diff --git a/Build/Compilers/BCC/bcc.cfg b/Build/Compilers/BCC/bcc.cfg
new file mode 100644
index 0000000..b70c6b1
--- /dev/null
+++ b/Build/Compilers/BCC/bcc.cfg
@@ -0,0 +1,15 @@
+
+compilers
+{
+	// This defines what files a compiler uses
+	// The setting named "program" defines what .exe to run
+	// The "interface" setting defines what interal interface to use for processing and error feedback
+	// All others are the required files (the setting names do not matter)
+	bcc
+	{
+		interface = "AccCompiler";
+		program = "bcc.exe";
+		zcommon = "zcommon.acs";
+		std = "std.acs";
+	}
+}
diff --git a/Build/Compilers/BCC/bcc.exe b/Build/Compilers/BCC/bcc.exe
new file mode 100644
index 0000000..2a3acac
Binary files /dev/null and b/Build/Compilers/BCC/bcc.exe differ
diff --git a/Build/Compilers/BCC/std.acs b/Build/Compilers/BCC/std.acs
new file mode 100644
index 0000000..17f18b1
--- /dev/null
+++ b/Build/Compilers/BCC/std.acs
@@ -0,0 +1,1422 @@
+/*
+
+   The following declarations are based on the declarations found in the
+   zdefs.acs and zspecial.acs files, both shipped with the acc compiler.
+
+*/
+
+region std {
+
+enum ON = 1;
+enum OFF = 0;
+enum YES = 1;
+enum NO = 0;
+
+enum LINE_FRONT = 0;
+enum LINE_BACK = 1;
+
+enum SIDE_FRONT = 0;
+enum SIDE_BACK = 1;
+
+enum TEXTURE_TOP = 0;
+enum TEXTURE_MIDDLE = 1;
+enum TEXTURE_BOTTOM = 2;
+
+enum TEXFLAG_TOP = 1;
+enum TEXFLAG_MIDDLE = 2;
+enum TEXFLAG_BOTTOM = 4;
+enum TEXFLAG_ADDOFFSET = 8;
+
+enum {
+   GAME_SINGLE_PLAYER,
+   GAME_NET_COOPERATIVE,
+   GAME_NET_DEATHMATCH,
+   GAME_TITLE_MAP
+};
+
+enum CLASS_FIGHTER = 0;
+enum CLASS_CLERIC = 1;
+enum CLASS_MAGE = 2;
+
+enum {
+   SKILL_VERY_EASY,
+   SKILL_EASY,
+   SKILL_NORMAL,
+   SKILL_HARD,
+   SKILL_VERY_HARD
+};
+
+enum {
+   BLOCK_NOTHING,
+   BLOCK_CREATURES,
+   BLOCK_EVERYTHING,
+   BLOCK_RAILING,
+   BLOCK_PLAYERS
+};
+
+enum SCROLL = 0;
+enum CARRY = 1;
+enum SCROLL_AND_CARRY = 2;
+
+enum {
+   MOD_UNKNOWN,
+   MOD_ROCKET = 5,
+   MOD_R_SPLASH,
+   MOD_PLASMARIFLE,
+   MOD_BFG_BOOM,
+   MOD_BFG_SPLASH,
+   MOD_CHAINSAW,
+   MOD_SSHOTGUN,
+   MOD_WATER,
+   MOD_SLIME,
+   MOD_LAVA,
+   MOD_CRUSH,
+   MOD_TELEFRAG,
+   MOD_FALLING,
+   MOD_SUICIDE,
+   MOD_BARREL,
+   MOD_EXIT,
+   MOD_SPLASH,
+   MOD_HIT,
+   MOD_RAILGUN,
+   MOD_ICE,
+   MOD_DISINTEGRATE,
+   MOD_POISON,
+   MOD_ELECTRIC
+};
+
+enum MOVIE_PLAYED = 0;
+enum MOVIE_PLAYED_NOVIDEO = 1;
+enum MOVIE_PLAYED_ABORTED = 2;
+enum MOVIE_FAILED = -1;
+
+enum {
+   PROP_FROZEN,
+   PROP_NOTARGET,
+   PROP_INSTANTWEAPONSWITCH,
+   PROP_FLY,
+   PROP_TOTALLYFROZEN,
+   PROP_INVULNERABILITY,
+   PROP_STRENGTH,
+   PROP_INVISIBILITY,
+   PROP_RADIATIONSUIT,
+   PROP_ALLMAP,
+   PROP_INFRARED,
+   PROP_WEAPONLEVEL2,
+   PROP_FLIGHT,
+   PROP_SPEED = 15,
+   PROP_BUDDHA
+};
+
+enum {
+   INPUT_OLDBUTTONS,
+   INPUT_BUTTONS,
+   INPUT_PITCH,
+   INPUT_YAW,
+   INPUT_ROLL,
+   INPUT_FORWARDMOVE,
+   INPUT_SIDEMOVE,
+   INPUT_UPMOVE
+};
+
+enum {
+   MODINPUT_OLDBUTTONS = 8,
+   MODINPUT_BUTTONS,
+   MODINPUT_PITCH,
+   MODINPUT_YAW,
+   MODINPUT_ROLL,
+   MODINPUT_FORWARDMOVE,
+   MODINPUT_SIDEMOVE,
+   MODINPUT_UPMOVE
+};
+
+enum BT_ATTACK = 0x1;
+enum BT_USE = 0x2;
+enum BT_JUMP = 0x4;
+enum BT_CROUCH = 0x8;
+enum BT_TURN180 = 0x10;
+enum BT_ALTATTACK = 0x20;
+enum BT_RELOAD = 0x40;
+enum BT_ZOOM = 0x80;
+enum BT_SPEED = 0x100;
+enum BT_STRAFE = 0x200;
+enum BT_MOVERIGHT = 0x400;
+enum BT_MOVELEFT = 0x800;
+enum BT_BACK = 0x1000;
+enum BT_FORWARD = 0x2000;
+enum BT_RIGHT = 0x4000;
+enum BT_LEFT = 0x8000;
+enum BT_LOOKUP = 0x10000;
+enum BT_LOOKDOWN = 0x20000;
+enum BT_MOVEUP = 0x40000;
+enum BT_MOVEDOWN = 0x80000;
+enum BT_SHOWSCORES = 0x100000;
+enum BT_USER1 = 0x200000;
+enum BT_USER2 = 0x400000;
+enum BT_USER3 = 0x800000;
+enum BT_USER4 = 0x1000000;
+
+enum {
+   CR_UNTRANSLATED = -1,
+   CR_BRICK,
+   CR_TAN,
+   CR_GRAY,
+   CR_GREY = CR_GRAY,
+   CR_GREEN,
+   CR_BROWN,
+   CR_GOLD,
+   CR_RED,
+   CR_BLUE,
+   CR_ORANGE,
+   CR_WHITE,
+   CR_YELLOW,
+   CR_BLACK = 12,
+   CR_LIGHTBLUE,
+   CR_CREAM,
+   CR_OLIVE,
+   CR_DARKGREEN,
+   CR_DARKRED,
+   CR_DARKBROWN,
+   CR_PURPLE,
+   CR_DARKGRAY,
+   CR_DARKGREY = CR_DARKGRAY,
+   CR_CYAN
+};
+
+enum HUDMSG_PLAIN = 0;
+enum HUDMSG_FADEOUT = 1;
+enum HUDMSG_TYPEON = 2;
+enum HUDMSG_FADEINOUT = 3;
+enum HUDMSG_LOG = 0x80000000;
+enum HUDMSG_COLORSTRING = 0x40000000;
+enum HUDMSG_ADDBLEND = 0x20000000;
+enum HUDMSG_ALPHA = 0x10000000;
+enum HUDMSG_NOWRAP = 0x8000000;
+enum HUDMSG_LAYER_OVERHUD = 0x0;
+enum HUDMSG_LAYER_UNDERHUD = 0x1000;
+enum HUDMSG_LAYER_OVERMAP = 0x2000;
+enum HUDMSG_NOTWITH3DVIEW = 0x10000;
+enum HUDMSG_NOTWITHFULLMAP = 0x20000;
+enum HUDMSG_NOTWITHOVERLAYMAP = 0x40000;
+
+enum {
+   MARINEWEAPON_DUMMY,
+   MARINEWEAPON_FIST,
+   MARINEWEAPON_BERSERKFIST,
+   MARINEWEAPON_CHAINSAW,
+   MARINEWEAPON_PISTOL,
+   MARINEWEAPON_SHOTGUN,
+   MARINEWEAPON_SUPERSHOTGUN,
+   MARINEWEAPON_CHAINGUN,
+   MARINEWEAPON_ROCKETLAUNCHER,
+   MARINEWEAPON_PLASMARIFLE,
+   MARINEWEAPON_RAILGUN,
+   MARINEWEAPON_BFG
+};
+
+enum {
+   APROP_HEALTH,
+   APROP_SPEED,
+   APROP_DAMAGE,
+   APROP_ALPHA,
+   APROP_RENDERSTYLE,
+   APROP_SEESOUND,
+   APROP_ATTACKSOUND,
+   APROP_PAINSOUND,
+   APROP_DEATHSOUND,
+   APROP_ACTIVESOUND,
+   APROP_AMBUSH,
+   APROP_INVULNERABLE,
+   APROP_JUMPZ,
+   APROP_CHASEGOAL,
+   APROP_FRIGHTENED,
+   APROP_GRAVITY,
+   APROP_FRIENDLY,
+   APROP_SPAWNHEALTH,
+   APROP_DROPPED,
+   APROP_NOTARGET,
+   APROP_SPECIES,
+   APROP_NAMETAG,
+   APROP_SCORE,
+   APROP_NOTRIGGER,
+   APROP_DAMAGEFACTOR,
+   APROP_MASTERTID,
+   APROP_TARGETTID,
+   APROP_TRACERTID,
+   APROP_WATERLEVEL,
+   APROP_SCALEX,
+   APROP_SCALEY,
+   APROP_DORMANT,
+   APROP_MASS,
+   APROP_ACCURACY,
+   APROP_STAMINA,
+   APROP_HEIGHT,
+   APROP_RADIUS,
+   APROP_REACTIONTIME,
+   APROP_MELEERANGE,
+   APROP_VIEWHEIGHT,
+   APROP_ATTACKZOFFSET,
+   APROP_STENCILCOLOR
+};
+
+enum {
+   STYLE_NONE,
+   STYLE_NORMAL,
+   STYLE_FUZZY,
+   STYLE_SOULTRANS,
+   STYLE_OPTFUZZY,
+   STYLE_STENCIL,
+   STYLE_ADDSTENCIL,
+   STYLE_ADDSHADED,
+   STYLE_TRANSLUCENT = 64,
+   STYLE_ADD,
+   STYLE_SHADED,
+   STYLE_TRANSLUCENTSTENCIL,
+   STYLE_SHADOW,
+   STYLE_SUBTRACT
+};
+
+enum {
+   LEVELINFO_PAR_TIME,
+   LEVELINFO_CLUSTERNUM,
+   LEVELINFO_LEVELNUM,
+   LEVELINFO_TOTAL_SECRETS,
+   LEVELINFO_FOUND_SECRETS,
+   LEVELINFO_TOTAL_ITEMS,
+   LEVELINFO_FOUND_ITEMS,
+   LEVELINFO_TOTAL_MONSTERS,
+   LEVELINFO_KILLED_MONSTERS,
+   LEVELINFO_SUCK_TIME
+};
+
+enum {
+   PLAYERINFO_TEAM,
+   PLAYERINFO_AIMDIST,
+   PLAYERINFO_COLOR,
+   PLAYERINFO_GENDER,
+   PLAYERINFO_NEVERSWITCH,
+   PLAYERINFO_MOVEBOB,
+   PLAYERINFO_STILLBOB,
+   PLAYERINFO_PLAYERCLASS,
+   PLAYERINFO_FOV,
+   PLAYERINFO_DESIREDFOV
+};
+
+enum NOT_BOTTOM = 1;
+enum NOT_MIDDLE = 2;
+enum NOT_TOP = 4;
+enum NOT_FLOOR = 8;
+enum NOT_CEILING = 16;
+
+enum DAMAGE_PLAYERS = 1;
+enum DAMAGE_NONPLAYERS = 2;
+enum DAMAGE_IN_AIR = 4;
+enum DAMAGE_SUBCLASSES_PROTECT = 8;
+
+enum MRF_OLDEFFECTS = 0x0;
+enum MRF_ADDSTAMINA = 0x1;
+enum MRF_FULLHEALTH = 0x2;
+enum MRF_UNDOBYTOMEOFPOWER = 0x4;
+enum MRF_UNDOBYCHAOSDEVICE = 0x8;
+enum MRF_FAILNOTELEFRAG = 0x10;
+enum MRF_FAILNOLAUGH = 0x20;
+enum MRF_WHENINVULNERABLE = 0x40;
+enum MRF_LOSEACTUALWEAPON = 0x80;
+enum MRF_NEWTIDBEHAVIOUR = 0x100;
+enum MRF_UNDOBYDEATH = 0x200;
+enum MRF_UNDOBYDEATHFORCED = 0x400;
+enum MRF_UNDOBYDEATHSAVES = 0x800;
+
+enum {
+   T_ROCK1 = 41,
+   T_ROCK2,
+   T_ROCK3,
+   T_DIRT1,
+   T_DIRT2,
+   T_DIRT3,
+   T_DIRT4,
+   T_DIRT5,
+   T_DIRT6,
+   T_STAINEDGLASS1 = 54,
+   T_STAINEDGLASS2,
+   T_STAINEDGLASS3,
+   T_STAINEDGLASS4,
+   T_STAINEDGLASS5,
+   T_STAINEDGLASS6,
+   T_STAINEDGLASS7,
+   T_STAINEDGLASS8,
+   T_STAINEDGLASS9,
+   T_STAINEDGLASS0
+};
+
+enum {
+   T_NONE,
+   T_SHOTGUY,
+   T_CHAINGUY,
+   T_BARON,
+   T_ZOMBIE,
+   T_IMP,
+   T_ARACHNOTRON,
+   T_SPIDERMASTERMIND,
+   T_DEMON,
+   T_SPECTRE,
+   T_IMPFIREBALL,
+   T_CLIP,
+   T_SHELLS,
+   T_CACODEMON = 19,
+   T_REVENANT,
+   T_BRIDGE,
+   T_ARMORBONUS,
+   T_STIMPACK,
+   T_MEDKIT,
+   T_SOULSPHERE,
+   T_SHOTGUN = 27,
+   T_CHAINGUN,
+   T_ROCKETLAUNCHER,
+   T_PLASMAGUN,
+   T_BFG,
+   T_CHAINSAW,
+   T_SUPERSHOTGUN,
+   T_PLASMABOLT = 51,
+   T_TRACER = 53,
+   T_GREENARMOR = 68,
+   T_BLUEARMOR,
+   T_CELL = 75,
+   T_BLUEKEYCARD = 85,
+   T_REDKEYCARD,
+   T_YELLOWKEYCARD,
+   T_YELLOWSKULLKEY,
+   T_REDSKULLKEY,
+   T_BLUESKULLKEY,
+   T_TEMPLARGEFLAME = 98,
+   T_STEALTHBARON = 100,
+   T_STEALTHKNIGHT,
+   T_STEALTHZOMBIE,
+   T_STEALTHSHOTGUY,
+   T_LOSTSOUL = 110,
+   T_VILE,
+   T_MANCUBUS,
+   T_HELLKNIGHT,
+   T_CYBERDEMON,
+   T_PAINELEMENTAL,
+   T_WOLFSS,
+   T_STEALTHARACHNOTRON,
+   T_STEALTHVILE,
+   T_STEALTHCACODEMON,
+   T_STEALTHCHAINGUY,
+   T_STEALTHSERGEANT,
+   T_STEALTHIMP,
+   T_STEALTHMANCUBUS,
+   T_STEALTHREVENANT,
+   T_BARREL,
+   T_CACODEMONSHOT,
+   T_ROCKET,
+   T_BFGSHOT,
+   T_ARACHNOTRONPLASMA,
+   T_BLOOD,
+   T_PUFF,
+   T_MEGASPHERE,
+   T_INVULNERABILITY,
+   T_BERSERK,
+   T_INVISIBILITY,
+   T_IRONFEET,
+   T_COMPUTERMAP,
+   T_LIGHTAMP,
+   T_AMMOBOX,
+   T_ROCKETAMMO,
+   T_ROCKETBOX,
+   T_BATTERY,
+   T_SHELLBOX,
+   T_BACKPACK,
+   T_GUTS,
+   T_BLOODPOOL,
+   T_BLOODPOOL1,
+   T_BLOODPOOL2,
+   T_FLAMINGBARREL,
+   T_BRAINS,
+   T_SCRIPTEDMARINE,
+   T_HEALTHBONUS,
+   T_MANCUBUSSHOT,
+   T_BARONBALL
+};
+
+enum {
+   T_CLINK = 1,
+   T_MUMMYLEADER,
+   T_BEAST,
+   T_MUMMY,
+   T_KNIGHT = 6,
+   T_IMPLEADER,
+   T_MUMMYGHOST,
+   T_MUMMYLEADERGHOST,
+   T_WIMPYWANDAMMO = 11,
+   T_HEFTYWANDAMMO,
+   T_ITEMEGG = 14,
+   T_ITEMFLIGHT,
+   T_ITEMTELEPORT = 18,
+   T_WIZARD,
+   T_IRONLICH,
+   T_ITEMHEALTHPOTION = 23,
+   T_ITEMHEALTHFLASH,
+   T_ITEMHEALTHFLASK = T_ITEMHEALTHFLASH,
+   T_ITEMHEALTHFULL,
+   T_CROSSBOW = 27,
+   T_BLASTER,
+   T_PHOENIXROD,
+   T_SKULLROD,
+   T_MACE,
+   T_GAUNTLETS,
+   T_WIMPYCROSSBOWAMMO,
+   T_HEFTYCROSSBOWAMMO,
+   T_WIMPYMACEAMMO,
+   T_HEFTYMACEAMMO,
+   T_WIMPYBLASTERAMMO,
+   T_HEFTYBLASTERAMMO,
+   T_MORPHBLAST = 40,
+   T_SHIELD1 = 68,
+   T_SHIELD2,
+   T_ITEMTIMEBOMB = 72,
+   T_ITEMTORCH,
+   T_BLUEKEY = 85,
+   T_GREENKEY,
+   T_YELLOWKEY,
+   T_SOUND_WIND = 110,
+   T_SOUND_WATERFALL,
+   T_BEASTBALL = 120,
+   T_FEATHER,
+   T_CHICKEN,
+   T_VOLCANOBALL,
+   T_TINYVOLCANOBALL,
+   T_POD,
+   T_PODGENERATOR,
+   T_KNIGHTAXE,
+   T_KNIGHTBLOODAXE,
+   T_KNIGHTGHOST,
+   T_MUMMYHEAD = 131,
+   T_SNAKE,
+   T_ITEMINVULNERABILITY,
+   T_ITEMTOME,
+   T_ITEMINVISIBILITY,
+   T_ITEMBAGOFHOLDING,
+   T_ITEMALLMAP,
+   T_SNAKEPROJECTILE,
+   T_SNAKEPROJECTILEBIG,
+   T_WIZARDSHOT,
+   T_DSPARILTELEPORTDEST,
+   T_DSPARILONSERPENT,
+   T_DSPARILALONE,
+   T_SERPENTFIREBALL,
+   T_DSPARILBLUESHOT,
+   T_DSPARILWIZARDSPAWNER,
+   T_CROSSBOWMAINBLAST,
+   T_CROSSBOWMINIBLAST,
+   T_CROSSBOWPOWERBLAST,
+   T_VOLCANO,
+   T_POWERWANDMINIBLAST,
+   T_POWERWANDBIGGERBLAST,
+   T_DEATHBALL,
+   T_NOGRAVITYMACEBALL,
+   T_BOUNCYMACEBALL,
+   T_HEAVYMACEBALL,
+   T_RIPPER,
+   T_WIMPYSKULLRODAMMO,
+   T_HEFTYSKULLRODAMMO,
+   T_SKULLRODBLAST,
+   T_WIMPYPHOENIXRODAMMO,
+   T_HEFTYPHOENIXRODAMMO,
+   T_PHOENIXSHOT,
+   T_IRONLICHBLUESHOT,
+   T_WHIRLWIND,
+   T_REDTELEGLITTER,
+   T_BLUETELEGLITTER
+};
+
+enum {
+   T_CENTAUR = 1,
+   T_CENTAURLEADER,
+   T_DEMON1,
+   T_ETTIN,
+   T_FIREGARGOYLE,
+   T_WATERLURKER,
+   T_WATERLURKERLEADER,
+   T_WRAITH,
+   T_WRAITHBURIED,
+   T_FIREBALL1,
+   T_MANA1,
+   T_MANA2,
+   T_ITEMBOOTS,
+   T_ITEMPORK,
+   T_ITEMSUMMON = 16,
+   T_ITEMTPORTOTHER,
+   T_BISHOP = 19,
+   T_ICEGOLEM,
+   T_DRAGONSKINBRACERS = 22,
+   T_ITEMBOOSTMANA = 26,
+   T_FIGHTERAXE,
+   T_FIGHTERHAMMER,
+   T_FIGHTERSWORD1,
+   T_FIGHTERSWORD2,
+   T_FIGHTERSWORD3,
+   T_CLERICSTAFF,
+   T_CLERICHOLY1,
+   T_CLERICHOLY2,
+   T_CLERICHOLY3,
+   T_MAGESHARDS,
+   T_MAGESTAFF1,
+   T_MAGESTAFF2,
+   T_MAGESTAFF3,
+   T_ARROW = 50,
+   T_DART,
+   T_POISONDART,
+   T_RIPPERBALL,
+   T_BLADE = 64,
+   T_ICESHARD,
+   T_FLAME_SMALL,
+   T_FLAME_LARGE,
+   T_MESHARMOR,
+   T_FALCONSHIELD,
+   T_PLATINUMHELM,
+   T_AMULETOFWARDING,
+   T_ITEMFLECHETTE,
+   T_ITEMREPULSION = 74,
+   T_MANA3,
+   T_PUZZSKULL,
+   T_PUZZGEMBIG,
+   T_PUZZGEMRED,
+   T_PUZZGEMGREEN1,
+   T_PUZZGEMGREEN2,
+   T_PUZZGEMBLUE1,
+   T_PUZZGEMBLUE2,
+   T_PUZZBOOK1,
+   T_PUZZBOOK2,
+   T_METALKEY,
+   T_SMALLMETALKEY,
+   T_AXEKEY,
+   T_FIREKEY,
+   T_EMERALDKEY,
+   T_MACEKEY,
+   T_SILVERKEY,
+   T_RUSTYKEY,
+   T_HORNKEY,
+   T_SERPENTKEY,
+   T_WATERDRIP,
+   T_TEMPSMALLFLAME,
+   T_PERMSMALLFLAME,
+   T_PERMLARGEFLAME = 99,
+   T_DEMON_MASH,
+   T_DEMON2_MASH,
+   T_ETTIN_MASH,
+   T_CENTAUR_MASH,
+   T_THRUSTSPIKEUP,
+   T_THRUSTSPIKEDOWN,
+   T_FLESH_DRIP1,
+   T_FLESH_DRIP2,
+   T_SPARK_DRIP
+};
+
+enum ACTOR_NONE = 0x0;
+enum ACTOR_WORLD = 0x1;
+enum ACTOR_PLAYER = 0x2;
+enum ACTOR_BOT = 0x4;
+enum ACTOR_VOODOODOLL = 0x8;
+enum ACTOR_MONSTER = 0x10;
+enum ACTOR_ALIVE = 0x20;
+enum ACTOR_DEAD = 0x40;
+enum ACTOR_MISSILE = 0x80;
+enum ACTOR_GENERIC = 0x100;
+
+enum {
+   SECSEQ_FLOOR = 1,
+   SECSEQ_CEILING,
+   SECSEQ_FULLHEIGHT,
+   SECSEQ_INTERIOR
+};
+
+enum CHAN_AUTO = 0;
+enum CHAN_WEAPON = 1;
+enum CHAN_VOICE = 2;
+enum CHAN_ITEM = 3;
+enum CHAN_BODY = 4;
+enum CHAN_LISTENERZ = 0x8;
+enum CHAN_MAYBE_LOCAL = 0x10;
+enum CHAN_UI = 0x20;
+enum CHAN_NOPAUSE = 0x40;
+
+enum ATTN_NONE = 0;
+enum ATTN_NORM = 1.0;
+enum ATTN_IDLE = 1.001;
+enum ATTN_STATIC = 3.0;
+
+enum {
+   SOUND_SEE,
+   SOUND_ATTACK,
+   SOUND_PAIN,
+   SOUND_DEATH,
+   SOUND_ACTIVE,
+   SOUND_USE,
+   SOUND_BOUNCE,
+   SOUND_WALLBOUNCE,
+   SOUND_CRUSHPAIN,
+   SOUND_HOWL
+};
+
+enum SDF_ABSANGLE = 0x1;
+enum SDF_PERMANENT = 0x2;
+
+enum AAPTR_DEFAULT = 0x0;
+enum AAPTR_NULL = 0x1;
+enum AAPTR_TARGET = 0x2;
+enum AAPTR_MASTER = 0x4;
+enum AAPTR_TRACER = 0x8;
+enum AAPTR_PLAYER_GETTARGET = 0x10;
+enum AAPTR_PLAYER_GETCONVERSATION = 0x20;
+enum AAPTR_PLAYER1 = 0x40;
+enum AAPTR_PLAYER2 = 0x80;
+enum AAPTR_PLAYER3 = 0x100;
+enum AAPTR_PLAYER4 = 0x200;
+enum AAPTR_PLAYER5 = 0x400;
+enum AAPTR_PLAYER6 = 0x800;
+enum AAPTR_PLAYER7 = 0x1000;
+enum AAPTR_PLAYER8 = 0x2000;
+enum AAPTR_FRIENDPLAYER = 0x4000;
+
+enum PTROP_UNSAFETARGET = 0x1;
+enum PTROP_UNSAFEMASTER = 0x2;
+enum PTROP_NOSAFEGUARDS = PTROP_UNSAFETARGET | PTROP_UNSAFEMASTER;
+
+enum {
+   ARMORINFO_CLASSNAME,
+   ARMORINFO_SAVEAMOUNT,
+   ARMORINFO_SAVEPERCENT,
+   ARMORINFO_MAXABSORB,
+   ARMORINFO_MAXFULLABSORB,
+   ARMORINFO_ACTUALSAVEAMOUNT,
+};
+
+enum SPAC_NONE = 0x0;
+enum SPAC_CROSS = 0x1;
+enum SPAC_USE = 0x2;
+enum SPAC_MCROSS = 0x4;
+enum SPAC_IMPACT = 0x8;
+enum SPAC_PUSH = 0x10;
+enum SPAC_PCROSS = 0x20;
+enum SPAC_ANYCROSS = 0x40;
+enum SPAC_MUSE = 0x80;
+enum SPAC_MPUSH = 0x100;
+enum SPAC_USEBACK = 0x200;
+
+enum TEAM_BLUE = 0;
+enum TEAM_RED = 1;
+enum NO_TEAM = 2;
+
+enum {
+   TPROP_NAME,
+   TPROP_SCORE,
+   TPROP_ISVALID,
+   TPROP_NUMPLAYERS,
+   TPROP_NUMLIVEPLAYERS,
+   TPROP_TEXTCOLOR,
+   TPROP_PLAYERSTARTNUM,
+   TPROP_SPREAD,
+   TPROP_CARRIER,
+   TPROP_ASSISTER,
+   TPROP_FRAGCOUNT,
+   TPROP_DEATHCOUNT,
+   TPROP_WINCOUNT,
+   TPROP_POINTCOUNT,
+   TPROP_RETURNTICS,
+   TPROP_TEAMITEM,
+   TPROP_WINNERTHEME,
+   TPROP_LOSERTHEME
+};
+
+enum {
+   IS_WAITINGFORPLAYERS,
+   IS_FIRSTCOUNTDOWN,
+   IS_INPROGRESS,
+   IS_BOSSFIGHT,
+   IS_WAVECOMPLETE,
+   IS_COUNDOWN
+};
+
+enum {
+   T_GRENADE = 216,
+   T_BFG10KSHOT,
+   T_DARKIMPFIREBALL,
+   T_CACOLANTERNSHOT,
+   T_ABADDONSHOT = 221
+};
+
+enum {
+   T_DARKIMP = 155,
+   T_BLOODDEMON,
+   T_SSGGUY,
+   T_HECTEBUS,
+   T_CACOLANTERN,
+   T_BELPHEGOR = 215,
+   T_ABADDON = 220
+};
+
+enum {
+   T_PISTOL = 162,
+   T_GRENADELAUNCHER,
+   T_RAILGUN,
+   T_BFG10000,
+   T_MINIGUN = 214
+};
+
+enum {
+   T_MAXHEALTHBONUS = 166,
+   T_MAXARMORBONUS,
+   T_REDARMOR
+};
+
+enum {
+   T_TURBOSPHERE = 169,
+   T_ANTIGRAVBELT,
+   T_TIMEFREEZER,
+   T_INFRAGOGGLES,
+   T_INFRATRACKER,
+   T_TRANSLUCENCY,
+   T_DOOMSPHERE,
+   T_RANDOMPOWERUP
+};
+
+enum {
+   T_BLUEFLAG = 177,
+   T_REDFLAG,
+   T_WHITEFLAG
+};
+
+enum {
+   T_STRENGTH = 180,
+   T_RAGE,
+   T_DRAIN,
+   T_SPREAD,
+   T_RESISTANCE,
+   T_REGENERATION,
+   T_PROSPERITY,
+   T_REFLECTION,
+   T_HIGHJUMP,
+   T_HASTE
+};
+
+enum {
+   EV_KEYDOWN = 1,
+   EV_KEYREPEAT,
+   EV_KEYUP,
+   EV_CHAR,
+   EV_MOUSEMOVE,
+   EV_LBUTTONDOWN,
+   EV_LBUTTONUP,
+   EV_LBUTTONDBLCLICK,
+   EV_MBUTTONDOWN,
+   EV_MBUTTONUP,
+   EV_MBUTTONDBLCLICK,
+   EV_RBUTTONDOWN,
+   EV_RBUTTONUP,
+   EV_RBUTTONDBLCLICK,
+   EV_WHEELDOWN,
+   EV_WHEELUP
+};
+
+enum GKM_SHIFT = 0x100;
+enum GKM_CTRL = 0x200;
+enum GKM_ALT = 0x400;
+enum GKM_LBUTTON = 0x800;
+enum GKM_MBUTTON = 0x1000;
+enum GKM_RBUTTON = 0x2000;
+
+enum {
+   GK_PGDN = 1,
+   GK_PGUP,
+   GK_HOME,
+   GK_END,
+   GK_LEFT,
+   GK_RIGHT,
+   GK_ALERT,
+   GK_BACKSPACE,
+   GK_TAB,
+   GK_LINEFEED,
+   GK_DOWN = GK_LINEFEED,
+   GK_VTAB,
+   GK_UP = GK_VTAB,
+   GK_FORMFEED,
+   GK_RETURN,
+   GK_F1,
+   GK_F2,
+   GK_F3,
+   GK_F4,
+   GK_F5,
+   GK_F6,
+   GK_F7,
+   GK_F8,
+   GK_F9,
+   GK_F10,
+   GK_F11,
+   GK_F12,
+   GK_DEL,
+   GK_ESCAPE,
+   GK_FREE1,
+   GK_FREE2,
+   GK_FREE3,
+   GK_CESCAPE
+};
+
+enum CHANGELEVEL_KEEPFACING = 0x1;
+enum CHANGELEVEL_RESETINVENTORY = 0x2;
+enum CHANGELEVEL_NOMONSTERS = 0x4;
+enum CHANGELEVEL_CHANGESKILL = 0x8;
+enum CHANGELEVEL_NOINTERMISSION = 0x10;
+enum CHANGELEVEL_RESETHEALTH = 0x20;
+enum CHANGELEVEL_PRERAISEWEAPON = 0x40;
+
+enum NO_CHANGE = 32767.0;
+
+enum SECF_SILENT = 0x1;
+enum SECF_NOFALLINGDAMAGE = 0x2;
+enum SECF_FLOORDROP = 0x4;
+enum SECF_NORESPAWN = 0x8;
+
+enum BLOCKF_CREATURES = 0x1;
+enum BLOCKF_MONSTERS = 0x2;
+enum BLOCKF_PLAYERS = 0x4;
+enum BLOCKF_FLOATERS = 0x8;
+enum BLOCKF_PROJECTILES = 0x10;
+enum BLOCKF_EVERYTHING = 0x20;
+enum BLOCKF_RAILING = 0x40;
+enum BLOCKF_USE = 0x80;
+enum BLOCKF_SIGHT = 0x100;
+
+enum FOGP_DENSITY = 0;
+enum FOGP_OUTSIDEDENSITY = 1;
+enum FOGP_SKYFOG = 2;
+
+enum PRINTNAME_LEVELNAME = -1;
+enum PRINTNAME_LEVEL = -2;
+enum PRINTNAME_SKILL = -3;
+
+enum CSF_NOFAKEFLOORS = 0x1;
+enum CSF_NOBLOCKALL = 0x2;
+
+enum FHF_NORANDOMPUFFZ = 0x1;
+
+enum {
+   GAMESTATE_UNSPECIFIED = -1,
+   GAMESTATE_WAITFORPLAYERS,
+   GAMESTATE_COUNTDOWN,
+   GAMESTATE_INPROGRESS,
+   GAMESTATE_INRESULTSEQUENCE
+};
+
+enum {
+   GAMEEVENT_PLAYERFRAGS,
+   GAMEEVENT_MEDALS,
+   GAMEEVENT_CAPTURES,
+   GAMEEVENT_TOUCHES,
+   GAMEEVENT_RETURNS,
+   GAMEEVENT_ROUND_STARTS,
+   GAMEEVENT_ROUND_ENDS,
+   GAMEEVENT_ROUND_ABORTED
+};
+
+enum DB_ORDER_DESC = false;
+enum DB_ORDER_ASC = true;
+
+// Action specials
+// Tail format: = <action-special-number> , <script-callable>
+int Polyobj_StartLine( int, int, int, int ) = 1, 0;
+int Polyobj_RotateLeft( int, int, int ) = 2, 1;
+int Polyobj_RotateRight( int, int, int ) = 3, 1;
+int Polyobj_Move( int, int, int, int ) = 4, 1;
+int Polyobj_ExplicitLine( int, int, int, int, int ) = 5, 0;
+int Polyobj_MoveTimes8( int, int, int, int ) = 6, 1;
+int Polyobj_DoorSwing( int, int, int, int ) = 7, 1;
+int Polyobj_DoorSlide( int, int, int, int, int ) = 8, 1;
+int Line_Horizon() = 9, 0;
+int Door_Close( int, int, int = 0 ) = 10, 1;
+int Door_Open( int, int, int = 0 ) = 11, 1;
+int Door_Raise( int, int, int, int = 0 ) = 12, 1;
+int Door_LockedRaise( int, int, int, int, int = 0 ) = 13, 1;
+int Door_Animated( int, int, int, int = 0 ) = 14, 1;
+int Autosave() = 15, 1;
+int Transfer_WallLight( int, int ) = 16, 0;
+int Thing_Raise( int ) = 17, 1;
+int StartConversation( int, int = 0 ) = 18, 1;
+int Thing_Stop( int ) = 19, 1;
+int Floor_LowerByValue( int, int, int ) = 20, 1;
+int Floor_LowerToLowest( int, int ) = 21, 1;
+int Floor_LowerToNearest( int, int ) = 22, 1;
+int Floor_RaiseByValue( int, int, int ) = 23, 1;
+int Floor_RaiseToHighest( int, int ) = 24, 1;
+int Floor_RaiseToNearest( int, int ) = 25, 1;
+int Stairs_BuildDown( int, int, int, int, int ) = 26, 1;
+int Stairs_BuildUp( int, int, int, int, int ) = 27, 1;
+int Floor_RaiseAndCrush( int, int, int, int = 0 ) = 28, 1;
+int Pillar_Build( int, int, int ) = 29, 1;
+int Pillar_Open( int, int, int, int ) = 30, 1;
+int Stairs_BuildDownSync( int, int, int, int ) = 31, 1;
+int Stairs_BuildUpSync( int, int, int, int ) = 32, 1;
+int ForceField() = 33, 1;
+int ClearForceField( int ) = 34, 1;
+int Floor_RaiseByValueTimes8( int, int, int ) = 35, 1;
+int Floor_LowerByValueTimes8( int, int, int ) = 36, 1;
+int Floor_MoveToValue( int, int, int, int = 0 ) = 37, 1;
+int Ceiling_Waggle( int, int, int, int, int ) = 38, 1;
+int Teleport_ZombieChanger( int, int ) = 39, 1;
+int Ceiling_LowerByValue( int, int, int ) = 40, 1;
+int Ceiling_RaiseByValue( int, int, int ) = 41, 1;
+int Ceiling_CrushAndRaise( int, int, int, int = 0 ) = 42, 1;
+int Ceiling_LowerAndCrush( int, int, int, int = 0 ) = 43, 1;
+int Ceiling_CrushStop( int ) = 44, 1;
+int Ceiling_CrushRaiseAndStay( int, int, int, int = 0 ) = 45, 1;
+int Floor_CrushStop( int ) = 46, 1;
+int Ceiling_MoveToValue( int, int, int, int = 0 ) = 47, 1;
+int Sector_Attach3dMidTex( int, int, int ) = 48, 0;
+int GlassBreak( int = 0 ) = 49, 1;
+int ExtraFloor_LightOnly( int, int ) = 50, 0;
+int Sector_SetLink( int, int, int, int ) = 51, 1;
+int Scroll_Wall( int, int, int, int, int ) = 52, 1;
+int Line_SetTextureOffset( int, int, int, int, int ) = 53, 1;
+int Sector_ChangeFlags( int, int, int ) = 54, 1;
+int Line_SetBlocking( int, int, int ) = 55, 1;
+int Line_SetTextureScale( int, int, int, int, int ) = 56, 1;
+int Sector_SetPortal( int, int, int, int, int ) = 57, 0;
+int Sector_CopyScroller( int, int ) = 58, 0;
+int Polyobj_Or_MoveToSpot( int, int, int ) = 59, 1;
+int Plat_PerpetualRaise( int, int, int ) = 60, 1;
+int Plat_Stop( int ) = 61, 1;
+int Plat_DownWaitUpStay( int, int, int ) = 62, 1;
+int Plat_DownByValue( int, int, int, int ) = 63, 1;
+int Plat_UpWaitDownStay( int, int, int ) = 64, 1;
+int Plat_UpByValue( int, int, int, int ) = 65, 1;
+int Floor_LowerInstant( int, int, int ) = 66, 1;
+int Floor_RaiseInstant( int, int, int ) = 67, 1;
+int Floor_MoveToValueTimes8( int, int, int, int ) = 68, 1;
+int Ceiling_MoveToValueTimes8( int, int, int, int ) = 69, 1;
+int Teleport( int, int = 0, int = 0 ) = 70, 1;
+int Teleport_NoFog( int, int = 0, int = 0, int = 0 ) = 71, 1;
+int ThrustThing( int, int, int = 0, int = 0 ) = 72, 1;
+int DamageThing( int, int = 0 ) = 73, 1;
+int Teleport_NewMap( int, int, int = 0 ) = 74, 1;
+int Teleport_EndGame() = 75, 1;
+int TeleportOther( int, int, int ) = 76, 1;
+int TeleportGroup( int, int, int, int, int ) = 77, 1;
+int TeleportInSector( int, int, int, int, int = 0 ) = 78, 1;
+int Thing_SetConversation( int, int ) = 79, 1;
+int Acs_Execute( int, int, int = 0, int = 0, int = 0 ) = 80, 1;
+int Acs_Suspend( int, int ) = 81, 1;
+int Acs_Terminate( int, int ) = 82, 1;
+int Acs_LockedExecute( int, int, int, int, int ) = 83, 1;
+int Acs_ExecuteWithResult( int, int = 0, int = 0, int = 0 ) = 84, 1;
+int Acs_LockedExecuteDoor( int, int, int, int, int ) = 85, 1;
+int Polyobj_MoveToSpot( int, int, int ) = 86, 1;
+int Polyobj_Stop( int ) = 87, 1;
+int Polyobj_MoveTo( int, int, int, int ) = 88, 1;
+int Polyobj_Or_MoveTo( int, int, int, int ) = 89, 1;
+int Polyobj_Or_RotateLeft( int, int, int ) = 90, 1;
+int Polyobj_Or_RotateRight( int, int, int ) = 91, 1;
+int Polyobj_Or_Move( int, int, int, int ) = 92, 1;
+int Polyobj_Or_MoveTimes8( int, int, int, int ) = 93, 1;
+int Pillar_BuildAndCrush( int, int, int, int, int = 0 ) = 94, 1;
+int FloorAndCeiling_LowerByValue( int, int, int ) = 95, 1;
+int FloorAndCeiling_RaiseByValue( int, int, int ) = 96, 1;
+int Ceiling_LowerAndCrushDist( int, int, int, int = 0, int = 0 ) = 97, 1;
+int Sector_SetTranslucent( int, int, int, int ) = 98, 1;
+int Floor_RaiseAndCrushDoom( int, int, int, int = 0 ) = 99, 1;
+int Scroll_Texture_Left( int, int = 0 ) = 100, 0;
+int Scroll_Texture_Right( int, int = 0 ) = 101, 0;
+int Scroll_Texture_Up( int, int = 0 ) = 102, 0;
+int Scroll_Texture_Down( int, int = 0 ) = 103, 0;
+int Light_ForceLightning( int ) = 109, 1;
+int Light_RaiseByValue( int, int ) = 110, 1;
+int Light_LowerByValue( int, int ) = 111, 1;
+int Light_ChangeToValue( int, int ) = 112, 1;
+int Light_Fade( int, int, int ) = 113, 1;
+int Light_Glow( int, int, int, int ) = 114, 1;
+int Light_Flicker( int, int, int ) = 115, 1;
+int Light_Strobe( int, int, int, int, int ) = 116, 1;
+int Light_Stop( int ) = 117, 1;
+int Plane_Copy( int, int, int, int, int ) = 118, 0;
+int Thing_Damage( int, int, int = 0 ) = 119, 1;
+int Radius_Quake( int, int, int, int, int ) = 120, 1;
+int Line_SetIdentification( int, int, int, int, int ) = 121, 0;
+int Thing_Move( int, int, int = 0 ) = 125, 1;
+int Thing_SetSpecial( int, int, int, int, int ) = 127, 1;
+int ThrustThingZ( int, int, int, int ) = 128, 1;
+int UsePuzzleItem() = 129, 0;
+int Thing_Activate( int ) = 130, 1;
+int Thing_Deactivate( int ) = 131, 1;
+int Thing_Remove( int ) = 132, 1;
+int Thing_Destroy( int, int = 0 ) = 133, 1;
+int Thing_Projectile( int, int, int, int, int ) = 134, 1;
+int Thing_Spawn( int, int, int, int = 0 ) = 135, 1;
+int Thing_ProjectileGravity( int, int, int, int, int ) = 136, 1;
+int Thing_SpawnNoFog( int, int, int, int = 0 ) = 137, 1;
+int Floor_Waggle( int, int, int, int, int ) = 138, 1;
+int Thing_SpawnFacing( int, int, int = 0, int = 0 ) = 139, 1;
+int Sector_ChangeSound( int, int ) = 140, 1;
+int Player_SetTeam( int ) = 145, 1;
+int Team_Score( int, int ) = 152, 1;
+int Team_GivePoints( int, int, int ) = 153, 1;
+int Teleport_NoStop( int, int, int = 0 ) = 154, 1;
+int SetGlobalFogParameter( int, int ) = 157, 1;
+int Fs_Excute( int, int = 0, int = 0, int = 0 ) = 158, 1;
+int Sector_SetPlaneReflection( int, int, int ) = 159, 1;
+int Sector_Set3dFloor( int, int, int, int, int ) = 160, 0;
+int Sector_SetContents( int, int, int ) = 161, 0;
+int Ceiling_CrushAndRaiseDist( int, int, int, int, int = 0 ) = 168, 1;
+int Generic_Crusher2( int, int, int, int, int ) = 169, 1;
+int Sector_SetCeilingScale2( int, int, int ) = 170, 1;
+int Sector_SetFloorScale2( int, int, int ) = 171, 1;
+int Plat_UpNearestWaitDownStay( int, int, int ) = 172, 1;
+int NoiseAlert( int, int ) = 173, 1;
+int SendToCommunicator( int, int, int, int ) = 174, 1;
+int Thing_ProjectileIntercept( int, int, int, int, int ) = 175, 1;
+int Thing_ChangeTid( int, int ) = 176, 1;
+int Thing_Hate( int, int, int = 0 ) = 177, 1;
+int Thing_ProjectileAimed( int, int, int, int, int = 0 ) = 178, 1;
+int ChangeSkill( int ) = 179, 1;
+int Thing_SetTranslation( int, int ) = 180, 1;
+int Plane_Align( int, int, int ) = 181, 0;
+int Line_Mirror() = 182, 0;
+int Line_AlignCeiling( int, int ) = 183, 1;
+int Line_AlignFloor( int, int ) = 184, 1;
+int Sector_SetRotation( int, int, int ) = 185, 1;
+int Sector_SetCeilingPanning( int, int, int, int, int ) = 186, 1;
+int Sector_SetFloorPanning( int, int, int, int, int ) = 187, 1;
+int Sector_SetCeilingScale( int, int, int, int, int ) = 188, 1;
+int Sector_SetFloorScale( int, int, int, int, int ) = 189, 1;
+int Static_Init( int, int, int, int ) = 190, 0;
+int SetPlayerProperty( int, int, int ) = 191, 1;
+int Ceiling_LowerToHighestFloor( int, int ) = 192, 1;
+int Ceiling_LowerInstant( int, int, int ) = 193, 1;
+int Ceiling_RaiseInstant( int, int, int ) = 194, 1;
+int Ceiling_CrushRaiseAndStayA( int, int, int, int, int = 0 ) = 195, 1;
+int Ceiling_CrushAndRaiseA( int, int, int, int, int = 0 ) = 196, 1;
+int Ceiling_CrushAndRaiseSilentA( int, int, int, int, int = 0 ) = 197, 1;
+int Ceiling_RaiseByValueTimes8( int, int, int ) = 198, 1;
+int Ceiling_LowerByValueTImes8( int, int, int ) = 199, 1;
+int Generic_Floor( int, int, int, int, int ) = 200, 1;
+int Generic_Ceiling( int, int, int, int, int ) = 201, 1;
+int Generic_Door( int, int, int, int, int ) = 202, 1;
+int Generic_Lift( int, int, int, int, int ) = 203, 1;
+int Generic_Stairs( int, int, int, int, int ) = 204, 1;
+int Generic_Crusher( int, int, int, int, int ) = 205, 1;
+int Plat_DownWaitUpStayLip( int, int, int, int, int = 0 ) = 206, 1;
+int Plat_PerpetualRaiseLip( int, int, int, int ) = 207, 1;
+int TranslucentLine( int, int, int = 0 ) = 208, 1;
+int Transfer_Heights( int, int ) = 209, 0;
+int Transfer_FloorLight( int ) = 210, 0;
+int Transfer_CeilingLight( int ) = 211, 0;
+int Sector_SetColor( int, int, int, int, int = 0 ) = 212, 1;
+int Sector_SetFade( int, int, int, int ) = 213, 1;
+int Sector_SetDamage( int, int, int ) = 214, 1;
+int Teleport_Line( int, int ) = 215, 1;
+int Sector_SetGravity( int, int, int ) = 216, 1;
+int Stairs_BuildUpDoom( int, int, int, int, int ) = 217, 1;
+int Sector_SetWind( int, int, int, int ) = 218, 1;
+int Sector_SetFriction( int, int ) = 219, 1;
+int Sector_SetCurrent( int, int, int, int ) = 220, 1;
+int Scroll_Texture_Both( int, int, int, int, int ) = 221, 1;
+int Scroll_Texture_Model( int, int ) = 222, 0;
+int Scroll_Floor( int, int, int, int ) = 223, 1;
+int Scroll_Ceiling( int, int, int, int ) = 224, 1;
+int Scroll_Texture_Offsets( int ) = 225, 0;
+int Acs_ExecuteAlways( int, int, int = 0, int = 0, int = 0 ) = 226, 1;
+int PointPush_SetForce( int, int, int, int ) = 227, 0;
+int Plat_RaiseAndStayTx0( int, int, int = 0 ) = 228, 1;
+int Thing_SetGoal( int, int, int, int = 0 ) = 229, 1;
+int Plat_UpByValueStayTx( int, int, int ) = 230, 1;
+int Plat_ToggleCeiling( int ) = 231, 1;
+int Light_StrobeDoom( int, int, int ) = 232, 1;
+int Light_MinNeighbor( int ) = 233, 1;
+int Light_MaxNeighbor( int ) = 234, 1;
+int Floor_TransferTrigger( int ) = 235, 1;
+int Floor_TransferNumeric( int ) = 236, 1;
+int ChangeCamera( int, int, int ) = 237, 1;
+int Floor_RaiseToLowestCeiling( int, int ) = 238, 1;
+int Floor_RaiseByValueTxTy( int, int, int ) = 239, 1;
+int Floor_RaiseByTexture( int, int ) = 240, 1;
+int Floor_LowerToLowestTxTy( int, int ) = 241, 1;
+int Floor_LowerToHighest( int, int, int ) = 242, 1;
+int Exit_Normal( int ) = 243, 1;
+int Exit_Secret( int ) = 244, 1;
+int Elevator_RaiseToNearest( int, int ) = 245, 1;
+int Elevator_MoveToFloor( int, int ) = 246, 1;
+int Elevator_LowerToNearest( int, int ) = 247, 1;
+int HealThing( int, int = 0 ) = 248, 1;
+int Door_CloseWaitOpen( int, int, int, int = 0 ) = 249, 1;
+int Floor_Donut( int, int, int ) = 250, 1;
+int FloorAndCeiling_LowerRaise( int, int, int, int = 0 ) = 251, 1;
+int Ceiling_RaiseToNearest( int, int ) = 252, 1;
+int Ceiling_LowerToLowest( int, int ) = 253, 1;
+int Ceiling_LowerToFloor( int, int ) = 254, 1;
+int Ceiling_CrushRaiseAndStaySilA( int, int, int, int,
+   int = 0 ) = 255, 1;
+
+// Extension functions
+// Tail format: -= <function-index>
+int GetLineUdmfInt( int, str ) -= 1;
+int GetLineUdmfFixed( int, str ) -= 2;
+int GetThingUdmfInt( int, str ) -= 3;
+int GetThingUdmfFixed( int, str ) -= 4;
+int GetSectorUdmfInt( int, str ) -= 5;
+int GetSectorUdmfFixed( int, str ) -= 6;
+int GetSideUdmfInt( int, bool, str ) -= 7;
+int GetSideUdmfFixed( int, bool, str ) -= 8;
+int GetActorVelX( int ) -= 9;
+int GetActorVelY( int ) -= 10;
+int GetActorVelZ( int ) -= 11;
+bool SetActivator( int ) -= 12;
+bool SetActivatorToTarget( int ) -= 13;
+int GetActorViewHeight( int ) -= 14;
+int GetChar( str, int ) -= 15;
+int GetAirSupply( int ) -= 16;
+bool SetAirSupply( int, int ) -= 17;
+void SetSkyScrollSpeed( int, int ) -= 18;
+int GetArmorType( str, int ) -= 19;
+int SpawnSpotForced( str, int, int = 0, int = 0 ) -= 20;
+int SpawnSpotFacingForced( str, int, int = 0 ) -= 21;
+bool CheckActorProperty( int, int, int ) -= 22;
+bool SetActorVelocity( int, int, int, int, bool, bool ) -= 23;
+void SetUserVariable( int, str, int ) -= 24;
+int GetUserVariable( int, str ) -= 25;
+void Radius_Quake2( int, int, int, int, int, str ) -= 26;
+bool CheckActorClass( int, str ) -= 27;
+void SetUserArray( int, str, int, int ) -= 28;
+int GetUserArray( int, str, int ) -= 29;
+void SoundSequenceOnActor( int, str ) -= 30;
+void SoundSequenceOnSector( int, str, int ) -= 31;
+void SoundSequenceOnPolyobj( int, str ) -= 32;
+int GetPolyobjX( int ) -= 33;
+int GetPolyobjY( int ) -= 34;
+bool CheckSight( int, int, int ) -= 35;
+int SpawnForced( str, int, int, int, int = 0, int = 0 ) -= 36;
+void AnnouncerSound( str, int ) -= 37;
+bool SetPointer( int, int, int = 0, int = 0 ) -= 38;
+bool Acs_NamedExecute( str, int, int = 0, int = 0, int = 0 ) -= 39;
+bool Acs_NamedSuspend( str, int ) -= 40;
+bool Acs_NamedTerminate( str, int ) -= 41;
+bool Acs_NamedLockedExecute( str, int, int, int, int ) -= 42;
+bool Acs_NamedLockedExecuteDoor( str, int, int, int, int ) -= 43;
+int Acs_NamedExecuteWithResult( str, int = 0, int = 0, int = 0 ) -= 44;
+bool Acs_NamedExecuteAlways( str, int, int = 0, int = 0, int = 0 ) -= 45;
+int UniqueTid( int = 0, int = 0 ) -= 46;
+bool IsTidUsed( int ) -= 47;
+int Sqrt( int ) -= 48;
+int FixedSqrt( int ) -= 49;
+int VectorLength( int, int ) -= 50;
+void SetHudClipRect( int, int, int, int, int = 0 ) -= 51;
+void SetHudWrapWidth( int ) -= 52;
+bool SetCVar( str, int ) -= 53;
+int GetUserCVar( int, str ) -= 54;
+bool SetUserCVar( int, str, int ) -= 55;
+str GetCVarString( str ) -= 56;
+bool SetCVarString( str, str ) -= 57;
+str GetUserCVarString( int, str ) -= 58;
+bool SetUserCVarString( int, str, str ) -= 59;
+void LineAttack( int, int, int, int, str, str, int, int = 0 ) -= 60;
+void PlaySound( int, str, int, int, bool, int ) -= 61;
+void StopSound( int, int ) -= 62;
+int Strcmp( str, str, int = 0 ) -= 63;
+int Stricmp( str, str, int = 0 ) -= 64;
+int Strcasecmp( str, str, int = 0 ) -= 64;
+str StrLeft( str, int ) -= 65;
+str StrRight( str, int ) -= 66;
+str StrMid( str, int, int ) -= 67;
+str GetActorClass( int ) -= 68;
+str GetWeapon() -= 69;
+void SoundVolume( int, int, int ) -= 70;
+void PlayActorSound( int, int, int = 0, int = 0.0, bool = false,
+   int = 0.0 ) -= 71;
+int SpawnDecal( int, str, int = 0, int = 0.0, int = 0.0, int = 0.0 ) -= 72;
+bool CheckFont( str ) -= 73;
+int DropItem( int, str, int = 0, int = 0 ) -= 74;
+bool CheckFlag( int, str ) -= 75;
+void SetLineActivation( int, int ) -= 76;
+int GetLineActivation( int ) -= 77;
+int GetActorPowerupTics( int, str ) -= 78;
+void ChangeActorAngle( int, int, bool = false ) -= 79;
+void ChangeActorPitch( int, int, bool = false ) -= 80;
+int GetArmorInfo( int ) -= 81;
+bool ResetMap() -= 100;
+bool PlayerIsSpectator( int ) -= 101;
+int ConsolePlayerNumber() -= 102;
+int GetTeamProperty( int, int ) -= 103;
+int GetPlayerLivesLeft( int ) -= 104;
+bool SetPlayerLivesLeft( int, int ) -= 105;
+bool KickFromGame( int, str ) -= 106;
+int GetGamemodeState() -= 107;
+void SetDBEntry( str, str, int ) -= 108;
+int GetDBEntry( str, str ) -= 109;
+void SetDBEntryString( str, str, str ) -= 110;
+str GetDBEntryString( str, str ) -= 111;
+void IncrementDBEntry( str, str, int ) -= 112;
+bool PlayerIsLoggedIn( int ) -= 113;
+str GetPlayerAccountName( int ) -= 114;
+int SortDBEntries( str, int, int, bool ) -= 115;
+int CountDBResults( int ) -= 116;
+void FreeDBResults( int ) -= 117;
+str GetDBResultKeyString( int, int ) -= 118;
+str GetDBResultValueString( int, int ) -= 119;
+int GetDBResultValue( int, int ) -= 120;
+int GetDBEntryRank( str, str, bool ) -= 121;
+int RequestScriptPuke( int, int = 0, int = 0, int = 0 ) -= 122;
+int GetTeamScore( int ) -= 19620;
+void SetTeamScore( int, int ) -= 19621;
+
+// Dedicated functions
+// Tail format: += <opcode> , <is-latent>
+void Delay( int ) += 55, 1;
+int Random( int, int ) += 57, 0;
+int ThingCount( int, int = 0 ) += 59, 0;
+void TagWait( int ) += 61, 1;
+void PolyWait( int ) += 63, 1;
+void ChangeFloor( int, str ) += 65, 0;
+void ChangeCeiling( int, str ) += 67, 0;
+int LineSide() += 80, 0;
+void ScriptWait( int ) += 81, 1;
+void ClearLineSpecial() += 83, 0;
+int PlayerCount() += 90, 0;
+int GameType() += 91, 0;
+int GameSkill() += 92, 0;
+int Timer() += 93, 0;
+void SectorSound( str, int ) += 94, 0;
+void AmbientSound( str, int ) += 95, 0;
+void SoundSequence( str ) += 96, 0;
+void SetLineTexture( int, int, int, str ) += 97, 0;
+void SetLineBlocking( int, int ) += 98, 0;
+void SetLineSpecial( int, int, int = 0, int = 0, int = 0, int = 0,
+   int = 0 ) += 99, 0;
+void ThingSound( int, str, int ) += 100, 0;
+void ActivatorSound( str, int ) += 102, 0;
+void LocalAmbientSound( str, int ) += 103, 0;
+void SetLineMonsterBlocking( int, int ) += 104, 0;
+bool IsMultiplayer() += 118, 0;
+int PlayerTeam() += 119, 0;
+int PlayerHealth() += 120, 0;
+int PlayerArmorPoints() += 121, 0;
+int PlayerFrags() += 122, 0;
+int BlueCount() += 124, 0;
+int BlueTeamCount() += 124, 0;
+int RedCount() += 125, 0;
+int RedTeamCount() += 125, 0;
+int BlueScore() += 126, 0;
+int BlueTeamScore() += 126, 0;
+int RedScore() += 127, 0;
+int RedTeamScore() += 127, 0;
+bool IsOneFlagCtf() += 128, 0;
+int GetInvasionWave() += 129, 0;
+int GetInvasionState() += 130, 0;
+void Music_Change( str, int ) += 132, 0;
+void ConsoleCommand( str, int = 0, int = 0 ) += 134, 0;
+bool SinglePlayer() += 135, 0;
+int FixedMul( int, int ) += 136, 0;
+int FixedDiv( int, int ) += 137, 0;
+void SetGravity( int ) += 138, 0;
+void SetAirControl( int ) += 140, 0;
+void ClearInventory() += 142, 0;
+void GiveInventory( str, int ) += 143, 0;
+void TakeInventory( str, int ) += 145, 0;
+int CheckInventory( str ) += 147, 0;
+int Spawn( str, int, int, int, int = 0, int = 0 ) += 149, 0;
+int SpawnSpot( str, int, int = 0, int = 0 ) += 151, 0;
+void SetMusic( str, int = 0, int = 0 ) += 153, 0;
+void LocalSetMusic( str, int = 0, int = 0 ) += 155, 0;
+void SetFont( str ) += 165, 0;
+void SetThingSpecial( int, int, int = 0, int = 0, int = 0, int = 0,
+   int = 0 ) += 180, 0;
+void FadeTo( int, int, int, int, int ) += 190, 0;
+void FadeRange( int, int, int, int, int, int, int, int, int ) += 191, 0;
+void CancelFade() += 192, 0;
+int PlayMovie( str ) += 193, 0;
+void SetFloorTrigger( int, int, int, int = 0, int = 0, int = 0,
+   int = 0, int = 0 ) += 194, 0;
+void SetCeilingTrigger( int, int, int, int = 0, int = 0, int = 0,
+   int = 0, int = 0 ) += 195, 0;
+int GetActorX( int ) += 196, 0;
+int GetActorY( int ) += 197, 0;
+int GetActorZ( int ) += 198, 0;
+int Sin( int ) += 220, 0;
+int Cos( int ) += 221, 0;
+int VectorAngle( int, int ) += 222, 0;
+bool CheckWeapon( str ) += 223, 0;
+bool SetWeapon( str ) += 224, 0;
+void SetMarineWeapon( int, int ) += 244, 0;
+void SetActorProperty( int, int, int ) += 245, 0;
+int GetActorProperty( int, int ) += 246, 0;
+int PlayerNumber() += 247, 0;
+int ActivatorTid() += 248, 0;
+void SetMarineSprite( int, str ) += 249, 0;
+int GetScreenWidth() += 250, 0;
+int GetScreenHeight() += 251, 0;
+void Thing_Projectile2( int, int, int, int, int, int, int ) += 252, 0;
+int StrLen( str ) += 253, 0;
+void SetHudSize( int, int, bool ) += 254, 0;
+int GetCvar( str ) += 255, 0;
+void SetResultValue( int ) += 257, 0;
+int GetLineRowOffset() += 258, 0;
+int GetActorFloorZ( int ) += 259, 0;
+int GetActorAngle( int ) += 260, 0;
+int GetSectorFloorZ( int, int, int ) += 261, 0;
+int GetSectorCeilingZ( int, int, int ) += 262, 0;
+int GetSigilPieces() += 264, 0;
+int GetLevelInfo( int ) += 265, 0;
+void ChangeSky( str, str ) += 266, 0;
+bool PlayerInGame( int ) += 267, 0;
+bool PlayerIsBot( int ) += 268, 0;
+void SetCameraToTexture( int, str, int ) += 269, 0;
+int GetAmmoCapacity( str ) += 271, 0;
+void SetAmmoCapacity( str, int ) += 272, 0;
+void SetActorAngle( int, int ) += 276, 0;
+void SpawnProjectile( int, str, int, int, int, int, int ) += 280, 0;
+int GetSectorLightLevel( int ) += 281, 0;
+int GetActorCeilingZ( int ) += 282, 0;
+bool SetActorPosition( int, int, int, int, bool ) += 283, 0;
+void ClearActorInventory( int ) += 284, 0;
+void GiveActorInventory( int, str, int ) += 285, 0;
+void TakeActorInventory( int, str, int ) += 286, 0;
+int CheckActorInventory( int, str ) += 287, 0;
+int ThingCountName( str, int ) += 288, 0;
+int SpawnSpotFacing( str, int, int = 0 ) += 289, 0;
+int PlayerClass( int ) += 290, 0;
+int GetPlayerInfo( int, int ) += 326, 0;
+void ChangeLevel( str, int, int, int = 0 ) += 327, 0;
+void SectorDamage( int, int, str, str, int ) += 328, 0;
+void ReplaceTextures( str, str, int = 0 ) += 329, 0;
+int GetActorPitch( int ) += 331, 0;
+void SetActorPitch( int, int ) += 332, 0;
+int SetActorState( int, str, bool = false ) += 334, 0;
+int Thing_Damage2( int, int, str ) += 335, 0;
+int UseInventory( str ) += 336, 0;
+int UseActorInventory( int, str ) += 337, 0;
+bool CheckActorCeilingTexture( int, str ) += 338, 0;
+bool CheckActorFloorTexture( int, str ) += 339, 0;
+int GetActorLightLevel( int ) += 340, 0;
+void SetMugShotState( str ) += 341, 0;
+int ThingCountSector( str, int, int ) += 342, 0;
+int ThingCountNameSector( str, int, int ) += 343, 0;
+int CheckPlayerCamera( int ) += 344, 0;
+int MorphActor( int, str = "", str = "", int = 0, int = 0, str = "",
+   str = "" ) += 345, 0;
+int UnmorphActor( int, int = 0 ) += 346, 0;
+int GetPlayerInput( int, int ) += 347, 0;
+int ClassifyActor( int ) += 348, 0;
+
+// Format functions
+// Tail format: *= <terminating-opcode>
+void Print( {} ) *= 86;
+void PrintBold( {} ) *= 101;
+void HudMessage( {}, int, int, int, int, int, int, int = 0.0,
+   int = 0.0 ) *= 161;
+void HudMessageBold( {}, int, int, int, int, int, int, int = 0.0,
+   int = 0.0 ) *= 162;
+void Log( {} ) *= 270;
+str StrParam( {} ) *= 352;
+
+// Internal functions
+// Tail format: /= <function-id>
+void Acs_ExecuteWait( int, int = 0, int = 0, int = 0, int = 0 ) /= 0;
+
+}
\ No newline at end of file
diff --git a/Build/Compilers/BCC/zcommon.acs b/Build/Compilers/BCC/zcommon.acs
new file mode 100644
index 0000000..ce5b00d
--- /dev/null
+++ b/Build/Compilers/BCC/zcommon.acs
@@ -0,0 +1,3 @@
+#include "std.acs"
+
+import upmost: region = std;
\ No newline at end of file
diff --git a/Build/Compilers/Hexen/acc.cfg b/Build/Compilers/Hexen/acc.cfg
new file mode 100644
index 0000000..3ec4db0
--- /dev/null
+++ b/Build/Compilers/Hexen/acc.cfg
@@ -0,0 +1,17 @@
+
+compilers
+{
+	// This defines what files a compiler uses
+	// The setting named "program" defines what .exe to run
+	// The "interface" setting defines what interal interface to use for processing and error feedback
+	// All others are the required files (the setting names do not matter)
+	hexen_acc
+	{
+		interface = "AccCompiler";
+		program = "acc.exe";
+		zcommon = "common.acs";
+		zdefs = "defs.acs";
+		zspecial = "specials.acs";
+		zwvars = "wvars.acs";
+	}
+}
diff --git a/Build/Compilers/Hexen/acc.exe b/Build/Compilers/Hexen/acc.exe
new file mode 100644
index 0000000..a60988b
Binary files /dev/null and b/Build/Compilers/Hexen/acc.exe differ
diff --git a/Build/Compilers/Hexen/common.acs b/Build/Compilers/Hexen/common.acs
new file mode 100644
index 0000000..8b9a082
--- /dev/null
+++ b/Build/Compilers/Hexen/common.acs
@@ -0,0 +1,10 @@
+
+//**************************************************************************
+//**
+//** common.acs
+//**
+//**************************************************************************
+
+#include "specials.acs"
+#include "defs.acs"
+#include "wvars.acs"
diff --git a/Build/Compilers/Hexen/defs.acs b/Build/Compilers/Hexen/defs.acs
new file mode 100644
index 0000000..0e630a1
--- /dev/null
+++ b/Build/Compilers/Hexen/defs.acs
@@ -0,0 +1,149 @@
+
+//**************************************************************************
+//**
+//** defs.acs
+//**
+//**************************************************************************
+
+#define TRUE	1
+#define FALSE	0
+#define ON		1
+#define OFF		0
+#define YES		1
+#define NO		0
+
+#define LINE_FRONT	0
+#define LINE_BACK	1
+
+#define SIDE_FRONT	0
+#define SIDE_BACK	1
+
+#define TEXTURE_TOP			0
+#define TEXTURE_MIDDLE		1
+#define TEXTURE_BOTTOM		2
+
+#define GAME_SINGLE_PLAYER		0
+#define GAME_NET_COOPERATIVE	1
+#define GAME_NET_DEATHMATCH		2
+
+#define CLASS_FIGHTER		0
+#define CLASS_CLERIC		1
+#define CLASS_MAGE			2
+
+#define SKILL_VERY_EASY		0
+#define SKILL_EASY			1
+#define SKILL_NORMAL		2
+#define SKILL_HARD			3
+#define SKILL_VERY_HARD		4
+
+#define T_NONE					0
+#define T_CENTAUR				1
+#define T_CENTAURLEADER			2
+#define T_DEMON					3
+#define T_ETTIN					4
+#define T_FIREGARGOYLE			5
+#define T_WATERLURKER			6
+#define T_WATERLURKERLEADER		7
+#define T_WRAITH				8
+#define T_WRAITHBURIED			9
+#define T_FIREBALL1				10
+#define T_MANA1					11
+#define T_MANA2					12
+#define T_ITEMBOOTS				13
+#define T_ITEMEGG				14
+#define T_ITEMFLIGHT			15
+#define T_ITEMSUMMON			16
+#define T_ITEMTPORTOTHER		17
+#define T_ITEMTELEPORT			18
+#define T_BISHOP				19
+#define T_ICEGOLEM				20
+#define T_BRIDGE				21
+#define T_DRAGONSKINBRACERS		22
+#define T_ITEMHEALTHPOTION		23
+#define T_ITEMHEALTHFLASK		24
+#define T_ITEMHEALTHFULL		25
+#define T_ITEMBOOSTMANA			26
+#define T_FIGHTERAXE			27
+#define T_FIGHTERHAMMER			28
+#define T_FIGHTERSWORD1			29
+#define T_FIGHTERSWORD2			30
+#define T_FIGHTERSWORD3			31
+#define T_CLERICSTAFF			32
+#define T_CLERICHOLY1			33
+#define T_CLERICHOLY2			34
+#define T_CLERICHOLY3			35
+#define T_MAGESHARDS			36
+#define T_MAGESTAFF1			37
+#define T_MAGESTAFF2			38
+#define T_MAGESTAFF3			39
+#define T_MORPHBLAST			40
+#define T_ROCK1					41
+#define T_ROCK2					42
+#define T_ROCK3					43
+#define T_DIRT1					44
+#define T_DIRT2					45
+#define T_DIRT3					46
+#define T_DIRT4					47
+#define T_DIRT5					48
+#define T_DIRT6					49
+#define T_ARROW					50
+#define T_DART					51
+#define T_POISONDART			52
+#define T_RIPPERBALL			53
+#define T_STAINEDGLASS1			54
+#define T_STAINEDGLASS2			55
+#define T_STAINEDGLASS3			56
+#define T_STAINEDGLASS4			57
+#define T_STAINEDGLASS5			58
+#define T_STAINEDGLASS6			59
+#define T_STAINEDGLASS7			60
+#define T_STAINEDGLASS8			61
+#define T_STAINEDGLASS9			62
+#define T_STAINEDGLASS0			63
+#define T_BLADE					64
+#define T_ICESHARD				65
+#define T_FLAME_SMALL			66
+#define T_FLAME_LARGE			67
+#define T_MESHARMOR				68
+#define T_FALCONSHIELD			69
+#define T_PLATINUMHELM			70
+#define T_AMULETOFWARDING		71
+#define T_ITEMFLECHETTE			72
+#define T_ITEMTORCH				73
+#define T_ITEMREPULSION			74
+#define T_MANA3					75
+#define T_PUZZSKULL				76
+#define T_PUZZGEMBIG			77
+#define T_PUZZGEMRED			78
+#define T_PUZZGEMGREEN1			79
+#define T_PUZZGEMGREEN2			80
+#define T_PUZZGEMBLUE1			81
+#define T_PUZZGEMBLUE2			82
+#define T_PUZZBOOK1				83
+#define T_PUZZBOOK2				84
+#define T_METALKEY				85
+#define T_SMALLMETALKEY			86
+#define T_AXEKEY				87
+#define T_FIREKEY				88
+#define T_GREENKEY				89
+#define T_MACEKEY				90
+#define T_SILVERKEY				91
+#define T_RUSTYKEY				92
+#define T_HORNKEY				93
+#define T_SERPENTKEY			94
+#define T_WATERDRIP				95
+#define T_TEMPSMALLFLAME		96
+#define T_PERMSMALLFLAME		97
+#define T_TEMPLARGEFLAME		98
+#define T_PERMLARGEFLAME		99
+#define T_DEMON_MASH			100
+#define T_DEMON2_MASH			101
+#define T_ETTIN_MASH			102
+#define T_CENTAUR_MASH			103
+#define T_THRUSTSPIKEUP			104
+#define T_THRUSTSPIKEDOWN		105
+#define T_FLESH_DRIP1			106
+#define T_FLESH_DRIP2			107
+#define T_SPARK_DRIP			108
+			
+
diff --git a/Build/Compilers/Hexen/specials.acs b/Build/Compilers/Hexen/specials.acs
new file mode 100644
index 0000000..91f346e
--- /dev/null
+++ b/Build/Compilers/Hexen/specials.acs
@@ -0,0 +1,84 @@
+//**************************************************************************
+//**
+//** specials.acs
+//**
+//**************************************************************************
+
+special
+	80:ACS_Execute(5),
+	81:ACS_Suspend(2),
+	82:ACS_Terminate(2),
+	83:ACS_LockedExecute(5),
+	42:Ceiling_CrushAndRaise(3),
+	44:Ceiling_CrushStop(1),
+	43:Ceiling_LowerAndCrush(3),
+	40:Ceiling_LowerByValue(3),
+	41:Ceiling_RaiseByValue(3),
+	45:Ceiling_CrushRaiseAndStay(3),
+	69:Ceiling_MoveToValueTimes8(4),
+	10:Door_Close(2),
+	11:Door_Open(2),
+	12:Door_Raise(3),
+	13:Door_LockedRaise(4),
+	20:Floor_LowerByValue(3),
+	36:Floor_LowerByValueTimes8(3),
+	66:Floor_LowerInstant(3),
+	68:Floor_MoveToValueTimes8(4),
+	21:Floor_LowerToLowest(2),
+	22:Floor_LowerToNearest(2),
+	28:Floor_RaiseAndCrush(3),
+	23:Floor_RaiseByValue(3),
+	35:Floor_RaiseByValueTimes8(3),
+	67:Floor_RaiseInstant(3),
+	24:Floor_RaiseToHighest(2),
+	25:Floor_RaiseToNearest(2),
+	95:FloorAndCeiling_LowerByValue(3),
+	96:FloorAndCeiling_RaiseByValue(3),
+	46:Floor_CrushStop(1),
+	109:Light_ForceLightning(1),
+	110:Light_RaiseByValue(2),
+	111:Light_LowerByValue(2),
+	112:Light_ChangeToValue(2),
+	113:Light_Fade(3),
+	114:Light_Glow(4),
+	115:Light_Flicker(3),
+	116:Light_Strobe(5),
+	29:Pillar_Build(3),
+	94:Pillar_BuildAndCrush(4),
+	30:Pillar_Open(4),
+	62:Plat_DownWaitUpStay(3),
+	63:Plat_DownByValue(4),
+	64:Plat_UpWaitDownStay(3),
+	65:Plat_UpByValue(4),
+	60:Plat_PerpetualRaise(3),
+	61:Plat_Stop(1),
+	6:Polyobj_MoveTimes8(4),
+	4:Polyobj_Move(4),
+	2:Polyobj_RotateLeft(3),
+	3:Polyobj_RotateRight(3),
+	7:Polyobj_DoorSwing(4),
+	8:Polyobj_DoorSlide(5),
+	93:Polyobj_OR_MoveTimes8(4),
+	92:Polyobj_OR_Move(4),
+	90:Polyobj_OR_RotateLeft(3),
+	91:Polyobj_OR_RotateRight(3),
+	120:Radius_Quake(5),
+	140:Sector_ChangeSound(2),
+	26:Stairs_BuildDown(5),
+	27:Stairs_BuildUp(5),
+	31:Stairs_BuildDownSync(4),
+	32:Stairs_BuildUpSync(4),
+	70:Teleport(1),
+	71:Teleport_NoFog(1),
+	74:Teleport_NewMap(2),
+	72:ThrustThing(2),
+	73:DamageThing(1),
+	130:Thing_Activate(1),
+	131:Thing_Deactivate(1),
+	133:Thing_Destroy(1),
+	134:Thing_Projectile(5),
+	136:Thing_ProjectileGravity(5),
+	132:Thing_Remove(1),
+	135:Thing_Spawn(3),
+	137:Thing_SpawnNoFog(3),
+	138:Floor_Waggle(5);
diff --git a/Build/Compilers/Hexen/wvars.acs b/Build/Compilers/Hexen/wvars.acs
new file mode 100644
index 0000000..252b4a1
--- /dev/null
+++ b/Build/Compilers/Hexen/wvars.acs
@@ -0,0 +1,13 @@
+
+//**************************************************************************
+//**
+//** wvars.acs
+//**
+//**************************************************************************
+
+/*
+world int 0:WorldFree1;
+world int 1:WorldFree2;
+world int 2:WorldFree3;
+world int 3:WorldFree4;
+*/
diff --git a/Build/Compilers/Nodebuilders/ZenNode.cfg b/Build/Compilers/Nodebuilders/ZenNode.cfg
new file mode 100644
index 0000000..36148ad
--- /dev/null
+++ b/Build/Compilers/Nodebuilders/ZenNode.cfg
@@ -0,0 +1,38 @@
+
+compilers
+{
+	// This defines what files a compiler uses
+	// The setting named "program" defines what .exe to run
+	zennode
+	{
+		interface = "NodesCompiler";
+		program = "ZenNode.exe";
+	}
+}
+
+
+// Below are configurations for this nodebuilder. If you want to make your own configurations,
+// it is recommended to do so in your own file as this file will be updated each release.
+
+// NOTE: Nodebuilder configuration key names defined here must be unique for all nodebuilders!
+// Recommend to start the key name with the name of the compiler, followed by underscore and a specific name.
+
+// The "compiler" setting must refer to an existing compiler (such as defined above), but it
+// does not have to be a compiler defined in the same configuration file.
+
+nodebuilders
+{
+	zennode_normal
+	{
+		title = "ZenNode - Normal";
+		compiler = "zennode";
+		parameters = "%FI -o %FI";
+	}
+
+	zennode_fast
+	{
+		title = "ZenNode - Fast (no reject)";
+		compiler = "zennode";
+		parameters = "-n3 -nq -rz %FI -o %FI";
+	}
+}
diff --git a/Build/Compilers/Nodebuilders/ZenNode.exe b/Build/Compilers/Nodebuilders/ZenNode.exe
new file mode 100644
index 0000000..0478720
Binary files /dev/null and b/Build/Compilers/Nodebuilders/ZenNode.exe differ
diff --git a/Build/Compilers/Nodebuilders/bsp-w32.bat b/Build/Compilers/Nodebuilders/bsp-w32.bat
new file mode 100644
index 0000000..2d7be17
--- /dev/null
+++ b/Build/Compilers/Nodebuilders/bsp-w32.bat
@@ -0,0 +1 @@
+bsp-w32.exe %*
diff --git a/Build/Compilers/Nodebuilders/bsp-w32.cfg b/Build/Compilers/Nodebuilders/bsp-w32.cfg
new file mode 100644
index 0000000..b9af8a5
--- /dev/null
+++ b/Build/Compilers/Nodebuilders/bsp-w32.cfg
@@ -0,0 +1,41 @@
+
+compilers
+{
+	// This defines what files a compiler uses
+	// The setting named "program" defines what .exe to run
+	bspw32
+	{
+		// Don't ask me why, but running the exe directly doesn't seem to work.
+		// It seems like it ignores the parameters. Using a batch file seems to 'fix' this.
+		interface = "NodesCompiler";
+		program = "bsp-w32.bat";
+		executable = "bsp-w32.exe";
+	}
+}
+
+
+// Below are configurations for this nodebuilder. If you want to make your own configurations,
+// it is recommended to do so in your own file as this file will be updated each release.
+
+// NOTE: Nodebuilder configuration key names defined here must be unique for all nodebuilders!
+// Recommend to start the key name with the name of the compiler, followed by underscore and a specific name.
+
+// The "compiler" setting must refer to an existing compiler (such as defined above), but it
+// does not have to be a compiler defined in the same configuration file.
+
+nodebuilders
+{
+	bspw32_normal
+	{
+		title = "BSP-W32 - Normal";
+		compiler = "bspw32";
+		parameters = "%FI -o %FO";
+	}
+
+	bspw32_fast
+	{
+		title = "BSP-W32 - Fast (no reject)";
+		compiler = "bspw32";
+		parameters = "-noreject %FI -o %FO";
+	}
+}
diff --git a/Build/Compilers/Nodebuilders/bsp-w32.exe b/Build/Compilers/Nodebuilders/bsp-w32.exe
new file mode 100644
index 0000000..1434e72
Binary files /dev/null and b/Build/Compilers/Nodebuilders/bsp-w32.exe differ
diff --git a/Build/Compilers/Nodebuilders/deepbsp.cfg b/Build/Compilers/Nodebuilders/deepbsp.cfg
new file mode 100644
index 0000000..c5cfc71
--- /dev/null
+++ b/Build/Compilers/Nodebuilders/deepbsp.cfg
@@ -0,0 +1,32 @@
+
+compilers
+{
+	// This defines what files a compiler uses
+	// The setting named "program" defines what .exe to run
+	deepbsp
+	{
+		interface = "NodesCompiler";
+		program = "deepbsp.exe";
+	}
+}
+
+
+// Below are configurations for this nodebuilder. If you want to make your own configurations,
+// it is recommended to do so in your own file as this file will be updated each release.
+
+// NOTE: Nodebuilder configuration key names defined here must be unique for all nodebuilders!
+// Recommend to start the key name with the name of the compiler, followed by underscore and a specific name.
+
+// The "compiler" setting must refer to an existing compiler (such as defined above), but it
+// does not have to be a compiler defined in the same configuration file.
+
+nodebuilders
+{
+	deepbsp_normal
+	{
+		title = "DeepBSP - Normal";
+		compiler = "deepbsp";
+		parameters = "%FI %FO";
+	}
+}
+
diff --git a/Build/Compilers/Nodebuilders/deepbsp.exe b/Build/Compilers/Nodebuilders/deepbsp.exe
new file mode 100644
index 0000000..a027431
Binary files /dev/null and b/Build/Compilers/Nodebuilders/deepbsp.exe differ
diff --git a/Build/Compilers/Nodebuilders/glBSP.cfg b/Build/Compilers/Nodebuilders/glBSP.cfg
new file mode 100644
index 0000000..48727df
--- /dev/null
+++ b/Build/Compilers/Nodebuilders/glBSP.cfg
@@ -0,0 +1,37 @@
+
+compilers
+{
+	// This defines what files a compiler uses
+	// The setting named "program" defines what .exe to run
+	glbsp
+	{
+		interface = "NodesCompiler";
+		program = "glBSP.exe";
+	}
+}
+
+// Below are configurations for this nodebuilder. If you want to make your own configurations,
+// it is recommended to do so in your own file as this file will be updated each release.
+
+// NOTE: Nodebuilder configuration key names defined here must be unique for all nodebuilders!
+// Recommend to start the key name with the name of the compiler, followed by underscore and a specific name.
+
+// The "compiler" setting must refer to an existing compiler (such as defined above), but it
+// does not have to be a compiler defined in the same configuration file.
+
+nodebuilders
+{
+	glbsp_normal
+	{
+		title = "glBSP - Normal";
+		compiler = "glbsp";
+		parameters = "%FI -o %FO";
+	}
+
+	glbsp_fast
+	{
+		title = "glBSP - Fast (no reject)";
+		compiler = "glbsp";
+		parameters = "-normal -noreject -v5 -factor 1 %FI -o %FO";
+	}
+}
diff --git a/Build/Compilers/Nodebuilders/glbsp.exe b/Build/Compilers/Nodebuilders/glbsp.exe
new file mode 100644
index 0000000..b6f9f1d
Binary files /dev/null and b/Build/Compilers/Nodebuilders/glbsp.exe differ
diff --git a/Build/Compilers/Nodebuilders/zdbsp.cfg b/Build/Compilers/Nodebuilders/zdbsp.cfg
new file mode 100644
index 0000000..ebaa4da
--- /dev/null
+++ b/Build/Compilers/Nodebuilders/zdbsp.cfg
@@ -0,0 +1,68 @@
+
+compilers
+{
+	// This defines what files a compiler uses
+	// The setting named "program" defines what .exe to run
+	zdbsp
+	{
+		interface = "NodesCompiler";
+		program = "zdbsp.exe";
+	}
+}
+
+
+// Below are configurations for this nodebuilder. If you want to make your own configurations,
+// it is recommended to do so in your own file as this file will be updated each release.
+
+// NOTE: Nodebuilder configuration key names defined here must be unique for all nodebuilders!
+// Recommend to start the key name with the name of the compiler, followed by underscore and a specific name.
+
+// The "compiler" setting must refer to an existing compiler (such as defined above), but it
+// does not have to be a compiler defined in the same configuration file.
+
+nodebuilders
+{
+	zdbsp_normal
+	{
+		title = "ZDBSP - Normal (no reject)";
+		compiler = "zdbsp";
+		parameters = "-c -o%FO %FI";
+		// -c adds comment indices in UDMF format. This is not documented in the ZDBSP usage.
+	}
+	
+	zdbsp_udmf_normal
+	{
+		title = "ZDBSP - UDMF Normal (no reject)";
+		compiler = "zdbsp";
+		parameters = "-c -X -o%FO %FI";
+		// -c adds comment indices in UDMF format. This is not documented in the ZDBSP usage.
+	}
+	
+	zdbsp_fast
+	{
+		title = "ZDBSP - Normal (zero reject)";
+		compiler = "zdbsp";
+		parameters = "-R -o%FO %FI";
+	}
+	
+	zdbsp_udmf_fast
+	{
+		title = "ZDBSP - UDMF Normal (zero reject)";
+		compiler = "zdbsp";
+		parameters = "-R -X -o%FO %FI";
+	}
+	
+	zdbsp_compressed
+	{
+		title = "ZDBSP - Compress nodes";
+		compiler = "zdbsp";
+		parameters = "-z -o%FO %FI";
+	}
+
+	zdbsp_udmf_compressed
+	{
+		title = "ZDBSP - Compress nodes (UDMF)";
+		compiler = "zdbsp";
+		parameters = "-z -X -o%FO %FI";
+	}
+}
diff --git a/Build/Compilers/Nodebuilders/zdbsp.exe b/Build/Compilers/Nodebuilders/zdbsp.exe
new file mode 100644
index 0000000..2fa3102
Binary files /dev/null and b/Build/Compilers/Nodebuilders/zdbsp.exe differ
diff --git a/Build/Compilers/ZDoom/acc.cfg b/Build/Compilers/ZDoom/acc.cfg
new file mode 100644
index 0000000..7e6d0e0
--- /dev/null
+++ b/Build/Compilers/ZDoom/acc.cfg
@@ -0,0 +1,17 @@
+
+compilers
+{
+	// This defines what files a compiler uses
+	// The setting named "program" defines what .exe to run
+	// The "interface" setting defines what interal interface to use for processing and error feedback
+	// All others are the required files (the setting names do not matter)
+	zdoom_acc
+	{
+		interface = "AccCompiler";
+		program = "acc.exe";
+		zcommon = "zcommon.acs";
+		zdefs = "zdefs.acs";
+		zspecial = "zspecial.acs";
+		zwvars = "zwvars.acs";
+	}
+}
diff --git a/Build/Compilers/ZDoom/acc.exe b/Build/Compilers/ZDoom/acc.exe
new file mode 100644
index 0000000..a60988b
Binary files /dev/null and b/Build/Compilers/ZDoom/acc.exe differ
diff --git a/Build/Compilers/ZDoom/zcommon.acs b/Build/Compilers/ZDoom/zcommon.acs
new file mode 100644
index 0000000..5cdec5d
--- /dev/null
+++ b/Build/Compilers/ZDoom/zcommon.acs
@@ -0,0 +1,15 @@
+
+//**************************************************************************
+//**
+//** zcommon.acs
+//**
+//**************************************************************************
+
+// If you are not using the -h command line switch and do not want to use
+// WadAuthor's error checker, you can uncomment the following line to shave
+// a few bytes off the size of compiled scripts.
+//#nowadauthor
+
+#include "zspecial.acs"
+#include "zdefs.acs"
+#include "zwvars.acs"
diff --git a/Build/Compilers/ZDoom/zdefs.acs b/Build/Compilers/ZDoom/zdefs.acs
new file mode 100644
index 0000000..c80cf89
--- /dev/null
+++ b/Build/Compilers/ZDoom/zdefs.acs
@@ -0,0 +1,1080 @@
+//**************************************************************************
+//**
+//** zdefs.acs
+//**
+//** Common definitions for use when compiling ACS scripts for ZDoom
+//**
+//**************************************************************************
+
+#define TRUE                    1
+#define FALSE                   0
+#define ON                      1
+#define OFF                     0
+#define YES                     1
+#define NO                      0
+
+#define LINE_FRONT              0
+#define LINE_BACK               1
+
+#define SIDE_FRONT              0
+#define SIDE_BACK               1
+
+#define TEXTURE_TOP             0
+#define TEXTURE_MIDDLE          1
+#define TEXTURE_BOTTOM          2
+
+// same information as combinable bit flags
+#define TEXFLAG_TOP				1
+#define TEXFLAG_MIDDLE			2
+#define TEXFLAG_BOTTOM			4
+#define TEXFLAG_ADDOFFSET		8
+
+#define GAME_SINGLE_PLAYER      0
+#define GAME_NET_COOPERATIVE    1
+#define GAME_NET_DEATHMATCH     2
+#define GAME_TITLE_MAP		3
+
+// Classes are only useful with Hexen
+#define CLASS_FIGHTER           0
+#define CLASS_CLERIC            1
+#define CLASS_MAGE              2
+
+#define SKILL_VERY_EASY         0
+#define SKILL_EASY              1
+#define SKILL_NORMAL            2
+#define SKILL_HARD              3
+#define SKILL_VERY_HARD         4
+
+#define BLOCK_NOTHING           0
+#define BLOCK_CREATURES         1
+#define BLOCK_EVERYTHING        2
+#define BLOCK_RAILING			3
+#define BLOCK_PLAYERS			4
+
+#define SCROLL                  0
+#define CARRY                   1
+#define SCROLL_AND_CARRY        2
+
+// Means-of-death for Sector_SetDamage --------------------------------------
+
+#define MOD_UNKNOWN             0
+#define MOD_ROCKET              5
+#define MOD_R_SPLASH            6
+#define MOD_PLASMARIFLE         7
+#define MOD_BFG_BOOM            8
+#define MOD_BFG_SPLASH          9
+#define MOD_CHAINSAW            10
+#define MOD_SSHOTGUN            11
+#define MOD_WATER               12
+#define MOD_SLIME               13
+#define MOD_LAVA                14
+#define MOD_CRUSH               15
+#define MOD_TELEFRAG            16
+#define MOD_FALLING             17
+#define MOD_SUICIDE             18
+#define MOD_BARREL              19
+#define MOD_EXIT                20
+#define MOD_SPLASH              21
+#define MOD_HIT                 22
+#define MOD_RAILGUN		23
+#define MOD_ICE			24
+#define MOD_DISINTEGRATE	25
+#define MOD_POISON		26
+#define MOD_ELECTRIC		27
+
+// Return values for PlayMovie ----------------------------------------------
+
+#define MOVIE_Played            0
+#define MOVIE_Played_NoVideo    1
+#define MOVIE_Played_Aborted    2
+#define MOVIE_Failed           -1
+
+
+// Player properties --------------------------------------------------------
+
+#define PROP_FROZEN                     0
+#define PROP_NOTARGET                   1
+#define PROP_INSTANTWEAPONSWITCH        2
+#define PROP_FLY			3
+#define PROP_TOTALLYFROZEN		4
+#define PROP_BUDDHA			16
+
+// The following properties correspond to powers given by certain items
+#define PROP_INVULNERABILITY		5
+#define PROP_STRENGTH			6
+#define PROP_INVISIBILITY		7
+#define PROP_RADIATIONSUIT		8
+#define PROP_ALLMAP			9
+#define PROP_INFRARED			10
+#define PROP_WEAPONLEVEL2		11
+#define PROP_FLIGHT			12
+#define PROP_SPEED			15
+
+// Player input -------------------------------------------------------------
+
+// These are the original inputs sent by the player.
+#define INPUT_OLDBUTTONS		0
+#define INPUT_BUTTONS			1
+#define INPUT_PITCH				2
+#define INPUT_YAW				3
+#define INPUT_ROLL				4
+#define INPUT_FORWARDMOVE		5
+#define INPUT_SIDEMOVE			6
+#define INPUT_UPMOVE			7
+
+// These are the inputs, as modified by P_PlayerThink().
+// Most of the time, these will match the original inputs, but
+// they can be different if a player is frozen or using a
+// chainsaw.
+#define MODINPUT_OLDBUTTONS		8
+#define MODINPUT_BUTTONS		9
+#define MODINPUT_PITCH			10
+#define MODINPUT_YAW			11
+#define MODINPUT_ROLL			12
+#define MODINPUT_FORWARDMOVE	13
+#define MODINPUT_SIDEMOVE		14
+#define MODINPUT_UPMOVE			15
+
+// Player buttons -----------------------------------------------------------
+
+#define BT_ATTACK				1
+#define BT_USE					2
+#define BT_JUMP					4
+#define BT_CROUCH				8
+#define BT_TURN180				16
+#define BT_ALTATTACK			32
+#define BT_RELOAD				64
+#define BT_ZOOM					128
+
+#define BT_SPEED				256
+#define BT_STRAFE				512
+
+#define BT_MOVERIGHT			1024
+#define BT_MOVELEFT				2048
+#define BT_BACK					4096
+#define BT_FORWARD				8192
+#define BT_RIGHT				16384
+#define BT_LEFT					32768
+#define BT_LOOKUP				65536
+#define BT_LOOKDOWN				131072
+#define BT_MOVEUP				262144
+#define BT_MOVEDOWN				524288
+#define BT_SHOWSCORES			1048576
+
+// Do whatever you want with these.
+#define BT_USER1				2097152
+#define BT_USER2				4194304
+#define BT_USER3				8388608
+#define BT_USER4				16777216
+
+// Text colors --------------------------------------------------------------
+
+#define CR_UNTRANSLATED         -1
+#define CR_BRICK                0
+#define CR_TAN                  1
+#define CR_GRAY                 2
+#define CR_GREY                 2
+#define CR_GREEN                3
+#define CR_BROWN                4
+#define CR_GOLD                 5
+#define CR_RED                  6
+#define CR_BLUE                 7
+#define CR_ORANGE               8
+#define CR_WHITE                9
+#define CR_YELLOW               10
+#define CR_BLACK				12
+#define CR_LIGHTBLUE			13
+#define CR_CREAM				14
+#define CR_OLIVE				15
+#define CR_DARKGREEN			16
+#define CR_DARKRED				17
+#define CR_DARKBROWN			18
+#define CR_PURPLE				19
+#define CR_DARKGRAY				20
+#define CR_DARKGREY				20
+#define CR_CYAN					21
+
+// HUD message types --------------------------------------------------------
+
+#define HUDMSG_PLAIN		0
+#define HUDMSG_FADEOUT		1
+#define HUDMSG_TYPEON		2
+#define HUDMSG_FADEINOUT	3
+
+// OR this with one of the above to log the hudmessage to the console.
+// i.e. instead of HUDMSG_PLAIN, you can use HUDMSG_PLAIN | HUDMSG_LOG
+#define HUDMSG_LOG					0x80000000
+
+// OR this with one of the above if the color you passed is a string
+// instead of one of the CR_ constants.
+#define HUDMSG_COLORSTRING			0x40000000
+
+// OR this with one of the above to use additive blending when drawing the
+// HUD message.
+#define HUDMSG_ADDBLEND				0x20000000
+
+// OR this with one of the above to use the extra alpha parameter
+#define HUDMSG_ALPHA				0x10000000
+
+// Or this with one of the above to not wrap lines
+#define HUDMSG_NOWRAP				0x08000000
+
+// HUD message layers; these are not flags
+#define HUDMSG_LAYER_OVERHUD		0x00000000
+#define HUDMSG_LAYER_UNDERHUD		0x00001000
+#define HUDMSG_LAYER_OVERMAP		0x00002000
+
+// HUD message visibility flags
+#define HUDMSG_NOTWITH3DVIEW		0x00010000
+#define HUDMSG_NOTWITHFULLMAP		0x00020000
+#define HUDMSG_NOTWITHOVERLAYMAP	0x00040000
+
+
+// "Scripted" Marine weapon types -------------------------------------------
+
+#define MARINEWEAPON_Dummy		0
+#define MARINEWEAPON_Fist		1
+#define MARINEWEAPON_BerserkFist	2
+#define MARINEWEAPON_Chainsaw		3
+#define MARINEWEAPON_Pistol		4
+#define MARINEWEAPON_Shotgun		5
+#define MARINEWEAPON_SuperShotgun	6
+#define MARINEWEAPON_Chaingun		7
+#define MARINEWEAPON_RocketLauncher	8
+#define MARINEWEAPON_PlasmaRifle	9
+#define MARINEWEAPON_Railgun		10
+#define MARINEWEAPON_BFG		11
+
+// Actor properties you can get/set -----------------------------------------
+
+#define APROP_Health		0
+#define APROP_Speed			1
+#define APROP_Damage		2
+#define APROP_Alpha			3
+#define APROP_RenderStyle	4
+#define APROP_SeeSound		5	// Sounds can only be set, not gotten
+#define APROP_AttackSound	6
+#define APROP_PainSound		7
+#define APROP_DeathSound	8
+#define APROP_ActiveSound	9
+#define APROP_Ambush		10
+#define APROP_Invulnerable	11
+#define APROP_JumpZ			12
+#define APROP_ChaseGoal		13
+#define APROP_Frightened	14
+#define APROP_Gravity		15
+#define APROP_Friendly		16
+#define APROP_SpawnHealth	17
+#define APROP_Dropped		18
+#define APROP_Notarget		19
+#define APROP_Species		20
+#define APROP_Nametag		21
+#define APROP_Score			22
+#define APROP_Notrigger		23
+#define APROP_DamageFactor	24
+#define APROP_MasterTID 	25
+#define APROP_TargetTID 	26
+#define APROP_TracerTID 	27
+#define APROP_Waterlevel	28
+#define APROP_ScaleX        29
+#define APROP_ScaleY        30
+#define APROP_Dormant		31
+#define APROP_Mass			32
+#define APROP_Accuracy      33
+#define APROP_Stamina       34
+#define APROP_Height		35
+#define APROP_Radius		36
+#define APROP_Reactiontime	37
+#define APROP_MeleeRange	38
+#define APROP_ViewHeight	39
+#define APROP_AttackZOffset	40
+#define APROP_StencilColor	41
+#define APROP_Friction		42
+#define APROP_DamageMultiplier	43
+
+// Render Styles ------------------------------------------------------------
+
+#define STYLE_None			0	// Do not draw
+#define STYLE_Normal		1	// Normal; just copy the image to the screen
+#define STYLE_Fuzzy			2	// Draw silhouette using "fuzz" effect
+#define STYLE_SoulTrans		3	// Draw translucent with amount in r_transsouls
+#define STYLE_OptFuzzy		4	// Draw as fuzzy, translucent or shadow, based on user preference
+#define STYLE_Stencil		5	// Draw as solid color
+#define STYLE_AddStencil	6	// Draw as additive solid color
+#define STYLE_AddShaded		7	// 
+#define STYLE_Translucent	64	// Draw translucent
+#define STYLE_Add			65	// Draw additive
+#define STYLE_Shaded		66	// 
+#define STYLE_TranslucentStencil 67
+#define STYLE_Shadow		68	// Draw dark translucent stencil
+#define STYLE_Subtract  69  // Draw subtractive
+
+// Properties you can use with GetLevelInfo() -------------------------------
+
+#define LEVELINFO_PAR_TIME		0
+#define LEVELINFO_CLUSTERNUM		1
+#define LEVELINFO_LEVELNUM		2
+#define LEVELINFO_TOTAL_SECRETS		3
+#define LEVELINFO_FOUND_SECRETS		4
+#define LEVELINFO_TOTAL_ITEMS		5
+#define LEVELINFO_FOUND_ITEMS		6
+#define LEVELINFO_TOTAL_MONSTERS	7
+#define LEVELINFO_KILLED_MONSTERS	8
+#define LEVELINFO_SUCK_TIME		9
+
+// Properties you can use with GetPlayerInfo() ------------------------------
+
+#define PLAYERINFO_TEAM			0
+#define PLAYERINFO_AIMDIST		1
+#define PLAYERINFO_COLOR		2
+#define PLAYERINFO_GENDER		3
+#define PLAYERINFO_NEVERSWITCH	4
+#define PLAYERINFO_MOVEBOB		5
+#define PLAYERINFO_STILLBOB		6
+#define PLAYERINFO_PLAYERCLASS	7
+#define PLAYERINFO_FOV			8
+#define PLAYERINFO_DESIREDFOV	9
+
+
+// Flags for ReplaceTextures ------------------------------------------------
+
+#define NOT_BOTTOM				1
+#define NOT_MIDDLE				2
+#define NOT_TOP					4
+#define NOT_FLOOR				8
+#define NOT_CEILING				16
+
+// Flags for SectorDamage ---------------------------------------------------
+
+#define DAMAGE_PLAYERS				1
+#define DAMAGE_NONPLAYERS			2
+#define DAMAGE_IN_AIR				4
+#define DAMAGE_SUBCLASSES_PROTECT	8
+
+// Flags for MorphActor -----------------------------------------------------
+
+#define MRF_OLDEFFECTS			0x00000000
+#define MRF_ADDSTAMINA			0x00000001
+#define MRF_FULLHEALTH			0x00000002
+#define MRF_UNDOBYTOMEOFPOWER	0x00000004
+#define MRF_UNDOBYCHAOSDEVICE	0x00000008
+#define MRF_FAILNOTELEFRAG		0x00000010
+#define MRF_FAILNOLAUGH			0x00000020
+#define MRF_WHENINVULNERABLE	0x00000040
+#define MRF_LOSEACTUALWEAPON	0x00000080
+#define MRF_NEWTIDBEHAVIOUR		0x00000100
+#define MRF_UNDOBYDEATH			0x00000200
+#define MRF_UNDOBYDEATHFORCED	0x00000400
+#define MRF_UNDOBYDEATHSAVES	0x00000800
+
+// Shared spawnable things from Hexen. You can spawn these in the other -----
+// games if you provide sprites for them, otherwise they'll be invisible. ---
+
+#define T_ROCK1                 41
+#define T_ROCK2                 42
+#define T_ROCK3                 43
+#define T_DIRT1                 44
+#define T_DIRT2                 45
+#define T_DIRT3                 46
+#define T_DIRT4                 47
+#define T_DIRT5                 48
+#define T_DIRT6                 49
+#define T_STAINEDGLASS1         54
+#define T_STAINEDGLASS2         55
+#define T_STAINEDGLASS3         56
+#define T_STAINEDGLASS4         57
+#define T_STAINEDGLASS5         58
+#define T_STAINEDGLASS6         59
+#define T_STAINEDGLASS7         60
+#define T_STAINEDGLASS8         61
+#define T_STAINEDGLASS9         62
+#define T_STAINEDGLASS0         63
+
+// Doom Spawnable things (used for thingcount() and thing spawners) ---------
+
+#define T_NONE                  0
+#define T_SHOTGUY               1
+#define T_CHAINGUY              2
+#define T_BARON                 3
+#define T_ZOMBIE                4
+#define T_IMP                   5
+#define T_ARACHNOTRON           6
+#define T_SPIDERMASTERMIND      7
+#define T_DEMON                 8
+#define T_SPECTRE               9
+#define T_IMPFIREBALL           10
+#define T_CLIP                  11
+#define T_SHELLS                12
+#define T_CACODEMON             19
+#define T_REVENANT              20
+#define T_BRIDGE                21
+#define T_ARMORBONUS            22
+#define T_STIMPACK              23
+#define T_MEDKIT                24
+#define T_SOULSPHERE            25
+#define T_SHOTGUN               27
+#define T_CHAINGUN              28
+#define T_ROCKETLAUNCHER        29
+#define T_PLASMAGUN             30
+#define T_BFG                   31
+#define T_CHAINSAW              32
+#define T_SUPERSHOTGUN          33
+#define T_PLASMABOLT            51
+#define T_TRACER                53
+#define T_GREENARMOR            68
+#define T_BLUEARMOR             69
+#define T_CELL                  75
+#define T_BLUEKEYCARD           85
+#define T_REDKEYCARD            86
+#define T_YELLOWKEYCARD         87
+#define T_YELLOWSKULLKEY        88
+#define T_REDSKULLKEY           89
+#define T_BLUESKULLKEY          90
+#define T_TEMPLARGEFLAME        98
+#define T_STEALTHBARON          100
+#define T_STEALTHKNIGHT         101
+#define T_STEALTHZOMBIE         102
+#define T_STEALTHSHOTGUY        103
+
+#define T_LOSTSOUL              110
+#define T_VILE                  111
+#define T_MANCUBUS              112
+#define T_HELLKNIGHT            113
+#define T_CYBERDEMON            114
+#define T_PAINELEMENTAL         115
+#define T_WOLFSS                116
+#define T_STEALTHARACHNOTRON    117
+#define T_STEALTHVILE           118
+#define T_STEALTHCACODEMON      119
+#define T_STEALTHCHAINGUY       120
+#define T_STEALTHSERGEANT       121
+#define T_STEALTHIMP            122
+#define T_STEALTHMANCUBUS       123
+#define T_STEALTHREVENANT       124
+#define T_BARREL                125
+#define T_CACODEMONSHOT         126
+#define T_ROCKET                127
+#define T_BFGSHOT               128
+#define T_ARACHNOTRONPLASMA     129
+#define T_BLOOD                 130
+#define T_PUFF                  131
+#define T_MEGASPHERE            132
+#define T_INVULNERABILITY       133
+#define T_BERSERK               134
+#define T_INVISIBILITY          135
+#define T_IRONFEET              136
+#define T_COMPUTERMAP           137
+#define T_LIGHTAMP              138
+#define T_AMMOBOX               139
+#define T_ROCKETAMMO            140
+#define T_ROCKETBOX             141
+#define T_BATTERY               142
+#define T_SHELLBOX              143
+#define T_BACKPACK              144
+#define T_GUTS                  145
+#define T_BLOODPOOL             146
+#define T_BLOODPOOL1            147
+#define T_BLOODPOOL2            148
+#define T_FLAMINGBARREL         149
+#define T_BRAINS                150
+#define T_SCRIPTEDMARINE	151
+#define T_HEALTHBONUS           152
+#define T_MANCUBUSSHOT		153
+#define T_BARONBALL		154
+
+// Heretic Spawnable things (used for thingcount() and thing spawners) ------
+
+#define T_CLINK                 1
+#define T_MUMMYLEADER           2
+#define T_BEAST                 3
+#define T_MUMMY                 4
+//#define T_IMP                 5   // Defined above
+#define T_KNIGHT                6
+#define T_IMPLEADER             7
+#define T_MUMMYGHOST            8
+#define T_MUMMYLEADERGHOST      9
+//#define T_IMPFIREBALL         10
+#define T_WIMPYWANDAMMO         11
+#define T_HEFTYWANDAMMO         12
+#define T_ITEMEGG               14
+#define T_ITEMFLIGHT            15
+#define T_ITEMTELEPORT          18
+#define T_WIZARD                19
+#define T_IRONLICH              20
+#define T_ITEMHEALTHPOTION      23
+#define T_ITEMHEALTHFLASH       24	// incorrect name but keep it for compatibility
+#define T_ITEMHEALTHFLASK       24
+#define T_ITEMHEALTHFULL        25
+#define T_CROSSBOW              27
+#define T_BLASTER               28
+#define T_PHOENIXROD            29
+#define T_SKULLROD              30
+#define T_MACE                  31
+#define T_GAUNTLETS             32
+#define T_WIMPYCROSSBOWAMMO     33
+#define T_HEFTYCROSSBOWAMMO     34
+#define T_WIMPYMACEAMMO         35
+#define T_HEFTYMACEAMMO         36
+#define T_WIMPYBLASTERAMMO      37
+#define T_HEFTYBLASTERAMMO      38
+#define T_MORPHBLAST            40
+#define T_SHIELD1               68
+#define T_SHIELD2               69
+#define T_ITEMTIMEBOMB          72
+#define T_ITEMTORCH             73
+#define T_BLUEKEY               85
+#define T_GREENKEY              86
+#define T_YELLOWKEY             87
+
+#define T_SOUND_WIND            110
+#define T_SOUND_WATERFALL       111
+
+#define T_BEASTBALL             120
+#define T_FEATHER               121
+#define T_CHICKEN               122
+#define T_VOLCANOBALL           123
+#define T_TINYVOLCANOBALL       124
+#define T_POD                   125
+#define T_PODGENERATOR          126
+#define T_KNIGHTAXE             127
+#define T_KNIGHTBLOODAXE        128
+#define T_KNIGHTGHOST           129
+#define T_MUMMYHEAD             131
+#define T_SNAKE                 132
+#define T_ITEMINVULNERABILITY   133
+#define T_ITEMTOME              134
+#define T_ITEMINVISIBILITY      135
+#define T_ITEMBAGOFHOLDING      136
+#define T_ITEMALLMAP            137
+#define T_SNAKEPROJECTILE       138
+#define T_SNAKEPROJECTILEBIG    139
+#define T_WIZARDSHOT            140
+
+#define T_DSPARILTELEPORTDEST   141
+#define T_DSPARILONSERPENT      142
+#define T_DSPARILALONE          143
+#define T_SERPENTFIREBALL       144
+#define T_DSPARILBLUESHOT       145
+#define T_DSPARILWIZARDSPAWNER  146
+
+#define T_CROSSBOWMAINBLAST     147
+#define T_CROSSBOWMINIBLAST     148
+#define T_CROSSBOWPOWERBLAST    149
+#define T_VOLCANO               150
+#define T_POWERWANDMINIBLAST    151
+#define T_POWERWANDBIGGERBLAST  152
+#define T_DEATHBALL             153
+#define T_NOGRAVITYMACEBALL     154
+#define T_BOUNCYMACEBALL        155
+#define T_HEAVYMACEBALL         156
+#define T_RIPPER                157
+#define T_WIMPYSKULLRODAMMO     158
+#define T_HEFTYSKULLRODAMMO     159
+#define T_SKULLRODBLAST         160
+#define T_WIMPYPHOENIXRODAMMO   161
+#define T_HEFTYPHOENIXRODAMMO   162
+#define T_PHOENIXSHOT           163
+#define T_IRONLICHBLUESHOT      164
+#define T_WHIRLWIND             165
+#define T_REDTELEGLITTER        166
+#define T_BLUETELEGLITTER       167
+
+// Hexen Spawnable things (used for thingcount() and thing spawners) ------
+
+#define T_CENTAUR				1
+#define T_CENTAURLEADER			2
+#define T_DEMON1				3
+#define T_ETTIN					4
+#define T_FIREGARGOYLE			5
+#define T_WATERLURKER			6
+#define T_WATERLURKERLEADER		7
+#define T_WRAITH				8
+#define T_WRAITHBURIED			9
+#define T_FIREBALL1				10
+#define T_MANA1					11
+#define T_MANA2					12
+#define T_ITEMBOOTS				13
+#define T_ITEMPORK				14
+#define T_ITEMSUMMON			16
+#define T_ITEMTPORTOTHER		17
+#define T_BISHOP				19
+#define T_ICEGOLEM				20
+#define T_DRAGONSKINBRACERS		22
+#define T_ITEMBOOSTMANA			26
+#define T_FIGHTERAXE			27
+#define T_FIGHTERHAMMER			28
+#define T_FIGHTERSWORD1			29
+#define T_FIGHTERSWORD2			30
+#define T_FIGHTERSWORD3			31
+#define T_CLERICSTAFF			32
+#define T_CLERICHOLY1			33
+#define T_CLERICHOLY2			34
+#define T_CLERICHOLY3			35
+#define T_MAGESHARDS			36
+#define T_MAGESTAFF1			37
+#define T_MAGESTAFF2			38
+#define T_MAGESTAFF3			39
+#define T_ARROW					50
+#define T_DART					51
+#define T_POISONDART			52
+#define T_RIPPERBALL			53
+#define T_BLADE					64
+#define T_ICESHARD				65
+#define T_FLAME_SMALL			66
+#define T_FLAME_LARGE			67
+#define T_MESHARMOR				68
+#define T_FALCONSHIELD			69
+#define T_PLATINUMHELM			70
+#define T_AMULETOFWARDING		71
+#define T_ITEMFLECHETTE			72
+#define T_ITEMREPULSION			74
+#define T_MANA3					75
+#define T_PUZZSKULL				76
+#define T_PUZZGEMBIG			77
+#define T_PUZZGEMRED			78
+#define T_PUZZGEMGREEN1			79
+#define T_PUZZGEMGREEN2			80
+#define T_PUZZGEMBLUE1			81
+#define T_PUZZGEMBLUE2			82
+#define T_PUZZBOOK1				83
+#define T_PUZZBOOK2				84
+#define T_METALKEY				85
+#define T_SMALLMETALKEY			86
+#define T_AXEKEY				87
+#define T_FIREKEY				88
+#define T_EMERALDKEY			89
+#define T_MACEKEY				90
+#define T_SILVERKEY				91
+#define T_RUSTYKEY				92
+#define T_HORNKEY				93
+#define T_SERPENTKEY			94
+#define T_WATERDRIP				95
+#define T_TEMPSMALLFLAME		96
+#define T_PERMSMALLFLAME		97
+#define T_PERMLARGEFLAME		99
+#define T_DEMON_MASH			100
+#define T_DEMON2_MASH			101
+#define T_ETTIN_MASH			102
+#define T_CENTAUR_MASH			103
+#define T_THRUSTSPIKEUP			104
+#define T_THRUSTSPIKEDOWN		105
+#define T_FLESH_DRIP1			106
+#define T_FLESH_DRIP2			107
+#define T_SPARK_DRIP			108
+
+
+// Flags returned by ClassifyActor
+
+#define ACTOR_NONE				0
+#define ACTOR_WORLD				1
+#define ACTOR_PLAYER			2
+#define ACTOR_BOT				4
+#define ACTOR_VOODOODOLL		8
+#define ACTOR_MONSTER			16
+#define ACTOR_ALIVE				32
+#define ACTOR_DEAD				64
+#define ACTOR_MISSILE			128
+#define ACTOR_GENERIC			256
+
+
+// Physical volumes for SoundSequenceOnSector
+
+#define SECSEQ_FLOOR			1
+#define SECSEQ_CEILING			2
+#define SECSEQ_FULLHEIGHT		3
+#define SECSEQ_INTERIOR			4
+
+// Channels for PlaySound and StopSound
+
+#define CHAN_AUTO				0
+#define CHAN_WEAPON				1
+#define CHAN_VOICE				2
+#define CHAN_ITEM				3
+#define CHAN_BODY				4
+#define CHAN_5					5
+#define CHAN_6					6
+#define CHAN_7					7
+
+// Modifier flags for PlaySound
+
+#define CHAN_LISTENERZ			8
+#define CHAN_MAYBE_LOCAL		16
+#define CHAN_UI					32
+#define CHAN_NOPAUSE			64
+
+// Standard attenuation values for PlaySound
+
+#define ATTN_NONE				0		// full volume the entire level
+#define ATTN_NORM				1.0
+#define ATTN_IDLE				1.001
+#define ATTN_STATIC				3.0		// dimish very rapidly with distance
+
+// Identifiers for PlayActorSound
+
+#define SOUND_See				0
+#define SOUND_Attack			1
+#define SOUND_Pain				2
+#define SOUND_Death				3
+#define SOUND_Active			4
+#define SOUND_Use				5
+#define SOUND_Bounce			6
+#define SOUND_WallBounce		7
+#define SOUND_CrushPain			8
+#define SOUND_Howl				9
+
+// Flags for SpawnDecal
+
+#define SDF_ABSANGLE			1
+#define SDF_PERMANENT			2
+
+// Actor pointer selectors
+
+#DEFINE	AAPTR_DEFAULT 0
+#DEFINE	AAPTR_NULL 0x1
+#DEFINE	AAPTR_TARGET 0x2
+#DEFINE	AAPTR_MASTER 0x4
+#DEFINE	AAPTR_TRACER 0x8
+
+#DEFINE	AAPTR_PLAYER_GETTARGET 0x10
+#DEFINE	AAPTR_PLAYER_GETCONVERSATION 0x20
+
+#DEFINE	AAPTR_PLAYER1 0x40
+#DEFINE	AAPTR_PLAYER2 0x80
+#DEFINE	AAPTR_PLAYER3 0x100
+#DEFINE	AAPTR_PLAYER4 0x200
+#DEFINE	AAPTR_PLAYER5 0x400
+#DEFINE	AAPTR_PLAYER6 0x800
+#DEFINE	AAPTR_PLAYER7 0x1000
+#DEFINE	AAPTR_PLAYER8 0x2000
+
+#DEFINE AAPTR_FRIENDPLAYER 0x4000
+#DEFINE AAPTR_GET_LINETARGET 0x8000
+
+// Actor pointer operation flags
+
+#DEFINE PTROP_UNSAFETARGET 1
+#DEFINE PTROP_UNSAFEMASTER 2
+#DEFINE PTROP_NOSAFEGUARDS PTROP_UNSAFETARGET |PTROP_UNSAFEMASTER 
+
+// Line activation flags
+
+#define SPAC_Cross			1		// when player crosses line
+#define SPAC_Use			2		// when player uses line
+#define SPAC_MCross			4		// when monster crosses line
+#define SPAC_Impact			8		// when projectile hits line
+#define SPAC_Push			16		// when player pushes line
+#define SPAC_PCross			32		// when projectile crosses line
+#define SPAC_UseThrough		64		// when player uses line (doesn't block)
+#define SPAC_AnyCross		128		// when anything without the TELEPORT flag crosses the line
+#define SPAC_MUse			256		// monsters can use
+#define SPAC_MPush			512		// monsters can push
+#define SPAC_UseBack		1024	// can be used from the back side
+
+#define SPAC_None			0
+
+// GetArmorInfo
+
+#define ARMORINFO_CLASSNAME		0
+#define ARMORINFO_SAVEAMOUNT		1
+#define ARMORINFO_SAVEPERCENT		2
+#define ARMORINFO_MAXABSORB		3
+#define ARMORINFO_MAXFULLABSORB		4
+#define ARMORINFO_ACTUALSAVEAMOUNT	5
+
+// ==========================================================================
+// Skulltag Definitions
+// ==========================================================================
+
+// Skulltag Teams -----------------------------------------------------------
+#define TEAM_BLUE				0
+#define TEAM_RED				1
+#define NO_TEAM					2
+
+// Team properties ----------------------------------------------------------
+#define TPROP_Name				0
+#define TPROP_Score				1
+#define TPROP_IsValid			2
+#define TPROP_NumPlayers		3
+#define TPROP_NumLivePlayers	4
+#define TPROP_TextColor			5
+#define TPROP_PlayerStartNum	6
+#define TPROP_Spread			7
+#define TPROP_Carrier			8
+#define TPROP_Assister			9
+#define TPROP_FragCount			10
+#define TPROP_DeathCount		11
+#define TPROP_WinCount			12
+#define TPROP_PointCount		13
+#define TPROP_ReturnTics		14
+#define TPROP_TeamItem			15
+#define TPROP_WinnerTheme		16
+#define TPROP_LoserTheme		17
+
+// Skulltag Invasion --------------------------------------------------------
+#define IS_WAITINGFORPLAYERS	0
+#define IS_FIRSTCOUNTDOWN		1
+#define IS_INPROGRESS			2
+#define IS_BOSSFIGHT			3
+#define IS_WAVECOMPLETE			4
+#define IS_COUNTDOWN			5
+
+
+#define T_GRENADE				216
+#define T_BFG10KSHOT			217
+#define T_DARKIMPFIREBALL		218
+#define T_CACOLANTERNSHOT		219
+#define T_ABADDONSHOT			221
+
+// Skulltag Monsters --------------------------------------------------------
+#define T_DARKIMP				155
+#define T_BLOODDEMON			156
+#define T_SSGGUY				157
+#define T_HECTEBUS				158
+#define T_CACOLANTERN			159
+#define T_BELPHEGOR				215
+#define T_ABADDON				220
+
+// Skulltag Weapons ---------------------------------------------------------
+#define T_PISTOL				162
+#define T_GRENADELAUNCHER		163
+#define T_RAILGUN				164
+#define T_BFG10000				165
+#define T_MINIGUN				214
+
+// Skulltag Armor/Health Items ----------------------------------------------
+#define T_MAXHEALTHBONUS		166
+#define T_MAXARMORBONUS			167
+#define T_REDARMOR				168
+
+// Skulltag Powerups --------------------------------------------------------
+#define T_TURBOSPHERE			169
+#define T_ANTIGRAVBELT			170
+#define T_TIMEFREEZER			171
+#define T_INFRAGOGGLES			172
+#define T_INFRATRACKER			173
+#define T_TRANSLUCENCY			174
+#define T_DOOMSPHERE			175
+#define T_RANDOMPOWERUP			176
+
+// Skulltag Flags -----------------------------------------------------------
+#define T_BLUEFLAG				177
+#define T_REDFLAG				178
+#define T_WHITEFLAG				179
+
+// Skulltag Runes -----------------------------------------------------------
+#define T_STRENGTH				180
+#define T_RAGE					181
+#define T_DRAIN					182
+#define T_SPREAD				183
+#define T_RESISTANCE			184
+#define T_REGENERATION			185
+#define T_PROSPERITY			186
+#define T_REFLECTION			187
+#define T_HIGHJUMP				188
+#define T_HASTE					189
+
+// Zandronum database additions ---------------------------------------------
+#define DB_ORDER_ASC			0
+#define DB_ORDER_DESC			1
+
+// Events when you have input grabbed
+
+#define EV_KeyDown				1	// data1: unshifted ASCII, data2: shifted ASCII
+#define EV_KeyRepeat			2	// data1: unshifted ASCII, data2: shifted ASCII
+#define EV_KeyUp				3	// data1: unshifted ASCII, data2: shifted ASCII
+#define EV_Char					4	// data1: translated character for text input
+#define EV_MouseMove			5	// data1: x, data2: y
+#define EV_LButtonDown			6
+#define EV_LButtonUp			7
+#define EV_LButtonDblClick		8
+#define EV_MButtonDown			9
+#define EV_MButtonUp			10
+#define EV_MButtonDblClick		11
+#define EV_RButtonDown			12
+#define EV_RButtonUp			13
+#define EV_RButtonDblClick		14
+#define EV_WheelDown			15
+#define EV_WheelUp				16
+
+// Key modifiers (or'd with event type)
+
+#define GKM_SHIFT				256
+#define GKM_CTRL				512
+#define GKM_ALT					1024
+
+// Button modifiers are only valid for EV_MouseMove events
+
+#define GKM_LBUTTON				2048
+#define GKM_MBUTTON				4096
+#define GKM_RBUTTON				8192
+
+// Special codes for some GUI keys, including a few real ASCII codes.
+
+#define GK_PGDN			1
+#define GK_PGUP			2
+#define GK_HOME			3
+#define GK_END			4
+#define GK_LEFT			5
+#define GK_RIGHT		6
+#define GK_ALERT		7		// ASCII bell
+#define GK_BACKSPACE	8		// ASCII
+#define GK_TAB			9		// ASCII
+#define GK_LINEFEED		10		// ASCII
+#define GK_DOWN			10
+#define GK_VTAB			11		// ASCII
+#define GK_UP			11
+#define GK_FORMFEED		12		// ASCII
+#define GK_RETURN		13		// ASCII
+#define GK_F1			14
+#define GK_F2			15
+#define GK_F3			16
+#define GK_F4			17
+#define GK_F5			18
+#define GK_F6			19
+#define GK_F7			20
+#define GK_F8			21
+#define GK_F9			22
+#define GK_F10			23
+#define GK_F11			24
+#define GK_F12			25
+#define GK_DEL			26
+#define GK_ESCAPE		27		// ASCII
+#define GK_FREE1		28
+#define GK_FREE2		29
+#define GK_FREE3		30
+#define GK_CESCAPE		31		// color escape
+
+#define CHANGELEVEL_KEEPFACING 1
+#define CHANGELEVEL_RESETINVENTORY 2
+#define CHANGELEVEL_NOMONSTERS 4
+#define CHANGELEVEL_CHANGESKILL 8
+#define CHANGELEVEL_NOINTERMISSION 16
+#define CHANGELEVEL_RESETHEALTH	32
+#define CHANGELEVEL_PRERAISEWEAPON 64
+
+#define NO_CHANGE 32767.0
+
+#define SECF_SILENT 1
+#define SECF_NOFALLINGDAMAGE 2
+#define SECF_FLOORDROP 4
+#define SECF_NORESPAWN 8
+
+#define BLOCKF_CREATURES 1
+#define BLOCKF_MONSTERS 2
+#define BLOCKF_PLAYERS 4
+#define BLOCKF_FLOATERS 8
+#define BLOCKF_PROJECTILES 16
+#define BLOCKF_EVERYTHING 32
+#define BLOCKF_RAILING 64
+#define BLOCKF_USE 128
+#define BLOCKF_SIGHT 256
+#define BLOCKF_HITSCAN 512
+
+#define FOGP_DENSITY 0
+#define FOGP_OUTSIDEDENSITY 1
+#define FOGP_SKYFOG 2
+
+#define PRINTNAME_LEVELNAME -1
+#define PRINTNAME_LEVEL -2
+#define PRINTNAME_SKILL -3
+
+#define CSF_NOFAKEFLOORS 1
+#define CSF_NOBLOCKALL 2
+
+#define FHF_NORANDOMPUFFZ	1
+#define FHF_NOIMPACTDECAL	2
+
+// PickActor flags
+
+#define	PICKAF_FORCETID			1
+#define	PICKAF_RETURNTID		2
+
+// magic value to set the ice translation through ACS
+#define TRANSLATION_ICE 0x100007
+
+// Actor flags
+#define MF_SPECIAL          0x00000001
+#define MF_SOLID            0x00000002
+#define MF_SHOOTABLE        0x00000004
+#define MF_NOSECTOR         0x00000008
+#define MF_NOBLOCKMAP       0x00000010
+#define MF_AMBUSH           0x00000020
+#define MF_JUSTHIT          0x00000040
+#define MF_JUSTATTACKED     0x00000080
+#define MF_SPAWNCEILING     0x00000100
+#define MF_NOGRAVITY        0x00000200
+#define MF_DROPOFF          0x00000400
+#define MF_PICKUP           0x00000800
+#define MF_NOCLIP           0x00001000
+#define MF_INCHASE          0x00002000
+#define MF_FLOAT            0x00004000
+#define MF_TELEPORT         0x00008000
+#define MF_MISSILE          0x00010000
+#define MF_DROPPED          0x00020000
+#define MF_SHADOW           0x00040000
+#define MF_NOBLOOD          0x00080000
+#define MF_CORPSE           0x00100000
+#define MF_INFLOAT          0x00200000
+#define MF_INBOUNCE         0x00200000
+#define MF_COUNTKILL        0x00400000
+#define MF_COUNTITEM        0x00800000
+#define MF_SKULLFLY         0x01000000
+#define MF_NOTDMATCH        0x02000000
+#define MF_SPAWNSOUNDSOURCE 0x04000000
+#define MF_FRIENDLY         0x08000000
+#define MF_UNMORPHED        0x10000000
+#define MF_NOLIFTDROP       0x20000000
+#define MF_STEALTH          0x40000000
+#define MF_ICECORPSE        0x80000000
+
+// Linedef flags
+#define ML_BLOCKING            0x00000001
+#define ML_BLOCKMONSTERS       0x00000002
+#define ML_TWOSIDED            0x00000004
+#define ML_DONTPEGTOP          0x00000008
+#define ML_DONTPEGBOTTOM       0x00000010
+#define ML_SECRET              0x00000020
+#define ML_SOUNDBLOCK          0x00000040
+#define ML_DONTDRAW            0x00000080
+#define ML_MAPPED              0x00000100
+#define ML_REPEAT_SPECIAL      0x00000200
+#define ML_ADDTRANS            0x00000400
+#define ML_MONSTERSCANACTIVATE 0x00002000
+#define ML_BLOCK_PLAYERS       0x00004000
+#define ML_BLOCKEVERYTHING     0x00008000
+#define ML_ZONEBOUNDARY        0x00010000
+#define ML_RAILING             0x00020000
+#define ML_BLOCK_FLOATERS      0x00040000
+#define ML_CLIP_MIDTEX         0x00080000
+#define ML_WRAP_MIDTEX         0x00100000
+#define ML_3DMIDTEX            0x00200000
+#define ML_CHECKSWITCHRANGE    0x00400000
+#define ML_FIRSTSIDEONLY       0x00800000
+#define ML_BLOCKPROJECTILE     0x01000000
+#define ML_BLOCKUSE            0x02000000
+#define ML_BLOCKSIGHT          0x04000000
+#define ML_BLOCKHITSCAN        0x08000000
+
+#define QF_RELATIVE		1
+#define QF_SCALEDOWN		1 << 1
+#define QF_SCALEUP		1 << 2
+#define QF_MAX			1 << 3
+#define QF_FULLINTENSITY	1 << 4
+#define QF_WAVE			1 << 5
+
+#define WARPF_ABSOLUTEOFFSET 0x1
+#define WARPF_ABSOLUTEANGLE 0x2
+#define WARPF_USECALLERANGLE 0x4
+#define WARPF_NOCHECKPOSITION 0x8
+#define WARPF_INTERPOLATE 0x10
+#define WARPF_WARPINTERPOLATION 0x20
+#define WARPF_COPYINTERPOLATION 0x40
+#define WARPF_STOP 0x80
+#define WARPF_TOFLOOR 0x100
+#define WARPF_TESTONLY 0x200
+#define WARPF_ABSOLUTEPOSITION 0x400
+#define WARPF_BOB 0x800
+#define WARPF_MOVEPTR 0x1000
+#define WARPF_USEPTR 0x2000
+#define WARPF_COPYVELOCITY 0x4000
+#define WARPF_COPYPITCH 0x8000
diff --git a/Build/Compilers/ZDoom/zspecial.acs b/Build/Compilers/ZDoom/zspecial.acs
new file mode 100644
index 0000000..22e7298
--- /dev/null
+++ b/Build/Compilers/ZDoom/zspecial.acs
@@ -0,0 +1,374 @@
+//**************************************************************************
+//**
+//** zspecials.acs
+//**
+//**************************************************************************
+
+special
+//	  1:Polyobj_StartLine
+	  2:Polyobj_RotateLeft(3),
+	  3:Polyobj_RotateRight(3),
+	  4:Polyobj_Move(4),
+//	  5:Polyobj_ExplicitLine
+	  6:Polyobj_MoveTimes8(4),
+	  7:Polyobj_DoorSwing(4),
+	  8:Polyobj_DoorSlide(5),
+	  9:Line_Horizon(0),
+	 10:Door_Close(2,3),
+	 11:Door_Open(2,3),
+	 12:Door_Raise(3,4),
+	 13:Door_LockedRaise(4,5),
+	 14:Door_Animated(3,4),
+	 15:Autosave(0),
+//	 16:Transfer_WallLight
+	 17:Thing_Raise(1),
+	 18:StartConversation(1,2),
+	 19:Thing_Stop(1),
+	 20:Floor_LowerByValue(3),
+	 21:Floor_LowerToLowest(2),
+	 22:Floor_LowerToNearest(2),
+	 23:Floor_RaiseByValue(3),
+	 24:Floor_RaiseToHighest(2),
+	 25:Floor_RaiseToNearest(2),
+	 26:Stairs_BuildDown(5),
+	 27:Stairs_BuildUp(5),
+	 28:Floor_RaiseAndCrush(3,4),
+	 29:Pillar_Build(3),
+	 30:Pillar_Open(4),
+	 31:Stairs_BuildDownSync(4),
+	 32:Stairs_BuildUpSync(4),
+	 33:ForceField(0),
+	 34:ClearForceField(1),
+	 35:Floor_RaiseByValueTimes8(3),
+	 36:Floor_LowerByValueTimes8(3),
+	 37:Floor_MoveToValue(3,4),
+	 38:Ceiling_Waggle(5),
+	 39:Teleport_ZombieChanger(2),
+	 40:Ceiling_LowerByValue(3),
+	 41:Ceiling_RaiseByValue(3),
+	 42:Ceiling_CrushAndRaise(3,4),
+	 43:Ceiling_LowerAndCrush(3,4),
+	 44:Ceiling_CrushStop(1),
+	 45:Ceiling_CrushRaiseAndStay(3,4),
+	 46:Floor_CrushStop(1),
+	 47:Ceiling_MoveToValue(3,4),
+//	 48:Sector_Attach3dMidtex
+	 49:GlassBreak(0,1),
+//	 50:ExtraFloor_LightOnly
+	 51:Sector_SetLink(4),
+	 52:Scroll_Wall(5),
+	 53:Line_SetTextureOffset(5),
+	 54:Sector_ChangeFlags(3),
+	 55:Line_SetBlocking(3),
+	 56:Line_SetTextureScale(5),
+//	 57: Sector_SetPortal
+//	 58: Sector_CopyScroller
+	 59:Polyobj_OR_MoveToSpot(3),
+	 60:Plat_PerpetualRaise(3),
+ 	 61:Plat_Stop(1),
+	 62:Plat_DownWaitUpStay(3),
+	 63:Plat_DownByValue(4),
+	 64:Plat_UpWaitDownStay(3),
+	 65:Plat_UpByValue(4),
+	 66:Floor_LowerInstant(3),
+	 67:Floor_RaiseInstant(3),
+	 68:Floor_MoveToValueTimes8(4),
+	 69:Ceiling_MoveToValueTimes8(4),
+	 70:Teleport(1,3),
+	 71:Teleport_NoFog(1,4),
+	 72:ThrustThing(2,4),
+	 73:DamageThing(1,2),
+	 74:Teleport_NewMap(2,3),
+	 75:Teleport_EndGame(0),
+	 76:TeleportOther(3),
+	 77:TeleportGroup(5),
+	 78:TeleportInSector(4,5),
+	 79:Thing_SetConversation(2),
+	 80:ACS_Execute(2,5),
+	 81:ACS_Suspend(2),
+	 82:ACS_Terminate(2),
+	 83:ACS_LockedExecute(5),
+	 84:ACS_ExecuteWithResult(1,5),
+	 85:ACS_LockedExecuteDoor(5),
+	 86:Polyobj_MoveToSpot(3),
+	 87:Polyobj_Stop(1),
+	 88:Polyobj_MoveTo(4),
+	 89:Polyobj_OR_MoveTo(4),
+	 90:Polyobj_OR_RotateLeft(3),
+	 91:Polyobj_OR_RotateRight(3),
+	 92:Polyobj_OR_Move(4),
+	 93:Polyobj_OR_MoveTimes8(4),
+	 94:Pillar_BuildAndCrush(4,5),
+	 95:FloorAndCeiling_LowerByValue(3),
+	 96:FloorAndCeiling_RaiseByValue(3),
+	 97:Ceiling_LowerAndCrushDist(3,5),
+	 98:Sector_SetTranslucent(3,4),
+	 99:Floor_RaiseAndCrushDoom(3,4),
+//	100:Scroll_Texture_Left
+//	101:Scroll_Texture_Right
+//	102:Scroll_Texture_Up
+//	103:Scroll_Texture_Down
+	104:Ceiling_CrushAndRaiseSilentDist(4,5),
+
+	109:Light_ForceLightning(1),
+	110:Light_RaiseByValue(2),
+	111:Light_LowerByValue(2),
+	112:Light_ChangeToValue(2),
+	113:Light_Fade(3),
+	114:Light_Glow(4),
+	115:Light_Flicker(3),
+	116:Light_Strobe(5),
+	117:Light_Stop(1),
+//	118:Plane_Copy
+	119:Thing_Damage(2,3),
+	120:Radius_Quake(5),
+//	121:Line_SetIdentification
+	
+	125:Thing_Move(2,3),
+	
+	127:Thing_SetSpecial(5),
+	128:ThrustThingZ(4),
+	129:UsePuzzleItem(0),	// only for setting it on a line. Cannot be called!
+	130:Thing_Activate(1),
+	131:Thing_Deactivate(1),
+	132:Thing_Remove(1),
+	133:Thing_Destroy(1,3),
+	134:Thing_Projectile(5),
+	135:Thing_Spawn(3,4),
+	136:Thing_ProjectileGravity(5),
+	137:Thing_SpawnNoFog(3,4),
+	138:Floor_Waggle(5),
+	139:Thing_SpawnFacing(2,4),
+	140:Sector_ChangeSound(2),
+	
+	143:Player_RemoveItem(2),			// Skulltag Functions
+	144:Player_GiveItem(2),				// Skulltag Functions
+	145:Player_SetTeam(1),				// Skulltag Functions
+	152:Team_Score(2),					// Skulltag Functions
+	153:Team_GivePoints(3),				// Skulltag Functions
+	154:Teleport_NoStop(2, 3),
+
+	157:SetGlobalFogParameter(2),		// GZDoom only!
+	158:FS_Execute(1,4),
+	159:Sector_SetPlaneReflection(3),	// GZDoom only!
+//	160:Sector_Set3DFloor
+//	161:Sector_SetContents
+	
+	168:Ceiling_CrushAndRaiseDist(3,5),
+	169:Generic_Crusher2(5),
+	170:Sector_SetCeilingScale2(3),
+	171:Sector_SetFloorScale2(3),
+	172:Plat_UpNearestWaitDownStay(3),
+	173:NoiseAlert(2),
+	174:SendToCommunicator(4),
+	175:Thing_ProjectileIntercept(5),
+	176:Thing_ChangeTID(2),
+	177:Thing_Hate(2,3),
+	178:Thing_ProjectileAimed(4,5),
+	179:ChangeSkill(1),
+	180:Thing_SetTranslation(2),
+//	181:Plane_Align,
+	182:Line_Mirror(0),
+	183:Line_AlignCeiling(2),
+	184:Line_AlignFloor(2),
+	185:Sector_SetRotation(3),
+	186:Sector_SetCeilingPanning(5),
+	187:Sector_SetFloorPanning(5),
+	188:Sector_SetCeilingScale(5),
+	189:Sector_SetFloorScale(5),
+	191:SetPlayerProperty(3),
+	192:Ceiling_LowerToHighestFloor(2),
+	193:Ceiling_LowerInstant(3),
+	194:Ceiling_RaiseInstant(3),
+	195:Ceiling_CrushRaiseAndStayA(4,5),
+	196:Ceiling_CrushAndRaiseA(4,5),
+	197:Ceiling_CrushAndRaiseSilentA(4,5),
+	198:Ceiling_RaiseByValueTimes8(3),
+	199:Ceiling_LowerByValueTimes8(3),
+	200:Generic_Floor(5),
+	201:Generic_Ceiling(5),
+	202:Generic_Door(5),
+	203:Generic_Lift(5),
+	204:Generic_Stairs(5),
+	205:Generic_Crusher(5),
+	206:Plat_DownWaitUpStayLip(4,5),
+	207:Plat_PerpetualRaiseLip(4),
+	208:TranslucentLine(2,3),
+//	209:Transfer_Heights,
+//	210:Transfer_FloorLight,
+//	211:Transfer_CeilingLight,
+	212:Sector_SetColor(4,5),
+	213:Sector_SetFade(4),
+	214:Sector_SetDamage(3),
+	215:Teleport_Line(2),
+	216:Sector_SetGravity(3),
+	217:Stairs_BuildUpDoom(5),
+	218:Sector_SetWind(4),
+	219:Sector_SetFriction(2),
+	220:Sector_SetCurrent(4),
+	221:Scroll_Texture_Both(5),
+//	222:Scroll_Texture_Model,
+	223:Scroll_Floor(4),
+	224:Scroll_Ceiling(4),
+//	225:Scroll_Texture_Offsets,
+	226:ACS_ExecuteAlways(2,5),
+//	227:PointPush_SetForce,
+	228:Plat_RaiseAndStayTx0(2,3),
+	229:Thing_SetGoal(3,4),
+	230:Plat_UpByValueStayTx(3),
+	231:Plat_ToggleCeiling(1),
+	232:Light_StrobeDoom(3),
+	233:Light_MinNeighbor(1),
+	234:Light_MaxNeighbor(1),
+	235:Floor_TransferTrigger(1),
+	236:Floor_TransferNumeric(1),
+	237:ChangeCamera(3),
+	238:Floor_RaiseToLowestCeiling(2),
+	239:Floor_RaiseByValueTxTy(3),
+	240:Floor_RaiseByTexture(2),
+	241:Floor_LowerToLowestTxTy(2),
+	242:Floor_LowerToHighest(3,4),
+	243:Exit_Normal(1),
+	244:Exit_Secret(1),
+	245:Elevator_RaiseToNearest(2),
+	246:Elevator_MoveToFloor(2),
+	247:Elevator_LowerToNearest(2),
+	248:HealThing(1,2),
+	249:Door_CloseWaitOpen(3, 4),
+	250:Floor_Donut(3),
+	251:FloorAndCeiling_LowerRaise(3,4),
+	252:Ceiling_RaiseToNearest(2),
+	253:Ceiling_LowerToLowest(2),
+	254:Ceiling_LowerToFloor(2),
+	255:Ceiling_CrushRaiseAndStaySilA(4,5),
+	
+	// internal functions have negative values
+	-1:GetLineUDMFInt(2),
+	-2:GetLineUDMFFixed(2),
+	-3:GetThingUDMFInt(2),
+	-4:GetThingUDMFFixed(2),
+	-5:GetSectorUDMFInt(2),
+	-6:GetSectorUDMFFixed(2),
+	-7:GetSideUDMFInt(3),
+	-8:GetSideUDMFFixed(3),
+	-9:GetActorVelX(1),
+	-10:GetActorVelY(1),
+	-11:GetActorVelZ(1),
+	-12:SetActivator(1,2),
+	-13:SetActivatorToTarget(1),
+	-14:GetActorViewHeight(1),
+	-15:GetChar(2),
+	-16:GetAirSupply(1),
+	-17:SetAirSupply(2),
+	-18:SetSkyScrollSpeed(2),
+	-19:GetArmorType(2),
+	-20:SpawnSpotForced(4),
+	-21:SpawnSpotFacingForced(3),
+	-22:CheckActorProperty(3),
+	-23:SetActorVelocity(6),
+	-24:SetUserVariable(3),
+	-25:GetUserVariable(2),
+	-26:Radius_Quake2(6),
+	-27:CheckActorClass(2),
+	-28:SetUserArray(4),
+	-29:GetUserArray(3),
+	-30:SoundSequenceOnActor(2),
+	-31:SoundSequenceOnSector(3),
+	-32:SoundSequenceOnPolyobj(2),
+	-33:GetPolyobjX(1),
+	-34:GetPolyobjY(1),
+	-35:CheckSight(3),
+	-36:SpawnForced(4,6),
+	-37:AnnouncerSound(2),
+	-38:SetPointer(2,4),
+	-39:ACS_NamedExecute(2,5),
+	-40:ACS_NamedSuspend(2),
+	-41:ACS_NamedTerminate(2),
+	-42:ACS_NamedLockedExecute(5),
+	-43:ACS_NamedLockedExecuteDoor(5),
+	-44:ACS_NamedExecuteWithResult(1,5),
+	-45:ACS_NamedExecuteAlways(2,5),
+	-46:UniqueTID(0,2),
+	-47:IsTIDUsed(1),
+	-48:Sqrt(1),
+	-49:FixedSqrt(1),
+	-50:VectorLength(2),
+	-51:SetHUDClipRect(4,6),
+	-52:SetHUDWrapWidth(1),
+	-53:SetCVar(2),
+	-54:GetUserCVar(2),
+	-55:SetUserCVar(3),
+	-56:GetCVarString(1),
+	-57:SetCVarString(2),
+	-58:GetUserCVarString(2),
+	-59:SetUserCVarString(3),
+	-60:LineAttack(4,8),
+	-61:PlaySound(2,6),
+	-62:StopSound(1,2),
+	-63:strcmp(2,3),
+	-64:stricmp(2,3),
+	-64:strcasecmp(2,3),	// an alias for stricmp
+	-65:StrLeft(2),
+	-66:StrRight(2),
+	-67:StrMid(3),
+	-68:GetActorClass(1),
+	-69:GetWeapon(0),
+	-70:SoundVolume(3),
+	-71:PlayActorSound(2,6),
+	-72:SpawnDecal(2,6),
+	-73:CheckFont(1),
+	-74:DropItem(2,4),
+	-75:CheckFlag(2),
+	-76:SetLineActivation(2),
+	-77:GetLineActivation(1),
+	-78:GetActorPowerupTics(2),
+	-79:ChangeActorAngle(2,3),
+	-80:ChangeActorPitch(2,3),
+	-81:GetArmorInfo(1),
+	-82:DropInventory(2),
+	-83:PickActor(5,8),
+	-84:IsPointerEqual(2,4),
+	-85:CanRaiseActor(1),
+	-86:SetActorTeleFog(3),
+	-87:SwapActorTeleFog(1),
+	-88:SetActorRoll(2),
+	-89:ChangeActorRoll(2,3),
+	-90:GetActorRoll(1),
+	-91:QuakeEx(8,12),
+	-92:Warp(6,11),
+	-93:GetMaxInventory(2),
+
+	// Zandronum's
+	-100:ResetMap(0),
+	-101:PlayerIsSpectator(1),
+	-102:ConsolePlayerNumber(0),
+	-103:GetTeamProperty(2),
+	-104:GetPlayerLivesLeft(1),
+	-105:SetPlayerLivesLeft(2),
+	-106:KickFromGame(2),
+	-107:GetGamemodeState(0),
+	-108:SetDBEntry(3),
+	-109:GetDBEntry(2),
+	-110:SetDBEntryString(3),
+	-111:GetDBEntryString(2),
+	-112:IncrementDBEntry(3),
+	-113:PlayerIsLoggedIn(1),
+	-114:GetPlayerAccountName(1),
+	-115:SortDBEntries(4),
+	-116:CountDBResults(1),
+	-117:FreeDBResults(1),
+	-118:GetDBResultKeyString(2),
+	-119:GetDBResultValueString(2),
+	-120:GetDBResultValue(2),
+	-121:GetDBEntryRank(3),
+	-122:RequestScriptPuke(4),
+	-123:BeginDBTransaction(0),
+	-124:EndDBTransaction(0),
+	-125:GetDBEntries(1),
+	
+	// ZDaemon's
+	-19620:GetTeamScore(1),
+	-19621:SetTeamScore(2),
+	
+	-100000:__EndOfList__(10);
+	
diff --git a/Build/Compilers/ZDoom/zwvars.acs b/Build/Compilers/ZDoom/zwvars.acs
new file mode 100644
index 0000000..b21f4e7
--- /dev/null
+++ b/Build/Compilers/ZDoom/zwvars.acs
@@ -0,0 +1,8 @@
+
+//**************************************************************************
+//**
+//** zwvars.acs
+//**
+//**************************************************************************
+
+// include your world-variable declarations here.
diff --git a/Build/Compilers/Zandronum/acc.cfg b/Build/Compilers/Zandronum/acc.cfg
new file mode 100644
index 0000000..cd6a413
--- /dev/null
+++ b/Build/Compilers/Zandronum/acc.cfg
@@ -0,0 +1,17 @@
+
+compilers
+{
+	// This defines what files a compiler uses
+	// The setting named "program" defines what .exe to run
+	// The "interface" setting defines what interal interface to use for processing and error feedback
+	// All others are the required files (the setting names do not matter)
+	zandronum_acc
+	{
+		interface = "AccCompiler";
+		program = "acc.exe";
+		zcommon = "zcommon.acs";
+		zdefs = "zdefs.acs";
+		zspecial = "zspecial.acs";
+		zwvars = "zwvars.acs";
+	}
+}
diff --git a/Build/Compilers/Zandronum/acc.exe b/Build/Compilers/Zandronum/acc.exe
new file mode 100644
index 0000000..005a714
Binary files /dev/null and b/Build/Compilers/Zandronum/acc.exe differ
diff --git a/Build/Compilers/Zandronum/commonFuncs.h b/Build/Compilers/Zandronum/commonFuncs.h
new file mode 100644
index 0000000..a621c27
--- /dev/null
+++ b/Build/Compilers/Zandronum/commonFuncs.h
@@ -0,0 +1,1079 @@
+// A bunch of functions that I've built up
+// They come in handy :>
+
+#define PLAYERMAX 64
+#define TEAMCOUNT 8
+#define DEFAULTTID_SCRIPT 471
+
+#define SECOND_TICS 35.714285714285715
+#define UNIT_CM     2.73921568627451
+
+#define DAMAGE_NORANDOM     0x40000000
+
+int TeamNames[TEAMCOUNT] = 
+{
+    "Blue", "Red", "Green", "Gold", "Black", "White", "Orange", "Purple"
+};
+
+int TeamColors[TEAMCOUNT] = 
+{
+    CR_BLUE, CR_RED, CR_GREEN, CR_GOLD, CR_BLACK, CR_WHITE, CR_ORANGE, CR_PURPLE
+};
+
+int TeamColorCodes[TEAMCOUNT] = 
+{
+    "\ch", "\cg", "\cd", "\cf", "\cm", "\cj", "\ci", "\ct"
+};
+
+function int itof(int x) { return x << 16; }
+function int ftoi(int x) { return x >> 16; }
+
+function int abs(int x)
+{
+    if (x < 0) { return -x; }
+    return x;
+}
+
+function int sign(int x)
+{
+    if (x < 0) { return -1; }
+    return 1;
+}
+
+function int randSign(void)
+{
+    return (2*random(0,1))-1;
+}
+
+function int mod(int x, int y)
+{
+    int ret = x - ((x / y) * y);
+    if (ret < 0) { ret = y + ret; }
+    return ret;
+}
+
+function int pow(int x, int y)
+{
+    int n = 1;
+    while (y-- > 0) { n *= x; }
+    return n;
+}
+
+function int powFloat(int x, int y)
+{
+    int n = 1.0;
+    while (y-- > 0) { n = FixedMul(n, x); }
+    return n;
+}
+
+function int gcf(int a, int b)
+{
+    int c;
+    while (1)
+    {
+        if (b == 0) { return a; }
+        c = a % b;
+        a = b;
+        b = c;
+    }
+    
+    return -1;
+}
+
+function int min(int x, int y)
+{
+    if (x < y) { return x; }
+    return y;
+}
+
+function int max(int x, int y)
+{
+    if (x > y) { return x; }
+    return y;
+}
+
+function int middle(int x, int y, int z)
+{
+    if ((x < z) && (y < z)) { return max(x, y); }
+    return max(min(x, y), z);
+}
+
+function int percFloat(int intg, int frac)
+{
+    return itof(intg) + (itof(frac) / 100);
+}
+
+function int percFloat2(int intg, int frac1, int frac2)
+{
+    return itof(intg) + (itof(frac1) / 100) + (itof(frac2) / 10000);
+}
+
+function int keyUp(int key)
+{
+    int buttons = GetPlayerInput(-1, INPUT_BUTTONS);
+
+    if ((~buttons & key) == key) { return 1; }
+    return 0;
+}
+
+function int keyUp_any(int key)
+{
+    int buttons = GetPlayerInput(-1, INPUT_BUTTONS);
+
+    if (~buttons & key) { return 1; }
+    return 0;
+}
+
+function int keyDown(int key)
+{
+    int buttons = GetPlayerInput(-1, INPUT_BUTTONS);
+
+    if ((buttons & key) == key) { return 1; }
+    return 0;
+}
+
+function int keyDown_any(int key)
+{
+    int buttons = GetPlayerInput(-1, INPUT_BUTTONS);
+
+    if (buttons & key) { return 1; }
+    return 0;
+}
+
+function int keysPressed(void)
+{
+    int buttons     = GetPlayerInput(-1, INPUT_BUTTONS);
+    int oldbuttons  = GetPlayerInput(-1, INPUT_OLDBUTTONS);
+    int newbuttons  = (buttons ^ oldbuttons) & buttons;
+
+    return newbuttons;
+}
+
+function int keyPressed(int key)
+{
+    if ((keysPressed() & key) == key) { return 1; }
+    return 0;
+}
+
+function int keyPressed_any(int key)
+{
+    if (keysPressed() & key) { return 1; }
+    return 0;
+}
+
+function int inputUp(int input)
+{
+    int buttons = GetPlayerInput(-1, MODINPUT_BUTTONS);
+
+    if ((~buttons & input) == input) { return 1; }
+    return 0;
+}
+
+function int inputUp_any(int input)
+{
+    int buttons = GetPlayerInput(-1, MODINPUT_BUTTONS);
+
+    if (~buttons & input) { return 1; }
+    return 0;
+}
+
+function int inputDown(int input)
+{
+    int buttons = GetPlayerInput(-1, MODINPUT_BUTTONS);
+
+    if ((buttons & input) == input) { return 1; }
+    return 0;
+}
+
+function int inputDown_any(int input)
+{
+    int buttons = GetPlayerInput(-1, MODINPUT_BUTTONS);
+
+    if (buttons & input) { return 1; }
+    return 0;
+}
+
+function int inputsPressed(void)
+{
+    int buttons     = GetPlayerInput(-1, MODINPUT_BUTTONS);
+    int oldbuttons  = GetPlayerInput(-1, MODINPUT_OLDBUTTONS);
+    int newbuttons  = (buttons ^ oldbuttons) & buttons;
+
+    return newbuttons;
+}
+
+function int inputPressed(int input)
+{
+    if ((inputsPressed() & input) == input) { return 1; }
+    return 0;
+}
+
+function int inputPressed_any(int input)
+{
+    if (inputsPressed() & input) { return 1; }
+    return 0;
+}
+
+function int adjustBottom(int tmin, int tmax, int i)
+{
+    if (tmin > tmax)
+    {
+        tmax ^= tmin; tmin ^= tmax; tmax ^= tmin;  // XOR swap
+    }
+
+    if (i < tmin) { tmin = i; }
+    if (i > tmax) { tmin += (i - tmax); }
+
+    return tmin;
+}
+
+function int adjustTop(int tmin, int tmax, int i)
+{
+    if (tmin > tmax)
+    {
+        tmax ^= tmin; tmin ^= tmax; tmax ^= tmin;
+    }
+
+    if (i < tmin) { tmax -= (tmin - i); }
+    if (i > tmax) { tmax = i; }
+
+    return tmax;
+}
+
+function int adjustShort(int tmin, int tmax, int i)
+{
+    if (tmin > tmax)
+    {
+        tmax ^= tmin; tmin ^= tmax; tmax ^= tmin;
+    }
+
+    if (i < tmin)
+    {
+        tmax -= (tmin - i);
+        tmin = i;
+    }
+    if (i > tmax)
+    {
+        tmin += (i - tmax);
+        tmax = i;
+    }
+    
+    return packShorts(tmin, tmax);
+}
+
+
+// Taken from http://zdoom.org/wiki/sqrt
+
+function int sqrt_i(int number)
+{
+    if (number <= 3) { return number > 0; }
+
+    int oldAns = number >> 1,                     // initial guess
+        newAns = (oldAns + (number / oldAns)) >> 1; // first iteration
+
+    // main iterative method
+    while (newAns < oldAns)
+    {
+        oldAns = newAns;
+        newAns = (oldAns + number / oldAns) >> 1;
+    }
+
+    return oldAns;
+}
+
+function int sqrt(int number)
+{
+    if (number == 1.0) { return 1.0; }
+    if (number <= 0) { return 0; }
+    int val = 150.0;
+    for (int i=0; i<15; i++) { val = (val + FixedDiv(number, val)) >> 1; }
+
+    return val;
+}
+
+function int magnitudeTwo(int x, int y)
+{
+    return sqrt_i(x*x + y*y);
+}
+
+function int magnitudeTwo_f(int x, int y)
+{
+    int len, ang;
+
+    ang = VectorAngle(x, y);
+    if (((ang + 0.125) % 0.5) > 0.25) { len = FixedDiv(y, sin(ang)); }
+    else { len = FixedDiv(x, cos(ang)); }
+
+    return len;
+}
+
+function int magnitudeThree(int x, int y, int z)
+{
+    return sqrt_i(x*x + y*y + z*z);
+}
+
+function int magnitudeThree_f(int x, int y, int z)
+{
+    int len, ang;
+
+    ang = VectorAngle(x, y);
+    if (((ang + 0.125) % 0.5) > 0.25) { len = FixedDiv(y, sin(ang)); }
+    else { len = FixedDiv(x, cos(ang)); }
+
+    ang = VectorAngle(len, z);
+    if (((ang + 0.125) % 0.5) > 0.25) { len = FixedDiv(z, sin(ang)); }
+    else { len = FixedDiv(len, cos(ang)); }
+
+    return len;
+}
+
+
+function int quadPos(int a, int b, int c)
+{
+    int s1 = sqrt(FixedMul(b, b)-(4*FixedMul(a, c)));
+    int s2 = (2 * a);
+    int b1 = FixedDiv(-b + s1, s2);
+
+    return b1;
+}
+
+function int quadNeg(int a, int b, int c)
+{
+    int s1 = sqrt(FixedMul(b, b)-(4*FixedMul(a, c)));
+    int s2 = (2 * a);
+    int b1 = FixedDiv(-b - s1, s2);
+
+    return b1;
+}
+
+// All the arguments are to be fixed-point
+function int quad(int a, int b, int c, int y)
+{
+    return FixedMul(a, FixedMul(y, y)) + FixedMul(b, y) + c + y;
+}
+
+function int quadHigh(int a, int b, int c, int x)
+{
+    return quadPos(a, b, c-x);
+}
+
+function int quadLow(int a, int b, int c, int x)
+{
+    return quadNeg(a, b, c-x);
+}
+
+function int inRange(int low, int high, int x)
+{
+    return ((x >= low) && (x < high));
+}
+
+function void AddAmmoCapacity(int type, int add)
+{
+    SetAmmoCapacity(type, GetAmmoCapacity(type) + add);
+}
+
+function int packShorts(int left, int right)
+{
+    return ((left & 0xFFFF) << 16) + (right & 0xFFFF);
+}
+
+function int leftShort(int packed) { return packed >> 16; }
+function int rightShort(int packed) { return (packed << 16) >> 16; }
+
+
+// This stuff only works with StrParam
+
+function int cleanString(int string)
+{
+    int ret = "";
+    int strSize = StrLen(string);
+
+    int c, i, ignoreNext;
+    
+    for (i = 0; i < strSize; i++)
+    {
+        c = GetChar(string, i);
+
+        if ( ( ((c > 8) && (c < 14)) || ((c > 31) && (c < 127)) || ((c > 160) && (c < 173)) ) && !ignoreNext)
+        {
+            ret = StrParam(s:ret, c:c);
+        }
+        else if (c == 28 && !ignoreNext)
+        {
+            ignoreNext = 1;
+        }
+        else
+        {
+            ignoreNext = 0;
+        }
+    }
+
+    return ret;
+}
+
+function int cvarFromString(int prefix, int newname)
+{
+    int ret = "";
+    int i, c;
+    int prelen = strlen(prefix);
+    int namelen = strlen(newname);
+    int cap = prelen+namelen;
+
+    for (i = 0; i <= cap; i++)
+    {
+        c = cond(i >= prelen, GetChar(newname, i-prelen), GetChar(prefix, i));
+
+        if (
+            (c > 64 && c < 91)  // is uppercase letter
+         || (c > 90 && c < 123) // is lowercase letter
+         || (c > 47 && c < 58)  // is number
+         || c == 95             // _
+         )
+        {
+            ret = StrParam(s:ret, c:c);
+        }
+    }
+
+    return ret;
+}
+
+function int padStringR(int baseStr, int padChar, int len)
+{
+    int baseStrLen = StrLen(baseStr);
+    int pad = "";
+    int padLen; int i;
+
+    if (baseStrLen >= len)
+    {
+        return baseStr;
+    }
+    
+    padChar = GetChar(padChar, 0);
+    padLen = len - baseStrLen;
+
+    for (i = 0; i < padLen; i++)
+    {
+        pad = StrParam(s:pad, c:padChar);
+    }
+
+    return StrParam(s:baseStr, s:pad);
+}
+
+function int padStringL(int baseStr, int padChar, int len)
+{
+    int baseStrLen = StrLen(baseStr);
+    int pad = "";
+    int padLen; int i;
+
+    if (baseStrLen >= len)
+    {
+        return baseStr;
+    }
+    
+    padChar = GetChar(padChar, 0);
+    padLen = len - baseStrLen;
+
+    for (i = 0; i < padLen; i++)
+    {
+        pad = StrParam(s:pad, c:padChar);
+    }
+
+    return StrParam(s:pad, s:baseStr);
+}
+
+function int changeString(int string, int repl, int where)
+{
+    int i; int j; int k;
+    int ret = "";
+    int len = StrLen(string);
+    int rLen = StrLen(repl);
+
+    if ((where + rLen < 0) || (where >= len))
+    {
+        return string;
+    }
+    
+    for (i = 0; i < len; i++)
+    {
+        if (inRange(where, where+rLen, i))
+        {
+            ret = StrParam(s:ret, c:GetChar(repl, i-where));
+        }
+        else
+        {
+            ret = StrParam(s:ret, c:GetChar(string, i));
+        }
+    }
+
+    return ret;
+}
+
+function int sliceString(int string, int start, int end)
+{
+    int len = StrLen(string);
+    int ret = "";
+    int i;
+
+    if (start < 0)
+    {
+        start = len + start;
+    }
+
+    if (end <= 0)
+    {
+        end = len + end;
+    }
+
+    start = max(0, start);
+    end   = min(end, len-1);
+    
+    for (i = start; i < end; i++)
+    {
+        ret = StrParam(s:ret, c:GetChar(string, i));
+    }
+
+    return ret;
+}
+
+function int strcmp(int str1, int str2)
+{
+    int i,j,k,l;
+    int len1 = StrLen(str1);
+    int len2 = StrLen(str2);
+    j = max(len1, len2);
+
+    for (i = 0; i < j; i++)
+    {
+        if (i >= len1) { return -1; }
+        if (i >= len2) { return  1; }
+        
+        k = GetChar(str1, i); l = GetChar(str2, i);
+
+        if (k > j) { return  1; }
+        if (k < j) { return -1; }
+    }
+    return 0;
+}
+
+
+// End StrParam
+
+function int unusedTID(int start, int end)
+{
+    int ret = start - 1;
+    int tidNum;
+
+    if (start > end) { start ^= end; end ^= start; start ^= end; }  // good ol' XOR swap
+    
+    while (ret++ != end)
+    {
+        if (ThingCount(0, ret) == 0)
+        {
+            return ret;
+        }
+    }
+    
+    return -1;
+}
+
+function int getMaxHealth(void)
+{
+    int maxHP = GetActorProperty(0, APROP_SpawnHealth);
+
+    if ((maxHP == 0) && (PlayerNumber() != -1))
+    {
+        maxHP = 100;
+    }
+
+    return maxHP;
+}
+
+function int giveHealth(int amount)
+{
+    return giveHealthFactor(amount, 1.0);
+}
+
+function int giveHealthFactor(int amount, int maxFactor)
+{
+    return giveHealthMax(amount, FixedMul(getMaxHealth(), maxFactor));
+}
+
+function int giveHealthMax(int amount, int maxHP)
+{
+    int newHP;
+
+    int curHP = GetActorProperty(0, APROP_Health);
+
+    if (maxHP == 0) { newHP = max(curHP, curHP+amount); }
+    else
+    {
+        if (curHP > maxHP) { return 0; }
+        newHP = middle(curHP, curHP+amount, maxHP);
+    }
+
+    SetActorProperty(0, APROP_Health, newHP);
+
+    return newHP - curHP;
+}
+
+function int isDead(int tid)
+{
+    return GetActorProperty(tid, APROP_Health) <= 0;
+}
+
+function int isSinglePlayer(void)
+{
+    return GameType() == GAME_SINGLE_PLAYER;
+}
+
+function int isLMS(void)
+{
+    return GetCVar("lastmanstanding") || GetCVar("teamlms");
+}
+
+function int isCoop(void)
+{
+    int check1 = GameType() == GAME_NET_COOPERATIVE;
+    int check2 = GetCVar("cooperative") || GetCVar("invasion") || GetCVar("survival");
+
+    return check1 || check2;
+}
+
+function int isInvasion(void)
+{
+    return GetCVar("invasion");
+}
+
+function int isFreeForAll(void)
+{
+    if (GetCVar("terminator") || GetCVar("duel"))
+    {
+        return 1;
+    }
+
+    int check1 = GetCVar("deathmatch") || GetCVar("possession") || GetCVar("lastmanstanding");
+    int check2 = check1 && !GetCVar("teamplay");
+
+    return check2;
+}
+
+function int isTeamGame(void)
+{
+    int ret = (GetCVar("teamplay") || GetCVar("teamgame") || GetCVar("teamlms"));
+    return ret;
+}
+
+function int spawnDistance(int item, int dist, int tid)
+{
+    int myX, myY, myZ, myAng, myPitch, spawnX, spawnY, spawnZ;
+
+    myX = GetActorX(0); myY = GetActorY(0); myZ = GetActorZ(0);
+    myAng = GetActorAngle(0); myPitch = GetActorPitch(0);
+
+    spawnX = FixedMul(cos(myAng) * dist, cos(myPitch));
+    spawnX += myX;
+    spawnY = FixedMul(sin(myAng) * dist, cos(myPitch));
+    spawnY += myY;
+    spawnZ = myZ + (-sin(myPitch) * dist);
+
+    return Spawn(item, spawnX, spawnY, spawnZ, tid, myAng >> 8);
+}
+
+function void SetInventory(int item, int amount)
+{
+    int count = CheckInventory(item);
+
+    if (count == amount) { return; }
+    
+    if (count > amount)
+    {
+        TakeInventory(item, count - amount);
+        return;
+    }
+
+    GiveAmmo(item, amount - count);
+    return;
+}
+function int ToggleInventory(int inv)
+{
+    if (CheckInventory(inv))
+    {
+        TakeInventory(inv, 0x7FFFFFFF);
+        return 0;
+    }
+
+    GiveInventory(inv, 1);
+    return 1;
+}
+
+function void GiveAmmo(int type, int amount)
+{
+    if (GetCVar("sv_doubleammo"))
+    {
+        int m = GetAmmoCapacity(type);
+        int expected = min(m, CheckInventory(type) + amount);
+
+        GiveInventory(type, amount);
+        TakeInventory(type, CheckInventory(type) - expected);
+    }
+    else
+    {  
+        GiveInventory(type, amount);
+    }
+}
+
+function void GiveActorAmmo(int tid, int type, int amount)
+{
+    if (GetCVar("sv_doubleammo"))
+    {
+        int m = GetAmmoCapacity(type);
+        int expected = min(m, CheckActorInventory(tid, type) + amount);
+
+        GiveActorInventory(tid, type, amount);
+        TakeActorInventory(tid, type, CheckActorInventory(tid, type) - expected);
+    }
+    else
+    {  
+        GiveActorInventory(tid, type, amount);
+    }
+}
+
+function int cond(int test, int trueRet, int falseRet)
+{
+    if (test) { return trueRet; }
+    return falseRet;
+}
+
+function int condTrue(int test, int trueRet)
+{
+    if (test) { return trueRet; }
+    return test;
+}
+
+function int condFalse(int test, int falseRet)
+{
+    if (test) { return test; }
+    return falseRet;
+}
+
+function void saveCVar(int cvar, int val)
+{
+    int setStr = StrParam(s:"set ", s:cvar, s:" ", d:val);
+    int arcStr = StrParam(s:"archivecvar ", s:cvar);
+    ConsoleCommand(setStr); ConsoleCommand(arcStr);
+}
+
+function int defaultCVar(int cvar, int defaultVal)
+{
+    int ret = GetCVar(cvar);
+    if (ret == 0) { saveCVar(cvar, defaultVal); return defaultVal; }
+
+    return ret;
+}
+
+
+function int onGround(int tid)
+{
+    return (GetActorZ(tid) - GetActorFloorZ(tid)) == 0;
+}
+
+function int ThingCounts(int start, int end)
+{
+    int i, ret = 0;
+
+    if (start > end) { start ^= end; end ^= start; start ^= end; }
+    for (i = start; i < end; i++) { ret += ThingCount(0, i); }
+
+    return ret;
+}
+
+function int PlaceOnFloor(int tid)
+{
+    if (ThingCount(0, tid) != 1) { return 1; }
+    
+    SetActorPosition(tid, GetActorX(tid), GetActorY(tid), GetActorFloorZ(tid), 0);
+    return 0;
+}
+
+#define DIR_E  1
+#define DIR_NE 2
+#define DIR_N  3
+#define DIR_NW 4
+#define DIR_W  5
+#define DIR_SW 6
+#define DIR_S  7
+#define DIR_SE 8
+
+function int getDirection(void)
+{
+    int sideMove = keyDown(BT_MOVERIGHT) - keyDown(BT_MOVELEFT);
+    int forwMove = keyDown(BT_FORWARD) - keyDown(BT_BACK);
+
+    if (sideMove || forwMove)
+    {
+        switch (sideMove)
+        {
+          case -1: 
+            switch (forwMove)
+            {
+                case -1: return DIR_SW;
+                case  0: return DIR_W;
+                case  1: return DIR_NW;
+            }
+            break;
+
+          case 0: 
+            switch (forwMove)
+            {
+                case -1: return DIR_S;
+                case  1: return DIR_N;
+            }
+            break;
+
+          case 1: 
+            switch (forwMove)
+            {
+                case -1: return DIR_SE;
+                case  0: return DIR_E;
+                case  1: return DIR_NE;
+            }
+            break;
+        }
+    }
+
+    return 0;
+}
+
+function int isInvulnerable(void)
+{
+    int check1 = GetActorProperty(0, APROP_Invulnerable);
+    int check2 = CheckInventory("PowerInvulnerable");
+
+    return check1 || check2;
+}
+
+function void saveStringCVar(int string, int cvarname)
+{
+    int slen = StrLen(string);
+    int i, c, cvarname2;
+
+    for (i = 0; i < slen; i++)
+    {
+        cvarname2 = StrParam(s:cvarname, s:"_char", d:i);
+        SaveCVar(cvarname2, GetChar(string, i));
+    }
+
+    while (1)
+    {
+        cvarname2 = StrParam(s:cvarname, s:"_char", d:i);
+        c = GetCVar(cvarname2);
+
+        if (c == 0) { break; }
+
+        ConsoleCommand(StrParam(s:"unset ", s:cvarname2));
+        i += 1;
+    }
+}
+
+function int loadStringCVar(int cvarname)
+{
+    int ret = "";
+    int i = 0, c, cvarname2;
+
+    while (1)
+    {
+        cvarname2 = StrParam(s:cvarname, s:"_char", d:i);
+        c = GetCVar(cvarname2);
+
+        if (c == 0) { break; }
+
+        ret = StrParam(s:ret, c:c);
+        i += 1;
+    }
+
+    return ret;
+}
+
+function int defaultTID(int def)
+{
+    return _defaulttid(def, 0);
+}
+
+function int _defaulttid(int def, int alwaysPropagate)
+{
+    if (ClassifyActor(0) & ACTOR_WORLD) { return 0; }
+
+    int tid = ActivatorTID();
+    int i, changed = 0;
+
+    if (ThingCount(0, tid) != 1)
+    {
+        tid = def;
+        changed = 1;
+        if (def <= 0)
+        {
+            i = random(12, 220);
+            tid = unusedTID(i*100, (i+100)*100);
+        }
+
+        Thing_ChangeTID(0, tid);
+    }
+
+    if ((changed || (alwaysPropagate == 1)) && (alwaysPropagate != 2))
+    {
+        ACS_ExecuteAlways(DEFAULTTID_SCRIPT, 0, tid,0,0);
+    }
+
+    return tid;
+}
+
+script DEFAULTTID_SCRIPT (int tid) clientside
+{
+    if (ConsolePlayerNumber() == -1) { terminate; }
+    Thing_ChangeTID(0, tid);
+}
+
+function int JumpZFromHeight(int height, int gravFactor)
+{
+    return sqrt(2 * height * gravFactor);
+}
+
+function int roundZero(int toround)
+{
+    int i = toround % 1.0;
+    return ftoi(toround - i);
+}
+
+function int roundAway(int toround)
+{
+    int i = toround % 1.0;
+
+    if (i == 0) { return ftoi(toround); }
+    return ftoi(toround + (1.0 - i));
+}
+
+function int round(int toround)
+{
+    return ftoi(toround + 0.5);
+}
+
+function int ceil(int toround)
+{
+    return ftoi(toround + (1.0-1));
+}
+
+function int intFloat(int toround)
+{
+    return itof(ftoi(toround));
+}
+
+function int distance(int x1, int y1, int z1, int x2, int y2, int z2)
+{
+    return magnitudeThree_f(x2-x1, y2-y1, z2-z1);
+}
+
+function int distance_tid(int tid1, int tid2)
+{
+    int x1 = GetActorX(tid1);
+    int y1 = GetActorY(tid1);
+    int z1 = GetActorZ(tid1);
+
+    int x2 = GetActorX(tid2);
+    int y2 = GetActorY(tid2);
+    int z2 = GetActorZ(tid2);
+
+    return magnitudeThree_f(x2-x1, y2-y1, z2-z1);
+}
+
+function int distance_ftoi(int x1, int y1, int z1, int x2, int y2, int z2)
+{
+    return ftoi(distance(x1,y1,z1, x2,y2,z2));
+}
+
+function void printDebugInfo(void)
+{
+    int classify    = ClassifyActor(0);
+    int fead        = classify & ACTOR_DEAD;
+    int player      = classify & ACTOR_PLAYER;
+    int pln         = PlayerNumber();
+
+    Log(s:" -- DEBUG INFO -- ");
+
+    Log(s:"Executed on tic ", d:Timer(), s:" on map ", d:GetLevelInfo(LEVELINFO_LEVELNUM));
+
+    if (classify & (ACTOR_PLAYER | ACTOR_MONSTER))
+    {
+        Log(s:"Script activator has ", d:GetActorProperty(0, APROP_Health), s:"/", d:getMaxHealth(), s:" HP");
+    }
+
+    if (player)
+    {
+        Log(s:"Is player ", d:pln, s:" (", n:0, s:"\c-) with class number ", d:PlayerClass(pln));
+    }
+
+    Log(s:" -- END DEBUG -- ");
+}
+
+
+function int PlayerTeamCount(int teamNo)
+{
+    int i, ret;
+    for (i = 0; i < PLAYERMAX; i++)
+    {
+        if (GetPlayerInfo(i, PLAYERINFO_TEAM) == teamNO) { ret++; }
+    }
+    return ret;
+}
+
+function int lower(int chr)
+{
+    if (chr > 64 && chr < 91) { return chr+32; }
+    return chr;
+}
+
+function int upper(int chr)
+{
+    if (chr > 90 && chr < 123) { return chr-32; }
+    return chr;
+}
+
+function int AddActorProperty(int tid, int prop, int amount)
+{
+    int newAmount = GetActorProperty(tid, prop) + amount;
+    SetActorProperty(tid, prop, newAmount);
+    return newAmount;
+}
+
+function int ClientCount(void)
+{
+    int ret, i;
+
+    for (i = 0; i < PLAYERMAX; i++)
+    {
+        if (PlayerInGame(i) || PlayerIsSpectator(i)) { ret++; }
+    }
+
+    return ret;
+}
+
+function int HasRoom(int actorname, int x, int y, int z)
+{
+    int tid = unusedTID(40000, 50000);
+    int ret = Spawn(actorname, x, y, z, tid);
+
+    if (ret >= 1) { Thing_Remove(tid); }
+
+    return ret;
+}
+
+function int RealPlayerCount(void)
+{
+    int ret, i;
+
+    for (i = 0; i < PLAYERMAX; i++)
+    {
+        if (PlayerInGame(i) && !PlayerIsBot(i)) { ret++; }
+    }
+
+    return ret;
+}
diff --git a/Build/Compilers/Zandronum/zcommon.acs b/Build/Compilers/Zandronum/zcommon.acs
new file mode 100644
index 0000000..5cdec5d
--- /dev/null
+++ b/Build/Compilers/Zandronum/zcommon.acs
@@ -0,0 +1,15 @@
+
+//**************************************************************************
+//**
+//** zcommon.acs
+//**
+//**************************************************************************
+
+// If you are not using the -h command line switch and do not want to use
+// WadAuthor's error checker, you can uncomment the following line to shave
+// a few bytes off the size of compiled scripts.
+//#nowadauthor
+
+#include "zspecial.acs"
+#include "zdefs.acs"
+#include "zwvars.acs"
diff --git a/Build/Compilers/Zandronum/zdefs.acs b/Build/Compilers/Zandronum/zdefs.acs
new file mode 100644
index 0000000..a20236e
--- /dev/null
+++ b/Build/Compilers/Zandronum/zdefs.acs
@@ -0,0 +1,889 @@
+
+//**************************************************************************
+//**
+//** zdefs.acs
+//**
+//** Common definitions for use when compiling ACS scripts for ZDoom
+//**
+//**************************************************************************
+
+#define TRUE                    1
+#define FALSE                   0
+#define ON                      1
+#define OFF                     0
+#define YES                     1
+#define NO                      0
+
+#define LINE_FRONT              0
+#define LINE_BACK               1
+
+#define SIDE_FRONT              0
+#define SIDE_BACK               1
+
+#define TEXTURE_TOP             0
+#define TEXTURE_MIDDLE          1
+#define TEXTURE_BOTTOM          2
+
+// same information as combinable bit flags
+#define TEXFLAG_TOP				1
+#define TEXFLAG_MIDDLE			2
+#define TEXFLAG_BOTTOM			4
+#define TEXFLAG_ADDOFFSET		8
+
+#define GAME_SINGLE_PLAYER      0
+#define GAME_NET_COOPERATIVE    1
+#define GAME_NET_DEATHMATCH     2
+#define GAME_TITLE_MAP		3
+
+// Classes are only useful with Hexen
+#define CLASS_FIGHTER           0
+#define CLASS_CLERIC            1
+#define CLASS_MAGE              2
+
+#define SKILL_VERY_EASY         0
+#define SKILL_EASY              1
+#define SKILL_NORMAL            2
+#define SKILL_HARD              3
+#define SKILL_VERY_HARD         4
+
+#define BLOCK_NOTHING           0
+#define BLOCK_CREATURES         1
+#define BLOCK_EVERYTHING        2
+#define BLOCK_RAILING			3
+#define BLOCK_PLAYERS			4
+
+#define SCROLL                  0
+#define CARRY                   1
+#define SCROLL_AND_CARRY        2
+
+// Means-of-death for Sector_SetDamage --------------------------------------
+
+#define MOD_UNKNOWN             0
+#define MOD_ROCKET              5
+#define MOD_R_SPLASH            6
+#define MOD_PLASMARIFLE         7
+#define MOD_BFG_BOOM            8
+#define MOD_BFG_SPLASH          9
+#define MOD_CHAINSAW            10
+#define MOD_SSHOTGUN            11
+#define MOD_WATER               12
+#define MOD_SLIME               13
+#define MOD_LAVA                14
+#define MOD_CRUSH               15
+#define MOD_TELEFRAG            16
+#define MOD_FALLING             17
+#define MOD_SUICIDE             18
+#define MOD_BARREL              19
+#define MOD_EXIT                20
+#define MOD_SPLASH              21
+#define MOD_HIT                 22
+#define MOD_RAILGUN		23
+#define MOD_ICE			24
+#define MOD_DISINTEGRATE	25
+#define MOD_POISON		26
+#define MOD_ELECTRIC		27
+
+// Return values for PlayMovie ----------------------------------------------
+
+#define MOVIE_Played            0
+#define MOVIE_Played_NoVideo    1
+#define MOVIE_Played_Aborted    2
+#define MOVIE_Failed           -1
+
+
+// Player properties --------------------------------------------------------
+
+#define PROP_FROZEN                     0
+#define PROP_NOTARGET                   1
+#define PROP_INSTANTWEAPONSWITCH        2
+#define PROP_FLY			3
+#define PROP_TOTALLYFROZEN		4
+#define PROP_BUDDHA			16
+
+// The following properties correspond to powers given by certain items
+#define PROP_INVULNERABILITY		5
+#define PROP_STRENGTH			6
+#define PROP_INVISIBILITY		7
+#define PROP_RADIATIONSUIT		8
+#define PROP_ALLMAP			9
+#define PROP_INFRARED			10
+#define PROP_WEAPONLEVEL2		11
+#define PROP_FLIGHT			12
+#define PROP_SPEED			15
+
+// Player input -------------------------------------------------------------
+
+// These are the original inputs sent by the player.
+#define INPUT_OLDBUTTONS		0
+#define INPUT_BUTTONS			1
+#define INPUT_PITCH				2
+#define INPUT_YAW				3
+#define INPUT_ROLL				4
+#define INPUT_FORWARDMOVE		5
+#define INPUT_SIDEMOVE			6
+#define INPUT_UPMOVE			7
+
+// These are the inputs, as modified by P_PlayerThink().
+// Most of the time, these will match the original inputs, but
+// they can be different if a player is frozen or using a
+// chainsaw.
+#define MODINPUT_OLDBUTTONS		8
+#define MODINPUT_BUTTONS		9
+#define MODINPUT_PITCH			10
+#define MODINPUT_YAW			11
+#define MODINPUT_ROLL			12
+#define MODINPUT_FORWARDMOVE	13
+#define MODINPUT_SIDEMOVE		14
+#define MODINPUT_UPMOVE			15
+
+// Player buttons -----------------------------------------------------------
+
+#define BT_ATTACK				1
+#define BT_USE					2
+#define BT_JUMP					4
+#define BT_CROUCH				8
+#define BT_TURN180				16
+#define BT_ALTATTACK			32
+#define BT_RELOAD				64
+#define BT_ZOOM					128
+
+#define BT_SPEED				256
+#define BT_STRAFE				512
+
+#define BT_MOVERIGHT			1024
+#define BT_MOVELEFT				2048
+#define BT_BACK					4096
+#define BT_FORWARD				8192
+#define BT_RIGHT				16384
+#define BT_LEFT					32768
+#define BT_LOOKUP				65536
+#define BT_LOOKDOWN				131072
+#define BT_MOVEUP				262144
+#define BT_MOVEDOWN				524288
+#define BT_SHOWSCORES			1048576
+
+// Do whatever you want with these.
+#define BT_USER1				2097152
+#define BT_USER2				4194304
+#define BT_USER3				8388608
+#define BT_USER4				16777216
+
+// Text colors --------------------------------------------------------------
+
+#define CR_UNTRANSLATED         -1
+#define CR_BRICK                0
+#define CR_TAN                  1
+#define CR_GRAY                 2
+#define CR_GREY                 2
+#define CR_GREEN                3
+#define CR_BROWN                4
+#define CR_GOLD                 5
+#define CR_RED                  6
+#define CR_BLUE                 7
+#define CR_ORANGE               8
+#define CR_WHITE                9
+#define CR_YELLOW               10
+#define CR_BLACK				12
+#define CR_LIGHTBLUE			13
+#define CR_CREAM				14
+#define CR_OLIVE				15
+#define CR_DARKGREEN			16
+#define CR_DARKRED				17
+#define CR_DARKBROWN			18
+#define CR_PURPLE				19
+#define CR_DARKGRAY				20
+#define CR_DARKGREY				20
+#define CR_CYAN					21
+
+// HUD message types --------------------------------------------------------
+
+#define HUDMSG_PLAIN		0
+#define HUDMSG_FADEOUT		1
+#define HUDMSG_TYPEON		2
+#define HUDMSG_FADEINOUT	3
+
+// OR this with one of the above to log the hudmessage to the console.
+// i.e. instead of HUDMSG_PLAIN, you can use HUDMSG_PLAIN | HUDMSG_LOG
+#define HUDMSG_LOG					0x80000000
+
+// OR this with one of the above if the color you passed is a string
+// instead of one of the CR_ constants.
+#define HUDMSG_COLORSTRING			0x40000000
+
+// OR this with one of the above to use additive blending when drawing the
+// HUD message.
+#define HUDMSG_ADDBLEND				0x20000000
+
+// HUD message layers; these are not flags
+#define HUDMSG_LAYER_OVERHUD		0x00000000
+#define HUDMSG_LAYER_UNDERHUD		0x00001000
+#define HUDMSG_LAYER_OVERMAP		0x00002000
+
+// HUD message visibility flags
+#define HUDMSG_NOTWITH3DVIEW		0x00010000
+#define HUDMSG_NOTWITHFULLMAP		0x00020000
+#define HUDMSG_NOTWITHOVERLAYMAP	0x00040000
+
+
+// "Scripted" Marine weapon types -------------------------------------------
+
+#define MARINEWEAPON_Dummy		0
+#define MARINEWEAPON_Fist		1
+#define MARINEWEAPON_BerserkFist	2
+#define MARINEWEAPON_Chainsaw		3
+#define MARINEWEAPON_Pistol		4
+#define MARINEWEAPON_Shotgun		5
+#define MARINEWEAPON_SuperShotgun	6
+#define MARINEWEAPON_Chaingun		7
+#define MARINEWEAPON_RocketLauncher	8
+#define MARINEWEAPON_PlasmaRifle	9
+#define MARINEWEAPON_Railgun		10
+#define MARINEWEAPON_BFG		11
+
+// Actor properties you can get/set -----------------------------------------
+
+#define APROP_Health		0
+#define APROP_Speed			1
+#define APROP_Damage		2
+#define APROP_Alpha			3
+#define APROP_RenderStyle	4
+#define APROP_SeeSound		5	// Sounds can only be set, not gotten
+#define APROP_AttackSound	6
+#define APROP_PainSound		7
+#define APROP_DeathSound	8
+#define APROP_ActiveSound	9
+#define APROP_Ambush		10
+#define APROP_Invulnerable	11
+#define APROP_JumpZ			12
+#define APROP_ChaseGoal		13
+#define APROP_Frightened	14
+#define APROP_Gravity		15
+#define APROP_Friendly		16
+#define APROP_SpawnHealth	17
+#define APROP_Dropped		18
+#define APROP_Notarget		19
+#define APROP_Species		20
+#define APROP_Nametag		21
+#define APROP_Score			22
+#define APROP_Notrigger		23
+#define APROP_DamageFactor	24
+#define APROP_MasterTID 	25
+#define APROP_TargetTID 	26
+#define APROP_TracerTID 	27
+#define APROP_Waterlevel	28
+#define APROP_ScaleX        29
+#define APROP_ScaleY        30
+#define APROP_Dormant		31
+#define APROP_Mass			32
+#define APROP_Accuracy      33
+#define APROP_Stamina       34
+
+// Render Styles ------------------------------------------------------------
+
+#define STYLE_None			0	// Do not draw
+#define STYLE_Normal		1	// Normal; just copy the image to the screen
+#define STYLE_Fuzzy			2	// Draw silhouette using "fuzz" effect
+#define STYLE_SoulTrans		3	// Draw translucent with amount in r_transsouls
+#define STYLE_OptFuzzy		4	// Draw as fuzzy or translucent, based on user preference
+#define STYLE_Stencil		5	// Draw as solid color
+#define STYLE_Translucent	64	// Draw translucent
+#define STYLE_Add			65	// Draw additive
+#define STYLE_Shaded		66	// 
+#define STYLE_TranslucentStencil 67
+
+// Properties you can use with GetLevelInfo() -------------------------------
+
+#define LEVELINFO_PAR_TIME		0
+#define LEVELINFO_CLUSTERNUM		1
+#define LEVELINFO_LEVELNUM		2
+#define LEVELINFO_TOTAL_SECRETS		3
+#define LEVELINFO_FOUND_SECRETS		4
+#define LEVELINFO_TOTAL_ITEMS		5
+#define LEVELINFO_FOUND_ITEMS		6
+#define LEVELINFO_TOTAL_MONSTERS	7
+#define LEVELINFO_KILLED_MONSTERS	8
+#define LEVELINFO_SUCK_TIME		9
+
+// Properties you can use with GetPlayerInfo() ------------------------------
+
+#define PLAYERINFO_TEAM			0
+#define PLAYERINFO_AIMDIST		1
+#define PLAYERINFO_COLOR		2
+#define PLAYERINFO_GENDER		3
+#define PLAYERINFO_NEVERSWITCH	4
+#define PLAYERINFO_MOVEBOB		5
+#define PLAYERINFO_STILLBOB		6
+#define PLAYERINFO_PLAYERCLASS	7
+#define PLAYERINFO_FOV			8
+#define PLAYERINFO_DESIREDFOV	9
+
+
+// Flags for ReplaceTextures ------------------------------------------------
+
+#define NOT_BOTTOM				1
+#define NOT_MIDDLE				2
+#define NOT_TOP					4
+#define NOT_FLOOR				8
+#define NOT_CEILING				16
+
+// Flags for SectorDamage ---------------------------------------------------
+
+#define DAMAGE_PLAYERS				1
+#define DAMAGE_NONPLAYERS			2
+#define DAMAGE_IN_AIR				4
+#define DAMAGE_SUBCLASSES_PROTECT	8
+
+// Flags for MorphActor -----------------------------------------------------
+
+#define MRF_OLDEFFECTS			0x00000000
+#define MRF_ADDSTAMINA			0x00000001
+#define MRF_FULLHEALTH			0x00000002
+#define MRF_UNDOBYTOMEOFPOWER	0x00000004
+#define MRF_UNDOBYCHAOSDEVICE	0x00000008
+#define MRF_FAILNOTELEFRAG		0x00000010
+#define MRF_FAILNOLAUGH			0x00000020
+#define MRF_WHENINVULNERABLE	0x00000040
+#define MRF_LOSEACTUALWEAPON	0x00000080
+#define MRF_NEWTIDBEHAVIOUR		0x00000100
+#define MRF_UNDOBYDEATH			0x00000200
+#define MRF_UNDOBYDEATHFORCED	0x00000400
+#define MRF_UNDOBYDEATHSAVES	0x00000800
+
+// Shared spawnable things from Hexen. You can spawn these in the other -----
+// games if you provide sprites for them, otherwise they'll be invisible. ---
+
+#define T_ROCK1                 41
+#define T_ROCK2                 42
+#define T_ROCK3                 43
+#define T_DIRT1                 44
+#define T_DIRT2                 45
+#define T_DIRT3                 46
+#define T_DIRT4                 47
+#define T_DIRT5                 48
+#define T_DIRT6                 49
+#define T_STAINEDGLASS1         54
+#define T_STAINEDGLASS2         55
+#define T_STAINEDGLASS3         56
+#define T_STAINEDGLASS4         57
+#define T_STAINEDGLASS5         58
+#define T_STAINEDGLASS6         59
+#define T_STAINEDGLASS7         60
+#define T_STAINEDGLASS8         61
+#define T_STAINEDGLASS9         62
+#define T_STAINEDGLASS0         63
+
+// Doom Spawnable things (used for thingcount() and thing spawners) ---------
+
+#define T_NONE                  0
+#define T_SHOTGUY               1
+#define T_CHAINGUY              2
+#define T_BARON                 3
+#define T_ZOMBIE                4
+#define T_IMP                   5
+#define T_ARACHNOTRON           6
+#define T_SPIDERMASTERMIND      7
+#define T_DEMON                 8
+#define T_SPECTRE               9
+#define T_IMPFIREBALL           10
+#define T_CLIP                  11
+#define T_SHELLS                12
+#define T_CACODEMON             19
+#define T_REVENANT              20
+#define T_BRIDGE                21
+#define T_ARMORBONUS            22
+#define T_STIMPACK              23
+#define T_MEDKIT                24
+#define T_SOULSPHERE            25
+#define T_SHOTGUN               27
+#define T_CHAINGUN              28
+#define T_ROCKETLAUNCHER        29
+#define T_PLASMAGUN             30
+#define T_BFG                   31
+#define T_CHAINSAW              32
+#define T_SUPERSHOTGUN          33
+#define T_PLASMABOLT            51
+#define T_TRACER                53
+#define T_GREENARMOR            68
+#define T_BLUEARMOR             69
+#define T_CELL                  75
+#define T_BLUEKEYCARD           85
+#define T_REDKEYCARD            86
+#define T_YELLOWKEYCARD         87
+#define T_YELLOWSKULLKEY        88
+#define T_REDSKULLKEY           89
+#define T_BLUESKULLKEY          90
+#define T_TEMPLARGEFLAME        98
+#define T_STEALTHBARON          100
+#define T_STEALTHKNIGHT         101
+#define T_STEALTHZOMBIE         102
+#define T_STEALTHSHOTGUY        103
+
+#define T_LOSTSOUL              110
+#define T_VILE                  111
+#define T_MANCUBUS              112
+#define T_HELLKNIGHT            113
+#define T_CYBERDEMON            114
+#define T_PAINELEMENTAL         115
+#define T_WOLFSS                116
+#define T_STEALTHARACHNOTRON    117
+#define T_STEALTHVILE           118
+#define T_STEALTHCACODEMON      119
+#define T_STEALTHCHAINGUY       120
+#define T_STEALTHSERGEANT       121
+#define T_STEALTHIMP            122
+#define T_STEALTHMANCUBUS       123
+#define T_STEALTHREVENANT       124
+#define T_BARREL                125
+#define T_CACODEMONSHOT         126
+#define T_ROCKET                127
+#define T_BFGSHOT               128
+#define T_ARACHNOTRONPLASMA     129
+#define T_BLOOD                 130
+#define T_PUFF                  131
+#define T_MEGASPHERE            132
+#define T_INVULNERABILITY       133
+#define T_BERSERK               134
+#define T_INVISIBILITY          135
+#define T_IRONFEET              136
+#define T_COMPUTERMAP           137
+#define T_LIGHTAMP              138
+#define T_AMMOBOX               139
+#define T_ROCKETAMMO            140
+#define T_ROCKETBOX             141
+#define T_BATTERY               142
+#define T_SHELLBOX              143
+#define T_BACKPACK              144
+#define T_GUTS                  145
+#define T_BLOODPOOL             146
+#define T_BLOODPOOL1            147
+#define T_BLOODPOOL2            148
+#define T_FLAMINGBARREL         149
+#define T_BRAINS                150
+#define T_SCRIPTEDMARINE	151
+#define T_HEALTHBONUS           152
+#define T_MANCUBUSSHOT		153
+#define T_BARONBALL		154
+
+// Heretic Spawnable things (used for thingcount() and thing spawners) ------
+
+#define T_CLINK                 1
+#define T_MUMMYLEADER           2
+#define T_BEAST                 3
+#define T_MUMMY                 4
+//#define T_IMP                 5   // Defined above
+#define T_KNIGHT                6
+#define T_IMPLEADER             7
+#define T_MUMMYGHOST            8
+#define T_MUMMYLEADERGHOST      9
+//#define T_IMPFIREBALL         10
+#define T_WIMPYWANDAMMO         11
+#define T_HEFTYWANDAMMO         12
+#define T_ITEMEGG               14
+#define T_ITEMFLIGHT            15
+#define T_ITEMTELEPORT          18
+#define T_WIZARD                19
+#define T_IRONLICH              20
+#define T_ITEMHEALTHPOTION      23
+#define T_ITEMHEALTHFLASH       24	// incorrect name but keep it for compatibility
+#define T_ITEMHEALTHFLASK       24
+#define T_ITEMHEALTHFULL        25
+#define T_CROSSBOW              27
+#define T_BLASTER               28
+#define T_PHOENIXROD            29
+#define T_SKULLROD              30
+#define T_MACE                  31
+#define T_GAUNTLETS             32
+#define T_WIMPYCROSSBOWAMMO     33
+#define T_HEFTYCROSSBOWAMMO     34
+#define T_WIMPYMACEAMMO         35
+#define T_HEFTYMACEAMMO         36
+#define T_WIMPYBLASTERAMMO      37
+#define T_HEFTYBLASTERAMMO      38
+#define T_MORPHBLAST            40
+#define T_SHIELD1               68
+#define T_SHIELD2               69
+#define T_ITEMTIMEBOMB          72
+#define T_ITEMTORCH             73
+#define T_BLUEKEY               85
+#define T_GREENKEY              86
+#define T_YELLOWKEY             87
+
+#define T_SOUND_WIND            110
+#define T_SOUND_WATERFALL       111
+
+#define T_BEASTBALL             120
+#define T_FEATHER               121
+#define T_CHICKEN               122
+#define T_VOLCANOBALL           123
+#define T_TINYVOLCANOBALL       124
+#define T_POD                   125
+#define T_PODGENERATOR          126
+#define T_KNIGHTAXE             127
+#define T_KNIGHTBLOODAXE        128
+#define T_KNIGHTGHOST           129
+#define T_MUMMYHEAD             131
+#define T_SNAKE                 132
+#define T_ITEMINVULNERABILITY   133
+#define T_ITEMTOME              134
+#define T_ITEMINVISIBILITY      135
+#define T_ITEMBAGOFHOLDING      136
+#define T_ITEMALLMAP            137
+#define T_SNAKEPROJECTILE       138
+#define T_SNAKEPROJECTILEBIG    139
+#define T_WIZARDSHOT            140
+
+#define T_DSPARILTELEPORTDEST   141
+#define T_DSPARILONSERPENT      142
+#define T_DSPARILALONE          143
+#define T_SERPENTFIREBALL       144
+#define T_DSPARILBLUESHOT       145
+#define T_DSPARILWIZARDSPAWNER  146
+
+#define T_CROSSBOWMAINBLAST     147
+#define T_CROSSBOWMINIBLAST     148
+#define T_CROSSBOWPOWERBLAST    149
+#define T_VOLCANO               150
+#define T_POWERWANDMINIBLAST    151
+#define T_POWERWANDBIGGERBLAST  152
+#define T_DEATHBALL             153
+#define T_NOGRAVITYMACEBALL     154
+#define T_BOUNCYMACEBALL        155
+#define T_HEAVYMACEBALL         156
+#define T_RIPPER                157
+#define T_WIMPYSKULLRODAMMO     158
+#define T_HEFTYSKULLRODAMMO     159
+#define T_SKULLRODBLAST         160
+#define T_WIMPYPHOENIXRODAMMO   161
+#define T_HEFTYPHOENIXRODAMMO   162
+#define T_PHOENIXSHOT           163
+#define T_IRONLICHBLUESHOT      164
+#define T_WHIRLWIND             165
+#define T_REDTELEGLITTER        166
+#define T_BLUETELEGLITTER       167
+
+// Hexen Spawnable things (used for thingcount() and thing spawners) ------
+
+#define T_CENTAUR				1
+#define T_CENTAURLEADER			2
+#define T_DEMON1				3
+#define T_ETTIN					4
+#define T_FIREGARGOYLE			5
+#define T_WATERLURKER			6
+#define T_WATERLURKERLEADER		7
+#define T_WRAITH				8
+#define T_WRAITHBURIED			9
+#define T_FIREBALL1				10
+#define T_MANA1					11
+#define T_MANA2					12
+#define T_ITEMBOOTS				13
+#define T_ITEMPORK				14
+#define T_ITEMSUMMON			16
+#define T_ITEMTPORTOTHER		17
+#define T_BISHOP				19
+#define T_ICEGOLEM				20
+#define T_DRAGONSKINBRACERS		22
+#define T_ITEMBOOSTMANA			26
+#define T_FIGHTERAXE			27
+#define T_FIGHTERHAMMER			28
+#define T_FIGHTERSWORD1			29
+#define T_FIGHTERSWORD2			30
+#define T_FIGHTERSWORD3			31
+#define T_CLERICSTAFF			32
+#define T_CLERICHOLY1			33
+#define T_CLERICHOLY2			34
+#define T_CLERICHOLY3			35
+#define T_MAGESHARDS			36
+#define T_MAGESTAFF1			37
+#define T_MAGESTAFF2			38
+#define T_MAGESTAFF3			39
+#define T_ARROW					50
+#define T_DART					51
+#define T_POISONDART			52
+#define T_RIPPERBALL			53
+#define T_BLADE					64
+#define T_ICESHARD				65
+#define T_FLAME_SMALL			66
+#define T_FLAME_LARGE			67
+#define T_MESHARMOR				68
+#define T_FALCONSHIELD			69
+#define T_PLATINUMHELM			70
+#define T_AMULETOFWARDING		71
+#define T_ITEMFLECHETTE			72
+#define T_ITEMREPULSION			74
+#define T_MANA3					75
+#define T_PUZZSKULL				76
+#define T_PUZZGEMBIG			77
+#define T_PUZZGEMRED			78
+#define T_PUZZGEMGREEN1			79
+#define T_PUZZGEMGREEN2			80
+#define T_PUZZGEMBLUE1			81
+#define T_PUZZGEMBLUE2			82
+#define T_PUZZBOOK1				83
+#define T_PUZZBOOK2				84
+#define T_METALKEY				85
+#define T_SMALLMETALKEY			86
+#define T_AXEKEY				87
+#define T_FIREKEY				88
+#define T_EMERALDKEY			89
+#define T_MACEKEY				90
+#define T_SILVERKEY				91
+#define T_RUSTYKEY				92
+#define T_HORNKEY				93
+#define T_SERPENTKEY			94
+#define T_WATERDRIP				95
+#define T_TEMPSMALLFLAME		96
+#define T_PERMSMALLFLAME		97
+#define T_PERMLARGEFLAME		99
+#define T_DEMON_MASH			100
+#define T_DEMON2_MASH			101
+#define T_ETTIN_MASH			102
+#define T_CENTAUR_MASH			103
+#define T_THRUSTSPIKEUP			104
+#define T_THRUSTSPIKEDOWN		105
+#define T_FLESH_DRIP1			106
+#define T_FLESH_DRIP2			107
+#define T_SPARK_DRIP			108
+
+
+// Flags returned by ClassifyActor
+
+#define ACTOR_NONE				0
+#define ACTOR_WORLD				1
+#define ACTOR_PLAYER			2
+#define ACTOR_BOT				4
+#define ACTOR_VOODOODOLL		8
+#define ACTOR_MONSTER			16
+#define ACTOR_ALIVE				32
+#define ACTOR_DEAD				64
+#define ACTOR_MISSILE			128
+#define ACTOR_GENERIC			256
+
+
+// Physical volumes for SoundSequenceOnSector
+
+#define SECSEQ_FLOOR			1
+#define SECSEQ_CEILING			2
+#define SECSEQ_FULLHEIGHT		3
+#define SECSEQ_INTERIOR			4
+
+// Actor pointer selectors
+
+#DEFINE	AAPTR_DEFAULT 0
+#DEFINE	AAPTR_NULL 0x1
+#DEFINE	AAPTR_TARGET 0x2
+#DEFINE	AAPTR_MASTER 0x4
+#DEFINE	AAPTR_TRACER 0x8
+
+#DEFINE	AAPTR_PLAYER_GETTARGET 0x10
+#DEFINE	AAPTR_PLAYER_GETCONVERSATION 0x20
+
+#DEFINE	AAPTR_PLAYER1 0x40
+#DEFINE	AAPTR_PLAYER2 0x80
+#DEFINE	AAPTR_PLAYER3 0x100
+#DEFINE	AAPTR_PLAYER4 0x200
+#DEFINE	AAPTR_PLAYER5 0x400
+#DEFINE	AAPTR_PLAYER6 0x800
+#DEFINE	AAPTR_PLAYER7 0x1000
+#DEFINE	AAPTR_PLAYER8 0x2000
+
+#DEFINE AAPTR_FRIENDPLAYER 0x4000
+
+// Actor pointer operation flags
+
+#DEFINE PTROP_UNSAFETARGET 1
+#DEFINE PTROP_UNSAFEMASTER 2
+#DEFINE PTROP_NOSAFEGUARDS PTROP_UNSAFETARGET |PTROP_UNSAFEMASTER 
+
+// ==========================================================================
+// Skulltag Definitions
+// ==========================================================================
+
+// Skulltag Teams -----------------------------------------------------------
+#define TEAM_BLUE				0
+#define TEAM_RED				1
+#define NO_TEAM					2
+
+// Skulltag Invasion --------------------------------------------------------
+#define IS_WAITINGFORPLAYERS	0
+#define IS_FIRSTCOUNTDOWN		1
+#define IS_INPROGRESS			2
+#define IS_BOSSFIGHT			3
+#define IS_WAVECOMPLETE			4
+#define IS_COUNTDOWN			5
+
+
+#define T_GRENADE				216
+#define T_BFG10KSHOT			217
+#define T_DARKIMPFIREBALL		218
+#define T_CACOLANTERNSHOT		219
+#define T_ABADDONSHOT			221
+
+// Skulltag Monsters --------------------------------------------------------
+#define T_DARKIMP				155
+#define T_BLOODDEMON			156
+#define T_SSGGUY				157
+#define T_HECTEBUS				158
+#define T_CACOLANTERN			159
+#define T_BELPHEGOR				215
+#define T_ABADDON				220
+
+// Skulltag Weapons ---------------------------------------------------------
+#define T_PISTOL				162
+#define T_GRENADELAUNCHER		163
+#define T_RAILGUN				164
+#define T_BFG10000				165
+#define T_MINIGUN				214
+
+// Skulltag Armor/Health Items ----------------------------------------------
+#define T_MAXHEALTHBONUS		166
+#define T_MAXARMORBONUS			167
+#define T_REDARMOR				168
+
+// Skulltag Powerups --------------------------------------------------------
+#define T_TURBOSPHERE			169
+#define T_ANTIGRAVBELT			170
+#define T_TIMEFREEZER			171
+#define T_INFRAGOGGLES			172
+#define T_INFRATRACKER			173
+#define T_TRANSLUCENCY			174
+#define T_DOOMSPHERE			175
+#define T_RANDOMPOWERUP			176
+
+// Skulltag Flags -----------------------------------------------------------
+#define T_BLUEFLAG				177
+#define T_REDFLAG				178
+#define T_WHITEFLAG				179
+
+// Skulltag Runes -----------------------------------------------------------
+#define T_STRENGTH				180
+#define T_RAGE					181
+#define T_DRAIN					182
+#define T_SPREAD				183
+#define T_RESISTANCE			184
+#define T_REGENERATION			185
+#define T_PROSPERITY			186
+#define T_REFLECTION			187
+#define T_HIGHJUMP				188
+#define T_HASTE					189
+
+
+// Events when you have input grabbed
+
+#define EV_KeyDown				1	// data1: unshifted ASCII, data2: shifted ASCII
+#define EV_KeyRepeat			2	// data1: unshifted ASCII, data2: shifted ASCII
+#define EV_KeyUp				3	// data1: unshifted ASCII, data2: shifted ASCII
+#define EV_Char					4	// data1: translated character for text input
+#define EV_MouseMove			5	// data1: x, data2: y
+#define EV_LButtonDown			6
+#define EV_LButtonUp			7
+#define EV_LButtonDblClick		8
+#define EV_MButtonDown			9
+#define EV_MButtonUp			10
+#define EV_MButtonDblClick		11
+#define EV_RButtonDown			12
+#define EV_RButtonUp			13
+#define EV_RButtonDblClick		14
+#define EV_WheelDown			15
+#define EV_WheelUp				16
+
+// Key modifiers (or'd with event type)
+
+#define GKM_SHIFT				256
+#define GKM_CTRL				512
+#define GKM_ALT					1024
+
+// Button modifiers are only valid for EV_MouseMove events
+
+#define GKM_LBUTTON				2048
+#define GKM_MBUTTON				4096
+#define GKM_RBUTTON				8192
+
+// Special codes for some GUI keys, including a few real ASCII codes.
+
+#define GK_PGDN			1
+#define GK_PGUP			2
+#define GK_HOME			3
+#define GK_END			4
+#define GK_LEFT			5
+#define GK_RIGHT		6
+#define GK_ALERT		7		// ASCII bell
+#define GK_BACKSPACE	8		// ASCII
+#define GK_TAB			9		// ASCII
+#define GK_LINEFEED		10		// ASCII
+#define GK_DOWN			10
+#define GK_VTAB			11		// ASCII
+#define GK_UP			11
+#define GK_FORMFEED		12		// ASCII
+#define GK_RETURN		13		// ASCII
+#define GK_F1			14
+#define GK_F2			15
+#define GK_F3			16
+#define GK_F4			17
+#define GK_F5			18
+#define GK_F6			19
+#define GK_F7			20
+#define GK_F8			21
+#define GK_F9			22
+#define GK_F10			23
+#define GK_F11			24
+#define GK_F12			25
+#define GK_DEL			26
+#define GK_ESCAPE		27		// ASCII
+#define GK_FREE1		28
+#define GK_FREE2		29
+#define GK_FREE3		30
+#define GK_CESCAPE		31		// color escape
+
+#define CHANGELEVEL_KEEPFACING 1
+#define CHANGELEVEL_RESETINVENTORY 2
+#define CHANGELEVEL_NOMONSTERS 4
+#define CHANGELEVEL_CHANGESKILL 8
+#define CHANGELEVEL_NOINTERMISSION 16
+#define CHANGELEVEL_RESETHEALTH	32
+
+#define NO_CHANGE 32767.0
+
+#define SECF_SILENT 1
+#define SECF_NOFALLINGDAMAGE 2
+#define SECF_FLOORDROP 4
+#define SECF_NORESPAWN 8
+
+#define BLOCKF_CREATURES 1
+#define BLOCKF_MONSTERS 2
+#define BLOCKF_PLAYERS 4
+#define BLOCKF_FLOATERS 8
+#define BLOCKF_PROJECTILES 16
+#define BLOCKF_EVERYTHING 32
+#define BLOCKF_RAILING 64
+#define BLOCKF_USE 128
+#define BLOCKF_SIGHT 256
+
+#define FOGP_DENSITY 0
+#define FOGP_OUTSIDEDENSITY 1
+#define FOGP_SKYFOG 2
+
+#define PRINTNAME_LEVELNAME -1
+#define PRINTNAME_LEVEL -2
+#define PRINTNAME_SKILL -3
+
+#define CSF_NOFAKEFLOORS 1
+#define CSF_NOBLOCKALL 2
+
+#define TPROP_Name 0
+#define TPROP_Score 1
+#define TPROP_IsValid 2
+#define TPROP_NumPlayers 3
+#define TPROP_NumLivePlayers 4
+#define TPROP_TextColor 5
+#define TPROP_PlayerStartNum 6
+#define TPROP_Spread 7
+#define TPROP_Carrier 8
+#define TPROP_Assister 9
+#define TPROP_FragCount 10
+#define TPROP_DeathCount 11
+#define TPROP_WinCount 12
+#define TPROP_PointCount 13
+#define TPROP_ReturnTics 14
+#define TPROP_TeamItem 15
+#define TPROP_WinnerTheme 16
+#define TPROP_LoserTheme 17
\ No newline at end of file
diff --git a/Build/Compilers/Zandronum/zspecial.acs b/Build/Compilers/Zandronum/zspecial.acs
new file mode 100644
index 0000000..0888a15
--- /dev/null
+++ b/Build/Compilers/Zandronum/zspecial.acs
@@ -0,0 +1,286 @@
+//**************************************************************************
+//**
+//** zspecials.acs
+//**
+//**************************************************************************
+
+special
+//	  1:Polyobj_StartLine
+	  2:Polyobj_RotateLeft(3),
+	  3:Polyobj_RotateRight(3),
+	  4:Polyobj_Move(4),
+//	  5:Polyobj_ExplicitLine
+	  6:Polyobj_MoveTimes8(4),
+	  7:Polyobj_DoorSwing(4),
+	  8:Polyobj_DoorSlide(5),
+	  9:Line_Horizon(0),
+	 10:Door_Close(2),
+	 11:Door_Open(2,3),
+	 12:Door_Raise(3,4),
+	 13:Door_LockedRaise(4,5),
+	 14:Door_Animated(3),
+	 15:Autosave(0),
+//	 16:Transfer_WallLight
+	 17:Thing_Raise(1),
+	 18:StartConversation(1,2),
+	 19:Thing_Stop(1),
+	 20:Floor_LowerByValue(3),
+	 21:Floor_LowerToLowest(2),
+	 22:Floor_LowerToNearest(2),
+	 23:Floor_RaiseByValue(3),
+	 24:Floor_RaiseToHighest(2),
+	 25:Floor_RaiseToNearest(2),
+	 26:Stairs_BuildDown(5),
+	 27:Stairs_BuildUp(5),
+	 28:Floor_RaiseAndCrush(3,4),
+	 29:Pillar_Build(3),
+	 30:Pillar_Open(4),
+	 31:Stairs_BuildDownSync(4),
+	 32:Stairs_BuildUpSync(4),
+	 33:ForceField(0),
+	 34:ClearForceField(1),
+	 35:Floor_RaiseByValueTimes8(3),
+	 36:Floor_LowerByValueTimes8(3),
+	 37:Floor_MoveToValue(3,4),
+	 38:Ceiling_Waggle(5),
+	 39:Teleport_ZombieChanger(2),
+	 40:Ceiling_LowerByValue(3),
+	 41:Ceiling_RaiseByValue(3),
+	 42:Ceiling_CrushAndRaise(3,4),
+	 43:Ceiling_LowerAndCrush(3,4),
+	 44:Ceiling_CrushStop(1),
+	 45:Ceiling_CrushRaiseAndStay(3,4),
+	 46:Floor_CrushStop(1),
+	 47:Ceiling_MoveToValue(3,4),
+//	 48:Sector_Attach3dMidtex
+	 49:GlassBreak(0,1),
+//	 50:ExtraFloor_LightOnly
+	 51:Sector_SetLink(4),
+	 52:Scroll_Wall(5),
+	 53:Line_SetTextureOffset(5),
+	 54:Sector_ChangeFlags(3),
+	 55:Line_SetBlocking(3),
+	 56:Line_SetTextureScale(5),
+//	 57: Sector_SetPortal
+//	 58: Sector_CopyScroller
+	 59:Polyobj_OR_MoveToSpot(3),
+	 60:Plat_PerpetualRaise(3),
+ 	 61:Plat_Stop(1),
+	 62:Plat_DownWaitUpStay(3),
+	 63:Plat_DownByValue(4),
+	 64:Plat_UpWaitDownStay(3),
+	 65:Plat_UpByValue(4),
+	 66:Floor_LowerInstant(3),
+	 67:Floor_RaiseInstant(3),
+	 68:Floor_MoveToValueTimes8(4),
+	 69:Ceiling_MoveToValueTimes8(4),
+	 70:Teleport(1,3),
+	 71:Teleport_NoFog(1,3),
+	 72:ThrustThing(2,4),
+	 73:DamageThing(1,2),
+	 74:Teleport_NewMap(2,3),
+	 75:Teleport_EndGame(0),
+	 76:TeleportOther(3),
+	 77:TeleportGroup(5),
+	 78:TeleportInSector(4,5),
+	 
+	 80:ACS_Execute(2,5),
+	 81:ACS_Suspend(2),
+	 82:ACS_Terminate(2),
+	 83:ACS_LockedExecute(5),
+	 84:ACS_ExecuteWithResult(1,4),
+	 85:ACS_LockedExecuteDoor(5),
+	 86:Polyobj_MoveToSpot(3),
+	 87:Polyobj_Stop(1),
+	 88:Polyobj_MoveTo(4),
+	 89:Polyobj_OR_MoveTo(4),
+	 90:Polyobj_OR_RotateLeft(3),
+	 91:Polyobj_OR_RotateRight(3),
+	 92:Polyobj_OR_Move(4),
+	 93:Polyobj_OR_MoveTimes8(4),
+	 94:Pillar_BuildAndCrush(4,5),
+	 95:FloorAndCeiling_LowerByValue(3),
+	 96:FloorAndCeiling_RaiseByValue(3),
+
+//	100:Scroll_Texture_Left
+//	101:Scroll_Texture_Right
+//	102:Scroll_Texture_Up
+//	103:Scroll_Texture_Down
+
+	109:Light_ForceLightning(1),
+	110:Light_RaiseByValue(2),
+	111:Light_LowerByValue(2),
+	112:Light_ChangeToValue(2),
+	113:Light_Fade(3),
+	114:Light_Glow(4),
+	115:Light_Flicker(3),
+	116:Light_Strobe(5),
+	117:Light_Stop(1),
+//	118:Plane_Copy
+	119:Thing_Damage(2,3),
+	120:Radius_Quake(5),
+//	121:Line_SetIdentification
+	
+	125:Thing_Move(2,3),
+	
+	127:Thing_SetSpecial(5),
+	128:ThrustThingZ(4),
+	129:UsePuzzleItem(0),	// only for setting it on a line. Cannot be called!
+	130:Thing_Activate(1),
+	131:Thing_Deactivate(1),
+	132:Thing_Remove(1),
+	133:Thing_Destroy(1,2),
+	134:Thing_Projectile(5),
+	135:Thing_Spawn(3,4),
+	136:Thing_ProjectileGravity(5),
+	137:Thing_SpawnNoFog(3,4),
+	138:Floor_Waggle(5),
+	139:Thing_SpawnFacing(2,4),
+	140:Sector_ChangeSound(2),
+	
+	143:Player_RemoveItem(2),			// Skulltag Functions
+	144:Player_GiveItem(2),				// Skulltag Functions
+	145:Player_SetTeam(1),				// Skulltag Functions
+	152:Team_Score(2),					// Skulltag Functions
+	153:Team_GivePoints(3),				// Skulltag Functions
+	154:Teleport_NoStop(2, 3),
+
+	157:SetGlobalFogParameter(2),		// GZDoom only!
+	158:FS_Execute(1,4),				// GZDoom only!
+	159:Sector_SetPlaneReflection(3),	// GZDoom only!
+//	160:Sector_Set3DFloor				// GZDoom/Vavoom
+//	161:Sector_SetContents				// Vavoom
+	
+	169:Generic_Crusher2(5),
+	170:Sector_SetCeilingScale2(3),
+	171:Sector_SetFloorScale2(3),
+	172:Plat_UpNearestWaitDownStay(3),
+	173:NoiseAlert(2),
+	174:SendToCommunicator(4),
+	175:Thing_ProjectileIntercept(5),
+	176:Thing_ChangeTID(2),
+	177:Thing_Hate(2,3),
+	178:Thing_ProjectileAimed(4,5),
+	179:ChangeSkill(1),
+	180:Thing_SetTranslation(2),
+//	181:Plane_Align,
+	182:Line_Mirror(0),
+	183:Line_AlignCeiling(2),
+	184:Line_AlignFloor(2),
+	185:Sector_SetRotation(3),
+	186:Sector_SetCeilingPanning(5),
+	187:Sector_SetFloorPanning(5),
+	188:Sector_SetCeilingScale(5),
+	189:Sector_SetFloorScale(5),
+	191:SetPlayerProperty(3),
+	192:Ceiling_LowerToHighestFloor(2),
+	193:Ceiling_LowerInstant(3),
+	194:Ceiling_RaiseInstant(3),
+	195:Ceiling_CrushRaiseAndStayA(4,5),
+	196:Ceiling_CrushAndRaiseA(4,5),
+	197:Ceiling_CrushAndRaiseSilentA(4,5),
+	198:Ceiling_RaiseByValueTimes8(3),
+	199:Ceiling_LowerByValueTimes8(3),
+	200:Generic_Floor(5),
+	201:Generic_Ceiling(5),
+	202:Generic_Door(5),
+	203:Generic_Lift(5),
+	204:Generic_Stairs(5),
+	205:Generic_Crusher(5),
+	206:Plat_DownWaitUpStayLip(4,5),
+	207:Plat_PerpetualRaiseLip(4),
+	208:TranslucentLine(2,3),
+//	209:Transfer_Heights,
+//	210:Transfer_FloorLight,
+//	211:Transfer_CeilingLight,
+	212:Sector_SetColor(4,5),
+	213:Sector_SetFade(4),
+	214:Sector_SetDamage(3),
+	215:Teleport_Line(2),
+	216:Sector_SetGravity(3),
+	217:Stairs_BuildUpDoom(5),
+	218:Sector_SetWind(4),
+	219:Sector_SetFriction(2),
+	220:Sector_SetCurrent(4),
+	221:Scroll_Texture_Both(5),
+//	222:Scroll_Texture_Model,
+	223:Scroll_Floor(4),
+	224:Scroll_Ceiling(4),
+//	225:Scroll_Texture_Offsets,
+	226:ACS_ExecuteAlways(2,5),
+//	227:PointPush_SetForce,
+	228:Plat_RaiseAndStayTx0(2),
+	229:Thing_SetGoal(3,4),
+	230:Plat_UpByValueStayTx(3),
+	231:Plat_ToggleCeiling(1),
+	232:Light_StrobeDoom(3),
+	233:Light_MinNeighbor(1),
+	234:Light_MaxNeighbor(1),
+	235:Floor_TransferTrigger(1),
+	236:Floor_TransferNumeric(1),
+	237:ChangeCamera(3),
+	238:Floor_RaiseToLowestCeiling(2),
+	239:Floor_RaiseByValueTxTy(3),
+	240:Floor_RaiseByTexture(2),
+	241:Floor_LowerToLowestTxTy(2),
+	242:Floor_LowerToHighest(3),
+	243:Exit_Normal(1),
+	244:Exit_Secret(1),
+	245:Elevator_RaiseToNearest(2),
+	246:Elevator_MoveToFloor(2),
+	247:Elevator_LowerToNearest(2),
+	248:HealThing(1,2),
+	249:Door_CloseWaitOpen(3, 4),
+	250:Floor_Donut(3),
+	251:FloorAndCeiling_LowerRaise(3),
+	252:Ceiling_RaiseToNearest(2),
+	253:Ceiling_LowerToLowest(2),
+	254:Ceiling_LowerToFloor(2),
+	255:Ceiling_CrushRaiseAndStaySilA(4,5),
+	
+	// internal functions have negative values
+	-1:GetLineUDMFInt(2),
+	-2:GetLineUDMFFixed(2),
+	-3:GetThingUDMFInt(2),
+	-4:GetThingUDMFFixed(2),
+	-5:GetSectorUDMFInt(2),
+	-6:GetSectorUDMFFixed(2),
+	-7:GetSideUDMFInt(3),
+	-8:GetSideUDMFFixed(3),
+	-9:GetActorVelX(1),
+	-10:GetActorVelY(1),
+	-11:GetActorVelZ(1),
+	-12:SetActivator(1),
+	-13:SetActivatorToTarget(1),
+	-14:GetActorViewHeight(1),
+	-15:GetChar(2),
+	-16:GetAirSupply(1),
+	-17:SetAirSupply(2),
+	-18:SetSkyScrollSpeed(2),
+	-19:GetArmorType(2),
+	-20:SpawnSpotForced(4),
+	-21:SpawnSpotFacingForced(3),
+	-22:CheckActorProperty(3),
+	-23:SetActorVelocity(6),
+	-24:SetUserVariable(3),
+	-25:GetUserVariable(2),
+	-26:Radius_Quake2(6),
+	-27:CheckActorClass(2),
+	-28:SetUserArray(4),
+	-29:GetUserArray(3),
+	-30:SoundSequenceOnActor(2),
+	-31:SoundSequenceOnSector(3),
+	-32:SoundSequenceOnPolyobj(2),
+	-33:GetPolyobjX(1),
+	-34:GetPolyobjY(1),
+	-45:ACS_NamedExecuteAlways(2,5),
+	-100:ResetMap(0),
+	-101:PlayerIsSpectator(1),
+	-102:ConsolePlayerNumber(0),
+	-103:GetTeamProperty(2),
+	-104:GetPlayerLivesLeft(1),
+	-105:SetPlayerLivesLeft(2),
+	-106:KickFromGame(2),
+	-19620:GetTeamScore(1), //Zdaemon
+	-100000:__EndOfList__(10);
+	//-1000:__EndOfList__(10);
\ No newline at end of file
diff --git a/Build/Compilers/Zandronum/zwvars.acs b/Build/Compilers/Zandronum/zwvars.acs
new file mode 100644
index 0000000..b21f4e7
--- /dev/null
+++ b/Build/Compilers/Zandronum/zwvars.acs
@@ -0,0 +1,8 @@
+
+//**************************************************************************
+//**
+//** zwvars.acs
+//**
+//**************************************************************************
+
+// include your world-variable declarations here.
diff --git a/Build/Configurations/Boom_Doom2Doom.cfg b/Build/Configurations/Boom_Doom2Doom.cfg
new file mode 100644
index 0000000..52cbb9f
--- /dev/null
+++ b/Build/Configurations/Boom_Doom2Doom.cfg
@@ -0,0 +1,62 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "Boom: Doom 2 (Doom format)";
+
+// This is the simplified game engine/sourceport name
+engine = "boom";
+
+// Should this configuration be initially available?
+enabledbydefault = true;
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD DOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\Doom_common.cfg", "common");
+
+// Settings common to Doom map format
+include("Includes\\Boom_common.cfg", "mapformat_doom");
+
+// Settings common to Doom games
+include("Includes\\Game_Doom.cfg");
+
+//mxd. No DECORATE support in vanilla
+decorategames = "";
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\Doom_misc.cfg", "thingsfilters");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Doom_things.cfg");
+	include("Includes\\Doom2_things.cfg");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+}
diff --git a/Build/Configurations/Boom_DoomDoom.cfg b/Build/Configurations/Boom_DoomDoom.cfg
new file mode 100644
index 0000000..5bb7ee9
--- /dev/null
+++ b/Build/Configurations/Boom_DoomDoom.cfg
@@ -0,0 +1,64 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "Boom: Doom (Doom format)";
+
+// This is the simplified game engine/sourceport name
+engine = "boom";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD DOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\Doom_common.cfg", "common");
+
+// Settings common to Doom map format
+include("Includes\\Boom_common.cfg", "mapformat_doom");
+
+// Settings common to Doom games
+include("Includes\\Game_Doom.cfg");
+
+//mxd. No DECORATE support in vanilla
+decorategames = "";
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\Doom_misc.cfg", "thingsfilters");
+}
+
+//Default map name
+defaultlumpname = "E1M1";
+
+// Default testing parameters
+include("Includes\\Test_params.cfg", "vanilla_exmx");
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Doom_things.cfg");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+}
diff --git a/Build/Configurations/Doom_Doom2Doom.cfg b/Build/Configurations/Doom_Doom2Doom.cfg
new file mode 100644
index 0000000..e7d7fd8
--- /dev/null
+++ b/Build/Configurations/Doom_Doom2Doom.cfg
@@ -0,0 +1,62 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "Doom: Doom 2 (Doom format)";
+
+// This is the simplified game engine/sourceport name
+engine = "doom2";
+
+// Should this configuration be initially available?
+enabledbydefault = true;
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD DOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\Doom_common.cfg", "common");
+
+// Settings common to Doom map format
+include("Includes\\Doom_common.cfg", "mapformat_doom");
+
+// Settings common to Doom games
+include("Includes\\Game_Doom.cfg");
+
+//mxd. No DECORATE support in vanilla
+decorategames = "";
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\Doom_misc.cfg", "thingsfilters");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Doom_things.cfg");
+	include("Includes\\Doom2_things.cfg");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+}
diff --git a/Build/Configurations/Doom_DoomDoom.cfg b/Build/Configurations/Doom_DoomDoom.cfg
new file mode 100644
index 0000000..79ce1ba
--- /dev/null
+++ b/Build/Configurations/Doom_DoomDoom.cfg
@@ -0,0 +1,64 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "Doom: Doom (Doom format)";
+
+// This is the simplified game engine/sourceport name
+engine = "doom";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD DOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\Doom_common.cfg", "common");
+
+// Settings common to Doom map format
+include("Includes\\Doom_common.cfg", "mapformat_doom");
+
+// Settings common to Doom games
+include("Includes\\Game_Doom.cfg");
+
+//mxd. No DECORATE support in vanilla
+decorategames = "";
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\Doom_misc.cfg", "thingsfilters");
+}
+
+//Default map name
+defaultlumpname = "E1M1";
+
+// Default testing parameters
+include("Includes\\Test_params.cfg", "vanilla_exmx");
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Doom_things.cfg");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+}
diff --git a/Build/Configurations/GZDoom_DoomDoom.cfg b/Build/Configurations/GZDoom_DoomDoom.cfg
new file mode 100644
index 0000000..bd0652e
--- /dev/null
+++ b/Build/Configurations/GZDoom_DoomDoom.cfg
@@ -0,0 +1,67 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "GZDoom: Doom 2 (Doom format)";
+
+// This is the simplified game engine/sourceport name
+engine = "gzdoom";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to Doom map format
+include("Includes\\ZDoom_common.cfg", "mapformat_doom");
+
+// Settings common to Doom games
+include("Includes\\Game_Doom.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\Doom_misc.cfg", "thingsfilters");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Doom_things.cfg");
+	include("Includes\\Doom2_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "doom");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+	// Additional actors from the engine
+	include("Includes\\GZDoom_things.cfg", "gzdoom");
+	include("Includes\\GZDoom_things.cfg", "gzdoom_lights");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_doom");
+}
diff --git a/Build/Configurations/GZDoom_DoomHexen.cfg b/Build/Configurations/GZDoom_DoomHexen.cfg
new file mode 100644
index 0000000..a145c3b
--- /dev/null
+++ b/Build/Configurations/GZDoom_DoomHexen.cfg
@@ -0,0 +1,70 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "GZDoom: Doom 2 (Hexen format)";
+
+// This is the simplified game engine/sourceport name
+engine = "gzdoom";
+
+// Should this configuration be initially available?
+enabledbydefault = true;
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to Hexen map format
+include("Includes\\ZDoom_common.cfg", "mapformat_hexen");
+
+// Settings common to Doom games
+include("Includes\\Game_Doom.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\Doom_misc.cfg", "thingsfilters");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Doom_things.cfg");
+	include("Includes\\Doom2_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "doom");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+	// Additional actors from the engine
+	include("Includes\\GZDoom_things.cfg", "gzdoom");
+    include("Includes\\GZDoom_things.cfg", "gzdoom_lights");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_doom");
+}
diff --git a/Build/Configurations/GZDoom_DoomUDMF.cfg b/Build/Configurations/GZDoom_DoomUDMF.cfg
new file mode 100644
index 0000000..5b4d069
--- /dev/null
+++ b/Build/Configurations/GZDoom_DoomUDMF.cfg
@@ -0,0 +1,70 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "GZDoom: Doom 2 (UDMF)";
+
+// This is the simplified game engine/sourceport name
+engine = "gzdoom";
+
+// Should this configuration be initially available?
+enabledbydefault = true;
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to text map format
+include("Includes\\ZDoom_common.cfg", "mapformat_udmf");
+
+// Settings common to Doom games
+include("Includes\\Game_Doom.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\ZDoom_misc.cfg", "thingsfilters_udmf");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Doom_things.cfg");
+	include("Includes\\Doom2_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "doom");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+	// Additional actors from the engine
+	include("Includes\\GZDoom_things.cfg", "gzdoom");
+	include("Includes\\GZDoom_things.cfg", "gzdoom_lights");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_doom");
+}
diff --git a/Build/Configurations/GZDoom_HereticDoom.cfg b/Build/Configurations/GZDoom_HereticDoom.cfg
new file mode 100644
index 0000000..538f6b5
--- /dev/null
+++ b/Build/Configurations/GZDoom_HereticDoom.cfg
@@ -0,0 +1,67 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "GZDoom: Heretic (Doom format)";
+
+// This is the simplified game engine/sourceport name
+engine = "gzdoom";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to Doom map format
+include("Includes\\ZDoom_common.cfg", "mapformat_doom");
+include("Includes\\Heretic_misc.cfg", "mapformat_doom");
+
+// Settings common to Heretic games
+include("Includes\\Game_Heretic.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\Doom_misc.cfg", "thingsfilters");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Heretic_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "heretic");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+	// Additional actors from the engine
+	include("Includes\\GZDoom_things.cfg", "gzdoom");
+	include("Includes\\GZDoom_things.cfg", "gzdoom_lights");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_heretic");
+}
diff --git a/Build/Configurations/GZDoom_HereticHexen.cfg b/Build/Configurations/GZDoom_HereticHexen.cfg
new file mode 100644
index 0000000..fd792f7
--- /dev/null
+++ b/Build/Configurations/GZDoom_HereticHexen.cfg
@@ -0,0 +1,66 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "GZDoom: Heretic (Hexen format)";
+
+// This is the simplified game engine/sourceport name
+engine = "gzdoom";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to Hexen map format
+include("Includes\\ZDoom_common.cfg", "mapformat_hexen");
+
+// Settings common to Heretic games
+include("Includes\\Game_Heretic.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\Doom_misc.cfg", "thingsfilters");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Heretic_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "heretic");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+	// Additional actors from the engine
+	include("Includes\\GZDoom_things.cfg", "gzdoom");
+	include("Includes\\GZDoom_things.cfg", "gzdoom_lights");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_heretic");
+}
diff --git a/Build/Configurations/GZDoom_HereticUDMF.cfg b/Build/Configurations/GZDoom_HereticUDMF.cfg
new file mode 100644
index 0000000..7549bce
--- /dev/null
+++ b/Build/Configurations/GZDoom_HereticUDMF.cfg
@@ -0,0 +1,66 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "GZDoom: Heretic (UDMF)";
+
+// This is the simplified game engine/sourceport name
+engine = "gzdoom";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to text map format
+include("Includes\\ZDoom_common.cfg", "mapformat_udmf");
+
+// Settings common to Heretic games
+include("Includes\\Game_Heretic.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\ZDoom_misc.cfg", "thingsfilters_udmf");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Heretic_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "heretic");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+	// Additional actors from the engine
+	include("Includes\\GZDoom_things.cfg", "gzdoom");
+	include("Includes\\GZDoom_things.cfg", "gzdoom_lights");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_heretic");
+}
diff --git a/Build/Configurations/GZDoom_HexenHexen.cfg b/Build/Configurations/GZDoom_HexenHexen.cfg
new file mode 100644
index 0000000..398b417
--- /dev/null
+++ b/Build/Configurations/GZDoom_HexenHexen.cfg
@@ -0,0 +1,66 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "GZDoom: Hexen (Hexen format)";
+
+// This is the simplified game engine/sourceport name
+engine = "gzdoom";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to Hexen map format
+include("Includes\\ZDoom_common.cfg", "mapformat_hexen");
+
+// Settings common to Hexen games
+include("Includes\\Game_Hexen.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\Hexen_misc.cfg", "thingsfilters");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Hexen_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "hexen");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+	// Additional actors from the engine
+	include("Includes\\GZDoom_things.cfg", "gzdoom");
+	include("Includes\\GZDoom_things.cfg", "gzdoom_lights");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_hexen");
+}
diff --git a/Build/Configurations/GZDoom_HexenUDMF.cfg b/Build/Configurations/GZDoom_HexenUDMF.cfg
new file mode 100644
index 0000000..8cc1cc4
--- /dev/null
+++ b/Build/Configurations/GZDoom_HexenUDMF.cfg
@@ -0,0 +1,66 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "GZDoom: Hexen (UDMF)";
+
+// This is the simplified game engine/sourceport name
+engine = "gzdoom";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to text map format
+include("Includes\\ZDoom_common.cfg", "mapformat_udmf");
+
+// Settings common to Hexen games
+include("Includes\\Game_Hexen.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\ZDoom_misc.cfg", "thingsfilters_udmf");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Hexen_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "hexen");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+	// Additional actors from the engine
+	include("Includes\\GZDoom_things.cfg", "gzdoom");
+	include("Includes\\GZDoom_things.cfg", "gzdoom_lights");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_hexen");
+}
diff --git a/Build/Configurations/GZDoom_StrifeDoom.cfg b/Build/Configurations/GZDoom_StrifeDoom.cfg
new file mode 100644
index 0000000..56cb821
--- /dev/null
+++ b/Build/Configurations/GZDoom_StrifeDoom.cfg
@@ -0,0 +1,67 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "GZDoom: Strife (Doom format)";
+
+// This is the simplified game engine/sourceport name
+engine = "gzdoom";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to Doom map format
+include("Includes\\ZDoom_common.cfg", "mapformat_doom");
+include("Includes\\Strife_misc.cfg", "mapformat_doom");
+
+// Settings common to Strife games
+include("Includes\\Game_Strife.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\Strife_misc.cfg", "thingsfilters");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Strife_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "strife");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+	// Additional actors from the engine
+	include("Includes\\GZDoom_things.cfg", "gzdoom");
+	include("Includes\\GZDoom_things.cfg", "gzdoom_lights");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_strife");
+}
diff --git a/Build/Configurations/GZDoom_StrifeHexen.cfg b/Build/Configurations/GZDoom_StrifeHexen.cfg
new file mode 100644
index 0000000..4567fce
--- /dev/null
+++ b/Build/Configurations/GZDoom_StrifeHexen.cfg
@@ -0,0 +1,66 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "GZDoom: Strife (Hexen format)";
+
+// This is the simplified game engine/sourceport name
+engine = "gzdoom";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to Hexen map format
+include("Includes\\ZDoom_common.cfg", "mapformat_hexen");
+
+// Settings common to Strife games
+include("Includes\\Game_Strife.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\Strife_misc.cfg", "thingsfilters");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Strife_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "strife");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+	// Additional actors from the engine
+	include("Includes\\GZDoom_things.cfg", "gzdoom");
+	include("Includes\\GZDoom_things.cfg", "gzdoom_lights");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_strife");
+}
diff --git a/Build/Configurations/GZDoom_StrifeUDMF.cfg b/Build/Configurations/GZDoom_StrifeUDMF.cfg
new file mode 100644
index 0000000..39f036f
--- /dev/null
+++ b/Build/Configurations/GZDoom_StrifeUDMF.cfg
@@ -0,0 +1,66 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "GZDoom: Strife (UDMF)";
+
+// This is the simplified game engine/sourceport name
+engine = "gzdoom";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to text map format
+include("Includes\\ZDoom_common.cfg", "mapformat_udmf");
+
+// Settings common to Strife games
+include("Includes\\Game_Strife.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\ZDoom_misc.cfg", "thingsfilters_udmf");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Strife_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "strife");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+	// Additional actors from the engine
+	include("Includes\\GZDoom_things.cfg", "gzdoom");
+	include("Includes\\GZDoom_things.cfg", "gzdoom_lights");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_strife");
+}
diff --git a/Build/Configurations/Heretic_HereticDoom.cfg b/Build/Configurations/Heretic_HereticDoom.cfg
new file mode 100644
index 0000000..8329e0a
--- /dev/null
+++ b/Build/Configurations/Heretic_HereticDoom.cfg
@@ -0,0 +1,64 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "Heretic: Heretic (Doom format)";
+
+// This is the simplified game engine/sourceport name
+engine = "heretic";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD DOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\Doom_common.cfg", "common");
+
+// Settings common to Doom map format
+include("Includes\\Heretic_common.cfg", "mapformat_doom");
+
+// Settings common to Doom games
+include("Includes\\Game_Heretic.cfg");
+
+//mxd. No DECORATE support in vanilla
+decorategames = "";
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\Doom_misc.cfg", "thingsfilters");
+}
+
+//Default map name
+defaultlumpname = "E1M1";
+
+// Default testing parameters
+include("Includes\\Test_params.cfg", "vanilla_exmx");
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Heretic_things.cfg");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+}
diff --git a/Build/Configurations/Hexen_HexenHexen.cfg b/Build/Configurations/Hexen_HexenHexen.cfg
new file mode 100644
index 0000000..2de8824
--- /dev/null
+++ b/Build/Configurations/Hexen_HexenHexen.cfg
@@ -0,0 +1,62 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "Hexen: Hexen (Hexen format)";
+
+// This is the simplified game engine/sourceport name
+engine = "hexen";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\Doom_common.cfg", "common");
+
+// Settings common to Hexen map format
+include("Includes\\Hexen_common.cfg", "mapformat_hexen");
+
+// Settings common to Hexen games
+include("Includes\\Game_Hexen.cfg");
+
+//mxd. No DECORATE support in vanilla
+decorategames = "";
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\Hexen_misc.cfg", "thingsfilters");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Hexen_things.cfg");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_hexen");
+}
diff --git a/Build/Configurations/Includes/Boom_common.cfg b/Build/Configurations/Includes/Boom_common.cfg
new file mode 100644
index 0000000..b80246e
--- /dev/null
+++ b/Build/Configurations/Includes/Boom_common.cfg
@@ -0,0 +1,107 @@
+mapformat_doom
+{
+  // The format interface handles the map data format
+  formatinterface = "DoomMapSetIO";
+
+	maplumpnames
+	{
+		include("Doom_misc.cfg", "doommaplumpnames");
+		include("Boom_misc.cfg", "boommaplumpnames");
+	}
+
+  // When this is set to true, sectors with the same tag will light up when a line is highlighted
+  linetagindicatesectors = true;
+
+  // Special linedefs
+  include("ZDoom_misc.cfg", "speciallinedefs_doomhexen");
+
+  // Default flags for first new thing
+  defaultthingflags
+  {
+    include("Doom_misc.cfg", "defaultthingflags");
+  }
+
+  // Door making
+  include("ZDoom_misc.cfg", "doormaking_doom");
+
+  // Generalized actions
+  generalizedlinedefs = true;
+  generalizedsectors = true;
+  
+  // GENERALIZED LINEDEF TYPES
+	gen_linedeftypes
+	{
+		include("Boom_generalized.cfg", "gen_linedeftypes");
+	}
+  
+  // GENERALIZED SECTOR TYPES
+	gen_sectortypes
+	{
+		include("Boom_generalized.cfg", "gen_sectortypes");
+	}
+  
+  // DEFAULT SECTOR BRIGHTNESS LEVELS
+  sectorbrightness
+  {
+    include("Doom_misc.cfg", "sectorbrightness");
+  }
+
+  // SECTOR TYPES
+  sectortypes
+  {
+    include("Doom_sectors.cfg");
+  }
+
+	// LINEDEF FLAGS
+	linedefflags
+	{
+		include("Doom_misc.cfg", "linedefflags");
+		include("Boom_misc.cfg", "linedefflags");
+	}
+
+	// LINEDEF ACTIVATIONS
+	linedefactivations
+	{
+	}
+
+	// Linedef flags UDMF translation table
+	// This is needed for copy/paste and prefabs to work properly
+	// When the UDMF field name is prefixed with ! it is inverted
+	linedefflagstranslation
+	{
+		include("Doom_misc.cfg", "linedefflagstranslation");
+    include("Boom_misc.cfg", "linedefflagstranslation");
+	}
+
+	// LINEDEF TYPES
+	linedeftypes
+	{
+		include("Doom_linedefs.cfg");
+    include("Boom_linedefs.cfg");
+	}
+
+	// THING FLAGS
+	thingflags
+	{
+		include("Doom_misc.cfg", "thingflags");
+    include("Boom_misc.cfg", "thingflags");
+	}
+
+	// Thing flags UDMF translation table
+	// This is needed for copy/paste and prefabs to work properly
+	// When the UDMF field name is prefixed with ! it is inverted
+	thingflagstranslation
+	{
+		include("Doom_misc.cfg", "thingflagstranslation");
+    include("Boom_misc.cfg", "thingflagstranslation");
+	}
+		// How to compare thing flags (for the stuck things error checker)
+	thingflagscompare
+	{
+		include("Boom_misc.cfg", "thingflagscompare");
+	}
+
+	// Things flags masks
+	include("Doom_misc.cfg", "thingflagsmasks");
+
+}
\ No newline at end of file
diff --git a/Build/Configurations/Includes/Boom_generalized.cfg b/Build/Configurations/Includes/Boom_generalized.cfg
new file mode 100644
index 0000000..f2c0f99
--- /dev/null
+++ b/Build/Configurations/Includes/Boom_generalized.cfg
@@ -0,0 +1,425 @@
+
+// Generalized sector types
+gen_sectortypes
+{
+	lighting
+	{
+		0 = "Normal";
+		1 = "Light Blinks (randomly)";
+		2 = "Light Blinks (0.5 sec)";
+		3 = "Light Blinks (1 sec)";
+		8 = "Light Glows (1+ sec)";
+		12 = "Light Blinks (0.5 sec sync)";
+		13 = "Light Blinks (1 sec sync)";
+		17 = "Light Flickers (randomly)";
+	}
+	
+	damage
+	{
+		0 = "None";
+		32 = "5 per second";
+		64 = "10 per second";
+		96 = "20 per second";
+	}
+	
+	secret
+	{
+		0 = "No";
+		128 = "Yes";
+	}
+	
+	friction
+	{
+		0 = "Disabled";
+		256 = "Enabled";
+	}
+	
+	wind
+	{
+		0 = "Disabled";
+		512 = "Enabled";
+	}
+}
+
+
+// Generalized linedef types
+gen_linedeftypes
+{
+	normal
+	{
+		title = "None";
+		offset = 0;
+		length = 0;
+	}
+	
+	floors
+	{
+		title = "Floor";
+		offset = 24576;
+		length = 8192;
+		
+		trigger
+		{
+			0 = "Walk Over Once";
+			1 = "Walk Over Repeatable";
+			2 = "Switch Once";
+			3 = "Switch Repeatable";
+			4 = "Gunfire Once";
+			5 = "Gunfire Repeatable";
+			6 = "Door Once";
+			7 = "Door Repeatable";
+		}
+		
+		direction
+		{
+			0 = "Down";
+			64 = "Up";
+		}
+		
+		target
+		{
+			0 = "Highest Adjacent Floor";
+			128 = "Lowest Adjacent Floor";
+			256 = "Next Adjacent Floor";
+			384 = "Lowest Adjacent Ceiling";
+			512 = "Ceiling";
+			640 = "Shortest Lower Texture";
+			768 = "24 Map Pixels (relative)";
+			896 = "32 Map Pixels (relative)";
+		}
+		
+		speed
+		{
+			0 = "Slow";
+			8 = "Normal";
+			16 = "Fast";
+			24 = "Turbo";
+		}
+		
+		model
+		{
+			0 = "Trigger";
+			32 = "Numeric";
+		}
+		
+		change
+		{
+			0 = "None";
+			1024 = "Change Texture and Remove Effect";
+			2048 = "Change Texture Only";
+			3072 = "Change Texture and Effect";
+		}
+		
+		crusher
+		{
+			0 = "No";
+			4096 = "Yes";
+		}
+	}
+	
+	ceilings
+	{
+		title = "Ceiling";
+		offset = 16384;
+		length = 8192;
+		
+		trigger
+		{
+			0 = "Walk Over Once";
+			1 = "Walk Over Repeatable";
+			2 = "Switch Once";
+			3 = "Switch Repeatable";
+			4 = "Gunfire Once";
+			5 = "Gunfire Repeatable";
+			6 = "Door Once";
+			7 = "Door Repeatable";
+		}
+		
+		direction
+		{
+			0 = "Down";
+			64 = "Up";
+		}
+		
+		target
+		{
+			0 = "Highest Adjacent Ceiling";
+			128 = "Lowest Adjacent Ceiling";
+			256 = "Next Adjacent Ceiling";
+			384 = "Highest Adjacent Floor";
+			512 = "Floor";
+			640 = "Shortest Lower Texture";
+			768 = "24 Map Pixels (relative)";
+			896 = "32 Map Pixels (relative)";
+		}
+		
+		speed
+		{
+			0 = "Slow";
+			8 = "Normal";
+			16 = "Fast";
+			24 = "Turbo";
+		}
+		
+		model
+		{
+			0 = "Trigger";
+			32 = "Numeric";
+		}
+		
+		change
+		{
+			0 = "None";
+			1024 = "Change Texture and Remove Effect";
+			2048 = "Change Texture Only";
+			3072 = "Change Texture and Effect";
+		}
+		
+		crusher
+		{
+			0 = "No";
+			4096 = "Yes";
+		}
+	}
+	
+	doors
+	{
+		title = "Door";
+		offset = 15360;
+		length = 1024;
+		
+		trigger
+		{
+			0 = "Walk Over Once";
+			1 = "Walk Over Repeatable";
+			2 = "Switch Once";
+			3 = "Switch Repeatable";
+			4 = "Gunfire Once";
+			5 = "Gunfire Repeatable";
+			6 = "Door Once";
+			7 = "Door Repeatable";
+		}
+		
+		action
+		{
+			0 = "Open Wait Close";
+			32 = "Open Only";
+			64 = "Close Wait Open";
+			96 = "Close Only";
+		}
+		
+		speed
+		{
+			0 = "Slow";
+			8 = "Normal";
+			16 = "Fast";
+			24 = "Turbo";
+		}
+		
+		wait
+		{
+			0 = "1 Second";
+			256 = "4 Seconds";
+			512 = "9 Seconds";
+			768 = "30 Seconds";
+		}
+		
+		monsters
+		{
+			0 = "No";
+			128 = "Yes";
+		}
+	}
+	
+	lockeddoors
+	{
+		title = "Locked Door";
+		offset = 14336;
+		length = 1024;
+		
+		trigger
+		{
+			0 = "Walk Over Once";
+			1 = "Walk Over Repeatable";
+			2 = "Switch Once";
+			3 = "Switch Repeatable";
+			4 = "Gunfire Once";
+			5 = "Gunfire Repeatable";
+			6 = "Door Once";
+			7 = "Door Repeatable";
+		}
+		
+		action
+		{
+			0 = "Open Wait Close";
+			32 = "Open Only";
+		}
+		
+		speed
+		{
+			0 = "Slow";
+			8 = "Normal";
+			16 = "Fast";
+			24 = "Turbo";
+		}
+		
+		lock
+		{
+			0 = "Any";
+			64 = "Red Keycard";
+			128 = "Blue Keycard";
+			192 = "Yellow Keycard";
+			256 = "Red Skullkey";
+			320 = "Blue Skullkey";
+			384 = "Yellow Skullkey";
+			448 = "All";
+		}
+		
+		combination
+		{
+			0 = "No (each is a different key)";
+			512 = "Keycard and Skullkey are same";
+		}
+	}
+	
+	lifts
+	{
+		title = "Lift";
+		offset = 13312;
+		length = 1024;
+		
+		trigger
+		{
+			0 = "Walk Over Once";
+			1 = "Walk Over Repeatable";
+			2 = "Switch Once";
+			3 = "Switch Repeatable";
+			4 = "Gunfire Once";
+			5 = "Gunfire Repeatable";
+			6 = "Door Once";
+			7 = "Door Repeatable";
+		}
+		
+		target
+		{
+			0 = "Lowest adjacent Floor";
+			256 = "Next adjacent Floor";
+			512 = "Lowest adjacent Ceiling";
+			768 = "Perpetual Lowest and Highest Floors";
+		}
+		
+		speed
+		{
+			0 = "Slow";
+			8 = "Normal";
+			16 = "Fast";
+			24 = "Turbo";
+		}
+		
+		delay
+		{
+			0 = "1 Second";
+			64 = "3 Seconds";
+			128 = "5 Seconds";
+			192 = "10 Seconds";
+		}
+		
+		monsters
+		{
+			0 = "No";
+			32 = "Yes";
+		}
+	}
+	
+	stairs
+	{
+		title = "Stairs";
+		offset = 12288;
+		length = 1024;
+		
+		trigger
+		{
+			0 = "Walk Over Once";
+			1 = "Walk Over Repeatable";
+			2 = "Switch Once";
+			3 = "Switch Repeatable";
+			4 = "Gunfire Once";
+			5 = "Gunfire Repeatable";
+			6 = "Door Once";
+			7 = "Door Repeatable";
+		}
+		
+		direction
+		{
+			0 = "Down";
+			256 = "Up";
+		}
+		
+		step
+		{
+			0 = "4 Map Pixels";
+			64 = "8 Map Pixels";
+			128 = "16 Map Pixels";
+			192 = "24 Map Pixels";
+		}
+		
+		speed
+		{
+			0 = "Slow";
+			8 = "Normal";
+			16 = "Fast";
+			24 = "Turbo";
+		}
+		
+		break
+		{
+			0 = "At different texture";
+			512 = "No";
+		}
+		
+		monsters
+		{
+			0 = "No";
+			32 = "Yes";
+		}
+	}
+	
+	crushers
+	{
+		title = "Crusher";
+		offset = 12160;
+		length = 128;
+		
+		trigger
+		{
+			0 = "Walk Over Once";
+			1 = "Walk Over Repeatable";
+			2 = "Switch Once";
+			3 = "Switch Repeatable";
+			4 = "Gunfire Once";
+			5 = "Gunfire Repeatable";
+			6 = "Door Once";
+			7 = "Door Repeatable";
+		}
+		
+		speed
+		{
+			0 = "Slow";
+			8 = "Normal";
+			16 = "Fast";
+			24 = "Turbo";
+		}
+		
+		silent
+		{
+			0 = "No";
+			64 = "Yes";
+		}
+		
+		monsters
+		{
+			0 = "No";
+			32 = "Yes";
+		}
+	}
+}
diff --git a/Build/Configurations/Includes/Boom_linedefs.cfg b/Build/Configurations/Includes/Boom_linedefs.cfg
new file mode 100644
index 0000000..d1d25c9
--- /dev/null
+++ b/Build/Configurations/Includes/Boom_linedefs.cfg
@@ -0,0 +1,899 @@
+
+door
+{
+	title = "Door";
+	
+	175
+	{
+		title = "Door Close Wait Open (30 seconds)";
+		prefix = "S1";
+	}
+	
+	196
+	{
+		title = "Door Close Wait Open (30 seconds)";
+		prefix = "SR";
+	}
+}
+
+
+floor
+{
+	title = "Floor";
+	
+	146
+	{
+		title = "Floor Raise Donut (changes texture)";
+		prefix = "W1";
+	}
+	
+	155
+	{
+		title = "Floor Raise Donut (changes texture)";
+		prefix = "WR";
+	}
+	
+	191
+	{
+		title = "Floor Raise Donut (changes texture)";
+		prefix = "SR";
+	}
+	
+	142
+	{
+		title = "Floor Raise by 512";
+		prefix = "W1";
+	}
+	
+	147
+	{
+		title = "Floor Raise by 512";
+		prefix = "WR";
+	}
+	
+	158
+	{
+		title = "Floor Raise by Shortest Lower Texture";
+		prefix = "S1";
+	}
+	
+	159
+	{
+		title = "Floor Lower to Lowest Floor (changes texture)";
+		prefix = "S1";
+	}
+	
+	160
+	{
+		title = "Floor Raise by 24 (changes texture and effect)";
+		prefix = "S1";
+	}
+	
+	161
+	{
+		title = "Floor Raise by 24";
+		prefix = "S1";
+	}
+	
+	176
+	{
+		title = "Floor Raise by Shortest Lower Texture";
+		prefix = "SR";
+	}
+	
+	177
+	{
+		title = "Floor Lower to Lowest Floor (changes texture)";
+		prefix = "SR";
+	}
+	
+	178
+	{
+		title = "Floor Raise by 512";
+		prefix = "SR";
+	}
+	
+	179
+	{
+		title = "Floor Raise by 24 (changes texture and effect)";
+		prefix = "SR";
+	}
+	
+	180
+	{
+		title = "Floor Raise by 24";
+		prefix = "SR";
+	}
+	
+	213
+	{
+		title = "Floor Change Brightness to this Brightness";
+		prefix = "";
+	}
+	
+	219
+	{
+		title = "Floor Lower to Nearest Floor";
+		prefix = "W1";
+	}
+	
+	220
+	{
+		title = "Floor Lower to Nearest Floor";
+		prefix = "WR";
+	}
+	
+	221
+	{
+		title = "Floor Lower to Nearest Floor";
+		prefix = "S1";
+	}
+	
+	222
+	{
+		title = "Floor Lower to Nearest Floor";
+		prefix = "SR";
+	}
+}
+
+
+crusher
+{
+	title = "Crusher";
+	
+	150
+	{
+		title = "Crusher Start (silent)";
+		prefix = "WR";
+	}
+	
+	164
+	{
+		title = "Crusher Start (fast)";
+		prefix = "S1";
+	}
+	
+	165
+	{
+		title = "Crusher Start (silent)";
+		prefix = "S1";
+	}
+	
+	168
+	{
+		title = "Crusher Stop";
+		prefix = "S1";
+	}
+	
+	183
+	{
+		title = "Crusher Start (fast)";
+		prefix = "SR";
+	}
+	
+	184
+	{
+		title = "Crusher Start";
+		prefix = "SR";
+	}
+	
+	185
+	{
+		title = "Crusher Start (silent)";
+		prefix = "SR";
+	}
+	
+	188
+	{
+		title = "Crusher Stop";
+		prefix = "SR";
+	}
+}
+
+
+stairs
+{
+	title = "Stairs";
+	
+	256
+	{
+		title = "Stairs Raise by 8";
+		prefix = "WR";
+	}
+	
+	257
+	{
+		title = "Stairs Raise by 16 (fast)";
+		prefix = "WR";
+	}
+	
+	258
+	{
+		title = "Stairs Raise by 8";
+		prefix = "SR";
+	}
+	
+	259
+	{
+		title = "Stairs Raise by 16 (fast)";
+		prefix = "SR";
+	}
+}
+
+
+lift
+{
+	title = "Lift";
+	
+	143
+	{
+		title = "Lift Raise by 24 (changes texture)";
+		prefix = "W1";
+	}
+	
+	144
+	{
+		title = "Lift Raise by 32 (changes texture)";
+		prefix = "W1";
+	}
+	
+	148
+	{
+		title = "Lift Raise by 24 (changes texture)";
+		prefix = "WR";
+	}
+	
+	149
+	{
+		title = "Lift Raise by 32 (changes texture)";
+		prefix = "WR";
+	}
+	
+	162
+	{
+		title = "Lift Perpetual Lowest and Highest Floors";
+		prefix = "S1";
+	}
+	
+	163
+	{
+		title = "Lift Stop";
+		prefix = "S1";
+	}
+	
+	181
+	{
+		title = "Lift Perpetual Lowest and Highest Floors";
+		prefix = "SR";
+	}
+	
+	182
+	{
+		title = "Lift Stop";
+		prefix = "SR";
+	}
+	
+	211
+	{
+		title = "Lift Raise to Ceiling (instantly)";
+		prefix = "SR";
+	}
+	
+	212
+	{
+		title = "Lift Raise to Ceiling (instantly)";
+		prefix = "WR";
+	}
+	
+	227
+	{
+		title = "Lift Raise to Next Highest Floor (fast)";
+		prefix = "W1";
+	}
+	
+	228
+	{
+		title = "Lift Raise to Next Highest Floor (fast)";
+		prefix = "WR";
+	}
+	
+	229
+	{
+		title = "Lift Raise to Next Highest Floor (fast)";
+		prefix = "S1";
+	}
+	
+	230
+	{
+		title = "Lift Raise to Next Highest Floor (fast)";
+		prefix = "SR";
+	}
+	
+	231
+	{
+		title = "Lift Lower to Next Lowest Floor (fast)";
+		prefix = "W1";
+	}
+	
+	232
+	{
+		title = "Lift Lower to Next Lowest Floor (fast)";
+		prefix = "WR";
+	}
+	
+	233
+	{
+		title = "Lift Lower to Next Lowest Floor (fast)";
+		prefix = "S1";
+	}
+	
+	234
+	{
+		title = "Lift Lower to Next Lowest Floor (fast)";
+		prefix = "SR";
+	}
+	
+	235
+	{
+		title = "Lift Move to Same Floor Height (fast)";
+		prefix = "W1";
+	}
+	
+	236
+	{
+		title = "Lift Move to Same Floor Height (fast)";
+		prefix = "WR";
+	}
+	
+	237
+	{
+		title = "Lift Move to Same Floor Height (fast)";
+		prefix = "S1";
+	}
+	
+	238
+	{
+		title = "Lift Move to Same Floor Height (fast)";
+		prefix = "SR";
+	}
+}
+
+
+exit
+{
+	title = "Exit";
+	
+	197
+	{
+		title = "Exit Level";
+		prefix = "G1";
+	}
+	
+	198
+	{
+		title = "Exit Level (goes to secret level)";
+		prefix = "G1";
+	}
+}
+
+
+light
+{
+	title = "Light";
+	
+	156
+	{
+		title = "Light Start Blinking";
+		prefix = "WR";
+	}
+	
+	157
+	{
+		title = "Light Change to Darkest Adjacent";
+		prefix = "WR";
+	}
+	
+	169
+	{
+		title = "Light Change to Brightest Adjacent";
+		prefix = "S1";
+	}
+	
+	170
+	{
+		title = "Light Change to 35";
+		prefix = "S1";
+	}
+	
+	171
+	{
+		title = "Light Change to 255";
+		prefix = "S1";
+	}
+	
+	172
+	{
+		title = "Light Start Blinking";
+		prefix = "S1";
+	}
+	
+	173
+	{
+		title = "Light Change to Darkest Adjacent";
+		prefix = "S1";
+	}
+	
+	192
+	{
+		title = "Light Change to Brightest Adjacent";
+		prefix = "SR";
+	}
+	
+	193
+	{
+		title = "Light Start Blinking";
+		prefix = "SR";
+	}
+	
+	194
+	{
+		title = "Light Change to Darkest Adjacent";
+		prefix = "SR";
+	}
+}
+
+
+teleport
+{
+	title = "Teleport";
+	
+	174
+	{
+		title = "Teleport (also monsters)";
+		prefix = "S1";
+	}
+	
+	195
+	{
+		title = "Teleport (also monsters)";
+		prefix = "SR";
+	}
+	
+	207
+	{
+		title = "Teleport (also monsters, silent, same angle)";
+		prefix = "W1";
+	}
+	
+	208
+	{
+		title = "Teleport (also monsters, silent, same angle)";
+		prefix = "WR";
+	}
+	
+	209
+	{
+		title = "Teleport (also monsters, silent, same angle)";
+		prefix = "S1";
+	}
+	
+	210
+	{
+		title = "Teleport (also monsters, silent, same angle)";
+		prefix = "SR";
+	}
+	
+	243
+	{
+		title = "Teleport to Line With Same Tag (silent, same angle)";
+		prefix = "W1";
+	}
+	
+	244
+	{
+		title = "Teleport to Line With Same Tag (silent, same angle)";
+		prefix = "WR";
+	}
+	
+	262
+	{
+		title = "Teleport to Line With Same Tag (silent, reversed angle)";
+		prefix = "W1";
+	}
+	
+	263
+	{
+		title = "Teleport to Line With Same Tag (silent, reversed angle)";
+		prefix = "WR";
+	}
+	
+	264
+	{
+		title = "Teleport to Line With Same Tag (also monsters, silent, reversed angle)";
+		prefix = "W1";
+	}
+	
+	265
+	{
+		title = "Teleport to Line With Same Tag (also monsters, reversed angle)";
+		prefix = "WR";
+	}
+	
+	266
+	{
+		title = "Teleport to Line With Same Tag (monsters only, silent)";
+		prefix = "W1";
+	}
+	
+	267
+	{
+		title = "Teleport to Line With Same Tag (monsters only, silent)";
+		prefix = "WR";
+	}
+	
+	268
+	{
+		title = "Teleport (monsters only, silent)";
+		prefix = "W1";
+	}
+	
+	269
+	{
+		title = "Teleport (monsters only, silent)";
+		prefix = "WR";
+	}
+}
+
+
+ceiling
+{
+	title = "Ceiling";
+	
+	145
+	{
+		title = "Ceiling Lower to Floor (fast)";
+		prefix = "W1";
+	}
+	
+	151
+	{
+		title = "Ceiling Raise to Highest Ceiling";
+		prefix = "WR";
+	}
+	
+	152
+	{
+		title = "Ceiling Lower to Floor (fast)";
+		prefix = "WR";
+	}
+	
+	166
+	{
+		title = "Ceiling Raise to Highest Ceiling";
+		prefix = "S1";
+	}
+	
+	167
+	{
+		title = "Ceiling Lower to 8 Above Floor";
+		prefix = "S1";
+	}
+	
+	186
+	{
+		title = "Ceiling Raise to Highest Ceiling";
+		prefix = "SR";
+	}
+	
+	187
+	{
+		title = "Ceiling Lower to 8 Above Floor";
+		prefix = "SR";
+	}
+	
+	199
+	{
+		title = "Ceiling Lower to Lowest Ceiling";
+		prefix = "W1";
+	}
+	
+	200
+	{
+		title = "Ceiling Lower to Highest Floor";
+		prefix = "W1";
+	}
+	
+	201
+	{
+		title = "Ceiling Lower to Lowest Ceiling";
+		prefix = "WR";
+	}
+	
+	202
+	{
+		title = "Ceiling Lower to Highest Floor";
+		prefix = "WR";
+	}
+	
+	203
+	{
+		title = "Ceiling Lower to Lowest Ceiling";
+		prefix = "S1";
+	}
+	
+	204
+	{
+		title = "Ceiling Lower to Highest Floor";
+		prefix = "S1";
+	}
+	
+	205
+	{
+		title = "Ceiling Lower to Lowest Ceiling";
+		prefix = "SR";
+	}
+	
+	206
+	{
+		title = "Ceiling Lower to Highest Floor";
+		prefix = "SR";
+	}
+	
+	261
+	{
+		title = "Ceiling Brightness to this Brightness";
+		prefix = "";
+	}
+}
+
+
+scroll
+{
+	title = "Scroll";
+	
+	85
+	{
+		title = "Scroll Texture Right";
+		prefix = "";
+	}
+	
+	214
+	{
+		title = "Scroll Ceiling Accelerates when Sector Changes Height";
+		prefix = "";
+	}
+	
+	215
+	{
+		title = "Scroll Floor Accelerates when Sector Changes Height";
+		prefix = "";
+	}
+	
+	216
+	{
+		title = "Scroll Things Accelerates when Sector Changes Height";
+		prefix = "";
+	}
+	
+	217
+	{
+		title = "Scroll Floor/Things Accelerates when Sector Changes Height";
+		prefix = "";
+	}
+	
+	218
+	{
+		title = "Scroll Wall Accelerates when Sector Changes Height";
+		prefix = "";
+	}
+	
+	245
+	{
+		title = "Scroll Ceiling when Sector Changes Height";
+		prefix = "";
+	}
+	
+	246
+	{
+		title = "Scroll Floor when Sector Changes Height";
+		prefix = "";
+	}
+	
+	247
+	{
+		title = "Scroll Move Things when Sector Changes Height";
+		prefix = "";
+	}
+	
+	248
+	{
+		title = "Scroll Floor/Move Things when Sector Changes Height";
+		prefix = "";
+	}
+	
+	249
+	{
+		title = "Scroll Wall when Sector Changes Height";
+		prefix = "";
+	}
+	
+	250
+	{
+		title = "Scroll Ceiling according to Line Vector";
+		prefix = "";
+	}
+	
+	251
+	{
+		title = "Scroll Floor according to Line Vector";
+		prefix = "";
+	}
+	
+	252
+	{
+		title = "Scroll Move Things according to Line Vector";
+		prefix = "";
+	}
+	
+	253
+	{
+		title = "Scroll Floor, Move Things";
+		prefix = "";
+	}
+	
+	254
+	{
+		title = "Scroll Wall according to Line Vector";
+		prefix = "";
+	}
+	
+	255
+	{
+		title = "Scroll Wall using Sidedef Offsets";
+		prefix = "";
+	}
+}
+
+
+change
+{
+	title = "Change";
+	
+	78
+	{
+		title = "Change Texture and Effect to Nearest";
+		prefix = "SR";
+	}
+	
+	153
+	{
+		title = "Change Texture And Effect";
+		prefix = "W1";
+	}
+	
+	154
+	{
+		title = "Change Texture And Effect";
+		prefix = "WR";
+	}
+	
+	189
+	{
+		title = "Change Texture And Effect";
+		prefix = "S1";
+	}
+	
+	190
+	{
+		title = "Change Texture And Effect";
+		prefix = "SR";
+	}
+	
+	239
+	{
+		title = "Change Texture and Effect to Nearest";
+		prefix = "W1";
+	}
+	
+	240
+	{
+		title = "Change Texture and Effect to Nearest";
+		prefix = "WR";
+	}
+	
+	241
+	{
+		title = "Change Texture and Effect to Nearest";
+		prefix = "S1";
+	}
+}
+
+
+friction
+{
+	title = "Friction";
+	
+	223
+	{
+		title = "Friction Tagged Sector: Drag < 100, Slide > 100";
+		prefix = "";
+	}
+}
+
+
+wind
+{
+	title = "Wind";
+	
+	224
+	{
+		title = "Wind according to Line Vector";
+		prefix = "";
+	}
+}
+
+
+current
+{
+	title = "Current";
+	
+	225
+	{
+		title = "Current according to Line Vector";
+		prefix = "";
+	}
+}
+
+
+wind/current
+{
+	title = "Wind/Current";
+	
+	226
+	{
+		title = "Wind/Current by Push/Pull Thing In Sector";
+		prefix = "";
+	}
+}
+
+
+create
+{
+	title = "Create";
+	
+	242
+	{
+		title = "Create Fake Ceiling and Floor";
+		prefix = "";
+	}
+}
+
+
+translucent
+{
+	title = "Translucent";
+	
+	260
+	{
+		title = "Translucent (Middle Texture)";
+		prefix = "";
+	}
+}
+
+
+transfer
+{
+	title = "Transfer";
+	
+	271
+	{
+		title = "Transfer Sky Texture to Tagged Sectors";
+		prefix = "";
+	}
+	
+	272
+	{
+		title = "Transfer Sky Texture to Tagged Sectors (flipped)";
+		prefix = "";
+	}
+}
diff --git a/Build/Configurations/Includes/Boom_misc.cfg b/Build/Configurations/Includes/Boom_misc.cfg
new file mode 100644
index 0000000..b351812
--- /dev/null
+++ b/Build/Configurations/Includes/Boom_misc.cfg
@@ -0,0 +1,124 @@
+
+// LINEDEF FLAGS
+linedefflags
+{
+	512 = "Pass use action";
+}
+
+
+// Linedef flags UDMF translation table
+// This is needed for copy/paste and prefabs to work properly
+// When the UDMF field name is prefixed with ! it is inverted
+linedefflagstranslation
+{
+	512 = "passuse";
+}
+
+
+// THING FLAGS
+thingflags
+{
+	32 = "Not Deathmatch";
+	64 = "Not Cooperative";
+}
+
+
+// Thing flags UDMF translation table
+// This is needed for copy/paste and prefabs to work properly
+// When the UDMF field name is prefixed with ! it is inverted
+thingflagstranslation
+{
+	32 = "!dm";
+	64 = "!coop";
+}
+
+// How thing flags should be compared (for the stuck thing error check)
+thingflagscompare
+{
+	skills
+	{
+		1;
+		2;
+		4;
+	}
+
+	gamemodes
+	{
+		16
+		{
+			comparemethod = "equal";
+			ignoredgroups = "skills";
+			ingnorethisgroupwhenunset = true;
+		}
+	}
+
+	gamemodes_extra
+	{	
+		optional = true;
+		
+		32
+		{
+			invert = true;
+			requiredflag = "16";
+			requiredgroups = "gamemodes";
+			ignoredgroups = "skills";
+		}
+
+		64
+		{
+			invert = true;
+			requiredflag = "16";
+			requiredgroups = "skills,gamemodes";
+		}
+	}
+}
+
+
+/*
+TEXTURES AND FLAT SOURCES
+This tells Doom Builder where to find the information for textures
+and flats in the IWAD file, Addition WAD file and Map WAD file.
+
+Start and end lumps must be given in a structure (of which the
+key name doesnt matter) and any textures or flats in between them
+are loaded in either the textures category or flats category.
+
+For textures: PNAMES, TEXTURE1 and TEXTURE2 are loaded by default.
+*/
+
+// Colormap sources
+colormaps
+{
+	standard1
+	{
+		start = "C_START";
+		end = "C_END";
+	}
+}
+
+
+
+/*
+MAP LUMP NAMES
+Map lumps are loaded with the map as long as they are right after each other. When the editor
+meets a lump which is not defined in this list it will ignore the map if not satisfied.
+The order of items defines the order in which lumps will be written to WAD file on save.
+To indicate the map header lump, use ~MAP
+
+Legenda:
+required = Lump is required to exist.
+blindcopy = Lump will be copied along with the map blindly. (useful for lumps Doom Builder doesn't use)
+nodebuild = The nodebuilder generates this lump.
+allowempty = The nodebuilder is allowed to leave this lump empty.
+script = This lump is a text-based script. Specify the filename of the script configuration to use.
+*/
+
+boommaplumpnames
+{
+	DEHACKED
+	{
+		required = false;
+		nodebuild = false;
+		script = "Dehacked.cfg";
+	}
+}
diff --git a/Build/Configurations/Includes/Boom_things.cfg b/Build/Configurations/Includes/Boom_things.cfg
new file mode 100644
index 0000000..732b89c
--- /dev/null
+++ b/Build/Configurations/Includes/Boom_things.cfg
@@ -0,0 +1,25 @@
+
+boom
+{
+	color = 8;	// Grey
+	arrow = 1;
+	title = "Boom Items";
+	width = 0;
+	height = 0;
+	sort = 1;
+	fixedsize = true;
+	
+	5001 
+	{
+		title = "Pusher";
+		sprite = "internal:pointpusher";
+		class = "PointPusher";
+	}
+
+	5002 
+	{
+		title = "Puller";
+		sprite = "internal:pointpuller"; 
+		class = "PointPuller";
+	}
+}
diff --git a/Build/Configurations/Includes/Common.cfg b/Build/Configurations/Includes/Common.cfg
new file mode 100644
index 0000000..539adc2
--- /dev/null
+++ b/Build/Configurations/Includes/Common.cfg
@@ -0,0 +1,51 @@
+
+// Common settings that are included in most (if not every) game configuration
+// These are settings you probably don't have to deal with unless you're making 
+// something really advanced (or maybe using a game engine not based on Doom)
+
+
+// Simulate Doom brightness levels (turn this off for linear lighting)
+doomlightlevels = true;
+
+
+// Thing number for start position in 3D Mode
+start3dmode = 32000;
+
+
+// Map boundaries. Map objects can only be placed within these boundaries
+// WARNING: changing this may mess your map up, so only change it when you
+// know what you are doing
+leftboundary = -32768;
+rightboundary = 32767;
+topboundary = 32767;
+bottomboundary = -32768;
+
+
+// Enables support for long (> 8 chars) texture names
+// WARNING: this should only be enabled for UDMF game configurations!
+// WARNING: enabling this will make maps incompatible with Doom Builder 2 and can lead to problems in Slade 3!
+longtexturenames = false;
+
+
+
+// Things used by the editor
+thingtypes
+{
+	editor
+	{
+		color = 15;	// White
+		arrow = 1;
+		title = "Editor Things";
+		width = 16;
+		sort = 1;
+		height = 0;
+		hangs = 0;
+		blocking = 0;
+		error = 0;
+		fixedsize = true;
+		
+		32000 = "Visual Mode camera";
+	}
+}
+
+
diff --git a/Build/Configurations/Includes/Doom2_things.cfg b/Build/Configurations/Includes/Doom2_things.cfg
new file mode 100644
index 0000000..197b18f
--- /dev/null
+++ b/Build/Configurations/Includes/Doom2_things.cfg
@@ -0,0 +1,304 @@
+
+// Only the new Doom 2 things, use in combination with Doom_things.cfg
+
+
+monsters
+{
+	color = 12;	// Light Red
+	arrow = 1;
+	title = "Monsters";
+	width = 20;
+	sort = 1;
+	height = 56;
+	hangs = 0;
+	blocking = 1;
+	error = 2;
+	
+	65
+	{
+		title = "Chaingunner";
+		sprite = "CPOSA2";
+		class = "ChaingunGuy";
+	}
+	
+	69
+	{
+		title = "Hell Knight";
+		width = 24;
+		sprite = "BOS2A2C8";
+		height = 64;
+		class = "HellKnight";
+	}
+	
+	68
+	{
+		title = "Arachnotron";
+		width = 64;
+		sprite = "BSPIA2A8";
+		height = 64;
+		class = "Arachnotron";
+	}
+	
+	71
+	{
+		title = "Pain Elemental";
+		width = 31;
+		sprite = "PAINA2A8";
+		class = "PainElemental";
+	}
+	
+	66
+	{
+		title = "Revenant";
+		sprite = "SKELA2D8";
+		class = "Revenant";
+	}
+	
+	67
+	{
+		title = "Mancubus";
+		width = 48;
+		sprite = "FATTC2C8";
+		height = 64;
+		class = "Fatso";
+	}
+	
+	64
+	{
+		title = "Archvile";
+		sprite = "VILEA2D8";
+		class = "Archvile";
+	}
+	
+	84
+	{
+		title = "Wolfenstein SS";
+		sprite = "SSWVA2";
+		class = "WolfensteinSS";
+	}
+	
+	72
+	{
+		title = "Commander Keen";
+		width = 16;
+		sprite = "KEENA0";
+		height = 72;
+		hangs = 1;
+		class = "CommanderKeen";
+	}
+	
+	88
+	{
+		title = "Icon of Sin";
+		width = 16;
+		sprite = "BBRNA0";
+		height = 16;
+		class = "BossBrain";
+	}
+	
+	89
+	{
+		title = "Monsters Spawner";
+		sprite = "BOSFB0";
+		locksprite = true;
+		height = 32;
+		class = "BossEye";
+	}
+
+	87
+	{
+		title = "Monsters Target";
+		sprite = "internal:Target";
+		height = 32;
+		class = "BossTarget";
+	}
+}
+
+
+weapons
+{
+	color = 14;	// Yellow
+	arrow = 0;
+	title = "Weapons";
+	width = 20;
+	height = 25;
+	hangs = 0;
+	blocking = 0;
+	sort = 1;
+	
+	82
+	{
+		title = "Super Shotgun";
+		sprite = "SGN2A0";
+		class = "SuperShotgun";
+	}
+}
+
+
+powerups
+{
+	color = 9;	// Light Blue
+	arrow = 0;
+	title = "Powerups";
+	width = 20;
+	height = 20;
+	hangs = 0;
+	blocking = 0;
+	sort = 1;
+	
+	83
+	{
+		title = "Megasphere";
+		sprite = "MEGAA0";
+		height = 40;
+		class = "Megasphere";
+	}
+}
+
+
+obstacles
+{
+	color = 3;	// Cyan
+	arrow = 0;
+	title = "Obstacles";
+	sort = 1;
+	blocking = 1;
+	error = 2;
+	
+	70
+	{
+		title = "Burning barrel";
+		width = 16;
+		sprite = "FCANA0";
+		height = 32;
+		class = "BurningBarrel";
+	}
+}
+
+
+lights
+{
+	color = 11;	// Light Cyan
+	arrow = 0;
+	title = "Light sources";
+	width = 16;
+	sort = 1;
+	height = 16;
+	blocking = 1;
+	error = 2;
+	hangs = 0;
+	
+	85
+	{
+		title = "Tall techno floor lamp";
+		sprite = "TLMPA0";
+		class = "TechLamp";
+	}
+	
+	86
+	{
+		title = "Short techno floor lamp";
+		sprite = "TLP2A0";
+		class = "TechLamp2";
+	}
+}
+
+
+decoration
+{
+	color = 4;	// Red
+	arrow = 0;
+	title = "Decoration";
+	width = 16;
+	sort = 1;
+	height = 16;
+	hangs = 0;
+	blocking = 0;
+	
+	79
+	{
+		title = "Pool of blood and guts";
+		sprite = "POB1A0";
+		class = "ColonGibs";
+	}
+	
+	80
+	{
+		title = "Pool of blood";
+		sprite = "POB2A0";
+		class = "SmallBloodPool";
+	}
+	
+	81
+	{
+		title = "Pool of brains";
+		sprite = "BRS1A0";
+		class = "BrainStem";
+	}
+	
+	73
+	{
+		title = "Hanging victim, guts removed";
+		sprite = "HDB1A0";
+		height = 88;
+		hangs = 1;
+		blocking = 1;
+		error = 2;
+		class = "HangNoGuts";
+	}
+	
+	74
+	{
+		title = "Hanging victim, guts and brain removed";
+		sprite = "HDB2A0";
+		height = 88;
+		hangs = 1;
+		blocking = 1;
+		error = 2;
+		class = "HangBNoBrain";
+	}
+	
+	75
+	{
+		title = "Hanging torso, looking down";
+		sprite = "HDB3A0";
+		height = 64;
+		hangs = 1;
+		blocking = 1;
+		error = 2;
+		class = "HangTLookingDown";
+	}
+	
+	76
+	{
+		title = "Hanging torso, open skull";
+		sprite = "HDB4A0";
+		height = 64;
+		hangs = 1;
+		blocking = 1;
+		error = 2;
+		class = "HangTSkull";
+	}
+	
+	77
+	{
+		title = "Hanging torso, looking up";
+		sprite = "HDB5A0";
+		height = 64;
+		hangs = 1;
+		blocking = 1;
+		error = 2;
+		class = "HangTLookingUp";
+	}
+	
+	78
+	{
+		title = "Hanging torso, brain removed";
+		sprite = "HDB6A0";
+		height = 64;
+		hangs = 1;
+		blocking = 1;
+		error = 2;
+		class = "HangTNoBrain";
+	}
+}
diff --git a/Build/Configurations/Includes/Doom_common.cfg b/Build/Configurations/Includes/Doom_common.cfg
new file mode 100644
index 0000000..c8f96fe
--- /dev/null
+++ b/Build/Configurations/Includes/Doom_common.cfg
@@ -0,0 +1,133 @@
+common
+{
+  // Some common settings
+  include("Common.cfg");
+
+  // Default testing parameters
+  include("Test_params.cfg", "vanilla_mapxx");
+  testshortpaths = true;
+
+  // Default nodebuilder configurations
+  defaultsavecompiler = "zennode_normal";
+  defaulttestcompiler = "zennode_fast";
+
+  // Texture loading options
+  mixtexturesflats = false;
+  defaulttexturescale = 1.0f;
+  defaultflatscale = 1.0f;
+  scaledtextureoffsets = true;
+
+  // Texture sources
+  textures
+  {
+    include("Doom_misc.cfg", "textures");
+  }
+
+  // Patch sources
+  patches
+  {
+    include("Doom_misc.cfg", "patches");
+  }
+
+  // Sprite sources
+  sprites
+  {
+    include("Doom_misc.cfg", "sprites");
+  }
+
+  // Flat sources
+  flats
+  {
+    include("Doom_misc.cfg", "flats");
+  }
+}
+
+mapformat_doom
+{
+  // The format interface handles the map data format
+  formatinterface = "DoomMapSetIO";
+
+  maplumpnames
+  {
+    include("Doom_misc.cfg", "doommaplumpnames");
+  }
+
+  // When this is set to true, sectors with the same tag will light up when a line is highlighted
+  linetagindicatesectors = true;
+
+  // Special linedefs
+  include("ZDoom_misc.cfg", "speciallinedefs_doomhexen");
+
+  // Default flags for first new thing
+  defaultthingflags
+  {
+    include("Doom_misc.cfg", "defaultthingflags");
+  }
+
+  // Door making
+  include("ZDoom_misc.cfg", "doormaking_doom");
+
+  // Generalized actions
+  generalizedlinedefs = false;
+  generalizedsectors = false;
+  
+  // DEFAULT SECTOR BRIGHTNESS LEVELS
+  sectorbrightness
+  {
+    include("Doom_misc.cfg", "sectorbrightness");
+  }
+
+  // SECTOR TYPES
+  sectortypes
+  {
+    include("Doom_sectors.cfg");
+  }
+
+  // LINEDEF FLAGS
+  linedefflags
+	{
+		include("Doom_misc.cfg", "linedefflags");
+	}
+
+	// LINEDEF ACTIVATIONS
+	linedefactivations
+	{
+	}
+
+	// Linedef flags UDMF translation table
+	// This is needed for copy/paste and prefabs to work properly
+	// When the UDMF field name is prefixed with ! it is inverted
+	linedefflagstranslation
+	{
+		include("Doom_misc.cfg", "linedefflagstranslation");
+	}
+
+	// LINEDEF TYPES
+	linedeftypes
+	{
+		include("Doom_linedefs.cfg");
+	}
+
+	// THING FLAGS
+	thingflags
+	{
+		include("Doom_misc.cfg", "thingflags");
+	}
+
+	// Thing flags UDMF translation table
+	// This is needed for copy/paste and prefabs to work properly
+	// When the UDMF field name is prefixed with ! it is inverted
+	thingflagstranslation
+	{
+		include("Doom_misc.cfg", "thingflagstranslation");
+	}
+	
+		// How to compare thing flags (for the stuck things error checker)
+	thingflagscompare
+	{
+		include("Doom_misc.cfg", "thingflagscompare");
+	}
+
+	// Things flags masks
+	include("Doom_misc.cfg", "thingflagsmasks");
+}
\ No newline at end of file
diff --git a/Build/Configurations/Includes/Doom_linedefs.cfg b/Build/Configurations/Includes/Doom_linedefs.cfg
new file mode 100644
index 0000000..823742d
--- /dev/null
+++ b/Build/Configurations/Includes/Doom_linedefs.cfg
@@ -0,0 +1,905 @@
+
+misc
+{
+	
+	0
+	{
+		title = "None";
+		prefix = "";
+	}
+}
+
+
+door
+{
+	title = "Door";
+	
+	1
+	{
+		title = "Door Open Wait Close (also monsters)";
+		prefix = "DR";
+	}
+	
+	2
+	{
+		title = "Door Open Stay";
+		prefix = "W1";
+	}
+	
+	3
+	{
+		title = "Door Close Stay";
+		prefix = "W1";
+	}
+	
+	4
+	{
+		title = "Door Open Wait Close";
+		prefix = "W1";
+	}
+	
+	16
+	{
+		title = "Door Close Wait Open";
+		prefix = "W1";
+	}
+	
+	26
+	{
+		title = "Door (Blue) Open Wait Close";
+		prefix = "DR";
+	}
+	
+	27
+	{
+		title = "Door (Yellow) Open Wait Close";
+		prefix = "DR";
+	}
+	
+	28
+	{
+		title = "Door (Red) Open Wait Close";
+		prefix = "DR";
+	}
+	
+	29
+	{
+		title = "Door Open Wait Close";
+		prefix = "S1";
+	}
+	
+	31
+	{
+		title = "Door Open Stay";
+		prefix = "D1";
+	}
+	
+	32
+	{
+		title = "Door (Blue) Open Stay";
+		prefix = "D1";
+	}
+	
+	33
+	{
+		title = "Door (Red) Open Stay";
+		prefix = "D1";
+	}
+	
+	34
+	{
+		title = "Door (Yellow) Open Stay";
+		prefix = "D1";
+	}
+	
+	42
+	{
+		title = "Door Close Stay";
+		prefix = "SR";
+	}
+	
+	46
+	{
+		title = "Door Open Stay";
+		prefix = "GR";
+	}
+	
+	50
+	{
+		title = "Door Close Stay";
+		prefix = "S1";
+	}
+	
+	61
+	{
+		title = "Door Open Stay";
+		prefix = "SR";
+	}
+	
+	63
+	{
+		title = "Door Open Wait Close";
+		prefix = "SR";
+	}
+	
+	75
+	{
+		title = "Door Close Stay";
+		prefix = "WR";
+	}
+	
+	76
+	{
+		title = "Door Close Stay Open";
+		prefix = "WR";
+	}
+	
+	86
+	{
+		title = "Door Open Stay";
+		prefix = "WR";
+	}
+	
+	90
+	{
+		title = "Door Open Wait Close";
+		prefix = "WR";
+	}
+	
+	99
+	{
+		title = "Door (Blue) Open Stay (fast)";
+		prefix = "SR";
+	}
+	
+	103
+	{
+		title = "Door Open Stay";
+		prefix = "S1";
+	}
+	
+	105
+	{
+		title = "Door Open Wait Close (fast)";
+		prefix = "WR";
+	}
+	
+	106
+	{
+		title = "Door Open Stay (fast)";
+		prefix = "WR";
+	}
+	
+	107
+	{
+		title = "Door Close Stay (fast)";
+		prefix = "WR";
+	}
+	
+	108
+	{
+		title = "Door Open Wait Close (fast)";
+		prefix = "W1";
+	}
+	
+	109
+	{
+		title = "Door Open Stay (fast)";
+		prefix = "W1";
+	}
+	
+	110
+	{
+		title = "Door Close (fast)";
+		prefix = "W1";
+	}
+	
+	111
+	{
+		title = "Door Open Wait Close (fast)";
+		prefix = "S1";
+	}
+	
+	112
+	{
+		title = "Door Open Stay (fast)";
+		prefix = "S1";
+	}
+	
+	113
+	{
+		title = "Door Close Stay (fast)";
+		prefix = "S1";
+	}
+	
+	114
+	{
+		title = "Door Open Wait Close (fast)";
+		prefix = "SR";
+	}
+	
+	115
+	{
+		title = "Door Open Stay (fast)";
+		prefix = "SR";
+	}
+	
+	116
+	{
+		title = "Door Close Stay (fast)";
+		prefix = "SR";
+	}
+	
+	117
+	{
+		title = "Door Open Wait Close (fast)";
+		prefix = "DR";
+	}
+	
+	118
+	{
+		title = "Door Open Stay (fast)";
+		prefix = "D1";
+	}
+	
+	133
+	{
+		title = "Door (Blue) Open Stay (fast)";
+		prefix = "S1";
+	}
+	
+	134
+	{
+		title = "Door (Red) Open Stay (fast)";
+		prefix = "SR";
+	}
+	
+	135
+	{
+		title = "Door (Red) Open Stay (fast)";
+		prefix = "S1";
+	}
+	
+	136
+	{
+		title = "Door (Yellow) Open Stay (fast)";
+		prefix = "SR";
+	}
+	
+	137
+	{
+		title = "Door (Yellow) Open Stay (fast)";
+		prefix = "S1";
+	}
+}
+
+
+floor
+{
+	title = "Floor";
+	
+	5
+	{
+		title = "Floor Raise to Lowest Ceiling";
+		prefix = "W1";
+	}
+	
+	9
+	{
+		title = "Floor Raise Donut (changes texture)";
+		prefix = "S1";
+	}
+	
+	14
+	{
+		title = "Floor Raise by 32 (changes texture)";
+		prefix = "S1";
+	}
+	
+	15
+	{
+		title = "Floor Raise by 24 (changes texture)";
+		prefix = "S1";
+	}
+	
+	18
+	{
+		title = "Floor Raise to Next Higher Floor";
+		prefix = "S1";
+	}
+	
+	19
+	{
+		title = "Floor Lower to Highest Floor";
+		prefix = "W1";
+	}
+	
+	20
+	{
+		title = "Floor Raise to Next Higher Floor (changes texture)";
+		prefix = "S1";
+	}
+	
+	22
+	{
+		title = "Floor Raise to Next Higher Floor (changes texture)";
+		prefix = "W1";
+	}
+	
+	23
+	{
+		title = "Floor Lower to Lowest Floor";
+		prefix = "S1";
+	}
+	
+	24
+	{
+		title = "Floor Raise to Lowest Ceiling";
+		prefix = "G1";
+	}
+	
+	30
+	{
+		title = "Floor Raise by Shortest Lower Texture";
+		prefix = "W1";
+	}
+	
+	36
+	{
+		title = "Floor Lower to 8 above Highest Floor";
+		prefix = "W1";
+	}
+	
+	37
+	{
+		title = "Floor Lower to Lowest Floor (changes texture)";
+		prefix = "W1";
+	}
+	
+	38
+	{
+		title = "Floor Lower to Lowest Floor";
+		prefix = "W1";
+	}
+	
+	45
+	{
+		title = "Floor Lower to Highest Floor";
+		prefix = "SR";
+	}
+	
+	47
+	{
+		title = "Floor Raise to Next Higher Floor (changes texture)";
+		prefix = "G1";
+	}
+	
+	53
+	{
+		title = "Floor Start Moving Up and Down";
+		prefix = "W1";
+	}
+	
+	54
+	{
+		title = "Floor Stop Moving";
+		prefix = "W1";
+	}
+	
+	55
+	{
+		title = "Floor Raise to 8 below Lowest Ceiling (crushes)";
+		prefix = "S1";
+	}
+	
+	56
+	{
+		title = "Floor Raise to 8 below Lowest Ceiling (crushes)";
+		prefix = "W1";
+	}
+	
+	58
+	{
+		title = "Floor Raise by 24";
+		prefix = "W1";
+	}
+	
+	59
+	{
+		title = "Floor Raise by 24 (changes texture)";
+		prefix = "W1";
+	}
+	
+	60
+	{
+		title = "Floor Lower to Lowest Floor";
+		prefix = "SR";
+	}
+	
+	64
+	{
+		title = "Floor Raise to Lowest Ceiling";
+		prefix = "SR";
+	}
+	
+	65
+	{
+		title = "Floor Raise to 8 below Lowest Ceiling (crushes)";
+		prefix = "SR";
+	}
+	
+	66
+	{
+		title = "Floor Raise by 24 (changes texture)";
+		prefix = "SR";
+	}
+	
+	67
+	{
+		title = "Floor Raise by 32 (changes texture)";
+		prefix = "SR";
+	}
+	
+	68
+	{
+		title = "Floor Raise to Next Higher Floor (changes texture)";
+		prefix = "SR";
+	}
+	
+	69
+	{
+		title = "Floor Raise to Next Higher Floor";
+		prefix = "SR";
+	}
+	
+	70
+	{
+		title = "Floor Lower to 8 above Highest Floor";
+		prefix = "SR";
+	}
+	
+	71
+	{
+		title = "Floor Lower to 8 above Highest Floor";
+		prefix = "S1";
+	}
+	
+	82
+	{
+		title = "Floor Lower to Lowest Floor";
+		prefix = "WR";
+	}
+	
+	83
+	{
+		title = "Floor Lower to Highest Floor";
+		prefix = "WR";
+	}
+	
+	84
+	{
+		title = "Floor Lower to Lowest Floor (changes texture)";
+		prefix = "WR";
+	}
+	
+	87
+	{
+		title = "Floor Start Moving Up and Down";
+		prefix = "WR";
+	}
+	
+	89
+	{
+		title = "Floor Stop Moving";
+		prefix = "WR";
+	}
+	
+	91
+	{
+		title = "Floor Raise to Lowest Ceiling";
+		prefix = "WR";
+	}
+	
+	92
+	{
+		title = "Floor Raise by 24";
+		prefix = "WR";
+	}
+	
+	93
+	{
+		title = "Floor Raise by 24 (changes texture)";
+		prefix = "WR";
+	}
+	
+	94
+	{
+		title = "Floor Raise to 8 below Lowest Ceiling (crushes)";
+		prefix = "WR";
+	}
+	
+	95
+	{
+		title = "Floor Raise to Next Higher Floor (changes texture)";
+		prefix = "WR";
+	}
+	
+	96
+	{
+		title = "Floor Raise by Shortest Lower Texture";
+		prefix = "WR";
+	}
+	
+	98
+	{
+		title = "Floor Lower to 8 above Highest Floor";
+		prefix = "WR";
+	}
+	
+	101
+	{
+		title = "Floor Raise to Lowest Ceiling";
+		prefix = "S1";
+	}
+	
+	102
+	{
+		title = "Floor Lower to Highest Floor";
+		prefix = "S1";
+	}
+	
+	119
+	{
+		title = "Floor Raise to Next Higher Floor";
+		prefix = "W1";
+	}
+	
+	128
+	{
+		title = "Floor Raise to Next Higher Floor";
+		prefix = "WR";
+	}
+	
+	129
+	{
+		title = "Floor Raise to Next Higher Floor (fast)";
+		prefix = "WR";
+	}
+	
+	130
+	{
+		title = "Floor Raise to Next Higher Floor (fast)";
+		prefix = "W1";
+	}
+	
+	131
+	{
+		title = "Floor Raise to Next Higher Floor (fast)";
+		prefix = "S1";
+	}
+	
+	132
+	{
+		title = "Floor Raise to Next Higher Floor (fast)";
+		prefix = "SR";
+	}
+	
+	140
+	{
+		title = "Floor Raise by 512";
+		prefix = "S1";
+	}
+}
+
+
+crusher
+{
+	title = "Crusher";
+	
+	6
+	{
+		title = "Crusher Start with Fast Damage";
+		prefix = "W1";
+	}
+	
+	25
+	{
+		title = "Crusher Start with Slow Damage";
+		prefix = "W1";
+	}
+	
+	57
+	{
+		title = "Crusher Stop";
+		prefix = "W1";
+	}
+	
+	73
+	{
+		title = "Crusher Start with Slow Damage";
+		prefix = "WR";
+	}
+	
+	74
+	{
+		title = "Crusher Stop";
+		prefix = "WR";
+	}
+	
+	77
+	{
+		title = "Crusher Start with Fast Damage";
+		prefix = "WR";
+	}
+	
+	141
+	{
+		title = "Crusher Start with Slow Damage (silent)";
+		prefix = "W1";
+	}
+}
+
+
+stairs
+{
+	title = "Stairs";
+	
+	7
+	{
+		title = "Stairs Raise by 8";
+		prefix = "S1";
+	}
+	
+	8
+	{
+		title = "Stairs Raise by 8";
+		prefix = "W1";
+	}
+	
+	100
+	{
+		title = "Stairs Raise by 16 (fast)";
+		prefix = "W1";
+	}
+	
+	127
+	{
+		title = "Stairs Raise by 16 (fast)";
+		prefix = "S1";
+	}
+}
+
+
+lift
+{
+	title = "Lift";
+	
+	10
+	{
+		title = "Lift Lower Wait Raise";
+		prefix = "W1";
+	}
+	
+	21
+	{
+		title = "Lift Lower Wait Raise";
+		prefix = "S1";
+	}
+	
+	62
+	{
+		title = "Lift Lower Wait Raise";
+		prefix = "SR";
+	}
+	
+	88
+	{
+		title = "Lift Lower Wait Raise";
+		prefix = "WR";
+	}
+	
+	120
+	{
+		title = "Lift Lower Wait Raise (fast)";
+		prefix = "WR";
+	}
+	
+	121
+	{
+		title = "Lift Lower Wait Raise (fast)";
+		prefix = "W1";
+	}
+	
+	122
+	{
+		title = "Lift Lower Wait Raise (fast)";
+		prefix = "S1";
+	}
+	
+	123
+	{
+		title = "Lift Lower Wait Raise (fast)";
+		prefix = "SR";
+	}
+}
+
+
+exit
+{
+	title = "Exit";
+	
+	11
+	{
+		title = "Exit Level";
+		prefix = "S1";
+	}
+	
+	51
+	{
+		title = "Exit Level (goes to secret level)";
+		prefix = "S1";
+	}
+	
+	52
+	{
+		title = "Exit Level";
+		prefix = "W1";
+	}
+	
+	124
+	{
+		title = "Exit Level (goes to secret level)";
+		prefix = "W1";
+	}
+}
+
+
+light
+{
+	title = "Light";
+	
+	12
+	{
+		title = "Light Change to Brightest Adjacent";
+		prefix = "W1";
+	}
+	
+	13
+	{
+		title = "Light Change to 255";
+		prefix = "W1";
+	}
+	
+	17
+	{
+		title = "Light Start Blinking";
+		prefix = "W1";
+	}
+	
+	35
+	{
+		title = "Light Change to 35";
+		prefix = "W1";
+	}
+	
+	79
+	{
+		title = "Light Change to 35";
+		prefix = "WR";
+	}
+	
+	80
+	{
+		title = "Light Change to Brightest Adjacent";
+		prefix = "WR";
+	}
+	
+	81
+	{
+		title = "Light Change to 255";
+		prefix = "WR";
+	}
+	
+	104
+	{
+		title = "Light Change to Darkest Adjacent";
+		prefix = "W1";
+	}
+	
+	138
+	{
+		title = "Light Change to 255";
+		prefix = "SR";
+	}
+	
+	139
+	{
+		title = "Light Change to 35";
+		prefix = "SR";
+	}
+}
+
+
+ceiling
+{
+	title = "Ceiling";
+	
+	40
+	{
+		title = "Ceiling Raise to Highest Ceiling";
+		prefix = "W1";
+	}
+	
+	41
+	{
+		title = "Ceiling Lower to Floor";
+		prefix = "S1";
+	}
+	
+	43
+	{
+		title = "Ceiling Lower to Floor";
+		prefix = "SR";
+	}
+	
+	44
+	{
+		title = "Ceiling Lower to 8 above Floor";
+		prefix = "W1";
+	}
+	
+	49
+	{
+		title = "Ceiling Lower to 8 above Floor (perpetual slow crusher damage)";
+		prefix = "S1";
+	}
+	
+	72
+	{
+		title = "Ceiling Lower to 8 above Floor";
+		prefix = "WR";
+	}
+}
+
+
+scroll
+{
+	title = "Scroll";
+	
+	48
+	{
+		title = "Scroll Texture Left";
+		prefix = "";
+	}
+}
+
+
+teleport
+{
+	title = "Teleport";
+	
+	97
+	{
+		title = "Teleport";
+		prefix = "WR";
+	}
+	
+	39
+	{
+		title = "Teleport";
+		prefix = "W1";
+	}
+	
+	125
+	{
+		title = "Teleport (monsters only)";
+		prefix = "W1";
+	}
+	
+	126
+	{
+		title = "Teleport (monsters only)";
+		prefix = "WR";
+	}
+}
+
diff --git a/Build/Configurations/Includes/Doom_misc.cfg b/Build/Configurations/Includes/Doom_misc.cfg
new file mode 100644
index 0000000..f4c56fc
--- /dev/null
+++ b/Build/Configurations/Includes/Doom_misc.cfg
@@ -0,0 +1,489 @@
+// Basic Doom and Vanilla engine stuff.
+skills
+{
+	1 = "I'm too young to die";
+	2 = "Hey, not too rough";
+	3 = "Hurt me plenty";
+	4 = "Ultra-Violence";
+	5 = "Nightmare!";
+}
+
+linedefflags
+{
+	1 = "Impassable";
+	2 = "Block Monsters";
+	4 = "Double Sided";
+	8 = "Upper Unpegged";
+	16 = "Lower Unpegged";
+	32 = "Shown as 1-sided on automap";
+	64 = "Block Sound";
+	128 = "Not shown on automap";
+	256 = "Initially shown on automap";
+}
+
+thingflags
+{
+	1 = "Easy";
+	2 = "Medium";
+	4 = "Hard";
+	8 = "Ambush players";
+	16 = "Multiplayer only";
+}
+
+// Default flags for first new thing
+defaultthingflags
+{
+	1;
+	2;
+	4;
+}
+
+// How thing flags should be compared (for the stuck thing error check)
+thingflagscompare
+{
+	skills
+	{
+		1;
+		2;
+		4;
+	}
+
+	gamemodes
+	{
+		16
+		{
+			comparemethod = "equal";
+			ignoredgroups = "skills";
+			ingnorethisgroupwhenunset = true;
+		}
+	}
+}
+
+// Mask for the thing flags which indicates the options
+// that make the same thing appear in the same modes
+thingflagsmasks
+{
+	thingflagsmask1 = 7;	// 1 + 2 + 4
+	thingflagsmask2 = 0;
+}
+
+// Linedef flags UDMF translation table
+// This is needed for copy/paste and prefabs to work properly
+// When the UDMF field name is prefixed with ! it is inverted
+linedefflagstranslation
+{
+	1 = "blocking";
+	2 = "blockmonsters";
+	4 = "twosided";
+	8 = "dontpegtop";
+	16 = "dontpegbottom";
+	32 = "secret";
+	64 = "blocksound";
+	128 = "dontdraw";
+	256 = "mapped";
+}
+
+// Thing flags UDMF translation table
+// This is needed for copy/paste and prefabs to work properly
+// When the UDMF field name is prefixed with ! it is inverted
+thingflagstranslation
+{
+	1 = "skill1,skill2";
+	2 = "skill3";
+	4 = "skill4,skill5";
+	8 = "ambush";
+	16 = "!single";
+}
+
+// Default sector brightness levels
+sectorbrightness
+{
+	256; 240; 224; 208; 192; 176; 160; 144;
+	128; 112; 96; 80; 64; 48; 32; 16; 0;
+}
+
+/*
+TEXTURES AND FLAT SOURCES
+This tells Doom Builder where to find the information for textures
+and flats in the IWAD file, Addition WAD file and Map WAD file.
+
+Start and end lumps must be given in a structure (of which the
+key name doesnt matter) and any textures or flats in between them
+are loaded in either the textures category or flats category.
+
+For textures: PNAMES, TEXTURE1 and TEXTURE2 are loaded by default.
+*/
+
+// Texture sources
+textures
+{
+}
+
+// Patch sources
+patches
+{
+	standard1
+	{
+		start = "P_START";
+		end = "P_END";
+	}
+	
+	standard2
+	{
+		start = "PP_START";
+		end = "PP_END";
+	}
+}
+
+// Sprite sources
+sprites
+{
+	standard1
+	{
+		start = "S_START";
+		end = "S_END";
+	}
+	
+	standard2
+	{
+		start = "SS_START";
+		end = "SS_END";
+	}
+}
+
+// Flat sources
+flats
+{
+	standard1
+	{
+		start = "F_START";
+		end = "F_END";
+	}
+	
+	standard2
+	{
+		start = "FF_START";
+		end = "FF_END";
+	}
+	
+	standard3
+	{
+		start = "FF_START";
+		end = "F_END";
+	}
+	
+	standard4
+	{
+		start = "F_START";
+		end = "FF_END";
+	}
+}
+
+/*
+MAP LUMP NAMES
+Map lumps are loaded with the map as long as they are right after each other. When the editor
+meets a lump which is not defined in this list it will ignore the map if not satisfied.
+The order of items defines the order in which lumps will be written to WAD file on save.
+To indicate the map header lump, use ~MAP
+
+Legenda:
+required = Lump is required to exist.
+blindcopy = Lump will be copied along with the map blindly. (useful for lumps Doom Builder doesn't use)
+nodebuild = The nodebuilder generates this lump.
+allowempty = The nodebuilder is allowed to leave this lump empty.
+script = This lump is a text-based script. Specify the filename of the script configuration to use.
+*/
+
+doommaplumpnames
+{
+	~MAP
+	{
+		required = true;
+		blindcopy = true;
+		nodebuild = false;
+	}
+	
+	THINGS
+	{
+		required = true;
+		nodebuild = true;
+		allowempty = true;
+	}
+	
+	LINEDEFS
+	{
+		required = true;
+		nodebuild = true;
+		allowempty = false;
+	}
+	
+	SIDEDEFS
+	{
+		required = true;
+		nodebuild = true;
+		allowempty = false;
+	}
+	
+	VERTEXES
+	{
+		required = true;
+		nodebuild = true;
+		allowempty = false;
+	}
+	
+	SEGS
+	{
+		required = false;
+		nodebuild = true;
+		allowempty = false;
+	}
+	
+	SSECTORS
+	{
+		required = false;
+		nodebuild = true;
+		allowempty = false;
+	}
+	
+	NODES
+	{
+		required = false;
+		nodebuild = true;
+		allowempty = false;
+	}
+	
+	SECTORS
+	{
+		required = true;
+		nodebuild = true;
+		allowempty = false;
+	}
+	
+	REJECT
+	{
+		required = false;
+		nodebuild = true;
+		allowempty = false;
+	}
+	
+	BLOCKMAP
+	{
+		required = false;
+		nodebuild = true;
+		allowempty = false;
+	}
+	
+	BEHAVIOR //mxd
+	{
+		forbidden = true;
+	}
+}
+
+hexenmaplumpnames
+{
+	~MAP
+	{
+		required = true;
+		blindcopy = true;
+		nodebuild = false;
+	}
+	
+	THINGS
+	{
+		required = true;
+		nodebuild = true;
+		allowempty = true;
+	}
+	
+	LINEDEFS
+	{
+		required = true;
+		nodebuild = true;
+		allowempty = false;
+	}
+	
+	SIDEDEFS
+	{
+		required = true;
+		nodebuild = true;
+		allowempty = false;
+	}
+	
+	VERTEXES
+	{
+		required = true;
+		nodebuild = true;
+		allowempty = false;
+	}
+	
+	SEGS
+	{
+		required = false;
+		nodebuild = true;
+		allowempty = false;
+	}
+	
+	SSECTORS
+	{
+		required = false;
+		nodebuild = true;
+		allowempty = false;
+	}
+	
+	NODES
+	{
+		required = false;
+		nodebuild = true;
+		allowempty = false;
+	}
+	
+	SECTORS
+	{
+		required = true;
+		nodebuild = true;
+		allowempty = false;
+	}
+	
+	REJECT
+	{
+		required = false;
+		nodebuild = true;
+		allowempty = true;
+	}
+	
+	BLOCKMAP
+	{
+		required = false;
+		nodebuild = true;
+		allowempty = false;
+	}
+	
+	BEHAVIOR
+	{
+		required = true;
+		nodebuild = false;
+		blindcopy = true;
+	}
+	
+	SCRIPTS
+	{
+		required = false;
+		nodebuild = false;
+		script = "Hexen_ACS.cfg";
+	}
+}
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	filter0
+	{
+		name = "Easy skill";
+		category = "";
+		type = -1;
+		
+		fields
+		{
+			1 = true;
+		}
+	}
+	
+	filter1
+	{
+		name = "Medium skill";
+		category = "";
+		type = -1;
+		
+		fields
+		{
+			2 = true;
+		}
+	}
+	
+	filter2
+	{
+		name = "Hard skill";
+		category = "";
+		type = -1;
+		
+		fields
+		{
+			4 = true;
+		}
+	}
+	
+	filter3
+	{
+		name = "Keys only";
+		category = "keys";
+		type = -1;
+	}
+	
+	filter4
+	{
+		name = "Multiplayer";
+		category = "";
+		type = -1;
+		
+		fields
+		{
+			16 = true;
+		}
+	}
+}
+
+
+// ENUMERATIONS
+// These are enumerated lists for linedef types and UDMF fields.
+// Reserved names are: angledeg, anglerad, color, texture, flat
+enums
+{
+	falsetrue
+	{
+		0 = "False";
+		1 = "True";
+	}
+	
+	yesno
+	{
+		0 = "Yes";
+		1 = "No";
+	}
+	
+	noyes
+	{
+		0 = "No";
+		1 = "Yes";
+	}
+	
+	onoff
+	{
+		0 = "On";
+		1 = "Off";
+	}
+	
+	offon
+	{
+		0 = "Off";
+		1 = "On";
+	}
+	
+	updown
+	{
+		0 = "Up";
+		1 = "Down";
+	}
+	
+	downup
+	{
+		0 = "Down";
+		1 = "Up";
+	}
+	
+	addset
+	{
+		0 = "Add";
+		1 = "Set";
+	}
+}
\ No newline at end of file
diff --git a/Build/Configurations/Includes/Doom_sectors.cfg b/Build/Configurations/Includes/Doom_sectors.cfg
new file mode 100644
index 0000000..c8b96dd
--- /dev/null
+++ b/Build/Configurations/Includes/Doom_sectors.cfg
@@ -0,0 +1,17 @@
+
+0 = "None";
+1 = "Light Blinks (randomly)";
+2 = "Light Blinks (2 Hz)";
+3 = "Light Blinks (1 Hz)";
+4 = "Damage -10 or 20% health and Light Blinks (2 Hz)";
+5 = "Damage -5 or 10% health";
+7 = "Damage -2 or 5% health";
+8 = "Light Glows (1+ sec)";
+9 = "Secret";
+10 = "Door Close Stay (after 30 sec)";
+11 = "Damage -10 or 20% health and End level";
+12 = "Light Blinks (1 Hz synchronized)";
+13 = "Light Blinks (2 Hz synchronized)";
+14 = "Door Open Close (opens after 5 min)";
+16 = "Damage -10 or 20% health";
+17 = "Light Flickers (randomly)";
diff --git a/Build/Configurations/Includes/Doom_texturesets.cfg b/Build/Configurations/Includes/Doom_texturesets.cfg
new file mode 100644
index 0000000..4007879
--- /dev/null
+++ b/Build/Configurations/Includes/Doom_texturesets.cfg
@@ -0,0 +1,615 @@
+
+set0
+{
+	name = "Rock";
+	filter0 = "ASHWALL*";
+	filter1 = "BSTONE*";
+	filter2 = "FLAT1_1";
+	filter3 = "FLAT1_2";
+	filter4 = "FLAT1_3";
+	filter5 = "FLAT10";
+	filter6 = "FLAT5_7";
+	filter7 = "FLAT5_8";
+	filter8 = "FLOOR6_1";
+	filter9 = "FLOOR6_2";
+	filter10 = "GRNROCK";
+	filter11 = "MFLR8_2";
+	filter12 = "MFLR8_3";
+	filter13 = "MFLR8_4";
+	filter14 = "ROCK*";
+	filter15 = "SLIME09";
+	filter16 = "SLIME10";
+	filter17 = "SLIME11";
+	filter18 = "SLIME12";
+	filter19 = "SP_ROCK1";
+	filter20 = "STONE4";
+	filter21 = "STONE5";
+	filter22 = "STONE6";
+	filter23 = "STONE7";
+	filter24 = "SW1ROCK";
+	filter25 = "SW1STON6";
+	filter26 = "SW2ROCK";
+	filter27 = "SW2STON6";
+	filter28 = "TANROCK*";
+	filter29 = "RROCK*";
+}
+
+
+set1
+{
+	name = "Brick";
+	filter0 = "BIGBRIK*";
+	filter1 = "BRICK*";
+	filter2 = "FLOOR5_4";
+	filter3 = "FLAT8";
+	filter4 = "GSTFONT1";
+	filter5 = "GSTFONT2";
+	filter6 = "GSTFONT3";
+	filter7 = "GSTGARG";
+	filter8 = "GSTLION";
+	filter9 = "GSTONE1";
+	filter10 = "GSTONE2";
+	filter11 = "GSTSATYR";
+	filter12 = "GSTVINE1";
+	filter13 = "GSTVINE2";
+	filter14 = "MFLR8_1";
+	filter15 = "RROCK10";
+	filter16 = "RROCK14";
+	filter17 = "SLIME13";
+	filter18 = "SP_DUDE1";
+	filter19 = "SP_DUDE2";
+	filter20 = "SP_DUDE4";
+	filter21 = "SP_DUDE5";
+	filter22 = "SP_DUDE7";
+	filter23 = "SP_DUDE8";
+	filter24 = "SP_HOT1";
+	filter25 = "STONE2";
+	filter26 = "STONE3";
+	filter27 = "SW1GSTON";
+	filter28 = "SW1HOT";
+	filter29 = "SW2GSTON";
+	filter30 = "SW2HOT";
+}
+
+
+set2
+{
+	name = "Liquids";
+	filter0 = "BFALL*";
+	filter1 = "BLOOD*";
+	filter2 = "DBRAIN*";
+	filter3 = "FWATER*";
+	filter4 = "LAVA*";
+	filter5 = "NUKAGE*";
+	filter6 = "SFALL*";
+	filter7 = "SLIME01";
+	filter8 = "SLIME02";
+	filter9 = "SLIME03";
+	filter10 = "SLIME04";
+	filter11 = "SLIME05";
+	filter12 = "SLIME06";
+	filter13 = "SLIME07";
+	filter14 = "SLIME08";
+}
+
+
+set3
+{
+	name = "Doors";
+	filter0 = "BIGDOOR*";
+	filter1 = "DOOR*";
+	filter2 = "EXITDOOR";
+	filter3 = "SPCDOOR*";
+	filter4 = "TEKBRON1";
+	filter5 = "TEKBRON2";
+}
+
+
+set4
+{
+	name = "Steps";
+	filter0 = "STEP*";
+}
+
+
+set5
+{
+	name = "Wood";
+	filter0 = "BIGDOOR5";
+	filter1 = "BIGDOOR6";
+	filter2 = "BIGDOOR7";
+	filter3 = "CEIL1_1";
+	filter4 = "CEIL1_3";
+	filter5 = "FLAT5_1";
+	filter6 = "FLAT5_2";
+	filter7 = "PAN*";
+	filter8 = "SW1PANEL";
+	filter9 = "SW1WDMET";
+	filter10 = "SW1WOOD";
+	filter11 = "SW2PANEL";
+	filter12 = "SW2WDMET";
+	filter13 = "SW2WOOD";
+	filter14 = "WOOD*";
+}
+
+
+set6
+{
+	name = "Flesh";
+	filter0 = "AASHITTY";
+	filter1 = "FLAT5_6";
+	filter2 = "SFLR6_1";
+	filter3 = "SFLR6_4";
+	filter4 = "SFLR7_1";
+	filter5 = "SFLR7_4";
+	filter6 = "SK_LEFT";
+	filter7 = "SK_RIGHT";
+	filter8 = "SKIN*";
+	filter9 = "SKSNAKE1";
+	filter10 = "SKSNAKE2";
+	filter11 = "SKSPINE1";
+	filter12 = "SKSPINE2";
+	filter13 = "SLOPPY1";
+	filter14 = "SLOPPY2";
+	filter15 = "SP_DUDE1";
+	filter16 = "SP_DUDE2";
+	filter17 = "SP_DUDE4";
+	filter18 = "SP_DUDE5";
+	filter19 = "SP_DUDE7";
+	filter20 = "SP_DUDE8";
+	filter21 = "SP_FACE1";
+	filter22 = "SP_FACE2";
+	filter23 = "SW1SKIN";
+	filter24 = "SW1SKULL";
+	filter25 = "SW2SKIN";
+	filter26 = "SW2SKULL";
+}
+
+
+set7
+{
+	name = "Switches";
+	filter0 = "SW1*";
+	filter1 = "SW2*";
+}
+
+
+set8
+{
+	name = "Marble";
+	filter0 = "DEM1_*";
+	filter1 = "FLOOR7_2";
+	filter2 = "GST*";
+	filter3 = "MARB*";
+	filter4 = "SP_DUDE1";
+	filter5 = "SP_DUDE2";
+	filter6 = "SP_DUDE4";
+	filter7 = "SP_DUDE5";
+	filter8 = "SP_HOT1";
+	filter9 = "SW1GSTON";
+	filter10 = "SW1MARB";
+	filter11 = "SW2GSTON";
+	filter12 = "SW2MARB";
+}
+
+
+set9
+{
+	name = "Lights";
+	filter0 = "BRICKLIT";
+	filter1 = "BSTONE3";
+	filter2 = "CEIL1_2";
+	filter3 = "CEIL1_3";
+	filter4 = "CEIL3_4";
+	filter5 = "CEIL3_6";
+	filter6 = "CEIL4_3";
+	filter7 = "FLAT17";
+	filter8 = "FLAT2";
+	filter9 = "FLAT22";
+	filter10 = "FLOOR1_7";
+	filter11 = "GRNLITE1";
+	filter12 = "LITE3";
+	filter13 = "LITE5";
+	filter14 = "LITEBLU1";
+	filter15 = "LITEBLU4";
+	filter16 = "TLITE6_1";
+	filter17 = "TLITE6_4";
+	filter18 = "TLITE6_5";
+	filter19 = "TLITE6_6";
+}
+
+
+set10
+{
+	name = "Metal";
+	filter0 = "CEIL1_2";
+	filter1 = "METAL*";
+	filter2 = "METAL";
+	filter3 = "MIDBRN1";
+	filter4 = "MIDGRATE";
+	filter5 = "SW1GARG";
+	filter6 = "SW1LION";
+	filter7 = "SW1SATYR";
+	filter8 = "SW2GARG";
+	filter9 = "SW2LION";
+	filter10 = "SW2MET2";
+	filter11 = "SW2METAL";
+	filter12 = "SW1METAL";
+	filter13 = "SW1MET2";
+	filter14 = "SW2SATYR";
+	filter15 = "WOODMET1";
+	filter16 = "WOODMET2";
+	filter17 = "WOODMET3";
+	filter18 = "WOODMET4";
+	filter19 = "SW2WDMET";
+	filter20 = "SW1WDMET";
+	filter21 = "SUPPORT*";
+}
+
+
+set11
+{
+	name = "Silver";
+	filter0 = "BIGDOOR1";
+	filter1 = "DOORSTOP";
+	filter2 = "LITEBLU1";
+	filter3 = "SHAWN*";
+	filter4 = "SILVER*";
+	filter5 = "SPCDOOR3";
+	filter6 = "STEP4";
+	filter7 = "SUPPORT2";
+	filter8 = "SW1COMM";
+	filter9 = "SW2COMM";
+}
+
+
+set12
+{
+	name = "Base";
+	filter0 = "BIGBRIK*";
+	filter1 = "BIGDOOR1";
+	filter2 = "BIGDOOR2";
+	filter3 = "BIGDOOR3";
+	filter4 = "BIGDOOR4";
+	filter5 = "BLAKWAL*";
+	filter6 = "BRN*";
+	filter7 = "BRONZE*";
+	filter8 = "BROWN*";
+	filter9 = "BROVINE2";
+	filter10 = "CEIL3_1";
+	filter11 = "CEIL3_2";
+	filter12 = "CEIL3_3";
+	filter13 = "CEIL3_4";
+	filter14 = "CEIL3_5";
+	filter15 = "CEIL3_6";
+	filter16 = "CEIL4_1";
+	filter17 = "CEIL4_2";
+	filter18 = "CEIL4_3";
+	filter19 = "CEIL5_1";
+	filter20 = "CEIL5_2";
+	filter21 = "CEMENT*";
+	filter22 = "COMP*";
+	filter23 = "CONS*";
+	filter24 = "CRAT*";
+	filter25 = "DOOR1";
+	filter26 = "DOOR3";
+	filter27 = "DOORBLU";
+	filter28 = "DOORRED";
+	filter29 = "DOORSTOP";
+	filter30 = "DOORTRAK";
+	filter31 = "DOORYEL";
+	filter32 = "EXITDOOR";
+	filter33 = "EXITSIGN";
+	filter34 = "EXITSTON";
+	filter35 = "FLAT1";
+	filter36 = "FLAT1_1";
+	filter37 = "FLAT1_2";
+	filter38 = "FLAT1_3";
+	filter39 = "FLAT14";
+	filter40 = "FLAT17";
+	filter41 = "FLAT18";
+	filter42 = "FLAT19";
+	filter43 = "FLAT2";
+	filter44 = "FLAT20";
+	filter45 = "FLAT22";
+	filter46 = "FLAT23";
+	filter47 = "FLAT3";
+	filter48 = "FLAT4";
+	filter49 = "FLAT5";
+	filter50 = "FLAT5_4";
+	filter51 = "FLAT5_5";
+	filter52 = "FLAT8";
+	filter53 = "FLAT9";
+	filter54 = "FLOOR0_1";
+	filter55 = "FLOOR0_2";
+	filter56 = "FLOOR0_3";
+	filter57 = "FLOOR0_5";
+	filter58 = "FLOOR0_6";
+	filter59 = "FLOOR0_7";
+	filter60 = "FLOOR1_1";
+	filter61 = "FLOOR1_6";
+	filter62 = "FLOOR1_7";
+	filter63 = "FLOOR3_3";
+	filter64 = "FLOOR4_1";
+	filter65 = "FLOOR4_5";
+	filter66 = "FLOOR4_6";
+	filter67 = "FLOOR4_8";
+	filter68 = "FLOOR5_1";
+	filter69 = "FLOOR5_2";
+	filter70 = "FLOOR5_3";
+	filter71 = "FLOOR5_4";
+	filter72 = "FLOOR7_1";
+	filter73 = "GRAY*";
+	filter74 = "ICKWALL*";
+	filter75 = "LITE*";
+	filter76 = "METAL";
+	filter77 = "METAL1";
+	filter78 = "METAL2";
+	filter79 = "METAL3";
+	filter80 = "METAL4";
+	filter81 = "METAL5";
+	filter82 = "METAL6";
+	filter83 = "METAL7";
+	filter84 = "MFLR8_1";
+	filter85 = "MIDBARS1";
+	filter86 = "MIDBARS3";
+	filter87 = "MIDBRONZ";
+	filter88 = "MIDSPACE";
+	filter89 = "MODWALL*";
+	filter90 = "NUKE*";
+	filter91 = "PIPES";
+	filter92 = "PIPEWAL1";
+	filter93 = "PIPEWAL2";
+	filter94 = "PLAT1";
+	filter95 = "RROCK14";
+	filter96 = "SHAWN*";
+	filter97 = "SILVER*";
+	filter98 = "SLAD*";
+	filter99 = "SLIME13";
+	filter100 = "SLIME14";
+	filter101 = "SLIME15";
+	filter102 = "SLIME16";
+	filter103 = "SPACE*";
+	filter104 = "SPCDOOR*";
+	filter105 = "STAR*";
+	filter106 = "STEP*";
+	filter107 = "STONE";
+	filter108 = "STONE2";
+	filter109 = "STONE3";
+	filter110 = "SUPPORT2";
+	filter111 = "SUPPORT3";
+	filter112 = "SW1BLUE";
+	filter113 = "SW1BRCOM";
+	filter114 = "SW1BRIK";
+	filter115 = "SW1BRN1";
+	filter116 = "SW1BRN2";
+	filter117 = "SW1BRNGN";
+	filter118 = "SW1BROWN";
+	filter119 = "SW1CMT";
+	filter120 = "SW1COMM";
+	filter121 = "SW1COMP";
+	filter122 = "SW1DIRT";
+	filter123 = "SW1EXIT";
+	filter124 = "SW1GRAY";
+	filter125 = "SW1GRAY1";
+	filter126 = "SW1MET2";
+	filter127 = "SW1METAL";
+	filter128 = "SW1MOD1";
+	filter129 = "SW1SLAD";
+	filter130 = "SW1STARG";
+	filter131 = "SW1STON1";
+	filter132 = "SW1STON2";
+	filter133 = "SW1STONE";
+	filter134 = "SW1STRTN";
+	filter135 = "SW1TEK";
+	filter136 = "SW1VINE";
+	filter137 = "SW2BLUE";
+	filter138 = "SW2BRCOM";
+	filter139 = "SW2BRIK";
+	filter140 = "SW2BRN1";
+	filter141 = "SW2BRN2";
+	filter142 = "SW2BRNGN";
+	filter143 = "SW2BROWN";
+	filter144 = "SW2CMT";
+	filter145 = "SW2COMM";
+	filter146 = "SW2COMP";
+	filter147 = "SW2DIRT";
+	filter148 = "SW2EXIT";
+	filter149 = "SW2GRAY";
+	filter150 = "SW2GRAY1";
+	filter151 = "SW2MET2";
+	filter152 = "SW2METAL";
+	filter153 = "SW2MOD1";
+	filter154 = "SW2SLAD";
+	filter155 = "SW2STARG";
+	filter156 = "SW2STON1";
+	filter157 = "SW2STON2";
+	filter158 = "SW2STONE";
+	filter159 = "SW2STRTN";
+	filter160 = "SW2TEK";
+	filter161 = "SW2VINE";
+	filter162 = "TEK*";
+	filter163 = "TLITE*";
+	filter164 = "PIPE1";
+	filter165 = "PIPE2";
+	filter166 = "PIPE4";
+	filter167 = "PIPE6";
+	filter168 = "STUCCO*";
+	filter169 = "STUCCO";
+}
+
+
+set13
+{
+	name = "Hell";
+	filter0 = "BFALL*";
+	filter1 = "BIGDOOR5";
+	filter2 = "BIGDOOR6";
+	filter3 = "BIGDOOR7";
+	filter4 = "BLODRIP*";
+	filter5 = "BLOOD1";
+	filter6 = "BLOOD2";
+	filter7 = "BLOOD3";
+	filter8 = "CEIL1_2";
+	filter9 = "CEIL1_3";
+	filter10 = "CEIL1_1";
+	filter11 = "BSTONE1";
+	filter12 = "BSTONE2";
+	filter13 = "BSTONE3";
+	filter14 = "CRACKLE2";
+	filter15 = "CRACKLE4";
+	filter16 = "DOORBLU2";
+	filter17 = "DOORRED2";
+	filter18 = "DOORYEL2";
+	filter19 = "FIRE*";
+	filter20 = "FLAT1_1";
+	filter21 = "FLAT1_2";
+	filter22 = "FLAT1_3";
+	filter23 = "FLAT5_1";
+	filter24 = "FLAT5_2";
+	filter25 = "FLAT5_3";
+	filter26 = "FLAT5_6";
+	filter27 = "FLAT5_7";
+	filter28 = "FLAT5_8";
+	filter29 = "FLOOR1_6";
+	filter30 = "FLOOR1_7";
+	filter31 = "FLOOR6_1";
+	filter32 = "FLOOR6_2";
+	filter33 = "GATE*";
+	filter34 = "GST*";
+	filter35 = "LAVA*";
+	filter36 = "MARB*";
+	filter37 = "METAL";
+	filter38 = "MFLR8_2";
+	filter39 = "MFLR8_3";
+	filter40 = "MIDBRN1";
+	filter41 = "MIDGRATE";
+	filter42 = "REDWALL";
+	filter43 = "ROCKRED1";
+	filter44 = "ROCKRED2";
+	filter45 = "ROCKRED3";
+	filter46 = "RROCK01";
+	filter47 = "RROCK02";
+	filter48 = "RROCK03";
+	filter49 = "RROCK04";
+	filter50 = "RROCK05";
+	filter51 = "RROCK06";
+	filter52 = "RROCK07";
+	filter53 = "RROCK08";
+	filter54 = "RROCK09";
+	filter55 = "RROCK10";
+	filter56 = "RROCK11";
+	filter57 = "RROCK12";
+	filter58 = "RROCK15";
+	filter59 = "SFLR6_1";
+	filter60 = "SFLR6_4";
+	filter61 = "SFLR7_1";
+	filter62 = "SFLR7_4";
+	filter63 = "SK_LEFT";
+	filter64 = "SK_RIGHT";
+	filter65 = "SKIN*";
+	filter66 = "SKSNAKE1";
+	filter67 = "SKSNAKE2";
+	filter68 = "SKSPINE1";
+	filter69 = "SKSPINE2";
+	filter70 = "SLIME09";
+	filter71 = "SLIME10";
+	filter72 = "SLIME11";
+	filter73 = "SLIME12";
+	filter74 = "SLOPPY1";
+	filter75 = "SLOPPY2";
+	filter76 = "SP_*";
+	filter77 = "SUPPORT3";
+	filter78 = "SW1GARG";
+	filter79 = "SW1GSTON";
+	filter80 = "SW1HOT";
+	filter81 = "SW1LION";
+	filter82 = "SW1MARB";
+	filter83 = "SW1SATYR";
+	filter84 = "SW1SKIN";
+	filter85 = "SW1SKULL";
+	filter86 = "SW1WDMET";
+	filter87 = "SW1WOOD";
+	filter88 = "SW2GARG";
+	filter89 = "SW2GSTON";
+	filter90 = "SW2HOT";
+	filter91 = "SW2LION";
+	filter92 = "SW2MARB";
+	filter93 = "SW2SATYR";
+	filter94 = "SW2SKIN";
+	filter95 = "SW2SKULL";
+	filter96 = "SW2WDMET";
+	filter97 = "SW2WOOD";
+	filter98 = "WOOD*";
+}
+
+
+set14
+{
+	name = "Outdoors";
+	filter0 = "ASHWALL*";
+	filter1 = "BFALL*";
+	filter2 = "FLAT10";
+	filter3 = "FLAT5_7";
+	filter4 = "FLAT5_8";
+	filter5 = "FLOOR6_1";
+	filter6 = "FLOOR6_2";
+	filter7 = "FWATER*";
+	filter8 = "GRASS*";
+	filter9 = "LAVA*";
+	filter10 = "MFLR8_2";
+	filter11 = "MFLR8_3";
+	filter12 = "MFLR8_4";
+	filter13 = "NUKAGE*";
+	filter14 = "ROCK4";
+	filter15 = "ROCK5";
+	filter16 = "ROCKRED1";
+	filter17 = "ROCKRED2";
+	filter18 = "ROCKRED3";
+	filter19 = "RROCK01";
+	filter20 = "RROCK02";
+	filter21 = "RROCK03";
+	filter22 = "RROCK04";
+	filter23 = "RROCK05";
+	filter24 = "RROCK06";
+	filter25 = "RROCK07";
+	filter26 = "RROCK08";
+	filter27 = "RROCK16";
+	filter28 = "RROCK17";
+	filter29 = "RROCK18";
+	filter30 = "RROCK19";
+	filter31 = "RROCK20";
+	filter32 = "SFALL*";
+	filter33 = "SLIME01";
+	filter34 = "SLIME02";
+	filter35 = "SLIME03";
+	filter36 = "SLIME04";
+	filter37 = "SLIME05";
+	filter38 = "SLIME06";
+	filter39 = "SLIME07";
+	filter40 = "SLIME08";
+	filter41 = "SLIME09";
+	filter42 = "SLIME10";
+	filter43 = "SLIME11";
+	filter44 = "SLIME12";
+	filter45 = "SP_ROCK1";
+	filter46 = "STONE4";
+	filter47 = "STONE5";
+	filter48 = "STONE6";
+	filter49 = "STONE7";
+	filter50 = "TANROCK5";
+	filter51 = "TANROCK8";
+	filter52 = "ZIMMER*";
+}
+
+
+set15
+{
+	name = "Computer";
+	filter0 = "COMP*";
+	filter1 = "CONS*";
+	filter2 = "SILVER3";
+	filter3 = "SPACEW3";
+	filter4 = "SW1COMP";
+	filter5 = "SW2COMP";
+}
diff --git a/Build/Configurations/Includes/Doom_things.cfg b/Build/Configurations/Includes/Doom_things.cfg
new file mode 100644
index 0000000..8d3e1f2
--- /dev/null
+++ b/Build/Configurations/Includes/Doom_things.cfg
@@ -0,0 +1,898 @@
+
+players
+{
+	color = 10;	// Light Green
+	arrow = 1;
+	title = "Player Starts";
+	width = 16;
+	sort = 1;
+	height = 56;
+	hangs = 0;
+	blocking = 1;
+	error = 2;
+	
+	1
+	{
+		title = "Player 1 start";
+		sprite = "PLAYA2A8";
+		class = "$Player1Start";
+	}
+	
+	2
+	{
+		title = "Player 2 start";
+		sprite = "PLAYA2A8";
+		class = "$Player2Start";
+	}
+	
+	3
+	{
+		title = "Player 3 start";
+		sprite = "PLAYA2A8";
+		class = "$Player3Start";
+	}
+	
+	4
+	{
+		title = "Player 4 start";
+		sprite = "PLAYA2A8";
+		class = "$Player4Start";
+	}
+	
+	11
+	{
+		title = "Player Deathmatch start";
+		sprite = "PLAYF1";
+		class = "$DeathmatchStart";
+	}
+}
+
+
+teleports
+{
+	color = 2;	// Green
+	arrow = 1;
+	title = "Teleports";
+	width = 16;
+	sort = 1;
+	height = 56;
+	hangs = 0;
+	blocking = 0;
+	error = 0;
+	
+	14
+	{
+		title = "Teleport Destination";
+		sprite = "TFOGB0";
+		class = "TeleportDest";
+	}
+}
+
+monsters
+{
+	color = 12;	// Light Red
+	arrow = 1;
+	title = "Monsters";
+	width = 20;
+	sort = 1;
+	height = 56;
+	hangs = 0;
+	blocking = 1;
+	error = 2;
+	
+	3004
+	{
+		title = "Former Human";
+		sprite = "POSSA2A8";
+		class = "ZombieMan";
+	}
+	
+	9
+	{
+		title = "Former Sergeant";
+		sprite = "SPOSA2A8";
+		class = "ShotgunGuy";
+	}
+	
+	3001
+	{
+		title = "Imp";
+		sprite = "TROOA2A8";
+		class = "DoomImp";
+	}
+	
+	3002
+	{
+		title = "Demon";
+		width = 30;
+		sprite = "SARGA2A8";
+		class = "Demon";
+	}
+	
+	58
+	{
+		title = "Spectre";
+		renderstyle = "translucent";
+		alpha = 0.25f;
+		width = 30;
+		sprite = "SARGF1";
+		class = "Spectre";
+	}
+	
+	3006
+	{
+		title = "Lost Soul";
+		width = 16;
+		sprite = "SKULA8A2";
+		class = "LostSoul";
+	}
+	
+	3005
+	{
+		title = "Cacodemon";
+		width = 31;
+		sprite = "HEADA2A8";
+		class = "Cacodemon";
+	}
+	
+	3003
+	{
+		title = "Baron of Hell";
+		width = 24;
+		sprite = "BOSSA2A8";
+		height = 64;
+		class = "BaronOfHell";
+	}
+	
+	16
+	{
+		title = "Cyberdemon";
+		width = 40;
+		sprite = "CYBRA2";
+		height = 110;
+		class = "Cyberdemon";
+	}
+	
+	7
+	{
+		title = "Spider Mastermind";
+		width = 128;
+		sprite = "SPIDG2G8";
+		height = 100;
+		class = "SpiderMastermind";
+	}
+}
+
+weapons
+{
+	color = 14;	// Yellow
+	arrow = 0;
+	title = "Weapons";
+	width = 20;
+	sort = 1;
+	height = 25;
+	hangs = 0;
+	blocking = 0;
+	
+	2005
+	{
+		title = "Chainsaw";
+		sprite = "CSAWA0";
+		class = "Chainsaw";
+	}
+	
+	2001
+	{
+		title = "Shotgun";
+		sprite = "SHOTA0";
+		class = "Shotgun";
+	}
+	
+	2002
+	{
+		title = "Chaingun";
+		sprite = "MGUNA0";
+		class = "Chaingun";
+	}
+	
+	2003
+	{
+		title = "Rocket launcher";
+		sprite = "LAUNA0";
+		class = "RocketLauncher";
+	}
+	
+	2004
+	{
+		title = "Plasma gun";
+		sprite = "PLASA0";
+		class = "PlasmaRifle";
+	}
+	
+	2006
+	{
+		title = "BFG9000";
+		sprite = "BFUGA0";
+		height = 30;
+		class = "BFG9000";
+	}
+}
+
+ammunition
+{
+	color = 6;	// Brown
+	arrow = 0;
+	title = "Ammunition";
+	width = 20;
+	sort = 1;
+	height = 16;
+	blocking = 0;
+	hangs = 0;
+	
+	2007
+	{
+		title = "Ammo clip";
+		sprite = "CLIPA0";
+		class = "Clip";
+	}
+	
+	2008
+	{
+		title = "Shotgun shells";
+		sprite = "SHELA0";
+		class = "Shell";
+	}
+	
+	2010
+	{
+		title = "Rocket";
+		sprite = "ROCKA0";
+		height = 25;
+		class = "RocketAmmo";
+	}
+	
+	2047
+	{
+		title = "Cell charge";
+		sprite = "CELLA0";
+		class = "Cell";
+	}
+	
+	2048
+	{
+		title = "Box of Ammo";
+		sprite = "AMMOA0";
+		class = "ClipBox";
+	}
+	
+	2049
+	{
+		title = "Box of Shells";
+		sprite = "SBOXA0";
+		class = "ShellBox";
+	}
+	
+	2046
+	{
+		title = "Box of Rockets";
+		sprite = "BROKA0";
+		height = 25;
+		class = "RocketBox";
+	}
+	
+	17
+	{
+		title = "Cell charge pack";
+		sprite = "CELPA0";
+		height = 25;
+		class = "CellPack";
+	}
+	
+	8
+	{
+		title = "Backpack";
+		sprite = "BPAKA0";
+		class = "Backpack";
+	}
+}
+
+health
+{
+	color = 1;	// Blue
+	arrow = 0;
+	title = "Health and Armor";
+	width = 20;
+	sort = 1;
+	height = 16;
+	hangs = 0;
+	blocking = 0;
+	
+	2011
+	{
+		title = "Stimpack";
+		sprite = "STIMA0";
+		class = "Stimpack";
+	}
+	
+	2012
+	{
+		title = "Medikit";
+		sprite = "MEDIA0";
+		height = 25;
+		class = "Medikit";
+	}
+	
+	2014
+	{
+		title = "Health bonus";
+		sprite = "BON1A0";
+		class = "HealthBonus";
+	}
+	
+	2015
+	{
+		title = "Armor bonus";
+		sprite = "BON2A0";
+		class = "ArmorBonus";
+	}
+	
+	2018
+	{
+		title = "Green armor";
+		sprite = "ARM1A0";
+		class = "GreenArmor";
+	}
+	
+	2019
+	{
+		title = "Blue armor";
+		sprite = "ARM2A0";
+		class = "BlueArmor";
+	}
+}
+
+powerups
+{
+	color = 9;	// Light Blue
+	arrow = 0;
+	title = "Powerups";
+	width = 20;
+	sort = 1;
+	height = 16;
+	hangs = 0;
+	blocking = 0;
+	
+	2013
+	{
+		title = "Soulsphere";
+		sprite = "SOULA0";
+		height = 45;
+		class = "Soulsphere";
+	}
+	
+	2022
+	{
+		title = "Invulnerability";
+		sprite = "PINVA0";
+		height = 30;
+		class = "InvulnerabilitySphere";
+	}
+	
+	2023
+	{
+		title = "Berserk";
+		sprite = "PSTRA0";
+		class = "Berserk";
+	}
+	
+	2024
+	{
+		title = "Invisibility";
+		sprite = "PINSA0";
+		height = 45;
+		class = "BlurSphere";
+	}
+	
+	2025
+	{
+		title = "Radiation suit";
+		sprite = "SUITA0";
+		height = 60;
+		class = "RadSuit";
+	}
+	
+	2026
+	{
+		title = "Computer map";
+		sprite = "PMAPA0";
+		height = 35;
+		class = "Allmap";
+	}
+	
+	2045
+	{
+		title = "Lite Amplification goggles";
+		sprite = "PVISA0";
+		class = "Infrared";
+	}
+}
+
+keys
+{
+	color = 13;	// Light Magenta
+	arrow = 0;
+	title = "Keys";
+	width = 20;
+	sort = 1;
+	height = 16;
+	hangs = 0;
+	blocking = 0;
+	
+	5
+	{
+		title = "Blue keycard";
+		sprite = "BKEYA0";
+		class = "BlueCard";
+	}
+	
+	40
+	{
+		title = "Blue skullkey";
+		sprite = "BSKUB0";
+		class = "BlueSkull";
+	}
+	
+	13
+	{
+		title = "Red keycard";
+		sprite = "RKEYA0";
+		class = "RedCard";
+	}
+	
+	38
+	{
+		title = "Red skullkey";
+		sprite = "RSKUB0";
+		class = "RedSkull";
+	}
+	
+	6
+	{
+		title = "Yellow keycard";
+		sprite = "YKEYA0";
+		class = "YellowCard";
+	}
+	
+	39
+	{
+		title = "Yellow skullkey";
+		sprite = "YSKUB0";
+		class = "YellowSkull";
+	}
+}
+
+obstacles
+{
+	color = 3;	// Cyan
+	arrow = 0;
+	title = "Obstacles";
+	width = 16;
+	sort = 1;
+	height = 20;
+	hangs = 0;
+	blocking = 1;
+	error = 2;
+	
+	2035
+	{
+		title = "Barrel";
+		width = 10;
+		sprite = "BAR1A0";
+		height = 32;
+		class = "ExplosiveBarrel";
+	}
+	
+	48
+	{
+		title = "Tall techno pillar";
+		sprite = "ELECA0";
+		class = "TechPillar";
+	}
+	
+	30
+	{
+		title = "Tall green pillar";
+		sprite = "COL1A0";
+		class = "TallGreenColumn";
+	}
+	
+	32
+	{
+		title = "Tall red pillar";
+		sprite = "COL3A0";
+		class = "TallRedColumn";
+	}
+	
+	31
+	{
+		title = "Short green pillar";
+		sprite = "COL2A0";
+		class = "ShortGreenColumn";
+	}
+	
+	36
+	{
+		title = "Short green pillar (beating heart)";
+		sprite = "COL5A0";
+		class = "HeartColumn";
+	}
+	
+	33
+	{
+		title = "Short red pillar";
+		sprite = "COL4A0";
+		class = "ShortRedColumn";
+	}
+	
+	37
+	{
+		title = "Short red pillar (skull)";
+		sprite = "COL6A0";
+		class = "SkullColumn";
+	}
+	
+	47
+	{
+		title = "Stalagtite";
+		sprite = "SMITA0";
+		class = "Stalagtite";
+	}
+	
+	43
+	{
+		title = "Gray tree";
+		sprite = "TRE1A0";
+		class = "TorchTree";
+	}
+	
+	54
+	{
+		title = "Large brown tree";
+		width = 32;
+		sprite = "TRE2A0";
+		class = "BigTree";
+	}
+	
+	41
+	{
+		title = "Evil Eye";
+		sprite = "CEYEA0";
+		class = "EvilEye";
+	}
+	
+	42
+	{
+		title = "Floating skull rock";
+		sprite = "FSKUA0";
+		class = "FloatingSkull";
+	}
+}
+
+lights
+{
+	color = 11;	// Light Cyan
+	arrow = 0;
+	title = "Light sources";
+	width = 16;
+	sort = 1;
+	height = 16;
+	hangs = 0;
+	blocking = 1;
+	error = 2;
+	
+	2028
+	{
+		title = "Floor lamp";
+		sprite = "COLUA0";
+		class = "Column";
+	}
+	
+	34
+	{
+		title = "Candle";
+		sprite = "CANDA0";
+		width = 20;
+		blocking = 0;
+		error = 1;
+		class = "Candlestick";
+	}
+	
+	35
+	{
+		title = "Candelabra";
+		sprite = "CBRAA0";
+		class = "Candelabra";
+	}
+	
+	44
+	{
+		title = "Tall blue firestick";
+		sprite = "TBLUA0";
+		class = "BlueTorch";
+	}
+	
+	45
+	{
+		title = "Tall green firestick";
+		sprite = "TGRNA0";
+		class = "GreenTorch";
+	}
+	
+	46
+	{
+		title = "Tall red firestick";
+		sprite = "TREDA0";
+		class = "RedTorch";
+	}
+	
+	55
+	{
+		title = "Short blue firestick";
+		sprite = "SMBTA0";
+		class = "ShortBlueTorch";
+	}
+	
+	56
+	{
+		title = "Short green firestick";
+		sprite = "SMGTA0";
+		class = "ShortGreenTorch";
+	}
+	
+	57
+	{
+		title = "Short red firestick";
+		sprite = "SMRTA0";
+		class = "ShortRedTorch";
+	}
+}
+
+decoration
+{
+	color = 4;	// Red
+	arrow = 0;
+	title = "Decoration";
+	width = 20;
+	sort = 1;
+	height = 16;
+	hangs = 0;
+	blocking = 0;
+	
+	49
+	{
+		title = "Hanging victim, twitching (blocking)";
+		sprite = "GOR1A0";
+		height = 68;
+		width = 16;
+		hangs = 1;
+		blocking = 1;
+		error = 2;
+		class = "BloodyTwitch";
+	}
+	
+	63
+	{
+		title = "Hanging victim, twitching";
+		sprite = "GOR1A0";
+		height = 68;
+		hangs = 1;
+		class = "NonsolidTwitch";
+	}
+	
+	50
+	{
+		title = "Hanging victim, arms out (blocking)";
+		sprite = "GOR2A0";
+		height = 84;
+		hangs = 1;
+		blocking = 1;
+		error = 2;
+		class = "Meat2";
+	}
+	
+	59
+	{
+		title = "Hanging victim, arms out";
+		sprite = "GOR2A0";
+		height = 84;
+		hangs = 1;
+		class = "NonsolidMeat2";
+	}
+	
+	52
+	{
+		title = "Hanging pair of legs (blocking)";
+		sprite = "GOR4A0";
+		height = 68;
+		width = 16;
+		hangs = 1;
+		blocking = 1;
+		error = 2;
+		class = "Meat4";
+	}
+	
+	60
+	{
+		title = "Hanging pair of legs";
+		sprite = "GOR4A0";
+		height = 68;
+		hangs = 1;
+		class = "NonsolidMeat4";
+	}
+	
+	51
+	{
+		title = "Hanging victim, 1-legged (blocking)";
+		sprite = "GOR3A0";
+		height = 84;
+		width = 16;
+		hangs = 1;
+		blocking = 1;
+		error = 2;
+		class = "HangingCorpse";
+	}
+	
+	61
+	{
+		title = "Hanging victim, 1-legged";
+		sprite = "GOR3A0";
+		height = 52;
+		hangs = 1;
+		class = "NonsolidMeat3";
+	}
+	
+	53
+	{
+		title = "Hanging leg (blocking)";
+		sprite = "GOR5A0";
+		height = 52;
+		width = 16;
+		hangs = 1;
+		blocking = 1;
+		error = 2;
+		class = "Meat5";
+	}
+	
+	62
+	{
+		title = "Hanging leg";
+		sprite = "GOR5A0";
+		height = 52;
+		hangs = 1;
+		class = "NonsolidMeat5";
+	}
+	
+	25
+	{
+		title = "Impaled human";
+		sprite = "POL1A0";
+		width = 16;
+		blocking = 1;
+		error = 2;
+		class = "DeadStick";
+	}
+	
+	26
+	{
+		title = "Twitching impaled human";
+		sprite = "POL6A0";
+		width = 16;
+		blocking = 1;
+		error = 2;
+		class = "LiveStick";
+	}
+	
+	27
+	{
+		title = "Skull on a pole";
+		sprite = "POL4A0";
+		width = 16;
+		blocking = 1;
+		error = 2;
+		class = "HeadOnAStick";
+	}
+	
+	28
+	{
+		title = "5 skulls shish kebob";
+		sprite = "POL2A0";
+		width = 16;
+		blocking = 1;
+		error = 2;
+		class = "HeadsOnAStick";
+	}
+	
+	29
+	{
+		title = "Pile of skulls and candles";
+		sprite = "POL3A0";
+		width = 16;
+		blocking = 1;
+		error = 2;
+		class = "HeadCandles";
+	}
+	
+	10
+	{
+		title = "Bloody mess 1";
+		sprite = "PLAYW0";
+		class = "GibbedMarine";
+	}
+	
+	12
+	{
+		title = "Bloody mess 2";
+		sprite = "PLAYW0";
+		class = "GibbedMarineExtra";
+	}
+	
+	24
+	{
+		title = "Pool of blood and bones";
+		sprite = "POL5A0";
+		class = "Gibs";
+	}
+	
+	15
+	{
+		title = "Dead player";
+		sprite = "PLAYN0";
+		class = "DeadMarine";
+	}
+	
+	18
+	{
+		title = "Dead former human";
+		sprite = "POSSL0";
+		width = 20;
+		class = "DeadZombieMan";
+	}
+	
+	19
+	{
+		title = "Dead former sergeant";
+		sprite = "SPOSL0";
+		width = 20;
+		class = "DeadShotgunGuy";
+	}
+	
+	20
+	{
+		title = "Dead imp";
+		sprite = "TROOM0";
+		width = 20;
+		class = "DeadDoomImp";
+	}
+	
+	21
+	{
+		title = "Dead demon";
+		sprite = "SARGN0";
+		width = 30;
+		class = "DeadDemon";
+	}
+	
+	22
+	{
+		title = "Dead cacodemon";
+		sprite = "HEADL0";
+		width = 31;
+		class = "DeadCacodemon";
+	}
+	
+	23
+	{
+		title = "Dead lost soul";
+		class = "DeadLostSoul";
+	}
+}
diff --git a/Build/Configurations/Includes/GZDoom_things.cfg b/Build/Configurations/Includes/GZDoom_things.cfg
new file mode 100644
index 0000000..37fc550
--- /dev/null
+++ b/Build/Configurations/Includes/GZDoom_things.cfg
@@ -0,0 +1,474 @@
+gzdoom_lights
+{
+	dynlights
+	{
+		color = 7;
+		arrow = 0;
+		title = "Dynamic Lights";
+		sort = 1;
+		width = 0;
+		height = 0;
+		hangs = 0;
+		blocking = 0;
+		fixedsize = true;
+		sprite = "internal:light";
+
+		9800
+		{
+			title = "Light";
+			arg0
+			{
+				title = "Red";
+				default = 255;
+			}
+			arg1
+			{
+				title = "Green";
+				default = 255;
+			}
+			arg2
+			{
+				title = "Blue";
+				default = 255;
+			}
+			arg3
+			{
+				title = "Intensity";
+				default = 64;
+			}
+		}
+		9801
+		{
+			title = "Pulse Light";
+      fixedrotation = true;
+			arg0
+			{
+				title = "Red";
+				default = 255;
+			}
+			arg1
+			{
+				title = "Green";
+				default = 255;
+			}
+			arg2
+			{
+				title = "Blue";
+				default = 255;
+			}
+			arg3
+			{
+				title = "Start intensity";
+				default = 64;
+			}
+			arg4
+			{
+				title = "End intensity";
+				default = 32;
+			}
+		}
+		9802
+		{
+			title = "Flicker Light";
+      fixedrotation = true;
+			arg0
+			{
+				title = "Red";
+				default = 255;
+			}
+			arg1
+			{
+				title = "Green";
+				default = 255;
+			}
+			arg2
+			{
+				title = "Blue";
+				default = 255;
+			}
+			arg3
+			{
+				title = "Primary intensity";
+				default = 64;
+			}
+			arg4
+			{
+				title = "Secondary intensity";
+				default = 32;
+			}
+		}
+		9803
+		{
+			title = "Sector Light";
+			arg0
+			{
+				title = "Red";
+				default = 255;
+			}
+			arg1
+			{
+				title = "Green";
+				default = 255;
+			}
+			arg2
+			{
+				title = "Blue";
+				default = 255;
+			}
+			arg3
+			{
+				title = "Intensity scale";
+				default = 4;
+			}
+		}
+		9804
+		{
+			title = "Random Light";
+      fixedrotation = true;
+			arg0
+			{
+				title = "Red";
+				default = 255;
+			}
+			arg1
+			{
+				title = "Green";
+				default = 255;
+			}
+			arg2
+			{
+				title = "Blue";
+				default = 255;
+			}
+			arg3
+			{
+				title = "Minimal intensity";
+				default = 32;
+			}
+			arg4
+			{
+				title = "Maximal intensity";
+				default = 64;
+			}
+		}
+		9810
+		{
+			title = "Additive Light";
+			arg0
+			{
+				title = "Red";
+				default = 255;
+			}
+			arg1
+			{
+				title = "Green";
+				default = 255;
+			}
+			arg2
+			{
+				title = "Blue";
+				default = 255;
+			}
+			arg3
+			{
+				title = "Intensity";
+				default = 64;
+			}
+		}
+		9811
+		{
+			title = "Additive Pulse Light";
+      fixedrotation = true;
+			arg0
+			{
+				title = "Red";
+				default = 255;
+			}
+			arg1
+			{
+				title = "Green";
+				default = 255;
+			}
+			arg2
+			{
+				title = "Blue";
+				default = 255;
+			}
+			arg3
+			{
+				title = "Start intensity";
+				default = 32;
+			}
+			arg4
+			{
+				title = "End intensity";
+				default = 64;
+			}
+		}
+		9812
+		{
+			title = "Additive Flicker Light";
+      fixedrotation = true;
+			arg0
+			{
+				title = "Red";
+				default = 255;
+			}
+			arg1
+			{
+				title = "Green";
+				default = 255;
+			}
+			arg2
+			{
+				title = "Blue";
+				default = 255;
+			}
+			arg3
+			{
+				title = "Primary intensity";
+				default = 64;
+			}
+			arg4
+			{
+				title = "Secondary intensity";
+				default = 32;
+			}
+		}
+		9813
+		{
+			title = "Additive Sector Light";
+			arg0
+			{
+				title = "Red";
+				default = 255;
+			}
+			arg1
+			{
+				title = "Green";
+				default = 255;
+			}
+			arg2
+			{
+				title = "Blue";
+				default = 255;
+			}
+			arg3
+			{
+				title = "Intensity scale";
+				default = 4;
+			}
+		}
+		9814
+		{
+			title = "Additive Random Light";
+      fixedrotation = true;
+			arg0
+			{
+				title = "Red";
+				default = 255;
+			}
+			arg1
+			{
+				title = "Green";
+				default = 255;
+			}
+			arg2
+			{
+				title = "Blue";
+				default = 255;
+			}
+			arg3
+			{
+				title = "Minimal intensity";
+				default = 32;
+			}
+			arg4
+			{
+				title = "Maximal intensity";
+				default = 64;
+			}
+		}
+		9820
+		{
+			title = "Subtractive Light";
+			arg0
+			{
+				title = "Red";
+				default = 255;
+			}
+			arg1
+			{
+				title = "Green";
+				default = 255;
+			}
+			arg2
+			{
+				title = "Blue";
+				default = 255;
+			}
+			arg3
+			{
+				title = "Radius";
+				default = 64;
+			}
+		}
+		9821
+		{
+			title = "Subtractive Pulse Light";
+      fixedrotation = true;
+			arg0
+			{
+				title = "Red";
+				default = 255;
+			}
+			arg1
+			{
+				title = "Green";
+				default = 255;
+			}
+			arg2
+			{
+				title = "Blue";
+				default = 255;
+			}
+			arg3
+			{
+				title = "Start intensity";
+				default = 32;
+			}
+			arg4
+			{
+				title = "End intensity";
+				default = 64;
+			}
+		}
+		9822
+		{
+			title = "Subtractive Flicker Light";
+      fixedrotation = true;
+			arg0
+			{
+				title = "Red";
+				default = 255;
+			}
+			arg1
+			{
+				title = "Green";
+				default = 255;
+			}
+			arg2
+			{
+				title = "Blue";
+				default = 255;
+			}
+			arg3
+			{
+				title = "Primary intensity";
+				default = 32;
+			}
+			arg4
+			{
+				title = "Secondary intensity";
+				default = 64;
+			}
+		}
+		9823
+		{
+			title = "Subtractive Sector Light";
+			arg0
+			{
+				title = "Red";
+				default = 255;
+			}
+			arg1
+			{
+				title = "Green";
+				default = 255;
+			}
+			arg2
+			{
+				title = "Blue";
+				default = 255;
+			}
+			arg3
+			{
+				title = "Intensity scale";
+				default = 4;
+			}
+		}
+		9824
+		{
+			title = "Subtractive Random Light";
+      fixedrotation = true;
+			arg0
+			{
+				title = "Red";
+				default = 255;
+			}
+			arg1
+			{
+				title = "Green";
+				default = 255;
+			}
+			arg2
+			{
+				title = "Blue";
+				default = 255;
+			}
+			arg3
+			{
+				title = "Minimal intensity";
+				default = 32;
+			}
+			arg4
+			{
+				title = "Maximal intensity";
+				default = 64;
+			}
+		}
+		9825 = "Vavoom Light";
+		1502
+		{
+			title = "Vavoom Light ";
+			arg0
+			{
+				title = "Radius";
+				default = 16;
+			}
+		}
+		1503
+		{
+			title = "Vavoom Light Color";
+			arg0
+			{
+				title = "Radius";
+				default = 16;
+			}
+			arg1
+			{
+				title = "Red";
+				default = 255;
+			}
+			arg2
+			{
+				title = "Green";
+				default = 255;
+			}
+			arg3
+			{
+				title = "Blue";
+				default = 255;
+			}
+		}
+	}
+}
+
+gzdoom
+{
+	zdoom
+	{
+		blocking = 2;
+		5004 = "Map Spot (FraggleScript)";
+	}
+}
\ No newline at end of file
diff --git a/Build/Configurations/Includes/Game_Doom.cfg b/Build/Configurations/Includes/Game_Doom.cfg
new file mode 100644
index 0000000..f3d3fd3
--- /dev/null
+++ b/Build/Configurations/Includes/Game_Doom.cfg
@@ -0,0 +1,29 @@
+// Default lump name for new map
+  defaultlumpname = "MAP01";
+  basegame = 1; //mxd: 0 - UNKNOWN, 1 - DOOM, 2 - HERETIC, 3 - HEXEN, 4 - STRIFE, 
+
+  // Decorate actors to include depending on actor game property
+  decorategames = "doom";
+
+  // Skill levels
+  skills
+  {
+    include("Doom_misc.cfg", "skills");
+  }
+
+  // Default textures
+  defaultwalltexture = "STARTAN";
+  defaultfloortexture = "FLOOR0_1";
+  defaultceilingtexture = "CEIL1_1";
+
+  // Door making
+  makedoortrack = "DOORTRAK";
+  makedoordoor = "BIGDOOR2";
+  makedoorceil = "FLAT20";
+
+  // Default texture sets
+  // (these are not required, but useful for new users)
+  texturesets
+  {
+    include("Doom_texturesets.cfg");
+  }
\ No newline at end of file
diff --git a/Build/Configurations/Includes/Game_Heretic.cfg b/Build/Configurations/Includes/Game_Heretic.cfg
new file mode 100644
index 0000000..d73b31b
--- /dev/null
+++ b/Build/Configurations/Includes/Game_Heretic.cfg
@@ -0,0 +1,29 @@
+// Default lump name for new map
+  defaultlumpname = "E1M1";
+  basegame = 2;
+
+  // Decorate actors to include depending on actor game property
+  decorategames = "heretic raven";
+
+  // Skill levels
+  skills
+  {
+    include("Heretic_misc.cfg", "skills");
+  }
+
+  // Default textures
+  defaultwalltexture = "GRSTNPB";
+  defaultfloortexture = "FLOOR03";
+  defaultceilingtexture = "FLAT506";
+
+  // Door making
+  makedoortrack = "WOODWL";
+  makedoordoor = "DOORWOOD";
+  makedoorceil = "FLOOR04";
+  
+  // Default texture sets
+  // (these are not required, but useful for new users)
+  texturesets
+  {
+    include("Heretic_texturesets.cfg");
+  }
\ No newline at end of file
diff --git a/Build/Configurations/Includes/Game_Hexen.cfg b/Build/Configurations/Includes/Game_Hexen.cfg
new file mode 100644
index 0000000..30b1418
--- /dev/null
+++ b/Build/Configurations/Includes/Game_Hexen.cfg
@@ -0,0 +1,30 @@
+// Default lump name for new map
+  defaultlumpname = "MAP01";
+  skyflatname = "F_SKY";
+  basegame = 3;
+
+  // Decorate actors to include depending on actor game property
+  decorategames = "hexen raven";
+
+  // Skill levels
+  skills
+  {
+    include("Hexen_misc.cfg", "skills");
+  }
+
+  // Default textures
+  defaultwalltexture = "FOREST01";
+  defaultfloortexture = "F_010";
+  defaultceilingtexture = "F_011";
+
+  // Door making
+  makedoortrack = "D_END2";
+  makedoordoor = "D_WD07";
+  makedoorceil = "F_092";
+
+  // Default texture sets
+  // (these are not required, but useful for new users)
+  texturesets
+  {
+    include("Hexen_texturesets.cfg");
+  }
\ No newline at end of file
diff --git a/Build/Configurations/Includes/Game_Strife.cfg b/Build/Configurations/Includes/Game_Strife.cfg
new file mode 100644
index 0000000..de3b6a6
--- /dev/null
+++ b/Build/Configurations/Includes/Game_Strife.cfg
@@ -0,0 +1,30 @@
+// Default lump name for new map
+  defaultlumpname = "MAP01";
+  skyflatname = "F_SKY001";
+  basegame = 4;
+
+  // Decorate actors to include depending on actor game property
+  decorategames = "strife";
+
+  // Skill levels
+  skills
+  {
+    include("Strife_misc.cfg", "skills");
+  }
+
+  // Default textures
+  defaultwalltexture = "BRKGRY17";
+  defaultfloortexture = "F_NOLINE";
+  defaultceilingtexture = "F_DECK";
+
+  // Door making
+  makedoortrack = "DORTRK01";
+  makedoordoor = "DORML01";
+  makedoorceil = "F_UNDOOR";
+
+  // Default texture sets
+  // (these are not required, but useful for new users)
+  texturesets
+  {
+    include("Strife_texturesets.cfg");
+  }
\ No newline at end of file
diff --git a/Build/Configurations/Includes/Heretic_common.cfg b/Build/Configurations/Includes/Heretic_common.cfg
new file mode 100644
index 0000000..9fe8a86
--- /dev/null
+++ b/Build/Configurations/Includes/Heretic_common.cfg
@@ -0,0 +1,90 @@
+//mxd. These settings are used only in Vanilla Heretic configuration.
+mapformat_doom
+{
+  // The format interface handles the map data format
+  formatinterface = "DoomMapSetIO";
+
+  maplumpnames
+  {
+    include("Doom_misc.cfg", "doommaplumpnames");
+  }
+
+  // When this is set to true, sectors with the same tag will light up when a line is highlighted
+  linetagindicatesectors = true;
+
+  // Special linedefs
+  include("ZDoom_misc.cfg", "speciallinedefs_doomhexen");
+
+  // Default flags for first new thing
+  defaultthingflags
+  {
+    include("Doom_misc.cfg", "defaultthingflags");
+  }
+	
+	// Door making
+  include("ZDoom_misc.cfg", "doormaking_doom");
+
+  // Generalized actions
+  generalizedlinedefs = false;
+  generalizedsectors = false;
+  
+  // DEFAULT SECTOR BRIGHTNESS LEVELS
+  sectorbrightness
+  {
+    include("Doom_misc.cfg", "sectorbrightness");
+  }
+	
+	// SECTOR TYPES
+  sectortypes
+  {
+		include("Heretic_sectors.cfg");
+  }
+
+  // LINEDEF FLAGS
+  linedefflags
+	{
+		include("Doom_misc.cfg", "linedefflags");
+	}
+
+	// LINEDEF ACTIVATIONS
+	linedefactivations
+	{
+	}
+
+	// Linedef flags UDMF translation table
+	// This is needed for copy/paste and prefabs to work properly
+	// When the UDMF field name is prefixed with ! it is inverted
+	linedefflagstranslation
+	{
+		include("Doom_misc.cfg", "linedefflagstranslation");
+	}
+
+	// LINEDEF TYPES
+	linedeftypes
+	{
+		include("Heretic_linedefs.cfg");
+	}
+
+	// THING FLAGS
+	thingflags
+	{
+		include("Doom_misc.cfg", "thingflags");
+	}
+
+	// Thing flags UDMF translation table
+	// This is needed for copy/paste and prefabs to work properly
+	// When the UDMF field name is prefixed with ! it is inverted
+	thingflagstranslation
+	{
+		include("Doom_misc.cfg", "thingflagstranslation");
+	}
+	
+		// How to compare thing flags (for the stuck things error checker)
+	thingflagscompare
+	{
+		include("Doom_misc.cfg", "thingflagscompare");
+	}
+
+	// Things flags masks
+	include("Doom_misc.cfg", "thingflagsmasks");
+}
\ No newline at end of file
diff --git a/Build/Configurations/Includes/Heretic_linedefs.cfg b/Build/Configurations/Includes/Heretic_linedefs.cfg
new file mode 100644
index 0000000..b1eb4e0
--- /dev/null
+++ b/Build/Configurations/Includes/Heretic_linedefs.cfg
@@ -0,0 +1,700 @@
+
+misc
+{
+	
+	0
+	{
+		title = "None";
+		prefix = "";
+	}
+}
+
+
+door
+{
+	title = "Door";
+	
+	1
+	{
+		title = "Door Open Wait Close (also monsters)";
+		prefix = "DR";
+	}
+	
+	2
+	{
+		title = "Door Open Stay";
+		prefix = "W1";
+	}
+	
+	3
+	{
+		title = "Door Close Stay";
+		prefix = "W1";
+	}
+	
+	4
+	{
+		title = "Door Open Wait Close";
+		prefix = "W1";
+	}
+	
+	16
+	{
+		title = "Door Close Wait Open";
+		prefix = "W1";
+	}
+	
+	26
+	{
+		title = "Door (Blue) Open Wait Close";
+		prefix = "DR";
+	}
+	
+	27
+	{
+		title = "Door (Yellow) Open Wait Close";
+		prefix = "DR";
+	}
+	
+	28
+	{
+		title = "Door (Red) Open Wait Close";
+		prefix = "DR";
+	}
+	
+	29
+	{
+		title = "Door Open Wait Close";
+		prefix = "S1";
+	}
+	
+	31
+	{
+		title = "Door Open Stay";
+		prefix = "D1";
+	}
+	
+	32
+	{
+		title = "Door (Blue) Open Stay";
+		prefix = "D1";
+	}
+	
+	33
+	{
+		title = "Door (Red) Open Stay";
+		prefix = "D1";
+	}
+	
+	34
+	{
+		title = "Door (Yellow) Open Stay";
+		prefix = "D1";
+	}
+	
+	42
+	{
+		title = "Door Close Stay";
+		prefix = "SR";
+	}
+	
+	46
+	{
+		title = "Door Open Stay";
+		prefix = "GR";
+	}
+	
+	50
+	{
+		title = "Door Close Stay";
+		prefix = "S1";
+	}
+	
+	61
+	{
+		title = "Door Open Stay";
+		prefix = "SR";
+	}
+	
+	63
+	{
+		title = "Door Open Wait Close";
+		prefix = "SR";
+	}
+	
+	75
+	{
+		title = "Door Close Stay";
+		prefix = "WR";
+	}
+	
+	76
+	{
+		title = "Door Close Stay Open";
+		prefix = "WR";
+	}
+	
+	86
+	{
+		title = "Door Open Stay";
+		prefix = "WR";
+	}
+	
+	90
+	{
+		title = "Door Open Wait Close";
+		prefix = "WR";
+	}
+	
+	103
+	{
+		title = "Door Open Stay";
+		prefix = "S1";
+	}
+}
+
+
+floor
+{
+	title = "Floor";
+	
+	5
+	{
+		title = "Floor Raise to Lowest Ceiling";
+		prefix = "W1";
+	}
+	
+	9
+	{
+		title = "Floor Raise Donut (changes texture)";
+		prefix = "S1";
+	}
+	
+	14
+	{
+		title = "Floor Raise by 32 (changes texture)";
+		prefix = "S1";
+	}
+	
+	15
+	{
+		title = "Floor Raise by 24 (changes texture)";
+		prefix = "S1";
+	}
+	
+	18
+	{
+		title = "Floor Raise to Next Higher Floor";
+		prefix = "S1";
+	}
+	
+	19
+	{
+		title = "Floor Lower to Highest Floor";
+		prefix = "W1";
+	}
+	
+	20
+	{
+		title = "Floor Raise to Next Higher Floor (changes texture)";
+		prefix = "S1";
+	}
+	
+	22
+	{
+		title = "Floor Raise to Next Higher Floor (changes texture)";
+		prefix = "W1";
+	}
+	
+	23
+	{
+		title = "Floor Lower to Lowest Floor";
+		prefix = "S1";
+	}
+	
+	24
+	{
+		title = "Floor Raise to Lowest Ceiling";
+		prefix = "G1";
+	}
+	
+	30
+	{
+		title = "Floor Raise by Shortest Lower Texture";
+		prefix = "W1";
+	}
+	
+	36
+	{
+		title = "Floor Lower to 8 above Highest Floor";
+		prefix = "W1";
+	}
+	
+	37
+	{
+		title = "Floor Lower to Lowest Floor (changes texture)";
+		prefix = "W1";
+	}
+	
+	38
+	{
+		title = "Floor Lower to Lowest Floor";
+		prefix = "W1";
+	}
+	
+	45
+	{
+		title = "Floor Lower to Highest Floor";
+		prefix = "SR";
+	}
+	
+	47
+	{
+		title = "Floor Raise to Next Higher Floor (changes texture)";
+		prefix = "G1";
+	}
+	
+	53
+	{
+		title = "Floor Start Moving Up and Down";
+		prefix = "W1";
+	}
+	
+	54
+	{
+		title = "Floor Stop Moving";
+		prefix = "W1";
+	}
+	
+	55
+	{
+		title = "Floor Raise to 8 below Lowest Ceiling (crushes)";
+		prefix = "S1";
+	}
+	
+	56
+	{
+		title = "Floor Raise to 8 below Lowest Ceiling (crushes)";
+		prefix = "W1";
+	}
+	
+	58
+	{
+		title = "Floor Raise by 24";
+		prefix = "W1";
+	}
+	
+	59
+	{
+		title = "Floor Raise by 24 (changes texture)";
+		prefix = "W1";
+	}
+	
+	60
+	{
+		title = "Floor Lower to Lowest Floor";
+		prefix = "SR";
+	}
+	
+	64
+	{
+		title = "Floor Raise to Lowest Ceiling";
+		prefix = "SR";
+	}
+	
+	65
+	{
+		title = "Floor Raise to 8 below Lowest Ceiling (crushes)";
+		prefix = "SR";
+	}
+	
+	66
+	{
+		title = "Floor Raise by 24 (changes texture)";
+		prefix = "SR";
+	}
+	
+	67
+	{
+		title = "Floor Raise by 32 (changes texture)";
+		prefix = "SR";
+	}
+	
+	68
+	{
+		title = "Floor Raise to Next Higher Floor (changes texture)";
+		prefix = "SR";
+	}
+	
+	69
+	{
+		title = "Floor Raise to Next Higher Floor";
+		prefix = "SR";
+	}
+	
+	70
+	{
+		title = "Floor Lower to 8 above Highest Floor";
+		prefix = "SR";
+	}
+	
+	71
+	{
+		title = "Floor Lower to 8 above Highest Floor";
+		prefix = "S1";
+	}
+	
+	82
+	{
+		title = "Floor Lower to Lowest Floor";
+		prefix = "WR";
+	}
+	
+	83
+	{
+		title = "Floor Lower to Highest Floor";
+		prefix = "WR";
+	}
+	
+	84
+	{
+		title = "Floor Lower to Lowest Floor (changes texture)";
+		prefix = "WR";
+	}
+	
+	87
+	{
+		title = "Floor Start Moving Up and Down";
+		prefix = "WR";
+	}
+	
+	89
+	{
+		title = "Floor Stop Moving";
+		prefix = "WR";
+	}
+	
+	91
+	{
+		title = "Floor Raise to Lowest Ceiling";
+		prefix = "WR";
+	}
+	
+	92
+	{
+		title = "Floor Raise by 24";
+		prefix = "WR";
+	}
+	
+	93
+	{
+		title = "Floor Raise by 24 (changes texture)";
+		prefix = "WR";
+	}
+	
+	94
+	{
+		title = "Floor Raise to 8 below Lowest Ceiling (crushes)";
+		prefix = "WR";
+	}
+	
+	95
+	{
+		title = "Floor Raise to Next Higher Floor (changes texture)";
+		prefix = "WR";
+	}
+	
+	96
+	{
+		title = "Floor Raise by Shortest Lower Texture";
+		prefix = "WR";
+	}
+	
+	98
+	{
+		title = "Floor Lower to 8 above Highest Floor";
+		prefix = "WR";
+	}
+	
+	101
+	{
+		title = "Floor Raise to Lowest Ceiling";
+		prefix = "S1";
+	}
+	
+	102
+	{
+		title = "Floor Lower to Highest Floor";
+		prefix = "S1";
+	}
+}
+
+
+crusher
+{
+	title = "Crusher";
+	
+	6
+	{
+		title = "Crusher Start with Fast Damage";
+		prefix = "W1";
+	}
+	
+	25
+	{
+		title = "Crusher Start with Slow Damage";
+		prefix = "W1";
+	}
+	
+	57
+	{
+		title = "Crusher Stop";
+		prefix = "W1";
+	}
+	
+	73
+	{
+		title = "Crusher Start with Slow Damage";
+		prefix = "WR";
+	}
+	
+	74
+	{
+		title = "Crusher Stop";
+		prefix = "WR";
+	}
+	
+	77
+	{
+		title = "Crusher Start with Fast Damage";
+		prefix = "WR";
+	}
+}
+
+
+stairs
+{
+	title = "Stairs";
+	
+	7
+	{
+		title = "Stairs Raise by 8";
+		prefix = "S1";
+	}
+	
+	8
+	{
+		title = "Stairs Raise by 8";
+		prefix = "W1";
+	}
+}
+
+
+lift
+{
+	title = "Lift";
+	
+	10
+	{
+		title = "Lift Lower Wait Raise";
+		prefix = "W1";
+	}
+	
+	21
+	{
+		title = "Lift Lower Wait Raise";
+		prefix = "S1";
+	}
+	
+	62
+	{
+		title = "Lift Lower Wait Raise";
+		prefix = "SR";
+	}
+	
+	88
+	{
+		title = "Lift Lower Wait Raise";
+		prefix = "WR";
+	}
+}
+
+
+exit
+{
+	title = "Exit";
+	
+	11
+	{
+		title = "Exit Level";
+		prefix = "S1";
+	}
+	
+	51
+	{
+		title = "Exit Level (goes to secret level)";
+		prefix = "S1";
+	}
+	
+	52
+	{
+		title = "Exit Level";
+		prefix = "W1";
+	}
+	
+	105
+	{
+		title = "Exit Level (goes to secret level)";
+		prefix = "W1";
+	}
+}
+
+
+light
+{
+	title = "Light";
+	
+	12
+	{
+		title = "Light Change to Brightest Adjacent";
+		prefix = "W1";
+	}
+	
+	13
+	{
+		title = "Light Change to Brightest";
+		prefix = "W1";
+	}
+	
+	17
+	{
+		title = "Light Start Blinking";
+		prefix = "W1";
+	}
+	
+	35
+	{
+		title = "Light Change to Darkest";
+		prefix = "W1";
+	}
+	
+	79
+	{
+		title = "Light Change to Darkest";
+		prefix = "WR";
+	}
+	
+	80
+	{
+		title = "Light Change to Brightest Adjacent";
+		prefix = "WR";
+	}
+	
+	81
+	{
+		title = "Light Change to Brightest";
+		prefix = "WR";
+	}
+	
+	104
+	{
+		title = "Light Change to Darkest Adjacent";
+		prefix = "W1";
+	}
+}
+
+
+ceiling
+{
+	title = "Ceiling";
+	
+	40
+	{
+		title = "Ceiling Raise to Highest Ceiling";
+		prefix = "W1";
+	}
+	
+	41
+	{
+		title = "Ceiling Lower to Floor";
+		prefix = "S1";
+	}
+	
+	43
+	{
+		title = "Ceiling Lower to Floor";
+		prefix = "SR";
+	}
+	
+	44
+	{
+		title = "Ceiling Lower to 8 above Floor";
+		prefix = "W1";
+	}
+	
+	49
+	{
+		title = "Ceiling Lower to 8 above Floor";
+		prefix = "S1";
+	}
+	
+	72
+	{
+		title = "Ceiling Lower to 8 above Floor";
+		prefix = "WR";
+	}
+}
+
+
+scroll
+{
+	title = "Scroll";
+	
+	48
+	{
+		title = "Scroll Texture Left";
+		prefix = "";
+	}
+	
+	99
+	{
+		title = "Scroll Texture Right";
+		prefix = "";
+	}
+}
+
+
+build
+{
+	title = "Build";
+	
+	106
+	{
+		title = "Build Stairs (16 Tall)";
+		prefix = "W1";
+	}
+	
+	107
+	{
+		title = "Build Stairs (16 Tall)";
+		prefix = "S1";
+	}
+}
+
+
+teleport
+{
+	title = "Teleport";
+	
+	97
+	{
+		title = "Teleport";
+		prefix = "WR";
+	}
+	
+	39
+	{
+		title = "Teleport";
+		prefix = "W1";
+	}
+}
diff --git a/Build/Configurations/Includes/Heretic_misc.cfg b/Build/Configurations/Includes/Heretic_misc.cfg
new file mode 100644
index 0000000..524304d
--- /dev/null
+++ b/Build/Configurations/Includes/Heretic_misc.cfg
@@ -0,0 +1,19 @@
+// Basic Heretic stuff.
+skills
+{
+	1 = "Thou needeth a wet-nurse";
+	2 = "Yellowbellies-r-us";
+	3 = "Bringest them oneth";
+	4 = "Thou art a smite-meister";
+	5 = "Black plague possesses thee";
+}
+
+//mxd. These are Heretic-specific settings only.
+//mxd. These settings are valid only in native Heretic map format.
+mapformat_doom
+{
+	sectortypes
+	{
+		include("Heretic_sectors.cfg");	
+	}
+}
\ No newline at end of file
diff --git a/Build/Configurations/Includes/Heretic_sectors.cfg b/Build/Configurations/Includes/Heretic_sectors.cfg
new file mode 100644
index 0000000..6f21afe
--- /dev/null
+++ b/Build/Configurations/Includes/Heretic_sectors.cfg
@@ -0,0 +1,49 @@
+
+0 = "None";
+1 = "Light Blinks (Randomly)";
+2 = "Light Blinks (0.5s)";
+3 = "Light Blinks (1.0s)";
+4 = "Damage (5 Points, Fast, Fire), Light Blinks (0.5s), Scroll East (Fast)";
+5 = "Damage (5 Points, Fast, Fire)";
+7 = "Damage (4 Points, Slow, Normal)";
+8 = "Light Glows (1.0s)";
+9 = "Secret";
+10 = "Door Close Stay (After 30s)";
+12 = "Light Blinks (0.5s Synchronized)";
+13 = "Light Blinks (1.0s Synchronized)";
+14 = "Door Open Stay (After 300s)";
+15 = "Friction";
+16 = "Damage (8 Points, Fast, Fire)";
+20 = "Scroll East (Slowest)";
+21 = "Scroll East (Slow)";
+22 = "Scroll East (Medium)";
+23 = "Scroll East (Fast)";
+24 = "Scroll East (Fastest)";
+25 = "Scroll North (Slowest)";
+26 = "Scroll North (Slow)";
+27 = "Scroll North (Medium)";
+28 = "Scroll North (Fast)";
+29 = "Scroll North (Fastest)";
+30 = "Scroll South (Slowest)";
+31 = "Scroll South (Slow)";
+32 = "Scroll South (Medium)";
+33 = "Scroll South (Fast)";
+34 = "Scroll South (Fastest)";
+35 = "Scroll West (Slowest)";
+36 = "Scroll West (Slow)";
+37 = "Scroll West (Medium)";
+38 = "Scroll West (Fast)";
+39 = "Scroll West (Fastest)";
+40 = "Wind East (Weak)";
+41 = "Wind East (Medium)";
+42 = "Wind East (Strong)";
+43 = "Wind North (Weak)";
+44 = "Wind North (Medium)";
+45 = "Wind North (Strong)";
+46 = "Wind South (Weak)";
+47 = "Wind South (Medium)";
+48 = "Wind South (Strong)";
+49 = "Wind West (Weak)";
+50 = "Wind West (Medium)";
+51 = "Wind West (Strong)";
+
diff --git a/Build/Configurations/Includes/Heretic_texturesets.cfg b/Build/Configurations/Includes/Heretic_texturesets.cfg
new file mode 100644
index 0000000..9cd707b
--- /dev/null
+++ b/Build/Configurations/Includes/Heretic_texturesets.cfg
@@ -0,0 +1,100 @@
+
+set0
+{
+	name = "Liquids";
+	filter0 = "FLATHUH*";
+	filter1 = "FLTFLWW*";
+	filter2 = "FLTLAVA*";
+	filter3 = "FLTSLUD*";
+	filter4 = "FLTWAWA*";
+	filter5 = "LAVAFL*";
+	filter6 = "WATRWAL*";
+}
+
+
+set1
+{
+	name = "Stone";
+	filter0 = "BRWNRCKS";
+	filter1 = "BANNER1";
+	filter2 = "BANNER2";
+	filter3 = "BANNER3";
+	filter4 = "BANNER4";
+	filter5 = "BANNER7";
+	filter6 = "BANNER8";
+	filter7 = "CSTLMOSS";
+	filter8 = "CSTLRCK";
+	filter9 = "FLAT520";
+	filter10 = "FLAT521";
+	filter11 = "FLAT522";
+	filter12 = "FLAT523";
+	filter13 = "FLOOR00";
+	filter14 = "FLOOR01";
+	filter15 = "FLOOR03";
+	filter16 = "FLOOR18";
+	filter17 = "GRSTNPB";
+	filter18 = "GRSTNPBV";
+	filter19 = "GRSTNPBW";
+	filter20 = "LOOSERCK";
+	filter21 = "RCKSNMUD";
+	filter22 = "ROOTWALL";
+	filter23 = "SQPEB1";
+	filter24 = "SQPEB2";
+	filter25 = "TRISTON1";
+	filter26 = "TRISTON2";
+	filter27 = "BLUEFRAG";
+	filter28 = "FLOOR04";
+	filter29 = "FLOOR05";
+	filter30 = "FLOOR06";
+	filter31 = "FLOOR07";
+	filter32 = "FLOOR16";
+	filter33 = "FLOOR19";
+	filter34 = "FLOOR20";
+	filter35 = "GRNBLOK*";
+	filter36 = "LAVA1";
+	filter37 = "SNDBLCKS";
+}
+
+
+set2
+{
+	name = "Metal";
+	filter0 = "CHAINSD";
+	filter1 = "DMNMSK";
+	filter2 = "DOOREXIT";
+	filter3 = "DOORSTON";
+	filter4 = "FLAT500";
+	filter5 = "FLOOR08";
+	filter6 = "FLOOR21";
+	filter7 = "FLOOR22";
+	filter8 = "FLOOR23";
+	filter9 = "FLOOR24";
+	filter10 = "FLOOR26";
+	filter11 = "FLOOR28";
+	filter12 = "FLOOR29";
+	filter13 = "FLOOR30";
+	filter14 = "METL1";
+	filter15 = "METL2";
+	filter16 = "SAINT1";
+	filter17 = "SKULLSB1";
+	filter18 = "SKULLSB2";
+	filter19 = "SW1OFF";
+	filter20 = "SW1ON";
+	filter21 = "SW2OFF";
+	filter22 = "SW2ON";
+	filter23 = "GATMETL*";
+	filter24 = "GATMETL";
+	filter25 = "GRSKULL*";
+}
+
+
+set3
+{
+	name = "Town";
+	filter0 = "CTYSTCI*";
+	filter1 = "CTYSTUC*";
+	filter2 = "FLOOR11";
+	filter3 = "FLOOR12";
+	filter4 = "WOODWL";
+	filter5 = "WDGAT64";
+}
diff --git a/Build/Configurations/Includes/Heretic_things.cfg b/Build/Configurations/Includes/Heretic_things.cfg
new file mode 100644
index 0000000..b484897
--- /dev/null
+++ b/Build/Configurations/Includes/Heretic_things.cfg
@@ -0,0 +1,659 @@
+
+players
+{
+	color = 10;	// Light Green
+	arrow = 1;
+	title = "Player Starts";
+	width = 16;
+	height = 56;
+	blocking = 2;
+	error = 2;
+	sort = 1;
+	
+	1
+	{
+		title = "Player 1 start";
+		sprite = "PLAYA1";
+	}
+	2
+	{
+		title = "Player 2 start";
+		sprite = "PLAYA1";
+	}
+	3
+	{
+		title = "Player 3 start";
+		sprite = "PLAYA1";
+	}
+	4
+	{
+		title = "Player 4 start";
+		sprite = "PLAYA1";
+	}
+	11
+	{
+		title = "Player Deathmatch start";
+		sprite = "PLAYQ0";
+	}
+}
+
+teleports
+{
+	color = 2;	// Green
+	arrow = 1;
+	title = "Teleports";
+	width = 16;
+	height = 56;
+	blocking = 0;
+	error = 0;
+	sort = 0;
+	
+	14
+	{
+		title = "Teleport Landing";
+		sprite = "TELEA0";
+	}
+	56
+	{
+		title = "D'Sparil Teleport Location";
+		sprite = "SOR2I0";
+	}
+	52
+	{
+		title = "Teleport Glitter (Exit/Blue)";
+		sprite = "TGLTF0";
+	}
+	74
+	{
+		title = "Teleport Glitter (Normal/Red)";
+		sprite = "TGLTA0";
+	}
+
+}
+
+sounds
+{
+	color = 5;	// Purple
+	arrow = 1;
+	title = "Sounds";
+	width = 20;
+	height = 16;
+	blocking = 0;
+	error = 0;
+	sort = 1;
+	
+	41 = "Looping Sound: Waterfall";
+	42 = "Looping Sound: Wind";
+
+	1203 = "Sequence: Slow Footsteps";
+	1209 = "Sequence: Fast Footsteps";
+
+	1200 = "Sequence: Scream";
+	1206 = "Sequence: Growl";
+	1208 = "Sequence: Laughter";
+	
+	1204 = "Sequence: Heartbeat";
+	1201 = "Sequence: Squish";
+	
+	1202 = "Sequence: Water Drops";
+	1205 = "Sequence: Bells";
+	1207 = "Sequence: Magic";
+}
+
+monsters
+{
+	color = 12;	// Light Red
+	arrow = 1;
+	title = "Monsters";
+	width = 16;
+	sort = 0;
+	error = 2;
+	blocking = 2;
+	
+	66
+	{
+		title = "Gargoyle";
+		sprite = "IMPXA1";
+		height = 36;
+	}
+	5
+	{
+		title = "Fire Gargoyle";
+		sprite = "IMPXF1";
+		height = 36;
+	}
+	68
+	{
+		title = "Golem";
+		sprite = "MUMMA1";
+		width = 22;
+		height = 62;
+	}
+	69
+	{
+		title = "Golem Ghost";
+		sprite = "MUMMA1";
+		width = 22;
+		height = 62;
+	}
+	45
+	{
+		title = "Nitrogolem";
+		sprite = "MUMMY1";
+		width = 22;
+		height = 62;
+	}
+	46
+	{
+		title = "Nitrogolem Ghost";
+		sprite = "MUMMY1";
+		width = 22;
+		height = 62;
+	}
+	90
+	{
+		title = "Sabreclaw";
+		sprite = "CLNKA1";
+		width = 20;
+		height = 64;
+	}
+	64
+	{
+		title = "Undead Warrior";
+		sprite = "KNIGA1";
+		width = 24;
+		height = 78;
+	}
+	65
+	{
+		title = "Undead Warrior Ghost";
+		sprite = "KNIGA1";
+		width = 24;
+		height = 78;
+	}
+	70
+	{
+		title = "Weredragon";
+		sprite = "BEASA1";
+		width = 32;
+		height = 74;
+	}
+	92
+	{
+		title = "Ophidian";
+		sprite = "SNKEA1";
+		width = 22;
+		height = 70;
+	}
+	15
+	{
+		title = "Disciple Of D'Sparil";
+		sprite = "WZRDA1";
+		height = 68;
+	}
+	6
+	{
+		title = "Iron Lich";
+		sprite = "HEADA1";
+		width = 40;
+		height = 72;
+	}
+	9
+	{
+		title = "Maulotaur";
+		sprite = "MNTRA1";
+		width = 28;
+		height = 100;
+	}
+	7
+	{
+		title = "D'Sparil";
+		sprite = "SRCRA1";
+		width = 28;
+		height = 100;
+	}
+}
+
+hazards
+{
+	color = 4;	// Red
+	arrow = 1;
+	title = "Hazards";
+	width = 20;
+	blocking = 2;
+	error = 2;
+	sort = 0;
+
+	87
+	{
+		title = "Volcano";
+		sprite = "VLCOE0";
+		height = 20;
+	}
+	2035
+	{
+		title = "Gasbag";
+		sprite = "PPODA0";
+		height = 54;
+	}
+	43
+	{
+		title = "Gasbag Generator";
+		sprite = "PPODA0";
+		height = 16;
+	}
+}
+
+weapons
+{
+	color = 14;	// Yellow
+	arrow = 1;
+	title = "Weapons";
+	width = 20;
+	height = 16;
+	blocking = 0;
+	sort = 0;
+
+	2005
+	{
+		title = "Gauntlets Of The Necromancer";
+		sprite = "WGNTA0";
+	}
+	2001
+	{
+		title = "Ethereal Crossbow";
+		sprite = "WBOWA0";
+	}
+	53
+	{
+		title = "Dragon Claw";
+		sprite = "WBLSA0";
+	}
+	2003
+	{
+		title = "Phoenix Rod";
+		sprite = "WPHXA0";
+	}
+	2004
+	{
+		title = "Hellstaff";
+		sprite = "WSKLA0";
+	}
+	2002
+	{
+		title = "Firemace";
+		sprite = "WMCEA0";
+	}
+}
+
+ammunition
+{
+	color = 6;	// Brown
+	arrow = 1;
+	title = "Ammunition";
+	width = 20;
+	sort = 0;
+	height = 16;
+	blocking = 0;
+	
+	10
+	{
+		title = "Wand Crystal";
+		sprite = "AMG1A0";
+	}
+	12
+	{
+		title = "Crystal Geode";
+		sprite = "AMG2A0";
+	}
+	18
+	{
+		title = "Ethereal Arrows";
+		sprite = "AMC1A0";
+	}
+	19
+	{
+		title = "Quiver Of Ethereal Arrows";
+		sprite = "AMC2A0";
+	}
+	54
+	{
+		title = "Claw Orb";
+		sprite = "AMB1A0";
+	}
+	55
+	{
+		title = "Energy Orb";
+		sprite = "AMB2A0";
+	}
+	22
+	{
+		title = "Flame Orb";
+		sprite = "AMP1A0";
+	}
+	23
+	{
+		title = "Inferno Orb";
+		sprite = "AMP2A0";
+	}
+	20
+	{
+		title = "Lesser Runes";
+		sprite = "AMS1A0";
+	}
+	21
+	{
+		title = "Greater Runes";
+		sprite = "AMS2A0";
+	}
+	13
+	{
+		title = "Mace Spheres";
+		sprite = "AMM1A0";
+	}
+	16
+	{
+		title = "Pile Of Mace Spheres";
+		sprite = "AMM2A0";
+	}
+	8
+	{
+		title = "Bag Of Holding";
+		sprite = "BAGHA0";
+	}
+	34
+	{
+		title = "Time Bomb Of The Ancients";
+		sprite = "FBMBA0";
+	}
+	30
+	{
+		title = "Morph Ovum";
+		sprite = "EGGCA0";
+	}
+}
+
+health
+{
+	color = 1;	// Blue
+	arrow = 1;
+	title = "Health and Armor";
+	width = 20;
+	height = 16;
+	blocking = 0;
+	sort = 0;
+	
+	81
+	{
+		title = "Crystal Vial";
+		sprite = "PTN1A0";
+	}
+	82
+	{
+		title = "Quartz Flask";
+		sprite = "PTN2A0";
+	}
+	32
+	{
+		title = "Mystic Urn";
+		sprite = "SPHLA0";
+	}
+	85
+	{
+		title = "Silver Shield";
+		sprite = "SHLDA0";
+	}
+	31
+	{
+		title = "Enchanted Shield";
+		sprite = "SHD2A0";
+	}
+}
+
+powerups
+{
+	color = 9;	// Light Blue
+	arrow = 1;
+	title = "Artifacts";
+	width = 20;
+	height = 20;
+	blocking = 0;
+	sort = 0;
+
+	35
+	{
+		title = "Map Scroll";
+		sprite = "SPMPA0";
+	}
+	33
+	{
+		title = "Torch";
+		sprite = "TRCHA0";
+	}
+	36
+	{
+		title = "Chaos Device";
+		sprite = "ATLPA0";
+	}
+	75
+	{
+		title = "Shadowsphere";
+		sprite = "INVSA0";
+	}
+	84
+	{
+		title = "Ring of Invulnerability";
+		sprite = "INVUA0";
+	}
+	86
+	{
+		title = "Tome of Power";
+		sprite = "PWBKA0";
+	}
+	83
+	{
+		title = "Wings Of Wrath";
+		sprite = "SOARA0";
+	}
+}
+
+keys
+{
+	color = 13;	// Light Magenta
+	arrow = 1;
+	title = "Keys";
+	width = 20;
+	height = 16;
+	blocking = 0;
+	sort = 0;
+
+	80
+	{
+		title = "Yellow Key";
+		sprite = "CKYYA0";
+	}
+	73
+	{
+		title = "Green Key";
+		sprite = "AKYYA0";
+	}
+	79
+	{
+		title = "Blue Key";
+		sprite = "BKYYA0";
+	}
+
+}
+
+obstacles
+{
+	color = 3;	// Cyan
+	arrow = 1;
+	title = "Obstacles";
+	width = 20;
+	blocking = 2;
+	error = 2;
+	sort = 0;
+	
+	37
+	{
+		title = "Stalagmite (Small)";
+		sprite = "STGSA0";
+		height = 32;
+	}
+	38
+	{
+		title = "Stalagmite (Large)";
+		sprite = "STGLA0";
+		height = 64;
+	}
+	39
+	{
+		title = "Stalactite (Small)";
+		sprite = "STCSA0";
+		height = 36;
+		hangs = 1;
+	}
+	40
+	{
+		title = "Stalactite (Large)";
+		sprite = "STCLA0";
+		height = 68;
+		hangs = 1;
+	}
+	44
+	{
+		title = "Barrel";
+		sprite = "BARLA0";
+		height = 32;
+	}
+	29
+	{
+		title = "Small Pillar";
+		sprite = "SMPLA0";
+		height = 34;
+	}
+	47
+	{
+		title = "Brown Pillar";
+		sprite = "BRPLA0";
+		height = 128;
+	}
+}
+
+decoration
+{
+	color = 11;	// Light Cyan
+	arrow = 1;
+	title = "Decoration";
+	width = 16;
+	sort = 0;
+	blocking = 2;
+	error = 2;
+
+	96
+	{
+		title = "Yellow Key Marker";
+		sprite = "KGZYA0";
+		height = 50;
+	}
+	95
+	{
+		title = "Green Key Marker";
+		sprite = "KGZGA0";
+		height = 50;
+	}
+	94
+	{
+		title = "Blue Key Marker";
+		sprite = "KGZBA0";
+		height = 50;
+	}
+
+	51
+	{
+		title = "Hanging Corpse";
+		sprite = "HCORA0";
+		hangs = 1;
+		height = 104;
+	}
+	17
+	{
+		title = "Hanging Skull 1";
+		sprite = "SKH1A0";
+		hangs = 1;
+		height = 70;
+	}
+	24
+	{
+		title = "Hanging Skull 2";
+		sprite = "SKH2A0";
+		hangs = 1;
+		height = 60;
+	}
+	25
+	{
+		title = "Hanging Skull 3";
+		sprite = "SKH3A0";
+		hangs = 1;
+		height = 45;
+	}
+	26
+	{
+		title = "Hanging Skull 4";
+		sprite = "SKH4A0";
+		hangs = 1;
+		height = 35;
+	}
+	48
+	{
+		title = "Moss 1";
+		sprite = "MOS1A0";
+		height = 23;
+		hangs = 1;
+	}
+	49
+	{
+		title = "Moss 2";
+		sprite = "MOS2A0";
+		height = 27;
+		hangs = 1;
+	}
+}
+
+lights
+{
+	color = 7;	// Light Grey
+	arrow = 1;
+	title = "Light Sources";
+	width = 16;
+	sort = 0;
+	blocking = 2;
+	error = 2;
+
+	50
+	{
+		title = "Wall Torch";
+		sprite = "WTRHA0";
+		height = 64;
+	}
+	27
+	{
+		title = "Serpent Torch";
+		sprite = "SRTCA0";
+		height = 54;
+	}
+	76
+	{
+		title = "Fire Brazier";
+		sprite = "KFR1A0";
+		height = 44;
+	}
+	28
+	{
+		title = "Chandelier";
+		sprite = "CHDLA0";
+		hangs = 1;
+		height = 62;
+	}
+}
diff --git a/Build/Configurations/Includes/Hexen_common.cfg b/Build/Configurations/Includes/Hexen_common.cfg
new file mode 100644
index 0000000..c4cf380
--- /dev/null
+++ b/Build/Configurations/Includes/Hexen_common.cfg
@@ -0,0 +1,101 @@
+//mxd. These settings are used only in Vanilla Hexen configuration.
+mapformat_hexen
+{
+	// The format interface handles the map data format
+	formatinterface = "HexenMapSetIO";
+
+	maplumpnames
+	{
+		include("Doom_misc.cfg", "hexenmaplumpnames");
+	}
+
+	// When this is set to true, sectors with the same tag will light up when a line is highlighted
+	linetagindicatesectors = false;
+
+	// Special linedefs
+	include("ZDoom_misc.cfg", "speciallinedefs_doomhexen");
+
+	// Default flags for first new thing
+	defaultthingflags
+	{
+		include("ZDoom_misc.cfg", "defaultthingflags");
+	}
+
+	// Door making
+	include("ZDoom_misc.cfg", "doormaking_hexen");
+
+	// Generalized actions
+	generalizedlinedefs = false;
+	generalizedsectors = false;
+	
+	// DEFAULT SECTOR BRIGHTNESS LEVELS
+	sectorbrightness
+	{
+		include("ZDoom_misc.cfg", "sectorbrightness");
+	}
+
+	// SECTOR TYPES
+	sectortypes
+	{
+		include("Hexen_sectors.cfg");
+	}
+
+	// LINEDEF FLAGS
+	linedefflags
+	{
+		include("Doom_misc.cfg", "linedefflags");
+		include("Hexen_misc.cfg", "linedefflags");
+	}
+
+	// Activations filter for Hexen type activations
+	// This filters the activation bits from the flags
+	include("Hexen_misc.cfg", "linedefactivationsfilter");
+
+	// LINEDEF ACTIVATIONS
+	// Make sure these are in order from lowest value to highest value
+	linedefactivations
+	{
+		include("Hexen_misc.cfg", "linedefactivations");
+	}
+
+	// Linedef flags UDMF translation table
+	// This is needed for copy/paste and prefabs to work properly
+	// When the UDMF field name is prefixed with ! it is inverted
+	linedefflagstranslation
+	{
+		include("Doom_misc.cfg", "linedefflagstranslation");
+		include("Hexen_misc.cfg", "linedefflagstranslation");
+	}
+
+	// LINEDEF TYPES
+	linedeftypes
+	{
+		include("Hexen_linedefs.cfg");
+	}
+
+	// THING FLAGS
+	thingflags
+	{
+		include("Doom_misc.cfg", "thingflags");
+		include("Hexen_misc.cfg", "thingflags");
+	}
+
+	// Thing flags UDMF translation table
+	// This is needed for copy/paste and prefabs to work properly
+	// When the UDMF field name is prefixed with ! it is inverted
+	thingflagstranslation
+	{
+		include("Doom_misc.cfg", "thingflagstranslation");
+		include("Hexen_misc.cfg", "thingflagstranslation");
+	}
+	
+	// How to compare thing flags (for the stuck things error checker)
+	thingflagscompare
+	{
+		include("Hexen_misc.cfg", "thingflagscompare");
+	}
+
+	// Things flags masks
+	include("Hexen_misc.cfg", "thingflagsmasks");
+
+}
\ No newline at end of file
diff --git a/Build/Configurations/Includes/Hexen_linedefs.cfg b/Build/Configurations/Includes/Hexen_linedefs.cfg
new file mode 100644
index 0000000..7994c8f
--- /dev/null
+++ b/Build/Configurations/Includes/Hexen_linedefs.cfg
@@ -0,0 +1,2187 @@
+
+misc
+{
+	
+	0
+	{
+		title = "None";
+	}
+}
+
+
+polyobj
+{
+	title = "Polyobj";
+	
+	1
+	{
+		title = "Polyobj Start Line";
+		id = "Polyobj_StartLine";
+		requiresactivation = false;
+		
+		arg0
+		{
+			title = "Polyobj Number";
+		}
+		
+		arg1
+		{
+			title = "Mirror Polyobj Number";
+		}
+		
+		arg2
+		{
+			title = "Sound Number";
+		}
+	}
+	
+	2
+	{
+		title = "Polyobj Rotate Left";
+		id = "Polyobj_RotateLeft";
+		
+		arg0
+		{
+			title = "Polyobj Number";
+		}
+		
+		arg1
+		{
+			title = "Rotation Speed";
+			type = 11;
+			enum = "stair_speeds";
+			default = 16;
+		}
+		
+		arg2
+		{
+			title = "Target Angle";
+			type = 11;
+			enum = "polyobj_angles";
+		}
+	}
+	
+	3
+	{
+		title = "Polyobj Rotate Right";
+		id = "Polyobj_RotateRight";
+		
+		arg0
+		{
+			title = "Polyobj Number";
+		}
+		
+		arg1
+		{
+			title = "Rotation Speed";
+			type = 11;
+			enum = "stair_speeds";
+			default = 16;
+		}
+		
+		arg2
+		{
+			title = "Target Angle";
+			type = 11;
+			enum = "polyobj_angles";
+		}
+	}
+	
+	4
+	{
+		title = "Polyobj Move";
+		id = "Polyobj_Move";
+		
+		arg0
+		{
+			title = "Polyobj Number";
+		}
+		
+		arg1
+		{
+			title = "Movement Speed";
+			type = 11;
+			enum = "stair_speeds";
+			default = 16;
+		}
+		
+		arg2
+		{
+			title = "Movement Angle";
+			type = 22;
+		}
+		
+		arg3
+		{
+			title = "Movement Distance";
+			default = 64;
+		}
+	}
+	
+	5
+	{
+		title = "Polyobj Explicit Line";
+		id = "Polyobj_ExplicitLine";
+		requiresactivation = false;
+		
+		arg0
+		{
+			title = "Polyobj Number";
+		}
+		
+		arg1
+		{
+			title = "Rendering order";
+		}
+		
+		arg2
+		{
+			title = "Mirror Polyobj Number";
+		}
+		
+		arg3
+		{
+			title = "Sound Number";
+		}
+	}
+	
+	6
+	{
+		title = "Polyobj Move (* 8)";
+		id = "Polyobj_MoveTimes8";
+		
+		arg0
+		{
+			title = "Polyobj Number";
+		}
+		
+		arg1
+		{
+			title = "Movement Speed";
+			type = 11;
+			enum = "stair_speeds";
+			default = 16;
+		}
+		
+		arg2
+		{
+			title = "Movement Angle";
+			type = 22;
+		}
+		
+		arg3
+		{
+			title = "Movement Dist. * 8";
+			default = 8;
+		}
+	}
+	
+	7
+	{
+		title = "Polyobj Door Swing";
+		id = "Polyobj_DoorSwing";
+		
+		arg0
+		{
+			title = "Polyobj Number";
+		}
+		
+		arg1
+		{
+			title = "Movement Speed";
+			type = 11;
+			enum = "polyobj_speeds";
+			default = 16;
+		}
+		
+		arg2
+		{
+			title = "Movement Angle";
+			type = 22;
+		}
+		
+		arg3
+		{
+			title = "Delay (tics)";
+			type = 11;
+			enum = "delay_tics";
+			default = 105;
+		}
+	}
+	
+	8
+	{
+		title = "Polyobj Door Slide";
+		id = "Polyobj_DoorSlide";
+		
+		arg0
+		{
+			title = "Polyobj Number";
+		}
+		
+		arg1
+		{
+			title = "Movement Speed";
+			type = 11;
+			enum = "stair_speeds";
+			default = 16;
+		}
+		
+		arg2
+		{
+			title = "Movement Angle";
+			type = 22;
+		}
+		
+		arg3
+		{
+			title = "Movement Distance";
+			default = 64;
+		}
+		
+		arg4
+		{
+			title = "Delay";
+			type = 11;
+			enum = "delay_tics";
+			default = 105;
+		}
+	}
+	
+	90
+	{
+		title = "Polyobj Rotate Left (override)";
+		id = "Polyobj_OR_RotateLeft";
+		
+		arg0
+		{
+			title = "Polyobj Number";
+		}
+		
+		arg1
+		{
+			title = "Rotation Speed";
+			type = 11;
+			enum = "stair_speeds";
+			default = 16;
+		}
+		
+		arg2
+		{
+			title = "Target Angle";
+			type = 11;
+			enum = "polyobj_angles";
+		}
+	}
+	
+	91
+	{
+		title = "Polyobj Rotate Right (override)";
+		id = "Polyobj_OR_RotateRight";
+		
+		arg0
+		{
+			title = "Polyobj Number";
+		}
+		
+		arg1
+		{
+			title = "Rotation Speed";
+			type = 11;
+			enum = "stair_speeds";
+			default = 16;
+		}
+		
+		arg2
+		{
+			title = "Target Angle";
+			type = 11;
+			enum = "polyobj_angles";
+		}
+	}
+	
+	92
+	{
+		title = "Polyobj Move (override)";
+		id = "Polyobj_OR_Move";
+		
+		arg0
+		{
+			title = "Polyobj Number";
+		}
+		
+		arg1
+		{
+			title = "Movement Speed";
+			type = 11;
+			enum = "stair_speeds";
+			default = 16;
+		}
+		
+		arg2
+		{
+			title = "Movement Angle";
+			type = 22;
+		}
+		
+		arg3
+		{
+			title = "Movement Distance";
+			default = 64;
+		}
+	}
+	
+	93
+	{
+		title = "Polyobj Move (8mu, override)";
+		id = "Polyobj_OR_MoveTimes8";
+		
+		arg0
+		{
+			title = "Polyobj Number";
+		}
+		
+		arg1
+		{
+			title = "Movement Speed";
+			type = 11;
+			enum = "stair_speeds";
+			default = 16;
+		}
+		
+		arg2
+		{
+			title = "Movement Angle";
+			type = 22;
+		}
+		
+		arg3
+		{
+			title = "Movement Distance * 8";
+			default = 8;
+		}
+	}
+}
+
+
+line
+{
+	title = "Line";
+	
+	121
+	{
+		title = "Line Identification";
+		id = "Line_SetIdentification";
+		
+		arg0
+		{
+			title = "Line ID";
+		}
+	}
+}
+
+
+door
+{
+	title = "Door";
+	
+	10
+	{
+		title = "Door Close";
+		id = "Door_Close";
+		
+		arg0
+		{
+			title = "Sector Tag";
+			type = 13;
+		}
+		
+		arg1
+		{
+			title = "Movement Speed";
+			type = 11;
+			enum = "door_speeds";
+			default = 32;
+		}
+		
+		arg2
+		{
+			title = "Light Tag";
+			type = 13;
+		}
+	}
+	
+	11
+	{
+		title = "Door Open";
+		id = "Door_Open";
+		
+		arg0
+		{
+			title = "Sector Tag";
+			type = 13;
+		}
+		
+		arg1
+		{
+			title = "Movement Speed";
+			type = 11;
+			enum = "door_speeds";
+			default = 32;
+		}
+		
+		arg2
+		{
+			title = "Light Tag";
+			type = 13;
+		}
+	}
+	
+	12
+	{
+		title = "Door Raise";
+		id = "Door_Raise";
+		
+		arg0
+		{
+			title = "Sector Tag";
+			type = 13;
+		}
+		
+		arg1
+		{
+			title = "Movement Speed";
+			type = 11;
+			enum = "door_speeds";
+			default = 32;
+		}
+		
+		arg2
+		{
+			title = "Close Delay";
+			type = 11;
+			enum = "reset_tics";
+			default = 105;
+		}
+		
+		arg3
+		{
+			title = "Light Tag";
+			type = 13;
+		}
+	}
+	
+	13
+	{
+		title = "Door Locked Raise";
+		id = "Door_LockedRaise";
+		
+		arg0
+		{
+			title = "Sector Tag";
+			type = 13;
+		}
+		
+		arg1
+		{
+			title = "Movement Speed";
+			type = 11;
+			enum = "door_speeds";
+			default = 32;
+		}
+		
+		arg2
+		{
+			title = "Close Delay";
+			type = 11;
+			enum = "reset_tics";
+			default = 105;
+		}
+		
+		arg3
+		{
+			title = "Key Number";
+			type = 11;
+			enum = "keys";
+		}
+		
+		arg4
+		{
+			title = "Light Tag";
+			type = 13;
+		}
+	}
+}
+
+
+floor
+{
+	title = "Floor";
+	
+	20
+	{
+		title = "Floor Lower by Value";
+		id = "Floor_LowerByValue";
+		
+		arg0
+		{
+			title = "Sector Tag";
+			type = 13;
+		}
+		
+		arg1
+		{
+			title = "Movement Speed";
+			type = 11;
+			enum = "flat_speeds";
+			default = 16;
+		}
+		
+		arg2
+		{
+			title = "Lower by";
+		}
+	}
+	
+	21
+	{
+		title = "Floor Lower to Lowest Floor";
+		id = "Floor_LowerToLowest";
+		
+		arg0
+		{
+			title = "Sector Tag";
+			type = 13;
+		}
+		
+		arg1
+		{
+			title = "Movement Speed";
+			type = 11;
+			enum = "flat_speeds";
+			default = 16;
+		}
+	}
+	
+	22
+	{
+		title = "Floor Lower to Nearest Floor";
+		id = "Floor_LowerToNearest";
+		
+		arg0
+		{
+			title = "Sector Tag";
+			type = 13;
+		}
+		
+		arg1
+		{
+			title = "Movement Speed";
+			type = 11;
+			enum = "flat_speeds";
+			default = 16;
+		}
+	}
+	
+	23
+	{
+		title = "Floor Raise by Value";
+		id = "Floor_RaiseByValue";
+		
+		arg0
+		{
+			title = "Sector Tag";
+			type = 13;
+		}
+		
+		arg1
+		{
+			title = "Movement Speed";
+			type = 11;
+			enum = "flat_speeds";
+			default = 16;
+		}
+		
+		arg2
+		{
+			title = "Raise by";
+		}
+	}
+	
+	24
+	{
+		title = "Floor Raise to Highest Floor";
+		id = "Floor_RaiseToHighest";
+		
+		arg0
+		{
+			title = "Sector Tag";
+			type = 13;
+		}
+		
+		arg1
+		{
+			title = "Movement Speed";
+			type = 11;
+			enum = "flat_speeds";
+			default = 16;
+		}
+	}
+	
+	25
+	{
+		title = "Floor Raise to Nearest Floor";
+		id = "Floor_RaiseToNearest";
+		
+		arg0
+		{
+			title = "Sector Tag";
+			type = 13;
+		}
+		
+		arg1
+		{
+			title = "Movement Speed";
+			type = 11;
+			enum = "flat_speeds";
+			default = 16;
+		}
+	}
+	
+	28
+	{
+		title = "Floor Crusher Start";
+		id = "Floor_RaiseAndCrush";
+		
+		arg0
+		{
+			title = "Sector Tag";
+			type = 13;
+		}
+		
+		arg1
+		{
+			title = "Movement Speed";
+			type = 11;
+			enum = "flat_speeds";
+			default = 16;
+		}
+		
+		arg2
+		{
+			title = "Crush Damage";
+			default = 100;
+		}
+	}
+	
+	35
+	{
+		title = "Floor Raise by Value * 8";
+		id = "Floor_RaiseByValueTimes8";
+		
+		arg0
+		{
+			title = "Sector Tag";
+			type = 13;
+		}
+		
+		arg1
+		{
+			title = "Movement Speed";
+			type = 11;
+			enum = "flat_speeds";
+			default = 16;
+		}
+		
+		arg2
+		{
+			title = "Raise by (* 8)";
+		}
+	}
+	
+	36
+	{
+		title = "Floor Lower by Value * 8";
+		id = "Floor_LowerByValueTimes8";
+		
+		arg0
+		{
+			title = "Sector Tag";
+			type = 13;
+		}
+		
+		arg1
+		{
+			title = "Movement Speed";
+			type = 11;
+			enum = "flat_speeds";
+			default = 16;
+		}
+		
+		arg2
+		{
+			title = "Lower by (* 8)";
+		}
+	}
+	
+	46
+	{
+		title = "Floor Crusher Stop";
+		id = "Floor_CrushStop";
+		
+		arg0
+		{
+			title = "Sector Tag";
+			type = 13;
+		}
+	}
+	
+	66
+	{
+		title = "Floor Lower Instantly by Value * 8";
+		id = "Floor_LowerInstant";
+		
+		arg0
+		{
+			title = "Sector Tag";
+			type = 13;
+		}
+		
+		arg2
+		{
+			title = "Lower by (* 8)";
+		}
+	}
+	
+	67
+	{
+		title = "Floor Raise Instantly by Value * 8";
+		id = "Floor_RaiseInstant";
+		
+		arg0
+		{
+			title = "Sector Tag";
+			type = 13;
+		}
+		
+		arg2
+		{
+			title = "Raise by (* 8)";
+		}
+	}
+	
+	68
+	{
+		title = "Floor Move to Value * 8";
+		id = "Floor_MoveToValueTimes8";
+		
+		arg0
+		{
+			title = "Sector Tag";
+			type = 13;
+		}
+		
+		arg1
+		{
+			title = "Movement Speed";
+			type = 11;
+			enum = "flat_speeds";
+			default = 16;
+		}
+		
+		arg2
+		{
+			title = "Target Height * 8";
+		}
+		
+		arg3
+		{
+			title = "Negative Height";
+			type = 11;
+			enum = "noyes";
+		}
+	}
+	
+	95
+	{
+		title = "Floor and Ceiling Lower by Value";
+		id = "FloorAndCeiling_LowerByValue";
+		
+		arg0
+		{
+			title = "Sector Tag";
+			type = 13;
+		}
+		
+		arg1
+		{
+			title = "Movement Speed";
+			type = 11;
+			enum = "flat_speeds";
+			default = 16;
+		}
+		
+		arg2
+		{
+			title = "Lower by";
+		}
+	}
+	
+	96
+	{
+		title = "Floor and Ceiling Raise by Value";
+		id = "FloorAndCeiling_RaiseByValue";
+		
+		arg0
+		{
+			title = "Sector Tag";
+			type = 13;
+		}
+		
+		arg1
+		{
+			title = "Movement Speed";
+			type = 11;
+			enum = "flat_speeds";
+			default = 16;
+		}
+		
+		arg2
+		{
+			title = "Raise by";
+		}
+	}
+}
+
+
+stairs
+{
+	title = "Stairs";
+	
+	26
+	{
+		title = "Stairs Build Down";
+		id = "Stairs_BuildDown";
+		
+		arg0
+		{
+			title = "Sector Tag";
+			type = 13;
+		}
+		
+		arg1
+		{
+			title = "Movement Speed";
+			type = 11;
+			enum = "stair_speeds";
+			default = 4;
+		}
+		
+		arg2
+		{
+			title = "Step Height";
+			default = 16;
+		}
+		
+		arg3
+		{
+			title = "Build Step Delay";
+			type = 11;
+			enum = "delay_tics";
+			default = 35;
+		}
+		
+		arg4
+		{
+			title = "Reset Delay";
+			type = 11;
+			enum = "reset_tics";
+		}
+	}
+	
+	27
+	{
+		title = "Stairs Build Up";
+		id = "Stairs_BuildUp";
+		
+		arg0
+		{
+			title = "Sector Tag";
+			type = 13;
+		}
+		
+		arg1
+		{
+			title = "Movement Speed";
+			type = 11;
+			enum = "stair_speeds";
+			default = 4;
+		}
+		
+		arg2
+		{
+			title = "Step Height";
+			default = 16;
+		}
+		
+		arg3
+		{
+			title = "Build Step Delay";
+			type = 11;
+			enum = "delay_tics";
+			default = 35;
+		}
+		
+		arg4
+		{
+			title = "Reset Delay";
+			type = 11;
+			enum = "reset_tics";
+		}
+	}
+	
+	31
+	{
+		title = "Stairs Build Down (sync)";
+		id = "Stairs_BuildDownSync";
+		
+		arg0
+		{
+			title = "Sector Tag";
+			type = 13;
+		}
+		
+		arg1
+		{
+			title = "Movement Speed";
+			type = 11;
+			enum = "stair_speeds";
+			default = 4;
+		}
+		
+		arg2
+		{
+			title = "Step Height";
+			default = 16;
+		}
+		
+		arg3
+		{
+			title = "Reset Delay";
+			type = 11;
+			enum = "reset_tics";
+		}
+	}
+	
+	32
+	{
+		title = "Stairs Build Up (sync)";
+		id = "Stairs_BuildUpSync";
+		
+		arg0
+		{
+			title = "Sector Tag";
+			type = 13;
+		}
+		
+		arg1
+		{
+			title = "Movement Speed";
+			type = 11;
+			enum = "stair_speeds";
+			default = 4;
+		}
+		
+		arg2
+		{
+			title = "Step Height";
+			default = 16;
+		}
+		
+		arg3
+		{
+			title = "Reset Delay";
+			type = 11;
+			enum = "reset_tics";
+		}
+	}
+}
+
+
+pillar
+{
+	title = "Pillar";
+	
+	29
+	{
+		title = "Pillar Build";
+		id = "Pillar_Build";
+		
+		arg0
+		{
+			title = "Sector Tag";
+			type = 13;
+		}
+		
+		arg1
+		{
+			title = "Movement Speed";
+			type = 11;
+			enum = "plat_speeds";
+			default = 16;
+		}
+		
+		arg2
+		{
+			title = "Target Height (rel.)";
+		}
+	}
+	
+	30
+	{
+		title = "Pillar Open";
+		id = "Pillar_Open";
+		
+		arg0
+		{
+			title = "Sector Tag";
+			type = 13;
+		}
+		
+		arg1
+		{
+			title = "Movement Speed";
+			type = 11;
+			enum = "plat_speeds";
+			default = 16;
+		}
+		
+		arg2
+		{
+			title = "Lower Floor by";
+		}
+		
+		arg3
+		{
+			title = "Raise Ceiling by";
+		}
+	}
+	
+	94
+	{
+		title = "Pillar Build and Crush";
+		id = "Pillar_BuildAndCrush";
+		
+		arg0
+		{
+			title = "Sector Tag";
+			type = 13;
+		}
+		
+		arg1
+		{
+			title = "Movement Speed";
+			type = 11;
+			enum = "plat_speeds";
+			default = 16;
+		}
+		
+		arg2
+		{
+			title = "Movement Amount";
+		}
+	}
+}
+
+
+ceiling
+{
+	title = "Ceiling";
+	
+	40
+	{
+		title = "Ceiling Lower by Value";
+		id = "Ceiling_LowerByValue";
+		
+		arg0
+		{
+			title = "Sector Tag";
+			type = 13;
+		}
+		
+		arg1
+		{
+			title = "Movement Speed";
+			type = 11;
+			enum = "plat_speeds";
+			default = 16;
+		}
+		
+		arg2
+		{
+			title = "Lower by";
+			default = 64;
+		}
+	}
+	
+	41
+	{
+		title = "Ceiling Raise by Value";
+		id = "Ceiling_RaiseByValue";
+		
+		arg0
+		{
+			title = "Sector Tag";
+			type = 13;
+		}
+		
+		arg1
+		{
+			title = "Movement Speed";
+			type = 11;
+			enum = "plat_speeds";
+			default = 16;
+		}
+		
+		arg2
+		{
+			title = "Raise by";
+			default = 64;
+		}
+	}
+	
+	42
+	{
+		title = "Ceiling Crusher Start";
+		id = "Ceiling_CrushAndRaise";
+		
+		arg0
+		{
+			title = "Sector Tag";
+			type = 13;
+		}
+		
+		arg1
+		{
+			title = "Movement Speed";
+			type = 11;
+			enum = "plat_speeds";
+			default = 16;
+		}
+		
+		arg2
+		{
+			title = "Crush Damage";
+			default = 100;
+		}
+	}
+	
+	43
+	{
+		title = "Ceiling Crush Once";
+		id = "Ceiling_LowerAndCrush";
+		
+		arg0
+		{
+			title = "Sector Tag";
+			type = 13;
+		}
+		
+		arg1
+		{
+			title = "Movement Speed";
+			type = 11;
+			enum = "plat_speeds";
+			default = 16;
+		}
+		
+		arg2
+		{
+			title = "Crush Damage";
+			default = 100;
+		}
+	}
+	
+	44
+	{
+		title = "Ceiling Crusher Stop";
+		id = "Ceiling_CrushStop";
+		
+		arg0
+		{
+			title = "Sector Tag";
+			type = 13;
+		}
+	}
+	
+	45
+	{
+		title = "Ceiling Crush Once and Open";
+		id = "Ceiling_CrushRaiseAndStay";
+		
+		arg0
+		{
+			title = "Sector Tag";
+			type = 13;
+		}
+		
+		arg1
+		{
+			title = "Movement Speed";
+			type = 11;
+			enum = "plat_speeds";
+			default = 16;
+		}
+		
+		arg2
+		{
+			title = "Crush Damage";
+			default = 100;
+		}
+	}
+	
+	69
+	{
+		title = "Ceiling Move to Value * 8";
+		id = "Ceiling_MoveToValueTimes8";
+		
+		arg0
+		{
+			title = "Sector Tag";
+			type = 13;
+		}
+		
+		arg1
+		{
+			title = "Movement Speed";
+			type = 11;
+			enum = "plat_speeds";
+			default = 16;
+		}
+		
+		arg2
+		{
+			title = "Target Height * 8";
+		}
+		
+		arg3
+		{
+			title = "Negative Height";
+			type = 11;
+			enum = "noyes";
+		}
+	}
+}
+
+
+platform
+{
+	title = "Platform";
+	
+	60
+	{
+		title = "Platform Perpetual Move";
+		id = "Plat_PerpetualRaise";
+		
+		arg0
+		{
+			title = "Sector Tag";
+			type = 13;
+		}
+		
+		arg1
+		{
+			title = "Movement Speed";
+			type = 11;
+			enum = "plat_speeds";
+			default = 16;
+		}
+		
+		arg2
+		{
+			title = "Reverse Delay (tics)";
+			type = 11;
+			enum = "delay_tics";
+			default = 105;
+		}
+	}
+	
+	61
+	{
+		title = "Platform Stop";
+		id = "Plat_Stop";
+		
+		arg0
+		{
+			title = "Sector Tag";
+			type = 13;
+		}
+	}
+	
+	62
+	{
+		title = "Platform Lower Wait Raise";
+		id = "Plat_DownWaitUpStay";
+		
+		arg0
+		{
+			title = "Sector Tag";
+			type = 13;
+		}
+		
+		arg1
+		{
+			title = "Movement Speed";
+			type = 11;
+			enum = "plat_speeds";
+			default = 16;
+		}
+		
+		arg2
+		{
+			title = "Reverse Delay (tics)";
+			type = 11;
+			enum = "delay_tics";
+			default = 105;
+		}
+	}
+	
+	63
+	{
+		title = "Platform Lower by Value * 8";
+		id = "Plat_DownByValue";
+		
+		arg0
+		{
+			title = "Sector Tag";
+			type = 13;
+		}
+		
+		arg1
+		{
+			title = "Movement Speed";
+			type = 11;
+			enum = "plat_speeds";
+			default = 16;
+		}
+		
+		arg2
+		{
+			title = "Reverse Delay (tics)";
+			type = 11;
+			enum = "delay_tics";
+			default = 105;
+		}
+		
+		arg3
+		{
+			title = "Lower by (* 8)";
+		}
+	}
+	
+	64
+	{
+		title = "Platform Raise Wait Lower";
+		id = "Plat_UpWaitDownStay";
+		
+		arg0
+		{
+			title = "Sector Tag";
+			type = 13;
+		}
+		
+		arg1
+		{
+			title = "Movement Speed";
+			type = 11;
+			enum = "plat_speeds";
+			default = 16;
+		}
+		
+		arg2
+		{
+			title = "Reverse Delay (tics)";
+			type = 11;
+			enum = "delay_tics";
+			default = 105;
+		}
+	}
+	
+	65
+	{
+		title = "Platform Raise by Value * 8";
+		id = "Plat_UpByValue";
+		
+		arg0
+		{
+			title = "Sector Tag";
+			type = 13;
+		}
+		
+		arg1
+		{
+			title = "Movement Speed";
+			type = 11;
+			enum = "plat_speeds";
+			default = 16;
+		}
+		
+		arg2
+		{
+			title = "Reverse Delay (tics)";
+			type = 11;
+			enum = "delay_tics";
+			default = 105;
+		}
+		
+		arg3
+		{
+			title = "Lower by (* 8)";
+		}
+	}
+}
+
+
+teleport
+{
+	title = "Teleport";
+	
+	70
+	{
+		title = "Teleport";
+		id = "Teleport";
+		
+		arg0
+		{
+			title = "Target MapSpot Tag";
+			type = 14;
+		}
+		
+		arg1
+		{
+			title = "Target Sector Tag";
+			type = 13;
+		}
+	}
+	
+	71
+	{
+		title = "Teleport (silent)";
+		id = "Teleport_NoFog";
+		
+		arg0
+		{
+			title = "Target MapSpot Tag";
+			type = 14;
+		}
+		
+		arg1
+		{
+			title = "Keep Orientation";
+			type = 11;
+			enum = "noyes";
+		}
+		
+		arg2
+		{
+			title = "Target Sector Tag";
+			type = 13;
+		}
+	}
+	
+	74
+	{
+		title = "Teleport to Map";
+		id = "Teleport_NewMap";
+		
+		arg0
+		{
+			title = "Map Number";
+		}
+		
+		arg1
+		{
+			title = "Position";
+		}
+	}
+}
+
+
+thing
+{
+	title = "Thing";
+	
+	72
+	{
+		title = "Thrust Thing";
+		id = "ThrustThing";
+		
+		arg0
+		{
+			title = "Thrust Angle";
+			type = 22;
+		}
+		
+		arg1
+		{
+			title = "Thrust Force (mu. per tic)";
+		}
+	}
+	
+	73
+	{
+		title = "Damage Thing";
+		id = "DamageThing";
+		
+		arg0
+		{
+			title = "Damage Amount";
+		}
+	}
+	
+	130
+	{
+		title = "Activate Thing";
+		id = "Thing_Activate";
+		
+		arg0
+		{
+			title = "Thing Tag";
+			type = 14;
+		}
+	}
+	
+	131
+	{
+		title = "Deactivate Thing";
+		id = "Thing_Deactivate";
+		
+		arg0
+		{
+			title = "Thing Tag";
+			type = 14;
+		}
+	}
+	
+	132
+	{
+		title = "Remove Thing";
+		id = "Thing_Remove";
+		
+		arg0
+		{
+			title = "Thing Tag";
+			type = 14;
+		}
+	}
+	
+	133
+	{
+		title = "Destroy Thing";
+		id = "Thing_Destroy";
+		
+		arg0
+		{
+			title = "Thing Tag";
+			type = 14;
+		}
+		arg1
+		{
+			title = "Extreme Death";
+			type = 11;
+			enum = "noyes";
+		}
+		arg2
+		{
+			title = "Sector Tag";
+			type = 13;
+		}
+
+	}
+	
+	134
+	{
+		title = "Spawn Projectile";
+		id = "Thing_Projectile";
+		
+		arg0
+		{
+			title = "MapSpot Tag";
+			type = 14;
+		}
+		
+		arg1
+		{
+			title = "Projectile Type";
+			type = 11;
+			enum = "spawn_projectile";
+		}
+		
+		arg2
+		{
+			title = "Movement Angle";
+			type = 22;
+		}
+		
+		arg3
+		{
+			title = "Horizontal Speed";
+		}
+		
+		arg4
+		{
+			title = "Vertical Speed";
+		}
+	}
+	
+	135
+	{
+		title = "Spawn Thing";
+		id = "Thing_Spawn";
+		
+		arg0
+		{
+			title = "MapSpot Tag";
+			type = 14;
+		}
+		
+		arg1
+		{
+			title = "Thing Type";
+			type = 11;
+			enum = "spawnthing";
+		}
+		
+		arg2
+		{
+			title = "Thing Angle";
+			type = 22;
+		}
+	}
+	
+	136
+	{
+		title = "Spawn Projectile (gravity)";
+		id = "Thing_ProjectileGravity";
+		
+		arg0
+		{
+			title = "MapSpot Tag";
+			type = 14;
+		}
+		
+		arg1
+		{
+			title = "Projectile Type";
+			type = 11;
+			enum = "spawn_projectile";
+		}
+		
+		arg2
+		{
+			title = "Movement Angle";
+			type = 22;
+		}
+		
+		arg3
+		{
+			title = "Horizontal Speed";
+		}
+		
+		arg4
+		{
+			title = "Vertical Speed";
+		}
+	}
+	
+	137
+	{
+		title = "Spawn Thing (silent)";
+		id = "Thing_SpawnNoFog";
+		
+		arg0
+		{
+			title = "Target MapSpot Tag";
+			type = 14;
+		}
+		
+		arg1
+		{
+			title = "Thing Type";
+			type = 11;
+			enum = "spawnthing";
+		}
+		
+		arg2
+		{
+			title = "Thing Angle";
+			type = 22;
+		}
+	}
+}
+
+
+end
+{
+	title = "End";
+	
+	75
+	{
+		title = "End Game";
+		id = "Teleport_EndGame";
+	}
+}
+
+
+script
+{
+	title = "Script";
+	
+	80
+	{
+		title = "Script Execute";
+		id = "ACS_Execute";
+		
+		arg0
+		{
+			title = "Script Number";
+		}
+		
+		arg1
+		{
+			title = "Map Number";
+		}
+		
+		arg2
+		{
+			title = "Script Argument 1";
+		}
+		
+		arg3
+		{
+			title = "Script Argument 2";
+		}
+		
+		arg4
+		{
+			title = "Script Argument 3";
+		}
+	}
+	
+	81
+	{
+		title = "Script Suspend";
+		id = "ACS_Suspend";
+		
+		arg0
+		{
+			title = "Script Number";
+		}
+		
+		arg1
+		{
+			title = "Map Number";
+		}
+	}
+	
+	82
+	{
+		title = "Script Terminate";
+		id = "ACS_Terminate";
+		
+		arg0
+		{
+			title = "Script Number";
+		}
+		
+		arg1
+		{
+			title = "Map Number";
+		}
+	}
+	
+	83
+	{
+		title = "Script Locked Execute";
+		id = "ACS_LockedExecute";
+		
+		arg0
+		{
+			title = "Script Number";
+		}
+		
+		arg1
+		{
+			title = "Map Number";
+		}
+		
+		arg2
+		{
+			title = "Script Argument 1";
+		}
+		
+		arg3
+		{
+			title = "Script Argument 2";
+		}
+		
+		arg4
+		{
+			title = "Key Number";
+			type = 11;
+			enum = "keys";
+		}
+	}
+}
+
+
+scroll
+{
+	title = "Scroll";
+	
+	100
+	{
+		title = "Scroll Texture Left";
+		id = "Scroll_Texture_Left";
+		requiresactivation = false;
+		
+		arg0
+		{
+			title = "Scroll Speed";
+			type = 11;
+			enum = "scroll_speeds";
+			default = 64;
+		}
+	}
+	
+	101
+	{
+		title = "Scroll Texture Right";
+		id = "Scroll_Texture_Right";
+		requiresactivation = false;
+		
+		arg0
+		{
+			title = "Scroll Speed";
+			type = 11;
+			enum = "scroll_speeds";
+			default = 64;
+		}
+	}
+	
+	102
+	{
+		title = "Scroll Texture Up";
+		id = "Scroll_Texture_Up";
+		requiresactivation = false;
+		
+		arg0
+		{
+			title = "Scroll Speed";
+			type = 11;
+			enum = "scroll_speeds";
+			default = 64;
+		}
+	}
+	
+	103
+	{
+		title = "Scroll Texture Down";
+		id = "Scroll_Texture_Down";
+		requiresactivation = false;
+		
+		arg0
+		{
+			title = "Scroll Speed";
+			type = 11;
+			enum = "scroll_speeds"; 
+			default = 64;
+		}
+	}
+}
+
+
+light
+{
+	title = "Light";
+	
+	110
+	{
+		title = "Light Raise by Value";
+		id = "Light_RaiseByValue";
+		
+		arg0
+		{
+			title = "Sector Tag";
+			type = 13;
+		}
+		
+		arg1
+		{
+			title = "Raise by";
+		}
+	}
+	
+	111
+	{
+		title = "Light Lower by Value";
+		id = "Light_LowerByValue";
+		
+		arg0
+		{
+			title = "Sector Tag";
+			type = 13;
+		}
+		
+		arg1
+		{
+			title = "Lower by";
+		}
+	}
+	
+	112
+	{
+		title = "Light Change to Value";
+		id = "Light_ChangeToValue";
+		
+		arg0
+		{
+			title = "Sector Tag";
+			type = 13;
+		}
+		
+		arg1
+		{
+			title = "Target Brightness";
+		}
+	}
+	
+	113
+	{
+		title = "Light Fade";
+		id = "Light_Fade";
+		
+		arg0
+		{
+			title = "Sector Tag";
+			type = 13;
+		}
+		
+		arg1
+		{
+			title = "Target Brightness";
+			default = 128;
+		}
+		
+		arg2
+		{
+			title = "Fade Duration (tics)";
+			type = 11;
+			enum = "delay_tics";
+			default = 105;
+		}
+	}
+	
+	114
+	{
+		title = "Light Glow";
+		id = "Light_Glow";
+		
+		arg0
+		{
+			title = "Sector Tag";
+			type = 13;
+		}
+		
+		arg1
+		{
+			title = "Brightest Level";
+			default = 255;
+		}
+		
+		arg2
+		{
+			title = "Darkest Level";
+			default = 128;
+		}
+		
+		arg3
+		{
+			title = "Fade Duration (tics)";
+			type = 11;
+			enum = "delay_tics";
+			default = 105;
+		}
+	}
+	
+	115
+	{
+		title = "Light Flicker";
+		id = "Light_Flicker";
+		
+		arg0
+		{
+			title = "Sector Tag";
+			type = 13;
+		}
+		
+		arg1
+		{
+			title = "Brightest Level";
+			default = 255;
+		}
+		
+		arg2
+		{
+			title = "Darkest Level";
+			default = 128;
+		}
+	}
+	
+	116
+	{
+		title = "Light Strobe";
+		id = "Light_Strobe";
+		
+		arg0
+		{
+			title = "Sector Tag";
+			type = 13;
+		}
+		
+		arg1
+		{
+			title = "Brightest Level";
+			default = 255;
+		}
+		
+		arg2
+		{
+			title = "Darkest Level";
+			default = 128;
+		}
+		
+		arg3
+		{
+			title = "Brightest Duration";
+			type = 11;
+			enum = "delay_tics";
+			default = 35;
+		}
+		
+		arg4
+		{
+			title = "Darkest Duration";
+			type = 11;
+			enum = "delay_tics";
+			default = 35;
+		}
+	}
+}
+
+
+earthquake
+{
+	title = "Earthquake";
+	
+	120
+	{
+		title = "Earthquake";
+		id = "Radius_Quake";
+		
+		arg0
+		{
+			title = "Intensity (1-9)";
+			default = 2;
+		}
+		
+		arg1
+		{
+			title = "Duration (tics)";
+			type = 11;
+			enum = "delay_tics";
+			default = 150;
+		}
+		
+		arg2
+		{
+			title = "Damage Radius * 64";
+			default = 4;
+		}
+		
+		arg3
+		{
+			title = "Tremor Radius * 64";
+			default = 4;
+		}
+		
+		arg4
+		{
+			title = "Focus Thing Tag";
+			type = 14;
+		}
+	}
+}
+
+
+use
+{
+	title = "Use";
+	
+	129
+	{
+		title = "Use Puzzle Item";
+		id = "UsePuzzleItem";
+		
+		arg0
+		{
+			title = "Item Number";
+			type = 11;
+			enum = "puzzle_items";
+		}
+
+		arg1
+		{
+			title = "Script Number";
+		}
+		
+		arg2
+		{
+			title = "Script Argument 1";
+		}
+		
+		arg3
+		{
+			title = "Script Argument 2";
+		}
+		
+		arg4
+		{
+			title = "Script Argument 3";
+		}
+	}
+}
+
+
+sector
+{
+	title = "Sector";
+	
+	140
+	{
+		title = "Sector Change Sound";
+		id = "Sector_ChangeSound";
+		
+		arg0
+		{
+			title = "Sector Tag";
+			type = 13;
+		}
+		
+		arg1
+		{
+			title = "Sound Number";
+		}
+	}
+}
+
diff --git a/Build/Configurations/Includes/Hexen_misc.cfg b/Build/Configurations/Includes/Hexen_misc.cfg
new file mode 100644
index 0000000..4b55d31
--- /dev/null
+++ b/Build/Configurations/Includes/Hexen_misc.cfg
@@ -0,0 +1,269 @@
+// Basic Hexen stuff.
+skills
+{
+	1 = "Squire / Altar boy / Apprentice";
+	2 = "Knight / Acolyte / Enchanter";
+	3 = "Warrior / Priest / Sorceror";
+	4 = "Berserker / Cardinal / Warlock";
+	5 = "Titan / Pope / Archimage";
+}
+
+linedefflags
+{
+	512 = "Repeatable Action";
+	8192 = "Monster Activates";
+	32768 = "Block Everything";
+}
+
+thingflags
+{
+	16 = "Dormant";
+	32 = "Fighter class";
+	64 = "Cleric class";
+	128 = "Mage class";
+	256 = "Singleplayer";
+	512 = "Cooperative";
+	1024 = "Deathmatch";
+}
+
+// Default flags for first new thing
+defaultthingflags
+{
+	32;
+	64;
+	128;
+	256;
+	512;
+	1024;
+}
+
+// How thing flags should be compared (for the stuck thing error check)
+thingflagscompare
+{
+	skills
+	{
+		1;
+		2;
+		4;
+	}
+
+	classes
+	{
+		32;
+		64;
+		128;
+	}
+
+	gamemodes
+	{
+		256 { requiredgroups = "skills"; }
+		512 { requiredgroups = "skills"; }
+		1024 { ignoredgroups = "skills"; }
+	}
+}
+
+// Mask for the thing flags which indicates the options
+// that make the same thing appear in the same modes
+thingflagsmasks
+{
+	thingflagsmask1 = 7;	// 1 + 2 + 4
+	thingflagsmask2 = 1792;	// 256 + 512 + 1024
+}
+
+// Linedef flags UDMF translation table
+// This is needed for copy/paste and prefabs to work properly
+// When the UDMF field name is prefixed with ! it is inverted
+linedefflagstranslation
+{
+	512 = "repeatspecial";
+	1024 = "playeruse";
+	2048 = "monstercross";
+	3072 = "impact";
+	4096 = "playerpush";
+	5120 = "missilecross";
+	8192 = "monsteractivate";
+	32768 = "blockeverything";
+}
+
+// Thing flags UDMF translation table
+// This is needed for copy/paste and prefabs to work properly
+// When the UDMF field name is prefixed with ! it is inverted
+thingflagstranslation
+{
+	16 = "dormant";
+	32 = "class1";
+	64 = "class2";
+	128 = "class3";
+	256 = "single";
+	512 = "coop";
+	1024 = "dm";
+}
+
+// Activations filter for Hexen type activations
+// This filters the activation bits from the flags
+// This is in its own structure for inclusion only,
+// the actual value will end up in the document scope
+linedefactivationsfilter
+{
+	linedefactivationsfilter = 7168;
+}
+
+// LINEDEF ACTIVATIONS
+// Make sure these are in order from lowest value to highest value
+linedefactivations
+{
+	0 = "Player walks over";
+	1024 = "Player presses Use";
+	2048 = "Monster walks over";
+	3072 = "Projectile hits";
+	4096 = "Player bumps";
+	5120 = "Projectile flies over";
+	6144 = "Player presses Use (PassThru)";
+}
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	filter0
+	{
+		name = "Easy skill";
+		category = "";
+		type = -1;
+		
+		fields
+		{
+			1 = true;
+		}
+	}
+	
+	filter1
+	{
+		name = "Medium skill";
+		category = "";
+		type = -1;
+		
+		fields
+		{
+			2 = true;
+		}
+	}
+	
+	filter2
+	{
+		name = "Hard skill";
+		category = "";
+		type = -1;
+		
+		fields
+		{
+			4 = true;
+		}
+	}
+	
+	filter3
+	{
+		name = "Fighter class";
+		category = "";
+		type = -1;
+		
+		fields
+		{
+			32 = true;
+		}
+	}
+	
+	filter4
+	{
+		name = "Cleric class";
+		category = "";
+		type = -1;
+		
+		fields
+		{
+			64 = true;
+		}
+	}
+	
+	filter5
+	{
+		name = "Mage class";
+		category = "";
+		type = -1;
+		
+		fields
+		{
+			128 = true;
+		}
+	}
+	
+	filter6
+	{
+		name = "Keys only";
+		category = "keys";
+		type = -1;
+	}
+	
+	filter7
+	{
+		name = "Cooperative";
+		category = "";
+		type = -1;
+		
+		fields
+		{
+			512 = true;
+		}
+	}
+	
+	filter8
+	{
+		name = "Deathmatch";
+		category = "";
+		type = -1;
+		
+		fields
+		{
+			1024 = true;
+		}
+	}
+}
+
+// ENUMERATIONS
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	keys
+	{
+		0 = "None";
+		1 = "Steel key";
+		2 = "Cave key";
+		3 = "Axe key";
+		4 = "Fire key";
+		5 = "Emerald key";
+		6 = "Dungeon key";
+		7 = "Silver key";
+		8 = "Rusted key";
+		9 = "Horn key";
+		10 = "Swamp key";
+		11 = "Castle key";
+		100 = "Any key";
+		101 = "All keys";
+		102 = "Impossible";
+	}
+	
+	spawnthing
+	{
+		0 = "None";
+	}
+}
+
+//mxd. These are Hexen-specific settings only.  
+//mxd. These settings are valid only in native Hexen map format.
+mapformat_hexen
+{
+	sectortypes
+	{
+		include("Hexen_sectors.cfg");
+	}	
+}
\ No newline at end of file
diff --git a/Build/Configurations/Includes/Hexen_sectors.cfg b/Build/Configurations/Includes/Hexen_sectors.cfg
new file mode 100644
index 0000000..930b03e
--- /dev/null
+++ b/Build/Configurations/Includes/Hexen_sectors.cfg
@@ -0,0 +1,35 @@
+
+0 = "None";
+1 = "Light Phased";
+2 = "Light Sequence Start";
+3 = "Light Sequence Special 1";
+4 = "Light Sequence Special 2";
+26 = "Stairs Special 1";
+27 = "Stairs Special 2";
+198 = "Light Indoor 2";
+199 = "Light Indoor 1";
+200 = "Sky 2 (MAPINFO)";
+201 = "Scroll North (slow)";
+202 = "Scroll North (medium)";
+203 = "Scroll North (fast)";
+204 = "Scroll East (slow)";
+205 = "Scroll East (medium)";
+206 = "Scroll East (fast)";
+207 = "Scroll South (slow)";
+208 = "Scroll South (medium)";
+209 = "Scroll South (fast)";
+210 = "Scroll West (slow)";
+211 = "Scroll West (medium)";
+212 = "Scroll West (fast)";
+213 = "Scroll NorthWest (slow)";
+214 = "Scroll NorthWest (medium)";
+215 = "Scroll NorthWest (fast)";
+216 = "Scroll NorthEast (slow)";
+217 = "Scroll NorthEast (medium)";
+218 = "Scroll NorthEast (fast)";
+219 = "Scroll SouthEast (slow)";
+220 = "Scroll SouthEast (medium)";
+221 = "Scroll SouthEast (fast)";
+222 = "Scroll SouthWest (slow)";
+223 = "Scroll SouthWest (medium)";
+224 = "Scroll SouthWest (fast)";
diff --git a/Build/Configurations/Includes/Hexen_texturesets.cfg b/Build/Configurations/Includes/Hexen_texturesets.cfg
new file mode 100644
index 0000000..e69de29
diff --git a/Build/Configurations/Includes/Hexen_things.cfg b/Build/Configurations/Includes/Hexen_things.cfg
new file mode 100644
index 0000000..2135c09
--- /dev/null
+++ b/Build/Configurations/Includes/Hexen_things.cfg
@@ -0,0 +1,1627 @@
+
+players
+{
+	color = 10;	// Light Green
+	arrow = 1;
+	title = "Player Starts";
+	width = 16;
+	sort = 1;
+	error = 2;
+	blocking = 2;
+	
+	1
+	{
+		title = "Player 1 start";
+		sprite = "CLERA1";
+	}
+	2
+	{
+		title = "Player 2 start";
+		sprite = "CLERA1";
+	}
+	3
+	{
+		title = "Player 3 start";
+		sprite = "CLERA1";
+	}
+	4
+	{
+		title = "Player 4 start";
+		sprite = "CLERA1";
+	}
+	9100
+	{
+		title = "Player 5 Start";
+		sprite = "CLERA1";
+	}
+	9101
+	{
+		title = "Player 6 Start";
+		sprite = "CLERA1";
+	}
+	9102
+	{
+		title = "Player 7 Start";
+		sprite = "CLERA1";
+	}
+	9103
+	{
+		title = "Player 8 Start";
+		sprite = "CLERA1";
+	}
+	11
+	{
+		title = "Player Deathmatch start";
+		sprite = "CLERR0";
+	}
+}
+
+teleports
+{
+	color = 2;	// Green
+	arrow = 1;
+	title = "Teleports";
+	width = 16;
+	sort = 1;
+	blocking = 0;
+	
+	14
+	{
+		title = "Teleport Landing";
+		sprite = "TELEA0";
+	}
+	140
+	{
+		title = "Teleport Smoke";
+		sprite = "TSMKA0";
+	}
+}
+
+monsters
+{
+	color = 12;	// Light Red
+	arrow = 1;
+	title = "Monsters";
+	width = 20;
+	sort = 1;
+	error = 2;
+	blocking = 2;
+	
+	107
+	{
+		title = "Centaur";
+		sprite = "CENTA1";
+	}
+	10060
+	{
+		title = "Affrit";
+		sprite = "FDMNA1";
+	}
+	115
+	{
+		title = "Slaughtaur";
+		sprite = "CENTF1";
+	}
+	34
+	{
+		title = "Reiver";
+		sprite = "WRTHA1";
+	}
+	10011
+	{
+		title = "Reiver (buried)";
+		sprite = "WRTHA1";
+	}
+	254
+	{
+		title = "Dragon Lich";
+		sprite = "DRAGC1";
+		arg0
+		{
+			title = "Destination Thing Tag";
+			type = 14;
+		}
+		arg1
+		{
+			title = "Destination Thing Tag";
+			type = 14;
+		}
+		arg2
+		{
+			title = "Destination Thing Tag";
+			type = 14;
+		}
+		arg3
+		{
+			title = "Destination Thing Tag";
+			type = 14;
+		}
+		arg4
+		{
+			title = "Destination Thing Tag";
+			type = 14;
+		}
+	}
+	10030
+	{
+		title = "Ettin";
+		sprite = "ETTNA1";
+		width = 25;
+	}
+	8020
+	{
+		title = "Wendigo";
+		sprite = "ICEYA1";
+		width = 22;
+	}
+	31
+	{
+		title = "Green Chaos Serpent";
+		sprite = "DEMNA1";
+		width = 32;
+	}
+	8080
+	{
+		title = "Brown Chaos Serpent";
+		sprite = "DEM2A1";
+		width = 32;
+	}
+	114
+	{
+		title = "Dark Bishop";
+		sprite = "BISHA1";
+		width = 22;
+	}
+	121
+	{
+		title = "Stalker";
+		sprite = "SSPTB0";
+		width = 32;
+	}
+	120
+	{
+		title = "Stalker Boss";
+		sprite = "SSPTD0";
+		width = 32;
+	}
+	10100
+	{        
+		title = "Zedek (fighter)";
+		sprite = "PLAYE8";
+		width = 16;
+	}
+	10101
+	{
+		title = "Traductus (cleric)";
+		sprite = "CLERE8";
+		width = 16;
+	}
+	10102
+	{
+		title = "Menelkir (mage)";
+		sprite = "MAGEE8";
+		width = 16;
+	}
+	10080
+	{
+		title = "Heresiarch";
+		sprite = "SORCA1";
+		width = 40;
+	}
+	10200
+	{
+		title = "Korax";
+		sprite = "KORXA1";
+		width = 65;
+	}
+}
+
+weapons
+{
+	color = 14;	// Yellow
+	arrow = 0;
+	title = "Weapons";
+	width = 20;
+	sort = 1;
+	blocking = 0;
+	
+	10
+	{
+		title = "Serpent Staff";
+		sprite = "WCSSA0";
+	}
+	8010
+	{
+		title = "Timon's Axe";
+		sprite = "WFAXA0";
+	}
+	53
+	{
+		title = "Frost Shards";
+		sprite = "WMCSA0";
+	}
+	8009
+	{
+		title = "Firestorm";
+		sprite = "WCFMA0";
+	}
+	123
+	{
+		title = "Hammer Of Retribution";
+		sprite = "WFHMA0";
+	}
+	8040
+	{
+		title = "Arc Of Death";
+		sprite = "WMLGG0";
+	}
+	18
+	{
+		title = "Wraithverge Piece 1";
+		sprite = "WCH1A0";
+	}
+	19
+	{
+		title = "Wraithverge Piece 2";
+		sprite = "WCH2A0";
+	}
+	20
+	{
+		title = "Wraithverge Piece 3";
+		sprite = "WCH3A0";
+	}
+	12
+	{
+		title = "Quietus Piece 1";
+		sprite = "WFR1A0";
+	}
+	13
+	{
+		title = "Quietus Piece 2";
+		sprite = "WFR2A0";
+	}
+	16
+	{
+		title = "Quietus Piece 3";
+		sprite = "WFR3A0";
+	}
+	21
+	{
+		title = "BloodScourge Piece 1";
+		sprite = "WMS1A0";
+	}
+	22
+	{
+		title = "BloodScourge Piece 2";
+		sprite = "WMS2A0";
+	}
+	23
+	{
+		title = "BloodScourge Piece 3";
+		sprite = "WMS3A0";
+	}
+}
+
+ammunition
+{
+	color = 6;	// Brown
+	arrow = 0;
+	title = "Mana";
+	width = 8;
+	sort = 1;
+	blocking = 0;
+	
+	122
+	{
+		title = "Blue Mana";
+		sprite = "MAN1H0";
+	}
+	124
+	{
+		title = "Green Mana";
+		sprite = "MAN2H0";
+	}
+	8004
+	{
+		title = "Combined Mana";
+		sprite = "MAN3A0";
+	}
+}
+
+health
+{
+	color = 1;	// Blue
+	arrow = 0;
+	title = "Health and Armor";
+	width = 20;
+	sort = 1;
+	blocking = 0;
+	
+	8005
+	{
+		title = "Mesh Armor";
+		sprite = "ARM1A0";
+	}
+	8006
+	{
+		title = "Falcon Shield";
+		sprite = "ARM2A0";
+	}
+	8007
+	{
+		title = "Platinum Helm";
+		sprite = "ARM3A0";
+	}
+	8008
+	{
+		title = "Amulet Of Warding";
+		sprite = "ARM4A0";
+	}
+	81
+	{
+		title = "Crystal Vial";
+		sprite = "PTN1A0";
+	}
+}
+
+powerups
+{
+	color = 9;	// Light Blue
+	arrow = 0;
+	title = "Artifacts";
+	width = 20;
+	height = 20;
+	sort = 1;
+	blocking = 0;
+	
+	30
+	{
+		title = "Porkalator";
+		sprite = "PORKB0";
+	}
+	32
+	{
+		title = "Mystic Urn";
+		sprite = "SPHLA0";
+	}
+	33
+	{
+		title = "Torch";
+		sprite = "TRCHA0";
+	}
+	36
+	{
+		title = "Chaos Device";
+		sprite = "ATLPA0";
+	}
+	82
+	{
+		title = "Quartz Flask";
+		sprite = "PTN2A0";
+	}
+	83
+	{
+		title = "Wings Of Wrath";
+		sprite = "SOARA0";
+	}
+	84
+	{
+		title = "Icon Of The Defender";
+		sprite = "INVUA0";
+	}
+	86
+	{
+		title = "Dark Servant";
+		sprite = "SUMNA0";
+	}
+	10110
+	{
+		title = "Disc Of Repulsion";
+		sprite = "BLSTB0";
+	}
+	10120
+	{
+		title = "Mystic Ambit Incant";
+		sprite = "HRADB0";
+	}
+	10040
+	{
+		title = "Banishment Device";
+		sprite = "TELOA0";
+	}
+	8000
+	{
+		title = "Flechette";
+		sprite = "PSBGA0";
+	}
+	8002
+	{
+		title = "Boots Of Speed";
+		sprite = "SPEDB0";
+	}
+	8003
+	{
+		title = "Krater Of Might";
+		sprite = "BMANA0";
+	}
+	8041
+	{
+		title = "Dragonskin Bracers";
+		sprite = "BRACC0";
+	}
+}
+
+puzzle
+{
+	color = 7;	// Light Grey
+	arrow = 1;
+	title = "Puzzle Items";
+	width = 20;
+	sort = 1;
+	blocking = 0;
+	
+	9002
+	{
+		title = "Yorick's Skull";
+		sprite = "ASKUA0";
+	}
+	9003
+	{
+		title = "Heart Of D'Sparil";
+		sprite = "ABGMA0";
+	}
+	9004
+	{
+		title = "Ruby Planet";
+		sprite = "AGMRA0";
+	}
+	9005
+	{
+		title = "Emerald Planet 1";
+		sprite = "AGMGA0";
+	}
+	9006
+	{
+		title = "Sapphire Planet 1";
+		sprite = "AGMBA0";
+	}
+	9007
+	{
+		title = "Daemon Codex";
+		sprite = "ABK1A0";
+	}
+	9008
+	{
+		title = "Liber Obscura";
+		sprite = "ABK2A0";
+	}
+	9009
+	{
+		title = "Emerald Planet 2";
+		sprite = "AGG2A0";
+	}
+	9010
+	{
+		title = "Sapphire Planet 2";
+		sprite = "AGMBA0";
+	}
+	9011
+	{
+		title = "Yorick's Statue";
+		sprite = "STWNA0";
+		width = 10;
+	}
+	9012
+	{
+		title = "Pedestal Of D'Sparil";
+		sprite = "GMPDA0";
+		width = 10;
+	}
+	9014
+	{
+		title = "Flame mask";
+		sprite = "ASK2A0";
+	}
+	9015
+	{
+		title = "Glaive seal";
+		sprite = "AFWPA0";
+	}
+	9016
+	{
+		title = "Holy relic";
+		sprite = "ACWPA0";
+		width = 10;
+	}
+	9017
+	{
+		title = "Sigil of the magus";
+		sprite = "AMWPA0";
+		width = 10;
+	}
+	9018
+	{
+		title = "Clock Gear (steel)";
+		sprite = "AGERA0";
+	}
+	9019
+	{
+		title = "Clock Gear (bronze)";
+		sprite = "AGR2A0";
+	}
+	9020
+	{
+		title = "Clock Gear (steel and bronze)";
+		sprite = "AGR3A0";
+	}
+	9021
+	{
+		title = "Clock Gear (bronze and steel)";
+		sprite = "AGR4A0";
+	}
+}
+
+keys
+{
+	color = 13;	// Light Magenta
+	arrow = 0;
+	title = "Keys";
+	width = 8;
+	sort = 1;
+	blocking = 0;
+	
+	8030
+	{
+		title = "Steel Key";
+		sprite = "KEY1A0";
+	}
+	8031
+	{
+		title = "Cave Key";
+		sprite = "KEY2A0";
+	}
+	8032
+	{
+		title = "Axe Key";
+		sprite = "KEY3A0";
+	}
+	8033
+	{
+		title = "Fire Key";
+		sprite = "KEY4A0";
+	}
+	8034
+	{
+		title = "Emerald Key";
+		sprite = "KEY5A0";
+	}
+	8035
+	{
+		title = "Dungeon Key";
+		sprite = "KEY6A0";
+	}
+	8036
+	{
+		title = "Silver Key";
+		sprite = "KEY7A0";
+	}
+	8037
+	{
+		title = "Rusty Key";
+		sprite = "KEY8A0";
+	}
+	8038
+	{
+		title = "Horn Key";
+		sprite = "KEY9A0";
+	}
+	8039
+	{
+		title = "Swamp Key";
+		sprite = "KEYAA0";
+	}
+	8200
+	{
+		title = "Castle Key";
+		sprite = "KEYBA0";
+	}
+}
+
+obstacles
+{
+	color = 3;	// Cyan
+	arrow = 0;
+	title = "Obstacles";
+	width = 20;
+	sort = 1;
+	blocking = 2;
+	error = 2;
+	
+	8064
+	{
+		title = "Suit Of Armor";
+		sprite = "SUITA0";
+		width = 16;
+		arg0
+		{
+			title = "Contained Item";
+			type = 11;
+			enum = "spawnthing";
+		}
+	}
+	77
+	{
+		title = "Battle Rag Banner";
+		sprite = "BNR1A0";
+		width = 8;
+	}
+	8100
+	{
+		title = "Barrel";
+		sprite = "BARLA0";
+		width = 15;
+	}
+	8065
+	{
+		title = "Bell";
+		sprite = "BBLLA0";
+		width = 56;
+	}
+	103
+	{
+		title = "Pillar With Vase";
+		sprite = "VASEA0";
+		width = 12;
+	}
+	5 
+	{
+		title= "Winged Statue";
+		sprite = "STTWA0";
+		width = 10;
+	}
+	98
+	{
+		title = "Small Rock (brown)";
+		sprite = "RKBSA0";
+		width = 15;
+	}
+	97
+	{
+		title = "Big Rock (brown)";
+		sprite = "RKBLA0";
+		width = 17;
+	}
+	99
+	{
+		title = "Big Rock (grey)";
+		sprite = "RKBKA0";
+	}
+	57
+	{
+		title = "Stalactite (small)";
+		sprite = "SLC3A0";
+		width = 8;
+		hangs = 1;
+	}
+	56
+	{
+		title = "Stalactite (medium)";
+		sprite = "SLC2A0";
+		width = 6;
+		hangs = 1;
+	}
+	52 
+	{
+		title = "Stalactite (large)";
+		sprite = "SLC1A0";
+		width = 8;
+		hangs = 1;
+	}
+	48
+	{
+		title = "Stalagmite (pillar)";
+		sprite = "SGMPA0";
+		width = 8;
+	}
+	51 
+	{
+		title = "Stalagmite (small)";
+		sprite = "SGM3A0";
+		width = 8;
+	}
+	50 
+	{
+		title = "Stalagmite (medium)";
+		sprite = "SGM2A0";
+		width = 6;
+	}
+	49
+	{
+		title = "Stalagmite (large)";
+		sprite = "SGM1A0";
+		width = 8;
+	}
+	80 
+	{
+		title = "Gnarled Tree 1";
+		sprite = "TRE6A0";
+		width = 22;
+	}
+	87 
+	{
+		title = "Gnarled Tree 2";
+		sprite = "TRE7A0";
+		width = 22;
+	}
+	78 
+	{
+		title = "Tall Tree 1";
+		sprite = "TRE5A0";
+		width = 15;
+	}
+	79 
+	{
+		title = "Tall Tree 2";
+		sprite = "TRE4A0";
+		width = 15;
+	}
+	8067 
+	{
+		title = "Iron Maiden";
+		sprite = "IRONA0";
+		width = 12;
+	}
+	63
+	{
+		title = "Tombstone (RIP)";
+		sprite = "TMS1A0";
+		width = 10;
+	}
+	64 
+	{
+		title = "Tombstone (Shane)";
+		sprite = "TMS2A0";
+		width = 10;
+	}
+	65
+	{
+		title = "Tombstone (slimy)";
+		sprite = "TMS3A0";
+		width = 10;
+	}
+	66 
+	{
+		title = "Tombstone (Brian R)";
+		sprite = "TMS4A0";
+		width = 10;
+	}
+	67 
+	{
+		title = "Tombstone (cross circle)";
+		sprite = "TMS5A0";
+		width = 10;
+	}
+	68 
+	{
+		title = "Tombstone (small cross)";
+		sprite = "TMS6A0";
+		width = 8;
+	}
+	69 
+	{
+		title = "Tombstone (Brian P)";
+		sprite = "TMS7A0";
+		width = 8;
+	}
+	96 
+	{
+		title = "Ice Spike (tiny)";
+		sprite = "ICM4A0";
+		width = 4;
+	}
+	95
+	{
+		title = "Ice Spike (small)";
+		sprite = "ICM3A0";
+		width = 5;
+	}
+	94
+	{
+		title = "Ice Spike (medium)";
+		sprite = "ICM2A0";
+		width = 5;
+	}
+	93
+	{
+		title = "Ice Spike (large)";
+		sprite = "ICM1A0";
+		width = 8;
+	}
+	92
+	{
+		title = "Icicle (tiny)";
+		sprite = "ICT4A0";
+		width = 4;
+		hangs = 1;
+	}
+	91
+	{
+		title = "Icicle (small)";
+		sprite = "ICT3A0";
+		width = 4;
+		hangs = 1;
+	}
+	90 
+	{
+		title = "Icicle (medium)";
+		sprite = "ICT2A0";
+		width = 5;
+		hangs = 1;
+	}
+	89 
+	{
+		title = "Icicle (large)";
+		sprite = "ICT1A0";
+		width = 8;
+		hangs = 1;
+	}
+	8068 
+	{
+		title = "Evergreen Tree";
+		sprite = "XMASA0";
+		width = 11;
+	}
+	8062 
+	{
+		title = "Rotten Dead Tree (destructible)";
+		sprite = "TRDTA0";
+		width = 15;
+	}
+	24
+	{
+		title = "Dead Tree";
+		sprite = "TRE1A0";
+		width = 10;
+	}
+	25
+	{
+		title = "Leafless Tree";
+		sprite = "TRE1A0";
+		width = 15;
+	}
+	60
+	{
+		title = "Dead Tree (mossy)";
+		sprite = "SWMVA0";
+		width = 8;
+	}
+	26
+	{
+		title = "Mossy Tree 1";
+		sprite = "TRE2A0";
+		width = 10;
+	}
+	27
+	{
+		title = "Mossy Tree 2";
+		sprite = "TRE3A0";
+		width = 10;
+	}
+	88
+	{
+		title = "Log";
+		sprite = "SLTRA0";
+	}
+	29
+	{
+		title= "Tree Stump (bare)";
+		sprite = "STM2A0";
+		width = 12;
+	}
+	28
+	{
+		title= "Tree Stump (burned)";
+		sprite = "STM1A0";
+		width = 12;
+	}
+	37
+	{
+		title = "Tree Stump 1";
+		sprite = "STM3A0";
+	}
+	38
+	{
+		title = "Tree Stump 2";
+		sprite = "STM4A0";
+	}
+	8051
+	{
+		title = "Bronze Gargoyle (short)";
+		sprite = "GAR8A0";
+		width = 14;
+	}
+	8047
+	{
+		title = "Bronze Gargoyle (tall)";
+		sprite = "GAR4A0";
+		width = 14;
+	}
+	8044
+	{
+		title = "Rusty Gargoyle (tall)";
+		sprite = "GAR1A0";
+		width = 14;
+	}
+	76
+	{
+		title = "Ice Gargoyle (short)";
+		sprite = "STT5A0";
+		width = 14;
+	}
+	73
+	{
+		title = "Ice Gargoyle (tall)";
+		sprite = "STT3A0";
+		width = 14;
+	}                          
+	8050
+	{
+		title = "Lava Gargoyle (short)";
+		sprite = "GAR7A0";
+		width = 14;
+	}
+	8046
+	{
+		title = "Lava Gargoyle (tall)";
+		sprite = "GAR3A0";
+		width = 14;
+	}
+	8049
+	{
+		title = "Dark Lava Gargoyle (short)";
+		sprite = "GAR6A0";
+		width = 14;
+	}
+	8045
+	{
+		title = "Dark Lava Gargoyle (tall)";
+		sprite = "GAR2A0";
+		width = 14;
+	}
+	74
+	{
+		title = "Stone Gargoyle (short)";
+		sprite = "STT4A0";
+		width = 14;
+	}
+	72
+	{
+		title = "Stone Gargoyle (tall)";
+		sprite = "STT2A0";
+		width = 14;
+	}
+	8052
+	{
+		title = "Steel Gargoyle (short)";
+		sprite = "GAR9A0";
+		width = 14;
+	}
+	8048
+	{
+		title = "Steel Gargoyle (tall)";
+		sprite = "GAR5A0";
+		width = 14;
+	}
+}
+	
+lights
+{
+	color = 11;	// Light Cyan
+	arrow = 0;
+	title = "Light sources";
+	width = 20;
+	blocking = 2;
+	error = 2;
+	sort = 1;
+	
+	17
+	{
+		title = "Chandelier (lit)";
+		sprite = "CDLRA0";
+		hangs = 1;
+	}
+	8063
+	{
+		title = "Chandelier (unlit)";
+		sprite = "CDLRD0";
+		hangs = 1;
+	}
+	8066
+	{
+		title = "Blue Candle (lit)";
+		sprite = "CANDA0";
+	}
+	8502
+	{
+		title = "Candle With Web (unlit)";
+		sprite = "TST3A0";
+	}
+	8503
+	{
+		title = "Small Gray Candle (unlit)";
+		sprite = "TST4A0";
+	}
+	8504
+	{
+		title = "Small Candle (unlit)";
+		sprite = "TST5A0";
+	}
+	119
+	{
+		title = "3 Candles (lit)";
+		sprite = "CNDLA0";
+	}
+	10500
+	{
+		title = "Small Flame (timed)";
+		sprite = "FFSMA0";
+	}
+	10501
+	{
+		title = "Small Flame";
+		sprite = "FFSMA0";
+	}
+	10502
+	{
+		title = "Large Flame (timed)";
+		sprite = "FFLGD0";
+	}
+	10503
+	{
+		title = "Large Flame";
+		sprite = "FFLGD0";
+	}
+	54
+	{
+		title = "Wall Torch (lit)";
+		sprite = "WLTRB0";
+	}
+	55
+	{
+		title = "Wall Torch (unlit)";
+		sprite = "WLTRI0";
+	}
+	8042
+	{
+		title = "Minotaur Statue (lit)";
+		sprite = "FBULB0";
+	}
+	8043
+	{
+		title = "Minotaur Statue (unlit)";
+		sprite = "FBULH0";
+	}
+	8069
+	{
+		title = "Cauldron (lit)";
+		sprite = "CDRNG0";
+		width = 12;
+	}
+	8070
+	{
+		title = "Cauldron (unlit)";
+		sprite = "CDRNA0";
+		width = 12;
+	}
+	8060
+	{
+		title = "Skull With Flame";
+		sprite = "FSKLA0";
+		width = 5;
+	}
+	8061
+	{
+		title = "Brazier With Flame";
+		sprite = "BRTRB0";
+		width = 6;
+	}
+	116
+	{
+		title = "Twined Torch (lit)";
+		sprite = "TWTRA0";
+		width = 10;
+	}
+	117
+	{
+		title = "Twined Torch (unlit)";
+		sprite = "TWTRI0";
+		width = 10;
+	}
+}
+
+decoration
+{
+	color = 4;	// Red
+	arrow = 0;
+	title = "Decoration";
+	width = 20;
+	sort = 1;
+	blocking = 0;
+	
+	8071
+	{
+		title = "Chain (short)";
+		sprite = "CHNSA0";
+		width = 4;
+		hangs = 1;
+		height = 32;
+	}
+	8072
+	{
+		title = "Chain (long)";
+		sprite = "CHNSB0";
+		width = 4;
+		hangs = 1;
+		height = 64;
+	}
+	8073
+	{
+		title = "Hook With Heart";
+		sprite = "CHNSC0";
+		width = 4;
+		hangs = 1;
+	}
+	8077
+	{			
+		title = "Hook With Skull";
+		sprite = "CHNSG0";
+		width = 4;
+		hangs = 1;
+	}
+	8074
+	{
+		title = "Chain With Large Hook";
+		sprite = "CHNSD0";
+		width = 4;
+		hangs = 1;
+		height = 32;
+	}
+	8075
+	{
+		title = "Chain With Small Hook";
+		sprite = "CHNSE0";
+		width = 4;
+		hangs = 1;
+		height = 32;
+	}
+	8076
+	{
+		title = "Chain with Spike Ball";
+		sprite = "CHNSF0";
+		width = 4;
+		hangs = 1;
+		height = 32;
+	}
+	8103
+	{
+		title = "Hanging Bucket";
+		sprite = "BCKTA0";
+		width = 8;
+		hangs = 1;
+		height = 72;
+		blocking = 2;
+		error = 2;
+	}
+	6
+	{
+		title = "Tiny Rock (mossy)";
+		sprite = "RCK1A0";
+	}
+	7
+	{
+		title = "Small Rock (mossy)";
+		sprite = "RCK2A0";
+	}
+	9
+	{
+		title = "Medium Rock (mossy)";
+		sprite = "RCK3A0";
+	}
+	15
+	{
+		title = "Big Rock (mossy)";
+		sprite = "RCK4A0";
+	}
+	101
+	{
+		title = "Brick Rubble (small)";
+		sprite = "RBL2A0";
+	}
+	102
+	{
+		title = "Brick Rubble (medium)";
+		sprite = "RBL3A0";
+	}
+	100
+	{
+		title = "Brick Rubble (large)";
+		sprite = "RBL1A0";
+	}
+	39
+	{
+		title = "Large Mushroom 1";
+		sprite = "MSH1A0";
+	}
+	40
+	{
+		title = "Large Mushroom 2";
+		sprite = "MSH2A0";
+	}
+	8104
+	{
+		title = "Large Mushroom (explodes)";
+		sprite = "SHRMB0";
+		width = 6;
+	}
+	41
+	{
+		title = "Medium Mushroom";
+		sprite = "MSH3A0";
+	}
+	42
+	{
+		title = "Small Mushroom 1";
+		sprite = "MSH4A0";
+	}
+	44
+	{
+		title = "Small Mushroom 2";
+		sprite = "MSH5A0";
+	}
+	45
+	{
+		title = "Small Mushroom 3";
+		sprite = "MSH6A0";
+	}
+	46
+	{
+		title = "Small Mushroom 4";
+		sprite = "MSH7A0";
+	}
+	47
+	{
+		title = "Small Mushroom 5";
+		sprite = "MSH8A0";
+	}
+	8101
+	{
+		title = "Shrub";
+		sprite = "SHB1A0";
+		width = 8;
+		blocking = 2;
+		error = 2;
+	}
+	8102
+	{
+		title = "Shrub 2";
+		sprite = "SHB2A0";
+		width = 16;
+		blocking = 2;
+		error = 2;
+	}
+	111
+	{
+		title = "Pool Of Blood";
+		sprite = "GIBSA0";
+	}
+	71
+	{
+		title= "Hanging Corpse";
+		sprite = "CPS3A0";
+		width = 6;
+		hangs = 1;
+		height = 75;
+		blocking = 2;
+		error = 2;
+	}
+	61
+	{
+		title = "Impaled Corpse";
+		sprite = "CPS1A0";
+		width = 10;
+		height = 92;
+		blocking = 2;
+		error = 2;
+	}
+	108
+	{
+		title = "Lynched Corpse";
+		sprite = "CPS4A0";
+		width = 11;
+		hangs = 1;
+		height = 95;
+		blocking = 2;
+		error = 2;
+	}
+	109
+	{
+		title = "Lynched Corpse (heartless)";
+		sprite = "CPS5A0";
+		width = 10;
+		hangs = 1;
+		height = 95;
+		blocking = 2;
+		error = 2;
+	}
+	110
+	{
+		title = "Corpse (sitting)";
+		sprite = "CPS6A0";
+		width = 15;
+		height = 35;
+		blocking = 2;
+		error = 2;
+	}
+	62
+	{
+		title = "Corpse (sleeping)";
+		sprite = "CPS2A0";
+	}
+	8509
+	{
+		title = "Meat Cleaver";
+		sprite = "TST0A0";
+	}
+	8508
+	{
+		title = "Goblet (silver)";
+		sprite = "TST9A0";
+	}
+	8507
+	{
+		title = "Goblet (small)";
+		sprite = "TST8A0";
+	}
+	8506
+	{
+		title = "Goblet (tall)";
+		sprite = "TST7A0";
+	}
+	8505
+	{
+		title = "Goblet (spilled)";
+		sprite = "TST6A0";
+	}
+	8501
+	{
+		title = "Small Silver Stein";
+		sprite = "TST2A0";
+	}
+	8500
+	{
+		title = "Large Brown Stein";
+		sprite = "TST1A0";
+	}
+	104
+	{
+		title = "Pot (tall)";
+		sprite = "POT1A0";
+		width = 10;
+		blocking = 2;
+		error = 2;
+		arg0
+		{
+			title = "Contained Item";
+			type = 11;
+			enum = "spawnthing";
+		}
+	}
+	105
+	{
+		title = "Pot (medium)";
+		sprite = "POT2A0";
+		width = 10;
+		blocking = 2;
+		error = 2;
+		arg0
+		{
+			title = "Contained Item";
+			type = 11;
+			enum = "spawnthing";
+		}
+	}
+	106
+	{
+		title = "Pot (short)";
+		sprite = "POT3A0";
+		width = 15;
+		blocking = 2;
+		error = 2;
+		arg0
+		{
+			title = "Contained Item";
+			type = 11;
+			enum = "spawnthing";
+		}
+	}
+	58
+	{
+		title = "Hanging Moss 1";
+		sprite = "MSS1A0";
+		hangs = 1;
+	}
+	59
+	{
+		title = "Hanging Moss 2";
+		sprite = "MSS2A0";
+		hangs = 1;
+	}
+	10090
+	{
+		title = "Spike Down";
+		sprite = "TSPKD0";
+		width = 20;
+	}
+	10091
+	{
+		title = "Spike Up";
+		sprite = "TSPKB0";
+		width = 20;
+	}
+}
+
+sounds
+{
+	color = 5;	// Purple
+	arrow = 1;
+	title = "Sounds";
+	width = 8;
+	height = 16;
+	sort = 1;
+	fixedsize = true;
+	blocking = 0;
+	sprite = "internal:sound";
+	
+	1403 = "Creak";
+	1408 = "Earth Crack";
+	1401 = "Heavy";
+	1407 = "Ice";
+	1405 = "Lava";
+	1402 = "Metal";
+	1409 = "Metal2";
+	1404 = "Silent";
+	1400 = "Stone";
+	1406 = "Water";
+	1410 = "Wind";
+}
+
+other
+{
+	color = 8;	// Dark Grey
+	arrow = 1;
+	title = "Other";
+	width = 0;
+	height = 0;
+	sort = 1;
+	fixedsize = true;
+	blocking = 0;
+	sprite = "internal:actor";
+	
+	118
+	{
+		title = "Glitter Bridge";
+		width = 32;
+		fixedsize = false;
+	}
+	3000
+	{
+		title = "Polyobject Anchor";
+		sprite = "internal:anchor";
+		fixedrotation = true;
+	}
+	3001
+	{
+		title = "Polyobject Start Spot";
+		sprite = "internal:anchor";
+		fixedrotation = true;
+	}
+	3002
+	{
+		title = "Polyobject Start Spot (crush)";
+		sprite = "internal:anchor";
+		fixedrotation = true;
+	}
+	10225
+	{
+		title = "Spawn Bat";
+		sprite = "ABATC2C8";
+		arg0
+		{
+			title = "Spawn Frequency";
+		}
+		arg1
+		{
+			title = "Spread Angle";
+		}
+		arg3
+		{
+			title = "Spawn Duration";
+		}
+		arg4
+		{
+			title = "Changing Angle";
+		}
+	}
+	10000
+	{
+		title = "Spawn Fog";
+		arg0
+		{
+			title = "Movement Speed";
+		}
+		arg1
+		{
+			title = "Spread Angle";
+		}
+		arg2
+		{
+			title = "Spawn Frequency";
+		}
+		arg3
+		{
+			title = "Fog Lifetime";
+		}
+	}
+	10001
+	{
+		title = "Fog Patch (small)";
+		arg0
+		{
+			title = "Movement Speed";
+		}
+		arg3
+		{
+			title = "Fog Lifetime";
+		}
+		arg4
+		{
+			title = "Moving Fog";
+		}
+	}
+	10002
+	{
+		title = "Fog Patch (medium)";
+		arg0
+		{
+			title = "Movement Speed";
+		}
+		arg3
+		{
+			title = "Fog Lifetime";
+		}
+		arg4
+		{
+			title = "Moving Fog";
+		}
+	}
+	10003
+	{
+		title = "Fog Patch (large)";
+		arg0
+		{
+			title = "Movement Speed";
+		}
+		arg3
+		{
+			title = "Fog Lifetime";
+		}
+		arg4
+		{
+			title = "Moving Fog";
+		}
+	}
+	112 = "Spawn Fly";
+	113 = "Spawn Leaf";
+	9001 = "Map Spot";
+	9013 = "Map Spot (gravity)";
+}
diff --git a/Build/Configurations/Includes/Skulltag_things.cfg b/Build/Configurations/Includes/Skulltag_things.cfg
new file mode 100644
index 0000000..dfff0b3
--- /dev/null
+++ b/Build/Configurations/Includes/Skulltag_things.cfg
@@ -0,0 +1,2894 @@
+skulltag
+{
+	// This one is from Skulltag_data.pk3, not Skulltag.pk3...
+	bridges
+	{
+		color = 8; // Grey
+		arrow = 0;
+		title = "Bridges";
+		width = 16;
+		sort = 1;
+		height = 1;
+		hangs = 0;
+		blocking = 0;
+		
+		1337
+		{
+			title = "Cargo Bridge";
+			sprite = "internal:Bridge";
+			width = 64;
+			height = 16;
+		}
+	}
+
+	flags
+	{
+		color = 13;	// Light Magenta
+		arrow = 0;
+		title = "Flags";
+		width = 20;
+		sort = 1;
+		height = 20;
+		hangs = 0;
+		blocking = 0;
+		
+		5067
+		{
+			title = "Skull Return Zone";
+			sprite = "internal:Zone";
+		}
+		
+		5068
+		{
+			title = "Spring Pad Zone";
+			sprite = "internal:Zone";
+		}
+	}
+	
+	obstacles
+	{
+		color = 3; // Cyan
+		arrow = 0;
+		title = "Obstacles";
+		width = 20;
+		sort = 1;
+		height = 20;
+		hangs = 0;
+		blocking = 2;
+		error = 2;
+		
+		5009
+		{
+			title = "Floating skull rock (bobs)";
+			sprite = "FSKUA0";
+		}
+	}
+	
+	monsters
+	{
+		color = 12; // Light Red
+		arrow = 1;
+		title = "Monsters";
+		width = 20;
+		sort = 1;
+		height = 56;
+		hangs = 0;
+		blocking = 2;
+		error = 2;
+		
+		// MBF stuff that's not in Zandronum yet
+		888 = NULL; // MBF helper dog
+		
+	}
+}
+
+// New things available in Doom, Heretic and Hexen; but not in Chex or Strife
+doomheretichexen
+{
+	// New powerups
+	powerups
+	{
+		color = 9;	// Light Blue
+		arrow = 0;
+		title = "Powerups";
+		width = 20;
+		sort = 1;
+		height = 40;
+		hangs = 0;
+		blocking = 0;
+		
+		5030
+		{
+			title = "Turbo Sphere";
+			sprite = "TURBA0";
+			height = 45;
+		}
+		5032
+		{
+			title = "Time-freeze Sphere";
+			sprite = "TIMEA0";
+			height = 45;
+		}
+		5035
+		{
+			title = "Invisibility Sphere";
+			sprite = "SINVA0";
+			height = 45;
+		}
+		5036
+		{
+			title = "Doomsphere";
+			sprite = "DOOMA0";
+			height = 45;
+		}
+		5037
+		{
+			title = "Guard Sphere";
+			sprite = "GARDA0";
+			height = 45;
+		}
+		6000
+		{
+			title = "Hellstone";
+			sprite = "PPOSA0";
+			height = 45;
+		}
+		6001
+		{
+			title = "Terminator Sphere";
+			sprite = "ARNOA0";
+			height = 45;
+		}
+	}
+  
+  obstacles
+  {
+    color = 3;  // Cyan
+    arrow = 0;
+    title = "Obstacles";
+    width = 20;
+    sort = 1;
+    height = 20;
+    hangs = 0;
+    blocking = 2;
+    error = 2;
+    
+    5120
+    {
+      title = "Impaling Spike";
+      sprite = "POL7A0";
+    }
+    5121
+    {
+      title = "Impaled Chaingunner Head";
+      sprite = "POL8A0";
+    }
+    5122
+    {
+      title = "Impaled ZombieMan Head";
+      sprite = "POL9A0";
+    }
+    5051
+    {
+      title = "Short Grey Pillar";
+      sprite = "COL8A0";
+    }
+    5052
+    {
+      title = "Tall Grey Pillar";
+      sprite = "COL7A0";
+    }
+    5053
+    {
+      title = "Grey Pillar with Pumping Heart";
+      sprite = "COL9A0";
+    }
+    5054
+    {
+      title = "Tall Gothic Pillar";
+      sprite = "GCOLA0";
+    }
+    5055
+    {
+      title = "Revenant Hand";
+      sprite = "SGRBA0";
+    }
+    5056
+    {
+      title = "Imp's Head";
+      sprite = "IHEDA1";
+    }
+    5059
+    {
+      title = "Evil Eye (Red)";
+      sprite = "CEYRA0";
+    }
+    5060
+    {
+      title = "Evil Eye (Blue)";
+      sprite = "CEYBA0";
+    }
+  }
+  
+  decoration
+  {
+    color = 4;  // Red
+    arrow = 0;
+    title = "Decoration";
+    width = 16;
+    sort = 1;
+    height = 16;
+    hangs = 0;
+    blocking = 0;
+
+    5058
+    {
+      title = "NEEDS MOAR IMPSE";
+      sprite = "IMPSA0";
+    }
+    5070
+    {
+      title = "Dead cyberdemon";
+      sprite = "CYBRP0";
+    }
+    5110
+    {
+      title = "Imp Statue";
+      sprite = "STA1A1";
+      width = 20;
+      height = 56;
+    }
+    5111
+    {
+      title = "Demon Statue";
+      sprite = "STA2A1";
+      width = 30;
+      height = 56;
+    }
+    5112
+    {
+      title = "Arch-Vile Statue";
+      width = 20;
+      sprite = "STA3A1";
+      height = 56;
+    }
+    5113
+    {
+      title = "Baron of Hell Statue";
+      sprite = "STA4A1";
+      width = 24;
+      height = 64;
+    }
+    5114
+    {
+      title = "Cyberdemon Statue";
+      sprite = "STA5A1";
+      width = 40;
+      height = 110;
+    }
+    5115
+    {
+      title = "Massmouth Statue";
+      width = 20;
+      sprite = "STA6A1";
+      height = 56;
+    }
+    5320
+    {
+      title = "Impaling Spike (doomguy head)";
+      sprite = "POLAA0";
+      width = 16;
+      height = 56;
+    }
+    5321
+    {
+      title = "Impaling Spike (3 doomguy heads)";
+      sprite = "POLBA0";
+      width = 16;
+      height = 64;
+    }
+    5322
+    {
+      title = "Impaling Spike (3 doomguy heads, short)";
+      sprite = "POLCA0";
+      width = 16;
+      height = 45;
+    }
+    5323
+    {
+      title = "Impaling Spike (doomguy torso, one arm)";
+      sprite = "POLDA0";
+      width = 16;
+      height = 54;
+    }
+    5324
+    {
+      title = "Impaling Spike (doomguy torso, two arms)";
+      sprite = "POLEA0";
+      width = 16;
+      height = 54;
+    }
+    5325
+    {
+      title = "Impaling Spike (doomguy skewered, twitching)";
+      sprite = "POLFA0";
+      width = 16;
+      height = 64;
+    }
+    5326
+    {
+      title = "Impaling Spike (doomguy skewered, long arm)";
+      sprite = "POLGA0";
+      width = 16;
+      height = 64;
+    }
+    5327
+    {
+      title = "Impaling Spike (doomguy skewered, short arm)";
+      sprite = "POLHA0";
+      width = 16;
+      height = 64;
+    }
+    5328
+    {
+      title = "Pool of Blood with Marine Helmet";
+      sprite = "GIB1A0";
+      width = 16;
+      height = 64;
+    }
+  }
+
+
+  lights
+  {
+    color = 11;  // Light Cyan
+    arrow = 0;
+    title = "Light sources";
+    width = 16;
+    sort = 1;
+    height = 16;
+    hangs = 0;
+    blocking = 1;
+    error = 2;
+    
+    5150
+    {
+      title = "Tall white firestick";
+      sprite = "TWHIA0";
+    }
+    5151
+    {
+      title = "Short white firestick";
+      sprite = "SMWTA0";
+    }
+    5152
+    {
+      title = "Tall yellow firestick";
+      sprite = "TYELA0";
+    }
+    5153
+    {
+      title = "Short yellow firestick";
+      sprite = "SMYTA0";
+    }
+    5154
+    {
+      title = "Tall techno floor lamp (Red)";
+      sprite = "TLP3A0";
+    }
+    5155
+    {
+      title = "Short techno floor lamp (Red)";
+      sprite = "TLP4A0";
+    }
+    5156
+    {
+      title = "Candle (Red)";
+      sprite = "CANRA0";
+      blocking = 0;
+    }
+    5157
+    {
+      title = "Candle (Blue)";
+      sprite = "CANBA0";
+      blocking = 0;
+    }
+    5158
+    {
+      title = "Floor lamp (Red)";
+      sprite = "RCOLA0";
+    }
+    5159
+    {
+      title = "Floor lamp (Blue)";
+      sprite = "BCOLA0";
+    }
+  }
+
+  scorepillars
+  {
+    color = 3;  // Cyan
+    arrow = 0;
+    title = "Score pillars";
+    width = 20;
+    sort = 1;
+    height = 20;
+    hangs = 0;
+    blocking = 2;
+    error = 2;
+
+    5020
+    {
+      title = "Hell Pillar";
+      sprite = "HLSPA0";
+    }
+  }
+
+  // All the invasion spawners
+  invmonsters
+  {
+    color = 14;  // Yellow
+    arrow = 1;
+    title = "Invasion Monster Spawners";
+    width = 20;
+    sort = 1;
+    height = 56;
+    hangs = 0;
+    blocking = 2;
+    error = 2;
+  }
+
+  invweapons
+  {
+    color = 14;  // Yellow
+    arrow = 0;
+    title = "Invasion Weapon Spawners";
+    width = 20;
+    sort = 1;
+    height = 25;
+    hangs = 0;
+    blocking = 0;
+  }
+
+  invammunition
+  {
+    color = 14;  // Yellow
+    arrow = 0;
+    title = "Invasion Ammunition Spawners";
+    width = 16;
+    sort = 1;
+    height = 20;
+    blocking = 0;
+    hangs = 0;
+  }
+
+  invhealth
+  {
+    color = 14;  // Yellow
+    arrow = 0;
+    title = "Invasion Health and Armor Spawners";
+    width = 16;
+    sort = 1;
+    height = 20;
+    hangs = 0;
+    blocking = 0;
+  }
+
+  invpowerups
+  {
+    color = 14;  // Yellow
+    arrow = 0;
+    title = "Invasion Powerup Spawners";
+    width = 20;
+    sort = 1;
+    height = 45;
+    hangs = 0;
+    blocking = 0;
+  }
+
+
+  invrandom
+  {
+    color = 14;  // Yellow
+    arrow = 0;
+    title = "Invasion Random Spawners";
+    width = 20;
+    sort = 1;
+    height = 25;
+    hangs = 0;
+    blocking = 0;
+  }
+
+  invrunes
+  {
+    color = 14;  // Yellow
+    arrow = 0;
+    title = "Invasion Rune Spawners";
+    width = 20;
+    sort = 1;
+    height = 45;
+    hangs = 0;
+    blocking = 0;
+
+    5248
+    {
+      title = "Strength Spawner";
+      sprite = "STRRA0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5249
+    {
+      title = "Rage Spawner";
+      sprite = "RAGRA0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5250
+    {
+      title = "Drain Spawner";
+      sprite = "DRARA0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+		}
+		5251
+		{
+			title = "Spread Spawner";
+			sprite = "SPRRA0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		}
+		5252
+		{
+			title = "Resistance Spawner";
+			sprite = "RESRA0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		}
+		5253
+		{
+			title = "Regeneration Spawner";
+			sprite = "REGRA0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		}
+		5254
+		{
+			title = "Prosperity Spawner";
+			sprite = "PRSRA0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		}
+		5255
+		{
+			title = "Reflection Spawner";
+			sprite = "REFRA0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		}
+		5256
+		{
+			title = "Haste Spawner";
+			sprite = "HIJRA0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		}
+		5257
+		{
+			title = "High jump Spawner";
+			sprite = "HIJRA0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		}
+	}
+}
+
+// New things available only in Doom
+doom
+{
+  // New monsters
+  monsters
+  {
+    color = 12;  // Light Red
+    arrow = 1;
+    title = "Monsters";
+    width = 20;
+    sort = 1;
+    height = 56;
+    hangs = 0;
+    blocking = 2;
+    error = 2;
+
+    5004
+    {
+      title = "Blood Demon";
+      width = 30;
+      sprite = "SRG2A2A8";
+    }
+    5003
+    {
+      title = "Dark Imp";
+      sprite = "DIMPA2A8";
+    }
+    5005
+    {
+      title = "Super Shotgunner";
+      sprite = "GPOSA2A8";
+    }
+    5006
+    {
+      title = "Cacolantern";
+      width = 31;
+      sprite = "HED2A2A8";
+    }
+    5007
+    {
+      title = "Hectebus";
+      width = 48;
+      sprite = "HECTC2C8";
+    }
+    5015
+    {
+      title = "Abaddon";
+      width = 31;
+      sprite = "HED3A2A8";
+    }
+    5008
+    {
+      title = "Belphegor";
+      width = 24;
+      sprite = "BOS3A2A8";
+    }
+    
+    // MBF stuff that's not in Zandronum yet
+    9037 = NULL; // Beta lost soul
+  }
+  
+  // New weapons
+  // The pistol pickup is already in ZDoom
+  weapons
+  {
+    color = 14;  // Yellow
+    arrow = 0;
+    title = "Weapons";
+    width = 20;
+    sort = 1;
+    height = 25;
+    hangs = 0;
+    blocking = 0;
+
+    5014
+    {
+      title = "Minigun";
+      sprite = "MNGNA0";
+    }
+    5011
+    {
+      title = "Grenade launcher";
+      sprite = "GLAUA0";
+    }
+    5012
+    {
+      title = "Railgun";
+      sprite = "RAILA0";
+    }
+    5013
+    {
+      title = "BFG10000";
+      sprite = "BFG2A0";
+    }
+  }
+  
+  // New health and armor items
+  health
+  {
+    color = 1;  // Blue
+    arrow = 0;
+    title = "Health and Armor";
+    width = 16;
+    sort = 1;
+    height = 20;
+    hangs = 0;
+    blocking = 0;
+
+    5091
+    {
+      title = "Max. armor bonus";
+      sprite = "BON4A0";
+    }
+    5090
+    {
+      title = "Max. health bonus";
+      sprite = "BON3A0";
+    }
+    5040
+    {
+      title = "Red armor";
+      sprite = "ARM3A0";
+    }
+  }
+
+  // New powerups
+  powerups
+  {
+    color = 9;  // Light Blue
+    arrow = 0;
+    title = "Powerups";
+    width = 20;
+    sort = 1;
+    height = 40;
+    hangs = 0;
+    blocking = 0;
+    
+    5039
+    {
+      title = "Random powerup";
+      sprite = "DOOMA0";
+      height = 45;
+    }
+
+    // MBF stuff that's not in Zandronum yet
+    2016 = NULL; // Beta evil sceptre
+    2017 = NULL; // Beta unholy bible
+  }
+
+  obstacles
+  {
+    color = 3;  // Cyan
+    arrow = 0;
+    title = "Obstacles";
+    width = 20;
+    sort = 1;
+    height = 20;
+    hangs = 0;
+    blocking = 2;
+    error = 2;
+    
+    5057
+    {
+      title = "Hissy";
+      sprite = "HISYA1";
+    }
+  }
+
+  // All the invasion spawners
+  invmonsters
+  {
+    color = 14;  // Yellow
+    arrow = 1;
+    title = "Invasion Monster Spawners";
+    width = 20;
+    sort = 1;
+    height = 56;
+    hangs = 0;
+    blocking = 2;
+    error = 2;
+
+    5205
+    {
+      title = "Imp Spawner";
+      sprite = "TROOA2A8";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5206
+    {
+      title = "Dark Imp Spawner";
+      sprite = "DIMPA2A8";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5207
+    {
+      title = "Demon Spawner";
+      width = 30;
+      sprite = "SARGA2A8";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5208
+    {
+      title = "Spectre Spawner";
+      width = 30;
+      sprite = "SARGA2A8";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5209
+    {
+      title = "Blood Demon Spawner";
+      width = 30;
+      sprite = "SRG2A2A8";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5210
+    {
+      title = "Former Human Spawner";
+      sprite = "POSSA2A8";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5211
+    {
+      title = "Former Sergeant Spawner";
+      sprite = "SPOSA2A8";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5212
+    {
+      title = "Chaingunner Spawner";
+      sprite = "CPOSA2";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5213
+    {
+      title = "Super Shotgunner Spawner";
+      sprite = "GPOSA2A8";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5214
+    {
+      title = "Cacodemon Spawner";
+      width = 31;
+      sprite = "HEADA2A8";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5215
+    {
+      title = "Cacolantern Spawner";
+      width = 31;
+      sprite = "HED2A2A8";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5216
+    {
+      title = "Abaddon Spawner";
+      width = 31;
+      sprite = "HED3A2A8";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5217
+    {
+      title = "Revenant Spawner";
+      sprite = "SKELA2D8";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5218
+    {
+      title = "Mancubus Spawner";
+      width = 48;
+      sprite = "FATTC2C8";
+      height = 64;
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5219
+    {
+      title = "Hectebus Spawner";
+      width = 48;
+      sprite = "HECTC2C8";
+      height = 64;
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5220
+    {
+      title = "Arachnotron Spawner";
+      width = 64;
+      sprite = "BSPIA2A8";
+      height = 64;
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5221
+    {
+      title = "Hell Knight Spawner";
+      width = 24;
+      sprite = "BOS2A2C8";
+      height = 64;
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5222
+    {
+      title = "Baron of Hell Spawner";
+      width = 24;
+      sprite = "BOSSA2A8";
+      height = 64;
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5223
+    {
+      title = "Belphegor Spawner";
+      width = 24;
+      sprite = "BOS3A2A8";
+      height = 64;
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5224
+    {
+      title = "Lost Soul Spawner";
+      width = 16;
+      sprite = "SKULA8A2";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5225
+    {
+      title = "Pain Elemental Spawner";
+      width = 31;
+      sprite = "PAINA2A8";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5226
+    {
+      title = "Cyberdemon Spawner";
+      width = 40;
+      sprite = "CYBRA2";
+      height = 110;
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5227
+    {
+      title = "Spider Mastermind Spawner";
+      width = 128;
+      sprite = "SPIDA2A8";
+      height = 100;
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5228
+    {
+      title = "Arch-Vile Spawner";
+      sprite = "VILEA2D8";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+
+    5280
+    {
+      title = "Wolfenstein SS Spawner";
+      sprite = "SSWVA2";
+      height = 25;
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+  }
+
+  invweapons
+  {
+    color = 14;  // Yellow
+    arrow = 0;
+    title = "Invasion Weapon Spawners";
+    width = 20;
+    sort = 1;
+    height = 25;
+    hangs = 0;
+    blocking = 0;
+
+    5267
+    {
+      title = "Chainsaw Spawner";
+      sprite = "CSAWA0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5268
+    {
+      title = "Shotgun Spawner";
+      sprite = "SHOTA0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5269
+    {
+      title = "Super Shotgun Spawner";
+      sprite = "SGN2A0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5270
+    {
+      title = "Chaingun Spawner";
+      sprite = "MGUNA0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5271
+    {
+      title = "Minigun Spawner";
+      sprite = "MNGNA0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5272
+    {
+      title = "Rocket Launcher Spawner";
+      sprite = "LAUNA0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5273
+    {
+      title = "Grenade Launcher Spawner";
+      sprite = "GLAUA0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5274
+    {
+      title = "Plasma Gun Spawner";
+      sprite = "PLASA0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5275
+    {
+      title = "Railgun Spawner";
+      sprite = "RAILA0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5276
+    {
+      title = "BFG9000 Spawner";
+      sprite = "BFUGA0";
+      height = 30;
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5277
+    {
+      title = "BFG10000 Spawner";
+      sprite = "BFG2A0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+  }
+
+  invammunition
+  {
+    color = 14;  // Yellow
+    arrow = 0;
+    title = "Invasion Ammunition Spawners";
+    width = 16;
+    sort = 1;
+    height = 20;
+    blocking = 0;
+    hangs = 0;
+
+    5258
+    {
+      title = "Ammo Clip Spawner";
+      sprite = "CLIPA0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5259
+    {
+      title = "Shotgun Shells Spawner";
+      sprite = "SHELA0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5260
+    {
+      title = "Rocket Spawner";
+      sprite = "ROCKA0";
+      height = "25";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5261
+    {
+      title = "Cell Charge Spawner";
+      sprite = "CELLA0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5262
+    {
+      title = "Box of Ammo Spawner";
+      sprite = "AMMOA0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5263
+    {
+      title = "Box of Shells Spawner";
+      sprite = "SBOXA0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5264
+    {
+      title = "Box of Rockets Spawner";
+      width = 30;
+      sprite = "BROKA0";
+      height = 25;
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5265
+    {
+      title = "Cell Charge Pack Spawner";
+      sprite = "CELPA0";
+      height = 25;
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5281
+    {
+      title = "Backpack Spawner";
+      sprite = "BPAKA0";
+      height = "25";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+  }
+
+  invhealth
+  {
+    color = 14;  // Yellow
+    arrow = 0;
+    title = "Invasion Health and Armor Spawners";
+    width = 16;
+    sort = 1;
+    height = 20;
+    hangs = 0;
+    blocking = 0;
+
+    5229
+    {
+      title = "Stimpack Spawner";
+      sprite = "STIMA0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5230
+    {
+      title = "Medkit Spawner";
+      sprite = "MEDIA0";
+      height = 25;
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5231
+    {
+      title = "Health Bonus Spawner";
+      sprite = "BON1A0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5232
+    {
+      title = "Armor Bonus Spawner";
+      sprite = "BON2A0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5233
+    {
+      title = "Max. Health Bonus Spawner";
+      sprite = "BON3A0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5234
+    {
+      title = "Max. Armor Bonus Spawner";
+      sprite = "BON4A0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5235
+    {
+      title = "Green Armor Spawner";
+      sprite = "ARM1A0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5236
+    {
+      title = "Blue Armor Spawner";
+      sprite = "ARM2A0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5237
+    {
+      title = "Red Armor Spawner";
+      sprite = "ARM3A0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+  }
+
+  invpowerups
+  {
+    color = 14;  // Yellow
+    arrow = 0;
+    title = "Invasion Powerup Spawners";
+    width = 20;
+    sort = 1;
+    height = 45;
+    hangs = 0;
+    blocking = 0;
+
+    5238
+    {
+      title = "Doomsphere Spawner";
+      sprite = "DOOMA0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5239
+    {
+      title = "Guardsphere Spawner";
+      sprite = "GARDA0";
+      height = 30;
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5240
+    {
+      title = "Invisibility Spawner";
+      sprite = "INVSA0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5241
+    {
+      title = "Partial Invisibility Spawner";
+      sprite = "PINSA0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5242
+    {
+      title = "Invulnerability Spawner";
+      sprite = "PINVA0";
+      height = 30;
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5243
+    {
+      title = "Megasphere Spawner";
+      sprite = "MEGAA0";
+      height = 40;
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5244
+    {
+      title = "Random Powerup Spawner";
+      sprite = "DOOMA0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5245
+    {
+      title = "Soulsphere Spawner";
+      sprite = "SOULA0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5246
+    {
+      title = "Time Freeze Spawner";
+      sprite = "TIMEA0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5247
+    {
+      title = "Turbosphere Spawner";
+      sprite = "TURBA0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+
+    5266
+    {
+      title = "Berserk Spawner";
+      sprite = "PSTRA0";
+      height = 20;
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+  }
+
+  invrandom
+  {
+    color = 14;  // Yellow
+    arrow = 0;
+    title = "Invasion Random Spawners";
+    width = 20;
+    sort = 1;
+    height = 25;
+    hangs = 0;
+    blocking = 0;
+
+    5200
+    {
+      title = "Generic Item/Monster Spawner";
+      sprite = "TFOGB0";
+      height = 45;
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5201
+    {
+      title = "Random Weak Monster Spawner";
+      width = 30;
+      sprite = "TFOGB0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5202
+    {
+      title = "Random Powerful Monster Spawner";
+      width = 64;
+      sprite = "TFOGB0";
+      height = 64;
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5203
+    {
+      title = "Random Very Powerful Monster Spawner";
+      width = 128;
+      sprite = "TFOGB0";
+      height = 110;
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5204
+    {
+      title = "Random Monster Spawner";
+      width = 128;
+      sprite = "TFOGB0";
+      height = 110;
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+
+    5278
+    {
+      title = "Random Clip Ammo Spawner";
+      sprite = "CELLA0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5279
+    {
+      title = "Random Box Ammo Spawner";
+      sprite = "CELPA0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+  }
+}
+
+// New things available only in Heretic
+heretic
+{
+  // All the invasion spawners
+  invmonsters
+  {
+    color = 14;  // Yellow
+    arrow = 1;
+    title = "Invasion Monster Spawners";
+    width = 20;
+    sort = 1;
+    height = 56;
+    hangs = 0;
+    blocking = 2;
+    error = 2;
+
+    5400
+    {
+      title = "Gargoyle Spawner";
+      sprite = "IMPXA1";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5401
+    {
+      title = "Fire Gargoyle Spawner";
+      sprite = "IMPXF1";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5402
+    {
+      title = "Golem Spawner";
+      sprite = "MUMMA1";
+      width = 22;
+      height = 62;
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5403
+    {
+      title = "Nitrogolem Spawner";
+      sprite = "MUMMY1";
+      width = 22;
+      height = 62;
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5404
+    {
+      title = "Golem Ghost Spawner";
+      sprite = "MUMMA1";
+      width = 22;
+      height = 62;
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5405
+    {
+      title = "Nitrogolem Ghost Spawner";
+      sprite = "MUMMY1";
+      width = 22;
+      height = 62;
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5406 
+    {
+      title = "Weredragon Spawner";
+      sprite = "BEASA1";
+      width = 32;
+      height = 74;
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5407
+    {
+      title = "Chicken Spawner";
+      sprite = "CHKNA2A8";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5408
+    {
+      title = "Sabreclaw Spawner";
+      sprite = "CLNKA1";
+      width = 20;
+      height = 64;
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }                
+    5409
+    {
+      title = "Iron Lich Spawner";
+      sprite = "HEADA1";
+      width = 40;
+      height = 72;
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5410
+    {
+      title = "Undead Warrior Spawner";
+      sprite = "KNIGA1";
+      width = 24;
+      height = 48;
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5411
+    {
+      title = "Undead Warrior Ghost Spawner";
+      sprite = "KNIGA1";
+      width = 24;
+      height = 78;
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5412
+    {
+      title = "Maulotaur Spawner";
+      sprite = "MNTRA1";
+      width = 28;
+      height = 100;
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5413
+    {
+      title = "Ophidian Spawner";
+      sprite = "SNKEA1";
+      width = 22;
+      height = 70;
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5414
+    {
+      title = "D'Sparil on Serpent Spawner";
+      sprite = "SRCRA1";
+      width = 28;
+      height = 100;
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5415
+    {
+      title = "D'Sparil alone Spawner";
+      sprite = "SOR2P1";
+      width = 28;
+      height = 100;
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5416
+    {
+      title = "Disciple Of D'Sparil Spawner";
+      sprite = "WZRDA1";
+      height = 68;
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+  }
+
+  invweapons
+  {
+    color = 14;  // Yellow
+    arrow = 0;
+    title = "Invasion Weapon Spawners";
+    width = 20;
+    sort = 1;
+    height = 25;
+    hangs = 0;
+    blocking = 0;
+
+    5417
+    {
+      title = "Dragon Claw Spawner";
+      sprite = "WBLSA0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5418
+    {
+      title = "Ethereal Crossbow Spawner";
+      sprite = "WBOWA0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5419
+    {
+      title = "Gauntlets Of The Necromancer Spawner";
+      sprite = "WGNTA0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5420
+    {
+      title = "Firemace Spawner";
+      sprite = "WMCEA0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5421
+    {
+      title = "Phoenix Rod Spawner";
+      sprite = "WPHXA0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5422
+    {
+      title = "Hellstaff Spawner";
+      sprite = "WSKLA0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+  }
+
+  invammunition
+  {
+    color = 14;  // Yellow
+    arrow = 0;
+    title = "Invasion Ammunition Spawners";
+    width = 16;
+    sort = 1;
+    height = 20;
+    blocking = 0;
+    hangs = 0;
+
+    5423
+    {
+      title = "Claw Orb Spawner";
+      sprite = "AMB1A0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5424
+    {
+      title = "Energy Orb Spawner";
+      sprite = "AMB2A0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5425
+    {
+      title = "Ethereal Arrows Spawner";
+      sprite = "AMC1A0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5426
+    {
+      title = "Quiver Of Ethereal Arrows Spawner";
+      sprite = "AMC2A0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5427
+    {
+      title = "Mace Spheres Spawner";
+      sprite = "AMM1A0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5428
+    {
+      title = "Pile Of Mace Spheres Spawner";
+      sprite = "AMM2A0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5429
+    {
+      title = "Flame Orb Spawner";
+      sprite = "AMP1A0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5430
+    {
+      title = "Inferno Orb Spawner";
+      sprite = "AMP2A0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5431
+    {
+      title = "Lesser Runes Spawner";
+      sprite = "AMS1A0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5432
+    {
+      title = "Greater Runes Spawner";
+      sprite = "AMS2A0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5433
+    {
+      title = "Wand Crystal Spawner";
+      sprite = "AMG1A0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5434
+    {
+      title = "Crystal Geode Spawner";
+      sprite = "AMG2A0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5435
+    {
+      title = "Bag Of Holding Spawner";
+      sprite = "BAGHA0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+  }
+
+  invhealth
+  {
+    color = 14;  // Yellow
+    arrow = 0;
+    title = "Invasion Health and Armor Spawners";
+    width = 16;
+    sort = 1;
+    height = 20;
+    hangs = 0;
+    blocking = 0;
+
+    5437
+    {
+      title = "Silver Shield Spawner";
+      sprite = "SHLDA0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5438
+    {
+      title = "Enchanted Shield Spawner";
+      sprite = "SHD2A0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+  }
+
+  invpowerups
+  {
+    color = 14;  // Yellow
+    arrow = 0;
+    title = "Invasion Powerup Spawners";
+    width = 20;
+    sort = 1;
+    height = 45;
+    hangs = 0;
+    blocking = 0;
+
+    5436
+    {
+      title = "Map Scroll Spawner";
+      sprite = "SPMPA0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5440
+    {
+      title = "Morph Ovum Spawner";
+      sprite = "ARTIEGGC";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5443
+    {
+      title = "Shadowsphere Spawner";
+      sprite = "ARTIINVS";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5444
+    {
+      title = "Ring of Invulnerability Spawner";
+      sprite = "ARTIINVU";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5447
+    {
+      title = "Time Bomb Of The Ancients Spawner";
+      sprite = "ARTIFBMB";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5448
+    {
+      title = "Tome of Power Spawner";
+      sprite = "ARTIPWBK";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+  }
+
+  invrandom
+  {
+    color = 14;  // Yellow
+    arrow = 0;
+    title = "Invasion Random Spawners";
+    width = 20;
+    sort = 1;
+    height = 25;
+    hangs = 0;
+    blocking = 0;
+
+    5450
+    {
+      title = "Random Artifact Spawner";
+      sprite = "ARTIATLP";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5451
+    {
+      title = "Weak Monster Spawner";
+      sprite = "IMPXA1";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5452
+    {
+      title = "Tough Monster Spawner";
+      sprite = "HEADA1";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5453
+    {
+      title = "Random Monster Spawner";
+      sprite = "MUMMY1";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5454
+    {
+      title = "Ghost Monster Spawner";
+      sprite = "KNIGA1";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+  }
+}
+
+// New things available only in Hexen
+hexen
+{
+  // All the invasion spawners
+  invmonsters
+  {
+    color = 14;  // Yellow
+    arrow = 1;
+    title = "Invasion Monster Spawners";
+    width = 20;
+    sort = 1;
+    height = 56;
+    hangs = 0;
+    blocking = 2;
+    error = 2;
+
+    5501
+    {
+      title = "Ettin Spawner";
+      sprite = "ETTNA1";
+      width = 25;
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5502
+    {
+      title = "Phantasmal Ettin Spawner";
+      sprite = "ETTNA1";
+      width = 25;
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5503
+    {
+      title = "Centaur Spawner";
+      sprite = "CENTA1";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5504
+    {
+      title = "Phantasmal Centaur Spawner";
+      sprite = "CENTA1";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5505
+    {
+      title = "Slaughtaur Spawner";
+      sprite = "CENTF1";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5506
+    {
+      title = "Affrit Spawner";
+      sprite = "FDMNA1";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5507
+    {
+      title = "Dark Bishop Spawner";
+      sprite = "BISHA1";
+      width = 22;
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5508
+    {
+      title = "Green Chaos Serpent Spawner";
+      sprite = "DEMNA1";
+      width = 32;
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5509
+    {
+      title = "Phantasmal Green Chaos Serpent Spawner";
+      sprite = "DEMNA1";
+      width = 32;
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5510
+    {
+      title = "Brown Chaos Serpent Spawner";
+      sprite = "DEM2A1";
+      width = 32;
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5511
+    {
+      title = "Phantasmal Brown Chaos Serpent Spawner";
+      sprite = "DEM2A1";
+      width = 32;
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5512
+    {
+      title = "Wendigo Spawner";
+      sprite = "ICEYA1";
+      width = 22;
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5513
+    {
+      title = "Stalker Spawner";
+      sprite = "SSPTB0";
+      width = 32;
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5514
+    {
+      title = "Stalker Boss Spawner";
+      sprite = "SSPTD0";
+      width = 32;
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5515
+    {
+      title = "Reiver Spawner";
+      sprite = "WRTHA1";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5516
+    {
+      title = "Traductus (cleric boss) Spawner";
+      sprite = "CLERE8";
+      width = 16;
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5517
+    {        
+      title = "Zedek (fighter boss) Spawner";
+      sprite = "PLAYE8";
+      width = 16;
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5518
+    {
+      title = "Menelkir (mage boss) Spawner";
+      sprite = "MAGEE8";
+      width = 16;
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5520
+    {
+      title = "Heresiarch Spawner Spawner";
+      sprite = "SORCA1";
+      width = 40;
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5521
+    {
+      title = "Korax Spawner Spawner";
+      sprite = "KORXA1";
+      width = 65;
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5522
+    {
+      title = "Pig Spawner Spawner";
+      sprite = "PIGA2A8";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+  }
+
+  invweapons
+  {
+    color = 14;  // Yellow
+    arrow = 0;
+    title = "Invasion Weapon Spawners";
+    width = 20;
+    sort = 1;
+    height = 25;
+    hangs = 0;
+    blocking = 0;
+
+    5530
+    {
+      title = "Firestorm Spawner";
+      sprite = "WCFMA0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5531
+    {
+      title = "Serpent Staff Spawner";
+      sprite = "WCSSA0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5532
+    {
+      title = "Timon's Axe Spawner";
+      sprite = "WFAXA0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5533
+    {
+      title = "Hammer Of Retribution Spawner";
+      sprite = "WFHMA0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5534
+    {
+      title = "Frost Shards Spawner";
+      sprite = "WMCSA0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5535
+    {
+      title = "Arc Of Death Spawner";
+      sprite = "WMLGG0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5554
+    {
+      title = "Wraithverge Piece 1 Spawner";
+      sprite = "WCH1A0";
+    }
+    5555
+    {
+      title = "Wraithverge Piece 2 Spawner";
+      sprite = "WCH2A0";
+    }
+    5556
+    {
+      title = "Wraithverge Piece 3 Spawner";
+      sprite = "WCH3A0";
+    }
+    5557
+    {
+      title = "Quietus Piece 1 Spawner";
+      sprite = "WFR1A0";
+    }
+    5558
+    {
+      title = "Quietus Piece 2 Spawner";
+      sprite = "WFR2A0";
+    }
+    5559
+    {
+      title = "Quietus Piece 3 Spawner";
+      sprite = "WFR3A0";
+    }
+    5560
+    {
+      title = "BloodScourge Piece 1 Spawner";
+      sprite = "WMS1A0";
+    }
+    5561
+    {
+      title = "BloodScourge Piece 2 Spawner";
+      sprite = "WMS2A0";
+    }
+    5562
+    {
+      title = "BloodScourge Piece 3 Spawner";
+      sprite = "WMS3A0";
+    }
+  }
+
+  invammunition
+  {
+    color = 14;  // Yellow
+    arrow = 0;
+    title = "Invasion Ammunition Spawners";
+    width = 16;
+    sort = 1;
+    height = 20;
+    blocking = 0;
+    hangs = 0;
+
+    5523
+    {
+      title = "Blue Mana Spawner";
+      sprite = "MAN1H0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5524
+    {
+      title = "Green Mana Spawner";
+      sprite = "MAN2H0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5525
+    {
+      title = "Combined Mana Spawner";
+      sprite = "MAN3A0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+  }
+
+  invhealth
+  {
+    color = 14;  // Yellow
+    arrow = 0;
+    title = "Invasion Health and Armor Spawners";
+    width = 16;
+    sort = 1;
+    height = 20;
+    hangs = 0;
+    blocking = 0;
+
+    5549
+    {
+      title = "Amulet Of Warding Spawner";
+      sprite = "ARM4A0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5550
+    {
+      title = "Falcon Shield Spawner";
+      sprite = "ARM2A0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5551
+    {
+      title = "Mesh Armor Spawner";
+      sprite = "ARM1A0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5552
+    {
+      title = "Platinum Helm Spawner";
+      sprite = "ARM3A0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+  }
+
+  invpowerups
+  {
+    color = 14;  // Yellow
+    arrow = 0;
+    title = "Invasion Powerup Spawners";
+    width = 20;
+    sort = 1;
+    height = 45;
+    hangs = 0;
+    blocking = 0;
+
+    5444
+    {
+      title = "Icon Of The Defender Spawner";
+      sprite = "ARTIINVU";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5536
+    {
+      title = "Disc Of Repulsion Spawner";
+      sprite = "ARTIBLST";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5537
+    {
+      title = "Dragonskin Bracers Spawner";
+      sprite = "ARTIBRAC";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5538
+    {
+      title = "Krater Of Might Spawner";
+      sprite = "ARTIBMAN";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5539
+    {
+      title = "Dark Servant Spawner";
+      sprite = "ARTISUMN";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5540
+    {
+      title = "Mystic Ambit Incant Spawner";
+      sprite = "ARTIHRAD";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5541
+    {
+      title = "Flechette Spawner";
+      sprite = "ARTIPSBG";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5542
+    {
+      title = "Poison Cloud Flechette Spawner";
+      sprite = "ARTIPSBG";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5543
+    {
+      title = "Delayed Blast Flechette Spawner";
+      sprite = "ARTIPSBG";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5544
+    {
+      title = "Bouncing Grenade Flechette Spawner";
+      sprite = "ARTIPSBG";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5545
+    {
+      title = "Porkelator Spawner";
+      sprite = "ARTIPORK";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5546
+    {
+      title = "Boots Of Speed Spawner";
+      sprite = "ARTISPED";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5547
+    {
+      title = "Banishment Device Spawner";
+      sprite = "ARTITELO";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+  }
+
+
+  invrandom
+  {
+    color = 14;  // Yellow
+    arrow = 0;
+    title = "Invasion Random Spawners";
+    width = 20;
+    sort = 1;
+    height = 25;
+    hangs = 0;
+    blocking = 0;
+
+    5519
+    {
+      title = "Random Deathking Spawner";
+      sprite = "CLERE8";
+      width = 16;
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5526
+    {
+      title = "Random Weapon Piece Spawner";
+      sprite = "WFR2A0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5527
+    {
+      title = "Random Wraithverge Piece Spawner";
+      sprite = "WCH3A0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5528
+    {
+      title = "Random Quietus Piece Spawner";
+      sprite = "WFR3A0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5529
+    {
+      title = "Random BloodScourge Piece Spawner";
+      sprite = "WMS3A0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5548
+    {
+      title = "Random Artifact Spawner";
+      sprite = "ARTIATLP";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5553
+    {
+      title = "Random Flechette Spawner";
+      sprite = "ARTIPSBG";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5563
+    {
+      title = "Cleric Weapon Spawner";
+      sprite = "WCSSA0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5564
+    {
+      title = "Fighter Weapon Spawner";
+      sprite = "WFAXA0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5565
+    {
+      title = "Mage Weapon Spawner";
+      sprite = "WMCSA0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5566
+    {
+      title = "Blue Mana Weapon Spawner";
+      sprite = "WCSSA0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5567
+    {
+      title = "Green Mana Weapon Spawner";
+      sprite = "WFHMA0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5568
+    {
+      title = "Weak Monster Spawner";
+      sprite = "FDMNA1";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5569
+    {
+      title = "Tough Monster Spawner";
+      sprite = "BISHA1";
+      width = 22;
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5570
+    {
+      title = "Random Monster Spawner";
+      sprite = "DEMNA1";
+      width = 32;
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5571
+    {
+      title = "Phantasmal Monster Spawner";
+      sprite = "CENTA1";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+  }
+}
+
+// New things available in both Raven Software games
+raven
+{
+  // The stalagmite is only defined for Doom in ZDoom, but it 
+  // is also defined for Heretic and Hexen in Zandronum.
+  obstacles
+  {
+    color = 3;  // Cyan
+    arrow = 0;
+    title = "Obstacles";
+    width = 20;
+    sort = 1;
+    height = 20;
+    hangs = 0;
+    blocking = 2;
+    error = 2;
+    
+    5050 // Stalagmite
+    {
+      title = "Stalagmite";
+      sprite = "SMT2A0";
+      width = 16;
+      height = 48;
+    }
+  }
+
+  invmonsters
+  {
+    color = 14;  // Yellow
+    arrow = 1;
+    title = "Invasion Monster Spawners";
+    width = 20;
+    sort = 1;
+    height = 56;
+    hangs = 0;
+    blocking = 2;
+    error = 2;
+
+    5500
+    {
+      title = "Friendly Allied Minotaur Spawner";
+      sprite = "MNTRA1";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+  }
+  
+  invhealth
+  {
+    color = 14;  // Yellow
+    arrow = 0;
+    title = "Invasion Health and Armor Spawners";
+    width = 16;
+    sort = 1;
+    height = 20;
+    hangs = 0;
+    blocking = 0;
+
+    5439
+    {
+      title = "Crystal Vial Spawner";
+      sprite = "PTN1A0";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+  }
+
+  invpowerups
+  {
+    color = 14;  // Yellow
+    arrow = 0;
+    title = "Invasion Powerup Spawners";
+    width = 20;
+    sort = 1;
+    height = 45;
+    hangs = 0;
+    blocking = 0;
+
+    5441
+    {
+      title = "Wings Of Wrath Spawner";
+      sprite = "ARTISOAR";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5442
+    {
+      title = "Quartz Flask Spawner";
+      sprite = "ARTIPTN2";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5445
+    {
+      title = "Mystic Urn Spawner";
+      sprite = "ARTISPHL";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5446
+    {
+      title = "Chaos Device Spawner";
+      sprite = "ARTIATLP";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5449
+    {
+      title = "Torch Spawner";
+      sprite = "ARTITRCH";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+  }
+}
+
+// New things available only in Strife
+strife
+{
+  // All the invasion spawners
+  invmonsters
+  {
+    color = 14;  // Yellow
+    arrow = 1;
+    title = "Invasion Monster Spawners";
+    width = 20;
+    sort = 1;
+    height = 56;
+    hangs = 0;
+    blocking = 2;
+    error = 2;
+
+    5600
+    {
+      title="Acolyte spawner";
+      sprite= "AGRDA2";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5601
+    {
+      title="Acolyte spawner (tan)";
+      sprite= "AGRDA2";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5602
+    {
+      title="Acolyte spawner (red)";
+      sprite= "AGRDA2";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5603
+    {
+      title="Acolyte spawner (rust)";
+      sprite= "AGRDA2";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5604
+    {
+      title="Acolyte spawner (gray)";
+      sprite= "AGRDA2";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5605
+    {
+      title="Acolyte spawner (dark green)";
+      sprite= "AGRDA2";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5606
+    {
+      title="Acolyte spawner (gold)";
+      sprite= "AGRDA2";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5607
+    {
+      title="Acolyte spawner (light green)";
+      sprite= "AGRDA2";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5608
+    {
+      title="Acolyte spawner (blue)";
+      sprite= "AGRDA2";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5609
+    {
+      title="Acolyte spawner (shadow)";
+      sprite= "AGRDA2";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5610
+    {
+      title="Random Acolyte spawner";
+      sprite= "AGRDA2";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5611
+    {
+      title="Sentinel Spawner";
+      sprite= "SEWRA8A2";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+        width = 23;
+    }
+    5612
+    {
+      title="Crusader Spawner";
+      sprite= "ROB2A2";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5613
+    {
+      title="Inquisitor Spawner";
+      sprite= "ROB3A2";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+        width = 40;
+    }
+    5614
+    {
+      title="Stalker Spawner";
+      sprite= "SPIDJ2";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+        width = 31;
+    }
+    5615
+    {
+      title="Ceiling Turret Spawner";
+      sprite= "TURTA8A2";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+        width = 20;
+    }
+    5616
+    {
+      title="Templar Spawner";
+      sprite= "PGRDA2";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+    }
+    5617
+    {
+      title="Reaver Spawner";
+      sprite= "ROB1A2";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+        width = 20;
+    }
+    5618
+    {
+      title="Random Small Robot Spawner";
+      sprite= "SEWRA8A2";
+      include("Zandronum_misc.cfg", "invasionspawnerargs");
+		    width = 31;
+		}
+		5619
+		{
+			title="Random Medium Robot Spawner";
+			sprite= "ROB2A2";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		    width = 40;
+		}
+		5620
+		{
+			title="Random Robot Spawner";
+			sprite= "ROB3A2";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		    width = 40;
+		}
+		5621
+		{
+			title="Bishop Spawner";
+			sprite= "MLDRA2";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		    width = 40;
+		}
+		5622
+		{
+			title="Programmer Spawner";
+			sprite= "PRGRD0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		    width = 45;
+		}
+		5623
+		{
+			title="Loremaster Spawner";
+			sprite= "PRSTA2";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		    width = 15;
+		}
+		5624
+		{
+			title="Entity Spawner";
+			sprite= "MNALA0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		    width = 130;
+		}
+		5625
+		{
+			title="Sub-Entity Spawner";
+			sprite= "MNALA0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		    width = 130;
+		}
+		5626
+		{
+			title="Spectre 1 Spawner";
+			sprite= "ALN1A0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+			width = 64;
+		}
+		5627
+		{
+			title="Spectre 2 Spawner";
+			sprite= "ALN1A0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+			width = 64;
+		}
+		5628
+		{
+			title="Spectre 3 Spawner";
+			sprite= "ALN1A0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+			width = 64;
+		}
+		5629
+		{
+			title="Spectre 4 Spawner";
+			sprite= "ALN1A0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+			width = 64;
+		}
+		5630
+		{
+			title="Spectre 5 Spawner";
+			sprite= "ALN1A0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+			width = 64;
+		}
+		5631
+		{
+			title="Random Spectre Spawner";
+			sprite= "ALN1A0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+			width = 64;
+		}
+	}
+
+	invweapons
+	{
+		color = 14;	// Yellow
+		arrow = 0;
+		title = "Invasion Weapon Spawners";
+		width = 20;
+		sort = 1;
+		height = 25;
+		hangs = 0;
+		blocking = 0;
+
+		5632
+		{
+			title="Crossbow Spawner";
+			sprite= "CBOWA0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		}
+		5633
+		{
+			title="Assault Gun Spawner";
+			sprite= "RIFLA0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		}
+		5634
+		{
+			title="Assault Gun (Standing) Spawner";
+			sprite= "RIFLB0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		}
+		5635
+		{
+			title="Random Assault Gun Spawner";
+			sprite= "RIFLB0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		}
+		5636
+		{
+			title="Mini-Missile Launcher Spawner";
+			sprite= "MMSLA0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		}
+		5637
+		{
+			title="Flame Thrower Spawner";
+			sprite= "FLAMA0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		}
+		5638
+		{
+			title="Mauler Spawner";
+			sprite= "TRPDA0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		}
+		5639
+		{
+			title="Grenade Launcher Spawner";
+			sprite= "GRNDA0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		}
+		5640
+		{
+			title="Sigil 1 Spawner";
+			sprite= "SIGLA0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		}
+		5641
+		{
+			title="Sigil 2 Spawner";
+			sprite= "SIGLB0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		}
+		5642
+		{
+			title="Sigil 3 Spawner";
+			sprite= "SIGLC0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		}
+		5643
+		{
+			title="Sigil 4 Spawner";
+			sprite= "SIGLD0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		}
+		5644
+		{
+			title="Sigil 5 Spawner";
+			sprite= "SIGLE0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		}
+		5645
+		{
+			title="Random Sigil Spawner";
+			sprite= "SIGLE0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		}
+	}
+
+	invammunition
+	{
+		color = 14;	// Yellow
+		arrow = 0;
+		title = "Invasion Ammunition Spawners";
+		width = 16;
+		sort = 1;
+		height = 20;
+		blocking = 0;
+		hangs = 0;
+
+		5646
+		{
+			title="High Explosive Grenade Rounds Spawner";
+			sprite= "GRN1A0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		}
+		5647
+		{
+			title="Phosphorous Grenade Rounds Spawner";
+			sprite= "GRN2A0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		}
+		5648
+		{
+			title="Random Grenade Rounds Spawner";
+			sprite= "GRN1A0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		}
+		5649
+		{
+			title="Bullet Clip Spawner";
+			sprite= "BLITA0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		}
+		5650
+		{
+			title="Bullet Box Spawner";
+			sprite= "BBOXA0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		}
+		5651
+		{
+			title="Bullet Spawner";
+			sprite= "BBOXA0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		}
+		5652
+		{
+			title="Mini Missiles Spawner";
+			sprite= "MSSLA0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		}
+		5653
+		{
+			title="Missile Crate Spawner";
+			sprite= "ROKTA0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		}
+		5654
+		{
+			title="Random Missiles Spawner";
+			sprite= "MSSLA0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		}
+		5655
+		{
+			title="Energy Pod Spawner";
+			sprite= "BRY1A0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		}
+		5656
+		{
+			title="Energy Pack Spawner";
+			sprite= "CPACA0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		}
+		5657
+		{
+			title="Random Energy Spawner";
+			sprite= "BRY1A0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		}
+		5658
+		{
+			title="Poison Bolts Spawner";
+			sprite= "PQRLA0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		}
+		5659
+		{
+			title="Electric Bolts Spawner";
+			sprite= "XQRLA0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		}
+		5660
+		{
+			title="Random Bolts Spawner";
+			sprite= "XQRLA0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		}
+		5661
+		{
+			title="Ammo Satchel Spawner";
+			sprite= "BKPKA0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		}
+		5662
+		{
+			title="Large or Rare Ammo Spawner";
+			sprite= "PQRLA0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		}
+		5663
+		{
+			title="Small or Common Ammo Spawner";
+			sprite= "BLITA0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		}
+	}
+
+	invhealth
+	{
+		color = 14;	// Yellow
+		arrow = 0;
+		title = "Invasion Health and Armor Spawners";
+		width = 16;
+		sort = 1;
+		height = 20;
+		hangs = 0;
+		blocking = 0;
+
+		5664
+		{
+			title="Metal Armor Spawner";
+			sprite= "ARM1A0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		}
+		5665
+		{
+			title="Leather Armor Spawner";
+			sprite= "ARM2A0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		}
+		5667
+		{
+			title="Med Patch Spawner";
+			sprite= "STMPA0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		}
+		5668
+		{
+			title="Medkit Spawner";
+			sprite= "MDKTA0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		}
+		5669
+		{
+			title="Surgery Kit Spawner";
+			sprite= "FULLA0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		}
+		5675
+		{
+			title="Random Health Spawner";
+			sprite= "MDKTA0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		}
+		5676
+		{
+			title="Random Armor Spawner";
+			sprite= "ARM1A0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		}
+	}
+
+	invpowerups
+	{
+		color = 14;	// Yellow
+		arrow = 0;
+		title = "Invasion Powerup Spawners";
+		width = 20;
+		sort = 1;
+		height = 45;
+		hangs = 0;
+		blocking = 0;
+
+		5666
+		{
+			title="Teleport Beacon Spawner";
+			sprite= "BEACA0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		}
+		5670
+		{
+			title="Map Spawner";
+			sprite= "PMAPA0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		}
+		5671
+		{
+			title="Shadow Armor Spawner";
+			sprite= "SHD1A0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		}
+		5672
+		{
+			title="Environmental Suit Spawner";
+			sprite= "MASKA0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		}
+		5673
+		{
+			title="Targeter Spawner";
+			sprite= "TARGA0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		}
+		5674
+		{
+			title="Scanner Spawner";
+			sprite= "PMUPA0";
+			include("Zandronum_misc.cfg", "invasionspawnerargs");
+		}
+	}
+}
\ No newline at end of file
diff --git a/Build/Configurations/Includes/Strife_common.cfg b/Build/Configurations/Includes/Strife_common.cfg
new file mode 100644
index 0000000..650cc23
--- /dev/null
+++ b/Build/Configurations/Includes/Strife_common.cfg
@@ -0,0 +1,93 @@
+//mxd. These settings are used only in Vanilla Strife configuration.
+mapformat_doom
+{
+  // The format interface handles the map data format
+  formatinterface = "DoomMapSetIO";
+
+  maplumpnames
+  {
+    include("Doom_misc.cfg", "doommaplumpnames");
+  }
+
+  // When this is set to true, sectors with the same tag will light up when a line is highlighted
+  linetagindicatesectors = true;
+
+  // Special linedefs
+  include("ZDoom_misc.cfg", "speciallinedefs_doomhexen");
+
+  // Default flags for first new thing
+  defaultthingflags
+  {
+    include("Strife_misc.cfg", "mapformat_doom.defaultthingflags");
+  }
+	
+	// Door making
+  include("ZDoom_misc.cfg", "doormaking_doom");
+
+  // Generalized actions
+  generalizedlinedefs = false;
+  generalizedsectors = false;
+  
+  // DEFAULT SECTOR BRIGHTNESS LEVELS
+  sectorbrightness
+  {
+    include("Doom_misc.cfg", "sectorbrightness");
+  }
+	
+	// SECTOR TYPES
+  sectortypes
+  {
+		include("Strife_misc.cfg", "mapformat_doom.sectortypes");
+  }
+
+  // LINEDEF FLAGS
+  linedefflags
+	{
+		include("Doom_misc.cfg", "linedefflags");
+		include("Strife_misc.cfg", "mapformat_doom.linedefflags");
+	}
+
+	// LINEDEF ACTIVATIONS
+	linedefactivations
+	{
+	}
+
+	// Linedef flags UDMF translation table
+	// This is needed for copy/paste and prefabs to work properly
+	// When the UDMF field name is prefixed with ! it is inverted
+	linedefflagstranslation
+	{
+		include("Doom_misc.cfg", "linedefflagstranslation");
+		include("Strife_misc.cfg", "mapformat_doom.linedefflagstranslation");
+	}
+
+	// LINEDEF TYPES
+	linedeftypes
+	{
+		include("Strife_linedefs.cfg");
+	}
+
+	// THING FLAGS
+	thingflags
+	{
+		include("Strife_misc.cfg", "mapformat_doom.thingflags");
+	}
+
+	// Thing flags UDMF translation table
+	// This is needed for copy/paste and prefabs to work properly
+	// When the UDMF field name is prefixed with ! it is inverted
+	thingflagstranslation
+	{
+		include("Strife_misc.cfg", "mapformat_doom.thingflagstranslation");
+	}
+	
+		// How to compare thing flags (for the stuck things error checker)
+	thingflagscompare
+	{
+		include("Doom_misc.cfg", "thingflagscompare");
+	}
+
+	// Things flags masks
+	include("Strife_misc.cfg", "mapformat_doom.thingflagsmasks");
+
+}
\ No newline at end of file
diff --git a/Build/Configurations/Includes/Strife_linedefs.cfg b/Build/Configurations/Includes/Strife_linedefs.cfg
new file mode 100644
index 0000000..b50a06e
--- /dev/null
+++ b/Build/Configurations/Includes/Strife_linedefs.cfg
@@ -0,0 +1,1477 @@
+
+misc
+{
+	
+	0
+	{
+		title = "None";
+		prefix = "";
+	}
+	
+	title = "Misc";
+	
+	165
+	{
+		title = "Misc That Doesn't Seem to Work";
+		prefix = "DR";
+	}
+	
+	182
+	{
+		title = "Misc Break Screen";
+		prefix = "G1";
+	}
+	
+	205
+	{
+		title = "Misc Area Only in Retail Version";
+		prefix = "DR";
+	}
+	
+	218
+	{
+		title = "Misc Clear NonBlock Quest?";
+		prefix = "W1";
+	}
+	
+	666
+	{
+		title = "Misc Push Wall (may not work right)";
+		prefix = "SR";
+	}
+}
+
+
+door
+{
+	title = "Door";
+	
+	1
+	{
+		title = "Door Open Wait Close (also monsters)";
+		prefix = "DR";
+	}
+	
+	2
+	{
+		title = "Door Open Stay";
+		prefix = "W1";
+	}
+	
+	3
+	{
+		title = "Door Close Stay";
+		prefix = "W1";
+	}
+	
+	4
+	{
+		title = "Door Open Wait Close";
+		prefix = "W1";
+	}
+	
+	16
+	{
+		title = "Door Close Wait Open";
+		prefix = "W1";
+	}
+	
+	26
+	{
+		title = "Door Open Blue ID Badge, Wait 4, Close";
+		prefix = "DR";
+	}
+	
+	27
+	{
+		title = "Door Open Pass Card, Wait 4, Close";
+		prefix = "DR";
+	}
+	
+	28
+	{
+		title = "Door Open Gold ID Card, Wait 4, Close";
+		prefix = "DR";
+	}
+	
+	29
+	{
+		title = "Door Open Wait Close";
+		prefix = "S1";
+	}
+	
+	31
+	{
+		title = "Door Open Stay";
+		prefix = "D1";
+	}
+	
+	32
+	{
+		title = "Door Open Blue ID Badge, Stay Open";
+		prefix = "D1";
+	}
+	
+	33
+	{
+		title = "Door Open Gold ID Card, Stay Open";
+		prefix = "D1";
+	}
+	
+	34
+	{
+		title = "Door Open Pass Card, Stay Open";
+		prefix = "D1";
+	}
+	
+	40
+	{
+		title = "Door Open Split, floor down, ceiling up";
+		prefix = "S1";
+	}
+	
+	42
+	{
+		title = "Door Close Stay";
+		prefix = "SR";
+	}
+	
+	46
+	{
+		title = "Door Open Stay";
+		prefix = "GR";
+	}
+	
+	50
+	{
+		title = "Door Close Stay";
+		prefix = "S1";
+	}
+	
+	61
+	{
+		title = "Door Open Stay";
+		prefix = "SR";
+	}
+	
+	63
+	{
+		title = "Door Open Wait Close";
+		prefix = "SR";
+	}
+	
+	75
+	{
+		title = "Door Close Stay";
+		prefix = "WR";
+	}
+	
+	76
+	{
+		title = "Door Close Stay Open";
+		prefix = "WR";
+	}
+	
+	86
+	{
+		title = "Door Open Stay";
+		prefix = "WR";
+	}
+	
+	90
+	{
+		title = "Door Open Wait Close";
+		prefix = "WR";
+	}
+	
+	99
+	{
+		title = "Door Open Blue ID Badge Fast, Stay Open";
+		prefix = "SR";
+	}
+	
+	103
+	{
+		title = "Door Open Stay";
+		prefix = "S1";
+	}
+	
+	105
+	{
+		title = "Door Open Wait Close (fast)";
+		prefix = "WR";
+	}
+	
+	106
+	{
+		title = "Door Open Stay (fast)";
+		prefix = "WR";
+	}
+	
+	107
+	{
+		title = "Door Close Stay (fast)";
+		prefix = "WR";
+	}
+	
+	108
+	{
+		title = "Door Open Wait Close (fast)";
+		prefix = "W1";
+	}
+	
+	109
+	{
+		title = "Door Open Stay (fast)";
+		prefix = "W1";
+	}
+	
+	110
+	{
+		title = "Door Close (fast)";
+		prefix = "W1";
+	}
+	
+	111
+	{
+		title = "Door Open Wait Close (fast)";
+		prefix = "S1";
+	}
+	
+	112
+	{
+		title = "Door Open Stay (fast)";
+		prefix = "S1";
+	}
+	
+	113
+	{
+		title = "Door Close Stay (fast)";
+		prefix = "S1";
+	}
+	
+	114
+	{
+		title = "Door Open Wait Close (fast)";
+		prefix = "SR";
+	}
+	
+	115
+	{
+		title = "Door Open Stay (fast)";
+		prefix = "SR";
+	}
+	
+	116
+	{
+		title = "Door Close Stay (fast)";
+		prefix = "SR";
+	}
+	
+	117
+	{
+		title = "Door Open Wait Close (fast)";
+		prefix = "DR";
+	}
+	
+	118
+	{
+		title = "Door Open Stay (fast)";
+		prefix = "D1";
+	}
+	
+	133
+	{
+		title = "Door Open Blue ID Badge Fast, Stay Open";
+		prefix = "S1";
+	}
+	
+	134
+	{
+		title = "Door Open Gold ID Card Fast, Stay Open";
+		prefix = "SR";
+	}
+	
+	135
+	{
+		title = "Door Open Gold ID Card Fast, Stay Open";
+		prefix = "S1";
+	}
+	
+	136
+	{
+		title = "Door Open Pass Card Fast, Stay Open";
+		prefix = "SR";
+	}
+	
+	137
+	{
+		title = "Door Open Pass Card Fast, Stay Open";
+		prefix = "S1";
+	}
+	
+	144
+	{
+		title = "Door Open Sliding (special texture)";
+		prefix = "DR";
+	}
+	
+	151
+	{
+		title = "Door Open Gold Key Fast, Stay Open";
+		prefix = "SR";
+	}
+	
+	152
+	{
+		title = "Door Open Brass Key Fast, Stay Open";
+		prefix = "SR";
+	}
+	
+	153
+	{
+		title = "Door Open Silver Key Fast, Stay Open";
+		prefix = "SR";
+	}
+	
+	156
+	{
+		title = "Door Open Brass Key, Stay Open";
+		prefix = "D1";
+	}
+	
+	157
+	{
+		title = "Door Open Silver Key, Stay Open";
+		prefix = "D1";
+	}
+	
+	158
+	{
+		title = "Door Open Gold Key, Stay Open";
+		prefix = "D1";
+	}
+	
+	159
+	{
+		title = "Door Open Gold Key, Wait 4, Close";
+		prefix = "DR";
+	}
+	
+	160
+	{
+		title = "Door Open Silver Key, Wait 4, Close";
+		prefix = "DR";
+	}
+	
+	161
+	{
+		title = "Door Open Brass Key, Wait, Close";
+		prefix = "DR";
+	}
+	
+	162
+	{
+		title = "Door Open Brass Key Fast, Stay Open";
+		prefix = "S1";
+	}
+	
+	163
+	{
+		title = "Door Open Silver Key Fast, Stay Open";
+		prefix = "S1";
+	}
+	
+	164
+	{
+		title = "Door Open Gold Key Fast, Stay Open";
+		prefix = "S1";
+	}
+	
+	166
+	{
+		title = "Door Open Severed Hand, Wait 4, Close";
+		prefix = "DR";
+	}
+	
+	167
+	{
+		title = "Door Open Severed Hand Fast, Stay Open";
+		prefix = "S1";
+	}
+	
+	168
+	{
+		title = "Door Open Severed Hand Fast, Stay Open";
+		prefix = "SR";
+	}
+	
+	169
+	{
+		title = "Door Open Front Base Key, Wait, Close";
+		prefix = "DR";
+	}
+	
+	170
+	{
+		title = "Door Open Govs Key, Wait, Close";
+		prefix = "DR";
+	}
+	
+	171
+	{
+		title = "Door Open Prison Key & Stay";
+		prefix = "S1";
+	}
+	
+	172
+	{
+		title = "Door Open Power 1 Key, Wait, Close";
+		prefix = "SR";
+	}
+	
+	173
+	{
+		title = "Door Open Power 2 Key, Wait, Close";
+		prefix = "SR";
+	}
+	
+	174
+	{
+		title = "Door Open Split, floor down, ceiling up";
+		prefix = "W1";
+	}
+	
+	176
+	{
+		title = "Door Open Power 3 Key, Wait, Close";
+		prefix = "SR";
+	}
+	
+	188
+	{
+		title = "Door Open if Piston destroyed/DM";
+		prefix = "W1";
+	}
+	
+	189
+	{
+		title = "Door Open Split Oracle Key";
+		prefix = "S1";
+	}
+	
+	190
+	{
+		title = "Door Open Order Key, Wait 4, Close";
+		prefix = "DR";
+	}
+	
+	191
+	{
+		title = "Door Open Military ID, Wait, Close";
+		prefix = "SR";
+	}
+	
+	192
+	{
+		title = "Door Open WareHouse Key, Wait, Close";
+		prefix = "SR";
+	}
+	
+	194
+	{
+		title = "Door Open Give QT1, Freed Prisoners";
+		prefix = "S1";
+	}
+	
+	197
+	{
+		title = "Door Close Fast Sigil B";
+		prefix = "W1";
+	}
+	
+	200
+	{
+		title = "Door Open Sigil A";
+		prefix = "W1";
+	}
+	
+	207
+	{
+		title = "Door Open Sliding (special texture)";
+		prefix = "SR";
+	}
+	
+	213
+	{
+		title = "Door Open Chalice, Wait 4, Close";
+		prefix = "DR";
+	}
+	
+	216
+	{
+		title = "Door Open Quest, Wait 4, Close?";
+		prefix = "WR";
+	}
+	
+	217
+	{
+		title = "Door Open Core Key, Wait 4, Close";
+		prefix = "DR";
+	}
+	
+	221
+	{
+		title = "Door Open Mauler Key, Wait 4, Close";
+		prefix = "DR";
+	}
+	
+	222
+	{
+		title = "Door Open Factory Key, Wait, Close";
+		prefix = "SR";
+	}
+	
+	223
+	{
+		title = "Door Open Mine Key, Wait, Close";
+		prefix = "SR";
+	}
+	
+	224
+	{
+		title = "Door Open Chapel Key, Wait, Close";
+		prefix = "DR";
+	}
+	
+	225
+	{
+		title = "Door Open Catabomb Key, Wait, Close";
+		prefix = "DR";
+	}
+	
+	227
+	{
+		title = "Door Close Quest";
+		prefix = "W1";
+	}
+	
+	229
+	{
+		title = "Door Open Sliding SigilE (special texture)";
+		prefix = "SR";
+	}
+	
+	230
+	{
+		title = "Door Open Quest? WRONG";
+		prefix = "W1";
+	}
+	
+	232
+	{
+		title = "Door Open Oracle Pass, Wait 4, Close";
+		prefix = "DR";
+	}
+	
+	233
+	{
+		title = "Door Open Split, Blackbird Message";
+		prefix = "S1";
+	}
+	
+	234
+	{
+		title = "Door Open Quest/DM";
+		prefix = "SR";
+	}
+	
+	235
+	{
+		title = "Door Open Split Sigil E";
+		prefix = "S1";
+	}
+}
+
+
+floor
+{
+	title = "Floor";
+	
+	5
+	{
+		title = "Floor Raise to Lowest Ceiling";
+		prefix = "W1";
+	}
+	
+	9
+	{
+		title = "Floor Raise Donut (changes texture)";
+		prefix = "S1";
+	}
+	
+	14
+	{
+		title = "Floor Raise by 32 (changes texture)";
+		prefix = "S1";
+	}
+	
+	15
+	{
+		title = "Floor Raise by 24 (changes texture)";
+		prefix = "S1";
+	}
+	
+	18
+	{
+		title = "Floor Raise to Next Higher Floor";
+		prefix = "S1";
+	}
+	
+	19
+	{
+		title = "Floor Lower to Highest Floor";
+		prefix = "W1";
+	}
+	
+	20
+	{
+		title = "Floor Raise to Next Higher Floor (changes texture)";
+		prefix = "S1";
+	}
+	
+	22
+	{
+		title = "Floor Raise to Next Higher Floor (changes texture)";
+		prefix = "W1";
+	}
+	
+	23
+	{
+		title = "Floor Lower to Lowest Floor";
+		prefix = "S1";
+	}
+	
+	24
+	{
+		title = "Floor Raise to Lowest Ceiling";
+		prefix = "G1";
+	}
+	
+	30
+	{
+		title = "Floor Raise by Shortest Lower Texture";
+		prefix = "W1";
+	}
+	
+	36
+	{
+		title = "Floor Lower to 8 above Highest Floor";
+		prefix = "W1";
+	}
+	
+	37
+	{
+		title = "Floor Lower to Lowest Floor (changes texture)";
+		prefix = "W1";
+	}
+	
+	38
+	{
+		title = "Floor Lower to Lowest Floor";
+		prefix = "W1";
+	}
+	
+	45
+	{
+		title = "Floor Lower to Highest Floor";
+		prefix = "SR";
+	}
+	
+	47
+	{
+		title = "Floor Raise to Next Higher Floor (changes texture)";
+		prefix = "G1";
+	}
+	
+	53
+	{
+		title = "Floor Start Moving Up and Down";
+		prefix = "W1";
+	}
+	
+	54
+	{
+		title = "Floor Stop Moving";
+		prefix = "W1";
+	}
+	
+	55
+	{
+		title = "Floor Raise to 8 below Lowest Ceiling (crushes)";
+		prefix = "S1";
+	}
+	
+	56
+	{
+		title = "Floor Raise to 8 below Lowest Ceiling (crushes)";
+		prefix = "W1";
+	}
+	
+	58
+	{
+		title = "Floor Raise by 24";
+		prefix = "W1";
+	}
+	
+	59
+	{
+		title = "Floor Raise by 24 (changes texture)";
+		prefix = "W1";
+	}
+	
+	60
+	{
+		title = "Floor Lower to Lowest Floor";
+		prefix = "SR";
+	}
+	
+	64
+	{
+		title = "Floor Raise to Lowest Ceiling";
+		prefix = "SR";
+	}
+	
+	65
+	{
+		title = "Floor Raise to 8 below Lowest Ceiling (crushes)";
+		prefix = "SR";
+	}
+	
+	66
+	{
+		title = "Floor Raise by 24 (changes texture)";
+		prefix = "SR";
+	}
+	
+	67
+	{
+		title = "Floor Raise by 32 (changes texture)";
+		prefix = "SR";
+	}
+	
+	68
+	{
+		title = "Floor Raise to Next Higher Floor (changes texture)";
+		prefix = "SR";
+	}
+	
+	69
+	{
+		title = "Floor Raise to Next Higher Floor";
+		prefix = "SR";
+	}
+	
+	70
+	{
+		title = "Floor Lower to 8 above Highest Floor";
+		prefix = "SR";
+	}
+	
+	71
+	{
+		title = "Floor Lower to 8 above Highest Floor";
+		prefix = "S1";
+	}
+	
+	82
+	{
+		title = "Floor Lower to Lowest Floor";
+		prefix = "WR";
+	}
+	
+	83
+	{
+		title = "Floor Lower to Highest Floor";
+		prefix = "WR";
+	}
+	
+	84
+	{
+		title = "Floor Lower to Lowest Floor (changes texture)";
+		prefix = "WR";
+	}
+	
+	87
+	{
+		title = "Floor Start Moving Up and Down";
+		prefix = "WR";
+	}
+	
+	89
+	{
+		title = "Floor Stop Moving";
+		prefix = "WR";
+	}
+	
+	91
+	{
+		title = "Floor Raise to Lowest Ceiling";
+		prefix = "WR";
+	}
+	
+	92
+	{
+		title = "Floor Raise by 24";
+		prefix = "WR";
+	}
+	
+	93
+	{
+		title = "Floor Raise by 24 (changes texture)";
+		prefix = "WR";
+	}
+	
+	94
+	{
+		title = "Floor Raise to 8 below Lowest Ceiling (crushes)";
+		prefix = "WR";
+	}
+	
+	95
+	{
+		title = "Floor Raise to Next Higher Floor (changes texture)";
+		prefix = "WR";
+	}
+	
+	96
+	{
+		title = "Floor Raise by Shortest Lower Texture";
+		prefix = "WR";
+	}
+	
+	98
+	{
+		title = "Floor Lower to 8 above Highest Floor";
+		prefix = "WR";
+	}
+	
+	101
+	{
+		title = "Floor Raise to Lowest Ceiling";
+		prefix = "S1";
+	}
+	
+	102
+	{
+		title = "Floor Lower to Highest Floor";
+		prefix = "S1";
+	}
+	
+	119
+	{
+		title = "Floor Raise to Next Higher Floor";
+		prefix = "W1";
+	}
+	
+	128
+	{
+		title = "Floor Raise to Next Higher Floor";
+		prefix = "WR";
+	}
+	
+	129
+	{
+		title = "Floor Raise to Next Higher Floor (fast)";
+		prefix = "WR";
+	}
+	
+	130
+	{
+		title = "Floor Raise to Next Higher Floor (fast)";
+		prefix = "W1";
+	}
+	
+	131
+	{
+		title = "Floor Raise to Next Higher Floor (fast)";
+		prefix = "S1";
+	}
+	
+	132
+	{
+		title = "Floor Raise to Next Higher Floor (fast)";
+		prefix = "SR";
+	}
+	
+	140
+	{
+		title = "Floor Raise by 512";
+		prefix = "S1";
+	}
+	
+	180
+	{
+		title = "Floor Raise 512 match adjacent text/type";
+		prefix = "G1";
+	}
+	
+	181
+	{
+		title = "Floor Raise 512 match adjacent text/type";
+		prefix = "S1";
+	}
+	
+	183
+	{
+		title = "Floor Raise High Lower Ceiling Low Adj Instant";
+		prefix = "W1";
+	}
+	
+	193
+	{
+		title = "Floor Lower Quest/DM";
+		prefix = "W1";
+	}
+	
+	212
+	{
+		title = "Floor Lower to nearest Comm Unit?";
+		prefix = "S1";
+	}
+	
+	214
+	{
+		title = "Floor Lower for 30 sec, raise back up";
+		prefix = "SR";
+	}
+	
+	219
+	{
+		title = "Floor Lower Red Crystal";
+		prefix = "S1";
+	}
+	
+	220
+	{
+		title = "Floor Lower Blue Crystal";
+		prefix = "S1";
+	}
+	
+	226
+	{
+		title = "Floor Lower to low adj, give Stat Bonus";
+		prefix = "S1";
+	}
+}
+
+
+crusher
+{
+	title = "Crusher";
+	
+	6
+	{
+		title = "Crusher Start with Fast Damage";
+		prefix = "W1";
+	}
+	
+	25
+	{
+		title = "Crusher Start with Slow Damage";
+		prefix = "W1";
+	}
+	
+	57
+	{
+		title = "Crusher Stop";
+		prefix = "W1";
+	}
+	
+	73
+	{
+		title = "Crusher Start with Slow Damage";
+		prefix = "WR";
+	}
+	
+	74
+	{
+		title = "Crusher Stop";
+		prefix = "WR";
+	}
+	
+	77
+	{
+		title = "Crusher Start with Fast Damage";
+		prefix = "WR";
+	}
+	
+	141
+	{
+		title = "Crusher Start with Slow Damage (silent)";
+		prefix = "W1";
+	}
+}
+
+
+stairs
+{
+	title = "Stairs";
+	
+	7
+	{
+		title = "Stairs Raise by 8";
+		prefix = "S1";
+	}
+	
+	8
+	{
+		title = "Stairs Raise by 8";
+		prefix = "W1";
+	}
+	
+	127
+	{
+		title = "Stairs Raise by 16 (fast)";
+		prefix = "S1";
+	}
+	
+	146
+	{
+		title = "Stairs Lower";
+		prefix = "S1";
+	}
+	
+	178
+	{
+		title = "Stairs Lower";
+		prefix = "W1";
+	}
+	
+	209
+	{
+		title = "Stairs Lower Chalice";
+		prefix = "S1";
+	}
+}
+
+
+lift
+{
+	title = "Lift";
+	
+	10
+	{
+		title = "Lift Lower Wait Raise";
+		prefix = "W1";
+	}
+	
+	21
+	{
+		title = "Lift Lower Wait Raise";
+		prefix = "S1";
+	}
+	
+	62
+	{
+		title = "Lift Lower Wait Raise";
+		prefix = "SR";
+	}
+	
+	88
+	{
+		title = "Lift Lower Wait Raise";
+		prefix = "WR";
+	}
+	
+	120
+	{
+		title = "Lift Lower Wait Raise (fast)";
+		prefix = "WR";
+	}
+	
+	121
+	{
+		title = "Lift Lower Wait Raise (fast)";
+		prefix = "W1";
+	}
+	
+	122
+	{
+		title = "Lift Lower Wait Raise (fast)";
+		prefix = "S1";
+	}
+	
+	123
+	{
+		title = "Lift Lower Wait Raise (fast)";
+		prefix = "SR";
+	}
+	
+	154
+	{
+		title = "Lift Lower Gold Key, Wait, Raise";
+		prefix = "SR";
+	}
+	
+	155
+	{
+		title = "Lift Raise, Wait, Lower";
+		prefix = "SR";
+	}
+	
+	177
+	{
+		title = "Lift Lower Power 3 Key, Wait, Up";
+		prefix = "SR";
+	}
+	
+	184
+	{
+		title = "Lift Raise, Wait, Lower";
+		prefix = "WR";
+	}
+}
+
+
+exit
+{
+	title = "Exit";
+	
+	11
+	{
+		title = "Exit Level (tag = map to go to)";
+		prefix = "S1";
+	}
+	
+	51
+	{
+		title = "Exit Level (secret exit)";
+		prefix = "S1";
+	}
+	
+	52
+	{
+		title = "Exit Level (go to next map)";
+		prefix = "W1";
+	}
+	
+	124
+	{
+		title = "Exit Level (secret exit)";
+		prefix = "W1";
+	}
+	
+	145
+	{
+		title = "Exit Teleport to New Map Thing, tag=map&spot";
+		prefix = "WR";
+	}
+	
+	186
+	{
+		title = "Exit Teleport to New Map Thing 1-Way, tag=map&spot";
+		prefix = "WR";
+	}
+}
+
+
+light
+{
+	title = "Light";
+	
+	12
+	{
+		title = "Light Change to Brightest Adjacent";
+		prefix = "W1";
+	}
+	
+	13
+	{
+		title = "Light Change to Brightest";
+		prefix = "W1";
+	}
+	
+	17
+	{
+		title = "Light Start Blinking";
+		prefix = "W1";
+	}
+	
+	35
+	{
+		title = "Light Change to Darkest";
+		prefix = "W1";
+	}
+	
+	79
+	{
+		title = "Light Change to Darkest";
+		prefix = "WR";
+	}
+	
+	80
+	{
+		title = "Light Change to Brightest Adjacent";
+		prefix = "WR";
+	}
+	
+	81
+	{
+		title = "Light Change to Brightest";
+		prefix = "WR";
+	}
+	
+	104
+	{
+		title = "Light Change to Darkest Adjacent";
+		prefix = "W1";
+	}
+	
+	138
+	{
+		title = "Light Change to Brightest";
+		prefix = "SR";
+	}
+	
+	139
+	{
+		title = "Light Change to Darkest";
+		prefix = "SR";
+	}
+}
+
+
+ceiling
+{
+	title = "Ceiling";
+	
+	41
+	{
+		title = "Ceiling Lower to Floor";
+		prefix = "S1";
+	}
+	
+	43
+	{
+		title = "Ceiling Lower to Floor";
+		prefix = "SR";
+	}
+	
+	44
+	{
+		title = "Ceiling Lower to 8 above Floor";
+		prefix = "W1";
+	}
+	
+	49
+	{
+		title = "Ceiling Lower to 8 above Floor";
+		prefix = "S1";
+	}
+	
+	72
+	{
+		title = "Ceiling Lower to 8 above Floor";
+		prefix = "WR";
+	}
+	
+	179
+	{
+		title = "Ceiling Lower to floor";
+		prefix = "W1";
+	}
+	
+	199
+	{
+		title = "Ceiling Crush Quest Factory, give Stats";
+		prefix = "S1";
+	}
+}
+
+
+scroll
+{
+	title = "Scroll";
+	
+	48
+	{
+		title = "Scroll Texture Left";
+		prefix = "";
+	}
+	
+	142
+	{
+		title = "Scroll Texture Up";
+		prefix = "";
+	}
+	
+	143
+	{
+		title = "Scroll Texture Down Fast";
+		prefix = "";
+	}
+	
+	149
+	{
+		title = "Scroll Texture Right";
+		prefix = "";
+	}
+}
+
+
+teleport
+{
+	title = "Teleport";
+	
+	97
+	{
+		title = "Teleport";
+		prefix = "WR";
+	}
+	
+	39
+	{
+		title = "Teleport";
+		prefix = "W1";
+	}
+	
+	125
+	{
+		title = "Teleport (monsters only)";
+		prefix = "W1";
+	}
+	
+	126
+	{
+		title = "Teleport (monsters only)";
+		prefix = "WR";
+	}
+	
+	185
+	{
+		title = "Teleport Target Silent";
+		prefix = "WR";
+	}
+	
+	195
+	{
+		title = "Teleport Silent, Change Zombie";
+		prefix = "MR";
+	}
+	
+	231
+	{
+		title = "Teleport Target InSou";
+		prefix = "WR";
+	}
+}
+
+
+forcefield
+{
+	title = "ForceField";
+	
+	147
+	{
+		title = "ForceField Remove Around Tagged Sector";
+		prefix = "SR";
+	}
+	
+	148
+	{
+		title = "ForceField (remove with 147)";
+		prefix = "";
+	}
+	
+	187
+	{
+		title = "ForceField Clear CrystalDestroyed/DM";
+		prefix = "W1";
+	}
+}
+
+
+sound
+{
+	title = "Sound";
+	
+	150
+	{
+		title = "Sound Alarm Claxon";
+		prefix = "WR";
+	}
+	
+	175
+	{
+		title = "Sound Alarm below 16";
+		prefix = "W1";
+	}
+	
+	198
+	{
+		title = "Sound Alarm without Guard Uniform";
+		prefix = "WR";
+	}
+	
+	201
+	{
+		title = "Sound Play Sound?";
+		prefix = "SR";
+	}
+	
+	202
+	{
+		title = "Sound Activate Comm Unit+tag=VOC#";
+		prefix = "W1";
+	}
+	
+	203
+	{
+		title = "Sound Play Music+tag=mus#";
+		prefix = "WR";
+	}
+	
+	204
+	{
+		title = "Sound Play Music+tag=mus#";
+		prefix = "W1";
+	}
+	
+	206
+	{
+		title = "Sound Alarm Chalice";
+		prefix = "W1";
+	}
+	
+	208
+	{
+		title = "Sound Trigger Alarm Comm?";
+		prefix = "W1";
+	}
+	
+	210
+	{
+		title = "Sound Activate Comm Unit+tag=????";
+		prefix = "W1";
+	}
+	
+	211
+	{
+		title = "Sound Play Sound?";
+		prefix = "S1";
+	}
+	
+	215
+	{
+		title = "Sound Play Quest Sound?";
+		prefix = "W1";
+	}
+	
+	228
+	{
+		title = "Sound Play Entity Voice";
+		prefix = "W1";
+	}
+}
+
diff --git a/Build/Configurations/Includes/Strife_misc.cfg b/Build/Configurations/Includes/Strife_misc.cfg
new file mode 100644
index 0000000..a2f4310
--- /dev/null
+++ b/Build/Configurations/Includes/Strife_misc.cfg
@@ -0,0 +1,142 @@
+
+// Basic Strife stuff.
+
+skills
+{
+	1 = "Training";
+	2 = "Rookie";
+	3 = "Veteran";
+	4 = "Elite";
+	5 = "Bloodbath";
+}
+
+//mxd. These are Strife-specific settings only.  
+//mxd. These settings are valid only in native Strife map format.
+mapformat_doom
+{
+	sectortypes
+	{
+		include("Strife_sectors.cfg");
+	}
+	
+	linedefflags
+	{
+		512 = "Jump over railing";
+		1024 = "Block floating monsters";
+		2048 = "Translucent (75% opacity)";
+		4096 = "Translucent (25% opacity)";
+	}
+
+	linedefflagstranslation
+	{
+		512 = "jumpover";
+		1024 = "blockfloating";
+		2048 = "translucent";
+		4096 = "transparent";
+	}
+
+	thingflags
+	{
+		1 = "Easy";
+		2 = "Medium";
+		4 = "Hard";
+		8 = "Stand still";
+		16 = "Multiplayer only";
+		32 = "Ambush players";
+		64 = "Friendly (Strife logic)";
+		256 = "Translucent (25%)";
+		512 = "Invisible";
+	}
+
+	// Thing flags UDMF translation table
+	// This is needed for copy/paste and prefabs to work properly
+	// When the UDMF field name is prefixed with ! it is inverted
+	thingflagstranslation
+	{
+		1 = "skill1,skill2";
+		2 = "skill3";
+		4 = "skill4,skill5";
+		8 = "standing";
+		16 = "!single";
+		32 = "ambush";
+		64 = "strifeally";
+		256 = "translucent";
+		512 = "invisible";
+	}
+
+	// Mask for the thing flags which indicates the options
+	// that make the same thing appear in the same modes
+	thingflagsmasks
+	{
+		thingflagsmask1 = 7;	// 1 + 2 + 4
+		thingflagsmask2 = 0;
+	}
+
+	// Default flags for first new thing
+	defaultthingflags
+	{
+		1;
+		2;
+		4;
+	}
+}
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	filter0
+	{
+		name = "Easy skill";
+		category = "";
+		type = -1;
+		
+		fields
+		{
+			1 = true;
+		}
+	}
+	
+	filter1
+	{
+		name = "Medium skill";
+		category = "";
+		type = -1;
+		
+		fields
+		{
+			2 = true;
+		}
+	}
+	
+	filter2
+	{
+		name = "Hard skill";
+		category = "";
+		type = -1;
+		
+		fields
+		{
+			4 = true;
+		}
+	}
+	
+	filter3
+	{
+		name = "Keys only";
+		category = "keys";
+		type = -1;
+	}
+	
+	filter4
+	{
+		name = "Multiplayer";
+		category = "";
+		type = -1;
+		
+		fields
+		{
+			16 = true;
+		}
+	}
+}
\ No newline at end of file
diff --git a/Build/Configurations/Includes/Strife_sectors.cfg b/Build/Configurations/Includes/Strife_sectors.cfg
new file mode 100644
index 0000000..11ad650
--- /dev/null
+++ b/Build/Configurations/Includes/Strife_sectors.cfg
@@ -0,0 +1,18 @@
+0 = "None";
+1 = "Light blink random";
+2 = "Light blink 0.5 second";
+3 = "Light blink 1 second";
+4 = "5% damage every 32 tics + light blink 0.5 sec.";
+5 = "Damage: +2 to nukagecount";
+7 = "Damage 5% every 32 tics";
+8 = "Light oscillate";
+9 = "Secret";
+10 = "Ceiling closes 30 seconds after level start";
+11 = "20% dmg. per sec. When player dies, level ends";
+12 = "Light blink 0.5 second, synchronized";
+13 = "Light blink 1 second, synchronized";
+14 = "Ceiling opens 5 minutes after level start";
+15 = "Instant death: 999% damage every tic";
+16 = "Damage: +4 to nukagecount";
+17 = "Light flicker random";
+18 = "Water current, tag controls angle and strength";
\ No newline at end of file
diff --git a/Build/Configurations/Includes/Strife_texturesets.cfg b/Build/Configurations/Includes/Strife_texturesets.cfg
new file mode 100644
index 0000000..e69de29
diff --git a/Build/Configurations/Includes/Strife_things.cfg b/Build/Configurations/Includes/Strife_things.cfg
new file mode 100644
index 0000000..03bef75
--- /dev/null
+++ b/Build/Configurations/Includes/Strife_things.cfg
@@ -0,0 +1,1664 @@
+players
+{
+	color = 10;	// Light Green
+	arrow = 1;
+	title = "Player Starts";
+	sprite = "PLAYA2";
+	width = 18;
+	height = 56;
+	sort = 1;
+	
+	1 = "Player 1 start";
+	2 = "Player 2 start";
+	3 = "Player 3 start";
+	4 = "Player 4 start";
+	5 = "Player 5 start";
+	6 = "Player 6 start";
+	7 = "Player 7 start";
+	8 = "Player 8 start";
+	
+	11
+	{
+		title = "Player Deathmatch start";
+		sprite = "PLAYF1";
+	}
+}
+
+teleports
+{
+	color = 2;	// Green
+	arrow = 1;
+	title = "Teleports";
+	sprite = "internal:Teleport";
+	width = 18;
+	sort = 1;
+	
+	14 = "Teleport Destination";
+	23
+	{
+		title = "Teleport Swirl";
+		width = 20;
+	}
+	118 = "Teleport New Map Spot 1";
+	119 = "Teleport New Map Spot 2";
+	120 = "Teleport New Map Spot 3";
+	121 = "Teleport New Map Spot 4";
+	122 = "Teleport New Map Spot 5";
+	123 = "Teleport New Map Spot 6";
+	124 = "Teleport New Map Spot 7";
+	125 = "Teleport New Map Spot 8";
+	126 = "Teleport New Map Spot 9";
+	127 = "Teleport New Map Spot 10";
+}
+
+monsters
+{
+	color = 12;	// Light Red
+	arrow = 1;
+	title = "Monsters";
+	width = 24;
+	sort = 1;
+	
+	3002
+	{
+		title = "Acolyte (tan)";
+		sprite = "AGRDA2";
+		height = 64;
+	}
+	
+	142
+	{
+		title = "Acolyte (red)";
+		sprite = "AGRDA2";
+		height = 64;
+	}
+	
+	143
+	{
+		title = "Acolyte (rust)";
+		sprite = "AGRDA2";
+		height = 64;
+	}
+	
+	146
+	{
+		title = "Acolyte (gray)";
+		sprite = "AGRDA2";
+		height = 64;
+	}
+	
+	147
+	{
+		title = "Acolyte (dark green)";
+		sprite = "AGRDA2";
+		height = 64;
+	}
+	
+	148
+	{
+		title = "Acolyte (gold)";
+		sprite = "AGRDA2";
+		height = 64;
+	}
+	
+	232
+	{
+		title = "Acolyte (bright green)";
+		sprite = "AGRDA2";
+		height = 64;
+	}
+	
+	231
+	{
+		title = "Acolyte (blue)";
+		sprite = "AGRDA2";
+		height = 64;
+	}
+	
+	58
+	{
+		title = "Acolyte (shadow armor)";
+		sprite = "AGRDA2";
+		height = 64;
+	}
+	
+	3006
+	{
+		title = "Sentinel";
+		sprite = "SEWRA8A2";
+		width = 23;
+		height = 53;
+	}
+	
+	186
+	{
+		title = "Stalker";
+		sprite = "SPIDJ2";
+		width = 31;
+		height = 25;
+	}
+	
+	27
+	{
+		title = "Ceiling Turret";
+		sprite = "TURTA8A2";
+		width = 20;
+		height = 20;
+		hangs = 1;
+		blocking = 0;
+	}
+	
+	3001
+	{
+		title = "Reaver";
+		sprite = "ROB1C2";
+		width = 20;
+		height = 60;
+	}
+	
+	3005
+	{
+		title = "Crusader";
+		sprite = "ROB2A2";
+		width = 40;
+		height = 56;
+	}
+	
+	3003
+	{
+		title = "Templar";
+		sprite = "PGRDE2";
+		width = 20;
+		height = 60;
+	}
+	
+	16
+	{
+		title = "Inquisitor";
+		sprite = "ROB3A2";
+		width = 40;
+		height = 110;
+	}
+	
+	71
+	{
+		title = "Programmer";
+		sprite = "PRGRD0";
+		width = 45;
+		height = 60;
+	}
+	
+	187
+	{
+		title = "Bishop";
+		sprite = "MLDRF2";
+		width = 40;
+		height = 56;
+	}
+	
+	12
+	{
+		title = "Loremaster";
+		sprite = "PRSTB2";
+		width = 15;
+		height = 56;
+	}
+	
+	129
+	{
+		title = "Specter A";
+		sprite = "ALN1K0";
+		width = 64;
+		height = 64;
+	}
+
+	75
+	{
+		title = "Specter B";
+		sprite = "ALN1J0";
+		width = 24;
+		height = 64;
+	}
+	
+	76
+	{
+		title = "Specter C - put with Oracle";
+		sprite = "ALN1I0";
+		width = 24;
+		height = 64;
+		hangs = 1;
+	}
+	
+	167
+	{
+		title = "Specter D";
+		sprite = "ALN1H0";
+		width = 24;
+		height = 64;
+	}
+	
+	168
+	{
+		title = "Specter E";
+		sprite = "ALN1G0";
+		width = 24;
+		height = 64;
+	}
+	
+	128
+	{
+		title = "Entity";
+		sprite = "MNALH0";
+		width = 130;
+		height = 200;
+	}
+	
+	85
+	{
+		title = "Rat Buddy";
+		sprite = "RATTA2A8";
+		width = 10;
+		height = 16;
+	}
+}
+
+weapons
+{
+	color = 14;	// Yellow
+	arrow = 0;
+	title = "Weapons";
+	width = 20;
+	sort = 1;
+	
+	2001
+	{
+		title = "Crossbow";
+		sprite = "CBOWA0";
+	}
+	
+	2002
+	{
+		title = "Assault Gun";
+		sprite = "RIFLA0";
+	}
+	
+	2006
+	{
+		title = "Assault Gun (standing)";
+		sprite = "RIFLB0";
+	}
+	
+	2003
+	{
+		title = "Mini-Missile Launcher";
+		sprite = "MMSLA0";
+	}
+	
+	154
+	{
+		title = "Grenade Launcher";
+		sprite = "GRNDA0";
+	}
+	
+	2005
+	{
+		title = "Flame Thrower";
+		sprite = "FLAMA0";
+	}
+	
+	2004
+	{
+		title = "Mauler";
+		sprite = "TRPDA0";
+	}
+	
+	77
+	{
+		title = "Sigil A (lightning strike)";
+		sprite = "SIGLA0";
+	}
+	
+	78
+	{
+		title = "Sigil B (rail lightning shot)";
+		sprite = "SIGLB0";
+	}
+	
+	79
+	{
+		title = "Sigil C (spread shot)";
+		sprite = "SIGLC0";
+	}
+	
+	80
+	{
+		title = "Sigil D (column shot)";
+		sprite = "SIGLD0";
+	}
+	
+	81
+	{
+		title = "Sigil E (big blast)";
+		sprite = "SIGLE0";
+	}
+}
+
+ammunition
+{
+	color = 6;	// Brown
+	arrow = 0;
+	title = "Ammunition";
+	width = 20;
+	sort = 1;
+	
+	183
+	{
+		title = "Ammo Satchel";
+		sprite = "BKPKA0";
+	}
+	
+	114
+	{
+		title = "Electric Bolts";
+		sprite = "XQRLA0";
+	}
+	
+	115
+	{
+		title = "Poison Arrows";
+		sprite = "PQRLA0";
+	}
+	
+	2007
+	{
+		title = "Bullet Clip";
+		sprite = "BLITA0";
+	}
+	
+	2048
+	{
+		title = "Box of Bullets";
+		sprite = "BBOXA0";
+	}
+	
+	2010
+	{
+		title = "Mini Missiles";
+		sprite = "MSSLA0";
+	}
+	
+	2046
+	{
+		title = "Crate of Missiles";
+		sprite = "ROKTA0";
+	}
+	
+	152
+	{
+		title = "HE-Grenade Rounds";
+		sprite = "GRN1A0";
+	}
+	
+	153
+	{
+		title = "Phoshorus-Grenade Rounds";
+		sprite = "GRN2A0";
+	}
+	
+	84 = "Gas-Grenade Rounds (demo only)";
+	
+	2047
+	{
+		title = "Energy Pod";
+		sprite = "BRY1A0";
+	}
+	
+	17
+	{
+		title = "Energy Pack";
+		sprite = "CPACA0";
+	}
+}
+
+health
+{
+	color = 1;	// Blue
+	arrow = 0;
+	title = "Health and Armor";
+	width = 20;
+	sort = 1;
+	
+	2011
+	{
+		title = "Med Patch";
+		sprite = "STMPA0";
+	}
+	
+	2012
+	{
+		title = "Medical Kit";
+		sprite = "MDKTA0";
+	}
+	
+	2018
+	{
+		title = "Leather Armor";
+		sprite = "ARM2A0";
+	}
+	
+	2019
+	{
+		title = "Metal Armor";
+		sprite = "ARM1A0";
+	}
+	
+	83
+	{
+		title = "Surgery Kit";
+		sprite = "FULLA0";
+	}
+}
+
+powerups
+{
+	color = 9;	// Light Blue
+	arrow = 0;
+	title = "Powerups";
+	width = 20;
+	height = 20;
+	sort = 1;
+	
+	2024
+	{
+		title = "Shadow Armor";
+		sprite = "SHD1A0";
+	}
+	
+	2025
+	{
+		title = "Environmental Suit";
+		sprite = "MASKA0";
+	}
+	
+	207
+	{
+		title = "Targeter";
+		sprite = "TARGA0";
+	}
+	
+	2026
+	{
+		title = "Map";
+		sprite = "PMAPA0";
+	}
+	
+	2027
+	{
+		title = "Scanner/Map-Radar";
+		sprite = "PMUPA0";
+	}
+	
+	10
+	{
+		title = "Teleport Beacon";
+		sprite = "BEACA0";
+		width = 16;
+		height = 16;
+	}
+}
+
+quests
+{
+	color = 13;	// Light Magenta
+	arrow = 0;
+	title = "Quest things";
+	width = 20;
+	sort = 1;
+	
+	45
+	{
+		title = "Gates (Piston)";
+		sprite = "PSTNA0";
+		height = 76;
+	}
+	
+	182
+	{
+		title = "Computer";
+		sprite = "SECRA0";
+		width = 26;
+		height = 128;
+	}
+	
+	220
+	{
+		title = "Power Coupling (Only 1)";
+		sprite = "COUPA0";
+		width = 17;
+		height = 64;
+	}
+	
+	226
+	{
+		title = "Broken Power Coupling (Only 1)";
+		sprite = "COUPC0";
+		width = 16;
+		height = 16;
+	}
+	
+	205
+	{
+		title = "Offering Chalice";
+		sprite = "RELCA0";
+		width = 10;
+		height = 16;
+	}
+	
+	90
+	{
+		title = "Guard Uniform (gives token)";
+		sprite = "UNIFA0";
+	}
+	
+	52
+	{
+		title = "Officer's Uniform (no alarm)";
+		sprite = "OFICA0";
+	}
+	
+	206
+	{
+		title = "Communicator";
+		sprite = "COMMA0";
+	}
+	
+	93
+	{
+		title = "Coin";
+		sprite = "COINA0";
+	}
+	
+	138
+	{
+		title = "10 Gold";
+		sprite = "CREDA0";
+	}
+	
+	139
+	{
+		title = "25 Gold";
+		sprite = "SACKA0";
+	}
+	
+	140
+	{
+		title = "50 Gold";
+		sprite = "CHSTA0";
+	}
+}
+
+keys
+{
+	color = 13;	// Light Magenta
+	arrow = 0;
+	title = "Keys";
+	width = 20;
+	sort = 1;
+	
+	13
+	{
+		title = "ID Card";
+		sprite = "CRD2A0";
+	}
+	
+	184
+	{
+		title = "ID Badge";
+		sprite = "CRD1A0";
+	}
+	
+	185
+	{
+		title = "Passcard";
+		sprite = "TPASA0";
+	}
+	
+	39
+	{
+		title = "Brass Key";
+		sprite = "KY3BA0";
+	}
+	
+	38
+	{
+		title = "Silver Key";
+		sprite = "KY2SA0";
+	}
+	
+	40
+	{
+		title = "Gold Key";
+		sprite = "KY1GA0";
+	}
+	
+	195
+	{
+		title = "Chapel Key";
+		sprite = "CHAPA0";
+	}
+	
+	230
+	{
+		title = "Base Key (Front)";
+		sprite = "FUSLA0";
+	}
+	
+	233
+	{
+		title = "Mauler Key";
+		sprite = "BLTKA0";
+	}
+	
+	234
+	{
+		title = "Factory Key";
+		sprite = "PROCA0";
+	}
+	
+	236
+	{
+		title = "Core Key";
+		sprite = "GOIDA0";
+	}
+	
+	235
+	{
+		title = "Mine Key";
+		sprite = "MINEA0";
+	}
+	
+	86
+	{
+		title = "Order Key";
+		sprite = "FUBRA0";
+	}
+	
+	166
+	{
+		title = "Warehouse Key";
+		sprite = "WAREA0";
+	}
+	
+	91
+	{
+		title = "Severed Hand";
+		sprite = "HANDA0";
+	}
+	
+	61
+	{
+		title = "Oracle Key";
+		sprite = "ORACA0";
+	}
+	
+	192
+	{
+		title = "Red Crystal Key";
+		sprite = "RCRYA0";
+	}
+	
+	193
+	{
+		title = "Blue Crystal Key";
+		sprite = "BCRYA0";
+	}
+}
+
+lights
+{
+	color = 11;	// Light Cyan
+	arrow = 0;
+	title = "Light sources";
+	width = 20;
+	sort = 1;
+	
+	24
+	{
+		title = "Claxon warning light";
+		sprite = "KLAXA0";
+		width = 5;
+		hangs = 1;
+	}
+	
+	70
+	{
+		title = "Burning Barrel";
+		sprite = "BARLA0";
+		width = 16;
+		height = 48;
+	}
+	
+	28
+	{
+		title = "Cage Light";
+		sprite = "CAGEA0";
+		height = 3;
+		hangs = 1;
+	}
+	
+	34
+	{
+		title = "Candle";
+		sprite = "CNDLA0";
+	}
+	
+	35
+	{
+		title = "Candelabra";
+		sprite = "CLBRA0";
+		width = 16;
+		height = 40;
+	}
+	
+	43
+	{
+		title = "Outside Lamp";
+		sprite = "LAMPA0";
+		width = 3;
+		height = 80;
+	}
+	
+	46
+	{
+		title = "Pole Lantern";
+		sprite = "LANTA0";
+		width = 3;
+		height = 80;
+	}
+	
+	107
+	{
+		title = "Small Burning Torch";
+		sprite = "TRCHA0";
+		width = 3;
+		height = 16;
+	}
+	
+	108
+	{
+		title = "Small Unlit Torch";
+		sprite = "TRHOA0";
+		width = 3;
+		height = 16;
+	}
+	
+	111
+	{
+		title = "Medium Torch";
+		sprite = "LTRHA0";
+		width = 4;
+		height = 72;
+	}
+	
+	47
+	{
+		title = "Large Torch";
+		sprite = "LMPCA0";
+		width = 10;
+		height = 72;
+	}
+	
+	50
+	{
+		title = "Huge Torch";
+		sprite = "LOGSA0";
+		width = 10;
+		height = 80;
+	}
+	
+	95
+	{
+		title = "Silver Flourescent Light";
+		sprite = "LITSA0";
+		width = 3;
+		height = 16;
+	}
+	
+	96
+	{
+		title = "Brass Flourescent Light";
+		sprite = "LITBA0";
+		width = 3;
+		height = 16;
+	}
+	
+	97
+	{
+		title = "Gold Flourescent Light";
+		sprite = "LITGA0";
+		width = 3;
+		height = 16;
+	}
+	
+	105
+	{
+		title = "Burning Bowl";
+		sprite = "BOWLA0";
+		width = 16;
+		height = 16;
+	}
+	
+	106
+	{
+		title = "Burning Brazier";
+		sprite = "BRAZA0";
+		width = 10;
+		height = 32;
+	}
+	
+	196
+	{
+		title = "Silver Tech Lamp";
+		sprite = "TLMPA0";
+		width = 11;
+		height = 64;
+	}
+	
+	197
+	{
+		title = "Brass Tech Lamp";
+		sprite = "TLMPB0";
+		width = 8;
+		height = 64;
+	}
+	
+	2028
+	{
+		title = "Light Globe";
+		sprite = "LITEA0";
+		width = 16;
+		height = 16;
+	}
+	
+	225
+	{
+		title = "Alien Spider Light";
+		sprite = "SPDLA0";
+		width = 32;
+		height = 56;
+	}
+}
+
+decoration
+{
+	color = 11;      // light cyan
+	arrow = 0;
+	title = "Decorations";
+	width = 20;
+	sort = 1;
+	
+	216
+	{
+		title = "Sigil Banner";
+		sprite = "SBANA1";
+		width = 24;
+		height = 96;
+	}
+
+	82
+	{
+		title = "Wooden Barrel";
+		sprite = "BARWA0";
+		width = 10;
+		height = 32;
+	}
+	
+	117
+	{
+		title = "Surgery Crab";
+		sprite = "CRABA0";
+		height = 16;
+	}
+	
+	68
+	{
+		title = "Tray";
+		sprite = "TRAYA0";
+		width = 24;
+		height = 40;
+	}
+	
+	217
+	{
+		title = "Rebel Boots";
+		sprite = "BOTRA0";
+	}
+	
+	218
+	{
+		title = "Rebel Helmet";
+		sprite = "HATRA0";
+	}
+	
+	219
+	{
+		title = "Rebel Shirt";
+		sprite = "TOPRA0";
+	}
+	
+	208
+	{
+		title = "Practice Target";
+		sprite = "HOGNA0";
+		width = 10;
+		height = 72;
+	}
+	
+	194
+	{
+		title = "Anvil";
+		sprite = "ANVLA0";
+		width = 16;
+		height = 32;
+	}
+	
+	228
+	{
+		title = "Ammo Filler";
+		sprite = "AFEDA0";
+		width = 12;
+		height = 24;
+	}
+	
+	109
+	{
+		title = "Ceiling Chain";
+		sprite = "CHANA0";
+		height = 93;
+		hangs = 1;
+	}
+	
+	112
+	{
+		title = "Fountain";
+		sprite = "WTFTA0";
+	}
+	
+	53
+	{
+		title = "Ceiling Water Drip";
+		sprite = "CDRPA0";
+		hangs = 1;
+	}
+	
+	103
+	{
+		title = "Floor Water Drip";
+		sprite = "DRIPA0";
+	}
+	
+	104
+	{
+		title = "Waterfall Splash";
+		sprite = "SPLHA0";
+	}
+	
+	164
+	{
+		title = "Mug";
+		sprite = "MUGGA0";
+	}
+	
+	2014
+	{
+		title = "Water Bottle";
+		sprite = "WATRA0";
+	}
+	
+	165
+	{
+		title = "Pot";
+		sprite = "VASEA0";
+		width = 12;
+		height = 24;
+	}
+	
+	190
+	{
+		title = "Metal Pot";
+		sprite = "POT1A0";
+	}
+	
+	188
+	{
+		title = "Pitcher";
+		sprite = "VASEB0";
+		width = 12;
+		height = 32;
+	}
+	
+	189
+	{
+		title = "Stool";
+		sprite = "STOLA0";
+		width = 6;
+		height = 24;
+	}
+	
+	191
+	{
+		title = "Tub";
+		sprite = "TUB1A0";
+	}
+	
+	26
+	{
+		title = "Entity Nest";
+		sprite = "NESTA1";
+		width = 84;
+		height = 47;
+	}
+	
+	198
+	{
+		title = "Entity Pod";
+		sprite = "PODDA0";
+		width = 25;
+		height = 91;
+	}
+}
+
+obstacles
+{
+	color = 3;	// Cyan
+	arrow = 0;
+	title = "Trees and Rocks";
+	width = 16;
+	sort = 1;
+	
+	33
+	{
+		title = "Tree Stub";
+		sprite = "TRE1A0";
+		width = 15;
+		height = 80;
+	}
+	
+	51
+	{
+		title = "Palm Tree";
+		sprite = "TREEA0";
+		width = 15;
+		height = 109;
+	}
+	
+	202
+	{
+		title = "Big Tree";
+		sprite = "TREEB0";
+		width = 15;
+		height = 109;
+	}
+	
+	203
+	{
+		title = "Potted Tree";
+		sprite = "TREEC0";
+		width = 15;
+		height = 64;
+	}
+	
+	60
+	{
+		title = "Short Bush";
+		sprite = "BUSHA0";
+		width = 15;
+		height = 40;
+	}
+	
+	62
+	{
+		title = "Tall Bush";
+		sprite = "SHRBA0";
+		width = 20;
+		height = 64;
+	}
+	
+	215
+	{
+		title = "Stick in Water";
+		sprite = "LOGGA0";
+		width = 20;
+	}
+	
+	98
+	{
+		title = "Stalactite";
+		sprite = "STLGC0";
+		height = 64;
+		hangs = 1;
+	}
+	
+	161
+	{
+		title = "Small Stalactite";
+		sprite = "STLGA0";
+		height = 40;
+		hangs = 1;
+	}
+	
+	160
+	{
+		title = "Stalagmite";
+		sprite = "STLGB0";
+		height = 40;
+	}
+	
+	163
+	{
+		title = "Small Stalagmite";
+		sprite = "STLGF0";
+		height = 25;
+	}
+	
+	159
+	{
+		title = "Cave Pillar Top";
+		sprite = "STLGD0";
+		height = 128;
+		hangs = 1;
+	}
+	
+	162
+	{
+		title = "Cave Pillar Bottom";
+		sprite = "STLGE0";
+		height = 128;
+	}
+	
+	99
+	{
+		title = "Rock 1";
+		sprite = "ROK1A0";
+		width = 20;
+	}
+	
+	100
+	{
+		title = "Rock 2";
+		sprite = "ROK2A0";
+		width = 20;
+	}
+	
+	101
+	{
+		title = "Rock 3";
+		sprite = "ROK3A0";
+		width = 20;
+	}
+	
+	102
+	{
+		title = "Rock 4";
+		sprite = "ROK4A0";
+		width = 20;
+	}
+	
+	29
+	{
+		title = "Rubble 1";
+		sprite = "RUB1A0";
+		width = 20;
+	}
+	
+	30
+	{
+		title = "Rubble 2";
+		sprite = "RUB2A0";
+		width = 20;
+	}
+	
+	31
+	{
+		title = "Rubble 3";
+		sprite = "RUB3A0";
+		width = 20;
+	}
+	32
+	{
+		title = "Rubble 4";
+		sprite = "RUB4A0";
+		width = 20;
+	}
+	
+	36
+	{
+		title = "Rubble 5";
+		sprite = "RUB5A0";
+		width = 20;
+	}
+	
+	37
+	{
+		title = "Rubble 6";
+		sprite = "RUB6A0";
+		width = 20;
+	}
+	
+	41
+	{
+		title = "Rubble 7";
+		sprite = "RUB7A0";
+		width = 20;
+	}
+	
+	42
+	{
+		title = "Rubble 8";
+		sprite = "RUB8A0";
+		width = 20;
+	}
+}
+
+pillars
+{
+	color = 3;	// Cyan
+	arrow = 0;
+	title = "Pillars";
+	width = 20;
+	sort = 1;
+	
+	69
+	{
+		title = "Barricade Column";
+		sprite = "BAR1A0";
+		width = 16;
+		height = 128;
+	}
+	
+	63
+	{
+		title = "Chimneystack";
+		sprite = "STAKA0";
+		height = 64;
+	}
+	
+	48
+	{
+		title = "Techno Pillar";
+		sprite = "MONIA0";
+		height = 128;
+	}
+	
+	54
+	{
+		title = "Aztec Pillar";
+		sprite = "STELA0";
+		width = 16;
+		height = 128;
+	}
+	
+	55
+	{
+		title = "Damaged Aztec Pillar";
+		sprite = "STLAA0";
+		width = 16;
+		height = 80;
+	}
+	
+	56
+	{
+		title = "Ruined Aztec Pillar";
+		sprite = "STLEA0";
+		width = 16;
+		height = 40;
+	}
+	
+	57
+	{
+		title = "Huge Tech Pillar";
+		sprite = "HUGEA0";
+		width = 24;
+		height = 192;
+	}
+	
+	227
+	{
+		title = "Huge Alien Pillar";
+		sprite = "APOWA0";
+		width = 24;
+		height = 192;
+	}
+	
+	110
+	{
+		title = "Statue";
+		sprite = "STATA0";
+		height = 64;
+	}
+	
+	44
+	{
+		title = "Ruined Statue";
+		sprite = "DSTAA0";
+		height = 56;
+	}
+	
+	221
+	{
+		title = "Alien Bubble Column";
+		sprite = "BUBBA0";
+		width = 16;
+		height = 128;
+	}
+	
+	222
+	{
+		title = "Alien Floor Bubble";
+		sprite = "BUBFA0";
+		width = 16;
+		height = 72;
+	}
+	
+	223
+	{
+		title = "Alien Ceiling Bubble";
+		sprite = "BUBCA0";
+		width = 16;
+		height = 72;
+		hangs = 1;
+	}
+	
+	224
+	{
+		title = "Alien Asp Climber";
+		sprite = "ASPRA0";
+		width = 16;
+		height = 128;
+	}
+}
+
+corpses
+{
+	color = 4;	// Red
+	arrow = 0;
+	title = "Corpses";
+	width = 16;
+	sort = 1;
+	
+	15
+	{
+		title = "Dead Player, disappears";
+		sprite = "PLAYP0";
+		width = 20;
+	}
+	
+	18
+	{
+		title = "Dead Peasant";
+		sprite = "PEASN0";
+		width = 20;
+	}
+	
+	19
+	{
+		title = "Dead Rebel";
+		sprite = "HMN1N0";
+		width = 20;
+	}
+	
+	20
+	{
+		title = "Dead Reaver";
+		sprite = "ROB1R0";
+		width = 20;
+	}
+	
+	21
+	{
+		title = "Dead Acolyte";
+		sprite = "AGRDN0";
+		width = 20;
+	}
+	
+	22
+	{
+		title = "Dead Crusader";
+		sprite = "ROB2P0";
+		width = 20;
+	}
+	
+	212
+	{
+		title = "Sacrificed Guy";
+		sprite = "SACRA0";
+		width = 20;
+	}
+	
+	113
+	{
+		title = "Hearts in Tank";
+		sprite = "HERTA0";
+		height = 56;
+	}
+	
+	209
+	{
+		title = "Huge Tank 1 (has skeleton)";
+		sprite = "TNK1A0";
+		height = 192;
+	}
+	
+	210
+	{
+		title = "Huge Tank 2";
+		sprite = "TNK2A0";
+		height = 192;
+	}
+	
+	211
+	{
+		title = "Huge Tank 3";
+		sprite = "TNK3A0";
+		height = 192;
+	}
+	
+	213
+	{
+		title = "Tank 4 (spine with organs)";
+		sprite = "TNK4A0";
+		height = 56;
+	}
+	
+	214
+	{
+		title = "Tank 5 (acolyte)";
+		sprite = "TNK5A0";
+		height = 56;
+	}
+	
+	229
+	{
+		title = "Tank 6 (spectre)";
+		sprite = "TNK6A0";
+		height = 56;
+	}
+}
+
+rebels
+{
+	color = 4;	// Red
+	arrow = 0;
+	title = "Rebels";
+	width = 20;
+	height = 56;
+	sprite = "HMN1A2";
+	sort = 1;
+	
+	9 = "Rebel 1 (summoned by beacon)";
+	144 = "Rebel 2";
+	145 = "Rebel 3";
+	149 = "Rebel 4";
+	150 = "Rebel 5";
+	151 = "Rebel 6";
+	
+	64
+	{
+		title = "Macil 1 Invincible (Map03,34)";
+		sprite = "LEADA2";
+	}
+	
+	200
+	{
+		title = "Macil 2 Spectral (Map10)";
+		sprite = "LEADA2";
+	}
+}
+
+peasants
+{
+	color = 4;	// Red
+	arrow = 0;
+	title = "Peasants";
+	width = 20;
+	height = 56;
+	sprite = "PEASA1";
+	sort = 1;
+	
+	3004 = "Peasant Tan 1";
+	130 = "Peasant Tan 2";
+	131 = "Peasant Tan 3";
+	65 = "Peasant Red 1 (2,33 Harris/23 Tevick)";
+	132 = "Peasant Red 2 (4 Derwin/33 Harris)";
+	133 = "Peasant Red 3 (4 Worner)";
+	67 = "Peasant Rust 1 (2 Rowan)";
+	136 = "Peasant Rust 2 (2 Geoff)";
+	137 = "Peasant Rust 3 (4 Technician)";
+	66 = "Peasant Gray 1 (4 Ketrick/5 Warden/17 Medic)";
+	134 = "Peasant Gray 2 (4 Sammis/5 Judge)";
+	135 = "Peasant Gray 3 (1 Beldin)";
+	172 = "Peasant DGreen 1 (2 Irale/23 Richter)";
+	173 = "Peasant DGreen 2 (6 Weran the Rat King)";
+	174 = "Peasant DGreen 3 (4 Computer Tech)";
+	178 = "Peasant Gold 1 (11 Key Master/31 False Prg)";
+	179 = "Peasant Gold 2";
+	180 = "Peasant Gold 3";
+	175 = "Peasant BGreen 1 (7 False Programmer)";
+	176 = "Peasant BGreen 2";
+	177 = "Peasant BGreen 3";
+	181 = "Peasant Blue (2,33 Governor/8 False Prgr)";
+}
+
+npcs
+{
+	color = 4;	// Red
+	arrow = 0;
+	title = "Other NPCs";
+	width = 20;
+	height = 56;
+	sprite = "BEGRA1";
+	sort = 1;
+	
+	141 = "Beggar 1 (Map01 MacGuffin/32 Prisoner)";
+	155 = "Beggar 2";
+	156 = "Beggar 3";
+	157 = "Beggar 4";
+	158 = "Beggar 5";
+	
+	204
+	{
+		title = "Kneeling Guy";
+		sprite = "NEALA2A8";
+		width = 6;
+		height = 17;
+	}
+	
+	169
+	{
+		title = "Zombie";
+		sprite = "PEASA2";
+	}
+	
+	170
+	{
+		title = "Zombie Spawner";
+		sprite = "internal:Actor";
+	}
+	
+	201
+	{
+		title = "Becoming Acolyte";
+		sprite = "ARMRA0";
+	}
+	
+	72
+	{
+		title = "Bar Keep 1 Gold (Map02,23,33)";
+		sprite = "MRSTA0";
+	}
+	
+	73
+	{
+		title = "Armorer 2 Bright Green (Map02,23,33/10)";
+		sprite = "MRSTA0";
+	}
+	
+	74
+	{
+		title = "Medic 3 Blue (Map02,23,33/03,10/17)";
+		sprite = "MRSTA0";
+	}
+	
+	116
+	{
+		title = "Weapon Smith 4 Tan (Map02,23,33/03,10)";
+		sprite = "MRSTA0";
+	}
+	
+	199
+	{
+		title = "Oracle (Map12)";
+		sprite = "ORCLA0";
+		width = 15;
+	}
+}
+
+hints
+{
+	color = 13;	// Light Magenta
+	arrow = 0;
+	title = "Explosives and Hints";
+	width = 20;
+	sort = 1;
+	
+	94
+	{
+		title = "Explosive Barrel";
+		sprite = "BARTA0";
+		width = 10;
+		height = 32;
+	}
+	
+	92
+	{
+		title = "Power Crystal";
+		sprite = "CRYSA0";
+		height = 32;
+	}
+	
+	59
+	{
+		title = "Degnin Ore - for FFG";
+		sprite = "XPRKA0";
+		width = 16;
+		height = 16;
+	}
+	
+	25
+	{
+		title = "Force Field Guard - use ore";
+		sprite = "internal:Actor";
+		width = 2;
+		height = 1;
+	}
+}
diff --git a/Build/Configurations/Includes/Test_params.cfg b/Build/Configurations/Includes/Test_params.cfg
new file mode 100644
index 0000000..a008350
--- /dev/null
+++ b/Build/Configurations/Includes/Test_params.cfg
@@ -0,0 +1,15 @@
+//Testing parameters for all engines
+vanilla_mapxx
+{
+	testparameters = "-iwad \"%WP\" -skill \"%S\" -file \"%AP\" \"%F\" -warp %L1%L2 %NM";
+}
+
+vanilla_exmx
+{
+	testparameters = "-iwad \"%WP\" -skill \"%S\" -file \"%AP\" \"%F\" -warp %L1 %L2 %NM";
+}
+
+modern
+{
+	testparameters = "-iwad \"%WP\" -skill \"%S\" -file \"%AP\" \"%F\" +map %L %NM";
+}
\ No newline at end of file
diff --git a/Build/Configurations/Includes/UDMF_misc.cfg b/Build/Configurations/Includes/UDMF_misc.cfg
new file mode 100644
index 0000000..e827d8b
--- /dev/null
+++ b/Build/Configurations/Includes/UDMF_misc.cfg
@@ -0,0 +1,191 @@
+
+// Basic UDMF stuff.
+thingflags
+{
+	skill1 = "Skill 1";
+	skill2 = "Skill 2";
+	skill3 = "Skill 3";
+	skill4 = "Skill 4";
+	skill5 = "Skill 5";
+	skill6 = "Skill 6";
+	skill7 = "Skill 7";
+	skill8 = "Skill 8";
+	single = "Singleplayer";
+	coop = "Cooperative";
+	dm = "Deathmatch";
+	friend = "Friendly (MBF logic)";
+	strifeally = "Friendly (Strife logic)";
+	ambush = "Ambush players";
+	standing = "Stand still";
+	dormant = "Dormant";
+	translucent = "Translucent (25%)";
+	invisible = "Invisible";
+}
+
+
+// Default flags for first new thing
+defaultthingflags
+{
+	skill1;
+	skill2;
+	skill3;
+	skill4;
+	skill5;
+	skill6;
+	skill7;
+	skill8;
+	single;
+	coop;
+	dm;
+}
+
+
+// How thing flags should be compared (for the stuck thing error check)
+thingflagscompare
+{
+	skills
+	{
+		skill1;
+		skill2;
+		skill3;
+		skill4;
+		skill5;
+		skill6;
+		skill7;
+		skill8;
+	}
+
+	gamemodes
+	{
+		single { requiredgroups = "skills"; }
+		coop   { requiredgroups = "skills"; }
+		dm      { ignoredgroups = "skills"; }
+	}
+
+	classes
+	{
+		class1;
+		class2;
+		class3;
+		class4;
+		class5;
+	}
+}
+
+sectorflags
+{
+	silent = "Silent";
+	hidden = "Not shown on automap";
+	nofallingdamage = "No falling damage";
+	waterzone = "Sector is under water and swimmable";
+	norespawn = "Players can't respawn in this sector";
+	dropactors = "Actors drop with instantly moving floors";
+}
+
+linedefflags
+{
+	blocking = "Impassable";
+	blockmonsters = "Block monsters";
+	twosided = "Doublesided";
+	dontpegtop = "Upper unpegged";
+	dontpegbottom = "Lower unpegged";
+	secret = "Shown as 1-sided on automap";
+	blocksound = "Block sound";
+	dontdraw = "Not shown on automap";
+	transparent = "Transparent (25% opacity)";
+	mapped = "Initially shown on automap";
+}
+
+
+linedefactivations
+{
+	playercross = "When player walks over";
+	playeruse = "When player presses use";
+	monstercross = "When monster walks over";
+	monsteruse = "When monster presses use";
+	impact = "On projectile impact";
+	playerpush = "When player bumps";
+	monsterpush = "When monsters bumps";
+	missilecross = "When projectile crosses";
+	repeatspecial = "Repeatable action";
+	passuse = "Pass use on";
+}
+
+sidedefflags
+{
+	clipmidtex = "Clip middle texture";
+	wrapmidtex = "Wrap middle texture";
+	smoothlighting = "Smooth lighting";
+	nofakecontrast = "Even lighting";
+	nodecals = "No decals";
+	lightfog = "Use sidedef brightness on fogged walls";
+}
+
+//RENDER STYLES
+thingrenderstyles
+{
+	normal = "Normal";
+	translucent = "Translucent";
+	soultrans = "Translucent (Lost Soul)";
+	translucentstencil = "Translucent (stencil)";
+	add = "Additive";
+	subtract = "Subtractive";
+	stencil = "Stencil";
+	fuzzy = "Fuzzy";
+	optfuzzy = "Fuzzy/Shadow (uses r_drawfuzz CVAR)";
+	none = "None";
+}
+
+linedefrenderstyles
+{
+	translucent = "Translucent";
+	add = "Additive";
+}
+
+sectorrenderstyles
+{
+	translucent = "Translucent";
+	add = "Additive";
+}
+
+/*
+MAP LUMP NAMES
+Map lumps are loaded with the map as long as they are right after each other. When the editor
+meets a lump which is not defined in this list it will ignore the map if not satisfied.
+The order of items defines the order in which lumps will be written to WAD file on save.
+To indicate the map header lump, use ~MAP
+
+Legenda:
+required = Lump is required to exist.
+blindcopy = Lump will be copied along with the map blindly. (useful for lumps Doom Builder doesn't use)
+nodebuild = The nodebuilder generates this lump.
+allowempty = The nodebuilder is allowed to leave this lump empty.
+script = This lump is a text-based script. Specify the filename of the script configuration to use.
+*/
+
+udmfmaplumpnames_begin
+{
+	~MAP
+	{
+		required = true;
+		blindcopy = true;
+		nodebuild = false;
+	}
+	
+	TEXTMAP
+	{
+		required = true;
+		nodebuild = true;
+		allowempty = true;
+	}
+}
+
+udmfmaplumpnames_end
+{
+	ENDMAP
+	{
+		required = true;
+		nodebuild = false;
+		allowempty = true;
+	}
+}
\ No newline at end of file
diff --git a/Build/Configurations/Includes/ZDoom_common.cfg b/Build/Configurations/Includes/ZDoom_common.cfg
new file mode 100644
index 0000000..40d67a7
--- /dev/null
+++ b/Build/Configurations/Includes/ZDoom_common.cfg
@@ -0,0 +1,464 @@
+// ***********************************************************
+// *                                                         *
+// * These values are the same for Doom format, Hexen format *
+// * and UDMF; as well as for ZDoom, GZDoom and Zandronum     *
+// *                                                         *
+// ***********************************************************
+
+common
+{
+	// Some common settings
+	include("Common.cfg");
+
+	// Default testing parameters
+	include("Test_params.cfg", "modern");
+
+	// Action special help (mxd)
+	actionspecialhelp = "http://www.zdoom.org/wiki/index.php?title=%K";
+	
+	// Thing class help (mxd)
+	thingclasshelp = "http://www.zdoom.org/wiki/Classes:%K";
+
+	// Default nodebuilder configurations
+	defaultsavecompiler = "zdbsp_normal";
+	defaulttestcompiler = "zdbsp_fast";
+
+	// Generalized actions
+	// generalizedlinedefs is true for Doom format and false for
+	// the other two, so it's not here.
+	generalizedsectors = true;
+
+	// Texture loading options
+	mixtexturesflats = true;
+	defaulttexturescale = 1.0f;
+	defaultflatscale = 1.0f;
+	scaledtextureoffsets = true;
+
+	// Texture sources
+	textures
+	{
+		include("Doom_misc.cfg", "textures");
+		include("ZDoom_misc.cfg", "textures");
+	}
+
+	// Patch sources
+	patches
+	{
+		include("Doom_misc.cfg", "patches");
+	}
+
+	// Sprite sources
+	sprites
+	{
+		include("Doom_misc.cfg", "sprites");
+	}
+
+	// Flat sources
+	flats
+	{
+		include("Doom_misc.cfg", "flats");
+	}
+
+	// Colormap sources
+	colormaps
+	{
+		include("Boom_misc.cfg", "colormaps");
+	}
+
+	//mxd. Voxel sources
+	voxels
+	{
+		include("ZDoom_misc.cfg", "voxels");
+	}
+
+	// Generalized sector types
+	gen_sectortypes
+	{
+		include("ZDoom_generalized.cfg", "gen_sectortypes");
+	}
+}
+
+// ***********************************************************
+// *                                                         *
+// *                       Doom map format                   *
+// *                                                         *
+// ***********************************************************
+
+mapformat_doom
+{
+	// The format interface handles the map data format
+	formatinterface = "DoomMapSetIO";
+
+	maplumpnames
+	{
+		include("Doom_misc.cfg", "doommaplumpnames");
+		include("ZDoom_misc.cfg", "doommaplumpnames");
+		include("ZDoom_misc.cfg", "glmaplumpnames");
+	}
+
+	// When this is set to true, sectors with the same tag will light up when a line is highlighted
+	linetagindicatesectors = true;
+
+	// Special linedefs
+	include("ZDoom_misc.cfg", "speciallinedefs_doomhexen");
+
+	// Default flags for first new thing
+	defaultthingflags
+	{
+		include("Doom_misc.cfg", "defaultthingflags");
+	}
+
+	// Door making
+	include("ZDoom_misc.cfg", "doormaking_doom");
+
+	// Generalized actions
+	generalizedlinedefs = true;
+
+	// GENERALIZED LINEDEF TYPES
+	gen_linedeftypes
+	{
+		include("Boom_generalized.cfg", "gen_linedeftypes");
+	}
+	
+	// DEFAULT SECTOR BRIGHTNESS LEVELS
+	sectorbrightness
+	{
+		include("Doom_misc.cfg", "sectorbrightness");
+	}
+
+	// SECTOR TYPES
+	sectortypes
+	{
+		include("Doom_sectors.cfg");
+		include("ZDoom_sectors.cfg", "doom");
+	}
+
+	// LINEDEF FLAGS
+	linedefflags
+	{
+		include("Doom_misc.cfg", "linedefflags");
+		include("Boom_misc.cfg", "linedefflags");
+	}
+
+	// LINEDEF ACTIVATIONS
+	linedefactivations
+	{
+	}
+
+	// Linedef flags UDMF translation table
+	// This is needed for copy/paste and prefabs to work properly
+	// When the UDMF field name is prefixed with ! it is inverted
+	linedefflagstranslation
+	{
+		include("Doom_misc.cfg", "linedefflagstranslation");
+		include("Boom_misc.cfg", "linedefflagstranslation");
+	}
+
+	// LINEDEF TYPES
+	linedeftypes
+	{
+		include("Doom_linedefs.cfg");
+		include("Boom_linedefs.cfg");
+		include("ZDoom_linedefs.cfg", "doom");
+	}
+
+	// THING FLAGS
+	thingflags
+	{
+		include("Doom_misc.cfg", "thingflags");
+		include("Boom_misc.cfg", "thingflags");
+	}
+
+	// Thing flags UDMF translation table
+	// This is needed for copy/paste and prefabs to work properly
+	// When the UDMF field name is prefixed with ! it is inverted
+	thingflagstranslation
+	{
+		include("Doom_misc.cfg", "thingflagstranslation");
+		include("Boom_misc.cfg", "thingflagstranslation");
+	}
+	
+	// How to compare thing flags (for the stuck things error checker)
+	thingflagscompare
+	{
+		include("Doom_misc.cfg", "thingflagscompare");
+	}
+
+	// Things flags masks
+	include("Doom_misc.cfg", "thingflagsmasks");
+
+}
+
+// ***********************************************************
+// *                                                         *
+// *                      Hexen map format                   *
+// *                                                         *
+// ***********************************************************
+
+mapformat_hexen
+{
+	// The format interface handles the map data format
+	formatinterface = "HexenMapSetIO";
+
+	//mxd. The default script compiler to use
+	defaultscriptcompiler = "zdoom_acs.cfg";
+
+	maplumpnames
+	{
+		include("Doom_misc.cfg", "hexenmaplumpnames");
+		include("ZDoom_misc.cfg", "hexenmaplumpnames");
+		include("ZDoom_misc.cfg", "glmaplumpnames");
+	}
+
+	// When this is set to true, sectors with the same tag will light up when a line is highlighted
+	linetagindicatesectors = false;
+
+	// Special linedefs
+	include("ZDoom_misc.cfg", "speciallinedefs_doomhexen");
+
+	// Default flags for first new thing
+	defaultthingflags
+	{
+		include("ZDoom_misc.cfg", "defaultthingflags");
+	}
+
+	// Door making
+	include("ZDoom_misc.cfg", "doormaking_hexen");
+
+	// Generalized actions
+	generalizedlinedefs = false;
+	
+	// DEFAULT SECTOR BRIGHTNESS LEVELS
+	sectorbrightness
+	{
+		include("ZDoom_misc.cfg", "sectorbrightness");
+	}
+
+	// SECTOR TYPES
+	sectortypes
+	{
+		include("ZDoom_sectors.cfg", "zdoom");
+	}
+
+	// LINEDEF FLAGS
+	linedefflags
+	{
+		include("Doom_misc.cfg", "linedefflags");
+		include("Hexen_misc.cfg", "linedefflags");
+		include("ZDoom_misc.cfg", "linedefflags");
+	}
+
+	// Activations filter for Hexen type activations
+	// This filters the activation bits from the flags
+	include("Hexen_misc.cfg", "linedefactivationsfilter");
+
+	// LINEDEF ACTIVATIONS
+	// Make sure these are in order from lowest value to highest value
+	linedefactivations
+	{
+		include("Hexen_misc.cfg", "linedefactivations");
+		include("ZDoom_misc.cfg", "linedefactivations");
+	}
+
+	// Linedef flags UDMF translation table
+	// This is needed for copy/paste and prefabs to work properly
+	// When the UDMF field name is prefixed with ! it is inverted
+	linedefflagstranslation
+	{
+		include("Doom_misc.cfg", "linedefflagstranslation");
+		include("Hexen_misc.cfg", "linedefflagstranslation");
+		include("ZDoom_misc.cfg", "linedefflagstranslation");
+	}
+
+	// LINEDEF TYPES
+	linedeftypes
+	{
+		include("Hexen_linedefs.cfg");
+		include("ZDoom_linedefs.cfg", "zdoom");
+		include("ZDoom_linedefs.cfg", "hexen");
+	}
+
+	// THING FLAGS
+	thingflags
+	{
+		include("Doom_misc.cfg", "thingflags");
+		include("Hexen_misc.cfg", "thingflags");
+		include("ZDoom_misc.cfg", "thingflags");
+	}
+
+	// Thing flags UDMF translation table
+	// This is needed for copy/paste and prefabs to work properly
+	// When the UDMF field name is prefixed with ! it is inverted
+	thingflagstranslation
+	{
+		include("Doom_misc.cfg", "thingflagstranslation");
+		include("Hexen_misc.cfg", "thingflagstranslation");
+		include("ZDoom_misc.cfg", "thingflagstranslation");
+	}
+	
+	// How to compare thing flags (for the stuck things error checker)
+	thingflagscompare
+	{
+		include("Hexen_misc.cfg", "thingflagscompare");
+	}
+
+	// Things flags masks
+	include("Hexen_misc.cfg", "thingflagsmasks");
+
+}
+
+// ***********************************************************
+// *                                                         *
+// *                       Text map format                   *
+// *                                                         *
+// ***********************************************************
+
+mapformat_udmf
+{
+	// The format interface handles the map data format
+	formatinterface = "UniversalMapSetIO";
+
+	//mxd. The default script compiler to use
+	defaultscriptcompiler = "zdoom_acs.cfg"; 
+
+	// Enables support for long (> 8 chars) texture names
+	// WARNING: this should only be enabled for UDMF game configurations!
+	// WARNING: enabling this will make maps incompatible with Doom Builder 2 and can lead to problems in Slade 3!
+	longtexturenames = true;
+	
+	// Default nodebuilder configurations
+	defaultsavecompiler = "zdbsp_udmf_normal";
+	defaulttestcompiler = "zdbsp_udmf_fast";
+	
+	engine = "zdoom"; // override that so that DB2 uses the correct namespace
+
+	maplumpnames
+	{
+		include("UDMF_misc.cfg", "udmfmaplumpnames_begin");
+		include("ZDoom_misc.cfg", "udmfmaplumpnames");
+		include("UDMF_misc.cfg", "udmfmaplumpnames_end");
+	}
+
+	universalfields
+	{
+		include("ZDoom_misc.cfg", "universalfields");
+	}
+
+	// When this is set to true, sectors with the same tag will light up when a line is highlighted
+	linetagindicatesectors = false;
+
+	// Special linedefs
+	include("ZDoom_misc.cfg", "speciallinedefs_udmf");
+
+	// Default flags for first new thing
+	defaultthingflags
+	{
+		include("ZDoom_misc.cfg", "defaultthingflags_udmf");
+	}
+
+	// Door making
+	include("ZDoom_misc.cfg", "doormaking_udmf");
+
+	// Generalized actions
+	generalizedlinedefs = false;
+
+	// SECTOR FLAGS
+	sectorflags
+	{
+		include("UDMF_misc.cfg", "sectorflags");
+	}
+	
+	// DEFAULT SECTOR BRIGHTNESS LEVELS
+	sectorbrightness
+	{
+		include("ZDoom_misc.cfg", "sectorbrightness");
+	}
+
+	// SECTOR TYPES
+	sectortypes
+	{
+		include("ZDoom_sectors.cfg", "zdoom");
+	}
+
+	// SECTOR RENSERSTYLES
+	sectorrenderstyles
+	{
+		include("UDMF_misc.cfg", "sectorrenderstyles");
+	}
+
+	// LINEDEF FLAGS
+	linedefflags
+	{
+		include("ZDoom_misc.cfg", "linedefflags_udmf");
+	}
+
+	// LINEDEF ACTIVATIONS
+	linedefactivations
+	{
+		include("ZDoom_misc.cfg", "linedefactivations_udmf");
+	}
+	
+	//mxd. Linedef flags UDMF translation table
+	// This is needed for copy/paste and prefabs to work properly
+	// When the UDMF field name is prefixed with ! it is inverted
+	linedefflagstranslation
+	{
+		include("Doom_misc.cfg", "linedefflagstranslation");
+		include("Hexen_misc.cfg", "linedefflagstranslation");
+		include("ZDoom_misc.cfg", "linedefflagstranslation");
+	} 
+
+	// LINEDEF RENSERSTYLES
+	linedefrenderstyles
+	{
+		include("UDMF_misc.cfg", "linedefrenderstyles");
+	}
+
+	//SIDEDEF FLAGS
+	sidedefflags
+	{
+		include("UDMF_misc.cfg", "sidedefflags");  
+	}
+
+	// THING FLAGS
+	thingflags
+	{
+		include("UDMF_misc.cfg", "thingflags");
+		include("ZDoom_misc.cfg", "thingflags_udmf");
+	}
+	
+	// THING RENSERSTYLES
+	thingrenderstyles
+	{
+		include("UDMF_misc.cfg", "thingrenderstyles");
+	}
+
+	// How to compare thing flags (for the stuck things error checker)
+	thingflagscompare
+	{
+		include("UDMF_misc.cfg", "thingflagscompare");
+		include("ZDoom_misc.cfg", "thingflagscompare_udmf");
+	}
+
+	//mxd. Thing flags UDMF translation table
+	// This is needed for copy/paste and prefabs to work properly
+	// When the UDMF field name is prefixed with ! it is inverted
+	thingflagstranslation
+	{
+		include("Doom_misc.cfg", "thingflagstranslation");
+		include("Hexen_misc.cfg", "thingflagstranslation");
+		include("ZDoom_misc.cfg", "thingflagstranslation");
+	}
+
+	// Things flags masks
+	include("Hexen_misc.cfg", "thingflagsmasks");
+
+	// LINEDEF TYPES
+	linedeftypes
+	{
+		include("Hexen_linedefs.cfg");
+		include("ZDoom_linedefs.cfg", "zdoom");
+		include("ZDoom_linedefs.cfg", "udmf");
+	}
+
+}
\ No newline at end of file
diff --git a/Build/Configurations/Includes/ZDoom_generalized.cfg b/Build/Configurations/Includes/ZDoom_generalized.cfg
new file mode 100644
index 0000000..f9f67c0
--- /dev/null
+++ b/Build/Configurations/Includes/ZDoom_generalized.cfg
@@ -0,0 +1,129 @@
+
+// Generalized sector types
+gen_sectortypes
+{
+	effect
+	{
+		0 = "Normal";
+		1 = "Light Phased";
+		2 = "Light Sequence Start";
+		3 = "Light Sequence Special 1";
+		4 = "Light Sequence Special 2";
+		21 = "Light Phased";
+		22 = "Light Sequence Start";
+		23 = "Light Sequence Special 1";
+		24 = "Light Sequence Special 2";
+		26 = "Stairs Special 1";
+		27 = "Stairs Special 2";
+		65 = "Light Flicker";
+		66 = "Light Strobe Fast";
+		67 = "Light Strobe Slow";
+		68 = "Light Strobe Hurt";
+		69 = "Damage Hellslime";
+		71 = "Damage Nukage";
+		72 = "Light Glow";
+		74 = "Sector Door Close (30 sec)";
+		75 = "Damage End Level";
+		76 = "Light StrobeSlowSync";
+		77 = "Light StrobeFastSync";
+		78 = "Sector Door Raise (5 min)";
+		79 = "Low Friction";
+		80 = "Damage Super Hellslime";
+		81 = "Light Fire Flicker";
+		82 = "Damage -2 or -5% health (no protection)";
+		83 = "Damage -4 or -8% health (no protection)";
+		84 = "Scroll east + -2 or -5% health (no protection)";
+		87 = "Sector uses outside fog";
+		105 = "Delayed damage weak";
+		115 = "Instant death";
+		116 = "Delayed damage strong";
+		118 = "Carry player by tag";
+		196 = "Healing Sector";
+		197 = "Lightning Outdoor";
+		198 = "Lightning Indoor 2";
+		199 = "Lightning Indoor 1";
+		200 = "Sky 2 (MAPINFO)";
+		201 = "Scroll North (slow)";
+		202 = "Scroll North (medium)";
+		203 = "Scroll North (fast)";
+		204 = "Scroll East (slow)";
+		205 = "Scroll East (medium)";
+		206 = "Scroll East (fast)";
+		207 = "Scroll South (slow)";
+		208 = "Scroll South (medium)";
+		209 = "Scroll South (fast)";
+		210 = "Scroll West (slow)";
+		211 = "Scroll West (medium)";
+		212 = "Scroll West (fast)";
+		213 = "Scroll NorthWest (slow)";
+		214 = "Scroll NorthWest (medium)";
+		215 = "Scroll NorthWest (fast)";
+		216 = "Scroll NorthEast (slow)";
+		217 = "Scroll NorthEast (medium)";
+		218 = "Scroll NorthEast (fast)";
+		219 = "Scroll SouthEast (slow)";
+		220 = "Scroll SouthEast (medium)";
+		221 = "Scroll SouthEast (fast)";
+		222 = "Scroll SouthWest (slow)";
+		223 = "Scroll SouthWest (medium)";
+		224 = "Scroll SouthWest (fast)";
+		40 = "Wind East weak";
+		41 = "Wind East medium";
+		42 = "Wind East strong";
+		43 = "Wind North weak";
+		44 = "Wind North medium";
+		45 = "Wind North strong";
+		46 = "Wind South weak";
+		47 = "Wind South medium";
+		48 = "Wind South strong";
+		49 = "Wind West weak";
+		50 = "Wind West medium";
+		51 = "Wind West strong";
+		225 = "Carry East Slow";
+		226 = "Carry East Med.Slow";
+		227 = "Carry East Medium";
+		228 = "Carry East Med.Fast";
+		229 = "Carry East Fast";
+		230 = "Carry North Slow";
+		231 = "Carry North Med.Slow";
+		232 = "Carry North Medium";
+		233 = "Carry North Med.Fast";
+		234 = "Carry North Fast";
+		235 = "Carry South Slow";
+		236 = "Carry South Med.Slow";
+		237 = "Carry South Medium";
+		238 = "Carry South Med.Fast";
+		239 = "Carry South Fast";
+		240 = "Carry West Slow";
+		241 = "Carry West Med.Slow";
+		242 = "Carry West Medium";
+		243 = "Carry West Med.Fast";
+		244 = "Carry West Fast";
+	}
+	
+	damage
+	{
+		0 = "None";
+		256 = "Damage 5 per second";
+		512 = "Damage 10 per second";
+		768 = "Damage 20 per second";
+	}
+	
+	secret
+	{
+		0 = "No";
+		1024 = "Yes";
+	}
+	
+	friction
+	{
+		0 = "Disabled";
+		2048 = "Enabled";
+	}
+	
+	pusher
+	{
+		0 = "Disabled";
+		4096 = "Enabled";
+	}
+}
diff --git a/Build/Configurations/Includes/ZDoom_linedefs.cfg b/Build/Configurations/Includes/ZDoom_linedefs.cfg
new file mode 100644
index 0000000..0361ccd
--- /dev/null
+++ b/Build/Configurations/Includes/ZDoom_linedefs.cfg
@@ -0,0 +1,4244 @@
+
+// NOTE: This config contains four structures for different linedefs systems: Doom, Hexen and UDMF.
+// The ZDoom structure is common to Hexen and UDMF and contains the bulk of the definitions.
+// The Hexen and UDMF structures contain only the little tweaks needed for these formats.
+
+doom
+{
+	script
+	{
+		title = "Script";
+		
+		270
+		{
+			title = "FraggleScript Execute";
+			prefix = "WR";
+		}
+		273
+		{
+			title = "FraggleScript Execute one-way";
+			prefix = "WR";
+		}
+		274
+		{
+			title = "FraggleScript Execute";
+			prefix = "W1";
+		}
+		275
+		{
+			title = "FraggleScript Execute one-way";
+			prefix = "W1";
+		}
+		276
+		{
+			title = "FraggleScript Execute";
+			prefix = "SR";
+		}
+		277
+		{
+			title = "FraggleScript Execute";
+			prefix = "S1";
+		}
+		278
+		{
+			title = "FraggleScript Execute";
+			prefix = "GR";
+		}
+		279
+		{
+			title = "FraggleScript Execute";
+			prefix = "G1";
+		}
+	}
+	sector
+	{
+		title = "Sector";
+		
+		280
+		{
+			title = "Transfer height: swimmable water (Legacy compat)";
+			prefix = "";
+		}
+		281
+		{
+			title = "3D floor, Solid (Legacy compat)";
+			prefix = "";
+		}
+		289
+		{
+			title = "3D floor, no light (Legacy compat)";
+			prefix = "";
+		}
+		300
+		{
+			title = "3D floor, no light, half-translucent (Legacy compat)";
+			prefix = "";
+		}
+		301
+		{
+			title = "3D floor, Swimmable water, half-translucent (Legacy compat)";
+			prefix = "";
+		}
+		302
+		{
+			title = "3D floor, Fog zone, half-translucent (Legacy compat)";
+			prefix = "";
+		}
+		303
+		{
+			title = "3D floor, Fog zone, translucent (Legacy compat)";
+			prefix = "";
+		}
+		304
+		{
+			title = "3D floor, Swimmable water, opaque (Legacy compat)";
+			prefix = "";
+		}
+		305
+		{
+			title = "3D floor, light zone (Legacy compat)";
+			prefix = "";
+		}
+		306
+		{
+			title = "3D floor, Solid, translucent (Legacy compat)";
+			prefix = "";
+		}
+		332
+		{
+			title = "3D floor, Vavoom-style";
+			prefix = "";
+		}
+		400
+		{
+			title = "3D floor, Thick, dummy texture (EDGE compat)";
+			prefix = "";
+		}
+		401
+		{
+			title = "3D floor, Thick, master upper texture (EDGE compat)";
+			prefix = "";
+		}
+		402
+		{
+			title = "3D floor, Thick, master lower texture (EDGE compat)";
+			prefix = "";
+		}
+		403
+		{
+			title = "3D floor, Liquid, solid (EDGE compat)";
+			prefix = "";
+		}
+		404
+		{
+			title = "3D floor, Liquid, 20% translucent (EDGE compat)";
+			prefix = "";
+		}
+		405
+		{
+			title = "3D floor, Liquid, 40% translucent (EDGE compat)";
+			prefix = "";
+		}
+		406
+		{
+			title = "3D floor, Liquid, 60% translucent (EDGE compat)";
+			prefix = "";
+		}
+		407
+		{
+			title = "3D floor, Liquid, 80% translucent (EDGE compat)";
+			prefix = "";
+		}
+		408
+		{
+			title = "3D floor, Liquid, invisible (EDGE compat)";
+			prefix = "";
+		}
+		413
+		{
+			title = "3D floor, Thin, opaque (EDGE compat)";
+			prefix = "";
+		}
+		414
+		{
+			title = "3D floor, Thin, 20% translucent (EDGE compat)";
+			prefix = "";
+		}
+		415
+		{
+			title = "3D floor, Thin, 40% translucent (EDGE compat)";
+			prefix = "";
+		}
+		416
+		{
+			title = "3D floor, Thin, 60% translucent (EDGE compat)";
+			prefix = "";
+		}
+		417
+		{
+			title = "3D floor, Thin, 80% translucent (EDGE compat)";
+			prefix = "";
+		}
+	}
+	
+	scroll
+	{
+		422
+		{
+			title = "Scroll Right (EDGE compat)";
+			prefix = "";
+		}
+		423
+		{
+			title = "Scroll Up (EDGE compat)";
+			prefix = "";
+		}
+		424
+		{
+			title = "Scroll Down (EDGE compat)";
+			prefix = "";
+		}
+		425
+		{
+			title = "Scroll Left And Up (EDGE compat)";
+			prefix = "";
+		}
+		426
+		{
+			title = "Scroll Left And Down (EDGE compat)";
+			prefix = "";
+		}
+		427
+		{
+			title = "Scroll Right And Up (EDGE compat)";
+			prefix = "";
+		}
+		428
+		{
+			title = "Scroll Right And Down (EDGE compat)";
+			prefix = "";
+		}
+	}
+		
+	floor
+	{	
+		434
+		{
+			title = "Floor Raise by 2 Units (EDGE compat)";
+			prefix = "S1";
+		}
+		435
+		{
+			title = "Floor Raise by 2 Units (EDGE compat)";
+			prefix = "SR";
+		}
+		436
+		{
+			title = "Floor Raise by 2 Units (EDGE compat)";
+			prefix = "W1";
+		}
+		437
+		{
+			title = "Floor Raise by 2 Units (EDGE compat)";
+			prefix = "WR";
+		}
+		438
+		{
+			title = "Floor Raise by 2 Units (EDGE compat)";
+			prefix = "G1";
+		}
+		439
+		{
+			title = "Floor Raise by 2 Units (EDGE compat)";
+			prefix = "GR";
+		}
+	}
+	translucent
+	{
+		title = "Translucent";
+		
+		284
+		{
+			title = "Translucent line (50% opaque)";
+			prefix = "";
+		}
+		285
+		{
+			title = "Translucent line (75% opaque)";
+			prefix = "";
+		}
+		286
+		{
+			title = "Translucent line (25% opaque)";
+			prefix = "";
+		}
+		287
+		{
+			title = "Translucent line (additive)";
+			prefix = "";
+		}
+		288
+		{
+			title = "Translucent line (100% opaque)";
+			prefix = "";
+		}
+		409
+		{
+			title = "Translucent line (20% opaque)";
+			prefix = "";
+		}
+		410
+		{
+			title = "Translucent line (40% opaque)";
+			prefix = "";
+		}
+		411
+		{
+			title = "Translucent line (60% opaque)";
+			prefix = "";
+		}
+		412
+		{
+			title = "Translucent line (80% opaque)";
+			prefix = "";
+		}
+	}
+	init
+	{
+		title = "Init";
+		
+		282
+		{
+			title = "Init Color (Legacy compat)";
+			prefix = "";
+		}
+		333
+		{
+			title = "Init Gravity";
+			prefix = "";
+		}
+		334
+		{
+			title = "Init Color";
+			prefix = "";
+		}
+		335
+		{
+			title = "Init Damage";
+			prefix = "";
+		}
+	}	
+	line
+	{
+		title = "Line";
+		
+		336
+		{
+			title = "Line Mirror";
+			prefix = "";
+		}
+		337
+		{
+			title = "Line Horizon";
+			prefix = "";
+		}
+	}
+	
+	floor
+	{
+		338
+		{
+			title = "Floor Waggle 24";
+			prefix = "W1";
+		}
+		339
+		{
+			title = "Floor Waggle 12";
+			prefix = "W1";
+		}
+	}
+	
+	plane
+	{
+		title = "Plane";
+		
+		340
+		{
+			title = "Plane Align Floor at front";
+			prefix = "";
+		}
+		341
+		{
+			title = "Plane Align Ceiling at front";
+			prefix = "";
+		}
+		342
+		{
+			title = "Plane Align Floor and Ceiling at front";
+			prefix = "";
+		}
+		343
+		{
+			title = "Plane Align Floor at back";
+			prefix = "";
+		}
+		344
+		{
+			title = "Plane Align Ceiling at back";
+			prefix = "";
+		}
+		345
+		{
+			title = "Plane Align Floor and Ceiling at back";
+			prefix = "";
+		}
+		346
+		{
+			title = "Plane Align Floor at back and Ceiling at front";
+			prefix = "";
+		}
+		347
+		{
+			title = "Plane Align Floor at front and Ceiling at back";
+			prefix = "";
+		}
+	}
+
+	autosave
+	{
+		title = "Autosave";
+		
+		348
+		{
+			title = "Autosave";
+			prefix = "W1";
+		}
+		349
+		{
+			title = "Autosave";
+			prefix = "S1";
+		}
+	}
+
+	transfer
+	{
+		title = "Transfer";
+		
+		350
+		{
+			title = "Transfer height fake floor";
+			prefix = "";
+		}
+		351
+		{
+			title = "Transfer height fake floor clip";
+			prefix = "";
+		}
+	}
+
+	scroll
+	{
+		352
+		{
+			title = "Copy ceiling scroller";
+			prefix = "";
+		}
+		353
+		{
+			title = "Copy floor scroller";
+			prefix = "";
+		}
+		354
+		{
+			title = "Copy carrying floor scroller";
+			prefix = "";
+		}
+	}		
+}
+
+zdoom
+{
+	polyobj
+	{
+		title = "Polyobject";
+		
+		59
+		{
+			title = "Polyobj Move to Spot (override)";
+			id = "Polyobj_OR_MoveToSpot";
+			arg0
+			{
+				title = "Polyobj Number";
+			}
+			arg1
+			{
+				title = "Speed (mu. per octic)";
+				type = 11;
+				enum = "stair_speeds";
+				default = 16;
+			}
+			arg2
+			{
+				title = "Target MapSpot Tag";
+				type = 14;
+			}
+		}
+		86
+		{
+			title = "Polyobj Move to Spot";
+			id = "Polyobj_MoveToSpot";
+			arg0
+			{
+				title = "Polyobj Number";
+			}
+			arg1
+			{
+				title = "Speed (mu. per octic)";
+				type = 11;
+				enum = "stair_speeds";
+				default = 16;
+			}
+			arg2
+			{
+				title = "Target MapSpot Tag";
+				type = 14;
+			}
+		}
+		87
+		{
+			title = "Polyobj Stop";
+			id = "Polyobj_Stop";
+			arg0
+			{
+				title = "Polyobj Number";
+			}
+		}
+		88
+		{
+			title = "Polyobj Move to";
+			id = "Polyobj_MoveTo";
+			arg0
+			{
+				title = "Polyobj Number";
+			}
+			arg1
+			{
+				title = "Speed (mu. per octic)";
+				type = 11;
+				enum = "stair_speeds";
+				default = 16;
+			}
+			arg2
+			{
+				title = "Target X Pos";
+			}
+			arg3
+			{
+				title = "Target Y Pos";
+			}
+		}
+		89
+		{
+			title = "Polyobj Move to (override)";
+			id = "Polyobj_OR_MoveTo";
+			arg0
+			{
+				title = "Polyobj Number";
+			}
+			arg1
+			{
+				title = "Speed (mu. per octic)";
+				type = 11;
+				enum = "stair_speeds";
+				default = 16;
+			}
+			arg2
+			{
+				title = "Target X Pos";
+			}
+			arg3
+			{
+				title = "Target Y Pos";
+			}
+		}
+	}
+
+	line
+	{
+		title = "Line";
+		
+		9
+		{
+			title = "Line Horizon";
+			id = "Line_Horizon";
+			requiresactivation = false;
+		}	
+		121	// Line Identification
+		{
+			arg1
+			{
+				title = "Flags";
+				type = 12;
+				enum
+				{
+					1 = "Sound zone boundary";
+					2 = "Jump-over railing";
+					4 = "Block floating monsters";
+					8 = "Clip middle texture";
+					16 = "Wrap middle texture";
+					32 = "Walkable middle texture";
+					64 = "Switch height check";
+					128 = "Front side only";
+				}
+			}
+			arg4
+			{
+				title = "Line ID High";
+			}
+		}
+		182
+		{
+			title = "Line Mirror";
+			id = "Line_Mirror";
+			requiresactivation = false;
+		}
+	}
+
+	door
+	{
+		14
+		{
+			title = "Door Animated";
+			id = "Door_Animated";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Animation Speed";
+				type = 11;
+				enum = "door_speeds";
+				default = 32;
+			}
+			arg2
+			{
+				title = "Close Delay";
+				type = 11;
+				enum = "reset_tics";
+				default = 140;
+			}
+			arg3
+			{
+				title = "Lock";
+				type = 11;
+				enum = "keys";
+			}
+		}
+		202
+		{
+			title = "Door Generic";
+			id = "Generic_Door";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Movement Speed";
+				type = 11;
+				enum = "flat_speeds";
+				default = 16;
+			}
+			arg2
+			{
+				title = "Type";
+				type = 11;
+				enum = "generic_door_types";
+			}
+			arg3
+			{
+				title = "Delay";
+				type = 11;
+				enum = "generic_door_delays";
+				default = 34;
+			}
+			arg4
+			{
+				title = "Lock";
+				type = 11;
+				enum = "keys";
+			}
+		}
+		
+		249
+		{
+			title = "Door Close Wait Open";
+			id = "Door_CloseWaitOpen";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Movement Speed";
+				type = 11;
+				enum = "flat_speeds";
+				default = 16;
+			}
+			arg2
+			{
+				title = "Delay";
+				type = 11;
+				enum = "generic_door_delays";
+				default = 34;
+			}
+			arg3
+			{
+				title = "Light Tag";
+				type = 13;
+			}
+		}
+	}
+
+	autosave
+	{
+		title = "Autosave";
+		
+		15
+		{
+			title = "Autosave";
+			id = "Autosave";
+		}
+	}
+
+	floor
+	{
+		28	// Floor Crusher Start
+		{
+			arg3
+			{
+				title = "Crush Mode";
+				type = 11;
+				enum = "crush_mode";
+			}
+		}
+		37
+		{
+			title = "Floor Move to Value";
+			id = "Floor_MoveToValue";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Movement Speed";
+				type = 11;
+				enum = "plat_speeds";
+				default = 16;
+			}
+			arg2
+			{
+				title = "Target Height";
+			}
+			arg3
+			{
+				title = "Negative Height";
+				type = 11;
+				enum = "noyes";
+			}
+		}
+		
+		138
+		{
+			title = "Floor Waggle";
+			id = "Floor_Waggle";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Amplitude";
+			}
+			arg2
+			{
+				title = "Frequency";
+			}
+			arg3
+			{
+				title = "Phase Offset (0-63)";
+			}
+			arg4
+			{
+				title = "Duration";
+				type = 11;
+				enum = "delay_seconds";
+				default = 5;
+			}
+		}
+		
+		200
+		{
+			title = "Floor Generic Change";
+			id = "Generic_Floor";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Movement Speed";
+				type = 11;
+				enum = "plat_speeds";
+				default = 16;
+			}
+			arg2
+			{
+				title = "Movement Amount";
+			}
+			arg3
+			{
+				title = "Target";
+				type = 11;
+				enum = "generic_floor_target";
+			}
+			arg4
+			{
+				title = "Options";
+				type = 12;
+				enum
+				{
+					0 = "No change";
+					1 = "Zero sector's special";
+					2 = "Change sector's floor texture";
+					3 = "Change sector's special";
+					4 = "Use numeric model if set, trigger model if not";
+					8 = "Raise floor if set, lower it if not";
+					16 = "Cause crushing damage";
+				}
+			}
+		}
+		
+		235
+		{
+			title = "Transfer Floor Texture and Special form Back Side";
+			id = "Floor_TransferTrigger";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+		}
+		236
+		{
+			title = "Transfer Floor Texture and Special using Numeric Change Model";
+			id = "Floor_TransferNumeric";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+		}
+		238
+		{
+			title = "Floor Raise to Lowest Ceiling";
+			id = "Floor_RaiseToLowestCeiling";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Movement Speed";
+				type = 11;
+				enum = "plat_speeds";
+				default = 16;
+			}
+		}
+		239
+		{
+			title = "Floor Raise by TxTy";
+			id = "Floor_RaiseByValueTxTy";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Movement Speed";
+				type = 11;
+				enum = "plat_speeds";
+				default = 16;
+			}
+			arg2
+			{
+				title = "Raise by";
+			}
+		}
+		
+		240
+		{
+			title = "Floor Raise by Texture";
+			id = "Floor_RaiseByTexture";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Movement Speed";
+				type = 11;
+				enum = "plat_speeds";
+				default = 16;
+			}
+		}
+		
+		241
+		{
+			title = "Floor Lower to Lowest TxTy";
+			id = "Floor_LowerToLowestTxTy";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Movement Speed";
+				type = 11;
+				enum = "plat_speeds";
+				default = 16;
+			}
+		}
+		
+		242
+		{
+			title = "Floor Lower to Highest Floor";
+			id = "Floor_LowerToHighest";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Movement Speed";
+				type = 11;
+				enum = "plat_speeds";
+				default = 16;
+			}
+			arg2
+			{
+				title = "Adjust Target Height";
+			}
+			arg3
+			{
+				title = "Force Adjust";
+				type = 11;
+				enum = "noyes";
+			}
+		}
+		250
+		{
+			title = "Floor Donut";
+			id = "Floor_Donut";
+			
+			arg0
+			{
+				title = "Center Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Pillar Lower Speed";
+				type = 11;
+				enum = "plat_speeds";
+				default = 16;
+			}
+			arg2
+			{
+				title = "Stairs Raise Speed";
+				type = 11;
+				enum = "stair_speeds";
+				default = 4;
+			}
+		}
+		
+		251
+		{
+			title = "Floor and Ceiling Lower and Raise";
+			id = "FloorAndCeiling_LowerRaise";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Floor Lowering Speed";
+				type = 11;
+				enum = "plat_speeds";
+				default = 16;
+			}
+			arg2
+			{
+				title = "Ceiling Raising Speed";
+				type = 11;
+				enum = "plat_speeds";
+				default = 16;
+			}
+			arg3
+			{
+				title = "Emulate Boom Bug";
+				type = 11;
+				enum
+				{
+					0 = "No";
+					1998 = "Yes";
+				}
+			}
+		}
+	}
+
+	stairs
+	{
+		204
+		{
+			title = "Stairs Generic Build";
+			id = "Generic_Stairs";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Movement Speed";
+				type = 11;
+				enum = "stair_speeds";
+				default = 4;
+			}
+			arg2
+			{
+				title = "Step Height";
+			}
+			arg3
+			{
+				title = "Options";
+				type = 12;
+				enum
+				{
+					1 = "Upwards";
+					2 = "Ignore Floor Texture";
+				}
+			}
+			arg4
+			{
+				title = "Reset Delay";
+				type = 11;
+				enum = "reset_tics";
+			}
+		}
+		
+		217
+		{
+			title = "Stairs Build up (Doom mode)";
+			id = "Stairs_BuildUpDoom";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Movement Speed";
+				type = 11;
+				enum = "stair_speeds";
+				default = 4;
+			}
+			arg2
+			{
+				title = "Step Height";
+			}
+			arg3
+			{
+				title = "Build Step Delay";
+				type = 11;
+				enum = "delay_tics";
+				default = 35;
+			}
+			arg4
+			{
+				title = "Reset Delay";
+				type = 11;
+				enum = "reset_tics";
+			}
+		}
+	}
+
+
+	pillar
+	{
+		94	// Pillar_BuildAndCrush
+		{
+			arg3
+			{
+				title = "Crush Damage";
+				default = 100;
+			}
+			arg4
+			{
+				title = "Crush Mode";
+				type = 11;
+				enum = "crush_mode";
+			}
+		}
+	}
+
+
+	forcefield
+	{
+		title = "Forcefield";
+		
+		33
+		{
+			title = "Forcefield Set";
+			id = "ForceField";
+			requiresactivation = false;
+		}
+		34
+		{
+			title = "Forcefield Remove";
+			id = "ClearForceField";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+		}
+	}
+
+
+	ceiling
+	{
+		title = "Ceiling";
+		
+		38
+		{
+			title = "Ceiling Waggle";
+			id = "Ceiling_Waggle";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Amplitude (in 1/8 mu.)";
+				default = 128;
+			}
+			arg2
+			{
+				title = "Frequency";
+				type = 11;
+				enum = "plat_speeds";
+				default = 16;
+			}
+			arg3
+			{
+				title = "Phase Offset (0-63)";
+			}
+			arg4
+			{
+				title = "Duration";
+				type = 11;
+				enum = "delay_seconds";
+				default = 5;
+			}
+		}
+		42	// Ceiling Crusher Start
+		{
+			arg3
+			{
+				title = "Crush Mode";
+				type = 11;
+				enum = "crush_mode";
+			}
+		}
+		43	// Ceiling Crush Once
+		{
+			arg3
+			{
+				title = "Crush Mode";
+				type = 11;
+				enum = "crush_mode";
+			}
+			
+		}
+		
+		97
+		{
+			title = "Ceiling Lower And Crush Dist";
+			id = "Ceiling_LowerAndCrushDist";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+		
+			arg1
+			{
+				title = "Movement Speed";
+				type = 11;
+				enum = "plat_speeds";
+				default = 16;
+				
+			}
+		
+			arg2
+			{
+				title = "Crush Damage";
+				default = 100;
+			}
+		
+			arg3
+			{
+				title = "Lip";
+			}
+		
+			arg4
+			{
+				title = "Crush Mode";
+				type = 11;
+				enum = "crush_mode";
+			}
+		}
+		
+		104
+		{
+			title = "Ceiling Crush And Raise Dist";
+			id = "Ceiling_CrushAndRaiseSilentDist";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+		
+			arg1
+			{
+				title = "Lip";
+			}
+		
+			arg2
+			{
+				title = "Movement Speed";
+				type = 11;
+				enum = "plat_speeds";
+				default = 16;
+			}
+		
+			arg3
+			{
+				title = "Crush Damage";
+				default = 100;
+			}
+		
+			arg4
+			{
+				title = "Crush Mode";
+				type = 11;
+				enum = "crush_mode";
+			}
+		}
+
+		45	// Ceiling Crush Once and Open
+		{
+			arg3
+			{
+				title = "Crush Mode";
+				type = 11;
+				enum = "crush_mode";
+			}
+			
+		}
+		47
+		{
+			title = "Ceiling Move to Value";
+			id = "Ceiling_MoveToValue";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Movement Speed";
+				type = 11;
+				enum = "plat_speeds";
+				default = 16;
+			}
+			arg2
+			{
+				title = "Target Height";
+			}
+			arg3
+			{
+				title = "Negative Height";
+				type = 11;
+				enum = "noyes";
+			}
+		}
+		169
+		{
+			title = "Ceiling Generic Crush (Hexen mode)";
+			id = "Generic_Crusher2";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Lower Speed";
+				type = 11;
+				enum = "plat_speeds";
+				default = 16;
+			}
+			arg2
+			{
+				title = "Raise Speed";
+				type = 11;
+				enum = "plat_speeds";
+				default = 16;
+			}
+			arg3
+			{
+				title = "Silent";
+				type = 11;
+				enum = "noyes";
+			}
+			arg4
+			{
+				title = "Crush Damage";
+				default = 100;
+			}
+		}
+		192
+		{
+			title = "Ceiling Lower to Highest Floor";
+			id = "Ceiling_LowerToHighestFloor";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Movement Speed";
+				type = 11;
+				enum = "plat_speeds";
+				default = 16;
+			}
+		}
+		193
+		{
+			title = "Ceiling Lower Instantly by Value * 8";
+			id = "Ceiling_LowerInstant";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg2
+			{
+				title = "Lower by (* 8)";
+			}
+		}
+		194
+		{
+			title = "Ceiling Raise Instantly by Value * 8";
+			id = "Ceiling_RaiseInstant";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg2
+			{
+				title = "Raise by (* 8)";
+			}
+		}
+		195
+		{
+			title = "Ceiling Crush Once and Open A";
+			id = "Ceiling_CrushRaiseAndStayA";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Lower Movement Speed";
+				type = 11;
+				enum = "plat_speeds";
+				default = 16;
+			}
+			arg2
+			{
+				title = "Raise Movement Speed";
+				type = 11;
+				enum = "plat_speeds";
+				default = 16;
+			}
+			arg3
+			{
+				title = "Crush Damage";
+				default = 100;
+			}
+			arg4
+			{
+				title = "Crush Mode";
+				type = 11;
+				enum = "crush_mode";
+			}
+			
+		}
+		196
+		{
+			title = "Ceiling Crush Start A";
+			id = "Ceiling_CrushAndRaiseA";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Lower Movement Speed";
+				type = 11;
+				enum = "plat_speeds";
+				default = 16;
+			}
+			arg2
+			{
+				title = "Raise Movement Speed";
+				type = 11;
+				enum = "plat_speeds";
+				default = 16;
+			}
+			arg3
+			{
+				title = "Crush Damage";
+				default = 100;
+			}
+			arg4
+			{
+				title = "Crush Mode";
+				type = 11;
+				enum = "crush_mode";
+			}
+			
+		}
+		197
+		{
+			title = "Ceiling Crush Start A (silent)";
+			id = "Ceiling_CrushAndRaiseSilentA";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Lower Movement Speed";
+				type = 11;
+				enum = "plat_speeds";
+				default = 16;
+			}
+			arg2
+			{
+				title = "Raise Movement Speed";
+				type = 11;
+				enum = "plat_speeds";
+				default = 16;
+			}
+			arg3
+			{
+				title = "Crush Damage";
+				default = 100;
+			}
+			arg4
+			{
+				title = "Crush Mode";
+				type = 11;
+				enum = "crush_mode";
+			}
+			
+		}
+		198
+		{
+			title = "Ceiling Raise by Value * 8";
+			id = "Ceiling_RaiseByValueTimes8";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Movement Speed";
+				type = 11;
+				enum = "plat_speeds";
+				default = 16;
+			}
+			arg2
+			{
+				title = "Raise by (* 8)";
+			}
+		}
+		199
+		{
+			title = "Ceiling Lower by Value * 8";
+			id = "Ceiling_LowerByValueTimes8";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Movement Speed";
+				type = 11;
+				enum = "plat_speeds";
+				default = 16;
+			}
+			arg2
+			{
+				title = "Lower by (* 8)";
+			}
+		}
+		
+		201
+		{
+			title = "Ceiling Generic Change";
+			id = "Generic_Ceiling";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Movement Speed";
+				type = 11;
+				enum = "plat_speeds";
+				default = 16;
+			}
+			arg2
+			{
+				title = "Movement Amount";
+			}
+			arg3
+			{
+				title = "Target";
+				type = 11;
+				enum = "generic_ceiling_target";
+			}
+			arg4
+			{
+				title = "Options";
+				type = 12;
+				enum
+				{
+					0 = "No change";
+					1 = "Zero sector's special";
+					2 = "Change sector's ceiling texture";
+					3 = "Change sector's special";
+					4 = "Use numeric model if set, trigger model if not";
+					8 = "Raise ceiling if set, lower it if not";
+					16 = "Cause crushing damage";
+				}
+			}
+		}
+		205
+		{
+			title = "Ceiling Generic Crush (Doom mode)";
+			id = "Generic_Crusher";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Lowering Speed";
+				type = 11;
+				enum = "plat_speeds";
+				default = 16;
+			}
+			arg2
+			{
+				title = "Raising Speed";
+				type = 11;
+				enum = "plat_speeds";
+				default = 16;
+			}
+			arg3
+			{
+				title = "Silent";
+				type = 11;
+				enum = "noyes";
+			}
+			arg4
+			{
+				title = "Crush Damage";
+				default = 100;
+			}
+		}
+		252
+		{
+			title = "Ceiling Raise to Nearest Ceiling";
+			id = "Ceiling_RaiseToNearest";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Movement Speed";
+				type = 11;
+				enum = "plat_speeds";
+				default = 16;
+			}
+		}
+		253
+		{
+			title = "Ceiling Lower to Lowest Ceiling";
+			id = "Ceiling_LowerToLowest";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Movement Speed";
+				type = 11;
+				enum = "plat_speeds";
+				default = 16;
+			}
+		}
+		254
+		{
+			title = "Ceiling Lower to Floor";
+			id = "Ceiling_LowerToFloor";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Movement Speed";
+				type = 11;
+				enum = "plat_speeds";
+				default = 16;
+			}
+		}
+		255
+		{
+			title = "Ceiling Crush Once and Open A (silent)";
+			id = "Ceiling_CrushRaiseAndStaySilA";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Lowering Speed";
+				type = 11;
+				enum = "plat_speeds";
+				default = 16;
+			}
+			arg2
+			{
+				title = "Raising Speed";
+				type = 11;
+				enum = "plat_speeds";
+				default = 16;
+			}
+			arg3
+			{
+				title = "Crush Damage";
+				default = 100;
+			}
+			arg4
+			{
+				title = "Crush Mode";
+				type = 11;
+				enum = "crush_mode";
+			}
+		}
+	}
+
+	breakable
+	{
+		title = "Breakable";
+		
+		49
+		{
+			title = "Breakable Glass";
+			id = "GlassBreak";
+			
+			arg0
+			{
+				title = "Spawn Glass Shards";
+				type = 11;
+				enum = "yesno";
+			}
+		}
+	}
+
+	transfer
+	{
+		title = "Transfer";
+		
+		50
+		{
+			title = "Transfer Brightness Level";
+			id = "ExtraFloor_LightOnly";
+			requiresactivation = false;
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Options";
+				type = 11;
+				enum
+				{
+					0 = "From control sector's ceiling down to the top of another type 0 light";
+					1 = "From control sector's ceiling down to control sector's floor";
+					2 = "From control sector's ceiling down to the top of another extra light";
+				}
+			}
+		}
+		209
+		{
+			title = "Transfer Heights";
+			id = "Transfer_Heights";
+			requiresactivation = false;
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Options";
+				type = 12;
+				enum
+				{
+					0 = "Boom mode";
+					1 = "Use fake ceiling/floor";
+					2 = "Draw fake floor only";
+					4 = "Inside sector only";
+					8 = "Swimmable below fake";
+					16 = "Do not draw";
+					32 = "Keep lighting";
+				}
+			}
+		}
+		
+		210
+		{
+			title = "Transfer Floor Brightness";
+			id = "Transfer_FloorLight";
+			requiresactivation = false;
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+		}
+		211
+		{
+			title = "Transfer Ceiling Brightness";
+			id = "Transfer_CeilingLight";
+			requiresactivation = false;
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+		}
+		16
+		{
+			title = "Transfer Wall Brightness";
+			id = "Transfer_WallLight";
+			requiresactivation = false;
+			
+			arg0
+			{
+				title = "Line Tag";
+				type = 15;
+			}
+			arg1
+			{
+				title = "Flags";
+				type = 12;
+				enum
+				{
+					1 = "Transfer light level to front side";
+					2 = "Transfer light level to back side";
+					4 = "Ignore fake contrast";
+				}
+			}
+		}
+		
+	}
+
+	platform
+	{
+		172
+		{
+			title = "Platform Raise to Nearest Wait Lower";
+			id = "Plat_UpNearestWaitDownStay";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Movement Speed";
+				type = 11;
+				enum = "plat_speeds";
+				default = 16;
+			}
+			arg2
+			{
+				title = "Reverse Delay (tics)";
+				type = 11;
+				enum = "delay_tics";
+				default = 35;
+			}
+		}
+		203
+		{
+			title = "Platform Generic Change";
+			id = "Generic_Lift";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Movement Speed";
+				type = 11;
+				enum = "plat_speeds";
+				default = 16;
+			}
+			arg2
+			{
+				title = "Reverse Delay (tics)";
+				type = 11;
+				enum = "delay_tics";
+				default = 35;
+			}
+			arg3
+			{
+				title = "Type";
+				type = 11;
+				enum = "generic_lift_types";
+			}
+			arg4
+			{
+				title = "Movement Amount";
+			}
+		}
+		206
+		{
+			title = "Platform Lower Wait Raise (lip)";
+			id = "Plat_DownWaitUpStayLip";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Movement Speed";
+				type = 11;
+				enum = "plat_speeds";
+				default = 16;
+			}
+			arg2
+			{
+				title = "Reverse Delay (tics)";
+				type = 11;
+				enum = "delay_tics";
+				default = 35;
+			}
+			arg3
+			{
+				title = "Lip Amount";
+			}
+			arg4
+			{
+				title = "Sound Type";
+				type = 11;
+				enum = "plat_sound";
+			}
+		}
+		207
+		{
+			title = "Platform Perpetual Move (lip)";
+			id = "Plat_PerpetualRaiseLip";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Movement Speed";
+				type = 11;
+				enum = "plat_speeds";
+				default = 16;
+			}
+			arg2
+			{
+				title = "Reverse Delay (tics)";
+				type = 11;
+				enum = "delay_tics";
+				default = 35;
+			}
+			arg3
+			{
+				title = "Lip Amount";
+			}
+		}
+		228
+		{
+			title = "Platform Raise Tx0";
+			id = "Plat_RaiseAndStayTx0";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Movement Speed";
+				type = 11;
+				enum = "plat_speeds";
+				default = 16;
+			}
+			arg2
+			{
+				title = "Lockout Mode";
+				type = 11;
+				enum
+				{
+					0 = "Lockout in Heretic only";
+					1 = "Don't lockout";
+					2 = "Lockout in all games";
+				}
+			}
+		}
+		230
+		{
+			title = "Platform Raise by Value Tx (* 8)";
+			id = "Plat_UpByValueStayTx";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Movement Speed";
+				type = 11;
+				enum = "plat_speeds";
+				default = 16;
+			}
+			arg2
+			{
+				title = "Raise by (* 8)";
+			}
+		}
+		231
+		{
+			title = "Platform Toggle Ceiling";
+			id = "Plat_ToggleCeiling";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+		}
+	}
+
+	teleport
+	{
+		title = "Teleport";
+		
+		39
+		{
+			title = "Teleport to Pain State (silent)";
+			id = "Teleport_ZombieChanger";
+			
+			arg0
+			{
+				title = "Target MapSpot Tag";
+				type = 14;
+			}
+			arg1
+			{
+				title = "Target Sector Tag";
+				type = 13;
+			}
+		}
+		70	// Teleport
+		{
+			arg2
+			{
+				title = "Source Fog";
+				type = 11;
+				enum = "yesno";
+			}
+		}
+		71	// Teleport_NoFog
+		{
+			arg3
+			{
+				title = "Keep rel. Height";
+				type = 11;
+				enum = "noyes";
+			}
+		}
+		74	// Teleport_NewMap
+		{
+			arg2
+			{
+				title = "Keep Orientation";
+				type = 11;
+				enum = "noyes";
+			}
+		}
+		76
+		{
+			title = "Teleport Other";
+			id = "TeleportOther";
+			
+			arg0
+			{
+				title = "Thing Tag";
+				type = 14;
+			}
+			arg1
+			{
+				title = "Target MapSpot Tag";
+				type = 14;
+			}
+			arg2
+			{
+				title = "Fog";
+				type = 11;
+				enum = "noyes";
+			}
+		}
+		77
+		{
+			title = "Teleport Group";
+			id = "TeleportGroup";
+			
+			arg0
+			{
+				title = "Thing Tag";
+				type = 14;
+			}
+			arg1
+			{
+				title = "Source Teleport Dest. Tag";
+				type = 14;
+			}
+			arg2
+			{
+				title = "Target Teleport Dest. Tag";
+				type = 14;
+			}
+			arg3
+			{
+				title = "Move Source";
+				type = 11;
+				enum = "noyes";
+			}
+			arg4
+			{
+				title = "Fog";
+				type = 11;
+				enum = "noyes";
+			}
+		}
+		78
+		{
+			title = "Teleport in Sector";
+			id = "TeleportInSector";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Source MapSpot Tag";
+				type = 14;
+			}
+			arg2
+			{
+				title = "Target MapSpot Tag";
+				type = 14;
+			}
+			arg3
+			{
+				title = "Fog";
+				type = 11;
+				enum = "noyes";
+			}
+			arg4
+			{
+				title = "Group Thing Tag";
+				type = 14;
+			}
+		}
+		154
+		{
+			title = "Teleport (no Stop)";
+			id = "Teleport_NoStop";
+			
+			arg0
+			{
+				title = "Target MapSpot Tag";
+				type = 14;
+			}
+			arg1
+			{
+				title = "Target Sector Tag";
+				type = 13;
+			}
+			arg2
+			{
+				title = "Fog";
+				type = 11;
+				enum = "yesno";
+			}
+		}
+		215
+		{
+			title = "Teleport to Line";
+			id = "Teleport_Line";
+			
+			arg1
+			{
+				title = "Target Line Tag";
+				type = 15;
+			}
+			arg2
+			{
+				title = "Reverse Angle";
+				type = 11;
+				enum = "noyes";
+			}
+		}
+	}
+
+	thing
+	{
+		17
+		{
+			title = "Thing Raise";
+			id = "Thing_Raise";
+			
+			arg0
+			{
+				title = "Thing Tag";
+				type = 14;
+			}
+		}
+		18
+		{
+			title = "Start Conversation";
+			id = "StartConversation";
+			
+			arg0
+			{
+				title = "Thing Tag";
+				type = 14;
+			}
+			arg1
+			{
+				title = "Face Talker";
+				type = 11;
+				enum = "noyes";
+				default = 1;
+			}
+		}
+		19
+		{
+			title = "Thing Stop";
+			id = "Thing_Stop";
+			
+			arg0
+			{
+				title = "Thing Tag";
+				type = 14;
+			}
+		}
+		72 // ThrustThing
+		{
+			arg2
+			{
+				title = "No Limit";
+				type = 11;
+				enum = "noyes";
+			}
+			arg3
+			{
+				title = "Target Thing Tag";
+				type = 14;
+			}
+		}
+		73 // DamageThing
+		{
+			arg1
+			{
+				title = "Death";
+				type = 11;
+				enum = "death_types";
+			}
+		}
+		79
+		{
+			title = "Set Conversation";
+			id = "Thing_SetConversation";
+			arg0
+			{
+				title = "Thing Tag";
+				type = 14;
+			}
+			arg1
+			{
+				title = "Conversation ID";
+			}
+		}
+		119
+		{
+			title = "Damage Thing by Tag";
+			id = "Thing_Damage";
+			
+			arg0
+			{
+				title = "Thing Tag";
+				type = 14;
+			}
+			arg1
+			{
+				title = "Damage";
+				default = 100;
+			}
+			arg2
+			{
+				title = "Death";
+				type = 11;
+				enum = "death_types";
+			}
+		}
+		125
+		{
+			title = "Move Thing";
+			id = "Thing_Move";
+			
+			arg0
+			{
+				title = "Thing Tag";
+				type = 14;
+			}
+			arg1
+			{
+				title = "Target Thing Tag";
+				type = 14;
+			}
+			arg2
+			{
+				title = "Fog";
+				type = 11;
+				enum = "yesno";
+			}
+		}
+		127
+		{
+			title = "Thing Set Special";
+			id = "Thing_SetSpecial";
+			
+			arg0
+			{
+				title = "Thing Tag";
+				type = 14;
+			}
+			arg1
+			{
+				title = "Special";
+				type = 4;
+			}
+			arg2
+			{
+				title = "Arg 1";
+			}
+			arg3
+			{
+				title = "Arg 2";
+			}
+			arg4
+			{
+				title = "Arg 3";
+			}
+		}
+		128
+		{
+			title = "Thing Thrust Z";
+			id = "ThrustThingZ";
+			
+			arg0
+			{
+				title = "Thing Tag";
+				type = 14;
+			}
+			arg1
+			{
+				title = "Force";
+			}
+			arg2
+			{
+				title = "Down/Up";
+				type = 11;
+				enum = "updown";
+			}
+			arg3
+			{
+				title = "Set/Add";
+				type = 11;
+				enum = "setadd";
+			}
+		}
+		135	// Thing_Spawn
+		{
+			arg3
+			{
+				title = "New Thing Tag";
+				type = 14;
+			}
+		}
+		137	// Thing_SpawnNoFog
+		{
+			arg3
+			{
+				title = "New Thing Tag";
+				type = 14;
+			}
+		}
+		139
+		{
+			title = "Spawn Thing Facing";
+			id = "Thing_SpawnFacing";
+			
+			arg0
+			{
+				title = "Mapspot Tag";
+				type = 14;
+			}
+			arg1
+			{
+				title = "Spawn Thing";
+				type = 11;
+				enum = "spawnthing";
+			}
+			arg2
+			{
+				title = "Fog";
+				type = 11;
+				enum = "yesno";
+			}
+			arg3
+			{
+				title = "New Thing Tag";
+				type = 14;
+			}
+		}
+		175
+		{
+			title = "Spawn Projectile (Intercept)";
+			id = "Thing_ProjectileIntercept";
+			
+			arg0
+			{
+				title = "Mapspot Tag";
+				type = 14;
+			}
+			arg1
+			{
+				title = "Projectile Type";
+				type = 11;
+				enum = "spawn_projectile";
+			}
+			arg2
+			{
+				title = "Speed";
+			}
+			arg3
+			{
+				title = "Target Thing Tag";
+				type = 14;
+			}
+			arg4
+			{
+				title = "New Thing Tag";
+				type = 14;
+			}
+		}
+		176
+		{
+			title = "Change Thing Tag";
+			id = "Thing_ChangeTID";
+			
+			arg0
+			{
+				title = "Old Thing Tag";
+				type = 14;
+			}
+			arg1
+			{
+				title = "New Thing Tag";
+				type = 14;
+			}
+		}
+		177
+		{
+			title = "Thing Hate";
+			id = "Thing_Hate";
+			
+			arg0
+			{
+				title = "Hater Tag";
+				type = 14;
+			}
+			arg1
+			{
+				title = "Hatee Tag";
+				type = 14;
+			}
+			arg2
+			{
+				title = "Hate";
+				type = 11;
+				enum
+				{
+					0 = "Target only";
+					1 = "Target and Player";
+					2 = "Forced Target and Player";
+					3 = "Hunt Target and Player";
+					4 = "Forced Hunt Target and Player";
+					5 = "Target, Ignore Player";
+					6 = "Forced Target, Ignore Player";
+				}
+			}
+		}
+		178
+		{
+			title = "Spawn Aimed Projectile";
+			id = "Thing_ProjectileAimed";
+			
+			arg0
+			{
+				title = "Mapspot Tag";
+				type = 14;
+			}
+			arg1
+			{
+				title = "Projectile Type";
+				type = 11;
+				enum = "spawn_projectile";
+			}
+			arg2
+			{
+				title = "Speed";
+			}
+			arg3
+			{
+				title = "Target Thing Tag";
+				type = 14;
+			}
+			arg4
+			{
+				title = "New Thing Tag";
+				type = 14;
+			}
+		}
+		180
+		{
+			title = "Set Thing Translation";
+			id = "Thing_SetTranslation";
+			
+			arg0
+			{
+				title = "Thing Tag";
+				type = 14;
+			}
+			arg1
+			{
+				title = "Translation Index";
+			}
+		}
+		229
+		{
+			title = "Thing Set Goal";
+			id = "Thing_SetGoal";
+			
+			arg0
+			{
+				title = "Monster Thing Tag";
+				type = 14;
+			}
+			arg1
+			{
+				title = "Target Thing Tag";
+				type = 14;
+			}
+			arg2
+			{
+				title = "Delay";
+				type = 11;
+				enum 
+				{
+					0 = "No Delay";
+					1 = "1 Second";
+					2 = "2 Seconds";
+					3 = "3 Seconds";
+					5 = "5 Seconds";
+					10 = "10 Seconds";
+					15 = "15 Seconds";
+					20 = "20 Seconds";
+					25 = "25 Seconds";
+					30 = "30 Seconds";
+					60 = "1 Minute";
+				}
+			}
+			arg3
+			{
+				title = "Don't Chase Target";
+				type = 11;
+				enum = "falsetrue";
+			}
+		}
+		248
+		{
+			title = "Heal Thing";
+			id = "HealThing";
+			
+			arg0
+			{
+				title = "Heal Amount";
+			}
+		}
+		
+	}
+
+	script
+	{
+		title = "Script";
+		
+		83	// Script Locked Execute
+		{
+			arg4	// Key Number
+			{
+				type = 11;
+				enum = "keys";
+			}
+		}
+		84
+		{
+			title = "Script Execute with Result";
+			id = "ACS_ExecuteWithResult";
+			
+			arg0
+			{
+				title = "Script Number";
+			}
+			arg1
+			{
+				title = "Script Argument 1";
+			}
+			arg2
+			{
+				title = "Script Argument 2";
+			}
+			arg3
+			{
+				title = "Script Argument 3";
+			}
+			arg4
+			{
+				title = "Script Argument 4";
+			}
+		}
+		85
+		{
+			title = "Script Locked Execute (Door message)";
+			id = "ACS_LockedExecuteDoor";
+			
+			arg0
+			{
+				title = "Script Number";
+			}
+			
+			arg1
+			{
+				title = "Map Number";
+			}
+			
+			arg2
+			{
+				title = "Script Argument 1";
+			}
+			
+			arg3
+			{
+				title = "Script Argument 2";
+			}
+			
+			arg4
+			{
+				title = "Key Number";
+				type = 11;
+				enum = "keys";
+			}
+		}
+		158
+		{
+			title = "FraggleScript Execute";
+			id = "FS_Execute";
+			
+			arg0
+			{
+				title = "Script Number";
+			}
+			arg1
+			{
+				title = "Side";
+				type = 11;
+				enum
+				{
+					0 = "Both";
+					1 = "Front";
+				}
+			}
+			arg2
+			{
+				title = "Key";
+				type = 11;
+				enum = "keys";
+			}
+			arg3
+			{
+				title = "Message";
+				type = 11;
+				enum
+				{
+					0 = "Open door";
+					1 = "Activate object";
+				}
+			}
+		}
+		226
+		{
+			title = "Script Execute Always";
+			id = "ACS_ExecuteAlways";
+			
+			arg0
+			{
+				title = "Script Number";
+			}
+			
+			arg1
+			{
+				title = "Map Number";
+			}
+			
+			arg2
+			{
+				title = "Script Argument 1";
+			}
+			
+			arg3
+			{
+				title = "Script Argument 2";
+			}
+			
+			arg4
+			{
+				title = "Script Argument 3";
+			}
+		}
+	}
+
+	end
+	{
+		243
+		{
+			title = "End Normal";
+			id = "Exit_Normal";
+			
+			arg0
+			{
+				title = "Position";
+			}
+		}
+		244
+		{
+			title = "End Secret";
+			id = "Exit_Secret";
+			
+			arg0
+			{
+				title = "Position";
+			}
+		}
+	}
+
+	scroll
+	{
+		title = "Scroll";
+		
+		52
+		{
+			title = "Scroll Wall";
+			id = "Scroll_Wall";
+			requiresactivation = false;
+			
+			arg0
+			{
+				title = "Line Tag";
+				type = 15;
+			}
+			arg1
+			{
+				title = "Horizontal speed";
+			}
+			arg2
+			{
+				title = "Vertical speed";
+			}
+			arg3
+			{
+				title = "Side";
+				type = 11;
+				enum = "frontback";
+			}
+			arg4
+			{
+				title = "Flags";
+				type = 12;
+				enum
+				{
+					1 = "Scroll upper";
+					2 = "Scroll middle";
+					4 = "Scroll lower";
+				}
+			}
+		}
+		
+		100 //Scroll_Texture_Left
+		{
+			arg1
+			{
+				title = "Sidedef Part";
+				type = 12;
+				enum = "sidedef_part";
+			}
+		}
+		
+		101 //Scroll_Texture_Right
+		{
+			arg1
+			{
+				title = "Sidedef Part";
+				type = 12;
+				enum = "sidedef_part";
+			}
+		}
+		
+		102 //Scroll_Texture_Up
+		{
+			arg1
+			{
+				title = "Sidedef Part";
+				type = 12;
+				enum = "sidedef_part";
+			}
+		}
+		
+		103 //Scroll_Texture_Down
+		{
+			arg1
+			{
+				title = "Sidedef Part";
+				type = 12;
+				enum = "sidedef_part";
+			}
+		}
+		
+		221
+		{
+			title = "Scroll Texture Both";
+			id = "Scroll_Texture_Both";
+			requiresactivation = false;
+			
+			arg0
+			{
+				title = "Line Tag";
+				type = 15;
+			}
+			arg1
+			{
+				title = "Left Speed";
+				type = 11;
+				enum = "scroll_speeds";
+			}
+			arg2
+			{
+				title = "Right Speed";
+				type = 11;
+				enum = "scroll_speeds";
+			}
+			arg3
+			{
+				title = "Down Speed";
+				type = 11;
+				enum = "scroll_speeds";
+			}
+			arg4
+			{
+				title = "Up Speed";
+				type = 11;
+				enum = "scroll_speeds";
+			}
+		}
+		222
+		{
+			title = "Scroll Texture Model";
+			id = "Scroll_Texture_Model";
+			requiresactivation = false;
+			
+			arg1
+			{
+				title = "Options";
+				type = 12;
+				enum
+				{
+					1 = "Displacement";
+					2 = "Accelerative";
+				}
+			}
+		}
+		
+		223
+		{
+			title = "Scroll Floor";
+			id = "Scroll_Floor";
+			requiresactivation = false;
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Options";
+				type = 12;
+				enum
+				{
+					1 = "Displacement";
+					2 = "Accelerative";
+					4 = "Scroll by linedef dx/dy";
+				}
+			}
+			arg2
+			{
+				title = "Scroll";
+				type = 11;
+				enum
+				{
+					1 = "Texture only";
+					2 = "Things only";
+					4 = "Both";
+				}
+			}
+			arg3
+			{
+				title = "Horizontal Speed";
+				type = 11;
+				enum = "scroll_speeds";
+			}
+			arg4
+			{
+				title = "Vertical Speed";
+				type = 11;
+				enum = "scroll_speeds";
+			}
+		}
+		224
+		{
+			title = "Scroll Ceiling";
+			id = "Scroll_Ceiling";
+			requiresactivation = false;
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Options";
+				type = 12;
+				enum
+				{
+					1 = "Displacement";
+					2 = "Accelerative";
+					4 = "Scroll by linedef dx/dy";
+				}
+			}
+			arg3
+			{
+				title = "Horizontal Speed";
+				type = 11;
+				enum = "scroll_speeds";
+			}
+			arg4
+			{
+				title = "Vertical Speed";
+				type = 11;
+				enum = "scroll_speeds";
+			}
+		}
+		225
+		{
+			title = "Scroll Texture by Offsets";
+			id = "Scroll_Texture_Offsets";
+			requiresactivation = false;
+			
+			arg0
+			{
+				title = "Sidedef Part";
+				type = 12;
+				enum = "sidedef_part";
+			}
+		}
+	}
+
+
+	light
+	{
+		109
+		{
+			title = "Lightning Control";
+			id = "Light_ForceLightning";
+			
+			arg0
+			{
+				title = "Mode";
+				type = 11;
+				enum
+				{
+					0 = "Enable Lightning Mode";
+					1 = "Flash Once";
+					2 = "Terminate Lightning Mode";
+				}
+			}
+		}
+		117
+		{
+			title = "Light Stop";
+			id = "Light_Stop";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+		}
+		232
+		{
+			title = "Light Strobe (Doom mode)";
+			id = "Light_StrobeDoom";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Brightest Duration (tics)";
+				type = 11;
+				enum = "delay_tics";
+				default = 35;
+			}
+			arg2
+			{
+				title = "Darkest Duration (tics)";
+				type = 11;
+				enum = "delay_tics";
+				default = 35;
+			}
+		}
+		233
+		{
+			title = "Light Change to Darkest Neightbour";
+			id = "Light_MinNeighbor";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+		}
+		234
+		{
+			title = "Light Change to Brightest Neightbour";
+			id = "Light_MaxNeighbor";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+		}
+	}
+
+	sector
+	{
+		title = "Sector";
+		
+		48
+		{
+			title = "Sector Attach 3D Midtex";
+			id = "Sector_Attach3dMidtex";
+			requiresactivation = false;
+			
+			arg0
+			{
+				title = "Line Tag";
+				type = 15;
+			}
+			arg1
+			{
+				title = "Sector Tag";
+				type = 13;
+			}		
+			arg2
+			{
+				title = "Floor / Ceiling";
+				type = 11;
+				enum = "floorceiling";
+			}
+		}
+		51
+		{
+			title = "Sector Set Link";
+			id = "Sector_SetLink";
+			
+			arg0
+			{
+				title = "Control Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Target Sector Tag";
+				type = 13;
+			}
+			arg2
+			{
+				title = "Floor / Ceiling";
+				type = 11;
+				enum = "floorceiling";
+			}
+			arg3
+			{
+				title = "Move Type";
+				type = 12;
+				enum
+				{
+					0 = "Unlink target sector(s) from the control sector";
+					1 = "Link target sector's floor to the specified surface of the control sector";
+					2 = "Link target sector's ceiling to the specified surface of the control sector";
+					4 = "Target floor movement is the opposite direction as the control sector's surface (requires bit 1)";
+					8 = "Target ceiling movement is the opposite direction as the control sector's surface (requires bit 2)";
+				}
+			}
+		}
+		
+		98
+		{
+			title = "Sector Set Translucent";
+			id = "Sector_SetTranslucent";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Floor / Ceiling";
+				type = 11;
+				enum = "floorceiling";
+			}
+			arg2
+			{
+				title = "Opacity";
+			}
+			arg3
+			{
+				title = "Translucency Type";
+				type = 11;
+				enum
+				{
+					0 = "Normal";
+					1 = "Additive";
+				}
+			}
+		}
+
+		54
+		{
+			title = "Sector Change Flags";
+			id = "Sector_ChangeFlags";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Set Flags";
+				type = 12;
+				enum = "sector_flags";
+			}
+			arg2
+			{
+				title = "Clear Flags";
+				type = 12;
+				enum = "sector_flags";
+			}
+		}
+		57
+		{
+			title = "Sector Set Portal";
+			id = "Sector_SetPortal";
+			requiresactivation = false;
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Portal Type";
+				type = 11;
+				enum
+				{
+					0 = "Link to portal with same tag";
+					1 = "Copy portal from second tag";
+					2 = "Eternity-style skybox portal";
+				}
+			}
+			arg2
+			{
+				title = "Floor / Ceiling";
+				type = 11;
+				enum = "floorceilingboth";
+			}
+			arg3
+			{
+				title = "Misc";
+			}
+			arg4
+			{
+				title = "Opacity";
+			}
+		}
+		58
+		{
+			title = "Sector Copy Scroller";
+			id = "Sector_CopyScroller";
+			requiresactivation = false;
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Scroller Type";
+				type = 12;
+				enum
+				{
+					1 = "Copy ceiling scroller";
+					2 = "Copy floor scroller";
+					4 = "Copy carrying effect";
+				}
+			}		
+		}
+		160
+		{
+			title = "Sector 3D Floor (OpenGL only)";
+			id = "Sector_Set3dFloor";
+			requiresactivation = false;
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Type";
+				type = 12;
+				enum
+				{
+					0 = "Vavoom-Style";
+					1 = "Solid";
+					2 = "Swimmable";
+					3 = "Non-Solid";
+					4 = "Render-Inside";
+					16 = "Invert Visibility Rules";
+					32 = "Invert Shootability Rules";
+				}
+				default = 1;
+			}
+			arg2
+			{
+				title = "Flags";
+				type = 12;
+				enum
+				{
+					1 = "Disable light effects";
+					2 = "Restrict light inside";
+					4 = "Fog effect";
+					8 = "Ignore bottom height";
+					16 = "Use upper texture";
+					32 = "Use lower texture";
+					64 = "Additive transluency";
+				}
+			}
+			arg3
+			{
+				title = "Alpha";
+				default = 255;
+			}
+		}
+		161
+		{
+			title = "Sector Set Contents (Vavoom compatibility)";
+			id = "Sector_SetContents";
+			
+			arg0
+			{
+				title = "Type";
+				type = 11;
+				enum
+				{
+					0 = "Empty";
+					1 = "Water";
+					2 = "Lava";
+					3 = "Nukage";
+					4 = "Slime";
+					5 = "Hellslime";
+					6 = "Blood";
+					7 = "Sludge";
+					8 = "Hazard";
+					9 = "Boom-style water";
+				}
+			}
+			arg1
+			{
+				title = "Translucency Percent";
+			}
+			arg2
+			{
+				title = "Flags";
+				type = 12;
+				enum
+				{
+					1 = "Don't block movement";
+					2 = "Don't block sight";
+					4 = "Don't block shooting";
+					8 = "Additive translucency";
+				}
+			}
+		}
+		185
+		{
+			title = "Sector Rotate Flat";
+			id = "Sector_SetRotation";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Floor Angle";
+				type = 8;
+			}
+			arg2
+			{
+				title = "Ceiling Angle";
+				type = 8;
+			}
+		}
+		186
+		{
+			title = "Sector Ceiling Panning";
+			id = "Sector_SetCeilingPanning";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Horizontal Integral";
+			}
+			arg2
+			{
+				title = "Horizontal Fractional";
+			}
+			arg3
+			{
+				title = "Vertical Integral";
+			}
+			arg4
+			{
+				title = "Vertical Fractional";
+			}
+		}
+		187
+		{
+			title = "Sector Floor Panning";
+			id = "Sector_SetFloorPanning";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Horizontal Integral";
+			}
+			arg2
+			{
+				title = "Horizontal Fractional";
+			}
+			arg3
+			{
+				title = "Vertical Integral";
+			}
+			arg4
+			{
+				title = "Vertical Fractional";
+			}
+		}
+		188
+		{
+			title = "Sector Ceiling Scale";
+			id = "Sector_SetCeilingScale";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Horizontal Integral";
+			}
+			arg2
+			{
+				title = "Horizontal Fractional";
+			}
+			arg3
+			{
+				title = "Vertical Integral";
+			}
+			arg4
+			{
+				title = "Vertical Fractional";
+			}
+		}
+		189
+		{
+			title = "Sector Floor Scale";
+			id = "Sector_SetFloorScale";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Horizontal Integral";
+			}
+			arg2
+			{
+				title = "Horizontal Fractional";
+			}
+			arg3
+			{
+				title = "Vertical Integral";
+			}
+			arg4
+			{
+				title = "Vertical Fractional";
+			}
+		}
+		212
+		{
+			title = "Sector Color";
+			id = "Sector_SetColor";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Red";
+			}
+			arg2
+			{
+				title = "Green";
+			}
+			arg3
+			{
+				title = "Blue";
+			}
+			arg4
+			{
+				title = "Desaturation";
+			}
+		}
+		213
+		{
+			title = "Sector Fade";
+			id = "Sector_SetFade";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Red";
+			}
+			arg2
+			{
+				title = "Green";
+			}
+			arg3
+			{
+				title = "Blue";
+			}
+		}
+		214
+		{
+			title = "Sector Damage";
+			id = "Sector_SetDamage";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Damage Amount";
+				default = 15;
+			}
+			arg2
+			{
+				title = "Death";
+				type = 11;
+				enum = "death_types";
+			}
+		}
+		216
+		{
+			title = "Sector Gravity";
+			id = "Sector_SetGravity";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Gravity Integral";
+			}
+			arg2
+			{
+				title = "Gravity Fractional";
+			}
+		}
+		
+		218
+		{
+			title = "Sector Wind";
+			id = "Sector_SetWind";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Wind Strength";
+			}
+			arg2
+			{
+				title = "Wind Angle";
+				type = 22;
+			}
+			arg3
+			{
+				title = "Use Line Vector";
+				type = 11;
+				enum = "noyes";
+			}
+		}
+		219
+		{
+			title = "Sector Friction";
+			id = "Sector_SetFriction";
+			requiresactivation = false;
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Friction Amount";
+				type = 11;
+				enum
+				{
+					0 = "Use Line Length";
+					1 = "Very Sludgy";
+					50 = "Sludgy";
+					100 = "Normal";
+					200 = "Icy";
+					255 = "Very Icy";
+				}
+			}
+		}
+		
+		220
+		{
+			title = "Sector Current";
+			id = "Sector_SetCurrent";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Current Strength";
+			}
+			arg2
+			{
+				title = "Current Angle";
+				type = 22;
+			}
+			arg3
+			{
+				title = "Use Line Vector";
+				type = 11;
+				enum = "noyes";
+			}
+		}
+	}
+
+	alert
+	{
+		title = "Alert";
+		
+		173
+		{
+			title = "Alert monsters";
+			id = "NoiseAlert";
+			
+			arg0
+			{
+				title = "Target Tag";
+				type = 14;
+			}
+			arg1
+			{
+				title = "Emitter Tag";
+				type = 14;
+			}
+		}
+	}
+
+	communicator
+	{
+		title = "Communicator";
+		
+		174
+		{
+			title = "Communicator Message";
+			id = "SendToCommunicator";
+			
+			arg0
+			{
+				title = "Message ID";
+			}
+			arg1
+			{
+				title = "Front Side Only";
+				type = 11;
+				enum = "noyes";
+			}
+			arg2
+			{
+				title = "Print Activator Name";
+				type = 11;
+				enum = "noyes";
+			}
+			arg3
+			{
+				title = "Add to Log";
+				type = 11;
+				enum = "yesno";
+			}
+		}
+	}
+
+	change
+	{
+		title = "Change";
+		
+		157
+		{
+			title = "Set Global Fog Parameter (GZDoom only)";
+			id = "SetGlobalFogParameter";
+			
+			arg0
+			{
+				title = "Property";
+				type = 11;
+				enum
+				{
+					0 = "Density";
+					1 = "Outside density";
+					2 = "Skyfog";
+				}
+			}
+			arg1
+			{
+				title = "Value";
+			}
+		}
+		179
+		{
+			title = "Change Skill";
+			id = "ChangeSkill";
+			
+			arg0
+			{
+				title = "New Skill Level";
+				type = 11;
+				enum 
+				{
+					0 = "Very Easy";
+					1 = "Easy";
+					2 = "Normal";
+					3 = "Hard";
+					4 = "Nightmare!";
+				}
+			}
+		}
+	}
+
+	plane
+	{
+		title = "Plane";
+		
+		118
+		{
+			title = "Plane Copy (slope)";
+			id = "Plane_Copy";
+			requiresactivation = false;
+			
+			arg0
+			{
+				title = "Front Floor Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Front Ceiling Tag";
+				type = 13;
+			}
+			arg2
+			{
+				title = "Back Floor Tag";
+				type = 13;
+			}
+			arg3
+			{
+				title = "Back Ceiling Tag";
+				type = 13;
+			}
+			arg4
+			{
+				title = "Share Slope";
+				type = 12;
+				enum
+				{
+					1 = "Front floor to back sector";
+					2 = "Back floor to front sector";
+					4 = "Front ceiling to back sector";
+					8 = "Back ceiling to front sector";
+				}
+			}
+		}
+		159
+		{
+			title = "Plane Reflection (OpenGL only)";
+			id = "Sector_SetPlaneReflection";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Floor Reflectiveness";
+			}
+			arg2
+			{
+				title = "Ceiling Reflectiveness";
+			}
+		}
+		181
+		{
+			title = "Plane Align (slope)";
+			id = "Plane_Align";
+			requiresactivation = false;
+			
+			arg0
+			{
+				title = "Align Floor";
+				type = 11;
+				enum
+				{
+					0 = "None";
+					1 = "Front";
+					2 = "Back";
+				}
+			}
+			arg1
+			{
+				title = "Align Ceiling";
+				type = 11;
+				enum
+				{
+					0 = "None";
+					1 = "Front";
+					2 = "Back";
+				}
+			}
+		}
+	}
+
+	static
+	{
+		title = "Static";
+		
+		190
+		{
+			title = "Static Init";
+			id = "Static_Init";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Property";
+				type = 11;
+				enum
+				{
+					0 = "Set the gravity to the length of the linedef";
+					1 = "Set the light or fog color in a sector";
+					2 = "Set damage to the length of the linedef";
+					3 = "Define a sector link";
+					255 = "Use the line's upper texture as the sky in any tagged sectors";
+				}
+			}
+			arg2
+			{
+				title = "Flip Sky / Ceiling";
+			}
+			arg3
+			{
+				title = "Movement Type";
+			}
+		}
+	}
+
+	player
+	{
+		title = "Player";
+		
+		191
+		{
+			title = "Set Player Property";
+			id = "SetPlayerProperty";
+			
+			arg0
+			{
+				title = "Target";
+				type = 11;
+				enum
+				{
+					0 = "Activator";
+					1 = "Everyone";
+				}
+			}
+			arg1
+			{
+				title = "Enable";
+				type = 11;
+				enum = "noyes";
+			}
+			arg2
+			{
+				title = "Property";
+				type = 11;
+				enum
+				{
+					0 = "PROP_FROZEN";
+					1 = "PROP_NOTARGET";
+					2 = "PROP_INSTANTWEAPONSWITCH";
+					3 = "PROP_FLY";
+					4 = "PROP_TOTALLYFROZEN";
+					16 = "PROP_BUDDHA";
+				}
+			}
+		}
+	}
+
+	translucent
+	{
+		title = "Translucent";
+		
+		208
+		{
+			title = "Translucent Line";
+			id = "TranslucentLine";
+			requiresactivation = false;
+			
+			arg1
+			{
+				title = "Translucency Amount";
+			}
+			arg2
+			{
+				title = "Additive";
+				type = 11;
+				enum = "noyes";
+			}
+		}
+	}
+
+	point
+	{
+		title = "Point";
+		
+		227
+		{
+			title = "Point Pusher/Puller Set Force";
+			id = "PointPush_SetForce";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Thing Tag";
+				type = 14;
+			}
+			arg2
+			{
+				title = "Strength";
+			}
+			arg3
+			{
+				title = "Use Line Vector";
+				type = 11;
+				enum = "noyes";
+			}
+		}
+	}
+
+	camera
+	{
+		title = "Camera";
+		
+		237
+		{
+			title = "Change Camera";
+			id = "ChangeCamera";
+			
+			arg0
+			{
+				title = "Thing Tag";
+				type = 14;
+			}
+			arg1
+			{
+				title = "Target";
+				type = 11;
+				enum
+				{
+					0 = "Activator";
+					1 = "Everyone";
+				}
+			}
+			arg2
+			{
+				title = "Movement Cancels";
+				type = 11;
+				enum = "noyes";
+			}
+		}
+	}
+
+	elevator
+	{
+		title = "Elevator";
+		
+		245
+		{
+			title = "Elevator Raise to Nearest Floor";
+			id = "Elevator_RaiseToNearest";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Movement Speed";
+				type = 11;
+				enum = "plat_speeds";
+				default = 16;
+			}
+		}
+		246
+		{
+			title = "Elevator Move to Activated Floor";
+			id = "Elevator_MoveToFloor";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Movement Speed";
+				type = 11;
+				enum = "plat_speeds";
+				default = 16;
+			}
+		}
+		247
+		{
+			title = "Elevator Lower to Nearest Floor";
+			id = "Elevator_LowerToNearest";
+			
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+			arg1
+			{
+				title = "Movement Speed";
+				type = 11;
+				enum = "plat_speeds";
+				default = 16;
+			}
+		}
+	}
+}
+
+hexen
+{
+	polyobj
+	{
+		1	// Polyobj Start Line
+		{
+			arg3
+			{
+				title = "Set Line ID";
+				type = 0;
+			}
+		}
+		5	// Polyobj Explicit Line
+		{
+			arg4
+			{
+				title = "Set Line ID";
+				type = 0;
+			}
+		}
+	}
+	plane
+	{
+		181 //Plane_Align
+		{
+			arg2
+			{
+				title = "Set Line ID";
+				type = 0;
+			}
+		}
+	}
+	scroll
+	{
+		52 //Scroll_Wall
+		{
+			arg0
+			{
+				title = "Set Line ID";
+				type = 0;
+			}
+		}
+		221 //Scroll_Texture_Both
+		{
+			arg0
+			{
+				title = "Line ID";
+				type = 0;
+			}
+		}
+		222 //Scroll_Texture_Model
+		{
+			arg0
+			{
+				title = "Set Line ID";
+				type = 0;
+			}
+		}
+	}
+	sector
+	{
+		48 //Sector_Attach3dMidtex
+		{
+			arg0
+			{
+				title = "Line ID";
+				type = 0;
+			}
+		}
+		160 //Sector_Set3dFloor
+		{
+			arg1
+			{
+				title = "Type";
+				type = 12;
+				enum
+				{
+					0 = "Vavoom-Style";
+					1 = "Solid";
+					2 = "Swimmable";
+					3 = "Non-Solid";
+					4 = "Render-Inside";
+					8 = "Use Arg5 as Line ID";
+					16 = "Invert Visibility Rules";
+					32 = "Invert Shootability Rules";
+				}
+				default = 1;
+			}
+			arg4
+			{
+				title = "Line ID / Hi-Tag";
+			}
+		}
+	}
+	teleport
+	{
+		215 //Teleport_Line
+		{
+			arg0
+			{
+				title = "Line ID";
+				type = 0;
+			}
+			arg1
+			{
+				title = "Target Line ID";
+				type = 0;
+			}
+		}
+	}
+	transfer
+	{
+		16 //Transfer_WallLight
+		{
+			arg0
+			{
+				title = "Line ID";
+				type = 0;
+			}
+		}
+  }
+	translucent
+	{
+		208 //TranslucentLine
+		{
+			arg0
+			{
+				title = "Set Line ID";
+				type = 0;
+			}
+			arg3
+			{
+				title = "Flags";
+				type = 12;
+				enum
+				{
+					1 = "Sound boundary";
+					2 = "Railing";
+					4 = "Block floating monsters";
+					8 = "Clip mid texture";
+					16 = "Wrap mid texture";
+					32 = "3D mid texture";
+					64 = "Check switch height";
+				}
+			}
+		}
+	}
+}
+
+udmf
+{
+	// No Line_SetIdentification in UDMF!
+	line
+	{
+		121 = NULL;
+	}
+}
diff --git a/Build/Configurations/Includes/ZDoom_misc.cfg b/Build/Configurations/Includes/ZDoom_misc.cfg
new file mode 100644
index 0000000..9b1b52c
--- /dev/null
+++ b/Build/Configurations/Includes/ZDoom_misc.cfg
@@ -0,0 +1,1909 @@
+
+linedefflags
+{
+	16384 = "Block Players";
+}
+
+
+// LINEDEF ACTIVATIONS
+// Make sure these are in order from lowest value to highest value
+linedefactivations
+{
+	7168 = "Projectile hits or crosses";
+}
+
+
+// Linedef flags UDMF translation table
+// This is needed for copy/paste and prefabs to work properly
+// When the UDMF field name is prefixed with ! it is inverted
+linedefflagstranslation
+{
+	6144 = "playeruse,passuse"; //mxd
+	7168 = "impact,missilecross"; //mxd 
+	16384 = "blockplayers";
+}
+
+
+linedefflags_udmf
+{
+	twosided = "Doublesided";
+	dontpegtop = "Upper unpegged";
+	dontpegbottom = "Lower unpegged";
+	blocking = "Impassable";
+	blockeverything = "Block everything"; 
+	blockplayers = "Block players";
+	blockmonsters = "Block monsters";
+	blockfloaters = "Block floating monsters";
+	blocksound = "Block sound";
+	blockprojectiles = "Block projectiles";
+	blockhitscan = "Block hitscans";
+	blockuse = "Block use actions";
+	blocksight = "Block monster line of sight";
+	jumpover = "Jump-over railing";
+	clipmidtex = "Clip middle texture";
+	wrapmidtex = "Wrap middle texture";
+	midtex3d = "Walkable middle texture";
+	midtex3dimpassible = "Projectile shoot-through middle texture";
+	mapped = "Initially shown on map";
+	secret = "Shown as 1-sided on map";
+	dontdraw = "Not shown on map";
+	transparent = "Transparent (25% opacity)";
+	translucent = "Translucent (obsolete)";
+	monsteractivate = "Monster activates";
+	zoneboundary = "Sound zone boundary";
+}
+
+
+linedefactivations_udmf
+{
+	repeatspecial = "Repeatable action";
+	playeruse = "When player presses use";
+	playercross = "When player walks over";
+	playerpush = "When player bumps";
+	monsteruse = "When monster presses use";
+	monstercross = "When monster walks over";
+	monsterpush = "When monsters bumps";
+	anycross = "Any crossing non-missile activates";
+	missilecross = "When projectile crosses";
+	impact = "On projectile impact";
+	checkswitchrange = "Switch height check";
+	passuse = "Pass use on";
+	firstsideonly = "Front side only";
+	playeruseback = "Player can use from back side";
+}
+
+
+thingflags
+{
+	2048 = "Translucent (25%)";
+	4096 = "Invisible";
+	8192 = "Friendly (Strife logic)";
+	16384 = "Stand still";
+}
+
+
+thingflags_udmf
+{
+	countsecret = "Count as secret";
+	class1 = "Class 1";
+	class2 = "Class 2";
+	class3 = "Class 3";
+	class4 = "Class 4";
+	class5 = "Class 5";
+}
+
+
+// Thing flags UDMF translation table
+// This is needed for copy/paste and prefabs to work properly
+// When the UDMF field name is prefixed with ! it is inverted
+thingflagstranslation
+{
+	256 = "single";
+	512 = "coop";
+	1024 = "dm";
+	2048 = "translucent";
+	4096 = "invisible";
+	8192 = "friend";
+	16384 = "standing";
+}
+
+
+defaultthingflags
+{
+	1;
+	2;
+	4;
+	32;
+	64;
+	128;
+	256;
+	512;
+	1024;
+}
+
+
+defaultthingflags_udmf
+{
+	skill1;
+	skill2;
+	skill3;
+	skill4;
+	skill5;
+	skill6;
+	skill7;
+	skill8;
+	single;
+	coop;
+	dm;
+	class1;
+	class2;
+	class3;
+	class4;
+	class5;
+}
+
+// How thing flags should be compared (for the stuck thing error check)
+thingflagscompare_udmf
+{
+	skills
+	{
+		skill9;
+		skill10;
+		skill11;
+		skill12;
+		skill13;
+		skill14;
+		skill15;
+		skill16;
+	}
+
+	classes
+	{
+		class4;
+		class5;
+		class6;
+		class7;
+		class8;
+		class9;
+		class10;
+		class11;
+		class12;
+		class13;
+		class14;
+		class15;
+		class16;
+	}
+}
+
+// Default sector brightness levels
+sectorbrightness
+{
+	256; 248; 240; 232; 224; 216; 208; 200; 192; 184; 176; 168; 160; 152; 144; 136;
+	128; 120; 112; 104; 96; 88; 80; 72; 64; 56; 48; 40; 32; 24; 16; 8; 0;
+}
+
+
+/*
+TEXTURES AND FLAT SOURCES
+This tells Doom Builder where to find the information for textures
+and flats in the IWAD file, Addition WAD file and Map WAD file.
+
+Start and end lumps must be given in a structure (of which the
+key name doesnt matter) and any textures or flats in between them
+are loaded in either the textures category or flats category.
+
+For textures: PNAMES, TEXTURE1 and TEXTURE2 are loaded by default.
+*/
+textures
+{
+	zdoom1
+	{
+		start = "TX_START";
+		end = "TX_END";
+	}
+}
+
+voxels //mxd
+{
+	zdoom1
+	{
+		start = "VX_START";
+		end = "VX_END";
+	}
+}
+
+/*
+ADDITIONAL UNIVERSAL DOOM MAP FORMAT FIELD DEFINITIONS
+Only add fields here that Doom Builder does not edit with its own user-interface!
+The "default" field must match the UDMF specifications!
+
+Field data types:
+0 = integer *
+1 = float
+2 = string
+3 = bool
+4 = linedef action (integer) *
+5 = sector effect (integer) *
+6 = texture (string)
+7 = flat (string)
+8 = angle in degrees (integer)
+9 = angle in radians (float)
+10 = XXRRGGBB color (integer)
+11 = enum option (integer) *
+12 = enum bits (integer) *
+13 = sector tag (integer) *
+14 = thing tag (integer) *
+15 = linedef tag (integer) *
+16 = enum option (string)
+17 = angle in degrees (float)
+22 = byte angle (integer)
+*/
+universalfields
+{
+	linedef
+	{
+		comment
+		{
+			type = 2;
+			default = "";
+		}
+	}
+	
+	sidedef
+	{
+		comment
+		{
+			type = 2;
+			default = "";
+		}
+	}
+	
+	thing
+	{
+		comment
+		{
+			type = 2;
+			default = "";
+		}
+    
+		skill6
+		{
+			type = 3;
+			default = false;
+		}
+    
+		skill7
+		{
+			type = 3;
+			default = false;
+		}
+    
+		skill8
+		{
+			type = 3;
+			default = false;
+		}
+    
+		skill9
+		{
+			type = 3;
+			default = false;
+		}
+    
+		skill10
+		{
+			type = 3;
+			default = false;
+		}
+    
+		skill11
+		{
+			type = 3;
+			default = false;
+		}
+    
+		skill12
+		{
+			type = 3;
+			default = false;
+		}
+    
+		skill13
+		{
+			type = 3;
+			default = false;
+		}
+    
+		skill14
+		{
+			type = 3;
+			default = false;
+		}
+    
+		skill15
+		{
+			type = 3;
+			default = false;
+		}
+    
+		skill16
+		{
+			type = 3;
+			default = false;
+		} 
+    
+		class6
+		{
+			type = 3;
+			default = false;
+		}
+    
+		class7
+		{
+			type = 3;
+			default = false;
+		}
+    
+		class8
+		{
+			type = 3;
+			default = false;
+		}
+    
+		class9
+		{
+			type = 3;
+			default = false;
+		}
+    
+		class10
+		{
+			type = 3;
+			default = false;
+		}
+    
+		class11
+		{
+			type = 3;
+			default = false;
+		}
+    
+		class12
+		{
+			type = 3;
+			default = false;
+		}
+    
+		class13
+		{
+			type = 3;
+			default = false;
+		}
+    
+		class14
+		{
+			type = 3;
+			default = false;
+		}
+    
+		class15
+		{
+			type = 3;
+			default = false;
+		}
+		class16
+		{
+			type = 3;
+			default = false;
+		}
+	}
+	
+	sector
+	{
+		comment
+		{
+			type = 2;
+			default = "";
+		}
+	}
+}
+
+
+/*
+MAP LUMP NAMES
+Map lumps are loaded with the map as long as they are right after each other. When the editor
+meets a lump which is not defined in this list it will ignore the map if not satisfied.
+The order of items defines the order in which lumps will be written to WAD file on save.
+To indicate the map header lump, use ~MAP
+
+Legenda:
+required = Lump is required to exist.
+blindcopy = Lump will be copied along with the map blindly. (useful for lumps Doom Builder doesn't use)
+nodebuild = The nodebuilder generates this lump.
+allowempty = The nodebuilder is allowed to leave this lump empty.
+scriptbuild = This lump is a text-based script, which should be compiled using current script compiler;
+script = This lump is a text-based script. Specify the filename of the script configuration to use.
+*/
+
+// GL nodebuilders generate this stuff
+glmaplumpnames
+{
+	GL_~MAP
+	{
+		required = false;
+		nodebuild = true;
+		allowempty = true;
+	}
+	
+	GL_VERT
+	{
+		required = false;
+		nodebuild = true;
+		allowempty = false;
+	}
+	
+	GL_SEGS
+	{
+		required = false;
+		nodebuild = true;
+		allowempty = false;
+	}
+	
+	GL_SSECT
+	{
+		required = false;
+		nodebuild = true;
+		allowempty = false;
+	}
+	
+	GL_NODES
+	{
+		required = false;
+		nodebuild = true;
+		allowempty = false;
+	}
+	
+	GL_PVS
+	{
+		required = false;
+		nodebuild = true;
+		allowempty = true;
+	}
+}
+
+doommaplumpnames
+{
+	REJECT
+	{
+		allowempty = true;
+	}
+}
+
+
+hexenmaplumpnames
+{
+	REJECT
+	{
+		allowempty = true;
+	}
+	
+	BEHAVIOR
+	{
+		required = true;
+		nodebuild = false;
+		blindcopy = true;
+	}
+	
+	SCRIPTS
+	{
+		required = false;
+		nodebuild = false;
+		scriptbuild = true;
+	}
+}
+
+
+udmfmaplumpnames
+{
+	BEHAVIOR
+	{
+		required = false;
+		nodebuild = false;
+		blindcopy = true;
+	}
+	
+	DIALOGUE
+	{
+		required = false;
+		nodebuild = false;
+		script = "ZDoom_USDF.cfg";
+	}
+	
+	ZNODES
+	{
+		required = false;
+		nodebuild = true;
+		allowempty = false;
+	}
+	
+	BLOCKMAP
+	{
+		required = false;
+		nodebuild = true;
+		allowempty = true;
+	}
+	
+	REJECT
+	{
+		required = false;
+		nodebuild = true;
+		allowempty = true;
+	}
+	
+	SCRIPTS
+	{
+		required = false;
+		nodebuild = false;
+		scriptbuild = true;
+	}
+}
+
+enums
+{
+	angles
+	{
+		0 = "0: East";
+		32 = "32: Northeast";
+		64 = "64: North";
+		96 = "96: Northwest";
+		128 = "128: West";
+		160 = "160: Southwest";
+		192 = "192: South";
+		224 = "224: Southeast";
+	}
+
+	polyobj_angles
+	{
+		0 = "0: East";
+		32 = "32: Northeast";
+		64 = "64: North";
+		96 = "96: Northwest";
+		128 = "128: West";
+		160 = "160: Southwest";
+		192 = "192: South";
+		224 = "224: Southeast";
+		255 = "255: Constant Rotation";
+	}
+
+	frontback
+	{
+		0 = "Front";
+		1 = "Back";
+	}
+	
+	backfront
+	{
+		1 = "Front";
+		0 = "Back";
+	}
+	
+	floorceiling
+	{
+		0 = "Floor";
+		1 = "Ceiling";
+	}
+	
+	ceilingfloor
+	{
+		0 = "Ceiling";
+		1 = "Floor";
+	}
+	
+	floorceilingboth
+	{
+		0 = "Floor";
+		1 = "Ceiling";
+		2 = "Both";
+	}
+	
+	sector_flags
+	{
+		1 = "Silent";
+		2 = "No falling damage";
+		4 = "Actors drop with floor";
+		8 = "No respawn";
+	}
+
+	delays
+	{
+		105 = "105: Lift wait";
+		150 = "150: Door Wait";
+	}
+
+	generic_door_delays
+	{
+		8 = "8: 1 second";
+		34 = "34: 4 seconds";
+		69 = "69: 9 seconds";
+		240 = "240: 30 seconds";
+	}
+	
+	donut
+	{
+		4 = "4: Normal";
+	}
+	
+	door_speeds
+	{
+		4   = "4: Animated";
+		16  = "16: Slow";
+		32  = "32: Normal";
+		64  = "64: Fast";
+		128 = "128: Turbo";
+	}
+	
+	flat_speeds
+	{
+		8  = "8: Slow";
+		16 = "16: Normal";
+		32 = "32: Fast";
+		64 = "64: Turbo";
+	}
+	
+	plat_speeds
+	{
+		8  = "8: Slow";
+		16 = "16: Normal";
+		32 = "32: Lift/Fast";
+		64 = "64: Turbo";
+	}
+	
+	scroll_speeds
+	{
+		0 = "0: Don't scroll";
+		16 = "16: Very slow";
+		32 = "32: Slow";
+		64 = "64: Normal"; 
+		96 = "96: Fast";
+		128 = "128: Very fast";
+	}
+	
+	stair_speeds
+	{
+		2  = "2: Slow";
+		4  = "4: Normal";
+		16 = "16: Fast";
+		32 = "32: Turbo";
+	}
+	
+	polyobj_speeds
+	{
+		-32 = "-32: Turbo, CW";
+		-16 = "-16: Fast, CW";
+		-4  = "-4: Normal, CW";
+		-2  = "-2: Slow, CW";
+		2  = "2: Slow, CCW";
+		4  = "4: Normal, CCW";
+		16 = "16: Fast, CCW";
+		32 = "32: Turbo, CCW";
+	}
+
+	crush_mode
+	{
+		0 = "0: Compatibility";
+		1 = "1: Doom mode";
+		2 = "2: Hexen mode";
+	}
+	
+	plat_sound
+	{
+		0 = "Platform";
+		1 = "Moving Floor";
+	}
+
+	sidedef_part
+	{
+		0 = "All";
+		1 = "Upper";
+		2 = "Middle";
+		4 = "Lower";
+	}
+	
+	generic_floor_target
+	{
+		0 = "Relative offset";
+		1 = "Highest neighbor";
+		2 = "Lowest neighbor";
+		3 = "Nearest neighbor";
+		4 = "Lowest neighbor";
+		5 = "Ceiling";
+		6 = "Shortest lower texture";
+	}
+	
+	generic_ceiling_target
+	{
+		0 = "Relative offset";
+		1 = "Highest neighbor";
+		2 = "Lowest neighbor";
+		3 = "Nearest neighbor";
+		4 = "Highest neighbor";
+		5 = "Floor";
+		6 = "Shortest lower texture";
+	}
+	
+	generic_door_types
+	{
+		0 = "Open Close";
+		1 = "Open Stay";
+		2 = "Close Open";
+		3 = "Close Stay";
+		64 = "Open Close (no retrigger)";
+		65 = "Open Stay (no retrigger)";
+		66 = "Close Open (no retrigger)";
+		67 = "Close Stay (no retrigger)";
+		128 = "Open Close (tag is light tag)";
+		129 = "Open Stay (tag is light tag)";
+		130 = "Close Open (tag is light tag)";
+		131 = "Close Stay (tag is light tag)";
+		192 = "Open Close (no retrigger, tag is light tag)";
+		193 = "Open Stay (no retrigger, tag is light tag)";
+		194 = "Close Open (no retrigger, tag is light tag)";
+		195 = "Close Stay (no retrigger, tag is light tag)";
+	}
+	
+	generic_lift_types
+	{
+		0 = "Up by Value, Stay";
+		1 = "Down, Wait, Up, Stay";
+		2 = "Down to Nearest Floor";
+		3 = "Down to Lowest Ceiling";
+		4 = "Perpetual Raise";
+	}
+
+	death_types
+	{
+		0  = "Unknown";
+		5  = "Rocket impact";
+		6  = "Rocket explosion";
+		7  = "Plasma rifle";
+		8  = "BFG impact";
+		9  = "BFG explosion";
+		10 = "Chainsaw";
+		11 = "Shotgun";
+		12 = "Water";
+		13 = "Slime";
+		14 = "Lava";
+		15 = "Crush";
+		16 = "Telefrag";
+		17 = "Falling";
+		18 = "Suicide";
+		19 = "Barrel";
+		20 = "Exit";
+		21 = "Splash";
+		22 = "Melee hit";
+		23 = "Railgun";
+		24 = "Frost";
+		25 = "Disintegration";
+		26 = "Poison";
+		27 = "Electricity";
+		1000 = "Massacre!";
+	}
+	
+	teams
+	{
+		0 = "0: Blue Team";
+		1 = "1: Red Team";
+		2 = "2: Green Team";
+		3 = "3: Gold Team";
+		4 = "4: Black Team";
+		5 = "5: White Team";
+		6 = "6: Orange Team";
+		7 = "7: Purple Team";
+	}
+
+	delay_tics
+	{
+		0 = "0: No delay";
+		35 = "35: 1 Second";
+		70 = "70: 2 Seconds";
+		105 = "105: 3 Seconds";
+		140 = "140: 4 Seconds";
+		175 = "175: 5 Seconds";
+		210 = "210: 6 Seconds";
+		245 = "245: 7 Seconds";
+		280 = "280: 8 Seconds";
+		315 = "315: 9 Seconds";
+		350 = "350: 10 Seconds";
+	}
+
+	delay_seconds
+	{
+		0 = "Forever";
+		1 = "1 Second";
+		2 = "2 Seconds";
+		3 = "3 Seconds";
+		5 = "5 Seconds";
+		10 = "10 Seconds";
+		15 = "15 Seconds";
+		20 = "20 Seconds";
+		25 = "25 Seconds";
+		30 = "30 Seconds";
+		60 = "1 Minute";
+	}
+	
+	delay_seconds_0nodelay
+	{
+		0 = "No delay";
+		1 = "1 Second";
+		2 = "2 Seconds";
+		3 = "3 Seconds";
+		5 = "5 Seconds";
+		10 = "10 Seconds";
+		15 = "15 Seconds";
+		20 = "20 Seconds";
+		25 = "25 Seconds";
+		30 = "30 Seconds";
+		60 = "1 Minute";
+	}
+
+	reset_tics
+	{
+		0 = "0: Never";
+		35 = "35: 1 Second";
+		70 = "70: 2 Seconds";
+		105 = "105: 3 Seconds";
+		140 = "140: 4 Seconds";
+		175 = "175: 5 Seconds";
+		210 = "210: 6 Seconds";
+		245 = "245: 7 Seconds";
+		280 = "280: 8 Seconds";
+		315 = "315: 9 Seconds";
+		350 = "350: 10 Seconds";
+	}
+	
+	sound_volume
+	{
+		0 = "Default";
+		10 = "10%";
+		25 = "25%";
+		50 = "50%";
+		75 = "75%";
+		100 = "100%";
+	}
+
+	setadd
+	{
+		0 = "Set";
+		1 = "Add";
+	}
+	
+	puzzle_items
+	{
+		0 = "None";
+	}
+	
+	spawn_projectile
+	{
+		0 = "None";
+	}
+}
+
+enums_doom
+{
+	keys
+	{
+		0 = "None";
+		1 = "Red key card";
+		2 = "Blue key card";
+		3 = "Yellow key card";
+		4 = "Red skull key";
+		5 = "Blue skull key";
+		6 = "Yellow skull key";
+		100 = "Any key";
+		101 = "All keys";
+		102 = "Impossible";
+		129 = "Any red key";
+		130 = "Any blue key";
+		131 = "Any yellow key";
+		229 = "One of each color";
+	}
+	
+	spawnthing
+	{
+		0 = "None";
+		1 = "Shotgun Guy";
+		2 = "Chaingun Guy";
+		3 = "Baron Of Hell";
+		4 = "Zombieman";
+		5 = "Imp";
+		6 = "Arachnotron";
+		7 = "Spider Mastermind";
+		8 = "Demon";
+		9 = "Spectre";
+		10 = "Imp Fireball";
+		11 = "Clip";
+		12 = "Shells";
+		19 = "Cacodemon";
+		20 = "Revenant";
+		21 = "Bridge";
+		22 = "Armor Bonus";
+		23 = "Stimpack";
+		24 = "Medkit";
+		25 = "Soul Sphere";
+		27 = "Shotgun";
+		28 = "Chaingun";
+		29 = "Rocket Launcher";
+		30 = "Plasma Gun";
+		31 = "BFG";
+		32 = "Chainsaw";
+		33 = "Super Shotgun";
+		41 = "Rock debris #1";
+		42 = "Rock debris #2";
+		43 = "Rock debris #3";
+		44 = "Dirt #1";
+		45 = "Dirt #2";
+		46 = "Dirt #3";
+		47 = "Dirt #4";
+		48 = "Dirt #5";
+		49 = "Dirt #6";
+		51 = "Plasma Bolt";
+		53 = "Tracer";
+		54 = "Glass shard #1";
+		55 = "Glass shard #2";
+		56 = "Glass shard #3";
+		57 = "Glass shard #4";
+		58 = "Glass shard #5";
+		59 = "Glass shard #6";
+		60 = "Glass shard #7";
+		61 = "Glass shard #8";
+		62 = "Glass shard #9";
+		63 = "Glass shard #10";
+		68 = "Green Armor";
+		69 = "Blue Armor";
+		75 = "Energy Cell";
+		85 = "Blue Keycard";
+		86 = "Red Keycard";
+		87 = "Yellow Keycard";
+		88 = "Yellow Skullkey";
+		89 = "Red Skullkey";
+		90 = "Blue Skullkey";
+		98 = "Temp Large Flame";
+		100 = "Stealth Baron";
+		101 = "Stealth Hell Knight";
+		102 = "Stealth Zombieman";
+		103 = "Stealth Shotgun Guy";
+		110 = "Lost Soul";
+		111 = "Arch-Vile";
+		112 = "Mancubus";
+		113 = "Hell Knight";
+		114 = "Cyberdemon";
+		115 = "Pain Elemental";
+		116 = "Wolf SS Soldier";
+		117 = "Stealth Arachnotron";
+		118 = "Stealth Arch-Vile";
+		119 = "Stealth Cacodemon";
+		120 = "Stealth Chaingun Guy";
+		121 = "Stealth Demon";
+		122 = "Stealth Imp";
+		123 = "Stealth Mancubus";
+		124 = "Stealth Revenant";
+		125 = "Barrel";
+		126 = "Cacodemon Shot";
+		127 = "Rocket (Projectile)";
+		128 = "BFG Shot";
+		129 = "Arachnotron Plasma Bolt";
+		130 = "Blood";
+		131 = "Bullet Puff";
+		132 = "Megasphere";
+		133 = "Invulnerability Sphere";
+		134 = "Berserk Pack";
+		135 = "Invisibility Sphere";
+		136 = "Radiation Suit";
+		137 = "Computer Map";
+		138 = "Light-Amp Goggles";
+		139 = "Box Of Ammo";
+		140 = "Rocket (Ammo)";
+		141 = "Box Of Rockets";
+		142 = "Energy Cell Pack";
+		143 = "Box Of Shells";
+		144 = "Backpack";
+		145 = "Guts";
+		146 = "Blood Pool 1";
+		147 = "Blood Pool 2";
+		148 = "Blood Pool 3";
+		149 = "Flaming Barrel";
+		150 = "Brains";
+		151 = "Scripted Marine";
+		152 = "Health Bonus";
+		153 = "Mancubus Shot";
+		154 = "Baron Fireball";
+		//216 = "Grenade";
+	}
+	
+	spawn_projectile
+	{
+		0 = "None";
+		10 = "Imp Fireball";
+		33 = "Super Shotgun";
+		41 = "Rock debris #1";
+		42 = "Rock debris #2";
+		43 = "Rock debris #3";
+		44 = "Dirt #1";
+		45 = "Dirt #2";
+		46 = "Dirt #3";
+		47 = "Dirt #4";
+		48 = "Dirt #5";
+		49 = "Dirt #6";
+		51 = "Plasma Bolt";
+		53 = "Tracer";
+		54 = "Glass shard #1";
+		55 = "Glass shard #2";
+		56 = "Glass shard #3";
+		57 = "Glass shard #4";
+		58 = "Glass shard #5";
+		59 = "Glass shard #6";
+		60 = "Glass shard #7";
+		61 = "Glass shard #8";
+		62 = "Glass shard #9";
+		63 = "Glass shard #10";
+		110 = "Lost Soul";
+		126 = "Cacodemon Shot";
+		127 = "Rocket (Projectile)";
+		128 = "BFG Shot";
+		129 = "Arachnotron Plasma Bolt";
+		131 = "Bullet Puff";
+		153 = "Mancubus Shot";
+		154 = "Baron Fireball";
+	}
+}
+
+enums_heretic
+{
+	keys
+	{
+		0 = "None";
+		1 = "Green key";
+		2 = "Blue key";
+		3 = "Yellow key";
+		129 = "Green key";
+		130 = "Blue key";
+		131 = "Yellow key";
+		100 = "Any key";
+		101 = "All keys";
+		229 = "All keys";
+	}
+	
+	spawnthing
+	{
+		1 = "Sabreclaw";
+		2 = "Nitrogolem";
+		3 = "Weredragon";
+		4 = "Golem";
+		5 = "Gargoyle";
+		6 = "Undead Warrior";
+		7 = "Fire Gargoyle";
+		8 = "Ghost Golem";
+		9 = "Ghost Nitrogolem";
+		10 = "Gargoyle Shot";
+		11 = "Wand Crystal";
+		12 = "Wand Geode";
+		14 = "Morph Ovum";
+		15 = "Wings of Wrath";
+		19 = "Disciple of D'Sparil";
+		20 = "Iron Lich";
+		21 = "Bridge";
+		23 = "Crystal Vial";
+		24 = "Quartz Flask";
+		25 = "Mystic Urb";
+		27 = "Ethereal Crossbow";
+		28 = "Dragon Claw";
+		29 = "Phoenix Rod";
+		30 = "Hell Staff";
+		31 = "Fire Mace";
+		32 = "Gauntlets of the Necromancer";
+		33 = "Ethereal Arrows";
+		34 = "Ethereal Quiver";
+		35 = "Mace Sphere";
+		36 = "Mace Sphere Pile";
+		37 = "Claw Orb";
+		38 = "Energy Orb";
+		40 = "Morph Ovum Shot";
+		41 = "Rock debris #1";
+		42 = "Rock debris #2";
+		43 = "Rock debris #3";
+		44 = "Dirt #1";
+		45 = "Dirt #2";
+		46 = "Dirt #3";
+		47 = "Dirt #4";
+		48 = "Dirt #5";
+		49 = "Dirt #6";
+		54 = "Glass shard #1";
+		55 = "Glass shard #2";
+		56 = "Glass shard #3";
+		57 = "Glass shard #4";
+		58 = "Glass shard #5";
+		59 = "Glass shard #6";
+		60 = "Glass shard #7";
+		61 = "Glass shard #8";
+		62 = "Glass shard #9";
+		63 = "Glass shard #10";
+		68 = "Silver Shield";
+		69 = "Enchanted Shield";
+		72 = "Time Bomb of the Ancients";
+		73 = "Torch";
+		85 = "Blue Key";
+		86 = "Green Key";
+		87 = "Yellow Key";
+		110 = "Wind Sound";
+		111 = "Waterfall Sound";
+		120 = "Weredragon Shot";
+		121 = "Feather";
+		122 = "Chicken";
+		123 = "Volcano Blast";
+		124 = "Tiny Volcano Blast";
+		125 = "Pod";
+		126 = "Pod Generator";
+		127 = "Ethereal Axe";
+		128 = "Bloody Axe";
+		129 = "Ghost Warrior";
+		130 = "Blood";
+		131 = "Golem Shot";
+		132 = "Ophidian";
+		133 = "Ring of Invincibility";
+		134 = "Tome of Power";
+		135 = "Shadow Sphere";
+		136 = "Bag of Holding";
+		137 = "Map Scroll";
+		138 = "Ophidian Blue Shot";
+		139 = "Ophidian Yellow Shot";
+		140 = "Disciple Shot";
+		141 = "D'Sparil Teleportation Spot";
+		142 = "D'Sparil on Chaos Serpent";
+		143 = "D'Sparil alone";
+		144 = "Chaos Serpent Shot";
+		145 = "D'Sparil Shot";
+		146 = "Disciple Summon";
+		147 = "Main Crossbow Shot";
+		148 = "Tomed Crossbow Shot";
+		149 = "Secondary Crossbow Shot";
+		150 = "Volcano";
+		151 = "Small Goldwand Shot";
+		152 = "Tomed Goldwand Shot";
+		153 = "Crushing Firemace Sphere";
+		154 = "Firemace Sphere";
+		155 = "Small Firemace Sphere";
+		156 = "Large Firemace Sphere";
+		157 = "Dragonclaw Ripper";
+		158 = "SkullRodAmmo";
+		159 = "SkullRodHefty";
+		160 = "HornRodFX1";
+		161 = "PhoenixRodAmmo";
+		162 = "PhoenixRodHefty";
+		163 = "PhoenixFX1";
+		164 = "Iron Lich Ice Shot";
+		165 = "Iron Lich Whirlwind";
+		166 = "Red Glitter Generator";
+		167 = "Blue Glitter Generator";
+	}
+	
+	spawn_projectile
+	{
+		10 = "Gargoyle Shot";
+		40 = "Morph Ovum Shot";
+		41 = "Rock debris #1";
+		42 = "Rock debris #2";
+		43 = "Rock debris #3";
+		44 = "Dirt #1";
+		45 = "Dirt #2";
+		46 = "Dirt #3";
+		47 = "Dirt #4";
+		48 = "Dirt #5";
+		49 = "Dirt #6";
+		54 = "Glass shard #1";
+		55 = "Glass shard #2";
+		56 = "Glass shard #3";
+		57 = "Glass shard #4";
+		58 = "Glass shard #5";
+		59 = "Glass shard #6";
+		60 = "Glass shard #7";
+		61 = "Glass shard #8";
+		62 = "Glass shard #9";
+		63 = "Glass shard #10";
+		120 = "Weredragon Shot";
+		123 = "Volcano Blast";
+		124 = "Tiny Volcano Blast";
+		131 = "Golem Shot";
+		138 = "Ophidian Blue Shot";
+		139 = "Ophidian Yellow Shot";
+		140 = "Disciple Shot";
+		141 = "D'Sparil Teleportation Spot";
+		144 = "Chaos Serpent Shot";
+		145 = "D'Sparil Shot";
+		147 = "Main Crossbow Shot";
+		148 = "Tomed Crossbow Shot";
+		149 = "Secondary Crossbow Shot";
+		151 = "Small Goldwand Shot";
+		152 = "Tomed Goldwand Shot";
+		164 = "Iron Lich Ice Shot";
+		165 = "Iron Lich Whirlwind";
+	}
+}
+
+enums_hexen
+{
+	keys
+	{
+		0 = "None";
+		1 = "Steel key";
+		2 = "Cave key";
+		3 = "Axe key";
+		4 = "Fire key";
+		5 = "Emerald key";
+		6 = "Dungeon key";
+		7 = "Silver key";
+		8 = "Rusted key";
+		9 = "Horn key";
+		10 = "Swamp key";
+		11 = "Castle key";
+		101 = "All keys";
+		229 = "All keys";
+	}
+
+	spawnthing
+	{
+		1 = "Centaur";
+		2 = "Slaughtaur";
+		3 = "Green Chaos Serpent";
+		4 = "Ettin";
+		5 = "Affrit";
+		6 = "Swamp Stalker";
+		7 = "Swamp Stalker Boss";
+		8 = "Reiver";
+		9 = "Buried Reiver";
+		10 = "Fireball";
+		11 = "Blue Mana";
+		12 = "Green Mana";
+		13 = "Boots of Speed";
+		14 = "Porkalator";
+		15 = "Wings of Wrath";
+		16 = "Dark Servant";
+		17 = "Banishment Device";
+		19 = "Dark Bishop";
+		20 = "Wendigo";
+		21 = "Glitter Bridge";
+		22 = "Dragonskin Bracers";
+		23 = "Crystal Vial";
+		24 = "Quartz Flask";
+		25 = "Mystic Urn";
+		26 = "Krater of Might";
+		27 = "Timon's Axe";
+		28 = "Hammer of Retribution";
+		29 = "Quietus Hilt";
+		30 = "Quietus Crossguard";
+		31 = "Quietus Blade";
+		32 = "Serpent Staff";
+		33 = "Wraithverge Crescent";
+		34 = "Wraithverge Cross";
+		35 = "Wraithverge Handle";
+		36 = "Ice Shards Spell";
+		37 = "Bloodscourge Grip";
+		38 = "Bloodscourge Haft";
+		39 = "Bloodscourge Jewel";
+		40 = "Porkalator Shot";
+		41 = "Rock debris #1";
+		42 = "Rock debris #2";
+		43 = "Rock debris #3";
+		44 = "Dirt #1";
+		45 = "Dirt #2";
+		46 = "Dirt #3";
+		47 = "Dirt #4";
+		48 = "Dirt #5";
+		49 = "Dirt #6";
+		50 = "Arrow";
+		51 = "Dart";
+		52 = "Poison Dart";
+		53 = "Ripper Ball";
+		54 = "Glass shard #1";
+		55 = "Glass shard #2";
+		56 = "Glass shard #3";
+		57 = "Glass shard #4";
+		58 = "Glass shard #5";
+		59 = "Glass shard #6";
+		60 = "Glass shard #7";
+		61 = "Glass shard #8";
+		62 = "Glass shard #9";
+		63 = "Glass shard #10";
+		64 = "Blade";
+		65 = "Ice Shard";
+		66 = "Small Flame";
+		67 = "Large Flame";
+		68 = "Mesh Armor";
+		69 = "Falcon Shield";
+		70 = "Platinum Helm";
+		71 = "Amulet Of Warding";
+		72 = "Flechette";
+		73 = "Torch";
+		74 = "Disc of Repulsion";
+		75 = "Combined Mana";
+		76 = "Yorick's skull";
+		77 = "Heart of D'Sparil";
+		78 = "Ruby planet";
+		79 = "Emerald planet #1";
+		80 = "Emerald planet #2";
+		81 = "Sapphire planet #1";
+		82 = "Sapphire planet #2";
+		83 = "Daemon Codex";
+		84 = "Liber Obscura";
+		85 = "Steel key";
+		86 = "Cave key";
+		87 = "Axe key";
+		88 = "Fire key";
+		89 = "Emerald key";
+		90 = "Dungeon key";
+		91 = "Silver key";
+		92 = "Rusted key";
+		93 = "Horn key";
+		94 = "Swamp key";
+		95 = "Water drip";
+		96 = "Small temporary flame";
+		97 = "Small Flame";
+		98 = "Large temporary flame";
+		99 = "Large Flame";
+		100 = "Phantasmal green chaos serpent";
+		101 = "Phantasmal brown chaos serpent";
+		102 = "Phantasmal ettin";
+		103 = "Phantasmal centaur";
+		104 = "Raised spike";
+		105 = "Burried spike";
+		106 = "Dripping flesh";
+		107 = "Dripping flesh";
+		108 = "Reiver fireball sparks";
+		110 = "Wind Sound";
+		130 = "Blood";
+		133 = "Icon of the Defender";
+	}
+	
+	spawn_projectile
+	{
+		10 = "Fireball";
+		40 = "Porkalator Shot";
+		41 = "Rock debris #1";
+		42 = "Rock debris #2";
+		43 = "Rock debris #3";
+		44 = "Dirt #1";
+		45 = "Dirt #2";
+		46 = "Dirt #3";
+		47 = "Dirt #4";
+		48 = "Dirt #5";
+		49 = "Dirt #6";
+		50 = "Arrow";
+		51 = "Dart";
+		52 = "Poison Dart";
+		53 = "Ripper Ball";
+		54 = "Glass shard #1";
+		55 = "Glass shard #2";
+		56 = "Glass shard #3";
+		57 = "Glass shard #4";
+		58 = "Glass shard #5";
+		59 = "Glass shard #6";
+		60 = "Glass shard #7";
+		61 = "Glass shard #8";
+		62 = "Glass shard #9";
+		63 = "Glass shard #10";
+		65 = "Ice Shard";
+	}
+
+	puzzle_items
+	{
+		0 = "Yorick's skull";
+		1 = "Heart of D'Sparil";
+		2 = "Ruby Planet";
+		3 = "Emerald Planet (1)";
+		4 = "Emerald Planet (2)";
+		5 = "Sapphire Planet (1)";
+		6 = "Sapphire Planet (2)";
+		7 = "Daemon Codex";
+		8 = "Liber Obscura";
+		9 = "Flame Mask";
+		10 = "Glaive Seal";
+		11 = "Holy Relic";
+		12 = "Sigil of the Magus";
+		13 = "Iron gear";
+		14 = "Brass gear";
+		15 = "Brass and iron gear";
+		16 = "Silver and brass gear";
+	}
+}
+
+enums_strife
+{
+	keys
+	{
+		0 = "None";
+		1 = "Base Key (Front)";
+		2 = "Governor's Key";
+		3 = "Travel Passcard";
+		4 = "Blue ID Badge";
+		5 = "Prison Key";
+		6 = "Severed Hand";
+		7 = "Power Key 1";
+		8 = "Power Key 2";
+		9 = "Power Key 3";
+		10 = "Gold Key";
+		11 = "Gold ID Badge";
+		12 = "Silver Key";
+		13 = "Oracle Key";
+		14 = "Military ID";
+		15 = "Order Key";
+		16 = "Warehouse Key";
+		17 = "Brass Key";
+		18 = "Red Crystal Key";
+		19 = "Blue Crystal Key";
+		20 = "Chapel Key";
+		21 = "Catacomb Key";
+		22 = "Security Key";
+		23 = "Core Key";
+		24 = "Mauler Key";
+		25 = "Factory Key";
+		26 = "Mine Key";
+		27 = "New Key 5";
+		50 = "Prison Pass";
+		51 = "Oracle Pass";
+		103 = "Retail Version Only"; // this was used in shareware Strife
+	}
+	
+	spawnthing
+	{
+		11 = "Clip Of Bullets";
+		68 = "Leather Armor";
+		69 = "Metal Armor";
+		75 = "Energy Pod";
+		135 = "Shadow Armor";
+		136 = "Environmental Suit";
+		137 = "Computer Map";
+		139 = "Box Of Bullets";
+		140 = "Mini-Missiles";
+		141 = "Crate of Missiles";
+		142 = "Energy Pack";
+		144 = "Ammo Satchel";
+	}
+}
+
+enums_chex
+{
+	keys
+	{
+		0 = "None";
+		1 = "Red key card";
+		2 = "Blue key card";
+		3 = "Yellow key card";
+		4 = "Red Flem key";
+		5 = "Blue Flem key";
+		6 = "Yellow Flem key";
+		100 = "Any key";
+		101 = "All keys";
+		102 = "Impossible";
+		129 = "Any red key";
+		130 = "Any blue key";
+		131 = "Any yellow key";
+		229 = "One of each color";
+	}
+	
+	spawnthing
+	{
+		41 = "Rock debris #1";
+		42 = "Rock debris #2";
+		43 = "Rock debris #3";
+		44 = "Dirt #1";
+		45 = "Dirt #2";
+		46 = "Dirt #3";
+		47 = "Dirt #4";
+		48 = "Dirt #5";
+		49 = "Dirt #6";
+		54 = "Glass shard #1";
+		55 = "Glass shard #2";
+		56 = "Glass shard #3";
+		57 = "Glass shard #4";
+		58 = "Glass shard #5";
+		59 = "Glass shard #6";
+		60 = "Glass shard #7";
+		61 = "Glass shard #8";
+		62 = "Glass shard #9";
+		63 = "Glass shard #10";
+		130 = "Blood";
+		142 = "Phasing Zorcher Pack";
+	}
+}
+
+enums_chex3
+{
+	keys
+	{
+		0 = "None";
+		1 = "Red key card";
+		2 = "Blue key card";
+		3 = "Yellow key card";
+		4 = "Red Flem key";
+		5 = "Blue Flem key";
+		6 = "Yellow Flem key";
+		100 = "Any key";
+		101 = "All keys";
+		102 = "Impossible";
+		129 = "Any red key";
+		130 = "Any blue key";
+		131 = "Any yellow key";
+		229 = "One of each color";
+	}
+	
+	spawnthing
+	{
+		1 = "Flemoidus Bipedicus";
+		3 = "Flemoidus Maximus";
+		4 = "Flemoidus Commonus";
+		5 = "Armored Flemoidus";
+		7 = "Flembomination";
+		8 = "Stridicus";
+		9 = "Cycloptis Commonus";
+		10 = "Bipedicus Shot";
+		19 = "Super Cycloptis";
+		41 = "Rock debris #1";
+		42 = "Rock debris #2";
+		43 = "Rock debris #3";
+		44 = "Dirt #1";
+		45 = "Dirt #2";
+		46 = "Dirt #3";
+		47 = "Dirt #4";
+		48 = "Dirt #5";
+		49 = "Dirt #6";
+		54 = "Glass shard #1";
+		55 = "Glass shard #2";
+		56 = "Glass shard #3";
+		57 = "Glass shard #4";
+		58 = "Glass shard #5";
+		59 = "Glass shard #6";
+		60 = "Glass shard #7";
+		61 = "Glass shard #8";
+		62 = "Glass shard #9";
+		63 = "Glass shard #10";
+		100 = "Statue of the Thinker";
+		101 = "Orange tree";
+		110 = "Flem mine";
+		113 = "Flembrane";
+		114 = "Lord Snotfolus";
+		117 = "Flemoid Larva";
+		118 = "Statue of David";
+		119 = "Statue of Ramses";
+		120 = "Statue of King Tut";
+		121 = "Statue of the Chex Warrior";
+		122 = "Quadrumpus";
+		125 = "Flemoid power strand";
+		126 = "Cycloptis shot";
+		130 = "Blood";
+		138 = "Ultra goggles";
+		142 = "Phasing Zorcher Pack";
+		147 = "Flower";
+		148 = "Beaker";
+		150 = "Small bush";
+		154 = "Maximus shot";
+	}
+}
+
+enums_harmony
+{
+	keys
+	{
+		0 = "None";
+		1 = "Purple key card";
+		2 = "Green key card";
+		3 = "Yellow key card";
+		4 = "Purple Pax Pox key";
+		5 = "Green Pax Pox key";
+		6 = "Yellow Pax Pox key";
+		100 = "Any key";
+		101 = "All keys";
+		102 = "Impossible";
+		129 = "Any Purple key";
+		130 = "Any Green key";
+		131 = "Any yellow key";
+		229 = "One of each color";
+	}
+	
+	spawnthing
+	{
+		0 = "None";
+		1 = "Follower";
+		2 = "Mutant Soldier";
+		3 = "Critter";
+		4 = "Beastling";
+		6 = "Phage";
+		7 = "Echidna";
+		8 = "Breaking grid";
+		11 = "Flies";
+		20 = "Predator";
+		21 = "Hack Bridge";
+		23 = "Healing Mushroom";
+		24 = "First Aid Kit";
+		25 = "Huge healing mushroom";
+		27 = "Shotgun";
+		28 = "Minigun";
+		29 = "Grenade Launcher";
+		30 = "Entropy Thrower";
+		31 = "Hand Grenade";
+		41 = "Rock debris #1";
+		42 = "Rock debris #2";
+		43 = "Rock debris #3";
+		44 = "Dirt #1";
+		45 = "Dirt #2";
+		46 = "Dirt #3";
+		47 = "Dirt #4";
+		48 = "Dirt #5";
+		49 = "Dirt #6";
+		51 = "Plasma Bolt";
+		53 = "Predator Shot";
+		54 = "Glass shard #1";
+		55 = "Glass shard #2";
+		56 = "Glass shard #3";
+		57 = "Glass shard #4";
+		58 = "Glass shard #5";
+		59 = "Glass shard #6";
+		60 = "Glass shard #7";
+		61 = "Glass shard #8";
+		62 = "Glass shard #9";
+		63 = "Glass shard #10";
+		68 = "Amazon Armor";
+		69 = "NDF Armor";
+		85 = "Green Keycard";
+		86 = "Purple Keycard";
+		87 = "Yellow Keycard";
+		88 = "Yellow key";
+		89 = "Purple key";
+		90 = "Green key";
+		110 = "Mine";
+		111 = "Falling Follower";
+		112 = "Grid obstacle";
+		114 = "Centaur";
+		125 = "Explosive Barrel";
+		127 = "Launched Grenade";
+		128 = "Thrown Grenade";
+		129 = "Phage Shot";
+		130 = "Blood";
+		131 = "Bullet Puff";
+		137 = "Computer Map";
+		139 = "Box Of Ammo";
+		140 = "Grenade";
+		141 = "Grenade Belt";
+		142 = "Energy Cell Pack";
+		143 = "Box Of Shells";
+		144 = "Backpack";
+		147 = "Grenade Blast";
+	}
+}
+
+
+enums_action2
+{
+	keys
+	{
+		0 = "None";
+	}
+	
+	spawnthing
+	{
+		21 = "Hack Bridge";
+		41 = "Rock debris #1";
+		42 = "Rock debris #2";
+		43 = "Rock debris #3";
+		44 = "Dirt #1";
+		45 = "Dirt #2";
+		46 = "Dirt #3";
+		47 = "Dirt #4";
+		48 = "Dirt #5";
+		49 = "Dirt #6";
+		54 = "Glass shard #1";
+		55 = "Glass shard #2";
+		56 = "Glass shard #3";
+		57 = "Glass shard #4";
+		58 = "Glass shard #5";
+		59 = "Glass shard #6";
+		60 = "Glass shard #7";
+		61 = "Glass shard #8";
+		62 = "Glass shard #9";
+		63 = "Glass shard #10";
+		244 = "Wood shard";
+		245 = "Glass shard";
+		246 = "Tire";
+		247 = "Paint chip";
+		248 = "Car hood";
+		249 = "Car door";
+		250 = "Soda #3";
+		251 = "Soda #2";
+		252 = "Soda #1";
+		253 = "Candy #3";
+		254 = "Candy #2";
+		255 = "Candy #1";
+	}
+}
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters_udmf
+{
+	
+	filter0
+	{
+		name = "Keys only";
+		category = "keys";
+		type = -1;
+	}
+	
+	filter1
+	{
+		name = "Deathmatch";
+		category = "";
+		type = -1;
+		
+		fields
+		{
+			dm = true;
+		}
+	}
+	
+	filter2
+	{
+		name = "Cooperative";
+		category = "";
+		type = -1;
+		
+		fields
+		{
+			coop = true;
+		}
+	}
+
+	filter3
+	{
+		name = "Skill 1";
+		category = "";
+		type = -1;
+		
+		fields
+		{
+			skill1 = true;
+		}
+	}
+	
+	filter4
+	{
+		name = "Skill 2";
+		category = "";
+		type = -1;
+		
+		fields
+		{
+			skill2 = true;
+		}
+	}
+	
+	filter5
+	{
+		name = "Skill 3";
+		category = "";
+		type = -1;
+		
+		fields
+		{
+			skill3 = true;
+		}
+	}
+	
+	filter6
+	{
+		name = "Skill 4";
+		category = "";
+		type = -1;
+		
+		fields
+		{
+			skill4 = true;
+		}
+	}
+	
+	filter7
+	{
+		name = "Skill 5";
+		category = "";
+		type = -1;
+		
+		fields
+		{
+			skill5 = true;
+		}
+	}
+	
+	filter8
+	{
+		name = "Skill 6";
+		category = "";
+		type = -1;
+		
+		fields
+		{
+			skill6 = true;
+		}
+	}
+	
+	filter9
+	{
+		name = "Skill 7";
+		category = "";
+		type = -1;
+		
+		fields
+		{
+			skill7 = true;
+		}
+	}
+	
+	filter10
+	{
+		name = "Skill 8";
+		category = "";
+		type = -1;
+		
+		fields
+		{
+			skill8 = true;
+		}
+	}
+}
+
+// Special linedefs
+speciallinedefs_doomhexen
+{
+	singlesidedflag = 1;	// See linedefflags
+	doublesidedflag = 4;	// See linedefflags
+	impassableflag = 1;
+	upperunpeggedflag = 8;
+	lowerunpeggedflag = 16;
+}
+
+speciallinedefs_udmf
+{
+	singlesidedflag = "blocking";
+	doublesidedflag = "twosided";
+	impassableflag = "blocking";
+	upperunpeggedflag = "dontpegtop";
+	lowerunpeggedflag = "dontpegbottom";
+	defaultlinedefactivation = "playercross"; //mxd. Used when translating a map to UDMF
+}
+
+// Door making
+// makedoortrack is not given here because it depends on available textures
+doormaking_doom
+{
+	makedooraction = 1;		// See linedeftypes
+}
+
+doormaking_hexen
+{
+	makedooraction = 202;	// See linedeftypes
+	makedooractivate = 1024;
+	makedoorflags { 512; }
+	makedoorarg0 = 0;
+	makedoorarg1 = 16;
+	makedoorarg2 = 0;
+	makedoorarg3 = 34;
+	makedoorarg4 = 0;
+}
+
+doormaking_udmf
+{
+	makedooraction = 202;	// See linedeftypes
+	makedoorflags { playeruse; repeatspecial; }
+	makedoorarg0 = 0;
+	makedoorarg1 = 16;
+	makedoorarg2 = 0;
+	makedoorarg3 = 34;
+	makedoorarg4 = 0;
+}
+
diff --git a/Build/Configurations/Includes/ZDoom_sectors.cfg b/Build/Configurations/Includes/ZDoom_sectors.cfg
new file mode 100644
index 0000000..e2fad79
--- /dev/null
+++ b/Build/Configurations/Includes/ZDoom_sectors.cfg
@@ -0,0 +1,108 @@
+
+// NOTE: This config contains two structures for different conventions: Doom and Hexen/UDMF
+
+// These are in addition to the standard Doom sector types and generalized Boom sector types
+doom
+{
+	21 = "Light Phased";
+	22 = "Light Sequence Start";
+	23 = "Light Sequence Special 1";
+	24 = "Light Sequence Special 2";
+}
+
+// These are instead of Doom sector types in UDMF and Hexen format
+zdoom
+{
+	0 = "None";
+	1 = "Light Phased";
+	2 = "Light Sequence Start";
+	3 = "Light Sequence Special 1";
+	4 = "Light Sequence Special 2";
+	26 = "Stairs Special 1";
+	27 = "Stairs Special 2";
+	40 = "Wind East weak";
+	41 = "Wind East medium";
+	42 = "Wind East strong";
+	43 = "Wind North weak";
+	44 = "Wind North medium";
+	45 = "Wind North strong";
+	46 = "Wind South weak";
+	47 = "Wind South medium";
+	48 = "Wind South strong";
+	49 = "Wind West weak";
+	50 = "Wind West medium";
+	51 = "Wind West strong";
+	65 = "Light Flicker";
+	66 = "Light Strobe Fast";
+	67 = "Light Strobe Slow";
+	68 = "Light Strobe Hurt -20% health";
+	69 = "Damage Hellslime -10% health";
+	71 = "Damage Nukage -5% health";
+	72 = "Light Glow";
+	74 = "Sector Door Close (30 sec)";
+	75 = "Damage End Level -20% health";
+	76 = "Light StrobeSlowSync";
+	77 = "Light StrobeFastSync";
+	78 = "Sector Door Raise (5 min)";
+	79 = "Low Friction";
+	80 = "Damage Super Hellslime -20% health";
+	81 = "Light Fire Flicker";
+	82 = "Damage -5% health (no protection)";
+	83 = "Damage -8% health (no protection)";
+	84 = "Scroll east + -2 or -5% health (no protection)";
+	85 = "Damage Sludge -4% health";
+	87 = "Sector uses outside fog";
+	105 = "Delayed damage weak (hazardcount +2/16 per second)";
+	115 = "Instant death";
+	116 = "Delayed damage strong (hazardcount +4/16 per second)";
+	118 = "Carry player by tag";
+	196 = "Healing Sector";
+	197 = "Lightning Outdoor";
+	198 = "Lightning Indoor 2";
+	199 = "Lightning Indoor 1";
+	200 = "Sky 2 (MAPINFO)";
+	201 = "Scroll North (slow)";
+	202 = "Scroll North (medium)";
+	203 = "Scroll North (fast)";
+	204 = "Scroll East (slow)";
+	205 = "Scroll East (medium)";
+	206 = "Scroll East (fast)";
+	207 = "Scroll South (slow)";
+	208 = "Scroll South (medium)";
+	209 = "Scroll South (fast)";
+	210 = "Scroll West (slow)";
+	211 = "Scroll West (medium)";
+	212 = "Scroll West (fast)";
+	213 = "Scroll NorthWest (slow)";
+	214 = "Scroll NorthWest (medium)";
+	215 = "Scroll NorthWest (fast)";
+	216 = "Scroll NorthEast (slow)";
+	217 = "Scroll NorthEast (medium)";
+	218 = "Scroll NorthEast (fast)";
+	219 = "Scroll SouthEast (slow)";
+	220 = "Scroll SouthEast (medium)";
+	221 = "Scroll SouthEast (fast)";
+	222 = "Scroll SouthWest (slow)";
+	223 = "Scroll SouthWest (medium)";
+	224 = "Scroll SouthWest (fast)";
+	225 = "Carry East Slow";
+	226 = "Carry East Med.Slow";
+	227 = "Carry East Medium";
+	228 = "Carry East Med.Fast";
+	229 = "Carry East Fast";
+	230 = "Carry North Slow";
+	231 = "Carry North Med.Slow";
+	232 = "Carry North Medium";
+	233 = "Carry North Med.Fast";
+	234 = "Carry North Fast";
+	235 = "Carry South Slow";
+	236 = "Carry South Med.Slow";
+	237 = "Carry South Medium";
+	238 = "Carry South Med.Fast";
+	239 = "Carry South Fast";
+	240 = "Carry West Slow";
+	241 = "Carry West Med.Slow";
+	242 = "Carry West Medium";
+	243 = "Carry West Med.Fast";
+	244 = "Carry West Fast";
+}
diff --git a/Build/Configurations/Includes/ZDoom_things.cfg b/Build/Configurations/Includes/ZDoom_things.cfg
new file mode 100644
index 0000000..c0920ed
--- /dev/null
+++ b/Build/Configurations/Includes/ZDoom_things.cfg
@@ -0,0 +1,1740 @@
+
+// NOTE: This config contains multiple structures for different games.
+// Note that since the extra player starts are a GameInfo setting to
+// use the games' own ednums when available, they have been moved
+// out of the main branch and into Doom, Heretic, and Default.
+//
+// ZDoom: standard actors
+// Doom: additional actors available only in Doom game mode
+// Heretic: one additional actor available in Heretic game mode
+// Hexen: some redefinitions to avoid conflict
+// Strife: some redefinitions to avoid conflict
+// Default: for other games (Harmony, Chex Quest, etc.)
+
+zdoom
+{
+	include("Boom_things.cfg");
+
+	teleports
+	{
+		9043
+		{
+			title = "Teleport (Z Height and Gravity)";
+			sprite = "internal:teleport";
+			class = "TeleportDest3";
+		}
+		
+		9044
+		{
+			title = "Teleport (Z Height)";
+			sprite = "internal:teleport";
+			class = "TeleportDest2";
+		}
+	}
+
+	obstacles
+	{
+		blocking = 2;
+		
+		5050
+		{
+			title = "Stalagmite";
+			sprite = "SMT2A0";
+			class = "Stalagmite";
+			width = 16;
+			height = 48;
+		}
+	}
+
+	lights
+	{
+		blocking = 2;
+	}
+	
+	decoration
+	{
+		9027
+		{
+			title = "Red Particle Fountain";
+			class = "RedParticleFountain";
+		}
+		
+		9028
+		{
+			title = "Green Particle Fountain";
+			class = "GreenParticleFountain";
+		}
+		
+		9029
+		{
+			title = "Blue Particle Fountain";
+			class = "BlueParticleFountain";
+		}
+		
+		9030
+		{
+			title = "Yellow Particle Fountain";
+			class = "YellowParticleFountain";
+		}
+		
+		9031
+		{
+			title = "Purple Particle Fountain";
+			class = "PurpleParticleFountain";
+		}
+		
+		9032
+		{
+			title = "Black Particle Fountain";
+			class = "BlackParticleFountain";
+		}
+		
+		9033
+		{
+			title = "White Particle Fountain";
+			class = "WhiteParticleFountain";
+		}
+	}
+
+	sounds
+	{
+		color = 7;
+		arrow = 0;
+		title = "Sounds";
+		width = 10;
+		height = 20;
+		sort = 1;
+		blocking = 0;
+		hangs = 0;
+		fixedsize = true;
+		sprite = "internal:sound";
+		
+		1400 = "Sound Sequence 0";
+		1401 = "Sound Sequence 1";
+		1402 = "Sound Sequence 2";
+		1403 = "Sound Sequence 3";
+		1404 = "Sound Sequence 4";
+		1405 = "Sound Sequence 5";
+		1406 = "Sound Sequence 6";
+		1407 = "Sound Sequence 7";
+		1408 = "Sound Sequence 8";
+		1409 = "Sound Sequence 9";
+		
+		1411
+		{
+			title = "Sector Sound Sequence Override";
+			class = "$SSeqOverride";
+			arg0
+			{
+				title = "Sound Sequence Index";
+				type = 11;
+				enum
+				{
+					255 = "Default";
+				}
+			}
+		}
+		
+		14001 = "Ambient Sound 01";
+		14002 = "Ambient Sound 02";
+		14003 = "Ambient Sound 03";
+		14004 = "Ambient Sound 04";
+		14005 = "Ambient Sound 05";
+		14006 = "Ambient Sound 06";
+		14007 = "Ambient Sound 07";
+		14008 = "Ambient Sound 08";
+		14009 = "Ambient Sound 09";
+		14010 = "Ambient Sound 10";
+		14011 = "Ambient Sound 11";
+		14012 = "Ambient Sound 12";
+		14013 = "Ambient Sound 13";
+		14014 = "Ambient Sound 14";
+		14015 = "Ambient Sound 15";
+		14016 = "Ambient Sound 16";
+		14017 = "Ambient Sound 17";
+		14018 = "Ambient Sound 18";
+		14019 = "Ambient Sound 19";
+		14020 = "Ambient Sound 20";
+		14021 = "Ambient Sound 21";
+		14022 = "Ambient Sound 22";
+		14023 = "Ambient Sound 23";
+		14024 = "Ambient Sound 24";
+		14025 = "Ambient Sound 25";
+		14026 = "Ambient Sound 26";
+		14027 = "Ambient Sound 27";
+		14028 = "Ambient Sound 28";
+		14029 = "Ambient Sound 29";
+		14030 = "Ambient Sound 30";
+		14031 = "Ambient Sound 31";
+		14032 = "Ambient Sound 32";
+		14033 = "Ambient Sound 33";
+		14034 = "Ambient Sound 34";
+		14035 = "Ambient Sound 35";
+		14036 = "Ambient Sound 36";
+		14037 = "Ambient Sound 37";
+		14038 = "Ambient Sound 38";
+		14039 = "Ambient Sound 39";
+		14040 = "Ambient Sound 40";
+		14041 = "Ambient Sound 41";
+		14042 = "Ambient Sound 42";
+		14043 = "Ambient Sound 43";
+		14044 = "Ambient Sound 44";
+		14045 = "Ambient Sound 45";
+		14046 = "Ambient Sound 46";
+		14047 = "Ambient Sound 47";
+		14048 = "Ambient Sound 48";
+		14049 = "Ambient Sound 49";
+		14050 = "Ambient Sound 50";
+		14051 = "Ambient Sound 51";
+		14052 = "Ambient Sound 52";
+		14053 = "Ambient Sound 53";
+		14054 = "Ambient Sound 54";
+		14055 = "Ambient Sound 55";
+		14056 = "Ambient Sound 56";
+		14057 = "Ambient Sound 57";
+		14058 = "Ambient Sound 58";
+		14059 = "Ambient Sound 59";
+		14060 = "Ambient Sound 60";
+		14061 = "Ambient Sound 61";
+		14062 = "Ambient Sound 62";
+		14063 = "Ambient Sound 63";
+		14064 = "Ambient Sound 64";
+		
+		14065
+		{
+			title = "Custom Ambient Sound";
+			class = "AmbientSound";
+			arg0
+			{
+				title = "Ambient Sound Index";
+			}
+			arg1
+			{
+				title = "Volume";
+				type = 11;
+				enum = "sound_volume";
+			}
+			arg2
+			{
+				title = "Min. Fading Distance";
+			}
+			arg3
+			{
+				title = "Max. Heard Distance";
+			}
+			arg4
+			{
+				title = "Distance Multiplier";
+			}
+		}
+		
+		14066
+		{
+			title = "Sound Sequence";
+			class = "SoundSequence";
+			arg0
+			{
+				title = "Sound Sequence Index";
+			}
+			arg1
+			{
+				title = "Choice";
+			}
+		}
+		
+		14067
+		{
+			title = "Custom Ambient Sound (no gravity)";
+			class = "AmbientSoundNoGravity";
+			arg0
+			{
+				title = "Ambient Sound Index";
+			}
+			arg1
+			{
+				title = "Volume";
+				type = 11;
+				enum = "sound_volume";
+			}
+			arg2
+			{
+				title = "Min. Fading Distance";
+			}
+			arg3
+			{
+				title = "Max. Heard Distance";
+			}
+			arg4
+			{
+				title = "Distance Multiplier";
+			}
+		}
+		
+		14101 = "Music Changer 01";
+		14102 = "Music Changer 02";
+		14103 = "Music Changer 03";
+		14104 = "Music Changer 04";
+		14105 = "Music Changer 05";
+		14106 = "Music Changer 06";
+		14107 = "Music Changer 07";
+		14108 = "Music Changer 08";
+		14109 = "Music Changer 09";
+		14110 = "Music Changer 10";
+		14111 = "Music Changer 11";
+		14112 = "Music Changer 12";
+		14113 = "Music Changer 13";
+		14114 = "Music Changer 14";
+		14115 = "Music Changer 15";
+		14116 = "Music Changer 16";
+		14117 = "Music Changer 17";
+		14118 = "Music Changer 18";
+		14119 = "Music Changer 19";
+		14120 = "Music Changer 20";
+		14121 = "Music Changer 21";
+		14122 = "Music Changer 22";
+		14123 = "Music Changer 23";
+		14124 = "Music Changer 24";
+		14125 = "Music Changer 25";
+		14126 = "Music Changer 26";
+		14127 = "Music Changer 27";
+		14128 = "Music Changer 28";
+		14129 = "Music Changer 29";
+		14130 = "Music Changer 30";
+		14131 = "Music Changer 31";
+		14132 = "Music Changer 32";
+		14133 = "Music Changer 33";
+		14134 = "Music Changer 34";
+		14135 = "Music Changer 35";
+		14136 = "Music Changer 36";
+		14137 = "Music Changer 37";
+		14138 = "Music Changer 38";
+		14139 = "Music Changer 39";
+		14140 = "Music Changer 40";
+		14141 = "Music Changer 41";
+		14142 = "Music Changer 42";
+		14143 = "Music Changer 43";
+		14144 = "Music Changer 44";
+		14145 = "Music Changer 45";
+		14146 = "Music Changer 46";
+		14147 = "Music Changer 47";
+		14148 = "Music Changer 48";
+		14149 = "Music Changer 49";
+		14150 = "Music Changer 50";
+		14151 = "Music Changer 51";
+		14152 = "Music Changer 52";
+		14153 = "Music Changer 53";
+		14154 = "Music Changer 54";
+		14155 = "Music Changer 55";
+		14156 = "Music Changer 56";
+		14157 = "Music Changer 57";
+		14158 = "Music Changer 58";
+		14159 = "Music Changer 59";
+		14160 = "Music Changer 60";
+		14161 = "Music Changer 61";
+		14162 = "Music Changer 62";
+		14163 = "Music Changer 63";
+		14164 = "Music Changer 64";
+		
+		14165
+		{
+			title = "Custom Music Changer";
+			class = "MusicChanger";
+			arg0
+			{
+				title = "MUSINFO Track Index";
+			}
+			arg1
+			{
+				title = "MOD Track Order";
+			}
+		}
+		
+		9048
+		{
+			title = "Sound Environment (reverbs)";
+			class = "SoundEnvironment";
+			arg0
+			{
+				title = "ID (first part)";
+			}
+			arg1
+			{
+				title = "ID (second part)";
+			}
+		}
+	}
+
+	monsters
+	{
+		888
+		{
+			title = "MBF Helper dog";
+			width = 12;
+			height = 28;
+			sprite = "internal:dog";
+			class = "MBFHelperDog";
+		}
+	}
+
+	bridges
+	{
+		color = 8;	// Grey
+		arrow = 0;
+		title = "Bridges";
+		width = 32;
+		sort = 1;
+		height = 8;
+		hangs = 0;
+		blocking = 0;
+		error = 1;
+		sprite = "internal:bridge";
+		
+		5065
+		{
+			title = "Invisible Bridge, radius 8";
+			class = "InvisibleBridge8";
+			width = 8;
+			arg0
+			{
+				title = "Radius";
+				type = 23;
+			}
+			arg1
+			{
+				title = "Height";
+				type = 24;
+			}
+		}
+		
+		5064
+		{
+			title = "Invisible Bridge, radius 16";
+			class = "InvisibleBridge16";
+			width = 16;
+			arg0
+			{
+				title = "Radius";
+				type = 23;
+			}
+			arg1
+			{
+				title = "Height";
+				type = 24;
+			}
+		}
+		
+		5061
+		{
+			title = "Invisible Bridge, radius 32";
+			class = "InvisibleBridge32";
+			arg0
+			{
+				title = "Radius";
+				type = 23;
+			}
+			arg1
+			{
+				title = "Height";
+				type = 24;
+			}
+		}
+		
+		9990
+		{
+			title = "Custom Invisible Bridge";
+			class = "InvisibleBridge";
+			height = 4;
+			arg0
+			{
+				title = "Radius";
+				type = 23;
+			}
+			arg1
+			{
+				title = "Height";
+				type = 24;
+			}
+		}
+		
+		9991
+		{
+			title = "Bridge Custom";
+			class = "CustomBridge";
+			height = 2;
+			arg0
+			{
+				title = "Radius";
+				type = 23;
+			}
+			arg1
+			{
+				title = "Height";
+				type = 24;
+			}
+			arg2
+			{
+				title = "Orbs Amount";
+			}
+			arg3
+			{
+				title = "Rotation Speed and Direction";
+				type = 11;
+				enum
+				{
+					0 = "0: Hexen default";
+					11 = "11: 15 deg. per second";
+					21 = "21: 30 deg. per second";
+					32 = "32: 45 deg. per second";
+					64 = "64: 90 deg. per second";
+					128 = "128: 180 deg. per second";
+					192 = "192: -90 deg. per second";
+					223 = "223: -45 deg. per second";
+					233 = "233: -30 deg. per second";
+					244 = "244: -15 deg. per second";
+				}
+			}
+			arg4
+			{
+				title = "Rotation Radius";
+				type = 11;
+				enum
+				{
+					0 = "0: Hexen default";
+				}
+			}
+		}
+	}
+	
+	cameras
+	{
+		color = 7;	// Light Grey
+		arrow = 1;
+		title = "Cameras and Interpolation";
+		width = 0;
+		height = 0;
+		sort = 1;
+		hangs = 0;
+		blocking = 0;
+		error = 1;
+		fixedsize = true;
+		sprite = "internal:camera";
+		
+		9025
+		{
+			title = "Security Camera";
+			class = "SecurityCamera";
+			arg0
+			{
+				title = "Pitch";
+			}
+			arg1
+			{
+				title = "Maximum Yaw";
+			}
+			arg2
+			{
+				title = "Cycle Time (octics)";
+				type = 11;
+				enum = "generic_door_delays";
+			}
+		}
+		
+		9073
+		{
+			title = "Aiming Camera";
+			class = "AimingCamera";
+			arg0
+			{
+				title = "Pitch";
+			}
+			arg1
+			{
+				title = "Max. yaw per second";
+			}
+			arg2
+			{
+				title = "Max. pitch per second";
+			}
+			arg3
+			{
+				title = "Target Thing Tag";
+				type = 14;
+			}
+		}
+		
+		9080
+		{
+			title = "Skybox Viewpoint";
+			sprite = "internal:SkyboxViewpoint";
+			class = "SkyViewpoint";
+			arg0
+			{
+				title = "Visibility / 4";
+			}
+		}
+		
+		9081
+		{
+			title = "Skybox Picker";
+			sprite = "internal:SkyboxPicker";
+			class = "SkyPicker";
+			arg0
+			{
+				title = "Skybox Viewpoint Tag";
+				type = 14;
+			}
+			arg1
+			{
+				title = "Apply to";
+				type = 11;
+				enum
+				{
+					0 = "Floor and Ceiling";
+					1 = "Ceiling";
+					2 = "Floor";
+				}
+			}
+		}
+		
+		9083
+		{
+			title = "Eternity Skybox Viewpoint";
+			sprite = "internal:SkyboxViewpoint";
+			class = "SkyCamCompat";
+		}
+		
+		9074
+		{
+			title = "Actor Mover";
+			sprite = "internal:actormover";
+			class = "ActorMover";
+			arg0
+			{
+				title = "Interpolation Point Tag";
+				type = 14;
+			}
+			arg1
+			{
+				title = "Interpolation Point HiTag";
+			}
+			arg2
+			{
+				title = "Options";
+				type = 12;
+				enum
+				{
+					1 = "Linear path";
+					2 = "Use point angle";
+					4 = "Use point pitch";
+					8 = "Face thing / movement direction";
+					128 = "Nonsolid";
+				}
+			}
+			arg3
+			{
+				title = "Target Thing Tag";
+				type = 14;
+			}
+		}
+		
+		9070
+		{
+			title = "Interpolation Point";
+			sprite = "internal:InterpolationPoint";
+			class = "InterpolationPoint";
+			arg0
+			{
+				title = "Pitch";
+			}
+			arg1
+			{
+				title = "Travel Time (otics)";
+				type = 11;
+				enum = "generic_door_delays";
+			}
+			arg2
+			{
+				title = "Hold Time (otics)";
+				type = 11;
+				enum = "generic_door_delays";
+			}
+			arg3
+			{
+				title = "Next Point Tag";
+				type = 14;
+			}
+			arg4
+			{
+				title = "Next Point HiTag";
+			}
+		}
+		
+		9075
+		{
+			title = "Interpolation Special";
+			sprite = "internal:InterpolationSpecial";
+			class = "InterpolationSpecial";
+		}
+		
+		9072
+		{
+			title = "Moving Camera";
+			class = "MovingCamera";
+			arg0
+			{
+				title = "Interpolation Point Tag";
+				type = 14;
+			}
+			arg1
+			{
+				title = "Interpolation Point HiTag";
+			}
+			arg2
+			{
+				title = "Options";
+				type = 12;
+				enum
+				{
+					1 = "Linear path";
+					2 = "Use point angle";
+					4 = "Use point pitch";
+					8 = "Face movement direction";
+					128 = "Show to everyone";
+				}
+			}
+			arg3
+			{
+				title = "Target Thing Tag";
+				type = 14;
+			}
+		}
+		
+		9071
+		{
+			title = "Path Follower";
+			sprite = "internal:PathFollower";
+			class = "PathFollower";
+			arg0
+			{
+				title = "Interpolation Point Tag";
+				type = 14;
+			}
+			arg1
+			{
+				title = "Interpolation Point HiTag";
+			}
+			arg2
+			{
+				title = "Options";
+				type = 12;
+				enum
+				{
+					1 = "Linear path";
+					2 = "Use point angle";
+					4 = "Use point pitch";
+					8 = "Face movement direction";
+				}
+			}
+		}
+		
+		9047
+		{
+			title = "Patrol Special";
+			class = "PatrolSpecial";
+		}
+	}
+
+	sectors
+	{
+		color = 7;
+		arrow = 0;
+		title = "Sector Actions";
+		sort = 1;
+		width = 10;
+		height = 20;
+		hangs = 0;
+		blocking = 0;
+		fixedsize = true;
+		sprite = "internal:action";
+		
+		9082
+		{
+			title = "Silent Sector";
+			sprite = "internal:SilentSector";
+			class = "SectorSilencer";
+		}
+		
+		9998
+		{
+			title = "Actor enters sector";
+			class = "SecActEnter";
+		} 
+		
+		9989
+		{
+			title = "Actor hits fake floor";
+			class = "SecActHitFakeFloor";
+		}
+		
+		9996
+		{
+			title = "Actor hits ceiling";
+			class = "SecActHitCeil";
+		}
+		
+		9999
+		{
+			title = "Actor hits floor";
+			class = "SecActHitFloor";
+		} 
+		
+		9997
+		{
+			title = "Actor leaves sector";
+			class = "SecActExit";
+		}
+		
+		9982
+		{
+			title = "Eyes above fake ceiling";
+			class = "SecActEyesAboveC";
+		}
+		
+		9992
+		{
+			title = "Eyes above fake floor";
+			class = "SecActEyesSurface";
+		}
+		
+		9983
+		{
+			title = "Eyes below fake ceiling";
+			class = "SecActEyesBelowC";
+		}
+		
+		9993
+		{
+			title = "Eyes below fake floor";
+			class = "SecActEyesDive";
+		}
+		
+		9995
+		{
+			title = "Player uses sector";
+			class = "SecActUse";
+		}
+		
+		9994
+		{
+			title = "Player uses sector";
+			class = "SecActUseWall";
+		}
+		
+		9038
+		{
+			title = "Color Setter"; 
+			class = "ColorSetter";
+			arg0
+			{
+				title = "Red";
+				default = 255;
+			}
+			arg1
+			{
+				title = "Green";
+        default = 255;
+			}
+			arg2
+			{
+				title = "Blue";
+				default = 255;
+			}
+			arg3
+			{
+				title = "Desaturation";
+			}
+		}
+		
+		9039
+		{
+			title = "Fade Setter";
+			class = "FadeSetter";
+			arg0
+			{
+				title = "Red";
+				default = 128;
+			}
+			arg1
+			{
+				title = "Green";
+				default = 128;
+			}
+			arg2
+			{
+				title = "Blue";
+				default = 128;
+			}
+		}
+		
+		9041
+		{
+			title = "Sector Flag Setter";
+			class = "SectorFlagSetter";
+			arg0
+			{
+				title = "Set Flags";
+				type = 12;
+				enum = "sector_flags";
+			}
+		}
+	}
+
+	slopes
+	{
+		color = 8;	// Grey
+		arrow = 0;
+		title = "Slopes";
+		width = 0;
+		sort = 1;
+		height = 0;
+		hangs = 0;
+		blocking = 0;
+		fixedsize = true;
+		sprite = "internal:slope";
+		
+		9511
+		{
+			title = "Copy ceiling plane";
+			class = "$CopyCeilingPlane";
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+		}
+		
+		9510
+		{
+			title = "Copy floor plane";
+			class = "$CopyFloorPlane";
+			arg0
+			{
+				title = "Sector Tag";
+				type = 13;
+			}
+		}
+		
+		9503
+		{
+			title = "Set ceiling slope";
+			class = "$SetCeilingSlope";
+			arrow = 1;
+			arg0
+			{
+				title = "Z-Angle";
+				default = 90;
+			}
+		}
+		
+		9502
+		{
+			title = "Set floor slope";
+			class = "$SetFloorSlope";
+			arrow = 1;
+			arg0
+			{
+				title = "Z-Angle";
+				default = 90;
+			}
+		}
+		
+		9501
+		{
+			title = "Slope ceiling to here";
+			class = "$SlopeCeilingPointLine";
+			height = 8;
+			arg0
+			{
+				title = "Line";
+				type = 15;
+			}
+		}
+		
+		9500
+		{
+			title = "Slope floor to here";
+			class = "$SlopeFloorPointLine";
+			height = 4;
+			arg0
+			{
+				title = "Line";
+				type = 15;
+			}
+		}
+		
+		1500
+		{
+			title = "Line slope floor";
+			class = "$VavoomFloor";
+			height = 8;
+		}
+		
+		1501
+		{
+			title = "Line slope ceiling";
+			class = "$VavoomCeiling";
+			height = 8;
+		}
+		
+		1504
+		{
+			title = "Vertex slope floor";
+			class = "$VertexFloorZ";
+			height = 8;
+			absolutez = true;
+		}
+		
+		1505
+		{
+			title = "Vertex slope ceiling";
+			class = "$VertexCeilingZ";
+			height = 8;
+			absolutez = true;
+		}
+	}
+
+	zdoom
+	{
+		color = 7;	// Light Grey
+		arrow = 1;
+		title = "ZDoom";
+		sort = 1;
+		width = 10;
+		height = 20;
+		hangs = 0;
+		blocking = 0;
+		fixedsize = true;
+		sprite = "internal:arrow";
+		
+		9200
+		{
+			title = "Decal";
+			sprite = "internal:Decal";
+			class = "Decal";
+			arg0
+			{
+				title = "Decal ID";
+			}
+		}
+		
+		9024
+		{
+			title = "Patrol Point";
+			sprite = "internal:PathFollower";
+			class = "PatrolPoint";
+			arg0
+			{
+				title = "Next Patrol Point Tag";
+				type = 14;
+			}
+			arg1
+			{
+				title = "Delay";
+				type = 11;
+				enum = "delay_seconds_0nodelay";
+			}
+		}
+		
+		9026
+		{
+			title = "Spark";
+			sprite = "internal:Sparkle";
+			class = "Spark";
+			arg0
+			{
+				title = "Particles Amount";
+			}
+		}
+		
+		9040
+		{
+			title = "Map Marker";
+			class = "MapMarker";
+			arg0
+			{
+				title = "Follow Target Tag";
+				type = 14;
+			}
+			arg1
+			{
+				title = "Don't Show Until Sector Seen";
+				type = 11;
+				enum = "noyes";
+			}
+		}
+		
+		9045
+		{
+			title = "Water Zone";
+			sprite = "internal:DeepWater";
+			class = "Waterzone";
+		}
+		
+		9046
+		{
+			title = "Secret";
+			sprite = "internal:Secret";
+			class = "SecretTrigger";
+			arg0
+			{
+				title = "Notification Type";
+				type = 11;
+				enum
+				{
+					0 = "Message And Sound";
+					1 = "Message Only";
+					2 = "Sound Only";
+					3 = "None";
+				} 
+			}
+		}
+		
+		9300
+		{
+			title = "Polyobject Anchor";
+			sprite = "internal:anchor";
+			class = "$PolyAnchor";
+			fixedrotation = true;
+		}
+		 
+		9301
+		{
+			title = "Polyobject Start Spot";
+			sprite = "internal:anchor";
+			class = "$PolySpawn";
+			fixedrotation = true;
+		}
+		
+		9302
+		{
+			title = "Polyobject Start Spot (crush)";
+			sprite = "internal:anchor";
+			class = "$PolySpawnCrush";
+			fixedrotation = true;
+		}
+		 
+		9303
+		{
+			title = "Polyobject Start Spot (hurts to touch)";
+			sprite = "internal:anchor";
+			class = "$PolySpawnHurt";
+			fixedrotation = true;
+		}
+		
+		9001
+		{
+			title = "Map Spot";
+			sprite = "internal:MapSpot";
+			class = "MapSpot";
+		}
+		
+		9013
+		{
+			title = "Map Spot (gravity)";
+			sprite = "internal:MapSpotGravity";
+			class = "MapSpotGravity";
+		}
+		
+		9076
+		{
+			title = "Hate target";
+			sprite = "internal:Target";
+			class = "HateTarget";
+		}
+		
+		9988
+		{
+			title = "Custom Sprite";
+			class = "CustomSprite";
+			arg0
+			{
+				title = "BTILxxxx";
+			}
+			arg1
+			{
+				title = "BTILxxxx";
+			}
+			arg2
+			{
+				title = "X Scale (64=100%)";
+				default = 64;
+			}
+			arg3
+			{
+				title = "Y Scale (64=100%) ";
+				default = 64;
+			}
+			arg4
+			{
+				title = "Flags";
+				type = 11;
+				enum
+				{
+					0 = "Opaque";
+					2 = "Alpha 33%";
+					3 = "Alpha 66%";
+					4 = "Flip horizontally";
+					5 = "Flip vertically";
+				}
+			}
+		}
+	}
+
+	portals
+	{
+		color = 7;
+		arrow = 0;
+		title = "Portals";
+		width = 0;
+		sort = 1;
+		height = 0;
+		hangs = 0;
+		blocking = 0;
+		fixedsize = true;
+		
+		9077
+		{
+			title = "Upper Sector";
+			sprite = "internal:portal_upper";
+			class = "UpperStackLookOnly";
+			arg0
+			{
+				title = "Flat Opacity";
+				default = 128;
+			}
+		}
+		
+		9078
+		{
+			title = "Lower Sector";
+			sprite = "internal:portal_lower";
+			class = "LowerStackLookOnly";
+			arg0
+			{
+				title = "Flat Opacity";
+				default = 128;
+			}
+		}
+	}
+}
+
+
+doom
+{
+	players
+	{
+		blocking = 2;
+		
+		4001
+		{
+			title = "Player 5 start";
+			sprite = "PLAYA2A8";
+			class = "$Player5Start";
+		}
+		
+		4002
+		{
+			title = "Player 6 start";
+			sprite = "PLAYA2A8";
+			class = "$Player6Start";
+		}
+		
+		4003
+		{
+			title = "Player 7 start";
+			sprite = "PLAYA2A8";
+			class = "$Player7Start";
+		}
+		
+		4004
+		{
+			title = "Player 8 start";
+			sprite = "PLAYA2A8";
+			class = "$Player8Start";
+		}
+	}
+
+	monsters
+	{
+		blocking = 2;
+		
+		9037
+		{
+			title = "PR Lost Soul (BETA)";
+			width = "16";
+			height = "56";
+			sprite = "SKULA1";
+			class = "BetaSkull";
+		}
+		
+		9050
+		{
+			title = "Arachnotron (stealth)";
+			renderstyle = "translucent";
+			alpha = 0.25f;
+			width = 64;
+			height = 64;
+			sprite = "BSPIA2A8";
+			class = "StealthArachnotron";
+		}
+		
+		9051
+		{
+			title = "Archvile (stealth)";
+			renderstyle = "translucent";
+			alpha = 0.25f;
+			width = 20;
+			sprite = "VILEA2D8";
+			class = "StealthArchvile";
+		}
+		
+		9052
+		{
+			title = "Baron of Hell (stealth)";
+			renderstyle = "translucent";
+			alpha = 0.25f;
+			width = 24;
+			height = 64;
+			sprite = "BOSSA2A8";
+			class = "StealthBaron";
+		}
+		
+		9053
+		{
+			title = "Cacodemon (stealth)";
+			renderstyle = "translucent";
+			alpha = 0.25f;
+			width = 31;
+			sprite = "HEADA2A8";
+			class = "StealthCacodemon";
+		}
+		
+		9054
+		{
+			title = "Chaingunner (stealth)";
+			renderstyle = "translucent";
+			alpha = 0.25f;
+			sprite = "CPOSA2";
+			class = "StealthChaingunGuy";
+		}
+		
+		9055
+		{
+			title = "Demon (stealth)";
+			renderstyle = "translucent";
+			alpha = 0.25f;
+			width = 30;
+			sprite = "SARGA2A8";
+			class = "StealthDemon";
+		}
+		
+		9056
+		{
+			title = "Hell Knight (stealth)";
+			renderstyle = "translucent";
+			alpha = 0.25f;
+			width = 24;
+			height = 64;
+			sprite = "BOS2A2C8";
+			class = "StealthHellKnight";
+		}
+		
+		9057
+		{
+			title = "Imp (stealth)";
+			renderstyle = "translucent";
+			alpha = 0.25f;
+			sprite = "TROOA2A8";
+			class = "StealthDoomImp";
+		}
+		
+		9058
+		{
+			title = "Mancubus (stealth)";
+			renderstyle = "translucent";
+			alpha = 0.25f;
+			width = 48;
+			height = 64;
+			sprite = "FATTC2C8";
+			class = "StealthFatso";
+		}
+		
+		9059
+		{
+			title = "Revenant (stealth)";
+			renderstyle = "translucent";
+			alpha = 0.25f;
+			sprite = "SKELA2D8";
+			class = "StealthRevenant";
+		}
+		
+		9060
+		{
+			title = "Former Sergeant (stealth)";
+			renderstyle = "translucent";
+			alpha = 0.25f;
+			sprite = "SPOSA2A8";
+			class = "StealthShotgunGuy";
+		}
+		
+		9061
+		{
+			title = "Former Human (stealth)";
+			renderstyle = "translucent";
+			alpha = 0.25f;
+			sprite = "POSSA2A8";
+			class = "StealthZombieMan";
+		}
+	}
+
+	decoration
+	{
+		49	// Hanging victim, twitching (blocking)
+		{
+			blocking = 2;
+		}
+		
+		50	// Hanging victim, arms out (blocking)
+		{
+			blocking = 2;
+		}
+
+		51	// Hanging victim, 1-legged (blocking)
+		{
+			blocking = 2;
+		}
+		
+		52	// Hanging pair of legs (blocking)
+		{
+			blocking = 2;
+		}
+
+		53	// Hanging leg (blocking)
+		{
+			blocking = 2;
+		}
+		
+		25	// Impaled human
+		{
+			blocking = 2;
+		}
+		
+		26	// Twitching impaled human
+		{
+			blocking = 2;
+		}
+		
+		27	// Skull on a pole
+		{
+			blocking = 2;
+		}
+		
+		28	// 5 skulls shish kebob
+		{
+			blocking = 2;
+		}
+		
+		29	// Pile of skulls and candles
+		{
+			blocking = 2;
+		}
+		
+		73	// Hanging victim, guts removed
+		{
+			blocking = 2;
+		}
+		
+		74	// Hanging victim, guts and brain removed
+		{
+			blocking = 2;
+		}
+		
+		75	// Hanging torso, looking down
+		{
+			blocking = 2;
+		}
+		
+		76	// Hanging torso, open skull
+		{
+			blocking = 2;
+		}
+		
+		77	// Hanging torso, looking up
+		{
+			blocking = 2;
+		}
+		
+		78	// Hanging torso, brain removed
+		{
+			blocking = 2;
+		}
+	}
+	
+	weapons
+	{
+		5010
+		{
+			title = "Pistol";
+			sprite = "internal:ZDoomPistol";
+			class = "Pistol";
+		}
+	}
+	
+	powerups
+	{
+		2016
+		{
+			title = "Evil Sceptre (BETA)";
+			class = "EvilSceptre";
+		}
+		
+		2017
+		{
+			title = "Unholy Bible (BETA)";
+			class = "UnholyBible";
+		}
+	}
+	
+	bridges
+	{
+		118
+		{
+			title = "Hack Bridge";
+			class = "ZBridge";
+			width = 36;
+			height = 4;
+			arg0
+			{
+				title = "Radius";
+				type = 23;
+			}
+			arg1
+			{
+				title = "Height";
+				type = 24;
+			}
+		}
+	}
+
+	marine
+	{
+		color = 15;
+		arrow = 1;
+		title = "Marines";
+		width = 16;
+		sort = 1;
+		height = 56;
+		hangs = 0;
+		blocking = 0;
+		sprite = "PLAYA2A8";
+		
+		9100
+		{
+			title = "Scripted Marine";
+			class = "ScriptedMarine";
+		}
+		
+		9101
+		{
+			title = "Marine (fist)";
+			class = "MarineFist";
+		}
+		
+		9102
+		{
+			title = "Marine (berserk)";
+			class = "MarineBerserk";
+		}
+		
+		9103
+		{
+			title = "Marine (chainsaw)";
+			class = "MarineChainsaw";
+		}
+		
+		9104
+		{
+			title = "Marine (pistol)";
+			class = "MarinePistol";
+		}
+		
+		9105
+		{
+			title = "Marine (shotgun)";
+			class = "MarineShotgun";
+		}
+		
+		9106
+		{
+			title = "Marine (SSG)";
+			class = "MarineSSG";
+		}
+		
+		9107
+		{
+			title = "Marine (chaingun)";
+			class = "MarineChaingun";
+		}
+		
+		9108
+		{
+			title = "Marine (rocket launcher)";
+			class = "MarineRocket";
+		}
+		
+		9109
+		{
+			title = "Marine (plasma rifle)";
+			class = "MarinePlasma";
+		}
+		
+		9110
+		{
+			title = "Marine (Railgun)";
+			class = "MarineRailgun";
+		}
+		
+		9111
+		{
+			title = "Marine (BFG9000)";
+			class = "MarineBFG";
+		}
+	}
+}
+
+heretic
+{
+	players
+	{
+		blocking = 2;
+		
+		4001
+		{
+			title = "Player 5 start";
+			sprite = "PLAYA2A8";
+			class = "$Player5Start";
+		}
+		
+		4002
+		{
+			title = "Player 6 start";
+			sprite = "PLAYA2A8";
+			class = "$Player6Start";
+		}
+		
+		4003
+		{
+			title = "Player 7 start";
+			sprite = "PLAYA2A8";
+			class = "$Player7Start";
+		}
+		
+		4004
+		{
+			title = "Player 8 start";
+			sprite = "PLAYA2A8";
+			class = "$Player8Start";
+		}
+	}
+	
+	weapons
+	{
+		9042
+		{
+			title = "Gold Wand";
+			sprite = "internal:ZDoomGoldWand";
+			class = "GoldWand";
+		}		
+	}
+
+	bridges
+	{
+		118
+		{
+			title = "Glitter Bridge";
+			class = "Bridge";
+			width = "32";
+			height = "2";
+		}
+	}
+}
+
+hexen
+{
+	other
+	{
+		// This solves conflict
+		9001 = null;	// Map Spot
+		9013 = null;	// Map Spot (Gravity)
+		// We'll want to use ZDoom's own polyobject numbers
+		3000 = null;	// Polyobject Anchor
+		3001 = null;	// Polyobject Start Spot
+		3002 = null;	// Polyobject Start Spot (crush)
+	}
+}
+
+strife
+{
+	// These are useless and not supported in ZDoom
+	hints
+	{
+		title = "Explosives";
+		9001 = null;	// Label Hint 1
+		9002 = null;	// Label Hint 2
+		9003 = null;	// Label Hint 3
+		9004 = null;	// Label Hint 4
+		9005 = null;	// Label Hint 5
+		9006 = null;	// Label Hint 6
+	}
+
+	pillars
+	{
+		blocking = 2;
+	}
+}
+
+default
+{
+	players
+	{
+		blocking = 2;
+		
+		4001
+		{
+			title = "Player 5 start";
+			sprite = "PLAYA2A8";
+			class = "$Player5Start";
+		}
+		
+		4002
+		{
+			title = "Player 6 start";
+			sprite = "PLAYA2A8";
+			class = "$Player6Start";
+		}
+		
+		4003
+		{
+			title = "Player 7 start";
+			sprite = "PLAYA2A8";
+			class = "$Player7Start";
+		}
+		
+		4004
+		{
+			title = "Player 8 start";
+			sprite = "PLAYA2A8";
+			class = "$Player8Start";
+		}
+	}
+}
\ No newline at end of file
diff --git a/Build/Configurations/Includes/Zandronum_common.cfg b/Build/Configurations/Includes/Zandronum_common.cfg
new file mode 100644
index 0000000..b44bb58
--- /dev/null
+++ b/Build/Configurations/Includes/Zandronum_common.cfg
@@ -0,0 +1,170 @@
+// New things available in all games
+zandronum
+{
+	//dynamic lights
+	include("GZDoom_things.cfg", "gzdoom_lights")
+
+	// Team player starts
+	players
+	{
+		color = 10;	// Light Green
+		arrow = 1;
+		title = "Player Starts";
+		width = 16;
+		sort = 1;
+		height = 56;
+		hangs = 0;
+		blocking = 2;
+		error = 2;
+		
+		5080
+		{
+			title = "Player Blue start (team start)";
+			sprite = "PLAYE2E8";
+		}
+		5081
+		{
+			title = "Player Red start (team start)";
+			sprite = "PLAYF2F8";
+		}
+		5082
+		{
+			title = "Player Temporary start (team start)";
+			sprite = "PLAYF1";
+		}
+	}
+
+	flags
+	{
+		color = 13;	// Light Magenta
+		arrow = 0;
+		title = "Flags";
+		width = 20;
+		sort = 1;
+		height = 20;
+		hangs = 0;
+		blocking = 0;
+		
+		5130
+		{
+			title = "Blue flag";
+			sprite = "internal:ZandFlagBlue";
+		}
+		5131
+		{
+			title = "Red flag";
+			sprite = "internal:ZandFlagRed";
+		}
+		5132
+		{
+			title = "White flag";
+			sprite = "internal:ZandFlagWhite";
+		}
+		5133
+		{
+			title = "Green flag";
+			sprite = "internal:ZandFlagGreen";
+		}
+		5134
+		{
+			title = "Gold flag";
+			sprite = "internal:ZandFlagGold";
+		}
+	}
+}
+
+// New things available in Doom, Heretic, Hexen and Strife but not Chex Quest
+doomheretichexenstrife
+{
+	flags
+	{
+		color = 13;	// Light Magenta
+		arrow = 0;
+		title = "Flags";
+		width = 20;
+		sort = 1;
+		height = 20;
+		hangs = 0;
+		blocking = 0;
+		
+    5025
+		{
+			title = "Red skull";
+			sprite = "RSKUB0";
+		}
+    5026
+		{
+			title = "Blue skull";
+			sprite = "BSKUB0";
+		}
+	}
+}
+
+
+// New things available in Doom, Heretic and Hexen; but not in Chex or Strife
+doomheretichexen
+{
+	// Zandronum runes
+	runes
+	{
+		color = 9;	// Light Blue
+		arrow = 0;
+		title = "Runes";
+		width = 20;
+		sort = 1;
+		height = 45;
+		hangs = 0;
+		blocking = 0;
+		
+		5100
+		{
+			title = "Strength";
+			sprite = "internal:ZandRuneStrength";
+		}
+		5101
+		{
+			title = "Rage";
+			sprite = "internal:ZandRuneRage";
+		}
+		5102
+		{
+			title = "Drain";
+			sprite = "internal:ZandRuneDrain";
+		}
+		5103
+		{
+			title = "Spread";
+			sprite = "internal:ZandRuneSpread";
+		}
+		5104
+		{
+			title = "Resistance";
+			sprite = "internal:ZandRuneResistance";
+		}
+		5105
+		{
+			title = "Regeneration";
+			sprite = "internal:ZandRuneRegeneration";
+		}
+		5106
+		{
+			title = "Prosperity";
+			sprite = "internal:ZandRuneProsperity";
+		}
+		5107
+		{
+			title = "Reflection";
+			sprite = "internal:ZandRuneReflection";
+		}
+		5108
+		{
+			title = "High Jumper";
+			sprite = "internal:ZandRuneHighJump";
+		}
+		5109
+		{
+			title = "Haste";
+			sprite = "internal:ZandRuneHaste";
+		}
+	}
+}
\ No newline at end of file
diff --git a/Build/Configurations/Includes/Zandronum_linedefs.cfg b/Build/Configurations/Includes/Zandronum_linedefs.cfg
new file mode 100644
index 0000000..1a42e65
--- /dev/null
+++ b/Build/Configurations/Includes/Zandronum_linedefs.cfg
@@ -0,0 +1,72 @@
+linedeftypes
+{
+	player
+	{
+		title = "Player";
+		
+		145
+		{
+			title = "Player Set Team";
+			id = "Player_SetTeam";
+			
+			arg0
+			{
+				title = "Team";
+				type = 11;
+				enum = "teams";
+			}
+		}
+	}
+
+	team
+	{
+		title = "Team";
+		
+		152
+		{
+			title = "Player Team Score";
+			id = "Team_Score";
+			
+			arg0
+			{
+				title = "Points";
+			}
+			
+			arg1
+			{
+					title = "Grin";
+					type = 11;
+					enum = "yesno";
+			}
+		}
+		
+		153
+		{
+			title = "Team Give Points";
+			id = "Team_GivePoints";
+			
+			arg0
+			{
+				title = "Team";
+				type = 11;
+				enum
+				{
+					0 = "Blue Team";
+					1 = "Red Team";
+				}
+			}
+			
+			arg1
+			{
+				title = "Points";
+			}
+			
+			arg2
+			{
+				title = "Announcer";
+				type = 11;
+				enum = "noyes";
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/Build/Configurations/Includes/Zandronum_misc.cfg b/Build/Configurations/Includes/Zandronum_misc.cfg
new file mode 100644
index 0000000..f829cb9
--- /dev/null
+++ b/Build/Configurations/Includes/Zandronum_misc.cfg
@@ -0,0 +1,121 @@
+// Miscellaneous Zandronum settings.
+// Only contains ST-exclusive stuff, imports the rest from ZDoom configuration.
+
+enums_doom
+{
+	spawnthing
+	{
+		155 = "Dark Imp";
+		156 = "Blood Demon";
+		157 = "SSG Guy";
+		158 = "Hectebus";
+		159 = "Cacolantern";
+		163 = "Grenade Launcher";
+		164 = "Railgun";
+		165 = "BFG 10K";
+		166 = "Max Health Bonus";
+		167 = "Max Armor Bonus";
+		168 = "Red Armor";
+		169 = "Turbo Sphere";
+		171 = "Time Freeze Sphere";
+		174 = "Invisibility Sphere";
+		175 = "Doom Sphere";
+		176 = "Random Powerup";
+		177 = "Blue Flag";
+		178 = "Red Flag";
+		179 = "White Flag";
+		180 = "Strength Rune";
+		181 = "Rage Rune";
+		182 = "Drain Rune";
+		183 = "Spread Rune";
+		184 = "Resistance Rune";
+		185 = "Regeneration Rune";
+		186 = "Prosperity Rune";
+		187 = "Reflection Rune";
+		188 = "High Jump Rune";
+		189 = "Haste Rune";
+		214 = "Minigun";
+		215 = "Belphegor";
+		217 = "BFG 10K Shot";
+		218 = "Dark Imp Shot";
+		219 = "Cacolantern Shot";
+		220 = "Abaddon";
+		221 = "Abaddon Shot";
+		222 = "Belphegor Shot";
+	}
+}
+
+enums_notdoom
+{
+	spawnthing
+	{
+		169 = "Turbo Sphere";
+		171 = "Time Freeze Sphere";
+		174 = "Invisibility Sphere";
+		175 = "Doom Sphere";
+		177 = "Blue Flag";
+		178 = "Red Flag";
+		179 = "White Flag";
+		180 = "Strength Rune";
+		181 = "Rage Rune";
+		182 = "Drain Rune";
+		183 = "Spread Rune";
+		184 = "Resistance Rune";
+		185 = "Regeneration Rune";
+		186 = "Prosperity Rune";
+		187 = "Reflection Rune";
+		188 = "High Jump Rune";
+		189 = "Haste Rune";
+		214 = "Minigun";
+		215 = "Belphegor";
+		219 = "Cacolantern Shot";
+		220 = "Abaddon";
+		221 = "Abaddon Shot";
+		222 = "Belphegor Shot";
+	}
+}
+
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+
+	filter1
+	{
+		name = "Multiplayer";
+		category = "";
+		type = -1;
+		fields
+		{
+			512 = true;
+			1024 = true;
+		}
+	}
+
+}
+
+// These things are just way too repetitive
+invasionspawnerargs
+{
+	arg0
+	{
+		title = "Start Spawn Number";
+	}
+	arg1
+	{
+		title = "Spawn Delay";
+	}
+	arg2
+	{
+		title = "Round Spawn Delay";
+	}
+	arg3
+	{
+		title = "First Appear Wave";
+	}
+	arg4
+	{
+		title = "Max Spawn";
+	}
+}
\ No newline at end of file
diff --git a/Build/Configurations/Includes/Zandronum_texturesets.cfg b/Build/Configurations/Includes/Zandronum_texturesets.cfg
new file mode 100644
index 0000000..0a4b453
--- /dev/null
+++ b/Build/Configurations/Includes/Zandronum_texturesets.cfg
@@ -0,0 +1,620 @@
+// Default texture sets for Zandronum
+// (these are not required, but useful for new users)
+texturesets
+{
+
+	set0
+	{
+		name = "Rock";
+		filter0 = "ASHWALL*";
+		filter1 = "BSTONE*";
+		filter2 = "FLAT1_1";
+		filter3 = "FLAT1_2";
+		filter4 = "FLAT1_3";
+		filter5 = "FLAT10";
+		filter6 = "FLAT5_7";
+		filter7 = "FLAT5_8";
+		filter8 = "FLOOR6_1";
+		filter9 = "FLOOR6_2";
+		filter10 = "GRNROCK";
+		filter11 = "MFLR8_2";
+		filter12 = "MFLR8_3";
+		filter13 = "MFLR8_4";
+		filter14 = "ROCK*";
+		filter15 = "SLIME09";
+		filter16 = "SLIME10";
+		filter17 = "SLIME11";
+		filter18 = "SLIME12";
+		filter19 = "SP_ROCK1";
+		filter20 = "STONE4";
+		filter21 = "STONE5";
+		filter22 = "STONE6";
+		filter23 = "STONE7";
+		filter24 = "SW1ROCK";
+		filter25 = "SW1STON6";
+		filter26 = "SW2ROCK";
+		filter27 = "SW2STON6";
+		filter28 = "TANROCK*";
+		filter29 = "RROCK*";
+	}
+
+
+	set1
+	{
+		name = "Brick";
+		filter0 = "BIGBRIK*";
+		filter1 = "BRICK*";
+		filter2 = "FLOOR5_4";
+		filter3 = "FLAT8";
+		filter4 = "GSTFONT1";
+		filter5 = "GSTFONT2";
+		filter6 = "GSTFONT3";
+		filter7 = "GSTGARG";
+		filter8 = "GSTLION";
+		filter9 = "GSTONE1";
+		filter10 = "GSTONE2";
+		filter11 = "GSTSATYR";
+		filter12 = "GSTVINE1";
+		filter13 = "GSTVINE2";
+		filter14 = "MFLR8_1";
+		filter15 = "RROCK10";
+		filter16 = "RROCK14";
+		filter17 = "SLIME13";
+		filter18 = "SP_DUDE1";
+		filter19 = "SP_DUDE2";
+		filter20 = "SP_DUDE4";
+		filter21 = "SP_DUDE5";
+		filter22 = "SP_DUDE7";
+		filter23 = "SP_DUDE8";
+		filter24 = "SP_HOT1";
+		filter25 = "STONE2";
+		filter26 = "STONE3";
+		filter27 = "SW1GSTON";
+		filter28 = "SW1HOT";
+		filter29 = "SW2GSTON";
+		filter30 = "SW2HOT";
+	}
+
+
+	set2
+	{
+		name = "Liquids";
+		filter0 = "BFALL*";
+		filter1 = "BLOOD*";
+		filter2 = "DBRAIN*";
+		filter3 = "FWATER*";
+		filter4 = "LAVA*";
+		filter5 = "NUKAGE*";
+		filter6 = "SFALL*";
+		filter7 = "SLIME01";
+		filter8 = "SLIME02";
+		filter9 = "SLIME03";
+		filter10 = "SLIME04";
+		filter11 = "SLIME05";
+		filter12 = "SLIME06";
+		filter13 = "SLIME07";
+		filter14 = "SLIME08";
+	}
+
+
+	set3
+	{
+		name = "Doors";
+		filter0 = "BIGDOOR*";
+		filter1 = "DOOR*";
+		filter2 = "EXITDOOR";
+		filter3 = "SPCDOOR*";
+		filter4 = "TEKBRON1";
+		filter5 = "TEKBRON2";
+	}
+
+
+	set4
+	{
+		name = "Steps";
+		filter0 = "STEP*";
+	}
+
+
+	set5
+	{
+		name = "Wood";
+		filter0 = "BIGDOOR5";
+		filter1 = "BIGDOOR6";
+		filter2 = "BIGDOOR7";
+		filter3 = "CEIL1_1";
+		filter4 = "CEIL1_3";
+		filter5 = "FLAT5_1";
+		filter6 = "FLAT5_2";
+		filter7 = "PAN*";
+		filter8 = "SW1PANEL";
+		filter9 = "SW1WDMET";
+		filter10 = "SW1WOOD";
+		filter11 = "SW2PANEL";
+		filter12 = "SW2WDMET";
+		filter13 = "SW2WOOD";
+		filter14 = "WOOD*";
+	}
+
+
+	set6
+	{
+		name = "Flesh";
+		filter0 = "AASHITTY";
+		filter1 = "FLAT5_6";
+		filter2 = "SFLR6_1";
+		filter3 = "SFLR6_4";
+		filter4 = "SFLR7_1";
+		filter5 = "SFLR7_4";
+		filter6 = "SK_LEFT";
+		filter7 = "SK_RIGHT";
+		filter8 = "SKIN*";
+		filter9 = "SKSNAKE1";
+		filter10 = "SKSNAKE2";
+		filter11 = "SKSPINE1";
+		filter12 = "SKSPINE2";
+		filter13 = "SLOPPY1";
+		filter14 = "SLOPPY2";
+		filter15 = "SP_DUDE1";
+		filter16 = "SP_DUDE2";
+		filter17 = "SP_DUDE4";
+		filter18 = "SP_DUDE5";
+		filter19 = "SP_DUDE7";
+		filter20 = "SP_DUDE8";
+		filter21 = "SP_FACE1";
+		filter22 = "SP_FACE2";
+		filter23 = "SW1SKIN";
+		filter24 = "SW1SKULL";
+		filter25 = "SW2SKIN";
+		filter26 = "SW2SKULL";
+	}
+
+
+	set7
+	{
+		name = "Switches";
+		filter0 = "SW1*";
+		filter1 = "SW2*";
+	}
+
+
+	set8
+	{
+		name = "Marble";
+		filter0 = "DEM1_*";
+		filter1 = "FLOOR7_2";
+		filter2 = "GST*";
+		filter3 = "MARB*";
+		filter4 = "SP_DUDE1";
+		filter5 = "SP_DUDE2";
+		filter6 = "SP_DUDE4";
+		filter7 = "SP_DUDE5";
+		filter8 = "SP_HOT1";
+		filter9 = "SW1GSTON";
+		filter10 = "SW1MARB";
+		filter11 = "SW2GSTON";
+		filter12 = "SW2MARB";
+	}
+
+
+	set9
+	{
+		name = "Lights";
+		filter0 = "BRICKLIT";
+		filter1 = "BSTONE3";
+		filter2 = "CEIL1_2";
+		filter3 = "CEIL1_3";
+		filter4 = "CEIL3_4";
+		filter5 = "CEIL3_6";
+		filter6 = "CEIL4_3";
+		filter7 = "FLAT17";
+		filter8 = "FLAT2";
+		filter9 = "FLAT22";
+		filter10 = "FLOOR1_7";
+		filter11 = "GRNLITE1";
+		filter12 = "LITE3";
+		filter13 = "LITE5";
+		filter14 = "LITEBLU1";
+		filter15 = "LITEBLU4";
+		filter16 = "TLITE6_1";
+		filter17 = "TLITE6_4";
+		filter18 = "TLITE6_5";
+		filter19 = "TLITE6_6";
+	}
+
+
+	set10
+	{
+		name = "Metal";
+		filter0 = "CEIL1_2";
+		filter1 = "METAL*";
+		filter2 = "METAL";
+		filter3 = "MIDBRN1";
+		filter4 = "MIDGRATE";
+		filter5 = "SW1GARG";
+		filter6 = "SW1LION";
+		filter7 = "SW1SATYR";
+		filter8 = "SW2GARG";
+		filter9 = "SW2LION";
+		filter10 = "SW2MET2";
+		filter11 = "SW2METAL";
+		filter12 = "SW1METAL";
+		filter13 = "SW1MET2";
+		filter14 = "SW2SATYR";
+		filter15 = "WOODMET1";
+		filter16 = "WOODMET2";
+		filter17 = "WOODMET3";
+		filter18 = "WOODMET4";
+		filter19 = "SW2WDMET";
+		filter20 = "SW1WDMET";
+		filter21 = "SUPPORT*";
+	}
+
+
+	set11
+	{
+		name = "Silver";
+		filter0 = "BIGDOOR1";
+		filter1 = "DOORSTOP";
+		filter2 = "LITEBLU1";
+		filter3 = "SHAWN*";
+		filter4 = "SILVER*";
+		filter5 = "SPCDOOR3";
+		filter6 = "STEP4";
+		filter7 = "SUPPORT2";
+		filter8 = "SW1COMM";
+		filter9 = "SW2COMM";
+	}
+
+
+	set12
+	{
+		name = "Base";
+		filter0 = "BIGBRIK*";
+		filter1 = "BIGDOOR1";
+		filter2 = "BIGDOOR2";
+		filter3 = "BIGDOOR3";
+		filter4 = "BIGDOOR4";
+		filter5 = "BLAKWAL*";
+		filter6 = "BRN*";
+		filter7 = "BRONZE*";
+		filter8 = "BROWN*";
+		filter9 = "BROVINE2";
+		filter10 = "CEIL3_1";
+		filter11 = "CEIL3_2";
+		filter12 = "CEIL3_3";
+		filter13 = "CEIL3_4";
+		filter14 = "CEIL3_5";
+		filter15 = "CEIL3_6";
+		filter16 = "CEIL4_1";
+		filter17 = "CEIL4_2";
+		filter18 = "CEIL4_3";
+		filter19 = "CEIL5_1";
+		filter20 = "CEIL5_2";
+		filter21 = "CEMENT*";
+		filter22 = "COMP*";
+		filter23 = "CONS*";
+		filter24 = "CRAT*";
+		filter25 = "DOOR1";
+		filter26 = "DOOR3";
+		filter27 = "DOORBLU";
+		filter28 = "DOORRED";
+		filter29 = "DOORSTOP";
+		filter30 = "DOORTRAK";
+		filter31 = "DOORYEL";
+		filter32 = "EXITDOOR";
+		filter33 = "EXITSIGN";
+		filter34 = "EXITSTON";
+		filter35 = "FLAT1";
+		filter36 = "FLAT1_1";
+		filter37 = "FLAT1_2";
+		filter38 = "FLAT1_3";
+		filter39 = "FLAT14";
+		filter40 = "FLAT17";
+		filter41 = "FLAT18";
+		filter42 = "FLAT19";
+		filter43 = "FLAT2";
+		filter44 = "FLAT20";
+		filter45 = "FLAT22";
+		filter46 = "FLAT23";
+		filter47 = "FLAT3";
+		filter48 = "FLAT4";
+		filter49 = "FLAT5";
+		filter50 = "FLAT5_4";
+		filter51 = "FLAT5_5";
+		filter52 = "FLAT8";
+		filter53 = "FLAT9";
+		filter54 = "FLOOR0_1";
+		filter55 = "FLOOR0_2";
+		filter56 = "FLOOR0_3";
+		filter57 = "FLOOR0_5";
+		filter58 = "FLOOR0_6";
+		filter59 = "FLOOR0_7";
+		filter60 = "FLOOR1_1";
+		filter61 = "FLOOR1_6";
+		filter62 = "FLOOR1_7";
+		filter63 = "FLOOR3_3";
+		filter64 = "FLOOR4_1";
+		filter65 = "FLOOR4_5";
+		filter66 = "FLOOR4_6";
+		filter67 = "FLOOR4_8";
+		filter68 = "FLOOR5_1";
+		filter69 = "FLOOR5_2";
+		filter70 = "FLOOR5_3";
+		filter71 = "FLOOR5_4";
+		filter72 = "FLOOR7_1";
+		filter73 = "GRAY*";
+		filter74 = "ICKWALL*";
+		filter75 = "LITE*";
+		filter76 = "METAL";
+		filter77 = "METAL1";
+		filter78 = "METAL2";
+		filter79 = "METAL3";
+		filter80 = "METAL4";
+		filter81 = "METAL5";
+		filter82 = "METAL6";
+		filter83 = "METAL7";
+		filter84 = "MFLR8_1";
+		filter85 = "MIDBARS1";
+		filter86 = "MIDBARS3";
+		filter87 = "MIDBRONZ";
+		filter88 = "MIDSPACE";
+		filter89 = "MODWALL*";
+		filter90 = "NUKE*";
+		filter91 = "PIPES";
+		filter92 = "PIPEWAL1";
+		filter93 = "PIPEWAL2";
+		filter94 = "PLAT1";
+		filter95 = "RROCK14";
+		filter96 = "SHAWN*";
+		filter97 = "SILVER*";
+		filter98 = "SLAD*";
+		filter99 = "SLIME13";
+		filter100 = "SLIME14";
+		filter101 = "SLIME15";
+		filter102 = "SLIME16";
+		filter103 = "SPACE*";
+		filter104 = "SPCDOOR*";
+		filter105 = "STAR*";
+		filter106 = "STEP*";
+		filter107 = "STONE";
+		filter108 = "STONE2";
+		filter109 = "STONE3";
+		filter110 = "SUPPORT2";
+		filter111 = "SUPPORT3";
+		filter112 = "SW1BLUE";
+		filter113 = "SW1BRCOM";
+		filter114 = "SW1BRIK";
+		filter115 = "SW1BRN1";
+		filter116 = "SW1BRN2";
+		filter117 = "SW1BRNGN";
+		filter118 = "SW1BROWN";
+		filter119 = "SW1CMT";
+		filter120 = "SW1COMM";
+		filter121 = "SW1COMP";
+		filter122 = "SW1DIRT";
+		filter123 = "SW1EXIT";
+		filter124 = "SW1GRAY";
+		filter125 = "SW1GRAY1";
+		filter126 = "SW1MET2";
+		filter127 = "SW1METAL";
+		filter128 = "SW1MOD1";
+		filter129 = "SW1SLAD";
+		filter130 = "SW1STARG";
+		filter131 = "SW1STON1";
+		filter132 = "SW1STON2";
+		filter133 = "SW1STONE";
+		filter134 = "SW1STRTN";
+		filter135 = "SW1TEK";
+		filter136 = "SW1VINE";
+		filter137 = "SW2BLUE";
+		filter138 = "SW2BRCOM";
+		filter139 = "SW2BRIK";
+		filter140 = "SW2BRN1";
+		filter141 = "SW2BRN2";
+		filter142 = "SW2BRNGN";
+		filter143 = "SW2BROWN";
+		filter144 = "SW2CMT";
+		filter145 = "SW2COMM";
+		filter146 = "SW2COMP";
+		filter147 = "SW2DIRT";
+		filter148 = "SW2EXIT";
+		filter149 = "SW2GRAY";
+		filter150 = "SW2GRAY1";
+		filter151 = "SW2MET2";
+		filter152 = "SW2METAL";
+		filter153 = "SW2MOD1";
+		filter154 = "SW2SLAD";
+		filter155 = "SW2STARG";
+		filter156 = "SW2STON1";
+		filter157 = "SW2STON2";
+		filter158 = "SW2STONE";
+		filter159 = "SW2STRTN";
+		filter160 = "SW2TEK";
+		filter161 = "SW2VINE";
+		filter162 = "TEK*";
+		filter163 = "TLITE*";
+		filter164 = "PIPE1";
+		filter165 = "PIPE2";
+		filter166 = "PIPE4";
+		filter167 = "PIPE6";
+		filter168 = "STUCCO*";
+		filter169 = "STUCCO";
+	}
+
+
+	set13
+	{
+		name = "Hell";
+		filter0 = "BFALL*";
+		filter1 = "BIGDOOR5";
+		filter2 = "BIGDOOR6";
+		filter3 = "BIGDOOR7";
+		filter4 = "BLODRIP*";
+		filter5 = "BLOOD1";
+		filter6 = "BLOOD2";
+		filter7 = "BLOOD3";
+		filter8 = "CEIL1_2";
+		filter9 = "CEIL1_3";
+		filter10 = "CEIL1_1";
+		filter11 = "BSTONE1";
+		filter12 = "BSTONE2";
+		filter13 = "BSTONE3";
+		filter14 = "CRACKLE2";
+		filter15 = "CRACKLE4";
+		filter16 = "DOORBLU2";
+		filter17 = "DOORRED2";
+		filter18 = "DOORYEL2";
+		filter19 = "FIRE*";
+		filter20 = "FLAT1_1";
+		filter21 = "FLAT1_2";
+		filter22 = "FLAT1_3";
+		filter23 = "FLAT5_1";
+		filter24 = "FLAT5_2";
+		filter25 = "FLAT5_3";
+		filter26 = "FLAT5_6";
+		filter27 = "FLAT5_7";
+		filter28 = "FLAT5_8";
+		filter29 = "FLOOR1_6";
+		filter30 = "FLOOR1_7";
+		filter31 = "FLOOR6_1";
+		filter32 = "FLOOR6_2";
+		filter33 = "GATE*";
+		filter34 = "GST*";
+		filter35 = "LAVA*";
+		filter36 = "MARB*";
+		filter37 = "METAL";
+		filter38 = "MFLR8_2";
+		filter39 = "MFLR8_3";
+		filter40 = "MIDBRN1";
+		filter41 = "MIDGRATE";
+		filter42 = "REDWALL";
+		filter43 = "ROCKRED1";
+		filter44 = "ROCKRED2";
+		filter45 = "ROCKRED3";
+		filter46 = "RROCK01";
+		filter47 = "RROCK02";
+		filter48 = "RROCK03";
+		filter49 = "RROCK04";
+		filter50 = "RROCK05";
+		filter51 = "RROCK06";
+		filter52 = "RROCK07";
+		filter53 = "RROCK08";
+		filter54 = "RROCK09";
+		filter55 = "RROCK10";
+		filter56 = "RROCK11";
+		filter57 = "RROCK12";
+		filter58 = "RROCK15";
+		filter59 = "SFLR6_1";
+		filter60 = "SFLR6_4";
+		filter61 = "SFLR7_1";
+		filter62 = "SFLR7_4";
+		filter63 = "SK_LEFT";
+		filter64 = "SK_RIGHT";
+		filter65 = "SKIN*";
+		filter66 = "SKSNAKE1";
+		filter67 = "SKSNAKE2";
+		filter68 = "SKSPINE1";
+		filter69 = "SKSPINE2";
+		filter70 = "SLIME09";
+		filter71 = "SLIME10";
+		filter72 = "SLIME11";
+		filter73 = "SLIME12";
+		filter74 = "SLOPPY1";
+		filter75 = "SLOPPY2";
+		filter76 = "SP_*";
+		filter77 = "SUPPORT3";
+		filter78 = "SW1GARG";
+		filter79 = "SW1GSTON";
+		filter80 = "SW1HOT";
+		filter81 = "SW1LION";
+		filter82 = "SW1MARB";
+		filter83 = "SW1SATYR";
+		filter84 = "SW1SKIN";
+		filter85 = "SW1SKULL";
+		filter86 = "SW1WDMET";
+		filter87 = "SW1WOOD";
+		filter88 = "SW2GARG";
+		filter89 = "SW2GSTON";
+		filter90 = "SW2HOT";
+		filter91 = "SW2LION";
+		filter92 = "SW2MARB";
+		filter93 = "SW2SATYR";
+		filter94 = "SW2SKIN";
+		filter95 = "SW2SKULL";
+		filter96 = "SW2WDMET";
+		filter97 = "SW2WOOD";
+		filter98 = "WOOD*";
+	}
+
+
+	set14
+	{
+		name = "Outdoors";
+		filter0 = "ASHWALL*";
+		filter1 = "BFALL*";
+		filter2 = "FLAT10";
+		filter3 = "FLAT5_7";
+		filter4 = "FLAT5_8";
+		filter5 = "FLOOR6_1";
+		filter6 = "FLOOR6_2";
+		filter7 = "FWATER*";
+		filter8 = "GRASS*";
+		filter9 = "LAVA*";
+		filter10 = "MFLR8_2";
+		filter11 = "MFLR8_3";
+		filter12 = "MFLR8_4";
+		filter13 = "NUKAGE*";
+		filter14 = "ROCK4";
+		filter15 = "ROCK5";
+		filter16 = "ROCKRED1";
+		filter17 = "ROCKRED2";
+		filter18 = "ROCKRED3";
+		filter19 = "RROCK01";
+		filter20 = "RROCK02";
+		filter21 = "RROCK03";
+		filter22 = "RROCK04";
+		filter23 = "RROCK05";
+		filter24 = "RROCK06";
+		filter25 = "RROCK07";
+		filter26 = "RROCK08";
+		filter27 = "RROCK16";
+		filter28 = "RROCK17";
+		filter29 = "RROCK18";
+		filter30 = "RROCK19";
+		filter31 = "RROCK20";
+		filter32 = "SFALL*";
+		filter33 = "SLIME01";
+		filter34 = "SLIME02";
+		filter35 = "SLIME03";
+		filter36 = "SLIME04";
+		filter37 = "SLIME05";
+		filter38 = "SLIME06";
+		filter39 = "SLIME07";
+		filter40 = "SLIME08";
+		filter41 = "SLIME09";
+		filter42 = "SLIME10";
+		filter43 = "SLIME11";
+		filter44 = "SLIME12";
+		filter45 = "SP_ROCK1";
+		filter46 = "STONE4";
+		filter47 = "STONE5";
+		filter48 = "STONE6";
+		filter49 = "STONE7";
+		filter50 = "TANROCK5";
+		filter51 = "TANROCK8";
+		filter52 = "ZIMMER*";
+	}
+
+
+	set15
+	{
+		name = "Computer";
+		filter0 = "COMP*";
+		filter1 = "CONS*";
+		filter2 = "SILVER3";
+		filter3 = "SPACEW3";
+		filter4 = "SW1COMP";
+		filter5 = "SW2COMP";
+	}
+}
\ No newline at end of file
diff --git a/Build/Configurations/Includes/Zandronum_things.cfg b/Build/Configurations/Includes/Zandronum_things.cfg
new file mode 100644
index 0000000..223ebfa
--- /dev/null
+++ b/Build/Configurations/Includes/Zandronum_things.cfg
@@ -0,0 +1,47 @@
+// Zandronum things that aren't found in ZDoom.
+// Simple interface file to access the listing easily.
+// The things themselves are actually listed in Zandronum_common.cfg.
+// Uncomment "Skulltag_things.cfg" lines if you want to use stuff from Skulltag_data.pk3
+
+doom
+{
+	include("Zandronum_common.cfg", "zandronum")
+	include("Zandronum_common.cfg", "doomheretichexenstrife")
+	include("Zandronum_common.cfg", "doomheretichexen")
+	//include("Skulltag_things.cfg", "doomheretichexen")
+	//include("Skulltag_things.cfg", "doom")
+}
+
+heretic
+{
+	include("Zandronum_common.cfg", "zandronum")
+	include("Zandronum_common.cfg", "doomheretichexenstrife")
+	include("Zandronum_common.cfg", "doomheretichexen")
+	//include("Skulltag_things.cfg", "doomheretichexen")
+	//include("Skulltag_things.cfg", "raven")
+	//include("Skulltag_things.cfg", "heretic")
+}
+
+hexen
+{
+	include("Zandronum_common.cfg", "zandronum")
+	include("Zandronum_common.cfg", "doomheretichexenstrife")
+	include("Zandronum_common.cfg", "doomheretichexen")
+	//include("Skulltag_things.cfg", "doomheretichexen")
+	//include("Skulltag_things.cfg", "raven")
+	//include("Skulltag_things.cfg", "hexen")
+}
+
+strife
+{
+	include("Zandronum_common.cfg", "zandronum")
+	include("Zandronum_common.cfg", "doomheretichexenstrife")
+	//include("Skulltag_things.cfg", "strife")
+}
+
+default
+{
+	include("Zandronum_common.cfg", "zandronum")
+	//include("Skulltag_things.cfg", "skulltag")
+}
+
diff --git a/Build/Configurations/Other Games/Action Doom/GZDoom_Action2Hexen.cfg b/Build/Configurations/Other Games/Action Doom/GZDoom_Action2Hexen.cfg
new file mode 100644
index 0000000..1a2d263
--- /dev/null
+++ b/Build/Configurations/Other Games/Action Doom/GZDoom_Action2Hexen.cfg	
@@ -0,0 +1,66 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "GZDoom: Urban Brawl (Hexen format)";
+
+// This is the simplified game engine/sourceport name
+engine = "zdoom";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to Hexen map format
+include("Includes\\ZDoom_common.cfg", "mapformat_hexen");
+
+// Settings common to Urban Brawl games
+include("Includes\\Game_Action2.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\Doom_misc.cfg", "thingsfilters");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Action2_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "default");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+	// Additional actors from the engine
+	include("Includes\\GZDoom_things.cfg", "gzdoom");
+	include("Includes\\GZDoom_things.cfg", "gzdoom_lights");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_action2");
+}
diff --git a/Build/Configurations/Other Games/Action Doom/GZDoom_Action2UDMF.cfg b/Build/Configurations/Other Games/Action Doom/GZDoom_Action2UDMF.cfg
new file mode 100644
index 0000000..0e0473c
--- /dev/null
+++ b/Build/Configurations/Other Games/Action Doom/GZDoom_Action2UDMF.cfg	
@@ -0,0 +1,66 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "GZDoom: Urban Brawl (UDMF)";
+
+// This is the simplified game engine/sourceport name
+engine = "zdoom";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to Hexen map format
+include("Includes\\ZDoom_common.cfg", "mapformat_udmf");
+
+// Settings common to Urban Brawl games
+include("Includes\\Game_Action2.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\ZDoom_misc.cfg", "thingsfilters_udmf");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Action2_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "default");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+	// Additional actors from the engine
+	include("Includes\\GZDoom_things.cfg", "gzdoom");
+	include("Includes\\GZDoom_things.cfg", "gzdoom_lights");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_action2");
+}
diff --git a/Build/Configurations/Other Games/Action Doom/Includes/Action2_misc.cfg b/Build/Configurations/Other Games/Action Doom/Includes/Action2_misc.cfg
new file mode 100644
index 0000000..ac67217
--- /dev/null
+++ b/Build/Configurations/Other Games/Action Doom/Includes/Action2_misc.cfg	
@@ -0,0 +1,13 @@
+
+// Basic Doom and Vanilla engine stuff.
+
+include("Doom_Misc.cfg");
+
+// The only difference with Doom
+skills
+{
+	1 = "Punkass Bitch";
+	2 = "Petty Thug";
+	3 = "Hot Shit";
+	4 = "Badass Mother Fucker";
+}
\ No newline at end of file
diff --git a/Build/Configurations/Other Games/Action Doom/Includes/Action2_texturesets.cfg b/Build/Configurations/Other Games/Action Doom/Includes/Action2_texturesets.cfg
new file mode 100644
index 0000000..e69de29
diff --git a/Build/Configurations/Other Games/Action Doom/Includes/Action2_things.cfg b/Build/Configurations/Other Games/Action Doom/Includes/Action2_things.cfg
new file mode 100644
index 0000000..fc19a89
--- /dev/null
+++ b/Build/Configurations/Other Games/Action Doom/Includes/Action2_things.cfg	
@@ -0,0 +1,1224 @@
+
+players
+{
+	color = 10;	// Light Green
+	arrow = 1;
+	title = "Player Starts";
+	width = 16;
+	sort = 1;
+	height = 56;
+	hangs = 0;
+	blocking = 1;
+	error = 2;
+	
+	1
+	{
+		title = "Player 1 start";
+		sprite = "AVYOU";
+	}
+	2
+	{
+		title = "Player 2 start";
+		sprite = "AVYOU";
+	}
+	3
+	{
+		title = "Player 3 start";
+		sprite = "AVYOU";
+	}
+	4
+	{
+		title = "Player 4 start";
+		sprite = "AVYOU";
+	}
+	11
+	{
+		title = "Player Deathmatch start";
+		sprite = "AVDEAD";
+	}
+}
+
+bridges
+{
+	118
+	{
+		title = "Hack Bridge";
+		width = "36";
+		height = "4";
+	}
+}
+
+teleports
+{
+	color = 2;	// Green
+	arrow = 1;
+	title = "Teleports";
+	width = 16;
+	sort = 1;
+	height = 56;
+	hangs = 0;
+	blocking = 0;
+	error = 0;
+	
+	14
+	{
+		title = "Teleport Destination";
+		sprite = "TFOGB0";
+	}
+}
+
+monsters
+{
+	color = 12;	// Light Red
+	arrow = 1;
+	title = "Monsters";
+	width = 20;
+	sort = 1;
+	height = 56;
+	hangs = 0;
+	blocking = 1;
+	error = 2;
+	
+	13379
+	{
+		title = "Leather Jacket Punk Spawner";
+		sprite = "AVPUNK4";
+	}
+	13401
+	{
+		title = "Flynn Haggar (ally)";
+		sprite = "AVJESSE";
+	}
+	13403
+	{
+		title = "Village Randy";
+		sprite = "AVVIL1";
+	}
+	13404
+	{
+		title = "Village Glenn";
+		sprite = "AVVIL3";
+	}
+	13405
+	{
+		title = "Village Felipe";
+		sprite = "AVVIL4";
+	}
+	13406
+	{
+		title = "Village David";
+		sprite = "AVVIL2";
+	}
+	13407
+	{
+		title = "Village Victor";
+		sprite = "AVVIL5";
+	}
+	13408
+	{
+		title = "Village Alex";
+		sprite = "AVVIL6";
+	}
+	13428
+	{
+		title = "Fat Construction Guy";
+		sprite = "AVFAT1";
+	}
+	13429
+	{
+		title = "Purple Jacket Punk Spawner";
+		sprite = "AVPUNK1";
+	}
+	13430
+	{
+		title = "Goth Chick";
+		sprite = "AVGOTH1";
+	}
+	13431
+	{
+		title = "Green Jacket Punk Spawner";
+		sprite = "AVPUNK2";
+	}
+	13432
+	{
+		title = "Yellow Jacket Punk Spawner";
+		sprite = "AVPUNK3";
+	}
+	13439
+	{
+		title = "Tattooed martial artist";
+		sprite = "AVTHUG1";
+	}
+	13442
+	{
+		title = "Redneck";
+		sprite = "AVREDNCK";
+	}
+	13444
+	{
+		title = "Redhead Kylie";
+		sprite = "AVCHICK1";
+	}
+	13446
+	{
+		title = "Afro thug with knife";
+		sprite = "AVKTHUG1";
+	}
+	13447
+	{
+		title = "Bald black thug throwing knives";
+		sprite = "AVKTHUG2";
+	}
+	13459
+	{
+		title = "Darkhead Tina";
+		sprite = "AVCHICK2";
+	}
+	13466
+	{
+		title = "Kickboxing martial artist";
+		sprite = "AVBOXER";
+	}
+	13487
+	{
+		title = "Hugo the Butcher";
+		sprite = "AVHUGO";
+	}
+	13495
+	{
+		title = "Ninja chick";
+		sprite = "AVNINJA";
+	}
+	13498
+	{
+		title = "Blue suit guy";
+		sprite = "AVSUIT1";
+	}
+	13499
+	{
+		title = "Red suit guy";
+		sprite = "AVSUIT2";
+	}
+	13500
+	{
+		title = "Green suit guy";
+		sprite = "AVSUIT3";
+	}
+	13504
+	{
+		title = "Gary Johnson (ally)";
+		sprite = "AVGARY";
+	}
+	13514
+	{
+		title = "Tommy LaCoata";
+		sprite = "AVTOMMY";
+	}
+	13519
+	{
+		title = "Bebop";
+		sprite = "AVBEBOP";
+	}
+	13520
+	{
+		title = "Rocksteady";
+		sprite = "AVROCKY";
+	}
+	13522
+	{
+		title = "Uzi guy";
+		sprite = "AVSUIT4";
+	}
+	13531
+	{
+		title = "Scuba Steve";
+		sprite = "AVSCUBA";
+	}
+	13537
+	{
+		title = "Purple Jacket Punk With Pipe";
+		sprite = "AVPUNK1";
+	}
+	13538
+	{
+		title = "Green Jacket Punk With Pipe";
+		sprite = "AVPUNK2";
+	}
+	13539
+	{
+		title = "Yellow Jacket Punk With Pipe";
+		sprite = "AVPUNK3";
+	}
+	13540
+	{
+		title = "Purple Jacket Punk With Board";
+		sprite = "AVPUNK1";
+	}
+	13541
+	{
+		title = "Green Jacket Punk With Board";
+		sprite = "AVPUNK2";
+	}
+	13542
+	{
+		title = "Yellow Jacket Punk With Board";
+		sprite = "AVPUNK3";
+	}
+	13543
+	{
+		title = "Leather Jacket Punk With Chain";
+		sprite = "AVPUNK4";
+	}
+	13554
+	{
+		title = "Suit Guy Drops Gun";
+		sprite = "AVSUIT4";
+	}
+	13555
+	{
+		title = "Leather Jacket Punk";
+		sprite = "AVPUNK4";
+	}
+	13556
+	{
+		title = "PurpleJacketPunk";
+		sprite = "AVPUNK1";
+	}
+	13557
+	{
+		title = "Green Jacket Punk";
+		sprite = "AVPUNK2";
+	}
+	13558
+	{
+		title = "Yellow Jacket Punk";
+		sprite = "AVPUNK3";
+	}
+	13559
+	{
+		title = "Wolf";
+		sprite = "AVWOLF";
+	}
+	13560
+	{
+		title = "Tree Sniper";
+		sprite = "SNPRA0";
+	}
+  
+
+	13568
+	{
+		title = "Maggie (ally)";
+		width = 40;
+		sprite = "AVWOLF";
+		height = 110;
+	}
+}
+
+weapons
+{
+	color = 14;	// Yellow
+	arrow = 0;
+	title = "Weapons";
+	width = 20;
+	sort = 1;
+	height = 25;
+	hangs = 0;
+	blocking = 0;
+	
+	13371
+	{
+		title = "Green bottle";
+		sprite = "AVBOTLE1";
+	}
+	13433
+	{
+		title = "Sarah (Pistol)";
+		sprite = "APISJ0";
+	}
+	13435
+	{
+		title = "Hefty 2x4";
+		sprite = "AVBOARD";
+	}
+	13436
+	{
+		title = "Rusty old pipe";
+		sprite = "AVPIPE";
+	}
+	13437
+	{
+		title = "Brown bottle";
+		sprite = "AVBOTLE3";
+	}
+	13438
+	{
+		title = "Broken green bottle (invisible)";
+		sprite = "AVBOTLE2";
+	}
+	13440
+	{
+		title = "Chain";
+		sprite = "AVCHAIN";
+	}
+	13441
+	{
+		title = "Switchblade knife";
+		sprite = "AVKNIFE";
+	}
+	13443
+	{
+		title = "Baseball bat";
+		sprite = "AVBAT";
+	}
+	13445
+	{
+		title = "Wrench";
+		sprite = "AVWRENCH";
+	}
+	13460
+	{
+		title = "Broken brown bottle (invisible)";
+		sprite = "AVBOTLE4";
+	}
+	13461
+	{
+		title = "Fire extinguisher";
+		sprite = "FEXTA0";
+	}
+	13467
+	{
+		title = "Katana";
+		sprite = "AVSWORD";
+	}
+	13470
+	{
+		title = "Chainsaw";
+		sprite = "JONZH0";
+	}
+	13494
+	{
+		title = "Shovel";
+		sprite = "AVSHOVEL";
+	}
+	13496
+	{
+		title = "Shurikens";
+		sprite = "AVSTAR3";
+	}
+	13497
+	{
+		title = "Sledge hammer";
+		sprite = "AVSLEDGE";
+	}
+	13503
+	{
+		title = "Cardboard tube";
+		sprite = "AVTUBE";
+	}
+	13521
+	{
+		title = "Bottle of Jack Daniel's";
+		sprite = "AVBOTLE5";
+	}
+	13523
+	{
+		title = "Uzi";
+		sprite = "AVUZI";
+	}
+	13533
+	{
+		title = "Etruscan statue";
+		sprite = "ROMNS0";
+	}
+	13535
+	{
+		title = "Taser";
+		sprite = "AVTASER";
+	}
+	13536
+	{
+		title = "Pool cue";
+		sprite = "AVPOOL";
+	}
+	13547
+	{
+		title = "Blunderbuss";
+		sprite = "AVBUSS";
+	}
+}
+
+ammunition
+{
+	color = 6;	// Brown
+	arrow = 0;
+	title = "Ammunition";
+	width = 20;
+	sort = 1;
+	height = 16;
+	blocking = 0;
+	hangs = 0;
+	
+	13434
+	{
+		title = "Clip of ammo";
+		sprite = "AVBUL6";
+	}
+	13488
+	{
+		title = "Can of gasoline";
+		sprite = "GASCA0";
+	}
+	13489
+	{
+		title = "Small can of gasoline";
+		sprite = "SGASA0";
+	}
+	13567
+	{
+		title = "Cannon ball";
+		sprite = "AVBUSS2";
+	}
+ 
+}
+
+health
+{
+	color = 1;	// Blue
+	arrow = 0;
+	title = "Food and drinks";
+	width = 16;
+	sort = 1;
+	height = 20;
+	hangs = 0;
+	blocking = 0;
+	
+	13382
+	{
+		title = "Apple";
+		sprite = "APLEA0";
+	}
+	13383
+	{
+		title = "Six-pack of cola";
+		sprite = "ESPIA0";
+	}
+	13384
+	{
+		title = "Turkey dinner";
+		sprite = "TRKYA0";
+	}
+	13411
+	{
+		title = "Hershey bar";
+		sprite = "CDY1A0";
+	}
+	13412
+	{
+		title = "Heath bar";
+		sprite = "CDY2A0";
+	}
+	13413
+	{
+		title = "Fritos";
+		sprite = "CDY3A0";
+	}
+	13414
+	{
+		title = "Can of coke";
+		sprite = "POP1A0";
+	}
+	13415
+	{
+		title = "Can of pepsi";
+		sprite = "POP2A0";
+	}
+	13416
+	{
+		title = "Can of 7up";
+		sprite = "POP3A0";
+	}
+	13448
+	{
+		title = "Hamburger";
+		sprite = "BRGRA0";
+	}
+	13449
+	{
+		title = "Taco";
+		sprite = "TACOA0";
+	}
+	13450
+	{
+		title = "Sandwich";
+		sprite = "SWCHA0";
+	}
+	13451
+	{
+		title = "Pizza pie";
+		sprite = "PZA2A0";
+	}
+ 
+}
+
+powerups
+{
+	color = 9;	// Light Blue
+	arrow = 0;
+	title = "Loot";
+	width = 20;
+	sort = 1;
+	height = 20;
+	hangs = 0;
+	blocking = 0;
+	
+	13385
+	{
+		title = "Bag of cash";
+		sprite = "SACKA0";
+	}
+	13386
+	{
+		title = "Gold ingots";
+		sprite = "GOLDA0";
+	}
+	13452
+	{
+		title = "Rolex";
+		sprite = "ROLXA0";
+	}
+	13453
+	{
+		title = "Necklace";
+		sprite = "NECKA0";
+	}
+	13454
+	{
+		title = "Ring";
+		sprite = "RINGA0";
+	}
+	13455
+	{
+		title = "Silver ingots";
+		sprite = "SLVRA0";
+	}
+	13456
+	{
+		title = "Sunglasses";
+		sprite = "RAYBA0";
+	}
+	13457
+	{
+		title = "Banknotes";
+		sprite = "MONYA0";
+	}
+	13458
+	{
+		title = "Action Comic";
+		sprite = "ACMCA0";
+	}
+	13468
+	{
+		title = "Diamond";
+		sprite = "DIMDA0";
+	}
+	13491
+	{
+		title = "TV";
+		sprite = "LOT1A0";
+	}
+	13492
+	{
+		title = "Stereo";
+		sprite = "LOT2A0";
+	}
+	13493
+	{
+		title = "Radio";
+		sprite = "BARTA0";
+	}
+	13502
+	{
+		title = "River City Ransom coins";
+		sprite = "RCR2A0";
+	}
+	13505
+	{
+		title = "ActionDoom";
+		sprite = "ACTNA0";
+	}
+	13506
+	{
+		title = "Pitfall Gold";
+		sprite = "PITFA0";
+	}
+	13507
+	{
+		title = "Daikatana";
+		sprite = "DAIKA0";
+	}
+	13527
+	{
+		title = "Stapler";
+		sprite = "OFS2A0";
+	}
+	13534
+	{
+		title = "Necronomicon";
+		sprite = "NECRA0";
+	}
+	13550
+	{
+		title = "Romero BobbleHead";
+		sprite = "BOBLA0";
+	}
+	13551
+	{
+		title = "Mordeth's computer";
+		sprite = "MORDA0";
+	}
+	13553
+	{
+		title = "Windows source code";
+		sprite = "XPCDA0";
+	}
+ 
+}
+
+keys
+{
+	color = 13;	// Light Magenta
+	arrow = 0;
+	title = "Interactive items";
+	width = 16;
+	sort = 1;
+	height = 20;
+	hangs = 0;
+	blocking = 2;
+	error = 2;
+	
+	13370
+	{
+		title = "Trash can";
+		sprite = "TRASA0";
+		height = 48;
+	}
+	13374
+	{
+		title = "Basket ball";
+		sprite = "BBALA0";
+		width = 12;
+		height = 24;
+	}
+	13377
+	{
+		title = "Tire stack";
+		sprite = "TIREB0";
+		width = 12;
+		height = 56;
+	}
+	13380
+	{
+		title = "Fire hydrant";
+		sprite = "HYDRA0";
+		width = 12;
+		height = 42;
+	}
+	13392
+	{
+		title = "Cigarette trash can";
+		sprite = "ASHCA0";
+		height = 48;
+	}
+	13395
+	{
+		title = "Bad clipping sign";
+		sprite = "SIGNA0";
+		width = 12;
+		height = 32;
+	}
+	13397
+	{
+		title = "Chandelier";
+		sprite = "CHNDA0";
+		height = 70;
+	}
+	13402
+	{
+		title = "Disco ball";
+		sprite = "GLOBA0";
+		height = 70;
+	}
+	13462
+	{
+		title = "Trash bin";
+		sprite = "TRASF0";
+	}
+	13516
+	{
+		title = "Blue trash can";
+		sprite = "TRASL0";
+	}
+	13552
+	{
+		title = "Trash can with key";
+		sprite = "TRASA0";
+	}
+}
+
+npcs
+{
+	color = 3;	// Cyan
+	arrow = 0;
+	title = "Billboard NPCs";
+	width = 12;
+	sort = 1;
+	height = 56;
+	hangs = 0;
+	blocking = 1;
+	error = 2;
+	
+	13381
+	{
+		title = "Jerry Marconi";
+		sprite = "HOMOA0";
+	}
+	13394
+	{
+		title = "Pigeon";
+		sprite = "PIGNA0";
+	}
+	13399
+	{
+		title = "Sir Elton John";
+		sprite = "ELTNA0";
+	}
+	13400
+	{
+		title = "RocketMan";
+		sprite = "ELTNB0";
+	}
+	13410
+	{
+		title = "Rasta man";
+		sprite = "RASTA2A8";
+	}
+	13420
+	{
+		title = "Bickle";
+		sprite = "BICKA2A8";
+	}
+	13513
+	{
+		title = "Peter Crisp with daughter";
+		sprite = "DICKB0";
+	}
+	13515
+	{
+		title = "Dead Gary Johnson";
+		sprite = "GARYM0";
+	}
+	13546
+	{
+		title = "Chopper gun";
+		sprite = "ABULA0";
+	}
+	13548
+	{
+		title = "Your daughter";
+		sprite = "GIRLA0";
+	}
+	13549
+	{
+		title = "Gary Johnson";
+		sprite = "GARYO0";
+	}
+ 
+}
+
+specialeffects
+{
+	color = 3;	// Cyan
+	arrow = 0;
+	title = "Special effects";
+	width = 20;
+	sort = 1;
+	height = 20;
+	hangs = 0;
+	blocking = 1;
+	error = 2;
+	
+	10102
+	{
+		title = "Blood dropper";
+		sprite = "BLD1Y0";
+	}
+	13524
+	{
+		title = "Dojo debris spawner";
+		sprite = "CHP8A0";
+	}
+	13532
+	{
+		title = "Splash spawner";
+		sprite = "SPLSA0";
+	}
+}
+
+obstacles
+{
+	color = 3;	// Cyan
+	arrow = 0;
+	title = "Obstacles";
+	width = 20;
+	sort = 1;
+	height = 48;
+	hangs = 0;
+	blocking = 1;
+	error = 2;
+	
+	13375
+	{
+		title = "Traffic cone";
+		sprite = "CONEA0";
+		width = 12;
+		height = 32;
+	}
+	13376
+	{
+		title = "Tire";
+		sprite = "TIREA0";
+		width = 12;
+		height = 16;
+	}
+	13378
+	{
+		title = "Invisible wall";
+		width = 16;
+		height = 48;
+	}
+	13396
+	{
+		title = "Leafy plant";
+		sprite = "PLNTA0";
+		width = 8;
+		height = 48;
+	}
+	13409
+	{
+		title = "Leafy plant (hang)";
+		sprite = "PLNTA0";
+		width = 8;
+		height = 48;
+	}
+	13418
+	{
+		title = "Birch tree";
+		sprite = "ACTRA0";
+		width = 24;
+		height = 72;
+	}
+	13419
+	{
+		title = "Parking meter";
+		sprite = "PMTRA0";
+		width = 8;
+		heigt = 56;
+	}
+	13421
+	{
+		title = "Umbrella";
+		sprite = "UMBRA0";
+		width = 8;
+		height = 56;
+	}
+	13464
+	{
+		title = "Water cooler tank";
+		sprite = "COOLA0";
+		width = 12;
+		height = 42;
+	}
+	13465
+	{
+		title = "Water cooler tank outline";
+		sprite = "COOLB0";
+		width = 12;
+		height = 42;
+	}
+	13480
+	{
+		title = "Large rock #1";
+		sprite = "RCK1A0";
+		width = 24;
+		height = 30;
+	}
+	13481
+	{
+		title = "Large rock #2";
+		sprite = "RCK2A0";
+		width = 24;
+		height = 30;
+	}
+	13482
+	{
+		title = "Large rock #3";
+		sprite = "RCK3A0";
+		width = 24;
+		height = 30;
+	}
+	13525
+	{
+		title = "Marble statue";
+		sprite = "STATA0";
+		width = 25;
+		height = 80;
+	}
+	13544
+	{
+		title = "Wine cooler tank";
+		sprite = "WINEA0";
+		width = 12;
+		height = 42;
+	}
+ 
+}
+
+lights
+{
+	color = 11;	// Light Cyan
+	arrow = 0;
+	title = "Light sources";
+	width = 16;
+	sort = 1;
+	height = 16;
+	hangs = 0;
+	blocking = 1;
+	error = 2;
+	
+	13389
+	{
+		title = "Light post";
+		sprite = "LITEA0";
+	}
+	13390
+	{
+		title = "Light corona";
+		sprite = "GLOWA0";
+	}
+	13398
+	{
+		title = "Light bulb";
+		sprite = "BULBA1";
+	}
+	13422
+	{
+		title = "Chinese lantern (red)";
+		sprite = "LMP1A0";
+	}
+	13423
+	{
+		title = "Chinese lantern (blue)";
+		sprite = "LMP2A0";
+	}
+	13424
+	{
+		title = "Chinese lantern (green)";
+		sprite = "LMP3A0";
+	}
+	13490
+	{
+		title = "Swinging light bulb";
+		sprite = "BULBE1";
+	}
+
+}
+
+decoration
+{
+	color = 4;	// Red
+	arrow = 0;
+	title = "Decoration";
+	width = 16;
+	sort = 1;
+	height = 16;
+	hangs = 0;
+	blocking = 0;
+	
+	13372
+	{
+		title = "Cocktail glass";
+		sprite = "DNR2A0";
+	}
+	13373
+	{
+		title = "Mug of beer";
+		sprite = "DNR3A0";
+	}
+	13387
+	{
+		title = "Crumpled paper trash";
+		sprite = "TRSHA0";
+	}
+	13388
+	{
+		title = "Newspaper";
+		sprite = "NEWSA0";
+	}
+	13391
+	{
+		title = "Bust";
+		sprite = "BUSTA0";
+	}
+	13393
+	{
+		title = "Cigarette";
+		sprite = "CIGGA0";
+	}
+	13417
+	{
+		title = "Pot plant (tiny)";
+		sprite = "PLNTA0";
+	}
+	13425
+	{
+		title = "Fruit pile (white)";
+		sprite = "FRT1A0";
+		width = 8;
+		height = 56;
+	}
+	13426
+	{
+		title = "Fruit Pile (red)";
+		sprite = "FRT2A0";
+		width = 8;
+		height = 56;
+	}
+	13427
+	{
+		title = "Fruit Pile (green)";
+		sprite = "FRT3A0";
+		width = 8;
+		height = 56;
+	}
+	13463
+	{
+		title = "Empty fire extinguisher";
+		sprite = "";
+	}
+	13469
+	{
+		title = "Stone debris (temporary)";
+		sprite = "";
+	}
+	13471
+	{
+		title = "Leafy blue bush";
+		sprite = "ATR2A0";
+	}
+	13472
+	{
+		title = "Dead blue bush";
+		sprite = "ATR2A0";
+	}
+	13473
+	{
+		title = "Tuft of blue grass";
+		sprite = "GRS1A0";
+	}
+	13474
+	{
+		title = "Tuft of blue grass with red flower";
+		sprite = "GRS2A0";
+	}
+	13475
+	{
+		title = "Big mushroom";
+		sprite = "MSH1A0";
+	}
+	13476
+	{
+		title = "Small mushroom";
+		sprite = "MSH2A0";
+	}
+	13477
+	{
+		title = "Reeds";
+		sprite = "GRS3A0";
+	}
+	13478
+	{
+		title = "Tall grass";
+		sprite = "GRS4A0";
+	}
+	13479
+	{
+		title = "Big tuft of blue grass";
+		sprite = "GRS5A0";
+	}
+	13483
+	{
+		title = "Small rock #1";
+		sprite = "RCK120";
+	}
+	13484
+	{
+		title = "Small rock #2";
+		sprite = "RCK230";
+	}
+	13501
+	{
+		title = "River City Ransom Alex";
+		sprite = "RCR1A0";
+	}
+	13508
+	{
+		title = "Meathook";
+		sprite = "HOOKA0";
+	}
+	13509
+	{
+		title = "Leg on meathook";
+		sprite = "BOD1A0";
+	}
+	13510
+	{
+		title = "Body on meathook";
+		sprite = "BOD2A0";
+	}
+	13511
+	{
+		title = "Torso on meathook";
+		sprite = "BOD3A0";
+	}
+	13517
+	{
+		title = "Blue trash";
+		sprite = "TRSHB0";
+	}
+	13518
+	{
+		title = "Blue newspaper";
+		sprite = "NEWSB0";
+	}
+	13526
+	{
+		title = "Office chair";
+		sprite = "OFS1A0";
+	}
+	13528
+	{
+		title = "Cell phone";
+		sprite = "OFS3A0";
+	}
+	13529
+	{
+		title = "Microscope";
+		sprite = "OFS4A0";
+	}
+	13530
+	{
+		title = "Pencil";
+		sprite = "OFS5A0";
+	}
+}
diff --git a/Build/Configurations/Other Games/Action Doom/Includes/Game_Action2.cfg b/Build/Configurations/Other Games/Action Doom/Includes/Game_Action2.cfg
new file mode 100644
index 0000000..0444ba6
--- /dev/null
+++ b/Build/Configurations/Other Games/Action Doom/Includes/Game_Action2.cfg	
@@ -0,0 +1,29 @@
+// Default lump name for new map
+  defaultlumpname = "MAP01";
+
+  // Decorate actors to include depending on actor game property
+  decorategames = "action2"; // Doesn't actually exist, but used to prevent loading Doom actors when loading zdoom.pk3
+
+  // Skill levels
+  skills
+  {
+    include("Action2_misc.cfg", "skills");
+  }
+
+  // Door making
+  makedoortrack = "BLACK";
+
+  // Default thing filters
+  // (these are not required, just useful for new users)
+  /*thingsfilters
+  {
+    include("Doom_misc.cfg", "thingsfilters");
+  }*/
+  
+
+  // Default texture sets
+  // (these are not required, but useful for new users)
+  texturesets
+  {
+    include("Action2_texturesets.cfg");
+  }
\ No newline at end of file
diff --git a/Build/Configurations/Other Games/Action Doom/ZDoom_Action2Hexen.cfg b/Build/Configurations/Other Games/Action Doom/ZDoom_Action2Hexen.cfg
new file mode 100644
index 0000000..f9eae46
--- /dev/null
+++ b/Build/Configurations/Other Games/Action Doom/ZDoom_Action2Hexen.cfg	
@@ -0,0 +1,63 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "ZDoom: Urban Brawl (Hexen format)";
+
+// This is the simplified game engine/sourceport name
+engine = "zdoom";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to Hexen map format
+include("Includes\\ZDoom_common.cfg", "mapformat_hexen");
+
+// Settings common to Urban Brawl games
+include("Includes\\Game_Action2.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\Doom_misc.cfg", "thingsfilters");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Action2_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "default");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_action2");
+}
diff --git a/Build/Configurations/Other Games/Action Doom/ZDoom_Action2UDMF.cfg b/Build/Configurations/Other Games/Action Doom/ZDoom_Action2UDMF.cfg
new file mode 100644
index 0000000..d272802
--- /dev/null
+++ b/Build/Configurations/Other Games/Action Doom/ZDoom_Action2UDMF.cfg	
@@ -0,0 +1,63 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "ZDoom: Urban Brawl (UDMF)";
+
+// This is the simplified game engine/sourceport name
+engine = "zdoom";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to Hexen map format
+include("Includes\\ZDoom_common.cfg", "mapformat_udmf");
+
+// Settings common to Urban Brawl games
+include("Includes\\Game_Action2.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\ZDoom_misc.cfg", "thingsfilters_udmf");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Action2_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "default");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_action2");
+}
diff --git a/Build/Configurations/Other Games/Action Doom/Zandronum_Action2Hexen.cfg b/Build/Configurations/Other Games/Action Doom/Zandronum_Action2Hexen.cfg
new file mode 100644
index 0000000..5e58d87
--- /dev/null
+++ b/Build/Configurations/Other Games/Action Doom/Zandronum_Action2Hexen.cfg	
@@ -0,0 +1,67 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "Zandronum: Urban Brawl (Hexen format)";
+
+// This is the simplified game engine/sourceport name
+engine = "zandronum";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to Hexen map format
+include("Includes\\ZDoom_common.cfg", "mapformat_hexen");
+
+// Settings common to Urban Brawl games
+include("Includes\\Game_Action2.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\Doom_misc.cfg", "thingsfilters");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Action2_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "default");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+	// Additional actors from the engine
+	include("Includes\\Zandronum_things.cfg", "default");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_action2");
+	// Additional enums from the engine
+	include("Includes\\Zandronum_misc.cfg", "enums_notdoom");
+}
diff --git a/Build/Configurations/Other Games/Action Doom/Zandronum_Action2UDMF.cfg b/Build/Configurations/Other Games/Action Doom/Zandronum_Action2UDMF.cfg
new file mode 100644
index 0000000..d2256f9
--- /dev/null
+++ b/Build/Configurations/Other Games/Action Doom/Zandronum_Action2UDMF.cfg	
@@ -0,0 +1,67 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "Zandronum: Urban Brawl (UDMF)";
+
+// This is the simplified game engine/sourceport name
+engine = "zandronum";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to Hexen map format
+include("Includes\\ZDoom_common.cfg", "mapformat_udmf");
+
+// Settings common to Urban Brawl games
+include("Includes\\Game_Action2.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\ZDoom_misc.cfg", "thingsfilters_udmf");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Action2_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "default");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+	// Additional actors from the engine
+	include("Includes\\Zandronum_things.cfg", "default");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_action2");
+	// Additional enums from the engine
+	include("Includes\\Zandronum_misc.cfg", "enums_notdoom");
+}
diff --git a/Build/Configurations/Other Games/Chex Quest 3/GZDoom_Chex3Hexen.cfg b/Build/Configurations/Other Games/Chex Quest 3/GZDoom_Chex3Hexen.cfg
new file mode 100644
index 0000000..f0f3b8c
--- /dev/null
+++ b/Build/Configurations/Other Games/Chex Quest 3/GZDoom_Chex3Hexen.cfg	
@@ -0,0 +1,66 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "GZDoom: Chex Quest 3 (Hexen format)";
+
+// This is the simplified game engine/sourceport name
+engine = "gzdoom";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to Hexen map format
+include("Includes\\ZDoom_common.cfg", "mapformat_hexen");
+
+// Settings common to Chex Quest 3 games
+include("Includes\\Game_Chex3.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\Doom_misc.cfg", "thingsfilters");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Chex3_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "default");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+	// Additional actors from the engine
+	include("Includes\\GZDoom_things.cfg", "gzdoom");
+	include("Includes\\GZDoom_things.cfg", "gzdoom_lights");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_chex3");
+}
diff --git a/Build/Configurations/Other Games/Chex Quest 3/GZDoom_Chex3UDMF.cfg b/Build/Configurations/Other Games/Chex Quest 3/GZDoom_Chex3UDMF.cfg
new file mode 100644
index 0000000..fdbc101
--- /dev/null
+++ b/Build/Configurations/Other Games/Chex Quest 3/GZDoom_Chex3UDMF.cfg	
@@ -0,0 +1,66 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "GZDoom: Chex Quest 3 (UDMF)";
+
+// This is the simplified game engine/sourceport name
+engine = "gzdoom";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to text map format
+include("Includes\\ZDoom_common.cfg", "mapformat_udmf");
+
+// Settings common to Chex Quest 3 games
+include("Includes\\Game_Chex3.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\ZDoom_misc.cfg", "thingsfilters_udmf");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Chex3_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "default");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+	// Additional actors from the engine
+	include("Includes\\GZDoom_things.cfg", "gzdoom");
+	include("Includes\\GZDoom_things.cfg", "gzdoom_lights");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_chex3");
+}
diff --git a/Build/Configurations/Other Games/Chex Quest 3/Includes/Chex3_texturesets.cfg b/Build/Configurations/Other Games/Chex Quest 3/Includes/Chex3_texturesets.cfg
new file mode 100644
index 0000000..e69de29
diff --git a/Build/Configurations/Other Games/Chex Quest 3/Includes/Chex3_things.cfg b/Build/Configurations/Other Games/Chex Quest 3/Includes/Chex3_things.cfg
new file mode 100644
index 0000000..7b3c008
--- /dev/null
+++ b/Build/Configurations/Other Games/Chex Quest 3/Includes/Chex3_things.cfg	
@@ -0,0 +1,759 @@
+
+players
+{
+	color = 10;	// Light Green
+	arrow = 1;
+	title = "Player Starts";
+	width = 16;
+	sort = 1;
+	height = 56;
+	hangs = 0;
+	blocking = 1;
+	error = 2;
+	
+	1
+	{
+		title = "Player 1 start";
+		sprite = "PLAYA2A8";
+	}
+	2
+	{
+		title = "Player 2 start";
+		sprite = "PLAYA2A8";
+	}
+	3
+	{
+		title = "Player 3 start";
+		sprite = "PLAYA2A8";
+	}
+	4
+	{
+		title = "Player 4 start";
+		sprite = "PLAYA2A8";
+	}
+	11
+	{
+		title = "Player Deathmatch start";
+		sprite = "PLAYF1";
+	}
+}
+
+
+teleports
+{
+	color = 2;	// Green
+	arrow = 1;
+	title = "Teleports";
+	width = 16;
+	sort = 1;
+	height = 56;
+	hangs = 0;
+	blocking = 0;
+	error = 0;
+	
+	14
+	{
+		title = "Teleport Destination";
+		sprite = "TFOGB0";
+	}
+}
+
+monsters
+{
+	color = 12;	// Light Red
+	arrow = 1;
+	title = "Monsters";
+	width = 20;
+	sort = 1;
+	height = 56;
+	hangs = 0;
+	blocking = 1;
+	error = 2;
+	
+	3004
+	{
+		title = "Flemoidus Commonus";
+		sprite = "POSSA2A8";
+	}
+	
+	
+	9
+	{
+		title = "Flemoidus Bipedicus";
+		sprite = "SPOSA2A8";
+	}
+	
+	
+	3001
+	{
+		title = "Armored Flemoidus Bipedicus";
+		sprite = "TROOA2A8";
+	}
+	
+	
+	3002
+	{
+		title = "Flemoidus Stridicus";
+		sprite = "SARGA2A8";
+	}
+	
+	58
+	{
+		title = "Flemoidus Cycloptis Commonus";
+		sprite = "CYCLA2A8";
+	}
+	
+	
+	3006
+	{
+		title = "Flem Mine";
+		sprite = "SKULA8A2";
+	}
+	
+	
+	3003
+	{
+		title = "Flemoidus Maximus";
+		sprite = "BOSSA2A8";
+	}
+
+	3005
+	{
+		title = "Super Cycloptis";
+		sprite = "HEADA2A8";
+	}
+
+	69
+	{
+		title = "The Flembrane";
+		sprite = "FLMBA2A8";
+	}
+
+	9050
+	{
+		title = "Flemoidus Larva";
+		sprite = "LRVAA2A8";
+	}
+
+	9057
+	{
+		title = "Quadrumpus";
+		sprite = "QUADA2A8";
+	}
+
+	16
+	{
+		title = "Lord Snotfolus";
+		sprite = "CYBRA2A8";
+	}
+
+	7
+	{
+		title = "Flembomination";
+		sprite = "SPIDA2A8";
+	}
+	
+	2035
+	{
+		title = "Flemoid power strand";
+		sprite = "BAR2A0";
+	}
+
+}
+
+weapons
+{
+	color = 14;	// Yellow
+	arrow = 0;
+	title = "Weapons";
+	width = 20;
+	sort = 1;
+	height = 25;
+	hangs = 0;
+	blocking = 0;
+	
+	82
+	{
+		title = "Super Large Zorcher";
+		sprite = "SGN2A0";
+	}
+	2005
+	{
+		title = "Super Bootspork";
+		sprite = "CSAWA0";
+	}
+	2001
+	{
+		title = "Large Zorcher";
+		sprite = "SHOTA0";
+	}
+	2002
+	{
+		title = "Rapid Zorcher";
+		sprite = "MGUNA0";
+	}
+	2003
+	{
+		title = "Zorch Propulsor";
+		sprite = "LAUNA0";
+	}
+	2004
+	{
+		title = "Phasing Zorcher";
+		sprite = "PLASA0";
+	}
+	2006
+	{
+		title = "LAZ Device";
+		sprite = "BFUGA0";
+		height = 30;
+	}
+}
+
+ammunition
+{
+	color = 6;	// Brown
+	arrow = 0;
+	title = "Ammunition";
+	width = 20;
+	sort = 1;
+	height = 16;
+	blocking = 0;
+	hangs = 0;
+	
+	2007
+	{
+		title = "Mini Zorcher Recharge";
+		sprite = "CLIPA0";
+	}
+	2008
+	{
+		title = "Large Zorcher Recharge";
+		sprite = "SHELA0";
+	}
+	2010
+	{
+		title = "Zorch propulsor recharge";
+		sprite = "ROCKA0";
+		height = 25;
+	}
+	2047
+	{
+		title = "Phasing zorcher recharge";
+		sprite = "CELLA0";
+	}
+	2048
+	{
+		title = "Mini zorcher pack";
+		sprite = "AMMOA0";
+	}
+	2049
+	{
+		title = "Large zorcher pack";
+		sprite = "SBOXA0";
+	}
+	2046
+	{
+		title = "Zorch propulsor pack";
+		sprite = "BROKA0";
+		width = 30;
+		height = 25;
+	}
+	17
+	{
+		title = "Phasing zorcher pack";
+		sprite = "CELPA0";
+		height = 25;
+	}
+	8
+	{
+		title = "Zorchpack";
+		sprite = "BPAKA0";
+	}
+}
+
+health
+{
+	color = 1;	// Blue
+	arrow = 0;
+	title = "Health and Armor";
+	width = 16;
+	sort = 1;
+	height = 20;
+	hangs = 0;
+	blocking = 0;
+	
+	2011
+	{
+		title = "Bowl of fruits";
+		sprite = "STIMA0";
+	}
+	2012
+	{
+		title = "Bowl of Vegetables";
+		sprite = "MEDIA0";
+		height = 25;
+	}
+	2014
+	{
+		title = "Glass of water";
+		sprite = "BON1A0";
+	}
+	2015
+	{
+		title = "Slime repellent";
+		sprite = "BON2A0";
+	}
+	2018
+	{
+		title = "Chex Armor";
+		sprite = "ARM1A0";
+	}
+	2019
+	{
+		title = "Super Chex Armor";
+		sprite = "ARM2A0";
+	}
+}
+
+powerups
+{
+	color = 9;	// Light Blue
+	arrow = 0;
+	title = "Powerups";
+	width = 20;
+	sort = 1;
+	height = 20;
+	hangs = 0;
+	blocking = 0;
+	
+	2013
+	{
+		title = "Supercharge Breakfast";
+		sprite = "SOULA0";
+		height = 45;
+	}
+	2025
+	{
+		title = "Slime-Proof Suit";
+		sprite = "SUITA0";
+		height = 60;
+	}
+	2026
+	{
+		title = "Computer map";
+		sprite = "PMAPA0";
+		height = 35;
+	}
+	2045
+	{
+		title = "Ultra goggles";
+		sprite = "PVISA0";
+	}
+}
+
+keys
+{
+	color = 13;	// Light Magenta
+	arrow = 0;
+	title = "Keys";
+	width = 16;
+	sort = 1;
+	height = 20;
+	hangs = 0;
+	blocking = 0;
+	
+	5
+	{
+		title = "Blue keycard";
+		sprite = "BKEYA0";
+	}
+	13
+	{
+		title = "Red keycard";
+		sprite = "RKEYA0";
+	}
+	6
+	{
+		title = "Yellow keycard";
+		sprite = "YKEYA0";
+	}
+	38
+	{
+		title = "Red flemkey";
+		sprite = "RSKUA0";
+	}
+	39
+	{
+		title = "Yellow flemkey";
+		sprite = "YSKUA0";
+	}
+	40
+	{
+		title = "Blue flemkey";
+		sprite = "BSKUA0";
+	}
+}
+
+
+obstacles
+{
+	color = 3;	// Cyan
+	arrow = 0;
+	title = "Obstacles";
+	width = 20;
+	sort = 1;
+	height = 20;
+	hangs = 0;
+	blocking = 1;
+	error = 2;
+	
+	47
+	{
+		title = "Pine tree";
+		sprite = "SMITA0";
+	}
+	54
+	{
+		title = "Spaceship";
+		sprite = "TRE2A0";
+	}
+	32
+	{
+		title = "Barrel";
+		sprite = "COL3A0";
+	}
+	30
+	{
+		title = "Pine tree with slime";
+		sprite = "COL1A0";
+	}
+	37
+	{
+		title = "Flag on a pole";
+		sprite = "COL6A0";
+		height = 128;
+	}
+	33
+	{
+		title = "Mine cart";
+		sprite = "COL4A0";
+		height = 30;
+	}
+	43
+	{
+		title = "Flemoid pod";
+		sprite = "TRE1A0";
+	}
+	44
+	{
+		title = "Slime fountain";
+		sprite = "TBLUA0";
+		height = 48;
+	}
+	48
+	{
+		title = "Slimy statue";
+		sprite = "ELECA0";
+		height = 52;
+	}
+	31
+	{
+		title = "Grey rock";
+		sprite = "COL2A0";
+	}
+	25
+	{
+		title = "Globe stand";
+		sprite = "POL1A0";
+	}
+	18
+	{
+		title = "Model rocket";
+		sprite = "MROCA0";
+	}
+	19
+	{
+		title = "Radar dish";
+		sprite = "RADAA0";
+	}
+	85
+	{
+		title = "Map room point light";
+		sprite = "TLMPA0";
+	}
+	86
+	{
+		title = "Slimy urn";
+		sprite = "TLP2A0";
+	}
+	36
+	{
+		title = "Oxygen tank";
+		sprite = "COL5A0";
+	}
+	42
+	{
+		title = "Lab coil";
+		sprite = "FSKUA0";
+	}
+	49
+	{
+		title = "Stool";
+		sprite = "GOR1A0";
+	}
+	50
+	{
+		title = "Hydroponic plant";
+		sprite = "GOR6A0";
+	}
+	51
+	{
+		title = "Big bowl sculpture";
+		sprite = "BOWLA0";
+	}
+	53
+	{
+		title = "Bazoik cart";
+		sprite = "COL7A0";
+	}
+	27
+	{
+		title = "Slimy meteor";
+		sprite = "POL4A0";
+	}
+	29
+	{
+		title = "Computer monitor";
+		sprite = "POL3A0";
+	}
+	73
+	{
+		title = "Pillar";
+		sprite = "HDB1A0";
+	}
+	74
+	{
+		title = "Stalagmite";
+		sprite = "HDB2A0";
+	}
+	76
+	{
+		title = "Triceratops skeleton";
+		sprite = "DINOA0";
+	}
+	77
+	{
+		title = "T-rex skeleton";
+		sprite = "DINOB0";
+	}
+	9051
+	{
+		title = "Statue of David";
+		sprite = "STTUA0";
+	}
+	9052
+	{
+		title = "Statue of the Thinker";
+		sprite = "STTUB0";
+	}
+	9053
+	{
+		title = "Statue of Ramses";
+		sprite = "STTUC0";
+	}
+	9054
+	{
+		title = "Statue of King Tut";
+		sprite = "STTUD0";
+	}
+	9055
+	{
+		title = "Statue of the Chex Warrior";
+		sprite = "STTUE0";
+	}
+	9056
+	{
+		title = "Statue of a spoon";
+		sprite = "STTUF0";
+	}
+	9058
+	{
+		title = "Banana tree";
+		sprite = "TRE3A0";
+	}
+	9059
+	{
+		title = "Beech tree";
+		sprite = "TRE4A0";
+	}
+	9060
+	{
+		title = "Apple tree";
+		sprite = "TRE5A0";
+	}
+	9061
+	{
+		title = "Orange tree";
+		sprite = "TRE6A0";
+	}
+	55
+	{
+		title = "Holographic globe projector";
+		sprite = "SMBTA0";
+	}
+
+}
+
+lights
+{
+	color = 11;	// Light Cyan
+	arrow = 0;
+	title = "Light sources";
+	width = 16;
+	sort = 1;
+	height = 16;
+	hangs = 0;
+	blocking = 1;
+	error = 2;
+	
+	2028
+	{
+		title = "Landing light";
+		sprite = "COLUA0";
+		height = 48;
+	}
+	56
+	{
+		title = "Flemoid glowing shroom #2";
+		sprite = "SMGTA0";
+	}
+	45
+	{
+		title = "Flemoid glowing shroom #1";
+		sprite = "TGRNA0";
+	}
+	46
+	{
+		title = "Chandelier";
+		sprite = "TREDA0";
+	}
+	57
+	{
+		title = "Brasero";
+		sprite = "SMRTA0";
+	}
+	34
+	{
+		title = "Short lamp";
+		sprite = "CANDA0";
+	}
+	35
+	{
+		title = "Street light";
+		sprite = "CBRAA0";
+	}
+}
+
+decoration
+{
+	color = 4;	// Red
+	arrow = 0;
+	title = "Decoration";
+	width = 16;
+	sort = 1;
+	height = 16;
+	hangs = 0;
+	blocking = 0;
+	
+	41
+	{
+		title = "Chemical burner";
+		sprite = "CEYEA0";
+		height = 25;
+	}
+	59
+	{
+		title = "Hanging plant #1";
+		sprite = "GOR2A0";
+	}
+	60
+	{
+		title = "Ceiling slime";
+		sprite = "GOR4A0";
+	}
+	61
+	{
+		title = "Hanging plant #2";
+		sprite = "GOR3A0";
+	}
+	62
+	{
+		title = "Hanging pots";
+		sprite = "GOR5A0";
+	}
+	63
+	{
+		title = "Cave bat";
+		sprite = "A0";
+	}
+	28
+	{
+		title = "Phone";
+		sprite = "POL2A0";
+	}
+	75
+	{
+		title = "Stalactite";
+		sprite = "HDB3A0";
+	}
+	78
+	{
+		title = "Flower #1";
+		sprite = "FLW1A0";
+	}
+	79
+	{
+		title = "Flower #2";
+		sprite = "FLW2A0";
+	}
+	80
+	{
+		title = "Chemical Beaker";
+		sprite = "POL5A0";
+	}
+	81
+	{
+		title = "Small bush";
+		sprite = "BRS1A0";
+	}
+}
+
+civilians
+{
+	color = 4;	// Red
+	arrow = 0;
+	title = "Civilians";
+	width = 16;
+	sort = 1;
+	height = 16;
+	hangs = 0;
+	blocking = 1;
+	error = 2;
+	
+	70
+	{
+		title = "Captive #1";
+		sprite = "FCANA0";
+	}
+	26
+	{
+		title = "Captive #2";
+		sprite = "POL6A0";
+	}
+	52
+	{
+		title = "Captive #3";
+		sprite = "POL7A0";
+	}
+}
diff --git a/Build/Configurations/Other Games/Chex Quest 3/Includes/Game_Chex3.cfg b/Build/Configurations/Other Games/Chex Quest 3/Includes/Game_Chex3.cfg
new file mode 100644
index 0000000..ab06f56
--- /dev/null
+++ b/Build/Configurations/Other Games/Chex Quest 3/Includes/Game_Chex3.cfg	
@@ -0,0 +1,28 @@
+// Default lump name for new map
+  defaultlumpname = "MAP01";
+
+  // Decorate actors to include depending on actor game property
+  decorategames = "chex";
+
+  // Skill levels
+  skills
+  {
+    include("Chex_misc.cfg", "skills");
+  }
+
+  // Door making
+  makedoortrack = "COMPSTA1";
+
+  // Default thing filters
+  // (these are not required, just useful for new users)
+  /*thingsfilters
+  {
+    include("Doom_misc.cfg", "thingsfilters");
+  }*/
+
+  // Default texture sets
+  // (these are not required, but useful for new users)
+  texturesets
+  {
+    include("Chex3_texturesets.cfg");
+  }
\ No newline at end of file
diff --git a/Build/Configurations/Other Games/Chex Quest 3/ZDoom_Chex3Hexen.cfg b/Build/Configurations/Other Games/Chex Quest 3/ZDoom_Chex3Hexen.cfg
new file mode 100644
index 0000000..e827f04
--- /dev/null
+++ b/Build/Configurations/Other Games/Chex Quest 3/ZDoom_Chex3Hexen.cfg	
@@ -0,0 +1,63 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "ZDoom: Chex Quest 3 (Hexen format)";
+
+// This is the simplified game engine/sourceport name
+engine = "zdoom";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to Hexen map format
+include("Includes\\ZDoom_common.cfg", "mapformat_hexen");
+
+// Settings common to Chex Quest 3 games
+include("Includes\\Game_Chex3.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\Doom_misc.cfg", "thingsfilters");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Chex3_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "default");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_chex3");
+}
diff --git a/Build/Configurations/Other Games/Chex Quest 3/ZDoom_Chex3UDMF.cfg b/Build/Configurations/Other Games/Chex Quest 3/ZDoom_Chex3UDMF.cfg
new file mode 100644
index 0000000..53e5ac9
--- /dev/null
+++ b/Build/Configurations/Other Games/Chex Quest 3/ZDoom_Chex3UDMF.cfg	
@@ -0,0 +1,63 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "ZDoom: Chex Quest 3 (UDMF)";
+
+// This is the simplified game engine/sourceport name
+engine = "zdoom";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to text map format
+include("Includes\\ZDoom_common.cfg", "mapformat_udmf");
+
+// Settings common to Chex Quest 3 games
+include("Includes\\Game_Chex3.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\ZDoom_misc.cfg", "thingsfilters_udmf");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Chex3_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "default");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_chex3");
+}
diff --git a/Build/Configurations/Other Games/Chex Quest 3/Zandronum_Chex3Hexen.cfg b/Build/Configurations/Other Games/Chex Quest 3/Zandronum_Chex3Hexen.cfg
new file mode 100644
index 0000000..cdab348
--- /dev/null
+++ b/Build/Configurations/Other Games/Chex Quest 3/Zandronum_Chex3Hexen.cfg	
@@ -0,0 +1,67 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "Zandronum: Chex Quest 3 (Hexen format)";
+
+// This is the simplified game engine/sourceport name
+engine = "zandronum";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to Hexen map format
+include("Includes\\ZDoom_common.cfg", "mapformat_hexen");
+
+// Settings common to Chex Quest 3 games
+include("Includes\\Game_Chex3.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\Doom_misc.cfg", "thingsfilters");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Chex3_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "default");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+	// Additional actors from the engine
+	include("Includes\\Zandronum_things.cfg", "default");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_chex3");
+	// Additional enums from the engine
+	include("Includes\\Zandronum_misc.cfg", "enums_notdoom");
+}
diff --git a/Build/Configurations/Other Games/Chex Quest 3/Zandronum_Chex3UDMF.cfg b/Build/Configurations/Other Games/Chex Quest 3/Zandronum_Chex3UDMF.cfg
new file mode 100644
index 0000000..2a0672c
--- /dev/null
+++ b/Build/Configurations/Other Games/Chex Quest 3/Zandronum_Chex3UDMF.cfg	
@@ -0,0 +1,67 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "Zandronum: Chex Quest 3 (UDMF)";
+
+// This is the simplified game engine/sourceport name
+engine = "zandronum";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to text map format
+include("Includes\\ZDoom_common.cfg", "mapformat_udmf");
+
+// Settings common to Chex Quest 3 games
+include("Includes\\Game_Chex3.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\ZDoom_misc.cfg", "thingsfilters_udmf");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Chex3_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "default");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+	// Additional actors from the engine
+	include("Includes\\Zandronum_things.cfg", "default");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_chex3");
+	// Additional enums from the engine
+	include("Includes\\Zandronum_misc.cfg", "enums_notdoom");
+}
diff --git a/Build/Configurations/Other Games/Chex Quest/GZDoom_ChexDoom.cfg b/Build/Configurations/Other Games/Chex Quest/GZDoom_ChexDoom.cfg
new file mode 100644
index 0000000..6b4e4cd
--- /dev/null
+++ b/Build/Configurations/Other Games/Chex Quest/GZDoom_ChexDoom.cfg	
@@ -0,0 +1,66 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "GZDoom: Chex Quest 1 (Doom format)";
+
+// This is the simplified game engine/sourceport name
+engine = "gzdoom";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to Doom map format
+include("Includes\\ZDoom_common.cfg", "mapformat_doom");
+
+// Settings common to Chex Quest games
+include("Includes\\Game_Chex.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\Doom_misc.cfg", "thingsfilters");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Chex_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "default");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+	// Additional actors from the engine
+	include("Includes\\GZDoom_things.cfg", "gzdoom");
+	include("Includes\\GZDoom_things.cfg", "gzdoom_lights");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_chex");
+}
diff --git a/Build/Configurations/Other Games/Chex Quest/GZDoom_ChexHexen.cfg b/Build/Configurations/Other Games/Chex Quest/GZDoom_ChexHexen.cfg
new file mode 100644
index 0000000..112b9da
--- /dev/null
+++ b/Build/Configurations/Other Games/Chex Quest/GZDoom_ChexHexen.cfg	
@@ -0,0 +1,66 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "GZDoom: Chex Quest 1 (Hexen format)";
+
+// This is the simplified game engine/sourceport name
+engine = "gzdoom";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to Hexen map format
+include("Includes\\ZDoom_common.cfg", "mapformat_hexen");
+
+// Settings common to Chex Quest games
+include("Includes\\Game_Chex.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\Doom_misc.cfg", "thingsfilters");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Chex_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "default");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+	// Additional actors from the engine
+	include("Includes\\GZDoom_things.cfg", "gzdoom");
+	include("Includes\\GZDoom_things.cfg", "gzdoom_lights");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_chex");
+}
diff --git a/Build/Configurations/Other Games/Chex Quest/GZDoom_ChexUDMF.cfg b/Build/Configurations/Other Games/Chex Quest/GZDoom_ChexUDMF.cfg
new file mode 100644
index 0000000..61c47c6
--- /dev/null
+++ b/Build/Configurations/Other Games/Chex Quest/GZDoom_ChexUDMF.cfg	
@@ -0,0 +1,66 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "GZDoom: Chex Quest 1 (UDMF)";
+
+// This is the simplified game engine/sourceport name
+engine = "gzdoom";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to text map format
+include("Includes\\ZDoom_common.cfg", "mapformat_udmf");
+
+// Settings common to Chex Quest games
+include("Includes\\Game_Chex.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\ZDoom_misc.cfg", "thingsfilters_udmf");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Chex_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "default");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+	// Additional actors from the engine
+	include("Includes\\GZDoom_things.cfg", "gzdoom");
+	include("Includes\\GZDoom_things.cfg", "gzdoom_lights");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_chex");
+}
diff --git a/Build/Configurations/Other Games/Chex Quest/Includes/Chex_misc.cfg b/Build/Configurations/Other Games/Chex Quest/Includes/Chex_misc.cfg
new file mode 100644
index 0000000..2004114
--- /dev/null
+++ b/Build/Configurations/Other Games/Chex Quest/Includes/Chex_misc.cfg	
@@ -0,0 +1,14 @@
+
+// Basic Doom and Vanilla engine stuff.
+
+include("Doom_Misc.cfg");
+
+// The only difference with Doom
+skills
+{
+	1 = "Easy does it";
+	2 = "Not so sticky";
+	3 = "Gobs of goo";
+	4 = "Extreme ooze";
+	5 = "Super slimey!";
+}
\ No newline at end of file
diff --git a/Build/Configurations/Other Games/Chex Quest/Includes/Chex_texturesets.cfg b/Build/Configurations/Other Games/Chex Quest/Includes/Chex_texturesets.cfg
new file mode 100644
index 0000000..e69de29
diff --git a/Build/Configurations/Other Games/Chex Quest/Includes/Chex_things.cfg b/Build/Configurations/Other Games/Chex Quest/Includes/Chex_things.cfg
new file mode 100644
index 0000000..6046e2a
--- /dev/null
+++ b/Build/Configurations/Other Games/Chex Quest/Includes/Chex_things.cfg	
@@ -0,0 +1,507 @@
+
+players
+{
+	color = 10;	// Light Green
+	arrow = 1;
+	title = "Player Starts";
+	width = 16;
+	sort = 1;
+	height = 56;
+	hangs = 0;
+	blocking = 1;
+	error = 2;
+	
+	1
+	{
+		title = "Player 1 start";
+		sprite = "PLAYA2A8";
+	}
+	2
+	{
+		title = "Player 2 start";
+		sprite = "PLAYA2A8";
+	}
+	3
+	{
+		title = "Player 3 start";
+		sprite = "PLAYA2A8";
+	}
+	4
+	{
+		title = "Player 4 start";
+		sprite = "PLAYA2A8";
+	}
+	11
+	{
+		title = "Player Deathmatch start";
+		sprite = "PLAYF1";
+	}
+}
+
+
+teleports
+{
+	color = 2;	// Green
+	arrow = 1;
+	title = "Teleports";
+	width = 16;
+	sort = 1;
+	height = 56;
+	hangs = 0;
+	blocking = 0;
+	error = 0;
+	
+	14
+	{
+		title = "Teleport Destination";
+		sprite = "TFOGB0";
+	}
+}
+
+monsters
+{
+	color = 12;	// Light Red
+	arrow = 1;
+	title = "Monsters";
+	width = 20;
+	sort = 1;
+	height = 56;
+	hangs = 0;
+	blocking = 1;
+	error = 2;
+	
+	3004
+	{
+		title = "Flemoidus Commonus";
+		sprite = "POSSA2A8";
+	}
+	
+	
+	9
+	{
+		title = "Flemoidus Bipedicus";
+		sprite = "SPOSA2A8";
+	}
+	
+	
+	3001
+	{
+		title = "Armored Flemoidus Bipedicus";
+		sprite = "TROOA2A8";
+	}
+	
+	
+	3002
+	{
+		title = "Flemoidus Cycloptis Commonus";
+		width = 30;
+		sprite = "SARGA2A8";
+	}
+	
+	
+	3006
+	{
+		title = "Chex Soul";
+		width = 16;
+		sprite = "SKULA8A2";
+	}
+	
+	
+	3003
+	{
+		title = "Flembrane";
+		width = 24;
+		sprite = "BOSSA2A8";
+		height = 64;
+	}
+}
+
+weapons
+{
+	color = 14;	// Yellow
+	arrow = 0;
+	title = "Weapons";
+	width = 20;
+	sort = 1;
+	height = 25;
+	hangs = 0;
+	blocking = 0;
+	
+	82
+	{
+		title = "Super Large Zorcher";
+		sprite = "SGN2A0";
+	}
+	2005
+	{
+		title = "Super Bootspork";
+		sprite = "CSAWA0";
+	}
+	2001
+	{
+		title = "Large Zorcher";
+		sprite = "SHOTA0";
+	}
+	2002
+	{
+		title = "Rapid Zorcher";
+		sprite = "MGUNA0";
+	}
+	2003
+	{
+		title = "Zorch Propulsor";
+		sprite = "LAUNA0";
+	}
+	2004
+	{
+		title = "Phasing Zorcher";
+		sprite = "PLASA0";
+	}
+	2006
+	{
+		title = "LAZ Device";
+		sprite = "BFUGA0";
+		height = 30;
+	}
+}
+
+ammunition
+{
+	color = 6;	// Brown
+	arrow = 0;
+	title = "Ammunition";
+	width = 20;
+	sort = 1;
+	height = 16;
+	blocking = 0;
+	hangs = 0;
+	
+	2007
+	{
+		title = "Mini Zorcher Recharge";
+		sprite = "CLIPA0";
+	}
+	2008
+	{
+		title = "Large Zorcher Recharge";
+		sprite = "SHELA0";
+	}
+	2010
+	{
+		title = "Zorch propulsor recharge";
+		sprite = "ROCKA0";
+		height = 25;
+	}
+	2047
+	{
+		title = "Phasing zorcher recharge";
+		sprite = "CELLA0";
+	}
+	2048
+	{
+		title = "Mini zorcher pack";
+		sprite = "AMMOA0";
+	}
+	2049
+	{
+		title = "Large zorcher pack";
+		sprite = "SBOXA0";
+	}
+	2046
+	{
+		title = "Zorch propulsor pack";
+		sprite = "BROKA0";
+		width = 30;
+		height = 25;
+	}
+	17
+	{
+		title = "Phasing zorcher pack";
+		sprite = "CELPA0";
+		height = 25;
+	}
+	8
+	{
+		title = "Zorchpack";
+		sprite = "BPAKA0";
+	}
+}
+
+health
+{
+	color = 1;	// Blue
+	arrow = 0;
+	title = "Health and Armor";
+	width = 16;
+	sort = 1;
+	height = 20;
+	hangs = 0;
+	blocking = 0;
+	
+	2011
+	{
+		title = "Bowl of fruits";
+		sprite = "STIMA0";
+	}
+	2012
+	{
+		title = "Bowl of Vegetables";
+		sprite = "MEDIA0";
+		height = 25;
+	}
+	2014
+	{
+		title = "Glass of water";
+		sprite = "BON1A0";
+	}
+	2015
+	{
+		title = "Slime repellent";
+		sprite = "BON2A0";
+	}
+	2018
+	{
+		title = "Chex Armor";
+		sprite = "ARM1A0";
+	}
+	2019
+	{
+		title = "Super Chex Armor";
+		sprite = "ARM2A0";
+	}
+}
+
+powerups
+{
+	color = 9;	// Light Blue
+	arrow = 0;
+	title = "Powerups";
+	width = 20;
+	sort = 1;
+	height = 20;
+	hangs = 0;
+	blocking = 0;
+	
+	2013
+	{
+		title = "Supercharge Breakfast";
+		sprite = "SOULA0";
+		height = 45;
+	}
+	2025
+	{
+		title = "Slime-Proof Suit";
+		sprite = "SUITA0";
+		height = 60;
+	}
+	2026
+	{
+		title = "Computer map";
+		sprite = "PMAPA0";
+		height = 35;
+	}
+}
+
+keys
+{
+	color = 13;	// Light Magenta
+	arrow = 0;
+	title = "Keys";
+	width = 16;
+	sort = 1;
+	height = 20;
+	hangs = 0;
+	blocking = 0;
+	
+	5
+	{
+		title = "Blue keycard";
+		sprite = "BKEYA0";
+	}
+	13
+	{
+		title = "Red keycard";
+		sprite = "RKEYA0";
+	}
+	6
+	{
+		title = "Yellow keycard";
+		sprite = "YKEYA0";
+	}
+}
+
+
+obstacles
+{
+	color = 3;	// Cyan
+	arrow = 0;
+	title = "Obstacles";
+	width = 20;
+	sort = 1;
+	height = 20;
+	hangs = 0;
+	blocking = 1;
+	error = 2;
+	
+	47
+	{
+		title = "Apple tree";
+		sprite = "SMITA0";
+		height = 92;
+	}
+	54
+	{
+		title = "Banana tree";
+		width = 32;
+		sprite = "TRE2A0";
+		height = 108;
+	}
+	32
+	{
+		title = "Cavern column";
+		sprite = "COL3A0";
+		height = 128;
+	}
+	30
+	{
+		title = "Cavern stalagmite";
+		sprite = "COL1A0";
+		height = 60;
+	}
+	37
+	{
+		title = "Flag on a pole";
+		sprite = "COL6A0";
+		height = 128;
+	}
+	35
+	{
+		title = "Gas tank";
+		sprite = "CBRAA0";
+		height = 36;
+	}
+	33
+	{
+		title = "Bazoik cart";
+		sprite = "COL4A0";
+		height = 30;
+	}
+	43
+	{
+		title = "Orange tree";
+		sprite = "TRE1A0";
+		height = 92;
+	}
+	44
+	{
+		title = "Slime fountain";
+		sprite = "TBLUA0";
+		height = 48;
+	}
+	48
+	{
+		title = "Spaceship";
+		sprite = "ELECA0";
+		height = 52;
+	}
+	31
+	{
+		title = "Submerged plant";
+		sprite = "COL2A0";
+		height = 42;
+	}
+	28
+	{
+		title = "Tall flower #1";
+		sprite = "POL2A0";
+		height = 25;
+	}
+	25
+	{
+		title = "Tall flower #2";
+		sprite = "POL1A0";
+		height = 25;
+	}
+	55
+	{
+		title = "Lab coil";
+		sprite = "SMBTA0";
+		height = 86;
+	}
+}
+
+lights
+{
+	color = 11;	// Light Cyan
+	arrow = 0;
+	title = "Light sources";
+	width = 16;
+	sort = 1;
+	height = 16;
+	hangs = 0;
+	blocking = 1;
+	error = 2;
+	
+	2028
+	{
+		title = "Landing light";
+		sprite = "COLUA0";
+		height = 48;
+	}
+}
+
+decoration
+{
+	color = 4;	// Red
+	arrow = 0;
+	title = "Decoration";
+	width = 16;
+	sort = 1;
+	height = 16;
+	hangs = 0;
+	blocking = 0;
+	
+	41
+	{
+		title = "Chemical burner";
+		sprite = "CEYEA0";
+		height = 25;
+	}
+	34
+	{
+		title = "Chemical beaker";
+		sprite = "CANDA0";
+	}
+}
+
+civilians
+{
+	color = 4;	// Red
+	arrow = 0;
+	title = "Civilians";
+	width = 16;
+	sort = 1;
+	height = 16;
+	hangs = 0;
+	blocking = 1;
+	error = 2;
+	
+	45
+	{
+		title = "Captive #1";
+		sprite = "TGRNA0";
+		height = 54;
+	}
+	56
+	{
+		title = "Captive #2";
+		sprite = "SMGTA0";
+		height = 54;
+	}
+	57
+	{
+		title = "Captive #3";
+		sprite = "SMRTA0";
+		height = 48;
+	}
+}
diff --git a/Build/Configurations/Other Games/Chex Quest/Includes/Game_Chex.cfg b/Build/Configurations/Other Games/Chex Quest/Includes/Game_Chex.cfg
new file mode 100644
index 0000000..21f5b1e
--- /dev/null
+++ b/Build/Configurations/Other Games/Chex Quest/Includes/Game_Chex.cfg	
@@ -0,0 +1,28 @@
+// Default lump name for new map
+  defaultlumpname = "MAP01";
+
+  // Decorate actors to include depending on actor game property
+  decorategames = "chex";
+
+  // Skill levels
+  skills
+  {
+    include("Chex_misc.cfg", "skills");
+  }
+
+  // Door making
+  makedoortrack = "COMPSTA1";
+
+  // Default thing filters
+  // (these are not required, just useful for new users)
+  /*thingsfilters
+  {
+    include("Doom_misc.cfg", "thingsfilters");
+  }*/
+
+  // Default texture sets
+  // (these are not required, but useful for new users)
+  texturesets
+  {
+    include("Chex_texturesets.cfg");
+  }
\ No newline at end of file
diff --git a/Build/Configurations/Other Games/Chex Quest/ZDoom_ChexDoom.cfg b/Build/Configurations/Other Games/Chex Quest/ZDoom_ChexDoom.cfg
new file mode 100644
index 0000000..e1bfa5e
--- /dev/null
+++ b/Build/Configurations/Other Games/Chex Quest/ZDoom_ChexDoom.cfg	
@@ -0,0 +1,63 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "ZDoom: Chex Quest 1 (Doom format)";
+
+// This is the simplified game engine/sourceport name
+engine = "zdoom";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to Doom map format
+include("Includes\\ZDoom_common.cfg", "mapformat_doom");
+
+// Settings common to Chex Quest games
+include("Includes\\Game_Chex.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\Doom_misc.cfg", "thingsfilters");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Chex_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "default");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_chex");
+}
diff --git a/Build/Configurations/Other Games/Chex Quest/ZDoom_ChexHexen.cfg b/Build/Configurations/Other Games/Chex Quest/ZDoom_ChexHexen.cfg
new file mode 100644
index 0000000..e0152b9
--- /dev/null
+++ b/Build/Configurations/Other Games/Chex Quest/ZDoom_ChexHexen.cfg	
@@ -0,0 +1,63 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "ZDoom: Chex Quest 1 (Hexen format)";
+
+// This is the simplified game engine/sourceport name
+engine = "zdoom";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to Hexen map format
+include("Includes\\ZDoom_common.cfg", "mapformat_hexen");
+
+// Settings common to Chex Quest games
+include("Includes\\Game_Chex.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\Doom_misc.cfg", "thingsfilters");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Chex_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "default");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_chex");
+}
diff --git a/Build/Configurations/Other Games/Chex Quest/ZDoom_ChexUDMF.cfg b/Build/Configurations/Other Games/Chex Quest/ZDoom_ChexUDMF.cfg
new file mode 100644
index 0000000..17e7628
--- /dev/null
+++ b/Build/Configurations/Other Games/Chex Quest/ZDoom_ChexUDMF.cfg	
@@ -0,0 +1,63 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "ZDoom: Chex Quest 1 (UDMF)";
+
+// This is the simplified game engine/sourceport name
+engine = "zdoom";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to text map format
+include("Includes\\ZDoom_common.cfg", "mapformat_udmf");
+
+// Settings common to Chex Quest games
+include("Includes\\Game_Chex.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\ZDoom_misc.cfg", "thingsfilters_udmf");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Chex_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "default");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_chex");
+}
diff --git a/Build/Configurations/Other Games/Chex Quest/Zandronum_ChexDoom.cfg b/Build/Configurations/Other Games/Chex Quest/Zandronum_ChexDoom.cfg
new file mode 100644
index 0000000..a68539a
--- /dev/null
+++ b/Build/Configurations/Other Games/Chex Quest/Zandronum_ChexDoom.cfg	
@@ -0,0 +1,67 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "Zandronum: Chex Quest 1 (Doom format)";
+
+// This is the simplified game engine/sourceport name
+engine = "zandronum";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to Doom map format
+include("Includes\\ZDoom_common.cfg", "mapformat_doom");
+
+// Settings common to Chex Quest games
+include("Includes\\Game_Chex.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\Doom_misc.cfg", "thingsfilters");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Chex_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "default");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+	// Additional actors from the engine
+	include("Includes\\Zandronum_things.cfg", "default");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_chex");
+	// Additional enums from the engine
+	include("Includes\\Zandronum_misc.cfg", "enums_notdoom");
+}
diff --git a/Build/Configurations/Other Games/Chex Quest/Zandronum_ChexHexen.cfg b/Build/Configurations/Other Games/Chex Quest/Zandronum_ChexHexen.cfg
new file mode 100644
index 0000000..ec0f424
--- /dev/null
+++ b/Build/Configurations/Other Games/Chex Quest/Zandronum_ChexHexen.cfg	
@@ -0,0 +1,67 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "Zandronum: Chex Quest 1 (Hexen format)";
+
+// This is the simplified game engine/sourceport name
+engine = "zandronum";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to Hexen map format
+include("Includes\\ZDoom_common.cfg", "mapformat_hexen");
+
+// Settings common to Chex Quest games
+include("Includes\\Game_Chex.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\Doom_misc.cfg", "thingsfilters");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Chex_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "default");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+	// Additional actors from the engine
+	include("Includes\\Zandronum_things.cfg", "default");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_chex");
+	// Additional enums from the engine
+	include("Includes\\Zandronum_misc.cfg", "enums_notdoom");
+}
diff --git a/Build/Configurations/Other Games/Chex Quest/Zandronum_ChexUDMF.cfg b/Build/Configurations/Other Games/Chex Quest/Zandronum_ChexUDMF.cfg
new file mode 100644
index 0000000..f8c99f7
--- /dev/null
+++ b/Build/Configurations/Other Games/Chex Quest/Zandronum_ChexUDMF.cfg	
@@ -0,0 +1,67 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "Zandronum: Chex Quest 1 (UDMF)";
+
+// This is the simplified game engine/sourceport name
+engine = "zandronum";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to text map format
+include("Includes\\ZDoom_common.cfg", "mapformat_udmf");
+
+// Settings common to Chex Quest games
+include("Includes\\Game_Chex.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\ZDoom_misc.cfg", "thingsfilters_udmf");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Chex_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "default");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+	// Additional actors from the engine
+	include("Includes\\Zandronum_things.cfg", "default");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_chex");
+	// Additional enums from the engine
+	include("Includes\\Zandronum_misc.cfg", "enums_notdoom");
+}
diff --git a/Build/Configurations/Other Games/Harmony/GZDoom_HarmonyDoom.cfg b/Build/Configurations/Other Games/Harmony/GZDoom_HarmonyDoom.cfg
new file mode 100644
index 0000000..9551873
--- /dev/null
+++ b/Build/Configurations/Other Games/Harmony/GZDoom_HarmonyDoom.cfg	
@@ -0,0 +1,66 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "GZDoom: Harmony (Doom format)";
+
+// This is the simplified game engine/sourceport name
+engine = "gzdoom";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to Doom map format
+include("Includes\\ZDoom_common.cfg", "mapformat_doom");
+
+// Settings common to Harmony games
+include("Includes\\Game_Harmony.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\Doom_misc.cfg", "thingsfilters");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Harmony_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "default");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+	// Additional actors from the engine
+	include("Includes\\GZDoom_things.cfg", "gzdoom");
+	include("Includes\\GZDoom_things.cfg", "gzdoom_lights");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_harmony");
+}
diff --git a/Build/Configurations/Other Games/Harmony/GZDoom_HarmonyHexen.cfg b/Build/Configurations/Other Games/Harmony/GZDoom_HarmonyHexen.cfg
new file mode 100644
index 0000000..8eab665
--- /dev/null
+++ b/Build/Configurations/Other Games/Harmony/GZDoom_HarmonyHexen.cfg	
@@ -0,0 +1,66 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "GZDoom: Harmony (Hexen format)";
+
+// This is the simplified game engine/sourceport name
+engine = "gzdoom";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to Hexen map format
+include("Includes\\ZDoom_common.cfg", "mapformat_hexen");
+
+// Settings common to Harmony games
+include("Includes\\Game_Harmony.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\Doom_misc.cfg", "thingsfilters");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Harmony_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "default");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+	// Additional actors from the engine
+	include("Includes\\GZDoom_things.cfg", "gzdoom");
+	include("Includes\\GZDoom_things.cfg", "gzdoom_lights");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_harmony");
+}
diff --git a/Build/Configurations/Other Games/Harmony/GZDoom_HarmonyUDMF.cfg b/Build/Configurations/Other Games/Harmony/GZDoom_HarmonyUDMF.cfg
new file mode 100644
index 0000000..62ea4fc
--- /dev/null
+++ b/Build/Configurations/Other Games/Harmony/GZDoom_HarmonyUDMF.cfg	
@@ -0,0 +1,66 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "GZDoom: Harmony (UDMF)";
+
+// This is the simplified game engine/sourceport name
+engine = "gzdoom";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to text map format
+include("Includes\\ZDoom_common.cfg", "mapformat_udmf");
+
+// Settings common to Harmony games
+include("Includes\\Game_Harmony.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\ZDoom_misc.cfg", "thingsfilters_udmf");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Harmony_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "default");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+	// Additional actors from the engine
+	include("Includes\\GZDoom_things.cfg", "gzdoom");
+	include("Includes\\GZDoom_things.cfg", "gzdoom_lights");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_harmony");
+}
diff --git a/Build/Configurations/Other Games/Harmony/Includes/Game_Harmony.cfg b/Build/Configurations/Other Games/Harmony/Includes/Game_Harmony.cfg
new file mode 100644
index 0000000..ba8c7f2
--- /dev/null
+++ b/Build/Configurations/Other Games/Harmony/Includes/Game_Harmony.cfg	
@@ -0,0 +1,28 @@
+// Default lump name for new map
+  defaultlumpname = "MAP01";
+
+  // Decorate actors to include depending on actor game property
+  decorategames = "harmony"; // Doesn't actually exist, but used to prevent loading Doom actors when loading zdoom.pk3
+
+  // Skill levels
+  skills
+  {
+    include("Harmony_misc.cfg", "skills");
+  }
+
+  // Door making
+  makedoortrack = "DOORTRAK";
+
+  // Default thing filters
+  // (these are not required, just useful for new users)
+  /*thingsfilters
+  {
+    include("Doom_misc.cfg", "thingsfilters");
+  }*/
+
+  // Default texture sets
+  // (these are not required, but useful for new users)
+  texturesets
+  {
+    include("Harmony_texturesets.cfg");
+  }
\ No newline at end of file
diff --git a/Build/Configurations/Other Games/Harmony/Includes/Harmony_misc.cfg b/Build/Configurations/Other Games/Harmony/Includes/Harmony_misc.cfg
new file mode 100644
index 0000000..e2fa425
--- /dev/null
+++ b/Build/Configurations/Other Games/Harmony/Includes/Harmony_misc.cfg	
@@ -0,0 +1,14 @@
+
+// Basic Doom and Vanilla engine stuff.
+
+include("Doom_Misc.cfg");
+
+// The only difference with Doom
+skills
+{
+	1 = "Very easy";
+	2 = "Easy";
+	3 = "Medium";
+	4 = "Hard";
+	5 = "Very hard";
+}
\ No newline at end of file
diff --git a/Build/Configurations/Other Games/Harmony/Includes/Harmony_texturesets.cfg b/Build/Configurations/Other Games/Harmony/Includes/Harmony_texturesets.cfg
new file mode 100644
index 0000000..e69de29
diff --git a/Build/Configurations/Other Games/Harmony/Includes/Harmony_things.cfg b/Build/Configurations/Other Games/Harmony/Includes/Harmony_things.cfg
new file mode 100644
index 0000000..ad64978
--- /dev/null
+++ b/Build/Configurations/Other Games/Harmony/Includes/Harmony_things.cfg	
@@ -0,0 +1,596 @@
+
+players
+{
+	color = 10;	// Light Green
+	arrow = 1;
+	title = "Player Starts";
+	width = 16;
+	sort = 1;
+	height = 56;
+	hangs = 0;
+	blocking = 1;
+	error = 2;
+	
+	1
+	{
+		title = "Player 1 start";
+		sprite = "PLAYA2A8";
+	}
+	2
+	{
+		title = "Player 2 start";
+		sprite = "PLAYA2A8";
+	}
+	3
+	{
+		title = "Player 3 start";
+		sprite = "PLAYA2A8";
+	}
+	4
+	{
+		title = "Player 4 start";
+		sprite = "PLAYA2A8";
+	}
+	11
+	{
+		title = "Player Deathmatch start";
+		sprite = "PLAYF1";
+	}
+}
+
+bridges
+{
+	118
+	{
+		title = "Hack Bridge";
+		width = "36";
+		height = "4";
+	}
+}
+
+teleports
+{
+	color = 2;	// Green
+	arrow = 1;
+	title = "Teleports";
+	width = 16;
+	sort = 1;
+	height = 56;
+	hangs = 0;
+	blocking = 0;
+	error = 0;
+	
+	14
+	{
+		title = "Teleport Destination";
+		sprite = "TFOGB0";
+	}
+}
+
+monsters
+{
+	color = 12;	// Light Red
+	arrow = 1;
+	title = "Monsters";
+	width = 20;
+	sort = 1;
+	height = 56;
+	hangs = 0;
+	blocking = 1;
+	error = 2;
+	
+	3004
+	{
+		title = "Beastling";
+		sprite = "SARGB2B8";
+	}
+	9
+	{
+		title = "Follower";
+		sprite = "SPOSA2A8";
+	}
+	3003
+	{
+		title = "Critter";
+		width = 24;
+		sprite = "BOSSA2A8";
+		height = 22;
+	}
+	16
+	{
+		title = "Centaur";
+		width = 40;
+		sprite = "TROOA2A8";
+		height = 110;
+	}
+	7
+	{
+		title = "Echidna";
+		width = 128;
+		sprite = "SPIDG2G8";
+		height = 110;
+	}
+	65
+	{
+		title = "Mutant soldier";
+		sprite = "CPOSA2";
+	}
+	68
+	{
+		title = "Phage";
+		width = 48;
+		sprite = "SSWVA2";
+		height = 64;
+	}
+	66
+	{
+		title = "Predator";
+		sprite = "CYBRC2";
+	}
+	64
+	{
+		title = "Falling follower";
+		sprite = "BON1C0";
+	}
+}
+
+weapons
+{
+	color = 14;	// Yellow
+	arrow = 0;
+	title = "Weapons";
+	width = 20;
+	sort = 1;
+	height = 25;
+	hangs = 0;
+	blocking = 0;
+	
+	2001
+	{
+		title = "Shotgun";
+		sprite = "SHOTA0";
+	}
+	2002
+	{
+		title = "Minigun";
+		sprite = "MGUNA0";
+	}
+	2003
+	{
+		title = "Grenade launcher";
+		sprite = "LAUNA0";
+	}
+	2004
+	{
+		title = "Entropy thrower";
+		sprite = "PLASA0";
+	}
+	2006
+	{
+		title = "Hand Grenade";
+		sprite = "BFUGA0";
+		height = 30;
+	}
+}
+
+ammunition
+{
+	color = 6;	// Brown
+	arrow = 0;
+	title = "Ammunition";
+	width = 20;
+	sort = 1;
+	height = 16;
+	blocking = 0;
+	hangs = 0;
+	
+	2010
+	{
+		title = "Grenade";
+		sprite = "ROCKA0";
+		height = 25;
+	}
+	2048
+	{
+		title = "Minigun ammo";
+		sprite = "AMMOA0";
+	}
+	2049
+	{
+		title = "Shotgun ammo";
+		sprite = "SBOXA0";
+	}
+	2046
+	{
+		title = "Grenade belts";
+		sprite = "BROKA0";
+		width = 30;
+		height = 25;
+	}
+	17
+	{
+		title = "Cell charge pack";
+		sprite = "CELPA0";
+		height = 25;
+	}
+	8
+	{
+		title = "Backpack";
+		sprite = "BPAKA0";
+	}
+}
+
+health
+{
+	color = 1;	// Blue
+	arrow = 0;
+	title = "Health and Armor";
+	width = 16;
+	sort = 1;
+	height = 20;
+	hangs = 0;
+	blocking = 0;
+	
+	2011
+	{
+		title = "Healing mushroom";
+		sprite = "STIMA0";
+	}
+	2012
+	{
+		title = "First aid kit";
+		sprite = "MEDIA0";
+		height = 25;
+	}
+	2018
+	{
+		title = "Amazon armor";
+		sprite = "ARM1A0";
+	}
+	2019
+	{
+		title = "NDF armor";
+		sprite = "ARM2A0";
+	}
+}
+
+powerups
+{
+	color = 9;	// Light Blue
+	arrow = 0;
+	title = "Powerups";
+	width = 20;
+	sort = 1;
+	height = 20;
+	hangs = 0;
+	blocking = 0;
+	
+	2013
+	{
+		title = "Huge healing mushroom";
+		sprite = "SOULA0";
+		height = 45;
+	}
+	2026
+	{
+		title = "Computer map";
+		sprite = "PMAPA0";
+		height = 35;
+	}
+}
+
+keys
+{
+	color = 13;	// Light Magenta
+	arrow = 0;
+	title = "Keys";
+	width = 16;
+	sort = 1;
+	height = 20;
+	hangs = 0;
+	blocking = 0;
+	
+	5
+	{
+		title = "Green keycard";
+		sprite = "BKEYA0";
+	}
+	40
+	{
+		title = "Green key";
+		sprite = "BSKUB0";
+	}
+	13
+	{
+		title = "Purple keycard";
+		sprite = "RKEYA0";
+	}
+	38
+	{
+		title = "Purple key";
+		sprite = "RSKUB0";
+	}
+	6
+	{
+		title = "Yellow keycard";
+		sprite = "YKEYA0";
+	}
+	39
+	{
+		title = "Yellow key";
+		sprite = "YSKUB0";
+	}
+}
+
+specialeffects
+{
+	color = 3;	// Cyan
+	arrow = 0;
+	title = "Special effects";
+	width = 20;
+	sort = 1;
+	height = 20;
+	hangs = 0;
+	blocking = 1;
+	error = 2;
+	
+	47
+	{
+		title = "Chair seat";
+		sprite = "SMITA0";
+		blocking = 0;
+		error = 0;
+	}
+	3006
+	{
+		title = "Mine";
+		width = 16;
+		height = 8;
+		sprite = "PAINB1";
+	}
+	67
+	{
+		title = "Grid obstacle";
+		width = 30;
+		sprite = "HEADL0";
+		height = 56;
+	}
+	3002
+	{
+		title = "Breaking grid";
+		blocking = 0;
+		error = 0;
+		sprite = "HEADL0";
+	}
+	26
+	{
+		title = "Crate target";
+		sprite = "POL6A0";
+	}
+	79
+	{
+		title = "Crate explosion";
+		sprite = "POB1A0";
+	}
+	51
+	{
+		title = "Attack blocker (invisible)";
+		sprite = "GOR3A0";
+		height = 84;
+	}
+}
+
+obstacles
+{
+	color = 3;	// Cyan
+	arrow = 0;
+	title = "Obstacles";
+	width = 20;
+	sort = 1;
+	height = 20;
+	hangs = 0;
+	blocking = 1;
+	error = 2;
+	
+	2035
+	{
+		title = "Explosive barrel";
+		width = 10;
+		sprite = "BAR1A0";
+		height = 32;
+	}
+	30
+	{
+		title = "Big mushroom";
+		sprite = "COL1A0";
+	}
+	32
+	{
+		title = "Abducted Amira";
+		sprite = "COL3A0";
+	}
+	31
+	{
+		title = "Truck pipe";
+		sprite = "COL2A0";
+	}
+	36
+	{
+		title = "Gouts of flame";
+		sprite = "MISLB0";
+	}
+	33
+	{
+		title = "Sphere of heads sculpture";
+		sprite = "COL4A0";
+	}
+	54
+	{
+		title = "Dead tree";
+		width = 32;
+		sprite = "TRE2A0";
+	}
+	42
+	{
+		title = "Dripping water";
+		sprite = "FSKUA0";
+	}
+	45
+	{
+		title = "Dopefish";
+		sprite = "TGRNA0";
+	}
+}
+
+lights
+{
+	color = 11;	// Light Cyan
+	arrow = 0;
+	title = "Light sources";
+	width = 16;
+	sort = 1;
+	height = 16;
+	hangs = 0;
+	blocking = 1;
+	error = 2;
+	
+	48
+	{
+		title = "Tall lamp statue";
+		sprite = "ELECA0";
+	}
+	2028
+	{
+		title = "Laser lamp";
+		sprite = "COLUA0";
+	}
+	34
+	{
+		title = "Candle";
+		sprite = "CANDA0";
+		blocking = 0;
+		error = 0;
+	}
+	55
+	{
+		title = "Fire";
+		sprite = "SMBTA0";
+	}
+	57
+	{
+		title = "Firebox";
+		sprite = "SMRTA0";
+	}
+}
+
+decoration
+{
+	color = 4;	// Red
+	arrow = 0;
+	title = "Decoration";
+	width = 16;
+	sort = 1;
+	height = 16;
+	hangs = 0;
+	blocking = 0;
+	
+	2007
+	{
+		title = "Flies";
+		sprite = "CEYEB0";
+	}
+
+	46
+	{
+		title = "Nukage splash";
+		sprite = "TREDA0";
+	}
+
+	56
+	{
+		title = "Ceiling sparks";
+		sprite = "SMGTA0";
+	}
+
+	63
+	{
+		title = "Hanging brazier";
+		sprite = "GOR1A0";
+		height = 68;
+		hangs = 1;
+	}
+	
+	27
+	{
+		title = "Missile (ready)";
+		sprite = "SMT2A0";
+		blocking = 1;
+		error = 2;
+	}
+	
+	
+	28
+	{
+		title = "Vine tentacle";
+		sprite = "POL2A0";
+		blocking = 1;
+		error = 2;
+	}
+	
+	
+	29
+	{
+		title = "Missile (launched)";
+		sprite = "POL3A0";
+		blocking = 1;
+		error = 2;
+	}
+	
+	15
+	{
+		title = "Dead amazon";
+		sprite = "ARM2B0";
+	}
+	
+	19
+	{
+		title = "Old skeleton";
+		sprite = "ARM1B0";
+		width = 20;
+	}
+	
+	21
+	{
+		title = "Dead beastling";
+		sprite = "SARGN0";
+		width = 30;
+	}
+
+	73
+	{
+		title = "Large hanging chains";
+		sprite = "HDB1A0";
+		height = 88;
+		hangs = 1;
+		blocking = 1;
+		error = 2;
+	}
+	
+	74
+	{
+		title = "Stored miniguns";
+		sprite = "HDB2A0";
+		height = 88;
+		blocking = 1;
+		error = 2;
+	}
+	
+	75
+	{
+		title = "Stored shotguns";
+		sprite = "HDB3A0";
+		height = 64;
+		blocking = 1;
+		error = 2;
+	}
+}
diff --git a/Build/Configurations/Other Games/Harmony/ZDoom_HarmonyDoom.cfg b/Build/Configurations/Other Games/Harmony/ZDoom_HarmonyDoom.cfg
new file mode 100644
index 0000000..5fda7f2
--- /dev/null
+++ b/Build/Configurations/Other Games/Harmony/ZDoom_HarmonyDoom.cfg	
@@ -0,0 +1,63 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "ZDoom: Harmony (Doom format)";
+
+// This is the simplified game engine/sourceport name
+engine = "zdoom";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to Doom map format
+include("Includes\\ZDoom_common.cfg", "mapformat_doom");
+
+// Settings common to Harmony games
+include("Includes\\Game_Harmony.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\Doom_misc.cfg", "thingsfilters");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Harmony_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "default");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_harmony");
+}
diff --git a/Build/Configurations/Other Games/Harmony/ZDoom_HarmonyHexen.cfg b/Build/Configurations/Other Games/Harmony/ZDoom_HarmonyHexen.cfg
new file mode 100644
index 0000000..da9eba6
--- /dev/null
+++ b/Build/Configurations/Other Games/Harmony/ZDoom_HarmonyHexen.cfg	
@@ -0,0 +1,63 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "ZDoom: Harmony (Hexen format)";
+
+// This is the simplified game engine/sourceport name
+engine = "zdoom";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to Hexen map format
+include("Includes\\ZDoom_common.cfg", "mapformat_hexen");
+
+// Settings common to Harmony games
+include("Includes\\Game_Harmony.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\Doom_misc.cfg", "thingsfilters");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Harmony_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "default");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_harmony");
+}
diff --git a/Build/Configurations/Other Games/Harmony/ZDoom_HarmonyUDMF.cfg b/Build/Configurations/Other Games/Harmony/ZDoom_HarmonyUDMF.cfg
new file mode 100644
index 0000000..7e923af
--- /dev/null
+++ b/Build/Configurations/Other Games/Harmony/ZDoom_HarmonyUDMF.cfg	
@@ -0,0 +1,63 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "ZDoom: Harmony (UDMF)";
+
+// This is the simplified game engine/sourceport name
+engine = "zdoom";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to text map format
+include("Includes\\ZDoom_common.cfg", "mapformat_udmf");
+
+// Settings common to Harmony games
+include("Includes\\Game_Harmony.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\ZDoom_misc.cfg", "thingsfilters_udmf");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Harmony_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "default");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_harmony");
+}
diff --git a/Build/Configurations/Other Games/Harmony/Zandronum_HarmonyDoom.cfg b/Build/Configurations/Other Games/Harmony/Zandronum_HarmonyDoom.cfg
new file mode 100644
index 0000000..3613ae2
--- /dev/null
+++ b/Build/Configurations/Other Games/Harmony/Zandronum_HarmonyDoom.cfg	
@@ -0,0 +1,67 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "Zandronum: Harmony (Doom format)";
+
+// This is the simplified game engine/sourceport name
+engine = "zandronum";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to Doom map format
+include("Includes\\ZDoom_common.cfg", "mapformat_doom");
+
+// Settings common to Harmony games
+include("Includes\\Game_Harmony.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\Doom_misc.cfg", "thingsfilters");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Harmony_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "default");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+	// Additional actors from the engine
+	include("Includes\\Zandronum_things.cfg", "default");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_harmony");
+	// Additional enums from the engine
+	include("Includes\\Zandronum_misc.cfg", "enums_notdoom");
+}
diff --git a/Build/Configurations/Other Games/Harmony/Zandronum_HarmonyHexen.cfg b/Build/Configurations/Other Games/Harmony/Zandronum_HarmonyHexen.cfg
new file mode 100644
index 0000000..d8aae1a
--- /dev/null
+++ b/Build/Configurations/Other Games/Harmony/Zandronum_HarmonyHexen.cfg	
@@ -0,0 +1,67 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "Zandronum: Harmony (Hexen format)";
+
+// This is the simplified game engine/sourceport name
+engine = "zandronum";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to Hexen map format
+include("Includes\\ZDoom_common.cfg", "mapformat_hexen");
+
+// Settings common to Harmony games
+include("Includes\\Game_Harmony.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\Doom_misc.cfg", "thingsfilters");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Harmony_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "default");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+	// Additional actors from the engine
+	include("Includes\\Zandronum_things.cfg", "default");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_harmony");
+	// Additional enums from the engine
+	include("Includes\\Zandronum_misc.cfg", "enums_notdoom");
+}
diff --git a/Build/Configurations/Other Games/Harmony/Zandronum_HarmonyUDMF.cfg b/Build/Configurations/Other Games/Harmony/Zandronum_HarmonyUDMF.cfg
new file mode 100644
index 0000000..652de75
--- /dev/null
+++ b/Build/Configurations/Other Games/Harmony/Zandronum_HarmonyUDMF.cfg	
@@ -0,0 +1,67 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "Zandronum: Harmony (UDMF)";
+
+// This is the simplified game engine/sourceport name
+engine = "zandronum";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to text map format
+include("Includes\\ZDoom_common.cfg", "mapformat_udmf");
+
+// Settings common to Harmony games
+include("Includes\\Game_Harmony.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\ZDoom_misc.cfg", "thingsfilters_udmf");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Harmony_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "default");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+	// Additional actors from the engine
+	include("Includes\\Zandronum_things.cfg", "default");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_harmony");
+	// Additional enums from the engine
+	include("Includes\\Zandronum_misc.cfg", "enums_notdoom");
+}
diff --git a/Build/Configurations/Other Games/Readme.txt b/Build/Configurations/Other Games/Readme.txt
new file mode 100644
index 0000000..05effdc
--- /dev/null
+++ b/Build/Configurations/Other Games/Readme.txt	
@@ -0,0 +1 @@
+To enable these game configurations, move the contents of a game folder into the "Configurations" folder, and then enable a game configuration(s) in the GZDB's Preferences.
\ No newline at end of file
diff --git a/Build/Configurations/Strife_StrifeDoom.cfg b/Build/Configurations/Strife_StrifeDoom.cfg
new file mode 100644
index 0000000..6bd73c9
--- /dev/null
+++ b/Build/Configurations/Strife_StrifeDoom.cfg
@@ -0,0 +1,49 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "Strife: Strife (Doom format)";
+
+// This is the simplified game engine/sourceport name
+engine = "strife";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD DOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\Doom_common.cfg", "common");
+
+// Settings common to Doom map format
+include("Includes\\Strife_common.cfg", "mapformat_doom");
+
+// Settings common to Strife games
+include("Includes\\Game_Strife.cfg");
+
+//mxd. No DECORATE support in vanilla
+decorategames = "";
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\Strife_misc.cfg", "thingsfilters");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Strife_things.cfg");
+}
\ No newline at end of file
diff --git a/Build/Configurations/ZDoomFamily_template.txt b/Build/Configurations/ZDoomFamily_template.txt
new file mode 100644
index 0000000..7286915
--- /dev/null
+++ b/Build/Configurations/ZDoomFamily_template.txt
@@ -0,0 +1,138 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "ZDoom: Game (map format)";
+
+// This is the simplified game engine/sourceport name
+engine = "zdoom";
+
+// Should this configuration be initially available?
+enabledbydefault = true;
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	// Keep only the one that's appropriate!
+	include("Includes\\Doom_misc.cfg", "thingsfilters"); // Thing filters for Doom/Hexen map formats
+	include("Includes\\ZDoom_misc.cfg", "thingsfilters_udmf"); // Thing filters for UDMF map format
+}
+
+// ---------------- MAP FORMAT STUFF ----------------
+// Keep only the one that's appropriate!
+// Settings common to Doom map format
+include("Includes\\ZDoom_common.cfg", "mapformat_doom");
+
+// Settings common to Hexen map format
+include("Includes\\ZDoom_common.cfg", "mapformat_hexen");
+
+// Settings common to text map format
+include("Includes\\ZDoom_common.cfg", "mapformat_udmf");
+// ---------------- MAP FORMAT STUFF ----------------
+
+
+
+// ---------------- GAME STUFF ----------------
+//Keep only the one that's appropriate!
+// Settings common to Doom games
+include("Includes\\Game_Doom.cfg");
+
+// Settings common to Heretic games
+include("Includes\\Game_Heretic.cfg");
+
+// Settings common to Hexen games
+include("Includes\\Game_Hexen.cfg");
+
+// Settings common to Strife games
+include("Includes\\Game_Strife.cfg");
+
+// Settings common to Chex Quest games
+include("Includes\\Game_Chex.cfg");
+
+// Settings common to Chex Quest 3 games
+include("Includes\\Game_Chex3.cfg");
+
+// Settings common to Harmony games
+include("Includes\\Game_Harmony.cfg");
+
+// Settings common to Action Doom 2 games
+include("Includes\\Game_Action2.cfg");
+// ---------------- GAME STUFF ----------------
+
+
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Doom_things.cfg");
+	include("Includes\\Doom2_things.cfg");
+	include("Includes\\Heretic_things.cfg");
+	include("Includes\\Hexen_things.cfg");
+	include("Includes\\Strife_things.cfg");
+	include("Includes\\Chex_things.cfg");
+	include("Includes\\Chex3_things.cfg");
+	include("Includes\\Harmony_things.cfg");
+	
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "doom");
+	include("Includes\\ZDoom_things.cfg", "heretic");
+	include("Includes\\ZDoom_things.cfg", "hexen");
+	include("Includes\\ZDoom_things.cfg", "strife");
+	include("Includes\\ZDoom_things.cfg", "default");
+	
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+	
+	// Additional actors from the engine
+	include("Includes\\GZDoom_things.cfg", "gzdoom");
+	include("Includes\\Zandronum_things.cfg", "doom");
+	include("Includes\\Zandronum_things.cfg", "heretic");
+	include("Includes\\Zandronum_things.cfg", "hexen");
+	include("Includes\\Zandronum_things.cfg", "strife");
+	include("Includes\\Zandronum_things.cfg", "default");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_doom");
+	include("Includes\\ZDoom_misc.cfg", "enums_heretic");
+	include("Includes\\ZDoom_misc.cfg", "enums_hexen");
+	include("Includes\\ZDoom_misc.cfg", "enums_strife");
+	include("Includes\\ZDoom_misc.cfg", "enums_chex");
+	include("Includes\\ZDoom_misc.cfg", "enums_chex3");
+	include("Includes\\ZDoom_misc.cfg", "enums_harmony");
+	
+	// Additional enums from the engine
+	include("Includes\\Zandronum_misc.cfg", "enums_doom");
+	include("Includes\\Zandronum_misc.cfg", "enums_notdoom");
+}
diff --git a/Build/Configurations/ZDoom_DoomDoom.cfg b/Build/Configurations/ZDoom_DoomDoom.cfg
new file mode 100644
index 0000000..384986e
--- /dev/null
+++ b/Build/Configurations/ZDoom_DoomDoom.cfg
@@ -0,0 +1,64 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "ZDoom: Doom 2 (Doom format)";
+
+// This is the simplified game engine/sourceport name
+engine = "zdoom";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to Doom map format
+include("Includes\\ZDoom_common.cfg", "mapformat_doom");
+
+// Settings common to Doom games
+include("Includes\\Game_Doom.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\Doom_misc.cfg", "thingsfilters");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Doom_things.cfg");
+	include("Includes\\Doom2_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "doom");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_doom");
+}
diff --git a/Build/Configurations/ZDoom_DoomHexen.cfg b/Build/Configurations/ZDoom_DoomHexen.cfg
new file mode 100644
index 0000000..d312e2f
--- /dev/null
+++ b/Build/Configurations/ZDoom_DoomHexen.cfg
@@ -0,0 +1,64 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "ZDoom: Doom 2 (Hexen format)";
+
+// This is the simplified game engine/sourceport name
+engine = "zdoom";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to Hexen map format
+include("Includes\\ZDoom_common.cfg", "mapformat_hexen");
+
+// Settings common to Doom games
+include("Includes\\Game_Doom.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\Doom_misc.cfg", "thingsfilters");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Doom_things.cfg");
+	include("Includes\\Doom2_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "doom");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_doom");
+}
diff --git a/Build/Configurations/ZDoom_DoomUDMF.cfg b/Build/Configurations/ZDoom_DoomUDMF.cfg
new file mode 100644
index 0000000..8564c44
--- /dev/null
+++ b/Build/Configurations/ZDoom_DoomUDMF.cfg
@@ -0,0 +1,64 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "ZDoom: Doom 2 (UDMF)";
+
+// This is the simplified game engine/sourceport name
+engine = "zdoom";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to text map format
+include("Includes\\ZDoom_common.cfg", "mapformat_udmf");
+
+// Settings common to Doom games
+include("Includes\\Game_Doom.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\ZDoom_misc.cfg", "thingsfilters_udmf");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Doom_things.cfg");
+	include("Includes\\Doom2_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "doom");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_doom");
+}
diff --git a/Build/Configurations/ZDoom_HereticDoom.cfg b/Build/Configurations/ZDoom_HereticDoom.cfg
new file mode 100644
index 0000000..e646345
--- /dev/null
+++ b/Build/Configurations/ZDoom_HereticDoom.cfg
@@ -0,0 +1,64 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "ZDoom: Heretic (Doom format)";
+
+// This is the simplified game engine/sourceport name
+engine = "zdoom";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to Doom map format
+include("Includes\\ZDoom_common.cfg", "mapformat_doom");
+include("Includes\\Heretic_misc.cfg", "mapformat_doom");
+
+// Settings common to Heretic games
+include("Includes\\Game_Heretic.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\Doom_misc.cfg", "thingsfilters");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Heretic_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "heretic");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_heretic");
+}
diff --git a/Build/Configurations/ZDoom_HereticHexen.cfg b/Build/Configurations/ZDoom_HereticHexen.cfg
new file mode 100644
index 0000000..40f80b0
--- /dev/null
+++ b/Build/Configurations/ZDoom_HereticHexen.cfg
@@ -0,0 +1,63 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "ZDoom: Heretic (Hexen format)";
+
+// This is the simplified game engine/sourceport name
+engine = "zdoom";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to Hexen map format
+include("Includes\\ZDoom_common.cfg", "mapformat_hexen");
+
+// Settings common to Heretic games
+include("Includes\\Game_Heretic.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\Doom_misc.cfg", "thingsfilters");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Heretic_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "heretic");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_heretic");
+}
diff --git a/Build/Configurations/ZDoom_HereticUDMF.cfg b/Build/Configurations/ZDoom_HereticUDMF.cfg
new file mode 100644
index 0000000..ac2b27c
--- /dev/null
+++ b/Build/Configurations/ZDoom_HereticUDMF.cfg
@@ -0,0 +1,63 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "ZDoom: Heretic (UDMF)";
+
+// This is the simplified game engine/sourceport name
+engine = "zdoom";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to text map format
+include("Includes\\ZDoom_common.cfg", "mapformat_udmf");
+
+// Settings common to Heretic games
+include("Includes\\Game_Heretic.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\ZDoom_misc.cfg", "thingsfilters_udmf");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Heretic_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "heretic");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_heretic");
+}
diff --git a/Build/Configurations/ZDoom_HexenHexen.cfg b/Build/Configurations/ZDoom_HexenHexen.cfg
new file mode 100644
index 0000000..9bbcd29
--- /dev/null
+++ b/Build/Configurations/ZDoom_HexenHexen.cfg
@@ -0,0 +1,63 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "ZDoom: Hexen (Hexen format)";
+
+// This is the simplified game engine/sourceport name
+engine = "zdoom";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to Hexen map format
+include("Includes\\ZDoom_common.cfg", "mapformat_hexen");
+
+// Settings common to Hexen games
+include("Includes\\Game_Hexen.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\Hexen_misc.cfg", "thingsfilters");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Hexen_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "hexen");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_hexen");
+}
diff --git a/Build/Configurations/ZDoom_HexenUDMF.cfg b/Build/Configurations/ZDoom_HexenUDMF.cfg
new file mode 100644
index 0000000..1655292
--- /dev/null
+++ b/Build/Configurations/ZDoom_HexenUDMF.cfg
@@ -0,0 +1,63 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "ZDoom: Hexen (UDMF)";
+
+// This is the simplified game engine/sourceport name
+engine = "zdoom";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to text map format
+include("Includes\\ZDoom_common.cfg", "mapformat_udmf");
+
+// Settings common to Hexen games
+include("Includes\\Game_Hexen.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\ZDoom_misc.cfg", "thingsfilters_udmf");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Hexen_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "hexen");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_hexen");
+}
diff --git a/Build/Configurations/ZDoom_StrifeDoom.cfg b/Build/Configurations/ZDoom_StrifeDoom.cfg
new file mode 100644
index 0000000..9c511ca
--- /dev/null
+++ b/Build/Configurations/ZDoom_StrifeDoom.cfg
@@ -0,0 +1,64 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "ZDoom: Strife (Doom format)";
+
+// This is the simplified game engine/sourceport name
+engine = "zdoom";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to Doom map format
+include("Includes\\ZDoom_common.cfg", "mapformat_doom");
+include("Includes\\Strife_misc.cfg", "mapformat_doom");
+
+// Settings common to Strife games
+include("Includes\\Game_Strife.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\Strife_misc.cfg", "thingsfilters");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Strife_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "strife");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_strife");
+}
diff --git a/Build/Configurations/ZDoom_StrifeHexen.cfg b/Build/Configurations/ZDoom_StrifeHexen.cfg
new file mode 100644
index 0000000..b2524e0
--- /dev/null
+++ b/Build/Configurations/ZDoom_StrifeHexen.cfg
@@ -0,0 +1,63 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "ZDoom: Strife (Hexen format)";
+
+// This is the simplified game engine/sourceport name
+engine = "zdoom";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to Hexen map format
+include("Includes\\ZDoom_common.cfg", "mapformat_hexen");
+
+// Settings common to Strife games
+include("Includes\\Game_Strife.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\Strife_misc.cfg", "thingsfilters");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Strife_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "strife");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_strife");
+}
diff --git a/Build/Configurations/ZDoom_StrifeUDMF.cfg b/Build/Configurations/ZDoom_StrifeUDMF.cfg
new file mode 100644
index 0000000..8c58c86
--- /dev/null
+++ b/Build/Configurations/ZDoom_StrifeUDMF.cfg
@@ -0,0 +1,63 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "ZDoom: Strife (UDMF)";
+
+// This is the simplified game engine/sourceport name
+engine = "zdoom";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to text map format
+include("Includes\\ZDoom_common.cfg", "mapformat_udmf");
+
+// Settings common to Strife games
+include("Includes\\Game_Strife.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\ZDoom_misc.cfg", "thingsfilters_udmf");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Strife_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "strife");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_strife");
+}
diff --git a/Build/Configurations/Zandronum_DoomDoom.cfg b/Build/Configurations/Zandronum_DoomDoom.cfg
new file mode 100644
index 0000000..6637fab
--- /dev/null
+++ b/Build/Configurations/Zandronum_DoomDoom.cfg
@@ -0,0 +1,69 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "Zandronum: Doom 2 (Doom format)";
+
+// This is the simplified game engine/sourceport name
+engine = "zandronum";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to Doom map format
+include("Includes\\ZDoom_common.cfg", "mapformat_doom");
+
+// Settings common to Doom games
+include("Includes\\Game_Doom.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\Doom_misc.cfg", "thingsfilters");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Doom_things.cfg");
+	include("Includes\\Doom2_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "doom");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+	// Additional actors from the engine
+	include("Includes\\Zandronum_things.cfg", "default");
+	include("Includes\\Zandronum_things.cfg", "doom");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_doom");
+	// Additional enums from the engine
+	include("Includes\\Zandronum_misc.cfg", "enums_doom");
+}
diff --git a/Build/Configurations/Zandronum_DoomHexen.cfg b/Build/Configurations/Zandronum_DoomHexen.cfg
new file mode 100644
index 0000000..560c3c3
--- /dev/null
+++ b/Build/Configurations/Zandronum_DoomHexen.cfg
@@ -0,0 +1,73 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "Zandronum: Doom 2 (Hexen format)";
+
+// This is the simplified game engine/sourceport name
+engine = "zandronum";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to Hexen map format
+include("Includes\\ZDoom_common.cfg", "mapformat_hexen");
+include("Includes\\Zandronum_linedefs.cfg");
+
+// mxd. Default script compiler
+defaultscriptcompiler = "zandronum_acs.cfg";
+
+// Settings common to Doom games
+include("Includes\\Game_Doom.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\Doom_misc.cfg", "thingsfilters");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Doom_things.cfg");
+	include("Includes\\Doom2_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "doom");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+	// Additional actors from the engine
+	include("Includes\\Zandronum_things.cfg", "default");
+	include("Includes\\Zandronum_things.cfg", "doom");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_doom");
+	// Additional enums from the engine
+	include("Includes\\Zandronum_misc.cfg", "enums_doom");
+}
diff --git a/Build/Configurations/Zandronum_DoomUDMF.cfg b/Build/Configurations/Zandronum_DoomUDMF.cfg
new file mode 100644
index 0000000..b1374a9
--- /dev/null
+++ b/Build/Configurations/Zandronum_DoomUDMF.cfg
@@ -0,0 +1,78 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "Zandronum: Doom 2 (UDMF)";
+
+// This is the simplified game engine/sourceport name
+engine = "zandronum";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to text map format
+include("Includes\\ZDoom_common.cfg", "mapformat_udmf");
+include("Includes\\Zandronum_linedefs.cfg");
+
+// Enables support for long (> 8 chars) texture names
+// WARNING: this should only be enabled for UDMF game configurations!
+// WARNING: enabling this will make maps incompatible with Doom Builder 2 and can lead to problems in Slade 3!
+longtexturenames = false;
+
+// mxd. Default script compiler
+defaultscriptcompiler = "zandronum_acs.cfg";
+
+// Settings common to Doom games
+include("Includes\\Game_Doom.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\ZDoom_misc.cfg", "thingsfilters_udmf");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Doom_things.cfg");
+	include("Includes\\Doom2_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "doom");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+	// Additional actors from the engine
+	include("Includes\\Zandronum_things.cfg", "default");
+	include("Includes\\Zandronum_things.cfg", "doom");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_doom");
+	// Additional enums from the engine
+	include("Includes\\Zandronum_misc.cfg", "enums_doom");
+}
diff --git a/Build/Configurations/Zandronum_HereticDoom.cfg b/Build/Configurations/Zandronum_HereticDoom.cfg
new file mode 100644
index 0000000..ee7b0af
--- /dev/null
+++ b/Build/Configurations/Zandronum_HereticDoom.cfg
@@ -0,0 +1,69 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "Zandronum: Heretic (Doom format)";
+
+// This is the simplified game engine/sourceport name
+engine = "zandronum";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to Doom map format
+include("Includes\\ZDoom_common.cfg", "mapformat_doom");
+include("Includes\\Heretic_misc.cfg", "mapformat_doom");
+
+// Settings common to Heretic games
+include("Includes\\Game_Heretic.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\Doom_misc.cfg", "thingsfilters");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Heretic_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "heretic");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+	// Additional actors from the engine
+	include("Includes\\Zandronum_things.cfg", "default");
+	include("Includes\\Zandronum_things.cfg", "heretic");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_heretic");
+	// Additional enums from the engine
+	include("Includes\\Zandronum_misc.cfg", "enums_notdoom");
+}
diff --git a/Build/Configurations/Zandronum_HereticHexen.cfg b/Build/Configurations/Zandronum_HereticHexen.cfg
new file mode 100644
index 0000000..a1701fb
--- /dev/null
+++ b/Build/Configurations/Zandronum_HereticHexen.cfg
@@ -0,0 +1,72 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "Zandronum: Heretic (Hexen format)";
+
+// This is the simplified game engine/sourceport name
+engine = "zandronum";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to Hexen map format
+include("Includes\\ZDoom_common.cfg", "mapformat_hexen");
+include("Includes\\Zandronum_linedefs.cfg");
+
+// mxd. Default script compiler
+defaultscriptcompiler = "zandronum_acs.cfg";
+
+// Settings common to Heretic games
+include("Includes\\Game_Heretic.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\Doom_misc.cfg", "thingsfilters");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Heretic_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "heretic");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+	// Additional actors from the engine
+	include("Includes\\Zandronum_things.cfg", "default");
+	include("Includes\\Zandronum_things.cfg", "heretic");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_heretic");
+	// Additional enums from the engine
+	include("Includes\\Zandronum_misc.cfg", "enums_notdoom");
+}
diff --git a/Build/Configurations/Zandronum_HereticUDMF.cfg b/Build/Configurations/Zandronum_HereticUDMF.cfg
new file mode 100644
index 0000000..178ac6a
--- /dev/null
+++ b/Build/Configurations/Zandronum_HereticUDMF.cfg
@@ -0,0 +1,77 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "Zandronum: Heretic (UDMF)";
+
+// This is the simplified game engine/sourceport name
+engine = "zandronum";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to text map format
+include("Includes\\ZDoom_common.cfg", "mapformat_udmf");
+include("Includes\\Zandronum_linedefs.cfg");
+
+// Enables support for long (> 8 chars) texture names
+// WARNING: this should only be enabled for UDMF game configurations!
+// WARNING: enabling this will make maps incompatible with Doom Builder 2 and can lead to problems in Slade 3!
+longtexturenames = false;
+
+// mxd. Default script compiler
+defaultscriptcompiler = "zandronum_acs.cfg";
+
+// Settings common to Heretic games
+include("Includes\\Game_Heretic.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\ZDoom_misc.cfg", "thingsfilters_udmf");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Heretic_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "heretic");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+	// Additional actors from the engine
+	include("Includes\\Zandronum_things.cfg", "default");
+	include("Includes\\Zandronum_things.cfg", "heretic");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_heretic");
+	// Additional enums from the engine
+	include("Includes\\Zandronum_misc.cfg", "enums_notdoom");
+}
diff --git a/Build/Configurations/Zandronum_HexenHexen.cfg b/Build/Configurations/Zandronum_HexenHexen.cfg
new file mode 100644
index 0000000..ce71adf
--- /dev/null
+++ b/Build/Configurations/Zandronum_HexenHexen.cfg
@@ -0,0 +1,72 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "Zandronum: Hexen (Hexen format)";
+
+// This is the simplified game engine/sourceport name
+engine = "zandronum";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to Hexen map format
+include("Includes\\ZDoom_common.cfg", "mapformat_hexen");
+include("Includes\\Zandronum_linedefs.cfg");
+
+// mxd. Default script compiler
+defaultscriptcompiler = "zandronum_acs.cfg";
+
+// Settings common to Hexen games
+include("Includes\\Game_Hexen.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\Hexen_misc.cfg", "thingsfilters");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Hexen_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "hexen");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+	// Additional actors from the engine
+	include("Includes\\Zandronum_things.cfg", "default");
+	include("Includes\\Zandronum_things.cfg", "hexen");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_hexen");
+	// Additional enums from the engine
+	include("Includes\\Zandronum_misc.cfg", "enums_notdoom");
+}
diff --git a/Build/Configurations/Zandronum_HexenUDMF.cfg b/Build/Configurations/Zandronum_HexenUDMF.cfg
new file mode 100644
index 0000000..3122058
--- /dev/null
+++ b/Build/Configurations/Zandronum_HexenUDMF.cfg
@@ -0,0 +1,77 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "Zandronum: Hexen (UDMF)";
+
+// This is the simplified game engine/sourceport name
+engine = "zandronum";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to text map format
+include("Includes\\ZDoom_common.cfg", "mapformat_udmf");
+include("Includes\\Zandronum_linedefs.cfg");
+
+// Enables support for long (> 8 chars) texture names
+// WARNING: this should only be enabled for UDMF game configurations!
+// WARNING: enabling this will make maps incompatible with Doom Builder 2 and can lead to problems in Slade 3!
+longtexturenames = false;
+
+// mxd. Default script compiler
+defaultscriptcompiler = "zandronum_acs.cfg";
+
+// Settings common to Hexen games
+include("Includes\\Game_Hexen.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\ZDoom_misc.cfg", "thingsfilters_udmf");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Hexen_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "hexen");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+	// Additional actors from the engine
+	include("Includes\\Zandronum_things.cfg", "default");
+	include("Includes\\Zandronum_things.cfg", "hexen");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_hexen");
+	// Additional enums from the engine
+	include("Includes\\Zandronum_misc.cfg", "enums_notdoom");
+}
diff --git a/Build/Configurations/Zandronum_StrifeDoom.cfg b/Build/Configurations/Zandronum_StrifeDoom.cfg
new file mode 100644
index 0000000..ef8bbf4
--- /dev/null
+++ b/Build/Configurations/Zandronum_StrifeDoom.cfg
@@ -0,0 +1,69 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "Zandronum: Strife (Doom format)";
+
+// This is the simplified game engine/sourceport name
+engine = "zandronum";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to Doom map format
+include("Includes\\ZDoom_common.cfg", "mapformat_doom");
+include("Includes\\Strife_misc.cfg", "mapformat_doom");
+
+// Settings common to Strife games
+include("Includes\\Game_Strife.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\Strife_misc.cfg", "thingsfilters");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Strife_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "strife");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+	// Additional actors from the engine
+	include("Includes\\Zandronum_things.cfg", "default");
+	include("Includes\\Zandronum_things.cfg", "strife");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_strife");
+	// Additional enums from the engine
+	include("Includes\\Zandronum_misc.cfg", "enums_notdoom");
+}
diff --git a/Build/Configurations/Zandronum_StrifeHexen.cfg b/Build/Configurations/Zandronum_StrifeHexen.cfg
new file mode 100644
index 0000000..13295ac
--- /dev/null
+++ b/Build/Configurations/Zandronum_StrifeHexen.cfg
@@ -0,0 +1,72 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "Zandronum: Strife (Hexen format)";
+
+// This is the simplified game engine/sourceport name
+engine = "zandronum";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to Hexen map format
+include("Includes\\ZDoom_common.cfg", "mapformat_hexen");
+include("Includes\\Zandronum_linedefs.cfg");
+
+// mxd. Default script compiler
+defaultscriptcompiler = "zandronum_acs.cfg";
+
+// Settings common to Strife games
+include("Includes\\Game_Strife.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\Strife_misc.cfg", "thingsfilters");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Strife_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "strife");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+	// Additional actors from the engine
+	include("Includes\\Zandronum_things.cfg", "default");
+	include("Includes\\Zandronum_things.cfg", "strife");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_strife");
+	// Additional enums from the engine
+	include("Includes\\Zandronum_misc.cfg", "enums_notdoom");
+}
diff --git a/Build/Configurations/Zandronum_StrifeUDMF.cfg b/Build/Configurations/Zandronum_StrifeUDMF.cfg
new file mode 100644
index 0000000..842b65a
--- /dev/null
+++ b/Build/Configurations/Zandronum_StrifeUDMF.cfg
@@ -0,0 +1,77 @@
+/*************************************************************\
+  Doom Builder 2 Game Configuration for ZDoom-compatible port
+\*************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "Zandronum: Strife (UDMF)";
+
+// This is the simplified game engine/sourceport name
+engine = "zandronum";
+
+// *******************************************************
+// *                                                     *
+// *   Note: all the elements that could be factorized   *
+// *   because they were common to ZDoom, GZDoom and     *
+// *   Zandronum have been moved to ZDoom_common.cfg.     *
+// *                                                     *
+// *******************************************************
+
+// STANDARD ZDOOM SETTINGS
+// Settings common to all games and all map formats
+include("Includes\\ZDoom_common.cfg", "common");
+
+// Settings common to text map format
+include("Includes\\ZDoom_common.cfg", "mapformat_udmf");
+include("Includes\\Zandronum_linedefs.cfg");
+
+// Enables support for long (> 8 chars) texture names
+// WARNING: this should only be enabled for UDMF game configurations!
+// WARNING: enabling this will make maps incompatible with Doom Builder 2 and can lead to problems in Slade 3!
+longtexturenames = false;
+
+// mxd. Default script compiler
+defaultscriptcompiler = "zandronum_acs.cfg";
+
+// Settings common to Strife games
+include("Includes\\Game_Strife.cfg");
+
+// Default thing filters
+// (these are not required, just useful for new users)
+thingsfilters
+{
+	include("Includes\\ZDoom_misc.cfg", "thingsfilters_udmf");
+}
+
+// THING TYPES
+// Each engine has its own additional thing types
+// Order should always be 1: Game; 2: ZDoom/game; 3: ZDoom/zdoom
+thingtypes
+{
+	// Basic game actors
+	include("Includes\\Strife_things.cfg");
+	// Additional ZDoom actors for that game
+	include("Includes\\ZDoom_things.cfg", "strife");
+	// Standard ZDoom actors
+	include("Includes\\ZDoom_things.cfg", "zdoom");
+	// Additional actors from the engine
+	include("Includes\\Zandronum_things.cfg", "default");
+	include("Includes\\Zandronum_things.cfg", "strife");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Doom_misc.cfg", "enums");
+	// Standard ZDoom enums
+	include("Includes\\ZDoom_misc.cfg", "enums");
+	// Additional ZDoom enums for that game
+	include("Includes\\ZDoom_misc.cfg", "enums_strife");
+	// Additional enums from the engine
+	include("Includes\\Zandronum_misc.cfg", "enums_notdoom");
+}
diff --git a/Build/DevIL.dll b/Build/DevIL.dll
new file mode 100644
index 0000000..b7a4c09
Binary files /dev/null and b/Build/DevIL.dll differ
diff --git a/Build/GPL.txt b/Build/GPL.txt
new file mode 100644
index 0000000..94a9ed0
--- /dev/null
+++ b/Build/GPL.txt
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/Build/GZBuilder.default.cfg b/Build/GZBuilder.default.cfg
new file mode 100644
index 0000000..1db6d90
--- /dev/null
+++ b/Build/GZBuilder.default.cfg
@@ -0,0 +1,264 @@
+
+// NOTE: These are the default program settings!
+// GZDoom Builder will use this file to create the program settings for a new user.
+// Your real settings are in the Local Application data directory
+// Windows XP: C:\Documents and Settings\Username\Local Settings\Application Data\Doom Builder\GZBuilder.cfg
+// Windows Vista or later: C:\Users\Username\AppData\Local\Doom Builder\GZBuilder.cfg
+
+shortcuts
+{
+	builder_closemap = 0;
+	builder_configuration = 117;
+	builder_newmap = 131150;
+	builder_openmap = 131151;
+	builder_scrolleast = 39;
+	builder_scrollnorth = 38;
+	builder_scrollsouth = 40;
+	builder_scrollwest = 37;
+	builder_zoomin = 65530;
+	builder_zoomout = 65531;
+	builder_preferences = 116;
+	builder_savemap = 131155;
+	builder_savemapas = 196691;
+	builder_savemapinto = 458835;
+	builder_mapoptions = 113;
+	builder_reloadresources = 119;
+	builder_cancelmode = 27;
+	builder_gridsetup = 0;
+	builder_undo = 131162;
+	builder_redo = 131161;
+	builder_togglesnap = 0;
+	builder_clearselection = 67;
+	builder_toggleautomerge = 0;
+	builder_centerinscreen = 36;
+	builder_moveleft = 83;
+	builder_moveright = 70;
+	builder_moveforward = 69;
+	builder_movebackward = 68;
+	buildermodes_thingsmode = 84;
+	buildermodes_linedefsmode = 76;
+	buildermodes_verticesmode = 86;
+	buildermodes_sectorsmode = 83;
+	builder_insertvertex = 65622;
+	builder_testmap = 120;
+	builder_acceptmode = 13;
+	builder_classicedit = 2;
+	builder_classicselect = 1;
+	builder_deleteitem = 46;
+	builder_dissolveitem = 8;
+	buildermodes_finishdraw = 2;
+	buildermodes_drawpoint = 1;
+	buildermodes_drawlinesmode = 131140;
+	buildermodes_flipsidedefs = 65606;
+	buildermodes_fliplinedefs = 70;
+	buildermodes_joinsectors = 74;
+	buildermodes_removepoint = 8;
+	buildermodes_mergesectors = 65610;
+	buildermodes_splitlinedefs = 0;
+	buildermodes_visualmode = 87;
+	buildermodes_curvelinesmode = 65603;
+	builder_thingsfilterssetup = 0;
+	builder_insertitem = 45;
+	builder_griddec = 219;
+	builder_gridinc = 221;
+	buildermodes_findmode = 114;
+	buildermodes_makesectormode = 77;
+	buildermodes_editselectionmode = 69;
+	builder_copyselection = 131139;
+	builder_pasteselection = 131158;
+	builder_cutselection = 131160;
+	buildermodes_gradientbrightness = 71;
+	builder_categories = 0;
+	builder_selectgroup6 = 54;
+	builder_selectgroup1 = 49;
+	builder_selectgroup10 = 48;
+	builder_selectgroup7 = 55;
+	builder_selectgroup2 = 50;
+	builder_selectgroup5 = 53;
+	builder_selectgroup8 = 56;
+	builder_selectgroup9 = 57;
+	builder_selectgroup3 = 51;
+	builder_selectgroup4 = 52;
+	builder_assigngroup1 = 131121;
+	builder_assigngroup6 = 131126;
+	builder_assigngroup9 = 131129;
+	builder_assigngroup2 = 131122;
+	builder_assigngroup4 = 131124;
+	builder_assigngroup10 = 131120;
+	builder_assigngroup8 = 131128;
+	builder_assigngroup7 = 131127;
+	builder_assigngroup3 = 131123;
+	builder_assigngroup5 = 131125;
+	buildermodes_makedoor = 65604;
+	builder_pan_view = 32;
+	builder_openscripteditor = 121;
+	builder_viewmodebrightness = 0;
+	builder_testaction = 0;
+	builder_viewmodefloors = 0;
+	builder_viewmodenormal = 0;
+	builder_viewmodeceilings = 0;
+	buildermodes_errorcheckmode = 115;
+	builder_movedoublespeed = 16;
+	builder_visualselect = 1;
+	builder_visualedit = 2;
+	builder_movethingleft = 37;
+	builder_movethingright = 39;
+	builder_movethingfwd = 38;
+	builder_movethingback = 40;
+	buildermodes_raisesector8 = 65530;
+	buildermodes_lowersector8 = 65531;
+	buildermodes_raisesector1 = 131066;
+	buildermodes_lowersector1 = 131067;
+	buildermodes_showvisualthings = 84;
+	buildermodes_movetextureright = 39;
+	buildermodes_movetextureleft = 37;
+	buildermodes_movetextureup = 38;
+	buildermodes_lowerbrightness8 = 196603;
+	buildermodes_raisebrightness8 = 196602;
+	buildermodes_movetexturedown = 40;
+	buildermodes_textureselect = 131074;
+	buildermodes_texturepaste = 4;
+	buildermodes_texturecopy = 131139;
+	buildermodes_visualautoalignx = 65;
+	buildermodes_visualautoaligny = 65601;
+	buildermodes_togglemiddletexture = 77;
+	buildermodes_togglelowerunpegged = 76;
+	buildermodes_toggleupperunpegged = 85;
+	buildermodes_togglegravity = 71;
+	builder_insertpreviousprefab = 80;
+	builder_createprefab = 0;
+	builder_insertprefabfile = 131152;
+	buildermodes_placevisualstart = 131159;
+	buildermodes_togglebrightness = 66;
+	builder_toggleinfopanel = 192;
+	buildermodes_resettexture = 65618;
+	builder_showerrors = 122;
+	buildermodes_pasteproperties = 393302;
+	buildermodes_pastepropertieswithoptions = 196694;
+	buildermodes_floodfilltextures = 65540;
+	buildermodes_copyproperties = 196675;
+	buildermodes_texturepasteoffsets = 65622;
+	buildermodes_movetextureleft8 = 65573;
+	buildermodes_movetextureright8 = 65575;
+	buildermodes_lowerfloor8 = 458747;
+	buildermodes_selectdoublesided = 65586;
+	buildermodes_raisefloor8 = 458746;
+	buildermodes_movetextureup8 = 65574;
+	buildermodes_texturecopyoffsets = 65603;
+	buildermodes_gradientfloors = 131143;
+	buildermodes_selectsinglesided = 65585;
+	buildermodes_gradientceilings = 65607;
+	buildermodes_flipselectionh = 0;
+	buildermodes_raiseceiling8 = 131066;
+	buildermodes_lowerceiling8 = 131067;
+	buildermodes_flipselectionv = 0;
+	buildermodes_movetexturedown8 = 65576;
+	buildermodes_classiccopyproperties = 196675;
+	buildermodes_togglehighlight = 72;
+	buildermodes_classicpasteproperties = 393302;
+	buildermodes_classicpastepropertieswithoptions = 196694;
+	buildermodes_drawrectanglemode = 196676;
+	buildermodes_drawellipsemode = 327748;
+	buildermodes_decreasebevel = 196603;
+	buildermodes_increasesubdivlevel = 131066;
+	buildermodes_increasebevel = 196602;
+	buildermodes_decreasesubdivlevel = 131067;
+	buildermodes_classicpaintselect = 4;
+	builder_movethingfwd = 38;
+	builder_movethingback = 40;
+	builder_movethingright = 39;
+	builder_movethingleft = 37;
+}
+
+
+colors
+{
+	color0 = -16777216;
+	color1 = -11425537;
+	color2 = -1;
+	color3 = -4259937;
+	color4 = -3750145;
+	color5 = -21504;
+	color6 = -49152;
+	color7 = -128;
+	color8 = -12171706;
+	color9 = -13018769;
+	color10 = -16711681;
+	color11 = -24576;
+	color12 = -49152;
+	color13 = -1;
+	color14 = -4144960;
+	color15 = -16777216;
+	color16 = -6908266;
+	color17 = -16753716;
+	color18 = -11366857;
+	color19 = -6671822;
+	color20 = -9868951;
+	color21 = -12490271;
+	color22 = -14513374;
+	color23 = -14634326;
+	color24 = -5103070;
+	color25 = -7077677;
+	color26 = -4684277;
+	color27 = -4144960;
+	color28 = -8355712;
+	color29 = -16728065;
+	color30 = -13447886;
+	color31 = -5247250;
+	color32 = -40121;
+	color33 = -1146130;
+	color34 = -256;
+	color35 = -657931;
+	color36 = -18751;
+	color37 = -29696;
+	color38 = -4343957;
+	color39 = -2448096;
+	color40 = -65536;
+}
+
+
+mainwindow
+{
+	positionx = 150;
+	sizeheight = 572;
+	positiony = 21;
+	windowstate = 2;
+	sizewidth = 739;
+}
+
+
+recentfiles
+{
+}
+
+
+configurations
+{
+}
+
+
+blackbrowsers = false;
+visualfov = 90;
+visualmousesensx = 4f;
+visualmousesensy = 4f;
+visualviewrange = 1000f;
+imagebrightness = 2;
+qualitydisplay = true;
+squarethings = true;
+testmonsters = true;
+doublesidedalpha = 0.5f;
+backgroundalpha = 1f;
+defaultviewmode = 2;
+classicbilinear = false;
+visualbilinear = false;
+mousespeed = 500;
+movespeed = 600;
+viewdistance = 3000f;
+invertyaxis = false;
+scriptfontname = "Lucida Console";
+scriptfontsize = 10;
+scriptfontbold = false;
+scriptontop = true;
+previewimagesize = 1;
+autoscrollspeed = 0;
+showerrorswindow = true;
diff --git a/Build/Plugins/Loadorder.cfg b/Build/Plugins/Loadorder.cfg
new file mode 100644
index 0000000..1970eda
--- /dev/null
+++ b/Build/Plugins/Loadorder.cfg
@@ -0,0 +1,24 @@
+// This file allows you to enforce the order in which plugins are loaded.
+// This may be important for some plugins as they require their functions to
+// be called before or after those of others.
+//
+// Simply list the filenames here in the order they should be loaded. Any files
+// in this directory that are not on this list will be loaded last.
+//
+// Example:
+//
+// loadorder
+// {
+//     BuilderModes.dll;
+//     ZDoomEditing.dll;
+//     FancyFlatFlipper.dll;
+// }
+//
+//
+
+
+loadorder
+{
+	BuilderModes.dll;
+}
+
diff --git a/Build/Scintilla.dll b/Build/Scintilla.dll
new file mode 100644
index 0000000..c5c6879
Binary files /dev/null and b/Build/Scintilla.dll differ
diff --git a/Build/Scripting/BCS.cfg b/Build/Scripting/BCS.cfg
new file mode 100644
index 0000000..f121a7f
--- /dev/null
+++ b/Build/Scripting/BCS.cfg
@@ -0,0 +1,1176 @@
+/*******************************************************************\
+	Doom Builder Script highlighting definitions for BCS
+\*******************************************************************/
+
+// Compiler settings
+compiler = "bcc";
+parameters = "-I \"%PT\" -I \"%PS\" %FI %FO";
+resultlump = "BEHAVIOR";
+
+// Editor settings
+description = "BCS script";
+codepage = 0;
+extensions = "bcs";
+casesensitive = false;
+insertcase = 0;				// 0=Normal, 1=Lowercase, 2=Uppercase
+lexer = 35;					// CPP-style, case-insensitive
+functionopen = "(";
+functionclose = ")";
+argumentdelimiter = ",";
+terminator = ";";
+keywordhelp = "http://www.zdoom.org/wiki/index.php?title=%K";
+snippetsdir = "acs";
+scripttype = 1; //0 = unknown script, 1 = acc, 2 = modeldef, 3 = decorate
+
+keywords
+{
+	enum = "Enumeration";
+  struct = "Structure";
+  region = "A code region block";
+  goto = "Goto statement";
+  upmost = "The upmost region";
+  #Define = "#Define identifier expression";
+	#EncryptStrings = "#EncryptStrings";
+	#Import = "#Import";
+	#Include = "#Include";
+	#LibDefine = "#LibDefine identifier expression";
+	#Library = "#Library";
+	#NoCompact = "#NoCompact";
+	#NoWadAuthor = "#NoWadAuthor";
+	#WadAuthor = "#WadAuthor";
+	ACS_Execute = "ACS_Execute(script, map, arg1, arg2, arg3)";
+	ACS_ExecuteAlways = "ACS_ExecuteAlways(script, map, arg1, arg2, arg3)";
+	ACS_ExecuteWait = "void ACS_ExecuteWait(int script, int unused, int arg1, int arg2, int arg3)";
+	ACS_ExecuteWithResult = "ACS_ExecuteWithResult(script, arg1, arg2, arg3)";
+	ACS_LockedExecute = "ACS_LockedExecute(script, map, arg1, arg2, lock)";
+	ACS_LockedExecuteDoor = "ACS_LockedExecuteDoor(script, map, arg1, arg2, lock)";
+	ACS_NamedExecute = "bool ACS_NamedExecute(str script, int map, int arg1, int arg2, int arg3)";
+	ACS_NamedExecuteAlways = "bool ACS_NamedExecuteAlways(str script, int map, int arg1, int arg2, int arg3)";
+	ACS_NamedExecuteWait = "void ACS_NamedExecuteWait(str script, int unused, int arg1, int arg2, int arg3)";
+	ACS_NamedExecuteWithResult = "int ACS_NamedExecuteWithResult(str script, int arg1, int arg2, int arg3, int arg4)";
+	ACS_NamedLockedExecute = "bool ACS_NamedLockedExecute(str script, int map, int arg1, int arg2, int lock)";
+	ACS_NamedLockedExecuteDoor = "bool ACS_NamedLockedExecuteDoor(str script, int map, int arg1, int arg2, int lock)";
+	ACS_NamedSuspend = "bool ACS_NamedSuspend(str script, int map)";
+	ACS_NamedTerminate = "bool ACS_NamedTerminate(str script, int map)";
+	ACS_Suspend = "ACS_Suspend(script, map)";
+	ACS_Terminate = "ACS_Terminate(script, map)";
+	ActivatorSound = "void ActivatorSound(str sound, int volume)";
+	ActivatorTID = "int ActivatorTID(void)";
+	AmbientSound = "void AmbientSound(str sound, int volume)";
+	AnnouncerSound = "void AnnouncerSound(str sound, int flags)";
+	Autosave = "Autosave()";
+	BlueCount = "BlueCount()";
+	BlueReturn = "Script expression BlueReturn";
+	BlueScore = "BlueScore()";
+	BlueTeamCount = "BlueTeamCount()";
+	BlueTeamScore = "BlueTeamScore()";
+	Bool = "Bool expression";
+	Break = "Break";
+	CancelFade = "void CancelFade(void)\nIf either FadeTo or FadeRange is currently in progress,\nCancelFade stops it and turns off the palette flash.";
+	Case = "Case expression";
+	Ceiling_CrushAndRaise = "Ceiling_CrushAndRaise(tag, speed, crush, crushmode)";
+	Ceiling_CrushAndRaiseA = "Ceiling_CrushAndRaiseA(tag, dspeed, uspeed, crush, crushmode)";
+	Ceiling_CrushAndRaiseDist = "Ceiling_CrushAndRaiseDist(tag, dist, speed, damage, crushmode)";
+	Ceiling_CrushAndRaiseSilentA = "Ceiling_CrushAndRaiseSilentA(tag, dspeed, uspeed, crush, crushmode)";
+	Ceiling_CrushRaiseAndStay = "Ceiling_CrushRaiseAndStay(tag, speed, crush, crushmode)";
+	Ceiling_CrushRaiseAndStayA = "Ceiling_CrushRaiseAndStayA(tag, dspeed, uspeed, crush, crushmode)";
+	Ceiling_CrushRaiseAndStaySilA = "Ceiling_CrushRaiseAndStaySilA(tag, dspeed, uspeed, crush, crushmode)";
+	Ceiling_CrushStop = "Ceiling_CrushStop(tag)";
+	Ceiling_LowerAndCrush = "Ceiling_LowerAndCrush(tag, speed, crush, crushmode)";
+	Ceiling_LowerAndCrushDist = "Ceiling_LowerAndCrushDist(tag, speed, crush, dist, crushmode)";
+	Ceiling_LowerByValue = "Ceiling_LowerByValue(tag, speed, height)";
+	Ceiling_LowerByValueTimes8 = "Ceiling_LowerByValueTimes8(tag, speed, height)";
+	Ceiling_LowerInstant = "Ceiling_LowerInstant(tag, unused, height)";
+	Ceiling_LowerToFloor = "Ceiling_LowerToFloor(tag, speed)";
+	Ceiling_LowerToHighestFloor = "Ceiling_LowerToHighestFloor(tag, speed)";
+	Ceiling_LowerToLowest = "Ceiling_LowerToLowest(tag, speed)";
+	Ceiling_MoveToValue = "Ceiling_MoveToValue(tag, speed, height, neg)";
+	Ceiling_MoveToValueTimes8 = "Ceiling_MoveToValueTimes8(tag, speed, height, neg)";
+	Ceiling_RaiseByValue = "Ceiling_RaiseByValue(tag, speed, height)";
+	Ceiling_RaiseByValueTimes8 = "Ceiling_RaiseByValueTimes8(tag, speed, height)";
+	Ceiling_RaiseInstant = "Ceiling_RaiseInstant(tag, unused, height)";
+	Ceiling_RaiseToNearest = "Ceiling_RaiseToNearest(tag, speed)";
+	Ceiling_Waggle = "Ceiling_Waggle(tag, amp, freq, offset, time)";
+	ChangeActorAngle = "ChangeActorAngle(int tid, fixed angle [, bool interpolate = false])\nSets the angle for the actors with the specified tid.\nIf tid is 0, it sets the angle for the activator of the script.\nangle: a fixed point angle in the range of 0.0 to 1.0 (N = 0.25, W = 0.5, S = 0.75, E = 1.0).";
+	ChangeActorPitch = "ChangeActorPitch(int tid, fixed pitch [, bool interpolate = false])\nSets the pitch for the actors with the specified tid. If tid is 0, it sets the pitch for the activator of the script.\npitch: a fixed point angle in the range of 0.0 to 1.0.";
+	ChangeCamera = "ChangeCamera(tid, who, revert)";
+	ChangeCeiling = "void ChangeCeiling(int tag, str flatname)";
+	ChangeFloor = "void ChangeFloor(int tag, str flatname)";
+	ChangeLevel = "void ChangeLevel(str mapname, int position, int flags [, int skill])\nChanges to a new map, places the player at the specified start spot, and optionally changes the skill level at the same time.";
+	ChangeSkill = "ChangeSkill(skill)";
+	ChangeSky = "void ChangeSky(str sky1, str sky2)\nChanges the sky texture to sky1 and the second sky texture to sky2.\nBoth textures must be the same height if doublesky is enabled.\nYou may also use any flat, pname, sprite or internal graphic (such as TITLEPIC) in place of an actual texture.\nUseful in conjunction with SetSkyScrollSpeed.";
+	CheckActorCeilingTexture = "bool CheckActorCeilingTexture(int tid, str texture)";
+	CheckActorClass = "bool CheckActorClass(int tid, str class)";
+	CheckActorFloorTexture = "bool CheckActorFloorTexture(int tid, str texture)";
+	CheckActorInventory = "int CheckActorInventory(int tid, str inventory_item)\nChecks the given actor's inventory for the item specified by inventory_item";
+	CheckActorProperty = "bool CheckActorProperty(int tid, int property, [int|float|str] value)";
+	CheckFlag = "bool CheckFlag(int tid, str flag)\nChecks to see if the actor with the matching tid has the specified actor flag set.\nIf tid is 0, the check is performed on the activator of the script.";
+	CheckFont = "bool CheckFont(str fontname)";
+	CheckInventory = "int CheckInventory(str inventory_item)\nChecks the inventory of the actor who activated the script for the item specified by inventory_item";
+	CheckPlayerCamera = "int CheckPlayerCamera(int player)";
+	CheckSight = "bool CheckSight(int source, int dest, int flags)";
+	CheckWeapon = "bool CheckWeapon(str weapon)\nChecks if player's active weapon is the weapon with specified class name.";
+	ClassifyActor = "int ClassifyActor(int tid)";
+	ClearActorInventory = "void ClearActorInventory(int tid)\nThis function clears the specified actor's inventory.";
+	ClearForceField = "ClearForceField(tag)";
+	ClearInventory = "void ClearInventory(void)\nClears the player's inventory of weapons, ammo, armor and usable items.";
+	ClearLineSpecial = "void ClearLineSpecial(void)\nClears the special of the line that activated the script.";
+	ConsoleCommand = "void ConsoleCommand (str command)";
+	Const = "Const";
+	Continue = "Continue";
+	cos = "fixed Cos(int angle)";
+	CreateTranslation = "void CreateTranslation(int transnumber, a:b=c:d, ...)";
+	DamageThing = "DamageThing(amount, mod)";
+	Death = "Script expression Death";
+	Default = "Default:";
+	Delay = "void Delay(int tics)";
+	Disconnect = "Disconnect script expression";
+	Do = "Do";
+	Door_Animated = "Door_Animated(tag, speed, delay, lock)";
+	Door_Close = "Door_Close(tag, speed, lighttag)";
+	Door_CloseWaitOpen = "Door_CloseWaitOpen(tag, speed, delay, lighttag)";
+	Door_LockedRaise = "Door_LockedRaise(tag, speed, delay, lock, lighttag)";
+	Door_Open = "Door_Open(tag, speed, lighttag)";
+	Door_Raise = "Door_Raise(tag, speed, delay, lighttag)";
+	DropItem = "int DropItem(int tid, str item [, int dropamount = -1 [, int chance = 256]])\nCauses actors with the matching tid to drop the specified item.\nIf tid is 0, the activator of the script is considered to be the dropper of the item.\nThis works in a similar way to the DropItem actor property.\nThe return value of the function is the number of dropped items.";
+	Elevator_LowerToNearest = "Elevator_LowerToNearest(tag, speed)";
+	Elevator_MoveToFloor = "Elevator_MoveToFloor(tag, speed)";
+	Elevator_RaiseToNearest = "Elevator_RaiseToNearest(tag, speed)";
+	Else = "Else";
+	Enter = "Script expression Enter";
+	Exit_Normal = "Exit_Normal(pos)";
+	Exit_Secret = "Exit_Secret(pos)";
+	FadeRange = "void FadeRange (int red1, int green1, int blue1, fixed amount1, int red2, int green2, int blue2, fixed amount2, fixed seconds)\nSets the current flash to the first color set and then fades it to the second color set over the specified number of seconds.";
+	FadeTo = "void FadeTo (int red, int green, int blue, fixed amount, fixed seconds)\nFades the activator's view from the current palette flash to another one.\nThis will also work if the activator is looking through another viewpoint (using a camera, etc.).";
+	FixedDiv = "fixed FixedDiv(int a, int b)";
+	FixedMul = "fixed FixedMul(int a, int b)";
+	FixedSqrt = "fixed FixedSqrt(fixed number)";
+	Floor_CrushStop = "Floor_CrushStop(tag)";
+	Floor_Donut = "Floor_Donut(ptag, pspeed, sspeed)";
+	Floor_LowerByValue = "Floor_LowerByValue(tag, speed, height)";
+	Floor_LowerByValueTimes8 = "Floor_LowerByValueTimes8(tag, speed, height)";
+	Floor_LowerInstant = "Floor_LowerInstant(tag, unused, height)";
+	Floor_LowerToHighest = "Floor_LowerToHighest(tag, speed, adjust, force_adjust)";
+	Floor_LowerToLowest = "Floor_LowerToLowest(tag, speed)";
+	Floor_LowerToLowestTxTy = "Floor_LowerToLowestTxTy(tag, speed)";
+	Floor_LowerToNearest = "Floor_LowerToNearest(tag, speed)";
+	Floor_MoveToValue = "Floor_MoveToValue(tag, speed, height, neg)";
+	Floor_MoveToValueTimes8 = "Floor_MoveToValueTimes8(tag, speed, height, neg)";
+	Floor_RaiseAndCrush = "Floor_RaiseAndCrush(tag, speed, crush, crushmode)";
+	Floor_RaiseAndCrushDoom = "Floor_RaiseAndCrushDoom(tag, speed, crush, crushmode)";
+	Floor_RaiseByTexture = "Floor_RaiseByTexture(tag, speed)";
+	Floor_RaiseByValue = "Floor_RaiseByValue(tag, speed, height)";
+	Floor_RaiseByValueTimes8 = "Floor_RaiseByValueTimes8(tag, speed, height)";
+	Floor_RaiseByValueTxTy = "Floor_RaiseByValueTxTy(tag, speed, height)";
+	Floor_RaiseInstant = "Floor_RaiseInstant(tag, unused, height)";
+	Floor_RaiseToHighest = "Floor_RaiseToHighest(tag, speed)";
+	Floor_RaiseToLowestCeiling = "Floor_RaiseToLowestCeiling(tag, speed)";
+	Floor_RaiseToNearest = "Floor_RaiseToNearest(tag, speed)";
+	Floor_TransferNumeric = "Floor_TransferNumeric(tag)";
+	Floor_TransferTrigger = "Floor_TransferTrigger(tag)";
+	Floor_Waggle = "Floor_Waggle(tag, amp, freq, offset, time)";
+	FloorAndCeiling_LowerByValue = "FloorAndCeiling_LowerByValue(tag, speed, height)";
+	FloorAndCeiling_LowerRaise = "FloorAndCeiling_LowerRaise(tag, fspeed, cspeed, boomemu)";
+	FloorAndCeiling_RaiseByValue = "FloorAndCeiling_RaiseByValue(tag, speed, height)";
+	For = "For(initialization, condition, iteration)";
+	ForceField = "ForceField()";
+	FS_Execute = "FS_Execute(script, side, keynum, message)";
+	Function = "Function Void expression (Void)";
+	GameSkill = "int GameSkill(void)";
+	GameType = "int GameType(void)";
+	Generic_Ceiling = "Generic_Ceiling(tag, speed, height, target, flag)";
+	Generic_Crusher = "Generic_Crusher(tag, dspeed, uspeed, silent, crush)";
+	Generic_Crusher2 = "Generic_Crusher2(tag, dspeed, uspeed, silent, crush)";
+	Generic_Door = "Generic_Door(tag, speed, kind, delay, lock)";
+	Generic_Floor = "Generic_Floor(tag, speed, height, target, flags)";
+	Generic_Lift = "Generic_Lift(tag, speed, delay, type, height)";
+	Generic_Stairs = "Generic_Stairs(tag, speed, height, flags, reset)";
+	GetActorAngle = "fixed GetActorAngle(int tid)";
+	GetActorCeilingZ = "fixed GetActorCeilingZ(int tid)";
+	GetActorClass = "str GetActorClass(int tid)";
+	GetActorFloorZ = "fixed GetActorFloorZ(int tid)";
+	GetActorLightLevel = "int GetActorLightLevel(int tid)";
+	GetActorPitch = "fixed GetActorPitch(int tid)";
+	GetActorPowerupTics = "int GetActorPowerupTics(int tid, str powerup)";
+	GetActorProperty = "int GetActorProperty(int tid, int property)";
+	GetActorVelX = "fixed GetActorVelX(int tid)";
+	GetActorVelY = "fixed GetActorVelY(int tid)";
+	GetActorVelZ = "fixed GetActorVelZ(int tid)";
+	GetActorViewHeight = "fixed GetActorViewHeight(int tid)";
+	GetActorX = "fixed GetActorX(int tid)";
+	GetActorY = "fixed GetActorY(int tid)";
+	GetActorZ = "fixed GetActorZ(int tid)";
+	GetAirSupply = "int GetAirSupply(int playernum)";
+	GetAmmoCapacity = "int GetAmmoCapacity(str classname)";
+	GetArmorType = "int GetArmorType(str armortype, int playernum)";
+	GetChar = "int GetChar(str string, int index)";
+	GetCVar = "int GetCVar(str cvar)";
+	GetCVarString = "str GetCVarString(str cvar)";
+	GetInvasionState = "GetInvasionState()";
+	GetInvasionWave = "GetInvasionWave()";
+	GetLevelInfo = "int GetLevelInfo(int levelinfo)";
+	GetLineActivation = "int GetLineActivation(int lineid)\nlineid: The id of the line of which to get the activation flags.\nReturns SPAC flags as a bitfield";
+	GetLineRowOffset = "int GetLineRowOffset(void)";
+	GetLineUDMFFixed = "fixed GetLineUDMFFixed(int lineid, str key)";
+	GetLineUDMFInt = "int GetLineUDMFInt(int lineid, str key)";
+	GetPlayerInfo = "int GetPlayerInfo(int playernumber, int playerinfo)";
+	GetPlayerInput = "int GetPlayerInput(int player, int input)";
+	GetPolyobjX = "fixed GetPolyobjX(int polyid)";
+	GetPolyobjY = "fixed GetPolyobjY(int polyid)";
+	GetScreenHeight = "int GetScreenHeight(void)";
+	GetScreenWidth = "int GetScreenWidth(void)";
+	GetSectorCeilingZ = "int GetSectorCeilingZ(int tag, int x, int y)";
+	GetSectorFloorZ = "fixed GetSectorFloorZ(int tag, int x, int y)";
+	GetSectorLightLevel = "int GetSectorLightLevel(int tag)";
+	GetSectorUDMFFixed = "fixed GetSectorUDMFFixed(int tag, str key)";
+	GetSectorUDMFInt = "int GetSectorUDMFInt(int tag, str key)";
+	GetSideUDMFFixed = "fixed GetSideUDMFFixed(int lineid, bool side, str key)";
+	GetSideUDMFInt = "int GetSideUDMFInt(int lineid, bool side, str key)";
+	GetSigilPieces = "int GetSigilPieces (void)\nReturns the number of Sigil pieces that are held by the player";
+	GetThingUDMFFixed = "fixed GetThingUDMFFixed(int thingid, str key)";
+	GetThingUDMFInt = "int GetThingUDMFInt(int thingid, str key)";
+	GetUserArray = "void GetUserArray(int tid, str name, int pos)";
+	GetUserCVar = "int GetUserCVar(int playernumber, str cvar)";
+	GetUserCVarString = "str GetUserCVarString(int playernumber, str cvar)";
+	GetUserVariable = "int GetUserVariable(int tid, str name)";
+	GetWeapon = "str GetWeapon (void)\nReturns the class name of the weapon currently equipped by the player as a string";
+	GiveActorInventory = "void GiveActorInventory(int tid, str inventory_item, int amount)\nThis function will give the amount of items to the specifed actor.\nThis function does not treat tid 0 as the activator of the script";
+	GiveInventory = "void GiveInventory(str inventory_item, int amount)\nThis function will give the number of items specified to the activator.";
+	GlassBreak = "GlassBreak(dontspawnjunk)";
+	Global = "Global Int expression:identifier";
+	HealThing = "HealThing(amount)";
+	HudMessage = "void hudmessage(text; int type, int id, int color, fixed x, fixed y, fixed holdTime)";
+	HudMessageBold = "void HudMessageBold(text; int type, int id, int color, fixed x, fixed y, fixed holdTime)";
+	If = "If(expression)";
+	Int = "Int expression";
+	IsMultiplayer = "int IsMultiplayer(void)";
+	IsOneFlagCTF = "int IsOneFlagCTF(void)";
+	IsTIDUsed = "bool IsTIDUsed (int tid)";
+	Light_ChangeToValue = "Light_ChangeToValue(tag, value)";
+	Light_Fade = "Light_Fade(tag, value, tics)";
+	Light_Flicker = "Light_Flicker(tag, upper, lower)";
+	Light_ForceLightning = "Light_ForceLightning(mode)";
+	Light_Glow = "Light_Glow(tag, upper, lower, tics)";
+	Light_LowerByValue = "Light_LowerByValue(tag, value)";
+	Light_MaxNeighbor = "Light_MaxNeighbor(tag)";
+	Light_MinNeighbor = "Light_MinNeighbor(tag)";
+	Light_RaiseByValue = "Light_RaiseByValue(tag, value)";
+	Light_Stop = "Light_Stop(tag)";
+	Light_Strobe = "Light_Strobe(tag, upper, lower, u-tics, l-tics)";
+	Light_StrobeDoom = "Light_StrobeDoom(tag, u-tics, l-tics)";
+	Lightning = "Script expression Lightning";
+	LineAttack = "LineAttack(int tid, fixed angle, fixed pitch, int damage [, str pufftype = 'BulletPuff' [, str damagetype = 'None' [, fixed range = 2048 [, int flags = 0]]]])\nFires a hitscan attack. If tid is 0, the activator of the script is the source of the attack.";
+	Line_AlignCeiling = "Line_AlignCeiling(lineid, side)";
+	Line_AlignFloor = "Line_AlignFloor(lineid, side)";
+	Line_SetBlocking = "Line_SetBlocking(lineid, setflags, clearflags)";
+	Line_SetTextureOffset = "Line_SetTextureOffset(lineid, x, y, side, flags)";
+	Line_SetTextureScale = "Line_SetTextureScale(lineid, x, y, side, flags)";
+	LineSide = "int LineSide(void)";
+	LocalAmbientSound = "void LocalAmbientSound(str sound, int volume)";
+	LocalSetMusic = "void LocalSetMusic (str song [, int order [, int unused]])";
+	Log = "void Log(type:expression)\nLog will print something in the log area of the screen (top left), as well as logging it to the console.\nIt uses the same parameter format as the Print function.";
+	MorphActor = "int MorphActor(int tid, [str playerclass, [str monsterclass, [int duration, [int style, [str morphflash, [str unmorphflash]]]]]])";
+	Music_Change = "void Music_Change(str music, int pattern)";
+	NamedScriptWait = "void NamedScriptWait(str script)";
+	Net = "Script expression Net";
+	NoiseAlert = "NoiseAlert(target_tid, emiter_tid)";
+	Open = "Script expression Open";
+	Pickup = "Script expression Pickup";
+	Pillar_Build = "Pillar_Build(tag, speed, height)";
+	Pillar_BuildAndCrush = "Pillar_BuildAndCrush(tag, speed, height, crush, crushmode)";
+	Pillar_Open = "Pillar_Open(tag, speed, fdist, cdist)";
+	Plat_DownByValue = "Plat_DownByValue(tag, speed, delay, height)";
+	Plat_DownWaitUpStay = "Plat_DownWaitUpStay(tag, speed, delay)";
+	Plat_DownWaitUpStayLip = "Plat_DownWaitUpStayLip(tag, speed, delay, lip, sound)";
+	Plat_PerpetualRaise = "Plat_PerpetualRaise(tag, speed, delay)";
+	Plat_PerpetualRaiseLip = "Plat_PerpetualRaiseLip(tag, speed, delay, lip)";
+	Plat_RaiseAndStayTx0 = "Plat_RaiseAndStayTx0(tag, speed, lockout)";
+	Plat_Stop = "Plat_Stop(tag)";
+	Plat_ToggleCeiling = "Plat_ToggleCeiling(tag)";
+	Plat_UpByValue = "Plat_UpByValue(tag, speed, delay, height)";
+	Plat_UpByValueStayTx = "Plat_UpByValueStayTx(tag, speed, height)";
+	Plat_UpNearestWaitDownStay = "Plat_UpNearestWaitDownStay(tag, speed, delay)";
+	Plat_UpWaitDownStay = "Plat_UpWaitDownStay(tag, speed, delay)";
+	PlayActorSound = "void PlayActorSound(int tid, int sound, int channel, fixed volume, bool looping, fixed attenuation)";
+	Player_SetTeam = "Player_SetTeam(team)";
+	PlayerArmorpoints = "int PlayerArmorpoints(void)";
+	PlayerClass = "int PlayerClass(int playernumber)";
+	PlayerCount = "int PlayerCount(void)\nReturns the number of players currently in the game";
+	PlayerFrags = "int PlayerFrags(void)";
+	PlayerHealth = "int PlayerHealth(void)";
+	PlayerInGame = "bool PlayerInGame(int playernumber)\nReturns true if the player [0..7] is in the game";
+	PlayerIsBot = "bool PlayerIsBot(int playernumber)\nReturns TRUE if the player [0..7] is a bot and FALSE if not";
+	PlayerNumber = "int PlayerNumber(void)\nReturns the player number for the player who activated the script, starting at 0.\nFor scripts that were not activated by a player, PlayerNumber will return -1.";
+	PlayerTeam = "int PlayerTeam(void)";
+	PlayMovie = "PlayMovie(moviename)";
+	PlaySound = "void PlaySound(int tid, str sound, int channel, fixed volume, bool looping, fixed attenuation)";
+	Polyobj_DoorSlide = "Polyobj_DoorSlide(po, speed, angle, dist, delay)";
+	Polyobj_DoorSwing = "Polyobj_DoorSwing(po, speed, angle, delay)";
+	Polyobj_Move = "Polyobj_Move(po, speed, angle, dist)";
+	Polyobj_MoveTimes8 = "Polyobj_MoveTimes8(po, speed, angle, dist)";
+	Polyobj_MoveTo = "Polyobj_MoveTo(po, speed, pos_x, pos_y)";
+	Polyobj_MoveToSpot = "Polyobj_MoveToSpot(po, speed, target)";
+	Polyobj_OR_Move = "Polyobj_OR_Move(po, speed, angle, distance)";
+	Polyobj_OR_MoveTimes8 = "Polyobj_OR_MoveTimes8(po, speed, angle, distance)";
+	Polyobj_OR_MoveTo = "Polyobj_OR_MoveTo(po, speed, pos_x, pos_y)";
+	Polyobj_OR_MoveToSpot = "Polyobj_OR_MoveToSpot(po, speed, target)";
+	Polyobj_OR_RotateLeft = "Polyobj_OR_RotateLeft(po, speed, angle)";
+	Polyobj_OR_RotateRight = "Polyobj_OR_RotateRight(po, speed, angle)";
+	Polyobj_RotateLeft = "Polyobj_RotateLeft(po, speed, angle)";
+	Polyobj_RotateRight = "Polyobj_RotateRight(po, speed, angle)";
+	Polyobj_Stop = "Polyobj_Stop(po)";
+	PolyWait = "void PolyWait(int polyid)";
+	Print = "void Print(type:expression)\nPrint will print something to the screen.\nPrint will only display for the activator of the script\nFor printing to all players, use PrintBold.";
+	PrintBold = "void PrintBold(type:expression)\nThis is exactly the same as Print, except all players will see the printed text\non the screen instead of just the activator of the script.";
+	Radius_Quake = "Radius_Quake(intensity, duration, damrad, tremrad, tid)";
+	Radius_Quake2 = "void Radius_Quake2(int tid, int intensity, int duration, int damrad, int tremrad, str sound)";
+	Random = "int Random(int min, int max)";
+	RedCount = "RedCount()";
+	RedReturn = "Script expression RedReturn";
+	RedScore = "RedScore()";
+	RedTeamCount = "RedTeamCount()";
+	RedTeamScore = "RedTeamScore()";
+	ReplaceTextures = "void ReplaceTextures(str oldtexturename, str newtexturename [, int flags])\nReplaces all occurences of oldtexturename with newtexturename.\nNOT_ flags can be used.";
+	Respawn = "Script expression Respawn";
+	Restart = "Restart";
+	Return = "Return";
+	Script = "Script expression";
+	ScriptWait = "void ScriptWait(int script)";
+	Scroll_Ceiling = "Scroll_Ceiling(tag, x-move, y-move, unused)";
+	Scroll_Floor = "Scroll_Floor(tag, x-move, y-move, type)";
+	Scroll_Texture_Both = "Scroll_Texture_Both(lineid, left, right, down, up)";
+	Scroll_Wall = "Scroll_Wall(lineid, x, y, side, flags)";
+	Sector_ChangeFlags = "Sector_ChangeFlags(tag, setflags, clearflags)";
+	Sector_ChangeSound = "Sector_ChangeSound(tag, newsequence)";
+	Sector_SetCeilingPanning = "Sector_SetCeilingPanning(tag, u-int, u-frac, v-int, v-frac)";
+	Sector_SetCeilingScale = "Sector_SetCeilingScale(tag, u-int, u-frac, v-int, v-frac)";
+	Sector_SetCeilingScale2 = "Sector_SetCeilingScale2(tag, u-fixed, v-fixed)";
+	Sector_SetColor = "Sector_SetColor(tag, red, green, blue, desaturation)";
+	Sector_SetCurrent = "Sector_SetCurrent(tag, amount, angle, useline)";
+	Sector_SetDamage = "Sector_SetDamage(tag, amount, mod)";
+	Sector_SetFade = "Sector_SetFade(tag, red, green, blue)";
+	Sector_SetFloorPanning = "Sector_SetFloorPanning(tag, u-int, u-frac, v-int, v-frac)";
+	Sector_SetFloorScale = "Sector_SetFloorScale(tag, u-int, u-frac, v-int, v-frac)";
+	Sector_SetFloorScale2 = "Sector_SetFloorScale2(tag, u-fixed, v-fixed)";
+	Sector_SetFriction = "Sector_SetFriction(tag, amount)";
+	Sector_SetGravity = "Sector_SetGravity(tag, ipart, fpart)";
+	Sector_SetLink = "Sector_SetLink(controltag, tag, surface, movetype)";
+	Sector_SetPlaneReflection = "Sector_SetPlaneReflection(tag, floor, ceiling)";
+	Sector_SetRotation = "Sector_SetRotation(tag, floor-angle, ceiling-angle)";
+	Sector_SetTranslucent = "Sector_SetTranslucent(tag, plane, amount, type)";
+	Sector_SetWind = "Sector_SetWind(tag, amount, angle, useline)";
+	SectorDamage = "void SectorDamage(int tag, int amount, str type, str protection_item, int flags)\nDoes the damage only when the function is called,\nand damages everything in the tagged sector.\nUses DAMAGE_ flags.";
+	SectorSound = "void SectorSound(str sound, int volume)";
+	SendToCommunicator = "SendToCommunicator(voc_id, front_only, indentify, nolog)";
+	SetActivator = "int SetActivator(int tid[, int pointer_selector])\nThis changes the activator of the script to the first actor found with the specified tid.\ntid: TID of the new activator.\npointer_selector: the pointer of the TID to set as the new activator (use AAPTR_ flags).";
+	SetActivatorToTarget = "bool SetActivatorToTarget(int tid)\nThis changes the activator of the script to the current target\nof the first actor found with the specified tid.\nUsing a tid of 0 uses the current activator's target.";
+	SetActorAngle = "void SetActorAngle(int tid, fixed angle)\nSets the actor's angle.\nangle: a fixed point angle in the range of 0.0 to 1.0 (N = 0.25, W = 0.5, S = 0.75, E = 1.0).";
+	SetActorPitch = "void SetActorPitch(int tid, int pitch)\nSets the actor's Pitch.\npitch: a fixed point angle in the range of 0.0 to 1.0.";
+	SetActorPosition = "bool SetActorPosition(int tid, fixed x, fixed y, fixed z, bool fog)\nThis function sets the x, y, and z coordinates of the specified actor, with or without teleport fog.\nReturns TRUE if the actor position was changed successfully.";
+	SetActorProperty = "void SetActorProperty(int tid, int property, [int|float|str] value)\nproperty: one of the APROP_ properties.";
+	SetActorState = "int SetActorState(int tid, str statename [, bool exact])\nForces the actor(s) with the matching tid into the specified state, as defined in Decorate.\nIf tid is 0, the activator is affected.\nThe exact parameter specifies whether or not partial state name matches are accepted.";
+	SetActorVelocity = "bool SetActorVelocity(int tid, fixed velx, fixed vely, fixed velz, bool add, bool setbob)\nChanges actor velocity.\ntid: TID of things to affect. If 0, the activator is used.\nvelx, vely, velz: The desired velocity for the affected things.\nadd: If true, each affected actor's velocity is modified by the velx, vely\nand velz parameters, rather than replaced by them.\nsetbob: If true, the speed adjustment influences the bobbing of any concerned player actor.";
+	SetAirControl = "void SetAirControl(fixed amount)\nSets how well the player can move while in the air.\nThe default amount is 0.00390625.";
+	SetAirSupply = "bool SetAirSupply(int playernum, int tics)\nSets the amount of tics remaining in a player's air supply.";
+	SetAmmoCapacity = "void SetAmmoCapacity(str typename, int maxamount)\nSets the maximum amount of a type of ammo the player can carry.";
+	SetCameraToTexture = "void SetCameraToTexture(int cameratid, str texturename, int fov)\nBinds the named texture to the specified camera\n(which does not have to be an actual camera thing).\nThe texture used must be defined as a “cameratexture” in the ANIMDEFS lump.";
+	SetCeilingTrigger = "void SetCeilingTrigger(int tag, int height, int special [, int arg1 [, int arg2 [, int arg3 [, int arg4 [, int arg5]]]]])\nWhen the ceiling specified by tag moves the specified height,\nspecial(arg1, arg2, arg3, arg4, arg5) will be activated.";
+	SetCVar = "bool SetCVar(str cvar, int value)\nSets the value of a particular console variable.\nOnly mod-defined console variables through CVARINFO can be changed by using this function.\nReturns FALSE if cvar is invalid, or it is not writable.";
+	SetCVarString = "bool SetCVarString(str cvar, str value)\nSets the value of a particular console variable.\nOnly mod-defined console variables through CVARINFO can be changed by using this function.\nReturns FALSE if cvar is invalid, or it is not writable.";
+	SetFloorTrigger = "SetFloorTrigger(tag, height, special, arg1, arg2, arg3, arg4, arg5)";
+	SetFont = "void SetFont(str fontlump)\nSets the current font (only within the script) to fontlump";
+	SetGlobalFogParameter = "SetGlobalFogParameter(property, value)";
+	SetGravity = "void SetGravity(fixed amount)\nThis function sets the global gravity of an entire level.\nDefault is 800.0";
+	SetHUDClipRect = "void SetHUDClipRect(int x, int y, int width, int height [, int wrapwidth])\nSets the clipping rectangle for future HUD messages.";
+	SetHudSize = "void SetHudSize(int width, int height, bool statusbar)\nCauses text messages to be stretched or shrunk to match the size\nthey would appear if the user's resolution was width by height.";
+	SetHUDWrapWidth = "void SetHudWrapWidth(int wrapwidth)\nSets the wrapping width for future HUD messages without altering the clipping rectangle.\nIf you set the wrapping width to 0, messages will wrap\nto the full width of the HUD, as normal.";
+	SetLineActivation = "void SetLineActivation(int lineid, int activation)\nSets the line activation flags of the line with the specified id.\nlineid: The id of the line of which to set the activation flags\nactivation: SPAC_ flags to set. Multiple flags can be set by using the pipe character | between the constant names.";
+	SetLineBlocking = "void SetLineBlocking (int lineid, int setting)\nDEPRECATED!\nUse Line_SetBlocking instead!";
+	SetLineMonsterBlocking = "void SetLineMonsterBlocking(int lineid, int setting)\nDEPRECATED!\nUse Line_SetBlocking instead!";
+	SetLineSpecial = "void SetLineSpecial(int lineid, int special [, int arg0 [, int arg1 [, int arg2 [, int arg3 [, int arg4]]]]])\nSetLineSpecial will change the special on all lines with the line id number specified.";
+	SetLineTexture = "void SetLineTexture(int lineid, int line_side, int sidedef_texture, str texturename)\nSetLineTexture will change the specified texture on all lines with the line id number specified\nline_side: SIDE_ flags can be used.\nsidedef_texture: TEXTURE_ flags can be used.\ntexturename: the texture that will be set on the line. Use '-' to remove a texture.";
+	SetMarineSprite = "void SetMarineSprite(int tid, str actorclass)\nChanges a Scripted Marine's sprite to match the sprite\nused in the specified actor's spawn state.";
+	SetMarineWeapon = "void SetMarineWeapon(int tid, int weapon)\nSets a Scripted Marine's weapon on the fly.\nweapon: one of MARINEWEAPON_ flags";
+	SetMugShotState = "void SetMugShotState(str state)\nSets the state of the mug shot in SBARINFO status bars.\nThe state you set will only be interrupted by damage or if the player\npicks up a weapon, provided the mugshot supports it.";
+	SetMusic = "void SetMusic(str song [, int order [, int unused]])";
+	SetPlayerProperty = "SetPlayerProperty(who, set, which)";
+	SetPointer = "bool SetPointer(int assign_slot, int tid[, int pointer_selector[, int flags]])\nSet the value of one of the caller's stored pointers.";
+	SetResultValue = "void SetResultValue(int value)";
+	SetSkyScrollSpeed = "void SetSkyScrollSpeed(int sky, fixed skyspeed)\nChanges the scrolling speed of a sky.\nThis is useful in conjunction with ChangeSky.\nsky: either 1 or 2.\nskyspeed: the desired scrolling speed.";
+	SetThingSpecial = "void SetThingSpecial(int tid, int special [, int arg0 [, int arg1 [, int arg2 [, int arg3 [, int arg4]]]]])\nSets the special for any things with the same TID.\nThis is similar to Thing_SetSpecial, except it can only be used from ACS,\nand it can set all of a thing's special arguments.\nIf tid is 0, then the activator is used.";
+	SetUserArray = "void SetUserArray(int tid, str name, int pos, int value)\nSets one of the affected actor's user array-bound variables.";
+	SetUserCVar = "bool SetUserCVar(int playernumber, str cvar, int value)\nSets the console variable of a particular player.\nOnly mod-defined console variables through CVARINFO can be changed by using this function.\nReturns FALSE if cvar is invalid, it is not writable, or the player doesn't exist.";
+	SetUserCVarString = "bool SetUserCVarString(int playernumber, str cvar, str value)\nSets the console variable of a particular player.\nOnly mod-defined console variables through CVARINFO can be changed by using this function.\nReturns FALSE if cvar is invalid, it is not writable, or the player doesn't exist.";
+	SetUserVariable = "void SetUserVariable(int tid, str name, int value)\nSets one of the affected actor's user variables.";
+	SetWeapon = "bool SetWeapon(str weaponname)\nSets the player's current weapon to weaponname.\nReturns TRUE if the weapon was set successfully, and FALSE if not.";
+	sin = "fixed Sin(int angle)";
+	SinglePlayer = "int SinglePlayer(void)";
+	SoundSequence = "void SoundSequence(str sndseq)\nPlays a sound sequence defined in SNDSEQ lump.";
+	SoundSequenceOnActor = "void SoundSequenceOnActor(int tid, str sndseq)\nPlays a sound sequence defined in SNDSEQ lump.";
+	SoundSequenceOnPolyObj = "void SoundSequenceOnPolyobj(int polynum, str sndseq)\nPlays a sound sequence defined in SNDSEQ lump.";
+	SoundSequenceOnSector = "void SoundSequenceOnSector(int tag, str sndseq, int location)\nPlays a sound sequence defined in SNDSEQ lump.";
+	SoundVolume = "void SoundVolume(int tid, int channel, fixed volume)\nChanges the volume of the currently playing sound by the actor(s) with the specified tid.\nIf tid is 0, the sound volume change is done to the sound being played by the activator of the script.";
+	Spawn = "int Spawn(str classname, fixed x, fixed y, fixed z [, int tid [, int angle]])\nSpawns an actor at the given X, Y and Z coordinates.\nOptionally a TID and a byte angle can be specified.";
+	SpawnForced = "int SpawnForced(str classname, fixed x, fixed y, fixed z [, int tid [, int angle]])\nForces the actor to spawn, even in conditions where the spawning would normally fail.\nThe return value is the number of things spawned.";
+	SpawnDecal = "int SpawnDecal(int tid, str decalname, int flags [, fixed angle = 0.0 [, fixed zoffset = 0.0 [, fixed distance = 64.0]]])\nCreates a decal on a wall by tracing a line from the actor with the\nspecified tid until hitting said wall, on which the decal is then created.\nIf tid is 0, the tracing is done from the activator of the script.\ndecalname: The name of the decal to create, as defined in DECALDEF.\nflags: use SDF_ flags\nThe return value of the function is the number of decals spawned.";
+	SpawnProjectile = "void SpawnProjectile(int tid, string type, int angle, int speed, int vspeed, int gravity, int newtid)";
+	SpawnSpot = "int SpawnSpot(str classname, int spottid [, int tid [, int angle]])\nRequires a MapSpot at the location where you want the Actor to spawn.\nThe return value is the number of things spawned.";
+	SpawnSpotFacing = "int SpawnSpotFacing(str classname, int spottid [, int tid])\nRequires a MapSpot at the location where you want the Actor to spawn.\nThe thing will assume the angle of the mapspot it is spawned to.\nThe return value is the number of things spawned.";
+	SpawnSpotFacingForced = "int SpawnSpotFacingForced(str classname, int spottid [, int tid])\nRequires a MapSpot at the location where you want the Actor to spawn.\nForces the actor to spawn, even in conditions where the spawning would normally fail.\nThe thing will assume the angle of the mapspot it is spawned to.\nThe return value is the number of things spawned.";
+	SpawnSpotForced = "int SpawnSpotForced(str classname, int spottid [, int tid [, int angle]])\nRequires a MapSpot at the location where you want the Actor to spawn.\nForces the actor to spawn, even in conditions where the spawning would normally fail.\nThe return value is the number of things spawned.";
+	Special = "Special";
+	Sqrt = "int Sqrt(int number)";
+	Stairs_BuildDown = "Stairs_BuildDown(tag, speed, height, delay, reset)";
+	Stairs_BuildDownSync = "Stairs_BuildDownSync(tag, speed, height, reset)";
+	Stairs_BuildUp = "Stairs_BuildUp(tag, speed, height, delay, reset)";
+	Stairs_BuildUpDoom = "Stairs_BuildUpDoom(tag, speed, height, delay, reset)";
+	Stairs_BuildUpSync = "Stairs_BuildUpSync(tag, speed, height, reset)";
+	StartConversation = "StartConversation(talker_tid, facetalker)";
+	StopSound = "void StopSound(int tid, int channel)\nStops the sound currently playing on the specified channel for the actor with matching tid";
+	str = "Str expression";
+	StrCmp = "int StrCmp(str string1, str string2 [, int maxcomparenum])\nCompares the two strings passed in arguments string1 and string2 character by character.\nIf maxcomparenum is specified, it only compares up to maxcomparenum characters of each string.";
+	StrCpy = "bool StrCpy(a:destination, string source [, int source_index])\nCopy a source string to a destination array as a series of characters.\nOptionally, the copy can start from a given index in the source string.\nReturns TRUE if the entire string (or substring) was successfully copied to the array;\nFALSE if the copy ran out of room or if a negative source_index was given.";
+	StrIcmp = "int StrCmp(str string1, str string2 [, int maxcomparenum])\nStrIcmp is case-insensitive version of StrCmp";
+	StrLeft = "str StrLeft(str string, int length)\nCreates a new string containing the length first characters of string.\nIf string does not exist, an empty string is returned.\nIf string is shorter than length characters, the entire string is returned."; 
+	StrLen = "int StrLen(str string)";
+	StrMid = "str StrMid(str string, int start, int length)\nCreates a new string containing the length characters of string starting from the one at position start.\nIf string does not exist or is shorter than start characters, an empty string is returned. \nIf string is shorter than start + length characters, the entire substring beginning at start is returned."; 
+	StrParam = "int StrParam(type:expression)\nStrParam will create a new string formatted based upon the same method for Print or Log.\nThe return value is the string table index of the new string.";
+	StrRight = "str StrRight(str string, int length)\nCreates a new string containing the length last characters of string.\nIf string does not exist, an empty string is returned.\nIf string is shorter than length characters, the entire string is returned."; 
+	Suspend = "Suspend";
+	Switch = "Switch(expression)";
+	TagWait = "void TagWait(int tag)";
+	TakeActorInventory = "void TakeActorInventory(int tid, str inventory_item, int amount)\nThis function will take the amount of items from the specified actor.\nTakeActorInventory can remove items that are flagged as undroppable.";
+	TakeInventory = "void TakeInventory(str inventory_item, int amount)\nThis function will take the number of items specified from the activator.\nTakeInventory can remove items that are flagged as undroppable.";
+	Team_GivePoints = "Team_GivePoints(team, points, announce)";
+	Team_Score = "Team_Score(points, nogrin)";
+	Teleport = "Teleport(tid, tag, nosourcefog)";
+	Teleport_EndGame = "Teleport_EndGame()";
+	Teleport_NewMap = "Teleport_NewMap(map, pos, face)";
+	Teleport_NoFog = "Teleport_NoFog(tid, useangle, tag)";
+	Teleport_NoStop = "Teleport_NoStop(tid, tag, nofog)";
+	Teleport_ZombieChanger = "Teleport_ZombieChanger(tid, tag)";
+	TeleportGroup = "TeleportGroup(groupid, sourceid, destinationid, movesource, fog)";
+	TeleportInSector = "TeleportInSector(tag, sourceid, destinationid, fog, groupid)";
+	TeleportOther = "TeleportOther(tid, destinationid, fog)";
+	Terminate = "Terminate";
+	Thing_Activate = "Thing_Activate(tid)";
+	Thing_ChangeTID = "Thing_ChangeTID(oldtid, newtid)";
+	Thing_Damage = "Thing_Damage(tid, amount, mod)";
+	Thing_Damage2 = "int Thing_Damage2 (int tid, int amount, str type)\nDamages the specified actor.\nDamage type is specified by name.";
+	Thing_Deactivate = "Thing_Deactivate(tid)";
+	Thing_Destroy = "Thing_Destroy(tid, extreme, tag)";
+	Thing_Hate = "Thing_Hate(hater, hatee, type)";
+	Thing_Move = "Thing_Move(tid, destid, nofog)";
+	Thing_Projectile = "Thing_Projectile(tid, type, angle, speed, vspeed)";
+	Thing_Projectile2 = "void Thing_Projectile2(int tid, int type, int angle, int speed, int vspeed, int gravity, int newtid)";
+	Thing_ProjectileAimed = "Thing_ProjectileAimed(tid, type, speed, target, newtid)";
+	Thing_ProjectileGravity = "Thing_ProjectileGravity(tid, type, angle, speed, vspeed)";
+	Thing_ProjectileIntercept = "Thing_ProjectileIntercept(tid, type, speed, target, newtid)";
+	Thing_Raise = "Thing_Raise(tid)";
+	Thing_Remove = "Thing_Remove(tid)";
+	Thing_SetConversation = "Thing_SetConversation(tid, conversationid)";
+	Thing_SetGoal = "Thing_SetGoal(tid, goal, delay, dontchasetarget)";
+	Thing_SetSpecial = "Thing_SetSpecial(tid, special, arg1, arg2, arg3)";
+	Thing_SetTranslation = "Thing_SetTranslation(tid, translation)";
+	Thing_Spawn = "Thing_Spawn(tid, type, angle, newtid)";
+	Thing_SpawnFacing = "Thing_SpawnFacing(tid, type, nofog, newtid)";
+	Thing_SpawnNoFog = "Thing_SpawnNoFog(tid, type, angle, newtid)";
+	Thing_Stop = "Thing_Stop(tid)";
+	ThingCount = "int ThingCount(int type, int tid)";
+	ThingCountName = "int ThingCountName(str classname, int tid)";
+	ThingCountNameSector = "int ThingCountNameSector(str classname, int tid, int tag)";
+	ThingCountSector = "int ThingCountSector(int type, int tid, int tag)";
+	ThingSound = "void ThingSound(int tid, str sound, int volume)\nPlays a sound at a thing.\nThis is a point sound, so anyone far away will not hear it as loudly";
+	ThrustThing = "ThrustThing(angle, force, nolimit, tid)";
+	ThrustThingZ = "ThrustThingZ(tid, speed, up_or_down, add_or_set)";
+	Timer = "int Timer(void)";
+	TranslucentLine = "TranslucentLine(lineid, amount, additive, moreflags)";
+	UniqueTID = "int UniqueTID([int tid [, int limit]])";
+	Unloading = "Script expression Unloading";
+	UnMorphActor = "int UnMorphActor (int tid[, bool force])";
+	Until = "Until(expression)";
+	UseActorInventory = "int UseActorInventory (int tid, str classname)\nForces the actor(s) with the specified tid to use an item from their inventory, if they have one.\nReturns TRUE if the item was used successfully.";
+	UseInventory = "int UseInventory (str classname)\nForces the activator to use the specified inventory item, if he has it.\nReturns TRUE if the item was used successfully.";
+	UsePuzzleItem = "UsePuzzleItem(item, script, arg1, arg2, arg3)";
+	VectorAngle = "fixed VectorAngle(int x, int y)";
+	VectorLength = "int VectorLength(int x, int y)";
+	Void = "Void";
+	While = "While(expression)";
+	WhiteReturn = "Script expression WhiteReturn";
+	World = "World Int expression:identifier";
+}
+
+constants
+{
+	AAPTR_DEFAULT;
+	AAPTR_FRIENDPLAYER;
+	AAPTR_MASTER;
+	AAPTR_NULL;
+	AAPTR_PLAYER_GETCONVERSATION;
+	AAPTR_PLAYER_GETTARGET;
+	AAPTR_PLAYER1;
+	AAPTR_PLAYER2;
+	AAPTR_PLAYER3;
+	AAPTR_PLAYER4;
+	AAPTR_PLAYER5;
+	AAPTR_PLAYER6;
+	AAPTR_PLAYER7;
+	AAPTR_PLAYER8;
+	AAPTR_TARGET;
+	AAPTR_TRACER;
+	ACTOR_ALIVE;
+	ACTOR_BOT;
+	ACTOR_DEAD;
+	ACTOR_GENERIC;
+	ACTOR_MISSILE;
+	ACTOR_MONSTER;
+	ACTOR_NONE;
+	ACTOR_PLAYER;
+	ACTOR_VOODOODOLL;
+	ACTOR_WORLD;
+	APROP_Accuracy;
+	APROP_ActiveSound;
+	APROP_Alpha;
+	APROP_Ambush;
+	APROP_AttackSound;
+	APROP_AttackZOffset;
+	APROP_ChaseGoal;
+	APROP_Damage;
+	APROP_DamageFactor;
+	APROP_DeathSound;
+	APROP_Dormant;
+	APROP_Dropped;
+	APROP_Friendly;
+	APROP_Frightened;
+	APROP_Gravity;
+	APROP_Health;
+	APROP_Height;
+	APROP_Invulnerable;
+	APROP_JumpZ;
+	APROP_Mass;
+	APROP_MasterTID;
+	APROP_MeleeRange;
+	APROP_NameTag;
+	APROP_NoTarget;
+	APROP_NoTrigger;
+	APROP_PainSound;
+	APROP_Radius;
+	APROP_RenderStyle;
+	APROP_ScaleX;
+	APROP_ScaleY;
+	APROP_Score;
+	APROP_SeeSound;
+	APROP_SpawnHealth;
+	APROP_Species;
+	APROP_Speed;
+	APROP_Stamina;
+	APROP_TargetTID;
+	APROP_TracerTID;
+	APROP_ViewHeight;
+	APROP_Waterlevel;
+	ATTN_IDLE;
+	ATTN_NONE;
+	ATTN_NORM;
+	ATTN_STATIC;
+	BLOCK_CREATURES;
+	BLOCK_EVERYTHING;
+	BLOCK_NOTHING;
+	BLOCK_PLAYERS;
+	BLOCK_RAILING;
+	BLOCKF_CREATURES;
+	BLOCKF_EVERYTHING;
+	BLOCKF_FLOATERS;
+	BLOCKF_HITSCAN;
+	BLOCKF_MONSTERS;
+	BLOCKF_PLAYERS;
+	BLOCKF_PROJECTILES;
+	BLOCKF_RAILING;
+	BLOCKF_SIGHT;
+	BLOCKF_USE;
+	BT_ALTATTACK;
+	BT_ATTACK;
+	BT_BACK;
+	BT_CROUCH;
+	BT_FORWARD;
+	BT_JUMP;
+	BT_LEFT;
+	BT_LOOKDOWN;
+	BT_LOOKUP;
+	BT_MOVEDOWN;
+	BT_MOVELEFT;
+	BT_MOVERIGHT;
+	BT_MOVEUP;
+	BT_RELOAD;
+	BT_RIGHT;
+	BT_SHOWSCORES;
+	BT_SPEED;
+	BT_STRAFE;
+	BT_TURN180;
+	BT_USE;
+	BT_USER1;
+	BT_USER2;
+	BT_USER3;
+	BT_USER4;
+	BT_ZOOM;
+	CARRY;
+	CHAN_AUTO;
+	CHAN_BODY;
+	CHAN_ITEM;
+	CHAN_LISTENERZ;
+	CHAN_MAYBE_LOCAL;
+	CHAN_NOPAUSE;
+	CHAN_UI;
+	CHAN_VOICE;
+	CHAN_WEAPON;
+	CHANGELEVEL_KEEPFACING;
+	CHANGELEVEL_NOINTERMISSION;
+	CHANGELEVEL_NOMONSTERS;
+	CHANGELEVEL_PRERAISEWEAPON;
+	CHANGELEVEL_RESETHEALTH;
+	CHANGELEVEL_RESETINVENTORY;
+	CLASS_CLERIC;
+	CLASS_FIGHTER;
+	CLASS_MAGE;
+	CR_BLACK;
+	CR_BLUE;
+	CR_BRICK;
+	CR_BROWN;
+	CR_CREAM;
+	CR_CYAN;
+	CR_DARKBROWN;
+	CR_DARKGRAY;
+	CR_DARKGREEN;
+	CR_DARKGREY;
+	CR_DARKRED;
+	CR_GOLD;
+	CR_GRAY;
+	CR_GREEN;
+	CR_GREY;
+	CR_LIGHTBLUE;
+	CR_OLIVE;
+	CR_ORANGE;
+	CR_PURPLE;
+	CR_RED;
+	CR_TAN;
+	CR_UNTRANSLATED;
+	CR_WHITE;
+	CR_YELLOW;
+	CSF_NOBLOCKALL;
+	CSF_NOFAKEFLOORS;
+	DAMAGE_IN_AIR;
+	DAMAGE_NONPLAYERS;
+	DAMAGE_PLAYERS;
+	DAMAGE_SUBCLASSES_PROTECT;
+	FALSE;
+	FHF_NORANDOMPUFFZ;
+	FOGP_DENSITY;
+	FOGP_OUTSIDEDENSITY;
+	FOGP_SKYFOG;
+	GAME_NET_COOPERATIVE;
+	GAME_NET_DEATHMATCH;
+	GAME_SINGLE_PLAYER;
+	GAME_TITLE_MAP;
+	HUDMSG_ADDBLEND;
+	HUDMSG_ALPHA;
+	HUDMSG_COLORSTRING;
+	HUDMSG_FADEINOUT;
+	HUDMSG_FADEOUT;
+	HUDMSG_LAYER_OVERHUD;
+	HUDMSG_LAYER_OVERMAP;
+	HUDMSG_LAYER_UNDERHUD;
+	HUDMSG_LOG;
+	HUDMSG_NOTWITH3DVIEW;
+	HUDMSG_NOTWITHFULLMAP;
+	HUDMSG_NOTWITHOVERLAYMAP;
+	HUDMSG_NOWRAP;
+	HUDMSG_PLAIN;
+	HUDMSG_TYPEON;
+	INPUT_BUTTONS;
+	INPUT_FORWARDMOVE;
+	INPUT_OLDBUTTONS;
+	INPUT_PITCH;
+	INPUT_ROLL;
+	INPUT_SIDEMOVE;
+	INPUT_UPMOVE;
+	INPUT_YAW;
+	IS_BOSSFIGHT;
+	IS_COUNTDOWN;
+	IS_FIRSTCOUNTDOWN;
+	IS_INPROGRESS;
+	IS_WAITINGFORPLAYERS;
+	IS_WAVECOMPLETE;
+	LEVELINFO_CLUSTERNUM;
+	LEVELINFO_FOUND_ITEMS;
+	LEVELINFO_FOUND_SECRETS;
+	LEVELINFO_KILLED_MONSTERS;
+	LEVELINFO_LEVELNUM;
+	LEVELINFO_PAR_TIME;
+	LEVELINFO_SUCK_TIME;
+	LEVELINFO_TOTAL_ITEMS;
+	LEVELINFO_TOTAL_MONSTERS;
+	LEVELINFO_TOTAL_SECRETS;
+	LINE_BACK;
+	LINE_FRONT;
+	MARINEWEAPON_BerserkFist;
+	MARINEWEAPON_BFG;
+	MARINEWEAPON_Chaingun;
+	MARINEWEAPON_Chainsaw;
+	MARINEWEAPON_Dummy;
+	MARINEWEAPON_Fist;
+	MARINEWEAPON_Pistol;
+	MARINEWEAPON_PlasmaRifle;
+	MARINEWEAPON_Railgun;
+	MARINEWEAPON_RocketLauncher;
+	MARINEWEAPON_Shotgun;
+	MARINEWEAPON_SuperShotgun;
+	MOD_BFG_SPLASH;
+	MOD_CRUSH;
+	MOD_DISINTEGRATE;
+	MOD_ELECTRIC;
+	MOD_EXIT;
+	MOD_FALLING;
+	MOD_HIT;
+	MOD_ICE;
+	MOD_LAVA;
+	MOD_POISON;
+	MOD_RAILGUN;
+	MOD_SLIME;
+	MOD_SUICIDE;
+	MOD_TELEFRAG;
+	MOD_UNKNOWN;
+	MOD_WATER;
+	MODINPUT_BUTTONS;
+	MODINPUT_FORWARDMOVE;
+	MODINPUT_OLDBUTTONS;
+	MODINPUT_PITCH;
+	MODINPUT_ROLL;
+	MODINPUT_SIDEMOVE;
+	MODINPUT_UPMOVE;
+	MODINPUT_YAW;
+	MOVIE_Failed;
+	MOVIE_Played;
+	MOVIE_Played_Aborted;
+	MOVIE_Played_NoVideo;
+	MRF_ADDSTAMINA;
+	MRF_FAILNOLAUGH;
+	MRF_FAILNOTELEFRAG;
+	MRF_FULLHEALTH;
+	MRF_LOSEACTUALWEAPON;
+	MRF_NEWTIDBEHAVIOUR;
+	MRF_OLDEFFECTS;
+	MRF_UNDOBYCHAOSDEVICE;
+	MRF_UNDOBYDEATH;
+	MRF_UNDOBYDEATHFORCED;
+	MRF_UNDOBYDEATHSAVES;
+	MRF_UNDOBYTOMEOFPOWER;
+	MRF_WHENINVULNERABLE;
+	NO;
+	NO_CHANGE;
+	NO_TEAM;
+	NOT_BOTTOM;
+	NOT_CEILING;
+	NOT_FLOOR;
+	NOT_MIDDLE;
+	NOT_TOP;
+	OFF;
+	ON;
+	PLAYERINFO_AIMDIST;
+	PLAYERINFO_COLOR;
+	PLAYERINFO_DESIREDFOV;
+	PLAYERINFO_FOV;
+	PLAYERINFO_GENDER;
+	PLAYERINFO_MOVEBOB;
+	PLAYERINFO_NEVERSWITCH;
+	PLAYERINFO_PLAYERCLASS;
+	PLAYERINFO_STILLBOB;
+	PLAYERINFO_TEAM;
+	PRINTNAME_LEVEL;
+	PRINTNAME_LEVELNAME;
+	PRINTNAME_SKILL;
+	PROP_ALLMAP;
+	PROP_BUDDHA;
+	PROP_FLIGHT;
+	PROP_FLY;
+	PROP_FROZEN;
+	PROP_INFRARED;
+	PROP_INSTANTWEAPONSWITCH;
+	PROP_INVISIBILITY;
+	PROP_INVULNERABILITY;
+	PROP_NOTARGET;
+	PROP_RADIATIONSUIT;
+	PROP_SPEED;
+	PROP_STRENGTH;
+	PROP_TOTALLYFROZEN;
+	PROP_WEAPONLEVEL2;
+	PTROP_NOSAFEGUARDS;
+	PTROP_UNSAFEMASTER;
+	PTROP_UNSAFETARGET;
+	SCROLL;
+	SCROLL_AND_CARRY;
+	SDF_ABSANGLE;
+	SDF_PERMANENT;
+	SECF_FLOORDROP;
+	SECF_NOFALLINGDAMAGE;
+	SECF_NORESPAWN;
+	SECF_SILENT;
+	SECSEQ_CEILING;
+	SECSEQ_FLOOR;
+	SECSEQ_FULLHEIGHT;
+	SECSEQ_INTERIOR;
+	SIDE_BACK;
+	SIDE_FRONT;
+	SKILL_EASY;
+	SKILL_HARD;
+	SKILL_NORMAL;
+	SKILL_VERY_EASY;
+	SKILL_VERY_HARD;
+	SPAC_None;
+	SPAC_Cross;
+	SPAC_Use;
+	SPAC_MCross;
+	SPAC_Impact;
+	SPAC_Push;
+	SPAC_PCross;
+	SPAC_UseThrough;
+	SPAC_AnyCross;
+	SPAC_MUse;
+	SPAC_MPush;
+	SPAC_UseBack;
+	STYLE_Add;
+	STYLE_Fuzzy;
+	STYLE_None;
+	STYLE_Normal;
+	STYLE_OptFuzzy;
+	STYLE_Shaded;
+	STYLE_SoulTrans;
+	STYLE_Stencil;
+	STYLE_Translucent;
+	STYLE_TranslucentStencil;
+	T_ABADDON;
+	T_ABADDONSHOT;
+	T_AMMOBOX;
+	T_AMULETOFWARDING;
+	T_ANTIGRAVBELT;
+	T_ARACHNOTRON;
+	T_ARACHNOTRONPLASMA;
+	T_ARMORBONUS;
+	T_ARROW;
+	T_AXEKEY;
+	T_BACKPACK;
+	T_BARON;
+	T_BARONBALL;
+	T_BARREL;
+	T_BATTERY;
+	T_BEAST;
+	T_BEASTBALL;
+	T_BELPHEGOR;
+	T_BERSERK;
+	T_BFG;
+	T_BFG10000;
+	T_BFG10KSHOT;
+	T_BFGSHOT;
+	T_BISHOP;
+	T_BLADE;
+	T_BLASTER;
+	T_BLOOD;
+	T_BLOODDEMON;
+	T_BLOODPOOL;
+	T_BLOODPOOL1;
+	T_BLOODPOOL2;
+	T_BLUEARMOR;
+	T_BLUEFLAG;
+	T_BLUEKEY;
+	T_BLUEKEYCARD;
+	T_BLUESKULLKEY;
+	T_BLUETELEGLITTER;
+	T_BOUNCYMACEBALL;
+	T_BRAINS;
+	T_BRIDGE;
+	T_CACODEMON;
+	T_CACODEMONSHOT;
+	T_CACOLANTERN;
+	T_CACOLANTERNSHOT;
+	T_CELL;
+	T_CENTAUR;
+	T_CENTAUR_MASH;
+	T_CENTAURLEADER;
+	T_CHAINGUN;
+	T_CHAINGUY;
+	T_CHAINSAW;
+	T_CHICKEN;
+  T_CLERICHOLY1;
+  T_CLERICHOLY2;
+  T_CLERICHOLY3;
+  T_CLERICSTAFF;
+  T_CLINK;
+  T_CLIP;
+  T_COMPUTERMAP;
+  T_CROSSBOW;
+  T_CROSSBOWMAINBLAST;
+  T_CROSSBOWMINIBLAST;
+  T_CROSSBOWPOWERBLAST;
+  T_CYBERDEMON;
+  T_DARKIMP;
+  T_DARKIMPFIREBALL;
+  T_DART;
+  T_DEATHBALL;
+  T_DEMON;
+  T_DEMON_MASH;
+  T_DEMON1;
+  T_DEMON2_MASH;
+  T_DIRT1;
+  T_DIRT2;
+  T_DIRT3;
+  T_DIRT4;
+  T_DIRT5;
+  T_DIRT6;
+  T_DOOMSPHERE;
+  T_DRAGONSKINBRACERS;
+  T_DRAIN;
+  T_DSPARILALONE;
+  T_DSPARILBLUESHOT;
+  T_DSPARILONSERPENT;
+  T_DSPARILTELEPORTDEST;
+  T_DSPARILWIZARDSPAWNER;
+  T_EMERALDKEY;
+  T_ETTIN;
+  T_ETTIN_MASH;
+  T_FALCONSHIELD;
+  T_FEATHER;
+  T_FIGHTERAXE;
+  T_FIGHTERHAMMER;
+  T_FIGHTERSWORD1;
+  T_FIGHTERSWORD2;
+  T_FIGHTERSWORD3;
+  T_FIREBALL1;
+  T_FIREGARGOYLE;
+  T_FIREKEY;
+  T_FLAME_LARGE;
+  T_FLAME_SMALL;
+  T_FLAMINGBARREL;
+  T_FLESH_DRIP1;
+  T_FLESH_DRIP2;
+  T_GAUNTLETS;
+  T_GREENARMOR;
+  T_GREENKEY;
+  T_GRENADE;
+  T_GRENADELAUNCHER;
+  T_GUTS;
+  T_HASTE;
+  T_HEALTHBONUS;
+  T_HEAVYMACEBALL;
+  T_HECTEBUS;
+  T_HEFTYBLASTERAMMO;
+  T_HEFTYCROSSBOWAMMO;
+  T_HEFTYMACEAMMO;
+  T_HEFTYPHOENIXRODAMMO;
+  T_HEFTYSKULLRODAMMO;
+  T_HEFTYWANDAMMO;
+  T_HELLKNIGHT;
+  T_HIGHJUMP;
+  T_HORNKEY;
+  T_ICEGOLEM;
+  T_ICESHARD;
+  T_IMP;
+  T_IMPFIREBALL;
+  T_IMPLEADER;
+  T_INFRAGOGGLES;
+  T_INFRATRACKER;
+  T_INVISIBILITY;
+  T_INVULNERABILITY;
+  T_IRONFEET;
+  T_IRONLICH;
+  T_IRONLICHBLUESHOT;
+  T_ITEMALLMAP;
+  T_ITEMBAGOFHOLDING;
+  T_ITEMBOOSTMANA;
+  T_ITEMBOOTS;
+  T_ITEMEGG;
+  T_ITEMFLECHETTE;
+  T_ITEMFLIGHT;
+  T_ITEMHEALTHFLASH;
+  T_ITEMHEALTHFLASK;
+  T_ITEMHEALTHFULL;
+  T_ITEMHEALTHPOTION;
+  T_ITEMINVISIBILITY;
+  T_ITEMINVULNERABILITY;
+  T_ITEMPORK;
+  T_ITEMREPULSION;
+  T_ITEMSUMMON;
+  T_ITEMTELEPORT;
+  T_ITEMTIMEBOMB;
+  T_ITEMTOME;
+  T_ITEMTORCH;
+  T_ITEMTPORTOTHER;
+  T_KNIGHT;
+  T_KNIGHTAXE;
+  T_KNIGHTBLOODAXE;
+  T_KNIGHTGHOST;
+  T_LIGHTAMP;
+  T_LOSTSOUL;
+  T_MACE;
+  T_MACEKEY;
+  T_MAGESHARDS;
+  T_MAGESTAFF1;
+  T_MAGESTAFF2;
+  T_MAGESTAFF3;
+  T_MANA1;
+  T_MANA2;
+  T_MANA3;
+  T_MANCUBUS;
+  T_MANCUBUSSHOT;
+  T_MAXARMORBONUS;
+  T_MAXHEALTHBONUS;
+  T_MEDKIT;
+  T_MEGASPHERE;
+  T_MESHARMOR;
+  T_METALKEY;
+  T_MINIGUN;
+  T_MORPHBLAST;
+  T_MUMMY;
+  T_MUMMYGHOST;
+  T_MUMMYHEAD;
+  T_MUMMYLEADER;
+  T_MUMMYLEADERGHOST;
+  T_NOGRAVITYMACEBALL;
+  T_NONE;
+  T_PAINELEMENTAL;
+  T_PERMLARGEFLAME;
+  T_PERMSMALLFLAME;
+  T_PHOENIXROD;
+  T_PHOENIXSHOT;
+  T_PISTOL;
+  T_PLASMABOLT;
+  T_PLASMAGUN;
+  T_PLATINUMHELM;
+  T_POD;
+  T_PODGENERATOR;
+  T_POISONDART;
+  T_POWERWANDBIGGERBLAST;
+  T_POWERWANDMINIBLAST;
+  T_PROSPERITY;
+  T_PUFF;
+  T_PUZZBOOK1;
+  T_PUZZBOOK2;
+  T_PUZZGEMBIG;
+  T_PUZZGEMBLUE1;
+  T_PUZZGEMBLUE2;
+  T_PUZZGEMGREEN1;
+  T_PUZZGEMGREEN2;
+  T_PUZZGEMRED;
+  T_PUZZSKULL;
+  T_RAGE;
+  T_RAILGUN;
+  T_RANDOMPOWERUP;
+  T_REDARMOR;
+  T_REDFLAG;
+  T_REDKEYCARD;
+  T_REDSKULLKEY;
+  T_REDTELEGLITTER;
+  T_REFLECTION;
+  T_REGENERATION;
+  T_RESISTANCE;
+  T_REVENANT;
+  T_RIPPER;
+  T_RIPPERBALL;
+  T_ROCK1;
+  T_ROCK2;
+  T_ROCK3;
+  T_ROCKET;
+  T_ROCKETAMMO;
+  T_ROCKETBOX;
+  T_ROCKETLAUNCHER;
+  T_RUSTYKEY;
+  T_SCRIPTEDMARINE;
+  T_SERPENTFIREBALL;
+  T_SERPENTKEY;
+  T_SHELLBOX;
+  T_SHELLS;
+  T_SHIELD1;
+  T_SHIELD2;
+  T_SHOTGUN;
+  T_SHOTGUY;
+  T_SILVERKEY;
+  T_SKULLROD;
+  T_SKULLRODBLAST;
+  T_SMALLMETALKEY;
+  T_SNAKE;
+  T_SNAKEPROJECTILE;
+  T_SNAKEPROJECTILEBIG;
+  T_SOULSPHERE;
+  T_SOUND_WATERFALL;
+  T_SOUND_WIND;
+  T_SPARK_DRIP;
+  T_SPECTRE;
+  T_SPIDERMASTERMIND;
+  T_SPREAD;
+  T_SSGGUY;
+  T_STAINEDGLASS0;
+  T_STAINEDGLASS1;
+  T_STAINEDGLASS2;
+  T_STAINEDGLASS3;
+  T_STAINEDGLASS4;
+  T_STAINEDGLASS5;
+  T_STAINEDGLASS6;
+  T_STAINEDGLASS7;
+  T_STAINEDGLASS8;
+  T_STAINEDGLASS9;
+  T_STEALTHARACHNOTRON;
+  T_STEALTHBARON;
+  T_STEALTHCACODEMON;
+  T_STEALTHCHAINGUY;
+  T_STEALTHIMP;
+  T_STEALTHKNIGHT;
+  T_STEALTHMANCUBUS;
+  T_STEALTHREVENANT;
+  T_STEALTHSERGEANT;
+  T_STEALTHSHOTGUY;
+  T_STEALTHVILE;
+  T_STEALTHZOMBIE;
+  T_STIMPACK;
+  T_STRENGTH;
+  T_SUPERSHOTGUN;
+  T_TEMPLARGEFLAME;
+  T_TEMPSMALLFLAME;
+	T_THRUSTSPIKEDOWN;
+	T_THRUSTSPIKEUP;
+	T_TIMEFREEZER;
+	T_TINYVOLCANOBALL;
+	T_TRACER;
+	T_TRANSLUCENCY;
+	T_TURBOSPHERE;
+	T_VILE;
+	T_VOLCANO;
+	T_VOLCANOBALL;
+	T_WATERDRIP;
+	T_WATERLURKER;
+	T_WATERLURKERLEADER;
+	T_WHIRLWIND;
+	T_WHITEFLAG;
+	T_WIMPYBLASTERAMMO;
+	T_WIMPYCROSSBOWAMMO;
+	T_WIMPYMACEAMMO;
+	T_WIMPYPHOENIXRODAMMO;
+	T_WIMPYSKULLRODAMMO;
+	T_WIMPYWANDAMMO;
+	T_WIZARD;
+	T_WIZARDSHOT;
+	T_WOLFSS;
+	T_WRAITH;
+	T_WRAITHBURIED;
+	T_YELLOWKEY;
+	T_YELLOWKEYCARD;
+	T_YELLOWSKULLKEY;
+	T_ZOMBIE;
+	TEAM_BLUE;
+	TEAM_RED;
+	TEXFLAG_ADDOFFSET;
+	TEXFLAG_BOTTOM;
+	TEXFLAG_MIDDLE;
+	TEXFLAG_TOP;
+	TEXTURE_BOTTOM;
+	TEXTURE_MIDDLE;
+	TEXTURE_TOP;
+	TRUE;
+	YES;
+}
\ No newline at end of file
diff --git a/Build/Scripting/Dehacked.cfg b/Build/Scripting/Dehacked.cfg
new file mode 100644
index 0000000..110cf93
--- /dev/null
+++ b/Build/Scripting/Dehacked.cfg
@@ -0,0 +1,145 @@
+/*******************************************************************\
+	Doom Builder Script highlighting definitions for Dehacked
+\*******************************************************************/
+
+// Editor settings
+description = "Dehacked script";
+codepage = 0;
+extensions = "deh,bex";
+casesensitive = false;
+insertcase = 0;				// 0=Normal, 1=Lowercase, 2=Uppercase
+lexer = 6;					// Perl-style
+keywordhelp = "";
+
+keywords
+{
+	[CODEPTR] = "[CODEPTR]";
+	[PARS] = "[PARS]";
+	[STRINGS] = "[STRINGS]";
+	Action.sound = "Action sound";
+	Alert.sound = "Alert sound";
+	Ammo = "Ammo";
+	Ammo.&.Keys = "Ammo & Keys";
+	Ammo.type = "Ammo type";
+	Attack.sound = "Attack sound";
+	Auto-map = "Auto-map";
+	BEHOLD.menu = "BEHOLD menu";
+	Berserk = "Berserk";
+	BFG.Cells/Shot = "BFG Cells/Shot";
+	Bits = "Bits";
+	Blue.Armor.Class = "Blue Armor Class";
+	Bobbing.frame = "Bobbing frame";
+	Chainsaw = "Chainsaw";
+	Change.music = "Change music";
+	Cheat = "Cheat";
+	Close.attack.frame = "Close attack frame";
+	Codep.Frame = "Codep Frame";
+	Death.frame = "Death frame";
+	Death.sound = "Death sound";
+	Deselect.frame = "Deselect frame";
+	Doom.version = "Doom version";
+	Duration = "Duration";
+	Exploding.frame = "Exploding frame";
+	Far.attack.frame = "Far attack frame";
+	Firing.frame = "Firing frame";
+	First.moving.frame = "First moving frame";
+	Frame = "Frame";
+	God.mode = "God mode";
+	God.Mode.Health = "God Mode Health";
+	Green.Armor.Class = "Green Armor Class";
+	Height = "Height";
+	Hit.points = "Hit points";
+	ID.# = "ID #";
+	IDFA.Armor = "IDFA Armor";
+	IDFA.Armor.Class = "IDFA Armor Class";
+	IDKFA.Armor = "IDKFA Armor";
+	IDKFA.Armor.Class = "IDKFA Armor Class";
+	INCLUDE = "INCLUDE";
+	INCLUDE.NOTEXT = "INCLUDE NOTEXT";
+	Initial.Bullets = "Initial Bullets";
+	Initial.frame = "Initial frame";
+	Initial.Health = "Initial Health";
+	Injury.frame = "Injury frame";
+	Invincibility = "Invincibility";
+	Invisibility = "Invisibility";
+	Level.Warp = "Level Warp";
+	Lite-amp.Goggles = "Lite-amp Goggles";
+	Mass = "Mass";
+	Max.ammo = "Max ammo";
+	Max.Armor = "Max Armor";
+	Max.Health = "Max Health";
+	Max.Soulsphere = "Max Soulsphere";
+	Megasphere.Health = "Megasphere Health";
+	Misc = "Misc";
+	Missile.damage = "Missile damage";
+	Monsters.Infight = "Monsters Infight";
+	Next.frame = "Next frame";
+	No.Clipping.1 = "No Clipping 1";
+	No.Clipping.2 = "No Clipping 2";
+	Offset = "Offset";
+	Pain.chance = "Pain chance";
+	Pain.sound = "Pain sound";
+	par = "par";
+	Patch.format = "Patch format";
+	Per.ammo = "Per ammo";
+	Player.Position = "Player Position";
+	Pointer = "Pointer";
+	Radiation.Suit = "Radiation Suit";
+	Reaction.time = "Reaction time";
+	Respawn.frame = "Respawn frame";
+	Select.frame = "Select frame";
+	Shooting.frame = "Shooting frame";
+	Soulsphere.Health = "Soulsphere Health";
+	Sound = "Sound";
+	Speed = "Speed";
+	Sprite = "Sprite";
+	Sprite.number = "Sprite number";
+	Sprite.subnumber = "Sprite subnumber";
+	Text = "Text";
+	Thing = "Thing";
+	Unknown.1 = "Unknown 1";
+	Unknown.2 = "Unknown 2";
+	Weapon = "Weapon";
+	Width = "Width";
+	Zero.1 = "Zero 1";
+	Zero.2 = "Zero 2";
+	Zero.3 = "Zero 3";
+	Zero.4 = "Zero 4";
+	Zero/One = "Zero/One";
+}
+
+constants
+{
+	AMBUSH;
+	BOUNCES;
+	CORPSE;
+	COUNTITEM;
+	COUNTKILL;
+	DROPOFF;
+	DROPPED;
+	FLOAT;
+	FRIEND;
+	INFLOAT;
+	JUSTATTACKED;
+	JUSTHIT;
+	MISSILE;
+	NOBLOCKMAP;
+	NOBLOOD;
+	NOCLIP;
+	NOGRAVITY;
+	NOSECTOR;
+	NOTDMATCH;
+	PICKUP;
+	SHADOW;
+	SHOOTABLE;
+	SKULLFLY;
+	SLIDE;
+	SOLID;
+	SPAWNCEILING;
+	SPECIAL;
+	TELEPORT;
+	TOUCHY;
+	TRANSLATION1;
+	TRANSLATION2;
+	TRANSLUCENT;
+}
diff --git a/Build/Scripting/Doomsday_DED.cfg b/Build/Scripting/Doomsday_DED.cfg
new file mode 100644
index 0000000..27d8dce
--- /dev/null
+++ b/Build/Scripting/Doomsday_DED.cfg
@@ -0,0 +1,98 @@
+/*******************************************************************\
+	Doom Builder Script highlighting definitions for DED
+\*******************************************************************/
+
+// Editor settings
+description = "Doomsday DED script";
+codepage = 0;
+extensions = "ded";
+casesensitive = false;
+insertcase = 0;				// 0=Normal, 1=Lowercase, 2=Uppercase
+lexer = 1;
+keywordhelp = "http://dengine.net/dew/index.php?title=%K";
+
+keywords
+{
+	Blending.Mode = "Blending Mode";
+	Copy.Model = "Copy Model";
+	File = "File";
+	Flags = "Flags";
+	Frame = "Frame";
+	Frame.Range = "Frame Range";
+	Group = "Group";
+	ID = "ID";
+	Include = "Include";
+	IncludeIf = "IncludeIf";
+	IncludeIf.Not = "IncludeIf Not";
+	Inter = "Inter";
+	Interpolate = "Interpolate";
+	MD2 = "MD2";
+	Model = "Model";
+	ModelPath = "ModelPath";
+	Off = "Off";
+	Offset = "Offset";
+	Offset.XYZ = "Offset XYZ";
+	Parm = "Parm";
+	Resize = "Resize";
+	Scale = "Scale";
+	Scale.XYZ = "Scale XYZ";
+	Selector = "Selector";
+	Selskin = "Selskin";
+	Selskin.Mask = "Selskin Mask";
+	Selskin.Shift = "Selskin Shift";
+	Selskins = "Selskins";
+	Shadow.Radius = "Shadow Radius";
+	Shiny = "Shiny";
+	Shiny.Color = "Shiny Color";
+	Shiny.Reaction = "Shiny Reaction";
+	Shiny.Skin = "Shiny Skin";
+	Skin = "Skin";
+	Skin.File = "Skin File";
+	Skin.Range = "Skin Range";
+	Skin.Ticks = "Skin Ticks";
+	SkipIf = "SkipIf";
+	SkipIf.Not = "SkipIf Not";
+	Sprite = "Sprite";
+	Sprite.Frame = "Sprite Frame";
+	State = "State";
+	Sub = "Sub";
+	Transparent = "Transparent";
+}
+
+constants
+{
+	add;
+	alignpitch;
+	alignyaw;
+	autoscale;
+	brightshadow;
+	brightshadow2;
+	dark;
+	darkshadow;
+	fullbright;
+	idangle;
+	idframe;
+	idskin;
+	invmul;
+	litshiny;
+	movpitch;
+	movyaw;
+	mul;
+	nointerpol;
+	nomaxz;
+	noptc;
+	normal;
+	notexcomp;
+	noz;
+	ptoffsub1;
+	revsub;
+	selskin;
+	shadow1;
+	shadow2;
+	skintrans;
+	specular;
+	spin;
+	sub;
+	sub2;
+	worldtime;
+}
diff --git a/Build/Scripting/GZDoom_MODELDEF.cfg b/Build/Scripting/GZDoom_MODELDEF.cfg
new file mode 100644
index 0000000..e3d7fc2
--- /dev/null
+++ b/Build/Scripting/GZDoom_MODELDEF.cfg
@@ -0,0 +1,41 @@
+/*******************************************************************\
+	GZDoom Builder Script highlighting definitions for MODELDEF
+\*******************************************************************/
+
+// Editor settings
+description = "GZDoom MODELDEF";
+codepage = 0;
+extensions = "mdd";
+casesensitive = false;
+insertcase = 1;	// 0=Normal, 1=Lowercase, 2=Uppercase
+lexer = 35;	// CPP-style, case-insensitive
+keywordhelp = "http://zdoom.org/wiki/MODELDEF";
+scripttype = 2; //0 = unknown script, 1 = acc, 2 = modeldef, 3 = decorate
+
+keywords
+{
+  Path = "Path <\"path\">";
+  Model = "Model <model index> <\"model file\">";
+  Skin = "Skin <model index> <\"skin file\">";
+  Scale = "Scale <float X scale> <float Y scale> <float Z scale>";
+  Frame = "Frame <XXXX> <X> <model index> <\"frame name\">";
+  FrameIndex = "FrameIndex <XXXX> <X> <model index> <frame number>";
+  Rotation-Speed = "Rotation-Speed <float>";
+  Rotation-Vector = "Rotation-Vector <float x> <float y> <float z>";
+  Rotation-Center = "Rotation-Center <float x> <float y> <float z>";
+  ZOffset = "ZOffset <float>";
+  AngleOffset = "AngleOffset <float>";
+  PitchOffset = "PitchOffset <float>";
+  RollOffset = "RollOffset <float>";
+}
+
+constants
+{
+  PITCHFROMMOMENTUM;
+  IGNORETRANSLATION;
+  INTERPOLATEDOUBLEDFRAMES;
+  ROTATING;
+  NOINTERPOLATION;
+  INHERITACTORPITCH;
+  INHERITACTORROLL;
+}
\ No newline at end of file
diff --git a/Build/Scripting/Hexen_ACS.cfg b/Build/Scripting/Hexen_ACS.cfg
new file mode 100644
index 0000000..550ac28
--- /dev/null
+++ b/Build/Scripting/Hexen_ACS.cfg
@@ -0,0 +1,299 @@
+/*******************************************************************\
+	Doom Builder Script highlighting definitions for ACS
+\*******************************************************************/
+
+// Compiler settings
+compiler = "hexen_acc";
+parameters = "-H -I \"%PT\" -I \"%PS\" %FI %FO";
+resultlump = "BEHAVIOR";
+
+// Editor settings
+description = "Hexen ACS script";
+codepage = 0;
+extensions = "acs";
+casesensitive = false;
+insertcase = 0;				// 0=Normal, 1=Lowercase, 2=Uppercase
+lexer = 35;					// CPP-style, case-insensitive
+functionopen = "(";
+functionclose = ")";
+argumentdelimiter = ",";
+terminator = ";";
+keywordhelp = "http://www.zdoom.org/wiki/index.php?title=%K";
+snippetsdir = "acs";
+scripttype = 1; //0 = unknown script, 1 = acc, 2 = modeldef, 3 = decorate
+
+keywords
+{
+	#Define = "#Define identifier expression";
+	#Import = "#Import";
+	#Include = "#Include";
+	#Library = "#Library";
+	#LibDefine = "#LibDefine identifier expression";
+	ACS_Execute = "ACS_Execute(script, map, arg1, arg2, arg3)";
+	ACS_LockedExecute = "ACS_LockedExecute(script, map, arg1, arg2, lock)";
+	ACS_Suspend = "ACS_Suspend(script, map)";
+	ACS_Terminate = "ACS_Terminate(script, map)";
+	ActivatorSound = "ActivatorSound(name, volume)";
+	ActivatorTID = "ActivatorTID()";
+	Bool = "Bool expression";
+	Break = "Break";
+	Return = "Return";
+	Case = "Case expression:";
+	Ceiling_CrushAndRaise = "Ceiling_CrushAndRaise(tag, speed, crush)";
+	Ceiling_CrushRaiseAndStay = "Ceiling_CrushRaiseAndStay(tag, speed, crush)";
+	Ceiling_CrushStop = "Ceiling_CrushStop(tag)";
+	Ceiling_LowerAndCrush = "Ceiling_LowerAndCrush(tag, speed, crush)";
+	Ceiling_LowerByValue = "Ceiling_LowerByValue(tag, speed, height)";
+	Ceiling_MoveToValueTimes8 = "Ceiling_MoveToValueTimes8(tag, speed, height, neg)";
+	Ceiling_RaiseByValue = "Ceiling_RaiseByValue(tag, speed, height)";
+	ChangeCeiling = "void ChangeCeiling(int tag, str flatname)";
+	ChangeFloor = "void ChangeFloor(int tag, str flatname)";
+	ClearLineSpecial = "void ClearLineSpecial(void)\nClears the special of the line that activated the script.";
+	Const = "Const";
+	Continue = "Continue";
+	DamageThing = "DamageThing(amount)";
+	Death = "Script expression Death";
+	Default = "Default:";
+	Delay = "void Delay(int tics)";
+	Disconnect = "Script expression Disconnect";
+	Do = "Do";
+	Door_Close = "Door_Close(tag, speed)";
+	Door_LockedRaise = "Door_LockedRaise(tag, speed, delay, lock)";
+	Door_Open = "Door_Open(tag, speed)";
+	Door_Raise = "Door_Raise(tag, speed, delay)";
+	Else = "Else";
+	Enter = "Script expression Enter";
+	Floor_CrushStop = "Floor_CrushStop(tag)";
+	Floor_LowerByValue = "Floor_LowerByValue(tag, speed, height)";
+	Floor_LowerByValueTimes8 = "Floor_LowerByValueTimes8(tag, speed, height)";
+	Floor_LowerInstant = "Floor_LowerInstant(tag, arg1, height)";
+	Floor_LowerToLowest = "Floor_LowerToLowest(tag, speed)";
+	Floor_LowerToNearest = "Floor_LowerToNearest(tag, speed)";
+	Floor_MoveToValueTimes8 = "Floor_MoveToValueTimes8(tag, speed, height, neg)";
+	Floor_RaiseAndCrush = "Floor_RaiseAndCrush(tag, speed, crush)";
+	Floor_RaiseByValue = "Floor_RaiseByValue(tag, speed, height)";
+	Floor_RaiseByValueTimes8 = "Floor_RaiseByValueTimes8(tag, speed, height)";
+	Floor_RaiseInstant = "Floor_RaiseInstant(tag, arg1, height)";
+	Floor_RaiseToHighest = "Floor_RaiseToHighest(tag, speed)";
+	Floor_RaiseToNearest = "Floor_RaiseToNearest(tag, speed)";
+	Floor_Waggle = "Floor_Waggle(tag, amp, freq, offset, time)";
+	FloorAndCeiling_LowerByValue = "FloorAndCeiling_LowerByValue(tag, speed, height)";
+	FloorAndCeiling_RaiseByValue = "FloorAndCeiling_RaiseByValue(tag, speed, height)";
+	For = "For(initialization, condition, iteration)";
+	Function = "Function Void expression (Void)";
+	GameSkill = "int GameSkill(void)";
+	GameType = "int GameType(void)";
+	If = "if(expression)";
+	Int = "int expression";
+	Light_ChangeToValue = "Light_ChangeToValue(tag, value)";
+	Light_Fade = "Light_Fade(tag, value, tics)";
+	Light_Flicker = "Light_Flicker(tag, upper, lower)";
+	Light_ForceLightning = "Light_ForceLightning()";
+	Light_Glow = "Light_Glow(tag, upper, lower, tics)";
+	Light_LowerByValue = "Light_LowerByValue(tag, value)";
+	Light_RaiseByValue = "Light_RaiseByValue(tag, value)";
+	Light_Strobe = "Light_Strobe(tag, upper, lower, u-tics, l-tics)";
+	LineSide = "int LineSide(void)";
+	Open = "Script expression Open";
+	Pillar_Build = "Pillar_Build(tag, speed, height)";
+	Pillar_BuildAndCrush = "Pillar_BuildAndCrush(tag, speed, height, crush)";
+	Pillar_Open = "Pillar_Open(tag, speed, fdist, cdist)";
+	Plat_DownByValue = "Plat_DownByValue(tag, speed, delay, height)";
+	Plat_DownWaitUpStay = "Plat_DownWaitUpStay(tag, speed, delay)";
+	Plat_PerpetualRaise = "Plat_PerpetualRaise(tag, speed, delay)";
+	Plat_Stop = "Plat_Stop(tag)";
+	Plat_ToggleCeiling = "Plat_ToggleCeiling(tag)";
+	Plat_UpByValue = "Plat_UpByValue(tag, speed, delay, height)";
+	Plat_UpWaitDownStay = "Plat_UpWaitDownStay(tag, speed, delay)";
+	PlayerCount = "int PlayerCount(void)\nReturns the number of players currently in the game";
+	Polyobj_DoorSlide = "Polyobj_DoorSlide(po, speed, angle, dist, delay)";
+	Polyobj_DoorSwing = "Polyobj_DoorSwing(po, speed, angle, delay)";
+	Polyobj_Move = "Polyobj_Move(po, speed, angle, dist)";
+	Polyobj_MoveTimes8 = "Polyobj_MoveTimes8(po, speed, angle, dist)";
+	Polyobj_OR_Move = "Polyobj_OR_Move(po, speed, angle, distance)";
+	Polyobj_OR_MoveTimes8 = "Polyobj_OR_MoveTimes8(po, speed, angle, distance)";
+	Polyobj_OR_RotateLeft = "Polyobj_OR_RotateLeft(po, speed)";
+	Polyobj_OR_RotateRight = "Polyobj_OR_RotateRight(po, speed, angle)";
+	Polyobj_RotateLeft = "Polyobj_RotateLeft(po, speed, angle)";
+	Polyobj_RotateRight = "Polyobj_RotateRight(po, speed, angle)";
+	PolyWait = "void PolyWait(int polyid)";
+	Print = "void Print(type:expression)\nPrint will print something to the screen.\nPrint will only display for the activator of the script\nFor printing to all players, use PrintBold.";
+	PrintBold = "void PrintBold(type:expression)\nThis is exactly the same as Print, except all players will see the printed text\non the screen instead of just the activator of the script.";
+	Radius_Quake = "Radius_Quake(intensity, duration, damrad, tremrad, tid)";
+	Random = "int Random(int min, int max)";
+	Restart = "Restart";
+	Script = "Script expression";
+	ScriptWait = "void ScriptWait(int script)";
+	Sector_ChangeSound = "Sector_ChangeSound(tag, newsequence)";
+	SectorSound = "void SectorSound(str sound, int volume)";
+	SetLineBlocking = "void SetLineBlocking(int lineid, int blocking)";
+	SetLineSpecial = "void SetLineSpecial(int lineid, int special[, int arg0[, int arg1[, int arg2[, int arg3[, int arg4]]]]])\nSetLineSpecial will change the special on all lines with the line id number specified.";
+	SetLineTexture = "void SetLineTexture(int lineid, int line_side, int sidedef_texture, str texturename)\nSetLineTexture will change the specified texture on all lines with the line id number specified\nline_side: SIDE_ flags can be used.\nsidedef_texture: TEXTURE_ flags can be used.\ntexturename: the texture that will be set on the line. Use '-' to remove a texture.";
+	SoundSequence = "void SoundSequence(str sndseq)\nPlays a sound sequence defined in SNDSEQ lump.";
+	Special = "Special";
+	Stairs_BuildDown = "Stairs_BuildDown(tag, speed, height, delay, reset)";
+	Stairs_BuildDownSync = "Stairs_BuildDownSync(tag, speed, height, reset)";
+	Stairs_BuildUp = "Stairs_BuildUp(tag, speed, height, delay, reset)";
+	Stairs_BuildUpSync = "Stairs_BuildUpSync(tag, speed, height, reset)";
+	str = "str expression";
+	Suspend = "Suspend";
+	Switch = "Switch(expression)";
+	TagWait = "void TagWait(int tag)";
+	Teleport = "Teleport(tid, tag, nosourcefog)";
+	Teleport_NewMap = "Teleport_NewMap(map, pos)";
+	Teleport_NoFog = "Teleport_NoFog(tid)";
+	Terminate = "Terminate";
+	Thing_Activate = "Thing_Activate(tid)";
+	Thing_Deactivate = "Thing_Deactivate(tid)";
+	Thing_Destroy = "Thing_Destroy(tid, extreme)";
+	Thing_Projectile = "Thing_Projectile(tid, type, angle, speed, vspeed)";
+	Thing_ProjectileGravity = "Thing_ProjectileGravity(tid, type, angle, speed, vspeed)";
+	Thing_Remove = "Thing_Remove(tid)";
+	Thing_Spawn = "Thing_Spawn(tid, type, angle, newtid)";
+	Thing_SpawnNoFog = "Thing_SpawnNoFog(tid, type, angle, newtid)";
+	ThingCount = "int ThingCount(int type, int tid)";
+	ThrustThing = "ThrustThing(angle, force, limit, tid)";
+	Timer = "int Timer(void)";
+	Unloading = "Script expression Unloading";
+	Until = "Until(expression)";
+	Void = "Void";
+	While = "While(expression)";
+	World = "World Int expression:identifier";
+}
+
+constants
+{
+	TRUE;
+	FALSE;
+	ON;
+	OFF;
+	YES;
+	NO;
+	LINE_FRONT;
+	LINE_BACK;
+	SIDE_FRONT;
+	SIDE_BACK;
+	TEXTURE_TOP;
+	TEXTURE_MIDDLE;
+	TEXTURE_BOTTOM;
+	GAME_SINGLE_PLAYER;
+	GAME_NET_COOPERATIVE;
+	GAME_NET_DEATHMATCH;
+	CLASS_FIGHTER;
+	CLASS_CLERIC;
+	CLASS_MAGE;
+	SKILL_VERY_EASY;
+	SKILL_EASY;
+	SKILL_NORMAL;
+	SKILL_HARD;
+	SKILL_VERY_HARD;
+	T_NONE;
+	T_CENTAUR;
+	T_CENTAURLEADER;
+	T_DEMON;
+	T_ETTIN;
+	T_FIREGARGOYLE;
+	T_WATERLURKER;
+	T_WATERLURKERLEADER;
+	T_WRAITH;
+	T_WRAITHBURIED;
+	T_FIREBALL1;
+	T_MANA1;
+	T_MANA2;
+	T_ITEMBOOTS;
+	T_ITEMEGG;
+	T_ITEMFLIGHT;
+	T_ITEMSUMMON;
+	T_ITEMTPORTOTHER;
+	T_ITEMTELEPORT;
+	T_BISHOP;
+	T_ICEGOLEM;
+	T_BRIDGE;
+	T_DRAGONSKINBRACERS;
+	T_ITEMHEALTHPOTION;
+	T_ITEMHEALTHFLASK;
+	T_ITEMHEALTHFULL;
+	T_ITEMBOOSTMANA;
+	T_FIGHTERAXE;
+	T_FIGHTERHAMMER;
+	T_FIGHTERSWORD1;
+	T_FIGHTERSWORD2;
+	T_FIGHTERSWORD3;
+	T_CLERICSTAFF;
+	T_CLERICHOLY1;
+	T_CLERICHOLY2;
+	T_CLERICHOLY3;
+	T_MAGESHARDS;
+	T_MAGESTAFF1;
+	T_MAGESTAFF2;
+	T_MAGESTAFF3;
+	T_MORPHBLAST;
+	T_ROCK1;
+	T_ROCK2;
+	T_ROCK3;
+	T_DIRT1;
+	T_DIRT2;
+	T_DIRT3;
+	T_DIRT4;
+	T_DIRT5;
+	T_DIRT6;
+	T_ARROW;
+	T_DART;
+	T_POISONDART;
+	T_RIPPERBALL;
+	T_STAINEDGLASS1;
+	T_STAINEDGLASS2;
+	T_STAINEDGLASS3;
+	T_STAINEDGLASS4;
+	T_STAINEDGLASS5;
+	T_STAINEDGLASS6;
+	T_STAINEDGLASS7;
+	T_STAINEDGLASS8;
+	T_STAINEDGLASS9;
+	T_STAINEDGLASS0;
+	T_BLADE;
+	T_ICESHARD;
+	T_FLAME_SMALL;
+	T_FLAME_LARGE;
+	T_MESHARMOR;
+	T_FALCONSHIELD;
+	T_PLATINUMHELM;
+	T_AMULETOFWARDING;
+	T_ITEMFLECHETTE;
+	T_ITEMTORCH;
+	T_ITEMREPULSION;
+	T_MANA3;
+	T_PUZZSKULL;
+	T_PUZZGEMBIG;
+	T_PUZZGEMRED;
+	T_PUZZGEMGREEN1;
+	T_PUZZGEMGREEN2;
+	T_PUZZGEMBLUE1;
+	T_PUZZGEMBLUE2;
+	T_PUZZBOOK1;
+	T_PUZZBOOK2;
+	T_METALKEY;
+	T_SMALLMETALKEY;
+	T_AXEKEY;
+	T_FIREKEY;
+	T_GREENKEY;
+	T_MACEKEY;
+	T_SILVERKEY;
+	T_RUSTYKEY;
+	T_HORNKEY;
+	T_SERPENTKEY;
+	T_WATERDRIP;
+	T_TEMPSMALLFLAME;
+	T_PERMSMALLFLAME;
+	T_TEMPLARGEFLAME;
+	T_PERMLARGEFLAME;
+	T_DEMON_MASH;
+	T_DEMON2_MASH;
+	T_ETTIN_MASH;
+	T_CENTAUR_MASH;
+	T_THRUSTSPIKEUP;
+	T_THRUSTSPIKEDOWN;
+	T_FLESH_DRIP1;
+	T_FLESH_DRIP2;
+	T_SPARK_DRIP;
+}
diff --git a/Build/Scripting/Legacy_FS.cfg b/Build/Scripting/Legacy_FS.cfg
new file mode 100644
index 0000000..f874615
--- /dev/null
+++ b/Build/Scripting/Legacy_FS.cfg
@@ -0,0 +1,169 @@
+/*******************************************************************\
+	Doom Builder Script highlighting definitions for FS
+\*******************************************************************/
+
+// Editor settings
+description = "Legacy Fragglescript";
+codepage = 0;
+extensions = "fs";
+casesensitive = true;
+insertcase = 0;				// 0=Normal, 1=Lowercase, 2=Uppercase
+lexer = 3;					// CPP-style, case-sensitive
+functionopen = "(";
+functionclose = ")";
+argumentdelimiter = ",";
+terminator = ";";
+keywordhelp = "";
+
+keywords
+{
+	Abs = "Abs(x)";
+	ACos = "ACos(x)";
+	AmbientSound = "AmbientSound(soundname)";
+	ASin = "ASin(x)";
+	ATan = "ATan(x)";
+	Beep = "Beep()";
+	Break = "Break()";
+	CeilingHeight = "CeilingHeight(tag, height)";
+	CeilingText = "CeilingText(tag, flat)";
+	ChangemMusic = "ChangemMusic(musicname)";
+	CheckCVar = "CheckCVar(cvar)";
+	CheckLife = "CheckLife(obj)";
+	ClearCamera = "ClearCamera()";
+	Clock = "Clock()";
+	CloseDoor = "CloseDoor(tag, speed)";
+	ColorMap = "ColorMap(tag, colormap)";
+	Const = "Const identifier = value";
+	Continue = "Continue()";
+	CopyInto = "CopyInto(source, target)";
+	Cos = "Cos(x)";
+	CreatePic = "CreatePic(lumpname, x, y, draw, trans, priority)";
+	DamageObj = "DamageObj(obj, damage)";
+	ElementAt = "ElementAt(array, index)";
+	Else = "Else";
+	ElseIf = "ElseIf(expression)";
+	ExitLevel = "ExitLevel()";
+	ExitSecret = "ExitSecret()";
+	Exp = "Exp(x)";
+	FadeLight = "FadeLight(tag, level, speed)";
+	Fixed = "Fixed expression";
+	Floor = "Floor(x)";
+	FloorHeight = "FloorHeight(tag, height)";
+	FloorText = "FloorText(tag, flat)";
+	For = "For(initialization, condition, iteration)";
+	GameMode = "GameMode()";
+	GameSkill = "GameSkill()";
+	GetFriction = "GetFriction(tag)";
+	GetPicAttr = "GetPicAttr(handle, selector)";
+	GetPicHandle = "GetPicHandle(lumpname, x, y)";
+	GetPicHP = "GetPicHP()";
+	GetPicLP = "GetPicLP()";
+	GetPicPriority = "GetPicPriority(handle)";
+	Goto = "Goto(label)";
+	HealObj = "HealObj(obj, heal)";
+	Hub = "Hub";
+	If = "If(expression)";
+	Include = "Include(lumpname)";
+	Int = "Int expression";
+	IsPlayerObj = "IsPlayerObj(obj)";
+	Kill = "Kill(obj)";
+	Length = "Length(array)";
+	LightLevel = "LightLevel(tag, level)";
+	LineAttack = "LineAttack(obj, angle, damage)";
+	LineTrigger = "LineTrigger(special, tag)";
+	Log = "Log(x)";
+	MapThingNumExist = "MapThingNumExist(mapthing)";
+	MapThings = "MapThings()";
+	Max = "Max(x, y)";
+	MaxPlayerAmmo = "MaxPlayerAmmo(plnum, ammonum, amount)";
+	Message = "Message(message)";
+	Min = "Min(x, y)";
+	MObj = "MObj expression";
+	ModifyPic = "ModifyPic(handle, lumpname, x, y)";
+	MoveCamera = "MoveCamera(target, targetheight, movespeed, targetangle, anglespeed)";
+	MoveCeil = "MoveCeil(tag, destheight, speed)";
+	MoveFloor = "MoveFloor(tag, destheight, speed)";
+	NewArray = "NewArray(array)";
+	ObjAngle = "ObjAngle(obj)";
+	ObjAwaken = "ObjAwaken(obj)";
+	ObjFlag = "ObjFlag()";
+	ObjFlag2 = "ObjFlag2()";
+	ObjHealth = "ObjHealth(obj)";
+	ObjMomX = "ObjMomX(obj, momx)";
+	ObjMomY = "ObjMomY(obj, momy)";
+	ObjMomZ = "ObjMomZ(obj, momz)";
+	ObjSector = "ObjSector(obj)";
+	ObjState = "ObjState(obj, state)";
+	ObjTarget = "ObjTarget(source, target)";
+	ObjType = "ObjType(obj)";
+	ObjX = "ObjX(obj)";
+	ObjY = "ObjY(obj)";
+	ObjZ = "ObjZ(obj)";
+	OpenDoor = "OpenDoor(tag, waittime, speed)";
+	PlayDemo = "PlayDemo(demolump)";
+	Player = "Player(playerobj)";
+	PlayerAddFrag = "PlayerAddFrag(playerid, modifier)";
+	PlayerAmmo = "PlayerAmmo(plnum, ammonum, amount)";
+	PlayerInGame = "PlayerInGame(playerid)";
+	PlayerKeys = "PlayerKeys(plnum, keynum, givetake)";
+	PlayerMsg = "PlayerMsg(player, message)";
+	PlayerName = "PlayerName(playerid)";
+	PlayerObj = "PlayerObj(playerid)";
+	PlayerSelWep = "PlayerSelWep(playerid, weapon)";
+	PlayerSkin = "PlayerSkin(playerid)";
+	PlayerTimedTip = "PlayerTimedTip(message)";
+	PlayerTip = "PlayerTip(message)";
+	PlayerWeapon = "PlayerWeapon(playerid, weapon, givetake)";
+	PointToAngle = "PointToAngle(x1, y1, x2, y2)";
+	PointToDist = "PointToDist(x1, y1, x2, y2)";
+	Pow = "Pow(x, y)";
+	Print = "Print(message)";
+	PRnd = "PRnd()";
+	PushThing = "PushThing(obj, angle, force)";
+	RadiusAttack = "RadiusAttack(spot, source, damage)";
+	ReactionTime = "ReactionTime(obj, val)";
+	RemoveObj = "RemoveObj(obj)";
+	Ressurect = "Ressurect(obj)";
+	Return = "Return()";
+	Rnd = "Rnd()";
+	RunCommand = "RunCommand(command)";
+	Script = "Script expression";
+	ScriptRunning = "ScriptRunning(scriptid)";
+	ScriptWait = "ScriptWait(scriptid)";
+	ScriptWaitPre = "ScriptWaitPre(scriptid)";
+	SetCamera = "SetCamera(obj, angle, height, pitch)";
+	SetCoronas = "SetCoronas()";
+	SetElementAt = "SetElementAt(array, index, element)";
+	SetFriction = "SetFriction(tag, friction)";
+	SetLineBlocking = "SetLineBlocking(tag, block)";
+	SetLineMnBlock = "SetLineMnBlock(tag, block)";
+	SetLineTexture = "SetLineTexture(tag, side, position, texture)";
+	SetPicPriority = "SetPicPriority(handle, priority)";
+	SetPicTrans = "SetPicTrans(handle, trans)";
+	SetPicVisible = "SetPicVisible(handle, visible)";
+	SilentTeleport = "SilentTeleport(obj, sectortag)";
+	Sin = "Sin(x)";
+	SkinColor = "SkinColor(playerid)";
+	Spawn = "Spawn(type, x, y, angle, z)";
+	SpawnExplosion = "SpawnExplosion(damage, spot, source)";
+	SpawnMissile = "SpawnMissile(obj, target, missile)";
+	SpawnShot = "SpawnShot(type, source, target, face)";
+	Sqrt = "Sqrt(x)";
+	StartScript = "StartScript(scriptid)";
+	StartSectorSound = "StartSectorSound(tag, soundname)";
+	StartSkill = "StartSkill(skill)";
+	StartSound = "StartSound(obj, soundname)";
+	String = "String expression";
+	TagWait = "TagWait(tag)";
+	Tan = "Tan(x)";
+	Teleport = "Teleport(obj, sectortag)";
+	TestLocation = "TestLocation(obj)";
+	TimedTip = "TimedTip(message)";
+	Tip = "Tip(message)";
+	Wait = "Wait(time)";
+	While = "While(expression)";
+}
+
+constants
+{
+}
diff --git a/Build/Scripting/ZDoom_ACS.cfg b/Build/Scripting/ZDoom_ACS.cfg
new file mode 100644
index 0000000..9753e4b
--- /dev/null
+++ b/Build/Scripting/ZDoom_ACS.cfg
@@ -0,0 +1,1270 @@
+/*******************************************************************\
+	Doom Builder Script highlighting definitions for ACS
+\*******************************************************************/
+
+// Compiler settings
+compiler = "zdoom_acc";
+parameters = "-I \"%PT\" -I \"%PS\" %FI %FO";
+resultlump = "BEHAVIOR";
+
+// Editor settings
+description = "ZDoom ACS script";
+codepage = 0;
+extensions = "acs";
+casesensitive = false;
+insertcase = 0;				// 0=Normal, 1=Lowercase, 2=Uppercase
+lexer = 35;					// CPP-style, case-insensitive
+functionopen = "(";
+functionclose = ")";
+argumentdelimiter = ",";
+terminator = ";";
+keywordhelp = "http://www.zdoom.org/wiki/index.php?title=%K";
+snippetsdir = "acs";
+scripttype = 1; //0 = unknown script, 1 = acc, 2 = modeldef, 3 = decorate
+
+keywords
+{
+	#Define = "#Define identifier expression";
+	#EncryptStrings = "#EncryptStrings";
+	#Import = "#Import";
+	#Include = "#Include";
+	#LibDefine = "#LibDefine identifier expression";
+	#Library = "#Library";
+	#NoCompact = "#NoCompact";
+	#NoWadAuthor = "#NoWadAuthor";
+	#WadAuthor = "#WadAuthor";
+	ACS_Execute = "ACS_Execute(script, map, arg1, arg2, arg3)";
+	ACS_ExecuteAlways = "ACS_ExecuteAlways(script, map, arg1, arg2, arg3)";
+	ACS_ExecuteWait = "void ACS_ExecuteWait(int script, int unused, int arg1, int arg2, int arg3)";
+	ACS_ExecuteWithResult = "ACS_ExecuteWithResult(script, arg1, arg2, arg3)";
+	ACS_LockedExecute = "ACS_LockedExecute(script, map, arg1, arg2, lock)";
+	ACS_LockedExecuteDoor = "ACS_LockedExecuteDoor(script, map, arg1, arg2, lock)";
+	ACS_NamedExecute = "bool ACS_NamedExecute(str script, int map, int arg1, int arg2, int arg3)";
+	ACS_NamedExecuteAlways = "bool ACS_NamedExecuteAlways(str script, int map, int arg1, int arg2, int arg3)";
+	ACS_NamedExecuteWait = "void ACS_NamedExecuteWait(str script, int unused, int arg1, int arg2, int arg3)";
+	ACS_NamedExecuteWithResult = "int ACS_NamedExecuteWithResult(str script, int arg1, int arg2, int arg3, int arg4)";
+	ACS_NamedLockedExecute = "bool ACS_NamedLockedExecute(str script, int map, int arg1, int arg2, int lock)";
+	ACS_NamedLockedExecuteDoor = "bool ACS_NamedLockedExecuteDoor(str script, int map, int arg1, int arg2, int lock)";
+	ACS_NamedSuspend = "bool ACS_NamedSuspend(str script, int map)";
+	ACS_NamedTerminate = "bool ACS_NamedTerminate(str script, int map)";
+	ACS_Suspend = "ACS_Suspend(script, map)";
+	ACS_Terminate = "ACS_Terminate(script, map)";
+	ActivatorSound = "void ActivatorSound(str sound, int volume)";
+	ActivatorTID = "int ActivatorTID(void)";
+	AmbientSound = "void AmbientSound(str sound, int volume)";
+	//AnnouncerSound = "void AnnouncerSound(str sound, int flags)";
+	Autosave = "Autosave()";
+	//BlueCount = "BlueCount()";
+	//BlueReturn = "Script expression BlueReturn";
+	//BlueScore = "BlueScore()";
+	//BlueTeamCount = "BlueTeamCount()";
+	//BlueTeamScore = "BlueTeamScore()";
+	Bool = "Bool expression";
+	Break = "Break";
+	CancelFade = "void CancelFade(void)\nIf either FadeTo or FadeRange is currently in progress,\nCancelFade stops it and turns off the palette flash.";
+	CanRaiseActor = "bool CanRaiseActor(int tid)\nChecks to see if the actor or actors with the specified tid are viable for resurrection.\nIf tid is 0, the check is done on the activator of the script.";
+	Case = "Case expression";
+	Ceiling_CrushAndRaise = "Ceiling_CrushAndRaise(tag, speed, crush, crushmode)";
+	Ceiling_CrushAndRaiseA = "Ceiling_CrushAndRaiseA(tag, dspeed, uspeed, crush, crushmode)";
+	Ceiling_CrushAndRaiseDist = "Ceiling_CrushAndRaiseDist(tag, dist, speed, damage, crushmode)";
+	Ceiling_CrushAndRaiseSilentA = "Ceiling_CrushAndRaiseSilentA(tag, dspeed, uspeed, crush, crushmode)";
+	Ceiling_CrushRaiseAndStay = "Ceiling_CrushRaiseAndStay(tag, speed, crush, crushmode)";
+	Ceiling_CrushRaiseAndStayA = "Ceiling_CrushRaiseAndStayA(tag, dspeed, uspeed, crush, crushmode)";
+	Ceiling_CrushRaiseAndStaySilA = "Ceiling_CrushRaiseAndStaySilA(tag, dspeed, uspeed, crush, crushmode)";
+	Ceiling_CrushStop = "Ceiling_CrushStop(tag)";
+	Ceiling_LowerAndCrush = "Ceiling_LowerAndCrush(tag, speed, crush, crushmode)";
+	Ceiling_LowerAndCrushDist = "Ceiling_LowerAndCrushDist(tag, speed, crush, dist, crushmode)";
+	Ceiling_LowerByValue = "Ceiling_LowerByValue(tag, speed, height)";
+	Ceiling_LowerByValueTimes8 = "Ceiling_LowerByValueTimes8(tag, speed, height)";
+	Ceiling_LowerInstant = "Ceiling_LowerInstant(tag, unused, height)";
+	Ceiling_LowerToFloor = "Ceiling_LowerToFloor(tag, speed)";
+	Ceiling_LowerToHighestFloor = "Ceiling_LowerToHighestFloor(tag, speed)";
+	Ceiling_LowerToLowest = "Ceiling_LowerToLowest(tag, speed)";
+	Ceiling_MoveToValue = "Ceiling_MoveToValue(tag, speed, height, neg)";
+	Ceiling_MoveToValueTimes8 = "Ceiling_MoveToValueTimes8(tag, speed, height, neg)";
+	Ceiling_RaiseByValue = "Ceiling_RaiseByValue(tag, speed, height)";
+	Ceiling_RaiseByValueTimes8 = "Ceiling_RaiseByValueTimes8(tag, speed, height)";
+	Ceiling_RaiseInstant = "Ceiling_RaiseInstant(tag, unused, height)";
+	Ceiling_RaiseToNearest = "Ceiling_RaiseToNearest(tag, speed)";
+	Ceiling_Waggle = "Ceiling_Waggle(tag, amp, freq, offset, time)";
+	ChangeActorAngle = "ChangeActorAngle(int tid, fixed angle[, bool interpolate = false])\nSets the angle for the actors with the specified tid.\nIf tid is 0, it sets the angle for the activator of the script.\nangle: a fixed point angle in the range of 0.0 to 1.0 (N = 0.25, W = 0.5, S = 0.75, E = 1.0).";
+	ChangeActorPitch = "ChangeActorPitch(int tid, fixed pitch[, bool interpolate = false])\nSets the pitch for the actors with the specified tid. If tid is 0, it sets the pitch for the activator of the script.\npitch: a fixed point angle in the range of 0.0 to 1.0.";
+	ChangeActorRoll = "void ChangeActorRoll(int tid, fixed angle[, bool interpolate = false])";
+	ChangeCamera = "ChangeCamera(tid, who, revert)";
+	ChangeCeiling = "void ChangeCeiling(int tag, str flatname)";
+	ChangeFloor = "void ChangeFloor(int tag, str flatname)";
+	ChangeLevel = "void ChangeLevel(str mapname, int position, int flags[, int skill])\nChanges to a new map, places the player at the specified start spot, and optionally changes the skill level at the same time.";
+	ChangeSkill = "ChangeSkill(skill)";
+	ChangeSky = "void ChangeSky(str sky1, str sky2)\nChanges the sky texture to sky1 and the second sky texture to sky2.\nBoth textures must be the same height if doublesky is enabled.\nYou may also use any flat, pname, sprite or internal graphic (such as TITLEPIC) in place of an actual texture.\nUseful in conjunction with SetSkyScrollSpeed.";
+	CheckActorCeilingTexture = "bool CheckActorCeilingTexture(int tid, str texture)";
+	CheckActorClass = "bool CheckActorClass(int tid, str class)";
+	CheckActorFloorTexture = "bool CheckActorFloorTexture(int tid, str texture)";
+	CheckActorInventory = "int CheckActorInventory(int tid, str inventory_item)\nChecks the given actor's inventory for the item specified by inventory_item";
+	CheckActorProperty = "bool CheckActorProperty(int tid, int property, [int|float|str] value)";
+	CheckFlag = "bool CheckFlag(int tid, str flag)\nChecks to see if the actor with the matching tid has the specified actor flag set.\nIf tid is 0, the check is performed on the activator of the script.";
+	CheckFont = "bool CheckFont(str fontname)";
+	CheckInventory = "int CheckInventory(str inventory_item)\nChecks the inventory of the actor who activated the script for the item specified by inventory_item";
+	CheckPlayerCamera = "int CheckPlayerCamera(int player)";
+	CheckSight = "bool CheckSight(int source, int dest, int flags)";
+	CheckWeapon = "bool CheckWeapon(str weapon)\nChecks if player's active weapon is the weapon with specified class name.";
+	ClassifyActor = "int ClassifyActor(int tid)";
+	ClearActorInventory = "void ClearActorInventory(int tid)\nThis function clears the specified actor's inventory.";
+	ClearForceField = "ClearForceField(tag)";
+	ClearInventory = "void ClearInventory(void)\nClears the player's inventory of weapons, ammo, armor and usable items.";
+	ClearLineSpecial = "void ClearLineSpecial(void)\nClears the special of the line that activated the script.";
+	//ConsoleCommand = "void ConsoleCommand(str command)";
+	Const = "const";
+	Continue = "continue";
+	cos = "fixed Cos(int angle)";
+	CreateTranslation = "void CreateTranslation(int transnumber, a:b=c:d, ...)";
+	DamageThing = "DamageThing(amount, mod)";
+	Death = "Script expression Death";
+	Default = "default:";
+	Delay = "void Delay(int tics)";
+	Disconnect = "Disconnect script expression";
+	Do = "do";
+	Door_Animated = "Door_Animated(tag, speed, delay, lock)";
+	Door_Close = "Door_Close(tag, speed, lighttag)";
+	Door_CloseWaitOpen = "Door_CloseWaitOpen(tag, speed, delay, lighttag)";
+	Door_LockedRaise = "Door_LockedRaise(tag, speed, delay, lock, lighttag)";
+	Door_Open = "Door_Open(tag, speed, lighttag)";
+	Door_Raise = "Door_Raise(tag, speed, delay, lighttag)";
+	DropInventory = "void DropInventory(int tid, str itemtodrop)";
+	DropItem = "int DropItem(int tid, str item[, int dropamount = -1[, int chance = 256]])\nCauses actors with the matching tid to drop the specified item.\nIf tid is 0, the activator of the script is considered to be the dropper of the item.\nThis works in a similar way to the DropItem actor property.\nThe return value of the function is the number of dropped items.";
+	Elevator_LowerToNearest = "Elevator_LowerToNearest(tag, speed)";
+	Elevator_MoveToFloor = "Elevator_MoveToFloor(tag, speed)";
+	Elevator_RaiseToNearest = "Elevator_RaiseToNearest(tag, speed)";
+	Else = "Else";
+	Enter = "Script expression Enter";
+	Exit_Normal = "Exit_Normal(pos)";
+	Exit_Secret = "Exit_Secret(pos)";
+	FadeRange = "void FadeRange(int red1, int green1, int blue1, fixed amount1, int red2, int green2, int blue2, fixed amount2, fixed seconds)\nSets the current flash to the first color set and then fades it to the second color set over the specified number of seconds.";
+	FadeTo = "void FadeTo(int red, int green, int blue, fixed amount, fixed seconds)\nFades the activator's view from the current palette flash to another one.\nThis will also work if the activator is looking through another viewpoint (using a camera, etc.).";
+	FixedDiv = "fixed FixedDiv(int a, int b)";
+	FixedMul = "fixed FixedMul(int a, int b)";
+	FixedSqrt = "fixed FixedSqrt(fixed number)";
+	Floor_CrushStop = "Floor_CrushStop(tag)";
+	Floor_Donut = "Floor_Donut(ptag, pspeed, sspeed)";
+	Floor_LowerByValue = "Floor_LowerByValue(tag, speed, height)";
+	Floor_LowerByValueTimes8 = "Floor_LowerByValueTimes8(tag, speed, height)";
+	Floor_LowerInstant = "Floor_LowerInstant(tag, unused, height)";
+	Floor_LowerToHighest = "Floor_LowerToHighest(tag, speed, adjust, force_adjust)";
+	Floor_LowerToLowest = "Floor_LowerToLowest(tag, speed)";
+	Floor_LowerToLowestTxTy = "Floor_LowerToLowestTxTy(tag, speed)";
+	Floor_LowerToNearest = "Floor_LowerToNearest(tag, speed)";
+	Floor_MoveToValue = "Floor_MoveToValue(tag, speed, height, neg)";
+	Floor_MoveToValueTimes8 = "Floor_MoveToValueTimes8(tag, speed, height, neg)";
+	Floor_RaiseAndCrush = "Floor_RaiseAndCrush(tag, speed, crush, crushmode)";
+	Floor_RaiseAndCrushDoom = "Floor_RaiseAndCrushDoom(tag, speed, crush, crushmode)";
+	Floor_RaiseByTexture = "Floor_RaiseByTexture(tag, speed)";
+	Floor_RaiseByValue = "Floor_RaiseByValue(tag, speed, height)";
+	Floor_RaiseByValueTimes8 = "Floor_RaiseByValueTimes8(tag, speed, height)";
+	Floor_RaiseByValueTxTy = "Floor_RaiseByValueTxTy(tag, speed, height)";
+	Floor_RaiseInstant = "Floor_RaiseInstant(tag, unused, height)";
+	Floor_RaiseToHighest = "Floor_RaiseToHighest(tag, speed)";
+	Floor_RaiseToLowestCeiling = "Floor_RaiseToLowestCeiling(tag, speed)";
+	Floor_RaiseToNearest = "Floor_RaiseToNearest(tag, speed)";
+	Floor_TransferNumeric = "Floor_TransferNumeric(tag)";
+	Floor_TransferTrigger = "Floor_TransferTrigger(tag)";
+	Floor_Waggle = "Floor_Waggle(tag, amp, freq, offset, time)";
+	FloorAndCeiling_LowerByValue = "FloorAndCeiling_LowerByValue(tag, speed, height)";
+	FloorAndCeiling_LowerRaise = "FloorAndCeiling_LowerRaise(tag, fspeed, cspeed, boomemu)";
+	FloorAndCeiling_RaiseByValue = "FloorAndCeiling_RaiseByValue(tag, speed, height)";
+	For = "for(initialization, condition, iteration)";
+	ForceField = "ForceField";
+	FS_Execute = "FS_Execute(script, side, keynum, message)";
+	Function = "function void expression(void)";
+	GameSkill = "int GameSkill(void)";
+	GameType = "int GameType(void)";
+	Generic_Ceiling = "Generic_Ceiling(tag, speed, height, target, flag)";
+	Generic_Crusher = "Generic_Crusher(tag, dspeed, uspeed, silent, crush)";
+	Generic_Crusher2 = "Generic_Crusher2(tag, dspeed, uspeed, silent, crush)";
+	Generic_Door = "Generic_Door(tag, speed, kind, delay, lock)";
+	Generic_Floor = "Generic_Floor(tag, speed, height, target, flags)";
+	Generic_Lift = "Generic_Lift(tag, speed, delay, type, height)";
+	Generic_Stairs = "Generic_Stairs(tag, speed, height, flags, reset)";
+	GetActorAngle = "fixed GetActorAngle(int tid)";
+	GetActorCeilingZ = "fixed GetActorCeilingZ(int tid)";
+	GetActorClass = "str GetActorClass(int tid)";
+	GetActorFloorZ = "fixed GetActorFloorZ(int tid)";
+	GetActorLightLevel = "int GetActorLightLevel(int tid)";
+	GetActorPitch = "fixed GetActorPitch(int tid)";
+	GetActorPowerupTics = "int GetActorPowerupTics(int tid, str powerup)";
+	GetActorProperty = "int GetActorProperty(int tid, int property)";
+	GetActorRoll = "fixed GetActorRoll(int tid)";
+	GetActorVelX = "fixed GetActorVelX(int tid)";
+	GetActorVelY = "fixed GetActorVelY(int tid)";
+	GetActorVelZ = "fixed GetActorVelZ(int tid)";
+	GetActorViewHeight = "fixed GetActorViewHeight(int tid)";
+	GetActorX = "fixed GetActorX(int tid)";
+	GetActorY = "fixed GetActorY(int tid)";
+	GetActorZ = "fixed GetActorZ(int tid)";
+	GetAirSupply = "int GetAirSupply(int playernum)";
+	GetAmmoCapacity = "int GetAmmoCapacity(str classname)";
+	GetArmorInfo = "mixed GetArmorInfo(int infotype)";
+	GetArmorType = "int GetArmorType(str armortype, int playernum)";
+	GetChar = "int GetChar(str string, int index)";
+	GetCVar = "int GetCVar(str cvar)";
+	GetCVarString = "str GetCVarString(str cvar)";
+	//GetInvasionState = "GetInvasionState()";
+	//GetInvasionWave = "GetInvasionWave()";
+	GetLevelInfo = "int GetLevelInfo(int levelinfo)";
+	GetLineActivation = "int GetLineActivation(int lineid)\nlineid: The id of the line of which to get the activation flags.\nReturns SPAC flags as a bitfield";
+	GetLineRowOffset = "int GetLineRowOffset(void)";
+	GetLineUDMFFixed = "fixed GetLineUDMFFixed(int lineid, str key)";
+	GetLineUDMFInt = "int GetLineUDMFInt(int lineid, str key)";
+	GetMaxInventory = "int GetMaxInventory(int tid, str inventory)";
+	GetPlayerInfo = "int GetPlayerInfo(int playernumber, int playerinfo)";
+	GetPlayerInput = "int GetPlayerInput(int player, int input)";
+	GetPolyobjX = "fixed GetPolyobjX(int polyid)";
+	GetPolyobjY = "fixed GetPolyobjY(int polyid)";
+	GetScreenHeight = "int GetScreenHeight(void)";
+	GetScreenWidth = "int GetScreenWidth(void)";
+	GetSectorCeilingZ = "int GetSectorCeilingZ(int tag, int x, int y)";
+	GetSectorFloorZ = "fixed GetSectorFloorZ(int tag, int x, int y)";
+	GetSectorLightLevel = "int GetSectorLightLevel(int tag)";
+	GetSectorUDMFFixed = "fixed GetSectorUDMFFixed(int tag, str key)";
+	GetSectorUDMFInt = "int GetSectorUDMFInt(int tag, str key)";
+	GetSideUDMFFixed = "fixed GetSideUDMFFixed(int lineid, bool side, str key)";
+	GetSideUDMFInt = "int GetSideUDMFInt(int lineid, bool side, str key)";
+	GetSigilPieces = "int GetSigilPieces(void)\nReturns the number of Sigil pieces that are held by the player";
+	GetThingUDMFFixed = "fixed GetThingUDMFFixed(int thingid, str key)";
+	GetThingUDMFInt = "int GetThingUDMFInt(int thingid, str key)";
+	GetUserArray = "void GetUserArray(int tid, str name, int pos)";
+	GetUserCVar = "int GetUserCVar(int playernumber, str cvar)";
+	GetUserCVarString = "str GetUserCVarString(int playernumber, str cvar)";
+	GetUserVariable = "int GetUserVariable(int tid, str name)";
+	GetWeapon = "str GetWeapon(void)\nReturns the class name of the weapon currently equipped by the player as a string";
+	GiveActorInventory = "void GiveActorInventory(int tid, str inventory_item, int amount)\nThis function will give the amount of items to the specifed actor.\nThis function does not treat tid 0 as the activator of the script";
+	GiveInventory = "void GiveInventory(str inventory_item, int amount)\nThis function will give the number of items specified to the activator.";
+	GlassBreak = "GlassBreak(dontspawnjunk)";
+	Global = "Global Int expression:identifier";
+	HealThing = "HealThing(amount)";
+	HudMessage = "void hudmessage(s:text; int type, int id, int color, fixed x, fixed y, fixed holdTime)";
+	HudMessageBold = "void HudMessageBold(s:text; int type, int id, int color, fixed x, fixed y, fixed holdTime)";
+	If = "if(expression)";
+	Int = "int expression";
+	//IsMultiplayer = "int IsMultiplayer(void)";
+	//IsOneFlagCTF = "int IsOneFlagCTF(void)";
+	IsPointerEqual = "bool IsPointerEqual(int ptr_select1, int ptr_select2[, int tid1[, int tid2]])";
+	IsTIDUsed = "bool IsTIDUsed(int tid)";
+	Light_ChangeToValue = "Light_ChangeToValue(tag, value)";
+	Light_Fade = "Light_Fade(tag, value, tics)";
+	Light_Flicker = "Light_Flicker(tag, upper, lower)";
+	Light_ForceLightning = "Light_ForceLightning(mode)";
+	Light_Glow = "Light_Glow(tag, upper, lower, tics)";
+	Light_LowerByValue = "Light_LowerByValue(tag, value)";
+	Light_MaxNeighbor = "Light_MaxNeighbor(tag)";
+	Light_MinNeighbor = "Light_MinNeighbor(tag)";
+	Light_RaiseByValue = "Light_RaiseByValue(tag, value)";
+	Light_Stop = "Light_Stop(tag)";
+	Light_Strobe = "Light_Strobe(tag, upper, lower, u-tics, l-tics)";
+	Light_StrobeDoom = "Light_StrobeDoom(tag, u-tics, l-tics)";
+	Lightning = "Script expression Lightning";
+	LineAttack = "LineAttack(int tid, fixed angle, fixed pitch, int damage[, str pufftype = 'BulletPuff'[, str damagetype = 'None'[, fixed range = 2048[, int flags = 0]]]])\nFires a hitscan attack. If tid is 0, the activator of the script is the source of the attack.";
+	Line_AlignCeiling = "Line_AlignCeiling(lineid, side)";
+	Line_AlignFloor = "Line_AlignFloor(lineid, side)";
+	Line_SetBlocking = "Line_SetBlocking(lineid, setflags, clearflags)";
+	Line_SetTextureOffset = "Line_SetTextureOffset(lineid, x, y, side, flags)";
+	Line_SetTextureScale = "Line_SetTextureScale(lineid, x, y, side, flags)";
+	LineSide = "int LineSide(void)";
+	LocalAmbientSound = "void LocalAmbientSound(str sound, int volume)";
+	LocalSetMusic = "void LocalSetMusic(str song[, int order[, int unused]])";
+	Log = "void Log(type:expression)\nLog will print something in the log area of the screen (top left), as well as logging it to the console.\nIt uses the same parameter format as the Print function.";
+	MorphActor = "int MorphActor(int tid, [str playerclass, [str monsterclass, [int duration, [int style, [str morphflash, [str unmorphflash]]]]]])";
+	NamedScriptWait = "void NamedScriptWait(str script)";
+	Net = "Script expression Net";
+	NoiseAlert = "NoiseAlert(target_tid, emiter_tid)";
+	Open = "Script expression Open";
+	PickActor = "bool PickActor(int source_tid, fixed angle, fixed pitch, fixed distance, int tid[, int actorMask = MF_SHOOTABLE[, int wallMask = ML_BLOCKEVERYTHING | ML_BLOCKHITSCAN[, bool forcetid = false]]])";
+	Pickup = "Script expression Pickup";
+	Pillar_Build = "Pillar_Build(tag, speed, height)";
+	Pillar_BuildAndCrush = "Pillar_BuildAndCrush(tag, speed, height, crush, crushmode)";
+	Pillar_Open = "Pillar_Open(tag, speed, fdist, cdist)";
+	Plat_DownByValue = "Plat_DownByValue(tag, speed, delay, height)";
+	Plat_DownWaitUpStay = "Plat_DownWaitUpStay(tag, speed, delay)";
+	Plat_DownWaitUpStayLip = "Plat_DownWaitUpStayLip(tag, speed, delay, lip, sound)";
+	Plat_PerpetualRaise = "Plat_PerpetualRaise(tag, speed, delay)";
+	Plat_PerpetualRaiseLip = "Plat_PerpetualRaiseLip(tag, speed, delay, lip)";
+	Plat_RaiseAndStayTx0 = "Plat_RaiseAndStayTx0(tag, speed, lockout)";
+	Plat_Stop = "Plat_Stop(tag)";
+	Plat_ToggleCeiling = "Plat_ToggleCeiling(tag)";
+	Plat_UpByValue = "Plat_UpByValue(tag, speed, delay, height)";
+	Plat_UpByValueStayTx = "Plat_UpByValueStayTx(tag, speed, height)";
+	Plat_UpNearestWaitDownStay = "Plat_UpNearestWaitDownStay(tag, speed, delay)";
+	Plat_UpWaitDownStay = "Plat_UpWaitDownStay(tag, speed, delay)";
+	PlayActorSound = "void PlayActorSound(int tid, int sound, int channel, fixed volume, bool looping, fixed attenuation)";
+	PlayerClass = "int PlayerClass(int playernumber)";
+	PlayerCount = "int PlayerCount(void)\nReturns the number of players currently in the game";
+	PlayerFrags = "int PlayerFrags(void)";
+	PlayerInGame = "bool PlayerInGame(int playernumber)\nReturns true if the player [0..7] is in the game";
+	PlayerIsBot = "bool PlayerIsBot(int playernumber)\nReturns TRUE if the player [0..7] is a bot and FALSE if not";
+	PlayerNumber = "int PlayerNumber(void)\nReturns the player number for the player who activated the script, starting at 0.\nFor scripts that were not activated by a player, PlayerNumber will return -1.";
+	PlaySound = "void PlaySound(int tid, str sound[, int channel = CHAN_BODY[, fixed volume = 1.0[, bool looping = false[, fixed attenuation = ATTN_NORM]]]])";
+	Polyobj_DoorSlide = "Polyobj_DoorSlide(po, speed, angle, dist, delay)";
+	Polyobj_DoorSwing = "Polyobj_DoorSwing(po, speed, angle, delay)";
+	Polyobj_Move = "Polyobj_Move(po, speed, angle, dist)";
+	Polyobj_MoveTimes8 = "Polyobj_MoveTimes8(po, speed, angle, dist)";
+	Polyobj_MoveTo = "Polyobj_MoveTo(po, speed, pos_x, pos_y)";
+	Polyobj_MoveToSpot = "Polyobj_MoveToSpot(po, speed, target)";
+	Polyobj_OR_Move = "Polyobj_OR_Move(po, speed, angle, distance)";
+	Polyobj_OR_MoveTimes8 = "Polyobj_OR_MoveTimes8(po, speed, angle, distance)";
+	Polyobj_OR_MoveTo = "Polyobj_OR_MoveTo(po, speed, pos_x, pos_y)";
+	Polyobj_OR_MoveToSpot = "Polyobj_OR_MoveToSpot(po, speed, target)";
+	Polyobj_OR_RotateLeft = "Polyobj_OR_RotateLeft(po, speed, angle)";
+	Polyobj_OR_RotateRight = "Polyobj_OR_RotateRight(po, speed, angle)";
+	Polyobj_RotateLeft = "Polyobj_RotateLeft(po, speed, angle)";
+	Polyobj_RotateRight = "Polyobj_RotateRight(po, speed, angle)";
+	Polyobj_Stop = "Polyobj_Stop(po)";
+	PolyWait = "void PolyWait(int polyid)";
+	Print = "void Print(type:expression)\nPrint will print something to the screen.\nPrint will only display for the activator of the script\nFor printing to all players, use PrintBold.";
+	PrintBold = "void PrintBold(type:expression)\nThis is exactly the same as Print, except all players will see the printed text\non the screen instead of just the activator of the script.";
+	QuakeEx = "bool QuakeEx(int tid, int intensityX, int intensityY, int intensityZ, int duration, int damrad, int tremrad, str sound[, int flags = 0[, float mulwavex = 1.0[, float mulwavey = 1.0[, float mulwavez = 1.0]]]])";
+	Radius_Quake = "Radius_Quake(intensity, duration, damrad, tremrad, tid)";
+	Radius_Quake2 = "void Radius_Quake2(int tid, int intensity, int duration, int damrad, int tremrad, str sound)";
+	Random = "int Random(int min, int max)";
+	ReplaceTextures = "void ReplaceTextures(str oldtexturename, str newtexturename[, int flags])\nReplaces all occurences of oldtexturename with newtexturename.\nNOT_ flags can be used.";
+	Respawn = "Script expression Respawn";
+	Restart = "Restart";
+	Return = "Return";
+	Script = "Script expression";
+	ScriptWait = "void ScriptWait(int script)";
+	Scroll_Ceiling = "Scroll_Ceiling(tag, x-move, y-move, unused)";
+	Scroll_Floor = "Scroll_Floor(tag, x-move, y-move, type)";
+	Scroll_Texture_Both = "Scroll_Texture_Both(lineid, left, right, down, up)";
+	Scroll_Wall = "Scroll_Wall(lineid, x, y, side, flags)";
+	Sector_ChangeFlags = "Sector_ChangeFlags(tag, setflags, clearflags)";
+	Sector_ChangeSound = "Sector_ChangeSound(tag, newsequence)";
+	Sector_SetCeilingPanning = "Sector_SetCeilingPanning(tag, u-int, u-frac, v-int, v-frac)";
+	Sector_SetCeilingScale = "Sector_SetCeilingScale(tag, u-int, u-frac, v-int, v-frac)";
+	Sector_SetCeilingScale2 = "Sector_SetCeilingScale2(tag, u-fixed, v-fixed)";
+	Sector_SetColor = "Sector_SetColor(tag, red, green, blue, desaturation)";
+	Sector_SetCurrent = "Sector_SetCurrent(tag, amount, angle, useline)";
+	Sector_SetDamage = "Sector_SetDamage(tag, amount, mod)";
+	Sector_SetFade = "Sector_SetFade(tag, red, green, blue)";
+	Sector_SetFloorPanning = "Sector_SetFloorPanning(tag, u-int, u-frac, v-int, v-frac)";
+	Sector_SetFloorScale = "Sector_SetFloorScale(tag, u-int, u-frac, v-int, v-frac)";
+	Sector_SetFloorScale2 = "Sector_SetFloorScale2(tag, u-fixed, v-fixed)";
+	Sector_SetFriction = "Sector_SetFriction(tag, amount)";
+	Sector_SetGravity = "Sector_SetGravity(tag, ipart, fpart)";
+	Sector_SetLink = "Sector_SetLink(controltag, tag, surface, movetype)";
+	Sector_SetPlaneReflection = "Sector_SetPlaneReflection(tag, floor, ceiling)";
+	Sector_SetRotation = "Sector_SetRotation(tag, floorangle, ceilingangle)";
+	Sector_SetTranslucent = "Sector_SetTranslucent(tag, plane, amount, type)";
+	Sector_SetWind = "Sector_SetWind(tag, amount, angle, useline)";
+	SectorDamage = "void SectorDamage(int tag, int amount, str type, str protection_item, int flags)\nDoes the damage only when the function is called,\nand damages everything in the tagged sector.\nUses DAMAGE_ flags.";
+	SectorSound = "void SectorSound(str sound, int volume)";
+	SendToCommunicator = "SendToCommunicator(voc_id, front_only, indentify, nolog)";
+	SetActivator = "int SetActivator(int tid[, int pointer_selector])\nThis changes the activator of the script to the first actor found with the specified tid.\ntid: TID of the new activator.\npointer_selector: the pointer of the TID to set as the new activator (use AAPTR_ flags).";
+	SetActivatorToTarget = "bool SetActivatorToTarget(int tid)\nThis changes the activator of the script to the current target\nof the first actor found with the specified tid.\nUsing a tid of 0 uses the current activator's target.";
+	SetActorAngle = "void SetActorAngle(int tid, fixed angle)\nSets the actor's angle.\nangle: a fixed point angle in the range of 0.0 to 1.0 (N = 0.25, W = 0.5, S = 0.75, E = 1.0).";
+	SetActorPitch = "void SetActorPitch(int tid, int pitch)\nSets the actor's Pitch.\npitch: a fixed point angle in the range of 0.0 to 1.0.";
+	SetActorPosition = "bool SetActorPosition(int tid, fixed x, fixed y, fixed z, bool fog)\nThis function sets the x, y, and z coordinates of the specified actor, with or without teleport fog.\nReturns TRUE if the actor position was changed successfully.";
+	SetActorProperty = "void SetActorProperty(int tid, int property, [int|float|str] value)\nproperty: one of the APROP_ properties.";
+	SetActorRoll = "void SetActorRoll(int tid, fixed angle)";
+	SetActorState = "int SetActorState(int tid, str statename[, bool exact])\nForces the actor(s) with the matching tid into the specified state, as defined in Decorate.\nIf tid is 0, the activator is affected.\nThe exact parameter specifies whether or not partial state name matches are accepted.";
+	SetActorVelocity = "bool SetActorVelocity(int tid, fixed velx, fixed vely, fixed velz, bool add, bool setbob)\nChanges actor velocity.\ntid: TID of things to affect. If 0, the activator is used.\nvelx, vely, velz: The desired velocity for the affected things.\nadd: If true, each affected actor's velocity is modified by the velx, vely\nand velz parameters, rather than replaced by them.\nsetbob: If true, the speed adjustment influences the bobbing of any concerned player actor.";
+	SetAirControl = "void SetAirControl(fixed amount)\nSets how well the player can move while in the air.\nThe default amount is 0.00390625.";
+	SetAirSupply = "bool SetAirSupply(int playernum, int tics)\nSets the amount of tics remaining in a player's air supply.";
+	SetAmmoCapacity = "void SetAmmoCapacity(str typename, int maxamount)\nSets the maximum amount of a type of ammo the player can carry.";
+	SetCameraToTexture = "void SetCameraToTexture(int cameratid, str texturename, int fov)\nBinds the named texture to the specified camera\n(which does not have to be an actual camera thing).\nThe texture used must be defined as a “cameratexture” in the ANIMDEFS lump.";
+	SetCeilingTrigger = "void SetCeilingTrigger(int tag, int height, int special[, int arg1[, int arg2[, int arg3[, int arg4[, int arg5]]]]])\nWhen the ceiling specified by tag moves the specified height,\nspecial(arg1, arg2, arg3, arg4, arg5) will be activated.";
+	SetCVar = "bool SetCVar(str cvar, int value)\nSets the value of a particular console variable.\nOnly mod-defined console variables through CVARINFO can be changed by using this function.\nReturns FALSE if cvar is invalid, or it is not writable.";
+	SetCVarString = "bool SetCVarString(str cvar, str value)\nSets the value of a particular console variable.\nOnly mod-defined console variables through CVARINFO can be changed by using this function.\nReturns FALSE if cvar is invalid, or it is not writable.";
+	SetFloorTrigger = "SetFloorTrigger(tag, height, special, arg1, arg2, arg3, arg4, arg5)";
+	SetFont = "void SetFont(str fontlump)\nSets the current font (only within the script) to fontlump";
+	SetGlobalFogParameter = "SetGlobalFogParameter(property, value)";
+	SetGravity = "void SetGravity(fixed amount)\nThis function sets the global gravity of an entire level.\nDefault is 800.0";
+	SetHUDClipRect = "void SetHUDClipRect(int x, int y, int width, int height[, int wrapwidth = 0[, bool aspectratio = true]])\nSets the clipping rectangle for future HUD messages.";
+	SetHudSize = "void SetHudSize(int width, int height, bool statusbar)\nCauses text messages to be stretched or shrunk to match the size\nthey would appear if the user's resolution was width by height.";
+	SetHUDWrapWidth = "void SetHudWrapWidth(int wrapwidth)\nSets the wrapping width for future HUD messages without altering the clipping rectangle.\nIf you set the wrapping width to 0, messages will wrap\nto the full width of the HUD, as normal.";
+	SetLineActivation = "void SetLineActivation(int lineid, int activation)\nSets the line activation flags of the line with the specified id.\nlineid: The id of the line of which to set the activation flags\nactivation: SPAC_ flags to set. Multiple flags can be set by using the pipe character | between the constant names.";
+	SetLineBlocking = "void SetLineBlocking(int lineid, int blocking)\nDEPRECATED!\nUse Line_SetBlocking instead!";
+	SetLineMonsterBlocking = "void SetLineMonsterBlocking(int lineid, int setting)\nDEPRECATED!\nUse Line_SetBlocking instead!";
+	SetLineSpecial = "void SetLineSpecial(int lineid, int special[, int arg0[, int arg1[, int arg2[, int arg3[, int arg4]]]]])\nSetLineSpecial will change the special on all lines with the line id number specified.";
+	SetLineTexture = "void SetLineTexture(int lineid, int line_side, int sidedef_texture, str texturename)\nSetLineTexture will change the specified texture on all lines with the line id number specified\nline_side: SIDE_ flags can be used.\nsidedef_texture: TEXTURE_ flags can be used.\ntexturename: the texture that will be set on the line. Use '-' to remove a texture.";
+	SetMarineSprite = "void SetMarineSprite(int tid, str actorclass)\nChanges a Scripted Marine's sprite to match the sprite\nused in the specified actor's spawn state.";
+	SetMarineWeapon = "void SetMarineWeapon(int tid, int weapon)\nSets a Scripted Marine's weapon on the fly.\nweapon: one of MARINEWEAPON_ flags";
+	SetMugShotState = "void SetMugShotState(str state)\nSets the state of the mug shot in SBARINFO status bars.\nThe state you set will only be interrupted by damage or if the player\npicks up a weapon, provided the mugshot supports it.";
+	SetMusic = "void SetMusic(str song[, int order[, int unused]])";
+	SetPlayerProperty = "SetPlayerProperty(who, set, which)";
+	SetPointer = "bool SetPointer(int assign_slot, int tid[, int pointer_selector[, int flags]])\nSet the value of one of the caller's stored pointers.";
+	SetResultValue = "void SetResultValue(int value)";
+	SetSkyScrollSpeed = "void SetSkyScrollSpeed(int sky, fixed skyspeed)\nChanges the scrolling speed of a sky.\nThis is useful in conjunction with ChangeSky.\nsky: either 1 or 2.\nskyspeed: the desired scrolling speed.";
+	SetActorTeleFog = "void SetActorTeleFog(int tid, str telefogsrcclass, str telefogdestclass";
+	SetThingSpecial = "void SetThingSpecial(int tid, int special[, int arg0[, int arg1[, int arg2[, int arg3[, int arg4]]]]])\nSets the special for any things with the same TID.\nThis is similar to Thing_SetSpecial, except it can only be used from ACS,\nand it can set all of a thing's special arguments.\nIf tid is 0, then the activator is used.";
+	SetUserArray = "void SetUserArray(int tid, str name, int pos, int value)\nSets one of the affected actor's user array-bound variables.";
+	SetUserCVar = "bool SetUserCVar(int playernumber, str cvar, int value)\nSets the console variable of a particular player.\nOnly mod-defined console variables through CVARINFO can be changed by using this function.\nReturns FALSE if cvar is invalid, it is not writable, or the player doesn't exist.";
+	SetUserCVarString = "bool SetUserCVarString(int playernumber, str cvar, str value)\nSets the console variable of a particular player.\nOnly mod-defined console variables through CVARINFO can be changed by using this function.\nReturns FALSE if cvar is invalid, it is not writable, or the player doesn't exist.";
+	SetUserVariable = "void SetUserVariable(int tid, str name, int value)\nSets one of the affected actor's user variables.";
+	SetWeapon = "bool SetWeapon(str weaponname)\nSets the player's current weapon to weaponname.\nReturns TRUE if the weapon was set successfully, and FALSE if not.";
+	sin = "fixed Sin(int angle)";
+	SoundSequence = "void SoundSequence(str sndseq)\nPlays a sound sequence defined in SNDSEQ lump.";
+	SoundSequenceOnActor = "void SoundSequenceOnActor(int tid, str sndseq)\nPlays a sound sequence defined in SNDSEQ lump.";
+	SoundSequenceOnPolyObj = "void SoundSequenceOnPolyobj(int polynum, str sndseq)\nPlays a sound sequence defined in SNDSEQ lump.";
+	SoundSequenceOnSector = "void SoundSequenceOnSector(int tag, str sndseq, int location)\nPlays a sound sequence defined in SNDSEQ lump.";
+	SoundVolume = "void SoundVolume(int tid, int channel, fixed volume)\nChanges the volume of the currently playing sound by the actor(s) with the specified tid.\nIf tid is 0, the sound volume change is done to the sound being played by the activator of the script.";
+	Spawn = "int Spawn(str classname, fixed x, fixed y, fixed z[, int tid[, int angle]])\nSpawns an actor at the given X, Y and Z coordinates.\nOptionally a TID and a byte angle can be specified.";
+	SpawnForced = "int SpawnForced(str classname, fixed x, fixed y, fixed z[, int tid[, int angle]])\nForces the actor to spawn, even in conditions where the spawning would normally fail.\nThe return value is the number of things spawned.";
+	SpawnDecal = "int SpawnDecal(int tid, str decalname, int flags[, fixed angle = 0.0[, fixed zoffset = 0.0[, fixed distance = 64.0]]])\nCreates a decal on a wall by tracing a line from the actor with the\nspecified tid until hitting said wall, on which the decal is then created.\nIf tid is 0, the tracing is done from the activator of the script.\ndecalname: The name of the decal to create, as defined in DECALDEF.\nflags: use SDF_ flags\nThe return value of the function is the number of decals spawned.";
+	SpawnProjectile = "void SpawnProjectile(int tid, str type, int angle, int speed, int vspeed, int gravity, int newtid)";
+	SpawnSpot = "int SpawnSpot(str classname, int spottid[, int tid[, int angle]])\nRequires a MapSpot at the location where you want the Actor to spawn.\nThe return value is the number of things spawned.";
+	SpawnSpotFacing = "int SpawnSpotFacing(str classname, int spottid[, int tid])\nRequires a MapSpot at the location where you want the Actor to spawn.\nThe thing will assume the angle of the mapspot it is spawned to.\nThe return value is the number of things spawned.";
+	SpawnSpotFacingForced = "int SpawnSpotFacingForced(str classname, int spottid[, int tid])\nRequires a MapSpot at the location where you want the Actor to spawn.\nForces the actor to spawn, even in conditions where the spawning would normally fail.\nThe thing will assume the angle of the mapspot it is spawned to.\nThe return value is the number of things spawned.";
+	SpawnSpotForced = "int SpawnSpotForced(str classname, int spottid[, int tid[, int angle]])\nRequires a MapSpot at the location where you want the Actor to spawn.\nForces the actor to spawn, even in conditions where the spawning would normally fail.\nThe return value is the number of things spawned.";
+	Special = "Special";
+	Sqrt = "int Sqrt(int number)";
+	Stairs_BuildDown = "Stairs_BuildDown(tag, speed, height, delay, reset)";
+	Stairs_BuildDownSync = "Stairs_BuildDownSync(tag, speed, height, reset)";
+	Stairs_BuildUp = "Stairs_BuildUp(tag, speed, height, delay, reset)";
+	Stairs_BuildUpDoom = "Stairs_BuildUpDoom(tag, speed, height, delay, reset)";
+	Stairs_BuildUpSync = "Stairs_BuildUpSync(tag, speed, height, reset)";
+	StartConversation = "StartConversation(talker_tid, facetalker)";
+	StopSound = "void StopSound(int tid, int channel)\nStops the sound currently playing on the specified channel for the actor with matching tid";
+	str = "str expression";
+	StrCmp = "int StrCmp(str string1, str string2[, int maxcomparenum])\nCompares the two strings passed in arguments string1 and string2 character by character.\nIf maxcomparenum is specified, it only compares up to maxcomparenum characters of each string.";
+	StrCpy = "bool StrCpy(a:destination, str source[, int source_index])\nCopy a source string to a destination array as a series of characters.\nOptionally, the copy can start from a given index in the source string.\nReturns TRUE if the entire string (or substring) was successfully copied to the array;\nFALSE if the copy ran out of room or if a negative source_index was given.";
+	StrIcmp = "int StrCmp(str string1, str string2[, int maxcomparenum])\nStrIcmp is case-insensitive version of StrCmp";
+	StrLeft = "str StrLeft(str string, int length)\nCreates a new string containing the length first characters of string.\nIf string does not exist, an empty string is returned.\nIf string is shorter than length characters, the entire string is returned."; 
+	StrLen = "int StrLen(str string)";
+	StrMid = "str StrMid(str string, int start, int length)\nCreates a new string containing the length characters of string starting from the one at position start.\nIf string does not exist or is shorter than start characters, an empty string is returned. \nIf string is shorter than start + length characters, the entire substring beginning at start is returned."; 
+	StrParam = "int StrParam(type:expression)\nStrParam will create a new string formatted based upon the same method for Print or Log.\nThe return value is the string table index of the new string.";
+	StrRight = "str StrRight(str string, int length)\nCreates a new string containing the length last characters of string.\nIf string does not exist, an empty string is returned.\nIf string is shorter than length characters, the entire string is returned."; 
+	Suspend = "Suspend";
+	SwapActorTeleFog = "int SwapActorTeleFog(int tid)";
+	Switch = "Switch(expression)";
+	TagWait = "void TagWait(int tag)";
+	TakeActorInventory = "void TakeActorInventory(int tid, str inventory_item, int amount)\nThis function will take the amount of items from the specified actor.\nTakeActorInventory can remove items that are flagged as undroppable.";
+	TakeInventory = "void TakeInventory(str inventory_item, int amount)\nThis function will take the number of items specified from the activator.\nTakeInventory can remove items that are flagged as undroppable.";
+	Teleport = "Teleport(tid, tag, nosourcefog)";
+	Teleport_EndGame = "Teleport_EndGame()";
+	Teleport_NewMap = "Teleport_NewMap(map, pos, face)";
+	Teleport_NoFog = "Teleport_NoFog(tid, useangle, tag)";
+	Teleport_NoStop = "Teleport_NoStop(tid, tag, nofog)";
+	Teleport_ZombieChanger = "Teleport_ZombieChanger(tid, tag)";
+	TeleportGroup = "TeleportGroup(groupid, sourceid, destinationid, movesource, fog)";
+	TeleportInSector = "TeleportInSector(tag, sourceid, destinationid, fog, groupid)";
+	TeleportOther = "TeleportOther(tid, destinationid, fog)";
+	Terminate = "Terminate";
+	Thing_Activate = "Thing_Activate(tid)";
+	Thing_ChangeTID = "Thing_ChangeTID(oldtid, newtid)";
+	Thing_Damage = "Thing_Damage(tid, amount, mod)";
+	Thing_Damage2 = "int Thing_Damage2(int tid, int amount, str type)\nDamages the specified actor.\nDamage type is specified by name.";
+	Thing_Deactivate = "Thing_Deactivate(tid)";
+	Thing_Destroy = "Thing_Destroy(tid, extreme, tag)";
+	Thing_Hate = "Thing_Hate(hater, hatee, type)";
+	Thing_Move = "Thing_Move(tid, destid, nofog)";
+	Thing_Projectile = "Thing_Projectile(tid, type, angle, speed, vspeed)";
+	Thing_Projectile2 = "void Thing_Projectile2(int tid, int type, int angle, int speed, int vspeed, int gravity, int newtid)";
+	Thing_ProjectileAimed = "Thing_ProjectileAimed(tid, type, speed, target, newtid)";
+	Thing_ProjectileGravity = "Thing_ProjectileGravity(tid, type, angle, speed, vspeed)";
+	Thing_ProjectileIntercept = "Thing_ProjectileIntercept(tid, type, speed, target, newtid)";
+	Thing_Raise = "Thing_Raise(tid)";
+	Thing_Remove = "Thing_Remove(tid)";
+	Thing_SetConversation = "Thing_SetConversation(tid, conversationid)";
+	Thing_SetGoal = "Thing_SetGoal(tid, goal, delay, dontchasetarget)";
+	Thing_SetSpecial = "Thing_SetSpecial(tid, special, arg1, arg2, arg3)";
+	Thing_SetTranslation = "Thing_SetTranslation(tid, translation)";
+	Thing_Spawn = "Thing_Spawn(tid, type, angle, newtid)";
+	Thing_SpawnFacing = "Thing_SpawnFacing(tid, type, nofog, newtid)";
+	Thing_SpawnNoFog = "Thing_SpawnNoFog(tid, type, angle, newtid)";
+	Thing_Stop = "Thing_Stop(tid)";
+	ThingCount = "int ThingCount(int type, int tid)";
+	ThingCountName = "int ThingCountName(str classname, int tid)";
+	ThingCountNameSector = "int ThingCountNameSector(str classname, int tid, int tag)";
+	ThingCountSector = "int ThingCountSector(int type, int tid, int tag)";
+	ThingSound = "void ThingSound(int tid, str sound, int volume)\nPlays a sound at a thing.\nThis is a point sound, so anyone far away will not hear it as loudly";
+	ThrustThing = "ThrustThing(angle, force, nolimit, tid)";
+	ThrustThingZ = "ThrustThingZ(tid, speed, up_or_down, add_or_set)";
+	Timer = "int Timer(void)";
+	TranslucentLine = "TranslucentLine(lineid, amount, additive, moreflags)";
+	UniqueTID = "int UniqueTID([int tid[, int limit]])";
+	Unloading = "Script expression Unloading";
+	UnMorphActor = "int UnMorphActor(int tid[, bool force])";
+	Until = "Until(expression)";
+	UseActorInventory = "int UseActorInventory(int tid, str classname)\nForces the actor(s) with the specified tid to use an item from their inventory, if they have one.\nReturns TRUE if the item was used successfully.";
+	UseInventory = "int UseInventory(str classname)\nForces the activator to use the specified inventory item, if he has it.\nReturns TRUE if the item was used successfully.";
+	UsePuzzleItem = "UsePuzzleItem(item, script, arg1, arg2, arg3)";
+	VectorAngle = "fixed VectorAngle(int x, int y)";
+	VectorLength = "int VectorLength(int x, int y)";
+	Void = "void";
+	Warp = "bool Warp(int destinationtid, fixed xofs, fixed yofs, fixed zofs, int angle, int flags[, str success_state[, bool exactstate[, fixed heightoffset]]])";
+	While = "while(expression)";
+	WhiteReturn = "Script expression WhiteReturn";
+	World = "World Int expression:identifier";
+}
+
+constants
+{
+	AAPTR_DEFAULT;
+	AAPTR_FRIENDPLAYER;
+	AAPTR_GET_LINETARGET;
+	AAPTR_MASTER;
+	AAPTR_NULL;
+	AAPTR_PLAYER_GETCONVERSATION;
+	AAPTR_PLAYER_GETTARGET;
+	AAPTR_PLAYER1;
+	AAPTR_PLAYER2;
+	AAPTR_PLAYER3;
+	AAPTR_PLAYER4;
+	AAPTR_PLAYER5;
+	AAPTR_PLAYER6;
+	AAPTR_PLAYER7;
+	AAPTR_PLAYER8;
+	AAPTR_TARGET;
+	AAPTR_TRACER;
+	ACTOR_ALIVE;
+	ACTOR_BOT;
+	ACTOR_DEAD;
+	ACTOR_GENERIC;
+	ACTOR_MISSILE;
+	ACTOR_MONSTER;
+	ACTOR_NONE;
+	ACTOR_PLAYER;
+	ACTOR_VOODOODOLL;
+	ACTOR_WORLD;
+	APROP_Accuracy;
+	APROP_ActiveSound;
+	APROP_Alpha;
+	APROP_Ambush;
+	APROP_AttackSound;
+	APROP_AttackZOffset;
+	APROP_ChaseGoal;
+	APROP_Damage;
+	APROP_DamageFactor;
+	APROP_DamageMultiplier;
+	APROP_DeathSound;
+	APROP_Dormant;
+	APROP_Dropped;
+	APROP_Friction;
+	APROP_Friendly;
+	APROP_Frightened;
+	APROP_Gravity;
+	APROP_Health;
+	APROP_Height;
+	APROP_Invulnerable;
+	APROP_JumpZ;
+	APROP_Mass;
+	APROP_MasterTID;
+	APROP_MeleeRange;
+	APROP_NameTag;
+	APROP_NoTarget;
+	APROP_NoTrigger;
+	APROP_PainSound;
+	APROP_Radius;
+	APROP_RenderStyle;
+	APROP_ScaleX;
+	APROP_ScaleY;
+	APROP_Score;
+	APROP_SeeSound;
+	APROP_SpawnHealth;
+	APROP_Species;
+	APROP_Speed;
+	APROP_Stamina;
+	APROP_StencilColor;
+	APROP_TargetTID;
+	APROP_TracerTID;
+	APROP_ViewHeight;
+	APROP_Waterlevel;
+	ARMORINFO_CLASSNAME;
+	ARMORINFO_SAVEAMOUNT;
+	ARMORINFO_ACTUALSAVEAMOUNT;
+	ARMORINFO_SAVEPERCENT;
+	ARMORINFO_MAXABSORB;
+	ARMORINFO_MAXFULLABSORB;
+	ATTN_IDLE;
+	ATTN_NONE;
+	ATTN_NORM;
+	ATTN_STATIC;
+	BLOCK_CREATURES;
+	BLOCK_EVERYTHING;
+	BLOCK_NOTHING;
+	BLOCK_PLAYERS;
+	BLOCK_RAILING;
+	BLOCKF_CREATURES;
+	BLOCKF_EVERYTHING;
+	BLOCKF_FLOATERS;
+	BLOCKF_HITSCAN;
+	BLOCKF_MONSTERS;
+	BLOCKF_PLAYERS;
+	BLOCKF_PROJECTILES;
+	BLOCKF_RAILING;
+	BLOCKF_SIGHT;
+	BLOCKF_USE;
+	BT_ALTATTACK;
+	BT_ATTACK;
+	BT_BACK;
+	BT_CROUCH;
+	BT_FORWARD;
+	BT_JUMP;
+	BT_LEFT;
+	BT_LOOKDOWN;
+	BT_LOOKUP;
+	BT_MOVEDOWN;
+	BT_MOVELEFT;
+	BT_MOVERIGHT;
+	BT_MOVEUP;
+	BT_RELOAD;
+	BT_RIGHT;
+	BT_SHOWSCORES;
+	BT_SPEED;
+	BT_STRAFE;
+	BT_TURN180;
+	BT_USE;
+	BT_USER1;
+	BT_USER2;
+	BT_USER3;
+	BT_USER4;
+	BT_ZOOM;
+	CARRY;
+	CHAN_AREA;
+	CHAN_AUTO;
+	CHAN_BODY;
+	CHAN_ITEM;
+	CHAN_LISTENERZ;
+	CHAN_LOOP;
+	CHAN_MAYBE_LOCAL;
+	CHAN_NOPAUSE;
+	CHAN_UI;
+	CHAN_VOICE;
+	CHAN_WEAPON;
+	CHAN_5;
+	CHAN_6;
+	CHAN_7;
+	CHANGELEVEL_KEEPFACING;
+	CHANGELEVEL_NOINTERMISSION;
+	CHANGELEVEL_NOMONSTERS;
+	CHANGELEVEL_PRERAISEWEAPON;
+	CHANGELEVEL_RESETHEALTH;
+	CHANGELEVEL_RESETINVENTORY;
+	CLASS_CLERIC;
+	CLASS_FIGHTER;
+	CLASS_MAGE;
+	CR_BLACK;
+	CR_BLUE;
+	CR_BRICK;
+	CR_BROWN;
+	CR_CREAM;
+	CR_CYAN;
+	CR_DARKBROWN;
+	CR_DARKGRAY;
+	CR_DARKGREEN;
+	CR_DARKGREY;
+	CR_DARKRED;
+	CR_GOLD;
+	CR_GRAY;
+	CR_GREEN;
+	CR_GREY;
+	CR_LIGHTBLUE;
+	CR_OLIVE;
+	CR_ORANGE;
+	CR_PURPLE;
+	CR_RED;
+	CR_TAN;
+	CR_UNTRANSLATED;
+	CR_WHITE;
+	CR_YELLOW;
+	CSF_NOBLOCKALL;
+	CSF_NOFAKEFLOORS;
+	DAMAGE_IN_AIR;
+	DAMAGE_NONPLAYERS;
+	DAMAGE_PLAYERS;
+	DAMAGE_SUBCLASSES_PROTECT;
+	FALSE;
+	FHF_NORANDOMPUFFZ;
+	FHF_NOIMPACTDECAL;
+	FOGP_DENSITY;
+	FOGP_OUTSIDEDENSITY;
+	FOGP_SKYFOG;
+	GAME_NET_COOPERATIVE;
+	GAME_NET_DEATHMATCH;
+	GAME_SINGLE_PLAYER;
+	GAME_TITLE_MAP;
+	HUDMSG_ADDBLEND;
+	HUDMSG_ALPHA;
+	HUDMSG_COLORSTRING;
+	HUDMSG_FADEINOUT;
+	HUDMSG_FADEOUT;
+	HUDMSG_LAYER_OVERHUD;
+	HUDMSG_LAYER_OVERMAP;
+	HUDMSG_LAYER_UNDERHUD;
+	HUDMSG_LOG;
+	HUDMSG_NOTWITH3DVIEW;
+	HUDMSG_NOTWITHFULLMAP;
+	HUDMSG_NOTWITHOVERLAYMAP;
+	HUDMSG_NOWRAP;
+	HUDMSG_PLAIN;
+	HUDMSG_TYPEON;
+	INPUT_BUTTONS;
+	INPUT_FORWARDMOVE;
+	INPUT_OLDBUTTONS;
+	INPUT_PITCH;
+	INPUT_ROLL;
+	INPUT_SIDEMOVE;
+	INPUT_UPMOVE;
+	INPUT_YAW;
+	IS_BOSSFIGHT;
+	IS_COUNTDOWN;
+	IS_FIRSTCOUNTDOWN;
+	IS_INPROGRESS;
+	IS_WAITINGFORPLAYERS;
+	IS_WAVECOMPLETE;
+	LEVELINFO_CLUSTERNUM;
+	LEVELINFO_FOUND_ITEMS;
+	LEVELINFO_FOUND_SECRETS;
+	LEVELINFO_KILLED_MONSTERS;
+	LEVELINFO_LEVELNUM;
+	LEVELINFO_PAR_TIME;
+	LEVELINFO_SUCK_TIME;
+	LEVELINFO_TOTAL_ITEMS;
+	LEVELINFO_TOTAL_MONSTERS;
+	LEVELINFO_TOTAL_SECRETS;
+	LINE_BACK;
+	LINE_FRONT;
+	MARINEWEAPON_BerserkFist;
+	MARINEWEAPON_BFG;
+	MARINEWEAPON_Chaingun;
+	MARINEWEAPON_Chainsaw;
+	MARINEWEAPON_Dummy;
+	MARINEWEAPON_Fist;
+	MARINEWEAPON_Pistol;
+	MARINEWEAPON_PlasmaRifle;
+	MARINEWEAPON_Railgun;
+	MARINEWEAPON_RocketLauncher;
+	MARINEWEAPON_Shotgun;
+	MARINEWEAPON_SuperShotgun;
+	MF_SPECIAL;
+	MF_SOLID;
+	MF_SHOOTABLE;
+	MF_NOSECTOR;
+	MF_NOBLOCKMAP;
+	MF_AMBUSH;
+	MF_JUSTHIT;
+	MF_JUSTATTACKED;
+	MF_SPAWNCEILING;
+	MF_NOGRAVITY;
+	MF_DROPOFF;
+	MF_PICKUP;
+	MF_NOCLIP;
+	MF_INCHASE;
+	MF_FLOAT;
+	MF_TELEPORT;
+	MF_MISSILE;
+	MF_DROPPED;
+	MF_SHADOW;
+	MF_NOBLOOD;
+	MF_CORPSE;
+	MF_INFLOAT;
+	MF_INBOUNCE;
+	MF_COUNTKILL;
+	MF_COUNTITEM;
+	MF_SKULLFLY;
+	MF_NOTDMATCH;
+	MF_SPAWNSOUNDSOURCE;
+	MF_FRIENDLY;
+	MF_UNMORPHED;
+	MF_NOLIFTDROP;
+	MF_STEALTH;
+	MF_ICECORPSE;
+	ML_BLOCKING;
+	ML_BLOCKMONSTERS;
+	ML_TWOSIDED;
+	ML_DONTPEGTOP;
+	ML_DONTPEGBOTTOM;
+	ML_SECRET;
+	ML_SOUNDBLOCK;
+	ML_DONTDRAW;
+	ML_MAPPED;
+	ML_REPEAT_SPECIAL;
+	ML_ADDTRANS;
+	ML_MONSTERSCANACTIVATE;
+	ML_BLOCK_PLAYERS;
+	ML_BLOCKEVERYTHING;
+	ML_ZONEBOUNDARY;
+	ML_RAILING;
+	ML_BLOCK_FLOATERS;
+	ML_CLIP_MIDTEX;
+	ML_WRAP_MIDTEX;
+	ML_3DMIDTEX;
+	ML_CHECKSWITCHRANGE;
+	ML_FIRSTSIDEONLY;
+	ML_BLOCKPROJECTILE;
+	ML_BLOCKUSE;
+	ML_BLOCKSIGHT;
+	ML_BLOCKHITSCAN;
+	MOD_BFG_SPLASH;
+	MOD_CRUSH;
+	MOD_DISINTEGRATE;
+	MOD_ELECTRIC;
+	MOD_EXIT;
+	MOD_FALLING;
+	MOD_HIT;
+	MOD_ICE;
+	MOD_LAVA;
+	MOD_POISON;
+	MOD_RAILGUN;
+	MOD_SLIME;
+	MOD_SUICIDE;
+	MOD_TELEFRAG;
+	MOD_UNKNOWN;
+	MOD_WATER;
+	MODINPUT_BUTTONS;
+	MODINPUT_FORWARDMOVE;
+	MODINPUT_OLDBUTTONS;
+	MODINPUT_PITCH;
+	MODINPUT_ROLL;
+	MODINPUT_SIDEMOVE;
+	MODINPUT_UPMOVE;
+	MODINPUT_YAW;
+	MOVIE_Failed;
+	MOVIE_Played;
+	MOVIE_Played_Aborted;
+	MOVIE_Played_NoVideo;
+	MRF_ADDSTAMINA;
+	MRF_FAILNOLAUGH;
+	MRF_FAILNOTELEFRAG;
+	MRF_FULLHEALTH;
+	MRF_LOSEACTUALWEAPON;
+	MRF_NEWTIDBEHAVIOUR;
+	MRF_OLDEFFECTS;
+	MRF_UNDOBYCHAOSDEVICE;
+	MRF_UNDOBYDEATH;
+	MRF_UNDOBYDEATHFORCED;
+	MRF_UNDOBYDEATHSAVES;
+	MRF_UNDOBYTOMEOFPOWER;
+	MRF_WHENINVULNERABLE;
+	NO;
+	NO_CHANGE;
+	NOT_BOTTOM;
+	NOT_CEILING;
+	NOT_FLOOR;
+	NOT_MIDDLE;
+	NOT_TOP;
+	OFF;
+	ON;
+	PICKAF_FORCETID;
+	PICKAF_RETURNTID;
+	PLAYERINFO_AIMDIST;
+	PLAYERINFO_COLOR;
+	PLAYERINFO_DESIREDFOV;
+	PLAYERINFO_FOV;
+	PLAYERINFO_GENDER;
+	PLAYERINFO_MOVEBOB;
+	PLAYERINFO_NEVERSWITCH;
+	PLAYERINFO_PLAYERCLASS;
+	PLAYERINFO_STILLBOB;
+	PLAYERINFO_TEAM;
+	PRINTNAME_LEVEL;
+	PRINTNAME_LEVELNAME;
+	PRINTNAME_SKILL;
+	PROP_ALLMAP;
+	PROP_BUDDHA;
+	PROP_FLIGHT;
+	PROP_FLY;
+	PROP_FROZEN;
+	PROP_INFRARED;
+	PROP_INSTANTWEAPONSWITCH;
+	PROP_INVISIBILITY;
+	PROP_INVULNERABILITY;
+	PROP_NOTARGET;
+	PROP_RADIATIONSUIT;
+	PROP_SPEED;
+	PROP_STRENGTH;
+	PROP_TOTALLYFROZEN;
+	PROP_WEAPONLEVEL2;
+	PTROP_NOSAFEGUARDS;
+	PTROP_UNSAFEMASTER;
+	PTROP_UNSAFETARGET;
+	QF_RELATIVE;
+	QF_SCALEDOWN;
+	QF_SCALEUP;
+	QF_MAX;
+	QF_FULLINTENSITY;
+	QF_WAVE;
+	SCROLL;
+	SCROLL_AND_CARRY;
+	SDF_ABSANGLE;
+	SDF_PERMANENT;
+	SECF_FLOORDROP;
+	SECF_NOFALLINGDAMAGE;
+	SECF_NORESPAWN;
+	SECF_SILENT;
+	SECSEQ_CEILING;
+	SECSEQ_FLOOR;
+	SECSEQ_FULLHEIGHT;
+	SECSEQ_INTERIOR;
+	SIDE_BACK;
+	SIDE_FRONT;
+	SKILL_EASY;
+	SKILL_HARD;
+	SKILL_NORMAL;
+	SKILL_VERY_EASY;
+	SKILL_VERY_HARD;
+	SPAC_None;
+	SPAC_Cross;
+	SPAC_Use;
+	SPAC_MCross;
+	SPAC_Impact;
+	SPAC_Push;
+	SPAC_PCross;
+	SPAC_UseThrough;
+	SPAC_AnyCross;
+	SPAC_MUse;
+	SPAC_MPush;
+	SPAC_UseBack;
+	STYLE_Add;
+	STYLE_AddStencil;
+	STYLE_AddShaded;
+	STYLE_Fuzzy;
+	STYLE_None;
+	STYLE_Normal;
+	STYLE_OptFuzzy;
+	STYLE_Shaded;
+	STYLE_Shadow;
+	STYLE_SoulTrans;
+	STYLE_Stencil;
+	STYLE_Subtract;
+	STYLE_Translucent;
+	STYLE_TranslucentStencil;
+	T_ABADDON;
+	T_ABADDONSHOT;
+	T_AMMOBOX;
+	T_AMULETOFWARDING;
+	T_ANTIGRAVBELT;
+	T_ARACHNOTRON;
+	T_ARACHNOTRONPLASMA;
+	T_ARMORBONUS;
+	T_ARROW;
+	T_AXEKEY;
+	T_BACKPACK;
+	T_BARON;
+	T_BARONBALL;
+	T_BARREL;
+	T_BATTERY;
+	T_BEAST;
+	T_BEASTBALL;
+	T_BELPHEGOR;
+	T_BERSERK;
+	T_BFG;
+	T_BFG10000;
+	T_BFG10KSHOT;
+	T_BFGSHOT;
+	T_BISHOP;
+	T_BLADE;
+	T_BLASTER;
+	T_BLOOD;
+	T_BLOODDEMON;
+	T_BLOODPOOL;
+	T_BLOODPOOL1;
+	T_BLOODPOOL2;
+	T_BLUEARMOR;
+	T_BLUEFLAG;
+	T_BLUEKEY;
+	T_BLUEKEYCARD;
+	T_BLUESKULLKEY;
+	T_BLUETELEGLITTER;
+	T_BOUNCYMACEBALL;
+	T_BRAINS;
+	T_BRIDGE;
+	T_CACODEMON;
+	T_CACODEMONSHOT;
+	T_CACOLANTERN;
+	T_CACOLANTERNSHOT;
+	T_CELL;
+	T_CENTAUR;
+	T_CENTAUR_MASH;
+	T_CENTAURLEADER;
+	T_CHAINGUN;
+	T_CHAINGUY;
+	T_CHAINSAW;
+	T_CHICKEN;
+	T_CLERICHOLY1;
+	T_CLERICHOLY2;
+	T_CLERICHOLY3;
+	T_CLERICSTAFF;
+	T_CLINK;
+	T_CLIP;
+	T_COMPUTERMAP;
+	T_CROSSBOW;
+	T_CROSSBOWMAINBLAST;
+	T_CROSSBOWMINIBLAST;
+	T_CROSSBOWPOWERBLAST;
+	T_CYBERDEMON;
+	T_DARKIMP;
+	T_DARKIMPFIREBALL;
+	T_DART;
+	T_DEATHBALL;
+	T_DEMON;
+	T_DEMON_MASH;
+	T_DEMON1;
+	T_DEMON2_MASH;
+	T_DIRT1;
+	T_DIRT2;
+	T_DIRT3;
+	T_DIRT4;
+	T_DIRT5;
+	T_DIRT6;
+	T_DOOMSPHERE;
+	T_DRAGONSKINBRACERS;
+	T_DRAIN;
+	T_DSPARILALONE;
+	T_DSPARILBLUESHOT;
+	T_DSPARILONSERPENT;
+	T_DSPARILTELEPORTDEST;
+	T_DSPARILWIZARDSPAWNER;
+	T_EMERALDKEY;
+	T_ETTIN;
+	T_ETTIN_MASH;
+	T_FALCONSHIELD;
+	T_FEATHER;
+	T_FIGHTERAXE;
+	T_FIGHTERHAMMER;
+	T_FIGHTERSWORD1;
+	T_FIGHTERSWORD2;
+	T_FIGHTERSWORD3;
+	T_FIREBALL1;
+	T_FIREGARGOYLE;
+	T_FIREKEY;
+	T_FLAME_LARGE;
+	T_FLAME_SMALL;
+	T_FLAMINGBARREL;
+	T_FLESH_DRIP1;
+	T_FLESH_DRIP2;
+	T_GAUNTLETS;
+	T_GREENARMOR;
+	T_GREENKEY;
+	T_GRENADE;
+	T_GRENADELAUNCHER;
+	T_GUTS;
+	T_HASTE;
+	T_HEALTHBONUS;
+	T_HEAVYMACEBALL;
+	T_HECTEBUS;
+	T_HEFTYBLASTERAMMO;
+	T_HEFTYCROSSBOWAMMO;
+	T_HEFTYMACEAMMO;
+	T_HEFTYPHOENIXRODAMMO;
+	T_HEFTYSKULLRODAMMO;
+	T_HEFTYWANDAMMO;
+	T_HELLKNIGHT;
+	T_HIGHJUMP;
+	T_HORNKEY;
+	T_ICEGOLEM;
+	T_ICESHARD;
+	T_IMP;
+	T_IMPFIREBALL;
+	T_IMPLEADER;
+	T_INFRAGOGGLES;
+	T_INFRATRACKER;
+	T_INVISIBILITY;
+	T_INVULNERABILITY;
+	T_IRONFEET;
+	T_IRONLICH;
+	T_IRONLICHBLUESHOT;
+	T_ITEMALLMAP;
+	T_ITEMBAGOFHOLDING;
+	T_ITEMBOOSTMANA;
+	T_ITEMBOOTS;
+	T_ITEMEGG;
+	T_ITEMFLECHETTE;
+	T_ITEMFLIGHT;
+	T_ITEMHEALTHFLASH;
+	T_ITEMHEALTHFLASK;
+	T_ITEMHEALTHFULL;
+	T_ITEMHEALTHPOTION;
+	T_ITEMINVISIBILITY;
+	T_ITEMINVULNERABILITY;
+	T_ITEMPORK;
+	T_ITEMREPULSION;
+	T_ITEMSUMMON;
+	T_ITEMTELEPORT;
+	T_ITEMTIMEBOMB;
+	T_ITEMTOME;
+	T_ITEMTORCH;
+	T_ITEMTPORTOTHER;
+	T_KNIGHT;
+	T_KNIGHTAXE;
+	T_KNIGHTBLOODAXE;
+	T_KNIGHTGHOST;
+	T_LIGHTAMP;
+	T_LOSTSOUL;
+	T_MACE;
+	T_MACEKEY;
+	T_MAGESHARDS;
+	T_MAGESTAFF1;
+	T_MAGESTAFF2;
+	T_MAGESTAFF3;
+	T_MANA1;
+	T_MANA2;
+	T_MANA3;
+	T_MANCUBUS;
+	T_MANCUBUSSHOT;
+	T_MAXARMORBONUS;
+	T_MAXHEALTHBONUS;
+	T_MEDKIT;
+	T_MEGASPHERE;
+	T_MESHARMOR;
+	T_METALKEY;
+	T_MINIGUN;
+	T_MORPHBLAST;
+	T_MUMMY;
+	T_MUMMYGHOST;
+	T_MUMMYHEAD;
+	T_MUMMYLEADER;
+	T_MUMMYLEADERGHOST;
+	T_NOGRAVITYMACEBALL;
+	T_NONE;
+	T_PAINELEMENTAL;
+	T_PERMLARGEFLAME;
+	T_PERMSMALLFLAME;
+	T_PHOENIXROD;
+	T_PHOENIXSHOT;
+	T_PISTOL;
+	T_PLASMABOLT;
+	T_PLASMAGUN;
+	T_PLATINUMHELM;
+	T_POD;
+	T_PODGENERATOR;
+	T_POISONDART;
+	T_POWERWANDBIGGERBLAST;
+	T_POWERWANDMINIBLAST;
+	T_PROSPERITY;
+	T_PUFF;
+	T_PUZZBOOK1;
+	T_PUZZBOOK2;
+	T_PUZZGEMBIG;
+	T_PUZZGEMBLUE1;
+	T_PUZZGEMBLUE2;
+	T_PUZZGEMGREEN1;
+	T_PUZZGEMGREEN2;
+	T_PUZZGEMRED;
+	T_PUZZSKULL;
+	T_RAGE;
+	T_RAILGUN;
+	T_RANDOMPOWERUP;
+	T_REDARMOR;
+	T_REDFLAG;
+	T_REDKEYCARD;
+	T_REDSKULLKEY;
+	T_REDTELEGLITTER;
+	T_REFLECTION;
+	T_REGENERATION;
+	T_RESISTANCE;
+	T_REVENANT;
+	T_RIPPER;
+	T_RIPPERBALL;
+	T_ROCK1;
+	T_ROCK2;
+	T_ROCK3;
+	T_ROCKET;
+	T_ROCKETAMMO;
+	T_ROCKETBOX;
+	T_ROCKETLAUNCHER;
+	T_RUSTYKEY;
+	T_SCRIPTEDMARINE;
+	T_SERPENTFIREBALL;
+	T_SERPENTKEY;
+	T_SHELLBOX;
+	T_SHELLS;
+	T_SHIELD1;
+	T_SHIELD2;
+	T_SHOTGUN;
+	T_SHOTGUY;
+	T_SILVERKEY;
+	T_SKULLROD;
+	T_SKULLRODBLAST;
+	T_SMALLMETALKEY;
+	T_SNAKE;
+	T_SNAKEPROJECTILE;
+	T_SNAKEPROJECTILEBIG;
+	T_SOULSPHERE;
+	T_SOUND_WATERFALL;
+	T_SOUND_WIND;
+	T_SPARK_DRIP;
+	T_SPECTRE;
+	T_SPIDERMASTERMIND;
+	T_SPREAD;
+	T_SSGGUY;
+	T_STAINEDGLASS0;
+	T_STAINEDGLASS1;
+	T_STAINEDGLASS2;
+	T_STAINEDGLASS3;
+	T_STAINEDGLASS4;
+	T_STAINEDGLASS5;
+	T_STAINEDGLASS6;
+	T_STAINEDGLASS7;
+	T_STAINEDGLASS8;
+	T_STAINEDGLASS9;
+	T_STEALTHARACHNOTRON;
+	T_STEALTHBARON;
+	T_STEALTHCACODEMON;
+	T_STEALTHCHAINGUY;
+	T_STEALTHIMP;
+	T_STEALTHKNIGHT;
+	T_STEALTHMANCUBUS;
+	T_STEALTHREVENANT;
+	T_STEALTHSERGEANT;
+	T_STEALTHSHOTGUY;
+	T_STEALTHVILE;
+	T_STEALTHZOMBIE;
+	T_STIMPACK;
+	T_STRENGTH;
+	T_SUPERSHOTGUN;
+	T_TEMPLARGEFLAME;
+	T_TEMPSMALLFLAME;
+	T_THRUSTSPIKEDOWN;
+	T_THRUSTSPIKEUP;
+	T_TIMEFREEZER;
+	T_TINYVOLCANOBALL;
+	T_TRACER;
+	T_TRANSLUCENCY;
+	T_TURBOSPHERE;
+	T_VILE;
+	T_VOLCANO;
+	T_VOLCANOBALL;
+	T_WATERDRIP;
+	T_WATERLURKER;
+	T_WATERLURKERLEADER;
+	T_WHIRLWIND;
+	T_WHITEFLAG;
+	T_WIMPYBLASTERAMMO;
+	T_WIMPYCROSSBOWAMMO;
+	T_WIMPYMACEAMMO;
+	T_WIMPYPHOENIXRODAMMO;
+	T_WIMPYSKULLRODAMMO;
+	T_WIMPYWANDAMMO;
+	T_WIZARD;
+	T_WIZARDSHOT;
+	T_WOLFSS;
+	T_WRAITH;
+	T_WRAITHBURIED;
+	T_YELLOWKEY;
+	T_YELLOWKEYCARD;
+	T_YELLOWSKULLKEY;
+	T_ZOMBIE;
+	TEXFLAG_ADDOFFSET;
+	TEXFLAG_BOTTOM;
+	TEXFLAG_MIDDLE;
+	TEXFLAG_TOP;
+	TEXTURE_BOTTOM;
+	TEXTURE_MIDDLE;
+	TEXTURE_TOP;
+	WARPF_ABSOLUTEOFFSET;
+	WARPF_ABSOLUTEANGLE;
+	WARPF_USECALLERANGLE;
+	WARPF_NOCHECKPOSITION;
+	WARPF_INTERPOLATE;
+	WARPF_WARPINTERPOLATION;
+	WARPF_COPYINTERPOLATION;
+	WARPF_STOP;
+	WARPF_TOFLOOR;
+	WARPF_TESTONLY;
+	WARPF_ABSOLUTEPOSITION;
+	WARPF_BOB;
+	WARPF_MOVEPTR;
+	WARPF_USEPTR;
+	WARPF_COPYVELOCITY;
+	WARPF_COPYPITCH;
+	TRUE;
+	YES;
+}
\ No newline at end of file
diff --git a/Build/Scripting/ZDoom_DECORATE.cfg b/Build/Scripting/ZDoom_DECORATE.cfg
new file mode 100644
index 0000000..416ebff
--- /dev/null
+++ b/Build/Scripting/ZDoom_DECORATE.cfg
@@ -0,0 +1,1197 @@
+/*******************************************************************\
+	GZDoom Builder Script highlighting definitions for DECORATE
+\*******************************************************************/
+
+// Editor settings
+description = "ZDoom DECORATE";
+codepage = 0;
+extensions = "txt,dec";
+casesensitive = false;
+insertcase = 0;				// 0=Normal, 1=Lowercase, 2=Uppercase
+lexer = 35;
+functionopen = "(";
+functionclose = ")";
+argumentdelimiter = ",";
+terminator = ";";
+keywordhelp = "http://www.zdoom.org/wiki/index.php?title=%K";
+scripttype = 3; //0 = unknown script, 1 = acc, 2 = modeldef, 3 = decorate
+
+keywords
+{
+	#Include = "#Include";
+//Monster AI
+	A_AlertMonsters = "A_AlertMonsters[(float maxrange = 0.0[, int flags = 0])]";
+	A_Burst = "A_Burst(str type)";
+	A_CentaurDefend = "A_CentaurDefend";
+	A_Chase = "A_Chase[(str meleestate = \"Melee\"[, str rangedstate = \"Missile\"[, int flags = 0]])]";
+	A_ClearLastHeard = "A_ClearLastHeard";
+	A_ClearSoundTarget = "A_ClearSoundTarget";
+	A_ClearTarget = "A_ClearTarget";
+	A_DamageChildren = "A_DamageChildren(int amount[, str damagetype = \"None\"[, int flags = 0[, str filter = \"None\"[, str species = \"None\"]]]])\namount: amount of damage to inflict. Use a negative value to heal.\ndamagetype: the type of damage to inflict.\nflags: DMSS flags.\nfilter: the actor class to damage.\nspecies: the actor species to damage.";
+	A_DamageMaster = "A_DamageMaster(int amount[, str damagetype = \"None\"[, int flags = 0[, str filter = \"None\"[, str species = \"None\"]]]])\namount: amount of damage to inflict. Use a negative value to heal.\ndamagetype: the type of damage to inflict.\nflags: DMSS flags.\nfilter: the actor class to damage.\nspecies: the actor species to damage.";
+	A_DamageSelf = "A_DamageSelf(int amount[, str damagetype = \"None\"[, int flags = 0[, str filter = \"None\"[, str species = \"None\"]]]])\namount: amount of damage to inflict. Use a negative value to heal.\ndamagetype: the type of damage to inflict.\nflags: DMSS flags.\nfilter: the actor class to damage.\nspecies: the actor species to damage.";
+	A_DamageSiblings = "A_DamageSiblings(int amount[, str damagetype = \"None\"[, int flags = 0[, str filter = \"None\"[, str species = \"None\"]]]])\namount: amount of damage to inflict. Use a negative value to heal.\ndamagetype: the type of damage to inflict.\nflags: DMSS flags.\nfilter: the actor class to damage.\nspecies: the actor species to damage.";
+	A_DamageTarget = "A_DamageTarget(int amount[, str damagetype = \"None\"[, int flags = 0[, str filter = \"None\"[, str species = \"None\"]]]])\namount: amount of damage to inflict. Use a negative value to heal.\ndamagetype: the type of damage to inflict.\nflags: DMSS flags.\nfilter: the actor class to damage.\nspecies: the actor species to damage.";
+	A_DamageTracer = "A_DamageTracer(int amount[, str damagetype = \"None\"[, int flags = 0[, str filter = \"None\"[, str species = \"None\"]]]])\namount: amount of damage to inflict. Use a negative value to heal.\ndamagetype: the type of damage to inflict.\nflags: DMSS flags.\nfilter: the actor class to damage.\nspecies: the actor species to damage.";
+	A_Die = "A_Die[(str damagetype)]";
+	A_FaceTarget = "A_FaceTarget[(float angle = 0.0[, float pitch = 0.0])]\nA_FaceTarget(float max_turn, float max_pitch, float ang_offset, float pitch_offset, int flags)";
+	A_FaceMaster = "A_FaceMaster[(float angle = 0.0[, float pitch = 0.0])]\nA_FaceMaster(float max_turn, float max_pitch, float ang_offset, float pitch_offset, int flags)";
+	A_FastChase = "A_FastChase";
+	A_KillChildren = "A_KillChildren[(str damagetype = \"None\"[, int flags = 0[, str filter = \"None\[, str species = \"None\]]])]\ndamagetype: if the actor dies, the actor will enter a death state based on damagetype if present (or pain state if using NODAMAGE).\nflags: KILS flags.\nfilter: the actor class to damage.\nspecies: the actor species to damage.";
+	A_KillMaster = "A_KillMaster[(str damagetype = \"None\"[, int flags = 0[, str filter = \"None\"[, str species = \"None\"]]])]\ndamagetype: if the actor dies, the actor will enter a death state based on damagetype if present (or pain state if using NODAMAGE).\nflags: KILS flags.\nfilter: the actor class to damage.\nspecies: the actor species to damage.";
+	A_KillSiblings = "A_KillSiblings[(str damagetype = \"None\"[, int flags = 0[, str filter = \"None\"[, str species = \"None\"]]])]\ndamagetype: if the actor dies, the actor will enter a death state based on damagetype if present (or pain state if using NODAMAGE).\nflags: KILS flags.\nfilter: the actor class to damage.\nspecies: the actor species to damage.";
+	A_KillTarget = "A_KillTarget[(str damagetype = \"None\"[, int flags = 0[, str filter = \"None\"[, str species = \"None\"]]])]\ndamagetype: if the actor dies, the actor will enter a death state based on damagetype if present (or pain state if using NODAMAGE).\nflags: KILS flags.\nfilter: the actor class to damage.\nspecies: the actor species to damage.";
+	A_KillTracer = "A_KillTracer[(str damagetype = \"None\"[, int flags = 0[, str filter = \"None\"[, str species = \"None\"]]])]\ndamagetype: if the actor dies, the actor will enter a death state based on damagetype if present (or pain state if using NODAMAGE).\nflags: KILS flags.\nfilter: the actor class to damage.\nspecies: the actor species to damage.";
+	A_Look = "A_Look";
+	A_Look2 = "A_Look2";
+	A_LookEx = "A_LookEx(int flags, fixed minseedist, fixed maxseedist, fixed maxheardist, fixed fov, state seestate)";
+	A_RaiseChildren = "A_RaiseChildren[(bool copyaffiliation = false)]";
+	A_RaiseMaster = "A_RaiseMaster[(bool copyaffiliation = false)]";
+	A_RaiseSiblings = "A_RaiseSiblings[(bool copyaffiliation = false)]"; 
+	A_RemoveChildren = "A_RemoveChildren[(bool all = false[, int flags = 0[, str filter = \"None\"[, str species = \"None\"]]])]\nflags: RMVF flags.\nfilter: the actor class to damage.\nspecies: the actor species to damage.";
+	A_RemoveMaster = "A_RemoveMaster[(int flags = 0[, str filter = \"None\"[, str species = \"None\"]])]\nflags: RMVF flags.\nfilter: the actor class to damage.\nspecies: the actor species to damage.";
+	A_RemoveSiblings = "A_RemoveSiblings[(bool all = false[, int flags = 0[, str filter = \"None\"[, str species = \"None\"]]])]\nflags: RMVF flags.\nfilter: the actor class to damage.\nspecies: the actor species to damage.";
+	A_RemoveTarget = "A_RemoveTarget[(int flags = 0[, str filter = \"None\"[, str species = \"None\"]])]\nflags: RMVF flags.\nfilter: the actor class to damage.\nspecies: the actor species to damage.";
+	A_RemoveTracer = "A_RemoveTracer[(int flags = 0[, str filter = \"None\"[, str species = \"None\"]])]\nflags: RMVF flags.\nfilter: the actor class to damage.\nspecies: the actor species to damage.";
+	A_Remove = "A_Remove(int pointer[, int flags = 0[, str filter = \"None\"[, str species = \"None\"]]])\nflags: RMVF flags.\nfilter: the actor class to damage.\nspecies: the actor species to damage.";
+	A_SentinelBob = "A_SentinelBob";
+	A_SetTeleFog = "A_SetTeleFog(str telefogsourceclass, str telefogdestclass)";
+	A_Srcr2Decide = "A_Srcr2Decide";
+	A_SwapTeleFog = "A_SwapTeleFog";
+	A_TurretLook = "A_TurretLook";
+	A_Teleport = "A_Teleport[(str teleportstate = \"Teleport\"[, str targettype = \"BossSpot\"[, str fogtype = \"TeleportFog\"[, int flags = 0[, float mindist = 0.0[, float maxdist = 0.0[, int pointer = AAPTR_DEFAULT]]]]]])]";
+	A_VileChase = "A_VileChase";
+	A_Wander = "A_Wander";
+//Generic monster attacks
+	A_CustomMissile = "A_CustomMissile(str missiletype[, float spawnheight = 0.0[, int spawnofs_horiz = 0[, int angle = 0[, int aimflags = 0[, int pitch = 0[, int target = AAPTR_TARGET]]]]]])";
+	A_CustomBulletAttack = "A_CustomBulletAttack(float horz_spread, float vert_spread, int numbullets, int damageperbullet[, str pufftype = \"BulletPuff\"[, float range = 0.0[, int flags = 0[, int target = AAPTR_TARGET]]]])";
+	A_CustomRailgun = "A_CustomRailgun(int damage[, int offset[, color ringcolor[, color corecolor[, int flags = 0[, bool aim = false[, float maxdiff = 0.0[, str pufftype = \"\"[, float spread_xy = 0.0[, float spread_z = 0.0[, fixed range = 8192[, int duration = 35[, float sparsity = 1.0[, float driftspeed = 1.0[, str spawnclass = \"\"[, float spawnofs_z = 0[, int spiraloffset = 270]]]]]]]]]]]]]]]])";
+	A_CustomMeleeAttack = "A_CustomMeleeAttack[(int damage = 0[, str meleesound = \"\"[, str misssound = \"\"[, str damagetype = \"Melee\"[, bool bleed = true]]]])]";
+	A_CustomComboAttack = "A_CustomComboAttack(str missiletype, float spawnheight, int damage, str meleesound[, str damagetype = \"Melee\"[, bool bleed = true]])";
+	A_MonsterRefire = "A_MonsterRefire(int chancecontinue, str abortstate) ";
+	A_BasicAttack = "A_BasicAttack(int meleedamage, str meleesound, str missiletype, float missileheight)";
+	A_BulletAttack = "A_BulletAttack";
+	A_MonsterRail = "A_MonsterRail";
+	A_Explode = "A_Explode[(int explosiondamage = 128[, int explosionradius = 128[, int flags = XF_HURTSOURCE[, bool alert = false[, int fulldamageradius = 0[, int nails = 0[, int naildamage = 10[, str pufftype = \"BulletPuff\"]]]]]]])]";
+	A_RadiusThrust = "A_RadiusThrust(int force, int distance[, int flags[, int fullthrustdistance]])";
+	A_Detonate = "A_Detonate";
+	A_ThrowGrenade = "A_ThrowGrenade(str spawntype[, float spawnheight[, float throwspeed_horz[, float throwspeed_vert[, bool useammo]]]])";
+	A_WolfAttack = "A_WolfAttack[(int flags = 0[, str soundname = \"weapons/pistol\"[, float snipe = 1.0[, int damage = 64[, int blocksize = 128[, int pointblank = 0[, int longrange = 0[, float runspeed = 160.0[, str pufftype = \"BulletPuff\"]]]]]]]])]"; 
+//Freeze death functions 
+	A_FreezeDeath = "A_FreezeDeath";
+	A_GenericFreezeDeath = "A_GenericFreezeDeath";
+	A_FreezeDeathChunks = "A_FreezeDeathChunks";
+	A_IceGuyDie = "A_IceGuyDie";
+//Sound functions
+	A_PlaySound = "A_PlaySound(str soundname[, int slot = CHAN_BODY[, float volume = 1.0[, bool looping = false[, float attenuation = ATTN_NORM]]]])";
+	A_PlayWeaponSound = "A_PlayWeaponSound(str soundname)";
+	A_ActiveSound = "A_ActiveSound";
+	A_LoopActiveSound = "A_LoopActiveSound";
+	A_FLoopActiveSound = "A_FLoopActiveSound";
+	A_StopSound = "A_StopSound[(int slot = CHAN_VOICE)]";
+	A_Pain = "A_Pain";
+	A_Scream = "A_Scream";
+	A_XScream = "A_XScream";
+	A_PlayerScream = "A_PlayerScream";
+	A_VileStart = "A_VileStart";
+	A_BrainPain = "A_BrainPain";
+	A_BrainAwake = "A_BrainAwake";
+	A_BFGSound = "A_BFGSound";
+//Print actions
+	A_Print = "A_Print(str text[, float time = 0.0[, str fontname = \"SmallFont\"]])";
+	A_PrintBold = "A_PrintBold(str text[, float time = 0.0[, str fontname = \"SmallFont\"]])";
+	A_Log = "A_Log(str text)";
+	A_LogInt = "A_LogInt(int number)";
+//Special actions
+	A_BossDeath = "A_BossDeath";
+	A_KeenDie = "A_KeenDie[(int tag = 666)]";
+	A_BrainDie = "A_BrainDie";
+	A_GetHurt = "A_GetHurt";
+	A_KlaxonBlare = "A_KlaxonBlare";
+	A_CheckTerrain = "A_CheckTerrain";
+	A_SetBlend = "A_SetBlend(str blendcolor, float alpha, int duration[, str fadecolor])";
+	A_CheckPlayerDone = "A_CheckPlayerDone";
+	A_PlayerSkinCheck = "A_PlayerSkinCheck(str state)";
+	A_SkullPop = "A_SkullPop[(str type = \"BloodySkull\")]";
+	A_Quake = "A_Quake(int intensity, int duration, int damageradius, int tremorradius[, str sound = \"world/quake\"])";
+	A_QuakeEx = "A_QuakeEx(int intensityX, int intensityY, int intensityZ, int duration, int damrad, int tremrad[, str sound = \"world/quake\"[, int flags = 0[, float mulwavex = 1.0[, float mulwavey = 1.0[, float mulwavez = 1.0]]]]])";
+//Spawn functions
+	A_TossGib = "A_TossGib";
+	A_SpawnDebris = "A_SpawnDebris(str type[, bool translation = false[, float horizontal_vel = 1.0[, float vertical_vel = 1.0]]])";
+	A_SpawnItem = "A_SpawnItem(str type, int distance, float zpos, bool useammo, bool translation)";
+	A_SpawnItemEx = "A_SpawnItemEx(str type[, float xoffset = 0.0[, float yoffset = 0.0[, float zoffset = 0.0[, float xvelocity = 0.0[, float yvelocity = 0.0[, float zvelocity = 0.0[, float angle = 0.0[, int flags = 0[, int skipchance = 0[, int tid = 0]]]]]]]]]])";
+//State jumps
+	A_CheckBlock = "A_CheckBlock(str block[, int flags = 0[, int pointer = AAPTR_TARGET]])";
+	A_CheckCeiling = "A_CheckCeiling(int offset OR str state)";
+	A_CheckFloor = "A_CheckFloor(int offset OR str state)";
+	A_CheckFlag = "A_CheckFlag(str flagname, state label[, int check_pointer = AAPTR_DEFAULT])";
+	A_CheckLOF = "A_CheckLOF(state jump[, int flags = 0[, float range = 0.0[, float minrange = 0.0[, float angle = 0.0[, float pitch = 0.0[, float offsetheight = 0.0[, float offsetwidth = 0.0[, int ptr_target = AAPTR_DEFAULT]]]]]]]])";
+	A_CheckProximity = "A_CheckProximity(str \"jump\", str classname, float distance[, int count = 1[, int flags = 0[, int pointer]]])"; 
+	A_CheckRange = "A_CheckRange(float distance, int offset OR str state[, bool 2d_check])";
+	A_CheckSight = "A_CheckSight(int offset OR str state)";
+	A_CheckSightOrRange = "A_CheckSightOrRange(float distance, int offset OR str state[, bool 2d_check])";
+	A_Jump = "A_Jump(int chance, int offset OR str state, ...)";
+	A_JumpIf = "A_JumpIf(expression, int offset OR str state)";
+	A_JumpIfArmorType = "A_JumpIfArmorType(str armortype, str state[, int minimum])";
+	A_JumpIfCloser = "A_JumpIfCloser(int distance, int offset OR str state[, bool noz = false])";
+	A_JumpIfHealthLower = "A_JumpIfHealthLower(int health, int offset OR str state[, int pointer = AAPTR_DEFAULT])";
+	A_JumpIfHigherOrLower = "A_JumpIfHigherOrLower(str high, str low[, float offsethigh = 0.0[, float offsetlow = 0.0[, bool includeHeight = true[, int pointer = AAPTR_TARGET]]]])";
+	A_JumpIfInventory = "A_JumpIfInventory(str inventorytype, int amount, int offset OR str state[, int owner = AAPTR_DEFAULT])";
+	A_JumpIfInTargetInventory = "A_JumpIfInTargetInventory(str item, int count, int offset OR str state[, int forward])";
+	A_JumpIfInTargetLOS = "A_JumpIfInTargetLOS(int offset OR str state[, float fov = 0.0[, int flags = 0[, float dist_max = 0.0[, float dist_close = 0.0]]]])\nflags: JLOSF flags.";
+	A_JumpIfMasterCloser = "A_JumpIfMasterCloser(int distance, int offset OR str state[, bool noz = false])";
+	A_JumpIfNoAmmo = "A_JumpIfNoAmmo(int offset OR str state)";
+	A_JumpIfTargetInLOS = "A_JumpIfTargetInLOS(int offset OR str state[, float fov = 0.0[, int flags = 0[, float dist_max = 0.0[, float dist_close = 0.0]]]])\nflags: JLOSF flags.";
+	A_JumpIfTargetInsideMeleeRange = "A_JumpIfTargetInsideMeleeRange(int offset OR str state)\nJumps the number of frames (offset) forward, or to the specified state\nwhen the target of the calling actor is within melee range of the caller.";
+	A_JumpIfTargetOutsideMeleeRange = "A_JumpIfTargetOutsideMeleeRange(int offset OR str state)\nJumps the number of frames (offset) forward, or to the specified state\nwhen the target of the calling actor is beyond melee range of the caller.";
+	A_JumpIfTracerCloser = "A_JumpIfTracerCloser(int distance, int offset OR str state[, bool noz = false])";
+//Status changes
+	A_ActiveAndUnblock = "A_ActiveAndUnblock"; 
+	A_CallSpecial = "A_CallSpecial(int special[, int arg1[, int arg2[, int arg3[, int arg4[, int arg5]]]]])";
+	A_ChangeFlag = "A_ChangeFlag(str flagname, bool value)";
+	A_ChangeVelocity = "A_ChangeVelocity[(float x = 0.0[, float y = 0.0[, float z = 0.0[, int flags = 0[, int pointer = AAPTR_DEFAULT]]]])]\nflags: CVF flags.";
+	A_ClearShadow = "A_ClearShadow";
+	A_CopyFriendliness = "A_CopyFriendliness[(int copyfrom = AAPTR_MASTER)]";
+	A_DeQueueCorpse = "A_DeQueueCorpse";
+	A_FadeIn = "A_FadeIn[(float increase_amount = 0.1[, int flags = 0])]\nflags: FTF flags.";
+	A_FadeOut = "A_FadeOut[(float reduce_amount = 0.1[, int flags = FTF_REMOVE])]\nflags: FTF flags.";
+	A_FadeTo = "A_FadeTo(float target[, float amount = 0.1[, int flags = 0]])\nflags: FTF flags.";
+	A_Fall = "A_Fall";
+	A_Gravity = "A_Gravity";
+	A_HideThing = "A_HideThing";
+	A_LowGravity = "A_LowGravity";
+	A_NoBlocking = "A_NoBlocking";
+	A_NoGravity = "A_NoGravity";
+	A_QueueCorpse = "A_QueueCorpse";
+	A_RearrangePointers = "A_RearrangePointers(int target, int master, int tracer, int flags)\nflags: AAPTR flags.";
+	A_ResetHealth = "A_ResetHealth[(int pointer = AAPTR_DEFAULT)]";
+	A_Respawn = "A_Respawn[(int flags = RSF_FOG)]\nflags: RSF flags";
+	A_ScaleVelocity = "A_ScaleVelocity(float scale[, int pointer = AAPTR_DEFAULT])";
+	A_ScreamAndUnblock = "A_ScreamAndUnblock";
+	A_SetAngle = "A_SetAngle(float angle[, int flags = 0[, int pointer = AAPTR_DEFAULT]])\nangle: the actor's new angle, in degrees.\nflags: SPF flags.";
+	A_SetArg = "A_SetArg(int position, int value)";
+	A_SetDamageType = "A_SetDamageType(str damagetype)";
+	A_SetFloat = "A_SetFloat";
+	A_SetFloatSpeed = "A_SetFloatSpeed(float speed[, int pointer = AAPTR_DEFAULT])";
+	A_FloatBobPhase = "A_FloatBobPhase(int bob)\nChanges the calling actor's FloatBobPhase to bob, which takes a number from 0 to 63.\nIf the number is invalid or not in range, the function does nothing.";
+	A_SetFloorClip = "A_SetFloorClip";
+	A_SetHealth = "A_SetHealth(int health[, int pointer = AAPTR_DEFAULT])\nhealth: The health value to set for the actor. Valid values are 1 and above.\npointer: The actor to set its health. Default is AAPTR_DEFAULT, which corresponds to the calling actor.";
+	A_SetInvulnerable = "A_SetInvulnerable";
+	A_SetMass = "A_SetMass(int mass)";
+	A_SetPainThreshold = "A_SetPainThreshold(int threshold[, int ptr])"; 
+	A_SetPitch = "A_SetPitch(float pitch[, int flags = 0[, int pointer = AAPTR_DEFAULT]])\npitch: The actor's new pitch, in degrees.\nflags: SPF flags.";
+	A_SetReflective = "A_SetReflective";
+	A_SetReflectiveInvulnerable = "A_SetReflectiveInvulnerable";
+	A_SetRipperLevel = "A_SetRipperLevel(int level)";
+	A_SetRipMin = "A_SetRipMin(int min)";
+	A_SetRipMax = "A_SetRipMax(int max)";
+	A_SetRoll = "A_SetRoll(float pitch[, int flags = 0[, int pointer = AAPTR_DEFAULT]])";
+	A_SetScale = "A_SetScale(float scaleX[, float scaleY = scaleX[, int pointer = AAPTR_DEFAULT]])";
+	A_SetShadow = "A_SetShadow";
+	A_SetShootable = "A_SetShootable";
+	A_SetSolid = "A_SetSolid";
+	A_SetSpecial = "A_SetSpecial(int special, int arg0, int arg1, int arg2, int arg3, int arg4)";
+	A_SetSpecies = "A_SetSpecies(str species[, int pointer = AAPTR_DEFAULT])";
+	A_SetSpeed = "A_SetSpeed(float speed[, int pointer = AAPTR_DEFAULT])";
+	A_SetTics = "A_SetTics(int tics)";
+	A_SetTranslucent = "A_SetTranslucent(float alpha[, int mode = 0])";
+	A_SetUserVar = "A_SetUserVar(str name, int value)";
+	A_TransferPointer = "A_TransferPointer(int source, int recipient, int sourcefield, int recipientfield[, int flags])\nflags: PTROP flags.";
+	A_UnHideThing = "A_UnHideThing";
+	A_UnsetFloat = "A_UnsetFloat";
+	A_UnSetFloorClip = "A_UnSetFloorClip";
+	A_UnSetInvulnerable = "A_UnSetInvulnerable";
+	A_UnSetReflective = "A_UnSetReflective";
+	A_UnSetReflectiveInvulnerable = "A_UnSetReflectiveInvulnerable";
+	A_UnSetShootable = "A_UnSetShootable";
+	A_UnsetSolid = "A_UnsetSolid";
+//Missile movement
+	A_SeekerMissile = "A_SeekerMissile(angle threshold, angle maxturnangle[, int flags = 0[, int chance = 50[, int distance = 10]]])\nflags: SMF flags.";
+	A_Tracer = "A_Tracer";
+	A_Tracer2 = "A_Tracer2";
+	A_FaceTracer = "A_FaceTracer[(float angle = 0.0[, float pitch = 0.0])]\nA_FaceTracer(float max_turn, float max_pitch, float ang_offset, float pitch_offset, int flags)";
+	A_Fire = "A_Fire[(float height = 0.0)]";
+	A_Weave = "A_Weave(int horzspeed, int vertspeed, float horzdist, float vertdist)";
+	A_Warp = "A_Warp(int ptr_destination[, float x-offset = 0[, float y-offset = 0[, float z-offset = 0[, float angle = 0[, int flags = 0[, str success_state = \"\"[, float heightoffset = 0[, float radiusoffset = 0[, float pitch = 0]]]]]]]]])\nflags: WARPF flags.";
+	A_Countdown = "A_Countdown";
+	A_CountdownArg = "A_CountdownArg(int arg[, str targetstate])";
+	A_Stop = "A_Stop";
+//Inventory functions
+	A_GiveInventory = "A_GiveInventory(str type[, int count = 0[, int giveto = AAPTR_DEFAULT]])\ntype: the item to give. This should be a valid inventory item.\ncount: the number of samples of this item to give. Default is 0, which is interpreted as 1.\ngiveto: the actor to give the item to";
+	A_GiveToChildren = "A_GiveToChildren(str type[, int count])\ntype: the item to give. This should be a valid inventory item.\ncount: the number of samples of this item to give. Default is 0, which is interpreted as 1.";
+	A_GiveToSiblings = "A_GiveToSiblings(str type[, int count])\ntype: the item to give. This should be a valid inventory item.\ncount: the number of samples of this item to give. Default is 0, which is interpreted as 1.";
+	A_GiveToTarget = "A_GiveToTarget(str type, int count[, int giveto])";
+	A_TakeInventory = "A_TakeInventory(str type, int count[, int flags[, int takefrom = AAPTR_DEFAULT]])";
+	A_TakeFromChildren = "A_TakeFromChildren(str type[, int count])\ntype: the item to take. This should be a valid inventory item.\ncount: the number of samples of this item to take.\nIf this is 0, the item is cleared from the inventory unless it has the\nINVENTORY.KEEPDEPLETED flag set, and in which case, its amount is merely reduced to 0.\nDefault is 0.";
+	A_TakeFromSiblings = "A_TakeFromSiblings(str type[, int count])\ntype: the item to take. This should be a valid inventory item.\ncount: the number of samples of this item to take.\nIf this is 0, the item is cleared from the inventory unless it has the\nINVENTORY.KEEPDEPLETED flag set, and in which case, its amount is merely reduced to 0.\nDefault is 0.";
+	A_TakeFromTarget = "A_TakeFromTarget(str type, int count[, int flags[, int takefrom]])";
+	A_DropInventory = "A_DropInventory(str type)";
+	A_DropItem = "A_DropItem(str item[, int dropamount = -1[, int chance = 256]])\nThe calling actor drops the specified item.\nThis works in a similar way to the DropItem actor property.";
+	A_SelectWeapon = "A_SelectWeapon(str type)";
+	A_RadiusGive = "A_RadiusGive(str item, fixed distance, int flags[, int amount = 0[, str filter = \"None\"[, str species = \"None\"[, fixed mindist = 0]]]])\nflags: RGF flags.";
+//Weapon functions
+	A_WeaponReady = "A_WeaponReady[(int flags = 0)]\nflags: WRF flags.";
+	A_Lower = "A_Lower";
+	A_Raise = "A_Raise";
+	A_ReFire = "A_ReFire[(str state = \"Hold\")]";
+	A_ClearReFire = "A_ClearReFire";
+	A_GunFlash = "A_GunFlash[(str state = \"Flash\"[, int flags = 0])]\nflags: GFF flags.";
+	A_CheckReload = "A_CheckReload";
+	A_CheckForReload = "A_CheckForReload(int counter, str state[, bool dontincrement = false])";
+	A_ResetReloadCounter = "A_ResetReloadCounter";
+	A_Light = "A_Light(int intensity)";
+	A_Light0 = "A_Light0";
+	A_Light1 = "A_Light1";
+	A_Light2 = "A_Light2";
+	A_LightInverse = "A_LightInverse";
+	A_Recoil = "A_Recoil(float force)";
+	A_ZoomFactor = "A_ZoomFactor[(float zoom = 1.0[, int flags = 0])]\nflags: ZOOM flags.";
+	A_SetCrosshair = "A_SetCrosshair(int number)";
+//Weapon attack functions
+	A_Punch = "A_Punch";
+	A_Saw = "A_Saw[(str fullsound = \"weapons/sawfull\"[, str hitsound = \"weapons/sawhit\"[, int damage = 0[, str pufftype = \"BulletPuff\"[, int flags = 0[, float range = 65.0[, float spread_xy = 2.8125[, float spread_z = 0.0[, float lifesteal = 0.0[, int lifestealmax = 0[, str armorbonustype = \"ArmorBonus\"]]]]]]]]]])]";
+	A_CustomPunch = "A_CustomPunch(int damage[, bool norandom = false[, int flags = 0[, str pufftype = \"BulletPuff\"[, float range = 64.0[, float lifesteal = 0.0[, int lifestealmax = 0[, str armorbonustype = \"ArmorBonus\"[, str meleesound[, str misssound]]]]]]]]])";
+	A_FireBullets = "A_FireBullets(int spread_horz, int spread_vert, int numbullets, int damage[, str pufftype = \"\"[, int flags = FBF_USEAMMO[, float range = 0.0]]])";
+	A_FireCustomMissile = "A_FireCustomMissile(str missiletype[, int angle = 0[, bool useammo = false[, int spawnofs_horz = 0[, int spawnheight = 0[, bool aim = false OR int flags = 0[, angle pitch = 0]]]]]])";
+	A_RailAttack = "A_RailAttack(int damage[, int spawnofs_horz[, bool useammo[, str ringcolor[, str corecolor[, int flags[, int maxdiff[, str pufftype[, float spread_xy = 0[, float spread_z = 0.0[, fixed range = 8192[, int duration = 35[, float sparsity = 1.0[, float driftspeed = 1.0[, str spawnclass[, float spawnofs_z = 0.0[, int spiraloffset = 270]]]]]]]]]]]]]]]])";
+	A_FireAssaultGun = "A_FireAssaultGun";
+	A_FireBFG = "A_FireBFG";
+	A_FireOldBFG = "A_FireOldBFG";
+	A_FireShotgun = "A_FireShotgun";
+	A_FireShotgun2 = "A_FireShotgun2";
+	A_FireCGun = "A_FireCGun";
+	A_FireMissile = "A_FireMissile";
+	A_FirePlasma = "A_FirePlasma";
+//Script functions
+	ACS_ExecuteWithResult = "int ACS_ExecuteWithResult(int script, int arg1, int arg2, int arg3, int arg4)";
+	ACS_NamedExecute = "bool ACS_NamedExecute(str script, int map, int arg1, int arg2, int arg3)";
+	ACS_NamedSuspend = "bool ACS_NamedSuspend(str script, int map)";
+	ACS_NamedTerminate = "bool ACS_NamedTerminate(str script, int map)";
+	ACS_NamedLockedExecute = "bool ACS_NamedLockedExecute(str script, int map, int arg1, int arg2, int lock)";
+	ACS_NamedLockedExecuteDoor = "bool ACS_NamedLockedExecuteDoor(str script, int map, int arg1, int arg2, int lock)";
+	ACS_NamedExecuteWithResult = "int ACS_NamedExecuteWithResult(str script, int arg1, int arg2, int arg3, int arg4)";
+	ACS_NamedExecuteAlways = "bool ACS_NamedExecuteAlways(str script, int map, int arg1, int arg2, int arg3)";
+	CallACS = "int CallACS(str script, int arg1, int arg2, int arg3, int arg4)";
+//Original Doom/Strife monster attacks
+	A_PosAttack = "A_PosAttack";
+	A_SPosAttack = "A_SPosAttack";
+	A_CPosAttack = "A_CPosAttack";
+	A_CPosRefire = "A_CPosRefire";
+	A_SpidRefire = "A_SpidRefire";
+	A_TroopAttack = "A_TroopAttack";
+	A_SargAttack = "A_SargAttack";
+	A_HeadAttack = "A_HeadAttack";
+	A_BruisAttack = "A_BruisAttack";
+	A_SkullAttack = "A_SkullAttack[(int speed = 20)]";
+	A_BspiAttack = "A_BspiAttack";
+	A_CyberAttack = "A_CyberAttack";
+	A_PainAttack = "A_PainAttack[(str spawntype = \"LostSoul\"[, float angle = 0.0[, int flags = 0[, int limit = 21]]])]";
+	A_DualPainAttack = "A_DualPainAttack[(str spawntype = \"LostSoul\")]";
+	A_PainDie = "A_PainDie[(str spawntype = \"LostSoul\")]";
+	A_SkelFist = "A_SkelFist";
+	A_SkelMissile = "A_SkelMissile";
+	A_FatAttack1 = "A_FatAttack1[(str spawntype = \"FatShot\")]";
+	A_FatAttack2 = "A_FatAttack2[(str spawntype = \"FatShot\")]";
+	A_FatAttack3 = "A_FatAttack3[(str spawntype = \"FatShot\")]";
+	A_VileTarget = "A_VileTarget[(str type = \"ArchvileFire\")]";
+	A_VileAttack = "A_VileAttack[(str sound = \"vile/stop\"[, int initialdamage = 20[, int blastdamage = 70[, int blastradius = 70[, float thrustfactor = 1.0[, str damagetype = \"Fire\"[, int flags = 0]]]]]])]";
+	A_BrainSpit = "A_BrainSpit[(str spawntype = \"SpawnShot\")]";
+	A_SpawnFly = "A_SpawnFly[(str fogactor = \"SpawnFire\")]";
+	A_SpawnSound = "A_SpawnSound";
+	A_BrainScream = "A_BrainScream";
+	A_BrainExplode = "A_BrainExplode";
+	A_Mushroom = "A_Mushroom[(str spawntype = \"FatShot\"[, int amount[, int flags = MSF_STANDARD[, float vrange = 4.0[, float hrange = 0.5]]]])]";
+	A_M_Saw = "A_M_Saw[(str fullsound = \"weapons/sawfull\"[, str hitsound = \"weapons/sawhit\"[, int damage = 0[, str pufftype = \"BulletPuff\"]]])]";
+	A_SentinelRefire = "A_SentinelRefire";
+	A_BetaSkullAttack = "A_BetaSkullAttack";
+//Miscellaneous functions for Doom
+	A_Hoof = "A_Hoof";
+	A_Metal = "A_Metal";
+	A_BabyMetal = "A_BabyMetal";
+	A_FatRaise = "A_FatRaise";
+	A_SkelWhoosh = "A_SkelWhoosh";
+	A_StartFire = "A_StartFire";
+	A_FireCrackle = "A_FireCrackle";
+	A_BFGSpray = "A_BFGSpray[(str flashtype = \"BFGExtra\"[, int numrays = 40[, int damagecnt = 15[, float angle = 90.0[, float distance = 1024.0[, float vrange = 32.0[, int explicit_damage = 0]]]]]])]";
+	A_BarrelDestroy = "A_BarrelDestroy";
+//Miscellaneous functions not listed in the "Action functions" wiki article
+	A_Bang4Cloud = "A_Bang4Cloud";
+	A_Blast = "A_Blast[(int flags = 0[, int strength = 255[, int radius = 255[, float speed = 20.0[, str blasteffect = \"BlastEffect\"[, sound blastsound = \"BlastRadius\"]]]]])]";
+	A_DropWeaponPieces = "A_DropWeaponPieces(str actorclass1, str actorclass2, str actorclass3)";
+	A_Feathers = "A_Feathers";
+	A_GauntletAttack = "A_GauntletAttack(int power)";
+	A_GiveQuestItem = "A_GiveQuestItem(int itemnum)";
+	A_PigPain = "A_PigPain";
+	A_RemoveForcefield = "A_RemoveForcefield";
+	A_RocketInFlight = "A_RocketInFlight";
+	A_SetGravity = "A_SetGravity(float gravity)\nSets the amount of gravity for the calling actor.";
+	A_SetUserArray = "A_SetUserArray(str name, int index, int value)";
+	A_ShootGun = "A_ShootGun";
+	A_SPosAttackUseAtkSound = "A_SPosAttackUseAtkSound";
+//Mathematical functions
+	abs = "abs(x)\nReturns the absolute value of x.";
+	sin = "sin(x)\nTrigonometry function, x must be in degrees.";
+	cos = "cos(x)\nTrigonometry function, x must be in degrees.";
+	sqrt = "sqrt(x)\nReturns the square root of x.";
+	random = "random[identifier](min, max)\nReturns a random integer value between min and max.";
+	random2 = "random2[identifier](mask)\nReturns a random integer value between -mask and +mask.";
+	frandom = "frandom[identifier](min, max)\nReturns a random floating point value between min and max.";
+	randompick = "randompick[identifier](int, ...)\nPicks a number from the numbers placed in it.\nThis can take an unlimited amount of parameters.";
+	frandompick = "frandompick[identifier](int, ...)\nSimilar to randompick but for float-point values.";
+//State keywords
+	//Bright = "Bright";
+	CanRaise = "CanRaise";
+	Fast = "Fast";
+	Light = "Light(str lightname)";
+	NoDelay = "NoDelay";
+	Offset = "Offset(int x, int y)";
+	Slow = "Slow";
+//Special functions
+	CheckClass = "bool CheckClass(str classname[, int ptr_select = AAPTR_DEFAULT[, bool match_superclass = false]])";
+	IsPointerEqual = "bool IsPointerEqual(int ptr_select1, int ptr_select2)";
+}
+
+constants
+{
+	Actor;
+//states:
+	States;
+	Spawn:;
+	Idle:;
+	See:;
+	Melee:;
+	Missile:;
+	Pain:;
+	Pain.Dagger:;
+	Death:;
+	XDeath:;
+	Burn:;
+	Ice:;
+	Disintegrate:;
+	Raise:;
+	Heal:;
+	Crash:;
+	Crash.Extreme:;
+	Crush:;
+	Wound:;
+	Greetings:;
+	Yes:;
+	No:;
+	Active:;
+	Inactive:;
+	Bounce:;
+	Bounce.Floor:;
+	Bounce.Ceiling:;
+	Bounce.Wall:;
+	Bounce.Actor:;
+	Bounce.Actor.Creature:;
+//flow control
+	loop;
+	stop;
+	wait;
+	fail;
+	goto;
+////////////////////
+//ACTOR PROPERTIES
+////////////////////
+//Map editing control
+	Game;
+	SpawnID;
+	ConversationID;
+	Tag;
+//Behavior
+	Health;
+	GibHealth;
+	WoundHealth;
+	ReactionTime;
+	PainChance;
+	PainThreshold;
+	DamageFactor;
+	Damage;
+	PoisonDamage;
+	PoisonDamageType;
+	RadiusDamageFactor;
+	DesignatedTeam;
+	Speed;
+	VSpeed;
+	FastSpeed;
+	FloatSpeed;
+	Species;
+	Accuracy;
+	Stamina;
+	Activation;
+	TeleFogSourceType;
+	TeleFogDestType;
+//Collision and 'Physics'
+	Radius;
+	Height;
+	DeathHeight;
+	BurnHeight;
+	ProjectilePassHeight;
+	CameraHeight;
+	Gravity;
+	Mass;
+	MaxStepHeight;
+	MaxDropOffHeight;
+	BounceType;
+	BounceFactor;
+	WallBounceFactor;
+	BounceCount;
+	ProjectileKickBack;
+	PushFactor;
+	WeaveIndexXY;
+	WeaveIndexZ;
+//Sound
+	ActiveSound;
+	AttackSound;
+	BounceSound;
+	CrushPainSound;
+	DeathSound;
+	HowlSound;
+	PainSound;
+	SeeSound;
+	WallBounceSound;
+//Rendering
+	RenderStyle;
+	Alpha;
+	DefaultAlpha;
+	XScale;
+	YScale;
+	Scale;
+	Translation;
+	BloodColor;
+	BloodType;
+	Decal;
+	StencilColor;
+	FloatBobPhase;
+//Obituaries
+	HitObituary;
+	Obituary;
+//Attacks
+	MinMissileChance;
+	DamageType;
+	DeathType;
+	MeleeThreshold;
+	MeleeRange;
+	MaxTargetRange;
+	PainType;
+//Special
+	Args[0];
+	Args[1];
+	Args[2];
+	Args[3];
+	Args[4];
+	ClearFlags;
+	DropItem;
+	Skip_Super;
+	VisibleToTeam;
+	VisibleToPlayerClass;
+//Inventory
+	Inventory.Amount;
+	Inventory.DefMaxAmount;
+	Inventory.MaxAmount;
+	Inventory.InterHubAmount;
+	Inventory.Icon;
+	Inventory.PickupMessage;
+	Inventory.PickupSound;
+	Inventory.PickupFlash;
+	Inventory.UseSound;
+	Inventory.RespawnTics;
+	Inventory.GiveQuest;
+	Inventory.ForbiddenTo;
+	Inventory.RestrictedTo;
+//FakeInventory
+	FakeInventory.Respawns;
+//BasicArmorPickup
+	Armor.SaveAmount;
+	Armor.SavePercent;
+	Armor.MaxFullAbsorb;
+	Armor.MaxAbsorb;
+//BasicArmorBonus
+	Armor.SavePercent;
+	Armor.MaxSaveAmount;
+	Armor.SaveAmount;
+	Armor.MaxBonus;
+	Armor.MaxBonusMax;
+//Weapons
+	Weapon.AmmoGive;
+	Weapon.AmmoGive1;
+	Weapon.AmmoGive2;
+	Weapon.AmmoType;
+	Weapon.AmmoType1;
+	Weapon.AmmoType2;
+	Weapon.AmmoUse;
+	Weapon.AmmoUse1;
+	Weapon.AmmoUse2;
+	Weapon.MinSelectionAmmo1;
+	Weapon.MinSelectionAmmo2;
+	Weapon.BobRangeX;
+	Weapon.BobRangeY;
+	Weapon.BobSpeed;
+	Weapon.BobStyle;
+	Weapon.KickBack;
+	Weapon.DefaultKickBack;
+	Weapon.ReadySound;
+	Weapon.SelectionOrder;
+	Weapon.SisterWeapon;
+	Weapon.SlotNumber;
+	Weapon.SlotPriority;
+	Weapon.UpSound;
+	Weapon.YAdjust;
+//Ammo
+	Ammo.BackpackAmount;
+	Ammo.BackpackMaxAmount;
+	Ammo.DropAmount;
+//Weapon Pieces
+	WeaponPiece.Number;
+	WeaponPiece.Weapon;
+//Health
+	Health.LowMessage;
+//Puzzle Items
+	PuzzleItem.Number;
+	PuzzleItem.FailMessage;
+//Player
+	Player.AirCapacity;
+	Player.AttackZOffset;
+	Player.ColorRange;
+	Player.ColorSet;
+	Player.ColorSetFile;
+	Player.ClearColorSet;
+	Player.CrouchSprite;
+	Player.DamageScreenColor;
+	Player.DisplayName;
+	Player.Face;
+	Player.FallingScreamSpeed;
+	Player.FlechetteType;
+	Player.ForwardMove;
+	Player.GruntSpeed;
+	Player.HealRadiusType;
+	Player.HexenArmor;
+	Player.InvulnerabilityMode;
+	Player.JumpZ;
+	Player.MaxHealth;
+	Player.RunHealth;
+	Player.Portrait;
+	Player.ScoreIcon;
+	Player.SideMove;
+	Player.SoundClass;
+	Player.SpawnClass;
+	Player.StartItem;
+	Player.UseRange;
+	Player.WeaponSlot;
+	Player.ViewHeight;
+	Player.MorphWeapon;
+	Player.MugShotMaxHealth;
+//Powerup
+	Powerup.Color;
+	Powerup.Colormap;
+	Powerup.Duration;
+	Powerup.Mode;
+	Powerup.Strength;
+//Powerup Giver
+	Powerup.Type;
+//Health Pickup
+	HealthPickup.AutoUse;
+//Morph Projectile
+	MorphProjectile.PlayerClass;
+	MorphProjectile.MonsterClass;
+	MorphProjectile.Duration;
+	MorphProjectile.MorphStyle;
+	MorphProjectile.MorphFlash;
+	MorphProjectile.UnMorphFlash;
+
+//Actor position and movement
+	x;
+	y;
+	z;
+	Angle;
+	CeilingZ;
+	FloorZ;
+	Pitch;
+	VelX;
+	VelY;
+	VelZ;
+//Actor properties
+	ScaleX;
+	ScaleY;
+	Score;
+	Special;
+	Stamina;
+////////
+//FLAGS	
+////////
+//pointers
+	AAPTR_DEFAULT;
+	AAPTR_NULL;
+	AAPTR_TARGET;
+	AAPTR_MASTER;
+	AAPTR_TRACER;
+	AAPTR_PLAYER;
+	AAPTR_PLAYER_GETTARGET;
+	AAPTR_PLAYER_GETCONVERSATION;
+//A_SpawnItemEx flags
+	SXF_TRANSFERTRANSLATION;
+	SXF_ABSOLUTEPOSITION;
+	SXF_ABSOLUTEANGLE;
+	SXF_ABSOLUTEVELOCITY;
+	SXF_SETMASTER;
+	SXF_NOCHECKPOSITION;
+	SXF_TELEFRAG;
+	SXF_TRANSFERAMBUSHFLAG;
+	SXF_TRANSFERPITCH;
+	SXF_TRANSFERPOINTERS;
+	SXF_USEBLOODCOLOR;
+	SXF_CLEARCALLERTID;
+	SXF_MULTIPLYSPEED;
+	SXF_TRANSFERSCALE;
+	SXF_TRANSFERSPECIAL;
+	SXF_CLEARCALLERSPECIAL;
+	SXF_TRANSFERSTENCILCOL;
+	SXF_TRANSFERALPHA;
+	SXF_TRANSFERRENDERSTYLE;
+	SXF_SETTARGET;
+	SXF_SETTRACER;
+	SXF_NOPOINTERS;
+	SXF_ORIGINATOR;
+	SXF_TRANSFERSPRITEFRAME;
+	SXF_TRANSFERROLL;
+	SXF_ISTARGET;
+	SXF_ISMASTER;
+	SXF_ISTRACER;
+//weapon flags
+	WRF_NOBOB;
+	WRF_NOFIRE;
+	WRF_NOSWITCH;
+	WRF_NOPRIMARY;
+	WRF_DISABLESWITCH;
+	WRF_NOSECONDARY;
+	WRF_ALLOWRELOAD;
+	WRF_ALLOWZOOM;
+	ZOOM_INSTANT;
+	ZOOM_NOSCALETURNING;
+	CPF_USEAMMO;
+	CPF_DAGGER;
+	CPF_PULLIN;
+	CPF_NORANDOMPUFFZ;
+	CPF_NOTURN;
+	CPF_STEALARMOR;
+	FBF_USEAMMO;
+	FBF_NOFLASH;
+	FBF_NORANDOM;
+	FBF_EXPLICITANGLE;
+	FBF_NOPITCH;
+	FBF_NORANDOMPUFFZ;
+//monster flags
+	PAF_NOSKULLATTACK;
+	PAF_AIMFACING;
+	PAF_NOTARGET;
+//Sound channels flags
+	CHAN_AUTO;
+	CHAN_WEAPON;
+	CHAN_VOICE;
+	CHAN_ITEM;
+	CHAN_BODY;
+	CHAN_5;
+	CHAN_6;
+	CHAN_7;
+	CHAN_LISTENERZ;
+	CHAN_MAYBE_LOCAL;
+	CHAN_UI;
+	CHAN_NOPAUSE;
+	CHAN_LOOP;
+//misc flags
+	MSF_STANDARD;
+	MSF_CLASSIC;
+	MSF_DONTHURT;
+//combo flags
+	Monster;
+	Projectile;
+//physics
+	SOLID;
+	SHOOTABLE;
+	FLOAT;
+	NOGRAVITY;
+	WINDTHRUST;
+	PUSHABLE;
+	DONTFALL;
+	CANPASS;
+	ACTLIKEBRIDGE;
+	NOBLOCKMAP;
+	MOVEWITHSECTOR;
+	RELATIVETOFLOOR;
+	NOLIFTDROP;
+	SLIDESONWALLS;
+	NODROPOFF;
+	NOTRIGGER;
+	BLOCKEDBYSOLIDACTORS;
+//Behavior
+	ALWAYSRESPAWN;
+	AMBUSH;
+	AVOIDMELEE;
+	BOSS;
+	DONTCORPSE;
+	DORMANT;
+	FRIENDLY;
+	JUMPDOWN;
+	LOOKALLAROUND;
+	MISSILEEVENMORE;
+	MISSILEMORE;
+	NEVERRESPAWN;
+	NOSPLASHALERT;
+	NOTARGETSWITCH;
+	NOVERTICALMELEERANGE;
+	QUICKTORETALIATE;
+	STANDSTILL;
+//(In)Abilities
+	CANNOTPUSH;
+	NOTELEPORT;
+	ACTIVATEIMPACT;
+	CANPUSHWALLS;
+	CANUSEWALLS;
+	ACTIVATEPCROSS;
+	CANTLEAVEFLOORPIC;
+	TELESTOMP;
+	NOTELESTOMP;
+	STAYMORPHED;
+	CANBLAST;
+	NOBLOCKMONST;
+	THRUGHOST;
+	THRUACTORS;
+	THRUSPECIES;
+	MTHRUSPECIES;
+	SPECTRAL;
+	FRIGHTENED;
+	NOTARGET;
+	NEVERTARGET;
+	NOINFIGHTING;
+	NOTIMEFREEZE;
+	NOFEAR;
+	CANTSEEK;
+	SEEINVISIBLE;
+	DONTTHRUST;
+	ALLOWPAIN;
+//Defenses
+	INVULNERABLE;
+	BUDDHA;
+	REFLECTIVE;
+	SHIELDREFLECT;
+	DEFLECT;
+	NORADIUSDMG;
+	DONTBLAST;
+	GHOST;
+	DONTMORPH;
+	DONTSQUASH;
+	NOTELEOTHER;
+	HARMFRIENDS;
+	DOHARMSPECIES;
+	DONTHARMCLASS;
+	DONTHARMSPECIES;
+	NODAMAGE;
+	DONTRIP;
+	NOTELEFRAG;
+	ALWAYSTELEFRAG;
+	DONTDRAIN;
+	LAXTELEFRAGDMG;
+//Appearance & Sound
+	BRIGHT;
+	INVISIBLE;
+	SHADOW;
+	NOBLOOD;
+	NOBLOODDECALS;
+	STEALTH;
+	FLOORCLIP;
+	SPAWNFLOAT;
+	SPAWNCEILING;
+	FLOATBOB;
+	NOICEDEATH;
+	DONTGIB;
+	DONTSPLASH;
+	DONTOVERLAP;
+	RANDOMIZE;
+	FIXMAPTHINGPOS;
+	FULLVOLACTIVE;
+	FULLVOLDEATH;
+	NOWALLBOUNCESND;
+	VISIBILITYPULSE;
+	ROCKETTRAIL;
+	GRENADETRAIL;
+	NOBOUNCESOUND;
+	NOSKIN;
+	DONTTRANSLATE;
+	NOPAIN;
+	FORCEYBILLBOARD;
+	FORCEXYBILLBOARD;
+//Projectile
+	MISSILE;
+	RIPPER;
+	NOBOSSRIP;
+	NODAMAGETHRUST;
+	DONTREFLECT;
+	FLOORHUGGER;
+	CEILINGHUGGER;
+	BLOODLESSIMPACT;
+	BLOODSPLATTER;
+	FOILINVUL;
+	FOILBUDDHA;
+	SEEKERMISSILE;
+	SCREENSEEKER;
+	SKYEXPLODE;
+	NOEXPLODEFLOOR;
+	STRIFEDAMAGE;
+	EXTREMEDEATH;
+	NOEXTREMEDEATH;
+	DEHEXPLOSION;
+	PIERCEARMOR;
+	FORCERADIUSDMG;
+	SPAWNSOUNDSOURCE;
+	PAINLESS;
+	FORCEPAIN;
+	CAUSEPAIN;
+	DONTSEEKINVISIBLE;
+	STEPMISSILE;
+	ADDITIVEPOISONDAMAGE;
+	ADDITIVEPOISONDURATION;
+	NOFORWARDFALL;
+	HITTARGET;
+	HITMASTER;
+	HITTRACER;
+//Bouncing
+	BOUNCEONWALLS;
+	BOUNCEONFLOORS;
+	BOUNCEONCEILINGS;
+	ALLOWBOUNCEONACTORS;
+	BOUNCEAUTOOFF;
+	BOUNCEAUTOOFFFLOORONLY;
+	BOUNCELIKEHERETIC;
+	BOUNCEONACTORS;
+	NOWALLBOUNCESND;
+	EXPLODEONWATER;
+	CANBOUNCEWATER;
+	MBFBOUNCER;
+	USEBOUNCESTATE;
+//Miscellaneous
+	ICESHATTER;
+	DROPPED;
+	ISMONSTER;
+	CORPSE;
+	COUNTITEM;
+	COUNTKILL;
+	COUNTSECRET;
+	NOTDMATCH;
+	NONSHOOTABLE;
+	DROPOFF;
+	PUFFONACTORS;
+	ALLOWPARTICLES;
+	ALWAYSPUFF;
+	PUFFGETSOWNER;
+	FORCEDECAL;
+	NODECAL;
+	SYNCHRONIZED;
+	ALWAYSFAST;
+	NEVERFAST;
+	OLDRADIUSDMG;
+	USESPECIAL;
+	BUMPSPECIAL;
+	BOSSDEATH;
+	NOINTERACTION;
+	NOTAUTOAIMED;
+	NOTONAUTOMAP;
+	WEAPONSPAWN;
+	NOMENU;
+	PICKUP;
+	TOUCHY;
+	VULNERABLE;
+//Limited Use
+	SEESDAGGERS;
+	INCOMBAT;
+	NOCLIP;
+	NOSECTOR;
+	ICECORPSE;
+	JUSTHIT;
+	JUSTATTACKED;
+	TELEPORT;
+	BLASTED;
+	EXPLOCOUNT;
+	SKULLFLY;
+//Inventory
+	INVENTORY.QUIET;
+	INVENTORY.AUTOACTIVATE;
+	INVENTORY.UNDROPPABLE;
+	INVENTORY.INVBAR;
+	INVENTORY.HUBPOWER;
+	INVENTORY.PERSISTENTPOWER;
+	INVENTORY.ALWAYSPICKUP;
+	INVENTORY.FANCYPICKUPSOUND;
+	INVENTORY.NOATTENPICKUPSOUND;
+	INVENTORY.BIGPOWERUP;
+	INVENTORY.NEVERRESPAWN;
+	INVENTORY.KEEPDEPLETED;
+	INVENTORY.IGNORESKILL;
+	INVENTORY.ADDITIVETIME;
+	INVENTORY.UNTOSSABLE;
+	INVENTORY.RESTRICTABSOLUTELY;
+	INVENTORY.NOSCREENFLASH;
+	INVENTORY.TOSSED;
+	INVENTORY.ALWAYSRESPAWN;
+	INVENTORY.TRANSFER;
+	INVENTORY.NOTELEPORTFREEZE;
+//Weapons
+	WEAPON.NOAUTOFIRE;
+	WEAPON.READYSNDHALF;
+	WEAPON.DONTBOB;
+	WEAPON.AXEBLOOD;
+	WEAPON.NOALERT;
+	WEAPON.AMMO_OPTIONAL;
+	WEAPON.ALT_AMMO_OPTIONAL;
+	WEAPON.AMMO_CHECKBOTH;
+	WEAPON.PRIMARY_USES_BOTH;
+	WEAPON.ALT_USES_BOTH;
+	WEAPON.WIMPY_WEAPON;
+	WEAPON.POWERED_UP;
+	WEAPON.STAFF2_KICKBACK;
+	WEAPON.EXPLOSIVE;
+	WEAPON.MELEEWEAPON;
+	WEAPON.BFG;
+	WEAPON.CHEATNOTWEAPON;
+	WEAPON.NO_AUTO_SWITCH;
+	WEAPON.NOAUTOAIM;
+//Player
+	PLAYERPAWN.NOTHRUSTWHENINVUL;
+	PLAYERPAWN.CANSUPERMORPH;	
+	PLAYERPAWN.CROUCHABLEMORPH;
+//Action-specific flags
+	AMF_EMITFROMTARGET;
+	AMF_TARGETEMITTER;
+	AMF_TARGETNONPLAYER;
+	BF_USEAMMO;
+	BF_DONTWARN;
+	BF_AFFECTBOSSES;
+	BF_NOIMPACTDAMAGE;
+	CBAF_AIMFACING;
+	CBAF_EXPLICITANGLE;
+	CBAF_NOPITCH;
+	CBAF_NORANDOM;
+	CBAF_NORANDOMPUFFZ;
+	CBF_NOLINES;
+	CBF_SETTARGET;
+	CBF_SETMASTER;
+	CBF_SETTRACER;
+	CBF_SETONPTR;
+	CHF_DONTMOVE;
+	CHF_FASTCHASE;
+	CHF_NIGHTMAREFAST;
+	CHF_NOPLAYACTIVE;
+	CHF_RESURRECT;
+	CLOFF_AIM_VERT_NOOFFSET;
+	CLOFF_ALLOWNULL;
+	CLOFF_BEYONDTARGET;
+	CLOFF_CHECKPARTIAL;
+	CLOFF_FROMBASE;
+	CLOFF_IGNOREGHOST;
+	CLOFF_JUMPENEMY;
+	CLOFF_JUMPFRIEND;
+	CLOFF_JUMPNONHOSTILE;
+	CLOFF_JUMPOBJECT;
+	CLOFF_JUMP_ON_MISS;
+	CLOFF_MUL_HEIGHT;
+	CLOFF_MUL_WIDTH;
+	CLOFF_MUSTBEGHOST;
+	CLOFF_MUSTBESHOOTABLE;
+	CLOFF_MUSTBESOLID;
+	CLOFF_NOAIM;
+	CLOFF_NOAIM_HORZ;
+	CLOFF_NOAIM_VERT;
+	CLOFF_SETTARGET;
+	CLOFF_SETMASTER;
+	CLOFF_SETTRACER;
+	CLOFF_SKIPENEMY;
+	CLOFF_SKIPFRIEND;
+	CLOFF_SKIPNONHOSTILE;
+	CLOFF_SKIPOBJECT;
+	CLOFF_SKIPOBSTACLES;
+	CLOFF_SKIPTARGET;
+	CMF_ABSOLUTEANGLE;
+	CMF_ABSOLUTEPITCH;
+	CMF_AIMDIRECTION;
+	CMF_AIMOFFSET;
+	CMF_CHECKTARGETDEAD;
+	CMF_OFFSETPITCH;
+	CMF_SAVEPITCH;
+	CMF_TRACKOWNER;
+	CVF_RELATIVE;
+	CVF_REPLACE;
+	DMSS_AFFECTARMOR;
+	DMSS_FOILBUDDHA;
+	DMSS_FOILINVUL;
+	DMSS_KILL;
+	DMSS_NOFACTOR;
+	DMSS_NOPROTECT;
+	DMSS_EXFILTER;
+	DMSS_EXSPECIES;
+	DMSS_EITHER;
+	FPF_AIMATANGLE;
+	FPF_TRANSFERTRANSLATION;
+	FPF_NOAUTOAIM;
+	FTF_CLAMP;
+	FTF_REMOVE;
+	GFF_NOEXTCHANGE;
+	JLOSF_ALLYNOJUMP;
+	JLOSF_CHECKMASTER;
+	JLOSF_CHECKTRACER;
+	JLOSF_CLOSENOFOV;
+	JLOSF_CLOSENOJUMP;
+	JLOSF_CLOSENOSIGHT;
+	JLOSF_COMBATANTONLY;
+	JLOSF_DEADNOJUMP;
+	JLOSF_FLIPFOV;
+	JLOSF_NOAUTOAIM;
+	JLOSF_NOSIGHT;
+	JLOSF_PROJECTILE;
+	JLOSF_TARGETLOS;
+	KILS_FOILBUDDHA;
+	KILS_FOILINVUL;
+	KILS_KILLMISSILES;
+	KILS_NOMONSTERS;
+	KILS_EXFILTER;
+	KILS_EXSPECIES;
+	KILS_EITHER;
+	LOF_DONTCHASEGOAL;
+	LOF_FULLVOLSEESOUND;
+	LOF_NOJUMP;
+	LOF_NOSEESOUND;
+	LOF_NOSIGHTCHECK;
+	LOF_NOSOUNDCHECK;
+	PTROP_NOSAFEGUARDS;
+	PTROP_UNSAFEMASTER;
+	PTROP_UNSAFETARGET;
+	RGF_CENTERZ;
+	RGF_CORPSES;
+	RGF_CUBE;
+	RGF_EXFILTER;
+	RGF_EXPLICITANGLE;
+	RGF_EXSPECIES;
+	RGF_FULLBRIGHT;
+	RGF_GIVESELF;
+	RGF_INCLUSIVE;
+	RGF_ITEMS;
+	RGF_KILLED;
+	RGF_MISSILES;
+	RGF_MONSTERS;
+	RGF_NOMASTER;
+	RGF_NOPIERCING;
+	RGF_NOSIGHT;
+	RGF_NOTARGET;
+	RGF_NOTRACER;
+	RGF_OBJECTS;
+	RGF_PLAYERS;
+	RGF_SILENT;
+	RGF_VOODOO;
+	RMVF_EVERYTHING;
+	RMVF_MISC;
+	RMVF_MISSILES;
+	RMVF_NOMONSTERS;
+	RMVF_EXFILTER;
+	RMVF_EXSPECIES;
+	RMVF_EITHER;
+	RSF_FOG;
+	RSF_KEEPTARGET;
+	RSF_TELEFRAG;
+	RTF_AFFECTSOURCE;
+	RTF_NOIMPACTDAMAGE;
+	RTF_NOTMISSILE;
+	SF_NOPULLIN;
+	SF_NORANDOM;
+	SF_NOTURN;	
+	SF_NOUSEAMMO;
+	SF_NOUSEAMMOMISS;
+	SF_RANDOMLIGHTBOTH;
+	SF_RANDOMLIGHTHIT;
+	SF_RANDOMLIGHTMISS;
+	SF_STEALARMOR;
+	SMF_CURSPEED;
+	SMF_LOOK;
+	SMF_PRECISE;
+	SPF_FORCECLAMP;
+	SPF_INTERPOLATE;
+	TF_TELEFRAG;
+	TF_RANDOMDECIDE;
+	TF_FORCED;
+	TF_KEEPVELOCITY;
+	TF_KEEPANGLE;
+	TF_USESPOTZ;
+	TF_NOSRCFOG;
+	TF_NODESTFOG;
+	TF_NOFOG;
+	TF_USEACTORFOG;
+	TF_NOJUMP;
+	TF_OVERRIDE;
+	TIF_NOTAKEINFINITE;
+	VAF_DMGTYPEAPPLYTODIRECT;
+	WARPF_ABSOLUTEOFFSET;
+	WARPF_ABSOLUTEANGLE;
+	WARPF_USECALLERANGLE;
+	WARPF_NOCHECKPOSITION;
+	WARPF_INTERPOLATE;
+	WARPF_WARPINTERPOLATION;
+	WARPF_COPYINTERPOLATION;
+	WARPF_STOP;
+	WARPF_TOFLOOR;
+	WARPF_TESTONLY;
+	WAPRF_ABSOLUTEPOSITION;
+	WARPF_BOB;
+	WARPF_MOVEPTR;
+	WARPF_USETID;
+	WARPF_COPYVELOCITY;
+	WARPF_COPYPITCH;
+	XF_HURTSOURCE;
+	XF_NOTMISSILE;
+//////////////////////////
+//Property-specific flags
+//////////////////////////
+//Activation flags
+	THINGSPEC_Default;
+	THINGSPEC_ThingActs;
+	THINGSPEC_TriggerActs;
+	THINGSPEC_ThingTargets;
+	THINGSPEC_TriggerTargets;
+	THINGSPEC_MonsterTrigger;
+	THINGSPEC_MissileTrigger;
+	THINGSPEC_ClearSpecial;
+	THINGSPEC_NoDeathSpecial;
+	THINGSPEC_Activate;
+	THINGSPEC_Deactivate;
+	THINGSPEC_Switch;
+//MorphProjectile.MorphStyle flags
+	MRF_ADDSTAMINA;
+	MRF_FULLHEALTH;
+	MRF_UNDOBYTOMEOFPOWER;
+	MRF_UNDOBYCHAOSDEVICE;
+	MRF_FAILNOTELEFRAG;
+	MRF_FAILNOLAUGH;
+	MRF_WHENINVULNERABLE;
+	MRF_LOSEACTUALWEAPON;
+	MRF_NEWTIDBEHAVIOUR;
+	MRF_UNDOBYDEATH;
+	MRF_UNDOBYDEATHFORCED;
+	MRF_UNDOBYDEATHSAVES;
+	MRF_UNDOALWAYS;
+//A_CheckProximity flags
+	CPXF_ANCESTOR;
+	CPXF_NOZ;
+	CPXF_COUNTDEAD;
+	CPXF_DEADONLY;
+	CPXF_LESSOREQUAL;
+	CPXF_EXACT;
+//A_FaceTraget/Master/Tracer flags
+	FAF_BOTTOM;
+	FAF_MIDDLE;
+	FAF_TOP;
+	FAF_NODISTFACTOR;
+//A_QuakeEx flags
+	QF_RELATIVE;
+	QF_SCALEDOWN;
+	QF_SCALEUP;
+	QF_WAVE;
+	QF_MAX;
+	QF_FULLINTENSITY;
+}
diff --git a/Build/Scripting/ZDoom_USDF.cfg b/Build/Scripting/ZDoom_USDF.cfg
new file mode 100644
index 0000000..13929e5
--- /dev/null
+++ b/Build/Scripting/ZDoom_USDF.cfg
@@ -0,0 +1,50 @@
+/*******************************************************************\
+	Doom Builder Script highlighting definitions for ACS
+\*******************************************************************/
+
+// Editor settings
+description = "ZDoom USDF script";
+codepage = 0;
+extensions = "txt";
+casesensitive = false;
+insertcase = 1;				// 0=Normal, 1=Lowercase, 2=Uppercase
+lexer = 35;					// CPP-style, case-insensitive
+terminator = ";";
+
+keywords
+{
+	Include = "Include a binary or text format script.";
+	Conversation = "conversation";
+	ID = "Unique ID for this conversation.";
+	Actor = "Class name of the Actor that uses this conversation.";
+	Page = "page";
+	Name = "Name to be displayed in upper-left coner.";
+	Panel = "Name of the image to show on the background.";
+	Voice = "Name of the narration sound to play.";
+	Dialog = "Dialog text on the page.";
+	Drop = "Class name of the object to drop when the actor is killed";
+	Link = "Next page to jump to when all ifitem conditions are satisified.";
+	IfItem = "ifitem";
+	Item = "Class name of an item to check in the inventory.";
+	Amount = "Amount of item required to be in the inventory.";
+	Choice = "choice";
+	Text = "Text of the choice the user has.";
+	Cost = "cost";
+	DisplayCost = "'true' to display the cost with the choice. 'false' to hide the cost.";
+	YesMessage = "Message to show in the console when the choice is accepted.";
+	NoMessage = "Message to show in the console when the choise is denied.";
+	Log = "LOG entry to use on success.";
+	GiveItem = "Class name of an item to give upon success.";
+	Special = "Action to perform upon success.";
+	Arg0 = "Argument 0 for the special action.";
+	Arg1 = "Argument 1 for the special action.";
+	Arg2 = "Argument 2 for the special action.";
+	Arg3 = "Argument 3 for the special action.";
+	Arg4 = "Argument 4 for the special action.";
+	NextPage = "Index of the next page.";
+	CloseDialog = "'true' to close the dialog with this choice.";
+}
+
+constants
+{
+}
diff --git a/Build/Scripting/Zandronum_ACS.cfg b/Build/Scripting/Zandronum_ACS.cfg
new file mode 100644
index 0000000..2436abc
--- /dev/null
+++ b/Build/Scripting/Zandronum_ACS.cfg
@@ -0,0 +1,995 @@
+/*******************************************************************\
+	Doom Builder Script highlighting definitions for ACS
+\*******************************************************************/
+
+// Compiler settings
+compiler = "zandronum_acc";
+parameters = "-I \"%PT\" -I \"%PS\" %FI %FO";
+resultlump = "BEHAVIOR";
+
+// Editor settings
+description = "Zandronum ACS script";
+codepage = 0;
+extensions = "acs";
+casesensitive = false;
+insertcase = 0;				// 0=Normal, 1=Lowercase, 2=Uppercase
+lexer = 35;					// CPP-style, case-insensitive
+functionopen = "(";
+functionclose = ")";
+argumentdelimiter = ",";
+terminator = ";";
+keywordhelp = "http://www.zdoom.org/wiki/index.php?title=%K";
+snippetsdir = "acs";
+scripttype = 1; //0 = unknown script, 1 = acc, 2 = modeldef, 3 = decorate
+
+keywords
+{
+	#Define = "#Define identifier expression";
+	#EncryptStrings = "#EncryptStrings";
+	#Import = "#Import";
+	#Include = "#Include";
+	#Library = "#Library";
+	#LibDefine = "#LibDefine identifier expression";
+	#NoCompact = "#NoCompact";
+	#NoWadAuthor = "#NoWadAuthor";
+	#WadAuthor = "#WadAuthor";
+	ACS_Execute = "ACS_Execute(script, map, arg1, arg2, arg3)";
+	ACS_ExecuteAlways = "ACS_ExecuteAlways(script, map, arg1, arg2, arg3)";
+	ACS_ExecuteWait = "ACS_ExecuteWait(script, map, arg1, arg2, arg3)";
+	ACS_ExecuteWithResult = "ACS_ExecuteWithResult(script, s_arg1, s_arg2, s_arg3)";
+	ACS_LockedExecute = "ACS_LockedExecute(script, map, arg1, arg2, lock)";
+	ACS_LockedExecuteDoor = "ACS_LockedExecuteDoor(script, map, arg1, arg2, lock)";
+	ACS_Suspend = "ACS_Suspend(script, map)";
+	ACS_Terminate = "ACS_Terminate(script, map)";
+	ActivatorSound = "ActivatorSound(name, volume)";
+	ActivatorTID = "ActivatorTID()";
+	AmbientSound = "AmbientSound(name, volume)";
+	Autosave = "Autosave()";
+	BlueTeamCount = "BlueTeamCount()";
+	BlueTeamScore = "BlueTeamScore()";
+	Bool = "Bool expression";
+	Break = "Break";
+	Return = "Return";
+	CancelFade = "CancelFade()";
+	Case = "Case expression:";
+	Ceiling_CrushAndRaise = "Ceiling_CrushAndRaise(tag, speed, crush)";
+	Ceiling_CrushAndRaiseA = "Ceiling_CrushAndRaiseA(tag, dspeed, uspeed, crush)";
+	Ceiling_CrushAndRaiseSilentA = "Ceiling_CrushAndRaiseSilentA(tag, dspeed, uspeed, crush)";
+	Ceiling_CrushRaiseAndStay = "Ceiling_CrushRaiseAndStay(tag, speed, crush)";
+	Ceiling_CrushRaiseAndStayA = "Ceiling_CrushRaiseAndStayA(tag, dspeed, uspeed, crush)";
+	Ceiling_CrushRaiseAndStaySilA = "Ceiling_CrushRaiseAndStaySilA(tag, dspeed, uspeed, crush)";
+	Ceiling_CrushStop = "Ceiling_CrushStop(tag)";
+	Ceiling_LowerAndCrush = "Ceiling_LowerAndCrush(tag, speed, crush)";
+	Ceiling_LowerByValue = "Ceiling_LowerByValue(tag, speed, height)";
+	Ceiling_LowerByValueTimes8 = "Ceiling_LowerByValueTimes8(tag, speed, height)";
+	Ceiling_LowerInstant = "Ceiling_LowerInstant(tag, arg1, height)";
+	Ceiling_LowerToFloor = "Ceiling_LowerToFloor(tag, speed)";
+	Ceiling_LowerToHighestFloor = "Ceiling_LowerToHighestFloor(tag, speed)";
+	Ceiling_LowerToLowest = "Ceiling_LowerToLowest(tag, speed)";
+	Ceiling_MoveToValue = "Ceiling_MoveToValue(tag, speed, height, neg)";
+	Ceiling_MoveToValueTimes8 = "Ceiling_MoveToValueTimes8(tag, speed, height, neg)";
+	Ceiling_RaiseByValue = "Ceiling_RaiseByValue(tag, speed, height)";
+	Ceiling_RaiseByValueTimes8 = "Ceiling_RaiseByValueTimes8(tag, speed, height)";
+	Ceiling_RaiseInstant = "Ceiling_RaiseInstant(tag, arg1, height)";
+	Ceiling_RaiseToNearest = "Ceiling_RaiseToNearest(tag, speed)";
+	Ceiling_Waggle = "Ceiling_Waggle(tag, amp, freq, offset, time)";
+	ChangeCamera = "ChangeCamera(tid, who, revert)";
+	ChangeCeiling = "ChangeCeiling(tag, flat)";
+	ChangeFloor = "ChangeFloor(tag, flat)";
+	ChangeLevel = "ChangeLevel(mapname, position, flags, skill)";
+	ChangeSkill = "ChangeSkill(skill)";
+	CheckActorCeilingTexture = "CheckActorCeilingTexture(tid, texture)";
+	CheckActorClass = "CheckActorClass(tid, class)";
+	CheckActorFloorTexture = "CheckActorFloorTexture(tid, texture)";
+	CheckActorInventory = "CheckActorInventory(tid, type)";
+	CheckActorProperty = "CheckActorProperty(tid, property, value)";
+	CheckInventory = "CheckInventory(type)";
+	CheckPlayerCamera = "CheckPlayerCamera(player)";
+	CheckWeapon = "CheckWeapon(weapon)";
+	ClassifyActor = "ClassifyActor(tid)";
+	ClearActorInventory = "ClearActorInventory(tid)";
+	ClearForceField = "ClearForceField()";
+	ClearInventory = "ClearInventory()";
+	ClearLineSpecial = "ClearLineSpecial()";
+	ConsoleCommand = "ConsoleCommand(command)";
+	Const = "Const";
+	Continue = "Continue";
+	cos = "cos(angle)";
+	CreateTranslation = "CreateTranslation(transnumber, translation, translation, translation, ...)";
+	DamageThing = "DamageThing(amount)";
+	Death = "Script expression Death";
+	Default = "Default:";
+	Delay = "Delay(tics)";
+	Disconnect = "Script expression Disconnect";
+	Do = "Do";
+	Door_Animated = "Door_Animated(tag, speed, delay)";
+	Door_Close = "Door_Close(tag, speed)";
+	Door_CloseWaitOpen = "Door_CloseWaitOpen(tag, speed, delay)";
+	Door_LockedRaise = "Door_LockedRaise(tag, speed, delay, lock)";
+	Door_Open = "Door_Open(tag, speed)";
+	Door_Raise = "Door_Raise(tag, speed, delay)";
+	Elevator_LowerToNearest = "Elevator_LowerToNearest(tag, speed)";
+	Elevator_MoveToFloor = "Elevator_MoveToFloor(tag, speed)";
+	Elevator_RaiseToNearest = "Elevator_RaiseToNearest(tag, speed)";
+	Else = "Else";
+	Enter = "Script expression Enter";
+	Exit_Normal = "Exit_Normal(pos)";
+	Exit_Secret = "Exit_Secret(pos)";
+	FadeRange = "FadeRange(red1, green1, blue1, red2, green2, blue2, amount, seconds)";
+	FadeTo = "FadeTo(red, green, blue, amount, seconds)";
+	FixedDiv = "FixedDiv(fa, fb)";
+	FixedMul = "FixedMul(fa, fb)";
+	Floor_CrushStop = "Floor_CrushStop(tag)";
+	Floor_Donut = "Floor_Donut(ptag, pspeed, sspeed)";
+	Floor_LowerByValue = "Floor_LowerByValue(tag, speed, height)";
+	Floor_LowerByValueTimes8 = "Floor_LowerByValueTimes8(tag, speed, height)";
+	Floor_LowerInstant = "Floor_LowerInstant(tag, arg1, height)";
+	Floor_LowerToHighest = "Floor_LowerToHighest(tag, speed, adjust)";
+	Floor_LowerToLowest = "Floor_LowerToLowest(tag, speed)";
+	Floor_LowerToLowestTxTy = "Floor_LowerToLowestTxTy(tag, speed)";
+	Floor_LowerToNearest = "Floor_LowerToNearest(tag, speed)";
+	Floor_MoveToValue = "Floor_MoveToValue(tag, speed, height, neg)";
+	Floor_MoveToValueTimes8 = "Floor_MoveToValueTimes8(tag, speed, height, neg)";
+	Floor_RaiseAndCrush = "Floor_RaiseAndCrush(tag, speed, crush)";
+	Floor_RaiseByTexture = "Floor_RaiseByTexture(tag, speed)";
+	Floor_RaiseByValue = "Floor_RaiseByValue(tag, speed, height)";
+	Floor_RaiseByValueTimes8 = "Floor_RaiseByValueTimes8(tag, speed, height)";
+	Floor_RaiseByValueTxTy = "Floor_RaiseByValueTxTy(tag, speed, height)";
+	Floor_RaiseInstant = "Floor_RaiseInstant(tag, arg1, height)";
+	Floor_RaiseToHighest = "Floor_RaiseToHighest(tag, speed)";
+	Floor_RaiseToLowestCeiling = "Floor_RaiseToLowestCeiling(tag, speed)";
+	Floor_RaiseToNearest = "Floor_RaiseToNearest(tag, speed)";
+	Floor_TransferNumeric = "Floor_TransferNumeric(tag)";
+	Floor_TransferTrigger = "Floor_TransferTrigger(tag)";
+	Floor_Waggle = "Floor_Waggle(tag, amp, freq, offset, time)";
+	FloorAndCeiling_LowerByValue = "FloorAndCeiling_LowerByValue(tag, speed, height)";
+	FloorAndCeiling_LowerRaise = "FloorAndCeiling_LowerRaise(tag, fspeed, cspeed)";
+	FloorAndCeiling_RaiseByValue = "FloorAndCeiling_RaiseByValue(tag, speed, height)";
+	For = "For(initialization, condition, iteration)";
+	ForceField = "ForceField()";
+	Function = "Function Void expression (Void)";
+	GameSkill = "GameSkill()";
+	GameType = "GameType()";
+	Generic_Ceiling = "Generic_Ceiling(tag, speed, height, target, flag)";
+	Generic_Crusher = "Generic_Crusher(tag, dspeed, uspeed, silent, crush)";
+	Generic_Door = "Generic_Door(tag, speed, kind, delay, lock)";
+	Generic_Floor = "Generic_Floor(tag, speed, height, target, flags)";
+	Generic_Lift = "Generic_Lift(tag, speed, delay, type, height)";
+	Generic_Stairs = "Generic_Stairs(tag, speed, height, flags, reset)";
+	GetLevelInfo = "GetLevelInfo(infotype)";
+	GetActorAngle = "GetActorAngle(tid)";
+	GetActorCeilingZ = "GetActorCeilingZ(tid)";
+	GetActorFloorZ = "GetActorFloorZ(tid)";
+	GetActorLightLevel = "GetActorLightLevel(tid)";
+	GetActorPitch = "GetActorPitch(tid)";
+	GetActorProperty = "GetActorProperty(tid, property)";
+	GetActorVelX = "GetActorVelX(tid)";
+	GetActorVelY = "GetActorVelY(tid)";
+	GetActorVelZ = "GetActorVelZ(tid)";
+	GetActorViewHeight = "GetActorViewHeight(tid)";
+	GetActorX = "GetActorX(tid)";
+	GetActorY = "GetActorY(tid)";
+	GetActorZ = "GetActorZ(tid)";
+	GetAirSupply = "GetAirSupply(playernumber)";
+	GetAmmoCapacity = "GetAmmoCapacity(classname)";
+	GetArmorType = "GetArmorType(armortype, playernumber)";
+	GetChar = "GetChar(string, index)";
+	GetCVar = "GetCVar(name)";
+	GetInvasionState = "GetInvasionState()";
+	GetInvasionWave = "GetInvasionWave()";
+	GetPlayerInfo = "GetPlayerInfo(playernumber, infotype)";
+	GetLevelInfo = "GetLevelInfo(infotype)";
+	GetLineRowOffset = "GetLineRowOffset()";
+	GetLineUDMFInt = "GetLineUDMFInt(lineid, fieldname)";
+	GetLineUDMFFixed = "GetLineUDMFFixed(lineid, fieldname)";
+	GetPlayerInput = "GetPlayerInput(player, input)";
+	GetPolyobjX = "GetPolyobjX(po)";
+	GetPolyobjY = "GetPolyobjY(po)";
+	GetScreenHeight = "GetScreenHeight()";
+	GetScreenWidth = "GetScreenWidth()";
+	GetSectorCeilingZ = "GetSectorCeilingZ(tag, x, y)";
+	GetSectorFloorZ = "GetSectorFloorZ(tag, x, y)";
+	GetSectorLightLevel = "GetSectorLightLevel(tag)";
+	GetSectorUDMFInt = "GetSectorUDMFInt(tag, fieldname)";
+	GetSectorUDMFFixed = "GetSectorUDMFFixed(tag, fieldname)";
+	GetSideUDMFInt = "GetSideUDMFInt(lineid, side, fieldname)";
+	GetSideUDMFFixed = "GetSideUDMFFixed(lineid, side, fieldname)";
+	GetThingUDMFInt = "GetThingUDMFInt(tid, fieldname)";
+	GetThingUDMFFixed = "GetThingUDMFFixed(tid, fieldname)";
+	GetUserArray = "GetUserArray(tid, name, pos)";
+	GetUserVariable = "GetUserVariable(tid, name)";
+	GiveActorInventory = "GiveActorInventory(tid, type, amount)";
+	GiveInventory = "GiveInventory(type, amount)";
+	GlassBreak = "GlassBreak(dontspawnjunk)";
+	Global = "Global Int expression:identifier";
+	Goto = "Goto";
+	HealThing = "HealThing(amount)";
+	HudMessage = "HudMessage(text; type, id, color, x, y, holdtime)";
+	HudMessageBold = "HudMessageBold(text; type, id, color, x, y, holdtime)";
+	If = "If(expression)";
+	Int = "Int expression";
+	IsMultiplayer = "IsMultiplayer()";
+	IsOneFlagCTF = "IsOneFlagCTF()";
+	Light_ChangeToValue = "Light_ChangeToValue(tag, value)";
+	Light_Fade = "Light_Fade(tag, value, tics)";
+	Light_Flicker = "Light_Flicker(tag, upper, lower)";
+	Light_ForceLightning = "Light_ForceLightning()";
+	Light_Glow = "Light_Glow(tag, upper, lower, tics)";
+	Light_LowerByValue = "Light_LowerByValue(tag, value)";
+	Light_MaxNeighbor = "Light_MaxNeighbor(tag)";
+	Light_MinNeighbor = "Light_MinNeighbor(tag)";
+	Light_RaiseByValue = "Light_RaiseByValue(tag, value)";
+	Light_Stop = "Light_Stop(tag)";
+	Light_Strobe = "Light_Strobe(tag, upper, lower, u-tics, l-tics)";
+	Light_StrobeDoom = "Light_StrobeDoom(tag, u-tics, l-tics)";
+	Lightning = "Script expression Lightning";
+	Line_AlignCeiling = "Line_AlignCeiling(lineid, side)";
+	Line_AlignFloor = "Line_AlignFloor(lineid, side)";
+	Line_SetBlocking = "Line_SetBlocking(lineid, setflags, clearflags)";
+	Line_SetTextureScale = "Line_SetTextureScale(lineid, x, y, side, flags)";
+	Line_SetTextureOffset = "Line_SetTextureOffset(lineid, x, y, side, flags)";
+	LineSide = "LineSide()";
+	LocalAmbientSound = "LocalAmbientSound(name, volume)";
+	LocalSetMusic = "LocalSetMusic(song, pattern, transition)";
+	Log = "Log(type:expression)";
+	MorphActor = "MorphActor(tid, playerclass, monsterclass, duration, style, morphflash, unmorphflash)";
+	Net = "Script expression Net";
+	NoiseAlert = "NoiseAlert(target_tid, emiter_tid)";
+	Open = "Script expression Open";
+	Pillar_Build = "Pillar_Build(tag, speed, height)";
+	Pillar_BuildAndCrush = "Pillar_BuildAndCrush(tag, speed, height, crush)";
+	Pillar_Open = "Pillar_Open(tag, speed, fdist, cdist)";
+	Plane_Align = "Plane_Align(floor, ceiling)";
+	Plat_DownByValue = "Plat_DownByValue(tag, speed, delay, height)";
+	Plat_DownWaitUpStay = "Plat_DownWaitUpStay(tag, speed, delay)";
+	Plat_DownWaitUpStayLip = "Plat_DownWaitUpStayLip(tag, speed, delay, lip)";
+	Plat_PerpetualRaise = "Plat_PerpetualRaise(tag, speed, delay)";
+	Plat_PerpetualRaiseLip = "Plat_PerpetualRaiseLip(tag, speed, delay, lip)";
+	Plat_RaiseAndStayTx0 = "Plat_RaiseAndStayTx0(tag, speed)";
+	Plat_Stop = "Plat_Stop(tag)";
+	Plat_ToggleCeiling = "Plat_ToggleCeiling(tag)";
+	Plat_UpByValue = "Plat_UpByValue(tag, speed, delay, height)";
+	Plat_UpByValueStayTx = "Plat_UpByValueStayTx(tag, speed, height)";
+	Plat_UpNearestWaitDownStay = "Plat_UpNearestWaitDownStay(tag, speed, delay)";
+	Plat_UpWaitDownStay = "Plat_UpWaitDownStay(tag, speed, delay)";
+	Player_GiveItem = "Player_GiveItem(item, message)";
+	Player_RemoveItem = "Player_RemoveItem(item, message)";
+	Player_SetTeam = "Player_SetTeam(team)";
+	PlayerArmorPoints = "PlayerArmorPoints()";
+	PlayerBlueSkull = "PlayerBlueSkull()";
+	PlayerClass = "PlayerClass(player_number)";
+	PlayerCount = "PlayerCount()";
+	PlayerFrags = "PlayerFrags()";
+	PlayerHealth = "PlayerHealth()";
+	PlayerInGame = "PlayerInGame(player_number)";
+	PlayerIsBot = "PlayerIsBot(player_number)";
+	PlayerNumber = "PlayerNumber()";
+	PlayerOnTeam = "PlayerOnTeam()";
+	PlayerRedSkull = "PlayerRedSkull()";
+	PlayerTeam = "PlayerTeam()";
+	PlayerYellowSkull = "PlayerYellowSkull()";
+	PlayMovie = "PlayMovie(moviename)";
+	Polyobj_DoorSlide = "Polyobj_DoorSlide(po, speed, angle, dist, delay)";
+	Polyobj_DoorSwing = "Polyobj_DoorSwing(po, speed, angle, delay)";
+	Polyobj_Move = "Polyobj_Move(po, speed, angle, dist)";
+	Polyobj_MoveTimes8 = "Polyobj_MoveTimes8(po, speed, angle, dist)";
+	Polyobj_OR_Move = "Polyobj_OR_Move(po, speed, angle, distance)";
+	Polyobj_OR_MoveTimes8 = "Polyobj_OR_MoveTimes8(po, speed, angle, distance)";
+	Polyobj_OR_RotateLeft = "Polyobj_OR_RotateLeft(po, speed)";
+	Polyobj_OR_RotateRight = "Polyobj_OR_RotateRight(po, speed, angle)";
+	Polyobj_RotateLeft = "Polyobj_RotateLeft(po, speed, angle)";
+	Polyobj_RotateRight = "Polyobj_RotateRight(po, speed, angle)";
+	PolyWait = "PolyWait(po)";
+	Print = "Print(type:expression)";
+	PrintBold = "PrintBold(type:expression)";
+	PointPush_SetForce = "PointPush_SetForce(tag, tid, amount, useline)";
+	Radius_Quake = "Radius_Quake(intensity, duration, damrad, tremrad, tid)";
+	Random = "Random(low, high)";
+	ReplaceTextures = "ReplaceTextures(oldtexture, newtexture, flags)";
+	RedTeamCount = "RedTeamCount()";
+	RedTeamScore = "RedTeamScore()";
+	Respawn = "Script expression Respawn";
+	Restart = "Restart";
+	Script = "Script expression (Void)";
+	ScriptWait = "ScriptWait(scriptid)";
+	Scroll_Ceiling = "Scroll_Ceiling(tag, scrollbits, 0, xmove, ymove)";
+	Scroll_Floor = "Scroll_Floor(tag, scrollbits, method xmove, ymove)";
+	Scroll_Texture_Both = "Scroll_Texture_Both(lineid, left, right, down, up)";
+	Scroll_Texture_Model = "Scroll_Texture_Model(lineid, scrollbits)";
+	Scroll_Texture_Offsets = "Scroll_Texture_Offsets";
+	Scroll_Wall = "Scroll_Wall(lineid, x, y, side, flags)";
+	Sector_ChangeSound = "Sector_ChangeSound(tag, newsequence)";
+	Sector_SetCeilingPanning = "Sector_SetCeilingPanning(tag, u-int, u-frac, v-int, v-frac)";
+	Sector_SetCeilingScale = "Sector_SetCeilingScale(tag, u-int, u-frac, v-int, v-frac)";
+	Sector_SetColor = "Sector_SetColor(tag, r, g, b)";
+	Sector_SetDamage = "Sector_SetDamage(tag, amount, mod)";
+	Sector_SetFade = "Sector_SetFade(tag, r, g, b)";
+	Sector_SetFloorPanning = "Sector_SetFloorPanning(tag, u-int, u-frac, v-int, v-frac)";
+	Sector_SetFloorScale = "Sector_SetFloorScale(tag, u-int, u-frac, v-int, v-frac)";
+	Sector_SetFriction = "Sector_SetFriction(tag, amount)";
+	Sector_SetGravity = "Sector_SetGravity(tag, ipart, fpart)";
+	Sector_SetLink = "Sector_SetLink(controltag, tag, surface, movetype)";
+	Sector_SetPlaneReflection = "Sector_SetPlaneReflection(tag, floor, ceiling)";
+	Sector_SetRotation = "Sector_SetRotation(tag, floor-angle, ceiling-angle)";
+	SectorDamage = "SectorDamage(tag, amount, type, protection-item, flags)";
+	SectorSound = "SectorSound(name, volume)";
+	SendToCommunicator = "SendToCommunicator(voc_id, front_only, indentify, nolog)";
+	SetActorAngle = "SetActorAngle(tid, angle)";
+	SetAirControl = "SetAirControl(amount)";
+	SetActorPitch = "SetActorPitch(tid, angle)";
+	SetActorPosition = "SetActorPosition(tid, x, y, z, fog)";
+	SetActorProperty = "SetActorProperty(tid, property, value)";
+	SetActorState = "SetActorState(tid, state, exact)";
+	SetActorVelocity = "SetActorVelocity(tid, velx, vely, velz, add, setbob)";
+	SetAirSupply = "SetAirSupply(playernumber, tics)";
+	SetCameraToTexture = "SetCameraToTexture(tag, texture, fov)";
+	SetCeilingTrigger = "SetCeilingTrigger(tag, height, special, arg1, arg2, arg3, arg4, arg5)";
+	SetFloorTrigger = "SetFloorTrigger(tag, height, special, arg1, arg2, arg3, arg4, arg5)";
+	SetFont = "SetFont(fontname)";
+	SetGravity = "SetGravity(amount)";
+	SetHudSize = "SetHudSize(width, height, statusbar)";
+	SetLineBlocking = "SetLineBlocking(line, blocking)";
+	SetLineMonsterBlocking = "SetLineMonsterBlocking(line, blocking)";
+	SetLineSpecial = "SetLineSpecial(line, special, arg1, arg2, arg3, arg4, arg5)";
+	SetLineTexture = "SetLineTexture(line, side, position, texture)";
+	SetMarineSprite = "SetMarineSprite(tid, actorclass)";
+	SetMarineWeapon = "SetMarineWeapon(tid, weapon)";
+	SetMugShotState = "SetMugShotState(state)";
+	SetMusic = "SetMusic(song, pattern, transition)";
+	SetPlayerProperty = "SetPlayerProperty(who, set, which)";
+	SetResultValue = "SetResultValue(value)";
+	SetSkyScrollSpeed = "SetSkyScrollSpeed(skynumber, speed)";
+	SetThingSpecial = "SetThingSpecial(tid, special, arg1, arg2, arg3, arg4, arg5)";
+	SetWeapon = "SetWeapon(weaponname)";
+	sin = "sin(angle)";
+	SinglePlayer = "SinglePlayer()";
+	SoundSequence = "SoundSequence(name)";
+	SoundSequenceOnActor = "SoundSequenceOnActor(tid, sndseq)";
+	SoundSequenceOnSector = "SoundSequenceOnSector(tag, sndseq, location)";
+	SoundSequenceOnPolyObj = "SoundSequenceOnPolyObj(tag, sndseq)";
+	Spawn = "Spawn(type, x, y, z, thingid, angle)";
+	SpawnProjectile = "SpawnProjectile(tid, type, angle, speed, vspeed, gravity, newtid)";
+	SpawnSpot = "SpawnSpot(type, spotid, thingid, angle)";
+	SpawnSpotFacing = "SpawnSpotFacing(type, spotid, thingid)";
+	Special = "Special";
+	Stairs_BuildDown = "Stairs_BuildDown(tag, speed, height, delay, reset)";
+	Stairs_BuildDownSync = "Stairs_BuildDownSync(tag, speed, height, reset)";
+	Stairs_BuildUp = "Stairs_BuildUp(tag, speed, height, delay, reset)";
+	Stairs_BuildUpDoom = "Stairs_BuildUpDoom(tag, speed, height, delay, reset)";
+	Stairs_BuildUpSync = "Stairs_BuildUpSync(tag, speed, height, reset)";
+	StartConversation = "StartConversation(tid, facing)";
+	Str = "Str expression";
+	strlen = "strlen(string)";
+	Suspend = "Suspend";
+	Switch = "Switch(expression)";
+	TagWait = "TagWait(tag)";
+	TakeActorInventory = "TakeActorInventory(tid, type, amount)";
+	TakeInventory = "TakeInventory(type, amount)";
+	Team_GivePoints = "Team_GivePoints(team, amount, announce)";
+	Team_Score = "Team_Score(amount, nogrin)";
+	Teleport = "Teleport(tid, tag, nosourcefog)";
+	Teleport_EndGame = "Teleport_EndGame()";
+	Teleport_Line = "Teleport_Line(thisid, destid, flip)";
+	Teleport_NewMap = "Teleport_NewMap(map, pos)";
+	Teleport_NoFog = "Teleport_NoFog(tid)";
+	Teleport_NoStop = "Teleport_NoStop(tid, sector, nofog)";
+	Teleport_ZombieChanger = "Teleport_ZombieChanger(tid, tag)";
+	TeleportGroup = "TeleportGroup(groupid, sourceid, destinationid, movesource, fog)";
+	TeleportInSector = "TeleportInSector(tag, sourceid, destinationid, fog, groupid)";
+	TeleportOther = "TeleportOther(tid, destinationid, fog)";
+	Terminate = "Terminate";
+	Thing_Activate = "Thing_Activate(tid)";
+	Thing_ChangeTID = "Thing_ChangeTID(oldtid, newtid)";
+	Thing_Damage = "Thing_Damage(tid, amount, mod)";
+	Thing_Damage2 = "Thing_Damage2(tid, amount, type)";
+	Thing_Deactivate = "Thing_Deactivate(tid)";
+	Thing_Destroy = "Thing_Destroy(tid, extreme)";
+	Thing_Hate = "Thing_Hate(hater, hatee, type)";
+	Thing_Move = "Thing_Move(tid, destid, nofog)";
+	Thing_Projectile = "Thing_Projectile(tid, type, angle, speed, vspeed)";
+	Thing_Projectile2 = "Thing_Projectile2(tid, type, angle, speed, vspeed, gravity, newtid)";
+	Thing_ProjectileAimed = "Thing_ProjectileAimed(tid, type, speed, target, newtid)";
+	Thing_ProjectileGravity = "Thing_ProjectileGravity(tid, type, angle, speed, vspeed)";
+	Thing_ProjectileIntercept = "Thing_ProjectileIntercept(tid, type, speed, target, newtid)";
+	Thing_Raise = "Thing_Raise(tid)";
+	Thing_Remove = "Thing_Remove(tid)";
+	Thing_SetFrame = "Thing_SetFrame(tid, frame)";
+	Thing_SetGoal = "Thing_SetGoal(tid, goal, delay, ignore)";
+	Thing_SetSpecial = "Thing_SetSpecial(tid, special, arg1, arg2, arg3)";
+	Thing_SetTranslation = "Thing_SetTranslation(tid, translation)";
+	Thing_Spawn = "Thing_Spawn(tid, type, angle, newtid)";
+	Thing_SpawnFacing = "Thing_SpawnFacing(tid, type, nofog, newtid)";
+	Thing_SpawnNoFog = "Thing_SpawnNoFog(tid, type, angle, newtid)";
+	Thing_Stop = "Thing_Stop(tid)";
+	ThingCount = "ThingCount(type, id)";
+	ThingCountName = "ThingCountName(type, tid)";
+	ThingCountNameSector = "ThingCountNameSector(class, tid, tag)";
+	ThingCountSector = "ThingCountSector(type, tid, tag)";
+	ThingSound = "ThingSound(thingid, name, volume)";
+	ThrustThing = "ThrustThing(angle, force, limit, tid)";
+	ThrustThingZ = "ThrustThingZ(tid, speed, upordown, addorset)";
+	Timer = "Timer()";
+	Transfer_Heights = "Transfer_Heights(tag, flags)";
+	Transfer_WallLight = "Transfer_WallLight(lineid, flags)";
+	Transfer_CeilingLight = "Transfer_CeilingLight(tag)";
+	Transfer_FloorLight = "Transfer_FloorLight(tag)";
+	TranslucentLine = "TranslucentLine(lineid, amount, additive)";
+	Unloading = "Script expression Unloading";
+	UnmorphActor = "UnmorphActor(tid, force)";
+	Until = "Until(expression)";
+	UsePuzzleItem = "UsePuzzleItem(item, script)";
+	UseActorInventory = "UseActorInventory(tid, item)";
+	VectorAngle = "VectorAngle(x, y)";
+	Void = "Void";
+	While = "While(expression)";
+	World = "World Int expression:identifier";
+}
+
+constants
+{
+	TRUE;
+	FALSE;
+	ON;
+	OFF;
+	YES;
+	NO;
+	CARRY;
+	SCROLL;
+	SCROLL_AND_CARRY;
+	ACTOR_NONE;
+	ACTOR_WORLD;
+	ACTOR_PLAYER;
+	ACTOR_BOT;
+	ACTOR_VOODOODOLL;
+	ACTOR_MONSTER;
+	ACTOR_ALIVE;
+	ACTOR_DEAD;
+	ACTOR_MISSILE;
+	ACTOR_GENERIC;
+	APROP_ActiveSound;
+	APROP_Alpha;
+	APROP_Ambush;
+	APROP_AttackSoun;
+	APROP_ChaseGoal;
+	APROP_Damage;
+	APROP_DeathSound;
+	APROP_Dropped;
+	APROP_Friendly;
+	APROP_Frightened;
+	APROP_Gravity;
+	APROP_Health;
+	APROP_Invulnerable;
+	APROP_JumpZ;
+	APROP_Notarget;
+	APROP_PainSound;
+	APROP_RenderStyle;
+	APROP_SeeSound;
+	APROP_SpawnHealth;
+	APROP_Speed;
+	BLOCK_CREATURES;
+	BLOCK_EVERYTHING;
+	BLOCK_NOTHING;
+	BLOCK_PLAYERS;
+	BLOCKF_MONSTERS;
+	BLOCKF_PLAYERS;
+	BLOCKF_FLOATERS;
+	BLOCKF_PROJECTILES;
+	BLOCKF_EVERYTHING;
+	BLOCKF_RAILING;
+	BLOCKF_USE;
+	BT_ALTATTACK;
+	BT_ATTACK;
+	BT_BACK;
+	BT_CROUCH;
+	BT_FORWARD;
+	BT_JUMP;
+	BT_LEFT;
+	BT_LOOKDOWN;
+	BT_LOOKUP;
+	BT_MOVEDOWN;
+	BT_MOVELEFT;
+	BT_MOVERIGHT;
+	BT_MOVEUP;
+	BT_RELOAD;
+	BT_RIGHT;
+	BT_SHOWSCORES;
+	BT_SPEED;
+	BT_STRAFE;
+	BT_TURN180;
+	BT_USE;
+	BT_USER1;
+	BT_USER2;
+	BT_USER3;
+	BT_USER4;
+	BT_ZOOM;
+	CLASS_CLERIC;
+	CLASS_FIGHTER;
+	CLASS_MAGE;
+	CR_BLACK; 
+	CR_BLUE;
+	CR_BRICK;
+	CR_BROWN;
+	CR_CREAM;
+	CR_DARKBROWN;
+	CR_DARKGRAY;  
+	CR_DARKGREEN;
+	CR_DARKRED;
+	CR_GOLD;
+	CR_GRAY;
+	CR_GREEN;
+	CR_GREY;
+	CR_LIGHTBLUE;
+	CR_OLIVE;
+	CR_ORANGE;
+	CR_PURPLE;
+	CR_RED;
+	CR_TAN;
+	CR_UNTRANSLATED;
+	CR_WHITE;
+	CR_YELLOW;
+	DAMAGE_IN_AIR;
+	DAMAGE_NONPLAYERS;
+	DAMAGE_PLAYERS;
+	DAMAGE_SUBCLASSES_PROTECT;
+	GAME_NET_COOPERATIVE;
+	GAME_NET_DEATHMATCH;
+	GAME_NET_TEAMGAME;
+	GAME_SINGLE_PLAYER;
+	HUDMSG_COLORSTRING;
+	HUDMSG_FADEINOUT;
+	HUDMSG_FADEOUT;
+	HUDMSG_LOG;
+	HUDMSG_PLAIN;
+	HUDMSG_TYPEON;
+	IS_COUNTDOWN;
+	IS_FIRSTCOUNTDOWN;
+	IS_INPROGRESS;
+	IS_WAITINGFORPLAYERS;
+	IS_WAVECOMPLETE;
+	INPUT_BUTTONS;
+	INPUT_FORWARDMOVE;
+	INPUT_OLDBUTTONS;
+	INPUT_PITCH;
+	INPUT_ROW;
+	INPUT_SIDEMOVE;
+	INPUT_UPMOVE;
+	INPUT_YAW;
+	LEVELINFO_CLUSTERNUM;
+	LEVELINFO_FOUND_ITEMS;
+	LEVELINFO_FOUND_SECRETS;
+	LEVELINFO_KILLED_MONSTERS;
+	LEVELINFO_LEVELNUM;
+	LEVELINFO_PAR_TIME;
+	LEVELINFO_SUCK_TIME;
+	LEVELINFO_TOTAL_ITEMS;
+	LEVELINFO_TOTAL_MONSTERS;
+	LEVELINFO_TOTAL_SECRETS;
+	LINE_BACK;
+	LINE_FRONT;
+	MARINEWEAPON_BerserkFis;
+	MARINEWEAPON_BFG;
+	MARINEWEAPON_Chaingun;
+	MARINEWEAPON_Chainsaw;
+	MARINEWEAPON_Dummy;
+	MARINEWEAPON_Fist;
+	MARINEWEAPON_Pistol;
+	MARINEWEAPON_PlasmaRifl;
+	MARINEWEAPON_Railgun;
+	MARINEWEAPON_RocketLaunche;
+	MARINEWEAPON_Shotgun;
+	MARINEWEAPON_SuperShotgu;
+	MOD_BARREL;
+	MOD_BFG_BOOM;
+	MOD_BFG_SPLASH;
+	MOD_CHAINGUN;
+	MOD_CHAINSAW;
+	MOD_CRUSH;
+	MOD_EXIT;
+	MOD_FALLING;
+	MOD_FIST;
+	MOD_HIT;
+	MOD_LAVA;
+	MOD_PISTOL;
+	MOD_PLASMARIFLE;
+	MOD_R_SPLASH;
+	MOD_ROCKET;
+	MOD_SHOTGUN;
+	MOD_SLIME;
+	MOD_SPLASH;
+	MOD_SSHOTGUN;
+	MOD_SUICIDE;
+	MOD_TELEFRAG;
+	MOD_UNKNOWN;
+	MOD_WATER;
+	MODINPUT_BUTTONS;
+	MODINPUT_FORWARDMOVE;
+	MODINPUT_OLDBUTTONS;
+	MODINPUT_PITCH;
+	MODINPUT_ROW;
+	MODINPUT_SIDEMOVE;
+	MODINPUT_UPMOVE;
+	MODINPUT_YAW;
+	MOVIE_Failed;
+	MOVIE_Played;
+	MOVIE_Played_Aborted;
+	MOVIE_Played_NoVideo;
+	NO_TEAM;
+	NOT_BOTTOM;
+	NOT_CEILING;
+	NOT_FLOOR;
+	NOT_MIDDLE;
+	NOT_TOP;
+	PLAYERINFO_AIMDIST;
+	PLAYERINFO_COLOR;
+	PLAYERINFO_GENDER;
+	PLAYERINFO_MOVEBOB;
+	PLAYERINFO_NEVERSWITCH;
+	PLAYERINFO_PLAYERCLASS;
+	PLAYERINFO_STILLBOB;
+	PLAYERINFO_TEAM;
+	PROP_FLY;
+	PROP_FROZEN;
+	PROP_INSTANTWEAPONSWITCH;
+	PROP_NOTARGET;
+	PROP_TOTALLYFROZEN;
+	SIDE_BACK;
+	SIDE_FRONT;
+	SKILL_EASY;
+	SKILL_HARD;
+	SKILL_NORMAL;
+	SKILL_VERY_EASY;
+	SKILL_VERY_HARD;
+	STYLE_Add;
+	STYLE_Fuzzy;
+	STYLE_None;
+	STYLE_Normal;
+	STYLE_OptFuzzy;
+	STYLE_SoulTrans;
+	STYLE_Translucent;
+	T_ABADDON;
+	T_ABADDONSHOT;
+	T_AMMOBOX;
+	T_AMULETOFWARDING;
+	T_ANTIGRAVBELT;
+	T_ARACHNOTRON;
+	T_ARACHNOTRONPLASMA;
+	T_ARCHSTATUE;
+	T_ARMORBONUS;
+	T_ARROW;
+	T_AXEKEY;
+	T_BACKPACK;
+	T_BARON;
+	T_BARONBALL;
+	T_BARONSTATUE;
+	T_BARREL;
+	T_BATTERY;
+	T_BEAST;
+	T_BEASTBALL;
+	T_BELPHEGOR;
+	T_BERSERK;
+	T_BFG;
+	T_BFG10000;
+	T_BFG10KSHOT;
+	T_BFGSHOT;
+	T_BISHOP;
+	T_BLADE;
+	T_BLASTER;
+	T_BLOOD;
+	T_BLOODDEMON;
+	T_BLOODPOOL;
+	T_BLOODPOOL1;
+	T_BLOODPOOL2;
+	T_BLUEARMOR;
+	T_BLUEFLAG;
+	T_BLUEKEY;
+	T_BLUEKEYCARD;
+	T_BLUESKULLKEY;
+	T_BLUETELEGLITTER;
+	T_BOBBINGSKULLINFLAMES;
+	T_BOUNCYMACEBALL;
+	T_BRAINS;
+	T_BRIDGE;
+	T_CACODEMON;
+	T_CACODEMONSHOT;
+	T_CACOLANTERN;
+	T_CACOLANTERNSHOT;
+	T_CELL;
+	T_CENTAUR;
+	T_CENTAUR_MASH;
+	T_CENTAURLEADER;
+	T_CHAINGUN;
+	T_CHAINGUY;
+	T_CHAINSAW;
+	T_CHICKEN;
+	T_CLERICHOLY1;
+	T_CLERICHOLY2;
+	T_CLERICHOLY3;
+	T_CLERICSTAFF;
+	T_CLINK;
+	T_CLIP;
+	T_COMPUTERMAP;
+	T_CROSSBOW;
+	T_CROSSBOWMAINBLAST;
+	T_CROSSBOWMINIBLAST;
+	T_CROSSBOWPOWERBLAST;
+	T_CYBERDEMON;
+	T_CYBERDEMONSTATUE;
+	T_DARKIMP;
+	T_DARKIMPFIREBALL;
+	T_DART;
+	T_DEADCYBERDEMON;
+	T_DEATHBALL;
+	T_DEMON;
+	T_DEMON_MASH;
+	T_DEMON1;
+	T_DEMON2_MASH;
+	T_DEMONSTATUE;
+	T_DIRT1;
+	T_DIRT2;
+	T_DIRT3;
+	T_DIRT4;
+	T_DIRT5;
+	T_DIRT6;
+	T_DOOMSPHERE;
+	T_DRAGONSKINBRACERS;
+	T_DRAIN;
+	T_DSPARILALONE;
+	T_DSPARILBLUESHOT;
+	T_DSPARILONSERPENT;
+	T_DSPARILTELEPORTDEST;
+	T_DSPARILWIZARDSPAWNER;
+	T_EMERALDKEY;
+	T_ETTIN;
+	T_ETTIN_MASH;
+	T_FALCONSHIELD;
+	T_FEATHER;
+	T_FIGHTERAXE;
+	T_FIGHTERHAMMER;
+	T_FIGHTERSWORD1;
+	T_FIGHTERSWORD2;
+	T_FIGHTERSWORD3;
+	T_FIREBALL1;
+	T_FIREGARGOYLE;
+	T_FIREKEY;
+	T_FLAME_LARGE;
+	T_FLAME_SMALL;
+	T_FLAMINGBARREL;
+	T_FLESH_DRIP1;
+	T_FLESH_DRIP2;
+	T_GAUNTLETS;
+	T_GOTHICPILLAR;
+	T_GREENARMOR;
+	T_GREENKEY;
+	T_GRENADE;
+	T_GRENADELAUNCHER;
+	T_GREYPILLARHEART;
+	T_GREYSTALAGMITE;
+	T_GUTS;
+	T_HASTE;
+	T_HEALTHBONUS;
+	T_HEAVYMACEBALL;
+	T_HECTEBUS;
+	T_HEFTYBLASTERAMMO;
+	T_HEFTYCROSSBOWAMMO;
+	T_HEFTYMACEAMMO;
+	T_HEFTYPHOENIXRODAMMO;
+	T_HEFTYSKULLRODAMMO;
+	T_HEFTYWANDAMMO;
+	T_HELLKNIGHT;
+	T_HELLPILLAR;
+	T_HIGHJUMP;
+	T_HISSY;
+	T_HORNKEY;
+	T_ICEGOLEM;
+	T_ICESHARD;
+	T_IMP;
+	T_IMPALINGSPIKE;
+	T_IMPALINGSPIKECGUN;
+	T_IMPALINGSPIKEZOMB;
+	T_IMPFIREBALL;
+	T_IMPHEAD;
+	T_IMPLEADER;
+	T_IMPSTATUE;
+	T_INFRAGOGGLES;
+	T_INFRATRACKER;
+	T_INVISIBILITY;
+	T_INVULNERABILITY;
+	T_IRONFEET;
+	T_IRONLICH;
+	T_IRONLICHBLUESHOT;
+	T_ITEMALLMAP;
+	T_ITEMBAGOFHOLDING;
+	T_ITEMBOOSTMANA;
+	T_ITEMBOOTS;
+	T_ITEMEGG;
+	T_ITEMFLECHETTE;
+	T_ITEMFLIGHT;
+	T_ITEMHEALTHFLASH;
+	T_ITEMHEALTHFLASK;
+	T_ITEMHEALTHFULL;
+	T_ITEMHEALTHPOTION;
+	T_ITEMINVISIBILITY;
+	T_ITEMINVULNERABILITY;
+	T_ITEMREPULSION;
+	T_ITEMSUMMON;
+	T_ITEMTELEPORT;
+	T_ITEMTIMEBOMB;
+	T_ITEMTOME;
+	T_ITEMTORCH;
+	T_ITEMTPORTOTHER;
+	T_KNIGHT;
+	T_KNIGHTAXE;
+	T_KNIGHTBLOODAXE;
+	T_KNIGHTGHOST;
+	T_LABORTORYPILLAR;
+	T_LIGHTAMP;
+	T_LOSTSOUL;
+	T_MACE;
+	T_MACEKEY;
+	T_MAGESHARDS;
+	T_MAGESTAFF1;
+	T_MAGESTAFF2;
+	T_MAGESTAFF3;
+	T_MANA1;
+	T_MANA2;
+	T_MANA3;
+	T_MANCUBUS;
+	T_MANCUBUSSHOT;
+	T_MASARMORBONUS;
+	T_MASSMOUTHSTATUE;
+	T_MAXHEALTHBONUS;
+	T_MEDKIT;
+	T_MEGASPHERE;
+	T_MESHARMOR;
+	T_METALKEY;
+	T_MILITARYPILLAR;
+	T_MINIGUN;
+	T_MORPHBLAST;
+	T_MUMMY;
+	T_MUMMYGHOST;
+	T_MUMMYHEAD;
+	T_MUMMYLEADER;
+	T_MUMMYLEADERGHOST;
+	T_NOGRAVITYMACEBALL;
+	T_NONE;
+	T_PAINELEMENTAL;
+	T_PERMLARGEFLAME;
+	T_PERMSMALLFLAME;
+	T_PHOENIXROD;
+	T_PHOENIXSHOT;
+	T_PISTOL;
+	T_PLASMABOLT;
+	T_PLASMAGUN;
+	T_PLATINUMHELM;
+	T_POD;
+	T_PODGENERATOR;
+	T_POISONDART;
+	T_POWERWANDBIGGERBLAST;
+	T_POWERWANDMINIBLAST;
+	T_PROSPERITY;
+	T_PUFF;
+	T_PUZZBOOK1;
+	T_PUZZBOOK2;
+	T_PUZZGEMBIG;
+	T_PUZZGEMBLUE1;
+	T_PUZZGEMBLUE2;
+	T_PUZZGEMGREEN1;
+	T_PUZZGEMGREEN2;
+	T_PUZZGEMRED;
+	T_PUZZSKULL;
+	T_RAGE;
+	T_RAILGUN;
+	T_RANDOMPOWERUP;
+	T_REDARMOR;
+	T_REDFLAG;
+	T_REDKEYCARD;
+	T_REDSKULLKEY;
+	T_REDTELEGLITTER;
+	T_REFLECTION;
+	T_REGENERATION;
+	T_RESISTANCE;
+	T_REVENANT;
+	T_REVENANTHAND;
+	T_RIPPER;
+	T_RIPPERBALL;
+	T_ROCK1;
+	T_ROCK2;
+	T_ROCK3;
+	T_ROCKET;
+	T_ROCKETAMMO;
+	T_ROCKETBOX;
+	T_ROCKETLAUNCHER;
+	T_RUSTYKEY;
+	T_SAUSAGEHEAD;
+	T_SAUSAGESPITTER;
+	T_SCRIPTEDMARINE;
+	T_SERPENTFIREBALL;
+	T_SERPENTKEY;
+	T_SHELLBOX;
+	T_SHELLS;
+	T_SHIELD1;
+	T_SHIELD2;
+	T_SHORTGREYPILLAR;
+	T_SHOTGUN;
+	T_SHOTGUY;
+	T_SILVERKEY;
+	T_SKULLROD;
+	T_SKULLRODBLAST;
+	T_SMALLMETALKEY;
+	T_SNAKE;
+	T_SNAKEPROJECTILE;
+	T_SNAKEPROJECTILEBIG;
+	T_SOULSPHERE;
+	T_SOUND_WATERFALL;
+	T_SOUND_WIND;
+	T_SPARK_DRIP;
+	T_SPECTRE;
+	T_SPIDERMASTERMIND;
+	T_SPREAD;
+	T_SSGGUY;
+	T_STAINEDGLASS0;
+	T_STAINEDGLASS1;
+	T_STAINEDGLASS2;
+	T_STAINEDGLASS3;
+	T_STAINEDGLASS4;
+	T_STAINEDGLASS5;
+	T_STAINEDGLASS6;
+	T_STAINEDGLASS7;
+	T_STAINEDGLASS8;
+	T_STAINEDGLASS9;
+	T_STARBASEPILLAR;
+	T_STEALTHARACHNOTRON;
+	T_STEALTHBARON;
+	T_STEALTHCACODEMON;
+	T_STEALTHCHAINGUY;
+	T_STEALTHIMP;
+	T_STEALTHKNIGHT;
+	T_STEALTHMANCUBUS;
+	T_STEALTHREVENANT;
+	T_STEALTHSERGEANT;
+	T_STEALTHSHOTGUY;
+	T_STEALTHVILE;
+	T_STEALTHZOMBIE;
+	T_STIMPACK;
+	T_STRENGTH;
+	T_SUPERSHOTGUN;
+	T_TALLGOTHICPILLAR;
+	T_TALLGREYPILLAR;
+	T_TEMPLARGEFLAME;
+	T_TEMPSMALLFLAME;
+	T_THRUSTSPIKEDOWN;
+	T_THRUSTSPIKEUP;
+	T_TIMEFREEZER;
+	T_TINYVOLCANOBALL;
+	T_TRACER;
+	T_TRANSLUCENCY;
+	T_TURBOSPHERE;
+	T_VILE;
+	T_VOLCANO;
+	T_VOLCANOBALL;
+	T_WATERDRIP;
+	T_WATERLURKER;
+	T_WATERLURKERLEADER;
+	T_WHIRLWIND;
+	T_WHITEFLAG;
+	T_WIMPYBLASTERAMMO;
+	T_WIMPYCROSSBOWAMMO;
+	T_WIMPYMACEAMMO;
+	T_WIMPYPHOENIXRODAMMO;
+	T_WIMPYSKULLRODAMMO;
+	T_WIMPYWANDAMMO;
+	T_WIZARD;
+	T_WIZARDSHOT;
+	T_WOLFSS;
+	T_WRAITH;
+	T_WRAITHBURIED;
+	T_YELLOWKEY;
+	T_YELLOWKEYCARD;
+	T_YELLOWSKULLKEY;
+	T_ZOMBIE;
+	TEAM_BLUE;
+	TEAM_RED;
+	TEXTURE_BOTTOM;
+	TEXTURE_MIDDLE;
+	TEXTURE_TOP;
+}
diff --git a/Build/Setup/dotnetfx35setup.exe b/Build/Setup/dotnetfx35setup.exe
new file mode 100644
index 0000000..7fd35dc
Binary files /dev/null and b/Build/Setup/dotnetfx35setup.exe differ
diff --git a/Build/Setup/dxwebsetup.exe b/Build/Setup/dxwebsetup.exe
new file mode 100644
index 0000000..c15749e
Binary files /dev/null and b/Build/Setup/dxwebsetup.exe differ
diff --git a/Build/Setup/vcredist_x86.exe b/Build/Setup/vcredist_x86.exe
new file mode 100644
index 0000000..378e7f0
Binary files /dev/null and b/Build/Setup/vcredist_x86.exe differ
diff --git a/Build/SharpCompress.3.5.dll b/Build/SharpCompress.3.5.dll
new file mode 100644
index 0000000..56828e2
Binary files /dev/null and b/Build/SharpCompress.3.5.dll differ
diff --git a/Build/SlimDX.dll b/Build/SlimDX.dll
new file mode 100644
index 0000000..8715ac4
Binary files /dev/null and b/Build/SlimDX.dll differ
diff --git a/Build/Snippets/acs/dountil.txt b/Build/Snippets/acs/dountil.txt
new file mode 100644
index 0000000..e9c6a34
--- /dev/null
+++ b/Build/Snippets/acs/dountil.txt
@@ -0,0 +1,3 @@
+do[LB]{
+	
+} until ([EP]);
\ No newline at end of file
diff --git a/Build/Snippets/acs/dowhile.txt b/Build/Snippets/acs/dowhile.txt
new file mode 100644
index 0000000..2ce3216
--- /dev/null
+++ b/Build/Snippets/acs/dowhile.txt
@@ -0,0 +1,3 @@
+do[LB]{
+	
+} while ([EP]);
\ No newline at end of file
diff --git a/Build/Snippets/acs/for.txt b/Build/Snippets/acs/for.txt
new file mode 100644
index 0000000..03b3345
--- /dev/null
+++ b/Build/Snippets/acs/for.txt
@@ -0,0 +1,3 @@
+for (int i = 0; i < [EP]; i++)[LB]{
+	
+}
diff --git a/Build/Snippets/acs/if.txt b/Build/Snippets/acs/if.txt
new file mode 100644
index 0000000..995faaf
--- /dev/null
+++ b/Build/Snippets/acs/if.txt
@@ -0,0 +1,3 @@
+if ([EP])[LB]{
+	
+}
\ No newline at end of file
diff --git a/Build/Snippets/acs/ifelse.txt b/Build/Snippets/acs/ifelse.txt
new file mode 100644
index 0000000..d76161c
--- /dev/null
+++ b/Build/Snippets/acs/ifelse.txt
@@ -0,0 +1,5 @@
+if ([EP])[LB]{
+	
+}[LB]else[LB]{
+	
+}
\ No newline at end of file
diff --git a/Build/Snippets/acs/include.txt b/Build/Snippets/acs/include.txt
new file mode 100644
index 0000000..95d9ac1
--- /dev/null
+++ b/Build/Snippets/acs/include.txt
@@ -0,0 +1,5 @@
+#include "zcommon.acs"
+
+script 1 OPEN[LB]{
+	[EP]
+}
\ No newline at end of file
diff --git a/Build/Snippets/acs/script.txt b/Build/Snippets/acs/script.txt
new file mode 100644
index 0000000..dc05cd7
--- /dev/null
+++ b/Build/Snippets/acs/script.txt
@@ -0,0 +1,3 @@
+script [EP] (void)[LB]{
+	
+}
\ No newline at end of file
diff --git a/Build/Snippets/acs/until.txt b/Build/Snippets/acs/until.txt
new file mode 100644
index 0000000..1f7fda2
--- /dev/null
+++ b/Build/Snippets/acs/until.txt
@@ -0,0 +1,3 @@
+until ([EP])[LB]{
+	
+}
\ No newline at end of file
diff --git a/Build/Snippets/acs/while.txt b/Build/Snippets/acs/while.txt
new file mode 100644
index 0000000..7ed3aa3
--- /dev/null
+++ b/Build/Snippets/acs/while.txt
@@ -0,0 +1,3 @@
+while ([EP])[LB]{
+	
+}
\ No newline at end of file
diff --git a/Build/Sprites/Action.png b/Build/Sprites/Action.png
new file mode 100644
index 0000000..146bf95
Binary files /dev/null and b/Build/Sprites/Action.png differ
diff --git a/Build/Sprites/Actor.png b/Build/Sprites/Actor.png
new file mode 100644
index 0000000..41b8da1
Binary files /dev/null and b/Build/Sprites/Actor.png differ
diff --git a/Build/Sprites/ActorMover.png b/Build/Sprites/ActorMover.png
new file mode 100644
index 0000000..48df6e9
Binary files /dev/null and b/Build/Sprites/ActorMover.png differ
diff --git a/Build/Sprites/Anchor.png b/Build/Sprites/Anchor.png
new file mode 100644
index 0000000..3367cd0
Binary files /dev/null and b/Build/Sprites/Anchor.png differ
diff --git a/Build/Sprites/Arrow.png b/Build/Sprites/Arrow.png
new file mode 100644
index 0000000..e7e97e8
Binary files /dev/null and b/Build/Sprites/Arrow.png differ
diff --git a/Build/Sprites/Bridge.png b/Build/Sprites/Bridge.png
new file mode 100644
index 0000000..73afdf5
Binary files /dev/null and b/Build/Sprites/Bridge.png differ
diff --git a/Build/Sprites/Camera.png b/Build/Sprites/Camera.png
new file mode 100644
index 0000000..6a54317
Binary files /dev/null and b/Build/Sprites/Camera.png differ
diff --git a/Build/Sprites/Decal.png b/Build/Sprites/Decal.png
new file mode 100644
index 0000000..139de29
Binary files /dev/null and b/Build/Sprites/Decal.png differ
diff --git a/Build/Sprites/DeepWater.png b/Build/Sprites/DeepWater.png
new file mode 100644
index 0000000..091c4fd
Binary files /dev/null and b/Build/Sprites/DeepWater.png differ
diff --git a/Build/Sprites/Dog.png b/Build/Sprites/Dog.png
new file mode 100644
index 0000000..28c5781
Binary files /dev/null and b/Build/Sprites/Dog.png differ
diff --git a/Build/Sprites/InterpolationPoint.png b/Build/Sprites/InterpolationPoint.png
new file mode 100644
index 0000000..f081679
Binary files /dev/null and b/Build/Sprites/InterpolationPoint.png differ
diff --git a/Build/Sprites/InterpolationSpecial.png b/Build/Sprites/InterpolationSpecial.png
new file mode 100644
index 0000000..a2c2d71
Binary files /dev/null and b/Build/Sprites/InterpolationSpecial.png differ
diff --git a/Build/Sprites/Light.png b/Build/Sprites/Light.png
new file mode 100644
index 0000000..01d2313
Binary files /dev/null and b/Build/Sprites/Light.png differ
diff --git a/Build/Sprites/MapSpot.png b/Build/Sprites/MapSpot.png
new file mode 100644
index 0000000..b711f6a
Binary files /dev/null and b/Build/Sprites/MapSpot.png differ
diff --git a/Build/Sprites/MapSpotGravity.png b/Build/Sprites/MapSpotGravity.png
new file mode 100644
index 0000000..3055fa8
Binary files /dev/null and b/Build/Sprites/MapSpotGravity.png differ
diff --git a/Build/Sprites/PathFollower.png b/Build/Sprites/PathFollower.png
new file mode 100644
index 0000000..361cebb
Binary files /dev/null and b/Build/Sprites/PathFollower.png differ
diff --git a/Build/Sprites/PointPuller.png b/Build/Sprites/PointPuller.png
new file mode 100644
index 0000000..60a2c03
Binary files /dev/null and b/Build/Sprites/PointPuller.png differ
diff --git a/Build/Sprites/PointPusher.png b/Build/Sprites/PointPusher.png
new file mode 100644
index 0000000..55bec88
Binary files /dev/null and b/Build/Sprites/PointPusher.png differ
diff --git a/Build/Sprites/Portal_lower.png b/Build/Sprites/Portal_lower.png
new file mode 100644
index 0000000..e4874a1
Binary files /dev/null and b/Build/Sprites/Portal_lower.png differ
diff --git a/Build/Sprites/Portal_upper.png b/Build/Sprites/Portal_upper.png
new file mode 100644
index 0000000..4d5293d
Binary files /dev/null and b/Build/Sprites/Portal_upper.png differ
diff --git a/Build/Sprites/Secret.png b/Build/Sprites/Secret.png
new file mode 100644
index 0000000..f2bb04d
Binary files /dev/null and b/Build/Sprites/Secret.png differ
diff --git a/Build/Sprites/SilentSector.png b/Build/Sprites/SilentSector.png
new file mode 100644
index 0000000..e7594bb
Binary files /dev/null and b/Build/Sprites/SilentSector.png differ
diff --git a/Build/Sprites/SkyboxPicker.png b/Build/Sprites/SkyboxPicker.png
new file mode 100644
index 0000000..e689065
Binary files /dev/null and b/Build/Sprites/SkyboxPicker.png differ
diff --git a/Build/Sprites/SkyboxViewpoint.png b/Build/Sprites/SkyboxViewpoint.png
new file mode 100644
index 0000000..f3d5304
Binary files /dev/null and b/Build/Sprites/SkyboxViewpoint.png differ
diff --git a/Build/Sprites/Slope.png b/Build/Sprites/Slope.png
new file mode 100644
index 0000000..b0ac546
Binary files /dev/null and b/Build/Sprites/Slope.png differ
diff --git a/Build/Sprites/Sound.png b/Build/Sprites/Sound.png
new file mode 100644
index 0000000..1c30b95
Binary files /dev/null and b/Build/Sprites/Sound.png differ
diff --git a/Build/Sprites/Sparkle.png b/Build/Sprites/Sparkle.png
new file mode 100644
index 0000000..3903be5
Binary files /dev/null and b/Build/Sprites/Sparkle.png differ
diff --git a/Build/Sprites/Target.png b/Build/Sprites/Target.png
new file mode 100644
index 0000000..1637d17
Binary files /dev/null and b/Build/Sprites/Target.png differ
diff --git a/Build/Sprites/Teleport.png b/Build/Sprites/Teleport.png
new file mode 100644
index 0000000..c7c0375
Binary files /dev/null and b/Build/Sprites/Teleport.png differ
diff --git a/Build/Sprites/ZDoomGoldWand.png b/Build/Sprites/ZDoomGoldWand.png
new file mode 100644
index 0000000..f887f04
Binary files /dev/null and b/Build/Sprites/ZDoomGoldWand.png differ
diff --git a/Build/Sprites/ZDoomPistol.png b/Build/Sprites/ZDoomPistol.png
new file mode 100644
index 0000000..74ff023
Binary files /dev/null and b/Build/Sprites/ZDoomPistol.png differ
diff --git a/Build/Sprites/ZandFlagBlue.png b/Build/Sprites/ZandFlagBlue.png
new file mode 100644
index 0000000..0a5d993
Binary files /dev/null and b/Build/Sprites/ZandFlagBlue.png differ
diff --git a/Build/Sprites/ZandFlagGold.png b/Build/Sprites/ZandFlagGold.png
new file mode 100644
index 0000000..d533643
Binary files /dev/null and b/Build/Sprites/ZandFlagGold.png differ
diff --git a/Build/Sprites/ZandFlagGreen.png b/Build/Sprites/ZandFlagGreen.png
new file mode 100644
index 0000000..45815c1
Binary files /dev/null and b/Build/Sprites/ZandFlagGreen.png differ
diff --git a/Build/Sprites/ZandFlagRed.png b/Build/Sprites/ZandFlagRed.png
new file mode 100644
index 0000000..27bd2e8
Binary files /dev/null and b/Build/Sprites/ZandFlagRed.png differ
diff --git a/Build/Sprites/ZandFlagWhite.png b/Build/Sprites/ZandFlagWhite.png
new file mode 100644
index 0000000..c12a857
Binary files /dev/null and b/Build/Sprites/ZandFlagWhite.png differ
diff --git a/Build/Sprites/ZandRuneDrain.png b/Build/Sprites/ZandRuneDrain.png
new file mode 100644
index 0000000..52336d0
Binary files /dev/null and b/Build/Sprites/ZandRuneDrain.png differ
diff --git a/Build/Sprites/ZandRuneHaste.png b/Build/Sprites/ZandRuneHaste.png
new file mode 100644
index 0000000..5429612
Binary files /dev/null and b/Build/Sprites/ZandRuneHaste.png differ
diff --git a/Build/Sprites/ZandRuneHighJump.png b/Build/Sprites/ZandRuneHighJump.png
new file mode 100644
index 0000000..66263d1
Binary files /dev/null and b/Build/Sprites/ZandRuneHighJump.png differ
diff --git a/Build/Sprites/ZandRuneProsperity.png b/Build/Sprites/ZandRuneProsperity.png
new file mode 100644
index 0000000..9f5f6e2
Binary files /dev/null and b/Build/Sprites/ZandRuneProsperity.png differ
diff --git a/Build/Sprites/ZandRuneRage.png b/Build/Sprites/ZandRuneRage.png
new file mode 100644
index 0000000..409c397
Binary files /dev/null and b/Build/Sprites/ZandRuneRage.png differ
diff --git a/Build/Sprites/ZandRuneReflection.png b/Build/Sprites/ZandRuneReflection.png
new file mode 100644
index 0000000..ec662f1
Binary files /dev/null and b/Build/Sprites/ZandRuneReflection.png differ
diff --git a/Build/Sprites/ZandRuneRegeneration.png b/Build/Sprites/ZandRuneRegeneration.png
new file mode 100644
index 0000000..5c99fe6
Binary files /dev/null and b/Build/Sprites/ZandRuneRegeneration.png differ
diff --git a/Build/Sprites/ZandRuneResistance.png b/Build/Sprites/ZandRuneResistance.png
new file mode 100644
index 0000000..55a50a3
Binary files /dev/null and b/Build/Sprites/ZandRuneResistance.png differ
diff --git a/Build/Sprites/ZandRuneSpread.png b/Build/Sprites/ZandRuneSpread.png
new file mode 100644
index 0000000..e7de298
Binary files /dev/null and b/Build/Sprites/ZandRuneSpread.png differ
diff --git a/Build/Sprites/ZandRuneStrength.png b/Build/Sprites/ZandRuneStrength.png
new file mode 100644
index 0000000..f5b0e47
Binary files /dev/null and b/Build/Sprites/ZandRuneStrength.png differ
diff --git a/Build/Sprites/Zone.png b/Build/Sprites/Zone.png
new file mode 100644
index 0000000..3d60661
Binary files /dev/null and b/Build/Sprites/Zone.png differ
diff --git a/Build/Textures/Crosshair.png b/Build/Textures/Crosshair.png
new file mode 100644
index 0000000..7d069a2
Binary files /dev/null and b/Build/Textures/Crosshair.png differ
diff --git a/Build/Textures/CrosshairBusy.png b/Build/Textures/CrosshairBusy.png
new file mode 100644
index 0000000..c534727
Binary files /dev/null and b/Build/Textures/CrosshairBusy.png differ
diff --git a/Build/Textures/Hourglass3D.png b/Build/Textures/Hourglass3D.png
new file mode 100644
index 0000000..f3a1b7d
Binary files /dev/null and b/Build/Textures/Hourglass3D.png differ
diff --git a/Build/Textures/MissingTexture3D.png b/Build/Textures/MissingTexture3D.png
new file mode 100644
index 0000000..1e24d4c
Binary files /dev/null and b/Build/Textures/MissingTexture3D.png differ
diff --git a/Build/Textures/UnknownTexture3D.png b/Build/Textures/UnknownTexture3D.png
new file mode 100644
index 0000000..7f31fa0
Binary files /dev/null and b/Build/Textures/UnknownTexture3D.png differ
diff --git a/Build/Updater.exe b/Build/Updater.exe
new file mode 100644
index 0000000..4ad1e3b
Binary files /dev/null and b/Build/Updater.exe differ
diff --git a/Build/Updater.ini b/Build/Updater.ini
new file mode 100644
index 0000000..b521b1c
--- /dev/null
+++ b/Build/Updater.ini
@@ -0,0 +1,3 @@
+URL http://devbuilds.drdteam.org/doombuilder2-gzdb/
+FileName Builder.exe
+UpdateName GZDoom_Builder-r[REVNUM].7z
\ No newline at end of file
diff --git a/Builder.sln b/Builder.sln
new file mode 100644
index 0000000..28c1e43
--- /dev/null
+++ b/Builder.sln
@@ -0,0 +1,128 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.24720.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Builder", "Source\Core\Builder.csproj", "{818B3D10-F791-4C3F-9AF5-BB2D0079B63C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuilderModes", "Source\Plugins\BuilderModes\BuilderModes.csproj", "{B42D5AA0-F9A6-4234-9C4B-A05B11A64851}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuilderEffects", "Source\Plugins\BuilderEffects\BuilderEffects.csproj", "{B859BE0F-A992-476D-A642-FA8EFE94AAA5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ColorPicker", "Source\Plugins\ColorPicker\ColorPicker.csproj", "{A4761900-0EA3-4FE4-A919-847FD5080EFC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TagExplorer", "Source\Plugins\TagExplorer\TagExplorer.csproj", "{BE7917F3-E6FE-4D5B-8FA9-B8E7668AC731}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommentsPanel", "Source\Plugins\CommentsPanel\CommentsPanel.csproj", "{58BD8A5B-1B48-435D-8473-A92F27D06C49}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NodesViewer", "Source\Plugins\NodesViewer\NodesViewer.csproj", "{9F244231-6A0C-42A6-87C5-ED9620DEE096}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TagRange", "Source\Plugins\TagRange\TagRange.csproj", "{F49EFF6D-51CB-4E49-8223-AAE653C5B62F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisplaneExplorer", "Source\Plugins\VisplaneExplorer\VisplaneExplorer.csproj", "{CF670175-7099-4090-A330-EE25C7230139}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SoundPropagation", "Source\Plugins\SoundPropagationMode\SoundPropagation.csproj", "{F59B344C-DD50-4DB7-ADDD-56AAD66450AF}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StairSectorBuilder", "Source\Plugins\StairSectorBuilder\StairSectorBuilder.csproj", "{3F365121-906B-409D-BB1E-37E0A78056C2}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug + Profiler|x86 = Debug + Profiler|x86
+		Debug|x86 = Debug|x86
+		Release + Profiler|x86 = Release + Profiler|x86
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{818B3D10-F791-4C3F-9AF5-BB2D0079B63C}.Debug + Profiler|x86.ActiveCfg = Debug + Profiler|x86
+		{818B3D10-F791-4C3F-9AF5-BB2D0079B63C}.Debug + Profiler|x86.Build.0 = Debug + Profiler|x86
+		{818B3D10-F791-4C3F-9AF5-BB2D0079B63C}.Debug|x86.ActiveCfg = Debug|x86
+		{818B3D10-F791-4C3F-9AF5-BB2D0079B63C}.Debug|x86.Build.0 = Debug|x86
+		{818B3D10-F791-4C3F-9AF5-BB2D0079B63C}.Release + Profiler|x86.ActiveCfg = Release + Profiler|x86
+		{818B3D10-F791-4C3F-9AF5-BB2D0079B63C}.Release + Profiler|x86.Build.0 = Release + Profiler|x86
+		{818B3D10-F791-4C3F-9AF5-BB2D0079B63C}.Release|x86.ActiveCfg = Release|x86
+		{818B3D10-F791-4C3F-9AF5-BB2D0079B63C}.Release|x86.Build.0 = Release|x86
+		{B42D5AA0-F9A6-4234-9C4B-A05B11A64851}.Debug + Profiler|x86.ActiveCfg = Debug + Profiler|x86
+		{B42D5AA0-F9A6-4234-9C4B-A05B11A64851}.Debug + Profiler|x86.Build.0 = Debug + Profiler|x86
+		{B42D5AA0-F9A6-4234-9C4B-A05B11A64851}.Debug|x86.ActiveCfg = Debug|x86
+		{B42D5AA0-F9A6-4234-9C4B-A05B11A64851}.Debug|x86.Build.0 = Debug|x86
+		{B42D5AA0-F9A6-4234-9C4B-A05B11A64851}.Release + Profiler|x86.ActiveCfg = Release + Profiler|x86
+		{B42D5AA0-F9A6-4234-9C4B-A05B11A64851}.Release + Profiler|x86.Build.0 = Release + Profiler|x86
+		{B42D5AA0-F9A6-4234-9C4B-A05B11A64851}.Release|x86.ActiveCfg = Release|x86
+		{B42D5AA0-F9A6-4234-9C4B-A05B11A64851}.Release|x86.Build.0 = Release|x86
+		{B859BE0F-A992-476D-A642-FA8EFE94AAA5}.Debug + Profiler|x86.ActiveCfg = Debug + Profiler|x86
+		{B859BE0F-A992-476D-A642-FA8EFE94AAA5}.Debug + Profiler|x86.Build.0 = Debug + Profiler|x86
+		{B859BE0F-A992-476D-A642-FA8EFE94AAA5}.Debug|x86.ActiveCfg = Debug|x86
+		{B859BE0F-A992-476D-A642-FA8EFE94AAA5}.Debug|x86.Build.0 = Debug|x86
+		{B859BE0F-A992-476D-A642-FA8EFE94AAA5}.Release + Profiler|x86.ActiveCfg = Release + Profiler|x86
+		{B859BE0F-A992-476D-A642-FA8EFE94AAA5}.Release + Profiler|x86.Build.0 = Release + Profiler|x86
+		{B859BE0F-A992-476D-A642-FA8EFE94AAA5}.Release|x86.ActiveCfg = Release|x86
+		{B859BE0F-A992-476D-A642-FA8EFE94AAA5}.Release|x86.Build.0 = Release|x86
+		{A4761900-0EA3-4FE4-A919-847FD5080EFC}.Debug + Profiler|x86.ActiveCfg = Debug + Profiler|x86
+		{A4761900-0EA3-4FE4-A919-847FD5080EFC}.Debug + Profiler|x86.Build.0 = Debug + Profiler|x86
+		{A4761900-0EA3-4FE4-A919-847FD5080EFC}.Debug|x86.ActiveCfg = Debug|x86
+		{A4761900-0EA3-4FE4-A919-847FD5080EFC}.Debug|x86.Build.0 = Debug|x86
+		{A4761900-0EA3-4FE4-A919-847FD5080EFC}.Release + Profiler|x86.ActiveCfg = Release + Profiler|x86
+		{A4761900-0EA3-4FE4-A919-847FD5080EFC}.Release + Profiler|x86.Build.0 = Release + Profiler|x86
+		{A4761900-0EA3-4FE4-A919-847FD5080EFC}.Release|x86.ActiveCfg = Release|x86
+		{A4761900-0EA3-4FE4-A919-847FD5080EFC}.Release|x86.Build.0 = Release|x86
+		{BE7917F3-E6FE-4D5B-8FA9-B8E7668AC731}.Debug + Profiler|x86.ActiveCfg = Debug + Profiler|x86
+		{BE7917F3-E6FE-4D5B-8FA9-B8E7668AC731}.Debug + Profiler|x86.Build.0 = Debug + Profiler|x86
+		{BE7917F3-E6FE-4D5B-8FA9-B8E7668AC731}.Debug|x86.ActiveCfg = Debug|x86
+		{BE7917F3-E6FE-4D5B-8FA9-B8E7668AC731}.Debug|x86.Build.0 = Debug|x86
+		{BE7917F3-E6FE-4D5B-8FA9-B8E7668AC731}.Release + Profiler|x86.ActiveCfg = Release + Profiler|x86
+		{BE7917F3-E6FE-4D5B-8FA9-B8E7668AC731}.Release + Profiler|x86.Build.0 = Release + Profiler|x86
+		{BE7917F3-E6FE-4D5B-8FA9-B8E7668AC731}.Release|x86.ActiveCfg = Release|x86
+		{BE7917F3-E6FE-4D5B-8FA9-B8E7668AC731}.Release|x86.Build.0 = Release|x86
+		{58BD8A5B-1B48-435D-8473-A92F27D06C49}.Debug + Profiler|x86.ActiveCfg = Debug + Profiler|x86
+		{58BD8A5B-1B48-435D-8473-A92F27D06C49}.Debug + Profiler|x86.Build.0 = Debug + Profiler|x86
+		{58BD8A5B-1B48-435D-8473-A92F27D06C49}.Debug|x86.ActiveCfg = Debug|x86
+		{58BD8A5B-1B48-435D-8473-A92F27D06C49}.Debug|x86.Build.0 = Debug|x86
+		{58BD8A5B-1B48-435D-8473-A92F27D06C49}.Release + Profiler|x86.ActiveCfg = Release + Profiler|x86
+		{58BD8A5B-1B48-435D-8473-A92F27D06C49}.Release + Profiler|x86.Build.0 = Release + Profiler|x86
+		{58BD8A5B-1B48-435D-8473-A92F27D06C49}.Release|x86.ActiveCfg = Release|x86
+		{58BD8A5B-1B48-435D-8473-A92F27D06C49}.Release|x86.Build.0 = Release|x86
+		{9F244231-6A0C-42A6-87C5-ED9620DEE096}.Debug + Profiler|x86.ActiveCfg = Debug + Profiler|x86
+		{9F244231-6A0C-42A6-87C5-ED9620DEE096}.Debug + Profiler|x86.Build.0 = Debug + Profiler|x86
+		{9F244231-6A0C-42A6-87C5-ED9620DEE096}.Debug|x86.ActiveCfg = Debug|x86
+		{9F244231-6A0C-42A6-87C5-ED9620DEE096}.Debug|x86.Build.0 = Debug|x86
+		{9F244231-6A0C-42A6-87C5-ED9620DEE096}.Release + Profiler|x86.ActiveCfg = Release + Profiler|x86
+		{9F244231-6A0C-42A6-87C5-ED9620DEE096}.Release + Profiler|x86.Build.0 = Release + Profiler|x86
+		{9F244231-6A0C-42A6-87C5-ED9620DEE096}.Release|x86.ActiveCfg = Release|x86
+		{9F244231-6A0C-42A6-87C5-ED9620DEE096}.Release|x86.Build.0 = Release|x86
+		{F49EFF6D-51CB-4E49-8223-AAE653C5B62F}.Debug + Profiler|x86.ActiveCfg = Debug + Profiler|x86
+		{F49EFF6D-51CB-4E49-8223-AAE653C5B62F}.Debug + Profiler|x86.Build.0 = Debug + Profiler|x86
+		{F49EFF6D-51CB-4E49-8223-AAE653C5B62F}.Debug|x86.ActiveCfg = Debug|x86
+		{F49EFF6D-51CB-4E49-8223-AAE653C5B62F}.Debug|x86.Build.0 = Debug|x86
+		{F49EFF6D-51CB-4E49-8223-AAE653C5B62F}.Release + Profiler|x86.ActiveCfg = Release + Profiler|x86
+		{F49EFF6D-51CB-4E49-8223-AAE653C5B62F}.Release + Profiler|x86.Build.0 = Release + Profiler|x86
+		{F49EFF6D-51CB-4E49-8223-AAE653C5B62F}.Release|x86.ActiveCfg = Release|x86
+		{F49EFF6D-51CB-4E49-8223-AAE653C5B62F}.Release|x86.Build.0 = Release|x86
+		{CF670175-7099-4090-A330-EE25C7230139}.Debug + Profiler|x86.ActiveCfg = Debug + Profiler|x86
+		{CF670175-7099-4090-A330-EE25C7230139}.Debug + Profiler|x86.Build.0 = Debug + Profiler|x86
+		{CF670175-7099-4090-A330-EE25C7230139}.Debug|x86.ActiveCfg = Debug|x86
+		{CF670175-7099-4090-A330-EE25C7230139}.Debug|x86.Build.0 = Debug|x86
+		{CF670175-7099-4090-A330-EE25C7230139}.Release + Profiler|x86.ActiveCfg = Release + Profiler|x86
+		{CF670175-7099-4090-A330-EE25C7230139}.Release + Profiler|x86.Build.0 = Release + Profiler|x86
+		{CF670175-7099-4090-A330-EE25C7230139}.Release|x86.ActiveCfg = Release|x86
+		{CF670175-7099-4090-A330-EE25C7230139}.Release|x86.Build.0 = Release|x86
+		{F59B344C-DD50-4DB7-ADDD-56AAD66450AF}.Debug + Profiler|x86.ActiveCfg = Debug + Profiler|x86
+		{F59B344C-DD50-4DB7-ADDD-56AAD66450AF}.Debug + Profiler|x86.Build.0 = Debug + Profiler|x86
+		{F59B344C-DD50-4DB7-ADDD-56AAD66450AF}.Debug|x86.ActiveCfg = Debug|x86
+		{F59B344C-DD50-4DB7-ADDD-56AAD66450AF}.Debug|x86.Build.0 = Debug|x86
+		{F59B344C-DD50-4DB7-ADDD-56AAD66450AF}.Release + Profiler|x86.ActiveCfg = Release + Profiler|x86
+		{F59B344C-DD50-4DB7-ADDD-56AAD66450AF}.Release + Profiler|x86.Build.0 = Release + Profiler|x86
+		{F59B344C-DD50-4DB7-ADDD-56AAD66450AF}.Release|x86.ActiveCfg = Release|x86
+		{F59B344C-DD50-4DB7-ADDD-56AAD66450AF}.Release|x86.Build.0 = Release|x86
+		{3F365121-906B-409D-BB1E-37E0A78056C2}.Debug + Profiler|x86.ActiveCfg = Debug + Profiler|x86
+		{3F365121-906B-409D-BB1E-37E0A78056C2}.Debug + Profiler|x86.Build.0 = Debug + Profiler|x86
+		{3F365121-906B-409D-BB1E-37E0A78056C2}.Debug|x86.ActiveCfg = Debug|x86
+		{3F365121-906B-409D-BB1E-37E0A78056C2}.Debug|x86.Build.0 = Debug|x86
+		{3F365121-906B-409D-BB1E-37E0A78056C2}.Release + Profiler|x86.ActiveCfg = Release + Profiler|x86
+		{3F365121-906B-409D-BB1E-37E0A78056C2}.Release + Profiler|x86.Build.0 = Release + Profiler|x86
+		{3F365121-906B-409D-BB1E-37E0A78056C2}.Release|x86.ActiveCfg = Release|x86
+		{3F365121-906B-409D-BB1E-37E0A78056C2}.Release|x86.Build.0 = Release|x86
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/ChangelogMaker.exe b/ChangelogMaker.exe
new file mode 100644
index 0000000..c47131d
Binary files /dev/null and b/ChangelogMaker.exe differ
diff --git a/Clean Rebuild.bat b/Clean Rebuild.bat
new file mode 100644
index 0000000..4eb46a0
--- /dev/null
+++ b/Clean Rebuild.bat	
@@ -0,0 +1,133 @@
+@ECHO OFF
+
+ECHO.
+ECHO.     This build script requires the following software to be installed:
+ECHO.       - Microsoft Visual Studio 2008
+ECHO.
+
+SET STUDIODIR=c:\Program Files (x86)\Microsoft Visual Studio 9.0
+
+CALL "%STUDIODIR%\Common7\Tools\vsvars32.bat"
+
+DEL /F /Q "Build\Plugins\*.pdb" > NUL
+
+ECHO.
+ECHO Compiling GZDoom Builder core...
+ECHO.
+IF EXIST "Build\Builder.exe" DEL /F /Q "Build\Builder.exe" > NUL
+IF EXIST "Source\Core\obj" RD /S /Q "Source\Core\obj"
+msbuild "Source\Core\Builder.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal
+IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL
+IF NOT EXIST "Build\Builder.exe" GOTO FILEFAIL
+
+ECHO.
+ECHO Compiling Builder Effects plugin...
+ECHO.
+IF EXIST "Build\Plugins\BuilderEffects.dll" DEL /F /Q "Build\Plugins\BuilderEffects.dll" > NUL
+IF EXIST "Source\Plugins\BuilderEffects\obj" RD /S /Q "Source\Plugins\BuilderEffects\obj"
+msbuild "Source\Plugins\BuilderEffects\BuilderEffects.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal
+IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL
+IF NOT EXIST "Build\Plugins\BuilderEffects.dll" GOTO FILEFAIL
+
+ECHO.
+ECHO Compiling Builder Modes plugin...
+ECHO.
+IF EXIST "Build\Plugins\BuilderModes.dll" DEL /F /Q "Build\Plugins\BuilderModes.dll" > NUL
+IF EXIST "Source\Plugins\BuilderModes\obj" RD /S /Q "Source\Plugins\BuilderModes\obj"
+msbuild "Source\Plugins\BuilderModes\BuilderModes.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal
+IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL
+IF NOT EXIST "Build\Plugins\BuilderModes.dll" GOTO FILEFAIL
+
+ECHO.
+ECHO Compiling Color Picker plugin...
+ECHO.
+IF EXIST "Build\Plugins\ColorPicker.dll" DEL /F /Q "Build\Plugins\ColorPicker.dll" > NUL
+IF EXIST "Source\Plugins\ColorPicker\obj" RD /S /Q "Source\Plugins\ColorPicker\obj"
+msbuild "Source\Plugins\ColorPicker\ColorPicker.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal
+IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL
+IF NOT EXIST "Build\Plugins\ColorPicker.dll" GOTO FILEFAIL
+
+ECHO.
+ECHO Compiling Comments Panel plugin...
+ECHO.
+IF EXIST "Build\Plugins\CommentsPanel.dll" DEL /F /Q "Build\Plugins\CommentsPanel.dll" > NUL
+IF EXIST "Source\Plugins\CommentsPanel\obj" RD /S /Q "Source\Plugins\CommentsPanel\obj"
+msbuild "Source\Plugins\CommentsPanel\CommentsPanel.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal
+IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL
+IF NOT EXIST "Build\Plugins\CommentsPanel.dll" GOTO FILEFAIL
+
+ECHO.
+ECHO Compiling Nodes Viewer plugin...
+ECHO.
+IF EXIST "Build\Plugins\NodesViewer.dll" DEL /F /Q "Build\Plugins\NodesViewer.dll" > NUL
+IF EXIST "Source\Plugins\NodesViewer\obj" RD /S /Q "Source\Plugins\NodesViewer\obj"
+msbuild "Source\Plugins\NodesViewer\NodesViewer.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal
+IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL
+IF NOT EXIST "Build\Plugins\NodesViewer.dll" GOTO FILEFAIL
+
+ECHO.
+ECHO Compiling Sound Propagation Mode plugin...
+ECHO.
+IF EXIST "Build\Plugins\SoundPropagationMode.dll" DEL /F /Q "Build\Plugins\SoundPropagationMode.dll" > NUL
+IF EXIST "Source\Plugins\SoundPropagationMode\obj" RD /S /Q "Source\Plugins\SoundPropagationMode\obj"
+msbuild "Source\Plugins\SoundPropagationMode\SoundPropagation.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal
+IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL
+IF NOT EXIST "Build\Plugins\SoundPropagationMode.dll" GOTO FILEFAIL
+
+ECHO.
+ECHO Compiling Stair Sector Builder plugin...
+ECHO.
+IF EXIST "Build\Plugins\StairSectorBuilder.dll" DEL /F /Q "Build\Plugins\StairSectorBuilder.dll" > NUL
+IF EXIST "Source\Plugins\StairSectorBuilder\obj" RD /S /Q "Source\Plugins\StairSectorBuilder\obj"
+msbuild "Source\Plugins\StairSectorBuilder\StairSectorBuilder.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal
+IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL
+IF NOT EXIST "Build\Plugins\StairSectorBuilder.dll" GOTO FILEFAIL
+
+ECHO.
+ECHO Compiling Tag Explorer plugin...
+ECHO.
+IF EXIST "Build\Plugins\TagExplorer.dll" DEL /F /Q "Build\Plugins\TagExplorer.dll" > NUL
+IF EXIST "Source\Plugins\TagExplorer\obj" RD /S /Q "Source\Plugins\TagExplorer\obj"
+msbuild "Source\Plugins\TagExplorer\TagExplorer.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal
+IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL
+IF NOT EXIST "Build\Plugins\TagExplorer.dll" GOTO FILEFAIL
+
+ECHO.
+ECHO Compiling Tag Range plugin...
+ECHO.
+IF EXIST "Build\Plugins\TagRange.dll" DEL /F /Q "Build\Plugins\TagRange.dll" > NUL
+IF EXIST "Source\Plugins\TagRange\obj" RD /S /Q "Source\Plugins\TagRange\obj"
+msbuild "Source\Plugins\TagRange\TagRange.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal
+IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL
+IF NOT EXIST "Build\Plugins\TagRange.dll" GOTO FILEFAIL
+
+ECHO.
+ECHO Compiling Visplane Explorer plugin...
+ECHO.
+IF EXIST "Build\Plugins\VisplaneExplorer.dll" DEL /F /Q "Build\Plugins\VisplaneExplorer.dll" > NUL
+IF EXIST "Source\Plugins\VisplaneExplorer\obj" RD /S /Q "Source\Plugins\VisplaneExplorer\obj"
+msbuild "Source\Plugins\VisplaneExplorer\VisplaneExplorer.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal
+IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL
+IF NOT EXIST "Build\Plugins\VisplaneExplorer.dll" GOTO FILEFAIL
+
+ECHO.
+ECHO.     BUILD DONE !
+ECHO.
+PAUSE > NUL
+GOTO LEAVE
+
+:ERRORFAIL
+ECHO.
+ECHO.     BUILD FAILED (Tool returned error %ERRORLEVEL%)
+ECHO.
+PAUSE > NUL
+GOTO LEAVE
+
+:FILEFAIL
+ECHO.
+ECHO.     BUILD FAILED (Output file was not built)
+ECHO.
+PAUSE > NUL
+GOTO LEAVE
+
+:LEAVE
diff --git a/CompileHelp.bat b/CompileHelp.bat
new file mode 100644
index 0000000..6d7f2ce
--- /dev/null
+++ b/CompileHelp.bat
@@ -0,0 +1,29 @@
+@ECHO OFF
+ECHO.
+ECHO Compiling HTML Help file...
+ECHO.
+IF EXIST "Build\Refmanual.chm" DEL /F /Q "Build\Refmanual.chm" > NUL
+"c:\Program Files (x86)\HTML Help Workshop\hhc" Help\Refmanual.hhp
+IF %ERRORLEVEL% NEQ 1 GOTO ERRORFAIL
+IF NOT EXIST "Build\Refmanual.chm" GOTO FILEFAIL
+
+ECHO.
+ECHO.     BUILD DONE !
+ECHO.
+GOTO LEAVE
+
+:ERRORFAIL
+ECHO.
+ECHO.     BUILD FAILED (Tool returned error)
+ECHO.
+PAUSE > NUL
+GOTO LEAVE
+
+:FILEFAIL
+ECHO.
+ECHO.     BUILD FAILED (Output file was not built)
+ECHO.
+PAUSE > NUL
+GOTO LEAVE
+
+:LEAVE
\ No newline at end of file
diff --git a/Documents/Boom_specs.txt b/Documents/Boom_specs.txt
new file mode 100644
index 0000000..5fab2b8
--- /dev/null
+++ b/Documents/Boom_specs.txt
@@ -0,0 +1,2388 @@
+>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<
+>                                          <
+>       BOOM reference v1.3 4/12/98        <
+>                                          <
+>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<
+
+======================================================================
+                        Part I Linedef Types
+======================================================================
+
+#######################
+Section 0. Terminology
+#######################
+
+In BOOM actions are caused to happen in the game thru linedef types.
+BOOM has three kinds of linedef types:
+
+Regular     - the linedef types that were already in DOOM II v1.9
+
+Extended    - linedef types not in DOOM II v1.9 but less than 8192 
+              in value
+
+Generalized - linedef types over 8192 in value that contain bit
+              fields that independently control the actions of the sector
+              affected.
+
+A linedef with non-zero linedef type is called a linedef trigger. A
+linedef trigger is always activated in one of three ways - pushing on
+the first sidedef of the linedef, walking over the linedef, or
+shooting the linedef with an impact weapon (fists, chainsaw, pistol,
+shotgun, double barreled, or chaingun). 
+
+Linedefs activated by pushing on them come in two varieties. A manual
+linedef affects the sector on the second sidedef of the line pushed.
+A switched linedef affects all sectors that have the same tag field
+as the linedef that was pushed.
+
+Nearly all switched, walkover, and gun linedefs operate on the sectors
+with the same tag as that in the tag field of the linedef.
+
+Some linedefs are never activated per se, but simply create or control
+an effect thru their existence and properties, usually affecting the 
+sectors sharing the linedef's tags. There are also a few special case
+like line-line teleporters and exit linedefs that do not affect
+sectors.
+
+Some linedefs are only triggerable once, others are triggerable as
+many times as you like.
+
+Triggering types are denoted by the letters P, S, W, and G for
+manual(push), switched, walkover, and gun. Their retriggerability is
+denoted by a 1 or R following the letter. So the triggering types for
+linedefs are:
+
+P1 PR S1 SR W1 WR G1 GR
+
+Often linedef actions depend on values in neighboring sectors. A
+neighboring sector is one that shares a linedef in common, just
+sharing a vertex is not sufficient.
+
+In DOOM only one action on a sector could occur at a time. BOOM
+supports one floor action, one ceiling action, and one lighting
+action simultaneously.
+ 
+
+################
+Section 1. Doors
+################
+
+A door is a sector, usually placed between two rooms, whose ceiling
+raises to open, and lowers to close. 
+
+A door is fully closed when its ceiling height is equal to its floor
+height. 
+
+A door is fully open when its ceiling height is 4 less than the lowest
+neighbor ceiling adjacent to it. 
+
+A door may be set to an intermediate state initially, or thru the action
+of a linedef trigger that affects ceilings or floors. The door is passable
+to a player when its ceiling is at least 56 units higher than its floor.
+In general the door is passable to a monster or a thing when its ceiling
+is at least the monster or thing's height above the floor.
+
+If a door has a ceiling height ABOVE the fully open height, then an
+open door action moves the ceiling to the fully open height
+instantly.
+
+If a door has a ceiling height BELOW the fully closed height (that is
+the ceiling of the door sector is lower than the floor of the door
+sector) a close door action moves the ceiling to the fully closed
+height instantly.
+
+--------------------------
+Section 1.1 Door functions
+--------------------------
+
+Open, Wait, Then Close   
+
+On activation, door opens fully, waits a specified period, then
+closes fully.
+
+Open and Stay Open
+
+On activation, door opens fully and remains there.
+
+Close and Stay Closed
+
+On activation, door closes fully, and remains there.
+
+Close, Wait, Then Open
+
+On activation, door closes fully, waits a specified period, then
+opens fully.
+
+------------------------------
+Section 1.2 Varieties of doors
+------------------------------
+
+A door can be triggered by pushing on it, walking over or pressing a
+linedef trigger tagged to it, or shooting a linedef tagged to it.
+These are called manual, walkover, switched, or gun doors resp.
+
+Since a push door (P1/PR) has no use for its tag, BOOM has extended
+the functionality to include changing any tagged sectors to maximum
+neighbor lighting on fully opening, then to minimum neighbor lighting
+on fully closing. This is true for regular, extended, and generalized
+doors with push triggers.
+
+A door trigger can be locked. This means that the door function will only
+operate if the player is in possession of the right key(s). Regular
+and extended door triggers only care if the player has a key of the
+right color, they do not care which. Generalized door triggers
+can distinguish between skull and card keys, and can also require
+any key, or all keys in order to activate.
+
+A door can have different speeds, slow, normal, fast or turbo.
+
+A door can wait for different amounts of time.
+
+A door may or may not be activatable by monsters.
+
+Any door function except Close and Stay Closed, when closing and
+encountering a monster or player's head will bounce harmlessly off
+that head and return to fully open. A Close and Stay Closed will rest
+on the head until it leaves the door sector.
+
+------------------------------
+Section 1.3 Door linedef types
+------------------------------
+
+Regular and Extended Door Types
+---------------------------------------------------------------
+#        Class   Trig   Lock   Speed    Wait  Monst    Function
+
+1        Reg     PR     No     Slow     4s    Yes      Open, Wait, Then Close
+117      Reg     PR     No     Fast     4s    No       Open, Wait, Then Close
+63       Reg     SR     No     Slow     4s    No       Open, Wait, Then Close
+114      Reg     SR     No     Fast     4s    No       Open, Wait, Then Close
+29       Reg     S1     No     Slow     4s    No       Open, Wait, Then Close
+111      Reg     S1     No     Fast     4s    No       Open, Wait, Then Close
+90       Reg     WR     No     Slow     4s    No       Open, Wait, Then Close
+105      Reg     WR     No     Fast     4s    No       Open, Wait, Then Close
+4        Reg     W1     No     Slow     4s    No       Open, Wait, Then Close
+108      Reg     W1     No     Fast     4s    No       Open, Wait, Then Close
+
+31       Reg     P1     No     Slow     --    No       Open and Stay Open
+118      Reg     P1     No     Fast     --    No       Open and Stay Open
+61       Reg     SR     No     Slow     --    No       Open and Stay Open
+115      Reg     SR     No     Fast     --    No       Open and Stay Open
+103      Reg     S1     No     Slow     --    No       Open and Stay Open
+112      Reg     S1     No     Fast     --    No       Open and Stay Open
+86       Reg     WR     No     Slow     --    No       Open and Stay Open
+106      Reg     WR     No     Fast     --    No       Open and Stay Open
+2        Reg     W1     No     Slow     --    No       Open and Stay Open
+109      Reg     W1     No     Fast     --    No       Open and Stay Open
+46       Reg     GR     No     Slow     --    No       Open and Stay Open
+
+42       Reg     SR     No     Slow     --    No       Close and Stay Closed
+116      Reg     SR     No     Fast     --    No       Close and Stay Closed
+50       Reg     S1     No     Slow     --    No       Close and Stay Closed
+113      Reg     S1     No     Fast     --    No       Close and Stay Closed
+75       Reg     WR     No     Slow     --    No       Close and Stay Closed
+107      Reg     WR     No     Fast     --    No       Close and Stay Closed
+3        Reg     W1     No     Slow     --    No       Close and Stay Closed
+110      Reg     W1     No     Fast     --    No       Close and Stay Closed
+
+196      Ext     SR     No     Slow     30s   No       Close, Wait, Then Open
+175      Ext     S1     No     Slow     30s   No       Close, Wait, Then Open
+76       Reg     WR     No     Slow     30s   No       Close, Wait, Then Open
+16       Reg     W1     No     Slow     30s   No       Close, Wait, Then Open
+
+Regular and Extended Locked Door Types
+---------------------------------------------------------------
+#        Class   Trig   Lock   Speed    Wait  Monst    Function
+
+26       Reg     PR     Blue   Slow     4s    No       Open, Wait, Then Close
+28       Reg     PR     Red    Slow     4s    No       Open, Wait, Then Close
+27       Reg     PR     Yell   Slow     4s    No       Open, Wait, Then Close
+
+32       Reg     P1     Blue   Slow     --    No       Open and Stay Open
+33       Reg     P1     Red    Slow     --    No       Open and Stay Open
+34       Reg     P1     Yell   Slow     --    No       Open and Stay Open
+99       Reg     SR     Blue   Fast     --    No       Open and Stay Open
+134      Reg     SR     Red    Fast     --    No       Open and Stay Open
+136      Reg     SR     Yell   Fast     --    No       Open and Stay Open
+133      Reg     S1     Blue   Fast     --    No       Open and Stay Open
+135      Reg     S1     Red    Fast     --    No       Open and Stay Open
+137      Reg     S1     Yell   Fast     --    No       Open and Stay Open
+
+
+There are two generalized door linedef types, Generalized Door, and
+Generalized Locked Door. The following tables show the possibilities
+for each parameter, any combination of parameters is allowed:
+
+Slow and Fast represent the same speeds as slow and fast regular doors. Normal
+is twice as fast as slow, Fast is twice normal, Turbo is twice Fast.
+
+Generalized Door Types
+---------------------------------------------------------------
+#        Class   Trig   Lock   Speed    Wait  Monst    Function
+
+3C00H-   Gen     P1/PR  No     Slow     1s    Yes      Open, Wait, Then Close
+4000H            S1/SR         Normal   4s    No       Open and Stay Open
+                 W1/WR         Fast     9s             Close and Stay Closed
+                 G1/GR         Turbo    30s            Close, Wait, Then Open
+                        
+
+Generalized Locked Door Types
+---------------------------------------------------------------
+#        Class   Trig   Lock   Speed    Wait  Monst    Function
+
+3800H-   Gen     P1/PR  Any    Slow     1s    No       Open, Wait, Then Close
+3C00H            S1/SR  Blue   Normal   4s             Open and Stay Open
+                 W1/WR  Red    Fast     9s             Close and Stay Closed
+                 G1/GR  Yell   Turbo    30s            Close, Wait, Then Open
+                        BlueC
+                        RedC
+                        YellC
+                        BlueS
+                        RedS
+                        YellS
+                        All3
+                        All6
+                        
+#################
+Section 2. Floors
+#################
+
+----------------------------
+Section 2.1 Floor targets
+----------------------------
+
+Lowest Neighbor Floor (LnF)
+
+This means that the floor moves to the height of the lowest
+neighboring floor including the floor itself. If the floor
+direction is up (only possible with generalized floors) motion is
+instant, else at the floor's speed.
+
+Next Neighbor Floor (NnF)
+
+This means that the floor moves up to the height of the lowest
+adjacent floor greater in height than the current, or down to the
+height of the highest adjacent floor less in height than the current,
+as determined by the floor's direction. Instant motion is not
+possible in this case. If no such floor exists, the floor does not move.
+
+Lowest Neighbor Ceiling (LnC)
+
+This means that the floor height changes to the height of the lowest
+ceiling possessed by any neighboring sector, including that floor's
+ceiling. If the target height is in the opposite direction to floor
+motion, motion is instant, otherwise at the floor action's speed.
+
+8 Under Lowest Neighbor Ceiling (8uLnC)
+
+This means that the floor height changes to 8 less than the height
+of the lowest ceiling possessed by any neighboring sector, including
+that floor's ceiling. If the target height is in the opposite
+direction to floor motion, motion is instant, otherwise at the floor
+action's speed.
+
+Highest Neighbor Floor (HnF)
+
+This means that the floor height changes to the height of the highest
+neighboring floor, excluding the floor itself. If no neighbor floor
+exists, the floor moves down to -32000. If the target height is in
+the opposite direction to floor motion, the motion is instant,
+otherwise it occurs at the floor action's speed.
+
+8 Above Highest Neighbor Floor (8aHnF)
+
+This means that the floor height changes to 8 above the height of
+the highest neighboring floor, excluding the floor itself. If no
+neighbor floor exists, the floor moves down to -31992. If the target
+height is in the opposite direction to floor motion, the motion is
+instant, otherwise it occurs at the floor action's speed.
+
+Ceiling
+
+The floor moves up until its at ceiling height, instantly if floor
+direction is down (only available with generalized types), at the
+floor speed if the direction is up.
+
+24 Units (24)
+
+The floor moves 24 units in the floor action's direction. Instant
+motion is not possible with this linedef type.
+
+32 Units (32)
+
+The floor moves 32 units in the floor action's direction. Instant
+motion is not possible with this linedef type.
+
+512 Units (512)
+
+The floor moves 512 units in the floor action's direction. Instant
+motion is not possible with this linedef type.
+
+Shortest Lower Texture (SLT)
+
+The floor moves the height of the shortest lower texture on the
+boundary of the sector, in the floor direction. Instant motion is not
+possible with this type. In the case that there is no surrounding
+texture the motion is to -32000 or +32000 depending on direction.
+
+None
+
+Some pure texture type changes are provided for changing the floor
+texture and/or sector type without moving the floor.
+
+--------------------------------
+Section 2.2 Varieties of floors
+--------------------------------
+
+A floor can be activated by pushing on a linedef bounding it
+(generalized types only), or by pushing on a switch with the same tag
+as the floor sector, or by walking over a linedef with the same tag
+as the floor, or by shooting a linedef with the same tag as the
+floor with an impact weapon.
+
+A floor can move either Up or Down.
+
+A floor can move with speeds of Slow, Normal, Fast, or Turbo. If the
+target height specified by the floor function (see Floor Targets
+above) is in the opposite direction to the floor's motion, then
+travel is instantaneous, otherwise its at the speed specified.
+
+A floor action can be a texture change type, in which case after the
+action the floor texture of the affected floor, and possibly the
+sector type of the affected floor are changed to those of a model
+sector. The sector type may be zeroed instead of copied from the
+model, or not changed at all. These change types are referred to
+below as Tx (texture only), Tx0 (type zeroed), and TxTy (texture and
+type changed). The model sector for the change may be the sector on
+the first sidedef of the trigger (trigger model) or the sector with
+floor at destination height across the lowest numbered two-sided
+linedef surrounding the affected sector (numeric model). If no model
+sector exists, no change occurs. If a change occurs, floor texture is
+always affected, lighting is never affected, even that corresponding
+to the sector's type, nor is any other sector property other than the
+sector's type.
+
+Numeric model algorithm:
+
+1) Find all floors adjacent to the tagged floor at destination height
+2) Find the lowest numbered linedef separating those floors from that tagged
+3) The sector on the other side of that linedef is the model
+
+A floor action can have the crush property, in which case players and
+monsters are crushed when the floor tries to move above the point
+where they fit exactly underneath the ceiling. This means they take
+damage until they die, leave the sector, or the floor action is stopped.
+A floor action never reverses on encountering an obstacle, even if
+the crush property is not true, the floor merely remains in the same
+position until the obstacle is removed or dies, then continues.
+
+-------------------------------
+Section 2.3 Floor linedef types
+-------------------------------
+
+Regular and Extended Floor Types
+-------------------------------------------------------------------
+#     Class   Trig   Dir Spd   Chg  Mdl Mon Crsh  Target
+
+60    Reg     SR     Dn  Slow  None --  No  No    Lowest Neighbor Floor
+23    Reg     S1     Dn  Slow  None --  No  No    Lowest Neighbor Floor
+82    Reg     WR     Dn  Slow  None --  No  No    Lowest Neighbor Floor
+38    Reg     W1     Dn  Slow  None --  No  No    Lowest Neighbor Floor
+      
+177   Ext     SR     Dn  Slow  TxTy Num No  No    Lowest Neighbor Floor
+159   Ext     S1     Dn  Slow  TxTy Num No  No    Lowest Neighbor Floor
+84    Reg     WR     Dn  Slow  TxTy Num No  No    Lowest Neighbor Floor
+37    Reg     W1     Dn  Slow  TxTy Num No  No    Lowest Neighbor Floor
+
+69    Reg     SR     Up  Slow  None --  No  No    Next Neighbor Floor
+18    Reg     S1     Up  Slow  None --  No  No    Next Neighbor Floor
+128   Reg     WR     Up  Slow  None --  No  No    Next Neighbor Floor
+119   Reg     W1     Up  Slow  None --  No  No    Next Neighbor Floor
+
+132   Reg     SR     Up  Fast  None --  No  No    Next Neighbor Floor
+131   Reg     S1     Up  Fast  None --  No  No    Next Neighbor Floor
+129   Reg     WR     Up  Fast  None --  No  No    Next Neighbor Floor
+130   Reg     W1     Up  Fast  None --  No  No    Next Neighbor Floor
+
+222   Ext     SR     Dn  Slow  None --  No  No    Next Neighbor Floor
+221   Ext     S1     Dn  Slow  None --  No  No    Next Neighbor Floor
+220   Ext     WR     Dn  Slow  None --  No  No    Next Neighbor Floor
+219   Ext     W1     Dn  Slow  None --  No  No    Next Neighbor Floor
+
+64    Reg     SR     Up  Slow  None --  No  No    Lowest Neighbor Ceiling
+101   Reg     S1     Up  Slow  None --  No  No    Lowest Neighbor Ceiling
+91    Reg     WR     Up  Slow  None --  No  No    Lowest Neighbor Ceiling
+5     Reg     W1     Up  Slow  None --  No  No    Lowest Neighbor Ceiling
+24    Reg     G1     Up  Slow  None --  No  No    Lowest Neighbor Ceiling
+
+65    Reg     SR     Up  Slow  None --  No  Yes   Lowest Neighbor Ceiling - 8
+55    Reg     S1     Up  Slow  None --  No  Yes   Lowest Neighbor Ceiling - 8
+94    Reg     WR     Up  Slow  None --  No  Yes   Lowest Neighbor Ceiling - 8
+56    Reg     W1     Up  Slow  None --  No  Yes   Lowest Neighbor Ceiling - 8
+
+45    Reg     SR     Dn  Slow  None --  No  No    Highest Neighbor Floor
+102   Reg     S1     Dn  Slow  None --  No  No    Highest Neighbor Floor
+83    Reg     WR     Dn  Slow  None --  No  No    Highest Neighbor Floor
+19    Reg     W1     Dn  Slow  None --  No  No    Highest Neighbor Floor
+
+70    Reg     SR     Dn  Fast  None --  No  No    Highest Neighbor Floor + 8     
+71    Reg     S1     Dn  Fast  None --  No  No    Highest Neighbor Floor + 8     
+98    Reg     WR     Dn  Fast  None --  No  No    Highest Neighbor Floor + 8     
+36    Reg     W1     Dn  Fast  None --  No  No    Highest Neighbor Floor + 8     
+
+180   Ext     SR     Up  Slow  None --  No  No    Absolute 24
+161   Ext     S1     Up  Slow  None --  No  No    Absolute 24
+92    Reg     WR     Up  Slow  None --  No  No    Absolute 24
+58    Reg     W1     Up  Slow  None --  No  No    Absolute 24
+
+179   Ext     SR     Up  Slow  TxTy Trg No  No    Absolute 24
+160   Ext     S1     Up  Slow  TxTy Trg No  No    Absolute 24
+93    Reg     WR     Up  Slow  TxTy Trg No  No    Absolute 24
+59    Reg     W1     Up  Slow  TxTy Trg No  No    Absolute 24
+
+176   Ext     SR     Up  Slow  None --  No  No    Abs Shortest Lower Texture
+158   Ext     S1     Up  Slow  None --  No  No    Abs Shortest Lower Texture
+96    Reg     WR     Up  Slow  None --  No  No    Abs Shortest Lower Texture
+30    Reg     W1     Up  Slow  None --  No  No    Abs Shortest Lower Texture
+
+178   Ext     SR     Up  Slow  None --  No  No    Absolute 512
+140   Reg     S1     Up  Slow  None --  No  No    Absolute 512
+147   Ext     WR     Up  Slow  None --  No  No    Absolute 512
+142   Ext     W1     Up  Slow  None --  No  No    Absolute 512
+
+190   Ext     SR     --  ----  TxTy Trg No  No    None
+189   Ext     S1     --  ----  TxTy Trg No  No    None
+154   Ext     WR     --  ----  TxTy Trg No  No    None
+153   Ext     W1     --  ----  TxTy Trg No  No    None
+
+78    Ext     SR     --  ----  TxTy Num No  No    None
+241   Ext     S1     --  ----  TxTy Num No  No    None
+240   Ext     WR     --  ----  TxTy Num No  No    None
+239   Ext     W1     --  ----  TxTy Num No  No    None
+
+The following tables show the possibilities for generalized floor
+linedef type parameters. Any combination of parameters is allowed:
+
+Slow and Fast represent the same speeds as slow and fast regular
+floors. Normal is twice as fast as slow, Fast is twice normal, Turbo
+is twice Fast.
+
+Generalized Floor Types
+---------------------------------------------------------------------------
+#      Class   Trig   Dir Spd   *Chg *Mdl Mon Crsh  Target
+
+6000H- Gen     P1/PR  Up  Slow   None Trg Yes Yes   Lowest Neighbor Floor
+7FFFH          S1/SR  Dn  Normal Tx   Num No  No    Next Neighbor Floor
+               W1/WR      Fast   Tx0                Lowest Neighbor Ceiling
+               G1/GR      Turbo  TxTy               Highest Neighbor Floor
+                                                    Ceiling
+                                                    24
+                                                    32
+*Mon(ster) enabled must be No if                    Shortest Lower Texture
+Chg field is not None
+
+Tx = Texture copied only           Trg = Trigger Model
+Tx0 = Texture copied and Type->0   Num = Numeric Model
+TxTy = Texture and Type copied
+
+
+####################
+Section 3. Ceilings
+####################
+
+----------------------------
+Section 3.1 Ceiling Targets
+----------------------------
+
+Highest Neighbor Ceiling (HnC)
+
+This means that the ceiling moves to the height of the highest
+neighboring ceiling NOT including the ceiling itself. If the ceiling
+direction is down (only possible with generalized ceilings) motion is
+instant, else at the ceiling's speed. If no adjacent ceiling exists
+the ceiling moves to -32000 units.
+
+Next Neighbor Ceiling (NnC)
+
+This means that the ceiling moves up to the height of the lowest
+adjacent ceiling greater in height than the current, or to the
+height of the highest adjacent ceiling less in height than the current,
+as determined by the ceiling's direction. Instant motion is not
+possible in this case. If no such ceiling exists, the ceiling does
+not move.
+
+Lowest Neighbor Ceiling (LnC)
+
+This means that the ceiling height changes to the height of the lowest
+ceiling possessed by any neighboring sector, NOT including itself.
+If the target height is in the opposite direction to ceiling
+motion, motion is instant, otherwise at the ceiling action's speed.
+If no adjacent ceiling exists the ceiling moves to 32000 units.
+
+Highest Neighbor Floor (HnF)
+
+This means that the ceiling height changes to the height of the
+highest neighboring floor, excluding the ceiling's floor itself. If
+no neighbor floor exists, the ceiling moves down to -32000 or the
+ceiling's floor, whichever is higher. If the target height is in the
+opposite direction to ceiling motion, the motion is instant,
+otherwise it occurs at the ceiling action's speed.
+
+Floor
+
+The ceiling moves down until its at floor height, instantly if
+ceiling direction is up (only available with generalized types), at
+the ceiling speed if the direction is down. 
+
+8 Above Floor (8aF)
+
+This means that the ceiling height changes to 8 above the height of
+the ceiling's floor. If the target height is in the opposite direction
+to ceiling motion, the motion is instant, otherwise it occurs at the
+ceiling action's speed.
+
+24 Units (24)
+
+The ceiling moves 24 units in the ceiling action's direction. Instant
+motion is not possible with this linedef type.
+
+32 Units (32)
+
+The ceiling moves 32 units in the ceiling action's direction. Instant
+motion is not possible with this linedef type.
+
+Shortest Upper Texture (SUT)
+
+The ceiling moves the height of the shortest upper texture on the
+boundary of the sector, in the ceiling direction. Instant motion is not
+possible with this type. In the case that there is no surrounding
+texture the motion is to -32000 or +32000 depending on direction.
+
+----------------------------------
+Section 3.2 Varieties of ceilings
+----------------------------------
+
+A ceiling can be activated by pushing on a linedef bounding it
+(generalized types only), or by pushing on a switch with the same tag
+as the ceiling sector, or by walking over a linedef with the same tag
+as the ceiling, or by shooting a linedef with the same tag as the
+ceiling with an impact weapon (generalized types only).
+
+A ceiling can move either Up or Down.
+
+A ceiling can move with speeds of Slow, Normal, Fast, or Turbo. If the
+target height specified by the ceiling function (see Ceiling Targets
+above) is in the opposite direction to the ceiling's motion, then
+travel is instantaneous, otherwise its at the speed specified.
+
+A ceiling action can be a texture change type, in which case after
+the action the ceiling texture of the affected ceiling, and possibly
+the sector type of the affected ceiling are changed to those of a
+model sector. The sector type may be zeroed instead of copied from
+the model, or not changed at all. These change types are referred to
+below as Tx (texture only), Tx0 (type set to 0), and TxTy (texture
+and type copied from model). The model sector for the change may be
+the sector on the first sidedef of the trigger (trigger model) or the
+sector with ceiling at destination height across the lowest numbered
+two-sided linedef surrounding the affected sector (numeric model). If
+no model sector exists, no change occurs. If a change occurs, ceiling
+texture is always affected, lighting is never affected, even that
+corresponding to the sector's type, nor is any other sector property
+other than the sector's type.
+
+Numeric model algorithm:
+
+1) Find all ceilings adjacent to the tagged ceiling at destination height
+2) Find the lowest numbered linedef separating those ceilings from that tagged
+3) The sector on the other side of that linedef is the model
+
+A ceiling action can have the crush property (generalized types only),
+in which case players and monsters are crushed when the ceiling tries
+to move below the point where they fit exactly underneath the
+ceiling. This means they take damage until they die, leave the
+sector, or the ceiling action is stopped.  A ceiling action never
+reverses on encountering an obstacle, even if the crush property is
+not true, the ceiling merely remains in the same position until the
+obstacle is removed or dies, then continues.
+
+---------------------------------
+Section 3.3 Ceiling linedef types
+---------------------------------
+
+Regular and Extended Ceiling Types
+-------------------------------------------------------------------
+#     Class   Trig   Dir Spd   *Chg *Mdl Mon Crsh Target
+
+43    Reg     SR     Dn  Fast  None  --  No  No   Floor 
+41    Reg     S1     Dn  Fast  None  --  No  No   Floor 
+152   Ext     WR     Dn  Fast  None  --  No  No   Floor 
+145   Ext     W1     Dn  Fast  None  --  No  No   Floor 
+
+186   Ext     SR     Up  Slow  None  --  No  No   Highest Neighbor Ceiling
+166   Ext     S1     Up  Slow  None  --  No  No   Highest Neighbor Ceiling
+151   Ext     WR     Up  Slow  None  --  No  No   Highest Neighbor Ceiling
+40    Reg     W1     Up  Slow  None  --  No  No   Highest Neighbor Ceiling
+
+187   Ext     SR     Dn  Slow  None  --  No  No   8 Above Floor
+167   Ext     S1     Dn  Slow  None  --  No  No   8 Above Floor
+72    Reg     WR     Dn  Slow  None  --  No  No   8 Above Floor
+44    Reg     W1     Dn  Slow  None  --  No  No   8 Above Floor
+
+205   Ext     SR     Dn  Slow  None  --  No  No   Lowest Neighbor Ceiling
+203   Ext     S1     Dn  Slow  None  --  No  No   Lowest Neighbor Ceiling
+201   Ext     WR     Dn  Slow  None  --  No  No   Lowest Neighbor Ceiling
+199   Ext     W1     Dn  Slow  None  --  No  No   Lowest Neighbor Ceiling
+
+206   Ext     SR     Dn  Slow  None  --  No  No   Highest Neighbor Floor
+204   Ext     S1     Dn  Slow  None  --  No  No   Highest Neighbor Floor
+202   Ext     WR     Dn  Slow  None  --  No  No   Highest Neighbor Floor
+200   Ext     W1     Dn  Slow  None  --  No  No   Highest Neighbor Floor
+
+Generalized Ceiling Types
+---------------------------------------------------------------------------
+#      Class   Trig   Dir Spd   *Chg *Mdl Mon Crsh  Target
+
+4000H- Gen     P1/PR  Up  Slow   None Trg Yes Yes   Highest Neighbor Ceiling
+5FFFH          S1/SR  Dn  Normal Tx   Num No  No    Next Neighbor Ceiling
+               W1/WR      Fast   Tx0                Lowest Neighbor Ceiling
+               G1/GR      Turbo  TxTy               Highest Neighbor Floor
+                                                    Floor
+                                                    24
+                                                    32
+*Mon(ster) enabled must be No if                    Shortest Upper Texture
+Chg field is not None
+
+Tx = Texture copied only           Trg = Trigger Model
+Tx0 = Texture copied and Type->0   Num = Numeric Model
+TxTy = Texture and Type copied
+
+
+############################
+Section 4. Platforms (Lifts)
+############################
+
+A platform is basically a floor action involving two heights. The
+simple raise platform actions, for example, differ from the
+corresponding floor actions in that if they encounter an obstacle,
+they reverse direction and return to their former height.
+
+The most often used kind of platform is a lift which travels from its
+current height to the target height, then waits a specified time and
+returns to it former height.
+
+-----------------------------
+Section 4.1 Platform Targets
+-----------------------------
+
+Lowest Neighbor Floor
+
+This means that the platforms "low" height is the height of the
+lowest surrounding floor, including the platform itself. The "high"
+height is the original height of the floor.
+
+Next Lowest Neighbor Floor
+
+This means that the platforms "low" height is the height of the
+highest surrounding floor lower than the floor itself. If no lower
+floor exists, no motion occurs as the "low" and "high" heights are
+then both equal to the floors current height.
+
+Lowest Neighbor Ceiling
+
+This means that the platforms "low" height is the height of the
+lowest surrounding ceiling unless this is higher than the floor
+itself. If no adjacent ceiling exists, or is higher than the floor no
+motion occurs as the "low" and "high" heights are then both equal to
+the floors current height.
+
+Lowest and Highest Floor
+
+This target sets the "low" height to the lowest neighboring floor,
+including the floor itself, and the "high" height to the highest
+neighboring floor, including the floor itself. When this target is
+used the floor moves perpetually between the two heights. Once
+triggered this type of linedef runs permanently, even if the motion
+is temporarily suspended with a Stop type. No other floor action can
+be commanded on the sector after this type is begun.
+
+Ceiling
+
+This target sets the "high" height to the ceiling of the sector and
+the "low" height to the floor height of the sector and is only used in
+the instant toggle type that switches the floor between the ceiling
+and its original height on each activation. This is also the ONLY
+instant platform type.
+
+Raise Next Floor
+
+This means that the "high" height is the lowest surrounding floor
+higher than the platform. If no higher adjacent floor exists no
+motion will occur.
+
+Raise 24 Units
+
+The "low" height is the original floor height, the "high" height is 24
+more. 
+
+Raise 32 Units
+
+The "low" height is the original floor height, the "high" height is 32
+more. 
+
+-----------------------------------
+Section 4.2 Varieties of Platforms
+-----------------------------------
+
+A platform can be activated by pushing on a linedef bounding it
+(generalized types only), or by pushing on a switch with the same tag
+as the platform sector, or by walking over a linedef with the same tag
+as the platform, or by shooting a linedef with the same tag as the
+platform with an impact weapon.
+
+A platform can move with speeds of Slow, Normal, Fast, or Turbo. 
+Only the instant toggle platform moves instantly, all others move at
+the platform's speed.
+
+A platform can have a delay, in between when it reaches "high" height
+and returns to "low" height, or at both ends of the motion in the
+case of perpetual lifts.
+
+A platform action can be a texture change type, in which case after
+the action the floor texture of the affected floor, and possibly the
+sector type of the affected floor are changed to those of a model
+sector. The sector type may be zeroed instead of copied from the
+model, or not changed at all. These change types are referred to
+below as Tx (texture only), Tx0 (type zeroed), and TxTy (texture and
+type changed). The model sector for the change is always the sector
+on the first sidedef of the trigger (trigger model).  If a change
+occurs, floor texture is always affected, lighting is never affected,
+even that corresponding to the sector's type, nor is any other sector
+property other than the sector's type.
+
+-----------------------------------
+Section 4.3 Platform Linedef types
+-----------------------------------
+
+Regular and Extended Platform Types
+-------------------------------------------------------------------
+#     Class  Trig   Dly Spd  Chg  Mdl Mon Target
+
+66    Reg    SR     --  Slow Tx   Trg No  Raise 24 Units
+15    Reg    S1     --  Slow Tx   Trg No  Raise 24 Units
+148   Ext    WR     --  Slow Tx   Trg No  Raise 24 Units
+143   Ext    W1     --  Slow Tx   Trg No  Raise 24 Units
+
+67    Reg    SR     --  Slow Tx0  Trg No  Raise 32 Units
+14    Reg    S1     --  Slow Tx0  Trg No  Raise 32 Units
+149   Ext    WR     --  Slow Tx0  Trg No  Raise 32 Units
+144   Ext    W1     --  Slow Tx0  Trg No  Raise 32 Units
+
+68    Reg    SR     --  Slow Tx0  Trg No  Raise Next Floor
+20    Reg    S1     --  Slow Tx0  Trg No  Raise Next Floor
+95    Reg    WR     --  Slow Tx0  Trg No  Raise Next Floor
+22    Reg    W1     --  Slow Tx0  Trg No  Raise Next Floor
+47    Reg    G1     --  Slow Tx0  Trg No  Raise Next Floor
+
+181   Ext    SR     3s  Slow None --  No  Lowest and Highest Floor (perpetual)
+162   Ext    S1     3s  Slow None --  No  Lowest and Highest Floor (perpetual)
+87    Reg    WR     3s  Slow None --  No  Lowest and Highest Floor (perpetual)
+53    Reg    W1     3s  Slow None --  No  Lowest and Highest Floor (perpetual)
+
+182   Ext    SR     --  ---- ---- --  --  Stop
+163   Ext    S1     --  ---- ---- --  --  Stop
+89    Reg    WR     --  ---- ---- --  --  Stop
+54    Reg    W1     --  ---- ---- --  --  Stop
+
+62    Reg    SR     3s  Slow None --  No  Lowest Neighbor Floor (lift)
+21    Reg    S1     3s  Slow None --  No  Lowest Neighbor Floor (lift)
+88    Reg    WR     3s  Slow None --  No  Lowest Neighbor Floor (lift)
+10    Reg    W1     3s  Slow None --  No  Lowest Neighbor Floor (lift)
+
+123   Reg    SR     3s  Fast None --  No  Lowest Neighbor Floor (lift)
+122   Reg    S1     3s  Fast None --  No  Lowest Neighbor Floor (lift)
+120   Reg    WR     3s  Fast None --  No  Lowest Neighbor Floor (lift)
+121   Reg    W1     3s  Fast None --  No  Lowest Neighbor Floor (lift)
+
+211   Ext    SR     --  Inst None --  No  Ceiling (toggle)
+212   Ext    WR     --  Inst None --  No  Ceiling (toggle)
+
+Generalized Lift Types
+---------------------------------------------------------------------------
+#      Class   Trig   Dly Spd    Mon  Target
+
+3400H- Gen     P1/PR  1s  Slow   Yes  Lowest Neighbor Floor
+37FFH          S1/SR  3s  Normal No   Next Lowest Neighbor Floor
+               W1/WR  5s  Fast        Lowest Neighbor Ceiling
+               G1/GR  10s Turbo       Lowest and Highest Floor (perpetual)
+
+############################
+Section 5. Crusher Ceilings
+############################
+
+A crusher ceiling is a linedef type that causes the ceiling to cycle
+between its starting height and 8 above the floor, damaging
+monsters and players that happen to be in between. Barrels explode
+when crushed.
+
+Once a crusher ceiling is started it remains running for the
+remainder of the level even if temporarily suspended with a stop type.
+No other ceiling action can be used in that sector thereafter.
+
+----------------------------------
+Section 5.1 Varieties of Crushers
+----------------------------------
+
+A crusher can be activated by pushing on a linedef bounding it
+(generalized types only), or by pushing on a switch with the same tag
+as the crusher sector, or by walking over a linedef with the same tag
+as the crusher, or by shooting a linedef with the same tag as the
+crusher with an impact weapon (generalized types only).
+
+A crusher has a speed: slow, normal, fast, or turbo. The slower the
+speed, the more damage the crusher does when crushing, simply thru
+being applied longer. When a slow or normal crusher is moving down
+and encounters something to crush, it slows down even more, by a
+factor of 8. This persists until it reaches bottom of stroke and
+starts up again. Fast and turbo crushers do not slow down.
+
+A crusher can be silent. The regular silent crusher makes platform
+stop and start noises at top and bottom of stroke. The generalized
+silent crusher is completely quiet.
+
+A crusher linedef is provided to stop a crusher in its current
+position. Care should be used that this doesn't lock the player out
+of an area of the wad if the crusher is too low to pass. A crusher
+can be restarted, but not changed, with any crusher linedef.
+
+----------------------------------
+Section 5.2 Crusher Linedef Types
+----------------------------------
+
+Regular and Extended Crusher Types
+-------------------------------------------------------------------
+#     Class  Trig   Spd  Mon Silent Action
+
+184   Ext    SR     Slow No  No     Start
+49    Reg    S1     Slow No  No     Start
+73    Reg    WR     Slow No  No     Start
+25    Reg    W1     Slow No  No     Start
+
+183   Ext    SR     Fast No  No     Start
+164   Ext    S1     Fast No  No     Start
+77    Reg    WR     Fast No  No     Start
+6     Reg    W1     Fast No  No     Start
+
+185   Ext    SR     Slow No  Yes    Start
+165   Ext    S1     Slow No  Yes    Start
+150   Ext    WR     Slow No  Yes    Start
+141   Reg    W1     Slow No  Yes    Start
+
+188   Ext    SR     ---- --  --     Stop
+168   Ext    S1     ---- --  --     Stop
+74,   Reg    WR     ---- --  --     Stop
+57,   Reg    W1     ---- --  --     Stop
+
+Generalized Crusher Types
+---------------------------------------------------------------------------
+#      Class   Trig   Spd    Mon  Silent
+
+2F80H- Gen     P1/PR  Slow   Yes  Yes
+2FFFH          S1/SR  Normal No   No
+               W1/WR  Fast        
+               G1/GR  Turbo       
+
+##########################
+Section 6. Stair Builders
+##########################
+
+A stair builder is a linedef type that sets a sequence of sectors
+defined by a complex rule to an ascending or descending sequence of
+heights.
+
+The rule for stair building is as follows:
+
+1) The first step to rise or fall is the tagged sector. It rises or
+falls by the stair stepsize, at the stair speed.
+
+2) To find the next step (sector) affected examine all two-sided
+linedefs with first sidedef facing into the previous step for the one
+with lowest linedef number. The sector on the other side of this
+linedef is the next step. If no such linedef exists, stair building
+ceases.
+
+3) If the next step is already moving, or has already risen as part
+of the stair, stair building ceases. Optionally if the floor texture
+of the next step is different from the previous step's the stair
+building stops. Otherwise the next step moves to the height of the
+previous step plus or minus the stepsize depending on the direction
+the stairs build, up or down. If the motion is in the same direction
+as the stairs build, it occurs at stair build speed, otherwise it is
+instant.
+
+4) Repeat from step 2 until stair building ceases.
+
+----------------------------------------
+Section 6.1 Varieties of Stair Builders
+----------------------------------------
+
+A stair can be activated by pushing on a linedef bounding it
+(generalized types only), or by pushing on a switch with the same tag
+as the stair sector, or by walking over a linedef with the same tag
+as the stair, or by shooting a linedef with the same tag as the
+stair with an impact weapon (generalized types only).
+
+Only extended and generalized stair types are retriggerable. The
+extended retriggerable stairs are mostly useless, though triggering a
+stair with stepsize 8 twice might be used. The generalized
+retriggerable stairs alternate building up and down on each
+activation which is much more useful.
+
+A stair can build up or down (generalized types only).
+
+A stair can have a step size of 4, 8, 16, or 24. Only generalized
+types support stepsize of 4 or 24.
+
+A stair can have build speeds of slow, normal, fast or turbo. Only
+generalized types support speeds of normal or turbo.
+
+A stair can stop on encountering a different texture or ignore
+(generalized types only) different textures and continue.
+
+Only the regular build fast, stepsize 16 stair has the property that
+monsters and players can be crushed by the motion, all others do not
+crush.
+
+----------------------------------------------------
+Section 6.2 Regular and Extended Stair Builder Types
+----------------------------------------------------
+
+Regular and Extended Stairs Types
+-------------------------------------------------------------------
+#     Class  Trig  Dir Spd   Step Ignore Mon
+
+258   Ext    SR    Up  Slow  8    No     No
+7     Reg    S1    Up  Slow  8    No     No
+256   Ext    WR    Up  Slow  8    No     No
+8     Reg    W1    Up  Slow  8    No     No
+
+259   Ext    SR    Up  Fast  16   No     No
+127   Reg    S1    Up  Fast  16   No     No
+257   Ext    WR    Up  Fast  16   No     No
+100   Reg    W1    Up  Fast  16   No     No
+
+Generalized Stairs Types
+---------------------------------------------------------------------------
+#      Class   Trig   Dir Spd     Step  Ignore Mon
+
+3000H- Gen     P1/PR  Up  Slow    4     Yes    Yes
+33FFH          S1/SR  Dn  Normal  8     No     No 
+               W1/WR      Fast    16 
+               G1/GR      Turbo   24 
+
+####################
+Section 7 Elevators
+####################
+
+An elevator is a linedef type that moves both floor and ceiling
+together. All elevator linedefs are extended, there are no regular or
+generalized elevator types. Instant elevator motion is not possible,
+and monsters cannot activate elevators. All elevator triggers are
+either switched or walkover.
+
+-----------------------------
+Section 7.1 Elevator Targets
+-----------------------------
+
+Next Highest Floor
+
+The elevator floor moves to the lowest adjacent floor higher than the
+elevator's floor, the ceiling staying the same height above the floor. 
+If there is no higher floor the elevator doesn't move.
+
+Next Lowest Floor
+
+The elevator floor moves to the highest adjacent floor lower than the
+current floor, the ceiling staying the same height above the floor. If
+there is no lower floor the elevator doesn't move.
+
+Current Floor
+
+The elevator floor moves to the height of the floor on the first
+sidedef of the triggering line, the ceiling remaining the same height
+above the elevator floor.
+
+-----------------------------------
+Section 7.2 Elevator Linedef Types
+-----------------------------------
+
+Extended Elevator types
+-------------------------------------------------------------------
+#     Class  Trig  Spd    Target
+
+230   Ext    SR    Fast   Next Highest Floor
+229   Ext    S1    Fast   Next Highest Floor
+228   Ext    WR    Fast   Next Highest Floor
+227   Ext    W1    Fast   Next Highest Floor
+
+234   Ext    SR    Fast   Next Lowest Floor
+233   Ext    S1    Fast   Next Lowest Floor
+232   Ext    WR    Fast   Next Lowest Floor
+231   Ext    W1    Fast   Next Lowest Floor
+
+238   Ext    SR    Fast   Current Floor
+237   Ext    S1    Fast   Current Floor
+236   Ext    WR    Fast   Current Floor
+235   Ext    W1    Fast   Current Floor
+
+###################
+Section 7 Lighting
+###################
+
+The lighting linedef types change the lighting in the tagged sector.
+All are regular or extended types, there are no generalized lighting
+types. All are switched or walkovers.
+
+-----------------------------
+Section 7.1 Lighting Targets
+-----------------------------
+
+Lights to Minimum Neighbor
+
+Each tagged sector is set to the minimum light level found in any
+adjacent sector. The tagged sectors are changed in numerical order, 
+and this may influence the result.
+
+Lights to Maximum Neighbor
+
+Each tagged sector is set to the maximum light level found in any
+adjacent sector. The tagged sectors are changed in numerical order, 
+and this may influence the result.
+
+Blinking
+
+Each tagged sector begins blinking between two light levels. The
+brighter level is the light level in the tagged sector. The darker
+level is the minimum neighbor light level, or 0 if all neighbor
+sectors have lighting greater than or equal to the sector's at the
+time of activation. The blinking is non-synchronous, beginning 1-9
+gametics after activation, with a dark period of 1 sec (35 gametics)
+and a bright period of 1/7 sec (5 gametics).
+
+35 Units
+
+Each tagged sector is set to a light level of 35 units.
+
+255 Units
+
+Each tagged sector is set to a light level of 255 units.
+
+-----------------------------------
+Section 7.2 Lighting Linedef Types
+-----------------------------------
+
+Regular and Extended Lighting types
+-------------------------------------------------------------------
+#     Class  Trig  Target
+
+139   Reg    SR    35 Units
+170   Ext    S1    35 Units
+79    Reg    WR    35 Units
+35    Reg    W1    35 Units
+
+138   Reg    SR    255 Units
+171   Ext    S1    255 Units
+81    Reg    WR    255 Units
+13    Reg    W1    255 Units
+
+192   Ext    SR    Maximum Neighbor
+169   Ext    S1    Maximum Neighbor
+80    Reg    WR    Maximum Neighbor
+12    Reg    W1    Maximum Neighbor
+
+194   Ext    SR    Minimum Neighbor
+173   Ext    S1    Minimum Neighbor
+157   Ext    WR    Minimum Neighbor
+104   Reg    W1    Minimum Neighbor
+
+193   Ext    SR    Blinking
+172   Ext    S1    Blinking
+156   Ext    WR    Blinking
+17    Reg    W1    Blinking
+
+
+################
+Section 8 Exits
+################
+
+An exit linedef type ends the current level bringing up the
+intermission screen with its report of kills/items/secrets or frags
+in the case of deathmatch. Obviously, none are retriggerable, and
+none require tags, since no sector is affected.
+
+---------------------------
+Section 8.1 Exit Varieties
+---------------------------
+
+An exit can be activated by pushing on a switch with the exit type
+or  by walking over a linedef with the exit type, or by shooting a 
+linedef with the exit type with an impact weapon.
+
+An exit can be normal or secret. The normal exit simply ends the
+level and takes you to the next level via the intermission screen. A
+secret exit only works in a special level depending on the IWAD being
+played. In DOOM the secret exits can be on E1M3, E2M5, or E3M6. In
+DOOM II they can be in levels 15 and 31. If a secret exit is used in
+any other level, it brings you back to the start of the current
+level. In DOOM the secret exits go from E1M3 to E1M9, E2M5 to E2M9,
+and E3M6 to E3M9. In DOOM II they go from 15 to 31 and from 31 to 32.
+In DOOM II a normal exit from 31 or 32 goes to level 16.
+
+-----------------------------------
+Section 8.2 Exit Linedef Types
+-----------------------------------
+
+Regular and Extended Exit types
+-------------------------------------------------------------------
+#     Class  Trig  Type
+
+11    Reg    S1    Normal
+52    Reg    W1    Normal
+197   Ext    G1    Normal
+
+51    Reg    S1    Secret
+124   Reg    W1    Secret
+198   Ext    G1    Secret
+
+######################
+Section 9 Teleporters
+######################
+
+A teleporter is a linedef that when crossed or switched makes the
+player or monster appear elsewhere in the level. There are only
+regular and extended teleporters, no generalized teleporters exist
+(yet).  Teleporters are the only direction sensitive walkover
+triggers in DOOM (to allow them to be exited without teleporting
+again). They must be crossed from the first sidedef side in order to
+work.
+
+The place that the player or monster appears is set in one of two
+ways. The more common is by a teleport thing in the sector tagged to
+the teleport line. The newer completely player preserving line-line
+silent teleport makes the player appear relative to the exit line
+(identified by having the same tag as the entry line) with the same
+orientation, position, momentum and height that they had relative to
+the entry line just before teleportation. A special kind of line-line
+teleporter is also provided that reverses the player's orientation by
+180 degrees.
+
+In the case of several lines tagged the same as the teleport line, or
+several sectors tagged the same, or several teleport things in the
+tagged sector, in all cases the lowest numbered one is used.
+
+In DOOM crossing a W1 teleport line in the wrong direction used it
+up, and it was never activatable. In BOOM this is not the case, it
+does not teleport but remains active until next crossed in the right
+direction.
+
+If the exit of a teleporter is blocked a monster (or anything besides
+a player) will not teleport thru it. However if the exit of teleporter
+is blocked a player will, including into a down crusher, a monster,
+or another player. In the latter two cases the monster/player
+occupying the spot dies messily, and this is called a telefrag.
+
+-------------------------------
+Section 9.1 Teleport Varieties
+-------------------------------
+
+A teleporter can be walkover or switched, and retriggerable or not.
+
+A teleporter can have destination set by a teleport thing in the
+tagged sector, or by a line tagged the same as the teleport line.
+These are called thing teleporters and line teleporters resp.
+
+A teleporter can preserve orientation or set orientation from the
+position, height, and angle of the teleport thing. Note a thing
+destination teleporter always sets position, though it may preserve
+orientation otherwise.
+
+A teleporter can produce green fog and a whoosh noise, or it can be
+silent, in which case it does neither.
+
+A teleporter can transport monsters only, or both players and
+monsters.
+
+-----------------------------------
+Section 9.2 Teleport Linedef types
+-----------------------------------
+
+Regular and Extended Teleport types
+-------------------------------------------------------------------
+#     Class  Trig  Silent Mon Plyr Orient    Dest
+
+195   Ext    SR    No     Yes Yes  Set       TP thing in tagged sector
+174   Ext    S1    No     Yes Yes  Set       TP thing in tagged sector
+97    Reg    WR    No     Yes Yes  Set       TP thing in tagged sector
+39    Reg    W1    No     Yes Yes  Set       TP thing in tagged sector
+
+126   Reg    WR    No     Yes No   Set       TP thing in tagged sector
+125   Reg    W1    No     Yes No   Set       TP thing in tagged sector
+269   Ext    WR    Yes    Yes No   Set       TP thing in tagged sector
+268   Ext    W1    Yes    Yes No   Set       TP thing in tagged sector
+
+210   Ext    SR    Yes    Yes Yes  Preserve  TP thing in tagged sector
+209   Ext    S1    Yes    Yes Yes  Preserve  TP thing in tagged sector
+208   Ext    WR    Yes    Yes Yes  Preserve  TP thing in tagged sector
+207   Ext    W1    Yes    Yes Yes  Preserve  TP thing in tagged sector
+
+244   Ext    WR    Yes    Yes Yes  Preserve  Line with same tag
+243   Ext    W1    Yes    Yes Yes  Preserve  Line with same tag
+263   Ext    WR    Yes    Yes Yes  Preserve  Line with same tag (reversed)
+262   Ext    W1    Yes    Yes Yes  Preserve  Line with same tag (reversed)
+
+267   Ext    WR    Yes    Yes No   Preserve  Line with same tag 
+266   Ext    W1    Yes    Yes No   Preserve  Line with same tag 
+265   Ext    WR    Yes    Yes No   Preserve  Line with same tag (reversed) 
+264   Ext    W1    Yes    Yes No   Preserve  Line with same tag (reversed)
+
+##################
+Section 10 Donuts
+##################
+
+A donut is a very specialized linedef type that lowers a pillar in a
+surrounding pool, while raising the pool and changing its texture and
+type.
+
+The tagged sector is the pillar, and its lowest numbered line must be
+two-sided. The sector on the other side of that is the pool. The pool
+must have a two-sided line whose second sidedef does not adjoin the
+pillar, and the sector on the second side of the lowest numbered such
+linedef is the model for the pool's texture change. The model sector
+floor also provides the destination height both for lowering the
+pillar and raising the pool.
+
+No generalized donut linedefs exist, and all are switched or
+walkover.
+
+---------------------------------
+Section 10.1 Donut Linedef types
+---------------------------------
+
+Regular and Extended Donut types
+-------------------------------------------------------------------
+#     Class  Trig
+
+191   Ext    SR
+9     Reg    S1
+155   Ext    WR
+146   Ext    W1
+
+#############################
+Section 11 Property Transfer
+#############################
+
+These linedefs are special purpose and are used to transfer
+properties from the linedef itself or the sector on its first sidedef 
+to the tagged sector(s). None are triggered, they simply exist.
+
+Extended Property Transfer Linedefs
+-------------------------------------------------------------------
+#     Class  Trig Description
+
+213   Ext --   Set Tagged Floor Lighting to Lighting on 1st Sidedef's Sector
+
+Used to give the floor of a sector a different light level from the
+remainder of the sector. For example bright lava in a dark room.
+
+261   Ext --   Set Tagged Ceiling Lighting to Lighting on 1st Sidedef's Sector
+
+Used to give the ceiling of a sector a different light level from the
+remainder of the sector.
+
+260   Ext --   Make Tagged Lines (or this line if tag==0) Translucent
+
+Used to make 2s normal textures translucent. If tag==0, then this linedef's
+normal texture is made translucent if it's 2s, and the default translucency
+map TRANMAP is used as the filter. If tag!=0, then all similarly-tagged 2s
+linedefs' normal textures are made translucent, and if this linedef's first
+sidedef contains a valid lump name for its middle texture (as opposed to a
+texture name), and the lump is 64K long, then that lump will be used as the
+translucency filter instead of the default TRANMAP, allowing different
+filters to be used in different parts of the same maps. If the first side's
+normal texture is not a valid translucency filter lump name, it must be a
+valid texture name, and will be displayed as such on this linedef.
+
+242   Ext --   Set Tagged Lighting, Flats Heights to 1st Sidedef's Sector,
+               and set colormap based on sidedef textures.
+
+This allows the tagged sector to have two levels -- an actual floor and 
+ceiling, and another floor or ceiling where more flats are rendered. Things
+will stand on the actual floor or hang from the actual ceiling, while this
+function provides another rendered floor and ceiling at the heights of the
+sector on the first sidedef of the linedef. Typical use is "deep water" that
+can be over the player's head.
+
+     ----------------------------------  < real sector's ceiling height
+    |         real ceiling             | < control sector's ceiling texture
+    |                                  |
+    |                                  | < control sector's lightlevel
+    |              A                   |
+    |                                  | < upper texture as colormap
+    |                                  |
+    |                                  | < control sector's floor texture
+     ----------------------------------  < control sector's ceiling height
+    |         fake ceiling             | < real sector's ceiling texture
+    |                                  |
+    |                                  | < real sector's lightlevel
+    |              B                   |
+    |                                  | < normal texture as colormap
+    |                                  |
+    |          fake floor              | < real sector's floor texture
+     ----------------------------------  < control sector's floor height
+    |                                  | < control sector's ceiling texture
+    |                                  |
+    |                                  | < control sector's lightlevel
+    |              C                   |
+    |                                  | < lower texture as colormap
+    |                                  |
+    |          real floor              | < control sector's floor texture
+     ----------------------------------  < real sector's floor height
+
+Boom sectors controlled by a 242 linedef are partitioned into 3 spaces.
+The viewer's xyz coordinates uniquely determine which space they are in.
+
+If they are in space B (normal space), then the floor and ceiling textures
+and lightlevel from the real sector are used, and the colormap from the 242
+linedef's first sidedef's normal texture is used (COLORMAP is used if it's
+invalid or missing). The floor and ceiling are rendered at the control
+sector's heights.
+
+If they are in space C ("underwater"), then the floor and ceiling textures
+and lightlevel from the control sector are used, and the lower texture in
+the 242 linedef's first sidedef is used as the colormap.
+
+If they are in space A ("head over ceiling"), then the floor and ceiling
+textures and lightlevel from the control sector are used, and the upper
+texture in the 242 linedef's first sidedef is used as the colormap.
+
+If only two of these adjacent partitions in z-space are used, such as 
+underwater and normal space, one has complete control over floor textures,
+ceiling textures, light level, and colormaps, in each of the two partitions.
+The control sector determines the textures and lighting in the more "unusual"
+case (e.g. underwater).
+
+It's also possible for the fake floor to extend below the real floor, in
+which case an invisible platform / stair effect is created. In that case,
+the picture looks like this (barring any ceiling effects too):
+
+     ----------------------------------  < real sector's ceiling texture
+    |   real ceiling = fake ceiling    |
+    |                                  |
+    |                                  |
+    |              B                   | < real sector's lightlevel
+    |                                  | < normal texture's colormap
+    |                                  |
+    |          real floor              |
+     ----------------------------------  < invisible, no texture drawn
+    |                                  |
+    |                                  |
+    |                                  | < real sector's lightlevel
+    |              C                   | < normal texture's colormap
+    |                                  |
+    |                                  |
+    |          fake floor              | < real sector's floor texture
+     ----------------------------------  < fake sector's floor height
+
+In this case, since the viewer is always at or above the fake floor, no
+colormap/lighting/texture changes occur -- the fake floor just gets drawn
+at the control sector's height, but at the real sector's lighting and
+texture, while objects stand on the higher height of the real floor.
+
+It's the viewer's position relative to the fake floor and/or fake ceiling,
+which determines whether the control sector's lighting and textures should
+be used, and which colormap should be used. If the viewer is always between
+the fake floor and fake ceiling, then no colormap, lighting, or texture
+changes occur, and the view just sees the real sector's textures and light
+level drawn at possibly different heights.
+
+If the viewer is below the fake floor height set by the control sector, or is
+above the fake ceiling height set by the control sector, then the corresponding
+colormap is used (lower or upper texture name), and the textures and lighting
+are taken from the control sector rather than the real sector. They are still
+stacked vertically in standard order -- the control sector's ceiling is always
+drawn above the viewer, and the control sector's floor is always drawn below
+the viewer.
+
+The kaleidescope effect only occurs when F_SKY1 is used as the control sector's
+floor or ceiling. If F_SKY1 is used as the control sector's ceiling texture,
+then under water, only the control sector's floor appears, but it "envelops"
+the viewer. Similarly, if F_SKY1 is used as the control sector's floor texture,
+then when the player's head is over a fake ceiling, the control sector's
+ceiling is used throughout.
+
+F_SKY1 causes HOM when used as a fake ceiling between the viewer and normal
+space. Since there is no other good use for it, this kaleidescope is an
+option turned on by F_SKY1. Note that this does not preclude the use of sky
+REAL ceilings over deep water -- this is the control sector's ceiling, the
+one displayed when the viewer is underwater, not the real one.
+
+A colormap has the same size and format as Doom's COLORMAP. Extra colormaps
+may defined in Boom by adding them between C_START and C_END markers in wads.
+Colormaps between C_START and C_END are automatically merged by Boom with any
+previously defined colormaps.
+
+WATERMAP is a colormap predefined by Boom which can be used to provide a
+blue-green tint while the player is under water. WATERMAP can be modified by
+pwads.
+
+Ceiling bleeding may occur if required upper textures are not used.
+
+223   Ext --   Length Sets Friction in tagged Sector,Sludge<100, Ice>100
+
+The length of the linedef with type 223 controls the amount of friction
+experienced by the player in the tagged sector, when in contact with the
+floor. Lengths less than 100 are sticker than normal, lengths greater than
+100 are slipperier than normal. The effect is only present in the tagged
+sector when its friction enable bit (bit 8) in the sector type is set.
+This allows the flat to be changed in conjunction with turning the effect
+on or off thru texture/type changes.
+
+
+Constant pushers
+----------------
+Two types of constant pushers are available, wind and current. Depending
+on whether you are above, on, or below (special water sectors) the ground
+level, the amount of force varies.
+
+The length of the linedef defines the 'full' magnitude of the force, and
+the linedef's angle defines the direction.
+
+     line type         above  on   under
+     ---------         -----  --   -----
+     wind       224    full  half  none
+     current    225    none  full  full
+
+The linedef should be tagged to the sector where you want the effect. The
+special type of the sector should have bit 9 set (0x200). If this bit
+is turned off, the effect goes away. For example, a fan creating a wind
+could be turned off, and the wind dies, by changing the sector type and
+clearing that bit.
+
+Constant pushers can be combined with scrolling effects and point
+pushers.
+
+224  Ext  --   Length/Direction Sets Wind Force in tagged Sectors
+
+
+225  Ext  --   Length/Direction Sets Current Force in tagged Sectors
+
+Point pushers
+-------------
+Two types of point pushers are available, push and pull.
+
+The previous implementation of these was SECTOR-SPECIFIC. The new
+implementation ignores sector boundaries and provides the effect in a
+circular area whose center is defined by a Thing of type 5001 (push)
+or 5002 (pull). You now also don't have to set any option flags on these
+Things. A new linedef type of 226 is used to control the effect, and this
+line should be tagged to the sector with the 5001/5002 Thing.
+
+The length of the linedef defines the 'full' magnitude of the force, and
+the force is inversely proportional to distance from the point source. If
+the length of the controlling linedef is L, then the force is reduced to
+zero at a distance of 2L.
+
+The angle of the controlling linedef is not used.
+
+The sector where the 5001/5002 Things reside must have bit 9 set (0x200)
+in its type. If this is turned off, the effect goes away.
+
+Point pushers can be combined with scrolling effects and constant
+pushers.
+
+226  Ext  --   Length Sets Point Source Wind/Current Force in Tagged Sectors
+
+###########################################
+Section 12 Scrolling Walls, Flats, Objects
+###########################################
+
+
+Static Scrollers
+
+The most basic kind of scrolling linedef causes some part of the tagged
+sector or tagged wall to scroll, in proportion to the length of the
+linedef the trigger is on, and according to the direction that trigger
+linedef lies. For each 32 units of length of the trigger, the tagged
+object scrolls 1 unit per frame. Since the length of a linedef doesn't
+change during gameplay, these types are static, the scrolling effect
+remains constant during gameplay. However, these effects can be combined
+with, and/or canceled by, other scrollers.
+
+
+250    -- Scroll Tagged Ceiling
+
+The ceiling of the tagged sector scrolls in the direction of the linedef
+trigger, 1 unit per frame for each 32 units of linedef trigger length.
+Objects attached to the ceiling do not move.
+
+
+251    -- Scroll Tagged Floor                                 
+
+The floor of the tagged sector scrolls in the direction of the linedef
+trigger, 1 unit per frame for each 32 units of linedef trigger length.
+Objects resting on the floor do not move.
+
+
+252    -- Carry Objects on Tagged Floor                       
+
+Objects on the floor of the tagged sector move in the direction of the
+linedef trigger, 1 unit per frame for each 32 units of linedef trigger
+length. The floor itself does not scroll.
+
+
+253    -- Scroll Tagged Floor, Carry Objects
+
+Both the floor of the tagged sector and objects resting on that floor
+move in the direction of the linedef trigger, 1 unit per frame for each
+32 units of linedef trigger length.
+
+
+254    -- Scroll Tagged Wall, Same as Floor/Ceiling
+
+Walls with the same tag as the linedef trigger scroll at the same
+rate as a floor or ceiling controlled by one of 250-253, allowing
+their motion to be synchronized. When the linedef trigger is not
+parallel to the wall, the component of the linedef in the direction
+perpendicular to the wall causes the wall to scroll vertically. The
+length of the component parallel to the wall sets the horizontal
+scroll rate, the length of the component perpendicular to the wall
+sets the vertical scroll rate.
+
+
+Simple Static Scrollers
+
+For convenience three simpler static scroll functions are provided
+for when you just need a wall to scroll and don't need to control its
+rate and don't want to bother with proportionality.
+
+255    -- Scroll Wall Using Sidedef Offsets                   
+
+For simplicity, a static scroller is provided that scrolls the first
+sidedef of a linedef, based on its x- and y- offsets. No tag is used.
+The x offset controls the rate of horizontal scrolling, 1 unit per
+frame per x offset, and the y offset controls the rate of vertical
+scrolling, 1 unit per frame per y offset.
+
+48     -- Animated wall, Scrolls Left                         
+
+A linedef with this type scrolls its first sidedef left at a
+constant rate of 1 unit per frame.
+
+85     -- Animated wall, Scrolls Right
+
+A linedef with this type scrolls its first sidedef right at a
+constant rate of 1 unit per frame.
+
+
+
+Dynamic Scrolling
+
+To achieve dynamic scrolling effects, the position or rate of scrolling
+is controlled by the relative position of the floor and ceiling of the
+sector on the scrolling trigger's first sidedef. The direction of
+scrolling remains controlled by the direction of the linedef trigger.
+Either the floor or ceiling may move in the controlling sector, or
+both. The control variable is the amount of change in the sum of the
+floor and ceiling heights.
+
+All scroll effects are additive, and thus two or more effects may
+reinforce and/or cancel each other.
+
+Displacement Scrollers
+
+In the first kind, displacement scrolling, the position of the scrolled
+objects or walls changes proportionally to the motion of the floor or
+ceiling in the sector on the first sidedef of the scrolling trigger. 
+The proportionality is set by the length of the linedef trigger. If it
+is 32 units long, the wall, floor, ceiling, or object moves 1 unit for
+each unit the floor or ceiling of the controlling sector moves. If it
+is 64 long, they move 2 units per unit of relative floor/ceiling motion
+in the controlling sector and so on.
+
+245    -- Scroll Tagged Ceiling w.r.t. 1st Side's Sector 
+
+The tagged sector's ceiling texture scrolls in the direction of the
+scrolling trigger line, when the sector on the trigger's first sidedef
+changes height. The amount moved is the height change times the trigger
+length, divided by 32. Objects attached to the ceiling do not move.
+
+
+246    -- Scroll Tagged Floor w.r.t. 1st Side's Sector        
+
+The tagged sector's floor texture scrolls in the direction of the 
+scrolling trigger line when the sector on the trigger's first sidedef
+changes height. The amount moved is the height change times the trigger
+length, divided by 32. Objects on the floor do not move.
+
+
+247    -- Push Objects on Tagged Floor wrt 1st Side's Sector  
+
+Objects on the tagged sector's floor move in the direction of the
+scrolling trigger line when the sector on the trigger's first sidedef 
+changes height. The amount moved is the height change times the trigger
+length, divided by 32.
+
+
+248    -- Push Objects & Tagged Floor wrt 1st Side's Sector   
+
+The tagged sector's floor texture, and objects on the floor, move in 
+the direction of the scrolling trigger line when the sector on the
+trigger's first sidedef changes height.  The amount moved is the height
+change times the trigger length, divided by 32. 
+
+
+249    -- Scroll Tagged Wall w.r.t 1st Side's Sector          
+
+Walls with the same tag as the linedef trigger scroll at the same
+rate as a floor or ceiling controlled by one of 245-249, allowing
+their motion to be synchronized. When the linedef trigger is not
+parallel to the wall, the component of the linedef in the direction
+perpendicular to the wall causes the wall to scroll vertically. The
+length of the component parallel to the wall sets the horizontal
+scroll displacement, the length of the component perpendicular to
+the wall sets the vertical scroll displacement. The distance scrolled
+is the controlling sector's height change times the trigger length,
+divided by 32.
+
+
+Accelerative Scrollers
+
+The second kind of dynamic scrollers, accelerative scrollers, also
+react to height changes in the sector on the first sidedef of the
+linedef trigger, but the RATE of scrolling changes, not the
+displacement. That is, changing the controlling sector's height
+speeds up or slows down the scrolling by the change in height
+times the trigger's length, divided by 32. 
+
+An on/off scroller can be made by using an accelerative scroller
+and any linedef that changes the controlling sector's heights.
+If a scroll effect which is initially on is desired, then the
+accelerative scroller should be combined with a static one which
+turns the scroll effect on initially. The accelerative scroller
+would then need to be set up to cancel the static scroller's
+effect when the controlling sector's height changes.
+
+
+214    -- Accel Tagged Ceiling w.r.t. 1st Side's Sector
+
+The tagged sector's ceiling's rate of scroll changes in the direction
+of the trigger linedef (use vector addition if already scrolling) by 
+the change in height of the sector on the trigger's first sidedef
+times the length of the linedef trigger, divided by 32. For example,
+if the ceiling is motionless originally, the linedef trigger is 32 
+long, and the ceiling of the controlling sector moves 1 unit, the 
+tagged ceiling will start scrolling at 1 unit per frame.
+
+
+215    -- Accel Tagged Floor w.r.t. 1st Side's Sector         
+
+The tagged sector's floor's rate of scroll changes in the direction of
+the trigger linedef (use vector addition if already scrolling) by the
+change in height of the sector on the trigger's first sidedef times
+the length of the linedef trigger, divided by 32. For example, if
+the floor is motionless originally, the linedef trigger is 32 long,
+and the ceiling of the controlling sector moves 1 unit, the tagged
+floor will start scrolling at 1 unit per frame.
+
+
+216    -- Accel Objects on Tagged Floor wrt 1st Side's Sector 
+
+Objects on the tagged sector's floor's rate of motion changes in the
+direction of the trigger linedef (use vector addition if already
+moving) by the change in height of the sector on the trigger's first
+sidedef times the length of the linedef trigger divided by 32. For
+example, if the objects are motionless originally, the linedef trigger
+is 32 long, and the ceiling of the controlling sector moves 1 unit,
+the objects on the tagged floor will start moving at 1 unit per frame.
+
+
+217    -- Accel Objects&Tagged Floor wrt 1st Side's Sector    
+
+The tagged sector's floor, and objects on it, change its rate of 
+motion in the direction of the trigger linedef (use vector addition
+if already moving) by the change in height of the sector on the
+trigger's first sidedef times the length of the linedef trigger, divided
+by 32. For example, if the floor and objects are motionless originally,
+the linedef trigger is 32 long, and the ceiling of the controlling
+sector moves 1 unit, the objects and the tagged floor will start moving
+at 1 unit per frame.
+
+
+218    -- Accel Tagged Wall w.r.t 1st Side's Sector           
+
+Walls with the same tag as the linedef trigger increase their 
+scroll rate in sync with a floor or ceiling controlled by one of
+214-217. When the linedef trigger is not parallel to the wall, the 
+component of the linedef in the direction perpendicular to the wall 
+causes the wall to increase its vertical scroll rate. The length of 
+the component parallel to the wall sets the change in horizontal
+scroll rate, the length of the component perpendicular to the wall
+sets the change in vertical scroll rate. The rate change is the height
+change times the trigger length, divided by 32.
+
+
+======================================================================
+
+#######################################################
+Section 13 Detailed Generalized Linedef Specification
+#######################################################
+
+
+BOOM has added generalized linedef types that permit the parameters
+of linedef actions to be nearly independently chosen. 
+
+To support these, DETH has been modified to support them via dialogs
+for each generalized type; each dialog allows the parameters for
+that type to be independently specified by choice from a array of
+radio buttons. A parser has also been added to support reading back
+the function of a generalized linedef from its type number.
+
+NOTE to wad authors:
+
+This requires a lot of type numbers, 20608 in all so far. Some
+editors may object to the presence of these new types thru assuming
+that a lookup table of size 256 suffices (or some other reason). For
+those that must continue to use such an editor, it may be necessary
+to stick to the old linedef types, which are still present.
+
+We are also providing command line tools to set these linedef types,
+independent of which editor you happen to use, but they are a lot
+less slick, and more difficult to use than DETH. See TRIGCALC.EXE and
+CLED.EXE in the EDITUTIL.ZIP package of the BOOM distribution.
+
+== Generalized Linedef Ranges =======================================
+
+There are types for Floors, Ceilings, Doors, Locked Doors, Lifts,
+Stairs, and Crushers. The allocation of linedef type field numbers is 
+according to the following table:
+
+Type            Start      Length   (Dec)
+-----------------------------------------------------------------
+Floors          0x6000     0x2000  (8192)
+Ceilings        0x4000     0x2000  (8192)
+Doors           0x3c00     0x0400  (1024)
+Locked Doors    0x3800     0x0400  (1024)
+Lifts           0x3400     0x0400  (1024)
+Stairs          0x3000     0x0400  (1024)
+Crushers        0x2F80     0x0080   (128)
+-----------------------------------------------------------------
+Totals:  0x2f80-0x7fff     0x5080  (20608)
+
+======================================================================
+
+The following sections define the placement and meaning of the bit
+fields within each linedef category. Fields in the description are
+listed in increasing numeric order.
+
+Some nomenclature:
+
+Target height designations:
+
+H means highest, L means lowest, N means next, F means floor, C means
+ceiling, n means neighbor, Cr means crush, sT means shortest
+lower texture. 
+
+Texture change designations:
+
+c0n  change texture, change sector type to 0, numeric model change
+c0t  change texture, change sector type to 0, trigger model change
+cTn  change texture only, numeric model change
+cTt  change texture only, trigger model change
+cSn  change texture and sector type to model's, numeric model change
+cSt  change texture and sector type to model's, trigger model change
+
+A trigger model change uses the sector on the first side of the
+trigger for its model. A numeric model change looks at the sectors
+adjoining the tagged sector at the target height, and chooses the one
+across the lowest numbered two sided line for its model. If no model
+exists, no change occurs. Note that in DOOM II v1.9, no model meant
+an illegal sector type was generated.
+
+
+------------------------------------------------------------------
+generalized floors (8192 types)
+
+field   description                       NBits   Mask     Shift
+------------------------------------------------------------------
+
+trigger W1/WR/S1/SR/G1/GR/D1/DR            3     0x0007      0
+speed   slow/normal/fast/turbo             2     0x0018      3
+model   trig/numeric -or- nomonst/monst    1     0x0020      5
+direct  down/up                            1     0x0040      6
+target  HnF/LnF/NnF/LnC/C/sT/24/32         3     0x0380      7
+change  nochg/zero/txtonly/type            2     0x0c00      10
+crush   no/yes                             1     0x1000      12
+
+DETH Nomenclature:
+
+W1[m] F->HnF DnS [c0t] [Cr]
+WR[m] F->LnF DnN [c0n] 
+S1[m] F->NnF DnF [cTt]  
+SR[m] F->LnC DnT [cTn]          
+G1[m] F->C   UpS [cSt]          
+GR[m] FbysT  UpN [cSn]          
+D1[m] Fby24  UpF                        
+DR[m] Fby32  UpT                        
+
+Notes:
+
+1) When change is nochg, model is 1 when monsters can activate trigger
+   otherwise monsters cannot activate it.
+2) The change fields mean the following:
+   nochg   - means no texture change or type change
+   zero    - means sector type is zeroed, texture copied from model
+   txtonly - means sector type unchanged, texture copied from model
+   type    - means sector type and floor texture are copied from model
+3) down/up specifies the "normal" direction for moving. If the
+   target specifies motion in the opposite direction, motion is instant.
+   Otherwise it occurs at speed specified by speed field.
+4) Speed is 1/2/4/8 units per tic
+5) If change is nonzero then model determines which sector is copied.
+   If model is 0 its the sector on the first side of the trigger.
+   if model is 1 (numeric) then the model sector is the sector at
+   destination height on the opposite side of the lowest numbered
+   two sided linedef around the tagged sector. If it doesn't exist
+   no change occurs.
+
+------------------------------------------------------------------
+generalized ceilings (8192 types)
+
+field   description                        NBits   Mask     Shift
+------------------------------------------------------------------
+
+trigger W1/WR/S1/SR/G1/GR/D1/DR             3     0x0007      0
+speed   slow/normal/fast/turbo              2     0x0018      3
+model   trig/numeric -or- nomonst/monst     1     0x0020      5
+direct  down/up                             1     0x0040      6
+target  HnC/LnC/NnC/HnF/F/sT/24/32          3     0x0380      7
+change  nochg/zero/txtonly/type             2     0x0c00      10
+crush   no/yes                              1     0x1000      12
+
+DETH Nomenclature:
+
+W1[m] C->HnC DnS [Cr] [c0t] 
+WR[m] C->LnC DnN      [c0n] 
+S1[m] C->NnC DnF      [cTt] 
+SR[m] C->HnF DnT      [cTn]     
+G1[m] C->F   UpS      [cSt]     
+GR[m] CbysT  UpN      [cSn]     
+D1[m] Cby24  UpF                        
+DR[m] Cby32  UpT                        
+
+Notes:
+
+1) When change is nochg, model is 1 when monsters can activate trigger
+   otherwise monsters cannot activate it.
+2) The change fields mean the following:
+   nochg   - means no texture change or type change
+   zero    - means sector type is zeroed, texture copied from model
+   txtonly - means sector type unchanged, texture copied from model
+   type    - means sector type and ceiling texture are copied from model
+3) down/up specifies the "normal" direction for moving. If the
+   target specifies motion in the opposite direction, motion is instant.
+   Otherwise it occurs at speed specified by speed field.
+4) Speed is 1/2/4/8 units per tic
+5) If change is nonzero then model determines which sector is copied.
+   If model is 0 its the sector on the first side of the trigger.
+   if model is 1 (numeric) then the model sector is the sector at
+   destination height on the opposite side of the lowest numbered
+   two sided linedef around the tagged sector. If it doesn't exist
+   no change occurs.
+
+------------------------------------------------------------------
+generalized doors (1024 types)
+
+field   description                       NBits    Mask     Shift
+------------------------------------------------------------------
+
+trigger W1/WR/S1/SR/G1/GR/D1/DR            3      0x0007      0
+speed   slow/normal/fast/turbo             2      0x0018      3
+kind    odc/o/cdo/c                        2      0x0060      5
+monster n/y                                1      0x0080      7
+delay   1/4/9/30 (secs)                    2      0x0300      8
+
+DETH Nomenclature:
+
+W1[m] OpnD{1|4|9|30}Cls S
+WR[m] Opn               N
+S1[m] ClsD{1|4|9|30}Opn F
+SR[m] Cls               T
+G1[m]
+GR[m]
+D1[m]
+DR[m]
+
+Notes:
+
+1) The odc (Open, Delay, Close) and cdo (Close, Delay, Open) kinds use
+   the delay field. The o (Open and Stay) and c (Close and Stay) kinds 
+   do not.
+2) The precise delay timings in gametics are: 35/150/300/1050
+3) Speed is 2/4/8/16 units per tic
+
+------------------------------------------------------------------
+generalized locked doors (1024 types)
+
+field   description                       NBits    Mask     Shift
+------------------------------------------------------------------
+
+trigger W1/WR/S1/SR/G1/GR/D1/DR            3      0x0007      0
+speed   slow/normal/fast/turbo             2      0x0018      3
+kind    odc/o                              1      0x0020      5
+lock    any/rc/yc/bc/rs/bs/ys/all          3      0x01c0      6
+sk=ck   n/y                                1      0x0200      9
+
+DETH Nomenclature:
+
+W1[m] OpnD{1|4|9|30}Cls S Any
+WR[m] Opn               N R{C|S|K}
+S1[m]                   F B{C|S|K}
+SR[m]                   T Y{C|S|K}
+G1[m]                     All{3|6}
+GR[m]
+D1[m]
+DR[m]
+
+Notes:
+
+1) Delay for odc kind is constant at 150 gametics or about 4.333 secs
+2) The lock field allows any key to open a door, or a specific key to
+   open a door, or all keys to open a door.
+3) If the sk=ck field is 0 (n) skull and cards are different keys,
+   otherwise they are treated identically. Hence an "all" type door
+   requires 3 keys if sk=ck is 1, and 6 keys if sk=ck is 0.
+4) Speed is 2/4/8/16 units per tic
+
+-------------------------------------------------------------------
+generalized lifts (1024 types)
+
+field   description                       NBits    Mask     Shift
+-------------------------------------------------------------------
+
+trigger W1/WR/S1/SR/G1/GR/D1/DR            3      0x0007      0
+speed   slow/normal/fast/turbo             2      0x0018      3
+monster n/y                                1      0x0020      5
+delay   1/3/5/10 (secs)                    2      0x00c0      6
+target  LnF/NnF/LnC/LnF<->HnF(perp.)       2      0x0300      8
+
+DETH Nomenclature:
+
+W1[m] Lft  F->LnFD{1|3|5|10}    S
+WR[m]      F->NnFD{1|3|5|10}    N
+S1[m]      F->LnCD{1|3|5|10}    F
+SR[m]      HnF<->LnFD{1|3|5|10} T
+G1[m]
+GR[m]
+D1[m]
+DR[m]
+
+Notes:
+
+1) The precise delay timings in gametics are: 35/105/165/350
+2) Speed is 1/2/4/8 units per tic
+3) If the target specified is above starting floor height, or does not
+   exist the lift does not move when triggered. NnF is Next Lowest
+   Neighbor Floor.
+4) Starting a perpetual lift between lowest and highest neighboring floors
+   locks out all other actions on the sector, even if it is stopped with
+   the non-extended stop perpetual floor function.
+
+-------------------------------------------------------------------
+generalized stairs (1024 types)
+
+field   description                       NBits    Mask     Shift
+-------------------------------------------------------------------
+
+trigger W1/WR/S1/SR/G1/GR/D1/DR            3      0x0007      0
+speed   slow/normal/fast/turbo             2      0x0018      3
+monster n/y                                1      0x0020      5
+step    4/8/16/24                          2      0x00c0      6
+dir     dn/up                              1      0x0100      8
+igntxt  n/y                                1      0x0200      9
+
+DETH Nomenclature:
+
+W1[m] Stair Dn s4  S [Ign]
+WR[m]       Up s8  N
+S1[m]          s16 F
+SR[m]          s24 T
+G1[m]
+GR[m]
+D1[m]
+DR[m]
+
+Notes:
+
+1) Speed is .25/.5/2/4 units per tic
+2) If igntxt is 1, then the staircase will not stop building when
+   a step does not have the same texture as the previous.
+3) A retriggerable stairs builds up and down alternately on each
+   trigger.
+
+-------------------------------------------------------------------
+generalized crushers (128 types)
+
+field   description                       NBits    Mask     Shift
+-------------------------------------------------------------------
+
+trigger W1/WR/S1/SR/G1/GR/D1/DR            3      0x0007      0
+speed   slow/normal/fast/turbo             2      0x0018      3
+monster n/y                                1      0x0020      5
+silent  n/y                                1      0x0040      6
+
+DETH Nomenclature:
+
+W1[m] Crusher S [Silent]
+WR[m]         N
+S1[m]         F
+SR[m]         T
+G1[m]
+GR[m]
+D1[m]
+DR[m]
+
+Notes:
+
+1) Speed is 1/2/4/8 units per second, faster means slower damage as usual.
+2) If silent is 1, the crusher is totally quiet, no start/stop sounds
+                                           
+
+======================================================================
+                        Part II Sector Types
+======================================================================
+
+BOOM is backward compatible with DOOM's sector types. All types 0-17
+have the same meaning they did under DOOM. Types 18-31 are reserved
+for extended sector types, that work like DOOM's and share the
+limitation that only one type can be active in a sector at once. No
+extended sector types are implemented at this time.
+
+####################################
+Section 14. Regular Sector types
+####################################
+
+From Matt Fell's Unofficial DOOM Spec the DOOM sector types are:
+
+Dec Hex Class   Description
+-------------------------------------------------------------------
+ 0  00  -       Normal, no special characteristic.
+ 1  01  Light   random off
+ 2  02  Light   blink 0.5 second
+ 3  03  Light   blink 1.0 second
+ 4  04  Both    -10/20% health AND light blink 0.5 second
+ 5  05  Damage  -5/10% health
+ 7  07  Damage  -2/5% health
+ 8  08  Light   oscillates
+ 9  09  Secret  a player must stand in this sector to get credit for
+                  finding this secret. This is for the SECRETS ratio
+                  on inter-level screens.
+10  0a  Door    30 seconds after level start, ceiling closes like a door.
+11  0b  End     -10/20% health. If a player's health is lowered to less
+                  than 11% while standing here, then the level ends! Play
+                  proceeds to the next level. If it is a final level
+                  (levels 8 in DOOM 1, level 30 in DOOM 2), the game ends!
+12  0c  Light   blink 0.5 second, synchronized
+13  0d  Light   blink 1.0 second, synchronized
+14  0e  Door    300 seconds after level start, ceiling opens like a door.
+16  10  Damage  -10/20% health
+
+17  11  Light   flickers on and off randomly
+
+Note that BOOM will NEVER exit the game on an illegal sector type, as
+was the case with DOOM. The sector type will merely be ignored.
+
+####################################
+Section 15. Generalized sector types
+####################################
+
+BOOM also provides generalized sector types, based on bit fields,
+that allow several sector type properties to be independently
+specified for a sector. Texture change linedefs can be used to switch
+some or all of these properties dynamically, outside lighting.
+
+Bits 0 thru 4 specify the lighting type in the sector, the same codes
+that DOOM used are employed:
+
+Dec Bits 4-0   Description
+-------------------------------------------------------------------
+0   00000      Normal lighting
+1   00001      random off
+2   00010      blink 0.5 second
+3   00011      blink 1.0 second
+4   00100      -10/20% health AND light blink 0.5 second
+8   01000      oscillates
+12  01100      blink 0.5 second, synchronized
+13  01101      blink 1.0 second, synchronized
+17  10001      flickers on and off randomly
+
+Bits 5 and 6 set the damage type of the sector, with the usual
+5/10/20 damage units per second.
+
+Dec Bits 6-5   Description
+-------------------------------------------------------------------
+0   00         No damage
+32  01         5  units damage per sec (halve damage in TYTD skill)
+64  10         10 units damage per sec
+96  11         20 units damage per sec
+
+Bit 7 makes the sector count towards the secrets total at game end
+
+Dec Bit 7      Description
+-------------------------------------------------------------------
+0    0         Sector is not secret
+128  1         Sector is secret
+
+Bit 8 enables the ice/mud effect controlled by linedef 223
+
+Dec Bit 8      Description
+-------------------------------------------------------------------
+0    0         Sector friction disabled
+256  1         Sector friction enabled
+
+Bit 9 enables the wind effects controlled by linedefs 224-226
+
+Dec Bit 9      Description
+-------------------------------------------------------------------
+0    0         Sector wind disabled
+512  1         Sector wind enabled
+
+Bits 10 and 11 are not implemented yet, but are reserved for use in
+sound control. Bit 10 will suppress all sounds within the sector,
+while bit 11 will disable any sounds due to floor or ceiling motion
+by the sector.
+
+======================================================================
+                        Part III Linedef Flags
+======================================================================
+
+Only one new linedef flag is implemented, called PassThru, which
+allows a push or switch linedef trigger to pass the push action thru
+it to ones within range behind it. In this way BOOM is capable of
+setting off many actions with a single push. Note that the limitation
+of one floor action, one ceiling action, and one lighting action per
+sector affect still applies however.
+
+The new linedef flag is bit 9, value 512, in the linedef flags word.
+
+======================================================================
+                        Part IV Thing Flags
+======================================================================
+
+BOOM has implemented two new thing flags, "not in DM" and "not in
+COOP", which in combination with the existing "not in Single" flag,
+usually called "Multiplayer", allow complete control over a level's
+inventory and monsters, in any game mode.
+
+If you want a thing to be only available in Single play, you set both
+the "not in DM" and "not in COOP" flags. Other combinations are
+similar.
+
+"not in DM"   is bit 5, value 32, in the thing flags word.
+"not in COOP" is bit 6, value 64, in the thing flags word.
+
+======================================================================
+                        Part V Thing Types
+======================================================================
+
+BOOM has implemented two new thing types as well, MT_PUSH (5001), and
+MT_PULL(5002). These control the origin of the point source wind
+effect controlled by linedef types 225 and 226, and set whether the
+wind blows towards or away from the origin depending on which is
+used.
+
+======================================================================
+                        Part VI BOOM Predefined Lumps
+======================================================================
+
+BOOM supports resources embedded in the .EXE that are loaded before
+all other resources. They can be replaced by resources of the same
+name in the IWAD or add-on PWADs. These resources can be extracted
+into a wad thru use of the command:
+
+BOOM -dumplumps predef.wad
+
+You can then extract the resources from predef.wad to alter them for
+replacement purposes.
+
+Menu text
+---------
+M_HORSEN       Mouse horizontal sensitivity menu
+M_VERSEN       Mouse vertical sensitivity menu
+M_SETUP	       Setup menu entry in main menu
+M_KEYBND       Key Bindings entry in setup menu
+M_AUTO	       Automap entry in setup menu
+M_CHAT	       Chat string entry in setup menu
+M_ENEM	       Enemies options entry in setup menu
+M_STAT	       Status bar and Hud entry in setup menu
+M_WEAP	       Weapons entry in setup menu
+M_MESS	       Message option entry in setup menu
+M_COLORS       Palette color picker diagram
+M_PALNO	       Xed-out symbol for unused automap features
+M_BUTT1	       Setup reset button off state
+M_BUTT2	       Setup reset button on state
+
+Font chars
+----------
+STCFN096       ` character for standard DOOM font
+
+STBR123	       HUD font bargraph char, full, 4 vertical bars
+STBR124	       HUD font bargraph char, partial, 3 vertical bars
+STBR125	       HUD font bargraph char, partial, 2 vertical bars
+STBR126	       HUD font bargraph char, partial, 1 vertical bars
+STBR127	       HUD font bargraph char, empty, 0 vertical bars
+
+DIG0	       HUD font 0 char
+DIG1	       HUD font 1 char
+DIG2	       HUD font 2 char
+DIG3	       HUD font 3 char
+DIG4	       HUD font 4 char
+DIG5	       HUD font 5 char
+DIG6	       HUD font 6 char
+DIG7	       HUD font 7 char
+DIG8	       HUD font 8 char
+DIG9	       HUD font 9 char
+DIGA	       HUD font A char
+DIGB	       HUD font B char
+DIGC	       HUD font C char
+DIGD	       HUD font D char
+DIGE	       HUD font E char
+DIGF	       HUD font F char
+DIGG	       HUD font G char
+DIGH	       HUD font H char
+DIGI	       HUD font I char
+DIGJ	       HUD font J char
+DIGK	       HUD font K char
+DIGL	       HUD font L char
+DIGM	       HUD font M char
+DIGN	       HUD font N char
+DIGO	       HUD font O char
+DIGP	       HUD font P char
+DIGQ	       HUD font Q char
+DIGR	       HUD font R char
+DIGS	       HUD font S char
+DIGT	       HUD font T char
+DIGU	       HUD font U char
+DIGV	       HUD font V char
+DIGW	       HUD font W char
+DIGX	       HUD font X char
+DIGY	       HUD font Y char
+DIGZ	       HUD font Z char
+DIG45	       HUD font - char
+DIG47	       HUD font / char
+DIG58	       HUD font : char
+DIG91	       HUD font [ char
+DIG93	       HUD font ] char
+
+Status bar
+----------
+STKEYS6	       Both blue keys graphic
+STKEYS7	       Both yellow keys graphic
+STKEYS8	       Both red keys graphic
+
+Box chars
+---------
+BOXUL	       Upper left corner of box
+BOXUC	       Center of upper border of box
+BOXUR	       Upper right corner of box
+BOXCL	       Center of left border of box
+BOXCC	       Center of box
+BOXCR	       Center of right border of box
+BOXLL	       Lower left corner of box
+BOXLC	       Center of lower border of box
+BOXLR	       Lower right corner of box
+
+Lumps missing in v1.1
+---------------------
+STTMINUS       minus sign for neg frags in status bar
+WIMINUS	       minus sign for neg frags on end screen
+M_NMARE	       nightmare skill menu string
+STBAR	       status bar background
+DSGETPOW       sound for obtaining power-up
+
+Text end screen
+---------------
+ENDBOOM	       Text displayed at end of game, 80X25 with attributes
+
+Sprites
+-------
+TNT1A0	       Invisible sprite for push/pull controller things
+
+Switches and Animations
+-----------------------
+SWITCHES       Definition of switch textures recognized
+ANIMATED       Definition of animated textures and flats recognized
+
+SWITCHES format:
+
+The SWITCHES lump makes the names of the switch textures used in the
+game known to the engine. It consists of a list of records each 20
+bytes long, terminated by an entry (not used) whose last 2 bytes are 0.
+
+9 bytes        Null terminated string naming "off" state texture for switch
+9 bytes        Null terminated string naming "off" state texture for switch
+2 bytes        Short integer for the IWADs switch will work in
+                1=shareware
+		2=registered/retail DOOM or shareware
+		3=DOOM II, registered/retail DOOM, or shareware
+		0=terminates list of known switches
+
+ANIMATED format:
+
+The ANIMATED lump makes the names of the animated flats and textures
+known to the engine. It consists of a list of records, each 23 bytes
+long, terminated by a record (not used) whose first byte is -1 (255).
+
+1 byte         -1 to terminate list, 0 if a flat, 1 if a texture
+9 bytes        Null terminated string naming last texture/flat in animation
+9 bytes        Null terminated string naming first texture/flat in animation
+4 bytes        Animation speed, number of frames between animation changes
+
+The utility package contains a program, SWANTBLS.EXE that will
+generate both the SWITCHES and ANIMATED lumps from a text file. An
+example is provided, DEFSWANI.DAT that generates the standard set of
+switches and animations for DOOM.
+
+Colormaps
+---------
+WATERMAP       Custom greenish colormap for underwater use
+
+The WATERMAP lump has the same format as COLORMAP, 34 tables of 256
+bytes each, see the UDS for details. Note that colormaps you add to
+a PWAD must be between C_START and C_END markers.
+
+The utility package contains a program, CMAPTOOL.EXE, that will
+generate custom colormaps for use with BOOM. It also includes 7
+premade colormaps, and an add-on wad containing them.
+
+
+Color translation tables
+------------------------
+CRBRICK        Translates red range to brick red
+CRTAN	       Translates red range to tan
+CRGRAY	       Translates red range to gray
+CRGREEN	       Translates red range to green
+CRBROWN	       Translates red range to brown
+CRGOLD	       Translates red range to dark yellow
+CRRED	       Translates red range to red range (no change)
+CRBLUE	       Translates red range to light blue
+CRBLUE2	       Translates red range to dark blue (status bar numerals)
+CRORANGE       Translates red range to orange
+CRYELLOW       Translates red range to light yellow
+
+These tables are used to translate the red font characters to other
+colors. They are made replaceable in order to support custom palettes
+in TC's better. Note however that the font character graphics must
+be defined using the palette indices for the standard red range of the
+palette 176-191.
+
+-END OF DOCUMENT----------------------------------------------------------
+
\ No newline at end of file
diff --git a/Documents/Doom_specs.txt b/Documents/Doom_specs.txt
new file mode 100644
index 0000000..e8d0395
--- /dev/null
+++ b/Documents/Doom_specs.txt
@@ -0,0 +1,3801 @@
+			   T H E   U N O F F I C I A L
+=================     ===============     ===============   ================
+\\ . . . . . . .\\   //. . . . . . .\\   //. . . . . . .\\  \\. . .\\// . .//
+||. . ._____. . .|| ||. . ._____. . .|| ||. . ._____. . .|| || . . .\/ . ..||
+|| . .||   ||. . || || . .||   ||. . || || . .||   ||. . || ||. . . . . . .||
+||. . ||   || . .|| ||. . ||   || . .|| ||. . ||   || . .|| || . | . . . ..||
+|| . .||   ||. _-|| ||-_ .||   ||. . || || . .||   ||. _-|| ||-_.|\ . . . .||
+||. . ||   ||-'  || ||  `-||   || . .|| ||. . ||   ||-'  || ||  `|\_ . .|..||
+|| . _||   ||    || ||    ||   ||_ . || || . _||   ||    || ||   |\ `-_/| .||
+||_-' ||  .|/    || ||    \|.  || `-_|| ||_-' ||  .|/    || ||   | \  / -_.||
+||    ||_-'      || ||      `-_||    || ||    ||_-'      || ||   | \  / | '||
+||    `'         || ||         `'    || ||    `'         || ||   | \  / |  ||
+||            .===' `===.         .==='.`===.         .===' /==. |  \/  |  ||
+||         .=='   \_|-_ `===. .==='   _|_   `===. .===' _-|/   `==  \/  |  ||
+||      .=='    _-'    `-_  `='    _-'   `-_    `='  _-'   `-_  /|  \/  |  ||
+||   .=='    _-'          `-__\._-'         `-_./__-'         `' |. /|  |  ||
+||.=='    _-'                                                     `' | /==.||
+=='    _-'         S         P         E         C         S          \/  `==
+\   _-'                                                                `-_  /
+ `''                                                                      ``'
+		       Release v1.666 - December 15th, 1994
+		   Written by: Matthew S Fell (msfell@aol.com)
+
+	  "The poets talk about love, ...but what I talk about is DOOM,
+		  because in the end, DOOM is all that counts."
+	    - Alex Machine/George Stark/Stephen King, _The Dark Half_
+------------------------------------------------------------------------------
+
+
+
+
+
+
+
+
+----------
+DISCLAIMER
+----------
+
+	These specs are to aid in informing the public about the games
+DOOM and DOOM 2, by id Software.  In no way should this promote your
+killing yourself, killing others, or killing in any other fashion.
+Additionally, the author does not claim ANY responsibility
+regarding ANY illegal activity concerning this file, or indirectly related
+to this file.  The information contained in this file only reflects
+id Software indirectly, and questioning id Software regarding any
+information in this file is not recommended.
+
+----------------
+COPYRIGHT NOTICE
+----------------
+
+This article is Copyright 1994 by Matt Fell.  All rights reserved.
+You are granted the following rights:
+
+I.  To make copies of this work in original form, so long as
+      (a) the copies are exact and complete;
+      (b) the copies include the copyright notice and these paragraphs
+	  in their entirety;
+      (c) the copies give obvious credit to the author, Matt Fell;
+      (d) the copies are in electronic form.
+II. To distribute this work, or copies made under the provisions
+    above, so long as
+      (a) this is the original work and not a derivative form;
+      (b) you do not charge a fee for copying or for distribution;
+      (c) you ensure that the distributed form includes the copyright
+	  notice, this paragraph, the disclaimer of warranty in
+	  their entirety and credit to the author;
+      (d) the distributed form is not in an electronic magazine or
+	  within computer software (prior explicit permission may be
+	  obtained from the author);
+      (e) the distributed form is the NEWEST version of the article to
+	  the best of the knowledge of the distributor;
+      (f) the distributed form is electronic.
+
+	You may not distribute this work by any non-electronic media,
+including but not limited to books, newsletters, magazines, manuals,
+catalogs, and speech.  You may not distribute this work in electronic
+magazines or within computer software without prior written explicit
+permission.  These rights are temporary and revocable upon written, oral,
+or other notice by the author. This copyright notice shall be governed
+by the laws of the state of Ohio.
+	If you would like additional rights beyond those granted above,
+write to the author at "msfell@aol.com" on the Internet.
+
+
+--------
+CONTENTS
+--------
+
+[1] Introduction
+	[1-1] id Software's Copyright
+	[1-2] What's New
+[2] The Basics
+	[2-1] Pwads
+	[2-2] DOOM version information
+	[2-3] Terminology conventions
+[3] List of DOOM.WAD Directory Entries
+[4] The Levels
+	[4-1] ExMy or MAPxy
+	[4-2] THINGS
+		[4-2-1] Thing Types
+		[4-2-2] Thing Sizes
+		[4-2-3] Thing Options
+	[4-3] LINEDEFS
+		[4-3-1] Linedef Flags
+		[4-3-2] Linedef Types
+	[4-4] SIDEDEFS
+	[4-5] VERTEXES
+	[4-6] SEGS
+	[4-7] SSECTORS
+	[4-8] NODES
+	[4-9] SECTORS
+		[4-9-1] Special Sector Types
+	[4-10] REJECT
+	[4-11] BLOCKMAP
+[5] Graphics
+	[5-1] Picture Format
+[6] Flats (Floor and Ceiling Textures)
+	[6-1] Animated Floors, see [8-4-1]
+[7] Sounds and Music
+	[7-1] PC Speaker Sound Effects
+	[7-2] Soundcard Sound Effects
+	[7-3] Music
+	[7-4] GENMIDI
+	[7-5] DMXGUS
+[8] Miscellaneous Lumps
+	[8-1] PLAYPAL
+	[8-2] COLORMAP
+	[8-3] ENDOOM
+	[8-4] TEXTURE1 and TEXTURE2
+		[8-4-1] Animated Walls
+		[8-4-2] The SKY Textures
+	[8-5] PNAMES
+	[8-6] DEMOs
+		[8-6-1] Level changes from 1.2 to 1.666 DOOM.WAD
+[9] Savegame Files
+
+[10] The DOOM.EXE File
+	[10-1] Version 1.2 DOOM.EXE Data Segment Overview
+	[10-1] Version 1.666 DOOM.EXE Data Segment Overview
+	[10-3] Detail on some EXE Data Structures
+
+APPENDICES
+
+[A-1] Backus-Naur Form definitions of wad elements
+[A-2] Engine limits
+[A-3] DOOM.WAD changes and errors
+[A-3] A BLOCKMAP algorithm
+[A-4] Other helpful documents
+[A-5] Acknowledgments
+
+
+-------------------------
+CHAPTER [1]: Introduction
+-------------------------
+
+  DOOM is simply an all-time great game. A big factor in its success
+and durability is the plethora of user-created add-ons. id Software
+tacitly encouraged them by including the -FILE parameter, and by having
+a data format that is both straightforward and easy to understand.
+DOOM is basically two files, DOOM.EXE and DOOM.WAD. DOOM.EXE is the
+"engine" which does the display and controls the game, and DOOM.WAD has
+ALL of the graphics, sound, and map/level data that the engine uses.
+The -FILE parameter allows small or large external "WAD" files to be
+incorporated, changing any number of those graphics, sounds, and maps.
+  DOOM 2 has many things in common with DOOM. It uses the same EXE file
+as version 1.666 of DOOM, and the WAD file format is the same. It's just
+the contents of the WAD file that are different; there are more enemies!
+more pictures! more weapons! more stuff!!
+
+  This document explains in great detail nearly all aspects of the doom
+WAD file format. And a new chapter (10) documents the location of data
+within DOOM.EXE itself, so that various unusual game-play changes can
+be made. This information has been updated to apply to DOOM 2 as well
+as DOOM 1.
+  The specs were originally conceived as an aid to programmers making
+DOOM utilities, especially map-editors. Coincidentally, there might also
+be information useful to advanced level designers and players.
+  The material herein is somewhat technical and it is not recommended for
+beginners, unless they are determined. There are some other very useful
+documents in existence; I list the ones I know of in Appendix [A-3].
+
+
+[1-1]: id Software's Copyright and the Shareware Version
+========================================================
+
+  My comments and statements are by no means official, and the excerpts
+below are just the parts that I think are relevant to these specs. Please
+read the LICENSE.DOC and README.EXE that came with DOOM.
+
+  The LICENSE.DOC says:
+
+    "You shall not:  rent, lease, sell, distribute for money or other
+    consideration, modify, translate, disassemble, decompile, reverse
+    engineer, or create derivative works based upon the Software.
+    Notwithstanding the foregoing, you may create a map editor, modify
+    maps and make your own maps (collectively referenced as the
+    "Permitted Derivative Works") for the Software.  You may not sell
+    or distribute any Permitted Derivative Works but you may exchange
+    the Permitted Derivative Works at no charge amongst other end-users.
+    In order to commercially distribute any such map editor or data
+    utility you must first sign ID's Data Utility License and ID
+    reserves the right to deny authorization to commercial distribute
+    the any such map editor or data utility.  You may request a copy of
+    the Data Editor License from ID"
+
+    "(except for backup purposes) You may not otherwise reproduce, copy
+    or disclose to others, in whole or in any part, the Software."
+
+  The README says:
+
+    "id Software respectfully requests that you do not modify the levels
+    for the shareware version of DOOM.  We feel that the distribution of
+    new levels that work with the shareware version of DOOM will lessen a
+    potential user's incentive to purchase the registered version.
+
+    "If you would like to work with modified levels of DOOM, we encourage
+    you to purchase the registered version of the game."
+
+  If you are making add-ons, plan on them not working on the shareware
+game, and plan on including statements about the trademarks and copyrights
+that id Software owns, as well as disclaimers that they won't support your
+add-on product, nor will they support DOOM after it has been modified.
+
+
+[1-2]: What's New
+=================
+
+  Each new version of these specs renders the previous version obsolete.
+  This document has grown considerably in size, and to fight that trend,
+I'll not discuss it any more.
+  It has now been five months since the specs were updated. I won't talk
+about that either. I'll just apologize for not releasing updates in late
+May and July like I should have. Those updates would have been numbered
+1.4 and 1.5, so perhaps that's why this is version 1.666.
+  Here's some of the new or revised sections since the 1.3 specs:
+
+    - DOOM 2 info, especially in [4-2-1] and [4-3-2]
+    - lots of info on the DOOM.EXE file in [10]
+    - BNF style definitions in [A-1]
+    - DOOM engine limits in [A-2]
+    - the DEMO format [8-6]
+    - the ENDOOM lump [8-3]
+    - comprehensive list of WAD lumps in [3]
+
+    - many parts rewritten for clarity
+    - changes in terminology to reflect id's where possible, and to be
+	more consistent throughout
+    - reformatted again, errors and typos corrected
+
+
+-------------------
+CHAPTER [2]: Basics
+-------------------
+
+  The starting point is the concept of "WAD". It is not an acronym, it
+just means a collection of data. Throughout this document, "WAD" or "wad"
+will mean a file with a .WAD extension that contains data for the doom
+engine to use.
+  A WAD file has three parts:
+
+  (1) a twelve-byte header
+  (2) one or more "lumps"
+  (3) a directory or "info table" that contains the names, offsets, and
+	sizes of all the lumps in the WAD
+
+  The header consists of three four-byte parts:
+
+    (a) an ASCII string which must be either "IWAD" or "PWAD"
+    (b) a 4-byte (long) integer which is the number of lumps in the wad
+    (c) a long integer which is the file offset to the start of
+	  the directory
+
+  The directory has one 16-byte entry for every lump. Each entry consists
+of three parts:
+
+    (a) a long integer, the file offset to the start of the lump
+    (b) a long integer, the size of the lump in bytes
+    (c) an 8-byte ASCII string, the name of the lump, padded with zeros.
+	  For example, the "DEMO1" entry in hexadecimal would be
+	  (44 45 4D 4F 31 00 00 00)
+
+  A "lump" is just data, in one of several different formats. Some
+contain sound data, some contain graphics data, some contain level
+structure data, etc. These specs are mostly concerned with delineating
+the formats of the various lump types. There are 10 different types of
+map/level lump formats, each has a section in chapter [4] (sections 2-11).
+There are 13 other types of lump formats, listed below with the section
+where the format is explained, and the actual lump names in parentheses.
+Also, Appendix [A-1] has definitions of the structures of all these
+WAD elements.
+
+  [8-1] palettes (PLAYPAL)
+  [8-2] colormaps (COLORMAP)
+  [8-3] dos exit text (ENDOOM)
+  [8-6] demos (DEMO1, DEMO2, and DEMO3)
+  [8-4] texture composition list (TEXTURE1 and TEXTURE2)
+  [8-5] wall patch "number for name" indexing list (PNAMES)
+  [7-4] midi mapping (GENMIDI)
+  [7-5] Gravis UltraSound patch mappings (DMXGUS)
+  [7-1] PC speaker sound effects (DP*)
+  [7-2] Soundcard sound effects (DS*)
+  [7-3] songs (D_*)
+  [6]   flats (lumpnames between F_START and F_END)
+  [5]   all other graphics (all other lumps)
+
+  The "marker" and "label" lump names like "S_START" and "E1M1" (or
+"MAP01") do not actually refer to lumps - they have zero length. They
+merely serve to mark the beginning or end of a set of related lumps.
+
+  It is possible to include other directory entries and lumps in a wad
+file, e.g. an entry called CLOWNS could point to a lump that includes the
+level creator's name, date of completion, and the latitude and longitude
+of the Holy Grail. None of these non-standard entries will be used by
+DOOM, nor will they cause it problems.
+
+
+[2-1]: Pwads
+============
+
+  There are two types of wad files. The original DOOM.WAD and DOOM2.WAD
+files are "IWAD"s, or "Internal wads", meaning they contain all of the
+data necessary to play. The other type is the "PWAD" file, "Patch wad",
+an external file which has the same structure, but with far fewer entries
+in the directory. The data in a pwad is substituted for the original data
+in the DOOM.WAD, thus allowing for much easier distribution of new levels.
+Only those resources listed in the pwad's directory are changed,
+everything else is loaded from the IWAD. All external wads should have
+the "PWAD" indicator, as id has requested.
+  A typical pwad might contain new data for a single level, in which
+case it would contain the 10 lumps and 11 directory entries necessary
+to define the level (as described in chapter [4]).
+  A pwad file may contain more than one level or parts of levels, in
+addition to replacement graphics, sounds, etc. (as of version 1.666,
+sprites and flats do NOT work from pwads - see chapter [5] for more).
+In fact, there is apparently no limit to how many entries may be in a
+pwad. The original doom levels are pretty complicated, and they are
+from 50-200 kilobytes each in size, uncompressed.
+  Pwad files need to have the extension .WAD to work. Many of them have
+descriptive names, e.g. if J.R.R. Tolkien made a new level, he might call
+it GONDOLIN.WAD - to use this level, a player would type
+
+  DOOM -FILE GONDOLIN.WAD
+
+at the command line, along with any other parameters. More than one
+external file can be added, thus in general:
+
+  DOOM -FILE [pwad_filename] [pwad_filename] [pwad_filename] ...
+
+  If there are duplicate entries amongst the directories of all the
+wads being "added", the pwads listed LAST take precedence.
+  When the game loads, a "modified game" message will appear if there
+are any pwads involved, reminding the player that id Software will not
+give technical support or answer questions regarding modified levels.
+  With DOOM version 1.666, there is also the @responsefile option for
+listing command line parameters and -file specifications. See the DOOM
+README or the latest FAQ for more information. Also, there are numerous
+"front-end" utilities that make it easier to play pwads, e.g. load several
+external files at once, warp to certain levels, specify options, etc.
+
+
+[2-2]: DOOM versions
+====================
+
+Version Date    Time    Is
+
+1.0     10dec93 01:00   first release (aka DOOM Operating System 0.99)
+1.1     16dec93 01:10   slightly different from 1.0, newer dos extender
+1.2     17feb94 01:20   modem play added!
+1.3     -       -       unauthorized beta release
+1.4     28jun94 01:04   shareware beta
+1.5     ??jul94 ?       shareware beta
+1.6     03aug94 01:06   shareware beta
+1.666   01sep94 16:42   registered full upgrade!
+1.666   ?       ?       DOOM 2!
+
+  The important releases as of this writing are 1.2 and 1.666. Hopefully,
+everyone will move up to 1.666 soon; it has many important improvements
+over 1.2. The 1.4, 1.5, and 1.6 shareware betas contained increasing
+amounts of the stuff that's now in 1.666, but there's no information
+here about what exactly those changes were. One, I didn't keep track,
+and two, they're not really important.
+  See appendix [A-3] for some miscellany about what has changed from
+version to version.
+
+
+[2-3]: Terminology conventions
+==============================
+
+  Throughout this document, I will use the following conventions for
+numbers and variable types:
+
+(1) Most numbers will be decimal. Hexadecimal numbers will usually be
+	labeled thus: 0xffff or $ffff. But sometimes I'll say "hex ...".
+	And in tablature form, a column heading "HEX" indicates all the
+	numbers in that column are hexadecimal.
+(2) "byte" is of course the generic, 8 bits. It will usually mean one
+	8-bit component of a larger data type, or an 8-bit ASCII
+	character, or some such. As a number, it is an unsigned 8-bit
+	integer (0..255).
+(3) "short" is a signed 16-bit integer (-32768..32767), stored in
+	lo-hi format.
+(4) "ushort" or "unsigned short" is an unsigned 16-bit integer (0..65535).
+(5) "integer" or "long" is a signed 32-bit integer. If you don't read
+	this first, my use of the word "integer" might not be immediately
+	apparent.
+(6) "string8" or "8-byte string" is an ASCII string with length between
+	1 and 8 characters inclusive. If its length is less than 8, the
+	remaining bytes are zeros.
+(7) The first byte of a file or any data structure, for addressing and
+	offset purposes, is byte #0, not byte #1.
+(8) Some abbreviations I use: E1, E2, and E3 refer to episodes 1, 2, and
+	3 respectively. "The EXE" means the file DOOM.EXE.
+(666) Any reference to this number is purely intentional.
+
+
+-----------------------------------------------
+CHAPTER [3]: List of DOOM.WAD Directory Entries
+-----------------------------------------------
+
+  There are over 2000 entries in the DOOM.WAD directory. Most of them
+can be easily described in groups, and so are not explicitly mentioned
+in this list. This includes the sprites (see [4-2-1] for sprite names
+and [5] for the sprite lump naming system), the wall patches ([8-4] and
+[8-5] have more info), the flats (chapter [6]), the sounds and songs
+(chapter [7]), and the map data lumps (chapter [4]). All the others
+are listed here.
+  There have been several changes from version to version. The "Ver"
+column indicates in which doom versions the lump exists:
+
+___     no indication means it is in every version. Most are like this.
+1.1     it was in 1.0 and 1.1, but not in 1.2 and later. It is obsolete.
+1.2     it is not in 1.1 and earlier, only in 1.2 and up.
+1.6     it is not in 1.2 and earlier, only in 1.666 and up.
+r       it is only in the registered version, not the shareware.
+1       it is only in DOOM 1, it is not in DOOM 2.
+2       it is only in DOOM 2, it is not in DOOM 1.
+
+  In the lump names, x (and y and e) indicates variable ASCII
+characters, and * can be replaced by an ASCII string (up to the
+8-byte lumpname limit).
+
+LumpName  Ver   Description
+--------  ---   -----------
+PLAYPAL         fourteen 256 color palettes. See [8-1].
+COLORMAP        maps colors in the palette down to darker ones. [8-2].
+ENDOOM          text message displayed when you exit to DOS. [8-3].
+DEMOx           x=1-3, are the demos. [8-6].
+ExMy            subsequent entries define a single level's data. [4].
+MAPxy     2     like ExMy, but for DOOM 2.
+TEXTURE1        list of wall texture names and their composition data,
+		  used in the SIDEDEF portion of each level. [8-4].
+TEXTURE2  r     more wall texture compositions.
+PNAMES          lists all lump names used as wall patches. [8-5].
+GENMIDI         General Midi standard instrument data. [7-3].
+DMXGUS          Gravis Ultra Sound instrument patches. [7-4].
+
+D_ExMy          music for a doom 1 level. [7-2].
+D_INTER         music played on the summary screen between levels.
+D_INTRO         music played when the game starts.
+D_INTROA  1.2   more introductory music.
+D_VICTOR        music played on the victory text-screen after an episode.
+D_BUNNY   r     music for while a certain rabbit has his story told...
+D_*       2     music for a doom 2 level.
+
+DP_*      vary  PC speaker sound effects. [7-1].
+DS_*      vary  Soundcard sound effects. [7-1].
+
+  All the remaining entries in the directory, except the flats between
+F_START and F_END, and the "markers" like S_START, refer to lumps which
+are pictures, in the doom/wad graphic format described in chapter [5].
+The flats are also pictures, but in a format described in chapter [6].
+  The next seven are full screen (320 by 200 pixel) pictures. After
+that, ST* are status-bar pictures, WI* are for the screens between
+levels, and M_* are for menus.
+
+HELP1           Ad-screen says Register!, with some screen shots.
+HELP2           Actual help, all the controls explained.
+TITLEPIC        Maybe this is the title screen? Gee, I dunno...
+CREDIT          People at id Software who created this great game.
+VICTORY2  r     Screen shown after a victorious end to episode 2.
+PFUB1     r     A nice little rabbit minding his own peas and queues...
+PFUB2     r     ...a hint of what's waiting in Doom 2.
+
+ENDx      r     x=0-6, big red "THE END" gets shot up.
+AMMNUMx         x=0-9. Small grey digits for ammo count (15/200 etc).
+STxBARy   1.1   x=M or A, y= L or R. Status bar used to be in pieces.
+STCHAT    1.1   Status bar used to have a "chat" box.
+STRSNUMx  1.1   x=0-9. Small red digits.
+STWEAPx   1.1   x=0-5. COOL little weapon icons. Why'd they drop them?
+STFRAGS   1.1   Tiny "FRAG" to be placed on top of part of status bar.
+STBAR     1.2   Status Bar as used in deathmatches.
+STGNUMx         x=0-9. Small grey digits used on the "Arms" panel.
+STTNUMx         x=0-9. Big red digits used for Armor, Health, etc.
+STTMINUS  1.6   Big red "-" used for negative frags.
+STYSNUMx        x=0-9. Small yellow digits used on the "Arms" panel.
+STTPRCNT        Big red % used in Armor and Health.
+STKEYSx         x=0-5. Blue/Yellow/Red Keycards and Skullkeys.
+STDISK          Disk, used at bottom right corner during disk accesses.
+STCDROM   1.6   CD, used during CD-ROM accesses.
+STARMS          "Arms" panel which replaces "Frags" in non-deathmatch.
+STCFNxxx        xxx=033-095, also 121. Small red ASCII characters.
+STFBx           x=0-3. Green/black/brown/red squares, for ST player faces.
+STPBx           x=0-3. Squares with bottoms, for inter-level screens.
+STFSTxy         x=0-4, y=0-2. Player face. x=0 is 100% health...x=4 is
+		  very low health. y=0 is glancing right, y=2 left.
+STFTLx0         x=0-4. Face looking left, player hurt from that direction.
+STFTRx0         x=0-4. Face looking right.
+STFOUCHx        x=0-4. Face looking surprised (hurt bad).
+STFEVLx         x=0-4. Face with a grin (when pick up new weapons).
+STFKILLx        x=0-4. Face with a grimace (when killing foes).
+STFGOD0         Face with yellow eyes (invulnerable).
+STFDEAD0        Dead face.
+BRDR_*          Tiny pictures used as a border between a less-than-full
+		  screen view and the "outside" marbleized zone. TL is
+		  top left, BR bottom right, you can guess the rest.
+WIBONUS   1.1   Medium sized red text "BONUS"
+WISCORE   1.1   "SCORE"
+WIMSTPx   1.1   x=0-3. Red text "ONE" to "FOUR".
+WIMSTBx   1.1   x=0-3. Grey text "ONE" to "FOUR".
+WIMINUS   1.6   Small red "-" used for negative frags.
+WIMAPx          x=0-2. 320x200 maps used on inter-level screens for e1,2,3.
+WIAe0x0y        patches used to animate inter-level maps.
+WIURH0          "YOU ARE HERE" with an arrow pointing left.
+WIURH1          "YOU ARE HERE" with an arrow pointing right.
+WISPLAT         Splat mark that indicates a completed level.
+WIOSTK          "KILLS"
+WIOSTI          "ITEMS"
+WIF             "FINISHED"
+WIMSTT          "TOTAL"
+WIOSTS          "SCRT"
+WIOSTF          "F."
+WITIME          "TIME"
+WIPAR           "PAR"
+WIMSTAR         "YOU"
+WIPCNT          "%"
+WINUMx          x=0-9. Medium sized red digits.
+WICOLON         ":"
+WISUCKS         "SUCKS"
+WIFRGS          "FRAGS"
+WILVxy          x=0-2, y=0-8. E(x+1)M(y+1) level names in grey/white letters.
+WIPx            x=1-4. Red "P1" - "P4", for multiplayer summaries.
+WIBPx           x=1-4. Grey "P1" - "P4"
+WIKILRS         Small red "KILLERS" going sideways up, for deathmatches.
+WIVCTMS         Small red "VICTIMS" for the top of the deathmatch chart.
+WISCRT2         "SECRET"
+WIENTER         "ENTERING"
+M_DOOM          The DOOM logo
+M_RDTHIS        Big red "Read This!"
+M_OPTION        "Options"
+M_QUITG         "Quit Game"
+M_NGAME         "New Game"
+M_SKULL1        The skull indicator with eyes lit.
+M_SKULL2        The skull indicator with eyes unlit.
+M_THERMO        The marker on e.g. the Sfx volume "thermometer".
+M_THERMR        The right end of the thermometer.
+M_THERML        The left end.
+M_THERMM        The middle, repeated over and over.
+M_ENDGAM        "End Game"
+M_PAUSE         "Pause"
+M_MESSG         "Messages:"
+M_MSGON         "on"
+M_MSGOFF        "off"
+M_EPISOD        "Which Epsiode?"
+M_EPI1          "Knee-Deep In The Dead"
+M_EPI2          "The Shores Of Hell"
+M_EPI3          "Inferno"
+M_HURT          "Hurt me plenty."
+M_JKILL         "I'm too young to die."
+M_ROUGH         "Hey, not too rough."
+M_SKILL         "Choose Skill Level:"
+M_NEWG          "NEW GAME" (title of New Game menu)
+M_ULTRA         "Ultra-Violence."
+M_NMARE   1.2   "Nightmare!"
+M_SVOL          "Sound Volume"
+M_OPTTTL        "OPTIONS" (title of Options menu)
+M_SAVEG         "Save Game"
+M_LOADG         "Load Game"
+M_DISP          "Display"
+M_MSENS         "Mouse sensitivity"
+M_GDHIGH        "high"
+M_GDLOW         "low"
+M_DETAIL        "Graphic Detail:"
+M_DISOPT        "DISPLAY OPTIONS"
+M_SCRNSZ        "Screen Size"
+M_SGTTL         "SAVE GAME"
+M_LGTTL         "LOAD GAME"
+M_SFXVOL        "Sfx Volume"
+M_MUSVOL        "Music Volume"
+M_LSLEFT        Load/save box, left part
+M_LSCNTR        Load/save box, center part (repeated)
+M_LSRGHT        Load/save box, right part
+
+  The following entries are markers that do not point to a lump; they
+have zero size:
+
+S_START         marks the start of the item/monster "sprite" section.
+		  See chapter [5] for the naming convention used here.
+S_END           is immediately after the last sprite.
+P_START         marks the beginning of the wall patches.
+P1_START          before the first of the shareware wall patches.
+P1_END            after the last of the shareware wall patches.
+P2_START  r       registered wall patches.
+P2_END    r       registered wall patches.
+P_END           marks the end of the wall patches.
+F_START         marks the beginning of the flats (floor textures).
+F1_START          shareware flats.
+F1_END            shareware flats.
+F2_START  r       registered flats.
+F2_END    r       registered flats.
+F_END           marks the end of the flats.
+
+
+-----------------------
+CHAPTER [4]: The Levels
+-----------------------
+
+  Each level has eleven directory entries and ten lumps: E[x]M[y] (or
+MAPxy in a DOOM 2 wad), THINGS, LINEDEFS, SIDEDEFS, VERTEXES, SEGS,
+SSECTORS, NODES, SECTORS, REJECT, and BLOCKMAP.
+  In the DOOM.WAD file, all of these entries are present for every level.
+In a pwad external file, they don't all need to be present. Whichever
+entries are in a pwad will be substituted for the originals. For example,
+a pwad with just two entries, E3M6 and THINGS, would use all the walls
+and such from the original E3M6, but could have a completely different
+set of THINGS.
+
+
+[4-1]: ExMy or MAPxy
+====================
+
+  DOOM 1 levels have an ExMy label in a wad's directory. x is a single
+(ASCII) digit 1-3 for the episode number and y is 1-9 for the mission
+number.
+  DOOM 2 levels have a MAPxy label in a wad's directory. xy can range
+from (ASCII) 01 to 32, for the level number.
+  This label just indicates that the lump names following it are part
+of the designated level. The label does not actually point to a lump,
+and the size field in the directory is 0. The assignment of lumps to
+this level stops with either the next ExMy or MAPxy entry, or with a
+non-map entry like TEXTURE1.
+  Without these labels, there would be no way to differentiate amongst
+the many lumps named "THINGS", "LINEDEFS", etc.
+
+
+[4-2]: THINGS
+=============
+
+  "Things" in DOOM are player start positions, monsters, weapons, keys,
+barrels, etc. The size of each THINGS lump will be a multiple of ten,
+since each thing requires ten bytes to describe it, in five <short>
+fields:
+
+(1) X position of thing (at level's inception)
+(2) Y position of thing
+(3) Angle the thing faces. On the automap, 0 is east, 90 is north, 180
+      is west, 270 is south. This value is only used for monsters, player
+      starts, deathmatch starts, and teleporter landing spots. Other
+      things look the same from all directions. Values are rounded to
+      the nearest 45 degree angle, so if the value is 80, it will
+      actually face 90 - north.
+(4) Type of thing, see next subsection, [4-2-1]
+(5) Thing options, see [4-2-3]
+
+
+[4-2-1]: Thing Types
+--------------------
+
+  Short 4 of 5, occupying bytes 6-7 of each thing record, specifies its
+kind. The table below summarizes the different types. They are listed
+in functional groups. You can easily get a numerical-order list by
+extracting this table and SORTing it.
+
+Dec/Hex The thing's number in decimal and hexadecimal. This is the
+	  number used in the THINGS lump on a level (ExMy or MAPxx).
+V       Version of DOOM needed to use this object:
+	  no mark indicates all versions have this object
+r         requires registered DOOM or DOOM 2
+2         requires DOOM 2
+Spr     The sprite name associated with this thing. This is the first
+	  four letters of the lumps that are pictures of this thing.
+seq.    The sequence of frames displayed. "-" means it displays nothing.
+	  Unanimated things will have just an "a" here, e.g. a backpack's
+	  only picture can be found in the wad under BPAKA0. Animated
+	  things will show the order that their frames are displayed
+	  (they cycle back after the last one). So the blue key
+	  alternates between BKEYA0 and BKEYB0. The soulsphere uses
+	  SOULA0-SOULB0-C0-D0-C0-B0 then repeats. Thing 15, a dead
+	  player, is PLAYN0.
++       Monsters and players and barrels. They can be hurt, and they
+	  have a more complicated sprite arrangement. See chapter [5].
+CAPITAL Monsters, counts toward the KILL ratio at the end of a level.
+#       An obstacle, players and monsters can't move through it.
+^       Hangs from the ceiling, or floats (if a monster).
+$       A regular item that players may get.
+!       An artifact item; counts toward the ITEM ratio at level's end.
+	  Note that 2025, the radiation suit, was an ITEM in version
+	  1.2, but it is not an ITEM in version 1.666 on. Also note
+	  that 2022 and 2024, invulnerability and invisibility, do not
+	  respawn in -altdeath games.
+
+Dec. Hex  V Spr  seq.     Thing is:
+
+  -1 ffff   ---- -        (nothing)
+   0 0000   ---- -        (nothing)
+   1 0001   PLAY +        Player 1 start (Player 1 start needed on ALL
+levels)
+   2 0002   PLAY +        Player 2 start (Player starts 2-4 are needed in)
+   3 0003   PLAY +        Player 3 start (cooperative mode multiplayer games)
+   4 0004   PLAY +        Player 4 start
+  11 000b   ---- -        Deathmatch start positions. Should have >= 4/level
+  14 000e   ---- -        Teleport landing. Where players/monsters land when
+  14                        they teleport to the SECTOR containing this thing
+
+3004 0bbc   POSS +      # FORMER HUMAN: regular pistol-shooting zombieman
+  84 0054 2 SSWV +      # WOLFENSTEIN SS: guest appearance by Wolf3D blue guy
+   9 0009   SPOS +      # FORMER HUMAN SERGEANT: black armor, shotgunners
+  65 0041 2 CPOS +      # HEAVY WEAPON DUDE: red armor, chaingunners
+3001 0bb9   TROO +      # IMP: brown, hurl fireballs
+3002 0bba   SARG +      # DEMON: pink, muscular bull-like chewers
+  58 003a   SARG +      # SPECTRE: invisible version of the DEMON
+3006 0bbe r SKUL +     ^# LOST SOUL: flying flaming skulls, they really bite
+3005 0bbd r HEAD +     ^# CACODEMON: red one-eyed floating heads. Behold...
+  69 0045 2 BOS2 +      # HELL KNIGHT: grey-not-pink BARON, weaker
+3003 0bbb   BOSS +      # BARON OF HELL: cloven hooved minotaur boss
+  68 0044 2 BSPI +      # ARACHNOTRON: baby SPIDER, shoots green plasma
+  71 0047 2 PAIN +     ^# PAIN ELEMENTAL: shoots LOST SOULS, deserves its
+name
+  66 0042 2 SKEL +      # REVENANT: Fast skeletal dude shoots homing missles
+  67 0043 2 FATT +      # MANCUBUS: Big, slow brown guy shoots barrage of
+fire
+  64 0040 2 VILE +      # ARCH-VILE: Super-fire attack, ressurects the dead!
+   7 0007 r SPID +      # SPIDER MASTERMIND: giant walking brain boss
+  16 0010 r CYBR +      # CYBER-DEMON: robo-boss, rocket launcher
+
+  88 0058 2 BBRN +      # BOSS BRAIN: Horrifying visage of the ultimate demon
+  89 0059 2 -    -        Boss Shooter: Shoots spinning skull-blocks
+  87 0057 2 -    -        Spawn Spot: Where Todd McFarlane's guys appear
+
+2005 07d5   CSAW a      $ Chainsaw
+2001 07d1   SHOT a      $ Shotgun
+  82 0052 2 SGN2 a      $ Double-barreled shotgun
+2002 07d2   MGUN a      $ Chaingun, gatling gun, mini-gun, whatever
+2003 07d3   LAUN a      $ Rocket launcher
+2004 07d4 r PLAS a      $ Plasma gun
+2006 07d6 r BFUG a      $ Bfg9000
+2007 07d7   CLIP a      $ Ammo clip
+2008 07d8   SHEL a      $ Shotgun shells
+2010 07da   ROCK a      $ A rocket
+2047 07ff r CELL a      $ Cell charge
+2048 0800   AMMO a      $ Box of Ammo
+2049 0801   SBOX a      $ Box of Shells
+2046 07fe   BROK a      $ Box of Rockets
+  17 0011 r CELP a      $ Cell charge pack
+   8 0008   BPAK a      $ Backpack: doubles maximum ammo capacities
+
+2011 07db   STIM a      $ Stimpak
+2012 07dc   MEDI a      $ Medikit
+2014 07de   BON1 abcdcb ! Health Potion +1% health
+2015 07df   BON2 abcdcb ! Spirit Armor +1% armor
+2018 07e2   ARM1 ab     $ Green armor 100%
+2019 07e3   ARM2 ab     $ Blue armor 200%
+  83 0053 2 MEGA abcd   ! Megasphere: 200% health, 200% armor
+2013 07dd   SOUL abcdcb ! Soulsphere, Supercharge, +100% health
+2022 07e6 r PINV abcd   ! Invulnerability
+2023 07e7 r PSTR a      ! Berserk Strength and 100% health
+2024 07e8   PINS abcd   ! Invisibility
+2025 07e9   SUIT a     (!)Radiation suit - see notes on ! above
+2026 07ea   PMAP abcdcb ! Computer map
+2045 07fd   PVIS ab     ! Lite Amplification goggles
+
+   5 0005   BKEY ab     $ Blue keycard
+  40 0028 r BSKU ab     $ Blue skullkey
+  13 000d   RKEY ab     $ Red keycard
+  38 0026 r RSKU ab     $ Red skullkey
+   6 0006   YKEY ab     $ Yellow keycard
+  39 0027 r YSKU ab     $ Yellow skullkey
+
+2035 07f3   BAR1 ab+    # Barrel; not an obstacle after blown up
+			    (BEXP sprite)
+  72 0048 2 KEEN a+     # A guest appearance by Billy
+
+  48 0030   ELEC a      # Tall, techno pillar
+  30 001e r COL1 a      # Tall green pillar
+  32 0020 r COL3 a      # Tall red pillar
+  31 001f r COL2 a      # Short green pillar
+  36 0024 r COL5 ab     # Short green pillar with beating heart
+  33 0021 r COL4 a      # Short red pillar
+  37 0025 r COL6 a      # Short red pillar with skull
+  47 002f r SMIT a      # Stalagmite: small brown pointy stump
+  43 002b r TRE1 a      # Burnt tree: gray tree
+  54 0036 r TRE2 a      # Large brown tree
+
+2028 07ec   COLU a      # Floor lamp
+  85 0055 2 TLMP abcd   # Tall techno floor lamp
+  86 0056 2 TLP2 abcd   # Short techno floor lamp
+  34 0022   CAND a        Candle
+  35 0023   CBRA a      # Candelabra
+  44 002c r TBLU abcd   # Tall blue firestick
+  45 002d r TGRE abcd   # Tall green firestick
+  46 002e   TRED abcd   # Tall red firestick
+  55 0037 r SMBT abcd   # Short blue firestick
+  56 0038 r SMGT abcd   # Short green firestick
+  57 0039 r SMRT abcd   # Short red firestick
+  70 0046 2 FCAN abc    # Burning barrel
+
+  41 0029 r CEYE abcb   # Evil Eye: floating eye in symbol, over candle
+  42 002a r FSKU abc    # Floating Skull: flaming skull-rock
+
+  49 0031 r GOR1 abcb  ^# Hanging victim, twitching
+  63 003f r GOR1 abcb  ^  Hanging victim, twitching
+  50 0032 r GOR2 a     ^# Hanging victim, arms out
+  59 003b r GOR2 a     ^  Hanging victim, arms out
+  52 0034 r GOR4 a     ^# Hanging pair of legs
+  60 003c r GOR4 a     ^  Hanging pair of legs
+  51 0033 r GOR3 a     ^# Hanging victim, 1-legged
+  61 003d r GOR3 a     ^  Hanging victim, 1-legged
+  53 0035 r GOR5 a     ^# Hanging leg
+  62 003e r GOR5 a     ^  Hanging leg
+  73 0049 2 HDB1 a     ^# Hanging victim, guts removed
+  74 004a 2 HDB2 a     ^# Hanging victim, guts and brain removed
+  75 004b 2 HDB3 a     ^# Hanging torso, looking down
+  76 004c 2 HDB4 a     ^# Hanging torso, open skull
+  77 004d 2 HDB5 a     ^# Hanging torso, looking up
+  78 004e 2 HDB6 a     ^# Hanging torso, brain removed
+
+  25 0019 r POL1 a      # Impaled human
+  26 001a r POL6 ab     # Twitching impaled human
+  27 001b r POL4 a      # Skull on a pole
+  28 001c r POL2 a      # 5 skulls shish kebob
+  29 001d r POL3 ab     # Pile of skulls and candles
+  10 000a   PLAY w        Bloody mess (an exploded player)
+  12 000c   PLAY w        Bloody mess, this thing is exactly the same as 10
+  24 0018   POL5 a        Pool of blood and flesh
+  79 004f 2 POB1 a        Pool of blood
+  80 0050 2 POB2 a        Pool of blood
+  81 0051 2 BRS1 a        Pool of brains
+  15 000f   PLAY n        Dead player
+  18 0012   POSS l        Dead former human
+  19 0013   SPOS l        Dead former sergeant
+  20 0014   TROO m        Dead imp
+  21 0015   SARG n        Dead demon
+  22 0016 r HEAD l        Dead cacodemon
+  23 0017 r SKUL k        Dead lost soul, invisible
+			      (they blow up when killed)
+
+
+[4-2-2]: Thing Sizes
+--------------------
+
+  The list below gives the radius, height, mass, speed, and toughness
+of all the monsters in DOOM 1 and 2. Almost all non-monster things only
+differ in their "radius", dependent on whether they are obstacles or not.
+For collision purposes, things are NOT circular. They occupy a square
+whose side equals slightly more than 2 times the radius. This square
+does not turn, it is always aligned with the x and y axes of a level.
+Consider a simple collision detection in a coordinate plane:
+
+    IF (ABS(x1-x2) =< (r1+r2)) AND (ABS(y1-y2) =< (r1+r2)) THEN *collision*
+
+  This will result in square objects centered on their (x,y) positions,
+and that is the behavior that DOOM objects exhibit.
+  I don't know why the horizontal size is "slightly more" than 2 times
+the radius, but it is. A player cannot enter a corridor of width 32, but
+can enter a corridor of width 33. Experiments have shown that no monster
+can enter a corridor that is exactly (2*radius) wide. It must be bigger.
+Moving up to the next multiple of 8 is a good idea, if not 16 or 32.
+  Monsters CAN enter sectors that are exactly "Height" high. But obstacles
+are infinitely high for collision purposes. A player on a very high ledge
+might not be able to jump off, because of an obstacle right next to him,
+even though it is far below him.
+  Height is also used when under a crushing ceiling, and to determine
+if an object can move from one sector to another. The space between the
+highest floor and the lowest ceiling must be "Height" or greater for the
+object to fit.
+  Toughness indicates how much punishment a monster can take until it
+dies. Bullets do 10 damage, Shotgun shells 70 (7 pellets, each is 10),
+Plasma 20, Rockets 100, and the BFG does 1000 for a direct hit. There's
+more info on this stuff in the DOOM FAQ.
+
+Dec. Hex  Radius Height Mass Tough Speed  Sprite name or class of things:
+
+-    -      16     56    100  (100)    -  PLAY
+3004 0bbc   20     56    100    20     8  POSS
+  84 0054   20     56    100    50     8  SSWV
+   9 0009   20     56    100    30     8  SPOS
+  65 0041   20     56    100    70     8  CPOS
+3001 0bb9   20     56    100    60     8  TROO
+3002 0bba   30     56    400   150    10  SARG
+  58 003a   30     56    400   150    10  SARG (Inviso model)
+3006 0bbe   16     56     50   100     8  SKUL
+3005 0bbd   31     56    400   400     8  HEAD
+  69 0045   24     64   1000   500     8  BOS2
+3003 0bbb   24     64   1000  1000     8  BOSS
+  68 0044   64     64    600   500    12  BSPI
+  71 0047   31     56    400   400     8  PAIN
+  66 0042   20     56    500   300    10  SKEL
+  67 0043   48     64   1000   600     8  FATT
+  64 0040   20     56    500   700    15  VILE
+   7 0007  128    100   1000  3000    12  SPID
+  16 0010   40    110   1000  4000    16  CYBR
+  88 0058   16     16   6666   250     0  BBRN
+  72 0048   16     72   6666   100     0  KEEN
+2035 07f3   10     42    100    20     0  BAR1
+   -    -   20     16      -     -     -  most non-obstacles (e.g. gettables)
+   -    -   16     16      -     -     -  most obstacles
+  54 0036   32     16      -     -     -  large brown tree
+
+
+[4-2-3]: Thing Options
+----------------------
+
+  Short 5 of 5, occupying bytes 8-9 of each thing record, control a
+few options, according to which bits are set:
+
+bit 0   the THING is present at skill 1 and 2
+bit 1   the THING is present at skill 3 (hurt me plenty)
+bit 2   the THING is present at skill 4 and 5 (ultra-violence, nightmare)
+bit 3   indicates a deaf guard.
+bit 4   means the THING only appears in multiplayer mode.
+
+bits 5-15 have no effect.
+
+  The skill settings are most used with the monsters, of course...the
+most common skill level settings are hex 07/0f (on all skills), 06/0e
+(on skill 3-4-5), and 04/0c (only on skill 4-5). Unusual skill settings
+are perfectly allowable, e.g. hex 05 for a thing which is present on
+skill 1, 2, 4, and 5, but not skill 3.
+  "deaf guard" only has meaning for monsters, who will not attack until
+they see a player if they are deaf. Otherwise, they will activate when
+they hear gunshots, etc. (including the punch!). Sound does not travel
+through solid walls (walls that are solid at the time of the noise).
+Also, lines can be set so that sound does not pass through them (see
+[4-3-1] bit 6). This option is also known as the "ambush" option (or
+flag, or attribute).
+
+
+[4-3]: LINEDEFS
+===============
+
+  Each linedef represents a line from one of the VERTEXES to another,
+and each linedef's record is 14 bytes, containing 7 <short> fields:
+
+(1) from the VERTEX with this number (the first vertex is 0).
+(2) to the VERTEX with this number (31 is the 32nd vertex).
+(3) flags, see [4-3-1] below.
+(4) types, see [4-3-2] below.
+(5) is a "tag" or "trigger" number which ties this line's effect type
+      to all SECTORS that have the same tag number (in their last
+      field).
+(6) number of the "right" SIDEDEF for this linedef.
+(7) "left" SIDEDEF, if this line adjoins 2 SECTORS. Otherwise, it is
+      equal to -1 (FFFF hex).
+
+  "right" and "left" are based on the direction of the linedef as
+indicated by the "from" and "to", or "start" and "end", VERTEXES.
+This sketch should make it clear:
+
+	     left side               right side
+    start -----------------> end <----------------- start
+	     right side              left side
+
+  IMPORTANT: All lines must have a right side. If it is a one-sided
+line, then it must go the proper direction, so its single side is
+facing the sector it is part of. DOOM will crash on a level that has
+a line with no right side.
+
+
+[4-3-1]: Linedef Flags
+----------------------
+
+  The third <short> field of each linedef controls some attributes of
+that line. These attributes (aka flags) are indicated by bits. If the
+bit is set (equal to 1), the condition is true for that line. If the
+bit is not set (equal to 0), the condition is not true. Note that the
+"unpegged" flags cannot be independently set for the two SIDEDEFs of
+a line. Here's a list of the flags, followed by a discussion of each:
+
+bit     Condition
+
+0       Impassible
+1       Block Monsters
+2       Two-sided
+3       Upper Unpegged
+4       Lower Unpegged
+5       Secret
+6       Block Sound
+7       Not on Map
+8       Already on Map
+9-15    unused
+
+  0 (Impassible) - Players and monsters cannot cross this line. Note that
+if there is no sector on the other side, they can't go through the line
+anyway, regardless of the flags.
+
+  1 (Block Monsters) - Monsters cannot cross this line.
+
+  2 (Two-sided) - The linedef's two sidedefs can have "-" as a texture,
+which in this case means "transparent". If this flag is not set, the
+sidedefs can't be transparent: if "-" is viewed, it will result in the
+"hall of mirrors" effect. However, a linedef CAN have two non-transparent
+sidedefs, even if this flag is not set, as long as it is between two
+sectors.
+  Another side effect of this flag is that if it is set, then gunfire
+(pistol, shotgun, chaingun) can go through it. If this flag is not set,
+gunfire cannot go through the line. Projectiles (rockets, plasma etc.)
+are not restricted this way. They can go through as long as there's a
+sector on the other side (and the sector heights allow it).
+  Finally, monsters can see through and attack through two-sided lines,
+despite any of the line's other flag settings and textures (once again,
+provided sector heights and the REJECT [4-10] allow it).
+
+  3 (Upper unpegged) - The upper texture is pasted onto the wall from
+the top down instead of from the bottom up like usual.
+  Upper textures normally have the bottom of the wall texture to be
+drawn lined up with the bottom of the "upper" space in which it is
+to be drawn (sidedef Y offsets then apply [4-4]). This can result
+in the upper texture being misaligned with a neighboring "middle"
+texture. To help solve this problem, common at "windows", this flag
+can be set.
+  If the upper texture is unpegged, it is drawn with the wall texture's
+top row at the ceiling, just like middle and lower textures are usually
+drawn. This can help realign the upper texture with a neighbor.
+
+  The article TEXTURES, cited in appendix [A-4] gives a great deal
+more explanation on the "unpegged" flags and how to use them.
+
+  4 (Lower unpegged) - Lower and middle textures are drawn from the
+bottom up, instead of from the top down like usual.
+  This is also commonly used on lower textures under "windows". It is
+also used on doorjambs, because when the door opens, the sector ceiling
+is rising, so the "sides" (the doorjambs), which are middle textures,
+will be drawn from the ever-changing ceiling height down, and thus will
+appear to be "moving". Unpegging them will make them be drawn from the
+floor up, and since the floor height doesn't change when a door opens,
+then will not move.
+  There's one slight difference with lower textures being unpegged -
+they are not necessarily drawn with the bottom of the wall texture placed
+at the bottom of the wall. The height of the facing sector and the height
+of the wall texture are taken into account. So if the sector is 160 high,
+and the wall texture is 128 high, then lower unpegged will cause the 32nd
+row of the wall texture to be at the floor, NOT the 128th row. This of
+course excludes sidedef Y offsets, which are applied AFTER unpegged
+flags do their stuff.
+
+  5 (Secret) - On the automap, this line appears in red like a normal
+solid wall that has nothing on the other side. This is useful in
+protecting secret doors and such. Note that if the sector on the other
+side of this "secret" line has its floor height HIGHER than the sector
+on the facing side of the secret line, then the map will show the lines
+beyond and thus give up the secret.
+  Also note that this flag has NOTHING to do with the SECRETS ratio on
+inter-level screens. That's done with special sector 9 (see [4-9-1]).
+
+  6 (Block Sound) - For purposes of monsters hearing sounds and thus
+becoming alerted. Every time a player fires a weapon, the "sound" of
+it travels from sector to sector, alerting all non-deaf monsters in
+each new sector. But the sound will die when it hits a second line
+with this flag. The sound can cross one such line, but not two. All
+possible routes for the sound to take are taken, so it can get to
+some out-of-the-way places. Another thing that blocks sound, instantly,
+is incompatible sector heights. Sound can go from a sector with 0/72
+floor/ceiling heights to one with 64/192, but the sound CANNOT go
+from a 0/128 sector to an adjacent 128/256 sector.
+
+  7 (Not on Map) - The line is not shown on the automap, even if the
+computer all-map power up is acquired.
+
+  8 (Already on Map) - When the level is begun, this line is already
+on the automap, even though it hasn't been seen (in the display) yet.
+Normally lines only get mapped once part of the line has been seen in
+the display window.
+
+  Automap line colors: Red lines indicate the line is one-sided, that
+there is a sector on only one side (or the line is marked secret).
+Brown lines are between two sectors with different floor heights but
+the same ceiling height. Yellow lines are between two sectors with
+different ceiling heights and the same or different floor heights.
+Gray lines are as-yet-unseen lines revealed by the computer all-map.
+Without the all-map, lines between sectors with identical floor and
+ceiling heights don't show up. With it, they are gray.
+
+
+[4-3-2]: Linedef Types
+----------------------
+
+  The <short> in field 4 of 7 of a linedef can control various special
+effects like doors opening, floors moving, etc. Some of them must be
+activated by "using" them, like switches, and some of them are activated
+when they are walked over. There are a huge number of ways to use these
+effects, but it's all done by using one of a hundred or so line function
+types.
+  The most common way they work is this: a player walks across a line
+or activates (presses the spacebar or the use key) right in front of
+a line. That line has a function type that is non-zero. It also has
+a tag number. Then ALL sectors on the level with the same tag number,
+that are not already engaged in some action, undergo the effects that
+the linedef type number dictates. Note that the tag numbers are NOT the
+sector numbers, nor the linedef numbers. A tag number is in a lindef's
+5th <short> field, and a sector's last <short> field.
+
+Explanations of all the abbreviations in the table:
+
+Val     The value of the linedef "type" field (#4). If you want them
+	  in numerical order, use SORT or something.
+*       This line function only works in 1.666 and up
+Class   The category of the effect
+Act     Activation. How the linedef's effect is activated.
+n       does NOT require a tag number (see note 5 below)
+W       walk-over activation
+S       switch ("use" - default config is spacebar)
+G       gunfire (pistol, shotgun, chaingun) cross or hit line
+1       the line may be activated once only
+R       potentially repeatable activation
+&       affected sectors "locked out" from further changes. See notes 9/10.
+m       Monster actions can activate the line's effect
+Sound   The type of noise made by moving sectors
+Speed   How quickly a floor moves up/down etc.
+Tm      Time - how long it "rests"; doors "rest" when they've gone as
+	  high as they're going to go, lifts "rest" at the bottom, etc.
+Chg     Change - some of them cause a floor texture change and/or special
+	  sector change. See note 11 below.
+T       Trigger model, see note 11 below.
+N       Numeric model, see note 11 below.
+X       Floor texture is transferred, and Sector type 0.
+P       Special Sector types 4, 5, 7, 9, 11, 16 transfer.
+Effect  What happens to the affected sector(s).
+open    The ceiling goes (up) to LEC-4.
+close   The ceiling goes (down) to the floor level.
+up      Will move up at specified speed if the destination is above.
+	  If the destination is below, it arrives there instantly.
+down    Will move down at specified speed if the destination is below.
+	  If the destination is above, it arrives there instantly.
+open/   The door can be activated while moving. If it's open or opening,
+  close   it closes. If it's closed or closing, it opens, then pauses,
+	  then closes.
+open,   The door can only be activated if it is in the closed state.
+  close   It opens, pauses, then closes.
+lift    The floor goes down to LIF, rests, then back up to original height.
+L       lowest
+H       highest
+C       ceiling
+F       floor
+E       adjacent sectors, excluding the affected sector
+I       adjacent sectors, including the affected sector
+nh      next-higher, i.e. LEF that is higher than source.
+
+  More notes and longer discussions related to these terms:
+
+1.  "Adjacent" is any sector that shares a LINEDEF with the tagged sector
+(sectors are adjacent to themselves).
+2.  All S activations and the teleporters only work from the RIGHT side
+of the linedef.
+3.  For teleporters, if more than 1 sector is tagged the same and each
+has a teleport landing THING, then the lowest numbered sector is the
+destination.
+4.  Floors that raise up an absolute height (up 24, 32) will go up INTO
+ceilings, so using the WR and SR types of these in levels is unwise.
+5.  A few of the linedef types don't require tag numbers: the end-level
+switches, the scrolling wall type 48 (0x30), and the "manual" doors which
+operate on the sector facing the left side of the linedef with the manual
+door line type.
+666.  Here's the terms id uses for different types of activations:
+	Manual: nSR and nS1 doors
+	Trigger: W1
+	Retrigger: WR
+	Switch: S1
+	Button: SR
+	Impact: G
+	Effect: line 48 is the only one
+7.  The "moving floors" go up to a maximum of HIF and go down to a minimum
+of LIF. Why they sometimes go up first and sometimes down is still a
+mystery to me.
+8.  The "crushing ceilings" go from their original ceiling height down
+to (floor + 8), then back up. While crushing a creature, their downward
+speed slows considerably. "Fast hurt" does about 120% total damage per
+crush, and "slow hurt" grabs you and does somewhere around 1000-2000%
+total damage per crush.
+9.  The & symbol indicates that a sector cannot be affected any more by
+other line types after it has performed this effect, even if it has
+finished. These are the floor-texture-changers and... (keep reading)
+10. Moving floors and crushing ceilings also "lock out" further changes
+to the sectors affected, EXCEPT for restarting the moving floor or
+crushing ceiling. If a line triggers a type 6 crushing ceiling in a
+sector, then it is stopped, then ANY other line with a "crush" type that
+is tagged to the same sector will cause the type 6 crusher to start
+again, with its original maximum and minimum ceiling heights.
+11. Some line types cause floor textures and/or some special sector types
+(see [4-9-1]) to transfer to the tagged sector. The tagged sectors' floor
+and/or special sector (SS) type will change to match that of the "model"
+sector. The TRIGGER model gets the info from the sector that the
+activating line's right side faces. The NUMERIC model gets the info
+from the sector on the other side of the lowest numbered two-sided
+linedef that has one side in the tagged sector.
+  All of these "change" line types transfer the floor texture. Also,
+they all can pass a special sector trait of "0" or "nothing", i.e. if
+the destination is an acid-floor or "damaging" sector, then any of these
+lines can erase the damaging effect. Lines 59, 93, 37, 84, and 9 (see
+note 12 for more specifics on line type 9) also have the ability to
+transfer the "secret" trait of SS 9, and the damaging traits of SS
+4, 5, 7, 11, and 16. None of the "blinking light" effects of SSs can be
+transferred. SS 4 "blinks" and causes damage, but only the damaging part
+can be transferred. SS 11 also turns off god-mode and causes a level END
+when health <11%, this characteristic is part of SS 11, and cannot be
+isolated via fancy transfers.
+12. Line type 9 is a special one. The definitive example is the chainsaw
+pillar on E1M2. Take the lowest-numbered linedef that has a sidedef in
+the tagged sector. If that linedef is one-sided, nothing happens. If it
+is 2-sided, then the tagged sector's floor will move down to match the
+2nd sector's floor height (or it will jump instantly up if it was below,
+like other floors that are supposed to move "down").
+  If this 2nd sector CONTAINS the tagged sector, i.e. all the linedefs
+with a sidedef in the tagged sector have their other sidedef in the 2nd
+sector, then this 2nd sector is the "donut". This donut's floor will
+move "up" to match the floor height of the sector on the other side of
+the DONUT's lowest-numbered linedef, excluding those linedefs that are
+shared with the "donut hole" central sector. Also, the donut will undergo
+a floor texture change and special sector type change to match the
+"outside". The donut sector does not have to be completely surrounded
+by another sector (i.e. it can have 1-sided linedefs), but if its
+lowest-numbered linedef is not 2-sided, a minor glitch results: the donut
+and the donut-hole both move to a strange height, and the donut changes
+floor texture to TLITE6_6 - the last flat in the directory.
+  Note that if the donut hole and the donut are both going to move, the
+donut hole is going to move to match the height that the donut is "going
+to". In other words, the whole thing will be at a single height when
+they're done, and this is the height of the "outside" sector that borders
+the donut.
+  Whew!
+13. Line types 30 and 96, "up ShortestLowerTexture" means that affected
+sector(s) floors go up a number of units equal to the height of the
+shortest "lower" texture facing out from the sector(s).
+14. STAIRS. Any sector tagged to a stair-raiser line will go up 8. Now
+find the lowest-numbered 2-sided linedef whose RIGHT side faces this
+sector (the first step). The sector on the other side of the lindedef
+becomes the next step, and its floor height changes to be 8 above the
+previous step (it raises up if it was lower, or it changes instantly if
+it was higher). This process continues as long as there are 2-sided
+lines with right sides facing each successive step. A couple things
+will stop the stairway:
+    (a) no 2-sided linedef whose right side faces the current step
+    (b) a sector with a different floor texture
+    (c) a sector that has already been moved by this stairway (this stops
+	  ouroboros stairways that circle around to repeat themselves)
+    (d) "locked-out" sectors that can't change their floor height anymore
+  The component steps of a stairway can have any shape or size.
+  The turbo stairs (100, 127) work just like regular stairs except that
+each step goes up 16 not 8, and rising steps can crush things between
+themselves and the ceiling.
+15. Line types 78 and 85 do NOTHING as of version 1.666.
+
+
+
+Val   Class Act  Sound Speed Tm Chg Effect
+
+SPECIAL (Continuous effect, doesn't need triggereing)
+
+ 48   Spec  n--  -     -     -  -   Scrolling wall
+
+LOCAL DOORS ("MANUAL" DOORS)
+
+  1   mDoor nSRm door  med   4  -   open/close
+ 26   mDoor nSR  door  med   4  -   open/close BLUE KEY
+ 28   mDoor nSR  door  med   4  -   open/close RED KEY
+ 27   mDoor nSR  door  med   4  -   open/close YELLOW KEY
+ 31   mDoor nS1  door  med   -  -   open
+ 32   mDoor nS1  door  med   -  -   open BLUE KEY
+ 33   mDoor nS1  door  med   -  -   open RED KEY
+ 34   mDoor nS1  door  med   -  -   open YELLOW KEY
+ 46   mDoor nGR  door  med   -  -   open
+117 * mDoor nSR  blaze turbo 4  -   open/close
+118 * mDoor nS1  blaze turbo -  -   open
+
+REMOTE DOORS
+
+  4   rDoor  W1  door  med   4  -   open,close
+ 29   rDoor  S1  door  med   4  -   open,close
+ 90   rDoor  WR  door  med   4  -   open,close
+ 63   rDoor  SR  door  med   4  -   open,close
+  2   rDoor  W1  door  med   -  -   open
+103   rDoor  S1  door  med   -  -   open
+ 86   rDoor  WR  door  med   -  -   open
+ 61   rDoor  SR  door  med   -  -   open
+  3   rDoor  W1  door  med   -  -   close
+ 50   rDoor  S1  door  med   -  -   close
+ 75   rDoor  WR  door  med   -  -   close
+ 42   rDoor  SR  door  med   -  -   close
+ 16   rDoor  W1  door  med   30 -   close, then opens
+ 76   rDoor  WR  door  med   30 -   close, then opens
+108 * rDoor  W1  blaze turbo 4  -   open,close
+111 * rDoor  WR  blaze turbo 4  -   open,close
+105 * rDoor  S1  blaze turbo 4  -   open,close
+114 * rDoor  SR  blaze turbo 4  -   open,close
+109 * rDoor  W1  blaze turbo -  -   open
+112 * rDoor  S1  blaze turbo -  -   open
+106 * rDoor  WR  blaze turbo -  -   open
+115 * rDoor  SR  blaze turbo -  -   open
+110 * rDoor  W1  blaze turbo -  -   close
+113 * rDoor  S1  blaze turbo -  -   close
+107 * rDoor  WR  blaze turbo -  -   close
+116 * rDoor  SR  blaze turbo -  -   close
+133 * rDoor  S1  blaze turbo -  -   open BLUE KEY
+ 99 * rDoor  SR  blaze turbo -  -   open BLUE KEY
+135 * rDoor  S1  blaze turbo -  -   open RED KEY
+134 * rDoor  SR  blaze turbo -  -   open RED KEY
+137 * rDoor  S1  blaze turbo -  -   open YELLOW KEY
+136 * rDoor  SR  blaze turbo -  -   open YELLOW KEY
+
+CEILINGS
+
+ 40   Ceil   W1  mover slow  -  -   up to HEC
+ 41   Ceil   S1  mover slow  -  -   down to floor
+ 43   Ceil   SR  mover slow  -  -   down to floor
+ 44   Ceil   W1  mover slow  -  -   down to floor + 8
+ 49   Ceil   S1  mover slow  -  -   down to floor + 8
+ 72   Ceil   WR  mover slow  -  -   down to floor + 8
+
+LIFTS
+
+ 10   Lift   W1  lift  fast  3  -   lift
+ 21   Lift   S1  lift  fast  3  -   lift
+ 88   Lift   WRm lift  fast  3  -   lift
+ 62   Lift   SR  lift  fast  3  -   lift
+121 * Lift   W1  lift  turbo 3  -   lift
+122 * Lift   S1  lift  turbo 3  -   lift
+120 * Lift   WR  lift  turbo 3  -   lift
+123 * Lift   SR  lift  turbo 3  -   lift
+
+FLOORS
+
+119 * Floor  W1  mover slow  -  -   up to nhEF
+128 * Floor  WR  mover slow  -  -   up to nhEF
+ 18   Floor  S1  mover slow  -  -   up to nhEF
+ 69   Floor  SR  mover slow  -  -   up to nhEF
+ 22   Floor  W1& mover slow  -  TX  up to nhEF
+ 95   Floor  WR& mover slow  -  TX  up to nhEF
+ 20   Floor  S1& mover slow  -  TX  up to nhEF
+ 68   Floor  SR& mover slow  -  TX  up to nhEF
+ 47   Floor  G1& mover slow  -  TX  up to nhEF
+  5   Floor  W1  mover slow  -  -   up to LIC
+ 91   Floor  WR  mover slow  -  -   up to LIC
+101   Floor  S1  mover slow  -  -   up to LIC
+ 64   Floor  SR  mover slow  -  -   up to LIC
+ 24   Floor  G1  mover slow  -  -   up to LIC
+130 * Floor  W1  mover turbo -  -   up to nhEF
+131 * Floor  S1  mover turbo -  -   up to nhEF
+129 * Floor  WR  mover turbo -  -   up to nhEF
+132 * Floor  SR  mover turbo -  -   up to nhEF
+ 56   Floor  W1& mover slow  -  -   up to LIC - 8, CRUSH
+ 94   Floor  WR& mover slow  -  -   up to LIC - 8, CRUSH
+ 55   Floor  S1  mover slow  -  -   up to LIC - 8, CRUSH
+ 65   Floor  SR  mover slow  -  -   up to LIC - 8, CRUSH
+ 58   Floor  W1  mover slow  -  -   up 24
+ 92   Floor  WR  mover slow  -  -   up 24
+ 15   Floor  S1& mover slow  -  TX  up 24
+ 66   Floor  SR& mover slow  -  TX  up 24
+ 59   Floor  W1& mover slow  -  TXP up 24
+ 93   Floor  WR& mover slow  -  TXP up 24
+ 14   Floor  S1& mover slow  -  TX  up 32
+ 67   Floor  SR& mover slow  -  TX  up 32
+140 * Floor  S1  mover med   -  -   up 512
+ 30   Floor  W1  mover slow  -  -   up ShortestLowerTexture
+ 96   Floor  WR  mover slow  -  -   up ShortestLowerTexture
+ 38   Floor  W1  mover slow  -  -   down to LEF
+ 23   Floor  S1  mover slow  -  -   down to LEF
+ 82   Floor  WR  mover slow  -  -   down to LEF
+ 60   Floor  SR  mover slow  -  -   down to LEF
+ 37   Floor  W1  mover slow  -  NXP down to LEF
+ 84   Floor  WR  mover slow  -  NXP down to LEF
+ 19   Floor  W1  mover slow  -  -   down to HEF
+102   Floor  S1  mover slow  -  -   down to HEF
+ 83   Floor  WR  mover slow  -  -   down to HEF
+ 45   Floor  SR  mover slow  -  -   down to HEF
+ 36   Floor  W1  mover fast  -  -   down to HEF + 8
+ 71   Floor  S1  mover fast  -  -   down to HEF + 8
+ 98   Floor  WR  mover fast  -  -   down to HEF + 8
+ 70   Floor  SR  mover fast  -  -   down to HEF + 8
+  9   Floor  S1  mover slow  -  NXP donut (see note 12 above)
+
+STAIRS
+
+  8   Stair  W1  mover slow  -  -   stairs
+  7   Stair  S1  mover slow  -  -   stairs
+100 * Stair  W1  mover turbo -  -   stairs (each up 16 not 8) + crush
+127 * Stair  S1  mover turbo -  -   stairs (each up 16 not 8) + crush
+
+MOVING FLOORS
+
+ 53   MvFlr  W1& lift  slow  3  -   start moving floor
+ 54   MvFlr  W1& -     -     -  -   stop moving floor
+ 87   MvFlr  WR& lift  slow  3  -   start moving floor
+ 89   MvFlr  WR& -     -     -  -   stop moving floor
+
+CRUSHING CEILINGS
+
+  6   Crush  W1& crush med   0  -   start crushing, fast hurt
+ 25   Crush  W1& crush med   0  -   start crushing, slow hurt
+ 73   Crush  WR& crush slow  0  -   start crushing, slow hurt
+ 77   Crush  WR& crush med   0  -   start crushing, fast hurt
+ 57   Crush  W1& -     -     -  -   stop crush
+ 74   Crush  WR& -     -     -  -   stop crush
+141 * Crush  W1& none? slow  0  -   start crushing, slow hurt "Silent"
+
+EXIT LEVEL
+
+ 11   Exit  nS-  clunk -     -  -   End level, go to next level
+ 51   Exit  nS-  clunk -     -  -   End level, go to secret level
+ 52   Exit  nW-  clunk -     -  -   End level, go to next level
+124 * Exit  nW-  clunk -     -  -   End level, go to secret level
+
+TELEPORT
+
+ 39   Telpt  W1m tport -     -  -   Teleport
+ 97   Telpt  WRm tport -     -  -   Teleport
+125 * Telpt  W1m tport -     -  -   Teleport monsters only
+126 * Telpt  WRm tport -     -  -   Teleport monsters only
+
+LIGHT
+
+ 35   Light  W1  -     -     -  -   0
+104   Light  W1  -     -     -  -   LE (light level)
+ 12   Light  W1  -     -     -  -   HE (light level)
+ 13   Light  W1  -     -     -  -   255
+ 79   Light  WR  -     -     -  -   0
+ 80   Light  WR  -     -     -  -   HE (light level)
+ 81   Light  WR  -     -     -  -   255
+ 17   Light  W1  -     -     -  -   Light blinks (see [4-9-1] type 3)
+138 * Light  SR  clunk -     -  -   255
+139 * Light  SR  clunk -     -  -   0
+
+
+[4-4]: SIDEDEFS
+===============
+
+  A sidedef is a definition of what wall texture(s) to draw along a
+LINEDEF, and a group of sidedefs outline the space of a SECTOR.
+  There will be one sidedef for a line that borders only one sector
+(and it must be the RIGHT side, as noted in [4-3]). It is not
+necessary to define what the doom player would see from the other
+side of that line because the doom player can't go there. The doom
+player can only go where there is a sector.
+  Each sidedef's record is 30 bytes, comprising 2 <short> fields, then
+3 <8-byte string> fields, then a final <short> field:
+
+(1) X offset for pasting the appropriate wall texture onto the wall's
+	"space": positive offset moves into the texture, so the left
+	portion gets cut off (# of columns off left side = offset).
+	Negative offset moves texture farther right, in the wall's space.
+(2) Y offset: analogous to the X, for vertical.
+(3) "upper" texture name: the part above the juncture with a lower
+	ceiling of an adjacent sector.
+(4) "lower" texture name: the part below a juncture with a higher
+	floored adjacent sector.
+(5) "middle" texture name: the regular part of the wall. Also known as
+	"normal" or "full" texture.
+(6) SECTOR that this sidedef faces or helps to surround.
+
+  The texture names are from the TEXTURE1/2 resources. The names of
+wall patches in the directory (between P_START and P_END) are not
+directly used, they are referenced through the PNAMES lump.
+  Simple sidedefs have no upper or lower texture, and so they will have
+"-" instead of a texture name. Also, two-sided lines can be transparent,
+in which case "-" means transparent (no texture).
+  If the wall is wider than the texture to be pasted onto it, then the
+texture is tiled horizontally. A 64-wide texture will be pasted at 0,
+64, 128, etc., unless an X-offset changes this.
+  If the wall is taller than the texture, than the texture is tiled
+vertically, with one very important difference: it starts new tiles
+ONLY at 128, 256, 384, etc. So if the texture is less than 128 high,
+there will be junk filling the undefined areas, and it looks ugly.
+This is sometimes called the "Tutti Frutti" effect.
+
+  There are some transparent textures which can be used as middle textures
+on 2-sided sidedefs (between sectors). These textures need to be composed
+of a single patch (see [8-4]), and note that on a very tall wall, they
+will NOT be tiled. Only one will be placed, at the spot determined by
+the "lower unpegged" flag being on/off and the sidedef's y offset. And
+if a transparent texture is used as an upper or lower texture, then
+the good old "Tutti Frutti" effect will have its way.
+  Also note that animated wall textures (see [8-4-1]) do NOT animate
+if they are the "middle" texture on a 2-sided line. So much for the
+lava waterfall with the hidden room at its base...hmm, maybe not...
+
+
+[4-5]: VERTEXES
+===============
+
+  These are the beginning and end points for LINEDEFS and SEGS. Each
+vertice's record is 4 bytes in 2 <short> fields:
+
+(1) X coordinate
+(2) Y coordinate
+
+  On the automap within the game, with the grid on (press 'G'), the
+lines are 128 apart (0x80), two lines = 256 (0x100).
+  A note on the coordinates: the coordinate system used for the vertices
+and the heights of the sectors corresponds to pixels, for purposes of
+texture-mapping. So a sector that's 128 high, or a multiple of 128, is
+pretty typical, since many wall textures are 128 pixels high.
+  And yes, the correct spelling of the plural of "vertex" is "vertices".
+
+
+[4-6]: SEGS
+===========
+
+  The SEGS are stored in a sequential order determined by the SSECTORS,
+which are part of the NODES recursive tree.
+  Each seg is 12 bytes in 6 <short> fields:
+
+(1) start of seg is VERTEX with this number
+(2) end VERTEX
+(3) angle: 0= east, 16384=north, -16384=south, -32768=west.
+      In hex, it's 0000=east, 4000=north, 8000=west, c000=south.
+      This is also know as BAMS for Binary Angle Measurement.
+(4) LINEDEF that this seg goes along
+(5) direction: 0 if the seg goes the same direction as the linedef it
+      is on, 1 if the seg goes the opposite direction. This is the
+      same as (0 if the seg is on the RIGHT side of the linedef) or
+      (1 if the seg is on the LEFT side of the linedef).
+(6) offset: distance along the linedef to the start of this seg (the
+      vertex in field 1). The offset is in the same direction as the
+      seg. If field 5 is 0, then the distance is from the "start"
+      vertex of the linedef to the "start" vertex of the seg. If field
+      5 is 1, then the offset is from the "end" vertex of the linedef
+      to the "start" vertex of the seg. So if the seg begins at one of
+      the two endpoints of the linedef, this offset will be 0.
+
+  For diagonal segs, the offset distance can be obtained from the
+formula DISTANCE = SQR((x2 - x1)^2 + (y2 - y1)^2). The angle can be
+calculated from the inverse tangent of the dx and dy in the vertices,
+multiplied to convert PI/2 radians (90 degrees) to 16384. And since
+most arctan functions return a value between -(pi/2) and (pi/2),
+you'll have to do some tweaking based on the sign of (x2-x1), to
+account for segs that go "west".
+
+
+[4-7]: SSECTORS
+===============
+
+  SSECTOR stands for sub-sector. These divide up all the SECTORS into
+convex polygons. They are then referenced through the NODES resources.
+There will be (number of nodes + 1) ssectors.
+  Each ssector is 4 bytes in 2 <short> fields:
+
+(1) This many SEGS are in this SSECTOR...
+(2) ...starting with this SEG number
+
+  The segs in ssector 0 should be segs 0 through x, then ssector 1
+contains segs x+1 through y, ssector 2 containg segs y+1 to z, etc.
+
+
+[4-8]: NODES
+============
+
+  A detailed explanation of the nodes follows this list of a node's
+structure in the wad file.
+  Each node is 28 bytes in 14 <short> fields:
+
+(1)  X coordinate of partition line's start
+(2)  Y coordinate of partition line's start
+(3)  DX, change in X to end of partition line
+(4)  DY, change in Y to end of partition line
+
+  If (1) to (4) equaled 64, 128, -64, -64, the partition line would
+go from (64,128) to (0,64).
+
+(5)  Y upper bound for right bounding-box.\
+(6)  Y lower bound                         All SEGS in right child of node
+(7)  X lower bound                         must be within this box.
+(8)  X upper bound                        /
+(9)  Y upper bound for left bounding box. \
+(10) Y lower bound                         All SEGS in left child of node
+(11) X lower bound                         must be within this box.
+(12) X upper bound                        /
+(13) a NODE or SSECTOR number for the right child. If bit 15 of this
+       <short> is set, then the rest of the number represents the
+       child SSECTOR. If not, the child is a recursed node.
+(14) a NODE or SSECTOR number for the left child.
+
+  The NODES lump is by far the most difficult to understand of all the
+data structures in DOOM. A new level won't display right without a valid
+set of precalculated nodes, ssectors, and segs.
+  Here I will explain what the nodes are for, and how they can be
+generated automatically from the set of linedefs, sidedefs, and
+vertices. I am NOT including any code or a pseudo-code algorithm, like
+I do for the BLOCKMAP (appendix [A-3]). This is for reasons of space,
+and more importantly, the fact that I haven't written any such
+algorithm myself. If there's to be some "node code" published here, it
+will have to be donated by someone, well-commented, well-organized, in
+pseudo-code, and 100% effective! So the odds are long against it.
+
+  The NODES are branches in a binary space partition (BSP) that divides
+up the level and is used to determine which walls are in front of others,
+a process know as hidden-surface removal. The SSECTORS (sub-sectors) and
+SEGS (segments) lumps are necessary parts of the structure.
+  A BSP tree is normally used in 3d space, but DOOM uses a simplified
+2d version of the scheme. Basically, the idea is to keep dividing the
+map into smaller spaces until each of the smallest spaces contains only
+wall segments which cannot possibly occlude (block from view) other
+walls in its own space. The smallest, undivided spaces will become
+SSECTORS. Each wall segment is part or all of a linedef (and thus a
+straight line), and becomes a SEG. All of the divisions are kept track
+of in a binary tree structure, which is used to greatly speed the
+rendering process (drawing what is seen). How does this binary tree
+lead to faster rendering? I have no idea.
+  Only the SECTORS need to be divided. The parts of the levels that are
+"outside" sectors are ignored. Also, only the walls need to be kept
+track of. The sides of any created ssectors which are not parts of
+linedefs do not become segs.
+  Some sectors do not require any dividing. Consider a square sector.
+All the walls are orthogonal to the floor (the walls are all straight
+up and down), so from any viewpoint inside the square, none of its
+four walls can possibly block the view of any of the others. Now
+imagine a sector shaped like this drawing:
+
++--------------.------+   The * is the viewpoint, looking ->, east. The
+|               .     |   diagonal wall marked @ @ can't be seen at all,
+|               /\    |@  and the vertical wall marked @@@ is partially
+|  *->        /   @\  |@  occluded by the other diagonal wall. This sector
+|           /       @\|@  needs to be divided. Suppose the diagonal wall
++---------/               is extended, as shown by the two dots (..):
+
+now each of the two resulting sub-sectors are sufficient, because while
+in either one, no wall that is part of that sub-sector blocks any other.
+  In general, being a convex polygon is the goal of a ssector. Convex
+means a line connecting any two points that are inside the polygon will
+be completely contained in the polygon. All triangles and rectangles are
+convex, but not all quadrilaterals. In doom's simple Euclidean space,
+convex also means that all the interior angles of the polygon are less
+than or equal to 180 degrees.
+  Now, an additional complication arises because of the two-sided
+linedef. Its two sides are in different sectors, so they will end up
+in different ssectors too. Thus every two-sided linedef becomes two segs
+(or more), or you could say that every sidedef becomes a seg. Creating
+segs from sidedefs is a good idea, because the seg can then be associated
+with a sector. Two segs that aren't part of the same sector cannot
+possibly be in the same ssector, so further division is required of any
+set of segs that aren't all from the same sector.
+  Whenever a division needs to be made, a SEG is picked, somewhat
+arbitrarily, which along with its imaginary extensions, forms a "knife"
+that divides the remaining space in two (thus binary). This seg is the
+partition line of a node, and the remaining spaces on either side of
+the partition line become the right and left CHILDREN of the node. All
+partition lines have a direction, and the space on the "right" side of
+the partition is the right child of the node; the space on the "left"
+is the left child (there's a cute sketch in [4-3]: LINEDEFS that shows
+how right and left relate to the start and end of a line). Note that if
+there does not exist a seg in the remaining space which can serve as a
+partition line, then there is no need for a further partition, i.e.
+it's a ssector and a "leaf" on the node tree.
+  If the "knife" passes through any lines/segs (but not at vertices),
+they are split at the intersection, with one part going to each child.
+A two-sided linedef, which is two segs, when split results in four segs.
+A two sider that lies along an extension of the partition line has each
+of its two segs go to opposite sides of the partition line. This is the
+eventual fate of ALL segs on two-sided linedefs.
+  As the partition lines are picked and the nodes created, a strict
+ordering must be maintained. The node tree is created from the "top"
+down. After the first division is made, then the left child is divided,
+then its left child, and so on, until a node's child is a ssector. The
+n you move back up the tree one branch, and divide the right child, then
+its left, etc. ALWAYS left first, on the way down.
+  Since there will be splits along the way, there is no way to know
+ahead of time how many nodes and ssectors there will be at the end.
+And the top of the tree, the node that is created first, is given the
+highest number. So as nodes and ssectors are created, they are simply
+numbered in order from 0 on up, and when it's all done (nothing's left
+but ssectors), then ALL the numbers, for nodes and ssectors, are
+reversed. If there's 485 nodes, then 485 becomes 0 and 0 becomes 485.
+  Here is another fabulous drawing which will explain everything.
++ is a vertex, - and | indicate linedefs, the . . indicates an
+extension of a partition line. The <, >, and ^ symbols indicate the
+directions of partition lines. All the space within the drawing is
+actual level space, i.e. sectors.
+
+      +-----+-------+-------+            0                     (5)
+      |     |       |       |         /     \      ==>       /     \
+      |  e  |^  f   |^  g   |       1         4           (4)       (1)
+      |     |4      |5      |     /   \      / \         /   \      / \
++---- + . . +-------+-------+    2     3    e   5      (3)   (2)   2  (0)
+|     |           < 0       |   / \   / \      / \     / \   / \      / \
+|  a  |       b             |  a   b c   d    f   g   6   5 4   3    1   0
+|     |^                    |
+| . . |2. . . . . +---------+ The order in which      How the elements are
+|     |           |1 >        the node tree's         numbered when it's
+|  c  |^    d     |           elements get made.      finished.
+|     |3          |           0 = node                (5) = node
++-----+-----------+           a = ssector             6 = ssector
+
+  1. Make segs from all the linedefs. There are 5 two-sided lines here.
+  2. Pick the vertex at 0 and go west (left). This is the first
+       partition line. Note the . . extension line.
+  3. Pick the vertex at 1, going east. The backwards extension . . cuts
+       the line 3>2>, and the unlabeled left edge line. The left edge
+       was one seg, it becomes two. The 3>2> line was two segs, it
+       becomes four. New vertices are created at the intersection
+       points to do this.
+  4. Pick the (newly created) vertex at 2. Now the REMAINING spaces on
+       both sides of the partition line are suitable for ssectors. The
+       left one is first, it becomes a, the right b. Note that ssector
+       a has 3 segs, and ssector b has 5 segs. The . . imaginary lines
+       are NOT segs.
+  5. Back up the tree, and take 1's right branch. Pick 3. Once again, we
+       can make 2 ssectors, c and d, 3 segs each. Back up the tree to 0.
+  6. Pick 4. Now the left side is a ssector, it becomes e. But the right
+       side is not, it needs one more node. Pick 5, make f and g.
+  7. All done, so reverse all the ordination of the nodes and the
+       ssectors. Ssector 0's segs become segs 0-2, ssector 1's segs
+       become segs 3-7, etc. The segs are written sequentially according
+       to the ssector numbering.
+
+  If we want to create an algorithm to do the nodes automatically, it
+needs to be able to pick partition lines automatically. From studying
+the original maps, it appears that they usually chose a linedef which
+divides the child's space roughly in "half". This is restricted by the
+availability of a seg in a good location, with a good angle. Also, the
+"half" refers to the total number of ssectors in any particular child,
+which we have no way of knowing when we start! Optimization methods are
+probably used, or maybe brute force, trying every candidate seg until
+the "best" one is found.
+  What is the best possible choice for a partition line? Well, there
+are apparently two goals when creating a BSP tree, which are partially
+exclusive. One is to have a balanced tree, i.e. for any node, there are
+about the same total number of sub-nodes on either side of it. The other
+goal is to minimize the number of "splits" necessary, in this case, the
+number of seg splits needed, along with the accompanying new vertices
+and extra segs. Only a very primitive and specially constructed set of
+linedefs could avoid having any splits, so they are inevitable. It's
+just that with some choices of partition lines, there end up being
+fewer splits. For example,
+
++--------------+       If a and b are chosen as partition lines,
+|              |       there will be four extra vertices needed,
++---+      +---+ < A   and this shape becomes five ssectors and
+    |^    ^|           16 segs. If A and B are chosen, however,
++---+a    b+---+ < B   there are no extra vertices, and only three
+|              |       ssectors and 12 segs.
++--------------+
+
+  I've read that for a "small" number of polygons (less than 1000?),
+which is what we're dealing with in a doom level, one should definitely
+try to minimize splits, and not worry about balancing the tree. I can't
+say for sure, but it does appear that the original levels strive for
+this. Their trees are not totally unbalanced, but there are some parts
+where many successive nodes each have a node and a ssector as children
+(this is unbalanced). And there are a lot of examples to prove that the
+number of extra segs and vertices they create is very low compared to
+what it could be. I think the algorithm that id Software used tried to
+optimize both, but with fewer splits being more important.
+
+
+[4-9]: SECTORS
+==============
+
+  A SECTOR is a horizontal (east-west and north-south) area of the map
+where a floor height and ceiling height is defined. It can have any
+shape. Any change in floor or ceiling height or texture requires a
+new sector (and therefore separating linedefs and sidedefs). If you
+didn't already know, this is where you find out that DOOM is in many
+respects still a two-dimensional world, because there can only be ONE
+floor height in each sector. No buildings with two floors, one above
+the other, although fairly convincing illusions are possible.
+  Each sector's record is 26 bytes, comprising 2 <short> fields, then
+2 <8-byte string> fields, then 3 <short> fields:
+
+(1) Floor is at this height for this sector
+(2) Ceiling height
+(3) name of the flat used for the floor texture, from the directory.
+(4) name of the flat used for the ceiling texture.
+      All the flats in the directory between F_START and F_END work
+      as either floors or ceilings.
+(5) lightlevel of this sector: 0 = total dark, 255 (0xff) = maximum
+      light. There are actually only 32 brightnesses possible (see
+      COLORMAP [8-2]), so 0-7 are the same, ..., 248-255 are the same.
+(6) special sector: see [4-9-1] immediately below.
+(7) a "tag" number corresponding to LINEDEF(s) with the same tag
+      number. When that linedef is activated, something will usually
+      happen to this sector - its floor will rise, the lights will
+      go out, etc. See [4-3-2] for the list of linedef effects.
+
+
+[4-9-1]: Special Sector Types
+-----------------------------
+
+  Bytes 22-23 of each Sector record are a <short> which determines
+some area-effects called special sectors.
+  Light changes are automatic. The brightness level will alternate
+between the light value specified for the special sector, and the lowest
+value amongst adjacent sectors (two sectors are adjacent if a linedef
+has a sidedef facing each sector). If there is no lower light value,
+or no adjacent sectors, then the "blink" sectors will instead alternate
+between 0 light and their own specified light level. The "oscillate"
+special (8) does nothing if there is no lower light level.
+  "blink off" means the light is at the specified level most of the time,
+and changes to the lower value for just a moment. "blink on" means the
+light is usually at the lower value, and changes to the sector's value
+for just a moment. Every "synchronized" blinking sector on the level
+will change at the same time, whereas the unsynchonized blinking sectors
+change independently. "oscillate" means the light level goes smoothly
+from the lower to the higher and back; it takes about 2 seconds to go
+from maximum to minimum and back (255 down to 0 back up to 255).
+  The damaging sector types only affect players, monsters suffer no ill
+effects from them whatsoever. Players will only take damage when they
+are standing on the floor of the damaging sector. "-10/20%" means that
+the player takes 20% damage at the end of every second that they are in
+the sector, except at skill 1, they will take 10% damage. If the player
+has armor, then the damage is split between health and armor.
+
+Dec Hex Class   Condition or effect
+
+ 0  00  -       Normal, no special characteristic.
+ 1  01  Light   random off
+ 2  02  Light   blink 0.5 second
+ 3  03  Light   blink 1.0 second
+ 4  04  Both    -10/20% health AND light blink 0.5 second
+ 5  05  Damage  -5/10% health
+ 7  07  Damage  -2/5% health
+ 8  08  Light   oscillates
+ 9  09  Secret  a player must stand in this sector to get credit for
+		  finding this secret. This is for the SECRETS ratio
+		  on inter-level screens.
+10  0a  Door    30 seconds after level start, ceiling closes like a door.
+11  0b  End     -10/20% health. If a player's health is lowered to less
+		  than 11% while standing here, then the level ends! Play
+		  proceeds to the next level. If it is a final level
+		  (levels 8 in DOOM 1, level 30 in DOOM 2), the game ends!
+12  0c  Light   blink 0.5 second, synchronized
+13  0d  Light   blink 1.0 second, synchronized
+14  0e  Door    300 seconds after level start, ceiling opens like a door.
+16  10  Damage  -10/20% health
+
+  The following value can only be used in versions 1.666 and up, it will
+cause an error and exit to DOS in version 1.2 and earlier:
+
+17  11  Light   flickers on and off randomly
+
+  All other values cause an error and exit to DOS. This includes these
+two values which were developed and are quoted by id as being available,
+but are not actually implemented in DOOM.EXE (as of version 1.666):
+
+ 6  06  -       crushing ceiling
+15  0f  -       ammo creator
+
+  What a shame! The "ammo creator" sounds especially interesting!
+
+
+[4-10]: REJECT
+==============
+
+  The REJECT lump is used to help speed play on large levels. It can
+also be used for some special effects like monsters in plain sight who
+CANNOT attack or see players.
+  The size of a REJECT in bytes is (number of SECTORS ^ 2) / 8, rounded
+up. It is an array of bits, with each bit controlling whether monsters
+in a given sector can detect and/or attack players in another sector.
+  Make a table of sectors vs. sectors, like this:
+
+	 sector that the player is in
+	        0  1  2  3  4
+	    +---------------
+sector    0 | 0  1  0  0  0
+that      1 | 1  0  1  1  0
+the       2 | 0  1  0  1  0
+monster   3 | 0  1  1  1  0
+is in     4 | 0  0  1  0  0
+
+  A 1 means the monster cannot become activated by seeing a player, nor
+can it attack the player. A 0 means there is no restriction. All non-
+deaf monsters still become activated by weapon sounds that they hear
+(including the bare fist!). And activated monsters will still pursue
+the player, but they will not attack if their current sector vs. sector
+bit is "1". So a REJECT that's set to all 1s gives a bunch of pacifist
+monsters who will follow the player around and look menacing, but never
+actually attack.
+  How the table turns into the REJECT resource:
+  Reading left-to-right, then top-to-bottom, like a page, the first bit
+in the table becomes bit 0 of byte 0, the 2nd bit is bit 1 of byte 0,
+the 9th bit is bit 0 of byte 1, etc. So if the above table represented
+a level with only 5 sectors, its REJECT would be 4 bytes:
+
+10100010 00101001 01000111 xxxxxxx0 (hex A2 29 47 00, decimal 162 41 71 0)
+
+  In other words, the REJECT is a long string of bits which are read
+from least significant bit to most significant bit, according to the
+lo-hi storage scheme used in a certain "x86" family of CPUs.
+  Usually, if a monster in sector A can't detect a player in sector B,
+then the reverse is true too, thus if sector8/sector5 is set, then
+sector5/sector8 will be set also. Same sector prohibitions, e.g. 0/0,
+3/3, etc. are only useful for special effects (pacifist monsters), or
+for tiny sectors that monsters can't get to anyway.
+
+  The REJECT array was designed to speed the monster-detection process.
+If a sector pair is prohibited, the game engine doesn't even bother
+checking line-of-sight feasibility for the monster to "see" the player
+and consider attacking. When a level has hundreds of monsters and
+hundreds of sectors, a good REJECT can prevent the drastic slowdowns
+that might otherwise occur (even fast CPUs can fall victim to this
+phenomenon).
+
+
+[4-11]: BLOCKMAP
+================
+
+  The BLOCKMAP is a pre-calculated structure that the game engine uses
+to simplify collision-detection between moving things and walls. If a
+level doesn't have a blockmap, it will display fine, but everybody walks
+through walls, and no one can hurt anyone else.
+  A concise definition of the BLOCKMAP is in appendix [A-1]. This is
+the full explanation of it.
+  The whole level is cut into "blocks", each is a 128 (hex 80) wide
+square (the grid lines in the automap correspond to these blocks). The
+BLOCKMAP is a collection of lists, one list for each block, which say
+what LINEDEFS are wholly or partially in that block (i.e. part of the
+line passes through the block). When the game engine needs to check
+for an object/wall collision (to prevent a player from walking through
+a wall or to explode a rocket when it hits a wall, etc.), it just looks
+up the blocklist for the block that the object is in. This tells it
+which linedefs it needs to check for collisions. Most blocks will have
+few if any lines in them, so there will be a substantial savings in
+processor time if it only checks a couple linedefs per object instead
+of a thousand or so linedefs per object - it would have to check every
+single linedef on the level if not for these blocklists.
+  The blocks are also used for object/object collisions, but that is
+not visible in the WAD format. During play, each block is also given a
+dynamic "thing list", which tells what THINGS are currently in that
+block. Again, this negates the need to check every moving object vs.
+every other object for collisions - only a few need be tested.
+  The BLOCKMAP is composed of three parts: the header, the offsets, and
+the blocklists.
+  The 8-byte header contains 4 short integers:
+
+(1)     X coordinate of block-grid origin
+(2)     Y coordinate of block-grid origin
+(3)     # of columns (blocks in X direction)
+(4)     # of rows (blocks in Y direction)
+
+  The block-grid origin is the bottom-left corner of the bottom-left
+(southwest) block. id's blockmap builder this origin point at 8 less
+than the minimum values of x and y achieved in any vertex on the level.
+  The number of columns and rows needs to be sufficient to contain
+every linedef in the level. If there are linedefs outside the blockmap,
+it will not be able to prevent monsters or players from crossing those
+linedefs, which can cause problems, including the hall of mirrors effect.
+
+  There are N blocks, N = (number of columns * number of rows). Each
+block has a blocklist and an offset to that blocklist. Immediately
+following the 8-byte header are N unsigned short integers. The first
+is the offset in short-ints NOT bytes, from the start of the BLOCKMAP
+lump to the start of the first blocklist. The last offset points to
+blocklist (N-1), the last blocklist. Note that all these offsets are
+UNSIGNED, so they can point to a location 65535 shorts (131070 bytes)
+into the BLOCKMAP. If they were signed, they could only go up to 32767.
+  The blocks are numbered going east (right) first, then north (up).
+Block 0 is at the southwest corner (row 0, column 0). Block 1 is at
+row 0, column 1. If there are 37 columns, then block 38 is at row 1,
+column 0, etc.
+
+  After the offsets come the blocklists. Each blocklist starts with
+a short-int 0 (0x0000) and ends with a short-int -1 (0xffff). In between
+are the numbers of every linedef which has any portion whatsoever in the
+128 x 128 coordinate area of that block. If the block-grid origin is at
+(0,0), then the first column is X = 0 to 127 inclusive, the second column
+is X = 128 to 255 inclusive, etc. So a vertical line with X = 128 which
+might seem to be on the border of two columns of blocks is actually only
+in the easternmost/rightmost column. Likewise for the rows.
+  The first linedef in the LINEDEFS lump is linedef number 0, and so on.
+An "empty" block's blocklist only has the two shorts 0 and -1. A non-
+empty block might have this as its blocklist: 0 330 331 333 -1. This
+means that linedefs 330, 331, and 333 have some part of them pass through
+this block. A block that has linedef 0 in it will go: 0 0 .. etc .. -1.
+
+  There is an upper limit to how big a BLOCKMAP can be. Even empty
+blocklists require at least 3 shorts - the 0, the -1, and the offset to
+the blocklist. The offsets are unsigned shorts, which would imply a
+maximum value of short #65535 ( = byte 131070) for the start of the last
+blocklist. At a little over 6 bytes per blocklist, that would be a maximum
+of around 21000 blocks (145 by 145 blocks, 18560 in coordinates). But the
+actual limit is less. Experiments suggest that the maximum total size of
+all the blocklists, not counting the offsets, is 65535 bytes. This limits
+a minimalist level to around 120 blocks square (15360 in coordinates),
+or a realistically complex level to around 100 blocks square (12800 in
+coordinates).
+
+
+---------------------
+CHAPTER [5]: Graphics
+---------------------
+
+  The great majority of the entries in the directory reference lumps
+that are in a special picture format. The same format is used for the
+sprites (monsters, items), the wall patches, and various miscellaneous
+pictures for the status bar, menu text, inter-level map, etc. Every
+one of these picture lumps contains exactly one picture. The flats
+(floor and ceiling pictures) are NOT in this format, they are raw data;
+see chapter [6].
+  A great many of these lumps are used in sprites. A "sprite" is the
+picture or pictures necessary to display any of the THINGS. Some of
+them are simple, a single lump like SUITA0. Most of the monsters have
+50 or more lumps.
+  The first four letters of these lumps are the sprite's "name". TROO
+is for imps, BKEY is for the blue key, and so on. See [4-2-1] for a list
+of them all. The fifth letter in the lump is an indication of what "frame"
+it is, for animation sequences. The letters correspond to numbers, ASCII
+"A" equalling 0, "B" is 1, ... "Z" is 25, etc. The highest needed by a
+DOOM 1 sprite is W=22, but some of the DOOM 2 monsters need a few more
+frames.
+  The "0" in the lump name is for "rotations" or "rot"s. All the
+static objects like torches and barrels and dead bodies look the same
+from any angle. This is because they have a "rot=0 lump" as DOOM itself
+might say. Monsters and projectiles look different from different
+angles. This is done with rots 1-8. This diagram shows how rot 1 is for
+the front and they go counter-clockwise (looking from above) to 8:
+
+	3
+      4 | 2
+       \|/
+     5--*----> 1   Thing is facing this direction
+       /|\
+      6 | 8
+	7
+
+  Many things have sets of lumps like this: TROOA1, TROOA2A8, TROOA3A7,
+TROOA4A6, TROOA5, TROOB1, etc. This means that for frame 0 (A), the
+pairs of rots/angles (2 and 8), (3 and 7), and (4 and 6) are mirror-
+images. In the long run, this saves space in the wad file, and from the
+designer's point of view, it's 37% fewer pictures to have to draw.
+  If a sprite's frame has a non-zero rot, it needs to have ALL 8 of
+them. Also note that no more than two rots can be squeezed into one
+lump's name. Some other two-rot lumps with a different format are
+shown in the SPIDA1D1, SPIDA2D2, etc. lumps.
+
+  IMPORTANT: Sprite lumps and flats cannot be added or replaced via pwads
+unless they ALL are. That is, ALL sprites' lumps must be located in a
+single wad file, and ALL flats' lumps must be in a single wad file. Wall
+patches CAN be used in external wads, because the PNAMES lump gives a
+number to every pname, and is used as a quick-index list to load in
+wall patches.
+  Version 1.666 was rumored to be able to include sprites in pwads (in
+fact the README says it can), but it can't.
+
+
+[5-1]: Picture Format
+=====================
+
+  Each picture has three sections. First, an 8-byte header composed of
+four short-integers. Then a number of long-integer pointers. Then the
+picture's pixel/color data. See [A-1] for concise BNF style definitions,
+here is a meatier explanation of the format:
+
+(A) The header's four fields are:
+
+  (1) Width. The number of columns of picture data.
+  (2) Height. The number of rows.
+  (3) Left offset. The number of pixels to the left of the center;
+	where the first column gets drawn.
+  (4) Top offset. The number of pixels above the origin;
+	where the top row is.
+
+  The width and height define a rectangular space or limits for drawing
+a picture within. To be "centered", (3) is usually about half of the
+total width. If the picture had 30 columns, and (3) was 10, then it
+would be off-center to the right, especially when the player is standing
+right in front of it, looking at it. If a picture has 30 rows, and (4)
+is 60, it will appear to "float" like a blue soul-sphere. If (4) equals
+the number of rows, it will appear to rest on the ground. If (4) is less
+than that for an object, the bottom part of the picture looks awkward.
+  With walls patches, (3) is always (columns/2)-1, and (4) is always
+(rows)-5. This is because the walls are drawn consistently within their
+own space (There are two integers in each SIDEDEF which can offset the
+starting position for drawing a wall's texture within the wall space).
+
+  Finally, if (3) and (4) are NEGATIVE integers, then they are the
+absolute coordinates from the top-left corner of the screen, to begin
+drawing the picture, assuming the VIEW is full-screen (i.e., the full
+320x200). This is only done with the picture of the player's current
+weapon - fist, chainsaw, bfg9000, etc. The game engine scales the
+picture down appropriatelyif the view is less than full-screen.
+
+(B) After the header, there are N = field (1) = <width> = (# of columns)
+4-byte <long> integers. These are pointers to the data for each COLUMN.
+The value of the pointer represents the offset in bytes from the first
+byte of the picture lump.
+
+(C) Each column is composed of some number of BYTES (NOT integers),
+arranged in "posts":
+
+  The first byte is the row to begin drawing this post at. 0 means
+whatever height the header (4) upwards-offset describes, larger numbers
+move correspondingly down.
+  The second byte is how many colored pixels (non-transparent) to draw,
+going downwards.
+  Then follow (# of pixels) + 2 bytes, which define what color each
+pixel is, using the game palette. The first and last bytes AREN'T drawn,
+and I don't know why they are there. Probably just leftovers from the
+creation process on the NeXT machines. Only the middle (# of pixels in
+this post) are drawn, starting at the row specified in the first byte
+of the post.
+  After the last byte of a post, either the column ends, or there is
+another post, which will start as stated above.
+  255 (0xFF) ends the column, so a column that starts this way is a null
+column, all "transparent". Draw the next column.
+
+
+-----------------------------------------------
+CHAPTER [6]: Flats (Floor and Ceiling Textures)
+-----------------------------------------------
+
+  All the lumpnames for flats are in the directory between the F_START
+and F_END entries. Calling them flats is a good way to avoid confusion
+with wall textures. There is no look-up or meta-structure in flats as
+there is in walls textures. Each flat is 4096 raw bytes, making a square
+64 by 64 pixels. This is pasted onto a floor or ceiling with the same
+orientation as the automap would imply, i.e. the first byte is the color
+at the NW corner, the 64th byte (byte 63, 0x3f) is the NE corner, etc.
+  The blocks in the automap grid are 128 by 128, so four flats will fit
+in each block. Note that there is no way to offset the placement of flats,
+as can be done with wall textures. They are pasted according to grid lines
+64 apart, reckoned from the coordinate (0,0). This allows flats to flow
+smoothly even across jagged boundaries between sectors with the same
+floor or ceiling height.
+
+  As discussed in chapter [5], replacement and/or new-name flats don't
+work right from pwad files unless they are all in the same wad.
+  Theoretically, you can change all the flats want by constructing a
+new DOOM.WAD or ALLFLATS.WAD pwad, but you have to make sure no floor
+or ceiling uses an entry name which isn't in your F_ section. And you
+have to include these four entries for DOOM 1 use, although you can
+change their actual contents (pictures): FLOOR4_8, SFLR6_1, MFLR8_4,
+and FLOOR7_2. The first three are needed as backgrounds for the episode
+end texts. The last is what is shown "outside" the border of the display
+window if the display is not full-screen.
+
+
+[6-1]: Animated Flats
+---------------------
+
+  See Chapter [8-4-1] for a discussion of how the animated walls and
+flats work. Unfortunately, the fact that the flats all need to be
+lumped together in one wad file means that its not possible to change
+the animations via a pwad file, unless it contains ALL the flats, which
+amounts to several hundred k. Plus it is illegal to distribute the
+original data, so to pass around modifications, either all the flats
+must be all-new, or a utility must be used to construct a FLATS.WAD
+on an end-user's hard drive, using the original DOOM.WAD plus the
+additions. (Note: Bernd Kreimeier, listed in [A-5], has written a
+utility that does just this. It is called DMADDS11).
+
+
+-----------------------------
+CHAPTER [7]: Sounds and Music
+-----------------------------
+
+
+[7-1]: PC Speaker Sound Effects
+===============================
+
+  DP* entries in the directory refer to lumps that are sound data for
+systems using the PC speaker.
+  It's a quick and simple format. First is a <short> that's always 0,
+then a <short> that's the number of bytes of sound data, then follow
+that many bytes worth of sound data. That is, the lump's bytes will be
+0, 0, N, 0, then N bytes of data. The DP* lumps range in size from around
+10 bytes to around 150 bytes, and the data seem to range from 0 to 96
+(0x00 to 0x60). The numbers obviously indicate frequency, but beyond
+that I don't know the exact correlation in Hz, nor the time duration
+of each byte worth of data. Feel free to figure this out and tell me.
+
+
+[7-2]: Soundcard Sound Effects
+==============================
+
+  DS* entries in the directory refer to lumps that are sound data for
+systems using soundcards.
+  This data is in a RAW format for 8-bit 11 KHz mono sound - first is
+an 8-byte header composed of 4 unsigned short integers:
+
+(1) 3           (means what?)
+(2) 11025       (the sample rate, samples per second)
+(3) N           (the number of samples)
+(4) 0
+
+  Each sample is a single byte, since they are 8-bit samples. The
+maximum number of samples is 65535, so at 11 KHz, a little less than
+6 seconds is the longest possible sound effect.
+
+
+[7-3]: Music
+============
+
+  D_* entries is the directory refer to lumps that are music. This
+music is in the MUS file format, which goes like this:
+
+offset  type    contents
+
+0       ASCII   "MUS" and CTRL-Z (hex 4d 55 53 1a)
+4      <short>  # of bytes of music data
+6      <short>  # of bytes of header data (offset to start of music)
+8      <short>  number of primary channels
+10     <short>  number of secondary channels
+12     <short>  number of instrument patches
+14     <short>  0
+16     <short>s instrument patch numbers
+X to end  ?     Music data
+
+  X is the header size (the second short). Drum patch numbers (greater
+than 128) are 28 less than the numbers listed in the DMXGUS lump.
+  What the exact format of the music data is, I don't know.
+
+
+[7-4]: GENMIDI
+==============
+
+  This has something to do with General MIDI, obviously. This lump
+has 3 sections: an 8-byte header (the ASCII text "#OPL_II#"), then
+150 36-byte records (1 for each instrument), then 150 32-byte strings
+(names of instruments, padded with zeros). Perhaps the 36 bytes contain
+waveform information for the General MIDI standard instruments (this
+guess is based on exactly one glance at a dump of the byte values,
+so don't put too much faith in it).
+
+
+[7-5]: DMXGUS
+=============
+
+  This lump is used to do instrument patch mappings on the Gravis
+Ultra-Sound soundcard. It's in a very simple format - ASCII text!
+Here's the start and end of the DMXGUS lump from DOOM 1 version 1.2,
+which is 200 lines, of which the first 10 are comments:
+
+#Purpose: Different size patch libraries for different memory sizes.
+#         The libraries are built in such a way as to leave 8K+32bytes
+#         after the patches are loaded for digital audio.
+#
+#Revision History: 06/22/93 - Fixed problem with 512K patch library
+#                  07/26/93 - patch names changed in various releases
+#
+#
+#Explanation of Columns: Patch #  256K  512K  768K  1024K  Patch Name
+#
+0, 2, 1, 1, 1, acpiano
+1, 2, 1, 1, 1, britepno
+2, 2, 1, 1, 1, synpiano
+.
+.
+.
+213, 128, 128, 128, 128, castinet
+214, 128, 128, 128, 128, surdo1
+215, 128, 128, 128, 128, surdo2
+
+
+--------------------------------
+CHAPTER [8]: Miscellaneous Lumps
+--------------------------------
+
+
+[8-1]: PLAYPAL
+==============
+
+  There are 14 palettes here, each is 768 bytes = 256 rgb triples.
+That is, the first three bytes of a palette are the red, green, and
+blue portions of color 0. And so on. Note that the values use the
+full range (0..255), while standard VGA digital-analog converters
+use values 0-63.
+  The first palette, palette 0, is used for most situations.
+  Palettes 10-12 are used (briefly) when an item is picked up, the
+more items that are picked up in quick succession, the brighter it
+gets, palette 12 being the brightest.
+  Palette 13 is used while wearing a radiation suit.
+  Palettes 3, 2, then 0 again are used after getting berserk strength.
+  If the player is hurt, then the palette shifts up to number X, then
+comes "down" one every second or so, to palette 2, then palette 0
+(normal) again. What X is depends on how badly the player got hurt:
+Over 100% damage (add health loss and armor loss), X=8. 93%, X=7. 81%,
+X=6. 55%, X=5. 35%, X=4. 16%, X=2. These are just rough estimates
+based on a single test session long ago. Why bother tracking down
+the exact division points?
+
+  Unknown: what palettes 1 and 9 are for.
+
+
+[8-2]: COLORMAP
+===============
+
+  This contains 34 sets of 256 bytes, which "map" the colors "down" in
+brightness. Brightness varies from sector to sector. At very low
+brightness, almost all the colors are mapped to black, the darkest gray,
+etc. At the highest brightness levels, most colors are mapped to their
+own values, i.e. they don't change.
+  In each set of 256 bytes, byte 0 will have the number of the palette
+color to which original color 0 gets mapped.
+  The colormaps are numbered 0-33. Colormaps 0-31 are for the different
+brightness levels, 0 being the brightest (light level 248-255), 31 being
+the darkest (light level 0-7). Light level is the fifth field of each
+SECTOR record, see [4-9].
+  Colormap 32 is used for every pixel in the display window (but not
+the status bar), regardless of sector brightness, when the player is
+under the effect of the "Invulnerability" power-up. This colormap is
+all whites and greys.
+  Colormap 33 is all black for some reason.
+  While the light-amplification goggles power-up is in effect, everything
+in the display uses colormap 0, regardless of sector brightness.
+
+
+[8-3]: ENDOOM
+=============
+
+  When you finally have to leave DOOM, you exit to dos, and a colorful
+box of text appears. This is it. It is 4000 bytes, which are simply
+stored in the screen memory area for 80x25 16-color text mode. Thus
+it follows the same format as screen memory does: each character on
+the screen takes up two bytes. The second byte of each pair is from
+the (extended) ASCII character set, while the first byte of each pair
+is the color attribute for that character. The color attribute can
+be explained thus:
+
+ bit 7    6   5   4   3   2   1   0
+  +-----+---+---+---+---+---+---+---+
+  |     |   .   .   |   .   .   .   |
+  |Blink| Background|  Foreground   |
+  |     |   .   .   |   .   .   .   |
+  +-----+---+---+---+---+---+---+---+
+
+  So the foreground color can be from 0-15, the background color can
+be from 0-7, and the "blink" attribute is either on or off. All this
+very low-level info can be found in many ancient PC programming books,
+but otherwise it might be hard to locate...
+
+
+[8-4]: TEXTURE1 and TEXTURE2
+============================
+
+  These are lists of wall texture names used in SIDEDEFS lumps. Each
+wall texture is composed of one or more wall patches, whose names are
+listed in the PNAMES lump. But in a texture, the wall patches are not
+referred to by name, rather by the index number indicating what position
+they occupy in the PNAMES lump.
+  The TEXTURE2 lump is only present in the registered DOOM.WAD. The
+TEXTURE1 lump is identical in DOOM.WAD and the shareware DOOM1.WAD, and
+it only refers to pname numbers up to 163, because the shareware wad
+only has the first 163 wall patches, not all 350.
+
+  A TEXTURE lump starts with a 4-byte long integer N which is the number
+of textures defined in it. Following it are N long integers which are the
+offsets in bytes from the beginning of the TEXTURE lump to the start of
+each texture's definition.
+  Then there are N texture definitions, which have the following format.
+The first (texture name) field is an 8-byte string (less than 8 byte
+names are padded with zeros), the rest of the fields are 2-byte short
+integers:
+
+(1) The name of the texture, used in SIDEDEFS, e.g. "FIREWALL".
+(2) always 0.
+(3) always 0.
+(4) total width of texture
+(5) total height of texture
+
+	The fourth and fifth fields define a "space" (usually 128 by 128
+      or 64 by 72 or etc...) in which individual wall patches are placed
+      to form the overall picture. To tile vertically on a very tall wall
+      without exhibiting the "Tutti Frutti" effect, a texture must have
+      height 128, the maximum. There is no maximum width.
+
+(6) always 0.
+(7) always 0.
+(8) Number of 5-field (5 <short>) patch descriptors that follow. This
+means that each texture entry has variable length. Many entries have just
+1 patch, the most used in DOOM in a single texture is 64.
+
+  Patch descriptor:
+
+  (a) x offset from top-left corner of texture space defined in fields
+	4 and 5 to start placement of this patch
+  (b) y offset
+  (c) number (0...) of the entry in the PNAMES lump that contains the
+	lump name from the directory, of the wall patch to use...
+  (d) always 1, is for something called "stepdir"...
+  (e) always 0, is for "colormap"...
+
+  Each texture's entry ends after the last of its patch descriptors.
+  Note that patches can have transparent parts, since they are in the
+same picture format as everything else. Thus there can be (and are)
+transparent wall textures. These should only be used on a border between
+two sectors, to avoid "hall of mirrors" problems.
+  Also, textures intended for use as the "middle" texture of a 2-sided
+SIDEDEF (e.g. transparent textures) should only be composed of a single
+patch. A limitation in the game engine will cause the "medusa" effect
+if there is more than 1 patch in any middle texture that is visible in
+the display window. This effect causes the computer to slow to a crawl
+and make play impossible until the offending wall is out of view.
+
+
+[8-4-1]: Animated Walls
+-----------------------
+
+  Some of the walls and floors are animated. In the case of wall
+textures, it is possible to substantially customize these animations.
+Flats' animations can theoretically also be modified, but since flats
+don't work from pwads, that can make the effort very difficult.
+  The game engine sets up a number of wall animation cycles based on
+what entries it finds in the TEXTURE lumps. It also sets up flat
+animations based on what lumps exist between F_START and F_END.
+Versions before 1.666 can have up to 9 animated walls and 5 animated
+flats. Version 1.666 (DOOM 1 or 2) can have 13 walls and 9 floors
+animate.
+  For wall animations, the entries in the columns "First" and "Last"
+below, and all the entries between them (in the order that they occur
+in the TEXTURE lump) are linked. If one of them is listed as a texture
+on a sidedef, that sidedef will change texture to the next in the cycle
+about 3 times a second, going back to <First> after <Last>. Flats work
+similarly, except the order is dictated by the wad directory. If both
+of the <First> and <Last> texture/flat names are not present, no problem.
+Then that potential cycle is unused. But if <First> is present, and
+<Last> either is not present or is listed BEFORE <First>, then an
+error occurs while the DOOM operating system sets up, and it aborts.
+  Note that much longer sequences are possible! The entries between
+<First> and <Last> can be almost anything; they need not be the same
+in number as in the original, nor do they have to follow the same
+naming pattern. Thus one could set up SLADRIP1, TRON2, TRON3, TRON4,
+..., TRON67, SLADRIP3 for a 69-frame animated wall!
+  The "Ver" column indicates what version of DOOM is required. "All"
+indicates all versions have it. The "r" signifies that the shareware
+DOOM1.WAD does not contain the necessary picture lumps. The "2" means
+that only DOOM 2 has the necessary picture lumps, but version 1.666 of
+DOOM.EXE for DOOM 1 also has the capability to use these animation-cycle
+names (for pwad designers).
+
+First       Last         Ver    Normal # of frames
+
+BLODGR1     BLODGR4       r     4
+BLODRIP1    BLODRIP4      r     4
+FIREBLU1    FIREBLU2      r     2
+FIRELAV3    FIRELAVA      r     2 (3 patches are in DOOM.WAD, 1 is unused)
+FIREMAG1    FIREMAG3      r     3
+FIREWALA    FIREWALL      r     3
+GSTFONT1    GSTFONT3      r     3
+ROCKRED1    ROCKRED3      r     3
+SLADRIP1    SLADRIP3     All    3
+
+BFALL1      BFALL4        2     4
+SFALL1      SFALL4        2     4
+WFALL1      WFALL4        2     4
+DBRAIN1     DBRAIN4       2     4
+
+(floor/ceiling animations):
+
+NUKAGE1     NUKAGE3      All    3
+FWATER1     FWATER4       r     4
+SWATER1     SWATER4       -     4 (SWATER lumps aren't in any DOOM.WAD)
+LAVA1       LAVA4         r     4
+BLOOD1      BLOOD3        r     3
+
+RROCK05     RROCK08       2     4
+SLIME01     SLIME04       2     4
+SLIME05     SLIME08       2     4
+SLIME09     SLIME12       2     4
+
+
+[8-4-2]: The SKY Textures
+-------------------------
+
+  The SKY1, SKY2, and SKY3 textures are rather special in that they are
+used as sky backgrounds when the player is out in the open. They can
+also be used on regular walls, but they usually aren't, because then
+they just look like a painting. The "background" effect is done by
+the game engine. There is a special flat, F_SKY1, which is used to
+indicate that a floor or ceiling is "transparent" to the SKY beyond.
+The picture data in the F_SKY1 flat is not even used.
+  Upper textures between F_SKY1 ceilinged sectors do not have the
+specified texture (if any) drawn. Instead, they are "sky". Likewise
+with lower textures between F_SKY1 floored sectors, but it doesn't
+work as well, because if the player's viewpoint is below the top of
+a lower-texture-sky (i.e. if any part of it is in the upper half of
+the display), it causes a hall-of-mirrors effect.
+  SKY textures as sky backgrounds are mirror-images of what they look
+like on walls.
+  The SKY textures are always placed with their tops at the top of the
+view window. Since they cannot be more than 128 high, just like any
+other texture, a rather ugly "seam" in the sky is sometimes visible
+if the player can see too far "down".
+  SKY textures do move horizontally, though, to give a realistic
+effect. Doing a complete 360 degree turn will scroll by a 256-wide
+SKY four times. A 1024-wide SKY will exactly circumscribe the horizon.
+The 0 column of the SKY texture will be at due north (as on the automap),
+the 256 column is at west, 512 is south, and 768 is east. So the middle
+part of a 256-wide SKY is visible at NW, SW, SE, and NE.
+
+  SKY textures can be composed of several patches, just like regular
+textures, but trying to animate the sky doesn't work. DOOM.EXE can be
+changed so that SKY2 is the start of an animation cycle, and indeed
+on a wall it will animate, but the sky background does not. This is
+perhaps related to the way that "middle" textures of sidedefs do not
+animate.
+
+
+[8-5]: PNAMES
+=============
+
+  This is a list of all the names of lumps that are going to be used
+as wall patches. DOOM assigns numbers to these names, in the order
+that they are listed. The numbers are then used in TEXTURE1 and TEXTURE2
+entries to refer to wall patch lumps. In a texture composition entry,
+0 means the first pname, 1 is the second, ...
+
+  The first four bytes of the PNAMES lump is a long integer N.
+  Then follow N pnames, each of which occupies 8 bytes. Pnames less than
+8 bytes long are padded with zeros. These names duplicate an entry in
+the directory (but are not case sensitive - lowercase letters will match
+uppercase letters and vice versa). Unlike sprites and floors, wall
+patches can be loaded from external pwads. Whichever pwad was listed
+last on the command line and contains a lump with the same name as the
+one in the PNAMES lump (which itself could be from a pwad) is the pwad
+that is used to get the picture data for that wall patch.
+
+
+[8-6]: DEMOs
+============
+
+  If you start DOOM and do nothing, after a few seconds, it automatically
+shows a demo of play on some level. Also, external demos can be recorded
+and played back by using the command line parameters explained in the
+README and/or the DOOM FAQ. All external demos have a .LMP extension
+which the DOOM OS attaches; you only type the [demoname] without the
+.LMP extension.
+  The DOOM.WAD lumps DEMO1, DEMO2, and DEMO3 are in exactly the same
+format as these external .LMP files. Strictly speaking, the "demo"
+format should not be called the "LMP" format, because any external
+file without a wadfile header, i.e. it is just raw data, is a "lump"
+and deserves the .LMP extension.
+
+  A DOOM demo has three parts:
+
+  (1) header - 7 or 13 bytes
+  (2) data recording player moves - 4 bytes per player per gametic
+  (3) quit byte - equals 128 (0x80)
+
+(1) There are two different kinds of header depending on the version of
+DOOM used to record the demo. Versions up to 1.2 use a 7-byte header:
+
+  byte  range   purpose
+
+0       0-4     skill level. 0="I'm too young to die", 4="Nightmare!"
+1       1-3     episode.
+2       1-9     mission/map.
+3       0-1     player 1 is present if this is 1.
+4       0-1     player 2.
+5       0-1     player 3.
+6       0-1     player 4.
+
+  Versions after 1.2 use a 13-byte header:
+
+byte    range   purpose
+
+0       104-106 version. 104=1.4 beta, 105=1.5 beta, 106=1.6 beta or 1.666
+1       0-4     skill level. 0="I'm too young to die", 4="Nightmare!"
+2       1-3     episode. In DOOM 2 this is always 1.
+3       1-32    mission/map/level. In DOOM 1, it's 1-9. In DOOM 2, it's 1-32.
+4       0-2     mode. 0=single or cooperative, 1=deathmatch, 2=altdeath
+5       0-      respawn. 0=no respawn parameter, (any other value)=respawn.
+6       0-      fast. 0=no fast parameter, (any other value)=fast.
+7       0-      nomonsters. 0=monsters exist, (any other value)=nomonsters.
+8       0-3     viewpoint. 0=player 1's status bar, ..., 3=player 4.
+9       0-1     player 1 is present if this is 1.
+10 0x0a 0-1     player 2.
+11 0x0b 0-1     player 3.
+12 0x0c 0-1     player 4.
+
+(2) The player-move data is recorded in 4-byte chunks. Every 1/35 of a
+second is a gametic, and for every gametic, there is one 4-byte chunk
+per player. So the time duration of a demo (in seconds) is approximately
+equal to its length in bytes divided by (140 * number_of_players).
+
+  The four bytes recording each player's actions are:
+
+  (a) Forward/Backward Movement.
+  (b) Strafe Right/Left Movement.
+  (c) Turn Left/Right.
+  (d) other actions - use/activate, fire, change weapons.
+
+  The first three are signed bytes (i.e. of type <char>).
+
+  (a) Ranges from -127 to 127, negative numbers are backward movement,
+      positive numbers are forward movement. Without the -turbo option
+      above 100, values outside -50..50 cannot be achieved. With a
+      keyboard or joystick, these are the regular values:
+
+      Move forward:   25 (0x19)   with Speed on:  50 (0x32)
+      Move backward: -25 (0xE7)   with Speed on: -50 (0xCE)
+
+      Fancy mouse use can achieve any number in the range.
+
+  (b) Ranges from -127 to 127, negative numbers are left-strafe movement,
+      positive numbers are right-strafe movement. The keyboard values are:
+
+      Strafe right: 24  (0x18)    with Speed on:  50 (0x32)
+      Strafe left: -24  (0xE8)    with Speed on: -50 (0xCE)
+
+  (c) Ranges from -127 to 127, negative numbers are right turns, positive
+      numbers are left turns. The keyboard values vary from version to
+      version, but are all in the range -5..5, and that's with Speed on.
+
+      Using the mouse can achieve much higher numbers here. I doubt if
+      the maximums of 127 and -127 can actually be achieved in play,
+      though.
+
+  (d) the bits of this byte indicate what actions the player is engaged in:
+
+      bit 0     Fire current weapon
+      bit 1     Use (a switch, open a door, etc.)
+      bit 2     Change weapon to the one indicated in bits 3-5:
+
+      bits 5-3 = 000 Fist or Chainsaw
+		 001 Pistol
+		 010 Shotgun
+		 011 Chaingun
+		 100 Rocket Launcher
+		 101 Plasma Rifle
+		 110 BFG 9000
+		 111 Super Shotgun (DOOM 2 only)
+
+      bit 6     unused
+      bit 7     indicates a special action which alters the meanings
+		  of the other bits:
+
+		bits 1-0 = 01 pause or unpause
+			 = 10 save game in slot # recorded in bits 4 to 2
+				(slot number can thus be 0 to 7 but
+				 should NOT be 6 or 7 or else!)
+
+  There might be other special actions. The save game action happens
+during replay of the demo, so be careful when playing demos if you
+have important savegames! One or more of them could conceivably get
+overwritten.
+
+(3) The last byte of a demo has the value 128 (0x80)
+
+
+[8-6-1]: Level changes from 1.2 to 1.666 DOOM.WAD
+=================================================
+
+  Many people have experienced the error "Demo from a different game
+version", because DOOM versions will only play back demos that were
+recorded with the same version number. Theoretically, though, ANY
+version can be converted to ANY other version. Versions up to 1.2
+don't even require any modification, and versions 1.4 and up just
+require that their first byte be changed. To change between the two
+families (pre-1.4 and post-1.2) would just require extra header bytes
+be added/shaved.
+  But there are serious complications to converting demos. There have
+been some minor changes and bug-fixes to the levels from version to
+version. Since the demos only record player actions, they have NOTHING
+about the level in them, so they depend on the level used for playback
+to be the same as the level used for recording. Some kinds of differences
+in the playback level can cause the demo to become "unsynchronized"
+with the level, and players will seem to have gone crazy. For example,
+if a deathmatch start-position is at a different location, when a
+demo-player is spawned there, they will try to open doors that don't
+exist at the new location, shoot at people who aren't there, etc.
+The entire playback is ruined from that point on. Some examples of
+changes that don't matter are different floor and wall textures, light
+levels, and linedef "unpegged" flags. But most changes DO matter.
+  Note that changes like (nomonsters) vs. (monsters), (respawn) vs.
+(regular), (altdeath) vs. (regular deathmatch) will very quickly lead
+to unsynchronized goofball players.
+
+
+
+---------------------------
+CHAPTER [9]: Savegame Files
+---------------------------
+
+
+-------------------------------
+CHAPTER [10]: The DOOM.EXE File
+-------------------------------
+
+  Via pwads, a great many characteristics of the DOOM environment can
+be changed: maps, pictures, sounds, etc. But there are also a lot of
+neat things that can be done by patching the DOOM.EXE file itself.
+There is a large collection of data at the end of the EXE file, and by
+patching some bytes, we can turn literal values into variables. For
+example, the player has a 16-unit "radius" which prevents him from
+entering very small passageways. The player's radius can be made 1 and
+his "height" 1, so he can enter mouse-sized crawlspaces. There are a
+lot more exciting examples, such as invisible monsters, cyber-demons
+that look like players, super-fast shotguns, and a hundred others, but
+I won't describe all of that here. See appendix [A-4] for some EXE
+utilities and documents. Here I will simply give the data that has
+been figured out to date.
+  I freely mix hex and decimal numbers below. Hopefully you can tell from
+the context. All of the stuff below applies to registered version 1.2,
+and some of it applies to version 1.666 also. This chapter has not yet
+been completely updated for 1.666, but it soon will be.
+
+[10-1]: Version 1.2 DOOM.EXE Data Segment Overview
+==================================================
+
+  The data begins at 0x6f414 (455700) and continues to the end of the
+file, 0x8db27 (580391). Here's an overview of the sections:
+
+start length what
+
+6f414  3d30  TEXT STRINGS
+73412  1a34  various unknowns, probably to do with I/O, sound, mouse, etc.
+74bf8 10000  looks like hard-coded math tables, for speed?
+84bf8   148  misc.
+84d40    82  gamma correction messages
+84dc2   280  "are you sure you want to quit" messages
+85042   3a2  MENUS (new game, load game, etc.)
+853e4   140  ?
+85524   36c  configuration options and defaults, like in DEFAULT.CFG
+85890   174  ?
+85a04    60  ?
+85a64    54  ?
+85ab8    c4  ?
+85b7c    20  max ammo at start, and ammo per thing
+85b9c    c0  ammo type and frame #s for the weapons
+85c5c   188  ANIMATED WALLS and FLOORS
+85de4   258  SWITCH-WALLS
+8603c    c0  ?
+860fc    d4  ?
+861d0   500  5 colormaps for use with the gamma correction setting 0-4
+866e4    fc  ?
+867e0    40  pointers to chatmacros, "Green:", etc.
+86820    88  pointers to level names, used on Automap
+868a8    d8  splat mark coordinates for end-level screen
+86980   5a8  wimap patch animations for end-level screen
+86f28   224  SONG NAMES list of pointers
+8714c   8b8  SOUND TABLE
+87a04   1a4  SPRITE NAMES list of pointers
+87ba8  3800  STATE TABLE
+8b3a8    20  ?
+8b3c8  2368  THING TABLE
+8d730   3fd  ?
+
+[10-2]: Version 1.666 DOOM.EXE Data Segment Overview
+====================================================
+
+
+[10-3]: Detail on some EXE Data Structures
+==========================================
+
+  More detail on some of the data follows. The "names" of each section
+are the hexadecimal offsets to the start of that data, in the registered
+versions 1.2 and 1.666 of DOOM.EXE. 1.2 offsets are to the left of the
+asterisk, 1.666 to the right. "Integer" means a 4-byte <long> integer
+in hi-lo format, unless otherwise noted (e.g. "2-byte short integer").
+
+6f414 *** 82a14
+
+  START OF DATA. Several times I'll refer to "pointers". All of these
+pointers are integers. Add the values of these pointers to $6f414 or
+$82a14 depending on the version, and you'll get the location of what's
+being pointed to.
+  Note: there's also at least one other kind of pointer in here, with
+larger values, that point to a location in the code, NOT the data. I call
+these "code-pointers" for now. I know it's a lame term.
+
+6f414 *** a2228
+
+  TEXT STRINGS. They all start on 4-byte boundaries, i.e. at xxxx0/4/8/c.
+$00 ends the string. Then the next one starts at the next boundary, so a 4
+byte string is followed by $00, then 3 bytes of random junk, then the next
+string.
+
+73140
+
+  I think this is the last string, "TZ"
+
+73144
+
+  Misc. stuff I haven't investigated. Some of it has to do with sound card
+stuff and mice and joysticks, because at 7384c is "DMXGUS.INI" and at 74ba8
+are pointers which point to the strings "None", "PC_Speaker", "Adlib", etc.
+
+74bf8
+
+  64k of precisely ordered numbers, which leads me to believe they are
+pre-calculated math tables, to speed up some floating point operations
+used in the screen draw routine. Any other guesses?
+
+84bfc
+
+  3 pointers to the episode 1/2/3 end texts, "Once you beat...", "You've
+done it...", and "The loathsome Spiderdemon is dead..."
+
+84c24
+
+  pointer to the string "doom.wad"
+
+84c74
+
+  pointer to the string "default.cfg"
+
+84c78
+
+  8 integers: 1, 25, 50, 24, 40, 640, 1280, 320
+
+84c98
+
+  2 code-pointers
+
+84ccc
+
+  29 integers, with values like 90 and 135 and 180. Angles?
+
+84d40
+
+  "Gamma correction OFF", 00s, "Gamma correction level 1", ... 4. Each
+occupies $1a bytes.
+
+84dc2
+
+  8 text messages used to confirm quitting, each uses $50 bytes
+
+85042
+
+  MENUS. I know this controls to some extent which menu pictures are used
+for which menu, but I haven't figured it all out yet.
+
+853e4
+
+  14 ints: 42, 22, 23, 24, 28, 29, 31, 40, zeros
+
+8541c
+
+  256 bytes, values from 00-ff, no two the same, "random" order.
+
+85524
+
+  The configuration options. Each is 5 integers: a pointer to a string,
+like "mouse_sensitivity", a code-pointer, the default value for that
+option, a 0 or 1 (1 for all the "key_" options), and a 0. It would be
+pretty dense to do anything with this, I think.
+
+85890
+
+  About 117 integers, with a definite structure, but I can't figure it
+out, and changing/experimenting seems to do nothing.
+
+85a64
+
+  21 sets of 4 bytes: 0, 0, 1, 0, 320, 168, "33", 0, 1, $(b2 26 26 2e),
+$(ff 63 fd ff), a pointer that points to the $(b2...), 0, 1, "ema", 0, 0,
+1, 0, 1, "xma". All these are unchanged from version 0.99 through 1.2,
+except the pointer obviously.
+
+85ab8
+
+  Ints: 0, -1, -1, 0, 0, 0, 0, 4, 7, 10, 12, 14, 15, 15, 0, 0, 112, 96, 64,
+176, then 16 that are members of this set {-65536, -47000, 0, 47000, 65536},
+then 4, 5, 6, 7, 0, 1, 2, 3, 8, 3, 1, 5, 7
+
+85b7c *** 95714
+
+  AMMO AMOUNTS. 8 integers: 200, 50, 300, 50, 10, 4, 20, 1. The first four
+are the maximum initial capacity for ammo, shells, cells, and rockets. The
+backpack doubles these amounts. The second four are how many ammo in a
+clip, shells, rockets/rocket, and cells/cell item. Boxes have 5x as much.
+
+859bc *** 95734
+
+  AMMO TABLE. 8 sets of 6 integers (9 sets in 1.666):
+
+  version 1.2                             version 1.666
+
+Punch     5  4  3  2  5  0              Punch     5  4  3  2  5  0
+Pistol    0 12 11 10 13 17              Pistol    0 12 11 10 13 17
+Shotgun   1 20 19 18 21 30              Shotgun   1 20 19 18 21 30
+Chaingun  0 34 33 32 35 38              Chaingun  0 51 50 49 52 55
+Laucher   3 42 41 40 43 46              Laucher   3 59 58 57 60 63
+Plasma    2 59 58 57 60 62              Plasma    2 76 75 74 77 79
+BFG       2 66 65 64 67 71              BFG       2 83 82 81 84 88
+Chainsaw  5 53 52 50 54  0              Chainsaw  5 70 69 67 71  0
+				  Super-Shotgun   1 34 33 32 35 47
+
+  The first number of each set is the ammo type. Type 5 never runs out.
+The next three numbers are 3 state #s (see the STATE TABLE below) for the
+pictures displayed when moving while holding that weapon. You know, the
+"bobbing weapon" effect? Fifth is the first state of the "shoot" sequence
+for that weapon, and last is the first state of the "firing" sequence. The
+"firing" pictures are the ones that are lit up, fire coming out, etc.
+
+85c5c *** 9580c
+
+  ANIMATED WALLS and FLOORS. Each is 26 bytes: an integer, a 8-byte string,
+$00, a 8-byte string, $00, and a final integer.
+
+0 NUKAGE3  NUKAGE1  8
+0 FWATER4  FWATER1  8
+0 SWATER4  SWATER1  8
+0 LAVA4    LAVA1    8
+0 BLOOD4   BLOOD1   8
+		       <---- v1.666 has four more:  0 RROCK08  RROCK05  8
+1 BLODGR4  BLODGR1  8                               0 SLIME04  SLIME01  8
+1 SLADRIP4 SLADRIP1 8                               0 SLIME08  SLIME05  8
+1 BLODRIP4 BLODRIP1 8                               0 SLIME12  SLIME09  8
+1 FIREWALL FIREWALA 8
+1 GSTFONT3 GSTFONT1 8
+1 FIRELAVA FIRELAV3 8
+1 FIREBLU2 FIREBLU1 8
+1 ROCKRED3 ROCKRED1 8
+		       <---- V1.666 has four more:  1 BFALL4   BFALL1   8
+						    1 SFALL4   SFALL1   8
+						    1 WFALL4   WFALL1   8
+						    1 DBRAIN4  DBRAIN1  8
+
+  Obviously the 0/1 means floor or wall. The first string is the name of
+the animation cycle's LAST listed texture, the second string is the FIRST
+listed texture. The cycle includes them and all entries between them in
+whichever wad file is in effect (It doesn't have to be DOOM.WAD, a pwad
+with new TEXTURE1 and 2 resources works quite nicely). The final 8
+doesn't seem to mean much.
+
+85dc8
+
+  A -1 then a bunch of zeros, maybe space for another animation cycle?
+
+85de4 *** 95a64
+
+  SWITCH WALL NAMES. Each is 20 bytes: an 8-byte string, 00, another
+string, 00, and a 2-byte short integer. There are 28 switch names here
+in v1.2 and 39 switch names in v1.666. When a switch is pulled, the game
+checks to see if the wall texture is on this list. If it is, it changes
+the wall texture to the corresponding alternate texture. The <short>
+is 1, 2, or 3. 1 means it's in all versions, 2 means only registered
+DOOM 1 and DOOM 2, 3 means DOOM 2 only.
+
+86028
+
+  20 zeros, again, room for one more?
+
+8603c ***
+
+  48 integers: 3 0 2 1 3 0 2 0 3 1 2 0 0 0 0 0
+	       2 0 2 1 0 0 0 0 3 1 3 0 0 0 0 0
+	       2 0 3 1 2 1 3 1 2 1 3 0 0 0 0 0
+
+860fc ***
+
+  50 integers, all are either 50 or -50.
+
+861d0 ***
+
+  5 sets of 256 bytes, each is a COLORMAP, for the gamma correction
+settings OFF, 1, 2, 3, 4.
+
+866d0 ***
+
+  5 integers: 1, 0, -1, 0, 0
+
+866e4 ***
+
+  13 sets of 5 - 10 bytes, each set terminated by a $FF
+
+8675e ***
+
+  $74 $20
+
+86760 ***
+
+  13 pointers to the stuff at 866e4. An integer '0' between each pointer.
+
+867c8 ***
+
+  6 integers: -1, -1, 0, -1, 0, 1
+
+867e0 ***
+
+  10 pointers to the 10 default chatmacros, then 4 pointers, to "Green:",
+"Indigo:", "Brown:", "Red:"
+
+86820 ***
+
+  AUTOMAP LEVEL NAMES. 27 pointers to the level names used on the automap.
+
+8689c ***
+
+  The ascii letters "gibr" - the keys for sending messages in multiplayer.
+
+868a8 ***
+
+  SPLAT MARK COORDINATES. At what screen coordinates to place the WISPLAT
+picture on the end-level screen, for th 27 levels. 54 integers, 27 pairs.
+e1m1 x, e1m1 y, ..., e3m9 y.
+
+86980, 86bb0, 86da8 ***
+
+  END-LEVEL MAP ANIMATIONS. Each is 14 integers. The first one is (0, 11,
+3, 224, 104, 0, 0, 0, 0, 0, 0, 0, 0, 0). The first number is 0 for all the
+ones on maps 0 and 2 (episodes 1 and 3), and it's 2 for map 1. The 11 is
+always 11 except the last one of map 2 is 8. The 3 means 3 pictures are
+involved in the animation, e.g WIA00100, WIA00101, and WIA00102. 224 and 104
+are the x and y coordinates. The sixth number is not 0 for map 1 - it's
+from 1 to 8. This controls the way the Tower of Mystery "appears". All the
+other numbers are always 0.
+
+86ef8 ***
+
+  Three integers, how many animations for WIMAP0, 1, 2 respectively.
+
+86f04 ***
+
+  Three pointers, to the starts of the animations for WIMAP0, 1, 2
+respectively.
+
+8714c ***
+
+  SOUND TABLE. 61 and 1/2 sounds are listed here. Each is 9 integers: a
+pointer to the string which is the sound's "name", then a 0 or 1, then
+a value ranging from 32 to 128, then 0, -1, -1, 0, 0, 0. The names are
+"pistol", "shotgn", ... "hoof", "metal", "chgun". Prefix DS or DP and you
+get the entries in DOOM.WAD for the sound data. The "chgun" is the 1/2 -
+there's no "DSCHGUN" in doom.wad, and the entry in this table is incomplete
+anyway, lacking the all-important 0, -1, -1, 0, 0, 0 ending :-). There seem
+to be a few glitches in the way the sounds were fit into the whole scheme,
+this is just one of them.
+
+879ec ***
+
+  pointer to start of SOUND TABLE.
+
+879f0 ***
+
+  Integer = 150. 150 whats?
+
+87a04 ***
+
+  SPRITE NAME POINTERS. 105 pointers to the strings "TROO", "SHTG", ...,
+"SMRT".
+
+87ba8 *** 9834c
+
+  STATE TABLE. 512 entries in v1.2, 967 entries in v1.666. Each entry
+is 28 bytes in 7 integers:
+
+(1)     sprite number 0-..., lookup in sprite name pointers list.
+(2)     sprite frame, 0="A" in a sprite lump, 1="B", etc.
+(3)     duration, how many gametics this state is displayed until
+	  it looks for the next. -1 (0xffffffff) is forever.
+(4)     a "code pointer" which indicates what action(s) accompany
+	  the displaying of this state.
+(5)     next state in sequence. 0 means no next state, sequence is done.
+(6)     always 0, has no effect.
+(7)     always 0, has no effect.
+
+
+8b3a8 ***
+
+  Two integers: 1, 0, then 6 code-pointers.
+
+8b3c8 *** 9ed10
+
+  THING TABLE. 103 entries in v1.2 which are each 88 bytes = 22 integers.
+136 entries in v1.666, which are each 92 bytes = 23 integers.
+
+(1)     Thing number, as used in maps. See [4-2-1]. Some of them are
+	  equal to -1, e.g. the players' entry, and all projectiles.
+(2)     "Spawn" state. State number (from STATE TABLE) for when this
+	  thing first appears.
+(3)     Health. Inanimates can't be killed, so it doesn't apply to them.
+(4)     "Moving" state. First state # of monsters pursuing, etc.
+(5)     "See player" sound. For monsters who become activated. Also for
+	  projectiles' first sound. Note that sounds are 1-..., not 0-...
+	  0 indicates no sound.
+(6)     Reaction Time. Lower is faster.
+(7)     "Attack" sound.
+(8)     "Pain" state.
+(9)     Painchance. The chance out of 256 that a monster will be disrupted
+	  when it gets hurt. Otherwise, they keep attacking.
+(10)    "Pain" sound.
+(11)    "Close attack" state.
+(12)    "Distance attack" state.
+(13)    "Death" state, or "explode" for projectiles.
+(14)    "Explosive death" state, only some monsters can be "mushed".
+(15)    "Death" sound, or "explode" for projectiles.
+(16)    Speed of movement. Projectiles' speed are * 65536.
+(17)    Horizontal size (radius) * 65536
+(18)    Height * 65536
+(19)    Mass
+(20)    Missile damage. Also, the Lost Soul has a 3 here, for it's attack.
+(21)    "Act" sound, for wandering monsters.
+(22)    Flags, see below
+(23)    "Respawn" state, for monsters being ressurected. VERSION 1.666 ONLY
+
+  Flags. 0 = condition is false. 1 = condition is true.
+
+  bit   flagname        effect on thing
+
+  0     Special         it is a gettable thing (ammo, health, etc.)
+  1     Solid           creatures can't pass through (but projectiles can)
+  2     Shootable       can be hurt (note barrels have this set)
+  3     NoSector        totally invisible
+  4     NoBlockmap
+  5
+  6     (InPain)        ?
+  7
+  8     SpawnCeiling    hung from ceiling
+  9     NoGravity       floating monsters and not-on-ground things
+  10    Dropoff         doesn't automatically hug floor if "jump" off ledge
+  11    Pickup          can pick up gettable items
+  12    (NoClip)        walks through walls
+  13
+  14    Float           floating monsters
+  15    (Semi-NoClip)   climb tall steps
+  16    Missile         projectiles
+  17    (Disappearing   ?
+	 Weapon)
+  18    Shadow          semi-invisible like Spectres
+  19    NoBlood         uses PUFF instead of BLUD when hurt (e.g. barrels)
+  20    (SlideHelpless) ?
+  21
+  22    CountKill       Monster: counts toward KILLS ratio on inter-level
+  23    CountItem       Artifact: counts toward ITEMS on inter-level screen
+  24    (Running)       ?
+  25    NotDMatch       this thing doesn't get spawned in deathmatch modes
+  26    Color0          \ 00 = green stays green  01 = change to dark greys
+  27    Color1          / 10 = change to browns   11 = change to dark reds
+  28-                   unused
+
+8d730 *** n/a
+
+  Misc junk I can't figure out.
+
+8db27 *** a7b99
+
+  End of DOOM.EXE
+
+
+------------------------------------------------------------
+APPENDIX [A-1]: Backus-Naur Form definitions of WAD elements
+------------------------------------------------------------
+
+  The descriptions below use a modified Backus-Naur Form (BNF) notation.
+Each entry looks like
+
+<keyword>       := description          ;type or comment (optional)
+		   description cont'd.  ;type or comment (optional)
+
+  Descriptions composed of more than one sequential keyword or element
+are usually listed with one element per line. This is for clarity and also
+allows each succesive element to be assigned different types without extra
+lines.
+
+<keyword>       := <whatever>           ;<type>
+
+  is a shorthand for
+
+<keyword>       := <whatever>
+<whatever>      := <type>
+
+  The description is one or more of the following predefined types,
+and/or previously or subsequently defined keywords.
+
+<byte>          is an unsigned 8-bit integer (0 to 255).
+<char>          is a signed 8-bit integer (-128 to 127).
+<ushort>        is an unsigned 16-bit integer in lo-hi format (0 to 65535)
+<short>         is a signed 16-bit integer (-32768 to 32767).
+<long>          is a signed 32-bit integer (-2147483648 to 2147483647).
+<string8>       is an ASCII string of from 1 to 8 bytes. If its length is
+		  less than 8 bytes, the remainder are zeros (hex 00).
+
+  Any of these may be followed by a range: <byte:1..99> means a byte
+restricted to the range 1 to 99 inclusive. A single number means that
+value is literally included: <byte:192> inserts that 8-bit value.
+
+  { } are used to enclose a group of elements.
+
+  | is used to separate choices - exactly one of the choices applies.
+
+  [ ] are used following an element or group of elements to indicate
+an array. Usually a literal value or a keyword will be used to denote
+how many members the array has. <rook> [666] means that the element
+<rook> is repeated 666 times in sequence. {<Scylla> <Charybdis>} [zeus]
+means that whatever the value of <zeus> is, there are that many pairs
+of <Scylla> and <Charybdis>. [1..16] indicates the value may be from
+1 to 16 inclusive, and [...] indicates an indefinite number.
+
+  A literal string "ABCD" may appear, in which case those ASCII characters
+are directly inserted.
+
+------
+
+<WAD file>      := "PWAD"|"IWAD"
+		   <numlumps>
+		   <infotableofs>
+		   <lumps>
+		   <directory>
+
+<numlumps>      := <long>               ;number of lumps in WAD file
+<infotableofs>  := <long>               ;file offset to directory start
+
+<lumps>         := <lump> [numlumps]
+<lump>          :=                      ;see different kinds below
+
+<directory>     := {<lumpinfo> | <otherinfo>} [numlumps]
+<lumpinfo>      := <filepos>            ;<long>
+		   <size>               ;<long>
+		   <name>               ;<string8>
+
+<otherinfo>     := <marker> | <label>
+<marker>        := <dummynumber>        ;<long> with any value
+		   <long:0>
+		   <"S_START" | etc>    ;<string8>
+
+<label>         := {<"E"> <episode> <"M"> <mission>} | {<"MAP"> <level>}
+<episode>       := "1"|"2"|"3"
+<mission>       := "1"|"2"|"3"|"4"|"5"|"6"|"7"|"8"|"9"
+<level>         := "01"|"02"|"03"|"04"|"05"|"06"|"07"|"08"|"09"|"10"
+		   |"11"|"12"|"13"|"14"|"15"|"16"|"17"|"18"|"19"|"20"
+		   |"21"|"22"|"23"|"24"|"25"|"26"|"27"|"28"|"29"|"30"
+		   |"31"|"32"
+
+------
+different kinds of lumps:
+------
+
+<PLAYPAL>       := <palette> [14]
+<palette>       := {<red> <green> <blue>} [256]
+<red>           := <byte>
+<green>         := <byte>
+<blue>          := <byte>
+
+------
+
+<COLORMAP>      := <color_map> [34]
+<color_map>     := <mapping> [256]
+<mapping>       := <byte>
+
+------
+
+<ENDOOM>        := <character_cell> [1000]
+<character_cell>:= <color_attributes>           ;<byte>
+		   <character>                  ;<byte>
+
+------
+
+<demo>          := <header>
+		   <gametic_data>
+		   <byte:128>
+<header>        := {<header_12> | <header_16>}  ;different versions
+<header_12>     := <skill>
+		   <episode>
+		   <map>
+		   <player> [4]
+<header_16>     := <version>
+		   <skill>
+		   <episode>
+		   <map>
+		   <mode>
+		   <respawn>
+		   <fast>
+		   <nomonsters>
+		   <viewpoint>
+		   <player> [4]
+<skill>         := <byte:0..4>
+<episode>       := {<byte:1..3> | <byte:1>}     ;DOOM 1 or DOOM 2
+<map>           := {<byte:1..9> | <byte:1..32>} ;DOOM 1 or DOOM 2
+<player>        := <byte:0..1>          ;0 means not present, 1 means present
+<version>       := <byte:104..106>      ;versions 1.4, 1.5, 1.6 (also 1.666)
+<mode>          := <byte:0..2}          ;cooperative|deathmatch|altdeath
+<respawn>       := <byte>               ;0 is off, non-zero is on
+<fast>          := <byte>               ;0 is off, non-zero is on
+<nomonsters>    := <byte>               ;0 is off, non-zero is on
+<viewpoint>     := <byte:0..3>          ;shown from this player's view
+
+<gametic_data>  := <gametic> [...]
+<gametic>       := <player_move> [1..4] ;1-4 is # of players present in demo
+<player_move>   := <forward>            ;<char>
+		   <strafe>             ;<char>
+		   <turn>               ;<char>
+		   <use>                ;<byte>
+
+------
+
+<GENMIDI>       := "#OPL_II#"
+		   <instr_data> [150]
+		   <instr_name> [150]
+<instr_data>    := <byte> [36]          ;format unknown to me
+<instr_name>    := <byte> [32]          ;padded with 0s
+
+------
+
+<DMXGUS>        := pointless to describe here, see section [7-5]
+
+------
+
+<song>          := "MUS"
+		   <byte:26>
+		   <music_length>       ;<ushort>
+		   <music_start>        ;<ushort>
+		   <primary_channels>   ;<ushort>
+		   <secondary_channels> ;<ushort>
+		   <num_instr_patches>  ;<ushort>
+		   <ushort:0>
+		   <instr_patches>
+		   <music data>
+<instr_patches> := <instr_patch> [num_instr_patches]
+<instr_patch>   := <ushort>             ;Drum patch #s 28 less than in DMXGUS
+
+<music data>    := ???
+
+------
+
+<soundeffect>   := <ushort:3>
+		   <ushort:11025>       ;sampling rate
+		   <num_samples>        ;<ushort>
+		   <ushort:0>
+		   <samples>
+<samples>       := <sample> [num_samples]       ;<byte>
+
+------
+
+<PC_sound>      := <ushort:0>
+		   <num_PC_samples>     ;<ushort>
+		   <PC_samples>
+<PC_samples>    := <PC_sample> [num_PC_samples]
+<PC_sample>     := <byte>               ;seem to range [0..96]
+
+------
+
+<TEXTURE1>      := <num_textures>       ;<long>
+		   <tex_offsets>
+		   <tex_entries>
+<tex_offsets>   := <tex_offset> [num_textures]
+<tex_offset>    := <long>
+<tex_entries>   := <tex_entry> [num_textures]
+<tex_entry>     := <tex_name>           ;<string8>
+		   <short:0>
+		   <short:0>
+		   <tex_width>          ;<short>
+		   <tex_height>         ;<short>
+		   <short:0>
+		   <short:0>
+		   <num_patches>        ;<short>
+		   <patches>
+<patches>       := <patch> [num_patches]
+<patch>         := <x_offset>           ;all are <short>
+		   <y_offset>
+		   <pname_number>       ;lookup in <PNAMES> for picture
+		   <short:1>            ;supposedly <stepdir>
+		   <short:0>            ;supposedly <color_map>
+
+------
+
+<PNAMES>        := <num_pnames>         ;<long>
+		   <pnames>
+<pnames>        := <pname> [num_pnames]
+<pname>         := <string8>]           ;match the <name> from the
+					;<lumpinfo> of a <picture>
+
+------
+
+<picture>       := <header>
+		   <pointers>           ;offsets to <column> starts
+		   <pixel_data>
+<header>        := <width>              ;all are <short>
+		   <height>
+		   <left_offset>
+		   <top_offset>
+<pointers>      := <pointer> [width]    ;<long>
+<pixel_data>    := <column> [width]
+<column>        := <post> [...]
+		   <byte:255>           ;255 (0xff) ends the column
+<post>          := <rowstart>           ;<byte>
+		   <num_pixels>         ;<byte>
+		   <unused>             ;<byte>
+		   <pixels>
+		   <unused>             ;<byte>
+<pixels>        := <pixel> [num_pixels] ;<byte>
+
+------
+
+<flat>          := <colorbyte> [4096]   ;<byte>
+
+------
+
+<maplevel>      := <THINGS>
+		   <LINDEDEFS>
+		   <SIDEDEFS>
+		   <VERTEXES>
+		   <SEGS>
+		   <SSECTORS>
+		   <NODES>
+		   <SECTORS>
+		   <REJECT>
+		   <BLOCKMAP>
+
+<THINGS>        := <thing> [...]
+<thing>         := <x_position>         ;all are <short>
+		   <y_position>
+		   <angle>
+		   <type>
+		   <options>
+
+<LINEDEFS>      := <linedef> [...]
+<linedef>       := <vertex_start>       ;all are <short>
+		   <vertex_end>
+		   <flags>
+		   <function>
+		   <tag>
+		   <sidedef_right>
+		   <sidedef_left>       ;if <short: -1> there's no left side
+
+<SIDEDEFS>      := <sidedef> [...]
+<sidedef>       := <xoffset>            ;<short>
+		   <yoffset>            ;<short>
+		   <uppertexture>       ;<string8>
+		   <lowertexture>       ;<string8>
+		   <middletexture>      ;<string8>
+		   <sector_ref>         ;<short>
+
+<VERTEXES>      := <vertex> [...]
+<vertex>        := <X_coord>            ;both are <short>
+		   <Y_coord>
+
+<SEGS>          := <seg> [...]          ;<segs> stored by <subsector> order
+<seg>           := <vertex_start>       ;all are <short>
+		   <vertex_end>
+		   <bams>
+		   <line_num>
+		   <segside>
+		   <segoffset>
+
+<SSECTORS>      := <subsector> [...]
+<subsector>     := <numsegs>            ;both are <short>
+		   <start_seg>
+
+<NODES>         := <node> [...]
+<node>          := <x>                  ;first four are <short>
+		   <y>
+		   <dx>
+		   <dy>
+		   <bbox> [2]
+		   <child> [2]
+<bbox>          := <boxtop>             ;all are <short>
+		   <boxbottom>
+		   <boxleft>
+		   <boxright>
+<child>         := <ushort>             ;if 0x8000 it's a subsector
+
+<SECTORS>       := <sector> [...]
+<sector>        := <floorheight>        ;<short>
+		   <ceilingheight>      ;<short>
+		   <floorpic>           ;<string8>
+		   <ceilingpic>         ;<string8>
+		   <lightlevel>         ;<short>
+		   <special_sector>     ;<short>
+		   <tag>                ;<short>
+
+<REJECT>        := <bitarray>           ;see [4-10] for this one
+
+<BLOCKMAP>      := <xorigin>            ;<short>
+		   <yorigin>            ;<short>
+		   <xblocks>            ;<short>
+		   <yblocks>            ;<short>
+		   <listoffsets>
+		   <blocklists>
+<listoffsets>   := <listoffset> [numofblocks]
+<listoffset>    := <ushort>
+<numofblocks>   := <short>              ;note it equals <xblocks> * <yblocks>
+<blocklists>    := <blocklist> [numofblocks]
+<blocklist>     := <short: 0>           ;for dynamic thinglist pointer
+		   <lines_in_block>
+		   <short: -1>
+<lines_in_block>:= <linedef_num> [...]  ;the numbers of all the <linedef>s
+					;that are in the block
+<linedef_num>   := <short>
+
+
+----------------------------------
+APPENDIX [A-2]: DOOM engine limits
+----------------------------------
+
+Maximum width of a TEXTURE = NONE?
+Maximum height of a TEXTURE = 128
+Maximum edges in display that can have their sides rendered = 128 in 1.2
+							      256 in 1.6+
+Maximum blocks in a BLOCKMAP = about 13000, or 113 * 113
+Maximum THINGS in view at once = 64, extras are not drawn
+Maximum patches on a texture used on a
+  2Sided "middle" texture before "medusa" effect = 1
+Maximum # of "plats" = 30 (up/down moving floors, and lifts)
+
+Maximum # of "scrolling" walls per level (line type 48) = 64
+
+
+-------------------------------------------
+APPENDIX [A-3]: DOOM.WAD changes and errors
+-------------------------------------------
+
+  There are some imperfections in the DOOM.WAD file. All versions up
+to 1.666 have the SW18_7 lump included twice. Versions before 1.666
+have the COMP03_8 lump twice. And with version 1.666 somebody really
+messed up, because every single DP* and DS* and D_* lump that's in
+the shareware DOOM1.WAD is in the registered DOOM.WAD twice. The error
+doesn't adversely affect play in any way, but it does take up an
+unnecessary 800k on the hard drive.
+
+  Some of the lumps in the sprite section are unused. Versions before
+1.666 had PBULx0 and PSHEx0, x=A-B, which were pictures of bullet and
+shell casings being ejected after the player fired a weapon (this
+feature was obviously removed). Also there were four more "fireball"
+sprite-lump sets: BAL3x0, BAL4x0, x=A-E, and BAL5x0 and BAL6x0, x=A-B.
+The only unused lump left in 1.666 is SMT2A0, which is a small grey
+stalagmite, similar to the SMIT sprite which is THING #47. There are
+some new sprite lumps in version 1.666 of DOOM 1 which are "semi-unused"
+because they aren't used in DOOM 1, but they ARE used in DOOM 2. They
+are all projectile sprites, so it's probably just a little leftover
+from compiling the WAD.
+
+  So, in case it might help with converting demos, or for any other
+reason, here is a list, entirely by Paul Falstad, of all the changes
+to the levels between DOOM 1.2 and DOOM 1.666. The 1.4 and 1.5 beta's
+levels are in most if not all respects identical to 1.666's - I haven't
+checked.
+
+E1M2
+- Linedef #530 changed from a door that closes to one that stays open.
+  This is the south side of the door out of the maze.  This allows
+  deathmatch players who started in there to get out from the inside.
+
+E1M4
+- The swastika got changed to a different shape.  A bunch of things in
+  the swastika room got moved around to accomodate the new layout.
+- Thing #185 (a deathmatch start position) got moved from (768, 1952) to
+  (736, 1824).  This is in the room with the ledge NW of the player 1
+  starting room; the deathmatch start got moved off the ledge onto the
+  main floor.
+
+E1M5
+- Thing #216 (a deathmatch start) got moved from (-2112, 512) to
+  (-800, 1200); that is, it got moved from the west courtyard (the one
+  with the supercharger) to the hidden hallway just south of the pentagram.
+- Sector #105's floor was lowered from 88 to 80.  In other words, the
+  window west of the yellow keycard was enlarged a bit.  Also, the
+  associated linedefs are no longer marked impassable.
+
+E1M6
+- Thing #116 (the sargeant in the middle of void space in the southeast
+  corner of the map) got removed.
+- Sectors #139 and #142 got their floor changed from FLOOR0_6 to FLOOR4_8
+  for consistency with the surrounding sectors.  (These are the floors
+  underneath the yellow doors on the northwest and northeast corners
+  of one of the rooms.)
+
+E1M7
+- Linedef #782 was type 0; now it's type 31 (door that stays open).
+  This is south side of the last door before the exit door; it can now
+  be opened from the inside, so a deathmatch player that started in the
+  exit room can get out.
+
+E1M8
+- The computer map in the pentagram got changed to a shotgun.
+- Linedefs 35, 136, and 140 no longer have their upper textures unpegged.
+  This is the secret door to the supercharger; it now looks like a real
+  door when it opens.
+- A secret door was added in the east baron's alcove. When you push on
+  the east wall, a secret chamber opens with a switch.  That switch
+  lowers the lift to the south, so that you can get back into the complex.
+  (Though you could anyway, by jumping through the window on the west or
+  east side of the hallway south of the lift...)
+  Actually, it lowers the lift to the lowest adjacent floor, which
+  (after the two barons are dead) is lower than the hallway floor
+  height.  Probably not the intended effect.
+- Vertex #223 got moved ever so slightly NW for some reason.
+
+E2M4
+- Northwest of the big green "O", there is a secret room with partial
+  invisibility.  The door to the room closes when you walk north through
+  a hallway just southwest of it; you're supposed to shoot the door to
+  open it.  However, if you run north quickly over the trigger line and
+  then run east through the door, you can just make it before the door
+  closes, but in 1.2 you'd be trapped inside, since the door would not
+  open from the east side.  In 1.666, the linedef type of the east edge
+  of the door has been changed so that you can open the door from inside
+  the secret room.
+
+E3M1
+- Sector 8's trigger number is now 0.  Previously, it was 6, which is the
+  same number as one of the lines you walk over when getting the shotgun.
+  This line would cause the floor to be lowered.  However, sector 8's floor
+  is already lower than that of any adjacent sectors, so nothing happened.
+
+E3M4
+- Sidedefs 1327 and 1332 had their texture offsets fixed.  These are
+  the sidedefs on either side of the window between the room with the
+  beserker and the room with two spectres and a teleporter, east of
+  the player one starting point.  Now, the window looks better than it
+  did before, but still not perfect.
+
+E3M6
+- There is now a BFG9000 sitting in the northwest window in the building
+  which you're facing at the start of the level.  It only appears in
+  multiplayer mode.
+- The structure which has the switch leading to the secret level had its
+  north wall thickened, so that you can't trigger the switch from outside
+  of the structure.
+
+
+------------------------------------
+APPENDIX [A-3]: A BLOCKMAP algorithm
+------------------------------------
+
+this section is being removed
+
+---------------------------------------
+APPENDIX [A-4]: Other helpful documents
+---------------------------------------
+
+  There are several other excellent sources of information about
+DOOM, editing DOOM levels, changing the DOOM.EXE, and pwads.
+Some of the following items get widely distributed (BBS, Usenet,
+online services, FTP) and some don't. Three prominent FTP sites
+with huge quantities of doom-related material are:
+
+    infant2.sphs.indiana.edu    /pub/doom and subdirectories
+				  (../wad_edit/text has most documents)
+    wuarchive.wustl.edu         /pub/msdos_uploads/games/doomstuff
+    ftp.uwp.edu                 /pub/incoming/id
+				/pub/msdos/games/id/home-brew/doom
+
+  The infant2 site also has a number of mirrors.
+  As time passes, newer versions of these documents may be released,
+and/or the file names will change:
+
+DESIGN12.ZIP    Level Design FAQ, edited by Tom Neff
+		  Truly has lots of good questions, and good answers,
+		  to common questions related to level design. Covers
+		  the simple stuff, and some of the most advanced
+		  topics too. Also, it is editor-nuetral, i.e. it
+		  does not restrict itself to any single level editor.
+		  Highly recommended.
+
+DMFAQ666.ZIP    The Official DOOM FAQ 6.666 by Hank Leukart.
+		  A huge collection of information about the history
+		  of DOOM, notes on game play, and lists of add-on
+		  utilities available to enhance play.
+
+DOOMBSP.ZIP     The source code from id's bsp routines, which build
+		  the NODES structure and the REJECT and BLOCKMAP too.
+		  If you want to see C, here it is.
+
+METRICS.ZIP     "DOOM Metrics", by Scott Amspoker. Has some more info
+		  and more explanations related to [4-2-2]: Thing Sizes,
+		  and how monsters prefer stairs that aren't too steep.
+
+TEXPATCH.ZIP    Textures To Patches, by Gregory Lewis. Shows the
+		  patch composition of every texture in registered
+		  DOOM.
+
+TEXTURES.ZIP    "Managing Textures and the Unpegged Attribute", by
+		  Scott Amspoker. Explains in great depth how textures
+		  are drawn on walls, how the unpegged flag works, and
+		  how texture offsets apply.
+
+DH200.ZIP       DOOM.EXE Hack Editor, by Greg Lewis. This program
+		  allows changes to be made to the DOOM.EXE file and
+		  they can be saved/loaded via patch files. The thing
+		  and frame tables (discussed in chapter [10]) are the
+		  main emphasis of this excellent utility.
+
+???             "Fun with Dehacked", edited by Dan Lottero. Has a lot
+		  of tips and tricks for using the DOOM.EXE Hack Editor
+		  (dehacked).
+
+???             "Blackadder's DeHackEd Patch Reviews", by Michael Adcock.
+		  Last updated 24Jul94?
+
+???             "DOOM Deathmatch Wad Ranking", by James Dicke and Jim
+		  Urbas. Is a good system for rating how good and how
+		  fun deathmatch play is on pwads. If you want to find
+		  the best deathmatch levels, this is a good place to
+		  start.
+
+???             pwad review documents and lists.
+
+???             "The unofficial LMP format description 1.0", by
+		  Uwe Girlich
+
+-------------------------------
+APPENDIX [A-5]: Acknowledgments
+-------------------------------
+
+  The following people either brought mistakes to my attention, or
+provided additional information that I've incorporated into these
+specs. Thanks for all the help! Sorry if I left anyone out.
+  If you have any comments or questions, have spotted any errors,
+or have any possible additions, please send me e-mail. If you've
+contacted me before, please note my new address (msfell@aol.com).
+
+id Software
+	Created DOOM, added the -file parameter, used a simple format
+	for the WAD, and occasionaly released specifications and
+	technical information about DOOM and DOOM 2 :-)
+
+All PWAD designers and doom-utility programmers everywhere!
+
+Coleman Reed Ammerman (cammer@cs.tamu.edu) and John Wolsh
+	They were the first to document the DEMO format.
+
+Scott Amspoker (scott@bbx.basis.com)
+	Wrote the METRICS and TEXTURES articles.
+
+Jeff Bird (jeff@wench.ece.jcu.edu.au)
+	Good ideas about the NODES, and a blockmap algorithm.
+
+Alistair Brown (A.D.Brown@bradford.ac.uk)
+	Helped me understand the NODES and explained REJECT.
+
+Frans P. de Vries (fpdevries@hgl.signaal.nl)
+	The cool ASCII DOOM logo used for the header. Also, gave a
+	comprehensive list of typos and mistakes in the 1.3 specs.
+
+Paul Falstad (pjf@crash.cts.com)
+	I got ALL of the [8-6-1] information from his messages.
+
+Robert Fenske (rfenske@swri.edu)
+	Passed along a great linedef flag list. Also helped with linedef
+	types, blockmap, special sectors, and general suggestions.
+
+Nelson Fernandez Jr. (nelson@netcom.com)
+	Distributed information about savegame files.
+
+Uwe Girlich (girlich@aix520.informatik.uni-leipzig.de)
+	Wrote "The unofficial LMP format description 1.0"
+
+Stuart Herbert (ac3slh@sunc.sheffield.ac.uk)
+	Clarifying how pegged/unpegged flags work.
+
+Herre de Jonge (herre@morra.et.tudelft.nl)
+	First pointed out the stairs mistake in the 1.3 specs.
+
+Tom Klok (a344@mindlink.bc.ca)
+	DMXGUS and MUS file format info.
+
+Bernd Kreimeier (bernd@nero.uni-bonn.de)
+	Wrote DMADDS11. Sprites, savegames, sounds, and lots of other help.
+
+Steve Larsen (larsen@sunset.cs.utah.edu)
+	Several patches for the DOOM.EXE file
+
+Hank Leukart (ap641@cleveland.freenet.edu)
+	Edits the DOOM FAQ and distributes these specs!
+
+Greg Lewis (gregl@umich.edu)
+	Wrote DeHackEd, and gave lots of info on EXE variables.
+
+Joel Lucsy (jjlucsy@mtu.edu)
+	Info on COLORMAP and PLAYPAL.
+
+Sean Malloy (malloy@nprdc.navy.mil)
+	Step-by-step proof of exactly how stairs work.
+
+John A. Matzen (jamatzen@cs.twsu.edu)
+	Instrument names in GENMIDI.
+
+Steve McCrea (sm@eng.cam.ac.uk)
+	Animated textures and textures larger than 256 wide.
+
+Brian McKimens (samneric@connected.com)
+	Comprehensive work on linedefs' function types.
+
+Tom Neff (tneff@panix.com)
+	Edits (writes) the DESIGNxx.FAQ. Suggested BNF and wrote the
+	intro to [A-1]. Created the WIF text standard. General advice.
+
+Tom Nettleship (mastn@midge.bath.ac.uk)
+	Explained BSP trees in comp.graphics.algorithms messages.
+
+Elias Papavassilopoulos (ep104@cus.cam.ac.uk)
+	Tons of technical info on EXE files in general and DOOM.EXE.
+
+Robert D. Potter (potter@bronze.lcs.mit.edu)
+	Theory about what BLOCKMAP is for and how the engine uses it.
+
+Raphael Quinet (eedraq@chapelle.ericsson.se)
+	Lots of rigorous contributions on linedef types and special
+	sectors. Not to mention DEU!
+
+Colin Reed (dyl@cix.compulink.co.uk)
+	I had the x upper and lower bounds for node bounding boxes
+	backwards a few versions ago.
+
+Joost Schuur (jschuur@studserv.zdv.uni-tuebingen.de)
+	Runs the doom-editing mailing list.
+
+Steve Simpson (ssimpson@world.std.com)
+	Corrected an error in the PNAMES section
+
+S. Sproston (S.Sproston-SE2@cs.bham.ac.uk)
+	Excellent work on linedef types.
+
+Matt Tagliaferri (matt.tagliaferri@pcohio.com)
+	Pointed out omission of TEXTURE1/2 pointer table in the 1.1
+	specs. Also provided a good BLOCKMAP algorithm.
+
+Ted Vessenes (tedv@geom.umn.ed)
+	I had the THING angles wrong in the original specs.
+
+You! Thanks for reading the "Unofficial" DOOM Specs!
diff --git a/Documents/GPL.txt b/Documents/GPL.txt
new file mode 100644
index 0000000..94a9ed0
--- /dev/null
+++ b/Documents/GPL.txt
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/Documents/Hexen_specs.txt b/Documents/Hexen_specs.txt
new file mode 100644
index 0000000..a22bc4a
--- /dev/null
+++ b/Documents/Hexen_specs.txt
@@ -0,0 +1,2650 @@
+
+HEXEN Specs v0.9                                                    Page 1
+
+
+
+                     The Official Hexen Technical Specs
+                 Author: Ben Morris (bmorris@islandnet.com)
+                Information from Raven provided by Ben Gokey
+
+                               [Disclaimer]
+
+        The text contained in this document is for informational
+        purposes only.  If you decide to use this information in any
+        way, neither id Software, Raven Software, nor Ben Morris
+        can be held responsible for any damages or losses (including,
+        but not limited to: dismembered bodily parts, telefrags and
+        lack of sleep) incurred by this information's use.  Although
+        this is an "Official" specification, some of the information
+        contained within might be old, or just plain typed in wrong.
+        You have been warned.
+
+                                     !!!
+
+    NB: This version of the specs, 0.9, is a preliminary release.  Most of
+        the information here is tried and true, but there's a good
+        chance there are errors in the file.  If something doesn't
+        look right, or really IS wrong, please contact me (Ben Morris)
+        at the address above.  Please do NOT contact me about new
+        versions of the specs; I will release the new versions when
+        they are ready.  Thanks.
+
+        ** Set your tab width to 4.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+                                                                    Page 1
+
+HEXEN Specs v0.9                                                    Page 2
+
+ÚÄÄÄÂÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ
+³ þ ³ Table of Contents
+ÀÄÄÄÙ
+
+    No, this isn't finished.
+
+
+ÚÄÄÄÂÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ
+³ þ ³ Definitions used in this File
+ÀÄÄÄÙ
+
+Angle [0..255]  Used in "angle" parameters to Special types:
+
+                0       East            32      Northeast
+                64      North           96      Northwest
+                128     West            160     Southwest
+                192     South           224     Southeast
+
+                * NOTE that this differs from DOOM/Heretic in that 45/90
+                  degree increments are not used.  However, this difference
+                  does _not_ apply for the angles used for the THINGS in
+                  map editing - they are the same as DOOM's (eg: 0 = East,
+                  90 = North, etc.)
+
+Tics            Time unit of length 1/35 second.  So, 35 tics = 1 second.
+
+Octics          Time unit of length 8 tics.  So, 8 octics = 1 second.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+                                                                    Page 2
+
+HEXEN Specs v0.9                                                    Page 3
+
+ÚÄÄÄÂÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ
+³ i ³ About This File
+ÀÄÄÄÙ
+
+This file was written for those who are interested in the inner workings of
+Hexen.  It doesn't contain playing tips or information on how to get Hexen
+working on your system.
+
+This file is intended to be supplementary to Matt Fell's "Unofficial DOOM
+Specs", which probably came with your copy of DOOM or DOOM ][.  Wherever
+it's relevant, this file refers to a specific section in the DOOM specs (be
+sure you have version 1.666!), so it's a good idea to have a copy at hand.
+
+
+ÚÄÄÄÂÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ
+³ i ³ Introduction to Hexen
+ÀÄÄÄÙ
+
+Hexen is the sequel to Heretic, Raven Software's first collaboration with id
+Software.
+
+[..]
+
+Hexen's major difference from Heretic and DOOM is its programmability.  Hexen
+features a powerful script language that can be used to create a wide variety
+of in-game effects such as traps, puzzles and even earthquakes!
+
+[...]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+                                                                    Page 3
+
+HEXEN Specs v0.9                                                    Page 4
+
+ÚÄÄÄÄÄÂÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ
+³ 3-0 ³ Hexen Data Structures
+ÀÄÄÄÄÄÙ
+
+This section outlines the format of the new data blocks in a Hexen map - the
+LINEDEF and THING structures.  These structures have changed from the
+versions used in DOOM and Heretic.
+
+[DOOM Specs ref]
+
+
+[3-1] The Hexen LINEDEF structure
+---------------------------------
+
+    Offset      Size        Meaning
+    ---------------------------------------------------
+    0           word        the line's start-vertex
+    2           word        the line's end-vertex
+    4           word        line flags (see below)
+    6           byte        special type (see [Specials])
+    7         5 bytes       special arguments
+    12          word        the line's right sidedef number
+    14          word        the line's left sidedef number
+
+
+[3-1-1] Line Flags
+------------------
+
+    The following flags are starred with an asterisk if they're new for
+    Hexen:
+
+    Bits        Meaning when Set
+    ---------------------------------------------------
+    0           impassable - the line cannot be crossed.
+    1           impassable to monsters only.
+    2           two-sided
+    3           upper texture is unpegged (drawn from top-down)
+    4           lower/middle texture is unpegged (drawn from bottom-up)
+    5           secret - the line appears as impassable on the automap.
+    6           sound can't travel through the line, but only
+                for monsters' ears.
+    7           never draw the line on the auto-map, even with the
+                map cheat enabled.
+    8           the line is always drawn on the auto-map, even if it
+                hasn't been seen by the player.
+
+  * 9           the line's special ([3-1]) is repeatable, ie: it can
+                be activated more than once.
+  * 10..12      the line's special activation, ie: how the special is
+
+                                                                    Page 4
+
+HEXEN Specs v0.9                                                    Page 5
+
+                activated.
+
+                Value   Activated when...
+                ---------------------------------------------
+                0       Player crosses the line
+                1       Player uses the line with the use key
+                2       Monster crosses the line
+                3       Projectile impacts the wall
+                4       Player pushes the wall
+                5       Projectile crosses the line
+
+                To get the special activation, use the following formula:
+
+                activation := (line.flags BITAND 0x1C00) BITSHIFTRIGHT 10
+
+
+[3-2] The Hexen THING structure
+-------------------------------
+
+    Offset      Size        Meaning
+    ---------------------------------------------------
+  * 0           word        thing ID - used in scripts and specials to
+                            identify a THING or a set of THINGs.
+    2           word        x-position on the map
+    4           word        y-position on the map
+  * 6           word        starting altitude on the map - the THING
+                            is created at this altitude above the floor
+                            of the sector it's in when the map is entered,
+                            and is immediately subjected to gravity.
+    8           word        the angle the thing is facing when the map
+                            is entered.
+    10          word        the thing type (see [3-2-2].)
+  * 12          word        thing flags (see [3-2-1].)
+    14          byte        special type (see [Specials]).  a thing's
+                            special is activated when the thing is
+                            killed (Monster), destroyed (Tree, Urn, etc.),
+                            or picked up (Artifact, Puzzle Piece.)
+    15        5 bytes       special arguments
+
+
+[3-2-1] Thing Flags
+-------------------
+
+The following flags are starred with an asterisk if they're new for
+Hexen:
+
+    Bits        Meaning when Set
+    ---------------------------------------------------
+    0           the thing appears on the Easy skill settings (1-2)
+    1           the thing appears on the Normal skill setting (3)
+
+                                                                    Page 5
+
+HEXEN Specs v0.9                                                    Page 6
+
+    2           the thing appears on the Hard skill settings (4-5)
+    3           the thing is deaf - it sits around until it's
+                hurt, or until it sees a player.
+  * 4           the thing is dormant - it never wakes up until it's
+                activated using the Thing_Activate() special.
+  * 5           the thing appears for the Fighter class.
+  * 6           the thing appears for the Cleric class.
+  * 7           the thing appears for the Mage class.
+  * 8           the thing appears in single-player games.
+  * 9           the thing appears in cooperative games.
+  * 10          the thing appears in deathmatch games.
+
+
+Each "thing appears" flag must be set for each condition under which the
+thing is to appear.  For multi-player games involving more than one
+class, a thing that is set for one of the classes involved will also appear
+for the other two classes in the game.
+
+For example, if you set the three pieces of the Fighter's sword to appear
+for only the Fighter (bit 5 is set) and in Deathmatch (bit 10 is set),
+if a Mage or a Cleric is also playing, the pieces of the sword will be
+visible to them, too.
+
+
+[3-2-2] Thing Types
+-------------------
+
+Creatures as well as some objects can be activated and/or deactivated with
+the ThingActivate and ThingDeactivate line specials.
+
+Creatures will freeze when deactivated and resume when activated.
+Activation can also be used to bring a "dormant" creature to life.
+
+If a creature has a special, that special will be activated upon its death.
+Also, if the creature is teleported away using the banishment device
+(teleport other), the special will be activated and then removed from the
+creature.
+
+    Type      Name
+    -----------------------------------------------------------
+    1         Player_1_start
+    2         Player_2_start
+    3         Player_3_start
+    4         Player_4_start
+    11        Player_Deathmatch
+    14        Player_TeleportSpot
+
+    10        2C_SerpentStaff
+    8010      2F_Axe
+    53        2M_ConeOfShards
+
+                                                                    Page 6
+
+HEXEN Specs v0.9                                                    Page 7
+
+    8009      3C_Firestorm
+    123       3F_Hammer
+    8040      3M_Lightning
+    20        4C_1Shaft
+    19        4C_2Cross
+    18        4C_3Arc
+    16        4F_1Hilt
+    13        4F_2Crosspiece
+    12        4F_3Blade
+    23        4M_1Stick
+    22        4M_2Stub
+    21        4M_3Skull
+
+    10110     A_Flechette
+    8003      A_BoostMana
+    8002      A_BootsOfSpeed
+    8041      A_Bracers
+    84        A_IconOfDefender
+    30        A_Porkelator
+    83        A_WingsOfWrath
+    32        A_HealingComplete (Urn)
+    82        A_HealingHefty (Flask)
+    81        A_HealingWimpy (Vial)
+    10120     A_HealRadius
+    8000      A_Repulsion
+    86        A_DarkServant
+    36        A_ChaosDevice
+    33        A_Torch
+    10040     A_Banishment
+
+    8008      Ar_Amulet
+    8005      Ar_Armor
+    8007      Ar_Helmet
+    8006      Ar_Shield
+
+    114       C_Bishop
+    107       C_Centaur
+    115       C_CentaurLeader
+    10101     C_ClericBoss
+    31        C_Demon
+    8080      C_Demon2
+    254       C_Dragon
+    10030     C_Ettin
+    10100     C_FighterBoss
+    10060     C_FireImp
+    112       C_Fly
+    10080     C_Heresiarch
+    8020      C_IceGuy
+    10200     C_Korax
+    10102     C_MageBoss
+
+                                                                    Page 7
+
+HEXEN Specs v0.9                                                    Page 8
+
+    121       C_Serpent
+    120       C_SerpentLeader
+    34        C_Wraith
+    10011     C_Wraith2
+
+    8032      K_AxeKey
+    8034      K_CastleKey
+    8031      K_CaveKey
+    8035      K_DungeonKey
+    8033      K_FireKey
+    8200      K_GoldKey
+    8037      K_RustyKey
+    8036      K_SilverKey
+    8030      K_SteelKey
+    8039      K_SwampKey
+    8038      K_WasteKey
+
+    122       Mana_1
+    124       Mana_2
+    8004      ManaCombined
+
+    3000      PO_Anchor
+    3001      PO_StartSpot
+    3002      PO_StartSpot_Crush
+
+    1410      SE_Wind
+
+    10225     Spawn_Bat
+    10000     Spawn_Fog
+    10001     Spawn_Fog_a
+    10002     Spawn_Fog_b
+    10003     Spawn_Fog_c
+    113       Spawn_Leaf
+
+    10090     Spike_Down
+    10091     Spike_Up
+
+    1403      SS_Creak
+    1408      SS_EarthCrack
+    1401      SS_Heavy
+    1407      SS_Ice
+    1405      SS_Lava
+    1402      SS_Metal
+    1409      SS_Metal2
+    1404      SS_Silent
+    1400      SS_Stone
+    1406      SS_Water
+
+    9001      X_MapSpot
+    9013      X_MapSpotGravity
+
+                                                                    Page 8
+
+HEXEN Specs v0.9                                                    Page 9
+
+
+    8064      Z_ArmorSuit
+    77        Z_Banner
+    8100      Z_Barrel
+    8065      Z_Bell
+    8066      Z_BlueCandle
+    8061      Z_BrassBrazier
+    8103      Z_Bucket
+    119       Z_Candle
+    8069      Z_Cauldron
+    8070      Z_Cauldron_Unlit
+    8071      Z_Chain32
+    8072      Z_Chain64
+    8073      Z_ChainHeart
+    8074      Z_ChainLHook
+    8075      Z_ChainSHook
+    8077      Z_ChainSkull
+    8076      Z_ChainSpikeBall
+    17        Z_Chandelier
+    8063      Z_Chandelier_Unlit
+    8042      Z_FireBull
+    8043      Z_FireBull_Unlit
+    8060      Z_FireSkull
+    118       Z_GlitterBridge
+    10503     Z_LargeFlame_Permanent
+    10502     Z_LargeFlame_Timed
+    10501     Z_SmallFlame_Permanent
+    10500     Z_SmallFlame_Timed
+    140       Z_TeleportSmoke
+    116       Z_TwinedTorch
+    117       Z_TwinedTorch_Unlit
+    103       Z_VasePillar
+    54        Z_Wall_Torch_Lit
+    55        Z_Wall_Torch_Unlit
+    5         Z_WingedStatue
+    6         ZC_Rock1
+    7         ZC_Rock2
+    9         ZC_Rock3
+    15        ZC_Rock4
+    41        ZC_ShroomLarge
+    42        ZC_ShroomSmall1
+    44        ZC_ShroomSmall2
+    45        ZC_ShroomSmall3
+    52        ZC_StalactiteLarge
+    56        ZC_StalactiteMedium
+    57        ZC_StalactiteSmall
+    48        ZC_Stalagmite_Pillar
+    49        ZC_StalagmiteLarge
+    50        ZC_StalagmiteMedium
+    51        ZC_StalagmiteSmall
+
+                                                                    Page 9
+
+HEXEN Specs v0.9                                                    Page 10
+
+    8062      ZF_DestructibleTree
+    8068      ZF_Hedge
+    8104      ZF_ShroomBoom
+    39        ZF_ShroomLarge1
+    40        ZF_ShroomLarge2
+    46        ZF_ShroomSmall1
+    47        ZF_ShroomSmall2
+    8101      ZF_Shrub1
+    8102      ZF_Shrub2
+    29        ZF_StumpBare
+    28        ZF_StumpBurned
+    24        ZF_TreeDead
+    25        ZF_TreeDestructible
+    80        ZF_TreeGnarled1
+    87        ZF_TreeGnarled2
+    78        ZF_TreeLarge1
+    79        ZF_TreeLarge2
+    111       ZG_BloodPool
+    71        ZG_CorpseHanging
+    61        ZG_CorpseKabob
+    108       ZG_CorpseLynched
+    109       ZG_CorpseNoHeart
+    110       ZG_CorpseSitting
+    62        ZG_CorpseSleeping
+    8067      ZG_IronMaiden
+    65        ZG_TombstoneBigCross
+    69        ZG_TombstoneBrianP
+    66        ZG_TombstoneBrianR
+    67        ZG_TombstoneCrossCircle
+    63        ZG_TombstoneRIP
+    64        ZG_TombstoneShane
+    68        ZG_TombstoneSmallCross
+    93        ZI_IceSpikeLarge
+    94        ZI_IceSpikeMedium
+    95        ZI_IceSpikeSmall
+    89        ZI_IcicleLarge
+    90        ZI_IcicleMedium
+    91        ZI_IcicleSmall
+    8502      ZM_CandleWeb
+    8509      ZM_CleaverMeat
+    8508      ZM_GobletSilver
+    8507      ZM_GobletSmall
+    8505      ZM_GobletSpill
+    8506      ZM_GobletTall
+    8504      ZM_LgCandle
+    8500      ZM_LgStein
+    104       ZM_Pot1
+    105       ZM_Pot2
+    106       ZM_Pot3
+    100       ZM_Rubble1
+
+                                                                    Page 10
+
+HEXEN Specs v0.9                                                    Page 11
+
+    101       ZM_Rubble2
+    102       ZM_Rubble3
+    8503      ZM_SmCandle
+    8501      ZM_SmStein
+    8051      ZP_GargBrnzShort
+    8047      ZP_GargBrnzTall
+    8044      ZP_GargCorrode
+    76        ZP_GargIceShort
+    73        ZP_GargIceTall
+    8050      ZP_GargLavaBrtShort
+    8046      ZP_GargLavaBrtTall
+    8049      ZP_GargLavaDrkShort
+    8045      ZP_GargLavaDrkTall
+    74        ZP_GargPortalShort
+    72        ZP_GargPortalTall
+    8052      ZP_GargStlShort
+    8048      ZP_GargStlTall
+    88        ZS_Log
+    58        ZS_Moss1
+    59        ZS_Moss2
+    37        ZS_Stump1
+    38        ZS_Stump2
+    27        ZS_Tree1
+    26        ZS_Tree2
+    60        ZS_Vine
+    99        ZW_RockBlack
+    97        ZW_RockBrownLarge
+    98        ZW_RockBrownSmall
+    9003      ZZ_BigGem
+    9007      ZZ_Book1
+    9008      ZZ_Book2
+    9016      ZZ_CWeapon
+    9015      ZZ_FWeapon
+    9018      ZZ_Gear
+    9019      ZZ_Gear2
+    9020      ZZ_Gear3
+    9021      ZZ_Gear4
+    9006      ZZ_GemBlue1
+    9010      ZZ_GemBlue2
+    9005      ZZ_GemGreen1
+    9009      ZZ_GemGreen2
+    9012      ZZ_GemPedestal
+    9004      ZZ_GemRed
+    9017      ZZ_MWeapon
+    9002      ZZ_Skull
+    9014      ZZ_Skull2
+    9011      ZZ_WingedStatueNoSkull
+
+
+
+
+                                                                    Page 11
+
+HEXEN Specs v0.9                                                    Page 12
+
+ÚÄÄÄÄÄÂÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ
+³ 4-0 ³ Hexen Script Language
+ÀÄÄÄÄÄÙ
+
+The Hexen Script Language is called the "Action Code Script", or ACS.
+
+Each map has an ACS file that contains the scripts specific to that map.  The
+scripts within it are identified using numbers that the general special
+ACS_Execute() uses.  A script itself can call the ACS_Execute() special
+(actually quite common), which will spawn another script that will run
+concurrently with the rest of the scripts.  A script can also be declared as
+OPEN, which will make it run automatically upon entering the map.  This is
+used for perpetual type effects, level initialization, etc.  The compiler
+takes the ACS file and produces and object file that is the last lump in the
+map WAD (BEHAVIOR).
+
+To create a compiled ACS file from a text script, use the DOS command:
+
+ c:\hexen> acs filename [enter]
+
+This command will produce 'filename.o' from 'filename.acs'.  The contents of
+the output file (filename.o) can be directly used as the BEHAVIOR lump of the
+map it's used with.
+
+Map scripts should start with #include "common.acs", which is just...
+
+#include "specials.acs"
+#include "defs.acs"
+#include "wvars.acs"
+
+The file "specials.acs" defines all the general specials.  These are used
+within scripts just like function calls.  The file "defs.acs" defines a
+bunch of constants that are used by the scripts.  The file "wvars.acs"
+defines all the world variables.  It needs to be included by all maps so
+they use consistent indexing.
+
+
+[4-1] Variables and their Scope
+--------------------------------
+
+There is only one data type ACS, a 4 byte integer.  Use the keyword int to
+declare an integer variable.  You may also use the keyword str, it is
+synonymous with int.  It's used to indicate that you'll be using the
+variable as a string.  The compiler doesn't use string pointers, it uses
+string handles, which are just integers.
+
+Declaring a variable is simple.  There are two "types" of variable - "str"
+and "int":
+
+
+                                                                    Page 12
+
+HEXEN Specs v0.9                                                    Page 13
+
+        str mystring;
+        int myint;
+
+      or:
+
+        str texture, sound;
+        int i, tid;
+
+* Note: You can't assign a variable in its declaration; you must give it a
+  value in a different expression.
+
+The SCOPE of a variable is one of World-scope, Map-scope, or Script-scope.
+
+    - World-scope variables are global, and can be accessed in any map.
+      Hexen maintains [n] permanent globals, numbered 0-[n-1].  You must
+      assign one of the globals a name in order to access it, like this:
+
+        world int 5:Grunt;
+
+      This tells Hexen to reference world global number 5 whenever it
+      encounters the name "Grunt".
+
+    - Map-scope variables are local to the current map.  They must be
+      declared outside of any script code, but without the world keyword.
+      These variables can't be accessed in any other map.
+
+    - Script-scope variables are local to the current script - they
+      can't be accessed by any other script or map.
+
+Here's some code that shows the declaration of all three scopes:
+
+    world int 3:DungeonAccess; // World-scope
+
+    int mapTimer; // Map-scope
+
+    script 4 (void)
+    {
+        int x, y; // Script-scope
+
+        ...
+    }
+
+
+[4-2] Language Structure
+------------------------
+
+Here is a quick reference manual type definition of the language.  It
+ends with a description of all the internal functions.
+
+
+
+                                                                    Page 13
+
+HEXEN Specs v0.9                                                    Page 14
+
+[4-2-1] Keywords
+----------------
+
+The following identifiers are reserved for use as keywords, and may
+not be used otherwise:
+
+  break
+  case
+  const
+  continue
+  default
+  define
+  do
+  else
+  goto
+  if
+  include
+  int
+  open
+  print
+  printbold
+  restart
+  script
+  special
+  str
+  suspend
+  switch
+  terminate
+  until
+  void
+  while
+  world
+
+[4-2-2] Comments
+----------------
+
+Comments are ignored by the script compiler.
+
+/*
+   This is a comment.
+*/
+
+int a; // And this is a comment
+
+
+
+[4-2-3] World-variable definitions
+----------------------------------
+
+world int <constant-expression> : <identifier> ;
+
+                                                                    Page 14
+
+HEXEN Specs v0.9                                                    Page 15
+
+world int <constant-expression> : <identifier> , ... ;
+
+
+[4-2-4] Map-variable definitions
+--------------------------------
+
+Declares a variable local to the current map.
+
+int <identifier> ;
+str <identifier> ;
+int <identifier> , ... ;
+
+
+[4-2-5] Include Directive
+-------------------------
+
+Includes the source of the specified file and compiles it.
+
+#include <string-literal>
+
+
+[4-2-5] Define Directive
+------------------------
+
+Replaces an identifier with a constant expression.
+
+#define <identifier> <constant-expression>
+
+
+[4-2-6] Constant Expressions
+----------------------------
+
+<integer-constant>:
+
+decimal      200
+hexadecimal  0x00a0, 0x00A0
+fixed point  32.0, 0.5, 103.329
+any radix    <radix>_digits
+
+  binary        2_01001010
+  octal         8_072310
+  decimal       10_50025
+  hexadecimal   16_00a03f2
+
+
+[4-2-7] String Literals
+-----------------------
+
+<string-literal>: "string"
+
+
+                                                                    Page 15
+
+HEXEN Specs v0.9                                                    Page 16
+
+
+[4-2-6] Script Definitions
+--------------------------
+
+To define a script:
+
+<script-definition>:
+  script <constant-expression> ( <arglist> ) { <statement> }
+  script <constant-expression> OPEN { <statement> }
+
+eg:
+
+script 10 (void) { ... }
+
+script 5 OPEN { ... }
+
+* Note that OPEN scripts do not take arguments.
+
+
+[4-2-6] Statements
+------------------
+
+<statement>:
+  <declaration-statement>
+  <assignment-statement>
+  <compound-statement>
+  <switch-statement>
+  <jump-statement>
+  <selection-statement>
+  <iteration-statement>
+  <function-statement>
+  <linespecial-statement>
+  <print-statement>
+  <control-statement>
+
+
+[4-2-6-1] Declaration Statements
+--------------------------------
+
+Delcaration statements create script variables.
+
+<declaration-statement>:
+  int <variable> ;
+  int <variable> , <variable> , ... ;
+
+
+[4-2-6-1] Assignment Statements
+-------------------------------
+
+Assigns an expression to a variable.
+
+                                                                    Page 16
+
+HEXEN Specs v0.9                                                    Page 17
+
+
+<assignment-statement>:
+  <variable> <assignment-operator> <expression> ;
+
+<assignment-operator>:
+  =
+  +=
+  -=
+  *=
+  /=
+  %=
+
+* Note: An assignment of the form V <op>= E is equivalent to V = V <op> E.
+  For example:
+
+    A += 5;     is the same as
+    A = A + 5;
+
+[4-2-6-2] Compound Statements
+-----------------------------
+
+<compound-statement>:
+  { <statement-list> }
+
+<statement-list>:
+  <statement> <statement> <...>
+
+
+[4-2-6-3] Switch Statements
+---------------------------
+
+A switch statement evaluates an integral expression and passes control to the
+code following the matched case.
+
+<switch-statement>:
+ switch ( <expression> ) { <labeled-statement-list> }
+
+  <labeled-statement>:
+    case <constant-expression> : <statement>
+    default : <statement>
+
+Example:
+
+    switch (a)
+    {
+    case 1:         // when a == 1
+        b = 1;      // .. this is executed,
+        break;      // and this breaks out of the switch().
+
+    case 2:         // when a == 2
+
+                                                                    Page 17
+
+HEXEN Specs v0.9                                                    Page 18
+
+        b = 8;      // .. this is executed,
+                    // but there is no break, so it continues to the next
+                    // case, even though a != 3.
+
+    case 3:         // when a == 3
+        b = 666;    // .. this is executed,
+        break;      // and this breaks out of the switch().
+
+    default:        // when none of the other cases match,
+        b = 777;    // .. this is executed.
+    }
+
+    * Note for C users: While C only allows integral expressions in a switch
+      statement, ACS allows full expressions such as "a + 10".
+
+
+[4-2-6-4] Jump Statements
+-------------------------
+
+A jump statement passes control to another portion of the script.
+
+<jump-statement>:
+  continue ;
+  break ;
+  restart ;
+
+
+[4-2-6-5] Iteration Statements
+------------------------------
+
+<iteration-statement>:
+  while ( <expression> ) <statement>
+  until ( <expression> ) <statement>
+  do <statement> while ( <expression> ) ;
+  do <statement> until ( <expression> ) ;
+  for ( <assignment-statement> ; <expression> ; <assignment-statement> )
+    <statement>
+
+The continue, break and restart keywords can be used in an iteration
+statement:
+
+    - the continue keyword jumps to the end of the last <statement> in the
+      iteration-statement.  The loop continues.
+
+    - the break keyword jumps right out of the iteration-statement.
+
+
+[4-2-6-6] Function Statements
+-----------------------------
+
+
+                                                                    Page 18
+
+HEXEN Specs v0.9                                                    Page 19
+
+A function statement calls a Hexen internal-function, or a Hexen
+linespecial-function.
+
+<function-statement>:
+  <internal-function> | <linespecial-statement>
+
+<internal-function>:
+  <identifier> ( <expression> , ... ) ;
+  <identifier> ( const : <constant-expression> , ... ) ;
+
+<linespecial-statement>:
+  <linespecial> ( <expression> , ... ) ;
+  <linespecial> ( const : <constant-expression> , ... ) ;
+
+
+[4-2-6-7] Print Statements
+--------------------------
+
+<print-statement>:
+  print ( <print-type> : <expression> , ... ) ;
+  printbold ( <print-type> : <expression> , ... ) ;
+
+<print-type>:
+    s   string
+    d   decimal
+    c   constant
+
+
+[4-2-6-8] Selection Statements
+------------------------------
+
+<selection-statement>:
+  if ( <expression> ) <statement>
+  if ( <expression> ) <statement> else <statement>
+
+
+[4-2-6-9] Control Statements
+----------------------------
+
+<control-statement>:
+  suspend ;         // suspends the script
+  terminate ;       // terminates the script
+
+
+[4-2-7] Internal Functions
+--------------------------
+
+ void tagwait(int tag);
+ ----------------------
+
+
+                                                                    Page 19
+
+HEXEN Specs v0.9                                                    Page 20
+
+  The current script is suspended until all sectors marked with
+  <tag> are inactive.
+
+
+ void polywait(int po);
+ ----------------------
+
+  The current script is suspended until the polyobj marked with
+  <po> is incactive.
+
+
+ void scriptwait(int script);
+ ----------------------------
+
+  The current script is suspended until the script specified by
+  <script> has terminated.
+
+
+ void delay(int ticks);
+ ----------------------
+
+  The current script is suspended for a time specified by <ticks>.
+  A tick represents one cycle from a 35Hz timer.
+
+
+ void changefloor(int tag, str flatname);
+ ----------------------------------------
+
+  The floor flat for all sectors marked with <tag> is changed to
+  <flatname>.
+
+
+ void changeceiling(int tag, str flatname);
+ ------------------------------------------
+
+  The ceiling flat for all sectors marked with <tag> is changed to
+  <flatname>.
+
+
+ int random(int low, int high);
+ ------------------------------
+
+  Returns a random number between <low> and <high>, inclusive.  The
+  values for <low> and <high> range from 0 to 255.
+
+
+ int lineside(void);
+ -------------------
+
+  Returns the side of the line the script was activated from.  Use
+
+                                                                    Page 20
+
+HEXEN Specs v0.9                                                    Page 21
+
+  the macros LINE_FRONT and LINE_BACK, defined in "defs.acs".
+
+
+ void clearlinespecial(void);
+ ----------------------------
+
+  The special of the line that activated the script is cleared.
+
+
+ int playercount(void);
+ ----------------------
+
+  Returns the number of active players.
+
+
+ int gametype(void);
+ -------------------
+
+  Returns the type of game being played:
+   GAME_SINGLE_PLAYER
+   GAME_NET_COOPERATIVE
+   GAME_NET_DEATHMATCH
+
+
+ int gameskill(void);
+ --------------------
+
+  Returns the skill of the game being played:
+   SKILL_VERY_EASY
+   SKILL_EASY
+   SKILL_NORMAL
+   SKILL_HARD
+   SKILL_VERY_HARD
+
+  Example:
+   int a;
+   a = gameskill();
+
+   switch( gameskill() )
+   {
+   case SKILL_VERY_EASY:
+    ...
+   case SKILL_VERY_HARD:
+    ...
+   }
+
+
+ int timer(void);
+ ----------------
+
+
+                                                                    Page 21
+
+HEXEN Specs v0.9                                                    Page 22
+
+  Returns the current leveltime in ticks.
+
+
+ void sectorsound(str name, int volume);
+ ---------------------------------------
+
+  Plays a sound in the sector the line is facing.  <volume> has the
+  range 0 to 127.
+
+
+ void thingsound(int tid, str name, int volume);
+ -----------------------------------------------
+
+  Plays a sound at all things marked with <tid>.  <volume> has the
+  range 0 to 127.
+
+
+ void ambientsound(str name, int volume);
+ ----------------------------------------
+
+  Plays a sound that all players hear at the same volume.  <volume> has
+  the range 0 to 127.
+
+
+ void soundsequence(str name);
+ -----------------------------
+
+  Plays a sound sequence in the sector the line is facing.
+
+
+ int thingcount(int type, int tid);
+ ----------------------------------
+
+  Returns a count of things in the world.  Use the thing type definitions
+  in defs.acs for <type>.  Both <type> and <tid> can be 0 to force the
+  counting to ignore that information.
+
+  Examples:
+
+  // Count all ettins that are marked with TID 28:
+  c = thingcount(T_ETTIN, 28);
+
+  // Count all ettins, no matter what their TID is:
+  c = thingcount(T_ETTIN, 0);
+
+  // Count all things with TID 28, no matter what their type is:
+  c = thingcount(0, 28);
+
+
+ void setlinetexture(int line, int side, int position, str texturename);
+
+                                                                    Page 22
+
+HEXEN Specs v0.9                                                    Page 23
+
+ -----------------------------------------------------------------------
+
+  Sets a texture on all lines identified by <line>.  A line is identified by
+  giving it the special Line_SetIdentification in a map editor.
+
+  <side>:
+   SIDE_FRONT
+   SIDE_BACK
+  <position>:
+   TEXTURE_TOP
+   TEXTURE_MIDDLE
+   TEXTURE_BOTTOM
+
+  Examples:
+
+  setlinetexture(14, SIDE_FRONT, TEXTURE_MIDDLE, "ice01");
+  setlinetexture(3, SIDE_BACK, TEXTURE_TOP, "forest03");
+
+
+ void setlineblocking(int line, int blocking);
+ ---------------------------------------------
+
+  Sets the blocking (impassable) flag on all lines identified by <line>.
+   <blocking>:
+    ON
+    OFF
+
+  Example:
+
+  setlineblocking(22, OFF);
+
+
+ void setlinespecial(int line, int special, int arg1, int arg2,
+	int arg3, int arg4, int arg5);
+ --------------------------------------------------------------
+
+  Sets the line special and args on all lines identified by <line>.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+                                                                    Page 23
+
+HEXEN Specs v0.9                                                    Page 24
+
+ÚÄÄÄÄÄÂÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ
+³ 5-0 ³ Flats with special properties
+ÀÄÄÄÄÄÙ
+
+	Lava		Lava does damage
+	Water		Makes things sink
+	Sludge		Makes things sink
+	Ice			Changes friction
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+                                                                    Page 24
+
+HEXEN Specs v0.9                                                    Page 25
+
+ÚÄÄÄÄÄÂÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ
+³ 6-0 ³ The MAPINFO lump
+ÀÄÄÄÄÄÙ
+
+    This is a lump in the .WAD that gives attributes to each map.  This entry
+    does not go with each map - there is only one MAPINFO lump in the entire
+    IWAD.  If you include a MAPINFO lump in a PWAD, make sure it's got
+    information for all the possible maps the player will be entering.
+
+	map:		Number and name of map [1..60]
+    warptrans:  Actual map number in case maps are not sequential [1..60]
+    next:       Map to teleport to upon exit of timed deathmatch [1..60]
+	cdtrack:	CD track to play during level
+	cluster:	Defines what cluster level belongs to
+	sky1:		Default sky texture; followed by speed
+    sky2:       Alternate sky displayed in Sky2 sectors ; followed by speed
+	doublesky:	parallax sky: sky2 behind sky1
+	lightning:	Keyword indicating use of lightning on the level
+                flashes from sky1 to sky2 (see also: IndoorLightning special)
+	fadetable:	Lump Name of fade table {fogmap}
+
+	Example MapInfo entry:
+
+		map 1 "Winnowing Hall"
+		warptrans 1
+		next 2
+		cluster 1
+		sky1 SKY2 2		; 2 is the sky scroll speed
+		sky2 SKY3 0		; 0 means don't scroll sky
+		lightning
+		doublesky
+		cdtrack 13
+
+
+Note on "next" integer (for timed deathmatches):
+
+In normal gameplay, there is no linear fashion in which the game
+progresses from one level to another; you just go through a teleport
+somewhere on a level, and it takes you to somewhere on another
+level.  For -timer deathmatch, the game needs to know what level to
+proceed to because it isn't always just the next higher level.
+
+A note about the WARPTRANS keyword:  Maps are edited and named
+MAPxx, where xx is a number from 01 to 63.  This is the number that
+is used from within scripts when a map is referred to, and by the
+MAP keyword in the MAPINFO lump.  However, the -warp option and the
+warping cheat use a different set of numbers.  This different set of
+numbers is set by the WARPTRANS keyword.  By default, the WARPTRANS
+value is set to the same number as the map.  Our designers starting
+
+                                                                    Page 25
+
+HEXEN Specs v0.9                                                    Page 26
+
+making maps with numbers that had big gaps between them, and then
+made the scripts refer to these numbers, so we needed a way to pack
+all the map numbers into a continuous stream for the -warp option.
+Also, the accepted range for a WARPTRANS value is 1-31.  Makes it
+easy when using DM.
+
+
+Note on "cluster" integer:
+
+The game maps are divided into clusters.  When you enter a new cluster, you 
+can never again visit any of the levels from the previous cluster.  This 
+makes it so each individual save game only needs to backup map archives for 
+about 6-7 maps, and provides for a milestone marker of sorts for game play, 
+like an episode -- a Hexen backdrop and some text are given at the end of 
+each cluster.  If you don't enter a cluster, it defaults to 0.  The 
+commercial IWAD separates its 31 maps into 5 clusters.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+                                                                    Page 26
+
+HEXEN Specs v0.9                                                    Page 27
+
+ÚÄÄÄÄÄÂÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ
+³ 7-0 ³ PolyObjects
+ÀÄÄÄÄÄÙ
+
+Polyobjs are one-sided lines that are built somewhere else on the map, and
+then later translated to the desired start spot on the map at level load.
+
+In building polyobjs, two different line specials can be used to determine
+the line drawing order:
+
+	Polyobj_ExplicitLine(polyNumber, orderNumber, polyMirror, sound);
+	Polyobj_StartLine(polyNumber, polyMirror, sound);
+
+Each polyobj should have a unique polyNumber, which is used in poly line
+specials to refer to a particular polyobj.
+
+polyMirror refers to a second polyobj that will "mirror" all actions of the
+first polyobj.  For instance, if a polyobj is rotated to the right by 90
+degrees, then that polyobj's mirror will rotate left 90 degrees.  Note that
+having two polyobjs mirror each other is not considered to be a good thing,
+but in general won't cause problems because a poly can only do one particular
+action at a time.  Meaning:  if that poly that rotated left by 90 degrees
+then mirrored the right-turning polyobj, the right-turning poly would ignore
+any attempt to rotate it again, as it would already be being acted upon.
+
+    The last parameter to these specials refers to a particular sound type
+that should play when the poly is moved/rotated.  See the section on
+attaching sounds to a moving sector for more info.
+
+
+Polyobj_StartLine():
+
+A very basic special.  Place it on a particular polyobj line, and that line
+will be the first line rendered on the polyobj.  The rendering order for all
+other lines are determined by itterating through to the next line that has a
+first point identical to the start line's second point.  The third line
+rendered will be the next line that has a first point identical to the second
+line's second point, and so on and so forth.  This method works well for
+polyobjs that are convex, and has the advantage of leaving all but one line
+free for other line specials.
+
+Polyobj_ExplicitLine:
+
+This special requires a bit more work to use.  Each line in the polyobj
+defined using this special must use this line special.  Then, a value from
+1-255 should be placed in orderNumber.  This defines the rendering order for
+the lines, with a 1 being the first line rendered, and so on.  Useful for
+non-convex polyobjs, but has the disadvantage of utilizing all line specials
+on the poly.
+
+                                                                    Page 27
+
+HEXEN Specs v0.9                                                    Page 28
+
+
+
+[7-1] Polyobj Start Spots and Anchor Points
+-------------------------------------------
+
+Each polyobj must have an anchor point, and a startSpot.  The anchor is a
+thing placed near the polyobj when it's created that defines the origin of
+the polyobj, or the point in which it will rotate about.  The anchor (and all
+polyobj lines) are directly translated to the polyobj startSpot.
+
+Bottom line:  The anchor point is the point near the polyobj, and the
+startSpot is the point on the actual map that defines the location of the
+poly.
+
+There are two different types of startSpots:  crushing and non-crushing.
+Pretty obvious what the difference is:  if the poly strikes an object, it'll
+first attempt to move it.  If that fails it will either try to damage the
+object, or just stop moving depending upon the type of startSpot.
+
+Please note that the ANGLE field of the startSpot and anchor points should be
+equal to the polyNumber that was previously defined for that particular
+polyobj.  The polyobj stuff was done before any of the TID/thing special code
+was implimented, so Raven did this temporary hack, which turned permanent, as
+the designers had already done a ton of polyobjs, and didn't want to have to
+go back and replace them.
+
+
+Appendixes:
+
+    A.  List of Spawnable Objects
+    B.  List of Activate/Deactivate Objects
+    C.  List of arg requiring Objects
+    D.  List of Sector Specials
+    E.  List of Line Specials
+    F.  List of Sector Sounds
+    G.  Key Numbers
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+                                                                    Page 28
+
+HEXEN Specs v0.9                                                    Page 29
+
+ÚÄÄÄÂÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ
+³ A ³ List of Spawnable Objects
+ÀÄÄÄÙ
+
+    Use these identifiers for the Thing_Spawn() and Thing_SpawnNoFog()
+    specials:
+
+	T_NONE
+	T_CENTAUR
+	T_CENTAURLEADER
+	T_DEMON
+	T_ETTIN
+	T_FIREGARGOYLE
+	T_WATERLURKER
+	T_WATERLURKERLEADER
+	T_WRAITH
+	T_WRAITHBURIED
+	T_FIREBALL1
+	T_MANA1
+	T_MANA2
+	T_ITEMBOOTS
+	T_ITEMEGG
+	T_ITEMFLIGHT
+	T_ITEMSUMMON
+	T_ITEMTPORTOTHER
+	T_ITEMTELEPORT
+	T_BISHOP
+	T_ICEGOLEM
+	T_BRIDGE
+	T_DRAGONSKINBRACERS
+	T_ITEMHEALTHPOTION
+	T_ITEMHEALTHFLASK
+	T_ITEMHEALTHFULL
+	T_ITEMBOOSTMANA
+	T_FIGHTERAXE
+	T_FIGHTERHAMMER
+	T_FIGHTERSWORD1
+	T_FIGHTERSWORD2
+	T_FIGHTERSWORD3
+	T_CLERICSTAFF
+	T_CLERICHOLY1
+	T_CLERICHOLY2
+	T_CLERICHOLY3
+	T_MAGESHARDS
+	T_MAGESTAFF1
+	T_MAGESTAFF2
+	T_MAGESTAFF3
+	T_MORPHBLAST
+	T_ROCK1
+
+                                                                    Page 29
+
+HEXEN Specs v0.9                                                    Page 30
+
+	T_ROCK2
+	T_ROCK3
+	T_DIRT1
+	T_DIRT2
+	T_DIRT3
+	T_DIRT4
+	T_DIRT5
+	T_DIRT6
+	T_ARROW
+	T_DART
+	T_POISONDART
+	T_RIPPERBALL
+	T_STAINEDGLASS1
+	T_STAINEDGLASS2
+	T_STAINEDGLASS3
+	T_STAINEDGLASS4
+	T_STAINEDGLASS5
+	T_STAINEDGLASS6
+	T_STAINEDGLASS7
+	T_STAINEDGLASS8
+	T_STAINEDGLASS9
+	T_STAINEDGLASS0
+	T_BLADE
+	T_ICESHARD
+	T_FLAME_SMALL
+	T_FLAME_LARGE
+	T_MESHARMOR
+	T_FALCONSHIELD
+	T_PLATINUMHELM
+	T_AMULETOFWARDING
+	T_ITEMFLECHETTE
+	T_ITEMTORCH
+	T_ITEMREPULSION
+	T_MANA3
+	T_PUZZSKULL
+	T_PUZZGEMBIG
+	T_PUZZGEMRED
+	T_PUZZGEMGREEN1
+	T_PUZZGEMGREEN2
+	T_PUZZGEMBLUE1
+	T_PUZZGEMBLUE2
+	T_PUZZBOOK1
+	T_PUZZBOOK2
+	T_METALKEY
+	T_SMALLMETALKEY
+	T_AXEKEY
+	T_FIREKEY
+	T_GREENKEY
+	T_MACEKEY
+	T_SILVERKEY
+
+                                                                    Page 30
+
+HEXEN Specs v0.9                                                    Page 31
+
+	T_RUSTYKEY
+	T_HORNKEY
+	T_SERPENTKEY
+	T_WATERDRIP
+	T_TEMPSMALLFLAME
+	T_PERMSMALLFLAME
+	T_TEMPLARGEFLAME
+	T_PERMLARGEFLAME
+	T_DEMON_MASH
+	T_DEMON2_MASH
+	T_ETTIN_MASH
+	T_CENTAUR_MASH
+	T_THRUSTSPIKEUP
+	T_THRUSTSPIKEDOWN
+	T_FLESH_DRIP1
+	T_FLESH_DRIP2
+	T_SPARK_DRIP
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+                                                                    Page 31
+
+HEXEN Specs v0.9                                                    Page 32
+
+ÚÄÄÄÂÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ
+³ B ³ List of Activateable/Deactivateable Objects
+ÀÄÄÄÙ
+
+	Activatable:
+		MT_ZTWINEDTORCH				Lights torch
+		MT_ZTWINEDTORCH_UNLIT		Lights torch
+		MT_ZWALLTORCH				Lights torch
+		MT_ZWALLTORCH_UNLIT			Lights torch
+		MT_ZGEMPEDESTAL				Makes gem appear
+        MT_ZWINGEDSTATUENOSKULL     Makes skull appear in hands
+        MT_THRUSTFLOOR_UP           Raises thrust spike (if lowered)
+        MT_THRUSTFLOOR_DOWN         Raises thrust spike
+		MT_ZFIREBULL				Lights flames
+		MT_ZFIREBULL_UNLIT			Lights flames
+        MT_ZBELL                    Rings bell
+		MT_ZCAULDRON				Lights flames
+		MT_ZCAULDRON_UNLIT			Lights flames
+		MT_FLAME_SMALL				Ignites flame
+		MT_FLAME_LARGE				Ignites flame
+        MT_BAT_SPAWNER              Start bat spawning
+
+	Deactivatable:
+		MT_ZTWINEDTORCH				Extinguish torch
+		MT_ZTWINEDTORCH_UNLIT		Extinguish torch
+		MT_ZWALLTORCH				Extinguish torch
+		MT_ZWALLTORCH_UNLIT			Extinguish torch
+        MT_THRUSTFLOOR_UP           Lower thrust spike
+        MT_THRUSTFLOOR_DOWN         Lower thrust spike
+		MT_ZFIREBULL				Extinguish torch
+		MT_ZFIREBULL_UNLIT			Extinguish torch
+		MT_ZCAULDRON				Extinguish torch
+		MT_ZCAULDRON_UNLIT			Extinguish torch
+		MT_FLAME_SMALL				Extinguish torch
+		MT_FLAME_LARGE				Extinguish torch
+		MT_BAT_SPAWNER				Stop bat spawning
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+                                                                    Page 32
+
+HEXEN Specs v0.9                                                    Page 33
+
+ÚÄÄÄÂÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ
+³ C ³ List of THINGS that require arguments
+ÀÄÄÄÙ
+
+    These THINGS ignore their special types, and use the arg0..arg5 fields
+    for their own purposes:
+
+		Type: 10225		Bat Spawner
+            arg0:   frequency of spawn (1=fastest, 10=slowest)
+			arg1:	spread angle (0..255)
+			arg2:	unused
+			arg3:	duration of bats (in octics)
+            arg4:   turn amount per move (in degrees [0..255])
+
+		Type: 10000		Fog Spawner
+			arg0:	movement speed [0..10] (10 == fastest)
+            arg1:   spread angle [0..128] (128 == 180 degrees)
+			arg2:	Frequency of spawn [1..10] (1 == fastest)
+			arg3:	Fog Lifetime [0..255] (5 == 1 second)
+			arg4:	unused
+
+		Type: 10001		Fog Patch Small
+			arg0:	movement speed [0..10] (10 == fastest)
+			arg1:	unused
+			arg2:	unused
+			arg3:	Fog Lifetime [0..255] (5 == 1 second)
+			arg4:	Boolean: (0 == not moving)
+
+		Type: 10002		Fog Patch Medium
+			arg0:	movement speed [0..10] (10 == fastest)
+			arg1:	unused
+			arg2:	unused
+			arg3:	Fog Lifetime [0..255] (5 == 1 second)
+			arg4:	Boolean: (0 == not moving)
+
+		Type: 10003		Fog Patch Large
+			arg0:	movement speed [0..10] (10 == fastest)
+			arg1:	unused
+			arg2:	unused
+			arg3:	Fog Lifetime [0..255] (5 == 1 second)
+			arg4:	Boolean: (0 == not moving)
+
+		Type: 254		Dragon Lich
+			arg0:	TID of possible destination (required)
+			arg1:	TID of possible destination (optional)
+			arg2:	TID of possible destination (optional)
+			arg3:	TID of possible destination (optional)
+			arg4:	TID of possible destination (optional)
+
+
+                                                                    Page 33
+
+HEXEN Specs v0.9                                                    Page 34
+
+            The dragon lich also requires mapspots placed around the map with
+            its args containing TIDs of possible destinations, making up to 5
+            destinations possible from each position.  The choice of next
+            destination is random.  Note that the dragon lich's first
+            destination is the first thing that it can locate that has a TID
+            identical to it's own.
+
+		Type: 10200		Korax
+			TIDs:
+				245	Korax's mapthing
+                249 Teleport destination (MapSpots)
+			Scripts:
+                249 Run when korax health falls below half
+				250-254 Randomly run by korax as commands
+				255	Run upon death of korax
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+                                                                    Page 34
+
+HEXEN Specs v0.9                                                    Page 35
+
+ÚÄÄÄÂÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ
+³ D ³ Sector Specials
+ÀÄÄÄÙ
+
+    The following numbers are used in the sector.type field [see DOOM
+    specs.]:
+
+	1	Light_Phased
+	2	LightSequenceStart
+	3	LightSequenceSpecial1
+    4   LightSequenceSpecial2
+
+        These specials deal with phased lightning ("moving lights").  Two
+        different ways to go about doing phased lighting:  automatic, or
+        by-hand.  The automatic method is (obviously) more convenient, but
+        the by-hand method is more flexible.  Light_Phased is the by-hand
+        special.  Place it on a sector, then set the sector's lightlevel to a
+        phase index (0-63).  As you place the special on nearby sectors,
+        increment the index for each sector.
+
+        Or, to use the LightSequence specials, just place the LightSequence
+        special on a sector.  Then, for each additional sector, alternate
+        between LightSequenceSpecial1 & LightSequenceSpecial2.
+
+        For instance, if you wanted phased lightning to flow up a staircase,
+        you could either place Light_Phased on each step, and change the
+        phase index (lightlevel) accordingly.  Or, you could place
+        LightSequenceStart on the bottom step (and set that step's lightlevel
+        to something mid-ranged:  80-128 are pretty nice values), and then
+        let the game calculate the phase indices for each step by placing the
+        LightSequenceSpecial specials on all other steps.  Note that for the
+        LightSequenceSpecial specials to have proper lighting, set their
+        lightlevels to zero, which causes it to use the previous sector's
+        lightlevel.  Hence, that "nice value" which was placed on the first
+        step will iterate through all the other steps.  If a step's
+        lightlevel is not zero, then that value will filter down to all other
+        steps after it.
+
+	26	Stairs_Special1
+	27	Stairs_Special2
+        Used by action specials that build stairs.
+
+	199	Light_IndoorLightning1
+        Dimmer effect during lightning flash.  Used for indoor areas, which
+        are normally not affected by lightning.
+
+    198 Light_IndoorLightning2
+		Same as 1, but brighter.
+
+
+                                                                    Page 35
+
+HEXEN Specs v0.9                                                    Page 36
+
+	200	Sky2
+        Use the alternate sky specified in the mapinfo lump.
+
+	201	Scroll_North_Slow
+	202	Scroll_North_Medium
+	203	Scroll_North_Fast
+	204	Scroll_East_Slow
+	205	Scroll_East_Medium
+	206	Scroll_East_Fast
+	207	Scroll_South_Slow
+	208	Scroll_South_Medium
+	209	Scroll_South_Fast
+	210	Scroll_West_Slow
+	211	Scroll_West_Medium
+	212	Scroll_West_Fast
+	213	Scroll_NorthWest_Slow
+	214	Scroll_NorthWest_Medium
+	215	Scroll_NorthWest_Fast
+	216	Scroll_NorthEast_Slow
+	217	Scroll_NorthEast_Medium
+	218	Scroll_NorthEast_Fast
+	219	Scroll_SouthEast_Slow
+	220	Scroll_SouthEast_Medium
+	221	Scroll_SouthEast_Fast
+	222	Scroll_SouthWest_Slow
+	223	Scroll_SouthWest_Medium
+	224	Scroll_SouthWest_Fast
+
+        These all scroll floor flats in their respective directions.  They
+        also move any objects in that direction.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+                                                                    Page 36
+
+HEXEN Specs v0.9                                                    Page 37
+
+ÚÄÄÄÂÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ
+³ E ³ Action Specials
+ÀÄÄÄÙ
+
+    These are the specials found in the THING.special and LINEDEF.special
+    fields.
+
+
+	Floor and Ceiling Specials
+	--------------------------
+	20:Floor_LowerByValue / tag / speed / height / arg4 / arg5
+		tag:		tag of affected sector
+		speed:		speed of move [0..255]
+		height:		relative height of move in pixels
+
+            Moves the floor of all sectors identified by 'tag'.
+
+	21:Floor_LowerToLowest / tag / speed / arg3 / arg4 / arg5
+		tag:		tag of affected sector
+		speed:		speed of move [0..255]
+
+            Lowers floor to lowest adjacent sectors' floor.
+
+	22:Floor_LowerToNearest / tag / speed / arg3 / arg4 / arg5
+		tag:		tag of affected sector
+		speed:		speed of move [0..255]
+
+            Lowers floor to next lower adjacent sector's floor.
+
+	23:Floor_RaiseByValue / tag / speed / height / arg4 / arg5
+		tag:		tag of affected sector
+		speed:		speed of move [0..255]
+		height:		relative height of move in pixels
+
+            Moves the floor of all sectors identified by 'tag'.
+
+	24:Floor_RaiseToHighest / tag / speed / arg3 / arg4 / arg5
+		tag:		tag of affected sector
+		speed:		speed of move [0..255]
+
+            Raises floor to highest adjacent sectors' floor.
+
+	25:Floor_RaiseToNearest / tag / speed / arg3 / arg4 / arg5
+		tag:		tag of affected sector
+		speed:		speed of move [0..255]
+
+            Raises floor to next higher adjacent sector's floor.
+
+	28:Floor_RaiseAndCrush / tag / speed / crush / arg4 / arg5
+
+                                                                    Page 37
+
+HEXEN Specs v0.9                                                    Page 38
+
+		tag:		tag of affected sector
+		speed:		speed of move [0..255]
+		crush:		damage done by crush
+
+            Raises floor to ceiling and does crushing damage.
+
+	35:Floor_RaiseByValueTimes8 / tag / speed / height / arg4 / arg5
+		tag:		tag of affected sector
+		speed:		speed of move [0..255]
+		height:		relative height of move in 8 pixel units
+
+            Raises the floor in increments of 8 units.
+
+	36:Floor_LowerByValueTimes8 / tag / speed / height / arg4 / arg5
+		tag:		tag of affected sector
+		speed:		speed of move [0..255]
+		height:		relative height of move in 8 pixel units
+
+            Lowers the floor in increments of 8 units.
+
+	46:Floor_CrushStop / tag / arg2 / arg3 / arg4 / arg5
+		tag:		tag of affected sector
+
+            Turns off a crushing floor.
+
+	66:Floor_LowerInstant / tag / arg2 / height / arg4 / arg5
+		tag:		tag of affected sector
+		height:		relative height in units of 8 pixels
+
+            Moves the floor down instantly by a specified amount.
+
+	67:Floor_RaiseInstant / tag / arg2 / height / arg4 / arg5
+		tag:		tag of affected sector
+		height:		relative height in units of 8 pixels
+
+            Moves the floor up instantly by a specified amount.
+
+    68:Floor_MoveToValueTimes8 / tag / speed / height / negative / arg5
+		tag:		tag of affected sector
+		speed:		speed of move
+        height:     absolute value in 8 pixel units of destination height
+        negative:   boolean (true if height is negative)
+
+            Move floor to an absolute height.
+
+	40:Ceiling_LowerByValue / tag / speed / height / arg4 / arg5
+		tag:		tag of affected sector
+		speed:		speed of move
+		height:		relative height of move in pixels
+
+
+                                                                    Page 38
+
+HEXEN Specs v0.9                                                    Page 39
+
+            Relative ceiling move.
+
+	41:Ceiling_RaiseByValue / tag / speed / height / arg4 /arg5
+		tag:		tag of affected sector
+		speed:		speed of move
+		height:		relative height of move in pixels
+
+            Relative ceiling move.
+
+	42:Ceiling_CrushAndRaise / tag / speed / crush / arg4 / arg5
+		tag:		tag of affected sector
+		speed:		speed of move
+		crush:		damage of crush
+
+            Lowers ceiling to crush and raises (continual until stopped)
+
+	43:Ceiling_LowerAndCrush / tag / speed / crush / arg4 / arg5
+		tag:		tag of affected sector
+		speed:		speed of move
+		crush:		damage of crush
+
+            Lowers ceiling to floor and stops.
+
+	44:Ceiling_CrushStop / tag / arg2 / arg3 / arg4 / arg5
+		tag:		tag of affected sector
+
+            Stop a crushing ceiling.
+
+	45:Ceiling_CrushRaiseAndStay / tag / speed / crush / arg4 / arg5
+		tag:		tag of affected sector
+		speed:		speed of move
+		crush:		damage of crush
+
+            Lowers ceiling to crush, raises and stays.
+
+    69:Ceiling_MoveToValueTimes8 / tag / speed / height / negative / arg5
+		tag:		tag of affected sector
+		speed:		speed of move
+        height:     absolute value in 8 pixel units of destination height
+		negative:	boolean (true if height is negative)
+
+            Moves ceiling to absolute height.
+
+    95:FloorAndCeiling_LowerByValue / tag / speed / height / arg4 / arg5
+		tag:		tag of affected sector
+		speed:		speed of move
+        height:     absolute value in 8 pixel units of destination height
+
+            Relative move of both floor and ceiling.
+
+
+                                                                    Page 39
+
+HEXEN Specs v0.9                                                    Page 40
+
+    96:FloorAndCeiling_RaiseByValue / tag / speed / height / arg4 / arg5
+		tag:		tag of affected sector
+		speed:		speed of move
+        height:     absolute value in 8 pixel units of destination height
+
+            Relative move of both floor and ceiling.
+
+	60:Plat_PerpetualRaise / tag / speed / delay / arg4 / arg5
+		tag:		tag of affected sector
+		speed:		speed of move
+		delay:		delay before reversing direction
+
+            Continually raises and lowers platform.
+
+	61:Plat_Stop / tag / arg2 / arg3 / arg4 / arg5
+		tag:		tag of affected sector
+
+            Stops a PerpectualRaise platform.
+
+	62:Plat_DownWaitUpStay / tag / speed / delay / arg4 / arg5
+		tag:		tag of affected sector
+		speed:		speed of move
+		delay:		delay before reversing direction
+
+            One cycle of lowering and raising.
+
+	63:Plat_DownByValue / tag / speed / delay / height / arg5
+		tag:		tag of affected sector
+		speed:		speed of move
+		delay:		delay before reversing direction
+		height:		relative height in 8 pixel units
+
+            Relative platform move.
+
+	64:Plat_UpWaitDownStay / tag / speed / delay / arg4 / arg5
+		tag:		tag of affected sector
+		speed:		speed of move
+		delay:		delay before reversing direction
+
+            One cycle of raising and lowering.
+
+	65:Plat_UpByValue / tag / speed / delay / height / arg5
+		tag:		tag of affected sector
+		speed:		speed of move
+		delay:		delay before reversing direction
+		height:		relative height
+
+            Relative platform move.
+
+	29:Pillar_Build / tag / speed / height / arg4 / arg5
+
+                                                                    Page 40
+
+HEXEN Specs v0.9                                                    Page 41
+
+		tag:		tag of affected sector
+		speed:		speed of build
+		height:		height (relative to floor) where
+
+            Makes the floor meet the ceiling.
+
+	30:Pillar_Open / tag / speed / f_height / c_height / arg5
+		tag:		tag of affected sector
+		speed:		speed of build
+		f_height:	relative height to move floor down
+		c_height:	relative height to move ceiling up
+
+            Makes the floor and the ceiling meet by moving both.
+
+	94:Pillar_BuildAndCrush / tag / speed / height / crush / arg5
+		tag:		tag of affected sector
+		speed:		speed of build
+        height:     height (relative to floor) where floor meets ceiling
+		crush:		damage from crushing
+
+
+	Stair Specials
+	--------------
+	These stair building specials find the sector with 'tag' and
+	build stairs by traversing adjacent sector marked with the
+	StairSpecial1 and StairSpecial2.  These specials must alternate
+	between the two and must not branch.
+
+	26:Stairs_BuildDown / tag / speed / height / delay / reset
+		tag:		tag of sector to start in
+		speed:		speed of build [0.255]
+		height:		height of step in pixels
+		delay:		delay between steps in tics
+        reset:      delay before stairs to reset (0==no reset)
+
+	27:Stairs_BuildUp / tag / speed / height / delay / reset
+		tag:		tag of sector to start in
+		speed:		speed of build [0.255]
+		height:		height of step in pixels
+		delay:		delay between steps in tics
+        reset:      delay before stairs to reset (0==no reset)
+
+	31:Stairs_BuildDownSync / tag / speed / height / reset / arg5
+		tag:		tag of sector to start in
+		speed:		speed of build [0.255]
+		height:		height of step in pixels
+        reset:      delay before stairs to reset (0==no reset)
+
+	32:Stairs_BuildUpSync / tag / speed / height / reset / arg5
+		tag:		tag of sector to start in
+
+                                                                    Page 41
+
+HEXEN Specs v0.9                                                    Page 42
+
+		speed:		speed of build [0.255]
+		height:		height of step in pixels
+        reset:      delay before stairs to reset (0==no reset)
+
+
+	Door Specials
+	-------------
+	10:Door_Close / tag / speed / arg3 / arg4 / arg5
+        tag:        tag of affected sector or zero if line is part of door
+		speed:		speed of move
+
+            Closes a door sector.
+
+	11:Door_Open / tag / speed / arg3 / arg4 / arg5
+        tag:        tag of affected sector or zero if line is part of door
+		speed:		speed of move
+
+            Opens a door sector.
+
+	12:Door_Raise / tag / speed / delay / arg4 / arg5
+        tag:        tag of affected sector or zero if line is part of door
+		speed:		speed of move
+		delay:		delay before door lowers
+
+	13:Door_LockedRaise / tag / speed / delay / lock / arg5
+        tag:        tag of affected sector or zero if line is part of door
+		speed:		speed of move
+		delay:		delay before door lowers
+        lock:       key number that will unlock door (see key numbers)
+
+            Raises a door if correct key is in inventory of triggering player.
+
+
+	Script Specials
+	---------------
+	80:ACS_Execute / script / map / s_arg1 / s_arg2 / s_arg3
+		script:		script number to execute
+		map:		map which contains the script
+
+	81:ACS_Suspend / script / map / arg3 / arg4 / arg5
+		script:		script number to suspend
+		map:		map which contains the script
+
+	82:ACS_Terminate / script / map / arg3 / arg4 / arg5
+		script:		script number to suspend
+		map:		map which contains the script
+
+	83:ACS_LockedExecute / script / map / s_arg1 / s_arg2 / lock
+		script:		script number to suspend
+		map:		map which contains the script
+
+                                                                    Page 42
+
+HEXEN Specs v0.9                                                    Page 43
+
+        lock:       key number needed to run script (see key numbers)
+
+
+	Light Specials
+	--------------
+	110:Light_RaiseByValue / tag / value / arg3 / arg4 / arg5
+		tag:		tag of affected sector
+		value:		relative value of light level change
+
+	111:Light_LowerByValue / tag / value / arg3 / arg4 / arg5
+		tag:		tag of affected sector
+		value:		relative value of light level change
+
+	112:Light_ChangeToValue / tag / value / arg3 / arg4 / arg5
+		tag:		tag of affected sector
+		value:		absolute value of light level change
+
+	113:Light_Fade / tag / value / tics / arg4 / arg5
+		tag:		tag of affected sector
+		value:		absolute value of light level change
+		tics:		number of tics to fade to light level
+
+	114:Light_Glow / tag / upper / lower / tics / arg5
+		tag:		tag of affected sector
+		upper:		brightest light level
+		lower:		lowest light level
+		tics:		number of tics between light changes
+
+	115:Light_Flicker / tag / upper / lower / arg4 / arg5
+		tag:		tag of affected sector
+		upper:		brightest light level
+		lower:		lowest light level
+
+	116:Light_Strobe / tag / upper / lower / u-tics / l-tics
+		tag:		tag of affected sector
+		upper:		brightest light level
+		lower:		lowest light level
+		u-tics:		tics to stay at upper light level
+		l-tics:		tics to stay at lower light level
+
+
+	Miscellaneous Specials
+	----------------------
+	121:Line_SetIdentification / line / arg2 / arg3 / arg4 / arg5
+		line:		unique id of this line
+
+            The script functions setlineblocking, setlinespecial, and
+            setlinetexture use the ID specified here to identify lines.
+
+	100:Scroll_Texture_Left / speed / arg2 / arg3 / arg4 / arg5
+
+                                                                    Page 43
+
+HEXEN Specs v0.9                                                    Page 44
+
+	101:Scroll_Texture_Right / speed / arg2 / arg3 / arg4 / arg5
+	102:Scroll_Texture_Up / speed / arg2 / arg3 / arg4 / arg5
+	103:Scroll_Texture_Down / speed / arg2 / arg3 / arg4 / arg5
+        speed:      speed of scroll in pixels
+
+	129:UsePuzzleItem / item / script / s_arg1 / s_arg2 / s_arg3
+		item:		item number needed to activate
+		script:		script to run upon activation
+
+            Runs a script upon use of appropriate puzzle item:
+
+            0   ZZ_Skull
+            1   ZZ_BigGem
+            2   ZZ_GemRed
+            3   ZZ_GemGreen1
+            4   ZZ_GemGreen2
+            5   ZZ_GemBlue1
+            6   ZZ_GemBlue2
+            7   ZZ_Book1
+            8   ZZ_Book2
+            9   ZZ_Skull2
+            10  ZZ_FWeapon
+            11  ZZ_CWeapon
+            12  ZZ_MWeapon
+            13  ZZ_Gear
+            14  ZZ_Gear2
+            15  ZZ_Gear3
+            16  ZZ_Gear4
+
+	140:Sector_ChangeSound / tag / sound / arg3 / arg4 /  arg5
+		tag:		tag of sector to contain sound
+		sound:		sound to be played - see sector sounds
+
+	120:Earthquake / intensity / duration / damrad / tremrad / tid
+		intensity:	strength of earthquake in richters [1..9]
+		duration:	duration in tics [1..255]
+        damrad:     radius of damage in 64x64 cells [0..255]
+		tremrad:	radius of tremor in 64x64 cells [0..255]
+		tid:		TID of map thing(s) for quake foci
+
+            Creates an earthquake at all matching foci.
+
+	74:Teleport_NewMap / map / position / arg3 / arg4 / arg5
+		map:		map to teleport to
+        position:   corresponds to destination player start spot arg0.
+
+            Teleports the player to a new map and to the player start spot
+            whose arg0 member matches 'position.'
+
+	75:Teleport_EndGame / arg1 / arg2 / arg3 / arg4 / arg5
+
+                                                                    Page 44
+
+HEXEN Specs v0.9                                                    Page 45
+
+		Ends game and runs finale script.
+        In deathmatch, teleports to level 1.
+
+	70:Teleport / tid / arg2 / arg3 / arg4 / arg5
+		tid:		TID of destination
+
+            Teleports triggering object to MapSpot with tid.
+
+	71:Teleport_NoFog / tid / arg2 / arg3 / arg4 / arg5
+        Same as teleport, but silent with no fog sprite.
+
+
+	Thing Specials
+	--------------
+	72:ThrustThing / angle / distance / arg3 / arg4 / arg5
+		angle:		byte angle to thrust [0..255]
+		distance:	distance to thrust
+
+	73:DamageThing / damage / arg2 / arg3 / arg4 / arg5
+		damage:		amount of damage
+
+	130:Thing_Activate / tid / arg2 / arg3 / arg4 / arg5
+        tid:        TID of thing to activate (see activatable things)
+
+	131:Thing_Deactivate / tid / arg2 / arg3 / arg4 / arg5
+        tid:        TID of thing to deactivate (see deactivatable things)
+
+	132:Thing_Remove / tid / arg2 / arg3 / arg4 / arg5
+		tid:		TID of thing to remove
+
+	133:Thing_Destroy / tid / arg2 / arg3 / arg4 / arg5
+		tid:		TID of affected thing
+
+            Puts thing into its death state.
+
+	134:Thing_Projectile / tid / type / angle / speed / vspeed
+		tid:		TID of spawn location
+        type:       Type of thing to spawn (see spawnable things)
+		angle:		byte angle of projectile
+		speed:		speed of projectile
+		vspeed:		vertical speed
+
+            Spawns a projectile.
+
+	136:Thing_ProjectileGravity / tid / type / angle / speed / vspeed
+		tid:		TID of spawn location
+        type:       Type of thing to spawn (see spawnable things)
+		angle:		byte angle of projectile
+		speed:		speed of projectile
+		vspeed:		vertical speed
+
+                                                                    Page 45
+
+HEXEN Specs v0.9                                                    Page 46
+
+
+            Spawns a projectile with gravity.
+
+	135:Thing_Spawn / tid / type / angle / arg4 / arg5
+		tid:		TID of spawn location
+        type:       Type of thing to spawn (see spawnable things)
+		angle:		byte angle of thing to face
+
+            Spawns a thing.
+
+	137:Thing_SpawnNoFog / tid / type / angle / arg4 / arg5
+		tid:		TID of spawn location
+        type:       Type of thing to spawn (see spawnable things)
+		angle:		byte angle of projectile
+
+            Spawns a thing silently.
+
+
+	PolyObject Specials
+	--------------------
+	1:Polyobj_StartLine / po / mirror / sound / arg4 / arg5
+		po: 		refer to a particular polyobj
+        mirror:     poly that will mirror the moves of this poly
+		sound:		See Section 5:  Sector Sound
+
+	2:Polyobj_RotateLeft / po / speed / angle / arg4 / arg5
+		po:			polyobj
+		speed:		speed
+		angle:		byte angle to rotate
+
+	3:Polyobj_RotateRight / po / speed / angle / arg4 / arg5
+		po:			polyobj
+		speed:		speed
+		angle:		byte angle to rotate
+
+	4:Polyobj_Move / po / speed / angle / distance / arg5
+		po:			polyobj
+		speed:		speed
+		angle:		byte angle to move along
+		distance:	byte distance to move
+
+	5:Polyobj_ExplicitLine / po / order / mirror / sound / arg5
+		po:			polyobj
+		order:		rendering order of this line
+        mirror:     poly that will mirror the moves of this poly
+		sound:		See Section 5:  Sector Sound
+
+	6:Polyobj_MoveTimes8 / po / speed / angle / distance / arg5
+		po:			polyobj
+		speed:		speed
+
+                                                                    Page 46
+
+HEXEN Specs v0.9                                                    Page 47
+
+		angle:		byte angle
+        distance:   byte distance to move in units of 8
+
+	7:Polyobj_DoorSwing / po / speed / angle / delay / arg5
+		po:			polyobj
+		speed:		speed
+		angle:		byte angle
+		delay:		delay in tics
+
+	8:Polyobj_DoorSlide / po / speed / angle / distance / delay
+		po:			polyobj
+		speed:		speed
+		angle:		byte angle
+		distance:	byte distance
+		delay:		delay in tics
+
+	90:Polyobj_OR_RotateLeft / po / speed / angle / arg4 / arg5
+	91:Polyobj_OR_RotateRight / po / speed / angle / arg4 / arg5
+	92:Polyobj_OR_Move / po / speed / angle / distance / arg5
+	93:Polyobj_OR_MoveTimes8 / po / speed / angle / distance / arg5
+
+The OR stands for OverRide.  As stated before, each poly can only be doing a
+single action at a time.  This poses a problem with perpetual polyobjs, since
+they are already moving, the designer cannot do anything else with them.
+However, using these functions the designer can override the code to not
+allow a poly to concurrently execute more than one action, and force a poly
+to do the other action as well.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+                                                                    Page 47
+
+HEXEN Specs v0.9                                                    Page 48
+
+ÚÄÄÄÂÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ
+³ F ³ Sector Sounds for ChangeSectorSound() special:
+ÀÄÄÄÙ
+
+	1	heavy
+	2	metal
+	3	creak
+	4	silence
+	5	lava
+	6	water
+	7	ice
+	8	earth
+	9	metal2
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+                                                                    Page 48
+
+HEXEN Specs v0.9                                                    Page 49
+
+ÚÄÄÄÂÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ
+³ G ³ Key Numbers
+ÀÄÄÄÙ
+
+    These are referenced by the DoorRaiseLocked() and ACS_ExecuteLocked()
+    specials.
+
+	1	steel key
+	2	cave key
+	3	axe key
+	4	fire key
+	5	emerald key
+	6	dungeon key
+	7	silver key
+	8	rusted key
+	9	horn key
+    10  swamp key
+    11  castle key
+
+
diff --git a/Documents/Scintilla/Indices.cs b/Documents/Scintilla/Indices.cs
new file mode 100644
index 0000000..1ed4ab7
--- /dev/null
+++ b/Documents/Scintilla/Indices.cs
@@ -0,0 +1,1853 @@
+// ALL LEXERS AND THEIR INDEX
+// BELOW YOU CAN FIND THE STYLE INDICES FOR EACH LEXER
+
+public enum Lexer
+{    
+	container = 0,
+	@null = 1,
+	python = 2,
+	cpp = 3,
+	html = 4,
+	xml = 5,
+	perl = 6,
+	sql = 7,
+	vb = 8,
+	properties = 9,
+	errorlist = 10,
+	makefile = 11,
+	batch = 12,
+	xcode = 13,
+	latex = 14,
+	lua = 15,
+	diff = 16,
+	conf = 17,
+	pascal = 18,
+	ave = 19,
+	ada = 20,
+	lisp = 21,
+	ruby = 22,
+	eiffel = 23,
+	eiffelkw = 24,
+	tcl = 25,
+	nncrontab = 26,
+	bullant = 27,
+	vbscript = 28,
+	asp = 29,
+	php = 30,
+	baan = 31,
+	matlab = 32,
+	scriptol = 33,
+	asm = 34,
+	cppnocase = 35,
+	fortran = 36,
+	f77 = 37,
+	css = 38,
+	pov = 39,
+	lout = 40,
+	escript = 41,
+	ps = 42,
+	nsis = 43,
+	mmixal = 44,
+	clw = 45,
+	clwnocase = 46,
+	lot = 47,
+	yaml = 48,
+	tex = 49,
+	metapost = 50,
+	powerbasic = 51,
+	forth = 52,
+	erlang = 53,
+	octave = 54,
+	mssql = 55,
+	verilog = 56,
+	kix = 57,
+	gui4cli = 58,
+	specman = 59,
+	au3 = 60,
+	apdl = 61,
+	bash = 62,
+	automatic = 1000
+}
+
+
+
+// STYLE INDICES FOR EACH LEXER
+
+public enum Python
+{    
+	@default = 0,
+	commentline = 1,
+	number = 2,
+	@string = 3,
+	character = 4,
+	word = 5,
+	triple = 6,
+	tripledouble = 7,
+	classname = 8,
+	defname = 9,
+	@operator = 10,
+	identifier = 11,
+	commentblock = 12,
+	stringeol = 13,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum Ruby
+{    
+	@default = 0,
+	commentline = 1,
+	number = 2,
+	@string = 3,
+	character = 4,
+	word = 5,
+	triple = 6,
+	tripledouble = 7,
+	classname = 8,
+	defname = 9,
+	@operator = 10,
+	identifier = 11,
+	commentblock = 12,
+	stringeol = 13,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum Cpp
+{    
+	@default = 0,
+	comment = 1,
+	commentline = 2,
+	commentdoc = 3,
+	number = 4,
+	word = 5,
+	@string = 6,
+	character = 7,
+	uuid = 8,
+	preprocessor = 9,
+	@operator = 10,
+	identifier = 11,
+	stringeol = 12,
+	verbatim = 13,
+	regex = 14,
+	commentlinedoc = 15,
+	word2 = 16,
+	commentdockeyword = 17,
+	commentdockeyworderror = 18,
+	globalclass = 19,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum SQL
+{    
+	@default = 0,
+	comment = 1,
+	commentline = 2,
+	commentdoc = 3,
+	number = 4,
+	word = 5,
+	@string = 6,
+	character = 7,
+	uuid = 8,
+	preprocessor = 9,
+	@operator = 10,
+	identifier = 11,
+	stringeol = 12,
+	verbatim = 13,
+	regex = 14,
+	commentlinedoc = 15,
+	word2 = 16,
+	commentdockeyword = 17,
+	commentdockeyworderror = 18,
+	globalclass = 19,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum Pascal
+{    
+	@default = 0,
+	comment = 1,
+	commentline = 2,
+	commentdoc = 3,
+	number = 4,
+	word = 5,
+	@string = 6,
+	character = 7,
+	uuid = 8,
+	preprocessor = 9,
+	@operator = 10,
+	identifier = 11,
+	stringeol = 12,
+	verbatim = 13,
+	regex = 14,
+	commentlinedoc = 15,
+	word2 = 16,
+	commentdockeyword = 17,
+	commentdockeyworderror = 18,
+	globalclass = 19,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum TCL
+{    
+	@default = 0,
+	comment = 1,
+	commentline = 2,
+	commentdoc = 3,
+	number = 4,
+	word = 5,
+	@string = 6,
+	character = 7,
+	uuid = 8,
+	preprocessor = 9,
+	@operator = 10,
+	identifier = 11,
+	stringeol = 12,
+	verbatim = 13,
+	regex = 14,
+	commentlinedoc = 15,
+	word2 = 16,
+	commentdockeyword = 17,
+	commentdockeyworderror = 18,
+	globalclass = 19,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum BullAnt
+{    
+	@default = 0,
+	comment = 1,
+	commentline = 2,
+	commentdoc = 3,
+	number = 4,
+	word = 5,
+	@string = 6,
+	character = 7,
+	uuid = 8,
+	preprocessor = 9,
+	@operator = 10,
+	identifier = 11,
+	stringeol = 12,
+	verbatim = 13,
+	regex = 14,
+	commentlinedoc = 15,
+	word2 = 16,
+	commentdockeyword = 17,
+	commentdockeyworderror = 18,
+	globalclass = 19,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum HTML
+{    
+	@default = 0,
+	tag = 1,
+	tagunknown = 2,
+	attribute = 3,
+	attributeunknown = 4,
+	number = 5,
+	doublestring = 6,
+	singlestring = 7,
+	other = 8,
+	comment = 9,
+	entity = 10,
+	tagend = 11,
+	xmlstart = 12,
+	xmlend = 13,
+	script = 14,
+	asp = 15,
+	aspat = 16,
+	cdata = 17,
+	question = 18,
+	@value = 19,
+	xccomment = 20,
+	sgml_default = 21,
+	sgml_command = 22,
+	sgml_1st_param = 23,
+	sgml_doublestring = 24,
+	sgml_simplestring = 25,
+	sgml_error = 26,
+	sgml_special = 27,
+	sgml_entity = 28,
+	sgml_comment = 29,
+	sgml_1st_param_comment = 30,
+	sgml_block_default = 31,
+	j_start = 40,
+	j_default = 41,
+	j_comment = 42,
+	j_commentline = 43,
+	j_commentdoc = 44,
+	j_number = 45,
+	j_word = 46,
+	j_keyword = 47,
+	j_doublestring = 48,
+	j_singlestring = 49,
+	j_symbols = 50,
+	j_stringeol = 51,
+	j_regex = 52,
+	ja_start = 55,
+	ja_default = 56,
+	ja_comment = 57,
+	ja_commentline = 58,
+	ja_commentdoc = 59,
+	ja_number = 60,
+	ja_word = 61,
+	ja_keyword = 62,
+	ja_doublestring = 63,
+	ja_singlestring = 64,
+	ja_symbols = 65,
+	ja_stringeol = 66,
+	ja_regex = 67,
+	b_start = 70,
+	b_default = 71,
+	b_commentline = 72,
+	b_number = 73,
+	b_word = 74,
+	b_string = 75,
+	b_identifier = 76,
+	b_stringeol = 77,
+	ba_start = 80,
+	ba_default = 81,
+	ba_commentline = 82,
+	ba_number = 83,
+	ba_word = 84,
+	ba_string = 85,
+	ba_identifier = 86,
+	ba_stringeol = 87,
+	p_start = 90,
+	p_default = 91,
+	p_commentline = 92,
+	p_number = 93,
+	p_string = 94,
+	p_character = 95,
+	p_word = 96,
+	p_triple = 97,
+	p_tripledouble = 98,
+	p_classname = 99,
+	p_defname = 100,
+	p_operator = 101,
+	p_identifier = 102,
+	php_complex_variable = 104,
+	pa_start = 105,
+	pa_default = 106,
+	pa_commentline = 107,
+	pa_number = 108,
+	pa_string = 109,
+	pa_character = 110,
+	pa_word = 111,
+	pa_triple = 112,
+	pa_tripledouble = 113,
+	pa_classname = 114,
+	pa_defname = 115,
+	pa_operator = 116,
+	pa_identifier = 117,
+	php_default = 118,
+	php_hstring = 119,
+	php_simplestring = 120,
+	php_word = 121,
+	php_number = 122,
+	php_variable = 123,
+	php_comment = 124,
+	php_commentline = 125,
+	php_hstring_variable = 126,
+	php_operator = 127,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum XML
+{    
+	@default = 0,
+	tag = 1,
+	tagunknown = 2,
+	attribute = 3,
+	attributeunknown = 4,
+	number = 5,
+	doublestring = 6,
+	singlestring = 7,
+	other = 8,
+	comment = 9,
+	entity = 10,
+	tagend = 11,
+	xmlstart = 12,
+	xmlend = 13,
+	script = 14,
+	asp = 15,
+	aspat = 16,
+	cdata = 17,
+	question = 18,
+	@value = 19,
+	xccomment = 20,
+	sgml_default = 21,
+	sgml_command = 22,
+	sgml_1st_param = 23,
+	sgml_doublestring = 24,
+	sgml_simplestring = 25,
+	sgml_error = 26,
+	sgml_special = 27,
+	sgml_entity = 28,
+	sgml_comment = 29,
+	sgml_1st_param_comment = 30,
+	sgml_block_default = 31,
+	j_start = 40,
+	j_default = 41,
+	j_comment = 42,
+	j_commentline = 43,
+	j_commentdoc = 44,
+	j_number = 45,
+	j_word = 46,
+	j_keyword = 47,
+	j_doublestring = 48,
+	j_singlestring = 49,
+	j_symbols = 50,
+	j_stringeol = 51,
+	j_regex = 52,
+	ja_start = 55,
+	ja_default = 56,
+	ja_comment = 57,
+	ja_commentline = 58,
+	ja_commentdoc = 59,
+	ja_number = 60,
+	ja_word = 61,
+	ja_keyword = 62,
+	ja_doublestring = 63,
+	ja_singlestring = 64,
+	ja_symbols = 65,
+	ja_stringeol = 66,
+	ja_regex = 67,
+	b_start = 70,
+	b_default = 71,
+	b_commentline = 72,
+	b_number = 73,
+	b_word = 74,
+	b_string = 75,
+	b_identifier = 76,
+	b_stringeol = 77,
+	ba_start = 80,
+	ba_default = 81,
+	ba_commentline = 82,
+	ba_number = 83,
+	ba_word = 84,
+	ba_string = 85,
+	ba_identifier = 86,
+	ba_stringeol = 87,
+	p_start = 90,
+	p_default = 91,
+	p_commentline = 92,
+	p_number = 93,
+	p_string = 94,
+	p_character = 95,
+	p_word = 96,
+	p_triple = 97,
+	p_tripledouble = 98,
+	p_classname = 99,
+	p_defname = 100,
+	p_operator = 101,
+	p_identifier = 102,
+	php_complex_variable = 104,
+	pa_start = 105,
+	pa_default = 106,
+	pa_commentline = 107,
+	pa_number = 108,
+	pa_string = 109,
+	pa_character = 110,
+	pa_word = 111,
+	pa_triple = 112,
+	pa_tripledouble = 113,
+	pa_classname = 114,
+	pa_defname = 115,
+	pa_operator = 116,
+	pa_identifier = 117,
+	php_default = 118,
+	php_hstring = 119,
+	php_simplestring = 120,
+	php_word = 121,
+	php_number = 122,
+	php_variable = 123,
+	php_comment = 124,
+	php_commentline = 125,
+	php_hstring_variable = 126,
+	php_operator = 127,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum ASP
+{    
+	@default = 0,
+	tag = 1,
+	tagunknown = 2,
+	attribute = 3,
+	attributeunknown = 4,
+	number = 5,
+	doublestring = 6,
+	singlestring = 7,
+	other = 8,
+	comment = 9,
+	entity = 10,
+	tagend = 11,
+	xmlstart = 12,
+	xmlend = 13,
+	script = 14,
+	asp = 15,
+	aspat = 16,
+	cdata = 17,
+	question = 18,
+	@value = 19,
+	xccomment = 20,
+	sgml_default = 21,
+	sgml_command = 22,
+	sgml_1st_param = 23,
+	sgml_doublestring = 24,
+	sgml_simplestring = 25,
+	sgml_error = 26,
+	sgml_special = 27,
+	sgml_entity = 28,
+	sgml_comment = 29,
+	sgml_1st_param_comment = 30,
+	sgml_block_default = 31,
+	j_start = 40,
+	j_default = 41,
+	j_comment = 42,
+	j_commentline = 43,
+	j_commentdoc = 44,
+	j_number = 45,
+	j_word = 46,
+	j_keyword = 47,
+	j_doublestring = 48,
+	j_singlestring = 49,
+	j_symbols = 50,
+	j_stringeol = 51,
+	j_regex = 52,
+	ja_start = 55,
+	ja_default = 56,
+	ja_comment = 57,
+	ja_commentline = 58,
+	ja_commentdoc = 59,
+	ja_number = 60,
+	ja_word = 61,
+	ja_keyword = 62,
+	ja_doublestring = 63,
+	ja_singlestring = 64,
+	ja_symbols = 65,
+	ja_stringeol = 66,
+	ja_regex = 67,
+	b_start = 70,
+	b_default = 71,
+	b_commentline = 72,
+	b_number = 73,
+	b_word = 74,
+	b_string = 75,
+	b_identifier = 76,
+	b_stringeol = 77,
+	ba_start = 80,
+	ba_default = 81,
+	ba_commentline = 82,
+	ba_number = 83,
+	ba_word = 84,
+	ba_string = 85,
+	ba_identifier = 86,
+	ba_stringeol = 87,
+	p_start = 90,
+	p_default = 91,
+	p_commentline = 92,
+	p_number = 93,
+	p_string = 94,
+	p_character = 95,
+	p_word = 96,
+	p_triple = 97,
+	p_tripledouble = 98,
+	p_classname = 99,
+	p_defname = 100,
+	p_operator = 101,
+	p_identifier = 102,
+	php_complex_variable = 104,
+	pa_start = 105,
+	pa_default = 106,
+	pa_commentline = 107,
+	pa_number = 108,
+	pa_string = 109,
+	pa_character = 110,
+	pa_word = 111,
+	pa_triple = 112,
+	pa_tripledouble = 113,
+	pa_classname = 114,
+	pa_defname = 115,
+	pa_operator = 116,
+	pa_identifier = 117,
+	php_default = 118,
+	php_hstring = 119,
+	php_simplestring = 120,
+	php_word = 121,
+	php_number = 122,
+	php_variable = 123,
+	php_comment = 124,
+	php_commentline = 125,
+	php_hstring_variable = 126,
+	php_operator = 127,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum PHP
+{    
+	@default = 0,
+	tag = 1,
+	tagunknown = 2,
+	attribute = 3,
+	attributeunknown = 4,
+	number = 5,
+	doublestring = 6,
+	singlestring = 7,
+	other = 8,
+	comment = 9,
+	entity = 10,
+	tagend = 11,
+	xmlstart = 12,
+	xmlend = 13,
+	script = 14,
+	asp = 15,
+	aspat = 16,
+	cdata = 17,
+	question = 18,
+	@value = 19,
+	xccomment = 20,
+	sgml_default = 21,
+	sgml_command = 22,
+	sgml_1st_param = 23,
+	sgml_doublestring = 24,
+	sgml_simplestring = 25,
+	sgml_error = 26,
+	sgml_special = 27,
+	sgml_entity = 28,
+	sgml_comment = 29,
+	sgml_1st_param_comment = 30,
+	sgml_block_default = 31,
+	j_start = 40,
+	j_default = 41,
+	j_comment = 42,
+	j_commentline = 43,
+	j_commentdoc = 44,
+	j_number = 45,
+	j_word = 46,
+	j_keyword = 47,
+	j_doublestring = 48,
+	j_singlestring = 49,
+	j_symbols = 50,
+	j_stringeol = 51,
+	j_regex = 52,
+	ja_start = 55,
+	ja_default = 56,
+	ja_comment = 57,
+	ja_commentline = 58,
+	ja_commentdoc = 59,
+	ja_number = 60,
+	ja_word = 61,
+	ja_keyword = 62,
+	ja_doublestring = 63,
+	ja_singlestring = 64,
+	ja_symbols = 65,
+	ja_stringeol = 66,
+	ja_regex = 67,
+	b_start = 70,
+	b_default = 71,
+	b_commentline = 72,
+	b_number = 73,
+	b_word = 74,
+	b_string = 75,
+	b_identifier = 76,
+	b_stringeol = 77,
+	ba_start = 80,
+	ba_default = 81,
+	ba_commentline = 82,
+	ba_number = 83,
+	ba_word = 84,
+	ba_string = 85,
+	ba_identifier = 86,
+	ba_stringeol = 87,
+	p_start = 90,
+	p_default = 91,
+	p_commentline = 92,
+	p_number = 93,
+	p_string = 94,
+	p_character = 95,
+	p_word = 96,
+	p_triple = 97,
+	p_tripledouble = 98,
+	p_classname = 99,
+	p_defname = 100,
+	p_operator = 101,
+	p_identifier = 102,
+	php_complex_variable = 104,
+	pa_start = 105,
+	pa_default = 106,
+	pa_commentline = 107,
+	pa_number = 108,
+	pa_string = 109,
+	pa_character = 110,
+	pa_word = 111,
+	pa_triple = 112,
+	pa_tripledouble = 113,
+	pa_classname = 114,
+	pa_defname = 115,
+	pa_operator = 116,
+	pa_identifier = 117,
+	php_default = 118,
+	php_hstring = 119,
+	php_simplestring = 120,
+	php_word = 121,
+	php_number = 122,
+	php_variable = 123,
+	php_comment = 124,
+	php_commentline = 125,
+	php_hstring_variable = 126,
+	php_operator = 127,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum Perl
+{    
+	@default = 0,
+	error = 1,
+	commentline = 2,
+	pod = 3,
+	number = 4,
+	word = 5,
+	@string = 6,
+	character = 7,
+	punctuation = 8,
+	preprocessor = 9,
+	@operator = 10,
+	identifier = 11,
+	scalar = 12,
+	array = 13,
+	hash = 14,
+	symboltable = 15,
+	regex = 17,
+	regsubst = 18,
+	longquote = 19,
+	backticks = 20,
+	datasection = 21,
+	here_delim = 22,
+	here_q = 23,
+	here_qq = 24,
+	here_qx = 25,
+	string_q = 26,
+	string_qq = 27,
+	string_qx = 28,
+	string_qr = 29,
+	string_qw = 30,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum VB
+{    
+	@default = 0,
+	comment = 1,
+	number = 2,
+	keyword = 3,
+	@string = 4,
+	preprocessor = 5,
+	@operator = 6,
+	identifier = 7,
+	date = 8,
+	stringeol = 9,
+	keyword2 = 10,
+	keyword3 = 11,
+	keyword4 = 12,
+	constant = 13,
+	asm = 14,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum VBScript
+{    
+	@default = 0,
+	comment = 1,
+	number = 2,
+	keyword = 3,
+	@string = 4,
+	preprocessor = 5,
+	@operator = 6,
+	identifier = 7,
+	date = 8,
+	stringeol = 9,
+	keyword2 = 10,
+	keyword3 = 11,
+	keyword4 = 12,
+	constant = 13,
+	asm = 14,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum PowerBasic
+{    
+	@default = 0,
+	comment = 1,
+	number = 2,
+	keyword = 3,
+	@string = 4,
+	preprocessor = 5,
+	@operator = 6,
+	identifier = 7,
+	date = 8,
+	stringeol = 9,
+	keyword2 = 10,
+	keyword3 = 11,
+	keyword4 = 12,
+	constant = 13,
+	asm = 14,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum Properties
+{    
+	@default = 0,
+	comment = 1,
+	section = 2,
+	assignment = 3,
+	defval = 4,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum LaTeX
+{    
+	@default = 0,
+	command = 1,
+	tag = 2,
+	math = 3,
+	comment = 4,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum Lua
+{    
+	@default = 0,
+	comment = 1,
+	commentline = 2,
+	commentdoc = 3,
+	number = 4,
+	word = 5,
+	@string = 6,
+	character = 7,
+	literalstring = 8,
+	preprocessor = 9,
+	@operator = 10,
+	identifier = 11,
+	stringeol = 12,
+	word2 = 13,
+	word3 = 14,
+	word4 = 15,
+	word5 = 16,
+	word6 = 17,
+	word7 = 18,
+	word8 = 19,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum ErrorList
+{    
+	@default = 0,
+	python = 1,
+	gcc = 2,
+	ms = 3,
+	cmd = 4,
+	borland = 5,
+	perl = 6,
+	net = 7,
+	lua = 8,
+	ctag = 9,
+	diff_changed = 10,
+	diff_addition = 11,
+	diff_deletion = 12,
+	diff_message = 13,
+	php = 14,
+	elf = 15,
+	ifc = 16,
+	ifort = 17,
+	absf = 18,
+	tidy = 19,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum Batch
+{    
+	@default = 0,
+	comment = 1,
+	word = 2,
+	label = 3,
+	hide = 4,
+	command = 5,
+	identifier = 6,
+	@operator = 7,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum MakeFile
+{    
+	@default = 0,
+	comment = 1,
+	preprocessor = 2,
+	identifier = 3,
+	@operator = 4,
+	target = 5,
+	ideol = 9,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum Diff
+{    
+	@default = 0,
+	comment = 1,
+	command = 2,
+	header = 3,
+	position = 4,
+	deleted = 5,
+	added = 6,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum Conf
+{    
+	@default = 0,
+	comment = 1,
+	number = 2,
+	identifier = 3,
+	extension = 4,
+	parameter = 5,
+	@string = 6,
+	@operator = 7,
+	ip = 8,
+	directive = 9,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum Avenue
+{    
+	@default = 0,
+	comment = 1,
+	number = 2,
+	word = 3,
+	@string = 6,
+	@enum = 7,
+	stringeol = 8,
+	identifier = 9,
+	@operator = 10,
+	word1 = 11,
+	word2 = 12,
+	word3 = 13,
+	word4 = 14,
+	word5 = 15,
+	word6 = 16,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum Ada
+{    
+	@default = 0,
+	word = 1,
+	identifier = 2,
+	number = 3,
+	delimiter = 4,
+	character = 5,
+	charactereol = 6,
+	@string = 7,
+	stringeol = 8,
+	label = 9,
+	commentline = 10,
+	illegal = 11,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum Baan
+{    
+	@default = 0,
+	comment = 1,
+	commentdoc = 2,
+	number = 3,
+	word = 4,
+	@string = 5,
+	preprocessor = 6,
+	@operator = 7,
+	identifier = 8,
+	stringeol = 9,
+	word2 = 10,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum Lisp
+{    
+	@default = 0,
+	comment = 1,
+	number = 2,
+	keyword = 3,
+	@string = 6,
+	stringeol = 8,
+	identifier = 9,
+	@operator = 10,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum Eiffel
+{    
+	@default = 0,
+	commentline = 1,
+	number = 2,
+	word = 3,
+	@string = 4,
+	character = 5,
+	@operator = 6,
+	identifier = 7,
+	stringeol = 8,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum EiffelKW
+{    
+	@default = 0,
+	commentline = 1,
+	number = 2,
+	word = 3,
+	@string = 4,
+	character = 5,
+	@operator = 6,
+	identifier = 7,
+	stringeol = 8,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum NNCronTab
+{    
+	@default = 0,
+	comment = 1,
+	task = 2,
+	section = 3,
+	keyword = 4,
+	modifier = 5,
+	asterisk = 6,
+	number = 7,
+	@string = 8,
+	environment = 9,
+	identifier = 10,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum Forth
+{    
+	@default = 0,
+	comment = 1,
+	comment_ml = 2,
+	identifier = 3,
+	control = 4,
+	keyword = 5,
+	defword = 6,
+	preword1 = 7,
+	preword2 = 8,
+	number = 9,
+	@string = 10,
+	locale = 11,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum MatLab
+{    
+	@default = 0,
+	comment = 1,
+	command = 2,
+	number = 3,
+	keyword = 4,
+	@string = 5,
+	@operator = 6,
+	identifier = 7,
+	doublequotestring = 8,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum Sol
+{    
+	@default = 0,
+	white = 1,
+	commentline = 2,
+	persistent = 3,
+	cstyle = 4,
+	commentblock = 5,
+	number = 6,
+	@string = 7,
+	character = 8,
+	stringeol = 9,
+	keyword = 10,
+	@operator = 11,
+	identifier = 12,
+	triple = 13,
+	classname = 14,
+	preprocessor = 15,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum Asm
+{    
+	@default = 0,
+	comment = 1,
+	number = 2,
+	@string = 3,
+	@operator = 4,
+	identifier = 5,
+	cpuinstruction = 6,
+	mathinstruction = 7,
+	register = 8,
+	directive = 9,
+	directiveoperand = 10,
+	commentblock = 11,
+	character = 12,
+	stringeol = 13,
+	extinstruction = 14,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum Fortran
+{    
+	@default = 0,
+	comment = 1,
+	number = 2,
+	string1 = 3,
+	string2 = 4,
+	stringeol = 5,
+	@operator = 6,
+	identifier = 7,
+	word = 8,
+	word2 = 9,
+	word3 = 10,
+	preprocessor = 11,
+	operator2 = 12,
+	label = 13,
+	continuation = 14,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum F77
+{    
+	@default = 0,
+	comment = 1,
+	number = 2,
+	string1 = 3,
+	string2 = 4,
+	stringeol = 5,
+	@operator = 6,
+	identifier = 7,
+	word = 8,
+	word2 = 9,
+	word3 = 10,
+	preprocessor = 11,
+	operator2 = 12,
+	label = 13,
+	continuation = 14,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum CSS
+{    
+	@default = 0,
+	tag = 1,
+	@class = 2,
+	pseudoclass = 3,
+	unknown_pseudoclass = 4,
+	@operator = 5,
+	identifier = 6,
+	unknown_identifier = 7,
+	@value = 8,
+	comment = 9,
+	id = 10,
+	important = 11,
+	directive = 12,
+	doublestring = 13,
+	singlestring = 14,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum POV
+{    
+	@default = 0,
+	comment = 1,
+	commentline = 2,
+	number = 3,
+	@operator = 4,
+	identifier = 5,
+	@string = 6,
+	stringeol = 7,
+	directive = 8,
+	baddirective = 9,
+	word2 = 10,
+	word3 = 11,
+	word4 = 12,
+	word5 = 13,
+	word6 = 14,
+	word7 = 15,
+	word8 = 16,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum LOUT
+{    
+	@default = 0,
+	comment = 1,
+	number = 2,
+	word = 3,
+	word2 = 4,
+	word3 = 5,
+	word4 = 6,
+	@string = 7,
+	@operator = 8,
+	identifier = 9,
+	stringeol = 10,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum ESCRIPT
+{    
+	@default = 0,
+	comment = 1,
+	commentline = 2,
+	commentdoc = 3,
+	number = 4,
+	word = 5,
+	@string = 6,
+	@operator = 7,
+	identifier = 8,
+	brace = 9,
+	word2 = 10,
+	word3 = 11,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum PS
+{    
+	@default = 0,
+	comment = 1,
+	dsc_comment = 2,
+	dsc_value = 3,
+	number = 4,
+	name = 5,
+	keyword = 6,
+	literal = 7,
+	immeval = 8,
+	paren_array = 9,
+	paren_dict = 10,
+	paren_proc = 11,
+	text = 12,
+	hexstring = 13,
+	base85string = 14,
+	badstringchar = 15,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum NSIS
+{    
+	@default = 0,
+	comment = 1,
+	stringdq = 2,
+	stringlq = 3,
+	stringrq = 4,
+	function = 5,
+	variable = 6,
+	label = 7,
+	userdefined = 8,
+	sectiondef = 9,
+	subsectiondef = 10,
+	ifdefinedef = 11,
+	macrodef = 12,
+	stringvar = 13,
+	number = 14,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum MMIXAL
+{    
+	leadws = 0,
+	comment = 1,
+	label = 2,
+	opcode = 3,
+	opcode_pre = 4,
+	opcode_valid = 5,
+	opcode_unknown = 6,
+	opcode_post = 7,
+	operands = 8,
+	number = 9,
+	@ref = 10,
+	@char = 11,
+	@string = 12,
+	register = 13,
+	hex = 14,
+	@operator = 15,
+	symbol = 16,
+	include = 17,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum Clarion
+{    
+	@default = 0,
+	label = 1,
+	comment = 2,
+	@string = 3,
+	user_identifier = 4,
+	integer_constant = 5,
+	real_constant = 6,
+	picture_string = 7,
+	keyword = 8,
+	compiler_directive = 9,
+	builtin_procedures_function = 10,
+	structure_data_type = 11,
+	attribute = 12,
+	standard_equate = 13,
+	error = 14,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum LOT
+{    
+	@default = 0,
+	header = 1,
+	@break = 2,
+	set = 3,
+	pass = 4,
+	fail = 5,
+	abort = 6,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum YAML
+{    
+	@default = 0,
+	comment = 1,
+	identifier = 2,
+	keyword = 3,
+	number = 4,
+	reference = 5,
+	document = 6,
+	text = 7,
+	error = 8,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum TeX
+{    
+	@default = 0,
+	special = 1,
+	group = 2,
+	symbol = 3,
+	command = 4,
+	text = 5,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum Metapost
+{    
+	@default = 0,
+	special = 1,
+	group = 2,
+	symbol = 3,
+	command = 4,
+	text = 5,
+	extra = 6,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum Erlang
+{    
+	@default = 0,
+	comment = 1,
+	variable = 2,
+	number = 3,
+	keyword = 4,
+	@string = 5,
+	@operator = 6,
+	atom = 7,
+	function_name = 8,
+	character = 9,
+	macro = 10,
+	record = 11,
+	separator = 12,
+	node_name = 13,
+	unknown = 31,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum Octave
+{    
+	@default = 0,
+	comment = 1,
+	command = 2,
+	number = 3,
+	keyword = 4,
+	@string = 5,
+	@operator = 6,
+	identifier = 7,
+	doublequotestring = 8,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum MSSQL
+{    
+	@default = 0,
+	comment = 1,
+	line_comment = 2,
+	number = 3,
+	@string = 4,
+	@operator = 5,
+	identifier = 6,
+	variable = 7,
+	column_name = 8,
+	statement = 9,
+	datatype = 10,
+	systable = 11,
+	global_variable = 12,
+	function = 13,
+	stored_procedure = 14,
+	default_pref_datatype = 15,
+	column_name_2 = 16,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum Verilog
+{    
+	@default = 0,
+	comment = 1,
+	commentline = 2,
+	commentlinebang = 3,
+	number = 4,
+	word = 5,
+	@string = 6,
+	word2 = 7,
+	word3 = 8,
+	preprocessor = 9,
+	@operator = 10,
+	identifier = 11,
+	stringeol = 12,
+	user = 19,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum Kix
+{    
+	@default = 0,
+	comment = 1,
+	string1 = 2,
+	string2 = 3,
+	number = 4,
+	var = 5,
+	macro = 6,
+	keyword = 7,
+	functions = 8,
+	@operator = 9,
+	identifier = 31,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum Specman
+{    
+	@default = 0,
+	code = 1,
+	commentline = 2,
+	commentlinebang = 3,
+	number = 4,
+	word = 5,
+	@string = 6,
+	word2 = 7,
+	word3 = 8,
+	preprocessor = 9,
+	@operator = 10,
+	identifier = 11,
+	stringeol = 12,
+	regextag = 13,
+	signal = 14,
+	user = 19,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum Au3
+{    
+	@default = 0,
+	comment = 1,
+	commentblock = 2,
+	number = 3,
+	function = 4,
+	keyword = 5,
+	macro = 6,
+	@string = 7,
+	@operator = 8,
+	variable = 9,
+	sent = 10,
+	preprocessor = 11,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum APDL
+{    
+	@default = 0,
+	comment = 1,
+	commentblock = 2,
+	number = 3,
+	@string = 4,
+	word = 5,
+	command = 6,
+	processor = 7,
+	function = 8,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
+public enum Bash
+{    
+	@default = 0,
+	error = 1,
+	commentline = 2,
+	number = 3,
+	word = 4,
+	@string = 5,
+	character = 6,
+	@operator = 7,
+	identifier = 8,
+	scalar = 9,
+	param = 10,
+	backticks = 11,
+	here_delim = 12,
+	here_q = 13,
+	_default = 32,
+	linenumber = 33,
+	bracelight = 34,
+	bracebad = 35,
+	controlchar = 36,
+	indentguide = 37,
+	lastpredefined = 39,
+	max = 127
+}
diff --git a/Documents/Scintilla/LexAPDL.cxx b/Documents/Scintilla/LexAPDL.cxx
new file mode 100644
index 0000000..7bf597b
--- /dev/null
+++ b/Documents/Scintilla/LexAPDL.cxx
@@ -0,0 +1,256 @@
+// Scintilla source code edit control
+/** @file LexAPDL.cxx
+ ** Lexer for APDL. Based on the lexer for Assembler by The Black Horus.
+ ** By Hadar Raz.
+ **/
+// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+static inline bool IsAWordChar(const int ch) {
+	return (ch < 0x80 && (isalnum(ch) || ch == '_'));
+}
+
+static inline bool IsAnOperator(char ch) {
+	// '.' left out as it is used to make up numbers
+	if (ch == '*' || ch == '/' || ch == '-' || ch == '+' ||
+		ch == '(' || ch == ')' || ch == '=' || ch == '^' ||
+		ch == '[' || ch == ']' || ch == '<' || ch == '&' ||
+		ch == '>' || ch == ',' || ch == '|' || ch == '~' ||
+		ch == '$' || ch == ':' || ch == '%')
+		return true;
+	return false;
+}
+
+static void ColouriseAPDLDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
+                            Accessor &styler) {
+
+	int stringStart = ' ';
+
+	WordList &processors = *keywordlists[0];
+	WordList &commands = *keywordlists[1];
+	WordList &slashcommands = *keywordlists[2];
+	WordList &starcommands = *keywordlists[3];
+	WordList &arguments = *keywordlists[4];
+	WordList &functions = *keywordlists[5];
+
+	// Do not leak onto next line
+	initStyle = SCE_APDL_DEFAULT;
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	for (; sc.More(); sc.Forward()) {
+		// Determine if the current state should terminate.
+		if (sc.state == SCE_APDL_NUMBER) {
+			if (!(IsADigit(sc.ch) || sc.ch == '.' || (sc.ch == 'e' || sc.ch == 'E') ||
+				((sc.ch == '+' || sc.ch == '-') && (sc.chPrev == 'e' || sc.chPrev == 'E')))) {
+				sc.SetState(SCE_APDL_DEFAULT);
+			}
+		} else if (sc.state == SCE_APDL_COMMENT) {
+			if (sc.atLineEnd) {
+				sc.SetState(SCE_APDL_DEFAULT);
+			}
+		} else if (sc.state == SCE_APDL_COMMENTBLOCK) {
+			if (sc.atLineEnd) {
+				if (sc.ch == '\r') {
+				sc.Forward();
+				}
+				sc.ForwardSetState(SCE_APDL_DEFAULT);
+			}
+		} else if (sc.state == SCE_APDL_STRING) {
+			if (sc.atLineEnd) {
+				sc.SetState(SCE_APDL_DEFAULT);
+			} else if ((sc.ch == '\'' && stringStart == '\'') || (sc.ch == '\"' && stringStart == '\"')) {
+				sc.ForwardSetState(SCE_APDL_DEFAULT);
+			}
+		} else if (sc.state == SCE_APDL_WORD) {
+			if (!IsAWordChar(sc.ch)) {
+				char s[100];
+				sc.GetCurrentLowered(s, sizeof(s));
+				if (processors.InList(s)) {
+					sc.ChangeState(SCE_APDL_PROCESSOR);
+				} else if (slashcommands.InList(s)) {
+					sc.ChangeState(SCE_APDL_SLASHCOMMAND);
+				} else if (starcommands.InList(s)) {
+					sc.ChangeState(SCE_APDL_STARCOMMAND);
+				} else if (commands.InList(s)) {
+					sc.ChangeState(SCE_APDL_COMMAND);
+				} else if (arguments.InList(s)) {
+					sc.ChangeState(SCE_APDL_ARGUMENT);
+				} else if (functions.InList(s)) {
+					sc.ChangeState(SCE_APDL_FUNCTION);
+				}
+				sc.SetState(SCE_APDL_DEFAULT);
+			}
+		} else if (sc.state == SCE_APDL_OPERATOR) {
+			if (!IsAnOperator(static_cast<char>(sc.ch))) {
+			    sc.SetState(SCE_APDL_DEFAULT);
+			}
+		}
+
+		// Determine if a new state should be entered.
+		if (sc.state == SCE_APDL_DEFAULT) {
+			if (sc.ch == '!' && sc.chNext == '!') {
+				sc.SetState(SCE_APDL_COMMENTBLOCK);
+			} else if (sc.ch == '!') {
+				sc.SetState(SCE_APDL_COMMENT);
+			} else if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
+				sc.SetState(SCE_APDL_NUMBER);
+			} else if (sc.ch == '\'' || sc.ch == '\"') {
+				sc.SetState(SCE_APDL_STRING);
+				stringStart = sc.ch;
+			} else if (IsAWordChar(sc.ch) || ((sc.ch == '*' || sc.ch == '/') && !isgraph(sc.chPrev))) {
+				sc.SetState(SCE_APDL_WORD);
+			} else if (IsAnOperator(static_cast<char>(sc.ch))) {
+				sc.SetState(SCE_APDL_OPERATOR);
+			}
+		}
+	}
+	sc.Complete();
+}
+
+//------------------------------------------------------------------------------
+// 06-27-07 Sergio Lucato
+// - Included code folding for Ansys APDL lexer
+// - Copyied from LexBasic.cxx and modified for APDL
+//------------------------------------------------------------------------------
+
+/* Bits:
+ * 1  - whitespace
+ * 2  - operator
+ * 4  - identifier
+ * 8  - decimal digit
+ * 16 - hex digit
+ * 32 - bin digit
+ */
+static int character_classification[128] =
+{
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  0,  0,  1,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    1,  2,  0,  2,  2,  2,  2,  2,  2,  2,  6,  2,  2,  2,  10, 6,
+    60, 60, 28, 28, 28, 28, 28, 28, 28, 28, 2,  2,  2,  2,  2,  2,
+    2,  20, 20, 20, 20, 20, 20, 4,  4,  4,  4,  4,  4,  4,  4,  4,
+    4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  2,  2,  2,  2,  4,
+    2,  20, 20, 20, 20, 20, 20, 4,  4,  4,  4,  4,  4,  4,  4,  4,
+    4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  2,  2,  2,  2,  0
+};
+
+static bool IsSpace(int c) {
+	return c < 128 && (character_classification[c] & 1);
+}
+
+static bool IsIdentifier(int c) {
+	return c < 128 && (character_classification[c] & 4);
+}
+
+static int LowerCase(int c)
+{
+	if (c >= 'A' && c <= 'Z')
+		return 'a' + c - 'A';
+	return c;
+}
+
+static int CheckAPDLFoldPoint(char const *token, int &level) {
+	if (!strcmp(token, "*if") ||
+		!strcmp(token, "*do") ||
+		!strcmp(token, "*dowhile") ) {
+		level |= SC_FOLDLEVELHEADERFLAG;
+		return 1;
+	}
+	if (!strcmp(token, "*endif") ||
+		!strcmp(token, "*enddo") ) {
+		return -1;
+	}
+	return 0;
+}
+
+static void FoldAPDLDoc(unsigned int startPos, int length, int,
+	WordList *[], Accessor &styler) {
+
+	int line = styler.GetLine(startPos);
+	int level = styler.LevelAt(line);
+	int go = 0, done = 0;
+	int endPos = startPos + length;
+	char word[256];
+	int wordlen = 0;
+	int i;
+    bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	// Scan for tokens at the start of the line (they may include
+	// whitespace, for tokens like "End Function"
+	for (i = startPos; i < endPos; i++) {
+		int c = styler.SafeGetCharAt(i);
+		if (!done && !go) {
+			if (wordlen) { // are we scanning a token already?
+				word[wordlen] = static_cast<char>(LowerCase(c));
+				if (!IsIdentifier(c)) { // done with token
+					word[wordlen] = '\0';
+					go = CheckAPDLFoldPoint(word, level);
+					if (!go) {
+						// Treat any whitespace as single blank, for
+						// things like "End   Function".
+						if (IsSpace(c) && IsIdentifier(word[wordlen - 1])) {
+							word[wordlen] = ' ';
+							if (wordlen < 255)
+								wordlen++;
+						}
+						else // done with this line
+							done = 1;
+					}
+				} else if (wordlen < 255) {
+					wordlen++;
+				}
+			} else { // start scanning at first non-whitespace character
+				if (!IsSpace(c)) {
+					if (IsIdentifier(c)) {
+						word[0] = static_cast<char>(LowerCase(c));
+						wordlen = 1;
+					} else // done with this line
+						done = 1;
+				}
+			}
+		}
+		if (c == '\n') { // line end
+			if (!done && wordlen == 0 && foldCompact) // line was only space
+				level |= SC_FOLDLEVELWHITEFLAG;
+			if (level != styler.LevelAt(line))
+				styler.SetLevel(line, level);
+			level += go;
+			line++;
+			// reset state
+			wordlen = 0;
+			level &= ~SC_FOLDLEVELHEADERFLAG;
+			level &= ~SC_FOLDLEVELWHITEFLAG;
+			go = 0;
+			done = 0;
+		}
+	}
+}
+
+static const char * const apdlWordListDesc[] = {
+    "processors",
+    "commands",
+    "slashommands",
+    "starcommands",
+    "arguments",
+    "functions",
+    0
+};
+
+LexerModule lmAPDL(SCLEX_APDL, ColouriseAPDLDoc, "apdl", FoldAPDLDoc, apdlWordListDesc);
diff --git a/Documents/Scintilla/LexASY.cxx b/Documents/Scintilla/LexASY.cxx
new file mode 100644
index 0000000..5bf979f
--- /dev/null
+++ b/Documents/Scintilla/LexASY.cxx
@@ -0,0 +1,270 @@
+// Scintilla source code edit control
+//Author: instanton (email: soft_share<at>126<dot>com)
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+#include "CharacterSet.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+static void ColouriseAsyDoc(unsigned int startPos, int length, int initStyle, 
+		WordList *keywordlists[], Accessor &styler) {
+
+	WordList &keywords = *keywordlists[0];
+	WordList &keywords2 = *keywordlists[1];
+
+	CharacterSet setWordStart(CharacterSet::setAlpha, "_", 0x80, true);
+	CharacterSet setWord(CharacterSet::setAlphaNum, "._", 0x80, true);
+
+	int visibleChars = 0;
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	for (; sc.More(); sc.Forward()) {
+
+		if (sc.atLineStart) {
+			if (sc.state == SCE_ASY_STRING) {
+				sc.SetState(SCE_ASY_STRING);
+			}
+			visibleChars = 0;
+		}
+
+		if (sc.ch == '\\') {
+			if (sc.chNext == '\n' || sc.chNext == '\r') {
+				sc.Forward();
+				if (sc.ch == '\r' && sc.chNext == '\n') {
+					sc.Forward();
+				}
+//				continuationLine = true;
+				continue;
+			}
+		}
+
+		// Determine if the current state should terminate.
+		switch (sc.state) {
+			case SCE_ASY_OPERATOR:
+				sc.SetState(SCE_ASY_DEFAULT);
+				break;
+			case SCE_ASY_NUMBER:
+				if (!setWord.Contains(sc.ch)) {
+					sc.SetState(SCE_ASY_DEFAULT);
+				}
+				break;
+			case SCE_ASY_IDENTIFIER:
+				if (!setWord.Contains(sc.ch) || (sc.ch == '.')) {
+					char s[1000];
+					sc.GetCurrentLowered(s, sizeof(s));
+					if (keywords.InList(s)) {
+						sc.ChangeState(SCE_ASY_WORD);
+					} else if (keywords2.InList(s)) {
+						sc.ChangeState(SCE_ASY_WORD2);
+					}
+					sc.SetState(SCE_ASY_DEFAULT);
+				}
+				break;
+			case SCE_ASY_COMMENT:
+				if (sc.Match('*', '/')) {
+					sc.Forward();
+					sc.ForwardSetState(SCE_ASY_DEFAULT);
+				}
+				break;
+			case SCE_ASY_COMMENTLINE:
+				if (sc.atLineStart) {
+					sc.SetState(SCE_ASY_DEFAULT);
+				}
+				break;
+			case SCE_ASY_STRING:
+				if (sc.atLineEnd) {
+					sc.ChangeState(SCE_ASY_STRINGEOL);
+				} else if (sc.ch == '\\') {
+					if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
+						sc.Forward();
+					}
+				} else if (sc.ch == '\"') {
+					sc.ForwardSetState(SCE_ASY_DEFAULT);
+				}
+				break;
+			case SCE_ASY_CHARACTER:
+				if (sc.atLineEnd) {
+					sc.ChangeState(SCE_ASY_STRINGEOL);
+				} else 	if (sc.ch == '\\') {
+					if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
+						sc.Forward();
+					}
+				} else if (sc.ch == '\'') {
+					sc.ForwardSetState(SCE_ASY_DEFAULT);
+				}
+				break;
+		}
+
+		// Determine if a new state should be entered.
+		if (sc.state == SCE_ASY_DEFAULT) {
+			if (setWordStart.Contains(sc.ch) || (sc.ch == '@')) {
+				sc.SetState(SCE_ASY_IDENTIFIER);
+			} else if (sc.Match('/', '*')) {
+				sc.SetState(SCE_ASY_COMMENT);
+				sc.Forward();	// 
+			} else if (sc.Match('/', '/')) {
+				sc.SetState(SCE_ASY_COMMENTLINE);
+			} else if (sc.ch == '\"') {
+				sc.SetState(SCE_ASY_STRING);
+			} else if (sc.ch == '\'') {
+				sc.SetState(SCE_ASY_CHARACTER);
+			} else if (sc.ch == '#' && visibleChars == 0) {
+				do {
+					sc.Forward();
+				} while ((sc.ch == ' ' || sc.ch == '\t') && sc.More());
+				if (sc.atLineEnd) {
+					sc.SetState(SCE_ASY_DEFAULT);
+				}
+			} else if (isoperator(static_cast<char>(sc.ch))) {
+				sc.SetState(SCE_ASY_OPERATOR);
+			}
+		}
+
+	}
+	sc.Complete();
+}
+
+static bool IsAsyCommentStyle(int style) {
+	return style == SCE_ASY_COMMENT;
+}
+
+
+static inline bool isASYidentifier(int ch) {
+	return
+      ((ch >= 'a') && (ch <= 'z')) || ((ch >= 'A') && (ch <= 'Z')) ;
+}
+
+static int ParseASYWord(unsigned int pos, Accessor &styler, char *word)
+{
+  int length=0;
+  char ch=styler.SafeGetCharAt(pos);
+  *word=0;
+
+  while(isASYidentifier(ch) && length<100){
+          word[length]=ch;
+          length++;
+          ch=styler.SafeGetCharAt(pos+length);
+  }
+  word[length]=0;   
+  return length;
+}
+
+static bool IsASYDrawingLine(int line, Accessor &styler) {
+	int pos = styler.LineStart(line);
+	int eol_pos = styler.LineStart(line + 1) - 1;
+	
+	int startpos = pos;
+	char buffer[100]="";
+
+	while (startpos<eol_pos){
+		char ch = styler[startpos];
+		ParseASYWord(startpos,styler,buffer);
+		bool drawcommands = strncmp(buffer,"draw",4)==0||
+			strncmp(buffer,"pair",4)==0||strncmp(buffer,"label",5)==0;
+		if (!drawcommands && ch!=' ') return false;
+		else if (drawcommands) return true;
+		startpos++;
+	}		
+	return false;
+}
+
+static void FoldAsyDoc(unsigned int startPos, int length, int initStyle, 
+					   WordList *[], Accessor &styler) {
+	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
+	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	bool foldAtElse = styler.GetPropertyInt("fold.at.else", 0) != 0;
+	unsigned int endPos = startPos + length;
+	int visibleChars = 0;
+	int lineCurrent = styler.GetLine(startPos);
+	int levelCurrent = SC_FOLDLEVELBASE;
+	if (lineCurrent > 0)
+		levelCurrent = styler.LevelAt(lineCurrent-1) >> 16;
+	int levelMinCurrent = levelCurrent;
+	int levelNext = levelCurrent;
+	char chNext = styler[startPos];
+	int styleNext = styler.StyleAt(startPos);
+	int style = initStyle;
+	for (unsigned int i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int stylePrev = style;
+		style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+		if (foldComment && IsAsyCommentStyle(style)) {
+			if (!IsAsyCommentStyle(stylePrev) && (stylePrev != SCE_ASY_COMMENTLINEDOC)) {
+				levelNext++;
+			} else if (!IsAsyCommentStyle(styleNext) && (styleNext != SCE_ASY_COMMENTLINEDOC) && !atEOL) {
+				levelNext--;
+			}
+		}
+		if (style == SCE_ASY_OPERATOR) {
+			if (ch == '{') {
+				if (levelMinCurrent > levelNext) {
+					levelMinCurrent = levelNext;
+				}
+				levelNext++;
+			} else if (ch == '}') {
+				levelNext--;
+			}
+		}
+
+		if (atEOL && IsASYDrawingLine(lineCurrent, styler)){
+			if (lineCurrent==0 && IsASYDrawingLine(lineCurrent + 1, styler))
+				levelNext++;
+			else if (lineCurrent!=0 && !IsASYDrawingLine(lineCurrent - 1, styler)
+				&& IsASYDrawingLine(lineCurrent + 1, styler)
+				)
+				levelNext++;
+			else if (lineCurrent!=0 && IsASYDrawingLine(lineCurrent - 1, styler) &&
+				!IsASYDrawingLine(lineCurrent+1, styler))
+				levelNext--;
+		}	
+
+		if (atEOL) {
+			int levelUse = levelCurrent;
+			if (foldAtElse) {
+				levelUse = levelMinCurrent;
+			}
+			int lev = levelUse | levelNext << 16;
+			if (visibleChars == 0 && foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if (levelUse < levelNext)
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelCurrent = levelNext;
+			levelMinCurrent = levelCurrent;
+			visibleChars = 0;
+		}
+		if (!IsASpace(ch))
+			visibleChars++;
+	}
+}
+
+static const char * const asyWordLists[] = {
+            "Primary keywords and identifiers",
+            "Secondary keywords and identifiers",
+            0,
+        };
+
+LexerModule lmASY(SCLEX_ASYMPTOTE, ColouriseAsyDoc, "asy", FoldAsyDoc, asyWordLists);
diff --git a/Documents/Scintilla/LexAU3.cxx b/Documents/Scintilla/LexAU3.cxx
new file mode 100644
index 0000000..cedf261
--- /dev/null
+++ b/Documents/Scintilla/LexAU3.cxx
@@ -0,0 +1,906 @@
+// Scintilla source code edit control
+// @file LexAU3.cxx
+// Lexer for AutoIt3  http://www.hiddensoft.com/autoit3
+// by Jos van der Zande, jvdzande@yahoo.com 
+//
+// Changes:
+// March 28, 2004 - Added the standard Folding code
+// April 21, 2004 - Added Preprosessor Table + Syntax Highlighting
+//                  Fixed Number highlighting
+//                  Changed default isoperator to IsAOperator to have a better match to AutoIt3
+//                  Fixed "#comments_start" -> "#comments-start"  
+//                  Fixed "#comments_end" -> "#comments-end"  
+//                  Fixed Sendkeys in Strings when not terminated with }
+//                  Added support for Sendkey strings that have second parameter e.g. {UP 5} or {a down}
+// April 26, 2004 - Fixed # pre-processor statement inside of comment block would invalidly change the color.
+//                  Added logic for #include <xyz.au3> to treat the <> as string
+//                  Added underscore to IsAOperator.
+// May 17, 2004   - Changed the folding logic from indent to keyword folding.
+//                  Added Folding logic for blocks of single-commentlines or commentblock.
+//                        triggered by: fold.comment=1
+//                  Added Folding logic for preprocessor blocks triggered by fold.preprocessor=1
+//                  Added Special for #region - #endregion syntax highlight and folding.
+// May 30, 2004   - Fixed issue with continuation lines on If statements.
+// June 5, 2004   - Added comma to Operators for better readability.
+//                  Added fold.compact support set with fold.compact=1
+//                  Changed folding inside of #cs-#ce. Default is no keyword folding inside comment blocks when fold.comment=1
+//                        it will now only happen when fold.comment=2.
+// Sep 5, 2004    - Added logic to handle colourizing words on the last line. 
+//                        Typed Characters now show as "default" till they match any table.
+// Oct 10, 2004   - Added logic to show Comments in "Special" directives. 
+// Nov  1, 2004   - Added better testing for Numbers supporting x and e notation.
+// Nov 28, 2004   - Added logic to handle continuation lines for syntax highlighting.
+// Jan 10, 2005   - Added Abbreviations Keyword used for expansion
+// Mar 24, 2005   - Updated Abbreviations Keywords to fix when followed by Operator.
+// Apr 18, 2005   - Updated #CE/#Comment-End logic to take a linecomment ";" into account
+//                - Added folding support for With...EndWith
+//                - Added support for a DOT in variable names
+//                - Fixed Underscore in CommentBlock
+// May 23, 2005   - Fixed the SentKey lexing in case of a missing }
+// Aug 11, 2005   - Fixed possible bug with s_save length > 100.
+// Aug 23, 2005   - Added Switch/endswitch support to the folding logic.
+// Sep 27, 2005   - Fixed the SentKey lexing logic in case of multiple sentkeys.
+// Mar 12, 2006   - Fixed issue with <> coloring as String in stead of Operator in rare occasions.
+// Apr  8, 2006   - Added support for AutoIt3 Standard UDF library (SCE_AU3_UDF)
+// Mar  9, 2007   - Fixed bug with + following a String getting the wrong Color.
+// Jun 20, 2007   - Fixed Commentblock issue when LF's are used as EOL.
+// Jul 26, 2007   - Fixed #endregion undetected bug.
+//
+// Copyright for Scintilla: 1998-2001 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+// Scintilla source code edit control
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+static inline bool IsTypeCharacter(const int ch)
+{
+    return ch == '$';
+}
+static inline bool IsAWordChar(const int ch)
+{
+    return (ch < 0x80) && (isalnum(ch) || ch == '_');
+}
+
+static inline bool IsAWordStart(const int ch)
+{
+    return (ch < 0x80) && (isalnum(ch) || ch == '_' || ch == '@' || ch == '#' || ch == '$' || ch == '.');
+}
+
+static inline bool IsAOperator(char ch) {
+	if (isascii(ch) && isalnum(ch))
+		return false;
+	if (ch == '+' || ch == '-' || ch == '*' || ch == '/' ||
+	    ch == '&' || ch == '^' || ch == '=' || ch == '<' || ch == '>' ||
+	    ch == '(' || ch == ')' || ch == '[' || ch == ']' || ch == ',' )
+		return true;
+	return false;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// GetSendKey() filters the portion before and after a/multiple space(s)
+// and return the first portion to be looked-up in the table
+// also check if the second portion is valid... (up,down.on.off,toggle or a number)
+///////////////////////////////////////////////////////////////////////////////
+
+static int GetSendKey(const char *szLine, char *szKey)
+{
+	int		nFlag	= 0;
+	int		nStartFound	= 0;
+	int		nKeyPos	= 0;
+	int		nSpecPos= 0;
+	int		nSpecNum= 1;
+	int		nPos	= 0;
+	char	cTemp;
+	char	szSpecial[100];
+
+	// split the portion of the sendkey in the part before and after the spaces
+	while ( ( (cTemp = szLine[nPos]) != '\0'))
+	{
+		// skip leading Ctrl/Shift/Alt state
+		if (cTemp == '{') {
+			nStartFound = 1;
+		}
+		//
+		if (nStartFound == 1) {
+			if ((cTemp == ' ') && (nFlag == 0) ) // get the stuff till first space
+			{
+				nFlag = 1;
+				// Add } to the end of the first bit for table lookup later.
+				szKey[nKeyPos++] = '}';
+			}
+			else if (cTemp == ' ')
+			{
+				// skip other spaces 
+			}
+			else if (nFlag == 0)
+			{
+				// save first portion into var till space or } is hit
+				szKey[nKeyPos++] = cTemp;
+			}
+			else if ((nFlag == 1) && (cTemp != '}'))
+			{
+				// Save second portion into var...
+				szSpecial[nSpecPos++] = cTemp;
+				// check if Second portion is all numbers for repeat fuction
+				if (isdigit(cTemp) == false) {nSpecNum = 0;} 
+			}
+		}
+		nPos++;									// skip to next char
+
+	} // End While
+
+
+	// Check if the second portion is either a number or one of these keywords
+	szKey[nKeyPos] = '\0';
+	szSpecial[nSpecPos] = '\0';
+	if (strcmp(szSpecial,"down")== 0    || strcmp(szSpecial,"up")== 0  ||
+		strcmp(szSpecial,"on")== 0      || strcmp(szSpecial,"off")== 0 || 
+		strcmp(szSpecial,"toggle")== 0  || nSpecNum == 1 )
+	{
+		nFlag = 0;
+	}
+	else
+	{
+		nFlag = 1;
+	}
+	return nFlag;  // 1 is bad, 0 is good 
+
+} // GetSendKey() 
+
+//
+// Routine to check the last "none comment" character on a line to see if its a continuation
+// 
+static bool IsContinuationLine(unsigned int szLine, Accessor &styler)
+{
+	int nsPos = styler.LineStart(szLine);
+	int nePos = styler.LineStart(szLine+1) - 2;
+	//int stylech = styler.StyleAt(nsPos);
+	while (nsPos < nePos)
+	{
+		//stylech = styler.StyleAt(nePos);
+		int stylech = styler.StyleAt(nsPos);
+		if (!(stylech == SCE_AU3_COMMENT)) {
+			char ch = styler.SafeGetCharAt(nePos);
+			if (!isspacechar(ch)) {
+				if (ch == '_')
+					return true;
+				else
+					return false;
+			}
+		}
+		nePos--; // skip to next char
+	} // End While
+	return false;
+} // IsContinuationLine()
+
+//
+// syntax highlighting logic
+static void ColouriseAU3Doc(unsigned int startPos, 
+							int length, int initStyle,
+							WordList *keywordlists[],
+							Accessor &styler) {
+
+    WordList &keywords = *keywordlists[0];
+    WordList &keywords2 = *keywordlists[1];
+    WordList &keywords3 = *keywordlists[2];
+    WordList &keywords4 = *keywordlists[3];
+    WordList &keywords5 = *keywordlists[4];
+    WordList &keywords6 = *keywordlists[5];
+    WordList &keywords7 = *keywordlists[6];
+    WordList &keywords8 = *keywordlists[7];
+	// find the first previous line without continuation character at the end
+	int lineCurrent = styler.GetLine(startPos);
+	int s_startPos = startPos;
+	// When not inside a Block comment: find First line without _
+	if (!(initStyle==SCE_AU3_COMMENTBLOCK)) {
+		while ((lineCurrent > 0 && IsContinuationLine(lineCurrent,styler)) ||
+			   (lineCurrent > 1 && IsContinuationLine(lineCurrent-1,styler))) {
+			lineCurrent--;
+			startPos = styler.LineStart(lineCurrent); // get start position
+			initStyle =  0;                           // reset the start style to 0 
+		}
+	}
+	// Set the new length to include it from the start and set the start position
+	length = length + s_startPos - startPos;      // correct the total length to process
+    styler.StartAt(startPos);
+	
+    StyleContext sc(startPos, length, initStyle, styler);
+	char si;     // string indicator "=1 '=2
+	char ni;     // Numeric indicator error=9 normal=0 normal+dec=1 hex=2 Enot=3
+	char ci;     // comment indicator 0=not linecomment(;) 
+	char s_save[100];
+	si=0;  
+	ni=0;
+	ci=0;
+	//$$$
+    for (; sc.More(); sc.Forward()) {
+		char s[100];
+		sc.GetCurrentLowered(s, sizeof(s));
+		// **********************************************
+		// save the total current word for eof processing 
+		if (IsAWordChar(sc.ch) || sc.ch == '}') 
+		{
+			strcpy(s_save,s);
+			int tp = strlen(s_save);
+			if (tp < 99) {
+				s_save[tp] = static_cast<char>(tolower(sc.ch));
+				s_save[tp+1] = '\0';
+			}
+		}
+		// **********************************************
+		//
+		switch (sc.state)
+        {
+            case SCE_AU3_COMMENTBLOCK:
+            {
+				//Reset at line end
+				if (sc.atLineEnd) {
+					ci=0;
+					if ((strcmp(s, "#ce")== 0 || strcmp(s, "#comments-end")== 0))
+						if (sc.atLineEnd) 
+							sc.SetState(SCE_AU3_DEFAULT);
+						else	
+							sc.SetState(SCE_AU3_COMMENTBLOCK);
+					break;
+				}
+				//skip rest of line when a ; is encountered
+				if (sc.chPrev == ';') {
+					ci=2;
+					sc.SetState(SCE_AU3_COMMENTBLOCK);
+				}
+				// skip rest of the line
+				if (ci==2) 
+					break;
+				// check when first character is detected on the line 
+				if (ci==0) {
+					if (IsAWordStart(static_cast<char>(sc.ch)) || IsAOperator(static_cast<char>(sc.ch))) {
+						ci=1;
+						sc.SetState(SCE_AU3_COMMENTBLOCK);
+					}
+					break;
+				}
+				if (!(IsAWordChar(sc.ch) || (sc.ch == '-' && strcmp(s, "#comments") == 0))) {
+					if ((strcmp(s, "#ce")== 0 || strcmp(s, "#comments-end")== 0))
+							sc.SetState(SCE_AU3_COMMENT);  // set to comment line for the rest of the line
+					else
+						ci=2;  // line doesn't begin with #CE so skip the rest of the line
+				}
+				break;
+			}
+            case SCE_AU3_COMMENT:
+            {
+                if (sc.atLineEnd) {sc.SetState(SCE_AU3_DEFAULT);}
+                break;
+            }
+            case SCE_AU3_OPERATOR:
+            {
+                // check if its a COMobject 
+				if (sc.chPrev == '.' && IsAWordChar(sc.ch)) {
+					sc.SetState(SCE_AU3_COMOBJ);
+				}	
+				else {
+					sc.SetState(SCE_AU3_DEFAULT);
+				}
+                break;
+            }
+            case SCE_AU3_SPECIAL:
+            {
+                if (sc.ch == ';') {sc.SetState(SCE_AU3_COMMENT);}
+				if (sc.atLineEnd) {sc.SetState(SCE_AU3_DEFAULT);}
+                break;
+            }
+            case SCE_AU3_KEYWORD:
+            {
+                if (!(IsAWordChar(sc.ch) || (sc.ch == '-' && (strcmp(s, "#comments") == 0 || strcmp(s, "#include") == 0))))
+                {
+                    if (!IsTypeCharacter(sc.ch))
+                    {
+						if (strcmp(s, "#cs")== 0 || strcmp(s, "#comments-start")== 0 )
+						{
+							sc.ChangeState(SCE_AU3_COMMENTBLOCK);
+							sc.SetState(SCE_AU3_COMMENTBLOCK);
+							break;
+						}
+						else if (keywords.InList(s)) {
+							sc.ChangeState(SCE_AU3_KEYWORD);
+							sc.SetState(SCE_AU3_DEFAULT);
+						}
+						else if (keywords2.InList(s)) {
+							sc.ChangeState(SCE_AU3_FUNCTION);
+							sc.SetState(SCE_AU3_DEFAULT);
+						}
+						else if (keywords3.InList(s)) {
+							sc.ChangeState(SCE_AU3_MACRO);
+							sc.SetState(SCE_AU3_DEFAULT);
+						}
+						else if (keywords5.InList(s)) {
+							sc.ChangeState(SCE_AU3_PREPROCESSOR);
+							sc.SetState(SCE_AU3_DEFAULT);
+							if (strcmp(s, "#include")== 0)
+							{
+								si = 3;   // use to determine string start for #inlude <>
+							}
+						}
+						else if (keywords6.InList(s)) {
+							sc.ChangeState(SCE_AU3_SPECIAL);
+							sc.SetState(SCE_AU3_SPECIAL);
+						}
+						else if ((keywords7.InList(s)) && (!IsAOperator(static_cast<char>(sc.ch)))) {
+							sc.ChangeState(SCE_AU3_EXPAND);
+							sc.SetState(SCE_AU3_DEFAULT);
+						}
+						else if (keywords8.InList(s)) {
+							sc.ChangeState(SCE_AU3_UDF);
+							sc.SetState(SCE_AU3_DEFAULT);
+						}
+						else if (strcmp(s, "_") == 0) {
+							sc.ChangeState(SCE_AU3_OPERATOR);
+							sc.SetState(SCE_AU3_DEFAULT);
+						}
+						else if (!IsAWordChar(sc.ch)) {
+							sc.ChangeState(SCE_AU3_DEFAULT);
+							sc.SetState(SCE_AU3_DEFAULT);
+						}
+					}
+				}	
+                if (sc.atLineEnd) {
+					sc.SetState(SCE_AU3_DEFAULT);}
+                break;
+            }
+			case SCE_AU3_NUMBER:
+            {
+				// Numeric indicator error=9 normal=0 normal+dec=1 hex=2 E-not=3
+				//
+				// test for Hex notation
+				if (strcmp(s, "0") == 0 && (sc.ch == 'x' || sc.ch == 'X') && ni == 0)
+				{
+					ni = 2;
+					break;
+				}
+				// test for E notation
+				if (IsADigit(sc.chPrev) && (sc.ch == 'e' || sc.ch == 'E') && ni <= 1)
+				{
+					ni = 3;
+					break;
+				}
+				//  Allow Hex characters inside hex numeric strings
+				if ((ni == 2) &&
+					(sc.ch == 'a' || sc.ch == 'b' || sc.ch == 'c' || sc.ch == 'd' || sc.ch == 'e' || sc.ch == 'f' ||
+					 sc.ch == 'A' || sc.ch == 'B' || sc.ch == 'C' || sc.ch == 'D' || sc.ch == 'E' || sc.ch == 'F' ))
+				{
+					break;
+				}
+				// test for 1 dec point only
+				if (sc.ch == '.')
+				{
+					if (ni==0)
+					{
+						ni=1;
+					}
+					else
+					{
+						ni=9;
+					}
+					break;
+				}
+				// end of numeric string ?
+				if (!(IsADigit(sc.ch)))
+				{
+					if (ni==9)
+					{
+						sc.ChangeState(SCE_AU3_DEFAULT);
+					}
+					sc.SetState(SCE_AU3_DEFAULT);
+				}
+				break;
+			}
+			case SCE_AU3_VARIABLE:
+			{
+				// Check if its a COMObject
+				if (sc.ch == '.' && !IsADigit(sc.chNext)) {
+					sc.SetState(SCE_AU3_OPERATOR);
+				}
+				else if (!IsAWordChar(sc.ch)) {
+					sc.SetState(SCE_AU3_DEFAULT);
+				}
+				break;
+            }
+			case SCE_AU3_COMOBJ:
+			{
+				if (!(IsAWordChar(sc.ch))) {
+					sc.SetState(SCE_AU3_DEFAULT);
+				}
+				break;
+            }
+            case SCE_AU3_STRING:
+            {
+				// check for " to end a double qouted string or
+				// check for ' to end a single qouted string 
+	            if ((si == 1 && sc.ch == '\"') || (si == 2 && sc.ch == '\'') || (si == 3 && sc.ch == '>'))
+				{
+					sc.ForwardSetState(SCE_AU3_DEFAULT);
+					si=0;
+					break;
+				}
+                if (sc.atLineEnd)
+				{
+					si=0;
+					// at line end and not found a continuation char then reset to default
+					int lineCurrent = styler.GetLine(sc.currentPos);
+					if (!IsContinuationLine(lineCurrent,styler)) 
+					{
+						sc.SetState(SCE_AU3_DEFAULT);
+						break;
+					}
+				}
+				// find Sendkeys in a STRING
+				if (sc.ch == '{' || sc.ch == '+' || sc.ch == '!' || sc.ch == '^' || sc.ch == '#' ) {
+					sc.SetState(SCE_AU3_SENT);}
+				break;
+            }
+            
+            case SCE_AU3_SENT:
+            {
+				// Send key string ended 
+				if (sc.chPrev == '}' && sc.ch != '}') 
+				{
+					// set color to SENDKEY when valid sendkey .. else set back to regular string
+					char sk[100];
+					// split {111 222} and return {111} and check if 222 is valid.
+					// if return code = 1 then invalid 222 so must be string
+					if (GetSendKey(s,sk))   
+					{
+						sc.ChangeState(SCE_AU3_STRING);
+					}
+					// if single char between {?} then its ok as sendkey for a single character
+					else if (strlen(sk) == 3)  
+					{
+						sc.ChangeState(SCE_AU3_SENT);
+					}
+					// if sendkey {111} is in table then ok as sendkey
+					else if (keywords4.InList(sk)) 
+					{
+						sc.ChangeState(SCE_AU3_SENT);
+					}
+					else
+					{
+						sc.ChangeState(SCE_AU3_STRING);
+					}
+					sc.SetState(SCE_AU3_STRING);
+				}
+				else
+				{
+					// check if the start is a valid SendKey start
+					int		nPos	= 0;
+					int		nState	= 1;
+					char	cTemp;
+					while (!(nState == 2) && ((cTemp = s[nPos]) != '\0')) 
+					{
+						if (cTemp == '{' && nState == 1) 
+						{
+							nState = 2;
+						}
+						if (nState == 1 && !(cTemp == '+' || cTemp == '!' || cTemp == '^' || cTemp == '#' ))
+						{
+							nState = 0;
+						}
+						nPos++;
+					}
+					//Verify characters infront of { ... if not assume  regular string
+					if (nState == 1 && (!(sc.ch == '{' || sc.ch == '+' || sc.ch == '!' || sc.ch == '^' || sc.ch == '#' ))) {
+						sc.ChangeState(SCE_AU3_STRING);
+						sc.SetState(SCE_AU3_STRING);
+					}
+					// If invalid character found then assume its a regular string	
+					if (nState == 0) {
+						sc.ChangeState(SCE_AU3_STRING);
+						sc.SetState(SCE_AU3_STRING);
+					}
+				}
+				// check if next portion is again a sendkey
+				if (sc.atLineEnd) 
+				{
+					sc.ChangeState(SCE_AU3_STRING);
+					sc.SetState(SCE_AU3_DEFAULT);
+					si = 0;  // reset string indicator
+				}
+				//* check in next characters following a sentkey are again a sent key
+				// Need this test incase of 2 sentkeys like {F1}{ENTER} but not detect {{}
+				if (sc.state == SCE_AU3_STRING && (sc.ch == '{' || sc.ch == '+' || sc.ch == '!' || sc.ch == '^' || sc.ch == '#' )) {
+					sc.SetState(SCE_AU3_SENT);}
+				// check to see if the string ended...
+				// Sendkey string isn't complete but the string ended....
+				if ((si == 1 && sc.ch == '\"') || (si == 2 && sc.ch == '\''))
+				{
+					sc.ChangeState(SCE_AU3_STRING);
+					sc.ForwardSetState(SCE_AU3_DEFAULT);
+				}
+				break;
+            }
+        }  //switch (sc.state)
+
+        // Determine if a new state should be entered:
+
+		if (sc.state == SCE_AU3_DEFAULT)
+        {
+            if (sc.ch == ';') {sc.SetState(SCE_AU3_COMMENT);}
+            else if (sc.ch == '#') {sc.SetState(SCE_AU3_KEYWORD);}
+            else if (sc.ch == '$') {sc.SetState(SCE_AU3_VARIABLE);}
+            else if (sc.ch == '.' && !IsADigit(sc.chNext)) {sc.SetState(SCE_AU3_OPERATOR);}
+            else if (sc.ch == '@') {sc.SetState(SCE_AU3_KEYWORD);}
+            //else if (sc.ch == '_') {sc.SetState(SCE_AU3_KEYWORD);}
+            else if (sc.ch == '<' && si==3) {sc.SetState(SCE_AU3_STRING);}  // string after #include 
+            else if (sc.ch == '\"') {
+				sc.SetState(SCE_AU3_STRING);
+				si = 1;	}
+            else if (sc.ch == '\'') {
+				sc.SetState(SCE_AU3_STRING);
+				si = 2;	}
+            else if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) 
+			{
+				sc.SetState(SCE_AU3_NUMBER);
+				ni = 0;
+			}
+            else if (IsAWordStart(sc.ch)) {sc.SetState(SCE_AU3_KEYWORD);}
+            else if (IsAOperator(static_cast<char>(sc.ch))) {sc.SetState(SCE_AU3_OPERATOR);}
+			else if (sc.atLineEnd) {sc.SetState(SCE_AU3_DEFAULT);}
+        }
+    }      //for (; sc.More(); sc.Forward())
+
+	//*************************************
+	// Colourize the last word correctly 
+	//*************************************
+	if (sc.state == SCE_AU3_KEYWORD)
+		{
+		if (strcmp(s_save, "#cs")== 0 || strcmp(s_save, "#comments-start")== 0 )
+		{
+			sc.ChangeState(SCE_AU3_COMMENTBLOCK);
+			sc.SetState(SCE_AU3_COMMENTBLOCK);
+		}
+		else if (keywords.InList(s_save)) {
+			sc.ChangeState(SCE_AU3_KEYWORD);
+			sc.SetState(SCE_AU3_KEYWORD);
+		}
+		else if (keywords2.InList(s_save)) {
+			sc.ChangeState(SCE_AU3_FUNCTION);
+			sc.SetState(SCE_AU3_FUNCTION);
+		}
+		else if (keywords3.InList(s_save)) {
+			sc.ChangeState(SCE_AU3_MACRO);
+			sc.SetState(SCE_AU3_MACRO);
+		}
+		else if (keywords5.InList(s_save)) {
+			sc.ChangeState(SCE_AU3_PREPROCESSOR);
+			sc.SetState(SCE_AU3_PREPROCESSOR);
+		}
+		else if (keywords6.InList(s_save)) {
+			sc.ChangeState(SCE_AU3_SPECIAL);
+			sc.SetState(SCE_AU3_SPECIAL);
+		}
+		else if (keywords7.InList(s_save) && sc.atLineEnd) {
+			sc.ChangeState(SCE_AU3_EXPAND);
+			sc.SetState(SCE_AU3_EXPAND);
+		}
+		else if (keywords8.InList(s_save)) {
+			sc.ChangeState(SCE_AU3_UDF);
+			sc.SetState(SCE_AU3_UDF);
+		}
+		else {
+			sc.ChangeState(SCE_AU3_DEFAULT);
+			sc.SetState(SCE_AU3_DEFAULT);
+		}
+	}
+	if (sc.state == SCE_AU3_SENT)
+    {
+		// Send key string ended 
+		if (sc.chPrev == '}' && sc.ch != '}') 
+		{
+			// set color to SENDKEY when valid sendkey .. else set back to regular string
+			char sk[100];
+			// split {111 222} and return {111} and check if 222 is valid.
+			// if return code = 1 then invalid 222 so must be string
+			if (GetSendKey(s_save,sk))   
+			{
+				sc.ChangeState(SCE_AU3_STRING);
+			}
+			// if single char between {?} then its ok as sendkey for a single character
+			else if (strlen(sk) == 3)  
+			{
+				sc.ChangeState(SCE_AU3_SENT);
+			}
+			// if sendkey {111} is in table then ok as sendkey
+			else if (keywords4.InList(sk)) 
+			{
+				sc.ChangeState(SCE_AU3_SENT);
+			}
+			else
+			{
+				sc.ChangeState(SCE_AU3_STRING);
+			}
+			sc.SetState(SCE_AU3_STRING);
+		}
+		// check if next portion is again a sendkey
+		if (sc.atLineEnd) 
+		{
+			sc.ChangeState(SCE_AU3_STRING);
+			sc.SetState(SCE_AU3_DEFAULT);
+		}
+    }
+	//*************************************
+	sc.Complete();
+}
+
+//
+static bool IsStreamCommentStyle(int style) {
+	return style == SCE_AU3_COMMENT || style == SCE_AU3_COMMENTBLOCK;
+}
+
+//
+// Routine to find first none space on the current line and return its Style
+// needed for comment lines not starting on pos 1 
+static int GetStyleFirstWord(unsigned int szLine, Accessor &styler)
+{
+	int nsPos = styler.LineStart(szLine);
+	int nePos = styler.LineStart(szLine+1) - 1;
+	while (isspacechar(styler.SafeGetCharAt(nsPos)) && nsPos < nePos)
+	{
+		nsPos++; // skip to next char
+
+	} // End While
+	return styler.StyleAt(nsPos);
+
+} // GetStyleFirstWord()
+
+
+//
+static void FoldAU3Doc(unsigned int startPos, int length, int, WordList *[], Accessor &styler)
+{
+	int endPos = startPos + length;
+	// get settings from the config files for folding comments and preprocessor lines
+	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
+	bool foldInComment = styler.GetPropertyInt("fold.comment") == 2;
+	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	bool foldpreprocessor = styler.GetPropertyInt("fold.preprocessor") != 0;
+	// Backtrack to previous line in case need to fix its fold status
+	int lineCurrent = styler.GetLine(startPos);
+	if (startPos > 0) {
+		if (lineCurrent > 0) {
+			lineCurrent--;
+			startPos = styler.LineStart(lineCurrent);
+		}
+	}
+	// vars for style of previous/current/next lines 
+	int style = GetStyleFirstWord(lineCurrent,styler);
+	int stylePrev = 0;
+	// find the first previous line without continuation character at the end
+	while ((lineCurrent > 0 && IsContinuationLine(lineCurrent,styler)) ||
+	       (lineCurrent > 1 && IsContinuationLine(lineCurrent-1,styler))) {
+		lineCurrent--;
+		startPos = styler.LineStart(lineCurrent);
+	}
+	if (lineCurrent > 0) {
+		stylePrev = GetStyleFirstWord(lineCurrent-1,styler);
+	}
+	// vars for getting first word to check for keywords
+	bool FirstWordStart = false;
+	bool FirstWordEnd = false;
+	char szKeyword[11]="";
+	int	 szKeywordlen = 0;
+	char szThen[5]="";
+	int	 szThenlen = 0;
+	bool ThenFoundLast = false;
+	// var for indentlevel
+	int levelCurrent = SC_FOLDLEVELBASE;
+	if (lineCurrent > 0)
+		levelCurrent = styler.LevelAt(lineCurrent-1) >> 16;
+	int levelNext = levelCurrent;
+	//  
+	int	visibleChars = 0;
+	char chNext = styler.SafeGetCharAt(startPos);
+	char chPrev = ' ';
+	//
+	for (int i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		if (IsAWordChar(ch)) {
+			visibleChars++;
+		}
+		// get the syle for the current character neede to check in comment
+		int stylech = styler.StyleAt(i);
+		// get first word for the line for indent check max 9 characters
+		if (FirstWordStart && (!(FirstWordEnd))) {
+			if (!IsAWordChar(ch)) {
+				FirstWordEnd = true;
+				szKeyword[szKeywordlen] = '\0';
+			}
+			else {
+				if (szKeywordlen < 10) {
+				szKeyword[szKeywordlen++] = static_cast<char>(tolower(ch));
+				}
+			}
+		}
+		// start the capture of the first word 
+		if (!(FirstWordStart)) {
+			if (IsAWordChar(ch) || IsAWordStart(ch) || ch == ';') {
+				FirstWordStart = true;
+				szKeyword[szKeywordlen++] = static_cast<char>(tolower(ch));
+			}
+		}
+		// only process this logic when not in comment section
+		if (!(stylech == SCE_AU3_COMMENT)) {
+			if (ThenFoundLast) {
+				if (IsAWordChar(ch)) {
+					ThenFoundLast = false;
+				}		
+			}
+			// find out if the word "then" is the last on a "if" line
+			if (FirstWordEnd && strcmp(szKeyword,"if") == 0) {
+				if (szThenlen == 4) {
+					szThen[0] = szThen[1];
+					szThen[1] = szThen[2];
+					szThen[2] = szThen[3];
+					szThen[3] = static_cast<char>(tolower(ch));
+					if (strcmp(szThen,"then") == 0 ) {
+						ThenFoundLast = true;
+					}
+				}
+				else {
+					szThen[szThenlen++] = static_cast<char>(tolower(ch));
+					if (szThenlen == 5) {
+						szThen[4] = '\0';
+					}
+				}
+			}
+		}
+		// End of Line found so process the information 
+		if ((ch == '\r' && chNext != '\n') || (ch == '\n') || (i == endPos)) {
+			// **************************
+			// Folding logic for Keywords
+			// **************************
+			// if a keyword is found on the current line and the line doesn't end with _ (continuation)
+			//    and we are not inside a commentblock.
+			if (szKeywordlen > 0 && (!(chPrev == '_')) && 
+				((!(IsStreamCommentStyle(style)) || foldInComment)) ) {
+				szKeyword[szKeywordlen] = '\0';
+				// only fold "if" last keyword is "then"  (else its a one line if)
+				if (strcmp(szKeyword,"if") == 0  && ThenFoundLast) {
+						levelNext++;
+				}
+				// create new fold for these words 
+				if (strcmp(szKeyword,"do") == 0   || strcmp(szKeyword,"for") == 0 ||
+					strcmp(szKeyword,"func") == 0 || strcmp(szKeyword,"while") == 0||
+					strcmp(szKeyword,"with") == 0 || strcmp(szKeyword,"#region") == 0 ) {
+						levelNext++;
+				}
+				// create double Fold for select&switch because Case will subtract one of the current level
+				if (strcmp(szKeyword,"select") == 0 || strcmp(szKeyword,"switch") == 0) {
+						levelNext++;
+						levelNext++;
+				}
+				// end the fold for these words before the current line
+				if (strcmp(szKeyword,"endfunc") == 0 || strcmp(szKeyword,"endif") == 0 ||
+					strcmp(szKeyword,"next") == 0    || strcmp(szKeyword,"until") == 0 || 
+					strcmp(szKeyword,"endwith") == 0 ||strcmp(szKeyword,"wend") == 0){
+						levelNext--;
+						levelCurrent--;
+				}
+				// end the fold for these words before the current line and Start new fold 
+				if (strcmp(szKeyword,"case") == 0      || strcmp(szKeyword,"else") == 0 ||
+					strcmp(szKeyword,"elseif") == 0 ) {
+						levelCurrent--;
+				}
+				// end the double fold for this word before the current line
+				if (strcmp(szKeyword,"endselect") == 0 || strcmp(szKeyword,"endswitch") == 0 ) {
+						levelNext--;
+						levelNext--;
+						levelCurrent--;
+						levelCurrent--;
+				}
+				// end the fold for these words on the current line
+				if (strcmp(szKeyword,"#endregion") == 0 ) {
+						levelNext--;
+				}
+			}
+			// Preprocessor and Comment folding
+			int styleNext = GetStyleFirstWord(lineCurrent + 1,styler);
+			// *************************************
+			// Folding logic for preprocessor blocks
+			// *************************************
+			// process preprosessor line
+			if (foldpreprocessor && style == SCE_AU3_PREPROCESSOR) {
+				if (!(stylePrev == SCE_AU3_PREPROCESSOR) && (styleNext == SCE_AU3_PREPROCESSOR)) {
+				    levelNext++;
+				}
+				// fold till the last line for normal comment lines
+				else if (stylePrev == SCE_AU3_PREPROCESSOR && !(styleNext == SCE_AU3_PREPROCESSOR)) {
+					levelNext--;
+				}
+			}
+			// *********************************
+			// Folding logic for Comment blocks
+			// *********************************
+			if (foldComment && IsStreamCommentStyle(style)) {
+				// Start of a comment block
+				if (!(stylePrev==style) && IsStreamCommentStyle(styleNext) && styleNext==style) {
+				    levelNext++;
+				} 
+				// fold till the last line for normal comment lines
+				else if (IsStreamCommentStyle(stylePrev) 
+						&& !(styleNext == SCE_AU3_COMMENT)
+						&& stylePrev == SCE_AU3_COMMENT 
+						&& style == SCE_AU3_COMMENT) {
+					levelNext--;
+				}
+				// fold till the one but last line for Blockcomment lines
+				else if (IsStreamCommentStyle(stylePrev) 
+						&& !(styleNext == SCE_AU3_COMMENTBLOCK)
+						&& style == SCE_AU3_COMMENTBLOCK) {
+					levelNext--;
+					levelCurrent--;
+				}
+			}
+			int levelUse = levelCurrent;
+			int lev = levelUse | levelNext << 16;
+			if (visibleChars == 0 && foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if (levelUse < levelNext) {
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			}
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			// reset values for the next line
+			lineCurrent++;
+			stylePrev = style;
+			style = styleNext;
+			levelCurrent = levelNext;
+			visibleChars = 0;
+			// if the last character is an Underscore then don't reset since the line continues on the next line.
+			if (!(chPrev == '_')) {
+				szKeywordlen = 0;
+				szThenlen = 0;
+				FirstWordStart = false;
+				FirstWordEnd = false;
+				ThenFoundLast = false;
+			}
+		}
+		// save the last processed character
+		if (!isspacechar(ch)) {
+			chPrev = ch;
+			visibleChars++;
+		}
+	}
+}
+
+
+//
+
+static const char * const AU3WordLists[] = {
+    "#autoit keywords",
+    "#autoit functions",
+    "#autoit macros",
+    "#autoit Sent keys",
+    "#autoit Pre-processors",
+    "#autoit Special",
+    "#autoit Expand",
+    "#autoit UDF",
+    0
+};
+LexerModule lmAU3(SCLEX_AU3, ColouriseAU3Doc, "au3", FoldAU3Doc , AU3WordLists);
diff --git a/Documents/Scintilla/LexAVE.cxx b/Documents/Scintilla/LexAVE.cxx
new file mode 100644
index 0000000..2b7029b
--- /dev/null
+++ b/Documents/Scintilla/LexAVE.cxx
@@ -0,0 +1,228 @@
+// SciTE - Scintilla based Text Editor
+/** @file LexAVE.cxx
+ ** Lexer for Avenue.
+ **
+  ** Written by Alexey Yutkin <yutkin@geol.msu.ru>.
+ **/
+// Copyright 1998-2002 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdarg.h>
+#include <stdio.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+
+static inline bool IsAWordChar(const int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '.' || ch == '_');
+}
+static inline bool IsEnumChar(const int ch) {
+	return (ch < 0x80) && (isalnum(ch)|| ch == '_');
+}
+static inline bool IsANumberChar(const int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '.' );
+}
+
+inline bool IsAWordStart(const int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '_');
+}
+
+inline bool isAveOperator(char ch) {
+	if (isalnum(ch))
+		return false;
+	// '.' left out as it is used to make up numbers
+	if (ch == '*' || ch == '/' || ch == '-' || ch == '+' ||
+		ch == '(' || ch == ')' || ch == '=' ||
+		ch == '{' || ch == '}' ||
+		ch == '[' || ch == ']' || ch == ';' ||
+		ch == '<' || ch == '>' || ch == ',' ||
+		ch == '.'  )
+		return true;
+	return false;
+}
+
+static void ColouriseAveDoc(
+	unsigned int startPos,
+	int length,
+	int initStyle,
+	WordList *keywordlists[],
+	Accessor &styler) {
+
+	WordList &keywords = *keywordlists[0];
+	WordList &keywords2 = *keywordlists[1];
+	WordList &keywords3 = *keywordlists[2];
+	WordList &keywords4 = *keywordlists[3];
+	WordList &keywords5 = *keywordlists[4];
+	WordList &keywords6 = *keywordlists[5];
+
+	// Do not leak onto next line
+	if (initStyle == SCE_AVE_STRINGEOL) {
+		initStyle = SCE_AVE_DEFAULT;
+	}
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	for (; sc.More(); sc.Forward()) {
+		if (sc.atLineEnd) {
+			// Update the line state, so it can be seen by next line
+			int currentLine = styler.GetLine(sc.currentPos);
+			styler.SetLineState(currentLine, 0);
+		}
+		if (sc.atLineStart && (sc.state == SCE_AVE_STRING)) {
+			// Prevent SCE_AVE_STRINGEOL from leaking back to previous line
+			sc.SetState(SCE_AVE_STRING);
+		}
+
+
+		// Determine if the current state should terminate.
+		if (sc.state == SCE_AVE_OPERATOR) {
+			sc.SetState(SCE_AVE_DEFAULT);
+		} else if (sc.state == SCE_AVE_NUMBER) {
+			if (!IsANumberChar(sc.ch)) {
+				sc.SetState(SCE_AVE_DEFAULT);
+			}
+		} else if (sc.state == SCE_AVE_ENUM) {
+			if (!IsEnumChar(sc.ch)) {
+				sc.SetState(SCE_AVE_DEFAULT);
+			}
+		} else if (sc.state == SCE_AVE_IDENTIFIER) {
+			if (!IsAWordChar(sc.ch) || (sc.ch == '.')) {
+				char s[100];
+				//sc.GetCurrent(s, sizeof(s));
+				sc.GetCurrentLowered(s, sizeof(s));
+				if (keywords.InList(s)) {
+					sc.ChangeState(SCE_AVE_WORD);
+				} else if (keywords2.InList(s)) {
+					sc.ChangeState(SCE_AVE_WORD2);
+				} else if (keywords3.InList(s)) {
+					sc.ChangeState(SCE_AVE_WORD3);
+				} else if (keywords4.InList(s)) {
+					sc.ChangeState(SCE_AVE_WORD4);
+				} else if (keywords5.InList(s)) {
+					sc.ChangeState(SCE_AVE_WORD5);
+				} else if (keywords6.InList(s)) {
+					sc.ChangeState(SCE_AVE_WORD6);
+				}
+				sc.SetState(SCE_AVE_DEFAULT);
+			}
+		} else if (sc.state == SCE_AVE_COMMENT) {
+			if (sc.atLineEnd) {
+				sc.SetState(SCE_AVE_DEFAULT);
+			}
+		} else if (sc.state == SCE_AVE_STRING) {
+			 if (sc.ch == '\"') {
+				sc.ForwardSetState(SCE_AVE_DEFAULT);
+			} else if (sc.atLineEnd) {
+				sc.ChangeState(SCE_AVE_STRINGEOL);
+				sc.ForwardSetState(SCE_AVE_DEFAULT);
+			}
+		}
+
+		// Determine if a new state should be entered.
+		if (sc.state == SCE_AVE_DEFAULT) {
+			if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
+				sc.SetState(SCE_AVE_NUMBER);
+			} else if (IsAWordStart(sc.ch)) {
+				sc.SetState(SCE_AVE_IDENTIFIER);
+			} else if (sc.Match('\"')) {
+				sc.SetState(SCE_AVE_STRING);
+			} else if (sc.Match('\'')) {
+				sc.SetState(SCE_AVE_COMMENT);
+				sc.Forward();
+			} else if (isAveOperator(static_cast<char>(sc.ch))) {
+				sc.SetState(SCE_AVE_OPERATOR);
+			} else if (sc.Match('#')) {
+				sc.SetState(SCE_AVE_ENUM);
+				sc.Forward();
+			}
+		}
+	}
+	sc.Complete();
+}
+
+static void FoldAveDoc(unsigned int startPos, int length, int /* initStyle */, WordList *[],
+                       Accessor &styler) {
+	unsigned int lengthDoc = startPos + length;
+	int visibleChars = 0;
+	int lineCurrent = styler.GetLine(startPos);
+	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
+	int levelCurrent = levelPrev;
+	char chNext = static_cast<char>(tolower(styler[startPos]));
+	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	int styleNext = styler.StyleAt(startPos);
+	char s[10];
+
+	for (unsigned int i = startPos; i < lengthDoc; i++) {
+		char ch = static_cast<char>(tolower(chNext));
+		chNext = static_cast<char>(tolower(styler.SafeGetCharAt(i + 1)));
+		int style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+		if (style == SCE_AVE_WORD) {
+			if (ch == 't' || ch == 'f' || ch == 'w' || ch == 'e') {
+				for (unsigned int j = 0; j < 6; j++) {
+					if (!iswordchar(styler[i + j])) {
+						break;
+					}
+					s[j] = static_cast<char>(tolower(styler[i + j]));
+					s[j + 1] = '\0';
+				}
+
+				if ((strcmp(s, "then") == 0) || (strcmp(s, "for") == 0) || (strcmp(s, "while") == 0)) {
+					levelCurrent++;
+				}
+				if ((strcmp(s, "end") == 0) || (strcmp(s, "elseif") == 0)) {
+					// Normally "elseif" and "then" will be on the same line and will cancel
+					// each other out.  // As implemented, this does not support fold.at.else.
+					levelCurrent--;
+				}
+			}
+		} else if (style == SCE_AVE_OPERATOR) {
+			if (ch == '{' || ch == '(') {
+				levelCurrent++;
+			} else if (ch == '}' || ch == ')') {
+				levelCurrent--;
+			}
+		}
+
+		if (atEOL) {
+			int lev = levelPrev;
+			if (visibleChars == 0 && foldCompact) {
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			}
+			if ((levelCurrent > levelPrev) && (visibleChars > 0)) {
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			}
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelPrev = levelCurrent;
+			visibleChars = 0;
+		}
+		if (!isspacechar(ch)) {
+			visibleChars++;
+		}
+	}
+	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
+
+	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
+}
+
+LexerModule lmAVE(SCLEX_AVE, ColouriseAveDoc, "ave", FoldAveDoc);
+
diff --git a/Documents/Scintilla/LexAbaqus.cxx b/Documents/Scintilla/LexAbaqus.cxx
new file mode 100644
index 0000000..10e8b76
--- /dev/null
+++ b/Documents/Scintilla/LexAbaqus.cxx
@@ -0,0 +1,617 @@
+// Scintilla source code edit control
+/** @file LexABAQUS.cxx
+ ** Lexer for ABAQUS. Based on the lexer for APDL by Hadar Raz.
+ ** By Sergio Lucato.
+ ** Sort of completely rewritten by Gertjan Kloosterman
+ **/
+// The License.txt file describes the conditions under which this software may be distributed.
+
+// Code folding copyied and modified from LexBasic.cxx
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+static inline bool IsAWordChar(const int ch) {
+	return (ch < 0x80 && (isalnum(ch) || (ch == '_')));
+}
+
+static inline bool IsAKeywordChar(const int ch) {
+	return (ch < 0x80 && (isalnum(ch) || (ch == '_') || (ch == ' ')));
+}
+
+static inline bool IsASetChar(const int ch) {
+	return (ch < 0x80 && (isalnum(ch) || (ch == '_') || (ch == '.') || (ch == '-')));
+}
+
+static inline bool IsAnOperator(char ch) {
+	// '.' left out as it is used to make up numbers
+	if (ch == '*' || ch == '/' || ch == '-' || ch == '+' ||
+		ch == '(' || ch == ')' || ch == '=' || ch == '^' ||
+		ch == '[' || ch == ']' || ch == '<' || ch == '&' ||
+		ch == '>' || ch == ',' || ch == '|' || ch == '~' ||
+		ch == '$' || ch == ':' || ch == '%')
+		return true;
+	return false;
+}
+
+static void ColouriseABAQUSDoc(unsigned int startPos, int length, int initStyle, WordList*[] /* *keywordlists[] */,
+                            Accessor &styler) {
+	enum localState { KW_LINE_KW, KW_LINE_COMMA, KW_LINE_PAR, KW_LINE_EQ, KW_LINE_VAL, \
+					  DAT_LINE_VAL, DAT_LINE_COMMA,\
+					  COMMENT_LINE,\
+					  ST_ERROR, LINE_END } state ;
+
+	// Do not leak onto next line
+	state = LINE_END ;
+	initStyle = SCE_ABAQUS_DEFAULT;
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	// Things are actually quite simple
+	// we have commentlines
+	// keywordlines and datalines
+	// On a data line there will only be colouring of numbers
+	// a keyword line is constructed as
+	// *word,[ paramname[=paramvalue]]*
+	// if the line ends with a , the keyword line continues onto the new line
+
+	for (; sc.More(); sc.Forward()) {
+		switch ( state ) {
+        case KW_LINE_KW :
+            if ( sc.atLineEnd ) {
+                // finished the line in keyword state, switch to LINE_END
+                sc.SetState(SCE_ABAQUS_DEFAULT) ;
+                state = LINE_END ;
+            } else if ( IsAKeywordChar(sc.ch) ) {
+                // nothing changes
+                state = KW_LINE_KW ;
+            } else if ( sc.ch == ',' ) {
+                // Well well we say a comma, arguments *MUST* follow
+                sc.SetState(SCE_ABAQUS_OPERATOR) ;
+                state = KW_LINE_COMMA ;
+            } else {
+                // Flag an error
+                sc.SetState(SCE_ABAQUS_PROCESSOR) ;
+                state = ST_ERROR ;
+            }
+            // Done with processing
+            break ;
+        case KW_LINE_COMMA :
+            // acomma on a keywordline was seen
+            if ( IsAKeywordChar(sc.ch)) {
+                sc.SetState(SCE_ABAQUS_ARGUMENT) ;
+                state = KW_LINE_PAR ;
+            } else if ( sc.atLineEnd || (sc.ch == ',') ) {
+                // we remain in keyword mode
+                state = KW_LINE_COMMA ;
+            } else if ( sc.ch == ' ' ) {
+                sc.SetState(SCE_ABAQUS_DEFAULT) ;
+                state = KW_LINE_COMMA ;
+            } else {
+                // Anything else constitutes an error
+                sc.SetState(SCE_ABAQUS_PROCESSOR) ;
+                state = ST_ERROR ;
+            }
+            break ;
+        case KW_LINE_PAR :
+            if ( sc.atLineEnd ) {
+                sc.SetState(SCE_ABAQUS_DEFAULT) ;
+                state = LINE_END ;
+            } else if ( IsAKeywordChar(sc.ch) || (sc.ch == '-') ) {
+                // remain in this state
+                state = KW_LINE_PAR ;
+            } else if ( sc.ch == ',' ) {
+                sc.SetState(SCE_ABAQUS_OPERATOR) ;
+                state = KW_LINE_COMMA ;
+            } else if ( sc.ch == '=' ) {
+                sc.SetState(SCE_ABAQUS_OPERATOR) ;
+                state = KW_LINE_EQ ;
+            } else {
+                // Anything else constitutes an error
+                sc.SetState(SCE_ABAQUS_PROCESSOR) ;
+                state = ST_ERROR ;
+            }
+            break ;
+        case KW_LINE_EQ :
+            if ( sc.ch == ' ' ) {
+                sc.SetState(SCE_ABAQUS_DEFAULT) ;
+                // remain in this state
+                state = KW_LINE_EQ ;
+            } else if ( IsADigit(sc.ch) || (sc.ch == '-') || (sc.ch == '.' && IsADigit(sc.chNext)) ) {
+                sc.SetState(SCE_ABAQUS_NUMBER) ;
+                state = KW_LINE_VAL ;
+            } else if ( IsAKeywordChar(sc.ch) ) {
+                sc.SetState(SCE_ABAQUS_DEFAULT) ;
+                state = KW_LINE_VAL ;
+            } else if ( (sc.ch == '\'') || (sc.ch == '\"') ) {
+                sc.SetState(SCE_ABAQUS_STRING) ;
+                state = KW_LINE_VAL ;
+            } else {
+                sc.SetState(SCE_ABAQUS_PROCESSOR) ;
+                state = ST_ERROR ;
+            }
+            break ;
+        case KW_LINE_VAL :
+            if ( sc.atLineEnd ) {
+                sc.SetState(SCE_ABAQUS_DEFAULT) ;
+                state = LINE_END ;
+            } else if ( IsASetChar(sc.ch) && (sc.state == SCE_ABAQUS_DEFAULT) ) {
+                // nothing changes
+                state = KW_LINE_VAL ;
+            } else if (( (IsADigit(sc.ch) || sc.ch == '.' || (sc.ch == 'e' || sc.ch == 'E') ||
+                    ((sc.ch == '+' || sc.ch == '-') && (sc.chPrev == 'e' || sc.chPrev == 'E')))) &&
+                    (sc.state == SCE_ABAQUS_NUMBER)) {
+                // remain in number mode
+                state = KW_LINE_VAL ;
+            } else if (sc.state == SCE_ABAQUS_STRING) {
+                // accept everything until a closing quote
+                if ( sc.ch == '\'' || sc.ch == '\"' ) {
+                    sc.SetState(SCE_ABAQUS_DEFAULT) ;
+                    state = KW_LINE_VAL ;
+                }
+            } else if ( sc.ch == ',' ) {
+                sc.SetState(SCE_ABAQUS_OPERATOR) ;
+                state = KW_LINE_COMMA ;
+            } else {
+                // anything else is an error
+                sc.SetState(SCE_ABAQUS_PROCESSOR) ;
+                state = ST_ERROR ;
+            }
+            break ;
+        case DAT_LINE_VAL :
+            if ( sc.atLineEnd ) {
+                sc.SetState(SCE_ABAQUS_DEFAULT) ;
+                state = LINE_END ;
+            } else if ( IsASetChar(sc.ch) && (sc.state == SCE_ABAQUS_DEFAULT) ) {
+                // nothing changes
+                state = DAT_LINE_VAL ;
+            } else if (( (IsADigit(sc.ch) || sc.ch == '.' || (sc.ch == 'e' || sc.ch == 'E') ||
+                    ((sc.ch == '+' || sc.ch == '-') && (sc.chPrev == 'e' || sc.chPrev == 'E')))) &&
+                    (sc.state == SCE_ABAQUS_NUMBER)) {
+                // remain in number mode
+                state = DAT_LINE_VAL ;
+            } else if (sc.state == SCE_ABAQUS_STRING) {
+                // accept everything until a closing quote
+                if ( sc.ch == '\'' || sc.ch == '\"' ) {
+                    sc.SetState(SCE_ABAQUS_DEFAULT) ;
+                    state = DAT_LINE_VAL ;
+                }
+            } else if ( sc.ch == ',' ) {
+                sc.SetState(SCE_ABAQUS_OPERATOR) ;
+                state = DAT_LINE_COMMA ;
+            } else {
+                // anything else is an error
+                sc.SetState(SCE_ABAQUS_PROCESSOR) ;
+                state = ST_ERROR ;
+            }
+            break ;
+        case DAT_LINE_COMMA :
+            // a comma on a data line was seen
+            if ( sc.atLineEnd ) {
+                sc.SetState(SCE_ABAQUS_DEFAULT) ;
+                state = LINE_END ;
+            } else if ( sc.ch == ' ' ) {
+                sc.SetState(SCE_ABAQUS_DEFAULT) ;
+                state = DAT_LINE_COMMA ;
+            } else if (sc.ch == ',')  {
+                sc.SetState(SCE_ABAQUS_OPERATOR) ;
+                state = DAT_LINE_COMMA ;
+            } else if ( IsADigit(sc.ch) || (sc.ch == '-')|| (sc.ch == '.' && IsADigit(sc.chNext)) ) {
+                sc.SetState(SCE_ABAQUS_NUMBER) ;
+                state = DAT_LINE_VAL ;
+            } else if ( IsAKeywordChar(sc.ch) ) {
+                sc.SetState(SCE_ABAQUS_DEFAULT) ;
+                state = DAT_LINE_VAL ;
+            } else if ( (sc.ch == '\'') || (sc.ch == '\"') ) {
+                sc.SetState(SCE_ABAQUS_STRING) ;
+                state = DAT_LINE_VAL ;
+            } else {
+                sc.SetState(SCE_ABAQUS_PROCESSOR) ;
+                state = ST_ERROR ;
+            }
+            break ;
+        case COMMENT_LINE :
+            if ( sc.atLineEnd ) {
+                sc.SetState(SCE_ABAQUS_DEFAULT) ;
+                state = LINE_END ;
+            }
+            break ;
+        case ST_ERROR :
+            if ( sc.atLineEnd ) {
+                sc.SetState(SCE_ABAQUS_DEFAULT) ;
+                state = LINE_END ;
+            }
+            break ;
+        case LINE_END :
+            if ( sc.atLineEnd || sc.ch == ' ' ) {
+                // nothing changes
+                state = LINE_END ;
+            } else if ( sc.ch == '*' ) {
+                if ( sc.chNext == '*' ) {
+                    state = COMMENT_LINE ;
+                    sc.SetState(SCE_ABAQUS_COMMENT) ;
+                } else {
+                    state = KW_LINE_KW ;
+                    sc.SetState(SCE_ABAQUS_STARCOMMAND) ;
+                }
+            } else {
+                // it must be a data line, things are as if we are in DAT_LINE_COMMA
+                if ( sc.ch == ',' ) {
+                    sc.SetState(SCE_ABAQUS_OPERATOR) ;
+                    state = DAT_LINE_COMMA ;
+                } else if ( IsADigit(sc.ch) || (sc.ch == '-')|| (sc.ch == '.' && IsADigit(sc.chNext)) ) {
+                    sc.SetState(SCE_ABAQUS_NUMBER) ;
+                    state = DAT_LINE_VAL ;
+                } else if ( IsAKeywordChar(sc.ch) ) {
+                    sc.SetState(SCE_ABAQUS_DEFAULT) ;
+                    state = DAT_LINE_VAL ;
+                } else if ( (sc.ch == '\'') || (sc.ch == '\"') ) {
+                    sc.SetState(SCE_ABAQUS_STRING) ;
+                    state = DAT_LINE_VAL ;
+                } else {
+                    sc.SetState(SCE_ABAQUS_PROCESSOR) ;
+                    state = ST_ERROR ;
+                }
+            }
+            break ;
+		  }
+   }
+   sc.Complete();
+}
+
+//------------------------------------------------------------------------------
+// This copyied and modified from LexBasic.cxx
+//------------------------------------------------------------------------------
+
+/* Bits:
+ * 1  - whitespace
+ * 2  - operator
+ * 4  - identifier
+ * 8  - decimal digit
+ * 16 - hex digit
+ * 32 - bin digit
+ */
+static int character_classification[128] =
+{
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  0,  0,  1,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    1,  2,  0,  2,  2,  2,  2,  2,  2,  2,  6,  2,  2,  2,  10, 6,
+    60, 60, 28, 28, 28, 28, 28, 28, 28, 28, 2,  2,  2,  2,  2,  2,
+    2,  20, 20, 20, 20, 20, 20, 4,  4,  4,  4,  4,  4,  4,  4,  4,
+    4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  2,  2,  2,  2,  4,
+    2,  20, 20, 20, 20, 20, 20, 4,  4,  4,  4,  4,  4,  4,  4,  4,
+    4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  2,  2,  2,  2,  0
+};
+
+static bool IsSpace(int c) {
+	return c < 128 && (character_classification[c] & 1);
+}
+
+static bool IsIdentifier(int c) {
+	return c < 128 && (character_classification[c] & 4);
+}
+
+static int LowerCase(int c)
+{
+	if (c >= 'A' && c <= 'Z')
+		return 'a' + c - 'A';
+	return c;
+}
+
+static int LineEnd(int line, Accessor &styler)
+{
+    const int docLines = styler.GetLine(styler.Length() - 1);  // Available last line
+    int eol_pos ;
+    // if the line is the last line, the eol_pos is styler.Length()
+    // eol will contain a new line, or a virtual new line
+    if ( docLines == line )
+        eol_pos = styler.Length() ;
+    else
+        eol_pos = styler.LineStart(line + 1) - 1;
+    return eol_pos ;
+}
+
+static int LineStart(int line, Accessor &styler)
+{
+    return styler.LineStart(line) ;
+}
+
+// LineType
+//
+// bits determines the line type
+// 1  : data line
+// 2  : only whitespace
+// 3  : data line with only whitespace
+// 4  : keyword line
+// 5  : block open keyword line
+// 6  : block close keyword line
+// 7  : keyword line in error
+// 8  : comment line
+static int LineType(int line, Accessor &styler) {
+    int pos = LineStart(line, styler) ;
+    int eol_pos = LineEnd(line, styler) ;
+
+    int c ;
+    char ch = ' ';
+
+    int i = pos ;
+    while ( i < eol_pos ) {
+        c = styler.SafeGetCharAt(i);
+        ch = static_cast<char>(LowerCase(c));
+        // We can say something as soon as no whitespace
+        // was encountered
+        if ( !IsSpace(c) )
+            break ;
+        i++ ;
+    }
+
+    if ( i >= eol_pos ) {
+        // This is a whitespace line, currently
+        // classifies as data line
+        return 3 ;
+    }
+
+    if ( ch != '*' ) {
+        // This is a data line
+        return 1 ;
+    }
+
+    if ( i == eol_pos - 1 ) {
+        // Only a single *, error but make keyword line
+        return 4+3 ;
+    }
+
+    // This means we can have a second character
+    // if that is also a * this means a comment
+    // otherwise it is a keyword.
+    c = styler.SafeGetCharAt(i+1);
+    ch = static_cast<char>(LowerCase(c));
+    if ( ch == '*' ) {
+        return 8 ;
+    }
+
+    // At this point we know this is a keyword line
+    // the character at position i is a *
+    // it is not a comment line
+    char word[256] ;
+    int  wlen = 0;
+
+    word[wlen] = '*' ;
+	wlen++ ;
+
+    i++ ;
+    while ( (i < eol_pos) && (wlen < 255) ) {
+        c = styler.SafeGetCharAt(i);
+        ch = static_cast<char>(LowerCase(c));
+
+        if ( (!IsSpace(c)) && (!IsIdentifier(c)) )
+            break ;
+
+        if ( IsIdentifier(c) ) {
+            word[wlen] = ch ;
+			wlen++ ;
+		}
+
+        i++ ;
+    }
+
+    word[wlen] = 0 ;
+
+    // Make a comparison
+	if ( !strcmp(word, "*step") ||
+         !strcmp(word, "*part") ||
+         !strcmp(word, "*instance") ||
+         !strcmp(word, "*assembly")) {
+       return 4+1 ;
+    }
+
+	if ( !strcmp(word, "*endstep") ||
+         !strcmp(word, "*endpart") ||
+         !strcmp(word, "*endinstance") ||
+         !strcmp(word, "*endassembly")) {
+       return 4+2 ;
+    }
+
+    return 4 ;
+}
+
+static void SafeSetLevel(int line, int level, Accessor &styler)
+{
+    if ( line < 0 )
+        return ;
+
+    int mask = ((~SC_FOLDLEVELHEADERFLAG) | (~SC_FOLDLEVELWHITEFLAG));
+
+    if ( (level & mask) < 0 )
+        return ;
+
+    if ( styler.LevelAt(line) != level )
+        styler.SetLevel(line, level) ;
+}
+
+static void FoldABAQUSDoc(unsigned int startPos, int length, int,
+WordList *[], Accessor &styler) {
+    int startLine = styler.GetLine(startPos) ;
+    int endLine   = styler.GetLine(startPos+length-1) ;
+
+    // bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+    // We want to deal with all the cases
+    // To know the correct indentlevel, we need to look back to the
+    // previous command line indentation level
+	// order of formatting keyline datalines commentlines
+    int beginData    = -1 ;
+    int beginComment = -1 ;
+    int prvKeyLine   = startLine ;
+    int prvKeyLineTp =  0 ;
+
+    // Scan until we find the previous keyword line
+    // this will give us the level reference that we need
+    while ( prvKeyLine > 0 ) {
+        prvKeyLine-- ;
+        prvKeyLineTp = LineType(prvKeyLine, styler) ;
+        if ( prvKeyLineTp & 4 )
+            break ;
+    }
+
+    // Determine the base line level of all lines following
+    // the previous keyword
+    // new keyword lines are placed on this level
+    //if ( prvKeyLineTp & 4 ) {
+    int level = styler.LevelAt(prvKeyLine) & ~SC_FOLDLEVELHEADERFLAG ;
+    //}
+
+    // uncomment line below if weird behaviour continues
+    prvKeyLine = -1 ;
+
+    // Now start scanning over the lines.
+    for ( int line = startLine; line <= endLine; line++ ) {
+        int lineType = LineType(line, styler) ;
+
+        // Check for comment line
+        if ( lineType == 8 ) {
+            if ( beginComment < 0 ) {
+                beginComment = line ;
+			}
+        }
+
+        // Check for data line
+        if ( (lineType == 1) || (lineType == 3) ) {
+            if ( beginData < 0 ) {
+                if ( beginComment >= 0 ) {
+                    beginData = beginComment ;
+                } else {
+                    beginData = line ;
+                }
+            }
+			beginComment = -1 ;
+		}
+
+        // Check for keywordline.
+        // As soon as a keyword line is encountered, we can set the
+        // levels of everything from the previous keyword line to this one
+        if ( lineType & 4 ) {
+            // this is a keyword, we can now place the previous keyword
+            // all its data lines and the remainder
+
+            // Write comments and data line
+            if ( beginComment < 0 ) {
+                beginComment = line ;
+			}
+
+            if ( beginData < 0 ) {
+                beginData = beginComment ;
+				if ( prvKeyLineTp != 5 )
+					SafeSetLevel(prvKeyLine, level, styler) ;
+				else
+					SafeSetLevel(prvKeyLine, level | SC_FOLDLEVELHEADERFLAG, styler) ;
+            } else {
+                SafeSetLevel(prvKeyLine, level | SC_FOLDLEVELHEADERFLAG, styler) ;
+            }
+
+            int datLevel = level + 1 ;
+			if ( !(prvKeyLineTp & 4) ) {
+				datLevel = level ;
+			}
+
+            for ( int ll = beginData; ll < beginComment; ll++ )
+                SafeSetLevel(ll, datLevel, styler) ;
+
+            // The keyword we just found is going to be written at another level
+            // if we have a type 5 and type 6
+            if ( prvKeyLineTp == 5 ) {
+                level += 1 ;
+			}
+
+            if ( prvKeyLineTp == 6 ) {
+                level -= 1 ;
+				if ( level < 0 ) {
+					level = 0 ;
+				}
+            }
+
+            for ( int lll = beginComment; lll < line; lll++ )
+                SafeSetLevel(lll, level, styler) ;
+
+            // wrap and reset
+            beginComment = -1 ;
+            beginData    = -1 ;
+            prvKeyLine   = line ;
+            prvKeyLineTp = lineType ;
+        }
+
+    }
+
+    if ( beginComment < 0 ) {
+        beginComment = endLine + 1 ;
+    } else {
+        // We need to find out whether this comment block is followed by
+        // a data line or a keyword line
+        const int docLines = styler.GetLine(styler.Length() - 1);
+
+        for ( int line = endLine + 1; line <= docLines; line++ ) {
+            int lineType = LineType(line, styler) ;
+
+            if ( lineType != 8 ) {
+				if ( !(lineType & 4) )  {
+					beginComment = endLine + 1 ;
+				}
+                break ;
+			}
+        }
+    }
+
+    if ( beginData < 0 ) {
+        beginData = beginComment ;
+		if ( prvKeyLineTp != 5 )
+			SafeSetLevel(prvKeyLine, level, styler) ;
+		else
+			SafeSetLevel(prvKeyLine, level | SC_FOLDLEVELHEADERFLAG, styler) ;
+    } else {
+        SafeSetLevel(prvKeyLine, level | SC_FOLDLEVELHEADERFLAG, styler) ;
+    }
+
+    int datLevel = level + 1 ;
+	if ( !(prvKeyLineTp & 4) ) {
+		datLevel = level ;
+	}
+
+    for ( int ll = beginData; ll < beginComment; ll++ )
+        SafeSetLevel(ll, datLevel, styler) ;
+
+	if ( prvKeyLineTp == 5 ) {
+		level += 1 ;
+	}
+
+	if ( prvKeyLineTp == 6 ) {
+		level -= 1 ;
+	}
+	for ( int m = beginComment; m <= endLine; m++ )
+        SafeSetLevel(m, level, styler) ;
+}
+
+static const char * const abaqusWordListDesc[] = {
+    "processors",
+    "commands",
+    "slashommands",
+    "starcommands",
+    "arguments",
+    "functions",
+    0
+};
+
+LexerModule lmAbaqus(SCLEX_ABAQUS, ColouriseABAQUSDoc, "abaqus", FoldABAQUSDoc, abaqusWordListDesc);
diff --git a/Documents/Scintilla/LexAda.cxx b/Documents/Scintilla/LexAda.cxx
new file mode 100644
index 0000000..f6c9e7e
--- /dev/null
+++ b/Documents/Scintilla/LexAda.cxx
@@ -0,0 +1,524 @@
+// Scintilla source code edit control
+/** @file LexAda.cxx
+ ** Lexer for Ada 95
+ **/
+// Copyright 2002 by Sergey Koshcheyev <sergey.k@seznam.cz>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdlib.h>
+#include <ctype.h>
+#include <string.h>
+#include <stdio.h>
+
+#include "Platform.h"
+
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "PropSet.h"
+#include "KeyWords.h"
+#include "SciLexer.h"
+#include "SString.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+/*
+ * Interface
+ */
+
+static void ColouriseDocument(
+    unsigned int startPos,
+    int length,
+    int initStyle,
+    WordList *keywordlists[],
+    Accessor &styler);
+
+static const char * const adaWordListDesc[] = {
+	"Keywords",
+	0
+};
+
+LexerModule lmAda(SCLEX_ADA, ColouriseDocument, "ada", NULL, adaWordListDesc);
+
+/*
+ * Implementation
+ */
+
+// Functions that have apostropheStartsAttribute as a parameter set it according to whether
+// an apostrophe encountered after processing the current token will start an attribute or
+// a character literal.
+static void ColouriseCharacter(StyleContext& sc, bool& apostropheStartsAttribute);
+static void ColouriseComment(StyleContext& sc, bool& apostropheStartsAttribute);
+static void ColouriseContext(StyleContext& sc, char chEnd, int stateEOL);
+static void ColouriseDelimiter(StyleContext& sc, bool& apostropheStartsAttribute);
+static void ColouriseLabel(StyleContext& sc, WordList& keywords, bool& apostropheStartsAttribute);
+static void ColouriseNumber(StyleContext& sc, bool& apostropheStartsAttribute);
+static void ColouriseString(StyleContext& sc, bool& apostropheStartsAttribute);
+static void ColouriseWhiteSpace(StyleContext& sc, bool& apostropheStartsAttribute);
+static void ColouriseWord(StyleContext& sc, WordList& keywords, bool& apostropheStartsAttribute);
+
+static inline bool IsDelimiterCharacter(int ch);
+static inline bool IsNumberStartCharacter(int ch);
+static inline bool IsNumberCharacter(int ch);
+static inline bool IsSeparatorOrDelimiterCharacter(int ch);
+static bool IsValidIdentifier(const SString& identifier);
+static bool IsValidNumber(const SString& number);
+static inline bool IsWordStartCharacter(int ch);
+static inline bool IsWordCharacter(int ch);
+
+static void ColouriseCharacter(StyleContext& sc, bool& apostropheStartsAttribute) {
+	apostropheStartsAttribute = true;
+
+	sc.SetState(SCE_ADA_CHARACTER);
+
+	// Skip the apostrophe and one more character (so that '' is shown as non-terminated and '''
+	// is handled correctly)
+	sc.Forward();
+	sc.Forward();
+
+	ColouriseContext(sc, '\'', SCE_ADA_CHARACTEREOL);
+}
+
+static void ColouriseContext(StyleContext& sc, char chEnd, int stateEOL) {
+	while (!sc.atLineEnd && !sc.Match(chEnd)) {
+		sc.Forward();
+	}
+
+	if (!sc.atLineEnd) {
+		sc.ForwardSetState(SCE_ADA_DEFAULT);
+	} else {
+		sc.ChangeState(stateEOL);
+	}
+}
+
+static void ColouriseComment(StyleContext& sc, bool& /*apostropheStartsAttribute*/) {
+	// Apostrophe meaning is not changed, but the parameter is present for uniformity
+
+	sc.SetState(SCE_ADA_COMMENTLINE);
+
+	while (!sc.atLineEnd) {
+		sc.Forward();
+	}
+}
+
+static void ColouriseDelimiter(StyleContext& sc, bool& apostropheStartsAttribute) {
+	apostropheStartsAttribute = sc.Match (')');
+	sc.SetState(SCE_ADA_DELIMITER);
+	sc.ForwardSetState(SCE_ADA_DEFAULT);
+}
+
+static void ColouriseLabel(StyleContext& sc, WordList& keywords, bool& apostropheStartsAttribute) {
+	apostropheStartsAttribute = false;
+
+	sc.SetState(SCE_ADA_LABEL);
+
+	// Skip "<<"
+	sc.Forward();
+	sc.Forward();
+
+	SString identifier;
+
+	while (!sc.atLineEnd && !IsSeparatorOrDelimiterCharacter(sc.ch)) {
+		identifier += static_cast<char>(tolower(sc.ch));
+		sc.Forward();
+	}
+
+	// Skip ">>"
+	if (sc.Match('>', '>')) {
+		sc.Forward();
+		sc.Forward();
+	} else {
+		sc.ChangeState(SCE_ADA_ILLEGAL);
+	}
+
+	// If the name is an invalid identifier or a keyword, then make it invalid label
+	if (!IsValidIdentifier(identifier) || keywords.InList(identifier.c_str())) {
+		sc.ChangeState(SCE_ADA_ILLEGAL);
+	}
+
+	sc.SetState(SCE_ADA_DEFAULT);
+
+}
+
+static void ColouriseNumber(StyleContext& sc, bool& apostropheStartsAttribute) {
+	apostropheStartsAttribute = true;
+
+	SString number;
+	sc.SetState(SCE_ADA_NUMBER);
+
+	// Get all characters up to a delimiter or a separator, including points, but excluding
+	// double points (ranges).
+	while (!IsSeparatorOrDelimiterCharacter(sc.ch) || (sc.ch == '.' && sc.chNext != '.')) {
+		number += static_cast<char>(sc.ch);
+		sc.Forward();
+	}
+
+	// Special case: exponent with sign
+	if ((sc.chPrev == 'e' || sc.chPrev == 'E') &&
+	        (sc.ch == '+' || sc.ch == '-')) {
+		number += static_cast<char>(sc.ch);
+		sc.Forward ();
+
+		while (!IsSeparatorOrDelimiterCharacter(sc.ch)) {
+			number += static_cast<char>(sc.ch);
+			sc.Forward();
+		}
+	}
+
+	if (!IsValidNumber(number)) {
+		sc.ChangeState(SCE_ADA_ILLEGAL);
+	}
+
+	sc.SetState(SCE_ADA_DEFAULT);
+}
+
+static void ColouriseString(StyleContext& sc, bool& apostropheStartsAttribute) {
+	apostropheStartsAttribute = true;
+
+	sc.SetState(SCE_ADA_STRING);
+	sc.Forward();
+
+	ColouriseContext(sc, '"', SCE_ADA_STRINGEOL);
+}
+
+static void ColouriseWhiteSpace(StyleContext& sc, bool& /*apostropheStartsAttribute*/) {
+	// Apostrophe meaning is not changed, but the parameter is present for uniformity
+	sc.SetState(SCE_ADA_DEFAULT);
+	sc.ForwardSetState(SCE_ADA_DEFAULT);
+}
+
+static void ColouriseWord(StyleContext& sc, WordList& keywords, bool& apostropheStartsAttribute) {
+	apostropheStartsAttribute = true;
+	sc.SetState(SCE_ADA_IDENTIFIER);
+
+	SString word;
+
+	while (!sc.atLineEnd && !IsSeparatorOrDelimiterCharacter(sc.ch)) {
+		word += static_cast<char>(tolower(sc.ch));
+		sc.Forward();
+	}
+
+	if (!IsValidIdentifier(word)) {
+		sc.ChangeState(SCE_ADA_ILLEGAL);
+
+	} else if (keywords.InList(word.c_str())) {
+		sc.ChangeState(SCE_ADA_WORD);
+
+		if (word != "all") {
+			apostropheStartsAttribute = false;
+		}
+	}
+
+	sc.SetState(SCE_ADA_DEFAULT);
+}
+
+//
+// ColouriseDocument
+//
+
+static void ColouriseDocument(
+    unsigned int startPos,
+    int length,
+    int initStyle,
+    WordList *keywordlists[],
+    Accessor &styler) {
+	WordList &keywords = *keywordlists[0];
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	int lineCurrent = styler.GetLine(startPos);
+	bool apostropheStartsAttribute = (styler.GetLineState(lineCurrent) & 1) != 0;
+
+	while (sc.More()) {
+		if (sc.atLineEnd) {
+			// Go to the next line
+			sc.Forward();
+			lineCurrent++;
+
+			// Remember the line state for future incremental lexing
+			styler.SetLineState(lineCurrent, apostropheStartsAttribute);
+
+			// Don't continue any styles on the next line
+			sc.SetState(SCE_ADA_DEFAULT);
+		}
+
+		// Comments
+		if (sc.Match('-', '-')) {
+			ColouriseComment(sc, apostropheStartsAttribute);
+
+		// Strings
+		} else if (sc.Match('"')) {
+			ColouriseString(sc, apostropheStartsAttribute);
+
+		// Characters
+		} else if (sc.Match('\'') && !apostropheStartsAttribute) {
+			ColouriseCharacter(sc, apostropheStartsAttribute);
+
+		// Labels
+		} else if (sc.Match('<', '<')) {
+			ColouriseLabel(sc, keywords, apostropheStartsAttribute);
+
+		// Whitespace
+		} else if (IsASpace(sc.ch)) {
+			ColouriseWhiteSpace(sc, apostropheStartsAttribute);
+
+		// Delimiters
+		} else if (IsDelimiterCharacter(sc.ch)) {
+			ColouriseDelimiter(sc, apostropheStartsAttribute);
+
+		// Numbers
+		} else if (IsADigit(sc.ch) || sc.ch == '#') {
+			ColouriseNumber(sc, apostropheStartsAttribute);
+
+		// Keywords or identifiers
+		} else {
+			ColouriseWord(sc, keywords, apostropheStartsAttribute);
+		}
+	}
+
+	sc.Complete();
+}
+
+static inline bool IsDelimiterCharacter(int ch) {
+	switch (ch) {
+	case '&':
+	case '\'':
+	case '(':
+	case ')':
+	case '*':
+	case '+':
+	case ',':
+	case '-':
+	case '.':
+	case '/':
+	case ':':
+	case ';':
+	case '<':
+	case '=':
+	case '>':
+	case '|':
+		return true;
+	default:
+		return false;
+	}
+}
+
+static inline bool IsNumberCharacter(int ch) {
+	return IsNumberStartCharacter(ch) ||
+	       ch == '_' ||
+	       ch == '.' ||
+	       ch == '#' ||
+	       (ch >= 'a' && ch <= 'f') ||
+	       (ch >= 'A' && ch <= 'F');
+}
+
+static inline bool IsNumberStartCharacter(int ch) {
+	return IsADigit(ch);
+}
+
+static inline bool IsSeparatorOrDelimiterCharacter(int ch) {
+	return IsASpace(ch) || IsDelimiterCharacter(ch);
+}
+
+static bool IsValidIdentifier(const SString& identifier) {
+	// First character can't be '_', so initialize the flag to true
+	bool lastWasUnderscore = true;
+
+	size_t length = identifier.length();
+
+	// Zero-length identifiers are not valid (these can occur inside labels)
+	if (length == 0) {
+		return false;
+	}
+
+	// Check for valid character at the start
+	if (!IsWordStartCharacter(identifier[0])) {
+		return false;
+	}
+
+	// Check for only valid characters and no double underscores
+	for (size_t i = 0; i < length; i++) {
+		if (!IsWordCharacter(identifier[i]) ||
+		        (identifier[i] == '_' && lastWasUnderscore)) {
+			return false;
+		}
+		lastWasUnderscore = identifier[i] == '_';
+	}
+
+	// Check for underscore at the end
+	if (lastWasUnderscore == true) {
+		return false;
+	}
+
+	// All checks passed
+	return true;
+}
+
+static bool IsValidNumber(const SString& number) {
+	int hashPos = number.search("#");
+	bool seenDot = false;
+
+	size_t i = 0;
+	size_t length = number.length();
+
+	if (length == 0)
+		return false; // Just in case
+
+	// Decimal number
+	if (hashPos == -1) {
+		bool canBeSpecial = false;
+
+		for (; i < length; i++) {
+			if (number[i] == '_') {
+				if (!canBeSpecial) {
+					return false;
+				}
+				canBeSpecial = false;
+			} else if (number[i] == '.') {
+				if (!canBeSpecial || seenDot) {
+					return false;
+				}
+				canBeSpecial = false;
+				seenDot = true;
+			} else if (IsADigit(number[i])) {
+				canBeSpecial = true;
+			} else {
+				break;
+			}
+		}
+
+		if (!canBeSpecial)
+			return false;
+	} else {
+		// Based number
+		bool canBeSpecial = false;
+		int base = 0;
+
+		// Parse base
+		for (; i < length; i++) {
+			int ch = number[i];
+			if (ch == '_') {
+				if (!canBeSpecial)
+					return false;
+				canBeSpecial = false;
+			} else if (IsADigit(ch)) {
+				base = base * 10 + (ch - '0');
+				if (base > 16)
+					return false;
+				canBeSpecial = true;
+			} else if (ch == '#' && canBeSpecial) {
+				break;
+			} else {
+				return false;
+			}
+		}
+
+		if (base < 2)
+			return false;
+		if (i == length)
+			return false;
+
+		i++; // Skip over '#'
+
+		// Parse number
+		canBeSpecial = false;
+
+		for (; i < length; i++) {
+			int ch = tolower(number[i]);
+
+			if (ch == '_') {
+				if (!canBeSpecial) {
+					return false;
+				}
+				canBeSpecial = false;
+
+			} else if (ch == '.') {
+				if (!canBeSpecial || seenDot) {
+					return false;
+				}
+				canBeSpecial = false;
+				seenDot = true;
+
+			} else if (IsADigit(ch)) {
+				if (ch - '0' >= base) {
+					return false;
+				}
+				canBeSpecial = true;
+
+			} else if (ch >= 'a' && ch <= 'f') {
+				if (ch - 'a' + 10 >= base) {
+					return false;
+				}
+				canBeSpecial = true;
+
+			} else if (ch == '#' && canBeSpecial) {
+				break;
+
+			} else {
+				return false;
+			}
+		}
+
+		if (i == length) {
+			return false;
+		}
+
+		i++;
+	}
+
+	// Exponent (optional)
+	if (i < length) {
+		if (number[i] != 'e' && number[i] != 'E')
+			return false;
+
+		i++; // Move past 'E'
+
+		if (i == length) {
+			return false;
+		}
+
+		if (number[i] == '+')
+			i++;
+		else if (number[i] == '-') {
+			if (seenDot) {
+				i++;
+			} else {
+				return false; // Integer literals should not have negative exponents
+			}
+		}
+
+		if (i == length) {
+			return false;
+		}
+
+		bool canBeSpecial = false;
+
+		for (; i < length; i++) {
+			if (number[i] == '_') {
+				if (!canBeSpecial) {
+					return false;
+				}
+				canBeSpecial = false;
+			} else if (IsADigit(number[i])) {
+				canBeSpecial = true;
+			} else {
+				return false;
+			}
+		}
+
+		if (!canBeSpecial)
+			return false;
+	}
+
+	// if i == length, number was parsed successfully.
+	return i == length;
+}
+
+static inline bool IsWordCharacter(int ch) {
+	return IsWordStartCharacter(ch) || IsADigit(ch);
+}
+
+static inline bool IsWordStartCharacter(int ch) {
+	return (isascii(ch) && isalpha(ch)) || ch == '_';
+}
diff --git a/Documents/Scintilla/LexAsm.cxx b/Documents/Scintilla/LexAsm.cxx
new file mode 100644
index 0000000..17c9384
--- /dev/null
+++ b/Documents/Scintilla/LexAsm.cxx
@@ -0,0 +1,180 @@
+// Scintilla source code edit control
+/** @file LexAsm.cxx
+ ** Lexer for Assembler, just for the MASM syntax
+ ** Written by The Black Horus
+ ** Enhancements and NASM stuff by Kein-Hong Man, 2003-10
+ ** SCE_ASM_COMMENTBLOCK and SCE_ASM_CHARACTER are for future GNU as colouring
+ **/
+// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+static inline bool IsAWordChar(const int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '.' ||
+		ch == '_' || ch == '?');
+}
+
+static inline bool IsAWordStart(const int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '_' || ch == '.' ||
+		ch == '%' || ch == '@' || ch == '$' || ch == '?');
+}
+
+static inline bool IsAsmOperator(const int ch) {
+	if ((ch < 0x80) && (isalnum(ch)))
+		return false;
+	// '.' left out as it is used to make up numbers
+	if (ch == '*' || ch == '/' || ch == '-' || ch == '+' ||
+		ch == '(' || ch == ')' || ch == '=' || ch == '^' ||
+		ch == '[' || ch == ']' || ch == '<' || ch == '&' ||
+		ch == '>' || ch == ',' || ch == '|' || ch == '~' ||
+		ch == '%' || ch == ':')
+		return true;
+	return false;
+}
+
+static void ColouriseAsmDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
+                            Accessor &styler) {
+
+	WordList &cpuInstruction = *keywordlists[0];
+	WordList &mathInstruction = *keywordlists[1];
+	WordList &registers = *keywordlists[2];
+	WordList &directive = *keywordlists[3];
+	WordList &directiveOperand = *keywordlists[4];
+	WordList &extInstruction = *keywordlists[5];
+
+	// Do not leak onto next line
+	if (initStyle == SCE_ASM_STRINGEOL)
+		initStyle = SCE_ASM_DEFAULT;
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	for (; sc.More(); sc.Forward())
+	{
+
+		// Prevent SCE_ASM_STRINGEOL from leaking back to previous line
+		if (sc.atLineStart && (sc.state == SCE_ASM_STRING)) {
+			sc.SetState(SCE_ASM_STRING);
+		} else if (sc.atLineStart && (sc.state == SCE_ASM_CHARACTER)) {
+			sc.SetState(SCE_ASM_CHARACTER);
+		}
+
+		// Handle line continuation generically.
+		if (sc.ch == '\\') {
+			if (sc.chNext == '\n' || sc.chNext == '\r') {
+				sc.Forward();
+				if (sc.ch == '\r' && sc.chNext == '\n') {
+					sc.Forward();
+				}
+				continue;
+			}
+		}
+
+		// Determine if the current state should terminate.
+		if (sc.state == SCE_ASM_OPERATOR) {
+			if (!IsAsmOperator(sc.ch)) {
+			    sc.SetState(SCE_ASM_DEFAULT);
+			}
+		}else if (sc.state == SCE_ASM_NUMBER) {
+			if (!IsAWordChar(sc.ch)) {
+				sc.SetState(SCE_ASM_DEFAULT);
+			}
+		} else if (sc.state == SCE_ASM_IDENTIFIER) {
+			if (!IsAWordChar(sc.ch) ) {
+				char s[100];
+				sc.GetCurrentLowered(s, sizeof(s));
+
+				if (cpuInstruction.InList(s)) {
+					sc.ChangeState(SCE_ASM_CPUINSTRUCTION);
+				} else if (mathInstruction.InList(s)) {
+					sc.ChangeState(SCE_ASM_MATHINSTRUCTION);
+				} else if (registers.InList(s)) {
+					sc.ChangeState(SCE_ASM_REGISTER);
+				}  else if (directive.InList(s)) {
+					sc.ChangeState(SCE_ASM_DIRECTIVE);
+				} else if (directiveOperand.InList(s)) {
+					sc.ChangeState(SCE_ASM_DIRECTIVEOPERAND);
+				} else if (extInstruction.InList(s)) {
+					sc.ChangeState(SCE_ASM_EXTINSTRUCTION);
+				}
+				sc.SetState(SCE_ASM_DEFAULT);
+			}
+		}
+		else if (sc.state == SCE_ASM_COMMENT ) {
+			if (sc.atLineEnd) {
+				sc.SetState(SCE_ASM_DEFAULT);
+			}
+		} else if (sc.state == SCE_ASM_STRING) {
+			if (sc.ch == '\\') {
+				if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
+					sc.Forward();
+				}
+			} else if (sc.ch == '\"') {
+				sc.ForwardSetState(SCE_ASM_DEFAULT);
+			} else if (sc.atLineEnd) {
+				sc.ChangeState(SCE_ASM_STRINGEOL);
+				sc.ForwardSetState(SCE_ASM_DEFAULT);
+			}
+		} else if (sc.state == SCE_ASM_CHARACTER) {
+			if (sc.ch == '\\') {
+				if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
+					sc.Forward();
+				}
+			} else if (sc.ch == '\'') {
+				sc.ForwardSetState(SCE_ASM_DEFAULT);
+			} else if (sc.atLineEnd) {
+				sc.ChangeState(SCE_ASM_STRINGEOL);
+				sc.ForwardSetState(SCE_ASM_DEFAULT);
+			}
+		}
+
+		// Determine if a new state should be entered.
+		if (sc.state == SCE_ASM_DEFAULT) {
+			if (sc.ch == ';'){
+				sc.SetState(SCE_ASM_COMMENT);
+			} else if (isascii(sc.ch) && (isdigit(sc.ch) || (sc.ch == '.' && isascii(sc.chNext) && isdigit(sc.chNext)))) {
+				sc.SetState(SCE_ASM_NUMBER);
+			} else if (IsAWordStart(sc.ch)) {
+				sc.SetState(SCE_ASM_IDENTIFIER);
+			} else if (sc.ch == '\"') {
+				sc.SetState(SCE_ASM_STRING);
+			} else if (sc.ch == '\'') {
+				sc.SetState(SCE_ASM_CHARACTER);
+			} else if (IsAsmOperator(sc.ch)) {
+				sc.SetState(SCE_ASM_OPERATOR);
+			}
+		}
+
+	}
+	sc.Complete();
+}
+
+static const char * const asmWordListDesc[] = {
+	"CPU instructions",
+	"FPU instructions",
+	"Registers",
+	"Directives",
+	"Directive operands",
+	"Extended instructions",
+	0
+};
+
+LexerModule lmAsm(SCLEX_ASM, ColouriseAsmDoc, "asm", 0, asmWordListDesc);
+
diff --git a/Documents/Scintilla/LexAsn1.cxx b/Documents/Scintilla/LexAsn1.cxx
new file mode 100644
index 0000000..36f1d5d
--- /dev/null
+++ b/Documents/Scintilla/LexAsn1.cxx
@@ -0,0 +1,185 @@
+// Scintilla source code edit control
+/** @file LexAsn1.cxx
+ ** Lexer for ASN.1
+ **/
+// Copyright 2004 by Herr Pfarrer rpfarrer <at> yahoo <dot> de
+// Last Updated: 20/07/2004
+// The License.txt file describes the conditions under which this software may be distributed.
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+// Some char test functions
+static bool isAsn1Number(int ch)
+{
+	return (ch >= '0' && ch <= '9');
+}
+
+static bool isAsn1Letter(int ch)
+{
+	return (ch >= 'A' && ch <= 'Z') || (ch >= 'a' && ch <= 'z');
+}
+
+static bool isAsn1Char(int ch)
+{
+	return (ch == '-' ) || isAsn1Number(ch) || isAsn1Letter (ch);
+}
+
+//
+//	Function determining the color of a given code portion
+//	Based on a "state"
+//
+static void ColouriseAsn1Doc(unsigned int startPos, int length, int initStyle, WordList *keywordLists[], Accessor &styler)
+{
+	// The keywords
+	WordList &Keywords = *keywordLists[0];
+	WordList &Attributes = *keywordLists[1];
+	WordList &Descriptors = *keywordLists[2];
+	WordList &Types = *keywordLists[3];
+
+	// Parse the whole buffer character by character using StyleContext
+	StyleContext sc(startPos, length, initStyle, styler);
+	for (; sc.More(); sc.Forward())
+	{
+		// The state engine
+		switch (sc.state)
+		{
+		case SCE_ASN1_DEFAULT:		// Plain characters
+asn1_default:
+			if (sc.ch == '-' && sc.chNext == '-')
+				// A comment begins here
+				sc.SetState(SCE_ASN1_COMMENT);
+			else if (sc.ch == '"')
+				// A string begins here
+				sc.SetState(SCE_ASN1_STRING);
+			else if (isAsn1Number (sc.ch))
+				// A number starts here (identifier should start with a letter in ASN.1)
+				sc.SetState(SCE_ASN1_SCALAR);
+			else if (isAsn1Char (sc.ch))
+				// An identifier starts here (identifier always start with a letter)
+				sc.SetState(SCE_ASN1_IDENTIFIER);
+			else if (sc.ch == ':')
+				// A ::= operator starts here
+				sc.SetState(SCE_ASN1_OPERATOR);
+			break;
+		case SCE_ASN1_COMMENT:		// A comment
+			if (sc.ch == '\r' || sc.ch == '\n')
+				// A comment ends here
+				sc.SetState(SCE_ASN1_DEFAULT);
+			break;
+		case SCE_ASN1_IDENTIFIER:	// An identifier (keyword, attribute, descriptor or type)
+			if (!isAsn1Char (sc.ch))
+			{
+				// The end of identifier is here: we can look for it in lists by now and change its state
+				char s[100];
+				sc.GetCurrent(s, sizeof(s));
+				if (Keywords.InList(s))
+					// It's a keyword, change its state
+					sc.ChangeState(SCE_ASN1_KEYWORD);
+				else if (Attributes.InList(s))
+					// It's an attribute, change its state
+					sc.ChangeState(SCE_ASN1_ATTRIBUTE);
+				else if (Descriptors.InList(s))
+					// It's a descriptor, change its state
+					sc.ChangeState(SCE_ASN1_DESCRIPTOR);
+				else if (Types.InList(s))
+					// It's a type, change its state
+					sc.ChangeState(SCE_ASN1_TYPE);
+
+				// Set to default now
+				sc.SetState(SCE_ASN1_DEFAULT);
+			}
+			break;
+		case SCE_ASN1_STRING:		// A string delimited by ""
+			if (sc.ch == '"')
+			{
+				// A string ends here
+				sc.ForwardSetState(SCE_ASN1_DEFAULT);
+
+				// To correctly manage a char sticking to the string quote
+				goto asn1_default;
+			}
+			break;
+		case SCE_ASN1_SCALAR:		// A plain number
+			if (!isAsn1Number (sc.ch))
+				// A number ends here
+				sc.SetState(SCE_ASN1_DEFAULT);
+			break;
+		case SCE_ASN1_OPERATOR:		// The affectation operator ::= and wath follows (eg: ::= { org 6 } OID or ::= 12 trap)
+			if (sc.ch == '{')
+			{
+				// An OID definition starts here: enter the sub loop
+				for (; sc.More(); sc.Forward())
+				{
+					if (isAsn1Number (sc.ch) && (!isAsn1Char (sc.chPrev) || isAsn1Number (sc.chPrev)))
+						// The OID number is highlighted
+						sc.SetState(SCE_ASN1_OID);
+					else if (isAsn1Char (sc.ch))
+						// The OID parent identifier is plain
+						sc.SetState(SCE_ASN1_IDENTIFIER);
+					else
+						sc.SetState(SCE_ASN1_DEFAULT);
+
+					if (sc.ch == '}')
+						// Here ends the OID and the operator sub loop: go back to main loop
+						break;
+				}
+			}
+			else if (isAsn1Number (sc.ch))
+			{
+				// A trap number definition starts here: enter the sub loop
+				for (; sc.More(); sc.Forward())
+				{
+					if (isAsn1Number (sc.ch))
+						// The trap number is highlighted
+						sc.SetState(SCE_ASN1_OID);
+					else
+					{
+						// The number ends here: go back to main loop
+						sc.SetState(SCE_ASN1_DEFAULT);
+						break;
+					}
+				}
+			}
+			else if (sc.ch != ':' && sc.ch != '=' && sc.ch != ' ')
+				// The operator doesn't imply an OID definition nor a trap, back to main loop
+				goto asn1_default; // To be sure to handle actually the state change
+			break;
+		}
+	}
+	sc.Complete();
+}
+
+static void FoldAsn1Doc(unsigned int, int, int, WordList *[], Accessor &styler)
+{
+	// No folding enabled, no reason to continue...
+	if( styler.GetPropertyInt("fold") == 0 )
+		return;
+
+	// No folding implemented: doesn't make sense for ASN.1
+}
+
+static const char * const asn1WordLists[] = {
+	"Keywords",
+	"Attributes",
+	"Descriptors",
+	"Types",
+	0, };
+
+
+LexerModule lmAns1(SCLEX_ASN1, ColouriseAsn1Doc, "asn1", FoldAsn1Doc, asn1WordLists);
diff --git a/Documents/Scintilla/LexBaan.cxx b/Documents/Scintilla/LexBaan.cxx
new file mode 100644
index 0000000..a6847db
--- /dev/null
+++ b/Documents/Scintilla/LexBaan.cxx
@@ -0,0 +1,193 @@
+// Scintilla source code edit control
+/** @file LexBaan.cxx
+ ** Lexer for Baan.
+ ** Based heavily on LexCPP.cxx
+ **/
+// Copyright 2001- by Vamsi Potluru <vamsi@who.net> & Praveen Ambekar <ambekarpraveen@yahoo.com>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+static inline bool IsAWordChar(const int  ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '.' || ch == '_' || ch == '$' || ch == ':');
+}
+
+static inline bool IsAWordStart(const int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '_');
+}
+
+static void ColouriseBaanDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
+                            Accessor &styler) {
+
+	WordList &keywords = *keywordlists[0];
+	WordList &keywords2 = *keywordlists[1];
+	bool stylingWithinPreprocessor = styler.GetPropertyInt("styling.within.preprocessor") != 0;
+
+	if (initStyle == SCE_BAAN_STRINGEOL)	// Does not leak onto next line
+		initStyle = SCE_BAAN_DEFAULT;
+
+	int visibleChars = 0;
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	for (; sc.More(); sc.Forward()) {
+
+		if (sc.state == SCE_BAAN_OPERATOR) {
+			sc.SetState(SCE_BAAN_DEFAULT);
+		} else if (sc.state == SCE_BAAN_NUMBER) {
+			if (!IsAWordChar(sc.ch)) {
+				sc.SetState(SCE_BAAN_DEFAULT);
+			}
+		} else if (sc.state == SCE_BAAN_IDENTIFIER) {
+			if (!IsAWordChar(sc.ch)) {
+				char s[100];
+				sc.GetCurrentLowered(s, sizeof(s));
+				if (keywords.InList(s)) {
+					sc.ChangeState(SCE_BAAN_WORD);
+				} else if (keywords2.InList(s)) {
+					sc.ChangeState(SCE_BAAN_WORD2);
+				}
+				sc.SetState(SCE_BAAN_DEFAULT);
+			}
+		} else if (sc.state == SCE_BAAN_PREPROCESSOR) {
+			if (stylingWithinPreprocessor) {
+				if (IsASpace(sc.ch)) {
+					sc.SetState(SCE_BAAN_DEFAULT);
+				}
+			} else {
+				if (sc.atLineEnd && (sc.chNext != '^')) {
+					sc.SetState(SCE_BAAN_DEFAULT);
+				}
+			}
+		} else if (sc.state == SCE_BAAN_COMMENT) {
+			if (sc.atLineEnd) {
+				sc.SetState(SCE_BAAN_DEFAULT);
+			}
+		} else if (sc.state == SCE_BAAN_COMMENTDOC) {
+			if (sc.MatchIgnoreCase("enddllusage")) {
+				for (unsigned int i = 0; i < 10; i++){
+					sc.Forward();
+				}
+				sc.ForwardSetState(SCE_BAAN_DEFAULT);
+			}
+		} else if (sc.state == SCE_BAAN_STRING) {
+			if (sc.ch == '\"') {
+				sc.ForwardSetState(SCE_BAAN_DEFAULT);
+			} else if ((sc.atLineEnd) && (sc.chNext != '^')) {
+				sc.ChangeState(SCE_BAAN_STRINGEOL);
+				sc.ForwardSetState(SCE_C_DEFAULT);
+				visibleChars = 0;
+			}
+		}
+
+		if (sc.state == SCE_BAAN_DEFAULT) {
+			if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
+				sc.SetState(SCE_BAAN_NUMBER);
+			} else if (sc.MatchIgnoreCase("dllusage")){
+					sc.SetState(SCE_BAAN_COMMENTDOC);
+					do {
+						sc.Forward();
+					} while ((!sc.atLineEnd) && sc.More());
+			} else if (IsAWordStart(sc.ch)) {
+					sc.SetState(SCE_BAAN_IDENTIFIER);
+			} else if (sc.Match('|')){
+					sc.SetState(SCE_BAAN_COMMENT);
+			} else if (sc.ch == '\"') {
+				sc.SetState(SCE_BAAN_STRING);
+			} else if (sc.ch == '#' && visibleChars == 0) {
+				// Preprocessor commands are alone on their line
+				sc.SetState(SCE_BAAN_PREPROCESSOR);
+				// Skip whitespace between # and preprocessor word
+				do {
+					sc.Forward();
+				} while (IsASpace(sc.ch) && sc.More());
+			} else if (isoperator(static_cast<char>(sc.ch))) {
+				sc.SetState(SCE_BAAN_OPERATOR);
+			}
+		}
+		if (sc.atLineEnd) {
+			// Reset states to begining of colourise so no surprises
+			// if different sets of lines lexed.
+			visibleChars = 0;
+		}
+		if (!IsASpace(sc.ch)) {
+			visibleChars++;
+		}
+	}
+	sc.Complete();
+}
+
+static void FoldBaanDoc(unsigned int startPos, int length, int initStyle, WordList *[],
+                            Accessor &styler) {
+	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
+	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	unsigned int endPos = startPos + length;
+	int visibleChars = 0;
+	int lineCurrent = styler.GetLine(startPos);
+	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
+	int levelCurrent = levelPrev;
+	char chNext = styler[startPos];
+	int styleNext = styler.StyleAt(startPos);
+	int style = initStyle;
+	for (unsigned int i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int stylePrev = style;
+		style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+		if (foldComment &&
+			(style == SCE_BAAN_COMMENT || style == SCE_BAAN_COMMENTDOC)) {
+			if (style != stylePrev) {
+				levelCurrent++;
+			} else if ((style != styleNext) && !atEOL) {
+				// Comments don't end at end of line and the next character may be unstyled.
+				levelCurrent--;
+			}
+		}
+		if (style == SCE_BAAN_OPERATOR) {
+			if (ch == '{') {
+				levelCurrent++;
+			} else if (ch == '}') {
+				levelCurrent--;
+			}
+		}
+		if (atEOL) {
+			int lev = levelPrev;
+			if (visibleChars == 0 && foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if ((levelCurrent > levelPrev) && (visibleChars > 0))
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelPrev = levelCurrent;
+			visibleChars = 0;
+		}
+		if (!isspacechar(ch))
+			visibleChars++;
+	}
+	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
+	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
+}
+
+LexerModule lmBaan(SCLEX_BAAN, ColouriseBaanDoc, "baan", FoldBaanDoc);
diff --git a/Documents/Scintilla/LexBash.cxx b/Documents/Scintilla/LexBash.cxx
new file mode 100644
index 0000000..7b475a7
--- /dev/null
+++ b/Documents/Scintilla/LexBash.cxx
@@ -0,0 +1,532 @@
+// Scintilla source code edit control
+/** @file LexBash.cxx
+ ** Lexer for Bash.
+ **/
+// Copyright 2004-2008 by Neil Hodgson <neilh@scintilla.org>
+// Adapted from LexPerl by Kein-Hong Man 2004
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+#include "CharacterSet.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+#define HERE_DELIM_MAX 256
+
+// define this if you want 'invalid octals' to be marked as errors
+// usually, this is not a good idea, permissive lexing is better
+#undef PEDANTIC_OCTAL
+
+#define BASH_BASE_ERROR		65
+#define BASH_BASE_DECIMAL	66
+#define BASH_BASE_HEX		67
+#ifdef PEDANTIC_OCTAL
+#define BASH_BASE_OCTAL		68
+#define BASH_BASE_OCTAL_ERROR	69
+#endif
+
+static inline int translateBashDigit(int ch) {
+	if (ch >= '0' && ch <= '9') {
+		return ch - '0';
+	} else if (ch >= 'a' && ch <= 'z') {
+		return ch - 'a' + 10;
+	} else if (ch >= 'A' && ch <= 'Z') {
+		return ch - 'A' + 36;
+	} else if (ch == '@') {
+		return 62;
+	} else if (ch == '_') {
+		return 63;
+	}
+	return BASH_BASE_ERROR;
+}
+
+static inline int getBashNumberBase(char *s) {
+	int i = 0;
+	int base = 0;
+	while (*s) {
+		base = base * 10 + (*s++ - '0');
+		i++;
+	}
+	if (base > 64 || i > 2) {
+		return BASH_BASE_ERROR;
+	}
+	return base;
+}
+
+static int opposite(int ch) {
+	if (ch == '(') return ')';
+	if (ch == '[') return ']';
+	if (ch == '{') return '}';
+	if (ch == '<') return '>';
+	return ch;
+}
+
+static void ColouriseBashDoc(unsigned int startPos, int length, int initStyle,
+							 WordList *keywordlists[], Accessor &styler) {
+
+	WordList &keywords = *keywordlists[0];
+
+	CharacterSet setWordStart(CharacterSet::setAlpha, "_");
+	// note that [+-] are often parts of identifiers in shell scripts
+	CharacterSet setWord(CharacterSet::setAlphaNum, "._+-");
+	CharacterSet setBashOperator(CharacterSet::setNone, "^&\\%()-+=|{}[]:;>,*/<?!.~@");
+	CharacterSet setSingleCharOp(CharacterSet::setNone, "rwxoRWXOezsfdlpSbctugkTBMACahGLNn");
+	CharacterSet setParam(CharacterSet::setAlphaNum, "$_");
+	CharacterSet setHereDoc(CharacterSet::setAlpha, "_\\-+!");
+	CharacterSet setHereDoc2(CharacterSet::setAlphaNum, "_-+!");
+	CharacterSet setLeftShift(CharacterSet::setDigits, "=$");
+
+	class HereDocCls {	// Class to manage HERE document elements
+	public:
+		int State;		// 0: '<<' encountered
+		// 1: collect the delimiter
+		// 2: here doc text (lines after the delimiter)
+		int Quote;		// the char after '<<'
+		bool Quoted;		// true if Quote in ('\'','"','`')
+		bool Indent;		// indented delimiter (for <<-)
+		int DelimiterLength;	// strlen(Delimiter)
+		char *Delimiter;	// the Delimiter, 256: sizeof PL_tokenbuf
+		HereDocCls() {
+			State = 0;
+			Quote = 0;
+			Quoted = false;
+			Indent = 0;
+			DelimiterLength = 0;
+			Delimiter = new char[HERE_DELIM_MAX];
+			Delimiter[0] = '\0';
+		}
+		void Append(int ch) {
+			Delimiter[DelimiterLength++] = static_cast<char>(ch);
+			Delimiter[DelimiterLength] = '\0';
+		}
+		~HereDocCls() {
+			delete []Delimiter;
+		}
+	};
+	HereDocCls HereDoc;
+
+	class QuoteCls {	// Class to manage quote pairs (simplified vs LexPerl)
+		public:
+		int Count;
+		int Up, Down;
+		QuoteCls() {
+			Count = 0;
+			Up    = '\0';
+			Down  = '\0';
+		}
+		void Open(int u) {
+			Count++;
+			Up    = u;
+			Down  = opposite(Up);
+		}
+		void Start(int u) {
+			Count = 0;
+			Open(u);
+		}
+	};
+	QuoteCls Quote;
+
+	int numBase = 0;
+	int digit;
+	unsigned int endPos = startPos + length;
+
+	// Backtrack to beginning of style if required...
+	// If in a long distance lexical state, backtrack to find quote characters
+	if (initStyle == SCE_SH_HERE_Q) {
+		while ((startPos > 1) && (styler.StyleAt(startPos) != SCE_SH_HERE_DELIM)) {
+			startPos--;
+		}
+		startPos = styler.LineStart(styler.GetLine(startPos));
+		initStyle = styler.StyleAt(startPos - 1);
+	}
+	// Bash strings can be multi-line with embedded newlines, so backtrack.
+	// Bash numbers have additional state during lexing, so backtrack too.
+	if (initStyle == SCE_SH_STRING
+	 || initStyle == SCE_SH_BACKTICKS
+	 || initStyle == SCE_SH_CHARACTER
+	 || initStyle == SCE_SH_NUMBER
+	 || initStyle == SCE_SH_IDENTIFIER
+	 || initStyle == SCE_SH_COMMENTLINE) {
+		while ((startPos > 1) && (styler.StyleAt(startPos - 1) == initStyle)) {
+			startPos--;
+		}
+		initStyle = SCE_SH_DEFAULT;
+	}
+
+	StyleContext sc(startPos, endPos - startPos, initStyle, styler);
+
+	for (; sc.More(); sc.Forward()) {
+
+		// Determine if the current state should terminate.
+		switch (sc.state) {
+			case SCE_SH_OPERATOR:
+				sc.SetState(SCE_SH_DEFAULT);
+				break;
+			case SCE_SH_WORD:
+				// "." never used in Bash variable names but used in file names
+				if (!setWord.Contains(sc.ch)) {
+					char s[1000];
+					sc.GetCurrent(s, sizeof(s));
+					if (s[0] != '-' &&	// for file operators
+						!keywords.InList(s)) {
+						sc.ChangeState(SCE_SH_IDENTIFIER);
+					}
+					sc.SetState(SCE_SH_DEFAULT);
+				}
+				break;
+			case SCE_SH_IDENTIFIER:
+				if (sc.chPrev == '\\') {	// for escaped chars
+					sc.ForwardSetState(SCE_SH_DEFAULT);
+				} else if (!setWord.Contains(sc.ch)) {
+					sc.SetState(SCE_SH_DEFAULT);
+				}
+				break;
+			case SCE_SH_NUMBER:
+				digit = translateBashDigit(sc.ch);
+				if (numBase == BASH_BASE_DECIMAL) {
+					if (sc.ch == '#') {
+						char s[10];
+						sc.GetCurrent(s, sizeof(s));
+						numBase = getBashNumberBase(s);
+						if (numBase != BASH_BASE_ERROR)
+							break;
+					} else if (IsADigit(sc.ch))
+						break;
+				} else if (numBase == BASH_BASE_HEX) {
+					if (IsADigit(sc.ch, 16))
+						break;
+#ifdef PEDANTIC_OCTAL
+				} else if (numBase == BASH_BASE_OCTAL ||
+						   numBase == BASH_BASE_OCTAL_ERROR) {
+					if (digit <= 7)
+						break;
+					if (digit <= 9) {
+						numBase = BASH_BASE_OCTAL_ERROR;
+						break;
+					}
+#endif
+				} else if (numBase == BASH_BASE_ERROR) {
+					if (digit <= 9)
+						break;
+				} else {	// DD#DDDD number style handling
+					if (digit != BASH_BASE_ERROR) {
+						if (numBase <= 36) {
+							// case-insensitive if base<=36
+							if (digit >= 36) digit -= 26;
+						}
+						if (digit < numBase)
+							break;
+						if (digit <= 9) {
+							numBase = BASH_BASE_ERROR;
+							break;
+						}
+					}
+				}
+				// fallthrough when number is at an end or error
+				if (numBase == BASH_BASE_ERROR
+#ifdef PEDANTIC_OCTAL
+					|| numBase == BASH_BASE_OCTAL_ERROR
+#endif
+				) {
+					sc.ChangeState(SCE_SH_ERROR);
+				}
+				sc.SetState(SCE_SH_DEFAULT);
+				break;
+			case SCE_SH_COMMENTLINE:
+				if (sc.ch == '\\' && (sc.chNext == '\r' || sc.chNext == '\n')) {
+					// comment continuation
+					sc.Forward();
+					if (sc.ch == '\r' && sc.chNext == '\n') {
+						sc.Forward();
+					}
+				} else if (sc.atLineEnd) {
+					sc.ForwardSetState(SCE_SH_DEFAULT);
+				}
+				break;
+			case SCE_SH_HERE_DELIM:
+				// From Bash info:
+				// ---------------
+				// Specifier format is: <<[-]WORD
+				// Optional '-' is for removal of leading tabs from here-doc.
+				// Whitespace acceptable after <<[-] operator
+				//
+				if (HereDoc.State == 0) { // '<<' encountered
+					HereDoc.Quote = sc.chNext;
+					HereDoc.Quoted = false;
+					HereDoc.DelimiterLength = 0;
+					HereDoc.Delimiter[HereDoc.DelimiterLength] = '\0';
+					if (sc.chNext == '\'' || sc.chNext == '\"') {	// a quoted here-doc delimiter (' or ")
+						sc.Forward();
+						HereDoc.Quoted = true;
+						HereDoc.State = 1;
+					} else if (!HereDoc.Indent && sc.chNext == '-') {	// <<- indent case
+						HereDoc.Indent = true;
+					} else if (setHereDoc.Contains(sc.chNext)) {
+						// an unquoted here-doc delimiter, no special handling
+						// TODO check what exactly bash considers part of the delim
+						HereDoc.State = 1;
+					} else if (sc.chNext == '<') {	// HERE string <<<
+						sc.Forward();
+						sc.ForwardSetState(SCE_SH_DEFAULT);
+					} else if (IsASpace(sc.chNext)) {
+						// eat whitespace
+					} else if (setLeftShift.Contains(sc.chNext)) {
+						// left shift << or <<= operator cases
+						sc.ChangeState(SCE_SH_OPERATOR);
+						sc.ForwardSetState(SCE_SH_DEFAULT);
+					} else {
+						// symbols terminates; deprecated zero-length delimiter
+						HereDoc.State = 1;
+					}
+				} else if (HereDoc.State == 1) { // collect the delimiter
+					if (HereDoc.Quoted) { // a quoted here-doc delimiter
+						if (sc.ch == HereDoc.Quote) { // closing quote => end of delimiter
+							sc.ForwardSetState(SCE_SH_DEFAULT);
+						} else {
+							if (sc.ch == '\\' && sc.chNext == HereDoc.Quote) { // escaped quote
+								sc.Forward();
+							}
+							HereDoc.Append(sc.ch);
+						}
+					} else { // an unquoted here-doc delimiter
+						if (setHereDoc2.Contains(sc.ch)) {
+							HereDoc.Append(sc.ch);
+						} else if (sc.ch == '\\') {
+							// skip escape prefix
+						} else {
+							sc.SetState(SCE_SH_DEFAULT);
+						}
+					}
+					if (HereDoc.DelimiterLength >= HERE_DELIM_MAX - 1) {	// force blowup
+						sc.SetState(SCE_SH_ERROR);
+						HereDoc.State = 0;
+					}
+				}
+				break;
+			case SCE_SH_HERE_Q:
+				// HereDoc.State == 2
+				if (sc.atLineStart) {
+					sc.SetState(SCE_SH_HERE_Q);
+					int prefixws = 0;
+					while (IsASpace(sc.ch) && !sc.atLineEnd) {	// whitespace prefix
+						sc.Forward();
+						prefixws++;
+					}
+					if (prefixws > 0)
+						sc.SetState(SCE_SH_HERE_Q);
+					while (!sc.atLineEnd) {
+						sc.Forward();
+					}
+					char s[HERE_DELIM_MAX];
+					sc.GetCurrent(s, sizeof(s));
+					if (strcmp(HereDoc.Delimiter, s) == 0) {
+						if ((prefixws > 0 && HereDoc.Indent) ||	// indentation rule
+							(prefixws == 0 && !HereDoc.Indent)) {
+							sc.SetState(SCE_SH_DEFAULT);
+							break;
+						}
+					}
+				}
+				break;
+			case SCE_SH_SCALAR:	// variable names
+				if (!setParam.Contains(sc.ch)) {
+					if (sc.LengthCurrent() == 1) {
+						// Special variable: $(, $_ etc.
+						sc.ForwardSetState(SCE_SH_DEFAULT);
+					} else {
+						sc.SetState(SCE_SH_DEFAULT);
+					}
+				}
+				break;
+			case SCE_SH_STRING:	// delimited styles
+			case SCE_SH_CHARACTER:
+			case SCE_SH_BACKTICKS:
+			case SCE_SH_PARAM:
+				if (sc.ch == '\\' && Quote.Up != '\\') {
+					sc.Forward();
+				} else if (sc.ch == Quote.Down) {
+					Quote.Count--;
+					if (Quote.Count == 0) {
+						sc.ForwardSetState(SCE_SH_DEFAULT);
+					}
+				} else if (sc.ch == Quote.Up) {
+					Quote.Count++;
+				}
+				break;
+		}
+
+		// Must check end of HereDoc state 1 before default state is handled
+		if (HereDoc.State == 1 && sc.atLineEnd) {
+			// Begin of here-doc (the line after the here-doc delimiter):
+			// Lexically, the here-doc starts from the next line after the >>, but the
+			// first line of here-doc seem to follow the style of the last EOL sequence
+			HereDoc.State = 2;
+			if (HereDoc.Quoted) {
+				if (sc.state == SCE_SH_HERE_DELIM) {
+					// Missing quote at end of string! We are stricter than bash.
+					// Colour here-doc anyway while marking this bit as an error.
+					sc.ChangeState(SCE_SH_ERROR);
+				}
+				// HereDoc.Quote always == '\''
+			}
+			sc.SetState(SCE_SH_HERE_Q);
+		}
+
+		// Determine if a new state should be entered.
+		if (sc.state == SCE_SH_DEFAULT) {
+			if (sc.ch == '\\') {	// escaped character
+				sc.SetState(SCE_SH_IDENTIFIER);
+			} else if (IsADigit(sc.ch)) {
+				sc.SetState(SCE_SH_NUMBER);
+				numBase = BASH_BASE_DECIMAL;
+				if (sc.ch == '0') {	// hex,octal
+					if (sc.chNext == 'x' || sc.chNext == 'X') {
+						numBase = BASH_BASE_HEX;
+						sc.Forward();
+					} else if (IsADigit(sc.chNext)) {
+#ifdef PEDANTIC_OCTAL
+						numBase = BASH_BASE_OCTAL;
+#else
+						numBase = BASH_BASE_HEX;
+#endif
+					}
+				}
+			} else if (setWordStart.Contains(sc.ch)) {
+				sc.SetState(SCE_SH_WORD);
+			} else if (sc.ch == '#') {
+				sc.SetState(SCE_SH_COMMENTLINE);
+			} else if (sc.ch == '\"') {
+				sc.SetState(SCE_SH_STRING);
+				Quote.Start(sc.ch);
+			} else if (sc.ch == '\'') {
+				sc.SetState(SCE_SH_CHARACTER);
+				Quote.Start(sc.ch);
+			} else if (sc.ch == '`') {
+				sc.SetState(SCE_SH_BACKTICKS);
+				Quote.Start(sc.ch);
+			} else if (sc.ch == '$') {
+				sc.SetState(SCE_SH_SCALAR);
+				sc.Forward();
+				if (sc.ch == '{') {
+					sc.ChangeState(SCE_SH_PARAM);
+				} else if (sc.ch == '\'') {
+					sc.ChangeState(SCE_SH_CHARACTER);
+				} else if (sc.ch == '"') {
+					sc.ChangeState(SCE_SH_STRING);
+				} else if (sc.ch == '(' || sc.ch == '`') {
+					sc.ChangeState(SCE_SH_BACKTICKS);
+					if (sc.chNext == '(') {	// $(( is lexed as operator
+						sc.ChangeState(SCE_SH_OPERATOR);
+					}
+				} else {
+					continue;	// scalar has no delimiter pair
+				}
+				// fallthrough, open delim for $[{'"(`]
+				Quote.Start(sc.ch);
+			} else if (sc.Match('<', '<')) {
+				sc.SetState(SCE_SH_HERE_DELIM);
+				HereDoc.State = 0;
+				HereDoc.Indent = false;
+			} else if (sc.ch == '-'	&&	// one-char file test operators
+					   setSingleCharOp.Contains(sc.chNext) &&
+					   !setWord.Contains(sc.GetRelative(2)) &&
+					   IsASpace(sc.chPrev)) {
+				sc.SetState(SCE_SH_WORD);
+				sc.Forward();
+			} else if (setBashOperator.Contains(sc.ch)) {
+				sc.SetState(SCE_SH_OPERATOR);
+			}
+		}
+	}
+	sc.Complete();
+}
+
+static bool IsCommentLine(int line, Accessor &styler) {
+	int pos = styler.LineStart(line);
+	int eol_pos = styler.LineStart(line + 1) - 1;
+	for (int i = pos; i < eol_pos; i++) {
+		char ch = styler[i];
+		if (ch == '#')
+			return true;
+		else if (ch != ' ' && ch != '\t')
+			return false;
+	}
+	return false;
+}
+
+static void FoldBashDoc(unsigned int startPos, int length, int, WordList *[],
+						Accessor &styler) {
+	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
+	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	unsigned int endPos = startPos + length;
+	int visibleChars = 0;
+	int lineCurrent = styler.GetLine(startPos);
+	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
+	int levelCurrent = levelPrev;
+	char chNext = styler[startPos];
+	int styleNext = styler.StyleAt(startPos);
+	for (unsigned int i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+		// Comment folding
+		if (foldComment && atEOL && IsCommentLine(lineCurrent, styler))
+		{
+			if (!IsCommentLine(lineCurrent - 1, styler)
+				&& IsCommentLine(lineCurrent + 1, styler))
+				levelCurrent++;
+			else if (IsCommentLine(lineCurrent - 1, styler)
+					 && !IsCommentLine(lineCurrent + 1, styler))
+				levelCurrent--;
+		}
+		if (style == SCE_SH_OPERATOR) {
+			if (ch == '{') {
+				levelCurrent++;
+			} else if (ch == '}') {
+				levelCurrent--;
+			}
+		}
+		if (atEOL) {
+			int lev = levelPrev;
+			if (visibleChars == 0 && foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if ((levelCurrent > levelPrev) && (visibleChars > 0))
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelPrev = levelCurrent;
+			visibleChars = 0;
+		}
+		if (!isspacechar(ch))
+			visibleChars++;
+	}
+	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
+	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
+}
+
+static const char * const bashWordListDesc[] = {
+	"Keywords",
+	0
+};
+
+LexerModule lmBash(SCLEX_BASH, ColouriseBashDoc, "bash", FoldBashDoc, bashWordListDesc);
diff --git a/Documents/Scintilla/LexBasic.cxx b/Documents/Scintilla/LexBasic.cxx
new file mode 100644
index 0000000..1c5d7b4
--- /dev/null
+++ b/Documents/Scintilla/LexBasic.cxx
@@ -0,0 +1,373 @@
+// Scintilla source code edit control
+/** @file LexBasic.cxx
+ ** Lexer for BlitzBasic and PureBasic.
+ **/
+// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+// This tries to be a unified Lexer/Folder for all the BlitzBasic/BlitzMax/PurBasic basics
+// and derivatives. Once they diverge enough, might want to split it into multiple
+// lexers for more code clearity.
+//
+// Mail me (elias <at> users <dot> sf <dot> net) for any bugs.
+
+// Folding only works for simple things like functions or types.
+
+// You may want to have a look at my ctags lexer as well, if you additionally to coloring
+// and folding need to extract things like label tags in your editor.
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <ctype.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+/* Bits:
+ * 1  - whitespace
+ * 2  - operator
+ * 4  - identifier
+ * 8  - decimal digit
+ * 16 - hex digit
+ * 32 - bin digit
+ */
+static int character_classification[128] =
+{
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  0,  0,  1,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    1,  2,  0,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  10, 2,
+    60, 60, 28, 28, 28, 28, 28, 28, 28, 28, 2,  2,  2,  2,  2,  2,
+    2,  20, 20, 20, 20, 20, 20, 4,  4,  4,  4,  4,  4,  4,  4,  4,
+    4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  2,  2,  2,  2,  4,
+    2,  20, 20, 20, 20, 20, 20, 4,  4,  4,  4,  4,  4,  4,  4,  4,
+    4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  2,  2,  2,  2,  0
+};
+
+static bool IsSpace(int c) {
+	return c < 128 && (character_classification[c] & 1);
+}
+
+static bool IsOperator(int c) {
+	return c < 128 && (character_classification[c] & 2);
+}
+
+static bool IsIdentifier(int c) {
+	return c < 128 && (character_classification[c] & 4);
+}
+
+static bool IsDigit(int c) {
+	return c < 128 && (character_classification[c] & 8);
+}
+
+static bool IsHexDigit(int c) {
+	return c < 128 && (character_classification[c] & 16);
+}
+
+static bool IsBinDigit(int c) {
+	return c < 128 && (character_classification[c] & 32);
+}
+
+static int LowerCase(int c)
+{
+	if (c >= 'A' && c <= 'Z')
+		return 'a' + c - 'A';
+	return c;
+}
+
+static void ColouriseBasicDoc(unsigned int startPos, int length, int initStyle,
+                           WordList *keywordlists[], Accessor &styler, char comment_char) {
+	bool wasfirst = true, isfirst = true; // true if first token in a line
+	styler.StartAt(startPos);
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	// Can't use sc.More() here else we miss the last character
+	for (; ; sc.Forward()) {
+		if (sc.state == SCE_B_IDENTIFIER) {
+			if (!IsIdentifier(sc.ch)) {
+				// Labels
+				if (wasfirst && sc.Match(':')) {
+					sc.ChangeState(SCE_B_LABEL);
+					sc.ForwardSetState(SCE_B_DEFAULT);
+				} else {
+					char s[100];
+					int kstates[4] = {
+						SCE_B_KEYWORD,
+						SCE_B_KEYWORD2,
+						SCE_B_KEYWORD3,
+						SCE_B_KEYWORD4,
+					};
+					sc.GetCurrentLowered(s, sizeof(s));
+					for (int i = 0; i < 4; i++) {
+						if (keywordlists[i]->InList(s)) {
+							sc.ChangeState(kstates[i]);
+						}
+					}
+					// Types, must set them as operator else they will be
+					// matched as number/constant
+					if (sc.Match('.') || sc.Match('$') || sc.Match('%') ||
+						sc.Match('#')) {
+						sc.SetState(SCE_B_OPERATOR);
+					} else {
+						sc.SetState(SCE_B_DEFAULT);
+					}
+				}
+			}
+		} else if (sc.state == SCE_B_OPERATOR) {
+			if (!IsOperator(sc.ch) || sc.Match('#'))
+				sc.SetState(SCE_B_DEFAULT);
+		} else if (sc.state == SCE_B_LABEL) {
+			if (!IsIdentifier(sc.ch))
+				sc.SetState(SCE_B_DEFAULT);
+		} else if (sc.state == SCE_B_CONSTANT) {
+			if (!IsIdentifier(sc.ch))
+				sc.SetState(SCE_B_DEFAULT);
+		} else if (sc.state == SCE_B_NUMBER) {
+			if (!IsDigit(sc.ch))
+				sc.SetState(SCE_B_DEFAULT);
+		} else if (sc.state == SCE_B_HEXNUMBER) {
+			if (!IsHexDigit(sc.ch))
+				sc.SetState(SCE_B_DEFAULT);
+		} else if (sc.state == SCE_B_BINNUMBER) {
+			if (!IsBinDigit(sc.ch))
+				sc.SetState(SCE_B_DEFAULT);
+		} else if (sc.state == SCE_B_STRING) {
+			if (sc.ch == '"') {
+				sc.ForwardSetState(SCE_B_DEFAULT);
+			}
+			if (sc.atLineEnd) {
+				sc.ChangeState(SCE_B_ERROR);
+				sc.SetState(SCE_B_DEFAULT);
+			}
+		} else if (sc.state == SCE_B_COMMENT || sc.state == SCE_B_PREPROCESSOR) {
+			if (sc.atLineEnd) {
+				sc.SetState(SCE_B_DEFAULT);
+			}
+		}
+
+		if (sc.atLineStart)
+			isfirst = true;
+
+		if (sc.state == SCE_B_DEFAULT || sc.state == SCE_B_ERROR) {
+			if (isfirst && sc.Match('.')) {
+				sc.SetState(SCE_B_LABEL);
+			} else if (isfirst && sc.Match('#')) {
+				wasfirst = isfirst;
+				sc.SetState(SCE_B_IDENTIFIER);
+			} else if (sc.Match(comment_char)) {
+				// Hack to make deprecated QBASIC '$Include show
+				// up in freebasic with SCE_B_PREPROCESSOR.
+				if (comment_char == '\'' && sc.Match(comment_char, '$'))
+					sc.SetState(SCE_B_PREPROCESSOR);
+				else
+					sc.SetState(SCE_B_COMMENT);
+			} else if (sc.Match('"')) {
+				sc.SetState(SCE_B_STRING);
+			} else if (IsDigit(sc.ch)) {
+				sc.SetState(SCE_B_NUMBER);
+			} else if (sc.Match('$')) {
+				sc.SetState(SCE_B_HEXNUMBER);
+			} else if (sc.Match('%')) {
+				sc.SetState(SCE_B_BINNUMBER);
+			} else if (sc.Match('#')) {
+				sc.SetState(SCE_B_CONSTANT);
+			} else if (IsOperator(sc.ch)) {
+				sc.SetState(SCE_B_OPERATOR);
+			} else if (IsIdentifier(sc.ch)) {
+				wasfirst = isfirst;
+				sc.SetState(SCE_B_IDENTIFIER);
+			} else if (!IsSpace(sc.ch)) {
+				sc.SetState(SCE_B_ERROR);
+			}
+		}
+
+		if (!IsSpace(sc.ch))
+			isfirst = false;
+
+		if (!sc.More())
+			break;
+	}
+	sc.Complete();
+}
+
+static int CheckBlitzFoldPoint(char const *token, int &level) {
+	if (!strcmp(token, "function") ||
+		!strcmp(token, "type")) {
+		level |= SC_FOLDLEVELHEADERFLAG;
+		return 1;
+	}
+	if (!strcmp(token, "end function") ||
+		!strcmp(token, "end type")) {
+		return -1;
+	}
+	return 0;
+}
+
+static int CheckPureFoldPoint(char const *token, int &level) {
+	if (!strcmp(token, "procedure") ||
+		!strcmp(token, "enumeration") ||
+		!strcmp(token, "interface") ||
+		!strcmp(token, "structure")) {
+		level |= SC_FOLDLEVELHEADERFLAG;
+		return 1;
+	}
+	if (!strcmp(token, "endprocedure") ||
+		!strcmp(token, "endenumeration") ||
+		!strcmp(token, "endinterface") ||
+		!strcmp(token, "endstructure")) {
+		return -1;
+	}
+	return 0;
+}
+
+static int CheckFreeFoldPoint(char const *token, int &level) {
+	if (!strcmp(token, "function") ||
+		!strcmp(token, "sub") ||
+		!strcmp(token, "type")) {
+		level |= SC_FOLDLEVELHEADERFLAG;
+		return 1;
+	}
+	if (!strcmp(token, "end function") ||
+		!strcmp(token, "end sub") ||
+		!strcmp(token, "end type")) {
+		return -1;
+	}
+	return 0;
+}
+
+static void FoldBasicDoc(unsigned int startPos, int length,
+	Accessor &styler, int (*CheckFoldPoint)(char const *, int &)) {
+	int line = styler.GetLine(startPos);
+	int level = styler.LevelAt(line);
+	int go = 0, done = 0;
+	int endPos = startPos + length;
+	char word[256];
+	int wordlen = 0;
+	int i;
+        bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	// Scan for tokens at the start of the line (they may include
+	// whitespace, for tokens like "End Function"
+	for (i = startPos; i < endPos; i++) {
+		int c = styler.SafeGetCharAt(i);
+		if (!done && !go) {
+			if (wordlen) { // are we scanning a token already?
+				word[wordlen] = static_cast<char>(LowerCase(c));
+				if (!IsIdentifier(c)) { // done with token
+					word[wordlen] = '\0';
+					go = CheckFoldPoint(word, level);
+					if (!go) {
+						// Treat any whitespace as single blank, for
+						// things like "End   Function".
+						if (IsSpace(c) && IsIdentifier(word[wordlen - 1])) {
+							word[wordlen] = ' ';
+							if (wordlen < 255)
+								wordlen++;
+						}
+						else // done with this line
+							done = 1;
+					}
+				} else if (wordlen < 255) {
+					wordlen++;
+				}
+			} else { // start scanning at first non-whitespace character
+				if (!IsSpace(c)) {
+					if (IsIdentifier(c)) {
+						word[0] = static_cast<char>(LowerCase(c));
+						wordlen = 1;
+					} else // done with this line
+						done = 1;
+				}
+			}
+		}
+		if (c == '\n') { // line end
+			if (!done && wordlen == 0 && foldCompact) // line was only space
+				level |= SC_FOLDLEVELWHITEFLAG;
+			if (level != styler.LevelAt(line))
+				styler.SetLevel(line, level);
+			level += go;
+			line++;
+			// reset state
+			wordlen = 0;
+			level &= ~SC_FOLDLEVELHEADERFLAG;
+			level &= ~SC_FOLDLEVELWHITEFLAG;
+			go = 0;
+			done = 0;
+		}
+	}
+}
+
+static void ColouriseBlitzBasicDoc(unsigned int startPos, int length, int initStyle,
+                           WordList *keywordlists[], Accessor &styler) {
+	ColouriseBasicDoc(startPos, length, initStyle, keywordlists, styler, ';');
+}
+
+static void ColourisePureBasicDoc(unsigned int startPos, int length, int initStyle,
+                           WordList *keywordlists[], Accessor &styler) {
+	ColouriseBasicDoc(startPos, length, initStyle, keywordlists, styler, ';');
+}
+
+static void ColouriseFreeBasicDoc(unsigned int startPos, int length, int initStyle,
+                           WordList *keywordlists[], Accessor &styler) {
+	ColouriseBasicDoc(startPos, length, initStyle, keywordlists, styler, '\'');
+}
+
+static void FoldBlitzBasicDoc(unsigned int startPos, int length, int,
+	WordList *[], Accessor &styler) {
+	FoldBasicDoc(startPos, length, styler, CheckBlitzFoldPoint);
+}
+
+static void FoldPureBasicDoc(unsigned int startPos, int length, int,
+	WordList *[], Accessor &styler) {
+	FoldBasicDoc(startPos, length, styler, CheckPureFoldPoint);
+}
+
+static void FoldFreeBasicDoc(unsigned int startPos, int length, int,
+	WordList *[], Accessor &styler) {
+	FoldBasicDoc(startPos, length, styler, CheckFreeFoldPoint);
+}
+
+static const char * const blitzbasicWordListDesc[] = {
+	"BlitzBasic Keywords",
+	"user1",
+	"user2",
+	"user3",
+	0
+};
+
+static const char * const purebasicWordListDesc[] = {
+	"PureBasic Keywords",
+	"PureBasic PreProcessor Keywords",
+	"user defined 1",
+	"user defined 2",
+	0
+};
+
+static const char * const freebasicWordListDesc[] = {
+	"FreeBasic Keywords",
+	"FreeBasic PreProcessor Keywords",
+	"user defined 1",
+	"user defined 2",
+	0
+};
+
+LexerModule lmBlitzBasic(SCLEX_BLITZBASIC, ColouriseBlitzBasicDoc, "blitzbasic",
+	FoldBlitzBasicDoc, blitzbasicWordListDesc);
+
+LexerModule lmPureBasic(SCLEX_PUREBASIC, ColourisePureBasicDoc, "purebasic",
+	FoldPureBasicDoc, purebasicWordListDesc);
+
+LexerModule lmFreeBasic(SCLEX_FREEBASIC, ColouriseFreeBasicDoc, "freebasic",
+	FoldFreeBasicDoc, freebasicWordListDesc);
+
diff --git a/Documents/Scintilla/LexBullant.cxx b/Documents/Scintilla/LexBullant.cxx
new file mode 100644
index 0000000..cc60cd2
--- /dev/null
+++ b/Documents/Scintilla/LexBullant.cxx
@@ -0,0 +1,228 @@
+// SciTE - Scintilla based Text Editor
+// LexBullant.cxx - lexer for Bullant
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+static int classifyWordBullant(unsigned int start, unsigned int end, WordList &keywords, Accessor &styler) {
+	char s[100];
+	for (unsigned int i = 0; i < end - start + 1 && i < 30; i++) {
+		s[i] = static_cast<char>(tolower(styler[start + i]));
+		s[i + 1] = '\0';
+	}
+	int lev= 0;
+	char chAttr = SCE_C_IDENTIFIER;
+	if (isdigit(s[0]) || (s[0] == '.')){
+		chAttr = SCE_C_NUMBER;
+	}
+	else {
+		if (keywords.InList(s)) {
+			chAttr = SCE_C_WORD;
+			if (strcmp(s, "end") == 0)
+				lev = -1;
+			else if (strcmp(s, "method") == 0 ||
+				strcmp(s, "case") == 0 ||
+				strcmp(s, "class") == 0 ||
+				strcmp(s, "debug") == 0 ||
+				strcmp(s, "test") == 0 ||
+				strcmp(s, "if") == 0 ||
+				strcmp(s, "lock") == 0 ||
+				strcmp(s, "transaction") == 0 ||
+				strcmp(s, "trap") == 0 ||
+				strcmp(s, "until") == 0 ||
+				strcmp(s, "while") == 0)
+				lev = 1;
+		}
+	}
+	styler.ColourTo(end, chAttr);
+	return lev;
+}
+
+static void ColouriseBullantDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
+	Accessor &styler) {
+	WordList &keywords = *keywordlists[0];
+
+	styler.StartAt(startPos);
+
+	bool fold = styler.GetPropertyInt("fold") != 0;
+	int lineCurrent = styler.GetLine(startPos);
+	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
+	int levelCurrent = levelPrev;
+
+	int state = initStyle;
+	if (state == SCE_C_STRINGEOL)	// Does not leak onto next line
+		state = SCE_C_DEFAULT;
+	char chPrev = ' ';
+	char chNext = styler[startPos];
+	unsigned int lengthDoc = startPos + length;
+	int visibleChars = 0;
+	styler.StartSegment(startPos);
+	int endFoundThisLine = 0;
+	for (unsigned int i = startPos; i < lengthDoc; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+
+		if ((ch == '\r' && chNext != '\n') || (ch == '\n')) {
+			// Trigger on CR only (Mac style) or either on LF from CR+LF (Dos/Win) or on LF alone (Unix)
+			// Avoid triggering two times on Dos/Win
+			// End of line
+			endFoundThisLine = 0;
+			if (state == SCE_C_STRINGEOL) {
+				styler.ColourTo(i, state);
+				state = SCE_C_DEFAULT;
+			}
+			if (fold) {
+				int lev = levelPrev;
+				if (visibleChars == 0)
+					lev |= SC_FOLDLEVELWHITEFLAG;
+				if ((levelCurrent > levelPrev) && (visibleChars > 0))
+					lev |= SC_FOLDLEVELHEADERFLAG;
+				styler.SetLevel(lineCurrent, lev);
+				lineCurrent++;
+				levelPrev = levelCurrent;
+			}
+			visibleChars = 0;
+
+/*			int indentBlock = GetLineIndentation(lineCurrent);
+			if (blockChange==1){
+				lineCurrent++;
+				int pos=SetLineIndentation(lineCurrent, indentBlock + indentSize);
+			} else if (blockChange==-1) {
+				indentBlock -= indentSize;
+				if (indentBlock < 0)
+					indentBlock = 0;
+				SetLineIndentation(lineCurrent, indentBlock);
+				lineCurrent++;
+			}
+			blockChange=0;
+*/		}
+		if (!isspace(ch))
+			visibleChars++;
+
+		if (styler.IsLeadByte(ch)) {
+			chNext = styler.SafeGetCharAt(i + 2);
+			chPrev = ' ';
+			i += 1;
+			continue;
+		}
+
+		if (state == SCE_C_DEFAULT) {
+			if (iswordstart(ch)) {
+				styler.ColourTo(i-1, state);
+					state = SCE_C_IDENTIFIER;
+			} else if (ch == '@' && chNext == 'o') {
+				if ((styler.SafeGetCharAt(i+2) =='f') && (styler.SafeGetCharAt(i+3) == 'f')) {
+					styler.ColourTo(i-1, state);
+					state = SCE_C_COMMENT;
+				}
+			} else if (ch == '#') {
+				styler.ColourTo(i-1, state);
+				state = SCE_C_COMMENTLINE;
+			} else if (ch == '\"') {
+				styler.ColourTo(i-1, state);
+				state = SCE_C_STRING;
+			} else if (ch == '\'') {
+				styler.ColourTo(i-1, state);
+				state = SCE_C_CHARACTER;
+			} else if (isoperator(ch)) {
+				styler.ColourTo(i-1, state);
+				styler.ColourTo(i, SCE_C_OPERATOR);
+			}
+		} else if (state == SCE_C_IDENTIFIER) {
+			if (!iswordchar(ch)) {
+				int levelChange = classifyWordBullant(styler.GetStartSegment(), i - 1, keywords, styler);
+				state = SCE_C_DEFAULT;
+				chNext = styler.SafeGetCharAt(i + 1);
+				if (ch == '#') {
+					state = SCE_C_COMMENTLINE;
+				} else if (ch == '\"') {
+					state = SCE_C_STRING;
+				} else if (ch == '\'') {
+					state = SCE_C_CHARACTER;
+				} else if (isoperator(ch)) {
+					styler.ColourTo(i, SCE_C_OPERATOR);
+				}
+				if (endFoundThisLine == 0)
+					levelCurrent+=levelChange;
+				if (levelChange == -1)
+					endFoundThisLine=1;
+			}
+		} else if (state == SCE_C_COMMENT) {
+			if (ch == '@' && chNext == 'o') {
+				if (styler.SafeGetCharAt(i+2) == 'n') {
+					styler.ColourTo(i+2, state);
+					state = SCE_C_DEFAULT;
+					i+=2;
+				}
+			}
+		} else if (state == SCE_C_COMMENTLINE) {
+			if (ch == '\r' || ch == '\n') {
+				endFoundThisLine = 0;
+				styler.ColourTo(i-1, state);
+				state = SCE_C_DEFAULT;
+			}
+		} else if (state == SCE_C_STRING) {
+			if (ch == '\\') {
+				if (chNext == '\"' || chNext == '\'' || chNext == '\\') {
+					i++;
+					ch = chNext;
+					chNext = styler.SafeGetCharAt(i + 1);
+				}
+			} else if (ch == '\"') {
+				styler.ColourTo(i, state);
+				state = SCE_C_DEFAULT;
+			} else if (chNext == '\r' || chNext == '\n') {
+				endFoundThisLine = 0;
+				styler.ColourTo(i-1, SCE_C_STRINGEOL);
+				state = SCE_C_STRINGEOL;
+			}
+		} else if (state == SCE_C_CHARACTER) {
+			if ((ch == '\r' || ch == '\n') && (chPrev != '\\')) {
+				endFoundThisLine = 0;
+				styler.ColourTo(i-1, SCE_C_STRINGEOL);
+				state = SCE_C_STRINGEOL;
+			} else if (ch == '\\') {
+				if (chNext == '\"' || chNext == '\'' || chNext == '\\') {
+					i++;
+					ch = chNext;
+					chNext = styler.SafeGetCharAt(i + 1);
+				}
+			} else if (ch == '\'') {
+				styler.ColourTo(i, state);
+				state = SCE_C_DEFAULT;
+			}
+		}
+		chPrev = ch;
+	}
+	styler.ColourTo(lengthDoc - 1, state);
+
+	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
+	if (fold) {
+		int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+		//styler.SetLevel(lineCurrent, levelCurrent | flagsNext);
+		styler.SetLevel(lineCurrent, levelPrev | flagsNext);
+
+	}
+}
+
+static const char * const bullantWordListDesc[] = {
+	"Keywords",
+	0
+};
+
+LexerModule lmBullant(SCLEX_BULLANT, ColouriseBullantDoc, "bullant", 0, bullantWordListDesc);
diff --git a/Documents/Scintilla/LexCLW.cxx b/Documents/Scintilla/LexCLW.cxx
new file mode 100644
index 0000000..624ef0f
--- /dev/null
+++ b/Documents/Scintilla/LexCLW.cxx
@@ -0,0 +1,679 @@
+// Scintilla source code edit control
+/** @file LexClw.cxx
+ ** Lexer for Clarion.
+ ** 2004/12/17 Updated Lexer
+ **/
+// Copyright 2003-2004 by Ron Schofield <ron@schofieldcomputer.com>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <ctype.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+// Is an end of line character
+inline bool IsEOL(const int ch) {
+
+	return(ch == '\n');
+}
+
+// Convert character to uppercase
+static char CharacterUpper(char chChar) {
+
+	if (chChar < 'a' || chChar > 'z') {
+		return(chChar);
+	}
+	else {
+		return(static_cast<char>(chChar - 'a' + 'A'));
+	}
+}
+
+// Convert string to uppercase
+static void StringUpper(char *szString) {
+
+	while (*szString) {
+		*szString = CharacterUpper(*szString);
+		szString++;
+	}
+}
+
+// Is a label start character
+inline bool IsALabelStart(const int iChar) {
+
+	return(isalpha(iChar) || iChar == '_');
+}
+
+// Is a label character
+inline bool IsALabelCharacter(const int iChar) {
+
+	return(isalnum(iChar) || iChar == '_' || iChar == ':'); 
+}
+
+// Is the character is a ! and the the next character is not a ! 
+inline bool IsACommentStart(const int iChar) {
+
+	return(iChar == '!');
+}
+
+// Is the character a Clarion hex character (ABCDEF)
+inline bool IsAHexCharacter(const int iChar, bool bCaseSensitive) {
+
+	// Case insensitive.
+	if (!bCaseSensitive) {
+		if (strchr("ABCDEFabcdef", iChar) != NULL) {
+			return(true);
+		}
+	}
+	// Case sensitive
+	else {
+		if (strchr("ABCDEF", iChar) != NULL) {
+			return(true);
+		}
+	}
+	return(false);
+}
+
+// Is the character a Clarion base character (B=Binary, O=Octal, H=Hex)
+inline bool IsANumericBaseCharacter(const int iChar, bool bCaseSensitive) {
+
+	// Case insensitive.
+	if (!bCaseSensitive) {
+		// If character is a numeric base character
+		if (strchr("BOHboh", iChar) != NULL) {
+			return(true);
+		}
+	}
+	// Case sensitive
+	else {
+		// If character is a numeric base character
+		if (strchr("BOH", iChar) != NULL) {
+			return(true);
+		}
+	}
+	return(false);
+}
+
+// Set the correct numeric constant state
+inline bool SetNumericConstantState(StyleContext &scDoc) {
+
+	int iPoints = 0;			// Point counter
+	char cNumericString[512];	// Numeric string buffer
+
+	// Buffer the current numberic string
+	scDoc.GetCurrent(cNumericString, sizeof(cNumericString));
+	// Loop through the string until end of string (NULL termination)
+	for (int iIndex = 0; cNumericString[iIndex] != '\0'; iIndex++) {
+		// Depending on the character
+		switch (cNumericString[iIndex]) {
+			// Is a . (point)
+			case '.' :
+				// Increment point counter
+				iPoints++;
+				break;
+			default :
+				break;
+		}	
+	}
+	// If points found (can be more than one for improper formatted number
+	if (iPoints > 0) {
+		return(true);
+	}
+	// Else no points found
+	else {
+		return(false);
+	}
+}
+
+// Get the next word in uppercase from the current position (keyword lookahead)
+inline bool GetNextWordUpper(Accessor &styler, unsigned int uiStartPos, int iLength, char *cWord) {
+
+	unsigned int iIndex = 0;		// Buffer Index
+
+	// Loop through the remaining string from the current position
+	for (int iOffset = uiStartPos; iOffset < iLength; iOffset++) {
+		// Get the character from the buffer using the offset
+		char cCharacter = styler[iOffset];
+		if (IsEOL(cCharacter)) {
+			break;
+		}
+		// If the character is alphabet character
+		if (isalpha(cCharacter)) {
+			// Add UPPERCASE character to the word buffer
+			cWord[iIndex++] = CharacterUpper(cCharacter);
+		}
+	}
+	// Add null termination
+	cWord[iIndex] = '\0';
+	// If no word was found
+	if (iIndex == 0) {
+		// Return failure
+		return(false);
+	}
+	// Else word was found
+	else {
+		// Return success
+		return(true);
+	}
+}
+
+// Clarion Language Colouring Procedure
+static void ColouriseClarionDoc(unsigned int uiStartPos, int iLength, int iInitStyle, WordList *wlKeywords[], Accessor &accStyler, bool bCaseSensitive) {
+
+	int iParenthesesLevel = 0;		// Parenthese Level
+	int iColumn1Label = false;		// Label starts in Column 1
+
+	WordList &wlClarionKeywords = *wlKeywords[0];			// Clarion Keywords
+	WordList &wlCompilerDirectives = *wlKeywords[1];		// Compiler Directives
+	WordList &wlRuntimeExpressions = *wlKeywords[2];		// Runtime Expressions
+	WordList &wlBuiltInProcsFuncs = *wlKeywords[3];			// Builtin Procedures and Functions
+	WordList &wlStructsDataTypes = *wlKeywords[4];			// Structures and Data Types
+	WordList &wlAttributes = *wlKeywords[5];				// Procedure Attributes
+	WordList &wlStandardEquates = *wlKeywords[6];			// Standard Equates
+	WordList &wlLabelReservedWords = *wlKeywords[7];		// Clarion Reserved Keywords (Labels)
+	WordList &wlProcLabelReservedWords = *wlKeywords[8];	// Clarion Reserved Keywords (Procedure Labels)
+
+	const char wlProcReservedKeywordList[] = 
+	"PROCEDURE FUNCTION";
+	WordList wlProcReservedKeywords;
+	wlProcReservedKeywords.Set(wlProcReservedKeywordList);
+
+	const char wlCompilerKeywordList[] = 
+	"COMPILE OMIT";
+	WordList wlCompilerKeywords;
+	wlCompilerKeywords.Set(wlCompilerKeywordList);
+
+	const char wlLegacyStatementsList[] =
+	"BOF EOF FUNCTION POINTER SHARE";
+	WordList wlLegacyStatements;
+	wlLegacyStatements.Set(wlLegacyStatementsList);
+
+	StyleContext scDoc(uiStartPos, iLength, iInitStyle, accStyler);
+
+	// lex source code
+    for (; scDoc.More(); scDoc.Forward())
+	{
+		//
+		// Determine if the current state should terminate.
+		//
+
+		// Label State Handling
+		if (scDoc.state == SCE_CLW_LABEL) {
+			// If the character is not a valid label
+			if (!IsALabelCharacter(scDoc.ch)) {
+				// If the character is a . (dot syntax)
+				if (scDoc.ch == '.') {
+					// Turn off column 1 label flag as label now cannot be reserved work
+					iColumn1Label = false;
+					// Uncolour the . (dot) to default state, move forward one character,
+					// and change back to the label state.
+					scDoc.SetState(SCE_CLW_DEFAULT);
+					scDoc.Forward();
+					scDoc.SetState(SCE_CLW_LABEL);
+				}
+				// Else check label
+				else {
+					char cLabel[512];		// Label buffer
+					// Buffer the current label string
+					scDoc.GetCurrent(cLabel,sizeof(cLabel));
+					// If case insensitive, convert string to UPPERCASE to match passed keywords.
+					if (!bCaseSensitive) {
+						StringUpper(cLabel);
+					}
+					// Else if UPPERCASE label string is in the Clarion compiler keyword list
+					if (wlCompilerKeywords.InList(cLabel) && iColumn1Label){
+						// change the label to error state
+						scDoc.ChangeState(SCE_CLW_COMPILER_DIRECTIVE);
+					}
+					// Else if UPPERCASE label string is in the Clarion reserved keyword list
+					else if (wlLabelReservedWords.InList(cLabel) && iColumn1Label){
+						// change the label to error state
+						scDoc.ChangeState(SCE_CLW_ERROR);
+					}
+					// Else if UPPERCASE label string is 
+					else if (wlProcLabelReservedWords.InList(cLabel) && iColumn1Label) {
+						char cWord[512];	// Word buffer
+						// Get the next word from the current position
+						if (GetNextWordUpper(accStyler,scDoc.currentPos,uiStartPos+iLength,cWord)) {
+							// If the next word is a procedure reserved word
+							if (wlProcReservedKeywords.InList(cWord)) {
+								// Change the label to error state
+								scDoc.ChangeState(SCE_CLW_ERROR);
+							}
+						}
+					}
+					// Else if label string is in the compiler directive keyword list
+					else if (wlCompilerDirectives.InList(cLabel)) {
+						// change the state to compiler directive state
+						scDoc.ChangeState(SCE_CLW_COMPILER_DIRECTIVE);
+					}
+					// Terminate the label state and set to default state
+					scDoc.SetState(SCE_CLW_DEFAULT);
+				}
+			}
+		}
+		// Keyword State Handling
+		else if (scDoc.state == SCE_CLW_KEYWORD) {
+			// If character is : (colon)
+			if (scDoc.ch == ':') {
+				char cEquate[512];		// Equate buffer
+				// Move forward to include : (colon) in buffer
+				scDoc.Forward();
+				// Buffer the equate string
+				scDoc.GetCurrent(cEquate,sizeof(cEquate));
+				// If case insensitive, convert string to UPPERCASE to match passed keywords.
+				if (!bCaseSensitive) {
+					StringUpper(cEquate);
+				}
+				// If statement string is in the equate list
+				if (wlStandardEquates.InList(cEquate)) {
+					// Change to equate state
+					scDoc.ChangeState(SCE_CLW_STANDARD_EQUATE);
+				}
+			}
+			// If the character is not a valid label character
+			else if (!IsALabelCharacter(scDoc.ch)) {
+				char cStatement[512];		// Statement buffer
+				// Buffer the statement string
+				scDoc.GetCurrent(cStatement,sizeof(cStatement));
+				// If case insensitive, convert string to UPPERCASE to match passed keywords.
+				if (!bCaseSensitive) {
+					StringUpper(cStatement);
+				}
+				// If statement string is in the Clarion keyword list
+				if (wlClarionKeywords.InList(cStatement)) {
+					// Change the statement string to the Clarion keyword state
+					scDoc.ChangeState(SCE_CLW_KEYWORD);
+				}
+				// Else if statement string is in the compiler directive keyword list
+				else if (wlCompilerDirectives.InList(cStatement)) {
+					// Change the statement string to the compiler directive state
+					scDoc.ChangeState(SCE_CLW_COMPILER_DIRECTIVE);
+				}
+				// Else if statement string is in the runtime expressions keyword list
+				else if (wlRuntimeExpressions.InList(cStatement)) {
+					// Change the statement string to the runtime expressions state
+					scDoc.ChangeState(SCE_CLW_RUNTIME_EXPRESSIONS);
+				}
+				// Else if statement string is in the builtin procedures and functions keyword list
+				else if (wlBuiltInProcsFuncs.InList(cStatement)) {
+					// Change the statement string to the builtin procedures and functions state
+					scDoc.ChangeState(SCE_CLW_BUILTIN_PROCEDURES_FUNCTION);
+				}
+				// Else if statement string is in the tructures and data types keyword list
+				else if (wlStructsDataTypes.InList(cStatement)) {
+					// Change the statement string to the structures and data types state
+					scDoc.ChangeState(SCE_CLW_STRUCTURE_DATA_TYPE);
+				}
+				// Else if statement string is in the procedure attribute keyword list
+				else if (wlAttributes.InList(cStatement)) {
+					// Change the statement string to the procedure attribute state
+					scDoc.ChangeState(SCE_CLW_ATTRIBUTE);
+				}
+				// Else if statement string is in the standard equate keyword list
+				else if (wlStandardEquates.InList(cStatement)) {
+					// Change the statement string to the standard equate state
+					scDoc.ChangeState(SCE_CLW_STANDARD_EQUATE);
+				}
+				// Else if statement string is in the deprecated or legacy keyword list
+				else if (wlLegacyStatements.InList(cStatement)) {
+					// Change the statement string to the standard equate state
+					scDoc.ChangeState(SCE_CLW_DEPRECATED);
+				}
+				// Else the statement string doesn't match any work list
+				else {
+					// Change the statement string to the default state
+					scDoc.ChangeState(SCE_CLW_DEFAULT);
+				}
+				// Terminate the keyword state and set to default state
+				scDoc.SetState(SCE_CLW_DEFAULT);
+			}
+		}
+		// String State Handling
+		else if (scDoc.state == SCE_CLW_STRING) {
+			// If the character is an ' (single quote)
+			if (scDoc.ch == '\'') {
+				// Set the state to default and move forward colouring
+				// the ' (single quote) as default state
+				// terminating the string state
+				scDoc.SetState(SCE_CLW_DEFAULT);
+				scDoc.Forward();
+			}
+			// If the next character is an ' (single quote)
+			if (scDoc.chNext == '\'') {
+				// Move forward one character and set to default state
+				// colouring the next ' (single quote) as default state
+				// terminating the string state
+				scDoc.ForwardSetState(SCE_CLW_DEFAULT);
+				scDoc.Forward();
+			}
+		}
+		// Picture String State Handling
+		else if (scDoc.state == SCE_CLW_PICTURE_STRING) {
+			// If the character is an ( (open parenthese)
+			if (scDoc.ch == '(') {
+				// Increment the parenthese level
+				iParenthesesLevel++;
+			}
+			// Else if the character is a ) (close parenthese) 
+			else if (scDoc.ch == ')') {
+				// If the parenthese level is set to zero
+				// parentheses matched
+				if (!iParenthesesLevel) {
+					scDoc.SetState(SCE_CLW_DEFAULT);
+				} 
+				// Else parenthese level is greater than zero
+				// still looking for matching parentheses
+				else {
+					// Decrement the parenthese level
+					iParenthesesLevel--;
+				}
+			}
+		}
+		// Standard Equate State Handling
+		else if (scDoc.state == SCE_CLW_STANDARD_EQUATE) {
+			if (!isalnum(scDoc.ch)) {
+				scDoc.SetState(SCE_CLW_DEFAULT);
+			}
+		}
+		// Integer Constant State Handling
+		else if (scDoc.state == SCE_CLW_INTEGER_CONSTANT) {
+			// If the character is not a digit (0-9)
+			// or character is not a hexidecimal character (A-F)
+			// or character is not a . (point)
+			// or character is not a numberic base character (B,O,H)
+			if (!(isdigit(scDoc.ch)
+			|| IsAHexCharacter(scDoc.ch, bCaseSensitive)
+			|| scDoc.ch == '.'
+			|| IsANumericBaseCharacter(scDoc.ch, bCaseSensitive))) {
+				// If the number was a real 
+				if (SetNumericConstantState(scDoc)) {
+					// Colour the matched string to the real constant state
+					scDoc.ChangeState(SCE_CLW_REAL_CONSTANT);
+				}
+				// Else the number was an integer
+				else {
+					// Colour the matched string to an integer constant state
+					scDoc.ChangeState(SCE_CLW_INTEGER_CONSTANT);
+				}
+				// Terminate the integer constant state and set to default state
+				scDoc.SetState(SCE_CLW_DEFAULT);
+			}
+		}
+
+		//
+		// Determine if a new state should be entered.
+		//
+
+		// Beginning of Line Handling
+		if (scDoc.atLineStart) {
+			// Reset the column 1 label flag
+			iColumn1Label = false;
+			// If column 1 character is a label start character
+			if (IsALabelStart(scDoc.ch)) {
+				// Label character is found in column 1
+				// so set column 1 label flag and clear last column 1 label
+				iColumn1Label = true;
+				// Set the state to label
+				scDoc.SetState(SCE_CLW_LABEL);
+			}
+			// else if character is a space or tab
+			else if (IsASpace(scDoc.ch)){
+				// Set to default state
+				scDoc.SetState(SCE_CLW_DEFAULT);
+			}
+			// else if comment start (!) or is an * (asterisk)
+			else if (IsACommentStart(scDoc.ch) || scDoc.ch == '*' ) {
+				// then set the state to comment.
+				scDoc.SetState(SCE_CLW_COMMENT);
+			}
+			// else the character is a ? (question mark)
+			else if (scDoc.ch == '?') {
+				// Change to the compiler directive state, move forward,
+				// colouring the ? (question mark), change back to default state.
+				scDoc.ChangeState(SCE_CLW_COMPILER_DIRECTIVE);
+				scDoc.Forward();
+				scDoc.SetState(SCE_CLW_DEFAULT);
+			}
+			// else an invalid character in column 1
+			else {
+				// Set to error state
+				scDoc.SetState(SCE_CLW_ERROR);
+			}
+		}
+		// End of Line Handling
+		else if (scDoc.atLineEnd) {
+			// Reset to the default state at the end of each line.
+			scDoc.SetState(SCE_CLW_DEFAULT);
+		}
+		// Default Handling
+		else {
+			// If in default state 
+			if (scDoc.state == SCE_CLW_DEFAULT) {
+				// If is a letter could be a possible statement
+				if (isalpha(scDoc.ch)) {
+					// Set the state to Clarion Keyword and verify later
+					scDoc.SetState(SCE_CLW_KEYWORD);
+				}
+				// else is a number
+				else if (isdigit(scDoc.ch)) {
+					// Set the state to Integer Constant and verify later
+					scDoc.SetState(SCE_CLW_INTEGER_CONSTANT);
+				}
+				// else if the start of a comment or a | (line continuation)
+				else if (IsACommentStart(scDoc.ch) || scDoc.ch == '|') {
+					// then set the state to comment.
+					scDoc.SetState(SCE_CLW_COMMENT);
+				}		
+				// else if the character is a ' (single quote)
+				else if (scDoc.ch == '\'') {
+					// If the character is also a ' (single quote) 
+					// Embedded Apostrophe
+					if (scDoc.chNext == '\'') {
+						// Move forward colouring it as default state
+						scDoc.ForwardSetState(SCE_CLW_DEFAULT);
+					}
+					else {
+						// move to the next character and then set the state to comment.
+						scDoc.ForwardSetState(SCE_CLW_STRING);
+					}
+				}		
+				// else the character is an @ (ampersand)
+				else if (scDoc.ch == '@') {
+					// Case insensitive.
+					if (!bCaseSensitive) {
+						// If character is a valid picture token character
+						if (strchr("DEKNPSTdeknpst", scDoc.chNext) != NULL) {
+							// Set to the picture string state
+							scDoc.SetState(SCE_CLW_PICTURE_STRING);
+						}
+					}
+					// Case sensitive
+					else {
+						// If character is a valid picture token character
+						if (strchr("DEKNPST", scDoc.chNext) != NULL) {
+							// Set the picture string state
+							scDoc.SetState(SCE_CLW_PICTURE_STRING);
+						}
+					}
+				}		
+			}
+		}
+	}
+	// lexing complete
+	scDoc.Complete();
+}
+
+// Clarion Language Case Sensitive Colouring Procedure
+static void ColouriseClarionDocSensitive(unsigned int uiStartPos, int iLength, int iInitStyle, WordList *wlKeywords[], Accessor &accStyler) {
+
+	ColouriseClarionDoc(uiStartPos, iLength, iInitStyle, wlKeywords, accStyler, true);
+}
+
+// Clarion Language Case Insensitive Colouring Procedure
+static void ColouriseClarionDocInsensitive(unsigned int uiStartPos, int iLength, int iInitStyle, WordList *wlKeywords[], Accessor &accStyler) {
+
+	ColouriseClarionDoc(uiStartPos, iLength, iInitStyle, wlKeywords, accStyler, false);
+}
+
+// Fill Buffer
+
+static void FillBuffer(unsigned int uiStart, unsigned int uiEnd, Accessor &accStyler, char *szBuffer, unsigned int uiLength) {
+
+	unsigned int uiPos = 0;
+
+	while ((uiPos < uiEnd - uiStart + 1) && (uiPos < uiLength-1)) {
+		szBuffer[uiPos] = static_cast<char>(toupper(accStyler[uiStart + uiPos]));
+		uiPos++;
+	}
+	szBuffer[uiPos] = '\0';
+}
+
+// Classify Clarion Fold Point
+
+static int ClassifyClarionFoldPoint(int iLevel, const char* szString) {
+
+	if (!(isdigit(szString[0]) || (szString[0] == '.'))) {
+		if (strcmp(szString, "PROCEDURE") == 0) {
+	//		iLevel = SC_FOLDLEVELBASE + 1;
+		}
+		else if (strcmp(szString, "MAP") == 0 ||
+			strcmp(szString,"ACCEPT") == 0 ||
+			strcmp(szString,"BEGIN") == 0 ||
+			strcmp(szString,"CASE") == 0 ||
+			strcmp(szString,"EXECUTE") == 0 ||
+			strcmp(szString,"IF") == 0 ||
+			strcmp(szString,"ITEMIZE") == 0 ||
+			strcmp(szString,"INTERFACE") == 0 ||
+			strcmp(szString,"JOIN") == 0 ||
+			strcmp(szString,"LOOP") == 0 ||
+			strcmp(szString,"MODULE") == 0 ||
+			strcmp(szString,"RECORD") == 0) {
+			iLevel++;
+		}
+		else if (strcmp(szString, "APPLICATION") == 0 ||
+			strcmp(szString, "CLASS") == 0 ||
+			strcmp(szString, "DETAIL") == 0 ||
+			strcmp(szString, "FILE") == 0 ||
+			strcmp(szString, "FOOTER") == 0 ||
+			strcmp(szString, "FORM") == 0 ||
+			strcmp(szString, "GROUP") == 0 ||
+			strcmp(szString, "HEADER") == 0 ||
+			strcmp(szString, "INTERFACE") == 0 ||
+			strcmp(szString, "MENU") == 0 ||
+			strcmp(szString, "MENUBAR") == 0 ||
+			strcmp(szString, "OLE") == 0 ||
+			strcmp(szString, "OPTION") == 0 ||
+			strcmp(szString, "QUEUE") == 0 ||
+			strcmp(szString, "REPORT") == 0 ||
+			strcmp(szString, "SHEET") == 0 ||
+			strcmp(szString, "TAB") == 0 ||
+			strcmp(szString, "TOOLBAR") == 0 ||
+			strcmp(szString, "VIEW") == 0 ||
+			strcmp(szString, "WINDOW") == 0) {
+			iLevel++;
+		}
+		else if (strcmp(szString, "END") == 0 ||
+			strcmp(szString, "UNTIL") == 0 ||
+			strcmp(szString, "WHILE") == 0) {
+			iLevel--;
+		}
+	}
+	return(iLevel);
+}
+
+// Clarion Language Folding Procedure
+static void FoldClarionDoc(unsigned int uiStartPos, int iLength, int iInitStyle, WordList *[], Accessor &accStyler) {
+
+	unsigned int uiEndPos = uiStartPos + iLength;
+	int iLineCurrent = accStyler.GetLine(uiStartPos);
+	int iLevelPrev = accStyler.LevelAt(iLineCurrent) & SC_FOLDLEVELNUMBERMASK;
+	int iLevelCurrent = iLevelPrev;
+	char chNext = accStyler[uiStartPos];
+	int iStyle = iInitStyle;
+	int iStyleNext = accStyler.StyleAt(uiStartPos);
+	int iVisibleChars = 0;
+	int iLastStart = 0;
+
+	for (unsigned int uiPos = uiStartPos; uiPos < uiEndPos; uiPos++) {
+
+		char chChar = chNext;
+		chNext = accStyler.SafeGetCharAt(uiPos + 1);
+		int iStylePrev = iStyle;
+		iStyle = iStyleNext;
+		iStyleNext = accStyler.StyleAt(uiPos + 1);
+		bool bEOL = (chChar == '\r' && chNext != '\n') || (chChar == '\n');
+	
+		if (iStylePrev == SCE_CLW_DEFAULT) {
+			if (iStyle == SCE_CLW_KEYWORD || iStyle == SCE_CLW_STRUCTURE_DATA_TYPE) {
+				// Store last word start point.
+				iLastStart = uiPos;
+			}
+		}
+
+		if (iStylePrev == SCE_CLW_KEYWORD || iStylePrev == SCE_CLW_STRUCTURE_DATA_TYPE) {
+			if(iswordchar(chChar) && !iswordchar(chNext)) {
+				char chBuffer[100];
+				FillBuffer(iLastStart, uiPos, accStyler, chBuffer, sizeof(chBuffer));
+				iLevelCurrent = ClassifyClarionFoldPoint(iLevelCurrent,chBuffer);
+			//	if ((iLevelCurrent == SC_FOLDLEVELBASE + 1) && iLineCurrent > 1) {
+			//		accStyler.SetLevel(iLineCurrent-1,SC_FOLDLEVELBASE);
+			//		iLevelPrev = SC_FOLDLEVELBASE;
+			//	}
+			}
+		}
+
+		if (bEOL) {
+			int iLevel = iLevelPrev;
+			if ((iLevelCurrent > iLevelPrev) && (iVisibleChars > 0))
+				iLevel |= SC_FOLDLEVELHEADERFLAG;
+			if (iLevel != accStyler.LevelAt(iLineCurrent)) {
+				accStyler.SetLevel(iLineCurrent,iLevel);
+			}
+			iLineCurrent++;
+			iLevelPrev = iLevelCurrent;
+			iVisibleChars = 0;
+		}
+		
+		if (!isspacechar(chChar))
+			iVisibleChars++;
+	}
+
+	// Fill in the real level of the next line, keeping the current flags
+	// as they will be filled in later.
+	int iFlagsNext = accStyler.LevelAt(iLineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+	accStyler.SetLevel(iLineCurrent, iLevelPrev | iFlagsNext);
+}
+
+// Word List Descriptions
+static const char * const rgWordListDescriptions[] = {
+	"Clarion Keywords",
+	"Compiler Directives",
+	"Built-in Procedures and Functions",
+	"Runtime Expressions",
+	"Structure and Data Types",
+	"Attributes",
+	"Standard Equates",
+	"Reserved Words (Labels)",
+	"Reserved Words (Procedure Labels)",
+	0,
+};
+
+// Case Sensitive Clarion Language Lexer
+LexerModule lmClw(SCLEX_CLW, ColouriseClarionDocSensitive, "clarion", FoldClarionDoc, rgWordListDescriptions);
+
+// Case Insensitive Clarion Language Lexer
+LexerModule lmClwNoCase(SCLEX_CLWNOCASE, ColouriseClarionDocInsensitive, "clarionnocase", FoldClarionDoc, rgWordListDescriptions);
diff --git a/Documents/Scintilla/LexCPP.cxx b/Documents/Scintilla/LexCPP.cxx
new file mode 100644
index 0000000..c2933f4
--- /dev/null
+++ b/Documents/Scintilla/LexCPP.cxx
@@ -0,0 +1,470 @@
+// Scintilla source code edit control
+/** @file LexCPP.cxx
+ ** Lexer for C++, C, Java, and JavaScript.
+ **/
+// Copyright 1998-2005 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+#include "CharacterSet.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+static bool IsSpaceEquiv(int state) {
+	return (state <= SCE_C_COMMENTDOC) ||
+		// including SCE_C_DEFAULT, SCE_C_COMMENT, SCE_C_COMMENTLINE
+		(state == SCE_C_COMMENTLINEDOC) || (state == SCE_C_COMMENTDOCKEYWORD) ||
+		(state == SCE_C_COMMENTDOCKEYWORDERROR);
+}
+
+// Preconditions: sc.currentPos points to a character after '+' or '-'.
+// The test for pos reaching 0 should be redundant,
+// and is in only for safety measures.
+// Limitation: this code will give the incorrect answer for code like
+// a = b+++/ptn/...
+// Putting a space between the '++' post-inc operator and the '+' binary op
+// fixes this, and is highly recommended for readability anyway.
+static bool FollowsPostfixOperator(StyleContext &sc, Accessor &styler) {
+	int pos = (int) sc.currentPos;
+	while (--pos > 0) {
+		char ch = styler[pos];
+		if (ch == '+' || ch == '-') {
+			return styler[pos - 1] == ch;
+		}
+	}
+	return false;
+}
+
+static void ColouriseCppDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
+                            Accessor &styler, bool caseSensitive) {
+
+	WordList &keywords = *keywordlists[0];
+	WordList &keywords2 = *keywordlists[1];
+	WordList &keywords3 = *keywordlists[2];
+	WordList &keywords4 = *keywordlists[3];
+
+	bool stylingWithinPreprocessor = styler.GetPropertyInt("styling.within.preprocessor") != 0;
+
+	CharacterSet setOKBeforeRE(CharacterSet::setNone, "([{=,:;!%^&*|?~+-");
+	CharacterSet setCouldBePostOp(CharacterSet::setNone, "+-");
+
+	CharacterSet setDoxygen(CharacterSet::setAlpha, "$@\\&<>#{}[]");
+
+	CharacterSet setWordStart(CharacterSet::setAlpha, "_", 0x80, true);
+	CharacterSet setWord(CharacterSet::setAlphaNum, "._", 0x80, true);
+	if (styler.GetPropertyInt("lexer.cpp.allow.dollars", 1) != 0) {
+		setWordStart.Add('$');
+		setWord.Add('$');
+	}
+
+	int chPrevNonWhite = ' ';
+	int visibleChars = 0;
+	bool lastWordWasUUID = false;
+	int styleBeforeDCKeyword = SCE_C_DEFAULT;
+	bool continuationLine = false;
+
+	if (initStyle == SCE_C_PREPROCESSOR) {
+		// Set continuationLine if last character of previous line is '\'
+		int lineCurrent = styler.GetLine(startPos);
+		if (lineCurrent > 0) {
+			int chBack = styler.SafeGetCharAt(startPos-1, 0);
+			int chBack2 = styler.SafeGetCharAt(startPos-2, 0);
+			int lineEndChar = '!';
+			if (chBack2 == '\r' && chBack == '\n') {
+				lineEndChar = styler.SafeGetCharAt(startPos-3, 0);
+			} else if (chBack == '\n' || chBack == '\r') {
+				lineEndChar = chBack2;
+			}
+			continuationLine = lineEndChar == '\\';
+		}
+	}
+
+	// look back to set chPrevNonWhite properly for better regex colouring
+	if (startPos > 0) {
+		int back = startPos;
+		while (--back && IsSpaceEquiv(styler.StyleAt(back)))
+			;
+		if (styler.StyleAt(back) == SCE_C_OPERATOR) {
+			chPrevNonWhite = styler.SafeGetCharAt(back);
+		}
+	}
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	for (; sc.More(); sc.Forward()) {
+
+		if (sc.atLineStart) {
+			if (sc.state == SCE_C_STRING) {
+				// Prevent SCE_C_STRINGEOL from leaking back to previous line which
+				// ends with a line continuation by locking in the state upto this position.
+				sc.SetState(SCE_C_STRING);
+			}
+			// Reset states to begining of colourise so no surprises
+			// if different sets of lines lexed.
+			visibleChars = 0;
+			lastWordWasUUID = false;
+		}
+
+		// Handle line continuation generically.
+		if (sc.ch == '\\') {
+			if (sc.chNext == '\n' || sc.chNext == '\r') {
+				sc.Forward();
+				if (sc.ch == '\r' && sc.chNext == '\n') {
+					sc.Forward();
+				}
+				continuationLine = true;
+				continue;
+			}
+		}
+
+		// Determine if the current state should terminate.
+		switch (sc.state) {
+			case SCE_C_OPERATOR:
+				sc.SetState(SCE_C_DEFAULT);
+				break;
+			case SCE_C_NUMBER:
+				// We accept almost anything because of hex. and number suffixes
+				if (!setWord.Contains(sc.ch)) {
+					sc.SetState(SCE_C_DEFAULT);
+				}
+				break;
+			case SCE_C_IDENTIFIER:
+				if (!setWord.Contains(sc.ch) || (sc.ch == '.')) {
+					char s[1000];
+					if (caseSensitive) {
+						sc.GetCurrent(s, sizeof(s));
+					} else {
+						sc.GetCurrentLowered(s, sizeof(s));
+					}
+					if (keywords.InList(s)) {
+						lastWordWasUUID = strcmp(s, "uuid") == 0;
+						sc.ChangeState(SCE_C_WORD);
+					} else if (keywords2.InList(s)) {
+						sc.ChangeState(SCE_C_WORD2);
+					} else if (keywords4.InList(s)) {
+						sc.ChangeState(SCE_C_GLOBALCLASS);
+					}
+					sc.SetState(SCE_C_DEFAULT);
+				}
+				break;
+			case SCE_C_PREPROCESSOR:
+				if (sc.atLineStart && !continuationLine) {
+					sc.SetState(SCE_C_DEFAULT);
+				} else if (stylingWithinPreprocessor) {
+					if (IsASpace(sc.ch)) {
+						sc.SetState(SCE_C_DEFAULT);
+					}
+				} else {
+					if (sc.Match('/', '*') || sc.Match('/', '/')) {
+						sc.SetState(SCE_C_DEFAULT);
+					}
+				}
+				break;
+			case SCE_C_COMMENT:
+				if (sc.Match('*', '/')) {
+					sc.Forward();
+					sc.ForwardSetState(SCE_C_DEFAULT);
+				}
+				break;
+			case SCE_C_COMMENTDOC:
+				if (sc.Match('*', '/')) {
+					sc.Forward();
+					sc.ForwardSetState(SCE_C_DEFAULT);
+				} else if (sc.ch == '@' || sc.ch == '\\') { // JavaDoc and Doxygen support
+					// Verify that we have the conditions to mark a comment-doc-keyword
+					if ((IsASpace(sc.chPrev) || sc.chPrev == '*') && (!IsASpace(sc.chNext))) {
+						styleBeforeDCKeyword = SCE_C_COMMENTDOC;
+						sc.SetState(SCE_C_COMMENTDOCKEYWORD);
+					}
+				}
+				break;
+			case SCE_C_COMMENTLINE:
+				if (sc.atLineStart) {
+					sc.SetState(SCE_C_DEFAULT);
+				}
+				break;
+			case SCE_C_COMMENTLINEDOC:
+				if (sc.atLineStart) {
+					sc.SetState(SCE_C_DEFAULT);
+				} else if (sc.ch == '@' || sc.ch == '\\') { // JavaDoc and Doxygen support
+					// Verify that we have the conditions to mark a comment-doc-keyword
+					if ((IsASpace(sc.chPrev) || sc.chPrev == '/' || sc.chPrev == '!') && (!IsASpace(sc.chNext))) {
+						styleBeforeDCKeyword = SCE_C_COMMENTLINEDOC;
+						sc.SetState(SCE_C_COMMENTDOCKEYWORD);
+					}
+				}
+				break;
+			case SCE_C_COMMENTDOCKEYWORD:
+				if ((styleBeforeDCKeyword == SCE_C_COMMENTDOC) && sc.Match('*', '/')) {
+					sc.ChangeState(SCE_C_COMMENTDOCKEYWORDERROR);
+					sc.Forward();
+					sc.ForwardSetState(SCE_C_DEFAULT);
+				} else if (!setDoxygen.Contains(sc.ch)) {
+					char s[100];
+					if (caseSensitive) {
+						sc.GetCurrent(s, sizeof(s));
+					} else {
+						sc.GetCurrentLowered(s, sizeof(s));
+					}
+					if (!IsASpace(sc.ch) || !keywords3.InList(s + 1)) {
+						sc.ChangeState(SCE_C_COMMENTDOCKEYWORDERROR);
+					}
+					sc.SetState(styleBeforeDCKeyword);
+				}
+				break;
+			case SCE_C_STRING:
+				if (sc.atLineEnd) {
+					sc.ChangeState(SCE_C_STRINGEOL);
+				} else if (sc.ch == '\\') {
+					if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
+						sc.Forward();
+					}
+				} else if (sc.ch == '\"') {
+					sc.ForwardSetState(SCE_C_DEFAULT);
+				}
+				break;
+			case SCE_C_CHARACTER:
+				if (sc.atLineEnd) {
+					sc.ChangeState(SCE_C_STRINGEOL);
+				} else if (sc.ch == '\\') {
+					if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
+						sc.Forward();
+					}
+				} else if (sc.ch == '\'') {
+					sc.ForwardSetState(SCE_C_DEFAULT);
+				}
+				break;
+			case SCE_C_REGEX:
+				if (sc.atLineStart) {
+					sc.SetState(SCE_C_DEFAULT);
+				} else if (sc.ch == '/') {
+					sc.Forward();
+					while ((sc.ch < 0x80) && islower(sc.ch))
+						sc.Forward();    // gobble regex flags
+					sc.SetState(SCE_C_DEFAULT);
+				} else if (sc.ch == '\\') {
+					// Gobble up the quoted character
+					if (sc.chNext == '\\' || sc.chNext == '/') {
+						sc.Forward();
+					}
+				}
+				break;
+			case SCE_C_STRINGEOL:
+				if (sc.atLineStart) {
+					sc.SetState(SCE_C_DEFAULT);
+				}
+				break;
+			case SCE_C_VERBATIM:
+				if (sc.ch == '\"') {
+					if (sc.chNext == '\"') {
+						sc.Forward();
+					} else {
+						sc.ForwardSetState(SCE_C_DEFAULT);
+					}
+				}
+				break;
+			case SCE_C_UUID:
+				if (sc.ch == '\r' || sc.ch == '\n' || sc.ch == ')') {
+					sc.SetState(SCE_C_DEFAULT);
+				}
+		}
+
+		// Determine if a new state should be entered.
+		if (sc.state == SCE_C_DEFAULT) {
+			if (sc.Match('@', '\"')) {
+				sc.SetState(SCE_C_VERBATIM);
+				sc.Forward();
+			} else if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
+				if (lastWordWasUUID) {
+					sc.SetState(SCE_C_UUID);
+					lastWordWasUUID = false;
+				} else {
+					sc.SetState(SCE_C_NUMBER);
+				}
+			} else if (setWordStart.Contains(sc.ch) || (sc.ch == '@')) {
+				if (lastWordWasUUID) {
+					sc.SetState(SCE_C_UUID);
+					lastWordWasUUID = false;
+				} else {
+					sc.SetState(SCE_C_IDENTIFIER);
+				}
+			} else if (sc.Match('/', '*')) {
+				if (sc.Match("/**") || sc.Match("/*!")) {	// Support of Qt/Doxygen doc. style
+					sc.SetState(SCE_C_COMMENTDOC);
+				} else {
+					sc.SetState(SCE_C_COMMENT);
+				}
+				sc.Forward();	// Eat the * so it isn't used for the end of the comment
+			} else if (sc.Match('/', '/')) {
+				if ((sc.Match("///") && !sc.Match("////")) || sc.Match("//!"))
+					// Support of Qt/Doxygen doc. style
+					sc.SetState(SCE_C_COMMENTLINEDOC);
+				else
+					sc.SetState(SCE_C_COMMENTLINE);
+			} else if (sc.ch == '/' && setOKBeforeRE.Contains(chPrevNonWhite) &&
+				(!setCouldBePostOp.Contains(chPrevNonWhite) || !FollowsPostfixOperator(sc, styler))) {
+				sc.SetState(SCE_C_REGEX);	// JavaScript's RegEx
+			} else if (sc.ch == '\"') {
+				sc.SetState(SCE_C_STRING);
+			} else if (sc.ch == '\'') {
+				sc.SetState(SCE_C_CHARACTER);
+			} else if (sc.ch == '#' && visibleChars == 0) {
+				// Preprocessor commands are alone on their line
+				sc.SetState(SCE_C_PREPROCESSOR);
+				// Skip whitespace between # and preprocessor word
+				do {
+					sc.Forward();
+				} while ((sc.ch == ' ' || sc.ch == '\t') && sc.More());
+				if (sc.atLineEnd) {
+					sc.SetState(SCE_C_DEFAULT);
+				}
+			} else if (isoperator(static_cast<char>(sc.ch))) {
+				sc.SetState(SCE_C_OPERATOR);
+			}
+		}
+
+		if (!IsASpace(sc.ch) && !IsSpaceEquiv(sc.state)) {
+			chPrevNonWhite = sc.ch;
+			visibleChars++;
+		}
+		continuationLine = false;
+	}
+	sc.Complete();
+}
+
+static bool IsStreamCommentStyle(int style) {
+	return style == SCE_C_COMMENT ||
+		style == SCE_C_COMMENTDOC ||
+		style == SCE_C_COMMENTDOCKEYWORD ||
+		style == SCE_C_COMMENTDOCKEYWORDERROR;
+}
+
+// Store both the current line's fold level and the next lines in the
+// level store to make it easy to pick up with each increment
+// and to make it possible to fiddle the current level for "} else {".
+static void FoldCppDoc(unsigned int startPos, int length, int initStyle,
+					   WordList *[], Accessor &styler) {
+	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
+	bool foldPreprocessor = styler.GetPropertyInt("fold.preprocessor") != 0;
+	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	bool foldAtElse = styler.GetPropertyInt("fold.at.else", 0) != 0;
+	unsigned int endPos = startPos + length;
+	int visibleChars = 0;
+	int lineCurrent = styler.GetLine(startPos);
+	int levelCurrent = SC_FOLDLEVELBASE;
+	if (lineCurrent > 0)
+		levelCurrent = styler.LevelAt(lineCurrent-1) >> 16;
+	int levelMinCurrent = levelCurrent;
+	int levelNext = levelCurrent;
+	char chNext = styler[startPos];
+	int styleNext = styler.StyleAt(startPos);
+	int style = initStyle;
+	for (unsigned int i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int stylePrev = style;
+		style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+		if (foldComment && IsStreamCommentStyle(style)) {
+			if (!IsStreamCommentStyle(stylePrev) && (stylePrev != SCE_C_COMMENTLINEDOC)) {
+				levelNext++;
+			} else if (!IsStreamCommentStyle(styleNext) && (styleNext != SCE_C_COMMENTLINEDOC) && !atEOL) {
+				// Comments don't end at end of line and the next character may be unstyled.
+				levelNext--;
+			}
+		}
+		if (foldComment && (style == SCE_C_COMMENTLINE)) {
+			if ((ch == '/') && (chNext == '/')) {
+				char chNext2 = styler.SafeGetCharAt(i + 2);
+				if (chNext2 == '{') {
+					levelNext++;
+				} else if (chNext2 == '}') {
+					levelNext--;
+				}
+			}
+		}
+		if (foldPreprocessor && (style == SCE_C_PREPROCESSOR)) {
+			if (ch == '#') {
+				unsigned int j = i + 1;
+				while ((j < endPos) && IsASpaceOrTab(styler.SafeGetCharAt(j))) {
+					j++;
+				}
+				if (styler.Match(j, "region") || styler.Match(j, "if")) {
+					levelNext++;
+				} else if (styler.Match(j, "end")) {
+					levelNext--;
+				}
+			}
+		}
+		if (style == SCE_C_OPERATOR) {
+			if (ch == '{') {
+				// Measure the minimum before a '{' to allow
+				// folding on "} else {"
+				if (levelMinCurrent > levelNext) {
+					levelMinCurrent = levelNext;
+				}
+				levelNext++;
+			} else if (ch == '}') {
+				levelNext--;
+			}
+		}
+		if (!IsASpace(ch))
+			visibleChars++;
+		if (atEOL || (i == endPos-1)) {
+			int levelUse = levelCurrent;
+			if (foldAtElse) {
+				levelUse = levelMinCurrent;
+			}
+			int lev = levelUse | levelNext << 16;
+			if (visibleChars == 0 && foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if (levelUse < levelNext)
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelCurrent = levelNext;
+			levelMinCurrent = levelCurrent;
+			visibleChars = 0;
+		}
+	}
+}
+
+static const char * const cppWordLists[] = {
+            "Primary keywords and identifiers",
+            "Secondary keywords and identifiers",
+            "Documentation comment keywords",
+            "Unused",
+            "Global classes and typedefs",
+            0,
+        };
+
+static void ColouriseCppDocSensitive(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
+                                     Accessor &styler) {
+	ColouriseCppDoc(startPos, length, initStyle, keywordlists, styler, true);
+}
+
+static void ColouriseCppDocInsensitive(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
+                                       Accessor &styler) {
+	ColouriseCppDoc(startPos, length, initStyle, keywordlists, styler, false);
+}
+
+LexerModule lmCPP(SCLEX_CPP, ColouriseCppDocSensitive, "cpp", FoldCppDoc, cppWordLists);
+LexerModule lmCPPNoCase(SCLEX_CPPNOCASE, ColouriseCppDocInsensitive, "cppnocase", FoldCppDoc, cppWordLists);
diff --git a/Documents/Scintilla/LexCSS.cxx b/Documents/Scintilla/LexCSS.cxx
new file mode 100644
index 0000000..3b139cd
--- /dev/null
+++ b/Documents/Scintilla/LexCSS.cxx
@@ -0,0 +1,363 @@
+// Scintilla source code edit control
+/** @file LexCSS.cxx
+ ** Lexer for Cascading Style Sheets
+ ** Written by Jakub Vrána
+ ** Improved by Philippe Lhoste (CSS2)
+ **/
+// Copyright 1998-2002 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+
+static inline bool IsAWordChar(const unsigned int ch) {
+	/* FIXME:
+	 * The CSS spec allows "ISO 10646 characters U+00A1 and higher" to be treated as word chars.
+	 * Unfortunately, we are only getting string bytes here, and not full unicode characters. We cannot guarantee
+	 * that our byte is between U+0080 - U+00A0 (to return false), so we have to allow all characters U+0080 and higher
+	 */
+	return ch >= 0x80 || isalnum(ch) || ch == '-' || ch == '_';
+}
+
+inline bool IsCssOperator(const int ch) {
+	if (!((ch < 0x80) && isalnum(ch)) &&
+		(ch == '{' || ch == '}' || ch == ':' || ch == ',' || ch == ';' ||
+		 ch == '.' || ch == '#' || ch == '!' || ch == '@' ||
+		 /* CSS2 */
+		 ch == '*' || ch == '>' || ch == '+' || ch == '=' || ch == '~' || ch == '|' ||
+		 ch == '[' || ch == ']' || ch == '(' || ch == ')')) {
+		return true;
+	}
+	return false;
+}
+
+static void ColouriseCssDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], Accessor &styler) {
+	WordList &css1Props = *keywordlists[0];
+	WordList &pseudoClasses = *keywordlists[1];
+	WordList &css2Props = *keywordlists[2];
+	WordList &css3Props = *keywordlists[3];
+	WordList &pseudoElements = *keywordlists[4];
+	WordList &exProps = *keywordlists[5];
+	WordList &exPseudoClasses = *keywordlists[6];
+	WordList &exPseudoElements = *keywordlists[7];
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	int lastState = -1; // before operator
+	int lastStateC = -1; // before comment
+	int op = ' '; // last operator
+	int opPrev = ' '; // last operator
+
+	for (; sc.More(); sc.Forward()) {
+		if (sc.state == SCE_CSS_COMMENT && sc.Match('*', '/')) {
+			if (lastStateC == -1) {
+				// backtrack to get last state:
+				// comments are like whitespace, so we must return to the previous state
+				unsigned int i = startPos;
+				for (; i > 0; i--) {
+					if ((lastStateC = styler.StyleAt(i-1)) != SCE_CSS_COMMENT) {
+						if (lastStateC == SCE_CSS_OPERATOR) {
+							op = styler.SafeGetCharAt(i-1);
+							opPrev = styler.SafeGetCharAt(i-2);
+							while (--i) {
+								lastState = styler.StyleAt(i-1);
+								if (lastState != SCE_CSS_OPERATOR && lastState != SCE_CSS_COMMENT)
+									break;
+							}
+							if (i == 0)
+								lastState = SCE_CSS_DEFAULT;
+						}
+						break;
+					}
+				}
+				if (i == 0)
+					lastStateC = SCE_CSS_DEFAULT;
+			}
+			sc.Forward();
+			sc.ForwardSetState(lastStateC);
+		}
+
+		if (sc.state == SCE_CSS_COMMENT)
+			continue;
+
+		if (sc.state == SCE_CSS_DOUBLESTRING || sc.state == SCE_CSS_SINGLESTRING) {
+			if (sc.ch != (sc.state == SCE_CSS_DOUBLESTRING ? '\"' : '\''))
+				continue;
+			unsigned int i = sc.currentPos;
+			while (i && styler[i-1] == '\\')
+				i--;
+			if ((sc.currentPos - i) % 2 == 1)
+				continue;
+			sc.ForwardSetState(SCE_CSS_VALUE);
+		}
+
+		if (sc.state == SCE_CSS_OPERATOR) {
+			if (op == ' ') {
+				unsigned int i = startPos;
+				op = styler.SafeGetCharAt(i-1);
+				opPrev = styler.SafeGetCharAt(i-2);
+				while (--i) {
+					lastState = styler.StyleAt(i-1);
+					if (lastState != SCE_CSS_OPERATOR && lastState != SCE_CSS_COMMENT)
+						break;
+				}
+			}
+			switch (op) {
+			case '@':
+				if (lastState == SCE_CSS_DEFAULT)
+					sc.SetState(SCE_CSS_DIRECTIVE);
+				break;
+			case '>':
+			case '+':
+				if (lastState == SCE_CSS_TAG || lastState == SCE_CSS_CLASS || lastState == SCE_CSS_ID ||
+					lastState == SCE_CSS_PSEUDOCLASS || lastState == SCE_CSS_EXTENDED_PSEUDOCLASS || lastState == SCE_CSS_UNKNOWN_PSEUDOCLASS)
+					sc.SetState(SCE_CSS_DEFAULT);
+				break;
+			case '[':
+				if (lastState == SCE_CSS_TAG || lastState == SCE_CSS_DEFAULT || lastState == SCE_CSS_CLASS || lastState == SCE_CSS_ID ||
+					lastState == SCE_CSS_PSEUDOCLASS || lastState == SCE_CSS_EXTENDED_PSEUDOCLASS || lastState == SCE_CSS_UNKNOWN_PSEUDOCLASS)
+					sc.SetState(SCE_CSS_ATTRIBUTE);
+				break;
+			case ']':
+				if (lastState == SCE_CSS_ATTRIBUTE)
+					sc.SetState(SCE_CSS_TAG);
+				break;
+			case '{':
+				if (lastState == SCE_CSS_DIRECTIVE)
+					sc.SetState(SCE_CSS_DEFAULT);
+				else if (lastState == SCE_CSS_TAG)
+					sc.SetState(SCE_CSS_IDENTIFIER);
+				break;
+			case '}':
+				if (lastState == SCE_CSS_DEFAULT || lastState == SCE_CSS_VALUE || lastState == SCE_CSS_IMPORTANT ||
+					lastState == SCE_CSS_IDENTIFIER || lastState == SCE_CSS_IDENTIFIER2 || lastState == SCE_CSS_IDENTIFIER3)
+					sc.SetState(SCE_CSS_DEFAULT);
+				break;
+			case '(':
+				if (lastState == SCE_CSS_PSEUDOCLASS)
+					sc.SetState(SCE_CSS_TAG);
+				else if (lastState == SCE_CSS_EXTENDED_PSEUDOCLASS)
+					sc.SetState(SCE_CSS_EXTENDED_PSEUDOCLASS);
+				break;
+			case ')':
+				if (lastState == SCE_CSS_TAG || lastState == SCE_CSS_DEFAULT || lastState == SCE_CSS_CLASS || lastState == SCE_CSS_ID ||
+					lastState == SCE_CSS_PSEUDOCLASS || lastState == SCE_CSS_EXTENDED_PSEUDOCLASS || lastState == SCE_CSS_UNKNOWN_PSEUDOCLASS ||
+					lastState == SCE_CSS_PSEUDOELEMENT || lastState == SCE_CSS_EXTENDED_PSEUDOELEMENT)
+					sc.SetState(SCE_CSS_TAG);
+				break;
+			case ':':
+				if (lastState == SCE_CSS_TAG || lastState == SCE_CSS_DEFAULT || lastState == SCE_CSS_CLASS || lastState == SCE_CSS_ID ||
+					lastState == SCE_CSS_PSEUDOCLASS || lastState == SCE_CSS_EXTENDED_PSEUDOCLASS || lastState == SCE_CSS_UNKNOWN_PSEUDOCLASS ||
+					lastState == SCE_CSS_PSEUDOELEMENT || lastState == SCE_CSS_EXTENDED_PSEUDOELEMENT)
+					sc.SetState(SCE_CSS_PSEUDOCLASS);
+				else if (lastState == SCE_CSS_IDENTIFIER || lastState == SCE_CSS_IDENTIFIER2 ||
+					lastState == SCE_CSS_IDENTIFIER3 || lastState == SCE_CSS_EXTENDED_IDENTIFIER ||
+					lastState == SCE_CSS_UNKNOWN_IDENTIFIER)
+					sc.SetState(SCE_CSS_VALUE);
+				break;
+			case '.':
+				if (lastState == SCE_CSS_TAG || lastState == SCE_CSS_DEFAULT || lastState == SCE_CSS_CLASS || lastState == SCE_CSS_ID ||
+					lastState == SCE_CSS_PSEUDOCLASS || lastState == SCE_CSS_EXTENDED_PSEUDOCLASS || lastState == SCE_CSS_UNKNOWN_PSEUDOCLASS)
+					sc.SetState(SCE_CSS_CLASS);
+				break;
+			case '#':
+				if (lastState == SCE_CSS_TAG || lastState == SCE_CSS_DEFAULT || lastState == SCE_CSS_CLASS || lastState == SCE_CSS_ID ||
+					lastState == SCE_CSS_PSEUDOCLASS || lastState == SCE_CSS_EXTENDED_PSEUDOCLASS || lastState == SCE_CSS_UNKNOWN_PSEUDOCLASS)
+					sc.SetState(SCE_CSS_ID);
+				break;
+			case ',':
+			case '|':
+			case '~':
+				if (lastState == SCE_CSS_TAG)
+					sc.SetState(SCE_CSS_DEFAULT);
+				break;
+			case ';':
+				if (lastState == SCE_CSS_DIRECTIVE)
+					sc.SetState(SCE_CSS_DEFAULT);
+				else if (lastState == SCE_CSS_VALUE || lastState == SCE_CSS_IMPORTANT)
+					sc.SetState(SCE_CSS_IDENTIFIER);
+				break;
+			case '!':
+				if (lastState == SCE_CSS_VALUE)
+					sc.SetState(SCE_CSS_IMPORTANT);
+				break;
+			}
+		}
+
+		if (IsAWordChar(sc.ch)) {
+			if (sc.state == SCE_CSS_DEFAULT)
+				sc.SetState(SCE_CSS_TAG);
+			continue;
+		}
+
+		if (sc.ch == '*' && sc.state == SCE_CSS_DEFAULT) {
+			sc.SetState(SCE_CSS_TAG);
+			continue;
+		}
+
+		if (IsAWordChar(sc.chPrev) && (
+			sc.state == SCE_CSS_IDENTIFIER || sc.state == SCE_CSS_IDENTIFIER2 ||
+			sc.state == SCE_CSS_IDENTIFIER3 || sc.state == SCE_CSS_EXTENDED_IDENTIFIER ||
+			sc.state == SCE_CSS_UNKNOWN_IDENTIFIER ||
+			sc.state == SCE_CSS_PSEUDOCLASS || sc.state == SCE_CSS_PSEUDOELEMENT ||
+			sc.state == SCE_CSS_EXTENDED_PSEUDOCLASS || sc.state == SCE_CSS_EXTENDED_PSEUDOELEMENT ||
+			sc.state == SCE_CSS_UNKNOWN_PSEUDOCLASS ||
+			sc.state == SCE_CSS_IMPORTANT
+		)) {
+			char s[100];
+			sc.GetCurrentLowered(s, sizeof(s));
+			char *s2 = s;
+			while (*s2 && !IsAWordChar(*s2))
+				s2++;
+			switch (sc.state) {
+			case SCE_CSS_IDENTIFIER:
+			case SCE_CSS_IDENTIFIER2:
+			case SCE_CSS_IDENTIFIER3:
+			case SCE_CSS_EXTENDED_IDENTIFIER:
+			case SCE_CSS_UNKNOWN_IDENTIFIER:
+				if (css1Props.InList(s2))
+					sc.ChangeState(SCE_CSS_IDENTIFIER);
+				else if (css2Props.InList(s2))
+					sc.ChangeState(SCE_CSS_IDENTIFIER2);
+				else if (css3Props.InList(s2))
+					sc.ChangeState(SCE_CSS_IDENTIFIER3);
+				else if (exProps.InList(s2))
+					sc.ChangeState(SCE_CSS_EXTENDED_IDENTIFIER);
+				else
+					sc.ChangeState(SCE_CSS_UNKNOWN_IDENTIFIER);
+				break;
+			case SCE_CSS_PSEUDOCLASS:
+			case SCE_CSS_PSEUDOELEMENT:
+			case SCE_CSS_EXTENDED_PSEUDOCLASS:
+			case SCE_CSS_EXTENDED_PSEUDOELEMENT:
+			case SCE_CSS_UNKNOWN_PSEUDOCLASS:
+				if (op == ':' && opPrev != ':' && pseudoClasses.InList(s2))
+					sc.ChangeState(SCE_CSS_PSEUDOCLASS);
+				else if (opPrev == ':' && pseudoElements.InList(s2))
+					sc.ChangeState(SCE_CSS_PSEUDOELEMENT);
+				else if ((op == ':' || (op == '(' && lastState == SCE_CSS_EXTENDED_PSEUDOCLASS)) && opPrev != ':' && exPseudoClasses.InList(s2))
+					sc.ChangeState(SCE_CSS_EXTENDED_PSEUDOCLASS);
+				else if (opPrev == ':' && exPseudoElements.InList(s2))
+					sc.ChangeState(SCE_CSS_EXTENDED_PSEUDOELEMENT);
+				else
+					sc.ChangeState(SCE_CSS_UNKNOWN_PSEUDOCLASS);
+				break;
+			case SCE_CSS_IMPORTANT:
+				if (strcmp(s2, "important") != 0)
+					sc.ChangeState(SCE_CSS_VALUE);
+				break;
+			}
+		}
+
+		if (sc.ch != '.' && sc.ch != ':' && sc.ch != '#' && (
+			sc.state == SCE_CSS_CLASS || sc.state == SCE_CSS_ID ||
+			(sc.ch != '(' && sc.ch != ')' && ( /* This line of the condition makes it possible to extend pseudo-classes with parentheses */
+				sc.state == SCE_CSS_PSEUDOCLASS || sc.state == SCE_CSS_PSEUDOELEMENT ||
+				sc.state == SCE_CSS_EXTENDED_PSEUDOCLASS || sc.state == SCE_CSS_EXTENDED_PSEUDOELEMENT ||
+				sc.state == SCE_CSS_UNKNOWN_PSEUDOCLASS
+			))
+		))
+			sc.SetState(SCE_CSS_TAG);
+
+		if (sc.Match('/', '*')) {
+			lastStateC = sc.state;
+			sc.SetState(SCE_CSS_COMMENT);
+			sc.Forward();
+		} else if (sc.state == SCE_CSS_VALUE && (sc.ch == '\"' || sc.ch == '\'')) {
+			sc.SetState((sc.ch == '\"' ? SCE_CSS_DOUBLESTRING : SCE_CSS_SINGLESTRING));
+		} else if (IsCssOperator(sc.ch)
+			&& (sc.state != SCE_CSS_ATTRIBUTE || sc.ch == ']')
+			&& (sc.state != SCE_CSS_VALUE || sc.ch == ';' || sc.ch == '}' || sc.ch == '!')
+			&& (sc.state != SCE_CSS_DIRECTIVE || sc.ch == ';' || sc.ch == '{')
+		) {
+			if (sc.state != SCE_CSS_OPERATOR)
+				lastState = sc.state;
+			sc.SetState(SCE_CSS_OPERATOR);
+			op = sc.ch;
+			opPrev = sc.chPrev;
+		}
+	}
+
+	sc.Complete();
+}
+
+static void FoldCSSDoc(unsigned int startPos, int length, int, WordList *[], Accessor &styler) {
+	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
+	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	unsigned int endPos = startPos + length;
+	int visibleChars = 0;
+	int lineCurrent = styler.GetLine(startPos);
+	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
+	int levelCurrent = levelPrev;
+	char chNext = styler[startPos];
+	bool inComment = (styler.StyleAt(startPos-1) == SCE_CSS_COMMENT);
+	for (unsigned int i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int style = styler.StyleAt(i);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+		if (foldComment) {
+			if (!inComment && (style == SCE_CSS_COMMENT))
+				levelCurrent++;
+			else if (inComment && (style != SCE_CSS_COMMENT))
+				levelCurrent--;
+			inComment = (style == SCE_CSS_COMMENT);
+		}
+		if (style == SCE_CSS_OPERATOR) {
+			if (ch == '{') {
+				levelCurrent++;
+			} else if (ch == '}') {
+				levelCurrent--;
+			}
+		}
+		if (atEOL) {
+			int lev = levelPrev;
+			if (visibleChars == 0 && foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if ((levelCurrent > levelPrev) && (visibleChars > 0))
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelPrev = levelCurrent;
+			visibleChars = 0;
+		}
+		if (!isspacechar(ch))
+			visibleChars++;
+	}
+	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
+	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
+}
+
+static const char * const cssWordListDesc[] = {
+	"CSS1 Properties",
+	"Pseudo-classes",
+	"CSS2 Properties",
+	"CSS3 Properties",
+	"Pseudo-elements",
+	"Browser-Specific CSS Properties",
+	"Browser-Specific Pseudo-classes",
+	"Browser-Specific Pseudo-elements",
+	0
+};
+
+LexerModule lmCss(SCLEX_CSS, ColouriseCssDoc, "css", FoldCSSDoc, cssWordListDesc);
diff --git a/Documents/Scintilla/LexCaml.cxx b/Documents/Scintilla/LexCaml.cxx
new file mode 100644
index 0000000..539eee0
--- /dev/null
+++ b/Documents/Scintilla/LexCaml.cxx
@@ -0,0 +1,403 @@
+// Scintilla source code edit control
+/** @file LexCaml.cxx
+ ** Lexer for Objective Caml.
+ **/
+// Copyright 2005 by Robert Roessler <robertr@rftp.com>
+// The License.txt file describes the conditions under which this software may be distributed.
+/*	Release History
+	20050204 Initial release.
+	20050205 Quick compiler standards/"cleanliness" adjustment.
+	20050206 Added cast for IsLeadByte().
+	20050209 Changes to "external" build support.
+	20050306 Fix for 1st-char-in-doc "corner" case.
+	20050502 Fix for [harmless] one-past-the-end coloring.
+	20050515 Refined numeric token recognition logic.
+	20051125 Added 2nd "optional" keywords class.
+	20051129 Support "magic" (read-only) comments for RCaml.
+	20051204 Swtich to using StyleContext infrastructure.
+*/
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+//	Since the Microsoft __iscsym[f] funcs are not ANSI...
+inline int  iscaml(int c) {return isalnum(c) || c == '_';}
+inline int iscamlf(int c) {return isalpha(c) || c == '_';}
+inline int iscamld(int c) {return isdigit(c) || c == '_';}
+
+static const int baseT[24] = {
+	0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,	/* A - L */
+	0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0,16	/* M - X */
+};
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+#ifdef BUILD_AS_EXTERNAL_LEXER
+/*
+	(actually seems to work!)
+*/
+#include "WindowAccessor.h"
+#include "ExternalLexer.h"
+
+#if PLAT_WIN
+#include <windows.h>
+#endif
+
+static void ColouriseCamlDoc(
+	unsigned int startPos, int length,
+	int initStyle,
+	WordList *keywordlists[],
+	Accessor &styler);
+
+static void FoldCamlDoc(
+	unsigned int startPos, int length,
+	int initStyle,
+	WordList *keywordlists[],
+	Accessor &styler);
+
+static void InternalLexOrFold(int lexOrFold, unsigned int startPos, int length,
+	int initStyle, char *words[], WindowID window, char *props);
+
+static const char* LexerName = "caml";
+
+#ifdef TRACE
+void Platform::DebugPrintf(const char *format, ...) {
+	char buffer[2000];
+	va_list pArguments;
+	va_start(pArguments, format);
+	vsprintf(buffer,format,pArguments);
+	va_end(pArguments);
+	Platform::DebugDisplay(buffer);
+}
+#else
+void Platform::DebugPrintf(const char *, ...) {
+}
+#endif
+
+bool Platform::IsDBCSLeadByte(int codePage, char ch) {
+	return ::IsDBCSLeadByteEx(codePage, ch) != 0;
+}
+
+long Platform::SendScintilla(WindowID w, unsigned int msg, unsigned long wParam, long lParam) {
+	return ::SendMessage(reinterpret_cast<HWND>(w), msg, wParam, lParam);
+}
+
+long Platform::SendScintillaPointer(WindowID w, unsigned int msg, unsigned long wParam, void *lParam) {
+	return ::SendMessage(reinterpret_cast<HWND>(w), msg, wParam,
+		reinterpret_cast<LPARAM>(lParam));
+}
+
+void EXT_LEXER_DECL Fold(unsigned int lexer, unsigned int startPos, int length,
+	int initStyle, char *words[], WindowID window, char *props)
+{
+	// below useless evaluation(s) to supress "not used" warnings
+	lexer;
+	// build expected data structures and do the Fold
+	InternalLexOrFold(1, startPos, length, initStyle, words, window, props);
+
+}
+
+int EXT_LEXER_DECL GetLexerCount()
+{
+	return 1;	// just us [Objective] Caml lexers here!
+}
+
+void EXT_LEXER_DECL GetLexerName(unsigned int Index, char *name, int buflength)
+{
+	// below useless evaluation(s) to supress "not used" warnings
+	Index;
+	// return as much of our lexer name as will fit (what's up with Index?)
+	if (buflength > 0) {
+		buflength--;
+		int n = strlen(LexerName);
+		if (n > buflength)
+			n = buflength;
+		memcpy(name, LexerName, n), name[n] = '\0';
+	}
+}
+
+void EXT_LEXER_DECL Lex(unsigned int lexer, unsigned int startPos, int length,
+	int initStyle, char *words[], WindowID window, char *props)
+{
+	// below useless evaluation(s) to supress "not used" warnings
+	lexer;
+	// build expected data structures and do the Lex
+	InternalLexOrFold(0, startPos, length, initStyle, words, window, props);
+}
+
+static void InternalLexOrFold(int foldOrLex, unsigned int startPos, int length,
+	int initStyle, char *words[], WindowID window, char *props)
+{
+	// create and initialize a WindowAccessor (including contained PropSet)
+	PropSet ps;
+	ps.SetMultiple(props);
+	WindowAccessor wa(window, ps);
+	// create and initialize WordList(s)
+	int nWL = 0;
+	for (; words[nWL]; nWL++) ;	// count # of WordList PTRs needed
+	WordList** wl = new WordList* [nWL + 1];// alloc WordList PTRs
+	int i = 0;
+	for (; i < nWL; i++) {
+		wl[i] = new WordList();	// (works or THROWS bad_alloc EXCEPTION)
+		wl[i]->Set(words[i]);
+	}
+	wl[i] = 0;
+	// call our "internal" folder/lexer (... then do Flush!)
+	if (foldOrLex)
+		FoldCamlDoc(startPos, length, initStyle, wl, wa);
+	else
+		ColouriseCamlDoc(startPos, length, initStyle, wl, wa);
+	wa.Flush();
+	// clean up before leaving
+	for (i = nWL - 1; i >= 0; i--)
+		delete wl[i];
+	delete [] wl;
+}
+
+static
+#endif	/* BUILD_AS_EXTERNAL_LEXER */
+
+void ColouriseCamlDoc(
+	unsigned int startPos, int length,
+	int initStyle,
+	WordList *keywordlists[],
+	Accessor &styler)
+{
+	// initialize styler
+	StyleContext sc(startPos, length, initStyle, styler);
+	// set up [initial] state info (terminating states that shouldn't "bleed")
+	int nesting = 0;
+	if (sc.state < SCE_CAML_STRING)
+		sc.state = SCE_CAML_DEFAULT;
+	if (sc.state >= SCE_CAML_COMMENT)
+		nesting = (sc.state & 0x0f) - SCE_CAML_COMMENT;
+
+	int chBase = 0, chToken = 0, chLit = 0;
+	WordList& keywords  = *keywordlists[0];
+	WordList& keywords2 = *keywordlists[1];
+	WordList& keywords3 = *keywordlists[2];
+	const int useMagic = styler.GetPropertyInt("lexer.caml.magic", 0);
+
+	// foreach char in range...
+	while (sc.More()) {
+		// set up [per-char] state info
+		int state2 = -1;		// (ASSUME no state change)
+		int chColor = sc.currentPos - 1;// (ASSUME standard coloring range)
+		bool advance = true;	// (ASSUME scanner "eats" 1 char)
+
+		// step state machine
+		switch (sc.state & 0x0f) {
+		case SCE_CAML_DEFAULT:
+			chToken = sc.currentPos;	// save [possible] token start (JIC)
+			// it's wide open; what do we have?
+			if (iscamlf(sc.ch))
+				state2 = SCE_CAML_IDENTIFIER;
+			else if (sc.Match('`') && iscamlf(sc.chNext))
+				state2 = SCE_CAML_TAGNAME;
+			else if (sc.Match('#') && isdigit(sc.chNext))
+				state2 = SCE_CAML_LINENUM;
+			else if (isdigit(sc.ch)) {
+				state2 = SCE_CAML_NUMBER, chBase = 10;
+				if (sc.Match('0') && strchr("bBoOxX", sc.chNext))
+					chBase = baseT[tolower(sc.chNext) - 'a'], sc.Forward();
+			} else if (sc.Match('\''))	/* (char literal?) */
+				state2 = SCE_CAML_CHAR, chLit = 0;
+			else if (sc.Match('\"'))
+				state2 = SCE_CAML_STRING;
+			else if (sc.Match('(', '*'))
+				state2 = SCE_CAML_COMMENT,
+					sc.ch = ' ',	// (make SURE "(*)" isn't seen as a closed comment)
+					sc.Forward();
+			else if (strchr("!?~"		/* Caml "prefix-symbol" */
+					"=<>@^|&+-*/$%"		/* Caml "infix-symbol" */
+					"()[]{};,:.#", sc.ch))	/* Caml "bracket" or ;,:.# */
+				state2 = SCE_CAML_OPERATOR;
+			break;
+
+		case SCE_CAML_IDENTIFIER:
+			// [try to] interpret as [additional] identifier char
+			if (!(iscaml(sc.ch) || sc.Match('\''))) {
+				const int n = sc.currentPos - chToken;
+				if (n < 24) {
+					// length is believable as keyword, [re-]construct token
+					char t[24];
+					for (int i = -n; i < 0; i++)
+						t[n + i] = static_cast<char>(sc.GetRelative(i));
+					t[n] = '\0';
+					// special-case "_" token as KEYWORD
+					if ((n == 1 && sc.chPrev == '_') || keywords.InList(t))
+						sc.ChangeState(SCE_CAML_KEYWORD);
+					else if (keywords2.InList(t))
+						sc.ChangeState(SCE_CAML_KEYWORD2);
+					else if (keywords3.InList(t))
+						sc.ChangeState(SCE_CAML_KEYWORD3);
+				}
+				state2 = SCE_CAML_DEFAULT, advance = false;
+			}
+			break;
+
+		case SCE_CAML_TAGNAME:
+			// [try to] interpret as [additional] tagname char
+			if (!(iscaml(sc.ch) || sc.Match('\'')))
+				state2 = SCE_CAML_DEFAULT, advance = false;
+			break;
+
+		/*case SCE_CAML_KEYWORD:
+		case SCE_CAML_KEYWORD2:
+		case SCE_CAML_KEYWORD3:
+			// [try to] interpret as [additional] keyword char
+			if (!iscaml(ch))
+				state2 = SCE_CAML_DEFAULT, advance = false;
+			break;*/
+
+		case SCE_CAML_LINENUM:
+			// [try to] interpret as [additional] linenum directive char
+			if (!isdigit(sc.ch))
+				state2 = SCE_CAML_DEFAULT, advance = false;
+			break;
+
+		case SCE_CAML_OPERATOR: {
+			// [try to] interpret as [additional] operator char
+			const char* o = 0;
+			if (iscaml(sc.ch) || isspace(sc.ch)		   /* ident or whitespace */
+				|| (o = strchr(")]};,\'\"`#", sc.ch),o)/* "termination" chars */
+				|| !strchr("!$%&*+-./:<=>?@^|~", sc.ch)/* "operator" chars */) {
+				// check for INCLUSIVE termination
+				if (o && strchr(")]};,", sc.ch)) {
+					if ((sc.Match(')') && sc.chPrev == '(')
+						|| (sc.Match(']') && sc.chPrev == '['))
+						// special-case "()" and "[]" tokens as KEYWORDS
+						sc.ChangeState(SCE_CAML_KEYWORD);
+					chColor++;
+				} else
+					advance = false;
+				state2 = SCE_CAML_DEFAULT;
+			}
+			break;
+		}
+
+		case SCE_CAML_NUMBER:
+			// [try to] interpret as [additional] numeric literal char
+			// N.B. - improperly accepts "extra" digits in base 2 or 8 literals
+			if (iscamld(sc.ch) || IsADigit(sc.ch, chBase))
+				break;
+			// how about an integer suffix?
+			if ((sc.Match('l') || sc.Match('L') || sc.Match('n'))
+				&& (iscamld(sc.chPrev) || IsADigit(sc.chPrev, chBase)))
+				break;
+			// or a floating-point literal?
+			if (chBase == 10) {
+				// with a decimal point?
+				if (sc.Match('.') && iscamld(sc.chPrev))
+					break;
+				// with an exponent? (I)
+				if ((sc.Match('e') || sc.Match('E'))
+					&& (iscamld(sc.chPrev) || sc.chPrev == '.'))
+					break;
+				// with an exponent? (II)
+				if ((sc.Match('+') || sc.Match('-'))
+					&& (sc.chPrev == 'e' || sc.chPrev == 'E'))
+					break;
+			}
+			// it looks like we have run out of number
+			state2 = SCE_CAML_DEFAULT, advance = false;
+			break;
+
+		case SCE_CAML_CHAR:
+			// [try to] interpret as [additional] char literal char
+			if (sc.Match('\\')) {
+				chLit = 1;	// (definitely IS a char literal)
+				if (sc.chPrev == '\\')
+					sc.ch = ' ';	// (so termination test isn't fooled)
+			// should we be terminating - one way or another?
+			} else if ((sc.Match('\'') && sc.chPrev != '\\') || sc.atLineEnd) {
+				state2 = SCE_CAML_DEFAULT;
+				if (sc.Match('\''))
+					chColor++;
+				else
+					sc.ChangeState(SCE_CAML_IDENTIFIER);
+			// ... maybe a char literal, maybe not
+			} else if (chLit < 1 && sc.currentPos - chToken >= 2)
+				sc.ChangeState(SCE_CAML_IDENTIFIER), advance = false;
+			break;
+
+		case SCE_CAML_STRING:
+			// [try to] interpret as [additional] string literal char
+			if (sc.Match('\\') && sc.chPrev == '\\')
+				sc.ch = ' ';	// (so '\\' doesn't cause us trouble)
+			else if (sc.Match('\"') && sc.chPrev != '\\')
+				state2 = SCE_CAML_DEFAULT, chColor++;
+			break;
+
+		case SCE_CAML_COMMENT:
+		case SCE_CAML_COMMENT1:
+		case SCE_CAML_COMMENT2:
+		case SCE_CAML_COMMENT3:
+			// we're IN a comment - does this start a NESTED comment?
+			if (sc.Match('(', '*'))
+				state2 = sc.state + 1, chToken = sc.currentPos,
+					sc.ch = ' ',	// (make SURE "(*)" isn't seen as a closed comment)
+					sc.Forward(), nesting++;
+			// [try to] interpret as [additional] comment char
+			else if (sc.Match(')') && sc.chPrev == '*') {
+				if (nesting)
+					state2 = (sc.state & 0x0f) - 1, chToken = 0, nesting--;
+				else
+					state2 = SCE_CAML_DEFAULT;
+				chColor++;
+			// enable "magic" (read-only) comment AS REQUIRED
+			} else if (useMagic && sc.currentPos - chToken == 4
+				&& sc.Match('c') && sc.chPrev == 'r' && sc.GetRelative(-2) == '@')
+				sc.state |= 0x10;	// (switch to read-only comment style)
+			break;
+		}
+
+		// handle state change and char coloring as required
+		if (state2 >= 0)
+			styler.ColourTo(chColor, sc.state), sc.ChangeState(state2);
+		// move to next char UNLESS re-scanning current char
+		if (advance)
+			sc.Forward();
+	}
+
+	// do any required terminal char coloring (JIC)
+	sc.Complete();
+}
+
+#ifdef BUILD_AS_EXTERNAL_LEXER
+static
+#endif	/* BUILD_AS_EXTERNAL_LEXER */
+void FoldCamlDoc(
+	unsigned int startPos, int length,
+	int initStyle,
+	WordList *keywordlists[],
+	Accessor &styler)
+{
+	// below useless evaluation(s) to supress "not used" warnings
+	startPos || length || initStyle || keywordlists[0] || styler.Length();
+}
+
+static const char * const camlWordListDesc[] = {
+	"Keywords",		// primary Objective Caml keywords
+	"Keywords2",	// "optional" keywords (typically from Pervasives)
+	"Keywords3",	// "optional" keywords (typically typenames)
+	0
+};
+
+#ifndef BUILD_AS_EXTERNAL_LEXER
+LexerModule lmCaml(SCLEX_CAML, ColouriseCamlDoc, "caml", FoldCamlDoc, camlWordListDesc);
+#endif	/* BUILD_AS_EXTERNAL_LEXER */
diff --git a/Documents/Scintilla/LexCmake.cxx b/Documents/Scintilla/LexCmake.cxx
new file mode 100644
index 0000000..f63eb39
--- /dev/null
+++ b/Documents/Scintilla/LexCmake.cxx
@@ -0,0 +1,456 @@
+// Scintilla source code edit control
+/** @file LexCmake.cxx
+ ** Lexer for Cmake
+ **/
+// Copyright 2007 by Cristian Adam <cristian [dot] adam [at] gmx [dot] net>
+// based on the NSIS lexer
+// The License.txt file describes the conditions under which this software may be distributed.
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+static bool isCmakeNumber(char ch)
+{
+    return(ch >= '0' && ch <= '9');
+}
+
+static bool isCmakeChar(char ch)
+{
+    return(ch == '.' ) || (ch == '_' ) || isCmakeNumber(ch) || (ch >= 'A' && ch <= 'Z') || (ch >= 'a' && ch <= 'z');
+}
+
+static bool isCmakeLetter(char ch)
+{
+    return(ch >= 'A' && ch <= 'Z') || (ch >= 'a' && ch <= 'z');
+}
+
+static bool CmakeNextLineHasElse(unsigned int start, unsigned int end, Accessor &styler)
+{
+    int nNextLine = -1;
+    for ( unsigned int i = start; i < end; i++ ) {
+        char cNext = styler.SafeGetCharAt( i );
+        if ( cNext == '\n' ) {
+            nNextLine = i+1;
+            break;
+        }
+    }
+
+    if ( nNextLine == -1 ) // We never foudn the next line...
+        return false;
+
+    for ( unsigned int firstChar = nNextLine; firstChar < end; firstChar++ ) {
+        char cNext = styler.SafeGetCharAt( firstChar );
+        if ( cNext == ' ' )
+            continue;
+        if ( cNext == '\t' )
+            continue;
+        if ( styler.Match(firstChar, "ELSE")  || styler.Match(firstChar, "else"))
+            return true;
+        break;
+    }
+
+    return false;
+}
+
+static int calculateFoldCmake(unsigned int start, unsigned int end, int foldlevel, Accessor &styler, bool bElse)
+{
+    // If the word is too long, it is not what we are looking for
+    if ( end - start > 20 )
+        return foldlevel;
+
+    int newFoldlevel = foldlevel;
+
+    char s[20]; // The key word we are looking for has atmost 13 characters
+    for (unsigned int i = 0; i < end - start + 1 && i < 19; i++) {
+        s[i] = static_cast<char>( styler[ start + i ] );
+        s[i + 1] = '\0';
+    }
+
+    if ( CompareCaseInsensitive(s, "IF") == 0 || CompareCaseInsensitive(s, "WHILE") == 0
+         || CompareCaseInsensitive(s, "MACRO") == 0 || CompareCaseInsensitive(s, "FOREACH") == 0
+         || CompareCaseInsensitive(s, "ELSEIF") == 0 )
+        newFoldlevel++;
+    else if ( CompareCaseInsensitive(s, "ENDIF") == 0 || CompareCaseInsensitive(s, "ENDWHILE") == 0
+              || CompareCaseInsensitive(s, "ENDMACRO") == 0 || CompareCaseInsensitive(s, "ENDFOREACH") == 0)
+        newFoldlevel--;
+    else if ( bElse && CompareCaseInsensitive(s, "ELSEIF") == 0 )
+        newFoldlevel++;
+    else if ( bElse && CompareCaseInsensitive(s, "ELSE") == 0 )
+        newFoldlevel++;
+
+    return newFoldlevel;
+}
+
+static int classifyWordCmake(unsigned int start, unsigned int end, WordList *keywordLists[], Accessor &styler )
+{
+    char word[100] = {0};
+    char lowercaseWord[100] = {0};
+
+    WordList &Commands = *keywordLists[0];
+    WordList &Parameters = *keywordLists[1];
+    WordList &UserDefined = *keywordLists[2];
+
+    for (unsigned int i = 0; i < end - start + 1 && i < 99; i++) {
+        word[i] = static_cast<char>( styler[ start + i ] );
+        lowercaseWord[i] = static_cast<char>(tolower(word[i]));
+    }
+
+    // Check for special words...
+    if ( CompareCaseInsensitive(word, "MACRO") == 0 || CompareCaseInsensitive(word, "ENDMACRO") == 0 )
+        return SCE_CMAKE_MACRODEF;
+
+    if ( CompareCaseInsensitive(word, "IF") == 0 ||  CompareCaseInsensitive(word, "ENDIF") == 0 )
+        return SCE_CMAKE_IFDEFINEDEF;
+
+    if ( CompareCaseInsensitive(word, "ELSEIF") == 0  || CompareCaseInsensitive(word, "ELSE") == 0 )
+        return SCE_CMAKE_IFDEFINEDEF;
+
+    if ( CompareCaseInsensitive(word, "WHILE") == 0 || CompareCaseInsensitive(word, "ENDWHILE") == 0)
+        return SCE_CMAKE_WHILEDEF;
+
+    if ( CompareCaseInsensitive(word, "FOREACH") == 0 || CompareCaseInsensitive(word, "ENDFOREACH") == 0)
+        return SCE_CMAKE_FOREACHDEF;
+
+    if ( Commands.InList(lowercaseWord) )
+        return SCE_CMAKE_COMMANDS;
+
+    if ( Parameters.InList(word) )
+        return SCE_CMAKE_PARAMETERS;
+
+
+    if ( UserDefined.InList(word) )
+        return SCE_CMAKE_USERDEFINED;
+
+    if ( strlen(word) > 3 ) {
+        if ( word[1] == '{' && word[strlen(word)-1] == '}' )
+            return SCE_CMAKE_VARIABLE;
+    }
+
+    // To check for numbers
+    if ( isCmakeNumber( word[0] ) ) {
+        bool bHasSimpleCmakeNumber = true;
+        for (unsigned int j = 1; j < end - start + 1 && j < 99; j++) {
+            if ( !isCmakeNumber( word[j] ) ) {
+                bHasSimpleCmakeNumber = false;
+                break;
+            }
+        }
+
+        if ( bHasSimpleCmakeNumber )
+            return SCE_CMAKE_NUMBER;
+    }
+
+    return SCE_CMAKE_DEFAULT;
+}
+
+static void ColouriseCmakeDoc(unsigned int startPos, int length, int, WordList *keywordLists[], Accessor &styler)
+{
+    int state = SCE_CMAKE_DEFAULT;
+    if ( startPos > 0 )
+        state = styler.StyleAt(startPos-1); // Use the style from the previous line, usually default, but could be commentbox
+
+    styler.StartAt( startPos );
+    styler.GetLine( startPos );
+
+    unsigned int nLengthDoc = startPos + length;
+    styler.StartSegment( startPos );
+
+    char cCurrChar;
+    bool bVarInString = false;
+    bool bClassicVarInString = false;
+
+    unsigned int i;
+    for ( i = startPos; i < nLengthDoc; i++ ) {
+        cCurrChar = styler.SafeGetCharAt( i );
+        char cNextChar = styler.SafeGetCharAt(i+1);
+
+        switch (state) {
+        case SCE_CMAKE_DEFAULT:
+            if ( cCurrChar == '#' ) { // we have a comment line
+                styler.ColourTo(i-1, state );
+                state = SCE_CMAKE_COMMENT;
+                break;
+            }
+            if ( cCurrChar == '"' ) {
+                styler.ColourTo(i-1, state );
+                state = SCE_CMAKE_STRINGDQ;
+                bVarInString = false;
+                bClassicVarInString = false;
+                break;
+            }
+            if ( cCurrChar == '\'' ) {
+                styler.ColourTo(i-1, state );
+                state = SCE_CMAKE_STRINGRQ;
+                bVarInString = false;
+                bClassicVarInString = false;
+                break;
+            }
+            if ( cCurrChar == '`' ) {
+                styler.ColourTo(i-1, state );
+                state = SCE_CMAKE_STRINGLQ;
+                bVarInString = false;
+                bClassicVarInString = false;
+                break;
+            }
+
+            // CMake Variable
+            if ( cCurrChar == '$' || isCmakeChar(cCurrChar)) {
+                styler.ColourTo(i-1,state);
+                state = SCE_CMAKE_VARIABLE;
+
+                // If it is a number, we must check and set style here first...
+                if ( isCmakeNumber(cCurrChar) && (cNextChar == '\t' || cNextChar == ' ' || cNextChar == '\r' || cNextChar == '\n' ) )
+                    styler.ColourTo( i, SCE_CMAKE_NUMBER);
+
+                break;
+            }
+
+            break;
+        case SCE_CMAKE_COMMENT:
+            if ( cNextChar == '\n' || cNextChar == '\r' ) {
+                // Special case:
+                if ( cCurrChar == '\\' ) {
+                    styler.ColourTo(i-2,state);
+                    styler.ColourTo(i,SCE_CMAKE_DEFAULT);
+                }
+                else {
+                    styler.ColourTo(i,state);
+                    state = SCE_CMAKE_DEFAULT;
+                }
+            }
+            break;
+        case SCE_CMAKE_STRINGDQ:
+        case SCE_CMAKE_STRINGLQ:
+        case SCE_CMAKE_STRINGRQ:
+
+            if ( styler.SafeGetCharAt(i-1) == '\\' && styler.SafeGetCharAt(i-2) == '$' )
+                break; // Ignore the next character, even if it is a quote of some sort
+
+            if ( cCurrChar == '"' && state == SCE_CMAKE_STRINGDQ ) {
+                styler.ColourTo(i,state);
+                state = SCE_CMAKE_DEFAULT;
+                break;
+            }
+
+            if ( cCurrChar == '`' && state == SCE_CMAKE_STRINGLQ ) {
+                styler.ColourTo(i,state);
+                state = SCE_CMAKE_DEFAULT;
+                break;
+            }
+
+            if ( cCurrChar == '\'' && state == SCE_CMAKE_STRINGRQ ) {
+                styler.ColourTo(i,state);
+                state = SCE_CMAKE_DEFAULT;
+                break;
+            }
+
+            if ( cNextChar == '\r' || cNextChar == '\n' ) {
+                int nCurLine = styler.GetLine(i+1);
+                int nBack = i;
+                // We need to check if the previous line has a \ in it...
+                bool bNextLine = false;
+
+                while ( nBack > 0 ) {
+                    if ( styler.GetLine(nBack) != nCurLine )
+                        break;
+
+                    char cTemp = styler.SafeGetCharAt(nBack, 'a'); // Letter 'a' is safe here
+
+                    if ( cTemp == '\\' ) {
+                        bNextLine = true;
+                        break;
+                    }
+                    if ( cTemp != '\r' && cTemp != '\n' && cTemp != '\t' && cTemp != ' ' )
+                        break;
+
+                    nBack--;
+                }
+
+                if ( bNextLine ) {
+                    styler.ColourTo(i+1,state);
+                }
+                if ( bNextLine == false ) {
+                    styler.ColourTo(i,state);
+                    state = SCE_CMAKE_DEFAULT;
+                }
+            }
+            break;
+
+        case SCE_CMAKE_VARIABLE:
+
+            // CMake Variable:
+            if ( cCurrChar == '$' )
+                state = SCE_CMAKE_DEFAULT;
+            else if ( cCurrChar == '\\' && (cNextChar == 'n' || cNextChar == 'r' || cNextChar == 't' ) )
+                state = SCE_CMAKE_DEFAULT;
+            else if ( (isCmakeChar(cCurrChar) && !isCmakeChar( cNextChar) && cNextChar != '}') || cCurrChar == '}' ) {
+                state = classifyWordCmake( styler.GetStartSegment(), i, keywordLists, styler );
+                styler.ColourTo( i, state);
+                state = SCE_CMAKE_DEFAULT;
+            }
+            else if ( !isCmakeChar( cCurrChar ) && cCurrChar != '{' && cCurrChar != '}' ) {
+                if ( classifyWordCmake( styler.GetStartSegment(), i-1, keywordLists, styler) == SCE_CMAKE_NUMBER )
+                    styler.ColourTo( i-1, SCE_CMAKE_NUMBER );
+
+                state = SCE_CMAKE_DEFAULT;
+
+                if ( cCurrChar == '"' ) {
+                    state = SCE_CMAKE_STRINGDQ;
+                    bVarInString = false;
+                    bClassicVarInString = false;
+                }
+                else if ( cCurrChar == '`' ) {
+                    state = SCE_CMAKE_STRINGLQ;
+                    bVarInString = false;
+                    bClassicVarInString = false;
+                }
+                else if ( cCurrChar == '\'' ) {
+                    state = SCE_CMAKE_STRINGRQ;
+                    bVarInString = false;
+                    bClassicVarInString = false;
+                }
+                else if ( cCurrChar == '#' ) {
+                    state = SCE_CMAKE_COMMENT;
+                }
+            }
+            break;
+        }
+
+        if ( state == SCE_CMAKE_COMMENT) {
+            styler.ColourTo(i,state);
+        }
+        else if ( state == SCE_CMAKE_STRINGDQ || state == SCE_CMAKE_STRINGLQ || state == SCE_CMAKE_STRINGRQ ) {
+            bool bIngoreNextDollarSign = false;
+
+            if ( bVarInString && cCurrChar == '$' ) {
+                bVarInString = false;
+                bIngoreNextDollarSign = true;
+            }
+            else if ( bVarInString && cCurrChar == '\\' && (cNextChar == 'n' || cNextChar == 'r' || cNextChar == 't' || cNextChar == '"' || cNextChar == '`' || cNextChar == '\'' ) ) {
+                styler.ColourTo( i+1, SCE_CMAKE_STRINGVAR);
+                bVarInString = false;
+                bIngoreNextDollarSign = false;
+            }
+
+            else if ( bVarInString && !isCmakeChar(cNextChar) ) {
+                int nWordState = classifyWordCmake( styler.GetStartSegment(), i, keywordLists, styler);
+                if ( nWordState == SCE_CMAKE_VARIABLE )
+                    styler.ColourTo( i, SCE_CMAKE_STRINGVAR);
+                bVarInString = false;
+            }
+            // Covers "${TEST}..."
+            else if ( bClassicVarInString && cNextChar == '}' ) {
+                styler.ColourTo( i+1, SCE_CMAKE_STRINGVAR);
+                bClassicVarInString = false;
+            }
+
+            // Start of var in string
+            if ( !bIngoreNextDollarSign && cCurrChar == '$' && cNextChar == '{' ) {
+                styler.ColourTo( i-1, state);
+                bClassicVarInString = true;
+                bVarInString = false;
+            }
+            else if ( !bIngoreNextDollarSign && cCurrChar == '$' ) {
+                styler.ColourTo( i-1, state);
+                bVarInString = true;
+                bClassicVarInString = false;
+            }
+        }
+    }
+
+    // Colourise remaining document
+    styler.ColourTo(nLengthDoc-1,state);
+}
+
+static void FoldCmakeDoc(unsigned int startPos, int length, int, WordList *[], Accessor &styler)
+{
+    // No folding enabled, no reason to continue...
+    if ( styler.GetPropertyInt("fold") == 0 )
+        return;
+
+    bool foldAtElse = styler.GetPropertyInt("fold.at.else", 0) == 1;
+
+    int lineCurrent = styler.GetLine(startPos);
+    unsigned int safeStartPos = styler.LineStart( lineCurrent );
+
+    bool bArg1 = true;
+    int nWordStart = -1;
+
+    int levelCurrent = SC_FOLDLEVELBASE;
+    if (lineCurrent > 0)
+        levelCurrent = styler.LevelAt(lineCurrent-1) >> 16;
+    int levelNext = levelCurrent;
+
+    for (unsigned int i = safeStartPos; i < startPos + length; i++) {
+        char chCurr = styler.SafeGetCharAt(i);
+
+        if ( bArg1 ) {
+            if ( nWordStart == -1 && (isCmakeLetter(chCurr)) ) {
+                nWordStart = i;
+            }
+            else if ( isCmakeLetter(chCurr) == false && nWordStart > -1 ) {
+                int newLevel = calculateFoldCmake( nWordStart, i-1, levelNext, styler, foldAtElse);
+
+                if ( newLevel == levelNext ) {
+                    if ( foldAtElse ) {
+                        if ( CmakeNextLineHasElse(i, startPos + length, styler) )
+                            levelNext--;
+                    }
+                }
+                else
+                    levelNext = newLevel;
+                bArg1 = false;
+            }
+        }
+
+        if ( chCurr == '\n' ) {
+            if ( bArg1 && foldAtElse) {
+                if ( CmakeNextLineHasElse(i, startPos + length, styler) )
+                    levelNext--;
+            }
+
+            // If we are on a new line...
+            int levelUse = levelCurrent;
+            int lev = levelUse | levelNext << 16;
+            if (levelUse < levelNext )
+                lev |= SC_FOLDLEVELHEADERFLAG;
+            if (lev != styler.LevelAt(lineCurrent))
+                styler.SetLevel(lineCurrent, lev);
+
+            lineCurrent++;
+            levelCurrent = levelNext;
+            bArg1 = true; // New line, lets look at first argument again
+            nWordStart = -1;
+        }
+    }
+
+    int levelUse = levelCurrent;
+    int lev = levelUse | levelNext << 16;
+    if (levelUse < levelNext)
+        lev |= SC_FOLDLEVELHEADERFLAG;
+    if (lev != styler.LevelAt(lineCurrent))
+        styler.SetLevel(lineCurrent, lev);
+}
+
+static const char * const cmakeWordLists[] = {
+    "Commands",
+    "Parameters",
+    "UserDefined",
+    0,
+    0,};
+
+LexerModule lmCmake(SCLEX_CMAKE, ColouriseCmakeDoc, "cmake", FoldCmakeDoc, cmakeWordLists);
diff --git a/Documents/Scintilla/LexConf.cxx b/Documents/Scintilla/LexConf.cxx
new file mode 100644
index 0000000..969275f
--- /dev/null
+++ b/Documents/Scintilla/LexConf.cxx
@@ -0,0 +1,188 @@
+// Scintilla source code edit control
+/** @file LexConf.cxx
+ ** Lexer for Apache Configuration Files.
+ **
+ ** First working version contributed by Ahmad Zawawi <zeus_go64@hotmail.com> on October 28, 2000.
+ ** i created this lexer because i needed something pretty when dealing
+ ** when Apache Configuration files...
+ **/
+// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+static void ColouriseConfDoc(unsigned int startPos, int length, int, WordList *keywordLists[], Accessor &styler)
+{
+	int state = SCE_CONF_DEFAULT;
+	char chNext = styler[startPos];
+	int lengthDoc = startPos + length;
+	// create a buffer large enough to take the largest chunk...
+	char *buffer = new char[length];
+	int bufferCount = 0;
+
+	// this assumes that we have 2 keyword list in conf.properties
+	WordList &directives = *keywordLists[0];
+	WordList &params = *keywordLists[1];
+
+	// go through all provided text segment
+	// using the hand-written state machine shown below
+	styler.StartAt(startPos);
+	styler.StartSegment(startPos);
+	for (int i = startPos; i < lengthDoc; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+
+		if (styler.IsLeadByte(ch)) {
+			chNext = styler.SafeGetCharAt(i + 2);
+			i++;
+			continue;
+		}
+		switch(state) {
+			case SCE_CONF_DEFAULT:
+				if( ch == '\n' || ch == '\r' || ch == '\t' || ch == ' ') {
+					// whitespace is simply ignored here...
+					styler.ColourTo(i,SCE_CONF_DEFAULT);
+					break;
+				} else if( ch == '#' ) {
+					// signals the start of a comment...
+					state = SCE_CONF_COMMENT;
+					styler.ColourTo(i,SCE_CONF_COMMENT);
+				} else if( ch == '.' /*|| ch == '/'*/) {
+					// signals the start of a file...
+					state = SCE_CONF_EXTENSION;
+					styler.ColourTo(i,SCE_CONF_EXTENSION);
+				} else if( ch == '"') {
+					state = SCE_CONF_STRING;
+					styler.ColourTo(i,SCE_CONF_STRING);
+				} else if( ispunct(ch) ) {
+					// signals an operator...
+					// no state jump necessary for this
+					// simple case...
+					styler.ColourTo(i,SCE_CONF_OPERATOR);
+				} else if( isalpha(ch) ) {
+					// signals the start of an identifier
+					bufferCount = 0;
+					buffer[bufferCount++] = static_cast<char>(tolower(ch));
+					state = SCE_CONF_IDENTIFIER;
+				} else if( isdigit(ch) ) {
+					// signals the start of a number
+					bufferCount = 0;
+					buffer[bufferCount++] = ch;
+					//styler.ColourTo(i,SCE_CONF_NUMBER);
+					state = SCE_CONF_NUMBER;
+				} else {
+					// style it the default style..
+					styler.ColourTo(i,SCE_CONF_DEFAULT);
+				}
+				break;
+
+			case SCE_CONF_COMMENT:
+				// if we find a newline here,
+				// we simply go to default state
+				// else continue to work on it...
+				if( ch == '\n' || ch == '\r' ) {
+					state = SCE_CONF_DEFAULT;
+				} else {
+					styler.ColourTo(i,SCE_CONF_COMMENT);
+				}
+				break;
+
+			case SCE_CONF_EXTENSION:
+				// if we find a non-alphanumeric char,
+				// we simply go to default state
+				// else we're still dealing with an extension...
+				if( isalnum(ch) || (ch == '_') ||
+					(ch == '-') || (ch == '$') ||
+					(ch == '/') || (ch == '.') || (ch == '*') )
+				{
+					styler.ColourTo(i,SCE_CONF_EXTENSION);
+				} else {
+					state = SCE_CONF_DEFAULT;
+					chNext = styler[i--];
+				}
+				break;
+
+			case SCE_CONF_STRING:
+				// if we find the end of a string char, we simply go to default state
+				// else we're still dealing with an string...
+				if( (ch == '"' && styler.SafeGetCharAt(i-1)!='\\') || (ch == '\n') || (ch == '\r') ) {
+					state = SCE_CONF_DEFAULT;
+				}
+				styler.ColourTo(i,SCE_CONF_STRING);
+				break;
+
+			case SCE_CONF_IDENTIFIER:
+				// stay  in CONF_IDENTIFIER state until we find a non-alphanumeric
+				if( isalnum(ch) || (ch == '_') || (ch == '-') || (ch == '/') || (ch == '$') || (ch == '.') || (ch == '*')) {
+					buffer[bufferCount++] = static_cast<char>(tolower(ch));
+				} else {
+					state = SCE_CONF_DEFAULT;
+					buffer[bufferCount] = '\0';
+
+					// check if the buffer contains a keyword, and highlight it if it is a keyword...
+					if(directives.InList(buffer)) {
+						styler.ColourTo(i-1,SCE_CONF_DIRECTIVE );
+					} else if(params.InList(buffer)) {
+						styler.ColourTo(i-1,SCE_CONF_PARAMETER );
+					} else if(strchr(buffer,'/') || strchr(buffer,'.')) {
+						styler.ColourTo(i-1,SCE_CONF_EXTENSION);
+					} else {
+						styler.ColourTo(i-1,SCE_CONF_DEFAULT);
+					}
+
+					// push back the faulty character
+					chNext = styler[i--];
+
+				}
+				break;
+
+			case SCE_CONF_NUMBER:
+				// stay  in CONF_NUMBER state until we find a non-numeric
+				if( isdigit(ch) || ch == '.') {
+					buffer[bufferCount++] = ch;
+				} else {
+					state = SCE_CONF_DEFAULT;
+					buffer[bufferCount] = '\0';
+
+					// Colourize here...
+					if( strchr(buffer,'.') ) {
+						// it is an IP address...
+						styler.ColourTo(i-1,SCE_CONF_IP);
+					} else {
+						// normal number
+						styler.ColourTo(i-1,SCE_CONF_NUMBER);
+					}
+
+					// push back a character
+					chNext = styler[i--];
+				}
+				break;
+
+		}
+	}
+	delete []buffer;
+}
+
+static const char * const confWordListDesc[] = {
+	"Directives",
+	"Parameters",
+	0
+};
+
+LexerModule lmConf(SCLEX_CONF, ColouriseConfDoc, "conf", 0, confWordListDesc);
diff --git a/Documents/Scintilla/LexCrontab.cxx b/Documents/Scintilla/LexCrontab.cxx
new file mode 100644
index 0000000..62044c3
--- /dev/null
+++ b/Documents/Scintilla/LexCrontab.cxx
@@ -0,0 +1,222 @@
+// Scintilla source code edit control
+/** @file LexCrontab.cxx
+ ** Lexer to use with extended crontab files used by a powerful
+ ** Windows scheduler/event monitor/automation manager nnCron.
+ ** (http://nemtsev.eserv.ru/)
+ **/
+// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+static void ColouriseNncrontabDoc(unsigned int startPos, int length, int, WordList
+*keywordLists[], Accessor &styler)
+{
+	int state = SCE_NNCRONTAB_DEFAULT;
+	char chNext = styler[startPos];
+	int lengthDoc = startPos + length;
+	// create a buffer large enough to take the largest chunk...
+	char *buffer = new char[length];
+	int bufferCount = 0;
+	// used when highliting environment variables inside quoted string:
+	bool insideString = false;
+
+	// this assumes that we have 3 keyword list in conf.properties
+	WordList &section = *keywordLists[0];
+	WordList &keyword = *keywordLists[1];
+	WordList &modifier = *keywordLists[2];
+
+	// go through all provided text segment
+	// using the hand-written state machine shown below
+	styler.StartAt(startPos);
+	styler.StartSegment(startPos);
+	for (int i = startPos; i < lengthDoc; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+
+		if (styler.IsLeadByte(ch)) {
+			chNext = styler.SafeGetCharAt(i + 2);
+			i++;
+			continue;
+		}
+		switch(state) {
+			case SCE_NNCRONTAB_DEFAULT:
+				if( ch == '\n' || ch == '\r' || ch == '\t' || ch == ' ') {
+					// whitespace is simply ignored here...
+					styler.ColourTo(i,SCE_NNCRONTAB_DEFAULT);
+					break;
+				} else if( ch == '#' && styler.SafeGetCharAt(i+1) == '(') {
+					// signals the start of a task...
+					state = SCE_NNCRONTAB_TASK;
+					styler.ColourTo(i,SCE_NNCRONTAB_TASK);
+				}
+				  else if( ch == '\\' && (styler.SafeGetCharAt(i+1) == ' ' ||
+										 styler.SafeGetCharAt(i+1) == '\t')) {
+					// signals the start of an extended comment...
+					state = SCE_NNCRONTAB_COMMENT;
+					styler.ColourTo(i,SCE_NNCRONTAB_COMMENT);
+				} else if( ch == '#' ) {
+					// signals the start of a plain comment...
+					state = SCE_NNCRONTAB_COMMENT;
+					styler.ColourTo(i,SCE_NNCRONTAB_COMMENT);
+				} else if( ch == ')' && styler.SafeGetCharAt(i+1) == '#') {
+					// signals the end of a task...
+					state = SCE_NNCRONTAB_TASK;
+					styler.ColourTo(i,SCE_NNCRONTAB_TASK);
+				} else if( ch == '"') {
+					state = SCE_NNCRONTAB_STRING;
+					styler.ColourTo(i,SCE_NNCRONTAB_STRING);
+				} else if( ch == '%') {
+					// signals environment variables
+					state = SCE_NNCRONTAB_ENVIRONMENT;
+					styler.ColourTo(i,SCE_NNCRONTAB_ENVIRONMENT);
+				} else if( ch == '<' && styler.SafeGetCharAt(i+1) == '%') {
+					// signals environment variables
+					state = SCE_NNCRONTAB_ENVIRONMENT;
+					styler.ColourTo(i,SCE_NNCRONTAB_ENVIRONMENT);
+				} else if( ch == '*' ) {
+					// signals an asterisk
+					// no state jump necessary for this simple case...
+					styler.ColourTo(i,SCE_NNCRONTAB_ASTERISK);
+				} else if( isalpha(ch) || ch == '<' ) {
+					// signals the start of an identifier
+					bufferCount = 0;
+					buffer[bufferCount++] = ch;
+					state = SCE_NNCRONTAB_IDENTIFIER;
+				} else if( isdigit(ch) ) {
+					// signals the start of a number
+					bufferCount = 0;
+					buffer[bufferCount++] = ch;
+					state = SCE_NNCRONTAB_NUMBER;
+				} else {
+					// style it the default style..
+					styler.ColourTo(i,SCE_NNCRONTAB_DEFAULT);
+				}
+				break;
+
+			case SCE_NNCRONTAB_COMMENT:
+				// if we find a newline here,
+				// we simply go to default state
+				// else continue to work on it...
+				if( ch == '\n' || ch == '\r' ) {
+					state = SCE_NNCRONTAB_DEFAULT;
+				} else {
+					styler.ColourTo(i,SCE_NNCRONTAB_COMMENT);
+				}
+				break;
+
+			case SCE_NNCRONTAB_TASK:
+				// if we find a newline here,
+				// we simply go to default state
+				// else continue to work on it...
+				if( ch == '\n' || ch == '\r' ) {
+					state = SCE_NNCRONTAB_DEFAULT;
+				} else {
+					styler.ColourTo(i,SCE_NNCRONTAB_TASK);
+				}
+				break;
+
+			case SCE_NNCRONTAB_STRING:
+				if( ch == '%' ) {
+					state = SCE_NNCRONTAB_ENVIRONMENT;
+					insideString = true;
+					styler.ColourTo(i-1,SCE_NNCRONTAB_STRING);
+					break;
+				}
+				// if we find the end of a string char, we simply go to default state
+				// else we're still dealing with an string...
+				if( (ch == '"' && styler.SafeGetCharAt(i-1)!='\\') ||
+					(ch == '\n') || (ch == '\r') ) {
+					state = SCE_NNCRONTAB_DEFAULT;
+				}
+				styler.ColourTo(i,SCE_NNCRONTAB_STRING);
+				break;
+
+			case SCE_NNCRONTAB_ENVIRONMENT:
+				// if we find the end of a string char, we simply go to default state
+				// else we're still dealing with an string...
+				if( ch == '%' && insideString ) {
+					state = SCE_NNCRONTAB_STRING;
+					insideString = false;
+					break;
+				}
+				if( (ch == '%' && styler.SafeGetCharAt(i-1)!='\\')
+					|| (ch == '\n') || (ch == '\r') || (ch == '>') ) {
+					state = SCE_NNCRONTAB_DEFAULT;
+					styler.ColourTo(i,SCE_NNCRONTAB_ENVIRONMENT);
+					break;
+				}
+				styler.ColourTo(i+1,SCE_NNCRONTAB_ENVIRONMENT);
+				break;
+
+			case SCE_NNCRONTAB_IDENTIFIER:
+				// stay  in CONF_IDENTIFIER state until we find a non-alphanumeric
+				if( isalnum(ch) || (ch == '_') || (ch == '-') || (ch == '/') ||
+					(ch == '$') || (ch == '.') || (ch == '<') || (ch == '>') ||
+					(ch == '@') ) {
+					buffer[bufferCount++] = ch;
+				} else {
+					state = SCE_NNCRONTAB_DEFAULT;
+					buffer[bufferCount] = '\0';
+
+					// check if the buffer contains a keyword,
+					// and highlight it if it is a keyword...
+					if(section.InList(buffer)) {
+						styler.ColourTo(i,SCE_NNCRONTAB_SECTION );
+					} else if(keyword.InList(buffer)) {
+						styler.ColourTo(i-1,SCE_NNCRONTAB_KEYWORD );
+					} // else if(strchr(buffer,'/') || strchr(buffer,'.')) {
+					//	styler.ColourTo(i-1,SCE_NNCRONTAB_EXTENSION);
+					// }
+					  else if(modifier.InList(buffer)) {
+						styler.ColourTo(i-1,SCE_NNCRONTAB_MODIFIER );
+					  }	else {
+						styler.ColourTo(i-1,SCE_NNCRONTAB_DEFAULT);
+					}
+					// push back the faulty character
+					chNext = styler[i--];
+				}
+				break;
+
+			case SCE_NNCRONTAB_NUMBER:
+				// stay  in CONF_NUMBER state until we find a non-numeric
+				if( isdigit(ch) /* || ch == '.' */ ) {
+					buffer[bufferCount++] = ch;
+				} else {
+					state = SCE_NNCRONTAB_DEFAULT;
+					buffer[bufferCount] = '\0';
+					// Colourize here... (normal number)
+					styler.ColourTo(i-1,SCE_NNCRONTAB_NUMBER);
+					// push back a character
+					chNext = styler[i--];
+				}
+				break;
+		}
+	}
+	delete []buffer;
+}
+
+static const char * const cronWordListDesc[] = {
+	"Section keywords and Forth words",
+	"nnCrontab keywords",
+	"Modifiers",
+	0
+};
+
+LexerModule lmNncrontab(SCLEX_NNCRONTAB, ColouriseNncrontabDoc, "nncrontab", 0, cronWordListDesc);
diff --git a/Documents/Scintilla/LexCsound.cxx b/Documents/Scintilla/LexCsound.cxx
new file mode 100644
index 0000000..4162c9b
--- /dev/null
+++ b/Documents/Scintilla/LexCsound.cxx
@@ -0,0 +1,210 @@
+// Scintilla source code edit control
+/** @file LexCsound.cxx
+ ** Lexer for Csound (Orchestra & Score)
+ ** Written by Georg Ritter - <ritterfuture A T gmail D O T com>
+ **/
+// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+static inline bool IsAWordChar(const int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '.' ||
+		ch == '_' || ch == '?');
+}
+
+static inline bool IsAWordStart(const int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '_' || ch == '.' ||
+		ch == '%' || ch == '@' || ch == '$' || ch == '?');
+}
+
+static inline bool IsCsoundOperator(char ch) {
+	if (isalnum(ch))
+		return false;
+	// '.' left out as it is used to make up numbers
+	if (ch == '*' || ch == '/' || ch == '-' || ch == '+' ||
+		ch == '(' || ch == ')' || ch == '=' || ch == '^' ||
+		ch == '[' || ch == ']' || ch == '<' || ch == '&' ||
+		ch == '>' || ch == ',' || ch == '|' || ch == '~' ||
+		ch == '%' || ch == ':')
+		return true;
+	return false;
+}
+
+static void ColouriseCsoundDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
+				Accessor &styler) {
+
+	WordList &opcode = *keywordlists[0];
+	WordList &headerStmt = *keywordlists[1];
+	WordList &otherKeyword = *keywordlists[2];
+
+	// Do not leak onto next line
+	if (initStyle == SCE_CSOUND_STRINGEOL)
+		initStyle = SCE_CSOUND_DEFAULT;
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	for (; sc.More(); sc.Forward())
+	{
+		// Handle line continuation generically.
+		if (sc.ch == '\\') {
+			if (sc.chNext == '\n' || sc.chNext == '\r') {
+				sc.Forward();
+				if (sc.ch == '\r' && sc.chNext == '\n') {
+					sc.Forward();
+				}
+				continue;
+			}
+		}
+              
+		// Determine if the current state should terminate.
+		if (sc.state == SCE_CSOUND_OPERATOR) {
+			if (!IsCsoundOperator(static_cast<char>(sc.ch))) {
+			    sc.SetState(SCE_CSOUND_DEFAULT);
+			}
+		}else if (sc.state == SCE_CSOUND_NUMBER) {
+			if (!IsAWordChar(sc.ch)) {
+				sc.SetState(SCE_CSOUND_DEFAULT);
+			}
+		} else if (sc.state == SCE_CSOUND_IDENTIFIER) {
+			if (!IsAWordChar(sc.ch) ) {
+				char s[100];
+				sc.GetCurrent(s, sizeof(s));
+
+				if (opcode.InList(s)) {
+					sc.ChangeState(SCE_CSOUND_OPCODE);
+				} else if (headerStmt.InList(s)) {
+					sc.ChangeState(SCE_CSOUND_HEADERSTMT);
+				} else if (otherKeyword.InList(s)) {
+					sc.ChangeState(SCE_CSOUND_USERKEYWORD);
+				} else if (s[0] == 'p') {
+					sc.ChangeState(SCE_CSOUND_PARAM);
+				} else if (s[0] == 'a') {
+					sc.ChangeState(SCE_CSOUND_ARATE_VAR);
+				} else if (s[0] == 'k') {
+					sc.ChangeState(SCE_CSOUND_KRATE_VAR);
+				} else if (s[0] == 'i') { // covers both i-rate variables and i-statements
+					sc.ChangeState(SCE_CSOUND_IRATE_VAR);
+				} else if (s[0] == 'g') {
+					sc.ChangeState(SCE_CSOUND_GLOBAL_VAR);
+				}
+				sc.SetState(SCE_CSOUND_DEFAULT);
+			}
+		}
+		else if (sc.state == SCE_CSOUND_COMMENT ) {
+			if (sc.atLineEnd) {
+				sc.SetState(SCE_CSOUND_DEFAULT);
+			}
+		}
+		else if ((sc.state == SCE_CSOUND_ARATE_VAR) ||
+			(sc.state == SCE_CSOUND_KRATE_VAR) ||
+		(sc.state == SCE_CSOUND_IRATE_VAR)) {
+			if (!IsAWordChar(sc.ch)) {
+				sc.SetState(SCE_CSOUND_DEFAULT);
+			}
+		}
+		
+		// Determine if a new state should be entered.
+		if (sc.state == SCE_CSOUND_DEFAULT) {
+			if (sc.ch == ';'){
+				sc.SetState(SCE_CSOUND_COMMENT);
+			} else if (isdigit(sc.ch) || (sc.ch == '.' && isdigit(sc.chNext))) {
+				sc.SetState(SCE_CSOUND_NUMBER);
+			} else if (IsAWordStart(sc.ch)) {
+				sc.SetState(SCE_CSOUND_IDENTIFIER);
+			} else if (IsCsoundOperator(static_cast<char>(sc.ch))) {
+				sc.SetState(SCE_CSOUND_OPERATOR);
+			} else if (sc.ch == 'p') {
+				sc.SetState(SCE_CSOUND_PARAM);
+			} else if (sc.ch == 'a') {
+				sc.SetState(SCE_CSOUND_ARATE_VAR);
+			} else if (sc.ch == 'k') {
+				sc.SetState(SCE_CSOUND_KRATE_VAR);
+			} else if (sc.ch == 'i') { // covers both i-rate variables and i-statements
+				sc.SetState(SCE_CSOUND_IRATE_VAR);
+			} else if (sc.ch == 'g') {
+				sc.SetState(SCE_CSOUND_GLOBAL_VAR);
+			}
+		}
+	}
+	sc.Complete();
+}
+
+static void FoldCsoundInstruments(unsigned int startPos, int length, int /* initStyle */, WordList *[], 
+		Accessor &styler) {
+	unsigned int lengthDoc = startPos + length;
+	int visibleChars = 0;
+	int lineCurrent = styler.GetLine(startPos);
+	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
+	int levelCurrent = levelPrev;
+	char chNext = styler[startPos];
+	int stylePrev = 0;
+	int styleNext = styler.StyleAt(startPos);
+	for (unsigned int i = startPos; i < lengthDoc; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+		if ((stylePrev != SCE_CSOUND_OPCODE) && (style == SCE_CSOUND_OPCODE)) {
+			char s[20];
+			unsigned int j = 0;
+			while ((j < (sizeof(s) - 1)) && (iswordchar(styler[i + j]))) {
+				s[j] = styler[i + j];
+				j++;
+			}
+			s[j] = '\0';
+
+			if (strcmp(s, "instr") == 0)
+				levelCurrent++;
+			if (strcmp(s, "endin") == 0)
+				levelCurrent--;
+		}
+
+		if (atEOL) {
+			int lev = levelPrev;
+			if (visibleChars == 0)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if ((levelCurrent > levelPrev) && (visibleChars > 0))
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelPrev = levelCurrent;
+			visibleChars = 0;
+		}
+		if (!isspacechar(ch))
+			visibleChars++;
+		stylePrev = style;
+	}
+	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
+	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
+}
+
+
+static const char * const csoundWordListDesc[] = {
+	"Opcodes",
+	"Header Statements",
+	"User keywords",
+	0
+};
+
+LexerModule lmCsound(SCLEX_CSOUND, ColouriseCsoundDoc, "csound", FoldCsoundInstruments, csoundWordListDesc);
diff --git a/Documents/Scintilla/LexD.cxx b/Documents/Scintilla/LexD.cxx
new file mode 100644
index 0000000..95be129
--- /dev/null
+++ b/Documents/Scintilla/LexD.cxx
@@ -0,0 +1,358 @@
+/** @file LexD.cxx
+ ** Lexer for D.
+ **
+ ** Copyright (c) 2006 by Waldemar Augustyn <waldemar@wdmsys.com>
+ **/
+// Copyright 1998-2005 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+/*/ Nested comments require keeping the value of the nesting level for every
+    position in the document.  But since scintilla always styles line by line,
+    we only need to store one value per line. The non-negative number indicates
+    nesting level at the end of the line.
+/*/
+
+// We use custom qualifiers since it is not clear what D allows.
+
+static bool IsWordStart(int ch) {
+	return isascii(ch) && (isalpha(ch) || ch == '_');
+}
+
+static bool IsWord(int ch) {
+	return isascii(ch) && (isalnum(ch) || ch == '_');
+}
+
+static bool IsDoxygen(int ch) {
+	if (isascii(ch) && islower(ch))
+		return true;
+	if (ch == '$' || ch == '@' || ch == '\\' ||
+		ch == '&' || ch == '#' || ch == '<' || ch == '>' ||
+		ch == '{' || ch == '}' || ch == '[' || ch == ']')
+		return true;
+	return false;
+}
+
+
+static void ColouriseDoc(unsigned int startPos, int length, int initStyle, 
+    WordList *keywordlists[], Accessor &styler, bool caseSensitive) {
+
+    WordList &keywords = *keywordlists[0];
+    WordList &keywords2 = *keywordlists[1];
+    WordList &keywords3 = *keywordlists[2];
+    WordList &keywords4 = *keywordlists[3];
+
+    int styleBeforeDCKeyword = SCE_D_DEFAULT;
+
+    StyleContext sc(startPos, length, initStyle, styler);
+
+    int curLine = styler.GetLine(startPos);
+    int curNcLevel = curLine > 0? styler.GetLineState(curLine-1): 0;
+
+    for (; sc.More(); sc.Forward()) {
+
+        if (sc.atLineStart) {
+            if (sc.state == SCE_D_STRING) {
+                // Prevent SCE_D_STRINGEOL from leaking back to previous line which
+                // ends with a line continuation by locking in the state upto this position.
+                sc.SetState(SCE_D_STRING);
+            }
+            curLine = styler.GetLine(sc.currentPos);
+            styler.SetLineState(curLine, curNcLevel);
+        }
+
+        // Handle line continuation generically.
+        if (sc.ch == '\\') {
+            if (sc.chNext == '\n' || sc.chNext == '\r') {
+                sc.Forward();
+                if (sc.ch == '\r' && sc.chNext == '\n') {
+                    sc.Forward();
+                }
+                continue;
+            }
+        }
+
+        // Determine if the current state should terminate.
+        switch (sc.state) {
+            case SCE_D_OPERATOR:
+                sc.SetState(SCE_D_DEFAULT);
+                break;
+            case SCE_D_NUMBER:
+                // We accept almost anything because of hex. and number suffixes
+                if (!IsWord(sc.ch) && sc.ch != '.') {
+                    sc.SetState(SCE_D_DEFAULT);
+                }
+                break;
+            case SCE_D_IDENTIFIER:
+                if (!IsWord(sc.ch)) {
+                    char s[1000];
+                    if (caseSensitive) {
+                        sc.GetCurrent(s, sizeof(s));
+                    } else {
+                        sc.GetCurrentLowered(s, sizeof(s));
+                    }
+                    if (keywords.InList(s)) {
+                        sc.ChangeState(SCE_D_WORD);
+                    } else if (keywords2.InList(s)) {
+                        sc.ChangeState(SCE_D_WORD2);
+                    } else if (keywords4.InList(s)) {
+                        sc.ChangeState(SCE_D_TYPEDEF);
+                    }
+                    sc.SetState(SCE_D_DEFAULT);
+                }
+                break;
+            case SCE_D_COMMENT:
+                if (sc.Match('*', '/')) {
+                    sc.Forward();
+                    sc.ForwardSetState(SCE_D_DEFAULT);
+                }
+                break;
+            case SCE_D_COMMENTDOC:
+                if (sc.Match('*', '/')) {
+                    sc.Forward();
+                    sc.ForwardSetState(SCE_D_DEFAULT);
+                } else if (sc.ch == '@' || sc.ch == '\\') { // JavaDoc and Doxygen support
+                    // Verify that we have the conditions to mark a comment-doc-keyword
+                    if ((IsASpace(sc.chPrev) || sc.chPrev == '*') && (!IsASpace(sc.chNext))) {
+                        styleBeforeDCKeyword = SCE_D_COMMENTDOC;
+                        sc.SetState(SCE_D_COMMENTDOCKEYWORD);
+                    }
+                }
+                break;
+            case SCE_D_COMMENTLINE:
+                if (sc.atLineStart) {
+                    sc.SetState(SCE_D_DEFAULT);
+                }
+                break;
+            case SCE_D_COMMENTLINEDOC:
+                if (sc.atLineStart) {
+                    sc.SetState(SCE_D_DEFAULT);
+                } else if (sc.ch == '@' || sc.ch == '\\') { // JavaDoc and Doxygen support
+                    // Verify that we have the conditions to mark a comment-doc-keyword
+                    if ((IsASpace(sc.chPrev) || sc.chPrev == '/' || sc.chPrev == '!') && (!IsASpace(sc.chNext))) {
+                        styleBeforeDCKeyword = SCE_D_COMMENTLINEDOC;
+                        sc.SetState(SCE_D_COMMENTDOCKEYWORD);
+                    }
+                }
+                break;
+            case SCE_D_COMMENTDOCKEYWORD:
+                if ((styleBeforeDCKeyword == SCE_D_COMMENTDOC) && sc.Match('*', '/')) {
+                    sc.ChangeState(SCE_D_COMMENTDOCKEYWORDERROR);
+                    sc.Forward();
+                    sc.ForwardSetState(SCE_D_DEFAULT);
+                } else if (!IsDoxygen(sc.ch)) {
+                    char s[100];
+                    if (caseSensitive) {
+                        sc.GetCurrent(s, sizeof(s));
+                    } else {
+                        sc.GetCurrentLowered(s, sizeof(s));
+                    }
+                    if (!IsASpace(sc.ch) || !keywords3.InList(s + 1)) {
+                        sc.ChangeState(SCE_D_COMMENTDOCKEYWORDERROR);
+                    }
+                    sc.SetState(styleBeforeDCKeyword);
+                }
+                break;
+            case SCE_D_COMMENTNESTED:
+                if (sc.Match('+', '/')) {
+                    if (curNcLevel > 0)
+                        curNcLevel -= 1;
+                    curLine = styler.GetLine(sc.currentPos);
+                    styler.SetLineState(curLine, curNcLevel);
+                    sc.Forward();
+                    if (curNcLevel == 0) {
+                        sc.ForwardSetState(SCE_D_DEFAULT);
+		    }
+                }
+                else if (sc.Match('/','+')) {
+                    curNcLevel += 1;
+                    curLine = styler.GetLine(sc.currentPos);
+                    styler.SetLineState(curLine, curNcLevel);
+                    sc.Forward();
+                }
+                break;
+            case SCE_D_STRING:
+                if (sc.atLineEnd) {
+                    sc.ChangeState(SCE_D_STRINGEOL);
+                } else if (sc.ch == '\\') {
+                    if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
+                        sc.Forward();
+                    }
+                } else if (sc.ch == '\"') {
+                    sc.ForwardSetState(SCE_D_DEFAULT);
+                }
+                break;
+            case SCE_D_CHARACTER:
+                if (sc.atLineEnd) {
+                    sc.ChangeState(SCE_D_STRINGEOL);
+                } else if (sc.ch == '\\') {
+                    if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
+                        sc.Forward();
+                    }
+                } else if (sc.ch == '\'') {
+                    sc.ForwardSetState(SCE_D_DEFAULT);
+                }
+                break;
+            case SCE_D_STRINGEOL:
+                if (sc.atLineStart) {
+                    sc.SetState(SCE_D_DEFAULT);
+                }
+                break;
+        }
+
+        // Determine if a new state should be entered.
+        if (sc.state == SCE_D_DEFAULT) {
+            if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
+                    sc.SetState(SCE_D_NUMBER);
+            } else if (IsWordStart(sc.ch)) {
+                    sc.SetState(SCE_D_IDENTIFIER);
+            } else if (sc.Match('/','+')) {
+                curNcLevel += 1;
+		curLine = styler.GetLine(sc.currentPos);
+                styler.SetLineState(curLine, curNcLevel);
+                sc.SetState(SCE_D_COMMENTNESTED);
+                sc.Forward();
+            } else if (sc.Match('/', '*')) {
+                if (sc.Match("/**") || sc.Match("/*!")) {   // Support of Qt/Doxygen doc. style
+                    sc.SetState(SCE_D_COMMENTDOC);
+                } else {
+                    sc.SetState(SCE_D_COMMENT);
+                }
+                sc.Forward();   // Eat the * so it isn't used for the end of the comment
+            } else if (sc.Match('/', '/')) {
+                if ((sc.Match("///") && !sc.Match("////")) || sc.Match("//!"))
+                    // Support of Qt/Doxygen doc. style
+                    sc.SetState(SCE_D_COMMENTLINEDOC);
+                else
+                    sc.SetState(SCE_D_COMMENTLINE);
+            } else if (sc.ch == '\"') {
+                sc.SetState(SCE_D_STRING);
+            } else if (sc.ch == '\'') {
+                sc.SetState(SCE_D_CHARACTER);
+            } else if (isoperator(static_cast<char>(sc.ch))) {
+                sc.SetState(SCE_D_OPERATOR);
+            }
+        }
+    }
+    sc.Complete();
+}
+
+static bool IsStreamCommentStyle(int style) {
+    return style == SCE_D_COMMENT ||
+        style == SCE_D_COMMENTDOC ||
+        style == SCE_D_COMMENTDOCKEYWORD ||
+        style == SCE_D_COMMENTDOCKEYWORDERROR;
+}
+
+// Store both the current line's fold level and the next lines in the
+// level store to make it easy to pick up with each increment
+// and to make it possible to fiddle the current level for "} else {".
+static void FoldDoc(unsigned int startPos, int length, int initStyle, Accessor &styler) {
+    bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
+    bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+    bool foldAtElse = styler.GetPropertyInt("lexer.d.fold.at.else",
+		styler.GetPropertyInt("fold.at.else", 0)) != 0;
+    unsigned int endPos = startPos + length;
+    int visibleChars = 0;
+    int lineCurrent = styler.GetLine(startPos);
+    int levelCurrent = SC_FOLDLEVELBASE;
+    if (lineCurrent > 0)
+        levelCurrent = styler.LevelAt(lineCurrent-1) >> 16;
+    int levelMinCurrent = levelCurrent;
+    int levelNext = levelCurrent;
+    char chNext = styler[startPos];
+    int styleNext = styler.StyleAt(startPos);
+    int style = initStyle;
+    for (unsigned int i = startPos; i < endPos; i++) {
+        char ch = chNext;
+        chNext = styler.SafeGetCharAt(i + 1);
+        int stylePrev = style;
+        style = styleNext;
+        styleNext = styler.StyleAt(i + 1);
+        bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+        if (foldComment && IsStreamCommentStyle(style)) {
+            if (!IsStreamCommentStyle(stylePrev)) {
+                levelNext++;
+            } else if (!IsStreamCommentStyle(styleNext) && !atEOL) {
+                // Comments don't end at end of line and the next character may be unstyled.
+                levelNext--;
+            }
+        }
+        if (style == SCE_D_OPERATOR) {
+            if (ch == '{') {
+                // Measure the minimum before a '{' to allow
+                // folding on "} else {"
+                if (levelMinCurrent > levelNext) {
+                    levelMinCurrent = levelNext;
+                }
+                levelNext++;
+            } else if (ch == '}') {
+                levelNext--;
+            }
+        }
+        if (atEOL) {
+            if (foldComment) {	// Handle nested comments
+		int nc;
+                nc =  styler.GetLineState(lineCurrent);
+                nc -= lineCurrent>0? styler.GetLineState(lineCurrent-1): 0;
+                levelNext += nc;
+	    }
+            int levelUse = levelCurrent;
+            if (foldAtElse) {
+                levelUse = levelMinCurrent;
+            }
+            int lev = levelUse | levelNext << 16;
+            if (visibleChars == 0 && foldCompact)
+                lev |= SC_FOLDLEVELWHITEFLAG;
+            if (levelUse < levelNext)
+                lev |= SC_FOLDLEVELHEADERFLAG;
+            if (lev != styler.LevelAt(lineCurrent)) {
+                styler.SetLevel(lineCurrent, lev);
+            }
+            lineCurrent++;
+            levelCurrent = levelNext;
+            levelMinCurrent = levelCurrent;
+            visibleChars = 0;
+        }
+        if (!IsASpace(ch))
+            visibleChars++;
+    }
+}
+
+static void FoldDDoc(unsigned int startPos, int length, int initStyle,
+    WordList *[], Accessor &styler) {
+        FoldDoc(startPos, length, initStyle, styler);
+}
+
+static const char * const dWordLists[] = {
+            "Primary keywords and identifiers",
+            "Secondary keywords and identifiers",
+            "Documentation comment keywords",
+            "Type definitions and aliases",
+            0,
+        };
+
+static void ColouriseDDoc(unsigned int startPos, int length, 
+    int initStyle, WordList *keywordlists[], Accessor &styler) {
+        ColouriseDoc(startPos, length, initStyle, keywordlists, styler, true);
+}
+
+LexerModule lmD(SCLEX_D, ColouriseDDoc, "d", FoldDDoc, dWordLists);
diff --git a/Documents/Scintilla/LexEScript.cxx b/Documents/Scintilla/LexEScript.cxx
new file mode 100644
index 0000000..295aaec
--- /dev/null
+++ b/Documents/Scintilla/LexEScript.cxx
@@ -0,0 +1,273 @@
+// Scintilla source code edit control
+/** @file LexESCRIPT.cxx
+ ** Lexer for ESCRIPT
+ **/
+// Copyright 2003 by Patrizio Bekerle (patrizio@bekerle.com)
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+
+static inline bool IsAWordChar(const int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '.' || ch == '_');
+}
+
+static inline bool IsAWordStart(const int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '_');
+}
+
+
+
+static void ColouriseESCRIPTDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
+                            Accessor &styler) {
+
+	WordList &keywords = *keywordlists[0];
+	WordList &keywords2 = *keywordlists[1];
+	WordList &keywords3 = *keywordlists[2];
+
+	// Do not leak onto next line
+	/*if (initStyle == SCE_ESCRIPT_STRINGEOL)
+		initStyle = SCE_ESCRIPT_DEFAULT;*/
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	bool caseSensitive = styler.GetPropertyInt("escript.case.sensitive", 0) != 0;
+
+	for (; sc.More(); sc.Forward()) {
+
+		/*if (sc.atLineStart && (sc.state == SCE_ESCRIPT_STRING)) {
+			// Prevent SCE_ESCRIPT_STRINGEOL from leaking back to previous line
+			sc.SetState(SCE_ESCRIPT_STRING);
+		}*/
+
+		// Handle line continuation generically.
+		if (sc.ch == '\\') {
+			if (sc.chNext == '\n' || sc.chNext == '\r') {
+				sc.Forward();
+				if (sc.ch == '\r' && sc.chNext == '\n') {
+					sc.Forward();
+				}
+				continue;
+			}
+		}
+
+		// Determine if the current state should terminate.
+		if (sc.state == SCE_ESCRIPT_OPERATOR || sc.state == SCE_ESCRIPT_BRACE) {
+			sc.SetState(SCE_ESCRIPT_DEFAULT);
+		} else if (sc.state == SCE_ESCRIPT_NUMBER) {
+			if (!IsADigit(sc.ch) || sc.ch != '.') {
+				sc.SetState(SCE_ESCRIPT_DEFAULT);
+			}
+		} else if (sc.state == SCE_ESCRIPT_IDENTIFIER) {
+			if (!IsAWordChar(sc.ch) || (sc.ch == '.')) {
+				char s[100];
+				if (caseSensitive) {
+					sc.GetCurrent(s, sizeof(s));
+				} else {
+					sc.GetCurrentLowered(s, sizeof(s));
+				}
+
+//				sc.GetCurrentLowered(s, sizeof(s));
+
+                                if (keywords.InList(s)) {
+					sc.ChangeState(SCE_ESCRIPT_WORD);
+				} else if (keywords2.InList(s)) {
+					sc.ChangeState(SCE_ESCRIPT_WORD2);
+				} else if (keywords3.InList(s)) {
+					sc.ChangeState(SCE_ESCRIPT_WORD3);
+                                        // sc.state = SCE_ESCRIPT_IDENTIFIER;
+				}
+				sc.SetState(SCE_ESCRIPT_DEFAULT);
+			}
+		} else if (sc.state == SCE_ESCRIPT_COMMENT) {
+			if (sc.Match('*', '/')) {
+				sc.Forward();
+				sc.ForwardSetState(SCE_ESCRIPT_DEFAULT);
+			}
+		} else if (sc.state == SCE_ESCRIPT_COMMENTDOC) {
+			if (sc.Match('*', '/')) {
+				sc.Forward();
+				sc.ForwardSetState(SCE_ESCRIPT_DEFAULT);
+			}
+		} else if (sc.state == SCE_ESCRIPT_COMMENTLINE) {
+			if (sc.atLineEnd) {
+				sc.SetState(SCE_ESCRIPT_DEFAULT);
+			}
+		} else if (sc.state == SCE_ESCRIPT_STRING) {
+			if (sc.ch == '\\') {
+				if (sc.chNext == '\"' || sc.chNext == '\\') {
+					sc.Forward();
+				}
+			} else if (sc.ch == '\"') {
+				sc.ForwardSetState(SCE_ESCRIPT_DEFAULT);
+			}
+		}
+
+		// Determine if a new state should be entered.
+		if (sc.state == SCE_ESCRIPT_DEFAULT) {
+			if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
+				sc.SetState(SCE_ESCRIPT_NUMBER);
+			} else if (IsAWordStart(sc.ch) || (sc.ch == '#')) {
+				sc.SetState(SCE_ESCRIPT_IDENTIFIER);
+			} else if (sc.Match('/', '*')) {
+				sc.SetState(SCE_ESCRIPT_COMMENT);
+				sc.Forward();	// Eat the * so it isn't used for the end of the comment
+			} else if (sc.Match('/', '/')) {
+				sc.SetState(SCE_ESCRIPT_COMMENTLINE);
+			} else if (sc.ch == '\"') {
+				sc.SetState(SCE_ESCRIPT_STRING);
+				//} else if (isoperator(static_cast<char>(sc.ch))) {
+			} else if (sc.ch == '+' || sc.ch == '-' || sc.ch == '*' || sc.ch == '/' || sc.ch == '=' || sc.ch == '<' || sc.ch == '>' || sc.ch == '&' || sc.ch == '|' || sc.ch == '!' || sc.ch == '?' || sc.ch == ':') {
+				sc.SetState(SCE_ESCRIPT_OPERATOR);
+			} else if (sc.ch == '{' || sc.ch == '}') {
+				sc.SetState(SCE_ESCRIPT_BRACE);
+			}
+		}
+
+	}
+	sc.Complete();
+}
+
+
+static int classifyFoldPointESCRIPT(const char* s, const char* prevWord) {
+	int lev = 0;
+	if (strcmp(prevWord, "end") == 0) return lev;
+	if ((strcmp(prevWord, "else") == 0 && strcmp(s, "if") == 0) || strcmp(s, "elseif") == 0)
+		return -1;
+
+        if (strcmp(s, "for") == 0 || strcmp(s, "foreach") == 0
+	    || strcmp(s, "program") == 0 || strcmp(s, "function") == 0
+	    || strcmp(s, "while") == 0 || strcmp(s, "case") == 0
+	    || strcmp(s, "if") == 0 ) {
+		lev = 1;
+	} else if ( strcmp(s, "endfor") == 0 || strcmp(s, "endforeach") == 0
+	    || strcmp(s, "endprogram") == 0 || strcmp(s, "endfunction") == 0
+	    || strcmp(s, "endwhile") == 0 || strcmp(s, "endcase") == 0
+	    || strcmp(s, "endif") == 0 ) {
+		lev = -1;
+	}
+
+	return lev;
+}
+
+
+static bool IsStreamCommentStyle(int style) {
+	return style == SCE_ESCRIPT_COMMENT ||
+	       style == SCE_ESCRIPT_COMMENTDOC ||
+	       style == SCE_ESCRIPT_COMMENTLINE;
+}
+
+static void FoldESCRIPTDoc(unsigned int startPos, int length, int initStyle, WordList *[], Accessor &styler) {
+	//~ bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
+	// Do not know how to fold the comment at the moment.
+	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+        bool foldComment = true;
+	unsigned int endPos = startPos + length;
+	int visibleChars = 0;
+	int lineCurrent = styler.GetLine(startPos);
+	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
+	int levelCurrent = levelPrev;
+	char chNext = styler[startPos];
+	int styleNext = styler.StyleAt(startPos);
+	int style = initStyle;
+
+	int lastStart = 0;
+	char prevWord[32] = "";
+
+	for (unsigned int i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int stylePrev = style;
+		style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+
+            
+		if (foldComment && IsStreamCommentStyle(style)) {
+			if (!IsStreamCommentStyle(stylePrev)) {
+				levelCurrent++;
+			} else if (!IsStreamCommentStyle(styleNext) && !atEOL) {
+				// Comments don't end at end of line and the next character may be unstyled.
+				levelCurrent--;
+			}
+		}
+
+		if (foldComment && (style == SCE_ESCRIPT_COMMENTLINE)) {
+			if ((ch == '/') && (chNext == '/')) {
+				char chNext2 = styler.SafeGetCharAt(i + 2);
+				if (chNext2 == '{') {
+					levelCurrent++;
+				} else if (chNext2 == '}') {
+					levelCurrent--;
+				}
+			}
+		}
+
+		if (stylePrev == SCE_ESCRIPT_DEFAULT && style == SCE_ESCRIPT_WORD3)
+		{
+			// Store last word start point.
+			lastStart = i;
+		}
+
+		if (style == SCE_ESCRIPT_WORD3) {
+			if(iswordchar(ch) && !iswordchar(chNext)) {
+				char s[32];
+				unsigned int j;
+				for(j = 0; ( j < 31 ) && ( j < i-lastStart+1 ); j++) {
+					s[j] = static_cast<char>(tolower(styler[lastStart + j]));
+				}
+				s[j] = '\0';
+				levelCurrent += classifyFoldPointESCRIPT(s, prevWord);
+				strcpy(prevWord, s);
+			}
+		}
+		if (atEOL) {
+			int lev = levelPrev;
+			if (visibleChars == 0 && foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if ((levelCurrent > levelPrev) && (visibleChars > 0))
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelPrev = levelCurrent;
+			visibleChars = 0;
+			strcpy(prevWord, "");
+		}
+
+		if (!isspacechar(ch))
+			visibleChars++;
+	}
+
+	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
+	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
+}
+
+
+
+static const char * const ESCRIPTWordLists[] = {
+	"Primary keywords and identifiers",
+	"Intrinsic functions",
+	"Extended and user defined functions",
+	0,
+};
+
+LexerModule lmESCRIPT(SCLEX_ESCRIPT, ColouriseESCRIPTDoc, "escript", FoldESCRIPTDoc, ESCRIPTWordLists);
diff --git a/Documents/Scintilla/LexEiffel.cxx b/Documents/Scintilla/LexEiffel.cxx
new file mode 100644
index 0000000..03dea5e
--- /dev/null
+++ b/Documents/Scintilla/LexEiffel.cxx
@@ -0,0 +1,238 @@
+// Scintilla source code edit control
+/** @file LexEiffel.cxx
+ ** Lexer for Eiffel.
+ **/
+// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdarg.h>
+#include <stdio.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+static inline bool isEiffelOperator(unsigned int ch) {
+	// '.' left out as it is used to make up numbers
+	return ch == '*' || ch == '/' || ch == '\\' || ch == '-' || ch == '+' ||
+	        ch == '(' || ch == ')' || ch == '=' ||
+	        ch == '{' || ch == '}' || ch == '~' ||
+	        ch == '[' || ch == ']' || ch == ';' ||
+	        ch == '<' || ch == '>' || ch == ',' ||
+	        ch == '.' || ch == '^' || ch == '%' || ch == ':' ||
+		ch == '!' || ch == '@' || ch == '?';
+}
+
+static inline bool IsAWordChar(unsigned int  ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '_');
+}
+
+static inline bool IsAWordStart(unsigned int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '_');
+}
+
+static void ColouriseEiffelDoc(unsigned int startPos,
+                            int length,
+                            int initStyle,
+                            WordList *keywordlists[],
+                            Accessor &styler) {
+
+	WordList &keywords = *keywordlists[0];
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	for (; sc.More(); sc.Forward()) {
+
+		if (sc.state == SCE_EIFFEL_STRINGEOL) {
+			if (sc.ch != '\r' && sc.ch != '\n') {
+				sc.SetState(SCE_EIFFEL_DEFAULT);
+			}
+		} else if (sc.state == SCE_EIFFEL_OPERATOR) {
+			sc.SetState(SCE_EIFFEL_DEFAULT);
+		} else if (sc.state == SCE_EIFFEL_WORD) {
+			if (!IsAWordChar(sc.ch)) {
+				char s[100];
+				sc.GetCurrentLowered(s, sizeof(s));
+				if (!keywords.InList(s)) {
+					sc.ChangeState(SCE_EIFFEL_IDENTIFIER);
+				}
+				sc.SetState(SCE_EIFFEL_DEFAULT);
+			}
+		} else if (sc.state == SCE_EIFFEL_NUMBER) {
+			if (!IsAWordChar(sc.ch)) {
+				sc.SetState(SCE_EIFFEL_DEFAULT);
+			}
+		} else if (sc.state == SCE_EIFFEL_COMMENTLINE) {
+			if (sc.ch == '\r' || sc.ch == '\n') {
+				sc.SetState(SCE_EIFFEL_DEFAULT);
+			}
+		} else if (sc.state == SCE_EIFFEL_STRING) {
+			if (sc.ch == '%') {
+				sc.Forward();
+			} else if (sc.ch == '\"') {
+				sc.Forward();
+				sc.SetState(SCE_EIFFEL_DEFAULT);
+			}
+		} else if (sc.state == SCE_EIFFEL_CHARACTER) {
+			if (sc.ch == '\r' || sc.ch == '\n') {
+				sc.SetState(SCE_EIFFEL_STRINGEOL);
+			} else if (sc.ch == '%') {
+				sc.Forward();
+			} else if (sc.ch == '\'') {
+				sc.Forward();
+				sc.SetState(SCE_EIFFEL_DEFAULT);
+			}
+		}
+
+		if (sc.state == SCE_EIFFEL_DEFAULT) {
+			if (sc.ch == '-' && sc.chNext == '-') {
+				sc.SetState(SCE_EIFFEL_COMMENTLINE);
+			} else if (sc.ch == '\"') {
+				sc.SetState(SCE_EIFFEL_STRING);
+			} else if (sc.ch == '\'') {
+				sc.SetState(SCE_EIFFEL_CHARACTER);
+			} else if (IsADigit(sc.ch) || (sc.ch == '.')) {
+				sc.SetState(SCE_EIFFEL_NUMBER);
+			} else if (IsAWordStart(sc.ch)) {
+				sc.SetState(SCE_EIFFEL_WORD);
+			} else if (isEiffelOperator(sc.ch)) {
+				sc.SetState(SCE_EIFFEL_OPERATOR);
+			}
+		}
+	}
+	sc.Complete();
+}
+
+static bool IsEiffelComment(Accessor &styler, int pos, int len) {
+	return len>1 && styler[pos]=='-' && styler[pos+1]=='-';
+}
+
+static void FoldEiffelDocIndent(unsigned int startPos, int length, int,
+						   WordList *[], Accessor &styler) {
+	int lengthDoc = startPos + length;
+
+	// Backtrack to previous line in case need to fix its fold status
+	int lineCurrent = styler.GetLine(startPos);
+	if (startPos > 0) {
+		if (lineCurrent > 0) {
+			lineCurrent--;
+			startPos = styler.LineStart(lineCurrent);
+		}
+	}
+	int spaceFlags = 0;
+	int indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags, IsEiffelComment);
+	char chNext = styler[startPos];
+	for (int i = startPos; i < lengthDoc; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+
+		if ((ch == '\r' && chNext != '\n') || (ch == '\n') || (i == lengthDoc)) {
+			int lev = indentCurrent;
+			int indentNext = styler.IndentAmount(lineCurrent + 1, &spaceFlags, IsEiffelComment);
+			if (!(indentCurrent & SC_FOLDLEVELWHITEFLAG)) {
+				// Only non whitespace lines can be headers
+				if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext & SC_FOLDLEVELNUMBERMASK)) {
+					lev |= SC_FOLDLEVELHEADERFLAG;
+				} else if (indentNext & SC_FOLDLEVELWHITEFLAG) {
+					// Line after is blank so check the next - maybe should continue further?
+					int spaceFlags2 = 0;
+					int indentNext2 = styler.IndentAmount(lineCurrent + 2, &spaceFlags2, IsEiffelComment);
+					if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext2 & SC_FOLDLEVELNUMBERMASK)) {
+						lev |= SC_FOLDLEVELHEADERFLAG;
+					}
+				}
+			}
+			indentCurrent = indentNext;
+			styler.SetLevel(lineCurrent, lev);
+			lineCurrent++;
+		}
+	}
+}
+
+static void FoldEiffelDocKeyWords(unsigned int startPos, int length, int /* initStyle */, WordList *[],
+                       Accessor &styler) {
+	unsigned int lengthDoc = startPos + length;
+	int visibleChars = 0;
+	int lineCurrent = styler.GetLine(startPos);
+	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
+	int levelCurrent = levelPrev;
+	char chNext = styler[startPos];
+	int stylePrev = 0;
+	int styleNext = styler.StyleAt(startPos);
+	// lastDeferred should be determined by looking back to last keyword in case
+	// the "deferred" is on a line before "class"
+	bool lastDeferred = false;
+	for (unsigned int i = startPos; i < lengthDoc; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+		if ((stylePrev != SCE_EIFFEL_WORD) && (style == SCE_EIFFEL_WORD)) {
+			char s[20];
+			unsigned int j = 0;
+			while ((j < (sizeof(s) - 1)) && (iswordchar(styler[i + j]))) {
+				s[j] = styler[i + j];
+				j++;
+			}
+			s[j] = '\0';
+
+			if (
+				(strcmp(s, "check") == 0) ||
+				(strcmp(s, "debug") == 0) ||
+				(strcmp(s, "deferred") == 0) ||
+				(strcmp(s, "do") == 0) ||
+				(strcmp(s, "from") == 0) ||
+				(strcmp(s, "if") == 0) ||
+				(strcmp(s, "inspect") == 0) ||
+				(strcmp(s, "once") == 0)
+			)
+				levelCurrent++;
+			if (!lastDeferred && (strcmp(s, "class") == 0))
+				levelCurrent++;
+			if (strcmp(s, "end") == 0)
+				levelCurrent--;
+			lastDeferred = strcmp(s, "deferred") == 0;
+		}
+
+		if (atEOL) {
+			int lev = levelPrev;
+			if (visibleChars == 0)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if ((levelCurrent > levelPrev) && (visibleChars > 0))
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelPrev = levelCurrent;
+			visibleChars = 0;
+		}
+		if (!isspacechar(ch))
+			visibleChars++;
+		stylePrev = style;
+	}
+	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
+	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
+}
+
+static const char * const eiffelWordListDesc[] = {
+	"Keywords",
+	0
+};
+
+LexerModule lmEiffel(SCLEX_EIFFEL, ColouriseEiffelDoc, "eiffel", FoldEiffelDocIndent, eiffelWordListDesc);
+LexerModule lmEiffelkw(SCLEX_EIFFELKW, ColouriseEiffelDoc, "eiffelkw", FoldEiffelDocKeyWords, eiffelWordListDesc);
diff --git a/Documents/Scintilla/LexErlang.cxx b/Documents/Scintilla/LexErlang.cxx
new file mode 100644
index 0000000..809dcef
--- /dev/null
+++ b/Documents/Scintilla/LexErlang.cxx
@@ -0,0 +1,526 @@
+// Scintilla source code edit control
+/** @file LexErlang.cxx
+ ** Lexer for Erlang.
+ ** Written by Peter-Henry Mander, based on Matlab lexer by José Fonseca
+ **/
+// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+/*
+   TODO:
+   o  _Param should be a new lexical type
+*/
+
+static int is_radix(int radix, int ch) {
+   int digit;
+   if ( 16 < radix || 2 > radix ) {
+      return 0;
+   }
+   if ( isdigit(ch) ) {
+      digit = ch - '0';
+   } else if ( isxdigit(ch) ) {
+      digit = toupper(ch) - 'A' + 10;
+   } else {
+      return 0;
+   }
+   if ( digit < radix ) {
+      return 1;
+   } else {
+      return 0;
+   }
+}
+
+typedef enum {
+   STATE_NULL,
+   ATOM_UNQUOTED,
+   ATOM_QUOTED,
+   ATOM_FUN_NAME,
+   NODE_NAME_UNQUOTED,
+   NODE_NAME_QUOTED,
+   MACRO_START,
+   MACRO_UNQUOTED,
+   MACRO_QUOTED,
+   RECORD_START,
+   RECORD_UNQUOTED,
+   RECORD_QUOTED,
+   NUMERAL_START,
+   NUMERAL_SIGNED,
+   NUMERAL_RADIX_LITERAL,
+   NUMERAL_SPECULATIVE_MANTISSA,
+   NUMERAL_FLOAT_MANTISSA,
+   NUMERAL_FLOAT_EXPONENT,
+   NUMERAL_FLOAT_SIGNED_EXPONENT,
+   PARSE_ERROR
+} atom_parse_state_t;
+
+static void ColouriseErlangDoc(unsigned int startPos, int length, int initStyle,
+                               WordList *keywordlists[], Accessor &styler) {
+
+	WordList &keywords = *keywordlists[0];
+
+	styler.StartAt(startPos);
+
+	StyleContext sc(startPos, length, initStyle, styler);
+   atom_parse_state_t parse_state = STATE_NULL;
+   int radix_digits = 0;
+   int exponent_digits = 0;
+	for (; sc.More(); sc.Forward()) {
+      if ( STATE_NULL != parse_state ) {
+         switch (parse_state) {
+         case STATE_NULL:
+				sc.SetState(SCE_ERLANG_DEFAULT);
+            break;
+         case ATOM_UNQUOTED:
+            if ( '@' == sc.ch ){
+               parse_state = NODE_NAME_UNQUOTED;
+            } else if ( !isalnum(sc.ch) && sc.ch != '_' ) {
+               char s[100];
+               sc.GetCurrent(s, sizeof(s));
+               if (keywords.InList(s)) {
+                  sc.ChangeState(SCE_ERLANG_KEYWORD);
+                  sc.SetState(SCE_ERLANG_DEFAULT);
+                  parse_state = STATE_NULL;
+               } else {
+                  if ( '/' == sc.ch ) {
+                     parse_state = ATOM_FUN_NAME;
+                  } else {
+                     sc.ChangeState(SCE_ERLANG_ATOM);
+                     sc.SetState(SCE_ERLANG_DEFAULT);
+                     parse_state = STATE_NULL;
+                  }
+               }
+            }
+            break;
+         case ATOM_QUOTED:
+            if ( '@' == sc.ch ){
+               parse_state = NODE_NAME_QUOTED;
+            } else if ( '\'' == sc.ch && '\\' != sc.chPrev ) {
+               sc.ChangeState(SCE_ERLANG_ATOM);
+               sc.ForwardSetState(SCE_ERLANG_DEFAULT);
+               parse_state = STATE_NULL;
+            }
+            break;
+         case ATOM_FUN_NAME:
+            if ( !isdigit(sc.ch) ) {
+               sc.ChangeState(SCE_ERLANG_FUNCTION_NAME);
+               sc.SetState(SCE_ERLANG_DEFAULT);
+               parse_state = STATE_NULL;
+            }
+            break;
+         case NODE_NAME_QUOTED:
+            if ( '@' == sc.ch ) {
+               sc.SetState(SCE_ERLANG_DEFAULT);
+               parse_state = STATE_NULL;
+            } else if ( '\'' == sc.ch && '\\' != sc.chPrev ) {
+               sc.ChangeState(SCE_ERLANG_NODE_NAME);
+               sc.ForwardSetState(SCE_ERLANG_DEFAULT);
+               parse_state = STATE_NULL;
+            }
+            break;
+         case NODE_NAME_UNQUOTED:
+            if ( '@' == sc.ch ) {
+               sc.SetState(SCE_ERLANG_DEFAULT);
+               parse_state = STATE_NULL;
+            } else if ( !isalnum(sc.ch) && sc.ch != '_' ) {
+               sc.ChangeState(SCE_ERLANG_NODE_NAME);
+               sc.SetState(SCE_ERLANG_DEFAULT);
+               parse_state = STATE_NULL;
+            }
+            break;
+         case RECORD_START:
+            if ( '\'' == sc.ch ) {
+               parse_state = RECORD_QUOTED;
+            } else if (isalpha(sc.ch) && islower(sc.ch)) {
+               parse_state = RECORD_UNQUOTED;
+            } else { // error
+               sc.SetState(SCE_ERLANG_DEFAULT);
+               parse_state = STATE_NULL;
+            }
+            break;
+         case RECORD_QUOTED:
+            if ( '\'' == sc.ch && '\\' != sc.chPrev ) {
+               sc.ChangeState(SCE_ERLANG_RECORD);
+               sc.ForwardSetState(SCE_ERLANG_DEFAULT);
+               parse_state = STATE_NULL;
+            }
+            break;
+         case RECORD_UNQUOTED:
+            if ( !isalpha(sc.ch) && '_' != sc.ch ) {
+               sc.ChangeState(SCE_ERLANG_RECORD);
+               sc.SetState(SCE_ERLANG_DEFAULT);
+               parse_state = STATE_NULL;
+            }
+            break;
+         case MACRO_START:
+            if ( '\'' == sc.ch ) {
+               parse_state = MACRO_QUOTED;
+            } else if (isalpha(sc.ch)) {
+               parse_state = MACRO_UNQUOTED;
+            } else { // error
+               sc.SetState(SCE_ERLANG_DEFAULT);
+               parse_state = STATE_NULL;
+            }
+            break;
+         case MACRO_UNQUOTED:
+            if ( !isalpha(sc.ch) && '_' != sc.ch ) {
+               sc.ChangeState(SCE_ERLANG_MACRO);
+               sc.SetState(SCE_ERLANG_DEFAULT);
+               parse_state = STATE_NULL;
+            }
+            break;
+         case MACRO_QUOTED:
+            if ( '\'' == sc.ch && '\\' != sc.chPrev ) {
+               sc.ChangeState(SCE_ERLANG_MACRO);
+               sc.ForwardSetState(SCE_ERLANG_DEFAULT);
+               parse_state = STATE_NULL;
+            }
+            break;
+         case NUMERAL_START:
+            if ( isdigit(sc.ch) ) {
+               radix_digits *= 10;
+               radix_digits += sc.ch - '0'; // Assuming ASCII here!
+            } else if ( '#' == sc.ch ) {
+               if ( 2 > radix_digits || 16 < radix_digits) {
+                  sc.SetState(SCE_ERLANG_DEFAULT);
+                  parse_state = STATE_NULL;
+               } else {
+                  parse_state = NUMERAL_RADIX_LITERAL;
+               }
+            } else if ( '.' == sc.ch && isdigit(sc.chNext)) {
+               radix_digits = 0;
+               parse_state = NUMERAL_FLOAT_MANTISSA;
+            } else if ( 'e' == sc.ch || 'E' == sc.ch ) {
+               exponent_digits = 0;
+               parse_state = NUMERAL_FLOAT_EXPONENT;
+            } else {
+               radix_digits = 0;
+               sc.ChangeState(SCE_ERLANG_NUMBER);
+               sc.SetState(SCE_ERLANG_DEFAULT);
+               parse_state = STATE_NULL;
+            }
+            break;
+         case NUMERAL_RADIX_LITERAL:
+            if ( !is_radix(radix_digits,sc.ch) ) {
+               radix_digits = 0;
+               if ( !isalnum(sc.ch) ) {
+                  sc.ChangeState(SCE_ERLANG_NUMBER);
+               }
+               sc.SetState(SCE_ERLANG_DEFAULT);
+               parse_state = STATE_NULL;
+            }
+            break;
+         case NUMERAL_FLOAT_MANTISSA:
+            if ( 'e' == sc.ch || 'E' == sc.ch ) {
+               exponent_digits = 0;
+               parse_state = NUMERAL_FLOAT_EXPONENT;
+            } else if ( !isdigit(sc.ch) ) {
+               sc.ChangeState(SCE_ERLANG_NUMBER);
+               sc.SetState(SCE_ERLANG_DEFAULT);
+               parse_state = STATE_NULL;
+            }
+            break;
+         case NUMERAL_FLOAT_EXPONENT:
+            if ( '-' == sc.ch || '+' == sc.ch ) {
+               parse_state = NUMERAL_FLOAT_SIGNED_EXPONENT;
+            } else if ( !isdigit(sc.ch) ) {
+               if ( 0 < exponent_digits ) {
+                  sc.ChangeState(SCE_ERLANG_NUMBER);
+               }
+               sc.SetState(SCE_ERLANG_DEFAULT);
+               parse_state = STATE_NULL;
+            } else {
+               ++exponent_digits;
+            }
+            break;
+         case NUMERAL_FLOAT_SIGNED_EXPONENT:
+            if ( !isdigit(sc.ch) ) {
+               if ( 0 < exponent_digits ) {
+                  sc.ChangeState(SCE_ERLANG_NUMBER);
+               }
+               sc.SetState(SCE_ERLANG_DEFAULT);
+               parse_state = STATE_NULL;
+            } else {
+               ++exponent_digits;
+            }
+            break;
+         case NUMERAL_SIGNED:
+            if ( !isdigit(sc.ch) ) {
+               sc.ChangeState(SCE_ERLANG_NUMBER);
+               sc.SetState(SCE_ERLANG_DEFAULT);
+               parse_state = STATE_NULL;
+            } else if ( '.' == sc.ch ) {
+               parse_state = NUMERAL_FLOAT_MANTISSA;
+            }
+            break;
+         case NUMERAL_SPECULATIVE_MANTISSA:
+            if ( !isdigit(sc.ch) ) {
+               sc.ChangeState(SCE_ERLANG_OPERATOR);
+               sc.SetState(SCE_ERLANG_DEFAULT);
+               parse_state = STATE_NULL;
+            } else {
+               parse_state = NUMERAL_FLOAT_MANTISSA;
+            }
+            break;
+         case PARSE_ERROR:
+				sc.SetState(SCE_ERLANG_DEFAULT);
+            parse_state = STATE_NULL;
+            break;
+         }
+      } else if (sc.state == SCE_ERLANG_OPERATOR) {
+			if (sc.chPrev == '.') {
+				if (sc.ch == '*' || sc.ch == '/' || sc.ch == '\\' || sc.ch == '^') {
+					sc.ForwardSetState(SCE_ERLANG_DEFAULT);
+				} else if (sc.ch == '\'') {
+					sc.ForwardSetState(SCE_ERLANG_DEFAULT);
+				} else {
+					sc.SetState(SCE_ERLANG_DEFAULT);
+				}
+			} else {
+				sc.SetState(SCE_ERLANG_DEFAULT);
+			}
+		} else if (sc.state == SCE_ERLANG_VARIABLE) {
+			if (!isalnum(sc.ch) && sc.ch != '_') {
+            sc.SetState(SCE_ERLANG_DEFAULT);
+			}
+		} else if (sc.state == SCE_ERLANG_STRING) {
+			if (sc.ch == '\"' && sc.chPrev != '\\') {
+				sc.ForwardSetState(SCE_ERLANG_DEFAULT);
+			}
+		} else if (sc.state == SCE_ERLANG_COMMENT ) {
+			if (sc.atLineEnd) {
+				sc.SetState(SCE_ERLANG_DEFAULT);
+			}
+      } else if (sc.state == SCE_ERLANG_CHARACTER ) {
+         if ( sc.chPrev == '\\' ) {
+            sc.ForwardSetState(SCE_ERLANG_DEFAULT);
+         } else if ( sc.ch != '\\' ) {
+            sc.ForwardSetState(SCE_ERLANG_DEFAULT);
+         }
+      }
+
+		if (sc.state == SCE_ERLANG_DEFAULT) {
+			if (sc.ch == '%') {
+				sc.SetState(SCE_ERLANG_COMMENT);
+			} else if (sc.ch == '\"') {
+            sc.SetState(SCE_ERLANG_STRING);
+         } else if (sc.ch == '#') {
+            parse_state = RECORD_START;
+				sc.SetState(SCE_ERLANG_UNKNOWN);
+         } else if (sc.ch == '?') {
+            parse_state = MACRO_START;
+				sc.SetState(SCE_ERLANG_UNKNOWN);
+         } else if (sc.ch == '$') {
+				sc.SetState(SCE_ERLANG_CHARACTER);
+         } else if (sc.ch == '\'') {
+            parse_state = ATOM_QUOTED;
+				sc.SetState(SCE_ERLANG_UNKNOWN);
+			} else if ( isdigit(sc.ch) ) {
+            parse_state = NUMERAL_START;
+            radix_digits = sc.ch - '0';
+				sc.SetState(SCE_ERLANG_UNKNOWN);
+         } else if ( '.' == sc.ch ) {
+            parse_state = NUMERAL_SPECULATIVE_MANTISSA;
+				sc.SetState(SCE_ERLANG_UNKNOWN);
+			} else if (isalpha(sc.ch) && isupper(sc.ch)) {
+				sc.SetState(SCE_ERLANG_VARIABLE);
+			} else if (isalpha(sc.ch)) {
+            parse_state = ATOM_UNQUOTED;
+				sc.SetState(SCE_ERLANG_UNKNOWN);
+			} else if (isoperator(static_cast<char>(sc.ch)) || sc.ch == '\\') {
+				sc.SetState(SCE_ERLANG_OPERATOR);
+			}
+		}
+	}
+	sc.Complete();
+}
+
+static int ClassifyFoldPointErlang(
+   Accessor &styler,
+   int styleNext,
+   int keyword_start
+) {
+	int lev = 0;
+   if ( styler.Match(keyword_start,"case")
+      || (
+            styler.Match(keyword_start,"fun")
+         && SCE_ERLANG_FUNCTION_NAME != styleNext)
+      || styler.Match(keyword_start,"if")
+      || styler.Match(keyword_start,"query")
+      || styler.Match(keyword_start,"receive")
+   ) {
+      ++lev;
+   } else if ( styler.Match(keyword_start,"end") ) {
+      --lev;
+   }
+	return lev;
+}
+
+
+static void FoldErlangDoc(
+   unsigned int startPos, int length, int initStyle,
+   WordList** /*keywordlists*/, Accessor &styler
+) {
+	unsigned int endPos = startPos + length;
+	//~ int visibleChars = 0;
+	int lineCurrent = styler.GetLine(startPos);
+	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
+	int levelCurrent = levelPrev;
+	char chNext = styler.SafeGetCharAt(startPos);
+	int styleNext = styler.StyleAt(startPos);
+	int style = initStyle;
+	int keyword_start = 0;
+
+   bool fold_keywords = true;
+   bool fold_comments = true;
+   bool fold_braces = true;
+   bool fold_function_clauses = false;
+   bool fold_clauses = false;
+
+   //int clause_level = 0;
+
+	for (unsigned int i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int stylePrev = style;
+		style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+
+      if ( (stylePrev != SCE_ERLANG_KEYWORD) && (style == SCE_ERLANG_KEYWORD) ) {
+         keyword_start = i;
+      }
+      if ( fold_keywords ) {
+         if ( (stylePrev == SCE_ERLANG_KEYWORD)
+            && (style != SCE_ERLANG_KEYWORD)
+            && (style != SCE_ERLANG_ATOM)
+         ) {
+            levelCurrent += ClassifyFoldPointErlang(styler,styleNext,keyword_start);
+         }
+      }
+
+      if ( fold_comments ) {
+         if (style == SCE_ERLANG_COMMENT) {
+            if ((ch == '%') && (chNext == '{')) {
+               levelCurrent++;
+            } else if ((ch == '%') && (chNext == '}')) {
+               levelCurrent--;
+            }
+         }
+      }
+
+      if ( fold_function_clauses ) {
+         if ( (SC_FOLDLEVELBASE == levelCurrent) /*&& (style == SCE_ERLANG_OPERATOR)*/ ) {
+            if ( (ch == '-') && (chNext == '>')) {
+               //~ fprintf(stderr,"levelCurrent=%d\n", levelCurrent);
+               //++clause_level;
+               //~ if ( 0 < clause_level )
+                  ++levelCurrent;
+            }
+         }
+         //~ if (  (stylePrev != SCE_ERLANG_RECORD)
+            //~ && (style != SCE_ERLANG_NUMBER)
+            //~ && (style != SCE_ERLANG_STRING)
+            //~ && (style != SCE_ERLANG_COMMENT)
+         //~ ) {
+            if ( (SC_FOLDLEVELBASE+1 == levelCurrent) && (ch == '.') ) {
+               //--clause_level;
+               //~ if ( 0 == clause_level )
+                  --levelCurrent;
+            }
+         //~ }
+      }
+
+      if ( fold_clauses ) {
+         if ( (0 < levelCurrent) && (style == SCE_ERLANG_OPERATOR) ) {
+            if ((ch == '-') && (chNext == '>')) {
+               levelCurrent++;
+            }
+            if ( (ch == ';') ) {
+               levelCurrent--;
+            }
+         }
+         if ( (stylePrev != SCE_ERLANG_RECORD)
+            && (style != SCE_ERLANG_NUMBER)
+            && (style != SCE_ERLANG_STRING)
+            && (style != SCE_ERLANG_COMMENT)
+         ) {
+            if ( (ch == '.') ) {
+               levelCurrent--;
+            }
+         }
+         if (  (stylePrev == SCE_ERLANG_KEYWORD)
+            && (style != SCE_ERLANG_KEYWORD)
+            && (style != SCE_ERLANG_ATOM)
+            && (
+               styler.Match(keyword_start,"end") // 'end' counted twice if fold_keywords too
+               || styler.Match(keyword_start,"after") )
+         ) {
+            levelCurrent--;
+         }
+      }
+
+      if ( fold_braces ) {
+         if (style == SCE_ERLANG_OPERATOR) {
+            if ( (ch == '{') || (ch == '(') || (ch == '[') ) {
+               levelCurrent++;
+            } else if ( (ch == '}') || (ch == ')') || (ch == ']') ) {
+               levelCurrent--;
+            }
+         }
+      }
+
+		if (atEOL) {
+			int lev = levelPrev;
+			//~ if (visibleChars == 0 && foldCompact)
+				//~ lev |= SC_FOLDLEVELWHITEFLAG;
+			//~ if ((levelCurrent > levelPrev) && (visibleChars > 0))
+			if ((levelCurrent > levelPrev)) {
+				lev |= SC_FOLDLEVELHEADERFLAG;
+         }
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelPrev = levelCurrent;
+			//~ visibleChars = 0;
+		}
+		//~ if (!isspacechar(ch))
+			//~ visibleChars++;
+
+	}
+	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
+	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
+}
+
+static const char * const erlangWordListDesc[] = {
+	"Keywords",
+	0
+};
+
+LexerModule lmErlang(
+   SCLEX_ERLANG,
+   ColouriseErlangDoc,
+   "erlang",
+   FoldErlangDoc,
+   erlangWordListDesc);
+
diff --git a/Documents/Scintilla/LexFlagship.cxx b/Documents/Scintilla/LexFlagship.cxx
new file mode 100644
index 0000000..baf2941
--- /dev/null
+++ b/Documents/Scintilla/LexFlagship.cxx
@@ -0,0 +1,230 @@
+// Scintilla source code edit control
+/** @file LexFlagShip.cxx
+ ** Lexer for FlagShip 
+ ** (Syntactically compatible to other XBase dialects, like dBase, Clipper, Fox etc.)
+ **/
+// Copyright 2005 by Randy Butler
+// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+static bool IsFlagShipComment(Accessor &styler, int pos, int len) {
+	return len>0 && styler[pos]=='\'';
+}
+
+static inline bool IsTypeCharacter(int ch) {
+	return ch == '%' || ch == '&' || ch == '@' || ch == '!' || ch == '#' || ch == '$';
+}
+
+// Extended to accept accented characters
+static inline bool IsAWordChar(int ch) {
+	return ch >= 0x80 ||
+	       (isalnum(ch) || ch == '.' || ch == '_');
+}
+
+static inline bool IsAWordStart(int ch) {
+	return ch >= 0x80 ||
+	       (isalnum(ch) || ch == '_');
+}
+
+static inline bool IsADateCharacter(const int ch) {
+	return (ch < 0x80) &&
+		(isalnum(ch) || ch == '|' || ch == '-' || ch == '/' || ch == ':' || ch == ' ' || ch == '\t');
+}
+
+
+static void ColouriseFlagShipDoc(unsigned int startPos, int length, int initStyle,
+                           WordList *keywordlists[], Accessor &styler) {
+
+	//bool FSScriptSyntax = true;
+	WordList &keywords = *keywordlists[0];
+	WordList &keywords2 = *keywordlists[1];
+	WordList &keywords3 = *keywordlists[2];
+	WordList &keywords4 = *keywordlists[3];
+
+	styler.StartAt(startPos);
+
+	int visibleChars = 0;
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	for (; sc.More(); sc.Forward()) {
+
+		if (sc.state == SCE_FS_OPERATOR) {
+			sc.SetState(SCE_FS_DEFAULT);
+		} else if (sc.state == SCE_FS_IDENTIFIER) {
+			if (!IsAWordChar(sc.ch)) {
+				char s[100];
+				sc.GetCurrentLowered(s, sizeof(s));
+				if (keywords.InList(s)) {
+					sc.ChangeState(SCE_FS_KEYWORD);
+				} else if (keywords2.InList(s)) {
+					sc.ChangeState(SCE_FS_KEYWORD2);
+				} else if (keywords3.InList(s)) {
+					sc.ChangeState(SCE_FS_KEYWORD3);
+				} else if (keywords4.InList(s)) {
+					sc.ChangeState(SCE_FS_KEYWORD4);
+				}// Else, it is really an identifier...
+				sc.SetState(SCE_FS_DEFAULT);
+			}
+		} else if (sc.state == SCE_FS_NUMBER) {
+			if (!IsAWordChar(sc.ch)) {
+				sc.SetState(SCE_FS_DEFAULT);
+			}
+		} else if (sc.state == SCE_FS_STRING) {
+			// VB doubles quotes to preserve them, so just end this string
+			// state now as a following quote will start again
+			if (sc.ch == '\"') {
+				if (tolower(sc.chNext) == 'c') {
+					sc.Forward();
+				}
+				sc.ForwardSetState(SCE_FS_DEFAULT);
+			} else if (sc.atLineEnd) {
+				sc.ChangeState(SCE_FS_STRINGEOL);
+				sc.ForwardSetState(SCE_FS_DEFAULT);
+			}
+		} else if (sc.state == SCE_FS_COMMENT) {
+			if (sc.Match('*', '/')) {   // new code
+				sc.Forward();
+				sc.ForwardSetState(SCE_FS_DEFAULT);
+			//if (sc.atLineEnd) {       // old code
+			//	sc.SetState(SCE_FS_DEFAULT);
+			}
+		} else if (sc.state == SCE_FS_COMMENTLINE) {  //new code
+			if (sc.ch == '\r' || sc.ch == '\n') {
+				sc.SetState(SCE_FS_DEFAULT);
+				visibleChars = 0;
+			}
+		} else if (sc.state == SCE_FS_PREPROCESSOR) {
+			if (sc.atLineEnd) {
+				sc.SetState(SCE_FS_DEFAULT);
+			}
+		} else if (sc.state == SCE_FS_DATE) {
+			if (sc.ch == '#' || !IsADateCharacter(sc.chNext)) {
+				sc.ForwardSetState(SCE_FS_DEFAULT);
+			}
+		}
+
+		// Determine if a new state should be entered.
+		if (sc.state == SCE_FS_DEFAULT) {
+			if (sc.Match('/', '*')) {  // New code
+				sc.SetState(SCE_FS_COMMENT);
+				sc.Forward();	// Eat the * so it isn't used for the end of the comment
+			//if (sc.ch == '\'') {  // Old code
+			//	sc.SetState(SCE_FS_COMMENT); // old code
+			} else if (sc.Match('/', '/')) { // New code
+				sc.SetState(SCE_FS_COMMENTLINE);
+			} else if (sc.ch == '\"') {
+				sc.SetState(SCE_FS_STRING);
+			} else if (sc.ch == '#' && visibleChars == 0) {
+				// Preprocessor commands are alone on their line
+				sc.SetState(SCE_FS_PREPROCESSOR);
+			} else if (sc.ch == '#') {
+				int n = 1;
+				int chSeek = ' ';
+				while ((n < 100) && (chSeek == ' ' || chSeek == '\t')) {
+					chSeek = sc.GetRelative(n);
+					n++;
+				}
+				if (IsADigit(chSeek)) {
+					sc.SetState(SCE_FS_DATE);
+				} else {
+					sc.SetState(SCE_FS_OPERATOR);
+				}
+			} else if (sc.ch == '&' && tolower(sc.chNext) == 'h') {
+				sc.SetState(SCE_FS_NUMBER);
+			} else if (sc.ch == '&' && tolower(sc.chNext) == 'o') {
+				sc.SetState(SCE_FS_NUMBER);
+			} else if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
+				sc.SetState(SCE_FS_NUMBER);
+			} else if (IsAWordStart(sc.ch) || (sc.ch == '[')) {
+				sc.SetState(SCE_FS_IDENTIFIER);
+			} else if (isoperator(static_cast<char>(sc.ch)) || (sc.ch == '\\')) {
+				sc.SetState(SCE_FS_OPERATOR);
+			}
+		}
+
+		if (sc.atLineEnd) {
+			visibleChars = 0;
+		}
+		if (!IsASpace(sc.ch)) {
+			visibleChars++;
+		}
+	}
+	sc.Complete();
+}
+
+static void FoldFlagShipDoc(unsigned int startPos, int length, int,
+						   WordList *[], Accessor &styler) {
+
+	int endPos = startPos + length;
+
+	// Backtrack to previous line in case need to fix its fold status
+	int lineCurrent = styler.GetLine(startPos);
+	if (startPos > 0) {
+		if (lineCurrent > 0) {
+			lineCurrent--;
+			startPos = styler.LineStart(lineCurrent);
+		}
+	}
+	int spaceFlags = 0;
+	int indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags, IsFlagShipComment);
+	char chNext = styler[startPos];
+	for (int i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+
+		if ((ch == '\r' && chNext != '\n') || (ch == '\n') || (i == endPos)) {
+			int lev = indentCurrent;
+			int indentNext = styler.IndentAmount(lineCurrent + 1, &spaceFlags, IsFlagShipComment);
+			if (!(indentCurrent & SC_FOLDLEVELWHITEFLAG)) {
+				// Only non whitespace lines can be headers
+				if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext & SC_FOLDLEVELNUMBERMASK)) {
+					lev |= SC_FOLDLEVELHEADERFLAG;
+				} else if (indentNext & SC_FOLDLEVELWHITEFLAG) {
+					// Line after is blank so check the next - maybe should continue further?
+					int spaceFlags2 = 0;
+					int indentNext2 = styler.IndentAmount(lineCurrent + 2, &spaceFlags2, IsFlagShipComment);
+					if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext2 & SC_FOLDLEVELNUMBERMASK)) {
+						lev |= SC_FOLDLEVELHEADERFLAG;
+					}
+				}
+			}
+			indentCurrent = indentNext;
+			styler.SetLevel(lineCurrent, lev);
+			lineCurrent++;
+		}
+	}
+}
+
+
+static const char * const FSWordListDesc[] = {
+	"Keywords",
+	"functions",
+	"user2",
+	"user3",
+	0
+};
+
+LexerModule lmFlagShip(SCLEX_FLAGSHIP, ColouriseFlagShipDoc, "flagship", FoldFlagShipDoc, FSWordListDesc);
+
+
+
diff --git a/Documents/Scintilla/LexForth.cxx b/Documents/Scintilla/LexForth.cxx
new file mode 100644
index 0000000..f097b0e
--- /dev/null
+++ b/Documents/Scintilla/LexForth.cxx
@@ -0,0 +1,352 @@
+// Scintilla source code edit control
+/** @file LexCrontab.cxx
+ ** Lexer to use with extended crontab files used by a powerful
+ ** Windows scheduler/event monitor/automation manager nnCron.
+ ** (http://nemtsev.eserv.ru/)
+ **/
+// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+bool is_whitespace(int ch){
+    return ch == '\n' || ch == '\r' || ch == '\t' || ch == ' ';
+}
+
+bool is_blank(int ch){
+    return ch == '\t' || ch == ' ';
+}
+//#define FORTH_DEBUG
+#ifdef FORTH_DEBUG
+static FILE *f_debug;
+#define log(x)  fputs(f_debug,x);
+#else
+#define log(x)
+#endif
+
+#define STATE_LOCALE
+#define BL ' '
+
+static Accessor *st;
+static int cur_pos,pos1,pos2,pos0,lengthDoc;
+char *buffer;
+
+char getChar(bool is_bl){
+    char ch=st->SafeGetCharAt(cur_pos);
+    if(is_bl) if(is_whitespace(ch)) ch=BL;
+    return ch;
+}
+
+char getCharBL(){
+    char ch=st->SafeGetCharAt(cur_pos);
+    return ch;
+}
+bool is_eol(char ch){
+    return ch=='\n' || ch=='\r';
+}
+
+int parse(char ch, bool skip_eol){
+// pos1 - start pos of word
+// pos2 - pos after of word
+// pos0 - start pos
+    char c=0;
+    int len;
+    bool is_bl=ch==BL;
+    pos0=pos1=pos2=cur_pos;
+    for(;cur_pos<lengthDoc && (c=getChar(is_bl))==ch; cur_pos++){
+        if(is_eol(c) && !skip_eol){
+            pos2=pos1;
+            return 0;
+        }
+    }
+    pos1=cur_pos;
+    pos2=pos1;
+    if(cur_pos==lengthDoc) return 0;
+    for(len=0;cur_pos<lengthDoc && (c=getChar(is_bl))!=ch; cur_pos++){
+        if(is_eol(c) && !skip_eol) break;
+        pos2++;
+        buffer[len++]=c;
+    }
+    if(c==ch) pos2--;
+    buffer[len]='\0';
+#ifdef FORTH_DEBUG
+    fprintf(f_debug,"parse: %c %s\n",ch,buffer);
+#endif
+    return len;
+}
+
+bool _is_number(char *s,int base){
+    for(;*s;s++){
+        int digit=((int)*s)-(int)'0';
+#ifdef FORTH_DEBUG
+    fprintf(f_debug,"digit: %c %d\n",*s,digit);
+#endif
+        if(digit>9 && base>10) digit-=7;
+        if(digit<0) return false;
+        if(digit>=base) return false;
+    }
+    return true;
+}
+
+bool is_number(char *s){
+    if(strncmp(s,"0x",2)==0) return _is_number(s+2,16);
+    return _is_number(s,10);
+}
+
+static void ColouriseForthDoc(unsigned int startPos, int length, int, WordList *keywordLists[], Accessor &styler)
+{
+    st=&styler;
+    cur_pos=startPos;
+    lengthDoc = startPos + length;
+    buffer = new char[length];
+
+#ifdef FORTH_DEBUG
+    f_debug=fopen("c:\\sci.log","at");
+#endif
+
+    WordList &control = *keywordLists[0];
+    WordList &keyword = *keywordLists[1];
+    WordList &defword = *keywordLists[2];
+    WordList &preword1 = *keywordLists[3];
+    WordList &preword2 = *keywordLists[4];
+    WordList &strings = *keywordLists[5];
+
+    // go through all provided text segment
+    // using the hand-written state machine shown below
+    styler.StartAt(startPos);
+    styler.StartSegment(startPos);
+    while(parse(BL,true)!=0){
+        if(pos0!=pos1){
+            styler.ColourTo(pos0,SCE_FORTH_DEFAULT);
+            styler.ColourTo(pos1-1,SCE_FORTH_DEFAULT);
+        }
+        if(strcmp("\\",buffer)==0){
+            styler.ColourTo(pos1,SCE_FORTH_COMMENT);
+            parse(1,false);
+            styler.ColourTo(pos2,SCE_FORTH_COMMENT);
+        }else if(strcmp("(",buffer)==0){
+            styler.ColourTo(pos1,SCE_FORTH_COMMENT);
+            parse(')',true);
+            if(cur_pos<lengthDoc) cur_pos++;
+            styler.ColourTo(cur_pos,SCE_FORTH_COMMENT);
+        }else if(strcmp("[",buffer)==0){
+            styler.ColourTo(pos1,SCE_FORTH_STRING);
+            parse(']',true);
+            if(cur_pos<lengthDoc) cur_pos++;
+            styler.ColourTo(cur_pos,SCE_FORTH_STRING);
+        }else if(strcmp("{",buffer)==0){
+            styler.ColourTo(pos1,SCE_FORTH_LOCALE);
+            parse('}',false);
+            if(cur_pos<lengthDoc) cur_pos++;
+            styler.ColourTo(cur_pos,SCE_FORTH_LOCALE);
+        }else if(strings.InList(buffer)) {
+            styler.ColourTo(pos1,SCE_FORTH_STRING);
+            parse('"',false);
+            if(cur_pos<lengthDoc) cur_pos++;
+            styler.ColourTo(cur_pos,SCE_FORTH_STRING);
+        }else if(control.InList(buffer)) {
+            styler.ColourTo(pos1,SCE_FORTH_CONTROL);
+            styler.ColourTo(pos2,SCE_FORTH_CONTROL);
+        }else if(keyword.InList(buffer)) {
+            styler.ColourTo(pos1,SCE_FORTH_KEYWORD);
+            styler.ColourTo(pos2,SCE_FORTH_KEYWORD);
+        }else if(defword.InList(buffer)) {
+            styler.ColourTo(pos1,SCE_FORTH_KEYWORD);
+            styler.ColourTo(pos2,SCE_FORTH_KEYWORD);
+            parse(BL,false);
+            styler.ColourTo(pos1-1,SCE_FORTH_DEFAULT);
+            styler.ColourTo(pos1,SCE_FORTH_DEFWORD);
+            styler.ColourTo(pos2,SCE_FORTH_DEFWORD);
+        }else if(preword1.InList(buffer)) {
+            styler.ColourTo(pos1,SCE_FORTH_PREWORD1);
+            parse(BL,false);
+            styler.ColourTo(pos2,SCE_FORTH_PREWORD1);
+        }else if(preword2.InList(buffer)) {
+            styler.ColourTo(pos1,SCE_FORTH_PREWORD2);
+            parse(BL,false);
+            styler.ColourTo(pos2,SCE_FORTH_PREWORD2);
+            parse(BL,false);
+            styler.ColourTo(pos1,SCE_FORTH_STRING);
+            styler.ColourTo(pos2,SCE_FORTH_STRING);
+        }else if(is_number(buffer)){
+            styler.ColourTo(pos1,SCE_FORTH_NUMBER);
+            styler.ColourTo(pos2,SCE_FORTH_NUMBER);
+        }
+    }
+#ifdef FORTH_DEBUG
+    fclose(f_debug);
+#endif
+    delete []buffer;
+    return;
+/*
+                        if(control.InList(buffer)) {
+                            styler.ColourTo(i,SCE_FORTH_CONTROL);
+                        } else if(keyword.InList(buffer)) {
+                            styler.ColourTo(i-1,SCE_FORTH_KEYWORD );
+                        } else if(defword.InList(buffer)) {
+                            styler.ColourTo(i-1,SCE_FORTH_DEFWORD );
+//                            prev_state=SCE_FORTH_DEFWORD
+                        } else if(preword1.InList(buffer)) {
+                            styler.ColourTo(i-1,SCE_FORTH_PREWORD1 );
+//                            state=SCE_FORTH_PREWORD1;
+                        } else if(preword2.InList(buffer)) {
+                            styler.ColourTo(i-1,SCE_FORTH_PREWORD2 );
+                         } else {
+                            styler.ColourTo(i-1,SCE_FORTH_DEFAULT);
+                        }
+*/
+/*
+    chPrev=' ';
+    for (int i = startPos; i < lengthDoc; i++) {
+        char ch = chNext;
+        chNext = styler.SafeGetCharAt(i + 1);
+        if(i!=startPos) chPrev=styler.SafeGetCharAt(i - 1);
+
+        if (styler.IsLeadByte(ch)) {
+            chNext = styler.SafeGetCharAt(i + 2);
+            i++;
+            continue;
+        }
+#ifdef FORTH_DEBUG
+        fprintf(f_debug,"%c %d ",ch,state);
+#endif
+        switch(state) {
+            case SCE_FORTH_DEFAULT:
+                if(is_whitespace(ch)) {
+                    // whitespace is simply ignored here...
+                    styler.ColourTo(i,SCE_FORTH_DEFAULT);
+                    break;
+                } else if( ch == '\\' && is_blank(chNext)) {
+                    // signals the start of an one line comment...
+                    state = SCE_FORTH_COMMENT;
+                    styler.ColourTo(i,SCE_FORTH_COMMENT);
+                } else if( is_whitespace(chPrev) &&  ch == '(' &&  is_whitespace(chNext)) {
+                    // signals the start of a plain comment...
+                    state = SCE_FORTH_COMMENT_ML;
+                    styler.ColourTo(i,SCE_FORTH_COMMENT_ML);
+                } else if( isdigit(ch) ) {
+                    // signals the start of a number
+                    bufferCount = 0;
+                    buffer[bufferCount++] = ch;
+                    state = SCE_FORTH_NUMBER;
+                } else if( !is_whitespace(ch)) {
+                    // signals the start of an identifier
+                    bufferCount = 0;
+                    buffer[bufferCount++] = ch;
+                    state = SCE_FORTH_IDENTIFIER;
+                } else {
+                    // style it the default style..
+                    styler.ColourTo(i,SCE_FORTH_DEFAULT);
+                }
+                break;
+
+            case SCE_FORTH_COMMENT:
+                // if we find a newline here,
+                // we simply go to default state
+                // else continue to work on it...
+                if( ch == '\n' || ch == '\r' ) {
+                    state = SCE_FORTH_DEFAULT;
+                } else {
+                    styler.ColourTo(i,SCE_FORTH_COMMENT);
+                }
+                break;
+
+            case SCE_FORTH_COMMENT_ML:
+                if( ch == ')') {
+                    state = SCE_FORTH_DEFAULT;
+                } else {
+                    styler.ColourTo(i+1,SCE_FORTH_COMMENT_ML);
+                }
+                break;
+
+            case SCE_FORTH_IDENTIFIER:
+                // stay  in CONF_IDENTIFIER state until we find a non-alphanumeric
+                if( !is_whitespace(ch) ) {
+                    buffer[bufferCount++] = ch;
+                } else {
+                    state = SCE_FORTH_DEFAULT;
+                    buffer[bufferCount] = '\0';
+#ifdef FORTH_DEBUG
+        fprintf(f_debug,"\nid %s\n",buffer);
+#endif
+
+                    // check if the buffer contains a keyword,
+                    // and highlight it if it is a keyword...
+//                    switch(prev_state)
+//                    case SCE_FORTH_DEFAULT:
+                        if(control.InList(buffer)) {
+                            styler.ColourTo(i,SCE_FORTH_CONTROL);
+                        } else if(keyword.InList(buffer)) {
+                            styler.ColourTo(i-1,SCE_FORTH_KEYWORD );
+                        } else if(defword.InList(buffer)) {
+                            styler.ColourTo(i-1,SCE_FORTH_DEFWORD );
+//                            prev_state=SCE_FORTH_DEFWORD
+                        } else if(preword1.InList(buffer)) {
+                            styler.ColourTo(i-1,SCE_FORTH_PREWORD1 );
+//                            state=SCE_FORTH_PREWORD1;
+                        } else if(preword2.InList(buffer)) {
+                            styler.ColourTo(i-1,SCE_FORTH_PREWORD2 );
+                         } else {
+                            styler.ColourTo(i-1,SCE_FORTH_DEFAULT);
+                        }
+//                        break;
+//                    case
+
+                    // push back the faulty character
+                    chNext = styler[i--];
+                }
+                break;
+
+            case SCE_FORTH_NUMBER:
+                // stay  in CONF_NUMBER state until we find a non-numeric
+                if( isdigit(ch) ) {
+                    buffer[bufferCount++] = ch;
+                } else {
+                    state = SCE_FORTH_DEFAULT;
+                    buffer[bufferCount] = '\0';
+                    // Colourize here... (normal number)
+                    styler.ColourTo(i-1,SCE_FORTH_NUMBER);
+                    // push back a character
+                    chNext = styler[i--];
+                }
+                break;
+        }
+    }
+#ifdef FORTH_DEBUG
+    fclose(f_debug);
+#endif
+    delete []buffer;
+*/
+}
+
+static void FoldForthDoc(unsigned int, int, int, WordList *[],
+                       Accessor &) {
+}
+
+static const char * const forthWordLists[] = {
+            "control keywords",
+            "keywords",
+            "definition words",
+            "prewords with one argument",
+            "prewords with two arguments",
+            "string definition keywords",
+            0,
+        };
+
+LexerModule lmForth(SCLEX_FORTH, ColouriseForthDoc, "forth",FoldForthDoc,forthWordLists);
diff --git a/Documents/Scintilla/LexFortran.cxx b/Documents/Scintilla/LexFortran.cxx
new file mode 100644
index 0000000..e66b37e
--- /dev/null
+++ b/Documents/Scintilla/LexFortran.cxx
@@ -0,0 +1,466 @@
+// Scintilla source code edit control
+/** @file LexFortran.cxx
+ ** Lexer for Fortran.
+ ** Writen by Chuan-jian Shen, Last changed Sep. 2003
+ **/
+// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+/***************************************/
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+/***************************************/
+#include "Platform.h"
+#include "PropSet.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+/***********************************************/
+static inline bool IsAWordChar(const int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '_' || ch == '%');
+}
+/**********************************************/
+static inline bool IsAWordStart(const int ch) {
+	return (ch < 0x80) && (isalnum(ch));
+}
+/***************************************/
+inline bool IsABlank(unsigned int ch) {
+    return (ch == ' ') || (ch == 0x09) || (ch == 0x0b) ;
+}
+/***************************************/
+inline bool IsALineEnd(char ch) {
+    return ((ch == '\n') || (ch == '\r')) ;
+}
+/***************************************/
+unsigned int GetContinuedPos(unsigned int pos, Accessor &styler) {
+	while (!IsALineEnd(styler.SafeGetCharAt(pos++))) continue;
+	if (styler.SafeGetCharAt(pos) == '\n') pos++;
+	while (IsABlank(styler.SafeGetCharAt(pos++))) continue;
+	char chCur = styler.SafeGetCharAt(pos);
+	if (chCur == '&') {
+		while (IsABlank(styler.SafeGetCharAt(++pos))) continue;
+		return pos;
+	} else {
+		return pos;
+	}
+}
+/***************************************/
+static void ColouriseFortranDoc(unsigned int startPos, int length, int initStyle,
+			WordList *keywordlists[], Accessor &styler, bool isFixFormat) {
+	WordList &keywords = *keywordlists[0];
+	WordList &keywords2 = *keywordlists[1];
+	WordList &keywords3 = *keywordlists[2];
+	/***************************************/
+	int posLineStart = 0, numNonBlank = 0, prevState = 0;
+	int endPos = startPos + length;
+	/***************************************/
+	// backtrack to the nearest keyword
+	while ((startPos > 1) && (styler.StyleAt(startPos) != SCE_F_WORD)) {
+		startPos--;
+	}
+	startPos = styler.LineStart(styler.GetLine(startPos));
+	initStyle = styler.StyleAt(startPos - 1);
+	StyleContext sc(startPos, endPos-startPos, initStyle, styler);
+	/***************************************/
+	for (; sc.More(); sc.Forward()) {
+		// remember the start position of the line
+		if (sc.atLineStart) {
+			posLineStart = sc.currentPos;
+			numNonBlank = 0;
+			sc.SetState(SCE_F_DEFAULT);
+		}
+		if (!IsASpaceOrTab(sc.ch)) numNonBlank ++;
+		/***********************************************/
+		// Handle the fix format generically
+		int toLineStart = sc.currentPos - posLineStart;
+		if (isFixFormat && (toLineStart < 6 || toLineStart > 72)) {
+			if (toLineStart == 0 && (tolower(sc.ch) == 'c' || sc.ch == '*') || sc.ch == '!') {
+                if (sc.MatchIgnoreCase("cdec$") || sc.MatchIgnoreCase("*dec$") || sc.MatchIgnoreCase("!dec$") ||
+                    sc.MatchIgnoreCase("cdir$") || sc.MatchIgnoreCase("*dir$") || sc.MatchIgnoreCase("!dir$") ||
+                    sc.MatchIgnoreCase("cms$")  || sc.MatchIgnoreCase("*ms$")  || sc.MatchIgnoreCase("!ms$")  ||
+                    sc.chNext == '$') {
+                    sc.SetState(SCE_F_PREPROCESSOR);
+				} else {
+					sc.SetState(SCE_F_COMMENT);
+				}
+
+				while (!sc.atLineEnd && sc.More()) sc.Forward(); // Until line end
+			} else if (toLineStart > 72) {
+				sc.SetState(SCE_F_COMMENT);
+				while (!sc.atLineEnd && sc.More()) sc.Forward(); // Until line end
+			} else if (toLineStart < 5) {
+				if (IsADigit(sc.ch))
+					sc.SetState(SCE_F_LABEL);
+				else
+					sc.SetState(SCE_F_DEFAULT);
+			} else if (toLineStart == 5) {
+				if (!IsASpace(sc.ch) && sc.ch != '0') {
+					sc.SetState(SCE_F_CONTINUATION);
+					sc.ForwardSetState(prevState);
+				} else
+					sc.SetState(SCE_F_DEFAULT);
+			}
+			continue;
+		}
+		/***************************************/
+		// Handle line continuation generically.
+		if (!isFixFormat && sc.ch == '&') {
+			char chTemp = ' ';
+			int j = 1;
+			while (IsABlank(chTemp) && j<132) {
+				chTemp = static_cast<char>(sc.GetRelative(j));
+				j++;
+			}
+			if (chTemp == '!') {
+				sc.SetState(SCE_F_CONTINUATION);
+				if (sc.chNext == '!') sc.ForwardSetState(SCE_F_COMMENT);
+			} else if (chTemp == '\r' || chTemp == '\n') {
+				int currentState = sc.state;
+				sc.SetState(SCE_F_CONTINUATION);
+				sc.ForwardSetState(SCE_F_DEFAULT);
+				while (IsASpace(sc.ch) && sc.More()) sc.Forward();
+				if (sc.ch == '&') {
+					sc.SetState(SCE_F_CONTINUATION);
+					sc.Forward();
+				}
+				sc.SetState(currentState);
+			}
+		}
+		/***************************************/
+		// Determine if the current state should terminate.
+		if (sc.state == SCE_F_OPERATOR) {
+			sc.SetState(SCE_F_DEFAULT);
+		} else if (sc.state == SCE_F_NUMBER) {
+			if (!(IsAWordChar(sc.ch) || sc.ch=='\'' || sc.ch=='\"' || sc.ch=='.')) {
+				sc.SetState(SCE_F_DEFAULT);
+			}
+		} else if (sc.state == SCE_F_IDENTIFIER) {
+			if (!IsAWordChar(sc.ch) || (sc.ch == '%')) {
+				char s[100];
+				sc.GetCurrentLowered(s, sizeof(s));
+				if (keywords.InList(s)) {
+					sc.ChangeState(SCE_F_WORD);
+				} else if (keywords2.InList(s)) {
+					sc.ChangeState(SCE_F_WORD2);
+				} else if (keywords3.InList(s)) {
+					sc.ChangeState(SCE_F_WORD3);
+				}
+				sc.SetState(SCE_F_DEFAULT);
+			}
+		} else if (sc.state == SCE_F_COMMENT || sc.state == SCE_F_PREPROCESSOR) {
+			if (sc.ch == '\r' || sc.ch == '\n') {
+				sc.SetState(SCE_F_DEFAULT);
+			}
+		} else if (sc.state == SCE_F_STRING1) {
+			prevState = sc.state;
+			if (sc.ch == '\'') {
+				if (sc.chNext == '\'') {
+					sc.Forward();
+				} else {
+					sc.ForwardSetState(SCE_F_DEFAULT);
+					prevState = SCE_F_DEFAULT;
+				}
+			} else if (sc.atLineEnd) {
+				sc.ChangeState(SCE_F_STRINGEOL);
+				sc.ForwardSetState(SCE_F_DEFAULT);
+			}
+		} else if (sc.state == SCE_F_STRING2) {
+			prevState = sc.state;
+			if (sc.atLineEnd) {
+				sc.ChangeState(SCE_F_STRINGEOL);
+				sc.ForwardSetState(SCE_F_DEFAULT);
+			} else if (sc.ch == '\"') {
+				if (sc.chNext == '\"') {
+					sc.Forward();
+				} else {
+					sc.ForwardSetState(SCE_F_DEFAULT);
+					prevState = SCE_F_DEFAULT;
+				}
+			}
+		} else if (sc.state == SCE_F_OPERATOR2) {
+			if (sc.ch == '.') {
+				sc.ForwardSetState(SCE_F_DEFAULT);
+			}
+		} else if (sc.state == SCE_F_CONTINUATION) {
+			sc.SetState(SCE_F_DEFAULT);
+		} else if (sc.state == SCE_F_LABEL) {
+			if (!IsADigit(sc.ch)) {
+				sc.SetState(SCE_F_DEFAULT);
+			} else {
+				if (isFixFormat && sc.currentPos-posLineStart > 4)
+					sc.SetState(SCE_F_DEFAULT);
+				else if (numNonBlank > 5)
+					sc.SetState(SCE_F_DEFAULT);
+			}
+		}
+		/***************************************/
+		// Determine if a new state should be entered.
+		if (sc.state == SCE_F_DEFAULT) {
+			if (sc.ch == '!') {
+                if (sc.MatchIgnoreCase("!dec$") || sc.MatchIgnoreCase("!dir$") ||
+                    sc.MatchIgnoreCase("!ms$") || sc.chNext == '$') {
+					sc.SetState(SCE_F_PREPROCESSOR);
+				} else {
+					sc.SetState(SCE_F_COMMENT);
+				}
+			} else if ((!isFixFormat) && IsADigit(sc.ch) && numNonBlank == 1) {
+				sc.SetState(SCE_F_LABEL);
+			} else if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
+				sc.SetState(SCE_F_NUMBER);
+			} else if ((tolower(sc.ch) == 'b' || tolower(sc.ch) == 'o' ||
+					    tolower(sc.ch) == 'z') && (sc.chNext == '\"' || sc.chNext == '\'')) {
+				sc.SetState(SCE_F_NUMBER);
+				sc.Forward();
+			} else if (sc.ch == '.' && isalpha(sc.chNext)) {
+				sc.SetState(SCE_F_OPERATOR2);
+			} else if (IsAWordStart(sc.ch)) {
+				sc.SetState(SCE_F_IDENTIFIER);
+			} else if (sc.ch == '\"') {
+				sc.SetState(SCE_F_STRING2);
+			} else if (sc.ch == '\'') {
+				sc.SetState(SCE_F_STRING1);
+			} else if (isoperator(static_cast<char>(sc.ch))) {
+				sc.SetState(SCE_F_OPERATOR);
+			}
+		}
+	}
+	sc.Complete();
+}
+/***************************************/
+// To determine the folding level depending on keywords
+static int classifyFoldPointFortran(const char* s, const char* prevWord, const char chNextNonBlank) {
+	int lev = 0;
+	if ((strcmp(prevWord, "else") == 0 && strcmp(s, "if") == 0) || strcmp(s, "elseif") == 0)
+		return -1;
+	if (strcmp(s, "associate") == 0 || strcmp(s, "block") == 0
+	    || strcmp(s, "blockdata") == 0 || strcmp(s, "select") == 0
+	    || strcmp(s, "do") == 0 || strcmp(s, "enum") ==0
+	    || strcmp(s, "function") == 0 || strcmp(s, "interface") == 0
+		|| strcmp(s, "module") == 0 || strcmp(s, "program") == 0
+		|| strcmp(s, "subroutine") == 0 || strcmp(s, "then") == 0
+		|| (strcmp(s, "type") == 0 && chNextNonBlank != '(') ){
+			if (strcmp(prevWord, "end") == 0)
+				lev = 0;
+			else
+				lev = 1;
+	} else if (strcmp(s, "end") == 0 && chNextNonBlank != '='
+		|| strcmp(s, "endassociate") == 0 || strcmp(s, "endblock") == 0
+		|| strcmp(s, "endblockdata") == 0 || strcmp(s, "endselect") == 0
+		|| strcmp(s, "enddo") == 0 || strcmp(s, "endenum") ==0
+		|| strcmp(s, "endif") == 0 || strcmp(s, "endforall") == 0
+		|| strcmp(s, "endfunction") == 0 || strcmp(s, "endinterface") == 0
+		|| strcmp(s, "endmodule") == 0 || strcmp(s, "endprogram") == 0
+		|| strcmp(s, "endsubroutine") == 0 || strcmp(s, "endtype") == 0
+		|| strcmp(s, "endwhere") == 0
+		|| strcmp(s, "procedure") == 0 ) { // Take care of the module procedure statement
+			lev = -1;
+	} else if (strcmp(prevWord, "end") == 0 && strcmp(s, "if") == 0){ // end if
+			lev = 0;
+	}
+	return lev;
+}
+// Folding the code
+static void FoldFortranDoc(unsigned int startPos, int length, int initStyle,
+						   Accessor &styler, bool isFixFormat) {
+	//
+	// bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
+	// Do not know how to fold the comment at the moment.
+	//
+	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	unsigned int endPos = startPos + length;
+	int visibleChars = 0;
+	int lineCurrent = styler.GetLine(startPos);
+	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
+	int levelCurrent = levelPrev;
+	char chNext = styler[startPos];
+	char chNextNonBlank;
+	int styleNext = styler.StyleAt(startPos);
+	int style = initStyle;
+	/***************************************/
+	int lastStart = 0;
+	char prevWord[32] = "";
+	char Label[6] = "";
+	// Variables for do label folding.
+	static int doLabels[100];
+	static int posLabel=-1;
+	/***************************************/
+	for (unsigned int i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		chNextNonBlank = chNext;
+		unsigned int j=i+1;
+		while(IsABlank(chNextNonBlank) && j<endPos) {
+			j ++ ;
+			chNextNonBlank = styler.SafeGetCharAt(j);
+		}
+		int stylePrev = style;
+		style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+		//
+		if (stylePrev == SCE_F_DEFAULT && (style == SCE_F_WORD || style == SCE_F_LABEL)) {
+			// Store last word and label start point.
+			lastStart = i;
+		}
+		/***************************************/
+		if (style == SCE_F_WORD) {
+			if(iswordchar(ch) && !iswordchar(chNext)) {
+				char s[32];
+				unsigned int k;
+				for(k=0; (k<31 ) && (k<i-lastStart+1 ); k++) {
+					s[k] = static_cast<char>(tolower(styler[lastStart+k]));
+				}
+				s[k] = '\0';
+				// Handle the forall and where statement and structure.
+				if (strcmp(s, "forall") == 0 || strcmp(s, "where") == 0) {
+					if (strcmp(prevWord, "end") != 0) {
+						j = i + 1;
+						char chBrace = '(', chSeek = ')', ch1 = styler.SafeGetCharAt(j);
+						// Find the position of the first (
+						while (ch1 != chBrace && j<endPos) {
+							j++;
+							ch1 = styler.SafeGetCharAt(j);
+						}
+						char styBrace = styler.StyleAt(j);
+						int depth = 1;
+						char chAtPos;
+						char styAtPos;
+						while (j<endPos) {
+							j++;
+							chAtPos = styler.SafeGetCharAt(j);
+							styAtPos = styler.StyleAt(j);
+							if (styAtPos == styBrace) {
+								if (chAtPos == chBrace) depth++;
+								if (chAtPos == chSeek) depth--;
+								if (depth == 0) break;
+							}
+						}
+						while (j<endPos) {
+							j++;
+							chAtPos = styler.SafeGetCharAt(j);
+							styAtPos = styler.StyleAt(j);
+							if (styAtPos == SCE_F_COMMENT || IsABlank(chAtPos)) continue;
+							if (isFixFormat) {
+								if (!IsALineEnd(chAtPos)) {
+									break;
+								} else {
+									if (lineCurrent < styler.GetLine(styler.Length()-1)) {
+										j = styler.LineStart(lineCurrent+1);
+										if (styler.StyleAt(j+5) == SCE_F_CONTINUATION) {
+											j += 5;
+											continue;
+										} else {
+											levelCurrent++;
+											break;
+										}
+									}
+								}
+							} else {
+								if (chAtPos == '&' && styler.StyleAt(j) == SCE_F_CONTINUATION) {
+									j = GetContinuedPos(j+1, styler);
+									continue;
+								} else if (IsALineEnd(chAtPos)) {
+									levelCurrent ++;
+									break;
+								} else {
+									break;
+								}
+							}
+						}
+					}
+				} else {
+					levelCurrent += classifyFoldPointFortran(s, prevWord, chNextNonBlank);
+					// Store the do Labels into array
+					if (strcmp(s, "do") == 0 && IsADigit(chNextNonBlank)) {
+						unsigned int k = 0;
+						for (i=j; (i<j+5 && i<endPos); i++) {
+							ch = styler.SafeGetCharAt(i);
+							if (IsADigit(ch))
+								Label[k++] = ch;
+							else
+								break;
+						}
+						Label[k] = '\0';
+						posLabel ++;
+						doLabels[posLabel] = atoi(Label);
+					}
+				}
+				strcpy(prevWord, s);
+			}
+		} else if (style == SCE_F_LABEL) {
+			if(IsADigit(ch) && !IsADigit(chNext)) {
+				for(j = 0; ( j < 5 ) && ( j < i-lastStart+1 ); j++) {
+					ch = styler.SafeGetCharAt(lastStart + j);
+					if (IsADigit(ch) && styler.StyleAt(lastStart+j) == SCE_F_LABEL)
+						Label[j] = ch;
+					else
+						break;
+				}
+				Label[j] = '\0';
+				while (doLabels[posLabel] == atoi(Label) && posLabel > -1) {
+					levelCurrent--;
+					posLabel--;
+				}
+			}
+		}
+		if (atEOL) {
+			int lev = levelPrev;
+			if (visibleChars == 0 && foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if ((levelCurrent > levelPrev) && (visibleChars > 0))
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelPrev = levelCurrent;
+			visibleChars = 0;
+			strcpy(prevWord, "");
+		}
+		/***************************************/
+		if (!isspacechar(ch)) visibleChars++;
+	}
+	/***************************************/
+	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
+	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
+}
+/***************************************/
+static const char * const FortranWordLists[] = {
+	"Primary keywords and identifiers",
+	"Intrinsic functions",
+	"Extended and user defined functions",
+	0,
+};
+/***************************************/
+static void ColouriseFortranDocFreeFormat(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
+                            Accessor &styler) {
+	ColouriseFortranDoc(startPos, length, initStyle, keywordlists, styler, false);
+}
+/***************************************/
+static void ColouriseFortranDocFixFormat(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
+                            Accessor &styler) {
+	ColouriseFortranDoc(startPos, length, initStyle, keywordlists, styler, true);
+}
+/***************************************/
+static void FoldFortranDocFreeFormat(unsigned int startPos, int length, int initStyle,
+		WordList *[], Accessor &styler) {
+	FoldFortranDoc(startPos, length, initStyle,styler, false);
+}
+/***************************************/
+static void FoldFortranDocFixFormat(unsigned int startPos, int length, int initStyle,
+		WordList *[], Accessor &styler) {
+	FoldFortranDoc(startPos, length, initStyle,styler, true);
+}
+/***************************************/
+LexerModule lmFortran(SCLEX_FORTRAN, ColouriseFortranDocFreeFormat, "fortran", FoldFortranDocFreeFormat, FortranWordLists);
+LexerModule lmF77(SCLEX_F77, ColouriseFortranDocFixFormat, "f77", FoldFortranDocFixFormat, FortranWordLists);
diff --git a/Documents/Scintilla/LexGAP.cxx b/Documents/Scintilla/LexGAP.cxx
new file mode 100644
index 0000000..25bd33b
--- /dev/null
+++ b/Documents/Scintilla/LexGAP.cxx
@@ -0,0 +1,263 @@
+// Scintilla source code edit control
+/** @file LexGAP.cxx
+ ** Lexer for the GAP language. (The GAP System for Computational Discrete Algebra)
+ ** http://www.gap-system.org
+ **/
+// Copyright 2007 by Istvan Szollosi ( szteven <at> gmail <dot> com )
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+static inline bool IsGAPOperator(char ch) {
+	if (isalnum(ch)) return false;
+	if (ch == '+' || ch == '-' || ch == '*' || ch == '/' ||
+		ch == '^' || ch == ',' || ch == '!' || ch == '.' ||
+		ch == '=' || ch == '<' || ch == '>' || ch == '(' ||
+		ch == ')' || ch == ';' || ch == '[' || ch == ']' ||
+		ch == '{' || ch == '}' || ch == ':' )
+		return true;
+	return false;
+}
+
+static void GetRange(unsigned int start, unsigned int end, Accessor &styler, char *s, unsigned int len) {
+	unsigned int i = 0;
+	while ((i < end - start + 1) && (i < len-1)) {
+		s[i] = static_cast<char>(styler[start + i]);
+		i++;
+	}
+	s[i] = '\0';
+}
+
+static void ColouriseGAPDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], Accessor &styler) {
+
+	WordList &keywords1 = *keywordlists[0];
+	WordList &keywords2 = *keywordlists[1];
+	WordList &keywords3 = *keywordlists[2];
+	WordList &keywords4 = *keywordlists[3];
+
+	// Do not leak onto next line
+	if (initStyle == SCE_GAP_STRINGEOL) initStyle = SCE_GAP_DEFAULT;
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	for (; sc.More(); sc.Forward()) {
+
+		// Prevent SCE_GAP_STRINGEOL from leaking back to previous line
+		if ( sc.atLineStart ) {
+			if (sc.state == SCE_GAP_STRING) sc.SetState(SCE_GAP_STRING);
+			if (sc.state == SCE_GAP_CHAR) sc.SetState(SCE_GAP_CHAR);
+		}
+
+		// Handle line continuation generically
+		if (sc.ch == '\\' ) {
+			if (sc.chNext == '\n' || sc.chNext == '\r') {
+				sc.Forward();
+				if (sc.ch == '\r' && sc.chNext == '\n') {
+					sc.Forward();
+				}
+				continue;
+			}
+		}
+
+		// Determine if the current state should terminate
+		switch (sc.state) {
+			case SCE_GAP_OPERATOR :
+				sc.SetState(SCE_GAP_DEFAULT);
+				break;
+
+			case SCE_GAP_NUMBER :
+				if (!IsADigit(sc.ch)) {
+					if (sc.ch == '\\') {
+						if (!sc.atLineEnd) {
+							if (!IsADigit(sc.chNext)) {
+								sc.Forward();
+								sc.ChangeState(SCE_GAP_IDENTIFIER);
+							}
+						}
+					} else if (isalpha(sc.ch) || sc.ch == '_') {
+						sc.ChangeState(SCE_GAP_IDENTIFIER);
+					}
+					else sc.SetState(SCE_GAP_DEFAULT);
+				}
+				break;
+
+			case SCE_GAP_IDENTIFIER :
+				if (!(iswordstart(static_cast<char>(sc.ch)) || sc.ch == '$')) {
+					if (sc.ch == '\\') sc.Forward();
+					else {
+						char s[1000];
+						sc.GetCurrent(s, sizeof(s));
+						if (keywords1.InList(s)) {
+							sc.ChangeState(SCE_GAP_KEYWORD);
+						} else if (keywords2.InList(s)) {
+							sc.ChangeState(SCE_GAP_KEYWORD2);
+						} else if (keywords3.InList(s)) {
+							sc.ChangeState(SCE_GAP_KEYWORD3);
+						} else if (keywords4.InList(s)) {
+							sc.ChangeState(SCE_GAP_KEYWORD4);
+						}
+						sc.SetState(SCE_GAP_DEFAULT);
+					}
+				}
+				break;
+
+			case SCE_GAP_COMMENT :
+				if (sc.atLineEnd) {
+					sc.SetState(SCE_GAP_DEFAULT);
+				}
+				break;
+
+			case SCE_GAP_STRING:
+				if (sc.atLineEnd) {
+					sc.ChangeState(SCE_GAP_STRINGEOL);
+				} else if (sc.ch == '\\') {
+					if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
+						sc.Forward();
+					}
+				} else if (sc.ch == '\"') {
+					sc.ForwardSetState(SCE_GAP_DEFAULT);
+				}
+				break;
+
+			case SCE_GAP_CHAR:
+				if (sc.atLineEnd) {
+					sc.ChangeState(SCE_GAP_STRINGEOL);
+				} else if (sc.ch == '\\') {
+					if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
+						sc.Forward();
+					}
+				} else if (sc.ch == '\'') {
+					sc.ForwardSetState(SCE_GAP_DEFAULT);
+				}
+				break;
+
+			case SCE_GAP_STRINGEOL:
+				if (sc.atLineStart) {
+					sc.SetState(SCE_GAP_DEFAULT);
+				}
+				break;
+		}
+
+		// Determine if a new state should be entered
+		if (sc.state == SCE_GAP_DEFAULT) {
+			if (IsGAPOperator(static_cast<char>(sc.ch))) {
+				sc.SetState(SCE_GAP_OPERATOR);
+			}
+			else if (IsADigit(sc.ch)) {
+				sc.SetState(SCE_GAP_NUMBER);
+			} else if (isalpha(sc.ch) || sc.ch == '_' || sc.ch == '\\' || sc.ch == '$' || sc.ch == '~') {
+				sc.SetState(SCE_GAP_IDENTIFIER);
+				if (sc.ch == '\\') sc.Forward();
+			} else if (sc.ch == '#') {
+				sc.SetState(SCE_GAP_COMMENT);
+			} else if (sc.ch == '\"') {
+				sc.SetState(SCE_GAP_STRING);
+			} else if (sc.ch == '\'') {
+				sc.SetState(SCE_GAP_CHAR);
+			}
+		}
+
+	}
+	sc.Complete();
+}
+
+static int ClassifyFoldPointGAP(const char* s) {
+	int level = 0;
+	if (strcmp(s, "function") == 0 ||
+		strcmp(s, "do") == 0 ||
+		strcmp(s, "if") == 0 ||
+		strcmp(s, "repeat") == 0 ) {
+		level = 1;
+	} else if (strcmp(s, "end") == 0 ||
+			strcmp(s, "od") == 0 ||
+			strcmp(s, "fi") == 0 ||
+			strcmp(s, "until") == 0 ) {
+		level = -1;
+	}
+	return level;
+}
+
+static void FoldGAPDoc( unsigned int startPos, int length, int initStyle,   WordList** , Accessor &styler) {
+	unsigned int endPos = startPos + length;
+	int visibleChars = 0;
+	int lineCurrent = styler.GetLine(startPos);
+	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
+	int levelCurrent = levelPrev;
+	char chNext = styler[startPos];
+	int styleNext = styler.StyleAt(startPos);
+	int style = initStyle;
+
+	int lastStart = 0;
+
+	for (unsigned int i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int stylePrev = style;
+		style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+
+		if (stylePrev != SCE_GAP_KEYWORD && style == SCE_GAP_KEYWORD) {
+			// Store last word start point.
+			lastStart = i;
+		}
+
+		if (stylePrev == SCE_GAP_KEYWORD) {
+			if(iswordchar(ch) && !iswordchar(chNext)) {
+				char s[100];
+				GetRange(lastStart, i, styler, s, sizeof(s));
+				levelCurrent += ClassifyFoldPointGAP(s);
+			}
+		}
+
+		if (atEOL) {
+			int lev = levelPrev;
+			if ((levelCurrent > levelPrev) && (visibleChars > 0))
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelPrev = levelCurrent;
+			visibleChars = 0;
+		}
+
+		if (!isspacechar(ch))
+			visibleChars++;
+	}
+
+	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
+}
+
+static const char * const GAPWordListDesc[] = {
+	"Keywords 1",
+	"Keywords 2",
+	"Keywords 3 (unused)",
+	"Keywords 4 (unused)",
+	0
+};
+
+LexerModule lmGAP(
+   SCLEX_GAP,
+   ColouriseGAPDoc,
+   "gap",
+   FoldGAPDoc,
+   GAPWordListDesc);
diff --git a/Documents/Scintilla/LexGui4Cli.cxx b/Documents/Scintilla/LexGui4Cli.cxx
new file mode 100644
index 0000000..1c92de7
--- /dev/null
+++ b/Documents/Scintilla/LexGui4Cli.cxx
@@ -0,0 +1,313 @@
+// Scintilla source code edit control
+// Copyright 1998-2002 by Neil Hodgson <neilh@scintilla.org>
+/*
+This is the Lexer for Gui4Cli, included in SciLexer.dll
+- by d. Keletsekis, 2/10/2003
+
+To add to SciLexer.dll:
+1. Add the values below to INCLUDE\Scintilla.iface
+2. Run the include/HFacer.py script
+3. Run the src/lexGen.py script
+
+val SCE_GC_DEFAULT=0
+val SCE_GC_COMMENTLINE=1
+val SCE_GC_COMMENTBLOCK=2
+val SCE_GC_GLOBAL=3
+val SCE_GC_EVENT=4
+val SCE_GC_ATTRIBUTE=5
+val SCE_GC_CONTROL=6
+val SCE_GC_COMMAND=7
+val SCE_GC_STRING=8
+val SCE_GC_OPERATOR=9
+*/
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+#define debug Platform::DebugPrintf
+
+static inline bool IsAWordChar(const int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '.' || ch == '_' || ch =='\\');
+}
+
+static inline bool IsAWordStart(const int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '_' || ch == '.');
+}
+
+inline bool isGCOperator(int ch)
+{	if (isalnum(ch))
+		return false;
+	// '.' left out as it is used to make up numbers
+	if (ch == '*' || ch == '/' || ch == '-' || ch == '+' ||
+		 ch == '(' || ch == ')' || ch == '=' || ch == '%' ||
+		 ch == '[' || ch == ']' || ch == '<' || ch == '>' ||
+		 ch == ',' || ch == ';' || ch == ':')
+		return true;
+	return false;
+}
+
+#define isSpace(x)		((x)==' ' || (x)=='\t')
+#define isNL(x)			((x)=='\n' || (x)=='\r')
+#define isSpaceOrNL(x)  (isSpace(x) || isNL(x))
+#define BUFFSIZE 500
+#define isFoldPoint(x)  ((styler.LevelAt(x) & SC_FOLDLEVELNUMBERMASK) == 1024)
+
+static void colorFirstWord(WordList *keywordlists[], Accessor &styler,
+									StyleContext *sc, char *buff, int length, int)
+{
+	int c = 0;
+	while (sc->More() && isSpaceOrNL(sc->ch))
+	{	sc->Forward();
+	}
+	styler.ColourTo(sc->currentPos - 1, sc->state);
+
+	if (!IsAWordChar(sc->ch)) // comment, marker, etc..
+		return;
+
+	while (sc->More() && !isSpaceOrNL(sc->ch) && (c < length-1) && !isGCOperator(sc->ch))
+	{	buff[c] = static_cast<char>(sc->ch);
+		++c; sc->Forward();
+	}
+	buff[c] = '\0';
+	char *p = buff;
+	while (*p)	// capitalize..
+	{	if (islower(*p)) *p = static_cast<char>(toupper(*p));
+		++p;
+	}
+
+	WordList &kGlobal		= *keywordlists[0];	// keyword lists set by the user
+	WordList &kEvent		= *keywordlists[1];
+	WordList &kAttribute	= *keywordlists[2];
+	WordList &kControl	= *keywordlists[3];
+	WordList &kCommand	= *keywordlists[4];
+
+	int state = 0;
+	// int level = styler.LevelAt(line) & SC_FOLDLEVELNUMBERMASK;
+	// debug ("line = %d, level = %d", line, level);
+
+	if	     (kGlobal.InList(buff))		state = SCE_GC_GLOBAL;
+	else if (kAttribute.InList(buff))	state = SCE_GC_ATTRIBUTE;
+	else if (kControl.InList(buff))		state = SCE_GC_CONTROL;
+	else if (kCommand.InList(buff))		state = SCE_GC_COMMAND;
+	else if (kEvent.InList(buff))			state = SCE_GC_EVENT;
+
+	if (state)
+	{	sc->ChangeState(state);
+		styler.ColourTo(sc->currentPos - 1, sc->state);
+		sc->ChangeState(SCE_GC_DEFAULT);
+	}
+	else
+	{	sc->ChangeState(SCE_GC_DEFAULT);
+		styler.ColourTo(sc->currentPos - 1, sc->state);
+	}
+}
+
+// Main colorizing function called by Scintilla
+static void
+ColouriseGui4CliDoc(unsigned int startPos, int length, int initStyle,
+                    WordList *keywordlists[], Accessor &styler)
+{
+	styler.StartAt(startPos);
+
+	int quotestart = 0, oldstate, currentline = styler.GetLine(startPos);
+	styler.StartSegment(startPos);
+	bool noforward;
+	char buff[BUFFSIZE+1];	// buffer for command name
+
+	StyleContext sc(startPos, length, initStyle, styler);
+	buff[0] = '\0'; // cbuff = 0;
+
+	if (sc.state != SCE_GC_COMMENTBLOCK) // colorize 1st word..
+		colorFirstWord(keywordlists, styler, &sc, buff, BUFFSIZE, currentline);
+
+	while (sc.More())
+	{	noforward = 0;
+
+		switch (sc.ch)
+		{
+			case '/':
+				if (sc.state == SCE_GC_COMMENTBLOCK || sc.state == SCE_GC_STRING)
+					break;
+				if (sc.chNext == '/')	// line comment
+				{	sc.SetState (SCE_GC_COMMENTLINE);
+					sc.Forward();
+					styler.ColourTo(sc.currentPos, sc.state);
+				}
+				else if (sc.chNext == '*')	// block comment
+				{	sc.SetState(SCE_GC_COMMENTBLOCK);
+					sc.Forward();
+					styler.ColourTo(sc.currentPos, sc.state);
+				}
+				else
+					styler.ColourTo(sc.currentPos, sc.state);
+				break;
+
+			case '*':	// end of comment block, or operator..
+				if (sc.state == SCE_GC_STRING)
+					break;
+				if (sc.state == SCE_GC_COMMENTBLOCK && sc.chNext == '/')
+				{	sc.Forward();
+					styler.ColourTo(sc.currentPos, sc.state);
+					sc.ChangeState (SCE_GC_DEFAULT);
+				}
+				else
+					styler.ColourTo(sc.currentPos, sc.state);
+				break;
+
+			case '\'':	case '\"': // strings..
+				if (sc.state == SCE_GC_COMMENTBLOCK || sc.state == SCE_GC_COMMENTLINE)
+					break;
+				if (sc.state == SCE_GC_STRING)
+				{	if (sc.ch == quotestart)	// match same quote char..
+					{	styler.ColourTo(sc.currentPos, sc.state);
+						sc.ChangeState(SCE_GC_DEFAULT);
+						quotestart = 0;
+				}	}
+				else
+				{	styler.ColourTo(sc.currentPos - 1, sc.state);
+					sc.ChangeState(SCE_GC_STRING);
+					quotestart = sc.ch;
+				}
+				break;
+
+			case ';':	// end of commandline character
+				if (sc.state != SCE_GC_COMMENTBLOCK && sc.state != SCE_GC_COMMENTLINE &&
+					 sc.state != SCE_GC_STRING)
+				{
+					styler.ColourTo(sc.currentPos - 1, sc.state);
+					styler.ColourTo(sc.currentPos, SCE_GC_OPERATOR);
+					sc.ChangeState(SCE_GC_DEFAULT);
+					sc.Forward();
+					colorFirstWord(keywordlists, styler, &sc, buff, BUFFSIZE, currentline);
+					noforward = 1; // don't move forward - already positioned at next char..
+				}
+				break;
+
+			case '+': case '-': case '=':	case '!':	// operators..
+			case '<': case '>': case '&': case '|': case '$':
+				if (sc.state != SCE_GC_COMMENTBLOCK && sc.state != SCE_GC_COMMENTLINE &&
+					 sc.state != SCE_GC_STRING)
+				{
+					styler.ColourTo(sc.currentPos - 1, sc.state);
+					styler.ColourTo(sc.currentPos, SCE_GC_OPERATOR);
+					sc.ChangeState(SCE_GC_DEFAULT);
+				}
+				break;
+
+			case '\\':	// escape - same as operator, but also mark in strings..
+				if (sc.state != SCE_GC_COMMENTBLOCK && sc.state != SCE_GC_COMMENTLINE)
+				{
+					oldstate = sc.state;
+					styler.ColourTo(sc.currentPos - 1, sc.state);
+					sc.Forward(); // mark also the next char..
+					styler.ColourTo(sc.currentPos, SCE_GC_OPERATOR);
+					sc.ChangeState(oldstate);
+				}
+				break;
+
+			case '\n': case '\r':
+				++currentline;
+				if (sc.state == SCE_GC_COMMENTLINE)
+				{	styler.ColourTo(sc.currentPos, sc.state);
+					sc.ChangeState (SCE_GC_DEFAULT);
+				}
+				else if (sc.state != SCE_GC_COMMENTBLOCK)
+				{	colorFirstWord(keywordlists, styler, &sc, buff, BUFFSIZE, currentline);
+					noforward = 1; // don't move forward - already positioned at next char..
+				}
+				break;
+
+//			case ' ': case '\t':
+//			default :
+		}
+
+		if (!noforward) sc.Forward();
+
+	}
+	sc.Complete();
+}
+
+// Main folding function called by Scintilla - (based on props (.ini) files function)
+static void FoldGui4Cli(unsigned int startPos, int length, int,
+								WordList *[], Accessor &styler)
+{
+	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+
+	unsigned int endPos = startPos + length;
+	int visibleChars = 0;
+	int lineCurrent = styler.GetLine(startPos);
+
+	char chNext = styler[startPos];
+	int styleNext = styler.StyleAt(startPos);
+	bool headerPoint = false;
+
+	for (unsigned int i = startPos; i < endPos; i++)
+	{
+		char ch = chNext;
+		chNext = styler[i+1];
+
+		int style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+
+		if (style == SCE_GC_EVENT || style == SCE_GC_GLOBAL)
+		{	headerPoint = true; // fold at events and globals
+		}
+
+		if (atEOL)
+		{	int lev = SC_FOLDLEVELBASE+1;
+
+			if (headerPoint)
+				lev = SC_FOLDLEVELBASE;
+
+			if (visibleChars == 0 && foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+
+			if (headerPoint)
+				lev |= SC_FOLDLEVELHEADERFLAG;
+
+			if (lev != styler.LevelAt(lineCurrent)) // set level, if not already correct
+			{	styler.SetLevel(lineCurrent, lev);
+			}
+
+			lineCurrent++;		// re-initialize our flags
+			visibleChars = 0;
+			headerPoint = false;
+		}
+
+		if (!(isspacechar(ch))) // || (style == SCE_GC_COMMENTLINE) || (style != SCE_GC_COMMENTBLOCK)))
+			visibleChars++;
+	}
+
+	int lev = headerPoint ? SC_FOLDLEVELBASE : SC_FOLDLEVELBASE+1;
+	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+	styler.SetLevel(lineCurrent, lev | flagsNext);
+}
+
+// I have no idea what these are for.. probably accessible by some message.
+static const char * const gui4cliWordListDesc[] = {
+	"Globals", "Events", "Attributes", "Control", "Commands",
+	0
+};
+
+// Declare language & pass our function pointers to Scintilla
+LexerModule lmGui4Cli(SCLEX_GUI4CLI, ColouriseGui4CliDoc, "gui4cli", FoldGui4Cli, gui4cliWordListDesc);
+
+#undef debug
+
diff --git a/Documents/Scintilla/LexHTML.cxx b/Documents/Scintilla/LexHTML.cxx
new file mode 100644
index 0000000..6d16c53
--- /dev/null
+++ b/Documents/Scintilla/LexHTML.cxx
@@ -0,0 +1,2184 @@
+// Scintilla source code edit control
+/** @file LexHTML.cxx
+ ** Lexer for HTML.
+ **/
+// Copyright 1998-2005 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+#include "CharacterSet.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+#define SCE_HA_JS (SCE_HJA_START - SCE_HJ_START)
+#define SCE_HA_VBS (SCE_HBA_START - SCE_HB_START)
+#define SCE_HA_PYTHON (SCE_HPA_START - SCE_HP_START)
+
+enum script_type { eScriptNone = 0, eScriptJS, eScriptVBS, eScriptPython, eScriptPHP, eScriptXML, eScriptSGML, eScriptSGMLblock, eScriptComment };
+enum script_mode { eHtml = 0, eNonHtmlScript, eNonHtmlPreProc, eNonHtmlScriptPreProc };
+
+static inline bool IsAWordChar(const int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '.' || ch == '_');
+}
+
+static inline bool IsAWordStart(const int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '_');
+}
+
+inline bool IsOperator(int ch) {
+	if (isascii(ch) && isalnum(ch))
+		return false;
+	// '.' left out as it is used to make up numbers
+	if (ch == '%' || ch == '^' || ch == '&' || ch == '*' ||
+	        ch == '(' || ch == ')' || ch == '-' || ch == '+' ||
+	        ch == '=' || ch == '|' || ch == '{' || ch == '}' ||
+	        ch == '[' || ch == ']' || ch == ':' || ch == ';' ||
+	        ch == '<' || ch == '>' || ch == ',' || ch == '/' ||
+	        ch == '?' || ch == '!' || ch == '.' || ch == '~')
+		return true;
+	return false;
+}
+
+static inline int MakeLowerCase(int ch) {
+	if (ch < 'A' || ch > 'Z')
+		return ch;
+	else
+		return ch - 'A' + 'a';
+}
+
+static void GetTextSegment(Accessor &styler, unsigned int start, unsigned int end, char *s, size_t len) {
+	size_t i = 0;
+	for (; (i < end - start + 1) && (i < len-1); i++) {
+		s[i] = static_cast<char>(MakeLowerCase(styler[start + i]));
+	}
+	s[i] = '\0';
+}
+
+static script_type segIsScriptingIndicator(Accessor &styler, unsigned int start, unsigned int end, script_type prevValue) {
+	char s[100];
+	GetTextSegment(styler, start, end, s, sizeof(s));
+	//Platform::DebugPrintf("Scripting indicator [%s]\n", s);
+	if (strstr(s, "src"))	// External script
+		return eScriptNone;
+	if (strstr(s, "vbs"))
+		return eScriptVBS;
+	if (strstr(s, "pyth"))
+		return eScriptPython;
+	if (strstr(s, "javas"))
+		return eScriptJS;
+	if (strstr(s, "jscr"))
+		return eScriptJS;
+	if (strstr(s, "php"))
+		return eScriptPHP;
+	if (strstr(s, "xml")) {
+		const char *xml = strstr(s, "xml");
+		for (const char *t=s; t<xml; t++) {
+			if (!IsASpace(*t)) {
+				return prevValue;
+			}
+		}
+		return eScriptXML;
+	}
+
+	return prevValue;
+}
+
+static int PrintScriptingIndicatorOffset(Accessor &styler, unsigned int start, unsigned int end) {
+	int iResult = 0;
+	char s[100];
+	GetTextSegment(styler, start, end, s, sizeof(s));
+	if (0 == strncmp(s, "php", 3)) {
+		iResult = 3;
+	}
+
+	return iResult;
+}
+
+static script_type ScriptOfState(int state) {
+	if ((state >= SCE_HP_START) && (state <= SCE_HP_IDENTIFIER)) {
+		return eScriptPython;
+	} else if ((state >= SCE_HB_START) && (state <= SCE_HB_STRINGEOL)) {
+		return eScriptVBS;
+	} else if ((state >= SCE_HJ_START) && (state <= SCE_HJ_REGEX)) {
+		return eScriptJS;
+	} else if ((state >= SCE_HPHP_DEFAULT) && (state <= SCE_HPHP_COMMENTLINE)) {
+		return eScriptPHP;
+	} else if ((state >= SCE_H_SGML_DEFAULT) && (state < SCE_H_SGML_BLOCK_DEFAULT)) {
+		return eScriptSGML;
+	} else if (state == SCE_H_SGML_BLOCK_DEFAULT) {
+		return eScriptSGMLblock;
+	} else {
+		return eScriptNone;
+	}
+}
+
+static int statePrintForState(int state, script_mode inScriptType) {
+	int StateToPrint = state;
+
+	if (state >= SCE_HJ_START) {
+		if ((state >= SCE_HP_START) && (state <= SCE_HP_IDENTIFIER)) {
+			StateToPrint = state + ((inScriptType == eNonHtmlScript) ? 0 : SCE_HA_PYTHON);
+		} else if ((state >= SCE_HB_START) && (state <= SCE_HB_STRINGEOL)) {
+			StateToPrint = state + ((inScriptType == eNonHtmlScript) ? 0 : SCE_HA_VBS);
+		} else if ((state >= SCE_HJ_START) && (state <= SCE_HJ_REGEX)) {
+			StateToPrint = state + ((inScriptType == eNonHtmlScript) ? 0 : SCE_HA_JS);
+		}
+	}
+
+	return StateToPrint;
+}
+
+static int stateForPrintState(int StateToPrint) {
+	int state;
+
+	if ((StateToPrint >= SCE_HPA_START) && (StateToPrint <= SCE_HPA_IDENTIFIER)) {
+		state = StateToPrint - SCE_HA_PYTHON;
+	} else if ((StateToPrint >= SCE_HBA_START) && (StateToPrint <= SCE_HBA_STRINGEOL)) {
+		state = StateToPrint - SCE_HA_VBS;
+	} else if ((StateToPrint >= SCE_HJA_START) && (StateToPrint <= SCE_HJA_REGEX)) {
+		state = StateToPrint - SCE_HA_JS;
+	} else {
+		state = StateToPrint;
+	}
+
+	return state;
+}
+
+static inline bool IsNumber(unsigned int start, Accessor &styler) {
+	return IsADigit(styler[start]) || (styler[start] == '.') ||
+	       (styler[start] == '-') || (styler[start] == '#');
+}
+
+static inline bool isStringState(int state) {
+	bool bResult;
+
+	switch (state) {
+	case SCE_HJ_DOUBLESTRING:
+	case SCE_HJ_SINGLESTRING:
+	case SCE_HJA_DOUBLESTRING:
+	case SCE_HJA_SINGLESTRING:
+	case SCE_HB_STRING:
+	case SCE_HBA_STRING:
+	case SCE_HP_STRING:
+	case SCE_HP_CHARACTER:
+	case SCE_HP_TRIPLE:
+	case SCE_HP_TRIPLEDOUBLE:
+	case SCE_HPA_STRING:
+	case SCE_HPA_CHARACTER:
+	case SCE_HPA_TRIPLE:
+	case SCE_HPA_TRIPLEDOUBLE:
+	case SCE_HPHP_HSTRING:
+	case SCE_HPHP_SIMPLESTRING:
+	case SCE_HPHP_HSTRING_VARIABLE:
+	case SCE_HPHP_COMPLEX_VARIABLE:
+		bResult = true;
+		break;
+	default :
+		bResult = false;
+		break;
+	}
+	return bResult;
+}
+
+static inline bool stateAllowsTermination(int state) {
+	bool allowTermination = !isStringState(state);
+	if (allowTermination) {
+		switch (state) {
+		case SCE_HB_COMMENTLINE:
+		case SCE_HPHP_COMMENT:
+		case SCE_HP_COMMENTLINE:
+		case SCE_HPA_COMMENTLINE:
+			allowTermination = false;
+		}
+	}
+	return allowTermination;
+}
+
+// not really well done, since it's only comments that should lex the %> and <%
+static inline bool isCommentASPState(int state) {
+	bool bResult;
+
+	switch (state) {
+	case SCE_HJ_COMMENT:
+	case SCE_HJ_COMMENTLINE:
+	case SCE_HJ_COMMENTDOC:
+	case SCE_HB_COMMENTLINE:
+	case SCE_HP_COMMENTLINE:
+	case SCE_HPHP_COMMENT:
+	case SCE_HPHP_COMMENTLINE:
+		bResult = true;
+		break;
+	default :
+		bResult = false;
+		break;
+	}
+	return bResult;
+}
+
+static void classifyAttribHTML(unsigned int start, unsigned int end, WordList &keywords, Accessor &styler) {
+	bool wordIsNumber = IsNumber(start, styler);
+	char chAttr = SCE_H_ATTRIBUTEUNKNOWN;
+	if (wordIsNumber) {
+		chAttr = SCE_H_NUMBER;
+	} else {
+		char s[100];
+		GetTextSegment(styler, start, end, s, sizeof(s));
+		if (keywords.InList(s))
+			chAttr = SCE_H_ATTRIBUTE;
+	}
+	if ((chAttr == SCE_H_ATTRIBUTEUNKNOWN) && !keywords)
+		// No keywords -> all are known
+		chAttr = SCE_H_ATTRIBUTE;
+	styler.ColourTo(end, chAttr);
+}
+
+static int classifyTagHTML(unsigned int start, unsigned int end,
+                           WordList &keywords, Accessor &styler, bool &tagDontFold,
+			   bool caseSensitive, bool isXml, bool allowScripts) {
+	char s[30 + 2];
+	// Copy after the '<'
+	unsigned int i = 0;
+	for (unsigned int cPos = start; cPos <= end && i < 30; cPos++) {
+		char ch = styler[cPos];
+		if ((ch != '<') && (ch != '/')) {
+			s[i++] = caseSensitive ? ch : static_cast<char>(MakeLowerCase(ch));
+		}
+	}
+
+	//The following is only a quick hack, to see if this whole thing would work
+	//we first need the tagname with a trailing space...
+	s[i] = ' ';
+	s[i+1] = '\0';
+
+	// if the current language is XML, I can fold any tag
+	// if the current language is HTML, I don't want to fold certain tags (input, meta, etc.)
+	//...to find it in the list of no-container-tags
+	tagDontFold = (!isXml) && (NULL != strstr("meta link img area br hr input ", s));
+
+	//now we can remove the trailing space
+	s[i] = '\0';
+
+	// No keywords -> all are known
+	// Name of a closing tag starts at s + 1
+	char chAttr = SCE_H_TAGUNKNOWN;
+	if (s[0] == '!') {
+		chAttr = SCE_H_SGML_DEFAULT;
+	} else if (!keywords || keywords.InList(s[0] == '/' ? s + 1 : s)) {
+		chAttr = SCE_H_TAG;
+	}
+	styler.ColourTo(end, chAttr);
+	if (chAttr == SCE_H_TAG) {
+		if (allowScripts && 0 == strcmp(s, "script")) {
+			chAttr = SCE_H_SCRIPT;
+		} else if (!isXml && 0 == strcmp(s, "comment")) {
+			chAttr = SCE_H_COMMENT;
+		}
+	}
+	return chAttr;
+}
+
+static void classifyWordHTJS(unsigned int start, unsigned int end,
+                             WordList &keywords, Accessor &styler, script_mode inScriptType) {
+	char chAttr = SCE_HJ_WORD;
+	bool wordIsNumber = IsADigit(styler[start]) || (styler[start] == '.');
+	if (wordIsNumber)
+		chAttr = SCE_HJ_NUMBER;
+	else {
+		char s[30 + 1];
+		unsigned int i = 0;
+		for (; i < end - start + 1 && i < 30; i++) {
+			s[i] = styler[start + i];
+		}
+		s[i] = '\0';
+		if (keywords.InList(s))
+			chAttr = SCE_HJ_KEYWORD;
+	}
+	styler.ColourTo(end, statePrintForState(chAttr, inScriptType));
+}
+
+static int classifyWordHTVB(unsigned int start, unsigned int end, WordList &keywords, Accessor &styler, script_mode inScriptType) {
+	char chAttr = SCE_HB_IDENTIFIER;
+	bool wordIsNumber = IsADigit(styler[start]) || (styler[start] == '.');
+	if (wordIsNumber)
+		chAttr = SCE_HB_NUMBER;
+	else {
+		char s[100];
+		GetTextSegment(styler, start, end, s, sizeof(s));
+		if (keywords.InList(s)) {
+			chAttr = SCE_HB_WORD;
+			if (strcmp(s, "rem") == 0)
+				chAttr = SCE_HB_COMMENTLINE;
+		}
+	}
+	styler.ColourTo(end, statePrintForState(chAttr, inScriptType));
+	if (chAttr == SCE_HB_COMMENTLINE)
+		return SCE_HB_COMMENTLINE;
+	else
+		return SCE_HB_DEFAULT;
+}
+
+static void classifyWordHTPy(unsigned int start, unsigned int end, WordList &keywords, Accessor &styler, char *prevWord, script_mode inScriptType) {
+	bool wordIsNumber = IsADigit(styler[start]);
+	char s[30 + 1];
+	unsigned int i = 0;
+	for (; i < end - start + 1 && i < 30; i++) {
+		s[i] = styler[start + i];
+	}
+	s[i] = '\0';
+	char chAttr = SCE_HP_IDENTIFIER;
+	if (0 == strcmp(prevWord, "class"))
+		chAttr = SCE_HP_CLASSNAME;
+	else if (0 == strcmp(prevWord, "def"))
+		chAttr = SCE_HP_DEFNAME;
+	else if (wordIsNumber)
+		chAttr = SCE_HP_NUMBER;
+	else if (keywords.InList(s))
+		chAttr = SCE_HP_WORD;
+	styler.ColourTo(end, statePrintForState(chAttr, inScriptType));
+	strcpy(prevWord, s);
+}
+
+// Update the word colour to default or keyword
+// Called when in a PHP word
+static void classifyWordHTPHP(unsigned int start, unsigned int end, WordList &keywords, Accessor &styler) {
+	char chAttr = SCE_HPHP_DEFAULT;
+	bool wordIsNumber = IsADigit(styler[start]) || (styler[start] == '.' && start+1 <= end && IsADigit(styler[start+1]));
+	if (wordIsNumber)
+		chAttr = SCE_HPHP_NUMBER;
+	else {
+		char s[100];
+		GetTextSegment(styler, start, end, s, sizeof(s));
+		if (keywords.InList(s))
+			chAttr = SCE_HPHP_WORD;
+	}
+	styler.ColourTo(end, chAttr);
+}
+
+static bool isWordHSGML(unsigned int start, unsigned int end, WordList &keywords, Accessor &styler) {
+	char s[30 + 1];
+	unsigned int i = 0;
+	for (; i < end - start + 1 && i < 30; i++) {
+		s[i] = styler[start + i];
+	}
+	s[i] = '\0';
+	return keywords.InList(s);
+}
+
+static bool isWordCdata(unsigned int start, unsigned int end, Accessor &styler) {
+	char s[30 + 1];
+	unsigned int i = 0;
+	for (; i < end - start + 1 && i < 30; i++) {
+		s[i] = styler[start + i];
+	}
+	s[i] = '\0';
+	return (0 == strcmp(s, "[CDATA["));
+}
+
+// Return the first state to reach when entering a scripting language
+static int StateForScript(script_type scriptLanguage) {
+	int Result;
+	switch (scriptLanguage) {
+	case eScriptVBS:
+		Result = SCE_HB_START;
+		break;
+	case eScriptPython:
+		Result = SCE_HP_START;
+		break;
+	case eScriptPHP:
+		Result = SCE_HPHP_DEFAULT;
+		break;
+	case eScriptXML:
+		Result = SCE_H_TAGUNKNOWN;
+		break;
+	case eScriptSGML:
+		Result = SCE_H_SGML_DEFAULT;
+		break;
+	case eScriptComment:
+		Result = SCE_H_COMMENT;
+		break;
+	default :
+		Result = SCE_HJ_START;
+		break;
+	}
+	return Result;
+}
+
+static inline bool ishtmlwordchar(int ch) {
+	return !isascii(ch) ||
+		(isalnum(ch) || ch == '.' || ch == '-' || ch == '_' || ch == ':' || ch == '!' || ch == '#');
+}
+
+static inline bool issgmlwordchar(int ch) {
+	return !isascii(ch) ||
+		(isalnum(ch) || ch == '.' || ch == '_' || ch == ':' || ch == '!' || ch == '#' || ch == '[');
+}
+
+static inline bool IsPhpWordStart(int ch) {
+	return (isascii(ch) && (isalpha(ch) || (ch == '_'))) || (ch >= 0x7f);
+}
+
+static inline bool IsPhpWordChar(int ch) {
+	return IsADigit(ch) || IsPhpWordStart(ch);
+}
+
+static bool InTagState(int state) {
+	return state == SCE_H_TAG || state == SCE_H_TAGUNKNOWN ||
+	       state == SCE_H_SCRIPT ||
+	       state == SCE_H_ATTRIBUTE || state == SCE_H_ATTRIBUTEUNKNOWN ||
+	       state == SCE_H_NUMBER || state == SCE_H_OTHER ||
+	       state == SCE_H_DOUBLESTRING || state == SCE_H_SINGLESTRING;
+}
+
+static bool IsCommentState(const int state) {
+	return state == SCE_H_COMMENT || state == SCE_H_SGML_COMMENT;
+}
+
+static bool IsScriptCommentState(const int state) {
+	return state == SCE_HJ_COMMENT || state == SCE_HJ_COMMENTLINE || state == SCE_HJA_COMMENT ||
+		   state == SCE_HJA_COMMENTLINE || state == SCE_HB_COMMENTLINE || state == SCE_HBA_COMMENTLINE;
+}
+
+static bool isLineEnd(int ch) {
+	return ch == '\r' || ch == '\n';
+}
+
+static bool isOKBeforeRE(int ch) {
+	return (ch == '(') || (ch == '=') || (ch == ',');
+}
+
+static bool isPHPStringState(int state) {
+	return
+	    (state == SCE_HPHP_HSTRING) ||
+	    (state == SCE_HPHP_SIMPLESTRING) ||
+	    (state == SCE_HPHP_HSTRING_VARIABLE) ||
+	    (state == SCE_HPHP_COMPLEX_VARIABLE);
+}
+
+static int FindPhpStringDelimiter(char *phpStringDelimiter, const int phpStringDelimiterSize, int i, const int lengthDoc, Accessor &styler, bool &isSimpleString) {
+	int j;
+	const int beginning = i - 1;
+	bool isValidSimpleString = false;
+
+	while (i < lengthDoc && (styler[i] == ' ' || styler[i] == '\t'))
+		i++;
+
+	char ch = styler.SafeGetCharAt(i);
+	const char chNext = styler.SafeGetCharAt(i + 1);
+	if (!IsPhpWordStart(ch)) {
+		if (ch == '\'' && IsPhpWordStart(chNext)) {
+			i++;
+			ch = chNext;
+			isSimpleString = true;
+		} else {
+			phpStringDelimiter[0] = '\0';
+			return beginning;
+		}
+	}
+	phpStringDelimiter[0] = ch;
+	i++;
+
+	for (j = i; j < lengthDoc && !isLineEnd(styler[j]); j++) {
+		if (!IsPhpWordChar(styler[j])) {
+			if (isSimpleString && (styler[j] == '\'') && isLineEnd(styler.SafeGetCharAt(j + 1))) {
+				isValidSimpleString = true;
+				j++;
+				break;
+			} else {
+				phpStringDelimiter[0] = '\0';
+				return beginning;
+			}
+		}
+		if (j - i < phpStringDelimiterSize - 2)
+			phpStringDelimiter[j-i+1] = styler[j];
+		else
+			i++;
+	}
+	if (isSimpleString && !isValidSimpleString) {
+		phpStringDelimiter[0] = '\0';
+		return beginning;
+	}
+	phpStringDelimiter[j-i+1 - (isSimpleString ? 1 : 0)] = '\0';
+	return j - 1;
+}
+
+static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
+                                  Accessor &styler, bool isXml) {
+	WordList &keywords = *keywordlists[0];
+	WordList &keywords2 = *keywordlists[1];
+	WordList &keywords3 = *keywordlists[2];
+	WordList &keywords4 = *keywordlists[3];
+	WordList &keywords5 = *keywordlists[4];
+	WordList &keywords6 = *keywordlists[5]; // SGML (DTD) keywords
+
+	// Lexer for HTML requires more lexical states (8 bits worth) than most lexers
+	styler.StartAt(startPos, static_cast<char>(STYLE_MAX));
+	char prevWord[200];
+	prevWord[0] = '\0';
+	char phpStringDelimiter[200]; // PHP is not limited in length, we are
+	phpStringDelimiter[0] = '\0';
+	int StateToPrint = initStyle;
+	int state = stateForPrintState(StateToPrint);
+
+	// If inside a tag, it may be a script tag, so reread from the start to ensure any language tags are seen
+	if (InTagState(state)) {
+		while ((startPos > 0) && (InTagState(styler.StyleAt(startPos - 1)))) {
+			startPos--;
+			length++;
+		}
+		state = SCE_H_DEFAULT;
+	}
+	// String can be heredoc, must find a delimiter first. Reread from beginning of line containing the string, to get the correct lineState
+	if (isPHPStringState(state)) {
+		while (startPos > 0 && (isPHPStringState(state) || !isLineEnd(styler[startPos - 1]))) {
+			startPos--;
+			length++;
+			state = styler.StyleAt(startPos);
+		}
+		if (startPos == 0)
+			state = SCE_H_DEFAULT;
+	}
+	styler.StartAt(startPos, static_cast<char>(STYLE_MAX));
+
+	int lineCurrent = styler.GetLine(startPos);
+	int lineState;
+	if (lineCurrent > 0) {
+		lineState = styler.GetLineState(lineCurrent);
+	} else {
+		// Default client and ASP scripting language is JavaScript
+		lineState = eScriptJS << 8;
+		lineState |= styler.GetPropertyInt("asp.default.language", eScriptJS) << 4;
+	}
+	script_mode inScriptType = script_mode((lineState >> 0) & 0x03); // 2 bits of scripting mode
+	bool tagOpened = (lineState >> 2) & 0x01; // 1 bit to know if we are in an opened tag
+	bool tagClosing = (lineState >> 3) & 0x01; // 1 bit to know if we are in a closing tag
+	bool tagDontFold = false; //some HTML tags should not be folded
+	script_type aspScript = script_type((lineState >> 4) & 0x0F); // 4 bits of script name
+	script_type clientScript = script_type((lineState >> 8) & 0x0F); // 4 bits of script name
+	int beforePreProc = (lineState >> 12) & 0xFF; // 8 bits of state
+
+	script_type scriptLanguage = ScriptOfState(state);
+	// If eNonHtmlScript coincides with SCE_H_COMMENT, assume eScriptComment
+	if (inScriptType == eNonHtmlScript && state == SCE_H_COMMENT) {
+		scriptLanguage = eScriptComment;
+	}
+
+	const bool foldHTML = styler.GetPropertyInt("fold.html", 0) != 0;
+	const bool fold = foldHTML && styler.GetPropertyInt("fold", 0);
+	const bool foldHTMLPreprocessor = foldHTML && styler.GetPropertyInt("fold.html.preprocessor", 1);
+	const bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	const bool foldComment = fold && styler.GetPropertyInt("fold.hypertext.comment", 0) != 0;
+	const bool foldHeredoc = fold && styler.GetPropertyInt("fold.hypertext.heredoc", 0) != 0;
+	const bool caseSensitive = styler.GetPropertyInt("html.tags.case.sensitive", 0) != 0;
+	const bool allowScripts = styler.GetPropertyInt("lexer.xml.allow.scripts", 1) != 0;
+
+	const CharacterSet setHTMLWord(CharacterSet::setAlphaNum, ".-_:!#", 0x80, true);
+	const CharacterSet setTagContinue(CharacterSet::setAlphaNum, ".-_:!#[", 0x80, true);
+	const CharacterSet setAttributeContinue(CharacterSet::setAlphaNum, ".-_:!#/", 0x80, true);
+
+	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
+	int levelCurrent = levelPrev;
+	int visibleChars = 0;
+
+	int chPrev = ' ';
+	int ch = ' ';
+	int chPrevNonWhite = ' ';
+	// look back to set chPrevNonWhite properly for better regex colouring
+	if (scriptLanguage == eScriptJS && startPos > 0) {
+		int back = startPos;
+		int style = 0;
+		while (--back) {
+			style = styler.StyleAt(back);
+			if (style < SCE_HJ_DEFAULT || style > SCE_HJ_COMMENTDOC)
+				// includes SCE_HJ_COMMENT & SCE_HJ_COMMENTLINE
+				break;
+		}
+		if (style == SCE_HJ_SYMBOLS) {
+			chPrevNonWhite = static_cast<unsigned char>(styler.SafeGetCharAt(back));
+		}
+	}
+
+	styler.StartSegment(startPos);
+	const int lengthDoc = startPos + length;
+	for (int i = startPos; i < lengthDoc; i++) {
+		const int chPrev2 = chPrev;
+		chPrev = ch;
+		if (!IsASpace(ch) && state != SCE_HJ_COMMENT &&
+			state != SCE_HJ_COMMENTLINE && state != SCE_HJ_COMMENTDOC)
+			chPrevNonWhite = ch;
+		ch = static_cast<unsigned char>(styler[i]);
+		int chNext = static_cast<unsigned char>(styler.SafeGetCharAt(i + 1));
+		const int chNext2 = static_cast<unsigned char>(styler.SafeGetCharAt(i + 2));
+
+		// Handle DBCS codepages
+		if (styler.IsLeadByte(static_cast<char>(ch))) {
+			chPrev = ' ';
+			i += 1;
+			continue;
+		}
+
+		if ((!IsASpace(ch) || !foldCompact) && fold)
+			visibleChars++;
+
+		// decide what is the current state to print (depending of the script tag)
+		StateToPrint = statePrintForState(state, inScriptType);
+
+		// handle script folding
+		if (fold) {
+			switch (scriptLanguage) {
+			case eScriptJS:
+			case eScriptPHP:
+				//not currently supported				case eScriptVBS:
+
+				if ((state != SCE_HPHP_COMMENT) && (state != SCE_HPHP_COMMENTLINE) && (state != SCE_HJ_COMMENT) && (state != SCE_HJ_COMMENTLINE) && (state != SCE_HJ_COMMENTDOC) && (!isStringState(state))) {
+				//Platform::DebugPrintf("state=%d, StateToPrint=%d, initStyle=%d\n", state, StateToPrint, initStyle);
+				//if ((state == SCE_HPHP_OPERATOR) || (state == SCE_HPHP_DEFAULT) || (state == SCE_HJ_SYMBOLS) || (state == SCE_HJ_START) || (state == SCE_HJ_DEFAULT)) {
+					if ((ch == '{') || (ch == '}') || (foldComment && (ch == '/') && (chNext == '*'))) {
+						levelCurrent += ((ch == '{') || (ch == '/')) ? 1 : -1;
+					}
+				} else if (((state == SCE_HPHP_COMMENT) || (state == SCE_HJ_COMMENT)) && foldComment && (ch == '*') && (chNext == '/')) {
+					levelCurrent--;
+				}
+				break;
+			case eScriptPython:
+				if (state != SCE_HP_COMMENTLINE) {
+					if ((ch == ':') && ((chNext == '\n') || (chNext == '\r' && chNext2 == '\n'))) {
+						levelCurrent++;
+					} else if ((ch == '\n') && !((chNext == '\r') && (chNext2 == '\n')) && (chNext != '\n')) {
+						// check if the number of tabs is lower than the level
+						int Findlevel = (levelCurrent & ~SC_FOLDLEVELBASE) * 8;
+						for (int j = 0; Findlevel > 0; j++) {
+							char chTmp = styler.SafeGetCharAt(i + j + 1);
+							if (chTmp == '\t') {
+								Findlevel -= 8;
+							} else if (chTmp == ' ') {
+								Findlevel--;
+							} else {
+								break;
+							}
+						}
+
+						if (Findlevel > 0) {
+							levelCurrent -= Findlevel / 8;
+							if (Findlevel % 8)
+								levelCurrent--;
+						}
+					}
+				}
+				break;
+			default:
+				break;
+			}
+		}
+
+		if ((ch == '\r' && chNext != '\n') || (ch == '\n')) {
+			// Trigger on CR only (Mac style) or either on LF from CR+LF (Dos/Win) or on LF alone (Unix)
+			// Avoid triggering two times on Dos/Win
+			// New line -> record any line state onto /next/ line
+			if (fold) {
+				int lev = levelPrev;
+				if (visibleChars == 0)
+					lev |= SC_FOLDLEVELWHITEFLAG;
+				if ((levelCurrent > levelPrev) && (visibleChars > 0))
+					lev |= SC_FOLDLEVELHEADERFLAG;
+
+				styler.SetLevel(lineCurrent, lev);
+				visibleChars = 0;
+				levelPrev = levelCurrent;
+			}
+			lineCurrent++;
+			styler.SetLineState(lineCurrent,
+			                    ((inScriptType & 0x03) << 0) |
+			                    ((tagOpened & 0x01) << 2) |
+			                    ((tagClosing & 0x01) << 3) |
+			                    ((aspScript & 0x0F) << 4) |
+			                    ((clientScript & 0x0F) << 8) |
+			                    ((beforePreProc & 0xFF) << 12));
+		}
+
+		// generic end of script processing
+		else if ((inScriptType == eNonHtmlScript) && (ch == '<') && (chNext == '/')) {
+			// Check if it's the end of the script tag (or any other HTML tag)
+			switch (state) {
+				// in these cases, you can embed HTML tags (to confirm !!!!!!!!!!!!!!!!!!!!!!)
+			case SCE_H_DOUBLESTRING:
+			case SCE_H_SINGLESTRING:
+			case SCE_HJ_COMMENT:
+			case SCE_HJ_COMMENTDOC:
+			//case SCE_HJ_COMMENTLINE: // removed as this is a common thing done to hide
+			// the end of script marker from some JS interpreters.
+			case SCE_HB_COMMENTLINE:
+			case SCE_HBA_COMMENTLINE:
+			case SCE_HJ_DOUBLESTRING:
+			case SCE_HJ_SINGLESTRING:
+			case SCE_HJ_REGEX:
+			case SCE_HB_STRING:
+			case SCE_HBA_STRING:
+			case SCE_HP_STRING:
+			case SCE_HP_TRIPLE:
+			case SCE_HP_TRIPLEDOUBLE:
+			case SCE_HPHP_HSTRING:
+			case SCE_HPHP_SIMPLESTRING:
+			case SCE_HPHP_COMMENT:
+			case SCE_HPHP_COMMENTLINE:
+				break;
+			default :
+				// check if the closing tag is a script tag
+				if (const char *tag =
+						state == SCE_HJ_COMMENTLINE || isXml ? "script" :
+						state == SCE_H_COMMENT ? "comment" : 0) {
+					int j = i + 2;
+					int chr;
+					do {
+						chr = static_cast<int>(*tag++);
+					} while (chr != 0 && chr == MakeLowerCase(styler.SafeGetCharAt(j++)));
+					if (chr != 0) break;
+				}
+				// closing tag of the script (it's a closing HTML tag anyway)
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_H_TAGUNKNOWN;
+				inScriptType = eHtml;
+				scriptLanguage = eScriptNone;
+				clientScript = eScriptJS;
+				i += 2;
+				visibleChars += 2;
+				tagClosing = true;
+				continue;
+			}
+		}
+
+		/////////////////////////////////////
+		// handle the start of PHP pre-processor = Non-HTML
+		else if ((state != SCE_H_ASPAT) &&
+		         !isPHPStringState(state) &&
+		         (state != SCE_HPHP_COMMENT) &&
+		         (ch == '<') &&
+		         (chNext == '?') &&
+				 !IsScriptCommentState(state) ) {
+			scriptLanguage = segIsScriptingIndicator(styler, i + 2, i + 6, eScriptPHP);
+			if (scriptLanguage != eScriptPHP && isStringState(state)) continue;
+			styler.ColourTo(i - 1, StateToPrint);
+			beforePreProc = state;
+			i++;
+			visibleChars++;
+			i += PrintScriptingIndicatorOffset(styler, styler.GetStartSegment() + 2, i + 6);
+			if (scriptLanguage == eScriptXML)
+				styler.ColourTo(i, SCE_H_XMLSTART);
+			else
+				styler.ColourTo(i, SCE_H_QUESTION);
+			state = StateForScript(scriptLanguage);
+			if (inScriptType == eNonHtmlScript)
+				inScriptType = eNonHtmlScriptPreProc;
+			else
+				inScriptType = eNonHtmlPreProc;
+			// Fold whole script, but not if the XML first tag (all XML-like tags in this case)
+			if (foldHTMLPreprocessor && (scriptLanguage != eScriptXML)) {
+				levelCurrent++;
+			}
+			// should be better
+			ch = static_cast<unsigned char>(styler.SafeGetCharAt(i));
+			continue;
+		}
+
+		// handle the start of ASP pre-processor = Non-HTML
+		else if (!isCommentASPState(state) && (ch == '<') && (chNext == '%') && !isPHPStringState(state)) {
+			styler.ColourTo(i - 1, StateToPrint);
+			beforePreProc = state;
+			if (inScriptType == eNonHtmlScript)
+				inScriptType = eNonHtmlScriptPreProc;
+			else
+				inScriptType = eNonHtmlPreProc;
+
+			if (chNext2 == '@') {
+				i += 2; // place as if it was the second next char treated
+				visibleChars += 2;
+				state = SCE_H_ASPAT;
+			} else if ((chNext2 == '-') && (styler.SafeGetCharAt(i + 3) == '-')) {
+				styler.ColourTo(i + 3, SCE_H_ASP);
+				state = SCE_H_XCCOMMENT;
+				scriptLanguage = eScriptVBS;
+				continue;
+			} else {
+				if (chNext2 == '=') {
+					i += 2; // place as if it was the second next char treated
+					visibleChars += 2;
+				} else {
+					i++; // place as if it was the next char treated
+					visibleChars++;
+				}
+
+				state = StateForScript(aspScript);
+			}
+			scriptLanguage = eScriptVBS;
+			styler.ColourTo(i, SCE_H_ASP);
+			// fold whole script
+			if (foldHTMLPreprocessor)
+				levelCurrent++;
+			// should be better
+			ch = static_cast<unsigned char>(styler.SafeGetCharAt(i));
+			continue;
+		}
+
+		/////////////////////////////////////
+		// handle the start of SGML language (DTD)
+		else if (((scriptLanguage == eScriptNone) || (scriptLanguage == eScriptXML)) &&
+				 (chPrev == '<') &&
+				 (ch == '!') &&
+				 (StateToPrint != SCE_H_CDATA) &&
+				 (!IsCommentState(StateToPrint)) &&
+				 (!IsScriptCommentState(StateToPrint)) ) {
+			beforePreProc = state;
+			styler.ColourTo(i - 2, StateToPrint);
+			if ((chNext == '-') && (chNext2 == '-')) {
+				state = SCE_H_COMMENT; // wait for a pending command
+				styler.ColourTo(i + 2, SCE_H_COMMENT);
+				i += 2; // follow styling after the --
+			} else if (isWordCdata(i + 1, i + 7, styler)) {
+				state = SCE_H_CDATA;
+			} else {
+				styler.ColourTo(i, SCE_H_SGML_DEFAULT); // <! is default
+				scriptLanguage = eScriptSGML;
+				state = SCE_H_SGML_COMMAND; // wait for a pending command
+			}
+			// fold whole tag (-- when closing the tag)
+			if (foldHTMLPreprocessor)
+				levelCurrent++;
+			continue;
+		}
+
+		// handle the end of a pre-processor = Non-HTML
+		else if ((
+		             ((inScriptType == eNonHtmlPreProc)
+		              || (inScriptType == eNonHtmlScriptPreProc)) && (
+		                 ((scriptLanguage != eScriptNone) && stateAllowsTermination(state) && ((ch == '%') || (ch == '?')))
+		             ) && (chNext == '>')) ||
+		         ((scriptLanguage == eScriptSGML) && (ch == '>') && (state != SCE_H_SGML_COMMENT))) {
+			if (state == SCE_H_ASPAT) {
+				aspScript = segIsScriptingIndicator(styler,
+				                                    styler.GetStartSegment(), i - 1, aspScript);
+			}
+			// Bounce out of any ASP mode
+			switch (state) {
+			case SCE_HJ_WORD:
+				classifyWordHTJS(styler.GetStartSegment(), i - 1, keywords2, styler, inScriptType);
+				break;
+			case SCE_HB_WORD:
+				classifyWordHTVB(styler.GetStartSegment(), i - 1, keywords3, styler, inScriptType);
+				break;
+			case SCE_HP_WORD:
+				classifyWordHTPy(styler.GetStartSegment(), i - 1, keywords4, styler, prevWord, inScriptType);
+				break;
+			case SCE_HPHP_WORD:
+				classifyWordHTPHP(styler.GetStartSegment(), i - 1, keywords5, styler);
+				break;
+			case SCE_H_XCCOMMENT:
+				styler.ColourTo(i - 1, state);
+				break;
+			default :
+				styler.ColourTo(i - 1, StateToPrint);
+				break;
+			}
+			if (scriptLanguage != eScriptSGML) {
+				i++;
+				visibleChars++;
+			}
+			if (ch == '%')
+				styler.ColourTo(i, SCE_H_ASP);
+			else if (scriptLanguage == eScriptXML)
+				styler.ColourTo(i, SCE_H_XMLEND);
+			else if (scriptLanguage == eScriptSGML)
+				styler.ColourTo(i, SCE_H_SGML_DEFAULT);
+			else
+				styler.ColourTo(i, SCE_H_QUESTION);
+			state = beforePreProc;
+			if (inScriptType == eNonHtmlScriptPreProc)
+				inScriptType = eNonHtmlScript;
+			else
+				inScriptType = eHtml;
+			// Unfold all scripting languages, except for XML tag
+			if (foldHTMLPreprocessor && (scriptLanguage != eScriptXML)) {
+				levelCurrent--;
+			}
+			scriptLanguage = eScriptNone;
+			continue;
+		}
+		/////////////////////////////////////
+
+		switch (state) {
+		case SCE_H_DEFAULT:
+			if (ch == '<') {
+				// in HTML, fold on tag open and unfold on tag close
+				tagOpened = true;
+				tagClosing = (chNext == '/');
+				styler.ColourTo(i - 1, StateToPrint);
+				if (chNext != '!')
+					state = SCE_H_TAGUNKNOWN;
+			} else if (ch == '&') {
+				styler.ColourTo(i - 1, SCE_H_DEFAULT);
+				state = SCE_H_ENTITY;
+			}
+			break;
+		case SCE_H_SGML_DEFAULT:
+		case SCE_H_SGML_BLOCK_DEFAULT:
+//			if (scriptLanguage == eScriptSGMLblock)
+//				StateToPrint = SCE_H_SGML_BLOCK_DEFAULT;
+
+			if (ch == '\"') {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_H_SGML_DOUBLESTRING;
+			} else if (ch == '\'') {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_H_SGML_SIMPLESTRING;
+			} else if ((ch == '-') && (chPrev == '-')) {
+				if (static_cast<int>(styler.GetStartSegment()) <= (i - 2)) {
+					styler.ColourTo(i - 2, StateToPrint);
+				}
+				state = SCE_H_SGML_COMMENT;
+			} else if (isascii(ch) && isalpha(ch) && (chPrev == '%')) {
+				styler.ColourTo(i - 2, StateToPrint);
+				state = SCE_H_SGML_ENTITY;
+			} else if (ch == '#') {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_H_SGML_SPECIAL;
+			} else if (ch == '[') {
+				styler.ColourTo(i - 1, StateToPrint);
+				scriptLanguage = eScriptSGMLblock;
+				state = SCE_H_SGML_BLOCK_DEFAULT;
+			} else if (ch == ']') {
+				if (scriptLanguage == eScriptSGMLblock) {
+					styler.ColourTo(i, StateToPrint);
+					scriptLanguage = eScriptSGML;
+				} else {
+					styler.ColourTo(i - 1, StateToPrint);
+					styler.ColourTo(i, SCE_H_SGML_ERROR);
+				}
+				state = SCE_H_SGML_DEFAULT;
+			} else if (scriptLanguage == eScriptSGMLblock) {
+				if ((ch == '!') && (chPrev == '<')) {
+					styler.ColourTo(i - 2, StateToPrint);
+					styler.ColourTo(i, SCE_H_SGML_DEFAULT);
+					state = SCE_H_SGML_COMMAND;
+				} else if (ch == '>') {
+					styler.ColourTo(i - 1, StateToPrint);
+					styler.ColourTo(i, SCE_H_SGML_DEFAULT);
+				}
+			}
+			break;
+		case SCE_H_SGML_COMMAND:
+			if ((ch == '-') && (chPrev == '-')) {
+				styler.ColourTo(i - 2, StateToPrint);
+				state = SCE_H_SGML_COMMENT;
+			} else if (!issgmlwordchar(ch)) {
+				if (isWordHSGML(styler.GetStartSegment(), i - 1, keywords6, styler)) {
+					styler.ColourTo(i - 1, StateToPrint);
+					state = SCE_H_SGML_1ST_PARAM;
+				} else {
+					state = SCE_H_SGML_ERROR;
+				}
+			}
+			break;
+		case SCE_H_SGML_1ST_PARAM:
+			// wait for the beginning of the word
+			if ((ch == '-') && (chPrev == '-')) {
+				if (scriptLanguage == eScriptSGMLblock) {
+					styler.ColourTo(i - 2, SCE_H_SGML_BLOCK_DEFAULT);
+				} else {
+					styler.ColourTo(i - 2, SCE_H_SGML_DEFAULT);
+				}
+				state = SCE_H_SGML_1ST_PARAM_COMMENT;
+			} else if (issgmlwordchar(ch)) {
+				if (scriptLanguage == eScriptSGMLblock) {
+					styler.ColourTo(i - 1, SCE_H_SGML_BLOCK_DEFAULT);
+				} else {
+					styler.ColourTo(i - 1, SCE_H_SGML_DEFAULT);
+				}
+				// find the length of the word
+				int size = 1;
+				while (setHTMLWord.Contains(static_cast<unsigned char>(styler.SafeGetCharAt(i + size))))
+					size++;
+				styler.ColourTo(i + size - 1, StateToPrint);
+				i += size - 1;
+				visibleChars += size - 1;
+				ch = static_cast<unsigned char>(styler.SafeGetCharAt(i));
+				if (scriptLanguage == eScriptSGMLblock) {
+					state = SCE_H_SGML_BLOCK_DEFAULT;
+				} else {
+					state = SCE_H_SGML_DEFAULT;
+				}
+				continue;
+			}
+			break;
+		case SCE_H_SGML_ERROR:
+			if ((ch == '-') && (chPrev == '-')) {
+				styler.ColourTo(i - 2, StateToPrint);
+				state = SCE_H_SGML_COMMENT;
+			}
+		case SCE_H_SGML_DOUBLESTRING:
+			if (ch == '\"') {
+				styler.ColourTo(i, StateToPrint);
+				state = SCE_H_SGML_DEFAULT;
+			}
+			break;
+		case SCE_H_SGML_SIMPLESTRING:
+			if (ch == '\'') {
+				styler.ColourTo(i, StateToPrint);
+				state = SCE_H_SGML_DEFAULT;
+			}
+			break;
+		case SCE_H_SGML_COMMENT:
+			if ((ch == '-') && (chPrev == '-')) {
+				styler.ColourTo(i, StateToPrint);
+				state = SCE_H_SGML_DEFAULT;
+			}
+			break;
+		case SCE_H_CDATA:
+			if ((chPrev2 == ']') && (chPrev == ']') && (ch == '>')) {
+				styler.ColourTo(i, StateToPrint);
+				state = SCE_H_DEFAULT;
+				levelCurrent--;
+			}
+			break;
+		case SCE_H_COMMENT:
+			if ((scriptLanguage != eScriptComment) && (chPrev2 == '-') && (chPrev == '-') && (ch == '>')) {
+				styler.ColourTo(i, StateToPrint);
+				state = SCE_H_DEFAULT;
+				levelCurrent--;
+			}
+			break;
+		case SCE_H_SGML_1ST_PARAM_COMMENT:
+			if ((ch == '-') && (chPrev == '-')) {
+				styler.ColourTo(i, SCE_H_SGML_COMMENT);
+				state = SCE_H_SGML_1ST_PARAM;
+			}
+			break;
+		case SCE_H_SGML_SPECIAL:
+			if (!(isascii(ch) && isupper(ch))) {
+				styler.ColourTo(i - 1, StateToPrint);
+				if (isalnum(ch)) {
+					state = SCE_H_SGML_ERROR;
+				} else {
+					state = SCE_H_SGML_DEFAULT;
+				}
+			}
+			break;
+		case SCE_H_SGML_ENTITY:
+			if (ch == ';') {
+				styler.ColourTo(i, StateToPrint);
+				state = SCE_H_SGML_DEFAULT;
+			} else if (!(isascii(ch) && isalnum(ch)) && ch != '-' && ch != '.') {
+				styler.ColourTo(i, SCE_H_SGML_ERROR);
+				state = SCE_H_SGML_DEFAULT;
+			}
+			break;
+		case SCE_H_ENTITY:
+			if (ch == ';') {
+				styler.ColourTo(i, StateToPrint);
+				state = SCE_H_DEFAULT;
+			}
+			if (ch != '#' && !(isascii(ch) && isalnum(ch))	// Should check that '#' follows '&', but it is unlikely anyway...
+				&& ch != '.' && ch != '-' && ch != '_' && ch != ':') { // valid in XML
+				styler.ColourTo(i, SCE_H_TAGUNKNOWN);
+				state = SCE_H_DEFAULT;
+			}
+			break;
+		case SCE_H_TAGUNKNOWN:
+			if (!setTagContinue.Contains(ch) && !((ch == '/') && (chPrev == '<'))) {
+				int eClass = classifyTagHTML(styler.GetStartSegment(),
+					i - 1, keywords, styler, tagDontFold, caseSensitive, isXml, allowScripts);
+				if (eClass == SCE_H_SCRIPT || eClass == SCE_H_COMMENT) {
+					if (!tagClosing) {
+						inScriptType = eNonHtmlScript;
+						scriptLanguage = eClass == SCE_H_SCRIPT ? clientScript : eScriptComment;
+					} else {
+						scriptLanguage = eScriptNone;
+					}
+					eClass = SCE_H_TAG;
+				}
+				if (ch == '>') {
+					styler.ColourTo(i, eClass);
+					if (inScriptType == eNonHtmlScript) {
+						state = StateForScript(scriptLanguage);
+					} else {
+						state = SCE_H_DEFAULT;
+					}
+					tagOpened = false;
+					if (!tagDontFold) {
+						if (tagClosing) {
+							levelCurrent--;
+						} else {
+							levelCurrent++;
+						}
+					}
+					tagClosing = false;
+				} else if (ch == '/' && chNext == '>') {
+					if (eClass == SCE_H_TAGUNKNOWN) {
+						styler.ColourTo(i + 1, SCE_H_TAGUNKNOWN);
+					} else {
+						styler.ColourTo(i - 1, StateToPrint);
+						styler.ColourTo(i + 1, SCE_H_TAGEND);
+					}
+					i++;
+					ch = chNext;
+					state = SCE_H_DEFAULT;
+					tagOpened = false;
+				} else {
+					if (eClass != SCE_H_TAGUNKNOWN) {
+						if (eClass == SCE_H_SGML_DEFAULT) {
+							state = SCE_H_SGML_DEFAULT;
+						} else {
+							state = SCE_H_OTHER;
+						}
+					}
+				}
+			}
+			break;
+		case SCE_H_ATTRIBUTE:
+			if (!setAttributeContinue.Contains(ch)) {
+				if (inScriptType == eNonHtmlScript) {
+					int scriptLanguagePrev = scriptLanguage;
+					clientScript = segIsScriptingIndicator(styler, styler.GetStartSegment(), i - 1, scriptLanguage);
+					scriptLanguage = clientScript;
+					if ((scriptLanguagePrev != scriptLanguage) && (scriptLanguage == eScriptNone))
+						inScriptType = eHtml;
+				}
+				classifyAttribHTML(styler.GetStartSegment(), i - 1, keywords, styler);
+				if (ch == '>') {
+					styler.ColourTo(i, SCE_H_TAG);
+					if (inScriptType == eNonHtmlScript) {
+						state = StateForScript(scriptLanguage);
+					} else {
+						state = SCE_H_DEFAULT;
+					}
+					tagOpened = false;
+					if (!tagDontFold) {
+						if (tagClosing) {
+							levelCurrent--;
+						} else {
+							levelCurrent++;
+						}
+					}
+					tagClosing = false;
+				} else if (ch == '=') {
+					styler.ColourTo(i, SCE_H_OTHER);
+					state = SCE_H_VALUE;
+				} else {
+					state = SCE_H_OTHER;
+				}
+			}
+			break;
+		case SCE_H_OTHER:
+			if (ch == '>') {
+				styler.ColourTo(i - 1, StateToPrint);
+				styler.ColourTo(i, SCE_H_TAG);
+				if (inScriptType == eNonHtmlScript) {
+					state = StateForScript(scriptLanguage);
+				} else {
+					state = SCE_H_DEFAULT;
+				}
+				tagOpened = false;
+				if (!tagDontFold) {
+					if (tagClosing) {
+						levelCurrent--;
+					} else {
+						levelCurrent++;
+					}
+				}
+				tagClosing = false;
+			} else if (ch == '\"') {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_H_DOUBLESTRING;
+			} else if (ch == '\'') {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_H_SINGLESTRING;
+			} else if (ch == '=') {
+				styler.ColourTo(i, StateToPrint);
+				state = SCE_H_VALUE;
+			} else if (ch == '/' && chNext == '>') {
+				styler.ColourTo(i - 1, StateToPrint);
+				styler.ColourTo(i + 1, SCE_H_TAGEND);
+				i++;
+				ch = chNext;
+				state = SCE_H_DEFAULT;
+				tagOpened = false;
+			} else if (ch == '?' && chNext == '>') {
+				styler.ColourTo(i - 1, StateToPrint);
+				styler.ColourTo(i + 1, SCE_H_XMLEND);
+				i++;
+				ch = chNext;
+				state = SCE_H_DEFAULT;
+			} else if (setHTMLWord.Contains(ch)) {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_H_ATTRIBUTE;
+			}
+			break;
+		case SCE_H_DOUBLESTRING:
+			if (ch == '\"') {
+				if (inScriptType == eNonHtmlScript) {
+					scriptLanguage = segIsScriptingIndicator(styler, styler.GetStartSegment(), i, scriptLanguage);
+				}
+				styler.ColourTo(i, SCE_H_DOUBLESTRING);
+				state = SCE_H_OTHER;
+			}
+			break;
+		case SCE_H_SINGLESTRING:
+			if (ch == '\'') {
+				if (inScriptType == eNonHtmlScript) {
+					scriptLanguage = segIsScriptingIndicator(styler, styler.GetStartSegment(), i, scriptLanguage);
+				}
+				styler.ColourTo(i, SCE_H_SINGLESTRING);
+				state = SCE_H_OTHER;
+			}
+			break;
+		case SCE_H_VALUE:
+			if (!setHTMLWord.Contains(ch)) {
+				if (ch == '\"' && chPrev == '=') {
+					// Should really test for being first character
+					state = SCE_H_DOUBLESTRING;
+				} else if (ch == '\'' && chPrev == '=') {
+					state = SCE_H_SINGLESTRING;
+				} else {
+					if (IsNumber(styler.GetStartSegment(), styler)) {
+						styler.ColourTo(i - 1, SCE_H_NUMBER);
+					} else {
+						styler.ColourTo(i - 1, StateToPrint);
+					}
+					if (ch == '>') {
+						styler.ColourTo(i, SCE_H_TAG);
+						if (inScriptType == eNonHtmlScript) {
+							state = StateForScript(scriptLanguage);
+						} else {
+							state = SCE_H_DEFAULT;
+						}
+						tagOpened = false;
+						if (!tagDontFold) {
+							if (tagClosing) {
+								levelCurrent--;
+							} else {
+								levelCurrent++;
+							}
+						}
+						tagClosing = false;
+					} else {
+						state = SCE_H_OTHER;
+					}
+				}
+			}
+			break;
+		case SCE_HJ_DEFAULT:
+		case SCE_HJ_START:
+		case SCE_HJ_SYMBOLS:
+			if (IsAWordStart(ch)) {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_HJ_WORD;
+			} else if (ch == '/' && chNext == '*') {
+				styler.ColourTo(i - 1, StateToPrint);
+				if (chNext2 == '*')
+					state = SCE_HJ_COMMENTDOC;
+				else
+					state = SCE_HJ_COMMENT;
+			} else if (ch == '/' && chNext == '/') {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_HJ_COMMENTLINE;
+			} else if (ch == '/' && isOKBeforeRE(chPrevNonWhite)) {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_HJ_REGEX;
+			} else if (ch == '\"') {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_HJ_DOUBLESTRING;
+			} else if (ch == '\'') {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_HJ_SINGLESTRING;
+			} else if ((ch == '<') && (chNext == '!') && (chNext2 == '-') &&
+			           styler.SafeGetCharAt(i + 3) == '-') {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_HJ_COMMENTLINE;
+			} else if ((ch == '-') && (chNext == '-') && (chNext2 == '>')) {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_HJ_COMMENTLINE;
+				i += 2;
+			} else if (IsOperator(ch)) {
+				styler.ColourTo(i - 1, StateToPrint);
+				styler.ColourTo(i, statePrintForState(SCE_HJ_SYMBOLS, inScriptType));
+				state = SCE_HJ_DEFAULT;
+			} else if ((ch == ' ') || (ch == '\t')) {
+				if (state == SCE_HJ_START) {
+					styler.ColourTo(i - 1, StateToPrint);
+					state = SCE_HJ_DEFAULT;
+				}
+			}
+			break;
+		case SCE_HJ_WORD:
+			if (!IsAWordChar(ch)) {
+				classifyWordHTJS(styler.GetStartSegment(), i - 1, keywords2, styler, inScriptType);
+				//styler.ColourTo(i - 1, eHTJSKeyword);
+				state = SCE_HJ_DEFAULT;
+				if (ch == '/' && chNext == '*') {
+					if (chNext2 == '*')
+						state = SCE_HJ_COMMENTDOC;
+					else
+						state = SCE_HJ_COMMENT;
+				} else if (ch == '/' && chNext == '/') {
+					state = SCE_HJ_COMMENTLINE;
+				} else if (ch == '\"') {
+					state = SCE_HJ_DOUBLESTRING;
+				} else if (ch == '\'') {
+					state = SCE_HJ_SINGLESTRING;
+				} else if ((ch == '-') && (chNext == '-') && (chNext2 == '>')) {
+					styler.ColourTo(i - 1, StateToPrint);
+					state = SCE_HJ_COMMENTLINE;
+					i += 2;
+				} else if (IsOperator(ch)) {
+					styler.ColourTo(i, statePrintForState(SCE_HJ_SYMBOLS, inScriptType));
+					state = SCE_HJ_DEFAULT;
+				}
+			}
+			break;
+		case SCE_HJ_COMMENT:
+		case SCE_HJ_COMMENTDOC:
+			if (ch == '/' && chPrev == '*') {
+				styler.ColourTo(i, StateToPrint);
+				state = SCE_HJ_DEFAULT;
+				ch = ' ';
+			}
+			break;
+		case SCE_HJ_COMMENTLINE:
+			if (ch == '\r' || ch == '\n') {
+				styler.ColourTo(i - 1, statePrintForState(SCE_HJ_COMMENTLINE, inScriptType));
+				state = SCE_HJ_DEFAULT;
+				ch = ' ';
+			}
+			break;
+		case SCE_HJ_DOUBLESTRING:
+			if (ch == '\\') {
+				if (chNext == '\"' || chNext == '\'' || chNext == '\\') {
+					i++;
+				}
+			} else if (ch == '\"') {
+				styler.ColourTo(i, statePrintForState(SCE_HJ_DOUBLESTRING, inScriptType));
+				state = SCE_HJ_DEFAULT;
+			} else if ((inScriptType == eNonHtmlScript) && (ch == '-') && (chNext == '-') && (chNext2 == '>')) {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_HJ_COMMENTLINE;
+				i += 2;
+			} else if (isLineEnd(ch)) {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_HJ_STRINGEOL;
+			}
+			break;
+		case SCE_HJ_SINGLESTRING:
+			if (ch == '\\') {
+				if (chNext == '\"' || chNext == '\'' || chNext == '\\') {
+					i++;
+				}
+			} else if (ch == '\'') {
+				styler.ColourTo(i, statePrintForState(SCE_HJ_SINGLESTRING, inScriptType));
+				state = SCE_HJ_DEFAULT;
+			} else if ((inScriptType == eNonHtmlScript) && (ch == '-') && (chNext == '-') && (chNext2 == '>')) {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_HJ_COMMENTLINE;
+				i += 2;
+			} else if (isLineEnd(ch)) {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_HJ_STRINGEOL;
+			}
+			break;
+		case SCE_HJ_STRINGEOL:
+			if (!isLineEnd(ch)) {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_HJ_DEFAULT;
+			} else if (!isLineEnd(chNext)) {
+				styler.ColourTo(i, StateToPrint);
+				state = SCE_HJ_DEFAULT;
+			}
+			break;
+		case SCE_HJ_REGEX:
+			if (ch == '\r' || ch == '\n' || ch == '/') {
+				if (ch == '/') {
+					while (isascii(chNext) && islower(chNext)) {   // gobble regex flags
+						i++;
+						ch = chNext;
+						chNext = static_cast<unsigned char>(styler.SafeGetCharAt(i + 1));
+					}
+				}
+				styler.ColourTo(i, StateToPrint);
+				state = SCE_HJ_DEFAULT;
+			} else if (ch == '\\') {
+				// Gobble up the quoted character
+				if (chNext == '\\' || chNext == '/') {
+					i++;
+					ch = chNext;
+					chNext = static_cast<unsigned char>(styler.SafeGetCharAt(i + 1));
+				}
+			}
+			break;
+		case SCE_HB_DEFAULT:
+		case SCE_HB_START:
+			if (IsAWordStart(ch)) {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_HB_WORD;
+			} else if (ch == '\'') {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_HB_COMMENTLINE;
+			} else if (ch == '\"') {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_HB_STRING;
+			} else if ((ch == '<') && (chNext == '!') && (chNext2 == '-') &&
+			           styler.SafeGetCharAt(i + 3) == '-') {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_HB_COMMENTLINE;
+			} else if (IsOperator(ch)) {
+				styler.ColourTo(i - 1, StateToPrint);
+				styler.ColourTo(i, statePrintForState(SCE_HB_DEFAULT, inScriptType));
+				state = SCE_HB_DEFAULT;
+			} else if ((ch == ' ') || (ch == '\t')) {
+				if (state == SCE_HB_START) {
+					styler.ColourTo(i - 1, StateToPrint);
+					state = SCE_HB_DEFAULT;
+				}
+			}
+			break;
+		case SCE_HB_WORD:
+			if (!IsAWordChar(ch)) {
+				state = classifyWordHTVB(styler.GetStartSegment(), i - 1, keywords3, styler, inScriptType);
+				if (state == SCE_HB_DEFAULT) {
+					if (ch == '\"') {
+						state = SCE_HB_STRING;
+					} else if (ch == '\'') {
+						state = SCE_HB_COMMENTLINE;
+					} else if (IsOperator(ch)) {
+						styler.ColourTo(i, statePrintForState(SCE_HB_DEFAULT, inScriptType));
+						state = SCE_HB_DEFAULT;
+					}
+				}
+			}
+			break;
+		case SCE_HB_STRING:
+			if (ch == '\"') {
+				styler.ColourTo(i, StateToPrint);
+				state = SCE_HB_DEFAULT;
+			} else if (ch == '\r' || ch == '\n') {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_HB_STRINGEOL;
+			}
+			break;
+		case SCE_HB_COMMENTLINE:
+			if (ch == '\r' || ch == '\n') {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_HB_DEFAULT;
+			}
+			break;
+		case SCE_HB_STRINGEOL:
+			if (!isLineEnd(ch)) {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_HB_DEFAULT;
+			} else if (!isLineEnd(chNext)) {
+				styler.ColourTo(i, StateToPrint);
+				state = SCE_HB_DEFAULT;
+			}
+			break;
+		case SCE_HP_DEFAULT:
+		case SCE_HP_START:
+			if (IsAWordStart(ch)) {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_HP_WORD;
+			} else if ((ch == '<') && (chNext == '!') && (chNext2 == '-') &&
+			           styler.SafeGetCharAt(i + 3) == '-') {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_HP_COMMENTLINE;
+			} else if (ch == '#') {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_HP_COMMENTLINE;
+			} else if (ch == '\"') {
+				styler.ColourTo(i - 1, StateToPrint);
+				if (chNext == '\"' && chNext2 == '\"') {
+					i += 2;
+					state = SCE_HP_TRIPLEDOUBLE;
+					ch = ' ';
+					chPrev = ' ';
+					chNext = static_cast<unsigned char>(styler.SafeGetCharAt(i + 1));
+				} else {
+					//					state = statePrintForState(SCE_HP_STRING,inScriptType);
+					state = SCE_HP_STRING;
+				}
+			} else if (ch == '\'') {
+				styler.ColourTo(i - 1, StateToPrint);
+				if (chNext == '\'' && chNext2 == '\'') {
+					i += 2;
+					state = SCE_HP_TRIPLE;
+					ch = ' ';
+					chPrev = ' ';
+					chNext = static_cast<unsigned char>(styler.SafeGetCharAt(i + 1));
+				} else {
+					state = SCE_HP_CHARACTER;
+				}
+			} else if (IsOperator(ch)) {
+				styler.ColourTo(i - 1, StateToPrint);
+				styler.ColourTo(i, statePrintForState(SCE_HP_OPERATOR, inScriptType));
+			} else if ((ch == ' ') || (ch == '\t')) {
+				if (state == SCE_HP_START) {
+					styler.ColourTo(i - 1, StateToPrint);
+					state = SCE_HP_DEFAULT;
+				}
+			}
+			break;
+		case SCE_HP_WORD:
+			if (!IsAWordChar(ch)) {
+				classifyWordHTPy(styler.GetStartSegment(), i - 1, keywords4, styler, prevWord, inScriptType);
+				state = SCE_HP_DEFAULT;
+				if (ch == '#') {
+					state = SCE_HP_COMMENTLINE;
+				} else if (ch == '\"') {
+					if (chNext == '\"' && chNext2 == '\"') {
+						i += 2;
+						state = SCE_HP_TRIPLEDOUBLE;
+						ch = ' ';
+						chPrev = ' ';
+						chNext = static_cast<unsigned char>(styler.SafeGetCharAt(i + 1));
+					} else {
+						state = SCE_HP_STRING;
+					}
+				} else if (ch == '\'') {
+					if (chNext == '\'' && chNext2 == '\'') {
+						i += 2;
+						state = SCE_HP_TRIPLE;
+						ch = ' ';
+						chPrev = ' ';
+						chNext = static_cast<unsigned char>(styler.SafeGetCharAt(i + 1));
+					} else {
+						state = SCE_HP_CHARACTER;
+					}
+				} else if (IsOperator(ch)) {
+					styler.ColourTo(i, statePrintForState(SCE_HP_OPERATOR, inScriptType));
+				}
+			}
+			break;
+		case SCE_HP_COMMENTLINE:
+			if (ch == '\r' || ch == '\n') {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_HP_DEFAULT;
+			}
+			break;
+		case SCE_HP_STRING:
+			if (ch == '\\') {
+				if (chNext == '\"' || chNext == '\'' || chNext == '\\') {
+					i++;
+					ch = chNext;
+					chNext = static_cast<unsigned char>(styler.SafeGetCharAt(i + 1));
+				}
+			} else if (ch == '\"') {
+				styler.ColourTo(i, StateToPrint);
+				state = SCE_HP_DEFAULT;
+			}
+			break;
+		case SCE_HP_CHARACTER:
+			if (ch == '\\') {
+				if (chNext == '\"' || chNext == '\'' || chNext == '\\') {
+					i++;
+					ch = chNext;
+					chNext = static_cast<unsigned char>(styler.SafeGetCharAt(i + 1));
+				}
+			} else if (ch == '\'') {
+				styler.ColourTo(i, StateToPrint);
+				state = SCE_HP_DEFAULT;
+			}
+			break;
+		case SCE_HP_TRIPLE:
+			if (ch == '\'' && chPrev == '\'' && chPrev2 == '\'') {
+				styler.ColourTo(i, StateToPrint);
+				state = SCE_HP_DEFAULT;
+			}
+			break;
+		case SCE_HP_TRIPLEDOUBLE:
+			if (ch == '\"' && chPrev == '\"' && chPrev2 == '\"') {
+				styler.ColourTo(i, StateToPrint);
+				state = SCE_HP_DEFAULT;
+			}
+			break;
+			///////////// start - PHP state handling
+		case SCE_HPHP_WORD:
+			if (!IsAWordChar(ch)) {
+				classifyWordHTPHP(styler.GetStartSegment(), i - 1, keywords5, styler);
+				if (ch == '/' && chNext == '*') {
+					i++;
+					state = SCE_HPHP_COMMENT;
+				} else if (ch == '/' && chNext == '/') {
+					i++;
+					state = SCE_HPHP_COMMENTLINE;
+				} else if (ch == '#') {
+					state = SCE_HPHP_COMMENTLINE;
+				} else if (ch == '\"') {
+					state = SCE_HPHP_HSTRING;
+					strcpy(phpStringDelimiter, "\"");
+				} else if (styler.Match(i, "<<<")) {
+					bool isSimpleString = false;
+					i = FindPhpStringDelimiter(phpStringDelimiter, sizeof(phpStringDelimiter), i + 3, lengthDoc, styler, isSimpleString);
+					if (strlen(phpStringDelimiter)) {
+						state = (isSimpleString ? SCE_HPHP_SIMPLESTRING : SCE_HPHP_HSTRING);
+						if (foldHeredoc) levelCurrent++;
+					}
+				} else if (ch == '\'') {
+					state = SCE_HPHP_SIMPLESTRING;
+					strcpy(phpStringDelimiter, "\'");
+				} else if (ch == '$' && IsPhpWordStart(chNext)) {
+					state = SCE_HPHP_VARIABLE;
+				} else if (IsOperator(ch)) {
+					state = SCE_HPHP_OPERATOR;
+				} else {
+					state = SCE_HPHP_DEFAULT;
+				}
+			}
+			break;
+		case SCE_HPHP_NUMBER:
+			// recognize bases 8,10 or 16 integers OR floating-point numbers
+			if (!IsADigit(ch)
+				&& strchr(".xXabcdefABCDEF", ch) == NULL
+				&& ((ch != '-' && ch != '+') || (chPrev != 'e' && chPrev != 'E'))) {
+				styler.ColourTo(i - 1, SCE_HPHP_NUMBER);
+				if (IsOperator(ch))
+					state = SCE_HPHP_OPERATOR;
+				else
+					state = SCE_HPHP_DEFAULT;
+			}
+			break;
+		case SCE_HPHP_VARIABLE:
+			if (!IsPhpWordChar(chNext)) {
+				styler.ColourTo(i, SCE_HPHP_VARIABLE);
+				state = SCE_HPHP_DEFAULT;
+			}
+			break;
+		case SCE_HPHP_COMMENT:
+			if (ch == '/' && chPrev == '*') {
+				styler.ColourTo(i, StateToPrint);
+				state = SCE_HPHP_DEFAULT;
+			}
+			break;
+		case SCE_HPHP_COMMENTLINE:
+			if (ch == '\r' || ch == '\n') {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_HPHP_DEFAULT;
+			}
+			break;
+		case SCE_HPHP_HSTRING:
+			if (ch == '\\' && (phpStringDelimiter[0] == '\"' || chNext == '$' || chNext == '{')) {
+				// skip the next char
+				i++;
+			} else if (((ch == '{' && chNext == '$') || (ch == '$' && chNext == '{'))
+				&& IsPhpWordStart(chNext2)) {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_HPHP_COMPLEX_VARIABLE;
+			} else if (ch == '$' && IsPhpWordStart(chNext)) {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_HPHP_HSTRING_VARIABLE;
+			} else if (styler.Match(i, phpStringDelimiter)) {
+				if (phpStringDelimiter[0] == '\"') {
+					styler.ColourTo(i, StateToPrint);
+					state = SCE_HPHP_DEFAULT;
+				} else if (isLineEnd(chPrev)) {
+				const int psdLength = strlen(phpStringDelimiter);
+					const char chAfterPsd = styler.SafeGetCharAt(i + psdLength);
+					const char chAfterPsd2 = styler.SafeGetCharAt(i + psdLength + 1);
+					if (isLineEnd(chAfterPsd) ||
+						(chAfterPsd == ';' && isLineEnd(chAfterPsd2))) {
+							i += (((i + psdLength) < lengthDoc) ? psdLength : lengthDoc) - 1;
+						styler.ColourTo(i, StateToPrint);
+						state = SCE_HPHP_DEFAULT;
+						if (foldHeredoc) levelCurrent--;
+					}
+				}
+			}
+			break;
+		case SCE_HPHP_SIMPLESTRING:
+			if (phpStringDelimiter[0] == '\'') {
+				if (ch == '\\') {
+					// skip the next char
+					i++;
+				} else if (ch == '\'') {
+					styler.ColourTo(i, StateToPrint);
+					state = SCE_HPHP_DEFAULT;
+				}
+			} else if (isLineEnd(chPrev) && styler.Match(i, phpStringDelimiter)) {
+				const int psdLength = strlen(phpStringDelimiter);
+				const char chAfterPsd = styler.SafeGetCharAt(i + psdLength);
+				const char chAfterPsd2 = styler.SafeGetCharAt(i + psdLength + 1);
+				if (isLineEnd(chAfterPsd) ||
+				(chAfterPsd == ';' && isLineEnd(chAfterPsd2))) {
+					i += (((i + psdLength) < lengthDoc) ? psdLength : lengthDoc) - 1;
+					styler.ColourTo(i, StateToPrint);
+					state = SCE_HPHP_DEFAULT;
+					if (foldHeredoc) levelCurrent--;
+				}
+			}
+			break;
+		case SCE_HPHP_HSTRING_VARIABLE:
+			if (!IsPhpWordChar(chNext)) {
+				styler.ColourTo(i, StateToPrint);
+				state = SCE_HPHP_HSTRING;
+			}
+			break;
+		case SCE_HPHP_COMPLEX_VARIABLE:
+			if (ch == '}') {
+				styler.ColourTo(i, StateToPrint);
+				state = SCE_HPHP_HSTRING;
+			}
+			break;
+		case SCE_HPHP_OPERATOR:
+		case SCE_HPHP_DEFAULT:
+			styler.ColourTo(i - 1, StateToPrint);
+			if (IsADigit(ch) || (ch == '.' && IsADigit(chNext))) {
+				state = SCE_HPHP_NUMBER;
+			} else if (IsAWordStart(ch)) {
+				state = SCE_HPHP_WORD;
+			} else if (ch == '/' && chNext == '*') {
+				i++;
+				state = SCE_HPHP_COMMENT;
+			} else if (ch == '/' && chNext == '/') {
+				i++;
+				state = SCE_HPHP_COMMENTLINE;
+			} else if (ch == '#') {
+				state = SCE_HPHP_COMMENTLINE;
+			} else if (ch == '\"') {
+				state = SCE_HPHP_HSTRING;
+				strcpy(phpStringDelimiter, "\"");
+			} else if (styler.Match(i, "<<<")) {
+				bool isSimpleString = false;
+				i = FindPhpStringDelimiter(phpStringDelimiter, sizeof(phpStringDelimiter), i + 3, lengthDoc, styler, isSimpleString);
+				if (strlen(phpStringDelimiter)) {
+					state = (isSimpleString ? SCE_HPHP_SIMPLESTRING : SCE_HPHP_HSTRING);
+					if (foldHeredoc) levelCurrent++;
+				}
+			} else if (ch == '\'') {
+				state = SCE_HPHP_SIMPLESTRING;
+				strcpy(phpStringDelimiter, "\'");
+			} else if (ch == '$' && IsPhpWordStart(chNext)) {
+				state = SCE_HPHP_VARIABLE;
+			} else if (IsOperator(ch)) {
+				state = SCE_HPHP_OPERATOR;
+			} else if ((state == SCE_HPHP_OPERATOR) && (IsASpace(ch))) {
+				state = SCE_HPHP_DEFAULT;
+			}
+			break;
+			///////////// end - PHP state handling
+		}
+
+		// Some of the above terminated their lexeme but since the same character starts
+		// the same class again, only reenter if non empty segment.
+
+		bool nonEmptySegment = i >= static_cast<int>(styler.GetStartSegment());
+		if (state == SCE_HB_DEFAULT) {    // One of the above succeeded
+			if ((ch == '\"') && (nonEmptySegment)) {
+				state = SCE_HB_STRING;
+			} else if (ch == '\'') {
+				state = SCE_HB_COMMENTLINE;
+			} else if (IsAWordStart(ch)) {
+				state = SCE_HB_WORD;
+			} else if (IsOperator(ch)) {
+				styler.ColourTo(i, SCE_HB_DEFAULT);
+			}
+		} else if (state == SCE_HBA_DEFAULT) {    // One of the above succeeded
+			if ((ch == '\"') && (nonEmptySegment)) {
+				state = SCE_HBA_STRING;
+			} else if (ch == '\'') {
+				state = SCE_HBA_COMMENTLINE;
+			} else if (IsAWordStart(ch)) {
+				state = SCE_HBA_WORD;
+			} else if (IsOperator(ch)) {
+				styler.ColourTo(i, SCE_HBA_DEFAULT);
+			}
+		} else if (state == SCE_HJ_DEFAULT) {    // One of the above succeeded
+			if (ch == '/' && chNext == '*') {
+				if (styler.SafeGetCharAt(i + 2) == '*')
+					state = SCE_HJ_COMMENTDOC;
+				else
+					state = SCE_HJ_COMMENT;
+			} else if (ch == '/' && chNext == '/') {
+				state = SCE_HJ_COMMENTLINE;
+			} else if ((ch == '\"') && (nonEmptySegment)) {
+				state = SCE_HJ_DOUBLESTRING;
+			} else if ((ch == '\'') && (nonEmptySegment)) {
+				state = SCE_HJ_SINGLESTRING;
+			} else if (IsAWordStart(ch)) {
+				state = SCE_HJ_WORD;
+			} else if (IsOperator(ch)) {
+				styler.ColourTo(i, statePrintForState(SCE_HJ_SYMBOLS, inScriptType));
+			}
+		}
+	}
+
+	switch (state) {
+	case SCE_HJ_WORD:
+		classifyWordHTJS(styler.GetStartSegment(), lengthDoc - 1, keywords2, styler, inScriptType);
+		break;
+	case SCE_HB_WORD:
+		classifyWordHTVB(styler.GetStartSegment(), lengthDoc - 1, keywords3, styler, inScriptType);
+		break;
+	case SCE_HP_WORD:
+		classifyWordHTPy(styler.GetStartSegment(), lengthDoc - 1, keywords4, styler, prevWord, inScriptType);
+		break;
+	case SCE_HPHP_WORD:
+		classifyWordHTPHP(styler.GetStartSegment(), lengthDoc - 1, keywords5, styler);
+		break;
+	default:
+		StateToPrint = statePrintForState(state, inScriptType);
+		styler.ColourTo(lengthDoc - 1, StateToPrint);
+		break;
+	}
+
+	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
+	if (fold) {
+		int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+		styler.SetLevel(lineCurrent, levelPrev | flagsNext);
+	}
+}
+
+static void ColouriseXMLDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
+                                  Accessor &styler) {
+	// Passing in true because we're lexing XML
+	ColouriseHyperTextDoc(startPos, length, initStyle, keywordlists, styler, true);
+}
+
+static void ColouriseHTMLDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
+                                  Accessor &styler) {
+	// Passing in false because we're notlexing XML
+	ColouriseHyperTextDoc(startPos, length, initStyle, keywordlists, styler, false);
+}
+
+static bool isASPScript(int state) {
+	return
+		(state >= SCE_HJA_START && state <= SCE_HJA_REGEX) ||
+		(state >= SCE_HBA_START && state <= SCE_HBA_STRINGEOL) ||
+		(state >= SCE_HPA_DEFAULT && state <= SCE_HPA_IDENTIFIER);
+}
+
+static void ColouriseHBAPiece(StyleContext &sc, WordList *keywordlists[]) {
+	WordList &keywordsVBS = *keywordlists[2];
+	if (sc.state == SCE_HBA_WORD) {
+		if (!IsAWordChar(sc.ch)) {
+			char s[100];
+			sc.GetCurrentLowered(s, sizeof(s));
+			if (keywordsVBS.InList(s)) {
+				if (strcmp(s, "rem") == 0) {
+					sc.ChangeState(SCE_HBA_COMMENTLINE);
+					if (sc.atLineEnd) {
+						sc.SetState(SCE_HBA_DEFAULT);
+					}
+				} else {
+					sc.SetState(SCE_HBA_DEFAULT);
+				}
+			} else {
+				sc.ChangeState(SCE_HBA_IDENTIFIER);
+				sc.SetState(SCE_HBA_DEFAULT);
+			}
+		}
+	} else if (sc.state == SCE_HBA_NUMBER) {
+		if (!IsAWordChar(sc.ch)) {
+			sc.SetState(SCE_HBA_DEFAULT);
+		}
+	} else if (sc.state == SCE_HBA_STRING) {
+		if (sc.ch == '\"') {
+			sc.ForwardSetState(SCE_HBA_DEFAULT);
+		} else if (sc.ch == '\r' || sc.ch == '\n') {
+			sc.ChangeState(SCE_HBA_STRINGEOL);
+			sc.ForwardSetState(SCE_HBA_DEFAULT);
+		}
+	} else if (sc.state == SCE_HBA_COMMENTLINE) {
+		if (sc.ch == '\r' || sc.ch == '\n') {
+			sc.SetState(SCE_HBA_DEFAULT);
+		}
+	}
+
+	if (sc.state == SCE_HBA_DEFAULT) {
+		if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
+			sc.SetState(SCE_HBA_NUMBER);
+		} else if (IsAWordStart(sc.ch)) {
+			sc.SetState(SCE_HBA_WORD);
+		} else if (sc.ch == '\'') {
+			sc.SetState(SCE_HBA_COMMENTLINE);
+		} else if (sc.ch == '\"') {
+			sc.SetState(SCE_HBA_STRING);
+		}
+	}
+}
+
+static void ColouriseHTMLPiece(StyleContext &sc, WordList *keywordlists[]) {
+	WordList &keywordsTags = *keywordlists[0];
+	if (sc.state == SCE_H_COMMENT) {
+		if (sc.Match("-->")) {
+			sc.Forward();
+			sc.Forward();
+			sc.ForwardSetState(SCE_H_DEFAULT);
+		}
+	} else if (sc.state == SCE_H_ENTITY) {
+		if (sc.ch == ';') {
+			sc.ForwardSetState(SCE_H_DEFAULT);
+		} else if (sc.ch != '#' && (sc.ch < 0x80) && !isalnum(sc.ch)	// Should check that '#' follows '&', but it is unlikely anyway...
+			&& sc.ch != '.' && sc.ch != '-' && sc.ch != '_' && sc.ch != ':') { // valid in XML
+			sc.ChangeState(SCE_H_TAGUNKNOWN);
+			sc.SetState(SCE_H_DEFAULT);
+		}
+	} else if (sc.state == SCE_H_TAGUNKNOWN) {
+		if (!ishtmlwordchar(sc.ch) && !((sc.ch == '/') && (sc.chPrev == '<')) && sc.ch != '[') {
+			char s[100];
+			sc.GetCurrentLowered(s, sizeof(s));
+			if (s[1] == '/') {
+				if (keywordsTags.InList(s + 2)) {
+					sc.ChangeState(SCE_H_TAG);
+				}
+			} else {
+				if (keywordsTags.InList(s + 1)) {
+					sc.ChangeState(SCE_H_TAG);
+				}
+			}
+			if (sc.ch == '>') {
+				sc.ForwardSetState(SCE_H_DEFAULT);
+			} else if (sc.Match('/', '>')) {
+				sc.SetState(SCE_H_TAGEND);
+				sc.Forward();
+				sc.ForwardSetState(SCE_H_DEFAULT);
+			} else {
+				sc.SetState(SCE_H_OTHER);
+			}
+		}
+	} else if (sc.state == SCE_H_ATTRIBUTE) {
+		if (!ishtmlwordchar(sc.ch)) {
+			char s[100];
+			sc.GetCurrentLowered(s, sizeof(s));
+			if (!keywordsTags.InList(s)) {
+				sc.ChangeState(SCE_H_ATTRIBUTEUNKNOWN);
+			}
+			sc.SetState(SCE_H_OTHER);
+		}
+	} else if (sc.state == SCE_H_OTHER) {
+		if (sc.ch == '>') {
+			sc.SetState(SCE_H_TAG);
+			sc.ForwardSetState(SCE_H_DEFAULT);
+		} else if (sc.Match('/', '>')) {
+			sc.SetState(SCE_H_TAG);
+			sc.Forward();
+			sc.ForwardSetState(SCE_H_DEFAULT);
+		} else if (sc.chPrev == '=') {
+			sc.SetState(SCE_H_VALUE);
+		}
+	} else if (sc.state == SCE_H_DOUBLESTRING) {
+		if (sc.ch == '\"') {
+			sc.ForwardSetState(SCE_H_OTHER);
+		}
+	} else if (sc.state == SCE_H_SINGLESTRING) {
+		if (sc.ch == '\'') {
+			sc.ForwardSetState(SCE_H_OTHER);
+		}
+	} else if (sc.state == SCE_H_NUMBER) {
+		if (!IsADigit(sc.ch)) {
+			sc.SetState(SCE_H_OTHER);
+		}
+	}
+
+	if (sc.state == SCE_H_DEFAULT) {
+		if (sc.ch == '<') {
+			if (sc.Match("<!--"))
+				sc.SetState(SCE_H_COMMENT);
+			else
+				sc.SetState(SCE_H_TAGUNKNOWN);
+		} else if (sc.ch == '&') {
+			sc.SetState(SCE_H_ENTITY);
+		}
+	} else if ((sc.state == SCE_H_OTHER) || (sc.state == SCE_H_VALUE)) {
+		if (sc.ch == '\"' && sc.chPrev == '=') {
+			sc.SetState(SCE_H_DOUBLESTRING);
+		} else if (sc.ch == '\'' && sc.chPrev == '=') {
+			sc.SetState(SCE_H_SINGLESTRING);
+		} else if (IsADigit(sc.ch)) {
+			sc.SetState(SCE_H_NUMBER);
+		} else if (sc.ch == '>') {
+			sc.SetState(SCE_H_TAG);
+			sc.ForwardSetState(SCE_H_DEFAULT);
+		} else if (ishtmlwordchar(sc.ch)) {
+			sc.SetState(SCE_H_ATTRIBUTE);
+		}
+	}
+}
+
+static void ColouriseASPPiece(StyleContext &sc, WordList *keywordlists[]) {
+	// Possibly exit current state to either SCE_H_DEFAULT or SCE_HBA_DEFAULT
+	if ((sc.state == SCE_H_ASPAT || isASPScript(sc.state)) && sc.Match('%', '>')) {
+		sc.SetState(SCE_H_ASP);
+		sc.Forward();
+		sc.ForwardSetState(SCE_H_DEFAULT);
+	}
+
+	// Handle some ASP script
+	if (sc.state >= SCE_HBA_START && sc.state <= SCE_HBA_STRINGEOL) {
+		ColouriseHBAPiece(sc, keywordlists);
+	} else if (sc.state >= SCE_H_DEFAULT && sc.state <= SCE_H_SGML_BLOCK_DEFAULT) {
+		ColouriseHTMLPiece(sc, keywordlists);
+	}
+
+	// Enter new sc.state
+	if ((sc.state == SCE_H_DEFAULT) || (sc.state == SCE_H_TAGUNKNOWN)) {
+		if (sc.Match('<', '%')) {
+			if (sc.state == SCE_H_TAGUNKNOWN)
+				sc.ChangeState(SCE_H_ASP);
+			else
+				sc.SetState(SCE_H_ASP);
+			sc.Forward();
+			sc.Forward();
+			if (sc.ch == '@') {
+				sc.ForwardSetState(SCE_H_ASPAT);
+			} else {
+				if (sc.ch == '=') {
+					sc.Forward();
+				}
+				sc.SetState(SCE_HBA_DEFAULT);
+			}
+		}
+	}
+}
+
+static void ColouriseASPDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
+                                  Accessor &styler) {
+	// Lexer for HTML requires more lexical states (8 bits worth) than most lexers
+	StyleContext sc(startPos, length, initStyle, styler, static_cast<char>(STYLE_MAX));
+	for (; sc.More(); sc.Forward()) {
+		ColouriseASPPiece(sc, keywordlists);
+	}
+	sc.Complete();
+}
+
+static void ColourisePHPPiece(StyleContext &sc, WordList *keywordlists[]) {
+	// Possibly exit current state to either SCE_H_DEFAULT or SCE_HBA_DEFAULT
+	if (sc.state >= SCE_HPHP_DEFAULT && sc.state <= SCE_HPHP_OPERATOR) {
+		if (!isPHPStringState(sc.state) &&
+			(sc.state != SCE_HPHP_COMMENT) &&
+			(sc.Match('?', '>'))) {
+			sc.SetState(SCE_H_QUESTION);
+			sc.Forward();
+			sc.ForwardSetState(SCE_H_DEFAULT);
+		}
+	}
+
+	if (sc.state >= SCE_H_DEFAULT && sc.state <= SCE_H_SGML_BLOCK_DEFAULT) {
+		ColouriseHTMLPiece(sc, keywordlists);
+	}
+
+	// Handle some PHP script
+	if (sc.state == SCE_HPHP_WORD) {
+		if (!IsPhpWordChar(static_cast<char>(sc.ch))) {
+			sc.SetState(SCE_HPHP_DEFAULT);
+		}
+	} else if (sc.state == SCE_HPHP_COMMENTLINE) {
+		if (sc.ch == '\r' || sc.ch == '\n') {
+			sc.SetState(SCE_HPHP_DEFAULT);
+		}
+	} else if (sc.state == SCE_HPHP_COMMENT) {
+		if (sc.Match('*', '/')) {
+			sc.Forward();
+			sc.Forward();
+			sc.SetState(SCE_HPHP_DEFAULT);
+		}
+	} else if (sc.state == SCE_HPHP_HSTRING) {
+		if (sc.ch == '\"') {
+			sc.ForwardSetState(SCE_HPHP_DEFAULT);
+		}
+	} else if (sc.state == SCE_HPHP_SIMPLESTRING) {
+		if (sc.ch == '\'') {
+			sc.ForwardSetState(SCE_HPHP_DEFAULT);
+		}
+	} else if (sc.state == SCE_HPHP_VARIABLE) {
+		if (!IsPhpWordChar(static_cast<char>(sc.ch))) {
+			sc.SetState(SCE_HPHP_DEFAULT);
+		}
+	} else if (sc.state == SCE_HPHP_OPERATOR) {
+		sc.SetState(SCE_HPHP_DEFAULT);
+	}
+
+	// Enter new sc.state
+	if ((sc.state == SCE_H_DEFAULT) || (sc.state == SCE_H_TAGUNKNOWN)) {
+		if (sc.Match("<?php")) {
+			sc.SetState(SCE_H_QUESTION);
+			sc.Forward();
+			sc.Forward();
+			sc.Forward();
+			sc.Forward();
+			sc.Forward();
+			sc.SetState(SCE_HPHP_DEFAULT);
+		}
+	}
+	if (sc.state == SCE_HPHP_DEFAULT) {
+		if (IsPhpWordStart(static_cast<char>(sc.ch))) {
+			sc.SetState(SCE_HPHP_WORD);
+		} else if (sc.ch == '#') {
+			sc.SetState(SCE_HPHP_COMMENTLINE);
+		} else if (sc.Match("<!--")) {
+			sc.SetState(SCE_HPHP_COMMENTLINE);
+		} else if (sc.Match('/', '/')) {
+			sc.SetState(SCE_HPHP_COMMENTLINE);
+		} else if (sc.Match('/', '*')) {
+			sc.SetState(SCE_HPHP_COMMENT);
+		} else if (sc.ch == '\"') {
+			sc.SetState(SCE_HPHP_HSTRING);
+		} else if (sc.ch == '\'') {
+			sc.SetState(SCE_HPHP_SIMPLESTRING);
+		} else if (sc.ch == '$' && IsPhpWordStart(static_cast<char>(sc.chNext))) {
+			sc.SetState(SCE_HPHP_VARIABLE);
+		} else if (IsOperator(static_cast<char>(sc.ch))) {
+			sc.SetState(SCE_HPHP_OPERATOR);
+		}
+	}
+}
+
+static void ColourisePHPDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
+                                  Accessor &styler) {
+	// Lexer for HTML requires more lexical states (8 bits worth) than most lexers
+	StyleContext sc(startPos, length, initStyle, styler, static_cast<char>(STYLE_MAX));
+	for (; sc.More(); sc.Forward()) {
+		ColourisePHPPiece(sc, keywordlists);
+	}
+	sc.Complete();
+}
+
+static void ColourisePHPScriptDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
+        Accessor &styler) {
+	if (startPos == 0)
+		initStyle = SCE_HPHP_DEFAULT;
+	ColouriseHTMLDoc(startPos, length, initStyle, keywordlists, styler);
+}
+
+static const char * const htmlWordListDesc[] = {
+	"HTML elements and attributes",
+	"JavaScript keywords",
+	"VBScript keywords",
+	"Python keywords",
+	"PHP keywords",
+	"SGML and DTD keywords",
+	0,
+};
+
+static const char * const phpscriptWordListDesc[] = {
+	"", //Unused
+	"", //Unused
+	"", //Unused
+	"", //Unused
+	"PHP keywords",
+	"", //Unused
+	0,
+};
+
+LexerModule lmHTML(SCLEX_HTML, ColouriseHTMLDoc, "hypertext", 0, htmlWordListDesc, 8);
+LexerModule lmXML(SCLEX_XML, ColouriseXMLDoc, "xml", 0, htmlWordListDesc, 8);
+// SCLEX_ASP and SCLEX_PHP should not be used in new code: use SCLEX_HTML instead.
+LexerModule lmASP(SCLEX_ASP, ColouriseASPDoc, "asp", 0, htmlWordListDesc, 8);
+LexerModule lmPHP(SCLEX_PHP, ColourisePHPDoc, "php", 0, htmlWordListDesc, 8);
+LexerModule lmPHPSCRIPT(SCLEX_PHPSCRIPT, ColourisePHPScriptDoc, "phpscript", 0, phpscriptWordListDesc, 8);
diff --git a/Documents/Scintilla/LexHaskell.cxx b/Documents/Scintilla/LexHaskell.cxx
new file mode 100644
index 0000000..3213bd5
--- /dev/null
+++ b/Documents/Scintilla/LexHaskell.cxx
@@ -0,0 +1,274 @@
+/******************************************************************
+ *    LexHaskell.cxx
+ *
+ *    A haskell lexer for the scintilla code control.
+ *    Some stuff "lended" from LexPython.cxx and LexCPP.cxx.
+ *    External lexer stuff inspired from the caml external lexer.
+ *
+ *    Written by Tobias Engvall - tumm at dtek dot chalmers dot se
+ *
+ *
+ *    TODO:
+ *    * Implement a folder :)
+ *    * Nice Character-lexing (stuff inside '\''), LexPython has
+ *      this.
+ *
+ *
+ *****************************************************************/
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+#ifdef BUILD_AS_EXTERNAL_LEXER
+
+#include "ExternalLexer.h"
+#include "WindowAccessor.h"
+
+#define BUILD_EXTERNAL_LEXER 0
+
+#endif
+
+// Max level of nested comments
+#define SCE_HA_COMMENTMAX SCE_HA_COMMENTBLOCK3
+
+
+enum kwType { kwOther, kwClass, kwData, kwInstance, kwImport, kwModule, kwType};
+
+static inline bool IsNewline(const int ch) {
+   return (ch == '\n' || ch == '\r');
+}
+
+static inline bool IsWhitespace(const int ch) {
+   return (  ch == ' '
+          || ch == '\t'
+          || IsNewline(ch) );
+}
+
+static inline bool IsAWordStart(const int ch) {
+   return (ch < 0x80) && (isalnum(ch) || ch == '_');
+}
+
+static inline bool IsAWordChar(const int ch) {
+   return (ch < 0x80) && (isalnum(ch) || ch == '.' || ch == '_' || ch == '\'');
+}
+
+static void ColorizeHaskellDoc(unsigned int startPos, int length, int initStyle,
+                               WordList *keywordlists[], Accessor &styler) {
+
+   WordList &keywords = *keywordlists[0];
+
+   int kwLast = kwOther;
+
+   StyleContext sc(startPos, length, initStyle, styler);
+
+   for (; sc.More(); sc.Forward()) {
+
+      // Check for state end
+         // Operator
+      if (sc.state == SCE_HA_OPERATOR) {
+         kwLast = kwOther;
+         sc.SetState(SCE_HA_DEFAULT);
+      }
+         // String
+      else if (sc.state == SCE_HA_STRING) {
+         if (sc.ch == '\"') {
+            sc.ForwardSetState(SCE_HA_DEFAULT);
+         } else if (sc.ch == '\\') {
+            sc.Forward();
+         }
+      }
+         // Char
+      else if (sc.state == SCE_HA_CHARACTER) {
+         if (sc.ch == '\'') {
+            sc.ForwardSetState(SCE_HA_DEFAULT);
+         } else if (sc.ch == '\\') {
+            sc.Forward();
+         }
+      }
+         // Number
+      else if (sc.state == SCE_HA_NUMBER) {
+         if (!IsADigit(sc.ch)) {
+            sc.SetState(SCE_HA_DEFAULT);
+         }
+      }
+         // Types, constructors, etc.
+      else if (sc.state == SCE_HA_CAPITAL) {
+         if (!IsAWordChar(sc.ch) || sc.ch == '.') {
+            sc.SetState(SCE_HA_DEFAULT);
+         }
+      }
+         // Identifier
+      else if (sc.state == SCE_HA_IDENTIFIER) {
+         if (!IsAWordChar(sc.ch)) {
+            char s[100];
+            sc.GetCurrent(s, sizeof(s));
+            int style = SCE_HA_IDENTIFIER;
+            if ((kwLast == kwImport) || (strcmp(s,"qualified") == 0) || (strcmp(s,"as") == 0)) {
+               style = SCE_HA_IMPORT;
+            } else if (keywords.InList(s)) {
+               style = SCE_HA_KEYWORD;
+            } else if (kwLast == kwData) {
+               style = SCE_HA_DATA;
+            } else if (kwLast == kwClass) {
+               style = SCE_HA_CLASS;
+            } else if (kwLast == kwModule) {
+               style = SCE_HA_MODULE;
+            } else if (isupper(s[0])) {
+               style = SCE_HA_CAPITAL;
+            }
+            sc.ChangeState(style);
+            sc.SetState(SCE_HA_DEFAULT);
+            if (style == SCE_HA_KEYWORD) {
+               if (0 == strcmp(s, "class"))
+                  kwLast = kwClass;
+               else if (0 == strcmp(s, "data"))
+                  kwLast = kwData;
+               else if (0 == strcmp(s, "instance"))
+                  kwLast = kwInstance;
+               else if (0 == strcmp(s, "import"))
+                  kwLast = kwImport;
+               else if (0 == strcmp(s, "module"))
+                  kwLast = kwModule;
+               else
+                  kwLast = kwOther;
+            } else if (style == SCE_HA_CLASS || style == SCE_HA_IMPORT ||
+                       style == SCE_HA_MODULE || style == SCE_HA_CAPITAL ||
+                       style == SCE_HA_DATA || style == SCE_HA_INSTANCE) {
+               kwLast = kwOther;
+            }
+         }
+      }
+         // Comments
+            // Oneliner
+      else if (sc.state == SCE_HA_COMMENTLINE) {
+         if (IsNewline(sc.ch))
+            sc.SetState(SCE_HA_DEFAULT);
+      }
+            // Nested
+      else if (sc.state >= SCE_HA_COMMENTBLOCK) {
+         if (sc.Match("{-")) {
+            if (sc.state < SCE_HA_COMMENTMAX)
+               sc.SetState(sc.state + 1);
+         }
+         else if (sc.Match("-}")) {
+            sc.Forward();
+            if (sc.state == SCE_HA_COMMENTBLOCK)
+               sc.ForwardSetState(SCE_HA_DEFAULT);
+            else
+               sc.ForwardSetState(sc.state - 1);
+         }
+      }
+      // New state?
+      if (sc.state == SCE_HA_DEFAULT) {
+         // Digit
+         if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
+            sc.SetState(SCE_HA_NUMBER);
+            if (sc.ch == '0' && (sc.chNext == 'X' || sc.chNext == 'x')) { // Match anything starting with "0x" or "0X", too
+               sc.Forward(1);
+            }
+         }
+         // Comment line
+         else if (sc.Match("--")) {
+            sc.SetState(SCE_HA_COMMENTLINE);
+         // Comment block
+         }
+         else if (sc.Match("{-")) {
+            sc.SetState(SCE_HA_COMMENTBLOCK);
+         }
+         // String
+         else if (sc.Match('\"')) {
+            sc.SetState(SCE_HA_STRING);
+         }
+         // Character
+         else if (sc.Match('\'')) {
+            sc.SetState(SCE_HA_CHARACTER);
+         }
+         // Stringstart
+         else if (sc.Match('\"')) {
+            sc.SetState(SCE_HA_STRING);
+         }
+         // Operator
+         else if (isascii(sc.ch) && isoperator(static_cast<char>(sc.ch))) {
+            sc.SetState(SCE_HA_OPERATOR);
+         }
+         // Keyword
+         else if (IsAWordStart(sc.ch)) {
+               sc.SetState(SCE_HA_IDENTIFIER);
+         }
+
+      }
+   }
+   sc.Complete();
+}
+
+// External stuff - used for dynamic-loading, not implemented in wxStyledTextCtrl yet.
+// Inspired by the caml external lexer - Credits to Robert Roessler - http://www.rftp.com
+#ifdef BUILD_EXTERNAL_LEXER
+static const char* LexerName = "haskell";
+
+void EXT_LEXER_DECL Lex(unsigned int lexer, unsigned int startPos, int length, int initStyle,
+                        char *words[], WindowID window, char *props)
+{
+   PropSet ps;
+   ps.SetMultiple(props);
+   WindowAccessor wa(window, ps);
+
+   int nWL = 0;
+   for (; words[nWL]; nWL++) ;
+   WordList** wl = new WordList* [nWL + 1];
+   int i = 0;
+   for (; i<nWL; i++)
+   {
+      wl[i] = new WordList();
+      wl[i]->Set(words[i]);
+   }
+   wl[i] = 0;
+
+   ColorizeHaskellDoc(startPos, length, initStyle, wl, wa);
+   wa.Flush();
+   for (i=nWL-1;i>=0;i--)
+      delete wl[i];
+   delete [] wl;
+}
+
+void EXT_LEXER_DECL Fold (unsigned int lexer, unsigned int startPos, int length, int initStyle,
+                        char *words[], WindowID window, char *props)
+{
+
+}
+
+int EXT_LEXER_DECL GetLexerCount()
+{
+   return 1;
+}
+
+void EXT_LEXER_DECL GetLexerName(unsigned int Index, char *name, int buflength)
+{
+   if (buflength > 0) {
+      buflength--;
+      int n = strlen(LexerName);
+      if (n > buflength)
+         n = buflength;
+      memcpy(name, LexerName, n), name[n] = '\0';
+   }
+}
+#endif
+
+LexerModule lmHaskell(SCLEX_HASKELL, ColorizeHaskellDoc, "haskell");
+
diff --git a/Documents/Scintilla/LexInno.cxx b/Documents/Scintilla/LexInno.cxx
new file mode 100644
index 0000000..3af9b2f
--- /dev/null
+++ b/Documents/Scintilla/LexInno.cxx
@@ -0,0 +1,264 @@
+// Scintilla source code edit control
+/** @file LexInno.cxx
+ ** Lexer for Inno Setup scripts.
+ **/
+// Written by Friedrich Vedder <fvedd@t-online.de>, using code from LexOthers.cxx.
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+static void ColouriseInnoDoc(unsigned int startPos, int length, int, WordList *keywordLists[], Accessor &styler) {
+	int state = SCE_INNO_DEFAULT;
+	char chPrev;
+	char ch = 0;
+	char chNext = styler[startPos];
+	int lengthDoc = startPos + length;
+	char *buffer = new char[length];
+	int bufferCount = 0;
+	bool isBOL, isEOL, isWS, isBOLWS = 0;
+
+	WordList &sectionKeywords = *keywordLists[0];
+	WordList &standardKeywords = *keywordLists[1];
+	WordList &parameterKeywords = *keywordLists[2];
+	WordList &preprocessorKeywords = *keywordLists[3];
+	WordList &pascalKeywords = *keywordLists[4];
+	WordList &userKeywords = *keywordLists[5];
+
+	// Go through all provided text segment
+	// using the hand-written state machine shown below
+	styler.StartAt(startPos);
+	styler.StartSegment(startPos);
+	for (int i = startPos; i < lengthDoc; i++) {
+		chPrev = ch;
+		ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+
+		if (styler.IsLeadByte(ch)) {
+			chNext = styler.SafeGetCharAt(i + 2);
+			i++;
+			continue;
+		}
+
+		isBOL = (chPrev == 0) || (chPrev == '\n') || (chPrev == '\r' && ch != '\n');
+		isBOLWS = (isBOL) ? 1 : (isBOLWS && (chPrev == ' ' || chPrev == '\t'));
+		isEOL = (ch == '\n' || ch == '\r');
+		isWS = (ch == ' ' || ch == '\t');
+
+		switch(state) {
+			case SCE_INNO_DEFAULT:
+				if (ch == ';' && isBOLWS) {
+					// Start of a comment
+					state = SCE_INNO_COMMENT;
+				} else if (ch == '[' && isBOLWS) {
+					// Start of a section name
+					bufferCount = 0;
+					state = SCE_INNO_SECTION;
+				} else if (ch == '#' && isBOLWS) {
+					// Start of a preprocessor directive
+					state = SCE_INNO_PREPROC;
+				} else if (ch == '{' && chNext == '#') {
+					// Start of a preprocessor inline directive
+					state = SCE_INNO_PREPROC_INLINE;
+				} else if ((ch == '{' && (chNext == ' ' || chNext == '\t'))
+					   || (ch == '(' && chNext == '*')) {
+					// Start of a Pascal comment
+					state = SCE_INNO_COMMENT_PASCAL;
+				} else if (ch == '"') {
+					// Start of a double-quote string
+					state = SCE_INNO_STRING_DOUBLE;
+				} else if (ch == '\'') {
+					// Start of a single-quote string
+					state = SCE_INNO_STRING_SINGLE;
+				} else if (isascii(ch) && (isalpha(ch) || (ch == '_'))) {
+					// Start of an identifier
+					bufferCount = 0;
+					buffer[bufferCount++] = static_cast<char>(tolower(ch));
+					state = SCE_INNO_IDENTIFIER;
+				} else {
+					// Style it the default style
+					styler.ColourTo(i,SCE_INNO_DEFAULT);
+				}
+				break;
+
+			case SCE_INNO_COMMENT:
+				if (isEOL) {
+					state = SCE_INNO_DEFAULT;
+					styler.ColourTo(i,SCE_INNO_COMMENT);
+				}
+				break;
+
+			case SCE_INNO_IDENTIFIER:
+				if (isascii(ch) && (isalnum(ch) || (ch == '_'))) {
+					buffer[bufferCount++] = static_cast<char>(tolower(ch));
+				} else {
+					state = SCE_INNO_DEFAULT;
+					buffer[bufferCount] = '\0';
+
+					// Check if the buffer contains a keyword
+					if (standardKeywords.InList(buffer)) {
+						styler.ColourTo(i-1,SCE_INNO_KEYWORD);
+					} else if (parameterKeywords.InList(buffer)) {
+						styler.ColourTo(i-1,SCE_INNO_PARAMETER);
+					} else if (pascalKeywords.InList(buffer)) {
+						styler.ColourTo(i-1,SCE_INNO_KEYWORD_PASCAL);
+					} else if (userKeywords.InList(buffer)) {
+						styler.ColourTo(i-1,SCE_INNO_KEYWORD_USER);
+					} else {
+						styler.ColourTo(i-1,SCE_INNO_DEFAULT);
+					}
+
+					// Push back the faulty character
+					chNext = styler[i--];
+					ch = chPrev;
+				}
+				break;
+
+			case SCE_INNO_SECTION:
+				if (ch == ']') {
+					state = SCE_INNO_DEFAULT;
+					buffer[bufferCount] = '\0';
+
+					// Check if the buffer contains a section name
+					if (sectionKeywords.InList(buffer)) {
+						styler.ColourTo(i,SCE_INNO_SECTION);
+					} else {
+						styler.ColourTo(i,SCE_INNO_DEFAULT);
+					}
+				} else if (isascii(ch) && (isalnum(ch) || (ch == '_'))) {
+					buffer[bufferCount++] = static_cast<char>(tolower(ch));
+				} else {
+					state = SCE_INNO_DEFAULT;
+					styler.ColourTo(i,SCE_INNO_DEFAULT);
+				}
+				break;
+
+			case SCE_INNO_PREPROC:
+				if (isWS || isEOL) {
+					if (isascii(chPrev) && isalpha(chPrev)) {
+						state = SCE_INNO_DEFAULT;
+						buffer[bufferCount] = '\0';
+
+						// Check if the buffer contains a preprocessor directive
+						if (preprocessorKeywords.InList(buffer)) {
+							styler.ColourTo(i-1,SCE_INNO_PREPROC);
+						} else {
+							styler.ColourTo(i-1,SCE_INNO_DEFAULT);
+						}
+
+						// Push back the faulty character
+						chNext = styler[i--];
+						ch = chPrev;
+					}
+				} else if (isascii(ch) && isalpha(ch)) {
+					if (chPrev == '#' || chPrev == ' ' || chPrev == '\t')
+						bufferCount = 0;
+					buffer[bufferCount++] = static_cast<char>(tolower(ch));
+				}
+				break;
+
+			case SCE_INNO_STRING_DOUBLE:
+				if (ch == '"' || isEOL) {
+					state = SCE_INNO_DEFAULT;
+					styler.ColourTo(i,SCE_INNO_STRING_DOUBLE);
+				}
+				break;
+
+			case SCE_INNO_STRING_SINGLE:
+				if (ch == '\'' || isEOL) {
+					state = SCE_INNO_DEFAULT;
+					styler.ColourTo(i,SCE_INNO_STRING_SINGLE);
+				}
+				break;
+
+			case SCE_INNO_PREPROC_INLINE:
+				if (ch == '}') {
+					state = SCE_INNO_DEFAULT;
+					styler.ColourTo(i,SCE_INNO_PREPROC_INLINE);
+				} else if (isEOL) {
+					state = SCE_INNO_DEFAULT;
+					styler.ColourTo(i,SCE_INNO_DEFAULT);
+				}
+				break;
+
+			case SCE_INNO_COMMENT_PASCAL:
+				if (ch == '}' || (ch == ')' && chPrev == '*')) {
+					state = SCE_INNO_DEFAULT;
+					styler.ColourTo(i,SCE_INNO_COMMENT_PASCAL);
+				} else if (isEOL) {
+					state = SCE_INNO_DEFAULT;
+					styler.ColourTo(i,SCE_INNO_DEFAULT);
+				}
+				break;
+
+		}
+	}
+	delete []buffer;
+}
+
+static const char * const innoWordListDesc[] = {
+	"Sections",
+	"Keywords",
+	"Parameters",
+	"Preprocessor directives",
+	"Pascal keywords",
+	"User defined keywords",
+	0
+};
+
+static void FoldInnoDoc(unsigned int startPos, int length, int, WordList *[], Accessor &styler) {
+	unsigned int endPos = startPos + length;
+	char chNext = styler[startPos];
+
+	int lineCurrent = styler.GetLine(startPos);
+
+	bool sectionFlag = false;
+	int levelPrev = lineCurrent > 0 ? styler.LevelAt(lineCurrent - 1) : SC_FOLDLEVELBASE;
+	int level;
+
+	for (unsigned int i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler[i+1];
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+		int style = styler.StyleAt(i);
+
+		if (style == SCE_INNO_SECTION)
+			sectionFlag = true;
+
+		if (atEOL || i == endPos - 1) {
+			if (sectionFlag) {
+				level = SC_FOLDLEVELBASE | SC_FOLDLEVELHEADERFLAG;
+				if (level == levelPrev)
+					styler.SetLevel(lineCurrent - 1, levelPrev & ~SC_FOLDLEVELHEADERFLAG);
+			} else {
+				level = levelPrev & SC_FOLDLEVELNUMBERMASK;
+				if (levelPrev & SC_FOLDLEVELHEADERFLAG)
+					level++;
+			}
+
+			styler.SetLevel(lineCurrent, level);
+
+			levelPrev = level;
+			lineCurrent++;
+			sectionFlag = false;
+		}
+	}
+}
+
+LexerModule lmInno(SCLEX_INNOSETUP, ColouriseInnoDoc, "inno", FoldInnoDoc, innoWordListDesc);
diff --git a/Documents/Scintilla/LexKix.cxx b/Documents/Scintilla/LexKix.cxx
new file mode 100644
index 0000000..06e7c17
--- /dev/null
+++ b/Documents/Scintilla/LexKix.cxx
@@ -0,0 +1,126 @@
+// Scintilla source code edit control
+/** @file LexKix.cxx
+ ** Lexer for KIX-Scripts.
+ **/
+// Copyright 2004 by Manfred Becker <manfred@becker-trdf.de>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+// Extended to accept accented characters
+static inline bool IsAWordChar(int ch) {
+	return ch >= 0x80 || isalnum(ch) || ch == '_';
+}
+
+static inline bool IsOperator(const int ch) {
+	return (ch == '+' || ch == '-' || ch == '*' || ch == '/' || ch == '&' || ch == '|' || ch == '<' || ch == '>' || ch == '=');
+}
+
+static void ColouriseKixDoc(unsigned int startPos, int length, int initStyle,
+                           WordList *keywordlists[], Accessor &styler) {
+
+	WordList &keywords = *keywordlists[0];
+	WordList &keywords2 = *keywordlists[1];
+	WordList &keywords3 = *keywordlists[2];
+//	WordList &keywords4 = *keywordlists[3];
+
+	styler.StartAt(startPos);
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	for (; sc.More(); sc.Forward()) {
+
+		if (sc.state == SCE_KIX_COMMENT) {
+			if (sc.atLineEnd) {
+				sc.SetState(SCE_KIX_DEFAULT);
+			}
+		} else if (sc.state == SCE_KIX_STRING1) {
+			// This is a doubles quotes string
+			if (sc.ch == '\"') {
+				sc.ForwardSetState(SCE_KIX_DEFAULT);
+			}
+		} else if (sc.state == SCE_KIX_STRING2) {
+			// This is a single quote string
+			if (sc.ch == '\'') {
+				sc.ForwardSetState(SCE_KIX_DEFAULT);
+			}
+		} else if (sc.state == SCE_KIX_NUMBER) {
+			if (!IsADigit(sc.ch)) {
+				sc.SetState(SCE_KIX_DEFAULT);
+			}
+		} else if (sc.state == SCE_KIX_VAR) {
+			if (!IsAWordChar(sc.ch)) {
+				sc.SetState(SCE_KIX_DEFAULT);
+			}
+		} else if (sc.state == SCE_KIX_MACRO) {
+			if (!IsAWordChar(sc.ch) && !IsADigit(sc.ch)) {
+				char s[100];
+				sc.GetCurrentLowered(s, sizeof(s));
+
+				if (!keywords3.InList(&s[1])) {
+					sc.ChangeState(SCE_KIX_DEFAULT);
+				}
+				sc.SetState(SCE_KIX_DEFAULT);
+			}
+		} else if (sc.state == SCE_KIX_OPERATOR) {
+			if (!IsOperator(sc.ch)) {
+				sc.SetState(SCE_KIX_DEFAULT);
+			}
+		} else if (sc.state == SCE_KIX_IDENTIFIER) {
+			if (!IsAWordChar(sc.ch)) {
+				char s[100];
+				sc.GetCurrentLowered(s, sizeof(s));
+
+				if (keywords.InList(s)) {
+					sc.ChangeState(SCE_KIX_KEYWORD);
+				} else if (keywords2.InList(s)) {
+					sc.ChangeState(SCE_KIX_FUNCTIONS);
+				}
+				sc.SetState(SCE_KIX_DEFAULT);
+			}
+		}
+
+		// Determine if a new state should be entered.
+		if (sc.state == SCE_KIX_DEFAULT) {
+			if (sc.ch == ';') {
+				sc.SetState(SCE_KIX_COMMENT);
+			} else if (sc.ch == '\"') {
+				sc.SetState(SCE_KIX_STRING1);
+			} else if (sc.ch == '\'') {
+				sc.SetState(SCE_KIX_STRING2);
+			} else if (sc.ch == '$') {
+				sc.SetState(SCE_KIX_VAR);
+			} else if (sc.ch == '@') {
+				sc.SetState(SCE_KIX_MACRO);
+			} else if (IsADigit(sc.ch) || ((sc.ch == '.' || sc.ch == '&') && IsADigit(sc.chNext))) {
+				sc.SetState(SCE_KIX_NUMBER);
+			} else if (IsOperator(sc.ch)) {
+				sc.SetState(SCE_KIX_OPERATOR);
+			} else if (IsAWordChar(sc.ch)) {
+				sc.SetState(SCE_KIX_IDENTIFIER);
+			}
+		}
+	}
+	sc.Complete();
+}
+
+
+LexerModule lmKix(SCLEX_KIX, ColouriseKixDoc, "kix");
+
diff --git a/Documents/Scintilla/LexLisp.cxx b/Documents/Scintilla/LexLisp.cxx
new file mode 100644
index 0000000..1072e13
--- /dev/null
+++ b/Documents/Scintilla/LexLisp.cxx
@@ -0,0 +1,279 @@
+// Scintilla source code edit control
+/** @file LexLisp.cxx
+ ** Lexer for Lisp.
+ ** Written by Alexey Yutkin.
+ **/
+// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+#include "StyleContext.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+#define SCE_LISP_CHARACTER 29
+#define SCE_LISP_MACRO 30
+#define SCE_LISP_MACRO_DISPATCH 31
+
+static inline bool isLispoperator(char ch) {
+	if (isascii(ch) && isalnum(ch))
+		return false;
+	if (ch == '\'' || ch == '`' || ch == '(' || ch == ')' )
+		return true;
+	return false;
+}
+
+static inline bool isLispwordstart(char ch) {
+	return isascii(ch) && ch != ';'  && !isspacechar(ch) && !isLispoperator(ch) &&
+		ch != '\n' && ch != '\r' &&  ch != '\"';
+}
+
+
+static void classifyWordLisp(unsigned int start, unsigned int end, WordList &keywords, WordList &keywords_kw, Accessor &styler) {
+	PLATFORM_ASSERT(end >= start);
+	char s[100];
+	unsigned int i;
+	bool digit_flag = true;
+	for (i = 0; (i < end - start + 1) && (i < 99); i++) {
+		s[i] = styler[start + i];
+		s[i + 1] = '\0';
+		if (!isdigit(s[i]) && (s[i] != '.')) digit_flag = false;
+	}
+	char chAttr = SCE_LISP_IDENTIFIER;
+
+	if(digit_flag) chAttr = SCE_LISP_NUMBER;
+	else {
+		if (keywords.InList(s)) {
+			chAttr = SCE_LISP_KEYWORD;
+		} else if (keywords_kw.InList(s)) {
+			chAttr = SCE_LISP_KEYWORD_KW;
+		} else if ((s[0] == '*' && s[i-1] == '*') ||
+			   (s[0] == '+' && s[i-1] == '+')) {
+			chAttr = SCE_LISP_SPECIAL;
+		}
+	}
+	styler.ColourTo(end, chAttr);
+	return;
+}
+
+
+static void ColouriseLispDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
+                            Accessor &styler) {
+
+	WordList &keywords = *keywordlists[0];
+	WordList &keywords_kw = *keywordlists[1];
+
+	styler.StartAt(startPos);
+
+	int state = initStyle, radix = -1;
+	char chNext = styler[startPos];
+	unsigned int lengthDoc = startPos + length;
+	styler.StartSegment(startPos);
+	for (unsigned int i = startPos; i < lengthDoc; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+
+		if (styler.IsLeadByte(ch)) {
+			chNext = styler.SafeGetCharAt(i + 2);
+			i += 1;
+			continue;
+		}
+
+		if (state == SCE_LISP_DEFAULT) {
+			if (ch == '#') {
+				styler.ColourTo(i - 1, state);
+				radix = -1;
+				state = SCE_LISP_MACRO_DISPATCH;
+			} else if (isLispwordstart(ch)) {
+				styler.ColourTo(i - 1, state);
+				state = SCE_LISP_IDENTIFIER;
+			}
+			else if (ch == ';') {
+				styler.ColourTo(i - 1, state);
+				state = SCE_LISP_COMMENT;
+			}
+			else if (isLispoperator(ch) || ch=='\'') {
+				styler.ColourTo(i - 1, state);
+				styler.ColourTo(i, SCE_LISP_OPERATOR);
+				if (ch=='\'' && isLispwordstart(chNext)) {
+					state = SCE_LISP_SYMBOL;
+				}
+			}
+			else if (ch == '\"') {
+				styler.ColourTo(i - 1, state);
+				state = SCE_LISP_STRING;
+			}
+		} else if (state == SCE_LISP_IDENTIFIER || state == SCE_LISP_SYMBOL) {
+			if (!isLispwordstart(ch)) {
+				if (state == SCE_LISP_IDENTIFIER) {
+					classifyWordLisp(styler.GetStartSegment(), i - 1, keywords, keywords_kw, styler);
+				} else {
+					styler.ColourTo(i - 1, state);
+				}
+				state = SCE_LISP_DEFAULT;
+			} /*else*/
+			if (isLispoperator(ch) || ch=='\'') {
+				styler.ColourTo(i - 1, state);
+				styler.ColourTo(i, SCE_LISP_OPERATOR);
+				if (ch=='\'' && isLispwordstart(chNext)) {
+					state = SCE_LISP_SYMBOL;
+				}
+			}
+		} else if (state == SCE_LISP_MACRO_DISPATCH) {
+			if (!isdigit(ch)) {
+				if (ch != 'r' && ch != 'R' && (i - styler.GetStartSegment()) > 1) {
+					state = SCE_LISP_DEFAULT;
+				} else {
+					switch (ch) {
+						case '|': state = SCE_LISP_MULTI_COMMENT; break;
+						case 'o':
+						case 'O': radix = 8; state = SCE_LISP_MACRO; break;
+						case 'x':
+						case 'X': radix = 16; state = SCE_LISP_MACRO; break;
+						case 'b':
+						case 'B': radix = 2; state = SCE_LISP_MACRO; break;
+						case '\\': state = SCE_LISP_CHARACTER; break;
+						case ':':
+						case '-':
+						case '+': state = SCE_LISP_MACRO; break;
+						case '\'': if (isLispwordstart(chNext)) {
+								   state = SCE_LISP_SPECIAL;
+							   } else {
+								   styler.ColourTo(i - 1, SCE_LISP_DEFAULT);
+								   styler.ColourTo(i, SCE_LISP_OPERATOR);
+								   state = SCE_LISP_DEFAULT;
+							   }
+							   break;
+						default: if (isLispoperator(ch)) {
+								 styler.ColourTo(i - 1, SCE_LISP_DEFAULT);
+								 styler.ColourTo(i, SCE_LISP_OPERATOR);
+							 }
+							 state = SCE_LISP_DEFAULT;
+							 break;
+					}
+				}
+			}
+		} else if (state == SCE_LISP_MACRO) {
+			if (isLispwordstart(ch) && (radix == -1 || IsADigit(ch, radix))) {
+				state = SCE_LISP_SPECIAL;
+			} else {
+				state = SCE_LISP_DEFAULT;
+			}
+		} else if (state == SCE_LISP_CHARACTER) {
+			if (isLispoperator(ch)) {
+				styler.ColourTo(i, SCE_LISP_SPECIAL);
+				state = SCE_LISP_DEFAULT;
+			} else if (isLispwordstart(ch)) {
+				styler.ColourTo(i, SCE_LISP_SPECIAL);
+				state = SCE_LISP_SPECIAL;
+			} else {
+				state = SCE_LISP_DEFAULT;
+			}
+		} else if (state == SCE_LISP_SPECIAL) {
+			if (!isLispwordstart(ch) || (radix != -1 && !IsADigit(ch, radix))) {
+				styler.ColourTo(i - 1, state);
+				state = SCE_LISP_DEFAULT;
+			}
+			if (isLispoperator(ch) || ch=='\'') {
+				styler.ColourTo(i - 1, state);
+				styler.ColourTo(i, SCE_LISP_OPERATOR);
+				if (ch=='\'' && isLispwordstart(chNext)) {
+					state = SCE_LISP_SYMBOL;
+				}
+			}
+		} else {
+			if (state == SCE_LISP_COMMENT) {
+				if (atEOL) {
+					styler.ColourTo(i - 1, state);
+					state = SCE_LISP_DEFAULT;
+				}
+			} else if (state == SCE_LISP_MULTI_COMMENT) {
+				if (ch == '|' && chNext == '#') {
+					i++;
+					chNext = styler.SafeGetCharAt(i + 1);
+					styler.ColourTo(i, state);
+					state = SCE_LISP_DEFAULT;
+				}
+			} else if (state == SCE_LISP_STRING) {
+				if (ch == '\\') {
+					if (chNext == '\"' || chNext == '\'' || chNext == '\\') {
+						i++;
+						chNext = styler.SafeGetCharAt(i + 1);
+					}
+				} else if (ch == '\"') {
+					styler.ColourTo(i, state);
+					state = SCE_LISP_DEFAULT;
+				}
+			}
+		}
+
+	}
+	styler.ColourTo(lengthDoc - 1, state);
+}
+
+static void FoldLispDoc(unsigned int startPos, int length, int /* initStyle */, WordList *[],
+                            Accessor &styler) {
+	unsigned int lengthDoc = startPos + length;
+	int visibleChars = 0;
+	int lineCurrent = styler.GetLine(startPos);
+	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
+	int levelCurrent = levelPrev;
+	char chNext = styler[startPos];
+	int styleNext = styler.StyleAt(startPos);
+	for (unsigned int i = startPos; i < lengthDoc; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+		if (style == SCE_LISP_OPERATOR) {
+			if (ch == '(') {
+				levelCurrent++;
+			} else if (ch == ')') {
+				levelCurrent--;
+			}
+		}
+		if (atEOL) {
+			int lev = levelPrev;
+			if (visibleChars == 0)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if ((levelCurrent > levelPrev) && (visibleChars > 0))
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelPrev = levelCurrent;
+			visibleChars = 0;
+		}
+		if (!isspacechar(ch))
+			visibleChars++;
+	}
+	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
+	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
+}
+
+static const char * const lispWordListDesc[] = {
+	"Functions and special operators",
+	"Keywords",
+	0
+};
+
+LexerModule lmLISP(SCLEX_LISP, ColouriseLispDoc, "lisp", FoldLispDoc, lispWordListDesc);
diff --git a/Documents/Scintilla/LexLout.cxx b/Documents/Scintilla/LexLout.cxx
new file mode 100644
index 0000000..492e4ed
--- /dev/null
+++ b/Documents/Scintilla/LexLout.cxx
@@ -0,0 +1,212 @@
+// Scintilla source code edit control
+/** @file LexLout.cxx
+ ** Lexer for the Basser Lout (>= version 3) typesetting language
+ **/
+// Copyright 2003 by Kein-Hong Man <mkh@pl.jaring.my>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+static inline bool IsAWordChar(const int ch) {
+	return (ch < 0x80) && (isalpha(ch) || ch == '@' || ch == '_');
+}
+
+static inline bool IsAnOther(const int ch) {
+	return (ch < 0x80) && (ch == '{' || ch == '}' ||
+	ch == '!' || ch == '$' || ch == '%' || ch == '&' || ch == '\'' ||
+	ch == '(' || ch == ')' || ch == '*' || ch == '+' || ch == ',' ||
+	ch == '-' || ch == '.' || ch == '/' || ch == ':' || ch == ';' ||
+	ch == '<' || ch == '=' || ch == '>' || ch == '?' || ch == '[' ||
+	ch == ']' || ch == '^' || ch == '`' || ch == '|' || ch == '~');
+}
+
+static void ColouriseLoutDoc(unsigned int startPos, int length, int initStyle,
+			     WordList *keywordlists[], Accessor &styler) {
+
+	WordList &keywords = *keywordlists[0];
+	WordList &keywords2 = *keywordlists[1];
+	WordList &keywords3 = *keywordlists[2];
+
+	int visibleChars = 0;
+	int firstWordInLine = 0;
+	int leadingAtSign = 0;
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	for (; sc.More(); sc.Forward()) {
+
+		if (sc.atLineStart && (sc.state == SCE_LOUT_STRING)) {
+			// Prevent SCE_LOUT_STRINGEOL from leaking back to previous line
+			sc.SetState(SCE_LOUT_STRING);
+		}
+
+		// Determine if the current state should terminate.
+		if (sc.state == SCE_LOUT_COMMENT) {
+			if (sc.atLineEnd) {
+				sc.SetState(SCE_LOUT_DEFAULT);
+				visibleChars = 0;
+			}
+		} else if (sc.state == SCE_LOUT_NUMBER) {
+			if (!IsADigit(sc.ch) && sc.ch != '.') {
+				sc.SetState(SCE_LOUT_DEFAULT);
+			}
+		} else if (sc.state == SCE_LOUT_STRING) {
+			if (sc.ch == '\\') {
+				if (sc.chNext == '\"' || sc.chNext == '\\') {
+					sc.Forward();
+				}
+			} else if (sc.ch == '\"') {
+				sc.ForwardSetState(SCE_LOUT_DEFAULT);
+			} else if (sc.atLineEnd) {
+				sc.ChangeState(SCE_LOUT_STRINGEOL);
+				sc.ForwardSetState(SCE_LOUT_DEFAULT);
+				visibleChars = 0;
+			}
+		} else if (sc.state == SCE_LOUT_IDENTIFIER) {
+			if (!IsAWordChar(sc.ch)) {
+				char s[100];
+				sc.GetCurrent(s, sizeof(s));
+
+				if (leadingAtSign) {
+					if (keywords.InList(s)) {
+						sc.ChangeState(SCE_LOUT_WORD);
+					} else {
+						sc.ChangeState(SCE_LOUT_WORD4);
+					}
+				} else if (firstWordInLine && keywords3.InList(s)) {
+					sc.ChangeState(SCE_LOUT_WORD3);
+				}
+				sc.SetState(SCE_LOUT_DEFAULT);
+			}
+		} else if (sc.state == SCE_LOUT_OPERATOR) {
+			if (!IsAnOther(sc.ch)) {
+				char s[100];
+				sc.GetCurrent(s, sizeof(s));
+
+				if (keywords2.InList(s)) {
+					sc.ChangeState(SCE_LOUT_WORD2);
+				}
+				sc.SetState(SCE_LOUT_DEFAULT);
+			}
+		}
+
+		// Determine if a new state should be entered.
+		if (sc.state == SCE_LOUT_DEFAULT) {
+			if (sc.ch == '#') {
+				sc.SetState(SCE_LOUT_COMMENT);
+			} else if (sc.ch == '\"') {
+				sc.SetState(SCE_LOUT_STRING);
+			} else if (IsADigit(sc.ch) ||
+				  (sc.ch == '.' && IsADigit(sc.chNext))) {
+				sc.SetState(SCE_LOUT_NUMBER);
+			} else if (IsAWordChar(sc.ch)) {
+				firstWordInLine = (visibleChars == 0);
+				leadingAtSign = (sc.ch == '@');
+				sc.SetState(SCE_LOUT_IDENTIFIER);
+			} else if (IsAnOther(sc.ch)) {
+				sc.SetState(SCE_LOUT_OPERATOR);
+			}
+		}
+
+		if (sc.atLineEnd) {
+			// Reset states to begining of colourise so no surprises
+			// if different sets of lines lexed.
+			visibleChars = 0;
+		}
+		if (!IsASpace(sc.ch)) {
+			visibleChars++;
+		}
+	}
+	sc.Complete();
+}
+
+static void FoldLoutDoc(unsigned int startPos, int length, int, WordList *[],
+                        Accessor &styler) {
+
+	unsigned int endPos = startPos + length;
+	int visibleChars = 0;
+	int lineCurrent = styler.GetLine(startPos);
+	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
+	int levelCurrent = levelPrev;
+	char chNext = styler[startPos];
+	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	int styleNext = styler.StyleAt(startPos);
+	char s[10];
+
+	for (unsigned int i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+
+		if (style == SCE_LOUT_WORD) {
+			if (ch == '@') {
+				for (unsigned int j = 0; j < 8; j++) {
+					if (!IsAWordChar(styler[i + j])) {
+						break;
+					}
+					s[j] = styler[i + j];
+					s[j + 1] = '\0';
+				}
+				if (strcmp(s, "@Begin") == 0) {
+					levelCurrent++;
+				} else if (strcmp(s, "@End") == 0) {
+					levelCurrent--;
+				}
+			}
+		} else if (style == SCE_LOUT_OPERATOR) {
+			if (ch == '{') {
+				levelCurrent++;
+			} else if (ch == '}') {
+				levelCurrent--;
+			}
+		}
+		if (atEOL) {
+			int lev = levelPrev;
+			if (visibleChars == 0 && foldCompact) {
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			}
+			if ((levelCurrent > levelPrev) && (visibleChars > 0)) {
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			}
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelPrev = levelCurrent;
+			visibleChars = 0;
+		}
+		if (!isspacechar(ch))
+			visibleChars++;
+	}
+	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
+	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
+}
+
+static const char * const loutWordLists[] = {
+            "Predefined identifiers",
+            "Predefined delimiters",
+            "Predefined keywords",
+            0,
+        };
+
+LexerModule lmLout(SCLEX_LOUT, ColouriseLoutDoc, "lout", FoldLoutDoc, loutWordLists);
diff --git a/Documents/Scintilla/LexLua.cxx b/Documents/Scintilla/LexLua.cxx
new file mode 100644
index 0000000..a1e579f
--- /dev/null
+++ b/Documents/Scintilla/LexLua.cxx
@@ -0,0 +1,358 @@
+// Scintilla source code edit control
+/** @file LexLua.cxx
+ ** Lexer for Lua language.
+ **
+ ** Written by Paul Winwood.
+ ** Folder by Alexey Yutkin.
+ ** Modified by Marcos E. Wurzius & Philippe Lhoste
+ **/
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdarg.h>
+#include <stdio.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+#include "CharacterSet.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+// Test for [=[ ... ]=] delimiters, returns 0 if it's only a [ or ],
+// return 1 for [[ or ]], returns >=2 for [=[ or ]=] and so on.
+// The maximum number of '=' characters allowed is 254.
+static int LongDelimCheck(StyleContext &sc) {
+	int sep = 1;
+	while (sc.GetRelative(sep) == '=' && sep < 0xFF)
+		sep++;
+	if (sc.GetRelative(sep) == sc.ch)
+		return sep;
+	return 0;
+}
+
+static void ColouriseLuaDoc(
+	unsigned int startPos,
+	int length,
+	int initStyle,
+	WordList *keywordlists[],
+	Accessor &styler) {
+
+	WordList &keywords = *keywordlists[0];
+	WordList &keywords2 = *keywordlists[1];
+	WordList &keywords3 = *keywordlists[2];
+	WordList &keywords4 = *keywordlists[3];
+	WordList &keywords5 = *keywordlists[4];
+	WordList &keywords6 = *keywordlists[5];
+	WordList &keywords7 = *keywordlists[6];
+	WordList &keywords8 = *keywordlists[7];
+
+	// Accepts accented characters
+	CharacterSet setWordStart(CharacterSet::setAlpha, "_", 0x80, true);
+	CharacterSet setWord(CharacterSet::setAlphaNum, "._", 0x80, true);
+	// Not exactly following number definition (several dots are seen as OK, etc.)
+	// but probably enough in most cases.
+	CharacterSet setNumber(CharacterSet::setDigits, ".-+abcdefABCDEF");
+	CharacterSet setLuaOperator(CharacterSet::setNone, "*/-+()={}~[];<>,.^%:#");
+	CharacterSet setEscapeSkip(CharacterSet::setNone, "\"'\\");
+
+	int currentLine = styler.GetLine(startPos);
+	// Initialize long string [[ ... ]] or block comment --[[ ... ]] nesting level,
+	// if we are inside such a string. Block comment was introduced in Lua 5.0,
+	// blocks with separators [=[ ... ]=] in Lua 5.1.
+	int nestLevel = 0;
+	int sepCount = 0;
+	if (initStyle == SCE_LUA_LITERALSTRING || initStyle == SCE_LUA_COMMENT) {
+		int lineState = styler.GetLineState(currentLine - 1);
+		nestLevel = lineState >> 8;
+		sepCount = lineState & 0xFF;
+	}
+
+	// Do not leak onto next line
+	if (initStyle == SCE_LUA_STRINGEOL || initStyle == SCE_LUA_COMMENTLINE || initStyle == SCE_LUA_PREPROCESSOR) {
+		initStyle = SCE_LUA_DEFAULT;
+	}
+
+	StyleContext sc(startPos, length, initStyle, styler);
+	if (startPos == 0 && sc.ch == '#') {
+		// shbang line: # is a comment only if first char of the script
+		sc.SetState(SCE_LUA_COMMENTLINE);
+	}
+	for (; sc.More(); sc.Forward()) {
+		if (sc.atLineEnd) {
+			// Update the line state, so it can be seen by next line
+			currentLine = styler.GetLine(sc.currentPos);
+			switch (sc.state) {
+			case SCE_LUA_LITERALSTRING:
+			case SCE_LUA_COMMENT:
+				// Inside a literal string or block comment, we set the line state
+				styler.SetLineState(currentLine, (nestLevel << 8) | sepCount);
+				break;
+			default:
+				// Reset the line state
+				styler.SetLineState(currentLine, 0);
+				break;
+			}
+		}
+		if (sc.atLineStart && (sc.state == SCE_LUA_STRING)) {
+			// Prevent SCE_LUA_STRINGEOL from leaking back to previous line
+			sc.SetState(SCE_LUA_STRING);
+		}
+
+		// Handle string line continuation
+		if ((sc.state == SCE_LUA_STRING || sc.state == SCE_LUA_CHARACTER) &&
+				sc.ch == '\\') {
+			if (sc.chNext == '\n' || sc.chNext == '\r') {
+				sc.Forward();
+				if (sc.ch == '\r' && sc.chNext == '\n') {
+					sc.Forward();
+				}
+				continue;
+			}
+		}
+
+		// Determine if the current state should terminate.
+		if (sc.state == SCE_LUA_OPERATOR) {
+			sc.SetState(SCE_LUA_DEFAULT);
+		} else if (sc.state == SCE_LUA_NUMBER) {
+			// We stop the number definition on non-numerical non-dot non-eE non-sign non-hexdigit char
+			if (!setNumber.Contains(sc.ch)) {
+				sc.SetState(SCE_LUA_DEFAULT);
+			} else if (sc.ch == '-' || sc.ch == '+') {
+				if (sc.chPrev != 'E' && sc.chPrev != 'e')
+					sc.SetState(SCE_LUA_DEFAULT);
+			}
+		} else if (sc.state == SCE_LUA_IDENTIFIER) {
+			if (!setWord.Contains(sc.ch) || sc.Match('.', '.')) {
+				char s[100];
+				sc.GetCurrent(s, sizeof(s));
+				if (keywords.InList(s)) {
+					sc.ChangeState(SCE_LUA_WORD);
+				} else if (keywords2.InList(s)) {
+					sc.ChangeState(SCE_LUA_WORD2);
+				} else if (keywords3.InList(s)) {
+					sc.ChangeState(SCE_LUA_WORD3);
+				} else if (keywords4.InList(s)) {
+					sc.ChangeState(SCE_LUA_WORD4);
+				} else if (keywords5.InList(s)) {
+					sc.ChangeState(SCE_LUA_WORD5);
+				} else if (keywords6.InList(s)) {
+					sc.ChangeState(SCE_LUA_WORD6);
+				} else if (keywords7.InList(s)) {
+					sc.ChangeState(SCE_LUA_WORD7);
+				} else if (keywords8.InList(s)) {
+					sc.ChangeState(SCE_LUA_WORD8);
+				}
+				sc.SetState(SCE_LUA_DEFAULT);
+			}
+		} else if (sc.state == SCE_LUA_COMMENTLINE || sc.state == SCE_LUA_PREPROCESSOR) {
+			if (sc.atLineEnd) {
+				sc.ForwardSetState(SCE_LUA_DEFAULT);
+			}
+		} else if (sc.state == SCE_LUA_STRING) {
+			if (sc.ch == '\\') {
+				if (setEscapeSkip.Contains(sc.chNext)) {
+					sc.Forward();
+				}
+			} else if (sc.ch == '\"') {
+				sc.ForwardSetState(SCE_LUA_DEFAULT);
+			} else if (sc.atLineEnd) {
+				sc.ChangeState(SCE_LUA_STRINGEOL);
+				sc.ForwardSetState(SCE_LUA_DEFAULT);
+			}
+		} else if (sc.state == SCE_LUA_CHARACTER) {
+			if (sc.ch == '\\') {
+				if (setEscapeSkip.Contains(sc.chNext)) {
+					sc.Forward();
+				}
+			} else if (sc.ch == '\'') {
+				sc.ForwardSetState(SCE_LUA_DEFAULT);
+			} else if (sc.atLineEnd) {
+				sc.ChangeState(SCE_LUA_STRINGEOL);
+				sc.ForwardSetState(SCE_LUA_DEFAULT);
+			}
+		} else if (sc.state == SCE_LUA_LITERALSTRING || sc.state == SCE_LUA_COMMENT) {
+			if (sc.ch == '[') {
+				int sep = LongDelimCheck(sc);
+				if (sep == 1 && sepCount == 1) {    // [[-only allowed to nest
+					nestLevel++;
+					sc.Forward();
+				}
+			} else if (sc.ch == ']') {
+				int sep = LongDelimCheck(sc);
+				if (sep == 1 && sepCount == 1) {    // un-nest with ]]-only
+					nestLevel--;
+					sc.Forward();
+					if (nestLevel == 0) {
+						sc.ForwardSetState(SCE_LUA_DEFAULT);
+					}
+				} else if (sep > 1 && sep == sepCount) {   // ]=]-style delim
+					sc.Forward(sep);
+					sc.ForwardSetState(SCE_LUA_DEFAULT);
+				}
+			}
+		}
+
+		// Determine if a new state should be entered.
+		if (sc.state == SCE_LUA_DEFAULT) {
+			if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
+				sc.SetState(SCE_LUA_NUMBER);
+				if (sc.ch == '0' && toupper(sc.chNext) == 'X') {
+					sc.Forward();
+				}
+			} else if (setWordStart.Contains(sc.ch)) {
+				sc.SetState(SCE_LUA_IDENTIFIER);
+			} else if (sc.ch == '\"') {
+				sc.SetState(SCE_LUA_STRING);
+			} else if (sc.ch == '\'') {
+				sc.SetState(SCE_LUA_CHARACTER);
+			} else if (sc.ch == '[') {
+				sepCount = LongDelimCheck(sc);
+				if (sepCount == 0) {
+					sc.SetState(SCE_LUA_OPERATOR);
+				} else {
+					nestLevel = 1;
+					sc.SetState(SCE_LUA_LITERALSTRING);
+					sc.Forward(sepCount);
+				}
+			} else if (sc.Match('-', '-')) {
+				sc.SetState(SCE_LUA_COMMENTLINE);
+				if (sc.Match("--[")) {
+					sc.Forward(2);
+					sepCount = LongDelimCheck(sc);
+					if (sepCount > 0) {
+						nestLevel = 1;
+						sc.ChangeState(SCE_LUA_COMMENT);
+						sc.Forward(sepCount);
+					}
+				} else {
+					sc.Forward();
+				}
+			} else if (sc.atLineStart && sc.Match('$')) {
+				sc.SetState(SCE_LUA_PREPROCESSOR);	// Obsolete since Lua 4.0, but still in old code
+			} else if (setLuaOperator.Contains(sc.ch)) {
+				sc.SetState(SCE_LUA_OPERATOR);
+			}
+		}
+	}
+
+	if (setWord.Contains(sc.chPrev)) {
+		char s[100];
+		sc.GetCurrent(s, sizeof(s));
+		if (keywords.InList(s)) {
+			sc.ChangeState(SCE_LUA_WORD);
+		} else if (keywords2.InList(s)) {
+			sc.ChangeState(SCE_LUA_WORD2);
+		} else if (keywords3.InList(s)) {
+			sc.ChangeState(SCE_LUA_WORD3);
+		} else if (keywords4.InList(s)) {
+			sc.ChangeState(SCE_LUA_WORD4);
+		} else if (keywords5.InList(s)) {
+			sc.ChangeState(SCE_LUA_WORD5);
+		} else if (keywords6.InList(s)) {
+			sc.ChangeState(SCE_LUA_WORD6);
+		} else if (keywords7.InList(s)) {
+			sc.ChangeState(SCE_LUA_WORD7);
+		} else if (keywords8.InList(s)) {
+			sc.ChangeState(SCE_LUA_WORD8);
+		}
+	}
+
+	sc.Complete();
+}
+
+static void FoldLuaDoc(unsigned int startPos, int length, int /* initStyle */, WordList *[],
+                       Accessor &styler) {
+	unsigned int lengthDoc = startPos + length;
+	int visibleChars = 0;
+	int lineCurrent = styler.GetLine(startPos);
+	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
+	int levelCurrent = levelPrev;
+	char chNext = styler[startPos];
+	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	int styleNext = styler.StyleAt(startPos);
+	char s[10];
+
+	for (unsigned int i = startPos; i < lengthDoc; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+		if (style == SCE_LUA_WORD) {
+			if (ch == 'i' || ch == 'd' || ch == 'f' || ch == 'e' || ch == 'r' || ch == 'u') {
+				for (unsigned int j = 0; j < 8; j++) {
+					if (!iswordchar(styler[i + j])) {
+						break;
+					}
+					s[j] = styler[i + j];
+					s[j + 1] = '\0';
+				}
+
+				if ((strcmp(s, "if") == 0) || (strcmp(s, "do") == 0) || (strcmp(s, "function") == 0) || (strcmp(s, "repeat") == 0)) {
+					levelCurrent++;
+				}
+				if ((strcmp(s, "end") == 0) || (strcmp(s, "elseif") == 0) || (strcmp(s, "until") == 0)) {
+					levelCurrent--;
+				}
+			}
+		} else if (style == SCE_LUA_OPERATOR) {
+			if (ch == '{' || ch == '(') {
+				levelCurrent++;
+			} else if (ch == '}' || ch == ')') {
+				levelCurrent--;
+			}
+		} else if (style == SCE_LUA_LITERALSTRING || style == SCE_LUA_COMMENT) {
+			if (ch == '[') {
+				levelCurrent++;
+			} else if (ch == ']') {
+				levelCurrent--;
+			}
+		}
+
+		if (atEOL) {
+			int lev = levelPrev;
+			if (visibleChars == 0 && foldCompact) {
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			}
+			if ((levelCurrent > levelPrev) && (visibleChars > 0)) {
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			}
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelPrev = levelCurrent;
+			visibleChars = 0;
+		}
+		if (!isspacechar(ch)) {
+			visibleChars++;
+		}
+	}
+	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
+
+	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
+}
+
+static const char * const luaWordListDesc[] = {
+	"Keywords",
+	"Basic functions",
+	"String, (table) & math functions",
+	"(coroutines), I/O & system facilities",
+	"user1",
+	"user2",
+	"user3",
+	"user4",
+	0
+};
+
+LexerModule lmLua(SCLEX_LUA, ColouriseLuaDoc, "lua", FoldLuaDoc, luaWordListDesc);
diff --git a/Documents/Scintilla/LexMMIXAL.cxx b/Documents/Scintilla/LexMMIXAL.cxx
new file mode 100644
index 0000000..a00f35c
--- /dev/null
+++ b/Documents/Scintilla/LexMMIXAL.cxx
@@ -0,0 +1,186 @@
+// Scintilla source code edit control
+/** @file LexMMIXAL.cxx
+ ** Lexer for MMIX Assembler Language.
+ ** Written by Christoph Hösler <christoph.hoesler@student.uni-tuebingen.de>
+ ** For information about MMIX visit http://www-cs-faculty.stanford.edu/~knuth/mmix.html
+ **/
+// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+
+static inline bool IsAWordChar(const int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == ':' || ch == '_');
+}
+
+inline bool isMMIXALOperator(char ch) {
+	if (isalnum(ch))
+		return false;
+	if (ch == '+' || ch == '-' || ch == '|' || ch == '^' ||
+		ch == '*' || ch == '/' || ch == '/' ||
+		ch == '%' || ch == '<' || ch == '>' || ch == '&' ||
+		ch == '~' || ch == '$' ||
+		ch == ',' || ch == '(' || ch == ')' ||
+		ch == '[' || ch == ']')
+		return true;
+	return false;
+}
+
+static void ColouriseMMIXALDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
+                            Accessor &styler) {
+
+	WordList &opcodes = *keywordlists[0];
+	WordList &special_register = *keywordlists[1];
+	WordList &predef_symbols = *keywordlists[2];
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	for (; sc.More(); sc.Forward())
+	{
+		// No EOL continuation
+		if (sc.atLineStart) {
+			if (sc.ch ==  '@' && sc.chNext == 'i') {
+				sc.SetState(SCE_MMIXAL_INCLUDE);
+			} else {
+				sc.SetState(SCE_MMIXAL_LEADWS);
+			}
+		}
+
+		// Check if first non whitespace character in line is alphanumeric
+		if (sc.state == SCE_MMIXAL_LEADWS && !isspace(sc.ch)) {	// LEADWS
+			if(!IsAWordChar(sc.ch)) {
+				sc.SetState(SCE_MMIXAL_COMMENT);
+			} else {
+				if(sc.atLineStart) {
+					sc.SetState(SCE_MMIXAL_LABEL);
+				} else {
+					sc.SetState(SCE_MMIXAL_OPCODE_PRE);
+				}
+			}
+		}
+
+		// Determine if the current state should terminate.
+		if (sc.state == SCE_MMIXAL_OPERATOR) {			// OPERATOR
+			sc.SetState(SCE_MMIXAL_OPERANDS);
+		} else if (sc.state == SCE_MMIXAL_NUMBER) {		// NUMBER
+			if (!isdigit(sc.ch)) {
+				if (IsAWordChar(sc.ch)) {
+					char s[100];
+					sc.GetCurrent(s, sizeof(s));
+					sc.ChangeState(SCE_MMIXAL_REF);
+					sc.SetState(SCE_MMIXAL_REF);
+				} else {
+					sc.SetState(SCE_MMIXAL_OPERANDS);
+				}
+			}
+		} else if (sc.state == SCE_MMIXAL_LABEL) {			// LABEL
+			if (!IsAWordChar(sc.ch) ) {
+				sc.SetState(SCE_MMIXAL_OPCODE_PRE);
+			}
+		} else if (sc.state == SCE_MMIXAL_REF) {			// REF
+			if (!IsAWordChar(sc.ch) ) {
+				char s[100];
+				sc.GetCurrent(s, sizeof(s));
+				if (*s == ':') {	// ignore base prefix for match
+					for (size_t i = 0; i != sizeof(s); ++i) {
+						*(s+i) = *(s+i+1);
+					}
+				}
+				if (special_register.InList(s)) {
+					sc.ChangeState(SCE_MMIXAL_REGISTER);
+				} else if (predef_symbols.InList(s)) {
+					sc.ChangeState(SCE_MMIXAL_SYMBOL);
+				}
+				sc.SetState(SCE_MMIXAL_OPERANDS);
+			}
+		} else if (sc.state == SCE_MMIXAL_OPCODE_PRE) {	// OPCODE_PRE
+				if (!isspace(sc.ch)) {
+					sc.SetState(SCE_MMIXAL_OPCODE);
+				}
+		} else if (sc.state == SCE_MMIXAL_OPCODE) {		// OPCODE
+			if (!IsAWordChar(sc.ch) ) {
+				char s[100];
+				sc.GetCurrent(s, sizeof(s));
+				if (opcodes.InList(s)) {
+					sc.ChangeState(SCE_MMIXAL_OPCODE_VALID);
+				} else {
+					sc.ChangeState(SCE_MMIXAL_OPCODE_UNKNOWN);
+				}
+				sc.SetState(SCE_MMIXAL_OPCODE_POST);
+			}
+		} else if (sc.state == SCE_MMIXAL_STRING) {		// STRING
+			if (sc.ch == '\"') {
+				sc.ForwardSetState(SCE_MMIXAL_OPERANDS);
+			} else if (sc.atLineEnd) {
+				sc.ForwardSetState(SCE_MMIXAL_OPERANDS);
+			}
+		} else if (sc.state == SCE_MMIXAL_CHAR) {			// CHAR
+			if (sc.ch == '\'') {
+				sc.ForwardSetState(SCE_MMIXAL_OPERANDS);
+			} else if (sc.atLineEnd) {
+				sc.ForwardSetState(SCE_MMIXAL_OPERANDS);
+			}
+		} else if (sc.state == SCE_MMIXAL_REGISTER) {		// REGISTER
+			if (!isdigit(sc.ch)) {
+				sc.SetState(SCE_MMIXAL_OPERANDS);
+			}
+		} else if (sc.state == SCE_MMIXAL_HEX) {			// HEX
+			if (!isxdigit(sc.ch)) {
+				sc.SetState(SCE_MMIXAL_OPERANDS);
+			}
+		}
+
+		// Determine if a new state should be entered.
+		if (sc.state == SCE_MMIXAL_OPCODE_POST ||		// OPCODE_POST
+			sc.state == SCE_MMIXAL_OPERANDS) {			// OPERANDS
+			if (sc.state == SCE_MMIXAL_OPERANDS && isspace(sc.ch)) {
+				if (!sc.atLineEnd) {
+					sc.SetState(SCE_MMIXAL_COMMENT);
+				}
+			} else if (isdigit(sc.ch)) {
+				sc.SetState(SCE_MMIXAL_NUMBER);
+			} else if (IsAWordChar(sc.ch) || sc.Match('@')) {
+				sc.SetState(SCE_MMIXAL_REF);
+			} else if (sc.Match('\"')) {
+				sc.SetState(SCE_MMIXAL_STRING);
+			} else if (sc.Match('\'')) {
+				sc.SetState(SCE_MMIXAL_CHAR);
+			} else if (sc.Match('$')) {
+				sc.SetState(SCE_MMIXAL_REGISTER);
+			} else if (sc.Match('#')) {
+				sc.SetState(SCE_MMIXAL_HEX);
+			} else if (isMMIXALOperator(static_cast<char>(sc.ch))) {
+				sc.SetState(SCE_MMIXAL_OPERATOR);
+			}
+		}
+	}
+	sc.Complete();
+}
+
+static const char * const MMIXALWordListDesc[] = {
+	"Operation Codes",
+	"Special Register",
+	"Predefined Symbols",
+	0
+};
+
+LexerModule lmMMIXAL(SCLEX_MMIXAL, ColouriseMMIXALDoc, "mmixal", 0, MMIXALWordListDesc);
+
diff --git a/Documents/Scintilla/LexMPT.cxx b/Documents/Scintilla/LexMPT.cxx
new file mode 100644
index 0000000..93b8cab
--- /dev/null
+++ b/Documents/Scintilla/LexMPT.cxx
@@ -0,0 +1,186 @@
+// Scintilla source code edit control
+/** @file LexMPT.cxx
+ ** Lexer for MPT specific files. Based on LexOthers.cxx
+ ** LOT = the text log file created by the MPT application while running a test program
+ ** Other MPT specific files to be added later.
+ **/
+// Copyright 2003 by Marius Gheorghe <mgheorghe@cabletest.com>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <string.h>
+#include <stdio.h>
+#include <ctype.h>
+#include <stdlib.h>
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+#include "SString.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+static int GetLotLineState(SString &line) {
+	if (line.length()) {
+		// Most of the time the first non-blank character in line determines that line's type
+		// Now finds the first non-blank character
+		unsigned i; // Declares counter here to make it persistent after the for loop
+		for (i = 0; i < line.length(); ++i) {
+			if (!isspace(line[i]))
+				break;
+		}
+
+		// Checks if it was a blank line
+		if (i == line.length())
+			return SCE_LOT_DEFAULT;
+
+		switch (line[i]) {
+		case '*': // Fail measurement
+			return SCE_LOT_FAIL;
+
+		case '+': // Header
+		case '|': // Header
+			return SCE_LOT_HEADER;
+
+		case ':': // Set test limits
+			return SCE_LOT_SET;
+
+		case '-': // Section break
+			return SCE_LOT_BREAK;
+
+		default:  // Any other line
+			// Checks for message at the end of lot file
+			if (line.contains("PASSED")) {
+				return SCE_LOT_PASS;
+			}
+			else if (line.contains("FAILED")) {
+				return SCE_LOT_FAIL;
+			}
+			else if (line.contains("ABORTED")) {
+				return SCE_LOT_ABORT;
+			}
+			else {
+				return i ? SCE_LOT_PASS : SCE_LOT_DEFAULT;			
+			}
+		}
+	}
+	else {
+		return SCE_LOT_DEFAULT;
+	}
+}
+
+static void ColourizeLotDoc(unsigned int startPos, int length, int, WordList *[], Accessor &styler) {
+	styler.StartAt(startPos);
+	styler.StartSegment(startPos);
+	bool atLineStart = true;// Arms the 'at line start' flag
+	char chNext = styler.SafeGetCharAt(startPos);
+	SString line("");
+	line.setsizegrowth(256);	// Lot lines are less than 256 chars long most of the time. This should avoid reallocations
+
+	// Styles LOT document
+	unsigned int i;			// Declared here because it's used after the for loop
+	for (i = startPos; i < startPos + length; ++i) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		line += ch;
+		atLineStart = false;
+
+		// LOT files are only used on the Win32 platform, thus EOL == CR+LF
+		// Searches for the end of line
+		if (ch == '\r' && chNext == '\n') {
+			line += chNext; // Gets the '\n'
+			++i; // Advances past the '\n'
+			chNext = styler.SafeGetCharAt(i + 1); // Gets character of next line
+			styler.ColourTo(i, GetLotLineState(line));
+			line = "";
+			atLineStart = true; // Arms flag for next line
+		}
+	}
+
+	// Last line may not have a line ending
+	if (!atLineStart) {
+		styler.ColourTo(i - 1, GetLotLineState(line));
+	}
+}
+
+// Folds an MPT LOT file: the blocks that can be folded are:
+// sections (headed by a set line)
+// passes (contiguous pass results within a section)
+// fails (contiguous fail results within a section)
+static void FoldLotDoc(unsigned int startPos, int length, int, WordList *[], Accessor &styler) {
+	bool foldCompact = styler.GetPropertyInt("fold.compact", 0) != 0;
+	unsigned int endPos = startPos + length;
+	int visibleChars = 0;
+	int lineCurrent = styler.GetLine(startPos);
+
+	char chNext = styler.SafeGetCharAt(startPos);
+	int style = SCE_LOT_DEFAULT;
+	int styleNext = styler.StyleAt(startPos);
+	int lev = SC_FOLDLEVELBASE;
+
+	// Gets style of previous line if not at the beginning of the document
+	if (startPos > 1)
+		style = styler.StyleAt(startPos - 2);
+
+	for (unsigned int i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+
+		if (ch == '\r' && chNext == '\n') {
+			// TO DO:
+			// Should really get the state of the previous line from the styler
+			int stylePrev = style;	
+			style = styleNext;
+			styleNext = styler.StyleAt(i + 2);
+		
+			switch (style) {
+/*
+			case SCE_LOT_SET:
+				lev = SC_FOLDLEVELBASE | SC_FOLDLEVELHEADERFLAG;
+				break;
+*/
+			case SCE_LOT_FAIL:
+/*
+				if (stylePrev != SCE_LOT_FAIL) 
+					lev = SC_FOLDLEVELBASE | SC_FOLDLEVELHEADERFLAG;
+				else
+					lev = SC_FOLDLEVELBASE + 1;
+*/
+				lev = SC_FOLDLEVELBASE;
+				break;
+
+			default:
+				if (lineCurrent == 0 || stylePrev == SCE_LOT_FAIL) 
+					lev = SC_FOLDLEVELBASE | SC_FOLDLEVELHEADERFLAG;
+				else
+					lev = SC_FOLDLEVELBASE + 1;
+
+				if (visibleChars == 0 && foldCompact)
+					lev |= SC_FOLDLEVELWHITEFLAG;
+				break;
+			}
+
+			if (lev != styler.LevelAt(lineCurrent)) 
+				styler.SetLevel(lineCurrent, lev);
+
+			lineCurrent++;
+			visibleChars = 0;
+		}
+
+		if (!isspacechar(ch))
+			visibleChars++;
+	}
+
+	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+	styler.SetLevel(lineCurrent, lev | flagsNext);
+}
+
+static const char * const emptyWordListDesc[] = {
+	0
+};
+
+LexerModule lmLot(SCLEX_LOT, ColourizeLotDoc, "lot", FoldLotDoc, emptyWordListDesc);
diff --git a/Documents/Scintilla/LexMSSQL.cxx b/Documents/Scintilla/LexMSSQL.cxx
new file mode 100644
index 0000000..4a3f3be
--- /dev/null
+++ b/Documents/Scintilla/LexMSSQL.cxx
@@ -0,0 +1,363 @@
+// Scintilla source code edit control
+/** @file LexMSSQL.cxx
+ ** Lexer for MSSQL.
+ **/
+// By Filip Yaghob <fyaghob@gmail.com>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+#define KW_MSSQL_STATEMENTS         0
+#define KW_MSSQL_DATA_TYPES         1
+#define KW_MSSQL_SYSTEM_TABLES      2
+#define KW_MSSQL_GLOBAL_VARIABLES   3
+#define KW_MSSQL_FUNCTIONS          4
+#define KW_MSSQL_STORED_PROCEDURES  5
+#define KW_MSSQL_OPERATORS          6
+
+static bool isMSSQLOperator(char ch) {
+	if (isascii(ch) && isalnum(ch))
+		return false;
+	// '.' left out as it is used to make up numbers
+	if (ch == '%' || ch == '^' || ch == '&' || ch == '*' ||
+        ch == '-' || ch == '+' || ch == '=' || ch == '|' ||
+        ch == '<' || ch == '>' || ch == '/' ||
+        ch == '!' || ch == '~' || ch == '(' || ch == ')' ||
+		ch == ',')
+		return true;
+	return false;
+}
+
+static char classifyWordSQL(unsigned int start,
+                            unsigned int end,
+                            WordList *keywordlists[],
+                            Accessor &styler,
+                            unsigned int actualState,
+							unsigned int prevState) {
+	char s[256];
+	bool wordIsNumber = isdigit(styler[start]) || (styler[start] == '.');
+
+	WordList &kwStatements          = *keywordlists[KW_MSSQL_STATEMENTS];
+    WordList &kwDataTypes           = *keywordlists[KW_MSSQL_DATA_TYPES];
+    WordList &kwSystemTables        = *keywordlists[KW_MSSQL_SYSTEM_TABLES];
+    WordList &kwGlobalVariables     = *keywordlists[KW_MSSQL_GLOBAL_VARIABLES];
+    WordList &kwFunctions           = *keywordlists[KW_MSSQL_FUNCTIONS];
+    WordList &kwStoredProcedures    = *keywordlists[KW_MSSQL_STORED_PROCEDURES];
+    WordList &kwOperators           = *keywordlists[KW_MSSQL_OPERATORS];
+
+	for (unsigned int i = 0; i < end - start + 1 && i < 128; i++) {
+		s[i] = static_cast<char>(tolower(styler[start + i]));
+		s[i + 1] = '\0';
+	}
+	char chAttr = SCE_MSSQL_IDENTIFIER;
+
+	if (actualState == SCE_MSSQL_GLOBAL_VARIABLE) {
+
+        if (kwGlobalVariables.InList(&s[2]))
+            chAttr = SCE_MSSQL_GLOBAL_VARIABLE;
+
+	} else if (wordIsNumber) {
+		chAttr = SCE_MSSQL_NUMBER;
+
+	} else if (prevState == SCE_MSSQL_DEFAULT_PREF_DATATYPE) {
+		// Look first in datatypes
+        if (kwDataTypes.InList(s))
+            chAttr = SCE_MSSQL_DATATYPE;
+		else if (kwOperators.InList(s))
+			chAttr = SCE_MSSQL_OPERATOR;
+		else if (kwStatements.InList(s))
+			chAttr = SCE_MSSQL_STATEMENT;
+		else if (kwSystemTables.InList(s))
+			chAttr = SCE_MSSQL_SYSTABLE;
+		else if (kwFunctions.InList(s))
+            chAttr = SCE_MSSQL_FUNCTION;
+		else if (kwStoredProcedures.InList(s))
+			chAttr = SCE_MSSQL_STORED_PROCEDURE;
+
+	} else {
+		if (kwOperators.InList(s))
+			chAttr = SCE_MSSQL_OPERATOR;
+		else if (kwStatements.InList(s))
+			chAttr = SCE_MSSQL_STATEMENT;
+		else if (kwSystemTables.InList(s))
+			chAttr = SCE_MSSQL_SYSTABLE;
+		else if (kwFunctions.InList(s))
+			chAttr = SCE_MSSQL_FUNCTION;
+		else if (kwStoredProcedures.InList(s))
+			chAttr = SCE_MSSQL_STORED_PROCEDURE;
+		else if (kwDataTypes.InList(s))
+			chAttr = SCE_MSSQL_DATATYPE;
+	}
+
+	styler.ColourTo(end, chAttr);
+
+	return chAttr;
+}
+
+static void ColouriseMSSQLDoc(unsigned int startPos, int length,
+                              int initStyle, WordList *keywordlists[], Accessor &styler) {
+
+
+	styler.StartAt(startPos);
+
+	bool fold = styler.GetPropertyInt("fold") != 0;
+	int lineCurrent = styler.GetLine(startPos);
+	int spaceFlags = 0;
+
+	int state = initStyle;
+	int prevState = initStyle;
+	char chPrev = ' ';
+	char chNext = styler[startPos];
+	styler.StartSegment(startPos);
+	unsigned int lengthDoc = startPos + length;
+	for (unsigned int i = startPos; i < lengthDoc; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+
+		if ((ch == '\r' && chNext != '\n') || (ch == '\n')) {
+			int indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags);
+			int lev = indentCurrent;
+			if (!(indentCurrent & SC_FOLDLEVELWHITEFLAG)) {
+				// Only non whitespace lines can be headers
+				int indentNext = styler.IndentAmount(lineCurrent + 1, &spaceFlags);
+				if (indentCurrent < (indentNext & ~SC_FOLDLEVELWHITEFLAG)) {
+					lev |= SC_FOLDLEVELHEADERFLAG;
+				}
+			}
+			if (fold) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+		}
+
+		if (styler.IsLeadByte(ch)) {
+			chNext = styler.SafeGetCharAt(i + 2);
+			chPrev = ' ';
+			i += 1;
+			continue;
+		}
+
+		// When the last char isn't part of the state (have to deal with it too)...
+		if ( (state == SCE_MSSQL_IDENTIFIER) ||
+                    (state == SCE_MSSQL_STORED_PROCEDURE) ||
+                    (state == SCE_MSSQL_DATATYPE) ||
+                    //~ (state == SCE_MSSQL_COLUMN_NAME) ||
+                    (state == SCE_MSSQL_FUNCTION) ||
+                    //~ (state == SCE_MSSQL_GLOBAL_VARIABLE) ||
+                    (state == SCE_MSSQL_VARIABLE)) {
+			if (!iswordchar(ch)) {
+				int stateTmp;
+
+                if ((state == SCE_MSSQL_VARIABLE) || (state == SCE_MSSQL_COLUMN_NAME)) {
+                    styler.ColourTo(i - 1, state);
+					stateTmp = state;
+                } else
+                    stateTmp = classifyWordSQL(styler.GetStartSegment(), i - 1, keywordlists, styler, state, prevState);
+
+				prevState = state;
+
+				if (stateTmp == SCE_MSSQL_IDENTIFIER || stateTmp == SCE_MSSQL_VARIABLE)
+					state = SCE_MSSQL_DEFAULT_PREF_DATATYPE;
+				else
+					state = SCE_MSSQL_DEFAULT;
+			}
+		} else if (state == SCE_MSSQL_LINE_COMMENT) {
+			if (ch == '\r' || ch == '\n') {
+				styler.ColourTo(i - 1, state);
+				prevState = state;
+				state = SCE_MSSQL_DEFAULT;
+			}
+		} else if (state == SCE_MSSQL_GLOBAL_VARIABLE) {
+			if ((ch != '@') && !iswordchar(ch)) {
+				classifyWordSQL(styler.GetStartSegment(), i - 1, keywordlists, styler, state, prevState);
+				prevState = state;
+				state = SCE_MSSQL_DEFAULT;
+			}
+		}
+
+		// If is the default or one of the above succeeded
+		if (state == SCE_MSSQL_DEFAULT || state == SCE_MSSQL_DEFAULT_PREF_DATATYPE) {
+			if (iswordstart(ch)) {
+				styler.ColourTo(i - 1, SCE_MSSQL_DEFAULT);
+				prevState = state;
+				state = SCE_MSSQL_IDENTIFIER;
+			} else if (ch == '/' && chNext == '*') {
+				styler.ColourTo(i - 1, SCE_MSSQL_DEFAULT);
+				prevState = state;
+				state = SCE_MSSQL_COMMENT;
+			} else if (ch == '-' && chNext == '-') {
+				styler.ColourTo(i - 1, SCE_MSSQL_DEFAULT);
+				prevState = state;
+				state = SCE_MSSQL_LINE_COMMENT;
+			} else if (ch == '\'') {
+				styler.ColourTo(i - 1, SCE_MSSQL_DEFAULT);
+				prevState = state;
+				state = SCE_MSSQL_STRING;
+			} else if (ch == '"') {
+				styler.ColourTo(i - 1, SCE_MSSQL_DEFAULT);
+				prevState = state;
+				state = SCE_MSSQL_COLUMN_NAME;
+			} else if (ch == '[') {
+				styler.ColourTo(i - 1, SCE_MSSQL_DEFAULT);
+				prevState = state;
+				state = SCE_MSSQL_COLUMN_NAME_2;
+			} else if (isMSSQLOperator(ch)) {
+				styler.ColourTo(i - 1, SCE_MSSQL_DEFAULT);
+				styler.ColourTo(i, SCE_MSSQL_OPERATOR);
+                //~ style = SCE_MSSQL_DEFAULT;
+				prevState = state;
+				state = SCE_MSSQL_DEFAULT;
+			} else if (ch == '@') {
+                styler.ColourTo(i - 1, SCE_MSSQL_DEFAULT);
+				prevState = state;
+                if (chNext == '@') {
+                    state = SCE_MSSQL_GLOBAL_VARIABLE;
+//                    i += 2;
+                } else
+                    state = SCE_MSSQL_VARIABLE;
+            }
+
+
+		// When the last char is part of the state...
+		} else if (state == SCE_MSSQL_COMMENT) {
+				if (ch == '/' && chPrev == '*') {
+					if (((i > (styler.GetStartSegment() + 2)) || ((initStyle == SCE_MSSQL_COMMENT) &&
+					    (styler.GetStartSegment() == startPos)))) {
+						styler.ColourTo(i, state);
+						//~ state = SCE_MSSQL_COMMENT;
+					prevState = state;
+                        state = SCE_MSSQL_DEFAULT;
+					}
+				}
+			} else if (state == SCE_MSSQL_STRING) {
+				if (ch == '\'') {
+					if ( chNext == '\'' ) {
+						i++;
+					ch = chNext;
+					chNext = styler.SafeGetCharAt(i + 1);
+					} else {
+						styler.ColourTo(i, state);
+					prevState = state;
+						state = SCE_MSSQL_DEFAULT;
+					//i++;
+					}
+				//ch = chNext;
+				//chNext = styler.SafeGetCharAt(i + 1);
+				}
+			} else if (state == SCE_MSSQL_COLUMN_NAME) {
+				if (ch == '"') {
+					if (chNext == '"') {
+						i++;
+					ch = chNext;
+					chNext = styler.SafeGetCharAt(i + 1);
+				} else {
+                    styler.ColourTo(i, state);
+					prevState = state;
+					state = SCE_MSSQL_DEFAULT_PREF_DATATYPE;
+					//i++;
+                }
+                }
+		} else if (state == SCE_MSSQL_COLUMN_NAME_2) {
+			if (ch == ']') {
+                styler.ColourTo(i, state);
+				prevState = state;
+                state = SCE_MSSQL_DEFAULT_PREF_DATATYPE;
+                //i++;
+			}
+		}
+
+		chPrev = ch;
+	}
+	styler.ColourTo(lengthDoc - 1, state);
+}
+
+static void FoldMSSQLDoc(unsigned int startPos, int length, int, WordList *[], Accessor &styler) {
+	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
+	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	unsigned int endPos = startPos + length;
+	int visibleChars = 0;
+	int lineCurrent = styler.GetLine(startPos);
+	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
+	int levelCurrent = levelPrev;
+	char chNext = styler[startPos];
+	bool inComment = (styler.StyleAt(startPos-1) == SCE_MSSQL_COMMENT);
+    char s[10];
+	for (unsigned int i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int style = styler.StyleAt(i);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+        // Comment folding
+		if (foldComment) {
+			if (!inComment && (style == SCE_MSSQL_COMMENT))
+				levelCurrent++;
+			else if (inComment && (style != SCE_MSSQL_COMMENT))
+				levelCurrent--;
+			inComment = (style == SCE_MSSQL_COMMENT);
+		}
+        if (style == SCE_MSSQL_STATEMENT) {
+            // Folding between begin or case and end
+            if (ch == 'b' || ch == 'B' || ch == 'c' || ch == 'C' || ch == 'e' || ch == 'E') {
+                for (unsigned int j = 0; j < 5; j++) {
+					if (!iswordchar(styler[i + j])) {
+						break;
+					}
+					s[j] = static_cast<char>(tolower(styler[i + j]));
+					s[j + 1] = '\0';
+                }
+				if ((strcmp(s, "begin") == 0) || (strcmp(s, "case") == 0)) {
+					levelCurrent++;
+				}
+				if (strcmp(s, "end") == 0) {
+					levelCurrent--;
+				}
+            }
+        }
+		if (atEOL) {
+			int lev = levelPrev;
+			if (visibleChars == 0 && foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if ((levelCurrent > levelPrev) && (visibleChars > 0))
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelPrev = levelCurrent;
+			visibleChars = 0;
+		}
+		if (!isspacechar(ch))
+			visibleChars++;
+	}
+	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
+	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
+}
+
+static const char * const sqlWordListDesc[] = {
+	"Statements",
+    "Data Types",
+    "System tables",
+    "Global variables",
+    "Functions",
+    "System Stored Procedures",
+    "Operators",
+	0,
+};
+
+LexerModule lmMSSQL(SCLEX_MSSQL, ColouriseMSSQLDoc, "mssql", FoldMSSQLDoc, sqlWordListDesc);
diff --git a/Documents/Scintilla/LexMagik.cxx b/Documents/Scintilla/LexMagik.cxx
new file mode 100644
index 0000000..8ab4d08
--- /dev/null
+++ b/Documents/Scintilla/LexMagik.cxx
@@ -0,0 +1,445 @@
+// Scintilla source code edit control
+/**
+ * @file LexMagik.cxx
+ * Lexer for GE(r) Smallworld(tm) MagikSF
+ */
+// Copyright 1998-2005 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+/**
+ * Is it a core character (C isalpha(), exclamation and question mark)
+ *
+ * \param  ch The character
+ * \return True if ch is a character, False otherwise
+ */
+static inline bool IsAlphaCore(int ch) {
+    return (isalpha(ch) || ch == '!' || ch == '?');
+}
+
+/**
+ * Is it a character (IsAlphaCore() and underscore)
+ *
+ * \param  ch The character
+ * \return True if ch is a character, False otherwise
+ */
+static inline bool IsAlpha(int ch) {
+    return (IsAlphaCore(ch) || ch == '_');
+}
+
+/**
+ * Is it a symbolic character (IsAlpha() and colon)
+ *
+ * \param  ch The character
+ * \return True if ch is a character, False otherwise
+ */
+static inline bool IsAlphaSym(int ch) {
+    return (IsAlpha(ch) || ch == ':');
+}
+
+/**
+ * Is it a numerical character (IsAlpha() and 0 - 9)
+ *
+ * \param  ch The character
+ * \return True if ch is a character, False otherwise
+ */
+static inline bool IsAlNum(int ch) {
+    return ((ch > '0' && ch < '9') || IsAlpha(ch));
+}
+
+/**
+ * Is it a symbolic numerical character (IsAlNum() and colon)
+ *
+ * \param  ch The character
+ * \return True if ch is a character, False otherwise
+ */
+static inline bool IsAlNumSym(int ch) {
+    return (IsAlNum(ch) || ch == ':');
+}
+
+/**
+ * The lexer function
+ *
+ * \param  startPos Where to start scanning
+ * \param  length Where to scan to
+ * \param  initStyle The style at the initial point, not used in this folder
+ * \param  keywordslists The keywordslists, currently, number 5 is used
+ * \param  styler The styler
+ */
+static void ColouriseMagikDoc(unsigned int startPos, int length, int initStyle,
+                           WordList *keywordlists[], Accessor &styler) {
+    styler.StartAt(startPos);
+
+    WordList &keywords = *keywordlists[0];
+    WordList &pragmatics = *keywordlists[1];
+    WordList &containers = *keywordlists[2];
+    WordList &flow = *keywordlists[3];
+    WordList &characters = *keywordlists[4];
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+
+	for (; sc.More(); sc.Forward()) {
+
+    repeat:
+
+        if(sc.ch == '#') {
+            if (sc.chNext == '#') sc.SetState(SCE_MAGIK_HYPER_COMMENT);
+            else sc.SetState(SCE_MAGIK_COMMENT);
+            for(; sc.More() && !(sc.atLineEnd); sc.Forward());
+            sc.SetState(SCE_MAGIK_DEFAULT);
+            goto repeat;
+        }
+
+        if(sc.ch == '"') {
+            sc.SetState(SCE_MAGIK_STRING);
+
+            if(sc.More())
+            {
+                sc.Forward();
+                for(; sc.More() && sc.ch != '"'; sc.Forward());
+            }
+
+            sc.ForwardSetState(SCE_MAGIK_DEFAULT);
+            goto repeat;
+        }
+
+	    // The default state
+	    if(sc.state == SCE_MAGIK_DEFAULT) {
+
+	        // A certain keyword has been detected
+	        if (sc.ch == '_' && (
+                    sc.currentPos == 0 || !IsAlNum(sc.chPrev))) {
+	            char keyword[50];
+	            memset(keyword, '\0', 50);
+
+	            for(
+                    int scanPosition = 0;
+                    scanPosition < 50;
+                    scanPosition++) {
+	                char keywordChar = static_cast<char>(
+                        tolower(styler.SafeGetCharAt(
+                            scanPosition +
+                                static_cast<int>(sc.currentPos+1), ' ')));
+                    if(IsAlpha(keywordChar)) {
+                        keyword[scanPosition] = keywordChar;
+                    } else {
+                        break;
+                    }
+	            }
+
+                // It is a pragma
+	            if(pragmatics.InList(keyword)) {
+	                sc.SetState(SCE_MAGIK_PRAGMA);
+	            }
+
+	            // it is a normal keyword like _local, _self, etc.
+	            else if(keywords.InList(keyword)) {
+	                sc.SetState(SCE_MAGIK_KEYWORD);
+	            }
+
+                // It is a container keyword, such as _method, _proc, etc.
+	            else if(containers.InList(keyword)) {
+	                sc.SetState(SCE_MAGIK_CONTAINER);
+	            }
+
+	            // It is a flow keyword, such as _for, _if, _try, etc.
+	            else if(flow.InList(keyword)) {
+	                sc.SetState(SCE_MAGIK_FLOW);
+	            }
+
+	            // Interpret as unknown keyword
+	            else {
+	                sc.SetState(SCE_MAGIK_UNKNOWN_KEYWORD);
+	            }
+	        }
+
+            // Symbolic expression
+	        else if(sc.ch == ':' && !IsAlNum(sc.chPrev)) {
+	            sc.SetState(SCE_MAGIK_SYMBOL);
+	            bool firstTrip = true;
+	            for(sc.Forward(); sc.More(); sc.Forward()) {
+	                if(firstTrip && IsAlphaSym(sc.ch));
+	                else if(!firstTrip && IsAlNumSym(sc.ch));
+	                else if(sc.ch == '|') {
+	                    for(sc.Forward();
+                            sc.More() && sc.ch != '|';
+                            sc.Forward());
+	                }
+	                else break;
+
+	                firstTrip = false;
+	            }
+	            sc.SetState(SCE_MAGIK_DEFAULT);
+	            goto repeat;
+	        }
+
+            // Identifier (label) expression
+	        else if(sc.ch == '@') {
+	            sc.SetState(SCE_MAGIK_IDENTIFIER);
+	            bool firstTrip = true;
+	            for(sc.Forward(); sc.More(); sc.Forward()) {
+	                if(firstTrip && IsAlphaCore(sc.ch)) {
+	                    firstTrip = false;
+	                }
+	                else if(!firstTrip && IsAlpha(sc.ch));
+	                else break;
+	            }
+	            sc.SetState(SCE_MAGIK_DEFAULT);
+	            goto repeat;
+	        }
+
+	        // Start of a character
+            else if(sc.ch == '%') {
+                sc.SetState(SCE_MAGIK_CHARACTER);
+                sc.Forward();
+                char keyword[50];
+	            memset(keyword, '\0', 50);
+
+	            for(
+                    int scanPosition = 0;
+                    scanPosition < 50;
+                    scanPosition++) {
+	                char keywordChar = static_cast<char>(
+                        tolower(styler.SafeGetCharAt(
+                            scanPosition +
+                                static_cast<int>(sc.currentPos), ' ')));
+                    if(IsAlpha(keywordChar)) {
+                        keyword[scanPosition] = keywordChar;
+                    } else {
+                        break;
+                    }
+	            }
+
+	            if(characters.InList(keyword)) {
+	                sc.Forward(strlen(keyword));
+	            } else {
+	                sc.Forward();
+	            }
+
+                sc.SetState(SCE_MAGIK_DEFAULT);
+                goto repeat;
+            }
+
+            // Operators
+	        else if(
+                sc.ch == '>' ||
+                sc.ch == '<' ||
+                sc.ch == '.' ||
+                sc.ch == ',' ||
+                sc.ch == '+' ||
+                sc.ch == '-' ||
+                sc.ch == '/' ||
+                sc.ch == '*' ||
+                sc.ch == '~' ||
+                sc.ch == '$' ||
+                sc.ch == '=') {
+                sc.SetState(SCE_MAGIK_OPERATOR);
+            }
+
+            // Braces
+            else if(sc.ch == '(' || sc.ch == ')') {
+                sc.SetState(SCE_MAGIK_BRACE_BLOCK);
+            }
+
+            // Brackets
+            else if(sc.ch == '{' || sc.ch == '}') {
+                sc.SetState(SCE_MAGIK_BRACKET_BLOCK);
+            }
+
+            // Square Brackets
+            else if(sc.ch == '[' || sc.ch == ']') {
+                sc.SetState(SCE_MAGIK_SQBRACKET_BLOCK);
+            }
+
+
+	    }
+
+	    // It is an operator
+	    else if(
+            sc.state == SCE_MAGIK_OPERATOR ||
+            sc.state == SCE_MAGIK_BRACE_BLOCK ||
+            sc.state == SCE_MAGIK_BRACKET_BLOCK ||
+            sc.state == SCE_MAGIK_SQBRACKET_BLOCK) {
+	        sc.SetState(SCE_MAGIK_DEFAULT);
+	        goto repeat;
+	    }
+
+	    // It is the pragma state
+	    else if(sc.state == SCE_MAGIK_PRAGMA) {
+	        if(!IsAlpha(sc.ch)) {
+	            sc.SetState(SCE_MAGIK_DEFAULT);
+                goto repeat;
+	        }
+	    }
+
+	    // It is the keyword state
+	    else if(
+            sc.state == SCE_MAGIK_KEYWORD ||
+            sc.state == SCE_MAGIK_CONTAINER ||
+            sc.state == SCE_MAGIK_FLOW ||
+            sc.state == SCE_MAGIK_UNKNOWN_KEYWORD) {
+	        if(!IsAlpha(sc.ch)) {
+	            sc.SetState(SCE_MAGIK_DEFAULT);
+	            goto repeat;
+	        }
+	    }
+	}
+
+	sc.Complete();
+}
+
+/**
+ * The word list description
+ */
+static const char * const magikWordListDesc[] = {
+    "Accessors (local, global, self, super, thisthread)",
+    "Pragmatic (pragma, private)",
+    "Containers (method, block, proc)",
+    "Flow (if, then, elif, else)",
+    "Characters (space, tab, newline, return)",
+    "Fold Containers (method, proc, block, if, loop)",
+    0};
+
+/**
+ * This function detects keywords which are able to have a body. Note that it
+ * uses the Fold Containers word description, not the containers description. It
+ * only works when the style at that particular position is set on Containers
+ * or Flow (number 3 or 4).
+ *
+ * \param  keywordslist The list of keywords that are scanned, they should only
+ *         contain the start keywords, not the end keywords
+ * \param  The actual keyword
+ * \return 1 if it is a folding start-keyword, -1 if it is a folding end-keyword
+ *         0 otherwise
+ */
+static inline int IsFoldingContainer(WordList &keywordslist, char * keyword) {
+    if(
+        strlen(keyword) > 3 &&
+        keyword[0] == 'e' && keyword[1] == 'n' && keyword[2] == 'd') {
+        if (keywordslist.InList(keyword + 3)) {
+            return -1;
+        }
+
+    } else {
+        if(keywordslist.InList(keyword)) {
+            return 1;
+        }
+    }
+
+    return 0;
+}
+
+/**
+ * The folding function
+ *
+ * \param  startPos Where to start scanning
+ * \param  length Where to scan to
+ * \param  keywordslists The keywordslists, currently, number 5 is used
+ * \param  styler The styler
+ */
+static void FoldMagikDoc(unsigned int startPos, int length, int,
+    WordList *keywordslists[], Accessor &styler) {
+
+    bool compact = styler.GetPropertyInt("fold.compact") != 0;
+
+    WordList &foldingElements = *keywordslists[5];
+    int endPos = startPos + length;
+    int line = styler.GetLine(startPos);
+    int level = styler.LevelAt(line) & SC_FOLDLEVELNUMBERMASK;
+    int flags = styler.LevelAt(line) & ~SC_FOLDLEVELNUMBERMASK;
+
+    for(
+        int currentPos = startPos;
+        currentPos < endPos;
+        currentPos++) {
+            char currentState = styler.StyleAt(currentPos);
+            char c = styler.SafeGetCharAt(currentPos, ' ');
+            int prevLine = styler.GetLine(currentPos - 1);
+            line = styler.GetLine(currentPos);
+
+            // Default situation
+            if(prevLine < line) {
+                styler.SetLevel(line, (level|flags) & ~SC_FOLDLEVELHEADERFLAG);
+                flags = styler.LevelAt(line) & ~SC_FOLDLEVELNUMBERMASK;
+            }
+
+            if(
+                (
+                    currentState == SCE_MAGIK_CONTAINER ||
+                    currentState == SCE_MAGIK_FLOW
+                ) &&
+                c == '_') {
+
+                char keyword[50];
+                memset(keyword, '\0', 50);
+
+                for(
+                    int scanPosition = 0;
+                    scanPosition < 50;
+                    scanPosition++) {
+                    char keywordChar = static_cast<char>(
+                        tolower(styler.SafeGetCharAt(
+                            scanPosition +
+                                currentPos + 1, ' ')));
+                    if(IsAlpha(keywordChar)) {
+                        keyword[scanPosition] = keywordChar;
+                    } else {
+                        break;
+                    }
+                }
+
+                if(IsFoldingContainer(foldingElements, keyword) > 0) {
+                    styler.SetLevel(
+                        line,
+                        styler.LevelAt(line) | SC_FOLDLEVELHEADERFLAG);
+                    level++;
+                } else if(IsFoldingContainer(foldingElements, keyword) < 0) {
+                    styler.SetLevel(line, styler.LevelAt(line));
+                    level--;
+                }
+            }
+
+            if(
+                compact && (
+                    currentState == SCE_MAGIK_BRACE_BLOCK ||
+                    currentState == SCE_MAGIK_BRACKET_BLOCK ||
+                    currentState == SCE_MAGIK_SQBRACKET_BLOCK)) {
+                if(c == '{' || c == '[' || c == '(') {
+                    styler.SetLevel(
+                        line,
+                        styler.LevelAt(line) | SC_FOLDLEVELHEADERFLAG);
+                    level++;
+                } else if(c == '}' || c == ']' || c == ')') {
+                    styler.SetLevel(line, styler.LevelAt(line));
+                    level--;
+                }
+            }
+        }
+
+}
+
+/**
+ * Injecting the module
+ */
+LexerModule lmMagikSF(
+    SCLEX_MAGIK, ColouriseMagikDoc, "magiksf", FoldMagikDoc, magikWordListDesc);
+
diff --git a/Documents/Scintilla/LexMatlab.cxx b/Documents/Scintilla/LexMatlab.cxx
new file mode 100644
index 0000000..4e467bd
--- /dev/null
+++ b/Documents/Scintilla/LexMatlab.cxx
@@ -0,0 +1,236 @@
+// Scintilla source code edit control
+/** @file LexMatlab.cxx
+ ** Lexer for Matlab.
+ ** Written by José Fonseca
+ **
+ ** Changes by Christoph Dalitz 2003/12/04:
+ **   - added support for Octave
+ **   - Strings can now be included both in single or double quotes
+ **/
+// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+static bool IsMatlabCommentChar(int c) {
+	return (c == '%') ;
+}
+
+static bool IsOctaveCommentChar(int c) {
+	return (c == '%' || c == '#') ;
+}
+
+static bool IsMatlabComment(Accessor &styler, int pos, int len) {
+	return len > 0 && IsMatlabCommentChar(styler[pos]) ;
+}
+
+static bool IsOctaveComment(Accessor &styler, int pos, int len) {
+	return len > 0 && IsOctaveCommentChar(styler[pos]) ;
+}
+
+static inline bool IsAWordChar(const int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '_');
+}
+
+static inline bool IsAWordStart(const int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '_');
+}
+
+static void ColouriseMatlabOctaveDoc(
+            unsigned int startPos, int length, int initStyle,
+            WordList *keywordlists[], Accessor &styler,
+            bool (*IsCommentChar)(int)) {
+
+	WordList &keywords = *keywordlists[0];
+
+	styler.StartAt(startPos);
+
+	bool transpose = false;
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	for (; sc.More(); sc.Forward()) {
+
+		if (sc.state == SCE_MATLAB_OPERATOR) {
+			if (sc.chPrev == '.') {
+				if (sc.ch == '*' || sc.ch == '/' || sc.ch == '\\' || sc.ch == '^') {
+					sc.ForwardSetState(SCE_MATLAB_DEFAULT);
+					transpose = false;
+				} else if (sc.ch == '\'') {
+					sc.ForwardSetState(SCE_MATLAB_DEFAULT);
+					transpose = true;
+				} else {
+					sc.SetState(SCE_MATLAB_DEFAULT);
+				}
+			} else {
+				sc.SetState(SCE_MATLAB_DEFAULT);
+			}
+		} else if (sc.state == SCE_MATLAB_KEYWORD) {
+			if (!isalnum(sc.ch) && sc.ch != '_') {
+				char s[100];
+				sc.GetCurrentLowered(s, sizeof(s));
+				if (keywords.InList(s)) {
+					sc.SetState(SCE_MATLAB_DEFAULT);
+					transpose = false;
+				} else {
+					sc.ChangeState(SCE_MATLAB_IDENTIFIER);
+					sc.SetState(SCE_MATLAB_DEFAULT);
+					transpose = true;
+				}
+			}
+		} else if (sc.state == SCE_MATLAB_NUMBER) {
+			if (!isdigit(sc.ch) && sc.ch != '.'
+			        && !(sc.ch == 'e' || sc.ch == 'E')
+			        && !((sc.ch == '+' || sc.ch == '-') && (sc.chPrev == 'e' || sc.chPrev == 'E'))) {
+				sc.SetState(SCE_MATLAB_DEFAULT);
+				transpose = true;
+			}
+		} else if (sc.state == SCE_MATLAB_STRING) {
+			if (sc.ch == '\\') {
+				if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
+					sc.Forward();
+				}
+			} else if (sc.ch == '\'') {
+				sc.ForwardSetState(SCE_MATLAB_DEFAULT);
+			}
+		} else if (sc.state == SCE_MATLAB_DOUBLEQUOTESTRING) {
+			if (sc.ch == '\\') {
+				if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
+					sc.Forward();
+				}
+			} else if (sc.ch == '\"') {
+				sc.ForwardSetState(SCE_MATLAB_DEFAULT);
+			}
+		} else if (sc.state == SCE_MATLAB_COMMENT || sc.state == SCE_MATLAB_COMMAND) {
+			if (sc.atLineEnd) {
+				sc.SetState(SCE_MATLAB_DEFAULT);
+				transpose = false;
+			}
+		}
+
+		if (sc.state == SCE_MATLAB_DEFAULT) {
+			if (IsCommentChar(sc.ch)) {
+				sc.SetState(SCE_MATLAB_COMMENT);
+			} else if (sc.ch == '!' && sc.chNext != '=' ) {
+				sc.SetState(SCE_MATLAB_COMMAND);
+			} else if (sc.ch == '\'') {
+				if (transpose) {
+					sc.SetState(SCE_MATLAB_OPERATOR);
+				} else {
+					sc.SetState(SCE_MATLAB_STRING);
+				}
+			} else if (sc.ch == '"') {
+				sc.SetState(SCE_MATLAB_DOUBLEQUOTESTRING);
+			} else if (isdigit(sc.ch) || (sc.ch == '.' && isdigit(sc.chNext))) {
+				sc.SetState(SCE_MATLAB_NUMBER);
+			} else if (isalpha(sc.ch)) {
+				sc.SetState(SCE_MATLAB_KEYWORD);
+			} else if (isoperator(static_cast<char>(sc.ch)) || sc.ch == '@' || sc.ch == '\\') {
+				if (sc.ch == ')' || sc.ch == ']') {
+					transpose = true;
+				} else {
+					transpose = false;
+				}
+				sc.SetState(SCE_MATLAB_OPERATOR);
+			} else {
+				transpose = false;
+			}
+		}
+	}
+	sc.Complete();
+}
+
+static void ColouriseMatlabDoc(unsigned int startPos, int length, int initStyle,
+                               WordList *keywordlists[], Accessor &styler) {
+	ColouriseMatlabOctaveDoc(startPos, length, initStyle, keywordlists, styler, IsMatlabCommentChar);
+}
+
+static void ColouriseOctaveDoc(unsigned int startPos, int length, int initStyle,
+                               WordList *keywordlists[], Accessor &styler) {
+	ColouriseMatlabOctaveDoc(startPos, length, initStyle, keywordlists, styler, IsOctaveCommentChar);
+}
+
+static void FoldMatlabOctaveDoc(unsigned int startPos, int length, int,
+                                WordList *[], Accessor &styler,
+                                bool (*IsComment)(Accessor&, int, int)) {
+
+	int endPos = startPos + length;
+
+	// Backtrack to previous line in case need to fix its fold status
+	int lineCurrent = styler.GetLine(startPos);
+	if (startPos > 0) {
+		if (lineCurrent > 0) {
+			lineCurrent--;
+			startPos = styler.LineStart(lineCurrent);
+		}
+	}
+	int spaceFlags = 0;
+	int indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags, IsComment);
+	char chNext = styler[startPos];
+	for (int i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+
+		if ((ch == '\r' && chNext != '\n') || (ch == '\n') || (i == endPos)) {
+			int lev = indentCurrent;
+			int indentNext = styler.IndentAmount(lineCurrent + 1, &spaceFlags, IsComment);
+			if (!(indentCurrent & SC_FOLDLEVELWHITEFLAG)) {
+				// Only non whitespace lines can be headers
+				if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext & SC_FOLDLEVELNUMBERMASK)) {
+					lev |= SC_FOLDLEVELHEADERFLAG;
+				} else if (indentNext & SC_FOLDLEVELWHITEFLAG) {
+					// Line after is blank so check the next - maybe should continue further?
+					int spaceFlags2 = 0;
+					int indentNext2 = styler.IndentAmount(lineCurrent + 2, &spaceFlags2, IsComment);
+					if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext2 & SC_FOLDLEVELNUMBERMASK)) {
+						lev |= SC_FOLDLEVELHEADERFLAG;
+					}
+				}
+			}
+			indentCurrent = indentNext;
+			styler.SetLevel(lineCurrent, lev);
+			lineCurrent++;
+		}
+	}
+}
+
+static void FoldMatlabDoc(unsigned int startPos, int length, int initStyle,
+                          WordList *keywordlists[], Accessor &styler) {
+	FoldMatlabOctaveDoc(startPos, length, initStyle, keywordlists, styler, IsMatlabComment);
+}
+
+static void FoldOctaveDoc(unsigned int startPos, int length, int initStyle,
+                          WordList *keywordlists[], Accessor &styler) {
+	FoldMatlabOctaveDoc(startPos, length, initStyle, keywordlists, styler, IsOctaveComment);
+}
+
+static const char * const matlabWordListDesc[] = {
+	"Keywords",
+	0
+};
+
+static const char * const octaveWordListDesc[] = {
+	"Keywords",
+	0
+};
+
+LexerModule lmMatlab(SCLEX_MATLAB, ColouriseMatlabDoc, "matlab", FoldMatlabDoc, matlabWordListDesc);
+
+LexerModule lmOctave(SCLEX_OCTAVE, ColouriseOctaveDoc, "octave", FoldOctaveDoc, octaveWordListDesc);
diff --git a/Documents/Scintilla/LexMetapost.cxx b/Documents/Scintilla/LexMetapost.cxx
new file mode 100644
index 0000000..6afc9d8
--- /dev/null
+++ b/Documents/Scintilla/LexMetapost.cxx
@@ -0,0 +1,399 @@
+// Scintilla source code edit control
+
+// File: LexMetapost.cxx - general context conformant metapost coloring scheme
+// Author: Hans Hagen - PRAGMA ADE - Hasselt NL - www.pragma-ade.com
+// Version: September 28, 2003
+// Modified by instanton: July 10, 2007
+// Folding based on keywordlists[]
+
+// Copyright: 1998-2003 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+// This lexer is derived from the one written for the texwork environment (1999++) which in
+// turn is inspired on texedit (1991++) which finds its roots in wdt (1986).
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+#include "StyleContext.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+// val SCE_METAPOST_DEFAULT = 0
+// val SCE_METAPOST_SPECIAL = 1
+// val SCE_METAPOST_GROUP = 2
+// val SCE_METAPOST_SYMBOL = 3
+// val SCE_METAPOST_COMMAND = 4
+// val SCE_METAPOST_TEXT = 5
+
+// Definitions in SciTEGlobal.properties:
+//
+// Metapost Highlighting
+//
+// # Default
+// style.metapost.0=fore:#7F7F00
+// # Special
+// style.metapost.1=fore:#007F7F
+// # Group
+// style.metapost.2=fore:#880000
+// # Symbol
+// style.metapost.3=fore:#7F7F00
+// # Command
+// style.metapost.4=fore:#008800
+// # Text
+// style.metapost.5=fore:#000000
+
+// lexer.tex.comment.process=0
+
+// Auxiliary functions:
+
+static inline bool endOfLine(Accessor &styler, unsigned int i) {
+	return
+      (styler[i] == '\n') || ((styler[i] == '\r') && (styler.SafeGetCharAt(i + 1) != '\n')) ;
+}
+
+static inline bool isMETAPOSTcomment(int ch) {
+	return
+      (ch == '%') ;
+}
+
+static inline bool isMETAPOSTone(int ch) {
+	return
+      (ch == '[') || (ch == ']') || (ch == '(') || (ch == ')') ||
+      (ch == ':') || (ch == '=') || (ch == '<') || (ch == '>') ||
+      (ch == '{') || (ch == '}') || (ch == '\'') || (ch == '\"') ;
+}
+
+static inline bool isMETAPOSTtwo(int ch) {
+	return
+      (ch == ';') || (ch == '$') || (ch == '@') || (ch == '#');
+}
+
+static inline bool isMETAPOSTthree(int ch) {
+	return
+      (ch == '.') || (ch == '-') || (ch == '+') || (ch == '/') ||
+      (ch == '*') || (ch == ',') || (ch == '|') || (ch == '`') ||
+      (ch == '!') || (ch == '?') || (ch == '^') || (ch == '&') ||
+      (ch == '%') ;
+}
+
+static inline bool isMETAPOSTidentifier(int ch) {
+	return
+      ((ch >= 'a') && (ch <= 'z')) || ((ch >= 'A') && (ch <= 'Z')) ||
+      (ch == '_') ;
+}
+
+static inline bool isMETAPOSTnumber(int ch) {
+	return
+      (ch >= '0') && (ch <= '9') ;
+}
+
+static inline bool isMETAPOSTstring(int ch) {
+	return
+      (ch == '\"') ;
+}
+
+static inline bool isMETAPOSTcolon(int ch) {
+	return
+		(ch == ':') ;
+}
+
+static inline bool isMETAPOSTequal(int ch) {
+	return
+		(ch == '=') ;
+}
+
+static int CheckMETAPOSTInterface(
+    unsigned int startPos,
+    int length,
+    Accessor &styler,
+	int defaultInterface) {
+
+    char lineBuffer[1024] ;
+	unsigned int linePos = 0 ;
+
+	// some day we can make something lexer.metapost.mapping=(none,0)(metapost,1)(mp,1)(metafun,2)...
+
+    if (styler.SafeGetCharAt(0) == '%') {
+        for (unsigned int i = 0; i < startPos + length; i++) {
+            lineBuffer[linePos++] = styler.SafeGetCharAt(i) ;
+            if (endOfLine(styler, i) || (linePos >= sizeof(lineBuffer) - 1)) {
+                lineBuffer[linePos] = '\0';
+				if (strstr(lineBuffer, "interface=none")) {
+                    return 0 ;
+				} else if (strstr(lineBuffer, "interface=metapost") || strstr(lineBuffer, "interface=mp")) {
+                    return 1 ;
+				} else if (strstr(lineBuffer, "interface=metafun")) {
+                    return 2 ;
+				} else if (styler.SafeGetCharAt(1) == 'D' && strstr(lineBuffer, "%D \\module")) {
+					// better would be to limit the search to just one line
+					return 2 ;
+                } else {
+                    return defaultInterface ;
+                }
+            }
+		}
+    }
+
+    return defaultInterface ;
+}
+
+static void ColouriseMETAPOSTDoc(
+    unsigned int startPos,
+    int length,
+    int,
+    WordList *keywordlists[],
+    Accessor &styler) {
+
+	styler.StartAt(startPos) ;
+	styler.StartSegment(startPos) ;
+
+	bool processComment   = styler.GetPropertyInt("lexer.metapost.comment.process",   0) == 1 ;
+    int  defaultInterface = styler.GetPropertyInt("lexer.metapost.interface.default", 1) ;
+
+	int currentInterface = CheckMETAPOSTInterface(startPos,length,styler,defaultInterface) ;
+
+	// 0  no keyword highlighting
+	// 1  metapost keyword hightlighting
+	// 2+ metafun keyword hightlighting
+
+	int extraInterface = 0 ;
+
+	if (currentInterface != 0) {
+		extraInterface = currentInterface ;
+	}
+
+	WordList &keywords  = *keywordlists[0] ;
+	WordList &keywords2 = *keywordlists[extraInterface-1] ;
+
+	StyleContext sc(startPos, length, SCE_METAPOST_TEXT, styler) ;
+
+	char key[100] ;
+
+    bool inTeX     = false ;
+	bool inComment = false ;
+	bool inString  = false ;
+	bool inClause  = false ;
+
+	bool going = sc.More() ; // needed because of a fuzzy end of file state
+
+	for (; going; sc.Forward()) {
+
+		if (! sc.More()) { going = false ; } // we need to go one behind the end of text
+
+		if (inClause) {
+			sc.SetState(SCE_METAPOST_TEXT) ;
+			inClause = false ;
+		}
+
+		if (inComment) {
+			if (sc.atLineEnd) {
+				sc.SetState(SCE_METAPOST_TEXT) ;
+				inTeX = false ;
+				inComment = false ;
+				inClause = false ;
+				inString = false ; // not correct but we want to stimulate one-lines
+			}
+		} else if (inString) {
+			if (isMETAPOSTstring(sc.ch)) {
+				sc.SetState(SCE_METAPOST_SPECIAL) ;
+				sc.ForwardSetState(SCE_METAPOST_TEXT) ;
+				inString = false ;
+			} else if (sc.atLineEnd) {
+				sc.SetState(SCE_METAPOST_TEXT) ;
+				inTeX = false ;
+				inComment = false ;
+				inClause = false ;
+				inString = false ; // not correct but we want to stimulate one-lines
+			}
+		} else {
+			if ((! isMETAPOSTidentifier(sc.ch)) && (sc.LengthCurrent() > 0)) {
+				if (sc.state == SCE_METAPOST_COMMAND) {
+					sc.GetCurrent(key, sizeof(key)) ;
+					if ((strcmp(key,"btex") == 0) || (strcmp(key,"verbatimtex") == 0)) {
+    					sc.ChangeState(SCE_METAPOST_GROUP) ;
+						inTeX = true ;
+					} else if (inTeX) {
+						if (strcmp(key,"etex") == 0) {
+	    					sc.ChangeState(SCE_METAPOST_GROUP) ;
+							inTeX = false ;
+						} else {
+	    					sc.ChangeState(SCE_METAPOST_TEXT) ;
+						}
+					} else {
+						if (keywords && keywords.InList(key)) {
+    						sc.ChangeState(SCE_METAPOST_COMMAND) ;
+						} else if (keywords2 && keywords2.InList(key)) {
+							sc.ChangeState(SCE_METAPOST_EXTRA) ;
+						} else {
+							sc.ChangeState(SCE_METAPOST_TEXT) ;
+						}
+					}
+				}
+			}
+			if (isMETAPOSTcomment(sc.ch)) {
+				if (! inTeX) {
+					sc.SetState(SCE_METAPOST_SYMBOL) ;
+					sc.ForwardSetState(SCE_METAPOST_DEFAULT) ;
+					inComment = ! processComment ;
+				} else {
+					sc.SetState(SCE_METAPOST_TEXT) ;
+				}
+			} else if (isMETAPOSTstring(sc.ch)) {
+				if (! inTeX) {
+					sc.SetState(SCE_METAPOST_SPECIAL) ;
+					if (! isMETAPOSTstring(sc.chNext)) {
+						sc.ForwardSetState(SCE_METAPOST_TEXT) ;
+					}
+					inString = true ;
+				} else {
+					sc.SetState(SCE_METAPOST_TEXT) ;
+				}
+			} else if (isMETAPOSTcolon(sc.ch)) {
+				if (! inTeX) {
+					if (! isMETAPOSTequal(sc.chNext)) {
+						sc.SetState(SCE_METAPOST_COMMAND) ;
+						inClause = true ;
+					} else {
+						sc.SetState(SCE_METAPOST_SPECIAL) ;
+					}
+				} else {
+					sc.SetState(SCE_METAPOST_TEXT) ;
+				}
+			} else if (isMETAPOSTone(sc.ch)) {
+				if (! inTeX) {
+					sc.SetState(SCE_METAPOST_SPECIAL) ;
+				} else {
+					sc.SetState(SCE_METAPOST_TEXT) ;
+				}
+			} else if (isMETAPOSTtwo(sc.ch)) {
+				if (! inTeX) {
+					sc.SetState(SCE_METAPOST_GROUP) ;
+				} else {
+					sc.SetState(SCE_METAPOST_TEXT) ;
+				}
+			} else if (isMETAPOSTthree(sc.ch)) {
+				if (! inTeX) {
+					sc.SetState(SCE_METAPOST_SYMBOL) ;
+				} else {
+					sc.SetState(SCE_METAPOST_TEXT) ;
+				}
+			} else if (isMETAPOSTidentifier(sc.ch)) {
+				if (sc.state != SCE_METAPOST_COMMAND) {
+					sc.SetState(SCE_METAPOST_TEXT) ;
+					sc.ChangeState(SCE_METAPOST_COMMAND) ;
+				}
+			} else if (isMETAPOSTnumber(sc.ch)) {
+				// rather redundant since for the moment we don't handle numbers
+				sc.SetState(SCE_METAPOST_TEXT) ;
+			} else if (sc.atLineEnd) {
+				sc.SetState(SCE_METAPOST_TEXT) ;
+				inTeX = false ;
+				inComment = false ;
+				inClause = false ;
+				inString = false ;
+			} else {
+				sc.SetState(SCE_METAPOST_TEXT) ;
+			}
+		}
+
+	}
+
+	sc.Complete();
+
+}
+
+// Hooks info the system:
+
+static const char * const metapostWordListDesc[] = {
+	"MetaPost",
+	"MetaFun",
+	0
+} ;
+
+static int classifyFoldPointMetapost(const char* s,WordList *keywordlists[]) {
+	WordList& keywordsStart=*keywordlists[3];
+	WordList& keywordsStop1=*keywordlists[4];
+	
+	if (keywordsStart.InList(s)) {return 1;}
+	else if (keywordsStop1.InList(s)) {return -1;}
+	return 0;
+	
+}
+
+static int ParseMetapostWord(unsigned int pos, Accessor &styler, char *word)
+{
+  int length=0;
+  char ch=styler.SafeGetCharAt(pos);
+  *word=0;
+
+  while(isMETAPOSTidentifier(ch) && isalpha(ch) && length<100){
+          word[length]=ch;
+          length++;
+          ch=styler.SafeGetCharAt(pos+length);
+  }
+  word[length]=0;   
+  return length;
+}
+ 
+static void FoldMetapostDoc(unsigned int startPos, int length, int, WordList *keywordlists[], Accessor &styler) 
+{
+	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	unsigned int endPos = startPos+length;
+	int visibleChars=0;
+	int lineCurrent=styler.GetLine(startPos);
+	int levelPrev=styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
+	int levelCurrent=levelPrev;
+	char chNext=styler[startPos];
+	
+	char buffer[100]="";
+	
+	for (unsigned int i=startPos; i < endPos; i++) {
+		char ch=chNext;
+		chNext=styler.SafeGetCharAt(i+1);
+		char chPrev=styler.SafeGetCharAt(i-1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+
+		if(i==0 || chPrev == '\r' || chPrev=='\n'|| chPrev==' '|| chPrev=='(' || chPrev=='$')
+		{
+            ParseMetapostWord(i, styler, buffer);
+			levelCurrent += classifyFoldPointMetapost(buffer,keywordlists);
+		}
+		
+		if (atEOL) {
+			int lev = levelPrev;
+			if (visibleChars == 0 && foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if ((levelCurrent > levelPrev) && (visibleChars > 0))
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelPrev = levelCurrent;
+			visibleChars = 0;
+		}
+
+		if (!isspacechar(ch))
+			visibleChars++;
+	}
+	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
+	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
+
+}
+
+
+LexerModule lmMETAPOST(SCLEX_METAPOST, ColouriseMETAPOSTDoc, "metapost", FoldMetapostDoc, metapostWordListDesc);
diff --git a/Documents/Scintilla/LexMySQL.cxx b/Documents/Scintilla/LexMySQL.cxx
new file mode 100644
index 0000000..742ff43
--- /dev/null
+++ b/Documents/Scintilla/LexMySQL.cxx
@@ -0,0 +1,367 @@
+// Scintilla source code edit control
+/** @file LexMySQL.cxx
+ ** Lexer for MySQL
+ **/
+// Adopted from LexSQL.cxx by Anders Karlsson <anders@mysql.com>
+// Original work by Neil Hodgson <neilh@scintilla.org>
+// Copyright 1998-2005 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+static inline bool IsAWordChar(int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '_');
+}
+
+static inline bool IsAWordStart(int ch) {
+	return (ch < 0x80) && (isalpha(ch) || ch == '_');
+}
+
+static inline bool IsADoxygenChar(int ch) {
+	return (islower(ch) || ch == '$' || ch == '@' ||
+	        ch == '\\' || ch == '&' || ch == '<' ||
+	        ch == '>' || ch == '#' || ch == '{' ||
+	        ch == '}' || ch == '[' || ch == ']');
+}
+
+static inline bool IsANumberChar(int ch) {
+	// Not exactly following number definition (several dots are seen as OK, etc.)
+	// but probably enough in most cases.
+	return (ch < 0x80) &&
+	        (isdigit(ch) || toupper(ch) == 'E' ||
+             ch == '.' || ch == '-' || ch == '+');
+}
+
+static void ColouriseMySQLDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
+                            Accessor &styler) {
+
+	WordList &major_keywords = *keywordlists[0];
+	WordList &keywords = *keywordlists[1];
+	WordList &database_objects = *keywordlists[2];
+	WordList &functions = *keywordlists[3];
+	WordList &system_variables = *keywordlists[4];
+	WordList &procedure_keywords = *keywordlists[5];
+	WordList &kw_user1 = *keywordlists[6];
+	WordList &kw_user2 = *keywordlists[7];
+	WordList &kw_user3 = *keywordlists[8];
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	for (; sc.More(); sc.Forward()) {
+		// Determine if the current state should terminate.
+		switch (sc.state) {
+		case SCE_MYSQL_OPERATOR:
+			sc.SetState(SCE_MYSQL_DEFAULT);
+			break;
+		case SCE_MYSQL_NUMBER:
+			// We stop the number definition on non-numerical non-dot non-eE non-sign char
+			if (!IsANumberChar(sc.ch)) {
+				sc.SetState(SCE_MYSQL_DEFAULT);
+			}
+			break;
+		case SCE_MYSQL_IDENTIFIER:
+			if (!IsAWordChar(sc.ch)) {
+				int nextState = SCE_MYSQL_DEFAULT;
+				char s[1000];
+				sc.GetCurrentLowered(s, sizeof(s));
+				if (major_keywords.InList(s)) {
+					sc.ChangeState(SCE_MYSQL_MAJORKEYWORD);
+				} else if (keywords.InList(s)) {
+					sc.ChangeState(SCE_MYSQL_KEYWORD);
+				} else if (database_objects.InList(s)) {
+					sc.ChangeState(SCE_MYSQL_DATABASEOBJECT);
+				} else if (functions.InList(s)) {
+					sc.ChangeState(SCE_MYSQL_FUNCTION);
+				} else if (procedure_keywords.InList(s)) {
+					sc.ChangeState(SCE_MYSQL_PROCEDUREKEYWORD);
+				} else if (kw_user1.InList(s)) {
+					sc.ChangeState(SCE_MYSQL_USER1);
+				} else if (kw_user2.InList(s)) {
+					sc.ChangeState(SCE_MYSQL_USER2);
+				} else if (kw_user3.InList(s)) {
+					sc.ChangeState(SCE_MYSQL_USER3);
+				}
+				sc.SetState(nextState);
+			}
+			break;
+		case SCE_MYSQL_VARIABLE:
+			if (!IsAWordChar(sc.ch)) {
+				sc.SetState(SCE_MYSQL_DEFAULT);
+			}
+			break;
+		case SCE_MYSQL_SYSTEMVARIABLE:
+			if (!IsAWordChar(sc.ch)) {
+				char s[1000];
+				sc.GetCurrentLowered(s, sizeof(s));
+// Check for known system variables here.
+				if (system_variables.InList(&s[2])) {
+					sc.ChangeState(SCE_MYSQL_KNOWNSYSTEMVARIABLE);
+				}
+				sc.SetState(SCE_MYSQL_DEFAULT);
+			}
+			break;
+		case SCE_MYSQL_QUOTEDIDENTIFIER:
+			if (sc.ch == 0x60) {
+				if (sc.chNext == 0x60) {
+					sc.Forward();	// Ignore it
+				} else {
+					sc.ForwardSetState(SCE_MYSQL_DEFAULT);
+				}
+			}
+			break;
+		case SCE_MYSQL_COMMENT:
+			if (sc.Match('*', '/')) {
+				sc.Forward();
+				sc.ForwardSetState(SCE_MYSQL_DEFAULT);
+			}
+			break;
+		case SCE_MYSQL_COMMENTLINE:
+			if (sc.atLineStart) {
+				sc.SetState(SCE_MYSQL_DEFAULT);
+			}
+			break;
+		case SCE_MYSQL_SQSTRING:
+			if (sc.ch == '\\') {
+				// Escape sequence
+				sc.Forward();
+			} else if (sc.ch == '\'') {
+				if (sc.chNext == '\'') {
+					sc.Forward();
+				} else {
+					sc.ChangeState(SCE_MYSQL_STRING);
+					sc.ForwardSetState(SCE_MYSQL_DEFAULT);
+				}
+			}
+			break;
+		case SCE_MYSQL_DQSTRING:
+			if (sc.ch == '\\') {
+				// Escape sequence
+				sc.Forward();
+			} else if (sc.ch == '\"') {
+				if (sc.chNext == '\"') {
+					sc.Forward();
+				} else {
+					sc.ChangeState(SCE_MYSQL_STRING);
+					sc.ForwardSetState(SCE_MYSQL_DEFAULT);
+				}
+			}
+			break;
+		}
+
+		// Determine if a new state should be entered.
+		if (sc.state == SCE_MYSQL_DEFAULT) {
+			if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
+				sc.SetState(SCE_MYSQL_NUMBER);
+			} else if (IsAWordStart(sc.ch)) {
+				sc.SetState(SCE_MYSQL_IDENTIFIER);
+// Note that the order of SYSTEMVARIABLE and VARIABLE is important here.
+			} else if (sc.ch == 0x40 && sc.chNext == 0x40) {
+				sc.SetState(SCE_MYSQL_SYSTEMVARIABLE);
+				sc.Forward(); // Skip past the second at-sign.
+			} else if (sc.ch == 0x40) {
+				sc.SetState(SCE_MYSQL_VARIABLE);
+			} else if (sc.ch == 0x60) {
+				sc.SetState(SCE_MYSQL_QUOTEDIDENTIFIER);
+			} else if (sc.Match('/', '*')) {
+				sc.SetState(SCE_MYSQL_COMMENT);
+				sc.Forward();	// Eat the * so it isn't used for the end of the comment
+			} else if (sc.Match('-', '-') || sc.Match('#')) {
+				sc.SetState(SCE_MYSQL_COMMENTLINE);
+			} else if (sc.ch == '\'') {
+				sc.SetState(SCE_MYSQL_SQSTRING);
+			} else if (sc.ch == '\"') {
+				sc.SetState(SCE_MYSQL_DQSTRING);
+			} else if (isoperator(static_cast<char>(sc.ch))) {
+				sc.SetState(SCE_MYSQL_OPERATOR);
+			}
+		}
+	}
+	sc.Complete();
+}
+
+static bool IsStreamCommentStyle(int style) {
+	return style == SCE_MYSQL_COMMENT;
+}
+
+// Store both the current line's fold level and the next lines in the
+// level store to make it easy to pick up with each increment.
+static void FoldMySQLDoc(unsigned int startPos, int length, int initStyle,
+                            WordList *[], Accessor &styler) {
+	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
+	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	bool foldOnlyBegin = styler.GetPropertyInt("fold.sql.only.begin", 0) != 0;
+
+	unsigned int endPos = startPos + length;
+	int visibleChars = 0;
+	int lineCurrent = styler.GetLine(startPos);
+	int levelCurrent = SC_FOLDLEVELBASE;
+	if (lineCurrent > 0) {
+		levelCurrent = styler.LevelAt(lineCurrent - 1) >> 16;
+	}
+	int levelNext = levelCurrent;
+	char chNext = styler[startPos];
+	int styleNext = styler.StyleAt(startPos);
+	int style = initStyle;
+	bool endFound = false;
+	bool whenFound = false;
+	bool elseFound = false;
+	for (unsigned int i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int stylePrev = style;
+		style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+		if (foldComment && IsStreamCommentStyle(style)) {
+			if (!IsStreamCommentStyle(stylePrev)) {
+				levelNext++;
+			} else if (!IsStreamCommentStyle(styleNext) && !atEOL) {
+				// Comments don't end at end of line and the next character may be unstyled.
+				levelNext--;
+			}
+		}
+		if (foldComment && (style == SCE_MYSQL_COMMENTLINE)) {
+			// MySQL needs -- comments to be followed by space or control char
+			if ((ch == '-') && (chNext == '-')) {
+				char chNext2 = styler.SafeGetCharAt(i + 2);
+				char chNext3 = styler.SafeGetCharAt(i + 3);
+				if (chNext2 == '{' || chNext3 == '{') {
+					levelNext++;
+				} else if (chNext2 == '}' || chNext3 == '}') {
+					levelNext--;
+				}
+			}
+		}
+		if (style == SCE_MYSQL_OPERATOR) {
+			if (ch == '(') {
+				levelNext++;
+			} else if (ch == ')') {
+				levelNext--;
+			}
+		}
+
+// Style new keywords here.
+		if ((style == SCE_MYSQL_MAJORKEYWORD && stylePrev != SCE_MYSQL_MAJORKEYWORD)
+		  || (style == SCE_MYSQL_KEYWORD && stylePrev != SCE_MYSQL_KEYWORD)
+		  || (style == SCE_MYSQL_PROCEDUREKEYWORD && stylePrev != SCE_MYSQL_PROCEDUREKEYWORD)) {
+			const int MAX_KW_LEN = 6;	// Maximum length of folding keywords
+			char s[MAX_KW_LEN + 2];
+			unsigned int j = 0;
+			for (; j < MAX_KW_LEN + 1; j++) {
+				if (!iswordchar(styler[i + j])) {
+					break;
+				}
+				s[j] = static_cast<char>(tolower(styler[i + j]));
+			}
+			if (j == MAX_KW_LEN + 1) {
+				// Keyword too long, don't test it
+				s[0] = '\0';
+			} else {
+				s[j] = '\0';
+			}
+			if (!foldOnlyBegin && endFound && (strcmp(s, "if") == 0 || strcmp(s, "while") == 0 || strcmp(s, "loop") == 0)) {
+				endFound = false;
+				levelNext--;
+				if (levelNext < SC_FOLDLEVELBASE) {
+					levelNext = SC_FOLDLEVELBASE;
+				}
+// Note that else is special here. It may or may be followed by an if then, but in aly case the level stays the
+// same. When followed by a if .. then, the level will be increased later, if not, at eol.
+			} else if (!foldOnlyBegin && strcmp(s, "else") == 0) {
+				levelNext--;
+				elseFound = true;
+			} else if (!foldOnlyBegin && strcmp(s, "then") == 0) {
+				if(whenFound) {
+					whenFound = false;
+				} else {
+					levelNext++;
+				}
+			} else if (strcmp(s, "if") == 0) {
+				elseFound = false;
+			} else if (strcmp(s, "when") == 0) {
+				whenFound = true;
+			} else if (strcmp(s, "begin") == 0) {
+				levelNext++;
+			} else if (!foldOnlyBegin && (strcmp(s, "loop") == 0 || strcmp(s, "repeat") == 0
+			  || strcmp(s, "while") == 0)) {
+				if(endFound) {
+					endFound = false;
+				} else {
+					levelNext++;
+				}
+			} else if (strcmp(s, "end") == 0) {
+// Multiple END in a row are counted multiple times!
+				if (endFound) {
+					levelNext--;
+					if (levelNext < SC_FOLDLEVELBASE) {
+						levelNext = SC_FOLDLEVELBASE;
+					}
+				}
+				endFound = true;
+				whenFound = false;
+			}
+		}
+// Handle this for a trailing end withiut an if / while etc, as in the case of a begin.
+		if (endFound) {
+			endFound = false;
+			levelNext--;
+			if (levelNext < SC_FOLDLEVELBASE) {
+				levelNext = SC_FOLDLEVELBASE;
+			}
+		}
+		if (atEOL) {
+			if(elseFound)
+				levelNext++;
+			elseFound = false;
+
+			int levelUse = levelCurrent;
+			int lev = levelUse | levelNext << 16;
+			if (visibleChars == 0 && foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if (levelUse < levelNext)
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelCurrent = levelNext;
+			visibleChars = 0;
+			endFound = false;
+			whenFound = false;
+		}
+		if (!isspacechar(ch)) {
+			visibleChars++;
+		}
+	}
+}
+
+static const char * const mysqlWordListDesc[] = {
+	"Major Keywords",
+	"Keywords",
+	"Database Objects",
+	"Functions",
+	"System Variables",
+	"Procedure keywords",
+	"User Keywords 1",
+	"User Keywords 2",
+	"User Keywords 3"
+};
+
+LexerModule lmMySQL(SCLEX_MYSQL, ColouriseMySQLDoc, "mysql", FoldMySQLDoc, mysqlWordListDesc);
diff --git a/Documents/Scintilla/LexNsis.cxx b/Documents/Scintilla/LexNsis.cxx
new file mode 100644
index 0000000..ab6304c
--- /dev/null
+++ b/Documents/Scintilla/LexNsis.cxx
@@ -0,0 +1,654 @@
+// Scintilla source code edit control
+/** @file LexNsis.cxx
+ ** Lexer for NSIS
+ **/
+// Copyright 2003 - 2005 by Angelo Mandato <angelo [at] spaceblue [dot] com>
+// Last Updated: 03/13/2005
+// The License.txt file describes the conditions under which this software may be distributed.
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+/*
+// located in SciLexer.h
+#define SCLEX_NSIS 43
+
+#define SCE_NSIS_DEFAULT 0
+#define SCE_NSIS_COMMENT 1
+#define SCE_NSIS_STRINGDQ 2
+#define SCE_NSIS_STRINGLQ 3
+#define SCE_NSIS_STRINGRQ 4
+#define SCE_NSIS_FUNCTION 5
+#define SCE_NSIS_VARIABLE 6
+#define SCE_NSIS_LABEL 7
+#define SCE_NSIS_USERDEFINED 8
+#define SCE_NSIS_SECTIONDEF 9
+#define SCE_NSIS_SUBSECTIONDEF 10
+#define SCE_NSIS_IFDEFINEDEF 11
+#define SCE_NSIS_MACRODEF 12
+#define SCE_NSIS_STRINGVAR 13
+#define SCE_NSIS_NUMBER 14
+// ADDED for Scintilla v1.63
+#define SCE_NSIS_SECTIONGROUP 15
+#define SCE_NSIS_PAGEEX 16
+#define SCE_NSIS_FUNCTIONDEF 17
+#define SCE_NSIS_COMMENTBOX 18
+*/
+
+static bool isNsisNumber(char ch)
+{
+  return (ch >= '0' && ch <= '9');
+}
+
+static bool isNsisChar(char ch)
+{
+  return (ch == '.' ) || (ch == '_' ) || isNsisNumber(ch) || (ch >= 'A' && ch <= 'Z') || (ch >= 'a' && ch <= 'z');
+}
+
+static bool isNsisLetter(char ch)
+{
+  return (ch >= 'A' && ch <= 'Z') || (ch >= 'a' && ch <= 'z');
+}
+
+static bool NsisNextLineHasElse(unsigned int start, unsigned int end, Accessor &styler)
+{
+  int nNextLine = -1;
+  for( unsigned int i = start; i < end; i++ )
+  {
+    char cNext = styler.SafeGetCharAt( i );
+    if( cNext == '\n' )
+    {
+      nNextLine = i+1;
+      break;
+    }
+  }
+
+  if( nNextLine == -1 ) // We never foudn the next line...
+    return false;
+
+  for( unsigned int firstChar = nNextLine; firstChar < end; firstChar++ )
+  {
+    char cNext = styler.SafeGetCharAt( firstChar );
+    if( cNext == ' ' )
+      continue;
+    if( cNext == '\t' )
+      continue;
+    if( cNext == '!' )
+    {
+      if( styler.Match(firstChar, "!else") )
+        return true;
+    }
+    break;
+  }
+
+  return false;
+}
+
+static int NsisCmp( const char *s1, const char *s2, bool bIgnoreCase )
+{
+  if( bIgnoreCase )
+     return CompareCaseInsensitive( s1, s2);
+
+  return strcmp( s1, s2 );
+}
+
+static int calculateFoldNsis(unsigned int start, unsigned int end, int foldlevel, Accessor &styler, bool bElse, bool foldUtilityCmd )
+{
+  int style = styler.StyleAt(end);
+
+  // If the word is too long, it is not what we are looking for
+  if( end - start > 20 )
+    return foldlevel;
+
+  if( foldUtilityCmd )
+  {
+    // Check the style at this point, if it is not valid, then return zero
+    if( style != SCE_NSIS_FUNCTIONDEF && style != SCE_NSIS_SECTIONDEF &&
+        style != SCE_NSIS_SUBSECTIONDEF && style != SCE_NSIS_IFDEFINEDEF &&
+        style != SCE_NSIS_MACRODEF && style != SCE_NSIS_SECTIONGROUP &&
+        style != SCE_NSIS_PAGEEX )
+          return foldlevel;
+  }
+  else
+  {
+    if( style != SCE_NSIS_FUNCTIONDEF && style != SCE_NSIS_SECTIONDEF &&
+        style != SCE_NSIS_SUBSECTIONDEF && style != SCE_NSIS_SECTIONGROUP &&
+        style != SCE_NSIS_PAGEEX )
+          return foldlevel;
+  }
+
+  int newFoldlevel = foldlevel;
+  bool bIgnoreCase = false;
+  if( styler.GetPropertyInt("nsis.ignorecase") == 1 )
+    bIgnoreCase = true;
+
+  char s[20]; // The key word we are looking for has atmost 13 characters
+  for (unsigned int i = 0; i < end - start + 1 && i < 19; i++)
+	{
+		s[i] = static_cast<char>( styler[ start + i ] );
+		s[i + 1] = '\0';
+	}
+
+  if( s[0] == '!' )
+  {
+    if( NsisCmp(s, "!ifndef", bIgnoreCase) == 0 || NsisCmp(s, "!ifdef", bIgnoreCase ) == 0 || NsisCmp(s, "!if", bIgnoreCase ) == 0 || NsisCmp(s, "!macro", bIgnoreCase ) == 0 )
+      newFoldlevel++;
+    else if( NsisCmp(s, "!endif", bIgnoreCase) == 0 || NsisCmp(s, "!macroend", bIgnoreCase ) == 0 )
+      newFoldlevel--;
+    else if( bElse && NsisCmp(s, "!else", bIgnoreCase) == 0 )
+      newFoldlevel++;
+  }
+  else
+  {
+    if( NsisCmp(s, "Section", bIgnoreCase ) == 0 || NsisCmp(s, "SectionGroup", bIgnoreCase ) == 0 || NsisCmp(s, "Function", bIgnoreCase) == 0 || NsisCmp(s, "SubSection", bIgnoreCase ) == 0 || NsisCmp(s, "PageEx", bIgnoreCase ) == 0 )
+      newFoldlevel++;
+    else if( NsisCmp(s, "SectionGroupEnd", bIgnoreCase ) == 0 || NsisCmp(s, "SubSectionEnd", bIgnoreCase ) == 0 || NsisCmp(s, "FunctionEnd", bIgnoreCase) == 0 || NsisCmp(s, "SectionEnd", bIgnoreCase ) == 0 || NsisCmp(s, "PageExEnd", bIgnoreCase ) == 0 )
+      newFoldlevel--;
+  }
+
+  return newFoldlevel;
+}
+
+static int classifyWordNsis(unsigned int start, unsigned int end, WordList *keywordLists[], Accessor &styler )
+{
+  bool bIgnoreCase = false;
+  if( styler.GetPropertyInt("nsis.ignorecase") == 1 )
+    bIgnoreCase = true;
+
+  bool bUserVars = false;
+  if( styler.GetPropertyInt("nsis.uservars") == 1 )
+    bUserVars = true;
+
+	char s[100];
+
+	WordList &Functions = *keywordLists[0];
+	WordList &Variables = *keywordLists[1];
+	WordList &Lables = *keywordLists[2];
+	WordList &UserDefined = *keywordLists[3];
+
+	for (unsigned int i = 0; i < end - start + 1 && i < 99; i++)
+	{
+    if( bIgnoreCase )
+      s[i] = static_cast<char>( tolower(styler[ start + i ] ) );
+    else
+		  s[i] = static_cast<char>( styler[ start + i ] );
+		s[i + 1] = '\0';
+	}
+
+	// Check for special words...
+	if( NsisCmp(s, "!macro", bIgnoreCase ) == 0 || NsisCmp(s, "!macroend", bIgnoreCase) == 0 ) // Covers !micro and !microend
+		return SCE_NSIS_MACRODEF;
+
+	if( NsisCmp(s, "!ifdef", bIgnoreCase ) == 0 ||  NsisCmp(s, "!ifndef", bIgnoreCase) == 0 ||  NsisCmp(s, "!endif", bIgnoreCase) == 0 )
+		return SCE_NSIS_IFDEFINEDEF;
+
+  if( NsisCmp(s, "!else", bIgnoreCase ) == 0 ) // ||  NsisCmp(s, "!ifndef", bIgnoreCase) == 0 ||  NsisCmp(s, "!endif", bIgnoreCase) == 0 )
+		return SCE_NSIS_IFDEFINEDEF;
+
+  if( NsisCmp(s, "!if", bIgnoreCase ) == 0 )
+		return SCE_NSIS_IFDEFINEDEF;
+
+  if( NsisCmp(s, "SectionGroup", bIgnoreCase) == 0 || NsisCmp(s, "SectionGroupEnd", bIgnoreCase) == 0 ) // Covers SectionGroup and SectionGroupEnd
+    return SCE_NSIS_SECTIONGROUP;
+
+	if( NsisCmp(s, "Section", bIgnoreCase ) == 0 || NsisCmp(s, "SectionEnd", bIgnoreCase) == 0 ) // Covers Section and SectionEnd
+		return SCE_NSIS_SECTIONDEF;
+
+	if( NsisCmp(s, "SubSection", bIgnoreCase) == 0 || NsisCmp(s, "SubSectionEnd", bIgnoreCase) == 0 ) // Covers SubSection and SubSectionEnd
+		return SCE_NSIS_SUBSECTIONDEF;
+
+  if( NsisCmp(s, "PageEx", bIgnoreCase) == 0 || NsisCmp(s, "PageExEnd", bIgnoreCase) == 0 ) // Covers PageEx and PageExEnd
+    return SCE_NSIS_PAGEEX;
+
+	if( NsisCmp(s, "Function", bIgnoreCase) == 0 || NsisCmp(s, "FunctionEnd", bIgnoreCase) == 0 ) // Covers Function and FunctionEnd
+		return SCE_NSIS_FUNCTIONDEF;
+
+	if ( Functions.InList(s) )
+		return SCE_NSIS_FUNCTION;
+
+	if ( Variables.InList(s) )
+		return SCE_NSIS_VARIABLE;
+
+	if ( Lables.InList(s) )
+		return SCE_NSIS_LABEL;
+
+	if( UserDefined.InList(s) )
+		return SCE_NSIS_USERDEFINED;
+
+	if( strlen(s) > 3 )
+	{
+		if( s[1] == '{' && s[strlen(s)-1] == '}' )
+			return SCE_NSIS_VARIABLE;
+	}
+
+  // See if the variable is a user defined variable
+  if( s[0] == '$' && bUserVars )
+  {
+    bool bHasSimpleNsisChars = true;
+    for (unsigned int j = 1; j < end - start + 1 && j < 99; j++)
+	  {
+      if( !isNsisChar( s[j] ) )
+      {
+        bHasSimpleNsisChars = false;
+        break;
+      }
+	  }
+
+    if( bHasSimpleNsisChars )
+      return SCE_NSIS_VARIABLE;
+  }
+
+  // To check for numbers
+  if( isNsisNumber( s[0] ) )
+  {
+    bool bHasSimpleNsisNumber = true;
+    for (unsigned int j = 1; j < end - start + 1 && j < 99; j++)
+	  {
+      if( !isNsisNumber( s[j] ) )
+      {
+        bHasSimpleNsisNumber = false;
+        break;
+      }
+	  }
+
+    if( bHasSimpleNsisNumber )
+      return SCE_NSIS_NUMBER;
+  }
+
+	return SCE_NSIS_DEFAULT;
+}
+
+static void ColouriseNsisDoc(unsigned int startPos, int length, int, WordList *keywordLists[], Accessor &styler)
+{
+	int state = SCE_NSIS_DEFAULT;
+  if( startPos > 0 )
+    state = styler.StyleAt(startPos-1); // Use the style from the previous line, usually default, but could be commentbox
+
+	styler.StartAt( startPos );
+	styler.GetLine( startPos );
+
+	unsigned int nLengthDoc = startPos + length;
+	styler.StartSegment( startPos );
+
+	char cCurrChar;
+	bool bVarInString = false;
+  bool bClassicVarInString = false;
+
+	unsigned int i;
+	for( i = startPos; i < nLengthDoc; i++ )
+	{
+		cCurrChar = styler.SafeGetCharAt( i );
+		char cNextChar = styler.SafeGetCharAt(i+1);
+
+		switch(state)
+		{
+			case SCE_NSIS_DEFAULT:
+				if( cCurrChar == ';' || cCurrChar == '#' ) // we have a comment line
+				{
+					styler.ColourTo(i-1, state );
+					state = SCE_NSIS_COMMENT;
+					break;
+				}
+				if( cCurrChar == '"' )
+				{
+					styler.ColourTo(i-1, state );
+					state = SCE_NSIS_STRINGDQ;
+					bVarInString = false;
+          bClassicVarInString = false;
+					break;
+				}
+				if( cCurrChar == '\'' )
+				{
+					styler.ColourTo(i-1, state );
+					state = SCE_NSIS_STRINGRQ;
+					bVarInString = false;
+          bClassicVarInString = false;
+					break;
+				}
+				if( cCurrChar == '`' )
+				{
+					styler.ColourTo(i-1, state );
+					state = SCE_NSIS_STRINGLQ;
+					bVarInString = false;
+          bClassicVarInString = false;
+					break;
+				}
+
+				// NSIS KeyWord,Function, Variable, UserDefined:
+				if( cCurrChar == '$' || isNsisChar(cCurrChar) || cCurrChar == '!' )
+				{
+					styler.ColourTo(i-1,state);
+				  state = SCE_NSIS_FUNCTION;
+
+          // If it is a number, we must check and set style here first...
+          if( isNsisNumber(cCurrChar) && (cNextChar == '\t' || cNextChar == ' ' || cNextChar == '\r' || cNextChar == '\n' ) )
+              styler.ColourTo( i, SCE_NSIS_NUMBER);
+
+					break;
+				}
+
+        if( cCurrChar == '/' && cNextChar == '*' )
+        {
+          styler.ColourTo(i-1,state);
+          state = SCE_NSIS_COMMENTBOX;
+          break;
+        }
+
+				break;
+			case SCE_NSIS_COMMENT:
+				if( cNextChar == '\n' || cNextChar == '\r' )
+        {
+          // Special case:
+          if( cCurrChar == '\\' )
+          {
+            styler.ColourTo(i-2,state);
+            styler.ColourTo(i,SCE_NSIS_DEFAULT);
+          }
+          else
+          {
+				    styler.ColourTo(i,state);
+            state = SCE_NSIS_DEFAULT;
+          }
+        }
+				break;
+			case SCE_NSIS_STRINGDQ:
+      case SCE_NSIS_STRINGLQ:
+      case SCE_NSIS_STRINGRQ:
+
+        if( styler.SafeGetCharAt(i-1) == '\\' && styler.SafeGetCharAt(i-2) == '$' )
+          break; // Ignore the next character, even if it is a quote of some sort
+
+        if( cCurrChar == '"' && state == SCE_NSIS_STRINGDQ )
+				{
+					styler.ColourTo(i,state);
+				  state = SCE_NSIS_DEFAULT;
+          break;
+				}
+
+        if( cCurrChar == '`' && state == SCE_NSIS_STRINGLQ )
+        {
+					styler.ColourTo(i,state);
+				  state = SCE_NSIS_DEFAULT;
+          break;
+				}
+
+        if( cCurrChar == '\'' && state == SCE_NSIS_STRINGRQ )
+				{
+					styler.ColourTo(i,state);
+				  state = SCE_NSIS_DEFAULT;
+          break;
+				}
+
+        if( cNextChar == '\r' || cNextChar == '\n' )
+        {
+          int nCurLine = styler.GetLine(i+1);
+          int nBack = i;
+          // We need to check if the previous line has a \ in it...
+          bool bNextLine = false;
+
+          while( nBack > 0 )
+          {
+            if( styler.GetLine(nBack) != nCurLine )
+              break;
+
+            char cTemp = styler.SafeGetCharAt(nBack, 'a'); // Letter 'a' is safe here
+
+            if( cTemp == '\\' )
+            {
+              bNextLine = true;
+              break;
+            }
+            if( cTemp != '\r' && cTemp != '\n' && cTemp != '\t' && cTemp != ' ' )
+              break;
+
+            nBack--;
+          }
+
+          if( bNextLine )
+          {
+            styler.ColourTo(i+1,state);
+          }
+          if( bNextLine == false )
+          {
+            styler.ColourTo(i,state);
+				    state = SCE_NSIS_DEFAULT;
+          }
+        }
+				break;
+
+			case SCE_NSIS_FUNCTION:
+
+				// NSIS KeyWord:
+        if( cCurrChar == '$' )
+          state = SCE_NSIS_DEFAULT;
+        else if( cCurrChar == '\\' && (cNextChar == 'n' || cNextChar == 'r' || cNextChar == 't' ) )
+          state = SCE_NSIS_DEFAULT;
+				else if( (isNsisChar(cCurrChar) && !isNsisChar( cNextChar) && cNextChar != '}') || cCurrChar == '}' )
+				{
+					state = classifyWordNsis( styler.GetStartSegment(), i, keywordLists, styler );
+					styler.ColourTo( i, state);
+					state = SCE_NSIS_DEFAULT;
+				}
+				else if( !isNsisChar( cCurrChar ) && cCurrChar != '{' && cCurrChar != '}' )
+				{
+          if( classifyWordNsis( styler.GetStartSegment(), i-1, keywordLists, styler) == SCE_NSIS_NUMBER )
+             styler.ColourTo( i-1, SCE_NSIS_NUMBER );
+
+					state = SCE_NSIS_DEFAULT;
+
+					if( cCurrChar == '"' )
+					{
+						state = SCE_NSIS_STRINGDQ;
+						bVarInString = false;
+            bClassicVarInString = false;
+					}
+					else if( cCurrChar == '`' )
+					{
+						state = SCE_NSIS_STRINGLQ;
+						bVarInString = false;
+            bClassicVarInString = false;
+					}
+					else if( cCurrChar == '\'' )
+					{
+						state = SCE_NSIS_STRINGRQ;
+						bVarInString = false;
+            bClassicVarInString = false;
+					}
+					else if( cCurrChar == '#' || cCurrChar == ';' )
+          {
+						state = SCE_NSIS_COMMENT;
+          }
+				}
+				break;
+      case SCE_NSIS_COMMENTBOX:
+
+        if( styler.SafeGetCharAt(i-1) == '*' && cCurrChar == '/' )
+        {
+          styler.ColourTo(i,state);
+          state = SCE_NSIS_DEFAULT;
+        }
+        break;
+		}
+
+		if( state == SCE_NSIS_COMMENT || state == SCE_NSIS_COMMENTBOX )
+		{
+			styler.ColourTo(i,state);
+		}
+		else if( state == SCE_NSIS_STRINGDQ || state == SCE_NSIS_STRINGLQ || state == SCE_NSIS_STRINGRQ )
+		{
+      bool bIngoreNextDollarSign = false;
+      bool bUserVars = false;
+      if( styler.GetPropertyInt("nsis.uservars") == 1 )
+        bUserVars = true;
+
+      if( bVarInString && cCurrChar == '$' )
+      {
+        bVarInString = false;
+        bIngoreNextDollarSign = true;
+      }
+      else if( bVarInString && cCurrChar == '\\' && (cNextChar == 'n' || cNextChar == 'r' || cNextChar == 't' || cNextChar == '"' || cNextChar == '`' || cNextChar == '\'' ) )
+      {
+        styler.ColourTo( i+1, SCE_NSIS_STRINGVAR);
+        bVarInString = false;
+        bIngoreNextDollarSign = false;
+      }
+
+      // Covers "$INSTDIR and user vars like $MYVAR"
+      else if( bVarInString && !isNsisChar(cNextChar) )
+      {
+        int nWordState = classifyWordNsis( styler.GetStartSegment(), i, keywordLists, styler);
+				if( nWordState == SCE_NSIS_VARIABLE )
+					styler.ColourTo( i, SCE_NSIS_STRINGVAR);
+        else if( bUserVars )
+          styler.ColourTo( i, SCE_NSIS_STRINGVAR);
+        bVarInString = false;
+      }
+      // Covers "${TEST}..."
+      else if( bClassicVarInString && cNextChar == '}' )
+      {
+        styler.ColourTo( i+1, SCE_NSIS_STRINGVAR);
+				bClassicVarInString = false;
+      }
+
+      // Start of var in string
+			if( !bIngoreNextDollarSign && cCurrChar == '$' && cNextChar == '{' )
+			{
+				styler.ColourTo( i-1, state);
+				bClassicVarInString = true;
+        bVarInString = false;
+			}
+      else if( !bIngoreNextDollarSign && cCurrChar == '$' )
+      {
+        styler.ColourTo( i-1, state);
+        bVarInString = true;
+        bClassicVarInString = false;
+      }
+		}
+	}
+
+  // Colourise remaining document
+	styler.ColourTo(nLengthDoc-1,state);
+}
+
+static void FoldNsisDoc(unsigned int startPos, int length, int, WordList *[], Accessor &styler)
+{
+	// No folding enabled, no reason to continue...
+	if( styler.GetPropertyInt("fold") == 0 )
+		return;
+
+  bool foldAtElse = styler.GetPropertyInt("fold.at.else", 0) == 1;
+  bool foldUtilityCmd = styler.GetPropertyInt("nsis.foldutilcmd", 1) == 1;
+  bool blockComment = false;
+
+  int lineCurrent = styler.GetLine(startPos);
+  unsigned int safeStartPos = styler.LineStart( lineCurrent );
+
+  bool bArg1 = true;
+  int nWordStart = -1;
+
+  int levelCurrent = SC_FOLDLEVELBASE;
+	if (lineCurrent > 0)
+		levelCurrent = styler.LevelAt(lineCurrent-1) >> 16;
+	int levelNext = levelCurrent;
+  int style = styler.StyleAt(safeStartPos);
+  if( style == SCE_NSIS_COMMENTBOX )
+  {
+    if( styler.SafeGetCharAt(safeStartPos) == '/' && styler.SafeGetCharAt(safeStartPos+1) == '*' )
+      levelNext++;
+    blockComment = true;
+  }
+
+  for (unsigned int i = safeStartPos; i < startPos + length; i++)
+	{
+    char chCurr = styler.SafeGetCharAt(i);
+    style = styler.StyleAt(i);
+    if( blockComment && style != SCE_NSIS_COMMENTBOX )
+    {
+      levelNext--;
+      blockComment = false;
+    }
+    else if( !blockComment && style == SCE_NSIS_COMMENTBOX )
+    {
+      levelNext++;
+      blockComment = true;
+    }
+
+    if( bArg1 && !blockComment)
+    {
+      if( nWordStart == -1 && (isNsisLetter(chCurr) || chCurr == '!') )
+      {
+        nWordStart = i;
+      }
+      else if( isNsisLetter(chCurr) == false && nWordStart > -1 )
+      {
+        int newLevel = calculateFoldNsis( nWordStart, i-1, levelNext, styler, foldAtElse, foldUtilityCmd );
+
+        if( newLevel == levelNext )
+        {
+          if( foldAtElse && foldUtilityCmd )
+          {
+            if( NsisNextLineHasElse(i, startPos + length, styler) )
+              levelNext--;
+          }
+        }
+        else
+          levelNext = newLevel;
+        bArg1 = false;
+      }
+    }
+
+    if( chCurr == '\n' )
+    {
+      if( bArg1 && foldAtElse && foldUtilityCmd && !blockComment )
+      {
+        if( NsisNextLineHasElse(i, startPos + length, styler) )
+          levelNext--;
+      }
+
+      // If we are on a new line...
+      int levelUse = levelCurrent;
+			int lev = levelUse | levelNext << 16;
+      if (levelUse < levelNext )
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent))
+				styler.SetLevel(lineCurrent, lev);
+
+			lineCurrent++;
+			levelCurrent = levelNext;
+      bArg1 = true; // New line, lets look at first argument again
+      nWordStart = -1;
+    }
+  }
+
+	int levelUse = levelCurrent;
+	int lev = levelUse | levelNext << 16;
+	if (levelUse < levelNext)
+		lev |= SC_FOLDLEVELHEADERFLAG;
+	if (lev != styler.LevelAt(lineCurrent))
+		styler.SetLevel(lineCurrent, lev);
+}
+
+static const char * const nsisWordLists[] = {
+	"Functions",
+	"Variables",
+	"Lables",
+	"UserDefined",
+	0, };
+
+
+LexerModule lmNsis(SCLEX_NSIS, ColouriseNsisDoc, "nsis", FoldNsisDoc, nsisWordLists);
+
diff --git a/Documents/Scintilla/LexOpal.cxx b/Documents/Scintilla/LexOpal.cxx
new file mode 100644
index 0000000..221f955
--- /dev/null
+++ b/Documents/Scintilla/LexOpal.cxx
@@ -0,0 +1,522 @@
+// Scintilla source code edit control
+/** @file LexOpal.cxx
+ ** Lexer for OPAL (functional language similar to Haskell)
+ ** Written by Sebastian Pipping <webmaster@hartwork.org>
+ **/
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+#include "StyleContext.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+inline static void getRange( unsigned int start, unsigned int end, Accessor & styler, char * s, unsigned int len )
+{
+	unsigned int i = 0;
+	while( ( i < end - start + 1 ) && ( i < len - 1 ) )
+	{
+		s[i] = static_cast<char>( styler[ start + i ] );
+		i++;
+	}
+	s[ i ] = '\0';
+}
+
+inline bool HandleString( unsigned int & cur, unsigned int one_too_much, Accessor & styler )
+{
+	char ch;
+
+	// Wait for string to close
+	bool even_backslash_count = true; // Without gaps in between
+	cur++; // Skip initial quote
+	for( ; ; )
+	{
+		if( cur >= one_too_much )
+		{
+			styler.ColourTo( cur - 1, SCE_OPAL_STRING );
+			return false; // STOP
+		}
+
+		ch = styler.SafeGetCharAt( cur );
+		if( ( ch == '\015' ) || ( ch == '\012' ) ) // Deny multi-line strings
+		{
+			styler.ColourTo( cur - 1, SCE_OPAL_STRING );
+			styler.StartSegment( cur );
+			return true;
+		}
+		else
+		{
+			if( even_backslash_count )
+			{
+				if( ch == '"' )
+				{
+					styler.ColourTo( cur, SCE_OPAL_STRING );
+					cur++;
+					if( cur >= one_too_much )
+					{
+						return false; // STOP
+					}
+					else
+					{
+						styler.StartSegment( cur );
+						return true;
+					}
+				}
+				else if( ch == '\\' )
+				{
+					even_backslash_count = false;
+				}
+			}
+			else
+			{
+				even_backslash_count = true;
+			}
+		}
+
+		cur++;
+	}
+}
+
+inline bool HandleCommentBlock( unsigned int & cur, unsigned int one_too_much, Accessor & styler, bool could_fail )
+{
+	char ch;
+	
+	if( could_fail )
+	{
+		cur++;
+		if( cur >= one_too_much )
+		{
+			styler.ColourTo( cur - 1, SCE_OPAL_DEFAULT );
+			return false; // STOP
+		}
+		
+		ch = styler.SafeGetCharAt( cur );
+		if( ch != '*' )
+		{
+			styler.ColourTo( cur - 1, SCE_OPAL_DEFAULT );
+			styler.StartSegment( cur );
+			return true;
+		}
+	}
+	
+	// Wait for comment close
+	cur++;
+	bool star_found = false;
+	for( ; ; )
+	{
+		if( cur >= one_too_much )
+		{
+			styler.ColourTo( cur - 1, SCE_OPAL_COMMENT_BLOCK );
+			return false; // STOP
+		}
+		
+		ch = styler.SafeGetCharAt( cur );
+		if( star_found )
+		{
+			if( ch == '/' )
+			{
+				styler.ColourTo( cur, SCE_OPAL_COMMENT_BLOCK );
+				cur++;
+				if( cur >= one_too_much )
+				{
+					return false; // STOP
+				}
+				else
+				{
+					styler.StartSegment( cur );
+					return true;
+				}
+			}
+			else if( ch != '*' )
+			{
+				star_found = false;
+			}
+		}
+		else if( ch == '*' )
+		{
+			star_found = true;
+		}
+		cur++;
+	}
+}
+
+inline bool HandleCommentLine( unsigned int & cur, unsigned int one_too_much, Accessor & styler, bool could_fail )
+{
+	char ch;
+	
+	if( could_fail )
+	{
+		cur++;
+		if( cur >= one_too_much )
+		{
+			styler.ColourTo( cur - 1, SCE_OPAL_DEFAULT );
+			return false; // STOP
+		}
+		
+		ch = styler.SafeGetCharAt( cur );
+		if( ch != '-' )
+		{
+			styler.ColourTo( cur - 1, SCE_OPAL_DEFAULT );
+			styler.StartSegment( cur );
+			return true;
+		}
+
+		cur++;
+		if( cur >= one_too_much )
+		{
+			styler.ColourTo( cur - 1, SCE_OPAL_DEFAULT );
+			return false; // STOP
+		}
+		
+		ch = styler.SafeGetCharAt( cur );
+		if( ( ch != ' ' ) && ( ch != '\t' ) )
+		{
+			styler.ColourTo( cur - 1, SCE_OPAL_DEFAULT );
+			styler.StartSegment( cur );
+			return true;
+		}
+	}
+
+	// Wait for end of line
+	bool fifteen_found = false;
+
+	for( ; ; )
+	{
+		cur++;
+
+		if( cur >= one_too_much )
+		{
+			styler.ColourTo( cur - 1, SCE_OPAL_COMMENT_LINE );
+			return false; // STOP
+		}
+
+		ch = styler.SafeGetCharAt( cur );
+		if( fifteen_found )
+		{
+/*
+			if( ch == '\012' )
+			{
+				// One newline on Windows (015, 012)
+			}
+			else
+			{
+				// One newline on MAC (015) and another char
+			}
+*/
+			cur--;
+			styler.ColourTo( cur - 1, SCE_OPAL_COMMENT_LINE );
+			styler.StartSegment( cur );
+			return true;
+		}
+		else
+		{
+			if( ch == '\015' )
+			{
+				fifteen_found = true;	
+			}
+			else if( ch == '\012' )
+			{
+				// One newline on Linux (012)
+				styler.ColourTo( cur - 1, SCE_OPAL_COMMENT_LINE );
+				styler.StartSegment( cur );
+				return true;
+			}
+		}
+	}
+}
+
+inline bool HandlePar( unsigned int & cur, Accessor & styler )
+{
+	styler.ColourTo( cur, SCE_OPAL_PAR );
+
+	cur++;
+
+	styler.StartSegment( cur );
+	return true;
+}
+
+inline bool HandleSpace( unsigned int & cur, unsigned int one_too_much, Accessor & styler )
+{
+	char ch;
+
+	cur++;
+	for( ; ; )
+	{
+		if( cur >= one_too_much )
+		{
+			styler.ColourTo( cur - 1, SCE_OPAL_SPACE );
+			return false;
+		}
+		
+		ch = styler.SafeGetCharAt( cur );
+		switch( ch )
+		{
+		case ' ':
+		case '\t':
+		case '\015':
+		case '\012':
+			cur++;
+			break;
+		
+		default:
+			styler.ColourTo( cur - 1, SCE_OPAL_SPACE );
+			styler.StartSegment( cur );
+			return true;
+		}
+	}
+}
+
+inline bool HandleInteger( unsigned int & cur, unsigned int one_too_much, Accessor & styler )
+{
+	char ch;
+
+	for( ; ; )
+	{
+		cur++;
+		if( cur >= one_too_much )
+		{
+			styler.ColourTo( cur - 1, SCE_OPAL_INTEGER );
+			return false; // STOP
+		}
+
+		ch = styler.SafeGetCharAt( cur );
+		if( !isdigit( ch ) )
+		{
+			styler.ColourTo( cur - 1, SCE_OPAL_INTEGER );
+			styler.StartSegment( cur );
+			return true;
+		}
+	}
+}
+
+inline bool HandleWord( unsigned int & cur, unsigned int one_too_much, Accessor & styler, WordList * keywordlists[] )
+{
+	char ch;
+	const unsigned int beg = cur;
+
+	cur++;
+	for( ; ; )
+	{
+		ch = styler.SafeGetCharAt( cur );
+		if( ( ch != '_' ) && ( ch != '-' ) &&
+			!islower( ch ) && !isupper( ch ) && !isdigit( ch ) ) break;
+
+		cur++;
+		if( cur >= one_too_much ) 
+		{
+			break;
+		}
+	}
+
+	const int ide_len = cur - beg + 1;
+	char * ide = new char[ ide_len ];
+	getRange( beg, cur, styler, ide, ide_len );
+	
+	WordList & keywords    = *keywordlists[ 0 ];
+	WordList & classwords  = *keywordlists[ 1 ];
+
+	if( keywords.InList( ide ) ) // Keyword
+	{
+		delete [] ide;
+
+		styler.ColourTo( cur - 1, SCE_OPAL_KEYWORD );
+		if( cur >= one_too_much )
+		{
+			return false; // STOP
+		}
+		else
+		{
+			styler.StartSegment( cur );	
+			return true;			
+		}
+	}
+	else if( classwords.InList( ide ) ) // Sort
+	{
+		delete [] ide;
+
+		styler.ColourTo( cur - 1, SCE_OPAL_SORT );
+		if( cur >= one_too_much )
+		{
+			return false; // STOP
+		}
+		else
+		{
+			styler.StartSegment( cur );	
+			return true;			
+		}
+	}
+	else if( !strcmp( ide, "true" ) || !strcmp( ide, "false" ) ) // Bool const
+	{
+		delete [] ide;
+
+		styler.ColourTo( cur - 1, SCE_OPAL_BOOL_CONST );
+		if( cur >= one_too_much )
+		{
+			return false; // STOP
+		}
+		else
+		{
+			styler.StartSegment( cur );	
+			return true;			
+		}
+	}
+	else // Unknown keyword
+	{
+		delete [] ide;
+
+		styler.ColourTo( cur - 1, SCE_OPAL_DEFAULT );
+		if( cur >= one_too_much )
+		{
+			return false; // STOP
+		}
+		else
+		{
+			styler.StartSegment( cur );
+			return true;			
+		}
+	}
+
+}
+
+inline bool HandleSkip( unsigned int & cur, unsigned int one_too_much, Accessor & styler )
+{
+	cur++;
+	styler.ColourTo( cur - 1, SCE_OPAL_DEFAULT );
+	if( cur >= one_too_much )
+	{
+		return false; // STOP
+	}
+	else
+	{
+		styler.StartSegment( cur );	
+		return true;
+	}
+}
+
+static void ColouriseOpalDoc( unsigned int startPos, int length, int initStyle, WordList *keywordlists[], Accessor & styler )
+{
+	styler.StartAt( startPos );
+	styler.StartSegment( startPos );
+
+	unsigned int & cur = startPos;
+	const unsigned int one_too_much = startPos + length;
+
+	int state = initStyle;
+
+	for( ; ; )
+	{
+		switch( state )
+		{
+		case SCE_OPAL_KEYWORD:
+		case SCE_OPAL_SORT:
+			if( !HandleWord( cur, one_too_much, styler, keywordlists ) ) return;
+			state = SCE_OPAL_DEFAULT;
+			break;
+
+		case SCE_OPAL_INTEGER:
+			if( !HandleInteger( cur, one_too_much, styler ) ) return;
+			state = SCE_OPAL_DEFAULT;
+			break;
+
+		case SCE_OPAL_COMMENT_BLOCK:
+			if( !HandleCommentBlock( cur, one_too_much, styler, false ) ) return;
+			state = SCE_OPAL_DEFAULT;
+			break;
+
+		case SCE_OPAL_COMMENT_LINE:
+			if( !HandleCommentLine( cur, one_too_much, styler, false ) ) return;
+			state = SCE_OPAL_DEFAULT;
+			break;
+
+		case SCE_OPAL_STRING:
+			if( !HandleString( cur, one_too_much, styler ) ) return;
+			state = SCE_OPAL_DEFAULT;
+			break;
+			
+		default: // SCE_OPAL_DEFAULT:
+			{
+				char ch = styler.SafeGetCharAt( cur );
+				
+				switch( ch )
+				{
+				// String
+				case '"':
+					if( !HandleString( cur, one_too_much, styler ) ) return;
+					break;
+
+				// Comment block
+				case '/':
+					if( !HandleCommentBlock( cur, one_too_much, styler, true ) ) return;
+					break;
+
+				// Comment line
+				case '-':
+					if( !HandleCommentLine( cur, one_too_much, styler, true ) ) return;
+					break;
+
+				// Par
+				case '(':
+				case ')':
+				case '[':
+				case ']':
+				case '{':
+				case '}':
+					if( !HandlePar( cur, styler ) ) return;
+					break;
+
+				// Whitespace
+				case ' ':
+				case '\t':
+				case '\015':
+				case '\012':
+					if( !HandleSpace( cur, one_too_much, styler ) ) return;
+					break;
+				
+				default:
+					{
+						// Integer
+						if( isdigit( ch ) )
+						{
+							if( !HandleInteger( cur, one_too_much, styler ) ) return;
+						}
+
+						// Keyword
+						else if( islower( ch ) || isupper( ch ) )
+						{
+							if( !HandleWord( cur, one_too_much, styler, keywordlists ) ) return;
+							
+						}
+
+						// Skip
+						else
+						{
+							if( !HandleSkip( cur, one_too_much, styler ) ) return;
+						}
+					}
+				}
+
+				break;
+			}
+		}
+	}
+}
+
+static const char * const opalWordListDesc[] = {
+	"Keywords",
+	"Sorts",
+	0
+};
+
+LexerModule lmOpal(SCLEX_OPAL, ColouriseOpalDoc, "opal", NULL, opalWordListDesc);
diff --git a/Documents/Scintilla/LexOthers.cxx b/Documents/Scintilla/LexOthers.cxx
new file mode 100644
index 0000000..24eee96
--- /dev/null
+++ b/Documents/Scintilla/LexOthers.cxx
@@ -0,0 +1,1231 @@
+// Scintilla source code edit control
+/** @file LexOthers.cxx
+ ** Lexers for batch files, diff results, properties files, make files and error lists.
+ ** Also lexer for LaTeX documents.
+ **/
+// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+static bool strstart(const char *haystack, const char *needle) {
+	return strncmp(haystack, needle, strlen(needle)) == 0;
+}
+
+static bool Is0To9(char ch) {
+	return (ch >= '0') && (ch <= '9');
+}
+
+static bool Is1To9(char ch) {
+	return (ch >= '1') && (ch <= '9');
+}
+
+static inline bool AtEOL(Accessor &styler, unsigned int i) {
+	return (styler[i] == '\n') ||
+	       ((styler[i] == '\r') && (styler.SafeGetCharAt(i + 1) != '\n'));
+}
+
+// Tests for BATCH Operators
+static bool IsBOperator(char ch) {
+	return (ch == '=') || (ch == '+') || (ch == '>') || (ch == '<') ||
+		(ch == '|') || (ch == '?') || (ch == '*');
+}
+
+// Tests for BATCH Separators
+static bool IsBSeparator(char ch) {
+	return (ch == '\\') || (ch == '.') || (ch == ';') ||
+		(ch == '\"') || (ch == '\'') || (ch == '/') || (ch == ')');
+}
+
+static void ColouriseBatchLine(
+    char *lineBuffer,
+    unsigned int lengthLine,
+    unsigned int startLine,
+    unsigned int endPos,
+    WordList *keywordlists[],
+    Accessor &styler) {
+
+	unsigned int offset = 0;	// Line Buffer Offset
+	unsigned int cmdLoc;		// External Command / Program Location
+	char wordBuffer[81];		// Word Buffer - large to catch long paths
+	unsigned int wbl;		// Word Buffer Length
+	unsigned int wbo;		// Word Buffer Offset - also Special Keyword Buffer Length
+	WordList &keywords = *keywordlists[0];      // Internal Commands
+	WordList &keywords2 = *keywordlists[1];     // External Commands (optional)
+
+	// CHOICE, ECHO, GOTO, PROMPT and SET have Default Text that may contain Regular Keywords
+	//   Toggling Regular Keyword Checking off improves readability
+	// Other Regular Keywords and External Commands / Programs might also benefit from toggling
+	//   Need a more robust algorithm to properly toggle Regular Keyword Checking
+	bool continueProcessing = true;	// Used to toggle Regular Keyword Checking
+	// Special Keywords are those that allow certain characters without whitespace after the command
+	// Examples are: cd. cd\ md. rd. dir| dir> echo: echo. path=
+	// Special Keyword Buffer used to determine if the first n characters is a Keyword
+	char sKeywordBuffer[10];	// Special Keyword Buffer
+	bool sKeywordFound;		// Exit Special Keyword for-loop if found
+
+	// Skip initial spaces
+	while ((offset < lengthLine) && (isspacechar(lineBuffer[offset]))) {
+		offset++;
+	}
+	// Colorize Default Text
+	styler.ColourTo(startLine + offset - 1, SCE_BAT_DEFAULT);
+	// Set External Command / Program Location
+	cmdLoc = offset;
+
+	// Check for Fake Label (Comment) or Real Label - return if found
+	if (lineBuffer[offset] == ':') {
+		if (lineBuffer[offset + 1] == ':') {
+			// Colorize Fake Label (Comment) - :: is similar to REM, see http://content.techweb.com/winmag/columns/explorer/2000/21.htm
+			styler.ColourTo(endPos, SCE_BAT_COMMENT);
+		} else {
+			// Colorize Real Label
+			styler.ColourTo(endPos, SCE_BAT_LABEL);
+		}
+		return;
+	// Check for Drive Change (Drive Change is internal command) - return if found
+	} else if ((isalpha(lineBuffer[offset])) &&
+		(lineBuffer[offset + 1] == ':') &&
+		((isspacechar(lineBuffer[offset + 2])) ||
+		(((lineBuffer[offset + 2] == '\\')) &&
+		(isspacechar(lineBuffer[offset + 3]))))) {
+		// Colorize Regular Keyword
+		styler.ColourTo(endPos, SCE_BAT_WORD);
+		return;
+	}
+
+	// Check for Hide Command (@ECHO OFF/ON)
+	if (lineBuffer[offset] == '@') {
+		styler.ColourTo(startLine + offset, SCE_BAT_HIDE);
+		offset++;
+	}
+	// Skip next spaces
+	while ((offset < lengthLine) && (isspacechar(lineBuffer[offset]))) {
+		offset++;
+	}
+
+	// Read remainder of line word-at-a-time or remainder-of-word-at-a-time
+	while (offset < lengthLine) {
+		if (offset > startLine) {
+			// Colorize Default Text
+			styler.ColourTo(startLine + offset - 1, SCE_BAT_DEFAULT);
+		}
+		// Copy word from Line Buffer into Word Buffer
+		wbl = 0;
+		for (; offset < lengthLine && wbl < 80 &&
+		        !isspacechar(lineBuffer[offset]); wbl++, offset++) {
+			wordBuffer[wbl] = static_cast<char>(tolower(lineBuffer[offset]));
+		}
+		wordBuffer[wbl] = '\0';
+		wbo = 0;
+
+		// Check for Comment - return if found
+		if (CompareCaseInsensitive(wordBuffer, "rem") == 0) {
+			styler.ColourTo(endPos, SCE_BAT_COMMENT);
+			return;
+		}
+		// Check for Separator
+		if (IsBSeparator(wordBuffer[0])) {
+			// Check for External Command / Program
+			if ((cmdLoc == offset - wbl) &&
+				((wordBuffer[0] == ':') ||
+				(wordBuffer[0] == '\\') ||
+				(wordBuffer[0] == '.'))) {
+				// Reset Offset to re-process remainder of word
+				offset -= (wbl - 1);
+				// Colorize External Command / Program
+				if (!keywords2) {
+					styler.ColourTo(startLine + offset - 1, SCE_BAT_COMMAND);
+				} else if (keywords2.InList(wordBuffer)) {
+					styler.ColourTo(startLine + offset - 1, SCE_BAT_COMMAND);
+				} else {
+					styler.ColourTo(startLine + offset - 1, SCE_BAT_DEFAULT);
+				}
+				// Reset External Command / Program Location
+				cmdLoc = offset;
+			} else {
+				// Reset Offset to re-process remainder of word
+				offset -= (wbl - 1);
+				// Colorize Default Text
+				styler.ColourTo(startLine + offset - 1, SCE_BAT_DEFAULT);
+			}
+		// Check for Regular Keyword in list
+		} else if ((keywords.InList(wordBuffer)) &&
+			(continueProcessing)) {
+			// ECHO, GOTO, PROMPT and SET require no further Regular Keyword Checking
+			if ((CompareCaseInsensitive(wordBuffer, "echo") == 0) ||
+				(CompareCaseInsensitive(wordBuffer, "goto") == 0) ||
+				(CompareCaseInsensitive(wordBuffer, "prompt") == 0) ||
+				(CompareCaseInsensitive(wordBuffer, "set") == 0)) {
+				continueProcessing = false;
+			}
+			// Identify External Command / Program Location for ERRORLEVEL, and EXIST
+			if ((CompareCaseInsensitive(wordBuffer, "errorlevel") == 0) ||
+				(CompareCaseInsensitive(wordBuffer, "exist") == 0)) {
+				// Reset External Command / Program Location
+				cmdLoc = offset;
+				// Skip next spaces
+				while ((cmdLoc < lengthLine) &&
+					(isspacechar(lineBuffer[cmdLoc]))) {
+					cmdLoc++;
+				}
+				// Skip comparison
+				while ((cmdLoc < lengthLine) &&
+					(!isspacechar(lineBuffer[cmdLoc]))) {
+					cmdLoc++;
+				}
+				// Skip next spaces
+				while ((cmdLoc < lengthLine) &&
+					(isspacechar(lineBuffer[cmdLoc]))) {
+					cmdLoc++;
+				}
+			// Identify External Command / Program Location for CALL, DO, LOADHIGH and LH
+			} else if ((CompareCaseInsensitive(wordBuffer, "call") == 0) ||
+				(CompareCaseInsensitive(wordBuffer, "do") == 0) ||
+				(CompareCaseInsensitive(wordBuffer, "loadhigh") == 0) ||
+				(CompareCaseInsensitive(wordBuffer, "lh") == 0)) {
+				// Reset External Command / Program Location
+				cmdLoc = offset;
+				// Skip next spaces
+				while ((cmdLoc < lengthLine) &&
+					(isspacechar(lineBuffer[cmdLoc]))) {
+					cmdLoc++;
+				}
+			}
+			// Colorize Regular keyword
+			styler.ColourTo(startLine + offset - 1, SCE_BAT_WORD);
+			// No need to Reset Offset
+		// Check for Special Keyword in list, External Command / Program, or Default Text
+		} else if ((wordBuffer[0] != '%') &&
+			(!IsBOperator(wordBuffer[0])) &&
+			(continueProcessing)) {
+			// Check for Special Keyword
+			//     Affected Commands are in Length range 2-6
+			//     Good that ERRORLEVEL, EXIST, CALL, DO, LOADHIGH, and LH are unaffected
+			sKeywordFound = false;
+			for (unsigned int keywordLength = 2; keywordLength < wbl && keywordLength < 7 && !sKeywordFound; keywordLength++) {
+				wbo = 0;
+				// Copy Keyword Length from Word Buffer into Special Keyword Buffer
+				for (; wbo < keywordLength; wbo++) {
+					sKeywordBuffer[wbo] = static_cast<char>(wordBuffer[wbo]);
+				}
+				sKeywordBuffer[wbo] = '\0';
+				// Check for Special Keyword in list
+				if ((keywords.InList(sKeywordBuffer)) &&
+					((IsBOperator(wordBuffer[wbo])) ||
+					(IsBSeparator(wordBuffer[wbo])))) {
+					sKeywordFound = true;
+					// ECHO requires no further Regular Keyword Checking
+					if (CompareCaseInsensitive(sKeywordBuffer, "echo") == 0) {
+						continueProcessing = false;
+					}
+					// Colorize Special Keyword as Regular Keyword
+					styler.ColourTo(startLine + offset - 1 - (wbl - wbo), SCE_BAT_WORD);
+					// Reset Offset to re-process remainder of word
+					offset -= (wbl - wbo);
+				}
+			}
+			// Check for External Command / Program or Default Text
+			if (!sKeywordFound) {
+				wbo = 0;
+				// Check for External Command / Program
+				if (cmdLoc == offset - wbl) {
+					// Read up to %, Operator or Separator
+					while ((wbo < wbl) &&
+						(wordBuffer[wbo] != '%') &&
+						(!IsBOperator(wordBuffer[wbo])) &&
+						(!IsBSeparator(wordBuffer[wbo]))) {
+						wbo++;
+					}
+					// Reset External Command / Program Location
+					cmdLoc = offset - (wbl - wbo);
+					// Reset Offset to re-process remainder of word
+					offset -= (wbl - wbo);
+					// CHOICE requires no further Regular Keyword Checking
+					if (CompareCaseInsensitive(wordBuffer, "choice") == 0) {
+						continueProcessing = false;
+					}
+					// Check for START (and its switches) - What follows is External Command \ Program
+					if (CompareCaseInsensitive(wordBuffer, "start") == 0) {
+						// Reset External Command / Program Location
+						cmdLoc = offset;
+						// Skip next spaces
+						while ((cmdLoc < lengthLine) &&
+							(isspacechar(lineBuffer[cmdLoc]))) {
+							cmdLoc++;
+						}
+						// Reset External Command / Program Location if command switch detected
+						if (lineBuffer[cmdLoc] == '/') {
+							// Skip command switch
+							while ((cmdLoc < lengthLine) &&
+								(!isspacechar(lineBuffer[cmdLoc]))) {
+								cmdLoc++;
+							}
+							// Skip next spaces
+							while ((cmdLoc < lengthLine) &&
+								(isspacechar(lineBuffer[cmdLoc]))) {
+								cmdLoc++;
+							}
+						}
+					}
+					// Colorize External Command / Program
+					if (!keywords2) {
+						styler.ColourTo(startLine + offset - 1, SCE_BAT_COMMAND);
+					} else if (keywords2.InList(wordBuffer)) {
+						styler.ColourTo(startLine + offset - 1, SCE_BAT_COMMAND);
+					} else {
+						styler.ColourTo(startLine + offset - 1, SCE_BAT_DEFAULT);
+					}
+					// No need to Reset Offset
+				// Check for Default Text
+				} else {
+					// Read up to %, Operator or Separator
+					while ((wbo < wbl) &&
+						(wordBuffer[wbo] != '%') &&
+						(!IsBOperator(wordBuffer[wbo])) &&
+						(!IsBSeparator(wordBuffer[wbo]))) {
+						wbo++;
+					}
+					// Colorize Default Text
+					styler.ColourTo(startLine + offset - 1 - (wbl - wbo), SCE_BAT_DEFAULT);
+					// Reset Offset to re-process remainder of word
+					offset -= (wbl - wbo);
+				}
+			}
+		// Check for Argument  (%n), Environment Variable (%x...%) or Local Variable (%%a)
+		} else if (wordBuffer[0] == '%') {
+			// Colorize Default Text
+			styler.ColourTo(startLine + offset - 1 - wbl, SCE_BAT_DEFAULT);
+			wbo++;
+			// Search to end of word for second % (can be a long path)
+			while ((wbo < wbl) &&
+				(wordBuffer[wbo] != '%') &&
+				(!IsBOperator(wordBuffer[wbo])) &&
+				(!IsBSeparator(wordBuffer[wbo]))) {
+				wbo++;
+			}
+			// Check for Argument (%n) or (%*)
+			if (((Is0To9(wordBuffer[1])) || (wordBuffer[1] == '*')) &&
+				(wordBuffer[wbo] != '%')) {
+				// Check for External Command / Program
+				if (cmdLoc == offset - wbl) {
+					cmdLoc = offset - (wbl - 2);
+				}
+				// Colorize Argument
+				styler.ColourTo(startLine + offset - 1 - (wbl - 2), SCE_BAT_IDENTIFIER);
+				// Reset Offset to re-process remainder of word
+				offset -= (wbl - 2);
+			// Check for Expanded Argument (%~...) / Variable (%%~...)
+			} else if (((wbl > 1) && (wordBuffer[1] == '~')) ||
+				((wbl > 2) && (wordBuffer[1] == '%') && (wordBuffer[2] == '~'))) {
+				// Check for External Command / Program
+				if (cmdLoc == offset - wbl) {
+					cmdLoc = offset - (wbl - wbo);
+				}
+				// Colorize Expanded Argument / Variable
+				styler.ColourTo(startLine + offset - 1 - (wbl - wbo), SCE_BAT_IDENTIFIER);
+				// Reset Offset to re-process remainder of word
+				offset -= (wbl - wbo);
+			// Check for Environment Variable (%x...%)
+			} else if ((wordBuffer[1] != '%') &&
+				(wordBuffer[wbo] == '%')) {
+				wbo++;
+				// Check for External Command / Program
+				if (cmdLoc == offset - wbl) {
+					cmdLoc = offset - (wbl - wbo);
+				}
+				// Colorize Environment Variable
+				styler.ColourTo(startLine + offset - 1 - (wbl - wbo), SCE_BAT_IDENTIFIER);
+				// Reset Offset to re-process remainder of word
+				offset -= (wbl - wbo);
+			// Check for Local Variable (%%a)
+			} else if (
+				(wbl > 2) &&
+				(wordBuffer[1] == '%') &&
+				(wordBuffer[2] != '%') &&
+				(!IsBOperator(wordBuffer[2])) &&
+				(!IsBSeparator(wordBuffer[2]))) {
+				// Check for External Command / Program
+				if (cmdLoc == offset - wbl) {
+					cmdLoc = offset - (wbl - 3);
+				}
+				// Colorize Local Variable
+				styler.ColourTo(startLine + offset - 1 - (wbl - 3), SCE_BAT_IDENTIFIER);
+				// Reset Offset to re-process remainder of word
+				offset -= (wbl - 3);
+			}
+		// Check for Operator
+		} else if (IsBOperator(wordBuffer[0])) {
+			// Colorize Default Text
+			styler.ColourTo(startLine + offset - 1 - wbl, SCE_BAT_DEFAULT);
+			// Check for Comparison Operator
+			if ((wordBuffer[0] == '=') && (wordBuffer[1] == '=')) {
+				// Identify External Command / Program Location for IF
+				cmdLoc = offset;
+				// Skip next spaces
+				while ((cmdLoc < lengthLine) &&
+					(isspacechar(lineBuffer[cmdLoc]))) {
+					cmdLoc++;
+				}
+				// Colorize Comparison Operator
+				styler.ColourTo(startLine + offset - 1 - (wbl - 2), SCE_BAT_OPERATOR);
+				// Reset Offset to re-process remainder of word
+				offset -= (wbl - 2);
+			// Check for Pipe Operator
+			} else if (wordBuffer[0] == '|') {
+				// Reset External Command / Program Location
+				cmdLoc = offset - wbl + 1;
+				// Skip next spaces
+				while ((cmdLoc < lengthLine) &&
+					(isspacechar(lineBuffer[cmdLoc]))) {
+					cmdLoc++;
+				}
+				// Colorize Pipe Operator
+				styler.ColourTo(startLine + offset - 1 - (wbl - 1), SCE_BAT_OPERATOR);
+				// Reset Offset to re-process remainder of word
+				offset -= (wbl - 1);
+			// Check for Other Operator
+			} else {
+				// Check for > Operator
+				if (wordBuffer[0] == '>') {
+					// Turn Keyword and External Command / Program checking back on
+					continueProcessing = true;
+				}
+				// Colorize Other Operator
+				styler.ColourTo(startLine + offset - 1 - (wbl - 1), SCE_BAT_OPERATOR);
+				// Reset Offset to re-process remainder of word
+				offset -= (wbl - 1);
+			}
+		// Check for Default Text
+		} else {
+			// Read up to %, Operator or Separator
+			while ((wbo < wbl) &&
+				(wordBuffer[wbo] != '%') &&
+				(!IsBOperator(wordBuffer[wbo])) &&
+				(!IsBSeparator(wordBuffer[wbo]))) {
+				wbo++;
+			}
+			// Colorize Default Text
+			styler.ColourTo(startLine + offset - 1 - (wbl - wbo), SCE_BAT_DEFAULT);
+			// Reset Offset to re-process remainder of word
+			offset -= (wbl - wbo);
+		}
+		// Skip next spaces - nothing happens if Offset was Reset
+		while ((offset < lengthLine) && (isspacechar(lineBuffer[offset]))) {
+			offset++;
+		}
+	}
+	// Colorize Default Text for remainder of line - currently not lexed
+	styler.ColourTo(endPos, SCE_BAT_DEFAULT);
+}
+
+static void ColouriseBatchDoc(
+    unsigned int startPos,
+    int length,
+    int /*initStyle*/,
+    WordList *keywordlists[],
+    Accessor &styler) {
+
+	char lineBuffer[1024];
+
+	styler.StartAt(startPos);
+	styler.StartSegment(startPos);
+	unsigned int linePos = 0;
+	unsigned int startLine = startPos;
+	for (unsigned int i = startPos; i < startPos + length; i++) {
+		lineBuffer[linePos++] = styler[i];
+		if (AtEOL(styler, i) || (linePos >= sizeof(lineBuffer) - 1)) {
+			// End of line (or of line buffer) met, colourise it
+			lineBuffer[linePos] = '\0';
+			ColouriseBatchLine(lineBuffer, linePos, startLine, i, keywordlists, styler);
+			linePos = 0;
+			startLine = i + 1;
+		}
+	}
+	if (linePos > 0) {	// Last line does not have ending characters
+		lineBuffer[linePos] = '\0';
+		ColouriseBatchLine(lineBuffer, linePos, startLine, startPos + length - 1,
+		                   keywordlists, styler);
+	}
+}
+
+static void ColouriseDiffLine(char *lineBuffer, int endLine, Accessor &styler) {
+	// It is needed to remember the current state to recognize starting
+	// comment lines before the first "diff " or "--- ". If a real
+	// difference starts then each line starting with ' ' is a whitespace
+	// otherwise it is considered a comment (Only in..., Binary file...)
+	if (0 == strncmp(lineBuffer, "diff ", 5)) {
+		styler.ColourTo(endLine, SCE_DIFF_COMMAND);
+	} else if (0 == strncmp(lineBuffer, "Index: ", 7)) {  // For subversion's diff
+		styler.ColourTo(endLine, SCE_DIFF_COMMAND);
+	} else if (0 == strncmp(lineBuffer, "---", 3)) {
+		// In a context diff, --- appears in both the header and the position markers
+		if (lineBuffer[3] == ' ' && atoi(lineBuffer + 4) && !strchr(lineBuffer, '/'))
+			styler.ColourTo(endLine, SCE_DIFF_POSITION);
+		else if (lineBuffer[3] == '\r' || lineBuffer[3] == '\n')
+			styler.ColourTo(endLine, SCE_DIFF_POSITION);
+		else
+			styler.ColourTo(endLine, SCE_DIFF_HEADER);
+	} else if (0 == strncmp(lineBuffer, "+++ ", 4)) {
+		// I don't know of any diff where "+++ " is a position marker, but for
+		// consistency, do the same as with "--- " and "*** ".
+		if (atoi(lineBuffer+4) && !strchr(lineBuffer, '/'))
+			styler.ColourTo(endLine, SCE_DIFF_POSITION);
+		else
+			styler.ColourTo(endLine, SCE_DIFF_HEADER);
+	} else if (0 == strncmp(lineBuffer, "====", 4)) {  // For p4's diff
+		styler.ColourTo(endLine, SCE_DIFF_HEADER);
+	} else if (0 == strncmp(lineBuffer, "***", 3)) {
+		// In a context diff, *** appears in both the header and the position markers.
+		// Also ******** is a chunk header, but here it's treated as part of the
+		// position marker since there is no separate style for a chunk header.
+		if (lineBuffer[3] == ' ' && atoi(lineBuffer+4) && !strchr(lineBuffer, '/'))
+			styler.ColourTo(endLine, SCE_DIFF_POSITION);
+		else if (lineBuffer[3] == '*')
+			styler.ColourTo(endLine, SCE_DIFF_POSITION);
+		else
+			styler.ColourTo(endLine, SCE_DIFF_HEADER);
+	} else if (0 == strncmp(lineBuffer, "? ", 2)) {    // For difflib
+		styler.ColourTo(endLine, SCE_DIFF_HEADER);
+	} else if (lineBuffer[0] == '@') {
+		styler.ColourTo(endLine, SCE_DIFF_POSITION);
+	} else if (lineBuffer[0] >= '0' && lineBuffer[0] <= '9') {
+		styler.ColourTo(endLine, SCE_DIFF_POSITION);
+	} else if (lineBuffer[0] == '-' || lineBuffer[0] == '<') {
+		styler.ColourTo(endLine, SCE_DIFF_DELETED);
+	} else if (lineBuffer[0] == '+' || lineBuffer[0] == '>') {
+		styler.ColourTo(endLine, SCE_DIFF_ADDED);
+	} else if (lineBuffer[0] == '!') {
+		styler.ColourTo(endLine, SCE_DIFF_CHANGED);
+	} else if (lineBuffer[0] != ' ') {
+		styler.ColourTo(endLine, SCE_DIFF_COMMENT);
+	} else {
+		styler.ColourTo(endLine, SCE_DIFF_DEFAULT);
+	}
+}
+
+static void ColouriseDiffDoc(unsigned int startPos, int length, int, WordList *[], Accessor &styler) {
+	char lineBuffer[1024];
+	styler.StartAt(startPos);
+	styler.StartSegment(startPos);
+	unsigned int linePos = 0;
+	for (unsigned int i = startPos; i < startPos + length; i++) {
+		lineBuffer[linePos++] = styler[i];
+		if (AtEOL(styler, i) || (linePos >= sizeof(lineBuffer) - 1)) {
+			// End of line (or of line buffer) met, colourise it
+			lineBuffer[linePos] = '\0';
+			ColouriseDiffLine(lineBuffer, i, styler);
+			linePos = 0;
+		}
+	}
+	if (linePos > 0) {	// Last line does not have ending characters
+		ColouriseDiffLine(lineBuffer, startPos + length - 1, styler);
+	}
+}
+
+static void FoldDiffDoc(unsigned int startPos, int length, int, WordList *[], Accessor &styler) {
+	int curLine = styler.GetLine(startPos);
+	int curLineStart = styler.LineStart(curLine);
+	int prevLevel = curLine > 0 ? styler.LevelAt(curLine - 1) : SC_FOLDLEVELBASE;
+	int nextLevel;
+
+	do {
+		int lineType = styler.StyleAt(curLineStart);
+		if (lineType == SCE_DIFF_COMMAND)
+			nextLevel = SC_FOLDLEVELBASE | SC_FOLDLEVELHEADERFLAG;
+		else if (lineType == SCE_DIFF_HEADER)
+			nextLevel = (SC_FOLDLEVELBASE + 1) | SC_FOLDLEVELHEADERFLAG;
+		else if (lineType == SCE_DIFF_POSITION && styler[curLineStart] != '-')
+			nextLevel = (SC_FOLDLEVELBASE + 2) | SC_FOLDLEVELHEADERFLAG;
+		else if (prevLevel & SC_FOLDLEVELHEADERFLAG)
+			nextLevel = (prevLevel & SC_FOLDLEVELNUMBERMASK) + 1;
+		else
+			nextLevel = prevLevel;
+
+		if ((nextLevel & SC_FOLDLEVELHEADERFLAG) && (nextLevel == prevLevel))
+			styler.SetLevel(curLine-1, prevLevel & ~SC_FOLDLEVELHEADERFLAG);
+
+		styler.SetLevel(curLine, nextLevel);
+		prevLevel = nextLevel;
+
+		curLineStart = styler.LineStart(++curLine);
+	} while (static_cast<int>(startPos) + length > curLineStart);
+}
+
+static void ColourisePoLine(
+    char *lineBuffer,
+    unsigned int lengthLine,
+    unsigned int startLine,
+    unsigned int endPos,
+    Accessor &styler) {
+
+	unsigned int i = 0;
+	static unsigned int state = SCE_PO_DEFAULT;
+	unsigned int state_start = SCE_PO_DEFAULT;
+
+	while ((i < lengthLine) && isspacechar(lineBuffer[i]))	// Skip initial spaces
+		i++;
+	if (i < lengthLine) {
+		if (lineBuffer[i] == '#') {
+			// check if the comment contains any flags ("#, ") and
+			// then whether the flags contain "fuzzy"
+			if (strstart(lineBuffer, "#, ") && strstr(lineBuffer, "fuzzy"))
+				styler.ColourTo(endPos, SCE_PO_FUZZY);
+			else
+				styler.ColourTo(endPos, SCE_PO_COMMENT);
+		} else {
+			if (lineBuffer[0] == '"') {
+				// line continuation, use previous style
+				styler.ColourTo(endPos, state);
+				return;
+			// this implicitly also matches "msgid_plural"
+			} else if (strstart(lineBuffer, "msgid")) {
+				state_start = SCE_PO_MSGID;
+				state = SCE_PO_MSGID_TEXT;
+			} else if (strstart(lineBuffer, "msgstr")) {
+				state_start = SCE_PO_MSGSTR;
+				state = SCE_PO_MSGSTR_TEXT;
+			} else if (strstart(lineBuffer, "msgctxt")) {
+				state_start = SCE_PO_MSGCTXT;
+				state = SCE_PO_MSGCTXT_TEXT;
+			}
+			if (state_start != SCE_PO_DEFAULT) {
+				// find the next space
+				while ((i < lengthLine) && ! isspacechar(lineBuffer[i]))
+					i++;
+				styler.ColourTo(startLine + i - 1, state_start);
+				styler.ColourTo(startLine + i, SCE_PO_DEFAULT);
+				styler.ColourTo(endPos, state);
+			}
+		}
+	} else {
+		styler.ColourTo(endPos, SCE_PO_DEFAULT);
+	}
+}
+
+static void ColourisePoDoc(unsigned int startPos, int length, int, WordList *[], Accessor &styler) {
+	char lineBuffer[1024];
+	styler.StartAt(startPos);
+	styler.StartSegment(startPos);
+	unsigned int linePos = 0;
+	unsigned int startLine = startPos;
+	for (unsigned int i = startPos; i < startPos + length; i++) {
+		lineBuffer[linePos++] = styler[i];
+		if (AtEOL(styler, i) || (linePos >= sizeof(lineBuffer) - 1)) {
+			// End of line (or of line buffer) met, colourise it
+			lineBuffer[linePos] = '\0';
+			ColourisePoLine(lineBuffer, linePos, startLine, i, styler);
+			linePos = 0;
+			startLine = i + 1;
+		}
+	}
+	if (linePos > 0) {	// Last line does not have ending characters
+		ColourisePoLine(lineBuffer, linePos, startLine, startPos + length - 1, styler);
+	}
+}
+
+
+static void ColourisePropsLine(
+    char *lineBuffer,
+    unsigned int lengthLine,
+    unsigned int startLine,
+    unsigned int endPos,
+    Accessor &styler) {
+
+	unsigned int i = 0;
+	while ((i < lengthLine) && isspacechar(lineBuffer[i]))	// Skip initial spaces
+		i++;
+	if (i < lengthLine) {
+		if (lineBuffer[i] == '#' || lineBuffer[i] == '!' || lineBuffer[i] == ';') {
+			styler.ColourTo(endPos, SCE_PROPS_COMMENT);
+		} else if (lineBuffer[i] == '[') {
+			styler.ColourTo(endPos, SCE_PROPS_SECTION);
+		} else if (lineBuffer[i] == '@') {
+			styler.ColourTo(startLine + i, SCE_PROPS_DEFVAL);
+			if (lineBuffer[++i] == '=')
+				styler.ColourTo(startLine + i, SCE_PROPS_ASSIGNMENT);
+			styler.ColourTo(endPos, SCE_PROPS_DEFAULT);
+		} else {
+			// Search for the '=' character
+			while ((i < lengthLine) && (lineBuffer[i] != '='))
+				i++;
+			if ((i < lengthLine) && (lineBuffer[i] == '=')) {
+				styler.ColourTo(startLine + i - 1, SCE_PROPS_KEY);
+				styler.ColourTo(startLine + i, SCE_PROPS_ASSIGNMENT);
+				styler.ColourTo(endPos, SCE_PROPS_DEFAULT);
+			} else {
+				styler.ColourTo(endPos, SCE_PROPS_DEFAULT);
+			}
+		}
+	} else {
+		styler.ColourTo(endPos, SCE_PROPS_DEFAULT);
+	}
+}
+
+static void ColourisePropsDoc(unsigned int startPos, int length, int, WordList *[], Accessor &styler) {
+	char lineBuffer[1024];
+	styler.StartAt(startPos);
+	styler.StartSegment(startPos);
+	unsigned int linePos = 0;
+	unsigned int startLine = startPos;
+	for (unsigned int i = startPos; i < startPos + length; i++) {
+		lineBuffer[linePos++] = styler[i];
+		if (AtEOL(styler, i) || (linePos >= sizeof(lineBuffer) - 1)) {
+			// End of line (or of line buffer) met, colourise it
+			lineBuffer[linePos] = '\0';
+			ColourisePropsLine(lineBuffer, linePos, startLine, i, styler);
+			linePos = 0;
+			startLine = i + 1;
+		}
+	}
+	if (linePos > 0) {	// Last line does not have ending characters
+		ColourisePropsLine(lineBuffer, linePos, startLine, startPos + length - 1, styler);
+	}
+}
+
+// adaption by ksc, using the "} else {" trick of 1.53
+// 030721
+static void FoldPropsDoc(unsigned int startPos, int length, int, WordList *[], Accessor &styler) {
+	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+
+	unsigned int endPos = startPos + length;
+	int visibleChars = 0;
+	int lineCurrent = styler.GetLine(startPos);
+
+	char chNext = styler[startPos];
+	int styleNext = styler.StyleAt(startPos);
+	bool headerPoint = false;
+	int lev;
+
+	for (unsigned int i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler[i+1];
+
+		int style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+
+		if (style == SCE_PROPS_SECTION) {
+			headerPoint = true;
+		}
+
+		if (atEOL) {
+			lev = SC_FOLDLEVELBASE;
+
+			if (lineCurrent > 0) {
+				int levelPrevious = styler.LevelAt(lineCurrent - 1);
+
+				if (levelPrevious & SC_FOLDLEVELHEADERFLAG) {
+					lev = SC_FOLDLEVELBASE + 1;
+				} else {
+					lev = levelPrevious & SC_FOLDLEVELNUMBERMASK;
+				}
+			}
+
+			if (headerPoint) {
+				lev = SC_FOLDLEVELBASE;
+			}
+			if (visibleChars == 0 && foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+
+			if (headerPoint) {
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			}
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+
+			lineCurrent++;
+			visibleChars = 0;
+			headerPoint = false;
+		}
+		if (!isspacechar(ch))
+			visibleChars++;
+	}
+
+	if (lineCurrent > 0) {
+		int levelPrevious = styler.LevelAt(lineCurrent - 1);
+		if (levelPrevious & SC_FOLDLEVELHEADERFLAG) {
+			lev = SC_FOLDLEVELBASE + 1;
+		} else {
+			lev = levelPrevious & SC_FOLDLEVELNUMBERMASK;
+		}
+	} else {
+		lev = SC_FOLDLEVELBASE;
+	}
+	int flagsNext = styler.LevelAt(lineCurrent);
+	styler.SetLevel(lineCurrent, lev | flagsNext & ~SC_FOLDLEVELNUMBERMASK);
+}
+
+static void ColouriseMakeLine(
+    char *lineBuffer,
+    unsigned int lengthLine,
+    unsigned int startLine,
+    unsigned int endPos,
+    Accessor &styler) {
+
+	unsigned int i = 0;
+	int lastNonSpace = -1;
+	unsigned int state = SCE_MAKE_DEFAULT;
+	bool bSpecial = false;
+
+	// check for a tab character in column 0 indicating a command
+	bool bCommand = false;
+	if ((lengthLine > 0) && (lineBuffer[0] == '\t'))
+		bCommand = true;
+
+	// Skip initial spaces
+	while ((i < lengthLine) && isspacechar(lineBuffer[i])) {
+		i++;
+	}
+	if (lineBuffer[i] == '#') {	// Comment
+		styler.ColourTo(endPos, SCE_MAKE_COMMENT);
+		return;
+	}
+	if (lineBuffer[i] == '!') {	// Special directive
+		styler.ColourTo(endPos, SCE_MAKE_PREPROCESSOR);
+		return;
+	}
+	while (i < lengthLine) {
+		if (lineBuffer[i] == '$' && lineBuffer[i + 1] == '(') {
+			styler.ColourTo(startLine + i - 1, state);
+			state = SCE_MAKE_IDENTIFIER;
+		} else if (state == SCE_MAKE_IDENTIFIER && lineBuffer[i] == ')') {
+			styler.ColourTo(startLine + i, state);
+			state = SCE_MAKE_DEFAULT;
+		}
+
+		// skip identifier and target styling if this is a command line
+		if (!bSpecial && !bCommand) {
+			if (lineBuffer[i] == ':') {
+				if (((i + 1) < lengthLine) && (lineBuffer[i + 1] == '=')) {
+					// it's a ':=', so style as an identifier
+					if (lastNonSpace >= 0)
+						styler.ColourTo(startLine + lastNonSpace, SCE_MAKE_IDENTIFIER);
+					styler.ColourTo(startLine + i - 1, SCE_MAKE_DEFAULT);
+					styler.ColourTo(startLine + i + 1, SCE_MAKE_OPERATOR);
+				} else {
+					// We should check that no colouring was made since the beginning of the line,
+					// to avoid colouring stuff like /OUT:file
+					if (lastNonSpace >= 0)
+						styler.ColourTo(startLine + lastNonSpace, SCE_MAKE_TARGET);
+					styler.ColourTo(startLine + i - 1, SCE_MAKE_DEFAULT);
+					styler.ColourTo(startLine + i, SCE_MAKE_OPERATOR);
+				}
+				bSpecial = true;	// Only react to the first ':' of the line
+				state = SCE_MAKE_DEFAULT;
+			} else if (lineBuffer[i] == '=') {
+				if (lastNonSpace >= 0)
+					styler.ColourTo(startLine + lastNonSpace, SCE_MAKE_IDENTIFIER);
+				styler.ColourTo(startLine + i - 1, SCE_MAKE_DEFAULT);
+				styler.ColourTo(startLine + i, SCE_MAKE_OPERATOR);
+				bSpecial = true;	// Only react to the first '=' of the line
+				state = SCE_MAKE_DEFAULT;
+			}
+		}
+		if (!isspacechar(lineBuffer[i])) {
+			lastNonSpace = i;
+		}
+		i++;
+	}
+	if (state == SCE_MAKE_IDENTIFIER) {
+		styler.ColourTo(endPos, SCE_MAKE_IDEOL);	// Error, variable reference not ended
+	} else {
+		styler.ColourTo(endPos, SCE_MAKE_DEFAULT);
+	}
+}
+
+static void ColouriseMakeDoc(unsigned int startPos, int length, int, WordList *[], Accessor &styler) {
+	char lineBuffer[1024];
+	styler.StartAt(startPos);
+	styler.StartSegment(startPos);
+	unsigned int linePos = 0;
+	unsigned int startLine = startPos;
+	for (unsigned int i = startPos; i < startPos + length; i++) {
+		lineBuffer[linePos++] = styler[i];
+		if (AtEOL(styler, i) || (linePos >= sizeof(lineBuffer) - 1)) {
+			// End of line (or of line buffer) met, colourise it
+			lineBuffer[linePos] = '\0';
+			ColouriseMakeLine(lineBuffer, linePos, startLine, i, styler);
+			linePos = 0;
+			startLine = i + 1;
+		}
+	}
+	if (linePos > 0) {	// Last line does not have ending characters
+		ColouriseMakeLine(lineBuffer, linePos, startLine, startPos + length - 1, styler);
+	}
+}
+
+static int RecogniseErrorListLine(const char *lineBuffer, unsigned int lengthLine, int &startValue) {
+	if (lineBuffer[0] == '>') {
+		// Command or return status
+		return SCE_ERR_CMD;
+	} else if (lineBuffer[0] == '<') {
+		// Diff removal, but not interested. Trapped to avoid hitting CTAG cases.
+		return SCE_ERR_DEFAULT;
+	} else if (lineBuffer[0] == '!') {
+		return SCE_ERR_DIFF_CHANGED;
+	} else if (lineBuffer[0] == '+') {
+		if (strstart(lineBuffer, "+++ ")) {
+			return SCE_ERR_DIFF_MESSAGE;
+		} else {
+			return SCE_ERR_DIFF_ADDITION;
+		}
+	} else if (lineBuffer[0] == '-') {
+		if (strstart(lineBuffer, "--- ")) {
+			return SCE_ERR_DIFF_MESSAGE;
+		} else {
+			return SCE_ERR_DIFF_DELETION;
+		}
+	} else if (strstart(lineBuffer, "cf90-")) {
+		// Absoft Pro Fortran 90/95 v8.2 error and/or warning message
+		return SCE_ERR_ABSF;
+	} else if (strstart(lineBuffer, "fortcom:")) {
+		// Intel Fortran Compiler v8.0 error/warning message
+		return SCE_ERR_IFORT;
+	} else if (strstr(lineBuffer, "File \"") && strstr(lineBuffer, ", line ")) {
+		return SCE_ERR_PYTHON;
+	} else if (strstr(lineBuffer, " in ") && strstr(lineBuffer, " on line ")) {
+		return SCE_ERR_PHP;
+	} else if ((strstart(lineBuffer, "Error ") ||
+	            strstart(lineBuffer, "Warning ")) &&
+	           strstr(lineBuffer, " at (") &&
+	           strstr(lineBuffer, ") : ") &&
+	           (strstr(lineBuffer, " at (") < strstr(lineBuffer, ") : "))) {
+		// Intel Fortran Compiler error/warning message
+		return SCE_ERR_IFC;
+	} else if (strstart(lineBuffer, "Error ")) {
+		// Borland error message
+		return SCE_ERR_BORLAND;
+	} else if (strstart(lineBuffer, "Warning ")) {
+		// Borland warning message
+		return SCE_ERR_BORLAND;
+	} else if (strstr(lineBuffer, "at line " ) &&
+	           (strstr(lineBuffer, "at line " ) < (lineBuffer + lengthLine)) &&
+	           strstr(lineBuffer, "file ") &&
+	           (strstr(lineBuffer, "file ") < (lineBuffer + lengthLine))) {
+		// Lua 4 error message
+		return SCE_ERR_LUA;
+	} else if (strstr(lineBuffer, " at " ) &&
+	           (strstr(lineBuffer, " at " ) < (lineBuffer + lengthLine)) &&
+	           strstr(lineBuffer, " line ") &&
+	           (strstr(lineBuffer, " line ") < (lineBuffer + lengthLine)) &&
+	           (strstr(lineBuffer, " at " ) < (strstr(lineBuffer, " line ")))) {
+		// perl error message
+		return SCE_ERR_PERL;
+	} else if ((memcmp(lineBuffer, "   at ", 6) == 0) &&
+	           strstr(lineBuffer, ":line ")) {
+		// A .NET traceback
+		return SCE_ERR_NET;
+	} else if (strstart(lineBuffer, "Line ") &&
+	           strstr(lineBuffer, ", file ")) {
+		// Essential Lahey Fortran error message
+		return SCE_ERR_ELF;
+	} else if (strstart(lineBuffer, "line ") &&
+	           strstr(lineBuffer, " column ")) {
+		// HTML tidy style: line 42 column 1
+		return SCE_ERR_TIDY;
+	} else if (strstart(lineBuffer, "\tat ") &&
+	           strstr(lineBuffer, "(") &&
+	           strstr(lineBuffer, ".java:")) {
+		// Java stack back trace
+		return SCE_ERR_JAVA_STACK;
+	} else {
+		// Look for one of the following formats:
+		// GCC: <filename>:<line>:<message>
+		// Microsoft: <filename>(<line>) :<message>
+		// Common: <filename>(<line>): warning|error|note|remark|catastrophic|fatal
+		// Common: <filename>(<line>) warning|error|note|remark|catastrophic|fatal
+		// Microsoft: <filename>(<line>,<column>)<message>
+		// CTags: \t<message>
+		// Lua 5 traceback: \t<filename>:<line>:<message>
+		// Lua 5.1: <exe>: <filename>:<line>:<message>
+		bool initialTab = (lineBuffer[0] == '\t');
+		bool initialColonPart = false;
+		enum { stInitial,
+			stGccStart, stGccDigit, stGcc,
+			stMsStart, stMsDigit, stMsBracket, stMsVc, stMsDigitComma, stMsDotNet,
+			stCtagsStart, stCtagsStartString, stCtagsStringDollar, stCtags,
+			stUnrecognized
+		} state = stInitial;
+		for (unsigned int i = 0; i < lengthLine; i++) {
+			char ch = lineBuffer[i];
+			char chNext = ' ';
+			if ((i + 1) < lengthLine)
+				chNext = lineBuffer[i + 1];
+			if (state == stInitial) {
+				if (ch == ':') {
+					// May be GCC, or might be Lua 5 (Lua traceback same but with tab prefix)
+					if ((chNext != '\\') && (chNext != '/') && (chNext != ' ')) {
+						// This check is not completely accurate as may be on
+						// GTK+ with a file name that includes ':'.
+						state = stGccStart;
+					} else if (chNext == ' ') { // indicates a Lua 5.1 error message
+						initialColonPart = true;
+					}
+				} else if ((ch == '(') && Is1To9(chNext) && (!initialTab)) {
+					// May be Microsoft
+					// Check against '0' often removes phone numbers
+					state = stMsStart;
+				} else if ((ch == '\t') && (!initialTab)) {
+					// May be CTags
+					state = stCtagsStart;
+				}
+			} else if (state == stGccStart) {	// <filename>:
+				state = Is1To9(ch) ? stGccDigit : stUnrecognized;
+			} else if (state == stGccDigit) {	// <filename>:<line>
+				if (ch == ':') {
+					state = stGcc;	// :9.*: is GCC
+					startValue = i + 1;
+					break;
+				} else if (!Is0To9(ch)) {
+					state = stUnrecognized;
+				}
+			} else if (state == stMsStart) {	// <filename>(
+				state = Is0To9(ch) ? stMsDigit : stUnrecognized;
+			} else if (state == stMsDigit) {	// <filename>(<line>
+				if (ch == ',') {
+					state = stMsDigitComma;
+				} else if (ch == ')') {
+					state = stMsBracket;
+				} else if ((ch != ' ') && !Is0To9(ch)) {
+					state = stUnrecognized;
+				}
+			} else if (state == stMsBracket) {	// <filename>(<line>)
+				if ((ch == ' ') && (chNext == ':')) {
+					state = stMsVc;
+				} else if ((ch == ':' && chNext == ' ') || (ch == ' ')) {
+					// Possibly Delphi.. don't test against chNext as it's one of the strings below.
+					char word[512];
+					unsigned int j, chPos;
+					unsigned numstep;
+					chPos = 0;
+					if (ch == ' ')
+						numstep = 1; // ch was ' ', handle as if it's a delphi errorline, only add 1 to i.
+					else
+						numstep = 2; // otherwise add 2.
+					for (j = i + numstep; j < lengthLine && isalpha(lineBuffer[j]) && chPos < sizeof(word) - 1; j++)
+						word[chPos++] = lineBuffer[j];
+					word[chPos] = 0;
+					if (!CompareCaseInsensitive(word, "error") || !CompareCaseInsensitive(word, "warning") ||
+						!CompareCaseInsensitive(word, "fatal") || !CompareCaseInsensitive(word, "catastrophic") ||
+						!CompareCaseInsensitive(word, "note") || !CompareCaseInsensitive(word, "remark")) {
+						state = stMsVc;
+					} else
+						state = stUnrecognized;
+				} else {
+					state = stUnrecognized;
+				}
+			} else if (state == stMsDigitComma) {	// <filename>(<line>,
+				if (ch == ')') {
+					state = stMsDotNet;
+					break;
+				} else if ((ch != ' ') && !Is0To9(ch)) {
+					state = stUnrecognized;
+				}
+			} else if (state == stCtagsStart) {
+				if ((lineBuffer[i - 1] == '\t') &&
+				        ((ch == '/' && lineBuffer[i + 1] == '^') || Is0To9(ch))) {
+					state = stCtags;
+					break;
+				} else if ((ch == '/') && (lineBuffer[i + 1] == '^')) {
+					state = stCtagsStartString;
+				}
+			} else if ((state == stCtagsStartString) && ((lineBuffer[i] == '$') && (lineBuffer[i + 1] == '/'))) {
+				state = stCtagsStringDollar;
+				break;
+			}
+		}
+		if (state == stGcc) {
+			return initialColonPart ? SCE_ERR_LUA : SCE_ERR_GCC;
+		} else if ((state == stMsVc) || (state == stMsDotNet)) {
+			return SCE_ERR_MS;
+		} else if ((state == stCtagsStringDollar) || (state == stCtags)) {
+			return SCE_ERR_CTAG;
+		} else {
+			return SCE_ERR_DEFAULT;
+		}
+	}
+}
+
+static void ColouriseErrorListLine(
+    char *lineBuffer,
+    unsigned int lengthLine,
+    unsigned int endPos,
+    Accessor &styler,
+	bool valueSeparate) {
+	int startValue = -1;
+	int style = RecogniseErrorListLine(lineBuffer, lengthLine, startValue);
+	if (valueSeparate && (startValue >= 0)) {
+		styler.ColourTo(endPos - (lengthLine - startValue), style);
+		styler.ColourTo(endPos, SCE_ERR_VALUE);
+	} else {
+		styler.ColourTo(endPos, style);
+	}
+}
+
+static void ColouriseErrorListDoc(unsigned int startPos, int length, int, WordList *[], Accessor &styler) {
+	char lineBuffer[10000];
+	styler.StartAt(startPos);
+	styler.StartSegment(startPos);
+	unsigned int linePos = 0;
+	bool valueSeparate = styler.GetPropertyInt("lexer.errorlist.value.separate", 0) != 0;
+	for (unsigned int i = startPos; i < startPos + length; i++) {
+		lineBuffer[linePos++] = styler[i];
+		if (AtEOL(styler, i) || (linePos >= sizeof(lineBuffer) - 1)) {
+			// End of line (or of line buffer) met, colourise it
+			lineBuffer[linePos] = '\0';
+			ColouriseErrorListLine(lineBuffer, linePos, i, styler, valueSeparate);
+			linePos = 0;
+		}
+	}
+	if (linePos > 0) {	// Last line does not have ending characters
+		ColouriseErrorListLine(lineBuffer, linePos, startPos + length - 1, styler, valueSeparate);
+	}
+}
+
+static int isSpecial(char s) {
+	return (s == '\\') || (s == ',') || (s == ';') || (s == '\'') || (s == ' ') ||
+	       (s == '\"') || (s == '`') || (s == '^') || (s == '~');
+}
+
+static int isTag(int start, Accessor &styler) {
+	char s[6];
+	unsigned int i = 0, e = 1;
+	while (i < 5 && e) {
+		s[i] = styler[start + i];
+		i++;
+		e = styler[start + i] != '{';
+	}
+	s[i] = '\0';
+	return (strcmp(s, "begin") == 0) || (strcmp(s, "end") == 0);
+}
+
+static void ColouriseLatexDoc(unsigned int startPos, int length, int initStyle,
+                              WordList *[], Accessor &styler) {
+
+	styler.StartAt(startPos);
+
+	int state = initStyle;
+	char chNext = styler[startPos];
+	styler.StartSegment(startPos);
+	int lengthDoc = startPos + length;
+
+	for (int i = startPos; i < lengthDoc; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+
+		if (styler.IsLeadByte(ch)) {
+			chNext = styler.SafeGetCharAt(i + 2);
+			i++;
+			continue;
+		}
+		switch (state) {
+		case SCE_L_DEFAULT :
+			switch (ch) {
+			case '\\' :
+				styler.ColourTo(i - 1, state);
+				if (isSpecial(styler[i + 1])) {
+					styler.ColourTo(i + 1, SCE_L_COMMAND);
+					i++;
+					chNext = styler.SafeGetCharAt(i + 1);
+				} else {
+					if (isTag(i + 1, styler))
+						state = SCE_L_TAG;
+					else
+						state = SCE_L_COMMAND;
+				}
+				break;
+			case '$' :
+				styler.ColourTo(i - 1, state);
+				state = SCE_L_MATH;
+				if (chNext == '$') {
+					i++;
+					chNext = styler.SafeGetCharAt(i + 1);
+				}
+				break;
+			case '%' :
+				styler.ColourTo(i - 1, state);
+				state = SCE_L_COMMENT;
+				break;
+			}
+			break;
+		case SCE_L_COMMAND :
+			if (chNext == '[' || chNext == '{' || chNext == '}' ||
+			        chNext == ' ' || chNext == '\r' || chNext == '\n') {
+				styler.ColourTo(i, state);
+				state = SCE_L_DEFAULT;
+				i++;
+				chNext = styler.SafeGetCharAt(i + 1);
+			}
+			break;
+		case SCE_L_TAG :
+			if (ch == '}') {
+				styler.ColourTo(i, state);
+				state = SCE_L_DEFAULT;
+			}
+			break;
+		case SCE_L_MATH :
+			if (ch == '$') {
+				if (chNext == '$') {
+					i++;
+					chNext = styler.SafeGetCharAt(i + 1);
+				}
+				styler.ColourTo(i, state);
+				state = SCE_L_DEFAULT;
+			}
+			break;
+		case SCE_L_COMMENT :
+			if (ch == '\r' || ch == '\n') {
+				styler.ColourTo(i - 1, state);
+				state = SCE_L_DEFAULT;
+			}
+		}
+	}
+	styler.ColourTo(lengthDoc-1, state);
+}
+
+static const char * const batchWordListDesc[] = {
+	"Internal Commands",
+	"External Commands",
+	0
+};
+
+static const char * const emptyWordListDesc[] = {
+	0
+};
+
+static void ColouriseNullDoc(unsigned int startPos, int length, int, WordList *[],
+                            Accessor &styler) {
+	// Null language means all style bytes are 0 so just mark the end - no need to fill in.
+	if (length > 0) {
+		styler.StartAt(startPos + length - 1);
+		styler.StartSegment(startPos + length - 1);
+		styler.ColourTo(startPos + length - 1, 0);
+	}
+}
+
+LexerModule lmBatch(SCLEX_BATCH, ColouriseBatchDoc, "batch", 0, batchWordListDesc);
+LexerModule lmDiff(SCLEX_DIFF, ColouriseDiffDoc, "diff", FoldDiffDoc, emptyWordListDesc);
+LexerModule lmPo(SCLEX_PO, ColourisePoDoc, "po", 0, emptyWordListDesc);
+LexerModule lmProps(SCLEX_PROPERTIES, ColourisePropsDoc, "props", FoldPropsDoc, emptyWordListDesc);
+LexerModule lmMake(SCLEX_MAKEFILE, ColouriseMakeDoc, "makefile", 0, emptyWordListDesc);
+LexerModule lmErrorList(SCLEX_ERRORLIST, ColouriseErrorListDoc, "errorlist", 0, emptyWordListDesc);
+LexerModule lmLatex(SCLEX_LATEX, ColouriseLatexDoc, "latex", 0, emptyWordListDesc);
+LexerModule lmNull(SCLEX_NULL, ColouriseNullDoc, "null");
diff --git a/Documents/Scintilla/LexPB.cxx b/Documents/Scintilla/LexPB.cxx
new file mode 100644
index 0000000..abc0ddc
--- /dev/null
+++ b/Documents/Scintilla/LexPB.cxx
@@ -0,0 +1,362 @@
+// Scintilla source code edit control
+// @file LexPB.cxx
+// Lexer for PowerBasic by Roland Walter, roland@rowalt.de (for PowerBasic see www.powerbasic.com)
+//
+// Changes:
+// 17.10.2003: Toggling of subs/functions now until next sub/function - this gives better results
+// 29.10.2003: 1. Bug: Toggling didn't work for subs/functions added in editor
+//             2. Own colors for PB constants and Inline Assembler SCE_B_CONSTANT and SCE_B_ASM
+//             3. Several smaller syntax coloring improvements and speed optimizations
+// 12.07.2004: 1. Toggling for macros added
+//             2. Further folding speed optimitations (for people dealing with very large listings)
+//
+// Necessary changes for the PB lexer in Scintilla project:
+//  - In SciLexer.h and Scintilla.iface:
+//
+//    #define SCLEX_POWERBASIC 51       //ID for PowerBasic lexer
+//    (...)
+//    #define SCE_B_DEFAULT 0           //in both VB and PB lexer
+//    #define SCE_B_COMMENT 1           //in both VB and PB lexer
+//    #define SCE_B_NUMBER 2            //in both VB and PB lexer
+//    #define SCE_B_KEYWORD 3           //in both VB and PB lexer
+//    #define SCE_B_STRING 4            //in both VB and PB lexer
+//    #define SCE_B_PREPROCESSOR 5      //VB lexer only, not in PB lexer
+//    #define SCE_B_OPERATOR 6          //in both VB and PB lexer
+//    #define SCE_B_IDENTIFIER 7        //in both VB and PB lexer
+//    #define SCE_B_DATE 8              //VB lexer only, not in PB lexer
+//    #define SCE_B_CONSTANT 13         //PB lexer only, not in VB lexer
+//    #define SCE_B_ASM 14              //PB lexer only, not in VB lexer
+
+//  - Statement added to KeyWords.cxx:      'LINK_LEXER(lmPB);'
+//  - Statement added to scintilla_vc6.mak: '$(DIR_O)\LexPB.obj: ...\src\LexPB.cxx $(LEX_HEADERS)'
+//
+// Copyright for Scintilla: 1998-2001 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+static inline bool IsTypeCharacter(const int ch)
+{
+    return ch == '%' || ch == '&' || ch == '@' || ch == '!' || ch == '#' || ch == '$' || ch == '?';
+}
+
+static inline bool IsAWordChar(const int ch)
+{
+    return (ch < 0x80) && (isalnum(ch) || ch == '.' || ch == '_');
+}
+
+static inline bool IsAWordStart(const int ch)
+{
+    return (ch < 0x80) && (isalnum(ch) || ch == '_');
+}
+
+bool MatchUpperCase(Accessor &styler, int pos, const char *s)   //Same as styler.Match() but uppercase comparison (a-z,A-Z and space only)
+{
+    char ch;
+    for (int i=0; *s; i++)
+    {
+        ch=styler.SafeGetCharAt(pos+i);
+        if (ch > 0x60) ch -= '\x20';
+        if (*s != ch) return false;
+        s++;
+    }
+    return true;
+}
+
+static void ColourisePBDoc(unsigned int startPos, int length, int initStyle,WordList *keywordlists[],Accessor &styler) {
+
+    WordList &keywords = *keywordlists[0];
+
+    styler.StartAt(startPos);
+
+    StyleContext sc(startPos, length, initStyle, styler);
+
+    for (; sc.More(); sc.Forward()) {
+        switch (sc.state)
+        {
+            case SCE_B_OPERATOR:
+            {
+                sc.SetState(SCE_B_DEFAULT);
+                break;
+            }
+            case SCE_B_KEYWORD:
+            {
+                if (!IsAWordChar(sc.ch))
+                {
+                    if (!IsTypeCharacter(sc.ch))
+                    {
+                        char s[100];
+                        sc.GetCurrentLowered(s, sizeof(s));
+                        if (keywords.InList(s))
+                        {
+                            if (strcmp(s, "rem") == 0)
+                            {
+                                sc.ChangeState(SCE_B_COMMENT);
+                                if (sc.atLineEnd) {sc.SetState(SCE_B_DEFAULT);}
+                            }
+                            else if (strcmp(s, "asm") == 0)
+                            {
+                                sc.ChangeState(SCE_B_ASM);
+                                if (sc.atLineEnd) {sc.SetState(SCE_B_DEFAULT);}
+                            }
+                            else
+                            {
+                                sc.SetState(SCE_B_DEFAULT);
+                            }
+                        }
+                        else
+                        {
+                            sc.ChangeState(SCE_B_IDENTIFIER);
+                            sc.SetState(SCE_B_DEFAULT);
+                        }
+                    }
+                }
+                break;
+            }
+            case SCE_B_NUMBER:
+            {
+                if (!IsAWordChar(sc.ch)) {sc.SetState(SCE_B_DEFAULT);}
+                break;
+            }
+            case SCE_B_STRING:
+            {
+                if (sc.ch == '\"'){sc.ForwardSetState(SCE_B_DEFAULT);}
+                break;
+            }
+            case SCE_B_CONSTANT:
+            {
+                if (!IsAWordChar(sc.ch)) {sc.SetState(SCE_B_DEFAULT);}
+                break;
+            }
+            case SCE_B_COMMENT:
+            {
+                if (sc.atLineEnd) {sc.SetState(SCE_B_DEFAULT);}
+                break;
+            }
+            case SCE_B_ASM:
+            {
+                if (sc.atLineEnd) {sc.SetState(SCE_B_DEFAULT);}
+                break;
+            }
+        }  //switch (sc.state)
+
+        // Determine if a new state should be entered:
+        if (sc.state == SCE_B_DEFAULT)
+        {
+            if (sc.ch == '\'') {sc.SetState(SCE_B_COMMENT);}
+            else if (sc.ch == '\"') {sc.SetState(SCE_B_STRING);}
+            else if (sc.ch == '&' && tolower(sc.chNext) == 'h') {sc.SetState(SCE_B_NUMBER);}
+            else if (sc.ch == '&' && tolower(sc.chNext) == 'b') {sc.SetState(SCE_B_NUMBER);}
+            else if (sc.ch == '&' && tolower(sc.chNext) == 'o') {sc.SetState(SCE_B_NUMBER);}
+            else if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {sc.SetState(SCE_B_NUMBER);}
+            else if (IsAWordStart(sc.ch)) {sc.SetState(SCE_B_KEYWORD);}
+            else if (sc.ch == '%') {sc.SetState(SCE_B_CONSTANT);}
+            else if (sc.ch == '$') {sc.SetState(SCE_B_CONSTANT);}
+            else if (sc.ch == '#') {sc.SetState(SCE_B_KEYWORD);}
+            else if (sc.ch == '!') {sc.SetState(SCE_B_ASM);}
+            else if (isoperator(static_cast<char>(sc.ch)) || (sc.ch == '\\')) {sc.SetState(SCE_B_OPERATOR);}
+        }
+    }      //for (; sc.More(); sc.Forward())
+    sc.Complete();
+}
+
+//The folding routine for PowerBasic toggles SUBs and FUNCTIONs only. This was exactly what I wanted,
+//nothing more. I had worked with this kind of toggling for several years when I used the great good old
+//GFA Basic which is dead now. After testing the feature of toggling FOR-NEXT loops, WHILE-WEND loops
+//and so on too I found this is more disturbing then helping (for me). So if You think in another way
+//you can (or must) write Your own toggling routine ;-)
+static void FoldPBDoc(unsigned int startPos, int length, int, WordList *[], Accessor &styler)
+{
+    // No folding enabled, no reason to continue...
+    if( styler.GetPropertyInt("fold") == 0 )
+        return;
+
+    unsigned int endPos = startPos + length;
+    int lineCurrent = styler.GetLine(startPos);
+    int levelCurrent = SC_FOLDLEVELBASE;
+    if (lineCurrent > 0)
+        levelCurrent = styler.LevelAt(lineCurrent-1) >> 16;
+    int levelNext = levelCurrent;
+    char chNext = styler[startPos];
+
+    bool fNewLine=true;
+    bool fMightBeMultiLineMacro=false;
+    bool fBeginOfCommentFound=false;
+    for (unsigned int i = startPos; i < endPos; i++)
+    {
+        char ch = chNext;
+        chNext = styler.SafeGetCharAt(i + 1);
+
+        if (fNewLine)            //Begin of a new line (The Sub/Function/Macro keywords may occur at begin of line only)
+        {
+            fNewLine=false;
+            fBeginOfCommentFound=false;
+            switch (ch)
+            {
+            case ' ':      //Most lines start with space - so check this first, the code is the same as for 'default:'
+            case '\t':     //Handle tab too
+                {
+                    int levelUse = levelCurrent;
+                    int lev = levelUse | levelNext << 16;
+                    styler.SetLevel(lineCurrent, lev);
+                    break;
+                }
+            case 'F':
+            case 'f':
+                {
+					switch (chNext)
+					{
+                    case 'U':
+                    case 'u':
+						{
+							if( MatchUpperCase(styler,i,"FUNCTION") )
+							{
+								styler.SetLevel(lineCurrent, (SC_FOLDLEVELBASE << 16) | SC_FOLDLEVELHEADERFLAG);
+								levelNext=SC_FOLDLEVELBASE+1;
+							}
+							break;
+						}
+					}
+                break;
+                }
+            case 'S':
+            case 's':
+                {
+					switch (chNext)
+					{
+                    case 'U':
+                    case 'u':
+						{
+							if( MatchUpperCase(styler,i,"SUB") )
+							{
+								styler.SetLevel(lineCurrent, (SC_FOLDLEVELBASE << 16) | SC_FOLDLEVELHEADERFLAG);
+								levelNext=SC_FOLDLEVELBASE+1;
+							}
+							break;
+						}
+                    case 'T':
+                    case 't':
+						{
+							if( MatchUpperCase(styler,i,"STATIC FUNCTION") )
+							{
+								styler.SetLevel(lineCurrent, (SC_FOLDLEVELBASE << 16) | SC_FOLDLEVELHEADERFLAG);
+								levelNext=SC_FOLDLEVELBASE+1;
+							}
+							else if( MatchUpperCase(styler,i,"STATIC SUB") )
+							{
+								styler.SetLevel(lineCurrent, (SC_FOLDLEVELBASE << 16) | SC_FOLDLEVELHEADERFLAG);
+								levelNext=SC_FOLDLEVELBASE+1;
+							}
+							break;
+						}
+					}
+                break;
+                }
+            case 'C':
+            case 'c':
+                {
+					switch (chNext)
+					{
+                    case 'A':
+                    case 'a':
+						{
+							if( MatchUpperCase(styler,i,"CALLBACK FUNCTION") )
+							{
+								styler.SetLevel(lineCurrent, (SC_FOLDLEVELBASE << 16) | SC_FOLDLEVELHEADERFLAG);
+								levelNext=SC_FOLDLEVELBASE+1;
+							}
+							break;
+						}
+					}
+                break;
+                }
+            case 'M':
+            case 'm':
+                {
+					switch (chNext)
+					{
+                    case 'A':
+                    case 'a':
+						{
+							if( MatchUpperCase(styler,i,"MACRO") )
+							{
+								fMightBeMultiLineMacro=true;  //Set folder level at end of line, we have to check for single line macro
+							}
+							break;
+						}
+					}
+                break;
+                }
+            default:
+                {
+                    int levelUse = levelCurrent;
+                    int lev = levelUse | levelNext << 16;
+                    styler.SetLevel(lineCurrent, lev);
+                    break;
+                }
+            }  //switch (ch)
+        }  //if( fNewLine )
+
+        switch (ch)
+        {
+            case '=':                              //To test single line macros
+            {
+                if (fBeginOfCommentFound==false)
+                    fMightBeMultiLineMacro=false;  //The found macro is a single line macro only;
+                break;
+            }
+            case '\'':                             //A comment starts
+            {
+                fBeginOfCommentFound=true;
+                break;
+            }
+            case '\n':
+            {
+                if (fMightBeMultiLineMacro)        //The current line is the begin of a multi line macro
+                {
+                    fMightBeMultiLineMacro=false;
+                    styler.SetLevel(lineCurrent, (SC_FOLDLEVELBASE << 16) | SC_FOLDLEVELHEADERFLAG);
+                    levelNext=SC_FOLDLEVELBASE+1;
+                }
+                lineCurrent++;
+                levelCurrent = levelNext;
+                fNewLine=true;
+                break;
+            }
+            case '\r':
+            {
+                if (chNext != '\n')
+                {
+                    lineCurrent++;
+                    levelCurrent = levelNext;
+                    fNewLine=true;
+                }
+                break;
+            }
+        }  //switch (ch)
+    }  //for (unsigned int i = startPos; i < endPos; i++)
+}
+
+static const char * const pbWordListDesc[] = {
+    "Keywords",
+    0
+};
+
+LexerModule lmPB(SCLEX_POWERBASIC, ColourisePBDoc, "powerbasic", FoldPBDoc, pbWordListDesc);
diff --git a/Documents/Scintilla/LexPLM.cxx b/Documents/Scintilla/LexPLM.cxx
new file mode 100644
index 0000000..604850f
--- /dev/null
+++ b/Documents/Scintilla/LexPLM.cxx
@@ -0,0 +1,198 @@
+// Copyright (c) 1990-2007, Scientific Toolworks, Inc.
+// Author: Jason Haslam
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+#include "StyleContext.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+static void GetRange(unsigned int start,
+                     unsigned int end,
+                     Accessor &styler,
+                     char *s,
+                     unsigned int len) {
+	unsigned int i = 0;
+	while ((i < end - start + 1) && (i < len-1)) {
+		s[i] = static_cast<char>(tolower(styler[start + i]));
+		i++;
+	}
+	s[i] = '\0';
+}
+
+static void ColourisePlmDoc(unsigned int startPos,
+                            int length,
+                            int initStyle,
+                            WordList *keywordlists[],
+                            Accessor &styler)
+{
+	unsigned int endPos = startPos + length;
+	int state = initStyle;
+
+	styler.StartAt(startPos);
+	styler.StartSegment(startPos);
+
+	for (unsigned int i = startPos; i < endPos; i++) {
+		char ch = styler.SafeGetCharAt(i);
+		char chNext = styler.SafeGetCharAt(i + 1);
+
+		if (state == SCE_PLM_DEFAULT) {
+			if (ch == '/' && chNext == '*') {
+				styler.ColourTo(i - 1, state);
+				state = SCE_PLM_COMMENT;
+			} else if (ch == '\'') {
+				styler.ColourTo(i - 1, state);
+				state = SCE_PLM_STRING;
+			} else if (isdigit(ch)) {
+				styler.ColourTo(i - 1, state);
+				state = SCE_PLM_NUMBER;
+			} else if (isalpha(ch)) {
+				styler.ColourTo(i - 1, state);
+				state = SCE_PLM_IDENTIFIER;
+			} else if (ch == '+' || ch == '-' || ch == '*' || ch == '/' ||
+			           ch == '=' || ch == '<' || ch == '>' || ch == ':') {
+				styler.ColourTo(i - 1, state);
+				state = SCE_PLM_OPERATOR;
+			} else if (ch == '$') {
+				styler.ColourTo(i - 1, state);
+				state = SCE_PLM_CONTROL;
+			}
+		} else if (state == SCE_PLM_COMMENT) {
+			if (ch == '*' && chNext == '/') {
+				i++;
+				styler.ColourTo(i, state);
+				state = SCE_PLM_DEFAULT;
+			}
+		} else if (state == SCE_PLM_STRING) {
+			if (ch == '\'') {
+				if (chNext == '\'') {
+					i++;
+				} else {
+					styler.ColourTo(i, state);
+					state = SCE_PLM_DEFAULT;
+				}
+			}
+		} else if (state == SCE_PLM_NUMBER) {
+			if (!isdigit(ch) && !isalpha(ch) && ch != '$') {
+				i--;
+				styler.ColourTo(i, state);
+				state = SCE_PLM_DEFAULT;
+			}
+		} else if (state == SCE_PLM_IDENTIFIER) {
+			if (!isdigit(ch) && !isalpha(ch) && ch != '$') {
+				// Get the entire identifier.
+				char word[1024];
+				int segmentStart = styler.GetStartSegment();
+				GetRange(segmentStart, i - 1, styler, word, sizeof(word));
+
+				i--;
+				if (keywordlists[0]->InList(word))
+					styler.ColourTo(i, SCE_PLM_KEYWORD);
+				else
+					styler.ColourTo(i, state);
+				state = SCE_PLM_DEFAULT;
+			}
+		} else if (state == SCE_PLM_OPERATOR) {
+			if (ch != '=' && ch != '>') {
+				i--;
+				styler.ColourTo(i, state);
+				state = SCE_PLM_DEFAULT;
+			}
+		} else if (state == SCE_PLM_CONTROL) {
+			if (ch == '\r' || ch == '\n') {
+				styler.ColourTo(i - 1, state);
+				state = SCE_PLM_DEFAULT;
+			}
+		}
+	}
+	styler.ColourTo(endPos - 1, state);
+}
+
+static void FoldPlmDoc(unsigned int startPos,
+                       int length,
+                       int initStyle,
+                       WordList *[],
+                       Accessor &styler)
+{
+	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
+	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	unsigned int endPos = startPos + length;
+	int visibleChars = 0;
+	int lineCurrent = styler.GetLine(startPos);
+	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
+	int levelCurrent = levelPrev;
+	char chNext = styler[startPos];
+	int styleNext = styler.StyleAt(startPos);
+	int style = initStyle;
+	int startKeyword = 0;
+
+	for (unsigned int i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int stylePrev = style;
+		style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+
+		if (stylePrev != SCE_PLM_KEYWORD && style == SCE_PLM_KEYWORD)
+			startKeyword = i;
+
+		if (style == SCE_PLM_KEYWORD && styleNext != SCE_PLM_KEYWORD) {
+			char word[1024];
+			GetRange(startKeyword, i, styler, word, sizeof(word));
+
+			if (strcmp(word, "procedure") == 0 || strcmp(word, "do") == 0)
+				levelCurrent++;
+			else if (strcmp(word, "end") == 0)
+				levelCurrent--;
+		}
+
+		if (foldComment) {
+			if (stylePrev != SCE_PLM_COMMENT && style == SCE_PLM_COMMENT)
+				levelCurrent++;
+			else if (stylePrev == SCE_PLM_COMMENT && style != SCE_PLM_COMMENT)
+				levelCurrent--;
+		}
+
+		if (atEOL) {
+			int lev = levelPrev;
+			if (visibleChars == 0 && foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if ((levelCurrent > levelPrev) && (visibleChars > 0))
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelPrev = levelCurrent;
+			visibleChars = 0;
+		}
+
+		if (!isspacechar(ch))
+			visibleChars++;
+	}
+
+	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
+}
+
+static const char *const plmWordListDesc[] = {
+	"Keywords",
+	0
+};
+
+LexerModule lmPLM(SCLEX_PLM, ColourisePlmDoc, "PL/M", FoldPlmDoc, plmWordListDesc);
diff --git a/Documents/Scintilla/LexPOV.cxx b/Documents/Scintilla/LexPOV.cxx
new file mode 100644
index 0000000..b845b2d
--- /dev/null
+++ b/Documents/Scintilla/LexPOV.cxx
@@ -0,0 +1,316 @@
+// Scintilla source code edit control
+/** @file LexPOV.cxx
+ ** Lexer for POV-Ray SDL (Persistance of Vision Raytracer, Scene Description Language).
+ ** Written by Philippe Lhoste but this is mostly a derivative of LexCPP...
+ **/
+// Copyright 1998-2005 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+// Some points that distinguish from a simple C lexer:
+// Identifiers start only by a character.
+// No line continuation character.
+// Strings are limited to 256 characters.
+// Directives are similar to preprocessor commands,
+// but we match directive keywords and colorize incorrect ones.
+// Block comments can be nested (code stolen from my code in LexLua).
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+static inline bool IsAWordChar(int ch) {
+	return ch < 0x80 && (isalnum(ch) || ch == '_');
+}
+
+static inline bool IsAWordStart(int ch) {
+	return ch < 0x80 && isalpha(ch);
+}
+
+static inline bool IsANumberChar(int ch) {
+	// Not exactly following number definition (several dots are seen as OK, etc.)
+	// but probably enough in most cases.
+	return (ch < 0x80) &&
+	        (isdigit(ch) || toupper(ch) == 'E' ||
+             ch == '.' || ch == '-' || ch == '+');
+}
+
+static void ColourisePovDoc(
+	unsigned int startPos,
+	int length,
+	int initStyle,
+	WordList *keywordlists[],
+    Accessor &styler) {
+
+	WordList &keywords1 = *keywordlists[0];
+	WordList &keywords2 = *keywordlists[1];
+	WordList &keywords3 = *keywordlists[2];
+	WordList &keywords4 = *keywordlists[3];
+	WordList &keywords5 = *keywordlists[4];
+	WordList &keywords6 = *keywordlists[5];
+	WordList &keywords7 = *keywordlists[6];
+	WordList &keywords8 = *keywordlists[7];
+
+	int currentLine = styler.GetLine(startPos);
+	// Initialize the block comment /* */ nesting level, if we are inside such a comment.
+	int blockCommentLevel = 0;
+	if (initStyle == SCE_POV_COMMENT) {
+		blockCommentLevel = styler.GetLineState(currentLine - 1);
+	}
+
+	// Do not leak onto next line
+	if (initStyle == SCE_POV_STRINGEOL || initStyle == SCE_POV_COMMENTLINE) {
+		initStyle = SCE_POV_DEFAULT;
+	}
+
+	short stringLen = 0;
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	for (; sc.More(); sc.Forward()) {
+		if (sc.atLineEnd) {
+			// Update the line state, so it can be seen by next line
+			currentLine = styler.GetLine(sc.currentPos);
+			if (sc.state == SCE_POV_COMMENT) {
+				// Inside a block comment, we set the line state
+				styler.SetLineState(currentLine, blockCommentLevel);
+			} else {
+				// Reset the line state
+				styler.SetLineState(currentLine, 0);
+			}
+		}
+
+		if (sc.atLineStart && (sc.state == SCE_POV_STRING)) {
+			// Prevent SCE_POV_STRINGEOL from leaking back to previous line
+			sc.SetState(SCE_POV_STRING);
+		}
+
+		// Determine if the current state should terminate.
+		if (sc.state == SCE_POV_OPERATOR) {
+			sc.SetState(SCE_POV_DEFAULT);
+		} else if (sc.state == SCE_POV_NUMBER) {
+			// We stop the number definition on non-numerical non-dot non-eE non-sign char
+			if (!IsANumberChar(sc.ch)) {
+				sc.SetState(SCE_POV_DEFAULT);
+			}
+		} else if (sc.state == SCE_POV_IDENTIFIER) {
+			if (!IsAWordChar(sc.ch)) {
+				char s[100];
+				sc.GetCurrent(s, sizeof(s));
+				if (keywords2.InList(s)) {
+					sc.ChangeState(SCE_POV_WORD2);
+				} else if (keywords3.InList(s)) {
+					sc.ChangeState(SCE_POV_WORD3);
+				} else if (keywords4.InList(s)) {
+					sc.ChangeState(SCE_POV_WORD4);
+				} else if (keywords5.InList(s)) {
+					sc.ChangeState(SCE_POV_WORD5);
+				} else if (keywords6.InList(s)) {
+					sc.ChangeState(SCE_POV_WORD6);
+				} else if (keywords7.InList(s)) {
+					sc.ChangeState(SCE_POV_WORD7);
+				} else if (keywords8.InList(s)) {
+					sc.ChangeState(SCE_POV_WORD8);
+				}
+				sc.SetState(SCE_POV_DEFAULT);
+			}
+		} else if (sc.state == SCE_POV_DIRECTIVE) {
+			if (!IsAWordChar(sc.ch)) {
+				char s[100];
+				char *p;
+				sc.GetCurrent(s, sizeof(s));
+				p = s;
+				// Skip # and whitespace between # and directive word
+				do {
+					p++;
+				} while ((*p == ' ' || *p == '\t') && *p != '\0');
+				if (!keywords1.InList(p)) {
+					sc.ChangeState(SCE_POV_BADDIRECTIVE);
+				}
+				sc.SetState(SCE_POV_DEFAULT);
+			}
+		} else if (sc.state == SCE_POV_COMMENT) {
+			if (sc.Match('/', '*')) {
+				blockCommentLevel++;
+				sc.Forward();
+			} else if (sc.Match('*', '/') && blockCommentLevel > 0) {
+				blockCommentLevel--;
+				sc.Forward();
+				if (blockCommentLevel == 0) {
+					sc.ForwardSetState(SCE_POV_DEFAULT);
+				}
+			}
+		} else if (sc.state == SCE_POV_COMMENTLINE) {
+			if (sc.atLineEnd) {
+				sc.ForwardSetState(SCE_POV_DEFAULT);
+			}
+		} else if (sc.state == SCE_POV_STRING) {
+			if (sc.ch == '\\') {
+				stringLen++;
+				if (strchr("abfnrtuv0'\"", sc.chNext)) {
+					// Compound characters are counted as one.
+					// Note: for Unicode chars \u, we shouldn't count the next 4 digits...
+					sc.Forward();
+				}
+			} else if (sc.ch == '\"') {
+				sc.ForwardSetState(SCE_POV_DEFAULT);
+			} else if (sc.atLineEnd) {
+				sc.ChangeState(SCE_POV_STRINGEOL);
+				sc.ForwardSetState(SCE_POV_DEFAULT);
+			} else {
+				stringLen++;
+			}
+			if (stringLen > 256) {
+				// Strings are limited to 256 chars
+				sc.SetState(SCE_POV_STRINGEOL);
+			}
+		} else if (sc.state == SCE_POV_STRINGEOL) {
+			if (sc.ch == '\\') {
+				if (sc.chNext == '\"' || sc.chNext == '\\') {
+					sc.Forward();
+				}
+			} else if (sc.ch == '\"') {
+				sc.ForwardSetState(SCE_C_DEFAULT);
+			} else if (sc.atLineEnd) {
+				sc.ForwardSetState(SCE_POV_DEFAULT);
+			}
+		}
+
+		// Determine if a new state should be entered.
+		if (sc.state == SCE_POV_DEFAULT) {
+			if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
+				sc.SetState(SCE_POV_NUMBER);
+			} else if (IsAWordStart(sc.ch)) {
+				sc.SetState(SCE_POV_IDENTIFIER);
+			} else if (sc.Match('/', '*')) {
+				blockCommentLevel = 1;
+				sc.SetState(SCE_POV_COMMENT);
+				sc.Forward();	// Eat the * so it isn't used for the end of the comment
+			} else if (sc.Match('/', '/')) {
+				sc.SetState(SCE_POV_COMMENTLINE);
+			} else if (sc.ch == '\"') {
+				sc.SetState(SCE_POV_STRING);
+				stringLen = 0;
+			} else if (sc.ch == '#') {
+				sc.SetState(SCE_POV_DIRECTIVE);
+				// Skip whitespace between # and directive word
+				do {
+					sc.Forward();
+				} while ((sc.ch == ' ' || sc.ch == '\t') && sc.More());
+				if (sc.atLineEnd) {
+					sc.SetState(SCE_POV_DEFAULT);
+				}
+			} else if (isoperator(static_cast<char>(sc.ch))) {
+				sc.SetState(SCE_POV_OPERATOR);
+			}
+		}
+	}
+	sc.Complete();
+}
+
+static void FoldPovDoc(
+	unsigned int startPos,
+	int length,
+	int initStyle,
+	WordList *[],
+	Accessor &styler) {
+
+	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
+	bool foldDirective = styler.GetPropertyInt("fold.directive") != 0;
+	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	unsigned int endPos = startPos + length;
+	int visibleChars = 0;
+	int lineCurrent = styler.GetLine(startPos);
+	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
+	int levelCurrent = levelPrev;
+	char chNext = styler[startPos];
+	int styleNext = styler.StyleAt(startPos);
+	int style = initStyle;
+	for (unsigned int i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int stylePrev = style;
+		style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+		if (foldComment && (style == SCE_POV_COMMENT)) {
+			if (stylePrev != SCE_POV_COMMENT) {
+				levelCurrent++;
+			} else if ((styleNext != SCE_POV_COMMENT) && !atEOL) {
+				// Comments don't end at end of line and the next character may be unstyled.
+				levelCurrent--;
+			}
+		}
+		if (foldComment && (style == SCE_POV_COMMENTLINE)) {
+			if ((ch == '/') && (chNext == '/')) {
+				char chNext2 = styler.SafeGetCharAt(i + 2);
+				if (chNext2 == '{') {
+					levelCurrent++;
+				} else if (chNext2 == '}') {
+					levelCurrent--;
+				}
+			}
+		}
+		if (foldDirective && (style == SCE_POV_DIRECTIVE)) {
+			if (ch == '#') {
+				unsigned int j=i+1;
+				while ((j<endPos) && IsASpaceOrTab(styler.SafeGetCharAt(j))) {
+					j++;
+				}
+			}
+		}
+		if (style == SCE_POV_OPERATOR) {
+			if (ch == '{') {
+				levelCurrent++;
+			} else if (ch == '}') {
+				levelCurrent--;
+			}
+		}
+		if (atEOL) {
+			int lev = levelPrev;
+			if (visibleChars == 0 && foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if ((levelCurrent > levelPrev) && (visibleChars > 0))
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelPrev = levelCurrent;
+			visibleChars = 0;
+		}
+		if (!isspacechar(ch))
+			visibleChars++;
+	}
+	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
+	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
+}
+
+static const char * const povWordLists[] = {
+	"Language directives",
+	"Objects & CSG & Appearance",
+	"Types & Modifiers & Items",
+	"Predefined Identifiers",
+	"Predefined Functions",
+	"User defined 1",
+	"User defined 2",
+	"User defined 3",
+	0,
+};
+
+LexerModule lmPOV(SCLEX_POV, ColourisePovDoc, "pov", FoldPovDoc, povWordLists);
diff --git a/Documents/Scintilla/LexPS.cxx b/Documents/Scintilla/LexPS.cxx
new file mode 100644
index 0000000..2edcff1
--- /dev/null
+++ b/Documents/Scintilla/LexPS.cxx
@@ -0,0 +1,347 @@
+// Scintilla source code edit control
+/** @file LexPS.cxx
+ ** Lexer for PostScript
+ **
+ ** Written by Nigel Hathaway <nigel@bprj.co.uk>.
+ ** The License.txt file describes the conditions under which this software may be distributed.
+ **/
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdarg.h>
+#include <stdio.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+static inline bool IsASelfDelimitingChar(const int ch) {
+    return (ch == '[' || ch == ']' || ch == '{' || ch == '}' ||
+            ch == '/' || ch == '<' || ch == '>' ||
+            ch == '(' || ch == ')' || ch == '%');
+}
+
+static inline bool IsAWhitespaceChar(const int ch) {
+    return (ch == ' '  || ch == '\t' || ch == '\r' ||
+            ch == '\n' || ch == '\f' || ch == '\0');
+}
+
+static bool IsABaseNDigit(const int ch, const int base) {
+    int maxdig = '9';
+    int letterext = -1;
+
+    if (base <= 10)
+        maxdig = '0' + base - 1;
+    else
+        letterext = base - 11;
+
+    return ((ch >= '0' && ch <= maxdig) ||
+            (ch >= 'A' && ch <= ('A' + letterext)) ||
+            (ch >= 'a' && ch <= ('a' + letterext)));
+}
+
+static inline bool IsABase85Char(const int ch) {
+    return ((ch >= '!' && ch <= 'u') || ch == 'z');
+}
+
+static void ColourisePSDoc(
+    unsigned int startPos,
+    int length,
+    int initStyle,
+    WordList *keywordlists[],
+    Accessor &styler) {
+
+    WordList &keywords1 = *keywordlists[0];
+    WordList &keywords2 = *keywordlists[1];
+    WordList &keywords3 = *keywordlists[2];
+    WordList &keywords4 = *keywordlists[3];
+    WordList &keywords5 = *keywordlists[4];
+
+    StyleContext sc(startPos, length, initStyle, styler);
+
+    bool tokenizing = styler.GetPropertyInt("ps.tokenize") != 0;
+    int pslevel = styler.GetPropertyInt("ps.level", 3);
+    int lineCurrent = styler.GetLine(startPos);
+    int nestTextCurrent = 0;
+    if (lineCurrent > 0 && initStyle == SCE_PS_TEXT)
+        nestTextCurrent = styler.GetLineState(lineCurrent - 1);
+    int numRadix = 0;
+    bool numHasPoint = false;
+    bool numHasExponent = false;
+    bool numHasSign = false;
+
+    // Clear out existing tokenization
+    if (tokenizing && length > 0) {
+        styler.StartAt(startPos, static_cast<char>(INDIC2_MASK));
+        styler.ColourTo(startPos + length-1, 0);
+        styler.Flush();
+        styler.StartAt(startPos);
+        styler.StartSegment(startPos);
+    }
+
+    for (; sc.More(); sc.Forward()) {
+        if (sc.atLineStart)
+            lineCurrent = styler.GetLine(sc.currentPos);
+
+        // Determine if the current state should terminate.
+        if (sc.state == SCE_PS_COMMENT || sc.state == SCE_PS_DSC_VALUE) {
+            if (sc.atLineEnd) {
+                sc.SetState(SCE_C_DEFAULT);
+            }
+        } else if (sc.state == SCE_PS_DSC_COMMENT) {
+            if (sc.ch == ':') {
+                sc.Forward();
+                if (!sc.atLineEnd)
+                    sc.SetState(SCE_PS_DSC_VALUE);
+                else
+                    sc.SetState(SCE_C_DEFAULT);
+            } else if (sc.atLineEnd) {
+                sc.SetState(SCE_C_DEFAULT);
+            } else if (IsAWhitespaceChar(sc.ch) && sc.ch != '\r') {
+                sc.ChangeState(SCE_PS_COMMENT);
+            }
+        } else if (sc.state == SCE_PS_NUMBER) {
+            if (IsASelfDelimitingChar(sc.ch) || IsAWhitespaceChar(sc.ch)) {
+                if ((sc.chPrev == '+' || sc.chPrev == '-' ||
+                     sc.chPrev == 'E' || sc.chPrev == 'e') && numRadix == 0)
+                    sc.ChangeState(SCE_PS_NAME);
+                sc.SetState(SCE_C_DEFAULT);
+            } else if (sc.ch == '#') {
+                if (numHasPoint || numHasExponent || numHasSign || numRadix != 0) {
+                    sc.ChangeState(SCE_PS_NAME);
+                } else {
+                    char szradix[5];
+                    sc.GetCurrent(szradix, 4);
+                    numRadix = atoi(szradix);
+                    if (numRadix < 2 || numRadix > 36)
+                        sc.ChangeState(SCE_PS_NAME);
+                }
+            } else if ((sc.ch == 'E' || sc.ch == 'e') && numRadix == 0) {
+                if (numHasExponent) {
+                    sc.ChangeState(SCE_PS_NAME);
+                } else {
+                    numHasExponent = true;
+                    if (sc.chNext == '+' || sc.chNext == '-')
+                        sc.Forward();
+                }
+            } else if (sc.ch == '.') {
+                if (numHasPoint || numHasExponent || numRadix != 0) {
+                    sc.ChangeState(SCE_PS_NAME);
+                } else {
+                    numHasPoint = true;
+                }
+            } else if (numRadix == 0) {
+                if (!IsABaseNDigit(sc.ch, 10))
+                    sc.ChangeState(SCE_PS_NAME);
+            } else {
+                if (!IsABaseNDigit(sc.ch, numRadix))
+                    sc.ChangeState(SCE_PS_NAME);
+            }
+        } else if (sc.state == SCE_PS_NAME || sc.state == SCE_PS_KEYWORD) {
+            if (IsASelfDelimitingChar(sc.ch) || IsAWhitespaceChar(sc.ch)) {
+                char s[100];
+                sc.GetCurrent(s, sizeof(s));
+                if ((pslevel >= 1 && keywords1.InList(s)) ||
+                    (pslevel >= 2 && keywords2.InList(s)) ||
+                    (pslevel >= 3 && keywords3.InList(s)) ||
+                    keywords4.InList(s) || keywords5.InList(s)) {
+                    sc.ChangeState(SCE_PS_KEYWORD);
+                }
+                sc.SetState(SCE_C_DEFAULT);
+            }
+        } else if (sc.state == SCE_PS_LITERAL || sc.state == SCE_PS_IMMEVAL) {
+            if (IsASelfDelimitingChar(sc.ch) || IsAWhitespaceChar(sc.ch))
+                sc.SetState(SCE_C_DEFAULT);
+        } else if (sc.state == SCE_PS_PAREN_ARRAY || sc.state == SCE_PS_PAREN_DICT ||
+                   sc.state == SCE_PS_PAREN_PROC) {
+            sc.SetState(SCE_C_DEFAULT);
+        } else if (sc.state == SCE_PS_TEXT) {
+            if (sc.ch == '(') {
+                nestTextCurrent++;
+            } else if (sc.ch == ')') {
+                if (--nestTextCurrent == 0)
+                   sc.ForwardSetState(SCE_PS_DEFAULT);
+            } else if (sc.ch == '\\') {
+                sc.Forward();
+            }
+        } else if (sc.state == SCE_PS_HEXSTRING) {
+            if (sc.ch == '>') {
+                sc.ForwardSetState(SCE_PS_DEFAULT);
+            } else if (!IsABaseNDigit(sc.ch, 16) && !IsAWhitespaceChar(sc.ch)) {
+                sc.SetState(SCE_PS_HEXSTRING);
+                styler.ColourTo(sc.currentPos, SCE_PS_BADSTRINGCHAR);
+            }
+        } else if (sc.state == SCE_PS_BASE85STRING) {
+            if (sc.Match('~', '>')) {
+                sc.Forward();
+                sc.ForwardSetState(SCE_PS_DEFAULT);
+            } else if (!IsABase85Char(sc.ch) && !IsAWhitespaceChar(sc.ch)) {
+                sc.SetState(SCE_PS_BASE85STRING);
+                styler.ColourTo(sc.currentPos, SCE_PS_BADSTRINGCHAR);
+            }
+        }
+
+        // Determine if a new state should be entered.
+        if (sc.state == SCE_C_DEFAULT) {
+            unsigned int tokenpos = sc.currentPos;
+
+            if (sc.ch == '[' || sc.ch == ']') {
+                sc.SetState(SCE_PS_PAREN_ARRAY);
+            } else if (sc.ch == '{' || sc.ch == '}') {
+                sc.SetState(SCE_PS_PAREN_PROC);
+            } else if (sc.ch == '/') {
+                if (sc.chNext == '/') {
+                    sc.SetState(SCE_PS_IMMEVAL);
+                    sc.Forward();
+                } else {
+                    sc.SetState(SCE_PS_LITERAL);
+                }
+            } else if (sc.ch == '<') {
+                if (sc.chNext == '<') {
+                    sc.SetState(SCE_PS_PAREN_DICT);
+                    sc.Forward();
+                } else if (sc.chNext == '~') {
+                    sc.SetState(SCE_PS_BASE85STRING);
+                    sc.Forward();
+                } else {
+                    sc.SetState(SCE_PS_HEXSTRING);
+                }
+            } else if (sc.ch == '>' && sc.chNext == '>') {
+                    sc.SetState(SCE_PS_PAREN_DICT);
+                    sc.Forward();
+            } else if (sc.ch == '>' || sc.ch == ')') {
+                sc.SetState(SCE_C_DEFAULT);
+                styler.ColourTo(sc.currentPos, SCE_PS_BADSTRINGCHAR);
+            } else if (sc.ch == '(') {
+                sc.SetState(SCE_PS_TEXT);
+                nestTextCurrent = 1;
+            } else if (sc.ch == '%') {
+                if (sc.chNext == '%' && sc.atLineStart) {
+                    sc.SetState(SCE_PS_DSC_COMMENT);
+                    sc.Forward();
+                    if (sc.chNext == '+') {
+                        sc.Forward();
+                        sc.ForwardSetState(SCE_PS_DSC_VALUE);
+                    }
+                } else {
+                    sc.SetState(SCE_PS_COMMENT);
+                }
+            } else if ((sc.ch == '+' || sc.ch == '-' || sc.ch == '.') &&
+                       IsABaseNDigit(sc.chNext, 10)) {
+                sc.SetState(SCE_PS_NUMBER);
+                numRadix = 0;
+                numHasPoint = (sc.ch == '.');
+                numHasExponent = false;
+                numHasSign = (sc.ch == '+' || sc.ch == '-');
+            } else if ((sc.ch == '+' || sc.ch == '-') && sc.chNext == '.' &&
+                       IsABaseNDigit(sc.GetRelative(2), 10)) {
+                sc.SetState(SCE_PS_NUMBER);
+                numRadix = 0;
+                numHasPoint = false;
+                numHasExponent = false;
+                numHasSign = true;
+            } else if (IsABaseNDigit(sc.ch, 10)) {
+                sc.SetState(SCE_PS_NUMBER);
+                numRadix = 0;
+                numHasPoint = false;
+                numHasExponent = false;
+                numHasSign = false;
+            } else if (!IsAWhitespaceChar(sc.ch)) {
+                sc.SetState(SCE_PS_NAME);
+            }
+
+            // Mark the start of tokens
+            if (tokenizing && sc.state != SCE_C_DEFAULT && sc.state != SCE_PS_COMMENT &&
+                sc.state != SCE_PS_DSC_COMMENT && sc.state != SCE_PS_DSC_VALUE) {
+                styler.Flush();
+                styler.StartAt(tokenpos, static_cast<char>(INDIC2_MASK));
+                styler.ColourTo(tokenpos, INDIC2_MASK);
+                styler.Flush();
+                styler.StartAt(tokenpos);
+                styler.StartSegment(tokenpos);
+            }
+        }
+
+        if (sc.atLineEnd)
+            styler.SetLineState(lineCurrent, nestTextCurrent);
+    }
+
+    sc.Complete();
+}
+
+static void FoldPSDoc(unsigned int startPos, int length, int, WordList *[],
+                       Accessor &styler) {
+    bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+    bool foldAtElse = styler.GetPropertyInt("fold.at.else", 0) != 0;
+    unsigned int endPos = startPos + length;
+    int visibleChars = 0;
+    int lineCurrent = styler.GetLine(startPos);
+    int levelCurrent = SC_FOLDLEVELBASE;
+    if (lineCurrent > 0)
+        levelCurrent = styler.LevelAt(lineCurrent-1) >> 16;
+    int levelMinCurrent = levelCurrent;
+    int levelNext = levelCurrent;
+    char chNext = styler[startPos];
+    int styleNext = styler.StyleAt(startPos);
+    int style;
+    for (unsigned int i = startPos; i < endPos; i++) {
+        char ch = chNext;
+        chNext = styler.SafeGetCharAt(i + 1);
+        style = styleNext;
+        styleNext = styler.StyleAt(i + 1);
+        bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');  //mac??
+        if ((style & 31) == SCE_PS_PAREN_PROC) {
+            if (ch == '{') {
+                // Measure the minimum before a '{' to allow
+                // folding on "} {"
+                if (levelMinCurrent > levelNext) {
+                    levelMinCurrent = levelNext;
+                }
+                levelNext++;
+            } else if (ch == '}') {
+                levelNext--;
+            }
+        }
+        if (atEOL) {
+            int levelUse = levelCurrent;
+            if (foldAtElse) {
+                levelUse = levelMinCurrent;
+            }
+            int lev = levelUse | levelNext << 16;
+            if (visibleChars == 0 && foldCompact)
+                lev |= SC_FOLDLEVELWHITEFLAG;
+            if (levelUse < levelNext)
+                lev |= SC_FOLDLEVELHEADERFLAG;
+            if (lev != styler.LevelAt(lineCurrent)) {
+                styler.SetLevel(lineCurrent, lev);
+            }
+            lineCurrent++;
+            levelCurrent = levelNext;
+            levelMinCurrent = levelCurrent;
+            visibleChars = 0;
+        }
+        if (!isspacechar(ch))
+            visibleChars++;
+    }
+}
+
+static const char * const psWordListDesc[] = {
+    "PS Level 1 operators",
+    "PS Level 2 operators",
+    "PS Level 3 operators",
+    "RIP-specific operators",
+    "User-defined operators",
+    0
+};
+
+LexerModule lmPS(SCLEX_PS, ColourisePSDoc, "ps", FoldPSDoc, psWordListDesc);
diff --git a/Documents/Scintilla/LexPascal.cxx b/Documents/Scintilla/LexPascal.cxx
new file mode 100644
index 0000000..0e45760
--- /dev/null
+++ b/Documents/Scintilla/LexPascal.cxx
@@ -0,0 +1,373 @@
+// Scintilla source code edit control
+/** @file LexPascal.cxx
+ ** Lexer for Pascal.
+ ** Written by Laurent le Tynevez
+ ** Updated by Simon Steele <s.steele@pnotepad.org> September 2002
+ ** Updated by Mathias Rauen <scite@madshi.net> May 2003 (Delphi adjustments)
+ **/
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+#include "StyleContext.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+static void getRange(unsigned int start,
+		unsigned int end,
+		Accessor &styler,
+		char *s,
+		unsigned int len) {
+	unsigned int i = 0;
+	while ((i < end - start + 1) && (i < len-1)) {
+		s[i] = static_cast<char>(tolower(styler[start + i]));
+		i++;
+	}
+	s[i] = '\0';
+}
+
+static bool IsStreamCommentStyle(int style) {
+	return style == SCE_C_COMMENT ||
+		style == SCE_C_COMMENTDOC ||
+		style == SCE_C_COMMENTDOCKEYWORD ||
+		style == SCE_C_COMMENTDOCKEYWORDERROR;
+}
+
+static void ColourTo(Accessor &styler, unsigned int end, unsigned int attr, bool bInAsm) {
+	if ((bInAsm) && (attr == SCE_C_OPERATOR || attr == SCE_C_NUMBER || attr == SCE_C_DEFAULT || attr == SCE_C_WORD || attr == SCE_C_IDENTIFIER)) {
+		styler.ColourTo(end, SCE_C_REGEX);
+	} else
+		styler.ColourTo(end, attr);
+}
+
+// returns 1 if the item starts a class definition, and -1 if the word is "end", and 2 if the word is "asm"
+static int classifyWordPascal(unsigned int start, unsigned int end, /*WordList &keywords*/WordList *keywordlists[], Accessor &styler, bool bInClass, bool bInAsm) {
+	int ret = 0;
+
+	WordList& keywords = *keywordlists[0];
+	WordList& classwords = *keywordlists[1];
+
+	char s[100];
+	getRange(start, end, styler, s, sizeof(s));
+
+	char chAttr = SCE_C_IDENTIFIER;
+	if (isdigit(s[0]) || (s[0] == '.') ||(s[0] == '$')) {
+		chAttr = SCE_C_NUMBER;
+	}
+	else {
+		if (s[0] == '#') {
+			chAttr = SCE_C_CHARACTER;
+		}
+		else {
+			if (keywords.InList(s)) {
+				chAttr = SCE_C_WORD;
+
+				if(strcmp(s, "class") == 0) {
+					ret = 1;
+				}
+				else if (strcmp(s, "asm") == 0) {
+					ret = 2;
+				}
+				else if (strcmp(s, "end") == 0) {
+					ret = -1;
+				}
+			} else if (bInClass) {
+				if (classwords.InList(s)) {
+					chAttr = SCE_C_WORD;
+				}
+			}
+		}
+	}
+	ColourTo(styler, end, chAttr, (bInAsm && ret != -1));
+	return ret;
+}
+
+static int classifyFoldPointPascal(const char* s) {
+	int lev = 0;
+	if (!(isdigit(s[0]) || (s[0] == '.'))) {
+		if (strcmp(s, "begin") == 0 ||
+			strcmp(s, "object") == 0 ||
+			strcmp(s, "case") == 0 ||
+			strcmp(s, "class") == 0 ||
+			strcmp(s, "record") == 0 ||
+			strcmp(s, "try") == 0) {
+			lev=1;
+		} else if (strcmp(s, "end") == 0) {
+			lev=-1;
+		}
+	}
+	return lev;
+}
+
+static void ColourisePascalDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
+	Accessor &styler) {
+
+	styler.StartAt(startPos);
+
+	int state = initStyle;
+	if (state == SCE_C_CHARACTER)	// Does not leak onto next line
+		state = SCE_C_DEFAULT;
+	char chPrev = ' ';
+	char chNext = styler[startPos];
+	unsigned int lengthDoc = startPos + length;
+
+	bool bInClassDefinition;
+
+	int currentLine = styler.GetLine(startPos);
+	if (currentLine > 0) {
+		styler.SetLineState(currentLine, styler.GetLineState(currentLine-1));
+		bInClassDefinition = (styler.GetLineState(currentLine) == 1);
+	} else {
+		styler.SetLineState(currentLine, 0);
+		bInClassDefinition = false;
+	}
+
+	bool bInAsm = (state == SCE_C_REGEX);
+	if (bInAsm)
+		state = SCE_C_DEFAULT;
+
+	styler.StartSegment(startPos);
+	for (unsigned int i = startPos; i < lengthDoc; i++) {
+		char ch = chNext;
+
+		chNext = styler.SafeGetCharAt(i + 1);
+
+		if ((ch == '\r' && chNext != '\n') || (ch == '\n')) {
+			// Trigger on CR only (Mac style) or either on LF from CR+LF (Dos/Win) or on LF alone (Unix)
+			// Avoid triggering two times on Dos/Win
+			// End of line
+			if (state == SCE_C_CHARACTER) {
+				ColourTo(styler, i, state, bInAsm);
+				state = SCE_C_DEFAULT;
+			}
+			currentLine++;
+			styler.SetLineState(currentLine, (bInClassDefinition ? 1 : 0));
+		}
+
+		if (styler.IsLeadByte(ch)) {
+			chNext = styler.SafeGetCharAt(i + 2);
+			chPrev = ' ';
+			i += 1;
+			continue;
+		}
+
+		if (state == SCE_C_DEFAULT) {
+			if (iswordstart(ch) || ch == '#' || ch == '$' || (ch == '@' && bInAsm)) {
+				ColourTo(styler, i-1, state, bInAsm);
+				state = SCE_C_IDENTIFIER;
+			} else if (ch == '{' && chNext != '$' && chNext != '&') {
+				ColourTo(styler, i-1, state, bInAsm);
+				state = SCE_C_COMMENT;
+			} else if (ch == '(' && chNext == '*'
+						&& styler.SafeGetCharAt(i + 2) != '$'
+						&& styler.SafeGetCharAt(i + 2) != '&') {
+				ColourTo(styler, i-1, state, bInAsm);
+				state = SCE_C_COMMENTDOC;
+			} else if (ch == '/' && chNext == '/') {
+				ColourTo(styler, i-1, state, bInAsm);
+				state = SCE_C_COMMENTLINE;
+			} else if (ch == '\'') {
+				ColourTo(styler, i-1, state, bInAsm);
+				state = SCE_C_CHARACTER;
+			} else if (ch == '{' && (chNext == '$' || chNext=='&')) {
+				ColourTo(styler, i-1, state, bInAsm);
+				state = SCE_C_PREPROCESSOR;
+			} else if (isoperator(ch)) {
+				ColourTo(styler, i-1, state, bInAsm);
+				ColourTo(styler, i, SCE_C_OPERATOR, bInAsm);
+
+			}
+		} else if (state == SCE_C_IDENTIFIER) {
+			bool bDoublePoint = ((ch == '.') && (chPrev == '.'));
+			if ((!iswordchar(ch) && ch != '$' && ch != '#' && (ch != '@' || !bInAsm)) || bDoublePoint) {
+				if (bDoublePoint) i--;
+				int lStateChange = classifyWordPascal(styler.GetStartSegment(), i - 1, keywordlists, styler, bInClassDefinition, bInAsm);
+
+				if(lStateChange == 1) {
+					styler.SetLineState(currentLine, 1);
+					bInClassDefinition = true;
+				} else if(lStateChange == 2) {
+					bInAsm = true;
+				} else if(lStateChange == -1) {
+					styler.SetLineState(currentLine, 0);
+					bInClassDefinition = false;
+					bInAsm = false;
+				}
+				if (bDoublePoint) {
+					i++;
+					ColourTo(styler, i-1, SCE_C_DEFAULT, bInAsm);
+				}
+
+				state = SCE_C_DEFAULT;
+				chNext = styler.SafeGetCharAt(i + 1);
+				if (ch == '{' && chNext != '$' && chNext != '&') {
+					state = SCE_C_COMMENT;
+				} else if (ch == '(' && chNext == '*'
+						&& styler.SafeGetCharAt(i + 2) != '$'
+						&& styler.SafeGetCharAt(i + 2) != '&') {
+					ColourTo(styler, i-1, state, bInAsm);
+					state = SCE_C_COMMENTDOC;
+				} else if (ch == '/' && chNext == '/') {
+					state = SCE_C_COMMENTLINE;
+				} else if (ch == '\'') {
+					state = SCE_C_CHARACTER;
+				} else if (isoperator(ch)) {
+					ColourTo(styler, i, SCE_C_OPERATOR, bInAsm);
+				}
+			}
+		} else {
+			if (state == SCE_C_PREPROCESSOR) {
+				if (ch=='}'){
+					ColourTo(styler, i, state, bInAsm);
+					state = SCE_C_DEFAULT;
+				} else {
+					if ((ch == '\r' || ch == '\n') && !(chPrev == '\\' || chPrev == '\r')) {
+						ColourTo(styler, i-1, state, bInAsm);
+						state = SCE_C_DEFAULT;
+					}
+				}
+			} else if (state == SCE_C_COMMENT) {
+				if (ch == '}' ) {
+					ColourTo(styler, i, state, bInAsm);
+					state = SCE_C_DEFAULT;
+				}
+			} else if (state == SCE_C_COMMENTDOC) {
+				if (ch == ')' && chPrev == '*') {
+					if (((i > styler.GetStartSegment() + 2) || (
+						(initStyle == SCE_C_COMMENTDOC) &&
+						(styler.GetStartSegment() == static_cast<unsigned int>(startPos))))) {
+							ColourTo(styler, i, state, bInAsm);
+							state = SCE_C_DEFAULT;
+					}
+				}
+			} else if (state == SCE_C_COMMENTLINE) {
+				if (ch == '\r' || ch == '\n') {
+					ColourTo(styler, i-1, state, bInAsm);
+					state = SCE_C_DEFAULT;
+				}
+			} else if (state == SCE_C_CHARACTER) {
+				if (ch == '\'') {
+					ColourTo(styler, i, state, bInAsm);
+					state = SCE_C_DEFAULT;
+				}
+			}
+		}
+		chPrev = ch;
+	}
+	ColourTo(styler, lengthDoc - 1, state, bInAsm);
+}
+
+static void FoldPascalDoc(unsigned int startPos, int length, int initStyle, WordList *[],
+                            Accessor &styler) {
+	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
+	bool foldPreprocessor = styler.GetPropertyInt("fold.preprocessor") != 0;
+	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	unsigned int endPos = startPos + length;
+	int visibleChars = 0;
+	int lineCurrent = styler.GetLine(startPos);
+	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
+	int levelCurrent = levelPrev;
+	char chNext = styler[startPos];
+	int styleNext = styler.StyleAt(startPos);
+	int style = initStyle;
+
+	int lastStart = 0;
+
+	for (unsigned int i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int stylePrev = style;
+		style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+
+		if (stylePrev != SCE_C_WORD && style == SCE_C_WORD)
+		{
+			// Store last word start point.
+			lastStart = i;
+		}
+
+		if (stylePrev == SCE_C_WORD) {
+			if(iswordchar(ch) && !iswordchar(chNext)) {
+				char s[100];
+				getRange(lastStart, i, styler, s, sizeof(s));
+				levelCurrent += classifyFoldPointPascal(s);
+			}
+		}
+
+		if (foldComment && (style == SCE_C_COMMENTLINE)) {
+			if ((ch == '/') && (chNext == '/')) {
+				char chNext2 = styler.SafeGetCharAt(i + 2);
+				if (chNext2 == '{') {
+					levelCurrent++;
+				} else if (chNext2 == '}') {
+					levelCurrent--;
+				}
+			}
+		}
+
+		if (foldPreprocessor && (style == SCE_C_PREPROCESSOR)) {
+			if (ch == '{' && chNext == '$') {
+				unsigned int j=i+2; // skip {$
+				while ((j<endPos) && IsASpaceOrTab(styler.SafeGetCharAt(j))) {
+					j++;
+				}
+				if (styler.Match(j, "region") || styler.Match(j, "if")) {
+					levelCurrent++;
+				} else if (styler.Match(j, "end")) {
+					levelCurrent--;
+				}
+			}
+		}
+
+		if (foldComment && IsStreamCommentStyle(style)) {
+			if (!IsStreamCommentStyle(stylePrev)) {
+				levelCurrent++;
+			} else if (!IsStreamCommentStyle(styleNext) && !atEOL) {
+				// Comments don't end at end of line and the next character may be unstyled.
+				levelCurrent--;
+			}
+		}
+
+		if (atEOL) {
+			int lev = levelPrev;
+			if (visibleChars == 0 && foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if ((levelCurrent > levelPrev) && (visibleChars > 0))
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelPrev = levelCurrent;
+			visibleChars = 0;
+		}
+
+		if (!isspacechar(ch))
+			visibleChars++;
+	}
+
+	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
+	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
+}
+
+static const char * const pascalWordListDesc[] = {
+	"Keywords",
+	"Classwords",
+	0
+};
+
+LexerModule lmPascal(SCLEX_PASCAL, ColourisePascalDoc, "pascal", FoldPascalDoc, pascalWordListDesc);
diff --git a/Documents/Scintilla/LexPerl.cxx b/Documents/Scintilla/LexPerl.cxx
new file mode 100644
index 0000000..f57f73c
--- /dev/null
+++ b/Documents/Scintilla/LexPerl.cxx
@@ -0,0 +1,1295 @@
+// Scintilla source code edit control
+/** @file LexPerl.cxx
+ ** Lexer for Perl.
+ **/
+// Copyright 1998-2008 by Neil Hodgson <neilh@scintilla.org>
+// Lexical analysis fixes by Kein-Hong Man <mkh@pl.jaring.my>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+#include "CharacterSet.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+// Info for HERE document handling from perldata.pod (reformatted):
+// ----------------------------------------------------------------
+// A line-oriented form of quoting is based on the shell ``here-doc'' syntax.
+// Following a << you specify a string to terminate the quoted material, and
+// all lines following the current line down to the terminating string are
+// the value of the item.
+// * The terminating string may be either an identifier (a word), or some
+//   quoted text.
+// * If quoted, the type of quotes you use determines the treatment of the
+//   text, just as in regular quoting.
+// * An unquoted identifier works like double quotes.
+// * There must be no space between the << and the identifier.
+//   (If you put a space it will be treated as a null identifier,
+//    which is valid, and matches the first empty line.)
+//   (This is deprecated, -w warns of this syntax)
+// * The terminating string must appear by itself (unquoted and
+//   with no surrounding whitespace) on the terminating line.
+
+#define HERE_DELIM_MAX 256		// maximum length of HERE doc delimiter
+
+#define PERLNUM_BINARY		1	// order is significant: 1-4 cannot have a dot
+#define PERLNUM_HEX			2
+#define PERLNUM_OCTAL		3
+#define PERLNUM_FLOAT_EXP	4	// exponent part only
+#define PERLNUM_DECIMAL		5	// 1-5 are numbers; 6-7 are strings
+#define PERLNUM_VECTOR		6
+#define PERLNUM_V_VECTOR	7
+#define PERLNUM_BAD			8
+
+#define BACK_NONE		0	// lookback state for bareword disambiguation:
+#define BACK_OPERATOR	1	// whitespace/comments are insignificant
+#define BACK_KEYWORD	2	// operators/keywords are needed for disambiguation
+
+static bool isPerlKeyword(unsigned int start, unsigned int end, WordList &keywords, Accessor &styler)
+{
+	// old-style keyword matcher; needed because GetCurrent() needs
+	// current segment to be committed, but we may abandon early...
+	char s[100];
+	unsigned int i, len = end - start;
+	if (len > 30) { len = 30; }
+	for (i = 0; i < len; i++, start++) s[i] = styler[start];
+	s[i] = '\0';
+	return keywords.InList(s);
+}
+
+static int disambiguateBareword(Accessor &styler, unsigned int bk, unsigned int fw,
+                                int backFlag, unsigned int backPos, unsigned int endPos)
+{
+	// identifiers are recognized by Perl as barewords under some
+	// conditions, the following attempts to do the disambiguation
+	// by looking backward and forward; result in 2 LSB
+	int result = 0;
+	bool moreback = false;		// true if passed newline/comments
+	bool brace = false;			// true if opening brace found
+	// if BACK_NONE, neither operator nor keyword, so skip test
+	if (backFlag == BACK_NONE)
+		return result;
+	// first look backwards past whitespace/comments to set EOL flag
+	// (some disambiguation patterns must be on a single line)
+	if (backPos <= static_cast<unsigned int>(styler.LineStart(styler.GetLine(bk))))
+		moreback = true;
+	// look backwards at last significant lexed item for disambiguation
+	bk = backPos - 1;
+	int ch = static_cast<unsigned char>(styler.SafeGetCharAt(bk));
+	if (ch == '{' && !moreback) {
+		// {bareword: possible variable spec
+		brace = true;
+	} else if ((ch == '&' && styler.SafeGetCharAt(bk - 1) != '&')
+			// &bareword: subroutine call
+			   || styler.Match(bk - 1, "->")
+			// ->bareword: part of variable spec
+			   || styler.Match(bk - 2, "sub")) {
+			// sub bareword: subroutine declaration
+			// (implied BACK_KEYWORD, no keywords end in 'sub'!)
+		result |= 1;
+	}
+	// next, scan forward after word past tab/spaces only;
+	// if ch isn't one of '[{(,' we can skip the test
+	if ((ch == '{' || ch == '(' || ch == '['|| ch == ',')
+		&& fw < endPos) {
+		while (ch = static_cast<unsigned char>(styler.SafeGetCharAt(fw)),
+			   IsASpaceOrTab(ch) && fw < endPos) {
+			fw++;
+		}
+		if ((ch == '}' && brace)
+			// {bareword}: variable spec
+			|| styler.Match(fw, "=>")) {
+			// [{(, bareword=>: hash literal
+			result |= 2;
+		}
+	}
+	return result;
+}
+
+static void skipWhitespaceComment(Accessor &styler, unsigned int &p)
+{
+	// when backtracking, we need to skip whitespace and comments
+	int style;
+	while ((p > 0) && (style = styler.StyleAt(p),
+		   style == SCE_PL_DEFAULT || style == SCE_PL_COMMENTLINE))
+		p--;
+}
+
+static int styleBeforeBracePair(Accessor &styler, unsigned int bk)
+{
+	// backtrack to find open '{' corresponding to a '}', balanced
+	// return significant style to be tested for '/' disambiguation
+	int braceCount = 1;
+	if (bk == 0)
+		return SCE_PL_DEFAULT;
+	while (--bk > 0) {
+		if (styler.StyleAt(bk) == SCE_PL_OPERATOR) {
+			int bkch = static_cast<unsigned char>(styler.SafeGetCharAt(bk));
+			if (bkch == ';') {	// early out
+				break;
+			} else if (bkch == '}') {
+				braceCount++;
+			} else if (bkch == '{') {
+				if (--braceCount == 0) break;
+			}
+		}
+	}
+	if (bk > 0 && braceCount == 0) {
+		// balanced { found, bk > 0, skip more whitespace/comments
+		bk--;
+		skipWhitespaceComment(styler, bk);
+		return styler.StyleAt(bk);
+	}
+	return SCE_PL_DEFAULT;
+}
+
+static int styleCheckIdentifier(Accessor &styler, unsigned int bk)
+{
+	// backtrack to classify sub-styles of identifier under test
+	// return sub-style to be tested for '/' disambiguation
+	if (styler.SafeGetCharAt(bk) == '>')	// inputsymbol, like <foo>
+		return 1;
+	// backtrack to check for possible "->" or "::" before identifier
+	while (bk > 0 && styler.StyleAt(bk) == SCE_PL_IDENTIFIER) {
+		bk--;
+	}
+	while (bk > 0) {
+		int bkstyle = styler.StyleAt(bk);
+		if (bkstyle == SCE_PL_DEFAULT
+			|| bkstyle == SCE_PL_COMMENTLINE) {
+			// skip whitespace, comments
+		} else if (bkstyle == SCE_PL_OPERATOR) {
+			// test for "->" and "::"
+			if (styler.Match(bk - 1, "->") || styler.Match(bk - 1, "::"))
+				return 2;
+		} else
+			return 3;	// bare identifier
+		bk--;
+	}
+	return 0;
+}
+
+static int inputsymbolScan(Accessor &styler, unsigned int pos, unsigned int endPos)
+{
+	// looks forward for matching > on same line; a bit ugly
+	unsigned int fw = pos;
+	while (++fw < endPos) {
+		int fwch = static_cast<unsigned char>(styler.SafeGetCharAt(fw));
+		if (fwch == '\r' || fwch == '\n') {
+			return 0;
+		} else if (fwch == '>') {
+			if (styler.Match(fw - 2, "<=>"))	// '<=>' case
+				return 0;
+			return fw - pos;
+		}
+	}
+	return 0;
+}
+
+static int podLineScan(Accessor &styler, unsigned int &pos, unsigned int endPos)
+{
+	// forward scan the current line to classify line for POD style
+	int state = -1;
+	while (pos <= endPos) {
+		int ch = static_cast<unsigned char>(styler.SafeGetCharAt(pos));
+		if (ch == '\n' || ch == '\r' || pos >= endPos) {
+			if (ch == '\r' && styler.SafeGetCharAt(pos + 1) == '\n') pos++;
+			break;
+		}
+		if (IsASpaceOrTab(ch)) {	// whitespace, take note
+			if (state == -1)
+				state = SCE_PL_DEFAULT;
+		} else if (state == SCE_PL_DEFAULT) {	// verbatim POD line
+			state = SCE_PL_POD_VERB;
+		} else if (state != SCE_PL_POD_VERB) {	// regular POD line
+			state = SCE_PL_POD;
+		}
+		pos++;
+	}
+	if (state == -1)
+		state = SCE_PL_DEFAULT;
+	return state;
+}
+
+static bool styleCheckSubPrototype(Accessor &styler, unsigned int bk)
+{
+	// backtrack to identify if we're starting a subroutine prototype
+	// we also need to ignore whitespace/comments:
+	// 'sub' [whitespace|comment] <identifier> [whitespace|comment]
+	styler.Flush();
+	skipWhitespaceComment(styler, bk);
+	if (bk == 0 || styler.StyleAt(bk) != SCE_PL_IDENTIFIER)	// check identifier
+		return false;
+	while (bk > 0 && (styler.StyleAt(bk) == SCE_PL_IDENTIFIER)) {
+		bk--;
+	}
+	skipWhitespaceComment(styler, bk);
+	if (bk < 2 || styler.StyleAt(bk) != SCE_PL_WORD	// check "sub" keyword
+		|| !styler.Match(bk - 2, "sub"))	// assume suffix is unique!
+		return false;
+	return true;
+}
+
+static bool isMatch(const char *sref, char *s)
+{
+	// match per-line delimiter - must kill trailing CR if CRLF
+	if (s[strlen(s) - 1] == '\r')
+		s[strlen(s) - 1] = '\0';
+	return (strcmp(sref, s) == 0);
+}
+
+static int actualNumStyle(int numberStyle) {
+	if (numberStyle == PERLNUM_VECTOR || numberStyle == PERLNUM_V_VECTOR) {
+		return SCE_PL_STRING;
+	} else if (numberStyle == PERLNUM_BAD) {
+		return SCE_PL_ERROR;
+	}
+	return SCE_PL_NUMBER;
+}
+
+static int opposite(int ch) {
+	if (ch == '(') return ')';
+	if (ch == '[') return ']';
+	if (ch == '{') return '}';
+	if (ch == '<') return '>';
+	return ch;
+}
+
+static void ColourisePerlDoc(unsigned int startPos, int length, int initStyle,
+                             WordList *keywordlists[], Accessor &styler) {
+
+	WordList &keywords = *keywordlists[0];
+
+	// keywords that forces /PATTERN/ at all times; should track vim's behaviour
+	WordList reWords;
+	reWords.Set("elsif if split while");
+
+	// charset classes
+	CharacterSet setWordStart(CharacterSet::setAlpha, "_", 0x80, true);
+	CharacterSet setWord(CharacterSet::setAlphaNum, "_", 0x80, true);
+	CharacterSet setSingleCharOp(CharacterSet::setNone, "rwxoRWXOezsfdlpSbctugkTBMAC");
+	// lexing of "%*</" operators is non-trivial; these are missing in the set below
+	CharacterSet setPerlOperator(CharacterSet::setNone, "^&\\()-+=|{}[]:;>,?!.~");
+	CharacterSet setQDelim(CharacterSet::setNone, "qrwx");
+	CharacterSet setModifiers(CharacterSet::setAlpha);
+	CharacterSet setPreferRE(CharacterSet::setNone, "*/<%");
+	// setArray and setHash also accepts chars for special vars like $_,
+	// which are then truncated when the next char does not match setVar
+	CharacterSet setVar(CharacterSet::setAlphaNum, "#$_'", 0x80, true);
+	CharacterSet setArray(CharacterSet::setAlpha, "#$_+-", 0x80, true);
+	CharacterSet setHash(CharacterSet::setAlpha, "#$_!^+-", 0x80, true);
+	CharacterSet &setPOD = setModifiers;
+	CharacterSet setNonHereDoc(CharacterSet::setDigits, "=$@");
+	CharacterSet setHereDocDelim(CharacterSet::setAlphaNum, "_");
+	CharacterSet setSubPrototype(CharacterSet::setNone, "\\[$@%&*];");
+	// for format identifiers
+	CharacterSet setFormatStart(CharacterSet::setAlpha, "_=");
+	CharacterSet &setFormat = setHereDocDelim;
+
+	// Lexer for perl often has to backtrack to start of current style to determine
+	// which characters are being used as quotes, how deeply nested is the
+	// start position and what the termination string is for HERE documents.
+
+	class HereDocCls {	// Class to manage HERE doc sequence
+	public:
+		int State;		// 0: '<<' encountered
+						// 1: collect the delimiter
+						// 2: here doc text (lines after the delimiter)
+		int Quote;		// the char after '<<'
+		bool Quoted;		// true if Quote in ('\'','"','`')
+		int DelimiterLength;	// strlen(Delimiter)
+		char *Delimiter;	// the Delimiter, 256: sizeof PL_tokenbuf
+		HereDocCls() {
+			State = 0;
+			Quote = 0;
+			Quoted = false;
+			DelimiterLength = 0;
+			Delimiter = new char[HERE_DELIM_MAX];
+			Delimiter[0] = '\0';
+		}
+		void Append(int ch) {
+			Delimiter[DelimiterLength++] = static_cast<char>(ch);
+			Delimiter[DelimiterLength] = '\0';
+		}
+		~HereDocCls() {
+			delete []Delimiter;
+		}
+	};
+	HereDocCls HereDoc;		// TODO: FIFO for stacked here-docs
+
+	class QuoteCls {	// Class to manage quote pairs
+		public:
+		int Rep;
+		int Count;
+		int Up, Down;
+		QuoteCls() {
+			this->New(1);
+		}
+		void New(int r = 1) {
+			Rep   = r;
+			Count = 0;
+			Up    = '\0';
+			Down  = '\0';
+		}
+		void Open(int u) {
+			Count++;
+			Up    = u;
+			Down  = opposite(Up);
+		}
+	};
+	QuoteCls Quote;
+
+	// additional state for number lexing
+	int numState = PERLNUM_DECIMAL;
+	int dotCount = 0;
+
+	unsigned int endPos = startPos + length;
+
+	// Backtrack to beginning of style if required...
+	// If in a long distance lexical state, backtrack to find quote characters.
+	// Includes strings (may be multi-line), numbers (additional state), format
+	// bodies, as well as POD sections.
+	if (initStyle == SCE_PL_HERE_Q
+		|| initStyle == SCE_PL_HERE_QQ
+		|| initStyle == SCE_PL_HERE_QX
+		|| initStyle == SCE_PL_FORMAT
+	) {
+		int delim = (initStyle == SCE_PL_FORMAT) ? SCE_PL_FORMAT_IDENT:SCE_PL_HERE_DELIM;
+		while ((startPos > 1) && (styler.StyleAt(startPos) != delim)) {
+			startPos--;
+		}
+		startPos = styler.LineStart(styler.GetLine(startPos));
+		initStyle = styler.StyleAt(startPos - 1);
+	}
+	if (initStyle == SCE_PL_STRING_Q
+		|| initStyle == SCE_PL_STRING_QQ
+		|| initStyle == SCE_PL_STRING_QX
+		|| initStyle == SCE_PL_STRING_QR
+		|| initStyle == SCE_PL_STRING_QW
+		|| initStyle == SCE_PL_REGEX
+		|| initStyle == SCE_PL_REGSUBST
+		|| initStyle == SCE_PL_STRING
+		|| initStyle == SCE_PL_BACKTICKS
+		|| initStyle == SCE_PL_CHARACTER
+		|| initStyle == SCE_PL_NUMBER
+		|| initStyle == SCE_PL_IDENTIFIER
+		|| initStyle == SCE_PL_ERROR
+		|| initStyle == SCE_PL_SUB_PROTOTYPE
+	) {
+		while ((startPos > 1) && (styler.StyleAt(startPos - 1) == initStyle)) {
+			startPos--;
+		}
+		initStyle = SCE_PL_DEFAULT;
+	} else if (initStyle == SCE_PL_POD
+			   || initStyle == SCE_PL_POD_VERB
+	) {
+		// POD backtracking finds preceeding blank lines and goes back past them
+		int ln = styler.GetLine(startPos);
+		if (ln > 0) {
+			initStyle = styler.StyleAt(styler.LineStart(--ln));
+			if (initStyle == SCE_PL_POD || initStyle == SCE_PL_POD_VERB) {
+				while (ln > 0 && styler.GetLineState(ln) == SCE_PL_DEFAULT)
+					ln--;
+			}
+			startPos = styler.LineStart(++ln);
+			initStyle = styler.StyleAt(startPos - 1);
+		} else {
+			startPos = 0;
+			initStyle = SCE_PL_DEFAULT;
+		}
+	}
+
+	// backFlag, backPos are additional state to aid identifier corner cases.
+	// Look backwards past whitespace and comments in order to detect either
+	// operator or keyword. Later updated as we go along.
+	int backFlag = BACK_NONE;
+	unsigned int backPos = startPos;
+	if (backPos > 0) {
+		backPos--;
+		skipWhitespaceComment(styler, backPos);
+		if (styler.StyleAt(backPos) == SCE_PL_OPERATOR)
+			backFlag = BACK_OPERATOR;
+		else if (styler.StyleAt(backPos) == SCE_PL_WORD)
+			backFlag = BACK_KEYWORD;
+		backPos++;
+	}
+
+	StyleContext sc(startPos, endPos - startPos, initStyle, styler, static_cast<char>(STYLE_MAX));
+
+	for (; sc.More(); sc.Forward()) {
+
+		// Determine if the current state should terminate.
+		switch (sc.state) {
+			case SCE_PL_OPERATOR:
+				sc.SetState(SCE_PL_DEFAULT);
+				backFlag = BACK_OPERATOR;
+				backPos = sc.currentPos;
+				break;
+			case SCE_PL_IDENTIFIER:		// identifier, bareword, inputsymbol
+				if ((!setWord.Contains(sc.ch) && sc.ch != '\'')
+					|| sc.Match('.', '.')
+					|| sc.chPrev == '>') {	// end of inputsymbol
+					sc.SetState(SCE_PL_DEFAULT);
+				}
+				break;
+			case SCE_PL_WORD:		// keyword, plus special cases
+				if (!setWord.Contains(sc.ch)) {
+					char s[100];
+					sc.GetCurrent(s, sizeof(s));
+					if ((strcmp(s, "__DATA__") == 0) || (strcmp(s, "__END__") == 0)) {
+						sc.ChangeState(SCE_PL_DATASECTION);
+					} else {
+						if ((strcmp(s, "format") == 0)) {
+							sc.SetState(SCE_PL_FORMAT_IDENT);
+							HereDoc.State = 0;
+						} else {
+							sc.SetState(SCE_PL_DEFAULT);
+						}
+						backFlag = BACK_KEYWORD;
+						backPos = sc.currentPos;
+					}
+				}
+				break;
+			case SCE_PL_SCALAR:
+			case SCE_PL_ARRAY:
+			case SCE_PL_HASH:
+			case SCE_PL_SYMBOLTABLE:
+				if (sc.Match(':', ':')) {	// skip ::
+					sc.Forward();
+				} else if (!setVar.Contains(sc.ch)) {
+					if (sc.LengthCurrent() == 1) {
+						// Special variable: $(, $_ etc.
+						sc.Forward();
+					}
+					sc.SetState(SCE_PL_DEFAULT);
+				}
+				break;
+			case SCE_PL_NUMBER:
+				// if no early break, number style is terminated at "(go through)"
+				if (sc.ch == '.') {
+					if (sc.chNext == '.') {
+						// double dot is always an operator (go through)
+					} else if (numState <= PERLNUM_FLOAT_EXP) {
+						// non-decimal number or float exponent, consume next dot
+						sc.SetState(SCE_PL_OPERATOR);
+						break;
+					} else {	// decimal or vectors allows dots
+						dotCount++;
+						if (numState == PERLNUM_DECIMAL) {
+							if (dotCount <= 1)	// number with one dot in it
+								break;
+							if (IsADigit(sc.chNext)) {	// really a vector
+								numState = PERLNUM_VECTOR;
+								break;
+							}
+							// number then dot (go through)
+						} else if (IsADigit(sc.chNext))	// vectors
+							break;
+						// vector then dot (go through)
+					}
+				} else if (sc.ch == '_') {
+					// permissive underscoring for number and vector literals
+					break;
+				} else if (numState == PERLNUM_DECIMAL) {
+					if (sc.ch == 'E' || sc.ch == 'e') {	// exponent, sign
+						numState = PERLNUM_FLOAT_EXP;
+						if (sc.chNext == '+' || sc.chNext == '-') {
+							sc.Forward();
+						}
+						break;
+					} else if (IsADigit(sc.ch))
+						break;
+					// number then word (go through)
+				} else if (numState == PERLNUM_HEX) {
+					if (IsADigit(sc.ch, 16))
+						break;
+				} else if (numState == PERLNUM_VECTOR || numState == PERLNUM_V_VECTOR) {
+					if (IsADigit(sc.ch))	// vector
+						break;
+					if (setWord.Contains(sc.ch) && dotCount == 0) {	// change to word
+						sc.ChangeState(SCE_PL_IDENTIFIER);
+						break;
+					}
+					// vector then word (go through)
+				} else if (IsADigit(sc.ch)) {
+					if (numState == PERLNUM_FLOAT_EXP) {
+						break;
+					} else if (numState == PERLNUM_OCTAL) {
+						if (sc.ch <= '7') break;
+					} else if (numState == PERLNUM_BINARY) {
+						if (sc.ch <= '1') break;
+					}
+					// mark invalid octal, binary numbers (go through)
+					numState = PERLNUM_BAD;
+					break;
+				}
+				// complete current number or vector
+				sc.ChangeState(actualNumStyle(numState));
+				sc.SetState(SCE_PL_DEFAULT);
+				break;
+			case SCE_PL_COMMENTLINE:
+				if (sc.atLineEnd) {
+					sc.SetState(SCE_PL_DEFAULT);
+				}
+				break;
+			case SCE_PL_HERE_DELIM:
+				if (HereDoc.State == 0) { // '<<' encountered
+					int delim_ch = sc.chNext;
+					int ws_skip = 0;
+					HereDoc.State = 1;	// pre-init HERE doc class
+					HereDoc.Quote = sc.chNext;
+					HereDoc.Quoted = false;
+					HereDoc.DelimiterLength = 0;
+					HereDoc.Delimiter[HereDoc.DelimiterLength] = '\0';
+					if (IsASpaceOrTab(delim_ch)) {
+						// skip whitespace; legal only for quoted delimiters
+						unsigned int i = sc.currentPos + 1;
+						while ((i < endPos) && IsASpaceOrTab(delim_ch)) {
+							i++;
+							delim_ch = static_cast<unsigned char>(styler.SafeGetCharAt(i));
+						}
+						ws_skip = i - sc.currentPos - 1;
+					}
+					if (delim_ch == '\'' || delim_ch == '"' || delim_ch == '`') {
+						// a quoted here-doc delimiter; skip any whitespace
+						sc.Forward(ws_skip + 1);
+						HereDoc.Quote = delim_ch;
+						HereDoc.Quoted = true;
+					} else if (ws_skip == 0 && setNonHereDoc.Contains(sc.chNext)
+							   || ws_skip > 0) {
+						// left shift << or <<= operator cases
+						// restore position if operator
+						sc.ChangeState(SCE_PL_OPERATOR);
+						sc.ForwardSetState(SCE_PL_DEFAULT);
+						backFlag = BACK_OPERATOR;
+						backPos = sc.currentPos;
+						HereDoc.State = 0;
+					} else {
+						// specially handle initial '\' for identifier
+						if (ws_skip == 0 && HereDoc.Quote == '\\')
+							sc.Forward();
+						// an unquoted here-doc delimiter, no special handling
+						// (cannot be prefixed by spaces/tabs), or
+						// symbols terminates; deprecated zero-length delimiter
+					}
+				} else if (HereDoc.State == 1) { // collect the delimiter
+					backFlag = BACK_NONE;
+					if (HereDoc.Quoted) { // a quoted here-doc delimiter
+						if (sc.ch == HereDoc.Quote) { // closing quote => end of delimiter
+							sc.ForwardSetState(SCE_PL_DEFAULT);
+						} else if (!sc.atLineEnd) {
+							if (sc.Match('\\', static_cast<char>(HereDoc.Quote))) { // escaped quote
+								sc.Forward();
+							}
+							if (sc.ch != '\r') {	// skip CR if CRLF
+								HereDoc.Append(sc.ch);
+							}
+						}
+					} else { // an unquoted here-doc delimiter
+						if (setHereDocDelim.Contains(sc.ch)) {
+							HereDoc.Append(sc.ch);
+						} else {
+							sc.SetState(SCE_PL_DEFAULT);
+						}
+					}
+					if (HereDoc.DelimiterLength >= HERE_DELIM_MAX - 1) {
+						sc.SetState(SCE_PL_ERROR);
+						HereDoc.State = 0;
+					}
+				}
+				break;
+			case SCE_PL_HERE_Q:
+			case SCE_PL_HERE_QQ:
+			case SCE_PL_HERE_QX: {
+				// also implies HereDoc.State == 2
+				sc.Complete();
+				while (!sc.atLineEnd)
+					sc.Forward();
+				char s[HERE_DELIM_MAX];
+				sc.GetCurrent(s, sizeof(s));
+				if (isMatch(HereDoc.Delimiter, s)) {
+					sc.SetState(SCE_PL_DEFAULT);
+					backFlag = BACK_NONE;
+					HereDoc.State = 0;
+				}
+				} break;
+			case SCE_PL_POD:
+			case SCE_PL_POD_VERB: {
+				unsigned int fw = sc.currentPos;
+				int ln = styler.GetLine(fw);
+				if (sc.atLineStart && sc.Match("=cut")) {	// end of POD
+					sc.SetState(SCE_PL_POD);
+					sc.Forward(4);
+					sc.SetState(SCE_PL_DEFAULT);
+					styler.SetLineState(ln, SCE_PL_POD);
+					break;
+				}
+				int pod = podLineScan(styler, fw, endPos);	// classify POD line
+				styler.SetLineState(ln, pod);
+				if (pod == SCE_PL_DEFAULT) {
+					if (sc.state == SCE_PL_POD_VERB) {
+						unsigned int fw2 = fw;
+						while (fw2 <= endPos && pod == SCE_PL_DEFAULT) {
+							fw = fw2++;	// penultimate line (last blank line)
+							pod = podLineScan(styler, fw2, endPos);
+							styler.SetLineState(styler.GetLine(fw2), pod);
+						}
+						if (pod == SCE_PL_POD) {	// truncate verbatim POD early
+							sc.SetState(SCE_PL_POD);
+						} else
+							fw = fw2;
+					} else
+						pod = SCE_PL_POD;
+				} else {
+					if (pod == SCE_PL_POD_VERB	// still part of current paragraph
+					    && (styler.GetLineState(ln - 1) == SCE_PL_POD)) {
+						pod = SCE_PL_POD;
+						styler.SetLineState(ln, pod);
+					} else if (pod == SCE_PL_POD
+							   && (styler.GetLineState(ln - 1) == SCE_PL_POD_VERB)) {
+						pod = SCE_PL_POD_VERB;
+						styler.SetLineState(ln, pod);
+					}
+					sc.SetState(pod);
+				}
+				sc.Forward(fw - sc.currentPos);	// commit style
+				} break;
+			case SCE_PL_REGEX:
+			case SCE_PL_STRING_QR:
+				if (Quote.Rep <= 0) {
+					if (!setModifiers.Contains(sc.ch))
+						sc.SetState(SCE_PL_DEFAULT);
+				} else if (!Quote.Up && !IsASpace(sc.ch)) {
+					Quote.Open(sc.ch);
+				} else if (sc.ch == '\\' && Quote.Up != '\\') {
+					sc.Forward();
+				} else if (sc.ch == Quote.Down) {
+					Quote.Count--;
+					if (Quote.Count == 0)
+						Quote.Rep--;
+				} else if (sc.ch == Quote.Up) {
+					Quote.Count++;
+				}
+				break;
+			case SCE_PL_REGSUBST:
+				if (Quote.Rep <= 0) {
+					if (!setModifiers.Contains(sc.ch))
+						sc.SetState(SCE_PL_DEFAULT);
+				} else if (!Quote.Up && !IsASpace(sc.ch)) {
+					Quote.Open(sc.ch);
+				} else if (sc.ch == '\\' && Quote.Up != '\\') {
+					sc.Forward();
+				} else if (Quote.Count == 0 && Quote.Rep == 1) {
+					// We matched something like s(...) or tr{...}, Perl 5.10
+					// appears to allow almost any character for use as the
+					// next delimiters. Whitespace and comments are accepted in
+					// between, but we'll limit to whitespace here.
+					// For '#', if no whitespace in between, it's a delimiter.
+					if (IsASpace(sc.ch)) {
+						// Keep going
+					} else if (sc.ch == '#' && IsASpaceOrTab(sc.chPrev)) {
+						sc.SetState(SCE_PL_DEFAULT);
+					} else {
+						Quote.Open(sc.ch);
+					}
+				} else if (sc.ch == Quote.Down) {
+					Quote.Count--;
+					if (Quote.Count == 0)
+						Quote.Rep--;
+					if (Quote.Up == Quote.Down)
+						Quote.Count++;
+				} else if (sc.ch == Quote.Up) {
+					Quote.Count++;
+				}
+				break;
+			case SCE_PL_STRING_Q:
+			case SCE_PL_STRING_QQ:
+			case SCE_PL_STRING_QX:
+			case SCE_PL_STRING_QW:
+			case SCE_PL_STRING:
+			case SCE_PL_CHARACTER:
+			case SCE_PL_BACKTICKS:
+				if (!Quote.Down && !IsASpace(sc.ch)) {
+					Quote.Open(sc.ch);
+				} else if (sc.ch == '\\' && Quote.Up != '\\') {
+					sc.Forward();
+				} else if (sc.ch == Quote.Down) {
+					Quote.Count--;
+					if (Quote.Count == 0)
+						sc.ForwardSetState(SCE_PL_DEFAULT);
+				} else if (sc.ch == Quote.Up) {
+					Quote.Count++;
+				}
+				break;
+			case SCE_PL_SUB_PROTOTYPE: {
+				int i = 0;
+				// forward scan; must all be valid proto characters
+				while (setSubPrototype.Contains(sc.GetRelative(i)))
+					i++;
+				if (sc.GetRelative(i) == ')') {	// valid sub prototype
+					sc.Forward(i);
+					sc.ForwardSetState(SCE_PL_DEFAULT);
+				} else {
+					// abandon prototype, restart from '('
+					sc.ChangeState(SCE_PL_OPERATOR);
+					sc.SetState(SCE_PL_DEFAULT);
+				}
+				} break;
+			case SCE_PL_FORMAT: {
+				sc.Complete();
+				while (!sc.atLineEnd)
+					sc.Forward();
+				char s[10];
+				sc.GetCurrent(s, sizeof(s));
+				if (isMatch(".", s))
+					sc.SetState(SCE_PL_DEFAULT);
+				} break;
+			case SCE_PL_ERROR:
+				break;
+		}
+		// Needed for specific continuation styles (one follows the other)
+		switch (sc.state) {
+			// continued from SCE_PL_WORD
+			case SCE_PL_FORMAT_IDENT:
+				// occupies HereDoc state 3 to avoid clashing with HERE docs
+				if (IsASpaceOrTab(sc.ch)) {		// skip whitespace
+					sc.ChangeState(SCE_PL_DEFAULT);
+					while (IsASpaceOrTab(sc.ch) && !sc.atLineEnd)
+						sc.Forward();
+					sc.SetState(SCE_PL_FORMAT_IDENT);
+				}
+				if (setFormatStart.Contains(sc.ch)) {	// identifier or '='
+					if (sc.ch != '=') {
+						do {
+							sc.Forward();
+						} while (setFormat.Contains(sc.ch));
+					}
+					while (IsASpaceOrTab(sc.ch) && !sc.atLineEnd)
+						sc.Forward();
+					if (sc.ch == '=') {
+						sc.ForwardSetState(SCE_PL_DEFAULT);
+						HereDoc.State = 3;
+					} else {
+						// invalid indentifier; inexact fallback, but hey
+						sc.ChangeState(SCE_PL_IDENTIFIER);
+						sc.SetState(SCE_PL_DEFAULT);
+					}
+				} else {
+					sc.ChangeState(SCE_PL_DEFAULT);	// invalid indentifier
+				}
+				backFlag = BACK_NONE;
+				break;
+		}
+
+		// Must check end of HereDoc states here before default state is handled
+		if (HereDoc.State == 1 && sc.atLineEnd) {
+			// Begin of here-doc (the line after the here-doc delimiter):
+			// Lexically, the here-doc starts from the next line after the >>, but the
+			// first line of here-doc seem to follow the style of the last EOL sequence
+			int st_new = SCE_PL_HERE_QQ;
+			HereDoc.State = 2;
+			if (HereDoc.Quoted) {
+				if (sc.state == SCE_PL_HERE_DELIM) {
+					// Missing quote at end of string! We are stricter than perl.
+					// Colour here-doc anyway while marking this bit as an error.
+					sc.ChangeState(SCE_PL_ERROR);
+				}
+				switch (HereDoc.Quote) {
+					case '\'': st_new = SCE_PL_HERE_Q ; break;
+					case '"' : st_new = SCE_PL_HERE_QQ; break;
+					case '`' : st_new = SCE_PL_HERE_QX; break;
+				}
+			} else {
+				if (HereDoc.Quote == '\\')
+					st_new = SCE_PL_HERE_Q;
+			}
+			sc.SetState(st_new);
+		}
+		if (HereDoc.State == 3 && sc.atLineEnd) {
+			// Start of format body.
+			HereDoc.State = 0;
+			sc.SetState(SCE_PL_FORMAT);
+		}
+
+		// Determine if a new state should be entered.
+		if (sc.state == SCE_PL_DEFAULT) {
+			if (IsADigit(sc.ch) ||
+				(IsADigit(sc.chNext) && (sc.ch == '.' || sc.ch == 'v'))) {
+				sc.SetState(SCE_PL_NUMBER);
+				backFlag = BACK_NONE;
+				numState = PERLNUM_DECIMAL;
+				dotCount = 0;
+				if (sc.ch == '0') {		// hex,bin,octal
+					if (sc.chNext == 'x') {
+						numState = PERLNUM_HEX;
+					} else if (sc.chNext == 'b') {
+						numState = PERLNUM_BINARY;
+					} else if (IsADigit(sc.chNext)) {
+						numState = PERLNUM_OCTAL;
+					}
+					if (numState != PERLNUM_DECIMAL) {
+						sc.Forward();
+					}
+				} else if (sc.ch == 'v') {		// vector
+					numState = PERLNUM_V_VECTOR;
+				}
+			} else if (setWord.Contains(sc.ch)) {
+				// if immediately prefixed by '::', always a bareword
+				sc.SetState(SCE_PL_WORD);
+				if (sc.chPrev == ':' && sc.GetRelative(-2) == ':') {
+					sc.ChangeState(SCE_PL_IDENTIFIER);
+				}
+				unsigned int bk = sc.currentPos;
+				unsigned int fw = sc.currentPos + 1;
+				// first check for possible quote-like delimiter
+				if (sc.ch == 's' && !setWord.Contains(sc.chNext)) {
+					sc.ChangeState(SCE_PL_REGSUBST);
+					Quote.New(2);
+				} else if (sc.ch == 'm' && !setWord.Contains(sc.chNext)) {
+					sc.ChangeState(SCE_PL_REGEX);
+					Quote.New();
+				} else if (sc.ch == 'q' && !setWord.Contains(sc.chNext)) {
+					sc.ChangeState(SCE_PL_STRING_Q);
+					Quote.New();
+				} else if (sc.ch == 'y' && !setWord.Contains(sc.chNext)) {
+					sc.ChangeState(SCE_PL_REGSUBST);
+					Quote.New(2);
+				} else if (sc.Match('t', 'r') && !setWord.Contains(sc.GetRelative(2))) {
+					sc.ChangeState(SCE_PL_REGSUBST);
+					Quote.New(2);
+					sc.Forward();
+					fw++;
+				} else if (sc.ch == 'q' && setQDelim.Contains(sc.chNext)
+						   && !setWord.Contains(sc.GetRelative(2))) {
+					if      (sc.chNext == 'q') sc.ChangeState(SCE_PL_STRING_QQ);
+					else if (sc.chNext == 'x') sc.ChangeState(SCE_PL_STRING_QX);
+					else if (sc.chNext == 'r') sc.ChangeState(SCE_PL_STRING_QR);
+					else sc.ChangeState(SCE_PL_STRING_QW);	// sc.chNext == 'w'
+					Quote.New();
+					sc.Forward();
+					fw++;
+				} else if (sc.ch == 'x' && (sc.chNext == '=' ||	// repetition
+						   !setWord.Contains(sc.chNext) ||
+						   (IsADigit(sc.chPrev) && IsADigit(sc.chNext)))) {
+					sc.ChangeState(SCE_PL_OPERATOR);
+				}
+				// if potentially a keyword, scan forward and grab word, then check
+				// if it's really one; if yes, disambiguation test is performed
+				// otherwise it is always a bareword and we skip a lot of scanning
+				if (sc.state == SCE_PL_WORD) {
+					while (setWord.Contains(static_cast<unsigned char>(styler.SafeGetCharAt(fw))))
+						fw++;
+					if (!isPerlKeyword(styler.GetStartSegment(), fw, keywords, styler)) {
+						sc.ChangeState(SCE_PL_IDENTIFIER);
+					}
+				}
+				// if already SCE_PL_IDENTIFIER, then no ambiguity, skip this
+				// for quote-like delimiters/keywords, attempt to disambiguate
+				// to select for bareword, change state -> SCE_PL_IDENTIFIER
+				if (sc.state != SCE_PL_IDENTIFIER && bk > 0) {
+					if (disambiguateBareword(styler, bk, fw, backFlag, backPos, endPos))
+						sc.ChangeState(SCE_PL_IDENTIFIER);
+				}
+				backFlag = BACK_NONE;
+			} else if (sc.ch == '#') {
+				sc.SetState(SCE_PL_COMMENTLINE);
+			} else if (sc.ch == '\"') {
+				sc.SetState(SCE_PL_STRING);
+				Quote.New();
+				Quote.Open(sc.ch);
+				backFlag = BACK_NONE;
+			} else if (sc.ch == '\'') {
+				if (sc.chPrev == '&' && setWordStart.Contains(sc.chNext)) {
+					// Archaic call
+					sc.SetState(SCE_PL_IDENTIFIER);
+				} else {
+					sc.SetState(SCE_PL_CHARACTER);
+					Quote.New();
+					Quote.Open(sc.ch);
+				}
+				backFlag = BACK_NONE;
+			} else if (sc.ch == '`') {
+				sc.SetState(SCE_PL_BACKTICKS);
+				Quote.New();
+				Quote.Open(sc.ch);
+				backFlag = BACK_NONE;
+			} else if (sc.ch == '$') {
+				sc.SetState(SCE_PL_SCALAR);
+				if (sc.chNext == '{') {
+					sc.ForwardSetState(SCE_PL_OPERATOR);
+				} else if (IsASpace(sc.chNext)) {
+					sc.ForwardSetState(SCE_PL_DEFAULT);
+				} else {
+					sc.Forward();
+					if (sc.Match('`', '`') || sc.Match(':', ':')) {
+						sc.Forward();
+					}
+				}
+				backFlag = BACK_NONE;
+			} else if (sc.ch == '@') {
+				sc.SetState(SCE_PL_ARRAY);
+				if (setArray.Contains(sc.chNext)) {
+					// no special treatment
+				} else if (sc.chNext == ':' && sc.GetRelative(2) == ':') {
+					sc.Forward(2);
+				} else if (sc.chNext == '{' || sc.chNext == '[') {
+					sc.ForwardSetState(SCE_PL_OPERATOR);
+				} else {
+					sc.ChangeState(SCE_PL_OPERATOR);
+				}
+				backFlag = BACK_NONE;
+			} else if (setPreferRE.Contains(sc.ch)) {
+				// Explicit backward peeking to set a consistent preferRE for
+				// any slash found, so no longer need to track preferRE state.
+				// Find first previous significant lexed element and interpret.
+				// A few symbols shares this code for disambiguation.
+				bool preferRE = false;
+				bool isHereDoc = sc.Match('<', '<');
+				bool hereDocSpace = false;		// for: SCALAR [whitespace] '<<'
+				unsigned int bk = (sc.currentPos > 0) ? sc.currentPos - 1: 0;
+				unsigned int bkend;
+				styler.Flush();
+				if (styler.StyleAt(bk) == SCE_PL_DEFAULT)
+					hereDocSpace = true;
+				skipWhitespaceComment(styler, bk);
+				if (bk == 0) {
+					// avoid backward scanning breakage
+					preferRE = true;
+				} else {
+					int bkstyle = styler.StyleAt(bk);
+					int bkch = static_cast<unsigned char>(styler.SafeGetCharAt(bk));
+					switch(bkstyle) {
+					case SCE_PL_OPERATOR:
+						preferRE = true;
+						if (bkch == ')' || bkch == ']') {
+							preferRE = false;
+						} else if (bkch == '}') {
+							// backtrack by counting balanced brace pairs
+							// needed to test for variables like ${}, @{} etc.
+							bkstyle = styleBeforeBracePair(styler, bk);
+							if (bkstyle == SCE_PL_SCALAR
+								|| bkstyle == SCE_PL_ARRAY
+								|| bkstyle == SCE_PL_HASH
+								|| bkstyle == SCE_PL_SYMBOLTABLE
+								|| bkstyle == SCE_PL_OPERATOR) {
+								preferRE = false;
+							}
+						} else if (bkch == '+' || bkch == '-') {
+							if (bkch == static_cast<unsigned char>(styler.SafeGetCharAt(bk - 1))
+								&& bkch != static_cast<unsigned char>(styler.SafeGetCharAt(bk - 2)))
+							// exceptions for operators: unary suffixes ++, --
+							preferRE = false;
+						}
+						break;
+					case SCE_PL_IDENTIFIER:
+						preferRE = true;
+						bkstyle = styleCheckIdentifier(styler, bk);
+						if ((bkstyle == 1) || (bkstyle == 2)) {
+							// inputsymbol or var with "->" or "::" before identifier
+							preferRE = false;
+						} else if (bkstyle == 3) {
+							// bare identifier, test cases follows:
+							if (sc.ch == '/') {
+								// if '/', /PATTERN/ unless digit/space immediately after '/'
+								// if '//', always expect defined-or operator to follow identifier
+								if (IsASpace(sc.chNext) || IsADigit(sc.chNext) || sc.chNext == '/')
+									preferRE = false;
+							} else if (sc.ch == '*' || sc.ch == '%') {
+								if (IsASpace(sc.chNext) || IsADigit(sc.chNext) || sc.Match('*', '*'))
+									preferRE = false;
+							} else if (sc.ch == '<') {
+								if (IsASpace(sc.chNext) || sc.chNext == '=')
+									preferRE = false;
+							}
+						}
+						break;
+					case SCE_PL_SCALAR:		// for $var<< case:
+						if (isHereDoc && hereDocSpace)	// if SCALAR whitespace '<<', *always* a HERE doc
+							preferRE = true;
+						break;
+					case SCE_PL_WORD:
+						preferRE = true;
+						// for HERE docs, always true
+						if (sc.ch == '/') {
+							// adopt heuristics similar to vim-style rules:
+							// keywords always forced as /PATTERN/: split, if, elsif, while
+							// everything else /PATTERN/ unless digit/space immediately after '/'
+							// for '//', defined-or favoured unless special keywords
+							bkend = bk + 1;
+							while (bk > 0 && styler.StyleAt(bk - 1) == SCE_PL_WORD) {
+								bk--;
+							}
+							if (isPerlKeyword(bk, bkend, reWords, styler))
+								break;
+							if (IsASpace(sc.chNext) || IsADigit(sc.chNext) || sc.chNext == '/')
+								preferRE = false;
+						} else if (sc.ch == '*' || sc.ch == '%') {
+							if (IsASpace(sc.chNext) || IsADigit(sc.chNext) || sc.Match('*', '*'))
+								preferRE = false;
+						} else if (sc.ch == '<') {
+							if (IsASpace(sc.chNext) || sc.chNext == '=')
+								preferRE = false;
+						}
+						break;
+					// other styles uses the default, preferRE=false
+					case SCE_PL_POD:
+					case SCE_PL_HERE_Q:
+					case SCE_PL_HERE_QQ:
+					case SCE_PL_HERE_QX:
+						preferRE = true;
+						break;
+					}
+				}
+				backFlag = BACK_NONE;
+				if (isHereDoc) {	// handle '<<', HERE doc
+					if (preferRE) {
+						sc.SetState(SCE_PL_HERE_DELIM);
+						HereDoc.State = 0;
+					} else {		// << operator
+						sc.SetState(SCE_PL_OPERATOR);
+						sc.Forward();
+					}
+				} else if (sc.ch == '*') {	// handle '*', typeglob
+					if (preferRE) {
+						sc.SetState(SCE_PL_SYMBOLTABLE);
+						if (sc.chNext == ':' && sc.GetRelative(2) == ':') {
+							sc.Forward(2);
+						} else if (sc.chNext == '{') {
+							sc.ForwardSetState(SCE_PL_OPERATOR);
+						} else {
+							sc.Forward();
+						}
+					} else {
+						sc.SetState(SCE_PL_OPERATOR);
+						if (sc.chNext == '*') 	// exponentiation
+							sc.Forward();
+					}
+				} else if (sc.ch == '%') {	// handle '%', hash
+					if (preferRE) {
+						sc.SetState(SCE_PL_HASH);
+						if (setHash.Contains(sc.chNext)) {
+							sc.Forward();
+						} else if (sc.chNext == ':' && sc.GetRelative(2) == ':') {
+							sc.Forward(2);
+						} else if (sc.chNext == '{') {
+							sc.ForwardSetState(SCE_PL_OPERATOR);
+						} else {
+							sc.ChangeState(SCE_PL_OPERATOR);
+						}
+					} else {
+						sc.SetState(SCE_PL_OPERATOR);
+					}
+				} else if (sc.ch == '<') {	// handle '<', inputsymbol
+					if (preferRE) {
+						// forward scan
+						int i = inputsymbolScan(styler, sc.currentPos, endPos);
+						if (i > 0) {
+							sc.SetState(SCE_PL_IDENTIFIER);
+							sc.Forward(i);
+						} else {
+							sc.SetState(SCE_PL_OPERATOR);
+						}
+					} else {
+						sc.SetState(SCE_PL_OPERATOR);
+					}
+				} else {			// handle '/', regexp
+					if (preferRE) {
+						sc.SetState(SCE_PL_REGEX);
+						Quote.New();
+						Quote.Open(sc.ch);
+					} else {		// / and // operators
+						sc.SetState(SCE_PL_OPERATOR);
+						if (sc.chNext == '/') {
+							sc.Forward();
+						}
+					}
+				}
+			} else if (sc.ch == '='		// POD
+					   && setPOD.Contains(sc.chNext)
+					   && sc.atLineStart) {
+				sc.SetState(SCE_PL_POD);
+				backFlag = BACK_NONE;
+			} else if (sc.ch == '-' && setWordStart.Contains(sc.chNext)) {	// extended '-' cases
+				unsigned int bk = sc.currentPos;
+				unsigned int fw = 2;
+				if (setSingleCharOp.Contains(sc.chNext) &&	// file test operators
+					!setWord.Contains(sc.GetRelative(2))) {
+					sc.SetState(SCE_PL_WORD);
+				} else {
+					// nominally a minus and bareword; find extent of bareword
+					while (setWord.Contains(sc.GetRelative(fw)))
+						fw++;
+					sc.SetState(SCE_PL_OPERATOR);
+				}
+				// force to bareword for hash key => or {variable literal} cases
+				if (disambiguateBareword(styler, bk, bk + fw, backFlag, backPos, endPos) & 2) {
+					sc.ChangeState(SCE_PL_IDENTIFIER);
+				}
+				backFlag = BACK_NONE;
+			} else if (sc.ch == '(' && sc.currentPos > 0) {	// '(' or subroutine prototype
+				if (styleCheckSubPrototype(styler, sc.currentPos - 1)) {
+					sc.SetState(SCE_PL_SUB_PROTOTYPE);
+					backFlag = BACK_NONE;
+				} else {
+					sc.SetState(SCE_PL_OPERATOR);
+				}
+			} else if (setPerlOperator.Contains(sc.ch)) {	// operators
+				sc.SetState(SCE_PL_OPERATOR);
+				if (sc.Match('.', '.')) {	// .. and ...
+					sc.Forward();
+					if (sc.chNext == '.') sc.Forward();
+				}
+			} else if (sc.ch == 4 || sc.ch == 26) {		// ^D and ^Z ends valid perl source
+				sc.SetState(SCE_PL_DATASECTION);
+			} else {
+				// keep colouring defaults
+				sc.Complete();
+			}
+		}
+	}
+	sc.Complete();
+}
+
+static bool IsCommentLine(int line, Accessor &styler) {
+	int pos = styler.LineStart(line);
+	int eol_pos = styler.LineStart(line + 1) - 1;
+	for (int i = pos; i < eol_pos; i++) {
+		char ch = styler[i];
+		int style = styler.StyleAt(i);
+		if (ch == '#' && style == SCE_PL_COMMENTLINE)
+			return true;
+		else if (!IsASpaceOrTab(ch))
+			return false;
+	}
+	return false;
+}
+
+static void FoldPerlDoc(unsigned int startPos, int length, int, WordList *[],
+                        Accessor &styler) {
+	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
+	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	// Custom folding of POD and packages
+	bool foldPOD = styler.GetPropertyInt("fold.perl.pod", 1) != 0;
+	bool foldPackage = styler.GetPropertyInt("fold.perl.package", 1) != 0;
+	unsigned int endPos = startPos + length;
+	int visibleChars = 0;
+	int lineCurrent = styler.GetLine(startPos);
+	int levelPrev = SC_FOLDLEVELBASE;
+	if (lineCurrent > 0)
+		levelPrev = styler.LevelAt(lineCurrent - 1) >> 16;
+	int levelCurrent = levelPrev;
+	char chNext = styler[startPos];
+	char chPrev = styler.SafeGetCharAt(startPos - 1);
+	int styleNext = styler.StyleAt(startPos);
+	// Used at end of line to determine if the line was a package definition
+	bool isPackageLine = false;
+	bool isPodHeading = false;
+	for (unsigned int i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+		bool atLineStart = ((chPrev == '\r') || (chPrev == '\n')) || i == 0;
+		// Comment folding
+		if (foldComment && atEOL && IsCommentLine(lineCurrent, styler))
+		{
+			if (!IsCommentLine(lineCurrent - 1, styler)
+				&& IsCommentLine(lineCurrent + 1, styler))
+				levelCurrent++;
+			else if (IsCommentLine(lineCurrent - 1, styler)
+					 && !IsCommentLine(lineCurrent+1, styler))
+				levelCurrent--;
+		}
+		if (style == SCE_PL_OPERATOR) {
+			if (ch == '{') {
+				levelCurrent++;
+			} else if (ch == '}') {
+				levelCurrent--;
+			}
+		}
+		// Custom POD folding
+		if (foldPOD && atLineStart) {
+			int stylePrevCh = (i) ? styler.StyleAt(i - 1):SCE_PL_DEFAULT;
+			if (style == SCE_PL_POD) {
+				if (stylePrevCh != SCE_PL_POD && stylePrevCh != SCE_PL_POD_VERB)
+					levelCurrent++;
+				else if (styler.Match(i, "=cut"))
+					levelCurrent--;
+				else if (styler.Match(i, "=head"))
+					isPodHeading = true;
+			} else if (style == SCE_PL_DATASECTION) {
+				if (ch == '=' && isalpha(chNext) && levelCurrent == SC_FOLDLEVELBASE)
+					levelCurrent++;
+				else if (styler.Match(i, "=cut") && levelCurrent > SC_FOLDLEVELBASE)
+					levelCurrent--;
+				else if (styler.Match(i, "=head"))
+					isPodHeading = true;
+				// if package used or unclosed brace, level > SC_FOLDLEVELBASE!
+				// reset needed as level test is vs. SC_FOLDLEVELBASE
+				else if (styler.Match(i, "__END__"))
+					levelCurrent = SC_FOLDLEVELBASE;
+			}
+		}
+		// Custom package folding
+		if (foldPackage && atLineStart) {
+			if (style == SCE_PL_WORD && styler.Match(i, "package")) {
+				isPackageLine = true;
+			}
+		}
+
+		if (atEOL) {
+			int lev = levelPrev;
+			if (isPodHeading) {
+				lev = levelPrev - 1;
+				lev |= SC_FOLDLEVELHEADERFLAG;
+				isPodHeading = false;
+			}
+			// Check if line was a package declaration
+			// because packages need "special" treatment
+			if (isPackageLine) {
+				lev = SC_FOLDLEVELBASE | SC_FOLDLEVELHEADERFLAG;
+				levelCurrent = SC_FOLDLEVELBASE + 1;
+				isPackageLine = false;
+			}
+			lev |= levelCurrent << 16;
+			if (visibleChars == 0 && foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if ((levelCurrent > levelPrev) && (visibleChars > 0))
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelPrev = levelCurrent;
+			visibleChars = 0;
+		}
+		if (!isspacechar(ch))
+			visibleChars++;
+		chPrev = ch;
+	}
+	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
+	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
+}
+
+static const char * const perlWordListDesc[] = {
+	"Keywords",
+	0
+};
+
+LexerModule lmPerl(SCLEX_PERL, ColourisePerlDoc, "perl", FoldPerlDoc, perlWordListDesc, 8);
diff --git a/Documents/Scintilla/LexPowerShell.cxx b/Documents/Scintilla/LexPowerShell.cxx
new file mode 100644
index 0000000..d16ba98
--- /dev/null
+++ b/Documents/Scintilla/LexPowerShell.cxx
@@ -0,0 +1,175 @@
+// Scintilla source code edit control
+/** @file LexPowerShell.cxx
+ ** Lexer for PowerShell scripts.
+ **/
+// Copyright 2008 by Tim Gerundt <tim@gerundt.de>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+// Extended to accept accented characters
+static inline bool IsAWordChar(int ch) {
+	return ch >= 0x80 || isalnum(ch) || ch == '-';
+}
+
+static void ColourisePowerShellDoc(unsigned int startPos, int length, int initStyle,
+                           WordList *keywordlists[], Accessor &styler) {
+
+	WordList &keywords = *keywordlists[0];
+	WordList &keywords2 = *keywordlists[1];
+	WordList &keywords3 = *keywordlists[2];
+
+	styler.StartAt(startPos);
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	for (; sc.More(); sc.Forward()) {
+
+		if (sc.state == SCE_POWERSHELL_COMMENT) {
+			if (sc.atLineEnd) {
+				sc.SetState(SCE_POWERSHELL_DEFAULT);
+			}
+		} else if (sc.state == SCE_POWERSHELL_STRING) {
+			// This is a doubles quotes string
+			if (sc.ch == '\"') {
+				sc.ForwardSetState(SCE_POWERSHELL_DEFAULT);
+			}
+		} else if (sc.state == SCE_POWERSHELL_CHARACTER) {
+			// This is a single quote string
+			if (sc.ch == '\'') {
+				sc.ForwardSetState(SCE_POWERSHELL_DEFAULT);
+			}
+		} else if (sc.state == SCE_POWERSHELL_NUMBER) {
+			if (!IsADigit(sc.ch)) {
+				sc.SetState(SCE_POWERSHELL_DEFAULT);
+			}
+		} else if (sc.state == SCE_POWERSHELL_VARIABLE) {
+			if (!IsAWordChar(sc.ch)) {
+				sc.SetState(SCE_POWERSHELL_DEFAULT);
+			}
+		} else if (sc.state == SCE_POWERSHELL_OPERATOR) {
+			if (!isoperator(static_cast<char>(sc.ch))) {
+				sc.SetState(SCE_POWERSHELL_DEFAULT);
+			}
+		} else if (sc.state == SCE_POWERSHELL_IDENTIFIER) {
+			if (!IsAWordChar(sc.ch)) {
+				char s[100];
+				sc.GetCurrentLowered(s, sizeof(s));
+
+				if (keywords.InList(s)) {
+					sc.ChangeState(SCE_POWERSHELL_KEYWORD);
+				} else if (keywords2.InList(s)) {
+					sc.ChangeState(SCE_POWERSHELL_CMDLET);
+				} else if (keywords3.InList(s)) {
+					sc.ChangeState(SCE_POWERSHELL_ALIAS);
+				}
+				sc.SetState(SCE_POWERSHELL_DEFAULT);
+			}
+		}
+
+		// Determine if a new state should be entered.
+		if (sc.state == SCE_POWERSHELL_DEFAULT) {
+			if (sc.ch == '#') {
+				sc.SetState(SCE_POWERSHELL_COMMENT);
+			} else if (sc.ch == '\"') {
+				sc.SetState(SCE_POWERSHELL_STRING);
+			} else if (sc.ch == '\'') {
+				sc.SetState(SCE_POWERSHELL_CHARACTER);
+			} else if (sc.ch == '$') {
+				sc.SetState(SCE_POWERSHELL_VARIABLE);
+			} else if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
+				sc.SetState(SCE_POWERSHELL_NUMBER);
+			} else if (isoperator(static_cast<char>(sc.ch))) {
+				sc.SetState(SCE_POWERSHELL_OPERATOR);
+			} else if (IsAWordChar(sc.ch)) {
+				sc.SetState(SCE_POWERSHELL_IDENTIFIER);
+			}
+		}
+	}
+	sc.Complete();
+}
+
+// Store both the current line's fold level and the next lines in the
+// level store to make it easy to pick up with each increment
+// and to make it possible to fiddle the current level for "} else {".
+static void FoldPowerShellDoc(unsigned int startPos, int length, int,
+                           WordList *[], Accessor &styler) {
+	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	bool foldAtElse = styler.GetPropertyInt("fold.at.else", 0) != 0;
+	unsigned int endPos = startPos + length;
+	int visibleChars = 0;
+	int lineCurrent = styler.GetLine(startPos);
+	int levelCurrent = SC_FOLDLEVELBASE;
+	if (lineCurrent > 0)
+		levelCurrent = styler.LevelAt(lineCurrent-1) >> 16;
+	int levelMinCurrent = levelCurrent;
+	int levelNext = levelCurrent;
+	char chNext = styler[startPos];
+	int styleNext = styler.StyleAt(startPos);
+	for (unsigned int i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+		if (style == SCE_POWERSHELL_OPERATOR) {
+			if (ch == '{') {
+				// Measure the minimum before a '{' to allow
+				// folding on "} else {"
+				if (levelMinCurrent > levelNext) {
+					levelMinCurrent = levelNext;
+				}
+				levelNext++;
+			} else if (ch == '}') {
+				levelNext--;
+			}
+		}
+		if (!IsASpace(ch))
+			visibleChars++;
+		if (atEOL || (i == endPos-1)) {
+			int levelUse = levelCurrent;
+			if (foldAtElse) {
+				levelUse = levelMinCurrent;
+			}
+			int lev = levelUse | levelNext << 16;
+			if (visibleChars == 0 && foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if (levelUse < levelNext)
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelCurrent = levelNext;
+			levelMinCurrent = levelCurrent;
+			visibleChars = 0;
+		}
+	}
+}
+
+static const char * const powershellWordLists[] = {
+	"Commands",
+	"Cmdlets",
+	"Aliases",
+	0
+};
+
+LexerModule lmPowerShell(SCLEX_POWERSHELL, ColourisePowerShellDoc, "powershell", FoldPowerShellDoc, powershellWordLists);
+
diff --git a/Documents/Scintilla/LexProgress.cxx b/Documents/Scintilla/LexProgress.cxx
new file mode 100644
index 0000000..c213569
--- /dev/null
+++ b/Documents/Scintilla/LexProgress.cxx
@@ -0,0 +1,276 @@
+// Scintilla source code edit control
+/** @file LexProgress.cxx
+ **  Lexer for Progress 4GL.
+ ** Based on LexCPP.cxx of Neil Hodgson <neilh@scintilla.org>
+  **/
+// Copyright 2006-2007 by Yuval Papish <Yuval@YuvCom.com>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+/** TODO:
+WebSpeed support in html lexer
+Support "end triggers" expression of the triggers phrase
+change lmPS to lmProgress
+Support more than 6 comments levels
+**/
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+static inline bool IsAWordChar(int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '_');
+}
+
+static inline bool IsAWordStart(int ch) {
+	return (ch < 0x80) && (isalpha(ch) || ch == '_');
+}
+
+enum SentenceStart { SetSentenceStart = 0xf, ResetSentenceStart = 0x10}; // true -> bit = 0
+
+static void Colourise4glDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
+                            Accessor &styler) {
+
+    WordList &keywords1 = *keywordlists[0];
+    WordList &keywords2 = *keywordlists[1];
+    WordList &keywords3 = *keywordlists[2];
+    //WordList &keywords4 = *keywordlists[3];
+    //WordList &keywords5 = *keywordlists[4];
+
+	int visibleChars = 0;
+	int mask;
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	for (; sc.More(); sc.Forward()) {
+
+		if (sc.atLineStart) {
+			// Reset states to begining of colourise so no surprises
+			// if different sets of lines lexed.
+			visibleChars = 0;
+		}
+
+		// Handle line continuation generically.
+		if (sc.ch == '~') {
+			if (sc.chNext > ' ') {
+				// skip special char after ~
+				sc.Forward();
+				continue;
+			}
+			else {
+				// Skip whitespace between ~ and EOL
+				while (sc.More() && (sc.chNext == ' ' || sc.chNext == '\t') ) {
+					sc.Forward();
+				}
+				if (sc.chNext == '\n' || sc.chNext == '\r') {
+					sc.Forward();
+					if (sc.ch == '\r' && sc.chNext == '\n') {
+						sc.Forward();
+					}
+					sc.Forward();
+					continue;
+				}
+			}
+		}
+		// Determine if a new state should be terminated.
+		mask = sc.state & 0x10;
+		switch (sc.state & 0xf) {
+			case SCE_4GL_OPERATOR:
+				sc.SetState(SCE_4GL_DEFAULT | mask);
+				break;
+			case SCE_4GL_NUMBER:
+				if (!(IsADigit(sc.ch))) {
+					sc.SetState(SCE_4GL_DEFAULT | mask);
+				}
+				break;
+			case SCE_4GL_IDENTIFIER:
+				if (!IsAWordChar(sc.ch) && sc.ch != '-') {
+					char s[1000];
+					sc.GetCurrentLowered(s, sizeof(s));
+					if (((sc.state & 0x10) == 0) && keywords2.InList(s) || keywords3.InList(s)) {
+						sc.ChangeState(SCE_4GL_BLOCK | ResetSentenceStart);
+					}
+					else if (keywords1.InList(s)) {
+						if ((s[0] == 'e' && s[1] =='n' && s[2] == 'd' && !isalnum(s[3]) && s[3] != '-') ||
+							(s[0] == 'f' && s[1] =='o' && s[2] == 'r' && s[3] == 'w' && s[4] =='a' && s[5] == 'r' && s[6] == 'd'&& !isalnum(s[7]))) {
+							sc.ChangeState(SCE_4GL_END | ResetSentenceStart);
+						}
+						else if	((s[0] == 'e' && s[1] =='l' && s[2] == 's' && s[3] == 'e') ||
+								 (s[0] == 't' && s[1] =='h' && s[2] == 'e' && s[3] == 'n')) {
+							sc.ChangeState(SCE_4GL_WORD & SetSentenceStart);
+						}
+						else {
+							sc.ChangeState(SCE_4GL_WORD | ResetSentenceStart);
+						}
+					}
+					sc.SetState(SCE_4GL_DEFAULT | (sc.state & 0x10));
+				}
+				break;
+			case SCE_4GL_PREPROCESSOR:
+				if (sc.atLineStart) {
+					sc.SetState(SCE_4GL_DEFAULT & SetSentenceStart);
+				} else if (sc.ch == '*' && sc.chNext == '/') {
+					sc.ForwardSetState(SCE_4GL_DEFAULT | mask);
+				}
+				break;
+			case SCE_4GL_STRING:
+				if (sc.ch == '\"') {
+					sc.ForwardSetState(SCE_4GL_DEFAULT | mask);
+				}
+				break;
+			case SCE_4GL_CHARACTER:
+				if (sc.ch == '\'') {
+					sc.ForwardSetState(SCE_4GL_DEFAULT | mask);
+				}
+				break;
+			default:
+				if ((sc.state & 0xf) >= SCE_4GL_COMMENT1) {
+					if (sc.ch == '*' && sc.chNext == '/') {
+						sc.Forward();
+						if ((sc.state & 0xf) == SCE_4GL_COMMENT1) {
+							sc.ForwardSetState(SCE_4GL_DEFAULT | mask);
+						}
+						else
+							sc.SetState((sc.state & 0x1f) - 1);
+					} else if (sc.ch == '/' && sc.chNext == '*') {
+						sc.Forward();
+						sc.SetState((sc.state & 0x1f) + 1);
+					}
+				}
+		}
+
+		// Determine if a new state should be entered.
+		mask = sc.state & 0x10;
+		if ((sc.state & 0xf) == SCE_4GL_DEFAULT) {
+			if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
+				sc.SetState(SCE_4GL_NUMBER | ResetSentenceStart);
+			} else if (IsAWordStart(sc.ch) || (sc.ch == '@')) {
+				sc.SetState(SCE_4GL_IDENTIFIER | mask);
+			} else if (sc.ch == '/' && sc.chNext == '*') {
+				sc.SetState(SCE_4GL_COMMENT1 | mask);
+				sc.Forward();
+			} else if (sc.ch == '\"') {
+				sc.SetState(SCE_4GL_STRING | ResetSentenceStart);
+			} else if (sc.ch == '\'') {
+				sc.SetState(SCE_4GL_CHARACTER | ResetSentenceStart);
+			} else if (sc.ch == '&' && visibleChars == 0 && ((sc.state & 0x10) == 0)) {
+				sc.SetState(SCE_4GL_PREPROCESSOR | ResetSentenceStart);
+				// Skip whitespace between & and preprocessor word
+				do {
+					sc.Forward();
+				} while ((sc.ch == ' ' || sc.ch == '\t') && sc.More());
+			// Handle syntactical line termination
+			} else if ((sc.ch == '.' || sc.ch == ':' || sc.ch == '}') && (sc.chNext == ' ' || sc.chNext == '\t' || sc.chNext == '\n' || sc.chNext == '\r')) {
+				sc.SetState(sc.state & SetSentenceStart);
+			} else if (isoperator(static_cast<char>(sc.ch))) {
+				if (sc.ch == ':')
+					sc.SetState(SCE_4GL_OPERATOR & SetSentenceStart);
+				else
+					sc.SetState(SCE_4GL_OPERATOR | ResetSentenceStart);
+			}
+		}
+
+		if (!IsASpace(sc.ch)) {
+			visibleChars++;
+		}
+	}
+	sc.Complete();
+}
+
+static bool IsStreamCommentStyle(int style) {
+	return (style & 0xf) >= SCE_4GL_COMMENT1 ;
+}
+
+// Store both the current line's fold level and the next lines in the
+// level store to make it easy to pick up with each increment
+// and to make it possible to fiddle the current level for "} else {".
+static void FoldNoBox4glDoc(unsigned int startPos, int length, int initStyle,
+                            Accessor &styler) {
+	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
+	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	bool foldAtElse = styler.GetPropertyInt("fold.at.else", 0) != 0;
+	unsigned int endPos = startPos + length;
+	int visibleChars = 0;
+	int lineCurrent = styler.GetLine(startPos);
+	int levelCurrent = SC_FOLDLEVELBASE;
+	if (lineCurrent > 0)
+		levelCurrent = styler.LevelAt(lineCurrent-1) >> 16;
+	int levelMinCurrent = levelCurrent;
+	int levelNext = levelCurrent;
+	char chNext = static_cast<char>(tolower(styler[startPos]));
+	int styleNext = styler.StyleAt(startPos);
+	int style = initStyle;
+	for (unsigned int i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = static_cast<char>(tolower(styler.SafeGetCharAt(i + 1)));
+		int stylePrev = style;
+		style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+		if (foldComment && IsStreamCommentStyle(style)) {
+			if (!IsStreamCommentStyle(stylePrev)) {
+				levelNext++;
+			} else if (!IsStreamCommentStyle(styleNext)) { // && !atEOL) {
+				// Comments don't end at end of line and the next character may be unstyled.
+				levelNext--;
+			}
+		}
+		else if ((style & 0xf) == SCE_4GL_BLOCK && !isalnum(chNext)) {
+			levelNext++;
+		}
+		else if ((style & 0xf) == SCE_4GL_END  && (ch == 'e' || ch == 'f')) {
+			levelNext--;
+		}
+		if (atEOL) {
+			int levelUse = levelCurrent;
+			if (foldAtElse) {
+				levelUse = levelMinCurrent;
+			}
+			int lev = levelUse | levelNext << 16;
+			if (visibleChars == 0 && foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if (levelUse < levelNext)
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelCurrent = levelNext;
+			levelMinCurrent = levelCurrent;
+			visibleChars = 0;
+		}
+		if (!isspacechar(ch))
+			visibleChars++;
+	}
+}
+
+static void Fold4glDoc(unsigned int startPos, int length, int initStyle, WordList *[],
+                       Accessor &styler) {
+	FoldNoBox4glDoc(startPos, length, initStyle, styler);
+}
+
+static const char * const FglWordLists[] = {
+            "Primary keywords and identifiers",
+            "Secondary keywords and identifiers",
+            "Documentation comment keywords",
+            "Unused",
+            "Global classes and typedefs",
+            0,
+        };
+
+LexerModule lmProgress(SCLEX_PS, Colourise4glDoc, "progress", Fold4glDoc, FglWordLists);
+
+
diff --git a/Documents/Scintilla/LexPython.cxx b/Documents/Scintilla/LexPython.cxx
new file mode 100644
index 0000000..01d406d
--- /dev/null
+++ b/Documents/Scintilla/LexPython.cxx
@@ -0,0 +1,461 @@
+// Scintilla source code edit control
+/** @file LexPython.cxx
+ ** Lexer for Python.
+ **/
+// Copyright 1998-2002 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+enum kwType { kwOther, kwClass, kwDef, kwImport };
+static const int indicatorWhitespace = 1;
+
+static bool IsPyComment(Accessor &styler, int pos, int len) {
+	return len > 0 && styler[pos] == '#';
+}
+
+static bool IsPyStringStart(int ch, int chNext, int chNext2) {
+	if (ch == '\'' || ch == '"')
+		return true;
+	if (ch == 'u' || ch == 'U') {
+		if (chNext == '"' || chNext == '\'')
+			return true;
+		if ((chNext == 'r' || chNext == 'R') && (chNext2 == '"' || chNext2 == '\''))
+			return true;
+	}
+	if ((ch == 'r' || ch == 'R') && (chNext == '"' || chNext == '\''))
+		return true;
+
+	return false;
+}
+
+/* Return the state to use for the string starting at i; *nextIndex will be set to the first index following the quote(s) */
+static int GetPyStringState(Accessor &styler, int i, unsigned int *nextIndex) {
+	char ch = styler.SafeGetCharAt(i);
+	char chNext = styler.SafeGetCharAt(i + 1);
+
+	// Advance beyond r, u, or ur prefix, but bail if there are any unexpected chars
+	if (ch == 'r' || ch == 'R') {
+		i++;
+		ch = styler.SafeGetCharAt(i);
+		chNext = styler.SafeGetCharAt(i + 1);
+	} else if (ch == 'u' || ch == 'U') {
+		if (chNext == 'r' || chNext == 'R')
+			i += 2;
+		else
+			i += 1;
+		ch = styler.SafeGetCharAt(i);
+		chNext = styler.SafeGetCharAt(i + 1);
+	}
+
+	if (ch != '"' && ch != '\'') {
+		*nextIndex = i + 1;
+		return SCE_P_DEFAULT;
+	}
+
+	if (ch == chNext && ch == styler.SafeGetCharAt(i + 2)) {
+		*nextIndex = i + 3;
+
+		if (ch == '"')
+			return SCE_P_TRIPLEDOUBLE;
+		else
+			return SCE_P_TRIPLE;
+	} else {
+		*nextIndex = i + 1;
+
+		if (ch == '"')
+			return SCE_P_STRING;
+		else
+			return SCE_P_CHARACTER;
+	}
+}
+
+static inline bool IsAWordChar(int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '.' || ch == '_');
+}
+
+static inline bool IsAWordStart(int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '_');
+}
+
+static void ColourisePyDoc(unsigned int startPos, int length, int initStyle,
+                           WordList *keywordlists[], Accessor &styler) {
+
+	int endPos = startPos + length;
+
+	// Backtrack to previous line in case need to fix its tab whinging
+	int lineCurrent = styler.GetLine(startPos);
+	if (startPos > 0) {
+		if (lineCurrent > 0) {
+			lineCurrent--;
+			startPos = styler.LineStart(lineCurrent);
+			if (startPos == 0)
+				initStyle = SCE_P_DEFAULT;
+			else
+				initStyle = styler.StyleAt(startPos - 1);
+		}
+	}
+
+	WordList &keywords = *keywordlists[0];
+	WordList &keywords2 = *keywordlists[1];
+
+	const int whingeLevel = styler.GetPropertyInt("tab.timmy.whinge.level");
+
+	initStyle = initStyle & 31;
+	if (initStyle == SCE_P_STRINGEOL) {
+		initStyle = SCE_P_DEFAULT;
+	}
+
+	kwType kwLast = kwOther;
+	int spaceFlags = 0;
+	styler.IndentAmount(lineCurrent, &spaceFlags, IsPyComment);
+	bool hexadecimal = false;
+
+	StyleContext sc(startPos, endPos - startPos, initStyle, styler);
+
+	bool indentGood = true;
+	int startIndicator = sc.currentPos;
+
+	for (; sc.More(); sc.Forward()) {
+
+		if (sc.atLineStart) {
+			styler.IndentAmount(lineCurrent, &spaceFlags, IsPyComment);
+			indentGood = true;
+			if (whingeLevel == 1) {
+				indentGood = (spaceFlags & wsInconsistent) == 0;
+			} else if (whingeLevel == 2) {
+				indentGood = (spaceFlags & wsSpaceTab) == 0;
+			} else if (whingeLevel == 3) {
+				indentGood = (spaceFlags & wsSpace) == 0;
+			} else if (whingeLevel == 4) {
+				indentGood = (spaceFlags & wsTab) == 0;
+			}
+			if (!indentGood) {
+				styler.IndicatorFill(startIndicator, sc.currentPos, indicatorWhitespace, 0);
+				startIndicator = sc.currentPos;
+			}
+		}
+
+		if (sc.atLineEnd) {
+			if ((sc.state == SCE_P_DEFAULT) ||
+			        (sc.state == SCE_P_TRIPLE) ||
+			        (sc.state == SCE_P_TRIPLEDOUBLE)) {
+				// Perform colourisation of white space and triple quoted strings at end of each line to allow
+				// tab marking to work inside white space and triple quoted strings
+				sc.SetState(sc.state);
+			}
+			lineCurrent++;
+			if ((sc.state == SCE_P_STRING) || (sc.state == SCE_P_CHARACTER)) {
+				sc.ChangeState(SCE_P_STRINGEOL);
+				sc.ForwardSetState(SCE_P_DEFAULT);
+			}
+			if (!sc.More())
+				break;
+		}
+
+		bool needEOLCheck = false;
+
+		// Check for a state end
+		if (sc.state == SCE_P_OPERATOR) {
+			kwLast = kwOther;
+			sc.SetState(SCE_P_DEFAULT);
+		} else if (sc.state == SCE_P_NUMBER) {
+			if (!IsAWordChar(sc.ch) &&
+			        !(!hexadecimal && ((sc.ch == '+' || sc.ch == '-') && (sc.chPrev == 'e' || sc.chPrev == 'E')))) {
+				sc.SetState(SCE_P_DEFAULT);
+			}
+		} else if (sc.state == SCE_P_IDENTIFIER) {
+			if ((sc.ch == '.') || (!IsAWordChar(sc.ch))) {
+				char s[100];
+				sc.GetCurrent(s, sizeof(s));
+				int style = SCE_P_IDENTIFIER;
+				if ((kwLast == kwImport) && (strcmp(s, "as") == 0)) {
+					style = SCE_P_WORD;
+				} else if (keywords.InList(s)) {
+					style = SCE_P_WORD;
+				} else if (kwLast == kwClass) {
+					style = SCE_P_CLASSNAME;
+				} else if (kwLast == kwDef) {
+					style = SCE_P_DEFNAME;
+				} else if (keywords2.InList(s)) {
+					style = SCE_P_WORD2;
+				}
+				sc.ChangeState(style);
+				sc.SetState(SCE_P_DEFAULT);
+				if (style == SCE_P_WORD) {
+					if (0 == strcmp(s, "class"))
+						kwLast = kwClass;
+					else if (0 == strcmp(s, "def"))
+						kwLast = kwDef;
+					else if (0 == strcmp(s, "import"))
+						kwLast = kwImport;
+					else
+						kwLast = kwOther;
+				} else {
+					kwLast = kwOther;
+				}
+			}
+		} else if ((sc.state == SCE_P_COMMENTLINE) || (sc.state == SCE_P_COMMENTBLOCK)) {
+			if (sc.ch == '\r' || sc.ch == '\n') {
+				sc.SetState(SCE_P_DEFAULT);
+			}
+		} else if (sc.state == SCE_P_DECORATOR) {
+			if (!IsAWordChar(sc.ch)) {
+				sc.SetState(SCE_P_DEFAULT);
+			}
+		} else if ((sc.state == SCE_P_STRING) || (sc.state == SCE_P_CHARACTER)) {
+			if (sc.ch == '\\') {
+				if ((sc.chNext == '\r') && (sc.GetRelative(2) == '\n')) {
+					sc.Forward();
+				}
+				sc.Forward();
+			} else if ((sc.state == SCE_P_STRING) && (sc.ch == '\"')) {
+				sc.ForwardSetState(SCE_P_DEFAULT);
+				needEOLCheck = true;
+			} else if ((sc.state == SCE_P_CHARACTER) && (sc.ch == '\'')) {
+				sc.ForwardSetState(SCE_P_DEFAULT);
+				needEOLCheck = true;
+			}
+		} else if (sc.state == SCE_P_TRIPLE) {
+			if (sc.ch == '\\') {
+				sc.Forward();
+			} else if (sc.Match("\'\'\'")) {
+				sc.Forward();
+				sc.Forward();
+				sc.ForwardSetState(SCE_P_DEFAULT);
+				needEOLCheck = true;
+			}
+		} else if (sc.state == SCE_P_TRIPLEDOUBLE) {
+			if (sc.ch == '\\') {
+				sc.Forward();
+			} else if (sc.Match("\"\"\"")) {
+				sc.Forward();
+				sc.Forward();
+				sc.ForwardSetState(SCE_P_DEFAULT);
+				needEOLCheck = true;
+			}
+		}
+
+		if (!indentGood && !IsASpaceOrTab(sc.ch)) {
+			styler.IndicatorFill(startIndicator, sc.currentPos, indicatorWhitespace, 1);
+			startIndicator = sc.currentPos;
+			indentGood = true;
+		}
+
+		// State exit code may have moved on to end of line
+		if (needEOLCheck && sc.atLineEnd) {
+			lineCurrent++;
+			styler.IndentAmount(lineCurrent, &spaceFlags, IsPyComment);
+			if (!sc.More())
+				break;
+		}
+
+		// Check for a new state starting character
+		if (sc.state == SCE_P_DEFAULT) {
+			if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
+				if (sc.ch == '0' && (sc.chNext == 'x' || sc.chNext == 'X')) {
+					hexadecimal = true;
+				} else {
+					hexadecimal = false;
+				}
+				sc.SetState(SCE_P_NUMBER);
+			} else if (isascii(sc.ch) && isoperator(static_cast<char>(sc.ch)) || sc.ch == '`') {
+				sc.SetState(SCE_P_OPERATOR);
+			} else if (sc.ch == '#') {
+				sc.SetState(sc.chNext == '#' ? SCE_P_COMMENTBLOCK : SCE_P_COMMENTLINE);
+			} else if (sc.ch == '@') {
+				sc.SetState(SCE_P_DECORATOR);
+			} else if (IsPyStringStart(sc.ch, sc.chNext, sc.GetRelative(2))) {
+				unsigned int nextIndex = 0;
+				sc.SetState(GetPyStringState(styler, sc.currentPos, &nextIndex));
+				while (nextIndex > (sc.currentPos + 1) && sc.More()) {
+					sc.Forward();
+				}
+			} else if (IsAWordStart(sc.ch)) {
+				sc.SetState(SCE_P_IDENTIFIER);
+			}
+		}
+	}
+	styler.IndicatorFill(startIndicator, sc.currentPos, indicatorWhitespace, 0);
+	sc.Complete();
+}
+
+static bool IsCommentLine(int line, Accessor &styler) {
+	int pos = styler.LineStart(line);
+	int eol_pos = styler.LineStart(line + 1) - 1;
+	for (int i = pos; i < eol_pos; i++) {
+		char ch = styler[i];
+		if (ch == '#')
+			return true;
+		else if (ch != ' ' && ch != '\t')
+			return false;
+	}
+	return false;
+}
+
+static bool IsQuoteLine(int line, Accessor &styler) {
+	int style = styler.StyleAt(styler.LineStart(line)) & 31;
+	return ((style == SCE_P_TRIPLE) || (style == SCE_P_TRIPLEDOUBLE));
+}
+
+
+static void FoldPyDoc(unsigned int startPos, int length, int /*initStyle - unused*/,
+                      WordList *[], Accessor &styler) {
+	const int maxPos = startPos + length;
+	const int maxLines = styler.GetLine(maxPos - 1);             // Requested last line
+	const int docLines = styler.GetLine(styler.Length() - 1);  // Available last line
+	const bool foldComment = styler.GetPropertyInt("fold.comment.python") != 0;
+	const bool foldQuotes = styler.GetPropertyInt("fold.quotes.python") != 0;
+
+	// Backtrack to previous non-blank line so we can determine indent level
+	// for any white space lines (needed esp. within triple quoted strings)
+	// and so we can fix any preceding fold level (which is why we go back
+	// at least one line in all cases)
+	int spaceFlags = 0;
+	int lineCurrent = styler.GetLine(startPos);
+	int indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags, NULL);
+	while (lineCurrent > 0) {
+		lineCurrent--;
+		indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags, NULL);
+		if (!(indentCurrent & SC_FOLDLEVELWHITEFLAG) &&
+		        (!IsCommentLine(lineCurrent, styler)) &&
+		        (!IsQuoteLine(lineCurrent, styler)))
+			break;
+	}
+	int indentCurrentLevel = indentCurrent & SC_FOLDLEVELNUMBERMASK;
+
+	// Set up initial loop state
+	startPos = styler.LineStart(lineCurrent);
+	int prev_state = SCE_P_DEFAULT & 31;
+	if (lineCurrent >= 1)
+		prev_state = styler.StyleAt(startPos - 1) & 31;
+	int prevQuote = foldQuotes && ((prev_state == SCE_P_TRIPLE) || (prev_state == SCE_P_TRIPLEDOUBLE));
+	int prevComment = 0;
+	if (lineCurrent >= 1)
+		prevComment = foldComment && IsCommentLine(lineCurrent - 1, styler);
+
+	// Process all characters to end of requested range or end of any triple quote
+	// or comment that hangs over the end of the range.  Cap processing in all cases
+	// to end of document (in case of unclosed quote or comment at end).
+	while ((lineCurrent <= docLines) && ((lineCurrent <= maxLines) || prevQuote || prevComment)) {
+
+		// Gather info
+		int lev = indentCurrent;
+		int lineNext = lineCurrent + 1;
+		int indentNext = indentCurrent;
+		int quote = false;
+		if (lineNext <= docLines) {
+			// Information about next line is only available if not at end of document
+			indentNext = styler.IndentAmount(lineNext, &spaceFlags, NULL);
+			int style = styler.StyleAt(styler.LineStart(lineNext)) & 31;
+			quote = foldQuotes && ((style == SCE_P_TRIPLE) || (style == SCE_P_TRIPLEDOUBLE));
+		}
+		const int quote_start = (quote && !prevQuote);
+		const int quote_continue = (quote && prevQuote);
+		const int comment = foldComment && IsCommentLine(lineCurrent, styler);
+		const int comment_start = (comment && !prevComment && (lineNext <= docLines) &&
+		                           IsCommentLine(lineNext, styler) && (lev > SC_FOLDLEVELBASE));
+		const int comment_continue = (comment && prevComment);
+		if ((!quote || !prevQuote) && !comment)
+			indentCurrentLevel = indentCurrent & SC_FOLDLEVELNUMBERMASK;
+		if (quote)
+			indentNext = indentCurrentLevel;
+		if (indentNext & SC_FOLDLEVELWHITEFLAG)
+			indentNext = SC_FOLDLEVELWHITEFLAG | indentCurrentLevel;
+
+		if (quote_start) {
+			// Place fold point at start of triple quoted string
+			lev |= SC_FOLDLEVELHEADERFLAG;
+		} else if (quote_continue || prevQuote) {
+			// Add level to rest of lines in the string
+			lev = lev + 1;
+		} else if (comment_start) {
+			// Place fold point at start of a block of comments
+			lev |= SC_FOLDLEVELHEADERFLAG;
+		} else if (comment_continue) {
+			// Add level to rest of lines in the block
+			lev = lev + 1;
+		}
+
+		// Skip past any blank lines for next indent level info; we skip also
+		// comments (all comments, not just those starting in column 0)
+		// which effectively folds them into surrounding code rather
+		// than screwing up folding.
+
+		while (!quote &&
+		        (lineNext < docLines) &&
+		        ((indentNext & SC_FOLDLEVELWHITEFLAG) ||
+		         (lineNext <= docLines && IsCommentLine(lineNext, styler)))) {
+
+			lineNext++;
+			indentNext = styler.IndentAmount(lineNext, &spaceFlags, NULL);
+		}
+
+		const int levelAfterComments = indentNext & SC_FOLDLEVELNUMBERMASK;
+		const int levelBeforeComments = Platform::Maximum(indentCurrentLevel,levelAfterComments);
+
+		// Now set all the indent levels on the lines we skipped
+		// Do this from end to start.  Once we encounter one line
+		// which is indented more than the line after the end of
+		// the comment-block, use the level of the block before
+
+		int skipLine = lineNext;
+		int skipLevel = levelAfterComments;
+
+		while (--skipLine > lineCurrent) {
+			int skipLineIndent = styler.IndentAmount(skipLine, &spaceFlags, NULL);
+
+			if ((skipLineIndent & SC_FOLDLEVELNUMBERMASK) > levelAfterComments)
+				skipLevel = levelBeforeComments;
+
+			int whiteFlag = skipLineIndent & SC_FOLDLEVELWHITEFLAG;
+
+			styler.SetLevel(skipLine, skipLevel | whiteFlag);
+		}
+
+		// Set fold header on non-quote/non-comment line
+		if (!quote && !comment && !(indentCurrent & SC_FOLDLEVELWHITEFLAG) ) {
+			if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext & SC_FOLDLEVELNUMBERMASK))
+				lev |= SC_FOLDLEVELHEADERFLAG;
+		}
+
+		// Keep track of triple quote and block comment state of previous line
+		prevQuote = quote;
+		prevComment = comment_start || comment_continue;
+
+		// Set fold level for this line and move to next line
+		styler.SetLevel(lineCurrent, lev);
+		indentCurrent = indentNext;
+		lineCurrent = lineNext;
+	}
+
+	// NOTE: Cannot set level of last line here because indentCurrent doesn't have
+	// header flag set; the loop above is crafted to take care of this case!
+	//styler.SetLevel(lineCurrent, indentCurrent);
+}
+
+static const char * const pythonWordListDesc[] = {
+	"Keywords",
+	"Highlighted identifiers",
+	0
+};
+
+LexerModule lmPython(SCLEX_PYTHON, ColourisePyDoc, "python", FoldPyDoc,
+					 pythonWordListDesc);
diff --git a/Documents/Scintilla/LexR.cxx b/Documents/Scintilla/LexR.cxx
new file mode 100644
index 0000000..67e779f
--- /dev/null
+++ b/Documents/Scintilla/LexR.cxx
@@ -0,0 +1,213 @@
+// Scintilla source code edit control
+/** @file Lexr.cxx
+ ** Lexer for R, S, SPlus Statistics Program (Heavily derived from CPP Lexer).
+ **
+ **/
+// Copyright 1998-2002 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+static inline bool IsAWordChar(const int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '.' || ch == '_');
+}
+
+static inline bool IsAWordStart(const int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '_');
+}
+
+static inline bool IsAnOperator(const int ch) {
+	if (isascii(ch) && isalnum(ch))
+		return false;
+	// '.' left out as it is used to make up numbers
+	if (ch == '-' || ch == '+' || ch == '!' || ch == '~' ||
+	        ch == '?' || ch == ':' || ch == '*' || ch == '/' ||
+	        ch == '^' || ch == '<' || ch == '>' || ch == '=' ||
+	        ch == '&' || ch == '|' || ch == '$' || ch == '(' ||
+	        ch == ')' || ch == '}' || ch == '{' || ch == '[' ||
+		ch == ']')
+		return true;
+	return false;
+}
+
+static void ColouriseRDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
+                            Accessor &styler) {
+
+	WordList &keywords   = *keywordlists[0];
+	WordList &keywords2 = *keywordlists[1];
+	WordList &keywords3 = *keywordlists[2];
+
+
+	// Do not leak onto next line
+	if (initStyle == SCE_R_INFIXEOL)
+		initStyle = SCE_R_DEFAULT;
+
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	for (; sc.More(); sc.Forward()) {
+
+		if (sc.atLineStart && (sc.state == SCE_R_STRING)) {
+			// Prevent SCE_R_STRINGEOL from leaking back to previous line
+			sc.SetState(SCE_R_STRING);
+		}
+
+		// Determine if the current state should terminate.
+		if (sc.state == SCE_R_OPERATOR) {
+			sc.SetState(SCE_R_DEFAULT);
+		} else if (sc.state == SCE_R_NUMBER) {
+			if (!IsADigit(sc.ch) && !(sc.ch == '.' && IsADigit(sc.chNext))) {
+				sc.SetState(SCE_R_DEFAULT);
+			}
+		} else if (sc.state == SCE_R_IDENTIFIER) {
+			if (!IsAWordChar(sc.ch) || (sc.ch == '.')) {
+				char s[100];
+				sc.GetCurrentLowered(s, sizeof(s));
+				if (keywords.InList(s)) {
+					sc.ChangeState(SCE_R_KWORD);
+				} else if  (keywords2.InList(s)) {
+					sc.ChangeState(SCE_R_BASEKWORD);
+				} else if  (keywords3.InList(s)) {
+					sc.ChangeState(SCE_R_OTHERKWORD);
+				}
+				sc.SetState(SCE_R_DEFAULT);
+			}
+		} else if (sc.state == SCE_R_COMMENT) {
+			if (sc.ch == '\r' || sc.ch == '\n') {
+				sc.SetState(SCE_R_DEFAULT);
+			}
+		} else if (sc.state == SCE_R_STRING) {
+			if (sc.ch == '\\') {
+				if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
+					sc.Forward();
+				}
+			} else if (sc.ch == '\"') {
+				sc.ForwardSetState(SCE_R_DEFAULT);
+			}
+		} else if (sc.state == SCE_R_INFIX) {
+			if (sc.ch == '%') {
+				sc.ForwardSetState(SCE_R_DEFAULT);
+			} else if (sc.atLineEnd) {
+				sc.ChangeState(SCE_R_INFIXEOL);
+				sc.ForwardSetState(SCE_R_DEFAULT);
+			}
+		}else if (sc.state == SCE_R_STRING2) {
+			if (sc.ch == '\\') {
+				if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
+					sc.Forward();
+				}
+			} else if (sc.ch == '\'') {
+				sc.ForwardSetState(SCE_R_DEFAULT);
+			}
+		}
+
+		// Determine if a new state should be entered.
+		if (sc.state == SCE_R_DEFAULT) {
+			if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
+				sc.SetState(SCE_R_NUMBER);
+			} else if (IsAWordStart(sc.ch) ) {
+				sc.SetState(SCE_R_IDENTIFIER);
+			} else if (sc.Match('#')) {
+					sc.SetState(SCE_R_COMMENT);
+			} else if (sc.ch == '\"') {
+				sc.SetState(SCE_R_STRING);
+			} else if (sc.ch == '%') {
+				sc.SetState(SCE_R_INFIX);
+			} else if (sc.ch == '\'') {
+				sc.SetState(SCE_R_STRING2);
+			} else if (IsAnOperator(sc.ch)) {
+				sc.SetState(SCE_R_OPERATOR);
+			}
+		}
+	}
+	sc.Complete();
+}
+
+// Store both the current line's fold level and the next lines in the
+// level store to make it easy to pick up with each increment
+// and to make it possible to fiddle the current level for "} else {".
+static void FoldRDoc(unsigned int startPos, int length, int, WordList *[],
+                       Accessor &styler) {
+	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	bool foldAtElse = styler.GetPropertyInt("fold.at.else", 0) != 0;
+	unsigned int endPos = startPos + length;
+	int visibleChars = 0;
+	int lineCurrent = styler.GetLine(startPos);
+	int levelCurrent = SC_FOLDLEVELBASE;
+	if (lineCurrent > 0)
+		levelCurrent = styler.LevelAt(lineCurrent-1) >> 16;
+	int levelMinCurrent = levelCurrent;
+	int levelNext = levelCurrent;
+	char chNext = styler[startPos];
+	int styleNext = styler.StyleAt(startPos);
+	for (unsigned int i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+		if (style == SCE_R_OPERATOR) {
+			if (ch == '{') {
+				// Measure the minimum before a '{' to allow
+				// folding on "} else {"
+				if (levelMinCurrent > levelNext) {
+					levelMinCurrent = levelNext;
+				}
+				levelNext++;
+			} else if (ch == '}') {
+				levelNext--;
+			}
+		}
+		if (atEOL) {
+			int levelUse = levelCurrent;
+			if (foldAtElse) {
+				levelUse = levelMinCurrent;
+			}
+			int lev = levelUse | levelNext << 16;
+			if (visibleChars == 0 && foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if (levelUse < levelNext)
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelCurrent = levelNext;
+			levelMinCurrent = levelCurrent;
+			visibleChars = 0;
+		}
+		if (!isspacechar(ch))
+			visibleChars++;
+	}
+}
+
+
+static const char * const RWordLists[] = {
+            "Language Keywords",
+            "Base / Default package function",
+            "Other Package Functions",
+            "Unused",
+            "Unused",
+            0,
+        };
+
+
+
+LexerModule lmR(SCLEX_R, ColouriseRDoc, "r", FoldRDoc, RWordLists);
diff --git a/Documents/Scintilla/LexRebol.cxx b/Documents/Scintilla/LexRebol.cxx
new file mode 100644
index 0000000..7139b8d
--- /dev/null
+++ b/Documents/Scintilla/LexRebol.cxx
@@ -0,0 +1,322 @@
+// Scintilla source code edit control
+/** @file LexRebol.cxx
+ ** Lexer for REBOL.
+ ** Written by Pascal Hurni, inspired from LexLua by Paul Winwood & Marcos E. Wurzius & Philippe Lhoste
+ **
+ ** History:
+ **		2005-04-07	First release.
+ **		2005-04-10	Closing parens and brackets go now in default style
+ **					String and comment nesting should be more safe
+ **/
+// Copyright 2005 by Pascal Hurni <pascal_hurni@fastmail.fm>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+#include "StyleContext.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+static inline bool IsAWordChar(const int ch) {
+	return (isalnum(ch) || ch == '?' || ch == '!' || ch == '.' || ch == '\'' || ch == '+' || ch == '-' || ch == '*' || ch == '&' || ch == '|' || ch == '=' || ch == '_' || ch == '~');
+}
+
+static inline bool IsAWordStart(const int ch, const int ch2) {
+	return ((ch == '+' || ch == '-' || ch == '.') && !isdigit(ch2)) ||
+		(isalpha(ch) || ch == '?' || ch == '!' || ch == '\'' || ch == '*' || ch == '&' || ch == '|' || ch == '=' || ch == '_' || ch == '~');
+}
+
+static inline bool IsAnOperator(const int ch, const int ch2, const int ch3) {
+	// One char operators
+	if (IsASpaceOrTab(ch2)) {
+		return ch == '+' || ch == '-' || ch == '*' || ch == '/' || ch == '<' || ch == '>' || ch == '=' || ch == '?';
+	}
+
+	// Two char operators
+	if (IsASpaceOrTab(ch3)) {
+		return (ch == '*' && ch2 == '*') ||
+			   (ch == '/' && ch2 == '/') ||
+			   (ch == '<' && (ch2 == '=' || ch2 == '>')) ||
+			   (ch == '>' && ch2 == '=') ||
+			   (ch == '=' && (ch2 == '=' || ch2 == '?')) ||
+			   (ch == '?' && ch2 == '?');
+	}
+
+	return false;
+}
+
+static inline bool IsBinaryStart(const int ch, const int ch2, const int ch3, const int ch4) {
+	return (ch == '#' && ch2 == '{') ||
+		   (IsADigit(ch) && ch2 == '#' && ch3 == '{' ) ||
+		   (IsADigit(ch) && IsADigit(ch2) && ch3 == '#' && ch4 == '{' );
+}
+
+
+static void ColouriseRebolDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], Accessor &styler) {
+
+	WordList &keywords = *keywordlists[0];
+	WordList &keywords2 = *keywordlists[1];
+	WordList &keywords3 = *keywordlists[2];
+	WordList &keywords4 = *keywordlists[3];
+	WordList &keywords5 = *keywordlists[4];
+	WordList &keywords6 = *keywordlists[5];
+	WordList &keywords7 = *keywordlists[6];
+	WordList &keywords8 = *keywordlists[7];
+
+	int currentLine = styler.GetLine(startPos);
+	// Initialize the braced string {.. { ... } ..} nesting level, if we are inside such a string.
+	int stringLevel = 0;
+	if (initStyle == SCE_REBOL_BRACEDSTRING || initStyle == SCE_REBOL_COMMENTBLOCK) {
+		stringLevel = styler.GetLineState(currentLine - 1);
+	}
+
+	bool blockComment = initStyle == SCE_REBOL_COMMENTBLOCK;
+	int dotCount = 0;
+
+	// Do not leak onto next line
+	if (initStyle == SCE_REBOL_COMMENTLINE) {
+		initStyle = SCE_REBOL_DEFAULT;
+	}
+
+	StyleContext sc(startPos, length, initStyle, styler);
+	if (startPos == 0) {
+		sc.SetState(SCE_REBOL_PREFACE);
+	}
+	for (; sc.More(); sc.Forward()) {
+
+		//--- What to do at line end ?
+		if (sc.atLineEnd) {
+			// Can be either inside a {} string or simply at eol
+			if (sc.state != SCE_REBOL_BRACEDSTRING && sc.state != SCE_REBOL_COMMENTBLOCK &&
+				sc.state != SCE_REBOL_BINARY && sc.state != SCE_REBOL_PREFACE)
+				sc.SetState(SCE_REBOL_DEFAULT);
+
+			// Update the line state, so it can be seen by next line
+			currentLine = styler.GetLine(sc.currentPos);
+			switch (sc.state) {
+			case SCE_REBOL_BRACEDSTRING:
+			case SCE_REBOL_COMMENTBLOCK:
+				// Inside a braced string, we set the line state
+				styler.SetLineState(currentLine, stringLevel);
+				break;
+			default:
+				// Reset the line state
+				styler.SetLineState(currentLine, 0);
+				break;
+			}
+
+			// continue with next char
+			continue;
+		}
+
+		//--- What to do on white-space ?
+		if (IsASpaceOrTab(sc.ch))
+		{
+			// Return to default if any of these states
+			if (sc.state == SCE_REBOL_OPERATOR || sc.state == SCE_REBOL_CHARACTER ||
+				sc.state == SCE_REBOL_NUMBER || sc.state == SCE_REBOL_PAIR ||
+				sc.state == SCE_REBOL_TUPLE || sc.state == SCE_REBOL_FILE ||
+				sc.state == SCE_REBOL_DATE || sc.state == SCE_REBOL_TIME ||
+				sc.state == SCE_REBOL_MONEY || sc.state == SCE_REBOL_ISSUE ||
+				sc.state == SCE_REBOL_URL || sc.state == SCE_REBOL_EMAIL) {
+				sc.SetState(SCE_REBOL_DEFAULT);
+			}
+		}
+
+		//--- Specialize state ?
+		// URL, Email look like identifier
+		if (sc.state == SCE_REBOL_IDENTIFIER)
+		{
+			if (sc.ch == ':' && !IsASpace(sc.chNext)) {
+				sc.ChangeState(SCE_REBOL_URL);
+			} else if (sc.ch == '@') {
+				sc.ChangeState(SCE_REBOL_EMAIL);
+			} else if (sc.ch == '$') {
+				sc.ChangeState(SCE_REBOL_MONEY);
+			}
+		}
+		// Words look like identifiers
+		if (sc.state == SCE_REBOL_IDENTIFIER || (sc.state >= SCE_REBOL_WORD && sc.state <= SCE_REBOL_WORD8)) {
+			// Keywords ?
+			if (!IsAWordChar(sc.ch) || sc.Match('/')) {
+				char s[100];
+				sc.GetCurrentLowered(s, sizeof(s));
+				blockComment = strcmp(s, "comment") == 0;
+				if (keywords8.InList(s)) {
+					sc.ChangeState(SCE_REBOL_WORD8);
+				} else if (keywords7.InList(s)) {
+					sc.ChangeState(SCE_REBOL_WORD7);
+				} else if (keywords6.InList(s)) {
+					sc.ChangeState(SCE_REBOL_WORD6);
+				} else if (keywords5.InList(s)) {
+					sc.ChangeState(SCE_REBOL_WORD5);
+				} else if (keywords4.InList(s)) {
+					sc.ChangeState(SCE_REBOL_WORD4);
+				} else if (keywords3.InList(s)) {
+					sc.ChangeState(SCE_REBOL_WORD3);
+				} else if (keywords2.InList(s)) {
+					sc.ChangeState(SCE_REBOL_WORD2);
+				} else if (keywords.InList(s)) {
+					sc.ChangeState(SCE_REBOL_WORD);
+				}
+				// Keep same style if there are refinements
+				if (!sc.Match('/')) {
+					sc.SetState(SCE_REBOL_DEFAULT);
+				}
+			}
+		// special numbers
+		} else if (sc.state == SCE_REBOL_NUMBER) {
+			switch (sc.ch) {
+			case 'x':	sc.ChangeState(SCE_REBOL_PAIR);
+						break;
+			case ':':	sc.ChangeState(SCE_REBOL_TIME);
+						break;
+			case '-':
+			case '/':	sc.ChangeState(SCE_REBOL_DATE);
+						break;
+			case '.':	if (++dotCount >= 2) sc.ChangeState(SCE_REBOL_TUPLE);
+						break;
+			}
+		}
+
+		//--- Determine if the current state should terminate
+		if (sc.state == SCE_REBOL_QUOTEDSTRING || sc.state == SCE_REBOL_CHARACTER) {
+			if (sc.ch == '^' && sc.chNext == '\"') {
+				sc.Forward();
+			} else if (sc.ch == '\"') {
+				sc.ForwardSetState(SCE_REBOL_DEFAULT);
+			}
+		} else if (sc.state == SCE_REBOL_BRACEDSTRING || sc.state == SCE_REBOL_COMMENTBLOCK) {
+			if (sc.ch == '}') {
+				if (--stringLevel == 0) {
+					sc.ForwardSetState(SCE_REBOL_DEFAULT);
+				}
+			} else if (sc.ch == '{') {
+				stringLevel++;
+			}
+		} else if (sc.state == SCE_REBOL_BINARY) {
+			if (sc.ch == '}') {
+				sc.ForwardSetState(SCE_REBOL_DEFAULT);
+			}
+		} else if (sc.state == SCE_REBOL_TAG) {
+			if (sc.ch == '>') {
+				sc.ForwardSetState(SCE_REBOL_DEFAULT);
+			}
+		} else if (sc.state == SCE_REBOL_PREFACE) {
+			if (sc.MatchIgnoreCase("rebol"))
+			{
+				int i;
+				for (i=5; IsASpaceOrTab(styler.SafeGetCharAt(sc.currentPos+i, 0)); i++);
+				if (sc.GetRelative(i) == '[')
+					sc.SetState(SCE_REBOL_DEFAULT);
+			}
+		}
+
+		//--- Parens and bracket changes to default style when the current is a number
+		if (sc.state == SCE_REBOL_NUMBER || sc.state == SCE_REBOL_PAIR || sc.state == SCE_REBOL_TUPLE ||
+			sc.state == SCE_REBOL_MONEY || sc.state == SCE_REBOL_ISSUE || sc.state == SCE_REBOL_EMAIL ||
+			sc.state == SCE_REBOL_URL || sc.state == SCE_REBOL_DATE || sc.state == SCE_REBOL_TIME) {
+			if (sc.ch == '(' || sc.ch == '[' || sc.ch == ')' || sc.ch == ']') {
+				sc.SetState(SCE_REBOL_DEFAULT);
+			}
+		}
+
+		//--- Determine if a new state should be entered.
+		if (sc.state == SCE_REBOL_DEFAULT) {
+			if (IsAnOperator(sc.ch, sc.chNext, sc.GetRelative(2))) {
+				sc.SetState(SCE_REBOL_OPERATOR);
+			} else if (IsBinaryStart(sc.ch, sc.chNext, sc.GetRelative(2), sc.GetRelative(3))) {
+				sc.SetState(SCE_REBOL_BINARY);
+			} else if (IsAWordStart(sc.ch, sc.chNext)) {
+				sc.SetState(SCE_REBOL_IDENTIFIER);
+			} else if (IsADigit(sc.ch) || sc.ch == '+' || sc.ch == '-' || /*Decimal*/ sc.ch == '.' || sc.ch == ',') {
+				dotCount = 0;
+				sc.SetState(SCE_REBOL_NUMBER);
+			} else if (sc.ch == '\"') {
+				sc.SetState(SCE_REBOL_QUOTEDSTRING);
+			} else if (sc.ch == '{') {
+				sc.SetState(blockComment ? SCE_REBOL_COMMENTBLOCK : SCE_REBOL_BRACEDSTRING);
+				++stringLevel;
+			} else if (sc.ch == ';') {
+				sc.SetState(SCE_REBOL_COMMENTLINE);
+			} else if (sc.ch == '$') {
+				sc.SetState(SCE_REBOL_MONEY);
+			} else if (sc.ch == '%') {
+				sc.SetState(SCE_REBOL_FILE);
+			} else if (sc.ch == '<') {
+				sc.SetState(SCE_REBOL_TAG);
+			} else if (sc.ch == '#' && sc.chNext == '"') {
+				sc.SetState(SCE_REBOL_CHARACTER);
+				sc.Forward();
+			} else if (sc.ch == '#' && sc.chNext != '"' && sc.chNext != '{' ) {
+				sc.SetState(SCE_REBOL_ISSUE);
+			}
+		}
+	}
+	sc.Complete();
+}
+
+
+static void FoldRebolDoc(unsigned int startPos, int length, int /* initStyle */, WordList *[],
+                            Accessor &styler) {
+	unsigned int lengthDoc = startPos + length;
+	int visibleChars = 0;
+	int lineCurrent = styler.GetLine(startPos);
+	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
+	int levelCurrent = levelPrev;
+	char chNext = styler[startPos];
+	int styleNext = styler.StyleAt(startPos);
+	for (unsigned int i = startPos; i < lengthDoc; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+		if (style == SCE_REBOL_DEFAULT) {
+			if (ch == '[') {
+				levelCurrent++;
+			} else if (ch == ']') {
+				levelCurrent--;
+			}
+		}
+		if (atEOL) {
+			int lev = levelPrev;
+			if (visibleChars == 0)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if ((levelCurrent > levelPrev) && (visibleChars > 0))
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelPrev = levelCurrent;
+			visibleChars = 0;
+		}
+		if (!isspacechar(ch))
+			visibleChars++;
+	}
+	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
+	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
+}
+
+static const char * const rebolWordListDesc[] = {
+	"Keywords",
+	0
+};
+
+LexerModule lmREBOL(SCLEX_REBOL, ColouriseRebolDoc, "rebol", FoldRebolDoc, rebolWordListDesc);
+
diff --git a/Documents/Scintilla/LexRuby.cxx b/Documents/Scintilla/LexRuby.cxx
new file mode 100644
index 0000000..7cb0b95
--- /dev/null
+++ b/Documents/Scintilla/LexRuby.cxx
@@ -0,0 +1,1715 @@
+// Scintilla source code edit control
+/** @file LexRuby.cxx
+ ** Lexer for Ruby.
+ **/
+// Copyright 2001- by Clemens Wyss <wys@helbling.ch>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+//XXX Identical to Perl, put in common area
+static inline bool isEOLChar(char ch) {
+	return (ch == '\r') || (ch == '\n');
+}
+
+#define isSafeASCII(ch) ((unsigned int)(ch) <= 127)
+// This one's redundant, but makes for more readable code
+#define isHighBitChar(ch) ((unsigned int)(ch) > 127)
+
+static inline bool isSafeAlpha(char ch) {
+    return (isSafeASCII(ch) && isalpha(ch)) || ch == '_';
+}
+
+static inline bool isSafeAlnum(char ch) {
+    return (isSafeASCII(ch) && isalnum(ch)) || ch == '_';
+}
+
+static inline bool isSafeAlnumOrHigh(char ch) {
+    return isHighBitChar(ch) || isalnum(ch) || ch == '_';
+}
+
+static inline bool isSafeDigit(char ch) {
+    return isSafeASCII(ch) && isdigit(ch);
+}
+
+static inline bool isSafeWordcharOrHigh(char ch) {
+    // Error: scintilla's KeyWords.h includes '.' as a word-char
+    // we want to separate things that can take methods from the
+    // methods.
+    return isHighBitChar(ch) || isalnum(ch) || ch == '_';
+}
+
+static bool inline iswhitespace(char ch) {
+	return ch == ' ' || ch == '\t';
+}
+
+#define MAX_KEYWORD_LENGTH 200
+
+#define STYLE_MASK 63
+#define actual_style(style) (style & STYLE_MASK)
+
+static bool followsDot(unsigned int pos, Accessor &styler) {
+    styler.Flush();
+    for (; pos >= 1; --pos) {
+        int style = actual_style(styler.StyleAt(pos));
+        char ch;
+        switch (style) {
+            case SCE_RB_DEFAULT:
+                ch = styler[pos];
+                if (ch == ' ' || ch == '\t') {
+                    //continue
+                } else {
+                    return false;
+                }
+                break;
+                
+            case SCE_RB_OPERATOR:
+                return styler[pos] == '.';
+
+            default:
+                return false;
+        }
+    }
+    return false;
+}
+
+// Forward declarations
+static bool keywordIsAmbiguous(const char *prevWord);
+static bool keywordDoStartsLoop(int pos,
+                                Accessor &styler);
+static bool keywordIsModifier(const char *word,
+                              int pos,
+                              Accessor &styler);
+
+static int ClassifyWordRb(unsigned int start, unsigned int end, WordList &keywords, Accessor &styler, char *prevWord) {
+	char s[MAX_KEYWORD_LENGTH];
+    unsigned int i, j;
+	unsigned int lim = end - start + 1; // num chars to copy
+	if (lim >= MAX_KEYWORD_LENGTH) {
+		lim = MAX_KEYWORD_LENGTH - 1;
+	}
+	for (i = start, j = 0; j < lim; i++, j++) {
+		s[j] = styler[i];
+	}
+    s[j] = '\0';
+	int chAttr;
+	if (0 == strcmp(prevWord, "class"))
+		chAttr = SCE_RB_CLASSNAME;
+	else if (0 == strcmp(prevWord, "module"))
+		chAttr = SCE_RB_MODULE_NAME;
+	else if (0 == strcmp(prevWord, "def"))
+		chAttr = SCE_RB_DEFNAME;
+    else if (keywords.InList(s) && !followsDot(start - 1, styler)) {
+        if (keywordIsAmbiguous(s)
+            && keywordIsModifier(s, start, styler)) {
+            
+            // Demoted keywords are colored as keywords,
+            // but do not affect changes in indentation.
+            //
+            // Consider the word 'if':
+            // 1. <<if test ...>> : normal
+            // 2. <<stmt if test>> : demoted
+            // 3. <<lhs = if ...>> : normal: start a new indent level
+            // 4. <<obj.if = 10>> : color as identifer, since it follows '.'
+            
+            chAttr = SCE_RB_WORD_DEMOTED;
+        } else {
+            chAttr = SCE_RB_WORD;
+        }
+	} else
+        chAttr = SCE_RB_IDENTIFIER;
+	styler.ColourTo(end, chAttr);
+	if (chAttr == SCE_RB_WORD) {
+		strcpy(prevWord, s);
+	} else {
+		prevWord[0] = 0;
+	}
+    return chAttr;
+}
+
+
+//XXX Identical to Perl, put in common area
+static bool isMatch(Accessor &styler, int lengthDoc, int pos, const char *val) {
+	if ((pos + static_cast<int>(strlen(val))) >= lengthDoc) {
+		return false;
+	}
+	while (*val) {
+		if (*val != styler[pos++]) {
+			return false;
+		}
+		val++;
+	}
+	return true;
+}
+
+// Do Ruby better -- find the end of the line, work back,
+// and then check for leading white space
+
+// Precondition: the here-doc target can be indented
+static bool lookingAtHereDocDelim(Accessor	   &styler,
+                                  int 			pos,
+                                  int 			lengthDoc,
+                                  const char   *HereDocDelim)
+{
+    if (!isMatch(styler, lengthDoc, pos, HereDocDelim)) {
+        return false;
+    }
+    while (--pos > 0) {
+        char ch = styler[pos];
+        if (isEOLChar(ch)) {
+            return true;
+        } else if (ch != ' ' && ch != '\t') {
+            return false;
+        }
+    }
+    return false;
+}
+
+//XXX Identical to Perl, put in common area
+static char opposite(char ch) {
+	if (ch == '(')
+		return ')';
+	if (ch == '[')
+		return ']';
+	if (ch == '{')
+		return '}';
+	if (ch == '<')
+		return '>';
+	return ch;
+}
+
+// Null transitions when we see we've reached the end
+// and need to relex the curr char.
+
+static void redo_char(int &i, char &ch, char &chNext, char &chNext2,
+                      int &state) {
+    i--;
+    chNext2 = chNext;
+    chNext = ch;
+    state = SCE_RB_DEFAULT;
+}
+
+static void advance_char(int &i, char &ch, char &chNext, char &chNext2) {
+    i++;
+    ch = chNext;
+    chNext = chNext2;
+}
+
+// precondition: startPos points to one after the EOL char
+static bool currLineContainsHereDelims(int& startPos,
+                                       Accessor &styler) {
+    if (startPos <= 1)
+        return false;
+
+    int pos;
+    for (pos = startPos - 1; pos > 0; pos--) {
+        char ch = styler.SafeGetCharAt(pos);
+        if (isEOLChar(ch)) {
+            // Leave the pointers where they are -- there are no
+            // here doc delims on the current line, even if
+            // the EOL isn't default style
+            
+            return false;
+        } else {
+            styler.Flush();
+            if (actual_style(styler.StyleAt(pos)) == SCE_RB_HERE_DELIM) {
+                break;
+            }
+        }
+    }
+    if (pos == 0) {
+        return false;
+    }
+    // Update the pointers so we don't have to re-analyze the string
+    startPos = pos;
+    return true;
+}
+
+// This class is used by the enter and exit methods, so it needs
+// to be hoisted out of the function.
+
+class QuoteCls {
+    public:
+    int  Count;
+    char Up;
+    char Down;
+    QuoteCls() {
+        this->New();
+    }
+    void New() {
+        Count = 0;
+        Up    = '\0';
+        Down  = '\0';
+    }
+    void Open(char u) {
+        Count++;
+        Up    = u;
+        Down  = opposite(Up);
+    }
+    QuoteCls(const QuoteCls& q) {
+        // copy constructor -- use this for copying in
+        Count = q.Count;
+        Up    = q.Up;
+        Down  = q.Down;
+    }
+    QuoteCls& operator=(const QuoteCls& q) { // assignment constructor
+        if (this != &q) {
+            Count = q.Count;
+            Up    = q.Up;
+            Down  = q.Down;
+        }
+		return *this;
+    }
+            
+};
+
+
+static void enterInnerExpression(int  *p_inner_string_types,
+                                 int  *p_inner_expn_brace_counts,
+                                 QuoteCls *p_inner_quotes,
+                                 int&  inner_string_count,
+                                 int&  state,
+                                 int&  brace_counts,
+                                 QuoteCls curr_quote
+                                 ) {
+    p_inner_string_types[inner_string_count] = state;
+    state = SCE_RB_DEFAULT;
+    p_inner_expn_brace_counts[inner_string_count] = brace_counts;
+    brace_counts = 0;
+    p_inner_quotes[inner_string_count] = curr_quote;
+    ++inner_string_count;
+}
+
+static void exitInnerExpression(int *p_inner_string_types,
+                                 int *p_inner_expn_brace_counts,
+                                 QuoteCls *p_inner_quotes,
+                                 int& inner_string_count,
+                                 int& state,
+                                 int&  brace_counts,
+                                 QuoteCls& curr_quote
+                                ) {
+    --inner_string_count;
+    state = p_inner_string_types[inner_string_count];
+    brace_counts = p_inner_expn_brace_counts[inner_string_count];
+    curr_quote = p_inner_quotes[inner_string_count];
+}
+
+static bool isEmptyLine(int pos,
+                        Accessor &styler) {
+	int spaceFlags = 0;
+	int lineCurrent = styler.GetLine(pos);
+	int indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags, NULL);
+    return (indentCurrent & SC_FOLDLEVELWHITEFLAG) != 0;
+}
+
+static bool RE_CanFollowKeyword(const char *keyword) {
+    if (!strcmp(keyword, "and")
+        || !strcmp(keyword, "begin")
+        || !strcmp(keyword, "break")
+        || !strcmp(keyword, "case")
+        || !strcmp(keyword, "do")
+        || !strcmp(keyword, "else")
+        || !strcmp(keyword, "elsif")
+        || !strcmp(keyword, "if")
+        || !strcmp(keyword, "next")
+        || !strcmp(keyword, "return")
+        || !strcmp(keyword, "when")
+        || !strcmp(keyword, "unless")
+        || !strcmp(keyword, "until")
+        || !strcmp(keyword, "not")
+        || !strcmp(keyword, "or")) {
+        return true;
+    }
+    return false;
+}
+
+// Look at chars up to but not including endPos
+// Don't look at styles in case we're looking forward
+
+static int skipWhitespace(int startPos,
+                           int endPos,
+                           Accessor &styler) {
+    for (int i = startPos; i < endPos; i++) {
+        if (!iswhitespace(styler[i])) {
+            return i;
+        }
+    }
+    return endPos;
+}
+    
+// This routine looks for false positives like
+// undef foo, <<
+// There aren't too many.
+//
+// iPrev points to the start of <<
+
+static bool sureThisIsHeredoc(int iPrev,
+                              Accessor &styler,
+                              char *prevWord) {
+                    
+    // Not so fast, since Ruby's so dynamic.  Check the context
+    // to make sure we're OK.
+    int prevStyle;
+    int lineStart = styler.GetLine(iPrev);
+    int lineStartPosn = styler.LineStart(lineStart);
+    styler.Flush();
+
+    // Find the first word after some whitespace
+    int firstWordPosn = skipWhitespace(lineStartPosn, iPrev, styler);
+    if (firstWordPosn >= iPrev) {
+        // Have something like {^     <<}
+		//XXX Look at the first previous non-comment non-white line
+		// to establish the context.  Not too likely though.
+        return true;
+    } else {
+        switch (prevStyle = styler.StyleAt(firstWordPosn)) {
+        case SCE_RB_WORD:
+        case SCE_RB_WORD_DEMOTED:
+        case SCE_RB_IDENTIFIER:
+            break;
+        default:
+            return true;
+        }
+    }
+    int firstWordEndPosn = firstWordPosn;
+    char *dst = prevWord;
+    for (;;) {
+        if (firstWordEndPosn >= iPrev ||
+            styler.StyleAt(firstWordEndPosn) != prevStyle) {
+            *dst = 0;
+            break;
+        }
+        *dst++ = styler[firstWordEndPosn];
+        firstWordEndPosn += 1;
+    }
+    //XXX Write a style-aware thing to regex scintilla buffer objects
+    if (!strcmp(prevWord, "undef")
+        || !strcmp(prevWord, "def")
+        || !strcmp(prevWord, "alias")) {
+        // These keywords are what we were looking for
+        return false;
+    }
+    return true;
+}
+
+// Routine that saves us from allocating a buffer for the here-doc target
+// targetEndPos points one past the end of the current target
+static bool haveTargetMatch(int currPos,
+                            int lengthDoc,
+                            int targetStartPos,
+                            int targetEndPos,
+                            Accessor &styler) {
+    if (lengthDoc - currPos < targetEndPos - targetStartPos) {
+        return false;
+    }
+    int i, j;
+    for (i = targetStartPos, j = currPos;
+         i < targetEndPos && j < lengthDoc;
+         i++, j++) {
+        if (styler[i] != styler[j]) {
+            return false;
+        }
+    }
+    return true;
+}
+
+// We need a check because the form
+// [identifier] <<[target]
+// is ambiguous.  The Ruby lexer/parser resolves it by
+// looking to see if [identifier] names a variable or a
+// function.  If it's the first, it's the start of a here-doc.
+// If it's a var, it's an operator.  This lexer doesn't
+// maintain a symbol table, so it looks ahead to see what's
+// going on, in cases where we have
+// ^[white-space]*[identifier([.|::]identifier)*][white-space]*<<[target]
+//
+// If there's no occurrence of [target] on a line, assume we don't.
+
+// return true == yes, we have no heredocs
+
+static bool sureThisIsNotHeredoc(int lt2StartPos,
+                                 Accessor &styler) {
+    int prevStyle;
+     // Use full document, not just part we're styling
+    int lengthDoc = styler.Length();
+    int lineStart = styler.GetLine(lt2StartPos);
+    int lineStartPosn = styler.LineStart(lineStart);
+    styler.Flush();
+    const bool definitely_not_a_here_doc = true;
+    const bool looks_like_a_here_doc = false;
+    
+    // Find the first word after some whitespace
+    int firstWordPosn = skipWhitespace(lineStartPosn, lt2StartPos, styler);
+    if (firstWordPosn >= lt2StartPos) {
+        return definitely_not_a_here_doc;
+    }
+    prevStyle = styler.StyleAt(firstWordPosn);
+    // If we have '<<' following a keyword, it's not a heredoc
+    if (prevStyle != SCE_RB_IDENTIFIER) {
+        return definitely_not_a_here_doc;
+    }
+    int newStyle = prevStyle;
+    // Some compilers incorrectly warn about uninit newStyle
+    for (firstWordPosn += 1; firstWordPosn <= lt2StartPos; firstWordPosn += 1) {
+        // Inner loop looks at the name
+        for (; firstWordPosn <= lt2StartPos; firstWordPosn += 1) {
+            newStyle = styler.StyleAt(firstWordPosn);
+            if (newStyle != prevStyle) {
+                break;
+            }
+        }
+        // Do we have '::' or '.'?
+        if (firstWordPosn < lt2StartPos && newStyle == SCE_RB_OPERATOR) {
+            char ch = styler[firstWordPosn];
+            if (ch == '.') {
+                // yes
+            } else if (ch == ':') {
+                if (styler.StyleAt(++firstWordPosn) != SCE_RB_OPERATOR) {
+                    return definitely_not_a_here_doc;
+                } else if (styler[firstWordPosn] != ':') {
+                    return definitely_not_a_here_doc;
+                }
+            } else {
+                break;
+            }
+        } else {
+            break;
+        }
+    }
+    // Skip next batch of white-space
+    firstWordPosn = skipWhitespace(firstWordPosn, lt2StartPos, styler);
+    if (firstWordPosn != lt2StartPos) {
+        // Have [[^ws[identifier]ws[*something_else*]ws<<
+        return definitely_not_a_here_doc;
+    }
+    // OK, now 'j' will point to the current spot moving ahead
+	int j = firstWordPosn + 1;
+    if (styler.StyleAt(j) != SCE_RB_OPERATOR || styler[j] != '<') {
+        // This shouldn't happen
+        return definitely_not_a_here_doc;
+    }
+    int nextLineStartPosn = styler.LineStart(lineStart + 1);
+    if (nextLineStartPosn >= lengthDoc) {
+        return definitely_not_a_here_doc;
+    }
+    j = skipWhitespace(j + 1, nextLineStartPosn, styler);
+    if (j >= lengthDoc) {
+        return definitely_not_a_here_doc;
+    }
+    bool allow_indent;
+    int target_start, target_end;
+    // From this point on no more styling, since we're looking ahead
+    if (styler[j] == '-') {
+        allow_indent = true;
+        j++;
+    } else {
+        allow_indent = false;
+    }
+
+    // Allow for quoted targets.
+    char target_quote = 0;
+    switch (styler[j]) {
+    case '\'':
+    case '"':
+    case '`':
+        target_quote = styler[j];
+        j += 1;
+    }
+    
+    if (isSafeAlnum(styler[j])) {
+        // Init target_end because some compilers think it won't
+        // be initialized by the time it's used
+        target_start = target_end = j;
+        j++;
+    } else {
+        return definitely_not_a_here_doc;
+    }
+    for (; j < lengthDoc; j++) {
+        if (!isSafeAlnum(styler[j])) {
+            if (target_quote && styler[j] != target_quote) {
+                // unquoted end
+                return definitely_not_a_here_doc;
+            }
+
+            // And for now make sure that it's a newline
+            // don't handle arbitrary expressions yet
+            
+            target_end = j;
+			if (target_quote) {
+				// Now we can move to the character after the string delimiter.
+				j += 1;
+			}
+            j = skipWhitespace(j, lengthDoc, styler);
+            if (j >= lengthDoc) {
+                return definitely_not_a_here_doc;
+            } else {
+                char ch = styler[j];
+                if (ch == '#' || isEOLChar(ch)) {
+                    // This is OK, so break and continue;
+                    break;
+                } else {
+                    return definitely_not_a_here_doc;
+                }
+            }
+        }
+    }
+
+    // Just look at the start of each line
+    int last_line = styler.GetLine(lengthDoc - 1);
+    // But don't go too far
+    if (last_line > lineStart + 50) {
+        last_line = lineStart + 50;
+    }
+    for (int line_num = lineStart + 1; line_num <= last_line; line_num++) {
+        if (allow_indent) {
+            j = skipWhitespace(styler.LineStart(line_num), lengthDoc, styler);
+        } else {
+            j = styler.LineStart(line_num);
+        }
+        // target_end is one past the end
+        if (haveTargetMatch(j, lengthDoc, target_start, target_end, styler)) {
+            // We got it
+            return looks_like_a_here_doc;
+        }
+    }
+    return definitely_not_a_here_doc;
+}
+
+//todo: if we aren't looking at a stdio character,
+// move to the start of the first line that is not in a 
+// multi-line construct
+
+static void synchronizeDocStart(unsigned int& startPos,
+                                int &length,
+                                int &initStyle,
+                                Accessor &styler,
+                                bool skipWhiteSpace=false) {
+
+    styler.Flush();
+    int style = actual_style(styler.StyleAt(startPos));
+    switch (style) {
+        case SCE_RB_STDIN:
+        case SCE_RB_STDOUT:
+        case SCE_RB_STDERR:
+            // Don't do anything else with these.
+            return;
+    }
+    
+    int pos = startPos;
+    // Quick way to characterize each line
+    int lineStart;
+    for (lineStart = styler.GetLine(pos); lineStart > 0; lineStart--) {
+        // Now look at the style before the previous line's EOL
+        pos = styler.LineStart(lineStart) - 1;
+        if (pos <= 10) {
+            lineStart = 0;
+            break;
+        }
+        char ch = styler.SafeGetCharAt(pos);
+        char chPrev = styler.SafeGetCharAt(pos - 1);
+        if (ch == '\n' && chPrev == '\r') {
+            pos--;
+        }
+        if (styler.SafeGetCharAt(pos - 1) == '\\') {
+            // Continuation line -- keep going
+        } else if (actual_style(styler.StyleAt(pos)) != SCE_RB_DEFAULT) {
+            // Part of multi-line construct -- keep going
+        } else if (currLineContainsHereDelims(pos, styler)) {
+            // Keep going, with pos and length now pointing
+            // at the end of the here-doc delimiter
+        } else if (skipWhiteSpace && isEmptyLine(pos, styler)) {
+            // Keep going
+        } else {
+            break;
+        }
+    }
+    pos = styler.LineStart(lineStart);
+    length += (startPos - pos);
+    startPos = pos;
+    initStyle = SCE_RB_DEFAULT;
+}
+
+static void ColouriseRbDoc(unsigned int startPos, int length, int initStyle,
+						   WordList *keywordlists[], Accessor &styler) {
+
+	// Lexer for Ruby often has to backtrack to start of current style to determine
+	// which characters are being used as quotes, how deeply nested is the
+	// start position and what the termination string is for here documents
+    
+	WordList &keywords = *keywordlists[0];
+
+	class HereDocCls {
+	public:
+		int State;
+        // States
+        // 0: '<<' encountered
+		// 1: collect the delimiter
+        // 1b: text between the end of the delimiter and the EOL
+		// 2: here doc text (lines after the delimiter)
+		char Quote;		// the char after '<<'
+		bool Quoted;		// true if Quote in ('\'','"','`')
+		int DelimiterLength;	// strlen(Delimiter)
+		char Delimiter[256];	// the Delimiter, limit of 256: from Perl
+        bool CanBeIndented;
+		HereDocCls() {
+			State = 0;
+			DelimiterLength = 0;
+			Delimiter[0] = '\0';
+            CanBeIndented = false;
+		}
+	};
+	HereDocCls HereDoc;	
+
+	QuoteCls Quote;
+
+    int numDots = 0;  // For numbers --
+                      // Don't start lexing in the middle of a num
+
+    synchronizeDocStart(startPos, length, initStyle, styler, // ref args
+                        false);
+
+	bool preferRE = true;
+    int state = initStyle;
+	int lengthDoc = startPos + length;
+
+	char prevWord[MAX_KEYWORD_LENGTH + 1]; // 1 byte for zero
+	prevWord[0] = '\0';
+	if (length == 0)
+		return;
+
+	char chPrev = styler.SafeGetCharAt(startPos - 1);
+	char chNext = styler.SafeGetCharAt(startPos);
+	bool is_real_number = true;   // Differentiate between constants and ?-sequences.
+	// Ruby uses a different mask because bad indentation is marked by oring with 32
+	styler.StartAt(startPos, 127);
+	styler.StartSegment(startPos);
+
+    static int q_states[] = {SCE_RB_STRING_Q,
+                             SCE_RB_STRING_QQ,
+                             SCE_RB_STRING_QR,
+                             SCE_RB_STRING_QW,
+                             SCE_RB_STRING_QW,
+                             SCE_RB_STRING_QX};
+    static const char* q_chars = "qQrwWx";
+
+    // In most cases a value of 2 should be ample for the code in the
+    // Ruby library, and the code the user is likely to enter.
+    // For example,
+    // fu_output_message "mkdir #{options[:mode] ? ('-m %03o ' % options[:mode]) : ''}#{list.join ' '}"
+    //     if options[:verbose]
+    // from fileutils.rb nests to a level of 2
+    // If the user actually hits a 6th occurrence of '#{' in a double-quoted
+    // string (including regex'es, %Q, %<sym>, %w, and other strings
+    // that interpolate), it will stay as a string.  The problem with this
+    // is that quotes might flip, a 7th '#{' will look like a comment,
+    // and code-folding might be wrong.
+
+    // If anyone runs into this problem, I recommend raising this
+    // value slightly higher to replacing the fixed array with a linked
+    // list.  Keep in mind this code will be called everytime the lexer
+    // is invoked.
+
+#define INNER_STRINGS_MAX_COUNT 5
+    // These vars track our instances of "...#{,,,%Q<..#{,,,}...>,,,}..."
+    int inner_string_types[INNER_STRINGS_MAX_COUNT];
+    // Track # braces when we push a new #{ thing
+    int inner_expn_brace_counts[INNER_STRINGS_MAX_COUNT];
+    QuoteCls inner_quotes[INNER_STRINGS_MAX_COUNT];
+    int inner_string_count = 0;
+    int brace_counts = 0;   // Number of #{ ... } things within an expression
+
+    int i;
+	for (i = 0; i < INNER_STRINGS_MAX_COUNT; i++) {
+        inner_string_types[i] = 0;
+        inner_expn_brace_counts[i] = 0;
+    }
+	for (i = startPos; i < lengthDoc; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		char chNext2 = styler.SafeGetCharAt(i + 2);
+
+        if (styler.IsLeadByte(ch)) {
+			chNext = chNext2;
+			chPrev = ' ';
+			i += 1;
+			continue;
+		}
+		
+        // skip on DOS/Windows
+        //No, don't, because some things will get tagged on,
+        // so we won't recognize keywords, for example
+#if 0
+		if (ch == '\r' && chNext == '\n') {
+	    	continue;
+        }
+#endif
+            
+        if (HereDoc.State == 1 && isEOLChar(ch)) {
+			// Begin of here-doc (the line after the here-doc delimiter):
+			HereDoc.State = 2;
+			styler.ColourTo(i-1, state);
+            // Don't check for a missing quote, just jump into
+            // the here-doc state
+            state = SCE_RB_HERE_Q;
+        }
+
+        // Regular transitions
+		if (state == SCE_RB_DEFAULT) {
+            if (isSafeDigit(ch)) {
+            	styler.ColourTo(i - 1, state);
+				state = SCE_RB_NUMBER;
+                is_real_number = true;
+                numDots = 0;
+            } else if (isHighBitChar(ch) || iswordstart(ch)) {
+            	styler.ColourTo(i - 1, state);
+				state = SCE_RB_WORD;
+			} else if (ch == '#') {
+				styler.ColourTo(i - 1, state);
+				state = SCE_RB_COMMENTLINE;
+			} else if (ch == '=') {
+				// =begin indicates the start of a comment (doc) block
+                if (i == 0 || isEOLChar(chPrev)
+                    && chNext == 'b'
+                    && styler.SafeGetCharAt(i + 2) == 'e'
+                    && styler.SafeGetCharAt(i + 3) == 'g'
+                    && styler.SafeGetCharAt(i + 4) == 'i'
+                    && styler.SafeGetCharAt(i + 5) == 'n'
+                    && !isSafeWordcharOrHigh(styler.SafeGetCharAt(i + 6))) {
+                    styler.ColourTo(i - 1, state);
+                    state = SCE_RB_POD;
+				} else {
+					styler.ColourTo(i - 1, state);
+					styler.ColourTo(i, SCE_RB_OPERATOR);
+					preferRE = true;
+				}
+			} else if (ch == '"') {
+				styler.ColourTo(i - 1, state);
+				state = SCE_RB_STRING;
+				Quote.New();
+				Quote.Open(ch);
+			} else if (ch == '\'') {
+                styler.ColourTo(i - 1, state);
+                state = SCE_RB_CHARACTER;
+                Quote.New();
+                Quote.Open(ch);
+			} else if (ch == '`') {
+				styler.ColourTo(i - 1, state);
+				state = SCE_RB_BACKTICKS;
+				Quote.New();
+				Quote.Open(ch);
+			} else if (ch == '@') {
+                // Instance or class var
+				styler.ColourTo(i - 1, state);
+                if (chNext == '@') {
+                    state = SCE_RB_CLASS_VAR;
+                    advance_char(i, ch, chNext, chNext2); // pass by ref
+                } else {
+                    state = SCE_RB_INSTANCE_VAR;
+                }
+			} else if (ch == '$') {
+                // Check for a builtin global
+				styler.ColourTo(i - 1, state);
+                // Recognize it bit by bit
+                state = SCE_RB_GLOBAL;
+            } else if (ch == '/' && preferRE) {
+                // Ambigous operator
+				styler.ColourTo(i - 1, state);
+				state = SCE_RB_REGEX;
+                Quote.New();
+                Quote.Open(ch);
+			} else if (ch == '<' && chNext == '<' && chNext2 != '=') {
+
+                // Recognise the '<<' symbol - either a here document or a binary op
+				styler.ColourTo(i - 1, state);
+                i++;
+                chNext = chNext2;
+				styler.ColourTo(i, SCE_RB_OPERATOR);
+
+                if (! (strchr("\"\'`_-", chNext2) || isSafeAlpha(chNext2))) {
+                    // It's definitely not a here-doc,
+                    // based on Ruby's lexer/parser in the
+                    // heredoc_identifier routine.
+                    // Nothing else to do.
+                } else if (preferRE) {
+                    if (sureThisIsHeredoc(i - 1, styler, prevWord)) {
+                        state = SCE_RB_HERE_DELIM;
+                        HereDoc.State = 0;
+                    }
+                    // else leave it in default state
+                } else {
+                    if (sureThisIsNotHeredoc(i - 1, styler)) {
+                        // leave state as default
+                        // We don't have all the heuristics Perl has for indications
+                        // of a here-doc, because '<<' is overloadable and used
+                        // for so many other classes.
+                    } else {
+                        state = SCE_RB_HERE_DELIM;
+                        HereDoc.State = 0;
+                    }
+                }
+                preferRE = (state != SCE_RB_HERE_DELIM);
+            } else if (ch == ':') {
+				styler.ColourTo(i - 1, state);
+                if (chNext == ':') {
+                    // Mark "::" as an operator, not symbol start
+                    styler.ColourTo(i + 1, SCE_RB_OPERATOR);
+                    advance_char(i, ch, chNext, chNext2); // pass by ref
+                    state = SCE_RB_DEFAULT;
+					preferRE = false;
+                } else if (isSafeWordcharOrHigh(chNext)) {
+					state = SCE_RB_SYMBOL;
+                } else if (strchr("[*!~+-*/%=<>&^|", chNext)) {
+                    // Do the operator analysis in-line, looking ahead
+                    // Based on the table in pickaxe 2nd ed., page 339
+                    bool doColoring = true;
+                    switch (chNext) {
+                    case '[':
+                        if (chNext2 == ']' ) {
+                            char ch_tmp = styler.SafeGetCharAt(i + 3);
+                            if (ch_tmp == '=') {
+                                i += 3;
+                                ch = ch_tmp;
+                                chNext = styler.SafeGetCharAt(i + 1);
+                            } else {
+                                i += 2;
+                                ch = chNext2;
+                                chNext = ch_tmp;
+                            }
+                        } else {
+                            doColoring = false;
+                        }
+                        break;
+
+                    case '*':
+                        if (chNext2 == '*') {
+                            i += 2;
+                            ch = chNext2;
+                            chNext = styler.SafeGetCharAt(i + 1);
+                        } else {
+                            advance_char(i, ch, chNext, chNext2);
+                        }
+                        break;
+
+                    case '!':
+                        if (chNext2 == '=' || chNext2 == '~') {
+                            i += 2;
+                            ch = chNext2;
+                            chNext = styler.SafeGetCharAt(i + 1);
+                        } else {
+                            advance_char(i, ch, chNext, chNext2);
+                        }
+                        break;
+
+                    case '<':
+                        if (chNext2 == '<') {
+                            i += 2;
+                            ch = chNext2;
+                            chNext = styler.SafeGetCharAt(i + 1);
+                        } else if (chNext2 == '=') {
+                            char ch_tmp = styler.SafeGetCharAt(i + 3);
+                            if (ch_tmp == '>') {  // <=> operator
+                                i += 3;
+                                ch = ch_tmp;
+                                chNext = styler.SafeGetCharAt(i + 1);
+                            } else {
+                                i += 2;
+                                ch = chNext2;
+                                chNext = ch_tmp;
+                            }
+                        } else {
+                            advance_char(i, ch, chNext, chNext2);
+                        }
+                        break;
+
+                    default:
+                        // Simple one-character operators
+                        advance_char(i, ch, chNext, chNext2);
+                        break;
+                    }
+                    if (doColoring) {
+                        styler.ColourTo(i, SCE_RB_SYMBOL);
+                        state = SCE_RB_DEFAULT;
+                    }
+				} else if (!preferRE) {
+					// Don't color symbol strings (yet)
+					// Just color the ":" and color rest as string
+					styler.ColourTo(i, SCE_RB_SYMBOL);
+					state = SCE_RB_DEFAULT;
+                } else {
+                    styler.ColourTo(i, SCE_RB_OPERATOR);
+                    state = SCE_RB_DEFAULT;
+                    preferRE = true;
+                }
+            } else if (ch == '%') {
+                styler.ColourTo(i - 1, state);
+                bool have_string = false;
+                if (strchr(q_chars, chNext) && !isSafeWordcharOrHigh(chNext2)) {
+                    Quote.New();
+                    const char *hit = strchr(q_chars, chNext);
+                    if (hit != NULL) {
+                        state = q_states[hit - q_chars];
+                        Quote.Open(chNext2);
+                        i += 2;
+                        ch = chNext2;
+						chNext = styler.SafeGetCharAt(i + 1);
+                        have_string = true;
+                    }
+                } else if (preferRE && !isSafeWordcharOrHigh(chNext)) {
+                    // Ruby doesn't allow high bit chars here,
+                    // but the editor host might
+                    state = SCE_RB_STRING_QQ;
+                    Quote.Open(chNext);
+                    advance_char(i, ch, chNext, chNext2); // pass by ref
+                    have_string = true;
+                }
+                if (!have_string) {
+                    styler.ColourTo(i, SCE_RB_OPERATOR);
+                    // stay in default
+                    preferRE = true;
+                }
+            } else if (ch == '?') {
+                styler.ColourTo(i - 1, state);
+                if (iswhitespace(chNext) || chNext == '\n' || chNext == '\r') {
+                    styler.ColourTo(i, SCE_RB_OPERATOR);
+                } else {
+                    // It's the start of a character code escape sequence
+                    // Color it as a number.
+                    state = SCE_RB_NUMBER;
+                    is_real_number = false;
+                }
+            } else if (isoperator(ch) || ch == '.') {
+				styler.ColourTo(i - 1, state);
+				styler.ColourTo(i, SCE_RB_OPERATOR);
+                // If we're ending an expression or block,
+                // assume it ends an object, and the ambivalent
+                // constructs are binary operators
+                //
+                // So if we don't have one of these chars,
+                // we aren't ending an object exp'n, and ops
+                // like : << / are unary operators.
+                
+                if (ch == '{') {
+                    ++brace_counts;
+                    preferRE = true;
+                } else if (ch == '}' && --brace_counts < 0
+                           && inner_string_count > 0) {
+                    styler.ColourTo(i, SCE_RB_OPERATOR);
+                    exitInnerExpression(inner_string_types,
+                                        inner_expn_brace_counts,
+                                        inner_quotes,
+                                        inner_string_count,
+                                        state, brace_counts, Quote);
+                } else {
+                    preferRE = (strchr(")}].", ch) == NULL);
+                }
+                // Stay in default state
+            } else if (isEOLChar(ch)) {
+                // Make sure it's a true line-end, with no backslash
+                if ((ch == '\r' || (ch == '\n' && chPrev != '\r'))
+                    && chPrev != '\\') {
+                    // Assume we've hit the end of the statement.
+                    preferRE = true;
+                }
+            }
+        } else if (state == SCE_RB_WORD) {
+            if (ch == '.' || !isSafeWordcharOrHigh(ch)) {
+                // Words include x? in all contexts,
+                // and <letters>= after either 'def' or a dot
+                // Move along until a complete word is on our left
+
+                // Default accessor treats '.' as word-chars,
+                // but we don't for now.
+                
+                if (ch == '='
+                    && isSafeWordcharOrHigh(chPrev)
+                    && (chNext == '('
+                        || strchr(" \t\n\r", chNext) != NULL)
+                    && (!strcmp(prevWord, "def")
+                        || followsDot(styler.GetStartSegment(), styler))) {
+                    // <name>= is a name only when being def'd -- Get it the next time
+                    // This means that <name>=<name> is always lexed as
+                    // <name>, (op, =), <name>
+                } else if ((ch == '?' || ch == '!')
+                           && isSafeWordcharOrHigh(chPrev)
+                           && !isSafeWordcharOrHigh(chNext)) {
+                    // <name>? is a name -- Get it the next time
+                    // But <name>?<name> is always lexed as
+                    // <name>, (op, ?), <name>
+                    // Same with <name>! to indicate a method that
+                    // modifies its target
+                } else if (isEOLChar(ch)
+                           && isMatch(styler, lengthDoc, i - 7, "__END__")) {
+                    styler.ColourTo(i, SCE_RB_DATASECTION);
+                    state = SCE_RB_DATASECTION;
+                    // No need to handle this state -- we'll just move to the end
+                    preferRE = false;
+                } else {
+					int wordStartPos = styler.GetStartSegment();
+                    int word_style = ClassifyWordRb(wordStartPos, i - 1, keywords, styler, prevWord);
+                    switch (word_style) {
+                        case SCE_RB_WORD:
+                            preferRE = RE_CanFollowKeyword(prevWord);
+							break;
+                            
+                        case SCE_RB_WORD_DEMOTED:
+                            preferRE = true;
+							break;
+                            
+                        case SCE_RB_IDENTIFIER:
+                            if (isMatch(styler, lengthDoc, wordStartPos, "print")) {
+                                preferRE = true;
+                            } else if (isEOLChar(ch)) {
+                                preferRE = true;
+                            } else {
+                                preferRE = false;
+                            }
+							break;
+                        default:
+                            preferRE = false;
+                    }
+                    if (ch == '.') {
+                        // We might be redefining an operator-method
+                        preferRE = false;
+                    }
+                    // And if it's the first 
+                    redo_char(i, ch, chNext, chNext2, state); // pass by ref
+                }
+            }
+        } else if (state == SCE_RB_NUMBER) {
+            if (!is_real_number) {
+                if (ch != '\\') {
+                    styler.ColourTo(i, state);
+                    state = SCE_RB_DEFAULT;
+                    preferRE = false;
+                } else if (strchr("\\ntrfvaebs", chNext)) {
+                    // Terminal escape sequence -- handle it next time
+                    // Nothing more to do this time through the loop
+                } else if (chNext == 'C' || chNext == 'M') {
+                    if (chNext2 != '-') {
+                        // \C or \M ends the sequence -- handle it next time
+                    } else {
+                        // Move from abc?\C-x
+                        //               ^
+                        // to
+                        //                 ^
+                        i += 2;
+                        ch = chNext2;
+                        chNext = styler.SafeGetCharAt(i + 1);
+                    }
+                } else if (chNext == 'c') {
+                    // Stay here, \c is a combining sequence
+                    advance_char(i, ch, chNext, chNext2); // pass by ref
+                } else {
+                    // ?\x, including ?\\ is final.
+                    styler.ColourTo(i + 1, state);
+                    state = SCE_RB_DEFAULT;
+                    preferRE = false;
+                    advance_char(i, ch, chNext, chNext2);
+                }
+            } else if (isSafeAlnumOrHigh(ch) || ch == '_') {
+                // Keep going
+            } else if (ch == '.' && ++numDots == 1) {
+                // Keep going
+            } else {
+                styler.ColourTo(i - 1, state);
+                redo_char(i, ch, chNext, chNext2, state); // pass by ref
+                preferRE = false;
+            }
+        } else if (state == SCE_RB_COMMENTLINE) {
+			if (isEOLChar(ch)) {
+                styler.ColourTo(i - 1, state);
+                state = SCE_RB_DEFAULT;
+                // Use whatever setting we had going into the comment
+            }
+        } else if (state == SCE_RB_HERE_DELIM) {
+            // See the comment for SCE_RB_HERE_DELIM in LexPerl.cxx
+            // Slightly different: if we find an immediate '-',
+            // the target can appear indented.
+            
+			if (HereDoc.State == 0) { // '<<' encountered
+				HereDoc.State = 1;
+                HereDoc.DelimiterLength = 0;
+                if (ch == '-') {
+                    HereDoc.CanBeIndented = true;
+                    advance_char(i, ch, chNext, chNext2); // pass by ref
+                } else {
+                    HereDoc.CanBeIndented = false;
+                }
+                if (isEOLChar(ch)) {
+                    // Bail out of doing a here doc if there's no target
+                    state = SCE_RB_DEFAULT;
+                    preferRE = false;
+                } else {
+                    HereDoc.Quote = ch;
+                
+                    if (ch == '\'' || ch == '"' || ch == '`') {
+                        HereDoc.Quoted = true;
+                        HereDoc.Delimiter[0] = '\0';
+                    } else {
+                        HereDoc.Quoted = false;
+                        HereDoc.Delimiter[0] = ch;
+                        HereDoc.Delimiter[1] = '\0';
+                        HereDoc.DelimiterLength = 1;
+                    }
+                }
+			} else if (HereDoc.State == 1) { // collect the delimiter
+                if (isEOLChar(ch)) {
+                    // End the quote now, and go back for more
+                    styler.ColourTo(i - 1, state);
+                    state = SCE_RB_DEFAULT;
+                    i--;
+                    chNext = ch;
+                    chNext2 = chNext;
+                    preferRE = false;
+                } else if (HereDoc.Quoted) {
+					if (ch == HereDoc.Quote) { // closing quote => end of delimiter
+						styler.ColourTo(i, state);
+						state = SCE_RB_DEFAULT;
+                        preferRE = false;
+                    } else {
+						if (ch == '\\' && !isEOLChar(chNext)) {
+                            advance_char(i, ch, chNext, chNext2);
+						}
+						HereDoc.Delimiter[HereDoc.DelimiterLength++] = ch;
+						HereDoc.Delimiter[HereDoc.DelimiterLength] = '\0';
+                    }
+                } else { // an unquoted here-doc delimiter
+					if (isSafeAlnumOrHigh(ch) || ch == '_') {
+						HereDoc.Delimiter[HereDoc.DelimiterLength++] = ch;
+						HereDoc.Delimiter[HereDoc.DelimiterLength] = '\0';
+					} else {
+						styler.ColourTo(i - 1, state);
+                        redo_char(i, ch, chNext, chNext2, state);
+                        preferRE = false;
+					}
+                }
+				if (HereDoc.DelimiterLength >= static_cast<int>(sizeof(HereDoc.Delimiter)) - 1) {
+					styler.ColourTo(i - 1, state);
+					state = SCE_RB_ERROR;
+                    preferRE = false;
+				}
+            }
+        } else if (state == SCE_RB_HERE_Q) {
+            // Not needed: HereDoc.State == 2
+            // Indentable here docs: look backwards
+            // Non-indentable: look forwards, like in Perl
+            //
+            // Why: so we can quickly resolve things like <<-" abc"
+
+            if (!HereDoc.CanBeIndented) {
+                if (isEOLChar(chPrev)
+                    && isMatch(styler, lengthDoc, i, HereDoc.Delimiter)) {
+                    styler.ColourTo(i - 1, state);
+                    i += HereDoc.DelimiterLength - 1;
+                    chNext = styler.SafeGetCharAt(i + 1);
+                    if (isEOLChar(chNext)) {
+                        styler.ColourTo(i, SCE_RB_HERE_DELIM);
+                        state = SCE_RB_DEFAULT;
+                        HereDoc.State = 0;
+                        preferRE = false;
+                    }
+                    // Otherwise we skipped through the here doc faster.
+                }
+            } else if (isEOLChar(chNext)
+                       && lookingAtHereDocDelim(styler,
+                                                i - HereDoc.DelimiterLength + 1,
+                                                lengthDoc,
+                                                HereDoc.Delimiter)) {
+                styler.ColourTo(i - 1 - HereDoc.DelimiterLength, state);
+                styler.ColourTo(i, SCE_RB_HERE_DELIM);
+                state = SCE_RB_DEFAULT;
+                preferRE = false;
+                HereDoc.State = 0;
+            }
+        } else if (state == SCE_RB_CLASS_VAR
+                   || state == SCE_RB_INSTANCE_VAR
+                   || state == SCE_RB_SYMBOL) {
+            if (!isSafeWordcharOrHigh(ch)) {
+                styler.ColourTo(i - 1, state);
+                redo_char(i, ch, chNext, chNext2, state); // pass by ref
+                preferRE = false;
+            }
+        } else if (state == SCE_RB_GLOBAL) {
+            if (!isSafeWordcharOrHigh(ch)) {
+                // handle special globals here as well
+                if (chPrev == '$') {
+                    if (ch == '-') {
+                        // Include the next char, like $-a
+                        advance_char(i, ch, chNext, chNext2);
+                    }
+                    styler.ColourTo(i, state);
+                    state = SCE_RB_DEFAULT;
+                } else {
+                    styler.ColourTo(i - 1, state);
+                    redo_char(i, ch, chNext, chNext2, state); // pass by ref
+                }
+                preferRE = false;
+            }
+        } else if (state == SCE_RB_POD) {
+            // PODs end with ^=end\s, -- any whitespace can follow =end
+            if (strchr(" \t\n\r", ch) != NULL
+                && i > 5
+                && isEOLChar(styler[i - 5])
+                && isMatch(styler, lengthDoc, i - 4, "=end")) {
+                styler.ColourTo(i - 1, state);
+                state = SCE_RB_DEFAULT;
+                preferRE = false;
+            }
+        } else if (state == SCE_RB_REGEX || state == SCE_RB_STRING_QR) {
+            if (ch == '\\' && Quote.Up != '\\') {
+                // Skip one
+                advance_char(i, ch, chNext, chNext2);
+            } else if (ch == Quote.Down) {
+                Quote.Count--;
+                if (Quote.Count == 0) {
+                    // Include the options
+                    while (isSafeAlpha(chNext)) {
+                        i++;
+						ch = chNext;
+                        chNext = styler.SafeGetCharAt(i + 1);
+                    }
+                    styler.ColourTo(i, state);
+                    state = SCE_RB_DEFAULT;
+                    preferRE = false;
+                }
+            } else if (ch == Quote.Up) {
+                // Only if close quoter != open quoter
+                Quote.Count++;
+                
+            } else if (ch == '#' ) {
+                if (chNext == '{'
+                    && inner_string_count < INNER_STRINGS_MAX_COUNT) {
+                    // process #{ ... }
+                    styler.ColourTo(i - 1, state);
+                    styler.ColourTo(i + 1, SCE_RB_OPERATOR);
+                    enterInnerExpression(inner_string_types,
+                                         inner_expn_brace_counts,
+                                         inner_quotes,
+                                         inner_string_count,
+                                         state,
+                                         brace_counts,
+                                         Quote);
+                    preferRE = true;
+                    // Skip one
+                    advance_char(i, ch, chNext, chNext2);
+                } else {
+                    //todo: distinguish comments from pound chars
+                    // for now, handle as comment
+                    styler.ColourTo(i - 1, state);
+                    bool inEscape = false;
+                    while (++i < lengthDoc) {
+                        ch = styler.SafeGetCharAt(i);
+                        if (ch == '\\') {
+                            inEscape = true;
+                        } else if (isEOLChar(ch)) {
+                            // Comment inside a regex
+                            styler.ColourTo(i - 1, SCE_RB_COMMENTLINE);
+                            break;
+                        } else if (inEscape) {
+                            inEscape = false;  // don't look at char
+                        } else if (ch == Quote.Down) {
+                            // Have the regular handler deal with this
+                            // to get trailing modifiers.
+                            i--;
+                            ch = styler[i];
+                            break;
+                        }
+                    }
+                    chNext = styler.SafeGetCharAt(i + 1);
+                    chNext2 = styler.SafeGetCharAt(i + 2);
+                }
+            }
+        // Quotes of all kinds...
+        } else if (state == SCE_RB_STRING_Q || state == SCE_RB_STRING_QQ || 
+                   state == SCE_RB_STRING_QX || state == SCE_RB_STRING_QW ||
+                   state == SCE_RB_STRING || state == SCE_RB_CHARACTER ||
+                   state == SCE_RB_BACKTICKS) {
+            if (!Quote.Down && !isspacechar(ch)) {
+                Quote.Open(ch);
+            } else if (ch == '\\' && Quote.Up != '\\') {
+                //Riddle me this: Is it safe to skip *every* escaped char?
+                advance_char(i, ch, chNext, chNext2);
+            } else if (ch == Quote.Down) {
+                Quote.Count--;
+                if (Quote.Count == 0) {
+                    styler.ColourTo(i, state);
+                    state = SCE_RB_DEFAULT;
+                    preferRE = false;
+                }
+            } else if (ch == Quote.Up) {
+                Quote.Count++;
+            } else if (ch == '#' && chNext == '{'
+                       && inner_string_count < INNER_STRINGS_MAX_COUNT
+                       && state != SCE_RB_CHARACTER
+                       && state != SCE_RB_STRING_Q) {
+                // process #{ ... }
+                styler.ColourTo(i - 1, state);
+                styler.ColourTo(i + 1, SCE_RB_OPERATOR);
+                enterInnerExpression(inner_string_types,
+                                     inner_expn_brace_counts,
+                                     inner_quotes,
+                                     inner_string_count,
+                                     state,
+                                     brace_counts,
+                                     Quote);
+                preferRE = true;
+                // Skip one
+                advance_char(i, ch, chNext, chNext2);
+            }
+        }
+            
+        if (state == SCE_RB_ERROR) {
+            break;
+        }
+        chPrev = ch;
+    }
+    if (state == SCE_RB_WORD) {
+        // We've ended on a word, possibly at EOF, and need to
+        // classify it.
+        (void) ClassifyWordRb(styler.GetStartSegment(), lengthDoc - 1, keywords, styler, prevWord);
+    } else {
+        styler.ColourTo(lengthDoc - 1, state);
+    }
+}
+
+// Helper functions for folding, disambiguation keywords
+// Assert that there are no high-bit chars 
+
+static void getPrevWord(int pos,
+                        char *prevWord,
+                        Accessor &styler,
+                        int word_state)
+{
+    int i;
+    styler.Flush();
+    for (i = pos - 1; i > 0; i--) {
+        if (actual_style(styler.StyleAt(i)) != word_state) {
+            i++;
+            break;
+        }
+    }
+    if (i < pos - MAX_KEYWORD_LENGTH) // overflow
+        i = pos - MAX_KEYWORD_LENGTH;
+    char *dst = prevWord;
+    for (; i <= pos; i++) {
+        *dst++ = styler[i];
+    }
+	*dst = 0;
+}
+
+static bool keywordIsAmbiguous(const char *prevWord)
+{
+    // Order from most likely used to least likely
+    // Lots of ways to do a loop in Ruby besides 'while/until'
+    if (!strcmp(prevWord, "if")
+        || !strcmp(prevWord, "do")
+        || !strcmp(prevWord, "while")
+        || !strcmp(prevWord, "unless")
+        || !strcmp(prevWord, "until")) {
+        return true;
+    } else {
+        return false;
+    }
+}
+
+// Demote keywords in the following conditions:
+// if, while, unless, until modify a statement
+// do after a while or until, as a noise word (like then after if) 
+
+static bool keywordIsModifier(const char *word,
+                              int pos,
+                              Accessor &styler)
+{
+    if (word[0] == 'd' && word[1] == 'o' && !word[2]) {
+        return keywordDoStartsLoop(pos, styler);
+    }
+    char ch;
+    int style = SCE_RB_DEFAULT;
+	int lineStart = styler.GetLine(pos);
+    int lineStartPosn = styler.LineStart(lineStart);
+    styler.Flush();
+    while (--pos >= lineStartPosn) {
+        style = actual_style(styler.StyleAt(pos));
+		if (style == SCE_RB_DEFAULT) {
+			if (iswhitespace(ch = styler[pos])) {
+				//continue
+			} else if (ch == '\r' || ch == '\n') {
+				// Scintilla's LineStart() and GetLine() routines aren't
+				// platform-independent, so if we have text prepared with
+				// a different system we can't rely on it.
+				return false;
+			}
+		} else {
+            break;
+		}
+    }
+    if (pos < lineStartPosn) {
+        return false; //XXX not quite right if the prev line is a continuation
+    }
+    // First things where the action is unambiguous
+    switch (style) {
+        case SCE_RB_DEFAULT:
+        case SCE_RB_COMMENTLINE:
+        case SCE_RB_POD:
+        case SCE_RB_CLASSNAME:
+        case SCE_RB_DEFNAME:
+        case SCE_RB_MODULE_NAME:
+            return false;
+        case SCE_RB_OPERATOR:
+            break;
+        case SCE_RB_WORD:
+            // Watch out for uses of 'else if'
+            //XXX: Make a list of other keywords where 'if' isn't a modifier
+            //     and can appear legitimately
+            // Formulate this to avoid warnings from most compilers
+            if (strcmp(word, "if") == 0) {
+                char prevWord[MAX_KEYWORD_LENGTH + 1];
+                getPrevWord(pos, prevWord, styler, SCE_RB_WORD);
+                return strcmp(prevWord, "else") != 0;
+            }
+            return true;
+        default:
+            return true;
+    }
+    // Assume that if the keyword follows an operator,
+    // usually it's a block assignment, like
+    // a << if x then y else z
+    
+    ch = styler[pos];
+    switch (ch) {
+        case ')':
+        case ']':
+        case '}':
+            return true;
+        default:
+            return false;
+    }
+}
+
+#define WHILE_BACKWARDS "elihw"
+#define UNTIL_BACKWARDS "litnu"
+
+// Nothing fancy -- look to see if we follow a while/until somewhere
+// on the current line
+
+static bool keywordDoStartsLoop(int pos,
+                                Accessor &styler)
+{
+    char ch;
+    int style;
+	int lineStart = styler.GetLine(pos);
+    int lineStartPosn = styler.LineStart(lineStart);
+    styler.Flush();
+    while (--pos >= lineStartPosn) {
+        style = actual_style(styler.StyleAt(pos));
+		if (style == SCE_RB_DEFAULT) {
+			if ((ch = styler[pos]) == '\r' || ch == '\n') {
+				// Scintilla's LineStart() and GetLine() routines aren't
+				// platform-independent, so if we have text prepared with
+				// a different system we can't rely on it.
+				return false;
+			}
+		} else if (style == SCE_RB_WORD) {
+            // Check for while or until, but write the word in backwards
+            char prevWord[MAX_KEYWORD_LENGTH + 1]; // 1 byte for zero
+            char *dst = prevWord;
+            int wordLen = 0;
+            int start_word;
+            for (start_word = pos;
+                 start_word >= lineStartPosn && actual_style(styler.StyleAt(start_word)) == SCE_RB_WORD;
+                 start_word--) {
+                if (++wordLen < MAX_KEYWORD_LENGTH) {
+                    *dst++ = styler[start_word];
+                }
+            }
+            *dst = 0;
+            // Did we see our keyword?
+            if (!strcmp(prevWord, WHILE_BACKWARDS)
+                || !strcmp(prevWord, UNTIL_BACKWARDS)) {
+                return true;
+            }
+            // We can move pos to the beginning of the keyword, and then
+            // accept another decrement, as we can never have two contiguous
+            // keywords:
+            // word1 word2
+            //           ^
+            //        <-  move to start_word
+            //      ^
+            //      <- loop decrement
+            //     ^  # pointing to end of word1 is fine
+            pos = start_word;
+        }
+    }
+    return false;
+}
+
+/*
+ *  Folding Ruby
+ * 
+ *  The language is quite complex to analyze without a full parse.
+ *  For example, this line shouldn't affect fold level:
+ * 
+ *   print "hello" if feeling_friendly?
+ * 
+ *  Neither should this:
+ * 
+ *   print "hello" \
+ *      if feeling_friendly?
+ * 
+ * 
+ *  But this should:
+ * 
+ *   if feeling_friendly?  #++
+ *     print "hello" \
+ *     print "goodbye"
+ *   end                   #--
+ * 
+ *  So we cheat, by actually looking at the existing indentation
+ *  levels for each line, and just echoing it back.  Like Python.
+ *  Then if we get better at it, we'll take braces into consideration,
+ *  which always affect folding levels.
+
+ *  How the keywords should work:
+ *  No effect:
+ *  __FILE__ __LINE__ BEGIN END alias and 
+ *  defined? false in nil not or self super then
+ *  true undef
+
+ *  Always increment:
+ *  begin  class def do for module when {
+ * 
+ *  Always decrement:
+ *  end }
+ * 
+ *  Increment if these start a statement
+ *  if unless until while -- do nothing if they're modifiers
+
+ *  These end a block if there's no modifier, but don't bother
+ *  break next redo retry return yield
+ * 
+ *  These temporarily de-indent, but re-indent
+ *  case else elsif ensure rescue
+ * 
+ *  This means that the folder reflects indentation rather
+ *  than setting it.  The language-service updates indentation
+ *  when users type return and finishes entering de-denters.
+ * 
+ *  Later offer to fold POD, here-docs, strings, and blocks of comments
+ */
+
+static void FoldRbDoc(unsigned int startPos, int length, int initStyle,
+                      WordList *[], Accessor &styler) {
+	const bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
+    
+    synchronizeDocStart(startPos, length, initStyle, styler, // ref args
+                        false);
+	unsigned int endPos = startPos + length;
+	int visibleChars = 0;
+	int lineCurrent = styler.GetLine(startPos);
+	int levelPrev = startPos == 0 ? 0 : (styler.LevelAt(lineCurrent)
+                                         & SC_FOLDLEVELNUMBERMASK
+                                         & ~SC_FOLDLEVELBASE);
+	int levelCurrent = levelPrev;
+	char chNext = styler[startPos];
+	int styleNext = styler.StyleAt(startPos);
+	int stylePrev = startPos <= 1 ? SCE_RB_DEFAULT : styler.StyleAt(startPos - 1);
+    bool buffer_ends_with_eol = false;
+	for (unsigned int i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+        if (style == SCE_RB_COMMENTLINE) {
+            if (foldComment && stylePrev != SCE_RB_COMMENTLINE) {
+                if (chNext == '{') {
+					levelCurrent++;
+				} else if (chNext == '}' && levelCurrent > 0) {
+					levelCurrent--;
+				}
+            }
+        } else if (style == SCE_RB_OPERATOR) {
+			if (strchr("[{(", ch)) {
+				levelCurrent++;
+			} else if (strchr(")}]", ch)) {
+                // Don't decrement below 0
+                if (levelCurrent > 0)
+                    levelCurrent--;
+			}
+        } else if (style == SCE_RB_WORD && styleNext != SCE_RB_WORD) {
+            // Look at the keyword on the left and decide what to do
+            char prevWord[MAX_KEYWORD_LENGTH + 1]; // 1 byte for zero
+            prevWord[0] = 0;
+            getPrevWord(i, prevWord, styler, SCE_RB_WORD);
+            if (!strcmp(prevWord, "end")) {
+                // Don't decrement below 0
+                if (levelCurrent > 0)
+                    levelCurrent--;
+            } else if (   !strcmp(prevWord, "if")
+                       || !strcmp(prevWord, "def")
+                       || !strcmp(prevWord, "class")
+                       || !strcmp(prevWord, "module")
+                       || !strcmp(prevWord, "begin")
+                       || !strcmp(prevWord, "case")
+                       || !strcmp(prevWord, "do")
+                       || !strcmp(prevWord, "while")
+                       || !strcmp(prevWord, "unless")
+                       || !strcmp(prevWord, "until")
+                       || !strcmp(prevWord, "for")
+                          ) {
+				levelCurrent++;
+            }
+        }
+		if (atEOL) {
+			int lev = levelPrev;
+			if (visibleChars == 0 && foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if ((levelCurrent > levelPrev) && (visibleChars > 0))
+				lev |= SC_FOLDLEVELHEADERFLAG;
+            styler.SetLevel(lineCurrent, lev|SC_FOLDLEVELBASE);
+			lineCurrent++;
+			levelPrev = levelCurrent;
+			visibleChars = 0;
+            buffer_ends_with_eol = true;
+		} else if (!isspacechar(ch)) {
+			visibleChars++;
+            buffer_ends_with_eol = false;
+        }
+		stylePrev = style;
+    }
+	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
+    if (!buffer_ends_with_eol) {
+        lineCurrent++;
+        int new_lev = levelCurrent;
+        if (visibleChars == 0 && foldCompact)
+            new_lev |= SC_FOLDLEVELWHITEFLAG;
+			if ((levelCurrent > levelPrev) && (visibleChars > 0))
+				new_lev |= SC_FOLDLEVELHEADERFLAG;
+            levelCurrent = new_lev;
+    }
+	styler.SetLevel(lineCurrent, levelCurrent|SC_FOLDLEVELBASE);
+}
+
+static const char * const rubyWordListDesc[] = {
+	"Keywords",
+	0
+};
+
+LexerModule lmRuby(SCLEX_RUBY, ColouriseRbDoc, "ruby", FoldRbDoc, rubyWordListDesc);
diff --git a/Documents/Scintilla/LexSQL.cxx b/Documents/Scintilla/LexSQL.cxx
new file mode 100644
index 0000000..eb1cddb
--- /dev/null
+++ b/Documents/Scintilla/LexSQL.cxx
@@ -0,0 +1,346 @@
+// Scintilla source code edit control
+/** @file LexSQL.cxx
+ ** Lexer for SQL, including PL/SQL and SQL*Plus.
+ **/
+// Copyright 1998-2005 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+static inline bool IsAWordChar(int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '_');
+}
+
+static inline bool IsAWordStart(int ch) {
+	return (ch < 0x80) && (isalpha(ch) || ch == '_');
+}
+
+static inline bool IsADoxygenChar(int ch) {
+	return (islower(ch) || ch == '$' || ch == '@' ||
+	        ch == '\\' || ch == '&' || ch == '<' ||
+	        ch == '>' || ch == '#' || ch == '{' ||
+	        ch == '}' || ch == '[' || ch == ']');
+}
+
+static inline bool IsANumberChar(int ch) {
+	// Not exactly following number definition (several dots are seen as OK, etc.)
+	// but probably enough in most cases.
+	return (ch < 0x80) &&
+	        (isdigit(ch) || toupper(ch) == 'E' ||
+             ch == '.' || ch == '-' || ch == '+');
+}
+
+static void ColouriseSQLDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
+                            Accessor &styler) {
+
+	WordList &keywords1 = *keywordlists[0];
+	WordList &keywords2 = *keywordlists[1];
+	WordList &kw_pldoc = *keywordlists[2];
+	WordList &kw_sqlplus = *keywordlists[3];
+	WordList &kw_user1 = *keywordlists[4];
+	WordList &kw_user2 = *keywordlists[5];
+	WordList &kw_user3 = *keywordlists[6];
+	WordList &kw_user4 = *keywordlists[7];
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	bool sqlBackslashEscapes = styler.GetPropertyInt("sql.backslash.escapes", 0) != 0;
+	bool sqlBackticksIdentifier = styler.GetPropertyInt("lexer.sql.backticks.identifier", 0) != 0;
+	int styleBeforeDCKeyword = SCE_SQL_DEFAULT;
+	for (; sc.More(); sc.Forward()) {
+		// Determine if the current state should terminate.
+		switch (sc.state) {
+		case SCE_SQL_OPERATOR:
+			sc.SetState(SCE_SQL_DEFAULT);
+			break;
+		case SCE_SQL_NUMBER:
+			// We stop the number definition on non-numerical non-dot non-eE non-sign char
+			if (!IsANumberChar(sc.ch)) {
+				sc.SetState(SCE_SQL_DEFAULT);
+			}
+			break;
+		case SCE_SQL_IDENTIFIER:
+			if (!IsAWordChar(sc.ch)) {
+				int nextState = SCE_SQL_DEFAULT;
+				char s[1000];
+				sc.GetCurrentLowered(s, sizeof(s));
+				if (keywords1.InList(s)) {
+					sc.ChangeState(SCE_SQL_WORD);
+				} else if (keywords2.InList(s)) {
+					sc.ChangeState(SCE_SQL_WORD2);
+				} else if (kw_sqlplus.InListAbbreviated(s, '~')) {
+					sc.ChangeState(SCE_SQL_SQLPLUS);
+					if (strncmp(s, "rem", 3) == 0) {
+						nextState = SCE_SQL_SQLPLUS_COMMENT;
+					} else if (strncmp(s, "pro", 3) == 0) {
+						nextState = SCE_SQL_SQLPLUS_PROMPT;
+					}
+				} else if (kw_user1.InList(s)) {
+					sc.ChangeState(SCE_SQL_USER1);
+				} else if (kw_user2.InList(s)) {
+					sc.ChangeState(SCE_SQL_USER2);
+				} else if (kw_user3.InList(s)) {
+					sc.ChangeState(SCE_SQL_USER3);
+				} else if (kw_user4.InList(s)) {
+					sc.ChangeState(SCE_SQL_USER4);
+				}
+				sc.SetState(nextState);
+			}
+			break;
+		case SCE_SQL_QUOTEDIDENTIFIER:
+			if (sc.ch == 0x60) {
+				if (sc.chNext == 0x60) {
+					sc.Forward();	// Ignore it
+				} else {
+					sc.ForwardSetState(SCE_SQL_DEFAULT);
+				}
+			}
+			break;
+		case SCE_SQL_COMMENT:
+			if (sc.Match('*', '/')) {
+				sc.Forward();
+				sc.ForwardSetState(SCE_SQL_DEFAULT);
+			}
+			break;
+		case SCE_SQL_COMMENTDOC:
+			if (sc.Match('*', '/')) {
+				sc.Forward();
+				sc.ForwardSetState(SCE_SQL_DEFAULT);
+			} else if (sc.ch == '@' || sc.ch == '\\') { // Doxygen support
+				// Verify that we have the conditions to mark a comment-doc-keyword
+				if ((IsASpace(sc.chPrev) || sc.chPrev == '*') && (!IsASpace(sc.chNext))) {
+					styleBeforeDCKeyword = SCE_SQL_COMMENTDOC;
+					sc.SetState(SCE_SQL_COMMENTDOCKEYWORD);
+				}
+			}
+			break;
+		case SCE_SQL_COMMENTLINE:
+		case SCE_SQL_COMMENTLINEDOC:
+		case SCE_SQL_SQLPLUS_COMMENT:
+		case SCE_SQL_SQLPLUS_PROMPT:
+			if (sc.atLineStart) {
+				sc.SetState(SCE_SQL_DEFAULT);
+			}
+			break;
+		case SCE_SQL_COMMENTDOCKEYWORD:
+			if ((styleBeforeDCKeyword == SCE_SQL_COMMENTDOC) && sc.Match('*', '/')) {
+				sc.ChangeState(SCE_SQL_COMMENTDOCKEYWORDERROR);
+				sc.Forward();
+				sc.ForwardSetState(SCE_SQL_DEFAULT);
+			} else if (!IsADoxygenChar(sc.ch)) {
+				char s[100];
+				sc.GetCurrentLowered(s, sizeof(s));
+				if (!isspace(sc.ch) || !kw_pldoc.InList(s + 1)) {
+					sc.ChangeState(SCE_SQL_COMMENTDOCKEYWORDERROR);
+				}
+				sc.SetState(styleBeforeDCKeyword);
+			}
+			break;
+		case SCE_SQL_CHARACTER:
+			if (sqlBackslashEscapes && sc.ch == '\\') {
+				sc.Forward();
+			} else if (sc.ch == '\'') {
+				if (sc.chNext == '\"') {
+					sc.Forward();
+				} else {
+					sc.ForwardSetState(SCE_SQL_DEFAULT);
+				}
+			}
+			break;
+		case SCE_SQL_STRING:
+			if (sc.ch == '\\') {
+				// Escape sequence
+				sc.Forward();
+			} else if (sc.ch == '\"') {
+				if (sc.chNext == '\"') {
+					sc.Forward();
+				} else {
+					sc.ForwardSetState(SCE_SQL_DEFAULT);
+				}
+			}
+			break;
+		}
+
+		// Determine if a new state should be entered.
+		if (sc.state == SCE_SQL_DEFAULT) {
+			if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
+				sc.SetState(SCE_SQL_NUMBER);
+			} else if (IsAWordStart(sc.ch)) {
+				sc.SetState(SCE_SQL_IDENTIFIER);
+			} else if (sc.ch == 0x60 && sqlBackticksIdentifier) {
+				sc.SetState(SCE_SQL_QUOTEDIDENTIFIER);
+			} else if (sc.Match('/', '*')) {
+				if (sc.Match("/**") || sc.Match("/*!")) {	// Support of Doxygen doc. style
+					sc.SetState(SCE_SQL_COMMENTDOC);
+				} else {
+					sc.SetState(SCE_SQL_COMMENT);
+				}
+				sc.Forward();	// Eat the * so it isn't used for the end of the comment
+			} else if (sc.Match('-', '-')) {
+				// MySQL requires a space or control char after --
+				// http://dev.mysql.com/doc/mysql/en/ansi-diff-comments.html
+				// Perhaps we should enforce that with proper property:
+//~ 			} else if (sc.Match("-- ")) {
+				sc.SetState(SCE_SQL_COMMENTLINE);
+			} else if (sc.ch == '#') {
+				sc.SetState(SCE_SQL_COMMENTLINEDOC);
+			} else if (sc.ch == '\'') {
+				sc.SetState(SCE_SQL_CHARACTER);
+			} else if (sc.ch == '\"') {
+				sc.SetState(SCE_SQL_STRING);
+			} else if (isoperator(static_cast<char>(sc.ch))) {
+				sc.SetState(SCE_SQL_OPERATOR);
+			}
+		}
+	}
+	sc.Complete();
+}
+
+static bool IsStreamCommentStyle(int style) {
+	return style == SCE_SQL_COMMENT ||
+	       style == SCE_SQL_COMMENTDOC ||
+	       style == SCE_SQL_COMMENTDOCKEYWORD ||
+	       style == SCE_SQL_COMMENTDOCKEYWORDERROR;
+}
+
+// Store both the current line's fold level and the next lines in the
+// level store to make it easy to pick up with each increment.
+static void FoldSQLDoc(unsigned int startPos, int length, int initStyle,
+                            WordList *[], Accessor &styler) {
+	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
+	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	bool foldOnlyBegin = styler.GetPropertyInt("fold.sql.only.begin", 0) != 0;
+
+	unsigned int endPos = startPos + length;
+	int visibleChars = 0;
+	int lineCurrent = styler.GetLine(startPos);
+	int levelCurrent = SC_FOLDLEVELBASE;
+	if (lineCurrent > 0) {
+		levelCurrent = styler.LevelAt(lineCurrent - 1) >> 16;
+	}
+	int levelNext = levelCurrent;
+	char chNext = styler[startPos];
+	int styleNext = styler.StyleAt(startPos);
+	int style = initStyle;
+	bool endFound = false;
+	for (unsigned int i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int stylePrev = style;
+		style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+		if (foldComment && IsStreamCommentStyle(style)) {
+			if (!IsStreamCommentStyle(stylePrev)) {
+				levelNext++;
+			} else if (!IsStreamCommentStyle(styleNext) && !atEOL) {
+				// Comments don't end at end of line and the next character may be unstyled.
+				levelNext--;
+			}
+		}
+		if (foldComment && (style == SCE_SQL_COMMENTLINE)) {
+			// MySQL needs -- comments to be followed by space or control char
+			if ((ch == '-') && (chNext == '-')) {
+				char chNext2 = styler.SafeGetCharAt(i + 2);
+				char chNext3 = styler.SafeGetCharAt(i + 3);
+				if (chNext2 == '{' || chNext3 == '{') {
+					levelNext++;
+				} else if (chNext2 == '}' || chNext3 == '}') {
+					levelNext--;
+				}
+			}
+		}
+		if (style == SCE_SQL_OPERATOR) {
+			if (ch == '(') {
+				levelNext++;
+			} else if (ch == ')') {
+				levelNext--;
+			}
+		}
+		// If new keyword (cannot trigger on elseif or nullif, does less tests)
+		if (style == SCE_SQL_WORD && stylePrev != SCE_SQL_WORD) {
+			const int MAX_KW_LEN = 6;	// Maximum length of folding keywords
+			char s[MAX_KW_LEN + 2];
+			unsigned int j = 0;
+			for (; j < MAX_KW_LEN + 1; j++) {
+				if (!iswordchar(styler[i + j])) {
+					break;
+				}
+				s[j] = static_cast<char>(tolower(styler[i + j]));
+			}
+			if (j == MAX_KW_LEN + 1) {
+				// Keyword too long, don't test it
+				s[0] = '\0';
+			} else {
+				s[j] = '\0';
+			}
+			if ((!foldOnlyBegin) && (strcmp(s, "if") == 0 || strcmp(s, "loop") == 0)) {
+				if (endFound) {
+					// ignore
+					endFound = false;
+				} else {
+					levelNext++;
+				}
+			} else if (strcmp(s, "begin") == 0) {
+				levelNext++;
+			} else if (strcmp(s, "end") == 0 ||
+						// DROP TABLE IF EXISTS or CREATE TABLE IF NOT EXISTS
+						strcmp(s, "exists") == 0) {
+				endFound = true;
+				levelNext--;
+				if (levelNext < SC_FOLDLEVELBASE) {
+					levelNext = SC_FOLDLEVELBASE;
+				}
+			}
+		}
+		if (atEOL) {
+			int levelUse = levelCurrent;
+			int lev = levelUse | levelNext << 16;
+			if (visibleChars == 0 && foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if (levelUse < levelNext)
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelCurrent = levelNext;
+			visibleChars = 0;
+			endFound = false;
+		}
+		if (!isspacechar(ch)) {
+			visibleChars++;
+		}
+	}
+}
+
+static const char * const sqlWordListDesc[] = {
+	"Keywords",
+	"Database Objects",
+	"PLDoc",
+	"SQL*Plus",
+	"User Keywords 1",
+	"User Keywords 2",
+	"User Keywords 3",
+	"User Keywords 4",
+	0
+};
+
+LexerModule lmSQL(SCLEX_SQL, ColouriseSQLDoc, "sql", FoldSQLDoc, sqlWordListDesc);
diff --git a/Documents/Scintilla/LexScriptol.cxx b/Documents/Scintilla/LexScriptol.cxx
new file mode 100644
index 0000000..76c38e6
--- /dev/null
+++ b/Documents/Scintilla/LexScriptol.cxx
@@ -0,0 +1,408 @@
+// Scintilla source code edit control
+/** @file LexScriptol.cxx
+ ** Lexer for Scriptol.
+ **/
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+static void ClassifyWordSol(unsigned int start, unsigned int end, WordList &keywords, Accessor &styler, char *prevWord)
+{
+    char s[100];
+    bool wordIsNumber = isdigit(styler[start]) != 0;
+    for (unsigned int i = 0; i < end - start + 1 && i < 30; i++)
+     {
+           s[i] = styler[start + i];
+           s[i + 1] = '\0';
+     }
+    char chAttr = SCE_SCRIPTOL_IDENTIFIER;
+    if (0 == strcmp(prevWord, "class"))       chAttr = SCE_SCRIPTOL_CLASSNAME;
+    else if (wordIsNumber)                    chAttr = SCE_SCRIPTOL_NUMBER;
+    else if (keywords.InList(s))              chAttr = SCE_SCRIPTOL_KEYWORD;
+    else for (unsigned int i = 0; i < end - start + 1; i++)  // test dotted idents
+    {
+        if (styler[start + i] == '.')
+        {
+            styler.ColourTo(start + i - 1, chAttr);
+            styler.ColourTo(start + i, SCE_SCRIPTOL_OPERATOR);
+        }
+    }
+    styler.ColourTo(end, chAttr);
+    strcpy(prevWord, s);
+}
+
+static bool IsSolComment(Accessor &styler, int pos, int len)
+{
+   char c;
+   if(len > 0)
+   {
+     c = styler[pos];
+     if(c == '`') return true;
+     if(len > 1)
+     {
+        if(c == '/')
+        {
+          c = styler[pos + 1];
+          if(c == '/') return true;
+          if(c == '*') return true;
+        }
+     }
+   }
+   return false;
+}
+
+static bool IsSolStringStart(char ch)
+{
+    if (ch == '\'' || ch == '"')  return true;
+    return false;
+}
+
+static bool IsSolWordStart(char ch)
+{
+    return (iswordchar(ch) && !IsSolStringStart(ch));
+}
+
+
+static int GetSolStringState(Accessor &styler, int i, int *nextIndex)
+{
+	char ch = styler.SafeGetCharAt(i);
+	char chNext = styler.SafeGetCharAt(i + 1);
+
+        if (ch != '\"' && ch != '\'')
+        {
+            *nextIndex = i + 1;
+            return SCE_SCRIPTOL_DEFAULT;
+	}
+        // ch is either single or double quotes in string
+        // code below seem non-sense but is here for future extensions
+	if (ch == chNext && ch == styler.SafeGetCharAt(i + 2))
+        {
+          *nextIndex = i + 3;
+          if(ch == '\"') return SCE_SCRIPTOL_TRIPLE;
+          if(ch == '\'') return SCE_SCRIPTOL_TRIPLE;
+          return SCE_SCRIPTOL_STRING;
+	}
+        else
+        {
+          *nextIndex = i + 1;
+          if (ch == '"') return SCE_SCRIPTOL_STRING;
+          else           return SCE_SCRIPTOL_STRING;
+	}
+}
+
+
+static void ColouriseSolDoc(unsigned int startPos, int length, int initStyle,
+                            WordList *keywordlists[], Accessor &styler)
+ {
+
+	int lengthDoc = startPos + length;
+        char stringType = '\"';
+
+	if (startPos > 0)
+        {
+            int lineCurrent = styler.GetLine(startPos);
+            if (lineCurrent > 0)
+            {
+              startPos = styler.LineStart(lineCurrent-1);
+              if (startPos == 0) initStyle = SCE_SCRIPTOL_DEFAULT;
+              else               initStyle = styler.StyleAt(startPos-1);
+            }
+	}
+
+	styler.StartAt(startPos, 127);
+
+	WordList &keywords = *keywordlists[0];
+
+	int whingeLevel = styler.GetPropertyInt("tab.timmy.whinge.level");
+	char prevWord[200];
+	prevWord[0] = '\0';
+        if (length == 0)  return;
+
+	int state = initStyle & 31;
+
+	int nextIndex = 0;
+        char chPrev  = ' ';
+        char chPrev2 = ' ';
+        char chNext  = styler[startPos];
+	styler.StartSegment(startPos);
+	bool atStartLine = true;
+	int spaceFlags = 0;
+	for (int i = startPos; i < lengthDoc; i++)
+        {
+
+         if (atStartLine)
+         {
+         char chBad = static_cast<char>(64);
+         char chGood = static_cast<char>(0);
+         char chFlags = chGood;
+
+         if (whingeLevel == 1)
+         {
+             chFlags = (spaceFlags & wsInconsistent) ? chBad : chGood;
+         }
+         else if (whingeLevel == 2)
+         {
+             chFlags = (spaceFlags & wsSpaceTab) ? chBad : chGood;
+         }
+         else if (whingeLevel == 3)
+         {
+             chFlags = (spaceFlags & wsSpace) ? chBad : chGood;
+         }
+         else if (whingeLevel == 4)
+         {
+              chFlags = (spaceFlags & wsTab) ? chBad : chGood;
+         }
+         styler.SetFlags(chFlags, static_cast<char>(state));
+         atStartLine = false;
+       }
+
+       char ch = chNext;
+       chNext = styler.SafeGetCharAt(i + 1);
+
+       if ((ch == '\r' && chNext != '\n') || (ch == '\n') || (i == lengthDoc))
+       {
+          if ((state == SCE_SCRIPTOL_DEFAULT) ||
+              (state == SCE_SCRIPTOL_TRIPLE) ||
+              (state == SCE_SCRIPTOL_COMMENTBLOCK))
+          {
+              styler.ColourTo(i, state);
+          }
+          atStartLine = true;
+        }
+
+        if (styler.IsLeadByte(ch))
+         {
+             chNext = styler.SafeGetCharAt(i + 2);
+             chPrev  = ' ';
+             chPrev2 = ' ';
+             i += 1;
+             continue;
+         }
+
+        if (state == SCE_SCRIPTOL_STRINGEOL)
+         {
+             if (ch != '\r' && ch != '\n')
+             {
+                    styler.ColourTo(i - 1, state);
+                    state = SCE_SCRIPTOL_DEFAULT;
+             }
+         }
+
+        if (state == SCE_SCRIPTOL_DEFAULT)
+         {
+            if (IsSolWordStart(ch))
+            {
+                 styler.ColourTo(i - 1, state);
+                 state = SCE_SCRIPTOL_KEYWORD;
+            }
+            else if (ch == '`')
+            {
+                styler.ColourTo(i - 1, state);
+                state = SCE_SCRIPTOL_COMMENTLINE;
+            }
+            else if (ch == '/')
+            {
+                styler.ColourTo(i - 1, state);
+                if(chNext == '/') state = SCE_SCRIPTOL_CSTYLE;
+                if(chNext == '*') state = SCE_SCRIPTOL_COMMENTBLOCK;
+            }
+
+            else if (IsSolStringStart(ch))
+            {
+               styler.ColourTo(i - 1, state);
+               state = GetSolStringState(styler, i, &nextIndex);
+               if(state == SCE_SCRIPTOL_STRING)
+               {
+                 stringType = ch;
+               }
+               if (nextIndex != i + 1)
+               {
+                   i = nextIndex - 1;
+                   ch = ' ';
+                   chPrev = ' ';
+                   chNext = styler.SafeGetCharAt(i + 1);
+               }
+           }
+            else if (isoperator(ch))
+            {
+                 styler.ColourTo(i - 1, state);
+                 styler.ColourTo(i, SCE_SCRIPTOL_OPERATOR);
+            }
+          }
+          else if (state == SCE_SCRIPTOL_KEYWORD)
+          {
+              if (!iswordchar(ch))
+              {
+                 ClassifyWordSol(styler.GetStartSegment(), i - 1, keywords, styler, prevWord);
+                 state = SCE_SCRIPTOL_DEFAULT;
+                 if (ch == '`')
+                 {
+                     state = chNext == '`' ? SCE_SCRIPTOL_PERSISTENT : SCE_SCRIPTOL_COMMENTLINE;
+                 }
+                 else if (IsSolStringStart(ch))
+                 {
+                    styler.ColourTo(i - 1, state);
+                    state = GetSolStringState(styler, i, &nextIndex);
+                    if (nextIndex != i + 1)
+                    {
+                       i = nextIndex - 1;
+                       ch = ' ';
+                       chPrev = ' ';
+                       chNext = styler.SafeGetCharAt(i + 1);
+                     }
+                 }
+                 else if (isoperator(ch))
+                 {
+                     styler.ColourTo(i, SCE_SCRIPTOL_OPERATOR);
+                 }
+             }
+          }
+          else
+          {
+            if (state == SCE_SCRIPTOL_COMMENTLINE ||
+                state == SCE_SCRIPTOL_PERSISTENT ||
+                state == SCE_SCRIPTOL_CSTYLE)
+            {
+                 if (ch == '\r' || ch == '\n')
+                 {
+                     styler.ColourTo(i - 1, state);
+                     state = SCE_SCRIPTOL_DEFAULT;
+                 }
+            }
+            else if(state == SCE_SCRIPTOL_COMMENTBLOCK)
+            {
+              if(chPrev == '*' && ch == '/')
+              {
+                styler.ColourTo(i, state);
+                state = SCE_SCRIPTOL_DEFAULT;
+              }
+            }
+            else if ((state == SCE_SCRIPTOL_STRING) ||
+                     (state == SCE_SCRIPTOL_CHARACTER))
+            {
+               if ((ch == '\r' || ch == '\n') && (chPrev != '\\'))
+                {
+                    styler.ColourTo(i - 1, state);
+                    state = SCE_SCRIPTOL_STRINGEOL;
+                }
+                else if (ch == '\\')
+                {
+                   if (chNext == '\"' || chNext == '\'' || chNext == '\\')
+                   {
+                        i++;
+                        ch = chNext;
+                        chNext = styler.SafeGetCharAt(i + 1);
+                   }
+                 }
+                else if ((ch == '\"') || (ch == '\''))
+                {
+                    // must match the entered quote type
+                    if(ch == stringType)
+                    {
+                      styler.ColourTo(i, state);
+                      state = SCE_SCRIPTOL_DEFAULT;
+                    }
+                 }
+             }
+             else if (state == SCE_SCRIPTOL_TRIPLE)
+             {
+                if ((ch == '\'' && chPrev == '\'' && chPrev2 == '\'') ||
+                    (ch == '\"' && chPrev == '\"' && chPrev2 == '\"'))
+                 {
+                    styler.ColourTo(i, state);
+                    state = SCE_SCRIPTOL_DEFAULT;
+                 }
+             }
+            
+           }
+          chPrev2 = chPrev;
+          chPrev = ch;
+	}
+        if (state == SCE_SCRIPTOL_KEYWORD)
+        {
+            ClassifyWordSol(styler.GetStartSegment(),
+                 lengthDoc-1, keywords, styler, prevWord);
+	}
+        else
+        {
+            styler.ColourTo(lengthDoc-1, state);
+	}
+}
+
+static void FoldSolDoc(unsigned int startPos, int length, int initStyle,
+						   WordList *[], Accessor &styler)
+ {
+	int lengthDoc = startPos + length;
+
+	int lineCurrent = styler.GetLine(startPos);
+	if (startPos > 0)
+        {
+          if (lineCurrent > 0)
+          {
+               lineCurrent--;
+               startPos = styler.LineStart(lineCurrent);
+               if (startPos == 0)
+                    initStyle = SCE_SCRIPTOL_DEFAULT;
+               else
+                    initStyle = styler.StyleAt(startPos-1);
+           }
+	}
+	int state = initStyle & 31;
+	int spaceFlags = 0;
+        int indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags, IsSolComment);
+        if ((state == SCE_SCRIPTOL_TRIPLE))
+             indentCurrent |= SC_FOLDLEVELWHITEFLAG;
+	char chNext = styler[startPos];
+	for (int i = startPos; i < lengthDoc; i++)
+         {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int style = styler.StyleAt(i) & 31;
+
+		if ((ch == '\r' && chNext != '\n') || (ch == '\n') || (i == lengthDoc))
+                {
+                   int lev = indentCurrent;
+                   int indentNext = styler.IndentAmount(lineCurrent + 1, &spaceFlags, IsSolComment);
+                   if (style == SCE_SCRIPTOL_TRIPLE)
+                        indentNext |= SC_FOLDLEVELWHITEFLAG;
+                   if (!(indentCurrent & SC_FOLDLEVELWHITEFLAG))
+                    {
+                        // Only non whitespace lines can be headers
+                        if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext & SC_FOLDLEVELNUMBERMASK))
+                        {
+                              lev |= SC_FOLDLEVELHEADERFLAG;
+                        }
+                        else if (indentNext & SC_FOLDLEVELWHITEFLAG)
+                        {
+                             // Line after is blank so check the next - maybe should continue further?
+                             int spaceFlags2 = 0;
+                             int indentNext2 = styler.IndentAmount(lineCurrent + 2, &spaceFlags2, IsSolComment);
+                             if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext2 & SC_FOLDLEVELNUMBERMASK))
+                             {
+                                   lev |= SC_FOLDLEVELHEADERFLAG;
+                              }
+                        }
+                    }
+                   indentCurrent = indentNext;
+                   styler.SetLevel(lineCurrent, lev);
+                   lineCurrent++;
+		}
+	}
+}
+
+LexerModule lmScriptol(SCLEX_SCRIPTOL, ColouriseSolDoc, "scriptol", FoldSolDoc);
diff --git a/Documents/Scintilla/LexSmalltalk.cxx b/Documents/Scintilla/LexSmalltalk.cxx
new file mode 100644
index 0000000..265de38
--- /dev/null
+++ b/Documents/Scintilla/LexSmalltalk.cxx
@@ -0,0 +1,321 @@
+// Scintilla source code edit control
+/** @file LexSmalltalk.cxx
+ ** Lexer for Smalltalk language.
+ ** Written by Sergey Philippov, sphilippov-at-gmail-dot-com
+ **/
+// Copyright 1998-2002 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+/*
+| lexTable classificationBlock charClasses |
+charClasses := #(#DecDigit #Letter #Special #Upper #BinSel).
+lexTable := ByteArray new: 128.
+classificationBlock := [ :charClass :chars |
+    | flag |
+    flag := 1 bitShift: (charClasses indexOf: charClass) - 1.
+    chars do: [ :char | lexTable at: char codePoint + 1 put: ((lexTable at: char codePoint + 1) bitOr: flag)]].
+
+classificationBlock
+    value: #DecDigit value: '0123456789';
+    value: #Letter value: '_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+    value: #Special value: '()[]{};.^:';
+    value: #BinSel value: '~@%&*-+=|\/,<>?!';
+    value: #Upper value: 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.
+
+((String new: 500) streamContents: [ :stream |            
+    stream crLf; nextPutAll: 'static int ClassificationTable[256] = {'.
+    lexTable keysAndValuesDo: [ :index :value |
+        ((index - 1) rem: 16) == 0 ifTrue: [
+            stream crLf; tab]
+        ifFalse: [
+            stream space].
+        stream print: value.
+        index ~= 256 ifTrue: [
+            stream nextPut: $,]].
+    stream crLf; nextPutAll: '};'; crLf.
+    
+    charClasses keysAndValuesDo: [ :index :name |
+        stream
+            crLf;
+            nextPutAll: (
+                ('static inline bool is<1s>(int ch) {return (ch > 0) && (ch %< 0x80) && ((ClassificationTable[ch] & <2p>) != 0);}')
+                    expandMacrosWith: name with: (1 bitShift: (index - 1)))
+    ]]) edit
+*/
+
+// autogenerated {{{{
+
+static int ClassificationTable[256] = {
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 16, 0, 0, 0, 16, 16, 0, 4, 4, 16, 16, 16, 16, 4, 16,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 4, 16, 16, 16, 16,
+    16, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
+    10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 4, 16, 4, 4, 2,
+    0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 4, 16, 4, 16, 0,
+};
+
+static inline bool isDecDigit(int ch) {return (ch > 0) && (ch < 0x80) && ((ClassificationTable[ch] & 1) != 0);}
+static inline bool isLetter(int ch) {return (ch > 0) && (ch < 0x80) && ((ClassificationTable[ch] & 2) != 0);}
+static inline bool isSpecial(int ch) {return (ch > 0) && (ch < 0x80) && ((ClassificationTable[ch] & 4) != 0);}
+static inline bool isUpper(int ch) {return (ch > 0) && (ch < 0x80) && ((ClassificationTable[ch] & 8) != 0);}
+static inline bool isBinSel(int ch) {return (ch > 0) && (ch < 0x80) && ((ClassificationTable[ch] & 16) != 0);}
+// autogenerated }}}}
+
+static inline bool isAlphaNumeric(int ch) {
+    return isDecDigit(ch) || isLetter(ch);
+}
+
+static inline bool isDigitOfRadix(int ch, int radix)
+{
+    if (isDecDigit(ch))
+        return (ch - '0') < radix;
+    else if (!isUpper(ch))
+        return false;
+    else
+        return (ch - 'A' + 10) < radix;
+}
+
+static inline void skipComment(StyleContext& sc)
+{    
+    while (sc.More() && sc.ch != '\"')
+        sc.Forward();
+}
+
+static inline void skipString(StyleContext& sc)
+{
+    while (sc.More()) {
+        if (sc.ch == '\'') {
+            if (sc.chNext != '\'')
+                return;
+            sc.Forward();
+        }
+        sc.Forward();
+    }
+}
+
+static void handleHash(StyleContext& sc)
+{
+    if (isSpecial(sc.chNext)) {
+        sc.SetState(SCE_ST_SPECIAL);
+        return;
+    }
+    
+    sc.SetState(SCE_ST_SYMBOL);
+    sc.Forward();
+    if (sc.ch == '\'') {
+        sc.Forward();
+        skipString(sc);
+    }
+    else {
+        if (isLetter(sc.ch)) {
+            while (isAlphaNumeric(sc.chNext) || sc.chNext == ':')
+                sc.Forward();
+        }
+        else if (isBinSel(sc.ch)) {
+            while (isBinSel(sc.chNext))
+                sc.Forward();
+        }
+    }
+}
+
+static inline void handleSpecial(StyleContext& sc)
+{
+    if (sc.ch == ':' && sc.chNext == '=') {
+        sc.SetState(SCE_ST_ASSIGN);
+        sc.Forward();
+    }
+    else {
+        if (sc.ch == '^')
+            sc.SetState(SCE_ST_RETURN);
+        else
+            sc.SetState(SCE_ST_SPECIAL);
+    }
+}
+
+static inline void skipInt(StyleContext& sc, int radix)
+{
+    while (isDigitOfRadix(sc.chNext, radix))
+        sc.Forward();
+}
+
+static void handleNumeric(StyleContext& sc)
+{
+    char num[256];
+    int nl;
+    int radix;
+    
+    sc.SetState(SCE_ST_NUMBER);
+    num[0] = static_cast<char>(sc.ch);
+    nl = 1;
+    while (isDecDigit(sc.chNext)) {
+        num[nl++] = static_cast<char>(sc.chNext);
+        sc.Forward();
+        if (nl+1 == sizeof(num)/sizeof(num[0])) // overrun check
+            break;
+    }
+    if (sc.chNext == 'r') {
+        num[nl] = 0;
+        if (num[0] == '-')
+            radix = atoi(num + 1);
+        else
+            radix = atoi(num);
+        sc.Forward();
+        if (sc.chNext == '-')
+            sc.Forward();
+        skipInt(sc, radix);
+    }
+    else
+        radix = 10;
+    if (sc.chNext != '.' || !isDigitOfRadix(sc.GetRelative(2), radix))
+        return;
+    sc.Forward();
+    skipInt(sc, radix);
+    if (sc.chNext == 's') {
+        // ScaledDecimal
+        sc.Forward();
+        while (isDecDigit(sc.chNext))
+            sc.Forward();
+        return;
+    }
+    else if (sc.chNext != 'e' && sc.chNext != 'd' && sc.chNext != 'q')
+        return;
+    sc.Forward();
+    if (sc.chNext == '+' || sc.chNext == '-')
+        sc.Forward();
+    skipInt(sc, radix);
+}
+
+static inline void handleBinSel(StyleContext& sc)
+{
+    sc.SetState(SCE_ST_BINARY);
+    while (isBinSel(sc.chNext))
+        sc.Forward();
+}
+
+static void handleLetter(StyleContext& sc, WordList* specialSelectorList)
+{
+    char ident[256];
+    int il;
+    int state;
+    bool doubleColonPresent;
+    
+    sc.SetState(SCE_ST_DEFAULT);
+
+    ident[0] = static_cast<char>(sc.ch);
+    il = 1;
+    while (isAlphaNumeric(sc.chNext)) {
+        ident[il++] = static_cast<char>(sc.chNext);
+        sc.Forward();
+        if (il+2 == sizeof(ident)/sizeof(ident[0])) // overrun check
+            break;
+    }
+
+    if (sc.chNext == ':') {
+        doubleColonPresent = true;
+        ident[il++] = ':';
+        sc.Forward();
+    }
+    else
+        doubleColonPresent = false;
+    ident[il] = 0;
+    
+    if (specialSelectorList->InList(ident))
+            state = SCE_ST_SPEC_SEL;
+    else if (doubleColonPresent)
+            state = SCE_ST_KWSEND;
+    else if (isUpper(ident[0]))
+        state = SCE_ST_GLOBAL;
+    else {
+        if (!strcmp(ident, "self"))
+            state = SCE_ST_SELF;
+        else if (!strcmp(ident, "super"))
+            state = SCE_ST_SUPER;
+        else if (!strcmp(ident, "nil"))
+            state = SCE_ST_NIL;
+        else if (!strcmp(ident, "true") || !strcmp(ident, "false"))
+            state = SCE_ST_BOOL;
+        else
+            state = SCE_ST_DEFAULT;
+    }
+    
+    sc.ChangeState(state);
+}
+
+static void colorizeSmalltalkDoc(unsigned int startPos, int length, int initStyle, WordList *wordLists[], Accessor &styler)
+{
+    StyleContext sc(startPos, length, initStyle, styler);
+
+    if (initStyle == SCE_ST_COMMENT) {
+        skipComment(sc);
+        if (sc.More())
+            sc.Forward();
+    }
+    else if (initStyle == SCE_ST_STRING) {
+        skipString(sc);
+        if (sc.More())
+            sc.Forward();
+    }
+
+    for (; sc.More(); sc.Forward()) {
+        int ch;
+        
+        ch = sc.ch;
+        if (ch == '\"') {
+            sc.SetState(SCE_ST_COMMENT);
+            sc.Forward();
+            skipComment(sc);
+        }
+        else if (ch == '\'') {
+            sc.SetState(SCE_ST_STRING);
+            sc.Forward();
+            skipString(sc);
+        }
+        else if (ch == '#')
+            handleHash(sc);
+        else if (ch == '$') {
+            sc.SetState(SCE_ST_CHARACTER);
+            sc.Forward();
+        }
+        else if (isSpecial(ch))
+            handleSpecial(sc);
+        else if (isDecDigit(ch))
+            handleNumeric(sc);
+        else if (isLetter(ch))
+            handleLetter(sc, wordLists[0]);
+        else if (isBinSel(ch)) {
+            if (ch == '-' && isDecDigit(sc.chNext))
+                handleNumeric(sc);
+            else
+                handleBinSel(sc);
+        }
+        else
+            sc.SetState(SCE_ST_DEFAULT);
+    }
+    sc.Complete();
+}
+
+static const char* const smalltalkWordListDesc[] = {
+    "Special selectors",
+    0
+};
+
+LexerModule lmSmalltalk(SCLEX_SMALLTALK, colorizeSmalltalkDoc, "smalltalk", NULL, smalltalkWordListDesc);
diff --git a/Documents/Scintilla/LexSpecman.cxx b/Documents/Scintilla/LexSpecman.cxx
new file mode 100644
index 0000000..093efae
--- /dev/null
+++ b/Documents/Scintilla/LexSpecman.cxx
@@ -0,0 +1,289 @@
+// Scintilla source code edit control
+/** @file LexSpecman.cxx
+ ** Lexer for Specman E language.
+ ** Written by Avi Yegudin, based on C++ lexer by Neil Hodgson
+ **/
+// Copyright 1998-2002 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+static inline bool IsAWordChar(const int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '.' || ch == '_' || ch == '\'');
+}
+
+static inline bool IsANumberChar(const int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '_' || ch == '\'');
+}
+
+static inline bool IsAWordStart(const int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '_' || ch == '`');
+}
+
+static void ColouriseSpecmanDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
+                            Accessor &styler, bool caseSensitive) {
+
+	WordList &keywords = *keywordlists[0];
+	WordList &keywords2 = *keywordlists[1];
+	WordList &keywords3 = *keywordlists[2];
+	WordList &keywords4 = *keywordlists[3];
+
+	// Do not leak onto next line
+	if (initStyle == SCE_SN_STRINGEOL)
+		initStyle = SCE_SN_CODE;
+
+	int visibleChars = 0;
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	for (; sc.More(); sc.Forward()) {
+
+		if (sc.atLineStart && (sc.state == SCE_SN_STRING)) {
+			// Prevent SCE_SN_STRINGEOL from leaking back to previous line
+			sc.SetState(SCE_SN_STRING);
+		}
+
+		// Handle line continuation generically.
+		if (sc.ch == '\\') {
+			if (sc.chNext == '\n' || sc.chNext == '\r') {
+				sc.Forward();
+				if (sc.ch == '\r' && sc.chNext == '\n') {
+					sc.Forward();
+				}
+				continue;
+			}
+		}
+
+		// Determine if the current state should terminate.
+		if (sc.state == SCE_SN_OPERATOR) {
+			sc.SetState(SCE_SN_CODE);
+		} else if (sc.state == SCE_SN_NUMBER) {
+			if (!IsANumberChar(sc.ch)) {
+				sc.SetState(SCE_SN_CODE);
+			}
+		} else if (sc.state == SCE_SN_IDENTIFIER) {
+			if (!IsAWordChar(sc.ch) || (sc.ch == '.')) {
+				char s[100];
+				if (caseSensitive) {
+					sc.GetCurrent(s, sizeof(s));
+				} else {
+					sc.GetCurrentLowered(s, sizeof(s));
+				}
+				if (keywords.InList(s)) {
+					sc.ChangeState(SCE_SN_WORD);
+				} else if (keywords2.InList(s)) {
+					sc.ChangeState(SCE_SN_WORD2);
+				} else if (keywords3.InList(s)) {
+                                        sc.ChangeState(SCE_SN_WORD3);
+				} else if (keywords4.InList(s)) {
+					sc.ChangeState(SCE_SN_USER);
+				}
+				sc.SetState(SCE_SN_CODE);
+			}
+		} else if (sc.state == SCE_SN_PREPROCESSOR) {
+                        if (IsASpace(sc.ch)) {
+                                sc.SetState(SCE_SN_CODE);
+                        }
+		} else if (sc.state == SCE_SN_DEFAULT) {
+			if (sc.Match('<', '\'')) {
+				sc.Forward();
+				sc.ForwardSetState(SCE_SN_CODE);
+			}
+		} else if (sc.state == SCE_SN_COMMENTLINE || sc.state == SCE_SN_COMMENTLINEBANG) {
+			if (sc.atLineEnd) {
+				sc.SetState(SCE_SN_CODE);
+				visibleChars = 0;
+			}
+		} else if (sc.state == SCE_SN_STRING) {
+			if (sc.ch == '\\') {
+				if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
+					sc.Forward();
+				}
+			} else if (sc.ch == '\"') {
+				sc.ForwardSetState(SCE_SN_CODE);
+			} else if (sc.atLineEnd) {
+				sc.ChangeState(SCE_SN_STRINGEOL);
+				sc.ForwardSetState(SCE_SN_CODE);
+				visibleChars = 0;
+			}
+		} else if (sc.state == SCE_SN_SIGNAL) {
+			if (sc.atLineEnd) {
+				sc.ChangeState(SCE_SN_STRINGEOL);
+				sc.ForwardSetState(SCE_SN_CODE);
+				visibleChars = 0;
+			} else if (sc.ch == '\\') {
+				if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
+					sc.Forward();
+				}
+			} else if (sc.ch == '\'') {
+				sc.ForwardSetState(SCE_SN_CODE);
+			}
+		} else if (sc.state == SCE_SN_REGEXTAG) {
+			if (!IsADigit(sc.ch)) {
+				sc.SetState(SCE_SN_CODE);
+			}
+		}
+
+		// Determine if a new state should be entered.
+		if (sc.state == SCE_SN_CODE) {
+			if (sc.ch == '$' && IsADigit(sc.chNext)) {
+				sc.SetState(SCE_SN_REGEXTAG);
+                                sc.Forward();
+			} else if (IsADigit(sc.ch)) {
+                                sc.SetState(SCE_SN_NUMBER);
+			} else if (IsAWordStart(sc.ch)) {
+				sc.SetState(SCE_SN_IDENTIFIER);
+			} else if (sc.Match('\'', '>')) {
+                                sc.SetState(SCE_SN_DEFAULT);
+				sc.Forward();	// Eat the * so it isn't used for the end of the comment
+			} else if (sc.Match('/', '/')) {
+				if (sc.Match("//!"))	// Nice to have a different comment style
+					sc.SetState(SCE_SN_COMMENTLINEBANG);
+				else
+					sc.SetState(SCE_SN_COMMENTLINE);
+			} else if (sc.Match('-', '-')) {
+				if (sc.Match("--!"))	// Nice to have a different comment style
+					sc.SetState(SCE_SN_COMMENTLINEBANG);
+				else
+					sc.SetState(SCE_SN_COMMENTLINE);
+			} else if (sc.ch == '\"') {
+				sc.SetState(SCE_SN_STRING);
+			} else if (sc.ch == '\'') {
+				sc.SetState(SCE_SN_SIGNAL);
+			} else if (sc.ch == '#' && visibleChars == 0) {
+				// Preprocessor commands are alone on their line
+				sc.SetState(SCE_SN_PREPROCESSOR);
+				// Skip whitespace between # and preprocessor word
+				do {
+					sc.Forward();
+				} while ((sc.ch == ' ' || sc.ch == '\t') && sc.More());
+				if (sc.atLineEnd) {
+					sc.SetState(SCE_SN_CODE);
+				}
+			} else if (isoperator(static_cast<char>(sc.ch)) || sc.ch == '@') {
+				sc.SetState(SCE_SN_OPERATOR);
+			}
+		}
+
+		if (sc.atLineEnd) {
+			// Reset states to begining of colourise so no surprises
+			// if different sets of lines lexed.
+			visibleChars = 0;
+		}
+		if (!IsASpace(sc.ch)) {
+			visibleChars++;
+		}
+	}
+	sc.Complete();
+}
+
+// Store both the current line's fold level and the next lines in the
+// level store to make it easy to pick up with each increment
+// and to make it possible to fiddle the current level for "} else {".
+static void FoldNoBoxSpecmanDoc(unsigned int startPos, int length, int,
+                            Accessor &styler) {
+	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
+	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	bool foldAtElse = styler.GetPropertyInt("fold.at.else", 0) != 0;
+	unsigned int endPos = startPos + length;
+	int visibleChars = 0;
+	int lineCurrent = styler.GetLine(startPos);
+	int levelCurrent = SC_FOLDLEVELBASE;
+	if (lineCurrent > 0)
+		levelCurrent = styler.LevelAt(lineCurrent-1) >> 16;
+	int levelMinCurrent = levelCurrent;
+	int levelNext = levelCurrent;
+	char chNext = styler[startPos];
+	int styleNext = styler.StyleAt(startPos);
+	int style;
+	for (unsigned int i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		//int stylePrev = style;
+		style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+		if (foldComment && (style == SCE_SN_COMMENTLINE)) {
+			if (((ch == '/') && (chNext == '/')) ||
+                            ((ch == '-') && (chNext == '-'))) {
+				char chNext2 = styler.SafeGetCharAt(i + 2);
+				if (chNext2 == '{') {
+					levelNext++;
+				} else if (chNext2 == '}') {
+					levelNext--;
+				}
+			}
+		}
+		if (style == SCE_SN_OPERATOR) {
+			if (ch == '{') {
+				// Measure the minimum before a '{' to allow
+				// folding on "} else {"
+				if (levelMinCurrent > levelNext) {
+					levelMinCurrent = levelNext;
+				}
+				levelNext++;
+			} else if (ch == '}') {
+				levelNext--;
+			}
+		}
+		if (atEOL) {
+			int levelUse = levelCurrent;
+			if (foldAtElse) {
+				levelUse = levelMinCurrent;
+			}
+			int lev = levelUse | levelNext << 16;
+			if (visibleChars == 0 && foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if (levelUse < levelNext)
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelCurrent = levelNext;
+			levelMinCurrent = levelCurrent;
+			visibleChars = 0;
+		}
+		if (!isspacechar(ch))
+			visibleChars++;
+	}
+}
+
+static void FoldSpecmanDoc(unsigned int startPos, int length, int initStyle, WordList *[],
+                       Accessor &styler) {
+	FoldNoBoxSpecmanDoc(startPos, length, initStyle, styler);
+}
+
+static const char * const specmanWordLists[] = {
+            "Primary keywords and identifiers",
+            "Secondary keywords and identifiers",
+            "Sequence keywords and identifiers",
+            "User defined keywords and identifiers",
+            "Unused",
+            0,
+        };
+
+static void ColouriseSpecmanDocSensitive(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
+                                     Accessor &styler) {
+	ColouriseSpecmanDoc(startPos, length, initStyle, keywordlists, styler, true);
+}
+
+
+LexerModule lmSpecman(SCLEX_SPECMAN, ColouriseSpecmanDocSensitive, "specman", FoldSpecmanDoc, specmanWordLists);
diff --git a/Documents/Scintilla/LexSpice.cxx b/Documents/Scintilla/LexSpice.cxx
new file mode 100644
index 0000000..b2953c0
--- /dev/null
+++ b/Documents/Scintilla/LexSpice.cxx
@@ -0,0 +1,225 @@
+// Scintilla source code edit control
+/** @file LexSpice.cxx
+ ** Lexer for Spice
+ **/
+// Copyright 2006 by Fabien Proriol
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdlib.h>
+#include <ctype.h>
+#include <string.h>
+#include <stdio.h>
+
+#include "Platform.h"
+
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "PropSet.h"
+#include "KeyWords.h"
+#include "SciLexer.h"
+#include "SString.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+/*
+ * Interface
+ */
+
+static void ColouriseDocument(
+    unsigned int startPos,
+    int length,
+    int initStyle,
+    WordList *keywordlists[],
+    Accessor &styler);
+
+static const char * const spiceWordListDesc[] = {
+    "Keywords",        // SPICE command
+    "Keywords2",    // SPICE functions
+    "Keywords3",    // SPICE params
+    0
+};
+
+LexerModule lmSpice(SCLEX_SPICE, ColouriseDocument, "spice", NULL, spiceWordListDesc);
+
+/*
+ * Implementation
+ */
+
+static void ColouriseComment(StyleContext& sc, bool& apostropheStartsAttribute);
+static void ColouriseDelimiter(StyleContext& sc, bool& apostropheStartsAttribute);
+static void ColouriseNumber(StyleContext& sc, bool& apostropheStartsAttribute);
+static void ColouriseWhiteSpace(StyleContext& sc, bool& apostropheStartsAttribute);
+static void ColouriseWord(StyleContext& sc, WordList& keywords, WordList& keywords2, WordList& keywords3, bool& apostropheStartsAttribute);
+
+static inline bool IsDelimiterCharacter(int ch);
+static inline bool IsNumberStartCharacter(int ch);
+static inline bool IsNumberCharacter(int ch);
+static inline bool IsSeparatorOrDelimiterCharacter(int ch);
+static inline bool IsWordStartCharacter(int ch);
+static inline bool IsWordCharacter(int ch);
+
+static void ColouriseComment(StyleContext& sc, bool&) {
+    sc.SetState(SCE_SPICE_COMMENTLINE);
+    while (!sc.atLineEnd) {
+        sc.Forward();
+    }
+}
+
+static void ColouriseDelimiter(StyleContext& sc, bool& apostropheStartsAttribute) {
+    apostropheStartsAttribute = sc.Match (')');
+    sc.SetState(SCE_SPICE_DELIMITER);
+    sc.ForwardSetState(SCE_SPICE_DEFAULT);
+}
+
+static void ColouriseNumber(StyleContext& sc, bool& apostropheStartsAttribute) {
+    apostropheStartsAttribute = true;
+    SString number;
+    sc.SetState(SCE_SPICE_NUMBER);
+    // Get all characters up to a delimiter or a separator, including points, but excluding
+    // double points (ranges).
+    while (!IsSeparatorOrDelimiterCharacter(sc.ch) || (sc.ch == '.' && sc.chNext != '.')) {
+        number += static_cast<char>(sc.ch);
+        sc.Forward();
+    }
+    // Special case: exponent with sign
+    if ((sc.chPrev == 'e' || sc.chPrev == 'E') &&
+            (sc.ch == '+' || sc.ch == '-')) {
+        number += static_cast<char>(sc.ch);
+        sc.Forward ();
+        while (!IsSeparatorOrDelimiterCharacter(sc.ch)) {
+            number += static_cast<char>(sc.ch);
+            sc.Forward();
+        }
+    }
+    sc.SetState(SCE_SPICE_DEFAULT);
+}
+
+static void ColouriseWhiteSpace(StyleContext& sc, bool& ) {
+    sc.SetState(SCE_SPICE_DEFAULT);
+    sc.ForwardSetState(SCE_SPICE_DEFAULT);
+}
+
+static void ColouriseWord(StyleContext& sc, WordList& keywords, WordList& keywords2, WordList& keywords3, bool& apostropheStartsAttribute) {
+    apostropheStartsAttribute = true;
+    sc.SetState(SCE_SPICE_IDENTIFIER);
+    SString word;
+    while (!sc.atLineEnd && !IsSeparatorOrDelimiterCharacter(sc.ch)) {
+        word += static_cast<char>(tolower(sc.ch));
+        sc.Forward();
+    }
+    if (keywords.InList(word.c_str())) {
+        sc.ChangeState(SCE_SPICE_KEYWORD);
+        if (word != "all") {
+            apostropheStartsAttribute = false;
+        }
+    }
+    else if (keywords2.InList(word.c_str())) {
+        sc.ChangeState(SCE_SPICE_KEYWORD2);
+        if (word != "all") {
+            apostropheStartsAttribute = false;
+        }
+    }
+    else if (keywords3.InList(word.c_str())) {
+        sc.ChangeState(SCE_SPICE_KEYWORD3);
+        if (word != "all") {
+            apostropheStartsAttribute = false;
+        }
+    }
+    sc.SetState(SCE_SPICE_DEFAULT);
+}
+
+//
+// ColouriseDocument
+//
+static void ColouriseDocument(
+    unsigned int startPos,
+    int length,
+    int initStyle,
+    WordList *keywordlists[],
+    Accessor &styler) {
+    WordList &keywords = *keywordlists[0];
+    WordList &keywords2 = *keywordlists[1];
+    WordList &keywords3 = *keywordlists[2];
+    StyleContext sc(startPos, length, initStyle, styler);
+    int lineCurrent = styler.GetLine(startPos);
+    bool apostropheStartsAttribute = (styler.GetLineState(lineCurrent) & 1) != 0;
+    while (sc.More()) {
+        if (sc.atLineEnd) {
+            // Go to the next line
+            sc.Forward();
+            lineCurrent++;
+            // Remember the line state for future incremental lexing
+            styler.SetLineState(lineCurrent, apostropheStartsAttribute);
+            // Don't continue any styles on the next line
+            sc.SetState(SCE_SPICE_DEFAULT);
+        }
+        // Comments
+        if ((sc.Match('*') && sc.atLineStart) || sc.Match('*','~')) {
+            ColouriseComment(sc, apostropheStartsAttribute);
+        // Whitespace
+        } else if (IsASpace(sc.ch)) {
+            ColouriseWhiteSpace(sc, apostropheStartsAttribute);
+        // Delimiters
+        } else if (IsDelimiterCharacter(sc.ch)) {
+            ColouriseDelimiter(sc, apostropheStartsAttribute);
+        // Numbers
+        } else if (IsADigit(sc.ch) || sc.ch == '#') {
+            ColouriseNumber(sc, apostropheStartsAttribute);
+        // Keywords or identifiers
+        } else {
+            ColouriseWord(sc, keywords, keywords2, keywords3, apostropheStartsAttribute);
+        }
+    }
+    sc.Complete();
+}
+
+static inline bool IsDelimiterCharacter(int ch) {
+    switch (ch) {
+    case '&':
+    case '\'':
+    case '(':
+    case ')':
+    case '*':
+    case '+':
+    case ',':
+    case '-':
+    case '.':
+    case '/':
+    case ':':
+    case ';':
+    case '<':
+    case '=':
+    case '>':
+    case '|':
+        return true;
+    default:
+        return false;
+    }
+}
+
+static inline bool IsNumberCharacter(int ch) {
+    return IsNumberStartCharacter(ch) ||
+           ch == '_' ||
+           ch == '.' ||
+           ch == '#' ||
+           (ch >= 'a' && ch <= 'f') ||
+           (ch >= 'A' && ch <= 'F');
+}
+
+static inline bool IsNumberStartCharacter(int ch) {
+    return IsADigit(ch);
+}
+
+static inline bool IsSeparatorOrDelimiterCharacter(int ch) {
+    return IsASpace(ch) || IsDelimiterCharacter(ch);
+}
+
+static inline bool IsWordCharacter(int ch) {
+    return IsWordStartCharacter(ch) || IsADigit(ch);
+}
+
+static inline bool IsWordStartCharacter(int ch) {
+    return (isascii(ch) && isalpha(ch)) || ch == '_';
+}
diff --git a/Documents/Scintilla/LexTADS3.cxx b/Documents/Scintilla/LexTADS3.cxx
new file mode 100644
index 0000000..7cc85f1
--- /dev/null
+++ b/Documents/Scintilla/LexTADS3.cxx
@@ -0,0 +1,904 @@
+// Scintilla source code edit control
+/** @file LexTADS3.cxx
+ ** Lexer for TADS3.
+ **/
+// Copyright 1998-2006 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+/*
+ * TADS3 is a language designed by Michael J. Roberts for the writing of text
+ * based games.  TADS comes from Text Adventure Development System.  It has good
+ * support for the processing and outputting of formatted text and much of a
+ * TADS program listing consists of strings.
+ *
+ * TADS has two types of strings, those enclosed in single quotes (') and those
+ * enclosed in double quotes (").  These strings have different symantics and
+ * can be given different highlighting if desired.
+ *
+ * There can be embedded within both types of strings html tags
+ * ( <tag key=value> ), library directives ( <.directive> ), and message
+ * parameters ( {The doctor's/his} ).
+ *
+ * Double quoted strings can also contain interpolated expressions
+ * ( << rug.moved ? ' and a hole in the floor. ' : nil >> ).  These expressions
+ * may themselves contain single or double quoted strings, although the double
+ * quoted strings may not contain interpolated expressions.
+ *
+ * These embedded constructs influence the output and formatting and are an
+ * important part of a program and require highlighting.
+ *
+ * LINKS
+ * http://www.tads.org/
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+static const int T3_SINGLE_QUOTE = 1;
+static const int T3_INT_EXPRESSION = 2;
+static const int T3_INT_EXPRESSION_IN_TAG = 4;
+static const int T3_HTML_SQUOTE = 8;
+
+static inline bool IsEOL(const int ch, const int chNext) {
+        return (ch == '\r' && chNext != '\n') || (ch == '\n');
+}
+
+/*
+ *   Test the current character to see if it's the START of an EOL sequence;
+ *   if so, skip ahead to the last character of the sequence and return true,
+ *   and if not just return false.  There are a few places where we want to
+ *   check to see if a newline sequence occurs at a particular point, but
+ *   where a caller expects a subroutine to stop only upon reaching the END
+ *   of a newline sequence (in particular, CR-LF on Windows).  That's why
+ *   IsEOL() above only returns true on CR if the CR isn't followed by an LF
+ *   - it doesn't want to admit that there's a newline until reaching the END
+ *   of the sequence.  We meet both needs by saying that there's a newline
+ *   when we see the CR in a CR-LF, but skipping the CR before returning so
+ *   that the caller's caller will see that we've stopped at the LF.  
+ */
+static inline bool IsEOLSkip(StyleContext &sc)
+{
+    /* test for CR-LF */
+    if (sc.ch == '\r' && sc.chNext == '\n')
+    {
+        /* got CR-LF - skip the CR and indicate that we're at a newline */
+        sc.Forward();
+        return true;
+    }
+
+    /* 
+     *   in other cases, we have at most a 1-character newline, so do the
+     *   normal IsEOL test 
+     */
+    return IsEOL(sc.ch, sc.chNext);
+}
+
+static inline bool IsASpaceOrTab(const int ch) {
+        return ch == ' ' || ch == '\t';
+}
+
+static inline bool IsATADS3Operator(const int ch) {
+        return ch == '=' || ch == '{' || ch == '}' || ch == '(' || ch == ')'
+                || ch == '[' || ch == ']' || ch == ',' || ch == ':' || ch == ';'
+                || ch == '+' || ch == '-' || ch == '*' || ch == '/' || ch == '%'
+                || ch == '?' || ch == '!' || ch == '<' || ch == '>' || ch == '|'
+                || ch == '@' || ch == '&' || ch == '~';
+}
+
+static inline bool IsAWordChar(const int ch) {
+        return isalnum(ch) || ch == '_';
+}
+
+static inline bool IsAWordStart(const int ch) {
+        return isalpha(ch) || ch == '_';
+}
+
+static inline bool IsAHexDigit(const int ch) {
+        int lch = tolower(ch);
+        return isdigit(lch) || lch == 'a' || lch == 'b' || lch == 'c'
+                || lch == 'd' || lch == 'e' || lch == 'f';
+}
+
+static inline bool IsAnHTMLChar(int ch) {
+        return isalnum(ch) || ch == '-' || ch == '_' || ch == '.';
+}
+
+static inline bool IsADirectiveChar(int ch) {
+        return isalnum(ch) || isspace(ch) || ch == '-' || ch == '/';
+}
+
+static inline bool IsANumberStart(StyleContext &sc) {
+        return isdigit(sc.ch)
+                || (!isdigit(sc.chPrev) && sc.ch == '.' && isdigit(sc.chNext));
+}
+
+inline static void ColouriseTADS3Operator(StyleContext &sc) {
+        int initState = sc.state;
+        int c = sc.ch;
+        sc.SetState(c == '{' || c == '}' ? SCE_T3_BRACE : SCE_T3_OPERATOR);
+        sc.ForwardSetState(initState);
+}
+
+static void ColouriseTADSHTMLString(StyleContext &sc, int &lineState) {
+        int endState = sc.state;
+        int chQuote = sc.ch;
+        int chString = (lineState & T3_SINGLE_QUOTE) ? '\'' : '"';
+        if (endState == SCE_T3_HTML_STRING) {
+                if (lineState&T3_SINGLE_QUOTE) {
+                        endState = SCE_T3_S_STRING;
+                        chString = '\'';
+                } else if (lineState&T3_INT_EXPRESSION) {
+                        endState = SCE_T3_X_STRING;
+                        chString = '"';
+                } else {
+                        endState = SCE_T3_HTML_DEFAULT;
+                        chString = '"';
+                }
+                chQuote = (lineState & T3_HTML_SQUOTE) ? '\'' : '"';
+        } else {
+                sc.SetState(SCE_T3_HTML_STRING);
+                sc.Forward();
+        }
+        if (chQuote == '"')
+                lineState &= ~T3_HTML_SQUOTE; 
+        else
+                lineState |= T3_HTML_SQUOTE;
+
+        while (sc.More()) {
+                if (IsEOL(sc.ch, sc.chNext)) {
+                        return;
+                }
+                if (sc.ch == chQuote) {
+                        sc.ForwardSetState(endState);
+                        return;
+                }
+                if (sc.Match('\\', static_cast<char>(chQuote))) {
+                        sc.Forward(2);
+                        sc.SetState(endState);
+                        return;
+                }
+                if (sc.ch == chString) {
+                        sc.SetState(SCE_T3_DEFAULT);
+                        return;
+                }
+
+                if (sc.Match('<', '<')) {
+                        lineState |= T3_INT_EXPRESSION | T3_INT_EXPRESSION_IN_TAG;
+                        sc.SetState(SCE_T3_X_DEFAULT);
+                        sc.Forward(2);
+                        return;
+                }
+
+                if (sc.Match('\\', static_cast<char>(chQuote))
+                        || sc.Match('\\', static_cast<char>(chString))
+                        || sc.Match('\\', '\\')) {
+                        sc.Forward(2);
+                } else {
+                        sc.Forward();
+                }
+        }
+}
+
+static void ColouriseTADS3HTMLTagStart(StyleContext &sc) {
+        sc.SetState(SCE_T3_HTML_TAG);
+        sc.Forward();
+        if (sc.ch == '/') {
+                sc.Forward();
+        }
+        while (IsAnHTMLChar(sc.ch)) {
+                sc.Forward();
+        }
+}
+
+static void ColouriseTADS3HTMLTag(StyleContext &sc, int &lineState) {
+        int endState = sc.state;
+        int chQuote = '"';
+        int chString = '\'';
+        switch (endState) {
+                case SCE_T3_S_STRING:
+                        ColouriseTADS3HTMLTagStart(sc);
+                        sc.SetState(SCE_T3_HTML_DEFAULT);
+                        chQuote = '\'';
+                        chString = '"';
+                        break;
+                case SCE_T3_D_STRING:
+                case SCE_T3_X_STRING:
+                        ColouriseTADS3HTMLTagStart(sc);
+                        sc.SetState(SCE_T3_HTML_DEFAULT);
+                        break;
+                case SCE_T3_HTML_DEFAULT:
+                        if (lineState&T3_SINGLE_QUOTE) {
+                                endState = SCE_T3_S_STRING;
+                                chQuote = '\'';
+                                chString = '"';
+                        } else if (lineState&T3_INT_EXPRESSION) {
+                                endState = SCE_T3_X_STRING;
+                        } else {
+                                endState = SCE_T3_D_STRING;
+                        }
+                        break;
+        }
+
+        while (sc.More()) {
+                if (IsEOL(sc.ch, sc.chNext)) {
+                        return;
+                }
+                if (sc.Match('/', '>')) {
+                        sc.SetState(SCE_T3_HTML_TAG);
+                        sc.Forward(2);
+                        sc.SetState(endState);
+                        return;
+                }
+                if (sc.ch == '>') {
+                        sc.SetState(SCE_T3_HTML_TAG);
+                        sc.ForwardSetState(endState);
+                        return;
+                }
+                if (sc.ch == chQuote) {
+                        sc.SetState(endState);
+                        return;
+                }
+                if (sc.Match('\\', static_cast<char>(chQuote))) {
+                        sc.Forward();
+                        ColouriseTADSHTMLString(sc, lineState);
+                        if (sc.state == SCE_T3_X_DEFAULT)
+                            break;
+                } else if (sc.ch == chString) {
+                        ColouriseTADSHTMLString(sc, lineState);
+                } else if (sc.ch == '=') {
+                        ColouriseTADS3Operator(sc);
+                } else {
+                        sc.Forward();
+                }
+        }
+}
+
+static void ColouriseTADS3Keyword(StyleContext &sc,
+                                                        WordList *keywordlists[],       unsigned int endPos) {
+        char s[250];
+        WordList &keywords = *keywordlists[0];
+        WordList &userwords1 = *keywordlists[1];
+        WordList &userwords2 = *keywordlists[2];
+        WordList &userwords3 = *keywordlists[3];
+        int initState = sc.state;
+        sc.SetState(SCE_T3_IDENTIFIER);
+        while (sc.More() && (IsAWordChar(sc.ch))) {
+                sc.Forward();
+        }
+        sc.GetCurrent(s, sizeof(s));
+        if ( strcmp(s, "is") == 0 || strcmp(s, "not") == 0) {
+                // have to find if "in" is next
+                int n = 1;
+                while (n + sc.currentPos < endPos && IsASpaceOrTab(sc.GetRelative(n)))
+                        n++;
+                if (sc.GetRelative(n) == 'i' && sc.GetRelative(n+1) == 'n') {
+                        sc.Forward(n+2);
+                        sc.ChangeState(SCE_T3_KEYWORD);
+                }
+        } else if (keywords.InList(s)) {
+                sc.ChangeState(SCE_T3_KEYWORD);
+        } else if (userwords3.InList(s)) {
+                sc.ChangeState(SCE_T3_USER3);
+        } else if (userwords2.InList(s)) {
+                sc.ChangeState(SCE_T3_USER2);
+        } else if (userwords1.InList(s)) {
+                sc.ChangeState(SCE_T3_USER1);
+        }
+        sc.SetState(initState);
+}
+
+static void ColouriseTADS3MsgParam(StyleContext &sc, int &lineState) {
+        int endState = sc.state;
+        int chQuote = '"';
+        switch (endState) {
+                case SCE_T3_S_STRING:
+                        sc.SetState(SCE_T3_MSG_PARAM);
+                        sc.Forward();
+                        chQuote = '\'';
+                        break;
+                case SCE_T3_D_STRING:
+                case SCE_T3_X_STRING:
+                        sc.SetState(SCE_T3_MSG_PARAM);
+                        sc.Forward();
+                        break;
+                case SCE_T3_MSG_PARAM:
+                        if (lineState&T3_SINGLE_QUOTE) {
+                                endState = SCE_T3_S_STRING;
+                                chQuote = '\'';
+                        } else if (lineState&T3_INT_EXPRESSION) {
+                                endState = SCE_T3_X_STRING;
+                        } else {
+                                endState = SCE_T3_D_STRING;
+                        }
+                        break;
+        }
+        while (sc.More() && sc.ch != '}' && sc.ch != chQuote) {
+                if (IsEOL(sc.ch, sc.chNext)) {
+                        return;
+                }
+                if (sc.ch == '\\') {
+                        sc.Forward();
+                }
+                sc.Forward();
+        }
+        if (sc.ch == chQuote) {
+                sc.SetState(endState);
+        } else {
+                sc.ForwardSetState(endState);
+        }
+}
+
+static void ColouriseTADS3LibDirective(StyleContext &sc, int &lineState) {
+        int initState = sc.state;
+        int chQuote = '"';
+        switch (initState) {
+                case SCE_T3_S_STRING:
+                        sc.SetState(SCE_T3_LIB_DIRECTIVE);
+                        sc.Forward(2);
+                        chQuote = '\'';
+                        break;
+                case SCE_T3_D_STRING:
+                        sc.SetState(SCE_T3_LIB_DIRECTIVE);
+                        sc.Forward(2);
+                        break;
+                case SCE_T3_LIB_DIRECTIVE:
+                        if (lineState&T3_SINGLE_QUOTE) {
+                                initState = SCE_T3_S_STRING;
+                                chQuote = '\'';
+                        } else {
+                                initState = SCE_T3_D_STRING;
+                        }
+                        break;
+        }
+        while (sc.More() && IsADirectiveChar(sc.ch)) {
+                if (IsEOL(sc.ch, sc.chNext)) {
+                        return;
+                }
+                sc.Forward();
+        };
+        if (sc.ch == '>' || !sc.More()) {
+                sc.ForwardSetState(initState);
+        } else if (sc.ch == chQuote) {
+                sc.SetState(initState);
+        } else {
+                sc.ChangeState(initState);
+                sc.Forward();
+        }
+}
+
+static void ColouriseTADS3String(StyleContext &sc, int &lineState) {
+        int chQuote = sc.ch;
+        int endState = sc.state;
+        switch (sc.state) {
+                case SCE_T3_DEFAULT:
+                case SCE_T3_X_DEFAULT:
+                        if (chQuote == '"') {
+                                if (sc.state == SCE_T3_DEFAULT) {
+                                        sc.SetState(SCE_T3_D_STRING);
+                                } else {
+                                        sc.SetState(SCE_T3_X_STRING);
+                                }
+                                lineState &= ~T3_SINGLE_QUOTE;
+                        } else {
+                                sc.SetState(SCE_T3_S_STRING);
+                                lineState |= T3_SINGLE_QUOTE;
+                        }
+                        sc.Forward();
+                        break;
+                case SCE_T3_S_STRING:
+                        chQuote = '\'';
+                        endState = lineState&T3_INT_EXPRESSION ?
+                                SCE_T3_X_DEFAULT : SCE_T3_DEFAULT;
+                        break;
+                case SCE_T3_D_STRING:
+                        chQuote = '"';
+                        endState = SCE_T3_DEFAULT;
+                        break;
+                case SCE_T3_X_STRING:
+                        chQuote = '"';
+                        endState = SCE_T3_X_DEFAULT;
+                        break;
+        }
+        while (sc.More()) {
+                if (IsEOL(sc.ch, sc.chNext)) {
+                        return;
+                }
+                if (sc.ch == chQuote) {
+                        sc.ForwardSetState(endState);
+                        return;
+                }
+                if (sc.state == SCE_T3_D_STRING && sc.Match('<', '<')) {
+                        lineState |= T3_INT_EXPRESSION;
+                        sc.SetState(SCE_T3_X_DEFAULT);
+                        sc.Forward(2);
+                        return;
+                }
+                if (sc.Match('\\', static_cast<char>(chQuote))
+                    || sc.Match('\\', '\\')) {
+                        sc.Forward(2);
+                } else if (sc.ch == '{') {
+                        ColouriseTADS3MsgParam(sc, lineState);
+                } else if (sc.Match('<', '.')) {
+                        ColouriseTADS3LibDirective(sc, lineState);
+                } else if (sc.ch == '<') {
+                        ColouriseTADS3HTMLTag(sc, lineState);
+                        if (sc.state == SCE_T3_X_DEFAULT)
+                                return;
+                } else {
+                        sc.Forward();
+                }
+        }
+}
+
+static void ColouriseTADS3Comment(StyleContext &sc, int endState) {
+        sc.SetState(SCE_T3_BLOCK_COMMENT);
+        while (sc.More()) {
+                if (IsEOL(sc.ch, sc.chNext)) {
+                        return;
+                }
+                if (sc.Match('*', '/')) {
+                        sc.Forward(2);
+                        sc.SetState(endState);
+                        return;
+                }
+                sc.Forward();
+        }
+}
+
+static void ColouriseToEndOfLine(StyleContext &sc, int initState, int endState) {
+        sc.SetState(initState);
+        while (sc.More()) {
+                if (sc.ch == '\\') {
+                        sc.Forward();
+                        if (IsEOLSkip(sc)) {
+                                        return;
+                        }
+                }
+                if (IsEOL(sc.ch, sc.chNext)) {
+                        sc.SetState(endState);
+                        return;
+                }
+                sc.Forward();
+        }
+}
+
+static void ColouriseTADS3Number(StyleContext &sc) {
+        int endState = sc.state;
+        bool inHexNumber = false;
+        bool seenE = false;
+        bool seenDot = sc.ch == '.';
+        sc.SetState(SCE_T3_NUMBER);
+        if (sc.More()) {
+                sc.Forward();
+        }
+        if (sc.chPrev == '0' && tolower(sc.ch) == 'x') {
+                inHexNumber = true;
+                sc.Forward();
+        }
+        while (sc.More()) {
+                if (inHexNumber) {
+                        if (!IsAHexDigit(sc.ch)) {
+                                break;
+                        }
+                } else if (!isdigit(sc.ch)) {
+                        if (!seenE && tolower(sc.ch) == 'e') {
+                                seenE = true;
+                                seenDot = true;
+                                if (sc.chNext == '+' || sc.chNext == '-') {
+                                        sc.Forward();
+                                }
+                        } else if (!seenDot && sc.ch == '.') {
+                                seenDot = true;
+                        } else {
+                                break;
+                        }
+                }
+                sc.Forward();
+        }
+        sc.SetState(endState);
+}
+
+static void ColouriseTADS3Doc(unsigned int startPos, int length, int initStyle,
+                                                           WordList *keywordlists[], Accessor &styler) {
+        int visibleChars = 0;
+        int bracketLevel = 0;
+        int lineState = 0;
+        unsigned int endPos = startPos + length;
+        int lineCurrent = styler.GetLine(startPos);
+        if (lineCurrent > 0) {
+                lineState = styler.GetLineState(lineCurrent-1);
+        }
+        StyleContext sc(startPos, length, initStyle, styler);
+
+        while (sc.More()) {
+
+                if (IsEOL(sc.ch, sc.chNext)) {
+                        styler.SetLineState(lineCurrent, lineState);
+                        lineCurrent++;
+                        visibleChars = 0;
+                        sc.Forward();
+                        if (sc.ch == '\n') {
+                                sc.Forward();
+                        }
+                }
+
+                switch(sc.state) {
+                        case SCE_T3_PREPROCESSOR:
+                        case SCE_T3_LINE_COMMENT:
+                                ColouriseToEndOfLine(sc, sc.state, lineState&T3_INT_EXPRESSION ?
+                                        SCE_T3_X_DEFAULT : SCE_T3_DEFAULT);
+                                break;
+                        case SCE_T3_S_STRING:
+                        case SCE_T3_D_STRING:
+                        case SCE_T3_X_STRING:
+                                ColouriseTADS3String(sc, lineState);
+                                visibleChars++;
+                                break;
+                        case SCE_T3_MSG_PARAM:
+                                ColouriseTADS3MsgParam(sc, lineState);
+                                break;
+                        case SCE_T3_LIB_DIRECTIVE:
+                                ColouriseTADS3LibDirective(sc, lineState);
+                                break;
+                        case SCE_T3_HTML_DEFAULT:
+                                ColouriseTADS3HTMLTag(sc, lineState);
+                                break;
+                        case SCE_T3_HTML_STRING:
+                                ColouriseTADSHTMLString(sc, lineState);
+                                break;
+                        case SCE_T3_BLOCK_COMMENT:
+                                ColouriseTADS3Comment(sc, lineState&T3_INT_EXPRESSION ?
+                                        SCE_T3_X_DEFAULT : SCE_T3_DEFAULT);
+                                break;
+                        case SCE_T3_DEFAULT:
+                        case SCE_T3_X_DEFAULT:
+                                if (IsASpaceOrTab(sc.ch)) {
+                                        sc.Forward();
+                                } else if (sc.ch == '#' && visibleChars == 0) {
+                                        ColouriseToEndOfLine(sc, SCE_T3_PREPROCESSOR, sc.state);
+                                } else if (sc.Match('/', '*')) {
+                                        ColouriseTADS3Comment(sc, sc.state);
+                                        visibleChars++;
+                                } else if (sc.Match('/', '/')) {
+                                        ColouriseToEndOfLine(sc, SCE_T3_LINE_COMMENT, sc.state);
+                                } else if (sc.ch == '"') {
+                                        bracketLevel = 0;
+                                        ColouriseTADS3String(sc, lineState);
+                                        visibleChars++;
+                                } else if (sc.ch == '\'') {
+                                        ColouriseTADS3String(sc, lineState);
+                                        visibleChars++;
+                                } else if (sc.state == SCE_T3_X_DEFAULT && bracketLevel == 0
+                                                   && sc.Match('>', '>')) {
+                                        sc.Forward(2);
+                                        sc.SetState(SCE_T3_D_STRING);
+                                        if (lineState & T3_INT_EXPRESSION_IN_TAG)
+                                                sc.SetState(SCE_T3_HTML_STRING);
+                                        lineState &= ~(T3_SINGLE_QUOTE|T3_INT_EXPRESSION
+                                                       |T3_INT_EXPRESSION_IN_TAG);
+                                } else if (IsATADS3Operator(sc.ch)) {
+                                        if (sc.state == SCE_T3_X_DEFAULT) {
+                                                if (sc.ch == '(') {
+                                                        bracketLevel++;
+                                                } else if (sc.ch == ')' && bracketLevel > 0) {
+                                                        bracketLevel--;
+                                                }
+                                        }
+                                        ColouriseTADS3Operator(sc);
+                                        visibleChars++;
+                                } else if (IsANumberStart(sc)) {
+                                        ColouriseTADS3Number(sc);
+                                        visibleChars++;
+                                } else if (IsAWordStart(sc.ch)) {
+                                        ColouriseTADS3Keyword(sc, keywordlists, endPos);
+                                        visibleChars++;
+                                } else if (sc.Match("...")) {
+                                        sc.SetState(SCE_T3_IDENTIFIER);
+                                        sc.Forward(3);
+                                        sc.SetState(SCE_T3_DEFAULT);
+                                } else {
+                                        sc.Forward();
+                                        visibleChars++;
+                                }
+                                break;
+                        default:
+                                sc.SetState(SCE_T3_DEFAULT);
+                                sc.Forward();
+                }
+        }
+        sc.Complete();
+}
+
+/*
+ TADS3 has two styles of top level block (TLB). Eg
+
+ // default style
+ silverKey : Key 'small silver key' 'small silver key'
+        "A small key glints in the sunlight. "
+ ;
+
+ and
+
+ silverKey : Key {
+        'small silver key'
+        'small silver key'
+        "A small key glints in the sunlight. "
+ }
+
+ Some constructs mandate one or the other, but usually the author has may choose
+ either.
+
+ T3_SEENSTART is used to indicate that a braceless TLB has been (potentially)
+ seen and is also used to match the closing ';' of the default style.
+
+ T3_EXPECTINGIDENTIFIER and T3_EXPECTINGPUNCTUATION are used to keep track of
+ what characters may be seen without incrementing the block level.  The general
+ pattern is identifier <punc> identifier, acceptable punctuation characters
+ are ':', ',', '(' and ')'.  No attempt is made to ensure that punctuation
+ characters are syntactically correct, eg parentheses match. A ')' always
+ signifies the start of a block.  We just need to check if it is followed by a
+ '{', in which case we let the brace handling code handle the folding level.
+
+ expectingIdentifier == false && expectingIdentifier == false
+ Before the start of a TLB.
+
+ expectingIdentifier == true && expectingIdentifier == true
+ Currently in an identifier.  Will accept identifier or punctuation.
+
+ expectingIdentifier == true && expectingIdentifier == false
+ Just seen a punctuation character & now waiting for an identifier to start.
+
+ expectingIdentifier == false && expectingIdentifier == truee
+ We were in an identifier and have seen space.  Now waiting to see a punctuation
+ character
+
+ Space, comments & preprocessor directives are always acceptable and are
+ equivalent.
+*/
+
+static const int T3_SEENSTART = 1 << 12;
+static const int T3_EXPECTINGIDENTIFIER = 1 << 13;
+static const int T3_EXPECTINGPUNCTUATION = 1 << 14;
+
+static inline bool IsStringTransition(int s1, int s2) {
+        return s1 != s2
+                && (s1 == SCE_T3_S_STRING || s1 == SCE_T3_X_STRING
+                        || s1 == SCE_T3_D_STRING && s2 != SCE_T3_X_DEFAULT)
+                && s2 != SCE_T3_LIB_DIRECTIVE
+                && s2 != SCE_T3_MSG_PARAM
+                && s2 != SCE_T3_HTML_TAG
+                && s2 != SCE_T3_HTML_STRING;
+}
+
+static inline bool IsATADS3Punctuation(const int ch) {
+        return ch == ':' || ch == ',' || ch == '(' || ch == ')';
+}
+
+static inline bool IsAnIdentifier(const int style) {
+        return style == SCE_T3_IDENTIFIER
+                || style == SCE_T3_USER1
+                || style == SCE_T3_USER2
+                || style == SCE_T3_USER3;
+}
+
+static inline bool IsAnOperator(const int style) {
+    return style == SCE_T3_OPERATOR || SCE_T3_BRACE;
+}
+
+static inline bool IsSpaceEquivalent(const int ch, const int style) {
+        return isspace(ch)
+                || style == SCE_T3_BLOCK_COMMENT
+                || style == SCE_T3_LINE_COMMENT
+                || style == SCE_T3_PREPROCESSOR;
+}
+
+static char peekAhead(unsigned int startPos, unsigned int endPos,
+                                          Accessor &styler) {
+        for (unsigned int i = startPos; i < endPos; i++) {
+                int style = styler.StyleAt(i);
+                char ch = styler[i];
+                if (!IsSpaceEquivalent(ch, style)) {
+                        if (IsAnIdentifier(style)) {
+                                return 'a';
+                        }
+                        if (IsATADS3Punctuation(ch)) {
+                                return ':';
+                        }
+                        if (ch == '{') {
+                                return '{';
+                        }
+                        return '*';
+                }
+        }
+        return ' ';
+}
+
+static void FoldTADS3Doc(unsigned int startPos, int length, int initStyle,
+                            WordList *[], Accessor &styler) {
+        unsigned int endPos = startPos + length;
+        int lineCurrent = styler.GetLine(startPos);
+        int levelCurrent = SC_FOLDLEVELBASE;
+        if (lineCurrent > 0)
+                levelCurrent = styler.LevelAt(lineCurrent-1) >> 16;
+        int seenStart = levelCurrent & T3_SEENSTART;
+        int expectingIdentifier = levelCurrent & T3_EXPECTINGIDENTIFIER;
+        int expectingPunctuation = levelCurrent & T3_EXPECTINGPUNCTUATION;
+        levelCurrent &= SC_FOLDLEVELNUMBERMASK;
+        int levelMinCurrent = levelCurrent;
+        int levelNext = levelCurrent;
+        char chNext = styler[startPos];
+        int styleNext = styler.StyleAt(startPos);
+        int style = initStyle;
+        char ch = chNext;
+        int stylePrev = style;
+        bool redo = false;
+        for (unsigned int i = startPos; i < endPos; i++) {
+                if (redo) {
+                        redo = false;
+                        i--;
+                } else {
+                        ch = chNext;
+                        chNext = styler.SafeGetCharAt(i + 1);
+                        stylePrev = style;
+                        style = styleNext;
+                        styleNext = styler.StyleAt(i + 1);
+                }
+                bool atEOL = IsEOL(ch, chNext);
+
+                if (levelNext == SC_FOLDLEVELBASE) {
+                        if (IsSpaceEquivalent(ch, style)) {
+                                if (expectingPunctuation) {
+                                        expectingIdentifier = 0;
+                                }
+                                if (style == SCE_T3_BLOCK_COMMENT) {
+                                        levelNext++;
+                                }
+                        } else if (ch == '{') {
+                                levelNext++;
+                                seenStart = 0;
+                        } else if (ch == '\'' || ch == '"' || ch == '[') {
+                                levelNext++;
+                                if (seenStart) {
+                                        redo = true;
+                                }
+                        } else if (ch == ';') {
+                                seenStart = 0;
+                                expectingIdentifier = 0;
+                                expectingPunctuation = 0;
+                        } else if (expectingIdentifier && expectingPunctuation) {
+                                if (IsATADS3Punctuation(ch)) {
+                                        if (ch == ')' && peekAhead(i+1, endPos, styler) != '{') {
+                                                levelNext++;
+                                        } else {
+                                                expectingPunctuation = 0;
+                                        }
+                                } else if (!IsAnIdentifier(style)) {
+                                        levelNext++;
+                                }
+                        } else if (expectingIdentifier && !expectingPunctuation) {
+                                if (!IsAnIdentifier(style)) {
+                                        levelNext++;
+                                } else {
+                                        expectingPunctuation = T3_EXPECTINGPUNCTUATION;
+                                }
+                        } else if (!expectingIdentifier && expectingPunctuation) {
+                                if (!IsATADS3Punctuation(ch)) {
+                                        levelNext++;
+                                } else {
+                                        if (ch == ')' && peekAhead(i+1, endPos, styler) != '{') {
+                                                levelNext++;
+                                        } else {
+                                                expectingIdentifier = T3_EXPECTINGIDENTIFIER;
+                                                expectingPunctuation = 0;
+                                        }
+                                }
+                        } else if (!expectingIdentifier && !expectingPunctuation) {
+                                if (IsAnIdentifier(style)) {
+                                        seenStart = T3_SEENSTART;
+                                        expectingIdentifier = T3_EXPECTINGIDENTIFIER;
+                                        expectingPunctuation = T3_EXPECTINGPUNCTUATION;
+                                }
+                        }
+
+                        if (levelNext != SC_FOLDLEVELBASE && style != SCE_T3_BLOCK_COMMENT) {
+                                expectingIdentifier = 0;
+                                expectingPunctuation = 0;
+                        }
+
+                } else if (levelNext == SC_FOLDLEVELBASE+1 && seenStart
+                                   && ch == ';' && IsAnOperator(style)) {
+                        levelNext--;
+                        seenStart = 0;
+                } else if (style == SCE_T3_BLOCK_COMMENT) {
+                        if (stylePrev != SCE_T3_BLOCK_COMMENT) {
+                                levelNext++;
+                        } else if (styleNext != SCE_T3_BLOCK_COMMENT && !atEOL) {
+                                // Comments don't end at end of line and the next character may be unstyled.
+                                levelNext--;
+                        }
+                } else if (ch == '\'' || ch == '"') {
+                        if (IsStringTransition(style, stylePrev)) {
+                                if (levelMinCurrent > levelNext) {
+                                        levelMinCurrent = levelNext;
+                                }
+                                levelNext++;
+                        } else if (IsStringTransition(style, styleNext)) {
+                                levelNext--;
+                        }
+                } else if (IsAnOperator(style)) {
+                        if (ch == '{' || ch == '[') {
+                                // Measure the minimum before a '{' to allow
+                                // folding on "} else {"
+                                if (levelMinCurrent > levelNext) {
+                                        levelMinCurrent = levelNext;
+                                }
+                                levelNext++;
+                        } else if (ch == '}' || ch == ']') {
+                                levelNext--;
+                        }
+                }
+
+                if (atEOL) {
+                        if (seenStart && levelNext == SC_FOLDLEVELBASE) {
+                                switch (peekAhead(i+1, endPos, styler)) {
+                                        case ' ':
+                                        case '{':
+                                                break;
+                                        case '*':
+                                                levelNext++;
+                                                break;
+                                        case 'a':
+                                                if (expectingPunctuation) {
+                                                        levelNext++;
+                                                }
+                                                break;
+                                        case ':':
+                                                if (expectingIdentifier) {
+                                                        levelNext++;
+                                                }
+                                                break;
+                                }
+                                if (levelNext != SC_FOLDLEVELBASE) {
+                                        expectingIdentifier = 0;
+                                        expectingPunctuation = 0;
+                                }
+                        }
+                        int lev = levelMinCurrent | (levelNext | expectingIdentifier
+                                | expectingPunctuation | seenStart) << 16;
+                        if (levelMinCurrent < levelNext)
+                                lev |= SC_FOLDLEVELHEADERFLAG;
+                        if (lev != styler.LevelAt(lineCurrent)) {
+                                styler.SetLevel(lineCurrent, lev);
+                        }
+                        lineCurrent++;
+                        levelCurrent = levelNext;
+                        levelMinCurrent = levelCurrent;
+                }
+        }
+}
+
+static const char * const tads3WordList[] = {
+        "TADS3 Keywords",
+        "User defined 1",
+        "User defined 2",
+        "User defined 3",
+        0
+};
+
+LexerModule lmTADS3(SCLEX_TADS3, ColouriseTADS3Doc, "tads3", FoldTADS3Doc, tads3WordList);
diff --git a/Documents/Scintilla/LexTCL.cxx b/Documents/Scintilla/LexTCL.cxx
new file mode 100644
index 0000000..3c175de
--- /dev/null
+++ b/Documents/Scintilla/LexTCL.cxx
@@ -0,0 +1,366 @@
+// Scintilla source code edit control
+/** @file LexTCL.cxx
+ ** Lexer for TCL language.
+ **/
+// Copyright 1998-2001 by Andre Arpin <arpin@kingston.net>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdarg.h>
+#include <stdio.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+// Extended to accept accented characters
+static inline bool IsAWordChar(int ch) {
+	return ch >= 0x80 ||
+        (isalnum(ch) || ch == '_' || ch ==':' || ch=='.'); // : name space separator
+}
+
+static inline bool IsAWordStart(int ch) {
+	return ch >= 0x80 || (ch ==':' || isalpha(ch) || ch == '_');
+}
+
+static inline bool IsANumberChar(int ch) {
+	// Not exactly following number definition (several dots are seen as OK, etc.)
+	// but probably enough in most cases.
+	return (ch < 0x80) &&
+	       (IsADigit(ch, 0x10) || toupper(ch) == 'E' ||
+	        ch == '.' || ch == '-' || ch == '+');
+}
+
+static void ColouriseTCLDoc(unsigned int startPos, int length, int , WordList *keywordlists[], Accessor &styler) {
+#define  isComment(s) (s==SCE_TCL_COMMENT || s==SCE_TCL_COMMENTLINE || s==SCE_TCL_COMMENT_BOX || s==SCE_TCL_BLOCK_COMMENT)
+	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
+	bool commentLevel = false;
+    bool subBrace = false; // substitution begin with a brace ${.....}
+	enum tLineState {LS_DEFAULT, LS_OPEN_COMMENT, LS_OPEN_DOUBLE_QUOTE, LS_COMMENT_BOX, LS_MASK_STATE = 0xf, 
+        LS_COMMAND_EXPECTED = 16, LS_BRACE_ONLY = 32 } lineState = LS_DEFAULT;
+	bool prevSlash = false;
+	int currentLevel = 0;
+    bool expected = 0;
+    bool subParen = 0;
+
+	int currentLine = styler.GetLine(startPos);
+    if (currentLine > 0)
+        currentLine--;
+	length += startPos - styler.LineStart(currentLine);
+	// make sure lines overlap
+	startPos = styler.LineStart(currentLine);
+
+	WordList &keywords = *keywordlists[0];
+	WordList &keywords2 = *keywordlists[1];
+	WordList &keywords3 = *keywordlists[2];
+	WordList &keywords4 = *keywordlists[3];
+	WordList &keywords5 = *keywordlists[4];
+	WordList &keywords6 = *keywordlists[5];
+	WordList &keywords7 = *keywordlists[6];
+    WordList &keywords8 = *keywordlists[7];
+    WordList &keywords9 = *keywordlists[8];
+
+	if (currentLine > 0) {
+        int ls = styler.GetLineState(currentLine - 1);
+		lineState = tLineState(ls & LS_MASK_STATE);
+		expected = LS_COMMAND_EXPECTED == tLineState(ls & LS_COMMAND_EXPECTED);
+        subBrace = LS_BRACE_ONLY == tLineState(ls & LS_BRACE_ONLY);
+		currentLevel = styler.LevelAt(currentLine - 1) >> 17;
+		commentLevel = (styler.LevelAt(currentLine - 1) >> 16) & 1;
+	} else
+		styler.SetLevel(0, SC_FOLDLEVELBASE | SC_FOLDLEVELHEADERFLAG);
+	bool visibleChars = false;
+
+	int previousLevel = currentLevel;
+    StyleContext sc(startPos, length, SCE_TCL_DEFAULT, styler);
+	for (; ; sc.Forward()) {
+next:
+        if (sc.ch=='\r' && sc.chNext == '\n') // only ignore \r on PC process on the mac 
+            continue;
+        bool atEnd = !sc.More();  // make sure we coloured the last word
+        if (lineState != LS_DEFAULT) {
+            sc.SetState(SCE_TCL_DEFAULT);
+            if (lineState == LS_OPEN_COMMENT)
+                sc.SetState(SCE_TCL_COMMENTLINE);
+            else if (lineState == LS_OPEN_DOUBLE_QUOTE)
+                sc.SetState(SCE_TCL_IN_QUOTE);
+            else if (lineState == LS_COMMENT_BOX && (sc.ch == '#' || (sc.ch == ' ' && sc.chNext=='#')))
+                sc.SetState(SCE_TCL_COMMENT_BOX);
+            lineState = LS_DEFAULT;
+        }
+        if (subBrace) { // ${ overrides every thing even \ except }
+            if (sc.ch == '}') {
+                subBrace = false;
+                sc.SetState(SCE_TCL_OPERATOR);
+                sc.ForwardSetState(SCE_TCL_DEFAULT);
+                goto next;
+            }
+            else
+                sc.SetState(SCE_TCL_SUB_BRACE);
+            if (!sc.atLineEnd)
+                continue;
+        } else if (sc.state == SCE_TCL_DEFAULT || sc.state ==SCE_TCL_OPERATOR) {
+            expected &= isspacechar(static_cast<unsigned char>(sc.ch)) || IsAWordStart(sc.ch) || sc.ch =='#';
+        } else if (sc.state == SCE_TCL_SUBSTITUTION) {
+            switch(sc.ch) {
+            case '(':
+                subParen=true;
+                sc.SetState(SCE_TCL_OPERATOR);
+                sc.ForwardSetState(SCE_TCL_SUBSTITUTION);
+                continue;
+            case ')':
+                sc.SetState(SCE_TCL_OPERATOR);
+                subParen=false;
+                continue;
+            case '$':
+                continue;
+            case ',':
+                sc.SetState(SCE_TCL_OPERATOR);
+                if (subParen)
+                    sc.ForwardSetState(SCE_TCL_SUBSTITUTION);
+                continue;
+            default :
+                // maybe spaces should be allowed ???
+                if (!IsAWordChar(sc.ch)) { // probably the code is wrong
+                    sc.SetState(SCE_TCL_DEFAULT);
+                    subParen = 0;
+                }
+                break;
+            }
+        } else if (isComment(sc.state)) {
+        } else if (!IsAWordChar(sc.ch)) {
+            if ((sc.state == SCE_TCL_IDENTIFIER && expected) ||  sc.state == SCE_TCL_MODIFIER) {
+                char w[100];
+                char *s=w;
+                sc.GetCurrent(w, sizeof(w));
+                if (w[strlen(w)-1]=='\r')
+                    w[strlen(w)-1]=0;
+                while(*s == ':') // ignore leading : like in ::set a 10
+                    ++s;
+                bool quote = sc.state == SCE_TCL_IN_QUOTE;
+                if (commentLevel  || expected) {
+                    if (keywords.InList(s)) {
+                        sc.ChangeState(quote ? SCE_TCL_WORD_IN_QUOTE : SCE_TCL_WORD);
+                    } else if (keywords2.InList(s)) {
+                        sc.ChangeState(quote ? SCE_TCL_WORD_IN_QUOTE : SCE_TCL_WORD2);
+                    } else if (keywords3.InList(s)) {
+                        sc.ChangeState(quote ? SCE_TCL_WORD_IN_QUOTE : SCE_TCL_WORD3);
+                    } else if (keywords4.InList(s)) {
+                        sc.ChangeState(quote ? SCE_TCL_WORD_IN_QUOTE : SCE_TCL_WORD4);
+                    } else if (sc.GetRelative(-static_cast<int>(strlen(s))-1) == '{' &&
+                        keywords5.InList(s) && sc.ch == '}') { // {keyword} exactly no spaces
+                            sc.ChangeState(SCE_TCL_EXPAND);
+                    }
+                    if (keywords6.InList(s)) {
+                        sc.ChangeState(SCE_TCL_WORD5);
+                    } else if (keywords7.InList(s)) {
+                        sc.ChangeState(SCE_TCL_WORD6);
+                    } else if (keywords8.InList(s)) {
+                        sc.ChangeState(SCE_TCL_WORD7);
+                    } else if (keywords9.InList(s)) {
+                        sc.ChangeState(SCE_TCL_WORD8);
+                    } 
+                }
+                expected = false;
+                sc.SetState(quote ? SCE_TCL_IN_QUOTE : SCE_TCL_DEFAULT);
+            } else if (sc.state == SCE_TCL_MODIFIER || sc.state == SCE_TCL_IDENTIFIER) {
+                sc.SetState(SCE_TCL_DEFAULT);
+            }
+        }
+		if (atEnd)
+			break;
+        if (sc.atLineEnd) {
+            lineState = LS_DEFAULT;
+			currentLine = styler.GetLine(sc.currentPos);
+			if (foldComment && sc.state!=SCE_TCL_COMMENT && isComment(sc.state)) {
+				if (currentLevel == 0) {
+					++currentLevel;
+					commentLevel = true;
+				}
+			} else {
+				if (visibleChars && commentLevel) {
+					--currentLevel;
+					--previousLevel;
+					commentLevel = false;
+				}
+			}
+			int flag = 0;
+			if (!visibleChars)
+				flag = SC_FOLDLEVELWHITEFLAG;
+			if (currentLevel > previousLevel)
+				flag = SC_FOLDLEVELHEADERFLAG;
+			styler.SetLevel(currentLine, flag + previousLevel + SC_FOLDLEVELBASE + (currentLevel << 17) + (commentLevel << 16));
+
+			// Update the line state, so it can be seen by next line
+			if (sc.state == SCE_TCL_IN_QUOTE)
+				lineState = LS_OPEN_DOUBLE_QUOTE;
+			else {
+			     if (prevSlash) {
+				    if (isComment(sc.state))
+					    lineState = LS_OPEN_COMMENT;
+                } else if (sc.state == SCE_TCL_COMMENT_BOX)
+                    lineState = LS_COMMENT_BOX;
+			}
+            styler.SetLineState(currentLine, 
+                (subBrace ? LS_BRACE_ONLY : 0) |
+                (expected ? LS_COMMAND_EXPECTED : 0)  | lineState);
+            if (lineState == LS_COMMENT_BOX)
+                sc.ForwardSetState(SCE_TCL_COMMENT_BOX);
+            else if (lineState == LS_OPEN_DOUBLE_QUOTE)
+                sc.ForwardSetState(SCE_TCL_IN_QUOTE);
+            else
+                sc.ForwardSetState(SCE_TCL_DEFAULT);
+			prevSlash = false;
+			previousLevel = currentLevel;
+			goto next;
+		}
+
+		if (prevSlash) {
+            prevSlash = false;
+            if (sc.ch == '#' && IsANumberChar(sc.chNext))
+                sc.ForwardSetState(SCE_TCL_NUMBER);
+            continue;
+		}
+        prevSlash = sc.ch == '\\';
+        if (isComment(sc.state))
+            continue;
+		if (sc.atLineStart) {
+			visibleChars = false;
+			if (sc.state!=SCE_TCL_IN_QUOTE && !isComment(sc.state))
+            {
+				sc.SetState(SCE_TCL_DEFAULT);
+                expected = IsAWordStart(sc.ch)|| isspacechar(static_cast<unsigned char>(sc.ch));
+            }
+		}
+
+		switch (sc.state) {
+		case SCE_TCL_NUMBER:
+			if (!IsANumberChar(sc.ch))
+				sc.SetState(SCE_TCL_DEFAULT);
+			break;
+		case SCE_TCL_IN_QUOTE:
+			if (sc.ch == '"') {
+				sc.ForwardSetState(SCE_TCL_DEFAULT);
+				visibleChars = true; // necessary if a " is the first and only character on a line
+				goto next;
+			} else if (sc.ch == '[' || sc.ch == ']' || sc.ch == '$') {
+				sc.SetState(SCE_TCL_OPERATOR);
+                expected = sc.ch == '[';
+                sc.ForwardSetState(SCE_TCL_IN_QUOTE);
+				goto next;
+			}
+            continue;
+        case SCE_TCL_OPERATOR:
+			sc.SetState(SCE_TCL_DEFAULT);
+			break;
+		}
+
+		if (sc.ch == '#') {
+			if (visibleChars) {
+                if (sc.state != SCE_TCL_IN_QUOTE && expected)
+					sc.SetState(SCE_TCL_COMMENT);
+			} else {
+                sc.SetState(SCE_TCL_COMMENTLINE);
+                if (sc.chNext == '~')
+                    sc.SetState(SCE_TCL_BLOCK_COMMENT);
+                if (sc.atLineStart && (sc.chNext == '#' || sc.chNext == '-'))
+                        sc.SetState(SCE_TCL_COMMENT_BOX);
+            }
+        }
+
+		if (!isspacechar(static_cast<unsigned char>(sc.ch))) {
+			visibleChars = true;
+		}
+
+		if (sc.ch == '\\') {
+			prevSlash = true;
+			continue;		
+		}
+
+		// Determine if a new state should be entered.
+		if (sc.state == SCE_TCL_DEFAULT) {
+            if (IsAWordStart(sc.ch)) {
+				sc.SetState(SCE_TCL_IDENTIFIER);
+			} else if (IsADigit(sc.ch) && !IsAWordChar(sc.chPrev)) {
+				sc.SetState(SCE_TCL_NUMBER);
+			} else {
+				switch (sc.ch) {
+				case '\"':
+					sc.SetState(SCE_TCL_IN_QUOTE);
+					break;
+				case '{':
+					sc.SetState(SCE_TCL_OPERATOR);
+					expected = true;
+					++currentLevel;
+					break;
+				case '}':
+					sc.SetState(SCE_TCL_OPERATOR);
+					--currentLevel;
+					break;
+				case '[':
+                    expected = true;
+				case ']':
+				case '(':
+				case ')':
+					sc.SetState(SCE_TCL_OPERATOR);
+					break;
+				case ';':
+                    expected = true;
+					break;
+                case '$':
+                    subParen = 0;
+                    if (sc.chNext != '{') {
+                        sc.SetState(SCE_TCL_SUBSTITUTION);
+                    } 
+                    else {
+                        sc.SetState(SCE_TCL_OPERATOR);  // $
+                        sc.Forward();  // {
+                        sc.ForwardSetState(SCE_TCL_SUB_BRACE);
+                        subBrace = true;
+                    }
+                    break;
+                case '#':
+                    if ((isspacechar(static_cast<unsigned char>(sc.chPrev))||
+                            isoperator(static_cast<char>(sc.chPrev))) && IsADigit(sc.chNext,0x10))
+                        sc.SetState(SCE_TCL_NUMBER);
+                    break;
+                case '-':
+                    sc.SetState(IsADigit(sc.chNext)? SCE_TCL_NUMBER: SCE_TCL_MODIFIER);
+                    break;
+                default:
+                    if (isoperator(static_cast<char>(sc.ch))) {
+                        sc.SetState(SCE_TCL_OPERATOR);
+                    }
+				}
+			}
+		}
+	}
+	sc.Complete();
+}
+
+static const char * const tclWordListDesc[] = {
+            "TCL Keywords",
+            "TK Keywords",
+            "iTCL Keywords",
+            "tkCommands",
+            "expand"
+            "user1",
+            "user2",
+            "user3",
+            "user4",
+            0
+        };
+
+// this code supports folding in the colourizer
+LexerModule lmTCL(SCLEX_TCL, ColouriseTCLDoc, "tcl", 0, tclWordListDesc);
diff --git a/Documents/Scintilla/LexTeX.cxx b/Documents/Scintilla/LexTeX.cxx
new file mode 100644
index 0000000..18c99ab
--- /dev/null
+++ b/Documents/Scintilla/LexTeX.cxx
@@ -0,0 +1,491 @@
+// Scintilla source code edit control
+
+// File: LexTeX.cxx - general context conformant tex coloring scheme
+// Author: Hans Hagen - PRAGMA ADE - Hasselt NL - www.pragma-ade.com
+// Version: September 28, 2003
+
+// Copyright: 1998-2003 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+// This lexer is derived from the one written for the texwork environment (1999++) which in
+// turn is inspired on texedit (1991++) which finds its roots in wdt (1986).
+
+// If you run into strange boundary cases, just tell me and I'll look into it.
+
+
+// TeX Folding code added by instanton (soft_share@126.com) with borrowed code from VisualTeX source by Alex Romanenko.
+// Version: June 22, 2007
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+#include "StyleContext.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+// val SCE_TEX_DEFAULT = 0
+// val SCE_TEX_SPECIAL = 1
+// val SCE_TEX_GROUP   = 2
+// val SCE_TEX_SYMBOL  = 3
+// val SCE_TEX_COMMAND = 4
+// val SCE_TEX_TEXT    = 5
+
+// Definitions in SciTEGlobal.properties:
+//
+// TeX Highlighting
+//
+// # Default
+// style.tex.0=fore:#7F7F00
+// # Special
+// style.tex.1=fore:#007F7F
+// # Group
+// style.tex.2=fore:#880000
+// # Symbol
+// style.tex.3=fore:#7F7F00
+// # Command
+// style.tex.4=fore:#008800
+// # Text
+// style.tex.5=fore:#000000
+
+// lexer.tex.interface.default=0
+// lexer.tex.comment.process=0
+
+// todo: lexer.tex.auto.if
+
+// Auxiliary functions:
+
+static inline bool endOfLine(Accessor &styler, unsigned int i) {
+	return
+      (styler[i] == '\n') || ((styler[i] == '\r') && (styler.SafeGetCharAt(i + 1) != '\n')) ;
+}
+
+static inline bool isTeXzero(int ch) {
+	return
+      (ch == '%') ;
+}
+
+static inline bool isTeXone(int ch) {
+	return
+      (ch == '[') || (ch == ']') || (ch == '=') || (ch == '#') ||
+      (ch == '(') || (ch == ')') || (ch == '<') || (ch == '>') ||
+      (ch == '"') ;
+}
+
+static inline bool isTeXtwo(int ch) {
+	return
+      (ch == '{') || (ch == '}') || (ch == '$') ;
+}
+
+static inline bool isTeXthree(int ch) {
+	return
+      (ch == '~') || (ch == '^') || (ch == '_') || (ch == '&') ||
+      (ch == '-') || (ch == '+') || (ch == '\"') || (ch == '`') ||
+      (ch == '/') || (ch == '|') || (ch == '%') ;
+}
+
+static inline bool isTeXfour(int ch) {
+	return
+      (ch == '\\') ;
+}
+
+static inline bool isTeXfive(int ch) {
+	return
+      ((ch >= 'a') && (ch <= 'z')) || ((ch >= 'A') && (ch <= 'Z')) ||
+      (ch == '@') || (ch == '!') || (ch == '?') ;
+}
+
+static inline bool isTeXsix(int ch) {
+	return
+      (ch == ' ') ;
+}
+
+static inline bool isTeXseven(int ch) {
+	return
+      (ch == '^') ;
+}
+
+// Interface determination
+
+static int CheckTeXInterface(
+    unsigned int startPos,
+    int length,
+    Accessor &styler,
+	int defaultInterface) {
+
+    char lineBuffer[1024] ;
+	unsigned int linePos = 0 ;
+
+    // some day we can make something lexer.tex.mapping=(all,0)(nl,1)(en,2)...
+
+    if (styler.SafeGetCharAt(0) == '%') {
+        for (unsigned int i = 0; i < startPos + length; i++) {
+            lineBuffer[linePos++] = styler.SafeGetCharAt(i) ;
+            if (endOfLine(styler, i) || (linePos >= sizeof(lineBuffer) - 1)) {
+                lineBuffer[linePos] = '\0';
+                if (strstr(lineBuffer, "interface=all")) {
+                    return 0 ;
+				} else if (strstr(lineBuffer, "interface=tex")) {
+                    return 1 ;
+                } else if (strstr(lineBuffer, "interface=nl")) {
+                    return 2 ;
+                } else if (strstr(lineBuffer, "interface=en")) {
+                    return 3 ;
+                } else if (strstr(lineBuffer, "interface=de")) {
+                    return 4 ;
+                } else if (strstr(lineBuffer, "interface=cz")) {
+                    return 5 ;
+                } else if (strstr(lineBuffer, "interface=it")) {
+                    return 6 ;
+                } else if (strstr(lineBuffer, "interface=ro")) {
+                    return 7 ;
+                } else if (strstr(lineBuffer, "interface=latex")) {
+					// we will move latex cum suis up to 91+ when more keyword lists are supported
+                    return 8 ;
+				} else if (styler.SafeGetCharAt(1) == 'D' && strstr(lineBuffer, "%D \\module")) {
+					// better would be to limit the search to just one line
+					return 3 ;
+                } else {
+                    return defaultInterface ;
+                }
+            }
+		}
+    }
+
+    return defaultInterface ;
+}
+
+static void ColouriseTeXDoc(
+    unsigned int startPos,
+    int length,
+    int,
+    WordList *keywordlists[],
+    Accessor &styler) {
+
+	styler.StartAt(startPos) ;
+	styler.StartSegment(startPos) ;
+
+	bool processComment   = styler.GetPropertyInt("lexer.tex.comment.process",   0) == 1 ;
+	bool useKeywords      = styler.GetPropertyInt("lexer.tex.use.keywords",      1) == 1 ;
+	bool autoIf           = styler.GetPropertyInt("lexer.tex.auto.if",           1) == 1 ;
+	int  defaultInterface = styler.GetPropertyInt("lexer.tex.interface.default", 1) ;
+
+	char key[100] ;
+	int  k ;
+	bool newifDone = false ;
+	bool inComment = false ;
+
+	int currentInterface = CheckTeXInterface(startPos,length,styler,defaultInterface) ;
+
+    if (currentInterface == 0) {
+        useKeywords = false ;
+        currentInterface = 1 ;
+    }
+
+    WordList &keywords = *keywordlists[currentInterface-1] ;
+
+	StyleContext sc(startPos, length, SCE_TEX_TEXT, styler);
+
+	bool going = sc.More() ; // needed because of a fuzzy end of file state
+
+	for (; going; sc.Forward()) {
+
+		if (! sc.More()) { going = false ; } // we need to go one behind the end of text
+
+		if (inComment) {
+			if (sc.atLineEnd) {
+				sc.SetState(SCE_TEX_TEXT) ;
+				newifDone = false ;
+				inComment = false ;
+			}
+		} else {
+			if (! isTeXfive(sc.ch)) {
+				if (sc.state == SCE_TEX_COMMAND) {
+					if (sc.LengthCurrent() == 1) { // \<noncstoken>
+						if (isTeXseven(sc.ch) && isTeXseven(sc.chNext)) {
+							sc.Forward(2) ; // \^^ and \^^<token>
+						}
+						sc.ForwardSetState(SCE_TEX_TEXT) ;
+					} else {
+						sc.GetCurrent(key, sizeof(key)-1) ;
+						k = strlen(key) ;
+						memmove(key,key+1,k) ; // shift left over escape token
+						key[k] = '\0' ;
+						k-- ;
+						if (! keywords || ! useKeywords) {
+							sc.SetState(SCE_TEX_COMMAND) ;
+							newifDone = false ;
+						} else if (k == 1) { //\<cstoken>
+							sc.SetState(SCE_TEX_COMMAND) ;
+							newifDone = false ;
+						} else if (keywords.InList(key)) {
+    						sc.SetState(SCE_TEX_COMMAND) ;
+							newifDone = autoIf && (strcmp(key,"newif") == 0) ;
+						} else if (autoIf && ! newifDone && (key[0] == 'i') && (key[1] == 'f') && keywords.InList("if")) {
+	    					sc.SetState(SCE_TEX_COMMAND) ;
+						} else {
+							sc.ChangeState(SCE_TEX_TEXT) ;
+							sc.SetState(SCE_TEX_TEXT) ;
+							newifDone = false ;
+						}
+					}
+				}
+				if (isTeXzero(sc.ch)) {
+					sc.SetState(SCE_TEX_SYMBOL) ;
+					sc.ForwardSetState(SCE_TEX_DEFAULT) ;
+					inComment = ! processComment ;
+					newifDone = false ;
+				} else if (isTeXseven(sc.ch) && isTeXseven(sc.chNext)) {
+					sc.SetState(SCE_TEX_TEXT) ;
+					sc.ForwardSetState(SCE_TEX_TEXT) ;
+				} else if (isTeXone(sc.ch)) {
+					sc.SetState(SCE_TEX_SPECIAL) ;
+					newifDone = false ;
+				} else if (isTeXtwo(sc.ch)) {
+					sc.SetState(SCE_TEX_GROUP) ;
+					newifDone = false ;
+				} else if (isTeXthree(sc.ch)) {
+					sc.SetState(SCE_TEX_SYMBOL) ;
+					newifDone = false ;
+				} else if (isTeXfour(sc.ch)) {
+					sc.SetState(SCE_TEX_COMMAND) ;
+				} else if (isTeXsix(sc.ch)) {
+					sc.SetState(SCE_TEX_TEXT) ;
+				} else if (sc.atLineEnd) {
+					sc.SetState(SCE_TEX_TEXT) ;
+					newifDone = false ;
+					inComment = false ;
+				} else {
+					sc.SetState(SCE_TEX_TEXT) ;
+				}
+			} else if (sc.state != SCE_TEX_COMMAND) {
+				sc.SetState(SCE_TEX_TEXT) ;
+			}
+		}
+	}
+	sc.ChangeState(SCE_TEX_TEXT) ;
+	sc.Complete();
+
+}
+
+
+static inline bool isNumber(int ch) {
+	return
+      (ch == '0') || (ch == '1') || (ch == '2') || 
+      (ch == '3') || (ch == '4') || (ch == '5') || 
+      (ch == '6') || (ch == '7') || (ch == '8') || (ch == '9');
+}
+
+static inline bool isWordChar(int ch) {
+	return ((ch >= 'a') && (ch <= 'z')) || ((ch >= 'A') && (ch <= 'Z'));
+}
+
+static int ParseTeXCommand(unsigned int pos, Accessor &styler, char *command)
+{
+  int length=0;
+  char ch=styler.SafeGetCharAt(pos+1);
+  
+  if(ch==',' || ch==':' || ch==';' || ch=='%'){
+      command[0]=ch;
+      command[1]=0;
+	  return 1;
+  }
+
+  // find end
+     while(isWordChar(ch) && !isNumber(ch) && ch!='_' && ch!='.' && length<100){
+          command[length]=ch;
+          length++;
+          ch=styler.SafeGetCharAt(pos+length+1);
+     }
+     
+  command[length]='\0';   
+  if(!length) return 0;
+  return length+1;
+}
+
+static int classifyFoldPointTeXPaired(const char* s) {
+	int lev=0; 
+	if (!(isdigit(s[0]) || (s[0] == '.'))){
+		if (strcmp(s, "begin")==0||strcmp(s,"FoldStart")==0||
+			strcmp(s,"abstract")==0||strcmp(s,"unprotect")==0||
+			strcmp(s,"title")==0||strncmp(s,"start",5)==0||strncmp(s,"Start",5)==0||
+			strcmp(s,"documentclass")==0||strncmp(s,"if",2)==0
+			)
+			lev=1;
+		if (strcmp(s, "end")==0||strcmp(s,"FoldStop")==0||
+			strcmp(s,"maketitle")==0||strcmp(s,"protect")==0||
+			strncmp(s,"stop",4)==0||strncmp(s,"Stop",4)==0||
+			strcmp(s,"fi")==0
+			) 
+		lev=-1;
+	}
+	return lev;
+}
+
+static int classifyFoldPointTeXUnpaired(const char* s) {
+	int lev=0; 
+	if (!(isdigit(s[0]) || (s[0] == '.'))){
+		if (strcmp(s,"part")==0||
+			strcmp(s,"chapter")==0||
+			strcmp(s,"section")==0||
+			strcmp(s,"subsection")==0||
+			strcmp(s,"subsubsection")==0||
+			strcmp(s,"CJKfamily")==0||
+			strcmp(s,"appendix")==0||
+			strcmp(s,"Topic")==0||strcmp(s,"topic")==0||
+			strcmp(s,"subject")==0||strcmp(s,"subsubject")==0||
+			strcmp(s,"def")==0||strcmp(s,"gdef")==0||strcmp(s,"edef")==0||
+			strcmp(s,"xdef")==0||strcmp(s,"framed")==0||
+			strcmp(s,"frame")==0||
+			strcmp(s,"foilhead")==0||strcmp(s,"overlays")==0||strcmp(s,"slide")==0
+			){
+			    lev=1;
+			}
+	}
+	return lev;
+}
+
+static bool IsTeXCommentLine(int line, Accessor &styler) {
+	int pos = styler.LineStart(line);
+	int eol_pos = styler.LineStart(line + 1) - 1;
+	
+	int startpos = pos;
+
+	while (startpos<eol_pos){
+		char ch = styler[startpos];
+		if (ch!='%' && ch!=' ') return false;
+		else if (ch=='%') return true;
+		startpos++;
+	}		
+
+	return false;
+}
+
+// FoldTeXDoc: borrowed from VisualTeX with modifications
+
+static void FoldTexDoc(unsigned int startPos, int length, int, WordList *[], Accessor &styler) 
+{
+	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	unsigned int endPos = startPos+length;
+	int visibleChars=0;
+	int lineCurrent=styler.GetLine(startPos);
+	int levelPrev=styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
+	int levelCurrent=levelPrev;
+	char chNext=styler[startPos];
+	char buffer[100]="";
+	
+	for (unsigned int i=startPos; i < endPos; i++) {
+		char ch=chNext;
+		chNext=styler.SafeGetCharAt(i+1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+
+        if(ch=='\\') {
+            ParseTeXCommand(i, styler, buffer);
+			levelCurrent += classifyFoldPointTeXPaired(buffer)+classifyFoldPointTeXUnpaired(buffer);
+		}
+
+		if (levelCurrent > SC_FOLDLEVELBASE && ((ch == '\r' || ch=='\n') && (chNext == '\\'))) {
+            ParseTeXCommand(i+1, styler, buffer);
+			levelCurrent -= classifyFoldPointTeXUnpaired(buffer);
+		}
+
+	char chNext2;
+	char chNext3;
+	char chNext4;
+	char chNext5;
+	chNext2=styler.SafeGetCharAt(i+2);
+	chNext3=styler.SafeGetCharAt(i+3);
+	chNext4=styler.SafeGetCharAt(i+4);
+	chNext5=styler.SafeGetCharAt(i+5);
+
+	bool atEOfold = (ch == '%') && 
+			(chNext == '%') && (chNext2=='}') && 
+				(chNext3=='}')&& (chNext4=='-')&& (chNext5=='-');
+
+	bool atBOfold = (ch == '%') && 
+			(chNext == '%') && (chNext2=='-') && 
+				(chNext3=='-')&& (chNext4=='{')&& (chNext5=='{');
+
+	if(atBOfold){
+		levelCurrent+=1;
+	}
+
+	if(atEOfold){
+		levelCurrent-=1;
+	}
+	
+	if(ch=='\\' && chNext=='['){
+		levelCurrent+=1;
+	}
+	
+	if(ch=='\\' && chNext==']'){
+		levelCurrent-=1;
+	}
+
+	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
+
+	if (foldComment && atEOL && IsTeXCommentLine(lineCurrent, styler))
+        {
+            if (lineCurrent==0 && IsTeXCommentLine(lineCurrent + 1, styler)
+				)
+                levelCurrent++;
+            else if (lineCurrent!=0 && !IsTeXCommentLine(lineCurrent - 1, styler)
+               && IsTeXCommentLine(lineCurrent + 1, styler)
+				)
+                levelCurrent++;
+            else if (lineCurrent!=0 && IsTeXCommentLine(lineCurrent - 1, styler) &&
+                     !IsTeXCommentLine(lineCurrent+1, styler))
+                levelCurrent--;
+        }
+
+//---------------------------------------------------------------------------------------------	
+		
+		if (atEOL) {
+			int lev = levelPrev;
+			if (visibleChars == 0 && foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if ((levelCurrent > levelPrev) && (visibleChars > 0))
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelPrev = levelCurrent;
+			visibleChars = 0;
+		}
+
+		if (!isspacechar(ch))
+			visibleChars++;
+	}
+
+	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
+	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
+}
+
+
+
+
+static const char * const texWordListDesc[] = {
+    "TeX, eTeX, pdfTeX, Omega",
+    "ConTeXt Dutch",
+    "ConTeXt English",
+    "ConTeXt German",
+    "ConTeXt Czech",
+    "ConTeXt Italian",
+    "ConTeXt Romanian",
+	0,
+} ;
+
+LexerModule lmTeX(SCLEX_TEX,   ColouriseTeXDoc, "tex", FoldTexDoc, texWordListDesc);
diff --git a/Documents/Scintilla/LexVB.cxx b/Documents/Scintilla/LexVB.cxx
new file mode 100644
index 0000000..a1f9ec7
--- /dev/null
+++ b/Documents/Scintilla/LexVB.cxx
@@ -0,0 +1,282 @@
+// Scintilla source code edit control
+/** @file LexVB.cxx
+ ** Lexer for Visual Basic and VBScript.
+ **/
+// Copyright 1998-2005 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+// Internal state, highlighted as number
+#define SCE_B_FILENUMBER SCE_B_DEFAULT+100
+
+
+static bool IsVBComment(Accessor &styler, int pos, int len) {
+	return len > 0 && styler[pos] == '\'';
+}
+
+static inline bool IsTypeCharacter(int ch) {
+	return ch == '%' || ch == '&' || ch == '@' || ch == '!' || ch == '#' || ch == '$';
+}
+
+// Extended to accept accented characters
+static inline bool IsAWordChar(int ch) {
+	return ch >= 0x80 ||
+	       (isalnum(ch) || ch == '.' || ch == '_');
+}
+
+static inline bool IsAWordStart(int ch) {
+	return ch >= 0x80 ||
+	       (isalpha(ch) || ch == '_');
+}
+
+static inline bool IsANumberChar(int ch) {
+	// Not exactly following number definition (several dots are seen as OK, etc.)
+	// but probably enough in most cases.
+	return (ch < 0x80) &&
+	        (isdigit(ch) || toupper(ch) == 'E' ||
+             ch == '.' || ch == '-' || ch == '+');
+}
+
+static void ColouriseVBDoc(unsigned int startPos, int length, int initStyle,
+                           WordList *keywordlists[], Accessor &styler, bool vbScriptSyntax) {
+
+	WordList &keywords = *keywordlists[0];
+	WordList &keywords2 = *keywordlists[1];
+	WordList &keywords3 = *keywordlists[2];
+	WordList &keywords4 = *keywordlists[3];
+
+	styler.StartAt(startPos);
+
+	int visibleChars = 0;
+	int fileNbDigits = 0;
+
+	// Do not leak onto next line
+	if (initStyle == SCE_B_STRINGEOL || initStyle == SCE_B_COMMENT || initStyle == SCE_B_PREPROCESSOR) {
+		initStyle = SCE_B_DEFAULT;
+	}
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	for (; sc.More(); sc.Forward()) {
+
+		if (sc.state == SCE_B_OPERATOR) {
+			sc.SetState(SCE_B_DEFAULT);
+		} else if (sc.state == SCE_B_IDENTIFIER) {
+			if (!IsAWordChar(sc.ch)) {
+				// In Basic (except VBScript), a variable name or a function name
+				// can end with a special character indicating the type of the value
+				// held or returned.
+				bool skipType = false;
+				if (!vbScriptSyntax && IsTypeCharacter(sc.ch)) {
+					sc.Forward();	// Skip it
+					skipType = true;
+				}
+				if (sc.ch == ']') {
+					sc.Forward();
+				}
+				char s[100];
+				sc.GetCurrentLowered(s, sizeof(s));
+				if (skipType) {
+					s[strlen(s) - 1] = '\0';
+				}
+				if (strcmp(s, "rem") == 0) {
+					sc.ChangeState(SCE_B_COMMENT);
+				} else {
+					if (keywords.InList(s)) {
+						sc.ChangeState(SCE_B_KEYWORD);
+					} else if (keywords2.InList(s)) {
+						sc.ChangeState(SCE_B_KEYWORD2);
+					} else if (keywords3.InList(s)) {
+						sc.ChangeState(SCE_B_KEYWORD3);
+					} else if (keywords4.InList(s)) {
+						sc.ChangeState(SCE_B_KEYWORD4);
+					}	// Else, it is really an identifier...
+					sc.SetState(SCE_B_DEFAULT);
+				}
+			}
+		} else if (sc.state == SCE_B_NUMBER) {
+			// We stop the number definition on non-numerical non-dot non-eE non-sign char
+			// Also accepts A-F for hex. numbers
+			if (!IsANumberChar(sc.ch) && !(tolower(sc.ch) >= 'a' && tolower(sc.ch) <= 'f')) {
+				sc.SetState(SCE_B_DEFAULT);
+			}
+		} else if (sc.state == SCE_B_STRING) {
+			// VB doubles quotes to preserve them, so just end this string
+			// state now as a following quote will start again
+			if (sc.ch == '\"') {
+				if (sc.chNext == '\"') {
+					sc.Forward();
+				} else {
+					if (tolower(sc.chNext) == 'c') {
+						sc.Forward();
+					}
+					sc.ForwardSetState(SCE_B_DEFAULT);
+				}
+			} else if (sc.atLineEnd) {
+				visibleChars = 0;
+				sc.ChangeState(SCE_B_STRINGEOL);
+				sc.ForwardSetState(SCE_B_DEFAULT);
+			}
+		} else if (sc.state == SCE_B_COMMENT) {
+			if (sc.atLineEnd) {
+				visibleChars = 0;
+				sc.ForwardSetState(SCE_B_DEFAULT);
+			}
+		} else if (sc.state == SCE_B_PREPROCESSOR) {
+			if (sc.atLineEnd) {
+				visibleChars = 0;
+				sc.ForwardSetState(SCE_B_DEFAULT);
+			}
+		} else if (sc.state == SCE_B_FILENUMBER) {
+			if (IsADigit(sc.ch)) {
+				fileNbDigits++;
+				if (fileNbDigits > 3) {
+					sc.ChangeState(SCE_B_DATE);
+				}
+			} else if (sc.ch == '\r' || sc.ch == '\n' || sc.ch == ',') {
+				// Regular uses: Close #1; Put #1, ...; Get #1, ... etc.
+				// Too bad if date is format #27, Oct, 2003# or something like that...
+				// Use regular number state
+				sc.ChangeState(SCE_B_NUMBER);
+				sc.SetState(SCE_B_DEFAULT);
+			} else if (sc.ch == '#') {
+				sc.ChangeState(SCE_B_DATE);
+				sc.ForwardSetState(SCE_B_DEFAULT);
+			} else {
+				sc.ChangeState(SCE_B_DATE);
+			}
+			if (sc.state != SCE_B_FILENUMBER) {
+				fileNbDigits = 0;
+			}
+		} else if (sc.state == SCE_B_DATE) {
+			if (sc.atLineEnd) {
+				visibleChars = 0;
+				sc.ChangeState(SCE_B_STRINGEOL);
+				sc.ForwardSetState(SCE_B_DEFAULT);
+			} else if (sc.ch == '#') {
+				sc.ForwardSetState(SCE_B_DEFAULT);
+			}
+		}
+
+		if (sc.state == SCE_B_DEFAULT) {
+			if (sc.ch == '\'') {
+				sc.SetState(SCE_B_COMMENT);
+			} else if (sc.ch == '\"') {
+				sc.SetState(SCE_B_STRING);
+			} else if (sc.ch == '#' && visibleChars == 0) {
+				// Preprocessor commands are alone on their line
+				sc.SetState(SCE_B_PREPROCESSOR);
+			} else if (sc.ch == '#') {
+				// It can be a date literal, ending with #, or a file number, from 1 to 511
+				// The date literal depends on the locale, so anything can go between #'s.
+				// Can be #January 1, 1993# or #1 Jan 93# or #05/11/2003#, etc.
+				// So we set the FILENUMBER state, and switch to DATE if it isn't a file number
+				sc.SetState(SCE_B_FILENUMBER);
+			} else if (sc.ch == '&' && tolower(sc.chNext) == 'h') {
+				// Hexadecimal number
+				sc.SetState(SCE_B_NUMBER);
+				sc.Forward();
+			} else if (sc.ch == '&' && tolower(sc.chNext) == 'o') {
+				// Octal number
+				sc.SetState(SCE_B_NUMBER);
+				sc.Forward();
+			} else if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
+				sc.SetState(SCE_B_NUMBER);
+			} else if (IsAWordStart(sc.ch) || (sc.ch == '[')) {
+				sc.SetState(SCE_B_IDENTIFIER);
+			} else if (isoperator(static_cast<char>(sc.ch)) || (sc.ch == '\\')) {	// Integer division
+				sc.SetState(SCE_B_OPERATOR);
+			}
+		}
+
+		if (sc.atLineEnd) {
+			visibleChars = 0;
+		}
+		if (!IsASpace(sc.ch)) {
+			visibleChars++;
+		}
+	}
+	sc.Complete();
+}
+
+static void FoldVBDoc(unsigned int startPos, int length, int,
+						   WordList *[], Accessor &styler) {
+	int endPos = startPos + length;
+
+	// Backtrack to previous line in case need to fix its fold status
+	int lineCurrent = styler.GetLine(startPos);
+	if (startPos > 0) {
+		if (lineCurrent > 0) {
+			lineCurrent--;
+			startPos = styler.LineStart(lineCurrent);
+		}
+	}
+	int spaceFlags = 0;
+	int indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags, IsVBComment);
+	char chNext = styler[startPos];
+	for (int i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+
+		if ((ch == '\r' && chNext != '\n') || (ch == '\n') || (i == endPos)) {
+			int lev = indentCurrent;
+			int indentNext = styler.IndentAmount(lineCurrent + 1, &spaceFlags, IsVBComment);
+			if (!(indentCurrent & SC_FOLDLEVELWHITEFLAG)) {
+				// Only non whitespace lines can be headers
+				if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext & SC_FOLDLEVELNUMBERMASK)) {
+					lev |= SC_FOLDLEVELHEADERFLAG;
+				} else if (indentNext & SC_FOLDLEVELWHITEFLAG) {
+					// Line after is blank so check the next - maybe should continue further?
+					int spaceFlags2 = 0;
+					int indentNext2 = styler.IndentAmount(lineCurrent + 2, &spaceFlags2, IsVBComment);
+					if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext2 & SC_FOLDLEVELNUMBERMASK)) {
+						lev |= SC_FOLDLEVELHEADERFLAG;
+					}
+				}
+			}
+			indentCurrent = indentNext;
+			styler.SetLevel(lineCurrent, lev);
+			lineCurrent++;
+		}
+	}
+}
+
+static void ColouriseVBNetDoc(unsigned int startPos, int length, int initStyle,
+                           WordList *keywordlists[], Accessor &styler) {
+	ColouriseVBDoc(startPos, length, initStyle, keywordlists, styler, false);
+}
+
+static void ColouriseVBScriptDoc(unsigned int startPos, int length, int initStyle,
+                           WordList *keywordlists[], Accessor &styler) {
+	ColouriseVBDoc(startPos, length, initStyle, keywordlists, styler, true);
+}
+
+static const char * const vbWordListDesc[] = {
+	"Keywords",
+	"user1",
+	"user2",
+	"user3",
+	0
+};
+
+LexerModule lmVB(SCLEX_VB, ColouriseVBNetDoc, "vb", FoldVBDoc, vbWordListDesc);
+LexerModule lmVBScript(SCLEX_VBSCRIPT, ColouriseVBScriptDoc, "vbscript", FoldVBDoc, vbWordListDesc);
+
diff --git a/Documents/Scintilla/LexVHDL.cxx b/Documents/Scintilla/LexVHDL.cxx
new file mode 100644
index 0000000..c082cdb
--- /dev/null
+++ b/Documents/Scintilla/LexVHDL.cxx
@@ -0,0 +1,477 @@
+// Scintilla source code edit control
+/** @file LexVHDL.cxx
+ ** Lexer for VHDL
+ ** Written by Phil Reid, 
+ ** Based on:
+ **  - The Verilog Lexer by Avi Yegudin 
+ **  - The Fortran Lexer by Chuan-jian Shen
+ **  - The C++ lexer by Neil Hodgson
+ **/
+// Copyright 1998-2002 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+static void ColouriseVHDLDoc(
+  unsigned int startPos,
+  int length,
+  int initStyle,
+  WordList *keywordlists[],
+  Accessor &styler);
+
+
+/***************************************/
+static inline bool IsAWordChar(const int ch) {
+  return (ch < 0x80) && (isalnum(ch) || ch == '.' || ch == '_' );
+}
+
+/***************************************/
+static inline bool IsAWordStart(const int ch) {
+  return (ch < 0x80) && (isalnum(ch) || ch == '_');
+}
+
+/***************************************/
+inline bool IsABlank(unsigned int ch) {
+    return (ch == ' ') || (ch == 0x09) || (ch == 0x0b) ;
+}
+
+/***************************************/
+static void ColouriseVHDLDoc(
+  unsigned int startPos,
+  int length,
+  int initStyle,
+  WordList *keywordlists[],
+  Accessor &styler)
+{
+  WordList &Keywords   = *keywordlists[0];
+  WordList &Operators  = *keywordlists[1];
+  WordList &Attributes = *keywordlists[2];
+  WordList &Functions  = *keywordlists[3];
+  WordList &Packages   = *keywordlists[4];
+  WordList &Types      = *keywordlists[5];
+  WordList &User       = *keywordlists[6];
+
+  StyleContext sc(startPos, length, initStyle, styler);
+
+  for (; sc.More(); sc.Forward())
+  {
+
+    // Determine if the current state should terminate.
+    if (sc.state == SCE_VHDL_OPERATOR) {
+      sc.SetState(SCE_VHDL_DEFAULT);
+    } else if (sc.state == SCE_VHDL_NUMBER) {
+      if (!IsAWordChar(sc.ch) && (sc.ch != '#')) {
+        sc.SetState(SCE_VHDL_DEFAULT);
+      }
+    } else if (sc.state == SCE_VHDL_IDENTIFIER) {
+      if (!IsAWordChar(sc.ch) || (sc.ch == '.')) {
+        char s[100];
+        sc.GetCurrentLowered(s, sizeof(s));
+        if (Keywords.InList(s)) {
+          sc.ChangeState(SCE_VHDL_KEYWORD);
+        } else if (Operators.InList(s)) {
+          sc.ChangeState(SCE_VHDL_STDOPERATOR);
+        } else if (Attributes.InList(s)) {
+          sc.ChangeState(SCE_VHDL_ATTRIBUTE);
+        } else if (Functions.InList(s)) {
+          sc.ChangeState(SCE_VHDL_STDFUNCTION);
+        } else if (Packages.InList(s)) {
+          sc.ChangeState(SCE_VHDL_STDPACKAGE);
+        } else if (Types.InList(s)) {
+          sc.ChangeState(SCE_VHDL_STDTYPE);
+        } else if (User.InList(s)) {
+          sc.ChangeState(SCE_VHDL_USERWORD);
+        }
+        sc.SetState(SCE_VHDL_DEFAULT);
+      }
+    } else if (sc.state == SCE_VHDL_COMMENT || sc.state == SCE_V_COMMENTLINEBANG) {
+      if (sc.atLineEnd) {
+        sc.SetState(SCE_VHDL_DEFAULT);
+      }
+    } else if (sc.state == SCE_VHDL_STRING) {
+      if (sc.ch == '\\') {
+        if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
+          sc.Forward();
+        }
+      } else if (sc.ch == '\"') {
+        sc.ForwardSetState(SCE_VHDL_DEFAULT);
+      } else if (sc.atLineEnd) {
+        sc.ChangeState(SCE_V_STRINGEOL);
+        sc.ForwardSetState(SCE_VHDL_DEFAULT);
+      }
+    }
+
+    // Determine if a new state should be entered.
+    if (sc.state == SCE_VHDL_DEFAULT) {
+      if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
+        sc.SetState(SCE_VHDL_NUMBER);
+      } else if (IsAWordStart(sc.ch)) {
+        sc.SetState(SCE_VHDL_IDENTIFIER);
+      } else if (sc.Match('-', '-')) {
+        sc.SetState(SCE_VHDL_COMMENT);
+        sc.Forward(); 
+      } else if (sc.Match('-', '-')) {
+        if (sc.Match("--!"))  // Nice to have a different comment style
+          sc.SetState(SCE_VHDL_COMMENTLINEBANG);
+        else
+          sc.SetState(SCE_VHDL_COMMENT);
+      } else if (sc.ch == '\"') {
+        sc.SetState(SCE_VHDL_STRING);
+      } else if (isoperator(static_cast<char>(sc.ch))) {
+        sc.SetState(SCE_VHDL_OPERATOR);
+      }
+    }
+  }
+  sc.Complete();
+}
+//=============================================================================
+static bool IsCommentLine(int line, Accessor &styler) {
+	int pos = styler.LineStart(line);
+	int eol_pos = styler.LineStart(line + 1) - 1;
+	for (int i = pos; i < eol_pos; i++) {
+		char ch = styler[i];
+		char chNext = styler[i+1];
+		if ((ch == '-') && (chNext == '-'))
+			return true;
+		else if (ch != ' ' && ch != '\t')
+			return false;
+	}
+	return false;
+}
+
+//=============================================================================
+// Folding the code
+static void FoldNoBoxVHDLDoc(
+  unsigned int startPos,
+  int length,
+  int initStyle,
+  Accessor &styler)
+{
+  // Decided it would be smarter to have the lexer have all keywords included. Therefore I
+  // don't check if the style for the keywords that I use to adjust the levels.
+  char words[] =
+    "architecture begin case component else elsif end entity generate loop package process record then "
+    "procedure function when";
+  WordList keywords;
+  keywords.Set(words);
+
+  bool foldComment      = styler.GetPropertyInt("fold.comment", 1) != 0;
+  bool foldCompact      = styler.GetPropertyInt("fold.compact", 1) != 0;
+  bool foldAtElse       = styler.GetPropertyInt("fold.at.else", 1) != 0;
+  bool foldAtBegin      = styler.GetPropertyInt("fold.at.Begin", 1) != 0;
+  bool foldAtParenthese = styler.GetPropertyInt("fold.at.Parenthese", 1) != 0;
+  //bool foldAtWhen       = styler.GetPropertyInt("fold.at.When", 1) != 0;  //< fold at when in case statements
+
+  int  visibleChars     = 0;
+  unsigned int endPos   = startPos + length;
+
+  int lineCurrent       = styler.GetLine(startPos);
+  int levelCurrent      = SC_FOLDLEVELBASE;
+  if(lineCurrent > 0)
+    levelCurrent        = styler.LevelAt(lineCurrent-1) >> 16;
+  //int levelMinCurrent   = levelCurrent;
+  int levelMinCurrentElse = levelCurrent;   //< Used for folding at 'else'
+  int levelMinCurrentBegin = levelCurrent;  //< Used for folding at 'begin'
+  int levelNext         = levelCurrent;
+
+  /***************************************/
+  int lastStart         = 0;
+  char prevWord[32]     = "";
+
+  /***************************************/
+  // Find prev word
+  // The logic for going up or down a level depends on a the previous keyword
+  // This code could be cleaned up.
+  int end = 0;
+  unsigned int j;
+  for(j = startPos; j>0; j--)
+  {
+    char ch       = styler.SafeGetCharAt(j);
+    char chPrev   = styler.SafeGetCharAt(j-1);
+    int style     = styler.StyleAt(j);
+    int stylePrev = styler.StyleAt(j-1);
+    if ((stylePrev != SCE_VHDL_COMMENT) && (stylePrev != SCE_VHDL_STRING))
+    {
+      if(IsAWordChar(chPrev) && !IsAWordChar(ch))
+      {
+        end = j-1;
+      }
+    }
+    if ((style != SCE_VHDL_COMMENT) && (style != SCE_VHDL_STRING))
+    {
+      if(!IsAWordChar(chPrev) && IsAWordStart(ch) && (end != 0))
+      {
+        char s[32];
+        unsigned int k;
+        for(k=0; (k<31 ) && (k<end-j+1 ); k++) {
+          s[k] = static_cast<char>(tolower(styler[j+k]));
+        }
+        s[k] = '\0';
+
+        if(keywords.InList(s)) {
+          strcpy(prevWord, s);
+          break;
+        }
+      }
+    }
+  }
+  for(j=j+strlen(prevWord); j<endPos; j++)
+  {
+    char ch       = styler.SafeGetCharAt(j);
+    int style     = styler.StyleAt(j);
+    if ((style != SCE_VHDL_COMMENT) && (style != SCE_VHDL_STRING))
+    {
+      if((ch == ';') && (strcmp(prevWord, "end") == 0))
+      {
+        strcpy(prevWord, ";");
+      }
+    }
+  }
+
+  char  chNext          = styler[startPos];
+  char  chPrev          = '\0';
+  char  chNextNonBlank;
+  int   styleNext       = styler.StyleAt(startPos);
+  int   style           = initStyle;
+  //Platform::DebugPrintf("Line[%04d] Prev[%20s] ************************* Level[%x]\n", lineCurrent+1, prevWord, levelCurrent);
+
+  /***************************************/
+  for (unsigned int i = startPos; i < endPos; i++)
+  {
+    char ch         = chNext;
+    chNext          = styler.SafeGetCharAt(i + 1);
+    chPrev          = styler.SafeGetCharAt(i - 1);
+    chNextNonBlank  = chNext;
+    unsigned int j  = i+1;
+    while(IsABlank(chNextNonBlank) && j<endPos)
+    {
+      j ++ ;
+      chNextNonBlank = styler.SafeGetCharAt(j);
+    }
+    style           = styleNext;
+    styleNext       = styler.StyleAt(i + 1);
+    bool atEOL      = (ch == '\r' && chNext != '\n') || (ch == '\n');
+
+		if (foldComment && atEOL && IsCommentLine(lineCurrent, styler)) 
+    {
+      if(!IsCommentLine(lineCurrent-1, styler) && IsCommentLine(lineCurrent+1, styler))
+      {
+        levelNext++;
+      } 
+      else if(IsCommentLine(lineCurrent-1, styler) && !IsCommentLine(lineCurrent+1, styler))
+      {
+        levelNext--;
+      }
+    }
+
+    if ((style == SCE_VHDL_OPERATOR) && foldAtParenthese)
+    {
+      if(ch == '(') {
+        levelNext++;
+      } else if (ch == ')') {
+        levelNext--;
+      }
+    }
+
+    if ((style != SCE_VHDL_COMMENT) && (style != SCE_VHDL_STRING))
+    {
+      if((ch == ';') && (strcmp(prevWord, "end") == 0))
+      {
+        strcpy(prevWord, ";");
+      }
+
+      if(!IsAWordChar(chPrev) && IsAWordStart(ch))
+      {
+        lastStart = i;
+      }
+
+      if(iswordchar(ch) && !iswordchar(chNext)) {
+        char s[32];
+        unsigned int k;
+        for(k=0; (k<31 ) && (k<i-lastStart+1 ); k++) {
+          s[k] = static_cast<char>(tolower(styler[lastStart+k]));
+        }
+        s[k] = '\0';
+
+        if(keywords.InList(s))
+        {
+          if (
+            strcmp(s, "architecture") == 0  ||
+            strcmp(s, "case") == 0          ||
+            strcmp(s, "component") == 0     ||
+            strcmp(s, "entity") == 0        ||
+            strcmp(s, "generate") == 0      ||
+            strcmp(s, "loop") == 0          ||
+            strcmp(s, "package") ==0        ||
+            strcmp(s, "process") == 0       ||
+            strcmp(s, "record") == 0        ||
+            strcmp(s, "then") == 0)
+          {
+            if (strcmp(prevWord, "end") != 0)
+            {
+              if (levelMinCurrentElse > levelNext) {
+                levelMinCurrentElse = levelNext;
+              }
+              levelNext++;
+            }
+          } else if (
+            strcmp(s, "procedure") == 0     ||
+            strcmp(s, "function") == 0)
+          {
+            if (strcmp(prevWord, "end") != 0) // check for "end procedure" etc.
+            { // This code checks to see if the procedure / function is a definition within a "package"
+              // rather than the actual code in the body.
+              int BracketLevel = 0;
+              for(int j=i+1; j<styler.Length(); j++)
+              {
+                int LocalStyle = styler.StyleAt(j);
+                char LocalCh = styler.SafeGetCharAt(j);
+                if(LocalCh == '(') BracketLevel++;
+                if(LocalCh == ')') BracketLevel--;
+                if(
+                  (BracketLevel == 0) &&
+                  (LocalStyle != SCE_VHDL_COMMENT) &&
+                  (LocalStyle != SCE_VHDL_STRING) &&
+                  !iswordchar(styler.SafeGetCharAt(j-1)) &&
+                  styler.Match(j, "is") &&
+                  !iswordchar(styler.SafeGetCharAt(j+2)))
+                {
+                  if (levelMinCurrentElse > levelNext) {
+                    levelMinCurrentElse = levelNext;
+                  }
+                  levelNext++;
+                  break;
+                }
+                if((BracketLevel == 0) && (LocalCh == ';'))
+                {
+                  break;
+                }
+              }
+            }
+
+          } else if (strcmp(s, "end") == 0) {
+            levelNext--;
+          }  else if(strcmp(s, "elsif") == 0) { // elsif is followed by then so folding occurs correctly
+            levelNext--;
+          } else if (strcmp(s, "else") == 0) {
+            if(strcmp(prevWord, "when") != 0)  // ignore a <= x when y else z;
+            {
+              levelMinCurrentElse = levelNext - 1;  // VHDL else is all on its own so just dec. the min level
+            }
+          } else if(
+            ((strcmp(s, "begin") == 0) && (strcmp(prevWord, "architecture") == 0)) ||
+            ((strcmp(s, "begin") == 0) && (strcmp(prevWord, "function") == 0)) ||
+            ((strcmp(s, "begin") == 0) && (strcmp(prevWord, "procedure") == 0)))
+          {
+            levelMinCurrentBegin = levelNext - 1;  
+          }
+          //Platform::DebugPrintf("Line[%04d] Prev[%20s] Cur[%20s] Level[%x]\n", lineCurrent+1, prevWord, s, levelCurrent);
+          strcpy(prevWord, s);
+        }
+      }
+    }
+    if (atEOL) {
+      int levelUse = levelCurrent;
+
+      if (foldAtElse && (levelMinCurrentElse < levelUse)) {
+        levelUse = levelMinCurrentElse;
+      }
+      if (foldAtBegin && (levelMinCurrentBegin < levelUse)) {
+        levelUse = levelMinCurrentBegin;
+      }
+      int lev = levelUse | levelNext << 16;
+      if (visibleChars == 0 && foldCompact)
+        lev |= SC_FOLDLEVELWHITEFLAG;
+
+      if (levelUse < levelNext)
+        lev |= SC_FOLDLEVELHEADERFLAG;
+      if (lev != styler.LevelAt(lineCurrent)) {
+        styler.SetLevel(lineCurrent, lev);
+      }
+      //Platform::DebugPrintf("Line[%04d] ---------------------------------------------------- Level[%x]\n", lineCurrent+1, levelCurrent);
+      lineCurrent++;
+      levelCurrent = levelNext;
+      //levelMinCurrent = levelCurrent;
+      levelMinCurrentElse = levelCurrent;
+      levelMinCurrentBegin = levelCurrent;
+      visibleChars = 0;
+    }
+    /***************************************/
+    if (!isspacechar(ch)) visibleChars++;
+  }
+
+  /***************************************/
+//  Platform::DebugPrintf("Line[%04d] ---------------------------------------------------- Level[%x]\n", lineCurrent+1, levelCurrent);
+}
+
+//=============================================================================
+static void FoldVHDLDoc(unsigned int startPos, int length, int initStyle, WordList *[],
+                       Accessor &styler) {
+  FoldNoBoxVHDLDoc(startPos, length, initStyle, styler);
+}
+
+//=============================================================================
+static const char * const VHDLWordLists[] = {
+            "Keywords",
+            "Operators",
+            "Attributes",
+            "Standard Functions",
+            "Standard Packages",
+            "Standard Types",
+            "User Words",
+            0,
+        };
+
+
+LexerModule lmVHDL(SCLEX_VHDL, ColouriseVHDLDoc, "vhdl", FoldVHDLDoc, VHDLWordLists);
+
+
+// Keyword:
+//    access after alias all architecture array assert attribute begin block body buffer bus case component 
+//    configuration constant disconnect downto else elsif end entity exit file for function generate generic 
+//    group guarded if impure in inertial inout is label library linkage literal loop map new next null of 
+//    on open others out package port postponed procedure process pure range record register reject report 
+//    return select severity shared signal subtype then to transport type unaffected units until use variable 
+//    wait when while with
+//
+// Operators:
+//    abs and mod nand nor not or rem rol ror sla sll sra srl xnor xor
+//
+// Attributes:
+//    left right low high ascending image value pos val succ pred leftof rightof base range reverse_range 
+//    length delayed stable quiet transaction event active last_event last_active last_value driving 
+//    driving_value simple_name path_name instance_name
+//
+// Std Functions:
+//    now readline read writeline write endfile resolved to_bit to_bitvector to_stdulogic to_stdlogicvector 
+//    to_stdulogicvector to_x01 to_x01z to_UX01 rising_edge falling_edge is_x shift_left shift_right rotate_left 
+//    rotate_right resize to_integer to_unsigned to_signed std_match to_01
+//
+// Std Packages:
+//    std ieee work standard textio std_logic_1164 std_logic_arith std_logic_misc std_logic_signed 
+//    std_logic_textio std_logic_unsigned numeric_bit numeric_std math_complex math_real vital_primitives 
+//    vital_timing
+//
+// Std Types:
+//    boolean bit character severity_level integer real time delay_length natural positive string bit_vector 
+//    file_open_kind file_open_status line text side width std_ulogic std_ulogic_vector std_logic 
+//    std_logic_vector X01 X01Z UX01 UX01Z unsigned signed
+//
+
diff --git a/Documents/Scintilla/LexVerilog.cxx b/Documents/Scintilla/LexVerilog.cxx
new file mode 100644
index 0000000..52183fe
--- /dev/null
+++ b/Documents/Scintilla/LexVerilog.cxx
@@ -0,0 +1,305 @@
+// Scintilla source code edit control
+/** @file LexVerilog.cxx
+ ** Lexer for Verilog.
+ ** Written by Avi Yegudin, based on C++ lexer by Neil Hodgson
+ **/
+// Copyright 1998-2002 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+static inline bool IsAWordChar(const int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '.' || ch == '_' || ch == '\'');
+}
+
+static inline bool IsAWordStart(const int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '_' || ch == '$');
+}
+
+static void ColouriseVerilogDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
+                            Accessor &styler) {
+
+	WordList &keywords = *keywordlists[0];
+	WordList &keywords2 = *keywordlists[1];
+	WordList &keywords3 = *keywordlists[2];
+	WordList &keywords4 = *keywordlists[3];
+
+	// Do not leak onto next line
+	if (initStyle == SCE_V_STRINGEOL)
+		initStyle = SCE_V_DEFAULT;
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	for (; sc.More(); sc.Forward()) {
+
+		if (sc.atLineStart && (sc.state == SCE_V_STRING)) {
+			// Prevent SCE_V_STRINGEOL from leaking back to previous line
+			sc.SetState(SCE_V_STRING);
+		}
+
+		// Handle line continuation generically.
+		if (sc.ch == '\\') {
+			if (sc.chNext == '\n' || sc.chNext == '\r') {
+				sc.Forward();
+				if (sc.ch == '\r' && sc.chNext == '\n') {
+					sc.Forward();
+				}
+				continue;
+			}
+		}
+
+		// Determine if the current state should terminate.
+		if (sc.state == SCE_V_OPERATOR) {
+			sc.SetState(SCE_V_DEFAULT);
+		} else if (sc.state == SCE_V_NUMBER) {
+			if (!IsAWordChar(sc.ch)) {
+				sc.SetState(SCE_V_DEFAULT);
+			}
+		} else if (sc.state == SCE_V_IDENTIFIER) {
+			if (!IsAWordChar(sc.ch) || (sc.ch == '.')) {
+				char s[100];
+                                sc.GetCurrent(s, sizeof(s));
+				if (keywords.InList(s)) {
+					sc.ChangeState(SCE_V_WORD);
+				} else if (keywords2.InList(s)) {
+					sc.ChangeState(SCE_V_WORD2);
+				} else if (keywords3.InList(s)) {
+					sc.ChangeState(SCE_V_WORD3);
+                                } else if (keywords4.InList(s)) {
+					sc.ChangeState(SCE_V_USER);
+				}
+				sc.SetState(SCE_V_DEFAULT);
+			}
+		} else if (sc.state == SCE_V_PREPROCESSOR) {
+                        if (!IsAWordChar(sc.ch)) {
+                                sc.SetState(SCE_V_DEFAULT);
+                        }
+		} else if (sc.state == SCE_V_COMMENT) {
+			if (sc.Match('*', '/')) {
+				sc.Forward();
+				sc.ForwardSetState(SCE_V_DEFAULT);
+			}
+		} else if (sc.state == SCE_V_COMMENTLINE || sc.state == SCE_V_COMMENTLINEBANG) {
+			if (sc.atLineStart) {
+				sc.SetState(SCE_V_DEFAULT);
+			}
+                } else if (sc.state == SCE_V_STRING) {
+			if (sc.ch == '\\') {
+				if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
+					sc.Forward();
+				}
+			} else if (sc.ch == '\"') {
+				sc.ForwardSetState(SCE_V_DEFAULT);
+			} else if (sc.atLineEnd) {
+				sc.ChangeState(SCE_V_STRINGEOL);
+				sc.ForwardSetState(SCE_V_DEFAULT);
+			}
+		}
+
+		// Determine if a new state should be entered.
+		if (sc.state == SCE_V_DEFAULT) {
+			if (IsADigit(sc.ch) || (sc.ch == '\'') || (sc.ch == '.' && IsADigit(sc.chNext))) {
+				sc.SetState(SCE_V_NUMBER);
+			} else if (IsAWordStart(sc.ch)) {
+				sc.SetState(SCE_V_IDENTIFIER);
+			} else if (sc.Match('/', '*')) {
+                                sc.SetState(SCE_V_COMMENT);
+				sc.Forward();	// Eat the * so it isn't used for the end of the comment
+			} else if (sc.Match('/', '/')) {
+				if (sc.Match("//!"))	// Nice to have a different comment style
+					sc.SetState(SCE_V_COMMENTLINEBANG);
+				else
+					sc.SetState(SCE_V_COMMENTLINE);
+			} else if (sc.ch == '\"') {
+				sc.SetState(SCE_V_STRING);
+			} else if (sc.ch == '`') {
+				sc.SetState(SCE_V_PREPROCESSOR);
+				// Skip whitespace between ` and preprocessor word
+				do {
+					sc.Forward();
+				} while ((sc.ch == ' ' || sc.ch == '\t') && sc.More());
+				if (sc.atLineEnd) {
+					sc.SetState(SCE_V_DEFAULT);
+				}
+			} else if (isoperator(static_cast<char>(sc.ch)) || sc.ch == '@' || sc.ch == '#') {
+				sc.SetState(SCE_V_OPERATOR);
+			}
+		}
+	}
+	sc.Complete();
+}
+
+static bool IsStreamCommentStyle(int style) {
+	return style == SCE_V_COMMENT;
+}
+
+// Store both the current line's fold level and the next lines in the
+// level store to make it easy to pick up with each increment
+// and to make it possible to fiddle the current level for "} else {".
+static void FoldNoBoxVerilogDoc(unsigned int startPos, int length, int initStyle,
+                            Accessor &styler) {
+	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
+	bool foldPreprocessor = styler.GetPropertyInt("fold.preprocessor") != 0;
+	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	bool foldAtElse = styler.GetPropertyInt("fold.at.else", 0) != 0;
+        // Verilog specific folding options:
+        // fold_at_module -
+        //      Generally used methodology in verilog code is
+        //      one module per file, so folding at module definition is useless.
+        // fold_at_brace/parenthese -
+        //      Folding of long port lists can be convenient.
+	bool foldAtModule = styler.GetPropertyInt("fold.verilog.flags", 0) != 0;
+	bool foldAtBrace  = 1;
+	bool foldAtParenthese  = 1;
+
+	unsigned int endPos = startPos + length;
+	int visibleChars = 0;
+	int lineCurrent = styler.GetLine(startPos);
+	int levelCurrent = SC_FOLDLEVELBASE;
+	if (lineCurrent > 0)
+		levelCurrent = styler.LevelAt(lineCurrent-1) >> 16;
+	int levelMinCurrent = levelCurrent;
+	int levelNext = levelCurrent;
+	char chNext = styler[startPos];
+	int styleNext = styler.StyleAt(startPos);
+	int style = initStyle;
+	for (unsigned int i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int stylePrev = style;
+		style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+		if (foldComment && IsStreamCommentStyle(style)) {
+			if (!IsStreamCommentStyle(stylePrev)) {
+				levelNext++;
+			} else if (!IsStreamCommentStyle(styleNext) && !atEOL) {
+				// Comments don't end at end of line and the next character may be unstyled.
+				levelNext--;
+			}
+		}
+		if (foldComment && (style == SCE_V_COMMENTLINE)) {
+			if ((ch == '/') && (chNext == '/')) {
+				char chNext2 = styler.SafeGetCharAt(i + 2);
+				if (chNext2 == '{') {
+					levelNext++;
+				} else if (chNext2 == '}') {
+					levelNext--;
+				}
+			}
+		}
+		if (foldPreprocessor && (style == SCE_V_PREPROCESSOR)) {
+			if (ch == '`') {
+				unsigned int j = i + 1;
+				while ((j < endPos) && IsASpaceOrTab(styler.SafeGetCharAt(j))) {
+					j++;
+				}
+				if (styler.Match(j, "if")) {
+					levelNext++;
+				} else if (styler.Match(j, "end")) {
+					levelNext--;
+				}
+			}
+		}
+                if (style == SCE_V_OPERATOR) {
+                    if (foldAtParenthese) {
+			if (ch == '(') {
+				levelNext++;
+			} else if (ch == ')') {
+				levelNext--;
+			}
+                    }
+		}
+                if (style == SCE_V_OPERATOR) {
+                    if (foldAtBrace) {
+			if (ch == '{') {
+				levelNext++;
+			} else if (ch == '}') {
+				levelNext--;
+			}
+                    }
+		}
+                if (style == SCE_V_WORD && stylePrev != SCE_V_WORD) {
+                        unsigned int j = i;
+                        if (styler.Match(j, "case") ||
+                            styler.Match(j, "casex") ||
+                            styler.Match(j, "casez") ||
+                            styler.Match(j, "function") ||
+                            styler.Match(j, "fork") ||
+                            styler.Match(j, "table") ||
+                            styler.Match(j, "task") ||
+                            styler.Match(j, "generate") ||
+                            styler.Match(j, "specify") ||
+                            styler.Match(j, "primitive") ||
+                            styler.Match(j, "module") && foldAtModule ||
+                            styler.Match(j, "begin")) {
+                                levelNext++;
+                        } else if (styler.Match(j, "endcase") ||
+                                   styler.Match(j, "endfunction") ||
+                                   styler.Match(j, "join") ||
+                                   styler.Match(j, "endtask") ||
+                                   styler.Match(j, "endgenerate") ||
+                                   styler.Match(j, "endtable") ||
+                                   styler.Match(j, "endspecify") ||
+                                   styler.Match(j, "endprimitive") ||
+                                   styler.Match(j, "endmodule") && foldAtModule ||
+                                   styler.Match(j, "end") && !IsAWordChar(styler.SafeGetCharAt(j+3))) {
+                                levelNext--;
+                        }
+		}
+		if (atEOL) {
+			int levelUse = levelCurrent;
+			if (foldAtElse) {
+				levelUse = levelMinCurrent;
+			}
+			int lev = levelUse | levelNext << 16;
+			if (visibleChars == 0 && foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if (levelUse < levelNext)
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelCurrent = levelNext;
+			levelMinCurrent = levelCurrent;
+			visibleChars = 0;
+		}
+		if (!isspacechar(ch))
+			visibleChars++;
+	}
+}
+
+static void FoldVerilogDoc(unsigned int startPos, int length, int initStyle, WordList *[],
+                       Accessor &styler) {
+	FoldNoBoxVerilogDoc(startPos, length, initStyle, styler);
+}
+
+static const char * const verilogWordLists[] = {
+            "Primary keywords and identifiers",
+            "Secondary keywords and identifiers",
+            "System Tasks",
+            "User defined tasks and identifiers",
+            "Unused",
+            0,
+        };
+
+
+LexerModule lmVerilog(SCLEX_VERILOG, ColouriseVerilogDoc, "verilog", FoldVerilogDoc, verilogWordLists);
diff --git a/Documents/Scintilla/LexYAML.cxx b/Documents/Scintilla/LexYAML.cxx
new file mode 100644
index 0000000..a4eac3c
--- /dev/null
+++ b/Documents/Scintilla/LexYAML.cxx
@@ -0,0 +1,314 @@
+// Scintilla source code edit control
+/** @file LexYAML.cxx
+ ** Lexer for YAML.
+ **/
+// Copyright 2003- by Sean O'Dell <sean@celsoft.com>
+// Release under the same license as Scintilla/SciTE.
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "Platform.h"
+
+#include "PropSet.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "KeyWords.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
+static const char * const yamlWordListDesc[] = {
+	"Keywords",
+	0
+};
+
+static inline bool AtEOL(Accessor &styler, unsigned int i) {
+	return (styler[i] == '\n') ||
+		((styler[i] == '\r') && (styler.SafeGetCharAt(i + 1) != '\n'));
+}
+
+static unsigned int SpaceCount(char* lineBuffer) {
+	if (lineBuffer == NULL)
+		return 0;
+
+	char* headBuffer = lineBuffer;
+
+	while (*headBuffer == ' ')
+		headBuffer++;
+
+	return headBuffer - lineBuffer;
+}
+
+#define YAML_STATE_BITSIZE 16
+#define YAML_STATE_MASK			(0xFFFF0000)
+#define YAML_STATE_DOCUMENT		(1 << YAML_STATE_BITSIZE)
+#define YAML_STATE_VALUE			(2 << YAML_STATE_BITSIZE)
+#define YAML_STATE_COMMENT		(3 << YAML_STATE_BITSIZE)
+#define YAML_STATE_TEXT_PARENT	(4 << YAML_STATE_BITSIZE)
+#define YAML_STATE_TEXT			(5 << YAML_STATE_BITSIZE)
+
+static void ColouriseYAMLLine(
+	char *lineBuffer,
+	unsigned int currentLine,
+	unsigned int lengthLine,
+	unsigned int startLine,
+	unsigned int endPos,
+	WordList &keywords,
+	Accessor &styler) {
+
+	unsigned int i = 0;
+	bool bInQuotes = false;
+	unsigned int indentAmount = SpaceCount(lineBuffer);
+
+	if (currentLine > 0) {
+		int parentLineState = styler.GetLineState(currentLine - 1);
+
+		if ((parentLineState&YAML_STATE_MASK) == YAML_STATE_TEXT || (parentLineState&YAML_STATE_MASK) == YAML_STATE_TEXT_PARENT) {
+			unsigned int parentIndentAmount = parentLineState&(~YAML_STATE_MASK);
+			if (indentAmount > parentIndentAmount) {
+				styler.SetLineState(currentLine, YAML_STATE_TEXT | parentIndentAmount);
+				styler.ColourTo(endPos, SCE_YAML_TEXT);
+				return;
+			}
+		}
+	}
+	styler.SetLineState(currentLine, 0);
+	if (strncmp(lineBuffer, "---", 3) == 0) {	// Document marker
+		styler.SetLineState(currentLine, YAML_STATE_DOCUMENT);
+		styler.ColourTo(endPos, SCE_YAML_DOCUMENT);
+		return;
+	}
+	// Skip initial spaces
+	while ((i < lengthLine) && lineBuffer[i] == ' ') { // YAML always uses space, never TABS or anything else
+		i++;
+	}
+	if (lineBuffer[i] == '\t') { // if we skipped all spaces, and we are NOT inside a text block, this is wrong
+		styler.ColourTo(endPos, SCE_YAML_ERROR);
+		return;
+	}
+	if (lineBuffer[i] == '#') {	// Comment
+		styler.SetLineState(currentLine, YAML_STATE_COMMENT);
+		styler.ColourTo(endPos, SCE_YAML_COMMENT);
+		return;
+	}
+	while (i < lengthLine) {
+		if (lineBuffer[i] == '\'' || lineBuffer[i] == '\"') {
+			bInQuotes = !bInQuotes;
+		} else if (lineBuffer[i] == ':' && !bInQuotes) {
+			styler.ColourTo(startLine + i - 1, SCE_YAML_IDENTIFIER);
+			styler.ColourTo(startLine + i, SCE_YAML_OPERATOR);
+			// Non-folding scalar
+			i++;
+			while ((i < lengthLine) && isspacechar(lineBuffer[i]))
+				i++;
+			unsigned int endValue = lengthLine - 1;
+			while ((endValue >= i) && isspacechar(lineBuffer[endValue]))
+				endValue--;
+			lineBuffer[endValue + 1] = '\0';
+			if (lineBuffer[i] == '|' || lineBuffer[i] == '>') {
+				i++;
+				if (lineBuffer[i] == '+' || lineBuffer[i] == '-')
+					i++;
+				while ((i < lengthLine) && isspacechar(lineBuffer[i]))
+					i++;
+				if (lineBuffer[i] == '\0') {
+					styler.SetLineState(currentLine, YAML_STATE_TEXT_PARENT | indentAmount);
+					styler.ColourTo(endPos, SCE_YAML_DEFAULT);
+					return;
+				} else if (lineBuffer[i] == '#') {
+					styler.SetLineState(currentLine, YAML_STATE_TEXT_PARENT | indentAmount);
+					styler.ColourTo(startLine + i - 1, SCE_YAML_DEFAULT);
+					styler.ColourTo(endPos, SCE_YAML_COMMENT);
+					return;
+				} else {
+					styler.ColourTo(endPos, SCE_YAML_ERROR);
+					return;
+				}
+			} else if (lineBuffer[i] == '#') {
+				styler.ColourTo(startLine + i - 1, SCE_YAML_DEFAULT);
+				styler.ColourTo(endPos, SCE_YAML_COMMENT);
+				return;
+			}
+			styler.SetLineState(currentLine, YAML_STATE_VALUE);
+			if (lineBuffer[i] == '&' || lineBuffer[i] == '*') {
+				styler.ColourTo(endPos, SCE_YAML_REFERENCE);
+				return;
+			}
+			if (keywords.InList(&lineBuffer[i])) { // Convertible value (true/false, etc.)
+				styler.ColourTo(endPos, SCE_YAML_KEYWORD);
+				return;
+			} else {
+				unsigned int i2 = i;
+				while ((i < lengthLine) && lineBuffer[i]) {
+					if (!(isascii(lineBuffer[i]) && isdigit(lineBuffer[i])) && lineBuffer[i] != '-' && lineBuffer[i] != '.' && lineBuffer[i] != ',') {
+						styler.ColourTo(endPos, SCE_YAML_DEFAULT);
+						return;
+					}
+					i++;
+				}
+				if (i > i2) {
+					styler.ColourTo(endPos, SCE_YAML_NUMBER);
+					return;
+				}
+			}
+			break; // shouldn't get here, but just in case, the rest of the line is coloured the default
+		}
+		i++;
+	}
+	styler.ColourTo(endPos, SCE_YAML_DEFAULT);
+}
+
+static void ColouriseYAMLDoc(unsigned int startPos, int length, int, WordList *keywordLists[], Accessor &styler) {
+	char lineBuffer[1024];
+	styler.StartAt(startPos);
+	styler.StartSegment(startPos);
+	unsigned int linePos = 0;
+	unsigned int startLine = startPos;
+	unsigned int endPos = startPos + length;
+	unsigned int maxPos = styler.Length();
+	unsigned int lineCurrent = styler.GetLine(startPos);
+
+	for (unsigned int i = startPos; i < maxPos && i < endPos; i++) {
+		lineBuffer[linePos++] = styler[i];
+		if (AtEOL(styler, i) || (linePos >= sizeof(lineBuffer) - 1)) {
+			// End of line (or of line buffer) met, colourise it
+			lineBuffer[linePos] = '\0';
+			ColouriseYAMLLine(lineBuffer, lineCurrent, linePos, startLine, i, *keywordLists[0], styler);
+			linePos = 0;
+			startLine = i + 1;
+			lineCurrent++;
+		}
+	}
+	if (linePos > 0) {	// Last line does not have ending characters
+		ColouriseYAMLLine(lineBuffer, lineCurrent, linePos, startLine, startPos + length - 1, *keywordLists[0], styler);
+	}
+}
+
+static bool IsCommentLine(int line, Accessor &styler) {
+	int pos = styler.LineStart(line);
+	if (styler[pos] == '#')
+		return true;
+	return false;
+}
+
+static void FoldYAMLDoc(unsigned int startPos, int length, int /*initStyle - unused*/,
+                      WordList *[], Accessor &styler) {
+	const int maxPos = startPos + length;
+	const int maxLines = styler.GetLine(maxPos - 1);             // Requested last line
+	const int docLines = styler.GetLine(styler.Length() - 1);  // Available last line
+	const bool foldComment = styler.GetPropertyInt("fold.comment.yaml") != 0;
+
+	// Backtrack to previous non-blank line so we can determine indent level
+	// for any white space lines
+	// and so we can fix any preceding fold level (which is why we go back
+	// at least one line in all cases)
+	int spaceFlags = 0;
+	int lineCurrent = styler.GetLine(startPos);
+	int indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags, NULL);
+	while (lineCurrent > 0) {
+		lineCurrent--;
+		indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags, NULL);
+		if (!(indentCurrent & SC_FOLDLEVELWHITEFLAG) &&
+		        (!IsCommentLine(lineCurrent, styler)))
+			break;
+	}
+	int indentCurrentLevel = indentCurrent & SC_FOLDLEVELNUMBERMASK;
+
+	// Set up initial loop state
+	int prevComment = 0;
+	if (lineCurrent >= 1)
+		prevComment = foldComment && IsCommentLine(lineCurrent - 1, styler);
+
+	// Process all characters to end of requested range
+	// or comment that hangs over the end of the range.  Cap processing in all cases
+	// to end of document (in case of unclosed comment at end).
+	while ((lineCurrent <= docLines) && ((lineCurrent <= maxLines) || prevComment)) {
+
+		// Gather info
+		int lev = indentCurrent;
+		int lineNext = lineCurrent + 1;
+		int indentNext = indentCurrent;
+		if (lineNext <= docLines) {
+			// Information about next line is only available if not at end of document
+			indentNext = styler.IndentAmount(lineNext, &spaceFlags, NULL);
+	}
+		const int comment = foldComment && IsCommentLine(lineCurrent, styler);
+		const int comment_start = (comment && !prevComment && (lineNext <= docLines) &&
+		                           IsCommentLine(lineNext, styler) && (lev > SC_FOLDLEVELBASE));
+		const int comment_continue = (comment && prevComment);
+		if (!comment)
+			indentCurrentLevel = indentCurrent & SC_FOLDLEVELNUMBERMASK;
+		if (indentNext & SC_FOLDLEVELWHITEFLAG)
+			indentNext = SC_FOLDLEVELWHITEFLAG | indentCurrentLevel;
+
+		if (comment_start) {
+			// Place fold point at start of a block of comments
+			lev |= SC_FOLDLEVELHEADERFLAG;
+		} else if (comment_continue) {
+			// Add level to rest of lines in the block
+			lev = lev + 1;
+		}
+
+		// Skip past any blank lines for next indent level info; we skip also
+		// comments (all comments, not just those starting in column 0)
+		// which effectively folds them into surrounding code rather
+		// than screwing up folding.
+
+		while ((lineNext < docLines) &&
+		        ((indentNext & SC_FOLDLEVELWHITEFLAG) ||
+		         (lineNext <= docLines && IsCommentLine(lineNext, styler)))) {
+
+			lineNext++;
+			indentNext = styler.IndentAmount(lineNext, &spaceFlags, NULL);
+		}
+
+		const int levelAfterComments = indentNext & SC_FOLDLEVELNUMBERMASK;
+		const int levelBeforeComments = Platform::Maximum(indentCurrentLevel,levelAfterComments);
+
+		// Now set all the indent levels on the lines we skipped
+		// Do this from end to start.  Once we encounter one line
+		// which is indented more than the line after the end of
+		// the comment-block, use the level of the block before
+
+		int skipLine = lineNext;
+		int skipLevel = levelAfterComments;
+
+		while (--skipLine > lineCurrent) {
+			int skipLineIndent = styler.IndentAmount(skipLine, &spaceFlags, NULL);
+
+			if ((skipLineIndent & SC_FOLDLEVELNUMBERMASK) > levelAfterComments)
+				skipLevel = levelBeforeComments;
+
+			int whiteFlag = skipLineIndent & SC_FOLDLEVELWHITEFLAG;
+
+			styler.SetLevel(skipLine, skipLevel | whiteFlag);
+		}
+
+		// Set fold header on non-comment line
+		if (!comment && !(indentCurrent & SC_FOLDLEVELWHITEFLAG) ) {
+			if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext & SC_FOLDLEVELNUMBERMASK))
+				lev |= SC_FOLDLEVELHEADERFLAG;
+		}
+
+		// Keep track of block comment state of previous line
+		prevComment = comment_start || comment_continue;
+
+		// Set fold level for this line and move to next line
+		styler.SetLevel(lineCurrent, lev);
+		indentCurrent = indentNext;
+		lineCurrent = lineNext;
+	}
+
+	// NOTE: Cannot set level of last line here because indentCurrent doesn't have
+	// header flag set; the loop above is crafted to take care of this case!
+	//styler.SetLevel(lineCurrent, indentCurrent);
+}
+
+LexerModule lmYAML(SCLEX_YAML, ColouriseYAMLDoc, "yaml", FoldYAMLDoc, yamlWordListDesc);
diff --git a/Documents/Scintilla/ScintillaDoc.html b/Documents/Scintilla/ScintillaDoc.html
new file mode 100644
index 0000000..c5dd473
--- /dev/null
+++ b/Documents/Scintilla/ScintillaDoc.html
@@ -0,0 +1,5641 @@
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta name="generator"
+    content="HTML Tidy for Windows (vers 1st August 2002), see www.w3.org" />
+    <meta name="generator" content="SciTE" />
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+
+    <title>Scintilla and SciTE</title>
+
+    <style type="text/css">
+<!--
+/*<![CDATA[*/
+    CODE { font-family: "Courier New", monospace; }
+    A:visited { color: blue; }
+    A:hover { text-decoration: underline ! important; }
+    A.message { text-decoration: none; font-family: "Courier New", monospace; }
+    A.toc { text-decoration: none; }
+    A.jump { text-decoration: none; }
+/*]]>*/
+-->
+    </style>
+  </head>
+
+  <body bgcolor="#FFFFFF" text="#000000">
+    <table bgcolor="#000000" width="100%" cellspacing="0" cellpadding="0" border="0"
+    summary="Banner">
+      <tr>
+        <td><img src="SciTEIco.png" border="3" height="64" width="64" alt="Scintilla icon" /></td>
+
+        <td><a href="index.html"
+        style="color:white;text-decoration:none;font-size:200%">Scintilla</a></td>
+      </tr>
+    </table>
+
+    <h1>Scintilla Documentation</h1>
+
+    <p>Last edited 20/June/2007 NH</p>
+
+    <p>There is <a class="jump" href="Design.html">an overview of the internal design of
+    Scintilla</a>.<br />
+     <a class="jump" href="ScintillaUsage.html">Some notes on using Scintilla</a>.<br />
+     <a class="jump" href="Steps.html">How to use the Scintilla Edit Control on Windows</a>.<br />
+     <a class="jump" href="http://www.scintilla.org/dmapp.zip">A simple sample using Scintilla from
+    C++ on Windows</a>.<br />
+     <a class="jump" href="http://www.scintilla.org/SciTry.vb">A simple sample using Scintilla from
+    Visual Basic</a>.<br />
+     <a class="jump" href="http://www.scintilla.org/bait.zip">Bait is a tiny sample using Scintilla
+     on GTK+</a>.<br />
+     <a class="jump" href="Lexer.txt">A detailed description of how to write a lexer, including a
+    discussion of folding</a>.<br />
+     <a class="jump" href="http://sphere.sourceforge.net/flik/docs/scintilla-container_lexer.html">
+     How to implement a lexer in the container</a>.<br />
+     <a class="jump" href="http://sphere.sourceforge.net/flik/docs/scintilla-folding.html">
+     How to implement folding</a>.<br />
+     The <a class="jump" href="SciCoding.html">coding style</a> used in Scintilla and SciTE is
+    worth following if you want to contribute code to Scintilla but is not compulsory.</p>
+
+    <h2>Introduction</h2>
+
+    <p>The Windows version of Scintilla is a Windows Control. As such, its primary programming
+    interface is through Windows messages. Early versions of Scintilla emulated much of the API
+    defined by the standard Windows Edit and RichEdit controls but those APIs are now deprecated in
+    favour of Scintilla's own, more consistent API. In addition to messages performing the actions
+    of a normal Edit control, Scintilla allows control of syntax styling, folding, markers, autocompletion
+    and call tips.</p>
+
+    <p>The GTK+ version also uses messages in a similar way to the Windows version. This is
+    different to normal GTK+ practice but made it easier to implement rapidly.</p>
+
+    <p>This documentation describes the individual messages and notifications used by Scintilla. It
+    does not describe how to link them together to form a useful editor. For now, the best way to
+    work out how to develop using Scintilla is to see how SciTE uses it. SciTE exercises most of
+    Scintilla's facilities.</p>
+
+    <p>In the descriptions that follow, the messages are described as function calls with zero, one
+    or two arguments. These two arguments are the standard <code>wParam</code> and
+    <code>lParam</code> familiar to Windows programmers. These parameters are integers that
+    are large enough to hold pointers, and the return value is also an integer large enough to contain a
+    pointer.
+    Although the commands only use the
+    arguments described, because all messages have two arguments whether Scintilla uses them or
+    not, it is strongly recommended that any unused arguments are set to 0. This allows future
+    enhancement of messages without the risk of breaking existing code. Common argument types
+    are:</p>
+
+    <table cellpadding="1" cellspacing="2" border="0" summary="Common argument types">
+      <tbody valign="top">
+        <tr>
+          <th align="left">bool</th>
+
+          <td>Arguments expect the values 0 for <code>false</code> and 1 for
+          <code>true</code>.</td>
+        </tr>
+
+        <tr>
+          <th align="left">int</th>
+
+          <td>Arguments are 32-bit signed integers.</td>
+        </tr>
+
+        <tr>
+          <th align="left">const&nbsp;char&nbsp;*</th>
+
+          <td>Arguments point at text that is being passed to Scintilla but not modified. The text
+          may be zero terminated or another argument may specify the character count, the
+          description will make this clear.</td>
+        </tr>
+
+        <tr>
+          <th align="left">char *</th>
+
+          <td>Arguments point at text buffers that Scintilla will fill with text. In some cases,
+          another argument will tell Scintilla the buffer size. In others, you must make sure that
+          the buffer is big enough to hold the requested text. If a NULL pointer (0) is passed
+          then, for SCI_* calls, the length that should be allocated is returned.</td>
+        </tr>
+
+        <tr>
+          <th align="left" id="colour">colour</th>
+
+          <td>Colours are set using the RGB format (Red, Green, Blue). The intensity of each colour
+          is set in the range 0 to 255. If you have three such intensities, they are combined as:
+          red | (green &lt;&lt; 8) | (blue &lt;&lt; 16). If you set all intensities to 255, the
+          colour is white. If you set all intensities to 0, the colour is black. When you set a
+          colour, you are making a request. What you will get depends on the capabilities of the
+          system and the current screen mode.</td>
+        </tr>
+
+        <tr>
+          <th align="left" id="alpha">alpha</th>
+
+          <td>Translucency is set using an alpha value.
+                        Alpha ranges from 0 (SC_ALPHA_TRANSPARENT) which is completely transparent to
+                               255 (SC_ALPHA_OPAQUE) which is opaque. The value 256 (SC_ALPHA_NOALPHA)
+                               is opaque and uses code that is not alpha-aware and may be faster. Not all platforms support
+                               translucency and only some Scintilla features implement translucency.
+                               The default alpha value for most features is SC_ALPHA_NOALPHA.</td>
+        </tr>
+
+        <tr>
+          <th align="left">&lt;unused&gt;</th>
+
+          <td>This is an unused argument. Setting it to 0 will ensure compatibility with future
+          enhancements.</td>
+        </tr>
+      </tbody>
+    </table>
+
+    <h2 id="MessageCategories">Contents</h2>
+
+    <table cellpadding="4" cellspacing="2" border="0" summary="Message categories">
+      <tbody>
+        <tr>
+          <td>o <a class="toc" href="#TextRetrievalAndModification">Text retrieval and
+          modification</a></td>
+
+          <td>o <a class="toc" href="#Searching">Searching and replacing</a></td>
+
+          <td>o <a class="toc" href="#Overtype">Overtype</a></td>
+        </tr>
+
+        <tr>
+          <td>o <a class="toc" href="#CutCopyAndPaste">Cut, copy and paste</a></td>
+
+          <td>o <a class="toc" href="#ErrorHandling">Error handling</a></td>
+
+          <td>o <a class="toc" href="#UndoAndRedo">Undo and Redo</a></td>
+        </tr>
+
+        <tr>
+          <td>o <a class="toc" href="#SelectionAndInformation">Selection and information</a></td>
+
+          <td>o <a class="toc" href="#ScrollingAndAutomaticScrolling">Scrolling and automatic
+          scrolling</a></td>
+
+          <td>o <a class="toc" href="#WhiteSpace">White space</a></td>
+        </tr>
+
+        <tr>
+          <td>o <a class="toc" href="#Cursor">Cursor</a></td>
+
+          <td>o <a class="toc" href="#MouseCapture">Mouse capture</a></td>
+
+          <td>o <a class="toc" href="#LineEndings">Line endings</a></td>
+        </tr>
+
+        <tr>
+          <td>o <a class="toc" href="#Styling">Styling</a></td>
+
+          <td>o <a class="toc" href="#StyleDefinition">Style definition</a></td>
+
+          <td>o <a class="toc" href="#CaretAndSelectionStyles">Caret, selection, and hotspot styles</a></td>
+        </tr>
+
+        <tr>
+          <td>o <a class="toc" href="#Margins">Margins</a></td>
+
+          <td>o <a class="toc" href="#OtherSettings">Other settings</a></td>
+
+          <td>o <a class="toc" href="#BraceHighlighting">Brace highlighting</a></td>
+        </tr>
+
+        <tr>
+          <td>o <a class="toc" href="#TabsAndIndentationGuides">Tabs and Indentation
+          Guides</a></td>
+
+          <td>o <a class="toc" href="#Markers">Markers</a></td>
+
+          <td>o <a class="toc" href="#Indicators">Indicators</a></td>
+        </tr>
+
+        <tr>
+          <td>o <a class="toc" href="#Autocompletion">Autocompletion</a></td>
+
+          <td>o <a class="toc" href="#UserLists">User lists</a></td>
+
+          <td>o <a class="toc" href="#CallTips">Call tips</a></td>
+        </tr>
+
+        <tr>
+          <td>o <a class="toc" href="#KeyboardCommands">Keyboard commands</a></td>
+
+          <td>o <a class="toc" href="#KeyBindings">Key bindings</a></td>
+
+          <td>o <a class="toc" href="#PopupEditMenu">Popup edit menu</a></td>
+        </tr>
+
+        <tr>
+          <td>o <a class="toc" href="#MacroRecording">Macro recording</a></td>
+
+          <td>o <a class="toc" href="#Printing">Printing</a></td>
+
+          <td>o <a class="toc" href="#DirectAccess">Direct access</a></td>
+        </tr>
+
+        <tr>
+          <td>o <a class="toc" href="#MultipleViews">Multiple views</a></td>
+
+          <td>o <a class="toc" href="#Folding">Folding</a></td>
+
+          <td>o <a class="toc" href="#LineWrapping">Line wrapping</a></td>
+        </tr>
+
+        <tr>
+          <td>o <a class="toc" href="#Zooming">Zooming</a></td>
+
+          <td>o <a class="toc" href="#LongLines">Long lines</a></td>
+
+          <td>o <a class="toc" href="#Lexer">Lexer</a></td>
+        </tr>
+
+        <tr>
+          <td>o <a class="toc" href="#Notifications">Notifications</a></td>
+
+          <td>o <a class="toc" href="#GTK">GTK+</a></td>
+
+          <td>o <a class="toc" href="#DeprecatedMessages">Deprecated messages</a></td>
+        </tr>
+
+        <tr>
+          <td>o <a class="toc" href="#EditMessagesNeverSupportedByScintilla">Edit messages never
+          supported by Scintilla</a></td>
+
+          <td>o <a class="toc" href="#BuildingScintilla">Building Scintilla</a></td>
+        </tr>
+      </tbody>
+    </table>
+
+    <p>Messages with names of the form <code>SCI_SETxxxxx</code> often have a companion
+    <code>SCI_GETxxxxx</code>. To save tedious repetition, if the <code>SCI_GETxxxxx</code> message
+    returns the value set by the <code>SCI_SETxxxxx</code> message, the <code>SET</code> routine is
+    described and the <code>GET</code> routine is left to your imagination.</p>
+
+    <h2 id="TextRetrievalAndModification">Text retrieval and modification</h2>
+
+    <p>Each character in a Scintilla document is followed by an associated byte of styling
+    information. The combination of a character byte and a style byte is called a cell. Style bytes
+    are interpreted an index into an array of styles.
+    Style bytes may be split into an index and a set of indicator bits
+    but this use is discouraged and indicators should now use
+    <a class="message" href ="#SCI_INDICATORFILLRANGE">SCI_INDICATORFILLRANGE</a>
+    and related calls.
+    The default split is with the index in the low 5 bits and 3 high bits as <a class="jump"
+    href="#Indicators">indicators</a>. This allows 32 fundamental styles, which is enough for most
+    languages, and three independent indicators so that, for example, syntax errors, deprecated
+    names and bad indentation could all be displayed at once. The number of bits used for styles
+    can be altered with <a class="message"
+    href="#SCI_SETSTYLEBITS"><code>SCI_SETSTYLEBITS</code></a> up to a maximum of 7 bits.
+    The remaining bits can be used for indicators.</p>
+
+    <p>Positions within the Scintilla document refer to a character or the gap before that
+    character. The first character in a document is 0, the second 1 and so on. If a document
+    contains <code>nLen</code> characters, the last character is numbered <code>nLen</code>-1.
+    The caret exists between character positions and can be located from before the first character (0)
+    to after the last character (<code>nLen</code>).</p>
+
+    <p>There are places where the caret can not go where two character bytes make up one character.
+    This occurs when a DBCS character from a language like Japanese is included in the document or
+    when line ends are marked with the CP/M standard of a carriage return followed by a line feed.
+    The <code>INVALID_POSITION</code> constant (-1) represents an invalid position within the
+    document.</p>
+
+    <p>All lines of text in Scintilla are the same height, and this height is calculated from the
+    largest font in any current style. This restriction is for performance; if lines differed in
+    height then calculations involving positioning of text would require the text to be styled
+    first.</p>
+    <code><a class="message" href="#SCI_GETTEXT">SCI_GETTEXT(int length, char *text)</a><br />
+     <a class="message" href="#SCI_SETTEXT">SCI_SETTEXT(&lt;unused&gt;, const char *text)</a><br />
+     <a class="message" href="#SCI_SETSAVEPOINT">SCI_SETSAVEPOINT</a><br />
+     <a class="message" href="#SCI_GETLINE">SCI_GETLINE(int line, char *text)</a><br />
+     <a class="message" href="#SCI_REPLACESEL">SCI_REPLACESEL(&lt;unused&gt;, const char
+    *text)</a><br />
+     <a class="message" href="#SCI_SETREADONLY">SCI_SETREADONLY(bool readOnly)</a><br />
+     <a class="message" href="#SCI_GETREADONLY">SCI_GETREADONLY</a><br />
+     <a class="message" href="#SCI_GETTEXTRANGE">SCI_GETTEXTRANGE(&lt;unused&gt;, TextRange
+    *tr)</a><br />
+     <a class="message" href="#SCI_ALLOCATE">SCI_ALLOCATE(int bytes, &lt;unused&gt;)</a><br />
+     <a class="message" href="#SCI_ADDTEXT">SCI_ADDTEXT(int length, const char *s)</a><br />
+     <a class="message" href="#SCI_ADDSTYLEDTEXT">SCI_ADDSTYLEDTEXT(int length, cell *s)</a><br />
+     <a class="message" href="#SCI_APPENDTEXT">SCI_APPENDTEXT(int length, const char *s)</a><br />
+     <a class="message" href="#SCI_INSERTTEXT">SCI_INSERTTEXT(int pos, const char *text)</a><br />
+     <a class="message" href="#SCI_CLEARALL">SCI_CLEARALL</a><br />
+     <a class="message" href="#SCI_CLEARDOCUMENTSTYLE">SCI_CLEARDOCUMENTSTYLE</a><br />
+     <a class="message" href="#SCI_GETCHARAT">SCI_GETCHARAT(int position)</a><br />
+     <a class="message" href="#SCI_GETSTYLEAT">SCI_GETSTYLEAT(int position)</a><br />
+     <a class="message" href="#SCI_GETSTYLEDTEXT">SCI_GETSTYLEDTEXT(&lt;unused&gt;, TextRange
+    *tr)</a><br />
+     <a class="message" href="#SCI_SETSTYLEBITS">SCI_SETSTYLEBITS(int bits)</a><br />
+     <a class="message" href="#SCI_GETSTYLEBITS">SCI_GETSTYLEBITS</a><br />
+     <a class="message" href="#SCI_TARGETASUTF8">SCI_TARGETASUTF8(&lt;unused&gt;, char *s)</a><br />
+     <a class="message" href="#SCI_ENCODEDFROMUTF8">SCI_ENCODEDFROMUTF8(const char *utf8, char *encoded)</a><br />
+     <a class="message" href="#SCI_SETLENGTHFORENCODE">SCI_SETLENGTHFORENCODE(int bytes)</a><br />
+    </code>
+
+    <p><b id="SCI_GETTEXT">SCI_GETTEXT(int length, char *text)</b><br />
+     This returns <code>length</code>-1 characters of text from the start of the document plus one
+    terminating 0 character. To collect all the text in a document, use <code>SCI_GETLENGTH</code>
+    to get the number of characters in the document (<code>nLen</code>), allocate a character
+    buffer of length <code>nLen+1</code> bytes, then call <code>SCI_GETTEXT(nLen+1, char
+    *text)</code>. If the text argument is 0 then the length that should be allocated to store the
+    entire document is returned.
+    If you then save the text, you should use <code>SCI_SETSAVEPOINT</code> to mark
+    the text as unmodified.</p>
+
+    <p>See also: <code><a class="message" href="#SCI_GETSELTEXT">SCI_GETSELTEXT</a>, <a
+    class="message" href="#SCI_GETCURLINE">SCI_GETCURLINE</a>, <a class="message"
+    href="#SCI_GETLINE">SCI_GETLINE</a>, <a class="message"
+    href="#SCI_GETSTYLEDTEXT">SCI_GETSTYLEDTEXT</a>, <a class="message"
+    href="#SCI_GETTEXTRANGE">SCI_GETTEXTRANGE</a></code></p>
+
+    <p><b id="SCI_SETTEXT">SCI_SETTEXT(&lt;unused&gt;, const char *text)</b><br />
+     This replaces all the text in the document with the zero terminated text string you pass
+    in.</p>
+
+    <p><b id="SCI_SETSAVEPOINT">SCI_SETSAVEPOINT</b><br />
+     This message tells Scintilla that the current state of the document is unmodified. This is
+    usually done when the file is saved or loaded, hence the name "save point". As Scintilla
+    performs undo and redo operations, it notifies the container that it has entered or left the
+    save point with <code><a class="message"
+    href="#SCN_SAVEPOINTREACHED">SCN_SAVEPOINTREACHED</a></code> and <code><a class="message"
+    href="#SCN_SAVEPOINTLEFT">SCN_SAVEPOINTLEFT</a></code> <a class="jump"
+    href="#Notifications">notification messages</a>, allowing the container to know if the file
+    should be considered dirty or not.</p>
+
+    <p>See also: <code><a class="message" href="#SCI_EMPTYUNDOBUFFER">SCI_EMPTYUNDOBUFFER</a>, <a
+    class="message" href="#SCI_GETMODIFY">SCI_GETMODIFY</a></code></p>
+
+    <p><b id="SCI_GETLINE">SCI_GETLINE(int line, char *text)</b><br />
+     This fills the buffer defined by text with the contents of the nominated line (lines start at
+    0). The buffer is not terminated by a 0 character. It is up to you to make sure that the buffer
+    is long enough for the text, use <a class="message"
+    href="#SCI_LINELENGTH"><code>SCI_LINELENGTH(int line)</code></a>. The returned value is the
+    number of characters copied to the buffer. The returned text includes any end of line
+    characters. If you ask for a line number outside the range of lines in the document, 0
+    characters are copied. If the text argument is 0 then the length that should be allocated
+    to store the entire line is returned.</p>
+
+    <p>See also: <code><a class="message" href="#SCI_GETCURLINE">SCI_GETCURLINE</a>, <a
+    class="message" href="#SCI_GETSELTEXT">SCI_GETSELTEXT</a>, <a class="message"
+    href="#SCI_GETTEXTRANGE">SCI_GETTEXTRANGE</a>, <a class="message"
+    href="#SCI_GETSTYLEDTEXT">SCI_GETSTYLEDTEXT</a>, <a class="message"
+    href="#SCI_GETTEXT">SCI_GETTEXT</a></code></p>
+
+    <p><b id="SCI_REPLACESEL">SCI_REPLACESEL(&lt;unused&gt;, const char *text)</b><br />
+     The currently selected text between the <a class="jump" href="#SelectionAndInformation">anchor
+    and the current position</a> is replaced by the 0 terminated text string. If the anchor and
+    current position are the same, the text is inserted at the caret position. The caret is
+    positioned after the inserted text and the caret is scrolled into view.</p>
+
+    <p><b id="SCI_SETREADONLY">SCI_SETREADONLY(bool readOnly)</b><br />
+     <b id="SCI_GETREADONLY">SCI_GETREADONLY</b><br />
+     These messages set and get the read-only flag for the document. If you mark a document as read
+    only, attempts to modify the text cause the <a class="message"
+    href="#SCN_MODIFYATTEMPTRO"><code>SCN_MODIFYATTEMPTRO</code></a> notification.</p>
+
+    <p><b id="SCI_GETTEXTRANGE">SCI_GETTEXTRANGE(&lt;unused&gt;, <a class="jump"
+    href="#TextRange">TextRange</a> *tr)</b><br />
+     This collects the text between the positions <code>cpMin</code> and <code>cpMax</code> and
+    copies it to <code>lpstrText</code> (see <code>struct TextRange</code> in
+    <code>Scintilla.h</code>). If <code>cpMax</code> is -1, text is returned to the end of the
+    document. The text is 0 terminated, so you must supply a buffer that is at least 1 character
+    longer than the number of characters you wish to read. The return value is the length of the
+    returned text not including the terminating 0.</p>
+
+    <p>See also: <code><a class="message" href="#SCI_GETSELTEXT">SCI_GETSELTEXT</a>, <a
+    class="message" href="#SCI_GETLINE">SCI_GETLINE</a>, <a class="message"
+    href="#SCI_GETCURLINE">SCI_GETCURLINE</a>, <a class="message"
+    href="#SCI_GETSTYLEDTEXT">SCI_GETSTYLEDTEXT</a>, <a class="message"
+    href="#SCI_GETTEXT">SCI_GETTEXT</a></code></p>
+
+    <p><b id="SCI_GETSTYLEDTEXT">SCI_GETSTYLEDTEXT(&lt;unused&gt;, <a class="jump"
+    href="#TextRange">TextRange</a> *tr)</b><br />
+     This collects styled text into a buffer using two bytes for each cell, with the character at
+    the lower address of each pair and the style byte at the upper address. Characters between the
+    positions <code>cpMin</code> and <code>cpMax</code> are copied to <code>lpstrText</code> (see
+    <code>struct TextRange</code> in <code>Scintilla.h</code>). Two 0 bytes are added to the end of
+    the text, so the buffer that <code>lpstrText</code> points at must be at least
+    <code>2*(cpMax-cpMin)+2</code> bytes long. No check is made for sensible values of
+    <code>cpMin</code> or <code>cpMax</code>. Positions outside the document return character codes
+    and style bytes of 0.</p>
+
+    <p>See also: <code><a class="message" href="#SCI_GETSELTEXT">SCI_GETSELTEXT</a>, <a
+    class="message" href="#SCI_GETLINE">SCI_GETLINE</a>, <a class="message"
+    href="#SCI_GETCURLINE">SCI_GETCURLINE</a>, <a class="message"
+    href="#SCI_GETTEXTRANGE">SCI_GETTEXTRANGE</a>, <a class="message"
+    href="#SCI_GETTEXT">SCI_GETTEXT</a></code></p>
+
+    <p><b id="SCI_ALLOCATE">SCI_ALLOCATE(int bytes, &lt;unused&gt;)</b><br />
+     Allocate a document buffer large enough to store a given number of bytes.
+     The document will not be made smaller than its current contents.</p>
+
+    <p><b id="SCI_ADDTEXT">SCI_ADDTEXT(int length, const char *s)</b><br />
+     This inserts the first <code>length</code> characters from the string <code>s</code>
+    at the current position. This will include any 0's in the string that you might have expected
+    to stop the insert operation. The current position is set at the end of the inserted text,
+    but it is not scrolled into view.</p>
+
+    <p><b id="SCI_ADDSTYLEDTEXT">SCI_ADDSTYLEDTEXT(int length, cell *s)</b><br />
+     This behaves just like <code>SCI_ADDTEXT</code>, but inserts styled text.</p>
+
+    <p><b id="SCI_APPENDTEXT">SCI_APPENDTEXT(int length, const char *s)</b><br />
+     This adds the first <code>length</code> characters from the string <code>s</code> to the end
+    of the document. This will include any 0's in the string that you might have expected to stop
+    the operation. The current selection is not changed and the new text is not scrolled into
+    view.</p>
+
+    <p><b id="SCI_INSERTTEXT">SCI_INSERTTEXT(int pos, const char *text)</b><br />
+     This inserts the zero terminated <code>text</code> string at position <code>pos</code> or at
+    the current position if <code>pos</code> is -1. If the current position is after the insertion point
+    then it is moved along with its surrounding text but no scrolling is performed.</p>
+
+    <p><b id="SCI_CLEARALL">SCI_CLEARALL</b><br />
+     Unless the document is read-only, this deletes all the text.</p>
+
+    <p><b id="SCI_CLEARDOCUMENTSTYLE">SCI_CLEARDOCUMENTSTYLE</b><br />
+     When wanting to completely restyle the document, for example after choosing a lexer, the
+    <code>SCI_CLEARDOCUMENTSTYLE</code> can be used to clear all styling information and reset the
+    folding state.</p>
+
+    <p><b id="SCI_GETCHARAT">SCI_GETCHARAT(int pos)</b><br />
+     This returns the character at <code>pos</code> in the document or 0 if <code>pos</code> is
+    negative or past the end of the document.</p>
+
+    <p><b id="SCI_GETSTYLEAT">SCI_GETSTYLEAT(int pos)</b><br />
+     This returns the style at <code>pos</code> in the document, or 0 if <code>pos</code> is
+    negative or past the end of the document.</p>
+
+    <p><b id="SCI_SETSTYLEBITS">SCI_SETSTYLEBITS(int bits)</b><br />
+     <b id="SCI_GETSTYLEBITS">SCI_GETSTYLEBITS</b><br />
+     This pair of routines sets and reads back the number of bits in each cell to use for styling,
+    to a maximum of 7 style bits. The remaining bits can be used as indicators. The standard
+    setting is <code>SCI_SETSTYLEBITS(5)</code>.
+    The number of styling bits needed by the current lexer can be found with
+    <a class="message" href="#SCI_GETSTYLEBITSNEEDED">SCI_GETSTYLEBITSNEEDED</a>.</p>
+
+    <p><b id="TextRange">TextRange</b> and <b id="CharacterRange">CharacterRange</b><br />
+     These structures are defined to be exactly the same shape as the Win32 <code>TEXTRANGE</code>
+    and <code>CHARRANGE</code>, so that older code that treats Scintilla as a RichEdit will
+    work.</p>
+<pre>
+struct CharacterRange {
+    long cpMin;
+    long cpMax;
+};
+
+struct TextRange {
+    struct CharacterRange chrg;
+    char *lpstrText;
+};
+</pre>
+
+    <h3 id="EncodedAccess">GTK+-specific: Access to encoded text</h3>
+
+    <p><b id="SCI_TARGETASUTF8">SCI_TARGETASUTF8(&lt;unused&gt;, char *s)</b><br />
+     This method retrieves the value of the target encoded as UTF-8 which is the default
+     encoding of GTK+ so is useful for retrieving text for use in other parts of the user interface,
+     such as find and replace dialogs. The length of the encoded text in bytes is returned.
+    </p>
+
+    <p><b id="SCI_ENCODEDFROMUTF8">SCI_ENCODEDFROMUTF8(const char *utf8, char *encoded)</b><br />
+     <b id="SCI_SETLENGTHFORENCODE">SCI_SETLENGTHFORENCODE(int bytes)</b><br />
+     <code>SCI_ENCODEDFROMUTF8</code> converts a UTF-8 string into the document's
+     encoding which is useful for taking the results of a find dialog, for example, and receiving
+     a string of bytes that can be searched for in the document. Since the text can contain nul bytes,
+     the <code>SCI_SETLENGTHFORENCODE</code> method can be used to set the
+     length that will be converted. If set to -1, the length is determined by finding a nul byte.
+     The length of the converted string is returned.
+    </p>
+
+
+    <h2 id="Searching">Searching</h2>
+    <p>
+    There are methods to search for text and for regular expressions. The regular expression support
+    is limited and should only be used for simple cases and initial development. A different regular expression
+    library can be <a class="jump" href="#AlternativeRegEx">integrated into Scintilla</a>
+    or can be called from the container using direct access to the buffer contents through
+    <a class="jump" href="#SCI_GETCHARACTERPOINTER">SCI_GETCHARACTERPOINTER</a>.
+    </p>
+    <code><a class="message" href="#SCI_FINDTEXT">SCI_FINDTEXT(int flags, TextToFind
+    *ttf)</a><br />
+     <a class="message" href="#SCI_SEARCHANCHOR">SCI_SEARCHANCHOR</a><br />
+     <a class="message" href="#SCI_SEARCHNEXT">SCI_SEARCHNEXT(int searchFlags, const char
+    *text)</a><br />
+     <a class="message" href="#SCI_SEARCHPREV">SCI_SEARCHPREV(int searchFlags, const char
+    *text)</a><br />
+     <a class="jump" href="#SearchAndReplaceUsingTheTarget">Search and replace using the
+    target</a><br />
+    </code>
+
+    <p><b id="searchFlags"><code>searchFlags</code></b><br />
+     Several of the search routines use flag options, which include a simple regular expression
+    search. Combine the flag options by adding them:</p>
+
+    <table border="0" summary="Search flags">
+      <tbody>
+        <tr>
+          <td><code>SCFIND_MATCHCASE</code></td>
+
+          <td>A match only occurs with text that matches the case of the search string.</td>
+        </tr>
+
+        <tr>
+          <td><code>SCFIND_WHOLEWORD</code></td>
+
+          <td>A match only occurs if the characters before and after are not word characters.</td>
+        </tr>
+
+        <tr>
+          <td><code>SCFIND_WORDSTART</code></td>
+
+          <td>A match only occurs if the character before is not a word character.</td>
+        </tr>
+
+        <tr>
+          <td><code>SCFIND_REGEXP</code></td>
+
+          <td>The search string should be interpreted as a regular expression.</td>
+        </tr>
+        <tr>
+          <td><code>SCFIND_POSIX</code></td>
+
+          <td>Treat regular expression in a more POSIX compatible manner
+            by interpreting bare ( and ) for tagged sections rather than \( and \).</td>
+        </tr>
+      </tbody>
+    </table>
+
+    <p>If <code>SCFIND_REGEXP</code> is not included in the <code>searchFlags</code>, you can
+    search backwards to find the previous occurrence of a search string by setting the end of the
+    search range before the start. If <code>SCFIND_REGEXP</code> is included, searches are always
+    from a lower position to a higher position, even if the search range is backwards.</p>
+
+    <p>In a regular expression, special characters interpreted are:</p>
+
+    <table border="0" summary="Regular expression synopsis">
+      <tbody>
+        <tr>
+          <td><code>.</code></td>
+
+          <td>Matches any character</td>
+        </tr>
+
+        <tr>
+          <td><code>\(</code></td>
+
+          <td>This marks the start of a region for tagging a match.</td>
+        </tr>
+
+        <tr>
+          <td><code>\)</code></td>
+
+          <td>This marks the end of a tagged region.</td>
+        </tr>
+
+        <tr>
+          <td><code>\n</code></td>
+
+          <td>Where <code>n</code> is 1 through 9 refers to the first through ninth tagged region
+          when replacing. For example, if the search string was <code>Fred\([1-9]\)XXX</code> and
+          the replace string was <code>Sam\1YYY</code>, when applied to <code>Fred2XXX</code> this
+          would generate <code>Sam2YYY</code>.</td>
+        </tr>
+
+        <tr>
+          <td><code>\&lt;</code></td>
+
+          <td>This matches the start of a word using Scintilla's definitions of words.</td>
+        </tr>
+
+        <tr>
+          <td><code>\&gt;</code></td>
+
+          <td>This matches the end of a word using Scintilla's definition of words.</td>
+        </tr>
+
+        <tr>
+          <td><code>\x</code></td>
+
+          <td>This allows you to use a character x that would otherwise have a special meaning. For
+          example, \[ would be interpreted as [ and not as the start of a character set.</td>
+        </tr>
+
+        <tr>
+          <td><code>[...]</code></td>
+
+          <td>This indicates a set of characters, for example, [abc] means any of the characters a,
+          b or c. You can also use ranges, for example [a-z] for any lower case character.</td>
+        </tr>
+
+        <tr>
+          <td><code>[^...]</code></td>
+
+          <td>The complement of the characters in the set. For example, [^A-Za-z] means any
+          character except an alphabetic character.</td>
+        </tr>
+
+        <tr>
+          <td><code>^</code></td>
+
+          <td>This matches the start of a line (unless used inside a set, see above).</td>
+        </tr>
+
+        <tr>
+          <td><code>$</code></td>
+
+          <td>This matches the end of a line.</td>
+        </tr>
+
+        <tr>
+          <td><code>*</code></td>
+
+          <td>This matches 0 or more times. For example, <code>Sa*m</code> matches <code>Sm</code>,
+          <code>Sam</code>, <code>Saam</code>, <code>Saaam</code> and so on.</td>
+        </tr>
+
+        <tr>
+          <td><code>+</code></td>
+
+          <td>This matches 1 or more times. For example, <code>Sa+m</code> matches
+          <code>Sam</code>, <code>Saam</code>, <code>Saaam</code> and so on.</td>
+        </tr>
+      </tbody>
+    </table>
+
+    <p><b id="SCI_FINDTEXT">SCI_FINDTEXT(int searchFlags, <a class="jump"
+    href="#TextToFind">TextToFind</a> *ttf)</b><br />
+     This message searches for text in the document. It does not use or move the current selection.
+    The <a class="jump" href="#searchFlags"><code>searchFlags</code></a> argument controls the
+    search type, which includes regular expression searches.</p>
+
+    <p>The <code>TextToFind</code> structure is defined in <code>Scintilla.h</code>; set
+    <code>chrg.cpMin</code> and <code>chrg.cpMax</code> with the range of positions in the document
+    to search. If <code>SCFIND_REGEXP</code> is not included in the flags, you can search backwards by
+    setting <code>chrg.cpMax</code> less than <code>chrg.cpMin</code>. If <code>SCFIND_REGEXP</code>
+    is included, the search is always forwards (even if <code>chrg.cpMax</code> is less than <code>chrg.cpMin</code>).
+    Set the <code>lpstrText</code> member of <code>TextToFind</code> to point at a zero terminated
+    text string holding the search pattern. If your language makes the use of <code>TextToFind</code>
+    difficult, you should consider using <code>SCI_SEARCHINTARGET</code> instead.</p>
+
+    <p>The return value is -1 if the search fails or the position of the start of the found text if
+    it succeeds. The <code>chrgText.cpMin</code> and <code>chrgText.cpMax</code> members of
+    <code>TextToFind</code> are filled in with the start and end positions of the found text.</p>
+
+    <p>See also: <code><a class="message"
+    href="#SCI_SEARCHINTARGET">SCI_SEARCHINTARGET</a></code></p>
+
+    <p><b id="TextToFind">TextToFind</b><br />
+     This structure is defined to have exactly the same shape as the Win32 structure
+    <code>FINDTEXTEX</code> for old code that treated Scintilla as a RichEdit control.</p>
+<pre>
+struct TextToFind {
+    struct <a class="jump" href="#CharacterRange">CharacterRange</a> chrg;     // range to search
+    char *lpstrText;                // the search pattern (zero terminated)
+    struct CharacterRange chrgText; // returned as position of matching text
+};
+</pre>
+
+    <p><b id="SCI_SEARCHANCHOR">SCI_SEARCHANCHOR</b><br />
+     <b id="SCI_SEARCHNEXT">SCI_SEARCHNEXT(int searchFlags, const char *text)</b><br />
+     <b id="SCI_SEARCHPREV">SCI_SEARCHPREV(int searchFlags, const char *text)</b><br />
+     These messages provide relocatable search support. This allows multiple incremental
+    interactive searches to be macro recorded while still setting the selection to found text so
+    the find/select operation is self-contained. These three messages send <a class="message"
+    href="#SCN_MACRORECORD"><code>SCN_MACRORECORD</code></a> <a class="jump"
+    href="#Notifications">notifications</a> if macro recording is enabled.</p>
+
+    <p><code>SCI_SEARCHANCHOR</code> sets the search start point used by
+    <code>SCI_SEARCHNEXT</code> and <code>SCI_SEARCHPREV</code> to the start of the current
+    selection, that is, the end of the selection that is nearer to the start of the document. You
+    should always call this before calling either of <code>SCI_SEARCHNEXT</code> or
+    <code>SCI_SEARCHPREV</code>.</p>
+
+    <p><code>SCI_SEARCHNEXT</code> and <code>SCI_SEARCHPREV</code> search for the next and previous
+    occurrence of the zero terminated search string pointed at by text. The search is modified by
+    the <a class="jump" href="#searchFlags"><code>searchFlags</code></a>. If you request a regular
+    expression, <code>SCI_SEARCHPREV</code> finds the first occurrence of the search string in the
+    document, not the previous one before the anchor point.</p>
+
+    <p>The return value is -1 if nothing is found, otherwise the return value is the start position
+    of the matching text. The selection is updated to show the matched text, but is not scrolled
+    into view.</p>
+
+    <p>See also: <a class="message" href="#SCI_SEARCHINTARGET"><code>SCI_SEARCHINTARGET</code></a>,
+    <a class="message" href="#SCI_FINDTEXT"><code>SCI_FINDTEXT</code></a></p>
+
+    <h3 id="SearchAndReplaceUsingTheTarget">Search and replace using the target</h3>
+
+    <p>Using <a class="message" href="#SCI_REPLACESEL"><code>SCI_REPLACESEL</code></a>,
+    modifications cause scrolling and other visible changes, which may take some time and cause
+    unwanted display updates. If performing many changes, such as a replace all command, the target
+    can be used instead. First, set the target, ie. the range to be replaced. Then call
+    <code>SCI_REPLACETARGET</code> or <code>SCI_REPLACETARGETRE</code>.</p>
+
+    <p>Searching can be performed within the target range with <code>SCI_SEARCHINTARGET</code>,
+    which uses a counted string to allow searching for null characters. It returns the length of
+    range or -1 for failure, in which case the target is not moved. The flags used by
+    <code>SCI_SEARCHINTARGET</code> such as <code>SCFIND_MATCHCASE</code>,
+    <code>SCFIND_WHOLEWORD</code>, <code>SCFIND_WORDSTART</code>, and <code>SCFIND_REGEXP</code>
+    can be set with <code>SCI_SETSEARCHFLAGS</code>. <code>SCI_SEARCHINTARGET</code> may be simpler
+    for some clients to use than <a class="message"
+    href="#SCI_FINDTEXT"><code>SCI_FINDTEXT</code></a>, as that requires using a pointer to a
+    structure.</p>
+    <code><a class="message" href="#SCI_SETTARGETSTART">SCI_SETTARGETSTART(int pos)</a><br />
+     <a class="message" href="#SCI_GETTARGETSTART">SCI_GETTARGETSTART</a><br />
+     <a class="message" href="#SCI_SETTARGETEND">SCI_SETTARGETEND(int pos)</a><br />
+     <a class="message" href="#SCI_GETTARGETEND">SCI_GETTARGETEND</a><br />
+     <a class="message" href="#SCI_TARGETFROMSELECTION">SCI_TARGETFROMSELECTION</a><br />
+     <a class="message" href="#SCI_SETSEARCHFLAGS">SCI_SETSEARCHFLAGS(int searchFlags)</a><br />
+     <a class="message" href="#SCI_GETSEARCHFLAGS">SCI_GETSEARCHFLAGS</a><br />
+     <a class="message" href="#SCI_SEARCHINTARGET">SCI_SEARCHINTARGET(int length, const char
+    *text)</a><br />
+     <a class="message" href="#SCI_REPLACETARGET">SCI_REPLACETARGET(int length, const char
+    *text)</a><br />
+     <a class="message" href="#SCI_REPLACETARGETRE">SCI_REPLACETARGETRE(int length, const char
+    *text)</a><br />
+    </code>
+
+    <p><b id="SCI_SETTARGETSTART">SCI_SETTARGETSTART(int pos)</b><br />
+     <b id="SCI_GETTARGETSTART">SCI_GETTARGETSTART</b><br />
+     <b id="SCI_SETTARGETEND">SCI_SETTARGETEND(int pos)</b><br />
+     <b id="SCI_GETTARGETEND">SCI_GETTARGETEND</b><br />
+     These functions set and return the start and end of the target. When searching in non-regular
+    expression mode, you can set start greater than end to find the last matching text in the
+    target rather than the first matching text. The target is also set by a successful
+    <code>SCI_SEARCHINTARGET</code>.</p>
+
+     <p><b id="SCI_TARGETFROMSELECTION">SCI_TARGETFROMSELECTION</b><br />
+     Set the target start and end to the start and end positions of the selection.</p>
+
+    <p><b id="SCI_SETSEARCHFLAGS">SCI_SETSEARCHFLAGS(int searchFlags)</b><br />
+     <b id="SCI_GETSEARCHFLAGS">SCI_GETSEARCHFLAGS</b><br />
+     These get and set the <a class="jump" href="#searchFlags"><code>searchFlags</code></a> used by
+    <code>SCI_SEARCHINTARGET</code>. There are several option flags including a simple regular
+    expression search.</p>
+
+    <p><b id="SCI_SEARCHINTARGET">SCI_SEARCHINTARGET(int length, const char *text)</b><br />
+     This searches for the first occurrence of a text string in the target defined by
+    <code>SCI_SETTARGETSTART</code> and <code>SCI_SETTARGETEND</code>. The text string is not zero
+    terminated; the size is set by <code>length</code>. The search is modified by the search flags
+    set by <code>SCI_SETSEARCHFLAGS</code>. If the search succeeds, the target is set to the found
+    text and the return value is the position of the start of the matching text. If the search
+    fails, the result is -1.</p>
+
+    <p><b id="SCI_REPLACETARGET">SCI_REPLACETARGET(int length, const char *text)</b><br />
+     If <code>length</code> is -1, <code>text</code> is a zero terminated string, otherwise
+    <code>length</code> sets the number of character to replace the target with.
+           After replacement, the target range refers to the replacement text.
+           The return value
+    is the length of the replacement string.<br />
+    Note that the recommended way to delete text in the document is to set the target to the text to be removed,
+    and to perform a replace target with an empty string.</p>
+
+    <p><b id="SCI_REPLACETARGETRE">SCI_REPLACETARGETRE(int length, const char *text)</b><br />
+     This replaces the target using regular expressions. If <code>length</code> is -1,
+    <code>text</code> is a zero terminated string, otherwise <code>length</code> is the number of
+    characters to use. The replacement string is formed from the text string with any sequences of
+    <code>\1</code> through <code>\9</code> replaced by tagged matches from the most recent regular
+    expression search.
+           After replacement, the target range refers to the replacement text.
+           The return value is the length of the replacement string.</p>
+
+    <p>See also: <a class="message" href="#SCI_FINDTEXT"><code>SCI_FINDTEXT</code></a></p>
+
+    <h2 id="Overtype">Overtype</h2>
+
+    <p><b id="SCI_SETOVERTYPE">SCI_SETOVERTYPE(bool overType)</b><br />
+     <b id="SCI_GETOVERTYPE">SCI_GETOVERTYPE</b><br />
+     When overtype is enabled, each typed character replaces the character to the right of the text
+    caret. When overtype is disabled, characters are inserted at the caret.
+    <code>SCI_GETOVERTYPE</code> returns <code>TRUE</code> (1) if overtyping is active, otherwise
+    <code>FALSE</code> (0) will be returned. Use <code>SCI_SETOVERTYPE</code> to set the overtype
+    mode.</p>
+
+    <h2 id="CutCopyAndPaste">Cut, copy and paste</h2>
+
+    <code><a class="message" href="#SCI_CUT">SCI_CUT</a><br />
+     <a class="message" href="#SCI_COPY">SCI_COPY</a><br />
+     <a class="message" href="#SCI_PASTE">SCI_PASTE</a><br />
+     <a class="message" href="#SCI_CLEAR">SCI_CLEAR</a><br />
+     <a class="message" href="#SCI_CANPASTE">SCI_CANPASTE</a><br />
+     <a class="message" href="#SCI_COPYRANGE">SCI_COPYRANGE(int start, int end)</a><br />
+     <a class="message" href="#SCI_COPYTEXT">SCI_COPYTEXT(int length,
+     const char *text)</a><br />
+     <a class="message" href="#SCI_COPYALLOWLINE">SCI_COPYALLOWLINE</a><br />
+     <a class="message" href="#SCI_SETPASTECONVERTENDINGS">SCI_SETPASTECONVERTENDINGS(bool convert)</a><br />
+     <a class="message" href="#SCI_GETPASTECONVERTENDINGS">SCI_GETPASTECONVERTENDINGS</a><br />
+    </code>
+
+    <p><b id="SCI_CUT">SCI_CUT</b><br />
+     <b id="SCI_COPY">SCI_COPY</b><br />
+     <b id="SCI_PASTE">SCI_PASTE</b><br />
+     <b id="SCI_CLEAR">SCI_CLEAR</b><br />
+     <b id="SCI_CANPASTE">SCI_CANPASTE</b><br />
+     <b id="SCI_COPYALLOWLINE">SCI_COPYALLOWLINE</b><br />
+     These commands perform the standard tasks of cutting and copying data to the clipboard,
+    pasting from the clipboard into the document, and clearing the document.
+    <code>SCI_CANPASTE</code> returns non-zero if the document isn't read-only and if the selection
+    doesn't contain protected text. If you need a "can copy" or "can cut", use
+    <code>SCI_GETSELECTIONSTART()-SCI_GETSELECTIONEND()</code>, which will be non-zero if you can
+    copy or cut to the clipboard.</p>
+
+    <p>GTK+ does not really support <code>SCI_CANPASTE</code> and always returns <code>TRUE</code>
+    unless the document is read-only.</p>
+
+    <p>On X, the clipboard is asynchronous and may require several messages between
+    the destination and source applications. Data from SCI_PASTE will not arrive in the
+    document immediately.</p>
+
+    <p><code>SCI_COPYALLOWLINE</code> works the same as SCI_COPY except that if the
+    selection is empty then the current line is copied. On Windows, an extra "MSDEVLineSelect" marker
+    is added to the clipboard which is then used in <code>SCI_PASTE</code> to paste
+    the whole line before the current line.</p>
+
+     <b id="SCI_COPYRANGE">SCI_COPYRANGE(int start, int end)</b><br />
+     <b id="SCI_COPYTEXT">SCI_COPYTEXT(int length, const char *text)</b><br />
+    <p><code>SCI_COPYRANGE</code> copies a range of text from the document to
+    the system clipboard and <code>SCI_COPYTEXT</code> copies a supplied piece of
+    text to the system clipboard.</p>
+
+    <p><b id="SCI_SETPASTECONVERTENDINGS">SCI_SETPASTECONVERTENDINGS(bool convert)</b><br />
+     <b id="SCI_GETPASTECONVERTENDINGS">SCI_GETPASTECONVERTENDINGS</b><br />
+     If this property is set then when text is pasted any line ends are converted to match the document's
+     end of line mode as set with
+     <a class="message" href="#SCI_SETEOLMODE">SCI_SETEOLMODE</a>.
+     Currently only changeable on Windows. On GTK+ pasted text is always converted.</p>
+
+    <h2 id="ErrorHandling">Error handling</h2>
+
+    <p><b id="SCI_SETSTATUS">SCI_SETSTATUS(int status)</b><br />
+     <b id="SCI_GETSTATUS">SCI_GETSTATUS</b><br />
+     If an error occurs, Scintilla may set an internal error number that can be retrieved with
+    <code>SCI_GETSTATUS</code>. Not currently used but will be in the future. To clear the error
+    status call <code>SCI_SETSTATUS(0)</code>.</p>
+
+    <h2 id="UndoAndRedo">Undo and Redo</h2>
+
+    <p>Scintilla has multiple level undo and redo. It will continue to collect undoable actions
+    until memory runs out. Scintilla saves actions that change the document. Scintilla does not
+    save caret and selection movements, view scrolling and the like. Sequences of typing or
+    deleting are compressed into single transactions to make it easier to undo and redo at a sensible
+    level of detail. Sequences of actions can be combined into transactions that are undone as a unit.
+    These sequences occur between <code>SCI_BEGINUNDOACTION</code> and
+    <code>SCI_ENDUNDOACTION</code> messages. These transactions can be nested and only the top-level
+    sequences are undone as units.</p>
+    <code><a class="message" href="#SCI_UNDO">SCI_UNDO</a><br />
+     <a class="message" href="#SCI_CANUNDO">SCI_CANUNDO</a><br />
+     <a class="message" href="#SCI_EMPTYUNDOBUFFER">SCI_EMPTYUNDOBUFFER</a><br />
+     <a class="message" href="#SCI_REDO">SCI_REDO</a><br />
+     <a class="message" href="#SCI_CANREDO">SCI_CANREDO</a><br />
+     <a class="message" href="#SCI_SETUNDOCOLLECTION">SCI_SETUNDOCOLLECTION(bool
+    collectUndo)</a><br />
+     <a class="message" href="#SCI_GETUNDOCOLLECTION">SCI_GETUNDOCOLLECTION</a><br />
+     <a class="message" href="#SCI_BEGINUNDOACTION">SCI_BEGINUNDOACTION</a><br />
+     <a class="message" href="#SCI_ENDUNDOACTION">SCI_ENDUNDOACTION</a><br />
+    </code>
+
+    <p><b id="SCI_UNDO">SCI_UNDO</b><br />
+     <b id="SCI_CANUNDO">SCI_CANUNDO</b><br />
+     <code>SCI_UNDO</code> undoes one action, or if the undo buffer has reached a
+    <code>SCI_ENDUNDOACTION</code> point, all the actions back to the corresponding
+    <code>SCI_BEGINUNDOACTION</code>.</p>
+
+    <p><code>SCI_CANUNDO</code> returns 0 if there is nothing to undo, and 1 if there is. You would
+    typically use the result of this message to enable/disable the Edit menu Undo command.</p>
+
+    <p><b id="SCI_REDO">SCI_REDO</b><br />
+     <b id="SCI_CANREDO">SCI_CANREDO</b><br />
+     <code>SCI_REDO</code> undoes the effect of the last <code>SCI_UNDO</code> operation.</p>
+
+    <p><code>SCI_CANREDO</code> returns 0 if there is no action to redo and 1 if there are undo
+    actions to redo. You could typically use the result of this message to enable/disable the Edit
+    menu Redo command.</p>
+
+    <p><b id="SCI_EMPTYUNDOBUFFER">SCI_EMPTYUNDOBUFFER</b><br />
+     This command tells Scintilla to forget any saved undo or redo history. It also sets the save
+    point to the start of the undo buffer, so the document will appear to be unmodified. This does
+    not cause the <code><a class="message"
+    href="#SCN_SAVEPOINTREACHED">SCN_SAVEPOINTREACHED</a></code> notification to be sent to the
+    container.</p>
+
+    <p>See also: <a class="message" href="#SCI_SETSAVEPOINT"><code>SCI_SETSAVEPOINT</code></a></p>
+
+    <p><b id="SCI_SETUNDOCOLLECTION">SCI_SETUNDOCOLLECTION(bool collectUndo)</b><br />
+     <b id="SCI_GETUNDOCOLLECTION">SCI_GETUNDOCOLLECTION</b><br />
+     You can control whether Scintilla collects undo information with
+    <code>SCI_SETUNDOCOLLECTION</code>. Pass in <code>true</code> (1) to collect information and
+    <code>false</code> (0) to stop collecting. If you stop collection, you should also use
+    <code>SCI_EMPTYUNDOBUFFER</code> to avoid the undo buffer being unsynchronized with the data in
+    the buffer.</p>
+
+    <p>You might wish to turn off saving undo information if you use the Scintilla to store text
+    generated by a program (a Log view) or in a display window where text is often deleted and
+    regenerated.</p>
+
+    <p><b id="SCI_BEGINUNDOACTION">SCI_BEGINUNDOACTION</b><br />
+     <b id="SCI_ENDUNDOACTION">SCI_ENDUNDOACTION</b><br />
+     Send these two messages to Scintilla to mark the beginning and end of a set of operations that
+    you want to undo all as one operation but that you have to generate as several operations.
+    Alternatively, you can use these to mark a set of operations that you do not want to have
+    combined with the preceding or following operations if they are undone.</p>
+
+    <h2 id="SelectionAndInformation">Selection and information</h2>
+
+    <p>Scintilla maintains a selection that stretches between two points, the anchor and the
+    current position. If the anchor and the current position are the same, there is no selected
+    text. Positions in the document range from 0 (before the first character), to the document size
+    (after the last character). If you use messages, there is nothing to stop you setting a
+    position that is in the middle of a CRLF pair, or in the middle of a 2 byte character. However,
+    keyboard commands will not move the caret into such positions.</p>
+    <code><a class="message" href="#SCI_GETTEXTLENGTH">SCI_GETTEXTLENGTH</a><br />
+     <a class="message" href="#SCI_GETLENGTH">SCI_GETLENGTH</a><br />
+     <a class="message" href="#SCI_GETLINECOUNT">SCI_GETLINECOUNT</a><br />
+     <a class="message" href="#SCI_GETFIRSTVISIBLELINE">SCI_GETFIRSTVISIBLELINE</a><br />
+     <a class="message" href="#SCI_LINESONSCREEN">SCI_LINESONSCREEN</a><br />
+     <a class="message" href="#SCI_GETMODIFY">SCI_GETMODIFY</a><br />
+     <a class="message" href="#SCI_SETSEL">SCI_SETSEL(int anchorPos, int currentPos)</a><br />
+     <a class="message" href="#SCI_GOTOPOS">SCI_GOTOPOS(int position)</a><br />
+     <a class="message" href="#SCI_GOTOLINE">SCI_GOTOLINE(int line)</a><br />
+     <a class="message" href="#SCI_SETCURRENTPOS">SCI_SETCURRENTPOS(int position)</a><br />
+     <a class="message" href="#SCI_GETCURRENTPOS">SCI_GETCURRENTPOS</a><br />
+     <a class="message" href="#SCI_SETANCHOR">SCI_SETANCHOR(int position)</a><br />
+     <a class="message" href="#SCI_GETANCHOR">SCI_GETANCHOR</a><br />
+     <a class="message" href="#SCI_SETSELECTIONSTART">SCI_SETSELECTIONSTART(int position)</a><br />
+     <a class="message" href="#SCI_GETSELECTIONSTART">SCI_GETSELECTIONSTART</a><br />
+     <a class="message" href="#SCI_SETSELECTIONEND">SCI_SETSELECTIONEND(int position)</a><br />
+     <a class="message" href="#SCI_GETSELECTIONEND">SCI_GETSELECTIONEND</a><br />
+     <a class="message" href="#SCI_SELECTALL">SCI_SELECTALL</a><br />
+     <a class="message" href="#SCI_LINEFROMPOSITION">SCI_LINEFROMPOSITION(int position)</a><br />
+     <a class="message" href="#SCI_POSITIONFROMLINE">SCI_POSITIONFROMLINE(int line)</a><br />
+     <a class="message" href="#SCI_GETLINEENDPOSITION">SCI_GETLINEENDPOSITION(int line)</a><br />
+     <a class="message" href="#SCI_LINELENGTH">SCI_LINELENGTH(int line)</a><br />
+     <a class="message" href="#SCI_GETCOLUMN">SCI_GETCOLUMN(int position)</a><br />
+     <a class="message" href="#SCI_FINDCOLUMN">SCI_FINDCOLUMN(int line, int column)</a><br />
+     <a class="message" href="#SCI_POSITIONFROMPOINT">SCI_POSITIONFROMPOINT(int x, int y)</a><br />
+     <a class="message" href="#SCI_POSITIONFROMPOINTCLOSE">SCI_POSITIONFROMPOINTCLOSE(int x, int
+    y)</a><br />
+     <a class="message" href="#SCI_POINTXFROMPOSITION">SCI_POINTXFROMPOSITION(&lt;unused&gt;, int
+    position)</a><br />
+     <a class="message" href="#SCI_POINTYFROMPOSITION">SCI_POINTYFROMPOSITION(&lt;unused&gt;, int
+    position)</a><br />
+     <a class="message" href="#SCI_HIDESELECTION">SCI_HIDESELECTION(bool hide)</a><br />
+     <a class="message" href="#SCI_GETSELTEXT">SCI_GETSELTEXT(&lt;unused&gt;, char *text)</a><br />
+     <a class="message" href="#SCI_GETCURLINE">SCI_GETCURLINE(int textLen, char *text)</a><br />
+     <a class="message" href="#SCI_SELECTIONISRECTANGLE">SCI_SELECTIONISRECTANGLE</a><br />
+     <a class="message" href="#SCI_SETSELECTIONMODE">SCI_SETSELECTIONMODE(int mode)</a><br />
+     <a class="message" href="#SCI_GETSELECTIONMODE">SCI_GETSELECTIONMODE</a><br />
+     <a class="message" href="#SCI_GETLINESELSTARTPOSITION">SCI_GETLINESELSTARTPOSITION(int line)</a><br />
+     <a class="message" href="#SCI_GETLINESELENDPOSITION">SCI_GETLINESELENDPOSITION(int line)</a><br />
+     <a class="message" href="#SCI_MOVECARETINSIDEVIEW">SCI_MOVECARETINSIDEVIEW</a><br />
+     <a class="message" href="#SCI_WORDENDPOSITION">SCI_WORDENDPOSITION(int position, bool
+    onlyWordCharacters)</a><br />
+     <a class="message" href="#SCI_WORDSTARTPOSITION">SCI_WORDSTARTPOSITION(int position, bool
+    onlyWordCharacters)</a><br />
+     <a class="message" href="#SCI_POSITIONBEFORE">SCI_POSITIONBEFORE(int position)</a><br />
+     <a class="message" href="#SCI_POSITIONAFTER">SCI_POSITIONAFTER(int position)</a><br />
+     <a class="message" href="#SCI_TEXTWIDTH">SCI_TEXTWIDTH(int styleNumber, const char *text)</a><br />
+     <a class="message" href="#SCI_TEXTHEIGHT">SCI_TEXTHEIGHT(int line)</a><br />
+     <a class="message" href="#SCI_CHOOSECARETX">SCI_CHOOSECARETX</a><br />
+    </code>
+
+    <p><b id="SCI_GETTEXTLENGTH">SCI_GETTEXTLENGTH</b><br />
+     <b id="SCI_GETLENGTH">SCI_GETLENGTH</b><br />
+     Both these messages return the length of the document in characters.</p>
+
+    <p><b id="SCI_GETLINECOUNT">SCI_GETLINECOUNT</b><br />
+     This returns the number of lines in the document. An empty document contains 1 line. A
+    document holding only an end of line sequence has 2 lines.</p>
+
+    <p><b id="SCI_GETFIRSTVISIBLELINE">SCI_GETFIRSTVISIBLELINE</b><br />
+     This returns the line number of the first visible line in the Scintilla view. The first line
+    in the document is numbered 0. The value is a visible line rather than a document line.</p>
+
+    <p><b id="SCI_LINESONSCREEN">SCI_LINESONSCREEN</b><br />
+     This returns the number of complete lines visible on the screen. With a constant line height,
+    this is the vertical space available divided by the line separation. Unless you arrange to size
+    your window to an integral number of lines, there may be a partial line visible at the bottom
+    of the view.</p>
+
+    <p><b id="SCI_GETMODIFY">SCI_GETMODIFY</b><br />
+     This returns non-zero if the document is modified and 0 if it is unmodified. The modified
+    status of a document is determined by the undo position relative to the save point. The save
+    point is set by <a class="message" href="#SCI_SETSAVEPOINT"><code>SCI_SETSAVEPOINT</code></a>,
+    usually when you have saved data to a file.</p>
+
+    <p>If you need to be notified when the document becomes modified, Scintilla notifies the
+    container that it has entered or left the save point with the <a class="message"
+    href="#SCN_SAVEPOINTREACHED"><code>SCN_SAVEPOINTREACHED</code></a> and <a class="message"
+    href="#SCN_SAVEPOINTLEFT"><code>SCN_SAVEPOINTLEFT</code></a> <a class="jump"
+    href="#Notifications">notification messages</a>.</p>
+
+    <p><b id="SCI_SETSEL">SCI_SETSEL(int anchorPos, int currentPos)</b><br />
+     This message sets both the anchor and the current position. If <code>currentPos</code> is
+    negative, it means the end of the document. If <code>anchorPos</code> is negative, it means
+    remove any selection (i.e. set the anchor to the same position as <code>currentPos</code>). The
+    caret is scrolled into view after this operation.</p>
+
+    <p><b id="SCI_GOTOPOS">SCI_GOTOPOS(int pos)</b><br />
+     This removes any selection, sets the caret at <code>pos</code> and scrolls the view to make
+    the caret visible, if necessary. It is equivalent to
+    <code>SCI_SETSEL(pos, pos)</code>. The anchor position is set the same as the current
+    position.</p>
+
+    <p><b id="SCI_GOTOLINE">SCI_GOTOLINE(int line)</b><br />
+     This removes any selection and sets the caret at the start of line number <code>line</code>
+    and scrolls the view (if needed) to make it visible. The anchor position is set the same as the
+    current position. If <code>line</code> is outside the lines in the document (first line is 0),
+    the line set is the first or last.</p>
+
+    <p><b id="SCI_SETCURRENTPOS">SCI_SETCURRENTPOS(int pos)</b><br />
+     This sets the current position and creates a selection between the anchor and the current
+    position. The caret is not scrolled into view.</p>
+
+    <p>See also: <a class="message" href="#SCI_SCROLLCARET"><code>SCI_SCROLLCARET</code></a></p>
+
+    <p><b id="SCI_GETCURRENTPOS">SCI_GETCURRENTPOS</b><br />
+     This returns the current position.</p>
+
+    <p><b id="SCI_SETANCHOR">SCI_SETANCHOR(int pos)</b><br />
+     This sets the anchor position and creates a selection between the anchor position and the
+    current position. The caret is not scrolled into view.</p>
+
+    <p>See also: <a class="message" href="#SCI_SCROLLCARET"><code>SCI_SCROLLCARET</code></a></p>
+
+    <p><b id="SCI_GETANCHOR">SCI_GETANCHOR</b><br />
+     This returns the current anchor position.</p>
+
+    <p><b id="SCI_SETSELECTIONSTART">SCI_SETSELECTIONSTART(int pos)</b><br />
+     <b id="SCI_SETSELECTIONEND">SCI_SETSELECTIONEND(int pos)</b><br />
+     These set the selection based on the assumption that the anchor position is less than the
+    current position. They do not make the caret visible. The table shows the positions of the
+    anchor and the current position after using these messages.</p>
+
+    <table cellpadding="3" cellspacing="0" border="1" summary="SetSelection caret positioning">
+      <thead align="center">
+        <tr>
+          <th>
+          </th>
+
+          <th>anchor</th>
+
+          <th>current</th>
+        </tr>
+      </thead>
+
+      <tbody align="center">
+        <tr>
+          <th><code>SCI_SETSELECTIONSTART</code></th>
+
+          <td><code>pos</code></td>
+
+          <td><code>Max(pos, current)</code></td>
+        </tr>
+
+        <tr>
+          <th><code>SCI_SETSELECTIONEND</code></th>
+
+          <td><code>Min(anchor, pos)</code></td>
+
+          <td><code>pos</code></td>
+        </tr>
+      </tbody>
+    </table>
+
+    <p>See also: <a class="message" href="#SCI_SCROLLCARET"><code>SCI_SCROLLCARET</code></a></p>
+
+    <p><b id="SCI_GETSELECTIONSTART">SCI_GETSELECTIONSTART</b><br />
+     <b id="SCI_GETSELECTIONEND">SCI_GETSELECTIONEND</b><br />
+     These return the start and end of the selection without regard to which end is the current
+    position and which is the anchor. <code>SCI_GETSELECTIONSTART</code> returns the smaller of the
+    current position or the anchor position. <code>SCI_GETSELECTIONEND</code> returns the larger of
+    the two values.</p>
+
+    <p><b id="SCI_SELECTALL">SCI_SELECTALL</b><br />
+     This selects all the text in the document. The current position is not scrolled into view.</p>
+
+    <p><b id="SCI_LINEFROMPOSITION">SCI_LINEFROMPOSITION(int pos)</b><br />
+     This message returns the line that contains the position <code>pos</code> in the document. The
+    return value is 0 if <code>pos</code> &lt;= 0. The return value is the last line if
+    <code>pos</code> is beyond the end of the document.</p>
+
+    <p><b id="SCI_POSITIONFROMLINE">SCI_POSITIONFROMLINE(int line)</b><br />
+     This returns the document position that corresponds with the start of the line. If
+    <code>line</code> is negative, the position of the line holding the start of the selection is
+    returned. If <code>line</code> is greater than the lines in the document, the return value is
+    -1. If <code>line</code> is equal to the number of lines in the document (i.e. 1 line past the
+    last line), the return value is the end of the document.</p>
+
+    <p><b id="SCI_GETLINEENDPOSITION">SCI_GETLINEENDPOSITION(int line)</b><br />
+     This returns the position at the end of the line, before any line end characters. If <code>line</code>
+    is the last line in the document (which does not have any end of line characters), the result is the size of the
+    document. If <code>line</code> is negative or <code>line</code> &gt;= <a class="message"
+    href="#SCI_GETLINECOUNT"><code>SCI_GETLINECOUNT()</code></a>, the result is undefined.</p>
+
+    <p><b id="SCI_LINELENGTH">SCI_LINELENGTH(int line)</b><br />
+     This returns the length of the line, including any line end characters. If <code>line</code>
+    is negative or beyond the last line in the document, the result is 0. If you want the length of
+    the line not including any end of line characters, use <a class="message"
+    href="#SCI_GETLINEENDPOSITION"><code>SCI_GETLINEENDPOSITION(line)</code></a> - <a class="message"
+    href="#SCI_POSITIONFROMLINE"><code>SCI_POSITIONFROMLINE(line)</code></a>.</p>
+    <b id="SCI_GETSELTEXT">SCI_GETSELTEXT(&lt;unused&gt;, char *text)</b><br />
+     This copies the currently selected text and a terminating 0 byte to the <code>text</code>
+    buffer. The buffer must be at least
+    <code>SCI_GETSELECTIONEND()-SCI_GETSELECTIONSTART()+1</code> bytes long. <br />
+    If the text argument is 0 then the length that should be allocated
+    to store the entire selection is returned.<br />
+
+    <p>See also: <code><a class="message" href="#SCI_GETCURLINE">SCI_GETCURLINE</a>, <a
+    class="message" href="#SCI_GETLINE">SCI_GETLINE</a>, <a class="message"
+    href="#SCI_GETTEXT">SCI_GETTEXT</a>, <a class="message"
+    href="#SCI_GETSTYLEDTEXT">SCI_GETSTYLEDTEXT</a>, <a class="message"
+    href="#SCI_GETTEXTRANGE">SCI_GETTEXTRANGE</a></code></p>
+
+    <p><b id="SCI_GETCURLINE">SCI_GETCURLINE(int textLen, char *text)</b><br />
+     This retrieves the text of the line containing the caret and returns the position within the
+    line of the caret. Pass in <code>char* text</code> pointing at a buffer large enough to hold
+    the text you wish to retrieve and a terminating 0 character.
+    Set <code>textLen</code> to the
+    length of the buffer which must be at least 1 to hold the terminating 0 character.
+    If the text argument is 0 then the length that should be allocated
+    to store the entire current line is returned.</p>
+
+    <p>See also: <code><a class="message" href="#SCI_GETSELTEXT">SCI_GETSELTEXT</a>, <a
+    class="message" href="#SCI_GETLINE">SCI_GETLINE</a>, <a class="message"
+    href="#SCI_GETTEXT">SCI_GETTEXT</a>, <a class="message"
+    href="#SCI_GETSTYLEDTEXT">SCI_GETSTYLEDTEXT</a>, <a class="message"
+    href="#SCI_GETTEXTRANGE">SCI_GETTEXTRANGE</a></code></p>
+
+    <p><b id="SCI_SELECTIONISRECTANGLE">SCI_SELECTIONISRECTANGLE</b><br />
+     This returns 1 if the current selection is in rectangle mode, 0 if not.</p>
+
+    <p><b id="SCI_SETSELECTIONMODE">SCI_SETSELECTIONMODE(int mode)</b><br />
+    <b id="SCI_GETSELECTIONMODE">SCI_GETSELECTIONMODE</b><br />
+    The two functions set and get the selection mode, which can be
+     stream (<code>SC_SEL_STREAM</code>=0) or
+     rectangular (<code>SC_SEL_RECTANGLE</code>=1)
+     or by lines (<code>SC_SEL_LINES</code>=2).
+     When set in these modes, regular caret moves will extend or reduce the selection,
+     until the mode is cancelled by a call with same value or with <code>SCI_CANCEL</code>.
+     The get function returns the current mode even if the selection was made by mouse
+     or with regular extended moves.</p>
+
+    <p><b id="SCI_GETLINESELSTARTPOSITION">SCI_GETLINESELSTARTPOSITION(int line)</b><br />
+    <b id="SCI_GETLINESELENDPOSITION">SCI_GETLINESELENDPOSITION(int line)</b><br />
+    Retrieve the position of the start and end of the selection at the given line with
+    INVALID_POSITION returned if no selection on this line.</p>
+
+    <p><b id="SCI_MOVECARETINSIDEVIEW">SCI_MOVECARETINSIDEVIEW</b><br />
+     If the caret is off the top or bottom of the view, it is moved to the nearest line that is
+    visible to its current position. Any selection is lost.</p>
+
+    <p><b id="SCI_WORDENDPOSITION">SCI_WORDENDPOSITION(int position, bool
+    onlyWordCharacters)</b><br />
+     <b id="SCI_WORDSTARTPOSITION">SCI_WORDSTARTPOSITION(int position, bool
+    onlyWordCharacters)</b><br />
+     These messages return the start and end of words using the same definition of words as used
+    internally within Scintilla. You can set your own list of characters that count as words with
+    <a class="message" href="#SCI_SETWORDCHARS"><code>SCI_SETWORDCHARS</code></a>. The position
+    sets the start or the search, which is forwards when searching for the end and backwards when
+    searching for the start.</p>
+
+    <p>Set <code>onlyWordCharacters</code> to <code>true</code> (1) to stop searching at the first
+    non-word character in the search direction. If <code>onlyWordCharacters</code> is
+    <code>false</code> (0), the first character in the search direction sets the type of the search
+    as word or non-word and the search stops at the first non-matching character. Searches are also
+    terminated by the start or end of the document.</p>
+
+    <p>If "w" represents word characters and "." represents non-word characters and "|" represents
+    the position and <code>true</code> or <code>false</code> is the state of
+    <code>onlyWordCharacters</code>:</p>
+
+    <table cellpadding="3" cellspacing="0" border="1" summary="Word start and end positions">
+      <thead align="center">
+        <tr>
+          <th>Initial state</th>
+
+          <th>end, true</th>
+
+          <th>end, false</th>
+
+          <th>start, true</th>
+
+          <th>start, false</th>
+        </tr>
+      </thead>
+
+      <tbody align="center">
+        <tr>
+          <td>..ww..|..ww..</td>
+
+          <td>..ww..|..ww..</td>
+
+          <td>..ww....|ww..</td>
+
+          <td>..ww..|..ww..</td>
+
+          <td>..ww|....ww..</td>
+        </tr>
+
+        <tr>
+          <td>....ww|ww....</td>
+
+          <td>....wwww|....</td>
+
+          <td>....wwww|....</td>
+
+          <td>....|wwww....</td>
+
+          <td>....|wwww....</td>
+        </tr>
+
+        <tr>
+          <td>..ww|....ww..</td>
+
+          <td>..ww|....ww..</td>
+
+          <td>..ww....|ww..</td>
+
+          <td>..|ww....ww..</td>
+
+          <td>..|ww....ww..</td>
+        </tr>
+
+        <tr>
+          <td>..ww....|ww..</td>
+
+          <td>..ww....ww|..</td>
+
+          <td>..ww....ww|..</td>
+
+          <td>..ww....|ww..</td>
+
+          <td>..ww|....ww..</td>
+        </tr>
+      </tbody>
+    </table>
+
+    <p><b id="SCI_POSITIONBEFORE">SCI_POSITIONBEFORE(int position)</b><br />
+     <b id="SCI_POSITIONAFTER">SCI_POSITIONAFTER(int position)</b><br />
+     These messages return the position before and after another position
+     in the document taking into account the current code page. The minimum
+     position returned is 0 and the maximum is the last position in the document.
+     If called with a position within a multi byte character will return the position
+     of the start/end of that character.</p>
+
+    <p><b id="SCI_TEXTWIDTH">SCI_TEXTWIDTH(int styleNumber, const char *text)</b><br />
+     This returns the pixel width of a string drawn in the given <code>styleNumber</code> which can
+    be used, for example, to decide how wide to make the line number margin in order to display a
+    given number of numerals.</p>
+
+    <p><b id="SCI_TEXTHEIGHT">SCI_TEXTHEIGHT(int line)</b><br />
+     This returns the height in pixels of a particular line. Currently all lines are the same
+    height.</p>
+
+    <p><b id="SCI_GETCOLUMN">SCI_GETCOLUMN(int pos)</b><br />
+     This message returns the column number of a position <code>pos</code> within the document
+    taking the width of tabs into account. This returns the column number of the last tab on the
+    line before <code>pos</code>, plus the number of characters between the last tab and
+    <code>pos</code>. If there are no tab characters on the line, the return value is the number of
+    characters up to the position on the line. In both cases, double byte characters count as a
+    single character. This is probably only useful with monospaced fonts.</p>
+
+    <p><b id="SCI_FINDCOLUMN">SCI_FINDCOLUMN(int line, int column)</b><br />
+     This message returns the position of a <code>column</code> on a <code>line</code>
+    taking the width of tabs into account. It treats a multi-byte character as a single column.
+    Column numbers, like lines start at 0.</p>
+
+    <p><b id="SCI_POSITIONFROMPOINT">SCI_POSITIONFROMPOINT(int x, int y)</b><br />
+     <b id="SCI_POSITIONFROMPOINTCLOSE">SCI_POSITIONFROMPOINTCLOSE(int x, int y)</b><br />
+     <code>SCI_POSITIONFROMPOINT</code> finds the closest character position to a point and
+    <code>SCI_POSITIONFROMPOINTCLOSE</code> is similar but returns -1 if the point is outside the
+    window or not close to any characters.</p>
+
+    <p><b id="SCI_POINTXFROMPOSITION">SCI_POINTXFROMPOSITION(&lt;unused&gt;, int pos)</b><br />
+     <b id="SCI_POINTYFROMPOSITION">SCI_POINTYFROMPOSITION(&lt;unused&gt;, int pos)</b><br />
+     These messages return the x and y display pixel location of text at position <code>pos</code>
+    in the document.</p>
+
+    <p><b id="SCI_HIDESELECTION">SCI_HIDESELECTION(bool hide)</b><br />
+     The normal state is to make the selection visible by drawing it as set by <a class="message"
+    href="#SCI_SETSELFORE"><code>SCI_SETSELFORE</code></a> and <a class="message"
+    href="#SCI_SETSELBACK"><code>SCI_SETSELBACK</code></a>. However, if you hide the selection, it
+    is drawn as normal text.</p>
+
+    <p><b id="SCI_CHOOSECARETX">SCI_CHOOSECARETX</b><br />
+     Scintilla remembers the x value of the last position horizontally moved to explicitly by the
+    user and this value is then used when moving vertically such as by using the up and down keys.
+    This message sets the current x position of the caret as the remembered value.</p>
+
+    <h2 id="ScrollingAndAutomaticScrolling">Scrolling and automatic scrolling</h2>
+    <code><a class="message" href="#SCI_LINESCROLL">SCI_LINESCROLL(int column, int line)</a><br />
+     <a class="message" href="#SCI_SCROLLCARET">SCI_SCROLLCARET</a><br />
+     <a class="message" href="#SCI_SETXCARETPOLICY">SCI_SETXCARETPOLICY(int caretPolicy, int
+    caretSlop)</a><br />
+     <a class="message" href="#SCI_SETYCARETPOLICY">SCI_SETYCARETPOLICY(int caretPolicy, int
+    caretSlop)</a><br />
+     <a class="message" href="#SCI_SETVISIBLEPOLICY">SCI_SETVISIBLEPOLICY(int caretPolicy, int
+    caretSlop)</a><br />
+     <a class="message" href="#SCI_SETHSCROLLBAR">SCI_SETHSCROLLBAR(bool visible)</a><br />
+     <a class="message" href="#SCI_GETHSCROLLBAR">SCI_GETHSCROLLBAR</a><br />
+     <a class="message" href="#SCI_SETVSCROLLBAR">SCI_SETVSCROLLBAR(bool visible)</a><br />
+     <a class="message" href="#SCI_GETVSCROLLBAR">SCI_GETVSCROLLBAR</a><br />
+     <a class="message" href="#SCI_GETXOFFSET">SCI_GETXOFFSET</a><br />
+     <a class="message" href="#SCI_SETXOFFSET">SCI_SETXOFFSET(int xOffset)</a><br />
+     <a class="message" href="#SCI_SETSCROLLWIDTH">SCI_SETSCROLLWIDTH(int pixelWidth)</a><br />
+     <a class="message" href="#SCI_GETSCROLLWIDTH">SCI_GETSCROLLWIDTH</a><br />
+     <a class="message" href="#SCI_SETSCROLLWIDTHTRACKING">SCI_SETSCROLLWIDTHTRACKING(bool tracking)</a><br />
+     <a class="message" href="#SCI_GETSCROLLWIDTHTRACKING">SCI_GETSCROLLWIDTHTRACKING</a><br />
+     <a class="message" href="#SCI_SETENDATLASTLINE">SCI_SETENDATLASTLINE(bool
+    endAtLastLine)</a><br />
+     <a class="message" href="#SCI_GETENDATLASTLINE">SCI_GETENDATLASTLINE</a><br />
+    </code>
+
+    <p><b id="SCI_LINESCROLL">SCI_LINESCROLL(int column, int line)</b><br />
+     This will attempt to scroll the display by the number of columns and lines that you specify.
+    Positive line values increase the line number at the top of the screen (i.e. they move the text
+    upwards as far as the user is concerned), Negative line values do the reverse.</p>
+
+    <p>The column measure is the width of a space in the default style. Positive values increase
+    the column at the left edge of the view (i.e. they move the text leftwards as far as the user
+    is concerned). Negative values do the reverse.</p>
+
+    <p>See also: <a class="message" href="#SCI_SETXOFFSET"><code>SCI_SETXOFFSET</code></a></p>
+
+    <p><b id="SCI_SCROLLCARET">SCI_SCROLLCARET</b><br />
+     If the current position (this is the caret if there is no selection) is not visible, the view
+    is scrolled to make it visible according to the current caret policy.</p>
+
+    <p><b id="SCI_SETXCARETPOLICY">SCI_SETXCARETPOLICY(int caretPolicy, int caretSlop)</b><br />
+     <b id="SCI_SETYCARETPOLICY">SCI_SETYCARETPOLICY(int caretPolicy, int caretSlop)</b><br />
+     These set the caret policy. The value of <code>caretPolicy</code> is a combination of
+    <code>CARET_SLOP</code>, <code>CARET_STRICT</code>, <code>CARET_JUMPS</code> and
+    <code>CARET_EVEN</code>.</p>
+
+    <table cellpadding="1" cellspacing="2" border="0" summary="Caret policy">
+      <tbody valign="top">
+        <tr>
+          <th align="left"><code>CARET_SLOP</code></th>
+
+          <td>If set, we can define a slop value: <code>caretSlop</code>. This value defines an
+          unwanted zone (UZ) where the caret is... unwanted. This zone is defined as a number of
+          pixels near the vertical margins, and as a number of lines near the horizontal margins.
+          By keeping the caret away from the edges, it is seen within its context. This makes it
+          likely that the identifier that the caret is on can be completely seen, and that the
+          current line is seen with some of the lines following it, which are often dependent on
+          that line.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>CARET_STRICT</code></th>
+
+          <td>If set, the policy set by <code>CARET_SLOP</code> is enforced... strictly. The caret
+          is centred on the display if <code>caretSlop</code> is not set, and cannot go in the UZ
+          if <code>caretSlop</code> is set.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>CARET_JUMPS</code></th>
+
+          <td>If set, the display is moved more energetically so the caret can move in the same
+          direction longer before the policy is applied again. '3UZ' notation is used to indicate
+          three time the size of the UZ as a distance to the margin.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>CARET_EVEN</code></th>
+
+          <td>If not set, instead of having symmetrical UZs, the left and bottom UZs are extended
+          up to right and top UZs respectively. This way, we favour the displaying of useful
+          information: the beginning of lines, where most code reside, and the lines after the
+          caret, for example, the body of a function.</td>
+        </tr>
+      </tbody>
+    </table>
+
+    <table cellpadding="3" cellspacing="0" border="1" summary="Caret positioning">
+      <thead align="center">
+        <tr>
+          <th>slop</th>
+
+          <th>strict</th>
+
+          <th>jumps</th>
+
+          <th>even</th>
+
+          <th>Caret can go to the margin</th>
+
+          <th>On reaching limit (going out of visibility<br />
+           or going into the UZ) display is...</th>
+        </tr>
+      </thead>
+
+      <tbody align="center">
+        <tr>
+          <td>0</td>
+
+          <td>0</td>
+
+          <td>0</td>
+
+          <td>0</td>
+
+          <td>Yes</td>
+
+          <td>moved to put caret on top/on right</td>
+        </tr>
+
+        <tr>
+          <td>0</td>
+
+          <td>0</td>
+
+          <td>0</td>
+
+          <td>1</td>
+
+          <td>Yes</td>
+
+          <td>moved by one position</td>
+        </tr>
+
+        <tr>
+          <td>0</td>
+
+          <td>0</td>
+
+          <td>1</td>
+
+          <td>0</td>
+
+          <td>Yes</td>
+
+          <td>moved to put caret on top/on right</td>
+        </tr>
+
+        <tr>
+          <td>0</td>
+
+          <td>0</td>
+
+          <td>1</td>
+
+          <td>1</td>
+
+          <td>Yes</td>
+
+          <td>centred on the caret</td>
+        </tr>
+
+        <tr>
+          <td>0</td>
+
+          <td>1</td>
+
+          <td>-</td>
+
+          <td>0</td>
+
+          <td>Caret is always on top/on right of display</td>
+
+          <td>-</td>
+        </tr>
+
+        <tr>
+          <td>0</td>
+
+          <td>1</td>
+
+          <td>-</td>
+
+          <td>1</td>
+
+          <td>No, caret is always centred</td>
+
+          <td>-</td>
+        </tr>
+
+        <tr>
+          <td>1</td>
+
+          <td>0</td>
+
+          <td>0</td>
+
+          <td>0</td>
+
+          <td>Yes</td>
+
+          <td>moved to put caret out of the asymmetrical UZ</td>
+        </tr>
+
+        <tr>
+          <td>1</td>
+
+          <td>0</td>
+
+          <td>0</td>
+
+          <td>1</td>
+
+          <td>Yes</td>
+
+          <td>moved to put caret out of the UZ</td>
+        </tr>
+
+        <tr>
+          <td>1</td>
+
+          <td>0</td>
+
+          <td>1</td>
+
+          <td>0</td>
+
+          <td>Yes</td>
+
+          <td>moved to put caret at 3UZ of the top or right margin</td>
+        </tr>
+
+        <tr>
+          <td>1</td>
+
+          <td>0</td>
+
+          <td>1</td>
+
+          <td>1</td>
+
+          <td>Yes</td>
+
+          <td>moved to put caret at 3UZ of the margin</td>
+        </tr>
+
+        <tr>
+          <td>1</td>
+
+          <td>1</td>
+
+          <td>-</td>
+
+          <td>0</td>
+
+          <td>Caret is always at UZ of top/right margin</td>
+
+          <td>-</td>
+        </tr>
+
+        <tr>
+          <td>1</td>
+
+          <td>1</td>
+
+          <td>0</td>
+
+          <td>1</td>
+
+          <td>No, kept out of UZ</td>
+
+          <td>moved by one position</td>
+        </tr>
+
+        <tr>
+          <td>1</td>
+
+          <td>1</td>
+
+          <td>1</td>
+
+          <td>0</td>
+
+          <td>No, kept out of UZ</td>
+
+          <td>moved to put caret at 3UZ of the margin</td>
+        </tr>
+      </tbody>
+    </table>
+
+    <p><b id="SCI_SETVISIBLEPOLICY">SCI_SETVISIBLEPOLICY(int caretPolicy, int caretSlop)</b><br />
+     This determines how the vertical positioning is determined when <a class="message"
+    href="#SCI_ENSUREVISIBLEENFORCEPOLICY"><code>SCI_ENSUREVISIBLEENFORCEPOLICY</code></a> is
+    called. It takes <code>VISIBLE_SLOP</code> and <code>VISIBLE_STRICT</code> flags for the policy
+    parameter. It is similar in operation to <a class="message"
+    href="#SCI_SETYCARETPOLICY"><code>SCI_SETYCARETPOLICY(int caretPolicy, int
+    caretSlop)</code></a>.</p>
+
+    <p><b id="SCI_SETHSCROLLBAR">SCI_SETHSCROLLBAR(bool visible)</b><br />
+     <b id="SCI_GETHSCROLLBAR">SCI_GETHSCROLLBAR</b><br />
+     The horizontal scroll bar is only displayed if it is needed for the assumed width.
+     If you never wish to see it, call
+    <code>SCI_SETHSCROLLBAR(0)</code>. Use <code>SCI_SETHSCROLLBAR(1)</code> to enable it again.
+    <code>SCI_GETHSCROLLBAR</code> returns the current state. The default state is to display it
+    when needed.</p>
+    <p>See also: <a class="message" href="#SCI_SETSCROLLWIDTH">SCI_SETSCROLLWIDTH</a>.</p>
+
+    <p><b id="SCI_SETVSCROLLBAR">SCI_SETVSCROLLBAR(bool visible)</b><br />
+     <b id="SCI_GETVSCROLLBAR">SCI_GETVSCROLLBAR</b><br />
+     By default, the vertical scroll bar is always displayed when required. You can choose to hide
+    or show it with <code>SCI_SETVSCROLLBAR</code> and get the current state with
+    <code>SCI_GETVSCROLLBAR</code>.</p>
+
+    <p><b id="SCI_SETXOFFSET">SCI_SETXOFFSET(int xOffset)</b><br />
+     <b id="SCI_GETXOFFSET">SCI_GETXOFFSET</b><br />
+     The <code>xOffset</code> is the horizontal scroll position in pixels of the start of the text
+    view. A value of 0 is the normal position with the first text column visible at the left of the
+    view.</p>
+
+    <p>See also: <a class="message" href="#SCI_LINESCROLL"><code>SCI_LINESCROLL</code></a></p>
+
+    <p><b id="SCI_SETSCROLLWIDTH">SCI_SETSCROLLWIDTH(int pixelWidth)</b><br />
+     <b id="SCI_GETSCROLLWIDTH">SCI_GETSCROLLWIDTH</b><br />
+     For performance, Scintilla does not measure the display width of the document to determine
+     the properties of the horizontal scroll bar. Instead, an assumed width is used.
+     These messages set and get the document width in pixels assumed by Scintilla.
+     The default value is 2000.
+     To ensure the width of the currently visible lines can be scrolled use
+     <a class="message" href="#SCI_SETSCROLLWIDTHTRACKING"><code>SCI_SETSCROLLWIDTHTRACKING</code></a></p>
+
+    <p><b id="SCI_SETSCROLLWIDTHTRACKING">SCI_SETSCROLLWIDTHTRACKING(bool tracking)</b><br />
+     <b id="SCI_GETSCROLLWIDTHTRACKING">SCI_GETSCROLLWIDTHTRACKING</b><br />
+     If scroll width tracking is enabled then the scroll width is adjusted to ensure that all of the lines currently
+     displayed can be completely scrolled. This mode never adjusts the scroll width to be narrower.</p>
+
+    <p><b id="SCI_SETENDATLASTLINE">SCI_SETENDATLASTLINE(bool endAtLastLine)</b><br />
+     <b id="SCI_GETENDATLASTLINE">SCI_GETENDATLASTLINE</b><br />
+     <code>SCI_SETENDATLASTLINE</code> sets the scroll range so that maximum scroll position has
+    the last line at the bottom of the view (default). Setting this to <code>false</code> allows
+    scrolling one page below the last line.</p>
+
+    <h2 id="WhiteSpace">White space</h2>
+    <code><a class="message" href="#SCI_SETVIEWWS">SCI_SETVIEWWS(int wsMode)</a><br />
+     <a class="message" href="#SCI_GETVIEWWS">SCI_GETVIEWWS</a><br />
+     <a class="message" href="#SCI_SETWHITESPACEFORE">SCI_SETWHITESPACEFORE(bool
+    useWhitespaceForeColour, int colour)</a><br />
+     <a class="message" href="#SCI_SETWHITESPACEBACK">SCI_SETWHITESPACEBACK(bool
+    useWhitespaceBackColour, int colour)</a><br />
+    </code>
+
+    <p><b id="SCI_SETVIEWWS">SCI_SETVIEWWS(int wsMode)</b><br />
+     <b id="SCI_GETVIEWWS">SCI_GETVIEWWS</b><br />
+     White space can be made visible which may useful for languages in which white space is
+    significant, such as Python. Space characters appear as small centred dots and tab characters
+    as light arrows pointing to the right. There are also ways to control the display of <a
+    class="jump" href="#LineEndings">end of line characters</a>. The two messages set and get the
+    white space display mode. The <code>wsMode</code> argument can be one of:</p>
+
+    <table cellpadding="1" cellspacing="2" border="0" summary="White space policy">
+      <tbody valign="top">
+        <tr>
+          <th align="left"><code>SCWS_INVISIBLE</code></th>
+
+          <td>0</td>
+
+          <td>The normal display mode with white space displayed as an empty background
+          colour.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>SCWS_VISIBLEALWAYS</code></th>
+
+          <td>1</td>
+
+          <td>White space characters are drawn as dots and arrows,</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>SCWS_VISIBLEAFTERINDENT</code></th>
+
+          <td>2</td>
+
+          <td>White space used for indentation is displayed normally but after the first visible
+          character, it is shown as dots and arrows.</td>
+        </tr>
+      </tbody>
+    </table>
+
+    <p>The effect of using any other <code>wsMode</code> value is undefined.</p>
+
+    <p><b id="SCI_SETWHITESPACEFORE">SCI_SETWHITESPACEFORE(bool useWhitespaceForeColour, int <a
+    class="jump" href="#colour">colour</a>)</b><br />
+     <b id="SCI_SETWHITESPACEBACK">SCI_SETWHITESPACEBACK(bool useWhitespaceBackColour, int <a
+    class="jump" href="#colour">colour</a>)</b><br />
+     By default, the colour of visible white space is determined by the lexer in use. The
+    foreground and/or background colour of all visible white space can be set globally, overriding
+    the lexer's colours with <code>SCI_SETWHITESPACEFORE</code> and
+    <code>SCI_SETWHITESPACEBACK</code>.</p>
+
+    <h2 id="Cursor">Cursor</h2>
+
+    <p><b id="SCI_SETCURSOR">SCI_SETCURSOR(int curType)</b><br />
+     <b id="SCI_GETCURSOR">SCI_GETCURSOR</b><br />
+     The cursor is normally chosen in a context sensitive way, so it will be different over the
+    margin than when over the text. When performing a slow action, you may wish to change to a wait
+    cursor. You set the cursor type with <code>SCI_SETCURSOR</code>. The <code>curType</code>
+    argument can be:</p>
+
+    <table cellpadding="1" cellspacing="2" border="0" summary="Mouse cursors">
+      <tbody valign="top">
+        <tr>
+          <th align="left"><code>SC_CURSORNORMAL</code></th>
+
+          <td>-1</td>
+
+          <td>The normal cursor is displayed.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>SC_CURSORWAIT</code></th>
+
+          <td>&nbsp;4</td>
+
+          <td>The wait cursor is displayed when the mouse is over or owned by the Scintilla
+          window.</td>
+        </tr>
+      </tbody>
+    </table>
+
+    <p>Cursor values 1 through 7 have defined cursors, but only <code>SC_CURSORWAIT</code> is
+    usefully controllable. Other values of <code>curType</code> cause a pointer to be displayed.
+    The <code>SCI_GETCURSOR</code> message returns the last cursor type you set, or
+    <code>SC_CURSORNORMAL</code> (-1) if you have not set a cursor type.</p>
+
+    <h2 id="MouseCapture">Mouse capture</h2>
+
+    <p><b id="SCI_SETMOUSEDOWNCAPTURES">SCI_SETMOUSEDOWNCAPTURES(bool captures)</b><br />
+     <b id="SCI_GETMOUSEDOWNCAPTURES">SCI_GETMOUSEDOWNCAPTURES</b><br />
+     When the mouse is pressed inside Scintilla, it is captured so future mouse movement events are
+    sent to Scintilla. This behavior may be turned off with
+    <code>SCI_SETMOUSEDOWNCAPTURES(0)</code>.</p>
+
+    <h2 id="LineEndings">Line endings</h2>
+
+    <p>Scintilla can interpret any of the three major line end conventions, Macintosh (\r), Unix
+    (\n) and CP/M / DOS / Windows (\r\n). When the user presses the Enter key, one of these line
+    end strings is inserted into the buffer. The default is \r\n in Windows and \n in Unix, but
+    this can be changed with the <code>SCI_SETEOLMODE</code> message. You can also convert the
+    entire document to one of these line endings with <code>SCI_CONVERTEOLS</code>. Finally, you
+    can choose to display the line endings with <code>SCI_SETVIEWEOL</code>.</p>
+    <code><a class="message" href="#SCI_SETEOLMODE">SCI_SETEOLMODE(int eolMode)</a><br />
+     <a class="message" href="#SCI_GETEOLMODE">SCI_GETEOLMODE</a><br />
+     <a class="message" href="#SCI_CONVERTEOLS">SCI_CONVERTEOLS(int eolMode)</a><br />
+     <a class="message" href="#SCI_SETVIEWEOL">SCI_SETVIEWEOL(bool visible)</a><br />
+     <a class="message" href="#SCI_GETVIEWEOL">SCI_GETVIEWEOL</a><br />
+    </code>
+
+    <p><b id="SCI_SETEOLMODE">SCI_SETEOLMODE(int eolMode)</b><br />
+     <b id="SCI_GETEOLMODE">SCI_GETEOLMODE</b><br />
+     <code>SCI_SETEOLMODE</code> sets the characters that are added into the document when the user
+    presses the Enter key. You can set <code>eolMode</code> to one of <code>SC_EOL_CRLF</code> (0),
+    <code>SC_EOL_CR</code> (1), or <code>SC_EOL_LF</code> (2). The <code>SCI_GETEOLMODE</code>
+    message retrieves the current state.</p>
+
+    <p><b id="SCI_CONVERTEOLS">SCI_CONVERTEOLS(int eolMode)</b><br />
+     This message changes all the end of line characters in the document to match
+    <code>eolMode</code>. Valid values are: <code>SC_EOL_CRLF</code> (0), <code>SC_EOL_CR</code>
+    (1), or <code>SC_EOL_LF</code> (2).</p>
+
+    <p><b id="SCI_SETVIEWEOL">SCI_SETVIEWEOL(bool visible)</b><br />
+     <b id="SCI_GETVIEWEOL">SCI_GETVIEWEOL</b><br />
+     Normally, the end of line characters are hidden, but <code>SCI_SETVIEWEOL</code> allows you to
+    display (or hide) them by setting <code>visible</code> <code>true</code> (or
+    <code>false</code>). The visible rendering of the end of line characters is similar to
+    <code>(CR)</code>, <code>(LF)</code>, or <code>(CR)(LF)</code>. <code>SCI_GETVIEWEOL</code>
+    returns the current state.</p>
+
+    <h2 id="Styling">Styling</h2>
+
+    <p>The styling messages allow you to assign styles to text. The standard Scintilla settings
+    divide the 8 style bits available for each character into 5 bits (0 to 4 = <a class="jump"
+    href="#StyleDefinition">styles 0 to 31</a>) that set a style and three bits (5 to 7) that
+    define <a class="jump" href="#Indicators">indicators</a>. You can change the balance between
+    styles and indicators with <a class="message"
+    href="#SCI_SETSTYLEBITS"><code>SCI_SETSTYLEBITS</code></a>. If your styling needs can be met by
+    one of the standard lexers, or if you can write your own, then a lexer is probably the easiest
+    way to style your document. If you choose to use the container to do the styling you can use
+    the <a class="message" href="#SCI_SETLEXER"><code>SCI_SETLEXER</code></a> command to select
+    <code>SCLEX_CONTAINER</code>, in which case the container is sent a <a class="message"
+    href="#SCN_STYLENEEDED"><code>SCN_STYLENEEDED</code></a> <a class="jump"
+    href="#Notifications">notification</a> each time text needs styling for display. As another
+    alternative, you might use idle time to style the document. Even if you use a lexer, you might
+    use the styling commands to mark errors detected by a compiler. The following commands can be
+    used.</p>
+    <code><a class="message" href="#SCI_GETENDSTYLED">SCI_GETENDSTYLED</a><br />
+     <a class="message" href="#SCI_STARTSTYLING">SCI_STARTSTYLING(int position, int mask)</a><br />
+     <a class="message" href="#SCI_SETSTYLING">SCI_SETSTYLING(int length, int style)</a><br />
+     <a class="message" href="#SCI_SETSTYLINGEX">SCI_SETSTYLINGEX(int length, const char
+    *styles)</a><br />
+     <a class="message" href="#SCI_SETLINESTATE">SCI_SETLINESTATE(int line, int value)</a><br />
+     <a class="message" href="#SCI_GETLINESTATE">SCI_GETLINESTATE(int line)</a><br />
+     <a class="message" href="#SCI_GETMAXLINESTATE">SCI_GETMAXLINESTATE</a><br />
+    </code>
+
+    <p><b id="SCI_GETENDSTYLED">SCI_GETENDSTYLED</b><br />
+     Scintilla keeps a record of the last character that is likely to be styled correctly. This is
+    moved forwards when characters after it are styled and moved backwards if changes are made to
+    the text of the document before it. Before drawing text, this position is checked to see if any
+    styling is needed and, if so, a <code><a class="message"
+    href="#SCN_STYLENEEDED">SCN_STYLENEEDED</a></code> notification message is sent to the
+    container. The container can send <code>SCI_GETENDSTYLED</code> to work out where it needs to
+    start styling. Scintilla will always ask to style whole lines.</p>
+
+    <p><b id="SCI_STARTSTYLING">SCI_STARTSTYLING(int pos, int mask)</b><br />
+     This prepares for styling by setting the styling position <code>pos</code> to start at and a
+    <code>mask</code> indicating which bits of the style bytes can be set. The mask allows styling
+    to occur over several passes, with, for example, basic styling done on an initial pass to
+    ensure that the text of the code is seen quickly and correctly, and then a second slower pass,
+    detecting syntax errors and using indicators to show where these are. For example, with the
+    standard settings of 5 style bits and 3 indicator bits, you would use a <code>mask</code> value
+    of 31 (0x1f) if you were setting text styles and did not want to change the indicators. After
+    <code>SCI_STARTSTYLING</code>, send multiple <code>SCI_SETSTYLING</code> messages for each
+    lexical entity to style.</p>
+
+    <p><b id="SCI_SETSTYLING">SCI_SETSTYLING(int length, int style)</b><br />
+     This message sets the style of <code>length</code> characters starting at the styling position
+    and then increases the styling position by <code>length</code>, ready for the next call. If
+    <code>sCell</code> is the style byte, the operation is:<br />
+     <code>if ((sCell &amp; mask) != style) sCell = (sCell &amp; ~mask) | (style &amp;
+    mask);</code><br />
+    </p>
+
+    <p><b id="SCI_SETSTYLINGEX">SCI_SETSTYLINGEX(int length, const char *styles)</b><br />
+     As an alternative to <code>SCI_SETSTYLING</code>, which applies the same style to each byte,
+    you can use this message which specifies the styles for each of <code>length</code> bytes from
+    the styling position and then increases the styling position by <code>length</code>, ready for
+    the next call. The <code>length</code> styling bytes pointed at by <code>styles</code> should
+    not contain any bits not set in mask.</p>
+
+    <p><b id="SCI_SETLINESTATE">SCI_SETLINESTATE(int line, int value)</b><br />
+     <b id="SCI_GETLINESTATE">SCI_GETLINESTATE(int line)</b><br />
+     As well as the 8 bits of lexical state stored for each character there is also an integer
+    stored for each line. This can be used for longer lived parse states such as what the current
+    scripting language is in an ASP page. Use <code>SCI_SETLINESTATE</code> to set the integer
+    value and <code>SCI_GETLINESTATE</code> to get the value.
+    Changing the value produces a <a class="message" href="#SC_MOD_CHANGELINESTATE">SC_MOD_CHANGELINESTATE</a> notification.
+    </p>
+
+    <p><b id="SCI_GETMAXLINESTATE">SCI_GETMAXLINESTATE</b><br />
+     This returns the last line that has any line state.</p>
+
+    <h2 id="StyleDefinition">Style definition</h2>
+
+    <p>While the style setting messages mentioned above change the style numbers associated with
+    text, these messages define how those style numbers are interpreted visually. There are 256
+    lexer styles that can be set, numbered 0 to <code>STYLE_MAX</code> (255). Unless you use <a
+    class="message" href="#SCI_SETSTYLEBITS"><code>SCI_SETSTYLEBITS</code></a> to change the number
+    of style bits, styles 0 to 31 are used to set the text attributes. There are also some
+    predefined numbered styles starting at 32, The following <code>STYLE_</code>* constants are
+    defined.</p>
+
+    <table cellpadding="1" cellspacing="2" border="0" summary="Preset styles">
+      <tbody valign="top">
+        <tr>
+          <th align="left"><code>STYLE_DEFAULT</code></th>
+
+          <td>32</td>
+
+          <td>This style defines the attributes that all styles receive when the
+          <code>SCI_STYLECLEARALL</code> message is used.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>STYLE_LINENUMBER</code></th>
+
+          <td>33</td>
+
+          <td>This style sets the attributes of the text used to display line numbers in a line
+          number margin. The background colour set for this style also sets the background colour
+          for all margins that do not have any folding mask bits set. That is, any margin for which
+          <code>mask &amp; SC_MASK_FOLDERS</code> is 0. See <a class="message"
+          href="#SCI_SETMARGINMASKN"><code>SCI_SETMARGINMASKN</code></a> for more about masks.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>STYLE_BRACELIGHT</code></th>
+
+          <td>34</td>
+
+          <td>This style sets the attributes used when highlighting braces with the <a
+          class="message" href="#BraceHighlighting"><code>SCI_BRACEHIGHLIGHT</code></a> message and
+          when highlighting the corresponding indentation with <a class="message"
+          href="#SCI_SETHIGHLIGHTGUIDE"><code>SCI_SETHIGHLIGHTGUIDE</code></a>.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>STYLE_BRACEBAD</code></th>
+
+          <td>35</td>
+
+          <td>This style sets the display attributes used when marking an unmatched brace with the
+          <a class="message" href="#BraceHighlighting"><code>SCI_BRACEBADLIGHT</code></a>
+          message.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>STYLE_CONTROLCHAR</code></th>
+
+          <td>36</td>
+
+          <td>This style sets the font used when drawing control characters.
+            Only the font, size, bold, italics, and character set attributes are used and not
+            the colour attributes. See
+          also: <a class="message"
+          href="#SCI_SETCONTROLCHARSYMBOL"><code>SCI_SETCONTROLCHARSYMBOL</code></a>.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>STYLE_INDENTGUIDE</code></th>
+
+          <td>37</td>
+
+          <td>This style sets the foreground and background colours used when drawing the
+          indentation guides.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>STYLE_CALLTIP</code></th>
+
+          <td>38</td>
+
+          <td> Call tips normally use the font attributes defined by <code>STYLE_DEFAULT</code>.
+          Use of <a class="message" href="#SCI_CALLTIPUSESTYLE"><code>SCI_CALLTIPUSESTYLE</code></a>
+            causes call tips to use this style instead. Only the font face name, font size,
+          foreground and background colours and character set attributes are used.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>STYLE_LASTPREDEFINED</code></th>
+
+          <td>39</td>
+
+          <td>To make it easier for client code to discover the range of styles that are
+          predefined, this is set to the style number of the last predefined style. This is
+          currently set to 39 and the last style with an identifier is 38, which reserves space
+          for one future predefined style.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>STYLE_MAX</code></th>
+
+          <td>255</td>
+
+          <td>This is not a style but is the number of the maximum style that can be set. Styles
+          between <code>STYLE_LASTPREDEFINED</code> and <code>STYLE_MAX</code> would be appropriate
+          if you used <a class="message" href="#SCI_SETSTYLEBITS"><code>SCI_SETSTYLEBITS</code></a>
+          to set more than 5 style bits.</td>
+        </tr>
+      </tbody>
+    </table>
+
+    <p>For each style you can set the font name, size and use of bold, italic and underline,
+    foreground and background colour and the character set. You can also choose to hide text with a
+    given style, display all characters as upper or lower case and fill from the last character on
+    a line to the end of the line (for embedded languages). There is also an experimental attribute
+    to make text read-only.</p>
+
+    <p>It is entirely up to you how you use styles. If you want to use syntax colouring you might
+    use style 0 for white space, style 1 for numbers, style 2 for keywords, style 3 for strings,
+    style 4 for preprocessor, style 5 for operators, and so on.</p>
+    <code><a class="message" href="#SCI_STYLERESETDEFAULT">SCI_STYLERESETDEFAULT</a><br />
+    <a class="message" href="#SCI_STYLECLEARALL">SCI_STYLECLEARALL</a><br />
+    <a class="message" href="#SCI_STYLESETFONT">SCI_STYLESETFONT(int styleNumber, char
+    *fontName)</a><br />
+    <a class="message" href="#SCI_STYLEGETFONT">SCI_STYLEGETFONT(int styleNumber, char *fontName)</a><br />
+    <a class="message" href="#SCI_STYLESETSIZE">SCI_STYLESETSIZE(int styleNumber, int
+    sizeInPoints)</a><br />
+    <a class="message" href="#SCI_STYLEGETSIZE">SCI_STYLEGETSIZE(int styleNumber)</a><br />
+    <a class="message" href="#SCI_STYLESETBOLD">SCI_STYLESETBOLD(int styleNumber, bool
+    bold)</a><br />
+    <a class="message" href="#SCI_STYLEGETBOLD">SCI_STYLEGETBOLD(int styleNumber)</a><br />
+    <a class="message" href="#SCI_STYLESETITALIC">SCI_STYLESETITALIC(int styleNumber, bool
+    italic)</a><br />
+    <a class="message" href="#SCI_STYLEGETITALIC">SCI_STYLEGETITALIC(int styleNumber)</a><br />
+    <a class="message" href="#SCI_STYLESETUNDERLINE">SCI_STYLESETUNDERLINE(int styleNumber, bool
+    underline)</a><br />
+    <a class="message" href="#SCI_STYLEGETUNDERLINE">SCI_STYLEGETUNDERLINE(int styleNumber)</a><br />
+    <a class="message" href="#SCI_STYLESETFORE">SCI_STYLESETFORE(int styleNumber, int
+    colour)</a><br />
+    <a class="message" href="#SCI_STYLEGETFORE">SCI_STYLEGETFORE(int styleNumber)</a><br />
+    <a class="message" href="#SCI_STYLESETBACK">SCI_STYLESETBACK(int styleNumber, int
+    colour)</a><br />
+    <a class="message" href="#SCI_STYLEGETBACK">SCI_STYLESETBACK(int styleNumber)</a><br />
+    <a class="message" href="#SCI_STYLESETEOLFILLED">SCI_STYLESETEOLFILLED(int styleNumber, bool
+    eolFilled)</a><br />
+    <a class="message" href="#SCI_STYLEGETEOLFILLED">SCI_STYLEGETEOLFILLED(int styleNumber)</a><br />
+    <a class="message" href="#SCI_STYLESETCHARACTERSET">SCI_STYLESETCHARACTERSET(int styleNumber,
+    int charSet)</a><br />
+    <a class="message" href="#SCI_STYLEGETCHARACTERSET">SCI_STYLEGETCHARACTERSET(int styleNumber)</a><br />
+    <a class="message" href="#SCI_STYLESETCASE">SCI_STYLESETCASE(int styleNumber, int
+    caseMode)</a><br />
+    <a class="message" href="#SCI_STYLEGETCASE">SCI_STYLEGETCASE(int styleNumber)</a><br />
+    <a class="message" href="#SCI_STYLESETVISIBLE">SCI_STYLESETVISIBLE(int styleNumber, bool
+    visible)</a><br />
+    <a class="message" href="#SCI_STYLEGETVISIBLE">SCI_STYLEGETVISIBLE(int styleNumber)</a><br />
+    <a class="message" href="#SCI_STYLESETCHANGEABLE">SCI_STYLESETCHANGEABLE(int styleNumber, bool
+    changeable)</a><br />
+    <a class="message" href="#SCI_STYLEGETCHANGEABLE">SCI_STYLEGETCHANGEABLE(int styleNumber)</a><br />
+     <a class="message" href="#SCI_STYLESETHOTSPOT">SCI_STYLESETHOTSPOT(int styleNumber, bool
+    hotspot)</a><br />
+    <a class="message" href="#SCI_STYLEGETHOTSPOT">SCI_STYLEGETHOTSPOT(int styleNumber)</a><br />
+    </code>
+
+    <p><b id="SCI_STYLERESETDEFAULT">SCI_STYLERESETDEFAULT</b><br />
+     This message resets <code>STYLE_DEFAULT</code> to its state when Scintilla was
+    initialised.</p>
+
+    <p><b id="SCI_STYLECLEARALL">SCI_STYLECLEARALL</b><br />
+     This message sets all styles to have the same attributes as <code>STYLE_DEFAULT</code>. If you
+    are setting up Scintilla for syntax colouring, it is likely that the lexical styles you set
+    will be very similar. One way to set the styles is to:<br />
+     1. Set <code>STYLE_DEFAULT</code> to the common features of all styles.<br />
+     2. Use <code>SCI_STYLECLEARALL</code> to copy this to all styles.<br />
+     3. Set the style attributes that make your lexical styles different.</p>
+
+    <p><b id="SCI_STYLESETFONT">SCI_STYLESETFONT(int styleNumber, const char *fontName)</b><br />
+    <b id="SCI_STYLEGETFONT">SCI_STYLEGETFONT(int styleNumber, char *fontName)</b><br />
+    <b id="SCI_STYLESETSIZE">SCI_STYLESETSIZE(int styleNumber, int sizeInPoints)</b><br />
+    <b id="SCI_STYLEGETSIZE">SCI_STYLEGETSIZE(int styleNumber)</b><br />
+    <b id="SCI_STYLESETBOLD">SCI_STYLESETBOLD(int styleNumber, bool bold)</b><br />
+    <b id="SCI_STYLEGETBOLD">SCI_STYLEGETBOLD(int styleNumber)</b><br />
+    <b id="SCI_STYLESETITALIC">SCI_STYLESETITALIC(int styleNumber, bool italic)</b><br />
+    <b id="SCI_STYLEGETITALIC">SCI_STYLEGETITALIC(int styleNumber)</b><br />
+     These messages (plus <a class="message"
+    href="#SCI_STYLESETCHARACTERSET"><code>SCI_STYLESETCHARACTERSET</code></a>) set the font
+    attributes that are used to match the fonts you request to those available. The
+    <code>fontName</code> is a zero terminated string holding the name of a font. Under Windows,
+    only the first 32 characters of the name are used and the name is not case sensitive. For
+    internal caching, Scintilla tracks fonts by name and does care about the casing of font names,
+    so please be consistent. On GTK+ 2.x, either GDK or Pango can be used to display text.
+    Pango antialiases text, works well with Unicode and is better supported in recent versions of GTK+
+    but GDK is faster.
+    Prepend a '!' character to the font name to use Pango.</p>
+
+    <p><b id="SCI_STYLESETUNDERLINE">SCI_STYLESETUNDERLINE(int styleNumber, bool
+    underline)</b><br />
+    <b id="SCI_STYLEGETUNDERLINE">SCI_STYLEGETUNDERLINE(int styleNumber)</b><br />
+    You can set a style to be underlined. The underline is drawn in the foreground colour. All
+    characters with a style that includes the underline attribute are underlined, even if they are
+    white space.</p>
+
+    <p><b id="SCI_STYLESETFORE">SCI_STYLESETFORE(int styleNumber, int <a class="jump"
+    href="#colour">colour</a>)</b><br />
+    <b id="SCI_STYLEGETFORE">SCI_STYLEGETFORE(int styleNumber)</b><br />
+    <b id="SCI_STYLESETBACK">SCI_STYLESETBACK(int styleNumber, int <a class="jump"
+    href="#colour">colour</a>)</b><br />
+    <b id="SCI_STYLEGETBACK">SCI_STYLEGETBACK(int styleNumber)</b><br />
+    Text is drawn in the foreground colour. The space in each character cell that is not occupied
+    by the character is drawn in the background colour.</p>
+
+    <p><b id="SCI_STYLESETEOLFILLED">SCI_STYLESETEOLFILLED(int styleNumber, bool
+    eolFilled)</b><br />
+    <b id="SCI_STYLEGETEOLFILLED">SCI_STYLEGETEOLFILLED(int styleNumber)</b><br />
+    If the last character in the line has a style with this attribute set, the remainder of the
+    line up to the right edge of the window is filled with the background colour set for the last
+    character. This is useful when a document contains embedded sections in another language such
+    as HTML pages with embedded JavaScript. By setting <code>eolFilled</code> to <code>true</code>
+    and a consistent background colour (different from the background colour set for the HTML
+    styles) to all JavaScript styles then JavaScript sections will be easily distinguished from
+    HTML.</p>
+
+    <p><b id="SCI_STYLESETCHARACTERSET">SCI_STYLESETCHARACTERSET(int styleNumber, int
+    charSet)</b><br />
+    <b id="SCI_STYLEGETCHARACTERSET">SCI_STYLEGETCHARACTERSET(int styleNumber)</b><br />
+    You can set a style to use a different character set than the default. The places where such
+    characters sets are likely to be useful are comments and literal strings. For example,
+    <code>SCI_STYLESETCHARACTERSET(SCE_C_STRING, SC_CHARSET_RUSSIAN)</code> would ensure that
+    strings in Russian would display correctly in C and C++ (<code>SCE_C_STRING</code> is the style
+    number used by the C and C++ lexer to display literal strings; it has the value 6). This
+    feature works differently on Windows and GTK+.</p>
+
+    <p>The character sets supported on Windows are:<br />
+     <code>SC_CHARSET_ANSI</code>, <code>SC_CHARSET_ARABIC</code>, <code>SC_CHARSET_BALTIC</code>,
+    <code>SC_CHARSET_CHINESEBIG5</code>, <code>SC_CHARSET_DEFAULT</code>,
+    <code>SC_CHARSET_EASTEUROPE</code>, <code>SC_CHARSET_GB2312</code>,
+    <code>SC_CHARSET_GREEK</code>, <code>SC_CHARSET_HANGUL</code>, <code>SC_CHARSET_HEBREW</code>,
+    <code>SC_CHARSET_JOHAB</code>, <code>SC_CHARSET_MAC</code>, <code>SC_CHARSET_OEM</code>,
+    <code>SC_CHARSET_RUSSIAN</code> (code page 1251),
+    <code>SC_CHARSET_SHIFTJIS</code>, <code>SC_CHARSET_SYMBOL</code>, <code>SC_CHARSET_THAI</code>,
+    <code>SC_CHARSET_TURKISH</code>, and <code>SC_CHARSET_VIETNAMESE</code>.</p>
+
+    <p>The character sets supported on GTK+ are:<br />
+     <code>SC_CHARSET_ANSI</code>, <code>SC_CHARSET_CYRILLIC</code> (code page 1251),
+     <code>SC_CHARSET_EASTEUROPE</code>,
+    <code>SC_CHARSET_GB2312</code>, <code>SC_CHARSET_HANGUL</code>,
+    <code>SC_CHARSET_RUSSIAN</code> (KOI8-R), <code>SC_CHARSET_SHIFTJIS</code>, and
+    <code>SC_CHARSET_8859_15</code>.</p>
+
+    <p><b id="SCI_STYLESETCASE">SCI_STYLESETCASE(int styleNumber, int caseMode)</b><br />
+    <b id="SCI_STYLEGETCASE">SCI_STYLEGETCASE(int styleNumber)</b><br />
+    The value of caseMode determines how text is displayed. You can set upper case
+    (<code>SC_CASE_UPPER</code>, 1) or lower case (<code>SC_CASE_LOWER</code>, 2) or display
+    normally (<code>SC_CASE_MIXED</code>, 0). This does not change the stored text, only how it is
+    displayed.</p>
+
+    <p><b id="SCI_STYLESETVISIBLE">SCI_STYLESETVISIBLE(int styleNumber, bool visible)</b><br />
+    <b id="SCI_STYLEGETVISIBLE">SCI_STYLEGETVISIBLE(int styleNumber)</b><br />
+    Text is normally visible. However, you can completely hide it by giving it a style with the
+    <code>visible</code> set to 0. This could be used to hide embedded formatting instructions or
+    hypertext keywords in HTML or XML.</p>
+
+    <p><b id="SCI_STYLESETCHANGEABLE">SCI_STYLESETCHANGEABLE(int styleNumber, bool
+    changeable)</b><br />
+    <b id="SCI_STYLEGETCHANGEABLE">SCI_STYLEGETCHANGEABLE(int styleNumber)</b><br />
+    This is an experimental and incompletely implemented style attribute. The default setting is
+    <code>changeable</code> set <code>true</code> but when set <code>false</code> it makes text
+    read-only. Currently it only stops the caret from being within not-changeable text and does not
+    yet stop deleting a range that contains not-changeable text.</p>
+
+    <p><b id="SCI_STYLESETHOTSPOT">SCI_STYLESETHOTSPOT(int styleNumber, bool
+    hotspot)</b><br />
+    <b id="SCI_STYLEGETHOTSPOT">SCI_STYLEGETHOTSPOT(int styleNumber)</b><br />
+    This style is used to mark ranges of text that can detect mouse clicks.
+    The cursor changes to a hand over hotspots, and the foreground, and background colours
+    may change and an underline appear to indicate that these areas are sensitive to clicking.
+    This may be used to allow hyperlinks to other documents.</p>
+
+    <h2 id="CaretAndSelectionStyles">Caret, selection, and hotspot styles</h2>
+
+    <p>The selection is shown by changing the foreground and/or background colours. If one of these
+    is not set then that attribute is not changed for the selection. The default is to show the
+    selection by changing the background to light gray and leaving the foreground the same as when
+    it was not selected. When there is no selection, the current insertion point is marked by the
+    text caret. This is a vertical line that is normally blinking on and off to attract the users
+    attention.</p>
+    <code><a class="message" href="#SCI_SETSELFORE">SCI_SETSELFORE(bool useSelectionForeColour,
+    int <a class="jump" href="#colour">colour<a>)</a><br />
+    <a class="message" href="#SCI_SETSELBACK">SCI_SETSELBACK(bool useSelectionBackColour,
+    int <a class="jump" href="#colour">colour<a>)</a><br />
+    <a class="message" href="#SCI_SETSELALPHA">SCI_SETSELALPHA(int alpha)</a><br />
+    <a class="message" href="#SCI_GETSELALPHA">SCI_GETSELALPHA</a><br />
+    <a class="message" href="#SCI_SETSELEOLFILLED">SCI_SETSELEOLFILLED(bool filled)</a><br />
+    <a class="message" href="#SCI_GETSELEOLFILLED">SCI_GETSELEOLFILLED</a><br />
+    <a class="message" href="#SCI_SETCARETFORE">SCI_SETCARETFORE(int colour)</a><br />
+    <a class="message" href="#SCI_GETCARETFORE">SCI_GETCARETFORE</a><br />
+    <a class="message" href="#SCI_SETCARETLINEVISIBLE">SCI_SETCARETLINEVISIBLE(bool
+    show)</a><br />
+    <a class="message" href="#SCI_GETCARETLINEVISIBLE">SCI_GETCARETLINEVISIBLE</a><br />
+    <a class="message" href="#SCI_SETCARETLINEBACK">SCI_SETCARETLINEBACK(int colour)</a><br />
+    <a class="message" href="#SCI_GETCARETLINEBACK">SCI_GETCARETLINEBACK</a><br />
+    <a class="message" href="#SCI_SETCARETLINEBACKALPHA">SCI_SETCARETLINEBACKALPHA(int alpha)</a><br />
+    <a class="message" href="#SCI_GETCARETLINEBACKALPHA">SCI_GETCARETLINEBACKALPHA</a><br />
+    <a class="message" href="#SCI_SETCARETPERIOD">SCI_SETCARETPERIOD(int milliseconds)</a><br />
+    <a class="message" href="#SCI_GETCARETPERIOD">SCI_GETCARETPERIOD</a><br />
+    <a class="message" href="#SCI_SETCARETSTYLE">SCI_SETCARETSTYLE(int style)</a><br />
+    <a class="message" href="#SCI_GETCARETSTYLE">SCI_GETCARETSTYLE</a><br />
+    <a class="message" href="#SCI_SETCARETWIDTH">SCI_SETCARETWIDTH(int pixels)</a><br />
+    <a class="message" href="#SCI_GETCARETWIDTH">SCI_GETCARETWIDTH</a><br />
+    <a class="message" href="#SCI_SETHOTSPOTACTIVEFORE">SCI_SETHOTSPOTACTIVEFORE(bool useSetting,
+    int <a class="jump" href="#colour">colour<a>)</a><br />
+    <a class="message" href="#SCI_GETHOTSPOTACTIVEFORE">SCI_GETHOTSPOTACTIVEFORE</a><br />
+    <a class="message" href="#SCI_SETHOTSPOTACTIVEBACK">SCI_SETHOTSPOTACTIVEBACK(bool useSetting,
+    int <a class="jump" href="#colour">colour<a>)</a><br />
+    <a class="message" href="#SCI_GETHOTSPOTACTIVEBACK">SCI_GETHOTSPOTACTIVEBACK</a><br />
+    <a class="message" href="#SCI_SETHOTSPOTACTIVEUNDERLINE">SCI_SETHOTSPOTACTIVEUNDERLINE(bool underline)</a><br />
+    <a class="message" href="#SCI_GETHOTSPOTACTIVEUNDERLINE">SCI_GETHOTSPOTACTIVEUNDERLINE</a><br />
+    <a class="message" href="#SCI_SETHOTSPOTSINGLELINE">SCI_SETHOTSPOTSINGLELINE(bool singleLine)</a><br />
+    <a class="message" href="#SCI_GETHOTSPOTSINGLELINE">SCI_GETHOTSPOTSINGLELINE</a><br />
+    <a class="message" href="#SCI_SETCONTROLCHARSYMBOL">SCI_SETCONTROLCHARSYMBOL(int
+    symbol)</a><br />
+     <a class="message" href="#SCI_GETCONTROLCHARSYMBOL">SCI_GETCONTROLCHARSYMBOL</a><br />
+     <a class="message" href="#SCI_SETCARETSTICKY">SCI_SETCARETSTICKY(bool useCaretStickyBehaviour)</a><br />
+     <a class="message" href="#SCI_GETCARETSTICKY">SCI_GETCARETSTICKY</a><br />
+     <a class="message" href="#SCI_TOGGLECARETSTICKY">SCI_TOGGLECARETSTICKY</a><br />
+    </code>
+
+    <p><b id="SCI_SETSELFORE">SCI_SETSELFORE(bool useSelectionForeColour, int <a class="jump"
+    href="#colour">colour</a>)</b><br />
+     <b id="SCI_SETSELBACK">SCI_SETSELBACK(bool useSelectionBackColour, int <a class="jump"
+    href="#colour">colour</a>)</b><br />
+     You can choose to override the default selection colouring with these two messages. The colour
+    you provide is used if you set <code>useSelection*Colour</code> to <code>true</code>. If it is
+    set to <code>false</code>, the default styled colouring is used and the <code>colour</code>
+    argument has no effect.</p>
+     <p><b id="SCI_SETSELALPHA">SCI_SETSELALPHA(int <a class="jump" href="#alpha">alpha</a>)</b><br />
+     <b id="SCI_GETSELALPHA">SCI_GETSELALPHA</b><br />
+     The selection can be drawn translucently in the selection background colour by
+     setting an alpha value.</p>
+
+     <p><b id="SCI_SETSELEOLFILLED">SCI_SETSELEOLFILLED(bool filled)</b><br />
+     <b id="SCI_GETSELEOLFILLED">SCI_GETSELEOLFILLED</b><br />
+     The selection can be drawn up to the right hand border by setting this property.</p>
+
+    <p><b id="SCI_SETCARETFORE">SCI_SETCARETFORE(int <a class="jump"
+    href="#colour">colour</a>)</b><br />
+     <b id="SCI_GETCARETFORE">SCI_GETCARETFORE</b><br />
+     The colour of the caret can be set with <code>SCI_SETCARETFORE</code> and retrieved with
+    <code>SCI_GETCARETFORE</code>.</p>
+
+    <p><b id="SCI_SETCARETLINEVISIBLE">SCI_SETCARETLINEVISIBLE(bool show)</b><br />
+     <b id="SCI_GETCARETLINEVISIBLE">SCI_GETCARETLINEVISIBLE</b><br />
+     <b id="SCI_SETCARETLINEBACK">SCI_SETCARETLINEBACK(int <a class="jump"
+    href="#colour">colour</a>)</b><br />
+     <b id="SCI_GETCARETLINEBACK">SCI_GETCARETLINEBACK</b><br />
+     <b id="SCI_SETCARETLINEBACKALPHA">SCI_SETCARETLINEBACKALPHA(int <a class="jump" href="#alpha">alpha</a>)</b><br />
+     <b id="SCI_GETCARETLINEBACKALPHA">SCI_GETCARETLINEBACKALPHA</b><br />
+     You can choose to make the background colour of the line containing the caret different with
+    these messages. To do this, set the desired background colour with
+    <code>SCI_SETCARETLINEBACK</code>, then use <code>SCI_SETCARETLINEVISIBLE(true)</code> to
+    enable the effect. You can cancel the effect with <code>SCI_SETCARETLINEVISIBLE(false)</code>.
+    The two <code>SCI_GETCARET*</code> functions return the state and the colour. This form of
+    background colouring has highest priority when a line has markers that would otherwise change
+    the background colour.
+           The caret line may also be drawn translucently which allows other background colours to show
+           through. This is done by setting the alpha (translucency) value by calling
+           SCI_SETCARETLINEBACKALPHA. When the alpha is not SC_ALPHA_NOALPHA,
+           the caret line is drawn after all other features so will affect the colour of all other features.
+          </p>
+
+    <p><b id="SCI_SETCARETPERIOD">SCI_SETCARETPERIOD(int milliseconds)</b><br />
+     <b id="SCI_GETCARETPERIOD">SCI_GETCARETPERIOD</b><br />
+     The rate at which the caret blinks can be set with <code>SCI_SETCARETPERIOD</code> which
+    determines the time in milliseconds that the caret is visible or invisible before changing
+    state. Setting the period to 0 stops the caret blinking. The default value is 500 milliseconds.
+    <code>SCI_GETCARETPERIOD</code> returns the current setting.</p>
+
+    <p><b id="SCI_SETCARETSTYLE">SCI_SETCARETSTYLE(int style)</b><br />
+     <b id="SCI_GETCARETSTYLE">SCI_GETCARETSTYLE</b><br />
+     The style of the caret can be set with <code>SCI_SETCARETSTYLE</code> to be a line caret
+    (CARETSTYLE_LINE=1), a block caret (CARETSTYLE_BLOCK=2) or to not draw at all
+    (CARETSTYLE_INVISIBLE=0). The default value is the line caret (CARETSTYLE_LINE=1).
+    You can determine the current caret style setting using <code>SCI_GETCARETSTYLE</code>.</p>
+
+    <p>The block character draws most combining and multibyte character sequences successfully,
+    though some fonts like Thai Fonts (and possibly others) can sometimes appear strange when
+    the cursor is positioned at these characters, which may result in only drawing a part of the
+    cursor character sequence. This is most notable on Windows platforms.</p>
+
+    <p><b id="SCI_SETCARETWIDTH">SCI_SETCARETWIDTH(int pixels)</b><br />
+     <b id="SCI_GETCARETWIDTH">SCI_GETCARETWIDTH</b><br />
+     The width of the line caret can be set with <code>SCI_SETCARETWIDTH</code> to a value of
+    0, 1, 2 or 3 pixels. The default width is 1 pixel. You can read back the current width with
+    <code>SCI_GETCARETWIDTH</code>. A width of 0 makes the caret invisible (added at version
+    1.50), similar to setting the caret style to CARETSTYLE_INVISIBLE (though not interchangable).
+    This setting only affects the width of the cursor when the cursor style is set to line caret
+    mode, it does not affect the width for a block caret.</p>
+
+    <p><b id="SCI_SETHOTSPOTACTIVEFORE">SCI_SETHOTSPOTACTIVEFORE(bool useHotSpotForeColour, int <a class="jump"
+    href="#colour">colour</a>)</b><br />
+    <b id="SCI_GETHOTSPOTACTIVEFORE">SCI_GETHOTSPOTACTIVEFORE</b><br />
+    <b id="SCI_SETHOTSPOTACTIVEBACK">SCI_SETHOTSPOTACTIVEBACK(bool useHotSpotBackColour, int <a class="jump"
+    href="#colour">colour</a>)</b><br />
+    <b id="SCI_GETHOTSPOTACTIVEBACK">SCI_GETHOTSPOTACTIVEBACK</b><br />
+    <b id="SCI_SETHOTSPOTACTIVEUNDERLINE">SCI_SETHOTSPOTACTIVEUNDERLINE(bool underline)</b><br />
+     <b id="SCI_GETHOTSPOTACTIVEUNDERLINE">SCI_GETHOTSPOTACTIVEUNDERLINE</b><br />
+    <b id="SCI_SETHOTSPOTSINGLELINE">SCI_SETHOTSPOTSINGLELINE(bool singleLine)</b><br />
+     <b id="SCI_GETHOTSPOTSINGLELINE">SCI_GETHOTSPOTSINGLELINE</b><br />
+    While the cursor hovers over text in a style with the hotspot attribute set,
+    the default colouring can be modified and an underline drawn with these settings.
+    Single line mode stops a hotspot from wrapping onto next line.</p>
+
+    <p><b id="SCI_SETCONTROLCHARSYMBOL">SCI_SETCONTROLCHARSYMBOL(int symbol)</b><br />
+     <b id="SCI_GETCONTROLCHARSYMBOL">SCI_GETCONTROLCHARSYMBOL</b><br />
+     By default, Scintilla displays control characters (characters with codes less than 32) in a
+    rounded rectangle as ASCII mnemonics: "NUL", "SOH", "STX", "ETX", "EOT", "ENQ", "ACK", "BEL",
+    "BS", "HT", "LF", "VT", "FF", "CR", "SO", "SI", "DLE", "DC1", "DC2", "DC3", "DC4", "NAK",
+    "SYN", "ETB", "CAN", "EM", "SUB", "ESC", "FS", "GS", "RS", "US". These mnemonics come from the
+    early days of signaling, though some are still used (LF = Line Feed, BS = Back Space, CR =
+    Carriage Return, for example).</p>
+
+    <p>You can choose to replace these mnemonics by a nominated symbol with an ASCII code in the
+    range 32 to 255. If you set a symbol value less than 32, all control characters are displayed
+    as mnemonics. The symbol you set is rendered in the font of the style set for the character.
+    You can read back the current symbol with the <code>SCI_GETCONTROLCHARSYMBOL</code> message.
+    The default symbol value is 0.</p>
+
+    <p><b id="SCI_SETCARETSTICKY">SCI_SETCARETSTICKY(bool useCaretStickyBehaviour)</b><br />
+    <b id="SCI_GETCARETSTICKY">SCI_GETCARETSTICKY</b><br />
+    <b id="SCI_TOGGLECARETSTICKY">SCI_TOGGLECARETSTICKY</b><br />
+    These messages set, get or toggle the caretSticky flag which controls when the last position
+     of the caret on the line is saved. When set to true, the position is not saved when you type
+     a character, a tab, paste the clipboard content or press backspace.</p>
+
+    <h2 id="Margins">Margins</h2>
+
+    <p>There may be up to five margins to the left of the text display, plus a gap either side of
+    the text. Each margin can be set to display either symbols or line numbers with <a
+    class="message" href="#SCI_SETMARGINTYPEN"><code>SCI_SETMARGINTYPEN</code></a>. The markers
+    that can be displayed in each margin are set with <a class="message"
+    href="#SCI_SETMARGINMASKN"><code>SCI_SETMARGINMASKN</code></a>. Any markers not associated with
+    a visible margin will be displayed as changes in background colour in the text. A width in
+    pixels can be set for each margin. Margins with a zero width are ignored completely. You can
+    choose if a mouse click in a margin sends a <a class="message"
+    href="#SCN_MARGINCLICK"><code>SCN_MARGINCLICK</code></a> notification to the container or
+    selects a line of text.</p>
+
+    <p>The margins are numbered 0 to 4. Using a margin number outside the valid range has no
+    effect. By default, margin 0 is set to display line numbers, but is given a width of 0, so it
+    is hidden. Margin 1 is set to display non-folding symbols and is given a width of 16 pixels, so
+    it is visible. Margin 2 is set to display the folding symbols, but is given a width of 0, so it
+    is hidden. Of course, you can set the margins to be whatever you wish.</p>
+    <code><a class="message" href="#SCI_SETMARGINTYPEN">SCI_SETMARGINTYPEN(int margin, int
+    type)</a><br />
+     <a class="message" href="#SCI_GETMARGINTYPEN">SCI_GETMARGINTYPEN(int margin)</a><br />
+     <a class="message" href="#SCI_SETMARGINWIDTHN">SCI_SETMARGINWIDTHN(int margin, int
+    pixelWidth)</a><br />
+     <a class="message" href="#SCI_GETMARGINWIDTHN">SCI_GETMARGINWIDTHN(int margin)</a><br />
+     <a class="message" href="#SCI_SETMARGINMASKN">SCI_SETMARGINMASKN(int margin, int
+    mask)</a><br />
+     <a class="message" href="#SCI_GETMARGINMASKN">SCI_GETMARGINMASKN(int margin)</a><br />
+     <a class="message" href="#SCI_SETMARGINSENSITIVEN">SCI_SETMARGINSENSITIVEN(int margin, bool
+    sensitive)</a><br />
+     <a class="message" href="#SCI_GETMARGINSENSITIVEN">SCI_GETMARGINSENSITIVEN(int
+    margin)</a><br />
+     <a class="message" href="#SCI_SETMARGINLEFT">SCI_SETMARGINLEFT(&lt;unused&gt;, int
+    pixels)</a><br />
+     <a class="message" href="#SCI_GETMARGINLEFT">SCI_GETMARGINLEFT</a><br />
+     <a class="message" href="#SCI_SETMARGINRIGHT">SCI_SETMARGINRIGHT(&lt;unused&gt;, int
+    pixels)</a><br />
+     <a class="message" href="#SCI_GETMARGINRIGHT">SCI_GETMARGINRIGHT</a><br />
+     <a class="message" href="#SCI_SETFOLDMARGINCOLOUR">SCI_SETFOLDMARGINCOLOUR(bool useSetting, int colour)</a><br />
+     <a class="message" href="#SCI_SETFOLDMARGINHICOLOUR">SCI_SETFOLDMARGINHICOLOUR(bool useSetting, int colour)</a><br />
+    </code>
+
+    <p><b id="SCI_SETMARGINTYPEN">SCI_SETMARGINTYPEN(int margin, int iType)</b><br />
+     <b id="SCI_GETMARGINTYPEN">SCI_GETMARGINTYPEN(int margin)</b><br />
+     These two routines set and get the type of a margin. The margin argument should be 0, 1, 2, 3 or 4.
+    You can use the predefined constants <code>SC_MARGIN_SYMBOL</code> (0) and
+    <code>SC_MARGIN_NUMBER</code> (1) to set a margin as either a line number or a symbol margin.
+    By convention, margin 0 is used for line numbers and the next two are used for symbols. You can
+    also use the constants <code>SC_MARGIN_BACK</code> (2) and <code>SC_MARGIN_FORE</code> (3) for
+    symbol margins that set their background colour to match the STYLE_DEFAULT background and
+    foreground colours.</p>
+
+    <p><b id="SCI_SETMARGINWIDTHN">SCI_SETMARGINWIDTHN(int margin, int pixelWidth)</b><br />
+     <b id="SCI_GETMARGINWIDTHN">SCI_GETMARGINWIDTHN(int margin)</b><br />
+     These routines set and get the width of a margin in pixels. A margin with zero width is
+    invisible. By default, Scintilla sets margin 1 for symbols with a width of 16 pixels, so this
+    is a reasonable guess if you are not sure what would be appropriate. Line number margins widths
+    should take into account the number of lines in the document and the line number style. You
+    could use something like <a class="message"
+    href="#SCI_TEXTWIDTH"><code>SCI_TEXTWIDTH(STYLE_LINENUMBER, "_99999")</code></a> to get a
+    suitable width.</p>
+
+    <p><b id="SCI_SETMARGINMASKN">SCI_SETMARGINMASKN(int margin, int mask)</b><br />
+     <b id="SCI_GETMARGINMASKN">SCI_GETMARGINMASKN(int margin)</b><br />
+     The mask is a 32-bit value. Each bit corresponds to one of 32 logical symbols that can be
+    displayed in a margin that is enabled for symbols. There is a useful constant,
+    <code>SC_MASK_FOLDERS</code> (0xFE000000 or -33554432), that is a mask for the 7 logical
+    symbols used to denote folding. You can assign a wide range of symbols and colours to each of
+    the 32 logical symbols, see <a href="#Markers">Markers</a> for more information. If <code>(mask
+    &amp; SC_MASK_FOLDERS)==0</code>, the margin background colour is controlled by style 33 (<a
+    class="message" href="#StyleDefinition"><code>STYLE_LINENUMBER</code></a>).</p>
+
+    <p>You add logical markers to a line with <a class="message"
+    href="#SCI_MARKERADD"><code>SCI_MARKERADD</code></a>. If a line has an associated marker that
+    does not appear in the mask of any margin with a non-zero width, the marker changes the
+    background colour of the line. For example, suppose you decide to use logical marker 10 to mark
+    lines with a syntax error and you want to show such lines by changing the background colour.
+    The mask for this marker is 1 shifted left 10 times (1&lt;&lt;10) which is 0x400. If you make
+    sure that no symbol margin includes 0x400 in its mask, any line with the marker gets the
+    background colour changed.</p>
+
+    <p>To set a non-folding margin 1 use <code>SCI_SETMARGINMASKN(1, ~SC_MASK_FOLDERS)</code>; to
+    set a folding margin 2 use <code>SCI_SETMARGINMASKN(2, SC_MASK_FOLDERS)</code>. This is the
+    default set by Scintilla. <code>~SC_MASK_FOLDERS</code> is 0x1FFFFFF in hexadecimal or 33554431
+    decimal. Of course, you may need to display all 32 symbols in a margin, in which case use
+    <code>SCI_SETMARGINMASKN(margin, -1)</code>.</p>
+
+    <p><b id="SCI_SETMARGINSENSITIVEN">SCI_SETMARGINSENSITIVEN(int margin, bool
+    sensitive)</b><br />
+     <b id="SCI_GETMARGINSENSITIVEN">SCI_GETMARGINSENSITIVEN(int margin)</b><br />
+     Each of the five margins can be set sensitive or insensitive to mouse clicks. A click in a
+    sensitive margin sends a <a class="message"
+    href="#SCN_MARGINCLICK"><code>SCN_MARGINCLICK</code></a> <a class="jump"
+    href="#Notifications">notification</a> to the container. Margins that are not sensitive act as
+    selection margins which make it easy to select ranges of lines. By default, all margins are
+    insensitive.</p>
+
+    <p><b id="SCI_SETMARGINLEFT">SCI_SETMARGINLEFT(&lt;unused&gt;, int pixels)</b><br />
+     <b id="SCI_GETMARGINLEFT">SCI_GETMARGINLEFT</b><br />
+     <b id="SCI_SETMARGINRIGHT">SCI_SETMARGINRIGHT(&lt;unused&gt;, int pixels)</b><br />
+     <b id="SCI_GETMARGINRIGHT">SCI_GETMARGINRIGHT</b><br />
+     These messages set and get the width of the blank margin on both sides of the text in pixels.
+    The default is to one pixel on each side.</p>
+
+    <p><b id="SCI_SETFOLDMARGINCOLOUR">SCI_SETFOLDMARGINCOLOUR(bool useSetting, int colour)</b><br />
+     <b id="SCI_SETFOLDMARGINHICOLOUR">SCI_SETFOLDMARGINHICOLOUR(bool useSetting, int colour)</b><br />
+     These messages allow changing the colour of the fold margin and fold margin highlight.
+     On Windows the fold margin colour defaults to ::GetSysColor(COLOR_3DFACE) and the fold margin highlight
+     colour to ::GetSysColor(COLOR_3DHIGHLIGHT).</p>
+
+    <h2 id="OtherSettings">Other settings</h2>
+    <code><a class="message" href="#SCI_SETUSEPALETTE">SCI_SETUSEPALETTE(bool
+    allowPaletteUse)</a><br />
+     <a class="message" href="#SCI_GETUSEPALETTE">SCI_GETUSEPALETTE</a><br />
+     <a class="message" href="#SCI_SETBUFFEREDDRAW">SCI_SETBUFFEREDDRAW(bool isBuffered)</a><br />
+     <a class="message" href="#SCI_GETBUFFEREDDRAW">SCI_GETBUFFEREDDRAW</a><br />
+     <a class="message" href="#SCI_SETTWOPHASEDRAW">SCI_SETTWOPHASEDRAW(bool twoPhase)</a><br />
+     <a class="message" href="#SCI_GETTWOPHASEDRAW">SCI_GETTWOPHASEDRAW</a><br />
+     <a class="message" href="#SCI_SETCODEPAGE">SCI_SETCODEPAGE(int codePage)</a><br />
+     <a class="message" href="#SCI_GETCODEPAGE">SCI_GETCODEPAGE</a><br />
+     <a class="message" href="#SCI_SETKEYSUNICODE">SCI_SETKEYSUNICODE(bool keysUnicode)</a><br />
+     <a class="message" href="#SCI_GETKEYSUNICODE">SCI_GETKEYSUNICODE</a><br />
+     <a class="message" href="#SCI_SETWORDCHARS">SCI_SETWORDCHARS(&lt;unused&gt;, const char
+    *chars)</a><br />
+     <a class="message" href="#SCI_SETWHITESPACECHARS">SCI_SETWHITESPACECHARS(&lt;unused&gt;, const char
+    *chars)</a><br />
+     <a class="message" href="#SCI_SETCHARSDEFAULT">SCI_SETCHARSDEFAULT</a><br />
+     <a class="message" href="#SCI_GRABFOCUS">SCI_GRABFOCUS</a><br />
+     <a class="message" href="#SCI_SETFOCUS">SCI_SETFOCUS(bool focus)</a><br />
+     <a class="message" href="#SCI_GETFOCUS">SCI_GETFOCUS</a><br />
+    </code>
+
+    <p><b id="SCI_SETUSEPALETTE">SCI_SETUSEPALETTE(bool allowPaletteUse)</b><br />
+     <b id="SCI_GETUSEPALETTE">SCI_GETUSEPALETTE</b><br />
+     On 8 bit displays, which can only display a maximum of 256 colours, the graphics environment
+    mediates between the colour needs of applications through the use of palettes. On GTK+,
+    Scintilla always uses a palette.</p>
+
+    <p>On Windows, there are some problems with visual flashing when switching between applications
+    with palettes and it is also necessary for the application containing the Scintilla control to
+    forward some messages to Scintilla for its palette code to work. Because of this, by default,
+    the palette is not used and the application must tell Scintilla to use one. If Scintilla is not
+    using a palette, it will only display in those colours already available, which are often the
+    20 Windows system colours.</p>
+
+    <p>To see an example of how to enable palette support in Scintilla, search the text of SciTE
+    for <code>WM_PALETTECHANGED</code>, <code>WM_QUERYNEWPALETTE</code> and
+    <code>SCI_SETUSEPALETTE</code>. The Windows messages to forward are:<br />
+     <code>WM_SYSCOLORCHANGE</code>, <code>WM_PALETTECHANGED</code>,
+    <code>WM_QUERYNEWPALETTE</code> (should return <code>TRUE</code>).</p>
+
+    <p>To forward a message <code>(WM_XXXX, WPARAM, LPARAM)</code> to Scintilla, you can use
+    <code>SendMessage(hScintilla, WM_XXXX, WPARAM, LPARAM)</code> where <code>hScintilla</code> is
+    the handle to the Scintilla window you created as your editor.</p>
+
+    <p>While we are on the subject of forwarding messages in Windows, the top level window should
+    forward any <code>WM_SETTINGCHANGE</code> messages to Scintilla (this is currently used to
+    collect changes to mouse settings, but could be used for other user interface items in the
+    future).</p>
+
+    <p><b id="SCI_SETBUFFEREDDRAW">SCI_SETBUFFEREDDRAW(bool isBuffered)</b><br />
+     <b id="SCI_GETBUFFEREDDRAW">SCI_GETBUFFEREDDRAW</b><br />
+     These messages turn buffered drawing on or off and report the buffered drawing state. Buffered
+    drawing draws each line into a bitmap rather than directly to the screen and then copies the
+    bitmap to the screen. This avoids flickering although it does take longer. The default is for
+    drawing to be buffered.</p>
+
+    <p><b id="SCI_SETTWOPHASEDRAW">SCI_SETTWOPHASEDRAW(bool twoPhase)</b><br />
+     <b id="SCI_GETTWOPHASEDRAW">SCI_GETTWOPHASEDRAW</b><br />
+     Two phase drawing is a better but slower way of drawing text.
+     In single phase drawing each run of characters in one style is drawn along with its background.
+     If a character overhangs the end of a run, such as in "<i>V</i>_" where the
+     "<i>V</i>" is in a different style from the "_", then this can cause the right hand
+     side of the "<i>V</i>" to be overdrawn by the background of the "_" which
+     cuts it off. Two phase drawing
+     fixes this by drawing all the backgrounds first and then drawing the text in
+     transparent mode. Two phase drawing may flicker more than single phase
+     unless buffered drawing is on. The default is for drawing to be two phase.</p>
+
+    <p><b id="SCI_SETCODEPAGE">SCI_SETCODEPAGE(int codePage)</b><br />
+     <b id="SCI_GETCODEPAGE">SCI_GETCODEPAGE</b><br />
+     Scintilla has some support for Japanese, Chinese and Korean DBCS. Use this message with
+    <code>codePage</code> set to the code page number to set Scintilla to use code page information
+    to ensure double byte characters are treated as one character rather than two. This also stops
+    the caret from moving between the two bytes in a double byte character.
+    Do not use this message to choose between different single byte character sets: it doesn't do that.
+    Call with
+    <code>codePage</code> set to zero to disable DBCS support. The default is
+    <code>SCI_SETCODEPAGE(0)</code>.</p>
+
+    <p>Code page <code>SC_CP_UTF8</code> (65001) sets Scintilla into Unicode mode with the document
+    treated as a sequence of characters expressed in UTF-8. The text is converted to the platform's
+    normal Unicode encoding before being drawn by the OS and thus can display Hebrew, Arabic,
+    Cyrillic, and Han characters. Languages which can use two characters stacked vertically in one
+    horizontal space, such as Thai, will mostly work but there are some issues where the characters
+    are drawn separately leading to visual glitches. Bi-directional text is not supported. Characters outside the
+    Basic Multilingual Plane are unlikely to work.</p>
+
+    <p>On Windows, code page can be set to 932 (Japanese Shift-JIS), 936 (Simplified Chinese GBK),
+    949 (Korean Unified Hangul Code), 950 (Traditional Chinese Big5), or 1361 (Korean Johab)
+    although these may require installation of language specific support.</p>
+
+    <p>On GTK+, code page <code>SC_CP_DBCS</code> (1) sets Scintilla into
+    multi byte character mode as is required for Japanese language processing with
+    the EUC encoding.</p>
+
+    <p>For GTK+ 1.x, the locale should be set to a Unicode locale with a call similar to
+    <code>setlocale(LC_CTYPE, "en_US.UTF-8")</code>. Fonts with an <code>"iso10646"</code> registry
+    should be used in a font set. Font sets are a comma separated list of partial font
+    specifications where each partial font specification can be in the form:
+    <code>foundry-fontface-charsetregistry-encoding</code> or
+    <code>fontface-charsetregistry-encoding</code> or <code>foundry-fontface</code> or
+    <code>fontface</code>. An example is <code>"misc-fixed-iso10646-1,*"</code>.
+    On GTK+ 2.x, Pango fonts should be used rather than font sets.</p>
+
+    <p>Setting <code>codePage</code> to a non-zero value that is not <code>SC_CP_UTF8</code> is
+    operating system dependent.</p>
+
+    <p><b id="SCI_SETKEYSUNICODE">SCI_SETKEYSUNICODE(bool keysUnicode)</b><br />
+     <b id="SCI_GETKEYSUNICODE">SCI_GETKEYSUNICODE</b><br />
+     On Windows, character keys are normally handled differently depending on whether Scintilla is a wide
+     or narrow character window with character messages treated as Unicode when wide and as 8 bit otherwise.
+     Set this property to always treat as Unicode. This option is needed for Delphi.</p>
+
+    <p><b id="SCI_SETWORDCHARS">SCI_SETWORDCHARS(&lt;unused&gt;, const char *chars)</b><br />
+     Scintilla has several functions that operate on words, which are defined to be contiguous
+    sequences of characters from a particular set of characters. This message defines which
+    characters are members of that set. The character sets are set to default values before processing this
+    function.
+    For example, if you don't allow '_' in your set of characters
+    use:<br />
+     <code>SCI_SETWORDCHARS(0, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789")</code>;</p>
+
+    <p><b id="SCI_SETWHITESPACECHARS">SCI_SETWHITESPACECHARS(&lt;unused&gt;, const char *chars)</b><br />
+     Similar to <code>SCI_SETWORDCHARS</code>, this message allows the user to define which chars Scintilla considers
+          as whitespace.  Setting the whitespace chars allows the user to fine-tune Scintilla's behaviour doing
+          such things as moving the cursor to the start or end of a word; for example, by defining punctuation chars
+          as whitespace, they will be skipped over when the user presses ctrl+left or ctrl+right.
+          This function should be called after <code>SCI_SETWORDCHARS</code> as it will
+          reset the whitespace characters to the default set.</p>
+    <p><b id="SCI_SETCHARSDEFAULT">SCI_SETCHARSDEFAULT</b><br />
+     Use the default sets of word and whitespace characters. This sets whitespace to space, tab and other
+     characters with codes less than 0x20, with word characters set to alphanumeric and '_'.
+    </p>
+
+
+    <p><b id="SCI_GRABFOCUS">SCI_GRABFOCUS</b><br />
+     <b id="SCI_SETFOCUS">SCI_SETFOCUS(bool focus)</b><br />
+     <b id="SCI_GETFOCUS">SCI_GETFOCUS</b><br />
+     Scintilla can be told to grab the focus with this message. This is needed more on GTK+ where
+           focus handling is more complicated than on Windows.</p>
+
+    <p>The internal focus flag can be set with <code>SCI_SETFOCUS</code>. This is used by clients
+    that have complex focus requirements such as having their own window that gets the real focus
+    but with the need to indicate that Scintilla has the logical focus.</p>
+
+    <h2 id="BraceHighlighting">Brace highlighting</h2>
+    <code><a class="message" href="#SCI_BRACEHIGHLIGHT">SCI_BRACEHIGHLIGHT(int pos1, int
+    pos2)</a><br />
+     <a class="message" href="#SCI_BRACEBADLIGHT">SCI_BRACEBADLIGHT(int pos1)</a><br />
+     <a class="message" href="#SCI_BRACEMATCH">SCI_BRACEMATCH(int position, int
+    maxReStyle)</a><br />
+    </code>
+
+    <p><b id="SCI_BRACEHIGHLIGHT">SCI_BRACEHIGHLIGHT(int pos1, int pos2)</b><br />
+     Up to two characters can be highlighted in a 'brace highlighting style', which is defined as
+    style number <a class="message" href="#StyleDefinition"><code>STYLE_BRACELIGHT</code></a> (34).
+    If you have enabled indent guides, you may also wish to highlight the indent that corresponds
+    with the brace. You can locate the column with <a class="message"
+    href="#SCI_GETCOLUMN"><code>SCI_GETCOLUMN</code></a> and highlight the indent with <a
+    class="message" href="#SCI_SETHIGHLIGHTGUIDE"><code>SCI_SETHIGHLIGHTGUIDE</code></a>.</p>
+
+    <p><b id="SCI_BRACEBADLIGHT">SCI_BRACEBADLIGHT(int pos1)</b><br />
+     If there is no matching brace then the <a class="jump" href="#StyleDefinition">brace
+    badlighting style</a>, style <code>BRACE_BADLIGHT</code> (35), can be used to show the brace
+    that is unmatched. Using a position of <code>INVALID_POSITION</code> (-1) removes the
+    highlight.</p>
+
+    <p><b id="SCI_BRACEMATCH">SCI_BRACEMATCH(int pos, int maxReStyle)</b><br />
+     The <code>SCI_BRACEMATCH</code> message finds a corresponding matching brace given
+    <code>pos</code>, the position of one brace. The brace characters handled are '(', ')', '[',
+    ']', '{', '}', '&lt;', and '&gt;'. The search is forwards from an opening brace and backwards
+    from a closing brace. If the character at position is not a brace character, or a matching
+    brace cannot be found, the return value is -1. Otherwise, the return value is the position of
+    the matching brace.</p>
+
+    <p>A match only occurs if the style of the matching brace is the same as the starting brace or
+    the matching brace is beyond the end of styling. Nested braces are handled correctly. The
+    <code>maxReStyle</code> parameter must currently be 0 - it may be used in the future to limit
+    the length of brace searches.</p>
+
+    <h2 id="TabsAndIndentationGuides">Tabs and Indentation Guides</h2>
+
+    <p>Indentation (the white space at the start of a line) is often used by programmers to clarify
+    program structure and in some languages, for example Python, it may be part of the language
+    syntax. Tabs are normally used in editors to insert a tab character or to pad text with spaces
+    up to the next tab.</p>
+
+    <p>Scintilla can be set to treat tab and backspace in the white space at the start of a line in
+    a special way: inserting a tab indents the line to the next indent position rather than just
+    inserting a tab at the current character position and backspace unindents the line rather than
+    deleting a character. Scintilla can also display indentation guides (vertical lines) to help
+    you to generate code.</p>
+    <code><a class="message" href="#SCI_SETTABWIDTH">SCI_SETTABWIDTH(int widthInChars)</a><br />
+     <a class="message" href="#SCI_GETTABWIDTH">SCI_GETTABWIDTH</a><br />
+     <a class="message" href="#SCI_SETUSETABS">SCI_SETUSETABS(bool useTabs)</a><br />
+     <a class="message" href="#SCI_GETUSETABS">SCI_GETUSETABS</a><br />
+     <a class="message" href="#SCI_SETINDENT">SCI_SETINDENT(int widthInChars)</a><br />
+     <a class="message" href="#SCI_GETINDENT">SCI_GETINDENT</a><br />
+     <a class="message" href="#SCI_SETTABINDENTS">SCI_SETTABINDENTS(bool tabIndents)</a><br />
+     <a class="message" href="#SCI_GETTABINDENTS">SCI_GETTABINDENTS</a><br />
+     <a class="message" href="#SCI_SETBACKSPACEUNINDENTS">SCI_SETBACKSPACEUNINDENTS(bool
+    bsUnIndents)</a><br />
+     <a class="message" href="#SCI_GETBACKSPACEUNINDENTS">SCI_GETBACKSPACEUNINDENTS</a><br />
+     <a class="message" href="#SCI_SETLINEINDENTATION">SCI_SETLINEINDENTATION(int line, int
+    indentation)</a><br />
+     <a class="message" href="#SCI_GETLINEINDENTATION">SCI_GETLINEINDENTATION(int line)</a><br />
+     <a class="message" href="#SCI_GETLINEINDENTPOSITION">SCI_GETLINEINDENTPOSITION(int
+    line)</a><br />
+     <a class="message" href="#SCI_SETINDENTATIONGUIDES">SCI_SETINDENTATIONGUIDES(bool
+    view)</a><br />
+     <a class="message" href="#SCI_GETINDENTATIONGUIDES">SCI_GETINDENTATIONGUIDES</a><br />
+     <a class="message" href="#SCI_SETHIGHLIGHTGUIDE">SCI_SETHIGHLIGHTGUIDE(int column)</a><br />
+     <a class="message" href="#SCI_GETHIGHLIGHTGUIDE">SCI_GETHIGHLIGHTGUIDE</a><br />
+    </code>
+
+    <p><b id="SCI_SETTABWIDTH">SCI_SETTABWIDTH(int widthInChars)</b><br />
+     <b id="SCI_GETTABWIDTH">SCI_GETTABWIDTH</b><br />
+     <code>SCI_SETTABWIDTH</code> sets the size of a tab as a multiple of the size of a space
+    character in <code>STYLE_DEFAULT</code>. The default tab width is 8 characters. There are no
+    limits on tab sizes, but values less than 1 or large values may have undesirable effects.</p>
+
+    <p><b id="SCI_SETUSETABS">SCI_SETUSETABS(bool useTabs)</b><br />
+     <b id="SCI_GETUSETABS">SCI_GETUSETABS</b><br />
+     <code>SCI_SETUSETABS</code> determines whether indentation should be created out of a mixture
+    of tabs and spaces or be based purely on spaces. Set <code>useTabs</code> to <code>false</code>
+    (0) to create all tabs and indents out of spaces. The default is <code>true</code>. You can use
+    <a class="message" href="#SCI_GETCOLUMN"><code>SCI_GETCOLUMN</code></a> to get the column of a
+    position taking the width of a tab into account.</p>
+    <p><b id="SCI_SETINDENT">SCI_SETINDENT(int widthInChars)</b><br />
+     <b id="SCI_GETINDENT">SCI_GETINDENT</b><br />
+     <code>SCI_SETINDENT</code> sets the size of indentation in terms of the width of a space in <a
+    class="message" href="#StyleDefinition"><code>STYLE_DEFAULT</code></a>. If you set a width of
+    0, the indent size is the same as the tab size. There are no limits on indent sizes, but values
+    less than 0 or large values may have undesirable effects.
+    </p>
+
+    <p><b id="SCI_SETTABINDENTS">SCI_SETTABINDENTS(bool tabIndents)</b><br />
+     <b id="SCI_GETTABINDENTS">SCI_GETTABINDENTS</b><br />
+     <b id="SCI_SETBACKSPACEUNINDENTS">SCI_SETBACKSPACEUNINDENTS(bool bsUnIndents)</b><br />
+     <b id="SCI_GETBACKSPACEUNINDENTS">SCI_GETBACKSPACEUNINDENTS</b><br />
+    </p>
+
+    <p>Inside indentation white space, the tab and backspace keys can be made to indent and
+    unindent rather than insert a tab character or delete a character with the
+    <code>SCI_SETTABINDENTS</code> and <code>SCI_SETBACKSPACEUNINDENTS</code> functions.</p>
+
+    <p><b id="SCI_SETLINEINDENTATION">SCI_SETLINEINDENTATION(int line, int indentation)</b><br />
+     <b id="SCI_GETLINEINDENTATION">SCI_GETLINEINDENTATION(int line)</b><br />
+     The amount of indentation on a line can be discovered and set with
+    <code>SCI_GETLINEINDENTATION</code> and <code>SCI_SETLINEINDENTATION</code>. The indentation is
+    measured in character columns, which correspond to the width of space characters.</p>
+
+    <p><b id="SCI_GETLINEINDENTPOSITION">SCI_GETLINEINDENTPOSITION(int line)</b><br />
+     This returns the position at the end of indentation of a line.</p>
+
+    <p><b id="SCI_SETINDENTATIONGUIDES">SCI_SETINDENTATIONGUIDES(int indentView)</b><br />
+     <b id="SCI_GETINDENTATIONGUIDES">SCI_GETINDENTATIONGUIDES</b><br />
+     Indentation guides are dotted vertical lines that appear within indentation white space every
+    indent size columns. They make it easy to see which constructs line up especially when they
+    extend over multiple pages. Style <a class="message"
+    href="#StyleDefinition"><code>STYLE_INDENTGUIDE</code></a> (37) is used to specify the
+    foreground and background colour of the indentation guides.</p>
+
+    <p>There are 4 indentation guide views.
+    SC_IV_NONE turns the feature off but the other 3 states determine how far the guides appear on
+    empty lines.
+    <table border="0" summary="Search flags">
+      <tbody>
+        <tr>
+          <td><code>SC_IV_NONE</code></td>
+          <td>No indentation guides are shown.</td>
+        </tr>
+
+        <tr>
+          <td><code>SC_IV_REAL</code></td>
+          <td>Indentation guides are shown inside real indentation white space.</td>
+        </tr>
+
+        <tr>
+          <td><code>SC_IV_LOOKFORWARD</code></td>
+          <td>Indentation guides are shown beyond the actual indentation up to the level of the
+          next non-empty line.
+          If the previous non-empty line was a fold header then indentation guides are shown for
+          one more level of indent than that line. This setting is good for Python.</td>
+        </tr>
+
+        <tr>
+          <td><code>SC_IV_LOOKBOTH</code></td>
+          <td>Indentation guides are shown beyond the actual indentation up to the level of the
+          next non-empty line or previous non-empty line whichever is the greater.
+          This setting is good for most languages.</td>
+        </tr>
+
+    </table>
+    </p>
+
+    <p><b id="SCI_SETHIGHLIGHTGUIDE">SCI_SETHIGHLIGHTGUIDE(int column)</b><br />
+     <b id="SCI_GETHIGHLIGHTGUIDE">SCI_GETHIGHLIGHTGUIDE</b><br />
+     When brace highlighting occurs, the indentation guide corresponding to the braces may be
+    highlighted with the brace highlighting style, <a class="message"
+    href="#StyleDefinition"><code>STYLE_BRACELIGHT</code></a> (34). Set <code>column</code> to 0 to
+    cancel this highlight.</p>
+
+    <h2 id="Markers">Markers</h2>
+
+    <p>There are 32 markers, numbered 0 to 31, and you can assign any combination of them to each
+    line in the document. Markers appear in the <a class="jump" href="#Margins">selection
+    margin</a> to the left of the text. If the selection margin is set to zero width, the
+    background colour of the whole line is changed instead. Marker numbers 25 to 31 are used by
+    Scintilla in folding margins, and have symbolic names of the form <code>SC_MARKNUM_</code>*,
+    for example <code>SC_MARKNUM_FOLDEROPEN</code>.</p>
+
+    <p>Marker numbers 0 to 24 have no pre-defined function; you can use them to mark syntax errors
+    or the current point of execution, break points, or whatever you need marking. If you do not
+    need folding, you can use all 32 for any purpose you wish.</p>
+
+    <p>Each marker number has a symbol associated with it. You can also set the foreground and
+    background colour for each marker number, so you can use the same symbol more than once with
+    different colouring for different uses. Scintilla has a set of symbols you can assign
+    (<code>SC_MARK_</code>*) or you can use characters. By default, all 32 markers are set to
+    <code>SC_MARK_CIRCLE</code> with a black foreground and a white background.</p>
+
+    <p>The markers are drawn in the order of their numbers, so higher numbered markers appear on
+    top of lower numbered ones. Markers try to move with their text by tracking where the start of
+    their line moves. When a line is deleted, its markers are combined, by an <code>OR</code>
+    operation, with the markers of the previous line.</p>
+    <code><a class="message" href="#SCI_MARKERDEFINE">SCI_MARKERDEFINE(int markerNumber, int
+    markerSymbols)</a><br />
+     <a class="message" href="#SCI_MARKERDEFINEPIXMAP">SCI_MARKERDEFINEPIXMAP(int markerNumber,
+    const char *xpm)</a><br />
+     <a class="message" href="#SCI_MARKERSETFORE">SCI_MARKERSETFORE(int markerNumber, int
+    colour)</a><br />
+     <a class="message" href="#SCI_MARKERSETBACK">SCI_MARKERSETBACK(int markerNumber, int
+    colour)</a><br />
+     <a class="message" href="#SCI_MARKERSETALPHA">SCI_MARKERSETALPHA(int markerNumber, int
+    alpha)</a><br />
+     <a class="message" href="#SCI_MARKERADD">SCI_MARKERADD(int line, int markerNumber)</a><br />
+     <a class="message" href="#SCI_MARKERADDSET">SCI_MARKERADDSET(int line, int markerMask)</a><br />
+     <a class="message" href="#SCI_MARKERDELETE">SCI_MARKERDELETE(int line, int
+    markerNumber)</a><br />
+     <a class="message" href="#SCI_MARKERDELETEALL">SCI_MARKERDELETEALL(int markerNumber)</a><br />
+     <a class="message" href="#SCI_MARKERGET">SCI_MARKERGET(int line)</a><br />
+     <a class="message" href="#SCI_MARKERNEXT">SCI_MARKERNEXT(int lineStart, int
+    markerMask)</a><br />
+     <a class="message" href="#SCI_MARKERPREVIOUS">SCI_MARKERPREVIOUS(int lineStart, int
+    markerMask)</a><br />
+     <a class="message" href="#SCI_MARKERLINEFROMHANDLE">SCI_MARKERLINEFROMHANDLE(int
+    handle)</a><br />
+     <a class="message" href="#SCI_MARKERDELETEHANDLE">SCI_MARKERDELETEHANDLE(int handle)</a><br />
+    </code>
+
+    <p><b id="SCI_MARKERDEFINE">SCI_MARKERDEFINE(int markerNumber, int markerSymbols)</b><br />
+     This message associates a marker number in the range 0 to 31 with one of the marker symbols or
+    an ASCII character. The general-purpose marker symbols currently available are:<br />
+     <code>SC_MARK_CIRCLE</code>, <code>SC_MARK_ROUNDRECT</code>, <code>SC_MARK_ARROW</code>,
+    <code>SC_MARK_SMALLRECT</code>, <code>SC_MARK_SHORTARROW</code>, <code>SC_MARK_EMPTY</code>,
+    <code>SC_MARK_ARROWDOWN</code>, <code>SC_MARK_MINUS</code>, <code>SC_MARK_PLUS</code>,
+    <code>SC_MARK_ARROWS</code>, <code>SC_MARK_DOTDOTDOT</code>, <code>SC_MARK_EMPTY</code>,
+    <code>SC_MARK_BACKGROUND</code>, <code>SC_MARK_LEFTRECT</code>
+    and <code>SC_MARK_FULLRECT</code>.</p>
+
+    <p>The <code>SC_MARK_BACKGROUND</code> marker changes the background colour of the line only.
+          The <code>SC_MARK_FULLRECT</code> symbol mirrors this, changing only the margin background colour.
+    The <code>SC_MARK_EMPTY</code> symbol is invisible, allowing client code to track the movement
+    of lines. You would also use it if you changed the folding style and wanted one or more of the
+    <code>SC_FOLDERNUM_</code>* markers to have no associated symbol.</p>
+
+    <p>There are also marker symbols designed for use in the folding margin in a flattened tree
+    style.<br />
+     <code>SC_MARK_BOXMINUS</code>, <code>SC_MARK_BOXMINUSCONNECTED</code>,
+    <code>SC_MARK_BOXPLUS</code>, <code>SC_MARK_BOXPLUSCONNECTED</code>,
+    <code>SC_MARK_CIRCLEMINUS</code>, <code>SC_MARK_CIRCLEMINUSCONNECTED</code>,
+    <code>SC_MARK_CIRCLEPLUS</code>, <code>SC_MARK_CIRCLEPLUSCONNECTED</code>,
+    <code>SC_MARK_LCORNER</code>, <code>SC_MARK_LCORNERCURVE</code>, <code>SC_MARK_TCORNER</code>,
+    <code>SC_MARK_TCORNERCURVE</code>, and <code>SC_MARK_VLINE</code>.</p>
+     Characters can be used as markers by adding the ASCII value of the character to
+    <code>SC_MARK_CHARACTER</code> (10000). For example, to use 'A' (ASCII code 65) as marker
+    number 1 use:<br />
+     <code>SCI_MARKERDEFINE(1, SC_MARK_CHARACTER+65)</code>. <br />
+
+    <p>The marker numbers <code>SC_MARKNUM_FOLDER</code> and <code>SC_MARKNUM_FOLDEROPEN</code> are
+    used for showing that a fold is present and open or closed. Any symbols may be assigned for
+    this purpose although the (<code>SC_MARK_PLUS</code>, <code>SC_MARK_MINUS</code>) pair or the
+    (<code>SC_MARK_ARROW</code>, <code>SC_MARK_ARROWDOWN</code>) pair are good choices. As well as
+    these two, more assignments are needed for the flattened tree style:
+    <code>SC_MARKNUM_FOLDEREND</code>, <code>SC_MARKNUM_FOLDERMIDTAIL</code>,
+    <code>SC_MARKNUM_FOLDEROPENMID</code>, <code>SC_MARKNUM_FOLDERSUB</code>, and
+    <code>SC_MARKNUM_FOLDERTAIL</code>. The bits used for folding are specified by
+    <code>SC_MASK_FOLDERS</code>, which is commonly used as an argument to
+    <code>SCI_SETMARGINMASKN</code> when defining a margin to be used for folding.</p>
+
+    <p>This table shows which <code>SC_MARK_</code>* symbols should be assigned to which
+    <code>SC_MARKNUM_</code>* marker numbers to obtain four folding styles: Arrow (mimics
+    Macintosh), plus/minus shows folded lines as '+' and opened folds as '-', Circle tree, Box
+    tree.</p>
+
+    <table cellpadding="1" cellspacing="2" border="0" summary="Markers used for folding">
+      <thead align="left">
+        <tr>
+          <th><code>SC_MARKNUM_</code>*</th>
+
+          <th>Arrow</th>
+
+          <th>Plus/minus</th>
+
+          <th>Circle tree</th>
+
+          <th>Box tree</th>
+        </tr>
+      </thead>
+
+      <tbody valign="top">
+        <tr>
+          <th align="left"><code>FOLDEROPEN</code></th>
+
+          <td><code>ARROWDOWN</code></td>
+
+          <td><code>MINUS</code></td>
+
+          <td><code>CIRCLEMINUS</code></td>
+
+          <td><code>BOXMINUS</code></td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>FOLDER</code></th>
+
+          <td><code>ARROW</code></td>
+
+          <td><code>PLUS</code></td>
+
+          <td><code>CIRCLEPLUS</code></td>
+
+          <td><code>BOXPLUS</code></td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>FOLDERSUB</code></th>
+
+          <td><code>EMPTY</code></td>
+
+          <td><code>EMPTY</code></td>
+
+          <td><code>VLINE</code></td>
+
+          <td><code>VLINE</code></td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>FOLDERTAIL</code></th>
+
+          <td><code>EMPTY</code></td>
+
+          <td><code>EMPTY</code></td>
+
+          <td><code>LCORNERCURVE</code></td>
+
+          <td><code>LCORNER</code></td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>FOLDEREND</code></th>
+
+          <td><code>EMPTY</code></td>
+
+          <td><code>EMPTY</code></td>
+
+          <td><code>CIRCLEPLUSCONNECTED</code></td>
+
+          <td><code>BOXPLUSCONNECTED</code></td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>FOLDEROPENMID</code></th>
+
+          <td><code>EMPTY</code></td>
+
+          <td><code>EMPTY</code></td>
+
+          <td><code>CIRCLEMINUSCONNECTED</code></td>
+
+          <td><code>BOXMINUSCONNECTED</code></td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>FOLDERMIDTAIL</code></th>
+
+          <td><code>EMPTY</code></td>
+
+          <td><code>EMPTY</code></td>
+
+          <td><code>TCORNERCURVE</code></td>
+
+          <td><code>TCORNER</code></td>
+        </tr>
+      </tbody>
+    </table>
+
+    <p><b id="SCI_MARKERDEFINEPIXMAP">SCI_MARKERDEFINEPIXMAP(int markerNumber, const char
+    *xpm)</b><br />
+     Markers can be set to pixmaps with this message. The XPM format is used for the pixmap and it
+    is limited to pixmaps that use one character per pixel with no named colours.
+    The transparent colour may be named 'None'.
+    The data should be null terminated.
+    Pixmaps use the <code>SC_MARK_PIXMAP</code> marker symbol. You can find the full description of
+    the XPM format <a class="jump" href="http://koala.ilog.fr/lehors/xpm.html">here</a>.</p>
+
+    <p><b id="SCI_MARKERSETFORE">SCI_MARKERSETFORE(int markerNumber, int <a class="jump"
+    href="#colour">colour</a>)</b><br />
+     <b id="SCI_MARKERSETBACK">SCI_MARKERSETBACK(int markerNumber, int <a class="jump"
+    href="#colour">colour</a>)</b><br />
+     These two messages set the foreground and background colour of a marker number.</p>
+     <p><b id="SCI_MARKERSETALPHA">SCI_MARKERSETALPHA(int markerNumber, int <a class="jump"
+    href="#alpha">alpha</a>)</b><br />
+     When markers are drawn in the content area, either because there is no margin for them or
+     they are of SC_MARK_BACKGROUND type, they may be drawn translucently by
+     setting an alpha value.</p>
+
+    <p><b id="SCI_MARKERADD">SCI_MARKERADD(int line, int markerNumber)</b><br />
+     This message adds marker number <code>markerNumber</code> to a line. The message returns -1 if
+    this fails (illegal line number, out of memory) or it returns a marker handle number that
+    identifies the added marker. You can use this returned handle with <a class="message"
+    href="#SCI_MARKERLINEFROMHANDLE"><code>SCI_MARKERLINEFROMHANDLE</code></a> to find where a
+    marker is after moving or combining lines and with <a class="message"
+    href="#SCI_MARKERDELETEHANDLE"><code>SCI_MARKERDELETEHANDLE</code></a> to delete the marker
+    based on its handle. The message does not check the value of markerNumber, nor does it
+    check if the line already contains the marker.</p>
+
+    <p><b id="SCI_MARKERADDSET">SCI_MARKERADDSET(int line, int markerMask)</b><br />
+     This message can add one or more markers to a line with a single call, specified in the same "one-bit-per-marker" 32-bit integer format returned by
+    <a class="message" href="#SCI_MARKERGET"><code>SCI_MARKERGET</code></a>
+    (and used by the mask-based marker search functions
+    <a class="message" href="#SCI_MARKERNEXT"><code>SCI_MARKERNEXT</code></a> and
+    <a class="message" href="#SCI_MARKERPREVIOUS"><code>SCI_MARKERPREVIOUS</code></a>).
+    As with
+    <a class="message" href="#SCI_MARKERADD"><code>SCI_MARKERADD</code></a>, no check is made
+    to see if any of the markers are already present on the targeted line.</p>
+
+    <p><b id="SCI_MARKERDELETE">SCI_MARKERDELETE(int line, int markerNumber)</b><br />
+     This searches the given line number for the given marker number and deletes it if it is
+    present. If you added the same marker more than once to the line, this will delete one copy
+    each time it is used. If you pass in a marker number of -1, all markers are deleted from the
+    line.</p>
+
+    <p><b id="SCI_MARKERDELETEALL">SCI_MARKERDELETEALL(int markerNumber)</b><br />
+     This removes markers of the given number from all lines. If markerNumber is -1, it deletes all
+    markers from all lines.</p>
+
+    <p><b id="SCI_MARKERGET">SCI_MARKERGET(int line)</b><br />
+     This returns a 32-bit integer that indicates which markers were present on the line. Bit 0 is
+    set if marker 0 is present, bit 1 for marker 1 and so on.</p>
+
+    <p><b id="SCI_MARKERNEXT">SCI_MARKERNEXT(int lineStart, int markerMask)</b><br />
+     <b id="SCI_MARKERPREVIOUS">SCI_MARKERPREVIOUS(int lineStart, int markerMask)</b><br />
+     These messages search efficiently for lines that include a given set of markers. The search
+    starts at line number <code>lineStart</code> and continues forwards to the end of the file
+    (<code>SCI_MARKERNEXT</code>) or backwards to the start of the file
+    (<code>SCI_MARKERPREVIOUS</code>). The <code>markerMask</code> argument should have one bit set
+    for each marker you wish to find. Set bit 0 to find marker 0, bit 1 for marker 1 and so on. The
+    message returns the line number of the first line that contains one of the markers in
+    <code>markerMask</code> or -1 if no marker is found.</p>
+
+    <p><b id="SCI_MARKERLINEFROMHANDLE">SCI_MARKERLINEFROMHANDLE(int markerHandle)</b><br />
+     The <code>markerHandle</code> argument is an identifier for a marker returned by <a
+    class="message" href="#SCI_MARKERADD"><code>SCI_MARKERADD</code></a>. This function searches
+    the document for the marker with this handle and returns the line number that contains it or -1
+    if it is not found.</p>
+
+    <p><b id="SCI_MARKERDELETEHANDLE">SCI_MARKERDELETEHANDLE(int markerHandle)</b><br />
+     The <code>markerHandle</code> argument is an identifier for a marker returned by <a
+    class="message" href="#SCI_MARKERADD"><code>SCI_MARKERADD</code></a>. This function searches
+    the document for the marker with this handle and deletes the marker if it is found.</p>
+
+    <h2 id="Indicators">Indicators</h2>
+
+    <p>Indicators are used to display additional information over the top of styling.
+    They can be used to show, for example, syntax errors, deprecated names and bad indentation
+    by drawing underlines under text or boxes around text. Originally, Scintilla stored indicator information in
+    the style bytes but this has proved limiting, so now up to 32 separately stored indicators may be used.
+    While style byte indicators currently still work, they will soon be removed so all the bits in each style
+    byte can be used for lexical states.</p>
+
+    <p>Indicators may be displayed as simple underlines, squiggly underlines, a
+    line of small 'T' shapes, a line of diagonal hatching, a strike-out or a rectangle around the text.</p>
+
+    <p>The <code>SCI_INDIC*</code> messages allow you to get and set the visual appearance of the
+    indicators. They all use an <code>indicatorNumber</code> argument in the range 0 to INDIC_MAX(31)
+    to set the indicator to style. To prevent interference the set of indicators is divided up into a range for use
+    by lexers (0..7) and a range for use by containers
+    (8=<code>INDIC_CONTAINER</code> .. 31=<code>INDIC_MAX</code>).</p>
+
+    <code><a class="message" href="#SCI_INDICSETSTYLE">SCI_INDICSETSTYLE(int indicatorNumber, int
+    indicatorStyle)</a><br />
+     <a class="message" href="#SCI_INDICGETSTYLE">SCI_INDICGETSTYLE(int indicatorNumber)</a><br />
+     <a class="message" href="#SCI_INDICSETFORE">SCI_INDICSETFORE(int indicatorNumber, int
+    colour)</a><br />
+     <a class="message" href="#SCI_INDICGETFORE">SCI_INDICGETFORE(int indicatorNumber)</a><br />
+    </code>
+
+    <p><b id="SCI_INDICSETSTYLE">SCI_INDICSETSTYLE(int indicatorNumber, int
+    indicatorStyle)</b><br />
+     <b id="SCI_INDICGETSTYLE">SCI_INDICGETSTYLE(int indicatorNumber)</b><br />
+     These two messages set and get the style for a particular indicator. The indicator styles
+    currently available are:</p>
+
+    <table cellpadding="1" cellspacing="2" border="0" summary="Indicators">
+      <tbody>
+        <tr>
+          <th align="left">Symbol</th>
+
+          <th>Value</th>
+
+          <th align="left">Visual effect</th>
+        </tr>
+      </tbody>
+
+      <tbody valign="top">
+        <tr>
+          <td align="left"><code>INDIC_PLAIN</code></td>
+
+          <td align="center">0</td>
+
+          <td>Underlined with a single, straight line.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>INDIC_SQUIGGLE</code></td>
+
+          <td align="center">1</td>
+
+          <td>A squiggly underline.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>INDIC_TT</code></td>
+
+          <td align="center">2</td>
+
+          <td>A line of small T shapes.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>INDIC_DIAGONAL</code></td>
+
+          <td align="center">3</td>
+
+          <td>Diagonal hatching.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>INDIC_STRIKE</code></td>
+
+          <td align="center">4</td>
+
+          <td>Strike out.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>INDIC_HIDDEN</code></td>
+
+          <td align="center">5</td>
+
+          <td>An indicator with no visual effect.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>INDIC_BOX</code></td>
+
+          <td align="center">6</td>
+
+          <td>A rectangle around the text.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>INDIC_ROUNDBOX</code></td>
+
+          <td align="center">7</td>
+
+          <td>A rectangle with rounded corners around the text using translucent drawing with the
+                         interior more transparent than the border.</td>
+        </tr>
+      </tbody>
+    </table>
+
+    <p>The default indicator styles are equivalent to:<br />
+     <code>SCI_INDICSETSTYLE(0, INDIC_SQUIGGLE);</code><br />
+     <code>SCI_INDICSETSTYLE(1, INDIC_TT);</code><br />
+     <code>SCI_INDICSETSTYLE(2, INDIC_PLAIN);</code></p>
+
+    <p><b id="SCI_INDICSETFORE">SCI_INDICSETFORE(int indicatorNumber, int <a class="jump"
+    href="#colour">colour</a>)</b><br />
+     <b id="SCI_INDICGETFORE">SCI_INDICGETFORE(int indicatorNumber)</b><br />
+     These two messages set and get the colour used to draw an indicator. The default indicator
+    colours are equivalent to:<br />
+     <code>SCI_INDICSETFORE(0, 0x007f00);</code> (dark green)<br />
+     <code>SCI_INDICSETFORE(1, 0xff0000);</code> (light blue)<br />
+     <code>SCI_INDICSETFORE(2, 0x0000ff);</code> (light red)</p>
+
+    <p><b id="SCI_INDICSETUNDER">SCI_INDICSETUNDER(int indicatorNumber, bool under)</b><br />
+     <b id="SCI_INDICGETUNDER">SCI_INDICGETUNDER(int indicatorNumber)</b><br />
+     These two messages set and get whether an indicator is drawn under text or over(default).
+     Drawing under text works only for modern indicators when <a class="message" href="#SCI_SETTWOPHASEDRAW">two phase drawing</a>
+     is enabled.</p>
+
+    <h3 id="Modern Indicators">Modern Indicators</h3>
+
+    <p>Modern indicators are stored in a format similar to run length encoding which is efficient in both
+    speed and storage for sparse information.</p>
+    <p>An indicator may store different values for each range but currently all values are drawn the same.
+    In the future, it may be possible to draw different values in different styles.</p>
+    <p>
+    <b id="SCI_SETINDICATORCURRENT">SCI_SETINDICATORCURRENT(int indicator)</b><br />
+    <b id="SCI_GETINDICATORCURRENT">SCI_GETINDICATORCURRENT</b><br />
+    These two messages set and get the indicator that will be affected by calls to
+    <a class="message" href="#SCI_INDICATORFILLRANGE">SCI_INDICATORFILLRANGE</a> and
+    <a class="message" href="#SCI_INDICATORCLEARRANGE">SCI_INDICATORCLEARRANGE</a>.
+    </p>
+
+    <p>
+    <b id="SCI_SETINDICATORVALUE">SCI_SETINDICATORVALUE(int value)</b><br />
+    <b id="SCI_GETINDICATORVALUE">SCI_GETINDICATORVALUE</b><br />
+    These two messages set and get the value that will be set by calls to
+    <a class="message" href="#SCI_INDICATORFILLRANGE">SCI_INDICATORFILLRANGE</a>.
+    </p>
+
+    <p>
+    <b id="SCI_INDICATORFILLRANGE">SCI_INDICATORFILLRANGE(int position, int fillLength)</b><br />
+    <b id="SCI_INDICATORCLEARRANGE">SCI_INDICATORCLEARRANGE(int position, int clearLength)</b><br />
+    These two messages fill or clear a range for the current indicator.
+    <code>SCI_INDICATORFILLRANGE</code> fills with the
+    the current value.
+    </p>
+
+    <p>
+    <b id="SCI_INDICATORALLONFOR">SCI_INDICATORALLONFOR(int position)</b><br />
+    Retrieve a bitmap value representing which indicators are non-zero at a position.
+    </p>
+
+    <p>
+    <b id="SCI_INDICATORVALUEAT">SCI_INDICATORVALUEAT(int indicator, int position)</b><br />
+    Retrieve the value of a particular indicator at a position.
+    </p>
+
+    <p>
+    <b id="SCI_INDICATORSTART">SCI_INDICATORSTART(int indicator, int position)</b><br />
+    <b id="SCI_INDICATOREND">SCI_INDICATOREND(int indicator, int position)</b><br />
+    Find the start or end of a range with one value from a position within the range.
+    Can be used to iterate through the document to discover all the indicator positions.
+    </p>
+
+    <h3 id="Style Byte Indicators">Style Byte Indicators (deprecated)</h3>
+    <p>By default, Scintilla organizes the style byte associated with each text byte as 5 bits of
+    style information (for 32 styles) and 3 bits of indicator information for 3 independent
+    indicators so that, for example, syntax errors, deprecated names and bad indentation could all
+    be displayed at once.</p>
+
+    <p>The indicators are set using <a class="message"
+    href="#SCI_STARTSTYLING"><code>SCI_STARTSTYLING</code></a> with a <code>INDICS_MASK</code> mask
+    and <a class="message" href="#SCI_SETSTYLING"><code>SCI_SETSTYLING</code></a> with the values
+    <code>INDIC0_MASK</code>, <code>INDIC1_MASK</code> and <code>INDIC2_MASK</code>.</p>
+
+          <p>If you are using indicators in a buffer that has a lexer active
+          (see <a class="message" href="#SCI_SETLEXER"><code>SCI_SETLEXER</code></a>),
+          you must save lexing state information before setting any indicators and restore it afterwards.
+          Use <a class="message" href="#SCI_GETENDSTYLED"><code>SCI_GETENDSTYLED</code></a>
+          to retrieve the current "styled to" position and
+          <a class="message" href="#SCI_STARTSTYLING"><code>SCI_STARTSTYLING</code></a>
+        to reset the styling position and mask (<code>0x1f </code> in the default layout of 5 style bits and 3 indicator bits)
+        when you are done.</p>
+
+    <p>The number of bits used for styles can be altered with <a class="message"
+    href="#SCI_SETSTYLEBITS"><code>SCI_SETSTYLEBITS</code></a> from 0 to 7 bits. The remaining bits
+    can be used for indicators, so there can be from 1 to 8 indicators. However, the
+    <code>INDIC*_MASK</code> constants defined in <code>Scintilla.h</code> all assume 5 bits of
+    styling information and 3 indicators. If you use a different arrangement, you must define your
+    own constants.</p>
+
+
+    <h2 id="Autocompletion">Autocompletion</h2>
+
+    <p>Autocompletion displays a list box showing likely identifiers based upon the user's typing.
+    The user chooses the currently selected item by pressing the tab character or another character
+    that is a member of the fillup character set defined with <code>SCI_AUTOCSETFILLUPS</code>.
+    Autocompletion is triggered by your application. For example, in C if you detect that the user
+    has just typed <code>fred.</code> you could look up <code>fred</code>, and if it has a known
+    list of members, you could offer them in an autocompletion list. Alternatively, you could
+    monitor the user's typing and offer a list of likely items once their typing has narrowed down
+    the choice to a reasonable list. As yet another alternative, you could define a key code to
+    activate the list.</p>
+
+    <p>When the user makes a selection from the list the container is sent a <code><a class="message"
+    href="#SCN_AUTOCSELECTION">SCN_AUTOCSELECTION</a></code> <a class="jump"
+    href="#Notifications">notification message</a>. On return from the notification Scintilla will insert
+     the selected text unless the autocompletion list has been cancelled, for example by the container sending
+     <code><a class="message" href="#SCI_AUTOCCANCEL">SCI_AUTOCCANCEL</a></code>.</p>
+
+    <p>To make use of autocompletion you must monitor each character added to the document. See
+    <code>SciTEBase::CharAdded()</code> in SciTEBase.cxx for an example of autocompletion.</p>
+    <code><a class="message" href="#SCI_AUTOCSHOW">SCI_AUTOCSHOW(int lenEntered, const char
+    *list)</a><br />
+     <a class="message" href="#SCI_AUTOCCANCEL">SCI_AUTOCCANCEL</a><br />
+     <a class="message" href="#SCI_AUTOCACTIVE">SCI_AUTOCACTIVE</a><br />
+     <a class="message" href="#SCI_AUTOCPOSSTART">SCI_AUTOCPOSSTART</a><br />
+     <a class="message" href="#SCI_AUTOCCOMPLETE">SCI_AUTOCCOMPLETE</a><br />
+     <a class="message" href="#SCI_AUTOCSTOPS">SCI_AUTOCSTOPS(&lt;unused&gt;, const char
+    *chars)</a><br />
+     <a class="message" href="#SCI_AUTOCSETSEPARATOR">SCI_AUTOCSETSEPARATOR(char
+    separator)</a><br />
+     <a class="message" href="#SCI_AUTOCGETSEPARATOR">SCI_AUTOCGETSEPARATOR</a><br />
+     <a class="message" href="#SCI_AUTOCSELECT">SCI_AUTOCSELECT(&lt;unused&gt;, const char
+    *select)</a><br />
+     <a class="message" href="#SCI_AUTOCGETCURRENT">SCI_AUTOCGETCURRENT</a><br />
+     <a class="message" href="#SCI_AUTOCSETCANCELATSTART">SCI_AUTOCSETCANCELATSTART(bool
+    cancel)</a><br />
+     <a class="message" href="#SCI_AUTOCGETCANCELATSTART">SCI_AUTOCGETCANCELATSTART</a><br />
+     <a class="message" href="#SCI_AUTOCSETFILLUPS">SCI_AUTOCSETFILLUPS(&lt;unused&gt;, const char
+    *chars)</a><br />
+     <a class="message" href="#SCI_AUTOCSETCHOOSESINGLE">SCI_AUTOCSETCHOOSESINGLE(bool
+    chooseSingle)</a><br />
+     <a class="message" href="#SCI_AUTOCGETCHOOSESINGLE">SCI_AUTOCGETCHOOSESINGLE</a><br />
+     <a class="message" href="#SCI_AUTOCSETIGNORECASE">SCI_AUTOCSETIGNORECASE(bool
+    ignoreCase)</a><br />
+     <a class="message" href="#SCI_AUTOCGETIGNORECASE">SCI_AUTOCGETIGNORECASE</a><br />
+     <a class="message" href="#SCI_AUTOCSETAUTOHIDE">SCI_AUTOCSETAUTOHIDE(bool autoHide)</a><br />
+     <a class="message" href="#SCI_AUTOCGETAUTOHIDE">SCI_AUTOCGETAUTOHIDE</a><br />
+     <a class="message" href="#SCI_AUTOCSETDROPRESTOFWORD">SCI_AUTOCSETDROPRESTOFWORD(bool
+    dropRestOfWord)</a><br />
+     <a class="message" href="#SCI_AUTOCGETDROPRESTOFWORD">SCI_AUTOCGETDROPRESTOFWORD</a><br />
+     <a class="message" href="#SCI_REGISTERIMAGE">SCI_REGISTERIMAGE</a><br />
+     <a class="message" href="#SCI_CLEARREGISTEREDIMAGES">SCI_CLEARREGISTEREDIMAGES</a><br />
+     <a class="message" href="#SCI_AUTOCSETTYPESEPARATOR">SCI_AUTOCSETTYPESEPARATOR(char separatorCharacter)</a><br />
+     <a class="message" href="#SCI_AUTOCGETTYPESEPARATOR">SCI_AUTOCGETTYPESEPARATOR</a><br />
+     <a class="message" href="#SCI_AUTOCSETMAXHEIGHT">SCI_AUTOCSETMAXHEIGHT(int rowCount)</a><br />
+     <a class="message" href="#SCI_AUTOCGETMAXHEIGHT">SCI_AUTOCGETMAXHEIGHT</a><br />
+     <a class="message" href="#SCI_AUTOCSETMAXWIDTH">SCI_AUTOCSETMAXWIDTH(int characterCount)</a><br />
+     <a class="message" href="#SCI_AUTOCGETMAXWIDTH">SCI_AUTOCGETMAXWIDTH</a><br />
+    </code>
+
+    <p><b id="SCI_AUTOCSHOW">SCI_AUTOCSHOW(int lenEntered, const char *list)</b><br />
+     This message causes a list to be displayed. <code>lenEntered</code> is the number of
+    characters of the word already entered and <code>list</code> is the list of words separated by
+    separator characters. The initial separator character is a space but this can be set or got
+    with <a class="message" href="#SCI_AUTOCSETSEPARATOR"><code>SCI_AUTOCSETSEPARATOR</code></a>
+    and <a class="message"
+    href="#SCI_AUTOCGETSEPARATOR"><code>SCI_AUTOCGETSEPARATOR</code></a>.</p>
+
+    <p>The list of words should be in sorted order. If set to ignore case mode with <a
+    class="message" href="#SCI_AUTOCSETIGNORECASE"><code>SCI_AUTOCSETIGNORECASE</code></a>, then
+    strings are matched after being converted to upper case. One result of this is that the list
+    should be sorted with the punctuation characters '[', '\', ']', '^', '_', and '`' sorted after
+    letters.</p>
+
+    <p><b id="SCI_AUTOCCANCEL">SCI_AUTOCCANCEL</b><br />
+     This message cancels any displayed autocompletion list. When in autocompletion mode, the list
+    should disappear when the user types a character that can not be part of the autocompletion,
+    such as '.', '(' or '[' when typing an identifier. A set of characters that will cancel
+    autocompletion can be specified with <a class="message"
+    href="#SCI_AUTOCSTOPS"><code>SCI_AUTOCSTOPS</code></a>.</p>
+
+    <p><b id="SCI_AUTOCACTIVE">SCI_AUTOCACTIVE</b><br />
+     This message returns non-zero if there is an active autocompletion list and zero if there is
+    not.</p>
+
+    <p><b id="SCI_AUTOCPOSSTART">SCI_AUTOCPOSSTART</b><br />
+     This returns the value of the current position when <code>SCI_AUTOCSHOW</code> started display
+    of the list.</p>
+
+    <p><b id="SCI_AUTOCCOMPLETE">SCI_AUTOCCOMPLETE</b><br />
+     This message triggers autocompletion. This has the same effect as the tab key.</p>
+
+    <p><b id="SCI_AUTOCSTOPS">SCI_AUTOCSTOPS(&lt;unused&gt;, const char *chars)</b><br />
+     The <code>chars</code> argument is a string containing a list of characters that will
+    automatically cancel the autocompletion list. When you start the editor, this list is
+    empty.</p>
+
+    <p><b id="SCI_AUTOCSETSEPARATOR">SCI_AUTOCSETSEPARATOR(char separator)</b><br />
+     <b id="SCI_AUTOCGETSEPARATOR">SCI_AUTOCGETSEPARATOR</b><br />
+     These two messages set and get the separator character used to separate words in the
+    <code>SCI_AUTOCSHOW</code> list. The default is the space character.</p>
+
+    <p><b id="SCI_AUTOCSELECT">SCI_AUTOCSELECT(&lt;unused&gt;, const char *select)</b><br />
+     <b id="SCI_AUTOCGETCURRENT">SCI_AUTOCGETCURRENT</b><br />
+     This message selects an item in the autocompletion list. It searches the list of words for the
+    first that matches <code>select</code>. By default, comparisons are case sensitive, but you can
+    change this with <a class="message"
+    href="#SCI_AUTOCSETIGNORECASE"><code>SCI_AUTOCSETIGNORECASE</code></a>. The match is character
+    by character for the length of the <code>select</code> string. That is, if select is "Fred" it
+    will match "Frederick" if this is the first item in the list that begins with "Fred". If an
+    item is found, it is selected. If the item is not found, the autocompletion list closes if
+    auto-hide is true (see <a class="message"
+    href="#SCI_AUTOCSETAUTOHIDE"><code>SCI_AUTOCSETAUTOHIDE</code></a>).<br />
+    The current selection can be retrieved with <code>SCI_AUTOCGETCURRENT</code>
+    </p>
+
+    <p><b id="SCI_AUTOCSETCANCELATSTART">SCI_AUTOCSETCANCELATSTART(bool cancel)</b><br />
+     <b id="SCI_AUTOCGETCANCELATSTART">SCI_AUTOCGETCANCELATSTART</b><br />
+     The default behavior is for the list to be cancelled if the caret moves before the location it
+    was at when the list was displayed. By calling this message with a <code>false</code> argument,
+    the list is not cancelled until the caret moves before the first character of the word being
+    completed.</p>
+
+    <p><b id="SCI_AUTOCSETFILLUPS">SCI_AUTOCSETFILLUPS(&lt;unused&gt;, const char *chars)</b><br />
+     If a fillup character is typed with an autocompletion list active, the currently selected item
+    in the list is added into the document, then the fillup character is added. Common fillup
+    characters are '(', '[' and '.' but others are possible depending on the language. By default,
+    no fillup characters are set.</p>
+
+    <p><b id="SCI_AUTOCSETCHOOSESINGLE">SCI_AUTOCSETCHOOSESINGLE(bool chooseSingle)</b><br />
+     <b id="SCI_AUTOCGETCHOOSESINGLE">SCI_AUTOCGETCHOOSESINGLE</b><br />
+     If you use <code>SCI_AUTOCSETCHOOSESINGLE(1)</code> and a list has only one item, it is
+    automatically added and no list is displayed. The default is to display the list even if there
+    is only a single item.</p>
+
+    <p><b id="SCI_AUTOCSETIGNORECASE">SCI_AUTOCSETIGNORECASE(bool ignoreCase)</b><br />
+     <b id="SCI_AUTOCGETIGNORECASE">SCI_AUTOCGETIGNORECASE</b><br />
+     By default, matching of characters to list members is case sensitive. These messages let you
+    set and get case sensitivity.</p>
+
+    <p><b id="SCI_AUTOCSETAUTOHIDE">SCI_AUTOCSETAUTOHIDE(bool autoHide)</b><br />
+     <b id="SCI_AUTOCGETAUTOHIDE">SCI_AUTOCGETAUTOHIDE</b><br />
+     By default, the list is cancelled if there are no viable matches (the user has typed
+    characters that no longer match a list entry). If you want to keep displaying the original
+    list, set <code>autoHide</code> to <code>false</code>. This also effects <a class="message"
+    href="#SCI_AUTOCSELECT"><code>SCI_AUTOCSELECT</code></a>.</p>
+
+    <p><b id="SCI_AUTOCSETDROPRESTOFWORD">SCI_AUTOCSETDROPRESTOFWORD(bool dropRestOfWord)</b><br />
+     <b id="SCI_AUTOCGETDROPRESTOFWORD">SCI_AUTOCGETDROPRESTOFWORD</b><br />
+     When an item is selected, any word characters following the caret are first erased if
+    <code>dropRestOfWord</code> is set <code>true</code>. The default is <code>false</code>.</p>
+
+    <p>
+      <b id="SCI_REGISTERIMAGE">SCI_REGISTERIMAGE(int type, const char *xpmData)</b><br />
+      <b id="SCI_CLEARREGISTEREDIMAGES">SCI_CLEARREGISTEREDIMAGES</b><br />
+      <b id="SCI_AUTOCSETTYPESEPARATOR">SCI_AUTOCSETTYPESEPARATOR(char separatorCharacter)</b><br />
+      <b id="SCI_AUTOCGETTYPESEPARATOR">SCI_AUTOCGETTYPESEPARATOR</b><br />
+
+      Autocompletion list items may display an image as well as text. Each image is first registered with an integer
+      type. Then this integer is included in the text of the list separated by a '?' from the text. For example,
+      "fclose?2 fopen" displays image 2 before the string "fclose" and no image before "fopen".
+      The images are in XPM format as is described for
+      <a class="message" href="#SCI_MARKERDEFINEPIXMAP"><code>SCI_MARKERDEFINEPIXMAP</code></a>
+      The set of registered images can be cleared with <code>SCI_CLEARREGISTEREDIMAGES</code> and the '?' separator changed
+      with <code>SCI_AUTOCSETTYPESEPARATOR</code>.
+    </p>
+
+    <p>
+      <b id="SCI_AUTOCSETMAXHEIGHT">SCI_AUTOCSETMAXHEIGHT(int rowCount)</b><br />
+      <b id="SCI_AUTOCGETMAXHEIGHT">SCI_AUTOCGETMAXHEIGHT</b><br />
+
+      Get or set the maximum number of rows that will be visible in an autocompletion list. If there are more rows in the list, then a vertical
+      scrollbar is shown. The default is 5.
+     </p>
+
+    <p>
+      <b id="SCI_AUTOCSETMAXWIDTH">SCI_AUTOCSETMAXWIDTH(int characterCount)</b><br />
+      <b id="SCI_AUTOCGETMAXWIDTH">SCI_AUTOCGETMAXWIDTH</b><br />
+
+      Get or set the maximum width of an autocompletion list expressed as the number of characters in the longest item that will be totally visible.
+      If zero (the default) then the list's width is calculated to fit the item with the most characters. Any items that cannot be fully displayed within
+      the available width are indicated by the presence of ellipsis.
+     </p>
+
+    <h2 id="UserLists">User lists</h2>
+
+    <p>User lists use the same internal mechanisms as autocompletion lists, and all the calls
+    listed for autocompletion work on them; you cannot display a user list at the same time as an
+    autocompletion list is active. They differ in the following respects:</p>
+
+    <p>o The <code><a class="message"
+    href="#SCI_AUTOCSETCHOOSESINGLE">SCI_AUTOCSETCHOOSESINGLE</a></code> message has no
+    effect.<br />
+     o When the user makes a selection you are sent a <code><a class="message"
+    href="#SCN_USERLISTSELECTION">SCN_USERLISTSELECTION</a></code> <a class="jump"
+    href="#Notifications">notification message</a> rather than <code><a class="message"
+    href="#SCN_AUTOCSELECTION">SCN_AUTOCSELECTION</a></code>.</p>
+
+    <p>BEWARE: if you have set fillup characters or stop characters, these will still be active
+    with the user list, and may result in items being selected or the user list cancelled due to
+    the user typing into the editor.</p>
+
+    <p><b id="SCI_USERLISTSHOW">SCI_USERLISTSHOW(int listType, const char *list)</b><br />
+     The <code>listType</code> parameter is returned to the container as the <code>wParam</code>
+    field of the <a class="message" href="#SCNotification"><code>SCNotification</code></a>
+    structure. It must be greater than 0 as this is how Scintilla tells the difference between an
+    autocompletion list and a user list. If you have different types of list, for example a list of
+    buffers and a list of macros, you can use <code>listType</code> to tell which one has returned
+    a selection. </p>
+
+    <h2 id="CallTips">Call tips</h2>
+
+    <p>Call tips are small windows displaying the arguments to a function and are displayed after
+    the user has typed the name of the function. They normally display characters using the font
+    facename, size and character set defined by
+    <code><a class="message" href="#StyleDefinition">STYLE_DEFAULT</a></code>. You can choose to
+    use <code><a class="message" href="#StyleDefinition">STYLE_CALLTIP</a></code> to define the
+    facename, size, foreground and background colours and character set with
+    <code><a class="message" href="#SCI_CALLTIPUSESTYLE">SCI_CALLTIPUSESTYLE</a></code>.
+    This also enables support for Tab characters.
+
+    There is some interaction between call tips and autocompletion lists in that showing a
+    call tip cancels any active autocompletion list, and vice versa.</p>
+
+    <p>Call tips can highlight part of the text within them. You could use this to highlight the
+    current argument to a function by counting the number of commas (or whatever separator your
+    language uses). See <code>SciTEBase::CharAdded()</code> in <code>SciTEBase.cxx</code> for an
+    example of call tip use.</p>
+
+    <p>The mouse may be clicked on call tips and this causes a
+    <code><a class="message" href="#SCN_CALLTIPCLICK">SCN_CALLTIPCLICK</a></code>
+    notification to be sent to the container. Small up and down arrows may be displayed within
+    a call tip by, respectively, including the characters '\001', or '\002'. This is useful
+    for showing that there are overloaded variants of one function name and that the user can
+    click on the arrows to cycle through the overloads.</p>
+
+    <p>Alternatively, call tips can be displayed when you leave the mouse pointer for a while over
+    a word in response to the <code><a class="message"
+    href="#SCN_DWELLSTART">SCN_DWELLSTART</a></code> <a class="jump"
+    href="#Notifications">notification</a> and cancelled in response to <code><a class="message"
+    href="#SCN_DWELLEND">SCN_DWELLEND</a></code>. This method could be used in a debugger to give
+    the value of a variable, or during editing to give information about the word under the
+    pointer.</p>
+    <code><a class="message" href="#SCI_CALLTIPSHOW">SCI_CALLTIPSHOW(int posStart, const char
+    *definition)</a><br />
+     <a class="message" href="#SCI_CALLTIPCANCEL">SCI_CALLTIPCANCEL</a><br />
+     <a class="message" href="#SCI_CALLTIPACTIVE">SCI_CALLTIPACTIVE</a><br />
+     <a class="message" href="#SCI_CALLTIPPOSSTART">SCI_CALLTIPPOSSTART</a><br />
+     <a class="message" href="#SCI_CALLTIPSETHLT">SCI_CALLTIPSETHLT(int highlightStart, int
+    highlightEnd)</a><br />
+     <a class="message" href="#SCI_CALLTIPSETBACK">SCI_CALLTIPSETBACK(int colour)</a><br />
+     <a class="message" href="#SCI_CALLTIPSETFORE">SCI_CALLTIPSETFORE(int colour)</a><br />
+     <a class="message" href="#SCI_CALLTIPSETFOREHLT">SCI_CALLTIPSETFOREHLT(int colour)</a><br />
+     <a class="message" href="#SCI_CALLTIPUSESTYLE">SCI_CALLTIPUSESTYLE(int tabsize)</a><br />
+    </code>
+
+    <p><b id="SCI_CALLTIPSHOW">SCI_CALLTIPSHOW(int posStart, const char *definition)</b><br />
+     This message starts the process by displaying the call tip window. If a call tip is already
+    active, this has no effect.<br />
+     <code>posStart</code> is the position in the document at which to align the call tip. The call
+    tip text is aligned to start 1 line below this character unless you have included up and/or
+    down arrows in the call tip text in which case the tip is aligned to the right-hand edge of
+    the rightmost arrow. The assumption is that you will start the text with something like
+    "\001 1 of 3 \002".<br />
+     <code>definition</code> is the call tip text. This can contain multiple lines separated by
+    '\n' (Line Feed, ASCII code 10) characters. Do not include '\r' (Carriage Return, ASCII
+     code 13), as this will most likely print as an empty box. '\t' (Tab, ASCII code 9) is
+     supported if you set a tabsize with
+    <code><a class="message" href="#SCI_CALLTIPUSESTYLE">SCI_CALLTIPUSESTYLE</a></code>.<br /></p>
+
+    <p><b id="SCI_CALLTIPCANCEL">SCI_CALLTIPCANCEL</b><br />
+     This message cancels any displayed call tip. Scintilla will also cancel call tips for you if
+    you use any keyboard commands that are not compatible with editing the argument list of a
+    function.</p>
+
+    <p><b id="SCI_CALLTIPACTIVE">SCI_CALLTIPACTIVE</b><br />
+     This returns 1 if a call tip is active and 0 if it is not active.</p>
+
+    <p><b id="SCI_CALLTIPPOSSTART">SCI_CALLTIPPOSSTART</b><br />
+     This message returns the value of the current position when <code>SCI_CALLTIPSHOW</code>
+    started to display the tip.</p>
+
+    <p><b id="SCI_CALLTIPSETHLT">SCI_CALLTIPSETHLT(int hlStart, int hlEnd)</b><br />
+     This sets the region of the call tips text to display in a highlighted style.
+    <code>hlStart</code> is the zero-based index into the string of the first character to
+    highlight and <code>hlEnd</code> is the index of the first character after the highlight.
+    <code>hlEnd</code> must be greater than <code>hlStart</code>; <code>hlEnd-hlStart</code> is the
+    number of characters to highlight. Highlights can extend over line ends if this is
+    required.</p>
+
+    <p>Unhighlighted text is drawn in a mid gray. Selected text is drawn in a dark blue. The
+    background is white. These can be changed with
+    <code>SCI_CALLTIPSETBACK</code>,
+    <code>SCI_CALLTIPSETFORE</code>, and
+    <code>SCI_CALLTIPSETFOREHLT</code>.
+    </p>
+
+    <p><b id="SCI_CALLTIPSETBACK">SCI_CALLTIPSETBACK(int colour)</b><br />
+     The background colour of call tips can be set with this message; the default colour is white.
+    It is not a good idea to set a dark colour as the background as the default colour for normal
+    calltip text is mid gray and the defaultcolour for highlighted text is dark blue. This also
+    sets the background colour of <code>STYLE_CALLTIP</code>.</p>
+
+    <p><b id="SCI_CALLTIPSETFORE">SCI_CALLTIPSETFORE(int colour)</b><br />
+     The colour of call tip text can be set with this message; the default colour is mid gray.
+    This also sets the foreground colour of <code>STYLE_CALLTIP</code>.</p>
+
+    <p><b id="SCI_CALLTIPSETFOREHLT">SCI_CALLTIPSETFOREHLT(int colour)</b><br />
+     The colour of highlighted call tip text can be set with this message; the default colour
+    is dark blue.</p>
+
+    <p><b id="SCI_CALLTIPUSESTYLE">SCI_CALLTIPUSESTYLE(int tabsize)</b><br />
+     This message changes the style used for call tips from <code>STYLE_DEFAULT</code> to
+    <code>STYLE_CALLTIP</code> and sets a tab size in screen pixels. If <code>tabsize</code> is
+    less than 1, Tab characters are not treated specially. Once this call has been used, the
+    call tip foreground and background colours are also taken from the style.</p>
+
+
+    <h2 id="KeyboardCommands">Keyboard commands</h2>
+
+    <p>To allow the container application to perform any of the actions available to the user with
+    keyboard, all the keyboard actions are messages. They do not take any parameters. These
+    commands are also used when redefining the key bindings with the <a class="message"
+    href="#SCI_ASSIGNCMDKEY"><code>SCI_ASSIGNCMDKEY</code></a> message.</p>
+
+    <table border="0" summary="Keyboard commands">
+      <tbody>
+        <tr>
+          <td><code>SCI_LINEDOWN</code></td>
+
+          <td><code>SCI_LINEDOWNEXTEND</code></td>
+
+          <td><code>SCI_LINEDOWNRECTEXTEND</code></td>
+
+          <td><code>SCI_LINESCROLLDOWN</code></td>
+        </tr>
+
+        <tr>
+          <td><code>SCI_LINEUP</code></td>
+
+          <td><code>SCI_LINEUPEXTEND</code></td>
+
+          <td><code>SCI_LINEUPRECTEXTEND</code></td>
+
+          <td><code>SCI_LINESCROLLUP</code></td>
+        </tr>
+
+        <tr>
+          <td><code>SCI_PARADOWN</code></td>
+
+          <td><code>SCI_PARADOWNEXTEND</code></td>
+
+          <td><code>SCI_PARAUP</code></td>
+
+          <td><code>SCI_PARAUPEXTEND</code></td>
+        </tr>
+
+        <tr>
+          <td><code>SCI_CHARLEFT</code></td>
+
+          <td><code>SCI_CHARLEFTEXTEND</code></td>
+
+          <td><code>SCI_CHARLEFTRECTEXTEND</code></td>
+        </tr>
+
+        <tr>
+          <td><code>SCI_CHARRIGHT</code></td>
+
+          <td><code>SCI_CHARRIGHTEXTEND</code></td>
+
+          <td><code>SCI_CHARRIGHTRECTEXTEND</code></td>
+        </tr>
+
+        <tr>
+          <td><code>SCI_WORDLEFT</code></td>
+
+          <td><code>SCI_WORDLEFTEXTEND</code></td>
+
+          <td><code>SCI_WORDRIGHT</code></td>
+
+          <td><code>SCI_WORDRIGHTEXTEND</code></td>
+        </tr>
+
+        <tr>
+          <td><code>SCI_WORDLEFTEND</code></td>
+
+          <td><code>SCI_WORDLEFTENDEXTEND</code></td>
+
+          <td><code>SCI_WORDRIGHTEND</code></td>
+
+          <td><code>SCI_WORDRIGHTENDEXTEND</code></td>
+        </tr>
+
+        <tr>
+          <td><code>SCI_WORDPARTLEFT</code></td>
+
+          <td><code>SCI_WORDPARTLEFTEXTEND</code></td>
+
+          <td><code>SCI_WORDPARTRIGHT</code></td>
+
+          <td><code>SCI_WORDPARTRIGHTEXTEND</code></td>
+        </tr>
+
+        <tr>
+          <td><code>SCI_HOME</code></td>
+
+          <td><code>SCI_HOMEEXTEND</code></td>
+
+          <td><code>[SCI_HOMERECTEXTEND]</code></td>
+        </tr>
+
+        <tr>
+          <td><code>SCI_HOMEDISPLAY</code></td>
+
+          <td><code>SCI_HOMEDISPLAYEXTEND</code></td>
+
+          <td><code>SCI_HOMEWRAP</code></td>
+
+          <td><code>SCI_HOMEWRAPEXTEND</code></td>
+        </tr>
+
+        <tr>
+          <td><code>SCI_VCHOME</code></td>
+
+          <td><code>SCI_VCHOMEEXTEND</code></td>
+
+          <td><code>SCI_VCHOMERECTEXTEND</code></td>
+        </tr>
+
+        <tr>
+          <td><code>SCI_VCHOMEWRAP</code></td>
+
+          <td><code>SCI_VCHOMEWRAPEXTEND</code></td>
+        </tr>
+
+        <tr>
+          <td><code>SCI_LINEEND</code></td>
+
+          <td><code>SCI_LINEENDEXTEND</code></td>
+
+          <td><code>SCI_LINEENDRECTEXTEND</code></td>
+        </tr>
+
+        <tr>
+          <td><code>SCI_LINEENDDISPLAY</code></td>
+
+          <td><code>SCI_LINEENDDISPLAYEXTEND</code></td>
+
+          <td><code>SCI_LINEENDWRAP</code></td>
+
+          <td><code>SCI_LINEENDWRAPEXTEND</code></td>
+        </tr>
+
+        <tr>
+          <td><code>SCI_DOCUMENTSTART</code></td>
+
+          <td><code>SCI_DOCUMENTSTARTEXTEND</code></td>
+
+          <td><code>SCI_DOCUMENTEND</code></td>
+
+          <td><code>SCI_DOCUMENTENDEXTEND</code></td>
+        </tr>
+
+        <tr>
+          <td><code>SCI_PAGEUP</code></td>
+
+          <td><code>SCI_PAGEUPEXTEND</code></td>
+
+          <td><code>SCI_PAGEUPRECTEXTEND</code></td>
+        </tr>
+
+        <tr>
+          <td><code>SCI_PAGEDOWN</code></td>
+
+          <td><code>SCI_PAGEDOWNEXTEND</code></td>
+
+          <td><code>SCI_PAGEDOWNRECTEXTEND</code></td>
+        </tr>
+
+
+        <tr>
+          <td><code>SCI_STUTTEREDPAGEUP</code></td>
+
+          <td><code>SCI_STUTTEREDPAGEUPEXTEND</code></td>
+        </tr>
+
+        <tr>
+          <td><code>SCI_STUTTEREDPAGEDOWN</code></td>
+
+          <td><code>SCI_STUTTEREDPAGEDOWNEXTEND</code></td>
+        </tr>
+
+        <tr>
+          <td><code>SCI_DELETEBACK</code></td>
+
+          <td><code>SCI_DELETEBACKNOTLINE</code></td>
+        </tr>
+
+        <tr>
+          <td><code>SCI_DELWORDLEFT</code></td>
+
+          <td><code>SCI_DELWORDRIGHT</code></td>
+
+          <td><code>SCI_DELWORDRIGHTEND</code></td>
+        </tr>
+
+        <tr>
+          <td><code>SCI_DELLINELEFT</code></td>
+
+          <td><code>SCI_DELLINERIGHT</code></td>
+
+          <td><code>SCI_LINEDELETE</code></td>
+        </tr>
+
+        <tr>
+          <td><code>SCI_LINECUT</code></td>
+
+          <td><code>SCI_LINECOPY</code></td>
+
+          <td><code>SCI_LINETRANSPOSE</code></td>
+
+          <td><code>SCI_LINEDUPLICATE</code></td>
+        </tr>
+
+        <tr>
+          <td><code>SCI_LOWERCASE</code></td>
+
+          <td><code>SCI_UPPERCASE</code></td>
+
+          <td><code>SCI_CANCEL</code></td>
+
+          <td><code>SCI_EDITTOGGLEOVERTYPE</code></td>
+        </tr>
+
+        <tr>
+          <td><code>SCI_NEWLINE</code></td>
+
+          <td><code>SCI_FORMFEED</code></td>
+
+          <td><code>SCI_TAB</code></td>
+
+          <td><code>SCI_BACKTAB</code></td>
+        </tr>
+
+        <tr>
+          <td><code>SCI_SELECTIONDUPLICATE</code></td>
+
+        </tr>
+     </tbody>
+    </table>
+
+    <p>The <code>SCI_*EXTEND</code> messages extend the selection.</p>
+
+    <p>The <code>SCI_*RECTEXTEND</code> messages extend the rectangular selection
+    (and convert regular selection to rectangular one, if any).</p>
+
+    <p>The <code>SCI_WORDPART*</code> commands are used to move between word segments marked by
+    capitalisation (aCamelCaseIdentifier) or underscores (an_under_bar_ident).</p>
+
+    <p>The <code>SCI_HOME*</code> commands move the caret to the start of the line, while the
+    <code>SCI_VCHOME*</code>commands move the caret to the first non-blank character of the line
+    (ie. just after the indentation) unless it is already there; in this case, it acts as SCI_HOME*.</p>
+
+    <p>The <code>SCI_[HOME|LINEEND]DISPLAY*</code> commands are used when in line wrap mode to
+    allow movement to the start or end of display lines as opposed to the normal
+    <code>SCI_[HOME|LINEEND]</code> commands which move to the start or end of document lines.</p>
+
+    <p>The <code>SCI_[[VC]HOME|LINEEND]WRAP*</code> commands are like their namesakes
+    <code>SCI_[[VC]HOME|LINEEND]*</code> except they behave differently when word-wrap is enabled:
+     They go first to the start / end of the display line, like <code>SCI_[HOME|LINEEND]DISPLAY*</code>,
+     but if the cursor is already at the point, it goes on to the start or end of the document line,
+     as appropriate for <code>SCI_[[VC]HOME|LINEEND]*</code>.
+     </p>
+
+    <h2 id="KeyBindings">Key bindings</h2>
+
+    <p>There is a default binding of keys to commands that is defined in the Scintilla source in
+    the file <code>KeyMap.cxx</code> by the constant <code>KeyMap::MapDefault[]</code>. This table
+    maps key definitions to <code>SCI_*</code> messages with no parameters (mostly the <a
+    class="jump" href="#KeyboardCommands">keyboard commands</a> discussed above, but any Scintilla
+    command that has no arguments can be mapped). You can change the mapping to suit your own
+    requirements.</p>
+    <code><a class="message" href="#SCI_ASSIGNCMDKEY">SCI_ASSIGNCMDKEY(int keyDefinition, int
+    sciCommand)</a><br />
+     <a class="message" href="#SCI_CLEARCMDKEY">SCI_CLEARCMDKEY(int keyDefinition)</a><br />
+     <a class="message" href="#SCI_CLEARALLCMDKEYS">SCI_CLEARALLCMDKEYS</a><br />
+     <a class="message" href="#SCI_NULL">SCI_NULL</a><br />
+    </code>
+
+    <p><b id="keyDefinition">keyDefinition</b><br />
+     A key definition contains the key code in the low 16-bits and the key modifiers in the high
+    16-bits. To combine <code>keyCode</code> and <code>keyMod</code> set:<br />
+    <br />
+     <code>keyDefinition = keyCode + (keyMod &lt;&lt; 16)</code></p>
+
+    <p>The key code is a visible or control character or a key from the <code>SCK_*</code>
+    enumeration, which contains:<br />
+     <code>SCK_ADD</code>, <code>SCK_BACK</code>, <code>SCK_DELETE</code>, <code>SCK_DIVIDE</code>,
+    <code>SCK_DOWN</code>, <code>SCK_END</code>, <code>SCK_ESCAPE</code>, <code>SCK_HOME</code>,
+    <code>SCK_INSERT</code>, <code>SCK_LEFT</code>, <code>SCK_MENU</code>, <code>SCK_NEXT</code> (Page Down),
+    <code>SCK_PRIOR</code> (Page Up), <code>SCK_RETURN</code>, <code>SCK_RIGHT</code>,
+    <code>SCK_RWIN</code>,
+    <code>SCK_SUBTRACT</code>, <code>SCK_TAB</code>, <code>SCK_UP</code>, and
+    <code>SCK_WIN</code>.</p>
+
+    <p>The modifiers are a combination of zero or more of <code>SCMOD_ALT</code>,
+    <code>SCMOD_CTRL</code>, and <code>SCMOD_SHIFT</code>. If you are building a table, you might
+    want to use <code>SCMOD_NORM</code>, which has the value 0, to mean no modifiers.</p>
+
+    <p><b id="SCI_ASSIGNCMDKEY">SCI_ASSIGNCMDKEY(int <a class="jump"
+    href="#keyDefinition">keyDefinition</a>, int sciCommand)</b><br />
+     This assigns the given key definition to a Scintilla command identified by
+    <code>sciCommand</code>. <code>sciCommand</code> can be any <code>SCI_*</code> command that has
+    no arguments.</p>
+
+    <p><b id="SCI_CLEARCMDKEY">SCI_CLEARCMDKEY(int <a class="jump"
+    href="#keyDefinition">keyDefinition</a>)</b><br />
+     This makes the given key definition do nothing by assigning the action <code>SCI_NULL</code>
+    to it.</p>
+
+    <p><b id="SCI_CLEARALLCMDKEYS">SCI_CLEARALLCMDKEYS</b><br />
+     This command removes all keyboard command mapping by setting an empty mapping table.</p>
+
+    <p><b id="SCI_NULL">SCI_NULL</b><br />
+     The <code>SCI_NULL</code> does nothing and is the value assigned to keys that perform no
+    action. SCI_NULL ensures that keys do not propagate to the parent window as that may
+    cause focus to move. If you want the standard platform behaviour use the constant 0 instead.</p>
+
+    <h2 id="PopupEditMenu">Popup edit menu</h2>
+
+    <p><b id="SCI_USEPOPUP">SCI_USEPOPUP(bool bEnablePopup)</b><br />
+     Clicking the wrong button on the mouse pops up a short default editing menu. This may be
+    turned off with <code>SCI_USEPOPUP(0)</code>. If you turn it off, context menu commands (in
+    Windows, <code>WM_CONTEXTMENU</code>) will not be handled by Scintilla, so the parent of the
+    Scintilla window will have the opportunity to handle the message.</p>
+
+    <h2 id="MacroRecording">Macro recording</h2>
+
+    <p>Start and stop macro recording mode. In macro recording mode, actions are reported to the
+    container through <code><a class="message" href="#SCN_MACRORECORD">SCN_MACRORECORD</a></code>
+    <a class="jump" href="#Notifications">notifications</a>. It is then up to the container to
+    record these actions for future replay.</p>
+
+    <p><b id="SCI_STARTRECORD">SCI_STARTRECORD</b><br />
+     <b id="SCI_STOPRECORD">SCI_STOPRECORD</b><br />
+     These two messages turn macro recording on and off.</p>
+
+    <h2 id="Printing">Printing</h2>
+
+    <p>On Windows <code>SCI_FORMATRANGE</code> can be used to draw the text onto a display context
+    which can include a printer display context. Printed output shows text styling as on the
+    screen, but it hides all margins except a line number margin. All special marker effects are
+    removed and the selection and caret are hidden.</p>
+    <code><a class="message" href="#SCI_FORMATRANGE">SCI_FORMATRANGE(bool bDraw, RangeToFormat
+    *pfr)</a><br />
+     <a class="message" href="#SCI_SETPRINTMAGNIFICATION">SCI_SETPRINTMAGNIFICATION(int
+    magnification)</a><br />
+     <a class="message" href="#SCI_GETPRINTMAGNIFICATION">SCI_GETPRINTMAGNIFICATION</a><br />
+     <a class="message" href="#SCI_SETPRINTCOLOURMODE">SCI_SETPRINTCOLOURMODE(int mode)</a><br />
+     <a class="message" href="#SCI_GETPRINTCOLOURMODE">SCI_GETPRINTCOLOURMODE</a><br />
+     <a class="message" href="#SCI_SETPRINTWRAPMODE">SCI_SETPRINTWRAPMODE</a><br />
+     <a class="message" href="#SCI_GETPRINTWRAPMODE">SCI_GETPRINTWRAPMODE</a><br />
+    </code>
+
+    <p><b id="SCI_FORMATRANGE">SCI_FORMATRANGE(bool bDraw, RangeToFormat *pfr)</b><br />
+     This call allows Windows users to render a range of text into a device context. If you use
+    this for printing, you will probably want to arrange a page header and footer; Scintilla does
+    not do this for you. See <code>SciTEWin::Print()</code> in <code>SciTEWinDlg.cxx</code> for an
+    example. Each use of this message renders a range of text into a rectangular area and returns
+    the position in the document of the next character to print.</p>
+
+    <p><code>bDraw</code> controls if any output is done. Set this to false if you are paginating
+    (for example, if you use this with MFC you will need to paginate in
+    <code>OnBeginPrinting()</code> before you output each page.</p>
+<pre>
+struct RangeToFormat {
+    SurfaceID hdc;        // The HDC (device context) we print to
+    SurfaceID hdcTarget;  // The HDC we use for measuring (may be same as hdc)
+    PRectangle rc;        // Rectangle in which to print
+    PRectangle rcPage;    // Physically printable page size
+    CharacterRange chrg;  // Range of characters to print
+};
+</pre>
+
+    <p><code>hdc</code> and <code>hdcTarget</code> should both be set to the device context handle
+    of the output device (usually a printer). If you print to a metafile these will not be the same
+    as Windows metafiles (unlike extended metafiles) do not implement the full API for returning
+    information. In this case, set <code>hdcTarget</code> to the screen DC.<br />
+     <code>rcPage</code> is the rectangle <code>{0, 0, maxX, maxY}</code> where <code>maxX+1</code>
+    and <code>maxY+1</code> are the number of physically printable pixels in x and y.<br />
+     <code>rc</code> is the rectangle to render the text in (which will, of course, fit within the
+    rectangle defined by rcPage).<br />
+     <code>chrg.cpMin</code> and <code>chrg.cpMax</code> define the start position and maximum
+    position of characters to output. All of each line within this character range is drawn.</p>
+
+    <p>When printing, the most tedious part is always working out what the margins should be to
+    allow for the non-printable area of the paper and printing a header and footer. If you look at
+    the printing code in SciTE, you will find that most of it is taken up with this. The loop that
+    causes Scintilla to render text is quite simple if you strip out all the margin, non-printable
+    area, header and footer code.</p>
+
+    <p><b id="SCI_SETPRINTMAGNIFICATION">SCI_SETPRINTMAGNIFICATION(int magnification)</b><br />
+     <b id="SCI_GETPRINTMAGNIFICATION">SCI_GETPRINTMAGNIFICATION</b><br />
+     <code>SCI_GETPRINTMAGNIFICATION</code> lets you to print at a different size than the screen
+    font. <code>magnification</code> is the number of points to add to the size of each screen
+    font. A value of -3 or -4 gives reasonably small print. You can get this value with
+    <code>SCI_GETPRINTMAGNIFICATION</code>.</p>
+
+    <p><b id="SCI_SETPRINTCOLOURMODE">SCI_SETPRINTCOLOURMODE(int mode)</b><br />
+     <b id="SCI_GETPRINTCOLOURMODE">SCI_GETPRINTCOLOURMODE</b><br />
+     These two messages set and get the method used to render coloured text on a printer that is
+    probably using white paper. It is especially important to consider the treatment of colour if
+    you use a dark or black screen background. Printing white on black uses up toner and ink very
+    many times faster than the other way around. You can set the mode to one of:</p>
+
+    <table cellpadding="1" cellspacing="2" border="0" summary="Colour printing modes">
+      <tbody>
+        <tr>
+          <th align="left">Symbol</th>
+
+          <th>Value</th>
+
+          <th align="left">Purpose</th>
+        </tr>
+      </tbody>
+
+      <tbody valign="top">
+        <tr>
+          <td align="left"><code>SC_PRINT_NORMAL</code></td>
+
+          <td align="center">0</td>
+
+          <td>Print using the current screen colours. This is the default.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_PRINT_INVERTLIGHT</code></td>
+
+          <td align="center">1</td>
+
+          <td>If you use a dark screen background this saves ink by inverting the light value of
+          all colours and printing on a white background.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_PRINT_BLACKONWHITE</code></td>
+
+          <td align="center">2</td>
+
+          <td>Print all text as black on a white background.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_PRINT_COLOURONWHITE</code></td>
+
+          <td align="center">3</td>
+
+          <td>Everything prints in its own colour on a white background.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_PRINT_COLOURONWHITEDEFAULTBG</code></td>
+
+          <td align="center">4</td>
+
+          <td>Everything prints in its own colour on a white background except that line numbers
+          use their own background colour.</td>
+        </tr>
+      </tbody>
+    </table>
+
+    <p><b id="SCI_SETPRINTWRAPMODE">SCI_SETPRINTWRAPMODE(int wrapMode)</b><br />
+     <b id="SCI_GETPRINTWRAPMODE">SCI_GETPRINTWRAPMODE</b><br />
+     These two functions get and set the printer wrap mode. <code>wrapMode</code> can be
+     set to <code>SC_WRAP_NONE</code> (0), <code>SC_WRAP_WORD</code> (1) or
+     <code>SC_WRAP_CHAR</code> (2). The default is
+     <code>SC_WRAP_WORD</code>, which wraps printed output so that all characters fit
+     into the print rectangle. If you set <code>SC_WRAP_NONE</code>, each line of text
+     generates one line of output and the line is truncated if it is too long to fit
+     into the print area.<br />
+     <code>SC_WRAP_WORD</code> tries to wrap only between words as indicated by
+     white space or style changes although if a word is longer than a line, it will be wrapped before
+     the line end. <code>SC_WRAP_CHAR</code> is preferred to
+     <code>SC_WRAP_WORD</code> for Asian languages where there is no white space
+     between words.</p>
+
+    <h2 id="DirectAccess">Direct access</h2>
+    <code><a class="message" href="#SCI_GETDIRECTFUNCTION">SCI_GETDIRECTFUNCTION</a><br />
+     <a class="message" href="#SCI_GETDIRECTPOINTER">SCI_GETDIRECTPOINTER</a><br />
+     <a class="message" href="#SCI_GETCHARACTERPOINTER">SCI_GETCHARACTERPOINTER</a><br />
+    </code>
+
+    <p>On Windows, the message-passing scheme used to communicate between the container and
+    Scintilla is mediated by the operating system <code>SendMessage</code> function and can lead to
+    bad performance when calling intensively. To avoid this overhead, Scintilla provides messages
+    that allow you to call the Scintilla message function directly. The code to do this in C/C++ is
+    of the form:</p>
+<pre>
+#include "Scintilla.h"
+SciFnDirect pSciMsg = (SciFnDirect)SendMessage(hSciWnd, SCI_GETDIRECTFUNCTION, 0, 0);
+sptr_t pSciWndData = (sptr_t)SendMessage(hSciWnd, SCI_GETDIRECTPOINTER, 0, 0);
+
+// now a wrapper to call Scintilla directly
+sptr_t CallScintilla(unsigned int iMessage, uptr_t wParam, sptr_t lParam){
+    return pSciMsg(pSciWndData, iMessage, wParam, lParam);
+}
+</pre>
+
+    <p><code>SciFnDirect</code>, <code>sptr_t</code> and <code>uptr_t</code> are declared in
+    <code>Scintilla.h</code>. <code>hSciWnd</code> is the window handle returned when you created
+    the Scintilla window.</p>
+
+    <p>While faster, this direct calling will cause problems if performed from a different thread
+    to the native thread of the Scintilla window in which case <code>SendMessage(hSciWnd, SCI_*,
+    wParam, lParam)</code> should be used to synchronize with the window's thread.</p>
+
+    <p>This feature also works on GTK+ but has no significant impact on speed.</p>
+
+    <p>From version 1.47 on Windows, Scintilla exports a function called
+    <code>Scintilla_DirectFunction</code> that can be used the same as the function returned by
+    <code>SCI_GETDIRECTFUNCTION</code>. This saves you the call to
+    <code>SCI_GETDIRECTFUNCTION</code> and the need to call Scintilla indirectly via the function
+    pointer.</p>
+
+    <p><b id="SCI_GETDIRECTFUNCTION">SCI_GETDIRECTFUNCTION</b><br />
+     This message returns the address of the function to call to handle Scintilla messages without
+    the overhead of passing through the Windows messaging system. You need only call this once,
+    regardless of the number of Scintilla windows you create.</p>
+
+    <p><b id="SCI_GETDIRECTPOINTER">SCI_GETDIRECTPOINTER</b><br />
+     This returns a pointer to data that identifies which Scintilla window is in use. You must call
+    this once for each Scintilla window you create. When you call the direct function, you must
+    pass in the direct pointer associated with the target window.</p>
+
+    <p><b id="SCI_GETCHARACTERPOINTER">SCI_GETCHARACTERPOINTER</b><br />
+     Move the gap within Scintilla so that the text of the document is stored consecutively
+     and ensure there is a NUL character after the text, then return a pointer to the first character.
+     Applications may then pass this to a function that accepts a character pointer such as a regular
+     expression search or a parser. The pointer should <em>not</em> be written to as that may desynchronize
+     the internal state of Scintilla.</p>
+     <p>Since any action in Scintilla may change its internal state
+     this pointer becomes invalid after any call or by allowing user interface activity. The application
+     should reacquire the pointer after making any call to Scintilla or performing any user-interface calls such
+     as modifying a progress indicator.</p>
+     <p>This call takes similar time to inserting a character at the end of the document and this may
+     include moving the document contents. Specifically, all the characters after the document gap
+     are moved to before the gap. This compacted state should persist over calls and user interface
+     actions that do not change the document contents so reacquiring the pointer afterwards is very
+     quick. If this call is used to implement a global replace operation, then each replacement will
+     move the gap so if <code>SCI_GETCHARACTERPOINTER</code> is called after
+     each replacement then the operation will become O(n^2) rather than O(n). Instead, all
+     matches should be found and remembered, then all the replacements performed.</p>
+
+    <h2 id="MultipleViews">Multiple views</h2>
+
+    <p>A Scintilla window and the document that it displays are separate entities. When you create
+    a new window, you also create a new, empty document. Each document has a reference count that
+    is initially set to 1. The document also has a list of the Scintilla windows that are linked to
+    it so when any window changes the document, all other windows in which it appears are notified
+    to cause them to update. The system is arranged in this way so that you can work with many
+    documents in a single Scintilla window and so you can display a single document in multiple
+    windows (for use with splitter windows).</p>
+
+    <p>Although these messages use <code>document *pDoc</code>, to ensure compatibility with future
+    releases of Scintilla you should treat <code>pDoc</code> as an opaque <code>void*</code>. That
+    is, you can use and store the pointer as described in this section but you should not
+    dereference it.</p>
+    <code><a class="message" href="#SCI_GETDOCPOINTER">SCI_GETDOCPOINTER</a><br />
+     <a class="message" href="#SCI_SETDOCPOINTER">SCI_SETDOCPOINTER(&lt;unused&gt;, document
+    *pDoc)</a><br />
+     <a class="message" href="#SCI_CREATEDOCUMENT">SCI_CREATEDOCUMENT</a><br />
+     <a class="message" href="#SCI_ADDREFDOCUMENT">SCI_ADDREFDOCUMENT(&lt;unused&gt;, document
+    *pDoc)</a><br />
+     <a class="message" href="#SCI_RELEASEDOCUMENT">SCI_RELEASEDOCUMENT(&lt;unused&gt;, document
+    *pDoc)</a><br />
+    </code>
+
+    <p><b id="SCI_GETDOCPOINTER">SCI_GETDOCPOINTER</b><br />
+     This returns a pointer to the document currently in use by the window. It has no other
+    effect.</p>
+
+    <p><b id="SCI_SETDOCPOINTER">SCI_SETDOCPOINTER(&lt;unused&gt;, document *pDoc)</b><br />
+     This message does the following:<br />
+     1. It removes the current window from the list held by the current document.<br />
+     2. It reduces the reference count of the current document by 1.<br />
+     3. If the reference count reaches 0, the document is deleted.<br />
+     4. <code>pDoc</code> is set as the new document for the window.<br />
+     5. If <code>pDoc</code> was 0, a new, empty document is created and attached to the
+    window.<br />
+     6. If <code>pDoc</code> was not 0, its reference count is increased by 1.</p>
+
+    <p><b id="SCI_CREATEDOCUMENT">SCI_CREATEDOCUMENT</b><br />
+     This message creates a new, empty document and returns a pointer to it. This document is not
+    selected into the editor and starts with a reference count of 1. This means that you have
+    ownership of it and must either reduce its reference count by 1 after using
+    <code>SCI_SETDOCPOINTER</code> so that the Scintilla window owns it or you must make sure that
+    you reduce the reference count by 1 with <code>SCI_RELEASEDOCUMENT</code> before you close the
+    application to avoid memory leaks.</p>
+
+    <p><b id="SCI_ADDREFDOCUMENT">SCI_ADDREFDOCUMENT(&lt;unused&gt;, document *pDoc)</b><br />
+     This increases the reference count of a document by 1. If you want to replace the current
+    document in the Scintilla window and take ownership of the current document, for example if you
+    are editing many documents in one window, do the following:<br />
+     1. Use <code>SCI_GETDOCPOINTER</code> to get a pointer to the document,
+    <code>pDoc</code>.<br />
+     2. Use <code>SCI_ADDREFDOCUMENT(0, pDoc)</code> to increment the reference count.<br />
+     3. Use <code>SCI_SETDOCPOINTER(0, pNewDoc)</code> to set a different document or
+    <code>SCI_SETDOCPOINTER(0, 0)</code> to set a new, empty document.</p>
+
+    <p><b id="SCI_RELEASEDOCUMENT">SCI_RELEASEDOCUMENT(&lt;unused&gt;, document *pDoc)</b><br />
+     This message reduces the reference count of the document identified by <code>pDoc</code>. pDoc
+    must be the result of <code>SCI_GETDOCPOINTER</code> or <code>SCI_CREATEDOCUMENT</code> and
+    must point at a document that still exists. If you call this on a document with a reference
+    count of 1 that is still attached to a Scintilla window, bad things will happen. To keep the
+    world spinning in its orbit you must balance each call to <code>SCI_CREATEDOCUMENT</code> or
+    <code>SCI_ADDREFDOCUMENT</code> with a call to <code>SCI_RELEASEDOCUMENT</code>.</p>
+
+    <h2 id="Folding">Folding</h2>
+
+    <p>The fundamental operation in folding is making lines invisible or visible. Line visibility
+    is a property of the view rather than the document so each view may be displaying a different
+    set of lines. From the point of view of the user, lines are hidden and displayed using fold
+    points. Generally, the fold points of a document are based on the hierarchical structure of the
+    document contents. In Python, the hierarchy is determined by indentation and in C++ by brace
+    characters. This hierarchy can be represented within a Scintilla document object by attaching a
+    numeric "fold level" to each line. The fold level is most easily set by a lexer, but you can
+    also set it with messages.</p>
+
+    <p>It is up to your code to set the connection between user actions and folding and unfolding.
+    The best way to see how this is done is to search the SciTE source code for the messages used
+    in this section of the documentation and see how they are used. You will also need to use
+    markers and a folding margin to complete your folding implementation.
+    The <code>"fold"</code> property should be set to <code>"1"</code> with
+    <code>SCI_SETPROPERTY("fold", "1")</code> to enable folding. </p>
+    <code><a class="message" href="#SCI_VISIBLEFROMDOCLINE">SCI_VISIBLEFROMDOCLINE(int
+    docLine)</a><br />
+     <a class="message" href="#SCI_DOCLINEFROMVISIBLE">SCI_DOCLINEFROMVISIBLE(int
+    displayLine)</a><br />
+     <a class="message" href="#SCI_SHOWLINES">SCI_SHOWLINES(int lineStart, int lineEnd)</a><br />
+     <a class="message" href="#SCI_HIDELINES">SCI_HIDELINES(int lineStart, int lineEnd)</a><br />
+     <a class="message" href="#SCI_GETLINEVISIBLE">SCI_GETLINEVISIBLE(int line)</a><br />
+     <a class="message" href="#SCI_SETFOLDLEVEL">SCI_SETFOLDLEVEL(int line, int level)</a><br />
+     <a class="message" href="#SCI_GETFOLDLEVEL">SCI_GETFOLDLEVEL(int line)</a><br />
+     <a class="message" href="#SCI_SETFOLDFLAGS">SCI_SETFOLDFLAGS(int flags)</a><br />
+     <a class="message" href="#SCI_GETLASTCHILD">SCI_GETLASTCHILD(int line, int level)</a><br />
+     <a class="message" href="#SCI_GETFOLDPARENT">SCI_GETFOLDPARENT(int line)</a><br />
+     <a class="message" href="#SCI_SETFOLDEXPANDED">SCI_SETFOLDEXPANDED(int line, bool
+    expanded)</a><br />
+     <a class="message" href="#SCI_GETFOLDEXPANDED">SCI_GETFOLDEXPANDED(int line)</a><br />
+     <a class="message" href="#SCI_TOGGLEFOLD">SCI_TOGGLEFOLD(int line)</a><br />
+     <a class="message" href="#SCI_ENSUREVISIBLE">SCI_ENSUREVISIBLE(int line)</a><br />
+     <a class="message" href="#SCI_ENSUREVISIBLEENFORCEPOLICY">SCI_ENSUREVISIBLEENFORCEPOLICY(int
+    line)</a><br />
+    </code>
+
+    <p><b id="SCI_VISIBLEFROMDOCLINE">SCI_VISIBLEFROMDOCLINE(int docLine)</b><br />
+     When some lines are folded, then a particular line in the document may be displayed at a
+    different position to its document position. If no lines are folded, this message returns
+    <code>docLine</code>. Otherwise, this returns the display line (counting the very first visible
+    line as 0). The display line of an invisible line is the same as the previous visible line. The
+    display line number of the first line in the document is 0. If there is folding and
+    <code>docLine</code> is outside the range of lines in the document, the return value is -1.
+    Lines can occupy more than one display line if they wrap.</p>
+
+    <p><b id="SCI_DOCLINEFROMVISIBLE">SCI_DOCLINEFROMVISIBLE(int displayLine)</b><br />
+     When some lines are hidden, then a particular line in the document may be displayed at a
+    different position to its document position. This message returns the document line number that
+    corresponds to a display line (counting the display line of the first line in the document as
+    0). If <code>displayLine</code> is less than or equal to 0, the result is 0. If
+    <code>displayLine</code> is greater than or equal to the number of displayed lines, the result
+    is the number of lines in the document.</p>
+
+    <p><b id="SCI_SHOWLINES">SCI_SHOWLINES(int lineStart, int lineEnd)</b><br />
+     <b id="SCI_HIDELINES">SCI_HIDELINES(int lineStart, int lineEnd)</b><br />
+     <b id="SCI_GETLINEVISIBLE">SCI_GETLINEVISIBLE(int line)</b><br />
+     The first two messages mark a range of lines as visible or invisible and then redraw the
+    display. The third message reports on the visible state of a line and returns 1 if it is
+    visible and 0 if it is not visible. These messages have no effect on fold levels or fold
+    flags. The first line can not be hidden.</p>
+
+    <p><b id="SCI_SETFOLDLEVEL">SCI_SETFOLDLEVEL(int line, int level)</b><br />
+     <b id="SCI_GETFOLDLEVEL">SCI_GETFOLDLEVEL(int line)</b><br />
+     These two messages set and get a 32-bit value that contains the fold level of a line and some
+    flags associated with folding. The fold level is a number in the range 0 to
+    <code>SC_FOLDLEVELNUMBERMASK</code> (4095). However, the initial fold level is set to
+    <code>SC_FOLDLEVELBASE</code> (1024) to allow unsigned arithmetic on folding levels. There are
+    two addition flag bits. <code>SC_FOLDLEVELWHITEFLAG</code> indicates that the line is blank and
+    allows it to be treated slightly different then its level may indicate. For example, blank
+    lines should generally not be fold points and will be considered part of the preceding section even though
+    they may have a lesser fold level.
+    <code>SC_FOLDLEVELHEADERFLAG</code> indicates that
+    the line is a header (fold point).</p>
+
+    <p>Use <code>SCI_GETFOLDLEVEL(line) &amp; SC_FOLDLEVELNUMBERMASK</code> to get the fold level
+    of a line. Likewise, use <code>SCI_GETFOLDLEVEL(line) &amp; SC_FOLDLEVEL*FLAG</code> to get the
+    state of the flags. To set the fold level you must or in the associated flags. For instance, to
+    set the level to <code>thisLevel</code> and mark a line as being a fold point use:
+    <code>SCI_SETFOLDLEVEL(line, thisLevel | SC_FOLDLEVELHEADERFLAG)</code>.</p>
+    If you use a lexer, you should not need to use <code>SCI_SETFOLDLEVEL</code> as this is far
+    better handled by the lexer. You will need to use <code>SCI_GETFOLDLEVEL</code> to decide how
+    to handle user folding requests. If you do change the fold levels, the folding margin will
+    update to match your changes.
+
+    <p><b id="SCI_SETFOLDFLAGS">SCI_SETFOLDFLAGS(int flags)</b><br />
+     In addition to showing markers in the folding margin, you can indicate folds to the user by
+    drawing lines in the text area. The lines are drawn in the foreground colour set for <a
+    class="message" href="#StyleDefinition"><code>STYLE_DEFAULT</code></a>. Bits set in
+    <code>flags</code> determine where folding lines are drawn:<br />
+    </p>
+
+    <table cellpadding="1" cellspacing="2" border="0" summary="Fold flags">
+      <tbody>
+        <tr>
+          <th align="center">Value</th>
+
+          <th align="left">Effect</th>
+        </tr>
+      </tbody>
+
+      <tbody valign="top">
+        <tr>
+          <td align="center">1</td>
+
+          <td align="left">Experimental - draw boxes if expanded</td>
+        </tr>
+
+        <tr>
+          <td align="center">2</td>
+
+          <td align="left">Draw above if expanded</td>
+        </tr>
+
+        <tr>
+          <td align="center">4</td>
+
+          <td align="left">Draw above if not expanded</td>
+        </tr>
+
+        <tr>
+          <td align="center">8</td>
+
+          <td align="left">Draw below if expanded</td>
+        </tr>
+
+        <tr>
+          <td align="center">16</td>
+
+          <td align="left">Draw below if not expanded</td>
+        </tr>
+
+        <tr>
+          <td align="center">64</td>
+
+          <td align="left">display hexadecimal fold levels in line margin to aid debugging of
+          folding. This feature needs to be redesigned to be sensible.</td>
+        </tr>
+      </tbody>
+    </table>
+
+    <p>This message causes the display to redraw.</p>
+
+    <p><b id="SCI_GETLASTCHILD">SCI_GETLASTCHILD(int startLine, int level)</b><br />
+     This message searches for the next line after <code>startLine</code>, that has a folding level
+    that is less than or equal to <code>level</code> and then returns the previous line number. If
+    you set <code>level</code> to -1, <code>level</code> is set to the folding level of line
+    <code>startLine</code>. If <code>from</code> is a fold point, <code>SCI_GETLASTCHILD(from,
+    -1)</code> returns the last line that would be in made visible or hidden by toggling the fold
+    state.</p>
+
+    <p><b id="SCI_GETFOLDPARENT">SCI_GETFOLDPARENT(int startLine)</b><br />
+     This message returns the line number of the first line before <code>startLine</code> that is
+    marked as a fold point with <code>SC_FOLDLEVELHEADERFLAG</code> and has a fold level less than
+    the <code>startLine</code>. If no line is found, or if the header flags and fold levels are
+    inconsistent, the return value is -1.</p>
+
+    <p><b id="SCI_TOGGLEFOLD">SCI_TOGGLEFOLD(int line)</b><br />
+     Each fold point may be either expanded, displaying all its child lines, or contracted, hiding
+    all the child lines. This message toggles the folding state of the given line as long as it has
+    the <code>SC_FOLDLEVELHEADERFLAG</code> set. This message takes care of folding or expanding
+    all the lines that depend on the line. The display updates after this message.</p>
+
+    <p><b id="SCI_SETFOLDEXPANDED">SCI_SETFOLDEXPANDED(int line, bool expanded)</b><br />
+     <b id="SCI_GETFOLDEXPANDED">SCI_GETFOLDEXPANDED(int line)</b><br />
+     These messages set and get the expanded state of a single line. The set message has no effect
+    on the visible state of the line or any lines that depend on it. It does change the markers in
+    the folding margin. If you ask for the expansion state of a line that is outside the document,
+    the result is <code>false</code> (0).</p>
+
+    <p>If you just want to toggle the fold state of one line and handle all the lines that are
+    dependent on it, it is much easier to use <code>SCI_TOGGLEFOLD</code>. You would use the
+    <code>SCI_SETFOLDEXPANDED</code> message to process many folds without updating the display
+    until you had finished. See <code>SciTEBase::FoldAll()</code> and
+    <code>SciTEBase::Expand()</code> for examples of the use of these messages.</p>
+
+    <p><b id="SCI_ENSUREVISIBLE">SCI_ENSUREVISIBLE(int line)</b><br />
+     <b id="SCI_ENSUREVISIBLEENFORCEPOLICY">SCI_ENSUREVISIBLEENFORCEPOLICY(int line)</b><br />
+     A line may be hidden because more than one of its parent lines is contracted. Both these
+    message travels up the fold hierarchy, expanding any contracted folds until they reach the top
+    level. The line will then be visible. If you use <code>SCI_ENSUREVISIBLEENFORCEPOLICY</code>,
+    the vertical caret policy set by <a class="message"
+    href="#SCI_SETVISIBLEPOLICY"><code>SCI_SETVISIBLEPOLICY</code></a> is then applied.</p>
+
+    <h2 id="LineWrapping">Line wrapping</h2>
+
+    <code><a class="message" href="#SCI_SETWRAPMODE">SCI_SETWRAPMODE(int wrapMode)</a><br />
+     <a class="message" href="#SCI_GETWRAPMODE">SCI_GETWRAPMODE</a><br />
+     <a class="message" href="#SCI_SETWRAPVISUALFLAGS">SCI_SETWRAPVISUALFLAGS(int wrapVisualFlags)</a><br />
+     <a class="message" href="#SCI_GETWRAPVISUALFLAGS">SCI_GETWRAPVISUALFLAGS</a><br />
+     <a class="message" href="#SCI_SETWRAPVISUALFLAGSLOCATION">SCI_SETWRAPVISUALFLAGSLOCATION(int wrapVisualFlagsLocation)</a><br />
+     <a class="message" href="#SCI_GETWRAPVISUALFLAGSLOCATION">SCI_GETWRAPVISUALFLAGSLOCATION</a><br />
+     <a class="message" href="#SCI_SETWRAPSTARTINDENT">SCI_SETWRAPSTARTINDENT(int indent)</a><br />
+     <a class="message" href="#SCI_GETWRAPSTARTINDENT">SCI_GETWRAPSTARTINDENT</a><br />
+     <a class="message" href="#SCI_SETLAYOUTCACHE">SCI_SETLAYOUTCACHE(int cacheMode)</a><br />
+     <a class="message" href="#SCI_GETLAYOUTCACHE">SCI_GETLAYOUTCACHE</a><br />
+     <a class="message" href="#SCI_SETPOSITIONCACHE">SCI_SETPOSITIONCACHE(int size)</a><br />
+     <a class="message" href="#SCI_GETPOSITIONCACHE">SCI_GETPOSITIONCACHE</a><br />
+     <a class="message" href="#SCI_LINESSPLIT">SCI_LINESSPLIT(int pixelWidth)</a><br />
+     <a class="message" href="#SCI_LINESJOIN">SCI_LINESJOIN</a><br />
+     <a class="message" href="#SCI_WRAPCOUNT">SCI_WRAPCOUNT(int docLine)</a><br />
+    </code>
+
+    <p>By default, Scintilla does not wrap lines of text. If you enable line wrapping, lines wider
+    than the window width are continued on the following lines. Lines are broken after space or tab
+    characters or between runs of different styles. If this is not possible because a word in one
+    style is wider than the window then the break occurs after the last character that completely
+    fits on the line. The horizontal scroll bar does not appear when wrap mode is on.</p>
+
+        <p>For wrapped lines Scintilla can draw visual flags (little arrows) at end of a a subline of a
+        wrapped line and at begin of the next subline. These can be enabled individually, but if Scintilla
+        draws the visual flag at begin of the next subline this subline will be indented by one char.
+        Independent from drawing a visual flag at the begin the subline can have an indention.</p>
+
+    <p>Much of the time used by Scintilla is spent on laying out and drawing text. The same text
+    layout calculations may be performed many times even when the data used in these calculations
+    does not change. To avoid these unnecessary calculations in some circumstances, the line layout
+    cache can store the results of the calculations. The cache is invalidated whenever the
+    underlying data, such as the contents or styling of the document changes. Caching the layout of
+    the whole document has the most effect, making dynamic line wrap as much as 20 times faster but
+    this requires 7 times the memory required by the document contents plus around 80 bytes per
+    line.</p>
+
+    <p>Wrapping is not performed immediately there is a change but is delayed until the display
+    is redrawn. This delay improves peformance by allowing a set of changes to be performed
+    and then wrapped and displayed once. Because of this, some operations may not occur as
+    expected. If a file is read and the scroll position moved to a particular line in the text,
+    such as occurs when a container tries to restore a previous editing session, then
+    the scroll position will have been determined before wrapping so an unexpected range
+    of text will be displayed. To scroll to the position correctly, delay the scroll until the
+    wrapping has been performed by waiting for an initial
+    <a class="message" href="#SCN_PAINTED">SCN_PAINTED</a> notification.</p>
+
+    <p><b id="SCI_SETWRAPMODE">SCI_SETWRAPMODE(int wrapMode)</b><br />
+     <b id="SCI_GETWRAPMODE">SCI_GETWRAPMODE</b><br />
+     Set wrapMode to <code>SC_WRAP_WORD</code> (1) to enable wrapping
+     on word boundaries, <code>SC_WRAP_CHAR</code> (2) to enable wrapping
+     between any characters, and to <code>SC_WRAP_NONE</code> (0) to disable line
+     wrapping. <code>SC_WRAP_CHAR</code> is preferred to
+     <code>SC_WRAP_WORD</code> for Asian languages where there is no white space
+     between words.</p>
+
+
+    <p><b id="SCI_SETWRAPVISUALFLAGS">SCI_SETWRAPVISUALFLAGS(int wrapVisualFlags)</b><br />
+     <b id="SCI_GETWRAPVISUALFLAGS">SCI_GETWRAPVISUALFLAGS</b><br />
+                You can enable the drawing of visual flags to indicate a line is wrapped. Bits set in
+                wrapVisualFlags determine which visual flags are drawn.
+
+    <table cellpadding="1" cellspacing="2" border="0" summary="Wrap visual flags">
+      <tbody>
+        <tr>
+          <th align="left">Symbol</th>
+          <th>Value</th>
+          <th align="left">Effect</th>
+        </tr>
+      </tbody>
+
+      <tbody valign="top">
+        <tr>
+          <td align="left"><code>SC_WRAPVISUALFLAG_NONE</code></td>
+          <td align="center">0</td>
+          <td>No visual flags</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_WRAPVISUALFLAG_END</code></td>
+          <td align="center">1</td>
+          <td>Visual flag at end of subline of a wrapped line.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_WRAPVISUALFLAG_START</code></td>
+          <td align="center">2</td>
+          <td>Visual flag at begin of subline of a wrapped line.<br />
+                                             Subline is indented by at least 1 to make room for the flag.<br />
+                                </td>
+        </tr>
+      </tbody>
+    </table>
+
+    <p><b id="SCI_SETWRAPVISUALFLAGSLOCATION">SCI_SETWRAPVISUALFLAGSLOCATION(int wrapVisualFlagsLocation)</b><br />
+     <b id="SCI_GETWRAPVISUALFLAGSLOCATION">SCI_GETWRAPVISUALFLAGSLOCATION</b><br />
+                You can set wether the visual flags to indicate a line is wrapped are drawn near the border or near the text.
+                Bits set in wrapVisualFlagsLocation set the location to near the text for the corresponding visual flag.
+
+    <table cellpadding="1" cellspacing="2" border="0" summary="Wrap visual flags locations">
+      <tbody>
+        <tr>
+          <th align="left">Symbol</th>
+          <th>Value</th>
+          <th align="left">Effect</th>
+        </tr>
+      </tbody>
+
+      <tbody valign="top">
+        <tr>
+          <td align="left"><code>SC_WRAPVISUALFLAGLOC_DEFAULT</code></td>
+          <td align="center">0</td>
+          <td>Visual flags drawn near border</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_WRAPVISUALFLAGLOC_END_BY_TEXT</code></td>
+          <td align="center">1</td>
+          <td>Visual flag at end of subline drawn near text</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_WRAPVISUALFLAGLOC_START_BY_TEXT</code></td>
+          <td align="center">2</td>
+          <td>Visual flag at begin of subline drawn near text</td>
+        </tr>
+      </tbody>
+    </table>
+    </p>
+
+    <p><b id="SCI_SETWRAPSTARTINDENT">SCI_SETWRAPSTARTINDENT(int indent)</b><br />
+     <b id="SCI_GETWRAPSTARTINDENT">SCI_GETWRAPSTARTINDENT</b><br />
+     <code>SCI_SETWRAPSTARTINDENT</code> sets the size of indentation of sublines for
+                 wrapped lines in terms of the width of a space in
+                <a class="message" href="#StyleDefinition"><code>STYLE_DEFAULT</code></a>.
+                There are no limits on indent sizes, but values        less than 0 or large values may have
+                undesirable effects.<br />
+                The indention of sublines is independent of visual flags, but if
+                <code>SC_WRAPVISUALFLAG_START</code> is set an indent of at least 1 is used.
+     </p>
+
+    <p><b id="SCI_SETLAYOUTCACHE">SCI_SETLAYOUTCACHE(int cacheMode)</b><br />
+     <b id="SCI_GETLAYOUTCACHE">SCI_GETLAYOUTCACHE</b><br />
+     You can set <code>cacheMode</code> to one of the symbols in the table:</p>
+
+    <table cellpadding="1" cellspacing="2" border="0" summary="Line caching styles">
+      <tbody>
+        <tr>
+          <th align="left">Symbol</th>
+
+          <th>Value</th>
+
+          <th align="left">Layout cached for these lines</th>
+        </tr>
+      </tbody>
+
+      <tbody valign="top">
+        <tr>
+          <td align="left"><code>SC_CACHE_NONE</code></td>
+
+          <td align="center">0</td>
+
+          <td>No lines are cached.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_CACHE_CARET</code></td>
+
+          <td align="center">1</td>
+
+          <td>The line containing the text caret. This is the default.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_CACHE_PAGE</code></td>
+
+          <td align="center">2</td>
+
+          <td>Visible lines plus the line containing the caret.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_CACHE_DOCUMENT</code></td>
+
+          <td align="center">3</td>
+
+          <td>All lines in the document.</td>
+        </tr>
+      </tbody>
+    </table>
+    </p>
+
+    <p><b id="SCI_SETPOSITIONCACHE">SCI_SETPOSITIONCACHE(int size)</b><br />
+     <b id="SCI_GETPOSITIONCACHE">SCI_GETPOSITIONCACHE</b><br />
+     The position cache stores position information for short runs of text
+     so that their layout can be determined more quickly if the run recurs.
+     The size in entries of this cache can be set with <code>SCI_SETPOSITIONCACHE</code>.</p>
+
+    <p><b id="SCI_LINESSPLIT">SCI_LINESSPLIT(int pixelWidth)</b><br />
+     Split a range of lines indicated by the target into lines that are at most pixelWidth wide.
+     Splitting occurs on word boundaries wherever possible in a similar manner to line wrapping.
+     When <code>pixelWidth</code> is 0 then the width of the window is used.
+     </p>
+
+    <p><b id="SCI_LINESJOIN">SCI_LINESJOIN</b><br />
+     Join a range of lines indicated by the target into one line by
+     removing line end characters.
+     Where this would lead to no space between words, an extra space is inserted.
+     </p>
+
+    <p><b id="SCI_WRAPCOUNT">SCI_WRAPCOUNT(int docLine)</b><br />
+    Document lines can occupy more than one display line if they wrap and this
+    returns the number of display lines needed to wrap a document line.</p>
+
+    <h2 id="Zooming">Zooming</h2>
+
+    <p>Scintilla incorporates a "zoom factor" that lets you make all the text in the document
+    larger or smaller in steps of one point. The displayed point size never goes below 2, whatever
+    zoom factor you set. You can set zoom factors in the range -10 to +20 points.</p>
+    <code><a class="message" href="#SCI_ZOOMIN">SCI_ZOOMIN</a><br />
+     <a class="message" href="#SCI_ZOOMOUT">SCI_ZOOMOUT</a><br />
+     <a class="message" href="#SCI_SETZOOM">SCI_SETZOOM(int zoomInPoints)</a><br />
+     <a class="message" href="#SCI_GETZOOM">SCI_GETZOOM</a><br />
+    </code>
+
+    <p><b id="SCI_ZOOMIN">SCI_ZOOMIN</b><br />
+     <b id="SCI_ZOOMOUT">SCI_ZOOMOUT</b><br />
+     <code>SCI_ZOOMIN</code> increases the zoom factor by one point if the current zoom factor is
+    less than 20 points. <code>SCI_ZOOMOUT</code> decreases the zoom factor by one point if the
+    current zoom factor is greater than -10 points.</p>
+
+    <p><b id="SCI_SETZOOM">SCI_SETZOOM(int zoomInPoints)</b><br />
+     <b id="SCI_GETZOOM">SCI_GETZOOM</b><br />
+     These messages let you set and get the zoom factor directly. There is no limit set on the
+    factors you can set, so limiting yourself to -10 to +20 to match the incremental zoom functions
+    is a good idea.</p>
+
+    <h2 id="LongLines">Long lines</h2>
+
+    <p>You can choose to mark lines that exceed a given length by drawing a vertical line or by
+    colouring the background of characters that exceed the set length.</p>
+    <code><a class="message" href="#SCI_SETEDGEMODE">SCI_SETEDGEMODE(int mode)</a><br />
+     <a class="message" href="#SCI_GETEDGEMODE">SCI_GETEDGEMODE</a><br />
+     <a class="message" href="#SCI_SETEDGECOLUMN">SCI_SETEDGECOLUMN(int column)</a><br />
+     <a class="message" href="#SCI_GETEDGECOLUMN">SCI_GETEDGECOLUMN</a><br />
+     <a class="message" href="#SCI_SETEDGECOLOUR">SCI_SETEDGECOLOUR(int colour)</a><br />
+     <a class="message" href="#SCI_GETEDGECOLOUR">SCI_GETEDGECOLOUR</a><br />
+    </code>
+
+    <p><b id="SCI_SETEDGEMODE">SCI_SETEDGEMODE(int edgeMode)</b><br />
+     <b id="SCI_GETEDGEMODE">SCI_GETEDGEMODE</b><br />
+     These two messages set and get the mode used to display long lines. You can set one of the
+    values in the table:</p>
+
+    <table cellpadding="1" cellspacing="2" border="0" summary="Long line styles">
+      <tbody>
+        <tr>
+          <th align="left">Symbol</th>
+
+          <th>Value</th>
+
+          <th align="left">Long line display mode</th>
+        </tr>
+      </tbody>
+
+      <tbody valign="top">
+        <tr>
+          <td align="left"><code>EDGE_NONE</code></td>
+
+          <td align="center">0</td>
+
+          <td>Long lines are not marked. This is the default state.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>EDGE_LINE</code></td>
+
+          <td align="center">1</td>
+
+          <td>A vertical line is drawn at the column number set by <code>SCI_SETEDGECOLUMN</code>.
+          This works well for monospaced fonts. The line is drawn at a position based on the width
+          of a space character in <a class="message"
+          href="#StyleDefinition"><code>STYLE_DEFAULT</code></a>, so it may not work very well if
+          your styles use proportional fonts or if your style have varied font sizes or you use a
+          mixture of bold, italic and normal text.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>EDGE_BACKGROUND</code></td>
+
+          <td align="center">2</td>
+
+          <td>The background colour of characters after the column limit is changed to the colour
+          set by <code>SCI_SETEDGECOLOUR</code>. This is recommended for proportional fonts.</td>
+        </tr>
+      </tbody>
+    </table>
+
+    <p><b id="SCI_SETEDGECOLUMN">SCI_SETEDGECOLUMN(int column)</b><br />
+     <b id="SCI_GETEDGECOLUMN">SCI_GETEDGECOLUMN</b><br />
+     These messages set and get the column number at which to display the long line marker. When
+    drawing lines, the column sets a position in units of the width of a space character in
+    <code>STYLE_DEFAULT</code>. When setting the background colour, the column is a character count
+    (allowing for tabs) into the line.</p>
+
+    <p><b id="SCI_SETEDGECOLOUR">SCI_SETEDGECOLOUR(int <a class="jump"
+    href="#colour">colour</a>)</b><br />
+     <b id="SCI_GETEDGECOLOUR">SCI_GETEDGECOLOUR</b><br />
+     These messages set and get the colour of the marker used to show that a line has exceeded the
+    length set by <code>SCI_SETEDGECOLUMN</code>.</p>
+
+    <h2 id="Lexer">Lexer</h2>
+
+    <p>If you define the symbol <code>SCI_LEXER</code> when building Scintilla, (this is sometimes
+    called the SciLexer version of Scintilla), lexing support for a wide range programming
+    languages is included and the messages in this section are supported. If you want to set
+    styling and fold points for an unsupported language you can either do this in the container or
+    better still, write your own lexer following the pattern of one of the existing ones.</p>
+
+    <p>Scintilla also supports external lexers. These are DLLs (on Windows) or .so modules (on GTK+/Linux) that export four
+    functions: <code>GetLexerCount</code>, <code>GetLexerName</code>, <code>Lex</code> and
+    <code>Fold</code>. See <code>externalLexer.cxx</code> for more.</p>
+    <code><a class="message" href="#SCI_SETLEXER">SCI_SETLEXER(int lexer)</a><br />
+     <a class="message" href="#SCI_GETLEXER">SCI_GETLEXER</a><br />
+     <a class="message" href="#SCI_SETLEXERLANGUAGE">SCI_SETLEXERLANGUAGE(&lt;unused&gt;, char
+    *name)</a><br />
+     <a class="message" href="#SCI_LOADLEXERLIBRARY">SCI_LOADLEXERLIBRARY(&lt;unused&gt;, char
+    *path)</a><br />
+     <a class="message" href="#SCI_COLOURISE">SCI_COLOURISE(int start, int end)</a><br />
+     <a class="message" href="#SCI_SETPROPERTY">SCI_SETPROPERTY(const char *key, const char *value)</a><br />
+     <a class="message" href="#SCI_GETPROPERTY">SCI_GETPROPERTY(const char *key, char *value)</a><br />
+     <a class="message" href="#SCI_GETPROPERTYEXPANDED">SCI_GETPROPERTYEXPANDED(const char *key, char *value)</a><br />
+     <a class="message" href="#SCI_GETPROPERTYINT">SCI_GETPROPERTYINT(const char *key, int default)</a><br />
+     <a class="message" href="#SCI_SETKEYWORDS">SCI_SETKEYWORDS(int keyWordSet, const char
+    *keyWordList)</a><br />
+     <a class="message" href="#SCI_GETSTYLEBITSNEEDED">SCI_GETSTYLEBITSNEEDED</a>
+    <br />
+    </code>
+
+    <p><b id="SCI_SETLEXER">SCI_SETLEXER(int lexer)</b><br />
+     <b id="SCI_GETLEXER">SCI_GETLEXER</b><br />
+     You can select the lexer to use with an integer code from the <code>SCLEX_*</code> enumeration
+    in <code>Scintilla.h</code>. There are two codes in this sequence that do not use lexers:
+    <code>SCLEX_NULL</code> to select no lexing action and <code>SCLEX_CONTAINER</code> which sends
+    the <code><a class="message" href="#SCN_STYLENEEDED">SCN_STYLENEEDED</a></code> notification to
+    the container whenever a range of text needs to be styled. You cannot use the
+    <code>SCLEX_AUTOMATIC</code> value; this identifies additional external lexers that Scintilla
+    assigns unused lexer numbers to.</p>
+
+    <p><b id="SCI_SETLEXERLANGUAGE">SCI_SETLEXERLANGUAGE(&lt;unused&gt;, const char *name)</b><br />
+     This message lets you select a lexer by name, and is the only method if you are using an
+    external lexer or if you have written a lexer module for a language of your own and do not wish
+    to assign it an explicit lexer number. To select an existing lexer, set <code>name</code> to
+    match the (case sensitive) name given to the module, for example "ada" or "python", not "Ada"
+    or "Python". To locate the name for the built-in lexers, open the relevant
+    <code>Lex*.cxx</code> file and search for <code>LexerModule</code>. The third argument in the
+    <code>LexerModule</code> constructor is the name to use.</p>
+
+    <p>To test if your lexer assignment worked, use <a class="message"
+    href="#SCI_GETLEXER"><code>SCI_GETLEXER</code></a> before and after setting the new lexer to
+    see if the lexer number changed.</p>
+
+    <p><b id="SCI_LOADLEXERLIBRARY">SCI_LOADLEXERLIBRARY(&lt;unused&gt;, const char *path)</b><br />
+     Load a lexer implemented in a shared library. This is a .so file on GTK+/Linux or a .DLL file on Windows.
+     </p>
+
+    <p><b id="SCI_COLOURISE">SCI_COLOURISE(int startPos, int endPos)</b><br />
+     This requests the current lexer or the container (if the lexer is set to
+    <code>SCLEX_CONTAINER</code>) to style the document between <code>startPos</code> and
+    <code>endPos</code>. If <code>endPos</code> is -1, the document is styled from
+    <code>startPos</code> to the end. If the <code>"fold"</code> property is set to
+    <code>"1"</code> and your lexer or container supports folding, fold levels are also set. This
+    message causes a redraw.</p>
+
+    <p><b id="SCI_SETPROPERTY">SCI_SETPROPERTY(const char *key, const char *value)</b><br />
+     You can communicate settings to lexers with keyword:value string pairs. There is no limit to
+    the number of keyword pairs you can set, other than available memory. <code>key</code> is a
+    case sensitive keyword, <code>value</code> is a string that is associated with the keyword. If
+    there is already a value string associated with the keyword, it is replaced. If you pass a zero
+    length string, the message does nothing. Both <code>key</code> and <code>value</code> are used
+    without modification; extra spaces at the beginning or end of <code>key</code> are
+    significant.</p>
+
+    <p>The <code>value</code> string can refer to other keywords. For example,
+    <code>SCI_SETPROPERTY("foldTimes10", "$(fold)0")</code> stores the string
+    <code>"$(fold)0"</code>, but when this is accessed, the <code>$(fold)</code> is replaced by the
+    value of the <code>"fold"</code> keyword (or by nothing if this keyword does not exist).</p>
+
+    <p>Currently the "fold" property is defined for most of the lexers to set the fold structure if
+    set to "1". <code>SCLEX_PYTHON</code> understands <code>"tab.timmy.whinge.level"</code> as a
+    setting that determines how to indicate bad indentation. Most keywords have values that are
+    interpreted as integers. Search the lexer sources for <code>GetPropertyInt</code> to see how
+    properties are used.</p>
+
+    <p>There is a convention for naming properties used by lexers so that the set of properties can be found by scripts.
+    Property names should start with "lexer.&lt;lexer&gt;." or "fold.&lt;lexer&gt;." when they apply to one
+    lexer or start with "lexer." or "fold." if they apply to multiple lexers.</p>
+
+    <p><b id="SCI_GETPROPERTY">SCI_GETPROPERTY(const char *key, char *value)</b><br />
+    Lookup a keyword:value pair using the specified key; if found, copy the value to the user-supplied
+    buffer and return the length (not including the terminating 0).  If not found, copy an empty string
+    to the buffer and return 0.</p>
+
+    <p>Note that  "keyword replacement" as described in <a class="message" href="#SCI_SETPROPERTY">
+    <code>SCI_SETPROPERTY</code></a> will not be performed.</p>
+
+    <p>If the value argument is 0 then the length that should be allocated to store the value is returned;
+    again, the terminating 0 is not included.</p>
+
+    <p><b id="SCI_GETPROPERTYEXPANDED">SCI_GETPROPERTYEXPANDED(const char *key, char *value)</b><br />
+    Lookup a keyword:value pair using the specified key; if found, copy the value to the user-supplied
+    buffer and return the length (not including the terminating 0).  If not found, copy an empty string
+    to the buffer and return 0.</p>
+
+    <p>Note that  "keyword replacement" as described in <a class="message" href="#SCI_SETPROPERTY">
+    <code>SCI_SETPROPERTY</code></a> will be performed.</p>
+
+    <p>If the value argument is 0 then the length that should be allocated to store the value (including any indicated keyword replacement)
+    is returned; again, the terminating 0 is not included.</p>
+
+    <p><b id="SCI_GETPROPERTYINT">SCI_GETPROPERTYINT(const char *key, int default)</b><br />
+    Lookup a keyword:value pair using the specified key; if found, interpret the value as an integer and return it.
+    If not found (or the value is an empty string) then return the supplied default.  If the keyword:value pair is found but is not
+    a number, then return 0.</p>
+
+    <p>Note that  "keyword replacement" as described in <a class="message" href="#SCI_SETPROPERTY">
+    <code>SCI_SETPROPERTY</code></a> will be performed before any numeric interpretation.</p>
+
+    <p><b id="SCI_SETKEYWORDS">SCI_SETKEYWORDS(int keyWordSet, const char *keyWordList)</b><br />
+     You can set up to 9 lists of keywords for use by the current lexer. This was increased from 6
+    at revision 1.50. <code>keyWordSet</code> can be 0 to 8 (actually 0 to <code>KEYWORDSET_MAX</code>)
+    and selects which keyword list to replace. <code>keyWordList</code> is a list of keywords
+    separated by spaces, tabs, <code>"\n"</code> or <code>"\r"</code> or any combination of these.
+    It is expected that the keywords will be composed of standard ASCII printing characters,
+    but there is nothing to stop you using any non-separator character codes from 1 to 255
+    (except common sense).</p>
+
+    <p>How these keywords are used is entirely up to the lexer. Some languages, such as HTML may
+    contain embedded languages, VBScript and JavaScript are common for HTML. For HTML, key word set
+    0 is for HTML, 1 is for JavaScript and 2 is for VBScript, 3 is for Python, 4 is for PHP and 5
+    is for SGML and DTD keywords. Review the lexer code to see examples of keyword list. A fully
+    conforming lexer sets the fourth argument of the <code>LexerModule</code> constructor to be a
+    list of strings that describe the uses of the keyword lists.</p>
+
+    <p>Alternatively, you might use set 0 for general keywords, set 1 for keywords that cause
+    indentation and set 2 for keywords that cause unindentation. Yet again, you might have a simple
+    lexer that colours keywords and you could change languages by changing the keywords in set 0.
+    There is nothing to stop you building your own keyword lists into the lexer, but this means
+    that the lexer must be rebuilt if more keywords are added.</p>
+
+    <p><b id="SCI_GETSTYLEBITSNEEDED">SCI_GETSTYLEBITSNEEDED</b><br />
+     Retrieve the number of bits the current lexer needs for styling. This should normally be the argument
+     to <a class="message" href="#SCI_SETSTYLEBITS">SCI_SETSTYLEBITS</a>.
+     </p>
+
+    <h2 id="Notifications">Notifications</h2>
+
+    <p>Notifications are sent (fired) from the Scintilla control to its container when an event has
+    occurred that may interest the container. Notifications are sent using the
+    <code>WM_NOTIFY</code> message on Windows and the "notify" signal on GTK+. The container is
+    passed a <code>SCNotification</code> structure containing information about the event.</p>
+<pre id="SCNotification">
+struct NotifyHeader {   // This matches the Win32 NMHDR structure
+    void *hwndFrom;     // environment specific window handle/pointer
+    uptr_t idFrom;        // CtrlID of the window issuing the notification
+    unsigned int code;  // The SCN_* notification code
+};
+
+struct SCNotification {
+    struct NotifyHeader nmhdr;
+    int position;
+    // SCN_STYLENEEDED, SCN_DOUBLECLICK, SCN_MODIFIED, SCN_DWELLSTART,
+    // SCN_DWELLEND, SCN_CALLTIPCLICK,
+    // SCN_HOTSPOTCLICK, SCN_HOTSPOTDOUBLECLICK
+    int ch;             // SCN_CHARADDED, SCN_KEY
+    int modifiers;      // SCN_KEY, SCN_DOUBLECLICK, SCN_HOTSPOTCLICK, SCN_HOTSPOTDOUBLECLICK
+    int modificationType; // SCN_MODIFIED
+    const char *text;   // SCN_MODIFIED, SCN_USERLISTSELECTION, SCN_AUTOCSELECTION
+    int length;         // SCN_MODIFIED
+    int linesAdded;     // SCN_MODIFIED
+    int message;        // SCN_MACRORECORD
+    uptr_t wParam;      // SCN_MACRORECORD
+    sptr_t lParam;      // SCN_MACRORECORD
+    int line;           // SCN_MODIFIED, SCN_DOUBLECLICK
+    int foldLevelNow;   // SCN_MODIFIED
+    int foldLevelPrev;  // SCN_MODIFIED
+    int margin;         // SCN_MARGINCLICK
+    int listType;       // SCN_USERLISTSELECTION, SCN_AUTOCSELECTION
+    int x;              // SCN_DWELLSTART, SCN_DWELLEND
+    int y;              // SCN_DWELLSTART, SCN_DWELLEND
+};
+</pre>
+
+    <p>The notification messages that your container can choose to handle and the messages
+    associated with them are:</p>
+    <code><a class="message" href="#SCN_STYLENEEDED">SCN_STYLENEEDED</a><br />
+     <a class="message" href="#SCN_CHARADDED">SCN_CHARADDED</a><br />
+     <a class="message" href="#SCN_SAVEPOINTREACHED">SCN_SAVEPOINTREACHED</a><br />
+     <a class="message" href="#SCN_SAVEPOINTLEFT">SCN_SAVEPOINTLEFT</a><br />
+     <a class="message" href="#SCN_MODIFYATTEMPTRO">SCN_MODIFYATTEMPTRO</a><br />
+     <a class="message" href="#SCN_KEY">SCN_KEY</a><br />
+     <a class="message" href="#SCN_DOUBLECLICK">SCN_DOUBLECLICK</a><br />
+     <a class="message" href="#SCN_UPDATEUI">SCN_UPDATEUI</a><br />
+     <a class="message" href="#SCN_MODIFIED">SCN_MODIFIED</a><br />
+     <a class="message" href="#SCN_MACRORECORD">SCN_MACRORECORD</a><br />
+     <a class="message" href="#SCN_MARGINCLICK">SCN_MARGINCLICK</a><br />
+     <a class="message" href="#SCN_NEEDSHOWN">SCN_NEEDSHOWN</a><br />
+     <a class="message" href="#SCN_PAINTED">SCN_PAINTED</a><br />
+     <a class="message" href="#SCN_USERLISTSELECTION">SCN_USERLISTSELECTION</a><br />
+     <a class="message" href="#SCN_URIDROPPED">SCN_URIDROPPED</a><br />
+     <a class="message" href="#SCN_DWELLSTART">SCN_DWELLSTART</a><br />
+     <a class="message" href="#SCN_DWELLEND">SCN_DWELLEND</a><br />
+     <a class="message" href="#SCN_ZOOM">SCN_ZOOM</a><br />
+     <a class="message" href="#SCN_HOTSPOTCLICK">SCN_HOTSPOTCLICK</a><br />
+     <a class="message" href="#SCN_HOTSPOTDOUBLECLICK">SCN_HOTSPOTDOUBLECLICK</a><br />
+     <a class="message" href="#SCN_INDICATORCLICK">SCN_INDICATORCLICK</a><br />
+     <a class="message" href="#SCN_INDICATORRELEASE">SCN_INDICATORRELEASE</a><br />
+     <a class="message" href="#SCN_CALLTIPCLICK">SCN_CALLTIPCLICK</a><br />
+     <a class="message" href="#SCN_AUTOCSELECTION">SCN_AUTOCSELECTION</a><br />
+     <a class="message" href="#SCN_AUTOCCANCELLED">SCN_AUTOCCANCELLED</a><br />
+    </code>
+
+    <p>The following <code>SCI_*</code> messages are associated with these notifications:</p>
+    <code><a class="message" href="#SCI_SETMODEVENTMASK">SCI_SETMODEVENTMASK(int
+    eventMask)</a><br />
+     <a class="message" href="#SCI_GETMODEVENTMASK">SCI_GETMODEVENTMASK</a><br />
+     <a class="message" href="#SCI_SETMOUSEDWELLTIME">SCI_SETMOUSEDWELLTIME</a><br />
+     <a class="message" href="#SCI_GETMOUSEDWELLTIME">SCI_GETMOUSEDWELLTIME</a><br />
+    </code>
+
+    <p>The following additional notifications are sent using the <code>WM_COMMAND</code> message on
+    Windows and the "Command" signal on GTK+. This emulates the Windows Edit control. Only the lower
+    16 bits of the control's ID is passed in these notifications.</p>
+    <code><a class="message" href="#SCEN_CHANGE">SCEN_CHANGE</a><br />
+     <a class="message" href="#SCEN_SETFOCUS">SCEN_SETFOCUS</a><br />
+     <a class="message" href="#SCEN_KILLFOCUS">SCEN_KILLFOCUS</a><br />
+    </code>
+
+    <p><b id="SCN_STYLENEEDED">SCN_STYLENEEDED</b><br />
+     If you used <code><a class="message"
+    href="#SCI_SETLEXER">SCI_SETLEXER</a>(SCLEX_CONTAINER)</code> to make the container act as the
+    lexer, you will receive this notification when Scintilla is about to display or print text that
+    requires styling. You are required to style the text from the line that contains the position
+    returned by <a class="message" href="#SCI_GETENDSTYLED"><code>SCI_GETENDSTYLED</code></a> up to
+    the position passed in <code>SCNotification.position</code>. Symbolically, you need code of the
+    form:</p>
+<pre>
+    startPos = <a class="message" href="#SCI_GETENDSTYLED">SCI_GETENDSTYLED</a>()
+    lineNumber = <a class="message"
+href="#SCI_LINEFROMPOSITION">SCI_LINEFROMPOSITION</a>(startPos);
+    startPos = <a class="message"
+href="#SCI_POSITIONFROMLINE">SCI_POSITIONFROMLINE</a>(lineNumber);
+    MyStyleRoutine(startPos, SCNotification.position);
+</pre>
+
+    <p><b id="SCN_CHARADDED">SCN_CHARADDED</b><br />
+     This is sent when the user types an ordinary text character (as opposed to a command
+    character) that is entered into the text. The container can use this to decide to display a <a
+    class="jump" href="#CallTips">call tip</a> or an <a class="jump" href="#Autocompletion">auto
+    completion list</a>. The character is in <code>SCNotification.ch</code>.
+        This notification is sent before the character has been styled so processing that depends on
+        styling should instead be performed in the SCN_UPDATEUI notification.</p>
+
+    <p><b id="SCN_SAVEPOINTREACHED">SCN_SAVEPOINTREACHED</b><br />
+     <b id="SCN_SAVEPOINTLEFT">SCN_SAVEPOINTLEFT</b><br />
+     Sent to the container when the save point is entered or left, allowing the container to
+    display a "document dirty" indicator and change its menus.<br />
+     See also: <a class="message" href="#SCI_SETSAVEPOINT"><code>SCI_SETSAVEPOINT</code></a>, <a
+    class="message" href="#SCI_GETMODIFY"><code>SCI_GETMODIFY</code></a></p>
+
+    <p><b id="SCN_MODIFYATTEMPTRO">SCN_MODIFYATTEMPTRO</b><br />
+     When in read-only mode, this notification is sent to the container if the user tries to change
+    the text. This can be used to check the document out of a version control system. You can set
+    the read-only state of a document with <code><a class="message"
+    href="#SCI_SETREADONLY">SCI_SETREADONLY</a></code>.</p>
+
+    <p><b id="SCN_KEY">SCN_KEY</b><br />
+     Reports all keys pressed but not consumed by Scintilla. Used on GTK+ because of
+     some problems with keyboard focus and is not sent by the Windows version. <code>SCNotification.ch</code> holds the key code and
+    <code>SCNotification.modifiers</code> holds the modifiers. This notification is sent if the
+    modifiers include <code>SCMOD_ALT</code> or <code>SCMOD_CTRL</code> and the key code is less
+    than 256.</p>
+
+    <p><b id="SCN_DOUBLECLICK">SCN_DOUBLECLICK</b><br />
+     The mouse button was double clicked in editor. The <code>position</code> field is set to the text position of the
+    double click and the <code>line</code> field is set to the line of the double click.</p>
+
+    <p><b id="SCN_UPDATEUI">SCN_UPDATEUI</b><br />
+     Either the text or styling of the document has changed or the selection range has changed. Now
+    would be a good time to update any container UI elements that depend on document or view state.
+    This was previously called <code><a class="message"
+    href="#SCN_CHECKBRACE">SCN_CHECKBRACE</a></code> because a common use is to check whether the
+    caret is next to a brace and set highlights on this brace and its corresponding matching brace.
+    This also replaces <a class="message" href="#SCN_POSCHANGED"><code>SCN_POSCHANGED</code></a>,
+    which is now deprecated.</p>
+
+    <p><b id="SCN_MODIFIED">SCN_MODIFIED</b><br />
+     This notification is sent when the text or styling of the document changes or is about to
+    change. You can set a mask for the notifications that are sent to the container with <a
+    class="message" href="#SCI_SETMODEVENTMASK"><code>SCI_SETMODEVENTMASK</code></a>. The
+    notification structure contains information about what changed, how the change occurred and
+    whether this changed the number of lines in the document. No modifications may be performed
+    while in a <code>SCN_MODIFIED</code> event. The <code>SCNotification</code> fields used
+    are:</p>
+
+    <table cellpadding="1" cellspacing="2" border="0" summary="Modify notification types">
+      <tbody>
+        <tr>
+          <th align="left">Field</th>
+
+          <th align="left">Usage</th>
+        </tr>
+      </tbody>
+
+      <tbody valign="top">
+        <tr>
+          <td align="left"><code>modificationType</code></td>
+
+          <td align="left">A set of flags that identify the change(s) made. See the next
+          table.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>position</code></td>
+
+          <td align="left">Start position of a text or styling change. Set to 0 if not used.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>length</code></td>
+
+          <td align="left">Length of the change in cells or characters when the text or styling
+          changes. Set to 0 if not used.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>linesAdded</code></td>
+
+          <td align="left">Number of added lines. If negative, the number of deleted lines. Set to
+          0 if not used or no lines added or deleted.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>text</code></td>
+
+          <td align="left">Valid for text changes, not for style changes. If we are collecting undo
+          information this holds a pointer to the text that is handed to the Undo system, otherwise
+          it is zero. For user performed SC_MOD_BEFOREDELETE the text field is 0 and
+                  for user performed SC_MOD_BEFOREINSERT the text field points to an array of cells,
+                   not bytes and the length is the number of cells.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>line</code></td>
+
+          <td align="left">The line number at which a fold level or marker change occurred. This is
+          0 if unused and may be -1 if more than one line changed.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>foldLevelNow</code></td>
+
+          <td align="left">The new fold level applied to the line or 0 if this field is
+          unused.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>foldLevelPrev</code></td>
+
+          <td align="left">The previous folding level of the line or 0 if this field is
+          unused.</td>
+        </tr>
+      </tbody>
+    </table>
+
+    <p>The <code>SCNotification.modificationType</code> field has bits set to tell you what has
+    been done. The <code>SC_MOD_*</code> bits correspond to actions. The
+    <code>SC_PERFORMED_*</code> bits tell you if the action was done by the user, or the result of
+    Undo or Redo of a previous action.</p>
+
+    <table cellpadding="1" cellspacing="2" border="0" summary="Modify notification type flags">
+      <tbody>
+        <tr>
+          <th align="left">Symbol</th>
+
+          <th>Value</th>
+
+          <th align="left">Meaning</th>
+
+          <th align="left">SCNotification fields</th>
+        </tr>
+      </tbody>
+
+      <tbody valign="top">
+        <tr>
+          <td align="left"><code>SC_MOD_INSERTTEXT</code></td>
+
+          <td align="center">0x01</td>
+
+          <td>Text has been inserted into the document.</td>
+
+          <td><code>position, length, text, linesAdded</code></td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_MOD_DELETETEXT</code></td>
+
+          <td align="center">0x02</td>
+
+          <td>Text has been removed from the document.</td>
+
+          <td><code>position, length, text, linesAdded</code></td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_MOD_CHANGESTYLE</code></td>
+
+          <td align="center">0x04</td>
+
+          <td>A style change has occurred.</td>
+
+          <td><code>position, length</code></td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_MOD_CHANGEFOLD</code></td>
+
+          <td align="center">0x08</td>
+
+          <td>A folding change has occurred.</td>
+
+          <td><code>line, foldLevelNow, foldLevelPrev</code></td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_PERFORMED_USER</code></td>
+
+          <td align="center">0x10</td>
+
+          <td>Information: the operation was done by the user.</td>
+
+          <td>None</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_PERFORMED_UNDO</code></td>
+
+          <td align="center">0x20</td>
+
+          <td>Information: this was the result of an Undo.</td>
+
+          <td>None</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_PERFORMED_REDO</code></td>
+
+          <td align="center">0x40</td>
+
+          <td>Information: this was the result of a Redo.</td>
+
+          <td>None</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_MULTISTEPUNDOREDO</code></td>
+
+          <td align="center">0x80</td>
+
+          <td>This is part of a multi-step Undo or Redo transaction.</td>
+
+          <td>None</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_LASTSTEPINUNDOREDO</code></td>
+
+          <td align="center">0x100</td>
+
+          <td>This is the final step in an Undo or Redo transaction.</td>
+
+          <td>None</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_MOD_CHANGEMARKER</code></td>
+
+          <td align="center">0x200</td>
+
+          <td>One or more markers has changed in a line.</td>
+
+          <td><code>line</code></td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_MOD_BEFOREINSERT</code></td>
+
+          <td align="center">0x400</td>
+
+          <td>Text is about to be inserted into the document.</td>
+
+          <td><code>position, if performed by user then text in cells, length in cells</code></td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_MOD_BEFOREDELETE</code></td>
+
+          <td align="center">0x800</td>
+
+          <td>Text is about to be deleted from the document.</td>
+
+          <td><code>position, length</code></td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_MOD_CHANGEINDICATOR</code></td>
+
+          <td align="center">0x4000</td>
+
+          <td>An indicator has been added or removed from a range of text.</td>
+
+          <td><code>position, length</code></td>
+        </tr>
+
+        <tr>
+          <td align="left"><code id="SC_MOD_CHANGELINESTATE">SC_MOD_CHANGELINESTATE</code></td>
+
+          <td align="center">0x8000</td>
+
+          <td>A line state has changed because <a class="message" href="#SCI_SETLINESTATE">SCI_SETLINESTATE</a>
+          was called.</td>
+
+          <td><code>line</code></td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_MULTILINEUNDOREDO</code></td>
+
+          <td align="center">0x1000</td>
+
+          <td>This is part of an Undo or Redo with multi-line changes.</td>
+
+          <td>None</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_STARTACTION</code></td>
+
+          <td align="center">0x2000</td>
+
+          <td>This is set on a SC_PERFORMED_USER action when it is the
+          first or only step in an undo transaction. This can be used to integrate the Scintilla
+          undo stack with an undo stack in the container application by adding a Scintilla
+          action to the container's stack for the currently opened container transaction or
+          to open a new container transaction if there is no open container transaction.
+          </td>
+
+          <td>None</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_MODEVENTMASKALL</code></td>
+
+          <td align="center">0x1fff</td>
+
+          <td>This is a mask for all valid flags. This is the default mask state set by <a
+          class="message" href="#SCI_SETMODEVENTMASK"><code>SCI_SETMODEVENTMASK</code></a>.</td>
+
+          <td>None</td>
+        </tr>
+      </tbody>
+    </table>
+
+    <p><b id="SCEN_CHANGE">SCEN_CHANGE</b><br />
+     <code>SCEN_CHANGE</code> (768) is fired when the text (not the style) of the document changes.
+    This notification is sent using the <code>WM_COMMAND</code> message on Windows and the
+    "Command" signal on GTK+ as this is the behavior of the standard Edit control
+    (<code>SCEN_CHANGE</code> has the same value as the Windows Edit control
+    <code>EN_CHANGE</code>). No other information is sent. If you need more detailed information
+    use <a class="message" href="#SCN_MODIFIED"><code>SCN_MODIFIED</code></a>. You can filter the
+    types of changes you are notified about with <a class="message"
+    href="#SCI_SETMODEVENTMASK"><code>SCI_SETMODEVENTMASK</code></a>.</p>
+
+    <p><b id="SCI_SETMODEVENTMASK">SCI_SETMODEVENTMASK(int eventMask)</b><br />
+     <b id="SCI_GETMODEVENTMASK">SCI_GETMODEVENTMASK</b><br />
+     These messages set and get an event mask that determines which document change events are
+    notified to the container with <a class="message"
+    href="#SCN_MODIFIED"><code>SCN_MODIFIED</code></a> and <a class="message"
+    href="#SCEN_CHANGE"><code>SCEN_CHANGE</code></a>. For example, a container may decide to see
+    only notifications about changes to text and not styling changes by calling
+    <code>SCI_SETMODEVENTMASK(SC_MOD_INSERTTEXT|SC_MOD_DELETETEXT)</code>.</p>
+
+    <p>The possible notification types are the same as the <code>modificationType</code> bit flags
+    used by <code>SCN_MODIFIED</code>: <code>SC_MOD_INSERTTEXT</code>,
+    <code>SC_MOD_DELETETEXT</code>, <code>SC_MOD_CHANGESTYLE</code>,
+    <code>SC_MOD_CHANGEFOLD</code>, <code>SC_PERFORMED_USER</code>, <code>SC_PERFORMED_UNDO</code>,
+    <code>SC_PERFORMED_REDO</code>, <code>SC_MULTISTEPUNDOREDO</code>,
+    <code>SC_LASTSTEPINUNDOREDO</code>, <code>SC_MOD_CHANGEMARKER</code>,
+    <code>SC_MOD_BEFOREINSERT</code>, <code>SC_MOD_BEFOREDELETE</code>,
+    <code>SC_MULTILINEUNDOREDO</code>, and <code>SC_MODEVENTMASKALL</code>.</p>
+
+    <p><b id="SCEN_SETFOCUS">SCEN_SETFOCUS</b><br />
+     <b id="SCEN_KILLFOCUS">SCEN_KILLFOCUS</b><br />
+     <code>SCEN_SETFOCUS</code> (512) is fired when Scintilla receives focus and
+    <code>SCEN_KILLFOCUS</code> (256) when it loses focus. These notifications are sent using the
+    <code>WM_COMMAND</code> message on Windows and the "Command" signal on GTK+ as this is the
+    behavior of the standard Edit control. Unfortunately, these codes do not match the Windows Edit
+    notification codes <code>EN_SETFOCUS</code> (256) and <code>EN_KILLFOCUS</code> (512). It is
+    now too late to change the Scintilla codes as clients depend on the current values.</p>
+
+    <p><b id="SCN_MACRORECORD">SCN_MACRORECORD</b><br />
+     The <code><a class="message" href="#SCI_STARTRECORD">SCI_STARTRECORD</a></code> and <a
+    class="message" href="#SCI_STOPRECORD"><code>SCI_STOPRECORD</code></a> messages enable and
+    disable macro recording. When enabled, each time a recordable change occurs, the
+    <code>SCN_MACRORECORD</code> notification is sent to the container. It is up to the container
+    to record the action. To see the complete list of <code>SCI_*</code> messages that are
+    recordable, search the Scintilla source <code>Editor.cxx</code> for
+    <code>Editor::NotifyMacroRecord</code>. The fields of <code>SCNotification</code> set in this
+    notification are:</p>
+
+    <table cellpadding="1" cellspacing="2" border="0" summary="Macro record notification data">
+      <tbody>
+        <tr>
+          <th align="left">Field</th>
+
+          <th align="left">Usage</th>
+        </tr>
+      </tbody>
+
+      <tbody valign="top">
+        <tr>
+          <td align="left"><code>message</code></td>
+
+          <td align="left">The <code>SCI_*</code> message that caused the notification.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>wParam</code></td>
+
+          <td align="left">The value of <code>wParam</code> in the <code>SCI_*</code> message.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>lParam</code></td>
+
+          <td align="left">The value of <code>lParam</code> in the <code>SCI_*</code> message.</td>
+        </tr>
+      </tbody>
+    </table>
+
+    <p><b id="SCN_MARGINCLICK">SCN_MARGINCLICK</b><br />
+     This notification tells the container that the mouse was clicked inside a <a class="jump"
+    href="#Margins">margin</a> that was marked as sensitive (see <a class="message"
+    href="#SCI_SETMARGINSENSITIVEN"><code>SCI_SETMARGINSENSITIVEN</code></a>). This can be used to
+    perform folding or to place breakpoints. The following <code>SCNotification</code> fields are
+    used:</p>
+
+    <table cellpadding="1" cellspacing="2" border="0" summary="Margin click notification">
+      <tbody>
+        <tr>
+          <th align="left">Field</th>
+
+          <th align="left">Usage</th>
+        </tr>
+      </tbody>
+
+      <tbody valign="top">
+        <tr>
+          <td align="left"><code>modifiers</code></td>
+
+          <td align="left">The appropriate combination of <code>SCI_SHIFT</code>,
+          <code>SCI_CTRL</code> and <code>SCI_ALT</code> to indicate the keys that were held down
+          at the time of the margin click.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>position</code></td>
+
+          <td align="left">The position of the start of the line in the document that corresponds
+          to the margin click.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>margin</code></td>
+
+          <td align="left">The margin number that was clicked.</td>
+        </tr>
+      </tbody>
+    </table>
+
+    <p><b id="SCN_NEEDSHOWN">SCN_NEEDSHOWN</b><br />
+     Scintilla has determined that a range of lines that is currently invisible should be made
+    visible. An example of where this may be needed is if the end of line of a contracted fold
+    point is deleted. This message is sent to the container in case it wants to make the line
+    visible in some unusual way such as making the whole document visible. Most containers will
+    just ensure each line in the range is visible by calling <a class="message"
+    href="#SCI_ENSUREVISIBLE"><code>SCI_ENSUREVISIBLE</code></a>. The <code>position</code> and
+    <code>length</code> fields of <code>SCNotification</code> indicate the range of the document
+    that should be made visible. The container code will be similar to the following code
+    skeleton:</p>
+<pre>
+firstLine = SCI_LINEFROMPOSITION(scn.position)
+lastLine = SCI_LINEFROMPOSITION(scn.position+scn.length-1)
+for line = lineStart to lineEnd do SCI_ENSUREVISIBLE(line) next
+</pre>
+
+    <p><b id="SCN_PAINTED">SCN_PAINTED</b><br />
+     Painting has just been done. Useful when you want to update some other widgets based on a
+    change in Scintilla, but want to have the paint occur first to appear more responsive. There is
+    no other information in <code>SCNotification</code>.</p>
+
+    <p><b id="SCN_USERLISTSELECTION">SCN_USERLISTSELECTION</b><br />
+     The user has selected an item in a <a class="jump" href="#UserLists">user list</a>. The
+    <code>SCNotification</code> fields used are:</p>
+
+    <table cellpadding="1" cellspacing="2" border="0" summary="User list notification">
+      <tbody>
+        <tr>
+          <th align="left">Field</th>
+
+          <th align="left">Usage</th>
+        </tr>
+      </tbody>
+
+      <tbody valign="top">
+        <tr>
+          <td align="left"><code>wParam</code></td>
+
+          <td align="left">This is set to the <code>listType</code> parameter from the <a
+          class="message" href="#SCI_USERLISTSHOW"><code>SCI_USERLISTSHOW</code></a> message that
+          initiated the list.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>text</code></td>
+
+          <td align="left">The text of the selection.</td>
+        </tr>
+      </tbody>
+    </table>
+    <br />
+     <br />
+
+
+    <p><b id="SCN_URIDROPPED">SCN_URIDROPPED</b><br />
+     Only on the GTK+ version. Indicates that the user has dragged a URI such as a file name or Web
+    address onto Scintilla. The container could interpret this as a request to open the file. The
+    <code>text</code> field of <code>SCNotification</code> points at the URI text.</p>
+
+    <p><b id="SCN_DWELLSTART">SCN_DWELLSTART</b><br />
+     <b id="SCN_DWELLEND">SCN_DWELLEND</b><br />
+     <code>SCN_DWELLSTART</code> is generated when the user keeps the mouse in one position for the
+    dwell period (see <code><a class="message"
+    href="#SCI_SETMOUSEDWELLTIME">SCI_SETMOUSEDWELLTIME</a></code>). <code>SCN_DWELLEND</code> is
+    generated after a <code>SCN_DWELLSTART</code> and the mouse is moved or other activity such as
+    key press indicates the dwell is over. Both notifications set the same fields in
+    <code>SCNotification</code>:</p>
+
+    <table cellpadding="1" cellspacing="2" border="0" summary="Mouse dwell notification">
+      <tbody>
+        <tr>
+          <th align="left">Field</th>
+
+          <th align="left">Usage</th>
+        </tr>
+      </tbody>
+
+      <tbody valign="top">
+        <tr>
+          <td align="left"><code>position</code></td>
+
+          <td align="left">This is the nearest position in the document to the position where the
+          mouse pointer was lingering.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>x, y</code></td>
+
+          <td align="left">Where the pointer lingered. The <code>position</code> field is set to
+          <code><a class="message"
+          href="#SCI_POSITIONFROMPOINTCLOSE">SCI_POSITIONFROMPOINTCLOSE</a>(x, y)</code>.</td>
+        </tr>
+      </tbody>
+    </table>
+    <br />
+     <br />
+
+    <p><b id="SCI_SETMOUSEDWELLTIME">SCI_SETMOUSEDWELLTIME</b><br />
+     <b id="SCI_GETMOUSEDWELLTIME">SCI_GETMOUSEDWELLTIME</b><br />
+     These two messages set and get the time the mouse must sit still, in milliseconds, to generate
+    a <code><a class="message" href="#SCN_DWELLSTART">SCN_DWELLSTART</a></code> notification. If
+    set to <code>SC_TIME_FOREVER</code>, the default, no dwell events are generated.</p>
+
+    <p><b id="SCN_ZOOM">SCN_ZOOM</b><br />
+     This notification is generated when the user zooms the display using the keyboard or the
+    <code><a class="message" href="#SCI_SETZOOM">SCI_SETZOOM</a></code> method is called. This
+    notification can be used to recalculate positions, such as the width of the line number margin
+    to maintain sizes in terms of characters rather than pixels. <code>SCNotification</code> has no
+    additional information.</p>
+
+    <p>
+    <b id="SCN_HOTSPOTCLICK">SCN_HOTSPOTCLICK</b><br />
+    <b id="SCN_HOTSPOTDOUBLECLICK">SCN_HOTSPOTDOUBLECLICK</b><br />
+     These notifications are generated when the user clicks or double clicks on
+     text that is in a style with the hotspot attribute set.
+    This notification can be used to link to variable definitions or web pages.
+    The <code>position</code> field is set the text position of the click or
+    double click and the <code>modifiers</code> field set to the key modifiers
+    held down in a similar manner to <a class="message" href="#SCN_KEY">SCN_KEY</a>.</p>
+
+    <p>
+    <b id="SCN_INDICATORCLICK">SCN_INDICATORCLICK</b><br />
+    <b id="SCN_INDICATORRELEASE">SCN_INDICATORRELEASE</b><br />
+     These notifications are generated when the user clicks or releases the mouse on
+     text that has an indicator.
+    The <code>position</code> field is set the text position of the click or
+    double click and the <code>modifiers</code> field set to the key modifiers
+    held down in a similar manner to <a class="message" href="#SCN_KEY">SCN_KEY</a>.</p>
+
+    <p><b id="SCN_CALLTIPCLICK">SCN_CALLTIPCLICK</b><br />
+     This notification is generated when the user clicks on a calltip.
+    This notification can be used to display the next function prototype when a
+    function name is overloaded with different arguments.
+    The <code>position</code> field is set to 1 if the click is in an up arrow,
+    2 if in a down arrow, and 0 if elsewhere.</p>
+
+    <p><b id="SCN_AUTOCSELECTION">SCN_AUTOCSELECTION</b><br />
+     The user has selected an item in an <a class="jump" href="#Autocompletion">autocompletion list</a>. The
+     notification is sent before the selection is inserted. Automatic insertion can be cancelled by sending a
+     <code><a class="message" href="#SCI_AUTOCCANCEL">SCI_AUTOCCANCEL</a></code> message
+     before returning from the notification. The <code>SCNotification</code> fields used are:</p>
+
+    <table cellpadding="1" cellspacing="2" border="0" summary="Autocompletion list notification">
+      <tbody>
+        <tr>
+          <th align="left">Field</th>
+
+          <th align="left">Usage</th>
+        </tr>
+      </tbody>
+
+      <tbody valign="top">
+        <tr>
+          <td align="left"><code>lParam</code></td>
+
+          <td align="left">The start position of the word being completed.</td>
+        </tr>
+        <tr>
+          <td align="left"><code>text</code></td>
+
+          <td align="left">The text of the selection.</td>
+        </tr>
+      </tbody>
+    </table>
+
+    <p><b id="SCN_AUTOCCANCELLED">SCN_AUTOCCANCELLED</b><br />
+     The user has cancelled an <a class="jump" href="#Autocompletion">autocompletion list</a>.
+     There is no other information in SCNotification.
+
+    <h2 id="GTK">GTK+</h2>
+    <p>On GTK+, the following functions create a Scintilla widget, communicate with it and allow
+    resources to be released after all Scintilla widgets have been destroyed.</p>
+    <code><a class="message" href="#scintilla_new">GtkWidget *scintilla_new()</a><br />
+     <a class="message" href="#scintilla_set_id">void scintilla_set_id(ScintillaObject *sci, uptr_t id)</a><br />
+     <a class="message" href="#scintilla_send_message">sptr_t scintilla_send_message(ScintillaObject *sci,unsigned int iMessage, uptr_t wParam, sptr_t lParam)</a><br />
+     <a class="message" href="#scintilla_release_resources">void scintilla_release_resources()</a><br />
+     </code>
+
+    <p><b id="scintilla_new">GtkWidget *scintilla_new()</b></b><br />
+    Create a new Scintilla widget. The returned pointer can be added to a container and displayed in the same way as other
+    widgets.</p>
+
+    <p><b id="scintilla_set_id">void scintilla_set_id(ScintillaObject *sci, uptr_t id)</b></b><br />
+    Set the control ID which will be used in the idFrom field of the NotifyHeader structure of all
+    notifications for this instance. When an application creates multiple Scintilla widgets, this allows
+    the source of each notification to be found. The value should be small, preferrably less than 16 bits,
+    rather than a pointer as some of the functions will only transmit 16 or 32 bits.</p>
+
+    <p><b id="scintilla_send_message">sptr_t scintilla_send_message(ScintillaObject *sci,unsigned int iMessage, uptr_t wParam, sptr_t lParam)</b><br />
+    The main entry point allows sending any of the messages described in this document.</p>
+
+    <p><b id="scintilla_release_resources">void scintilla_release_resources()</b><br />
+    Call this to free any remaining resources after all the Scintilla widgets have been destroyed.</p>
+
+    <h2 id="DeprecatedMessages">Deprecated messages and notifications</h2>
+
+    <p>The following messages are currently supported to emulate existing Windows controls, but
+    they will be removed in future versions of Scintilla. If you use these messages you should
+    replace them with the Scintilla equivalent.</p>
+<pre>
+WM_GETTEXT(int length, char *text)
+WM_SETTEXT(&lt;unused&gt;, const char *text)
+EM_GETLINE(int line, char *text)
+EM_REPLACESEL(&lt;unused&gt;, const char *text)
+EM_SETREADONLY
+EM_GETTEXTRANGE(&lt;unused&gt;, TEXTRANGE *tr)
+WM_CUT
+WM_COPY
+WM_PASTE
+WM_CLEAR
+WM_UNDO
+EM_CANUNDO
+EM_EMPTYUNDOBUFFER
+WM_GETTEXTLENGTH
+EM_GETFIRSTVISIBLELINE
+EM_GETLINECOUNT
+EM_GETMODIFY
+EM_SETMODIFY(bool isModified)
+EM_GETRECT(RECT *rect)
+EM_GETSEL(int *start, int *end)
+EM_EXGETSEL(&lt;unused&gt;, CHARRANGE *cr)
+EM_SETSEL(int start, int end)
+EM_EXSETSEL(&lt;unused&gt;, CHARRANGE *cr)
+EM_GETSELTEXT(&lt;unused&gt;, char *text)
+EM_LINEFROMCHAR(int position)
+EM_EXLINEFROMCHAR(int position)
+EM_LINEINDEX(int line)
+EM_LINELENGTH(int position)
+EM_SCROLL(int line)
+EM_LINESCROLL(int column, int line)
+EM_SCROLLCARET()
+EM_CANPASTE
+EM_CHARFROMPOS(&lt;unused&gt;, POINT *location)
+EM_POSFROMCHAR(int position, POINT *location)
+EM_SELECTIONTYPE
+EM_HIDESELECTION(bool hide)
+EM_FINDTEXT(int flags, FINDTEXTEX *ft)
+EM_FINDTEXTEX(int flags, FINDTEXTEX *ft)
+EM_GETMARGINS
+EM_SETMARGINS(EC_LEFTMARGIN or EC_RIGHTMARGIN or EC_USEFONTINFO, int val)
+EM_FORMATRANGE
+</pre>
+
+    <p>The following are features that are only included if you define
+    <code>INCLUDE_DEPRECATED_FEATURES</code> in <code>Scintilla.h</code>. To ensure future
+    compatibility you should change them as indicated.</p>
+
+    <p><b id="SCN_POSCHANGED">SCN_POSCHANGED()</b> Deprecated<br />
+     Fired when the user moves the cursor to a different position in the text. Use <a
+    class="message" href="#SCN_UPDATEUI"><code>SCN_UPDATEUI</code></a> instead.</p>
+
+    <p><b id="SCN_CHECKBRACE">SCN_CHECKBRACE</b> Deprecated<br />
+     Either the text or styling of the document has changed or the selection range has changed.
+    This is replaced by <a class="message" href="#SCN_UPDATEUI"><code>SCN_UPDATEUI</code></a>. You
+    can also use <code><a class="message" href="#SCN_MODIFIED">SCN_MODIFIED</a></code> for more
+    detailed information on text and styling changes,</p>
+
+    <h2 id="EditMessagesNeverSupportedByScintilla">Edit messages never supported by Scintilla</h2>
+<pre>
+EM_GETWORDBREAKPROC EM_GETWORDBREAKPROCEX
+EM_SETWORDBREAKPROC EM_SETWORDBREAKPROCEX
+EM_GETWORDWRAPMODE EM_SETWORDWRAPMODE
+EM_LIMITTEXT EM_EXLIMITTEXT
+EM_SETRECT EM_SETRECTNP
+EM_FMTLINES
+EM_GETHANDLE EM_SETHANDLE
+EM_GETPASSWORDCHAR EM_SETPASSWORDCHAR
+EM_SETTABSTOPS
+EM_FINDWORDBREAK
+EM_GETCHARFORMAT EM_SETCHARFORMAT
+EM_GETOLEINTERFACE EM_SETOLEINTERFACE
+EM_SETOLECALLBACK
+EM_GETPARAFORMAT EM_SETPARAFORMAT
+EM_PASTESPECIAL
+EM_REQUESTRESIZE
+EM_GETBKGNDCOLOR EM_SETBKGNDCOLOR
+EM_STREAMIN EM_STREAMOUT
+EM_GETIMECOLOR EM_SETIMECOLOR
+EM_GETIMEOPTIONS EM_SETIMEOPTIONS
+EM_GETOPTIONS EM_SETOPTIONS
+EM_GETPUNCTUATION EM_SETPUNCTUATION
+EM_GETTHUMB
+EM_GETEVENTMASK
+EM_SETEVENTMASK
+EM_DISPLAYBAND
+EM_SETTARGETDEVICE
+</pre>
+
+    <p>Scintilla tries to be a superset of the standard windows Edit and RichEdit controls wherever
+    that makes sense. As it is not intended for use in a word processor, some edit messages can not
+    be sensibly handled. Unsupported messages have no effect.</p>
+
+    <h2 id="BuildingScintilla">Building Scintilla</h2>
+
+    <p>To build Scintilla or SciTE, see the README file present in both the Scintilla and SciTE
+    directories. For Windows, GCC 3.2, Borland C++ or Microsoft Visual Studio .NET can be used
+    for building. There is a make file for building Scintilla but not SciTE with Visual C++ 6 at
+    scintilla/win32/scintilla_vc6.mak. For GTK+, GCC 3.1 should be used. GTK+ 1.2x and 2.0x are
+    supported. The version of GTK+ installed should be detected automatically.
+    When both GTK+ 1 and GTK+ 2 are present, building for GTK+ 1.x requires defining GTK1
+    on the command line.</p>
+
+    <h3>Static linking</h3>
+
+    <p>On Windows, Scintilla is normally used as a dynamic library as a .DLL file. If you want to
+    link Scintilla directly into your application .EXE or .DLL file, then the
+    <code>STATIC_BUILD</code> preprocessor symbol should be defined and
+    <code>Scintilla_RegisterClasses</code> called. <code>STATIC_BUILD</code> prevents compiling the
+    <code>DllMain</code> function which will conflict with any <code>DllMain</code> defined in your
+    code. <code>Scintilla_RegisterClasses</code> takes the <code>HINSTANCE</code> of your
+    application and ensures that the "Scintilla" window class is registered. To make sure that the
+    right pointing arrow cursor used in the margin is displayed by Scintilla add the
+    <code>scintilla/win32/Margin.cur</code> file to your application's resources with the ID
+    <code>IDC_MARGIN</code> which is defined in <code>scintilla/win32/platfromRes.h</code> as
+    400.</p>
+
+    <h3>Ensuring lexers are linked into Scintilla</h3>
+
+    <p>Depending on the compiler and linker used, the lexers may be stripped out. This is most
+    often caused when building a static library. To ensure the lexers are linked in, the
+    <code>Scintilla_LinkLexers()</code> function may be called.</p>
+
+    <h3>Changing set of lexers</h3>
+
+    <p>To change the set of lexers in Scintilla, add and remove lexer source files
+    (<code>Lex*.cxx</code>) from the <code>scintilla/src directory</code> and run the
+    <code>src/LexGen.py</code> script from the <code>src</code> directory to update the make files
+    and <code>KeyWords.cxx</code>. <code>LexGen.py</code> requires Python 2.1 or later. If you do
+    not have access to Python, you can hand edit <code>KeyWords.cxx</code> in a simple-minded way,
+    following the patterns of other lexers. The important thing is to include
+    <code>LINK_LEXER(lmMyLexer);</code> to correspond with the <code>LexerModule
+    lmMyLexer(...);</code> in your lexer source code.</p>
+
+    <h3>Building with an alternative Regular Expression implementation</h3>
+
+ <p id="AlternativeRegEx">A simple interface provides support for switching the Regular Expressions engine at
+ compile time. You must implement <code>RegexSearchBase</code> for your chosen engine,
+ look at the built-in implementation <code>BuiltinRegex</code> to see how this is done.
+ You then need to implement the factory method <code>CreateRegexSearch</code>
+ to create an instance of your class. You must disable the built-in implementation by defining
+ <code>SCI_OWNREGEX</code>.</p>
+
+  </body>
+</html>
+
diff --git a/Documents/checklist.txt b/Documents/checklist.txt
new file mode 100644
index 0000000..d33eadb
--- /dev/null
+++ b/Documents/checklist.txt
@@ -0,0 +1,20 @@
+Doom Builder Release Checklist
+=================================================================================
+
+- Have all new actions and settings default values if needed?
+
+- Are the game configurations up-to-date?
+
+- Are the compilers up-to-date?
+
+- Are the script configurations up-to-date?
+
+- Have the game configurations got default texture sets?
+
+
+
+
+
+
+
+
diff --git a/Documents/cmdargs.txt b/Documents/cmdargs.txt
new file mode 100644
index 0000000..daf8db5
--- /dev/null
+++ b/Documents/cmdargs.txt
@@ -0,0 +1,92 @@
+Doom Builder 2 command-line arguments
+==========================================================================================
+
+Usage:
+
+   builder.exe [wadfile] [-map mapname] [-cfg configname] [-delaywindow] [-nopreferences]
+               [-strictpatches] [-resource wad|dir|pk3 [roottextures] [rootflats]
+               [strictpatches] [notest] resourcename]
+
+==========================================================================================
+
+Parameters:
+
+- wadfile
+This is a .WAD file to load immediately after Doom Builder has started up. Unless -map
+and -cfg are used, this will show the map-options dialog.
+
+- map
+Where 'mapname' is the name of the map (map header lump name) such as MAP01 or E1M1. When
+specified, this will indicate the map to load from the specified wad file. Use in
+combination with -cfg to provide the required information to skip the map-options dialog.
+
+- cfg
+Where 'configname' is a game configuration filename, for example, "ZDoom_DoomHexen.cfg".
+Do NOT include the path, all game configurations must be in the Configurations subfolder.
+When used in combination with -map this will provide the required information to load a
+map directly and skip the map-options dialog.
+
+- delaywindow
+This delays showing the main interface window until the automatic map loading from
+command line parameters is completed, and the program is not terminating yet. This is
+usefull for plugins that can be used to perform batch processes where the showing of the
+main interface window is not desired. If a plugin completes it's actions on map load and
+terminates the application immediately, the main window will not be shown at all.
+
+- nosettings
+When this parameter is specified, Doom Builder will not load your preferences or game
+configuration settings and will use the default settings instead. You will not lose your
+original settings, but when this parameter is specified your settings will not be saved.
+
+- strictpatches
+Specify this parameter to enforce strictly loading texture patches from between P_START
+and P_END marker lumps only. This can solve lump name conflicts, but old WAD files do not
+always adhere to this rule.
+
+- resource
+When -wadfile is specified, the -resource option can be used to add additional resources
+that must be loaded along with the wad file. Note that these are added to the resources
+which are automatically loaded due to the selection of a game configuration. You can
+repeat this option for any number of resources you wish to add. As always, the last
+specified resource will override any data in earlier specified resource. This parameter
+has the following arguments:
+
+   wad|dir|pk3       Either 'wad', 'dir' or 'pk3' must be specified to indicate how this
+                     resource must be loaded. This is the same as selecting the tabs in
+                     the resource options dialog in Doom Builder. This is required.
+
+   roottextures      This specifies that any images in the root directory of the resource
+                     must be loaded as textures. This is optional and can only be
+                     specified for directory resources.
+
+   rootflats         This specifies that any images in the root directory of the resource
+                     must be loaded as flats. This is optional and can only be
+                     specified for directory resources.
+
+   strictpatches     Set this for wad resources to load patches with strict rules to
+                     solve lump name conflicts. Same as -strictpatches described above.
+                     This is optional and can only be specified for wad resources.
+   
+   notest            Indicates that this resource will not be included in the parameters
+                     for the game engine when testing the map. This is optional.
+
+==========================================================================================
+
+Examples:
+
+This loads the file "Ubermegawad.wad" after Doom Builder is initialized and shows the
+map-options dialog:
+
+   builder.exe "C:\Games\Doom\My Maps\Ubermegawad.wad"
+
+Same as the example above, but now without showing the map-options dialog and instead
+immediately loads map MAP23 with the game configuration for Doom 2:
+
+   builder.exe "C:\Games\Doom\My Maps\Ubermegawad.wad" -map MAP23 -cfg "Doom2.cfg"
+
+Same as the example above, but with added wad file resource and PK3 file resource:
+
+   builder.exe "C:\Games\Doom\My Maps\Ubermegawad.wad" -map MAP23 -cfg "Doom2.cfg"
+               -resource wad strictpatches "C:\Games\Doom\gothtextures.wad"
+               -resource pk3 "C:\Games\Doom\hardmonsters.pk3"
+
diff --git a/Documents/colorbrightnesslogic.png b/Documents/colorbrightnesslogic.png
new file mode 100644
index 0000000..a580035
Binary files /dev/null and b/Documents/colorbrightnesslogic.png differ
diff --git a/Documents/compilerinterfaces.txt b/Documents/compilerinterfaces.txt
new file mode 100644
index 0000000..a7462d4
--- /dev/null
+++ b/Documents/compilerinterfaces.txt
@@ -0,0 +1,49 @@
+
+This describes the various compiler interfaces available. These can be used with
+the "interface" setting in a compiler configuration. Plugins can create their
+own interfaces by inheriting from the abstract Compiler class.
+
+
+-------------------------------------------------------------------------------------
+AccCompiler
+
+This compiler interface is made for Acc compilers, but can be used for any compiler
+which accepts a single script input file and writes a single output file.
+
+If this interface detects a file named "acs.err" created by the compiler, it will
+parse this file and treat the contents as compiler errors. In this case, the output
+file contents are not copied into the wad file.
+
+With this interface supports the following placeholders in command-line parameters:
+
+%FI indicates the input path and filename (temporary location for compiler).
+
+%FO indicates the output path and filename (temporary location for compiler).
+
+%FS indicates the path and filename of the original file.
+
+%PT indicates the temporary directory path where the compiler is located.
+
+%PS indicates the path of the original file.
+
+The 'original file' is the saved location of the WAD file when the script is an
+internal lump. If the wad file is not saved, %PW is the same as %PT and %FS is the
+path and filename of the temporary wad file.
+
+These placeholders are case-sensitive!
+
+-------------------------------------------------------------------------------------
+NodesCompiler
+
+This compiler interface is made for nodebuilders.
+
+With this interface you can use the following command-line parameters:
+
+%FI indicates the input filename (no path included).
+
+%FO indicates the output filename (no path included).
+
+When %FO is not specified, the nodebuilder should output to %FI
+These placeholders are case-sensitive!
+
+-------------------------------------------------------------------------------------
diff --git a/Documents/fielddatatypes.txt b/Documents/fielddatatypes.txt
new file mode 100644
index 0000000..ac3db44
--- /dev/null
+++ b/Documents/fielddatatypes.txt
@@ -0,0 +1,51 @@
+
+Doom Builder has editing features for different data types of
+UDMF fields and standard hexen arguments. This is a list of
+all supported data types:
+
+0 = integer *
+1 = float
+2 = string
+3 = bool
+4 = linedeftype (integer) *
+5 = sectoreffect (integer) *
+6 = texture (string)
+7 = flat (string)
+8 = angle in degrees (integer)
+9 = angle in radians (float)
+10 = XXRRGGBB color (integer)
+11 = enum option (integer) *
+12 = enum bits (integer) *
+13 = sector tag (integer) *
+14 = thing tag (integer) *
+15 = linedef tag (integer) *
+16 = enum option (string)
+17 = angle in degrees (float)
+18 = thing type (integer)
+19 = thing class (string)
+
+- Only types indicates with * are usable for standard hexen args
+- When no type is specified, the default type is 0 (integer)
+- Enum types (11, 12 and 16) cannot be used in custom UDMF fields
+
+For enum types 11, 12 and 16 there must be an "enum" field that
+either specifies the values or refers to an existing enum set:
+
+	enum
+	{
+		0 = "Yes";
+		1 = "No";
+	}
+	
+	OR
+
+	enum = "yesno";
+
+Type 16 uses case-sensitive strings for values and can only be
+used as an option, not as bit flags:
+
+	enum
+	{
+		translucent = "Translucent";
+		add = "Add";
+	}
diff --git a/Documents/planeslogic.png b/Documents/planeslogic.png
new file mode 100644
index 0000000..4df2da4
Binary files /dev/null and b/Documents/planeslogic.png differ
diff --git a/Documents/sevenzipsharp_patch.zip b/Documents/sevenzipsharp_patch.zip
new file mode 100644
index 0000000..d372b98
Binary files /dev/null and b/Documents/sevenzipsharp_patch.zip differ
diff --git a/Documents/testparameters.txt b/Documents/testparameters.txt
new file mode 100644
index 0000000..cf90539
--- /dev/null
+++ b/Documents/testparameters.txt
@@ -0,0 +1,47 @@
+
+This describes the placeholders that can be used in the command-line parameter for
+testing settings (for launching the sourceport). These placeholders are not
+case-sensitive.
+
+
+-------------------------------------------------------------------------------------
+
+%F indicates the edited PWAD file to be tested.
+NOTE: Doom Builder writes everything to a temporary file, this is not the file
+that was opened through the File -> Open Map dialog.
+
+-------------------------------------------------------------------------------------
+
+%WP indicates the IWAD resource file to be used (path included).
+This is the first (highest) IWAD file that is found in the resources list.
+
+-------------------------------------------------------------------------------------
+
+%WF indicates the IWAD resource file to be used (without path).
+This is the first (highest) IWAD file that is found in the resources list.
+
+-------------------------------------------------------------------------------------
+
+%L indicates the map lump name as is set in the map options.
+
+-------------------------------------------------------------------------------------
+
+%L1 indicates the first number in the map lump name and
+%L2 indicates the second number in the map lump name.
+These can be used for the -warp parameter.
+
+-------------------------------------------------------------------------------------
+
+%AP indicates the all resources files, except the first IWAD file (paths included).
+The items are seperated by spaces. When used within quotes "%AP", the quotes are
+also repeated for every item.
+
+-------------------------------------------------------------------------------------
+
+%S indicates the skill number at which to test.
+
+-------------------------------------------------------------------------------------
+
+%NM indicates the position where to put -nomonsters when the user chooses to test
+without monsters.
+
diff --git a/Documents/udmf11.txt b/Documents/udmf11.txt
new file mode 100644
index 0000000..4966ab9
--- /dev/null
+++ b/Documents/udmf11.txt
@@ -0,0 +1,442 @@
+===============================================================================
+Universal Doom Map Format Specification v1.1 - 03/29/09
+
+Written by James "Quasar" Haley - haleyjd@hotmail.com
+
+Defined with input from:
+
+CodeImp
+esselfortium
+Graf Zahl
+Kaiser
+SlayeR
+SoM
+et al.
+
+    Copyright (c) 2009 James Haley.
+    Permission is granted to copy, distribute and/or modify this document
+    under the terms of the GNU Free Documentation License, Version 1.2
+    or any later version published by the Free Software Foundation;
+    with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+    
+===============================================================================
+
+
+=======================================
+Preface
+=======================================
+
+The Universal Doom Map Format specification is a collaborative effort to 
+create and maintain a cross-port standardized textual representation for Doom
+engine maps. 
+
+The basic UDMF standard contains a superset of the features of all commercial 
+Doom engine games, and provides facilities for seamless extension in source 
+ports, allowing in-editor access to custom map data which would otherwise be 
+squirreled away in external lumps.
+
+
+=======================================
+Changes in v1.1
+=======================================
+
+This is version 1.1 of the UDMF specification, superceding the previous version
+1.0 with the following adjustments:
+
+* Added Preface.
+* Grammar for identifiers altered to forbid initial numerals.
+* Made use of true/false keywords for boolean-type fields more explicit.
+* Rule added for user-defined fields.
+
+
+=======================================
+I. Grammar / Syntax
+=======================================
+
+    translation_unit := global_expr_list
+    global_expr_list := global_expr global_expr_list
+    global_expr := block | assignment_expr
+    block := identifier '{' expr_list '}'
+    expr_list := assignment_expr expr_list
+    assignment_expr := identifier '=' value ';' | nil
+    identifier := [A-Za-z_]+[A-Za-z0-9_]*
+    value := integer | float | quoted_string | keyword
+    integer := [+-]?[1-9]+[0-9]* | 0[0-9]+ | 0x[0-9A-Fa-f]+
+    float := [+-]?[0-9]+'.'[0-9]*([eE][+-]?[0-9]+)?
+    quoted_string := "([^"\\]*(\\.[^"\\]*)*)"
+    keyword := [^{}();"'\n\t ]+
+
+
+Global assignments and named/indexed global blocks are the only top-level
+entities supported. Whitespace is strictly ignored.
+
+Keywords are currently restricted to the values true and false, which are
+used as the values of all boolean fields.
+
+Comments are supported as C-style single and multi-line comments:
+
+    // single line comment
+    
+    /*
+       multi
+       line
+       comment
+    */
+    
+Multi-line comments may not be nested.
+
+Implementing editors are not required (but are allowed) to maintain syntactic
+comments when rewriting UDMF map lumps. These comments are provided chiefly for
+hand-writing and debugging purposes.
+
+Blocks begin with a keyword identifier. An example of a minimally-defined
+entity follows:
+
+    linedef { id = 1; }
+
+Compliant parsers will ignore all unknown keywords in global assignments, 
+block-level assignments, and block headers. Compliant parsers should attempt
+to preserve as much of such information as is possible by using a flexible
+mapping such as hashing.
+
+For purposes of forward compatibility, user-defined fields are restricted to
+beginning with the string "user_", but are otherwise normal identifiers.
+Implementing editors should not restrict the entry of custom field names to 
+those beginning with "user_", however, in order to avoid problems with 
+out-of-date configurations.
+
+Identifiers and keywords are to be treated as case-insensitive.
+
+A field which specifies "boolean" semantics shall accept keyword value 
+true to mean that the field is asserted, and keyword value false to 
+mean that the field is unasserted. Keyword values can only be defined in
+this specification, and not by implementing ports. Use quoted strings
+instead.
+
+Fields which do not appear in a block take on their default value. This
+allows minimal specification. Note that the default values specified by
+UDMF are not necessarily the default values which editors may wish to
+apply to those fields during the creation of new entities during editing.
+Such editing defaults are not part of this specification.
+
+
+=======================================
+II. Implementation Semantics
+=======================================
+
+------------------------------------
+II.A : Storage and Retrieval of Data
+------------------------------------
+
+Block-defined entities are written and read in top-to-bottom order. For
+example, the following linedefs can be assigned in order to a contiguous
+block of memory serving as the implementing port's lines array:
+
+    linedef { id = 1; }
+    linedef { id = 2; }
+    linedef { id = 3; }
+    linedef { id = 4; }
+    
+Data types:
+
+For purposes of internal storage:
+---------------------------------
+Integers should be considered signed with a range of at least 32 bits.
+Floating-point numbers should be considered double precision.
+Strings have no reasonable length limitations.
+
+Hard Data Type Limits
+---------------------
+No limits on number of definitions are defined as part of this specification,
+but implementors may face the need to impose such limitations due to 
+restrictions on the amount of memory available, or the amount that can be
+allocated through a single pointer on the host machine or in a private heap
+implementation.
+
+In the event that a map exceeds such an internal engine limitation, an 
+implementing port or editor should not continue to attempt loading the map, as
+doing so could destabilize the program.
+
+-----------------------------------
+II.B : Storage Within Archive Files
+-----------------------------------
+
+UDMF maps shall be layed out within the archive directory as follows:
+
+    (HEADER)
+    TEXTMAP
+    ... 
+    ENDMAP
+
+(HEADER) = Any lump name from 1 to 8 characters. Serves as the name of the map.
+TEXTMAP  = Single UDMF lump containing all data for the map.
+...      = Blockmap, reject, BSP tree, and port-specific lumps, if any. The
+           format and presence of these resources are not defined by UDMF.
+ENDMAP   = Required closing lump.
+
+Implementing editors and source ports may distinguish a UDMF map from a
+traditional binary map by testing the name of the first directory entry
+following the map header. Implementing resource editors will be capable of
+keeping all lumps for the map, even non-standard ones, together by properly
+scanning for the ENDMAP entry. Non-implementing resource editors will not
+recognize the sequence of lumps as a map, and may thus be less likely to
+interfere with the order or presence of the lumps.
+
+Use of non-implementing resource editors to manipulate UDMF-map-containing WAD
+files is not recommended, however.
+    
+    
+--------------------------------
+II.C : Implementation Dependence
+--------------------------------
+
+A port's list of supported non-standard fields must be provided to implementing
+editors, where they can be provided to the end user as controls, as options
+in a dropbox, or through the ability to input any arbitrary 
+"identifier = value;" pair in a text box.
+
+Every UDMF map should contain as the first statement in the file the "namespace"
+identifier statement, which declares the source port implementation relative to 
+which this map is to be interpreted.
+
+Example:
+
+    namespace = "ZDoom";
+    
+Implementing source ports may ignore this information, or they may use it to 
+perform automatic runtime translation of maps they would otherwise be unable to 
+support.
+
+Implementing source ports should publicly document the value of the "namespace"
+variable they intend to identify with when establishing support for UDMF, and
+avoid conflicts with existing implementations at all costs.
+
+The following namespaces are considered reserved for compatibility purposes:
+
+Doom
+Heretic
+Hexen
+Strife
+
+The use of one of these namespaces indicates that all line specials, sector 
+specials, thing types, and if applicable, thing specials contained in the UDMF 
+map conform to the "vanilla" types for the respective gamemode (with an 
+exception for Doom) and are therefore 100% compatible with all UDMF 
+implementors which support the specified gamemode.
+
+An exception is made for the "Doom" translation type. It is considered to
+represent the final fork of the v1.9 Doom engine, and therefore it includes
+all line types added in DOOM II. It is also additionally considered to 
+include all specials defined in the BOOM and MBF source ports. Implementors
+who support BOOM linedef types can handle these in the normal manner; ports
+which do not support them should zero or otherwise ignore the offending
+specials.
+
+Documentation of the precise meanings of these standardized namespaces will
+be provided in separate documents.
+
+This feature is provided in order to facilitate a universal and lossless
+conversion of all existing Doom-engine-game maps to and from UDMF format,
+independent of any implementing ports' specific namespaces.
+
+
+=======================================
+III. Standardized Fields
+=======================================
+
+The UDMF v1.0 specification considers the following fields standard. They must
+be recognized by all implementing ports and editors (support for the features
+they signify is not necessarily required, such as for ports which do not
+implement Hexen support - all fields unknown to a given port should be 
+ignored and not treated as an error).
+
+All boolean fields take the keyword values true and false.
+
+   linedef
+   {
+      id = <integer>; // ID of line. Interpreted as tag or scripting id.
+                      // Default = -1. *** see below.
+      
+      v1 = <integer>; // Index of first vertex. No valid default.
+      v2 = <integer>; // Index of second vertex. No valid default.
+      
+      // All flags default to false.
+      
+      blocking      = <bool>; // true = line blocks things.
+      blockmonsters = <bool>; // true = line blocks monsters.
+      twosided      = <bool>; // true = line is 2S.
+      dontpegtop    = <bool>; // true = upper texture unpegged.
+      dontpegbottom = <bool>; // true = lower texture unpegged.
+      secret        = <bool>; // true = drawn as 1S on map.
+      blocksound    = <bool>; // true = blocks sound.
+      dontdraw      = <bool>; // true = line never drawn on map.
+      mapped        = <bool>; // true = always appears on map.
+      
+      // BOOM passuse flag not supported in Strife/Heretic/Hexen namespaces.
+      
+      passuse       = <bool>; // true = passes use action.
+
+      // Strife specific flags. Support for other games is not defined by
+      // default and these flags should be ignored when reading maps not for
+      // the Strife namespace or maps for a port which supports these flags.
+
+      translucent   = <bool>; // true = line is a Strife translucent line.
+      jumpover      = <bool>; // true = line is a Strife railing.
+      blockfloaters = <bool>; // true = line is a Strife float-blocker.
+      
+      // Note: SPAC flags should be set false in Doom/Heretic/Strife
+      // namespace maps. Specials in those games do not support this
+      // mechanism and instead imply activation parameters through the
+      // special number. All flags default to false.
+      
+      playercross   = <bool>; // true = player can cross.
+      playeruse     = <bool>; // true = player can use.
+      monstercross  = <bool>; // true = monster can cross.
+      monsteruse    = <bool>; // true = monster can use.
+      impact        = <bool>; // true = projectile can activate.
+      playerpush    = <bool>; // true = player can push.
+      monsterpush   = <bool>; // true = monster can push.
+      missilecross  = <bool>; // true = projectile can cross.
+      repeatspecial = <bool>; // true = repeatable special.
+      
+      special = <integer>; // Special. Default = 0.
+      arg0    = <integer>; // Argument 0. Default = 0.
+      arg1    = <integer>; // Argument 1. Default = 0.
+      arg2    = <integer>; // Argument 2. Default = 0.
+      arg3    = <integer>; // Argument 3. Default = 0.
+      arg4    = <integer>; // Argument 4. Default = 0.
+      
+      sidefront = <integer>; // Sidedef 1 index. No valid default.
+      sideback  = <integer>; // Sidedef 2 index. Default = -1.
+      
+      comment = <string>; // A comment. Implementors should attach no special
+                          // semantic meaning to this field.
+   }
+   
+   sidedef
+   {
+      offsetx = <integer>; // X Offset. Default = 0.
+      offsety = <integer>; // Y Offset. Default = 0.
+      
+      texturetop    = <string>; // Upper texture. Default = "-".
+      texturebottom = <string>; // Lower texture. Default = "-".
+      texturemiddle = <string>; // Middle texture. Default = "-".
+      
+      sector = <integer>; // Sector index. No valid default.
+
+      comment = <string>; // A comment. Implementors should attach no special
+                          // semantic meaning to this field.
+   }
+   
+   vertex
+   {
+      x = <float>; // X coordinate. No valid default.
+      y = <float>; // Y coordinate. No valid default.
+   }
+   
+   sector
+   {
+      heightfloor   = <integer>; // Floor height. Default = 0.
+      heightceiling = <integer>; // Ceiling height. Default = 0.
+      
+      texturefloor   = <string>; // Floor flat. No valid default.
+      textureceiling = <string>; // Ceiling flat. No valid default.
+      
+      lightlevel = <integer>; // Light level. Default = 160.
+      
+      special = <integer>; // Sector special. Default = 0.
+      id      = <integer>; // Sector tag/id. Default = 0.
+
+      comment = <string>; // A comment. Implementors should attach no special
+                          // semantic meaning to this field.
+   }
+   
+   thing
+   {
+      id = <integer>; // Thing ID. Default = 0.
+      
+      x = <float>; // X coordinate. No valid default.
+      y = <float>; // Y coordinate. No valid default.
+      
+      height = <float>; // Z height relative to floor. Default = 0.
+                        // (Relative to ceiling for SPAWNCEILING items).
+                          
+      angle = <integer>; // Map angle of thing in degrees. Default = 0 (East).
+      
+      type = <integer>; // DoomedNum. No valid default.
+      
+      // All flags default to false.
+      
+      skill1      = <bool>; // true = in skill 1.
+      skill2      = <bool>; // true = in skill 2.
+      skill3      = <bool>; // true = in skill 3.
+      skill4      = <bool>; // true = in skill 4.
+      skill5      = <bool>; // true = in skill 5.
+      ambush      = <bool>; // true = thing is deaf.
+      single      = <bool>; // true = in SP mode.
+      dm          = <bool>; // true = in DM mode.
+      coop        = <bool>; // true = in Coop.
+
+      // MBF friend flag not supported in Strife/Heretic/Hexen namespaces.
+      
+      friend      = <bool>; // true = MBF friend.
+      
+      // Hexen flags; not supported in Doom/Strife/Heretic namespaces.
+      
+      dormant     = <bool>; // true = dormant thing.
+      class1      = <bool>; // true = Present for pclass 1.
+      class2      = <bool>; // true = Present for pclass 2.
+      class3      = <bool>; // true = Present for pclass 3.
+      
+
+      // Strife specific flags. Support for other games is not defined by
+      // default and these flags should be ignored when reading maps not for
+      // the Strife namespace or maps for a port which supports these flags.
+      standing    = <bool>; // true = Strife NPC flag.
+      strifeally  = <bool>; // true = Strife ally flag.
+      translucent = <bool>; // true = Strife translucency flag.
+      invisible   = <bool>; // true = Strife invisibility flag.
+            
+      // Note: suggested editor defaults for all skill, gamemode, and player
+      // class flags is true rather than the UDMF default of false.
+
+      // Thing special semantics are only defined for the Hexen namespace or
+      // ports which implement this feature in their own namespace.
+      
+      special = <integer>; // Scripting special. Default = 0;
+      arg0    = <integer>; // Argument 0. Default = 0.
+      arg1    = <integer>; // Argument 1. Default = 0.
+      arg2    = <integer>; // Argument 2. Default = 0.
+      arg3    = <integer>; // Argument 3. Default = 0.
+      arg4    = <integer>; // Argument 4. Default = 0.
+
+      comment = <string>; // A comment. Implementors should attach no special
+                          // semantic meaning to this field.
+   }
+   
+
+*** Tag / ID Behavior for Map Conversion:
+   
+   Unlike traditional Doom maps UDMF makes a clear distinction between a line's
+   ID and the parameter which identifies the object the line's special is 
+   supposed to affect.
+
+   The id will be used to identify this line, and arg0 will be used to identify
+   the line or sector that this line is to affect or otherwise reference, i.e.
+   it is effectively a parameter to the line's special.
+
+   Boom used the linedef's tag for both due to lack of other options so in 
+   order to ensure compatibility any map converter converting maps for the 
+   Doom/Heretic/Strife namespaces must store the linedef's tag field as both
+   the id and as arg0 in each line. The default value of the id field under 
+   these namespaces is defined as 0 rather than -1.
+   
+   Since UDMF provides a line id field, the Hexen line special #121
+   (Line_SetIdentification) is obsolete. When converting maps to UDMF under
+   Hexen namespace, special 121 should be written as zero, and the arg0 of
+   the binary linedef should be written as the id field of the UDMF line.
+   The arg0 value of the UDMF line should also then be set to zero.
+   
+===============================================================================
+EOF
+===============================================================================
diff --git a/Documents/udmf_zdoom.txt b/Documents/udmf_zdoom.txt
new file mode 100644
index 0000000..d501cb8
--- /dev/null
+++ b/Documents/udmf_zdoom.txt
@@ -0,0 +1,381 @@
+===============================================================================
+Universal Doom Map Format ZDoom extensions v1.15 - 14.12.2010
+
+
+    Copyright (c) 2008 Christoph Oelckers.
+    Permission is granted to copy, distribute and/or modify this document
+    under the terms of the GNU Free Documentation License, Version 1.2
+    or any later version published by the Free Software Foundation;
+    with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+    
+===============================================================================
+
+This document discusses only the additions ZDoom makes to the UDMF 
+specification.
+
+=======================================
+I. Grammar / Syntax
+=======================================
+
+    No changes.
+
+=======================================
+II. Implementation Semantics
+=======================================
+
+------------------------------------
+II.A : Storage and Retrieval of Data
+------------------------------------
+
+No changes.
+
+-----------------------------------
+II.B : Storage Within Archive Files
+-----------------------------------
+
+In addition to the base specification ZDoom recognizes the following lumps
+between the TEXTMAP and ENDMAP lumps:
+
+    BEHAVIOR = contains compiled ACS code
+    DIALOGUE = contains compiled Strife or USDF conversation scripts.
+    ZNODES = Nodes (must be stored as extended GL nodes. Compression is allowed
+                    but deprecated for portability reasons.)
+    BLOCKMAP = blockmap. It is recommended not to include this lump in UDMF maps.
+    REJECT = reject table. Recommended use is for special effects only.
+    
+    Lumps starting with 'SCRIPT' are guaranteed to be ignored by ZDoom so they
+    can be used to store ACS and dialogue script sources.
+    
+--------------------------------
+II.C : Implementation Dependence
+--------------------------------
+
+ZDoom supports all namespaces defined in the base specification and adds two new
+ones:
+    "ZDoom"
+    "ZDoomTranslated"
+    
+The only difference between these two namespaces is how line, thing and sector
+specials are handled:
+
+'ZDoom' uses Hexen type specials which are ZDoom's native implementation.
+
+'ZDoomTranslated' uses Doom-type specials. Such maps have to be processed by
+a special translator. A special translator is a text lump that defines how
+Doom-format specials are translated into Hexen-format specials. By default
+each game defines its own translation table but these can be overridden in
+MAPINFO. It is the mapper's responsibility to choose the correct translation
+table for a map.
+
+
+=======================================
+III. Standardized Fields
+=======================================
+
+ZDoom's namespaces implement all fields from the standard, regardless of
+any restrictions mentioned in the spec.
+In particular, the 'ZDoomTranslated' namespaces implements thing specials.
+These will ignore the implicit trigger type and triggering semantics are the
+same as for native maps.
+The only field not fully supported is the thing's 'friend' field. ZDoom does
+not offer MBF's friendly monster implementation and will remap any use of this
+field to 'strifeally', even for the 'Doom' namespace.
+
+In addition to the standard fields, ZDoom defines the following:
+Note: All <bool> fields default to false unless mentioned otherwise.
+
+   vertex
+   {
+      zfloor = <float>;         // Floor height at this vertex. Only applies to triangular sectors
+      zceiling = <float>;       // Ceiling height at this vertex. Only applies to triangular sectors
+   }
+
+   linedef
+   {
+      alpha = <float>;            // Translucency of this line, default is 1.0
+      renderstyle = <string>;     // Render style, can be "translucent" or "add",
+                                  // default is "translucent".
+      playeruseback = <bool> ;    // New SPAC flag, true = player can use from back side.
+      anycross = <bool>;          // New SPAC flag, true = any non-projectile 
+                                  // crossing will trigger this line
+      monsteractivate = <bool>;   // Monsters can trigger this line.
+                                  // For compatibility only because this flag's 
+                                  // semantics can not be fully reproduced with
+                                  // explicit trigger flags.
+      blockplayers = <bool>;      // Line blocks players' movement.
+      blockeverything = <bool>;   // Line blocks everything.
+      firstsideonly = <bool>;     // Line can only be triggered from the front side.
+      zoneboundary = <bool>;      // Line is a boundary for sound reverb zones.
+      clipmidtex = <bool>;        // Line's mid textures are clipped to floor and ceiling.
+      wrapmidtex = <bool>;        // Line's mid textures are wrapped.
+      midtex3d = <bool>;          // Actors can walk on mid texture.
+      midtex3dimpassible = <bool>;// Used in conjuction with midtex3d - causes the mid
+                                  // texture to behave like an impassible line (projectiles
+                                  // pass through it).
+      checkswitchrange = <bool>;  // Switches can only be activated when vertically reachable.
+      blockprojectiles = <bool>;  // Line blocks all projectiles
+      blockuse = <bool>;          // Line blocks all use actions
+      blocksight = <bool>;        // Line blocks monster line of sight
+      blockhitscan = <bool>;      // Line blocks hitscan attacks
+      locknumber = <int>;         // Line special is locked
+      arg0str = <string>;         // Alternate string-based version of arg0
+	  moreids = <string>;         // Additional line IDs, specified as a space separated list of numbers (e.g. "2 666 1003 4505")
+
+      transparent   = <bool>; // true = line is a Strife transparent line (alpha 0.25)
+
+      * Note about arg0str
+
+      For lines with ACS specials (80-86 and 226), if arg0str is present and non-null, it
+      will be used as the name of the script to execute, and arg0 will be ignored.
+   }
+
+   sidedef
+   {
+      scalex_top = <float>;    // X scale for upper texture, Default = 1.0.
+      scaley_top = <float>;    // y scale for upper texture, Default = 1.0.
+      scalex_mid = <float>;    // X scale for mid texture, Default = 1.0.
+      scaley_mid = <float>;    // y scale for mid texture, Default = 1.0.
+      scalex_bottom = <float>; // X scale for lower texture, Default = 1.0.
+      scaley_bottom = <float>; // y scale for lower texture, Default = 1.0.
+      offsetx_top = <float>;    // X offset for upper texture, Default = 0.0.
+      offsety_top = <float>;    // y offset for upper texture, Default = 0.0.
+      offsetx_mid = <float>;    // X offset for mid texture, Default = 0.0.
+      offsety_mid = <float>;    // y offset for mid texture, Default = 0.0.
+      offsetx_bottom = <float>; // X offset for lower texture, Default = 0.0.
+      offsety_bottom = <float>; // y offset for lower texture, Default = 0.0.
+                                // When global texture offsets are used they will
+                                // be added on top of these values.
+      light = <integer>;        // This side's light level. Default is 0.
+      lightabsolute = <bool>;   // true = 'light' is an absolute value. Default is 
+                                // relative to the owning sector's light level.
+      lightfog = <bool>;        // true = This side's relative lighting is used even in
+                                // foggy sectors. Default is to disable relative
+                                // lighting in foggy sectors.
+      nofakecontrast = <bool>;  // Disables use of fake contrast on this sidedef.
+      smoothlighting = <bool>;  // Use smooth fake contrast.
+      clipmidtex = <bool>;      // Side's mid textures are clipped to floor and ceiling.
+      wrapmidtex = <bool>;      // Side's mid textures are wrapped.
+      nodecals = <bool>;        // Disables decals on the sidedef.
+   }
+
+   sector
+   {
+      xpanningfloor = <float>;        // X texture offset of floor texture, Default = 0.0.
+      ypanningfloor = <float>;        // Y texture offset of floor texture, Default = 0.0.
+      xpanningceiling = <float>;      // X texture offset of ceiling texture, Default = 0.0.
+      ypanningceiling = <float>;      // Y texture offset of ceiling texture, Default = 0.0.
+      xscalefloor = <float>;          // X texture scale of floor texture, Default = 1.0.
+      yscalefloor = <float>;          // Y texture scale of floor texture, Default = 1.0.
+      xscaleceiling = <float>;        // X texture scale of ceiling texture, Default = 1.0.
+      yscaleceiling = <float>;        // Y texture scale of ceiling texture, Default = 1.0.
+      rotationfloor = <float>;        // Rotation of floor texture in degrees, Default = 0.0.
+      rotationceiling = <float>;      // Rotation of ceiling texture in degrees, Default = 0.0.
+	  ceilingplane_a = <float>;       // Define the plane equation for the sector's ceiling. Default is a horizontal plane at 'heightceiling'.
+	  ceilingplane_b = <float>;       // 'heightceiling' will still be used to calculate texture alignment.
+	  ceilingplane_c = <float>;       // The plane equation will only be used if all 4 values are given.
+	  ceilingplane_d = <float>;
+	  floorplane_a = <float>;         // Define the plane equation for the sector's floor. Default is a horizontal plane at 'heightfloor'.
+	  floorplane_b = <float>;         // 'heightfloor' will still be used to calculate texture alignment.
+	  floorplane_c = <float>;         // The plane equation will only be used if all 4 values are given.
+	  floorplane_d = <float>;
+      lightfloor = <integer>;         // The floor's light level. Default is 0.
+      lightceiling = <integer>;       // The ceiling's light level. Default is 0.
+      lightfloorabsolute = <bool>;    // true = 'lightfloor' is an absolute value. Default is 
+                                      // relative to the owning sector's light level.
+      lightceilingabsolute = <bool>;  // true = 'lightceiling' is an absolute value. Default is 
+                                      // relative to the owning sector's light level.
+      alphafloor = <float>;           // translucency of floor plane (only has meaning with Sector_SetPortal) Default is 1.0.
+      alphaceiling = <float>;         // translucency of ceiling plane (only has meaning with Sector_SetPortal) Default is 1.0.
+      renderstylefloor = <string>;    // floor plane renderstyle (only has meaning with Sector_SetPortal); not implemented yet in software renderer
+                                      // can be "translucent" or "add", default is "translucent".
+      renderstyleceiling = <string>;  // ceiling plane renderstyle (only has meaning with Sector_SetPortal); not implemented yet in software renderer
+                                      // can be "translucent" or "add", default is "translucent".
+      gravity = <float>;              // Sector's gravity. Default is 1.0.
+      lightcolor = <integer>;         // Sector's light color as RRGGBB value, default = 0xffffff.
+      fadecolor = <integer>;          // Sector's fog color as RRGGBB value, default = 0x000000.
+      desaturation = <float>;         // Color desaturation factor. 0 = none, 1 = full, default = 0.
+      silent = <bool>;                // Actors in this sector make no sound,
+      nofallingdamage = <bool>;		  // Falling damage is disabled in this sector
+      dropactors = <bool>;            // Actors drop with instantly moving floors (*)
+      norespawn = <bool>;             // Players can not respawn in this sector
+      soundsequence = <string>;       // The sound sequence to play when this sector moves. Placing a
+                                      // sound sequence thing in the sector will override this property.
+      hidden = <bool>;                // if true this sector will not be drawn on the textured automap.
+      waterzone = <bool>;             // Sector is under water and swimmable
+	  moreids = <string>;             // Additional sector IDs/tags, specified as a space separated list of numbers (e.g. "2 666 1003 4505")
+      
+      * Note about dropactors
+
+      The spec requires this to be false by default. Currently, however, ZDoom assumes this to be true
+      for Doom format maps so any map converter converting to the ZDoomTranslated namespace should
+      set this flag for each tagged sector.
+
+   }
+
+   thing
+   {
+      skill# = <bool>			// Unlike the base spec, # can range from 1-16.
+      class# = <bool>			// Unlike the base spec, # can range from 1-16.
+      conversation = <int>		// Assigns a conversation dialogue to this thing.
+                                // Parameter is the conversation ID, 0 meaning none.
+      countsecret = <bool>;     // Picking up this actor counts as a secret.
+      arg0str = <string>;       // Alternate string-based version of arg0
+	  gravity = <float>;		// Set per-actor gravity. Positive values are multiplied with the class's property, 
+	                            // negative values are used as their absolute. Default = 1.0.
+								
+	  health = <int>;			// Set per-actor health. Positive values are multiplied with the class's property,
+								// negative values are used as their absolute. Default = 1.
+								
+	  renderstyle = <string>;	// Set per-actor render style, overriding the class default. Possible values can be "normal",
+								// "none", "add" or "additive", "subtract" or "subtractive", "stencil", "translucentstencil",
+								// "translucent", "fuzzy", "optfuzzy", "soultrans". Default is an empty string for no change.
+	  fillcolor = <integer>;    // Fill color used by the "stencil" and "translucentstencil" rendestyles, as RRGGBB value, default = 0x000000.
+	  alpha = <float>;          // Translucency of this actor (if applicable to renderstyle), default is 1.0.
+	  score = <int>;			// Score value of this actor, overriding the class default if not null. Default = 0.
+      pitch = <integer>; 		// Pitch of thing in degrees. Default = 0 (horizontal).
+      roll = <integer>; 		// Pitch of thing in degrees. Default = 0 (horizontal).
+	  scalex = <float>;         // Vertical scaling on thing. Default = 0 (ignored).
+	  scaley = <float>;         // Horizontal scaling on thing. Default = 0 (ignored).
+	  scale = <float>;        	// Vertical and horizontal scaling on thing. Default = 0 (ignored).
+	  floatbobphase = <int>;	// Sets the thing's floatbobphase. Valid phase values are 0-63. Default = -1 (use actor class default).
+
+      * Note about arg0str
+
+      For things with ACS specials (80-86 and 226), if arg0str is present and non-null, it
+      will be used as the name of the script to execute, and arg0 will be ignored.
+   }
+
+
+
+*** Special notes for map format conversions:
+
+   Setting the line's ID via special is not supported so any special using
+   this option must be converted to use the line's ID field instead.
+   Unless mentioned differently the arg being used to define the line ID
+   should be set to 0.
+   The following line specials are affected:
+
+   121: Line_SetIdentification, arg 0
+   208: TranslucentLine, arg0 (arg0 must be preserved)
+     1: Polyobj_StartLine, arg3
+     5: Polyobj_ExplicitLine, arg4
+   181: Plane_Align, arg2
+   215: Teleport_Line, arg0
+   222: Scroll_Texture_Model, arg0 (arg0 must be preserved)
+   160: Sector_3DFloor, arg4 (both uses as high-byte of tag and line ID are not supported in UDMF and must be remapped)
+
+   Some specials also allow setting the extended flags. These must also be
+   converted to explicitly setting the flags through the defined map fields.
+   This affects the following specials:
+
+   121: Line_SetIdentification, arg1
+   208: TranslucentLine, arg3
+
+   These args are to be converted as follows to flags, bit by bit:
+
+   Bit 0 (Value   1): zoneboundary
+   Bit 1 (Value   2): jumpover
+   Bit 2 (Value   4): blockfloaters
+   Bit 3 (Value   8): clipmidtex
+   Bit 4 (Value  16): wrapmidtex
+   Bit 5 (Value  32): midtex3d
+   Bit 6 (Value  64): checkswitchrange
+   Bit 7 (Value 128): firstsideonly
+
+   When used in special 208 this arg should be cleared afterward.
+
+   Special 121 is not being used by UDMF maps in ZDoom and should be completely
+   deleted after conversion.
+
+
+=======================================
+Changelog
+=======================================
+
+1.1: 27.05.2008
+Changed default light mode for sectors and sidedefs to relative and renamed
+associated properties to avoid having a non-intuitive standard value for the
+light field.
+Added 'nofakecontrast' option to sidedefs.
+
+1.2 21.08.2008
+Added smooth lighting option to linedefs
+
+1.3 12.12.2008
+Added NoRespawn sector flag
+Fixed lightfloor and lightceiling properties for sectors. They are of type 
+integer, not float
+
+1.4 27.01.2009
+Changed description of class and skill thing flags to avoid the impression that
+this uses array syntax. No functional changes
+
+1.5 22.02.2009
+Added blockprojectiles to lines and firstsideonly to conversion notes
+
+1.6 28.04.2009
+Added blockuse line flag.
+
+1.7 07.06.2009
+Added sidedef scaling properties and side specific clipmidtex and wrapmidtex.
+
+1.8 16.07.2009
+Added NoDecals sidedef option
+Fixed conversion specifications for TranslucentLine special.
+
+1.9 17.04.2010
+Changed node specifications to deprecate compression of node lump.
+
+1.10 25.04.2010
+Added 'playeruseback' line trigger flag.
+
+1.11 07.08.2010
+Added 'soundsequence' sector property.
+
+1.12 22.08.2010
+Added 'conversation' thing property.
+
+1.13 29.08.2010
+Added 'hidden' sector property.
+
+1.14 19.09.2010
+Added 'countsecret' actor property.
+
+1.15 14.12.2010
+Added vertex floor and ceiling height properties
+
+1.16 23.01.2011
+Added alphaceiling and alphafloor sector properties
+Added blocksight linedef flag
+Removed remarks of 8 being the maximum number of player classes/skill levels the menu can handle so the spec now properly lists 16 as limit.
+
+1.17 12.02.2011
+Added renderstyleceiling and renderstylefloor sector properties
+Added Sector_Set3DFloor to list of specials that need to be handled for line ID remapping
+
+1.18 17.02.2012
+Added arg0str linedef property.
+Standardized whitespace.
+
+1.19 24.02.2012
+Added back locknumber property.
+
+1.20 25.02.2012
+Added arg0str thing property.
+
+1.21 09.08.2013
+Added waterzone sector property.
+
+1.22 12.04.2014
+Added transparent line property (to be folded back to core UDMF standard), and health, score, renderstyle, fillcolor, alpha, scale, scalex, scaley, pitch and roll thing properties.
+
+1.24 14.05.2014
+Added plane equations for sector slopes. (Please read carefully to ensure proper use!)
+Changed language describing the DIALOGUE lump to mention USDF as an option.
+
+1.25 19.04.2015
+Added 'moreids' for linedefs and sectors.
+
+===============================================================================
+EOF
+===============================================================================
diff --git a/Documents/usdf11.txt b/Documents/usdf11.txt
new file mode 100644
index 0000000..cb5330b
--- /dev/null
+++ b/Documents/usdf11.txt
@@ -0,0 +1,155 @@
+===============================================================================
+Universal Strife Dialog Format Specification v1.1 - 01/29/09
+
+Written by Braden "Blzut3" Obrzut - admin@maniacsvault.net
+
+Defined with input from:
+
+CodeImp
+Gez
+Graf Zahl
+Quasar
+et al.
+
+    Copyright (c) 2009 Braden Obrzut.
+    Permission is granted to copy, distribute and/or modify this document
+    under the terms of the GNU Free Documentation License, Version 1.2
+    or any later version published by the Free Software Foundation;
+    with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+
+===============================================================================
+
+=======================================
+I. Grammar / Syntax
+=======================================
+
+The grammar and syntax is similar to that of UDMF.  A compliant UDMF parser 
+should be applyable to the USDF.  However, it will need to be capable of 
+handling sub-blocks.  Unknown sub-blocks should be skipped.
+
+=======================================
+II. Implementation Semantics
+=======================================
+
+------------------------------------
+II.A : Storage and Retrieval of Data
+------------------------------------
+
+This is the same as in UDMF.
+
+-----------------------------------
+II.B : Storage Within Archive Files
+-----------------------------------
+
+There are two options for the USDF lump placement.  This can either be a part 
+of the UDMF lump list or standalone.  If used stand alone the lump name 
+DIALOGXY is used corresponding with MAPXY.  For UDMF the lump shall be called 
+"DIALOG".
+
+--------------------------------
+II.C : Implementation Dependence
+--------------------------------
+
+USDF also implements the namespace statement.  This has all the same 
+requirements as UDMF.
+
+=======================================
+III. Standardized Fields
+=======================================
+
+The following are required for all USDF complient implementations.  Like UDMF, 
+any unknown field/function should be ignored and not treated as an error.
+
+NOTE: "mobj" refers to Strife's conversationIDs and not doom editor numbers or 
+      Hexen's spawnids.
+
+---------------------
+III.A : Conversations
+---------------------
+
+Conversations are groups of pages that can be assigned to a particular object.
+Implementors should preserve the IDs to allow for dynamic reassignment through 
+scripting although this is not a requirement.  Section III.B covers static 
+assignments.
+
+conversation // Starts a dialog.
+{
+    actor = <integer>; // mobj for this conversation's actor.  If previously 
+                       // used, this will override the previous conversation.
+
+    page // Starts a new page.  Pages are automatically numbered starting at 0.
+    {
+        name   = <string>; // Name that goes in the upper left hand corner
+        panel  = <string>; // Name of lump to render as the background.
+        voice  = <string>; // Narration sound lump.
+        dialog = <string>; // Dialog of the page.
+
+        // jumps to the specified page if the chater has the specified amount 
+        // or more of item in their inventory.  This can be repeated as many
+        // times as the author wants, but only the first one to evaluate as
+        // true takes effect.
+        ifitem
+        {
+            item   = <integer>; // mobj of item to check.
+            amount = <integer>; // amount required to be in inventory.
+            page   = <integer>; // page to jump to.
+        }
+
+        // Choices shall be automatically numbered.
+        choice
+        {
+            text            = <string>;  // Name of the choice.
+
+            // The amount of an item needed to successfully pick this option.
+            // This can be repeated, but only the first will be shown (provided 
+            // diaplaycost is true).  First to evaluate to true determines 
+            // success.
+            cost
+            {
+                item   = <integer>; // Item that is required for this option.
+                amount = <integer>; // Minimum amount of the item needed.
+            }
+
+            displaycost     = <bool>;    // Weather the cost should be
+                                         // displayed with the option.
+                                         // Default: true
+            yesmessage      = <string>;  // Text to add to console when choice
+                                         // is accepted.
+            nomessage       = <string>;  // Text to add to console when choice
+                                         // is denied.
+
+            log             = <string>;  // LOG entry to use on success.
+            giveitem        = <integer>; // Gives the specified item upon
+                                         // success.
+            // The following are the same as the special for linedefs in UDMF.
+            // They are executed on success.
+            special         = <integer>;
+            arg0            = <integer>;
+            arg1            = <integer>;
+            arg2            = <integer>;
+            arg3            = <integer>;
+            arg4            = <integer>;
+
+            nextpage        = <integer>; // Sets the next page.
+            closedialog     = <bool>;    // Should the dialog be closed upon
+                                         // selecting this choice?
+                                         // Default: false
+        }
+    }
+}
+
+-------------------------------
+III.B : Including Other Dialogs
+-------------------------------
+
+Unlike the original Strife dialog format.  The lump "SCRIPT00" should not be 
+included automatically.  Instead the user must specify this behavior by using 
+the include function, which takes the name of a lump to include.  Include only 
+needs to be available in the global scope and for compatibility reasons, must 
+include the result of the script and not act like a preprocessor statement.
+
+include = <string>;
+
+===============================================================================
+EOF
+===============================================================================
diff --git a/Documents/usdf20.txt b/Documents/usdf20.txt
new file mode 100644
index 0000000..fc955f0
--- /dev/null
+++ b/Documents/usdf20.txt
@@ -0,0 +1,158 @@
+===============================================================================
+Universal Strife Dialog Format Specification v2.0 - 08/20/10
+
+Written by Braden "Blzut3" Obrzut - admin@maniacsvault.net
+
+Defined with input from:
+
+CodeImp
+Gez
+Graf Zahl
+Quasar
+et al.
+
+    Copyright (c) 2010 Braden Obrzut.
+    Permission is granted to copy, distribute and/or modify this document
+    under the terms of the GNU Free Documentation License, Version 1.2
+    or any later version published by the Free Software Foundation;
+    with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+
+===============================================================================
+
+=======================================
+I. Grammar / Syntax
+=======================================
+
+The grammar and syntax is similar to that of UDMF.  A compliant UDMF parser 
+should be applyable to the USDF.  However, it will need to be capable of 
+handling sub-blocks.  Unknown sub-blocks should be skipped.
+
+=======================================
+II. Implementation Semantics
+=======================================
+
+------------------------------------
+II.A : Storage and Retrieval of Data
+------------------------------------
+
+This is the same as in UDMF.
+
+-----------------------------------
+II.B : Storage Within Archive Files
+-----------------------------------
+
+There are two options for the USDF lump placement.  This can either be a part 
+of the UDMF lump list or standalone.  If used stand alone the lump name 
+DIALOGXY is used corresponding with MAPXY.  For UDMF the lump shall be called 
+"DIALOGUE".
+
+--------------------------------
+II.C : Implementation Dependence
+--------------------------------
+
+USDF also implements the namespace statement.  This has all the same 
+requirements as UDMF.
+
+=======================================
+III. Standardized Fields
+=======================================
+
+The following are required for all USDF complient implementations.  Like UDMF, 
+any unknown field/function should be ignored and not treated as an error.
+
+NOTE: "mobj" refers to Strife's conversationIDs and not doom editor numbers or 
+      Hexen's spawnids.  A valid mobj value is any positive integer greater
+      than or equal to 1.
+
+---------------------
+III.A : Conversations
+---------------------
+
+Conversations are groups of pages that can be assigned to a particular object.
+Implementors should preserve the IDs to allow for dynamic reassignment through 
+scripting although this is not a requirement.
+
+conversation // Starts a dialog.
+{
+    actor = <integer>; // mobj for this conversation's actor.  If previously 
+                       // used, this will override the previous conversation.
+
+    page // Starts a new page.  Pages are automatically numbered starting at 0.
+    {
+        name   = <string>;  // Name that goes in the upper left hand corner
+        panel  = <string>;  // Name of lump to render as the background.
+        voice  = <string>;  // Narration sound lump.
+        dialog = <string>;  // Dialog of the page.
+        drop   = <integer>; // mobj for the object to drop if the actor is 
+                            // killed.
+        link   = <integer>; // Page to jump to if all ifitem conditions are
+                            // satisified.
+
+        // jumps to the specified page if the player has the specified amount 
+        // or more of item in their inventory.  This can be repeated as many
+        // times as the author wants, all conditions must be met for the
+        // jump to occur.
+        ifitem
+        {
+            item   = <integer>; // mobj of item to check.
+            amount = <integer>; // amount required to be in inventory.
+        }
+
+        // Choices shall be automatically numbered.
+        choice
+        {
+            text            = <string>;  // Name of the choice.
+
+            // The amount of an item needed to successfully pick this option.
+            // This can be repeated, but only the first will be shown (provided 
+            // diaplaycost is true).  All costs must be satisfied for success.
+            cost
+            {
+                item   = <integer>; // Item that is required for this option.
+                amount = <integer>; // Minimum amount of the item needed.
+            }
+
+            displaycost     = <bool>;    // Weather the cost should be
+                                         // displayed with the option.
+                                         // If no cost is specified this should
+                                         // be ignored.
+            yesmessage      = <string>;  // Text to add to console when choice
+                                         // is accepted.
+            nomessage       = <string>;  // Text to add to console when choice
+                                         // is denied.
+
+            log             = <string>;  // LOG entry to use on success.
+            giveitem        = <integer>; // Gives the specified item upon
+                                         // success.
+            // The following are the same as the special for linedefs in UDMF.
+            // They are executed on success.
+            special         = <integer>;
+            arg0            = <integer>;
+            arg1            = <integer>;
+            arg2            = <integer>;
+            arg3            = <integer>;
+            arg4            = <integer>;
+
+            nextpage        = <integer>; // Sets the next page.
+            closedialog     = <bool>;    // Should the dialog be closed upon
+                                         // selecting this choice?
+                                         // Default: false
+        }
+    }
+}
+
+-------------------------------
+III.B : Including Other Dialogs
+-------------------------------
+
+Unlike the original Strife dialog format.  The lump "SCRIPT00" should not be 
+included automatically.  Instead the user must specify this behavior by using 
+the include function, which takes the name of a lump to include.  Include only 
+needs to be available in the global scope and for compatibility reasons, must 
+include the result of the script and not act like a preprocessor statement.
+
+include = <string>;
+
+===============================================================================
+EOF
+===============================================================================
diff --git a/Help/Contents.hhc b/Help/Contents.hhc
new file mode 100644
index 0000000..a59265d
--- /dev/null
+++ b/Help/Contents.hhc
@@ -0,0 +1,462 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<HTML>
+<HEAD>
+<meta name="GENERATOR" content="Microsoft&reg; HTML Help Workshop 4.1">
+<!-- Sitemap 1.0 -->
+</HEAD><BODY>
+<OBJECT type="text/site properties">
+	<param name="WindowName" value="default">
+</OBJECT>
+<UL>
+	<LI> <OBJECT type="text/sitemap">
+		<param name="Name" value="Introduction">
+		<param name="Local" value="introduction.html">
+		</OBJECT>
+	<LI> <OBJECT type="text/sitemap">
+		<param name="Name" value="Terminology">
+		<param name="Local" value="terminology.html">
+		</OBJECT>
+	<LI> <OBJECT type="text/sitemap">
+		<param name="Name" value="User Interface">
+		<param name="Local" value="userinterface.html">
+		</OBJECT>
+	<UL>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="About the User Interface">
+			<param name="Local" value="userinterface.html">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Main Window">
+			<param name="Local" value="w_mainwindow.html">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Custom Fields Editor">
+			<param name="Local" value="w_customfields.html">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Errors and Warnings Window">
+			<param name="Local" value="w_errorsandwarnings.html">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Game Configurations Window">
+			<param name="Local" value="w_gameconfigurations.html">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Grid Setup Window">
+			<param name="Local" value="w_gridsetup.html">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Image Browser Window">
+			<param name="Local" value="w_imagesbrowser.html">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Linedef Properties Window">
+			<param name="Local" value="w_linedefedit.html">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Map Options Window">
+			<param name="Local" value="w_mapoptions.html">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Open Map Window">
+			<param name="Local" value="w_openmapoptions.html">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Preferences Window">
+			<param name="Local" value="w_preferences.html">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Resource Options Window">
+			<param name="Local" value="w_resourceoptions.html">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Script Editor Window">
+			<param name="Local" value="w_scripteditor.html">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Sector Properties Window">
+			<param name="Local" value="w_sectoredit.html">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Texture Sets Window">
+			<param name="Local" value="w_textureset.html">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Thing Properties Window">
+			<param name="Local" value="w_thingedit.html">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Things Filters Window">
+			<param name="Local" value="w_thingsfilters.html">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Vertex Properties Window">
+			<param name="Local" value="w_vertexedit.html">
+			</OBJECT>
+	</UL>
+	<LI> <OBJECT type="text/sitemap">
+		<param name="Name" value="Editing Modes">
+		<param name="Local" value="editingmodes.html">
+		</OBJECT>
+	<UL>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="About Editing Modes">
+			<param name="Local" value="editingmodes.html">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Curve Linedefs Mode">
+			<param name="Local" value="e_curvelinedefs.html">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Draw Geometry Mode">
+			<param name="Local" value="e_drawgeometry.html">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Edit Selection Mode">
+			<param name="Local" value="e_editselection.html">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Find &amp; Replace Mode">
+			<param name="Local" value="e_findreplace.html">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Linedefs Mode">
+			<param name="Local" value="e_linedefs.html">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Make Sectors Mode">
+			<param name="Local" value="e_makesectors.html">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Map Analysis Mode">
+			<param name="Local" value="e_mapanalysis.html">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Sectors Mode">
+			<param name="Local" value="e_sectors.html">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Things Mode">
+			<param name="Local" value="e_things.html">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Vertices Mode">
+			<param name="Local" value="e_vertices.html">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Visual Mode">
+			<param name="Local" value="e_visual.html">
+			</OBJECT>
+	</UL>
+	<LI> <OBJECT type="text/sitemap">
+		<param name="Name" value="Configurations">
+		<param name="Local" value="configurations.html">
+		</OBJECT>
+	<UL>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="About Configurations">
+			<param name="Local" value="configurations.html">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Configuration Syntax">
+			<param name="Local" value="configstructure.html">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Compiler Configurations">
+			<param name="Local" value="compilerconfigs.html">
+			</OBJECT>
+		<UL>
+			<LI> <OBJECT type="text/sitemap">
+				<param name="Name" value="About Compiler Configurations">
+				<param name="Local" value="compilerconfigs.html">
+				</OBJECT>
+		</UL>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Game Configurations">
+			<param name="Local" value="gameconfigs.html">
+			</OBJECT>
+		<UL>
+			<LI> <OBJECT type="text/sitemap">
+				<param name="Name" value="About Game Configurations">
+				<param name="Local" value="gameconfigs.html">
+				</OBJECT>
+			<LI> <OBJECT type="text/sitemap">
+				<param name="Name" value="Basic Settings">
+				<param name="Local" value="gc_basicsettings.html">
+				</OBJECT>
+			<LI> <OBJECT type="text/sitemap">
+				<param name="Name" value="Map Format Settings">
+				<param name="Local" value="gc_formatsettings.html">
+				</OBJECT>
+			<LI> <OBJECT type="text/sitemap">
+				<param name="Name" value="Resource Settings">
+				<param name="Local" value="gc_resourcesettings.html">
+				</OBJECT>
+			<LI> <OBJECT type="text/sitemap">
+				<param name="Name" value="Sectors Settings">
+				<param name="Local" value="gc_sectorsettings.html">
+				</OBJECT>
+			<LI> <OBJECT type="text/sitemap">
+				<param name="Name" value="Linedefs Settings">
+				<param name="Local" value="gc_linedefsettings.html">
+				</OBJECT>
+			<LI> <OBJECT type="text/sitemap">
+				<param name="Name" value="Sidedef Settings">
+				<param name="Local" value="gc_sidedefsettings.html">
+				</OBJECT>
+			<LI> <OBJECT type="text/sitemap">
+				<param name="Name" value="Things Settings">
+				<param name="Local" value="gc_thingsettings.html">
+				</OBJECT>
+			<LI> <OBJECT type="text/sitemap">
+				<param name="Name" value="Action Argument Settings">
+				<param name="Local" value="gc_argumentsettings.html">
+				</OBJECT>
+		</UL>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Scripting Configurations">
+			<param name="Local" value="scriptingconfigs.html">
+			</OBJECT>
+		<UL>
+			<LI> <OBJECT type="text/sitemap">
+				<param name="Name" value="About Scripting Configurations">
+				<param name="Local" value="scriptingconfigs.html">
+				</OBJECT>
+		</UL>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="DECORATE keys">
+			<param name="Local" value="gc_decoratekeys.html">
+			</OBJECT>
+	</UL>
+	<LI> <OBJECT type="text/sitemap">
+		<param name="Name" value="GZDoom Builder manual">
+		<param name="Local" value="gz_introduction.html">
+		</OBJECT>
+	<UL>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Features">
+			<param name="Local" value="gzdb\features\features.html">
+			</OBJECT>
+		<UL>
+			<LI> <OBJECT type="text/sitemap">
+				<param name="Name" value="General Interface">
+				<param name="Local" value="gzdb\features\features.html#general">
+				</OBJECT>
+			<UL>
+				<LI> <OBJECT type="text/sitemap">
+					<param name="Name" value="Rendering toolbar">
+					<param name="Local" value="gzdb\features\general\rendering_toolbar.html">
+					</OBJECT>
+				<LI> <OBJECT type="text/sitemap">
+					<param name="Name" value="Multiple engines per game configuration">
+					<param name="Local" value="gzdb\features\general\multi_engines.html">
+					</OBJECT>
+			</UL>
+			<LI> <OBJECT type="text/sitemap">
+				<param name="Name" value="Scripting">
+				<param name="Local" value="gzdb\features\features.html#scripting">
+				</OBJECT>
+			<UL>
+				<LI> <OBJECT type="text/sitemap">
+					<param name="Name" value="Enhanced scripting workflow">
+					<param name="Local" value="gzdb\features\scripting\acs.html">
+					</OBJECT>
+				<LI> <OBJECT type="text/sitemap">
+					<param name="Name" value="Code Snippets">
+					<param name="Local" value="gzdb\features\scripting\snippets.html">
+					</OBJECT>
+			</UL>
+			<LI> <OBJECT type="text/sitemap">
+				<param name="Name" value="New features in Classic and Visual modes">
+				<param name="Local" value="gzdb\features\features.html#allmodes">
+				</OBJECT>
+			<UL>
+				<LI> <OBJECT type="text/sitemap">
+					<param name="Name" value="Enhanced Tag support">
+					<param name="Local" value="gzdb\features\all_modes\tag_support.html">
+					</OBJECT>
+				<LI> <OBJECT type="text/sitemap">
+					<param name="Name" value="Event lines">
+					<param name="Local" value="gzdb\features\all_modes\event_lines.html">
+					</OBJECT>
+				<LI> <OBJECT type="text/sitemap">
+					<param name="Name" value="Testing map from view">
+					<param name="Local" value="gzdb\features\all_modes\test_from_view.html">
+					</OBJECT>
+				<LI> <OBJECT type="text/sitemap">
+					<param name="Name" value="Synchronizing selection">
+					<param name="Local" value="gzdb\features\all_modes\synch_selection.html">
+					</OBJECT>
+				<LI> <OBJECT type="text/sitemap">
+					<param name="Name" value="Synchronizing camera position">
+					<param name="Local" value="gzdb\features\all_modes\synch_camera.html">
+					</OBJECT>
+				<LI> <OBJECT type="text/sitemap">
+					<param name="Name" value="Color Picker plugin">
+					<param name="Local" value="gzdb\features\all_modes\colorpicker.html">
+					</OBJECT>
+				<LI> <OBJECT type="text/sitemap">
+					<param name="Name" value="Tag Explorer plugin">
+					<param name="Local" value="gzdb\features\all_modes\tagexplorer.html">
+					</OBJECT>
+				<LI> <OBJECT type="text/sitemap">
+					<param name="Name" value="Image Browser">
+					<param name="Local" value="gzdb\features\all_modes\texture_browser.html">
+					</OBJECT>
+			</UL>
+			<LI> <OBJECT type="text/sitemap">
+				<param name="Name" value="New features in Classic modes">
+				<param name="Local" value="gzdb\features\features.html#classic">
+				</OBJECT>
+			<UL>
+				<LI> <OBJECT type="text/sitemap">
+					<param name="Name" value="Draw Settings Panel">
+					<param name="Local" value="gzdb\features\classic_modes\drawsettingspanel.html">
+					</OBJECT>
+				<LI> <OBJECT type="text/sitemap">
+					<param name="Name" value="Custom linedef colors">
+					<param name="Local" value="gzdb\features\classic_modes\linedef_color_presets.html">
+					</OBJECT>
+				<LI> <OBJECT type="text/sitemap">
+					<param name="Name" value="Enhanced rectangular selection">
+					<param name="Local" value="gzdb\features\classic_modes\selection.html">
+					</OBJECT>
+			</UL>
+			<LI> <OBJECT type="text/sitemap">
+				<param name="Name" value="New features in Sectors mode">
+				<param name="Local" value="gzdb\features\features.html#sectors">
+				</OBJECT>
+			<LI> <OBJECT type="text/sitemap">
+				<param name="Name" value="New features in Linedefs mode">
+				<param name="Local" value="gzdb\features\features.html#linedefs">
+				</OBJECT>
+			<LI> <OBJECT type="text/sitemap">
+				<param name="Name" value="Draw Rectangle mode">
+				<param name="Local" value="gzdb\features\classic_modes\mode_drawrect.html">
+				</OBJECT>
+			<LI> <OBJECT type="text/sitemap">
+				<param name="Name" value="Draw Ellipse mode">
+				<param name="Local" value="gzdb\features\classic_modes\mode_drawellipse.html">
+				</OBJECT>
+			<LI> <OBJECT type="text/sitemap">
+				<param name="Name" value="Draw Curve mode">
+				<param name="Local" value="gzdb\features\classic_modes\mode_drawcurve.html">
+				</OBJECT>
+			<LI> <OBJECT type="text/sitemap">
+				<param name="Name" value="Draw Grid mode">
+				<param name="Local" value="gzdb\features\classic_modes\mode_drawgrid.html">
+				</OBJECT>
+			<LI> <OBJECT type="text/sitemap">
+				<param name="Name" value="Sound Propagation Mode">
+				<param name="Local" value="gzdb\features\classic_modes\mode_soundpropagation.html">
+				</OBJECT>
+			<LI> <OBJECT type="text/sitemap">
+				<param name="Name" value="Sound Environment Mode">
+				<param name="Local" value="gzdb\features\classic_modes\mode_soundenvironment.html">
+				</OBJECT>
+			<LI> <OBJECT type="text/sitemap">
+				<param name="Name" value="Randomize mode">
+				<param name="Local" value="gzdb\features\all_modes\jitter.html">
+				</OBJECT>
+			<LI> <OBJECT type="text/sitemap">
+				<param name="Name" value="Bridge mode">
+				<param name="Local" value="gzdb\features\classic_modes\mode_drawbridge.html">
+				</OBJECT>
+			<LI> <OBJECT type="text/sitemap">
+				<param name="Name" value="Import Terrain mode">
+				<param name="Local" value="gzdb\features\classic_modes\mode_importterrain.html">
+				</OBJECT>
+			<LI> <OBJECT type="text/sitemap">
+				<param name="Name" value="Snap geometry mode">
+				<param name="Local" value="gzdb\features\classic_modes\mode_snapelements.html">
+				</OBJECT>
+			<LI> <OBJECT type="text/sitemap">
+				<param name="Name" value="New features in Things mode">
+				<param name="Local" value="gzdb\features\features.html#things">
+				</OBJECT>
+			<UL>
+				<LI> <OBJECT type="text/sitemap">
+					<param name="Name" value="Assigning multiple thing types at once">
+					<param name="Local" value="gzdb\features\things_mode\multiple_thing_types.html">
+					</OBJECT>
+				<LI> <OBJECT type="text/sitemap">
+					<param name="Name" value="&quot;Point Thing to Cursor&quot; action">
+					<param name="Local" value="gzdb\features\things_mode\pointthing.html">
+					</OBJECT>
+			</UL>
+			<LI> <OBJECT type="text/sitemap">
+				<param name="Name" value="New features in Vertices mode">
+				<param name="Local" value="gzdb\features\features.html#vertices">
+				</OBJECT>
+			<LI> <OBJECT type="text/sitemap">
+				<param name="Name" value="GZDB Visual mode">
+				<param name="Local" value="gzdb\features\features.html#visual">
+				</OBJECT>
+			<UL>
+				<LI> <OBJECT type="text/sitemap">
+					<param name="Name" value="Visual vertices (UDMF)">
+					<param name="Local" value="gzdb\features\visual_mode\visual_verts.html">
+					</OBJECT>
+				<LI> <OBJECT type="text/sitemap">
+					<param name="Name" value="Using Auto Align Textures actions on floors and ceilings (UDMF)">
+					<param name="Local" value="gzdb\features\visual_mode\autoalignfloors.html">
+					</OBJECT>
+				<LI> <OBJECT type="text/sitemap">
+					<param name="Name" value="&quot;Fit Texture&quot; actions">
+					<param name="Local" value="gzdb\features\visual_mode\texturefit.html">
+					</OBJECT>
+				<LI> <OBJECT type="text/sitemap">
+					<param name="Name" value="&quot;Auto-align Textures to Selection&quot; actions">
+					<param name="Local" value="gzdb\features\visual_mode\autoalign_to_selection.html">
+					</OBJECT>
+			</UL>
+			<LI> <OBJECT type="text/sitemap">
+				<param name="Name" value="New features in Map Analysis mode">
+				<param name="Local" value="gzdb\features\features.html#mapanalysis">
+				</OBJECT>
+			<LI> <OBJECT type="text/sitemap">
+				<param name="Name" value="New features in Find and Replace mode">
+				<param name="Local" value="gzdb\features\features.html#findreplace">
+				</OBJECT>
+			<LI> <OBJECT type="text/sitemap">
+				<param name="Name" value="Custom Fields">
+				<param name="Local" value="gzdb\features\features.html#fields">
+				</OBJECT>
+			<UL>
+				<LI> <OBJECT type="text/sitemap">
+					<param name="Name" value="New custom field types">
+					<param name="Local" value="gzdb\features\custom_fields\newfieldtypes.html">
+					</OBJECT>
+			</UL>
+			<LI> <OBJECT type="text/sitemap">
+				<param name="Name" value="(G)ZDoom features support">
+				<param name="Local" value="gzdb\features\features.html#formats">
+				</OBJECT>
+		</UL>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="(G)ZDoom text lumps support">
+			<param name="Local" value="gzdb\text_lumps.html">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="List of deprecated plugins">
+			<param name="Local" value="gzdb\deprecated_plugins.html">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Compiling GZDoom Builder">
+			<param name="Local" value="gzdb\compilingtheeditor.html">
+			</OBJECT>
+	</UL>
+	<LI> <OBJECT type="text/sitemap">
+		<param name="Name" value="Frequently asked questions">
+		<param name="Local" value="gzdb\faq.html">
+		</OBJECT>
+	<LI> <OBJECT type="text/sitemap">
+		<param name="Name" value="Command Line Parameters">
+		<param name="Local" value="commandlineparams.html">
+		</OBJECT>
+	<LI> <OBJECT type="text/sitemap">
+		<param name="Name" value="System Requirements">
+		<param name="Local" value="systemrequirements.html">
+		</OBJECT>
+</UL>
+</BODY></HTML>
diff --git a/Help/Excluded/actions.html b/Help/Excluded/actions.html
new file mode 100644
index 0000000..1f8bd6b
--- /dev/null
+++ b/Help/Excluded/actions.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>About Actions</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Actions">
+	</object>
+	
+	<div id="title"><h1>About Actions</h1></div>
+	
+	<div id="contents">
+	<p>
+		Every possible user input in Doom Builder is turned in an "action". You can change or assign new controls to these actions in the Preferences Dialog on the Controls tab. Some of these actions are available in all editing modes, which other actions are only available in one or more editing modes. Therefore, you can often re-use the same keys for multiple actions when they are in different editing modes. All the available actions that come with Doom Builder are explained in this part of the Reference Manual.
+	</p>
+	</div>
+</body>
diff --git a/Help/Index.hhk b/Help/Index.hhk
new file mode 100644
index 0000000..ddf4319
--- /dev/null
+++ b/Help/Index.hhk
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<HTML>
+<HEAD>
+<meta name="GENERATOR" content="Microsoft&reg; HTML Help Workshop 4.1">
+<!-- Sitemap 1.0 -->
+</HEAD><BODY>
+<OBJECT type="text/site properties">
+	<param name="WindowName" value="default">
+</OBJECT>
+<UL>
+</UL>
+</BODY></HTML>
diff --git a/Help/Refmanual.hhp b/Help/Refmanual.hhp
new file mode 100644
index 0000000..43286c2
--- /dev/null
+++ b/Help/Refmanual.hhp
@@ -0,0 +1,33 @@
+[OPTIONS]
+Auto Index=Yes
+Compatibility=1.1 or later
+Compiled file=..\Build\Refmanual.chm
+Contents file=Contents.hhc
+Default Font=Verdana,10,0
+Default Window=default
+Default topic=gz_introduction.html
+Display compile progress=Yes
+Full-text search=Yes
+Index file=Index.hhk
+Language=0x409 Àíãëèéñêèé (ÑØÀ)
+Title=GZDoom Builder Reference Manual
+
+[WINDOWS]
+default="GZDoom Builder Reference Manual","Contents.hhc","Index.hhk","gz_introduction.html","gz_introduction.html",,,,,0x42520,300,0x384e,[150,110,1100,800],0x108b0000,,,,,,0
+
+
+[FILES]
+introduction.html
+gz_introduction.html
+header.gif
+gzdb\gz_header.gif
+editingmodes.html
+userinterface.html
+configurations.html
+w_mainwindow.png
+w_scripteditor.png
+classiccontrols.html
+scripts.js
+
+[INFOTYPES]
+
diff --git a/Help/a_template.html b/Help/a_template.html
new file mode 100644
index 0000000..f31c190
--- /dev/null
+++ b/Help/a_template.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>ACTIONTITLE Action</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="ACTIONTITLE">
+	</object>
+	
+	<div id="title"><h1>ACTIONTITLE Action</h1></div>
+	
+	<div id="contents">
+	<p>
+		<h2>Summary</h2>
+		Category: &nbsp; ACTIONCATEGORY<br />
+		<br />
+		ACTIONDESCRIPTION
+		<!--<h2>Remarks</h2>-->
+	</p>
+	</div>
+</body>
diff --git a/Help/classiccontrols.html b/Help/classiccontrols.html
new file mode 100644
index 0000000..3bb7311
--- /dev/null
+++ b/Help/classiccontrols.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>Classic Controls</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
+</head>
+<body>
+	<div id="iframecontents">
+	<p>
+		<table border="0" cellspacing="6" width="90%">
+		<tr>
+			<td width="150" valign="top"><b>E</b></td>
+			<td>Starts the <a href="e_editselection.html" target="_parent">Edit Selection Mode</a> to move, resize, flip and/or rotate the highlighted or selected elements.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b title="Left Mouse Button">LMB</b></td>
+			<td>Click to select or deselect. Hold and drag to make a rectangular selection. While making a rectangular selection you can hold <b>Shift</b> to change the additive behavior.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b title="Right Mouse Button">RMB</b></td>
+			<td>Click once on an element or selection of elements to edit properties. Hold and drag to move the element or selection around. While dragging you can hold <b>Shift</b> to change the Snap-To-Grid behavior, and/or hold <b>Control</b> to change the Snap-To-Geometry behavior.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>C</b></td>
+			<td>Clears the selection.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>Control+C</b></td>
+			<td>Copy the current selection or highlighted element to the clipboard.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>Control+X</b></td>
+			<td>Cuts the current selection or highlighted element and places it on the clipboard.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>Control+V</b></td>
+			<td>Pastes from the clipboard as a new selection in <a href="e_editselection.html" target="_parent">Edit Selection Mode</a>.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>Control+W</b></td>
+			<td>Place or move the Visual Mode camera to the mouse coordinates. Next time you go into <a href="e_visual.html" target="_parent">Visual Mode</a>, you will be at these coordinates.</td>
+		</tr>
+		</table>
+	</p>
+	</div>
+</body>
diff --git a/Help/commandlineparams.html b/Help/commandlineparams.html
new file mode 100644
index 0000000..e42a407
--- /dev/null
+++ b/Help/commandlineparams.html
@@ -0,0 +1,55 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+<title>About Compiler Configurations</title>
+<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
+</head>
+<body>
+<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+  <param name="keyword" value="command line">
+  <param name="keyword" value="arguments">
+</object>
+<div id="gz_title">
+  <h1>Command Line Parameters</h1>
+</div>
+<div id="contents">
+  <p> All command line parameters are case-insensitive.<br />
+    <br />
+    <b class="fat">-portable</b> - <span class="red">GZDB only.</span><br />
+    The editor will be launched in portable mode. It will use the &quot;GZBuilder.cfg&quot; located in the program directory instead of the one located in the &quot;%LocalAppData%\Doom Builder\GZBuilder.cfg&quot; to load and save program settings. Log and crash report files will be also created in the program directory.<br />
+    <br />
+    <b class="fat">-nosettings</b><br />
+    The editor doesn't load or save program settings.<br />
+    <br />
+    <b class="fat">-delaywindow</b><br />
+    Delays showing of the main window.<br />
+    <br />
+    <b class="fat">-map &quot;path\to\mapfile.wad&quot;</b><br />
+    The editor will automatically load the specified map.<br />
+  <h2>The following parameters are used only in conjunction with the &quot;-map&quot; parameter</h2>
+  They replicate the settings, which can be set in the <a href="w_openmapoptions.html">Open Map Window</a>.<br />
+  <br />
+  <b class="fat">-strictpatches</b><br />
+  Enables strict patches rules.<br />
+  <br />
+  <b class="fat">-cfg &quot;path\to\game configuration.cfg&quot;</b><br />
+  <b class="fat">-config &quot;path\to\game configuration.cfg&quot;</b><br />
+  The editor will use the specified game configuration file when loading the map.<br />
+  <br />
+  <b class="fat">-resource &lt;resource type&gt; [flags] &quot;path\to\resource&quot;</b><br />
+  Adds a map resource.<br />
+  <strong>Resource type</strong> (required): &quot;wad&quot;, &quot;dir&quot; or &quot;pk3&quot;.<br />
+  <strong>Flags</strong> (optional):
+  <ul>
+    <li><strong>ROOTTEXTURES</strong> - load images in the root directory of the resource as textures.</li>
+    <li><strong>ROOTFLATS</strong> - load images in the root directory of the resource as flats.</li>
+    <li><strong>STRICTPATCHES</strong> - use strict rules for patches.</li>
+    <li><strong>NOTEST</strong> - exclude this resource from testing parameters.</li>
+  </ul>
+  <strong>Examples:</strong>
+  <pre>
+  -resource pk3 notest "c:\GZDoom\gzdoom.pk3"
+  -resource WAD "c:\Doom\DOOM.WAD"</pre>
+</div>
+</body>
diff --git a/Help/compilerconfigs.html b/Help/compilerconfigs.html
new file mode 100644
index 0000000..f6d6b50
--- /dev/null
+++ b/Help/compilerconfigs.html
@@ -0,0 +1,87 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+<title>About Compiler Configurations</title>
+<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
+</head>
+<body>
+<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+  <param name="keyword" value="Configurations">
+  <param name="keyword" value="Compiler Configurations">
+</object>
+<div id="title">
+  <h1>About Compiler Configurations</h1>
+</div>
+<div id="contents">
+  <p>Compiler configurations are required to use script compilers and nodebuilders from the editor.<br />
+    Compiler configurations are loaded from *.cfg files placed in the "Compilers" directory or it's subdirectories.</p>
+  <h2>Script compiler configurations:</h2>
+  Typical script compiler configuration consists from a single block:
+  </p>
+  <h3>"Compilers" block:</h3>
+  Defines what files a compiler uses.
+  The setting named "program" defines what .exe to run.
+  The "interface" setting defines what interal interface to use for processing and error feedback (currenttly the only valid value is "AccCompiler"). All others are the required files (the setting names do not matter).
+  </p>
+  <p><strong>Example:</strong>
+  <pre>
+compilers
+{
+	zdoom_acc
+	{
+		interface = "AccCompiler";
+		program = "acc.exe";
+		zcommon = "zcommon.acs";
+		zdefs = "zdefs.acs";
+		zspecial = "zspecial.acs";
+		zwvars = "zwvars.acs";
+	}
+}
+</pre>
+  </p>
+  <h2>Nodebuilder configurations:</h2>
+  Typical nodebuilder configuration consists from two blocks:
+  </p>
+  <h3>"Compilers" block:</h3>
+  Defines what files a compiler uses.<br />
+  The setting named "program" defines what .exe to run.<br />
+  The "interface" setting defines what interal interface to use for processing and error feedback (currenttly the only valid value is "NodesCompiler").
+  </p>
+  <p><strong>Example:</strong>
+  <pre>
+compilers
+{
+	zdbsp
+	{
+		interface = "NodesCompiler";
+		program = "zdbsp.exe";
+	}
+}
+</pre>
+  </p>
+  <h3>"Nodebuilders" block:</h3>
+  Defines various presets for the nodebuilder defined in "compilers" block (you can then pick which ones of these to use in the <a href="w_gameconfigurations.html">Game Configurations Window</a>). <strong>NOTE:</strong> Nodebuilder configuration key names defined here must be unique for all nodebuilders!
+  It's recommended to start the key name with the name of the compiler, followed by underscore and a specific name. The &quot;compiler&quot; setting must refer to an existing compiler, but it does not have to be a compiler defined in the same configuration file.<br />
+  <br />
+  "<strong>parameters</strong>" setting supports the following wildcards:
+  <ul style="list-style-type:none;">
+    <li>"%FI" - input file path.</li>
+    <li>"%FO" - output file path.</li>
+  </ul>
+  <strong>Example:</strong>
+  <pre>
+nodebuilders
+{
+	zdbsp_normal
+	{
+		title = "ZDBSP - Normal (no reject)"; // name to display in the Game Configurations Window
+		compiler = "zdbsp"; // must match a nodebuilder block name defined in a "compiler" block
+		parameters = "-c -o%FO %FI"; // command line parameters
+	}
+}
+</pre>
+  </p>
+</div>
+</body>
+
diff --git a/Help/configstructure.html b/Help/configstructure.html
new file mode 100644
index 0000000..3c0e734
--- /dev/null
+++ b/Help/configstructure.html
@@ -0,0 +1,262 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>Configuration Syntax</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Configurations">
+	<param name="keyword" value="Structure">
+	<param name="keyword" value="Syntax">
+	</object>
+	
+	<div id="title"><h1>Configuration Syntax</h1></div>
+	
+	<div id="contents">
+	<p>
+		All configurations used with Doom Builder follow a specific, structured syntax. The configurations are all in plain text format and can be edited with any plain text editor. Every setting in a configuration is in the following form:
+	</p>
+<pre>
+settingname = value;
+</pre>
+	<p>Here are a few examples:</p>
+<pre>
+doublesidedflag = 4;
+defaulttexturescale = 1.0f;
+scaledtextureoffsets = true;
+gamename = "Doom";
+</pre>
+	<p>
+	There are a few rules to the setting names and values:
+	<ul>
+		<li>The setting name may not contain any spaces, tabs, newlines, dots or (back)slashes.
+		<li>The setting name must be unique within the configuration, or within the structure it is in.
+		<li>A decimal value must contain a dot and must end with '<b>f</b>'
+		<li>Boolean settings may use the keywords <b>true</b> and <b>false</b>.
+		<li>Strings (texts) must begin with a doublequote (<b>&quot;</b>) and end with a doublequote. To include a doublequote in the string, prefix it with a backslash (<b>\&quot;</b>). To use a backslash in a string, also prefix it with a backslash.
+	</ul>
+	Some settings do not require a value and their precense or absense alone is enough. Such a case would look like this:
+	</p>
+<pre>
+enablelighting;
+</pre>
+	<p>
+		C-style comments can be inserted by using double slashes (<b>//</b>) for singleline comments and <b>/*</b> and <b>*/</b> for block comments. These comments will be completely ignored by Doom Builder. You can hide writings about your wildest dreams in configuration files!
+	</p>
+	
+	
+	
+	<h2>Structures</h2>
+	<p>
+		Configurations can also contain <b>structures</b>. Think of them as a collection of settings that have their own name space. The structure begins with a name and opens with an opening bracket (<b>{</b>). At the end of the structure it closes with a closing bracktet (<b>}</b>). It is common to ident the settings inside the structure with a single tab to make it easier to see that those settings belong in a structure. An example of a structure with settings:
+	</p>
+<pre>
+winningnumbers
+{
+	car = 55;
+	washmachine = 40;
+	tools = 30;
+}
+</pre>
+	<p>
+		Structures are often used by Doom Builder in cases where multiple collections of settings can be found. The name of a structure can also be just a number, so that a structure can describe information about a specific index number. Here is an example of such a case:
+	</p>
+<pre>
+things
+{
+	1
+	{
+		name = "Player 1 start";
+		color = "green";
+	}
+	
+	2
+	{
+		name = "Player 2 start";
+		color = "green";
+	}
+	
+	138
+	{
+		name = "Hideous monster";
+		color = "red";
+	}
+}
+</pre>
+	Please note that in some structures, the order of the settings and structures is important.
+	
+	
+	
+	<h2>Including</h2>
+	<p>
+		Some configurations (such as the Game Configurations) can become very large and complex, while some share the same values in many settings. For example, Eternity is a game engine that inherits features from Doom and Boom and adds on top of that. This is where including pieces from other configuration files becomes interesting. With the <b>include</b> function, we can insert features from Doom, then insert (and possible override) features from Boom and then add the Eternity ones. This saves us rewriting all the Doom and Boom features that already exists in other configurations.<br />
+		<br />
+		The include function takes two arguments. The first (mandatory) is the filename (path relative to the current file) and the second (optional) is the name of the structure to include. If the second argument is not given, the entire file will be included. Here is an example that shows how such an include functions look like:
+	</p>
+<pre>
+include("commonsettings.cfg");
+include("extras.cfg", "skills");
+</pre>
+	<p>
+		Below are a few examples that show what the results are when including settings that override settings with the same names among other things. For these examples we will be including a file named &quot;extras.cfg&quot;, which contains the following settings:
+	</p>
+<pre>
+maxtexturenamelength = 8;
+skyflatname = "F_SKY1";
+
+options
+{
+	1 = "Low";
+	2 = "Medium";
+	3 = "High";
+}
+</pre>
+	<p>
+		This example shows how the include function includes an entire file. This is the most basic include:
+	</p>
+<pre>
+thingflags
+{
+	1 = "Easy";
+	2 = "Medium";
+	4 = "Hard";
+}
+
+include("extras.cfg");
+</pre>
+	<p>Result:</p>
+<pre>
+thingflags
+{
+	1 = "Easy";
+	2 = "Medium";
+	4 = "Hard";
+}
+
+maxtexturenamelength = 8;
+skyflatname = "F_SKY1";
+
+options
+{
+	1 = "Low";
+	2 = "Medium";
+	3 = "High";
+}
+</pre>
+	<p>
+		The following example shows how a single structure from extras.cfg is included. Notice how only the contents of the structure are included and not the structure container itsself!
+	</p>
+<pre>
+thingflags
+{
+	1 = "Easy";
+	2 = "Medium";
+	4 = "Hard";
+}
+
+include("extras.cfg", "options");
+</pre>
+	<p>Result:</p>
+<pre>
+thingflags
+{
+	1 = "Easy";
+	2 = "Medium";
+	4 = "Hard";
+}
+
+1 = "Low";
+2 = "Medium";
+3 = "High";
+</pre>
+	<p>
+		If we want our included settings in a structure, we have to put the include function in the structure where we want our settings included. See the following example:
+	</p>
+<pre>
+thingflags
+{
+	1 = "Easy";
+	2 = "Medium";
+	4 = "Hard";
+}
+
+options
+{
+	0 = "None";
+	
+	include("extras.cfg", "options");
+	
+	4 = "Ultra";
+}
+</pre>
+	<p>Result:</p>
+<pre>
+thingflags
+{
+	1 = "Easy";
+	2 = "Medium";
+	4 = "Hard";
+}
+
+options
+{
+	0 = "None";
+	
+	1 = "Low";
+	2 = "Medium";
+	3 = "High";
+	
+	4 = "Ultra";
+}
+</pre>
+	<p>
+		The following example demonstrates how values can be overridden by using the same same setting name. It also shows that this does NOT change the order of the items. The first time an item is defined (either by including or because it is written) is where its position will be. See this example:
+	</p>
+<pre>
+thingflags
+{
+	1 = "Easy";
+	2 = "Medium";
+	4 = "Hard";
+}
+
+options
+{
+	0 = "None";
+	
+	include("extras.cfg", "options");
+	
+	2 = "Average";
+	4 = "Ultra";
+}
+</pre>
+	<p>Result:</p>
+<pre>
+thingflags
+{
+	1 = "Easy";
+	2 = "Medium";
+	4 = "Hard";
+}
+
+options
+{
+	0 = "None";
+	
+	1 = "Low";
+	2 = "Average";
+	3 = "High";
+	
+	4 = "Ultra";
+}
+</pre>
+	<p>
+		Notice how the definition of setting &quot;2&quot; (&quot;Average&quot;) does not move the already defined &quot;2&quot; (&quot;Medium&quot;), but instead only changes its value to &quot;Average&quot;.
+	</p>
+	</div>
+</body>
diff --git a/Help/configurations.html b/Help/configurations.html
new file mode 100644
index 0000000..f3fca68
--- /dev/null
+++ b/Help/configurations.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>About Configurations</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Configurations">
+	</object>
+	
+	<div id="title"><h1>About Configurations</h1></div>
+	
+	<div id="contents">
+	<p>
+		Doom Builder is a very flexible editor that can be customized for your own sourceport or mapping project. Most of the settings that are different among the sourceports are in configuration files. You can find these configurations in the subdirectories of your Doom Builder program directory. This part of the Reference Manual helps you writing your own configurations, but is only recommended for advanced users.
+	</p>
+	<p>
+		You can safely create your own configurations for your mapping project or sourceport. If there are any errors in your configuration, Doom Builder will show these in the <a href="w_errorsandwarnings.html">Errors & Warnings dialog</a>. Doom Builder is installed with several configurations which can be great examples to see how these things work. It is recommended to always create new configurations in separate files. Do not modify the files that are installed by Doom Builder, as these will be overwritten when a new version is installed.
+	</p>
+	<p>
+		When you made changes to the configurations in the Doom Builder subdirectories, you must restart Doom Builder to reload the configurations with your changes.
+	</p>
+	</div>
+</body>
diff --git a/Help/default.css b/Help/default.css
new file mode 100644
index 0000000..694cf3f
--- /dev/null
+++ b/Help/default.css
@@ -0,0 +1,180 @@
+body
+{
+	background: #ffffff;
+	margin: 0 auto;
+	font: 76% Verdana,Tahoma,Arial,sans-serif;
+	text-align: left;
+	padding: 0 0 0 0;
+}
+
+#title, #gz_title
+{
+	background: #f4f4f4 url(header.gif) bottom right no-repeat;
+	color: #515151;
+	clear: both;
+	margin: 0 0 0 0;
+	padding: 0;
+	height: 47px;
+	border-bottom-style: solid;
+	border-bottom-color: #ffffff;
+	border-bottom-width: 2px;
+}
+
+#gz_title
+{
+	background: #f4f4f4 url(gzdb/gz_header.gif) bottom right no-repeat;
+	height: 52px;
+}
+
+#contents
+{
+	background: #ffffff;
+	padding: 0 10px 10px 10px;
+	line-height: 1.6em;
+	border-top-style: solid;
+	border-top-color: #f4f4f4;
+	border-top-width: 2px;
+}
+
+#iframecontents
+{
+	background: #ffffff;
+	padding: 0 0 0 0;
+	line-height: 1.6em;
+	border-top-style: none;
+}
+
+input.spoilerbutton 
+{
+	border: 1px solid #81776D;
+	height: 20px;
+}
+
+pre
+{
+	background: #f4f4f4;
+	color: #515151;
+	width: 95%;
+	margin: 10px 0px 10px 20px;
+	font: 100% Courier New,Courier,sans-serif;
+	text-align: left;
+	padding: 5px 5px 5px 10px;
+	border-style: solid;
+	border-color: #E0E0E0;
+	border-width: 1px;
+}
+
+h1
+{
+	padding: 10px 10px 10px 10px;
+	font-size: 1.8em;
+	margin: 0 0 0.5em 0;
+}
+
+h2
+{
+	color: #515151;
+	font-size: 1.5em;
+	margin: 1.5em 0 0.2em;
+}
+
+h3
+{
+	color: #515151;
+	font-size: 1.1em;
+	margin: 1.0em 0 0.1em;
+}
+
+img
+{
+	padding: 1px;
+	display:inline;
+	background: #FFFFFF;
+	border: 0;
+}
+
+a
+{
+	text-decoration: none;
+	color: #286ea0;
+}
+
+a:hover
+{
+	text-decoration: underline;
+	color: #286ea0;
+}
+
+a img
+{
+	border: 0;
+}
+
+.left
+{
+	margin: 10px 10px 5px 0;
+	float: left;
+}
+
+.right
+{
+	margin: 10px 0 5px 10px;
+	float: right;
+}
+
+.textright
+{
+	text-align: right;
+}
+
+.center
+{
+	text-align: center;
+}
+
+.small
+{
+	font-size: 0.8em;
+}
+
+.bold
+{
+	font-weight: bold;
+}
+
+.grey
+{
+	color: #8C8C8C;
+}
+
+.greycenter
+{
+	color: #8C8C8C;
+	text-align: center;
+}
+
+.fat
+{
+	color: #515151;
+	font-size: 1.1em;
+}
+
+.red
+{
+	color: #990000;
+	font-weight: bold;
+}
+
+.blue
+{
+	color: #0066FF;
+	font-weight: bold;
+}
+
+.big
+{
+  color: #515151;
+	font-size: large;
+	font-weight: bold;
+}
+
diff --git a/Help/e_curvelinedefs.html b/Help/e_curvelinedefs.html
new file mode 100644
index 0000000..3dadb93
--- /dev/null
+++ b/Help/e_curvelinedefs.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>Curve Linedefs Mode</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
+	<script type="text/javascript" src="scripts.js"></script>
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Curve Linedefs Mode">
+	</object>
+	
+	<div id="title"><h1>Curve Linedefs Mode</h1></div>
+	
+	<div id="contents">
+	<p>
+		This mode shows a small dialog window that you can use to create a curve from a linedef or multiple linedefs. The linedefs will be split in a number of smaller linedefs that make up the curve. Although this mode shows a dialog window, you can still use the main interface and zoom/move your view around the map.<br />
+		<br />
+		The curve linedefs editing mode is one of the classic (2D) editing modes. This mode is volatile, which means that this mode returns to the previous stable mode when the map is saved or closed, either accepting or discarding your preview changes. You can access this mode through the <a href="e_linedefs.html">Linedefs Mode</a>.
+		
+		<h2>Default Controls</h2>
+		<table border="0" cellspacing="6" width="90%">
+		<tr>
+			<td width="150" valign="top"><b>Enter</b></td>
+			<td>Accept and apply the changes, and return to the previous mode.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>Escape</b></td>
+			<td>Discard the changes and return to the previous mode.</td>
+		</tr>
+		</table>
+	</p>
+	</div>
+</body>
diff --git a/Help/e_drawgeometry.html b/Help/e_drawgeometry.html
new file mode 100644
index 0000000..c154fcd
--- /dev/null
+++ b/Help/e_drawgeometry.html
@@ -0,0 +1,58 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>Draw Geometry Mode</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
+	<script type="text/javascript" src="scripts.js"></script>
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Draw Geometry Mode">
+	<param name="keyword" value="Drawing">
+	<param name="keyword" value="Split Sector">
+	</object>
+	
+	<div id="title"><h1>Draw Geometry Mode</h1></div>
+	
+	<div id="contents">
+	<p>
+		This editing mode allows you to draw your geometry. Draw lines by clicking with the left mouse button (<b>LMB</b>) where you want your vertices. Depending on the toolbar buttons, the vertex you are drawing next will snap to the grid and/or to nearby geometry. You can change this behavior by holding down Shift and/or Control. Your drawing ends when you draw onto the first drawn vertex (making a closed polygon) or when you press your right mouse button (<b>RMB</b>).<br />
+		<br />
+		Contrary to drawing in older editors, it is not required to draw in any specific way, such as drawing clockwise or drawing a complete polygon. You also do not need to traverse your existing lines when drawing a sector adjacent to existing geometry. The editor will solve any lines your drawing crosses, split sector you draw across and creates new sectors where needed.<br />
+		<br />
+		This editing mode is one of the classic (2D) editing modes. This mode is volatile, which means that this mode returns to the previous stable mode when the map is saved or closed, either accepting or discarding your preview changes. You can access this mode by pressing <b>Control+D</b> in any classic mode.
+		
+		<h2>Default Controls</h2>
+		<table border="0" cellspacing="6" width="90%">
+		<tr>
+			<td width="150" valign="top"><b>Control+D</b></td>
+			<td>Starts this drawing mode (available from any classic mode).</td>
+		</tr>
+		<tr>
+			<td width="150" valign="top"><b>Enter</b></td>
+			<td>Accept and apply the changes, and return to the previous mode.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>Escape</b></td>
+			<td>Discard the changes and return to the previous mode.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>Backspace</b></td>
+			<td>Removes the last drawn vertex.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b title="Left Mouse Button">LMB</b></td>
+			<td>Draws a new line by placing a vertex at the mouse cursor. Use in combination with Shift and/or Control to change the snapping behavior.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b title="Right Mouse Button">LMB</b></td>
+			<td>Ends and applies the drawing, and returns to the previous editing mode.</td>
+		</tr>
+		</table>
+	</p>
+	</div>
+</body>
diff --git a/Help/e_editselection.html b/Help/e_editselection.html
new file mode 100644
index 0000000..b8dc5fb
--- /dev/null
+++ b/Help/e_editselection.html
@@ -0,0 +1,52 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>Edit Selection Mode</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
+	<script type="text/javascript" src="scripts.js"></script>
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Edit Selection Mode">
+	<param name="keyword" value="Rotate">
+	<param name="keyword" value="Resize">
+	<param name="keyword" value="Flip Horizontally">
+	<param name="keyword" value="Flip Vertically">
+	</object>
+	
+	<div id="title"><h1>Edit Selection Mode</h1></div>
+	
+	<div id="contents">
+	<p>
+		With this editing mode you can perform some more advanced operations on a selection of geometry or things. This editing mode is one of the classic (2D) editing modes. This mode is volatile, which means that this mode returns to the previous stable mode when the map is saved or closed, either accepting or discarding your preview changes. You can access this mode by making a selection or highlight and pressing <b>E</b> in most classic modes. Clicking on the map outside the selection will return to the previous mode, applying your changes.
+		
+		<h2>Functions</h2>
+		<h3>Drag selection</h3>
+		You can drag the selection by holding <b title="Left Mouse Button">LMB</b> on the selection rectangle to grab it and move it around. When grabbing the selection, the nearby vertex is highlighted and will be used to snap to other geometry while dragging.
+		<h3>Flip Horizontally</h3>
+		Accessible from the toolbar or by shortcut key, you can flip the entire selection horizontally. It is recommended to do this before rotating the selection.
+		<h3>Flip Vertically</h3>
+		Accessible from the toolbar or by shortcut key, you can flip the entire selection vertically. It is recommended to do this before rotating the selection.
+		<h3>Resize</h3>
+		Grab one of the handles on the edges of the selection rectangle using <b title="Left Mouse Button">LMB</b> and drag it to resize the selection. You can drag your mouse away from the selection and a ruler will appear that allows you to align the grabbed edge of the selection with existing geometry.
+		<h3>Rotate</h3>
+		Grab one of the handles on the corners of the selection rectangle using <b title="Left Mouse Button">LMB</b> and drag it to rotate the selection. The selection will normally only rotate by the nearest 45 degrees. You can hold Shift to rotate it freely.
+		
+		<h2>Default Controls</h2>
+		<table border="0" cellspacing="6" width="90%">
+		<tr>
+			<td width="150" valign="top"><b>Enter</b></td>
+			<td>Accept and apply the changes, and return to the previous mode.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>Escape</b></td>
+			<td>Discard the changes and return to the previous mode.</td>
+		</tr>
+		</table>
+	</p>
+	</div>
+</body>
diff --git a/Help/e_findreplace.html b/Help/e_findreplace.html
new file mode 100644
index 0000000..4de7a31
--- /dev/null
+++ b/Help/e_findreplace.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>Find &amp; Replace Mode</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
+	<script type="text/javascript" src="scripts.js"></script>
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Find &amp; Replace Mode">
+	</object>
+	
+	<div id="title"><h1>Find &amp; Replace Mode</h1></div>
+	
+	<div id="contents">
+	<p>
+		Looking for something? This is the mode you want to use to quickly find specific elements in your map. This mode is accessible from any classic mode using <b>F3</b> and shows a dialog window that you can use to find items. Select the type of search you want to perform at the top of the dialog window. Then enter the value you are looking for. Depending on the type of search, you can click the browse button to select from a browser. Check the <b>Replace</b> checkbox if you want to replace the value of the found elements with another value. Click the Find / Replace button to perform the search.<br />
+		<br />
+		The results will be displayed in a list that opens. Click on one of the results to zoom in on that particular element. You can also focus the main window and scroll or zoom the map to see the selected elements. Click the <b>Edit Selection</b> button to edit the selected elements.
+	</p>
+	</div>
+</body>
diff --git a/Help/e_linedefs.html b/Help/e_linedefs.html
new file mode 100644
index 0000000..166ad9d
--- /dev/null
+++ b/Help/e_linedefs.html
@@ -0,0 +1,68 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>Linedefs Mode</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
+	<script type="text/javascript" src="scripts.js"></script>
+</head>
+<body onresize="autoadjustheight('classiccontrols')">
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Linedefs Mode">
+	<param name="keyword" value="Sidedefs">
+	</object>
+	
+	<div id="title"><h1>Linedefs Mode</h1></div>
+	
+	<div id="contents">
+	<p>
+		With this mode you can edit the linedefs in your map. Every linedef has a front (right) and back (left) side which make up the boundaries of your sectors. You can edit the sidedef properties through the linedefs in this mode. Drag the linedefs to move them and snap them to the <a href="w_gridsetup.html">grid</a> and other geometry. Hold Shift and/or Control to disable snapping to the grid and geometry.<br />
+		<br />
+		The linedefs editing mode is one of the classic (2D) editing modes.
+		
+		<h2>Default Controls</h2>
+		<table border="0" cellspacing="6" width="90%">
+		<tr>
+			<td width="150" valign="top"><b>L</b></td>
+			<td>Switches from any other classic editing mode to this mode.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>Insert</b></td>
+			<td>Starts the <a href="e_drawgeometry.html">Draw Geometry Mode</a>.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>Delete</b></td>
+			<td>Deletes the selected linedefs. Note that this may break your sectors.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>F</b></td>
+			<td>Flips the linedef and changes the sidedefs so that they remain in their correct position.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>Shift+F</b></td>
+			<td>Flips the sidedefs to the other side of the linedef.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>Shift+S</b></td>
+			<td>Splits the linedef with a new vertex on the linedef, nearest to your mouse position.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>Shift+1</b></td>
+			<td>Keeps only the single-sided linedefs selected.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>Shift+2</b></td>
+			<td>Keeps only the double-sided linedefs selected.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>Shift+C</b></td>
+			<td>Starts the <a href="e_curvelinedefs.html">Curve Linedefs Mode</a> to make curves with the selected or highlighted linedefs.</td>
+		</tr>
+		</table>
+		<iframe src="classiccontrols.html" frameborder="0" width="100%" id="classiccontrols" scrolling="no" onload="autoadjustheight('classiccontrols')"></iframe>
+	</p>
+	</div>
+</body>
diff --git a/Help/e_makesectors.html b/Help/e_makesectors.html
new file mode 100644
index 0000000..6521263
--- /dev/null
+++ b/Help/e_makesectors.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>Make Sectors Mode</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
+	<script type="text/javascript" src="scripts.js"></script>
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Make Sectors Mode">
+	</object>
+	
+	<div id="title"><h1>Make Sectors Mode</h1></div>
+	
+	<div id="contents">
+	<p>
+		With this mode you can create new sectors from existing geometry only. This is useful to fix broken sectors, split the islands from a single sector into multiple sectors, or create sectors from enclosed void areas. When moving the mouse over the map, the potential sector is highlighted. Use <b title="Left Mouse Button">LMB</b> to create the new sector.<br />
+		<br />
+		The Make Sectors editing mode is one of the classic (2D) editing modes.
+		
+		<h2>Default Controls</h2>
+		<table border="0" cellspacing="6" width="90%">
+		<tr>
+			<td width="150" valign="top"><b>M</b></td>
+			<td>Switches from any other classic editing mode to this mode.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b title="Left Mouse Button">LMB</b></td>
+			<td>Click to create a new, closed sector.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b title="Right Mouse Button">RMB</b></td>
+			<td>Click to create a new, closed sector and edit its properties.</td>
+		</tr>
+		</table>
+	</p>
+	</div>
+</body>
diff --git a/Help/e_mapanalysis.html b/Help/e_mapanalysis.html
new file mode 100644
index 0000000..b6f067f
--- /dev/null
+++ b/Help/e_mapanalysis.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>Map Analysis Mode</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
+	<script type="text/javascript" src="scripts.js"></script>
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Map Analysis Mode">
+	<param name="keyword" value="Error Checking">
+	</object>
+	
+	<div id="title"><h1>Map Analysis Mode</h1></div>
+	
+	<div id="contents">
+	<p>
+		This mode helps finding problems in your map. It shows a small dialog window with the checks you wish to perform. Press <b>F4</b> in any classic mode to switch to this mode. Select the checks to perform and click the <b>Start Analysis</b> button. The problems that are found are displayed in a list. Click on of the problems to zoom in on the subject and show a description of the problem below the list. For some problems, buttons appear below the description that you can use to quickly fix the problem.
+	</p>
+	</div>
+</body>
diff --git a/Help/e_sectors.html b/Help/e_sectors.html
new file mode 100644
index 0000000..90d40c6
--- /dev/null
+++ b/Help/e_sectors.html
@@ -0,0 +1,88 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>Sectors Mode</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
+	<script type="text/javascript" src="scripts.js"></script>
+</head>
+<body onresize="autoadjustheight('classiccontrols')">
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Sectors Mode">
+	<param name="keyword" value="Join Sectors">
+	<param name="keyword" value="Merge Sectors">
+	<param name="keyword" value="Stairs">
+	</object>
+	
+	<div id="title"><h1>Sectors Mode</h1></div>
+	
+	<div id="contents">
+	<p>
+		In this mode you can edit the sectors in your map. Every sector is formed by the sidedefs around the sector (which are the sides of the linedefs). Drag the sectors to move them and snap them to the <a href="w_gridsetup.html">grid</a> and other geometry. Hold Shift and/or Control to disable snapping to the grid and geometry. You can also create a stairs or gradient brightness by using the buttons on the toolbar.<br />
+		<br />
+		The order in which you select the sectors is important to some of the functions of the editing mode and, as long as you stay in an editing mode that keeps sectors selected, the order will stay the same. When you select the sectors, the order will be displayed with numbers in the sectors.<br />
+		<br />
+		The sectors editing mode is one of the classic (2D) editing modes.
+		
+		<h2>Default Controls</h2>
+		<table border="0" cellspacing="6" width="90%">
+		<tr>
+			<td width="150" valign="top"><b>S</b></td>
+			<td>Switches from any other classic editing mode to this mode.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>Insert</b></td>
+			<td>Starts the <a href="e_drawgeometry.html">Draw Geometry Mode</a>.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>Delete</b></td>
+			<td>Deletes the selected sectors and associated sidedefs. When deleting a sector that is enclosed inside a larger sector, this will create a hole (or 'pillar') inside that sector. If you wish to remove the sector without creating a void area, use the <a href="e_linedefs.html">Linedefs Mode</a> to delete the lines instead.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>J</b></td>
+			<td>Joins to selected sector to become one sector. The properties of the first selected sector will be retained.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>Shift+J</b></td>
+			<td>Merge the selected sectors to become one sector. This is the same as joining, with the addition that lines in between the selected sectors are automatically removed.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>Shift+D</b></td>
+			<td>Create a door from the selected or highlighted sectors. This will show a dialog which allows you to choose textures and flats for the door.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>G</b></td>
+			<td>Make gradient brightness levels from first selected sector to last selected sector.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>Shift+ScrollDown</b></td>
+			<td>Lowers the ceiling of the selected or highlighted sectors by 8 mappixels.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>Shift+ScrollUp</b></td>
+			<td>Raises the ceiling of the selected or highlighted sectors by 8 mappixels.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>Shift+G</b></td>
+			<td>Make gradient ceiling heights from first selected sector to last selected sector.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>Control+ScrollDown</b></td>
+			<td>Lowers the floors of the selected or highlighted sectors by 8 mappixels.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>Control+ScrollUp</b></td>
+			<td>Raises the floors of the selected or highlighted sectors by 8 mappixels.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>Control+G</b></td>
+			<td>Make gradient floor heights (stairs) from first selected sector to last selected sector.</td>
+		</tr>
+		</table>
+		<iframe src="classiccontrols.html" frameborder="0" width="100%" id="classiccontrols" scrolling="no" onload="autoadjustheight('classiccontrols')"></iframe>
+	</p>
+	</div>
+</body>
diff --git a/Help/e_things.html b/Help/e_things.html
new file mode 100644
index 0000000..91a9a82
--- /dev/null
+++ b/Help/e_things.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>Things Mode</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
+	<script type="text/javascript" src="scripts.js"></script>
+</head>
+<body onresize="autoadjustheight('classiccontrols')">
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Things Mode">
+	</object>
+	
+	<div id="title"><h1>Things Mode</h1></div>
+	
+	<div id="contents">
+	<p>
+		With this editing mode you edit the things in your map. Drag the things to move them and snap them to the <a href="w_gridsetup.html">grid</a>. Hold Shift to disable snapping to the grid. You can use the <a href="w_thingsfilters.html">Things Filter</a> in the toolbar to show only things with specific properties (such as multiplayer things or things that only appear at a hard skill level).<br />
+		<br />
+		The things editing mode is one of the classic (2D) editing modes.
+		
+		<h2>Default Controls</h2>
+		<table border="0" cellspacing="6" width="90%">
+		<tr>
+			<td width="150" valign="top"><b>T</b></td>
+			<td>Switches from any other classic editing mode to this mode.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>Insert</b></td>
+			<td>Inserts a new thing.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>Delete</b></td>
+			<td>Deletes the selected or highlighted things.</td>
+		</tr>
+		</table>
+		<iframe src="classiccontrols.html" frameborder="0" width="100%" id="classiccontrols" scrolling="no" onload="autoadjustheight('classiccontrols')"></iframe>
+	</p>
+	</div>
+</body>
diff --git a/Help/e_vertices.html b/Help/e_vertices.html
new file mode 100644
index 0000000..c6e87b6
--- /dev/null
+++ b/Help/e_vertices.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>Vertices Mode</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
+	<script type="text/javascript" src="scripts.js"></script>
+</head>
+<body onresize="autoadjustheight('classiccontrols')">
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Vertices Mode">
+	</object>
+	
+	<div id="title"><h1>Vertices Mode</h1></div>
+	
+	<div id="contents">
+	<p>
+		This editing mode allows you to edit the vertices in your map. You can insert new vertices that automatically split linedefs and deleting a vertex that only has two linedefs attached will reconnect the linedefs properly. You can drag the vertices to move them and snap them to the <a href="w_gridsetup.html">grid</a> and geometry. Hold Shift and/or Control to disable snapping to the grid and geometry.<br />
+		<br />
+		The vertices editing mode is one of the classic (2D) editing modes.
+		
+		<h2>Default Controls</h2>
+		<table border="0" cellspacing="6" width="90%">
+		<tr>
+			<td width="150" valign="top"><b>V</b></td>
+			<td>Switches from any other classic editing mode to this mode.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>Insert</b></td>
+			<td>Inserts a new vertex at the mouse coordinates. When near a linedef, the linedef will be split with this vertex.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>Delete</b></td>
+			<td>Deletes the selected vertices. Note that this may also remove attached linedefs and break your sectors.</td>
+		</tr>
+		</table>
+		<iframe src="classiccontrols.html" frameborder="0" width="100%" id="classiccontrols" scrolling="no" onload="autoadjustheight('classiccontrols')"></iframe>
+	</p>
+	</div>
+</body>
diff --git a/Help/e_visual.html b/Help/e_visual.html
new file mode 100644
index 0000000..6a3d133
--- /dev/null
+++ b/Help/e_visual.html
@@ -0,0 +1,181 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>Visual Mode</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
+	<script type="text/javascript" src="scripts.js"></script>
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Visual Mode">
+	<param name="keyword" value="3D Mode">
+	</object>
+	
+	<div id="title"><h1>Visual Mode</h1></div>
+	
+	<div id="contents">
+	<p>
+		The Visual Mode is different from the other modes. In this mode you can walk and fly through your map in 3D and see it as it would look like in game. With the crosshair you can aim at objects (floors, ceilings, walls and things) and edit them instantly. You can also select objects and perform actions on all objects together. Note that not all actions apply to an entire selection.
+		
+		<h2>Default Controls</h2>
+		<table border="0" cellspacing="6" width="90%">
+		<tr>
+			<td width="150" valign="top"><b>W</b></td>
+			<td>Switches from any classic editing mode to this mode and back to the previous mode.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b title="Left Mouse Button">LMB</b></td>
+			<td>Select the targeted object. For walls, hold down this button to drag the texture offsets.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b title="Right Mouse Button">RMB</b></td>
+			<td>Edit the targeted object's properties.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b title="Middle Mouse Button">MMB</b></td>
+			<td>Pastes the copied texture image or flat image onto the target or selection.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b title="Control + Right Mouse Button">Control+RMB</b></td>
+			<td>Opens the <a href="w_imagesbrowser.html">Image Browser</a> to select a new texture or flat for the targeted or selected object.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b title="Shift + Middle Mouse Button">Shift+MMB</b></td>
+			<td>Flood-fills with the copied texture image or flat image onto the target. This fills all adjacent textures or flats that are identical to the original. Note that this action is only applied to the targeted object and does not work for a selection.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>C</b></td>
+			<td>Clears the selection.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>E</b></td>
+			<td>Move forward. Hold Shift to move faster.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>D</b></td>
+			<td>Move backward. Hold Shift to move faster.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>S</b></td>
+			<td>Strafe left. Hold Shift to move faster.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>F</b></td>
+			<td>Strafe right. Hold Shift to move faster.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>G</b></td>
+			<td>Toggle gravity on/off.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>B</b></td>
+			<td>Toggle full-brightness on/off.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>L</b></td>
+			<td>Toggle lower unpegged linedef flag on/off.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>U</b></td>
+			<td>Toggle upper unpegged linedef flag on/off.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>T</b></td>
+			<td>Toggle things on/off/boxed. When things are set to boxed, you will see the bounding box of things around them in the color of their category.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>A</b></td>
+			<td>Auto-aligns the neighbouring textures horizontally, until a wall is encountered that has different textures. Note that this action is only applied to the targeted object and does not work for a selection.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>Shift+A</b></td>
+			<td>Auto-aligns the neighbouring textures vertically, until a wall is encountered that has different textures. The vertical alignment takes the ceiling height differences between sidedefs into account. Note that this action is only applied to the targeted object and does not work for a selection.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>Shift+C</b></td>
+			<td>Copies the targeted texture offsets for pasting. Note that this works only for the targeted object, the selection is ignored.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>Control+C</b></td>
+			<td>Copies the targeted texture image or flat image for pasting. Note that this works only for the targeted object, the selection is ignored.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>Control+Shift+C</b></td>
+			<td>Copies the targeted object properties for pasting. Note that this works only for the targeted object, the selection is ignored.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>Shift+V</b></td>
+			<td>Pastes the copied texture offsets onto the target or selection.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>Control+Shift+V</b></td>
+			<td>Pastes the copied object properties onto the target or selection.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>ScrollUp</b></td>
+			<td>Raises the targeted or selected object by 8 mappixels.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>ScrollDown</b></td>
+			<td>Lowers the targeted or selected object by 8 mappixels.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>Shift+ScrollUp</b></td>
+			<td>Raises the targeted or selected object by 1 mappixel.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>Shift+ScrollDown</b></td>
+			<td>Lowers the targeted or selected object by 1 mappixel.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>Control+ScrollUp</b></td>
+			<td>Increases the brightness level of the targeted or selected object by 8.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>Control+ScrollDown</b></td>
+			<td>Decreases the brightness level of the targeted or selected object by 8.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>Up</b></td>
+			<td>Moves the targeted or selected texture up by 1 pixel.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>Down</b></td>
+			<td>Moves the targeted or selected texture down by 1 pixel.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>Left</b></td>
+			<td>Moves the targeted or selected texture left by 1 pixel.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>Right</b></td>
+			<td>Moves the targeted or selected texture right by 1 pixel.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>Shift+Up</b></td>
+			<td>Moves the targeted or selected texture up by 8 pixels.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>Shift+Down</b></td>
+			<td>Moves the targeted or selected texture down by 8 pixels.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>Shift+Left</b></td>
+			<td>Moves the targeted or selected texture left by 8 pixels.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>Shift+Right</b></td>
+			<td>Moves the targeted or selected texture right by 8 pixels.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>Shift+R</b></td>
+			<td>Resets the texture offsets to 0, 0 on the targeted or selected object.</td>
+		</tr>
+		</table>
+	</p>
+	</div>
+</body>
diff --git a/Help/editingmodes.html b/Help/editingmodes.html
new file mode 100644
index 0000000..cbc3fd9
--- /dev/null
+++ b/Help/editingmodes.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>About Editing Modes</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Editing">
+	<param name="keyword" value="Modes">
+	</object>
+	
+	<div id="title"><h1>About Editing Modes</h1></div>
+	
+	<div id="contents">
+	<p>
+		With Doom Builder, you are always editing in a specific mode which depends on what you want to do and allows you to use the same mouse buttons and key controls for different purposes. You will find yourself switching editing modes all the time, so it is a good thing to remember which keys you have assigned to these modes.
+	</p>
+	</div>
+</body>
diff --git a/Help/gameconfigs.html b/Help/gameconfigs.html
new file mode 100644
index 0000000..8559e31
--- /dev/null
+++ b/Help/gameconfigs.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>About Game Configurations</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Configurations">
+	<param name="keyword" value="Game Configurations">
+	</object>
+	
+	<div id="title"><h1>About Game Configurations</h1></div>
+	
+	<div id="contents">
+	<p>
+		These configurations are the largest and most complex ones. A Game Configuration contains all the settings that determine Doom Builder's behavior when editing your map and optional features that are specific to certain map formats can be enabled or disabled here. A Game Configuration also keeps all information about hardcoded actions and things in the game, which Doom Builder cannot find in the WAD files. You can find the Game Configurations in &quot;Configurations&quot; directory, which is a subdirectory of your Doom Builder's program directory. Subdirectories are not searched by Doom Builder for configurations, but you can use them for include files.
+	</p>
+	<p>
+		Many settings in Doom Builder's user interface as bound to the available Game Configurations. This is because the user often wants to use different resources and compilers for a different project. When Doom Builder starts up and detects a new Game Configuration file, it will automatically create default settings for that configuration. The following default settings are read from the Game Configuration (only when first detected by Doom Builder): <a href="gc_basicsettings.html#testparameters">testparameters</a>, <a href="gc_basicsettings.html#testshortpaths">testshortpaths</a>, <a href="gc_basicsettings.html#defaultsavecompiler">defaultsavecompiler</a>, <a href="gc_basicsettings.html#defaulttestcompiler">defaulttestcompiler</a>, <a href="gc_thingsfilters.html">thingsfilters</a> and <a href="gc_texturesets.html">texturesets</a>.
+	</p>
+	</div>
+</body>
diff --git a/Help/gc_argumentsettings.html b/Help/gc_argumentsettings.html
new file mode 100644
index 0000000..0682a74
--- /dev/null
+++ b/Help/gc_argumentsettings.html
@@ -0,0 +1,96 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+<title>Game Configuration - Linedefs Settings</title>
+<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
+</head>
+<body>
+<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+  <param name="keyword" value="Configurations">
+  <param name="keyword" value="Game Configurations">
+  <param name="keyword" value="Action">
+  <param name="keyword" value="Argument">
+</object>
+<div id="title">
+  <h1>Game Configuration - Action Argument Settings</h1>
+</div>
+<div id="contents">
+  <p> <b class="fat">title</b> (string)<br />
+    Sets the title of this argument.<br />
+    Argument title can be also set in <a href="gc_decoratekeys.html#argtitle">DECORATE</a>.<br />
+    <br />
+    <b class="fat"><a name="argtooltip" id="argtooltip"></a>tooltip</b> (string) - <span class="red">GZDB only</span>.<br />
+    Allows to specify a tooltip text displayed for a <a href="gc_thingsettings.html#argtooltip">Thing</a> or Linedef argument definition. Newline character ("\n") can be used to format the text.<br />
+    Argument tooltips can be also set in <a href="gc_decoratekeys.html#argtooltip">DECORATE</a>.<br />
+    <strong>Example:</strong> </p>
+  <pre>arg1
+{
+    title = "Mirror Polyobj Number";
+    <span class="blue">tooltip = "Polyobject that will mirror\nthis one's movements.";</span>
+}</pre>
+  <br />
+  <b class="fat"><a name="argtype" id="argtype"></a>type</b> (integer)<br />
+  Sets the type of this argument. This changes the behaviour of  Argument inputs in <a href="w_linedefedit.html">Linedef</a> and <a href="w_thingedit.html">Thing Edit</a> windows.<br />
+  Argument type can be also set in <a href="gc_decoratekeys.html#argtype">DECORATE</a>.<br />
+  <strong>Supported values are:</strong><br />
+  <br />
+  <ul style="list-style-type:none">
+    <li>0 = Integer (default)</li>
+    <li>4 = Action special</li>
+    <li>5 = Sector effect</li>
+    <li>8 = Angle in degrees</li>
+    <li>10 = XXRRGGBB color</li>
+    <li>11 = Enum option</li>
+    <li>12 = Enum bits</li>
+    <li>13 = Sector tag</li>
+    <li>14 = Thing tag</li>
+    <li>15 = Linedef tag</li>
+    <li>22 = Byte angle (<span class="red">GZDB only</span>)</li>
+    <li>23 = Thing Radius (<span class="red">GZDB only</span>)</li>
+    <li>24 = Thing Height (<span class="red">GZDB only</span>)</li>
+  </ul>
+  <p><b class="fat">enum</b> (structure or string)<br />
+    Provides a list of predefined values to display for this argument. Used only when argument <strong>type</strong> is 11 or 12.<br />
+    The value can be either a name of a predefined enum:<br />
+  <pre>
+arg0
+{
+    title = &quot;Volume&quot;;
+    type = 11;
+    <span class="blue">enum = &quot;sound_volume&quot;;</span>
+}
+</pre>
+  or an explicit  definition:<br />
+  <pre>
+arg0
+{
+    title = "Apply to";
+    type = 11;
+    <span class="blue">enum
+    {
+        0 = "Floor and Ceiling";
+        1 = "Ceiling";
+        2 = "Floor";
+    }</span> 
+}
+</pre>
+  Enums can be also set in <a href="gc_decoratekeys.html#argenum">DECORATE</a>.<br />
+  <br />
+  <b class="fat">default</b> (integer) - <span class="red">GZDB only</span>.<br />
+  Sets the default value for a Thing or Linedef argument definition.<br />
+  Default value can be also set in <a href="gc_decoratekeys.html#argdefault">DECORATE</a>.<br />
+  <strong>Example:</strong>
+  </p>
+  <pre>9038
+{
+    title = "ColorSetter";
+    arg0
+    {
+        title = "Red";
+        <span class="blue">default = 255;</span>
+    }
+}</pre>
+  </p>
+</div>
+</body>
diff --git a/Help/gc_basicsettings.html b/Help/gc_basicsettings.html
new file mode 100644
index 0000000..528c64f
--- /dev/null
+++ b/Help/gc_basicsettings.html
@@ -0,0 +1,131 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>Game Configuration - Basic Settings</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Configurations">
+	<param name="keyword" value="Game Configurations">
+	</object>
+	
+	<div id="title"><h1>Game Configuration - Basic Settings</h1></div>
+	
+	<div id="contents">
+	<p>
+		<b class="fat">type</b> (string)<br />
+		This indicates the type of configuration to prevent accedential use of a different configuration. Must always be the string "Doom Builder 2 Game Configuration".<br />
+		<br />
+        <b class="fat">game</b> (string)<br />
+		The name that is displayed in Doom Buider for your Game Configuration.<br />
+		<br />
+		<b class="fat">enabledbydefault</b> (boolean) - <span class="red">GZDB only</span>.<br />
+		This game configuration is available by default. You can enable and disable game configurations using <a href="w_gameconfigurations.html">Game Configurations window</a>.<br />
+        The default value is <b>false</b>.<br />
+		<br />
+        <b class="fat">actionspecialhelp</b> (string) - <span class="red">GZDB only</span>.<br />
+		The URL used to display action special help. &quot;<strong>%K</strong>&quot; wildcard is replaced by <strong>id</strong> property defined in <a href="gc_linedefsettings.html#actionid">action definition</a>.<br />
+		<br />
+        
+        <b class="fat">thingclasshelp</b> (string) - <span class="red">GZDB only</span>.<br />
+        The URL to  open when thing class name is clicked in the Thing Edit form. &quot;<strong>%K</strong>&quot; wildcard is replaced by <strong>classname</strong> property defined in thing definition or by DECORATE actor name.<br />
+		<br />
+        <b class="fat">basegame</b>  (integer) [0 .. 4] - <span class="red">GZDB only</span>.<br />
+		Indicates which game the current configuration is based on. Used to load game-specific GLDEFS lumps (DOOMDEFS, HTICDEFS, HEXNDEFS or STRFDEFS).
+        <br /><b>Possible values:</b> 1 (DOOM), 2 (HERETIC), 3 (HEXEN) or 4 (STRIFE).<br />
+        The default value is <b>0</b> (don't load game-specific lumps).<br />
+
+		<br />
+		<b class="fat">engine</b> (string)<br />
+		Game engine/sourceport name. This is used as the UDMF namespace for UDMF map format interface. It currently has no other function.<br />
+		<br />
+		<b class="fat">defaultlumpname</b> (string)<br />
+		Default lump name suggested when creating a new map and selecting this configuration.<br />
+		<br />
+		<b class="fat">testparameters</b> (string)<br />
+		Default parameters used to launch the test game engine. See <a href="w_gameconfigurations.html">Game Configurations window</a> for the available parameter placeholders.<br />
+		<br />
+		<b class="fat">testshortpaths</b> (boolean)<br />
+		Set to <b>true</b> to use MSDOS 8.3 format paths and filenames by default. The user can still change this in the <a href="w_gameconfigurations.html">Game Configurations window</a>.<br />
+		The default value is <b>false</b>.<br />
+		<br />
+		<b class="fat">defaultsavecompiler</b> (string)<br />
+	  Name of the <a href="scriptingconfigs.html">Nodebuilder Compiler Configuration structure</a> to use as the default settings for the compiler that is used when saving the map. The user can still change this in the <a href="w_gameconfigurations.html">Game Configurations window</a>.<br />
+		<br />
+		<b class="fat">defaulttestcompiler</b> (string)<br />
+	  Name of the <a href="scriptingconfigs.html">Nodebuilder Compiler Configuration structure</a> to use as the default settings for the compiler that is used when testing the map. The user can still change this in the <a href="w_gameconfigurations.html">Game Configurations window</a>.<br />
+		<br />
+        <b class="fat">defaultscriptcompiler</b> (string) - <span class="red">GZDB only</span>.<br />
+	  Name of the <a href="scriptingconfigs.html">Script Compiler Configuration file</a> to use as the default settings for the script compiler that is used when compiling map scripts. The user can still change this in the <a href="w_mapoptions.html">Map Options window</a>.<br />
+		<br />
+		<b class="fat">skills</b> (structure)<br />
+		This defines the skill options the user has available with this game engine/project. The settings in this structure are expected to be numbers with string values (the descriptive name for the skill level).<br />
+		<br />
+		<strong>Example:</strong>
+	<pre>
+skills
+{
+	1 = "I'm too young to die";
+	2 = "Hey, not too rough";
+	3 = "Hurt me plenty";
+	4 = "Ultra-Violence";
+	5 = "Nightmare!";
+}
+</pre>
+		<br />
+		<b class="fat">linetagindicatesectors</b> (boolean)<br />
+		When <b>true</b>, Doom Builder will highlight sectors associated with the same tag number when a line is highlighted. This is only really useful for Doom format maps, because Hexen format and UDMF format has no single tag on linedefs (in those formats, the arguments of the linedef's action can be tags, which also works to highlight sectors).<br />The default is <b>false</b>.<br />
+		<br />
+	  <b class="fat">singlesidedflag</b> (integer or string)<br />
+		This lets Doom Builder know the <a href="gc_linedefflags.html">linedef flag</a> that indicates a line with only one side. Doom Builder will set this flag value on a linedef when it changes a line to become single sided and removes the flag from a linedef when it becomes double sided. Plugins can also use this information to perform operations on linedefs. For map formats that use numeric flags (Doom and Hexen) this must be an integer flag value. For map formats that use named flags (UDMF), this must be a string indicating the name of the flag.<br />
+		<br />
+		<b class="fat">doublesidedflag</b> (integer or string)<br />
+		This lets Doom Builder know the <a href="gc_linedefflags.html">linedef flag</a> that indicates a line with two sides. Doom Builder will set this flag value on a linedef when it changes a line to become double sided and removes the flag from a linedef when it becomes single sided. Plugins can also use this information to perform operations on linedefs. For map formats that use numeric flags (Doom and Hexen) this must be an integer flag value. For map formats that use named flags (UDMF), this must be a string indicating the name of the flag.<br />
+		<br />
+		<b class="fat">impassableflag</b> (integer or string)<br />
+		This lets Doom Builder know the <a href="gc_linedefflags.html">linedef flag</a> that indicates a line which blocks players and monsters. Doom Builder uses this to give the line a special color and plugins can use this information to perform operations related to blocking sound lines. For map formats that use numeric flags (Doom and Hexen) this must be an integer specifying the flag value of the Impassable flag. For map formats that use named flags (UDMF), this must be a string indicating the name of the Impassable flag.<br />
+		<br />
+        <b class="fat">defaultwalltexture</b> (string) - <span class="red">GZDB only</span>.<br />
+		Name of a   texture to use on sidedefs when creating a new sector.<br />
+        <br />
+        <b class="fat">defaultfloortexture</b> (string) - <span class="red">GZDB only</span>.<br />
+		Name of a   flat to use on the floor when creating a new sector.<br />
+        <br />
+        <b class="fat">defaultceilingtexture</b> (string) - <span class="red">GZDB only</span>.<br />
+		Name of a   flat to use on the ceiling when creating a new sector.<br />
+        <br />
+        <b class="fat">makedoortrack</b> (string)<br />
+		Name of a texture to use on the walls when making a door.<br />
+        <br />
+		<b class="fat">makedoordoor</b> (string) - <span class="red">GZDB only</span>.<br />
+		Name of a texture to use as the door texture when making a door.<br />
+		<br />
+        <b class="fat">makedoorceil</b> (string) - <span class="red">GZDB only</span>.<br />
+		Name of a texture to use as the door's ceiling texture when making a door.<br />
+        <br />
+		<b class="fat">makedooraction</b> (integer)<br />
+		Linedef action number to put on the lines when making a door.<br />
+		<br />
+		<b class="fat">makedoorarg#</b> (0 .. 4) (integer)<br />
+		Arguments for the linedef action number to put on the lines when making a door.<br />
+		<br />
+		<b class="fat">doomlightlevels</b> (boolean)<br />
+		Set this to <b>false</b> to use linear lighting in Doom Builder. Normally Doom Builder uses a simulation of Doom's light levels.<br />Default value is <b>true</b>.<br />
+		<br />
+		<b class="fat">start3dmode</b> (integer)<br />
+		Thing type number that Doom Builder will use to keep your Visual Mode camera position stored in the map. Doom Builder will place a single thing of this type in your map and move it along as you move in Visual Mode.<br />
+		<br />
+		<b class="fat">skyflatname</b> (string)<br />
+		Name of the flat that is interpreted as sky (meaning there is no ceiling). Doom Builder and plugins can use this information for various purposes.<br />
+		<br />
+<b class="fat">longtexturenames</b> (boolean) - <span class="red">GZDB only</span>.<br />
+		Enables support for long (> 8 chars) texture names. This is used by GZDoom Builder to limit the input fields in the user interface and to check the validity of texture names in resources. This setting should only be enabled for UDMF game configurations. Enabling this setting will make maps incompatible with Doom Builder 2 and can lead to problems in Slade 3 This does NOT determine the actual limitation on the texture names in the map file format.<br />Default value is <b>false</b>.<br />
+		<br />
+	</p>
+	</div>
+</body>
diff --git a/Help/gc_decoratekeys.html b/Help/gc_decoratekeys.html
new file mode 100644
index 0000000..3cc1d5f
--- /dev/null
+++ b/Help/gc_decoratekeys.html
@@ -0,0 +1,137 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+<title>DECORATE keys</title>
+<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
+</head>
+<body>
+<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+  <param name="keyword" value="Configurations">
+  <param name="keyword" value="Game Configurations">
+  <param name="keyword" value="DECORATE">
+</object>
+<div id="title">
+  <h1>DECORATE keys</h1>
+</div>
+<div id="contents">
+  <p> Doom Builder 2 includes a DECORATE parser used to obtain relevant information (such as editor number, Radius, Height, Scale, and so on) from custom actors. Additional information can be conveyed with keys in the form of special comments inserted within an actor's declaration block:<br />
+    <br />
+    <strong>//$Angled</strong> - <span class="red">GZDB only</span>.<br />
+    <strong>//$NotAngled</strong> - <span class="red">GZDB only</span>.<br />
+    Specifies whether the direction matters (angled) or not. Things that are not angled are represented without a direction arrow.<br />
+    <br />
+    <strong>//$Category &lt;category&gt;</strong><br />
+    Specifies in which category (Monsters, Weapons, etc.) it should be sorted. By default, a custom actor not identified in a configuration file will be put in the Decorate category.<br />
+    GZDoom Builder supports hierarchical subgroups, using the backslash separator. For example, <strong>//$Category "Decorations/Tech"</strong> will put the actor within the "Tech" subgroup of the "Decorations" group.<br />
+    <br />
+    <strong>//$Sprite &lt;sprite&gt;</strong><br />
+    Specifies which sprite to use to represent the actor in the editor. By default, a custom actor not identified in a configuration file will use the first suitable sprite it finds in the actor definition, trying first the states in the sequence Idle, See, Inactive, Spawn, and if all these fail, the first defined state. This key is therefore especially useful for stateless actor definitions. Keep in mind that this sprite name must match an image in the wad (i.e., if the sprite in your wad is named JUNKA0D0, you need to put JUNKA0D0, JUNKA0 won't work).<br />
+    <br />
+    <strong>//$Title &lt;title&gt;</strong><br />
+    Specifies which name to give to the actor. By default, a custom actor not identified in a configuration file will use the Tag property, and if not present, will default to the class name.<br />
+    <br />
+    <strong><a name="argtitle" id="argtitle"></a>//$ArgN &lt;name&gt;</strong> - <span class="red">GZDB only</span>.<br />
+    Allows to override default argument names for this actor.<br />
+    <br />
+    <strong><a name="argdefault" id="argdefault"></a>//$ArgNDefault &lt;integer&gt;</strong> - <span class="red">GZDB only</span>.<br />
+    Allows to set the default value for this argument. This property can only be used in conjunction with &quot;<strong>//$ArgN</strong>&quot; property.<br />
+    <br />
+    <strong><a name="argtooltip" id="argtooltip"></a>//$ArgNTooltip &lt;text&gt;</strong> - <span class="red">GZDB only</span>.<br />
+    Allows to specify a tooltip text displayed for this argument. Newline character (&quot;\n&quot;) can be used to format the  text. This property can only be used in conjunction with &quot;<strong>//$ArgN</strong>&quot; property.<br />
+    Argument tooltips can be also set for <a href="gc_argumentsettings.html#argtooltip">things and linedefs</a> in a Game Configuration.<br />
+    <br />
+    <strong><a name="argtype" id="argtype"></a>//$ArgNType &lt;integer&gt;</strong> - <span class="red">GZDB only</span>.<br />
+    Allows to specify an <a href="gc_argumentsettings.html#argtype">argument type</a> for this argument. This property can only be used in conjunction with &quot;<strong>//$ArgN</strong>&quot; property.<br />
+    <br />
+    <strong><a name="argenum" id="argenum"></a>//$ArgNEnum &lt;string or structure&gt;</strong> - <span class="red">GZDB only</span>.<br />
+    Allows to specify an enum for this argument. This can be either a name of an enum defined in the Game Configuration, or an explicit enum definition. This property can only be used in conjunction with &quot;<strong>//$ArgN</strong>&quot; property.<br />
+    <br />
+    <strong>//$Color &lt;color index&gt;</strong> - <span class="red">GZDB only</span>.<br />
+    Allows to override category color for this actor. Possible values are:
+  <ul>
+    <li>&nbsp;&nbsp;0 - <span style="color:#696969">&#9608;</span> Dark Gray;</li>
+    <li>&nbsp;&nbsp;1 - <span style="color:#4169E1">&#9608;</span> Blue;</li>
+    <li>&nbsp;&nbsp;2 - <span style="color:#228B22">&#9608;</span> Green;</li>
+    <li>&nbsp;&nbsp;3 - <span style="color:#20B2AA">&#9608;</span> Cyan;</li>
+    <li>&nbsp;&nbsp;4 - <span style="color:#B22222">&#9608;</span> Red;</li>
+    <li>&nbsp;&nbsp;5 - <span style="color:#9400D3">&#9608;</span> Magenta;</li>
+    <li>&nbsp;&nbsp;6 - <span style="color:#B8860B">&#9608;</span> Brown;</li>
+    <li>&nbsp;&nbsp;7 - <span style="color:#C0C0C0">&#9608;</span> Gray;</li>
+    <li>&nbsp;&nbsp;8 - <span style="color:#808080">&#9608;</span> Light Gray;</li>
+    <li>&nbsp;&nbsp;9 - <span style="color:#00BFFF">&#9608;</span> Light Blue;</li>
+    <li>10 - <span style="color:#32CD32">&#9608;</span> Light Green;</li>
+    <li>11 - <span style="color:#AFEEEE">&#9608;</span> Light Cyan;</li>
+    <li>12 - <span style="color:#FF6347">&#9608;</span> Light Red;</li>
+    <li>13 - <span style="color:#EE82EE">&#9608;</span> Light Magenta;</li>
+    <li>14 - <span style="color:#FFFF00">&#9608;</span> Yellow;</li>
+    <li>15 - <span style="color:#F5F5F5">&#9608;</span> White;</li>
+    <li>16 - <span style="color:#FFB6C1">&#9608;</span> Pink;</li>
+    <li>17 - <span style="color:#FF8C00">&#9608;</span> Light Orange;</li>
+    <li>18 - <span style="color:#BDB76B">&#9608;</span> Light Brown (default);</li>
+    <li>19 - <span style="color:#DAA520">&#9608;</span> Orange;</li>
+  </ul>
+    <strong>//$Obsolete &lt;reason&gt;</strong> - <span class="red">GZDB only</span>.<br />
+    Marks the thing as obsolete. It will be detected by &quot;Check obsolete things&quot; <a href="e_mapanalysis.html">Map Analysis Mode</a> check and will be marked in the <a href="w_thingedit.html">Thing Properties Window</a> and the Thing Info panel.<br />
+    <br /><br />
+  
+  <h3>Additionaly, you can use the following special comments in the global block:</h3><br />
+  <strong>//$GZDB_SKIP</strong> - <span class="red">GZDB only</span>.<br />
+  DECORATE parser will stop parsing a file after encountering this comment. This can be used to speedup the parsing process by skipping files, which don't contain placeable actor definitions.<br />
+  <br />
+  <strong>Note:</strong> It is a good idea to include the Doom Editor Number after the actor definition if you want it to show in Doom Builder, even if it is replacing a standard Doom actor.<br />
+  <br />
+  <strong>Example:</strong><br />
+  <pre>
+Actor ChexShield : ResistanceRune replaces ResistanceRune 5104
+{
+  //$Category &quot;Pickups/Chex Powerups&quot;
+  //$Sprite ARMXA0
+  //$Title "Chex Shield"
+  //$Color 12
+  //$NotAngled
+  //$Obsolete "That's a strange powerup. Consider replacing it with something else..."
+  
+  //$Arg0 "Respawn Delay"
+  //$Arg0ToolTip "Positive values specify delay in tics.\nNegative - in seconds."
+  
+  //$Arg1 "Enum Example 1"
+  //$Arg1ToolTip "Config enum example"
+  //$Arg1Type 11
+  //$Arg1Enum "keys"
+	
+  //$Arg2 "Enum Example 2"
+  //$Arg2ToolTip "Explicit enum example"
+  //$Arg2Type 11
+  //$Arg2Enum { 1 = "First option"; 2 = "Second option"; 667 = "Option 667"; }
+  
+  //$Arg3 "Radius"
+  //$Arg3Type 23
+  //$Arg3Default 32
+	
+  //$Arg4 "Height"
+  //$Arg4Type 24
+  //$Arg4Default 64
+
+  Height 44
+  Radius 26
+  Inventory.PickupMessage "Picked up the energized Chex armor!"
+
+  States
+  {
+    Spawn:
+      ARMX A 1
+      Loop
+  }
+}
+
+//$GZDB_SKIP
+actor SuperGiantImpBall : DoomImpBall
+{
+  Scale 8.0
+  Damage 30
+}
+</pre>
+  </p>
+</div>
+</body>
diff --git a/Help/gc_formatsettings.html b/Help/gc_formatsettings.html
new file mode 100644
index 0000000..8ce9f9e
--- /dev/null
+++ b/Help/gc_formatsettings.html
@@ -0,0 +1,225 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>Game Configuration - Map Format Settings</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Configurations">
+	<param name="keyword" value="Game Configurations">
+	</object>
+	
+	<div id="title"><h1>Game Configuration - Map Format Settings</h1></div>
+	
+	<div id="contents">
+	<p>
+		<b class="fat">formatinterface</b> (string)<br />
+		Interface class name in Doom Builder that is used to read and write the map data.
+		<ul>
+			<li>For Doom map format, use "DoomMapSetIO". This is a map format that uses numeric flags.
+			<li>For Hexen map format, use "HexenMapSetIO". This is a map format that uses numeric flags.
+			<li>For UDMF map format, use "UniversalMapSetIO". This is a map format that uses named flags.
+		</ul>
+		<b class="fat">maplumpnames</b> (structure)<br />
+		This structure describes the lumps that make up the complete map, including scripts and nodes. It must also indicate what Doom Builder is supposed to do with these lumps and/or where the lumps come from. These lumps are normally written by the map format interface class, but some could be generated by the nodebuilder compiler or stored by Doom Builder directly. In this structure, there should be a structure for every map lump. The name of the structure should be the lump name, in uppercase. For the map header (which name differs) you can use the name <b>~MAP</b>. The following settings should be in the lump structure (unless the default value applies):<br />
+		<ul>
+			<li><b class="fat">required</b> (boolean)<br />
+				<b>True</b> to indicate that this lump is a required lump for the map. Default is <b>false</b>.<br />
+				<br />
+			<li><b class="fat">forbidden</b> (boolean) - <span class="red">GZDB only</span>.<br />
+				<b>True</b> to indicate that this lump must not present in the map's namespace. Default is <b>false</b>.<br />
+				<br />
+			<li><b class="fat">blindcopy</b> (boolean)<br />
+				Set this to <b>true</b> when Doom Builder should copy this lump along with the map without using it. Default is <b>false</b>.<br />
+				<br />
+			<li><b class="fat">nodebuild</b> (boolean)<br />
+				When set to <b>true</b>, this indicates that the nodebuilder compiler generates or modifies this lump. Default is <b>false</b>.<br />
+				<br />
+			<li><b class="fat">allowempty</b> (boolean)<br />
+				Set to <b>true</b> to allow the nodebuilder to leave this lump empty. Default is <b>false</b>.<br />
+				<br />
+			<li><b class="fat">script</b> (string)<br />
+				When this is set, it indicates that this lump can be edited with the script editor. The contents of this lump will be loaded in the script editor automatically. Set the value to the .cfg filename (without path) of a Script Configuration to use.<br />
+                <br />
+                <li><b class="fat">scriptbuild</b> (boolean) - <span class="red">GZDB only</span>.<br />
+				When this is set, it indicates that this lump can be edited with the script editor. Currently chosen script configuration will be used to build this lump. The contents of this lump will be loaded in the script editor automatically.<br />
+		</ul>
+		<strong>Example:</strong><br />
+<pre>
+maplumpnames
+{
+	~MAP
+	{
+		required = true;
+		blindcopy = true;
+		nodebuild = false;
+	}
+	
+	THINGS
+	{
+		required = true;
+		nodebuild = true;
+		allowempty = true;
+	}
+	
+	LINEDEFS
+	{
+		required = true;
+		nodebuild = true;
+		allowempty = false;
+	}
+	
+	SIDEDEFS
+	{
+		required = true;
+		nodebuild = true;
+		allowempty = false;
+	}
+	
+	VERTEXES
+	{
+		required = true;
+		nodebuild = true;
+		allowempty = false;
+	}
+	
+	SEGS
+	{
+		required = false;
+		nodebuild = true;
+		allowempty = false;
+	}
+	
+	SSECTORS
+	{
+		required = false;
+		nodebuild = true;
+		allowempty = false;
+	}
+	
+	NODES
+	{
+		required = false;
+		nodebuild = true;
+		allowempty = false;
+	}
+	
+	SECTORS
+	{
+		required = true;
+		nodebuild = true;
+		allowempty = false;
+	}
+	
+	REJECT
+	{
+		required = false;
+		nodebuild = true;
+		allowempty = false;
+	}
+	
+	BLOCKMAP
+	{
+		required = false;
+		nodebuild = true;
+		allowempty = false;
+	}
+	
+	SCRIPTS
+	{
+		required = false;
+		nodebuild = false;
+		script = "ZDoom_ACS.cfg";
+	}
+}
+</pre>
+		<br />
+        <b class="fat">universalfields</b> (structure) - <span class="red">UDMF only</span>.<br />
+        Provides additional UDMF field definitions to show in the <strong>Custom</strong> tab of Edit windows.<br />
+        <span class="red">Warning:</span> only add fields  that Doom Builder does not edit with its own user-interface!<br />
+        <span class="red">Warning:</span> the "default" field must match the UDMF specifications!<br /><br />
+        <strong>Field data types:</strong><br />
+        <ul style="list-style-type:none">
+          <li>0 = Integer</li>
+          <li>1 = Float</li>
+          <li>2 = String</li>
+          <li>3 = Bool</li>
+          <li>4 = Linedef type (integer)</li>
+          <li>5 = Sector effect (integer)</li>
+          <li>6 = Texture (string)</li>
+          <li>7 = Flat (string)</li>
+          <li>8 = Angle in degrees (integer)</li>
+          <li>9 = Angle in radians (float)</li>
+          <li>10 = XXRRGGBB color (integer)</li>
+          <li>11 = Enum option (integer)</li>
+          <li>12 = Enum bits (integer)</li>
+          <li>13 = Sector tag (integer)</li>
+          <li>14 = Thing tag (integer)</li>
+          <li>15 = Linedef tag (integer)</li>
+          <li>16 = Enum option (string)</li>
+          <li>17 = Angle in degrees (float)</li>
+          <li>22 = Byte angle (integer) - <span class="red">GZDB only</span></li>
+      </ul>
+        <strong>Example:</strong><br />
+<pre>
+universalfields
+{
+	linedef
+	{
+		comment
+		{
+			type = 2;
+			default = "";
+		}
+	}
+	
+	sidedef
+	{
+		comment
+		{
+			type = 2;
+			default = "";
+		}
+	}
+	
+	thing
+	{
+		comment
+		{
+			type = 2;
+			default = "";
+		}
+    
+		skill6
+		{
+			type = 3;
+			default = false;
+		}
+
+    
+		class6
+		{
+			type = 3;
+			default = false;
+		}
+
+	}
+	
+	sector
+	{
+		comment
+		{
+			type = 2;
+			default = "";
+		}
+	}
+}
+</pre>
+	</p>
+	</div>
+</body>
diff --git a/Help/gc_linedefsettings.html b/Help/gc_linedefsettings.html
new file mode 100644
index 0000000..95b21d2
--- /dev/null
+++ b/Help/gc_linedefsettings.html
@@ -0,0 +1,139 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+<title>Game Configuration - Linedefs Settings</title>
+<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
+</head>
+<body>
+<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+  <param name="keyword" value="Configurations">
+  <param name="keyword" value="Game Configurations">
+  <param name="keyword" value="Linedef">
+  <param name="keyword" value="Linedefs">
+</object>
+<div id="title">
+  <h1>Game Configuration - Linedefs Settings</h1>
+</div>
+<div id="contents">
+  <p> <span class="big">General settings:</span><br />
+    <br />
+    <b class="fat">generalizedlinedefs</b> (boolean)<br />
+    Set to <b>true</b> to support generalized linedef actions. This makes the <b>gen_linedeftypes</b> structure mandatory. Default value is <b>false</b>.<br />
+    <br />
+    <b class="fat">linedefflags</b> (structure)<br />
+    Lists the options that can be set on a linedef. In case of a map format that works with numeric flags, the values of the chosen options are added together to form the final linedef flags value (so each option should use its own bit). Note that with numeric flags, the linedef activation flags are also incorporated in the same value (see <b>linedefactivations</b>).<br />
+    Example for numeric flags:
+  <pre>
+linedefflags
+{
+	1 = "Impassable";
+	2 = "Block Monster";
+	4 = "Double Sided";
+	8 = "Upper Unpegged";
+	16 = "Lower Unpegged";
+	32 = "Secret";
+	64 = "Block Sound";
+}
+</pre>
+  <br />
+  Example for named flags:
+  <pre>
+linedefflags
+{
+	blocking = "Impassable";
+	blockmonsters = "Block monster";
+	twosided = "Doublesided";
+	dontpegtop = "Upper unpegged";
+	dontpegbottom = "Lower unpegged";
+	secret = "Secret";
+	blocksound = "Block sound";
+}
+</pre>
+  <br />
+  <b class="fat">linedefactivations</b> (structure)<br />
+  This provides a list of choices about how a linedef is activated. Only one of these choices can be selected by the user. In case of a map format that works with numeric flags, the value is part of the linedef flags value and should have it's own range of bits. To separate these bits from the linedef flag options, use the <b>linedefactivationsfilter</b> setting. For map formats which use named flags, you can just use names for the settings.<br />
+  <br />
+  Example for numeric flags:
+  <pre>
+linedefactivations
+{
+	0 = "Player walks over";
+	1024 = "Player presses Use";
+	2048 = "Monster walks over";
+	3072 = "Projectile hits";
+	4096 = "Player bumps";
+	5120 = "Projectile flies over";
+}
+</pre>
+  <br />
+  <b class="fat">linedefactivationsfilter</b> (integer)<br />
+  Bit mask value that separates the <b>linedefactivations</b> bits from the <b>linedefflags</b> bits. This is required in map formats that use numeric linedef flags, because the bits share the same integer linedef flags value in the map data. This setting is ignored for map formats that use named flags.<br />
+  <br />
+  <b class="fat">linedefrenderstyles</b> (structure) - <span class="red">GZDB only, UDMF only</span>.<br />
+  Lists the renderstyles that can be set on a linedef.<br />
+  <br />
+  Example:
+  <pre>        
+linedefrenderstyles
+{
+	translucent = "Translucent";
+	add = "Additive";
+}
+</pre>
+  <br />
+  <b class="fat">linedefflagstranslation</b> (structure)<br />
+  This is a translation between named (UDMF) linedef flags and the numeric linedef flags that your configuration uses (including linedef activation flags, if any). This structure is mandatory for all Game Configurations that do not use the UDMF map format and should not exist in Game Configurations that use the UDMF map format. Doom Builder uses this translation ot correctly work with copy/paste and prefabs (which are all converted to/from UDMF format). The setting names should be the non-UDMF flags. In case that your Game Configuration uses numeric flags map format, the setting names should be numeric. The setting values must be the equivalent UDMF flag names. The value can be prefixed with <b>!</b> to indicate that the value should be inverted (for example, if a setting 32 with value '!raisable' is to be converted, the existance of the bit value 32 will set 'raisable' to <b>false</b>).<br />
+  <br />
+  Example for numeric flags:
+  <pre>
+linedefflagstranslation
+{
+	1 = "blocking";
+	2 = "blockmonsters";
+	4 = "twosided";
+	8 = "dontpegtop";
+	16 = "dontpegbottom";
+	32 = "secret";
+	64 = "blocksound";
+	512 = "repeatspecial";
+	1024 = "playeruse";
+	2048 = "monstercross";
+	3072 = "impact";
+	4096 = "playerpush";
+	5120 = "missilecross";
+	8192 = "monsteractivate";
+}
+</pre>
+  <br />
+  <span class="big">Linedef action definitions:</span><br />
+  <br />
+  
+  <b class="fat">title</b> (string)<br />
+  The name of this linedef action.<br />
+  <br />
+  
+  <b class="fat"><a name="actionid" id="actionid"></a>id</b> (string) - <span class="red">GZDB only</span>.<br />
+  The name used to display help page when you press the &quot;Action Help&quot; button in <a href="w_thingedit.html">Thing</a> or <a href="w_linedefedit.html">Linedef Edit</a> windows (used in conjunction with <strong>actionspecialhelp</strong> property).<br />
+  <br />
+  
+   <b class="fat">prefix</b> (string)<br />
+  Linedef action prefix (&quot;WR&quot;, &quot;SR&quot;, &quot;GR&quot; etc.). Usable only for Doom format linedef definitions.<br />
+  <br />
+  
+  <b class="fat">requiresactivation</b> (boolean) - <span class="red">GZDB only</span>.<br />
+  This linedef action requires activation flag(s). When this property is set to true, a warning will be shown when a user selects this linedef action and no activation flags are set.<br />
+  The default value is <strong>true</strong>.<br />
+  <strong>Example:</strong>
+  <pre>1
+{
+    title = "Polyobj Start Line";
+    <span class="blue">requiresactivation = false;</span>
+} 
+</pre>
+<br />
+<span class="big">Linedef action argument definitions:</span><br />
+See <a href="gc_argumentsettings.html">Action Argument Settings</a>.
+  </p>
+</div>
+</body>
diff --git a/Help/gc_resourcesettings.html b/Help/gc_resourcesettings.html
new file mode 100644
index 0000000..9852425
--- /dev/null
+++ b/Help/gc_resourcesettings.html
@@ -0,0 +1,126 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>Game Configuration - Resource Settings</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Configurations">
+	<param name="keyword" value="Game Configurations">
+	</object>
+	
+	<div id="title"><h1>Game Configuration - Resource Settings</h1></div>
+	
+	<div id="contents">
+	<p>
+		<b class="fat">decorategames</b> (string)<br />
+		Fill this to the game names to support DECORATE actors from. Only the DECORATE actors who's game name is in this string will be loaded. If this setting is not set, DECORATE lumps are not loaded.<br />
+		<br />
+		Example:
+<pre>
+decorategames = "heretic raven";
+</pre>
+		<br />
+		<b class="fat">mixtexturesflats</b> (boolean)<br />
+		Doom Builder will allow the use of flats on walls and textures on floors when this is set to <b>true</b>. Textures and flats will be mixed with priority to the original purpose. For textures this means that textures override flats with the same name, for flats this means that flats override textures with the same name. Default is <b>false</b>.<br />
+		<br />
+		<b class="fat">defaulttexturescale</b> (decimal)<br />
+		The scale of textures when no scale is known. This is a scalar value: 0.5 is half the original size and double the resolution. Default is 1.0.<br />
+		<br />
+		<b class="fat">defaultflatscale</b> (decimal)<br />
+		The scale of flats when no scale is known. This is a scalar value: 0.5 is half the original size and double the resolution. Default is 1.0.<br />
+		<br />
+		<b class="fat">scaledtextureoffsets</b> (boolean)<br />
+		Determines if texture offsets are in world coordinates (unscaled by texture scale) or texture coordinates. Set to <b>true</b> to use texture coordinates. Default is <b>false</b>.<br />
+		<br />
+		<b class="fat">textures</b> (structure)<br />
+		This lists the marker lump names that indicate the begin and end of a list of textures that Doom Builder should load. There must be a separate structure for each range, for which the structure name doesn't matter. The range must have a 'start' setting and an 'end' setting of which the values must be the names of the start and end lumps (strings). Please note that PNAMES, TEXTURE1 and TEXTURE2 lumps do not need to be in the game configuration, they are always loaded when available.<br />
+		<br />
+		Example:
+<pre>
+textures
+{
+	zdoom1
+	{
+		start = "TX_START";
+		end = "TX_END";
+	}
+}
+</pre>
+		<br />
+		<b class="fat">patches</b> (structure)<br />
+		This lists the marker lump names that indicate the begin and end of a list of patches that Doom Builder should load. There must be a separate structure for each range, for which the structure name doesn't matter. The range must have a 'start' setting and an 'end' setting of which the values must be the names of the start and end lumps (strings). Note that Doom Builder does not load all patches, only those that are used by the textures.<br />
+		<br />
+		Example:
+<pre>
+patches
+{
+	standard1
+	{
+		start = "P_START";
+		end = "P_END";
+	}
+	
+	standard2
+	{
+		start = "PP_START";
+		end = "PP_END";
+	}
+}
+</pre>
+		<br />
+		<b class="fat">sprites</b> (structure)<br />
+		This lists the marker lump names that indicate the begin and end of a list of sprites that Doom Builder should load. There must be a separate structure for each range, for which the structure name doesn't matter. The range must have a 'start' setting and an 'end' setting of which the values must be the names of the start and end lumps (strings). Note that Doom Builder does not load all sprites, only those that are used by the <a href="gc_thingsettings.cfg">things</a>.<br />
+		<br />
+		Example:
+<pre>
+sprites
+{
+	standard1
+	{
+		start = "S_START";
+		end = "S_END";
+	}
+}
+</pre>
+		<br />
+		<b class="fat">flats</b> (structure)<br />
+		This lists the marker lump names that indicate the begin and end of a list of flats that Doom Builder should load. There must be a separate structure for each range, for which the structure name doesn't matter. The range must have a 'start' setting and an 'end' setting of which the values must be the names of the start and end lumps (strings).<br />
+		<br />
+		Example:
+<pre>
+flats
+{
+	standard1
+	{
+		start = "F_START";
+		end = "F_END";
+	}
+}
+</pre>
+		<br />
+		<b class="fat">colormaps</b> (structure)<br />
+		This lists the marker lump names that indicate the begin and end of a list of colormaps that Doom Builder should load. There must be a separate structure for each range, for which the structure name doesn't matter. The range must have a 'start' setting and an 'end' setting of which the values must be the names of the start and end lumps (strings).<br />
+		<br />
+		Example:
+<pre>
+colormaps
+{
+	standard1
+	{
+		start = "C_START";
+		end = "C_END";
+	}
+}
+</pre>
+		<br />
+
+		
+	</p>
+	</div>
+</body>
diff --git a/Help/gc_sectorsettings.html b/Help/gc_sectorsettings.html
new file mode 100644
index 0000000..41bbf2c
--- /dev/null
+++ b/Help/gc_sectorsettings.html
@@ -0,0 +1,98 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+<title>Game Configuration - Sectors Settings</title>
+<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
+</head>
+<body>
+<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+  <param name="keyword" value="Configurations">
+  <param name="keyword" value="Game Configurations">
+  <param name="keyword" value="Sector">
+  <param name="keyword" value="Sectors">
+</object>
+<div id="title">
+  <h1>Game Configuration - Sectors Settings</h1>
+</div>
+<div id="contents">
+  <p><b class="fat">generalizedsectors</b> (boolean)<br />
+    Set to <b>true</b> to support generalized sector effects. This makes the <b>gen_sectortypes</b> structure mandatory. Default value is <b>false</b>.<br />
+    <br />
+    <b class="fat">sectorflags</b> (structure) - <span class="red">GZDB only, UDMF only</span>.<br />
+    Lists the options that can be set on a sector.<br />
+    <br />
+    <b class="fat">sectorrenderstyles </b>(structure) - <span class="red">GZDB only, UDMF only</span>.<br />
+    Lists the renderstyles that can be set on a sector.<br />
+    <br />
+    Example:
+  <pre>        
+sectorrenderstyles
+{
+	translucent = "Translucent";
+	add = "Additive";
+}
+</pre>
+  <b class="fat">sectorbrightness</b> (structure)<br />
+  This structure provides Doom Builder with a list of sector brightness levels that are most common. Doom Builder will use these levels to increase/decrease the brightness quickly. The structure must contain numeric setting names for the brightness levels. The settings don't need a value and any value will be ignored by Doom Builder.<br />
+  <br />
+  Example:
+  <pre>
+sectorbrightness
+{
+	96;
+	64;
+	32;
+	0;
+}
+</pre>
+  <br />
+  <b class="fat">gen_sectortypes</b> (structure)<br />
+  Generalized sector types are described in this structure. This structure is required when <b>generalizedsectors</b> is set to <b>true</b>. For each option there should be a structure. The name of the structure is displayed as the option description. Each option structure should contain a setting for the available choices. The setting name must be a numeric value that is added to the final sector effect value along with the values of the choices from other options (so the final sector effect value is the sum of the choices from every option). The setting must have a string value containing the choice description to be displayed.<br />
+  <br />
+  Example:
+  <pre>
+gen_sectortypes
+{
+	secret
+	{
+		0 = "No";
+		128 = "Yes";
+	}
+	
+	friction
+	{
+		0 = "Disabled";
+		256 = "Enabled";
+	}
+	
+	wind
+	{
+		0 = "Disabled";
+		512 = "Enabled";
+	}
+}
+</pre>
+  <br />
+  <b class="fat">sectortypes</b> (structure)<br />
+  This is a simple list of all available sector effects that the user can choose from. The setting names must be numeric (the sector effect number) and the value must be a string containing the description to display.<br />
+  <br />
+  Example:
+  <pre>
+sectortypes
+{
+	0 = "Normal";
+	1 = "Light Blinks (randomly)";
+	2 = "Light Blinks (2 Hz)";
+	3 = "Light Blinks (1 Hz)";
+	4 = "Damage -10 or 20% health and Light Blinks (2 Hz)";
+	5 = "Damage -5 or 10% health";
+	7 = "Damage -2 or 5% health";
+	8 = "Light Glows (1+ sec)";
+	9 = "Secret";
+}
+</pre>
+  <br />
+  </p>
+</div>
+</body>
diff --git a/Help/gc_sidedefsettings.html b/Help/gc_sidedefsettings.html
new file mode 100644
index 0000000..8616621
--- /dev/null
+++ b/Help/gc_sidedefsettings.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+<title>Game Configuration - Linedefs Settings</title>
+<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
+</head>
+<body>
+<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+  <param name="keyword" value="Configurations">
+  <param name="keyword" value="Game Configurations">
+  <param name="keyword" value="Sidedef">
+  <param name="keyword" value="Sidedefs">
+</object>
+<div id="title">
+  <h1>Game Configuration - Sidedefs Settings</h1>
+</div>
+<div id="contents">
+  <p> <span class="big">General settings:</span><br />
+    <br />
+    <b class="fat">sidedefflags</b> (structure) - <span class="red">GZDB only, UDMF only</span>.<br />
+    Lists the options that can be set on a sidedef.<br />
+</div>
+</body>
diff --git a/Help/gc_thingsettings.html b/Help/gc_thingsettings.html
new file mode 100644
index 0000000..af571ab
--- /dev/null
+++ b/Help/gc_thingsettings.html
@@ -0,0 +1,182 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+<title>Game Configuration - Things Settings</title>
+<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
+</head>
+<body>
+<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+  <param name="keyword" value="Configurations">
+  <param name="keyword" value="Game Configurations">
+  <param name="keyword" value="Thing">
+  <param name="keyword" value="Things">
+</object>
+<div id="title">
+  <h1>Game Configuration - Things Settings</h1>
+</div>
+<div id="contents">
+  <p> <span class="big">General settings:</span><br />
+    <br />
+    <b class="fat">defaultthingflags</b> (structure)<br />
+    This defines what the default flags should be first the first new thing when inserted. In map formats that use numeric thing flags, the settings in this structure should be the numeric flags to set. In map formats that use named flags, the settings must be the names of the flags to set. The value of the settings is optional and is ignored by Doom Builder.<br />
+    <br />
+    Example for numeric flags:
+  <pre>
+defaultthingflags
+{
+	1;
+	2;
+	4;
+	32;
+}
+</pre>
+  <br />
+  Example for named flags:
+  <pre>
+defaultthingflags
+{
+	skill1;
+	skill2;
+	skill3;
+	single;
+	coop;
+}
+</pre>
+  <br />
+  <b class="fat">thingrenderstyles </b>(structure) - <span class="red">GZDB only, UDMF only</span>.<br />
+  Lists the renderstyles that can be set on a thing.<br />
+  <br />
+  Example:
+  <pre>        
+thingrenderstyles
+{
+	normal = "Normal";
+	translucent = "Translucent";
+	soultrans = "Translucent (Lost Soul)";
+	translucentstencil = "Translucent (stencil)";
+	add = "Additive";
+	subtract = "Subtractive";
+	stencil = "Stencil";
+	fuzzy = "Fuzzy";
+	optfuzzy = "Fuzzy/Shadow (uses r_drawfuzz CVAR)";
+	none = "None";
+}
+</pre>
+  <br />
+  <span class="big">Thing Category definitions:</span><br />
+  These settings can be used inside of thing category definitions.<br />
+  <span class="blue">Info:</span> thing categories can be nested in GZDB.<br />
+  <br />
+  <b class="fat">sorted</b> (integer) [0 .. 1]<br />
+  When set to 1, items in this category will be sorted by title.<br />
+  <br />
+  <span class="big">Thing and Thing Category definitions:</span><br />
+  These settings can be used inside of both thing category and thing definitions.<br />
+  <br />
+  <b class="fat">color</b> (integer) [0 .. 19]<br />
+  Sets the color used by things in this category.<br />
+  Possible values are:
+  <ul>
+    <li>&nbsp;&nbsp;0 - <span style="color:#696969">&#9608;</span> Dark Gray;</li>
+    <li>&nbsp;&nbsp;1 - <span style="color:#4169E1">&#9608;</span> Blue;</li>
+    <li>&nbsp;&nbsp;2 - <span style="color:#228B22">&#9608;</span> Green;</li>
+    <li>&nbsp;&nbsp;3 - <span style="color:#20B2AA">&#9608;</span> Cyan;</li>
+    <li>&nbsp;&nbsp;4 - <span style="color:#B22222">&#9608;</span> Red;</li>
+    <li>&nbsp;&nbsp;5 - <span style="color:#9400D3">&#9608;</span> Magenta;</li>
+    <li>&nbsp;&nbsp;6 - <span style="color:#B8860B">&#9608;</span> Brown;</li>
+    <li>&nbsp;&nbsp;7 - <span style="color:#C0C0C0">&#9608;</span> Gray;</li>
+    <li>&nbsp;&nbsp;8 - <span style="color:#808080">&#9608;</span> Light Gray;</li>
+    <li>&nbsp;&nbsp;9 - <span style="color:#00BFFF">&#9608;</span> Light Blue;</li>
+    <li>10 - <span style="color:#32CD32">&#9608;</span> Light Green;</li>
+    <li>11 - <span style="color:#AFEEEE">&#9608;</span> Light Cyan;</li>
+    <li>12 - <span style="color:#FF6347">&#9608;</span> Light Red;</li>
+    <li>13 - <span style="color:#EE82EE">&#9608;</span> Light Magenta;</li>
+    <li>14 - <span style="color:#FFFF00">&#9608;</span> Yellow;</li>
+    <li>15 - <span style="color:#F5F5F5">&#9608;</span> White;</li>
+    <li>16 - <span style="color:#FFB6C1">&#9608;</span> Pink;</li>
+    <li>17 - <span style="color:#FF8C00">&#9608;</span> Light Orange;</li>
+    <li>18 - <span style="color:#BDB76B">&#9608;</span> Light Brown (default);</li>
+    <li>19 - <span style="color:#DAA520">&#9608;</span> Orange;</li>
+  </ul>
+  <p><b class="fat">arrow</b> (integer) [0 .. 1]<br />
+    When set to 1, thing angle will be shown as an arrow in Classic and Visual modes.<br />
+    <br />
+    <b class="fat">renderstyle</b> (string)<br />
+    Sets the renderstyle of this category or thing. See <a href="http://www.zdoom.org/wiki/Actor_properties#RenderStyle">zdoom.org/wiki/Actor_properties#RenderStyle</a>.<br />
+    Default value is<strong> &quot;Normal&quot;</strong>.<br />
+    <br />
+    <b class="fat">alpha</b> (decimal) [0.0f .. 1.0f]<br />
+    Sets alpha of this category or thing.<br />
+    Default value is<strong> &quot;1.0f&quot;</strong>.<br />
+    <br />
+    <b class="fat">title</b> (string)<br />
+    Sets the title of this category or thing.<br />
+    <br />
+    <b class="fat">sprite</b> (string)<br />
+    Sets the sprite graphic to use when rendering this thing or things in this category. This should be fully qualified sprite name without file extension, like &quot;CPOSA2&quot;.<br />
+    You can also use  images from the"Sprites" directory by prefixing an image name without extension with &quot;internal:&quot;, like so: &quot;internal:Actor&quot;.<br />
+    <br />
+    <b class="fat">width</b> (integer)<br />
+    Sets the width to use when rendering  things in Classic and Visual modes.<br />
+    Default value is <strong>10</strong>.<br />
+    <br />
+    <b class="fat">height</b> (integer)<br />
+    Sets the height to use when rendering  things in Classic and Visual modes.<br />
+    Default value is <strong>20</strong>.<br />
+    <br />
+    <b class="fat">hangs</b> (integer) [0 .. 1]<br />
+    When set to 1, the thing will be aligned to ceiling instead of floor in Visual mode.<br />
+    <br />
+    <b class="fat">blocking</b> (integer) [0 .. 2]<br />
+    Sets thing blocking mode. This value is used when checking for stuck things.<br />
+    Possible values are:
+  <ul>
+    <li>0 - No blocking.</li>
+    <li>1 - Completely blocking.</li>
+    <li>2 - True-Height.</li>
+  </ul>
+  <b class="fat">error</b> (integer) [0 .. 2]<br />
+  Sets the stuck things error checking mode to use on this thing. <br />
+  Possible values are:
+  <ul>
+    <li>0 - Don't check this thing.</li>
+    <li>1 - Check if the thing is outside of map geometry.</li>
+    <li>2 - Check if the thing is outside of map geometry or stuck in another thing.</li>
+  </ul>
+  Default value is<strong> 1</strong>.<br />
+  <br />
+  <b class="fat">fixedsize</b> (boolean)<br />
+  When set to true, thing will be rendered as sizeless in Classic and Visual modes.<br />
+  <br />
+  <b class="fat">fixedrotation</b> (boolean) - <span class="red">GZDB only</span>.<br />
+  When set to true, thing's angle won't be changed when rotating things using Edit Selection mode.<br />
+  <br />
+  <b class="fat">absolutez</b> (boolean)<br />
+  When set to true, thing's vertical position will be used as an absolute value instead of distance from floor/ceiling in Visual mode.<br />
+  <br />
+  <b class="fat">spritescale</b> (decimal)<br />
+  Can be used to modify the rendered sprite scale in Visual mode.<br />
+  Default value is<strong> &quot;1.0f&quot;</strong>.<br />
+  <br />
+  <span class="big">Thing definitions:</span><br />
+  These settings can be used inside of thing definitions.<br />
+  <br />
+  <b class="fat">locksprite</b> (boolean) - <span class="red">GZDB only</span>.<br />
+  When set to true, the sprite set in the Game Configuration will be used even if a DECORATE actor definition of this thing contains a different sprite.<br />
+  <br />
+  <b class="fat">class</b> (string) - <span class="red">GZDB only</span>.<br />
+  Sets  DECORATE class name, which corresponds to this thing. Used internally to attach models and dynamic lights to given thing and when looking for an actor class to inherit from in DECORATE parser.<br />
+  <strong>Example:</strong>
+  <pre>3001
+{
+    title = "Imp";
+    sprite = "TROOA2A8";
+    <span class="blue">class = "DoomImp";</span>
+}</pre>
+<br />
+<span class="big">Thing argument definitions:</span><br />
+See <a href="gc_argumentsettings.html">Action Argument Settings</a>.
+  </p>
+</div>
+</body>
diff --git a/Help/gz_introduction.html b/Help/gz_introduction.html
new file mode 100644
index 0000000..2a513d5
--- /dev/null
+++ b/Help/gz_introduction.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>GZDoom Builder introduction</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Introduction">
+	</object>
+	
+	<div id="gz_title"><h1>Introduction</h1></div>
+	
+	<div id="contents">
+	<p align="right"><em>Documentation is like sex: when it is good, it is very, very good; and when it is bad, it is better than nothing.</em></p>
+    <p>GZDoom Builder is a Doom Builder 2 fork, which aims to incorporate as many GZDoom features as possible. Currently it's the only map editor for Doom and games based on Doom engine, which supports 3D models, dynamic lights and colored fog.
+
+		<h2>Reference Manual</h2>
+		<p>This is the Reference Manual for <strong>GZDoom Builder</strong>. You can use this manual to look up how the specific GZDoom Builder features work and what the specific modes and actions do.</p>
+		
+	  <p>This manual is not a beginners tutorial that teaches you how to make maps. To learn the mechanics of how to make maps read <a href="http://www.doombuilder.com/files/doombuilder1guide.pdf"><b>Doom Builder: An Illustrated Guide </b>(http://www.doombuilder.com/files/doombuilder1guide.pdf)</a>.</p>
+		
+    <h2>Table of contents</h2>
+    <ul>
+        <li><a href="gzdb/features/features.html">List of features</a>.</li>
+        <li><a href="gzdb/text_lumps.html">(G)ZDoom text lumps support</a> support.</li>
+        <li><a href="gzdb/deprecated_plugins.html">List of deprecated plugins</a>.</li>
+        <li><a href="gzdb/faq.html">Frequently asked questions</a>.</li>
+      </ul>
+    <p>Also, you can generate the  list of all GZDB actions by using <strong>Help -&gt; Keyboard Shortcuts Reference</strong> menu command.</p>
+    <img style="float:left; margin-right:10px; margin-top:18px" src="gzdb/mxd_avatar.png"/>
+    <h2>Notice from author:</h2>
+    English is not my native language, so there most likely are things which are explained in a strange or grammatically incorrect way. If you notice such things, please write me a personal message at <a href="http://forum.zdoom.org/ucp.php?i=pm&mode=compose&u=7012">http://forum.zdoom.org/ucp.php?i=pm&mode=compose&u=7012</a>, or leave a comment in the Official GZDoom Builder thread at <a href="http://forum.zdoom.org/viewtopic.php?f=3&t=32392">http://forum.zdoom.org/viewtopic.php?f=3&t=32392</a>.
+	</p>
+	</div>
+</body>
+
+
diff --git a/Help/gzdb/compilingtheeditor.html b/Help/gzdb/compilingtheeditor.html
new file mode 100644
index 0000000..03ef2e3
--- /dev/null
+++ b/Help/gzdb/compilingtheeditor.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+<title>About Compiler Configurations</title>
+<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
+</head>
+<body>
+<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+  <param name="keyword" value="compiling">
+  <param name="keyword" value="compilation">
+  <param name="keyword" value="svn">
+</object>
+<div id="gz_title">
+  <h1>Compiling GZDoom Builder</h1>
+</div>
+<div id="contents">
+  <h2>Required software:</h2>
+  <ul>
+    <li>
+    Visual C# 2008 Express Edition or  newer  with .net Framework 3.5 support. You can download it for free from <a href="http://msdn.microsoft.com/vstudio/express/">http://msdn.microsoft.com/vstudio/express/</a>. Alternatively, you can use Visual Studio 2008 or newer  with .net Framework 3.5 support.</li>
+  </ul>
+  
+  <h2>Optional software:</h2>
+  <ul>
+    <li>Subversion command-line client. For example, Tortoise SVN (<a href="http://tortoisesvn.net/">http://tortoisesvn.net</a>).<br />
+      <strong>Notice</strong>: when installing Tortoise SVN, make sure to select &quot;command line client tools&quot; option.</li>
+    <li>7-zip archiver (<a href="www.7-zip.org">www.7-zip.org</a>).</li>
+    <li>Inno Setup 5 or newer (<a href="http://www.jrsoftware.org/isinfo.php">http://www.jrsoftware.org/isinfo.php</a>).</li>
+    <li>Microsoft HTML Help compiler (<a href="http://www.microsoft.com/en-us/download/details.aspx?id=21138">http://www.microsoft.com/en-us/download/details.aspx?id=21138</a>).</li>
+    <li>SlimDX Developer SDK. You can download it for free from <a href="http://slimdx.org/download.php">http://slimdx.org/download.php</a>.</li>
+  </ul>
+  
+  <h2>Obtaining the source:</h2>
+  The Doom Builder 2 source code is hosted on SourceForge and is available through SVN at the following location:<pre>https://svn.code.sf.net/p/doombuilder/code/branches/GZDoomBuilder</pre>
+  If you don't want to use a SVN client, head to 
+  <a href="https://sourceforge.net/p/doombuilder/code/HEAD/tree/branches/GZDoomBuilder/">https://sourceforge.net/p/doombuilder/code/HEAD/tree/branches/GZDoomBuilder/</a>
+  and press &quot;Download Snapshot&quot; button.
+  <h2>Batch files:</h2>
+GZDB source comes with several batch files, which can be used to automatically compile and package the editor. Before launching a batch file for the first time, make sure to open it and check that variables holding software paths point to the right directories. These variables are always located near the top of the file, after the info block.
+<ul>
+  <li><strong>Clean Rebuild.bat</strong> - removes project cache files, then compiles it in Release mode.<br />Requires Visual C#  Express Edition / Visual Studio.</li><br />
+  <li><strong>CompileHelp.bat</strong> - compiles &quot;Build\Refmanual.chm&quot;. Help source files are located in the &quot;Help&quot; directory.<br />Requires Microsoft HTML Help compiler.</li><br />
+  <li><strong>MakeRelease.bat</strong> - removes project cache files,  sets project version number to match the latest SVN revision, compiles the project in Release mode, generates &quot;Build\Changelog.txt&quot;, compiles &quot;Build\Refmanual.chm&quot;, creates an installer and places it in the &quot;Release&quot; folder.<br />Requires Subversion command-line client, Visual C#  Express Edition / Visual Studio, Microsoft HTML Help compiler and Inno Setup 5.</li><br />
+  <li><strong>MakeSVNRelease.bat</strong> - removes project cache files,  sets project version number to match the latest SVN revision, compiles the project in Release mode, generates &quot;Build\Changelog.txt&quot;, compiles &quot;Build\Refmanual.chm&quot;, packs the build into 7-zip archive and places it in the &quot;SVN_Build&quot; folder.<br />Requires Subversion command-line client, Visual C#  Express Edition / Visual Studio, Microsoft HTML Help compiler and 7-zip archiver.</li>
+</ul>
+</div>
+</body>
+
diff --git a/Help/gzdb/deprecated_plugins.html b/Help/gzdb/deprecated_plugins.html
new file mode 100644
index 0000000..8433502
--- /dev/null
+++ b/Help/gzdb/deprecated_plugins.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>GZDoom Builder features</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="../default.css" media="screen" title="Default" />
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="plugins">
+    <param name="keyword" value="deprecated">
+	</object>
+	
+	<div id="gz_title"><h1>List of deprecated plugins</h1></div>
+	
+	<div id="contents">
+    <p><strong>The following plugins, which shipped with either Doom Builder 2 or older versions of GZDoom Builder, are no longer required or supported.</strong><br />
+      They can potentially cause problems in GZDoom Builder 2.3 or newer.<br />
+      It is recommended to delete them from the &quot;Plugins&quot; folder.</p>
+      <ul>
+        <li><strong>GZDoomEditing.dll</strong> - was merged into BuilderModes.dll in GZDB 1.14. Will cause crash during startup in the SVN versions of GZDB 1.14.</li>
+        <li><strong>Statistics.dll</strong> - merged into the core in the SVN versions of GZDB 1.14. Statistics are now shown in any editing mode when not highlighting any map elements.</li>
+        <li><strong>UDMFControls.dll</strong> - plugin's functionality was fully replaced by <a href="../w_linedefedit.html">Edit Linedef</a> and <a href="../w_sectoredit.html">Edit Sector</a> windows in the SVN versions of GZDB 1.14.</li>
+        <li><strong>CopyPasteSectorProps.dll</strong> - merged into BuilderModes.dll in the SVN versions of GZDB 1.14.</li>
+      </ul>
+      <p><strong>The following unfinished/example plugins either ship or shipped with GZDB's source code.</strong><br />
+      None of them are required by the end users and can be safely removed from the &quot;Plugins&quot; folder.</p>
+      <ul>
+        <li><strong>ImageDrawingExample.dll</strong></strong> - a simple editing mode example plugin. Can be useful for people interested in making their own plugins for DB2 or GZDB.</li>
+        <li><strong>USDF.dll</strong> - a very unfinished Universal Strife Dialog Format (<a href="http://zdoom.org/wiki/Universal_Strife_Dialog_Format">zdoom.org/wiki/USDF</a>) plugin. Doesn't do anything useful.</li>
+        <li><strong>WadAuthorMode.dll</strong> - another very unfinished plugin, which aimed to replicate WadAuthor's all-in-one editing mode. Doesn't do anything useful.</li>
+      </ul>
+</div>
+</body>
diff --git a/Help/gzdb/faq.html b/Help/gzdb/faq.html
new file mode 100644
index 0000000..172019f
--- /dev/null
+++ b/Help/gzdb/faq.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>GZDoom Builder features</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="../default.css" media="screen" title="Default" />
+    <style type="text/css">
+<!--
+.style1 {
+	color: #990000;
+	font-weight: bold;
+}
+-->
+    </style>
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="faq">
+	</object>
+	
+	<div id="gz_title"><h1>Frequently asked questions</h1></div>
+	
+	<div id="contents">
+    <p><strong>Q:</strong> I'm getting a ton of &quot;<strong>Unable to find the DECORATE class '[some actor]' to inherit from, while parsing '[some other actor]:[DoomEdNum]'</strong>&quot; warnings. What's wrong?<br />
+      <strong>A:</strong> This happens when a DECORATE actor is inherited from another actor, which is not defined in game configuration and is not defined in any included resources. <br />
+      <span class="style1">If you are using (G)ZDoom:</span><br />
+      To fix this, add "<strong>(g)zdoom.pk3</strong>" as a map resource. Don't forget to check "<strong>Exclude from testing parameters</strong>" chekbox while adding it, otherwise (G)ZDoom won't load your map. &quot;<strong>(g)zdoom.pk3</strong>&quot; can be found in (G)ZDoom folder.<br />
+      <span class="style1">If you are using Zandronum:</span><br />
+      To fix this, add "<strong>zandronum.pk3</strong>" as a map resource. If you are using Skulltag monsters, you'll also need to add &quot;<strong>skulltag_actors.pk3</strong>&quot; and &quot;<strong>skulltag_data.pk3</strong>&quot;. Don't forget to check "<strong>Exclude from testing parameters</strong>" chekbox while adding any of them, otherwise Zandronum won't load your map. "<strong>zandronum.pk3</strong>" and &quot;<strong>skulltag_actors.pk3</strong>&quot;  can be found in Zandronum folder. You'll have to find <strong>&quot;skulltag_data.pk3</strong>&quot; on your own.</p><br />
+    <p><strong>Q: </strong>Dynamic lights defined in GLDEFS are not rendered in Visual mode / I'm getting a ton of &quot;<strong>Light declaration not found for light '[light name]' ('[source]', line [n])</strong>&quot; warnings. What's wrong?<br />
+      <strong>A:</strong> GZDoom Builder doesn't include GZDoom's/Zandronum's GLDEFS light definitions.<br />
+      <span class="style1">If you are using GZDoom:</span><br />
+      To get rid of these errors, add &quot;<strong>lights.pk3</strong>&quot; as a map resource. &quot;<strong>lights.pk3</strong>&quot; can be found in GZDoom folder.<br />
+      <span class="style1">If you are using Zandronum:</span><br />
+      To get rid of these errors, add &quot;<strong>zandronum.pk3</strong>&quot; as a map resource. Don't forget to check &quot;<strong>Exclude from testing parameters</strong>&quot; chekbox while adding it, otherwise Zandronum won't load your map. &quot;<strong>zandronum.pk3</strong>&quot; can be found in Zandronum folder.</p><br />
+    <p><strong>Q:</strong> I don't like the &quot;fake contrast&quot; (<a href="http://zdoom.org/wiki/Fake_contrast">zdoom.org/wiki/Fake_contrast</a>)  GZDB uses to render sector walls in Visual mode. How can I disable this?<br />
+      <strong>A:</strong> GZDB's Visual mode emulates (G)ZDoom's default rendering preferences (in (G)ZDoom, Options -&gt; Display options -&gt; Use fake contrast is &quot;on&quot; by default). You can change this behaviour by adding &quot;evenlighting&quot; or &quot;smoothlighting&quot; property to the &quot;map&quot; or &quot;defaultmap&quot; definition in the MAPINFO. More info about  MAPINFO properties supported by GZDB can be found <a href="text_lumps.html#mapinfo">here</a>.</p>
+</div>
+</body>
diff --git a/Help/gzdb/features/all_modes/colorpicker.html b/Help/gzdb/features/all_modes/colorpicker.html
new file mode 100644
index 0000000..232c841
--- /dev/null
+++ b/Help/gzdb/features/all_modes/colorpicker.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+<title>GZDoom Builder features</title>
+<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" type="text/css" href="../../../default.css" media="screen" title="Default" />
+</head>
+<body>
+<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+  <param name="keyword" value="Template">
+</object>
+<div id="gz_title">
+  <h1>Color Picker plugin</h1>
+</div>
+<div id="contents">
+  <p>The Color Picker plugin lets you quickly edit Dynamic Lights properties as well as the sector properties "lightcolor" and "fadecolor".<br />
+    <strong>Default key:</strong> K<br />
+    <strong>Found in:</strong> Preferences -> Controls -> Tools -&gt; Open Color Picker</p>
+  <table width="100%" border="0" cellspacing="3" cellpadding="3">
+    <tr>
+      <td valign="top"><strong>To edit light properties:</strong><br />
+Select one or more lights in Classic or Visual Mode and click the Color Picker button or press  the shortcut key to open the  Color Picker window.<br />
+You can enable <strong>Relative mode</strong> if you have several   lights with different settings selected and want to scale them all   up/down a bit.<br />
+If nothing is selected in Visual Mode, you   can highlight a Light Thing and then open Color Picker window to edit it's properties.<br />
+<br />
+<strong>To edit sector colors (UDMF  only):</strong><br />
+Select any sectors in Classic mode, or any surfaces in  Visual Mode, then open the Color Picker window.
+Sector color (&quot;lightcolor&quot; property) and Fade color (&quot;fadecolor&quot; property) can be set in this mode.
+If nothing is selected in Visual Mode, you can highlight a surface and then open the Color Picker window to edit the color of the corresponding sector to which the highlighted surface belongs.</td>
+<td><img src="colorpicker.jpg"/></td>
+</tr>
+</table>
+</div>
+</body>
diff --git a/Help/gzdb/features/all_modes/colorpicker.jpg b/Help/gzdb/features/all_modes/colorpicker.jpg
new file mode 100644
index 0000000..d5c8782
Binary files /dev/null and b/Help/gzdb/features/all_modes/colorpicker.jpg differ
diff --git a/Help/gzdb/features/all_modes/event_lines.html b/Help/gzdb/features/all_modes/event_lines.html
new file mode 100644
index 0000000..1a1811e
--- /dev/null
+++ b/Help/gzdb/features/all_modes/event_lines.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>GZDoom Builder features</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="../../../default.css" media="screen" title="Default" />
+    <script type="text/javascript" src="../../../scripts.js"></script>
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Event lines">
+	</object>
+	
+	<div id="gz_title"><h1>Event lines</h1></div>
+	
+	<div id="contents">
+    <p>Event lines can be toggled using the icon on the <a href="../general/rendering_toolbar.html">Rendering toolbar</a> or using the "<strong>Toggle Event lines</strong>" action.<br />
+		The Color of the event lines can be changed in <strong>Preferences -> Appearance</strong>.</p>
+    <p>Several things will happen when event lines are enabled:</p>
+    1. Arrows will be drawn to all action targets for currently highlighted item in 2D modes:
+    <input class="spoilerbutton" type="button" onclick="ToggleSpoiler(this);" href="javascript:void(0);" value="Show image"/>
+          <div style="display: none; margin: 0px; padding: 6px; border: 1px inset;"><img src="event_lines1.jpg" alt="" /></div>
+
+   <br /> 2. Order, in which patrol points and interpolation points are connected  will be shown in Classic and Visual modes:
+    <input class="spoilerbutton" type="button" onclick="ToggleSpoiler(this);" href="javascript:void(0);" value="Show image"/>
+          <div style="display: none; margin: 0px; padding: 6px; border: 1px inset;"><img src="event_lines2.jpg" alt="" /></div>
+          <br />3. Corresponding Polyobject Start Spots and Polyobject Anchors will be connected in 2D modes.
+</div>
+</body>
diff --git a/Help/gzdb/features/all_modes/event_lines1.jpg b/Help/gzdb/features/all_modes/event_lines1.jpg
new file mode 100644
index 0000000..54a614e
Binary files /dev/null and b/Help/gzdb/features/all_modes/event_lines1.jpg differ
diff --git a/Help/gzdb/features/all_modes/event_lines2.jpg b/Help/gzdb/features/all_modes/event_lines2.jpg
new file mode 100644
index 0000000..47cbbf5
Binary files /dev/null and b/Help/gzdb/features/all_modes/event_lines2.jpg differ
diff --git a/Help/gzdb/features/all_modes/incremental_tags1.jpg b/Help/gzdb/features/all_modes/incremental_tags1.jpg
new file mode 100644
index 0000000..e51a460
Binary files /dev/null and b/Help/gzdb/features/all_modes/incremental_tags1.jpg differ
diff --git a/Help/gzdb/features/all_modes/incremental_tags2.jpg b/Help/gzdb/features/all_modes/incremental_tags2.jpg
new file mode 100644
index 0000000..c55816e
Binary files /dev/null and b/Help/gzdb/features/all_modes/incremental_tags2.jpg differ
diff --git a/Help/gzdb/features/all_modes/jitter.html b/Help/gzdb/features/all_modes/jitter.html
new file mode 100644
index 0000000..054f6e3
--- /dev/null
+++ b/Help/gzdb/features/all_modes/jitter.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>GZDoom Builder features</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="../../../default.css" media="screen" title="Default" />
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Template">
+	</object>
+	
+	<div id="gz_title">
+	  <h1>Randomize</h1>
+	</div>
+	
+	<div id="contents">
+      <p>Randomize mode can be used to add some randomness to any kind of   selection, which can be helpful when you are creating natural (caves) or   distorted (CAVES IN HELL!!!) environments.      </p>
+      <p><b>Menu path:</b> Mode -&gt; Randomize.<br />
+        <b>Action category:</b> Transform.<br />
+        <b>Default key:</b> Ctrl-J.<br />
+      <table border="0" cellspacing="3" cellpadding="3">
+        <tr>
+          <td><strong>Before:</strong></td>
+          <td><strong>After:</strong></td>
+        </tr>
+        <tr>
+          <td><img src="jitter2.jpg" alt="" width="295" height="211" /></td>
+          <td><img src="jitter3.jpg" alt="" width="257" height="211" /></td>
+        </tr>
+      </table>
+      <p>This function can be applied to any kind of selection from both Classic and Visual modes. 
+        Depending on selection type, different sets of settings can be used:<br />
+        <br />
+      When vertices or linedefs are selected in <strong>Vertices</strong> or <strong>Linedefs mode</strong>, or only walls are selected in <strong>Visual mode</strong>, you'll get this:</p>
+      <p><img src="jitter_verts.jpg" alt="" /></p>
+      <p>When sectors are selected in <strong>Sectors mode</strong>, or floors/ceilings are selected in <strong>Visual mode</strong>, you'll get this:</p>
+      <p><img src="jitter_sectors.jpg" alt="" /></p>
+      <p>When things are selected in <strong>Things</strong> or <strong>Visual mode</strong>, you'll get this:</p>
+      <p><img src="jitter_things.jpg" alt="" /></p>
+      <p>You can use <img src="jitter_update.jpg" alt="" width="22" height="24" /> button to update random values for a given property.</p>
+</div>
+</body>
diff --git a/Help/gzdb/features/all_modes/jitter2.jpg b/Help/gzdb/features/all_modes/jitter2.jpg
new file mode 100644
index 0000000..63d9bf4
Binary files /dev/null and b/Help/gzdb/features/all_modes/jitter2.jpg differ
diff --git a/Help/gzdb/features/all_modes/jitter3.jpg b/Help/gzdb/features/all_modes/jitter3.jpg
new file mode 100644
index 0000000..f27bac1
Binary files /dev/null and b/Help/gzdb/features/all_modes/jitter3.jpg differ
diff --git a/Help/gzdb/features/all_modes/jitter_sectors.jpg b/Help/gzdb/features/all_modes/jitter_sectors.jpg
new file mode 100644
index 0000000..34420b2
Binary files /dev/null and b/Help/gzdb/features/all_modes/jitter_sectors.jpg differ
diff --git a/Help/gzdb/features/all_modes/jitter_things.jpg b/Help/gzdb/features/all_modes/jitter_things.jpg
new file mode 100644
index 0000000..5064958
Binary files /dev/null and b/Help/gzdb/features/all_modes/jitter_things.jpg differ
diff --git a/Help/gzdb/features/all_modes/jitter_update.jpg b/Help/gzdb/features/all_modes/jitter_update.jpg
new file mode 100644
index 0000000..5b88c2a
Binary files /dev/null and b/Help/gzdb/features/all_modes/jitter_update.jpg differ
diff --git a/Help/gzdb/features/all_modes/jitter_verts.jpg b/Help/gzdb/features/all_modes/jitter_verts.jpg
new file mode 100644
index 0000000..16c80f3
Binary files /dev/null and b/Help/gzdb/features/all_modes/jitter_verts.jpg differ
diff --git a/Help/gzdb/features/all_modes/paste_properties_options.jpg b/Help/gzdb/features/all_modes/paste_properties_options.jpg
new file mode 100644
index 0000000..5ee0c2b
Binary files /dev/null and b/Help/gzdb/features/all_modes/paste_properties_options.jpg differ
diff --git a/Help/gzdb/features/all_modes/synch_cam1.jpg b/Help/gzdb/features/all_modes/synch_cam1.jpg
new file mode 100644
index 0000000..1737f5d
Binary files /dev/null and b/Help/gzdb/features/all_modes/synch_cam1.jpg differ
diff --git a/Help/gzdb/features/all_modes/synch_cam2.jpg b/Help/gzdb/features/all_modes/synch_cam2.jpg
new file mode 100644
index 0000000..626ea83
Binary files /dev/null and b/Help/gzdb/features/all_modes/synch_cam2.jpg differ
diff --git a/Help/gzdb/features/all_modes/synch_cam3.jpg b/Help/gzdb/features/all_modes/synch_cam3.jpg
new file mode 100644
index 0000000..e61e2e2
Binary files /dev/null and b/Help/gzdb/features/all_modes/synch_cam3.jpg differ
diff --git a/Help/gzdb/features/all_modes/synch_cam4.jpg b/Help/gzdb/features/all_modes/synch_cam4.jpg
new file mode 100644
index 0000000..dfc002d
Binary files /dev/null and b/Help/gzdb/features/all_modes/synch_cam4.jpg differ
diff --git a/Help/gzdb/features/all_modes/synch_camera.html b/Help/gzdb/features/all_modes/synch_camera.html
new file mode 100644
index 0000000..51e057a
--- /dev/null
+++ b/Help/gzdb/features/all_modes/synch_camera.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>GZDoom Builder features</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="../../../default.css" media="screen" title="Default" />
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Template">
+	</object>
+	
+	<div id="gz_title">
+	  <h1>Synchronizing camera position</h1>
+</div>
+	
+<div id="contents">
+  <p>GZDB can synchronize the camera position between Classic and Visual modes. Unlike DB2, this doesn't require a Visual Mode Camera thing and it works both ways. Here's how it works: </p>
+  <p>Let's say you want to inspect that secret area  in Visual mode:<br />
+  <img src="synch_cam1.jpg" alt="" width="736" height="512" /></p>
+  <p>Move the mouse cursor to the position where you want to appear in Visual mode, then go to Visual mode (default key is <strong>Q</strong>). You will appear there:</p>
+  <p><img src="synch_cam2.jpg" alt="" width="740" height="515" /></p>
+  <p>Then, let's say you've moved to an entirely different place without leaving Visual mode:</p>
+  <p><img src="synch_cam3.jpg" alt="" width="740" height="515" /></p>
+  <p>If you leave Visual mode now, the map will be centered at Visual camera's location:</p>
+  <p><img src="synch_cam4.jpg" alt="" width="736" height="512" /></p>
+  <p>If you don't like this behaviour, you can disable it in the <a href="../../../w_preferences.html">Preferences window</a>.</p>
+</div>
+</body>
diff --git a/Help/gzdb/features/all_modes/synch_selection.html b/Help/gzdb/features/all_modes/synch_selection.html
new file mode 100644
index 0000000..f9ed18e
--- /dev/null
+++ b/Help/gzdb/features/all_modes/synch_selection.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>GZDoom Builder features</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="../../../default.css" media="screen" title="Default" />
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Template">
+	</object>
+	
+	<div id="gz_title">
+	  <h1>Synchronizing selection</h1>
+</div>
+	
+<div id="contents">
+  <p>You can retain any selection made in the Linedefs, Sectors and Things modes while moving from 2D editing to Visual mode (and back). To do this, hold <strong>Shift</strong> while going to/from Visual mode (that will be <strong>Shift-Q</strong> by default). You can also invert this behavior by enabling<strong> Preferences -&gt; Editing -&gt; &quot;Synchronize selection between Visual and Classic modes&quot;</strong> setting. When this setting is enabled, holding <strong>Shift</strong> will ignore selection.</p>
+</div>
+</body>
diff --git a/Help/gzdb/features/all_modes/tag_support.html b/Help/gzdb/features/all_modes/tag_support.html
new file mode 100644
index 0000000..ad3b0ca
--- /dev/null
+++ b/Help/gzdb/features/all_modes/tag_support.html
@@ -0,0 +1,70 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+<title>Enhanced Tag Support</title>
+<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" type="text/css" href="../../../default.css" media="screen" title="Default" />
+<style type="text/css">
+<!--
+.style1 {
+	color: #990000;
+	font-weight: bold;
+}
+-->
+</style>
+</head>
+<body>
+<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+  <param name="keyword" value="tags">
+  <param name="keyword" value="tag">
+</object>
+<div id="gz_title">
+  <h1>Enhanced Tag Support</h1>
+</div>
+<div id="contents">
+  <h2><strong>New Tag vs. Unused Tag:</strong></h2>
+  <p><img src="tags_newlabel.jpg" /><br />
+    Two methods can be used to assign a new tag to a map element.<br />
+    Pressing &quot;<strong>New</strong>&quot; button will find a tag number, which is not used by any map element or any action argument, which expects a tag (classic Doom Builder 2 behaviour).<br />
+    Pressing "<strong>Unused</strong>" button will  find a tag number, which is not used by any map element of current type (e.g. not used by any linedef in the map, if the button is pressed in Edit Linedefs form).</p>
+  <h2><strong>Setting Tags relatively:</strong></h2>
+  <p>You can enter &quot;<strong>++N</strong>&quot; or &quot;<strong>--N</strong>&quot; as a tag to increase or decrease tags by <strong>N</strong>.</p>
+  <h2><strong>Setting Tag Ranges:</strong></h2>
+  <p>When several map elements are selected, you can set a tag range by entering "<strong>&gt;=N</strong>" or "<strong>&lt;=N</strong>" as a tag.<br />
+    <strong>Example:</strong> to tag selected sectors starting from 10 and going up, enter "<strong>&gt;=10</strong>" as the tag and press <strong>OK</strong> button:<br />
+    <img src="incremental_tags1.jpg" /><br />
+    <br />
+    The result:<br />
+    <img src="incremental_tags2.jpg" /><br />
+    <br />
+    <span class="style1">Warning:</span> setting tag ranges this way doesn't check if tags being set are already used in the map. If you need that functionality, set tag ranges using the <strong>Tag Range</strong> plugin.</p>
+  <h2><strong>Enhanced Tag Support:</strong></h2>
+  <table width="100%" border="0" cellspacing="3" cellpadding="3">
+    <tr>
+      <td valign="top">If a tag is already used in a map, you can  pick it from the list:
+        </p></td>
+      <td><img src="tags_dropdown.jpg" alt="" width="398" height="400" /></td>
+    </tr>
+    <tr>
+      <td valign="top"><p>This also works for action arguments. Only relevant tags will be shown in this case (e.g. if an argument is a sector tag, only sector tags will be shown in the drop down).<br />
+          <strong>If you want, you can type the tag number manually.</strong></p></td>
+      <td><img src="tags_action_arg.jpg" alt="" width="400" height="329" /></td>
+    </tr>
+  </table>
+  <h2><strong>Tag Labels</strong>:</h2>
+  <p>You can add labels to tags. This can be done in several ways:<br />
+    1. If you type any text in the tag selector, then an unused tag number will be found, and your text will be assigned to it as a label (this won't work for action arguments).
+  <p><img src="tags_newlabel.jpg" />
+  <p>2. You can use the <strong>Tag statistics form</strong> to view all tags used in a map, and view and edit labels, if any are assigned to them:
+  <p><img src="tags_view1.jpg" alt="" width="264" height="399" /><br />
+    <br />
+    <img src="tags_table.jpg" alt="" />
+  <p>Double-click on a value in the &quot;<strong>Label</strong>&quot; column to edit the tag label.<br />
+    Double-click on Sectors, Linedefs or Things cells to select map elements,  right click to open their properties.<br />
+    All columns are sortable.
+  <p>Tag labels support autocompletion. Start typing a tag label to show the autocompletion list:
+  <p><img src="tags_autocomplete.jpg" alt="" width="356" height="400" />
+  <p>When sort mode is set to &quot;By Tag&quot;, tag labels will be shown in the <strong>Tag Explorer</strong>:
+  <p><img src="tags_tagexplorer.jpg" alt="" width="285" height="311" /> 
+</div>
+</body>
diff --git a/Help/gzdb/features/all_modes/tagexplorer.html b/Help/gzdb/features/all_modes/tagexplorer.html
new file mode 100644
index 0000000..26e61bd
--- /dev/null
+++ b/Help/gzdb/features/all_modes/tagexplorer.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+<title>GZDoom Builder features</title>
+<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" type="text/css" href="../../../default.css" media="screen" title="Default" />
+</head>
+<body>
+<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+  <param name="keyword" value="Template">
+</object>
+<div id="gz_title">
+  <h1>Tag Explorer plugin</h1>
+</div>
+<div id="contents">
+  <table width="100%" border="0" cellspacing="3" cellpadding="3">
+    <tr>
+      <td valign="top">The Tag Explorer plugin lets you view all things, sectors and linedefs, which have tags and/or actions/effects assigned to them. It also allows you to view all polyobject-related things and linedefs. It allows you to filter by tag, effect or polyobject number. If the current map is in UDMF map format, it also allows you to edit comments of things, sectors and linedefs and search an item by a comment.<br />
+        <br />
+        <strong>Usage:</strong><br />
+Right-click an item to open the Edit menu.<br />
+Double-click an item to edit a comment (UDMF-only). Remove the comment text to clear comment.<br />
+<br />
+<strong>Special filter options:</strong><br />
+Enter <b>&quot;#&quot; + tag number</b> to show only elements with this tag. Example: enter &quot;#12&quot; to show elements with tag 12.<br />
+Enter &quot;<b>$&quot; + effect or action number</b> to show only elements with this effect or action. Example: enter &quot;$9&quot; to show elements with &quot;Line Horizon&quot; effect.
+<br />
+Enter <b>&quot;^&quot; + polyobject number</b> to filter by polyobject number.</td>
+      <td><img src="tagexplorer.jpg"/></td>
+    </tr>
+  </table>
+</div>
+</body>
diff --git a/Help/gzdb/features/all_modes/tagexplorer.jpg b/Help/gzdb/features/all_modes/tagexplorer.jpg
new file mode 100644
index 0000000..6fc0f13
Binary files /dev/null and b/Help/gzdb/features/all_modes/tagexplorer.jpg differ
diff --git a/Help/gzdb/features/all_modes/tags_action_arg.jpg b/Help/gzdb/features/all_modes/tags_action_arg.jpg
new file mode 100644
index 0000000..171e8f7
Binary files /dev/null and b/Help/gzdb/features/all_modes/tags_action_arg.jpg differ
diff --git a/Help/gzdb/features/all_modes/tags_autocomplete.jpg b/Help/gzdb/features/all_modes/tags_autocomplete.jpg
new file mode 100644
index 0000000..d720c29
Binary files /dev/null and b/Help/gzdb/features/all_modes/tags_autocomplete.jpg differ
diff --git a/Help/gzdb/features/all_modes/tags_dropdown.jpg b/Help/gzdb/features/all_modes/tags_dropdown.jpg
new file mode 100644
index 0000000..1d54ae3
Binary files /dev/null and b/Help/gzdb/features/all_modes/tags_dropdown.jpg differ
diff --git a/Help/gzdb/features/all_modes/tags_newlabel.jpg b/Help/gzdb/features/all_modes/tags_newlabel.jpg
new file mode 100644
index 0000000..d9ef215
Binary files /dev/null and b/Help/gzdb/features/all_modes/tags_newlabel.jpg differ
diff --git a/Help/gzdb/features/all_modes/tags_table.jpg b/Help/gzdb/features/all_modes/tags_table.jpg
new file mode 100644
index 0000000..353e463
Binary files /dev/null and b/Help/gzdb/features/all_modes/tags_table.jpg differ
diff --git a/Help/gzdb/features/all_modes/tags_tagexplorer.jpg b/Help/gzdb/features/all_modes/tags_tagexplorer.jpg
new file mode 100644
index 0000000..427222e
Binary files /dev/null and b/Help/gzdb/features/all_modes/tags_tagexplorer.jpg differ
diff --git a/Help/gzdb/features/all_modes/tags_view1.jpg b/Help/gzdb/features/all_modes/tags_view1.jpg
new file mode 100644
index 0000000..76164cf
Binary files /dev/null and b/Help/gzdb/features/all_modes/tags_view1.jpg differ
diff --git a/Help/gzdb/features/all_modes/test_from_view.html b/Help/gzdb/features/all_modes/test_from_view.html
new file mode 100644
index 0000000..a961f53
--- /dev/null
+++ b/Help/gzdb/features/all_modes/test_from_view.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>GZDoom Builder features</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="../../../default.css" media="screen" title="Default" />
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Template">
+	</object>
+	
+	<div id="gz_title">
+	  <h1>Testing map from view</h1>
+</div>
+	
+<div id="contents">
+  <p>GZDB allows you to test a map from any valid place in a map. Here's how it works: </p>
+  <p>Let's say you want to inspect that secret area  in (G)ZDoom:<br />
+  <img src="synch_cam1.jpg" alt="" width="736" height="512" /></p>
+  <p>Move  mouse cursor to the position you want to appear in the game, then use &quot;<strong>Test map from  current position</strong>&quot; action (default key is <strong>Ctrl-F9</strong>). You will appear there:</p>
+  <p><img src="test_from_view2.jpg" alt="" width="740"/></p>
+  <p>This works from Visual mode as well. You will appear at Visual camera position:</p>
+  <p><img src="test_from_view3.jpg" alt="" width="740" height="515" /></p>
+  <p><img src="test_from_view4.jpg" alt="" width="740"/></p>
+</div>
+</body>
diff --git a/Help/gzdb/features/all_modes/test_from_view2.jpg b/Help/gzdb/features/all_modes/test_from_view2.jpg
new file mode 100644
index 0000000..7ba012e
Binary files /dev/null and b/Help/gzdb/features/all_modes/test_from_view2.jpg differ
diff --git a/Help/gzdb/features/all_modes/test_from_view3.jpg b/Help/gzdb/features/all_modes/test_from_view3.jpg
new file mode 100644
index 0000000..6c69ee2
Binary files /dev/null and b/Help/gzdb/features/all_modes/test_from_view3.jpg differ
diff --git a/Help/gzdb/features/all_modes/test_from_view4.jpg b/Help/gzdb/features/all_modes/test_from_view4.jpg
new file mode 100644
index 0000000..6ed9ee2
Binary files /dev/null and b/Help/gzdb/features/all_modes/test_from_view4.jpg differ
diff --git a/Help/gzdb/features/all_modes/texture_browser.html b/Help/gzdb/features/all_modes/texture_browser.html
new file mode 100644
index 0000000..a40395f
--- /dev/null
+++ b/Help/gzdb/features/all_modes/texture_browser.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+<title>GZDoom Builder features</title>
+<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" type="text/css" href="../../../default.css" media="screen" title="Default" />
+</head>
+<body>
+<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+  <param name="keyword" value="Template">
+</object>
+<div id="gz_title">
+  <h1>Image Browser</h1>
+</div>
+<div id="contents">
+  <table width="100%" border="0" cellspacing="3" cellpadding="3">
+    <tr>
+      <td valign="top">The Image browser displays the directory structure of a Folder, PK3 and PK7 resource, allowing you to group and find textures easier.<br />
+        You can filter textures by texture size. If the current game configuration supports mixed textures and flats, you can filter textures by image type using this drop down:<br />
+        <img src="texture_types.jpg" alt=""/><br />
+        <br />
+        <strong>Technical notice:</strong><br />
+        For textures defined in TEXTURES lump, the location of the first patch is used as texture path.</td>
+      <td><img src="texture_browser.jpg"/></td>
+    </tr>
+  </table>
+</div>
+</body>
diff --git a/Help/gzdb/features/all_modes/texture_browser.jpg b/Help/gzdb/features/all_modes/texture_browser.jpg
new file mode 100644
index 0000000..1bf60ff
Binary files /dev/null and b/Help/gzdb/features/all_modes/texture_browser.jpg differ
diff --git a/Help/gzdb/features/all_modes/texture_types.jpg b/Help/gzdb/features/all_modes/texture_types.jpg
new file mode 100644
index 0000000..578f556
Binary files /dev/null and b/Help/gzdb/features/all_modes/texture_types.jpg differ
diff --git a/Help/gzdb/features/classic_modes/3dfloor_marks.jpg b/Help/gzdb/features/classic_modes/3dfloor_marks.jpg
new file mode 100644
index 0000000..bba5ebe
Binary files /dev/null and b/Help/gzdb/features/classic_modes/3dfloor_marks.jpg differ
diff --git a/Help/gzdb/features/classic_modes/bridge1.jpg b/Help/gzdb/features/classic_modes/bridge1.jpg
new file mode 100644
index 0000000..1af8603
Binary files /dev/null and b/Help/gzdb/features/classic_modes/bridge1.jpg differ
diff --git a/Help/gzdb/features/classic_modes/bridge2.jpg b/Help/gzdb/features/classic_modes/bridge2.jpg
new file mode 100644
index 0000000..787467f
Binary files /dev/null and b/Help/gzdb/features/classic_modes/bridge2.jpg differ
diff --git a/Help/gzdb/features/classic_modes/bridge3.jpg b/Help/gzdb/features/classic_modes/bridge3.jpg
new file mode 100644
index 0000000..12f2546
Binary files /dev/null and b/Help/gzdb/features/classic_modes/bridge3.jpg differ
diff --git a/Help/gzdb/features/classic_modes/bridge_copy.jpg b/Help/gzdb/features/classic_modes/bridge_copy.jpg
new file mode 100644
index 0000000..6a9ebd2
Binary files /dev/null and b/Help/gzdb/features/classic_modes/bridge_copy.jpg differ
diff --git a/Help/gzdb/features/classic_modes/bridge_easeInOutSine.jpg b/Help/gzdb/features/classic_modes/bridge_easeInOutSine.jpg
new file mode 100644
index 0000000..6292a90
Binary files /dev/null and b/Help/gzdb/features/classic_modes/bridge_easeInOutSine.jpg differ
diff --git a/Help/gzdb/features/classic_modes/bridge_easeInSine.jpg b/Help/gzdb/features/classic_modes/bridge_easeInSine.jpg
new file mode 100644
index 0000000..3bbf268
Binary files /dev/null and b/Help/gzdb/features/classic_modes/bridge_easeInSine.jpg differ
diff --git a/Help/gzdb/features/classic_modes/bridge_easeOutSine.jpg b/Help/gzdb/features/classic_modes/bridge_easeOutSine.jpg
new file mode 100644
index 0000000..555958e
Binary files /dev/null and b/Help/gzdb/features/classic_modes/bridge_easeOutSine.jpg differ
diff --git a/Help/gzdb/features/classic_modes/bridge_flip.jpg b/Help/gzdb/features/classic_modes/bridge_flip.jpg
new file mode 100644
index 0000000..d5c17ab
Binary files /dev/null and b/Help/gzdb/features/classic_modes/bridge_flip.jpg differ
diff --git a/Help/gzdb/features/classic_modes/bridge_mirror.jpg b/Help/gzdb/features/classic_modes/bridge_mirror.jpg
new file mode 100644
index 0000000..5278c43
Binary files /dev/null and b/Help/gzdb/features/classic_modes/bridge_mirror.jpg differ
diff --git a/Help/gzdb/features/classic_modes/bridge_settings.jpg b/Help/gzdb/features/classic_modes/bridge_settings.jpg
new file mode 100644
index 0000000..1578501
Binary files /dev/null and b/Help/gzdb/features/classic_modes/bridge_settings.jpg differ
diff --git a/Help/gzdb/features/classic_modes/bridge_tex1.jpg b/Help/gzdb/features/classic_modes/bridge_tex1.jpg
new file mode 100644
index 0000000..422f9de
Binary files /dev/null and b/Help/gzdb/features/classic_modes/bridge_tex1.jpg differ
diff --git a/Help/gzdb/features/classic_modes/bridge_tex1_3d.jpg b/Help/gzdb/features/classic_modes/bridge_tex1_3d.jpg
new file mode 100644
index 0000000..5be33dc
Binary files /dev/null and b/Help/gzdb/features/classic_modes/bridge_tex1_3d.jpg differ
diff --git a/Help/gzdb/features/classic_modes/bridge_tex2_3d.jpg b/Help/gzdb/features/classic_modes/bridge_tex2_3d.jpg
new file mode 100644
index 0000000..6d3e9ab
Binary files /dev/null and b/Help/gzdb/features/classic_modes/bridge_tex2_3d.jpg differ
diff --git a/Help/gzdb/features/classic_modes/bridge_tex3.jpg b/Help/gzdb/features/classic_modes/bridge_tex3.jpg
new file mode 100644
index 0000000..3142830
Binary files /dev/null and b/Help/gzdb/features/classic_modes/bridge_tex3.jpg differ
diff --git a/Help/gzdb/features/classic_modes/bridge_tex4_3d.jpg b/Help/gzdb/features/classic_modes/bridge_tex4_3d.jpg
new file mode 100644
index 0000000..71c2bb5
Binary files /dev/null and b/Help/gzdb/features/classic_modes/bridge_tex4_3d.jpg differ
diff --git a/Help/gzdb/features/classic_modes/bridgemode_icon.png b/Help/gzdb/features/classic_modes/bridgemode_icon.png
new file mode 100644
index 0000000..b91f0ec
Binary files /dev/null and b/Help/gzdb/features/classic_modes/bridgemode_icon.png differ
diff --git a/Help/gzdb/features/classic_modes/draw_curve.jpg b/Help/gzdb/features/classic_modes/draw_curve.jpg
new file mode 100644
index 0000000..d4925c2
Binary files /dev/null and b/Help/gzdb/features/classic_modes/draw_curve.jpg differ
diff --git a/Help/gzdb/features/classic_modes/draw_ellipse1.jpg b/Help/gzdb/features/classic_modes/draw_ellipse1.jpg
new file mode 100644
index 0000000..c6efde5
Binary files /dev/null and b/Help/gzdb/features/classic_modes/draw_ellipse1.jpg differ
diff --git a/Help/gzdb/features/classic_modes/draw_ellipse2.jpg b/Help/gzdb/features/classic_modes/draw_ellipse2.jpg
new file mode 100644
index 0000000..aae2898
Binary files /dev/null and b/Help/gzdb/features/classic_modes/draw_ellipse2.jpg differ
diff --git a/Help/gzdb/features/classic_modes/draw_grid_tri.jpg b/Help/gzdb/features/classic_modes/draw_grid_tri.jpg
new file mode 100644
index 0000000..6881754
Binary files /dev/null and b/Help/gzdb/features/classic_modes/draw_grid_tri.jpg differ
diff --git a/Help/gzdb/features/classic_modes/draw_rectangle1.jpg b/Help/gzdb/features/classic_modes/draw_rectangle1.jpg
new file mode 100644
index 0000000..ed280e3
Binary files /dev/null and b/Help/gzdb/features/classic_modes/draw_rectangle1.jpg differ
diff --git a/Help/gzdb/features/classic_modes/draw_rectangle2.jpg b/Help/gzdb/features/classic_modes/draw_rectangle2.jpg
new file mode 100644
index 0000000..b6eebfa
Binary files /dev/null and b/Help/gzdb/features/classic_modes/draw_rectangle2.jpg differ
diff --git a/Help/gzdb/features/classic_modes/draw_settings.jpg b/Help/gzdb/features/classic_modes/draw_settings.jpg
new file mode 100644
index 0000000..5519a30
Binary files /dev/null and b/Help/gzdb/features/classic_modes/draw_settings.jpg differ
diff --git a/Help/gzdb/features/classic_modes/drawsettingspanel.html b/Help/gzdb/features/classic_modes/drawsettingspanel.html
new file mode 100644
index 0000000..160a0c7
--- /dev/null
+++ b/Help/gzdb/features/classic_modes/drawsettingspanel.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>Draw Ellipse mode</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="../../../default.css" media="screen" title="Default" />
+</head>
+<body>
+
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Template">
+	</object>
+	
+	<div id="gz_title">
+	  <h1>Draw Settings Panel</h1>
+	</div>
+	
+	<div id="contents">
+<div style="float:right"><img src="drawsettingspanel.jpg" alt="" width="285" height="578" /></div>
+<p> By default, when the new sector overlaps or touches existing sector, the editor uses textures, brighntess and floor/ceiling heights from that sector when drawing the new one. You can use Draw Settings Panel to override that behaviour.</p>
+<p>Also, you can use this panel to remove textures from currently selected map objects, or replace the texures with currently selected overrides.</p>
+</div>
+</body>
diff --git a/Help/gzdb/features/classic_modes/drawsettingspanel.jpg b/Help/gzdb/features/classic_modes/drawsettingspanel.jpg
new file mode 100644
index 0000000..c36c18f
Binary files /dev/null and b/Help/gzdb/features/classic_modes/drawsettingspanel.jpg differ
diff --git a/Help/gzdb/features/classic_modes/import_terrain_settings.jpg b/Help/gzdb/features/classic_modes/import_terrain_settings.jpg
new file mode 100644
index 0000000..02f82bc
Binary files /dev/null and b/Help/gzdb/features/classic_modes/import_terrain_settings.jpg differ
diff --git a/Help/gzdb/features/classic_modes/linedef_color_presets.html b/Help/gzdb/features/classic_modes/linedef_color_presets.html
new file mode 100644
index 0000000..f742116
--- /dev/null
+++ b/Help/gzdb/features/classic_modes/linedef_color_presets.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>GZDoom Builder features</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="../../../default.css" media="screen" title="Default" />
+    <style type="text/css">
+<!--
+.style1 {color: #336600}
+-->
+    </style>
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Template">
+	</object>
+	
+	<div id="gz_title"><h1>Custom linedef colors</h1></div>
+	
+	<div id="contents">
+    <p>You can create <strong>custom linedef color presets</strong> to show linedefs with any combination of <strong>action</strong>, <strong>flags</strong> and <strong>activation</strong> using a specified color in 2D modes.</p>
+    <p>You can choose which presets to apply using the drop down menu on the main toolbar.<br />While the drop down is opened, hold <strong>Shift</strong> to toggle several items at once.<br />
+    <img src="linedef_color_presets_dropdown.jpg" />
+    </p>
+    <p><strong>Technical notice: </strong>color presets are evaluated from top to bottom, so if you have a setup like this:<br />
+      <span class="style1">"Any action" [no flags]<strong> [any action]</strong> [no activation]<br />
+    "Slopes" [no flags]<strong> [action 181]</strong> [no activation]</span><br />
+    then the "Slopes" preset will never be used.
+    
+    </p>
+    <img src="linedef_color_presets.jpg" />
+</div>
+</body>
diff --git a/Help/gzdb/features/classic_modes/linedef_color_presets.jpg b/Help/gzdb/features/classic_modes/linedef_color_presets.jpg
new file mode 100644
index 0000000..6ebcd7b
Binary files /dev/null and b/Help/gzdb/features/classic_modes/linedef_color_presets.jpg differ
diff --git a/Help/gzdb/features/classic_modes/linedef_color_presets_dropdown.jpg b/Help/gzdb/features/classic_modes/linedef_color_presets_dropdown.jpg
new file mode 100644
index 0000000..40fda93
Binary files /dev/null and b/Help/gzdb/features/classic_modes/linedef_color_presets_dropdown.jpg differ
diff --git a/Help/gzdb/features/classic_modes/mode_drawbridge.html b/Help/gzdb/features/classic_modes/mode_drawbridge.html
new file mode 100644
index 0000000..9f3b31c
--- /dev/null
+++ b/Help/gzdb/features/classic_modes/mode_drawbridge.html
@@ -0,0 +1,108 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>Template</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="../../../default.css" media="screen" title="Default" />
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Bridge Mode">
+	</object>
+	
+	<div id="gz_title"><h1>Bridge Mode</h1></div>
+	
+	<div id="contents">
+	<p>
+This mode lets you connect parts of existing geometry using Bezier curves.<br>
+<b>Menu path:</b> Mode -&gt; Bridge mode.<br>
+<b>Action category:</b> Drawing.<br>
+<b>Default key:</b> Ctrl-B.<br>
+<b>Additional actions:</b> Increase Subdivision Level, Decrease Subdivision Level. You  can hold <strong>Shift</strong> while dragging a handle to turn grid snapping off.<br>
+<table width="100%" border="0" cellspacing="3" cellpadding="3">
+  <tr>
+    <td width="33%"><b>Usage:</b> Select two linedefs or two groups of linedefs: </td>
+    <td width="33%">Then activate the Bridge mode by using the keyboard shortcut or tool button (<img align="texttop" src="bridgemode_icon.png" />):</td>
+    <td>Make some changes, then press the OK button or Enter to accept, or Cancel/Esc to cancel:</td>
+  </tr>
+  <tr>
+    <td align="center"><img src="bridge1.jpg" /></td>
+    <td align="center"><img src="bridge2.jpg" /></td>
+    <td align="center"><img src="bridge3.jpg" /></td>
+  </tr>
+</table>
+
+<h2>Options window</h2>
+<table width="100%" border="0" cellspacing="3" cellpadding="3">
+  <tr>
+    <td valign="top"><img src="bridge_settings.jpg" /></td>
+    <td><b>Align floor and Align ceiling drop downs</b> let you choose how the heights of created sectors are <a href="#interp_modes">interpolated</a>.<br>
+<b>Brightness drop down</b> lets you choose how the brightness of created sectors is interpolated.<br>
+<b>Subdivisions</b> controls how many subdivisions a bridge has. You can also use "Increase Subdivisions" and "Decrease Subdivisions" actions to control this by using keyboard shortcuts.<br>
+<br>
+Activate <b>Mirror mode</b> to mirror paired handle movement:<br>
+<img style="display:block" src="bridge_mirror.jpg" /><br>
+Activate <b>Copy mode</b> to copy paired handle movement:<br>
+<img style="display:block" src="bridge_copy.jpg" /><br>
+If a shape crosses itself, you can press the <b>"Flip Lines"</b> button to fix this:
+<img style="display:block" src="bridge_flip.jpg" /><br>
+<br></td>
+  </tr>
+</table>
+<h2>Interpolation modes:<a id="interp_modes"></a></h2>
+<table width="100%" border="0" cellspacing="3" cellpadding="3">
+  <tr>
+    <td width="200px">&nbsp;</td>
+    <td><strong>Highest ceiling</strong></td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td><strong>Lowest floor</strong></td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td><strong>Linear interpolation</strong></td>
+  </tr>
+  <tr>
+    <td><img align="middle" src="bridge_easeInSine.jpg" /></td>
+    <td><b>EaseInSine interpolation</b> - interpolates heights using sinusoidal (sin(t)) easing in.</td>
+  </tr>
+  <tr>
+    <td><img align="middle" src="bridge_easeOutSine.jpg" /></td>
+    <td><b>EaseOutSine interpolation</b> - interpolates heights using sinusoidal (sin(t)) easing out.</td>
+  </tr>
+  <tr>
+    <td><img align="middle" src="bridge_easeInOutSine.jpg" /></td>
+    <td><b>EaseInOutSine interpolation</b> - interpolates heights using sinusoidal (sin(t)) easing in/out.</td>
+  </tr>
+</table>
+<h2>Setting lower/upper textures:</h2>
+If you are going to connect sectors with different ceiling and/or floor heights, you'll generally want to set upper and/or lower textures. To do this, set upper or lower textures to linedefs, which will be used to define the shape of the bridge. <br>Let's say we want to make a stairway out of these lines:
+<table border="0" cellspacing="3" cellpadding="3">
+  <tr>
+    <td><b>2D-view:</b></td>
+    <td><b>3D-view:</b></td>
+  </tr>
+  <tr>
+    <td valign="top"><img src="bridge_tex1.jpg" /></td>
+    <td><img src="bridge_tex1_3d.jpg" /></td>
+  </tr>
+</table>
+<br>
+If you bridge these linedefs right now, you'll have lots of unset textures:
+<br>
+<img src="bridge_tex2_3d.jpg" /> 
+<br><br>
+Instead of setting them all by hand, set the upper and lower textures of those linedefs, which will be used to create this shape (you need to set only one linedef of the pair):
+<br>
+<img src="bridge_tex3.jpg" /> 
+<br><br>
+If you bridge linedefs now, all upper/lower textures will be set:
+<br>
+<img src="bridge_tex4_3d.jpg" /> 
+</p>
+</div>
+</body>
diff --git a/Help/gzdb/features/classic_modes/mode_drawcurve.html b/Help/gzdb/features/classic_modes/mode_drawcurve.html
new file mode 100644
index 0000000..948a54d
--- /dev/null
+++ b/Help/gzdb/features/classic_modes/mode_drawcurve.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>Draw Rectangle mode</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="../../../default.css" media="screen" title="Default" />
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Template">
+	</object>
+	
+	<div id="gz_title">
+	  <h1>Draw Curve mode</h1>
+	</div>
+	
+	<div id="contents">
+	<p>
+This mode lets you draw various curve shapes. <br>
+<b>Menu path:</b> Mode -&gt; Draw Curve.<br>
+<b>Action category: </b> Drawing.<br>
+<b>Default key:</b> Ctrl-Alt-D.<br>
+<b>Additional actions:</b> Increase Subdivision Level, Decrease Subdivision Level.<br><br>
+You can activate this mode by pressing <strong>Ctrl-Alt-D</strong> (default key).<br>
+You can use the side panel or &quot;<strong>Increase Subdivision Level</strong>&quot; and &quot;<strong>Decrease Subdivision Level</strong>&quot; actions to control how detailed the curve is:
+<br>
+<img src="draw_curve.jpg" /></div>
+</body>
diff --git a/Help/gzdb/features/classic_modes/mode_drawellipse.html b/Help/gzdb/features/classic_modes/mode_drawellipse.html
new file mode 100644
index 0000000..8c81f82
--- /dev/null
+++ b/Help/gzdb/features/classic_modes/mode_drawellipse.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>Draw Ellipse mode</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="../../../default.css" media="screen" title="Default" />
+</head>
+<body>
+
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Template">
+	</object>
+	
+	<div id="gz_title"><h1>Draw Ellipse mode</h1></div>
+	
+	<div id="contents">
+	<p>
+This mode lets you draw various ellipsoid shapes.<br>
+	<b>Menu path:</b> Mode -&gt; Draw Ellipse.<br>
+      <b>Action category:</b> Drawing.<br>
+      <b>Default key:</b> Ctrl-Alt-D.<br>
+      <b>Additional actions:</b> Increase Subdivision Level, Decrease Subdivision Level, Increase  Corners Bevel, Decrease Corners Bevel.<br>
+      <br>
+      You can activate this mode by pressing <strong>Alt-Shift-D</strong> (default key).<br>
+      You can use the side panel or &quot;<strong>Increase Subdivision Level</strong>&quot; and &quot;<strong>Decrease Subdivision Level</strong>&quot; actions to  control the number of sides ellipse has:
+      <br>
+      <img src="draw_ellipse1.jpg" />
+      <br>
+      You can use side panel or &quot;<strong>Increase Corners Bevel</strong>&quot; and &quot;<strong>Decrease Corners Bevel</strong>&quot; actions to bevel the ellipse: <br>
+      <img src="draw_ellipse2.jpg" />
+      <br>
+      When using &quot;<strong>Increase/Decrease Corners Bevel</strong>&quot; actions, the bevel  increment is based on the current grid size.</p>
+</div>
+</body>
diff --git a/Help/gzdb/features/classic_modes/mode_drawgrid.html b/Help/gzdb/features/classic_modes/mode_drawgrid.html
new file mode 100644
index 0000000..2d06dc1
--- /dev/null
+++ b/Help/gzdb/features/classic_modes/mode_drawgrid.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>GZDoom Builder features</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="../../../default.css" media="screen" title="Default" />
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Template">
+	</object>
+	
+	<div id="gz_title">
+	  <h1>Draw Grid mode</h1>
+	</div>
+	
+	<div id="contents">
+    <p>This mode lets you draw  grids.<br />
+      <b>Menu path:</b> Mode -&gt; Draw Grid.<br>
+      <b>Action category:</b> Drawing.<br />
+      <b>Default key:</b> none.<br />
+      <b>Additional actions:</b> Increase Subdivision Level, Decrease Subdivision Level, Increase  Corners Bevel, Decrease Corners Bevel.</p>
+    <p>You can use the side panel or &quot;<strong>Increase/Decrease Subdivision Level</strong>&quot; and &quot;<strong>Increase/Decrease Corners Bevel</strong>&quot; actions to change the number of horizontal and vertical slices.<br />
+    Check "<strong>Lock slices to grid</strong>" to match slices number to current grid size.<br />
+    Check &quot;<strong>Triangulate</strong>&quot; if you want to create triangles instead of quads:</p>
+    <p><img src="draw_grid_tri.jpg" alt="" /></p>
+</div>
+</body>
diff --git a/Help/gzdb/features/classic_modes/mode_drawrect.html b/Help/gzdb/features/classic_modes/mode_drawrect.html
new file mode 100644
index 0000000..ed12653
--- /dev/null
+++ b/Help/gzdb/features/classic_modes/mode_drawrect.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>Draw Rectangle mode</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="../../../default.css" media="screen" title="Default" />
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Template">
+	</object>
+	
+	<div id="gz_title"><h1>Draw Rectangle mode</h1></div>
+	
+	<div id="contents">
+	<p>
+This mode lets you draw various rectangle shapes.<br>
+<b>Menu path:</b> Mode -&gt; Draw Rectangle.<br />
+<b>Action category:</b> Drawing.<br>
+<b>Default key:</b> Ctrl-Shift-D.<br>
+<b>Additional actions:</b> Increase Subdivision Level, Decrease Subdivision Level, Increase  Corners Bevel, Decrease Corners Bevel.<br><br>
+You can activate this mode by pressing <strong>Ctrl-Shift-D</strong> (default key).<br>
+You can use the side panel or &quot;<strong>Increase/Decrease Subdivision Level</strong>&quot; and &quot;<strong>Increase/Decrease Corners Bevel</strong>&quot; actions to change corner bevel amount and detail level:
+<br>
+<img src="draw_rectangle1.jpg" />
+<br>
+Negative bevel values are also supported:
+<br>
+<img src="draw_rectangle2.jpg" />
+<br>
+When using &quot;<strong>Increase/Decrease Corners Bevel</strong>&quot; actions, the bevel increment is based on the current grid size.</p>
+</div>
+</body>
diff --git a/Help/gzdb/features/classic_modes/mode_importterrain.html b/Help/gzdb/features/classic_modes/mode_importterrain.html
new file mode 100644
index 0000000..386daaa
--- /dev/null
+++ b/Help/gzdb/features/classic_modes/mode_importterrain.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>GZDoom Builder features</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="../../../default.css" media="screen" title="Default" />
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Template">
+	</object>
+	
+	<div id="gz_title">
+	  <h1>Terrain Importer</h1>
+	</div>
+	
+	<div id="contents">
+    <p>This mode allows you to create sectors from  a Wavefront .obj model.<br />
+      <b>Menu path:</b> File -&gt; Import -&gt; Wavefront .obj as Terrain.<br>
+      <b>Action category:</b> Tools.<br />
+      <b>Default key:</b> none.</p>
+    <p><strong>Usage:</strong><br />
+      Create a terrain model in your favorite 3D modeling app (<a href="http://www.blender.org/">Blender</a>, <a href="http://www.earthsculptor.com/">Earth Sculptor</a> or any other, which can save or export a model to Wavefront .obj format)<br />
+      Use <strong>File -&gt; Import -&gt; Wavefront .obj as Terrain</strong> action to import it as sectors. Each polygon in your model will be transformed into a sector.</p>
+      <strong>Settings:</strong><img style="float:right" src="import_terrain_settings.jpg"/><br />
+      <em>Scale:</em> self explanatory. The default is 1.0.<br />
+      <em>Up axis:</em> should be the same as vertical axis in the 3D modeling app used to create a terrain model.<br />
+      <em>Sloped terrain:</em>      when enabled, the mode will generate sloped terrain using floor vertex height offsets (&quot;ZFloor&quot;) in UDMF or Vertex slope floor (1504) things. Regardless of this setting, the mode will also set each new sector's floor height to the averaged height of a polygon it was created from.<br />
+      <br />
+      <strong>Limitations:</strong><br />
+      The model should be triangulated.<br />
+      Polygons should not overlap each other when viewed from the top.<br />
+      <p><img src="terrain1.jpg" alt="" width="842" height="722" /></p>
+    <p><img src="terrain2.jpg" alt="" width="842" height="632" /></p>
+</div>
+</body>
diff --git a/Help/gzdb/features/classic_modes/mode_snapelements.html b/Help/gzdb/features/classic_modes/mode_snapelements.html
new file mode 100644
index 0000000..180b663
--- /dev/null
+++ b/Help/gzdb/features/classic_modes/mode_snapelements.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>Draw Ellipse mode</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="../../../default.css" media="screen" title="Default" />
+</head>
+<body>
+
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Template">
+	</object>
+	
+	<div id="gz_title">
+	  <h1>Snap selected map elements to grid mode</h1>
+	</div>
+	
+	<div id="contents">
+	<p>
+Activate this mode to snap selected map elements to the current grid.<br>
+<b>Menu path:</b> Edit -> Snap selected  map elements to the grid.<br>
+<b>Action category:</b> Drawing.<br>
+<b>Default key:</b> none.
+</div>
+</body>
diff --git a/Help/gzdb/features/classic_modes/mode_soundenvironment.html b/Help/gzdb/features/classic_modes/mode_soundenvironment.html
new file mode 100644
index 0000000..1fe5196
--- /dev/null
+++ b/Help/gzdb/features/classic_modes/mode_soundenvironment.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>Sound Propagation Mode</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="../../../default.css" media="screen" title="Default" />
+</head>
+<body>
+
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Template">
+	</object>
+	
+	<div id="gz_title">
+	  <h1>Sound Environment Mode</h1>
+	</div>
+	
+	<div id="contents">
+	<p>
+<span class="fat">This mode is based on <a href="http://forum.zdoom.org/viewtopic.php?f=3&amp;t=47464">Sound Propagation Mode Plugin</a> by Boris Iwansky (<a href="https://github.com/biwa/soundpropagationmode">https://github.com/biwa/soundpropagationmode</a>).</span><br>
+<br>
+<b>Action category:</b> Modes.<br>
+<b>Default key:</b> none.<br><br>
+This mode shows the sound environments in ZDoom maps (both Hexen format and UDMF). The gray areas do not belong to a sound environment.<br><br>
+
+The mode also supplies a docker that supplies information about the sound environments. It will display the sound environments, the SoundEnvironment things belonging to them and also the lines that are limit the sound environments. Clicking on the sound environments, things or lines in the list will center the map view on those objects.
+<br><br>
+<span class="bold">User interaction:</span>
+<ul>
+      <li>Click on double-sided linedefs to toggle &quot;Sound Zone Boundary&quot; flag.</li>
+      <li>Right-click to insert a SoundEnvironment thing.</li>
+      <li>Right-click on a SoundEnvironment thing to choose a Sound Environment.</li>
+      <li>Highlight a SoundEnvironment thing and press &quot;Delete&quot; key to remove it.</li>
+</ul>
+
+This mode can also help you find problems (i.e. behaviors that you probably  did not intend). If there are any problems with a sound environment, a warning sign will be displayed in the list at the affected thing or line (the icon will bubble up the tree to make it easier to find when the whole list is collapsed).
+<br>
+<br>
+<span class="bold">Following problems are detected:</span>
+<ul>
+   <li>One-sided lines that are set to be a sound zone boundary.</li>
+   <li>Two-sided lines that are set to be a sound zone boundary, but the sectors on both sides belong to the same sound environment.</li>
+   <li> Multiple non-dormant SoundEnivornment things.</li>
+</ul>
+Note that the latter two can be caused by sound environments unintentionally bleeding into other sectors (i.e. not correctly sealed sound environments).
+</div>
+</body>
diff --git a/Help/gzdb/features/classic_modes/mode_soundpropagation.html b/Help/gzdb/features/classic_modes/mode_soundpropagation.html
new file mode 100644
index 0000000..8c62cc9
--- /dev/null
+++ b/Help/gzdb/features/classic_modes/mode_soundpropagation.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>Sound Propagation Mode</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="../../../default.css" media="screen" title="Default" />
+</head>
+<body>
+
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Template">
+	</object>
+	
+	<div id="gz_title">
+	  <h1>Sound Propagation Mode</h1>
+	</div>
+	
+	<div id="contents">
+	<p>
+<span class="fat">This mode is based on <a href="http://forum.zdoom.org/viewtopic.php?f=3&amp;t=47464">Sound Propagation Mode Plugin</a> by Boris Iwansky (<a href="https://github.com/biwa/soundpropagationmode">https://github.com/biwa/soundpropagationmode</a>).</span><br>
+<br>
+<b>Action category:</b> Modes.<br>
+<b>Default key:</b> none.<br><br>
+This mode shows how sound propagates from the currently highlighted sector
+through the map.<br><br>
+
+<span class="bold">User interaction:</span>
+<ul>
+      <li>Click on double-sided linedefs to toggle &quot;Block Sound&quot; flag.</li>
+</ul>
+
+<span class="bold">Following colors are used:</span>
+    <ul>
+      <li>dark green: the currently highlighted sector;</li>
+      <li>light green: sounds can travel unhindered to these sectors;</li>
+      <li>yellow: these sectors are behind a sound blocking line, but sound will still travel to this sector from the highlighted sector;</li>
+      <li>gray: sounds from the highlighted sector will not travel to these sectors;</li>
+      <li>red: these lines have the block sound flag set;</li></ul>
+</div>
+</body>
diff --git a/Help/gzdb/features/classic_modes/selection.html b/Help/gzdb/features/classic_modes/selection.html
new file mode 100644
index 0000000..dfc7b6d
--- /dev/null
+++ b/Help/gzdb/features/classic_modes/selection.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+<title>Draw Ellipse mode</title>
+<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" type="text/css" href="../../../default.css" media="screen" title="Default" />
+</head>
+<body>
+<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+  <param name="keyword" value="Template">
+</object>
+<div id="gz_title">
+  <h1>Enhanced rectangular selection</h1>
+</div>
+<div id="contents">
+  <p>A Rectangular selection can now be started even when a map element is already highlighted. This means that you can now use it to select sectors, which are completely surrounded by other sectors.<br />
+    Hold <strong>Shift</strong> to enable additive selection, hold <strong>Ctrl</strong> to enable subtractive selection, hold <strong>Ctrl-Shift</strong> to intersect with an existing selection.<br />
+  Hold <strong>Alt</strong> in <strong>Sectors </strong><strong> mode</strong> to (de)select things inside of (de)selected sectors when using regular, paint and rectangular selection. This behaviour is inverted when &quot;<strong>Syncronized Things Editing</strong>&quot; option is enabled.<br />
+  Hold <strong>Alt</strong> in<strong> Linedefs mode</strong> to (de)select things inside of rectangular selection marquee. This behaviour is inverted when &quot;<strong>Syncronized Things Editing</strong>&quot; option is enabled.</p>
+  <p>Current behaviour is indicated by the selection outline: additive selection uses the Highlight color, subtractive selection uses the inverted Highlight color.
+  <p>The Rectangular selection mode in <strong>Sectors</strong> and <strong>Linedefs</strong> modes can  be toggled between &quot;Select inside&quot; (classic behavior: only map elements which are fully inside selection will be affected) and &quot;Select touching&quot; (map elements which are partially inside selection will be also   affected) using this button in the toolbar:
+  <p><img src="selection_mode_btn.jpg" alt="" width="260" height="30" /><br />
+    <br>
+</div>
+</body>
diff --git a/Help/gzdb/features/classic_modes/selection_mode_btn.jpg b/Help/gzdb/features/classic_modes/selection_mode_btn.jpg
new file mode 100644
index 0000000..e68a7b7
Binary files /dev/null and b/Help/gzdb/features/classic_modes/selection_mode_btn.jpg differ
diff --git a/Help/gzdb/features/classic_modes/terrain1.jpg b/Help/gzdb/features/classic_modes/terrain1.jpg
new file mode 100644
index 0000000..32dc0a0
Binary files /dev/null and b/Help/gzdb/features/classic_modes/terrain1.jpg differ
diff --git a/Help/gzdb/features/classic_modes/terrain2.jpg b/Help/gzdb/features/classic_modes/terrain2.jpg
new file mode 100644
index 0000000..223fbcb
Binary files /dev/null and b/Help/gzdb/features/classic_modes/terrain2.jpg differ
diff --git a/Help/gzdb/features/classic_modes/thing_statistics.jpg b/Help/gzdb/features/classic_modes/thing_statistics.jpg
new file mode 100644
index 0000000..f6e6e6a
Binary files /dev/null and b/Help/gzdb/features/classic_modes/thing_statistics.jpg differ
diff --git a/Help/gzdb/features/custom_fields/newfieldtypes.html b/Help/gzdb/features/custom_fields/newfieldtypes.html
new file mode 100644
index 0000000..1a71474
--- /dev/null
+++ b/Help/gzdb/features/custom_fields/newfieldtypes.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+<title>GZDoom Builder features</title>
+<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" type="text/css" href="../../../default.css" media="screen" title="Default" />
+</head>
+<body>
+<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+  <param name="keyword" value="Custom Fields">
+</object>
+<div id="gz_title">
+  <h1>New Custom Field types</h1>
+</div>
+<div id="contents">
+	<p><b class="fat">Byte Angle</b><br />
+    Allows to easily set a <a href="http://zdoom.org/wiki/Definitions#Byte_angles">byte angle</a>.<br />
+  <p><b class="fat">Integer (random)</b><br />
+    Randomly picks an integer value between provided minimum and maximum value. To use it, change the UDMF field type to &quot;Integer (Random)&quot; and enter a value as 'min max'.<br />
+    <strong>Technical notice:</strong> this field type is considered &quot;virtual&quot;, because it cannot be saved in a map, so it will be converted to &quot;Integer&quot; type after clicking OK in an Edit form.<br />
+    <strong>Example:</strong><br />
+    Here, the field 'user_test' will be added to all selected map elements, and in all of them this field will have a random value from 1 to 123:</p>
+  <p><img src="randomint.jpg" alt="" width="329" height="56" /></p><br />
+  <p><b class="fat">Decimal (random)</b><br />
+    Same as "Integer (Random)", but for decimal values.<br />
+</div>
+</body>
diff --git a/Help/gzdb/features/custom_fields/randomint.jpg b/Help/gzdb/features/custom_fields/randomint.jpg
new file mode 100644
index 0000000..abd512b
Binary files /dev/null and b/Help/gzdb/features/custom_fields/randomint.jpg differ
diff --git a/Help/gzdb/features/features.html b/Help/gzdb/features/features.html
new file mode 100644
index 0000000..7b8fca2
--- /dev/null
+++ b/Help/gzdb/features/features.html
@@ -0,0 +1,328 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+<title>GZDoom Builder features</title>
+<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" type="text/css" href="../../default.css" media="screen" title="Default" />
+<script type="text/javascript" src="../../scripts.js"></script>
+<style type="text/css">
+<!--
+.style3 {
+	color: #336600;
+	font-weight: bold;
+}
+.style7 {
+	color: #6600CC
+}
+.style9 {
+	color: #003300
+}
+-->
+</style>
+</head>
+<body>
+<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+  <param name="keyword" value="Template">
+</object>
+<div id="gz_title">
+  <h1>GZDoom Builder features</h1>
+</div>
+<div id="contents"> Jump to: <a href="#general">General interface</a> | <a href="#allmodes">Classic and Visual modes</a> | <a href="#classic">Classic modes</a> | <a href="#sectors">Sectors mode</a> | <a href="#linedefs">Linedefs mode</a> | <a href="#things">Things mode</a> | <a href="#vertices">Vertices mode</a> | <a href="#visual">GZDB Visual mode</a> | <a href="#fields">Custom Fields</a> | <a href="#mapanalysis">Map Analysis mode</a> | <a href="#findreplace">Find and Replace mode</a> | <a href="#misc">Misc.</a> | <a href="#formats">(G)ZDoom features support</a>
+  <ul style="list-style-type:none;">
+    <li>
+      <h3><a name="general" id="general"></a>General interface:</h3>
+      <ul>
+        <li><strong>Help</strong> side panel, which shows most of actions, available in current mode.</li>
+        <li>Maps can now be loaded by dragging wad files on top of GZDB's main window.</li>
+        <li>Open Map Options,  Map Options and Game Configurations forms: resources can be added by dragging them on top of resources list.</li>
+        <li><strong>Game Configurations form</strong>: game configurations can  be disabled. This setting is mostly   cosmetic. When a game configuration is disabled, it won't be shown in the  &quot;game configuration&quot; drop downs in New\Open Map Options and Map Options   windows. If a map's .dbs file specifies a disabled configuration, it   will be picked as a map configuration anyway.</li>
+        <li><strong>Game Configurations form</strong>: game configurations can  be copied and pasted (a context menu is now available in the game configurations list).</li>
+        <li>Numeric textboxes: in addition to '++NN' and '--NN' to increment or decrement by given value, you can use '*NN' and '/NN' to multiply or divide by given value, '+++N' and '---N' to incrementally increase or decrease by given value.</li>
+        <li>Toolbar button groups can be toggled using context menu. Hold &quot;Shift&quot; to toggle several button groups at once.
+          <input class="spoilerbutton" type="button" onclick="ToggleSpoiler(this);" href="javascript:void(0);" value="Show image"/>
+          <div style="display: none; margin: 0px; padding: 6px; border: 1px inset;"><img src="general/toolbarmenu.jpg" alt="" /></div>
+        </li>
+        <li>You can save screenshots using <strong>Tools -&gt; Save Screenshot</strong> (default key is F12) and <strong>Tools -&gt; Save Screenshot (editing area)</strong> (default key is Ctrl-F12) menu commands.</li>
+        <li>You can save shortcut reference to html file using <strong>Help -&gt; Export Shortcut Reference</strong> menu command.</li>
+        <li>New action: &quot;<strong>Open Map in current WAD</strong>&quot;,   available as <strong>File -&gt; Open Map in current WAD</strong> and via Ctrl-Shift-O shortcut.</li>
+        <li></strong>New action:  &quot;Export to Wavefront .obj&quot;,   available as <strong>File -&gt;  Export -&gt; Selection to Wavefront .obj</strong>. It will export selected sectors (or the whole map, if no sectors are selected) to Wavefront .obj model.</li>
+        <li>New action: &quot;<strong>Reload MODELDEF/VOXELDEF</strong>&quot; (<strong>Tools -&gt; Reload MODELDEF/VOXELDEF</strong>).</li>
+        <li>New action: &quot;<strong>Reload GLDEFS</strong>&quot; (<strong>Tools -&gt; Reload GLDEFS</strong>).</li>
+        <li>Info about current selection is  shown at the bottom of program's window.
+          <input class="spoilerbutton" type="button" onclick="ToggleSpoiler(this);" href="javascript:void(0);" value="Show image"/>
+          <div style="display: none; margin: 0px; padding: 6px; border: 1px inset;"><img src="general/selection_info.jpg" alt="" /></div>
+        </li>
+        <li>Texture size is now shown in texture previews. You can disable this   feature by unchecking &quot;<strong>Preferences -&gt; Interface -&gt; Show texture   and flat sizes in browsers</strong>&quot; checkbox.
+          <input class="spoilerbutton" type="button" onclick="ToggleSpoiler(this);" href="javascript:void(0);" value="Show image"/>
+          <div style="display: none; margin: 0px; padding: 6px; border: 1px inset;"><img src="general/texturesize_preview.jpg" alt="" /></div>
+        </li>
+        <li><a href="general/multi_engines.html">Several game engines can be used per game configuration</a>.</li>
+        <li>Size of vertex handles in 2D modes can be changed in <a href="../preferences.html">preferences</a>.</li>
+        <li><strong>Script editor</strong>: pressing &quot;F1&quot; opens keyword help instead of program manual.</li>
+        <li>Side panel auto hiding can be now toggled much easier.
+          <input class="spoilerbutton" type="button" onclick="ToggleSpoiler(this);" href="javascript:void(0);" value="Show image"/>
+          <div style="display: none; margin: 0px; padding: 6px; border: 1px inset;"><img src="general/pinsidepanel.jpg" alt="" /></div>
+        </li>
+        <li>Things can be filtered in Thing Edit form.</li>
+        <li>Added &quot;<strong>Hints</strong>&quot; side panel, which shows the list of actions, available in current editing mode.</li>
+        <li>Actions and Effects can  be filtered (useful when you remember   action/effect name, but don't remember it's number or category).
+          <input class="spoilerbutton" type="button" onclick="ToggleSpoiler(this);" href="javascript:void(0);" value="Show image"/>
+          <div style="display: none; margin: 0px; padding: 6px; border: 1px inset;"><img src="general/actions_filter.jpg" alt="" /></div>
+        </li>
+        <li>Actions can be filtered in Preferences form.</li>
+        <li>Added errors and warnings indicator to main window (bottom-right   corner). You can click on it to open <strong>Errors and warnings</strong> window.</li>
+      </ul>
+    </li>
+    <li>
+      <h3><a name="scripting" id="scripting"></a>Scripting:</h3>
+      <ul>
+        <li><a href="scripting/acs.html">Enhanced scripting workflow</a>.</li>
+        <li><a href="scripting/snippets.html">Code snippets.</a></li>
+        <li>Added support for multiple ACC compilers.</li>
+        <li>BCC script compiler (<a href="https://github.com/wormt/bcc/">https://github.com/wormt/bcc/</a>) is  bundled with GZDB.</li>
+        <li>Script type can  be chosen when creating or opening a map, and can be changed in Map Options form.</li>
+      </ul>
+    </li>
+    <li>
+      <h3><a name="allmodes" id="allmodes"></a>Classic and Visual modes:</h3>
+      <ul>
+        <li><span class="style3">[changed]</span> &quot;<strong>Toggle Full Brightness&quot; </strong>action works in Classic modes.</li>
+        <li><span class="style3">[changed]</span> &quot;<strong>Toggle Highlight&quot; </strong>action works in Classic modes.</li>
+        <li><span class="style3">[changed]</span> &quot;<strong>Increase Brightness by 8</strong>&quot; and &quot;<strong>Decrease Brightness by 8</strong>&quot; actions work in Sectors mode.</li>
+        <li><a href="all_modes/tag_support.html">Enhanced Tag support</a>.</li>
+        <li><a href="all_modes/event_lines.html">Event lines</a>.</li>
+        <li>Map can be tested from camera position in Visual mode and from cursor position in Classic modes. <a href="all_modes/test_from_view.html">More info</a>.</li>
+        <li>Selection can be synchronized between Classic and Visual modes. <a href="all_modes/synch_selection.html">More info</a>.</li>
+        <li>Camera position can be  synchronized between Classic and Visual modes. <a href="all_modes/synch_camera.html">More info</a>.</li>
+        <li>You can use <a href="all_modes/colorpicker.html">Color Picker plugin </a> to edit dynamic light properties and sector's fog and tint colors in Classic and Visual modes.</li>
+        <li>You can use <a href="all_modes/tagexplorer.html">Tag Explorer plugin</a> to view all tags and actions used in current map.</li>
+        <li>You can paste only specific properties using  &quot;<strong>Paste Properties Special</strong>&quot; action (available via keyboard shortcut, as &quot;<strong>Edit</strong> -&gt; <strong>Paste Properties Special...</strong>&quot; menu item and as a button on the Edit Mode toolbar).
+          <input class="spoilerbutton" type="button" onclick="ToggleSpoiler(this);" href="javascript:void(0);" value="Show image"/>
+          <div style="display: none; margin: 0px; padding: 6px; border: 1px inset;"> <img src="all_modes/paste_properties_options.jpg" alt="" /></div>
+        </li>
+        <li>You can apply <a href="all_modes/jitter.html">randomized transformations</a> to any map element.</li>
+        <li>Image browser shows directory structure of Folder, PK3 and PK7 resources and can filter images by texture type and size. <a href="all_modes/texture_browser.html">More info</a>.</li>
+        <li>Most controls of Edit Sector/Linedef/Thing forms now work in realtime (e.g. you can immediately see texture offset/scale/rotation changes while you are changing appropriate values). Action and Tag changes are still applied only after you press &quot;OK&quot; button.</li>
+        <li><strong>[UDMF] </strong>All UDMF properties can be edited using  Edit Sector/Linedef/Thing/Vertex windows user interface.</li>
+        <li>Thing Edit Form  has &quot;Random angle&quot; checkbox.</li>
+        <li><strong>[UDMF] </strong>Sector,  Linedef and Vertex info panels show additional info if a map is in UDMF format.</li>
+      </ul>
+    </li>
+    <li>
+      <h3><a name="classic" id="classic"></a>Classic modes:</h3>
+      <ul>
+        <li>All drawing modes are available in the <strong>Mode</strong> menu
+          <input class="spoilerbutton" type="button" onclick="ToggleSpoiler(this);" href="javascript:void(0);" value="Show image"/>
+          <div style="display: none; margin: 0px; padding: 6px; border: 1px inset;"> <img src="general/menu_drawmodes.jpg" alt="" /></div>
+        </li>
+        <li><a href="classic_modes/selection.html"> </a>Thing sprites are rendered in classic modes.</li>
+        <li>You can assign custom color to any combination of linedef flags, actions and/or activation. <a href="classic_modes/linedef_color_presets.html">More info</a>.</li>
+        <li><a href="classic_modes/selection.html"> Enhanced rectangular selection</a>.</li>
+        <li>New action: &quot;<strong>Go To Coordinates</strong>&quot;, available in the <strong>View</strong> menu and by clicking on cursor coordinates in the lower-right corner of UI.</li>
+        <li>You can use <strong>Paint selection </strong>action to select map elements easier.</li>
+        <li><a href="classic_modes/mode_drawrect.html">Draw Rectangle mode</a>.</li>
+        <li><a href="classic_modes/mode_drawellipse.html">Draw Ellipse mode</a>.</li>
+        <li><a href="classic_modes/mode_drawcurve.html">Draw Curve mode</a>.</li>
+        <li><a href="classic_modes/mode_drawgrid.html">Draw Grid mode</a>.</li>
+        <li><a href="classic_modes/mode_drawcurve.html"></a><a href="../classic_modes/mode_importterrain.html">Terrain Importer mode</a>.</li>
+        <li><a href="classic_modes/mode_drawbridge.html">Bridge mode</a>.</li>
+        <li><a href="classic_modes/mode_snapelements.html">Snap map elements mode</a>.</li>
+        <li>Selected things are now dragged while dragging vertices, linedefs and sectors.</li>
+        <li>You can hold the <strong>Alt</strong> key while dragging map elements to snap them to grid increments relative to their initial position.</li>
+        <li>You can place things on top of selected vertices in Vertices and Linedefs modes and inside of selected sectors in Sectors mode using &quot;<strong>Place Things</strong>&quot; action.</li>
+        <li>You can view all loaded thing types and some additional info using Thing Statistics form (<strong>Edit -&gt; View Thing Types...</strong>).
+          <input class="spoilerbutton" type="button" onclick="ToggleSpoiler(this);" href="javascript:void(0);" value="Show image"/>
+          <div style="display: none; margin: 0px; padding: 6px; border: 1px inset;"> <img src="classic_modes/thing_statistics.jpg" alt="" /></div>
+        </li>
+        <li>You can override default sector properties, which are used  to create new geometry, using &quot;<strong><a href="classic_modes/drawsettingspanel.html">Draw Settings</a></strong>&quot; panel (by default, when the new sector overlaps or touches existing sector, the editor uses textures, brighntess and floor/ceiling heights from that sector when drawing the new one).</li>
+        <li>You can disable Doom Builder's auto-clear textures behaviour by using this button in the toolbar: <img src="general/autoclear_textures.jpg"/></li>
+        <li>You can change default sector brightness and floor/ceiling height (<strong>Preferences -&gt; Editing -&gt; Default sector settings</strong>). These settings are used when the new sector doesn't touch or overlap already existing sectors.</li>
+        <li>3D floor indication (color can be changed in <strong>Preferences -&gt; Appearance -&gt; 3D Floors</strong>, the setting can be disabled in <a href="../preferences.html#markextrafloors">Preferences</a>).
+          <input class="spoilerbutton" type="button" onclick="ToggleSpoiler(this);" href="javascript:void(0);" value="Show image"/>
+          <div style="display: none; margin: 0px; padding: 6px; border: 1px inset;"> <img src="classic_modes/3dfloor_marks.jpg" alt="" /></div>
+        </li>
+        <li>Line angle, length and front side direction are displayed when a line is drawn in Draw Geometry mode or dragged in any Classic mode.</li>
+        <li><strong>[UDMF]</strong> Floor/ceiling texture offsets can be pinned using this button in the toolbar: <img src="general/pin_textures.jpg"/>. When pinned, textures will be aligned to a sector while it is dragged.</li>
+        <li><strong>Tag Range plugin</strong>: custom increment can now be set.</li>
+        <li><strong>Tag Range plugin:</strong> tags can be set in relative mode (when this mode is enabled, generated values are added to existing tags instead of replacing them).</li>
+        <li>You can clear selection groups (default shortcuts are Ctrl-Shift-1 ... 0).</li>
+        <li>You can add selection to groups, select and clear groups using the <strong>Edit</strong> menu.
+          <input class="spoilerbutton" type="button" onclick="ToggleSpoiler(this);" href="javascript:void(0);" value="Show image"/>
+          <div style="display: none; margin: 0px; padding: 6px; border: 1px inset;"><img src="general/menu_selectiongroups.jpg" alt="" /></div>
+        </li>
+        <li>Center of map is  shown in Classic modes using Highlight color.</li>
+      </ul>
+    </li>
+    <li>
+      <h3><a name="sectors" id="sectors"></a>Sectors mode:</h3>
+      <ul>
+      	<li><strong>[UDMF]</strong> Sector Edit Form now has "<strong>Slopes</strong>" tab.</li>
+        <li>Things selection, dragging and deletion can be syncronized with sectors selection, dragging and deletion by enabling <strong>Sectors -&gt; Syncronized Things Editing</strong> menu item / <strong>Syncronized Things Editing</strong> toolbar button.</li>
+        <li>Things can  be (de)selected by holding the <strong>Alt</strong> key when (de)selecting sectors. <strong>Alt</strong> key behaviour is inverted when <strong>Syncronized Things Editing</strong> option is enabled.</li>
+        <li>Sector Tag and Effect can now be shown on top of sectors. You can use &quot;<strong>View Tags and Effects</strong>&quot; button to toggle this overlay.
+          <input class="spoilerbutton" type="button" onclick="ToggleSpoiler(this);" href="javascript:void(0);" value="Show image"/>
+          <div style="display: none; margin: 0px; padding: 6px; border: 1px inset;"><img src="sectors_mode/toggle_effect_overlay.jpg" alt="" /></div>
+        </li>
+        <li><strong>[UDMF]</strong> Create Brightness Gradient option can work in 5 modes:
+          <input class="spoilerbutton" type="button" onclick="ToggleSpoiler(this);" href="javascript:void(0);" value="Show image"/>
+          <div style="display: none; margin: 0px; padding: 6px; border: 1px inset;"><img src="sectors_mode/gradientmodes.jpg" alt="" /></div>
+        </li>
+        <li>Sector Info panel  shows the number of sector's sidedefs as well as light and fade colors (UDMF only):
+          <input class="spoilerbutton" type="button" onclick="ToggleSpoiler(this);" href="javascript:void(0);" value="Show image"/>
+          <div style="display: none; margin: 0px; padding: 6px; border: 1px inset;"><img src="sectors_mode/sector_info.jpg" alt="" /></div>
+        </li>
+        <li>&quot;<strong>Flip Linedefs</strong>&quot; action is now available from Sectors mode. It will try to align linedefs, so their front (or back) point towards the same sector.</li>
+      </ul>
+    </li>
+    <li>
+      <h3><a name="linedefs" id="linedefs"></a>Linedefs mode:</h3>
+      <ul>
+        <li>Things  dragging can be syncronized with linedefs  dragging  by enabling <strong>Linedefs -&gt; Syncronized Things Transform</strong> menu item / <strong>Syncronized Things Transform</strong> toolbar button.</li>
+        <li><strong>[UDMF]</strong> New actions: &quot;<strong>Align Ceiling Texture to Back Side</strong>&quot;, &quot;<strong>Align Ceiling Texture to Front Side</strong>&quot;, &quot;<strong>Align Floor Texture to Back Side</strong>&quot; and &quot;<strong>Align Floor Texture to Front Side</strong>&quot; (available in <strong>Linedefs -&gt; Align Textures</strong> menu).</li>
+        <li><strong>[UDMF]</strong> &quot;<strong>Make brightness gradient</strong>&quot; command is available in Linedefs mode.</li>
+        <li><strong>[UDMF]</strong> Linedef info panel: relative UDMF light values are  shown like this: <span class="style7">16</span> (<span class="style9">128</span>), which means &quot;<span class="style7">UDMF light value</span>&quot; (&quot;<span class="style9">total surface brightness</span>&quot;). Total surface brightness is UDMF light value + sector brightness.</li>
+        <li>Split Linedefs preview (a rectangle, colored using Info line color) is shown in this mode.</li>
+        <li>&quot;<strong>Flip Linedefs</strong>&quot; action will try to align linedefs, so their front (or back) point towards the same sector.</li>
+      </ul>
+    </li>
+    <li>
+      <h3><a name="things" id="things"></a>Things mode:</h3>
+      <ul>
+        <li>Several thing types can now be selected at once in Thing Edit form. If   you do so,  a type randomly chosen from selected ones will be assigned   to each selected thing. <a href="things_mode/multiple_thing_types.html">More info</a>.</li>
+        <li>You can filter selected things by type using Filter Things form (<strong>Things -&gt; Filter Things...</strong>).
+          <input class="spoilerbutton" type="button" onclick="ToggleSpoiler(this);" href="javascript:void(0);" value="Show image"/>
+          <div style="display: none; margin: 0px; padding: 6px; border: 1px inset;"><img src="things_mode/filter_selection.jpg" alt="" /></div>
+        </li>
+        <li>You can clone selected/highlighted things by holding &quot;Shift&quot; before starting to drag them.</li>
+        <li>New action: &quot;<strong>Point Thing to cursor</strong>&quot;. <a href="things_mode/pointthing.html">More info</a>.</li>
+        <li>New action: &quot;<strong>Align Things To Linedef</strong>&quot;.</li>
+        <li>Z-height of a thing can  be changed in absolute and relative mode in Thing Edit form.</li>
+        <li>Thing's X and Y position can be edited in Edit Thing form.</li>
+      </ul>
+    </li>
+    <li>
+      <h3><a name="vertices" id="vertices"></a>Vertices mode:</h3>
+      <ul>
+        <li><strong>[UDMF]</strong> Vertical offsets of a vertex can  be edited in Vertex Edit form and are shown in Vertex Info panel.</li>
+        <li>Split Linedefs preview (a rectangle, colored using Info line color) is shown in this mode.</li>
+      </ul>
+    </li>
+    <li>
+      <h3><a name="visual" id="visual"></a>GZDB Visual mode:</h3>
+      <ul>
+        <li style="list-style-type:none;">GZDB Visual mode is the result of merging Doom Builder's Visual mode and GZDoom Visual mode.<span class="style1"><br />
+          <br />
+          <strong>New rendering features available in this mode:</strong></li>
+        <ul>
+          <li>Dynamic lights (all types) are rendered in Visual mode. You can use <a href="general/rendering_toolbar.html">Rendering panel</a> to toggle dynamic lights rendering and animation. </li>
+          <li>Dynamic lights defined in GLDEFS are rendered in Visual mode (only one GLDEFS light per actor is currently supported).</li>
+          <li>Fog rendering in Visual mode (including colored fog in maps in UDMF format).</li>
+          <li>New action: &quot;<strong>Render selected/all models</strong>&quot;.</li>
+          <li>New action: &quot;<strong>Toggle dynamic lights animation</strong>&quot;.</li>
+          <li>New action: &quot;<strong>Toggle dynamic lights rendering</strong>&quot;.</li>
+          <li>New action: &quot;<strong>Toggle fog rendering</strong>&quot;.</li>
+          <li>New action: &quot;<strong>Toggle models rendering</strong>&quot;.</li>
+          <li>New action: &quot;<strong>Toggle GZDoom effects</strong>&quot;.</li>
+          <li><a href="all_modes/event_lines.html">Event  lines</a> for PatrolPoints, cameras and InterpolationPoints.</li>
+          <li>Translucent 3D floors are rendered correctly.</li>
+          <li>Things with zero Height and Radius are  rendered.</li>
+          <li>Plane Copy effect (118) is supported.</li>
+          <li>Several new 3D floor flags are supported:
+            <ul>
+              <li>&quot;16: Use a sidedef's upper texture to draw the sides&quot;.</li>
+              <li>&quot;32: Use a sidedef's lower texture to draw the sides&quot;.</li>
+              <li>&quot;64: Render the 3D floor using additive translucency&quot;.</li>
+              <li>&quot;Ignore bottom height&quot;.</li>
+            </ul>
+          </li>
+          <li>When the thing category has sprite, and the thing doesn't, category sprite is used.</li>
+          <li> Doom-style shading on walls (walls going from west to east are slightly darker than walls going from north to south). This effect is affected by &quot;<strong>vertwallshade</strong>&quot;, &quot;<strong>horizwallshade</strong>&quot;, &quot;<strong>evenlighting</strong>&quot; and &quot;<strong>smoothlighting</strong>&quot; MAPINFO properties.</li>
+        </ul>
+        <li style="list-style-type:none;"><strong><br />
+          New editing features available in this mode:</strong>
+          <ul>
+            <li>You can <strong>Shift-Select</strong> (usually Select action = LMB) to select all adjacent   surfaces with same texture, <strong>Ctrl-Select</strong> to select all adjacent surfaces   with same height. <strong>Ctrl-Shift-Select</strong> will also work as expected.</li>
+            <li><strong>[UDMF]</strong> Vertex height offsets (&quot;zfloor&quot; and &quot;zceiling&quot;) <a href="visual_mode/visual_verts.html">can be edited</a>.</li>
+            <li><strong>[UDMF]</strong> Using &quot;<strong>Increase/Decrease brightness</strong>&quot; actions (bound to Ctrl+Mouse Wheel by default) on walls and ceilings will change sidedef/ceiling brightness, using them on floors will change sector brightness, using them on 3D floors will change brightness of 3D floor.</li>
+            <li>You can use &quot;<strong>Toggle geometry effects</strong>&quot; action (default key is Tab) to toggle   GZDoom's geometry effects, such as slopes, 3D floors, transfer brightness effects etc.</li>
+            <li>You can hold <strong>Shift</strong> while dragging a texture to lock movement to horizontal axis, and <strong>Ctrl</strong> to lock it to vertical axis.</li>
+            <li>You can hold <strong>Ctrl-Shift</strong> while dragging a texture to snap texture offsets to current grid size.</li>
+            <li>New action: &quot;<strong>Align Textures X and Y</strong>&quot;  (default key is Ctrl-A).</li>
+            <li>&quot;Auto-align Textures Y&quot; action  takes surface peg type into account.   It  also applies vertical scale of first (highlighted) surface to the   rest of aligned surfaces (<strong>UDMF</strong> only).</li>
+            <li><strong>[UDMF]</strong> Auto-align textures actions now affect sides of 3D floors.</li>
+            <li><strong>[UDMF] </strong><a href="visual_mode/autoalignfloors.html">&quot;Auto-align textures&quot; actions now work on floors and ceilings</a>.</li>
+            <li><strong>[UDMF]</strong> New action: &quot;<strong>Match Brightness</strong>&quot;: this action makes the brightness of selected surfaces the same as the brightness of highlighted surface.</li>
+            <li>New actions: &quot;<strong>Lower Floor/Ceiling to adjacent sector</strong>&quot; and &quot;<strong>Raise Floor/Ceiling to   adjacent sector</strong>&quot;  (default keys are PageDown and PageUp). By   default, they will find next lower/higher surface in sectors, adjacent   to selected ones, and lower/raise selected sectors to this height. If you   hold Ctrl, they will lower/raise sectors to lowest/highest sector   inside selection. And they will also drop selected things to ground or   align them to ceiling.</li>
+            <li><strong>[UDMF]</strong> New actions: &quot;<strong>Increase  Scale</strong>&quot; (Num9), &quot;<strong>Decrease  Scale</strong>&quot; (Num7), &quot;<strong>Increase Horizontal Scale</strong>&quot; (Num6), &quot;<strong>Decrease Horizontal Scale</strong>&quot; (Num4), &quot;<strong>Increase Vertical Scale</strong>&quot; (Num8), &quot;<strong>Decrease Vertical Scale</strong>&quot; (Num5) actions.  These actions can be used to change thing scale and sidedef/floor/ceiling texture scale.<br />
+            </li>
+            <li><strong>[UDMF]</strong> New actions: &quot;<strong><a href="visual_mode/texturefit.html">Fit Texture</a></strong>&quot; (default key is Ctrl-Alt-A), &quot;<strong><a href="visual_mode/texturefit.html">Fit Texture's Width</a></strong>&quot;  (Alt-A) and &quot;<strong><a href="visual_mode/texturefit.html">Fit Texture's Height</a></strong>&quot; (Alt-Shift-A).</li>
+            <li>New action: &quot;<strong>Toggle slope</strong>&quot; (default key is Alt-S). Select or highlight upper/lower walls then call this action to add   slopes. Select or highlight floors or ceilings then call this action to   remove slopes.</li>
+            <li>New action: &quot;<strong>Look Through Selection</strong>&quot;  (default key is &quot;Y&quot;). This action places   visual camera at the same position as selected/highlighted thing and   rotates it to match thing's angle. Special handling is available if   targeted thing is AimingCamera, MovingCamera, SecurityCamera or   InterpolationPoint.</li>
+            <li>New actions: &quot;<strong><a href="visual_mode/autoalign_to_selection.html">Auto-align Textures to Selection</a> (X)</strong>&quot;, &quot;<strong>Auto-align Textures to Selection (Y)</strong>&quot; and &quot;<strong>Auto-align Textures to Selection (X and Y)</strong>&quot;.</li>
+            <li>New actions: &quot;<strong>Rotate Clockwise</strong>&quot; and &quot;<strong>Rotate Counterclockwise</strong>&quot;, which can be used to rotate things and <strong>[UDMF]</strong> floor/ceiling textures.</li>
+            <li>New actions: &quot;<strong>Change Pitch Clockwise</strong>&quot;, &quot;<strong>Change Pitch Counterclockwise</strong>&quot;, &quot;<strong>Change Roll Clockwise</strong>&quot; and &quot;<strong>Change Roll Counterclockwise</strong>&quot;, which can be used to change pitch and roll of selected or highlighted things.</li>
+            <li>Things can be moved horizontally using &quot;<strong>Move Thing Forward/Backward/Left/Right</strong>&quot; actions.</li>
+            <li>Things can be moved to cursor position using &quot;<strong>Move Thing To Cursor Location</strong>&quot; (default key is Ctrl + Middle mouse) action.</li>
+            <li>Things can be inserted at cursor position using &quot;<strong>Insert Item</strong>&quot; action (default key is Insert).</li>
+            <li>Selected things can be deleted using &quot;<strong>Delete Item</strong>&quot; action (default key is Delete).</li>
+            <li>Selected things can be cut/copied/pasted at cursor position.</li>
+            <li><strong>[UDMF]</strong> Floor/ceiling texture rotation is now taken into account when moving texture offsets with arrow keys.</li>
+            <li><strong>[UDMF] </strong>New action:  &quot;<strong>Reset Local Texture Offsets (UDMF)</strong>&quot;. It resets upper/middle/lower texture offsets, scale and brightness of targeted or selected sidedefs, resets texture offsets, rotation, scale and brightness of targeted or selected floors/ceilings and resets scale, pitch and roll of targeted or selected things.</li>
+            <li><strong>[UDMF]</strong> &quot;<strong>Reset Texture Offsets</strong>&quot; action now resets texture offsets of targeted or selected floors and ceilings and also  resets scale of targeted or selected things.</li>
+          </ul>
+        </li>
+      </ul>
+    </li>
+    <li>
+      <h3><a name="fields" id="fields"></a>Custom Fields:</h3>
+    </li>
+    <ul>
+      <li><a href="custom_fields/newfieldtypes.html">Integer (Random)</a> custom field type.</li>
+      <li><a href="custom_fields/newfieldtypes.html">Decimal (Random)</a> custom field type.</li>
+    </ul>
+    <li>
+      <h3><a name="mapanalysis" id="mapanalysis"></a>Map Analysis mode:</h3>
+      <ul>
+        <li>Analysis results can be hidden per result type and individually via results list's context menu.</li>
+        <li>Map Analysis mode can  check the map for unconnected vertices.</li>
+        <li>Map Analysis mode can  check the map for overlapping lines. This will check if 2 lines have the same start and end positions.</li>
+        <li>Map Analysis mode can  check the map for  overlapping vertices. This will   check if a vertex is on top of a linedef or another vertex.</li>
+        <li>Map Analysis mode can  check the map for invalid sectors (sectors with less than 3 sidedefs or sectors without area).</li>
+        <li>Map Analysis mode can  check the map for unused textures.</li>
+        <li>Map Analysis mode can  check the map for missing flats.</li>
+        <li>Map Analysis mode can  check the map for unknown things (things, which type is not defined in DECORATE or current game configuration).</li>
+        <li>Map Analysis window now has &quot;<strong>Apply to all errors of this type</strong>&quot; checkbox.</li>
+        <li>Analysis results can be saved to a text file or copied to clipboard.</li>
+      </ul>
+    </li>
+    <li>
+      <h3><a name="findreplace" id="findreplace"></a>Find and Replace mode:</h3>
+      <ul>
+        <li>Find and Replace mode now has &quot;<strong>Sector Brightness</strong>&quot;, &quot;<strong>Sector Floor Height</strong>&quot;, &quot;<strong>Sector Ceiling Height</strong>&quot;, &quot;<strong>Linedef Flags</strong>&quot;, &quot;<strong>Thing Flags</strong>&quot;, &quot;<strong>Sidedef Flags</strong>&quot; and &quot;<strong>Sector Flags</strong>&quot; search modes.</li>
+        <li>&quot;<strong>Any Texture or Flat</strong>&quot;, &quot;<strong>Sector Flat</strong>&quot; and &quot;<strong>Sidedef   Texture</strong>&quot; search modes now support &quot;<strong>*</strong>&quot; (match any number of characters) and   &quot;<strong>?</strong>&quot; (match any single character) wildcards.</li>
+        <li>Find and Replace Mode can find and replace Thing and Linedef Actions with specific arguments. Syntax is &quot;[Action] [arg1]  [...]&quot;. Script names used by ACS actions can be replaced this way as well (<strong>UDMF only</strong>).</li>
+      </ul>
+    </li>
+    <li>
+      <h3><a name="misc" id="formats"></a>Misc. features:</h3>
+      <ul>
+        <li>Nodes Viewer plugin supports ZNODES in &quot;XNOD&quot;, &quot;XGLN&quot;, &quot;XGL2&quot; and &quot;XGL3&quot; formats.</li>
+        <li>Selection groups are saved the map's .dbs file.</li>
+      </ul>
+    </li>
+    <li>
+      <h3><a name="formats" id="formats"></a>(G)ZDoom features support:</h3>
+      <ul>
+        <li><a href="../text_lumps.html#modeldef">MD2 and MD3 models</a> rendering in 2D and 3D modes.</li>
+        <li><a href="../text_lumps.html#voxeldef">VOXLEDEF</a> support.</li>
+        <li><a href="../text_lumps.html#reverbs">REVERBS</a> support (used in <a href="classic_modes/mode_soundenvironment.html">Sound Environment Mode</a>).</li>
+        <li>More complete <a href="../text_lumps.html#textures">TEXTURES</a> support.</li>
+        <li>Partial <a href="../text_lumps.html#mapinfo">MAPINFO</a> support, including DoomEdNum and SpawnNums overrides.</li>
+        <li>ACS scripts with #include directives are compiled properly.</li>
+        <li>PNG and PCX image formats are supported.</li>
+        <li>PK7 archive format is supported.</li>
+      </ul>
+    </li>
+  </ul>
+</div>
+</body>
diff --git a/Help/gzdb/features/general/actions_filter.jpg b/Help/gzdb/features/general/actions_filter.jpg
new file mode 100644
index 0000000..76d7fa9
Binary files /dev/null and b/Help/gzdb/features/general/actions_filter.jpg differ
diff --git a/Help/gzdb/features/general/autoclear_textures.jpg b/Help/gzdb/features/general/autoclear_textures.jpg
new file mode 100644
index 0000000..5ffce89
Binary files /dev/null and b/Help/gzdb/features/general/autoclear_textures.jpg differ
diff --git a/Help/gzdb/features/general/menu_drawmodes.jpg b/Help/gzdb/features/general/menu_drawmodes.jpg
new file mode 100644
index 0000000..548ddfe
Binary files /dev/null and b/Help/gzdb/features/general/menu_drawmodes.jpg differ
diff --git a/Help/gzdb/features/general/menu_renderingtoolbar.jpg b/Help/gzdb/features/general/menu_renderingtoolbar.jpg
new file mode 100644
index 0000000..312620b
Binary files /dev/null and b/Help/gzdb/features/general/menu_renderingtoolbar.jpg differ
diff --git a/Help/gzdb/features/general/menu_selectiongroups.jpg b/Help/gzdb/features/general/menu_selectiongroups.jpg
new file mode 100644
index 0000000..8807936
Binary files /dev/null and b/Help/gzdb/features/general/menu_selectiongroups.jpg differ
diff --git a/Help/gzdb/features/general/multi_engines.html b/Help/gzdb/features/general/multi_engines.html
new file mode 100644
index 0000000..23c0cf0
--- /dev/null
+++ b/Help/gzdb/features/general/multi_engines.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>GZDoom Builder features</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="../../../default.css" media="screen" title="Default" />
+    <style type="text/css">
+<!--
+.style1 {color: #990000}
+-->
+    </style>
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Template">
+	</object>
+	
+	<div id="gz_title"><h1>Multiple engines per game configuration</h1></div>
+	
+	<div id="contents">
+    <p>Multiple engines can now be setup for each game configuration by clicking on the + icon:</p>
+    <img src="multi_engines1.jpg" />
+    <p>Choose which engine to use in the <b>Test Map</b> -> <b>Engine</b> drop down:</p>
+    <img src="multi_engines2.jpg" />
+</div>
+</body>
diff --git a/Help/gzdb/features/general/multi_engines1.jpg b/Help/gzdb/features/general/multi_engines1.jpg
new file mode 100644
index 0000000..9a2ee4c
Binary files /dev/null and b/Help/gzdb/features/general/multi_engines1.jpg differ
diff --git a/Help/gzdb/features/general/multi_engines2.jpg b/Help/gzdb/features/general/multi_engines2.jpg
new file mode 100644
index 0000000..fb27c6f
Binary files /dev/null and b/Help/gzdb/features/general/multi_engines2.jpg differ
diff --git a/Help/gzdb/features/general/objexport1.jpg b/Help/gzdb/features/general/objexport1.jpg
new file mode 100644
index 0000000..8e2ec5e
Binary files /dev/null and b/Help/gzdb/features/general/objexport1.jpg differ
diff --git a/Help/gzdb/features/general/pin_textures.jpg b/Help/gzdb/features/general/pin_textures.jpg
new file mode 100644
index 0000000..e058e65
Binary files /dev/null and b/Help/gzdb/features/general/pin_textures.jpg differ
diff --git a/Help/gzdb/features/general/pinsidepanel.jpg b/Help/gzdb/features/general/pinsidepanel.jpg
new file mode 100644
index 0000000..f8def48
Binary files /dev/null and b/Help/gzdb/features/general/pinsidepanel.jpg differ
diff --git a/Help/gzdb/features/general/rendering_toolbar.html b/Help/gzdb/features/general/rendering_toolbar.html
new file mode 100644
index 0000000..1a9e7de
--- /dev/null
+++ b/Help/gzdb/features/general/rendering_toolbar.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>GZDoom Builder features</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="../../../default.css" media="screen" title="Default" />
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Template">
+	</object>
+	
+	<div id="gz_title">
+	  <h1>Rendering toolbar</h1>
+	</div>
+	
+	<div id="contents">
+    <img src="menu_renderingtoolbar.jpg" />
+    <p>The Rendering toolbar allows you to toggle several GZDoom Builder's features:</p>
+    <ol>
+      <li>Toggles models, dynamic lights and fog rendering in Visual mode.</li>
+      <li>Toggles between available dynamic lights rendering modes in Visual mode.</li>
+      <li>Toggles  between available model rendering modes.</li>
+      <li>Toggles fog rendering  in Visual mode.</li>
+      <li>Toggles <a href="../all_modes/event_lines.html">Event lines</a>.</li>
+      <li>Toggles <a href="../visual_mode/visual_verts.html">Visual vertices</a> in Visual mode (UDMF only).</li>
+      </ol>
+    <p>Most of these settings can also be toggled using actions from &quot;<strong>Rendering</strong>&quot; category.<br />
+    You can toggle currently enabled rendering effects using &quot;<strong>Toggle GZDoom effects</strong>&quot; action.</p>
+</div>
+</body>
diff --git a/Help/gzdb/features/general/selection_info.jpg b/Help/gzdb/features/general/selection_info.jpg
new file mode 100644
index 0000000..42fd4cc
Binary files /dev/null and b/Help/gzdb/features/general/selection_info.jpg differ
diff --git a/Help/gzdb/features/general/texturesize_preview.jpg b/Help/gzdb/features/general/texturesize_preview.jpg
new file mode 100644
index 0000000..f585a07
Binary files /dev/null and b/Help/gzdb/features/general/texturesize_preview.jpg differ
diff --git a/Help/gzdb/features/general/toolbarmenu.jpg b/Help/gzdb/features/general/toolbarmenu.jpg
new file mode 100644
index 0000000..f9a3510
Binary files /dev/null and b/Help/gzdb/features/general/toolbarmenu.jpg differ
diff --git a/Help/gzdb/features/scripting/acs.html b/Help/gzdb/features/scripting/acs.html
new file mode 100644
index 0000000..ffd7a55
--- /dev/null
+++ b/Help/gzdb/features/scripting/acs.html
@@ -0,0 +1,54 @@
+ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>GZDoom Builder features</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="../../../default.css" media="screen" title="Default" />
+    <style type="text/css">
+<!--
+.style1 {color: #0066FF}
+.style2 {color: #006600}
+-->
+    </style>
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Template">
+	</object>
+	
+	<div id="gz_title"><h1>Enhanced scripting workflow</h1></div>
+	
+	<div id="contents">
+    <table width="100%" border="0" cellspacing="3" cellpadding="3">
+      <tr>
+        <td valign="top"><p><b>GZDoom Builder</b> includes many features to help you to assign and edit scripts easier.</br>
+              </br>
+          The Script editor now has a &quot;Script names&quot; drop down, which allows you to view and select individual scripts faster.</br>
+        </p>
+          <h3>Pseudo-named scripts</h3>
+          If you add a comment after the script's opening brace like so:</br>
+          <p><span class="style1">script 1 (void) {</span> <span class="style2">//My Pseudo-named script</span></br>&emsp;&emsp;[code]</br>
+          <span class="style1">}</span></p>
+          it will be used as the script name in the &quot;Script names&quot; drop down and in the Thing and Linedef Edit forms drop downs (the example script will be named as &quot;<strong>[1] My Pseudo-named script</strong>&quot;).</br>
+          </br>
+        <p><b>Notice:</b> &quot;Script names&quot; drop down items are updated when the script is compiled successfully.</p></td>
+        <td><img src="acs_scripteditor.jpg"/></td>
+      </tr>
+      <tr>
+        <td valign="top"><p>Thing and Linedef scripts can now be set much easier.</br>
+              </br>
+        <b>Notice:</b> to remove a named or regular script, clear the script selector text box</p>
+        </td>
+        <td><img src="acs_thing2.jpg"/><br /><br><img src="acs_thing1.jpg"/></td>
+      </tr>
+      <tr>
+        <td valign="top">If a Thing or a Linedef has a named script attached to it, it will be shown in the info panel.</td>
+        <td><img src="acs_infoex.jpg"/></td>
+      </tr>
+    </table>
+</div>
+</body>
+
diff --git a/Help/gzdb/features/scripting/acs_infoex.jpg b/Help/gzdb/features/scripting/acs_infoex.jpg
new file mode 100644
index 0000000..090a79e
Binary files /dev/null and b/Help/gzdb/features/scripting/acs_infoex.jpg differ
diff --git a/Help/gzdb/features/scripting/acs_scripteditor.jpg b/Help/gzdb/features/scripting/acs_scripteditor.jpg
new file mode 100644
index 0000000..114d49a
Binary files /dev/null and b/Help/gzdb/features/scripting/acs_scripteditor.jpg differ
diff --git a/Help/gzdb/features/scripting/acs_thing1.jpg b/Help/gzdb/features/scripting/acs_thing1.jpg
new file mode 100644
index 0000000..afeff84
Binary files /dev/null and b/Help/gzdb/features/scripting/acs_thing1.jpg differ
diff --git a/Help/gzdb/features/scripting/acs_thing2.jpg b/Help/gzdb/features/scripting/acs_thing2.jpg
new file mode 100644
index 0000000..ffc9c87
Binary files /dev/null and b/Help/gzdb/features/scripting/acs_thing2.jpg differ
diff --git a/Help/gzdb/features/scripting/snippets.html b/Help/gzdb/features/scripting/snippets.html
new file mode 100644
index 0000000..bfc138d
--- /dev/null
+++ b/Help/gzdb/features/scripting/snippets.html
@@ -0,0 +1,53 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>GZDoom Builder features</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="../../../default.css" media="screen" title="Default" />
+    <style type="text/css">
+<!--
+.style1 {
+	color: #990000;
+	font-weight: bold;
+}
+-->
+    </style>
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Template">
+	</object>
+	
+	<div id="gz_title">
+	  <h1>Code Snippets</h1>
+</div>
+	
+<div id="contents">
+<div style="float:right; padding-left:10px;"><br /><img src="snippets1.jpg"/></div>
+  <p>In the Script Editor you can use and create code snippets, which are small blocks of reusable code that you can insert where you need it in your code.</p>
+  <p><strong>Using code snippets:</strong><br />
+  To use a snippet,  pick it from the drop-down menu.<br />
+  Alternatively, type the name of a snippet (or place the cursor at the end of already existing one), then press the <strong>Tab</strong> key to expand it.<br /><br />
+  <strong>Example:</strong> to create the while loop, type &quot;<strong>while</strong>&quot;, then press the <strong>Tab</strong> key:<br />
+  <img style="padding-right:16px;" src="snippets_expand1.jpg"/><img src="snippets_expand2.jpg"/></p>
+  <p><strong>Creating new code snippets:</strong><br />
+  Code snippets are plain text files stored in [GZDB]\Snippets\[category], so just create a new text file there and add the code you want to it.<br />
+  There are several special tokens you can use: </p>
+  <ul>
+    <li><strong>[EP]</strong> (Entry Point) - that's the place where the cursor will be placed after inserting a snippet.</li>
+    <li><strong>[LB]</strong> (Line Break)
+  - these will be converted to line breaks when &quot;<strong>Allman-style bracing in snippets</strong>&quot; (located in Preferences -&gt; Appearance -&gt; Script Editor) setting is enabled, or a space character when it's not.
+  </ul>
+  <span class="style1">Warning:</span> snippet's file name must not contain spaces.
+  <p><strong>Creating new code snippets for custom scripting configurations:</strong><br />
+  To add snippets to a scripting configuration, which doesn't already have  existing snippets (&quot;Insert a Code Snippet&quot; drop-down is disabled in the Script Editor), you'll have to:</p>
+  <ol>
+    <li>Add a new folder inside of &quot;Snippets&quot; folder (for example, &quot;[GZDB]\Snippets\Decorate&quot;).</li>
+    <li>Add the &quot;<strong>snippetsdir</strong>&quot; parameter to a scripting configuration, in which you want to use snippets, and set it to the folder name you've just created  (for example, <strong>snippetsdir = &quot;Decorate&quot;;</strong>).</li>
+    <li>Add the snippets to the folder you've created.</li>
+  </ol>
+</div>
+</body>
diff --git a/Help/gzdb/features/scripting/snippets1.jpg b/Help/gzdb/features/scripting/snippets1.jpg
new file mode 100644
index 0000000..fde576a
Binary files /dev/null and b/Help/gzdb/features/scripting/snippets1.jpg differ
diff --git a/Help/gzdb/features/scripting/snippets_expand1.jpg b/Help/gzdb/features/scripting/snippets_expand1.jpg
new file mode 100644
index 0000000..86a7a5f
Binary files /dev/null and b/Help/gzdb/features/scripting/snippets_expand1.jpg differ
diff --git a/Help/gzdb/features/scripting/snippets_expand2.jpg b/Help/gzdb/features/scripting/snippets_expand2.jpg
new file mode 100644
index 0000000..edf8384
Binary files /dev/null and b/Help/gzdb/features/scripting/snippets_expand2.jpg differ
diff --git a/Help/gzdb/features/sectors_mode/gradientmodes.jpg b/Help/gzdb/features/sectors_mode/gradientmodes.jpg
new file mode 100644
index 0000000..88f6b58
Binary files /dev/null and b/Help/gzdb/features/sectors_mode/gradientmodes.jpg differ
diff --git a/Help/gzdb/features/sectors_mode/sector_info.jpg b/Help/gzdb/features/sectors_mode/sector_info.jpg
new file mode 100644
index 0000000..0a00143
Binary files /dev/null and b/Help/gzdb/features/sectors_mode/sector_info.jpg differ
diff --git a/Help/gzdb/features/sectors_mode/toggle_effect_overlay.jpg b/Help/gzdb/features/sectors_mode/toggle_effect_overlay.jpg
new file mode 100644
index 0000000..6cd00eb
Binary files /dev/null and b/Help/gzdb/features/sectors_mode/toggle_effect_overlay.jpg differ
diff --git a/Help/gzdb/features/things_mode/filter_selection.jpg b/Help/gzdb/features/things_mode/filter_selection.jpg
new file mode 100644
index 0000000..b629fa7
Binary files /dev/null and b/Help/gzdb/features/things_mode/filter_selection.jpg differ
diff --git a/Help/gzdb/features/things_mode/multiple_thing_types.html b/Help/gzdb/features/things_mode/multiple_thing_types.html
new file mode 100644
index 0000000..061213c
--- /dev/null
+++ b/Help/gzdb/features/things_mode/multiple_thing_types.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>Draw Ellipse mode</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="../../../default.css" media="screen" title="Default" />
+</head>
+<body>
+
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Template">
+	</object>
+	
+	<div id="gz_title">
+	  <h1>Assigning multiple thing types at once</h1>
+	</div>
+	
+	<div id="contents">
+	<p>Several thing types can now be selected at once in the Thing Edit form. If you do so, a type randomly chosen from selected ones will be assigned to each selected thing.<br /><br />
+	  <strong>Example</strong>. Let's say you have a typical slaughterwad and want to add some monster vatiety:<br />
+	<img src="multithingtype1.jpg"/></p>
+	  
+	<p>Select all monsters, and pick several monster types:<br />
+	<img src="multithingtype2.jpg"/></p>   
+	  
+	<p>Click OK and there you have it: <br />   
+	<img src="multithingtype3.jpg"/></p>
+    </div>
+</body>
diff --git a/Help/gzdb/features/things_mode/multithingtype1.jpg b/Help/gzdb/features/things_mode/multithingtype1.jpg
new file mode 100644
index 0000000..ba3a4fb
Binary files /dev/null and b/Help/gzdb/features/things_mode/multithingtype1.jpg differ
diff --git a/Help/gzdb/features/things_mode/multithingtype2.jpg b/Help/gzdb/features/things_mode/multithingtype2.jpg
new file mode 100644
index 0000000..1fa0f1b
Binary files /dev/null and b/Help/gzdb/features/things_mode/multithingtype2.jpg differ
diff --git a/Help/gzdb/features/things_mode/multithingtype3.jpg b/Help/gzdb/features/things_mode/multithingtype3.jpg
new file mode 100644
index 0000000..f0a60aa
Binary files /dev/null and b/Help/gzdb/features/things_mode/multithingtype3.jpg differ
diff --git a/Help/gzdb/features/things_mode/pointthing.html b/Help/gzdb/features/things_mode/pointthing.html
new file mode 100644
index 0000000..c9f7bb6
--- /dev/null
+++ b/Help/gzdb/features/things_mode/pointthing.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>Draw Ellipse mode</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="../../../default.css" media="screen" title="Default" />
+</head>
+<body>
+
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Template">
+	</object>
+	
+	<div id="gz_title">
+	  <h1>Point Thing to Cursor</h1>
+</div>
+	
+<div id="contents">
+	<p>This action can be used to quickly orient things in Things mode. Hold Ctrl key to point away from cursor.<br />
+      <b>Menu:</b> Things -&gt; Point to Cursor.<br />
+      <b>Action category:</b> Things.<br />
+      <b>Default key:</b> Shift+L.</p>
+	<p><strong>Example:</strong><br />
+	Select things and place mouse cursor where you want things to face:<br /><img src="thing_lookat1.jpg" alt="" width="273" height="243" /></p>
+	<p>Press the action shortcut:<br /><img src="thing_lookat2.jpg" alt="" width="278" height="245" /></p>
+</div>
+</body>
diff --git a/Help/gzdb/features/things_mode/thing_lookat1.jpg b/Help/gzdb/features/things_mode/thing_lookat1.jpg
new file mode 100644
index 0000000..45cc32f
Binary files /dev/null and b/Help/gzdb/features/things_mode/thing_lookat1.jpg differ
diff --git a/Help/gzdb/features/things_mode/thing_lookat2.jpg b/Help/gzdb/features/things_mode/thing_lookat2.jpg
new file mode 100644
index 0000000..1469cfc
Binary files /dev/null and b/Help/gzdb/features/things_mode/thing_lookat2.jpg differ
diff --git a/Help/gzdb/features/visual_mode/align_to_selection1.jpg b/Help/gzdb/features/visual_mode/align_to_selection1.jpg
new file mode 100644
index 0000000..83f9052
Binary files /dev/null and b/Help/gzdb/features/visual_mode/align_to_selection1.jpg differ
diff --git a/Help/gzdb/features/visual_mode/align_to_selection2.jpg b/Help/gzdb/features/visual_mode/align_to_selection2.jpg
new file mode 100644
index 0000000..6f03f1e
Binary files /dev/null and b/Help/gzdb/features/visual_mode/align_to_selection2.jpg differ
diff --git a/Help/gzdb/features/visual_mode/align_to_selection3.jpg b/Help/gzdb/features/visual_mode/align_to_selection3.jpg
new file mode 100644
index 0000000..e24d570
Binary files /dev/null and b/Help/gzdb/features/visual_mode/align_to_selection3.jpg differ
diff --git a/Help/gzdb/features/visual_mode/autoalign_to_selection.html b/Help/gzdb/features/visual_mode/autoalign_to_selection.html
new file mode 100644
index 0000000..b54670b
--- /dev/null
+++ b/Help/gzdb/features/visual_mode/autoalign_to_selection.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+<title>GZDoom Builder features</title>
+<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" type="text/css" href="../../../default.css" media="screen" title="Default" />
+</head>
+<body>
+<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+  <param name="keyword" value="Template">
+</object>
+<div id="gz_title">
+  <h1>&quot;Auto-align Textures to Selection&quot; actions</h1>
+</div>
+<div id="contents">
+  <p><strong>Action names:</strong> Auto-align Textures to Selection (X), Auto-align Textures to Selection (Y), Auto-align Textures to Selection (X and Y)<br />
+    <b>Action category:</b> Visual Modes<br />
+    <b>Default keys:</b> none</p>
+  <p>These actions will align unselected textures to selected ones.<br />
+  Let's say you have a room full of columns, and you want to align textures on all of them:<br />
+  <img src="align_to_selection1.jpg"/></p>
+  <p>Select one sidedef of each column:<br />
+  <img src="align_to_selection2.jpg"/></p>
+  <p>And use &quot;<strong>Auto-align Textures to Selection (X)&quot;</strong> action:<br />
+  <img src="align_to_selection3.jpg"/></p>
+</div>
+</body>
diff --git a/Help/gzdb/features/visual_mode/autoalignfloors.html b/Help/gzdb/features/visual_mode/autoalignfloors.html
new file mode 100644
index 0000000..26c2d53
--- /dev/null
+++ b/Help/gzdb/features/visual_mode/autoalignfloors.html
@@ -0,0 +1,55 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+<title>GZDoom Builder features</title>
+<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" type="text/css" href="../../../default.css" media="screen" title="Default" />
+</head>
+<body>
+<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+  <param name="keyword" value="Template">
+</object>
+<div id="gz_title">
+  <h1> Auto aligning textures on floors and ceilings (UDMF)</h1>
+</div>
+<div id="contents">
+  <h2>Floors and ceilings</h2>
+  <p>&quot;<strong>Auto Align Textures</strong>&quot; actions  work on floors and ceilings. It works like so:<br />
+    - a linedef closest to the 3D cursor position is picked from the highlighted sector.<br />
+    - the linedef's start or end vertex is chosen based on distance to the 3D cursor as a start point for texture offsets.<br />
+    - all selected floors/ceilings are aligned to that linedef if their texture matches one of the highlighted floor/ceiling.<br />
+  - the vertical and horizontal texture scale is copied from the highlighted floor/ceiling to the selected floors/ceilings.</p>
+  <table border="0" cellspacing="3" cellpadding="3">
+    <tr>
+      <td>Before:</td>
+      <td>After (1):</td>
+    </tr>
+    <tr>
+      <td><img src="floor_align_00.jpg"/></td>
+      <td><img src="floor_align_01.jpg"/></td>
+    </tr>
+    <tr>
+      <td>After (2):</td>
+      <td>After (3):</td>
+    </tr>
+    <tr>
+      <td><img src="floor_align_02.jpg" alt=""/></td>
+      <td><img src="floor_align_03.jpg" alt=""/></td>
+    </tr>
+  </table>
+  <p>You can also align floors and ceilings to selected linedefs in the Linedefs mode by using &quot;<strong>Align Ceiling Texture to Back Side</strong>&quot;, &quot;<strong>Align Ceiling Texture to Front Side</strong>&quot;, &quot;<strong>Align Floor Texture to Back Side</strong>&quot; and &quot;<strong>Align Floor Texture to Front Side</strong>&quot; actions, available in the <strong>Linedefs -&gt; Align Textures</strong> menu.</p>
+  <br />
+  <h2>Slopes</h2>
+  <p>&quot;<strong>Auto Align Textures</strong>&quot; actions  work on slopes. Textures are aligned to the line with &quot;Plane align (slope)&quot; action (181).<br />
+  <table border="0" cellspacing="3" cellpadding="3">
+    <tr>
+      <td>Before:</td>
+      <td>After:</td>
+    </tr>
+    <tr>
+      <td><img src="slopealign1.jpg" alt="" width="274" height="400" /></td>
+      <td><img src="slopealign2.jpg" alt="" width="284" height="400" /></td>
+    </tr>
+  </table></p>
+</div>
+</body>
diff --git a/Help/gzdb/features/visual_mode/floor_align_00.jpg b/Help/gzdb/features/visual_mode/floor_align_00.jpg
new file mode 100644
index 0000000..2f12fb2
Binary files /dev/null and b/Help/gzdb/features/visual_mode/floor_align_00.jpg differ
diff --git a/Help/gzdb/features/visual_mode/floor_align_01.jpg b/Help/gzdb/features/visual_mode/floor_align_01.jpg
new file mode 100644
index 0000000..91c04be
Binary files /dev/null and b/Help/gzdb/features/visual_mode/floor_align_01.jpg differ
diff --git a/Help/gzdb/features/visual_mode/floor_align_02.jpg b/Help/gzdb/features/visual_mode/floor_align_02.jpg
new file mode 100644
index 0000000..76238a6
Binary files /dev/null and b/Help/gzdb/features/visual_mode/floor_align_02.jpg differ
diff --git a/Help/gzdb/features/visual_mode/floor_align_03.jpg b/Help/gzdb/features/visual_mode/floor_align_03.jpg
new file mode 100644
index 0000000..062fbda
Binary files /dev/null and b/Help/gzdb/features/visual_mode/floor_align_03.jpg differ
diff --git a/Help/gzdb/features/visual_mode/slopealign1.jpg b/Help/gzdb/features/visual_mode/slopealign1.jpg
new file mode 100644
index 0000000..96d0526
Binary files /dev/null and b/Help/gzdb/features/visual_mode/slopealign1.jpg differ
diff --git a/Help/gzdb/features/visual_mode/slopealign2.jpg b/Help/gzdb/features/visual_mode/slopealign2.jpg
new file mode 100644
index 0000000..72b07f4
Binary files /dev/null and b/Help/gzdb/features/visual_mode/slopealign2.jpg differ
diff --git a/Help/gzdb/features/visual_mode/texturefit.html b/Help/gzdb/features/visual_mode/texturefit.html
new file mode 100644
index 0000000..46696c4
--- /dev/null
+++ b/Help/gzdb/features/visual_mode/texturefit.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+<title>GZDoom Builder features</title>
+<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" type="text/css" href="../../../default.css" media="screen" title="Default" />
+</head>
+<body>
+<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+  <param name="keyword" value="Template">
+</object>
+<div id="gz_title">
+  <h1>&quot;Fit Textures&quot; action</h1>
+</div>
+<div id="contents">
+  <p><strong>Action name:</strong> Fit Textures.<br />
+    <b>Action category:</b> Visual Modes.<br />
+    <b>Default key:</b> Ctrl-Alt-A.</p>
+  <p>This action allows you to align textures to selected surfaces in Visual mode. &quot;<em>Fit across connected surfaces</em>&quot; setting controls whether adjacent surfaces sharing the same texture are threated as a continuous surface.</p>
+  <p><strong>Examples:</strong><br /><br />
+  Initial setup:<br />
+  <img src="texturefit1.jpg"/></p><br />
+  <p>Examples of various settings in action:<br />
+  <img src="texturefit2.jpg"/></p>
+<br /> 
+  <img src="texturefit3.jpg"/>
+<br />
+  <img src="texturefit4.jpg"/>
+<br />
+  <img src="texturefit5.jpg"/>
+</div>
+</body>
diff --git a/Help/gzdb/features/visual_mode/texturefit1.jpg b/Help/gzdb/features/visual_mode/texturefit1.jpg
new file mode 100644
index 0000000..b002737
Binary files /dev/null and b/Help/gzdb/features/visual_mode/texturefit1.jpg differ
diff --git a/Help/gzdb/features/visual_mode/texturefit2.jpg b/Help/gzdb/features/visual_mode/texturefit2.jpg
new file mode 100644
index 0000000..218ccda
Binary files /dev/null and b/Help/gzdb/features/visual_mode/texturefit2.jpg differ
diff --git a/Help/gzdb/features/visual_mode/texturefit3.jpg b/Help/gzdb/features/visual_mode/texturefit3.jpg
new file mode 100644
index 0000000..8ed52ea
Binary files /dev/null and b/Help/gzdb/features/visual_mode/texturefit3.jpg differ
diff --git a/Help/gzdb/features/visual_mode/texturefit4.jpg b/Help/gzdb/features/visual_mode/texturefit4.jpg
new file mode 100644
index 0000000..68e0daa
Binary files /dev/null and b/Help/gzdb/features/visual_mode/texturefit4.jpg differ
diff --git a/Help/gzdb/features/visual_mode/texturefit5.jpg b/Help/gzdb/features/visual_mode/texturefit5.jpg
new file mode 100644
index 0000000..c8fe754
Binary files /dev/null and b/Help/gzdb/features/visual_mode/texturefit5.jpg differ
diff --git a/Help/gzdb/features/visual_mode/visual_verts.html b/Help/gzdb/features/visual_mode/visual_verts.html
new file mode 100644
index 0000000..69aa35d
--- /dev/null
+++ b/Help/gzdb/features/visual_mode/visual_verts.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+<title>GZDoom Builder features</title>
+<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" type="text/css" href="../../../default.css" media="screen" title="Default" />
+</head>
+<body>
+<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+  <param name="keyword" value="Template">
+</object>
+<div id="gz_title">
+  <h1>Visual vertices (UDMF)</h1>
+</div>
+<div id="contents">
+  <p>Visual vertices allow you to edit vertical vertex offsets in Visual mode.<br/>
+    You can select and edit them just like Things (except you can't move them horizontally).<br/>
+    You can use the &quot;<strong>Delete</strong>&quot; action (usually bound to Delete key) to clear z-offsets of selected vertices.<br/>
+    You can toggle the Visual vertices display from the <a href="../general/rendering_toolbar.html">Rendering toolbar</a> or the &quot;<strong>Toggle Visual Vertices</strong>&quot; action.<br/>
+    Visual vertices with height offset (e.g. with some values in &quot;zceiling&quot; or &quot;zfloor&quot; UDMF fields) are colored using the &quot;Info Line&quot; color. Visual vertices without offsets are colored using the &quot;Vertex&quot; color. You can change these colors in Preferences -&gt; Appearance.</p>
+  <p> <strong>Technical note &#8470;1:</strong> Visual vertices work only if a map is in UDMF map format.<br/>
+    <strong>Technical note &#8470;2:</strong> Visual vertices work only for triangular sectors.</p>
+  <p>It took approx. 30 seconds to create this wonderous terrain:<br />
+<img src="visual_verts.jpg" /><br />
+</p>
+  <p>You can create much more elaborate terrains using <a href="../classic_modes/mode_importterrain.html"><strong>Terrain Importer</strong></a>.</p>
+</div>
+</body>
diff --git a/Help/gzdb/features/visual_mode/visual_verts.jpg b/Help/gzdb/features/visual_mode/visual_verts.jpg
new file mode 100644
index 0000000..0a0dde1
Binary files /dev/null and b/Help/gzdb/features/visual_mode/visual_verts.jpg differ
diff --git a/Help/gzdb/gz_header.gif b/Help/gzdb/gz_header.gif
new file mode 100644
index 0000000..a45c7e7
Binary files /dev/null and b/Help/gzdb/gz_header.gif differ
diff --git a/Help/gzdb/mxd_avatar.png b/Help/gzdb/mxd_avatar.png
new file mode 100644
index 0000000..6ae0ce3
Binary files /dev/null and b/Help/gzdb/mxd_avatar.png differ
diff --git a/Help/gzdb/renderingpanel.jpg b/Help/gzdb/renderingpanel.jpg
new file mode 100644
index 0000000..b9f13b0
Binary files /dev/null and b/Help/gzdb/renderingpanel.jpg differ
diff --git a/Help/gzdb/text_lumps.html b/Help/gzdb/text_lumps.html
new file mode 100644
index 0000000..8898be2
--- /dev/null
+++ b/Help/gzdb/text_lumps.html
@@ -0,0 +1,85 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>GZDoom Builder features</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="../default.css" media="screen" title="Default" />
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="textures">
+    <param name="keyword" value="modeldef">
+    <param name="keyword" value="voxeldef">
+    <param name="keyword" value="reverbs">
+    <param name="keyword" value="gldefs">
+	</object>
+	
+	<div id="gz_title">
+	  <h1>(G)ZDoom text lumps support</h1>
+	</div>
+	
+	<div id="contents">
+    <p>GZDoom Builder will automatically load data from the following lumps if they are present in the map's resources.</p>
+    <a name="textures" id="textures"></a><h2>TEXTURES:</h2>
+    You can use "<strong>//$GZDB_SKIP</strong>" special comment to abort parsing of the current file. Useful if you don't want textures from certain files or parts of files to show up in the <a href="w_imagesbrowser.html">Image Browser</a> or want to increase resource loading speed.<br /><br />
+    GZDoom Builder adds support for the following TEXTURES parameters:
+    <ul><li>FlipX, FlipY, Rotate and Blend (both styles) patch parameters.</li>
+        <li>&quot;Add&quot;, &quot;Modulate&quot;, &quot;Subtract&quot;, &quot;ReverseSubtract&quot; and &quot;Translucent&quot; patch Translucency Styles.</li>
+      </ul>
+    <a name="mapinfo" id="mapinfo"></a>
+    <h2>(Z)MAPINFO:</h2>
+    Both new and old MAPINFO definition styles are supported.<br />
+    You can use "<strong>//$GZDB_SKIP</strong>" special comment to abort parsing of the current file.<br />
+    <strong>DoomEdNum</strong> overrides are supported.<br />
+    <strong>SpawnNums</strong> overrides are supported. The values are used to update "spawnthing" Game Configuration enum.<br /><br />
+    In addition, following values from (Z)MAPINFO are supported by Visual mode:
+<ul>
+  <li>fade;</li>
+  <li>outsidefog;</li>
+  <li>fogdensity;</li>
+  <li>outsidefogdensity;</li>
+  <li>vertwallshade;</li>
+  <li>horizwallshade;</li>
+  <li>evenlighting;</li>
+  <li>smoothlighting.</li>
+</ul>
+
+	<a name="reverbs" id="reverbs"></a>
+    <h2>REVERBS:</h2>
+    Sound environment definitions are loaded and can be used in the <a href="features/classic_modes/mode_soundenvironment.html">Sound Environment Mode</a>.
+    
+    <h2>SNDSEQ:</h2>
+    Sound Sequence and Sound Sequence Group definitions are loaded and can be selected in the "Sound sequence" drop-down of the Edit Sector window (UDMF only). 
+         
+    <a name="modeldef" id="modeldef"></a>
+    <h2>MODELDEF:</h2>
+    All relevant MODELDEF properties and flags, except sprite translations are supported.
+    
+    <a name="voxeldef" id="voxeldef"></a>
+    <h2>VOXELDEF:</h2>
+    All relevant VOXELDEF properties and flags  are supported.
+    
+    <a name="gldefs" id="gldefs"></a>
+    <h2>GLDEFS:</h2>
+    Only glowing flat and dynamic light definitions are currently supported. Brightmaps support may be added in the future.<br />You can use &quot;<strong>//$GZDB_SKIP</strong>&quot; special comment to abort parsing of the current file.<br />
+    <br />
+    You can reload GLDEFS and MODELDEF by using &quot;<strong>Reload GLDEFS</strong>&quot; and &quot;<strong>Reload MODELDEF</strong>&quot; actions.<br />
+    To enable GZDoom's built-in GLDEFS dynamic light definitions, you need to add "<strong>lights.pk3</strong>" as a map resource. "<strong>lights.pk3</strong>" can be found in GZDoom folder.
+    <h2>Additional info regarding MODELDEF and GLDEFS support:</h2> 
+    <p>If you are creating maps for Doom or Doom 2, you probably don't need to read this, since required information is already added for those games.<br />
+      <br />
+	  <b>To load models or dynamic lights defined in GLDEFS for things defined in configuration files:</b><br />
+	  To display a model instead of a thing sprite, or to attach a light defined in GLDEFS, GZDB needs to know a thing's class name (because that's how overrides are defined in MODELDEF and GLDEFS). Things defined in Doom Builder configuration files don't have this value. So, if you aren't using configs, which came with GZDoom Builder, or you are creating maps for games other than Doom and Doom 2, you'll need to add a new value named "class" to thing definition in game configuration:<br />
+<pre>3001
+{
+    title = "Imp";
+    sprite = "TROOA2A8";
+    <span class="blue">class = "DoomImp";</span> // <- you'll need to add this value
+}</pre>
+ <br>
+ You can find all thing class names at <a href="http://www.zdoom.org/wiki/Classes">http://www.zdoom.org/wiki/Classes</a>.</p>
+</div>
+</body>
diff --git a/Help/header.gif b/Help/header.gif
new file mode 100644
index 0000000..e180c74
Binary files /dev/null and b/Help/header.gif differ
diff --git a/Help/introduction.html b/Help/introduction.html
new file mode 100644
index 0000000..ab6a9f8
--- /dev/null
+++ b/Help/introduction.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>Introduction</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Introduction">
+	</object>
+	
+	<div id="title"><h1>Introduction</h1></div>
+	
+	<div id="contents">
+	<p>
+		Doom Builder is an advanced, revolutionary map editor for Doom and games based on the Doom engine, such as Heretic, Hexen and Strife. This editor is highly extendible for the different game engines of the Doom community. Doom Builder introduced the 3D editing mode in the Doom community and is still the leading editor for Doom levels today.
+		
+		<h2>Reference Manual</h2>
+		This is the Reference Manual for Doom Builder 2. You can use this manual to look up how the editor works and what the specific modes and actions do. This manual is not a beginners tutorial that teaches you how to make maps. <br /><br />
+        
+        <strong>GZDoom Builder</strong> reference manual is available <a href="gz_introduction.html">here</a>.
+	</p>
+	</div>
+</body>
diff --git a/Help/scriptingconfigs.html b/Help/scriptingconfigs.html
new file mode 100644
index 0000000..1c024ba
--- /dev/null
+++ b/Help/scriptingconfigs.html
@@ -0,0 +1,109 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+<title>About Scripting Configurations</title>
+<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
+</head>
+<body>
+<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+  <param name="keyword" value="Configurations">
+  <param name="keyword" value="Scripting Configurations">
+</object>
+<div id="title">
+  <h1>About Scripting Configurations</h1>
+</div>
+<div id="contents">
+  <p>Scripting configurations are used to provide code highlighting and code completion in the <a href="w_scripteditor.html">Script Editor</a>.<br />
+    Scripting configurations are loaded from *.cfg files placed in the "Scripting" directory.</p>
+  <h2>Script compiler settings:</h2>
+  <br />
+  <b class="fat">compiler</b> (string)<br />
+  The name of the <a href="scriptingconfigs.html">script compiler</a> to use.<br />
+  <br />
+  <b class="fat">parameters</b> (string)<br />
+  Command line paramterets to pass to the <a href="scriptingconfigs.html">script compiler</a>. 
+  Following wildcards are supported:
+  <ul style="list-style-type:none;">
+    <li>"%FI" - input file path.</li>
+    <li>"%FO" - output file path.</li>
+    <li>"%FS" - source file.</li>
+    <li>"%PT" - temporary directory path.</li>
+    <li>"%PS" - source path.</li>
+  </ul>
+  <b class="fat">resultlump</b> (string)<br />
+  The name of the lump compilation result should be stored in.<br />
+  <br />
+  <br />
+  <h2>Script Editor settings:</h2>
+  <br />
+  <b class="fat">description</b> (string)<br />
+  Script type name shown in the <a href="w_scripteditor.html">Script Editor's</a> &quot;New File&quot; drop-down.<br />
+  <br />
+  <b class="fat">codepage</b> (integer)<br />
+  The code page  Scintilla Control will use.<br />
+  <br />
+  <b class="fat">extensions</b> (string)<br />
+  Comma-separated list of file extensions associated with this configuration.<br />
+  <br />
+  <b class="fat">casesensitive</b> (boolean)<br />
+  Is the script type case sensitive? Default value is <strong>true</strong>.<br />
+  <br />
+  <b class="fat">insertcase</b> (int)<br />
+  0 - Normal, 1 - Lowercase, 2 - Uppercase. Defaullt value is <strong>0</strong>.<br />
+  <br />
+  <b class="fat">lexer</b> (integer)<br />
+  Specifies a lexer type Scintilla Control will use.<br />
+  Possible values are: 1 - Plain text; 3 - CPP-style, case-sensitive; 6 - Perl-style; 18 - Pascal-style; 35 - CPP-style, case-insensitive.<br />
+  <br />
+  <b class="fat">functionopen</b> (string)<br />
+  A character used as a function's opening brace.<br />
+  <br />
+  <b class="fat">functionclose</b> (string)<br />
+A character used as a function's closing brace.  <br />
+  <br />
+  <b class="fat">argumentdelimiter</b> (string)<br />
+A character used as a function arguments delimiter.  <br />
+  <br />
+  <b class="fat">terminator</b> (string)<br />
+A character used as an expression terminator.  <br />
+  <br />
+  <b class="fat">keywordhelp</b> (string) - <span class="red">GZDB only</span>.<br />
+  An URL used to display keyword help. &quot;%K&quot; placeholder will be replaced with the word text cursor is position in when calling keyword help (F1).<br />
+  <br />
+  <b class="fat">snippetsdir</b> (string) - <span class="red">GZDB only</span>.<br />
+  Directory name inside of the &quot;Snippets&quot; directory, which holds snippets for current script configuration.<br />
+  <br />
+  <b class="fat">scripttype</b> (integer) - <span class="red">GZDB only</span>.<br />
+  Marks current script configuration as one of script types, recognized by GZDB. Possible values are: 1 - ACC; 2 - MODELDEF; 3 - DECORATE. Default value is <strong>0</strong> (unknown script).<br />
+  <h2>"keywords" block:</h2>
+  <br />
+  Defines a list of keywords to highlight and show code completion 
+  for. Each keyword is defined as
+  <pre>Keyword = "Keyword description";</pre>
+  "Keyword" is a word used in a script, "Keyword description" provides additional information about a keyword, like function arguments or hints about what function or it's parameters do.
+  <p><strong>Example:</strong>
+  <pre>
+keywords
+{
+	CanRaiseActor = "bool CanRaiseActor(int tid)\nChecks to see if the actor or actors with the specified tid are viable for resurrection.\nIf tid is 0, the check is done on the activator of the script.";
+}
+</pre>
+  </p>
+  <h2>"constants" block:</h2>
+  <br />
+  Defines a list of constants to highlight and show code completion for.
+  <p><strong>Example:</strong>
+  <pre>
+constants
+{
+	AAPTR_DEFAULT;
+	AAPTR_FRIENDPLAYER;
+	AAPTR_GET_LINETARGET;
+	AAPTR_MASTER;
+	AAPTR_NULL;
+}
+</pre>
+  </p>
+</div>
+</body>
diff --git a/Help/scripts.js b/Help/scripts.js
new file mode 100644
index 0000000..0ca648f
--- /dev/null
+++ b/Help/scripts.js
@@ -0,0 +1,20 @@
+function autoadjustheight(iframeid)
+{
+	// Find the height of the internal page
+	var doc_height = document.getElementById(iframeid).contentWindow.document.body.scrollHeight;
+	
+	// Change the height of the iframe
+	document.getElementById(iframeid).height = doc_height;
+}
+
+//mxd
+function ToggleSpoiler(t){
+	var d = t.nextSibling.nextSibling;
+	if (d.style.display != '') {
+		d.style.display = '';
+		t.value = 'Hide image';
+	} else {
+		d.style.display = 'none';
+		t.value = 'Show image';
+	}
+}
\ No newline at end of file
diff --git a/Help/systemrequirements.html b/Help/systemrequirements.html
new file mode 100644
index 0000000..49ffd63
--- /dev/null
+++ b/Help/systemrequirements.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+<title>About Compiler Configurations</title>
+<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
+</head>
+<body>
+<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+  <param name="keyword" value="system requirements">
+  <param name="keyword" value="prerequisite">
+</object>
+<div id="gz_title">
+  <h1>System Requirements</h1>
+</div>
+<div id="contents">
+  <p><b class="fat">System requirements:</b>
+  <ul>
+    <li>2.4 GHz CPU or faster. (Multi-core recommended).</li>
+    <li> Windows XP, Vista, 7, 8 or 10.</li>
+    <li> Graphics card with Pixel Shader model 2.0 support.</li>
+  </ul>
+  <b class="fat">Required software:</b>
+  <ul>
+    <li><a href="http://www.microsoft.com/en-us/download/details.aspx?id=5582">Microsoft Visual C++ 2008 SP1 Redistributable Package (x86)</a> (required only by the Nodes Viewer plugin).</li>
+    <li><a href="http://www.microsoft.com/download/en/details.aspx?id=25150">Microsoft .Net Framework 3.5</a>. <strong>Notice:</strong> if you already have .Net Framework 4.0 or later installed, you'll still   need to install 3.5 version, because newer versions are not backwards   compatible with it!</li>
+    <li><a href="http://www.microsoft.com/en-us/download/details.aspx?id=35">DirectX 9.0 Runtime</a>. <strong>Notice:</strong> required even if you have DirectX 11 installed.</li>
+  </ul>
+  <strong>Notice:</strong> these components are installed automatically when using GZDoom Builder installer.
+  </p>
+</div>
+</body>
diff --git a/Help/template.html b/Help/template.html
new file mode 100644
index 0000000..47dfe71
--- /dev/null
+++ b/Help/template.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>Template</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Template">
+	</object>
+	
+	<div id="title"><h1>Template</h1></div>
+	
+	<div id="contents">
+	<p>
+		Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque dignissim porttitor nisl. Sed bibendum magna nec quam. Phasellus purus. Nunc rutrum libero nec libero. Fusce iaculis elit sed nibh. Curabitur posuere magna at massa suscipit consequat. Duis ac quam. Ut ante nulla, tincidunt et, tincidunt at, convallis eget, diam. Duis et ligula. Mauris accumsan massa id nunc. Donec sit amet ligula eget odio mattis dictum. Donec mauris nunc, vulputate nec, cursus ac, ullamcorper ornare, neque. 
+	</p>
+	</div>
+</body>
diff --git a/Help/terminology.html b/Help/terminology.html
new file mode 100644
index 0000000..c3f91b8
--- /dev/null
+++ b/Help/terminology.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>Terminology</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Terminology">
+	<param name="keyword" value="Linedef">
+	<param name="keyword" value="Sidedef">
+	<param name="keyword" value="Sector">
+	<param name="keyword" value="Vertex">
+	<param name="keyword" value="Thing">
+	<param name="keyword" value="Element">
+	<param name="keyword" value="WAD">
+	<param name="keyword" value="IWAD">
+	<param name="keyword" value="PWAD">
+	<param name="keyword" value="Resource">
+	<param name="keyword" value="PK3">
+	</object>
+	
+	<div id="title"><h1>Terminology</h1></div>
+	
+	<div id="contents">
+	<p>
+		<h2>Resource</h2>
+		A file or directory from which textures, flats, sprites and other information is read that is used during map editing. Doom Builder supports WAD files, PK3 files and directories as resources.
+		
+		<h2>WAD</h2>
+		A WAD file is a collection of data, which can include textures, sprites, sounds but also maps. This is the most common resource type used by Doom. A WAD file can be an <b>IWAD</b> (Internal WAD)  which contains all data needed to run a game without any additional WAD files, or a <b>PWAD</b> (Patch WAD) which only contains the data you wish to change (for example; a new map and some textures only, but no change in sounds or sprites). Doom always requires a single IWAD and optionally one or more PWADs.
+		
+		<h2>PK3</h2>
+		The PK3 file is actually a ZIP file and contains a directory with a specific structure. It can be used as a replacement for WAD files in some Doom sourceports and is smaller than the WAD file because it is compressed. Doom Builder can read from PK3 files as resources, but for better performance it is recommended that you unzip your PK3 file (keeping the directory structure) and add the directory as resource. For more information, see <a href="http://zdoom.org/wiki/Using_ZIPs_as_WAD_replacement" target="_blank">Using ZIPs as WAD replacement</a> for more information.
+		
+		<h2>Element</h2>
+		A map consists of vertices, linedefs, sidedefs, sectors and things. These are all elements in a map and each has their own set of properties. Some elements are connected to other elements: A linedef is always connected to two vertices and has one or two sidedefs. A sidedef is always connected to one sector and a sector has one or more sidedefs.
+		
+		<h2>Vertex</h2>
+		This is the most simple element in a map. A vertex is a point on the map which has X and Y coordinates.
+		
+		<h2>Linedef</h2>
+		This is a line in your map geometry which connects two vertices. Every wall and sector border must have a linedef. Linedefs can have an action that is triggered when player pushes the wall or walks over the line. The linedef has a front (right) and a back (left) side where a sidedef can be attached. The front side should always have a sidedef attached, but when the linedef is a wall with nothing behind it (void), it should not have a back side.
+		
+		<h2>Sidedef</h2>
+		A sidedef defines how one side of a linedef looks like and which sector it forms. A sidedefs has a upper, middle and lower texture which are sometimes required depending on the heights of the sectors and all share the same texture offsets.
+		
+		<h2>Sector</h2>
+		The sector defines an area on the map. It has properties for the floor and ceiling and can have special effects for the environment. The shape of the sector is defined by the sidedefs and the linedefs they are on and should always be a closed area or multiple closed areas. There are exceptional cases, however, where authors use a non-closed sector to create a special effect by exploiting the Doom engine.
+		
+		<h2>Thing</h2>
+		Things are basically any object in the map that is not part of its geometry. They can be decorations, items, monsters, player starts or even indicators for the sourceport to do something in that location. They have X and Y coordinates and in Hexen format they also have a Z coordinate (which often is relative to the sector floor).
+	</p>
+	</div>
+</body>
diff --git a/Help/userinterface.html b/Help/userinterface.html
new file mode 100644
index 0000000..ff99afb
--- /dev/null
+++ b/Help/userinterface.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>About the User Interface</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="User Interface">
+	<param name="keyword" value="Interface">
+	</object>
+	
+	<div id="title"><h1>About the User Interface</h1></div>
+	
+	<div id="contents">
+	<p>
+		Doom Builder's user interface exists of one main editing window in which most of the map editing will be done. Doom Builder also has a window for scripting and several built-in dialogs for editing and setting up your preferences and much more. This part of the Reference Manual will help you explain all the buttons and controls on every window.
+	</p>
+	</div>
+</body>
diff --git a/Help/w_customfields.html b/Help/w_customfields.html
new file mode 100644
index 0000000..17f267f
--- /dev/null
+++ b/Help/w_customfields.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>Custom Fields Editor</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Custom Fields Editor">
+	<param name="keyword" value="UDMF Custom Fields">
+	</object>
+	
+	<div id="title"><h1>Custom Fields Editor</h1></div>
+	
+	<div id="contents">
+	<p>
+		The UDMF format allows any number of custom properties on every element in the map. With the custom fields editor, you can edit the known properties and add custom ones yourself. The game configuration has known properties that are supported by the sourceport and are automatically shown in the list. Grayed items are known, but have not been set (and thus have their default value). To add your own custom properties, you can click on the text <b>Click to add custom field</b> and type the name for the new property. Then you can change the type and set its value. To remove a custom property, just select it and press Delete. Known properties cannot be deleted, pressing Delete with a known property selected will just reset it back to its default value.
+	</p>
+	</div>
+</body>
diff --git a/Help/w_errorsandwarnings.html b/Help/w_errorsandwarnings.html
new file mode 100644
index 0000000..0237c47
--- /dev/null
+++ b/Help/w_errorsandwarnings.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>Errors and Warnings Window</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Errors and Warnings Window">
+	<param name="keyword" value="Warnings">
+	<param name="keyword" value="Errors">
+	</object>
+	
+	<div id="title"><h1>Errors and Warnings Window</h1></div>
+	
+	<div id="contents">
+	<p>
+		When errors or warnings occur during certain operations these will be reported in this window. If the window does not automatically show, you can find it in the Tools menu or by pressing the default key F11. Click the <b>Copy Selection</b> button to copy the selected errors to the clipboard. Click the <b>Clear</b> button to remove all the errors from the window.<br />
+		<br />
+		You can choose to open this window automatically when errors occur after operations such as loading a map by checking the option <b>Show this window when errors occur</b>.
+	</p>
+	</div>
+</body>
diff --git a/Help/w_gameconfigurations.html b/Help/w_gameconfigurations.html
new file mode 100644
index 0000000..847184a
--- /dev/null
+++ b/Help/w_gameconfigurations.html
@@ -0,0 +1,86 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>Game Configurations Window</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Game Configurations Window">
+	<param name="keyword" value="Configuration Window">
+	<param name="keyword" value="Testing">
+	<param name="keyword" value="Parameters">
+	<param name="keyword" value="Nodebuilder">
+	<param name="keyword" value="Resources">
+	<param name="keyword" value="Texture Sets">
+	<param name="keyword" value="IWAD File">
+	</object>
+	
+	<div id="title"><h1>Game Configurations Window</h1></div>
+	
+	<div id="contents">
+	<p>
+		The Game Configurations window is accessible from the Tools menu, or with the default key F6. On the left of this window you can select the game configuration for which you want to change settings. Choose from the tabs on the right what you want to change.
+		
+		<h2>Resources</h2>
+		This is a list of resources that will be loaded before any other resources. You should add the IWAD and other project-related resources here so that they are automatically loaded with every map you make with this game configuration. These resources, from top to bottom, will be loaded first before any other resources. You can drag the resource items to change their order. See also the <a href="w_resourceoptions.html">Resource Options Window</a>.
+		
+		<h2>Nodebuilder</h2>
+		Building the BSP tree and other additional information such as BLOCKMAP and REJECT is useful to optimize the in-game performance and for most older sourceports and vanilla Doom it is even required. This is where you select the nodebuilder you want to run in certain cases and which settings to use. You can choose a nodebuilder to run when saving the map and when testing the map. Consult the documentation of the sourceport you are using to find out which nodebuilder and which settings you need. Advanced users may want to add more specific settings by writing a <a href="nodebuilderconfiguration.html">nodebuilder configuration</a>.
+		
+		<h2>Testing</h2>
+		No matter how well an editor works, testing to see how your map looks and performs in the sourceport is essential. Here you can choose the sourceport to test with and the parameters to use. You can also set the default skill level, but this can also be easily changed from the test drop down menu in the toolbar of the <a href="w_mainwindow.html">main window</a>. You generally do not need to specify custom parameters (the default ones should work fine) but advanced users may wish to change these parameters.<br />
+		<br />
+		The following special placeholders can be used in the parameters;
+		<table border="0" cellspacing="6" width="90%">
+		<tr>
+			<td width="50" valign="top"><b>%F</b></td>
+			<td>WAD file with the map that is to be tested. NOTE: this is a temporary file and not the file you opened or saved.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>%WP</b></td>
+			<td>IWAD resource file with full path included. This is the first (highest) IWAD file that is found in the resources list.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>%WF</b></td>
+			<td>IWAD resource filename only, without path. This is the first (highest) IWAD file that is found in the resources list.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>%L</b></td>
+			<td>Map lump name as is set in the <a href="w_mapoptions.html">map options window</a>.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>%L1</b></td>
+			<td>The first number found in the map lump name (as is set in the <a href="w_mapoptions.html">map options window</a>). This is for use with the -warp parameter.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>%L2</b></td>
+			<td>The second number found in the map lump name (as is set in the <a href="w_mapoptions.html">map options window</a>). This is for use with the -warp parameter.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>%AP</b></td>
+			<td>All resource files, except the first IWAD, with full paths included. The resources are separated by spaces and when this placeholder is enclosed within quotes (<b>"%AP"</b>) then the quotes are repeated for every resource.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>%S</b></td>
+			<td>Skill number at which to test.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>%NM</b></td>
+			<td>This is either <b>-nomonsters</b> when you choose to test without monsters, or nothing at all.</td>
+		</tr>
+		</table>
+		When the checkbox <b>Use short path and file names (MSDOS 8.3 format)</b> is checked, all the above placeholders that output filenames and/or paths will use the short version that is compatible with MSDOS.
+		
+		<h2>Textures</h2>
+		You can group your textures into categories called Texture Sets. There are some fixed Texture Sets that appear in the browsers automatically (such as the "All" set and the sets for each resource) and you can create custom Texture Sets here. You can also copy Texture Sets from one game configuration to another with the <b>Copy</b> and <b>Paste</b> buttons. With the <b>Add Default Sets</b> button you can add the default Texture Sets that are provided with the game configuration (if any). For more information about creating your own Texture Sets, see the <a href="w_textureset.html">Texture Set window</a>.
+		
+		<h2>Modes</h2>
+		Here you can choose what <a href="editingmodes.html">editing modes</a> you can use when editing with the selected game configuration. This is useful when plugins are installed that replace certain editing modes or plugins that add editing modes for a specific sourceport only. Note that some editing modes may require other editing modes from the same plugin to work together. When plugins are installed, you should consult the provided documentation to see what changes should be made here. Only recommended for advanced users.
+	</p>
+	</div>
+</body>
diff --git a/Help/w_gridsetup.html b/Help/w_gridsetup.html
new file mode 100644
index 0000000..44bc577
--- /dev/null
+++ b/Help/w_gridsetup.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>Grid Setup Window</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Grid Setup Window">
+	<param name="keyword" value="Grid">
+	<param name="keyword" value="Background">
+	</object>
+	
+	<div id="title"><h1>Grid Setup Window</h1></div>
+	
+	<div id="contents">
+	<p>
+		On this window you can configure the grid and background settings. Click the grid icon in the <a href="w_mainwindow.html">statusbar</a> or select Grid Setup from the Edit menu to access this window. The grid helps aligning your map elements and the 64 mappixels grid is important to Doom as it indicates how flats are aligned. You can change the size of the grid you want to work with at the top of this window. Note that the grid can also easily be changed with the actions <b>Grid Increase</b> and <b>Grid Decrease</b>.<br />
+		<br />
+		The background is useful when drawing over an image to copy its shape. Check the <b>Show background image</b> checkbox and select a texture, flat or file to be used as the background image. You can also change the offset and the scale.
+	</p>
+	</div>
+</body>
diff --git a/Help/w_imagesbrowser.html b/Help/w_imagesbrowser.html
new file mode 100644
index 0000000..3332b06
--- /dev/null
+++ b/Help/w_imagesbrowser.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>Image Browser Window</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Image Browser Window">
+	<param name="keyword" value="Textures">
+	<param name="keyword" value="Flats">
+	</object>
+	
+	<div id="title"><h1>Image Browser Window</h1></div>
+	
+	<div id="contents">
+	<p>
+		Use this browser to look for textures or flats. On the left you have the list with your Texture Sets. The list also contains a set named &quot;All&quot; which, obviously, contains all textures or flats. A Texture Set for each loaded resource has also been added. This is useful if you know in which resource the image resides. Once you have chosen your Texture Set, you can use the text field at the bottom to enter the texture name. You only have to enter the name partly and the list of images will adjust to show only the images that match with the entered name. Select an image to view its dimensions at the bottom. When the focus is on the images list, you can press the <b>Tab</b> key to jump between the same image in the &quot;Used textures&quot; and &quot;Available textures&quot; areas. Doubleclick the image or click <b>OK</b> to make your selection or <b>Cancel</b> to close the list.<br />
+		<br />
+		To make your own Texture Sets, see the Textures tab on the <a href="w_gameconfigurations.html">Game Configurations Window</a>.
+	</p>
+	</div>
+</body>
diff --git a/Help/w_linedefedit.html b/Help/w_linedefedit.html
new file mode 100644
index 0000000..18ce929
--- /dev/null
+++ b/Help/w_linedefedit.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>Linedef Properties Window</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Linedef Properties Window">
+	<param name="keyword" value="Linedef">
+	<param name="keyword" value="Sidedef">
+	<param name="keyword" value="Action">
+	<param name="keyword" value="Impassable">
+	<param name="keyword" value="Doublesided">
+	<param name="keyword" value="Texture">
+	<param name="keyword" value="Special Linedef">
+	<param name="keyword" value="Tag">
+	</object>
+	
+	<div id="title"><h1>Linedef Properties Window</h1></div>
+	
+	<div id="contents">
+	<p>
+		With this dialog window you can edit all linedef properties. When a selection of multiple linedefs is made, some fields may appear grayed or empty in case they are different for some of the selected elements. Setting a value in grayed or empty field will apply this to the entire selection.
+		
+		<h2>Properties</h2>
+		On this tab you will find all the general settings for the linedef. These setting apply to both sides of the linedef, unless specified otherwise.<br/>
+		<br/>
+		The <b>Settings</b> area provides options for the line such as <i>Impassable</i> which blocks players and monsters from crossing the line, and <i>Doublesided</i> which is automatically set or unset by Doom Builder to indicate if the line has one or two sidedefs. Depending on the game configuration, this area can feature many more options for the behaviour of the linedef.<br/>
+		<br/>
+		Below that is the <b>Action</b> area, which allows you to set a special action that is executed on a specific trigger method such as a switch or proximity trigger. In Hexen format, the action can take some arguments and the trigger method can be specified independently from the action. In UDMF format, the trigger method can be any combination of methods.<br/>
+		<br/>
+		In Doom and UDMF formats, the line can also be tagged with a number that identifies the linedef. This number can then be used by Thing actions or scripts to perform actions on the linedef.
+		
+		<h2>Sidedefs</h2>
+		Here you can change the properties for each side of the line. If you wish to add or remove a sidedef on the linedef, just check or uncheck the <b>Front Side</b> or <b>Back Side</b> box. In the <b>Sector Index</b> field you can type the sector index that you which this sidedef to be bound to. Note that you generally do not have to change this as Doom Builder will make valid sectors for you. Changing the Sector Index is only recommended for advanced users. On the right are the textures that are on the sidedef. Left-click on the box to browse for a texture using the <a href="w_imagesbrowser.html">Image Browser</a>, right-click on the box to clear the texture (making it a single dash). If you know the texture name, you can also type the name directly into the text field below the texture box.<br />
+		<br />
+		In UDMF format, you can click the <b>Custom Fields</b> buttons to change the custom fields for the sidedefs. See <a href="w_customfields.html">Custom Fields Editor</a> for more information.
+		
+		<h2>Custom</h2>
+		This tab allows you to edit the custom fields on the linedef. Only available in UDMF format. See <a href="w_customfields.html">Custom Fields Editor</a> for more information.
+	</p>
+	</div>
+</body>
diff --git a/Help/w_mainwindow.html b/Help/w_mainwindow.html
new file mode 100644
index 0000000..a5bee54
--- /dev/null
+++ b/Help/w_mainwindow.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>Main Window</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Main Window">
+	</object>
+	
+	<div id="title"><h1>Main Window</h1></div>
+	
+	<div id="contents">
+	<p>The main interface window consists of the following parts;</p>
+	<img src="w_mainwindow.png" />
+	<p>
+		<h3>Menus</h3>
+		The menus are very straight-forward and you'll find most common features in the usual places. File related actions in the File menu, view related actions in the View menu and editing related actions in the Edit menu.
+		
+		<h3>Toolbar</h3>
+		Your most needed actions and options are on the toolbar, right below the menu.
+		
+		<h3>Information panel</h3>
+		When highlighting or targeting a specific element in the working area, a small summary about that element is displayed in this panel. You can minimize the information panel by clicking on the little arrow button on the right to maximize your working area.
+		
+		<h3>Statusbar</h3>
+		Doom Builder shows you the current status in the statusbar. On the left is a small LED that turns green when Doom Builder is idle. When the LED turns yellow, it means Doom Builder is doing some background work. When the LED is red, then Doom Builder is busy performing an action. Right next to the status LED is a description of the current status. It also shows a result description and flashes the LED when performing and action.<br />
+		<br />
+		On the right of the statusbar are grid size (in mappixels), the zoom percentage and the current mouse coordinates. You can click the buttons next to the grid size and the zoom percentage to bring up a related menu that allows you to change any of these settings.
+	</p>
+	</div>
+</body>
diff --git a/Help/w_mainwindow.png b/Help/w_mainwindow.png
new file mode 100644
index 0000000..cecbf9d
Binary files /dev/null and b/Help/w_mainwindow.png differ
diff --git a/Help/w_mapoptions.html b/Help/w_mapoptions.html
new file mode 100644
index 0000000..6f7a13d
--- /dev/null
+++ b/Help/w_mapoptions.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>Map Options Window</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Map Options Window">
+	<param name="keyword" value="Map Name">
+	<param name="keyword" value="Level Name">
+	</object>
+	
+	<div id="title"><h1>Map Options Window</h1></div>
+	
+	<div id="contents">
+	<p>
+		This dialog window allows you to change some options that apply to the entire map and how it is loaded. You can access it from the Edit menu, or with the default key F2. At the top you can choose the <b>Game Configuration</b> that you wish to use when editing this map. Please note that changing to a configuration of a different file format may cause a loss of information in your map, possibly breaking it. Below the Game Configuration field is the <b>Level Name</b> field. Here you can enter the lump name that is used to store your map in the WAD file. An example level name for a Doom 1 map could be E2M3 which indicates the map is or episode 2, level 3. An example for a Doom 2 map is MAP03 which is level 3.
+		
+		<h2>Resources</h2>
+		The Resources area allows you to specify which resources are loaded when editing this map. The <b>Strictly load patches between P_START and P_END only for this file</b> checkbox applies to the wad file you are editing (where your map is in). When this is checked, Doom Builder will resolve texture patch conflicts by strictly loading patch lumps only from between the P_START and P_END lumps as it was intended by id Software, but most sourceports do not require this (as result, older maps have texture patch lumps that are not in between P_START and P_END).<br />
+		<br />
+		In the list of resources you can see all the resources that will be loaded. Doom Builder shows the items from the game configuration in gray at the top of the list, because those are always loaded first. You can change the resources loaded according to the game configuration in the <a href="w_gameconfigurations.html">Game Configurations Window</a>. You can drag the resource items (except the ones from the game configuration) to change their order. See also the <a href="w_resourceoptions.html">Resource Options Window</a>.
+	</p>
+	</div>
+</body>
diff --git a/Help/w_openmapoptions.html b/Help/w_openmapoptions.html
new file mode 100644
index 0000000..4c93e67
--- /dev/null
+++ b/Help/w_openmapoptions.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>Open Map Window</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Open Map Window">
+	</object>
+	
+	<div id="title"><h1>Open Map Window</h1></div>
+	
+	<div id="contents">
+	<p>
+		When opening a map from a WAD file, this is the dialog that lets you choose what level to open and what options to use. At the top you can choose the <b>Game Configuration</b> that you wish to use when editing this map. When you select the game configuration you need, Doom Builder will show you a list of maps from the WAD file that can be opened with the selected configuration. You must select a map from the list to open.
+		
+		<h2>Resources</h2>
+		The Resources area allows you to specify which resources are loaded when editing this map. The <b>Strictly load patches between P_START and P_END only for this file</b> checkbox applies to the wad file you are editing (where your map is in). When this is checked, Doom Builder will resolve texture patch conflicts by strictly loading patch lumps only from between the P_START and P_END lumps as it was intended by id Software, but most sourceports do not require this (as result, older maps have texture patch lumps that are not in between P_START and P_END).<br />
+		<br />
+		In the list of resources you can see all the resources that will be loaded. Doom Builder shows the items from the game configuration in gray at the top of the list, because those are always loaded first. You can change the resources loaded according to the game configuration in the <a href="w_gameconfigurations.html">Game Configuration Window</a>. You can drag the resource items (except the ones from the game configuration) to change their order. See also the <a href="w_resourceoptions.html">Resource Options Window</a>.
+	</p>
+	</div>
+</body>
diff --git a/Help/w_preferences.html b/Help/w_preferences.html
new file mode 100644
index 0000000..f333c4f
--- /dev/null
+++ b/Help/w_preferences.html
@@ -0,0 +1,87 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>Preferences Window</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" /></head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Preferences Window">
+	</object>
+	
+	<div id="title"><h1>Preferences Window</h1></div>
+	
+	<div id="contents">
+	<p>
+		The Preferences window provides options that apply to Doom Builder, regardless of the game configuration or map you choose to edit. You can access this window from the Tools menu, or with the default key F5. The options are categorized in different tabs;
+	  <h2>Interface</h2>
+		This tab contains some interface related options.
+		<h3>Default view:</h3>
+		This sets the default view mode that you wish to use when opening or creating a new map.
+		<h3>Preview image size:</h3>
+		The size of all preview images in the editor and in the <a href="w_imagesbrowser.html">Image Browser</a>. Smaller preview images consume less system memory.
+		<h3>Autoscroll speed:</h3>
+		During some actions, such as drawing and dragging, Doom Builder can automatically scroll the working area when you move your mouse towards the edges. Use this setting to set the scrolling speed to use. Drag the slider completely to the left to turn off automatic scrolling.
+      <h3>Vertex scale factor <span class="red">(GZDB only)</span>:</h3>
+        Controls the size of vertex handles in Classic and Visual modes.
+        <h3>Max. recent files <span class="red">(GZDB only)</span>:</h3>
+        Controls how many recent files are shown in the File menu.
+		<h3>Script Editor <b>always on top of main window</b>:</h3>
+		Check the box<strong> </strong>if you want the script editor to float above the <a href="w_mainwindow.html">Main Window</a> even when the script editor does not have the focus.
+        <h3><a href="gzdb/features/all_modes/synch_camera.html">Sync camera position between 2D and 3D modes</a> <span class="red">(GZDB only)</span>:</h3>
+        When enabled, GZDoom Builder will center 2D-mode on Visual Camera position when you leave Visual mode, and will place Visual Camera at cursor position when you toggle from 2D mode to Visual Mode (unless you have Visual Mode camera thing in your map).
+	    <h3>Visual Modes:</h3>
+		This area contains several settings for the <a href="e_visualmode.html">Visual Mode</a>. To improve performance, you may want to decrease the <b>View distance</b> setting.
+		
+	  <h2>Controls</h2>
+		This is where you configure your keyboard and mouse shortcut keys. On the left is a list of all <a href="actions.html">Actions</a> in Doom Builder with the current mouse or key combination shown next to them. Select an action to view a summary of this action on the right. Press any key combination to set to this action, or select a special mouse combination from the drop down box. Below that, you can see which other actions share the same key combination so that you can verify any conflicts it may have. Note that actions used in different editing modes can safely share the same key combination.
+		
+		<h2>Appearance</h2>
+		On this tab you can change some settings related to visual aesthetics. On the top and the left of this tab you can change colors that are used in the <a href="w_mainwindow.html">Working Area</a>
+		and set the font and other options regarding the <a href="w_scripteditor.html">Script Editor</a>.
+        
+        <h3>Passable lines transparency:</h3>
+		This controls how much translucent the passable lines are. 0% is completely opaque, which is the same as impassable lines. Passable or impassable can be set with a linedef setting, but is automatically set by the editor for singlesided lines and removed for doublesided lines.
+		<h3>Textures and Flats brightness:</h3>
+		With this setting you can increase the brightness of the textures and flats. This is useful when viewing the texture against a white background, or if you are using a dark monitor.
+        <h3>Maximum dynamic lights to render <span class="red">(GZDB only)</span>:</h3>
+		Lets you choose how many dynamic lights to render in Visual mode. Decrease this to improve performance when Dynamic Lights Rendering is on. Possible values are [1..32].
+        <h3>Dynamic light size <span class="red">(GZDB only)</span>:</h3>
+		This option mimics GZDoom's "light size" option.
+        <h3>Dynamic light intensity <span class="red">(GZDB only)</span>:</h3>
+		This option mimics GZDoom's "light intensity" option.
+        
+        <h3>Square things:</h3>
+		Things in Doom use a square shape for collision detection and you may want to turn this option on to get a better view on the bounding boxes of things in the classic Editing Modes (2D).
+        <h3>High quality display rendering:</h3>
+		This improves the display with the use of Pixel Shader Model 2.0. Also adds anti-aliasing to the classic Editing Modes (2D). Performance may be improved by turning off this setting (this also gives a more oldschool Doom Builder 1.68 look to the working area). When Pixel Shader Model 2.0 support is not available, Doom Builder automatically turns off this setting and disables this option.
+        <h3>Bilinear filtering in classic modes:</h3>
+		This enables bilinear texture filtering for all classic Editing Modes (2D). Bilinear texture filtering removes the large square blocks when zooming in, but can also make it look blurry.
+	  <h3>Bilinear filtering in visual modes:</h3>
+		This enables bilinear texture filtering for all visual Editing Modes (3D). Bilinear texture filtering removes the large square blocks when zooming in, but can also make it look blurry.
+        <h3>Load GZDoom light definitions <span class="red">(GZDB only)</span>:</h3>
+		When enabled, GZDoom's built-in GLDEFS dynamic light definitions will be loaded.<br />
+		<span class="red">Warning:</span> if a map is loaded, you'll need to reload resources after changing this option to apply the changes.
+        <h3>Scale models in visual modes <span class="red">(GZDB only)</span>:</h3>
+		When enabled, height of models will be scaled down by 15% in Visual mode to mimick GZDoom's way of rendering them.
+		<h3>Black background in image browser:</h3>
+		Turn this on to create a black background in the <a href="w_imagesbrowser.html">Image Browser</a>.
+        <h3>Always show selection in visual modes <span class="red">(GZDB only)</span>:</h3>
+		When enabled, selected surfaces will be highlighted in Visual mode even if "Show highlight" mode is disabled (Doom Builder 2 behaviour).
+        <h3>Mark 3D floors in classic modes <span class="red">(GZDB only)</span>:</h3>
+		When enabled, linedefs of sectors with 3D floors will be marked using "3D Floors" color.
+        
+        <h2>Appearance</h2>
+        <h3>Default sector settings <span class="red">(GZDB only)</span>:</h3>
+		Allows you to modify setting used when drawing a new sector. These settings can be overriden using <a href="gzdb/features/classic_modes/drawsettingspanel.html">Draw Settings Panel</a>.
+        <h3>Auto-align textures on newly created linedefs <span class="red">(GZDB only)</span>:</h3>
+        When enabled, auto texture alignment will be applied to sidedefs created after drawing deometry.
+        <h3>Don't move selection if any part of it is outside of map boundary <span class="red">(GZDB only)</span>:</h3>
+        When enabled, geometry outisde of map boundaries can not be dragged. When disabled, geometry will be moved inside of map boundary, most likely destroying sector shapes in the process (Doom Builder 2 behaviour).
+        <h3><a href="gzdb/features/all_modes/synch_selection.html">Synchronise selection between Visual and Classic modes</a> <span class="red">(GZDB only)</span></h3>
+	</p>
+	</div>
+</body>
diff --git a/Help/w_resourceoptions.html b/Help/w_resourceoptions.html
new file mode 100644
index 0000000..233c407
--- /dev/null
+++ b/Help/w_resourceoptions.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>Resource Options Window</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Resource Options Window">
+	<param name="keyword" value="WAD File Resource">
+	<param name="keyword" value="PK3 File Resource">
+	<param name="keyword" value="Directory Resource">
+	</object>
+	
+	<div id="title"><h1>Resource Options Window</h1></div>
+	
+	<div id="contents">
+	<p>
+		Use this dialog window to browse for a resource and change any options on how to use the resource. Doom Builder supports 3 types of resources;
+		
+		<h2>WAD File</h2>
+		This is the most common resource known with Doom. You can find more information about the WAD format on the <a href="http://doom.wikia.com/wiki/WAD" target="_blank">Doom Wiki</a>. When the <b>Strictly load patches between P_START and P_END only for this file</b> checkbox is checked, Doom Builder will resolve texture patch conflicts by strictly loading patch lumps only from between the P_START and P_END lumps in this WAD file as it was intended by id Software, but most sourceports do not require this (as result, older maps have texture patch lumps that are not in between P_START and P_END).<br />
+		
+		<h2>Directory</h2>
+		Doom Builder can load resources from a directory in different ways. The directory is expected to use the PK3 directory structure (for more information see the <a href="http://www.zdoom.org/wiki/Using_ZIPs_as_WAD_replacement" target="_blank">ZDoom Wiki</a>) but you can use it to simply load images from the directory root as textures or flats by turning on the options <b>Load images in directory root as textures/flats</b>.
+		
+		<h2>PK3 File</h2>
+		The PK3 file is a zipped directory structure and can be used as WAD file replacement by several sourceports. For more information see the <a href="http://www.zdoom.org/wiki/Using_ZIPs_as_WAD_replacement" target="_blank">ZDoom Wiki</a>.
+		
+	</p>
+	</div>
+</body>
diff --git a/Help/w_scripteditor.html b/Help/w_scripteditor.html
new file mode 100644
index 0000000..2183e4a
--- /dev/null
+++ b/Help/w_scripteditor.html
@@ -0,0 +1,51 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>Script Editor Window</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Script Editor Window">
+	</object>
+	
+	<div id="title"><h1>Script Editor Window</h1></div>
+	
+	<div id="contents">
+	<p>The script editor is a powerful text editor with syntax highlighting and autocomplete. It allows you to open and edit multiple documents at the same time, even if they do not reside in your map.</p>
+	<img src="w_scripteditor.png" />
+	<p>
+		Each opened script has its own tab page. When there are text lumps in the map format (such as the SCRIPTS lump in Hexen formats), they will be opened automatically and cannot be closed.
+		<h2>Shortcut Keys</h2>
+		<table border="0" cellspacing="6" width="90%">
+		<tr>
+			<td width="50" valign="top"><b>CTRL+O</b></td>
+			<td>Browse for a script file to open.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>CTRL+S</b></td>
+			<td>Save the current script to file. This does not work for internal script lumps, save the map to save the internal script lumps.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>CTRL+Space</b></td>
+			<td>Autocompletes the current word. If there is more than one possibility, it will pop up a list of keywords to choose from.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>CTRL+F</b></td>
+			<td>Opens the Find and Replace dialog window.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>F3</b></td>
+			<td>Finds the next occurence of the most recent search with the Find and Replace dialog window.</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>F2</b></td>
+			<td>If supported for the type of script you are editing, this opens a website with information about the current keyword that your cursor is at.</td>
+		</tr>
+	</p>
+	</div>
+</body>
diff --git a/Help/w_scripteditor.png b/Help/w_scripteditor.png
new file mode 100644
index 0000000..440d8d6
Binary files /dev/null and b/Help/w_scripteditor.png differ
diff --git a/Help/w_sectoredit.html b/Help/w_sectoredit.html
new file mode 100644
index 0000000..4c2d74e
--- /dev/null
+++ b/Help/w_sectoredit.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>Sector Properties Window</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Sector Properties Window">
+	<param name="keyword" value="Floor Texture">
+	<param name="keyword" value="Ceiling Texture">
+	<param name="keyword" value="Floor Height">
+	<param name="keyword" value="Ceiling Height">
+	<param name="keyword" value="Flat">
+	<param name="keyword" value="Brightness">
+	<param name="keyword" value="Tag">
+	</object>
+	
+	<div id="title"><h1>Sector Properties Window</h1></div>
+	
+	<div id="contents">
+	<p>
+		On this dialog you can change all the sector properties. When a selection of multiple sectors is made, some fields may appear grayed or empty in case they are different for some of the selected elements. Setting a value in grayed or empty field will apply this to the entire selection.
+		
+		<h2>Properties</h2>
+		You can manually set the <b>Ceiling height</b> and <b>Floor height</b> at the top of this window. On the right are the flats (textures) that are on the floor and ceiling. Left-click on the box to browse for a flat using the <a href="w_imagesbrowser.html">Image Browser</a>. If you know the flat name, you can also type the name directly into the text field below the flat box.<br />
+		<br />
+		In the <b>Effects</b> area you can set a special effect for the sector and set the <b>Brightness</b> level to use.<br />
+		<br />
+		Below that you can enter a tag number to identify the sector. This number can then be used by Linedef actions or scripts to perform actions on the sector.
+		
+		<h2>Custom</h2>
+		This tab allows you to edit the custom fields on the sector. Only available in UDMF format. See <a href="w_customfields.html">Custom Fields Editor</a> for more information.
+	</p>
+	</div>
+</body>
diff --git a/Help/w_textureset.html b/Help/w_textureset.html
new file mode 100644
index 0000000..48d4dea
--- /dev/null
+++ b/Help/w_textureset.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>Texture Set Window</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Texture Set Window">
+	</object>
+	
+	<div id="title"><h1>Texture Set Window</h1></div>
+	
+	<div id="contents">
+	<p>
+		This dialog window lets you make your own Texture Set. On the top of this window you can enter the name of the Texture Set, this is how it will be displayed in the <a href="w_gameconfigurations.html">Game Configurations Window</a> and the <a href="w_imagesbrowser.html">Image Browser Window</a>. It is recommended that you make your Texture Sets while the map you are editing is open in Doom Builder, so that you can see the results immediately.
+		
+		<h2>Filters</h2>
+		In this area you set up what you want to include in this Texture Set. You can use wildcards to include more than one texture at once. Use the question mark <b>?</b> to indicate exactly one character (no matter which character) and use the asterisk <b>*</b> to indicate zero or more characters (no matter which characters). Each Texture Set has its own filters, so it is possible for Texture Sets to overlap and include textures that are also in other Texture Sets.
+		
+		<h2>Results</h2>
+		If you have a map open in Doom Builder while you are setting up your Texture Sets, you can instantly see the result in the Results area. By clicking the buttons <b>Show Matches</b> and <b>Show Not Matching</b> you can see which textures are included and which are not. When viewing the texture that are <b>not</b> included, you can double-click the texture image to add it to the filters list and include it in the Texture Set.
+	</p>
+	</div>
+</body>
diff --git a/Help/w_thingedit.html b/Help/w_thingedit.html
new file mode 100644
index 0000000..0fac378
--- /dev/null
+++ b/Help/w_thingedit.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>Thing Properties Window</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Thing Properties Window">
+	<param name="keyword" value="Action">
+	<param name="keyword" value="Tag">
+	</object>
+	
+	<div id="title"><h1>Thing Properties Window</h1></div>
+	
+	<div id="contents">
+	<p>
+		This dialog allows you to edit all the thing properties. When a selection of multiple things is made, some fields may appear grayed or empty in case they are different for some of the selected elements. Setting a value in grayed or empty field will apply this to the entire selection.
+		
+		<h2>Properties</h2>
+		On the left of this tab you can select the <b>Thing Type</b>. Either select it from the list or enter the type number in the field below the list. If it is a thing type that is in the Game Configuration, the information known about that thing type is displayed as well.<br />
+		<br />
+		On the right you can change the <b>Settings</b> for the thing. The settings available depend on the Game Configuration you are using. Below that you can change the <b>Angle</b>. In Hexen and UDMF formats, you can also specify the <b>Z height</b> of the thing. The Z height is usually relative to the sector floor, but for some things the Z height is absolute (refer to the sourceport documentation).
+
+		<h2>Action</h2>
+		This tab is only available in Hexen and UDMF formats. You can set the thing <b>Tag</b> that is used to refer to this thing. Below that is the <b>Action</b> area, which allows you to set a special action that is executed by the thing (for monsters this is usually when it dies). Please note that some things use the action arguments for their own properties and that setting an action on those things may give an unexpected result (refer to the sourceport documentation).
+		
+		<h2>Custom</h2>
+		This tab allows you to edit the custom fields on the thing. Only available in UDMF format. See <a href="w_customfields.html">Custom Fields Editor</a> for more information.
+	</p>
+	</div>
+</body>
diff --git a/Help/w_thingsfilters.html b/Help/w_thingsfilters.html
new file mode 100644
index 0000000..ef081e4
--- /dev/null
+++ b/Help/w_thingsfilters.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>Things Filters Window</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Things Filters Window">
+	</object>
+	
+	<div id="title"><h1>Things Filters Window</h1></div>
+	
+	<div id="contents">
+	<p>
+		With the Things Filters dialog window, you can set up your own Things filters that you can use to show only relevant things in the editor. You can access this dialog from the View menu. Select a filter on the left to edit it, or click on <b>New Filter</b> to create a new one. You can remove the selected filter by clicking on the <b>Delete Selected</b> button. On the right is the <b>Filter Settings</b> are where you can edit the selected filter.<br />
+		<br />
+		Enter the name of your filter in the <b>Name</b> field. If you want to show only Things from a specific category, select the category in the <b>Filter by category</b> box. Below that you can select the settings by which you want to filter the Things (<b>Filter by settings)</b>. A grayed/filled checkbox means it is not used for the filter. If the checkbox is empty, it means that the setting may not be set on the Things to pass the filter. If the checkbox is checked, it means that the setting must be set on the Things to pass the filter.<br />
+		<br />
+		Things Filters are stored separately for each Game Configuration.
+	</p>
+	</div>
+</body>
diff --git a/Help/w_vertexedit.html b/Help/w_vertexedit.html
new file mode 100644
index 0000000..23dce1f
--- /dev/null
+++ b/Help/w_vertexedit.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+	
+	<title>Vertex Properties Window</title>
+	
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<link rel="stylesheet" type="text/css" href="default.css" media="screen" title="Default" />
+</head>
+<body>
+	
+	<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+	<param name="keyword" value="Vertex Properties Window">
+	<param name="keyword" value="Vertex Coordinates">
+	</object>
+	
+	<div id="title"><h1>Vertex Properties Window</h1></div>
+	
+	<div id="contents">
+	<p>
+		This dialog allows you to edit the exact vertex coordinates. When a selection of multiple vertices is made, some fields may appear grayed or empty in case they are different for some of the selected elements. Setting a value in grayed or empty field will apply this to the entire selection.
+		
+		<h2>Custom</h2>
+		This tab allows you to edit the custom fields on the vertex. Only available in UDMF format. See <a href="w_customfields.html">Custom Fields Editor</a> for more information.
+	</p>
+	</div>
+</body>
diff --git a/MakeRelease.bat b/MakeRelease.bat
new file mode 100644
index 0000000..1a041ce
--- /dev/null
+++ b/MakeRelease.bat
@@ -0,0 +1,201 @@
+@ECHO OFF
+
+ECHO.
+ECHO.     This build script requires the following software to be installed:
+ECHO.       - Subversion command-line client
+ECHO.       - Microsoft Visual Studio 2008
+ECHO.       - Microsoft HTML Help compiler
+ECHO.       - Inno Setup 5
+ECHO.
+ECHO.     You have to commit your work before using this script.
+ECHO.     Results will be in the 'Release' directory. Anything currently in
+ECHO.     the 'Release' directory may be overwritten.
+ECHO.
+ECHO.
+
+SET STUDIODIR=c:\Program Files (x86)\Microsoft Visual Studio 9.0
+SET HHWDIR=c:\Program Files (x86)\HTML Help Workshop
+SET ISSDIR=c:\Program Files (x86)\Inno Setup 5
+
+CALL "%STUDIODIR%\Common7\Tools\vsvars32.bat"
+
+MKDIR "Release"
+
+svn revert "Source\Core\Properties\AssemblyInfo.cs" > NUL
+svn revert "Source\Plugins\BuilderModes\Properties\AssemblyInfo.cs" > NUL
+
+ECHO.
+ECHO Writing SVN log file...
+ECHO.
+IF EXIST "Release\Changelog.xml" DEL /F /Q "Release\Changelog.xml" > NUL
+svn log --xml -r HEAD:1496 > "Release\Changelog.xml"
+IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL
+IF NOT EXIST "Release\Changelog.xml" GOTO FILEFAIL
+
+ECHO.
+ECHO Compiling HTML Help file...
+ECHO.
+IF EXIST "Build\Refmanual.chm" DEL /F /Q "Build\Refmanual.chm" > NUL
+"%HHWDIR%\hhc" Help\Refmanual.hhp
+IF %ERRORLEVEL% NEQ 1 GOTO ERRORFAIL
+IF NOT EXIST "Build\Refmanual.chm" GOTO FILEFAIL
+
+ECHO.
+ECHO Looking up current repository revision numbers...
+ECHO.
+IF EXIST "setenv.bat" DEL /F /Q "setenv.bat" > NUL
+VersionFromSVN.exe "Source\Core\Properties\AssemblyInfo.cs" "Source\Plugins\BuilderModes\Properties\AssemblyInfo.cs" -O "setenv.bat"
+IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL
+IF NOT EXIST "setenv.bat" GOTO FILEFAIL
+
+CALL "setenv.bat"
+DEL /F /Q "setenv.bat"
+
+ECHO.
+ECHO Compiling GZDoom Builder core...
+ECHO.
+IF EXIST "Build\Builder.exe" DEL /F /Q "Build\Builder.exe" > NUL
+IF EXIST "Source\Core\obj" RD /S /Q "Source\Core\obj"
+msbuild "Source\Core\Builder.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal
+IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL
+IF NOT EXIST "Build\Builder.exe" GOTO FILEFAIL
+
+ECHO.
+ECHO Compiling Builder Effects plugin...
+ECHO.
+IF EXIST "Build\Plugins\BuilderEffects.dll" DEL /F /Q "Build\Plugins\BuilderEffects.dll" > NUL
+IF EXIST "Source\Plugins\BuilderEffects\obj" RD /S /Q "Source\Plugins\BuilderEffects\obj"
+msbuild "Source\Plugins\BuilderEffects\BuilderEffects.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal
+IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL
+IF NOT EXIST "Build\Plugins\BuilderEffects.dll" GOTO FILEFAIL
+
+ECHO.
+ECHO Compiling Builder Modes plugin...
+ECHO.
+IF EXIST "Build\Plugins\BuilderModes.dll" DEL /F /Q "Build\Plugins\BuilderModes.dll" > NUL
+IF EXIST "Source\Plugins\BuilderModes\obj" RD /S /Q "Source\Plugins\BuilderModes\obj"
+msbuild "Source\Plugins\BuilderModes\BuilderModes.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal
+IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL
+IF NOT EXIST "Build\Plugins\BuilderModes.dll" GOTO FILEFAIL
+
+ECHO.
+ECHO Compiling Color Picker plugin...
+ECHO.
+IF EXIST "Build\Plugins\ColorPicker.dll" DEL /F /Q "Build\Plugins\ColorPicker.dll" > NUL
+IF EXIST "Source\Plugins\ColorPicker\obj" RD /S /Q "Source\Plugins\ColorPicker\obj"
+msbuild "Source\Plugins\ColorPicker\ColorPicker.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal
+IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL
+IF NOT EXIST "Build\Plugins\ColorPicker.dll" GOTO FILEFAIL
+
+ECHO.
+ECHO Compiling Comments Panel plugin...
+ECHO.
+IF EXIST "Build\Plugins\CommentsPanel.dll" DEL /F /Q "Build\Plugins\CommentsPanel.dll" > NUL
+IF EXIST "Source\Plugins\CommentsPanel\obj" RD /S /Q "Source\Plugins\CommentsPanel\obj"
+msbuild "Source\Plugins\CommentsPanel\CommentsPanel.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal
+IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL
+IF NOT EXIST "Build\Plugins\CommentsPanel.dll" GOTO FILEFAIL
+
+ECHO.
+ECHO Compiling Nodes Viewer plugin...
+ECHO.
+IF EXIST "Build\Plugins\NodesViewer.dll" DEL /F /Q "Build\Plugins\NodesViewer.dll" > NUL
+IF EXIST "Source\Plugins\NodesViewer\obj" RD /S /Q "Source\Plugins\NodesViewer\obj"
+msbuild "Source\Plugins\NodesViewer\NodesViewer.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal
+IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL
+IF NOT EXIST "Build\Plugins\NodesViewer.dll" GOTO FILEFAIL
+
+ECHO.
+ECHO Compiling Sound Propagation Mode plugin...
+ECHO.
+IF EXIST "Build\Plugins\SoundPropagationMode.dll" DEL /F /Q "Build\Plugins\SoundPropagationMode.dll" > NUL
+IF EXIST "Source\Plugins\SoundPropagationMode\obj" RD /S /Q "Source\Plugins\SoundPropagationMode\obj"
+msbuild "Source\Plugins\SoundPropagationMode\SoundPropagation.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal
+IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL
+IF NOT EXIST "Build\Plugins\SoundPropagationMode.dll" GOTO FILEFAIL
+
+ECHO.
+ECHO Compiling Stair Sector Builder plugin...
+ECHO.
+IF EXIST "Build\Plugins\StairSectorBuilder.dll" DEL /F /Q "Build\Plugins\StairSectorBuilder.dll" > NUL
+IF EXIST "Source\Plugins\StairSectorBuilder\obj" RD /S /Q "Source\Plugins\StairSectorBuilder\obj"
+msbuild "Source\Plugins\StairSectorBuilder\StairSectorBuilder.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal
+IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL
+IF NOT EXIST "Build\Plugins\StairSectorBuilder.dll" GOTO FILEFAIL
+
+ECHO.
+ECHO Compiling Tag Explorer plugin...
+ECHO.
+IF EXIST "Build\Plugins\TagExplorer.dll" DEL /F /Q "Build\Plugins\TagExplorer.dll" > NUL
+IF EXIST "Source\Plugins\TagExplorer\obj" RD /S /Q "Source\Plugins\TagExplorer\obj"
+msbuild "Source\Plugins\TagExplorer\TagExplorer.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal
+IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL
+IF NOT EXIST "Build\Plugins\TagExplorer.dll" GOTO FILEFAIL
+
+ECHO.
+ECHO Compiling Tag Range plugin...
+ECHO.
+IF EXIST "Build\Plugins\TagRange.dll" DEL /F /Q "Build\Plugins\TagRange.dll" > NUL
+IF EXIST "Source\Plugins\TagRange\obj" RD /S /Q "Source\Plugins\TagRange\obj"
+msbuild "Source\Plugins\TagRange\TagRange.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal
+IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL
+IF NOT EXIST "Build\Plugins\TagRange.dll" GOTO FILEFAIL
+
+ECHO.
+ECHO Compiling Visplane Explorer plugin...
+ECHO.
+IF EXIST "Build\Plugins\VisplaneExplorer.dll" DEL /F /Q "Build\Plugins\VisplaneExplorer.dll" > NUL
+IF EXIST "Source\Plugins\VisplaneExplorer\obj" RD /S /Q "Source\Plugins\VisplaneExplorer\obj"
+msbuild "Source\Plugins\VisplaneExplorer\VisplaneExplorer.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal
+IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL
+IF NOT EXIST "Build\Plugins\VisplaneExplorer.dll" GOTO FILEFAIL
+
+ECHO.
+ECHO Creating changelog...
+ECHO.
+ChangelogMaker.exe "SVN_Build\Changelog.xml" "Build" "m-x-d"
+IF %ERRORLEVEL% NEQ 0 GOTO LOGFAIL
+
+ECHO.
+ECHO Building Setup Installer...
+ECHO.
+IF EXIST "Release\*.exe" DEL /F /Q "Release\*.exe" > NUL
+"%ISSDIR%\iscc.exe" "Setup\gzbuilder_setup.iss"
+IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL
+IF NOT EXIST "Release\GZDoom Builder Setup.exe" GOTO FILEFAIL
+
+REN "Release\GZDoom Builder Setup.exe" "GZDoom Builder R%REVISIONNUMBER% Setup.exe"
+
+svn revert "Source\Core\Properties\AssemblyInfo.cs" > NUL
+svn revert "Source\Plugins\BuilderModes\Properties\AssemblyInfo.cs" > NUL
+
+ECHO.
+ECHO.     BUILD DONE !
+ECHO.
+ECHO.     Revision:  %REVISIONNUMBER%
+ECHO.
+PAUSE > NUL
+GOTO LEAVE
+
+:ERRORFAIL
+ECHO.
+ECHO.     BUILD FAILED (Tool returned error  %ERRORLEVEL%)
+ECHO.
+PAUSE > NUL
+GOTO LEAVE
+
+:FILEFAIL
+ECHO.
+ECHO.     BUILD FAILED (Output file was not built)
+ECHO.
+PAUSE > NUL
+GOTO LEAVE
+
+:LOGFAIL
+ECHO.
+ECHO.     CHANGELOG GENERATION FAILED (Tool returned error %ERRORLEVEL%)
+ECHO.
+PAUSE > NUL
+GOTO LEAVE
+
+:LEAVE
diff --git a/MakeSVNRelease.bat b/MakeSVNRelease.bat
new file mode 100644
index 0000000..e678b7f
--- /dev/null
+++ b/MakeSVNRelease.bat
@@ -0,0 +1,211 @@
+@ECHO OFF
+
+ECHO.
+ECHO.     This build script requires the following software to be installed:
+ECHO.       - Subversion command-line client
+ECHO.       - Microsoft Visual Studio 2008
+ECHO.       - Microsoft HTML Help compiler
+ECHO.       - 7zip
+ECHO.
+ECHO.     You have to commit your work before using this script.
+ECHO.     Results will be in the 'SVN_Build' directory. Files in
+ECHO.     the 'SVN_Build' directory may be overwritten.
+ECHO.
+ECHO.
+
+SET STUDIODIR=c:\Program Files (x86)\Microsoft Visual Studio 9.0
+SET HHWDIR=c:\Program Files (x86)\HTML Help Workshop
+SET SEVENZIPDIR=c:\Program Files (x86)\7-Zip
+
+CALL "%STUDIODIR%\Common7\Tools\vsvars32.bat"
+
+MKDIR "SVN_Build"
+
+svn revert "Source\Core\Properties\AssemblyInfo.cs" > NUL
+svn revert "Source\Plugins\BuilderModes\Properties\AssemblyInfo.cs" > NUL
+
+ECHO.
+ECHO Writing SVN log file...
+ECHO.
+IF EXIST "SVN_Build\Changelog.xml" DEL /F /Q "SVN_Build\Changelog.xml" > NUL
+svn log --xml -r HEAD:1496 > "SVN_Build\Changelog.xml"
+IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL
+IF NOT EXIST "SVN_Build\Changelog.xml" GOTO FILEFAIL
+
+ECHO.
+ECHO Compiling HTML Help file...
+ECHO.
+IF EXIST "Build\Refmanual.chm" DEL /F /Q "Build\Refmanual.chm" > NUL
+"%HHWDIR%\hhc" Help\Refmanual.hhp
+IF %ERRORLEVEL% NEQ 1 GOTO ERRORFAIL
+IF NOT EXIST "Build\Refmanual.chm" GOTO FILEFAIL
+
+ECHO.
+ECHO Looking up current repository revision numbers...
+ECHO.
+IF EXIST "setenv.bat" DEL /F /Q "setenv.bat" > NUL
+VersionFromSVN.exe "Source\Core\Properties\AssemblyInfo.cs" "Source\Plugins\BuilderModes\Properties\AssemblyInfo.cs" -O "setenv.bat"
+IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL
+IF NOT EXIST "setenv.bat" GOTO FILEFAIL
+
+CALL "setenv.bat"
+DEL /F /Q "setenv.bat"
+
+ECHO.
+ECHO Compiling GZDoom Builder core...
+ECHO.
+IF EXIST "Build\Builder.exe" DEL /F /Q "Build\Builder.exe" > NUL
+IF EXIST "Source\Core\obj" RD /S /Q "Source\Core\obj"
+msbuild "Source\Core\Builder.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal
+IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL
+IF NOT EXIST "Build\Builder.exe" GOTO FILEFAIL
+
+ECHO.
+ECHO Compiling Builder Effects plugin...
+ECHO.
+IF EXIST "Build\Plugins\BuilderEffects.dll" DEL /F /Q "Build\Plugins\BuilderEffects.dll" > NUL
+IF EXIST "Source\Plugins\BuilderEffects\obj" RD /S /Q "Source\Plugins\BuilderEffects\obj"
+msbuild "Source\Plugins\BuilderEffects\BuilderEffects.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal
+IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL
+IF NOT EXIST "Build\Plugins\BuilderEffects.dll" GOTO FILEFAIL
+
+ECHO.
+ECHO Compiling Builder Modes plugin...
+ECHO.
+IF EXIST "Build\Plugins\BuilderModes.dll" DEL /F /Q "Build\Plugins\BuilderModes.dll" > NUL
+IF EXIST "Source\Plugins\BuilderModes\obj" RD /S /Q "Source\Plugins\BuilderModes\obj"
+msbuild "Source\Plugins\BuilderModes\BuilderModes.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal
+IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL
+IF NOT EXIST "Build\Plugins\BuilderModes.dll" GOTO FILEFAIL
+
+ECHO.
+ECHO Compiling Color Picker plugin...
+ECHO.
+IF EXIST "Build\Plugins\ColorPicker.dll" DEL /F /Q "Build\Plugins\ColorPicker.dll" > NUL
+IF EXIST "Source\Plugins\ColorPicker\obj" RD /S /Q "Source\Plugins\ColorPicker\obj"
+msbuild "Source\Plugins\ColorPicker\ColorPicker.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal
+IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL
+IF NOT EXIST "Build\Plugins\ColorPicker.dll" GOTO FILEFAIL
+
+ECHO.
+ECHO Compiling Comments Panel plugin...
+ECHO.
+IF EXIST "Build\Plugins\CommentsPanel.dll" DEL /F /Q "Build\Plugins\CommentsPanel.dll" > NUL
+IF EXIST "Source\Plugins\CommentsPanel\obj" RD /S /Q "Source\Plugins\CommentsPanel\obj"
+msbuild "Source\Plugins\CommentsPanel\CommentsPanel.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal
+IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL
+IF NOT EXIST "Build\Plugins\CommentsPanel.dll" GOTO FILEFAIL
+
+ECHO.
+ECHO Compiling Nodes Viewer plugin...
+ECHO.
+IF EXIST "Build\Plugins\NodesViewer.dll" DEL /F /Q "Build\Plugins\NodesViewer.dll" > NUL
+IF EXIST "Source\Plugins\NodesViewer\obj" RD /S /Q "Source\Plugins\NodesViewer\obj"
+msbuild "Source\Plugins\NodesViewer\NodesViewer.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal
+IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL
+IF NOT EXIST "Build\Plugins\NodesViewer.dll" GOTO FILEFAIL
+
+ECHO.
+ECHO Compiling Sound Propagation Mode plugin...
+ECHO.
+IF EXIST "Build\Plugins\SoundPropagationMode.dll" DEL /F /Q "Build\Plugins\SoundPropagationMode.dll" > NUL
+IF EXIST "Source\Plugins\SoundPropagationMode\obj" RD /S /Q "Source\Plugins\SoundPropagationMode\obj"
+msbuild "Source\Plugins\SoundPropagationMode\SoundPropagation.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal
+IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL
+IF NOT EXIST "Build\Plugins\SoundPropagationMode.dll" GOTO FILEFAIL
+
+ECHO.
+ECHO Compiling Stair Sector Builder plugin...
+ECHO.
+IF EXIST "Build\Plugins\StairSectorBuilder.dll" DEL /F /Q "Build\Plugins\StairSectorBuilder.dll" > NUL
+IF EXIST "Source\Plugins\StairSectorBuilder\obj" RD /S /Q "Source\Plugins\StairSectorBuilder\obj"
+msbuild "Source\Plugins\StairSectorBuilder\StairSectorBuilder.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal
+IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL
+IF NOT EXIST "Build\Plugins\StairSectorBuilder.dll" GOTO FILEFAIL
+
+ECHO.
+ECHO Compiling Tag Explorer plugin...
+ECHO.
+IF EXIST "Build\Plugins\TagExplorer.dll" DEL /F /Q "Build\Plugins\TagExplorer.dll" > NUL
+IF EXIST "Source\Plugins\TagExplorer\obj" RD /S /Q "Source\Plugins\TagExplorer\obj"
+msbuild "Source\Plugins\TagExplorer\TagExplorer.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal
+IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL
+IF NOT EXIST "Build\Plugins\TagExplorer.dll" GOTO FILEFAIL
+
+ECHO.
+ECHO Compiling Tag Range plugin...
+ECHO.
+IF EXIST "Build\Plugins\TagRange.dll" DEL /F /Q "Build\Plugins\TagRange.dll" > NUL
+IF EXIST "Source\Plugins\TagRange\obj" RD /S /Q "Source\Plugins\TagRange\obj"
+msbuild "Source\Plugins\TagRange\TagRange.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal
+IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL
+IF NOT EXIST "Build\Plugins\TagRange.dll" GOTO FILEFAIL
+
+ECHO.
+ECHO Compiling Visplane Explorer plugin...
+ECHO.
+IF EXIST "Build\Plugins\VisplaneExplorer.dll" DEL /F /Q "Build\Plugins\VisplaneExplorer.dll" > NUL
+IF EXIST "Source\Plugins\VisplaneExplorer\obj" RD /S /Q "Source\Plugins\VisplaneExplorer\obj"
+msbuild "Source\Plugins\VisplaneExplorer\VisplaneExplorer.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal
+IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL
+IF NOT EXIST "Build\Plugins\VisplaneExplorer.dll" GOTO FILEFAIL
+
+ECHO.
+ECHO Creating changelog...
+ECHO.
+ChangelogMaker.exe "SVN_Build\Changelog.xml" "Build" "m-x-d"
+IF %ERRORLEVEL% NEQ 0 GOTO LOGFAIL
+
+ECHO.
+ECHO Packing release...
+ECHO.
+IF EXIST "SVN_Build\*.7z" DEL /F /Q "SVN_Build\*.7z" > NUL
+"%SEVENZIPDIR%\7z" a .\SVN_Build\gzdb.7z .\Build\* -xr!*.xml -xr!JetBrains.Profiler.Core.Api.dll -x!Setup
+IF %ERRORLEVEL% NEQ 0 GOTO PACKFAIL
+IF NOT EXIST .\SVN_Build\gzdb.7z GOTO FILEFAIL
+
+REN "SVN_Build\gzdb.7z" GZDoom_Builder-r%REVISIONNUMBER%.7z
+IF EXIST "Build\Changelog.txt" DEL /F /Q "Build\Changelog.txt" > NUL
+
+@ECHO %REVISIONNUMBER%> .\SVN_Build\Version.txt
+
+svn revert "Source\Core\Properties\AssemblyInfo.cs" > NUL
+svn revert "Source\Plugins\BuilderModes\Properties\AssemblyInfo.cs" > NUL
+
+ECHO.
+ECHO.     BUILD DONE !
+ECHO.
+ECHO.     Revision:  %REVISIONNUMBER%
+ECHO.
+PAUSE > NUL
+GOTO LEAVE
+
+:ERRORFAIL
+ECHO.
+ECHO.     BUILD FAILED (Tool returned error %ERRORLEVEL%)
+ECHO.
+PAUSE > NUL
+GOTO LEAVE
+
+:PACKFAIL
+ECHO.
+ECHO.     PACKAGING FAILED (7zip returned error %ERRORLEVEL%)
+ECHO.
+PAUSE > NUL
+GOTO LEAVE
+
+:FILEFAIL
+ECHO.
+ECHO.     BUILD FAILED (Output file was not built)
+ECHO.
+PAUSE > NUL
+GOTO LEAVE
+
+:LOGFAIL
+ECHO.
+ECHO.     CHANGELOG GENERATION FAILED (Tool returned error %ERRORLEVEL%)
+ECHO.
+PAUSE > NUL
+GOTO LEAVE
+
+:LEAVE
diff --git a/Resources/BitmapFont/BitmapFont.vbp b/Resources/BitmapFont/BitmapFont.vbp
new file mode 100644
index 0000000..6456d8c
--- /dev/null
+++ b/Resources/BitmapFont/BitmapFont.vbp
@@ -0,0 +1,36 @@
+Type=Exe
+Reference=*\G{420B2830-E718-11CF-893D-00A0C9054228}#1.0#0#C:\WINDOWS\system32\scrrun.dll#Microsoft Scripting Runtime
+Form=Form1.frm
+Class=clsConfiguration; clsConfiguration.cls
+IconForm="frmChars"
+Startup="frmChars"
+HelpFile=""
+Title="BitmapFont"
+Command32=""
+Name="BitmapFont"
+HelpContextID="0"
+CompatibleMode="0"
+MajorVer=1
+MinorVer=0
+RevisionVer=0
+AutoIncrementVer=0
+ServerSupportFiles=0
+VersionCompanyName="XODE Multimedia"
+CompilationType=0
+OptimizationType=0
+FavorPentiumPro(tm)=0
+CodeViewDebugInfo=0
+NoAliasing=0
+BoundsCheck=0
+OverflowCheck=0
+FlPointCheck=0
+FDIVCheck=0
+UnroundedFP=0
+StartMode=0
+Unattended=0
+Retained=0
+ThreadPerObject=0
+MaxNumberOfThreads=1
+
+[MS Transaction Server]
+AutoRefresh=1
diff --git a/Resources/BitmapFont/BitmapFont.vbw b/Resources/BitmapFont/BitmapFont.vbw
new file mode 100644
index 0000000..4f13912
--- /dev/null
+++ b/Resources/BitmapFont/BitmapFont.vbw
@@ -0,0 +1,2 @@
+frmChars = -4, 118, 902, 640, C, 65, 69, 690, 511, C
+clsConfiguration = 66, 66, 676, 562, C
diff --git a/Resources/BitmapFont/Form1.frm b/Resources/BitmapFont/Form1.frm
new file mode 100644
index 0000000..21bf724
--- /dev/null
+++ b/Resources/BitmapFont/Form1.frm
@@ -0,0 +1,193 @@
+VERSION 5.00
+Begin VB.Form frmChars 
+   BorderStyle     =   1  'Fixed Single
+   Caption         =   "Bitmap Font Generator"
+   ClientHeight    =   8910
+   ClientLeft      =   45
+   ClientTop       =   330
+   ClientWidth     =   8715
+   ClipControls    =   0   'False
+   BeginProperty Font 
+      Name            =   "Arial"
+      Size            =   8.25
+      Charset         =   0
+      Weight          =   400
+      Underline       =   0   'False
+      Italic          =   0   'False
+      Strikethrough   =   0   'False
+   EndProperty
+   Icon            =   "Form1.frx":0000
+   MaxButton       =   0   'False
+   MinButton       =   0   'False
+   ScaleHeight     =   594
+   ScaleMode       =   3  'Pixel
+   ScaleWidth      =   581
+   StartUpPosition =   3  'Windows Default
+   Begin VB.PictureBox picChar 
+      AutoRedraw      =   -1  'True
+      BackColor       =   &H00000000&
+      BorderStyle     =   0  'None
+      CausesValidation=   0   'False
+      ClipControls    =   0   'False
+      FillColor       =   &H00FFFFFF&
+      BeginProperty Font 
+         Name            =   "Arial"
+         Size            =   24
+         Charset         =   0
+         Weight          =   700
+         Underline       =   0   'False
+         Italic          =   0   'False
+         Strikethrough   =   0   'False
+      EndProperty
+      ForeColor       =   &H00FFFFFF&
+      Height          =   510
+      Left            =   7890
+      ScaleHeight     =   34
+      ScaleMode       =   3  'Pixel
+      ScaleWidth      =   34
+      TabIndex        =   0
+      Top             =   60
+      Visible         =   0   'False
+      Width           =   510
+   End
+   Begin VB.PictureBox picBitmap 
+      AutoRedraw      =   -1  'True
+      BackColor       =   &H00000000&
+      BorderStyle     =   0  'None
+      CausesValidation=   0   'False
+      ClipControls    =   0   'False
+      FillColor       =   &H00FFFFFF&
+      ForeColor       =   &H00FFFFFF&
+      Height          =   3840
+      Left            =   45
+      ScaleHeight     =   256
+      ScaleMode       =   3  'Pixel
+      ScaleWidth      =   512
+      TabIndex        =   2
+      Top             =   45
+      Width           =   7680
+   End
+   Begin VB.Label lblChars 
+      Caption         =   "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 !@#$%^&*()_+=-[]:;'"",.<>/?\"
+      BeginProperty Font 
+         Name            =   "Arial Black"
+         Size            =   24
+         Charset         =   0
+         Weight          =   700
+         Underline       =   0   'False
+         Italic          =   0   'False
+         Strikethrough   =   0   'False
+      EndProperty
+      Height          =   1095
+      Left            =   60
+      TabIndex        =   1
+      Top             =   7785
+      UseMnemonic     =   0   'False
+      Visible         =   0   'False
+      Width           =   8475
+   End
+End
+Attribute VB_Name = "frmChars"
+Attribute VB_GlobalNameSpace = False
+Attribute VB_Creatable = False
+Attribute VB_PredeclaredId = True
+Attribute VB_Exposed = False
+Option Explicit
+
+Private Declare Sub Sleep Lib "kernel32" (ByVal dwMilliseconds As Long)
+Sub DrawChar(Char As String)
+     
+     picChar.Width = picChar.TextWidth(Char)
+     
+     DoEvents
+     
+     picChar.Height = picChar.TextHeight(Char)
+     
+     DoEvents
+          
+     Set picChar.Picture = Nothing
+     picChar.Cls
+     
+     picChar.Print Char
+     
+     DoEvents
+End Sub
+
+Private Sub Form_Load()
+     Dim i
+     Dim CharX As Integer
+     Dim CharY As Integer
+     Dim LargestY As Integer
+     Dim cfg As New clsConfiguration
+     Dim settings As Dictionary
+     Dim chars As New Dictionary
+     
+     Show
+     Refresh
+     
+     picChar.Font = lblChars.Font
+     picChar.FontSize = lblChars.FontSize
+     
+     ''Adjustment (in pixels) per character
+     Const u1 As Single = -4 '-2
+     Const v1 As Single = -4 '-2
+     Const u2 As Single = 4 '2
+     Const v2 As Single = 5 '5
+     
+     ''Spacing
+     Const sx As Long = 10
+     Const sy As Long = 6
+     
+     ''Offset
+     Const ox As Long = 10
+     Const oy As Long = 3
+     
+     ''Start values
+     CharY = oy
+     CharX = ox
+     LargestY = 0
+     
+     cfg.NewConfiguration
+     
+     'Render all chars
+     For i = 1 To Len(lblChars)
+          
+          'Get the bitmap char
+          DrawChar Mid$(lblChars, i, 1)
+          
+          If (picChar.Height - 3) > LargestY Then LargestY = (picChar.Height - 3)
+          If CharX + picChar.Width >= (picBitmap.Width - sx / 2) Then
+               'Go to next character position
+               CharY = CharY + LargestY + sy
+               LargestY = 0
+               CharX = ox
+          End If
+          
+          'Draw on bitmap
+          picBitmap.PaintPicture picChar.Image, CharX, CharY - 2
+          
+          'Make settings
+          Set settings = New Dictionary
+          settings.Add "width", CLng(picChar.Width)
+          settings.Add "height", CLng((picChar.Height - 3))
+          settings.Add "u1", (CSng(CharX) + u1) / CSng(picBitmap.Width)
+          settings.Add "v1", (CSng(CharY) + v1) / CSng(picBitmap.Height)
+          settings.Add "u2", (CSng(CharX + picChar.Width) + u2) / CSng(picBitmap.Width)
+          settings.Add "v2", (CSng(CharY + (picChar.Height - 3)) + v2) / CSng(picBitmap.Height)
+          chars.Add Asc(Mid$(lblChars, i, 1)), settings
+          Set settings = Nothing
+          
+          'Go to next character position
+          CharX = CharX + picChar.Width + sx
+     Next i
+     
+     'save bitmap
+     SavePicture picBitmap.Image, "font.bmp"
+     
+     'save config
+     cfg.WriteSetting "count", CLng(Len(lblChars))
+     cfg.WriteSetting "chars", chars, True
+     cfg.SaveConfiguration "font.cfg"
+     
+End Sub
+
diff --git a/Resources/BitmapFont/Form1.frx b/Resources/BitmapFont/Form1.frx
new file mode 100644
index 0000000..b20c2b6
Binary files /dev/null and b/Resources/BitmapFont/Form1.frx differ
diff --git a/Resources/BitmapFont/clsConfiguration.cls b/Resources/BitmapFont/clsConfiguration.cls
new file mode 100644
index 0000000..fbf3483
--- /dev/null
+++ b/Resources/BitmapFont/clsConfiguration.cls
@@ -0,0 +1,844 @@
+VERSION 1.0 CLASS
+BEGIN
+  MultiUse = -1  'True
+  Persistable = 0  'NotPersistable
+  DataBindingBehavior = 0  'vbNone
+  DataSourceBehavior  = 0  'vbNone
+  MTSTransactionMode  = 0  'NotAnMTSObject
+END
+Attribute VB_Name = "clsConfiguration"
+Attribute VB_GlobalNameSpace = False
+Attribute VB_Creatable = False
+Attribute VB_PredeclaredId = False
+Attribute VB_Exposed = False
+' ====================================================================================
+'    INTRODUCTION
+' ====================================================================================
+'
+'    Configuration Class Module by Pascal vd Heiden, www.codeimp.com
+'
+'    This Class module contains code of my design. You are free to use it,
+'    as long as you do not remove my details up here in this comment. Thanks.
+'
+'    This Class module requires "Microsoft Scripting Runtime" reference (scrrun.dll)
+'    for the Dictionary object. Select this in the Project -> References dialog.
+'
+'    Can safely be compiled with Fast Optimization and
+'    all Advanced Optimization switches checked.
+'
+'
+' ====================================================================================
+'    CONFIGURATION FILE STRUCTURE SYNTAX
+' ====================================================================================
+'
+'    Whitepace is always allowed. This includes spaces, tabs
+'    linefeeds (10) and carriage returns (13)
+'
+'    Keys may not have spaces or assignment operator = in them.
+'
+'    Comments start with // (unless used within strings)
+'    and count as comment for the rest of the line. Or use /* and */
+'    to mark the beginning and end of a comment.
+'
+'    Simple setting:
+'
+'              key = value;
+'
+'    Example:  speed = 345;
+'              cars = 8;
+'
+'    Strings must be in quotes.
+'
+'    Example:  nickname = "Gherkin";
+'              altnick = "Gherk inn";
+'
+'    String Escape Sequences:
+'        \n    New line (10)
+'        \r    Carriage return (13)
+'        \t    Tab (9)
+'        \"    Double-quotation mark
+'        \\    Backslash
+'        \000  Any ASCII character (MUST be 3 digits! So for 13 you use \013)
+'
+'    Decimals ALWAYS use a dot, NEVER comma!
+'
+'    Example:  pressure = 15.29;
+'              acceleration = 1.0023;
+'
+'    Structures must use brackets.
+'
+'    Structure Example:
+'
+'              key
+'              {
+'                   key = value;
+'                   key = value;
+'
+'                   key
+'                   {
+'                        key = value;
+'                        key = value;
+'                        key = value;
+'                   }
+'
+'                   key = value;
+'                   key = value;
+'                   key = value;
+'                   key = value;
+'                   key = value;
+'              }
+'
+'    As you can see, structures inside structures are allowed
+'    and you may go as deep as you want. Note that only the root structures
+'    can be readed from config using ReadSetting. ReadSetting will return a
+'    Dictionary object containing everything in that root structure.
+'
+'    Key names must be unique within their scope.
+'
+'    This is NOT allowed, it may not have 'father' more
+'    than once in the same scope:
+'
+'              mother = 45;
+'              father = 52;
+'
+'              father
+'              {
+'                   length = 1.87;
+'              }
+'
+'    This however is allowed, because father
+'    now exists in a different scope:
+'
+'              mother = 45;
+'              father = 52;
+'
+'              parents
+'              {
+'                   father = 52;
+'              }
+'
+'    This too is allowed, both 'age' are in a different scope:
+'
+'              mother
+'              {
+'                   age = 45;
+'              }
+'
+'              father
+'              {
+'                   age = 52;
+'              }
+'
+'
+' ====================================================================================
+'    FUNCTION CALL DESCRIPTIONS
+' ====================================================================================
+'
+'    InputConfiguration
+'
+'    This loads a configuration from a string. The string must contain a
+'    configuration using the rules described above.
+'
+' ------------------------------------------------------------------------------------
+'
+'    LoadConfiguration
+'
+'    Loads a configuration from a file. The file must contain a configuration
+'    using the rules described above.
+'
+' ------------------------------------------------------------------------------------
+'
+'    NewConfiguration
+'
+'    Erases all loaded settings and starts with a new, clear configuration
+'
+' ------------------------------------------------------------------------------------
+'
+'    OutputConfiguration
+'
+'    Returns the configuration as a string following the rules described above.
+'    You can optionally determine the newline character to use and/or omit
+'    whitespace in the result.
+'
+' ------------------------------------------------------------------------------------
+'
+'    SaveConfiguration
+'
+'    Writes the configuration to file following the rules described above.
+'    You can optionally specify the newline character to use and/or omit
+'    whitespace in the result.
+'
+' ------------------------------------------------------------------------------------
+'
+'    ReadSetting
+'
+'    Reads a setting from the root level and returns it in its own variable type.
+'    You can optionally specify a default to return if the specified setting
+'    does not exist and/or specify if you would like to get a reference if the
+'    setting is a Dictionary object (structure in configuration).
+'    If you use a reference, you can change the configuration immediately
+'    through that reference.
+'
+' ------------------------------------------------------------------------------------
+'
+'    WriteSetting
+'
+'    Writes a setting to the root level in the configuration.
+'    You can choose to write the setting as reference if it is of Dictionary type.
+'    Note that your configuration changes too when you change anything
+'    in your Dictionary when it is written as reference!
+'
+' ------------------------------------------------------------------------------------
+'
+'    RemoveSetting
+'
+'    Removes a setting from the root level in the configuration.
+'    Its as simple as that. What else is there to tell about it?!
+'
+' ------------------------------------------------------------------------------------
+'
+'    Root
+'
+'    Returns the entire configuration (root level) as a Dictionary object.
+'    You can optionally specify to return a reference through which you can change
+'    the configuration immediately.
+'
+' ====================================================================================
+' ====================================================================================
+
+
+
+'Do not allow any undeclared variables
+Option Explicit
+
+'Case sensitive comparisions
+Option Compare Binary
+
+Private Const ASSIGNOP As Long = 61          ' =
+Private Const BEGINOP As Long = 123          ' {
+Private Const ENDOP As Long = 125            ' }
+Private Const TERMINATEOP As Long = 59       ' ;
+Private Const STRINGOP As Long = 34          ' "
+Private Const COMMENT As String = "//"       '
+Private Const BEGINCOMMENT As String = "/*"  '
+Private Const ENDCOMMENT As String = "*/"    '
+
+Private Const WS_SPACE As Long = 32          ' space
+Private Const WS_LINEFEED As Long = 10       ' linefeed
+Private Const WS_TAB As String = vbTab       '
+Private Const WS_RETURN As String = vbCr     '
+
+Private Const ESCAPESEQ As Long = 92         ' \
+Private Const ES_NEWLINE As Long = 110       ' n
+Private Const ES_RETURN As Long = 114        ' r
+Private Const ES_TAB As Long = 116           ' t
+Private Const ES_QUOTE As Long = 34          ' "
+Private Const ES_BACKSLASH As Long = 92      ' \
+
+'This will hold the object orientated configuration
+Private Config As Dictionary
+
+'Last line that was read where error occurred
+Private cLastReadLine As Long
+
+Public Property Get CurrentScanLine() As Long
+     CurrentScanLine = cLastReadLine
+End Property
+
+Private Sub Class_Initialize()
+     
+     'New database
+     Set Config = New Dictionary
+End Sub
+
+Private Sub Class_Terminate()
+     
+     'Clean up
+     Set Config = Nothing
+End Sub
+
+Private Function DeepCopy(ByRef Dict As Dictionary) As Dictionary
+     Dim NewConfig As Dictionary
+     Dim CopyObject As Dictionary
+     Dim ConfigKeys As Variant
+     Dim ConfigValue As Variant
+     Dim i As Long
+     
+     'Create new config
+     Set NewConfig = New Dictionary
+     
+     'Add all items from Config
+     If Dict.Count Then
+          ConfigKeys = Dict.Keys
+          For i = LBound(ConfigKeys) To UBound(ConfigKeys)
+               
+               'Check if the value is a dictionary
+               If VarType(Dict(ConfigKeys(i))) = vbObject Then
+                    
+                    'Get the object
+                    Set CopyObject = Dict(ConfigKeys(i))
+                    
+                    'Deepcopy this too
+                    NewConfig.Add ConfigKeys(i), DeepCopy(CopyObject)
+                    
+                    'Clean up
+                    Set CopyObject = Nothing
+               Else
+                    
+                    'Normal copy
+                    ConfigValue = Dict(ConfigKeys(i))
+                    NewConfig.Add ConfigKeys(i), ConfigValue
+               End If
+          Next i
+     End If
+     
+     'Return the result
+     Set DeepCopy = NewConfig
+     
+     'Clean up
+     Set NewConfig = Nothing
+End Function
+
+Private Function Escaped(ByRef Value As String) As String
+     
+     '    \n New line
+     '    \r Carriage return
+     '    \t Tab
+     '    \" Double quotation mark
+     '    \\ Backslash
+     
+     'Copy string
+     Escaped = Value
+     
+     'Replace characters with escape sequences
+     Escaped = Replace$(Escaped, "\", "\\")       'Note the \ must be the first to replace!
+     Escaped = Replace$(Escaped, vbLf, "\n")
+     Escaped = Replace$(Escaped, vbCr, "\r")
+     Escaped = Replace$(Escaped, vbTab, "\t")
+     Escaped = Replace$(Escaped, """", "\""")
+End Function
+
+Public Sub InputConfiguration(ByVal Configuration As String)
+     
+     
+     'This reads the data and builds a new dictionary object
+     
+     
+     'Remove Returns and Tabs so we only have Linefeed as newline
+     Configuration = Replace$(Configuration, WS_RETURN, "")
+     Configuration = Replace$(Configuration, WS_TAB, "")
+     
+     
+     'First line
+     cLastReadLine = 1
+     
+     'Load main structure
+     Set Config = LoadStructure(0, Configuration)
+End Sub
+
+Public Sub LoadConfiguration(ByRef Filename As String)
+     Dim FB As Integer        'File buffer
+     Dim Data As String       'Data
+     
+     
+     'This reads a file and builds a new dictionary object
+     
+     
+     'Open the file to read
+     FB = FreeFile
+     Open Filename For Binary As #FB
+     
+     'Read all data
+     Data = Space$(LOF(FB))
+     Get #FB, 1, Data
+     
+     'Close file
+     Close #FB
+     
+     
+     'Remove Returns and Tabs so we only have Linefeed as newline
+     Data = Replace$(Data, WS_RETURN, "")
+     Data = Replace$(Data, WS_TAB, "")
+     
+     
+     'First line
+     cLastReadLine = 1
+     
+     'Load main structure
+     Set Config = LoadStructure(0, Data)
+End Sub
+
+Private Function LoadStructure(ByRef p As Long, ByRef Data As String) As Dictionary
+     Dim c As String * 1           'Character at p
+     Dim ca As Long                'ASCII value of c
+     Dim np As Long                'Next position
+     Dim StringData As Boolean     'True if in a string
+     Dim NumberData As Boolean     'True if in a number
+     Dim Sequence As Boolean       'True if getting a sequence character
+     Dim Assigning As Boolean      'True when assigning
+     Dim NewKey As String
+     Dim NewValue As String
+     
+     'Create dictionary
+     Set LoadStructure = New Dictionary
+     
+     'Continue until end of data
+     Do While p < Len(Data)
+          
+          'Next char
+          p = p + 1
+          
+          'Get char
+          c = Mid$(Data, p, 1)
+          ca = AscW(c)
+          
+          'Check if we are processing number data
+          If NumberData Then
+               
+               'Check if assignment ends
+               If ca = TERMINATEOP Then
+                    
+                    'Check number type
+                    If InStr(NewValue, ".") <> 0 Then
+                         
+                         'Add the number to dictionary as single
+                         LoadStructure.Add Trim$(NewKey), CSng(Val(NewValue))
+                    Else
+                         
+                         'Add the number to dictionary as long
+                         LoadStructure.Add Trim$(NewKey), CLng(NewValue)
+                    End If
+                    
+                    'Reset
+                    NewKey = ""
+                    NewValue = ""
+                    
+                    'End of assign
+                    NumberData = False
+                    Assigning = False
+               
+               'Check if newline
+               ElseIf (ca = WS_LINEFEED) Then
+                    
+                    'Count the new line
+                    cLastReadLine = cLastReadLine + 1
+               Else
+                    
+                    'Add to value
+                    NewValue = NewValue & c
+               End If
+               
+          'Check if we are processing string data
+          ElseIf StringData Then
+               
+               'Check if previous char was a slash
+               If Sequence Then
+                    
+                    'Check the char
+                    Select Case ca
+                         Case ES_BACKSLASH: NewValue = NewValue & "\"
+                         Case ES_NEWLINE: NewValue = NewValue & vbLf
+                         Case ES_QUOTE: NewValue = NewValue & """"
+                         Case ES_RETURN: NewValue = NewValue & vbCr
+                         Case ES_TAB: NewValue = NewValue & vbTab
+                         Case Else
+                              
+                              'Check if its a number
+                              If IsNumeric(c) Then
+                                   
+                                   'Always 3 chars
+                                   np = CLng(Mid$(Data, p, 3))
+                                   NewValue = NewValue & ChrW$(np)
+                                   p = p + 2
+                              Else
+                                   
+                                   'Add character
+                                   NewValue = NewValue & c
+                              End If
+                    End Select
+                    
+                    'End of sequence
+                    Sequence = False
+               Else
+                    
+                    'Check if sequence start
+                    If ca = ESCAPESEQ Then
+                         
+                         'Start escape sequence
+                         Sequence = True
+                         
+                    'Check if string ends
+                    ElseIf ca = STRINGOP Then
+                         
+                         'Add the string to dictionary
+                         LoadStructure.Add Trim$(NewKey), NewValue
+                         
+                         'End of string
+                         StringData = False
+                         
+                         'Reset
+                         NewKey = ""
+                         NewValue = ""
+                    
+                    'Check if newline
+                    ElseIf (ca = WS_LINEFEED) Then
+                         
+                         'Count the new line
+                         cLastReadLine = cLastReadLine + 1
+                         
+                    Else
+                         
+                         'Add to string
+                         NewValue = NewValue & c
+                    End If
+               End If
+               
+          'Check if assigning
+          ElseIf Assigning Then
+               
+               'Check for STRINGOP or Numeric character
+               If (ca = STRINGOP) Then
+                    
+                    'Begin string data here
+                    StringData = True
+                    
+               ElseIf (IsNumeric(c) = True) Or (c = "-") Or (c = ".") Or (LCase$(c) = "e") Or (c = "&") Then
+                    
+                    'Begin numeric data here
+                    NumberData = True
+                    
+                    'Note that this byte is part of the value
+                    p = p - 1
+               
+               'Check if newline
+               ElseIf (ca = WS_LINEFEED) Then
+                    
+                    'Count the new line
+                    cLastReadLine = cLastReadLine + 1
+                    
+               'Check if assignment ends
+               ElseIf (ca = TERMINATEOP) Then
+                    
+                    'End of assign
+                    Assigning = False
+                    
+               'Everything else but spaces are not allowed
+               ElseIf (ca <> WS_SPACE) Then
+                    
+                    'Invalid assignment
+                    Err.Raise vbObjectError, , "Invalid assignment. Forgot an assignment terminator?"
+               End If
+               
+          'Anything else
+          Else 'If (ca <> WS_SPACE) Then
+               
+               'Check for a Key, BEGINOP, ENDOP or ASSIGNOP, COMMENT or whitespace
+               Select Case ca
+                    Case BEGINOP
+                         
+                         'Check for spaces in key name
+                         If (InStr(Trim$(NewKey), " ") > 0) Then
+                              
+                              'Spaces not allowed in key names
+                              Err.Raise vbObjectError, , "Spaces not allowed in key names."
+                         Else
+                              
+                              'Add structure
+                              LoadStructure.Add Trim$(NewKey), LoadStructure(p, Data)
+                              
+                              'Reset
+                              NewKey = ""
+                         End If
+                         
+                    Case ENDOP
+                         
+                         'Leave here
+                         Exit Do
+                         
+                    Case ASSIGNOP
+                         
+                         'Check for spaces in key name
+                         If (InStr(Trim$(NewKey), Chr$(WS_SPACE)) > 0) Then
+                              
+                              'Spaces not allowed in key names
+                              Err.Raise vbObjectError, , "Spaces not allowed in key names."
+                         Else
+                              
+                              'Now assigning
+                              Assigning = True
+                         End If
+                    
+                    Case TERMINATEOP
+                         
+                         'Add the key to dictionary with 0 value
+                         LoadStructure.Add Trim$(NewKey), CLng(0)
+                         
+                         'Reset
+                         NewKey = ""
+                         NewValue = ""
+                         
+                    Case WS_LINEFEED
+                         
+                         'Count the new line
+                         cLastReadLine = cLastReadLine + 1
+                         
+                         'Add as space
+                         NewKey = NewKey & Chr$(WS_SPACE)
+                         
+                    'Check for possible comment
+                    Case AscW(COMMENT), AscW(BEGINCOMMENT)
+                         
+                         'Check for 2 bytes line comment
+                         If Mid$(Data, p, 2) = COMMENT Then
+                              
+                              'Find the next linefeed
+                              np = InStr(p, Data, vbLf)
+                              
+                              'Check if linefeed was found
+                              If np > 0 Then
+                                   
+                                   'Count linefeed
+                                   cLastReadLine = cLastReadLine + 1
+                                   
+                                   'Skip to next
+                                   p = np
+                              Else
+                                   
+                                   'No linefeed can be found, end of file!
+                                   p = Len(Data)
+                                   Exit Do
+                              End If
+                              
+                         'Check for 2 bytes block comment
+                         ElseIf Mid$(Data, p, 2) = BEGINCOMMENT Then
+                              
+                              'Find the next endcomment
+                              np = InStr(p, Data, ENDCOMMENT)
+                              
+                              'Check if endcomment was found
+                              If np > 0 Then
+                                   
+                                   'Count the number of linefeeds in comment block
+                                   cLastReadLine = cLastReadLine + UBound(Split(Mid$(Data, p, np - p), Chr$(WS_LINEFEED)))
+                                   
+                                   'Skip to next
+                                   p = np + 1
+                              Else
+                                   
+                                   'No endcomment can be found, end of file!
+                                   p = Len(Data)
+                                   Exit Do
+                              End If
+                         End If
+                         
+                    'Add to key name
+                    Case Else: NewKey = NewKey & c
+                    
+               End Select
+          End If
+     Loop
+End Function
+
+Public Sub NewConfiguration()
+     
+     'First line
+     cLastReadLine = 1
+     
+     'Create new, empty dictionary
+     Set Config = New Dictionary
+End Sub
+
+Public Function OutputConfiguration(Optional ByVal NewLine As String = vbCrLf, Optional ByVal Whitespace As Boolean = True) As String
+     
+     'Create configuration as string
+     OutputConfiguration = OutputDictionary(Config, 0, NewLine, Whitespace)
+End Function
+
+Private Function OutputDictionary(ByRef Dict As Dictionary, ByVal Level As Long, Optional ByVal NewLine = vbCrLf, Optional ByVal Whitespace As Boolean = True) As String
+     Dim LevelTabs As String
+     Dim sp As String
+     Dim Keys As Variant
+     Dim Data As String
+     Dim i As Long
+     
+     'Check if this dictionary is not empty
+     If Dict.Count > 0 Then
+          
+          'Create whitespace
+          If Whitespace Then
+               LevelTabs = String$(Level, vbTab)
+               sp = " "
+          End If
+          
+          'Get the keys
+          Keys = Dict.Keys
+          
+          'Go for all keys in dictionary
+          For i = LBound(Keys) To UBound(Keys)
+               
+               'Check type of value
+               Select Case VarType(Dict(Keys(i)))
+                    
+                    'Dictionary Object
+                    Case vbObject
+                         
+                         'Output empty line
+                         If Whitespace Then Data = Data & LevelTabs & NewLine
+                         
+                         'Output the key
+                         Data = Data & LevelTabs & Keys(i) & NewLine
+                         
+                         'Ouput the BEGINOP
+                         Data = Data & LevelTabs & ChrW$(BEGINOP) & NewLine
+                         
+                         'Output Dictionary
+                         Data = Data & OutputDictionary(Dict(Keys(i)), Level + 1, NewLine, Whitespace)
+                         
+                         'Output the ENDOP
+                         Data = Data & LevelTabs & ChrW$(ENDOP) & NewLine
+                         
+                         'Output empty line
+                         If Whitespace Then Data = Data & LevelTabs & NewLine
+                         
+                    'Integral Number
+                    Case vbInteger, vbLong, vbByte
+                         
+                         'Output the key = value;
+                         Data = Data & LevelTabs & Keys(i) & sp & ChrW$(ASSIGNOP) & sp & Dict(Keys(i)) & ChrW$(TERMINATEOP) & NewLine
+                         
+                    'Floating point Number
+                    Case vbSingle, vbDouble, vbCurrency, vbDecimal
+                         
+                         'Output the key = value;
+                         Data = Data & LevelTabs & Keys(i) & sp & ChrW$(ASSIGNOP) & sp & Format(Dict(Keys(i)), "###############################0.0#####") & "f" & ChrW$(TERMINATEOP) & NewLine
+                         
+                    'Boolean as Number
+                    Case vbBoolean
+                         
+                         'Output the key = value;
+                         Data = Data & LevelTabs & Keys(i) & sp & ChrW$(ASSIGNOP) & sp & CLng(Dict(Keys(i))) & ChrW$(TERMINATEOP) & NewLine
+                         
+                    'Other (String)
+                    Case Else
+                         
+                         'Output the key = "value";
+                         Data = Data & LevelTabs & Keys(i) & sp & ChrW$(ASSIGNOP) & sp & ChrW$(STRINGOP) & Escaped(Dict(Keys(i))) & ChrW$(STRINGOP) & ChrW$(TERMINATEOP) & NewLine
+                         
+               End Select
+          Next i
+     End If
+     
+     'Return data
+     OutputDictionary = Data
+End Function
+
+Public Function ReadSetting(ByRef Setting As String, Optional ByRef Default As Variant, Optional ByVal Reference As Boolean)
+     
+     'Check if setting exists
+     If Config.Exists(Setting) Then
+          
+          'Check setting type
+          If VarType(Config(Setting)) = vbObject Then
+               
+               'Check if we should return a reference
+               If Reference Then
+                    
+                    'Return a reference
+                    Set ReadSetting = Config(Setting)
+               Else
+                    
+                    'Return the setting
+                    Set ReadSetting = DeepCopy(Config(Setting))
+               End If
+          Else
+               
+               'Return the setting
+               ReadSetting = Config(Setting)
+          End If
+     Else
+          
+          'Return the default
+          If VarType(Default) = vbObject Then Set ReadSetting = Default Else ReadSetting = Default
+     End If
+End Function
+
+Public Sub RemoveSetting(ByRef Setting As String)
+     
+     'Remove setting if exists
+     If Config.Exists(Setting) Then Config.Remove Setting
+End Sub
+
+Public Function Root(Optional ByVal Reference As Boolean) As Dictionary
+     
+     'Check if we should return a reference
+     If Reference Then
+          
+          'Return a reference
+          Set Root = Config
+     Else
+          
+          'Return the setting
+          Set Root = DeepCopy(Config)
+     End If
+End Function
+
+Public Sub SaveConfiguration(ByRef Filename As String, Optional ByVal NewLine As String = vbCrLf, Optional ByVal Whitespace As Boolean = True)
+     Dim FB As Integer        'File buffer
+     Dim Data As String       'Data
+     
+     
+     'This reads a file and builds a new dictionary object
+     
+     
+     'Create data
+     Data = OutputDictionary(Config, 0, NewLine, Whitespace)
+     
+     
+     'Kill the file if exists
+     If Dir(Filename) <> "" Then Kill Filename
+     
+     'Open the file to write
+     FB = FreeFile
+     Open Filename For Binary As #FB
+     
+     'Write configuration data
+     Put #FB, 1, Data
+     
+     'Close file
+     Close #FB
+End Sub
+
+Public Sub WriteSetting(ByRef Setting As String, ByRef Value As Variant, Optional ByVal Reference As Boolean)
+     Dim DictValue As Dictionary
+     
+     'Check if the setting exists
+     If Config.Exists(Setting) Then
+          
+          'Check type of value
+          If VarType(Value) = vbObject Then
+               
+               'Check if we should apply referenced
+               If Reference Then
+                    
+                    'Apply setting as reference
+                    Set Config(Setting) = Value
+               Else
+                    
+                    'Apply setting
+                    Set DictValue = Value
+                    Set Config(Setting) = DeepCopy(DictValue)
+                    
+                    'Clean up
+                    Set DictValue = Nothing
+               End If
+          Else
+               
+               'Apply setting
+               Config(Setting) = Value
+          End If
+     Else
+          
+          'Add setting
+          Config.Add Setting, Value
+     End If
+End Sub
diff --git a/Resources/CLogo.png b/Resources/CLogo.png
new file mode 100644
index 0000000..0dee254
Binary files /dev/null and b/Resources/CLogo.png differ
diff --git a/Resources/Crosshair.png b/Resources/Crosshair.png
new file mode 100644
index 0000000..40c70d9
Binary files /dev/null and b/Resources/Crosshair.png differ
diff --git a/Resources/CrosshairBusy.png b/Resources/CrosshairBusy.png
new file mode 100644
index 0000000..c534727
Binary files /dev/null and b/Resources/CrosshairBusy.png differ
diff --git a/Resources/DB2 logo BIG.gif b/Resources/DB2 logo BIG.gif
new file mode 100644
index 0000000..327ec0d
Binary files /dev/null and b/Resources/DB2 logo BIG.gif differ
diff --git a/Resources/Failed.png b/Resources/Failed.png
new file mode 100644
index 0000000..b977254
Binary files /dev/null and b/Resources/Failed.png differ
diff --git a/Resources/Filter.png b/Resources/Filter.png
new file mode 100644
index 0000000..b0129d5
Binary files /dev/null and b/Resources/Filter.png differ
diff --git a/Resources/Font.bmp b/Resources/Font.bmp
new file mode 100644
index 0000000..792e2e5
Binary files /dev/null and b/Resources/Font.bmp differ
diff --git a/Resources/Font.cfg b/Resources/Font.cfg
new file mode 100644
index 0000000..8a0f9fd
--- /dev/null
+++ b/Resources/Font.cfg
@@ -0,0 +1,710 @@
+count = 64;
+
+chars
+{
+	
+	65
+	{
+		width = 26;
+		height = 42;
+		u1 = 0.011719f;
+		v1 = -0.003906f;
+		u2 = 0.078125f;
+		v2 = 0.195313f;
+	}
+	
+	
+	66
+	{
+		width = 26;
+		height = 42;
+		u1 = 0.082031f;
+		v1 = -0.003906f;
+		u2 = 0.148438f;
+		v2 = 0.195313f;
+	}
+	
+	
+	67
+	{
+		width = 26;
+		height = 42;
+		u1 = 0.152344f;
+		v1 = -0.003906f;
+		u2 = 0.21875f;
+		v2 = 0.195313f;
+	}
+	
+	
+	68
+	{
+		width = 26;
+		height = 42;
+		u1 = 0.222656f;
+		v1 = -0.003906f;
+		u2 = 0.289063f;
+		v2 = 0.195313f;
+	}
+	
+	
+	69
+	{
+		width = 24;
+		height = 42;
+		u1 = 0.292969f;
+		v1 = -0.003906f;
+		u2 = 0.355469f;
+		v2 = 0.195313f;
+	}
+	
+	
+	70
+	{
+		width = 22;
+		height = 42;
+		u1 = 0.359375f;
+		v1 = -0.003906f;
+		u2 = 0.417969f;
+		v2 = 0.195313f;
+	}
+	
+	
+	71
+	{
+		width = 28;
+		height = 42;
+		u1 = 0.421875f;
+		v1 = -0.003906f;
+		u2 = 0.492188f;
+		v2 = 0.195313f;
+	}
+	
+	
+	72
+	{
+		width = 28;
+		height = 42;
+		u1 = 0.496094f;
+		v1 = -0.003906f;
+		u2 = 0.566406f;
+		v2 = 0.195313f;
+	}
+	
+	
+	73
+	{
+		width = 13;
+		height = 42;
+		u1 = 0.570313f;
+		v1 = -0.003906f;
+		u2 = 0.611328f;
+		v2 = 0.195313f;
+	}
+	
+	
+	74
+	{
+		width = 22;
+		height = 42;
+		u1 = 0.615234f;
+		v1 = -0.003906f;
+		u2 = 0.673828f;
+		v2 = 0.195313f;
+	}
+	
+	
+	75
+	{
+		width = 28;
+		height = 42;
+		u1 = 0.677734f;
+		v1 = -0.003906f;
+		u2 = 0.748047f;
+		v2 = 0.195313f;
+	}
+	
+	
+	76
+	{
+		width = 22;
+		height = 42;
+		u1 = 0.751953f;
+		v1 = -0.003906f;
+		u2 = 0.810547f;
+		v2 = 0.195313f;
+	}
+	
+	
+	77
+	{
+		width = 31;
+		height = 42;
+		u1 = 0.814453f;
+		v1 = -0.003906f;
+		u2 = 0.890625f;
+		v2 = 0.195313f;
+	}
+	
+	
+	78
+	{
+		width = 28;
+		height = 42;
+		u1 = 0.894531f;
+		v1 = -0.003906f;
+		u2 = 0.964844f;
+		v2 = 0.195313f;
+	}
+	
+	
+	79
+	{
+		width = 28;
+		height = 42;
+		u1 = 0.011719f;
+		v1 = 0.183594f;
+		u2 = 0.082031f;
+		v2 = 0.382813f;
+	}
+	
+	
+	80
+	{
+		width = 24;
+		height = 42;
+		u1 = 0.085938f;
+		v1 = 0.183594f;
+		u2 = 0.148438f;
+		v2 = 0.382813f;
+	}
+	
+	
+	81
+	{
+		width = 28;
+		height = 42;
+		u1 = 0.152344f;
+		v1 = 0.183594f;
+		u2 = 0.222656f;
+		v2 = 0.382813f;
+	}
+	
+	
+	82
+	{
+		width = 26;
+		height = 42;
+		u1 = 0.226563f;
+		v1 = 0.183594f;
+		u2 = 0.292969f;
+		v2 = 0.382813f;
+	}
+	
+	
+	83
+	{
+		width = 24;
+		height = 42;
+		u1 = 0.296875f;
+		v1 = 0.183594f;
+		u2 = 0.359375f;
+		v2 = 0.382813f;
+	}
+	
+	
+	84
+	{
+		width = 24;
+		height = 42;
+		u1 = 0.363281f;
+		v1 = 0.183594f;
+		u2 = 0.425781f;
+		v2 = 0.382813f;
+	}
+	
+	
+	85
+	{
+		width = 28;
+		height = 42;
+		u1 = 0.429688f;
+		v1 = 0.183594f;
+		u2 = 0.5f;
+		v2 = 0.382813f;
+	}
+	
+	
+	86
+	{
+		width = 26;
+		height = 42;
+		u1 = 0.503906f;
+		v1 = 0.183594f;
+		u2 = 0.570313f;
+		v2 = 0.382813f;
+	}
+	
+	
+	87
+	{
+		width = 33;
+		height = 42;
+		u1 = 0.574219f;
+		v1 = 0.183594f;
+		u2 = 0.654297f;
+		v2 = 0.382813f;
+	}
+	
+	
+	88
+	{
+		width = 26;
+		height = 42;
+		u1 = 0.658203f;
+		v1 = 0.183594f;
+		u2 = 0.724609f;
+		v2 = 0.382813f;
+	}
+	
+	
+	89
+	{
+		width = 26;
+		height = 42;
+		u1 = 0.728516f;
+		v1 = 0.183594f;
+		u2 = 0.794922f;
+		v2 = 0.382813f;
+	}
+	
+	
+	90
+	{
+		width = 24;
+		height = 42;
+		u1 = 0.798828f;
+		v1 = 0.183594f;
+		u2 = 0.861328f;
+		v2 = 0.382813f;
+	}
+	
+	
+	48
+	{
+		width = 22;
+		height = 42;
+		u1 = 0.865234f;
+		v1 = 0.183594f;
+		u2 = 0.923828f;
+		v2 = 0.382813f;
+	}
+	
+	
+	49
+	{
+		width = 22;
+		height = 42;
+		u1 = 0.927734f;
+		v1 = 0.183594f;
+		u2 = 0.986328f;
+		v2 = 0.382813f;
+	}
+	
+	
+	50
+	{
+		width = 22;
+		height = 42;
+		u1 = 0.011719f;
+		v1 = 0.371094f;
+		u2 = 0.070313f;
+		v2 = 0.570313f;
+	}
+	
+	
+	51
+	{
+		width = 22;
+		height = 42;
+		u1 = 0.074219f;
+		v1 = 0.371094f;
+		u2 = 0.132813f;
+		v2 = 0.570313f;
+	}
+	
+	
+	52
+	{
+		width = 22;
+		height = 42;
+		u1 = 0.136719f;
+		v1 = 0.371094f;
+		u2 = 0.195313f;
+		v2 = 0.570313f;
+	}
+	
+	
+	53
+	{
+		width = 22;
+		height = 42;
+		u1 = 0.199219f;
+		v1 = 0.371094f;
+		u2 = 0.257813f;
+		v2 = 0.570313f;
+	}
+	
+	
+	54
+	{
+		width = 22;
+		height = 42;
+		u1 = 0.261719f;
+		v1 = 0.371094f;
+		u2 = 0.320313f;
+		v2 = 0.570313f;
+	}
+	
+	
+	55
+	{
+		width = 22;
+		height = 42;
+		u1 = 0.324219f;
+		v1 = 0.371094f;
+		u2 = 0.382813f;
+		v2 = 0.570313f;
+	}
+	
+	
+	56
+	{
+		width = 22;
+		height = 42;
+		u1 = 0.386719f;
+		v1 = 0.371094f;
+		u2 = 0.445313f;
+		v2 = 0.570313f;
+	}
+	
+	
+	57
+	{
+		width = 22;
+		height = 42;
+		u1 = 0.449219f;
+		v1 = 0.371094f;
+		u2 = 0.507813f;
+		v2 = 0.570313f;
+	}
+	
+	
+	32
+	{
+		width = 12;
+		height = 42;
+		u1 = 0.511719f;
+		v1 = 0.371094f;
+		u2 = 0.550781f;
+		v2 = 0.570313f;
+	}
+	
+	
+	33
+	{
+		width = 12;
+		height = 42;
+		u1 = 0.554688f;
+		v1 = 0.371094f;
+		u2 = 0.59375f;
+		v2 = 0.570313f;
+	}
+	
+	
+	64
+	{
+		width = 25;
+		height = 42;
+		u1 = 0.597656f;
+		v1 = 0.371094f;
+		u2 = 0.662109f;
+		v2 = 0.570313f;
+	}
+	
+	
+	35
+	{
+		width = 22;
+		height = 42;
+		u1 = 0.666016f;
+		v1 = 0.371094f;
+		u2 = 0.724609f;
+		v2 = 0.570313f;
+	}
+	
+	
+	36
+	{
+		width = 22;
+		height = 42;
+		u1 = 0.728516f;
+		v1 = 0.371094f;
+		u2 = 0.787109f;
+		v2 = 0.570313f;
+	}
+	
+	
+	37
+	{
+		width = 33;
+		height = 42;
+		u1 = 0.791016f;
+		v1 = 0.371094f;
+		u2 = 0.871094f;
+		v2 = 0.570313f;
+	}
+	
+	
+	94
+	{
+		width = 22;
+		height = 42;
+		u1 = 0.875f;
+		v1 = 0.371094f;
+		u2 = 0.933594f;
+		v2 = 0.570313f;
+	}
+	
+	
+	38
+	{
+		width = 29;
+		height = 42;
+		u1 = 0.011719f;
+		v1 = 0.558594f;
+		u2 = 0.083984f;
+		v2 = 0.757813f;
+	}
+	
+	
+	42
+	{
+		width = 19;
+		height = 42;
+		u1 = 0.087891f;
+		v1 = 0.558594f;
+		u2 = 0.140625f;
+		v2 = 0.757813f;
+	}
+	
+	
+	40
+	{
+		width = 13;
+		height = 42;
+		u1 = 0.144531f;
+		v1 = 0.558594f;
+		u2 = 0.185547f;
+		v2 = 0.757813f;
+	}
+	
+	
+	41
+	{
+		width = 13;
+		height = 42;
+		u1 = 0.189453f;
+		v1 = 0.558594f;
+		u2 = 0.230469f;
+		v2 = 0.757813f;
+	}
+	
+	
+	95
+	{
+		width = 17;
+		height = 42;
+		u1 = 0.234375f;
+		v1 = 0.558594f;
+		u2 = 0.283203f;
+		v2 = 0.757813f;
+	}
+	
+	
+	43
+	{
+		width = 22;
+		height = 42;
+		u1 = 0.287109f;
+		v1 = 0.558594f;
+		u2 = 0.345703f;
+		v2 = 0.757813f;
+	}
+	
+	
+	61
+	{
+		width = 22;
+		height = 42;
+		u1 = 0.349609f;
+		v1 = 0.558594f;
+		u2 = 0.408203f;
+		v2 = 0.757813f;
+	}
+	
+	
+	45
+	{
+		width = 12;
+		height = 42;
+		u1 = 0.412109f;
+		v1 = 0.558594f;
+		u2 = 0.451172f;
+		v2 = 0.757813f;
+	}
+	
+	
+	91
+	{
+		width = 13;
+		height = 42;
+		u1 = 0.455078f;
+		v1 = 0.558594f;
+		u2 = 0.496094f;
+		v2 = 0.757813f;
+	}
+	
+	
+	93
+	{
+		width = 13;
+		height = 42;
+		u1 = 0.5f;
+		v1 = 0.558594f;
+		u2 = 0.541016f;
+		v2 = 0.757813f;
+	}
+	
+	
+	58
+	{
+		width = 12;
+		height = 42;
+		u1 = 0.544922f;
+		v1 = 0.558594f;
+		u2 = 0.583984f;
+		v2 = 0.757813f;
+	}
+	
+	
+	59
+	{
+		width = 12;
+		height = 42;
+		u1 = 0.587891f;
+		v1 = 0.558594f;
+		u2 = 0.626953f;
+		v2 = 0.757813f;
+	}
+	
+	
+	39
+	{
+		width = 10;
+		height = 42;
+		u1 = 0.630859f;
+		v1 = 0.558594f;
+		u2 = 0.666016f;
+		v2 = 0.757813f;
+	}
+	
+	
+	34
+	{
+		width = 17;
+		height = 42;
+		u1 = 0.669922f;
+		v1 = 0.558594f;
+		u2 = 0.71875f;
+		v2 = 0.757813f;
+	}
+	
+	
+	44
+	{
+		width = 12;
+		height = 42;
+		u1 = 0.722656f;
+		v1 = 0.558594f;
+		u2 = 0.761719f;
+		v2 = 0.757813f;
+	}
+	
+	
+	46
+	{
+		width = 12;
+		height = 42;
+		u1 = 0.765625f;
+		v1 = 0.558594f;
+		u2 = 0.804688f;
+		v2 = 0.757813f;
+	}
+	
+	
+	60
+	{
+		width = 22;
+		height = 42;
+		u1 = 0.808594f;
+		v1 = 0.558594f;
+		u2 = 0.867188f;
+		v2 = 0.757813f;
+	}
+	
+	
+	62
+	{
+		width = 22;
+		height = 42;
+		u1 = 0.871094f;
+		v1 = 0.558594f;
+		u2 = 0.929688f;
+		v2 = 0.757813f;
+	}
+	
+	
+	47
+	{
+		width = 10;
+		height = 42;
+		u1 = 0.933594f;
+		v1 = 0.558594f;
+		u2 = 0.96875f;
+		v2 = 0.757813f;
+	}
+	
+	
+	63
+	{
+		width = 21;
+		height = 42;
+		u1 = 0.011719f;
+		v1 = 0.746094f;
+		u2 = 0.068359f;
+		v2 = 0.945313f;
+	}
+	
+	
+	92
+	{
+		width = 10;
+		height = 42;
+		u1 = 0.072266f;
+		v1 = 0.746094f;
+		u2 = 0.107422f;
+		v2 = 0.945313f;
+	}
+	
+}
+
diff --git a/Resources/Font.cpt b/Resources/Font.cpt
new file mode 100644
index 0000000..0034afe
Binary files /dev/null and b/Resources/Font.cpt differ
diff --git a/Resources/Font.png b/Resources/Font.png
new file mode 100644
index 0000000..c7986dc
Binary files /dev/null and b/Resources/Font.png differ
diff --git a/Resources/Hourglass.png b/Resources/Hourglass.png
new file mode 100644
index 0000000..94c428c
Binary files /dev/null and b/Resources/Hourglass.png differ
diff --git a/Resources/Hourglass3D.png b/Resources/Hourglass3D.png
new file mode 100644
index 0000000..4902830
Binary files /dev/null and b/Resources/Hourglass3D.png differ
diff --git a/Resources/Icons/AllTextureSet2.ico b/Resources/Icons/AllTextureSet2.ico
new file mode 100644
index 0000000..7548cd8
Binary files /dev/null and b/Resources/Icons/AllTextureSet2.ico differ
diff --git a/Resources/Icons/Angle.png b/Resources/Icons/Angle.png
new file mode 100644
index 0000000..a0d67d2
Binary files /dev/null and b/Resources/Icons/Angle.png differ
diff --git a/Resources/Icons/Blockmap.png b/Resources/Icons/Blockmap.png
new file mode 100644
index 0000000..cb00844
Binary files /dev/null and b/Resources/Icons/Blockmap.png differ
diff --git a/Resources/Icons/BrightnessGradient.png b/Resources/Icons/BrightnessGradient.png
new file mode 100644
index 0000000..f88afbe
Binary files /dev/null and b/Resources/Icons/BrightnessGradient.png differ
diff --git a/Resources/Icons/BrightnessMode.png b/Resources/Icons/BrightnessMode.png
new file mode 100644
index 0000000..9321a04
Binary files /dev/null and b/Resources/Icons/BrightnessMode.png differ
diff --git a/Resources/Icons/CeilingAlign.png b/Resources/Icons/CeilingAlign.png
new file mode 100644
index 0000000..014137f
Binary files /dev/null and b/Resources/Icons/CeilingAlign.png differ
diff --git a/Resources/Icons/CeilsGradient.png b/Resources/Icons/CeilsGradient.png
new file mode 100644
index 0000000..2a7a70a
Binary files /dev/null and b/Resources/Icons/CeilsGradient.png differ
diff --git a/Resources/Icons/Close.png b/Resources/Icons/Close.png
new file mode 100644
index 0000000..e86f5f6
Binary files /dev/null and b/Resources/Icons/Close.png differ
diff --git a/Resources/Icons/ColorPick.png b/Resources/Icons/ColorPick.png
new file mode 100644
index 0000000..e9d0ae1
Binary files /dev/null and b/Resources/Icons/ColorPick.png differ
diff --git a/Resources/Icons/Copy.png b/Resources/Icons/Copy.png
new file mode 100644
index 0000000..cb3d871
Binary files /dev/null and b/Resources/Icons/Copy.png differ
diff --git a/Resources/Icons/CopyProperties.png b/Resources/Icons/CopyProperties.png
new file mode 100644
index 0000000..d69a7d4
Binary files /dev/null and b/Resources/Icons/CopyProperties.png differ
diff --git a/Resources/Icons/CurveLines.png b/Resources/Icons/CurveLines.png
new file mode 100644
index 0000000..1a213db
Binary files /dev/null and b/Resources/Icons/CurveLines.png differ
diff --git a/Resources/Icons/Cut.png b/Resources/Icons/Cut.png
new file mode 100644
index 0000000..51449ba
Binary files /dev/null and b/Resources/Icons/Cut.png differ
diff --git a/Resources/Icons/DB2.ico b/Resources/Icons/DB2.ico
new file mode 100644
index 0000000..a50ce40
Binary files /dev/null and b/Resources/Icons/DB2.ico differ
diff --git a/Resources/Icons/Dialog.ico b/Resources/Icons/Dialog.ico
new file mode 100644
index 0000000..9d0d40c
Binary files /dev/null and b/Resources/Icons/Dialog.ico differ
diff --git a/Resources/Icons/Dialog.png b/Resources/Icons/Dialog.png
new file mode 100644
index 0000000..1bbc62c
Binary files /dev/null and b/Resources/Icons/Dialog.png differ
diff --git a/Resources/Icons/Dialog2.png b/Resources/Icons/Dialog2.png
new file mode 100644
index 0000000..eb65880
Binary files /dev/null and b/Resources/Icons/Dialog2.png differ
diff --git a/Resources/Icons/ErrorLarge.png b/Resources/Icons/ErrorLarge.png
new file mode 100644
index 0000000..1b1368f
Binary files /dev/null and b/Resources/Icons/ErrorLarge.png differ
diff --git a/Resources/Icons/File.ico b/Resources/Icons/File.ico
new file mode 100644
index 0000000..c458d1e
Binary files /dev/null and b/Resources/Icons/File.ico differ
diff --git a/Resources/Icons/FileLocked.ico b/Resources/Icons/FileLocked.ico
new file mode 100644
index 0000000..7e9c2f9
Binary files /dev/null and b/Resources/Icons/FileLocked.ico differ
diff --git a/Resources/Icons/FileTextureSet.ico b/Resources/Icons/FileTextureSet.ico
new file mode 100644
index 0000000..0ecf7ce
Binary files /dev/null and b/Resources/Icons/FileTextureSet.ico differ
diff --git a/Resources/Icons/Filter.png b/Resources/Icons/Filter.png
new file mode 100644
index 0000000..334c89b
Binary files /dev/null and b/Resources/Icons/Filter.png differ
diff --git a/Resources/Icons/Find.png b/Resources/Icons/Find.png
new file mode 100644
index 0000000..c108a2c
Binary files /dev/null and b/Resources/Icons/Find.png differ
diff --git a/Resources/Icons/FlipSelectionH.png b/Resources/Icons/FlipSelectionH.png
new file mode 100644
index 0000000..2407623
Binary files /dev/null and b/Resources/Icons/FlipSelectionH.png differ
diff --git a/Resources/Icons/FlipSelectionV.png b/Resources/Icons/FlipSelectionV.png
new file mode 100644
index 0000000..cc9951c
Binary files /dev/null and b/Resources/Icons/FlipSelectionV.png differ
diff --git a/Resources/Icons/FloorAlign.png b/Resources/Icons/FloorAlign.png
new file mode 100644
index 0000000..cadfacd
Binary files /dev/null and b/Resources/Icons/FloorAlign.png differ
diff --git a/Resources/Icons/FloorsGradient.png b/Resources/Icons/FloorsGradient.png
new file mode 100644
index 0000000..3c9b47b
Binary files /dev/null and b/Resources/Icons/FloorsGradient.png differ
diff --git a/Resources/Icons/Folder.ico b/Resources/Icons/Folder.ico
new file mode 100644
index 0000000..fae0263
Binary files /dev/null and b/Resources/Icons/Folder.ico differ
diff --git a/Resources/Icons/Folder.png b/Resources/Icons/Folder.png
new file mode 100644
index 0000000..1d415fd
Binary files /dev/null and b/Resources/Icons/Folder.png differ
diff --git a/Resources/Icons/FolderLocked.ico b/Resources/Icons/FolderLocked.ico
new file mode 100644
index 0000000..cbb6050
Binary files /dev/null and b/Resources/Icons/FolderLocked.ico differ
diff --git a/Resources/Icons/FolderTextureSet.ico b/Resources/Icons/FolderTextureSet.ico
new file mode 100644
index 0000000..1e844ae
Binary files /dev/null and b/Resources/Icons/FolderTextureSet.ico differ
diff --git a/Resources/Icons/Grid.png b/Resources/Icons/Grid.png
new file mode 100644
index 0000000..e79583b
Binary files /dev/null and b/Resources/Icons/Grid.png differ
diff --git a/Resources/Icons/Grid2.png b/Resources/Icons/Grid2.png
new file mode 100644
index 0000000..d98629b
Binary files /dev/null and b/Resources/Icons/Grid2.png differ
diff --git a/Resources/Icons/Grid2_arrowup.png b/Resources/Icons/Grid2_arrowup.png
new file mode 100644
index 0000000..0015701
Binary files /dev/null and b/Resources/Icons/Grid2_arrowup.png differ
diff --git a/Resources/Icons/Grid3.png b/Resources/Icons/Grid3.png
new file mode 100644
index 0000000..5feeca4
Binary files /dev/null and b/Resources/Icons/Grid3.png differ
diff --git a/Resources/Icons/Grid4.png b/Resources/Icons/Grid4.png
new file mode 100644
index 0000000..039cfdc
Binary files /dev/null and b/Resources/Icons/Grid4.png differ
diff --git a/Resources/Icons/Gunfire.png b/Resources/Icons/Gunfire.png
new file mode 100644
index 0000000..90e3175
Binary files /dev/null and b/Resources/Icons/Gunfire.png differ
diff --git a/Resources/Icons/HeightsMode.png b/Resources/Icons/HeightsMode.png
new file mode 100644
index 0000000..6a15ca9
Binary files /dev/null and b/Resources/Icons/HeightsMode.png differ
diff --git a/Resources/Icons/Help.png b/Resources/Icons/Help.png
new file mode 100644
index 0000000..cd784fb
Binary files /dev/null and b/Resources/Icons/Help.png differ
diff --git a/Resources/Icons/Image.png b/Resources/Icons/Image.png
new file mode 100644
index 0000000..ffc9429
Binary files /dev/null and b/Resources/Icons/Image.png differ
diff --git a/Resources/Icons/Keys.ico b/Resources/Icons/Keys.ico
new file mode 100644
index 0000000..34a18d2
Binary files /dev/null and b/Resources/Icons/Keys.ico differ
diff --git a/Resources/Icons/KnownTextureSet.ico b/Resources/Icons/KnownTextureSet.ico
new file mode 100644
index 0000000..db924ed
Binary files /dev/null and b/Resources/Icons/KnownTextureSet.ico differ
diff --git a/Resources/Icons/KnownTextureSet.png b/Resources/Icons/KnownTextureSet.png
new file mode 100644
index 0000000..36c25b5
Binary files /dev/null and b/Resources/Icons/KnownTextureSet.png differ
diff --git a/Resources/Icons/KnownTextureSet2.ico b/Resources/Icons/KnownTextureSet2.ico
new file mode 100644
index 0000000..9268707
Binary files /dev/null and b/Resources/Icons/KnownTextureSet2.ico differ
diff --git a/Resources/Icons/LinesMode.png b/Resources/Icons/LinesMode.png
new file mode 100644
index 0000000..aa96cfd
Binary files /dev/null and b/Resources/Icons/LinesMode.png differ
diff --git a/Resources/Icons/List.png b/Resources/Icons/List.png
new file mode 100644
index 0000000..acc30b8
Binary files /dev/null and b/Resources/Icons/List.png differ
diff --git a/Resources/Icons/List_Images.png b/Resources/Icons/List_Images.png
new file mode 100644
index 0000000..248eaf1
Binary files /dev/null and b/Resources/Icons/List_Images.png differ
diff --git a/Resources/Icons/MapAnalysisMode.png b/Resources/Icons/MapAnalysisMode.png
new file mode 100644
index 0000000..ad1cc7f
Binary files /dev/null and b/Resources/Icons/MapAnalysisMode.png differ
diff --git a/Resources/Icons/Monster.png b/Resources/Icons/Monster.png
new file mode 100644
index 0000000..a817724
Binary files /dev/null and b/Resources/Icons/Monster.png differ
diff --git a/Resources/Icons/Monster2.png b/Resources/Icons/Monster2.png
new file mode 100644
index 0000000..7542cfe
Binary files /dev/null and b/Resources/Icons/Monster2.png differ
diff --git a/Resources/Icons/Monster3.png b/Resources/Icons/Monster3.png
new file mode 100644
index 0000000..7da1760
Binary files /dev/null and b/Resources/Icons/Monster3.png differ
diff --git a/Resources/Icons/NewMap.png b/Resources/Icons/NewMap.png
new file mode 100644
index 0000000..d8a0cc0
Binary files /dev/null and b/Resources/Icons/NewMap.png differ
diff --git a/Resources/Icons/NewMap2.png b/Resources/Icons/NewMap2.png
new file mode 100644
index 0000000..aee6681
Binary files /dev/null and b/Resources/Icons/NewMap2.png differ
diff --git a/Resources/Icons/NewScript.png b/Resources/Icons/NewScript.png
new file mode 100644
index 0000000..9e6fe95
Binary files /dev/null and b/Resources/Icons/NewScript.png differ
diff --git a/Resources/Icons/NewSector.png b/Resources/Icons/NewSector.png
new file mode 100644
index 0000000..b386103
Binary files /dev/null and b/Resources/Icons/NewSector.png differ
diff --git a/Resources/Icons/NewSector2.png b/Resources/Icons/NewSector2.png
new file mode 100644
index 0000000..dbdbe09
Binary files /dev/null and b/Resources/Icons/NewSector2.png differ
diff --git a/Resources/Icons/OpenMap.png b/Resources/Icons/OpenMap.png
new file mode 100644
index 0000000..b3731a6
Binary files /dev/null and b/Resources/Icons/OpenMap.png differ
diff --git a/Resources/Icons/OpenScript.png b/Resources/Icons/OpenScript.png
new file mode 100644
index 0000000..210ff23
Binary files /dev/null and b/Resources/Icons/OpenScript.png differ
diff --git a/Resources/Icons/OthersTextureSet.ico b/Resources/Icons/OthersTextureSet.ico
new file mode 100644
index 0000000..884cf4f
Binary files /dev/null and b/Resources/Icons/OthersTextureSet.ico differ
diff --git a/Resources/Icons/OthersTextureSet2.ico b/Resources/Icons/OthersTextureSet2.ico
new file mode 100644
index 0000000..71045a8
Binary files /dev/null and b/Resources/Icons/OthersTextureSet2.ico differ
diff --git a/Resources/Icons/PK3.ico b/Resources/Icons/PK3.ico
new file mode 100644
index 0000000..b6e6e8d
Binary files /dev/null and b/Resources/Icons/PK3.ico differ
diff --git a/Resources/Icons/PK3Locked.ico b/Resources/Icons/PK3Locked.ico
new file mode 100644
index 0000000..11dba09
Binary files /dev/null and b/Resources/Icons/PK3Locked.ico differ
diff --git a/Resources/Icons/PK3TextureSet.ico b/Resources/Icons/PK3TextureSet.ico
new file mode 100644
index 0000000..7d3955f
Binary files /dev/null and b/Resources/Icons/PK3TextureSet.ico differ
diff --git a/Resources/Icons/Paste.png b/Resources/Icons/Paste.png
new file mode 100644
index 0000000..95d9df6
Binary files /dev/null and b/Resources/Icons/Paste.png differ
diff --git a/Resources/Icons/PasteProperties.png b/Resources/Icons/PasteProperties.png
new file mode 100644
index 0000000..55a76db
Binary files /dev/null and b/Resources/Icons/PasteProperties.png differ
diff --git a/Resources/Icons/PasteSpecial.png b/Resources/Icons/PasteSpecial.png
new file mode 100644
index 0000000..cc39545
Binary files /dev/null and b/Resources/Icons/PasteSpecial.png differ
diff --git a/Resources/Icons/Pencil.png b/Resources/Icons/Pencil.png
new file mode 100644
index 0000000..5317f8c
Binary files /dev/null and b/Resources/Icons/Pencil.png differ
diff --git a/Resources/Icons/Player.png b/Resources/Icons/Player.png
new file mode 100644
index 0000000..79ed518
Binary files /dev/null and b/Resources/Icons/Player.png differ
diff --git a/Resources/Icons/Prefab.png b/Resources/Icons/Prefab.png
new file mode 100644
index 0000000..54561df
Binary files /dev/null and b/Resources/Icons/Prefab.png differ
diff --git a/Resources/Icons/Prefab2.png b/Resources/Icons/Prefab2.png
new file mode 100644
index 0000000..c46beb6
Binary files /dev/null and b/Resources/Icons/Prefab2.png differ
diff --git a/Resources/Icons/Properties.png b/Resources/Icons/Properties.png
new file mode 100644
index 0000000..e3cfc7c
Binary files /dev/null and b/Resources/Icons/Properties.png differ
diff --git a/Resources/Icons/Property.png b/Resources/Icons/Property.png
new file mode 100644
index 0000000..7a424bf
Binary files /dev/null and b/Resources/Icons/Property.png differ
diff --git a/Resources/Icons/PropertyUnknown.png b/Resources/Icons/PropertyUnknown.png
new file mode 100644
index 0000000..8ce7d39
Binary files /dev/null and b/Resources/Icons/PropertyUnknown.png differ
diff --git a/Resources/Icons/Pushpin.png b/Resources/Icons/Pushpin.png
new file mode 100644
index 0000000..a4e0ac2
Binary files /dev/null and b/Resources/Icons/Pushpin.png differ
diff --git a/Resources/Icons/Question.png b/Resources/Icons/Question.png
new file mode 100644
index 0000000..7727557
Binary files /dev/null and b/Resources/Icons/Question.png differ
diff --git a/Resources/Icons/Redo.png b/Resources/Icons/Redo.png
new file mode 100644
index 0000000..3e05a40
Binary files /dev/null and b/Resources/Icons/Redo.png differ
diff --git a/Resources/Icons/SaveAll.png b/Resources/Icons/SaveAll.png
new file mode 100644
index 0000000..845a49c
Binary files /dev/null and b/Resources/Icons/SaveAll.png differ
diff --git a/Resources/Icons/SaveMap.png b/Resources/Icons/SaveMap.png
new file mode 100644
index 0000000..e4adbbc
Binary files /dev/null and b/Resources/Icons/SaveMap.png differ
diff --git a/Resources/Icons/SaveScript.png b/Resources/Icons/SaveScript.png
new file mode 100644
index 0000000..e5ac50d
Binary files /dev/null and b/Resources/Icons/SaveScript.png differ
diff --git a/Resources/Icons/Script.ico b/Resources/Icons/Script.ico
new file mode 100644
index 0000000..2f7362b
Binary files /dev/null and b/Resources/Icons/Script.ico differ
diff --git a/Resources/Icons/Script.png b/Resources/Icons/Script.png
new file mode 100644
index 0000000..022a785
Binary files /dev/null and b/Resources/Icons/Script.png differ
diff --git a/Resources/Icons/Script2.ico b/Resources/Icons/Script2.ico
new file mode 100644
index 0000000..d00360a
Binary files /dev/null and b/Resources/Icons/Script2.ico differ
diff --git a/Resources/Icons/Script2.png b/Resources/Icons/Script2.png
new file mode 100644
index 0000000..80f929b
Binary files /dev/null and b/Resources/Icons/Script2.png differ
diff --git a/Resources/Icons/ScriptCompile.png b/Resources/Icons/ScriptCompile.png
new file mode 100644
index 0000000..8e5d4d6
Binary files /dev/null and b/Resources/Icons/ScriptCompile.png differ
diff --git a/Resources/Icons/ScriptConstant.png b/Resources/Icons/ScriptConstant.png
new file mode 100644
index 0000000..a91a848
Binary files /dev/null and b/Resources/Icons/ScriptConstant.png differ
diff --git a/Resources/Icons/ScriptConstant.xpm b/Resources/Icons/ScriptConstant.xpm
new file mode 100644
index 0000000..cb7a992
--- /dev/null
+++ b/Resources/Icons/ScriptConstant.xpm
@@ -0,0 +1,95 @@
+/* XPM */
+static char *image_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 74 1",
+"  c #00ffff",
+". c #eceff4",
+"+ c #e5e8ee",
+"@ c #4e607a",
+"# c #fbfbfc",
+"$ c #c4ccda",
+"% c #a2adc4",
+"& c #3f546e",
+"* c #8494ad",
+"= c #8796af",
+"- c #ffffff",
+"; c #d3dae3",
+"> c #485c75",
+", c #93a2bb",
+"' c #9da9c1",
+") c #96a3bc",
+"! c #eceff3",
+"~ c #dce0e8",
+"{ c #556880",
+"] c #f4f6f8",
+"^ c #9ba8bf",
+"/ c #dce0e9",
+"( c #52667e",
+"_ c #e4e7ee",
+": c #a6b1c6",
+"< c #586a83",
+"[ c #ccd2df",
+"} c #b5bdc8",
+"| c #b5bed0",
+"1 c #40546e",
+"2 c #adb8cc",
+"3 c #9fabc3",
+"4 c #edeff3",
+"5 c #ccd3df",
+"6 c #e4e8ef",
+"7 c #8b9ab3",
+"8 c #d8dde6",
+"9 c #f4f5f8",
+"0 c #acb8cb",
+"a c #798aa3",
+"b c #909eb7",
+"c c #d3d9e3",
+"d c #d4d9e3",
+"e c #e4e8ee",
+"f c #fafbfc",
+"g c #aab4c9",
+"h c #3b4f6a",
+"i c #d3d9e4",
+"j c #b4bed0",
+"k c #e5e7ee",
+"l c #374b67",
+"m c #334863",
+"n c #a5b1c6",
+"o c #52657e",
+"p c #a9b4c9",
+"q c #dce1e9",
+"r c #66778e",
+"s c #435771",
+"t c #a4aeba",
+"u c #5d7088",
+"v c #f5f6f9",
+"w c #465a73",
+"x c #8e9cb5",
+"y c #7f8fa8",
+"z c #394e68",
+"A c #ccd2de",
+"B c #c5ccda",
+"C c #a3afc5",
+"D c #3e536d",
+"E c #bcc5d5",
+"F c #8998b2",
+"G c #ccd3de",
+"H c #cbd3df",
+"I c #dbe1e9",
+"                ",
+"                ",
+"                ",
+"                ",
+"   8p%^,xF*ya}  ",
+"   g--f9!k~d5r  ",
+"   C-#v._IiABu  ",
+"   '#].(&mG$E{  ",
+"   )]46/cHBE|@  ",
+"   b!e~o1mEj0w  ",
+"   7+qd[$E|2nD  ",
+"   =/;G$E|0:3z  ",
+"   }u<o@>sDhlt  ",
+"                ",
+"                ",
+"                ",
+};
\ No newline at end of file
diff --git a/Resources/Icons/ScriptError.png b/Resources/Icons/ScriptError.png
new file mode 100644
index 0000000..4049fe1
Binary files /dev/null and b/Resources/Icons/ScriptError.png differ
diff --git a/Resources/Icons/ScriptError.xpm b/Resources/Icons/ScriptError.xpm
new file mode 100644
index 0000000..38a7d55
--- /dev/null
+++ b/Resources/Icons/ScriptError.xpm
@@ -0,0 +1,100 @@
+/* XPM */
+static char *image_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 79 1",
+"  c #00ffff",
+". c #f33b00",
+"+ c #ea3900",
+"@ c #ee3a00",
+"# c #e43600",
+"$ c #ba7a64",
+"% c #ff8b65",
+"& c #ff7c52",
+"* c #ffbea9",
+"= c #ffa183",
+"- c #f87247",
+"; c #ff9a79",
+"> c #d49b8a",
+", c #bd3306",
+"' c #f1ab95",
+") c #ff6a39",
+"! c #ff6f41",
+"~ c #d19481",
+"{ c #fb7950",
+"] c #7c250a",
+"^ c #fe5c28",
+"/ c #ff5f2c",
+"( c #ff8e69",
+"_ c #dc9d89",
+": c #e5b6a7",
+"< c #ff9c7c",
+"[ c #fe7f56",
+"} c #fb8660",
+"| c #fa8059",
+"1 c #fd5721",
+"2 c #f29679",
+"3 c #ffa487",
+"4 c #fa4409",
+"5 c #fb480d",
+"6 c #e0ad9d",
+"7 c #dc957e",
+"8 c #b9725a",
+"9 c #bb5a3b",
+"0 c #e23903",
+"a c #77311b",
+"b c #e35a2e",
+"c c #b62f05",
+"d c #feb8a2",
+"e c #fed8cc",
+"f c #f83e02",
+"g c #7f2e14",
+"h c #6e2a14",
+"i c #d03c0c",
+"j c #dda797",
+"k c #fec7b5",
+"l c #b27967",
+"m c #fed3c5",
+"n c #fb5018",
+"o c #f94107",
+"p c #a45f49",
+"q c #f2d8cf",
+"r c #ddaa9b",
+"s c #ffa88d",
+"t c #ff6d3e",
+"u c #ac4d2e",
+"v c #ff612d",
+"w c #fefefe",
+"x c #fd521b",
+"y c #b8411c",
+"z c #ffc4b1",
+"A c #c66b50",
+"B c #d48c75",
+"C c #dc3602",
+"D c #dd4c1c",
+"E c #d4947f",
+"F c #ee734c",
+"G c #962a09",
+"H c #ff8660",
+"I c #933e23",
+"J c #d9704d",
+"K c #ffb197",
+"L c #d58970",
+"M c #e5a38d",
+"N c #ecc2b4",
+"                ",
+"    e6_>~L~e    ",
+"   NjM2}{FJA7   ",
+"  Nr'3;%&tvb9B  ",
+" qj'Ks*ww=vxDuq ",
+" :M3s3mwwk/x4y$ ",
+" _2;<;zwwd^noiI ",
+" >}%(%Kww;15f0a ",
+" ~{&[&Hwwtn4.Ch ",
+" LFt!t)(Hx5f+,g ",
+" :J/v/%ww{f@#Gp ",
+" qAbxx[ww|@#c]q ",
+"  _9D4o--+#c]l  ",
+"   Euyi0C,G]l   ",
+"    q8Iahgpq    ",
+"                ",
+};
\ No newline at end of file
diff --git a/Resources/Icons/ScriptError2.png b/Resources/Icons/ScriptError2.png
new file mode 100644
index 0000000..95ac68e
Binary files /dev/null and b/Resources/Icons/ScriptError2.png differ
diff --git a/Resources/Icons/ScriptError3.png b/Resources/Icons/ScriptError3.png
new file mode 100644
index 0000000..b5fc9ca
Binary files /dev/null and b/Resources/Icons/ScriptError3.png differ
diff --git a/Resources/Icons/ScriptHelp.png b/Resources/Icons/ScriptHelp.png
new file mode 100644
index 0000000..c319c00
Binary files /dev/null and b/Resources/Icons/ScriptHelp.png differ
diff --git a/Resources/Icons/ScriptKeyword.png b/Resources/Icons/ScriptKeyword.png
new file mode 100644
index 0000000..78a63bd
Binary files /dev/null and b/Resources/Icons/ScriptKeyword.png differ
diff --git a/Resources/Icons/ScriptKeyword.xpm b/Resources/Icons/ScriptKeyword.xpm
new file mode 100644
index 0000000..40fe11d
--- /dev/null
+++ b/Resources/Icons/ScriptKeyword.xpm
@@ -0,0 +1,92 @@
+/* XPM */
+static char *image_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 71 1",
+"  c #00ffff",
+". c #8e468f",
+"+ c #edd8ed",
+"@ c #8d358e",
+"# c #f4e6f4",
+"$ c #a74fa8",
+"% c #a950aa",
+"& c #d5d5ac",
+"* c #a952aa",
+"= c #f0e3f0",
+"- c #acb4ae",
+"; c #e2afe2",
+"> c #712472",
+", c #f2dbf2",
+"' c #f0d4f0",
+") c #7c2d7d",
+"! c #ee9def",
+"~ c #7e2e7e",
+"{ c #d36ed4",
+"] c #eb91ec",
+"^ c #f0d5f0",
+"/ c #9f3c9f",
+"( c #752775",
+"_ c #cb67cc",
+": c #eea5ef",
+"< c #e8d1e8",
+"[ c #965297",
+"} c #a650a7",
+"| c #c1c4ac",
+"1 c #d56fd5",
+"2 c #f3e3f3",
+"3 c #fefbfe",
+"4 c #7f3080",
+"5 c #ecd2ec",
+"6 c #d26bd3",
+"7 c #7e307f",
+"8 c #eebeee",
+"9 c #a850a9",
+"0 c #7a2b7b",
+"a c #e9e5ab",
+"b c #953896",
+"c c #fa9bfb",
+"d c #b5bbad",
+"e c #bc70bd",
+"f c #fa98fb",
+"g c #904e91",
+"h c #e698e7",
+"i c #e5e2ab",
+"j c #faaefb",
+"k c #dd98de",
+"l c #e4cae4",
+"m c #e6cce6",
+"n c #7c2e7c",
+"o c #ccceac",
+"p c #faabfb",
+"q c #9ca7ae",
+"r c #bb6fbc",
+"s c #cf88cf",
+"t c #9c3c9d",
+"u c #e990ea",
+"v c #e3ace3",
+"w c #f7f0ab",
+"x c #d16ad2",
+"y c #fa9ffb",
+"z c #ebd1eb",
+"A c #acb5ad",
+"B c #8a99ae",
+"C c #fa99fb",
+"D c #f2e0f3",
+"E c #98a4ae",
+"F c #d16dd2",
+"                ",
+"           3    ",
+"          ,s=   ",
+"         ,svs2  ",
+"        's8j]sD ",
+"   w&-B s;pffus#",
+"        }r:cfChg",
+" wa&|AE $Fr:y![n",
+"        *x1ek.t~",
+"  wiodq l96{7/@)",
+"         <%_~b0^",
+"          +94(z ",
+"           5>m  ",
+"                ",
+"                ",
+"                ",
+};
\ No newline at end of file
diff --git a/Resources/Icons/ScriptPalette.png b/Resources/Icons/ScriptPalette.png
new file mode 100644
index 0000000..20f9d69
Binary files /dev/null and b/Resources/Icons/ScriptPalette.png differ
diff --git a/Resources/Icons/SectorsMode.png b/Resources/Icons/SectorsMode.png
new file mode 100644
index 0000000..a804452
Binary files /dev/null and b/Resources/Icons/SectorsMode.png differ
diff --git a/Resources/Icons/Selection.png b/Resources/Icons/Selection.png
new file mode 100644
index 0000000..486d40c
Binary files /dev/null and b/Resources/Icons/Selection.png differ
diff --git a/Resources/Icons/Selection3.png b/Resources/Icons/Selection3.png
new file mode 100644
index 0000000..5418b6e
Binary files /dev/null and b/Resources/Icons/Selection3.png differ
diff --git a/Resources/Icons/SelectionApply.png b/Resources/Icons/SelectionApply.png
new file mode 100644
index 0000000..8bb24ee
Binary files /dev/null and b/Resources/Icons/SelectionApply.png differ
diff --git a/Resources/Icons/Status0.png b/Resources/Icons/Status0.png
new file mode 100644
index 0000000..d6ce784
Binary files /dev/null and b/Resources/Icons/Status0.png differ
diff --git a/Resources/Icons/Status1.png b/Resources/Icons/Status1.png
new file mode 100644
index 0000000..84e2ace
Binary files /dev/null and b/Resources/Icons/Status1.png differ
diff --git a/Resources/Icons/Status10.png b/Resources/Icons/Status10.png
new file mode 100644
index 0000000..092d098
Binary files /dev/null and b/Resources/Icons/Status10.png differ
diff --git a/Resources/Icons/Status11.png b/Resources/Icons/Status11.png
new file mode 100644
index 0000000..2b033bc
Binary files /dev/null and b/Resources/Icons/Status11.png differ
diff --git a/Resources/Icons/Status12.png b/Resources/Icons/Status12.png
new file mode 100644
index 0000000..68a477d
Binary files /dev/null and b/Resources/Icons/Status12.png differ
diff --git a/Resources/Icons/Status2.png b/Resources/Icons/Status2.png
new file mode 100644
index 0000000..386e0d5
Binary files /dev/null and b/Resources/Icons/Status2.png differ
diff --git a/Resources/Icons/Switch.png b/Resources/Icons/Switch.png
new file mode 100644
index 0000000..77fa0f0
Binary files /dev/null and b/Resources/Icons/Switch.png differ
diff --git a/Resources/Icons/Test.png b/Resources/Icons/Test.png
new file mode 100644
index 0000000..a1a46b0
Binary files /dev/null and b/Resources/Icons/Test.png differ
diff --git a/Resources/Icons/Text.png b/Resources/Icons/Text.png
new file mode 100644
index 0000000..82b80f3
Binary files /dev/null and b/Resources/Icons/Text.png differ
diff --git a/Resources/Icons/TextLump.png b/Resources/Icons/TextLump.png
new file mode 100644
index 0000000..1a56c52
Binary files /dev/null and b/Resources/Icons/TextLump.png differ
diff --git a/Resources/Icons/Things/thing00.png b/Resources/Icons/Things/thing00.png
new file mode 100644
index 0000000..47f5bde
Binary files /dev/null and b/Resources/Icons/Things/thing00.png differ
diff --git a/Resources/Icons/Things/thing01.png b/Resources/Icons/Things/thing01.png
new file mode 100644
index 0000000..c49c33a
Binary files /dev/null and b/Resources/Icons/Things/thing01.png differ
diff --git a/Resources/Icons/Things/thing02.png b/Resources/Icons/Things/thing02.png
new file mode 100644
index 0000000..bf51903
Binary files /dev/null and b/Resources/Icons/Things/thing02.png differ
diff --git a/Resources/Icons/Things/thing03.png b/Resources/Icons/Things/thing03.png
new file mode 100644
index 0000000..3c74cc7
Binary files /dev/null and b/Resources/Icons/Things/thing03.png differ
diff --git a/Resources/Icons/Things/thing04.png b/Resources/Icons/Things/thing04.png
new file mode 100644
index 0000000..d7de73f
Binary files /dev/null and b/Resources/Icons/Things/thing04.png differ
diff --git a/Resources/Icons/Things/thing05.png b/Resources/Icons/Things/thing05.png
new file mode 100644
index 0000000..40dc113
Binary files /dev/null and b/Resources/Icons/Things/thing05.png differ
diff --git a/Resources/Icons/Things/thing06.png b/Resources/Icons/Things/thing06.png
new file mode 100644
index 0000000..b57ff3b
Binary files /dev/null and b/Resources/Icons/Things/thing06.png differ
diff --git a/Resources/Icons/Things/thing07.png b/Resources/Icons/Things/thing07.png
new file mode 100644
index 0000000..336ef73
Binary files /dev/null and b/Resources/Icons/Things/thing07.png differ
diff --git a/Resources/Icons/Things/thing08.png b/Resources/Icons/Things/thing08.png
new file mode 100644
index 0000000..83ca501
Binary files /dev/null and b/Resources/Icons/Things/thing08.png differ
diff --git a/Resources/Icons/Things/thing09.png b/Resources/Icons/Things/thing09.png
new file mode 100644
index 0000000..5bce3d2
Binary files /dev/null and b/Resources/Icons/Things/thing09.png differ
diff --git a/Resources/Icons/Things/thing10.png b/Resources/Icons/Things/thing10.png
new file mode 100644
index 0000000..d012a50
Binary files /dev/null and b/Resources/Icons/Things/thing10.png differ
diff --git a/Resources/Icons/Things/thing11.png b/Resources/Icons/Things/thing11.png
new file mode 100644
index 0000000..e1deb45
Binary files /dev/null and b/Resources/Icons/Things/thing11.png differ
diff --git a/Resources/Icons/Things/thing12.png b/Resources/Icons/Things/thing12.png
new file mode 100644
index 0000000..22aef82
Binary files /dev/null and b/Resources/Icons/Things/thing12.png differ
diff --git a/Resources/Icons/Things/thing13.png b/Resources/Icons/Things/thing13.png
new file mode 100644
index 0000000..c8f5807
Binary files /dev/null and b/Resources/Icons/Things/thing13.png differ
diff --git a/Resources/Icons/Things/thing14.png b/Resources/Icons/Things/thing14.png
new file mode 100644
index 0000000..9148c15
Binary files /dev/null and b/Resources/Icons/Things/thing14.png differ
diff --git a/Resources/Icons/Things/thing15.png b/Resources/Icons/Things/thing15.png
new file mode 100644
index 0000000..332fe80
Binary files /dev/null and b/Resources/Icons/Things/thing15.png differ
diff --git a/Resources/Icons/Things/thing16.png b/Resources/Icons/Things/thing16.png
new file mode 100644
index 0000000..621ee1f
Binary files /dev/null and b/Resources/Icons/Things/thing16.png differ
diff --git a/Resources/Icons/Things/thing17.png b/Resources/Icons/Things/thing17.png
new file mode 100644
index 0000000..bc9f7bf
Binary files /dev/null and b/Resources/Icons/Things/thing17.png differ
diff --git a/Resources/Icons/Things/thing18.png b/Resources/Icons/Things/thing18.png
new file mode 100644
index 0000000..eeb3dba
Binary files /dev/null and b/Resources/Icons/Things/thing18.png differ
diff --git a/Resources/Icons/Things/thing19.png b/Resources/Icons/Things/thing19.png
new file mode 100644
index 0000000..0830fa7
Binary files /dev/null and b/Resources/Icons/Things/thing19.png differ
diff --git a/Resources/Icons/ThingsListIcon.png b/Resources/Icons/ThingsListIcon.png
new file mode 100644
index 0000000..0d124f0
Binary files /dev/null and b/Resources/Icons/ThingsListIcon.png differ
diff --git a/Resources/Icons/ThingsMode.png b/Resources/Icons/ThingsMode.png
new file mode 100644
index 0000000..2bfc8a8
Binary files /dev/null and b/Resources/Icons/ThingsMode.png differ
diff --git a/Resources/Icons/TriangulatorMode.png b/Resources/Icons/TriangulatorMode.png
new file mode 100644
index 0000000..22a883d
Binary files /dev/null and b/Resources/Icons/TriangulatorMode.png differ
diff --git a/Resources/Icons/Undo.png b/Resources/Icons/Undo.png
new file mode 100644
index 0000000..a5226e3
Binary files /dev/null and b/Resources/Icons/Undo.png differ
diff --git a/Resources/Icons/VerticesMode.png b/Resources/Icons/VerticesMode.png
new file mode 100644
index 0000000..891363d
Binary files /dev/null and b/Resources/Icons/VerticesMode.png differ
diff --git a/Resources/Icons/ViewBrightness.png b/Resources/Icons/ViewBrightness.png
new file mode 100644
index 0000000..9b6df92
Binary files /dev/null and b/Resources/Icons/ViewBrightness.png differ
diff --git a/Resources/Icons/ViewNormal.png b/Resources/Icons/ViewNormal.png
new file mode 100644
index 0000000..785bd8f
Binary files /dev/null and b/Resources/Icons/ViewNormal.png differ
diff --git a/Resources/Icons/ViewSelectionIndex.png b/Resources/Icons/ViewSelectionIndex.png
new file mode 100644
index 0000000..96b7756
Binary files /dev/null and b/Resources/Icons/ViewSelectionIndex.png differ
diff --git a/Resources/Icons/ViewTextureCeiling.png b/Resources/Icons/ViewTextureCeiling.png
new file mode 100644
index 0000000..584d83d
Binary files /dev/null and b/Resources/Icons/ViewTextureCeiling.png differ
diff --git a/Resources/Icons/ViewTextureFloor.png b/Resources/Icons/ViewTextureFloor.png
new file mode 100644
index 0000000..65617fd
Binary files /dev/null and b/Resources/Icons/ViewTextureFloor.png differ
diff --git a/Resources/Icons/VisualMode.png b/Resources/Icons/VisualMode.png
new file mode 100644
index 0000000..e528ccf
Binary files /dev/null and b/Resources/Icons/VisualMode.png differ
diff --git a/Resources/Icons/VisualModeZ.png b/Resources/Icons/VisualModeZ.png
new file mode 100644
index 0000000..110541d
Binary files /dev/null and b/Resources/Icons/VisualModeZ.png differ
diff --git a/Resources/Icons/WAuthor.png b/Resources/Icons/WAuthor.png
new file mode 100644
index 0000000..b98bed4
Binary files /dev/null and b/Resources/Icons/WAuthor.png differ
diff --git a/Resources/Icons/WadTextureSet.png b/Resources/Icons/WadTextureSet.png
new file mode 100644
index 0000000..58f5833
Binary files /dev/null and b/Resources/Icons/WadTextureSet.png differ
diff --git a/Resources/Icons/Warning.png b/Resources/Icons/Warning.png
new file mode 100644
index 0000000..083b8cb
Binary files /dev/null and b/Resources/Icons/Warning.png differ
diff --git a/Resources/Icons/WarningLarge.png b/Resources/Icons/WarningLarge.png
new file mode 100644
index 0000000..5a5eea4
Binary files /dev/null and b/Resources/Icons/WarningLarge.png differ
diff --git a/Resources/Icons/WarningOff.png b/Resources/Icons/WarningOff.png
new file mode 100644
index 0000000..5532475
Binary files /dev/null and b/Resources/Icons/WarningOff.png differ
diff --git a/Resources/Icons/Zoom.png b/Resources/Icons/Zoom.png
new file mode 100644
index 0000000..629fe83
Binary files /dev/null and b/Resources/Icons/Zoom.png differ
diff --git a/Resources/Icons/Zoom_arrowup.png b/Resources/Icons/Zoom_arrowup.png
new file mode 100644
index 0000000..7cc806b
Binary files /dev/null and b/Resources/Icons/Zoom_arrowup.png differ
diff --git a/Resources/Icons/book_closed.png b/Resources/Icons/book_closed.png
new file mode 100644
index 0000000..5b8aa83
Binary files /dev/null and b/Resources/Icons/book_closed.png differ
diff --git a/Resources/Icons/book_open.png b/Resources/Icons/book_open.png
new file mode 100644
index 0000000..36da1cd
Binary files /dev/null and b/Resources/Icons/book_open.png differ
diff --git a/Resources/Icons/db16x16-32bit.ico b/Resources/Icons/db16x16-32bit.ico
new file mode 100644
index 0000000..dab0779
Binary files /dev/null and b/Resources/Icons/db16x16-32bit.ico differ
diff --git a/Resources/Icons/db16x16-8bit.ico b/Resources/Icons/db16x16-8bit.ico
new file mode 100644
index 0000000..9acc648
Binary files /dev/null and b/Resources/Icons/db16x16-8bit.ico differ
diff --git a/Resources/Icons/db256x256-32bit.ico b/Resources/Icons/db256x256-32bit.ico
new file mode 100644
index 0000000..ac6fe00
Binary files /dev/null and b/Resources/Icons/db256x256-32bit.ico differ
diff --git a/Resources/Icons/db32x32-32bit.ico b/Resources/Icons/db32x32-32bit.ico
new file mode 100644
index 0000000..375a0d3
Binary files /dev/null and b/Resources/Icons/db32x32-32bit.ico differ
diff --git a/Resources/Icons/db32x32-8bit.ico b/Resources/Icons/db32x32-8bit.ico
new file mode 100644
index 0000000..a9fcf18
Binary files /dev/null and b/Resources/Icons/db32x32-8bit.ico differ
diff --git a/Resources/Icons/db48x48-32bit.ico b/Resources/Icons/db48x48-32bit.ico
new file mode 100644
index 0000000..71c715d
Binary files /dev/null and b/Resources/Icons/db48x48-32bit.ico differ
diff --git a/Resources/Icons/db48x48-8bit.ico b/Resources/Icons/db48x48-8bit.ico
new file mode 100644
index 0000000..8a4ed77
Binary files /dev/null and b/Resources/Icons/db48x48-8bit.ico differ
diff --git a/Resources/Icons/mergegeometry.png b/Resources/Icons/mergegeometry.png
new file mode 100644
index 0000000..c9c4427
Binary files /dev/null and b/Resources/Icons/mergegeometry.png differ
diff --git a/Resources/Icons/mergegeometry2.png b/Resources/Icons/mergegeometry2.png
new file mode 100644
index 0000000..f8af3f1
Binary files /dev/null and b/Resources/Icons/mergegeometry2.png differ
diff --git a/Resources/Icons/page_user.png b/Resources/Icons/page_user.png
new file mode 100644
index 0000000..08618f6
Binary files /dev/null and b/Resources/Icons/page_user.png differ
diff --git a/Resources/Icons/tag_blue.png b/Resources/Icons/tag_blue.png
new file mode 100644
index 0000000..9757fc6
Binary files /dev/null and b/Resources/Icons/tag_blue.png differ
diff --git a/Resources/Icons/treeview.png b/Resources/Icons/treeview.png
new file mode 100644
index 0000000..0bbd274
Binary files /dev/null and b/Resources/Icons/treeview.png differ
diff --git a/Resources/MissingTexture.png b/Resources/MissingTexture.png
new file mode 100644
index 0000000..b9c3828
Binary files /dev/null and b/Resources/MissingTexture.png differ
diff --git a/Resources/MissingTexture3D.png b/Resources/MissingTexture3D.png
new file mode 100644
index 0000000..e354202
Binary files /dev/null and b/Resources/MissingTexture3D.png differ
diff --git a/Resources/Nothing.png b/Resources/Nothing.png
new file mode 100644
index 0000000..5d1275a
Binary files /dev/null and b/Resources/Nothing.png differ
diff --git a/Resources/Shaders.fxcproj b/Resources/Shaders.fxcproj
new file mode 100644
index 0000000..1421086
--- /dev/null
+++ b/Resources/Shaders.fxcproj
@@ -0,0 +1,60 @@
+<project>
+  <current_configuration value="Debug" />
+  <configurations>
+    <configuration name="Debug">
+      <settings category="Project\Direct3D\HLSL Compiler">
+        <CompilerOptions value="" />
+      </settings>
+      <settings category="Project\OpenGL\CgCompiler">
+        <CompilerOptions value="" />
+      </settings>
+      <settings category="Project\Paths">
+        <Includes value="" />
+        <Models value="" />
+        <Scripts value="" />
+        <Shaders value="" />
+        <Textures value="" />
+      </settings>
+      <settings category="Project\Settings">
+        <BindLightToUnboundMaterials value="False" />
+      </settings>
+      <settings category="Project\COLLADA Common Profile">
+        <EnvironmentMap value="" />
+        <DisableCommonProfileTransparency value="False" />
+      </settings>
+    </configuration>
+    <configuration name="Release">
+      <settings category="Project\Direct3D\HLSL Compiler">
+        <CompilerOptions value="" />
+      </settings>
+      <settings category="Project\OpenGL\CgCompiler">
+        <CompilerOptions value="" />
+      </settings>
+      <settings category="Project\Paths">
+        <Includes value="" />
+        <Models value="" />
+        <Scripts value="" />
+        <Shaders value="" />
+        <Textures value="" />
+      </settings>
+      <settings category="Project\Settings">
+        <BindLightToUnboundMaterials value="False" />
+      </settings>
+      <settings category="Project\COLLADA Common Profile">
+        <EnvironmentMap value="" />
+        <DisableCommonProfileTransparency value="False" />
+      </settings>
+    </configuration>
+  </configurations>
+  <assetFile uri="base2d.dae" />
+  <activeAssetCollection uri="base2d.dae" />
+  <customConfigurations>
+    <FXComposer.Scene.Services.FXSceneService>
+      <background_color color="0.5 0.5 0.5 1" />
+    </FXComposer.Scene.Services.FXSceneService>
+    <FXComposer.Scene.Services.FXRenderPortService>
+      <renderPort name="Direct3D9" />
+      <renderPort name="OpenGL" />
+    </FXComposer.Scene.Services.FXRenderPortService>
+  </customConfigurations>
+</project>
\ No newline at end of file
diff --git a/Resources/SlimDX.png b/Resources/SlimDX.png
new file mode 100644
index 0000000..f2a61d3
Binary files /dev/null and b/Resources/SlimDX.png differ
diff --git a/Resources/SlimDX_small.png b/Resources/SlimDX_small.png
new file mode 100644
index 0000000..c074552
Binary files /dev/null and b/Resources/SlimDX_small.png differ
diff --git a/Resources/Splash3.png b/Resources/Splash3.png
new file mode 100644
index 0000000..ffa3083
Binary files /dev/null and b/Resources/Splash3.png differ
diff --git a/Resources/Splash3_small.png b/Resources/Splash3_small.png
new file mode 100644
index 0000000..e9cc678
Binary files /dev/null and b/Resources/Splash3_small.png differ
diff --git a/Resources/Splash3_trans.png b/Resources/Splash3_trans.png
new file mode 100644
index 0000000..5e32c75
Binary files /dev/null and b/Resources/Splash3_trans.png differ
diff --git a/Resources/ThingArrow.png b/Resources/ThingArrow.png
new file mode 100644
index 0000000..d8f5e58
Binary files /dev/null and b/Resources/ThingArrow.png differ
diff --git a/Resources/ThingBox.png b/Resources/ThingBox.png
new file mode 100644
index 0000000..132dc5e
Binary files /dev/null and b/Resources/ThingBox.png differ
diff --git a/Resources/ThingCircle.png b/Resources/ThingCircle.png
new file mode 100644
index 0000000..6b232bb
Binary files /dev/null and b/Resources/ThingCircle.png differ
diff --git a/Resources/ThingColors.png b/Resources/ThingColors.png
new file mode 100644
index 0000000..ec524dc
Binary files /dev/null and b/Resources/ThingColors.png differ
diff --git a/Resources/ThingMask.png b/Resources/ThingMask.png
new file mode 100644
index 0000000..f00da2e
Binary files /dev/null and b/Resources/ThingMask.png differ
diff --git a/Resources/ThingTexture1.png b/Resources/ThingTexture1.png
new file mode 100644
index 0000000..d78b54d
Binary files /dev/null and b/Resources/ThingTexture1.png differ
diff --git a/Resources/ThingTexture2.png b/Resources/ThingTexture2.png
new file mode 100644
index 0000000..bc15905
Binary files /dev/null and b/Resources/ThingTexture2.png differ
diff --git a/Resources/ThingTexture3.png b/Resources/ThingTexture3.png
new file mode 100644
index 0000000..e027567
Binary files /dev/null and b/Resources/ThingTexture3.png differ
diff --git a/Resources/ThingTexture4.png b/Resources/ThingTexture4.png
new file mode 100644
index 0000000..6174e38
Binary files /dev/null and b/Resources/ThingTexture4.png differ
diff --git a/Resources/UnknownImage.png b/Resources/UnknownImage.png
new file mode 100644
index 0000000..bc48f95
Binary files /dev/null and b/Resources/UnknownImage.png differ
diff --git a/Resources/UnknownTexture3D.png b/Resources/UnknownTexture3D.png
new file mode 100644
index 0000000..7600774
Binary files /dev/null and b/Resources/UnknownTexture3D.png differ
diff --git a/Resources/UnknownThing.png b/Resources/UnknownThing.png
new file mode 100644
index 0000000..63dd72a
Binary files /dev/null and b/Resources/UnknownThing.png differ
diff --git a/Resources/White.png b/Resources/White.png
new file mode 100644
index 0000000..0f4ea34
Binary files /dev/null and b/Resources/White.png differ
diff --git a/Resources/base2d.dae b/Resources/base2d.dae
new file mode 100644
index 0000000..613b2b9
--- /dev/null
+++ b/Resources/base2d.dae
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<COLLADA xmlns="http://www.collada.org/2005/11/COLLADASchema" version="1.4.1">
+    <asset>
+        <contributor>
+            <author>Pascal</author>
+            <authoring_tool>NVIDIA FX Composer 2.0</authoring_tool>
+            <comments/>
+            <copyright/>
+        </contributor>
+        <created>2007-10-19T17:06:49</created>
+        <keywords>FXComposer, NVIDIA</keywords>
+        <modified>2007-10-19T17:07:14</modified>
+        <subject/>
+        <title/>
+    </asset>
+    <library_effects>
+        <effect id="Effect" name="display2d">
+            <profile_COMMON>
+                <technique sid="__fxc2_default">
+                    <constant/>
+                </technique>
+            </profile_COMMON>
+            <extra type="import">
+                <technique profile="NVIDIA_FXCOMPOSER">
+                    <import url="../Source/Resources/display2d.fx" compiler_options="" profile="fx"/>
+                </technique>
+            </extra>
+        </effect>
+    </library_effects>
+</COLLADA>
diff --git a/Resources/mergegeometry.cpt b/Resources/mergegeometry.cpt
new file mode 100644
index 0000000..0a7b1f1
Binary files /dev/null and b/Resources/mergegeometry.cpt differ
diff --git a/Resources/thingicon.cpt b/Resources/thingicon.cpt
new file mode 100644
index 0000000..9594dd8
Binary files /dev/null and b/Resources/thingicon.cpt differ
diff --git a/Resources/world3d.dae b/Resources/world3d.dae
new file mode 100644
index 0000000..aec348a
--- /dev/null
+++ b/Resources/world3d.dae
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<COLLADA xmlns="http://www.collada.org/2005/11/COLLADASchema" version="1.4.1">
+    <asset>
+        <contributor>
+            <author>Pascal</author>
+            <authoring_tool>NVIDIA FX Composer 2.0</authoring_tool>
+            <comments/>
+            <copyright/>
+        </contributor>
+        <created>2008-01-05T13:49:04</created>
+        <keywords>FXComposer, NVIDIA</keywords>
+        <modified>2008-01-05T13:49:04</modified>
+        <subject/>
+        <title/>
+    </asset>
+    <library_effects>
+        <effect id="Effect" name="world3d">
+            <profile_COMMON>
+                <technique sid="__fxc2_default">
+                    <constant/>
+                </technique>
+            </profile_COMMON>
+            <extra type="import">
+                <technique profile="NVIDIA_FXCOMPOSER">
+                    <import url="../Source/Resources/world3d.fx" compiler_options="" profile="fx"/>
+                </technique>
+            </extra>
+        </effect>
+    </library_effects>
+</COLLADA>
diff --git a/Setup/WizModernImage-IS.bmp b/Setup/WizModernImage-IS.bmp
new file mode 100644
index 0000000..4ad634d
Binary files /dev/null and b/Setup/WizModernImage-IS.bmp differ
diff --git a/Setup/WizModernSmallImage-IS.bmp b/Setup/WizModernSmallImage-IS.bmp
new file mode 100644
index 0000000..abcaa5d
Binary files /dev/null and b/Setup/WizModernSmallImage-IS.bmp differ
diff --git a/Setup/disclaimer.txt b/Setup/disclaimer.txt
new file mode 100644
index 0000000..de8cad0
--- /dev/null
+++ b/Setup/disclaimer.txt
@@ -0,0 +1,7 @@
+Disclaimer of warranty:
+
+The software and documentation are provided as is without warranty of any kind. To the maximum extent permitted by applicable law, MaxED further disclaims all warranties, including without limitation any implied warranties of merchantability, fitness for a particular purpose, and noninfringement.
+
+The entire risk arising out of the use or performance of the software and documentation remains with you.
+
+To the maximum extent permitted by applicable law, in no event shall MaxED be liable for any consequential, incidental, direct, indirect, special, punitive, or other damages whatsoever (including, without limitation, damages for loss of business profits, business interruption, loss of business information, or other pecuniary loss) arising out of this agreement or the use of or inability to use the product, even if MaxED has been advised of the possibility of such damages.
diff --git a/Setup/gzbuilder_setup.iss b/Setup/gzbuilder_setup.iss
new file mode 100644
index 0000000..dbfd66d
--- /dev/null
+++ b/Setup/gzbuilder_setup.iss
@@ -0,0 +1,365 @@
+; Script generated by the Inno Setup Script Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+
+[Setup]
+AppName=GZDoom Builder
+AppVerName=GZDoom Builder 2.4
+AppPublisher=MaxED
+AppPublisherURL=http://forum.zdoom.org/memberlist.php?mode=viewprofile&u=7012
+AppSupportURL=http://forum.zdoom.org/viewtopic.php?f=3&t=32392
+AppUpdatesURL=http://devbuilds.drdteam.org/doombuilder2-gzdb/
+DefaultDirName={pf}\GZDoom Builder
+DefaultGroupName=GZDoom Builder
+AllowNoIcons=true
+InfoBeforeFile=..\Setup\disclaimer.txt
+OutputDir=..\Release
+OutputBaseFilename=GZDoom Builder Setup
+Compression=lzma/ultra64
+SolidCompression=true
+SourceDir=..\Build
+SetupLogging=false
+AppMutex=gzdoombuilder
+PrivilegesRequired=admin
+ShowLanguageDialog=no
+LanguageDetectionMethod=none
+MinVersion=0,5.01.2600
+UninstallDisplayIcon={app}\Updater.exe
+WizardImageFile=..\Setup\WizModernImage-IS.bmp
+WizardSmallImageFile=..\Setup\WizModernSmallImage-IS.bmp
+
+[Languages]
+Name: english; MessagesFile: compiler:Default.isl
+
+[Tasks]
+Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked
+
+[Files]
+Source: Setup\dotnetfx35setup.exe; DestDir: {tmp}; Flags: dontcopy
+Source: Setup\dxwebsetup.exe; DestDir: {tmp}; Flags: dontcopy
+Source: Setup\vcredist_x86.exe; DestDir: {tmp}; Flags: dontcopy
+Source: Builder.exe; DestDir: {app}; Flags: ignoreversion
+Source: GZBuilder.default.cfg; DestDir: {app}; Flags: ignoreversion
+Source: Updater.exe; DestDir: {app}; Flags: ignoreversion
+Source: Updater.ini; DestDir: {app}; Flags: ignoreversion
+Source: Refmanual.chm; DestDir: {app}; Flags: ignoreversion
+Source: DevIL.dll; DestDir: {app}; Flags: ignoreversion
+Source: SharpCompress.3.5.dll; DestDir: {app}; Flags: ignoreversion
+Source: Scintilla.dll; DestDir: {app}; Flags: ignoreversion
+Source: SlimDX.dll; DestDir: {app}; Flags: ignoreversion
+Source: GPL.txt; DestDir: {app}; Flags: ignoreversion
+Source: Compilers\*; DestDir: {app}\Compilers; Flags: ignoreversion recursesubdirs
+Source: Configurations\*; DestDir: {app}\Configurations; Flags: ignoreversion recursesubdirs
+Source: Scripting\*; DestDir: {app}\Scripting; Flags: ignoreversion recursesubdirs
+Source: Snippets\*; DestDir: {app}\Snippets; Flags: ignoreversion recursesubdirs
+; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+Source: Plugins\BuilderModes.dll; DestDir: {app}\Plugins; Flags: ignoreversion
+Source: Plugins\BuilderEffects.dll; DestDir: {app}\Plugins; Flags: ignoreversion
+Source: Plugins\ColorPicker.dll; DestDir: {app}\Plugins; Flags: ignoreversion
+Source: Plugins\CommentsPanel.dll; DestDir: {app}\Plugins; Flags: ignoreversion
+Source: Plugins\NodesViewer.dll; DestDir: {app}\Plugins; Flags: ignoreversion
+Source: Plugins\SoundPropagationMode.dll; DestDir: {app}\Plugins; Flags: ignoreversion
+Source: Plugins\StairSectorBuilder.dll; DestDir: {app}\Plugins; Flags: ignoreversion
+Source: Plugins\TagExplorer.dll; DestDir: {app}\Plugins; Flags: ignoreversion
+Source: Plugins\TagRange.dll; DestDir: {app}\Plugins; Flags: ignoreversion
+Source: Plugins\VisplaneExplorer.dll; DestDir: {app}\Plugins; Flags: ignoreversion
+Source: Plugins\Loadorder.cfg; DestDir: {app}\Plugins; Flags: ignoreversion onlyifdoesntexist
+Source: Sprites\*; DestDir: {app}\Sprites; Flags: ignoreversion recursesubdirs
+Source: Textures\*; DestDir: {app}\Textures; Flags: ignoreversion
+
+[Icons]
+Name: {group}\GZDoom Builder; Filename: {app}\Builder.exe
+Name: {group}\{cm:UninstallProgram,GZDoom Builder}; Filename: {uninstallexe}
+Name: {commondesktop}\GZDoom Builder; Filename: {app}\Builder.exe; Tasks: desktopicon
+
+[UninstallDelete]
+Name: {app}; Type: filesandordirs
+
+[InstallDelete]
+Name: {app}\Builder.pdb; Type: files
+Name: {app}\Builder.xml; Type: files
+
+[Registry]
+Root: HKLM; Subkey: SOFTWARE\MaxED\GZDoom Builder\; ValueType: string; ValueName: Location; ValueData: {app}; Flags: uninsdeletevalue
+
+[Messages]
+ReadyLabel2a=Continue to begin with the installation, or click Back if you want to review or change any settings.
+
+[Code]
+// Global variables
+var
+	page_info_net: TOutputMsgWizardPage;
+	page_info_netfailed: TOutputMsgWizardPage;
+	page_setup_net: TOutputProgressWizardPage;
+	page_info_dx: TOutputMsgWizardPage;
+	page_info_dxfailed: TOutputMsgWizardPage;
+	page_setup_dx: TOutputProgressWizardPage;
+	page_info_vc: TOutputMsgWizardPage;
+	page_info_vcfailed: TOutputMsgWizardPage;
+	page_setup_vc: TOutputProgressWizardPage;
+	restartneeded: Boolean;
+	netinstallfailed: Boolean;
+	netisinstalled: Boolean;
+	dxinstallfailed: Boolean;
+	dxisinstalled: Boolean;
+	vcinstallfailed: Boolean;
+	vcisinstalled: Boolean;
+
+// Prerequisites checks
+function CheckNetIsInstalled(): Boolean;
+begin
+	Result := RegKeyExists(HKLM, 'SOFTWARE\Microsoft\NET Framework Setup\NDP\v3.5') or
+					  RegKeyExists(HKLM, 'SOFTWARE\Wow6432Node\Microsoft\NET Framework Setup\NDP\v3.5');
+end;
+
+function CheckDXVersion(): Boolean;
+var
+	MajorVer, MinorVer: Integer;
+	StartPos: Integer;
+	TempStr, VerStr: string;
+	HasRequiredDll : Boolean;
+begin
+	if (RegQueryStringValue(HKEY_LOCAL_MACHINE, 'SOFTWARE\Microsoft\DirectX', 'Version', VerStr)) then begin
+		(* Extract major version *)
+		StartPos := Pos('.', VerStr);
+		MajorVer := StrToInt(Copy(VerStr, 1, StartPos - 1));
+		(* Remove major version and decimal point that follows *)
+		TempStr := Copy(VerStr, StartPos + 1, MaxInt);
+		(* Find next decimal point *)
+		StartPos := Pos('.', TempStr); 
+		(* Extract minor version *)
+		MinorVer := StrToInt(Copy(TempStr, 1, StartPos - 1));
+
+		//mxd. The DX version alone is not accurate enough...
+		HasRequiredDll := FileExists(ExpandConstant('{syswow64}\d3dx9_43.dll'));
+
+		Result := ((MajorVer > 4) or ((MajorVer = 4) and (MinorVer >= 9))) and HasRequiredDll;
+	end
+	else begin
+		Result := false;
+	end;
+end;
+
+function CheckVCIsInstalled(): Boolean;
+begin
+	//mxd. Any VC++ 2008 package will do, I assume...
+	//mxd. Registry values gartered from http://blogs.msdn.com/b/astebner/archive/2009/01/29/9384143.aspx
+	Result := RegKeyExists(HKLM, 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{1F1C2DFC-2D24-3E06-BCB8-725134ADF989}') or
+			  RegKeyExists(HKLM, 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{9A25302D-30C0-39D9-BD6F-21E6EC160475}') or
+			  RegKeyExists(HKLM, 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{FF66E9F6-83E7-3A3E-AF14-8DE9A809A6A4}');
+end;
+
+// When the wizard initializes
+procedure InitializeWizard();
+begin
+	restartneeded := false;
+	netinstallfailed := false;
+	netisinstalled := CheckNetIsInstalled();
+	dxinstallfailed := false;
+	dxisinstalled := CheckDXVersion();
+	vcinstallfailed := false;
+	vcisinstalled := CheckVCIsInstalled();
+
+	// Create .NET Framework pages
+	page_info_net := CreateOutputMsgPage(wpPreparing,
+		'Installing Microsoft .NET Framework 3.5', '',
+		'Setup has detected that your system is missing the required version of the Microsoft .NET Framework. ' +
+		'Setup will now install or update your Microsoft .NET Framework. This may take several minutes to complete.' + #10 + #10 +
+		'WARNING: The installer will download the Microsoft .NET Framework from the internet, but the progress bar will not ' +
+		'go forward until the download is complete. You may send Microsoft an angry letter about that.' + #10 + #10 +
+		'Click Install to begin.');
+
+	page_info_netfailed := CreateOutputMsgPage(page_info_net.ID,
+		'Installing Microsoft .NET Framework  3.5', '',
+		'Setup could not install the Microsoft .NET Framework  3.5.' + #10 + #10 +
+		'Click Back to try again, or Cancel to exit Setup.');
+
+	page_setup_net := CreateOutputProgressPage('Installing Microsoft .NET Framework 3.5', 'Setup is installing Microsoft .NET Framework 3.5, please wait...');
+
+	// Create DirectX pages
+	page_info_dx := CreateOutputMsgPage(wpPreparing,
+		'Installing DirectX 9.0', '',
+		'Setup has detected that your system is missing the required version of the DirectX. ' +
+		'Setup will now install or update your DirectX. This may take several minutes to complete.' + #10 + #10 +
+		'WARNING: The installer will download DirectX from the internet, but the progress bar will not ' +
+		'go forward until the download is complete. You may send Microsoft an angry letter about that.' + #10 + #10 +
+		'Click Install to begin.');
+
+	page_info_dxfailed := CreateOutputMsgPage(page_info_net.ID,
+		'Installing DirectX 9.0', '',
+		'Setup could not install DirectX 9.0.' + #10 + #10 +
+		'Click Back to try again, or Cancel to exit Setup.');
+
+	page_setup_dx := CreateOutputProgressPage('Installing DirectX 9.0', 'Setup is installing DirectX 9.0, please wait...');
+
+	// Create VC++ 2008 pages
+	page_info_vc := CreateOutputMsgPage(wpPreparing,
+		'Installing Visual C++ 2008 SP1 ATL Security Update', '',
+		'Setup has detected that your system is missing the required version of the Visual C++ Runtime. ' +
+		'Setup will now install or update your Visual C++ Runtime. This may take several minutes to complete.' + #10 + #10 +
+		'Click Install to begin.');
+
+	page_info_vcfailed := CreateOutputMsgPage(page_info_net.ID,
+		'Installing Visual C++ 2008 SP1 ATL Security Update', '',
+		'Setup could not install Visual C++ 2008 SP1 ATL Security Update.' + #10 + #10 +
+		'Click Back to try again, or Cancel to exit Setup.');
+
+	page_setup_vc := CreateOutputProgressPage('Installing Visual C++ 2008 SP1 ATL Security Update', 'Setup is installing Visual C++ 2008 SP1 ATL Security Update, please wait...');
+end;
+
+// This is called to check if a page must be skipped
+function ShouldSkipPage(PageID: Integer): Boolean;
+begin
+	if(PageID = page_info_net.ID) then // Skip .NET pages?
+		Result := netisinstalled
+	else if(PageID = page_info_netfailed.ID) then
+		Result := (not netinstallfailed) and netisinstalled
+	else if(PageID = page_info_dx.ID) then // Skip DX pages?
+		Result := dxisinstalled
+	else if(PageID = page_info_dxfailed.ID) then
+		Result := (not dxinstallfailed) and dxisinstalled
+	else if(PageID = page_info_vc.ID) then // Skip VC++ pages?
+		Result := vcisinstalled
+	else if(PageID = page_info_vcfailed.ID) then
+		Result := (not vcinstallfailed) and vcisinstalled
+	else
+		Result := false;
+end;
+
+// This is called to determine if we need to restart
+function NeedRestart(): Boolean;
+begin
+	Result := restartneeded;
+end;
+
+// This is called when the current page changes
+procedure CurPageChanged(CurPageID: Integer);
+begin
+	if(CurPageID = wpReady) then begin
+		if(netisinstalled = false) or (dxisinstalled = false) or (vcisinstalled = false) then
+			WizardForm.NextButton.Caption := 'Next';
+	end
+	else if(CurPageID = page_info_net.ID) or (CurPageID = page_info_dx.ID) or (CurPageID = page_info_vc.ID) then begin
+		WizardForm.NextButton.Caption := 'Install';
+	end
+	else if(CurPageID = page_info_netfailed.ID) or (CurPageID = page_info_dxfailed.ID) or (CurPageID = page_info_vcfailed.ID) then begin
+		WizardForm.NextButton.Visible := true;
+		WizardForm.NextButton.Enabled := false;
+		WizardForm.BackButton.Visible := true;
+		WizardForm.BackButton.Enabled := true;
+		WizardForm.CancelButton.Visible := true;
+		WizardForm.CancelButton.Enabled := true;
+	end;
+end;
+
+// This is called when the Next button is clicked
+function NextButtonClick(CurPage: Integer): Boolean;
+var
+	errorcode: Integer;
+	tempfile: String;
+begin
+
+	// Next pressed on .NET info page?
+	if(CurPage = page_info_net.ID) then begin
+		// Show progress page and run setup
+		page_setup_net.Show;
+		try
+		begin
+			netinstallfailed := false;
+			ExtractTemporaryFile('dotnetfx35setup.exe');
+			// We copy the file to the real temp directory so that it isn't removed when Setup is closed.
+			// Judging from the return codes, this installer may want to run again after a reboot.
+			// See the return codes here: http://msdn.microsoft.com/en-us/library/cc160716.aspx
+			tempfile := RemoveBackslash(GetTempDir()) + '\dotnetfx35setup.exe';
+			FileCopy(ExpandConstant('{tmp}\dotnetfx35setup.exe'), tempfile, false);
+			Exec(tempfile, '/qb /norestart', '', SW_SHOW, ewWaitUntilTerminated, errorcode);
+
+			if((errorcode = 1641) or (errorcode = 3010)) then begin
+				// Success, but restart needed!
+				restartneeded := true;
+			end
+			else if(errorcode <> 0) then begin
+				netinstallfailed := true;
+			end;
+
+			netisinstalled := CheckNetIsInstalled();
+		end
+		finally
+			page_setup_net.Hide;
+		end;
+	end
+	// Next pressed on DX info page?
+	else if(CurPage = page_info_dx.ID) then begin
+		// Show progress page and run setup
+		page_setup_dx.Show;
+		try
+		begin
+			dxinstallfailed := false;
+			ExtractTemporaryFile('dxwebsetup.exe');
+			// We copy the file to the real temp directory so that it isn't removed when Setup is closed.
+			// Judging from the return codes, this installer may want to run again after a reboot.
+			// See the return codes here: http://support.microsoft.com/kb/177430
+			tempfile := RemoveBackslash(GetTempDir()) + '\dxwebsetup.exe';
+			FileCopy(ExpandConstant('{tmp}\dxwebsetup.exe'), tempfile, false);
+			Exec(tempfile, '/Q', '', SW_SHOW, ewWaitUntilTerminated, errorcode);
+
+			if(errorcode = 1) then begin
+				// Success, but restart needed!
+				restartneeded := true;
+			end
+			else if(errorcode <> 0) then begin
+				dxinstallfailed := true;
+			end;
+
+			dxisinstalled := CheckDXVersion();
+		end
+		finally
+			page_setup_dx.Hide;
+		end;
+	end
+	// Next pressed on VC info page?
+	else if(CurPage = page_info_vc.ID) then begin
+		// Show progress page and run setup
+		page_setup_vc.Show;
+		try
+		begin
+			vcinstallfailed := false;
+			ExtractTemporaryFile('vcredist_x86.exe');
+			// We copy the file to the real temp directory so that it isn't removed when Setup is closed.
+			// Judging from the return codes, this installer may want to run again after a reboot.
+			// See the return codes here: http://blogs.msdn.com/b/astebner/archive/2010/10/20/10078468.aspx
+			tempfile := RemoveBackslash(GetTempDir()) + '\vcredist_x86.exe';
+			FileCopy(ExpandConstant('{tmp}\vcredist_x86.exe'), tempfile, false);
+			Exec(tempfile, '/q /norestart', '', SW_SHOW, ewWaitUntilTerminated, errorcode);
+
+			if(errorcode = 3010) then begin
+				// Success, but restart needed!
+				restartneeded := true;
+			end
+			else if(errorcode <> 0) then begin
+				vcinstallfailed := true;
+			end;
+
+			vcisinstalled := CheckVCIsInstalled();
+		end
+		finally
+			page_setup_vc.Hide;
+		end;
+	end;
+
+	Result := True;
+end;
+
+//Remove configs?
+procedure DeinitializeUninstall();
+begin
+	if MsgBox('Delete map restore data and program configuration files?', mbConfirmation, MB_YESNO) = IDYES then
+	begin
+		// Remove restore data
+		DelTree(ExpandConstant('{localappdata}\Doom Builder\Restore'), True, True, True);
+
+		// Remove configs
+		DeleteFile(ExpandConstant('{localappdata}\Doom Builder\GZBuilder.cfg'));
+		DeleteFile(ExpandConstant('{localappdata}\Doom Builder\GZBuilder.log'));
+		DeleteFile(ExpandConstant('{localappdata}\Doom Builder\GZCrash.txt'));
+	end;
+end;
\ No newline at end of file
diff --git a/Source/Core/Actions/Action.cs b/Source/Core/Actions/Action.cs
new file mode 100644
index 0000000..0037f23
--- /dev/null
+++ b/Source/Core/Actions/Action.cs
@@ -0,0 +1,286 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.IO;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Actions
+{
+	public class Action
+	{
+		#region ================== Variables
+
+		// Description
+		private readonly string name;
+		private readonly string shortname;
+		private readonly string title;
+		private readonly string description;
+		private readonly string category;
+
+		// Shortcut key
+		private int key;
+		private readonly int keymask;
+		private readonly int defaultkey;
+		
+		// Shortcut options
+		private readonly bool allowkeys;
+		private readonly bool allowmouse;
+		private readonly bool allowscroll;
+		private readonly bool disregardshift;
+		private readonly bool disregardcontrol;
+		private readonly bool disregardalt; //mxd
+		private readonly bool repeat;
+		
+		// Delegate
+		private readonly List<ActionDelegate> begindelegates;
+		private readonly List<ActionDelegate> enddelegates;
+		
+		#endregion
+
+		#region ================== Properties
+
+		public string Name { get { return name; } }
+		public string ShortName { get { return shortname; } }
+		public string Category { get { return category; } }
+		public string Title { get { return title; } }
+		public string Description { get { return description; } }
+		public int ShortcutKey { get { return key; } }
+		public int ShortcutMask { get { return keymask; } }
+		public int DefaultShortcutKey { get { return defaultkey; } }
+		public bool AllowKeys { get { return allowkeys; } }
+		public bool AllowMouse { get { return allowmouse; } }
+		public bool AllowScroll { get { return allowscroll; } }
+		public bool DisregardShift { get { return disregardshift; } }
+		public bool DisregardControl { get { return disregardcontrol; } }
+		public bool DisregardAlt { get { return disregardalt; } } //mxd
+		public bool Repeat { get { return repeat; } }
+		public bool BeginBound { get { return (begindelegates.Count > 0); } }
+		public bool EndBound { get { return (enddelegates.Count > 0); } }
+		
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		internal Action(Configuration cfg, string name, string shortname, int key)
+		{
+			// Initialize
+			this.name = name;
+			this.shortname = shortname;
+			this.title = cfg.ReadSetting(shortname + ".title", "[" + name + "]");
+			this.category = cfg.ReadSetting(shortname + ".category", "");
+			this.description = cfg.ReadSetting(shortname + ".description", "");
+			this.allowkeys = cfg.ReadSetting(shortname + ".allowkeys", true);
+			this.allowmouse = cfg.ReadSetting(shortname + ".allowmouse", true);
+			this.allowscroll = cfg.ReadSetting(shortname + ".allowscroll", false);
+			this.disregardshift = cfg.ReadSetting(shortname + ".disregardshift", false);
+			this.disregardcontrol = cfg.ReadSetting(shortname + ".disregardcontrol", false);
+			this.disregardalt = cfg.ReadSetting(shortname + ".disregardalt", false); //mxd
+			this.repeat = cfg.ReadSetting(shortname + ".repeat", false);
+			this.defaultkey = cfg.ReadSetting(shortname + ".default", 0);
+			this.begindelegates = new List<ActionDelegate>();
+			this.enddelegates = new List<ActionDelegate>();
+
+			keymask = disregardshift ? (int)Keys.Shift : 0;
+			if(disregardcontrol) keymask |= (int)Keys.Control;
+			if(disregardalt) keymask |= (int)Keys.Alt; //mxd
+			
+			keymask = ~keymask;
+
+			if(key == -1)
+			{
+				this.key = -1;
+			}
+			else
+			{
+				this.key = key & keymask;
+			}
+		}
+		
+		#endregion
+
+		#region ================== Static Methods
+
+		// This returns the shortcut key description for a key
+		public static string GetShortcutKeyDesc(int key)
+		{
+			KeysConverter conv = new KeysConverter();
+			string ctrlprefix = "";
+			
+			// When key is 0, then return an empty string
+			if(key == 0) return "";
+
+			// Split the key in Control and Button
+			int ctrl = key & ((int)Keys.Control | (int)Keys.Shift | (int)Keys.Alt);
+			int button = key & ~((int)Keys.Control | (int)Keys.Shift | (int)Keys.Alt);
+
+			// When the button is a control key, then remove the control itsself
+			if((button == (int)Keys.ControlKey) ||
+			   (button == (int)Keys.ShiftKey))
+			{
+				ctrl = 0;
+				key = key & ~((int)Keys.Control | (int)Keys.Shift | (int)Keys.Alt);
+			}
+			
+			// Determine control prefix
+			if(ctrl != 0) ctrlprefix = conv.ConvertToString(key);
+			
+			// Check if button is special
+			switch(button)
+			{
+				// Scroll down
+				case (int)SpecialKeys.MScrollDown:
+					
+					// Make string representation
+					return ctrlprefix + "ScrollDown";
+
+				// Scroll up
+				case (int)SpecialKeys.MScrollUp:
+
+					// Make string representation
+					return ctrlprefix + "ScrollUp";
+
+				// Keys that would otherwise have odd names
+				case (int)Keys.Oemtilde: return ctrlprefix + "~";
+				case (int)Keys.OemMinus: return ctrlprefix + "-";
+				case (int)Keys.Oemplus: return ctrlprefix + "+";
+				case (int)Keys.Subtract: return ctrlprefix + "NumPad-";
+				case (int)Keys.Add: return ctrlprefix + "NumPad+";
+				case (int)Keys.Decimal: return ctrlprefix + "NumPad.";
+				case (int)Keys.Multiply: return ctrlprefix + "NumPad*";
+				case (int)Keys.Divide: return ctrlprefix + "NumPad/";
+				case (int)Keys.OemOpenBrackets: return ctrlprefix + "[";
+				case (int)Keys.OemCloseBrackets: return ctrlprefix + "]";
+				case (int)Keys.Oem1: return ctrlprefix + ";";
+				case (int)Keys.Oem7: return ctrlprefix + "'";
+				case (int)Keys.Oemcomma: return ctrlprefix + ",";
+				case (int)Keys.OemPeriod: return ctrlprefix + ".";
+				case (int)Keys.OemQuestion: return ctrlprefix + "?";
+				case (int)Keys.Oem5: return ctrlprefix + "\\";
+				case (int)Keys.Capital: return ctrlprefix + "CapsLock";
+				case (int)Keys.Back: return ctrlprefix + "Backspace";
+				
+				default:
+					
+					// Use standard key-string conversion
+					return conv.ConvertToString(key);
+			}
+		}
+
+		//mxd. This returns the shortcut key description for an action name
+		public static string GetShortcutKeyDesc(string actionName) 
+		{
+			Action a = General.Actions.GetActionByName(actionName);
+			if(a.ShortcutKey == 0) return a.Title + " (not bound to a key)";
+			return GetShortcutKeyDesc(a.ShortcutKey);
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This invokes the action
+		public void Invoke()
+		{
+			this.Begin();
+			this.End();
+		}
+		
+		// This sets a new key for the action
+		internal void SetShortcutKey(int key)
+		{
+			// Make it so.
+			this.key = key & keymask;
+		}
+		
+		// This binds a delegate to this action
+		internal void BindBegin(ActionDelegate method)
+		{
+			begindelegates.Add(method);
+		}
+
+		// This removes a delegate from this action
+		internal void UnbindBegin(ActionDelegate method)
+		{
+			begindelegates.Remove(method);
+		}
+
+		// This binds a delegate to this action
+		internal void BindEnd(ActionDelegate method)
+		{
+			enddelegates.Add(method);
+		}
+
+		// This removes a delegate from this action
+		internal void UnbindEnd(ActionDelegate method)
+		{
+			enddelegates.Remove(method);
+		}
+
+		// This raises events for this action
+		internal void Begin()
+		{
+			General.Plugins.OnActionBegin(this);
+
+			// Method bound?
+			if(begindelegates.Count > 0)
+			{
+				// Copy delegates list
+				List<ActionDelegate> delegateslist = new List<ActionDelegate>(begindelegates);
+				
+				// Invoke all the delegates
+				General.Actions.Current = this;
+				General.Actions.ResetExclusiveRequest();
+				foreach(ActionDelegate ad in delegateslist) ad.Invoke();
+				General.Actions.ResetExclusiveRequest();
+				General.Actions.Current = null;
+			}
+		}
+
+		// This raises events for this action
+		internal void End()
+		{
+			// Method bound?
+			if(enddelegates.Count > 0)
+			{
+				// Copy delegates list
+				List<ActionDelegate> delegateslist = new List<ActionDelegate>(enddelegates);
+
+				// Invoke all the delegates
+				General.Actions.Current = this;
+				General.Actions.ResetExclusiveRequest();
+				foreach(ActionDelegate ad in delegateslist) ad.Invoke();
+				General.Actions.ResetExclusiveRequest();
+				General.Actions.Current = null;
+			}
+			
+			General.Plugins.OnActionEnd(this);
+		}
+
+		// This checks if the action qualifies for a key combination
+		public bool KeyMatches(int pressedkey)
+		{
+			return (key == (pressedkey & keymask));
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Actions/ActionAttribute.cs b/Source/Core/Actions/ActionAttribute.cs
new file mode 100644
index 0000000..753a6e7
--- /dev/null
+++ b/Source/Core/Actions/ActionAttribute.cs
@@ -0,0 +1,92 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Reflection;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Actions
+{
+	/// <summary>
+	/// This binds a method to an action.
+	/// </summary>
+	[AttributeUsage(AttributeTargets.Method, Inherited = true, AllowMultiple = true)]
+	public class ActionAttribute : Attribute
+	{
+		#region ================== Variables
+
+		// The action to bind to
+		protected string action;
+		protected bool baseaction;
+		protected string library;
+
+		#endregion
+
+		#region ================== Properties
+
+		/// <summary>
+		/// Set to true to indicate this is a core Doom Builder action when used within a plugin.
+		/// </summary>
+		public bool BaseAction { get { return baseaction; } set { baseaction = value; } }
+
+		/// <summary>
+		/// Set this to the name of the plugin library when this action is defined by another plugin. The library name is the filename without extension.
+		/// </summary>
+		public string Library { get { return library; } set { library = value; } }
+
+		internal string ActionName { get { return action; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		/// <summary>
+		/// This binds a method to an action.
+		/// </summary>
+		/// <param name="action">The action name as defined in Actions.cfg resource.</param>
+		public ActionAttribute(string action)
+		{
+			// Initialize
+			this.action = action;
+			this.baseaction = false;
+			this.library = "";
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This makes the proper name
+		public string GetFullActionName(Assembly asm)
+		{
+			string asmname;
+
+			if(library.Length > 0)
+				asmname = library.ToLowerInvariant();
+			else if(baseaction)
+				asmname = General.ThisAssembly.GetName().Name.ToLowerInvariant();
+			else
+				asmname = asm.GetName().Name.ToLowerInvariant();
+
+			return asmname + "_" + action;
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Actions/ActionDelegate.cs b/Source/Core/Actions/ActionDelegate.cs
new file mode 100644
index 0000000..45b0e6c
--- /dev/null
+++ b/Source/Core/Actions/ActionDelegate.cs
@@ -0,0 +1,24 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Actions
+{
+	internal delegate void ActionDelegate();
+}
diff --git a/Source/Core/Actions/ActionManager.cs b/Source/Core/Actions/ActionManager.cs
new file mode 100644
index 0000000..f93ad4e
--- /dev/null
+++ b/Source/Core/Actions/ActionManager.cs
@@ -0,0 +1,676 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.IO;
+using CodeImp.DoomBuilder.IO;
+using System.Collections;
+using System.Reflection;
+using System.Windows.Forms;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Actions
+{
+	public class ActionManager
+	{
+		#region ================== Constants
+
+		private const string ACTIONS_RESOURCE = "Actions.cfg";
+
+		#endregion
+
+		#region ================== Variables
+
+		// Actions
+		private Dictionary<string, Action> actions;
+		
+		// Categories
+		private SortedDictionary<string, string> categories;
+		
+		// Keys state
+		private int modifiers;
+		private List<int> pressedkeys;
+		
+		// Begun actions
+		private List<Action> activeactions;
+		private Action currentaction;
+		
+		// Exclusive invokation
+		private bool exclusiverequested;
+		
+		// Disposing
+		private bool isdisposed;
+
+		#endregion
+
+		#region ================== Properties
+
+		internal SortedDictionary<string, string> Categories { get { return categories; } }
+		internal Action this[string action] { get { if(actions.ContainsKey(action)) return actions[action]; else throw new ArgumentException("There is no such action \"" + action + "\""); } }
+		public bool IsDisposed { get { return isdisposed; } }
+		internal bool ExclusiveRequested { get { return exclusiverequested; } }
+		
+		/// <summary>
+		/// Current executing action. This returns Null when no action is invoked.
+		/// </summary>
+		public Action Current { get { return currentaction; } internal set { currentaction = value; } }
+		
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		internal ActionManager()
+		{
+			// Initialize
+			General.WriteLogLine("Starting action manager...");
+			actions = new Dictionary<string, Action>();
+			pressedkeys = new List<int>();
+			activeactions = new List<Action>();
+			categories = new SortedDictionary<string, string>();
+			
+			// Load all actions in this assembly
+			LoadActions(General.ThisAssembly);
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Disposer
+		internal void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Clean up
+				
+				// Done
+				isdisposed = true;
+			}
+		}
+
+		#endregion
+
+		#region ================== Actions
+
+		// This loads all actions from an assembly
+		internal void LoadActions(Assembly asm)
+		{
+			AssemblyName asmname = asm.GetName();
+
+			// Find a resource named Actions.cfg
+			string[] resnames = asm.GetManifestResourceNames();
+			foreach(string rn in resnames)
+			{
+				// Found one?
+				if(rn.EndsWith(ACTIONS_RESOURCE, StringComparison.InvariantCultureIgnoreCase))
+				{
+					// Get a stream from the resource
+					Stream actionsdata = asm.GetManifestResourceStream(rn);
+					StreamReader actionsreader = new StreamReader(actionsdata, Encoding.ASCII);
+
+					// Load configuration from stream
+					Configuration cfg = new Configuration();
+					cfg.InputConfiguration(actionsreader.ReadToEnd());
+					if(cfg.ErrorResult)
+					{
+						string errordesc = "Error in Actions configuration on line " + cfg.ErrorLine + ": " + cfg.ErrorDescription;
+						General.CancelAutoMapLoad();
+						General.ErrorLogger.Add(ErrorType.Error, "Unable to read Actions configuration from assembly " + Path.GetFileName(asm.Location));
+						General.WriteLogLine(errordesc);
+						General.ShowErrorMessage("Unable to read Actions configuration from assembly " + Path.GetFileName(asm.Location) + "!\n" + errordesc, MessageBoxButtons.OK);
+					}
+					else
+					{
+						// Read the categories structure
+						IDictionary cats = cfg.ReadSetting("categories", new Hashtable());
+						foreach(DictionaryEntry c in cats)
+						{
+							// Make the category if not already added
+							if(!categories.ContainsKey(c.Key.ToString()))
+								categories.Add(c.Key.ToString(), c.Value.ToString());
+						}
+
+						// Go for all objects in the configuration
+						foreach(DictionaryEntry a in cfg.Root)
+						{
+							// Get action properties
+							string shortname = a.Key.ToString();
+							string name = asmname.Name.ToLowerInvariant() + "_" + shortname;
+							bool debugonly = cfg.ReadSetting(a.Key + ".debugonly", false);
+
+							// Not the categories structure?
+							if(shortname.ToLowerInvariant() != "categories")
+							{
+								// Check if action should be included
+								if(General.DebugBuild || !debugonly)
+								{
+									// Create an action
+									CreateAction(cfg, name, shortname);
+								}
+							}
+						}
+					}
+					
+					// Done with the resource
+					actionsreader.Dispose();
+					actionsdata.Dispose();
+					break; //mxd. Usually we have a single "Actions.cfg", right?
+				}
+			}
+		}
+
+		// This manually creates an action
+		private void CreateAction(Configuration cfg, string name, string shortname)
+		{
+			// Action does not exist yet?
+			if(!actions.ContainsKey(name))
+			{
+				// Read the key from configuration
+				int key = General.Settings.ReadSetting("shortcuts." + name, -1);
+
+				// Create an action
+				actions.Add(name, new Action(cfg, name, shortname, key));
+			}
+			else
+			{
+				// Action already exists!
+				General.ErrorLogger.Add(ErrorType.Warning, "Action '" + name + "' already exists. Action names must be unique.");
+			}
+		}
+
+		// This binds all methods marked with this attribute
+		public void BindMethods(Type type)
+		{
+			// Bind static methods
+			BindMethods(null, type);
+		}
+
+		// This binds all methods marked with this attribute
+		public void BindMethods(object obj)
+		{
+			// Bind instance methods
+			BindMethods(obj, obj.GetType());
+		}
+
+		// This binds all methods marked with this attribute
+		private void BindMethods(object obj, Type type)
+		{
+			if(obj == null)
+				General.WriteLogLine("Binding static action methods for class " + type.Name + "...");
+			else
+				General.WriteLogLine("Binding action methods for " + type.Name + " object...");
+
+			// Go for all methods on obj
+			MethodInfo[] methods = type.GetMethods(BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static);
+			foreach(MethodInfo m in methods)
+			{
+				// Check if the method has this attribute
+				ActionAttribute[] attrs = (ActionAttribute[])m.GetCustomAttributes(typeof(BeginActionAttribute), true);
+
+				// Go for all attributes
+				foreach(ActionAttribute a in attrs)
+				{
+					// Create a delegate for this method
+					ActionDelegate del = (ActionDelegate)Delegate.CreateDelegate(typeof(ActionDelegate), obj, m);
+
+					// Make proper name
+					string actionname = a.GetFullActionName(type.Assembly);
+
+					// Bind method to action
+					if(Exists(actionname))
+						actions[actionname].BindBegin(del);
+					else
+						throw new ArgumentException("Could not bind " + m.ReflectedType.Name + "." + m.Name + " to action \"" + actionname + "\", that action does not exist! Refer to, or edit Actions.cfg for all available application actions.");
+				}
+				
+				// Check if the method has this attribute
+				attrs = (ActionAttribute[])m.GetCustomAttributes(typeof(EndActionAttribute), true);
+
+				// Go for all attributes
+				foreach(ActionAttribute a in attrs)
+				{
+					// Create a delegate for this method
+					ActionDelegate del = (ActionDelegate)Delegate.CreateDelegate(typeof(ActionDelegate), obj, m);
+
+					// Make proper name
+					string actionname = a.GetFullActionName(type.Assembly);
+
+					// Bind method to action
+					if(Exists(actionname))
+						actions[actionname].BindEnd(del);
+					else
+						throw new ArgumentException("Could not bind " + m.ReflectedType.Name + "." + m.Name + " to action \"" + actionname + "\", that action does not exist. Refer to, or edit Actions.cfg for all available application actions.");
+				}
+			}
+		}
+
+		// This binds a delegate manually
+		internal void BindBeginDelegate(Assembly asm, ActionDelegate d, BeginActionAttribute a)
+		{
+			// Make proper name
+			string actionname = a.GetFullActionName(asm);
+
+			// Bind delegate to action
+			if(Exists(actionname))
+				actions[actionname].BindBegin(d);
+			else
+				General.ErrorLogger.Add(ErrorType.Warning, "Could not bind delegate for " + d.Method.Name + " to action \"" + a.ActionName + "\" (" + actionname + "), that action does not exist. Refer to, or edit Actions.cfg for all available application actions.");
+		}
+
+		// This binds a delegate manually
+		internal void BindEndDelegate(Assembly asm, ActionDelegate d, EndActionAttribute a)
+		{
+			// Make proper name
+			string actionname = a.GetFullActionName(asm);
+
+			// Bind delegate to action
+			if(Exists(actionname))
+				actions[actionname].BindEnd(d);
+			else
+				General.ErrorLogger.Add(ErrorType.Warning, "Could not bind delegate for " + d.Method.Name + " to action \"" + a.ActionName + "\" (" + actionname + "), that action does not exist. Refer to, or edit Actions.cfg for all available application actions.");
+		}
+
+		// This unbinds all methods marked with this attribute
+		public void UnbindMethods(Type type)
+		{
+			// Unbind static methods
+			UnbindMethods(null, type);
+		}
+
+		// This unbinds all methods marked with this attribute
+		public void UnbindMethods(object obj)
+		{
+			// Unbind instance methods
+			UnbindMethods(obj, obj.GetType());
+		}
+
+		// This unbinds all methods marked with this attribute
+		private void UnbindMethods(object obj, Type type)
+		{
+			if(obj == null)
+				General.WriteLogLine("Unbinding static action methods for class " + type.Name + "...");
+			else
+				General.WriteLogLine("Unbinding action methods for " + type.Name + " object...");
+
+			// Go for all methods on obj
+			MethodInfo[] methods = type.GetMethods(BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static);
+			foreach(MethodInfo m in methods)
+			{
+				// Check if the method has this attribute
+				ActionAttribute[] attrs = (ActionAttribute[])m.GetCustomAttributes(typeof(BeginActionAttribute), true);
+
+				// Go for all attributes
+				foreach(ActionAttribute a in attrs)
+				{
+					// Create a delegate for this method
+					ActionDelegate del = (ActionDelegate)Delegate.CreateDelegate(typeof(ActionDelegate), obj, m);
+
+					// Make proper name
+					string actionname = a.GetFullActionName(type.Assembly);
+
+					// Unbind method from action
+					actions[actionname].UnbindBegin(del);
+				}
+				
+				// Check if the method has this attribute
+				attrs = (ActionAttribute[])m.GetCustomAttributes(typeof(EndActionAttribute), true);
+
+				// Go for all attributes
+				foreach(ActionAttribute a in attrs)
+				{
+					// Create a delegate for this method
+					ActionDelegate del = (ActionDelegate)Delegate.CreateDelegate(typeof(ActionDelegate), obj, m);
+
+					// Make proper name
+					string actionname = a.GetFullActionName(type.Assembly);
+
+					// Unbind method from action
+					actions[actionname].UnbindEnd(del);
+				}
+			}
+		}
+
+		// This unbinds a delegate manually
+		internal void UnbindBeginDelegate(Assembly asm, ActionDelegate d, BeginActionAttribute a)
+		{
+			// Make proper name
+			string actionname = a.GetFullActionName(asm);
+
+			// Unbind delegate to action
+			actions[actionname].UnbindBegin(d);
+		}
+
+		// This unbinds a delegate manually
+		internal void UnbindEndDelegate(Assembly asm, ActionDelegate d, EndActionAttribute a)
+		{
+			// Make proper name
+			string actionname = a.GetFullActionName(asm);
+
+			// Unbind delegate to action
+			actions[actionname].UnbindEnd(d);
+		}
+		
+		// This checks if a given action exists
+		public bool Exists(string action)
+		{
+			return actions.ContainsKey(action);
+		}
+
+		// This returns a list of all actions
+		internal Action[] GetAllActions()
+		{
+			Action[] list = new Action[actions.Count];
+			actions.Values.CopyTo(list, 0);
+			return list;
+		}
+
+		// This returns the specified action
+		public Action GetActionByName(string fullname)
+		{
+			return actions[fullname];
+		}
+		
+		// This saves the control settings
+		internal void SaveSettings()
+		{
+			// Go for all actions
+			foreach(KeyValuePair<string, Action> a in actions)
+			{
+				// Write to configuration
+				General.Settings.WriteSetting("shortcuts." + a.Key, a.Value.ShortcutKey);
+			}
+		}
+
+		// This invokes the Begin and End of the given action
+		public bool InvokeAction(string actionname)
+		{
+			if(Exists(actionname))
+			{
+				actions[actionname].Invoke();
+				return true;
+			}
+			return false;
+		}
+
+		#endregion
+
+		#region ================== Shortcut Keys
+		
+		// This applies default keys if they are not already in use
+		internal void ApplyDefaultShortcutKeys()
+		{
+			// Find actions that have no key set
+			foreach(KeyValuePair<string, Action> a in actions)
+			{
+				// Key set?
+				if(a.Value.ShortcutKey == -1)
+				{
+					// Check if the default key is not already used
+					bool keyused = false;
+					foreach(KeyValuePair<string, Action> d in actions)
+					{
+						// Check if the keys are the same
+						// Note that I use the mask of the source action to check if they match any combination
+						if((d.Value.ShortcutKey & a.Value.ShortcutMask) == (a.Value.DefaultShortcutKey & a.Value.ShortcutMask))
+						{
+							// No party.
+							keyused = true;
+							break;
+						}
+					}
+					
+					// Party?
+					if(!keyused)
+					{
+						// Apply the default key
+						a.Value.SetShortcutKey(a.Value.DefaultShortcutKey);
+					}
+					else
+					{
+						// No party.
+						a.Value.SetShortcutKey(0);
+					}
+				}
+			}
+		}
+		
+		// This checks if a given action is active
+		public bool CheckActionActive(Assembly asm, string actionname)
+		{
+			if(asm == null) asm = General.ThisAssembly;
+			
+			// Find active action
+			string fullname = asm.GetName().Name.ToLowerInvariant() + "_" + actionname;
+			foreach(Action a in activeactions)
+			{
+				if(a.Name == fullname) return true;
+			}
+			
+			// No such active action
+			return false;
+		}
+		
+		// Removes all shortcut keys
+		internal void RemoveShortcutKeys()
+		{
+			// Clear all keys
+			foreach(KeyValuePair<string, Action> a in actions)
+				a.Value.SetShortcutKey(0);
+		}
+		
+		// This notifies a key has been pressed
+		// Returns true when the key press has been absorbed
+		internal bool KeyPressed(int key)
+		{
+			int strippedkey = key & ~((int)Keys.Alt | (int)Keys.Shift | (int)Keys.Control);
+			if((strippedkey == (int)Keys.ShiftKey) || (strippedkey == (int)Keys.ControlKey) || (strippedkey == (int)Keys.Alt)) key = strippedkey;
+			bool repeat = pressedkeys.Contains(strippedkey);
+			
+			// Update pressed keys
+			if(!repeat) pressedkeys.Add(strippedkey);
+			
+			// Add action to active list
+			Action[] acts = GetActionsByKey(key);
+			bool absorbed = acts.Length > 0;
+			foreach(Action a in acts) if(!activeactions.Contains(a)) activeactions.Add(a);
+
+			// Invoke actions
+			absorbed |= BeginActionByKey(key, repeat);
+
+			return absorbed;
+		}
+
+		// This notifies a key has been released
+		// Returns true when the key release has been absorbed
+		internal bool KeyReleased(int key)
+		{
+			int strippedkey = key & ~((int)Keys.Alt | (int)Keys.Shift | (int)Keys.Control);
+			
+			// Update pressed keys
+			if(pressedkeys.Contains(strippedkey)) pressedkeys.Remove(strippedkey);
+
+			// End actions that no longer match
+			return EndActiveActions();
+		}
+
+		// This releases all pressed keys
+		internal void ReleaseAllKeys()
+		{
+			// Clear pressed keys
+			pressedkeys.Clear();
+
+			// End actions
+			EndActiveActions();
+		}
+		
+		// This updates the modifiers
+		internal void UpdateModifiers(int mods)
+		{
+			// Update modifiers
+			modifiers = mods;
+
+			// End actions that no longer match
+			EndActiveActions();
+		}
+		
+		// This will call the associated actions for a keypress
+		// Returns true when the key invokes any action
+		internal bool BeginActionByKey(int key, bool repeated)
+		{
+			bool invoked = false;
+			
+			// Get all actions for which a begin is bound
+			List<Action> boundactions = new List<Action>(actions.Count);
+			foreach(KeyValuePair<string, Action> a in actions)
+				if(a.Value.BeginBound) boundactions.Add(a.Value);
+			
+			// Go for all actions
+			foreach(Action a in boundactions)
+			{
+				// This action is associated with this key?
+				if(a.KeyMatches(key))
+				{
+					invoked = true;
+					
+					// Allowed to repeat?
+					if(a.Repeat || !repeated)
+					{
+						// Invoke action
+						a.Begin();
+					}
+					else
+					{
+						//General.WriteLogLine("Action \"" + a.Value.Name + "\" failed because it does not support repeating activation!");
+					}
+				}
+			}
+
+			return invoked;
+		}
+
+		// This will end active actions for which the pressed keys do not match
+		// Returns true when actions have been ended
+		private bool EndActiveActions()
+		{
+			bool listchanged;
+			bool actionsended = false;
+			
+			do
+			{
+				// Go for all active actions
+				listchanged = false;
+				for(int i = 0; i < activeactions.Count; i++)
+				{
+					Action a = activeactions[i];
+					
+					// Go for all pressed keys
+					bool stillactive = false;
+					foreach(int k in pressedkeys)
+					{
+						if((k == (int)Keys.ShiftKey) || (k == (int)Keys.ControlKey))
+							stillactive |= a.KeyMatches(k);
+						else
+							stillactive |= a.KeyMatches(k | modifiers);
+					}
+
+					// End the action if no longer matches any of the keys
+					if(!stillactive)
+					{
+						actionsended = true;
+						activeactions.RemoveAt(i);
+						listchanged = true;
+						a.End();
+						break;
+					}
+				}
+			}
+			while(listchanged);
+
+			return actionsended;
+		}
+		
+		// This returns all action names for a given key
+		public string[] GetActionNamesByKey(int key)
+		{
+			List<string> actionnames = new List<string>();
+			
+			// Go for all actions
+			foreach(KeyValuePair<string, Action> a in actions)
+			{
+				// This action is associated with this key?
+				if(a.Value.KeyMatches(key))
+				{
+					// List short name
+					actionnames.Add(a.Value.ShortName);
+				}
+			}
+
+			// Return result;
+			return actionnames.ToArray();
+		}
+
+		// This returns all action names for a given key
+		public Action[] GetActionsByKey(int key)
+		{
+			List<Action> actionnames = new List<Action>();
+
+			// Go for all actions
+			foreach(KeyValuePair<string, Action> a in actions)
+			{
+				// This action is associated with this key?
+				if(a.Value.KeyMatches(key))
+				{
+					// List short name
+					actionnames.Add(a.Value);
+				}
+			}
+
+			// Return result;
+			return actionnames.ToArray();
+		}
+		
+		#endregion
+
+		#region ================== Exclusive Invokation
+
+		// This resets the exclusive request
+		internal void ResetExclusiveRequest()
+		{
+			exclusiverequested = false;
+		}
+		
+		/// <summary>
+		/// This asks for exclusive invokation of the current BeginAction or EndAction.
+		/// Returns true when successull, false when denied (already given to another caller)
+		/// </summary>
+		public bool RequestExclusiveInvokation()
+		{
+			if(exclusiverequested) return false; // Already given out
+
+			// Success
+			exclusiverequested = true;
+			return true;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Actions/BeginActionAttribute.cs b/Source/Core/Actions/BeginActionAttribute.cs
new file mode 100644
index 0000000..e82ca05
--- /dev/null
+++ b/Source/Core/Actions/BeginActionAttribute.cs
@@ -0,0 +1,36 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Actions
+{
+	/// <summary>
+	/// This binds a method to an action which is then called when the action is started.
+	/// </summary>
+	public class BeginActionAttribute : ActionAttribute
+	{
+		/// <summary>
+		/// This binds a method to an action which is then called when the action is started.
+		/// </summary>
+		/// <param name="action">The action name as defined in Actions.cfg resource.</param>
+		public BeginActionAttribute(string action) : base(action)
+		{
+		}
+	}
+}
diff --git a/Source/Core/Actions/EndActionAttribute.cs b/Source/Core/Actions/EndActionAttribute.cs
new file mode 100644
index 0000000..e796eeb
--- /dev/null
+++ b/Source/Core/Actions/EndActionAttribute.cs
@@ -0,0 +1,36 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Actions
+{
+	/// <summary>
+	/// This binds a method to an action which is then called when the action is stopped.
+	/// </summary>
+	public class EndActionAttribute : ActionAttribute
+	{
+		/// <summary>
+		/// This binds a method to an action which is then called when the action is stopped.
+		/// </summary>
+		/// <param name="action">The action name as defined in Actions.cfg resource.</param>
+		public EndActionAttribute(string action) : base(action)
+		{
+		}
+	}
+}
diff --git a/Source/Core/Actions/HintsManager.cs b/Source/Core/Actions/HintsManager.cs
new file mode 100644
index 0000000..f9e9049
--- /dev/null
+++ b/Source/Core/Actions/HintsManager.cs
@@ -0,0 +1,164 @@
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
+using System.Text;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Actions
+{
+	public class HintsManager
+	{
+		#region ================== Public constants
+
+		public const string GENERAL = "general";
+		public const string MULTISELECTION = "multiselection";
+
+		#endregion
+		
+		#region ================== Constants
+
+		private const string HINTS_RESOURCE = "Hints.cfg";
+		private const string CLASS_MARKER = "class";
+		private const string GROUP_MARKER = "group";
+		private const string DEFAULT_HINT = "{\\rtf1 Press {\\b F1} to show help for current editing mode}";
+
+		#endregion
+
+		#region ================== Variables
+
+		private readonly Dictionary<string, Dictionary<string, string>> hints; //<classname, <group, hints as rtf string>>
+
+		#endregion
+
+		#region ================== Constructor
+
+		public HintsManager() 
+		{
+			hints = new Dictionary<string, Dictionary<string, string>>(StringComparer.Ordinal);
+		}
+
+		#endregion
+
+		#region ================== Hints
+
+		//Hints.cfg is dev-only stuff so bare minimum of boilerplate is present 
+		//(e.g. create your Hints.cfg exactly the way it's done in the main project). 
+		internal void LoadHints(Assembly asm) 
+		{
+			// Find a resource named Hints.cfg
+			string[] resnames = asm.GetManifestResourceNames();
+			string asmname = asm.GetName().Name.ToLowerInvariant() + "_";
+
+			foreach(string rn in resnames) 
+			{
+				// Found one?
+				if(rn.EndsWith(HINTS_RESOURCE, StringComparison.InvariantCultureIgnoreCase)) 
+				{
+					string classname = string.Empty;
+					string groupname = string.Empty;
+					List<string> lines = new List<string>(2);
+					
+					// Get a stream from the resource
+					using(Stream data = asm.GetManifestResourceStream(rn)) 
+					{
+						using(StreamReader reader = new StreamReader(data, Encoding.ASCII)) 
+						{
+							while(!reader.EndOfStream) lines.Add(reader.ReadLine());
+						}
+					}
+
+					Dictionary<string, List<string>> group = new Dictionary<string, List<string>>(StringComparer.Ordinal);
+
+					foreach(string s in lines) 
+					{
+						string line = s.Trim();
+						if(string.IsNullOrEmpty(line) || line.StartsWith("//"))
+							continue;
+
+						//class declaration?
+						if(line.StartsWith(CLASS_MARKER)) 
+						{
+							if(!string.IsNullOrEmpty(classname)) 
+							{
+								hints.Add(asmname + classname, ProcessHints(group));
+							}
+
+							classname = line.Substring(6, line.Length - 6);
+							groupname = string.Empty;
+							group.Clear();
+							continue;
+						}
+
+						//group declaration?
+						if(line.StartsWith(GROUP_MARKER)) 
+						{
+							groupname = line.Substring(6, line.Length - 6);
+							group.Add(groupname, new List<string>());
+							continue;
+						}
+
+						//regular lines
+						line = line.Replace("\"", string.Empty).Replace("<b>", "{\\b ").Replace("</b>", "}").Replace("<br>", "\\par ");
+
+						//replace action names with keys
+						int start = line.IndexOf("<k>");
+						while(start != -1) 
+						{
+							int end = line.IndexOf("</k>");
+							string key = line.Substring(start + 3, end - start - 3);
+							line = line.Substring(0, start) + "{\\b " + Action.GetShortcutKeyDesc(key) + "}" + line.Substring(end + 4, line.Length - end - 4);
+							start = line.IndexOf("<k>");
+						}
+
+						group[groupname].Add(line);
+					}
+
+					//add the last class
+					hints.Add(asmname + classname, ProcessHints(group));
+					break;
+				}
+			}
+		}
+
+		private static Dictionary<string, string> ProcessHints(Dictionary<string, List<string>> hintsgroup) 
+		{
+			var result = new Dictionary<string, string>(StringComparer.Ordinal);
+			foreach(KeyValuePair<string, List<string>> group in hintsgroup) 
+			{
+				result.Add(group.Key, "{\\rtf1" + string.Join("\\par\\par ", group.Value.ToArray()) + "}");
+			}
+			return result;
+		}
+
+		public void ShowHints(Type type, string groupname) 
+		{
+			string fullname = type.Assembly.GetName().Name.ToLowerInvariant() + "_" + type.Name;
+
+			if(!hints.ContainsKey(fullname) || !hints[fullname].ContainsKey(groupname)) 
+			{
+				General.Interface.ShowHints(DEFAULT_HINT);
+#if DEBUG
+				Console.WriteLine("WARNING: Unable to get hints for class '" + fullname + "', group '" + groupname + "'");
+#endif
+				return;
+			}
+			General.Interface.ShowHints(hints[fullname][groupname]);
+		}
+
+		#endregion
+
+		#region ================== Utility
+
+		public static string GetRtfString(string text) 
+		{
+			text = text.Replace("<b>", "{\\b ").Replace("</b>", "}").Replace("<br>", "\\par\\par ");
+			return "{\\rtf1" + text + "}";
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Actions/KeyControl.cs b/Source/Core/Actions/KeyControl.cs
new file mode 100644
index 0000000..76c7906
--- /dev/null
+++ b/Source/Core/Actions/KeyControl.cs
@@ -0,0 +1,72 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Windows.Forms;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Actions
+{
+	internal struct KeyControl
+	{
+		#region ================== Variables
+
+		public int key;
+		public string name;
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public KeyControl(Keys key, string name)
+		{
+			// Initialize
+			this.key = (int)key;
+			this.name = name;
+		}
+
+		// Constructor
+		public KeyControl(SpecialKeys key, string name)
+		{
+			// Initialize
+			this.key = (int)key;
+			this.name = name;
+		}
+
+		// Constructor
+		public KeyControl(int key, string name)
+		{
+			// Initialize
+			this.key = key;
+			this.name = name;
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// Returns name
+		public override string ToString()
+		{
+			return name;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Actions/MouseInput.cs b/Source/Core/Actions/MouseInput.cs
new file mode 100644
index 0000000..b5b0b9d
--- /dev/null
+++ b/Source/Core/Actions/MouseInput.cs
@@ -0,0 +1,171 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Windows.Forms;
+using SlimDX;
+using SlimDX.DirectInput;
+using CodeImp.DoomBuilder.Geometry;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Actions
+{
+	internal class MouseInput : IDisposable
+	{
+		#region ================== Variables
+
+		// Mouse input
+		private DirectInput dinput;
+		private Mouse mouse;
+		
+		// Disposing
+		private bool isdisposed;
+
+		#endregion
+
+		#region ================== Properties
+
+		public bool IsDisposed { get { return isdisposed; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public MouseInput(Control source)
+		{
+			// Initialize
+			dinput = new DirectInput();
+			
+			// Start mouse input
+			mouse = new Mouse(dinput);
+			if(mouse == null) throw new Exception("No mouse device found.");
+			
+			// Set mouse input settings
+			mouse.Properties.AxisMode = DeviceAxisMode.Relative;
+			
+			// Set cooperative level
+			mouse.SetCooperativeLevel(source,
+				CooperativeLevel.Nonexclusive | CooperativeLevel.Foreground);
+			
+			// Aquire device
+			try { mouse.Acquire(); }
+#if DEBUG
+			catch (Exception e)
+			{
+				Console.WriteLine("MouseInput initialization failed: " + e.Message);
+			}
+#else
+			catch (Exception) { }
+#endif
+
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Disposer
+		public void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Dispose
+				mouse.Unacquire();
+				mouse.Dispose();
+				dinput.Dispose();
+				
+				// Clean up
+				mouse = null;
+				dinput = null;
+				
+				// Done
+				isdisposed = true;
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		#endregion
+
+		#region ================== Processing
+
+		// This processes the input
+		public Vector2D Process()
+		{
+			// Poll the device
+			try
+			{
+				Result result = mouse.Poll();
+				if(result.IsSuccess)
+				{
+					// Get the changes since previous poll
+					MouseState ms = mouse.GetCurrentState();
+
+					// Calculate changes depending on sensitivity
+					float changex = ms.X * General.Settings.VisualMouseSensX * General.Settings.MouseSpeed * 0.01f;
+					float changey = ms.Y * General.Settings.VisualMouseSensY * General.Settings.MouseSpeed * 0.01f;
+
+					// Return changes
+					return new Vector2D(changex, changey);
+				}
+
+				// Reaquire device
+				try { mouse.Acquire(); }
+#if DEBUG
+				catch (Exception e)
+				{
+					Console.WriteLine("MouseInput process failed: " + e.Message);
+				}
+#else
+				catch (Exception) { }
+#endif
+				return new Vector2D();
+			}
+#if DEBUG
+			catch(DirectInputException die)
+			{
+				Console.WriteLine("MouseInput process failed: " + die.Message);
+			
+				// Reaquire device
+				try
+				{
+					mouse.Acquire();
+				}
+				catch (Exception e)
+				{
+					Console.WriteLine("MouseInput process failed: " + e.Message);
+				}
+				return new Vector2D();
+			}
+#else
+			catch(DirectInputException)
+			{
+				// Reaquire device
+				try { mouse.Acquire(); } 
+				catch (Exception) { }
+				return new Vector2D();
+			}
+#endif
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Actions/SpecialKeys.cs b/Source/Core/Actions/SpecialKeys.cs
new file mode 100644
index 0000000..bfc35ac
--- /dev/null
+++ b/Source/Core/Actions/SpecialKeys.cs
@@ -0,0 +1,28 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Actions
+{
+	public enum SpecialKeys : int
+	{
+		MScrollUp = 65530,
+		MScrollDown = 65531,
+	}
+}
diff --git a/Source/Core/Builder.csproj b/Source/Core/Builder.csproj
new file mode 100644
index 0000000..b3bf7a8
--- /dev/null
+++ b/Source/Core/Builder.csproj
@@ -0,0 +1,1330 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{818B3D10-F791-4C3F-9AF5-BB2D0079B63C}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>CodeImp.DoomBuilder</RootNamespace>
+    <AssemblyName>Builder</AssemblyName>
+    <StartupObject>CodeImp.DoomBuilder.General</StartupObject>
+    <ApplicationIcon>Resources\GZDB2.ico</ApplicationIcon>
+    <Win32Resource>
+    </Win32Resource>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\..\Build\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <DocumentationFile>..\..\Build\Builder.xml</DocumentationFile>
+    <WarningLevel>3</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <OutputPath>..\..\Build\</OutputPath>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <DocumentationFile>..\..\Build\Builder.xml</DocumentationFile>
+    <DefineConstants>
+    </DefineConstants>
+    <WarningLevel>3</WarningLevel>
+    <DebugSymbols>true</DebugSymbols>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug + Profiler|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\..\Build\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;PROFILE</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DocumentationFile>..\..\Build\Builder.xml</DocumentationFile>
+    <WarningLevel>3</WarningLevel>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release + Profiler|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\..\Build\</OutputPath>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DocumentationFile>..\..\Build\Builder.xml</DocumentationFile>
+    <Optimize>true</Optimize>
+    <WarningLevel>3</WarningLevel>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <DefineConstants>TRACE</DefineConstants>
+  </PropertyGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+  <ItemGroup>
+    <Compile Include="Compilers\AccCompiler.cs" />
+    <Compile Include="Compilers\NodesCompiler.cs" />
+    <Compile Include="Config\ArgumentInfo.cs" />
+    <Compile Include="Config\MapLumpInfo.cs" />
+    <Compile Include="Config\ScriptConfiguration.cs" />
+    <Compile Include="Config\DefinedTextureSet.cs" />
+    <Compile Include="Config\EnumItem.cs" />
+    <Compile Include="Config\EnumList.cs" />
+    <Compile Include="Config\IFilledTextureSet.cs" />
+    <Compile Include="Config\MatchingTextureSet.cs" />
+    <Compile Include="Config\ResourceTextureSet.cs" />
+    <Compile Include="Config\SectorEffectInfo.cs" />
+    <Compile Include="Config\GeneralizedBit.cs" />
+    <Compile Include="Config\GeneralizedOption.cs" />
+    <Compile Include="Config\GameConfiguration.cs" />
+    <Compile Include="Config\GeneralizedCategory.cs" />
+    <Compile Include="Config\INumberedTitle.cs" />
+    <Compile Include="Config\LinedefActionCategory.cs" />
+    <Compile Include="Config\LinedefActionInfo.cs" />
+    <Compile Include="Config\LinedefActivateInfo.cs" />
+    <Compile Include="Config\ProgramConfiguration.cs" />
+    <Compile Include="Config\SkillInfo.cs" />
+    <Compile Include="Config\TagType.cs" />
+    <Compile Include="Config\TextureSet.cs" />
+    <Compile Include="Config\ThingCategory.cs" />
+    <Compile Include="Config\ThingTypeInfo.cs" />
+    <Compile Include="Config\UniversalFieldInfo.cs" />
+    <Compile Include="Actions\ActionAttribute.cs" />
+    <Compile Include="Actions\BeginActionAttribute.cs" />
+    <Compile Include="Actions\EndActionAttribute.cs" />
+    <Compile Include="Actions\KeyControl.cs" />
+    <Compile Include="Actions\MouseInput.cs" />
+    <Compile Include="Controls\ArgumentBox.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Controls\ArgumentBox.Designer.cs">
+      <DependentUpon>ArgumentBox.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\ScriptEditorControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Controls\ScriptEditorControl.Designer.cs">
+      <DependentUpon>ScriptEditorControl.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\ScriptDocumentTab.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\ScintillaConstants.cs" />
+    <Compile Include="Controls\ScintillaControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\ScriptEditorPanel.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Controls\ScriptEditorPanel.Designer.cs">
+      <DependentUpon>ScriptEditorPanel.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\ScriptFileDocumentTab.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\ScriptLumpDocumentTab.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Data\DirectoryReader.cs" />
+    <Compile Include="Data\FileImage.cs" />
+    <Compile Include="Data\FlatImage.cs" />
+    <Compile Include="Data\ImageLoadState.cs" />
+    <Compile Include="Data\UnknownImage.cs" />
+    <Compile Include="Data\PatchNames.cs" />
+    <Compile Include="Data\PK3Reader.cs" />
+    <Compile Include="Data\Playpal.cs" />
+    <Compile Include="Data\PreviewManager.cs" />
+    <Compile Include="Data\ResourceImage.cs" />
+    <Compile Include="Data\SimpleTextureImage.cs" />
+    <Compile Include="Data\SpriteImage.cs" />
+    <Compile Include="Data\TextureImage.cs" />
+    <Compile Include="Editing\CopyPasteManager.cs" />
+    <Compile Include="Editing\EditMode.cs" />
+    <Compile Include="Editing\EditModeAttribute.cs" />
+    <Compile Include="Editing\EditModeInfo.cs" />
+    <Compile Include="Editing\GridSetup.cs" />
+    <Compile Include="Editing\NullThingsFilter.cs" />
+    <Compile Include="Editing\ThingsFilter.cs" />
+    <Compile Include="Editing\UndoManager.cs" />
+    <Compile Include="Editing\UndoSnapshot.cs" />
+    <Compile Include="Editing\ClassicMode.cs" />
+    <Compile Include="Actions\ActionDelegate.cs" />
+    <Compile Include="Actions\Action.cs" />
+    <Compile Include="Actions\ActionManager.cs" />
+    <Compile Include="Config\CompilerInfo.cs" />
+    <Compile Include="Config\ConfigurationInfo.cs" />
+    <Compile Include="GZBuilder\Controls\PairedFloatControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="GZBuilder\Controls\PairedFloatControl.Designer.cs">
+      <DependentUpon>PairedFloatControl.cs</DependentUpon>
+    </Compile>
+    <Compile Include="GZBuilder\Windows\ThingStatisticsForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="GZBuilder\Windows\ThingStatisticsForm.Designer.cs">
+      <DependentUpon>ThingStatisticsForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="VisualModes\VisualBlockMap.cs" />
+    <Compile Include="VisualModes\VisualMode.cs" />
+    <Compile Include="General\Clock.cs" />
+    <Compile Include="Compilers\Compiler.cs" />
+    <Compile Include="Compilers\CompilerError.cs" />
+    <Compile Include="General\MapManager.cs" />
+    <Compile Include="Actions\SpecialKeys.cs" />
+    <Compile Include="Config\NodebuilderInfo.cs" />
+    <Compile Include="Geometry\Angle2D.cs" />
+    <Compile Include="Geometry\DrawnVertex.cs" />
+    <Compile Include="Geometry\LabelPositionInfo.cs" />
+    <Compile Include="Geometry\LinedefsTracePath.cs" />
+    <Compile Include="Geometry\LinedefAngleSorter.cs" />
+    <Compile Include="Geometry\Tools.cs" />
+    <Compile Include="Geometry\Triangulation.cs" />
+    <Compile Include="Geometry\EarClipVertex.cs" />
+    <Compile Include="Geometry\Line2D.cs" />
+    <Compile Include="Geometry\EarClipPolygon.cs" />
+    <Compile Include="Geometry\SidedefAngleSorter.cs" />
+    <Compile Include="Geometry\SidedefsTracePath.cs" />
+    <Compile Include="Geometry\Vector2D.cs" />
+    <Compile Include="Geometry\Vector3D.cs" />
+    <Compile Include="Data\TexturePatch.cs" />
+    <Compile Include="Data\ImageDataFormat.cs" />
+    <Compile Include="Data\DataReader.cs" />
+    <Compile Include="Data\DataLocationList.cs" />
+    <Compile Include="Data\DataManager.cs" />
+    <Compile Include="Data\WADReader.cs" />
+    <Compile Include="IO\UniversalCollection.cs" />
+    <Compile Include="IO\UniversalEntry.cs" />
+    <Compile Include="IO\UniversalParser.cs" />
+    <Compile Include="IO\UniversalStreamReader.cs" />
+    <Compile Include="IO\UniversalStreamWriter.cs" />
+    <Compile Include="Map\MapElement.cs" />
+    <Compile Include="Map\SelectableElement.cs" />
+    <Compile Include="Map\UniFields.cs" />
+    <Compile Include="Map\UniValue.cs" />
+    <Compile Include="Rendering\ViewMode.cs" />
+    <Compile Include="Types\BoolHandler.cs" />
+    <Compile Include="Types\ColorHandler.cs" />
+    <Compile Include="Types\EnumBitsHandler.cs" />
+    <Compile Include="Types\EnumOptionHandler.cs" />
+    <Compile Include="Types\EnumStringsHandler.cs" />
+    <Compile Include="Types\FlatHandler.cs" />
+    <Compile Include="Types\FloatHandler.cs" />
+    <Compile Include="Types\IntegerHandler.cs" />
+    <Compile Include="Types\LinedefTypeHandler.cs" />
+    <Compile Include="Types\NullHandler.cs" />
+    <Compile Include="Types\SectorEffectHandler.cs" />
+    <Compile Include="Types\StringHandler.cs" />
+    <Compile Include="Types\TextureHandler.cs" />
+    <Compile Include="Types\TypeHandler.cs" />
+    <Compile Include="Types\TypeHandlerAttribute.cs" />
+    <Compile Include="Types\TypesManager.cs" />
+    <Compile Include="Types\UniversalType.cs" />
+    <Compile Include="Windows\AboutForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Windows\AboutForm.Designer.cs">
+      <DependentUpon>AboutForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Windows\ActionBrowserForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Windows\ActionBrowserForm.Designer.cs">
+      <DependentUpon>ActionBrowserForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\ActionSelectorControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Controls\ActionSelectorControl.Designer.cs">
+      <DependentUpon>ActionSelectorControl.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\AngleControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Controls\AngleControl.Designer.cs">
+      <DependentUpon>AngleControl.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\AutoSelectTextbox.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\CheckboxArrayControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Controls\CheckboxArrayControl.Designer.cs">
+      <DependentUpon>CheckboxArrayControl.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\ButtonsNumericTextbox.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Controls\ButtonsNumericTextbox.Designer.cs">
+      <DependentUpon>ButtonsNumericTextbox.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\ColorControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Controls\ColorControl.Designer.cs">
+      <DependentUpon>ColorControl.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Windows\BitFlagsForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Windows\BitFlagsForm.Designer.cs">
+      <DependentUpon>BitFlagsForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Windows\ConfigForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Windows\ConfigForm.Designer.cs">
+      <DependentUpon>ConfigForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Windows\CustomFieldsForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Windows\CustomFieldsForm.Designer.cs">
+      <DependentUpon>CustomFieldsForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Windows\EffectBrowserForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Windows\EffectBrowserForm.Designer.cs">
+      <DependentUpon>EffectBrowserForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\FieldsEditorRow.cs" />
+    <Compile Include="Controls\FieldsEditorControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Controls\FieldsEditorControl.Designer.cs">
+      <DependentUpon>FieldsEditorControl.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Windows\DelayedForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Controls\FlatSelectorControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Windows\GridSetupForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Windows\GridSetupForm.Designer.cs">
+      <DependentUpon>GridSetupForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\ImageBrowserControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Controls\ImageBrowserControl.Designer.cs">
+      <DependentUpon>ImageBrowserControl.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\ImageBrowserItem.cs" />
+    <Compile Include="Controls\ImageSelectorControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Controls\ImageSelectorControl.Designer.cs">
+      <DependentUpon>ImageSelectorControl.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Windows\IMainForm.cs" />
+    <Compile Include="Windows\LinedefEditForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Windows\LinedefEditForm.Designer.cs">
+      <DependentUpon>LinedefEditForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\LinedefInfoPanel.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Controls\LinedefInfoPanel.Designer.cs">
+      <DependentUpon>LinedefInfoPanel.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Windows\MapOptionsForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Windows\MapOptionsForm.Designer.cs">
+      <DependentUpon>MapOptionsForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\NumericTextbox.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Windows\MessageBeepType.cs" />
+    <Compile Include="Windows\OpenMapOptionsForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Windows\OpenMapOptionsForm.Designer.cs">
+      <DependentUpon>OpenMapOptionsForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\OptimizedListView.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Windows\PreferencesForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Windows\PreferencesForm.Designer.cs">
+      <DependentUpon>PreferencesForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\RenderTargetControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\ResourceListView.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\ResourceListEditor.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Controls\ResourceListEditor.Designer.cs">
+      <DependentUpon>ResourceListEditor.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Windows\ResourceOptionsForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Windows\ResourceOptionsForm.Designer.cs">
+      <DependentUpon>ResourceOptionsForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Windows\ScriptEditorForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Windows\ScriptEditorForm.Designer.cs">
+      <DependentUpon>ScriptEditorForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Windows\SectorEditForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Windows\SectorEditForm.Designer.cs">
+      <DependentUpon>SectorEditForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\SectorInfoPanel.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Controls\SectorInfoPanel.Designer.cs">
+      <DependentUpon>SectorInfoPanel.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Windows\TextEditForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Windows\TextEditForm.Designer.cs">
+      <DependentUpon>TextEditForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Windows\TextureBrowserForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Windows\TextureBrowserForm.Designer.cs">
+      <DependentUpon>TextureBrowserForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\TextureSelectorControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Windows\TextureSetForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Windows\TextureSetForm.Designer.cs">
+      <DependentUpon>TextureSetForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Windows\ThingEditForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Windows\ThingEditForm.Designer.cs">
+      <DependentUpon>ThingEditForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\ThingInfoPanel.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Controls\ThingInfoPanel.Designer.cs">
+      <DependentUpon>ThingInfoPanel.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Windows\ThingsFiltersForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Windows\ThingsFiltersForm.Designer.cs">
+      <DependentUpon>ThingsFiltersForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\VertexInfoPanel.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Controls\VertexInfoPanel.Designer.cs">
+      <DependentUpon>VertexInfoPanel.cs</DependentUpon>
+    </Compile>
+    <Compile Include="IO\Configuration.cs" />
+    <Compile Include="General\General.cs" />
+    <Compile Include="IO\ClippedStream.cs" />
+    <Compile Include="IO\HexenMapSetIO.cs" />
+    <Compile Include="IO\DoomFlatReader.cs" />
+    <Compile Include="IO\DoomMapSetIO.cs" />
+    <Compile Include="IO\DoomPictureReader.cs" />
+    <Compile Include="IO\FileImageReader.cs" />
+    <Compile Include="IO\IImageReader.cs" />
+    <Compile Include="IO\IMapSetIO.cs" />
+    <Compile Include="General\Launcher.cs" />
+    <Compile Include="IO\Lump.cs" />
+    <Compile Include="IO\MapSetIO.cs" />
+    <Compile Include="IO\UniversalMapSetIO.cs" />
+    <Compile Include="IO\UnknownImageReader.cs" />
+    <Compile Include="IO\WAD.cs" />
+    <Compile Include="Windows\MainForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Windows\MainForm.Designer.cs">
+      <DependentUpon>MainForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Map\Linedef.cs" />
+    <Compile Include="Geometry\LinedefSide.cs" />
+    <Compile Include="Map\MapOptions.cs" />
+    <Compile Include="Map\MapSet.cs" />
+    <Compile Include="Data\DataLocation.cs" />
+    <Compile Include="Map\Sector.cs" />
+    <Compile Include="Map\Sidedef.cs" />
+    <Compile Include="Map\SidedefPart.cs" />
+    <Compile Include="Map\Thing.cs" />
+    <Compile Include="Map\Vertex.cs" />
+    <Compile Include="Plugins\Plug.cs" />
+    <Compile Include="Plugins\Plugin.cs" />
+    <Compile Include="Plugins\PluginManager.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Rendering\Presentation.cs" />
+    <Compile Include="Rendering\Display2DShader.cs" />
+    <Compile Include="Rendering\ColorCollection.cs" />
+    <Compile Include="Rendering\ColorSetting.cs" />
+    <Compile Include="Rendering\D3DDevice.cs" />
+    <Compile Include="Data\ImageData.cs" />
+    <Compile Include="Rendering\D3DShader.cs" />
+    <Compile Include="Rendering\FlatQuad.cs" />
+    <Compile Include="Rendering\FlatVertex.cs" />
+    <Compile Include="Rendering\ID3DResource.cs" />
+    <Compile Include="Rendering\IRenderer2D.cs" />
+    <Compile Include="Rendering\IRenderer3D.cs" />
+    <Compile Include="Rendering\RenderLayers.cs" />
+    <Compile Include="Rendering\TextAlignment.cs" />
+    <Compile Include="Rendering\TextFont.cs" />
+    <Compile Include="Rendering\TextLabel.cs" />
+    <Compile Include="VisualModes\VisualGeometry.cs" />
+    <Compile Include="Rendering\PixelColor.cs" />
+    <Compile Include="Rendering\PixelColorBlock.cs" />
+    <Compile Include="Rendering\Plotter.cs" />
+    <Compile Include="Rendering\Renderer.cs" />
+    <Compile Include="Rendering\Renderer2D.cs" />
+    <Compile Include="Rendering\Renderer3D.cs" />
+    <Compile Include="Rendering\ShaderManager.cs" />
+    <Compile Include="Rendering\Things2DShader.cs" />
+    <Compile Include="VisualModes\VisualSector.cs" />
+    <Compile Include="Rendering\World3DShader.cs" />
+    <Compile Include="Rendering\WorldVertex.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="JetBrains.Profiler.Core.Api, Version=1.3.1661.20096, Culture=neutral, PublicKeyToken=1010a0d8d6380325" Condition=" '$(Configuration)|$(Platform)' == 'Debug + Profiler|x86' Or '$(Configuration)|$(Platform)' == 'Release + Profiler|x86' " />
+    <Reference Include="SharpCompress.3.5, Version=0.11.2.0, Culture=neutral, processorArchitecture=x86">
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="SlimDX, Version=2.0.13.43, Culture=neutral, PublicKeyToken=b1b0c32fd1ffe4f9, processorArchitecture=x86" />
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data" />
+    <Reference Include="System.Design" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Management" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="GZBuilder\Controls\PairedFloatControl.resx">
+      <DependentUpon>PairedFloatControl.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="GZBuilder\Windows\ThingStatisticsForm.resx">
+      <DependentUpon>ThingStatisticsForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Windows\AboutForm.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>AboutForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Windows\MainForm.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>MainForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Windows\MapOptionsForm.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>MapOptionsForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Windows\OpenMapOptionsForm.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>OpenMapOptionsForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Windows\ResourceOptionsForm.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>ResourceOptionsForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <SubType>Designer</SubType>
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\MissingTexture.png" />
+    <None Include="Resources\UnknownImage.png" />
+    <None Include="Resources\treeview.png" />
+    <None Include="Resources\Folder.png" />
+    <None Include="Resources\mergegeometry2.png" />
+    <None Include="Resources\mergegeometry.png" />
+    <None Include="Resources\Grid4.png" />
+    <None Include="Resources\Redo.png" />
+    <None Include="Resources\Undo.png" />
+    <None Include="Resources\Grid2.png" />
+    <None Include="Resources\Hourglass.png" />
+    <None Include="Resources\Filter.png" />
+    <None Include="Resources\Status1.png" />
+    <None Include="Resources\Status2.png" />
+    <None Include="Resources\Status0.png" />
+    <None Include="Resources\ColorPick.png" />
+    <None Include="Resources\Zoom.png" />
+    <None Include="Resources\Properties.png" />
+    <None Include="Resources\NewMap2.png" />
+    <None Include="Resources\SaveMap.png" />
+    <None Include="Resources\OpenMap.png" />
+    <None Include="Resources\NewMap.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Windows\ActionBrowserForm.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>ActionBrowserForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Controls\ActionSelectorControl.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>ActionSelectorControl.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Controls\CheckboxArrayControl.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>CheckboxArrayControl.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Controls\ColorControl.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>ColorControl.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Windows\ConfigForm.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>ConfigForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Windows\EffectBrowserForm.resx">
+      <DependentUpon>EffectBrowserForm.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Controls\FieldsEditorControl.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>FieldsEditorControl.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Windows\DelayedForm.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>DelayedForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Windows\GridSetupForm.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>GridSetupForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Controls\ImageBrowserControl.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>ImageBrowserControl.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Controls\ImageSelectorControl.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>ImageSelectorControl.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Windows\LinedefEditForm.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>LinedefEditForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Controls\LinedefInfoPanel.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>LinedefInfoPanel.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Windows\PreferencesForm.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>PreferencesForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Controls\ResourceListEditor.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>ResourceListEditor.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Windows\SectorEditForm.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>SectorEditForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Controls\SectorInfoPanel.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>SectorInfoPanel.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Windows\TextureBrowserForm.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>TextureBrowserForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Controls\ThingInfoPanel.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>ThingInfoPanel.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Controls\VertexInfoPanel.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>VertexInfoPanel.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Resources\Actions.cfg" />
+    <EmbeddedResource Include="Resources\display2d.fx" />
+    <EmbeddedResource Include="Resources\Thing2D.png" />
+    <EmbeddedResource Include="Resources\things2d.fx" />
+    <EmbeddedResource Include="Resources\world3d.fx" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\MissingTexture3D.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.manifest" />
+    <None Include="Resources\ScriptSnippet.xpm" />
+    <None Include="Resources\ThingStatistics.png" />
+    <None Include="Resources\Copy.png" />
+    <None Include="Resources\Cut.png" />
+    <None Include="Resources\Close.png" />
+    <Compile Include="Actions\HintsManager.cs" />
+    <Compile Include="Config\AllTexturesSet.cs" />
+    <Compile Include="Config\FlagTranslation.cs" />
+    <Compile Include="Config\ModelAndLightRenderModes.cs" />
+    <Compile Include="Config\PasteOptions.cs" />
+    <Compile Include="Config\ThingsFlagsCompare.cs" />
+    <Compile Include="Controls\ActionSpecialHelpButton.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Controls\ActionSpecialHelpButton.Designer.cs">
+      <DependentUpon>ActionSpecialHelpButton.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\ArgumentsControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Controls\ArgumentsControl.Designer.cs">
+      <DependentUpon>ArgumentsControl.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\ButtonsNumericTextboxDesigner.cs" />
+    <Compile Include="Controls\CollapsibleSplitContainer.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\ColoredComboBox.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\CommentEditor.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Controls\CommentEditor.Designer.cs">
+      <DependentUpon>CommentEditor.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\DebugConsole.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Controls\DebugConsole.designer.cs">
+      <DependentUpon>DebugConsole.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\Docker.cs" />
+    <Compile Include="Controls\DockersControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Controls\DockersControl.Designer.cs">
+      <DependentUpon>DockersControl.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\DockersTabsControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\ConfigurablePictureBox.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\HintsPanel.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Controls\HintsPanel.Designer.cs">
+      <DependentUpon>HintsPanel.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\PasteOptionsControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Controls\PasteOptionsControl.Designer.cs">
+      <DependentUpon>PasteOptionsControl.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\SectorSlopeControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Controls\SectorSlopeControl.Designer.cs">
+      <DependentUpon>SectorSlopeControl.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\StatisticsControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Controls\StatisticsControl.Designer.cs">
+      <DependentUpon>StatisticsControl.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\ThingBrowserControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Controls\ThingBrowserControl.Designer.cs">
+      <DependentUpon>ThingBrowserControl.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\ToolStripCheckBox.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\ToolStripNumericUpDown.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\TransparentPanel.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Data\BitmapImage.cs" />
+    <Compile Include="Data\CameraTextureImage.cs" />
+    <Compile Include="Data\ColorImage.cs" />
+    <Compile Include="Data\ColormapImage.cs" />
+    <Compile Include="Data\HighResImage.cs" />
+    <Compile Include="Data\PK3FileImage.cs" />
+    <Compile Include="Data\PK3StructuredReader.cs" />
+    <Compile Include="Data\DynamicBitmapImage.cs" />
+    <Compile Include="Editing\CustomThingsFilter.cs" />
+    <Compile Include="General\CRC.cs" />
+    <Compile Include="General\ErrorItem.cs" />
+    <Compile Include="General\ErrorLogger.cs" />
+    <Compile Include="General\FileLockChecker.cs" />
+    <Compile Include="General\MurmurHash2.cs" />
+    <Compile Include="General\SavePurpose.cs" />
+    <Compile Include="General\UpdateChecker.cs" />
+    <Compile Include="Geometry\CurveTools.cs" />
+    <Compile Include="Geometry\InterpolationTools.cs" />
+    <Compile Include="GZBuilder\Controls\AngleControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="GZBuilder\Controls\AngleControl.Designer.cs">
+      <DependentUpon>AngleControl.cs</DependentUpon>
+    </Compile>
+    <Compile Include="GZBuilder\Controls\ColorFieldsControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="GZBuilder\Controls\ColorFieldsControl.Designer.cs">
+      <DependentUpon>ColorFieldsControl.cs</DependentUpon>
+    </Compile>
+    <Compile Include="GZBuilder\Controls\TagsSelector.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="GZBuilder\Controls\TagsSelector.Designer.cs">
+      <DependentUpon>TagsSelector.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\CheckedColoredListBox.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="GZBuilder\Controls\MultiSelectTreeview.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="GZBuilder\Controls\PairedFieldsControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="GZBuilder\Controls\PairedFieldsControl.Designer.cs">
+      <DependentUpon>PairedFieldsControl.cs</DependentUpon>
+    </Compile>
+    <Compile Include="GZBuilder\Controls\PairedIntControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="GZBuilder\Controls\PairedIntControl.Designer.cs">
+      <DependentUpon>PairedIntControl.cs</DependentUpon>
+    </Compile>
+    <Compile Include="GZBuilder\Controls\TagSelector.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="GZBuilder\Controls\TagSelector.Designer.cs">
+      <DependentUpon>TagSelector.cs</DependentUpon>
+    </Compile>
+    <Compile Include="GZBuilder\Data\BoundingBox.cs" />
+    <Compile Include="GZBuilder\Data\EngineInfo.cs" />
+    <Compile Include="GZBuilder\Data\GameType.cs" />
+    <Compile Include="GZBuilder\Data\DynamicLight.cs" />
+    <Compile Include="GZBuilder\Data\GlowingFlatData.cs" />
+    <Compile Include="GZBuilder\Data\LinedefColorPreset.cs" />
+    <Compile Include="GZBuilder\Data\LinksCollector.cs" />
+    <Compile Include="GZBuilder\Data\MapInfo.cs" />
+    <Compile Include="GZBuilder\Data\ModelData.cs" />
+    <Compile Include="GZBuilder\Data\ModelLoadState.cs" />
+    <Compile Include="GZBuilder\Data\ScriptItem.cs" />
+    <Compile Include="GZBuilder\Data\SharpCompressHelper.cs" />
+    <Compile Include="GZBuilder\Rendering\SizelessVisualThingCage.cs" />
+    <Compile Include="GZBuilder\Rendering\ThingBoundingBox.cs" />
+    <Compile Include="GZBuilder\Data\ThingCopyData.cs" />
+    <Compile Include="GZBuilder\Rendering\VisualVertexHandle.cs" />
+    <Compile Include="GZBuilder\Geometry\Line3D.cs" />
+    <Compile Include="GZBuilder\GZDoom\DecorateParserSE.cs" />
+    <Compile Include="GZBuilder\GZDoom\GldefsParser.cs" />
+    <Compile Include="GZBuilder\GZDoom\MapinfoParser.cs" />
+    <Compile Include="GZBuilder\GZDoom\ModeldefParser.cs" />
+    <Compile Include="GZBuilder\GZDoom\ModeldefParserSE.cs" />
+    <Compile Include="GZBuilder\GZDoom\ModeldefStructure.cs" />
+    <Compile Include="GZBuilder\GZDoom\ScriptTypeParserSE.cs" />
+    <Compile Include="GZBuilder\GZGeneral.cs" />
+    <Compile Include="GZBuilder\md3\GZModel.cs" />
+    <Compile Include="GZBuilder\md3\ModelReader.cs" />
+    <Compile Include="GZBuilder\GZDoom\AcsParserSE.cs" />
+    <Compile Include="GZBuilder\Windows\ExceptionDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="GZBuilder\Windows\ExceptionDialog.designer.cs">
+      <DependentUpon>ExceptionDialog.cs</DependentUpon>
+    </Compile>
+    <Compile Include="GZBuilder\Windows\TagStatisticsForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="GZBuilder\Windows\TagStatisticsForm.Designer.cs">
+      <DependentUpon>TagStatisticsForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="IO\ClipboardStreamReader.cs" />
+    <Compile Include="IO\DoomColormapReader.cs" />
+    <Compile Include="IO\ClipboardStreamWriter.cs" />
+    <Compile Include="Map\GroupInfo.cs" />
+    <Compile Include="Map\SelectionType.cs" />
+    <Compile Include="Map\MapElementCollection.cs" />
+    <Compile Include="Map\SplitLineBehavior.cs" />
+    <Compile Include="Rendering\CommentType.cs" />
+    <Compile Include="Rendering\SurfaceBufferSet.cs" />
+    <Compile Include="Rendering\SurfaceEntry.cs" />
+    <Compile Include="Rendering\SurfaceEntryCollection.cs" />
+    <Compile Include="Rendering\SurfaceManager.cs" />
+    <Compile Include="Rendering\SurfaceUpdate.cs" />
+    <Compile Include="Types\AngleByteHandler.cs" />
+    <Compile Include="Types\RandomFloatHandler.cs" />
+    <Compile Include="Types\RandomIntegerHandler.cs" />
+    <Compile Include="Types\ThingClassHandler.cs" />
+    <Compile Include="Types\ThingHeightHandler.cs" />
+    <Compile Include="Types\ThingRadiusHandler.cs" />
+    <Compile Include="Types\ThingTypeHandler.cs" />
+    <Compile Include="VisualModes\VisualVertex.cs" />
+    <Compile Include="Windows\CenterOnCoordinatesForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Windows\CenterOnCoordinatesForm.Designer.cs">
+      <DependentUpon>CenterOnCoordinatesForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Windows\ChangeMapForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Windows\ChangeMapForm.Designer.cs">
+      <DependentUpon>ChangeMapForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Windows\ErrorsForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Windows\ErrorsForm.Designer.cs">
+      <DependentUpon>ErrorsForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Windows\FindReplaceOptions.cs" />
+    <Compile Include="Windows\FlagsForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Windows\FlagsForm.Designer.cs">
+      <DependentUpon>FlagsForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Windows\LinedefColorPresetsForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Windows\LinedefColorPresetsForm.Designer.cs">
+      <DependentUpon>LinedefColorPresetsForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Windows\LinedefEditFormUDMF.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Windows\LinedefEditFormUDMF.designer.cs">
+      <DependentUpon>LinedefEditFormUDMF.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Windows\MenuSection.cs" />
+    <Compile Include="Windows\PasteOptionsForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Windows\PasteOptionsForm.Designer.cs">
+      <DependentUpon>PasteOptionsForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Windows\PluginToolbarButton.cs" />
+    <Compile Include="Windows\ScriptFindReplaceForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Windows\ScriptFindReplaceForm.Designer.cs">
+      <DependentUpon>ScriptFindReplaceForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Windows\SectorEditFormUDMF.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Windows\SectorEditFormUDMF.Designer.cs">
+      <DependentUpon>SectorEditFormUDMF.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Windows\StatusInfo.cs" />
+    <Compile Include="Windows\TanColorTable.cs" />
+    <Compile Include="Windows\ThingBrowserForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Windows\ThingBrowserForm.Designer.cs">
+      <DependentUpon>ThingBrowserForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Windows\ThingEditFormUDMF.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Windows\ThingEditFormUDMF.Designer.cs">
+      <DependentUpon>ThingEditFormUDMF.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Windows\ToolbarSection.cs" />
+    <Compile Include="Windows\UpdateForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Windows\UpdateForm.Designer.cs">
+      <DependentUpon>UpdateForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Windows\VertexEditForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Windows\VertexEditForm.Designer.cs">
+      <DependentUpon>VertexEditForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="ZDoom\ActorStructure.cs" />
+    <Compile Include="ZDoom\AnimdefsParser.cs" />
+    <Compile Include="ZDoom\PatchStructure.cs" />
+    <Compile Include="ZDoom\ReverbsParser.cs" />
+    <Compile Include="ZDoom\SndSeqParser.cs" />
+    <Compile Include="ZDoom\StateGoto.cs" />
+    <Compile Include="ZDoom\TexturesParser.cs" />
+    <Compile Include="ZDoom\TextureStructure.cs" />
+    <Compile Include="ZDoom\VoxeldefParser.cs" />
+    <Compile Include="ZDoom\ZDTextParser.cs" />
+    <Compile Include="ZDoom\DecorateParser.cs" />
+    <Compile Include="ZDoom\StateStructure.cs" />
+    <Compile Include="Editing\EditingManager.cs" />
+    <EmbeddedResource Include="Controls\ActionSpecialHelpButton.resx">
+      <DependentUpon>ActionSpecialHelpButton.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Controls\ArgumentsControl.resx">
+      <DependentUpon>ArgumentsControl.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Controls\CommentEditor.resx">
+      <DependentUpon>CommentEditor.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Controls\DebugConsole.resx">
+      <DependentUpon>DebugConsole.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Controls\DockersControl.resx">
+      <DependentUpon>DockersControl.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Controls\HintsPanel.resx">
+      <DependentUpon>HintsPanel.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Controls\PasteOptionsControl.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>PasteOptionsControl.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Controls\SectorSlopeControl.resx">
+      <DependentUpon>SectorSlopeControl.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Controls\StatisticsControl.resx">
+      <DependentUpon>StatisticsControl.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Controls\ThingBrowserControl.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>ThingBrowserControl.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="GZBuilder\Controls\AngleControl.resx">
+      <DependentUpon>AngleControl.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="GZBuilder\Controls\ColorFieldsControl.resx">
+      <DependentUpon>ColorFieldsControl.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="GZBuilder\Controls\TagsSelector.resx">
+      <DependentUpon>TagsSelector.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="GZBuilder\Controls\PairedFieldsControl.resx">
+      <DependentUpon>PairedFieldsControl.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="GZBuilder\Controls\PairedIntControl.resx">
+      <DependentUpon>PairedIntControl.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="GZBuilder\Controls\TagSelector.resx">
+      <DependentUpon>TagSelector.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="GZBuilder\Windows\ExceptionDialog.resx">
+      <DependentUpon>ExceptionDialog.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="GZBuilder\Windows\TagStatisticsForm.resx">
+      <DependentUpon>TagStatisticsForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Resources\Crosshair.png" />
+    <EmbeddedResource Include="Resources\CrosshairBusy.png" />
+    <Compile Include="General\StepsList.cs" />
+    <None Include="Resources\Builder16.png" />
+    <None Include="Resources\CLogo.png" />
+    <None Include="Resources\Angle.png" />
+    <None Include="Resources\Add.png" />
+    <None Include="Resources\ArrowDown.png" />
+    <None Include="Resources\ArrowUp.png" />
+    <None Include="Resources\Check.png" />
+    <None Include="Resources\ClearTextures.png" />
+    <None Include="Resources\Cursor.png" />
+    <None Include="Resources\Brightness.png" />
+    <None Include="Resources\Clear.png" />
+    <None Include="Resources\Collapse.png" />
+    <EmbeddedResource Include="Resources\CommentInfo.png" />
+    <EmbeddedResource Include="Resources\CommentProblem.png" />
+    <EmbeddedResource Include="Resources\CommentQuestion.png" />
+    <EmbeddedResource Include="Resources\CommentRegular.png" />
+    <EmbeddedResource Include="Resources\CommentSmile.png" />
+    <None Include="Resources\Comment.png" />
+    <None Include="Resources\About.png" />
+    <None Include="Resources\Configuration.png" />
+    <EmbeddedResource Include="Resources\Black.png" />
+    <Content Include="Resources\DB2.ico" />
+    <None Include="Resources\GZDB2.ico" />
+    <None Include="Resources\fog.png" />
+    <None Include="Resources\fx.png" />
+    <None Include="Resources\GZDB_Logo_small.png" />
+    <None Include="Resources\InfoLine.png" />
+    <None Include="Resources\Keyboard.png" />
+    <None Include="Resources\ImageStack.png" />
+    <None Include="Resources\FolderExplore.png" />
+    <None Include="Resources\Expand.png" />
+    <None Include="Resources\DockerCollapse.png" />
+    <None Include="Resources\DockerExpand.png" />
+    <None Include="Resources\InfoPanelCollapse.png" />
+    <None Include="Resources\InfoPanelExpand.png" />
+    <None Include="Resources\GridDynamic.png" />
+    <None Include="Resources\Group.png" />
+    <None Include="Resources\GroupAdd.png" />
+    <None Include="Resources\GroupRemove.png" />
+    <None Include="Resources\GridDecrease.png" />
+    <None Include="Resources\GridIncrease.png" />
+    <Content Include="Resources\Light.png" />
+    <None Include="Resources\Lightbulb.png" />
+    <None Include="Resources\LightDisabled.png" />
+    <Content Include="Resources\Light_animate.png" />
+    <None Include="Resources\MLogo.png" />
+    <None Include="Resources\Marine.png" />
+    <None Include="Resources\Link.png" />
+    <EmbeddedResource Include="Resources\MissingThing.png" />
+    <None Include="Resources\MCrash.png" />
+    <None Include="Resources\MixedThings.png" />
+    <None Include="Resources\LinedefColorPresets.png" />
+    <Content Include="Resources\Model.png" />
+    <None Include="Resources\ModelDisabled.png" />
+    <None Include="Resources\ModelFiltered.png" />
+    <Content Include="Resources\Model_selected.png" />
+    <None Include="Resources\Update.png" />
+    <None Include="Resources\Reload.png" />
+    <None Include="Resources\Preferences.png" />
+    <None Include="Resources\Replace.png" />
+    <None Include="Resources\SearchPrev.png" />
+    <None Include="Resources\SearchNext.png" />
+    <None Include="Resources\SearchMatchCase.png" />
+    <None Include="Resources\SearchMatch.png" />
+    <None Include="Resources\WordWrap.png" />
+    <None Include="Resources\ScreenshotActiveWindow.png" />
+    <None Include="Resources\Screenshot.png" />
+    <None Include="Resources\PuzzlePiece.png" />
+    <None Include="Resources\Search.png" />
+    <None Include="Resources\SnapVerts.png" />
+    <EmbeddedResource Include="Resources\UDMF_UI.cfg" />
+    <None Include="Resources\Unlink.png" />
+    <None Include="Resources\Unpin.png" />
+    <None Include="Resources\Pin.png" />
+    <None Include="Resources\Reset.png" />
+    <None Include="Resources\TagStatistics.png" />
+    <None Include="Resources\VisualVertices.png" />
+    <None Include="Resources\SearchClear.png" />
+    <None Include="Resources\Text.png" />
+    <None Include="Resources\List_Images.png" />
+    <None Include="Resources\List.png" />
+    <None Include="Resources\PasteSpecial.png" />
+    <None Include="Resources\ScriptHelp.png" />
+    <None Include="Resources\ErrorLarge.png" />
+    <None Include="Resources\WarningLarge.png" />
+    <None Include="Resources\Question.png" />
+    <None Include="Resources\Help.png" />
+    <None Include="Resources\Status11.png" />
+    <None Include="Resources\Status10.png" />
+    <None Include="Resources\Status12.png" />
+    <EmbeddedResource Include="Resources\UnknownTexture3D.png" />
+    <None Include="Resources\Monster3.png" />
+    <None Include="Resources\Monster2.png" />
+    <None Include="Resources\Prefab2.png" />
+    <None Include="Resources\Prefab.png" />
+    <EmbeddedResource Include="Resources\Nothing.png" />
+    <EmbeddedResource Include="Resources\UnknownThing.png" />
+    <Compile Include="IO\DirectoryFileEntry.cs" />
+    <Compile Include="IO\DirectoryFilesList.cs" />
+    <Compile Include="Map\BlockEntry.cs" />
+    <Compile Include="Map\BlockMap.cs" />
+    <Compile Include="Types\AngleDegreesFloatHandler.cs" />
+    <Compile Include="Types\AngleDegreesHandler.cs" />
+    <Compile Include="Types\AngleRadiansHandler.cs" />
+    <Compile Include="Types\LinedefTagHandler.cs" />
+    <Compile Include="Types\SectorTagHandler.cs" />
+    <Compile Include="Types\ThingTagHandler.cs" />
+    <Compile Include="VisualModes\IVisualPickable.cs" />
+    <Compile Include="General\BinaryHeap.cs" />
+    <Compile Include="Geometry\Plane.cs" />
+    <Compile Include="Geometry\ProjectedFrustum2D.cs" />
+    <Compile Include="IO\DeserializerStream.cs" />
+    <Compile Include="IO\IReadWriteStream.cs" />
+    <Compile Include="IO\SerializerStream.cs" />
+    <Compile Include="Rendering\RenderPasses.cs" />
+    <Compile Include="VisualModes\VisualBlockEntry.cs" />
+    <Compile Include="VisualModes\VisualCamera.cs" />
+    <Compile Include="VisualModes\VisualPickResult.cs" />
+    <Compile Include="VisualModes\VisualThing.cs" />
+    <Compile Include="Windows\AngleForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Windows\AngleForm.Designer.cs">
+      <DependentUpon>AngleForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Windows\PreferencesController.cs" />
+    <None Include="Resources\Script2.png" />
+    <None Include="Resources\ScriptCompile.png" />
+    <None Include="Resources\ScriptConstant.xpm" />
+    <None Include="Resources\ScriptError.xpm" />
+    <None Include="Resources\ScriptKeyword.xpm" />
+    <None Include="Resources\ScriptPalette.png" />
+    <None Include="Resources\SaveAll.png" />
+    <None Include="Resources\SaveScript.png" />
+    <None Include="Resources\OpenScript.png" />
+    <None Include="Resources\NewScript.png" />
+    <EmbeddedResource Include="Controls\ScriptEditorPanel.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>ScriptEditorPanel.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Resources\Lexers.cfg" />
+    <None Include="Resources\ViewBrightness.png" />
+    <None Include="Resources\ViewTextureCeiling.png" />
+    <None Include="Resources\ViewTextureFloor.png" />
+    <None Include="Resources\ViewNormal.png" />
+    <None Include="Resources\KnownTextureSet.png" />
+    <EmbeddedResource Include="Controls\ScriptEditorControl.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>ScriptEditorControl.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Resources\Hourglass3D.png" />
+    <None Include="Resources\Failed.png" />
+    <None Include="Resources\Grid2_arrowup.png" />
+    <None Include="Resources\Zoom_arrowup.png" />
+    <None Include="Resources\Paste.png" />
+    <None Include="Resources\Test.png" />
+    <None Include="Resources\Warning.png" />
+    <None Include="Resources\WarningOff.png" />
+    <None Include="Resources\SlimDX_small.png" />
+    <None Include="Resources\Splash3_trans.png" />
+    <None Include="Resources\Splash3_small.png" />
+    <EmbeddedResource Include="Resources\UDMF.cfg" />
+    <EmbeddedResource Include="Controls\AngleControl.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>AngleControl.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Controls\ArgumentBox.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>ArgumentBox.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Controls\ButtonsNumericTextbox.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>ButtonsNumericTextbox.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Windows\AngleForm.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>AngleForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Windows\BitFlagsForm.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>BitFlagsForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Windows\CenterOnCoordinatesForm.resx">
+      <DependentUpon>CenterOnCoordinatesForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Windows\ChangeMapForm.resx">
+      <DependentUpon>ChangeMapForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Windows\CustomFieldsForm.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>CustomFieldsForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Windows\ErrorsForm.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>ErrorsForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Windows\FlagsForm.resx">
+      <DependentUpon>FlagsForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Windows\LinedefColorPresetsForm.resx">
+      <DependentUpon>LinedefColorPresetsForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Windows\LinedefEditFormUDMF.resx">
+      <DependentUpon>LinedefEditFormUDMF.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Windows\PasteOptionsForm.resx">
+      <DependentUpon>PasteOptionsForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Windows\ScriptEditorForm.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>ScriptEditorForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Windows\ScriptFindReplaceForm.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>ScriptFindReplaceForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Windows\SectorEditFormUDMF.resx">
+      <DependentUpon>SectorEditFormUDMF.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Windows\TextEditForm.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>TextEditForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Windows\TextureSetForm.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>TextureSetForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Windows\ThingBrowserForm.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>ThingBrowserForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Windows\ThingEditForm.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>ThingEditForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Windows\ThingEditFormUDMF.resx">
+      <DependentUpon>ThingEditFormUDMF.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Windows\ThingsFiltersForm.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>ThingsFiltersForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Resources\Font.png" />
+    <EmbeddedResource Include="Resources\White.png" />
+    <EmbeddedResource Include="Resources\Font.cfg" />
+    <EmbeddedResource Include="Windows\UpdateForm.resx">
+      <DependentUpon>UpdateForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Windows\VertexEditForm.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>VertexEditForm.cs</DependentUpon>
+    </EmbeddedResource>
+  </ItemGroup>
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>call "$(DevEnvDir)..\tools\vsvars32.bat"
+EDITBIN.EXE /NOLOGO /LARGEADDRESSAWARE "$(TargetPath)"</PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/Core/Builder.sln b/Source/Core/Builder.sln
new file mode 100644
index 0000000..dfbe5dd
--- /dev/null
+++ b/Source/Core/Builder.sln
@@ -0,0 +1,155 @@
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Builder", "Builder.csproj", "{818B3D10-F791-4C3F-9AF5-BB2D0079B63C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuilderModes", "..\Plugins\BuilderModes\BuilderModes.csproj", "{B42D5AA0-F9A6-4234-9C4B-A05B11A64851}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ColorPicker", "..\Plugins\ColorPicker\ColorPicker.csproj", "{A4761900-0EA3-4FE4-A919-847FD5080EFC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TagExplorer", "..\Plugins\TagExplorer\TagExplorer.csproj", "{BE7917F3-E6FE-4D5B-8FA9-B8E7668AC731}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuilderEffects", "..\Plugins\BuilderEffects\BuilderEffects.csproj", "{B859BE0F-A992-476D-A642-FA8EFE94AAA5}"
+	ProjectSection(ProjectDependencies) = postProject
+		{818B3D10-F791-4C3F-9AF5-BB2D0079B63C} = {818B3D10-F791-4C3F-9AF5-BB2D0079B63C}
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StairSectorBuilder", "..\Plugins\StairSectorBuilder\StairSectorBuilder.csproj", "{3F365121-906B-409D-BB1E-37E0A78056C2}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommentsPanel", "..\Plugins\CommentsPanel\CommentsPanel.csproj", "{58BD8A5B-1B48-435D-8473-A92F27D06C49}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CopyPasteSectorProperties", "..\Plugins\CopyPasteSectorProps\CopyPasteSectorProperties.csproj", "{A5F93B70-18D9-4F3C-9B72-BC8B5B13998E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Statistics", "..\Plugins\Statistics\Statistics.csproj", "{FBC0A503-9152-4BE2-9B5C-128FFD0B0D3F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TagRange", "..\Plugins\TagRange\TagRange.csproj", "{F49EFF6D-51CB-4E49-8223-AAE653C5B62F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisplaneExplorer", "..\Plugins\VisplaneExplorer\VisplaneExplorer.csproj", "{CF670175-7099-4090-A330-EE25C7230139}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|Mixed Platforms = Release|Mixed Platforms
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{818B3D10-F791-4C3F-9AF5-BB2D0079B63C}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{818B3D10-F791-4C3F-9AF5-BB2D0079B63C}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{818B3D10-F791-4C3F-9AF5-BB2D0079B63C}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{818B3D10-F791-4C3F-9AF5-BB2D0079B63C}.Debug|x86.ActiveCfg = Debug|x86
+		{818B3D10-F791-4C3F-9AF5-BB2D0079B63C}.Debug|x86.Build.0 = Debug|x86
+		{818B3D10-F791-4C3F-9AF5-BB2D0079B63C}.Release|Any CPU.ActiveCfg = Release|x86
+		{818B3D10-F791-4C3F-9AF5-BB2D0079B63C}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{818B3D10-F791-4C3F-9AF5-BB2D0079B63C}.Release|Mixed Platforms.Build.0 = Release|x86
+		{818B3D10-F791-4C3F-9AF5-BB2D0079B63C}.Release|x86.ActiveCfg = Release|x86
+		{818B3D10-F791-4C3F-9AF5-BB2D0079B63C}.Release|x86.Build.0 = Release|x86
+		{B42D5AA0-F9A6-4234-9C4B-A05B11A64851}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{B42D5AA0-F9A6-4234-9C4B-A05B11A64851}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{B42D5AA0-F9A6-4234-9C4B-A05B11A64851}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{B42D5AA0-F9A6-4234-9C4B-A05B11A64851}.Debug|x86.ActiveCfg = Debug|x86
+		{B42D5AA0-F9A6-4234-9C4B-A05B11A64851}.Debug|x86.Build.0 = Debug|x86
+		{B42D5AA0-F9A6-4234-9C4B-A05B11A64851}.Release|Any CPU.ActiveCfg = Release|x86
+		{B42D5AA0-F9A6-4234-9C4B-A05B11A64851}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{B42D5AA0-F9A6-4234-9C4B-A05B11A64851}.Release|Mixed Platforms.Build.0 = Release|x86
+		{B42D5AA0-F9A6-4234-9C4B-A05B11A64851}.Release|x86.ActiveCfg = Release|x86
+		{B42D5AA0-F9A6-4234-9C4B-A05B11A64851}.Release|x86.Build.0 = Release|x86
+		{A4761900-0EA3-4FE4-A919-847FD5080EFC}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{A4761900-0EA3-4FE4-A919-847FD5080EFC}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{A4761900-0EA3-4FE4-A919-847FD5080EFC}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{A4761900-0EA3-4FE4-A919-847FD5080EFC}.Debug|x86.ActiveCfg = Debug|x86
+		{A4761900-0EA3-4FE4-A919-847FD5080EFC}.Debug|x86.Build.0 = Debug|x86
+		{A4761900-0EA3-4FE4-A919-847FD5080EFC}.Release|Any CPU.ActiveCfg = Release|x86
+		{A4761900-0EA3-4FE4-A919-847FD5080EFC}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{A4761900-0EA3-4FE4-A919-847FD5080EFC}.Release|Mixed Platforms.Build.0 = Release|x86
+		{A4761900-0EA3-4FE4-A919-847FD5080EFC}.Release|x86.ActiveCfg = Release|x86
+		{A4761900-0EA3-4FE4-A919-847FD5080EFC}.Release|x86.Build.0 = Release|x86
+		{BE7917F3-E6FE-4D5B-8FA9-B8E7668AC731}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{BE7917F3-E6FE-4D5B-8FA9-B8E7668AC731}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{BE7917F3-E6FE-4D5B-8FA9-B8E7668AC731}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{BE7917F3-E6FE-4D5B-8FA9-B8E7668AC731}.Debug|x86.ActiveCfg = Debug|x86
+		{BE7917F3-E6FE-4D5B-8FA9-B8E7668AC731}.Debug|x86.Build.0 = Debug|x86
+		{BE7917F3-E6FE-4D5B-8FA9-B8E7668AC731}.Release|Any CPU.ActiveCfg = Release|x86
+		{BE7917F3-E6FE-4D5B-8FA9-B8E7668AC731}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{BE7917F3-E6FE-4D5B-8FA9-B8E7668AC731}.Release|Mixed Platforms.Build.0 = Release|x86
+		{BE7917F3-E6FE-4D5B-8FA9-B8E7668AC731}.Release|x86.ActiveCfg = Release|x86
+		{BE7917F3-E6FE-4D5B-8FA9-B8E7668AC731}.Release|x86.Build.0 = Release|x86
+		{B859BE0F-A992-476D-A642-FA8EFE94AAA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B859BE0F-A992-476D-A642-FA8EFE94AAA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B859BE0F-A992-476D-A642-FA8EFE94AAA5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B859BE0F-A992-476D-A642-FA8EFE94AAA5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B859BE0F-A992-476D-A642-FA8EFE94AAA5}.Debug|x86.ActiveCfg = Debug|x86
+		{B859BE0F-A992-476D-A642-FA8EFE94AAA5}.Debug|x86.Build.0 = Debug|x86
+		{B859BE0F-A992-476D-A642-FA8EFE94AAA5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B859BE0F-A992-476D-A642-FA8EFE94AAA5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B859BE0F-A992-476D-A642-FA8EFE94AAA5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{B859BE0F-A992-476D-A642-FA8EFE94AAA5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{B859BE0F-A992-476D-A642-FA8EFE94AAA5}.Release|x86.ActiveCfg = Release|x86
+		{B859BE0F-A992-476D-A642-FA8EFE94AAA5}.Release|x86.Build.0 = Release|x86
+		{3F365121-906B-409D-BB1E-37E0A78056C2}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{3F365121-906B-409D-BB1E-37E0A78056C2}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{3F365121-906B-409D-BB1E-37E0A78056C2}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{3F365121-906B-409D-BB1E-37E0A78056C2}.Debug|x86.ActiveCfg = Debug|x86
+		{3F365121-906B-409D-BB1E-37E0A78056C2}.Debug|x86.Build.0 = Debug|x86
+		{3F365121-906B-409D-BB1E-37E0A78056C2}.Release|Any CPU.ActiveCfg = Release|x86
+		{3F365121-906B-409D-BB1E-37E0A78056C2}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{3F365121-906B-409D-BB1E-37E0A78056C2}.Release|Mixed Platforms.Build.0 = Release|x86
+		{3F365121-906B-409D-BB1E-37E0A78056C2}.Release|x86.ActiveCfg = Release|x86
+		{3F365121-906B-409D-BB1E-37E0A78056C2}.Release|x86.Build.0 = Release|x86
+		{58BD8A5B-1B48-435D-8473-A92F27D06C49}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{58BD8A5B-1B48-435D-8473-A92F27D06C49}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{58BD8A5B-1B48-435D-8473-A92F27D06C49}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{58BD8A5B-1B48-435D-8473-A92F27D06C49}.Debug|x86.ActiveCfg = Debug|x86
+		{58BD8A5B-1B48-435D-8473-A92F27D06C49}.Debug|x86.Build.0 = Debug|x86
+		{58BD8A5B-1B48-435D-8473-A92F27D06C49}.Release|Any CPU.ActiveCfg = Release|x86
+		{58BD8A5B-1B48-435D-8473-A92F27D06C49}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{58BD8A5B-1B48-435D-8473-A92F27D06C49}.Release|Mixed Platforms.Build.0 = Release|x86
+		{58BD8A5B-1B48-435D-8473-A92F27D06C49}.Release|x86.ActiveCfg = Release|x86
+		{58BD8A5B-1B48-435D-8473-A92F27D06C49}.Release|x86.Build.0 = Release|x86
+		{A5F93B70-18D9-4F3C-9B72-BC8B5B13998E}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{A5F93B70-18D9-4F3C-9B72-BC8B5B13998E}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{A5F93B70-18D9-4F3C-9B72-BC8B5B13998E}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{A5F93B70-18D9-4F3C-9B72-BC8B5B13998E}.Debug|x86.ActiveCfg = Debug|x86
+		{A5F93B70-18D9-4F3C-9B72-BC8B5B13998E}.Debug|x86.Build.0 = Debug|x86
+		{A5F93B70-18D9-4F3C-9B72-BC8B5B13998E}.Release|Any CPU.ActiveCfg = Release|x86
+		{A5F93B70-18D9-4F3C-9B72-BC8B5B13998E}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{A5F93B70-18D9-4F3C-9B72-BC8B5B13998E}.Release|Mixed Platforms.Build.0 = Release|x86
+		{A5F93B70-18D9-4F3C-9B72-BC8B5B13998E}.Release|x86.ActiveCfg = Release|x86
+		{A5F93B70-18D9-4F3C-9B72-BC8B5B13998E}.Release|x86.Build.0 = Release|x86
+		{FBC0A503-9152-4BE2-9B5C-128FFD0B0D3F}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{FBC0A503-9152-4BE2-9B5C-128FFD0B0D3F}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{FBC0A503-9152-4BE2-9B5C-128FFD0B0D3F}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{FBC0A503-9152-4BE2-9B5C-128FFD0B0D3F}.Debug|x86.ActiveCfg = Debug|x86
+		{FBC0A503-9152-4BE2-9B5C-128FFD0B0D3F}.Debug|x86.Build.0 = Debug|x86
+		{FBC0A503-9152-4BE2-9B5C-128FFD0B0D3F}.Release|Any CPU.ActiveCfg = Release|x86
+		{FBC0A503-9152-4BE2-9B5C-128FFD0B0D3F}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{FBC0A503-9152-4BE2-9B5C-128FFD0B0D3F}.Release|Mixed Platforms.Build.0 = Release|x86
+		{FBC0A503-9152-4BE2-9B5C-128FFD0B0D3F}.Release|x86.ActiveCfg = Release|x86
+		{FBC0A503-9152-4BE2-9B5C-128FFD0B0D3F}.Release|x86.Build.0 = Release|x86
+		{F49EFF6D-51CB-4E49-8223-AAE653C5B62F}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{F49EFF6D-51CB-4E49-8223-AAE653C5B62F}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{F49EFF6D-51CB-4E49-8223-AAE653C5B62F}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{F49EFF6D-51CB-4E49-8223-AAE653C5B62F}.Debug|x86.ActiveCfg = Debug|x86
+		{F49EFF6D-51CB-4E49-8223-AAE653C5B62F}.Debug|x86.Build.0 = Debug|x86
+		{F49EFF6D-51CB-4E49-8223-AAE653C5B62F}.Release|Any CPU.ActiveCfg = Release|x86
+		{F49EFF6D-51CB-4E49-8223-AAE653C5B62F}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{F49EFF6D-51CB-4E49-8223-AAE653C5B62F}.Release|Mixed Platforms.Build.0 = Release|x86
+		{F49EFF6D-51CB-4E49-8223-AAE653C5B62F}.Release|x86.ActiveCfg = Release|x86
+		{F49EFF6D-51CB-4E49-8223-AAE653C5B62F}.Release|x86.Build.0 = Release|x86
+		{CF670175-7099-4090-A330-EE25C7230139}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{CF670175-7099-4090-A330-EE25C7230139}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{CF670175-7099-4090-A330-EE25C7230139}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{CF670175-7099-4090-A330-EE25C7230139}.Debug|x86.ActiveCfg = Debug|x86
+		{CF670175-7099-4090-A330-EE25C7230139}.Debug|x86.Build.0 = Debug|x86
+		{CF670175-7099-4090-A330-EE25C7230139}.Release|Any CPU.ActiveCfg = Release|x86
+		{CF670175-7099-4090-A330-EE25C7230139}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{CF670175-7099-4090-A330-EE25C7230139}.Release|Mixed Platforms.Build.0 = Release|x86
+		{CF670175-7099-4090-A330-EE25C7230139}.Release|x86.ActiveCfg = Release|x86
+		{CF670175-7099-4090-A330-EE25C7230139}.Release|x86.Build.0 = Release|x86
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/Source/Core/Compilers/AccCompiler.cs b/Source/Core/Compilers/AccCompiler.cs
new file mode 100644
index 0000000..595040b
--- /dev/null
+++ b/Source/Core/Compilers/AccCompiler.cs
@@ -0,0 +1,229 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using CodeImp.DoomBuilder.Config;
+using System.Windows.Forms;
+using System.Text.RegularExpressions;
+using CodeImp.DoomBuilder.Data;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Compilers
+{
+	internal sealed class AccCompiler : Compiler
+	{
+		#region ================== Constants
+		
+		private const string ACS_ERROR_FILE = "acs.err";
+		
+		#endregion
+		
+		#region ================== Variables
+		
+		#endregion
+		
+		#region ================== Constructor
+		
+		// Constructor
+		public AccCompiler(CompilerInfo info) : base(info, false)
+		{
+		}
+
+		// Disposer
+		public override void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Clean up
+
+				// Done
+				base.Dispose();
+			}
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+		
+		// This runs the compiler
+		public override bool Run()
+		{
+			Process process;
+			int line = 0;
+			string sourcedir = Path.GetDirectoryName(sourcefile);
+
+			//xabis
+			// Copy includes from the resources into the compiler's folder, preserving relative pathing and naming
+			if(CopyIncludesToWorkingDirectory) //mxd
+			{
+				foreach(string include in includes)
+				{
+					// Grab the script text from the resources
+					Stream s = General.Map.Data.LoadFile(include);
+
+					if(s != null)
+					{
+						// Pull the pk3 or directory sub folder out if applicable
+						FileInfo fi = new FileInfo(Path.Combine(this.tempdir.FullName, include));
+
+						// Do not allow files to be overwritten, either accidentally or maliciously
+						if(!fi.Exists)
+						{
+							General.WriteLogLine("Copying script include: " + include);
+
+							// Create the directory path as needed
+							if(!string.IsNullOrEmpty(fi.DirectoryName)) Directory.CreateDirectory(fi.DirectoryName);
+
+							// Dump the script into the target file
+							BinaryReader reader = new BinaryReader(s);
+							File.WriteAllBytes(fi.FullName, reader.ReadBytes((int)s.Length));
+						}
+					}
+				}
+			}
+
+			// Create parameters
+			string args = this.parameters;
+			args = args.Replace("%FI", inputfile);
+			args = args.Replace("%FO", outputfile);
+			args = args.Replace("%FS", sourcefile);
+			args = args.Replace("%PT", this.tempdir.FullName);
+			args = args.Replace("%PS", sourcedir);
+			args = args.Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar); //mxd. This fixes include path when the map is in a root directory
+			
+			// Setup process info
+			ProcessStartInfo processinfo = new ProcessStartInfo();
+			processinfo.Arguments = args;
+			//processinfo.FileName = Path.Combine(this.tempdir.FullName, info.ProgramFile);
+			processinfo.FileName = Path.Combine(info.Path, info.ProgramFile); //mxd
+			processinfo.CreateNoWindow = false;
+			processinfo.ErrorDialog = false;
+			processinfo.UseShellExecute = true;
+			processinfo.WindowStyle = ProcessWindowStyle.Hidden;
+			processinfo.WorkingDirectory = this.workingdir;
+			
+			// Output info
+			General.WriteLogLine("Running compiler...");
+			General.WriteLogLine("Program:    " + processinfo.FileName);
+			General.WriteLogLine("Arguments:  " + processinfo.Arguments);
+			
+			try
+			{
+				// Start the compiler
+				process = Process.Start(processinfo);
+			}
+			catch(Exception e)
+			{
+				// Unable to start the compiler
+				General.ShowErrorMessage("Unable to start the compiler (" + info.Name + "). " + e.GetType().Name + ": " + e.Message, MessageBoxButtons.OK);
+				return false;
+			}
+			
+			// Wait for compiler to complete
+			process.WaitForExit();
+			TimeSpan deltatime = TimeSpan.FromTicks(process.ExitTime.Ticks - process.StartTime.Ticks);
+			General.WriteLogLine("Compiler process has finished.");
+			General.WriteLogLine("Compile time: " + deltatime.TotalSeconds.ToString("########0.00") + " seconds");
+			
+			// Now find the error file
+			string errfile = Path.Combine(this.workingdir, ACS_ERROR_FILE);
+			if(File.Exists(errfile))
+			{
+				try
+				{
+					// Regex to find error lines
+					Regex errlinematcher = new Regex(":[0-9]+: ", RegexOptions.Compiled | RegexOptions.CultureInvariant);
+					
+					// Read all lines
+					bool erroradded = false; //mxd
+					string[] errlines = File.ReadAllLines(errfile);
+					while(line < errlines.Length)
+					{
+						// Check line
+						string linestr = errlines[line];
+						Match match = errlinematcher.Match(linestr);
+						if(match.Success && (match.Index > 0))
+						{
+							CompilerError err = new CompilerError();
+							
+							// The match without spaces and semicolon is the line number
+							string linenr = match.Value.Replace(":", "").Trim();
+							if(!int.TryParse(linenr, out err.linenumber))
+								err.linenumber = CompilerError.NO_LINE_NUMBER;
+							else
+								err.linenumber--;
+							
+							// Everything before the match is the filename
+							err.filename = linestr.Substring(0, match.Index).Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
+							if(!Path.IsPathRooted(err.filename))
+							{
+								//mxd. If the error is in an include file, try to find it in loaded resources
+								if(includes.Contains(err.filename.ToLowerInvariant()))
+								{
+									foreach(DataReader dr in General.Map.Data.Containers)
+									{
+										if(dr is DirectoryReader && dr.FileExists(err.filename))
+										{
+											err.filename = Path.Combine(dr.Location.location, err.filename);
+											break;
+										}
+									}
+								}
+								else
+								{
+									// Add working directory to filename, so it could be recognized as map namespace lump in MapManager.CompileLump()
+									err.filename = Path.Combine(processinfo.WorkingDirectory, err.filename);
+								}
+							}
+							
+							// Everything after the match is the description
+							err.description = linestr.Substring(match.Index + match.Length).Trim();
+							
+							// Report the error
+							ReportError(err);
+							erroradded = true; //mxd
+						}
+						
+						// Next line
+						line++;
+					}
+
+					//mxd. Some ACC errors are not properly formatted. If that's the case, threat the whole acs.err as an error...
+					if(!erroradded && errlines.Length > 0)
+					{
+						ReportError(new CompilerError(string.Join(Environment.NewLine, errlines)));
+					}
+				}
+				catch(Exception e)
+				{
+					// Error reading errors (ironic, isn't it)
+					ReportError(new CompilerError("Failed to retrieve compiler error report. " + e.GetType().Name + ": " + e.Message));
+				}
+			}
+			
+			return true;
+		}
+		
+		#endregion
+	}
+}
+
diff --git a/Source/Core/Compilers/Compiler.cs b/Source/Core/Compilers/Compiler.cs
new file mode 100644
index 0000000..7289a4f
--- /dev/null
+++ b/Source/Core/Compilers/Compiler.cs
@@ -0,0 +1,222 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Diagnostics;
+using System.Reflection;
+using System.IO;
+using CodeImp.DoomBuilder.Config;
+
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Compilers
+{
+	public abstract class Compiler : IDisposable
+	{
+		#region ================== Variables
+		
+		// Parameters
+		protected readonly CompilerInfo info;
+		protected string parameters;
+		protected string workingdir;
+		protected string sourcefile;
+		protected string outputfile;
+		protected string inputfile;
+		protected HashSet<string> includes; //mxd
+		
+		// Files
+		protected readonly DirectoryInfo tempdir;
+
+		// Errors
+		private readonly List<CompilerError> errors;
+		
+		// Disposing
+		protected bool isdisposed;
+		
+		#endregion
+		
+		#region ================== Properties
+		
+		public string Parameters { get { return parameters; } set { parameters = value; } }
+		public string WorkingDirectory { get { return workingdir; } set { workingdir = value; } }
+		public string SourceFile { get { return sourcefile; } set { sourcefile = value; } }
+		public string InputFile { get { return inputfile; } set { inputfile = value; } }
+		public string OutputFile { get { return outputfile; } set { outputfile = value; } }
+		public string Location { get { return tempdir.FullName; } }
+		public HashSet<string> Includes { get { return includes; } set { includes = value; } } //mxd
+		public bool CopyIncludesToWorkingDirectory; //mxd
+		public bool IsDisposed { get { return isdisposed; } }
+		public CompilerError[] Errors { get { return errors.ToArray(); } }
+		
+		#endregion
+		
+		#region ================== Constructor / Disposer
+		
+		// Constructor
+		protected Compiler(CompilerInfo info, bool copyrequiredfiles)
+		{
+			// Initialize
+			this.info = info;
+			this.errors = new List<CompilerError>();
+			this.includes = new HashSet<string>(); //mxd
+			
+			General.WriteLogLine("Creating compiler '" + info.Name + "' on interface '" + this.GetType().Name + "'...");
+			
+			// Create temporary directory
+			tempdir = Directory.CreateDirectory(General.MakeTempDirname());
+			workingdir = tempdir.FullName;
+
+			//mxd. ACC compiler itself is not copied to tempdir anymore, so we don't need to move it's include files
+			//but we still need tempdir to compile SCRIPTS lump.
+			if(copyrequiredfiles)
+			{
+				// Copy required files to the temp directory
+				General.WriteLogLine("Copying required files for compiler...");
+				CopyRequiredFiles();
+			}
+		}
+		
+		// Disposer
+		public virtual void Dispose()
+		{
+			if(!isdisposed)
+			{
+				Exception deleteerror;
+				float starttime = Clock.CurrentTime;
+				
+				do
+				{
+					try
+					{
+						// Remove temporary directory
+						General.WriteLogLine("Removing temporary compiler files...");
+						tempdir.Delete(true);
+						deleteerror = null;
+					}
+					catch(Exception e)
+					{
+						deleteerror = e;
+					}
+
+					// Bail out when it takes too long
+					if((Clock.CurrentTime - starttime) > 2000) break;
+				}
+				while(deleteerror != null);
+				
+				// Report error if we have one
+				if(deleteerror != null)
+				{
+					General.ErrorLogger.Add(ErrorType.Error, "Unable to remove temporary compiler files. " + deleteerror.GetType().Name + ": " + deleteerror.Message);
+					General.WriteLogLine(deleteerror.StackTrace);
+				}
+				
+				// Disposed
+				isdisposed = true;
+			}
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+
+		// This copies all compiler files to a given destination
+		private void CopyRequiredFiles()
+		{
+			// Copy files
+			foreach(string f in info.Files)
+			{
+				string srcfile = Path.Combine(info.Path, f);
+				if(!File.Exists(srcfile)) 
+				{
+					General.ErrorLogger.Add(ErrorType.Error, "The file '" + f + "' required by the '" + info.Name + "' compiler is missing. According to the compiler configuration in '" + info.FileName + "', the was expected to be found in the following path: " + info.Path);
+				} 
+				else 
+				{
+					string tgtfile = Path.Combine(tempdir.FullName, f);
+					File.Copy(srcfile, tgtfile, true);
+				}
+			}
+		}
+		
+		/// <summary>
+		/// This runs the compiler.
+		/// </summary>
+		/// <returns>Returns false when failed to start.</returns>
+		public virtual bool Run() { return false; }
+
+		/// <summary>
+		/// Use this to report an error.
+		/// </summary>
+		protected void ReportError(CompilerError err)
+		{
+			this.errors.Add(err);
+		}
+		
+		// This creates a compiler by interface name
+		internal static Compiler Create(CompilerInfo info)
+		{
+			// Make list of assemblies to search in
+			List<Assembly> asms = General.Plugins.GetPluginAssemblies();
+			asms.Add(General.ThisAssembly);
+			
+			// Constructor arguments
+			object[] args = new object[1];
+			args[0] = info;
+			
+			try
+			{
+				// Go for all assemblies
+				foreach(Assembly a in asms) 
+				{
+					// Find the class
+					Type[] types = (Equals(a, General.ThisAssembly) ? a.GetTypes() : a.GetExportedTypes());
+
+					foreach(Type t in types)
+					{
+						if(t.IsSubclassOf(typeof(Compiler)) && (t.Name == info.ProgramInterface))
+						{
+							// Create instance
+							Compiler result = (Compiler)a.CreateInstance(t.FullName, false, BindingFlags.Default,
+							                                             null, args, CultureInfo.CurrentCulture, new object[0]);
+							return result;
+						}
+					}
+				}
+			}
+			// Catch errors
+			catch(TargetInvocationException e)
+			{
+				// Throw the actual exception
+				Debug.WriteLine(DateTime.Now.ToShortDateString() + " " + DateTime.Now.ToShortTimeString());
+				Debug.WriteLine(e.InnerException.Source + " throws " + e.InnerException.GetType().Name + ":");
+				Debug.WriteLine(e.InnerException.Message);
+				Debug.WriteLine(e.InnerException.StackTrace);
+				throw e.InnerException;
+			}
+
+			// No such compiler
+			return null;
+		}
+		
+		#endregion
+	}
+}
+
diff --git a/Source/Core/Compilers/CompilerError.cs b/Source/Core/Compilers/CompilerError.cs
new file mode 100644
index 0000000..f22c71a
--- /dev/null
+++ b/Source/Core/Compilers/CompilerError.cs
@@ -0,0 +1,58 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Compilers
+{
+	public struct CompilerError
+	{
+		// Constants
+		public const int NO_LINE_NUMBER = -1;
+		
+		// Members
+		public string description;
+		public string filename;
+		public int linenumber;
+		
+		// Constructor
+		public CompilerError(string description)
+		{
+			this.description = description;
+			this.filename = "";
+			this.linenumber = NO_LINE_NUMBER;
+		}
+		
+		// Constructor
+		public CompilerError(string description, string filename)
+		{
+			this.description = description;
+			this.filename = filename;
+			this.linenumber = NO_LINE_NUMBER;
+		}
+		
+		// Constructor
+		public CompilerError(string description, string filename, int linenumber)
+		{
+			this.description = description;
+			this.filename = filename;
+			this.linenumber = linenumber;
+		}
+	}
+}
+
diff --git a/Source/Core/Compilers/NodesCompiler.cs b/Source/Core/Compilers/NodesCompiler.cs
new file mode 100644
index 0000000..b4a5d1c
--- /dev/null
+++ b/Source/Core/Compilers/NodesCompiler.cs
@@ -0,0 +1,150 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using CodeImp.DoomBuilder.Config;
+using System.Windows.Forms;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Compilers
+{
+	internal sealed class NodesCompiler : Compiler
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		#endregion
+
+		#region ================== Properties
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public NodesCompiler(CompilerInfo info) : base(info, true)
+		{
+			// Initialize
+
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Disposer
+		public override void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Clean up
+
+				// Done
+				base.Dispose();
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This runs the compiler with a file as input.
+		public override bool Run()
+		{
+			// Create parameters
+			string args = this.parameters;
+			args = args.Replace("%FI", inputfile);
+			args = args.Replace("%FO", outputfile);
+			
+			// Setup process info
+			ProcessStartInfo processinfo = new ProcessStartInfo();
+			processinfo.Arguments = args;
+			//processinfo.FileName = Path.Combine(this.tempdir.FullName, info.ProgramFile);
+			processinfo.FileName = Path.Combine(info.Path, info.ProgramFile); //mxd
+			processinfo.CreateNoWindow = true; //mxd. was false
+			processinfo.ErrorDialog = false;
+			processinfo.UseShellExecute = false; //mxd. was true
+			processinfo.WindowStyle = ProcessWindowStyle.Hidden;
+			processinfo.WorkingDirectory = this.workingdir;
+
+			//mxd
+			processinfo.RedirectStandardError = true;
+			processinfo.RedirectStandardOutput = true;
+			
+			// Output info
+			General.WriteLogLine("Running compiler...");
+			General.WriteLogLine("Program:    " + processinfo.FileName);
+			General.WriteLogLine("Arguments:  " + processinfo.Arguments);
+
+			Process process;
+
+			try
+			{
+				// Start the compiler
+				process = Process.Start(processinfo);
+			}
+			catch(Exception e)
+			{
+				// Unable to start the compiler
+				General.ShowErrorMessage("Unable to start the compiler (" + info.Name + "). " + e.GetType().Name + ": " + e.Message, MessageBoxButtons.OK);
+				return false;
+			}
+
+			//mxd
+			string outErr = process.StandardError.ReadToEnd().Trim().Replace("\b", "");
+			string outMsg = process.StandardOutput.ReadToEnd().Trim().Replace("\b", "");
+			
+			// Wait for compiler to complete
+			process.WaitForExit();
+
+			//mxd
+			bool errorsInNormalOurput = (outMsg.Length > 0 && outMsg.ToLowerInvariant().IndexOf("error") != -1);
+			//zdbsp actually writes building process here, not error info
+			bool errorsInErrorOutput = (outErr.Length > 0 && outErr.ToLowerInvariant().IndexOf("error") != -1);
+
+			TimeSpan deltatime = TimeSpan.FromTicks(process.ExitTime.Ticks - process.StartTime.Ticks);
+			General.WriteLogLine("Compiler process has finished" + (errorsInNormalOurput || errorsInErrorOutput ? " with errors." : ".")); //mxd
+			General.WriteLogLine("Compile time: " + deltatime.TotalSeconds.ToString("########0.00") + " seconds");
+
+			//mxd
+			if(process.ExitCode > 0 || errorsInNormalOurput || errorsInErrorOutput) 
+			{
+				if(errorsInNormalOurput) 
+				{
+					ReportError(new CompilerError(outMsg));
+					General.WriteLogLine("Normal output: " + outMsg);
+				}
+				if(errorsInErrorOutput) 
+				{
+					ReportError(new CompilerError(outErr));
+					General.WriteLogLine("Error output: " + outErr);
+				}
+				return false;
+			}
+
+			return true;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Config/AllTexturesSet.cs b/Source/Core/Config/AllTexturesSet.cs
new file mode 100644
index 0000000..3afaf55
--- /dev/null
+++ b/Source/Core/Config/AllTexturesSet.cs
@@ -0,0 +1,75 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Data;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Config
+{
+	internal sealed class AllTextureSet : TextureSet, IFilledTextureSet
+	{
+		#region ================== Constants
+
+		public const string NAME = "All";
+
+		#endregion
+
+		#region ================== Variables
+
+		// Matching textures and flats
+		private List<ImageData> textures;
+		private List<ImageData> flats;
+
+		#endregion
+
+		#region ================== Properties
+
+		public ICollection<ImageData> Textures { get { return textures; } }
+		public ICollection<ImageData> Flats { get { return flats; } }
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		// New texture set constructor
+		public AllTextureSet()
+		{
+			this.name = NAME;
+			this.textures = new List<ImageData>();
+			this.flats = new List<ImageData>();
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		internal void AddTexture(ImageData image)
+		{
+			textures.Add(image);
+		}
+
+		internal void AddFlat(ImageData image)
+		{
+			flats.Add(image);
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Config/ArgumentInfo.cs b/Source/Core/Config/ArgumentInfo.cs
new file mode 100644
index 0000000..e939553
--- /dev/null
+++ b/Source/Core/Config/ArgumentInfo.cs
@@ -0,0 +1,169 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections;
+using System.Collections.Generic;
+using System.Globalization;
+using CodeImp.DoomBuilder.IO;
+using CodeImp.DoomBuilder.Types;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Config
+{
+	public class ArgumentInfo
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		private readonly string title;
+		private readonly string tooltip; //mxd
+		private readonly bool used;
+		private readonly int type;
+		private EnumList enumlist;
+		private readonly object defaultvalue; //mxd
+
+		#endregion
+
+		#region ================== Properties
+
+		public string Title { get { return title; } }
+		public string ToolTip { get { return tooltip; } } //mxd
+		public bool Used { get { return used; } }
+		public int Type { get { return type; } }
+		public EnumList Enum { get { return enumlist; } internal set { enumlist = value; } }
+		public object DefaultValue { get { return defaultvalue; } } //mxd
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor for argument info from configuration
+		internal ArgumentInfo(Configuration cfg, string argspath, int argindex, IDictionary<string, EnumList> enums)
+		{
+			// Read
+			string istr = argindex.ToString(CultureInfo.InvariantCulture);
+			this.used = cfg.SettingExists(argspath + ".arg" + istr);
+			this.title = cfg.ReadSetting(argspath + ".arg" + istr + ".title", "Argument " + (argindex + 1));
+			this.tooltip = cfg.ReadSetting(argspath + ".arg" + istr + ".tooltip", string.Empty); //mxd
+			this.type = cfg.ReadSetting(argspath + ".arg" + istr + ".type", 0);
+			this.defaultvalue = cfg.ReadSetting(argspath + ".arg" + istr + ".default", 0); //mxd
+
+			// Determine enum type
+			IDictionary argdic = cfg.ReadSetting(argspath + ".arg" + istr, new Hashtable());
+			if(argdic.Contains("enum"))
+			{
+				// Enum fully specified?
+				if(argdic["enum"] is IDictionary)
+				{
+					// Create anonymous enum
+					this.enumlist = new EnumList(argdic["enum"] as IDictionary);
+				}
+				else
+				{
+					// Check if referenced enum exists
+					if((argdic["enum"].ToString().Length > 0) && enums.ContainsKey(argdic["enum"].ToString()))
+					{
+						// Get the enum list
+						this.enumlist = enums[argdic["enum"].ToString()];
+					}
+					else
+					{
+						General.ErrorLogger.Add(ErrorType.Warning, "'" + argspath + ".arg" + istr + "' references unknown enumeration '" + argdic["enum"] + "'.");
+					}
+				}
+			}
+			
+			if(this.enumlist == null) this.enumlist = new EnumList(); //mxd
+		}
+
+		//mxd. Constructor for an argument info defined in DECORATE
+		internal ArgumentInfo(string actorname, string argtitle, string tooltip, int type, int defaultvalue, string enumstr, IDictionary<string, EnumList> enums)
+		{
+			this.used = true;
+			this.title = argtitle;
+			this.tooltip = tooltip;
+			this.defaultvalue = defaultvalue;
+
+			// Get argument type
+			if(System.Enum.IsDefined(typeof(UniversalType), type))
+			{
+				this.type = type;
+			}
+			else
+			{
+				General.ErrorLogger.Add(ErrorType.Error, actorname + ": action argument \"" + argtitle + "\" has unknown type " + type + "!");
+				this.type = 0;
+			}
+
+			// Get or create enum
+			if(!string.IsNullOrEmpty(enumstr))
+			{
+				if(enums.ContainsKey(enumstr.ToLowerInvariant()))
+				{
+					this.enumlist = enums[enumstr.ToLowerInvariant()];
+				}
+				else
+				{
+					Configuration cfg = new Configuration();
+					if(cfg.InputConfiguration("enum" + enumstr, true)) 
+					{
+						IDictionary argdic = cfg.ReadSetting("enum", new Hashtable());
+						if(argdic.Keys.Count > 0)
+							this.enumlist = new EnumList(argdic);
+						else
+							General.ErrorLogger.Add(ErrorType.Error, actorname + ": unable to parse explicit enum structure for argument \"" + argtitle + "\"!");
+					} 
+					else 
+					{
+						General.ErrorLogger.Add(ErrorType.Error, actorname + ": unable to parse enum structure for argument \"" + argtitle + "\"!");
+					}
+				}
+			}
+
+			if(this.enumlist == null) this.enumlist = new EnumList();
+		}
+
+		// Constructor for unknown argument info
+		internal ArgumentInfo(int argindex)
+		{
+			this.used = false;
+			this.title = "Argument " + (argindex + 1);
+			this.type = 0;
+			this.enumlist = new EnumList();
+			this.defaultvalue = 0; //mxd
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This gets the description for an argument value
+		public string GetValueDescription(int value)
+		{
+			// TODO: Use the registered type editor to get the description!
+
+			return value.ToString();
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Config/CompilerInfo.cs b/Source/Core/Config/CompilerInfo.cs
new file mode 100644
index 0000000..3cd1c9f
--- /dev/null
+++ b/Source/Core/Config/CompilerInfo.cs
@@ -0,0 +1,102 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.IO;
+using CodeImp.DoomBuilder.Compilers;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Config
+{
+	public sealed class CompilerInfo
+	{
+		#region ================== Constants
+		
+		#endregion
+		
+		#region ================== Variables
+		
+		private readonly string filename;
+		private readonly string name;
+		private readonly string programfile;
+		private readonly string programinterface;
+		private readonly string path;
+		private readonly HashSet<string> files;
+		
+		#endregion
+		
+		#region ================== Properties
+
+		public string FileName { get { return filename; } }
+		public string Name { get { return name; } }
+		public string Path { get { return path; } }
+		public string ProgramFile { get { return programfile; } }
+		public string ProgramInterface { get { return programinterface; } }
+		public HashSet<string> Files { get { return files; } }
+		
+		#endregion
+		
+		#region ================== Constructor / Disposer
+		
+		// Constructor
+		internal CompilerInfo(string filename, string name, string path, Configuration cfg)
+		{
+			General.WriteLogLine("Registered compiler configuration '" + name + "' from '" + filename + "'");
+			
+			// Initialize
+			this.filename = filename;
+			this.path = path;
+			this.name = name;
+			this.files = new HashSet<string>(StringComparer.OrdinalIgnoreCase); //mxd. List -> HashSet
+			
+			// Read program file and interface
+			this.programfile = cfg.ReadSetting("compilers." + name + ".program", "");
+			this.programinterface = cfg.ReadSetting("compilers." + name + ".interface", "");
+			
+			// Make list of files required
+			IDictionary cfgfiles = cfg.ReadSetting("compilers." + name, new Hashtable());
+			foreach(DictionaryEntry de in cfgfiles)
+			{
+				if(de.Key.ToString() != "interface" && de.Key.ToString() != "program")
+				{
+					//mxd
+					string include = de.Value.ToString().Replace(System.IO.Path.AltDirectorySeparatorChar, System.IO.Path.DirectorySeparatorChar);
+					if(files.Contains(include))
+						General.ErrorLogger.Add(ErrorType.Warning, "Include file '" + de.Value + "' is double-defined in '" + name + "' compiler configuration");
+					else
+						files.Add(include);
+				}
+			}
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+		
+		// This creates the actual compiler interface
+		internal Compiler Create()
+		{
+			return Compiler.Create(this);
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Config/ConfigurationInfo.cs b/Source/Core/Config/ConfigurationInfo.cs
new file mode 100644
index 0000000..f9243cd
--- /dev/null
+++ b/Source/Core/Config/ConfigurationInfo.cs
@@ -0,0 +1,548 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Globalization;
+using CodeImp.DoomBuilder.IO;
+using CodeImp.DoomBuilder.Data;
+using System.IO;
+using CodeImp.DoomBuilder.Editing;
+using System.Collections.Specialized;
+using CodeImp.DoomBuilder.GZBuilder.Data;
+using CodeImp.DoomBuilder.Rendering;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Config
+{
+	public class ConfigurationInfo : IComparable<ConfigurationInfo>
+	{
+		#region ================== Constants
+
+		private const string MODE_DISABLED_KEY = "disabled";
+		private const string MODE_ENABLED_KEY = "enabled";
+
+		// The { and } are invalid key names in a configuration so this ensures this string is unique
+		private const string MISSING_NODEBUILDER = "{missing nodebuilder}";
+		private readonly string[] LINEDEF_COLOR_PRESET_FLAGS_SEPARATOR = new[] { "^" }; //mxd
+
+		#endregion
+		
+		#region ================== Variables
+
+		private string name;
+		private string filename;
+		private string settingskey;
+		private string defaultlumpname;
+		private string nodebuildersave;
+		private string nodebuildertest;
+		private string formatinterface; //mxd
+		private readonly string defaultscriptcompiler; //mxd
+		private DataLocationList resources;
+		private Configuration config; //mxd
+		private bool enabled; //mxd
+		private bool changed; //mxd
+
+		private List<EngineInfo> testEngines; //mxd
+		private int currentEngineIndex; //mxd
+		private LinedefColorPreset[] linedefColorPresets; //mxd
+
+		private List<ThingsFilter> thingsfilters;
+		private List<DefinedTextureSet> texturesets;
+		private Dictionary<string, bool> editmodes;
+		private string startmode;
+		
+		#endregion
+
+		#region ================== Properties
+
+		public string Name { get { return name; } }
+		public string Filename { get { return filename; } }
+		public string DefaultLumpName { get { return defaultlumpname; } }
+		public string NodebuilderSave { get { return nodebuildersave; } internal set { nodebuildersave = value; } }
+		public string NodebuilderTest { get { return nodebuildertest; } internal set { nodebuildertest = value; } }
+		public string FormatInterface { get { return formatinterface; } } //mxd
+		public string DefaultScriptCompiler { get { return defaultscriptcompiler; } } //mxd
+		internal DataLocationList Resources { get { return resources; } }
+		internal Configuration Configuration { get { return config; } } //mxd
+		public bool Enabled { get { return enabled; } internal set { enabled = value; } } //mxd
+		public bool Changed { get { return changed; } internal set { changed = value; } } //mxd
+
+		//mxd
+		public string TestProgramName { get { return testEngines[currentEngineIndex].TestProgramName; } internal set { testEngines[currentEngineIndex].TestProgramName = value; } }
+		public string TestProgram { get { return testEngines[currentEngineIndex].TestProgram; } internal set { testEngines[currentEngineIndex].TestProgram = value; } }
+		public string TestParameters { get { return testEngines[currentEngineIndex].TestParameters; } internal set { testEngines[currentEngineIndex].TestParameters = value; } }
+		public bool TestShortPaths { get { return testEngines[currentEngineIndex].TestShortPaths; } internal set { testEngines[currentEngineIndex].TestShortPaths = value; } }
+		public int TestSkill { get { return testEngines[currentEngineIndex].TestSkill; } internal set { testEngines[currentEngineIndex].TestSkill = value; } }
+		public bool CustomParameters { get { return testEngines[currentEngineIndex].CustomParameters; } internal set { testEngines[currentEngineIndex].CustomParameters = value; } }
+		public List<EngineInfo> TestEngines { get { return testEngines; } internal set { testEngines = value; } }
+		public int CurrentEngineIndex { get { return currentEngineIndex; } internal set { currentEngineIndex = value; } }
+		public LinedefColorPreset[] LinedefColorPresets { get { return linedefColorPresets; } internal set { linedefColorPresets = value; } }
+
+		internal ICollection<ThingsFilter> ThingsFilters { get { return thingsfilters; } }
+		internal List<DefinedTextureSet> TextureSets { get { return texturesets; } }
+		internal Dictionary<string, bool> EditModes { get { return editmodes; } }
+		public string StartMode { get { return startmode; } internal set { startmode = value; } }
+		
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		internal ConfigurationInfo(Configuration cfg, string filename)
+		{
+			// Initialize
+			this.filename = filename;
+			this.config = cfg; //mxd
+			this.settingskey = Path.GetFileNameWithoutExtension(filename).ToLower();
+			
+			// Load settings from game configuration
+			this.name = config.ReadSetting("game", "<unnamed game>");
+			this.defaultlumpname = config.ReadSetting("defaultlumpname", "");
+			
+			// Load settings from program configuration
+			this.nodebuildersave = General.Settings.ReadSetting("configurations." + settingskey + ".nodebuildersave", MISSING_NODEBUILDER);
+			this.nodebuildertest = General.Settings.ReadSetting("configurations." + settingskey + ".nodebuildertest", MISSING_NODEBUILDER);
+			this.formatinterface = config.ReadSetting("formatinterface", "").ToLowerInvariant(); //mxd
+			this.defaultscriptcompiler = cfg.ReadSetting("defaultscriptcompiler", ""); //mxd
+			this.resources = new DataLocationList(General.Settings.Config, "configurations." + settingskey + ".resources");
+			this.startmode = General.Settings.ReadSetting("configurations." + settingskey + ".startmode", "VerticesMode");
+			this.enabled = General.Settings.ReadSetting("configurations." + settingskey + ".enabled", config.ReadSetting("enabledbydefault", false)); //mxd
+			
+			//mxd. Read test engines
+			testEngines = new List<EngineInfo>();
+			IDictionary list = General.Settings.ReadSetting("configurations." + settingskey + ".engines", new ListDictionary());
+			currentEngineIndex = Math.Max(0, General.Settings.ReadSetting("configurations." + settingskey + ".currentengineindex", 0));
+			
+			// No engine list found? Use old engine properties
+			if(list.Count == 0) 
+			{
+				EngineInfo info = new EngineInfo();
+				info.TestProgram = General.Settings.ReadSetting("configurations." + settingskey + ".testprogram", "");
+				info.TestProgramName = General.Settings.ReadSetting("configurations." + settingskey + ".testprogramname", EngineInfo.DEFAULT_ENGINE_NAME);
+				info.TestParameters = General.Settings.ReadSetting("configurations." + settingskey + ".testparameters", "");
+				info.TestShortPaths = General.Settings.ReadSetting("configurations." + settingskey + ".testshortpaths", false);
+				info.CustomParameters = General.Settings.ReadSetting("configurations." + settingskey + ".customparameters", false);
+				info.TestSkill = General.Settings.ReadSetting("configurations." + settingskey + ".testskill", 3);
+				testEngines.Add(info);
+				currentEngineIndex = 0;
+			} 
+			else 
+			{
+				//read engines settings from config
+				foreach(DictionaryEntry de in list) 
+				{
+					string path = "configurations." + settingskey + ".engines." + de.Key;
+					EngineInfo info = new EngineInfo();
+					info.TestProgram = General.Settings.ReadSetting(path + ".testprogram", "");
+					info.TestProgramName = General.Settings.ReadSetting(path + ".testprogramname", EngineInfo.DEFAULT_ENGINE_NAME);
+					info.TestParameters = General.Settings.ReadSetting(path + ".testparameters", "");
+					info.TestShortPaths = General.Settings.ReadSetting(path + ".testshortpaths", false);
+					info.CustomParameters = General.Settings.ReadSetting(path + ".customparameters", false);
+					info.TestSkill = General.Settings.ReadSetting(path + ".testskill", 3);
+					testEngines.Add(info);
+				}
+
+				if(currentEngineIndex >= testEngines.Count)	currentEngineIndex = 0;
+			}
+
+			//mxd. read custom linedef colors 
+			List<LinedefColorPreset> colorPresets = new List<LinedefColorPreset>();
+			list = General.Settings.ReadSetting("configurations." + settingskey + ".linedefcolorpresets", new ListDictionary());
+
+			//no presets? add "classic" ones then.
+			if(list.Count == 0) 
+			{
+				colorPresets.Add(new LinedefColorPreset("Any action", PixelColor.FromColor(System.Drawing.Color.PaleGreen), -1, 0, new List<string>(), new List<string>(), true));
+			} 
+			else 
+			{
+				//read custom linedef colors from config
+				foreach(DictionaryEntry de in list) 
+				{
+					string path = "configurations." + settingskey + ".linedefcolorpresets." + de.Key;
+					string presetname = General.Settings.ReadSetting(path + ".name", "Unnamed");
+					bool presetenabled = General.Settings.ReadSetting(path + ".enabled", true);
+					PixelColor color = PixelColor.FromInt(General.Settings.ReadSetting(path + ".color", -1));
+					int action = General.Settings.ReadSetting(path + ".action", 0);
+					int activation = General.Settings.ReadSetting(path + ".activation", 0);
+					List<string> flags = new List<string>();
+					flags.AddRange(General.Settings.ReadSetting(path + ".flags", "").Split(LINEDEF_COLOR_PRESET_FLAGS_SEPARATOR, StringSplitOptions.RemoveEmptyEntries));
+					List<string> restrictedFlags = new List<string>();
+					restrictedFlags.AddRange(General.Settings.ReadSetting(path + ".restrictedflags", "").Split(LINEDEF_COLOR_PRESET_FLAGS_SEPARATOR, StringSplitOptions.RemoveEmptyEntries));
+					LinedefColorPreset preset = new LinedefColorPreset(presetname, color, action, activation, flags, restrictedFlags, presetenabled);
+					colorPresets.Add(preset);
+				}
+			}
+			linedefColorPresets = colorPresets.ToArray();
+
+			// Make list of things filters
+			thingsfilters = new List<ThingsFilter>();
+			IDictionary cfgfilters = General.Settings.ReadSetting("configurations." + settingskey + ".thingsfilters", new Hashtable());
+			foreach(DictionaryEntry de in cfgfilters)
+			{
+				thingsfilters.Add(new ThingsFilter(General.Settings.Config, "configurations." + settingskey + ".thingsfilters." + de.Key));
+			}
+
+			// Make list of texture sets
+			texturesets = new List<DefinedTextureSet>();
+			IDictionary sets = General.Settings.ReadSetting("configurations." + settingskey + ".texturesets", new Hashtable());
+			foreach(DictionaryEntry de in sets)
+			{
+				texturesets.Add(new DefinedTextureSet(General.Settings.Config, "configurations." + settingskey + ".texturesets." + de.Key));
+			}
+			
+			// Make list of edit modes
+			this.editmodes = new Dictionary<string, bool>(StringComparer.Ordinal);
+			IDictionary modes = General.Settings.ReadSetting("configurations." + settingskey + ".editmodes", new Hashtable());
+			foreach(DictionaryEntry de in modes)
+			{
+				if(de.Key.ToString().StartsWith(MODE_ENABLED_KEY))
+					editmodes.Add(de.Value.ToString(), true);
+				else if(de.Key.ToString().StartsWith(MODE_DISABLED_KEY))
+					editmodes.Add(de.Value.ToString(), false);
+			}
+		}
+		
+		// Constructor
+		private ConfigurationInfo()
+		{
+		}
+
+		//mxd. Destructor
+		~ConfigurationInfo()
+		{
+			foreach(ThingsFilter tf in thingsfilters) tf.Dispose();
+		}
+		
+		#endregion
+
+		#region ================== Methods
+
+		/// <summary>
+		/// This returns the resource locations as configured.
+		/// </summary>
+		public DataLocationList GetResources()
+		{
+			return new DataLocationList(resources);
+		}
+
+		// This compares it to other ConfigurationInfo objects
+		public int CompareTo(ConfigurationInfo other)
+		{
+			// Compare
+			return String.Compare(name, other.name, StringComparison.Ordinal);
+		}
+
+		// This saves the settings to program configuration
+		internal void SaveSettings()
+		{
+			//mxd
+			General.Settings.WriteSetting("configurations." + settingskey + ".enabled", enabled);
+			if(!changed) return;
+			
+			// Write to configuration
+			General.Settings.WriteSetting("configurations." + settingskey + ".nodebuildersave", nodebuildersave);
+			General.Settings.WriteSetting("configurations." + settingskey + ".nodebuildertest", nodebuildertest);
+			
+			//mxd. Test Engines
+			General.Settings.WriteSetting("configurations." + settingskey + ".currentengineindex", currentEngineIndex);
+			SaveTestEngines();
+
+			//mxd. Custom linedef colors
+			SaveLinedefColorPresets();
+
+			General.Settings.WriteSetting("configurations." + settingskey + ".startmode", startmode);
+			resources.WriteToConfig(General.Settings.Config, "configurations." + settingskey + ".resources");
+			
+			// Write filters to configuration
+			General.Settings.DeleteSetting("configurations." + settingskey + ".thingsfilters");
+			for(int i = 0; i < thingsfilters.Count; i++)
+			{
+				thingsfilters[i].WriteSettings(General.Settings.Config,
+					"configurations." + settingskey + ".thingsfilters.filter" + i.ToString(CultureInfo.InvariantCulture));
+			}
+
+			// Write texturesets to configuration
+			General.Settings.DeleteSetting("configurations." + settingskey + ".texturesets"); //mxd
+			for(int i = 0; i < texturesets.Count; i++)
+			{
+				texturesets[i].WriteToConfig(General.Settings.Config,
+					"configurations." + settingskey + ".texturesets.set" + i.ToString(CultureInfo.InvariantCulture));
+			}
+			
+			// Write edit modes to configuration
+			ListDictionary modeslist = new ListDictionary();
+			int index = 0;
+			foreach(KeyValuePair<string, bool> em in editmodes)
+			{
+				if(em.Value)
+					modeslist.Add(MODE_ENABLED_KEY + index.ToString(CultureInfo.InvariantCulture), em.Key);
+				else
+					modeslist.Add(MODE_DISABLED_KEY + index.ToString(CultureInfo.InvariantCulture), em.Key);
+
+				index++;
+			}
+			General.Settings.WriteSetting("configurations." + settingskey + ".editmodes", modeslist);
+		}
+
+		//mxd
+		private void SaveTestEngines() 
+		{
+			// Fill structure
+			IDictionary resinfo = new ListDictionary();
+
+			for(int i = 0; i < testEngines.Count; i++) 
+			{
+				IDictionary rlinfo = new ListDictionary();
+				rlinfo.Add("testprogramname", testEngines[i].TestProgramName);
+				rlinfo.Add("testprogram", testEngines[i].TestProgram);
+				rlinfo.Add("testparameters", testEngines[i].TestParameters);
+				rlinfo.Add("testshortpaths", testEngines[i].TestShortPaths);
+				rlinfo.Add("customparameters", testEngines[i].CustomParameters);
+				rlinfo.Add("testskill", testEngines[i].TestSkill);
+
+				// Add structure
+				resinfo.Add("engine" + i.ToString(CultureInfo.InvariantCulture), rlinfo);
+			}
+
+			// Write to config
+			General.Settings.Config.WriteSetting("configurations." + settingskey + ".engines", resinfo);
+		}
+
+		//mxd
+		private void SaveLinedefColorPresets() 
+		{
+			// Fill structure
+			IDictionary resinfo = new ListDictionary();
+
+			for(int i = 0; i < linedefColorPresets.Length; i++) 
+			{
+				IDictionary rlinfo = new ListDictionary();
+				rlinfo.Add("name", linedefColorPresets[i].Name);
+				rlinfo.Add("enabled", linedefColorPresets[i].Enabled);
+				rlinfo.Add("color", linedefColorPresets[i].Color.ToInt());
+				rlinfo.Add("action", linedefColorPresets[i].Action);
+				rlinfo.Add("activation", linedefColorPresets[i].Activation);
+				rlinfo.Add("flags", string.Join(LINEDEF_COLOR_PRESET_FLAGS_SEPARATOR[0], linedefColorPresets[i].Flags.ToArray()));
+				rlinfo.Add("restrictedflags", string.Join(LINEDEF_COLOR_PRESET_FLAGS_SEPARATOR[0], linedefColorPresets[i].RestrictedFlags.ToArray()));
+
+				// Add structure
+				resinfo.Add("preset" + i.ToString(CultureInfo.InvariantCulture), rlinfo);
+			}
+
+			// Write to config
+			General.Settings.Config.WriteSetting("configurations." + settingskey + ".linedefcolorpresets", resinfo);
+		}
+
+
+		// String representation
+		public override string ToString()
+		{
+			return name;
+		}
+
+		// This clones the object
+		internal ConfigurationInfo Clone()
+		{
+			ConfigurationInfo ci = new ConfigurationInfo();
+			ci.name = this.name;
+			ci.filename = this.filename;
+			ci.settingskey = this.settingskey;
+			ci.nodebuildersave = this.nodebuildersave;
+			ci.nodebuildertest = this.nodebuildertest;
+			ci.formatinterface = this.formatinterface; //mxd
+			ci.resources = new DataLocationList();
+			ci.resources.AddRange(this.resources);
+			
+			//mxd
+			ci.testEngines = new List<EngineInfo>();
+			foreach(EngineInfo info in testEngines) ci.testEngines.Add(new EngineInfo(info));
+			ci.currentEngineIndex = this.currentEngineIndex;
+			ci.linedefColorPresets = new LinedefColorPreset[linedefColorPresets.Length];
+			for(int i = 0; i < linedefColorPresets.Length; i++)
+				ci.linedefColorPresets[i] = new LinedefColorPreset(linedefColorPresets[i]);
+
+			ci.startmode = this.startmode;
+			ci.config = this.config; //mxd
+			ci.enabled = this.enabled; //mxd
+			ci.changed = this.changed; //mxd
+			ci.texturesets = new List<DefinedTextureSet>();
+			foreach(DefinedTextureSet s in this.texturesets) ci.texturesets.Add(s.Copy());
+			ci.thingsfilters = new List<ThingsFilter>();
+			foreach(ThingsFilter f in this.thingsfilters) ci.thingsfilters.Add(new ThingsFilter(f));
+			ci.editmodes = new Dictionary<string, bool>(this.editmodes);
+			return ci;
+		}
+		
+		// This applies settings from an object
+		internal void Apply(ConfigurationInfo ci)
+		{
+			this.name = ci.name;
+			this.filename = ci.filename;
+			this.settingskey = ci.settingskey;
+			this.nodebuildersave = ci.nodebuildersave;
+			this.nodebuildertest = ci.nodebuildertest;
+			this.formatinterface = ci.formatinterface; //mxd
+			this.currentEngineIndex = ci.currentEngineIndex; //mxd
+			this.resources = new DataLocationList();
+			this.resources.AddRange(ci.resources);
+			
+			//mxd
+			this.testEngines = new List<EngineInfo>();
+			foreach(EngineInfo info in ci.testEngines) testEngines.Add(new EngineInfo(info));
+			if(this.currentEngineIndex >= testEngines.Count) this.currentEngineIndex = Math.Max(0, testEngines.Count - 1);
+			this.linedefColorPresets = new LinedefColorPreset[ci.linedefColorPresets.Length];
+			for(int i = 0; i < ci.linedefColorPresets.Length; i++)
+				this.linedefColorPresets[i] = new LinedefColorPreset(ci.linedefColorPresets[i]);
+
+			this.startmode = ci.startmode;
+			this.config = ci.config; //mxd
+			this.enabled = ci.enabled; //mxd
+			this.changed = ci.changed;
+			this.texturesets = new List<DefinedTextureSet>();
+			foreach(DefinedTextureSet s in ci.texturesets) this.texturesets.Add(s.Copy());
+			this.thingsfilters = new List<ThingsFilter>();
+			foreach(ThingsFilter f in ci.thingsfilters) this.thingsfilters.Add(new ThingsFilter(f));
+			this.editmodes = new Dictionary<string, bool>(ci.editmodes);
+		}
+		
+		// This applies the defaults
+		internal void ApplyDefaults(GameConfiguration gameconfig)
+		{
+			// Some of the defaults can only be applied from game configuration
+			if(gameconfig != null)
+			{
+				// No nodebuildes set?
+				if(nodebuildersave == MISSING_NODEBUILDER) nodebuildersave = gameconfig.DefaultSaveCompiler;
+				if(nodebuildertest == MISSING_NODEBUILDER) nodebuildertest = gameconfig.DefaultTestCompiler;
+				
+				// No texture sets?
+				if(texturesets.Count == 0)
+				{
+					// Copy the default texture sets from the game configuration
+					foreach(DefinedTextureSet s in gameconfig.TextureSets)
+					{
+						// Add a copy to our list
+						texturesets.Add(s.Copy());
+					}
+				}
+				
+				// No things filters?
+				if(thingsfilters.Count == 0)
+				{
+					// Copy the things filters from game configuration
+					foreach(ThingsFilter f in gameconfig.ThingsFilters)
+						thingsfilters.Add(new ThingsFilter(f));
+				}
+
+				//mxd. Validate filters. Do it only for currently used ConfigInfo
+				if(General.Map != null && General.Map.ConfigSettings == this)
+				{
+					foreach(ThingsFilter f in thingsfilters) f.Validate();
+				}
+			}
+			
+			// Go for all available editing modes
+			foreach(EditModeInfo info in General.Editing.ModesInfo)
+			{
+				// Is this a mode that is optional?
+				if(info.IsOptional)
+				{
+					// Add if not listed yet
+					if(!editmodes.ContainsKey(info.Type.FullName))
+						editmodes.Add(info.Type.FullName, info.Attributes.UseByDefault);
+				}
+			}
+		}
+
+		//mxd
+		internal void PasteResourcesFrom(ConfigurationInfo source) 
+		{
+			resources = new DataLocationList();
+			resources.AddRange(source.resources);
+			changed = true;
+		}
+
+		//mxd
+		internal void PasteTestEnginesFrom(ConfigurationInfo source) 
+		{
+			currentEngineIndex = source.currentEngineIndex;
+			testEngines = new List<EngineInfo>();
+			foreach(EngineInfo info in source.testEngines) testEngines.Add(new EngineInfo(info));
+			if(currentEngineIndex >= testEngines.Count) currentEngineIndex = Math.Max(0, testEngines.Count - 1);
+			changed = true;
+		}
+
+		//mxd
+		internal void PasteColorPresetsFrom(ConfigurationInfo source) 
+		{
+			linedefColorPresets = new LinedefColorPreset[source.linedefColorPresets.Length];
+			for(int i = 0; i < source.linedefColorPresets.Length; i++)
+				linedefColorPresets[i] = new LinedefColorPreset(source.linedefColorPresets[i]);
+			changed = true;
+		}
+
+		//mxd. Not all properties should be pasted
+		internal void PasteFrom(ConfigurationInfo source) 
+		{
+			nodebuildersave = source.nodebuildersave;
+			nodebuildertest = source.nodebuildertest;
+			currentEngineIndex = source.currentEngineIndex;
+			resources = new DataLocationList();
+			resources.AddRange(source.resources);
+
+			testEngines = new List<EngineInfo>();
+			foreach(EngineInfo info in source.testEngines)
+				testEngines.Add(new EngineInfo(info)); 
+			if(currentEngineIndex >= testEngines.Count) currentEngineIndex = Math.Max(0, testEngines.Count - 1);
+			linedefColorPresets = new LinedefColorPreset[source.linedefColorPresets.Length];
+			for(int i = 0; i < source.linedefColorPresets.Length; i++)
+				linedefColorPresets[i] = new LinedefColorPreset(source.linedefColorPresets[i]);
+
+			startmode = source.startmode;
+			changed = true;
+			texturesets = new List<DefinedTextureSet>();
+			foreach(DefinedTextureSet s in source.texturesets) texturesets.Add(s.Copy());
+			thingsfilters = new List<ThingsFilter>();
+			foreach(ThingsFilter f in source.thingsfilters) thingsfilters.Add(new ThingsFilter(f));
+			editmodes = new Dictionary<string, bool>(source.editmodes);
+		}
+
+		//mxd. This checks if given map name can cause problems
+		internal bool ValidateMapName(string name)
+		{
+			// Get the map lump names
+			IDictionary maplumpnames = config.ReadSetting("maplumpnames", new Hashtable());
+
+			// Check if given map name overlaps with maplumpnames defined for this game configuration
+			foreach(DictionaryEntry ml in maplumpnames) 
+			{
+				// Ignore the map header (it will not be found because the name is different)
+				string lumpname = ml.Key.ToString().ToUpperInvariant();
+				if(lumpname.Contains(name)) return false;
+			}
+
+			return true;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Config/DefinedTextureSet.cs b/Source/Core/Config/DefinedTextureSet.cs
new file mode 100644
index 0000000..ec553cb
--- /dev/null
+++ b/Source/Core/Config/DefinedTextureSet.cs
@@ -0,0 +1,100 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections;
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.IO;
+using System.Collections.Specialized;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Config
+{
+	internal sealed class DefinedTextureSet : TextureSet
+	{
+		#region ================== Variables
+		
+		#endregion
+		
+		#region ================== Constructor / Destructor
+		
+		// Texture set from configuration
+		public DefinedTextureSet(Configuration cfg, string path)
+		{
+			// Read the name
+			name = cfg.ReadSetting(path + ".name", "Unnamed Set");
+			
+			// Read the filters
+			IDictionary dic = cfg.ReadSetting(path, new Hashtable());
+			filters = new List<string>(dic.Count);
+			foreach(DictionaryEntry de in dic)
+			{
+				// If not the name of this texture set, add value as filter
+				if(de.Key.ToString() != "name") filters.Add(de.Value.ToString().ToUpperInvariant());
+			}
+		}
+		
+		// New texture set constructor
+		public DefinedTextureSet(string name)
+		{
+			this.name = name;
+			this.filters = new List<string>();
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+		
+		// This writes the texture set to configuration
+		internal void WriteToConfig(Configuration cfg, string path)
+		{
+			// Fill structure
+			IDictionary dic = new ListDictionary();
+			
+			// Add name
+			dic.Add("name", name);
+			
+			for(int i = 0; i < filters.Count; i++)
+			{
+				// Add filters
+				dic.Add("filter" + i, filters[i].ToUpperInvariant());
+			}
+			
+			// Write to config
+			cfg.WriteSetting(path, dic);
+		}
+		
+		// Duplication
+		internal DefinedTextureSet Copy()
+		{
+			// Make a copy
+			DefinedTextureSet s = new DefinedTextureSet(this.name);
+			s.filters = new List<string>(this.filters);
+			return s;
+		}
+		
+		// This applies the filters and name of one set to this one
+		internal void Apply(TextureSet set)
+		{
+			this.name = set.Name;
+			this.filters = new List<string>(set.Filters);
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Config/EnumItem.cs b/Source/Core/Config/EnumItem.cs
new file mode 100644
index 0000000..7953800
--- /dev/null
+++ b/Source/Core/Config/EnumItem.cs
@@ -0,0 +1,85 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Globalization;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Config
+{
+	public class EnumItem : IComparable<EnumItem>
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		private readonly string value;
+		private readonly string title;
+
+		#endregion
+
+		#region ================== Properties
+
+		public string Value { get { return value; } }
+		public string Title { get { return title; } }
+
+		#endregion
+
+		#region ================== Constructor
+
+		// Constructor
+		public EnumItem(string value, string title)
+		{
+			// Initialize
+			this.value = value;
+			this.title = title;
+		}
+		
+		#endregion
+
+		#region ================== Methods
+
+		// String representation
+		public override string ToString()
+		{
+			return title;
+		}
+
+		//mxd. This compares against another activate info
+		public int CompareTo(EnumItem other)
+		{
+			int thisval = GetIntValue();
+			int otherval = other.GetIntValue();
+			if(thisval < otherval) return -1;
+			if(thisval > otherval) return 1;
+			return 0;
+		}
+
+		// This returns the value as int
+		public int GetIntValue()
+		{
+			int result;
+			return int.TryParse(value, NumberStyles.Integer, CultureInfo.InvariantCulture, out result) ? result : 0;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Config/EnumList.cs b/Source/Core/Config/EnumList.cs
new file mode 100644
index 0000000..3a48027
--- /dev/null
+++ b/Source/Core/Config/EnumList.cs
@@ -0,0 +1,101 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections;
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.IO;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Config
+{
+	public class EnumList : List<EnumItem>
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		private readonly string name; //mxd
+
+		#endregion
+
+		#region ================== Properties
+
+		public string Name { get { return name; } } //mxd
+
+		#endregion
+
+		#region ================== Constructor
+
+		// Constructor for custom list
+		internal EnumList()
+		{
+		}
+
+		// Constructor to load from dictionary
+		internal EnumList(IDictionary dic)
+		{
+			this.name = "<unnamed>"; //mxd
+			
+			// Read the dictionary
+			foreach(DictionaryEntry de in dic)
+			{
+				// Add item
+				EnumItem item = new EnumItem(de.Key.ToString(), de.Value.ToString());
+				base.Add(item);
+			}
+		}
+
+		// Constructor to load from configuration
+		internal EnumList(string name, Configuration cfg)
+		{
+			this.name = name; //mxd
+			
+			// Read the list from configuration
+			IDictionary dic = cfg.ReadSetting("enums." + name, new Hashtable());
+			foreach(DictionaryEntry de in dic)
+			{
+				// Add item
+				EnumItem item = new EnumItem(de.Key.ToString(), de.Value.ToString());
+				base.Add(item);
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This gets an item by value
+		// Returns null when item could not be found
+		public EnumItem GetByEnumIndex(string value)
+		{
+			// Find the item
+			foreach(EnumItem i in this)
+			{
+				if(i.Value == value) return i;
+			}
+
+			// Nothing found
+			return null;
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Config/FlagTranslation.cs b/Source/Core/Config/FlagTranslation.cs
new file mode 100644
index 0000000..50ba605
--- /dev/null
+++ b/Source/Core/Config/FlagTranslation.cs
@@ -0,0 +1,94 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Config
+{
+	public class FlagTranslation : IComparable<FlagTranslation>
+	{
+		#region ================== Variables
+
+		private int flag;
+		private List<string> fields;
+		private List<bool> values;
+
+		#endregion
+
+		#region ================== Properties
+
+		public int Flag { get { return flag; } }
+		public List<string> Fields { get { return fields; } }
+		public List<bool> FieldValues { get { return values; } }
+
+		#endregion
+
+		#region ================== Constructor
+
+		// Constructor
+		public FlagTranslation(DictionaryEntry de)
+		{
+			// Initialize
+			this.fields = new List<string>();
+			this.values = new List<bool>();
+			
+			// Set the flag
+			if(!int.TryParse(de.Key.ToString(), out flag))
+				General.ErrorLogger.Add(ErrorType.Warning, "Invalid flag translation key in configuration. The key must be numeric.");
+
+			// Set the fields
+			string[] fieldstrings = de.Value.ToString().Split(',');
+			foreach(string f in fieldstrings)
+			{
+				string ft = f.Trim();
+				if(ft.StartsWith("!"))
+				{
+					fields.Add(ft.Substring(1).Trim());
+					values.Add(false);
+				}
+				else
+				{
+					fields.Add(ft);
+					values.Add(true);
+				}
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// String representation
+		public override string ToString()
+		{
+			return flag.ToString();
+		}
+
+		// Comparer (highest first)
+		public int CompareTo(FlagTranslation other)
+		{
+			return other.flag - this.flag;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Config/GameConfiguration.cs b/Source/Core/Config/GameConfiguration.cs
new file mode 100644
index 0000000..dba4563
--- /dev/null
+++ b/Source/Core/Config/GameConfiguration.cs
@@ -0,0 +1,1048 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Globalization;
+using CodeImp.DoomBuilder.IO;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Editing;
+
+using CodeImp.DoomBuilder.GZBuilder.Data;
+using CodeImp.DoomBuilder.Data;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Config
+{
+	public class GameConfiguration
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		// Original configuration
+		private readonly Configuration cfg;
+		
+		// General settings
+		private readonly string configname;
+		private readonly string enginename;
+		private readonly float defaulttexturescale;
+		private readonly float defaultflatscale;
+		private readonly string defaultwalltexture; //mxd
+		private readonly string defaultfloortexture; //mxd
+		private readonly string defaultceilingtexture; //mxd
+		private readonly bool scaledtextureoffsets;
+		private readonly string defaultsavecompiler;
+		private readonly string defaulttestcompiler;
+		private readonly string formatinterface;
+		private readonly string defaultLinedefActivation; //mxd
+		private readonly string singlesidedflag;
+		private readonly string doublesidedflag;
+		private readonly string impassableflag;
+		private readonly string upperunpeggedflag;
+		private readonly string lowerunpeggedflag;
+		private readonly bool mixtexturesflats;
+		private readonly bool generalizedactions;
+		private readonly bool generalizedeffects;
+		private readonly int start3dmodethingtype;
+		private readonly int linedefactivationsfilter;
+		private readonly string testparameters;
+		private readonly bool testshortpaths;
+		private readonly string makedoortrack;
+		private readonly string makedoordoor; //mxd
+		private readonly string makedoorceil; //mxd
+		private readonly int makedooraction;
+		private readonly int makedooractivate;
+		private readonly int[] makedoorargs;
+		private readonly Dictionary<string, bool> makedoorflags;
+		private readonly bool linetagindicatesectors;
+		private readonly string decorategames;
+		private string skyflatname;
+		private readonly int maxtexturenamelength;
+		private readonly bool longtexturenames; //mxd
+		private readonly int leftboundary;
+		private readonly int rightboundary;
+		private readonly int topboundary;
+		private readonly int bottomboundary;
+		private readonly bool doomlightlevels;
+		private readonly string actionspecialhelp; //mxd
+		private readonly string thingclasshelp; //mxd
+		
+		// Skills
+		private readonly List<SkillInfo> skills;
+
+		// Map lumps
+		private readonly Dictionary<string, MapLumpInfo> maplumps;
+
+		//mxd. Map format
+		private readonly bool doommapformat;
+		private readonly bool hexenmapformat;
+		private readonly bool universalmapformat;
+		
+		// Texture/flat/voxel sources
+		private readonly IDictionary textureranges;
+		private readonly IDictionary flatranges;
+		private readonly IDictionary patchranges;
+		private readonly IDictionary spriteranges;
+		private readonly IDictionary colormapranges;
+		private readonly IDictionary voxelranges; //mxd
+		
+		// Things
+		private readonly List<string> defaultthingflags;
+		private readonly Dictionary<string, string> thingflags;
+		private readonly List<ThingCategory> thingcategories;
+		private readonly Dictionary<int, ThingTypeInfo> things;
+		private readonly List<FlagTranslation> thingflagstranslation;
+		private readonly Dictionary<string, ThingFlagsCompareGroup> thingflagscompare; //mxd 
+		private readonly Dictionary<string, string> thingrenderstyles; //mxd
+		
+		// Linedefs
+		private readonly Dictionary<string, string> linedefflags;
+		private readonly List<string> sortedlinedefflags;
+		private readonly Dictionary<int, LinedefActionInfo> linedefactions;
+		private readonly List<LinedefActionInfo> sortedlinedefactions;
+		private readonly List<LinedefActionCategory> actioncategories;
+		private readonly List<LinedefActivateInfo> linedefactivates;
+		private readonly List<GeneralizedCategory> genactioncategories;
+		private readonly List<FlagTranslation> linedefflagstranslation;
+		private readonly Dictionary<string, string> linedefrenderstyles; //mxd
+
+		//mxd. Sidedefs
+		private readonly Dictionary<string, string> sidedefflags; //mxd
+		
+		// Sectors
+		private readonly Dictionary<string, string> sectorflags; //mxd
+		private readonly Dictionary<int, SectorEffectInfo> sectoreffects;
+		private readonly List<SectorEffectInfo> sortedsectoreffects;
+		private readonly List<GeneralizedOption> geneffectoptions;
+		private readonly StepsList brightnesslevels;
+		private readonly Dictionary<string, string> sectorrenderstyles; //mxd
+
+		// Universal fields
+		private readonly List<UniversalFieldInfo> linedeffields;
+		private readonly List<UniversalFieldInfo> sectorfields;
+		private readonly List<UniversalFieldInfo> sidedeffields;
+		private readonly List<UniversalFieldInfo> thingfields;
+		private readonly List<UniversalFieldInfo> vertexfields;
+		
+		// Enums
+		private readonly Dictionary<string, EnumList> enums;
+		
+		// Defaults
+		private readonly List<DefinedTextureSet> texturesets;
+		private readonly List<ThingsFilter> thingfilters;
+
+		//mxd. Holds base game type (doom, heretic, hexen or strife)
+		private readonly GameType gameType;
+		
+		#endregion
+
+		#region ================== Properties
+
+		// General settings
+		public string Name { get { return configname; } }
+		public string EngineName { get { return enginename; } }
+		public string DefaultSaveCompiler { get { return defaultsavecompiler; } }
+		public string DefaultTestCompiler { get { return defaulttestcompiler; } }
+		public float DefaultTextureScale { get { return defaulttexturescale; } }
+		public float DefaultFlatScale { get { return defaultflatscale; } }
+		public string DefaultWallTexture { get { return defaultwalltexture; } } //mxd
+		public string DefaultFloorTexture { get { return defaultfloortexture; } } //mxd
+		public string DefaultCeilingTexture { get { return defaultceilingtexture; } } //mxd
+		public bool ScaledTextureOffsets { get { return scaledtextureoffsets; } }
+		public string FormatInterface { get { return formatinterface; } }
+		public string DefaultLinedefActivationFlag { get { return defaultLinedefActivation; } } //mxd
+		public string SingleSidedFlag { get { return singlesidedflag; } }
+		public string DoubleSidedFlag { get { return doublesidedflag; } }
+		public string ImpassableFlag { get { return impassableflag; } }
+		public string UpperUnpeggedFlag { get { return upperunpeggedflag; } }
+		public string LowerUnpeggedFlag { get { return lowerunpeggedflag; } }
+		public bool MixTexturesFlats { get { return mixtexturesflats; } }
+		public bool GeneralizedActions { get { return generalizedactions; } }
+		public bool GeneralizedEffects { get { return generalizedeffects; } }
+		public int Start3DModeThingType { get { return start3dmodethingtype; } }
+		public int LinedefActivationsFilter { get { return linedefactivationsfilter; } }
+		public string TestParameters { get { return testparameters; } }
+		public bool TestShortPaths { get { return testshortpaths; } }
+		public string MakeDoorTrack { get { return makedoortrack; } }
+		public string MakeDoorDoor { get { return makedoordoor; } } //mxd
+		public string MakeDoorCeiling { get { return makedoorceil; } } //mxd
+		public int MakeDoorAction { get { return makedooraction; } }
+		public int MakeDoorActivate { get { return makedooractivate; } }
+		public Dictionary<string, bool> MakeDoorFlags { get { return makedoorflags; } }
+		public int[] MakeDoorArgs { get { return makedoorargs; } }
+		public bool LineTagIndicatesSectors { get { return linetagindicatesectors ; } }
+		public string DecorateGames { get { return decorategames; } }
+		public string SkyFlatName { get { return skyflatname; } internal set { skyflatname = value; } } //mxd. Added setter
+		public int MaxTextureNameLength { get { return maxtexturenamelength; } }
+		public bool UseLongTextureNames { get { return longtexturenames; } } //mxd
+		public int LeftBoundary { get { return leftboundary; } }
+		public int RightBoundary { get { return rightboundary; } }
+		public int TopBoundary { get { return topboundary; } }
+		public int BottomBoundary { get { return bottomboundary; } }
+		public bool DoomLightLevels { get { return doomlightlevels; } }
+		public string ActionSpecialHelp { get { return actionspecialhelp; } } //mxd
+		public string ThingClassHelp { get { return thingclasshelp; } } //mxd
+
+		// Skills
+		public List<SkillInfo> Skills { get { return skills; } }
+		
+		// Map lumps
+		public Dictionary<string, MapLumpInfo> MapLumps { get { return maplumps; } }
+
+		//mxd. Map format
+		public bool UDMF { get { return universalmapformat; } }
+		public bool HEXEN { get { return hexenmapformat; } }
+		public bool DOOM { get { return doommapformat; } }
+
+		// Texture/flat/voxel sources
+		public IDictionary TextureRanges { get { return textureranges; } }
+		public IDictionary FlatRanges { get { return flatranges; } }
+		public IDictionary PatchRanges { get { return patchranges; } }
+		public IDictionary SpriteRanges { get { return spriteranges; } }
+		public IDictionary ColormapRanges { get { return colormapranges; } }
+		public IDictionary VoxelRanges { get { return voxelranges; } } //mxd
+
+		// Things
+		public ICollection<string> DefaultThingFlags { get { return defaultthingflags; } }
+		public IDictionary<string, string> ThingFlags { get { return thingflags; } }
+		public List<FlagTranslation> ThingFlagsTranslation { get { return thingflagstranslation; } }
+		public Dictionary<string, ThingFlagsCompareGroup> ThingFlagsCompare { get { return thingflagscompare; } } //mxd
+		public Dictionary<string, string> ThingRenderStyles { get { return thingrenderstyles; } } //mxd
+		
+		// Linedefs
+		public IDictionary<string, string> LinedefFlags { get { return linedefflags; } }
+		public List<string> SortedLinedefFlags { get { return sortedlinedefflags; } }
+		public IDictionary<int, LinedefActionInfo> LinedefActions { get { return linedefactions; } }
+		public List<LinedefActionInfo> SortedLinedefActions { get { return sortedlinedefactions; } }
+		public List<LinedefActionCategory> ActionCategories { get { return actioncategories; } }
+		public List<LinedefActivateInfo> LinedefActivates { get { return linedefactivates; } }
+		public List<GeneralizedCategory> GenActionCategories { get { return genactioncategories; } }
+		public List<FlagTranslation> LinedefFlagsTranslation { get { return linedefflagstranslation; } }
+		public Dictionary<string, string> LinedefRenderStyles { get { return linedefrenderstyles; } } //mxd
+
+		//mxd. Sidedefs
+		public IDictionary<string, string> SidedefFlags { get { return sidedefflags; } }
+
+		// Sectors
+		public IDictionary<string, string> SectorFlags { get { return sectorflags; } } //mxd
+		public IDictionary<int, SectorEffectInfo> SectorEffects { get { return sectoreffects; } }
+		public List<SectorEffectInfo> SortedSectorEffects { get { return sortedsectoreffects; } }
+		public List<GeneralizedOption> GenEffectOptions { get { return geneffectoptions; } }
+		public StepsList BrightnessLevels { get { return brightnesslevels; } }
+		public Dictionary<string, string> SectorRenderStyles { get { return sectorrenderstyles; } } //mxd
+
+		// Universal fields
+		public List<UniversalFieldInfo> LinedefFields { get { return linedeffields; } }
+		public List<UniversalFieldInfo> SectorFields { get { return sectorfields; } }
+		public List<UniversalFieldInfo> SidedefFields { get { return sidedeffields; } }
+		public List<UniversalFieldInfo> ThingFields { get { return thingfields; } }
+		public List<UniversalFieldInfo> VertexFields { get { return vertexfields; } }
+
+		// Enums
+		public IDictionary<string, EnumList> Enums { get { return enums; } }
+
+		// Defaults
+		internal List<DefinedTextureSet> TextureSets { get { return texturesets; } }
+		public List<ThingsFilter> ThingsFilters { get { return thingfilters; } }
+
+		//mxd
+		public GameType GameType { get { return gameType; } }
+		
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		internal GameConfiguration(Configuration cfg)
+		{
+			// Initialize
+			this.cfg = cfg;
+			this.thingflags = new Dictionary<string, string>(StringComparer.Ordinal);
+			this.defaultthingflags = new List<string>();
+			this.thingcategories = new List<ThingCategory>();
+			this.things = new Dictionary<int, ThingTypeInfo>();
+			this.linedefflags = new Dictionary<string, string>(StringComparer.Ordinal);
+			this.sortedlinedefflags = new List<string>();
+			this.linedefactions = new Dictionary<int, LinedefActionInfo>();
+			this.actioncategories = new List<LinedefActionCategory>();
+			this.sortedlinedefactions = new List<LinedefActionInfo>();
+			this.linedefactivates = new List<LinedefActivateInfo>();
+			this.sidedefflags = new Dictionary<string, string>(StringComparer.Ordinal); //mxd
+			this.genactioncategories = new List<GeneralizedCategory>();
+			this.sectorflags = new Dictionary<string, string>(StringComparer.Ordinal); //mxd
+			this.sectoreffects = new Dictionary<int, SectorEffectInfo>();
+			this.sortedsectoreffects = new List<SectorEffectInfo>();
+			this.geneffectoptions = new List<GeneralizedOption>();
+			this.enums = new Dictionary<string, EnumList>(StringComparer.Ordinal);
+			this.skills = new List<SkillInfo>();
+			this.texturesets = new List<DefinedTextureSet>();
+			this.makedoorargs = new int[Linedef.NUM_ARGS];
+			this.maplumps = new Dictionary<string, MapLumpInfo>(StringComparer.Ordinal);
+			this.thingflagstranslation = new List<FlagTranslation>();
+			this.linedefflagstranslation = new List<FlagTranslation>();
+			this.thingfilters = new List<ThingsFilter>();
+			this.thingflagscompare = new Dictionary<string, ThingFlagsCompareGroup>(); //mxd
+			this.brightnesslevels = new StepsList();
+			this.makedoorflags = new Dictionary<string, bool>(StringComparer.Ordinal);
+			this.linedefrenderstyles = new Dictionary<string, string>(StringComparer.Ordinal); //mxd
+			this.sectorrenderstyles = new Dictionary<string, string>(StringComparer.Ordinal); //mxd
+			this.thingrenderstyles = new Dictionary<string, string>(StringComparer.Ordinal); //mxd
+			
+			// Read general settings
+			configname = cfg.ReadSetting("game", "<unnamed game>");
+
+			//mxd
+			int gt = (cfg.ReadSetting("basegame", (int)GameType.UNKNOWN));
+			gameType = ( (gt > -1 && gt < Gldefs.GLDEFS_LUMPS_PER_GAME.Length) ? (GameType)gt : GameType.UNKNOWN);
+
+			enginename = cfg.ReadSetting("engine", "");
+			defaultsavecompiler = cfg.ReadSetting("defaultsavecompiler", "");
+			defaulttestcompiler = cfg.ReadSetting("defaulttestcompiler", "");
+			defaulttexturescale = cfg.ReadSetting("defaulttexturescale", 1f);
+			defaultflatscale = cfg.ReadSetting("defaultflatscale", 1f);
+			defaultwalltexture = cfg.ReadSetting("defaultwalltexture", "STARTAN"); //mxd
+			defaultfloortexture = cfg.ReadSetting("defaultfloortexture", "FLOOR0_1"); //mxd
+			defaultceilingtexture = cfg.ReadSetting("defaultceilingtexture", "CEIL1_1"); //mxd
+			scaledtextureoffsets = cfg.ReadSetting("scaledtextureoffsets", true);
+			formatinterface = cfg.ReadSetting("formatinterface", "");
+			mixtexturesflats = cfg.ReadSetting("mixtexturesflats", false);
+			generalizedactions = cfg.ReadSetting("generalizedlinedefs", false);
+			generalizedeffects = cfg.ReadSetting("generalizedsectors", false);
+			start3dmodethingtype = cfg.ReadSetting("start3dmode", 0);
+			linedefactivationsfilter = cfg.ReadSetting("linedefactivationsfilter", 0);
+			testparameters = cfg.ReadSetting("testparameters", "");
+			testshortpaths = cfg.ReadSetting("testshortpaths", false);
+			makedoortrack = cfg.ReadSetting("makedoortrack", "-");
+			makedoordoor = cfg.ReadSetting("makedoordoor", "-"); //mxd
+			makedoorceil = cfg.ReadSetting("makedoorceil", "-"); //mxd
+			makedooraction = cfg.ReadSetting("makedooraction", 0);
+			makedooractivate = cfg.ReadSetting("makedooractivate", 0);
+			linetagindicatesectors = cfg.ReadSetting("linetagindicatesectors", false);
+			decorategames = cfg.ReadSetting("decorategames", "");
+			skyflatname = cfg.ReadSetting("skyflatname", "F_SKY1");
+			leftboundary = cfg.ReadSetting("leftboundary", -32768);
+			rightboundary = cfg.ReadSetting("rightboundary", 32767);
+			topboundary = cfg.ReadSetting("topboundary", 32767);
+			bottomboundary = cfg.ReadSetting("bottomboundary", -32768);
+			doomlightlevels = cfg.ReadSetting("doomlightlevels", true);
+			actionspecialhelp = cfg.ReadSetting("actionspecialhelp", string.Empty); //mxd
+			thingclasshelp = cfg.ReadSetting("thingclasshelp", string.Empty); //mxd
+			defaultLinedefActivation = cfg.ReadSetting("defaultlinedefactivation", ""); //mxd
+			for(int i = 0; i < Linedef.NUM_ARGS; i++) makedoorargs[i] = cfg.ReadSetting("makedoorarg" + i.ToString(CultureInfo.InvariantCulture), 0);
+
+			//mxd. Update map format flags
+			universalmapformat = (formatinterface == "UniversalMapSetIO");
+			hexenmapformat = (formatinterface == "HexenMapSetIO");
+			doommapformat = (formatinterface == "DoomMapSetIO");
+
+			//mxd. Texture names length
+			longtexturenames = cfg.ReadSetting("longtexturenames", false);
+			maxtexturenamelength = (longtexturenames ? short.MaxValue : DataManager.CLASIC_IMAGE_NAME_LENGTH);
+
+			// Flags have special (invariant culture) conversion
+			// because they are allowed to be written as integers in the configs
+			object obj = cfg.ReadSettingObject("singlesidedflag", 0);
+			if(obj is int) singlesidedflag = ((int)obj).ToString(CultureInfo.InvariantCulture); else singlesidedflag = obj.ToString();
+			obj = cfg.ReadSettingObject("doublesidedflag", 0);
+			if(obj is int) doublesidedflag = ((int)obj).ToString(CultureInfo.InvariantCulture); else doublesidedflag = obj.ToString();
+			obj = cfg.ReadSettingObject("impassableflag", 0);
+			if(obj is int) impassableflag = ((int)obj).ToString(CultureInfo.InvariantCulture); else impassableflag = obj.ToString();
+			obj = cfg.ReadSettingObject("upperunpeggedflag", 0);
+			if(obj is int) upperunpeggedflag = ((int)obj).ToString(CultureInfo.InvariantCulture); else upperunpeggedflag = obj.ToString();
+			obj = cfg.ReadSettingObject("lowerunpeggedflag", 0);
+			if(obj is int) lowerunpeggedflag = ((int)obj).ToString(CultureInfo.InvariantCulture); else lowerunpeggedflag = obj.ToString();
+
+			// Get texture and flat sources
+			textureranges = cfg.ReadSetting("textures", new Hashtable());
+			flatranges = cfg.ReadSetting("flats", new Hashtable());
+			patchranges = cfg.ReadSetting("patches", new Hashtable());
+			spriteranges = cfg.ReadSetting("sprites", new Hashtable());
+			colormapranges = cfg.ReadSetting("colormaps", new Hashtable());
+			voxelranges = cfg.ReadSetting("voxels", new Hashtable()); //mxd
+			
+			// Map lumps
+			LoadMapLumps();
+			
+			// Skills
+			LoadSkills();
+
+			// Enums
+			LoadEnums();
+			
+			// Things
+			LoadThingFlags();
+			LoadDefaultThingFlags();
+			LoadThingCategories();
+			LoadStringDictionary(thingrenderstyles, "thingrenderstyles"); //mxd
+			
+			// Linedefs
+			LoadLinedefFlags();
+			LoadLinedefActions();
+			LoadLinedefActivations();
+			LoadLinedefGeneralizedActions();
+			LoadStringDictionary(linedefrenderstyles, "linedefrenderstyles"); //mxd
+
+			//mxd. Sidedefs
+			LoadStringDictionary(sidedefflags, "sidedefflags");
+
+			// Sectors
+			LoadStringDictionary(sectorflags, "sectorflags"); //mxd
+			LoadBrightnessLevels();
+			LoadSectorEffects();
+			LoadSectorGeneralizedEffects();
+			LoadStringDictionary(sectorrenderstyles, "sectorrenderstyles"); //mxd
+			
+			// Universal fields
+			linedeffields = LoadUniversalFields("linedef");
+			sectorfields = LoadUniversalFields("sector");
+			sidedeffields = LoadUniversalFields("sidedef");
+			thingfields = LoadUniversalFields("thing");
+			vertexfields = LoadUniversalFields("vertex");
+
+			// Defaults
+			LoadTextureSets();
+			LoadThingFilters();
+
+			// Make door flags
+			LoadMakeDoorFlags();
+		}
+
+		// Destructor
+		~GameConfiguration()
+		{
+			foreach(ThingCategory tc in thingcategories) tc.Dispose();
+			foreach(LinedefActionCategory ac in actioncategories) ac.Dispose();
+			foreach(ThingsFilter tf in thingfilters) tf.Dispose(); //mxd
+			foreach(GeneralizedCategory gc in genactioncategories) gc.Dispose(); //mxd
+		}
+		
+		#endregion
+
+		#region ================== Loading
+		
+		// This loads the map lumps
+		private void LoadMapLumps() 
+		{
+			// Get map lumps list
+			IDictionary dic = cfg.ReadSetting("maplumpnames", new Hashtable());
+			foreach(DictionaryEntry de in dic)
+			{
+				// Make map lumps
+				MapLumpInfo lumpinfo = new MapLumpInfo(de.Key.ToString(), cfg);
+				maplumps.Add(de.Key.ToString(), lumpinfo);
+			}
+		}
+		
+		// This loads the enumerations
+		private void LoadEnums() 
+		{
+			// Get enums list
+			IDictionary dic = cfg.ReadSetting("enums", new Hashtable());
+			foreach(DictionaryEntry de in dic)
+			{
+				// Make new enum
+				EnumList list = new EnumList(de.Key.ToString(), cfg);
+				enums.Add(de.Key.ToString(), list);
+			}
+		}
+		
+		// This loads a universal fields list
+		private List<UniversalFieldInfo> LoadUniversalFields(string elementname)
+		{
+			List<UniversalFieldInfo> list = new List<UniversalFieldInfo>();
+
+			// Get fields
+			IDictionary dic = cfg.ReadSetting("universalfields." + elementname, new Hashtable());
+			foreach(DictionaryEntry de in dic)
+			{
+				try
+				{
+					// Read the field info and add to list
+					UniversalFieldInfo uf = new UniversalFieldInfo(elementname, de.Key.ToString(), cfg, enums);
+					list.Add(uf);
+				}
+				catch(Exception)
+				{
+					General.ErrorLogger.Add(ErrorType.Warning, "Unable to read universal field definition 'universalfields." + elementname + "." + de.Key + "' from game configuration '" + this.Name + "'");
+				}
+			}
+
+			// Return result
+			return list;
+		}
+		
+		// Things and thing categories
+		private void LoadThingCategories()
+		{
+			// Get thing categories
+			IDictionary dic = cfg.ReadSetting("thingtypes", new Hashtable());
+			foreach(DictionaryEntry de in dic)
+			{
+				if(de.Value is IDictionary)
+				{
+					// Make a category
+					ThingCategory thingcat = new ThingCategory(cfg, null, de.Key.ToString(), enums);
+
+					//mxd. Otherwise nesting problems might occure
+					if(thingcat.IsValid)
+					{
+						// Add all things in category to the big list
+						AddThingsFromCategory(thingcat); //mxd
+
+						// Add category to list
+						thingcategories.Add(thingcat);
+					}
+				}
+			}
+		}
+
+		//mxd. This recursively adds all things from a ThingCategory and it's children
+		private void AddThingsFromCategory(ThingCategory thingcat) 
+		{
+			if(!thingcat.IsValid) return;
+			
+			// Add all things in category to the big list
+			foreach(ThingTypeInfo t in thingcat.Things) 
+			{
+				if(!things.ContainsKey(t.Index)) 
+					things.Add(t.Index, t);
+				else 
+					General.ErrorLogger.Add(ErrorType.Warning, "Thing number " + t.Index + " is defined more than once (as '" + things[t.Index].Title + "' and '" + t.Title + "') in the '" + this.Name + "' game configuration");
+			}
+
+			// Recursively add things from child categories
+			foreach(ThingCategory c in thingcat.Children) AddThingsFromCategory(c);
+		}
+		
+		// Linedef flags
+		private void LoadLinedefFlags()
+		{
+			// Get linedef flags
+			LoadStringDictionary(linedefflags, "linedefflags"); //mxd
+			
+			// Get translations
+			IDictionary dic = cfg.ReadSetting("linedefflagstranslation", new Hashtable());
+			foreach(DictionaryEntry de in dic)
+				linedefflagstranslation.Add(new FlagTranslation(de));
+			
+			// Sort flags?
+			MapSetIO io = MapSetIO.Create(formatinterface);
+			if(io.HasNumericLinedefFlags)
+			{
+				// Make list for integers that we can sort
+				List<int> sortlist = new List<int>(linedefflags.Count);
+				foreach(KeyValuePair<string, string> f in linedefflags)
+				{
+					int num;
+					if(int.TryParse(f.Key, NumberStyles.Integer, CultureInfo.InvariantCulture, out num)) sortlist.Add(num);
+				}
+				
+				// Sort
+				sortlist.Sort();
+				
+				// Make list of strings
+				foreach(int i in sortlist)
+					sortedlinedefflags.Add(i.ToString(CultureInfo.InvariantCulture));
+			}
+			
+			// Sort the flags, because they must be compared highest first!
+			linedefflagstranslation.Sort();
+		}
+
+		// Linedef actions and action categories
+		private void LoadLinedefActions()
+		{
+			Dictionary<string, LinedefActionCategory> cats = new Dictionary<string, LinedefActionCategory>(StringComparer.Ordinal);
+
+			// Get linedef categories
+			IDictionary dic = cfg.ReadSetting("linedeftypes", new Hashtable());
+			foreach(DictionaryEntry cde in dic)
+			{
+				if(cde.Value is IDictionary)
+				{
+					// Read category title
+					string cattitle = cfg.ReadSetting("linedeftypes." + cde.Key + ".title", "");
+
+					// Make or get category
+					LinedefActionCategory ac;
+					if(cats.ContainsKey(cde.Key.ToString()))
+						ac = cats[cde.Key.ToString()];
+					else
+					{
+						ac = new LinedefActionCategory(cde.Key.ToString(), cattitle);
+						cats.Add(cde.Key.ToString(), ac);
+					}
+
+					// Go for all line types in category
+					IDictionary catdic = cfg.ReadSetting("linedeftypes." + cde.Key, new Hashtable());
+					foreach(DictionaryEntry de in catdic)
+					{
+						// Check if the item key is numeric
+						int actionnumber;
+						if(int.TryParse(de.Key.ToString(),
+							NumberStyles.AllowLeadingWhite | NumberStyles.AllowTrailingWhite,
+							CultureInfo.InvariantCulture, out actionnumber))
+						{
+							// Check if the item value is a structure
+							if(de.Value is IDictionary)
+							{
+								// Make the line type
+								LinedefActionInfo ai = new LinedefActionInfo(actionnumber, cfg, cde.Key.ToString(), enums);
+
+								// Add action to category and sorted list
+								sortedlinedefactions.Add(ai);
+								linedefactions.Add(actionnumber, ai);
+								ac.Add(ai);
+							}
+							else
+							{
+								// Failure
+								if(de.Value != null)
+									General.ErrorLogger.Add(ErrorType.Warning, "Structure 'linedeftypes' contains invalid types in game configuration '" + this.Name + "'. All types must be expanded structures.");
+							}
+						}
+					}
+				}
+			}
+
+			// Sort the actions list
+			sortedlinedefactions.Sort();
+			
+			// Copy categories to final list
+			actioncategories.Clear();
+			actioncategories.AddRange(cats.Values);
+
+			// Sort the categories list
+			actioncategories.Sort();
+		}
+
+		// Linedef activates
+		private void LoadLinedefActivations()
+		{
+			// Get linedef activations
+			IDictionary dic = cfg.ReadSetting("linedefactivations", new Hashtable());
+			foreach(DictionaryEntry de in dic)
+			{
+				// Add to the list
+				linedefactivates.Add(new LinedefActivateInfo(de.Key.ToString(), de.Value.ToString()));
+			}
+
+			//mxd. Sort only when activations are numeric
+			MapSetIO io = MapSetIO.Create(formatinterface);
+			if(io.HasNumericLinedefActivations)
+			{
+				linedefactivates.Sort();
+			}
+		}
+
+		// Linedef generalized actions
+		private void LoadLinedefGeneralizedActions()
+		{
+			// Get linedef activations
+			IDictionary dic = cfg.ReadSetting("gen_linedeftypes", new Hashtable());
+			foreach(DictionaryEntry de in dic)
+			{
+				// Check for valid structure
+				if(de.Value is IDictionary)
+				{
+					// Add category
+					genactioncategories.Add(new GeneralizedCategory("gen_linedeftypes", de.Key.ToString(), cfg));
+				}
+				else
+				{
+					General.ErrorLogger.Add(ErrorType.Warning, "Structure 'gen_linedeftypes' contains invalid entries in game configuration '" + this.Name + "'");
+				}
+			}
+		}
+
+		// Sector effects
+		private void LoadSectorEffects()
+		{
+			// Get sector effects
+			IDictionary dic = cfg.ReadSetting("sectortypes", new Hashtable());
+			foreach(DictionaryEntry de in dic)
+			{
+				// Try paring the action number
+				int actionnumber;
+				if(int.TryParse(de.Key.ToString(),
+					NumberStyles.AllowLeadingWhite | NumberStyles.AllowTrailingWhite,
+					CultureInfo.InvariantCulture, out actionnumber))
+				{
+					// Make effects
+					SectorEffectInfo si = new SectorEffectInfo(actionnumber, de.Value.ToString(), true, false);
+					
+					// Add action to category and sorted list
+					sortedsectoreffects.Add(si);
+					sectoreffects.Add(actionnumber, si);
+				}
+				else
+				{
+					General.ErrorLogger.Add(ErrorType.Warning, "Structure 'sectortypes' contains invalid keys in game configuration '" + this.Name + "'");
+				}
+			}
+
+			// Sort the actions list
+			sortedsectoreffects.Sort();
+		}
+
+		// Brightness levels
+		private void LoadBrightnessLevels()
+		{
+			// Get brightness levels structure
+			IDictionary dic = cfg.ReadSetting("sectorbrightness", new Hashtable());
+			foreach(DictionaryEntry de in dic)
+			{
+				// Try paring the level
+				int level;
+				if(int.TryParse(de.Key.ToString(),
+					NumberStyles.AllowLeadingWhite | NumberStyles.AllowTrailingWhite,
+					CultureInfo.InvariantCulture, out level))
+				{
+					brightnesslevels.Add(level);
+				}
+				else
+				{
+					General.ErrorLogger.Add(ErrorType.Warning, "Structure 'sectorbrightness' contains invalid keys in game configuration '" + this.Name + "'");
+				}
+			}
+
+			// Sort the list
+			brightnesslevels.Sort();
+		}
+
+		// Sector generalized effects
+		private void LoadSectorGeneralizedEffects()
+		{
+			// Get sector effects
+			IDictionary dic = cfg.ReadSetting("gen_sectortypes", new Hashtable());
+			foreach(DictionaryEntry de in dic)
+			{
+				// Check for valid structure
+				if(de.Value is IDictionary)
+				{
+					// Add option
+					geneffectoptions.Add(new GeneralizedOption("gen_sectortypes", "", de.Key.ToString(), de.Value as IDictionary));
+				}
+				else
+				{
+					General.ErrorLogger.Add(ErrorType.Warning, "Structure 'gen_sectortypes' contains invalid entries in game configuration '" + this.Name + "'");
+				}
+			}
+		}
+
+		// Thing flags
+		private void LoadThingFlags()
+		{
+			// Get thing flags
+			LoadStringDictionary(thingflags, "thingflags"); //mxd
+			
+			// Get translations
+			IDictionary dic = cfg.ReadSetting("thingflagstranslation", new Hashtable());
+			foreach(DictionaryEntry de in dic)
+				thingflagstranslation.Add(new FlagTranslation(de));
+				
+			// Get thing compare flag info (for the stuck thing error checker
+			HashSet<string> flagscache = new HashSet<string>();
+			dic = cfg.ReadSetting("thingflagscompare", new Hashtable());
+			foreach(DictionaryEntry de in dic)
+			{
+				string group = de.Key.ToString(); //mxd
+				thingflagscompare[group] = new ThingFlagsCompareGroup(cfg, group); //mxd
+				foreach(string s in thingflagscompare[group].Flags.Keys)
+				{
+					if(flagscache.Contains(s))
+						General.ErrorLogger.Add(ErrorType.Warning, "ThingFlagsCompare flag '" + s + "' is double-defined in '" + group + "' group!");
+					else
+						flagscache.Add(s);
+				}
+			}
+
+			//mxd. Integrity check
+			foreach(KeyValuePair<string, ThingFlagsCompareGroup> group in thingflagscompare)
+			{
+				foreach(ThingFlagsCompare flag in group.Value.Flags.Values)
+				{
+					// Required groups are missing?
+					foreach(string s in flag.RequiredGroups)
+					{
+						if(!thingflagscompare.ContainsKey(s))
+						{
+							General.ErrorLogger.Add(ErrorType.Warning, "ThingFlagsCompare group '" + s + "', required by flag '" + flag.Flag + "' does not exist!");
+							flag.RequiredGroups.Remove(s);
+						}
+					}
+
+					// Ignored groups are missing?
+					foreach(string s in flag.IgnoredGroups)
+					{
+						if(!thingflagscompare.ContainsKey(s))
+						{
+							General.ErrorLogger.Add(ErrorType.Warning, "ThingFlagsCompare group '" + s + "', ignored by flag '" + flag.Flag + "' does not exist!");
+							flag.IgnoredGroups.Remove(s);
+						}
+					}
+
+					// Required flag is missing?
+					if(!string.IsNullOrEmpty(flag.RequiredFlag) && !flagscache.Contains(flag.RequiredFlag) /*!group.Value.Flags.ContainsKey(flag.RequiredFlag)*/) 
+					{
+						General.ErrorLogger.Add(ErrorType.Warning, "ThingFlagsCompare flag '" + flag.RequiredFlag + "', required by flag '" + flag.Flag + "' does not exist!");
+						flag.RequiredFlag = string.Empty;
+					}
+				}
+			}
+
+			// Sort the translation flags, because they must be compared highest first!
+			thingflagstranslation.Sort();
+		}
+
+		// Default thing flags
+		private void LoadDefaultThingFlags()
+		{
+			// Get linedef flags
+			IDictionary dic = cfg.ReadSetting("defaultthingflags", new Hashtable());
+			foreach(DictionaryEntry de in dic)
+			{
+				// Check if flag exists
+				if(thingflags.ContainsKey(de.Key.ToString()))
+				{
+					defaultthingflags.Add(de.Key.ToString());
+				}
+				else
+				{
+					General.ErrorLogger.Add(ErrorType.Warning, "Structure 'defaultthingflags' contains unknown thing flags in game configuration '" + this.Name + "'");
+				}
+			}
+		}
+
+		// Skills
+		private void LoadSkills()
+		{
+			// Get skills
+			IDictionary dic = cfg.ReadSetting("skills", new Hashtable());
+			foreach(DictionaryEntry de in dic)
+			{
+				int num;
+				if(int.TryParse(de.Key.ToString(), out num))
+				{
+					skills.Add(new SkillInfo(num, de.Value.ToString()));
+				}
+				else
+				{
+					General.ErrorLogger.Add(ErrorType.Warning, "Structure 'skills' contains invalid skill numbers in game configuration '" + this.Name + "'");
+				}
+			}
+		}
+		
+		// Texture Sets
+		private void LoadTextureSets() 
+		{
+			// Get sets
+			IDictionary dic = cfg.ReadSetting("texturesets", new Hashtable());
+			foreach(DictionaryEntry de in dic)
+			{
+				DefinedTextureSet s = new DefinedTextureSet(cfg, "texturesets." + de.Key);
+				texturesets.Add(s);
+			}
+		}
+		
+		// Thing Filters
+		private void LoadThingFilters()
+		{
+			// Get sets
+			IDictionary dic = cfg.ReadSetting("thingsfilters", new Hashtable());
+			foreach(DictionaryEntry de in dic)
+			{
+				ThingsFilter f = new ThingsFilter(cfg, "thingsfilters." + de.Key);
+				thingfilters.Add(f);
+			}
+		}
+
+		// Make door flags
+		private void LoadMakeDoorFlags()
+		{
+			IDictionary dic = cfg.ReadSetting("makedoorflags", new Hashtable());
+			foreach(DictionaryEntry de in dic)
+			{
+				// Using minus will unset the flag
+				if(de.Key.ToString()[0] == '-')
+				{
+					makedoorflags[de.Key.ToString().TrimStart('-')] = false;
+				}
+				else
+				{
+					makedoorflags[de.Key.ToString()] = true;
+				}
+			}
+		}
+
+		//mxd
+		private void LoadStringDictionary(Dictionary<string, string> target, string settingname) 
+		{
+			IDictionary dic = cfg.ReadSetting(settingname, new Hashtable());
+			foreach(DictionaryEntry de in dic)
+				target.Add(de.Key.ToString(), de.Value.ToString());
+		}
+		
+		#endregion
+
+		#region ================== Methods
+
+		// ReadSetting
+		public string ReadSetting(string setting, string defaultsetting) { return cfg.ReadSetting(setting, defaultsetting); }
+		public int ReadSetting(string setting, int defaultsetting) { return cfg.ReadSetting(setting, defaultsetting); }
+		public float ReadSetting(string setting, float defaultsetting) { return cfg.ReadSetting(setting, defaultsetting); }
+		public short ReadSetting(string setting, short defaultsetting) { return cfg.ReadSetting(setting, defaultsetting); }
+		public long ReadSetting(string setting, long defaultsetting) { return cfg.ReadSetting(setting, defaultsetting); }
+		public bool ReadSetting(string setting, bool defaultsetting) { return cfg.ReadSetting(setting, defaultsetting); }
+		public byte ReadSetting(string setting, byte defaultsetting) { return cfg.ReadSetting(setting, defaultsetting); }
+		public IDictionary ReadSetting(string setting, IDictionary defaultsetting) { return cfg.ReadSetting(setting, defaultsetting); }
+		
+		// This gets a list of things categories
+		internal List<ThingCategory> GetThingCategories()
+		{
+			return new List<ThingCategory>(thingcategories);
+		}
+		
+		// This gets a list of things
+		internal Dictionary<int, ThingTypeInfo> GetThingTypes()
+		{
+			return new Dictionary<int, ThingTypeInfo>(things);
+		}
+		
+		// This checks if an action is generalized or predefined
+		public static bool IsGeneralized(int action, List<GeneralizedCategory> categories)
+		{
+			// Only actions above 0
+			if(action > 0)
+			{
+				// Go for all categories
+				foreach(GeneralizedCategory ac in categories)
+				{
+					// Check if the action is within range of this category
+					if((action >= ac.Offset) && (action < (ac.Offset + ac.Length))) return true;
+				}
+			}
+
+			// Not generalized
+			return false;
+		}
+
+		// This gets the generalized action category from action number
+		public GeneralizedCategory GetGeneralizedActionCategory(int action)
+		{
+			// Only actions above 0
+			if(action > 0)
+			{
+				// Go for all categories
+				foreach(GeneralizedCategory ac in genactioncategories)
+				{
+					// Check if the action is within range of this category
+					if((action >= ac.Offset) && (action < (ac.Offset + ac.Length))) return ac;
+				}
+			}
+
+			// Not generalized
+			return null;
+		}
+
+		//mxd
+		public static bool IsGeneralizedSectorEffect(int effect, IEnumerable<GeneralizedOption> options) 
+		{
+			if(effect == 0) return false;
+			foreach(GeneralizedOption option in options) 
+			{
+				foreach(GeneralizedBit bit in option.Bits) 
+				{
+					if(bit.Index > 0 && (effect & bit.Index) == bit.Index) return true;
+				}
+			}
+
+			return false;
+		}
+
+		//mxd
+		public string GetGeneralizedSectorEffectName(int effect) 
+		{
+			if(effect == 0) return "None";
+			string title = "Unknown";
+			int matches = 0;
+
+			foreach(GeneralizedOption option in geneffectoptions) 
+			{
+				foreach(GeneralizedBit bit in option.Bits) 
+				{
+					if(bit.Index > 0 && (effect & bit.Index) == bit.Index) 
+					{
+						title = option.Name + ": " + bit.Title;
+						matches++;
+						break;
+					}
+				}
+			}
+
+			return (matches > 1 ? "Generalized (" + matches + " effects)" : title);
+		}
+		
+		// This checks if a specific edit mode class is listed
+		public bool IsEditModeSpecified(string classname)
+		{
+			return cfg.SettingExists("editingmodes." + classname.ToString(CultureInfo.InvariantCulture));
+		}
+		
+		// This returns information on a linedef type
+		public LinedefActionInfo GetLinedefActionInfo(int action)
+		{
+			// No action?
+			if(action == 0) return new LinedefActionInfo(0, "None", true, false);
+			
+			// Known type?
+			if(linedefactions.ContainsKey(action)) return linedefactions[action];
+
+			// Generalized action?
+			if(IsGeneralized(action, genactioncategories))
+				return new LinedefActionInfo(action, "Generalized (" + GetGeneralizedActionCategory(action) + ")", true, true);
+
+			// Unknown action...
+			return new LinedefActionInfo(action, "Unknown", false, false);
+		}
+
+		// This returns information on a sector effect
+		public SectorEffectInfo GetSectorEffectInfo(int effect)
+		{
+			// No effect?
+			if(effect == 0) return new SectorEffectInfo(0, "None", true, false);
+			
+			// Known type?
+			if(sectoreffects.ContainsKey(effect)) return sectoreffects[effect];
+	
+			//mxd. Generalized sector effect?
+			if(IsGeneralizedSectorEffect(effect, geneffectoptions))
+				return new SectorEffectInfo(effect, GetGeneralizedSectorEffectName(effect), true, true);
+
+			// Unknown sector effect...
+			return new SectorEffectInfo(effect, "Unknown", false, false);
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Config/GeneralizedBit.cs b/Source/Core/Config/GeneralizedBit.cs
new file mode 100644
index 0000000..1fcb13d
--- /dev/null
+++ b/Source/Core/Config/GeneralizedBit.cs
@@ -0,0 +1,62 @@
+using System;
+
+namespace CodeImp.DoomBuilder.Config
+{
+	/// <summary>
+	/// Option value in generalized types.
+	/// </summary>
+	public class GeneralizedBit : INumberedTitle, IComparable<GeneralizedBit>
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		// Properties
+		private int index;
+		private string title;
+
+		#endregion
+
+		#region ================== Properties
+
+		public int Index { get { return index; } }
+		public string Title { get { return title; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		internal GeneralizedBit(int index, string title)
+		{
+			// Initialize
+			this.index = index;
+			this.title = title;
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This presents the item as string
+		public override string ToString()
+		{
+			return title;
+		}
+
+		// This compares against another
+		public int CompareTo(GeneralizedBit other)
+		{
+			if(this.index < other.index) return -1;
+			else if(this.index > other.index) return 1;
+			else return 0;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Config/GeneralizedCategory.cs b/Source/Core/Config/GeneralizedCategory.cs
new file mode 100644
index 0000000..417db8a
--- /dev/null
+++ b/Source/Core/Config/GeneralizedCategory.cs
@@ -0,0 +1,95 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.IO;
+
+namespace CodeImp.DoomBuilder.Config
+{
+	/// <summary>
+	/// Category of generalized type options.
+	/// </summary>
+	public class GeneralizedCategory
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		// Category properties
+		private string title;
+		private int offset;
+		private int length;
+		private List<GeneralizedOption> options;
+		
+		// Disposing
+		private bool isdisposed;
+
+		#endregion
+
+		#region ================== Properties
+
+		public string Title { get { return title; } }
+		public int Offset { get { return offset; } }
+		public int Length { get { return length; } }
+		public List<GeneralizedOption> Options { get { return options; } }
+		public bool IsDisposed { get { return isdisposed; } }
+		
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		internal GeneralizedCategory(string structure, string name, Configuration cfg)
+		{
+			// Initialize
+			this.options = new List<GeneralizedOption>();
+			
+			// Read properties
+			this.title = cfg.ReadSetting(structure + "." + name + ".title", "");
+			this.offset = cfg.ReadSetting(structure + "." + name + ".offset", 0);
+			this.length = cfg.ReadSetting(structure + "." + name + ".length", 0);
+			
+			// Read the options
+			IDictionary opts = cfg.ReadSetting(structure + "." + name, new Hashtable());
+			foreach(DictionaryEntry de in opts)
+			{
+				// Is this an option and not just some value?
+				if(de.Value is IDictionary)
+				{
+					// Add the option
+					this.options.Add(new GeneralizedOption(structure, name, de.Key.ToString(), (IDictionary)de.Value));
+				}
+			}
+
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Disposer
+		internal void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Clean up
+				options = null;
+				
+				// Done
+				isdisposed = true;
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// String representation
+		public override string ToString()
+		{
+			return title;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Config/GeneralizedOption.cs b/Source/Core/Config/GeneralizedOption.cs
new file mode 100644
index 0000000..3797388
--- /dev/null
+++ b/Source/Core/Config/GeneralizedOption.cs
@@ -0,0 +1,102 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Globalization;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Config
+{
+	/// <summary>
+	/// Option in generalized types.
+	/// </summary>
+	public class GeneralizedOption
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		// Properties
+		private string name;
+		private List<GeneralizedBit> bits;
+		
+		#endregion
+
+		#region ================== Properties
+
+		public string Name { get { return name; } }
+		public List<GeneralizedBit> Bits { get { return bits; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		internal GeneralizedOption(string structure, string cat, string name, IDictionary bitslist)
+		{
+			string fullpath;
+			
+			// Determine path
+			if(cat.Length > 0) fullpath = structure + "." + cat;
+				else fullpath = structure;
+
+			// Initialize
+			this.name = CultureInfo.CurrentCulture.TextInfo.ToTitleCase(name);
+			this.bits = new List<GeneralizedBit>();
+
+			// Go for all bits
+			foreach(DictionaryEntry de in bitslist)
+			{
+				// Check if the item key is numeric
+				int index;
+				if(int.TryParse(de.Key.ToString(), NumberStyles.AllowLeadingWhite | NumberStyles.AllowTrailingWhite, CultureInfo.InvariantCulture, out index))
+				{
+					// Add to list
+					this.bits.Add(new GeneralizedBit(index, de.Value.ToString()));
+				}
+				else
+				{
+					General.ErrorLogger.Add(ErrorType.Warning, "Structure '" + fullpath + "." + name + "' contains invalid entries. The keys must be numeric.");
+				}
+			}
+			
+			// Sort the list
+			bits.Sort();
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This presents the item as string
+		public override string ToString()
+		{
+			return name;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Config/IFilledTextureSet.cs b/Source/Core/Config/IFilledTextureSet.cs
new file mode 100644
index 0000000..202a6d3
--- /dev/null
+++ b/Source/Core/Config/IFilledTextureSet.cs
@@ -0,0 +1,34 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Data;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Config
+{
+	internal interface IFilledTextureSet
+	{
+		// Properties
+		string Name { get; }
+		int Level { get; } //mxd
+		ICollection<ImageData> Textures { get; }
+		ICollection<ImageData> Flats { get; }
+	}
+}
diff --git a/Source/Core/Config/INumberedTitle.cs b/Source/Core/Config/INumberedTitle.cs
new file mode 100644
index 0000000..e4f4d4a
--- /dev/null
+++ b/Source/Core/Config/INumberedTitle.cs
@@ -0,0 +1,29 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Config
+{
+	public interface INumberedTitle
+	{
+		// Properties
+		int Index { get; }
+		string Title { get; }
+	}
+}
diff --git a/Source/Core/Config/LinedefActionCategory.cs b/Source/Core/Config/LinedefActionCategory.cs
new file mode 100644
index 0000000..eae6889
--- /dev/null
+++ b/Source/Core/Config/LinedefActionCategory.cs
@@ -0,0 +1,108 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Config
+{
+	public class LinedefActionCategory : IComparable<LinedefActionCategory>
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		// Category properties
+		private string name;
+		private string title;
+
+		// Actions
+		private List<LinedefActionInfo> actions;
+
+		// Disposing
+		private bool isdisposed;
+
+		#endregion
+
+		#region ================== Properties
+
+		public string Name { get { return name; } }
+		public string Title { get { return title; } }
+		public List<LinedefActionInfo> Actions { get { return actions; } }
+		public bool IsDisposed { get { return isdisposed; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		internal LinedefActionCategory(string name, string title)
+		{
+			// Initialize
+			this.name = name;
+			this.title = title;
+			this.actions = new List<LinedefActionInfo>();
+
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Disposer
+		internal void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Clean up
+				actions = null;
+				
+				// Done
+				isdisposed = true;
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This adds an action to this category
+		internal void Add(LinedefActionInfo a)
+		{
+			// Make it so.
+			actions.Add(a);
+		}
+
+		// This compares against another action category
+		public int CompareTo(LinedefActionCategory other)
+		{
+			return string.Compare(this.name, other.name);
+		}
+		
+		// String representation
+		public override string ToString()
+		{
+			return title;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Config/LinedefActionInfo.cs b/Source/Core/Config/LinedefActionInfo.cs
new file mode 100644
index 0000000..64b2116
--- /dev/null
+++ b/Source/Core/Config/LinedefActionInfo.cs
@@ -0,0 +1,130 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using CodeImp.DoomBuilder.IO;
+using CodeImp.DoomBuilder.Map;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Config
+{
+	public class LinedefActionInfo : INumberedTitle, IComparable<LinedefActionInfo>
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		// Properties
+		private readonly int index;
+		private readonly string prefix;
+		private readonly string category;
+		private readonly string name;
+		private readonly string title;
+		private readonly string id; //mxd. wiki-compatible name 
+		private readonly ArgumentInfo[] args;
+		private readonly bool isgeneralized;
+		private readonly bool isknown;
+		private readonly bool requiresactivation; //mxd
+		
+		#endregion
+
+		#region ================== Properties
+
+		public int Index { get { return index; } }
+		public string Prefix { get { return prefix; } }
+		public string Category { get { return category; } }
+		public string Name { get { return name; } }
+		public string Title { get { return title; } }
+		public string Id { get { return id; } } //mxd
+		public bool IsGeneralized { get { return isgeneralized; } }
+		public bool IsKnown { get { return isknown; } }
+		public bool IsNull { get { return (index == 0); } }
+		public bool RequiresActivation { get { return requiresactivation; } } //mxd
+		public ArgumentInfo[] Args { get { return args; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		internal LinedefActionInfo(int index, Configuration cfg, string categoryname, IDictionary<string, EnumList> enums)
+		{
+			string actionsetting = "linedeftypes." + categoryname + "." + index.ToString(CultureInfo.InvariantCulture);
+			
+			// Initialize
+			this.index = index;
+			this.category = categoryname;
+			this.args = new ArgumentInfo[Linedef.NUM_ARGS];
+			this.isgeneralized = false;
+			this.isknown = true;
+			
+			// Read settings
+			this.name = cfg.ReadSetting(actionsetting + ".title", "Unnamed");
+			this.id = cfg.ReadSetting(actionsetting + ".id", string.Empty); //mxd
+			this.prefix = cfg.ReadSetting(actionsetting + ".prefix", "");
+			this.requiresactivation = cfg.ReadSetting(actionsetting + ".requiresactivation", true); //mxd
+			this.title = this.prefix + " " + this.name;
+			this.title = this.title.Trim();
+
+			// Read the args
+			for(int i = 0; i < Linedef.NUM_ARGS; i++)
+				this.args[i] = new ArgumentInfo(cfg, actionsetting, i, enums);
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+		
+		// Constructor for generalized type display
+		internal LinedefActionInfo(int index, string title, bool isknown, bool isgeneralized)
+		{
+			this.index = index;
+			this.isgeneralized = isgeneralized;
+			this.isknown = isknown;
+			this.requiresactivation = true; //mxd. Unused, set for consistency sake.
+			this.title = title;
+			this.args = new ArgumentInfo[Linedef.NUM_ARGS];
+			for(int i = 0; i < Linedef.NUM_ARGS; i++)
+				this.args[i] = new ArgumentInfo(i);
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This presents the item as string
+		public override string ToString()
+		{
+			return index + " - " + title;
+		}
+
+		// This compares against another action info
+		public int CompareTo(LinedefActionInfo other)
+		{
+			if(this.index < other.index) return -1;
+			else if(this.index > other.index) return 1;
+			else return 0;
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Config/LinedefActivateInfo.cs b/Source/Core/Config/LinedefActivateInfo.cs
new file mode 100644
index 0000000..7a66dfe
--- /dev/null
+++ b/Source/Core/Config/LinedefActivateInfo.cs
@@ -0,0 +1,84 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Config
+{
+	public class LinedefActivateInfo : IComparable<LinedefActivateInfo>
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		// Properties
+		private int intkey;
+		private string key;
+		private string title;
+		
+		#endregion
+
+		#region ================== Properties
+
+		public int Index { get { return intkey; } }
+		public string Key { get { return key; } }
+		public string Title { get { return title; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		internal LinedefActivateInfo(string key, string title)
+		{
+			// Initialize
+			this.key = key;
+			this.title = title;
+			
+			// Try parsing key as int for comparison
+			if(!int.TryParse(key, out intkey)) intkey = 0;
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This presents the item as string
+		public override string ToString()
+		{
+			return title;
+		}
+
+		// This compares against another activate info
+		public int CompareTo(LinedefActivateInfo other)
+		{
+			if(this.intkey < other.intkey) return -1;
+			else if(this.intkey > other.intkey) return 1;
+			else return 0;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Config/MapLumpInfo.cs b/Source/Core/Config/MapLumpInfo.cs
new file mode 100644
index 0000000..efecc10
--- /dev/null
+++ b/Source/Core/Config/MapLumpInfo.cs
@@ -0,0 +1,65 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using CodeImp.DoomBuilder.IO;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Config
+{
+	public struct MapLumpInfo
+	{
+		// Members
+		public readonly string Name;
+		public readonly bool Required;
+		public readonly bool BlindCopy;
+		public readonly bool NodeBuild;
+		public readonly bool AllowEmpty;
+		public readonly bool ScriptBuild; //mxd
+		internal readonly ScriptConfiguration Script;
+		
+		// Construct from IDictionary
+		internal MapLumpInfo(string name, Configuration cfg)
+		{
+			// Apply settings
+			this.Name = name;
+			this.Script = null;
+			this.Required = cfg.ReadSetting("maplumpnames." + name + ".required", false);
+			this.BlindCopy = cfg.ReadSetting("maplumpnames." + name + ".blindcopy", false);
+			this.NodeBuild = cfg.ReadSetting("maplumpnames." + name + ".nodebuild", false);
+			this.AllowEmpty = cfg.ReadSetting("maplumpnames." + name + ".allowempty", false);
+			this.ScriptBuild = cfg.ReadSetting("maplumpnames." + name + ".scriptbuild", false); //mxd
+			string scriptconfig = cfg.ReadSetting("maplumpnames." + name + ".script", "");
+			
+			// Find script configuration
+			if(scriptconfig.Length > 0)
+			{
+				if(General.ScriptConfigs.ContainsKey(scriptconfig.ToLowerInvariant()))
+				{
+					this.Script = General.ScriptConfigs[scriptconfig.ToLowerInvariant()];
+				}
+				else
+				{
+					General.ErrorLogger.Add(ErrorType.Warning, "Map lump '" + name + "' in the current game configuration specifies an unknown script configuration '" + scriptconfig + "'. Using plain text instead.");
+					this.Script = new ScriptConfiguration();
+				}
+			}
+		}
+	}
+}
+
diff --git a/Source/Core/Config/MatchingTextureSet.cs b/Source/Core/Config/MatchingTextureSet.cs
new file mode 100644
index 0000000..b999c40
--- /dev/null
+++ b/Source/Core/Config/MatchingTextureSet.cs
@@ -0,0 +1,194 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using CodeImp.DoomBuilder.Data;
+using System.Text.RegularExpressions;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Config
+{
+	public sealed class MatchingTextureSet : TextureSet, IFilledTextureSet, IComparable<MatchingTextureSet>
+	{
+		#region ================== Variables
+		
+		// Never stored, only used at run-time
+		private Regex regex;
+		
+		// Matching textures and flats
+		private List<ImageData> textures;
+		private List<ImageData> flats;
+		
+		#endregion
+
+		#region ================== Properties
+
+		public ICollection<ImageData> Textures { get { return textures; } }
+		public ICollection<ImageData> Flats { get { return flats; } } //mxd
+
+		#endregion
+		
+		#region ================== Constructor / Destructor
+		
+		// New texture set for quick matching
+		public MatchingTextureSet(ICollection<string> filters)
+		{
+			this.filters = new List<string>(filters);
+			
+			// Setup
+			Setup();
+		}
+		
+		// Texture set from defined set
+		internal MatchingTextureSet(DefinedTextureSet definedset)
+		{
+			// Copy the name
+			this.name = definedset.Name;
+			
+			// Copy the filters
+			this.filters = new List<string>(definedset.Filters);
+			
+			// Setup
+			Setup();
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+		
+		// This sets up the object
+		private void Setup()
+		{
+			// Make the regex string that handles all filters
+			StringBuilder regexstr = new StringBuilder("");
+			foreach(string s in this.filters)
+			{
+				// Make sure filter is in uppercase
+				string ss = s.ToUpperInvariant();
+
+				// Escape regex characters
+				ss = ss.Replace("+", "\\+");
+				ss = ss.Replace("\\", "\\\\");
+				ss = ss.Replace("|", "\\|");
+				ss = ss.Replace("{", "\\{");
+				ss = ss.Replace("[", "\\[");
+				ss = ss.Replace("(", "\\(");
+				ss = ss.Replace(")", "\\)");
+				ss = ss.Replace("^", "\\^");
+				ss = ss.Replace("$", "\\$");
+				ss = ss.Replace(".", "\\.");
+				ss = ss.Replace("#", "\\#");
+				ss = ss.Replace(" ", "\\ ");
+
+				// Replace the ? with the regex code for single character
+				ss = ss.Replace("?", ".");
+
+				// Replace the * with the regex code for optional multiple characters
+				ss = ss.Replace("*", ".*?");
+
+				// When a filter has already added, insert a conditional OR operator
+				if(regexstr.Length > 0) regexstr.Append("|");
+
+				// Open group without backreferencing
+				regexstr.Append("(?:");
+
+				// Must be start of string
+				regexstr.Append("\\A");
+
+				// Add the filter
+				regexstr.Append(ss);
+
+				// Must be end of string
+				regexstr.Append("\\Z");
+
+				// Close group
+				regexstr.Append(")");
+			}
+
+			// No filters added? Then make a never-matching regex
+			if(this.filters.Count == 0) regexstr.Append("\\Z\\A");
+			
+			// Make the regex
+			regex = new Regex(regexstr.ToString(), RegexOptions.Compiled |
+												   RegexOptions.CultureInvariant);
+
+			// Initialize collections
+			textures = new List<ImageData>();
+			flats = new List<ImageData>();
+		}
+		
+		// This matches a name against the regex and adds a texture to
+		// the list if it matches. Returns true when matched and added.
+		internal bool AddTexture(ImageData image)
+		{
+			// Check against regex
+			if(regex.IsMatch(image.Name.ToUpperInvariant()))
+			{
+				// Matches! Add it.
+				textures.Add(image);
+				return true;
+			}
+			else
+			{
+				// Doesn't match
+				return false;
+			}
+		}
+
+		// This matches a name against the regex and adds a flat to
+		// the list if it matches. Returns true when matched and added.
+		internal bool AddFlat(ImageData image)
+		{
+			// Check against regex
+			if(regex.IsMatch(image.Name.ToUpperInvariant()))
+			{
+				// Matches! Add it.
+				flats.Add(image);
+				return true;
+			}
+			else
+			{
+				// Doesn't match
+				return false;
+			}
+		}
+		
+		// This only checks if the given image is a match
+		internal bool IsMatch(ImageData image)
+		{
+			return regex.IsMatch(image.Name.ToUpperInvariant());
+		}
+
+		// This only checks if the given texture name is a match (mxd)
+		public bool IsMatch(string texturename) 
+		{
+			return regex.IsMatch(texturename.ToUpperInvariant());
+		}
+
+		// This compares it for sorting
+		public int CompareTo(MatchingTextureSet other)
+		{
+			return string.Compare(this.name, other.name);
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Config/ModelAndLightRenderModes.cs b/Source/Core/Config/ModelAndLightRenderModes.cs
new file mode 100644
index 0000000..36a56af
--- /dev/null
+++ b/Source/Core/Config/ModelAndLightRenderModes.cs
@@ -0,0 +1,17 @@
+namespace CodeImp.DoomBuilder.Config
+{
+	public enum ModelRenderMode
+	{
+		NONE,
+		SELECTION,
+		ACTIVE_THINGS_FILTER,
+		ALL,
+	}
+
+	public enum LightRenderMode
+	{
+		NONE,
+		ALL,
+		ALL_ANIMATED,
+	}
+}
diff --git a/Source/Core/Config/NodebuilderInfo.cs b/Source/Core/Config/NodebuilderInfo.cs
new file mode 100644
index 0000000..8dcb20d
--- /dev/null
+++ b/Source/Core/Config/NodebuilderInfo.cs
@@ -0,0 +1,122 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using CodeImp.DoomBuilder.IO;
+using CodeImp.DoomBuilder.Compilers;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Config
+{
+	internal class NodebuilderInfo : IComparable<NodebuilderInfo>
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		private readonly string name;
+		private readonly string title;
+		private readonly CompilerInfo compiler;
+		private readonly string parameters;
+		private readonly bool specialoutputfile;
+		
+		#endregion
+
+		#region ================== Properties
+
+		public string Name { get { return name; } }
+		public string Title { get { return title; } }
+		public CompilerInfo Compiler { get { return compiler; } }
+		public string Parameters { get { return parameters; } }
+		public bool HasSpecialOutputFile { get { return specialoutputfile; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public NodebuilderInfo(string filename, string name, Configuration cfg)
+		{
+			General.WriteLogLine("Registered nodebuilder configuration '" + name + "' from '" + filename + "'");
+			
+			// Initialize
+			this.name = name;
+			this.compiler = null;
+			this.title = cfg.ReadSetting("nodebuilders." + name + ".title", "<untitled configuration>");
+			string compilername = cfg.ReadSetting("nodebuilders." + name + ".compiler", "");
+			this.parameters = cfg.ReadSetting("nodebuilders." + name + ".parameters", "");
+			
+			// Check for special output filename
+			this.specialoutputfile = this.parameters.Contains("%FO");
+			
+			// Find compiler
+			foreach(CompilerInfo c in General.Compilers)
+			{
+				// Compiler name matches?
+				if(c.Name == compilername)
+				{
+					// Apply compiler
+					this.compiler = c;
+					break;
+				}
+			}
+			
+			// No compiler found?
+			if(this.compiler == null) throw new Exception("No such compiler defined: '" + compilername + "'");
+		}
+
+		// Constructor for "none" nodebuilder
+		public NodebuilderInfo()
+		{
+			// Initialize
+			this.name = "";
+			this.compiler = null;
+			this.title = "[do not build nodes]";
+			this.parameters = "";
+			this.specialoutputfile = false;
+		}
+		
+		#endregion
+
+		#region ================== Methods
+
+		// This compares it to other ConfigurationInfo objects
+		public int CompareTo(NodebuilderInfo other)
+		{
+			// Compare
+			return String.Compare(name, other.name, StringComparison.Ordinal);
+		}
+		
+		// String representation
+		public override string ToString()
+		{
+			return title;
+		}
+		
+		// This runs the nodebuilder
+		public Compiler CreateCompiler()
+		{
+			return compiler.Create();
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Config/PasteOptions.cs b/Source/Core/Config/PasteOptions.cs
new file mode 100644
index 0000000..d1d63b6
--- /dev/null
+++ b/Source/Core/Config/PasteOptions.cs
@@ -0,0 +1,94 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using CodeImp.DoomBuilder.IO;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Config
+{
+	public class PasteOptions
+	{
+		#region ================== Constants
+		
+		public const int TAGS_KEEP = 0;
+		public const int TAGS_RENUMBER = 1;
+		public const int TAGS_REMOVE = 2;
+		
+		#endregion
+		
+		#region ================== Variables
+		
+		private int changetags;				// See TAGS_ constants
+		private bool removeactions;
+		private bool adjustheights;
+		
+		#endregion
+		
+		#region ================== Properties
+		
+		public int ChangeTags { get { return changetags; } set { changetags = value; } }
+		public bool RemoveActions { get { return removeactions; } set { removeactions = value; } }
+		public bool AdjustHeights { get { return adjustheights; } set { adjustheights = value; } }
+		
+		#endregion
+		
+		#region ================== Constructor / Disposer
+		
+		// Constructor
+		public PasteOptions()
+		{
+		}
+		
+		// Copy Constructor
+		public PasteOptions(PasteOptions p)
+		{
+			this.changetags = p.changetags;
+			this.removeactions = p.removeactions;
+			this.adjustheights = p.adjustheights;
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+		
+		// Make a copy
+		public PasteOptions Copy()
+		{
+			return new PasteOptions(this);
+		}
+		
+		// This reads from configuration
+		internal void ReadConfiguration(Configuration cfg, string path)
+		{
+			changetags = cfg.ReadSetting(path + ".changetags", 0);
+			removeactions = cfg.ReadSetting(path + ".removeactions", false);
+			adjustheights = cfg.ReadSetting(path + ".adjustheights", true);
+		}
+		
+		// This writes to configuration
+		internal void WriteConfiguration(Configuration cfg, string path)
+		{
+			cfg.WriteSetting(path + ".changetags", changetags);
+			cfg.WriteSetting(path + ".removeactions", removeactions);
+			cfg.WriteSetting(path + ".adjustheights", adjustheights);
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Config/ProgramConfiguration.cs b/Source/Core/Config/ProgramConfiguration.cs
new file mode 100644
index 0000000..a49c560
--- /dev/null
+++ b/Source/Core/Config/ProgramConfiguration.cs
@@ -0,0 +1,755 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.IO;
+using System.IO;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Map;
+using System.Reflection;
+using CodeImp.DoomBuilder.Plugins;
+using CodeImp.DoomBuilder.Rendering;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Config
+{
+	public class ProgramConfiguration
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		// Original configuration
+		private Configuration cfg;
+		
+		// Cached variables
+		private bool blackbrowsers;
+		private bool capitalizetexturenames; //mxd
+		private int visualfov;
+		private float visualmousesensx;
+		private float visualmousesensy;
+		private int imagebrightness;
+		private float doublesidedalpha;
+		private byte doublesidedalphabyte;
+		private float backgroundalpha;
+		private bool qualitydisplay;
+		private bool testmonsters;
+		private int defaultviewmode;
+		private bool classicbilinear;
+		private bool visualbilinear;
+		private int mousespeed;
+		private int movespeed;
+		private float viewdistance;
+		private bool invertyaxis;
+		private string scriptfontname;
+		private int scriptfontsize;
+		private bool scriptfontbold;
+		private bool scriptontop;
+		private bool scriptautoindent;
+		private bool snippetsallmanstyle; //mxd
+		private string screenshotspath; //mxd
+		private int scripttabwidth;
+		private int previewimagesize;
+		private int autoscrollspeed;
+		private int zoomfactor;
+		private bool showerrorswindow;
+		private bool animatevisualselection;
+		private int previousversion;
+		private PasteOptions pasteoptions;
+		private int dockersposition;
+		private bool collapsedockers;
+		private int dockerswidth;
+		private bool toolbarscript;
+		private bool toolbarundo;
+		private bool toolbarcopy;
+		private bool toolbarprefabs;
+		private bool toolbarfilter;
+		private bool toolbarviewmodes;
+		private bool toolbargeometry;
+		private bool toolbartesting;
+		private bool toolbarfile;
+		private float filteranisotropy;
+		private bool showtexturesizes;
+		private bool locatetexturegroup; //mxd
+		private SplitLineBehavior splitlinebehavior;	//mxd
+
+		//mxd
+		private ModelRenderMode gzDrawModelsMode;
+		private LightRenderMode gzDrawLightsMode;
+		private bool gzDrawFog;
+		private bool gzToolbarGZDoom;
+		private bool gzSynchCameras;
+		private bool gzShowEventLines;
+		private bool gzOldHighlightMode;
+		private int gzMaxDynamicLights;
+		private float gzDynamicLightRadius;
+		private float gzDynamicLightIntensity;
+		private bool gzStretchView;
+		private float gzVertexScale2D;
+		private bool gzShowVisualVertices;
+		private float gzVertexScale3D;
+		private string lastUsedConfigName;
+		private string lastUsedMapFolder;
+		private bool gzMarkExtraFloors;
+		private int maxRecentFiles;
+		private bool autoClearSideTextures;
+		private bool storeSelectedEditTab;
+		private bool checkforupdates;
+		private bool rendercomments;
+		private bool rendergrid;
+		private bool dynamicgridsize;
+		private int ignoredremoterevision;
+		
+		// These are not stored in the configuration, only used at runtime
+		private int defaultbrightness;
+		private int defaultfloorheight;
+		private int defaultceilheight;
+		private int defaultthingtype = 1;
+		private float defaultthingangle;
+		private List<string> defaultthingflags;
+		
+		#endregion
+
+		#region ================== Properties
+
+		internal Configuration Config { get { return cfg; } }
+		public bool BlackBrowsers { get { return blackbrowsers; } internal set { blackbrowsers = value; } }
+		public bool CapitalizeTextureNames { get { return capitalizetexturenames; } internal set { capitalizetexturenames = value; } } //mxd
+		public int VisualFOV { get { return visualfov; } internal set { visualfov = value; } }
+		public int ImageBrightness { get { return imagebrightness; } internal set { imagebrightness = value; } }
+		public float DoubleSidedAlpha { get { return doublesidedalpha; } internal set { doublesidedalpha = value; doublesidedalphabyte = (byte)(doublesidedalpha * 255f); } }
+		public byte DoubleSidedAlphaByte { get { return doublesidedalphabyte; } }
+		public float BackgroundAlpha { get { return backgroundalpha; } internal set { backgroundalpha = value; } }
+		public float VisualMouseSensX { get { return visualmousesensx; } internal set { visualmousesensx = value; } }
+		public float VisualMouseSensY { get { return visualmousesensy; } internal set { visualmousesensy = value; } }
+		public bool QualityDisplay { get { return qualitydisplay; } internal set { qualitydisplay = value; } }
+		public bool TestMonsters { get { return testmonsters; } internal set { testmonsters = value; } }
+		public int DefaultViewMode { get { return defaultviewmode; } internal set { defaultviewmode = value; } }
+		public bool ClassicBilinear { get { return classicbilinear; } internal set { classicbilinear = value; } }
+		public bool VisualBilinear { get { return visualbilinear; } internal set { visualbilinear = value; } }
+		public int MouseSpeed { get { return mousespeed; } internal set { mousespeed = value; } }
+		public int MoveSpeed { get { return movespeed; } internal set { movespeed = value; } }
+		public float ViewDistance { get { return viewdistance; } internal set { viewdistance = value; } }
+		public bool InvertYAxis { get { return invertyaxis; } internal set { invertyaxis = value; } }
+		public string ScriptFontName { get { return scriptfontname; } internal set { scriptfontname = value; } }
+		public int ScriptFontSize { get { return scriptfontsize; } internal set { scriptfontsize = value; } }
+		public bool ScriptFontBold { get { return scriptfontbold; } internal set { scriptfontbold = value; } }
+		public bool ScriptOnTop { get { return scriptontop; } internal set { scriptontop = value; } }
+		public int PreviewImageSize { get { return previewimagesize; } internal set { previewimagesize = value; } }
+		public int AutoScrollSpeed { get { return autoscrollspeed; } internal set { autoscrollspeed = value; } }
+		public int ZoomFactor { get { return zoomfactor; } internal set { zoomfactor = value; } }
+		public bool ShowErrorsWindow { get { return showerrorswindow; } internal set { showerrorswindow = value; } }
+		public bool AnimateVisualSelection { get { return animatevisualselection; } internal set { animatevisualselection = value; } }
+		public int ScriptTabWidth { get { return scripttabwidth; } internal set { scripttabwidth = value; } }
+		public bool ScriptAutoIndent { get { return scriptautoindent; } internal set { scriptautoindent = value; } }
+		public bool SnippetsAllmanStyle { get { return snippetsallmanstyle; } internal set { snippetsallmanstyle = value; } } //mxd
+		internal string ScreenshotsPath { get { return screenshotspath; } set { screenshotspath = value; } } //mxd
+		internal int PreviousVersion { get { return previousversion; } }
+		internal PasteOptions PasteOptions { get { return pasteoptions; } set { pasteoptions = value; } }
+		public int DockersPosition { get { return dockersposition; } internal set { dockersposition = value; } }
+		public bool CollapseDockers { get { return collapsedockers; } internal set { collapsedockers = value; } }
+		public int DockersWidth { get { return dockerswidth; } internal set { dockerswidth = value; } }
+		public bool ToolbarScript { get { return toolbarscript; } internal set { toolbarscript = value; } }
+		public bool ToolbarUndo { get { return toolbarundo; } internal set { toolbarundo = value; } }
+		public bool ToolbarCopy { get { return toolbarcopy; } internal set { toolbarcopy = value; } }
+		public bool ToolbarPrefabs { get { return toolbarprefabs; } internal set { toolbarprefabs = value; } }
+		public bool ToolbarFilter { get { return toolbarfilter; } internal set { toolbarfilter = value; } }
+		public bool ToolbarViewModes { get { return toolbarviewmodes; } internal set { toolbarviewmodes = value; } }
+		public bool ToolbarGeometry { get { return toolbargeometry; } internal set { toolbargeometry = value; } }
+		public bool ToolbarTesting { get { return toolbartesting; } internal set { toolbartesting = value; } }
+		public bool ToolbarFile { get { return toolbarfile; } internal set { toolbarfile = value; } }
+		public float FilterAnisotropy { get { return filteranisotropy; } internal set { filteranisotropy = value; } }
+		public bool ShowTextureSizes { get { return showtexturesizes; } internal set { showtexturesizes = value; } }
+		public bool LocateTextureGroup { get { return locatetexturegroup; } internal set { locatetexturegroup = value; } } //mxd
+		public SplitLineBehavior SplitLineBehavior { get { return splitlinebehavior; } set { splitlinebehavior = value; } } //mxd
+
+		//mxd 
+		public ModelRenderMode GZDrawModelsMode { get { return gzDrawModelsMode; } internal set { gzDrawModelsMode = value; } }
+		public LightRenderMode GZDrawLightsMode { get { return gzDrawLightsMode; } internal set { gzDrawLightsMode = value; } }
+		public bool GZDrawFog { get { return gzDrawFog; } internal set { gzDrawFog = value; } }
+		public bool GZToolbarGZDoom { get { return gzToolbarGZDoom; } internal set { gzToolbarGZDoom = value; } }
+		public bool GZSynchCameras { get { return gzSynchCameras; } internal set { gzSynchCameras = value; } }
+		public bool GZShowEventLines { get { return gzShowEventLines; } internal set { gzShowEventLines = value; } }
+		public bool GZOldHighlightMode { get { return gzOldHighlightMode; } internal set { gzOldHighlightMode = value; } }
+		public int GZMaxDynamicLights { get { return gzMaxDynamicLights; } internal set { gzMaxDynamicLights = value; } }
+		public float GZDynamicLightRadius { get { return gzDynamicLightRadius; } internal set { gzDynamicLightRadius = value; } }
+		public float GZDynamicLightIntensity { get { return gzDynamicLightIntensity; } internal set { gzDynamicLightIntensity = value; } }
+		public bool GZStretchView { get { return gzStretchView; } internal set { gzStretchView = value; } }
+		public float GZVertexScale2D { get { return gzVertexScale2D; } internal set { gzVertexScale2D = value; } }
+		public bool GZShowVisualVertices { get { return gzShowVisualVertices; } internal set { gzShowVisualVertices = value; } }
+		public float GZVertexScale3D { get { return gzVertexScale3D; } internal set { gzVertexScale3D = value; } }
+		public string LastUsedConfigName { get { return lastUsedConfigName; } internal set { lastUsedConfigName = value; } }
+		public string LastUsedMapFolder { get { return lastUsedMapFolder; } internal set { lastUsedMapFolder = value; } }
+		public bool GZMarkExtraFloors { get { return gzMarkExtraFloors; } internal set { gzMarkExtraFloors = value; } }
+		public int MaxRecentFiles { get { return maxRecentFiles; } internal set { maxRecentFiles = General.Clamp(value, 8, 25); } }
+		public bool AutoClearSidedefTextures { get { return autoClearSideTextures; } internal set { autoClearSideTextures = value; } }
+		public bool StoreSelectedEditTab { get { return storeSelectedEditTab; } internal set { storeSelectedEditTab = value; } }
+		internal bool CheckForUpdates { get { return checkforupdates; } set { checkforupdates = value; } } //mxd
+		public bool RenderComments { get { return rendercomments; } internal set { rendercomments = value; } } //mxd
+		public bool RenderGrid { get { return rendergrid; } internal set { rendergrid = value; } } //mxd
+		public bool DynamicGridSize { get { return dynamicgridsize; } internal set { dynamicgridsize = value; } } //mxd
+		internal int IgnoredRemoteRevision { get { return ignoredremoterevision; } set { ignoredremoterevision = value; } } //mxd
+
+		//mxd. Left here for compatibility reasons...
+		public string DefaultTexture { get { return General.Map != null ? General.Map.Options.DefaultWallTexture : "-"; } set { if(General.Map != null) General.Map.Options.DefaultWallTexture = value; } }
+		public string DefaultFloorTexture { get { return General.Map != null ? General.Map.Options.DefaultFloorTexture : "-"; } set { if(General.Map != null) General.Map.Options.DefaultFloorTexture = value; } }
+		public string DefaultCeilingTexture { get { return General.Map != null ? General.Map.Options.DefaultCeilingTexture : "-"; } set { if(General.Map != null) General.Map.Options.DefaultCeilingTexture = value; } }
+		public int DefaultBrightness { get { return defaultbrightness; } set { defaultbrightness = value; } }
+		public int DefaultFloorHeight { get { return defaultfloorheight; } set { defaultfloorheight = value; } }
+		public int DefaultCeilingHeight { get { return defaultceilheight; } set { defaultceilheight = value; } }
+
+		public int DefaultThingType { get { return defaultthingtype; } set { defaultthingtype = value; } }
+		public float DefaultThingAngle { get { return defaultthingangle; } set { defaultthingangle = value; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		internal ProgramConfiguration()
+		{
+			// We have no destructor
+			GC.SuppressFinalize(this);
+			defaultthingflags = new List<string>();
+			pasteoptions = new PasteOptions();
+		}
+
+		#endregion
+
+		#region ================== Loading / Saving
+
+		// This loads the program configuration
+		internal bool Load(string cfgfilepathname, string defaultfilepathname)
+		{
+			// First parse it
+			if(Read(cfgfilepathname, defaultfilepathname))
+			{
+				// Read the cache variables
+				blackbrowsers = cfg.ReadSetting("blackbrowsers", false);
+				capitalizetexturenames = cfg.ReadSetting("capitalizetexturenames", true); //mxd
+				//undolevels = cfg.ReadSetting("undolevels", 20);
+				visualfov = cfg.ReadSetting("visualfov", 80);
+				visualmousesensx = cfg.ReadSetting("visualmousesensx", 40f);
+				visualmousesensy = cfg.ReadSetting("visualmousesensy", 40f);
+				imagebrightness = cfg.ReadSetting("imagebrightness", 3);
+				doublesidedalpha = cfg.ReadSetting("doublesidedalpha", 0.4f);
+				doublesidedalphabyte = (byte)(doublesidedalpha * 255f);
+				backgroundalpha = cfg.ReadSetting("backgroundalpha", 1.0f);
+				qualitydisplay = cfg.ReadSetting("qualitydisplay", true);
+				testmonsters = cfg.ReadSetting("testmonsters", true);
+				defaultviewmode = cfg.ReadSetting("defaultviewmode", (int)ViewMode.Normal);
+				classicbilinear = cfg.ReadSetting("classicbilinear", false);
+				visualbilinear = cfg.ReadSetting("visualbilinear", false);
+				mousespeed = cfg.ReadSetting("mousespeed", 100);
+				movespeed = cfg.ReadSetting("movespeed", 100);
+				viewdistance = cfg.ReadSetting("viewdistance", 3000.0f);
+				invertyaxis = cfg.ReadSetting("invertyaxis", false);
+				scriptfontname = cfg.ReadSetting("scriptfontname", "Lucida Console");
+				scriptfontsize = cfg.ReadSetting("scriptfontsize", 10);
+				scriptfontbold = cfg.ReadSetting("scriptfontbold", false);
+				scriptautoindent = cfg.ReadSetting("scriptautoindent", true);
+				snippetsallmanstyle = cfg.ReadSetting("snippetsallmanstyle", false); //mxd
+				screenshotspath = cfg.ReadSetting("screenshotspath", General.DefaultScreenshotsPath); //mxd
+				scriptontop = cfg.ReadSetting("scriptontop", true);
+				scripttabwidth = cfg.ReadSetting("scripttabwidth", 4);
+				previewimagesize = cfg.ReadSetting("previewimagesize", 1);
+				autoscrollspeed = cfg.ReadSetting("autoscrollspeed", 0);
+				zoomfactor = cfg.ReadSetting("zoomfactor", 3);
+				showerrorswindow = cfg.ReadSetting("showerrorswindow", true);
+				animatevisualselection = cfg.ReadSetting("animatevisualselection", true);
+				previousversion = cfg.ReadSetting("currentversion", 0);
+				dockersposition = cfg.ReadSetting("dockersposition", 1);
+				collapsedockers = cfg.ReadSetting("collapsedockers", true);
+				dockerswidth = cfg.ReadSetting("dockerswidth", 300);
+				pasteoptions.ReadConfiguration(cfg, "pasteoptions");
+				toolbarscript = cfg.ReadSetting("toolbarscript", true);
+				toolbarundo = cfg.ReadSetting("toolbarundo", true);
+				toolbarcopy = cfg.ReadSetting("toolbarcopy", true);
+				toolbarprefabs = cfg.ReadSetting("toolbarprefabs", true);
+				toolbarfilter = cfg.ReadSetting("toolbarfilter", true);
+				toolbarviewmodes = cfg.ReadSetting("toolbarviewmodes", true);
+				toolbargeometry = cfg.ReadSetting("toolbargeometry", true);
+				toolbartesting = cfg.ReadSetting("toolbartesting", true);
+				toolbarfile = cfg.ReadSetting("toolbarfile", true);
+				filteranisotropy = cfg.ReadSetting("filteranisotropy", 8.0f);
+				showtexturesizes = cfg.ReadSetting("showtexturesizes", true);
+				locatetexturegroup = cfg.ReadSetting("locatetexturegroup", true); //mxd
+				splitlinebehavior = (SplitLineBehavior) General.Clamp(cfg.ReadSetting("splitlinebehavior", 0), 0, 3); //mxd
+
+				//mxd 
+				gzDrawModelsMode = (ModelRenderMode)cfg.ReadSetting("gzdrawmodels", (int)ModelRenderMode.ALL);
+				gzDrawLightsMode = (LightRenderMode)cfg.ReadSetting("gzdrawlights", (int)LightRenderMode.ALL);
+				gzDrawFog = cfg.ReadSetting("gzdrawfog", false);
+				gzToolbarGZDoom = cfg.ReadSetting("gztoolbargzdoom", true);
+				gzSynchCameras = cfg.ReadSetting("gzsynchcameras", true);
+				gzShowEventLines = cfg.ReadSetting("gzshoweventlines", true);
+				gzOldHighlightMode = cfg.ReadSetting("gzoldhighlightmode", false);
+				gzMaxDynamicLights = cfg.ReadSetting("gzmaxdynamiclights", 16);
+				gzDynamicLightRadius = cfg.ReadSetting("gzdynamiclightradius", 1.0f);
+				gzDynamicLightIntensity = cfg.ReadSetting("gzdynamiclightintensity", 1.0f);
+				gzStretchView = cfg.ReadSetting("gzstretchview", true);
+				gzVertexScale2D = cfg.ReadSetting("gzvertexscale2d", 1.0f);
+				gzShowVisualVertices = cfg.ReadSetting("gzshowvisualvertices", true);
+				gzVertexScale3D = cfg.ReadSetting("gzvertexscale3d", 1.0f);
+				lastUsedConfigName = cfg.ReadSetting("lastusedconfigname", "");
+				lastUsedMapFolder = cfg.ReadSetting("lastusedmapfolder", "");
+				gzMarkExtraFloors = cfg.ReadSetting("gzmarkextrafloors", true);
+				maxRecentFiles = cfg.ReadSetting("maxrecentfiles", 8);
+				autoClearSideTextures = cfg.ReadSetting("autoclearsidetextures", true);
+				storeSelectedEditTab = cfg.ReadSetting("storeselectededittab", true);
+				checkforupdates = cfg.ReadSetting("checkforupdates", true); //mxd
+				rendercomments = cfg.ReadSetting("rendercomments", true); //mxd
+				rendergrid = cfg.ReadSetting("rendergrid", true); //mxd
+				dynamicgridsize = cfg.ReadSetting("dynamicgridsize", true); //mxd
+				ignoredremoterevision = cfg.ReadSetting("ignoredremoterevision", 0); //mxd
+
+				//mxd. Sector defaults
+				defaultceilheight = cfg.ReadSetting("defaultceilheight", 128);
+				defaultfloorheight = cfg.ReadSetting("defaultfloorheight", 0);
+				defaultbrightness = cfg.ReadSetting("defaultbrightness", 192);
+				
+				// Success
+				return true;
+			}
+			// Failed
+			return false;
+		}
+
+		// This saves the program configuration
+		internal void Save(string filepathname)
+		{
+			Version v = General.ThisAssembly.GetName().Version;
+			
+			// Write the cache variables
+			cfg.WriteSetting("blackbrowsers", blackbrowsers);
+			cfg.WriteSetting("capitalizetexturenames", capitalizetexturenames); //mxd
+			//cfg.WriteSetting("undolevels", undolevels);
+			cfg.WriteSetting("visualfov", visualfov);
+			cfg.WriteSetting("visualmousesensx", visualmousesensx);
+			cfg.WriteSetting("visualmousesensy", visualmousesensy);
+			cfg.WriteSetting("imagebrightness", imagebrightness);
+			cfg.WriteSetting("qualitydisplay", qualitydisplay);
+			cfg.WriteSetting("testmonsters", testmonsters);
+			cfg.WriteSetting("doublesidedalpha", doublesidedalpha);
+			cfg.WriteSetting("backgroundalpha", backgroundalpha);
+			cfg.WriteSetting("defaultviewmode", defaultviewmode);
+			cfg.WriteSetting("classicbilinear", classicbilinear);
+			cfg.WriteSetting("visualbilinear", visualbilinear);
+			cfg.WriteSetting("mousespeed", mousespeed);
+			cfg.WriteSetting("movespeed", movespeed);
+			cfg.WriteSetting("viewdistance", viewdistance);
+			cfg.WriteSetting("invertyaxis", invertyaxis);
+			cfg.WriteSetting("scriptfontname", scriptfontname);
+			cfg.WriteSetting("scriptfontsize", scriptfontsize);
+			cfg.WriteSetting("scriptfontbold", scriptfontbold);
+			cfg.WriteSetting("scriptontop", scriptontop);
+			cfg.WriteSetting("scripttabwidth", scripttabwidth);
+			cfg.WriteSetting("scriptautoindent", scriptautoindent);
+			cfg.WriteSetting("snippetsallmanstyle", snippetsallmanstyle); //mxd
+			cfg.WriteSetting("screenshotspath", screenshotspath); //mxd
+			cfg.WriteSetting("previewimagesize", previewimagesize);
+			cfg.WriteSetting("autoscrollspeed", autoscrollspeed);
+			cfg.WriteSetting("zoomfactor", zoomfactor);
+			cfg.WriteSetting("showerrorswindow", showerrorswindow);
+			cfg.WriteSetting("animatevisualselection", animatevisualselection);
+			cfg.WriteSetting("currentversion", v.Major * 1000000 + v.Revision);
+			cfg.WriteSetting("dockersposition", dockersposition);
+			cfg.WriteSetting("collapsedockers", collapsedockers);
+			cfg.WriteSetting("dockerswidth", dockerswidth);
+			pasteoptions.WriteConfiguration(cfg, "pasteoptions");
+			cfg.WriteSetting("toolbarscript", toolbarscript);
+			cfg.WriteSetting("toolbarundo", toolbarundo);
+			cfg.WriteSetting("toolbarcopy", toolbarcopy);
+			cfg.WriteSetting("toolbarprefabs", toolbarprefabs);
+			cfg.WriteSetting("toolbarfilter", toolbarfilter);
+			cfg.WriteSetting("toolbarviewmodes", toolbarviewmodes);
+			cfg.WriteSetting("toolbargeometry", toolbargeometry);
+			cfg.WriteSetting("toolbartesting", toolbartesting);
+			cfg.WriteSetting("toolbarfile", toolbarfile);
+			cfg.WriteSetting("filteranisotropy", filteranisotropy);
+			cfg.WriteSetting("showtexturesizes", showtexturesizes);
+			cfg.WriteSetting("locatetexturegroup", locatetexturegroup); //mxd
+			cfg.WriteSetting("splitlinebehavior", (int)splitlinebehavior); //mxd
+
+			//mxd
+			cfg.WriteSetting("gzdrawmodels", (int)gzDrawModelsMode);
+			cfg.WriteSetting("gzdrawlights", (int)gzDrawLightsMode);
+			cfg.WriteSetting("gzdrawfog", gzDrawFog);
+			cfg.WriteSetting("gzsynchcameras", gzSynchCameras);
+			cfg.WriteSetting("gzshoweventlines", gzShowEventLines);
+			cfg.WriteSetting("gzoldhighlightmode", gzOldHighlightMode);
+			cfg.WriteSetting("gztoolbargzdoom", gzToolbarGZDoom);
+			cfg.WriteSetting("gzmaxdynamiclights", gzMaxDynamicLights);
+			cfg.WriteSetting("gzdynamiclightradius", gzDynamicLightRadius);
+			cfg.WriteSetting("gzdynamiclightintensity", gzDynamicLightIntensity);
+			cfg.WriteSetting("gzstretchview", gzStretchView);
+			cfg.WriteSetting("gzvertexscale2d", gzVertexScale2D);
+			cfg.WriteSetting("gzshowvisualvertices", gzShowVisualVertices);
+			cfg.WriteSetting("gzvertexscale3d", gzVertexScale3D);
+			cfg.WriteSetting("gzmarkextrafloors", gzMarkExtraFloors);
+			if(!string.IsNullOrEmpty(lastUsedConfigName))
+				cfg.WriteSetting("lastusedconfigname", lastUsedConfigName);
+			if(!string.IsNullOrEmpty(lastUsedMapFolder))
+				cfg.WriteSetting("lastusedmapfolder", lastUsedMapFolder);
+			cfg.WriteSetting("maxrecentfiles", maxRecentFiles);
+			cfg.WriteSetting("autoclearsidetextures", autoClearSideTextures);
+			cfg.WriteSetting("storeselectededittab", storeSelectedEditTab);
+			cfg.WriteSetting("checkforupdates", checkforupdates); //mxd
+			cfg.WriteSetting("rendercomments", rendercomments); //mxd
+			cfg.WriteSetting("rendergrid", rendergrid); //mxd
+			cfg.WriteSetting("dynamicgridsize", dynamicgridsize); //mxd
+			cfg.WriteSetting("ignoredremoterevision", ignoredremoterevision); //mxd
+
+			//mxd. Sector defaults
+			cfg.WriteSetting("defaultceilheight", defaultceilheight);
+			cfg.WriteSetting("defaultfloorheight", defaultfloorheight);
+			cfg.WriteSetting("defaultbrightness", defaultbrightness);
+			
+			// Save settings configuration
+			General.WriteLogLine("Saving program configuration to '" + filepathname + "'...");
+			cfg.SaveConfiguration(filepathname);
+		}
+		
+		// This reads the configuration
+		private bool Read(string cfgfilepathname, string defaultfilepathname)
+		{
+			// Check if no config for this user exists yet
+			if(!File.Exists(cfgfilepathname))
+			{
+				// Copy new configuration
+				General.WriteLogLine("Local user program configuration is missing!");
+				File.Copy(defaultfilepathname, cfgfilepathname);
+				General.WriteLogLine("New program configuration copied for local user");
+			}
+
+			// Load it
+			cfg = new Configuration(cfgfilepathname, true);
+			if(cfg.ErrorResult)
+			{
+				// Error in configuration
+				// Ask user for a new copy
+				DialogResult result = General.ShowErrorMessage("Error in program configuration near line " + cfg.ErrorLine + ": " + cfg.ErrorDescription + "\n\nWould you like to overwrite your settings with a new configuration to restore the default settings?", MessageBoxButtons.YesNoCancel);
+				if(result == DialogResult.Yes)
+				{
+					// Remove old configuration and make a new copy
+					General.WriteLogLine("User requested a new copy of the program configuration");
+					File.Delete(cfgfilepathname);
+					File.Copy(defaultfilepathname, cfgfilepathname);
+					General.WriteLogLine("New program configuration copied for local user");
+
+					// Load it
+					cfg = new Configuration(cfgfilepathname, true);
+					if(cfg.ErrorResult)
+					{
+						// Error in configuration
+						General.WriteLogLine("Error in program configuration near line " + cfg.ErrorLine + ": " + cfg.ErrorDescription);
+						General.ShowErrorMessage("Default program configuration is corrupted. Please re-install Doom Builder.", MessageBoxButtons.OK);
+						return false;
+					}
+				}
+				else if(result == DialogResult.Cancel)
+				{
+					// User requested to cancel startup
+					General.WriteLogLine("User cancelled startup");
+					return false;
+				}
+			}
+			
+			// Check if a version number is missing
+			previousversion = cfg.ReadSetting("currentversion", -1);
+			if(!General.NoSettings && (previousversion == -1))
+			{
+				// Remove old configuration and make a new copy
+				General.WriteLogLine("Program configuration is outdated, new configuration will be copied for local user");
+				File.Delete(cfgfilepathname);
+				File.Copy(defaultfilepathname, cfgfilepathname);
+				
+				// Load it
+				cfg = new Configuration(cfgfilepathname, true);
+				if(cfg.ErrorResult)
+				{
+					// Error in configuration
+					General.WriteLogLine("Error in program configuration near line " + cfg.ErrorLine + ": " + cfg.ErrorDescription);
+					General.ShowErrorMessage("Default program configuration is corrupted. Please re-install Doom Builder.", MessageBoxButtons.OK);
+					return false;
+				}
+			}
+			
+			// Success
+			return true;
+		}
+		
+		#endregion
+
+		#region ================== Methods
+
+		// This makes the path prefix for the given assembly
+		private static string GetPluginPathPrefix(Assembly asm)
+		{
+			Plugin p = General.Plugins.FindPluginByAssembly(asm);
+			return GetPluginPathPrefix(p.Name);
+		}
+
+		// This makes the path prefix for the given assembly
+		private static string GetPluginPathPrefix(string assemblyname)
+		{
+			return "plugins." + assemblyname.ToLowerInvariant() + ".";
+		}
+
+		// ReadPluginSetting
+		public string ReadPluginSetting(string setting, string defaultsetting) { return cfg.ReadSetting(GetPluginPathPrefix(Assembly.GetCallingAssembly()) + setting, defaultsetting); }
+		public int ReadPluginSetting(string setting, int defaultsetting) { return cfg.ReadSetting(GetPluginPathPrefix(Assembly.GetCallingAssembly()) + setting, defaultsetting); }
+		public float ReadPluginSetting(string setting, float defaultsetting) { return cfg.ReadSetting(GetPluginPathPrefix(Assembly.GetCallingAssembly()) + setting, defaultsetting); }
+		public short ReadPluginSetting(string setting, short defaultsetting) { return cfg.ReadSetting(GetPluginPathPrefix(Assembly.GetCallingAssembly()) + setting, defaultsetting); }
+		public long ReadPluginSetting(string setting, long defaultsetting) { return cfg.ReadSetting(GetPluginPathPrefix(Assembly.GetCallingAssembly()) + setting, defaultsetting); }
+		public bool ReadPluginSetting(string setting, bool defaultsetting) { return cfg.ReadSetting(GetPluginPathPrefix(Assembly.GetCallingAssembly()) + setting, defaultsetting); }
+		public byte ReadPluginSetting(string setting, byte defaultsetting) { return cfg.ReadSetting(GetPluginPathPrefix(Assembly.GetCallingAssembly()) + setting, defaultsetting); }
+		public IDictionary ReadPluginSetting(string setting, IDictionary defaultsetting) { return cfg.ReadSetting(GetPluginPathPrefix(Assembly.GetCallingAssembly()) + setting, defaultsetting); }
+
+		// ReadPluginSetting with specific plugin
+		public string ReadPluginSetting(string pluginname, string setting, string defaultsetting) { return cfg.ReadSetting(GetPluginPathPrefix(pluginname) + setting, defaultsetting); }
+		public int ReadPluginSetting(string pluginname, string setting, int defaultsetting) { return cfg.ReadSetting(GetPluginPathPrefix(pluginname) + setting, defaultsetting); }
+		public float ReadPluginSetting(string pluginname, string setting, float defaultsetting) { return cfg.ReadSetting(GetPluginPathPrefix(pluginname) + setting, defaultsetting); }
+		public short ReadPluginSetting(string pluginname, string setting, short defaultsetting) { return cfg.ReadSetting(GetPluginPathPrefix(pluginname) + setting, defaultsetting); }
+		public long ReadPluginSetting(string pluginname, string setting, long defaultsetting) { return cfg.ReadSetting(GetPluginPathPrefix(pluginname) + setting, defaultsetting); }
+		public bool ReadPluginSetting(string pluginname, string setting, bool defaultsetting) { return cfg.ReadSetting(GetPluginPathPrefix(pluginname) + setting, defaultsetting); }
+		public byte ReadPluginSetting(string pluginname, string setting, byte defaultsetting) { return cfg.ReadSetting(GetPluginPathPrefix(pluginname) + setting, defaultsetting); }
+		public IDictionary ReadPluginSetting(string pluginname, string setting, IDictionary defaultsetting) { return cfg.ReadSetting(GetPluginPathPrefix(pluginname) + setting, defaultsetting); }
+		
+		// WritePluginSetting
+		public bool WritePluginSetting(string setting, object settingvalue) { return cfg.WriteSetting(GetPluginPathPrefix(Assembly.GetCallingAssembly()) + setting, settingvalue); }
+		
+		// DeletePluginSetting
+		public bool DeletePluginSetting(string setting) { return cfg.DeleteSetting(GetPluginPathPrefix(Assembly.GetCallingAssembly()) + setting); }
+
+		// ReadSetting
+		internal string ReadSetting(string setting, string defaultsetting) { return cfg.ReadSetting(setting, defaultsetting); }
+		internal int ReadSetting(string setting, int defaultsetting) { return cfg.ReadSetting(setting, defaultsetting); }
+		internal float ReadSetting(string setting, float defaultsetting) { return cfg.ReadSetting(setting, defaultsetting); }
+		internal short ReadSetting(string setting, short defaultsetting) { return cfg.ReadSetting(setting, defaultsetting); }
+		internal long ReadSetting(string setting, long defaultsetting) { return cfg.ReadSetting(setting, defaultsetting); }
+		internal bool ReadSetting(string setting, bool defaultsetting) { return cfg.ReadSetting(setting, defaultsetting); }
+		internal byte ReadSetting(string setting, byte defaultsetting) { return cfg.ReadSetting(setting, defaultsetting); }
+		internal IDictionary ReadSetting(string setting, IDictionary defaultsetting) { return cfg.ReadSetting(setting, defaultsetting); }
+
+		// WriteSetting
+		internal bool WriteSetting(string setting, object settingvalue) { return cfg.WriteSetting(setting, settingvalue); }
+		internal bool WriteSetting(string setting, object settingvalue, string pathseperator) { return cfg.WriteSetting(setting, settingvalue, pathseperator); }
+
+		// DeleteSetting
+		internal bool DeleteSetting(string setting) { return cfg.DeleteSetting(setting); }
+		internal bool DeleteSetting(string setting, string pathseperator) { return cfg.DeleteSetting(setting, pathseperator); }
+
+		#endregion
+
+		#region ================== Default Settings
+
+		// This sets the default thing flags
+		public void SetDefaultThingFlags(ICollection<string> setflags)
+		{
+			defaultthingflags = new List<string>(setflags);
+		}
+
+		// This applies default settings to a thing
+		public void ApplyDefaultThingSettings(Thing t)
+		{
+			t.Type = defaultthingtype;
+			t.Rotate(defaultthingangle);
+			foreach(string f in defaultthingflags) t.SetFlag(f, true);
+
+			//mxd. Set default arguments
+			ThingTypeInfo tti = General.Map.Data.GetThingInfoEx(t.Type);
+			if(tti != null) 
+			{
+				t.Args[0] = (int)tti.Args[0].DefaultValue;
+				t.Args[1] = (int)tti.Args[1].DefaultValue;
+				t.Args[2] = (int)tti.Args[2].DefaultValue;
+				t.Args[3] = (int)tti.Args[3].DefaultValue;
+				t.Args[4] = (int)tti.Args[4].DefaultValue;
+			}
+		}
+		
+		// This attempts to find the default drawing settings
+		public void FindDefaultDrawSettings()
+		{
+			bool foundone;
+			
+			// Only possible when a map is loaded
+			if(General.Map == null || General.Map.Options == null) return;
+			
+			// Default texture missing?
+			if(!General.Map.Options.OverrideMiddleTexture || string.IsNullOrEmpty(General.Map.Options.DefaultWallTexture)) //mxd
+			{
+				// Find default texture from map
+				foundone = false;
+				foreach(Sidedef sd in General.Map.Map.Sidedefs)
+				{
+					if(sd.MiddleTexture != "-" && General.Map.Data.GetTextureExists(sd.MiddleTexture))
+					{
+						foundone = true;
+						General.Map.Options.DefaultWallTexture = sd.MiddleTexture;
+						break;
+					}
+				}
+				
+				// Not found yet?
+				if(!foundone)
+				{
+					//mxd. Use the wall texture from the game configuration?
+					if(!string.IsNullOrEmpty(General.Map.Config.DefaultWallTexture) && General.Map.Data.GetTextureExists(General.Map.Config.DefaultWallTexture))
+					{
+						General.Map.Options.DefaultWallTexture = General.Map.Config.DefaultWallTexture;
+						foundone = true;
+					}
+					
+					// Pick the first STARTAN from the list.
+					// I love the STARTAN texture as default for some reason.
+					if(!foundone)
+					{
+						foreach(string s in General.Map.Data.TextureNames)
+						{
+							if(s.StartsWith("STARTAN"))
+							{
+								foundone = true;
+								General.Map.Options.DefaultWallTexture = s;
+								break;
+							}
+						}
+					}
+					
+					// Otherwise just pick the first
+					if(!foundone)
+					{
+						if(General.Map.Data.TextureNames.Count > 1)
+							General.Map.Options.DefaultWallTexture = General.Map.Data.TextureNames[1];
+					}
+				}
+			}
+
+			// Default floor missing?
+			if(!General.Map.Options.OverrideFloorTexture || string.IsNullOrEmpty(General.Map.Options.DefaultFloorTexture))
+			{
+				// Find default texture from map
+				foundone = false;
+				if(General.Map.Map.Sectors.Count > 0)
+				{
+					// Find one that is known
+					foreach(Sector s in General.Map.Map.Sectors)
+					{
+						if(General.Map.Data.GetFlatExists(s.FloorTexture))
+						{
+							foundone = true;
+							General.Map.Options.DefaultFloorTexture = s.FloorTexture;
+							break;
+						}
+					}
+				}
+
+				//mxd. Use the floor flat from the game configuration?
+				if(!foundone && !string.IsNullOrEmpty(General.Map.Config.DefaultFloorTexture) && General.Map.Data.GetFlatExists(General.Map.Config.DefaultFloorTexture))
+				{
+					General.Map.Options.DefaultFloorTexture = General.Map.Config.DefaultFloorTexture;
+					foundone = true;
+				}
+				
+				// Pick the first FLOOR from the list.
+				if(!foundone)
+				{
+					foreach(string s in General.Map.Data.FlatNames)
+					{
+						if(s.StartsWith("FLOOR"))
+						{
+							foundone = true;
+							General.Map.Options.DefaultFloorTexture = s;
+							break;
+						}
+					}
+				}
+				
+				// Otherwise just pick the first
+				if(!foundone)
+				{
+					if(General.Map.Data.FlatNames.Count > 1)
+						General.Map.Options.DefaultFloorTexture = General.Map.Data.FlatNames[1];
+				}
+			}
+			
+			// Default ceiling missing?
+			if(!General.Map.Options.OverrideCeilingTexture || string.IsNullOrEmpty(General.Map.Options.DefaultCeilingTexture))
+			{
+				// Find default texture from map
+				foundone = false;
+				if(General.Map.Map.Sectors.Count > 0)
+				{
+					// Find one that is known
+					foreach(Sector s in General.Map.Map.Sectors)
+					{
+						if(General.Map.Data.GetFlatExists(s.CeilTexture))
+						{
+							foundone = true;
+							General.Map.Options.DefaultCeilingTexture = s.CeilTexture;
+							break;
+						}
+					}
+				}
+
+				//mxd. Use the floor flat from the game configuration?
+				if(!foundone && !string.IsNullOrEmpty(General.Map.Config.DefaultCeilingTexture) && General.Map.Data.GetFlatExists(General.Map.Config.DefaultCeilingTexture))
+				{
+					General.Map.Options.DefaultCeilingTexture = General.Map.Config.DefaultCeilingTexture;
+					foundone = true;
+				}
+				
+				// Pick the first CEIL from the list.
+				if(!foundone)
+				{
+					foreach(string s in General.Map.Data.FlatNames)
+					{
+						if(s.StartsWith("CEIL"))
+						{
+							foundone = true;
+							General.Map.Options.DefaultCeilingTexture = s;
+							break;
+						}
+					}
+				}
+				
+				// Otherwise just pick the first
+				if(!foundone)
+				{
+					if(General.Map.Data.FlatNames.Count > 1)
+						General.Map.Options.DefaultCeilingTexture = General.Map.Data.FlatNames[1];
+				}
+			}
+
+			// Texture names may not be null
+			if(string.IsNullOrEmpty(General.Map.Options.DefaultWallTexture)) General.Map.Options.DefaultWallTexture = "-";
+			if(string.IsNullOrEmpty(General.Map.Options.DefaultTopTexture) || !General.Map.Options.OverrideTopTexture) General.Map.Options.DefaultTopTexture = General.Map.Options.DefaultWallTexture; //mxd
+			if(string.IsNullOrEmpty(General.Map.Options.DefaultBottomTexture) || !General.Map.Options.OverrideBottomTexture) General.Map.Options.DefaultBottomTexture = General.Map.Options.DefaultWallTexture; //mxd
+			if(string.IsNullOrEmpty(General.Map.Options.DefaultFloorTexture)) General.Map.Options.DefaultFloorTexture = "-";
+			if(string.IsNullOrEmpty(General.Map.Options.DefaultCeilingTexture)) General.Map.Options.DefaultCeilingTexture = "-";
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Config/ResourceTextureSet.cs b/Source/Core/Config/ResourceTextureSet.cs
new file mode 100644
index 0000000..5dc3f7c
--- /dev/null
+++ b/Source/Core/Config/ResourceTextureSet.cs
@@ -0,0 +1,114 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Data;
+using CodeImp.DoomBuilder.IO;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Config
+{
+	internal sealed class ResourceTextureSet : TextureSet, IFilledTextureSet
+	{
+		#region ================== Constants
+		
+		#endregion
+
+		#region ================== Variables
+
+		// Matching textures and flats
+		private Dictionary<long, ImageData> textures;
+		private Dictionary<long, ImageData> flats;
+		private DataLocation location;
+
+		#endregion
+
+		#region ================== Properties
+		
+		public ICollection<ImageData> Textures { get { return textures.Values; } }
+		public ICollection<ImageData> Flats { get { return flats.Values; } }
+		public DataLocation Location { get { return location; } }
+		
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		// New texture set constructor
+		public ResourceTextureSet(string name, DataLocation location)
+		{
+			this.name = name;
+			this.location = location;
+			this.textures = new Dictionary<long, ImageData>();
+			this.flats = new Dictionary<long, ImageData>();
+		}
+		
+		#endregion
+
+		#region ================== Methods
+		
+		// Add a texture
+		internal void AddTexture(ImageData image)
+		{
+			if(textures.ContainsKey(image.LongName) && !image.HasPatchWithSameName)
+				General.ErrorLogger.Add(ErrorType.Warning, "Texture \"" + image.Name + "\" is double defined in resource \"" + this.Location.location + "\".");
+			textures[image.LongName] = image;
+		}
+
+		// Add a flat
+		internal void AddFlat(ImageData image)
+		{
+			if(flats.ContainsKey(image.LongName) && (!General.Map.Config.MixTexturesFlats || !image.HasPatchWithSameName))
+				General.ErrorLogger.Add(ErrorType.Warning, "Flat \"" + image.Name + "\" is double defined in resource \"" + this.Location.location + "\".");
+			flats[image.LongName] = image;
+		}
+
+		// Check if this set has a texture
+		internal bool TextureExists(ImageData image)
+		{
+			return textures.ContainsKey(image.LongName);
+		}
+
+		// Check if this set has a flat
+		internal bool FlatExists(ImageData image)
+		{
+			return flats.ContainsKey(image.LongName);
+		}
+
+		// Mix the textures and flats
+		internal void MixTexturesAndFlats()
+		{
+			// Make a copy of the flats only
+			Dictionary<long, ImageData> flatsonly = new Dictionary<long, ImageData>(flats);
+
+			// Add textures to flats
+			foreach(KeyValuePair<long, ImageData> t in textures) 
+			{
+				if(!flats.ContainsKey(t.Key)) flats.Add(t.Key, t.Value);
+			}
+
+			// Add flats to textures
+			foreach(KeyValuePair<long, ImageData> f in flatsonly) 
+			{
+				if(!textures.ContainsKey(f.Key)) textures.Add(f.Key, f.Value);
+			}
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Config/ScriptConfiguration.cs b/Source/Core/Config/ScriptConfiguration.cs
new file mode 100644
index 0000000..4cd10ef
--- /dev/null
+++ b/Source/Core/Config/ScriptConfiguration.cs
@@ -0,0 +1,296 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using CodeImp.DoomBuilder.IO;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Config
+{
+	//mxd
+	internal enum ScriptType
+	{
+		UNKNOWN = 0,
+		ACS = 1,
+		MODELDEF = 2,
+		DECORATE = 3,
+	}
+	
+	internal class ScriptConfiguration : IComparable<ScriptConfiguration>
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+		
+		// Compiler settings
+		private readonly CompilerInfo compiler;
+		private readonly string parameters;
+		private readonly string resultlump;
+		
+		// Editor settings
+		private readonly string description;
+		private readonly int codepage;
+		private readonly string[] extensions;
+		private readonly bool casesensitive;
+		private readonly int insertcase;
+		private readonly int lexer;
+		private readonly string keywordhelp;
+		private readonly string functionopen;
+		private readonly string functionclose;
+		private readonly string argumentdelimiter;
+		private readonly string terminator;
+		private readonly string functionregex;
+		private readonly ScriptType scripttype; //mxd
+		
+		// Collections
+		private readonly Dictionary<string, string> keywords;
+		private readonly Dictionary<string, string> lowerkeywords;
+		private readonly List<string> constants;
+		private readonly Dictionary<string, string> lowerconstants;
+		private readonly Dictionary<string, string[]> snippets; //mxd
+		
+		#endregion
+
+		#region ================== Properties
+
+		// Compiler settings
+		public CompilerInfo Compiler { get { return compiler; } }
+		public string Parameters { get { return parameters; } }
+		public string ResultLump { get { return resultlump; } }
+		
+		// Editor settings
+		public string Description { get { return description; } }
+		public int CodePage { get { return codepage; } }
+		public string[] Extensions { get { return extensions; } }
+		public bool CaseSensitive { get { return casesensitive; } }
+		public int InsertCase { get { return insertcase; } }
+		public int Lexer { get { return lexer; } }
+		public string KeywordHelp { get { return keywordhelp; } }
+		public string FunctionOpen { get { return functionopen; } }
+		public string FunctionClose { get { return functionclose; } }
+		public string ArgumentDelimiter { get { return argumentdelimiter; } }
+		public string Terminator { get { return terminator; } }
+		public string FunctionRegEx { get { return functionregex; } }
+		public ScriptType ScriptType { get { return scripttype; } } //mxd
+		public Dictionary<string, string[]> Snippets { get { return snippets; } } //mxd
+
+		// Collections
+		public ICollection<string> Keywords { get { return keywords.Keys; } }
+		public ICollection<string> Constants { get { return constants; } }
+		
+		#endregion
+
+		#region ================== Constructor / Disposer
+		
+		// This creates the default script configuration
+		// that is used for documents of unknown type
+		internal ScriptConfiguration()
+		{
+			// Initialize
+			this.keywords = new Dictionary<string, string>(StringComparer.Ordinal);
+			this.constants = new List<string>();
+			this.lowerkeywords = new Dictionary<string, string>(StringComparer.Ordinal);
+			this.lowerconstants = new Dictionary<string, string>(StringComparer.Ordinal);
+
+			// Settings
+			lexer = 1;
+			casesensitive = false;
+			codepage = 65001;
+			parameters = "";
+			resultlump = "";
+			insertcase = 0;
+			keywordhelp = "";
+			functionopen = "";
+			functionclose = "";
+			argumentdelimiter = "";
+			terminator = "";
+			functionregex = "";
+			description = "Plain text";
+			scripttype = ScriptType.UNKNOWN; //mxd
+			extensions = new[] { "txt" };
+			snippets = new Dictionary<string, string[]>(StringComparer.Ordinal); //mxd
+		}
+		
+		// Constructor
+		internal ScriptConfiguration(Configuration cfg)
+		{
+			// Initialize
+			this.keywords = new Dictionary<string, string>(StringComparer.Ordinal);
+			this.constants = new List<string>();
+			this.lowerkeywords = new Dictionary<string, string>(StringComparer.Ordinal);
+			this.lowerconstants = new Dictionary<string, string>(StringComparer.Ordinal);
+			this.snippets = new Dictionary<string, string[]>(StringComparer.Ordinal); //mxd
+			
+			// Read settings
+			description = cfg.ReadSetting("description", "Untitled script");
+			codepage = cfg.ReadSetting("codepage", 0);
+			string extensionsstring = cfg.ReadSetting("extensions", "");
+			string compilername = cfg.ReadSetting("compiler", "");
+			parameters = cfg.ReadSetting("parameters", "");
+			resultlump = cfg.ReadSetting("resultlump", "");
+			casesensitive = cfg.ReadSetting("casesensitive", true);
+			insertcase = cfg.ReadSetting("insertcase", 0);
+			lexer = cfg.ReadSetting("lexer", 0);
+			keywordhelp = cfg.ReadSetting("keywordhelp", "");
+			functionopen = cfg.ReadSetting("functionopen", "");
+			functionclose = cfg.ReadSetting("functionclose", "");
+			argumentdelimiter = cfg.ReadSetting("argumentdelimiter", "");
+			terminator = cfg.ReadSetting("terminator", "");
+			functionregex = cfg.ReadSetting("functionregex", "");
+			scripttype = (ScriptType)cfg.ReadSetting("scripttype", (int)ScriptType.UNKNOWN); //mxd
+			
+			// Make extensions array
+			extensions = extensionsstring.Split(',');
+			for(int i = 0; i < extensions.Length; i++) extensions[i] = extensions[i].Trim();
+			
+			// Load keywords
+			IDictionary dic = cfg.ReadSetting("keywords", new Hashtable());
+			foreach(DictionaryEntry de in dic)
+			{
+				keywords.Add(de.Key.ToString(), de.Value.ToString());
+				lowerkeywords.Add(de.Key.ToString().ToLowerInvariant(), de.Key.ToString());
+			}
+			
+			// Load constants
+			dic = cfg.ReadSetting("constants", new Hashtable());
+			foreach(DictionaryEntry de in dic)
+			{
+				constants.Add(de.Key.ToString());
+				lowerconstants.Add(de.Key.ToString().ToLowerInvariant(), de.Key.ToString());
+			}
+			
+			// Compiler specified?
+			if(compilername.Length > 0)
+			{
+				// Find compiler
+				foreach(CompilerInfo c in General.Compilers)
+				{
+					// Compiler name matches?
+					if(c.Name == compilername)
+					{
+						// Apply compiler
+						this.compiler = c;
+						break;
+					}
+				}
+				
+				// No compiler found?
+				if(this.compiler == null) throw new Exception("No such compiler defined: '" + compilername + "'");
+			}
+
+			//mxd. Load Snippets
+			string snippetsdir = cfg.ReadSetting("snippetsdir", "");
+			if(!string.IsNullOrEmpty(snippetsdir)) 
+			{
+				string snippetspath = Path.Combine(General.SnippetsPath, snippetsdir);
+				if(Directory.Exists(snippetspath)) 
+				{
+					string[] files = Directory.GetFiles(snippetspath, "*.txt", SearchOption.TopDirectoryOnly);
+
+					foreach(string file in files) 
+					{
+						string name = Path.GetFileNameWithoutExtension(file);
+						if(name.Contains(" ")) 
+						{
+							General.ErrorLogger.Add(ErrorType.Warning, "Failed to load snippet '" + file + "' for '" + description + "' script configuration: snippet file name must not contain spaces!");
+						} 
+						else 
+						{
+							string[] lines = File.ReadAllLines(file);
+							if(lines.Length > 0) 
+							{
+								snippets.Add(name, lines);
+							} 
+							else 
+							{
+								General.ErrorLogger.Add(ErrorType.Warning, "Failed to load snippet '" + file + "' for '" + description + "' script configuration: file is empty!");
+							}
+						}
+					}
+				}
+			}
+		}
+		
+		#endregion
+
+		#region ================== Methods
+		
+		// This returns the correct case for a keyword
+		// Returns the same keyword as the input when it cannot be found
+		public string GetKeywordCase(string keyword)
+		{
+			if(lowerkeywords.ContainsKey(keyword.ToLowerInvariant()))
+				return lowerkeywords[keyword.ToLowerInvariant()];
+			else
+				return keyword;
+		}
+
+		// This returns the correct case for a constant
+		// Returns the same constant as the input when it cannot be found
+		public string GetConstantCase(string constant)
+		{
+			if(lowerconstants.ContainsKey(constant.ToLowerInvariant()))
+				return lowerconstants[constant.ToLowerInvariant()];
+			else
+				return constant;
+		}
+		
+		// This returns true when the given word is a keyword
+		public bool IsKeyword(string keyword)
+		{
+			return lowerkeywords.ContainsKey(keyword.ToLowerInvariant());
+		}
+
+		// This returns true when the given word is a contant
+		public bool IsConstant(string constant)
+		{
+			return lowerconstants.ContainsKey(constant.ToLowerInvariant());
+		}
+		
+		// This returns the function definition for a keyword
+		// Returns null when no function definition exists
+		// NOTE: The keyword parameter is case-sensitive!
+		public string GetFunctionDefinition(string keyword)
+		{
+			if(keywords.ContainsKey(keyword))
+				return keywords[keyword];
+			else
+				return null;
+		}
+		
+		// This sorts by description
+		public int CompareTo(ScriptConfiguration other)
+		{
+			return string.Compare(this.description, other.description, true);
+		}
+
+		//mxd
+		public override string ToString() 
+		{
+			return description;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Config/SectorEffectInfo.cs b/Source/Core/Config/SectorEffectInfo.cs
new file mode 100644
index 0000000..8138506
--- /dev/null
+++ b/Source/Core/Config/SectorEffectInfo.cs
@@ -0,0 +1,86 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Config
+{
+	public class SectorEffectInfo : INumberedTitle, IComparable<SectorEffectInfo>
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		// Properties
+		private int index;
+		private string title;
+		private bool isknown;
+		private bool isgeneralized;
+		
+		#endregion
+
+		#region ================== Properties
+
+		public int Index { get { return index; } }
+		public string Title { get { return title; } }
+		public bool IsGeneralized { get { return isgeneralized; } }
+		public bool IsKnown { get { return isknown; } }
+		public bool IsNull { get { return (index == 0); } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		internal SectorEffectInfo(int index, string title, bool isknown, bool isgeneralized)
+		{
+			// Initialize
+			this.index = index;
+			this.title = title;
+			this.isknown = isknown;
+			this.isgeneralized = isgeneralized;
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This presents the item as string
+		public override string ToString()
+		{
+			return index + " - " + title;
+		}
+
+		// This compares against another action info
+		public int CompareTo(SectorEffectInfo other)
+		{
+			if(this.index < other.index) return -1;
+			else if(this.index > other.index) return 1;
+			else return 0;
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Config/SkillInfo.cs b/Source/Core/Config/SkillInfo.cs
new file mode 100644
index 0000000..24c4cd5
--- /dev/null
+++ b/Source/Core/Config/SkillInfo.cs
@@ -0,0 +1,76 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Config
+{
+	public class SkillInfo : INumberedTitle, IComparable<SkillInfo>
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		// Properties
+		private int index;
+		private string title;
+
+		#endregion
+
+		#region ================== Properties
+
+		public int Index { get { return index; } }
+		public string Title { get { return title; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		internal SkillInfo(int index, string title)
+		{
+			// Initialize
+			this.index = index;
+			this.title = title;
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This presents the item as string
+		public override string ToString()
+		{
+			return index + " - " + title;
+		}
+
+		// This compares against another skill
+		public int CompareTo(SkillInfo other)
+		{
+			if(this.index < other.index) return -1;
+			else if(this.index > other.index) return 1;
+			else return 0;
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Config/TagType.cs b/Source/Core/Config/TagType.cs
new file mode 100644
index 0000000..5f34643
--- /dev/null
+++ b/Source/Core/Config/TagType.cs
@@ -0,0 +1,30 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Config
+{
+	public enum TagType
+	{
+		None = 0,
+		Sector = 1,
+		Thing = 2,
+		Linedef = 3		// Implement this?
+	}
+}
diff --git a/Source/Core/Config/TextureSet.cs b/Source/Core/Config/TextureSet.cs
new file mode 100644
index 0000000..e2faff4
--- /dev/null
+++ b/Source/Core/Config/TextureSet.cs
@@ -0,0 +1,70 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Config
+{
+	public abstract class TextureSet : IComparable<TextureSet>
+	{
+		#region ================== Variables
+
+		protected string name;
+		private int level; //mxd. Folder depth of this item
+		protected List<string> filters;
+		
+		#endregion
+		
+		#region ================== Properties
+		
+		public string Name { get { return name; } set { name = value; } }
+		public int Level { get { return level; } set { level = value; } }
+		internal List<string> Filters { get { return filters; } }
+		
+		#endregion
+		
+		#region ================== Constructor / Destructor
+		
+		protected TextureSet()
+		{
+			this.name = "Unnamed Set";
+			this.filters = new List<string>();
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+		
+		// This returns the name
+		public override string ToString()
+		{
+			return name;
+		}
+		
+		// Comparer for sorting alphabetically
+		public int CompareTo(TextureSet other)
+		{
+			return string.Compare(this.name, other.name);
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Config/ThingCategory.cs b/Source/Core/Config/ThingCategory.cs
new file mode 100644
index 0000000..5063e2f
--- /dev/null
+++ b/Source/Core/Config/ThingCategory.cs
@@ -0,0 +1,315 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Globalization;
+using CodeImp.DoomBuilder.IO;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Config
+{
+	public class ThingCategory
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		// Things
+		private List<ThingTypeInfo> things;
+		
+		// Category properties
+		private readonly string name;
+		private readonly string title;
+		private readonly bool sorted;
+		private readonly List<ThingCategory> children; //mxd 
+
+		// Thing properties for inheritance
+		private readonly string sprite;
+		private readonly int color;
+		private readonly float alpha; //mxd
+		private readonly string renderstyle; //mxd
+		private readonly int arrow;
+		private readonly float radius;
+		private readonly float height;
+		private readonly int hangs;
+		private readonly int blocking;
+		private readonly int errorcheck;
+		private readonly bool fixedsize;
+		private readonly bool fixedrotation; //mxd
+		private readonly bool absolutez;
+		private readonly float spritescale;
+		
+		// Disposing
+		private bool isdisposed;
+
+		//mxd. Validity
+		private bool isinvalid;
+		
+		#endregion
+
+		#region ================== Properties
+
+		public string Name { get { return name; } }
+		public string Title { get { return title; } }
+		public string Sprite { get { return sprite; } }
+		public bool Sorted { get { return sorted; } }
+		public List<ThingCategory> Children { get { return children; } } //mxd
+		public int Color { get { return color; } }
+		public float Alpha { get { return alpha; } } //mxd
+		public string RenderStyle { get { return renderstyle; } } //mxd
+		public int Arrow { get { return arrow; } }
+		public float Radius { get { return radius; } }
+		public float Height { get { return height; } }
+		public int Hangs { get { return hangs; } }
+		public int Blocking { get { return blocking; } }
+		public int ErrorCheck { get { return errorcheck; } }
+		public bool FixedSize { get { return fixedsize; } }
+		public bool FixedRotation { get { return fixedrotation; } } //mxd
+		public bool IsDisposed { get { return isdisposed; } }
+		public bool IsValid { get { return !isinvalid; } } //mxd
+		public bool AbsoluteZ { get { return absolutez; } }
+		public float SpriteScale { get { return spritescale; } }
+		public List<ThingTypeInfo> Things { get { return things; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+		
+		// Constructor
+		internal ThingCategory(ThingCategory parent, string name, string title)
+		{
+			// Initialize
+			this.name = name;
+			this.title = title;
+			this.things = new List<ThingTypeInfo>();
+			this.children = new List<ThingCategory>();
+			
+			//mxd. Copy properties from the parent
+			if(parent != null)
+			{
+				this.sprite = parent.sprite;
+				this.sorted = parent.sorted;
+				this.color = parent.color;
+				this.alpha = parent.alpha;
+				this.renderstyle = parent.renderstyle;
+				this.arrow = parent.arrow;
+				this.radius = parent.radius;
+				this.height = parent.height;
+				this.hangs = parent.hangs;
+				this.blocking = parent.blocking;
+				this.errorcheck = parent.errorcheck;
+				this.fixedsize = parent.fixedsize;
+				this.fixedrotation = parent.fixedrotation;
+				this.absolutez = parent.absolutez;
+				this.spritescale = parent.spritescale;
+			}
+			// Set default properties
+			else
+			{
+				this.sprite = "";
+				this.sorted = true;
+				this.color = 18;
+				this.alpha = 1f; //mxd
+				this.renderstyle = "normal"; //mxd
+				this.arrow = 1;
+				this.radius = 10;
+				this.height = 20;
+				this.hangs = 0;
+				this.blocking = 0;
+				this.errorcheck = 1;
+				this.fixedsize = false;
+				this.fixedrotation = false; //mxd
+				this.absolutez = false;
+				this.spritescale = 1.0f;
+			}
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+		
+		// Constructor
+		internal ThingCategory(Configuration cfg, ThingCategory parent, string name, IDictionary<string, EnumList> enums)
+		{
+			// Initialize
+			this.name = name;
+			this.things = new List<ThingTypeInfo>();
+			this.children = new List<ThingCategory>();
+			
+			// Read properties
+			this.title = cfg.ReadSetting("thingtypes." + name + ".title", name);
+
+			//mxd. If current block has no settings, it should be a grouping block, not a thing category.
+			if(this.title == name)
+			{
+				string[] props = new[] { "sprite", "sort", "color", "alpha", "renderstyle", "arrow", "width", 
+					"height", "hangs", "blocking", "error", "fixedsize", "fixedrotation", "absolutez", "spritescale" };
+
+				isinvalid = true;
+				foreach(string prop in props)
+				{
+					if(cfg.SettingExists("thingtypes." + name + "." + prop))
+					{
+						isinvalid = false;
+						break;
+					}
+				}
+
+				if(isinvalid) return;
+			}
+
+			if(parent != null) //mxd
+			{
+				this.sprite = cfg.ReadSetting("thingtypes." + name + ".sprite", parent.sprite);
+				this.sorted = (cfg.ReadSetting("thingtypes." + name + ".sort", (parent.sorted ? 1 : 0)) != 0);
+				this.color = cfg.ReadSetting("thingtypes." + name + ".color", parent.color);
+				this.alpha = cfg.ReadSetting("thingtypes." + name + ".alpha", parent.alpha);
+				this.renderstyle = cfg.ReadSetting("thingtypes." + name + ".renderstyle", parent.renderstyle).ToLower();
+				this.arrow = cfg.ReadSetting("thingtypes." + name + ".arrow", parent.arrow);
+				this.radius = cfg.ReadSetting("thingtypes." + name + ".width", parent.radius);
+				this.height = cfg.ReadSetting("thingtypes." + name + ".height", parent.height);
+				this.hangs = cfg.ReadSetting("thingtypes." + name + ".hangs", parent.hangs);
+				this.blocking = cfg.ReadSetting("thingtypes." + name + ".blocking", parent.blocking);
+				this.errorcheck = cfg.ReadSetting("thingtypes." + name + ".error", parent.errorcheck);
+				this.fixedsize = cfg.ReadSetting("thingtypes." + name + ".fixedsize", parent.fixedsize);
+				this.fixedrotation = cfg.ReadSetting("thingtypes." + name + ".fixedrotation", parent.fixedrotation);
+				this.absolutez = cfg.ReadSetting("thingtypes." + name + ".absolutez", parent.absolutez);
+				this.spritescale = cfg.ReadSetting("thingtypes." + name + ".spritescale", parent.spritescale);
+			}
+			else
+			{
+				this.sprite = cfg.ReadSetting("thingtypes." + name + ".sprite", "");
+				this.sorted = (cfg.ReadSetting("thingtypes." + name + ".sort", 0) != 0);
+				this.color = cfg.ReadSetting("thingtypes." + name + ".color", 0);
+				this.alpha = General.Clamp(cfg.ReadSetting("thingtypes." + name + ".alpha", 1f), 0f, 1f);
+				this.renderstyle = cfg.ReadSetting("thingtypes." + name + ".renderstyle", "normal").ToLower();
+				this.arrow = cfg.ReadSetting("thingtypes." + name + ".arrow", 0);
+				this.radius = cfg.ReadSetting("thingtypes." + name + ".width", 10);
+				this.height = cfg.ReadSetting("thingtypes." + name + ".height", 20);
+				this.hangs = cfg.ReadSetting("thingtypes." + name + ".hangs", 0);
+				this.blocking = cfg.ReadSetting("thingtypes." + name + ".blocking", 0);
+				this.errorcheck = cfg.ReadSetting("thingtypes." + name + ".error", 1);
+				this.fixedsize = cfg.ReadSetting("thingtypes." + name + ".fixedsize", false);
+				this.fixedrotation = cfg.ReadSetting("thingtypes." + name + ".fixedrotation", false); //mxd
+				this.absolutez = cfg.ReadSetting("thingtypes." + name + ".absolutez", false);
+				this.spritescale = cfg.ReadSetting("thingtypes." + name + ".spritescale", 1.0f);
+			}
+			
+			// Safety
+			if(this.radius < 4f) this.radius = 8f;
+			
+			// Go for all items in category
+			IDictionary dic = cfg.ReadSetting("thingtypes." + name, new Hashtable());
+			Dictionary<string, ThingCategory> cats = new Dictionary<string, ThingCategory>(StringComparer.Ordinal); //mxd
+			foreach(DictionaryEntry de in dic)
+			{
+				// Check if the item key is numeric
+				int index;
+				if(int.TryParse(de.Key.ToString(), NumberStyles.AllowLeadingWhite | NumberStyles.AllowTrailingWhite, CultureInfo.InvariantCulture, out index))
+				{
+					// Check if the item value is a structure
+					if(de.Value is IDictionary)
+					{
+						// Create this thing
+						things.Add(new ThingTypeInfo(this, index, cfg, enums));
+					}
+					// Check if the item value is a string
+					else if(de.Value is string)
+					{
+						// Interpret this as the title
+						things.Add(new ThingTypeInfo(this, index, de.Value.ToString()));
+					}
+				}
+				//mxd. This should be a child category 
+				else if(de.Value is IDictionary)
+				{
+					ThingCategory child = new ThingCategory(cfg, this, name + "." + de.Key, enums);
+					if(child.IsValid && child.things.Count > 0)
+					{
+						if(cats.ContainsKey(child.title.ToLowerInvariant()))
+							General.ErrorLogger.Add(ErrorType.Warning, "Thing Category '" + child.title + "' is double-defined in " + this.title);
+						cats[child.title.ToLowerInvariant()] = child;
+					}
+				}
+			}
+
+			//mxd. Add to main collection
+			foreach(ThingCategory tc in cats.Values) children.Add(tc);
+
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Disposer
+		internal void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Clean up
+				things = null;
+
+				//mxd. Dispose children (oh so cruel!!11)
+				foreach(ThingCategory tc in children) tc.Dispose();
+
+				// Done
+				isdisposed = true;
+			}
+		}
+		
+		#endregion
+
+		#region ================== Methods
+
+		// This sorts the category, if preferred
+		internal void SortIfNeeded()
+		{
+			if(sorted) things.Sort();
+
+			//mxd. Sort children as well
+			foreach(ThingCategory tc in children) tc.SortIfNeeded();
+		}
+		
+		// This adds a thing to the category
+		internal void AddThing(ThingTypeInfo t)
+		{
+			// Add
+			things.Add(t);
+		}
+
+		//mxd. This removes a thing from the category
+		internal void RemoveThing(ThingTypeInfo t) 
+		{
+			// Remove
+			if(things.Contains(t)) things.Remove(t);
+		}
+
+		// String representation
+		public override string ToString()
+		{
+			return title;
+		}
+		
+		#endregion
+	}
+}
+
diff --git a/Source/Core/Config/ThingTypeInfo.cs b/Source/Core/Config/ThingTypeInfo.cs
new file mode 100644
index 0000000..d9aa17b
--- /dev/null
+++ b/Source/Core/Config/ThingTypeInfo.cs
@@ -0,0 +1,518 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using CodeImp.DoomBuilder.GZBuilder.Data;
+using CodeImp.DoomBuilder.IO;
+using CodeImp.DoomBuilder.Data;
+using CodeImp.DoomBuilder.ZDoom;
+using CodeImp.DoomBuilder.Map;
+using System.Drawing;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Config
+{
+	public class ThingTypeInfo : INumberedTitle, IComparable<ThingTypeInfo>
+	{
+		#region ================== Constants
+
+		public const int THING_BLOCKING_NONE = 0;
+		public const int THING_BLOCKING_FULL = 1;
+		public const int THING_BLOCKING_HEIGHT = 2;
+		public const int THING_ERROR_NONE = 0;
+		public const int THING_ERROR_INSIDE = 1;
+		public const int THING_ERROR_INSIDE_STUCK = 2;
+		
+		#endregion
+
+		#region ================== Variables
+
+		// Properties
+		private readonly int index;
+		private string title;
+		private string sprite;
+		private ActorStructure actor;
+		private string classname; //mxd
+		private long spritelongname;
+		private int color;
+		private float alpha; //mxd
+		private byte alphabyte; //mxd
+		private string renderstyle; //mxd
+		private bool bright; //mxd
+		private bool arrow;
+		private float radius;
+		private float height;
+		private bool hangs;
+		private int blocking;
+		private int errorcheck;
+		private readonly bool fixedsize;
+		private readonly bool fixedrotation; //mxd
+		private readonly ThingCategory category;
+		private readonly ArgumentInfo[] args;
+		private readonly bool isknown;
+		private readonly bool absolutez;
+		private bool xybillboard; //mxd
+		private SizeF spritescale;
+		private readonly bool locksprite; //mxd
+		private bool obsolete; //mxd
+		private string obsoletemessage; //mxd
+
+		//mxd. GLOOME rendering settings
+		private Thing.SpriteRenderMode rendermode;
+		private bool rollsprite;
+		private bool sticktoplane;
+		
+		#endregion
+
+		#region ================== Properties
+
+		public int Index { get { return index; } }
+		public string Title { get { return title; } }
+		public string Sprite { get { return sprite; } }
+		public ActorStructure Actor { get { return actor; } }
+		public long SpriteLongName { get { return spritelongname; } }
+		public int Color { get { return color; } }
+		public float Alpha { get { return alpha; } } //mxd
+		public byte AlphaByte { get { return alphabyte; } } //mxd
+		public string RenderStyle { get { return renderstyle; } } //mxd
+		public bool Bright { get { return bright; } } //mxd
+		public bool Arrow { get { return arrow; } }
+		public float Radius { get { return radius; } }
+		public float Height { get { return height; } }
+		public bool Hangs { get { return hangs; } }
+		public int Blocking { get { return blocking; } }
+		public int ErrorCheck { get { return errorcheck; } }
+		public bool FixedSize { get { return fixedsize; } }
+		public bool FixedRotation { get { return fixedrotation; } } //mxd
+		public ThingCategory Category { get { return category; } }
+		public ArgumentInfo[] Args { get { return args; } }
+		public bool IsKnown { get { return isknown; } }
+		public bool IsNull { get { return (index == 0); } }
+		public bool IsObsolete { get { return obsolete; } } //mxd
+		public string ObsoleteMessage { get { return obsoletemessage; } } //mxd
+		public bool AbsoluteZ { get { return absolutez; } }
+		public bool XYBillboard { get { return xybillboard; } } //mxd
+		public SizeF SpriteScale { get { return spritescale; } }
+		public string ClassName { get { return classname; } } //mxd. Need this to add model overrides for things defined in configs
+
+		//mxd. GLOOME rendering flags
+		public Thing.SpriteRenderMode RenderMode { get { return rendermode; } }
+		public bool RollSprite { get { return rollsprite; } }
+		public bool StickToPlane { get { return sticktoplane; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		internal ThingTypeInfo(int index)
+		{
+			// Initialize
+			this.index = index;
+			this.category = null;
+			this.actor = null;
+			this.title = "<" + index.ToString(CultureInfo.InvariantCulture) + ">";
+			this.sprite = DataManager.INTERNAL_PREFIX + "unknownthing";
+			this.classname = string.Empty; //mxd
+			this.color = 0;
+			this.alpha = 1f; //mxd
+			this.alphabyte = 255; //mxd
+			this.renderstyle = "normal"; //mxd
+			this.bright = false; //mxd
+			this.arrow = true;
+			this.radius = 10f;
+			this.height = 20f;
+			this.hangs = false;
+			this.blocking = 0;
+			this.errorcheck = 0;
+			this.spritescale = new SizeF(1.0f, 1.0f);
+			this.fixedsize = false;
+			this.fixedrotation = false; //mxd
+			this.spritelongname = long.MaxValue;
+			this.args = new ArgumentInfo[Linedef.NUM_ARGS];
+			this.isknown = false;
+			this.absolutez = false;
+			this.xybillboard = false;
+			this.locksprite = false; //mxd
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Constructor
+		internal ThingTypeInfo(ThingCategory cat, int index, Configuration cfg, IDictionary<string, EnumList> enums)
+		{
+			string key = index.ToString(CultureInfo.InvariantCulture);
+			
+			// Initialize
+			this.index = index;
+			this.category = cat;
+			this.args = new ArgumentInfo[Linedef.NUM_ARGS];
+			this.isknown = true;
+			this.actor = null;
+			this.bright = false; //mxd
+		
+			// Read properties
+			this.title = cfg.ReadSetting("thingtypes." + cat.Name + "." + key + ".title", "<" + key + ">");
+			this.sprite = cfg.ReadSetting("thingtypes." + cat.Name + "." + key + ".sprite", cat.Sprite);
+			this.color = cfg.ReadSetting("thingtypes." + cat.Name + "." + key + ".color", cat.Color);
+			this.alpha = General.Clamp(cfg.ReadSetting("thingtypes." + cat.Name + "." + key + ".alpha", cat.Alpha), 0f, 1f); //mxd
+			this.alphabyte = (byte)(this.alpha * 255); //mxd
+			this.renderstyle = cfg.ReadSetting("thingtypes." + cat.Name + "." + key + ".renderstyle", cat.RenderStyle).ToLower(); //mxd
+			this.arrow = (cfg.ReadSetting("thingtypes." + cat.Name + "." + key + ".arrow", cat.Arrow) != 0);
+			this.radius = cfg.ReadSetting("thingtypes." + cat.Name + "." + key + ".width", cat.Radius);
+			this.height = cfg.ReadSetting("thingtypes." + cat.Name + "." + key + ".height", cat.Height);
+			this.hangs = (cfg.ReadSetting("thingtypes." + cat.Name + "." + key + ".hangs", cat.Hangs) != 0);
+			this.blocking = cfg.ReadSetting("thingtypes." + cat.Name + "." + key + ".blocking", cat.Blocking);
+			this.errorcheck = cfg.ReadSetting("thingtypes." + cat.Name + "." + key + ".error", cat.ErrorCheck);
+			this.fixedsize = cfg.ReadSetting("thingtypes." + cat.Name + "." + key + ".fixedsize", cat.FixedSize);
+			this.fixedrotation = cfg.ReadSetting("thingtypes." + cat.Name + "." + key + ".fixedrotation", cat.FixedRotation); //mxd
+			this.absolutez = cfg.ReadSetting("thingtypes." + cat.Name + "." + key + ".absolutez", cat.AbsoluteZ);
+			float sscale = cfg.ReadSetting("thingtypes." + cat.Name + "." + key + ".spritescale", cat.SpriteScale);
+			this.spritescale = new SizeF(sscale, sscale);
+			this.locksprite = cfg.ReadSetting("thingtypes." + cat.Name + "." + key + ".locksprite", false); //mxd
+			this.classname = cfg.ReadSetting("thingtypes." + cat.Name + "." + key + ".class", String.Empty); //mxd
+			
+			// Read the args
+			for(int i = 0; i < Linedef.NUM_ARGS; i++)
+				this.args[i] = new ArgumentInfo(cfg, "thingtypes." + cat.Name + "." + key, i, enums);
+			
+			// Safety
+			if(this.radius < 4f) this.radius = 16f;
+			if(this.hangs && this.absolutez) this.hangs = false; //mxd
+			
+			// Make long name for sprite lookup
+			if(this.sprite.Length <= 8)
+				this.spritelongname = Lump.MakeLongName(this.sprite);
+			else
+				this.spritelongname = long.MaxValue;
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Constructor
+		public ThingTypeInfo(ThingCategory cat, int index, string title)
+		{
+			// Initialize
+			this.index = index;
+			this.category = cat;
+			this.title = title;
+			this.actor = null;
+			this.classname = string.Empty; //mxd
+			this.isknown = true;
+			this.bright = false; //mxd
+			this.args = new ArgumentInfo[Linedef.NUM_ARGS];
+			for(int i = 0; i < Linedef.NUM_ARGS; i++) this.args[i] = new ArgumentInfo(i);
+			
+			// Read properties
+			this.sprite = cat.Sprite;
+			this.color = cat.Color;
+			this.arrow = (cat.Arrow != 0);
+			this.alpha = cat.Alpha; //mxd
+			this.alphabyte = (byte)(this.alpha * 255); //mxd
+			this.renderstyle = cat.RenderStyle; //mxd
+			this.radius = cat.Radius;
+			this.height = cat.Height;
+			this.hangs = (cat.Hangs != 0);
+			this.blocking = cat.Blocking;
+			this.errorcheck = cat.ErrorCheck;
+			this.fixedsize = cat.FixedSize;
+			this.fixedrotation = cat.FixedRotation; //mxd
+			this.absolutez = cat.AbsoluteZ;
+			this.spritescale = new SizeF(cat.SpriteScale, cat.SpriteScale);
+			this.locksprite = false;
+
+			// Safety
+			if(this.radius < 4f) this.radius = 8f;
+			if(this.hangs && this.absolutez) this.hangs = false; //mxd
+			
+			// Make long name for sprite lookup
+			if(this.sprite.Length <= 8)
+				this.spritelongname = Lump.MakeLongName(this.sprite);
+			else
+				this.spritelongname = long.MaxValue;
+
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Constructor
+		internal ThingTypeInfo(ThingCategory cat, ActorStructure actor)
+		{
+			// Initialize
+			this.index = actor.DoomEdNum;
+			this.category = cat;
+			this.title = "";
+			this.actor = actor;
+			this.classname = actor.ClassName; //mxd
+			this.isknown = true;
+			this.bright = false; //mxd
+			this.args = new ArgumentInfo[Linedef.NUM_ARGS];
+			for(int i = 0; i < Linedef.NUM_ARGS; i++) this.args[i] = new ArgumentInfo(i);
+			
+			// Read properties
+			this.sprite = cat.Sprite;
+			this.color = cat.Color;
+			this.alpha = cat.Alpha; //mxd
+			this.alphabyte = (byte)(this.alpha * 255); //mxd
+			this.renderstyle = cat.RenderStyle; //mxd
+			this.arrow = (cat.Arrow != 0);
+			this.radius = cat.Radius;
+			this.height = cat.Height;
+			this.hangs = (cat.Hangs != 0);
+			this.blocking = cat.Blocking;
+			this.errorcheck = cat.ErrorCheck;
+			this.fixedsize = cat.FixedSize;
+			this.fixedrotation = cat.FixedRotation; //mxd
+			this.absolutez = cat.AbsoluteZ;
+			this.spritescale = new SizeF(cat.SpriteScale, cat.SpriteScale);
+
+			// Safety
+			if(this.radius < 4f) this.radius = 8f;
+			if(this.hangs && this.absolutez) this.hangs = false; //mxd
+			
+			// Apply settings from actor
+			ModifyByDecorateActor(actor);
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		//mxd. Constructor
+		internal ThingTypeInfo(ThingCategory cat, ActorStructure actor, int index)
+		{
+			// Initialize
+			this.index = index;
+			this.category = cat;
+			this.title = "";
+			this.actor = actor;
+			this.classname = actor.ClassName; //mxd
+			this.isknown = true;
+			this.bright = false; //mxd
+			this.args = new ArgumentInfo[Linedef.NUM_ARGS];
+			for(int i = 0; i < Linedef.NUM_ARGS; i++) this.args[i] = new ArgumentInfo(i);
+
+			// Read properties
+			this.sprite = cat.Sprite;
+			this.color = cat.Color;
+			this.alpha = cat.Alpha; //mxd
+			this.alphabyte = (byte)(this.alpha * 255); //mxd
+			this.renderstyle = cat.RenderStyle; //mxd
+			this.arrow = (cat.Arrow != 0);
+			this.radius = cat.Radius;
+			this.height = cat.Height;
+			this.hangs = (cat.Hangs != 0);
+			this.blocking = cat.Blocking;
+			this.errorcheck = cat.ErrorCheck;
+			this.fixedsize = cat.FixedSize;
+			this.fixedrotation = cat.FixedRotation; //mxd
+			this.absolutez = cat.AbsoluteZ;
+			this.spritescale = new SizeF(cat.SpriteScale, cat.SpriteScale);
+
+			// Safety
+			if(this.radius < 4f) this.radius = 8f;
+			if(this.hangs && this.absolutez) this.hangs = false; //mxd
+
+			// Apply settings from actor
+			ModifyByDecorateActor(actor);
+
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Constructor
+		internal ThingTypeInfo(int index, ThingTypeInfo other) 
+		{
+			// Initialize
+			this.index = index;
+			this.category = other.category;
+			this.title = other.title;
+			this.actor = other.actor;
+			this.classname = other.classname; //mxd
+			this.isknown = true;
+			this.args = new ArgumentInfo[Linedef.NUM_ARGS];
+			for(int i = 0; i < Linedef.NUM_ARGS; i++)
+				this.args[i] = other.args[i];
+
+			// Copy properties
+			this.sprite = other.sprite;
+			this.color = other.color;
+			this.alpha = other.alpha; //mxd
+			this.alphabyte = other.alphabyte; //mxd
+			this.renderstyle = other.renderstyle; //mxd
+			this.bright = other.bright; //mxd
+			this.arrow = other.arrow;
+			this.radius = other.radius;
+			this.height = other.height;
+			this.hangs = other.hangs;
+			this.blocking = other.blocking;
+			this.errorcheck = other.errorcheck;
+			this.fixedsize = other.fixedsize;
+			this.fixedrotation = other.fixedrotation; //mxd
+			this.absolutez = other.absolutez;
+			this.xybillboard = other.xybillboard; //mxd
+			this.spritescale = new SizeF(other.spritescale.Width, other.spritescale.Height);
+
+			//mxd. Copy GLOOME properties
+			this.rendermode = other.rendermode;
+			this.sticktoplane = other.sticktoplane;
+			this.rollsprite = other.rollsprite;
+
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		#endregion
+
+		#region ================== Methods
+		
+		// This updates the properties from a decorate actor
+		internal void ModifyByDecorateActor(ActorStructure actor)
+		{
+			// Keep reference to actor
+			this.actor = actor;
+			this.classname = actor.ClassName; //mxd
+			
+			// Set the title
+			if(actor.HasPropertyWithValue("$title"))
+				title = actor.GetPropertyAllValues("$title");
+			else if(actor.HasPropertyWithValue("tag")) 
+			{
+				string tag = actor.GetPropertyAllValues("tag");
+				if(!tag.StartsWith("\"$")) title = tag; //mxd. Don't use LANGUAGE keywords.
+			}
+
+			if(string.IsNullOrEmpty(title)) title = actor.ClassName;
+				
+			//mxd. Color override?
+			if(actor.HasPropertyWithValue("$color")) 
+			{
+				int ci = actor.GetPropertyValueInt("$color", 0);
+				color = (ci == 0 || ci > 19 ? 18 : ci) ;
+			}
+
+			//mxd. Custom argument titles?
+			for(int i = 0; i < args.Length; i++)
+			{
+				if(!actor.HasPropertyWithValue("$arg" + i)) continue;
+				string argtitle = ZDTextParser.StripQuotes(actor.GetPropertyAllValues("$arg" + i));
+				string argtooltip = ZDTextParser.StripQuotes(actor.GetPropertyAllValues("$arg" + i + "tooltip").Replace("\\n", Environment.NewLine));
+				int argtype = actor.GetPropertyValueInt("$arg" + i + "type", 0);
+				int defaultvalue = actor.GetPropertyValueInt("$arg" + i + "default", 0);
+				string argenum = ZDTextParser.StripQuotes(actor.GetPropertyAllValues("$arg" + i + "enum"));
+				args[i] = new ArgumentInfo(title, argtitle, argtooltip, argtype, defaultvalue, argenum, General.Map.Config.Enums);
+			}
+
+			//mxd. Some SLADE compatibility
+			if(actor.HasProperty("$angled")) this.arrow = true;
+			else if(actor.HasProperty("$notangled")) this.arrow = false;
+
+			//mxd. Marked as obsolete?
+			if(actor.HasPropertyWithValue("$obsolete"))
+			{
+				obsoletemessage = ZDTextParser.StripQuotes(actor.GetPropertyValueString("$obsolete", 0));
+				obsolete = true;
+				color = 4; //red
+			}
+
+			// Remove doublequotes from title
+			title = ZDTextParser.StripQuotes(title); //mxd
+			
+			// Set sprite
+			string suitablesprite = (locksprite ? string.Empty : actor.FindSuitableSprite()); //mxd
+			if(!string.IsNullOrEmpty(suitablesprite)) 
+				sprite = suitablesprite;
+			else if(string.IsNullOrEmpty(sprite))//mxd
+				sprite = DataManager.INTERNAL_PREFIX + "unknownthing";
+
+			if(this.sprite.Length < 9)
+				this.spritelongname = Lump.MakeLongName(this.sprite);
+			else
+				this.spritelongname = long.MaxValue;
+			
+			// Set sprite scale (mxd. Scale is translated to xscale and yscale in ActorStructure)
+			if(actor.HasPropertyWithValue("xscale"))
+				this.spritescale.Width = actor.GetPropertyValueFloat("xscale", 0);
+			
+			if(actor.HasPropertyWithValue("yscale"))
+				this.spritescale.Height = actor.GetPropertyValueFloat("yscale", 0);
+			
+			// Size
+			if(actor.HasPropertyWithValue("radius")) radius = actor.GetPropertyValueInt("radius", 0);
+			if(actor.HasPropertyWithValue("height")) height = actor.GetPropertyValueInt("height", 0);
+
+			//mxd. Renderstyle
+			if(actor.HasPropertyWithValue("renderstyle")) renderstyle = actor.GetPropertyValueString("renderstyle", 0).ToLower();
+
+			//mxd. Alpha
+			if(actor.HasPropertyWithValue("alpha"))
+			{
+				this.alpha = General.Clamp(actor.GetPropertyValueFloat("alpha", 0), 0f, 1f);
+				this.alphabyte = (byte)(this.alpha * 255);
+			}
+			else if(actor.HasProperty("defaultalpha"))
+			{
+				this.alpha = (General.Map.Config.GameType == GameType.HERETIC ? 0.4f : 0.6f);
+				this.alphabyte = (byte)(this.alpha * 255);
+			}
+
+			//mxd. BRIGHT
+			this.bright = actor.GetFlagValue("bright", false);
+			
+			// Safety
+			if(this.radius < 4f) this.radius = 8f;
+			if(this.spritescale.Width == 0.0f) this.spritescale.Width = 1.0f;
+			if(this.spritescale.Height == 0.0f) this.spritescale.Height = 1.0f;
+			
+			// Options
+			hangs = actor.GetFlagValue("spawnceiling", hangs);
+			int blockvalue = (blocking > 0) ? blocking : 2;
+			blocking = actor.GetFlagValue("solid", (blocking != 0)) ? blockvalue : 0;
+			xybillboard = actor.GetFlagValue("forcexybillboard", false); //mxd
+
+			//mxd. GLOOME rendering flags. ORDER: WALLSPRITE -> FLOORSPRITE || CEILSPRITE
+			rollsprite = actor.GetFlagValue("rollsprite", false); 
+			if(actor.GetFlagValue("wallsprite", false)) rendermode = Thing.SpriteRenderMode.WALL_SPRITE;
+			else if(actor.GetFlagValue("floorsprite", false)) rendermode = Thing.SpriteRenderMode.FLOOR_SPRITE;
+			else if(actor.GetFlagValue("ceilsprite", false)) rendermode = Thing.SpriteRenderMode.CEILING_SPRITE;
+			if(rendermode == Thing.SpriteRenderMode.FLOOR_SPRITE || rendermode == Thing.SpriteRenderMode.CEILING_SPRITE)
+				sticktoplane = actor.GetFlagValue("sticktoplane", false); // Works only for Floor/Ceil sprites
+
+			//mxd
+			if(blocking > THING_BLOCKING_NONE) errorcheck = THING_ERROR_INSIDE_STUCK;
+		}
+
+		// This is used for sorting
+		public int CompareTo(ThingTypeInfo other)
+		{
+			return string.Compare(this.title, other.title, true);
+		}
+		
+		// String representation
+		public override string ToString()
+		{
+			return title + " (" + index + ")";
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Config/ThingsFlagsCompare.cs b/Source/Core/Config/ThingsFlagsCompare.cs
new file mode 100644
index 0000000..fcbb4a5
--- /dev/null
+++ b/Source/Core/Config/ThingsFlagsCompare.cs
@@ -0,0 +1,316 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.IO;
+using CodeImp.DoomBuilder.Map;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Config
+{
+	//mxd
+	public class ThingFlagsCompareGroup
+	{
+		public readonly string Name;
+		public readonly bool IsOptional; // When set to true, group flags won't be considered as required for a thing to show up ingame by CheckUnusedThings error check and ThingFlagsCompare.CheckThingEditFormFlags() method.
+		public readonly Dictionary<string, ThingFlagsCompare> Flags;
+
+		public ThingFlagsCompareGroup(Configuration cfg, string name)
+		{
+			Name = name;
+			Flags = new Dictionary<string, ThingFlagsCompare>();
+			IsOptional = cfg.ReadSetting("thingflagscompare." + name + ".optional", false);
+
+			IDictionary dic = cfg.ReadSetting("thingflagscompare." + name, new Hashtable());
+			foreach(DictionaryEntry de in dic)
+			{
+				if(de.Value != null && !(de.Value is IDictionary)) continue; // flag either has no value, or is defined as block
+				string flag = de.Key.ToString();
+
+				// Duplicate flags check
+				if(Flags.ContainsKey(flag))
+					General.ErrorLogger.Add(ErrorType.Warning, "ThingFlagsCompare flag '" + flag + "' is double-defined in '" + name + "' group");
+
+				Flags[flag] = new ThingFlagsCompare(cfg, name, flag);
+			}
+		}
+
+		// Compares flags group of the two things.
+		public ThingFlagsCompareResult Compare(Thing t1, Thing t2)
+		{
+			ThingFlagsCompareResult result = new ThingFlagsCompareResult();
+			foreach(ThingFlagsCompare tfc in Flags.Values)
+			{
+				// Current flag doesn't overlap when required flag does not overlap
+				if(!string.IsNullOrEmpty(tfc.RequiredFlag) && !GetFlag(tfc.RequiredFlag).Compare(t1, t2))
+				{
+					result.Result = -1;
+					continue;
+				}
+
+				// Compare current flag
+				bool flagoverlaps = tfc.Compare(t1, t2);
+
+				// Ignore this group when whole group doens't match or required flag is not set
+				if(!flagoverlaps && tfc.IgnoreGroupWhenUnset) return new ThingFlagsCompareResult { Result = 0 };
+
+				// If current flag overlaps, check IgnoredGroup and RequiredGroup settings
+				if(flagoverlaps)
+				{
+					result.Result = 1;
+					
+					foreach(string s in tfc.IgnoredGroups)
+					{
+						if(!result.IgnoredGroups.Contains(s)) result.IgnoredGroups.Add(s);
+					}
+
+					if(tfc.RequiredGroups.Count > 0)
+					{
+						foreach(string s in tfc.RequiredGroups)
+						{
+							if(result.IgnoredGroups.Contains(s)) result.IgnoredGroups.Remove(s);
+							if(!result.RequiredGroups.Contains(s)) result.RequiredGroups.Add(s);
+						}
+					}
+				}
+			}
+
+			return result;
+		}
+
+		public ThingFlagsCompare GetFlag(string flag)
+		{
+			// Check our flags
+			if(Flags.ContainsKey(flag)) return Flags[flag];
+
+			// Check other groups
+			foreach(ThingFlagsCompareGroup group in General.Map.Config.ThingFlagsCompare.Values)
+			{
+				if(group != this && group.Flags.ContainsKey(flag)) return group.Flags[flag];
+			}
+
+			// Fial...
+			return null;
+		}
+	}
+
+	//mxd
+	public class ThingFlagsCompareResult
+	{
+		public readonly HashSet<string> IgnoredGroups;
+		public readonly HashSet<string> RequiredGroups;
+		
+		// -1 if group does not overlap
+		//	0 if group should be ignored
+		//	1 if group overlaps
+		public int Result;
+
+		public ThingFlagsCompareResult()
+		{
+			Result = -1;
+			IgnoredGroups = new HashSet<string>();
+			RequiredGroups = new HashSet<string>();
+		}
+	}
+	
+	public class ThingFlagsCompare
+	{
+		private enum CompareMethod
+		{
+			Equal,
+			And
+		};
+
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		private readonly string flag;
+		private readonly HashSet<string> requiredgroups; //mxd. This flag only works if at least one flag is set in the "requiredgroup"
+		private readonly HashSet<string> ignoredgroups; //mxd. If this flag is set, flags from ignoredgroup can be... well... ignored!
+		private string requiredflag; //mxd. This flag only works if requiredflag is set.
+		private readonly bool ingnorethisgroupwhenunset; //mxd
+		private readonly CompareMethod comparemethod;
+		private readonly bool invert;
+		private readonly char[] comma = new[] {','};
+
+		#endregion
+
+		#region ================== Properties
+
+		public string Flag { get { return flag; } }
+		public HashSet<string> RequiredGroups { get { return requiredgroups; } } //mxd
+		public HashSet<string> IgnoredGroups { get { return ignoredgroups; } } //mxd
+		public string RequiredFlag { get { return requiredflag; } internal set { requiredflag = value; } } //mxd
+		public bool IgnoreGroupWhenUnset { get { return ingnorethisgroupwhenunset; } } //mxd
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public ThingFlagsCompare(Configuration cfg, string group, string flag)
+		{
+			string cfgpath = "thingflagscompare." + group + "." + flag;
+			this.flag = flag;
+
+			string cm = cfg.ReadSetting(cfgpath + ".comparemethod", "and");
+			switch(cm)
+			{
+				default:
+					General.ErrorLogger.Add(ErrorType.Warning, "Unrecognized value \"" + cm + "\" for comparemethod in " + cfgpath + " in game configuration " + cfg.ReadSetting("game", "<unnamed game>") + ". Defaulting to \"and\".");
+					goto case "and";
+				case "and":
+					comparemethod = CompareMethod.And;
+					break;
+				case "equal":
+					comparemethod = CompareMethod.Equal;
+					break;
+			}
+
+			invert = cfg.ReadSetting(cfgpath + ".invert", false);
+			
+			//mxd
+			requiredgroups = new HashSet<string>();
+			string[] requiredgroupsarr = cfg.ReadSetting(cfgpath + ".requiredgroups", string.Empty).Split(comma, StringSplitOptions.RemoveEmptyEntries);
+			foreach(string s in requiredgroupsarr)
+				if(!requiredgroups.Contains(s)) requiredgroups.Add(s);
+
+			//mxd
+			ignoredgroups = new HashSet<string>();
+			string[] ignoredgroupsarr = cfg.ReadSetting(cfgpath + ".ignoredgroups", string.Empty).Split(comma, StringSplitOptions.RemoveEmptyEntries);
+			foreach(string s in ignoredgroupsarr)
+				if(!ignoredgroups.Contains(s)) ignoredgroups.Add(s);
+
+			requiredflag = cfg.ReadSetting(cfgpath + ".requiredflag", string.Empty); //mxd
+			ingnorethisgroupwhenunset = cfg.ReadSetting(cfgpath + ".ingnorethisgroupwhenunset", false); //mxd
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// Compares the flag of the two things.
+		public bool Compare(Thing t1, Thing t2)
+		{
+			//mxd. Get flags
+			bool t1flag = (invert ? !t1.IsFlagSet(flag) : t1.IsFlagSet(flag));
+			bool t2flag = (invert ? !t2.IsFlagSet(flag) : t2.IsFlagSet(flag));
+
+			//mxd. Ignore the flag when ingnorethisgroupwhenunset is set and both flags are unset
+			if(!t1flag && !t2flag && ingnorethisgroupwhenunset) return false;
+
+			//mxd. Compare them
+			switch(comparemethod)
+			{
+				case CompareMethod.And: return t1flag && t2flag;
+				case CompareMethod.Equal: return t1flag == t2flag;
+				default: throw new NotImplementedException("Unknown compare method!");
+			}
+		}
+
+		//mxd
+		public static List<string> CheckFlags(HashSet<string> flags)
+		{
+			Dictionary<string, HashSet<string>> flagspergroup = new Dictionary<string, HashSet<string>>(General.Map.Config.ThingFlagsCompare.Count);
+			HashSet<string> ignoredgroups = new HashSet<string>();
+
+			// Gather flags per group
+			foreach(KeyValuePair<string, ThingFlagsCompareGroup> group in General.Map.Config.ThingFlagsCompare)
+			{
+				flagspergroup.Add(group.Key, new HashSet<string>());
+
+				foreach(ThingFlagsCompare flag in group.Value.Flags.Values)
+				{
+					if(IsFlagSet(flags, flag.flag, flag.invert) && 
+						(string.IsNullOrEmpty(flag.requiredflag) || IsFlagSet(flags, flag.requiredflag, group.Value.GetFlag(flag.requiredflag).invert)))
+					{
+						flagspergroup[group.Key].Add(flag.Flag);
+						foreach(string s in flag.ignoredgroups)
+							if(!ignoredgroups.Contains(s)) ignoredgroups.Add(s);
+					}
+					else if(flag.ingnorethisgroupwhenunset)
+					{
+						flagspergroup.Remove(group.Key);
+						break;
+					}
+				}
+			}
+
+			// Check required dependancies
+			foreach(KeyValuePair<string, HashSet<string>> group in flagspergroup)
+			{
+				foreach(string flag in group.Value)
+				{
+					foreach(string s in General.Map.Config.ThingFlagsCompare[group.Key].Flags[flag].requiredgroups)
+					{
+						if(ignoredgroups.Contains(s)) ignoredgroups.Remove(s);
+					}
+				}
+			}
+
+			// Get rid of ignoredgroups
+			foreach(string s in ignoredgroups) flagspergroup.Remove(s);
+			
+			// Return message
+			List<string> result = new List<string>();
+
+			foreach(KeyValuePair<string, HashSet<string>> group in flagspergroup)
+			{
+				if(group.Value.Count == 0 && !General.Map.Config.ThingFlagsCompare[group.Key].IsOptional)
+				{
+					switch(group.Key) 
+					{
+						case "skills":
+							result.Add("Thing is not used in any skill level.");
+							break;
+						case "gamemodes":
+							result.Add("Thing is not used in any game mode.");
+							break;
+						case "classes":
+							result.Add("Thing is not used by any class.");
+							break;
+						default:
+							result.Add("At least one '" + group.Key + "' flag should be set.");
+							break;
+					}
+				}
+			}
+
+			return result;
+		}
+
+		//mxd
+		private static bool IsFlagSet(HashSet<string> flags, string flag, bool invert)
+		{
+			bool result = flags.Contains(flag);
+			return (invert ? !result : result);
+		}
+
+		#endregion
+	}
+}
+
diff --git a/Source/Core/Config/UniversalFieldInfo.cs b/Source/Core/Config/UniversalFieldInfo.cs
new file mode 100644
index 0000000..c58871b
--- /dev/null
+++ b/Source/Core/Config/UniversalFieldInfo.cs
@@ -0,0 +1,106 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.IO;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Config
+{
+	public class UniversalFieldInfo : IComparable<UniversalFieldInfo>
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		// Properties
+		private string name;
+		private int type;
+		private object defaultvalue;
+		private EnumList enumlist;
+
+		#endregion
+
+		#region ================== Properties
+
+		public string Name { get { return name; } }
+		public int Type { get { return type; } }
+		public object Default { get { return defaultvalue; } }
+		public EnumList Enum { get { return enumlist; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		internal UniversalFieldInfo(string path, string name, Configuration cfg, IDictionary<string, EnumList> enums)
+		{
+			string setting = "universalfields." + path + "." + name;
+
+			// Initialize
+			this.name = name.ToLowerInvariant();
+
+			// Read type
+			this.type = cfg.ReadSetting(setting + ".type", 0);
+			this.defaultvalue = cfg.ReadSettingObject(setting + ".default", null);
+			
+			// Read enum
+			object enumsetting = cfg.ReadSettingObject(setting + ".enum", null);
+			if(enumsetting != null)
+			{
+				// Reference to existing enums list?
+				if(enumsetting is string)
+				{
+					// Link to it
+					enumlist = enums[enumsetting.ToString()];
+				}
+				else if(enumsetting is IDictionary)
+				{
+					// Make list
+					enumlist = new EnumList(enumsetting as IDictionary);
+				}
+			}
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This presents the item as string
+		public override string ToString()
+		{
+			return name;
+		}
+
+		// This compares against another field
+		public int CompareTo(UniversalFieldInfo other)
+		{
+			return string.Compare(this.name, other.name);
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Controls/ActionSelectorControl.Designer.cs b/Source/Core/Controls/ActionSelectorControl.Designer.cs
new file mode 100644
index 0000000..2fa6bae
--- /dev/null
+++ b/Source/Core/Controls/ActionSelectorControl.Designer.cs
@@ -0,0 +1,101 @@
+namespace CodeImp.DoomBuilder.Controls
+{
+	partial class ActionSelectorControl
+	{
+		/// <summary> 
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Component Designer generated code
+
+		/// <summary> 
+		/// Required method for Designer support - do not modify 
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.number = new CodeImp.DoomBuilder.Controls.AutoSelectTextbox();
+			this.list = new System.Windows.Forms.ComboBox();
+			this.numberpanel = new System.Windows.Forms.Panel();
+			this.numberpanel.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// number
+			// 
+			this.number.BorderStyle = System.Windows.Forms.BorderStyle.None;
+			this.number.ImeMode = System.Windows.Forms.ImeMode.Off;
+			this.number.Location = new System.Drawing.Point(3, 1);
+			this.number.Name = "number";
+			this.number.Size = new System.Drawing.Size(43, 13);
+			this.number.TabIndex = 0;
+			this.number.Text = "402";
+			this.number.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
+			this.number.TextChanged += new System.EventHandler(this.number_TextChanged);
+			this.number.KeyDown += new System.Windows.Forms.KeyEventHandler(this.number_KeyDown);
+			this.number.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.number_KeyPress);
+			// 
+			// list
+			// 
+			this.list.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
+			this.list.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.list.FormattingEnabled = true;
+			this.list.IntegralHeight = false;
+			this.list.Location = new System.Drawing.Point(57, 0);
+			this.list.MaxDropDownItems = 15;
+			this.list.Name = "list";
+			this.list.Size = new System.Drawing.Size(251, 21);
+			this.list.TabIndex = 1;
+			this.list.TabStop = false;
+			this.list.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.list_DrawItem);
+			this.list.SelectionChangeCommitted += new System.EventHandler(this.list_SelectionChangeCommitted);
+			this.list.DropDownClosed += new System.EventHandler(this.list_DropDownClosed);
+			// 
+			// numberpanel
+			// 
+			this.numberpanel.BackColor = System.Drawing.SystemColors.Window;
+			this.numberpanel.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+			this.numberpanel.Controls.Add(this.number);
+			this.numberpanel.Location = new System.Drawing.Point(0, 0);
+			this.numberpanel.Name = "numberpanel";
+			this.numberpanel.Size = new System.Drawing.Size(53, 21);
+			this.numberpanel.TabIndex = 0;
+			// 
+			// ActionSelectorControl
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.BackColor = System.Drawing.Color.Transparent;
+			this.Controls.Add(this.numberpanel);
+			this.Controls.Add(this.list);
+			this.Cursor = System.Windows.Forms.Cursors.Default;
+			this.Name = "ActionSelectorControl";
+			this.Size = new System.Drawing.Size(382, 21);
+			this.Layout += new System.Windows.Forms.LayoutEventHandler(this.ActionSelectorControl_Layout);
+			this.Resize += new System.EventHandler(this.ActionSelectorControl_Resize);
+			this.numberpanel.ResumeLayout(false);
+			this.numberpanel.PerformLayout();
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private CodeImp.DoomBuilder.Controls.AutoSelectTextbox number;
+		private System.Windows.Forms.ComboBox list;
+		private System.Windows.Forms.Panel numberpanel;
+	}
+}
diff --git a/Source/Core/Controls/ActionSelectorControl.cs b/Source/Core/Controls/ActionSelectorControl.cs
new file mode 100644
index 0000000..13d7f5b
--- /dev/null
+++ b/Source/Core/Controls/ActionSelectorControl.cs
@@ -0,0 +1,305 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Config;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Controls
+{
+	public partial class ActionSelectorControl : UserControl
+	{
+		// Events
+		public event EventHandler ValueChanges;
+		
+		// Variables
+		private List<GeneralizedCategory> generalizedcategories;
+		private List<GeneralizedOption> generalizedoptions; //mxd
+		private bool controlpressed;
+		
+		// Constants
+		private const string NUMBER_SEPERATOR = "\t";
+		
+		// Properties
+		public bool Empty { get { return (number.Text.Length == 0); } set { if(value) number.Text = ""; } }
+		public int Value { get { return GetValue(); } set { number.Text = value.ToString(); } }
+		public List<GeneralizedCategory> GeneralizedCategories { get { return generalizedcategories; } set { generalizedcategories = value; } }
+		public List<GeneralizedOption> GeneralizedOptions { get { return generalizedoptions; } set { generalizedoptions = value; } } //mxd
+		
+		// Constructor
+		public ActionSelectorControl()
+		{
+			// Initialize
+			InitializeComponent();
+			number.MouseWheel += number_OnMouseWheel; //mxd
+		}
+
+		// This returns the numeric value
+		public int GetValue()
+		{
+			int val = 0;
+
+			if(number.Text.Length > 0)
+			{
+				try
+				{
+					val = Convert.ToInt32(number.Text);
+				}
+				catch(Exception) { }
+			}
+			
+			return val;
+		}
+
+		// This clears all information
+		public void ClearInfo()
+		{
+			list.Items.Clear();
+		}
+		
+		// This adds information to display
+		public void AddInfo(INumberedTitle[] infolist)
+		{
+			// Add to list
+			list.Items.AddRange(infolist);
+		}
+
+		// Resized
+		private void ActionSelectorControl_Resize(object sender, EventArgs e)
+		{
+			list.Width = ClientRectangle.Width - list.Left;
+			ClientSize = new Size(ClientSize.Width, list.Height);
+		}
+
+		// Layout change
+		private void ActionSelectorControl_Layout(object sender, LayoutEventArgs e)
+		{
+			ActionSelectorControl_Resize(sender, e);
+		}
+
+		// This draws an item in the combobox
+		private void list_DrawItem(object sender, DrawItemEventArgs e)
+		{
+			Brush displaybrush = SystemBrushes.WindowText;
+			Brush backbrush = SystemBrushes.Window;
+			string displayname = string.Empty;
+
+			// Only when running
+			if(!this.DesignMode)
+			{
+				// Unknow item?
+				if(e.Index < 0)
+				{
+					// Grayed
+					displaybrush = new SolidBrush(SystemColors.GrayText);
+					backbrush = new SolidBrush(SystemColors.Window);
+
+					// Try getting integral number
+					int intnumber;
+					int.TryParse(number.Text, out intnumber);
+
+					// Check what to display
+					if(number.Text.Length == 0)
+						displayname = "";
+					else if(intnumber == 0)
+						displayname = "None";
+					else if((generalizedcategories != null) && GameConfiguration.IsGeneralized(intnumber, generalizedcategories))
+						displayname = "Generalized (" + General.Map.Config.GetGeneralizedActionCategory(intnumber) + ")";
+					else if((generalizedoptions != null) && GameConfiguration.IsGeneralizedSectorEffect(intnumber, generalizedoptions)) //mxd
+						displayname = General.Map.Config.GetGeneralizedSectorEffectName(intnumber); //mxd
+					else
+						displayname = "Unknown";
+				}
+				// In the display part of the combobox?
+				else if((e.State & DrawItemState.ComboBoxEdit) != 0)
+				{
+					// Show without number
+					INumberedTitle item = (INumberedTitle)list.Items[e.Index];
+					displayname = item.Title.Trim();
+
+					// Determine colors to use
+					if(item.Index == 0)
+					{
+						// Grayed
+						displaybrush = new SolidBrush(SystemColors.GrayText);
+						backbrush = new SolidBrush(SystemColors.Window);
+					}
+					else
+					{
+						// Normal color
+						displaybrush = new SolidBrush(list.ForeColor);
+						backbrush = new SolidBrush(SystemColors.Window);
+					}
+				}
+				else
+				{
+					// Use number and description
+					INumberedTitle item = (INumberedTitle)list.Items[e.Index];
+					displayname = item.Index + NUMBER_SEPERATOR + item.Title;
+
+					// Determine colors to use
+					if((e.State & DrawItemState.Focus) != 0)
+					{
+						displaybrush = new SolidBrush(SystemColors.HighlightText);
+						backbrush = new SolidBrush(SystemColors.Highlight);
+					}
+					else
+					{
+						displaybrush = new SolidBrush(list.ForeColor);
+						backbrush = new SolidBrush(SystemColors.Window);
+					}
+				}
+			}
+
+			// Draw item
+			e.Graphics.FillRectangle(backbrush, e.Bounds);
+			e.Graphics.DrawString(displayname, list.Font, displaybrush, e.Bounds.X, e.Bounds.Y);
+
+			//mxd. Dispose brushes
+			if(!this.DesignMode)
+			{
+				backbrush.Dispose();
+				displaybrush.Dispose();
+			}
+		}
+
+		// List closed
+		private void list_DropDownClosed(object sender, EventArgs e)
+		{
+			// Focus to number box
+			number.SelectAll();
+			number.Focus();
+		}
+
+		// Number changes
+		private void number_TextChanged(object sender, EventArgs e)
+		{
+			int itemindex = -1;
+
+			// Not nothing?
+			if(number.Text.Length > 0)
+			{
+				// Find the index in the list
+				for(int i = 0; i < list.Items.Count; i++)
+				{
+					// This is the item we're looking for?
+					INumberedTitle item = (INumberedTitle)list.Items[i];
+					if(item.Index.ToString() == number.Text)
+					{
+						// Found it
+						itemindex = i;
+						break;
+					}
+				}
+			}
+
+			// Select item
+			if(list.SelectedIndex != itemindex)
+			{
+				list.SelectedIndex = itemindex;
+				list.Refresh();
+			}
+
+			// Raise change event
+			//mxd. This HAS to be raised during Edit form setup, otherwise TypeHandlers in ArgumentBoxes won't be initialized
+			if(ValueChanges != null) ValueChanges(this, EventArgs.Empty);
+		}
+
+		// Keys pressed in number box
+		private void number_KeyDown(object sender, KeyEventArgs e)
+		{
+			controlpressed = e.Control;
+
+			// Allow CTRL+X, CTRL+C and CTRL+V
+			if(controlpressed && ((e.KeyCode == Keys.X) || (e.KeyCode == Keys.C) || (e.KeyCode == Keys.V))) return;
+
+			//mxd. Scroll action list using arrow keys
+			if(e.KeyCode == Keys.Down)
+			{
+				if(list.SelectedIndex > 0)
+				{
+					list.SelectedIndex--;
+					list_SelectionChangeCommitted(list, EventArgs.Empty);
+				}
+				// Cancel this
+				e.Handled = true;
+				return;
+			}
+			if(e.KeyCode == Keys.Up) 
+			{
+				if(list.SelectedIndex < list.Items.Count)
+				{
+					list.SelectedIndex++;
+					list_SelectionChangeCommitted(list, EventArgs.Empty);
+				}
+				// Cancel this
+				e.Handled = true;
+				return;
+			}
+
+			// Not numeric or control key?
+			if(((e.KeyValue < 48) || (e.KeyValue > 57)) &&
+			   (e.KeyCode != Keys.Back) && (e.KeyCode != Keys.Left) &&
+			   (e.KeyCode != Keys.Right) && (e.KeyCode != Keys.Delete))
+			{
+				// Cancel this
+				e.Handled = true;
+			}
+		}
+
+		// Keys pressed in number box
+		private void number_KeyPress(object sender, KeyPressEventArgs e)
+		{
+			// Allow CTRL+X, CTRL+C and CTRL+V
+			if(controlpressed && ((e.KeyChar == '\u0018') || (e.KeyChar == '\u0003') || (e.KeyChar == '\u0016'))) return;
+			
+			// Not numeric or control key?
+			if(((e.KeyChar < 48) || (e.KeyChar > 57)) && (e.KeyChar != 8))
+			{
+				// Cancel this
+				e.Handled = true;
+			}
+		}
+
+		//mxd. Scrolls action list using mouse wheel
+		private void number_OnMouseWheel(object sender, MouseEventArgs e) 
+		{
+			if(e.Delta < 0 && list.SelectedIndex > 0)
+			{
+				list.SelectedIndex--;
+				list_SelectionChangeCommitted(list, EventArgs.Empty);
+			}
+			else if(e.Delta > 0 && list.SelectedIndex < list.Items.Count - 1)
+			{
+				list.SelectedIndex++;
+				list_SelectionChangeCommitted(list, EventArgs.Empty);
+			}
+		}
+		
+		// Selection made
+		private void list_SelectionChangeCommitted(object sender, EventArgs e)
+		{
+			INumberedTitle item = (INumberedTitle)list.SelectedItem;
+			number.Text = item.Index.ToString();
+		}
+	}
+}
diff --git a/Source/Core/Controls/ActionSelectorControl.resx b/Source/Core/Controls/ActionSelectorControl.resx
new file mode 100644
index 0000000..45d0b51
--- /dev/null
+++ b/Source/Core/Controls/ActionSelectorControl.resx
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+	Microsoft ResX Schema 
+	
+	Version 2.0
+	
+	The primary goals of this format is to allow a simple XML format 
+	that is mostly human readable. The generation and parsing of the 
+	various data types are done through the TypeConverter classes 
+	associated with the data types.
+	
+	Example:
+	
+	... ado.net/XML headers & schema ...
+	<resheader name="resmimetype">text/microsoft-resx</resheader>
+	<resheader name="version">2.0</resheader>
+	<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+	<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+	<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+	<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+	<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+		<value>[base64 mime encoded serialized .NET Framework object]</value>
+	</data>
+	<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+		<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+		<comment>This is a comment</comment>
+	</data>
+				
+	There are any number of "resheader" rows that contain simple 
+	name/value pairs.
+	
+	Each data row contains a name, and value. The row also contains a 
+	type or mimetype. Type corresponds to a .NET class that support 
+	text/value conversion through the TypeConverter architecture. 
+	Classes that don't support this are serialized and stored with the 
+	mimetype set.
+	
+	The mimetype is used for serialized objects, and tells the 
+	ResXResourceReader how to depersist the object. This is currently not 
+	extensible. For a given mimetype the value must be set accordingly:
+	
+	Note - application/x-microsoft.net.object.binary.base64 is the format 
+	that the ResXResourceWriter will generate, however the reader can 
+	read any of the formats listed below.
+	
+	mimetype: application/x-microsoft.net.object.binary.base64
+	value   : The object must be serialized with 
+			: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+			: and then encoded with base64 encoding.
+	
+	mimetype: application/x-microsoft.net.object.soap.base64
+	value   : The object must be serialized with 
+			: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+			: and then encoded with base64 encoding.
+
+	mimetype: application/x-microsoft.net.object.bytearray.base64
+	value   : The object must be serialized into a byte array 
+			: using a System.ComponentModel.TypeConverter
+			: and then encoded with base64 encoding.
+	-->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+	<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+	<xsd:element name="root" msdata:IsDataSet="true">
+	  <xsd:complexType>
+		<xsd:choice maxOccurs="unbounded">
+		  <xsd:element name="metadata">
+			<xsd:complexType>
+			  <xsd:sequence>
+				<xsd:element name="value" type="xsd:string" minOccurs="0" />
+			  </xsd:sequence>
+			  <xsd:attribute name="name" use="required" type="xsd:string" />
+			  <xsd:attribute name="type" type="xsd:string" />
+			  <xsd:attribute name="mimetype" type="xsd:string" />
+			  <xsd:attribute ref="xml:space" />
+			</xsd:complexType>
+		  </xsd:element>
+		  <xsd:element name="assembly">
+			<xsd:complexType>
+			  <xsd:attribute name="alias" type="xsd:string" />
+			  <xsd:attribute name="name" type="xsd:string" />
+			</xsd:complexType>
+		  </xsd:element>
+		  <xsd:element name="data">
+			<xsd:complexType>
+			  <xsd:sequence>
+				<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+				<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+			  </xsd:sequence>
+			  <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+			  <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+			  <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+			  <xsd:attribute ref="xml:space" />
+			</xsd:complexType>
+		  </xsd:element>
+		  <xsd:element name="resheader">
+			<xsd:complexType>
+			  <xsd:sequence>
+				<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+			  </xsd:sequence>
+			  <xsd:attribute name="name" type="xsd:string" use="required" />
+			</xsd:complexType>
+		  </xsd:element>
+		</xsd:choice>
+	  </xsd:complexType>
+	</xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+	<value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+	<value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+	<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+	<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="number.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+	<value>True</value>
+  </metadata>
+  <metadata name="list.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+	<value>True</value>
+  </metadata>
+  <metadata name="numberpanel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+	<value>True</value>
+  </metadata>
+  <metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+	<value>True</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Controls/ActionSpecialHelpButton.Designer.cs b/Source/Core/Controls/ActionSpecialHelpButton.Designer.cs
new file mode 100644
index 0000000..dd71e7b
--- /dev/null
+++ b/Source/Core/Controls/ActionSpecialHelpButton.Designer.cs
@@ -0,0 +1,62 @@
+namespace CodeImp.DoomBuilder.Controls
+{
+	partial class ActionSpecialHelpButton
+	{
+		/// <summary> 
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing) {
+			if(disposing && (components != null)) {
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Component Designer generated code
+
+		/// <summary> 
+		/// Required method for Designer support - do not modify 
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent() {
+			this.components = new System.ComponentModel.Container();
+			this.button = new System.Windows.Forms.Button();
+			this.tooltip = new System.Windows.Forms.ToolTip(this.components);
+			this.SuspendLayout();
+			// 
+			// button
+			// 
+			this.button.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.button.Image = global::CodeImp.DoomBuilder.Properties.Resources.Help;
+			this.button.Location = new System.Drawing.Point(0, 0);
+			this.button.Margin = new System.Windows.Forms.Padding(0);
+			this.button.Name = "button";
+			this.button.Size = new System.Drawing.Size(28, 26);
+			this.button.TabIndex = 0;
+			this.tooltip.SetToolTip(this.button, "Open Action Reference");
+			this.button.UseVisualStyleBackColor = true;
+			this.button.Click += new System.EventHandler(this.button_Click);
+			// 
+			// ActionSpecialHelpButton
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.Controls.Add(this.button);
+			this.Name = "ActionSpecialHelpButton";
+			this.Size = new System.Drawing.Size(28, 26);
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Button button;
+		private System.Windows.Forms.ToolTip tooltip;
+	}
+}
diff --git a/Source/Core/Controls/ActionSpecialHelpButton.cs b/Source/Core/Controls/ActionSpecialHelpButton.cs
new file mode 100644
index 0000000..1727d18
--- /dev/null
+++ b/Source/Core/Controls/ActionSpecialHelpButton.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Windows.Forms;
+
+namespace CodeImp.DoomBuilder.Controls
+{
+	public partial class ActionSpecialHelpButton : UserControl
+	{
+		private int action;
+		
+		public ActionSpecialHelpButton() 
+		{
+			InitializeComponent();
+		}
+
+		public void UpdateAction(int newaction)
+		{
+			action = newaction;
+
+			//Can we display help?
+			this.Enabled = (action != 0 
+				&& !string.IsNullOrEmpty(General.Map.Config.ActionSpecialHelp)
+				&& General.Map.Config.LinedefActions.ContainsKey(action)
+				&& !string.IsNullOrEmpty(General.Map.Config.LinedefActions[action].Id));
+		}
+
+		private void button_Click(object sender, EventArgs e)
+		{
+			string site = General.Map.Config.ActionSpecialHelp.Replace("%K", General.Map.Config.LinedefActions[action].Id);
+			General.OpenWebsite(site);
+		}
+	}
+}
diff --git a/Source/Core/Controls/ActionSpecialHelpButton.resx b/Source/Core/Controls/ActionSpecialHelpButton.resx
new file mode 100644
index 0000000..b9dfa25
--- /dev/null
+++ b/Source/Core/Controls/ActionSpecialHelpButton.resx
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Controls/AngleControl.Designer.cs b/Source/Core/Controls/AngleControl.Designer.cs
new file mode 100644
index 0000000..ef4935a
--- /dev/null
+++ b/Source/Core/Controls/AngleControl.Designer.cs
@@ -0,0 +1,170 @@
+namespace CodeImp.DoomBuilder.Controls
+{
+	partial class AngleControl
+	{
+		/// <summary> 
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Component Designer generated code
+
+		/// <summary> 
+		/// Required method for Designer support - do not modify 
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.button0 = new System.Windows.Forms.RadioButton();
+			this.button1 = new System.Windows.Forms.RadioButton();
+			this.button2 = new System.Windows.Forms.RadioButton();
+			this.button3 = new System.Windows.Forms.RadioButton();
+			this.button4 = new System.Windows.Forms.RadioButton();
+			this.button5 = new System.Windows.Forms.RadioButton();
+			this.button6 = new System.Windows.Forms.RadioButton();
+			this.button7 = new System.Windows.Forms.RadioButton();
+			this.SuspendLayout();
+			// 
+			// button0
+			// 
+			this.button0.AutoSize = true;
+			this.button0.BackColor = System.Drawing.Color.Transparent;
+			this.button0.Location = new System.Drawing.Point(62, 33);
+			this.button0.Name = "button0";
+			this.button0.Padding = new System.Windows.Forms.Padding(3);
+			this.button0.Size = new System.Drawing.Size(20, 19);
+			this.button0.TabIndex = 0;
+			this.button0.UseVisualStyleBackColor = false;
+			this.button0.CheckedChanged += new System.EventHandler(this.button_CheckedChanged);
+			// 
+			// button1
+			// 
+			this.button1.AutoSize = true;
+			this.button1.BackColor = System.Drawing.Color.Transparent;
+			this.button1.Location = new System.Drawing.Point(54, 11);
+			this.button1.Name = "button1";
+			this.button1.Padding = new System.Windows.Forms.Padding(3);
+			this.button1.Size = new System.Drawing.Size(20, 19);
+			this.button1.TabIndex = 1;
+			this.button1.UseVisualStyleBackColor = false;
+			this.button1.CheckedChanged += new System.EventHandler(this.button_CheckedChanged);
+			// 
+			// button2
+			// 
+			this.button2.AutoSize = true;
+			this.button2.BackColor = System.Drawing.Color.Transparent;
+			this.button2.Location = new System.Drawing.Point(33, 3);
+			this.button2.Name = "button2";
+			this.button2.Padding = new System.Windows.Forms.Padding(3);
+			this.button2.Size = new System.Drawing.Size(20, 19);
+			this.button2.TabIndex = 2;
+			this.button2.UseVisualStyleBackColor = false;
+			this.button2.CheckedChanged += new System.EventHandler(this.button_CheckedChanged);
+			// 
+			// button3
+			// 
+			this.button3.AutoSize = true;
+			this.button3.BackColor = System.Drawing.Color.Transparent;
+			this.button3.Location = new System.Drawing.Point(11, 11);
+			this.button3.Name = "button3";
+			this.button3.Padding = new System.Windows.Forms.Padding(3);
+			this.button3.Size = new System.Drawing.Size(20, 19);
+			this.button3.TabIndex = 3;
+			this.button3.UseVisualStyleBackColor = false;
+			this.button3.CheckedChanged += new System.EventHandler(this.button_CheckedChanged);
+			// 
+			// button4
+			// 
+			this.button4.AutoSize = true;
+			this.button4.BackColor = System.Drawing.Color.Transparent;
+			this.button4.Location = new System.Drawing.Point(3, 33);
+			this.button4.Name = "button4";
+			this.button4.Padding = new System.Windows.Forms.Padding(3);
+			this.button4.Size = new System.Drawing.Size(20, 19);
+			this.button4.TabIndex = 4;
+			this.button4.UseVisualStyleBackColor = false;
+			this.button4.CheckedChanged += new System.EventHandler(this.button_CheckedChanged);
+			// 
+			// button5
+			// 
+			this.button5.AutoSize = true;
+			this.button5.BackColor = System.Drawing.Color.Transparent;
+			this.button5.Location = new System.Drawing.Point(11, 55);
+			this.button5.Name = "button5";
+			this.button5.Padding = new System.Windows.Forms.Padding(3);
+			this.button5.Size = new System.Drawing.Size(20, 19);
+			this.button5.TabIndex = 5;
+			this.button5.UseVisualStyleBackColor = false;
+			this.button5.CheckedChanged += new System.EventHandler(this.button_CheckedChanged);
+			// 
+			// button6
+			// 
+			this.button6.AutoSize = true;
+			this.button6.BackColor = System.Drawing.Color.Transparent;
+			this.button6.Location = new System.Drawing.Point(33, 63);
+			this.button6.Name = "button6";
+			this.button6.Padding = new System.Windows.Forms.Padding(3);
+			this.button6.Size = new System.Drawing.Size(20, 19);
+			this.button6.TabIndex = 6;
+			this.button6.UseVisualStyleBackColor = false;
+			this.button6.CheckedChanged += new System.EventHandler(this.button_CheckedChanged);
+			// 
+			// button7
+			// 
+			this.button7.AutoSize = true;
+			this.button7.BackColor = System.Drawing.Color.Transparent;
+			this.button7.Location = new System.Drawing.Point(54, 55);
+			this.button7.Name = "button7";
+			this.button7.Padding = new System.Windows.Forms.Padding(3);
+			this.button7.Size = new System.Drawing.Size(20, 19);
+			this.button7.TabIndex = 7;
+			this.button7.UseVisualStyleBackColor = false;
+			this.button7.CheckedChanged += new System.EventHandler(this.button_CheckedChanged);
+			// 
+			// AngleControl
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.BackColor = System.Drawing.SystemColors.Control;
+			this.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+			this.Controls.Add(this.button7);
+			this.Controls.Add(this.button6);
+			this.Controls.Add(this.button5);
+			this.Controls.Add(this.button4);
+			this.Controls.Add(this.button3);
+			this.Controls.Add(this.button2);
+			this.Controls.Add(this.button1);
+			this.Controls.Add(this.button0);
+			this.Name = "AngleControl";
+			this.Size = new System.Drawing.Size(84, 84);
+			this.Paint += new System.Windows.Forms.PaintEventHandler(this.AngleControl_Paint);
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.RadioButton button0;
+		private System.Windows.Forms.RadioButton button1;
+		private System.Windows.Forms.RadioButton button2;
+		private System.Windows.Forms.RadioButton button3;
+		private System.Windows.Forms.RadioButton button4;
+		private System.Windows.Forms.RadioButton button5;
+		private System.Windows.Forms.RadioButton button6;
+		private System.Windows.Forms.RadioButton button7;
+	}
+}
diff --git a/Source/Core/Controls/AngleControl.cs b/Source/Core/Controls/AngleControl.cs
new file mode 100644
index 0000000..6f60f6f
--- /dev/null
+++ b/Source/Core/Controls/AngleControl.cs
@@ -0,0 +1,155 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Geometry;
+using System.Drawing.Drawing2D;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Controls
+{
+	/// <summary>
+	/// Control which allows you to click on one of the buttons to select a rotation by 45 degrees.
+	/// </summary>
+	public partial class AngleControl : UserControl
+	{
+		#region ================== Constants
+
+		private const float LINE_THICKNESS = 3f;
+
+		#endregion
+		
+		#region ================== Events
+
+		public event EventHandler ValueChanged;
+		public event EventHandler ButtonClicked;
+
+		#endregion
+
+		#region ================== Variables
+
+		// Buttons
+		private RadioButton[] buttons;
+		
+		// Result
+		private int angle;
+		private bool settingangle;
+		
+		#endregion
+
+		#region ================== Properties
+
+		public int Value { get { return angle; } set { SetAngle(value, true); } }
+		
+		#endregion
+		
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public AngleControl()
+		{
+			// Initialize
+			InitializeComponent();
+
+			// Make array from buttons
+			buttons = new RadioButton[8];
+			buttons[0] = button0;
+			buttons[1] = button1;
+			buttons[2] = button2;
+			buttons[3] = button3;
+			buttons[4] = button4;
+			buttons[5] = button5;
+			buttons[6] = button6;
+			buttons[7] = button7;
+		}
+
+		#endregion
+
+		#region ================== Interface
+
+		// Redraw the control
+		private void AngleControl_Paint(object sender, PaintEventArgs e)
+		{
+			float rad = Angle2D.DegToRad(angle);
+			e.Graphics.PixelOffsetMode = PixelOffsetMode.HighQuality;
+			e.Graphics.InterpolationMode = InterpolationMode.High;
+			e.Graphics.SmoothingMode = SmoothingMode.HighQuality;
+			e.Graphics.Clear(this.BackColor);
+			Pen linepen = new Pen(SystemColors.ControlText, LINE_THICKNESS);
+			PointF start = new PointF(this.Size.Width * 0.5f, this.Size.Height * 0.5f);
+			float line_length = this.Size.Width * 0.26f;
+			if((rad >= 0) && (rad < 360))
+			{
+				PointF end = new PointF(start.X + (float)Math.Sin(rad + Angle2D.PIHALF) * line_length,
+										start.Y + (float)Math.Cos(rad + Angle2D.PIHALF) * line_length);
+				e.Graphics.DrawLine(linepen, start, end);
+			}
+			else
+			{
+				e.Graphics.DrawLine(linepen, start, start);
+			}
+			linepen.Dispose(); //mxd
+		}
+		
+		#endregion
+
+		#region ================== Control
+
+		// This sets an angle manually
+		private void SetAngle(int newangle, bool changebuttons)
+		{
+			// Normalize and apply angle
+			bool changed = (newangle != angle);
+			angle = newangle;
+			
+			// Check if it matches an angle from the buttons
+			if(changebuttons)
+			{
+				settingangle = true;
+				for(int i = 0; i < 8; i++)
+					buttons[i].Checked = (angle == i * 45);
+				settingangle = false;
+			}
+			
+			// Redraw
+			this.Invalidate();
+			
+			// Raise event
+			if((ValueChanged != null) && changed) ValueChanged(this, EventArgs.Empty);
+		}
+		
+		// When checked state of a button changes
+		private void button_CheckedChanged(object sender, EventArgs e)
+		{
+			if(!settingangle)
+			{
+				// Check if we can get the angle from one of the buttons
+				for(int i = 0; i < 8; i++)
+					if(buttons[i].Checked) SetAngle(i * 45, false);
+
+				// Raise event
+				if(ButtonClicked != null) ButtonClicked(this, EventArgs.Empty);
+			}
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Controls/AngleControl.resx b/Source/Core/Controls/AngleControl.resx
new file mode 100644
index 0000000..24bc645
--- /dev/null
+++ b/Source/Core/Controls/AngleControl.resx
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="button0.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="button1.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="button2.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="button3.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="button4.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="button5.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="button6.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="button7.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Controls/ArgumentBox.Designer.cs b/Source/Core/Controls/ArgumentBox.Designer.cs
new file mode 100644
index 0000000..5703ce2
--- /dev/null
+++ b/Source/Core/Controls/ArgumentBox.Designer.cs
@@ -0,0 +1,90 @@
+namespace CodeImp.DoomBuilder.Controls
+{
+	partial class ArgumentBox
+	{
+		/// <summary> 
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Component Designer generated code
+
+		/// <summary> 
+		/// Required method for Designer support - do not modify 
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.combobox = new System.Windows.Forms.ComboBox();
+			this.button = new System.Windows.Forms.Button();
+			this.scrollbuttons = new System.Windows.Forms.VScrollBar();
+			this.SuspendLayout();
+			// 
+			// combobox
+			// 
+			this.combobox.DropDownWidth = 130;
+			this.combobox.Location = new System.Drawing.Point(0, 2);
+			this.combobox.Name = "combobox";
+			this.combobox.Size = new System.Drawing.Size(149, 21);
+			this.combobox.TabIndex = 0;
+			this.combobox.Validating += new System.ComponentModel.CancelEventHandler(this.combobox_Validating);
+			this.combobox.TextChanged += new System.EventHandler(this.combobox_TextChanged);
+			// 
+			// button
+			// 
+			this.button.Image = global::CodeImp.DoomBuilder.Properties.Resources.treeview;
+			this.button.Location = new System.Drawing.Point(153, 0);
+			this.button.Name = "button";
+			this.button.Size = new System.Drawing.Size(28, 24);
+			this.button.TabIndex = 1;
+			this.button.UseVisualStyleBackColor = true;
+			this.button.Visible = false;
+			this.button.Click += new System.EventHandler(this.button_Click);
+			// 
+			// scrollbuttons
+			// 
+			this.scrollbuttons.LargeChange = 10000;
+			this.scrollbuttons.Location = new System.Drawing.Point(186, -1);
+			this.scrollbuttons.Maximum = 10000;
+			this.scrollbuttons.Minimum = -10000;
+			this.scrollbuttons.Name = "scrollbuttons";
+			this.scrollbuttons.Size = new System.Drawing.Size(18, 24);
+			this.scrollbuttons.TabIndex = 2;
+			this.scrollbuttons.Visible = false;
+			this.scrollbuttons.ValueChanged += new System.EventHandler(this.scrollbuttons_ValueChanged);
+			// 
+			// ArgumentBox
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.Controls.Add(this.scrollbuttons);
+			this.Controls.Add(this.button);
+			this.Controls.Add(this.combobox);
+			this.Name = "ArgumentBox";
+			this.Size = new System.Drawing.Size(268, 64);
+			this.Layout += new System.Windows.Forms.LayoutEventHandler(this.ArgumentBox_Layout);
+			this.Resize += new System.EventHandler(this.ArgumentBox_Resize);
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.ComboBox combobox;
+		private System.Windows.Forms.Button button;
+		private System.Windows.Forms.VScrollBar scrollbuttons;
+	}
+}
diff --git a/Source/Core/Controls/ArgumentBox.cs b/Source/Core/Controls/ArgumentBox.cs
new file mode 100644
index 0000000..37e5293
--- /dev/null
+++ b/Source/Core/Controls/ArgumentBox.cs
@@ -0,0 +1,324 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Types;
+using System.Globalization;
+using CodeImp.DoomBuilder.GZBuilder.Controls;
+using CodeImp.DoomBuilder.Map;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Controls
+{
+	/// <summary>
+	/// Control to accept a linedef action argument.
+	/// </summary>
+	public partial class ArgumentBox : UserControl
+	{
+		#region ================== Variables
+		
+		private TypeHandler typehandler;
+		private bool ignorebuttonchange;
+		
+		#endregion
+
+		#region ================== Properties
+
+		public override string Text { get { return combobox.Text; }	} //mxd
+
+		#endregion
+
+		#region ================== Constructor
+
+		// Constructor
+		public ArgumentBox()
+		{
+			// Initialize
+			InitializeComponent();
+			scrollbuttons.Value = 0;
+			combobox.MouseWheel += combobox_MouseWheel;
+		}
+
+		#endregion
+		
+		#region ================== Events
+
+		// When control resizes
+		private void ArgumentBox_Resize(object sender, EventArgs e)
+		{
+			if(button.Visible)
+				combobox.Width = ClientRectangle.Width - button.Width - 2;
+			else if(scrollbuttons.Visible)
+				combobox.Width = ClientRectangle.Width - scrollbuttons.Width - 2;
+			else
+				combobox.Width = ClientRectangle.Width;
+
+			button.Left = ClientRectangle.Width - button.Width;
+			scrollbuttons.Left = ClientRectangle.Width - scrollbuttons.Width;
+			Height = button.Height;
+		}
+
+		// When control layout is aplied
+		private void ArgumentBox_Layout(object sender, LayoutEventArgs e)
+		{
+			ArgumentBox_Resize(sender, e);
+		}
+
+		// When the entered value needs to be validated
+		private void combobox_Validating(object sender, CancelEventArgs e)
+		{
+			string str = combobox.Text.Trim().ToLowerInvariant();
+			str = str.TrimStart('+', '-');
+
+			// Anything in the box?
+			if(combobox.Text.Trim().Length > 0)
+			{
+				// Prefixed?
+				if(CheckIsRelative())
+				{
+					// Try parsing to number
+					int num;
+					if(!int.TryParse(str, NumberStyles.Integer, CultureInfo.CurrentCulture, out num))
+					{
+						// Invalid relative number
+						combobox.SelectedItem = null;
+						combobox.Text = "";
+					}
+				}
+				else
+				{
+					// Set the value. The type handler will validate it
+					// and make the best possible choice.
+					typehandler.SetValue(combobox.Text);
+					combobox.SelectedItem = null;
+					combobox.Text = typehandler.GetStringValue();
+				}
+			}
+		}
+
+		// When browse button is clicked
+		private void button_Click(object sender, EventArgs e)
+		{
+			// Browse for a value
+			typehandler.Browse(this);
+			combobox.SelectedItem = null;
+			combobox.Text = typehandler.GetStringValue();
+			combobox.Focus();
+			combobox.SelectAll();
+		}
+
+		// Text changes
+		private void combobox_TextChanged(object sender, EventArgs e)
+		{
+			scrollbuttons.Enabled = !CheckIsRelative();
+		}
+
+		// Mouse wheel used
+		private void combobox_MouseWheel(object sender, MouseEventArgs e)
+		{
+			if(scrollbuttons.Visible)
+			{
+				if(e.Delta < 0)
+					scrollbuttons.Value += 1;
+				else if(e.Delta > 0)
+					scrollbuttons.Value -= 1;
+			}
+		}
+		
+		// Scroll buttons clicked
+		private void scrollbuttons_ValueChanged(object sender, EventArgs e)
+		{
+			if(!ignorebuttonchange)
+			{
+				ignorebuttonchange = true;
+				if(!CheckIsRelative())
+				{
+					typehandler.SetValue(combobox.Text);
+					int newvalue = GetResult(0) - scrollbuttons.Value;
+					if(newvalue < 0) newvalue = 0;
+					combobox.Text = newvalue.ToString();
+					combobox_Validating(sender, new CancelEventArgs());
+				}
+				scrollbuttons.Value = 0;
+				ignorebuttonchange = false;
+			}
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+		
+		// This sets up the control for a specific argument
+		public void Setup(ArgumentInfo arginfo)
+		{
+			int oldvalue = 0;
+			
+			// Get the original value
+			if(typehandler != null) oldvalue = typehandler.GetIntValue();
+			
+			// Get the type handler
+			typehandler = General.Types.GetArgumentHandler(arginfo);
+			
+			// Clear combobox
+			combobox.SelectedItem = null;
+			combobox.Items.Clear();
+
+			// Check if this supports enumerated options
+			if(typehandler.IsEnumerable) 
+			{
+				// Show the combobox
+				button.Visible = false;
+				scrollbuttons.Visible = false;
+				combobox.DropDownStyle = ComboBoxStyle.DropDown;
+				combobox.Items.AddRange(typehandler.GetEnumList().ToArray());
+				combobox.DropDownWidth = Tools.GetDropDownWidth(combobox); //mxd
+			}
+			// Check if browsable
+			else if(typehandler.IsBrowseable)
+			{
+				// Show the button
+				button.Visible = true;
+				button.Image = typehandler.BrowseImage;
+				scrollbuttons.Visible = false;
+				combobox.DropDownStyle = ComboBoxStyle.Simple;
+			}
+			else
+			{
+				// Show textbox with scroll buttons
+				button.Visible = false;
+				scrollbuttons.Visible = true;
+				combobox.DropDownStyle = ComboBoxStyle.Simple;
+			}
+
+			//mxd
+			if(typehandler.IsEnumerable) 
+			{
+				combobox.AutoCompleteMode = AutoCompleteMode.Suggest;
+				combobox.AutoCompleteSource = AutoCompleteSource.ListItems;
+			} 
+			else 
+			{
+				combobox.AutoCompleteMode = AutoCompleteMode.None;
+				combobox.AutoCompleteSource = AutoCompleteSource.None;
+			}
+			
+			// Setup layout
+			ArgumentBox_Resize(this, EventArgs.Empty);
+			
+			//mxd. If not mixed values, re-apply the old value
+			if(!string.IsNullOrEmpty(combobox.Text)) SetValue(oldvalue);
+		}
+
+		// This sets the value
+		public void SetValue(int value)
+		{
+			typehandler.SetValue(value);
+			combobox.SelectedItem = null;
+			combobox.Text = typehandler.GetStringValue();
+			combobox_Validating(this, new CancelEventArgs());
+		}
+
+		//mxd. this sets default value
+		public void SetDefaultValue() 
+		{
+			typehandler.SetDefaultValue();
+			combobox.SelectedItem = null;
+			combobox.Text = typehandler.GetStringValue();
+			combobox_Validating(this, new CancelEventArgs());
+		}
+
+		// This clears the value
+		public void ClearValue()
+		{
+			typehandler.SetValue("");
+			combobox.SelectedItem = null;
+			combobox.Text = "";
+		}
+
+		// This checks if the number is relative
+		public bool CheckIsRelative()
+		{
+			// Prefixed with ++ or --?
+			return (combobox.Text.Trim().StartsWith("++") || combobox.Text.Trim().StartsWith("--"));
+		}
+		
+		// This returns the selected value
+		public int GetResult(int original)
+		{
+			int result;
+			
+			// Strip prefixes
+			string str = combobox.Text.Trim().ToLowerInvariant();
+			str = str.TrimStart('+', '-');
+
+			// Anything in the box?
+			if(combobox.Text.Trim().Length > 0)
+			{
+				// Prefixed with ++?
+				if(combobox.Text.Trim().StartsWith("++"))
+				{
+					// Add number to original
+					int num;
+					if(!int.TryParse(str, out num)) num = 0;
+					result = original + num;
+				}
+				// Prefixed with --?
+				else if(combobox.Text.Trim().StartsWith("--"))
+				{
+					// Subtract number from original
+					int num;
+					if(!int.TryParse(str, out num)) num = 0;
+					result = original - num;
+				}
+				else
+				{
+					// Return the value
+					result = typehandler.GetIntValue();
+				}
+			}
+			else
+			{
+				// Just return the original
+				result = original;
+			}
+
+			return General.Clamp(result, General.Map.FormatInterface.MinArgument, General.Map.FormatInterface.MaxArgument);
+		}
+
+		//mxd. Very tricky way to close parent control by pressing ENTER or ESCAPE key when combobox.DropDownStyle == ComboBoxStyle.Simple
+		protected override bool ProcessCmdKey(ref Message msg, Keys keyData) 
+		{
+			if(this.ActiveControl == combobox && combobox.DropDownStyle == ComboBoxStyle.Simple 
+				&& (keyData == Keys.Return || keyData == Keys.Escape)) 
+			{
+				combobox.DropDownStyle = ComboBoxStyle.DropDown;
+				return false;
+			}
+
+			return base.ProcessCmdKey(ref msg, keyData);
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Controls/ArgumentBox.resx b/Source/Core/Controls/ArgumentBox.resx
new file mode 100644
index 0000000..9f6cd25
--- /dev/null
+++ b/Source/Core/Controls/ArgumentBox.resx
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="combobox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="button.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="scrollbuttons.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Controls/ArgumentsControl.Designer.cs b/Source/Core/Controls/ArgumentsControl.Designer.cs
new file mode 100644
index 0000000..3779674
--- /dev/null
+++ b/Source/Core/Controls/ArgumentsControl.Designer.cs
@@ -0,0 +1,244 @@
+namespace CodeImp.DoomBuilder.Controls
+{
+	partial class ArgumentsControl
+	{
+		/// <summary> 
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing) {
+			if(disposing && (components != null)) {
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Component Designer generated code
+
+		/// <summary> 
+		/// Required method for Designer support - do not modify 
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent() {
+			this.components = new System.ComponentModel.Container();
+			this.splitcontainer = new System.Windows.Forms.SplitContainer();
+			this.cbuseargstr = new System.Windows.Forms.CheckBox();
+			this.arg0label = new System.Windows.Forms.Label();
+			this.arg1label = new System.Windows.Forms.Label();
+			this.arg2label = new System.Windows.Forms.Label();
+			this.arg3label = new System.Windows.Forms.Label();
+			this.arg4label = new System.Windows.Forms.Label();
+			this.tooltip = new System.Windows.Forms.ToolTip(this.components);
+			this.scriptnames = new CodeImp.DoomBuilder.Controls.ColoredComboBox();
+			this.scriptnumbers = new CodeImp.DoomBuilder.Controls.ColoredComboBox();
+			this.arg0 = new CodeImp.DoomBuilder.Controls.ArgumentBox();
+			this.arg1 = new CodeImp.DoomBuilder.Controls.ArgumentBox();
+			this.arg2 = new CodeImp.DoomBuilder.Controls.ArgumentBox();
+			this.arg3 = new CodeImp.DoomBuilder.Controls.ArgumentBox();
+			this.arg4 = new CodeImp.DoomBuilder.Controls.ArgumentBox();
+			this.splitcontainer.Panel1.SuspendLayout();
+			this.splitcontainer.Panel2.SuspendLayout();
+			this.splitcontainer.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// splitcontainer
+			// 
+			this.splitcontainer.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.splitcontainer.Location = new System.Drawing.Point(0, 0);
+			this.splitcontainer.Name = "splitcontainer";
+			// 
+			// splitcontainer.Panel1
+			// 
+			this.splitcontainer.Panel1.Controls.Add(this.cbuseargstr);
+			this.splitcontainer.Panel1.Controls.Add(this.scriptnames);
+			this.splitcontainer.Panel1.Controls.Add(this.scriptnumbers);
+			this.splitcontainer.Panel1.Controls.Add(this.arg0label);
+			this.splitcontainer.Panel1.Controls.Add(this.arg1label);
+			this.splitcontainer.Panel1.Controls.Add(this.arg2label);
+			this.splitcontainer.Panel1.Controls.Add(this.arg0);
+			this.splitcontainer.Panel1.Controls.Add(this.arg1);
+			this.splitcontainer.Panel1.Controls.Add(this.arg2);
+			// 
+			// splitcontainer.Panel2
+			// 
+			this.splitcontainer.Panel2.Controls.Add(this.arg3label);
+			this.splitcontainer.Panel2.Controls.Add(this.arg4label);
+			this.splitcontainer.Panel2.Controls.Add(this.arg3);
+			this.splitcontainer.Panel2.Controls.Add(this.arg4);
+			this.splitcontainer.Size = new System.Drawing.Size(700, 140);
+			this.splitcontainer.SplitterDistance = 350;
+			this.splitcontainer.SplitterWidth = 1;
+			this.splitcontainer.TabIndex = 0;
+			this.splitcontainer.TabStop = false;
+			// 
+			// cbuseargstr
+			// 
+			this.cbuseargstr.Location = new System.Drawing.Point(3, -5);
+			this.cbuseargstr.Name = "cbuseargstr";
+			this.cbuseargstr.Size = new System.Drawing.Size(63, 40);
+			this.cbuseargstr.TabIndex = 44;
+			this.cbuseargstr.Text = "Named script";
+			this.cbuseargstr.UseVisualStyleBackColor = true;
+			this.cbuseargstr.CheckedChanged += new System.EventHandler(this.cbuseargstr_CheckedChanged);
+			// 
+			// arg0label
+			// 
+			this.arg0label.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.arg0label.Location = new System.Drawing.Point(55, 8);
+			this.arg0label.Name = "arg0label";
+			this.arg0label.Size = new System.Drawing.Size(179, 14);
+			this.arg0label.TabIndex = 33;
+			this.arg0label.Text = "Argument 1:";
+			this.arg0label.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			this.arg0label.UseMnemonic = false;
+			// 
+			// arg1label
+			// 
+			this.arg1label.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.arg1label.Location = new System.Drawing.Point(55, 33);
+			this.arg1label.Name = "arg1label";
+			this.arg1label.Size = new System.Drawing.Size(179, 14);
+			this.arg1label.TabIndex = 42;
+			this.arg1label.Text = "Argument 2:";
+			this.arg1label.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			this.arg1label.UseMnemonic = false;
+			// 
+			// arg2label
+			// 
+			this.arg2label.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.arg2label.Location = new System.Drawing.Point(55, 58);
+			this.arg2label.Name = "arg2label";
+			this.arg2label.Size = new System.Drawing.Size(179, 14);
+			this.arg2label.TabIndex = 43;
+			this.arg2label.Text = "Argument 3:";
+			this.arg2label.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			this.arg2label.UseMnemonic = false;
+			// 
+			// arg3label
+			// 
+			this.arg3label.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.arg3label.Location = new System.Drawing.Point(55, 8);
+			this.arg3label.Name = "arg3label";
+			this.arg3label.Size = new System.Drawing.Size(179, 14);
+			this.arg3label.TabIndex = 44;
+			this.arg3label.Text = "Argument 4:";
+			this.arg3label.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			this.arg3label.UseMnemonic = false;
+			// 
+			// arg4label
+			// 
+			this.arg4label.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.arg4label.Location = new System.Drawing.Point(55, 33);
+			this.arg4label.Name = "arg4label";
+			this.arg4label.Size = new System.Drawing.Size(179, 14);
+			this.arg4label.TabIndex = 46;
+			this.arg4label.Text = "Argument 5:";
+			this.arg4label.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			this.arg4label.UseMnemonic = false;
+			// 
+			// scriptnames
+			// 
+			this.scriptnames.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.scriptnames.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest;
+			this.scriptnames.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems;
+			this.scriptnames.BackColor = System.Drawing.Color.Honeydew;
+			this.scriptnames.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
+			this.scriptnames.FormattingEnabled = true;
+			this.scriptnames.Location = new System.Drawing.Point(237, 104);
+			this.scriptnames.Name = "scriptnames";
+			this.scriptnames.Size = new System.Drawing.Size(110, 21);
+			this.scriptnames.TabIndex = 41;
+			this.scriptnames.TextChanged += new System.EventHandler(this.scriptnames_TextChanged);
+			// 
+			// scriptnumbers
+			// 
+			this.scriptnumbers.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.scriptnumbers.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest;
+			this.scriptnumbers.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems;
+			this.scriptnumbers.BackColor = System.Drawing.Color.LemonChiffon;
+			this.scriptnumbers.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
+			this.scriptnumbers.FormattingEnabled = true;
+			this.scriptnumbers.Location = new System.Drawing.Point(237, 80);
+			this.scriptnumbers.Name = "scriptnumbers";
+			this.scriptnumbers.Size = new System.Drawing.Size(110, 21);
+			this.scriptnumbers.TabIndex = 40;
+			this.scriptnumbers.TextChanged += new System.EventHandler(this.scriptnumbers_TextChanged);
+			// 
+			// arg0
+			// 
+			this.arg0.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.arg0.Location = new System.Drawing.Point(237, 3);
+			this.arg0.Name = "arg0";
+			this.arg0.Size = new System.Drawing.Size(110, 24);
+			this.arg0.TabIndex = 2;
+			// 
+			// arg1
+			// 
+			this.arg1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.arg1.Location = new System.Drawing.Point(237, 28);
+			this.arg1.Name = "arg1";
+			this.arg1.Size = new System.Drawing.Size(110, 24);
+			this.arg1.TabIndex = 34;
+			// 
+			// arg2
+			// 
+			this.arg2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.arg2.Location = new System.Drawing.Point(237, 53);
+			this.arg2.Name = "arg2";
+			this.arg2.Size = new System.Drawing.Size(110, 24);
+			this.arg2.TabIndex = 35;
+			// 
+			// arg3
+			// 
+			this.arg3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.arg3.Location = new System.Drawing.Point(236, 3);
+			this.arg3.Name = "arg3";
+			this.arg3.Size = new System.Drawing.Size(110, 24);
+			this.arg3.TabIndex = 43;
+			// 
+			// arg4
+			// 
+			this.arg4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.arg4.Location = new System.Drawing.Point(236, 28);
+			this.arg4.Name = "arg4";
+			this.arg4.Size = new System.Drawing.Size(110, 24);
+			this.arg4.TabIndex = 45;
+			// 
+			// ArgumentsControl
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.Controls.Add(this.splitcontainer);
+			this.Name = "ArgumentsControl";
+			this.Size = new System.Drawing.Size(700, 140);
+			this.splitcontainer.Panel1.ResumeLayout(false);
+			this.splitcontainer.Panel2.ResumeLayout(false);
+			this.splitcontainer.ResumeLayout(false);
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.SplitContainer splitcontainer;
+		private ArgumentBox arg0;
+		private ArgumentBox arg1;
+		private System.Windows.Forms.Label arg0label;
+		private ColoredComboBox scriptnumbers;
+		private System.Windows.Forms.Label arg2label;
+		private System.Windows.Forms.Label arg1label;
+		private ColoredComboBox scriptnames;
+		private System.Windows.Forms.Label arg3label;
+		private System.Windows.Forms.Label arg4label;
+		private ArgumentBox arg3;
+		private ArgumentBox arg4;
+		private System.Windows.Forms.CheckBox cbuseargstr;
+		private System.Windows.Forms.ToolTip tooltip;
+		private ArgumentBox arg2;
+	}
+}
diff --git a/Source/Core/Controls/ArgumentsControl.cs b/Source/Core/Controls/ArgumentsControl.cs
new file mode 100644
index 0000000..a511c61
--- /dev/null
+++ b/Source/Core/Controls/ArgumentsControl.cs
@@ -0,0 +1,455 @@
+#region ================== Namespaces
+
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Runtime.InteropServices;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.GZBuilder.Data;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Types;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Controls
+{
+	public partial class ArgumentsControl : UserControl
+	{
+		#region ================== Native stuff
+
+		[DllImport("user32.dll")]
+		private static extern int SendMessage(IntPtr hWnd, Int32 wMsg, bool wParam, Int32 lParam);
+		
+		private const int WM_SETREDRAW = 11;
+
+		#endregion
+
+		#region ================== Variables
+
+		private string arg0str;
+		private bool havearg0str;
+		private int action;
+		private ArgumentInfo[] arginfo;
+
+		#endregion
+
+		#region ================== Constructor
+
+		public ArgumentsControl()
+		{
+			InitializeComponent();
+
+			// Only when running (this.DesignMode won't do when not this, but one of parent controls is in design mode)
+			if(LicenseManager.UsageMode != LicenseUsageMode.Designtime)
+			{
+				//mxd. Setup script numbers
+				scriptnumbers.Location = new Point(arg0.Location.X, arg0.Location.Y + 2);
+				foreach(ScriptItem si in General.Map.NumberedScripts.Values)
+					scriptnumbers.Items.Add(new ColoredComboBoxItem(si, si.IsInclude ? SystemColors.HotTrack : SystemColors.WindowText));
+				scriptnumbers.DropDownWidth = Tools.GetDropDownWidth(scriptnumbers);
+
+				//mxd. Setup script names
+				if(General.Map.UDMF)
+				{
+					scriptnames.Location = scriptnumbers.Location;
+					foreach(ScriptItem nsi in General.Map.NamedScripts.Values)
+						scriptnames.Items.Add(new ColoredComboBoxItem(nsi, nsi.IsInclude ? SystemColors.HotTrack : SystemColors.WindowText));
+					scriptnames.DropDownWidth = Tools.GetDropDownWidth(scriptnames);
+				}
+				else
+				{
+					scriptnames.Visible = false;
+					cbuseargstr.Visible = false;
+				}
+			}
+		}
+
+		#endregion
+
+		#region ================== Setup
+
+		public void SetValue(Linedef l, bool first)
+		{
+			SetValue(l.Fields, l.Args, first);
+		}
+
+		public void SetValue(Thing t, bool first)
+		{
+			SetValue(t.Fields, t.Args, first);
+		}
+
+		private void SetValue(UniFields fields, int[] args, bool first)
+		{
+			if(first)
+			{
+				if(General.Map.UDMF)
+				{
+					arg0str = fields.GetValue("arg0str", string.Empty);
+					havearg0str = !string.IsNullOrEmpty(arg0str);
+				}
+
+				// Update arguments
+				arg0.SetValue(args[0]);
+				arg1.SetValue(args[1]);
+				arg2.SetValue(args[2]);
+				arg3.SetValue(args[3]);
+				arg4.SetValue(args[4]);
+			}
+			else
+			{
+				if(General.Map.UDMF)
+				{
+					if(arg0str != fields.GetValue("arg0str", string.Empty))
+					{
+						havearg0str = true;
+						arg0str = string.Empty;
+					}
+				}
+
+				// Update arguments
+				if(!string.IsNullOrEmpty(arg0.Text) && args[0] != arg0.GetResult(int.MinValue)) arg0.ClearValue();
+				if(!string.IsNullOrEmpty(arg1.Text) && args[1] != arg1.GetResult(int.MinValue)) arg1.ClearValue();
+				if(!string.IsNullOrEmpty(arg2.Text) && args[2] != arg2.GetResult(int.MinValue)) arg2.ClearValue();
+				if(!string.IsNullOrEmpty(arg3.Text) && args[3] != arg3.GetResult(int.MinValue)) arg3.ClearValue();
+				if(!string.IsNullOrEmpty(arg4.Text) && args[4] != arg4.GetResult(int.MinValue)) arg4.ClearValue();
+			}
+		}
+
+		#endregion
+
+		#region ================== Apply
+
+		public void Apply(Linedef l)
+		{
+			//mxd. Script name/number handling
+			if(scriptnumbers.Visible)
+			{
+				//apply script number
+				if(!string.IsNullOrEmpty(scriptnumbers.Text))
+				{
+					if(scriptnumbers.SelectedItem != null)
+						l.Args[0] = ((ScriptItem)((ColoredComboBoxItem)scriptnumbers.SelectedItem).Value).Index;
+					else if(!int.TryParse(scriptnumbers.Text.Trim(), out l.Args[0]))
+						l.Args[0] = 0;
+
+					if(l.Fields.ContainsKey("arg0str")) l.Fields.Remove("arg0str");
+				}
+			}
+			else if(scriptnames.Visible)
+			{
+				// Apply arg0str
+				if(!string.IsNullOrEmpty(scriptnames.Text))
+					l.Fields["arg0str"] = new UniValue(UniversalType.String, scriptnames.Text);
+			}
+			else
+			{
+				l.Args[0] = arg0.GetResult(l.Args[0]);
+				if(l.Fields.ContainsKey("arg0str")) l.Fields.Remove("arg0str");
+			}
+
+			// Apply the rest of args
+			l.Args[1] = arg1.GetResult(l.Args[1]);
+			l.Args[2] = arg2.GetResult(l.Args[2]);
+			l.Args[3] = arg3.GetResult(l.Args[3]);
+			l.Args[4] = arg4.GetResult(l.Args[4]);
+		}
+
+		public void Apply(Thing t)
+		{
+			//mxd. Script name/number handling
+			if(scriptnumbers.Visible)
+			{
+				//apply script number
+				if(!string.IsNullOrEmpty(scriptnumbers.Text))
+				{
+					if(scriptnumbers.SelectedItem != null)
+						t.Args[0] = ((ScriptItem)((ColoredComboBoxItem)scriptnumbers.SelectedItem).Value).Index;
+					else if(!int.TryParse(scriptnumbers.Text.Trim(), out t.Args[0]))
+						t.Args[0] = 0;
+
+					if(t.Fields.ContainsKey("arg0str")) t.Fields.Remove("arg0str");
+				}
+			}
+			else if(scriptnames.Visible)
+			{
+				// Apply arg0str
+				if(!string.IsNullOrEmpty(scriptnames.Text))
+					t.Fields["arg0str"] = new UniValue(UniversalType.String, scriptnames.Text);
+			}
+			else
+			{
+				t.Args[0] = arg0.GetResult(t.Args[0]);
+				if(t.Fields.ContainsKey("arg0str")) t.Fields.Remove("arg0str");
+			}
+
+			// Apply the rest of args
+			t.Args[1] = arg1.GetResult(t.Args[1]);
+			t.Args[2] = arg2.GetResult(t.Args[2]);
+			t.Args[3] = arg3.GetResult(t.Args[3]);
+			t.Args[4] = arg4.GetResult(t.Args[4]);
+		}
+
+		#endregion
+
+		#region ================== Update
+
+		public void UpdateAction(int action, bool setuponly)
+		{
+			UpdateAction(action, setuponly, null);
+		}
+
+		public void UpdateAction(int action, bool setuponly, ThingTypeInfo info)
+		{
+			// Update arguments
+			int showaction = 0;
+
+			// Only when action type is known
+			if(General.Map.Config.LinedefActions.ContainsKey(action)) showaction = action;
+			if((showaction == 0) && (info != null)) arginfo = info.Args;
+			else arginfo = General.Map.Config.LinedefActions[showaction].Args;
+
+			// Don't update action args when thing type is changed
+			if(info != null && showaction != 0 && this.action == showaction) return;
+
+			// Change the argument descriptions
+			this.BeginUpdate();
+
+			UpdateArgument(arg0, arg0label, arginfo[0]);
+			UpdateArgument(arg1, arg1label, arginfo[1]);
+			UpdateArgument(arg2, arg2label, arginfo[2]);
+			UpdateArgument(arg3, arg3label, arginfo[3]);
+			UpdateArgument(arg4, arg4label, arginfo[4]);
+
+			if(!setuponly)
+			{
+				// Apply action's or thing's default arguments
+				if(showaction != 0 || info != null)
+				{
+					arg0.SetDefaultValue();
+					arg1.SetDefaultValue();
+					arg2.SetDefaultValue();
+					arg3.SetDefaultValue();
+					arg4.SetDefaultValue();
+				}
+				else //or set them to 0
+				{
+					arg0.SetValue(0);
+					arg1.SetValue(0);
+					arg2.SetValue(0);
+					arg3.SetValue(0);
+					arg4.SetValue(0);
+				}
+			}
+
+			// Store current action
+			this.action = showaction;
+
+			this.EndUpdate();
+		}
+
+		public void UpdateScriptControls()
+		{
+			// Update script-specific stuff
+			if(Array.IndexOf(GZBuilder.GZGeneral.ACS_SPECIALS, action) != -1)
+			{
+				// Update script controls visibility
+				bool shownamedscripts = (General.Map.UDMF && havearg0str);
+				cbuseargstr.Visible = General.Map.UDMF;
+				cbuseargstr.Checked = shownamedscripts;
+				scriptnames.Visible = shownamedscripts;
+				scriptnumbers.Visible = !shownamedscripts;
+
+				// Update named script name
+				if(shownamedscripts)
+				{
+					if(General.Map.NamedScripts.ContainsKey(arg0str))
+					{
+						int i = 0;
+						foreach(ScriptItem item in General.Map.NamedScripts.Values)
+						{
+							if(item.Name == arg0str)
+							{
+								scriptnames.SelectedIndex = i;
+								UpdateScriptArguments(item);
+								break;
+							}
+							i++;
+						}
+					}
+					else
+					{
+						// Unknown script name
+						scriptnames.Text = arg0str;
+					}
+				}
+				else
+				{
+					// Update numbered script name
+					int a0 = arg0.GetResult(0);
+					if(General.Map.NumberedScripts.ContainsKey(a0))
+					{
+						int i = 0;
+						foreach(ScriptItem item in General.Map.NumberedScripts.Values)
+						{
+							if(item.Index == a0)
+							{
+								scriptnumbers.SelectedIndex = i;
+								UpdateScriptArguments(item);
+								break;
+							}
+
+							i++;
+						}
+					}
+					else
+					{
+						// Unknown script number...
+						scriptnumbers.Text = a0.ToString();
+					}
+				}
+			}
+			else
+			{
+				cbuseargstr.Visible = false;
+				scriptnames.Visible = false;
+				scriptnumbers.Visible = false;
+				cbuseargstr.Checked = false;
+			}
+
+			arg0.Visible = (!scriptnames.Visible && !scriptnumbers.Visible);
+		}
+
+		private void UpdateArgument(ArgumentBox arg, Label label, ArgumentInfo info)
+		{
+			// Update labels
+			label.Text = info.Title + ":";
+			label.Enabled = info.Used;
+			arg.ForeColor = (label.Enabled ? SystemColors.WindowText : SystemColors.GrayText);
+			arg.Setup(info);
+
+			// Update tooltip
+			UpdateToolTip(label, info);
+		}
+
+		private void UpdateToolTip(Label label, ArgumentInfo info)
+		{
+			if(info.Used && !string.IsNullOrEmpty(info.ToolTip))
+			{
+				tooltip.SetToolTip(label, info.ToolTip);
+				label.Font = new Font(label.Font, FontStyle.Underline);
+				label.ForeColor = SystemColors.HotTrack;
+			}
+			else
+			{
+				tooltip.SetToolTip(label, null);
+				label.Font = new Font(label.Font, FontStyle.Regular);
+				label.ForeColor = SystemColors.WindowText;
+			}
+		}
+
+		private void UpdateScriptArguments(ScriptItem item)
+		{
+			Label[] labels = { arg0label, arg1label, arg2label, arg3label, arg4label };
+			ArgumentBox[] args = { arg0, arg1, arg2, arg3, arg4 };
+			if(item != null)
+			{
+				string[] argnames = item.GetArgumentsDescriptions(action);
+				for(int i = 0; i < labels.Length; i++)
+				{
+					if(!string.IsNullOrEmpty(argnames[i]))
+					{
+						labels[i].Text = argnames[i] + ":";
+						labels[i].Enabled = true;
+						labels[i].Font = new Font(labels[i].Font, FontStyle.Regular);
+						labels[i].ForeColor = SystemColors.WindowText;
+					}
+					else
+					{
+						labels[i].Text = arginfo[i].Title;
+						labels[i].Enabled = arginfo[i].Used;
+						UpdateToolTip(labels[i], arginfo[i]);
+					}
+
+					args[i].ForeColor = (labels[i].Enabled ? SystemColors.WindowText : SystemColors.GrayText);
+				}
+			}
+			else
+			{
+				for(int i = 0; i < labels.Length; i++)
+				{
+					labels[i].Text = arginfo[i].Title;
+					labels[i].Enabled = arginfo[i].Used;
+					UpdateToolTip(labels[i], arginfo[i]);
+					args[i].ForeColor = (labels[i].Enabled ? SystemColors.WindowText : SystemColors.GrayText);
+				}
+			}
+		}
+
+		#endregion
+
+		#region ================== Redraw control
+
+		private void BeginUpdate()
+		{
+			SendMessage(this.Parent.Handle, WM_SETREDRAW, false, 0);
+		}
+
+		private void EndUpdate()
+		{
+			SendMessage(this.Parent.Handle, WM_SETREDRAW, true, 0);
+			this.Parent.Refresh();
+		}
+
+		#endregion
+
+		#region ================== Events
+
+		private void cbuseargstr_CheckedChanged(object sender, EventArgs e)
+		{
+			if(!cbuseargstr.Visible) return;
+			scriptnames.Visible = cbuseargstr.Checked;
+			scriptnumbers.Visible = !cbuseargstr.Checked;
+			arg0label.Text = (cbuseargstr.Checked ? "Script Name:" : "Script Number:");
+		}
+
+		private void scriptnumbers_TextChanged(object sender, EventArgs e)
+		{
+			if(string.IsNullOrEmpty(scriptnumbers.Text)) return;
+			ScriptItem item = null;
+			if(scriptnumbers.SelectedIndex != -1)
+			{
+				item = ((ScriptItem)((ColoredComboBoxItem)scriptnumbers.SelectedItem).Value);
+			}
+			else
+			{
+				int scriptindex;
+				if(int.TryParse(scriptnumbers.Text, out scriptindex) && General.Map.NumberedScripts.ContainsKey(scriptindex))
+					item = General.Map.NumberedScripts[scriptindex];
+			}
+
+			UpdateScriptArguments(item);
+		}
+
+		private void scriptnames_TextChanged(object sender, EventArgs e)
+		{
+			if(string.IsNullOrEmpty(scriptnames.Text)) return;
+			ScriptItem item = null;
+			if(scriptnames.SelectedIndex != -1)
+			{
+				item = ((ScriptItem)((ColoredComboBoxItem)scriptnames.SelectedItem).Value);
+			}
+			else
+			{
+				string scriptname = scriptnames.Text.Trim().ToLowerInvariant();
+				if(General.Map.NamedScripts.ContainsKey(scriptname))
+					item = General.Map.NamedScripts[scriptname];
+			}
+
+			UpdateScriptArguments(item);
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Controls/ArgumentsControl.resx b/Source/Core/Controls/ArgumentsControl.resx
new file mode 100644
index 0000000..b9dfa25
--- /dev/null
+++ b/Source/Core/Controls/ArgumentsControl.resx
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Controls/AutoSelectTextbox.cs b/Source/Core/Controls/AutoSelectTextbox.cs
new file mode 100644
index 0000000..bfef1aa
--- /dev/null
+++ b/Source/Core/Controls/AutoSelectTextbox.cs
@@ -0,0 +1,93 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Windows.Forms;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Controls
+{
+	public class AutoSelectTextbox : TextBox
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		private int eventcount;
+		
+		#endregion
+
+		#region ================== Properties
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		#endregion
+
+		#region ================== Methods
+
+		// When gaining focus
+		protected override void OnGotFocus(EventArgs e)
+		{
+			base.OnGotFocus(e);
+
+			// Reset counter
+			eventcount = 0;
+		}
+		
+		// When losing focus
+		protected override void OnLostFocus(EventArgs e)
+		{
+			base.OnLostFocus(e);
+
+			// Reset counter
+			eventcount = 0;
+		}
+		
+		// When mouse pressed down
+		protected override void OnMouseDown(MouseEventArgs e)
+		{
+			base.OnMouseDown(e);
+
+			// Select all text when this mouseclick gives focus
+			if(eventcount == 0) this.SelectAll();
+			eventcount++;
+		}
+
+		// When key is pressed
+		protected override void OnKeyDown(KeyEventArgs e)
+		{
+			base.OnKeyDown(e);
+			eventcount++;
+		}
+
+		//mxd
+		new public bool Focus()
+		{
+			bool result = base.Focus();
+			this.Select(0, 0);
+			return result;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Controls/ButtonsNumericTextbox.Designer.cs b/Source/Core/Controls/ButtonsNumericTextbox.Designer.cs
new file mode 100644
index 0000000..e316c8e
--- /dev/null
+++ b/Source/Core/Controls/ButtonsNumericTextbox.Designer.cs
@@ -0,0 +1,83 @@
+namespace CodeImp.DoomBuilder.Controls
+{
+	partial class ButtonsNumericTextbox
+	{
+		/// <summary> 
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Component Designer generated code
+
+		/// <summary> 
+		/// Required method for Designer support - do not modify 
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.components = new System.ComponentModel.Container();
+			this.buttons = new System.Windows.Forms.VScrollBar();
+			this.tooltip = new System.Windows.Forms.ToolTip(this.components);
+			this.textbox = new CodeImp.DoomBuilder.Controls.NumericTextbox();
+			this.SuspendLayout();
+			// 
+			// buttons
+			// 
+			this.buttons.LargeChange = 10000;
+			this.buttons.Location = new System.Drawing.Point(163, 0);
+			this.buttons.Maximum = 10000;
+			this.buttons.Minimum = -10000;
+			this.buttons.Name = "buttons";
+			this.buttons.Size = new System.Drawing.Size(18, 24);
+			this.buttons.TabIndex = 1;
+			this.buttons.ValueChanged += new System.EventHandler(this.buttons_ValueChanged);
+			// 
+			// textbox
+			// 
+			this.textbox.AllowDecimal = false;
+			this.textbox.AllowNegative = false;
+			this.textbox.AllowRelative = false;
+			this.textbox.ForeColor = System.Drawing.SystemColors.WindowText;
+			this.textbox.ImeMode = System.Windows.Forms.ImeMode.Off;
+			this.textbox.Location = new System.Drawing.Point(0, 2);
+			this.textbox.Name = "textbox";
+			this.textbox.Size = new System.Drawing.Size(160, 20);
+			this.textbox.TabIndex = 0;
+			this.textbox.TextChanged += new System.EventHandler(this.textbox_TextChanged);
+			this.textbox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textbox_KeyDown);
+			// 
+			// ButtonsNumericTextbox
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.Controls.Add(this.buttons);
+			this.Controls.Add(this.textbox);
+			this.Name = "ButtonsNumericTextbox";
+			this.Size = new System.Drawing.Size(289, 68);
+			this.Layout += new System.Windows.Forms.LayoutEventHandler(this.ClickableNumericTextbox_Layout);
+			this.Resize += new System.EventHandler(this.ClickableNumericTextbox_Resize);
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private NumericTextbox textbox;
+		private System.Windows.Forms.VScrollBar buttons;
+		private System.Windows.Forms.ToolTip tooltip;
+	}
+}
diff --git a/Source/Core/Controls/ButtonsNumericTextbox.cs b/Source/Core/Controls/ButtonsNumericTextbox.cs
new file mode 100644
index 0000000..82db85c
--- /dev/null
+++ b/Source/Core/Controls/ButtonsNumericTextbox.cs
@@ -0,0 +1,243 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.ComponentModel;
+using System.Globalization;
+using System.Windows.Forms;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Controls
+{
+	[Designer(typeof(ButtonsNumericTextboxDesigner))]
+	public partial class ButtonsNumericTextbox : UserControl
+	{
+		#region ================== Events
+
+		public event EventHandler WhenTextChanged;
+		public event EventHandler WhenButtonsClicked;
+		public event EventHandler WhenEnterPressed;
+
+		#endregion
+
+		#region ================== Variables
+		
+		private bool ignorebuttonchange;
+		private StepsList steps;
+		private int stepsize = 1;
+		private float stepsizeFloat = 1.0f; //mxd
+		private float stepsizeBig = 10.0f; //mxd
+		private float stepsizeSmall = 0.1f; //mxd
+		private bool wrapsteps; //mxd
+		private bool usemodifierkeys; //mxd
+		
+		#endregion
+
+		#region ================== Properties
+
+		public bool AllowDecimal { get { return textbox.AllowDecimal; } set { textbox.AllowDecimal = value; UpdateButtonsTooltip(); } }
+		public bool AllowNegative { get { return textbox.AllowNegative; } set { textbox.AllowNegative = value; } }
+		public bool AllowRelative { get { return textbox.AllowRelative; } set { textbox.AllowRelative = value; } }
+		public int ButtonStep { get { return stepsize; } set { stepsize = value; } }
+		public float ButtonStepFloat { get { return stepsizeFloat; } set { stepsizeFloat = value; } } //mxd. This is used when AllowDecimal is true
+		public float ButtonStepBig { get { return stepsizeBig; } set { stepsizeBig = value; } } //mxd
+		public float ButtonStepSmall { get { return stepsizeSmall; } set { stepsizeSmall = value; } } //mxd
+		override public string Text { get { return textbox.Text; } set { textbox.Text = value; } }
+		internal NumericTextbox Textbox { get { return textbox; } }
+		public StepsList StepValues { get { return steps; } set { steps = value; UpdateButtonsTooltip(); } }
+		public bool ButtonStepsWrapAround { get { return wrapsteps; } set { wrapsteps = value; } }
+		public bool ButtonStepsUseModifierKeys { get { return usemodifierkeys; } set { usemodifierkeys = value; UpdateButtonsTooltip(); } }
+
+		#endregion
+		
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public ButtonsNumericTextbox()
+		{
+			InitializeComponent();
+			buttons.Value = 0;
+			textbox.MouseWheel += textbox_MouseWheel;
+			UpdateButtonsTooltip(); //mxd
+		}
+
+		#endregion
+
+		#region ================== Interface
+
+		// Client size changes
+		protected override void OnClientSizeChanged(EventArgs e)
+		{
+			base.OnClientSizeChanged(e);
+			ClickableNumericTextbox_Resize(this, e);
+		}
+		
+		// Layout changes
+		private void ClickableNumericTextbox_Layout(object sender, LayoutEventArgs e)
+		{
+			ClickableNumericTextbox_Resize(sender, e);
+		}
+
+		// Control resizes
+		private void ClickableNumericTextbox_Resize(object sender, EventArgs e)
+		{
+			buttons.Height = textbox.Height + 4;
+			textbox.Width = ClientRectangle.Width - buttons.Width - 2;
+			buttons.Left = textbox.Width + 2;
+			this.Height = buttons.Height;
+		}
+		
+		// Text in textbox changes
+		private void textbox_TextChanged(object sender, EventArgs e)
+		{
+			if(WhenTextChanged != null) WhenTextChanged(sender, e);
+			buttons.Enabled = !textbox.CheckIsRelative();
+		}
+		
+		// Buttons changed
+		private void buttons_ValueChanged(object sender, EventArgs e)
+		{
+			if(!ignorebuttonchange)
+			{
+				ignorebuttonchange = true;
+				if(!textbox.CheckIsRelative())
+				{
+					bool ctrl = ((ModifierKeys & Keys.Control) == Keys.Control); //mxd
+					bool shift = ((ModifierKeys & Keys.Shift) == Keys.Shift); //mxd
+
+					if(steps != null && (!usemodifierkeys || (!ctrl && !shift)))
+					{
+						if(buttons.Value < 0)
+							textbox.Text = steps.GetNextHigherWrap(textbox.GetResult(0), wrapsteps).ToString(); //mxd
+						else if(buttons.Value > 0)
+							textbox.Text = steps.GetNextLowerWrap(textbox.GetResult(0), wrapsteps).ToString(); //mxd
+					}
+					else if(textbox.AllowDecimal)
+					{
+						float stepsizemod; //mxd
+						if(usemodifierkeys)
+							stepsizemod = (ctrl ? stepsizeSmall : (shift ? stepsizeBig : stepsizeFloat));
+						else
+							stepsizemod = stepsizeFloat;
+						
+						float newvalue = (float)Math.Round(textbox.GetResultFloat(0.0f) - (buttons.Value * stepsizemod), General.Map.FormatInterface.VertexDecimals);
+						if((newvalue < 0.0f) && !textbox.AllowNegative) newvalue = 0.0f;
+						textbox.Text = newvalue.ToString();
+					}
+					else
+					{
+						int stepsizemod; //mxd
+						if(usemodifierkeys) 
+							stepsizemod = (ctrl ? (int)stepsizeSmall : (shift ? (int)stepsizeBig : stepsize));
+						else
+							stepsizemod = stepsize;
+						
+						int newvalue = textbox.GetResult(0) - (buttons.Value * stepsizemod);
+						if((newvalue < 0) && !textbox.AllowNegative) newvalue = 0;
+						textbox.Text = newvalue.ToString();
+					}
+				}
+				
+				buttons.Value = 0;
+				
+				if(WhenButtonsClicked != null)
+					WhenButtonsClicked(this, EventArgs.Empty);
+				
+				ignorebuttonchange = false;
+			}
+		}
+
+		// Mouse wheel used
+		private void textbox_MouseWheel(object sender, MouseEventArgs e)
+		{
+			if(steps != null && (!usemodifierkeys || ((ModifierKeys & Keys.Control) != Keys.Control && (ModifierKeys & Keys.Shift) != Keys.Shift)))
+			{
+				if(e.Delta > 0)
+					textbox.Text = steps.GetNextHigher(textbox.GetResult(0)).ToString();
+				else if(e.Delta < 0)
+					textbox.Text = steps.GetNextLower(textbox.GetResult(0)).ToString();
+			}
+			else
+			{
+				buttons.Value -= Math.Sign(e.Delta);
+			}
+		}
+
+		// Key pressed in textbox
+		private void textbox_KeyDown(object sender, KeyEventArgs e)
+		{
+			// Enter key?
+			if((e.KeyData == Keys.Enter) && (WhenEnterPressed != null))
+				WhenEnterPressed(this, EventArgs.Empty);
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+		
+		// This checks if the number is relative
+		public bool CheckIsRelative()
+		{
+			return textbox.CheckIsRelative();
+		}
+		
+		// This determines the result value
+		public int GetResult(int original)
+		{
+			return textbox.GetResult(original);
+		}
+
+		//mxd. This determines the result value at given inremental step
+		public int GetResult(int original, int step)
+		{
+			return textbox.GetResult(original, step);
+		}
+		
+		// This determines the result value
+		public float GetResultFloat(float original)
+		{
+			return textbox.GetResultFloat(original);
+		}
+
+		//mxd. This determines the result value at given inremental step
+		public float GetResultFloat(float original, int step)
+		{
+			return textbox.GetResultFloat(original, step);
+		}
+
+		//mxd
+		public void UpdateButtonsTooltip()
+		{
+			if(usemodifierkeys)
+			{
+				string tip = "Hold Ctrl to change value by " + stepsizeSmall.ToString(CultureInfo.CurrentCulture) + "." + Environment.NewLine +
+							 "Hold Shift to change value by " + stepsizeBig.ToString(CultureInfo.CurrentCulture) + ".";
+				tooltip.SetToolTip(buttons, tip);
+				textbox.UpdateTextboxStyle(tip);
+			}
+			else
+			{
+				tooltip.RemoveAll();
+				textbox.UpdateTextboxStyle();
+			}
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Controls/ButtonsNumericTextbox.resx b/Source/Core/Controls/ButtonsNumericTextbox.resx
new file mode 100644
index 0000000..176d65b
--- /dev/null
+++ b/Source/Core/Controls/ButtonsNumericTextbox.resx
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="buttons.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="textbox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Controls/ButtonsNumericTextboxDesigner.cs b/Source/Core/Controls/ButtonsNumericTextboxDesigner.cs
new file mode 100644
index 0000000..8f357bd
--- /dev/null
+++ b/Source/Core/Controls/ButtonsNumericTextboxDesigner.cs
@@ -0,0 +1,65 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Windows.Forms.Design.Behavior;
+using System.Windows.Forms.Design;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Controls
+{
+	// Designer for ButtonsNumericTextbox
+	internal class ButtonsNumericTextboxDesigner : ControlDesigner
+	{
+		public override IList SnapLines
+		{
+			get
+			{
+				IList snaplines = base.SnapLines;
+
+				ButtonsNumericTextbox control = base.Control as ButtonsNumericTextbox;
+				if(control == null) { return snaplines; }
+
+				IDesigner designer = TypeDescriptor.CreateDesigner(control.Textbox, typeof(IDesigner));
+				if(designer == null) { return snaplines; }
+				designer.Initialize(control.Textbox);
+
+				using(designer)
+				{
+					ControlDesigner boxdesigner = designer as ControlDesigner;
+					if(boxdesigner == null) { return snaplines; }
+					
+					// Add the baseline and right snap lines from the textbox
+					foreach(SnapLine line in boxdesigner.SnapLines)
+					{
+						if(line.SnapLineType == SnapLineType.Baseline)
+							snaplines.Add(new SnapLine(line.SnapLineType, line.Offset + control.Textbox.Top, line.Filter, line.Priority));
+						
+						if(line.SnapLineType == SnapLineType.Right)
+							snaplines.Add(new SnapLine(line.SnapLineType, line.Offset + control.Textbox.Left, line.Filter, line.Priority));
+					}
+				}
+
+				return snaplines;
+			}
+		}
+	}
+}
diff --git a/Source/Core/Controls/CheckboxArrayControl.Designer.cs b/Source/Core/Controls/CheckboxArrayControl.Designer.cs
new file mode 100644
index 0000000..e6e3d86
--- /dev/null
+++ b/Source/Core/Controls/CheckboxArrayControl.Designer.cs
@@ -0,0 +1,51 @@
+namespace CodeImp.DoomBuilder.Controls
+{
+	partial class CheckboxArrayControl
+	{
+		/// <summary> 
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Component Designer generated code
+
+		/// <summary> 
+		/// Required method for Designer support - do not modify 
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.SuspendLayout();
+			// 
+			// CheckboxArrayControl
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.AutoScroll = true;
+			this.DoubleBuffered = true;
+			this.Name = "CheckboxArrayControl";
+			this.Size = new System.Drawing.Size(361, 163);
+			this.Paint += new System.Windows.Forms.PaintEventHandler(this.CheckboxArrayControl_Paint);
+			this.Layout += new System.Windows.Forms.LayoutEventHandler(this.CheckboxArrayControl_Layout);
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+
+	}
+}
diff --git a/Source/Core/Controls/CheckboxArrayControl.cs b/Source/Core/Controls/CheckboxArrayControl.cs
new file mode 100644
index 0000000..de451de
--- /dev/null
+++ b/Source/Core/Controls/CheckboxArrayControl.cs
@@ -0,0 +1,172 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Windows.Forms;
+using System.Drawing.Drawing2D;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Controls
+{
+	public partial class CheckboxArrayControl : UserControl
+	{
+		// Events
+		public event EventHandler OnValueChanged; //mxd
+
+		// Variables
+		private List<CheckBox> checkboxes;
+		private int columns;
+		private int spacingY = 1; //mxd
+		
+		// Properties
+		public List<CheckBox> Checkboxes { get { return checkboxes; } }
+		public int Columns { get { return columns; } set { columns = value; } }
+		public int VerticalSpacing { get { return spacingY; } set { spacingY = value; } } //mxd
+		
+		// Constructor
+		public CheckboxArrayControl()
+		{
+			// Initialize
+			InitializeComponent();
+
+			// Setup
+			checkboxes = new List<CheckBox>();
+		}
+
+		// This adds a checkbox
+		public CheckBox Add(string text, object tag)
+		{
+			// Make new checkbox
+			CheckBox c = new CheckBox();
+			c.AutoSize = true;
+			//c.FlatStyle = FlatStyle.System;
+			c.UseVisualStyleBackColor = true;
+			c.Text = text;
+			c.Tag = tag;
+			c.CheckStateChanged += checkbox_OnCheckStateChanged; //mxd
+
+			// Add to list
+			this.Controls.Add(c);
+			checkboxes.Add(c);
+
+			// Return checkbox
+			return c;
+		}
+
+		//mxd
+		public int GetWidth() 
+		{
+			if(columns < 1 || checkboxes.Count < 1) return 0;
+			int maxwidth = 0;
+			foreach(CheckBox cb in checkboxes)
+			{
+				if(cb.Width > maxwidth) maxwidth = cb.Width;
+			}
+
+			return maxwidth * columns;
+		}
+
+		//mxd
+		public int GetHeight() 
+		{
+			if(columns < 1 || checkboxes.Count < 1)	return 0;
+			int col = (int)Math.Ceiling(checkboxes.Count / (float)columns);
+			return col * checkboxes[0].Height + (col * spacingY + spacingY);
+		}
+
+		// This positions the checkboxes
+		public void PositionCheckboxes()
+		{
+			int boxheight = 0;
+			int row = 0;
+			int col = 0;
+			
+			// Checks
+			if(columns < 1 || checkboxes.Count < 1) return;
+			
+			// Calculate column width
+			int columnwidth = this.ClientSize.Width / columns;
+			
+			// Check what the biggest checkbox height is
+			foreach(CheckBox c in checkboxes) if(c.Height > boxheight) boxheight = c.Height;
+
+			// Check what the preferred column length is
+			int columnlength = 1 + (int)Math.Floor((this.ClientSize.Height - boxheight) / (float)(boxheight + spacingY));
+			
+			// When not all items fit with the preferred column length
+			// we have to extend the column length to make it fit
+			if((int)Math.Ceiling(checkboxes.Count / (float)columnlength) > columns)
+			{
+				// Make a column length which works for all items
+				columnlength = (int)Math.Ceiling(checkboxes.Count / (float)columns);
+			}
+
+			// Go for all items
+			foreach(CheckBox c in checkboxes)
+			{
+				// Position checkbox
+				c.Location = new Point(col * columnwidth, row * boxheight + (row - 1) * spacingY + spacingY);
+
+				// Next position
+				if(++row == columnlength)
+				{
+					row = 0;
+					col++;
+				}
+			}
+		}
+
+		//mxd
+		public void Sort()
+		{
+			checkboxes.Sort(CheckboxesComparison);
+		}
+
+		//mxd
+		private static int CheckboxesComparison(CheckBox cb1, CheckBox cb2)
+		{
+			return String.Compare(cb1.Text, cb2.Text, StringComparison.Ordinal);
+		}
+
+		// When layout must change
+		private void CheckboxArrayControl_Layout(object sender, LayoutEventArgs e)
+		{
+			PositionCheckboxes();
+		}
+
+		private void CheckboxArrayControl_Paint(object sender, PaintEventArgs e)
+		{
+			if(this.DesignMode)
+			{
+				using (Pen p = new Pen(SystemColors.ControlDark, 1) { DashStyle = DashStyle.Dash })
+				{
+					e.Graphics.DrawRectangle(p, 0, 0, this.ClientRectangle.Width - 1, this.ClientRectangle.Height - 1);
+				}
+			}
+		}
+
+		//mxd
+		private void checkbox_OnCheckStateChanged(object sender, EventArgs eventArgs) 
+		{
+			if(OnValueChanged != null) OnValueChanged(this, EventArgs.Empty);
+		}
+	}
+}
diff --git a/Source/Core/Controls/CheckboxArrayControl.resx b/Source/Core/Controls/CheckboxArrayControl.resx
new file mode 100644
index 0000000..e1596fb
--- /dev/null
+++ b/Source/Core/Controls/CheckboxArrayControl.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+	Microsoft ResX Schema 
+	
+	Version 2.0
+	
+	The primary goals of this format is to allow a simple XML format 
+	that is mostly human readable. The generation and parsing of the 
+	various data types are done through the TypeConverter classes 
+	associated with the data types.
+	
+	Example:
+	
+	... ado.net/XML headers & schema ...
+	<resheader name="resmimetype">text/microsoft-resx</resheader>
+	<resheader name="version">2.0</resheader>
+	<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+	<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+	<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+	<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+	<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+		<value>[base64 mime encoded serialized .NET Framework object]</value>
+	</data>
+	<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+		<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+		<comment>This is a comment</comment>
+	</data>
+				
+	There are any number of "resheader" rows that contain simple 
+	name/value pairs.
+	
+	Each data row contains a name, and value. The row also contains a 
+	type or mimetype. Type corresponds to a .NET class that support 
+	text/value conversion through the TypeConverter architecture. 
+	Classes that don't support this are serialized and stored with the 
+	mimetype set.
+	
+	The mimetype is used for serialized objects, and tells the 
+	ResXResourceReader how to depersist the object. This is currently not 
+	extensible. For a given mimetype the value must be set accordingly:
+	
+	Note - application/x-microsoft.net.object.binary.base64 is the format 
+	that the ResXResourceWriter will generate, however the reader can 
+	read any of the formats listed below.
+	
+	mimetype: application/x-microsoft.net.object.binary.base64
+	value   : The object must be serialized with 
+			: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+			: and then encoded with base64 encoding.
+	
+	mimetype: application/x-microsoft.net.object.soap.base64
+	value   : The object must be serialized with 
+			: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+			: and then encoded with base64 encoding.
+
+	mimetype: application/x-microsoft.net.object.bytearray.base64
+	value   : The object must be serialized into a byte array 
+			: using a System.ComponentModel.TypeConverter
+			: and then encoded with base64 encoding.
+	-->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+	<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+	<xsd:element name="root" msdata:IsDataSet="true">
+	  <xsd:complexType>
+		<xsd:choice maxOccurs="unbounded">
+		  <xsd:element name="metadata">
+			<xsd:complexType>
+			  <xsd:sequence>
+				<xsd:element name="value" type="xsd:string" minOccurs="0" />
+			  </xsd:sequence>
+			  <xsd:attribute name="name" use="required" type="xsd:string" />
+			  <xsd:attribute name="type" type="xsd:string" />
+			  <xsd:attribute name="mimetype" type="xsd:string" />
+			  <xsd:attribute ref="xml:space" />
+			</xsd:complexType>
+		  </xsd:element>
+		  <xsd:element name="assembly">
+			<xsd:complexType>
+			  <xsd:attribute name="alias" type="xsd:string" />
+			  <xsd:attribute name="name" type="xsd:string" />
+			</xsd:complexType>
+		  </xsd:element>
+		  <xsd:element name="data">
+			<xsd:complexType>
+			  <xsd:sequence>
+				<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+				<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+			  </xsd:sequence>
+			  <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+			  <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+			  <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+			  <xsd:attribute ref="xml:space" />
+			</xsd:complexType>
+		  </xsd:element>
+		  <xsd:element name="resheader">
+			<xsd:complexType>
+			  <xsd:sequence>
+				<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+			  </xsd:sequence>
+			  <xsd:attribute name="name" type="xsd:string" use="required" />
+			</xsd:complexType>
+		  </xsd:element>
+		</xsd:choice>
+	  </xsd:complexType>
+	</xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+	<value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+	<value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+	<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+	<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Controls/CheckedColoredListBox.cs b/Source/Core/Controls/CheckedColoredListBox.cs
new file mode 100644
index 0000000..2e118d4
--- /dev/null
+++ b/Source/Core/Controls/CheckedColoredListBox.cs
@@ -0,0 +1,66 @@
+using System;
+using System.Windows.Forms;
+using System.Drawing;
+using System.Windows.Forms.VisualStyles;
+
+namespace CodeImp.DoomBuilder.Controls
+{
+	public class CheckedColoredListBox : CheckedListBox
+	{
+		public Image WarningIcon { get; set; }
+		
+		public CheckedColoredListBox() 
+		{
+			this.DrawMode = DrawMode.OwnerDrawVariable;
+		}
+
+		protected override void OnMeasureItem(MeasureItemEventArgs e) 
+		{
+			e.ItemHeight = (int)Math.Ceiling(this.Font.Height * (e.Graphics.DpiY / 96.0f));
+		}
+
+		protected override void OnDrawItem(DrawItemEventArgs e) 
+		{
+			if(Items.Count == 0) return; //sanity check
+			IColoredListBoxItem item = (IColoredListBoxItem)Items[e.Index];
+
+			// Draw background
+			e.DrawBackground();
+
+			// Draw checkbox
+			CheckBoxRenderer.DrawCheckBox(e.Graphics, new Point(e.Bounds.Left + 1, e.Bounds.Top + 1), CheckedIndices.Contains(e.Index) ? CheckBoxState.CheckedNormal : CheckBoxState.UncheckedNormal);
+
+			// Draw warning icon
+			if(item.ShowWarning && WarningIcon != null)
+			{
+				e.Graphics.DrawImage(WarningIcon, e.Bounds.Left + e.Bounds.Height + 2, e.Bounds.Top, WarningIcon.Width, WarningIcon.Height);
+			}
+			else // Draw color rectangle
+			{
+				using(SolidBrush bg = new SolidBrush(item.Color))
+				{
+					e.Graphics.FillRectangle(bg, e.Bounds.Left + e.Bounds.Height + 2, e.Bounds.Top + 2, e.Bounds.Height, e.Bounds.Height - 5);
+				}
+				using(Pen outline = new Pen(Color.Black))
+				{
+					e.Graphics.DrawRectangle(outline, e.Bounds.Left + e.Bounds.Height + 2, e.Bounds.Top + 2, e.Bounds.Height, e.Bounds.Height - 5);
+				}
+			}
+
+			// Draw text
+			int offset = e.Bounds.Left + e.Bounds.Height * 2 + 4;
+			Rectangle textbounds = new Rectangle(offset, e.Bounds.Top, e.Bounds.Width - offset, e.Bounds.Height);
+			e.Graphics.DrawString(item.ToString(), e.Font, new SolidBrush(e.ForeColor), textbounds.Left, textbounds.Top);
+
+			// Draw focus rectangle
+			if(e.State == DrawItemState.Focus)
+				ControlPaint.DrawFocusRectangle(e.Graphics, textbounds, e.ForeColor, e.BackColor); 
+		}
+	}
+
+	interface IColoredListBoxItem
+	{
+		bool ShowWarning { get; }
+		Color Color { get; }
+	}
+}
diff --git a/Source/Core/Controls/CollapsibleSplitContainer.cs b/Source/Core/Controls/CollapsibleSplitContainer.cs
new file mode 100644
index 0000000..212c514
--- /dev/null
+++ b/Source/Core/Controls/CollapsibleSplitContainer.cs
@@ -0,0 +1,412 @@
+#region ================== Copyright (c) 2015 MaxED
+
+// Parts of the code are based on "Collapsible Splitter control in C#" by Furty
+// http://www.codeproject.com/Articles/3025/Collapsible-Splitter-control-in-C
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Reflection;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Windows;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Controls
+{
+	[Designer("System.Windows.Forms.Design.SplitContainerDesigner, System.Design, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
+	public class CollapsibleSplitContainer : SplitContainer, ISupportInitialize
+	{
+		#region ================== Private Properties
+
+		// Declare and define some base properties
+		private bool hot;
+		private bool collapsed;
+		private readonly Color hotcolor = CalculateColor(SystemColors.Highlight, SystemColors.Window, 70);
+		private Rectangle bounds;
+		private readonly Dictionary<int, int> scaled;
+
+		// Storesome settings
+		private int storedpanel1minsize;
+		private int storedpanel2minsize;
+		private int storedsplitterdistance;
+
+		#endregion
+
+		#region ================== Public Properties
+
+		[Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public bool IsCollapsed 
+		{
+			get { return collapsed; }
+			set { collapsed = value; ToggleSplitter(); }
+		}
+
+		[Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public int SplitPosition
+		{
+			get { return GetSplitPosition(); }
+			set { storedsplitterdistance = value; if(!IsCollapsed) ToggleSplitter(); }
+		}
+
+		[Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		private new int SplitterWidth 
+		{
+			get { return base.SplitterWidth; }
+			set { base.SplitterWidth = value; }
+		}
+		
+		#endregion
+
+		#region ================== Constructor
+
+		public CollapsibleSplitContainer()
+		{
+			// Register mouse events
+			this.Click += OnClick;
+			this.Resize += OnResize;
+			this.MouseLeave += OnMouseLeave;
+			this.MouseMove += OnMouseMove;
+			this.MouseUp += OnMouseUp;
+
+			//mxd. Set drawing style
+			const ControlStyles cs = ControlStyles.ResizeRedraw | ControlStyles.AllPaintingInWmPaint | ControlStyles.UserPaint | ControlStyles.OptimizedDoubleBuffer;
+			this.SetStyle(cs, true);
+			
+			object[] args = new object[] { cs, true };
+			MethodInfo objMethodInfo = typeof(Control).GetMethod("SetStyle", BindingFlags.NonPublic | BindingFlags.Instance);
+			objMethodInfo.Invoke(this.Panel1, args);
+			objMethodInfo.Invoke(this.Panel2, args);
+
+			// Force the width to 8px so that everything always draws correctly
+			this.SplitterWidth = 8;
+
+			//mxd. Create some scaled coordinates...
+			int[] coords = new[] { 1, 2, 3, 4, 6, 8, 9, 14, 115 };
+			scaled = new Dictionary<int, int>(coords.Length);
+			foreach(int i in coords) scaled[i] = (int)Math.Round(i * MainForm.DPIScaler.Width);
+		}
+
+		#endregion
+
+		#region ================== Event Handlers
+
+		protected override void OnMouseDown(MouseEventArgs e) 
+		{
+			// if the hider control isn't hot, let the base resize action occur
+			if(!this.hot && this.Panel1.Visible && this.Panel2.Visible) base.OnMouseDown(e);
+		}
+
+		private void OnResize(object sender, EventArgs e) 
+		{
+			this.Invalidate();
+		}
+
+		private void OnMouseMove(object sender, MouseEventArgs e) 
+		{
+			// check to see if the mouse cursor position is within the bounds of our control
+			if(bounds.Contains(e.Location)) 
+			{
+				if(!this.hot) 
+				{
+					this.hot = true;
+					this.Cursor = Cursors.Hand;
+					this.Invalidate();
+				}
+			} 
+			else 
+			{
+				if(this.hot) 
+				{
+					this.hot = false;
+					this.Invalidate();
+				}
+
+				this.Cursor = Cursors.Default;
+			}
+		}
+
+		private void OnMouseLeave(object sender, EventArgs e) 
+		{
+			// ensure that the hot state is removed
+			this.hot = false;
+			this.Invalidate();
+		}
+
+		// User may've moved the splitter...
+		private void OnMouseUp(object sender, MouseEventArgs mouseEventArgs) 
+		{
+			if(!collapsed) storedsplitterdistance = GetSplitPosition();
+		}
+
+		private void OnClick(object sender, EventArgs e) 
+		{
+			if(FixedPanel != FixedPanel.None && hot)
+			{
+				collapsed = !collapsed;
+				ToggleSplitter();
+				this.Invalidate();
+			}
+		}
+
+		#endregion
+
+		#region ================== Paint
+
+		protected override void OnPaint(PaintEventArgs e) 
+		{
+			base.OnPaint(e);
+			if(FixedPanel == FixedPanel.None) return;
+			
+			// find the rectangle for the splitter and paint it
+			Rectangle r = this.SplitterRectangle;
+			using(SolidBrush brushbg = new SolidBrush(this.BackColor))
+			{
+				e.Graphics.FillRectangle(brushbg, r);
+			}
+
+			Pen pendark = new Pen(SystemColors.ControlDark);
+			SolidBrush brushlightlight = new SolidBrush(SystemColors.ControlLightLight);
+			SolidBrush brushdark = new SolidBrush(SystemColors.ControlDark);
+			SolidBrush brushdarkdark = new SolidBrush(SystemColors.ControlDarkDark);
+
+			// Check the docking style and create the control rectangle accordingly
+			if(this.Orientation == Orientation.Vertical) 
+			{
+				// create a new rectangle in the vertical center of the splitter for our collapse control button
+				bounds = new Rectangle(r.X, r.Y + ((r.Height - scaled[115]) / 2), scaled[8], scaled[115]);
+
+				// draw the background color for our control image
+				using (SolidBrush bg = new SolidBrush(hot ? hotcolor : this.BackColor))
+				{
+					e.Graphics.FillRectangle(bg, new Rectangle(bounds.X + scaled[1], bounds.Y, scaled[6], scaled[115]));
+				}
+
+				// draw the top & bottom lines for our control image
+				e.Graphics.DrawLine(pendark, bounds.X + scaled[1], bounds.Y, bounds.X + bounds.Width - scaled[2], bounds.Y);
+				e.Graphics.DrawLine(pendark, bounds.X + scaled[1], bounds.Y + bounds.Height, bounds.X + bounds.Width - scaled[2], bounds.Y + bounds.Height);
+
+				if(this.Enabled) 
+				{
+					// draw the arrows for our control image
+					// the ArrowPointArray is a point array that defines an arrow shaped polygon
+					e.Graphics.FillPolygon(brushdarkdark, ArrowPointArray(bounds.X + scaled[2], bounds.Y + scaled[3]));
+					e.Graphics.FillPolygon(brushdarkdark, ArrowPointArray(bounds.X + scaled[2], bounds.Y + bounds.Height - scaled[9]));
+				}
+
+				// draw the dots for our control image using a loop
+				int x = bounds.X + scaled[3];
+				int y = bounds.Y + scaled[14];
+
+				for(int i = 0; i < 30; i++) 
+				{
+					// light dot
+					e.Graphics.FillRectangle(brushlightlight, x, y + scaled[1] + (i * scaled[3]), scaled[2], scaled[2]);
+					// dark dot
+					e.Graphics.FillRectangle(brushdark, x - scaled[1], y + (i * scaled[3]), scaled[2], scaled[2]);
+					i++;
+					// light dot
+					e.Graphics.FillRectangle(brushlightlight, x + scaled[2], y + scaled[1] + (i * scaled[3]), scaled[2], scaled[2]);
+					// dark dot
+					e.Graphics.FillRectangle(brushdark, x + scaled[1], y + (i * scaled[3]), scaled[2], scaled[2]);
+				}
+			} 
+			else // Should be Orientation.Horizontal
+			{
+				// create a new rectangle in the horizontal center of the splitter for our collapse control button
+				bounds = new Rectangle(r.X + ((r.Width - scaled[115]) / 2), r.Y, scaled[115], scaled[8]);
+
+				// draw the background color for our control image
+				using (SolidBrush bg = new SolidBrush(hot ? hotcolor : this.BackColor))
+				{
+					e.Graphics.FillRectangle(bg, new Rectangle(bounds.X, bounds.Y + scaled[1], scaled[115], scaled[6]));
+				}
+
+				// draw the left & right lines for our control image
+				e.Graphics.DrawLine(pendark, bounds.X, bounds.Y + scaled[1], bounds.X, bounds.Y + bounds.Height - scaled[2]);
+				e.Graphics.DrawLine(pendark, bounds.X + bounds.Width, bounds.Y + scaled[1], bounds.X + bounds.Width, bounds.Y + bounds.Height - scaled[2]);
+
+				if(this.Enabled) 
+				{
+					// draw the arrows for our control image
+					// the ArrowPointArray is a point array that defines an arrow shaped polygon
+					e.Graphics.FillPolygon(brushdarkdark, ArrowPointArray(bounds.X + scaled[3], bounds.Y + scaled[2]));
+					e.Graphics.FillPolygon(brushdarkdark, ArrowPointArray(bounds.X + bounds.Width - scaled[9], bounds.Y + scaled[2]));
+				}
+
+				// draw the dots for our control image using a loop
+				int x = bounds.X + scaled[14];
+				int y = bounds.Y + scaled[3];
+
+				for(int i = 0; i < 30; i++) 
+				{
+					// light dot
+					e.Graphics.FillRectangle(brushlightlight, x + scaled[1] + (i * scaled[3]), y, scaled[2], scaled[2]);
+					// dark dot
+					e.Graphics.FillRectangle(brushdark, x + (i * scaled[3]), y - scaled[1], scaled[2], scaled[2]);
+					i++;
+					// light dot
+					e.Graphics.FillRectangle(brushlightlight, x + scaled[1] + (i * scaled[3]), y + scaled[2], scaled[2], scaled[2]);
+					// dark dot
+					e.Graphics.FillRectangle(brushdark, x + (i * scaled[3]), y + scaled[1], scaled[2], scaled[2]);
+				}
+			}
+
+			//mxd. Dispose brushes
+			pendark.Dispose();
+			brushlightlight.Dispose();
+			brushdark.Dispose();
+			brushdarkdark.Dispose();
+		}
+
+		#endregion
+
+		#region ================== Helper methods
+
+		private void ToggleSplitter() 
+		{
+			//mxd. Toggle visibility
+			switch(FixedPanel)
+			{
+				case FixedPanel.Panel1:
+					Panel1.Visible = !collapsed;
+					if(collapsed)
+					{
+						storedsplitterdistance = SplitterDistance;
+						storedpanel1minsize = Panel1MinSize;
+						Panel1MinSize = 0;
+						SplitterDistance = 0;
+					}
+					else
+					{
+						Panel1MinSize = storedpanel1minsize;
+						SplitterDistance = Math.Min(this.Width, storedsplitterdistance);
+					}
+					break;
+
+				case FixedPanel.Panel2:
+					Panel2.Visible = !collapsed;
+					if(collapsed)
+					{
+						storedpanel2minsize = Panel2MinSize;
+						Panel2MinSize = 0;
+					}
+					else
+					{
+						Panel2MinSize = storedpanel2minsize;
+					}
+
+					if(Orientation == Orientation.Vertical)
+					{
+						if(collapsed) storedsplitterdistance = this.Width - SplitterDistance;
+						SplitterDistance = (collapsed ? this.Width : Math.Max(0, this.Width - storedsplitterdistance));
+					}
+					else
+					{
+						if(collapsed) storedsplitterdistance = this.Height - SplitterDistance;
+						SplitterDistance = (collapsed ? this.Height : Math.Max(0, this.Height - storedsplitterdistance));
+					}
+					break;
+			}
+		}
+
+		private int GetSplitPosition() 
+		{
+			switch(FixedPanel) 
+			{
+				case FixedPanel.Panel1:
+					return (Panel1.Visible ? SplitterDistance : storedsplitterdistance);
+
+				case FixedPanel.Panel2:
+					if(Panel2.Visible)
+					{
+						if(Orientation == Orientation.Vertical)
+							return Math.Max(0, this.Width - SplitterDistance);
+						else
+							return Math.Max(0, this.Height - SplitterDistance);
+					}
+					else
+					{
+						return storedsplitterdistance;
+					}
+			}
+
+			return SplitterDistance;
+		}
+
+		// This creates a point array to draw a arrow-like polygon
+		private Point[] ArrowPointArray(int x, int y) 
+		{
+			Point[] points = new Point[3];
+
+			// Right or left arrows
+			if(Orientation == Orientation.Vertical)
+			{
+				if((FixedPanel == FixedPanel.Panel2 && Panel2.Visible) || (FixedPanel == FixedPanel.Panel1 && !Panel1.Visible)) // Right arrow
+				{
+					points[0] = new Point(x, y);
+					points[1] = new Point(x + scaled[3], y + scaled[3]);
+					points[2] = new Point(x, y + scaled[6]);
+				}
+				else // Left arrow
+				{
+					points[0] = new Point(x + scaled[3], y);
+					points[1] = new Point(x, y + scaled[3]);
+					points[2] = new Point(x + scaled[3], y + scaled[6]);
+				}
+			}
+			else // Up or down arrows
+			{
+				if((FixedPanel == FixedPanel.Panel2 && Panel2.Visible) || (FixedPanel == FixedPanel.Panel1 && !Panel1.Visible)) // Down arrow
+				{
+					points[0] = new Point(x, y);
+					points[1] = new Point(x + scaled[6], y);
+					points[2] = new Point(x + scaled[3], y + scaled[3]);
+				} 
+				else // Up arrow
+				{
+					points[0] = new Point(x + scaled[3], y);
+					points[1] = new Point(x + scaled[6], y + scaled[4]);
+					points[2] = new Point(x, y + scaled[4]);
+				}
+			}
+
+			return points;
+		}
+
+		// this method was borrowed from the RichUI Control library by Sajith M
+		private static Color CalculateColor(Color front, Color back, int alpha) 
+		{
+			// solid color obtained as a result of alpha-blending
+			Color frontColor = Color.FromArgb(255, front);
+			Color backColor = Color.FromArgb(255, back);
+
+			float frontRed = frontColor.R;
+			float frontGreen = frontColor.G;
+			float frontBlue = frontColor.B;
+			float backRed = backColor.R;
+			float backGreen = backColor.G;
+			float backBlue = backColor.B;
+
+			float fRed = frontRed * alpha / 255 + backRed * ((float)(255 - alpha) / 255);
+			float fGreen = frontGreen * alpha / 255 + backGreen * ((float)(255 - alpha) / 255);
+			float fBlue = frontBlue * alpha / 255 + backBlue * ((float)(255 - alpha) / 255);
+
+			return Color.FromArgb(255, (byte)fRed, (byte)fGreen, (byte)fBlue);
+		}
+
+		// ISupportInitialize methods. Not needed for .Net 4 and higher
+		public void BeginInit() { }
+		public void EndInit() { }
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Controls/ColorControl.Designer.cs b/Source/Core/Controls/ColorControl.Designer.cs
new file mode 100644
index 0000000..1c176a7
--- /dev/null
+++ b/Source/Core/Controls/ColorControl.Designer.cs
@@ -0,0 +1,99 @@
+namespace CodeImp.DoomBuilder.Controls
+{
+	partial class ColorControl
+	{
+		/// <summary> 
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Component Designer generated code
+
+		/// <summary> 
+		/// Required method for Designer support - do not modify 
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.label = new System.Windows.Forms.Label();
+			this.panel = new System.Windows.Forms.Panel();
+			this.button = new System.Windows.Forms.Button();
+			this.dialog = new System.Windows.Forms.ColorDialog();
+			this.SuspendLayout();
+			// 
+			// label
+			// 
+			this.label.Location = new System.Drawing.Point(-3, 0);
+			this.label.Name = "label";
+			this.label.Size = new System.Drawing.Size(175, 23);
+			this.label.TabIndex = 0;
+			this.label.Text = "Color name:";
+			this.label.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+			// 
+			// panel
+			// 
+			this.panel.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
+			this.panel.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+			this.panel.Location = new System.Drawing.Point(178, 0);
+			this.panel.Name = "panel";
+			this.panel.Size = new System.Drawing.Size(27, 23);
+			this.panel.TabIndex = 1;
+			// 
+			// button
+			// 
+			this.button.BackColor = System.Drawing.SystemColors.Control;
+			this.button.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
+			this.button.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+			this.button.Image = global::CodeImp.DoomBuilder.Properties.Resources.ColorPick;
+			this.button.Location = new System.Drawing.Point(322, 0);
+			this.button.Name = "button";
+			this.button.Size = new System.Drawing.Size(26, 23);
+			this.button.TabIndex = 2;
+			this.button.UseVisualStyleBackColor = false;
+			this.button.MouseMove += new System.Windows.Forms.MouseEventHandler(this.button_MouseMove);
+			this.button.Click += new System.EventHandler(this.button_Click);
+			this.button.MouseDown += new System.Windows.Forms.MouseEventHandler(this.button_MouseDown);
+			this.button.MouseUp += new System.Windows.Forms.MouseEventHandler(this.button_MouseUp);
+			// 
+			// dialog
+			// 
+			this.dialog.FullOpen = true;
+			// 
+			// ColorControl
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.BackColor = System.Drawing.Color.Transparent;
+			this.Controls.Add(this.button);
+			this.Controls.Add(this.panel);
+			this.Controls.Add(this.label);
+			this.MaximumSize = new System.Drawing.Size(10000, 23);
+			this.MinimumSize = new System.Drawing.Size(100, 23);
+			this.Name = "ColorControl";
+			this.Size = new System.Drawing.Size(348, 23);
+			this.Resize += new System.EventHandler(this.ColorControl_Resize);
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Label label;
+		private System.Windows.Forms.Panel panel;
+		private System.Windows.Forms.Button button;
+		private System.Windows.Forms.ColorDialog dialog;
+	}
+}
diff --git a/Source/Core/Controls/ColorControl.cs b/Source/Core/Controls/ColorControl.cs
new file mode 100644
index 0000000..98b07e7
--- /dev/null
+++ b/Source/Core/Controls/ColorControl.cs
@@ -0,0 +1,99 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Rendering;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Controls
+{
+	public partial class ColorControl : UserControl
+	{
+		public event EventHandler ColorChanged;
+		
+		// Constructor
+		public ColorControl()
+		{
+			// Initialize
+			InitializeComponent();
+		}
+
+		// Properties
+		public string Label { get { return label.Text; } set { label.Text = value; } }
+		public PixelColor Color { get { return PixelColor.FromColor(panel.BackColor); } set { panel.BackColor = System.Drawing.Color.FromArgb(value.ToInt()); } }
+
+		// Button clicked
+		private void button_Click(object sender, EventArgs e)
+		{
+			// Mouse up first
+			button_MouseUp(sender, new MouseEventArgs(MouseButtons.Left, 1, 0, 0, 0));
+			
+			// Show color dialog
+			dialog.Color = panel.BackColor;
+			if(dialog.ShowDialog(this.ParentForm) == DialogResult.OK)
+			{
+				// Apply new color
+				panel.BackColor = dialog.Color;
+				//mxd. Dispatch Event
+				if(ColorChanged != null) ColorChanged(this, EventArgs.Empty); 
+			}
+		}
+
+		// Resized
+		private void ColorControl_Resize(object sender, EventArgs e)
+		{
+			try
+			{
+				button.Left = ClientSize.Width - button.Width;
+				panel.Left = ClientSize.Width - button.Width - panel.Width - 3;
+				label.Left = 0;
+				label.Width = panel.Left;
+			}
+			catch(Exception) { }
+		}
+
+		// Mouse pressed on button
+		private void button_MouseDown(object sender, MouseEventArgs e)
+		{
+			// This moves the image 1 pixel to right-bottom
+			if(e.Button == MouseButtons.Left)
+				button.Padding = new Padding(1, 0, 1, 1);
+		}
+
+		// Mouse released on button
+		private void button_MouseUp(object sender, MouseEventArgs e)
+		{
+			// This moves the image 1 pixel to normal position
+			if(e.Button == MouseButtons.Left)
+				button.Padding = new Padding(0, 0, 2, 3);
+			
+			// Lose focus
+			panel.Focus();
+		}
+
+		// Mouse moves over button
+		private void button_MouseMove(object sender, MouseEventArgs e)
+		{
+			// Outside button rect?
+			if((e.X < 0) || (e.X >= button.Width) || (e.Y < 0) || (e.Y >= button.Height))
+				button.Padding = new Padding(0, 0, 2, 3);
+		}
+	}
+}
diff --git a/Source/Core/Controls/ColorControl.resx b/Source/Core/Controls/ColorControl.resx
new file mode 100644
index 0000000..f2f0ce0
--- /dev/null
+++ b/Source/Core/Controls/ColorControl.resx
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="dialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Controls/ColoredComboBox.cs b/Source/Core/Controls/ColoredComboBox.cs
new file mode 100644
index 0000000..07561cb
--- /dev/null
+++ b/Source/Core/Controls/ColoredComboBox.cs
@@ -0,0 +1,55 @@
+using System.Windows.Forms;
+using System.Drawing;
+
+namespace CodeImp.DoomBuilder.Controls
+{
+	public class ColoredComboBox : ComboBox
+	{
+		public ColoredComboBox() 
+		{ 
+			this.DrawMode = DrawMode.OwnerDrawFixed; 
+		}
+
+		protected override void OnDrawItem(DrawItemEventArgs e)
+		{
+			base.OnDrawItem(e);
+			e.DrawBackground();
+			ColoredComboBoxItem item = (ColoredComboBoxItem)this.Items[e.Index];
+			using(Brush brush = new SolidBrush(((e.State & DrawItemState.Selected) == DrawItemState.Selected) ? Color.White : item.ForeColor))
+			{
+				e.Graphics.DrawString(item.Text, this.Font, brush, e.Bounds.X, e.Bounds.Y);
+			}
+		}
+	}
+
+	public class ColoredComboBoxItem
+	{
+		private string text = "";
+		private object value;
+		Color forecolor = Color.Black;
+
+		public string Text { get { return text; } set { text = value; } }
+		public object Value { get { return value; } set { this.value = value; } }
+		public Color ForeColor { get { return forecolor; } set { forecolor = value; } }
+		
+		public ColoredComboBoxItem() { }
+
+		public ColoredComboBoxItem(object value) 
+		{
+			this.text = value.ToString();
+			this.value = value;
+		}
+
+		public ColoredComboBoxItem(object value, Color forecolor) 
+		{
+			this.text = value.ToString();
+			this.value = value;
+			this.forecolor = forecolor;
+		}
+
+		public override string ToString() 
+		{
+			return text;
+		}
+	}
+}
diff --git a/Source/Core/Controls/CommentEditor.Designer.cs b/Source/Core/Controls/CommentEditor.Designer.cs
new file mode 100644
index 0000000..ea0f310
--- /dev/null
+++ b/Source/Core/Controls/CommentEditor.Designer.cs
@@ -0,0 +1,182 @@
+namespace CodeImp.DoomBuilder.Controls
+{
+	partial class CommentEditor
+	{
+		/// <summary> 
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing) {
+			if(disposing && (components != null)) {
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Component Designer generated code
+
+		/// <summary> 
+		/// Required method for Designer support - do not modify 
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent() {
+			this.textbox = new System.Windows.Forms.TextBox();
+			this.clear = new System.Windows.Forms.Button();
+			this.label1 = new System.Windows.Forms.Label();
+			this.radioButton1 = new System.Windows.Forms.RadioButton();
+			this.radioButton2 = new System.Windows.Forms.RadioButton();
+			this.radioButton3 = new System.Windows.Forms.RadioButton();
+			this.radioButton4 = new System.Windows.Forms.RadioButton();
+			this.radioButton5 = new System.Windows.Forms.RadioButton();
+			this.panel1 = new System.Windows.Forms.Panel();
+			this.panel1.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// textbox
+			// 
+			this.textbox.Location = new System.Drawing.Point(3, 29);
+			this.textbox.Multiline = true;
+			this.textbox.Name = "textbox";
+			this.textbox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
+			this.textbox.Size = new System.Drawing.Size(481, 268);
+			this.textbox.TabIndex = 0;
+			this.textbox.TabStop = false;
+			this.textbox.TextChanged += new System.EventHandler(this.textbox_TextChanged);
+			this.textbox.PreviewKeyDown += new System.Windows.Forms.PreviewKeyDownEventHandler(this.textbox_PreviewKeyDown);
+			this.textbox.Leave += new System.EventHandler(this.textbox_Leave);
+			this.textbox.Enter += new System.EventHandler(this.textbox_Enter);
+			// 
+			// clear
+			// 
+			this.clear.Image = global::CodeImp.DoomBuilder.Properties.Resources.Clear;
+			this.clear.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+			this.clear.Location = new System.Drawing.Point(424, 2);
+			this.clear.Name = "clear";
+			this.clear.Size = new System.Drawing.Size(60, 23);
+			this.clear.TabIndex = 1;
+			this.clear.Text = "Clear";
+			this.clear.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+			this.clear.UseVisualStyleBackColor = true;
+			this.clear.Click += new System.EventHandler(this.clear_Click);
+			// 
+			// label1
+			// 
+			this.label1.AutoSize = true;
+			this.label1.Location = new System.Drawing.Point(6, 8);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(80, 13);
+			this.label1.TabIndex = 2;
+			this.label1.Text = "Comment type: ";
+			// 
+			// radioButton1
+			// 
+			this.radioButton1.Image = global::CodeImp.DoomBuilder.Properties.Resources.CommentRegular;
+			this.radioButton1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+			this.radioButton1.Location = new System.Drawing.Point(3, -1);
+			this.radioButton1.Name = "radioButton1";
+			this.radioButton1.Size = new System.Drawing.Size(36, 24);
+			this.radioButton1.TabIndex = 3;
+			this.radioButton1.TabStop = true;
+			this.radioButton1.Tag = 0;
+			this.radioButton1.UseVisualStyleBackColor = true;
+			this.radioButton1.CheckedChanged += new System.EventHandler(this.radiobutton_CheckedChanged);
+			// 
+			// radioButton2
+			// 
+			this.radioButton2.Image = global::CodeImp.DoomBuilder.Properties.Resources.CommentInfo;
+			this.radioButton2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+			this.radioButton2.Location = new System.Drawing.Point(45, -1);
+			this.radioButton2.Name = "radioButton2";
+			this.radioButton2.Size = new System.Drawing.Size(36, 24);
+			this.radioButton2.TabIndex = 4;
+			this.radioButton2.TabStop = true;
+			this.radioButton2.Tag = 1;
+			this.radioButton2.UseVisualStyleBackColor = true;
+			this.radioButton2.CheckedChanged += new System.EventHandler(this.radiobutton_CheckedChanged);
+			// 
+			// radioButton3
+			// 
+			this.radioButton3.Image = global::CodeImp.DoomBuilder.Properties.Resources.CommentQuestion;
+			this.radioButton3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+			this.radioButton3.Location = new System.Drawing.Point(87, -1);
+			this.radioButton3.Name = "radioButton3";
+			this.radioButton3.Size = new System.Drawing.Size(36, 24);
+			this.radioButton3.TabIndex = 5;
+			this.radioButton3.TabStop = true;
+			this.radioButton3.Tag = 2;
+			this.radioButton3.UseVisualStyleBackColor = true;
+			this.radioButton3.CheckedChanged += new System.EventHandler(this.radiobutton_CheckedChanged);
+			// 
+			// radioButton4
+			// 
+			this.radioButton4.Image = global::CodeImp.DoomBuilder.Properties.Resources.CommentProblem;
+			this.radioButton4.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+			this.radioButton4.Location = new System.Drawing.Point(129, -1);
+			this.radioButton4.Name = "radioButton4";
+			this.radioButton4.Size = new System.Drawing.Size(36, 24);
+			this.radioButton4.TabIndex = 6;
+			this.radioButton4.TabStop = true;
+			this.radioButton4.Tag = 3;
+			this.radioButton4.UseVisualStyleBackColor = true;
+			this.radioButton4.CheckedChanged += new System.EventHandler(this.radiobutton_CheckedChanged);
+			// 
+			// radioButton5
+			// 
+			this.radioButton5.Image = global::CodeImp.DoomBuilder.Properties.Resources.CommentSmile;
+			this.radioButton5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+			this.radioButton5.Location = new System.Drawing.Point(171, -1);
+			this.radioButton5.Name = "radioButton5";
+			this.radioButton5.Size = new System.Drawing.Size(36, 24);
+			this.radioButton5.TabIndex = 7;
+			this.radioButton5.TabStop = true;
+			this.radioButton5.Tag = 4;
+			this.radioButton5.UseVisualStyleBackColor = true;
+			this.radioButton5.CheckedChanged += new System.EventHandler(this.radiobutton_CheckedChanged);
+			// 
+			// panel1
+			// 
+			this.panel1.Controls.Add(this.radioButton1);
+			this.panel1.Controls.Add(this.radioButton2);
+			this.panel1.Controls.Add(this.radioButton3);
+			this.panel1.Controls.Add(this.radioButton4);
+			this.panel1.Controls.Add(this.radioButton5);
+			this.panel1.Location = new System.Drawing.Point(88, 4);
+			this.panel1.Name = "panel1";
+			this.panel1.Size = new System.Drawing.Size(330, 23);
+			this.panel1.TabIndex = 8;
+			// 
+			// CommentEditor
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.Controls.Add(this.clear);
+			this.Controls.Add(this.panel1);
+			this.Controls.Add(this.label1);
+			this.Controls.Add(this.textbox);
+			this.Name = "CommentEditor";
+			this.Size = new System.Drawing.Size(487, 300);
+			this.Resize += new System.EventHandler(this.CommentEditor_Resize);
+			this.panel1.ResumeLayout(false);
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.TextBox textbox;
+		private System.Windows.Forms.Button clear;
+		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.RadioButton radioButton1;
+		private System.Windows.Forms.RadioButton radioButton2;
+		private System.Windows.Forms.RadioButton radioButton3;
+		private System.Windows.Forms.RadioButton radioButton4;
+		private System.Windows.Forms.RadioButton radioButton5;
+		private System.Windows.Forms.Panel panel1;
+	}
+}
diff --git a/Source/Core/Controls/CommentEditor.cs b/Source/Core/Controls/CommentEditor.cs
new file mode 100644
index 0000000..6628780
--- /dev/null
+++ b/Source/Core/Controls/CommentEditor.cs
@@ -0,0 +1,148 @@
+#region ================== Copyright
+
+/*
+ * Made by MaxED, mkay?
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Controls
+{
+	public partial class CommentEditor : UserControl
+	{
+		#region ================== Variables
+
+		private const string DEFAULT_TEXT = "Click to enter a comment...";
+		private bool mixedvalues;
+		private int commenttype;
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		public CommentEditor()
+		{
+			InitializeComponent();
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		public void SetValues(UniFields fields, bool first)
+		{
+			if(mixedvalues) return;
+			string c = fields.GetValue("comment", string.Empty);
+			if(first)
+			{
+				textbox.Text = c;
+			}
+			else if(textbox.Text != c)
+			{
+				textbox.Clear();
+				mixedvalues = true;
+			}
+		}
+
+		public void FinishSetup()
+		{
+			if(mixedvalues) return;
+
+			if(string.IsNullOrEmpty(textbox.Text))
+			{
+				textbox.Text = DEFAULT_TEXT;
+				textbox.ForeColor = SystemColors.InactiveCaptionText;
+				radioButton1.Checked = true;
+			}
+			else if(textbox.Text.Length > 2)
+			{
+				string type = textbox.Text.Substring(0, 3);
+				int index = Array.IndexOf(CommentType.Types, type);
+				commenttype = (index > 0 ? index : 0);
+				if(commenttype > 0) textbox.Text = textbox.Text.TrimStart(type.ToCharArray());
+
+				// Isn't there a better way to do this?..
+				switch(commenttype)
+				{
+					case 0: radioButton1.Checked = true; break;
+					case 1: radioButton2.Checked = true; break;
+					case 2: radioButton3.Checked = true; break;
+					case 3: radioButton4.Checked = true; break;
+					case 4: radioButton5.Checked = true; break;
+				}
+			}
+		}
+
+		public void Apply(UniFields fields)
+		{
+			if(mixedvalues) return;
+			string text = (!string.IsNullOrEmpty(textbox.Text) && textbox.Text != DEFAULT_TEXT ? CommentType.Types[commenttype] + textbox.Text : String.Empty);
+			UniFields.SetString(fields, "comment", text, string.Empty);
+		}
+
+		#endregion
+
+		#region ================== Events
+
+		private void clear_Click(object sender, EventArgs e)
+		{
+			textbox.Text = DEFAULT_TEXT;
+			textbox.ForeColor = SystemColors.InactiveCaptionText;
+			mixedvalues = false;
+		}
+
+		private void textbox_Enter(object sender, EventArgs e)
+		{
+			if(textbox.Text == DEFAULT_TEXT)
+			{
+				textbox.Clear();
+				textbox.ForeColor = SystemColors.WindowText;
+			}
+		}
+
+		private void textbox_Leave(object sender, EventArgs e)
+		{
+			if(string.IsNullOrEmpty(textbox.Text) && !mixedvalues)
+			{
+				textbox.Text = DEFAULT_TEXT;
+				textbox.ForeColor = SystemColors.InactiveCaptionText;
+			}
+		}
+
+		private void textbox_TextChanged(object sender, EventArgs e)
+		{
+			mixedvalues = false;
+		}
+
+		private void radiobutton_CheckedChanged(object sender, EventArgs e)
+		{
+			commenttype = (int)((Control)sender).Tag;
+		}
+
+		// We don't want to close the parent form when user presses Enter while typing the text
+		private void textbox_PreviewKeyDown(object sender, PreviewKeyDownEventArgs e)
+		{
+			if(e.KeyCode == Keys.Enter) e.IsInputKey = true;
+		}
+
+		//mxd. Because anchor-based alignment fails when using high-Dpi settings...
+		private void CommentEditor_Resize(object sender, EventArgs e)
+		{
+			clear.Left = this.Width - clear.Margin.Right - clear.Width;
+			textbox.Width = this.Width - textbox.Left - textbox.Margin.Right;
+			textbox.Height = this.Height - textbox.Top - textbox.Margin.Bottom;
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Controls/CommentEditor.resx b/Source/Core/Controls/CommentEditor.resx
new file mode 100644
index 0000000..19dc0dd
--- /dev/null
+++ b/Source/Core/Controls/CommentEditor.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Controls/ConfigurablePictureBox.cs b/Source/Core/Controls/ConfigurablePictureBox.cs
new file mode 100644
index 0000000..a105dc8
--- /dev/null
+++ b/Source/Core/Controls/ConfigurablePictureBox.cs
@@ -0,0 +1,64 @@
+#region ================== Namespaces
+
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Controls
+{
+	public class ConfigurablePictureBox : PictureBox
+	{
+		#region ================== Constants
+
+		private const int BORDER_SIZE = 4;
+
+		#endregion
+
+		#region ================== Variables
+
+		private InterpolationMode interpolationmode = InterpolationMode.NearestNeighbor;
+		private SmoothingMode smoothingmode = SmoothingMode.Default;
+		private CompositingQuality compositingquality = CompositingQuality.Default;
+		private PixelOffsetMode pixeloffsetmode = PixelOffsetMode.None;
+		private GraphicsUnit pageunit = GraphicsUnit.Pixel;
+		private readonly Color highlight = Color.FromArgb(196, SystemColors.Highlight);
+
+		#endregion
+
+		#region ================== Properties
+
+		public InterpolationMode InterpolationMode { get { return interpolationmode; } set { interpolationmode = value; } }
+		public SmoothingMode SmoothingMode { get { return smoothingmode; } set { smoothingmode = value; } }
+		public CompositingQuality CompositingQuality { get { return compositingquality; } set { compositingquality = value; } }
+		public PixelOffsetMode PixelOffsetMode { get { return pixeloffsetmode; } set { pixeloffsetmode = value; } }
+		public GraphicsUnit PageUnit { get { return pageunit; } set { pageunit = value; } }
+		public bool Highlighted { get; set; }
+
+		#endregion
+
+		#region ================== Events
+
+		protected override void OnPaint(PaintEventArgs pe)
+		{
+			pe.Graphics.InterpolationMode = InterpolationMode;
+			pe.Graphics.SmoothingMode = SmoothingMode;
+			pe.Graphics.CompositingQuality = CompositingQuality;
+			pe.Graphics.PageUnit = PageUnit;
+			pe.Graphics.PixelOffsetMode = PixelOffsetMode;
+			base.OnPaint(pe);
+
+			if(Highlighted)
+			{
+				ControlPaint.DrawBorder(pe.Graphics, DisplayRectangle,
+								  highlight, BORDER_SIZE, ButtonBorderStyle.Solid,
+								  highlight, BORDER_SIZE, ButtonBorderStyle.Solid,
+								  highlight, BORDER_SIZE, ButtonBorderStyle.Solid,
+								  highlight, BORDER_SIZE, ButtonBorderStyle.Solid);
+			}
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Controls/DebugConsole.cs b/Source/Core/Controls/DebugConsole.cs
new file mode 100644
index 0000000..5a396ac
--- /dev/null
+++ b/Source/Core/Controls/DebugConsole.cs
@@ -0,0 +1,284 @@
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Globalization;
+using System.Windows.Forms;
+
+#if PROFILE
+using JetBrains.Profiler.Core.Api;
+#endif
+
+#endregion
+
+namespace CodeImp.DoomBuilder
+{
+	#region ================== Enums
+
+	[Flags]
+	public enum DebugMessageType
+	{
+		LOG = 1,
+		INFO = 2,
+		WARNING = 4,
+		ERROR = 8,
+		SPECIAL = 16,
+	}
+
+	#endregion
+
+	public partial class DebugConsole : UserControl
+	{
+		#region ================== Variables
+
+		private const int MAX_MESSAGES = 1024;
+		private static readonly List<KeyValuePair<DebugMessageType, string>> messages = new List<KeyValuePair<DebugMessageType, string>>(MAX_MESSAGES);
+
+		//Colors
+		private readonly Dictionary<DebugMessageType, Color> textcolors;
+		private readonly Dictionary<DebugMessageType, string> textheaders;
+
+		private DebugMessageType filters;
+		private static long starttime = -1;
+		private static DebugConsole me;
+
+		#endregion
+
+		#region ================== Properties
+
+		public bool AlwaysOnTop { get { return alwaysontop.Checked; } }
+
+		#endregion
+
+		#region ================== Constructor
+
+		public DebugConsole() 
+		{
+			InitializeComponent();
+			me = this;
+
+			// Setup filters
+			foreach(ToolStripMenuItem item in filterselector.DropDownItems)
+			{
+				UpdateFilters(item);
+			}
+
+			// Setup colors
+			textcolors = new Dictionary<DebugMessageType, Color> {
+				             { DebugMessageType.LOG, SystemColors.WindowText }, 
+							 { DebugMessageType.INFO, Color.DarkGreen }, 
+							 { DebugMessageType.WARNING, Color.DarkOrange }, 
+							 { DebugMessageType.ERROR, Color.DarkRed }, 
+							 { DebugMessageType.SPECIAL, Color.DarkMagenta }
+			             };
+
+			// Setup headers
+			textheaders = new Dictionary<DebugMessageType, string> {
+				              { DebugMessageType.LOG, string.Empty}, 
+							  { DebugMessageType.INFO, string.Empty}, 
+							  { DebugMessageType.WARNING, "Warning: "}, 
+							  { DebugMessageType.ERROR, "ERROR: "}, 
+							  { DebugMessageType.SPECIAL, string.Empty}
+			              };
+
+			// Word wrap?
+			wordwrap.Checked = console.WordWrap;
+
+			// Pending messages?
+			if(messages.Count > 0) UpdateMessages();
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		public static void Write(string text)
+		{
+			Write(DebugMessageType.INFO, text);
+		}
+
+		public static void WriteLine(string text) 
+		{
+			Write(DebugMessageType.INFO, text + Environment.NewLine);
+		}
+
+		public static void Write(DebugMessageType type, string text)
+		{
+			if(me != null && me.InvokeRequired) 
+			{
+				me.Invoke(new Action<DebugMessageType, string>(Write), new object[] { type, text });
+			} 
+			else 
+			{
+				if(messages.Count + 1 > MAX_MESSAGES) lock (messages) { messages.RemoveAt(0); }
+				messages.Add(new KeyValuePair<DebugMessageType, string>(type, text));
+				if(me != null && (me.filters & type) == type) 
+				{
+					me.AddMessage(type, text, true);
+				}
+			}
+		}
+
+		public static void WriteLine(DebugMessageType type, string text)
+		{
+			Write(type, text + Environment.NewLine);
+		}
+
+		public static void Clear()
+		{
+			if(me != null && me.InvokeRequired)
+			{
+				me.Invoke(new Action(Clear));
+			}
+			else
+			{
+				if(me != null) me.console.Clear();
+				messages.Clear();
+			}
+		}
+
+		public static void StartTimer() 
+		{
+			starttime = SlimDX.Configuration.Timer.ElapsedMilliseconds;
+		}
+
+		public static void StopTimer(string message) 
+		{
+			if(starttime == -1) throw new InvalidOperationException("DebugConsole.StartTimer() must be called before DebugConsole.StopTimer()!");
+
+			long duration = SlimDX.Configuration.Timer.ElapsedMilliseconds - starttime;
+			
+			if(message.Contains("%"))
+				message = message.Replace("%", duration.ToString(CultureInfo.InvariantCulture));
+			else
+				message = message.TrimEnd() + " " + duration + " ms.";
+
+			WriteLine(DebugMessageType.SPECIAL, message);
+
+			starttime = -1;
+		}
+
+		public static void StartProfiler()
+		{
+#if PROFILE
+			if(PerformanceProfiler.IsActive)
+			{
+				WriteLine(DebugMessageType.SPECIAL, "Starting the Profiler...");
+				PerformanceProfiler.Begin();
+				PerformanceProfiler.Start();
+			}
+			else
+			{
+				WriteLine(DebugMessageType.SPECIAL, "Unable to start the Profiler...");
+			}
+#else
+			WriteLine(DebugMessageType.SPECIAL, "Unable to start the Profiler: incorrect build configuration selected!");
+#endif
+		}
+
+		public static void StopProfiler() { StopProfiler(true); }
+		public static void StopProfiler(bool savesnapshot)
+		{
+#if PROFILE
+			if(PerformanceProfiler.IsActive)
+			{
+				PerformanceProfiler.Stop();
+				if(savesnapshot) PerformanceProfiler.EndSave();
+				else PerformanceProfiler.EndDrop();
+
+				WriteLine(DebugMessageType.SPECIAL, "Profiler Stopped...");
+			}
+			else
+			{
+				WriteLine(DebugMessageType.SPECIAL, "Unable to stop the Profiler...");
+			}
+#else
+			WriteLine(DebugMessageType.SPECIAL, "Unable to stop the Profiler: incorrect build configuration selected!");
+#endif
+		}
+
+		private void AddMessage(DebugMessageType type, string text, bool scroll)
+		{
+			text = textheaders[type] + text;
+			console.SelectionStart = console.TextLength;
+			console.SelectionColor = textcolors[type];
+			console.AppendText(text);
+			if(scroll && autoscroll.Checked) console.ScrollToCaret();
+		}
+
+		private void UpdateFilters(ToolStripMenuItem item)
+		{
+			DebugMessageType flag = (DebugMessageType)(int)item.Tag;
+			if(item.Checked) 
+			{
+				filters |= flag;
+			} 
+			else 
+			{
+				filters &= ~flag;
+			}
+		}
+
+		private void UpdateMessages()
+		{
+			console.Clear();
+
+			console.SuspendLayout();
+			foreach(KeyValuePair<DebugMessageType, string> pair in messages)
+			{
+				if((filters & pair.Key) == pair.Key && CheckTextFilter(pair.Value, searchbox.Text))
+				{
+					AddMessage(pair.Key, pair.Value, false);
+				}
+			}
+
+			console.ResumeLayout();
+			console.ScrollToCaret();
+		}
+
+		// Should we display this message?
+		private static bool CheckTextFilter(string text, string filter) 
+		{
+			if(string.IsNullOrEmpty(filter) || filter.Length < 3) return true;
+			return text.ToUpperInvariant().Contains(filter.ToUpperInvariant());
+		}
+
+		#endregion
+
+		#region ================== Events
+
+		private void clearall_Click(object sender, EventArgs e) 
+		{
+			Clear();
+		}
+
+		private void filters_Click(object sender, EventArgs e)
+		{
+			UpdateFilters(sender as ToolStripMenuItem);
+			UpdateMessages();
+		}
+
+		private void wordwrap_Click(object sender, EventArgs e) 
+		{
+			console.WordWrap = wordwrap.Checked;
+		}
+
+		#endregion
+
+		#region ================== Search events
+
+		private void searchclear_Click(object sender, EventArgs e) 
+		{
+			searchbox.Clear();
+		}
+
+		private void searchbox_TextChanged(object sender, EventArgs e) 
+		{
+			if(string.IsNullOrEmpty(searchbox.Text) || searchbox.Text.Length > 2) UpdateMessages();
+		}
+
+		#endregion
+
+	}
+}
diff --git a/Source/Core/Controls/DebugConsole.designer.cs b/Source/Core/Controls/DebugConsole.designer.cs
new file mode 100644
index 0000000..9965c81
--- /dev/null
+++ b/Source/Core/Controls/DebugConsole.designer.cs
@@ -0,0 +1,266 @@
+namespace CodeImp.DoomBuilder
+{
+	partial class DebugConsole
+	{
+		/// <summary> 
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing) 
+		{
+			if(disposing && (components != null)) 
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Component Designer generated code
+
+		/// <summary> 
+		/// Required method for Designer support - do not modify 
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent() 
+		{
+			this.toolStrip1 = new System.Windows.Forms.ToolStrip();
+			this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
+			this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+			this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
+			this.searchbox = new System.Windows.Forms.ToolStripTextBox();
+			this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
+			this.autoscroll = new CodeImp.DoomBuilder.Controls.ToolStripCheckBox();
+			this.console = new System.Windows.Forms.RichTextBox();
+			this.clearall = new System.Windows.Forms.ToolStripButton();
+			this.wordwrap = new System.Windows.Forms.ToolStripButton();
+			this.filterselector = new System.Windows.Forms.ToolStripDropDownButton();
+			this.filterlog = new System.Windows.Forms.ToolStripMenuItem();
+			this.filterinfo = new System.Windows.Forms.ToolStripMenuItem();
+			this.filterwarning = new System.Windows.Forms.ToolStripMenuItem();
+			this.filtererrors = new System.Windows.Forms.ToolStripMenuItem();
+			this.filterspecial = new System.Windows.Forms.ToolStripMenuItem();
+			this.searchclear = new System.Windows.Forms.ToolStripButton();
+			this.alwaysontop = new System.Windows.Forms.ToolStripButton();
+			this.toolStrip1.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// toolStrip1
+			// 
+			this.toolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;
+			this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.clearall,
+            this.toolStripSeparator3,
+            this.wordwrap,
+            this.filterselector,
+            this.toolStripSeparator1,
+            this.toolStripLabel1,
+            this.searchbox,
+            this.searchclear,
+            this.toolStripSeparator2,
+            this.alwaysontop,
+            this.autoscroll});
+			this.toolStrip1.Location = new System.Drawing.Point(0, 0);
+			this.toolStrip1.Name = "toolStrip1";
+			this.toolStrip1.Size = new System.Drawing.Size(800, 25);
+			this.toolStrip1.TabIndex = 0;
+			this.toolStrip1.Text = "toolStrip1";
+			// 
+			// toolStripSeparator3
+			// 
+			this.toolStripSeparator3.Name = "toolStripSeparator3";
+			this.toolStripSeparator3.Size = new System.Drawing.Size(6, 25);
+			// 
+			// toolStripSeparator1
+			// 
+			this.toolStripSeparator1.Name = "toolStripSeparator1";
+			this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25);
+			// 
+			// toolStripLabel1
+			// 
+			this.toolStripLabel1.Name = "toolStripLabel1";
+			this.toolStripLabel1.Size = new System.Drawing.Size(39, 22);
+			this.toolStripLabel1.Text = "Filter: ";
+			// 
+			// searchbox
+			// 
+			this.searchbox.Name = "searchbox";
+			this.searchbox.Size = new System.Drawing.Size(100, 25);
+			this.searchbox.TextChanged += new System.EventHandler(this.searchbox_TextChanged);
+			// 
+			// toolStripSeparator2
+			// 
+			this.toolStripSeparator2.Name = "toolStripSeparator2";
+			this.toolStripSeparator2.Size = new System.Drawing.Size(6, 25);
+			// 
+			// autoscroll
+			// 
+			this.autoscroll.Checked = true;
+			this.autoscroll.Margin = new System.Windows.Forms.Padding(3, 3, 0, 2);
+			this.autoscroll.Name = "autoscroll";
+			this.autoscroll.Size = new System.Drawing.Size(84, 20);
+			this.autoscroll.Text = "Auto Scroll";
+			// 
+			// console
+			// 
+			this.console.BackColor = System.Drawing.SystemColors.Window;
+			this.console.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+			this.console.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.console.Font = new System.Drawing.Font("Lucida Console", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.console.Location = new System.Drawing.Point(0, 25);
+			this.console.Name = "console";
+			this.console.ReadOnly = true;
+			this.console.Size = new System.Drawing.Size(800, 125);
+			this.console.TabIndex = 1;
+			this.console.Text = "";
+			// 
+			// clearall
+			// 
+			this.clearall.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.clearall.Image = global::CodeImp.DoomBuilder.Properties.Resources.Clear;
+			this.clearall.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.clearall.Name = "clearall";
+			this.clearall.Size = new System.Drawing.Size(23, 22);
+			this.clearall.Text = "Clear All";
+			this.clearall.Click += new System.EventHandler(this.clearall_Click);
+			// 
+			// wordwrap
+			// 
+			this.wordwrap.CheckOnClick = true;
+			this.wordwrap.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.wordwrap.Image = global::CodeImp.DoomBuilder.Properties.Resources.WordWrap;
+			this.wordwrap.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.wordwrap.Name = "wordwrap";
+			this.wordwrap.Size = new System.Drawing.Size(23, 22);
+			this.wordwrap.Text = "Word Wrap";
+			this.wordwrap.Click += new System.EventHandler(this.wordwrap_Click);
+			// 
+			// filterselector
+			// 
+			this.filterselector.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.filterselector.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.filterlog,
+            this.filterinfo,
+            this.filterwarning,
+            this.filtererrors,
+            this.filterspecial});
+			this.filterselector.Image = global::CodeImp.DoomBuilder.Properties.Resources.Filter;
+			this.filterselector.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.filterselector.Name = "filterselector";
+			this.filterselector.Size = new System.Drawing.Size(29, 22);
+			this.filterselector.Text = "Displayed Message Types";
+			// 
+			// filterlog
+			// 
+			this.filterlog.CheckOnClick = true;
+			this.filterlog.Name = "filterlog";
+			this.filterlog.Size = new System.Drawing.Size(124, 22);
+			this.filterlog.Tag = 1;
+			this.filterlog.Text = "Log";
+			this.filterlog.Click += new System.EventHandler(this.filters_Click);
+			// 
+			// filterinfo
+			// 
+			this.filterinfo.Checked = true;
+			this.filterinfo.CheckOnClick = true;
+			this.filterinfo.CheckState = System.Windows.Forms.CheckState.Checked;
+			this.filterinfo.Name = "filterinfo";
+			this.filterinfo.Size = new System.Drawing.Size(124, 22);
+			this.filterinfo.Tag = 2;
+			this.filterinfo.Text = "Info";
+			this.filterinfo.Click += new System.EventHandler(this.filters_Click);
+			// 
+			// filterwarning
+			// 
+			this.filterwarning.Checked = true;
+			this.filterwarning.CheckOnClick = true;
+			this.filterwarning.CheckState = System.Windows.Forms.CheckState.Checked;
+			this.filterwarning.Name = "filterwarning";
+			this.filterwarning.Size = new System.Drawing.Size(124, 22);
+			this.filterwarning.Tag = 4;
+			this.filterwarning.Text = "Warnings";
+			this.filterwarning.Click += new System.EventHandler(this.filters_Click);
+			// 
+			// filtererrors
+			// 
+			this.filtererrors.Checked = true;
+			this.filtererrors.CheckOnClick = true;
+			this.filtererrors.CheckState = System.Windows.Forms.CheckState.Checked;
+			this.filtererrors.Name = "filtererrors";
+			this.filtererrors.Size = new System.Drawing.Size(124, 22);
+			this.filtererrors.Tag = 8;
+			this.filtererrors.Text = "Errors";
+			this.filtererrors.Click += new System.EventHandler(this.filters_Click);
+			// 
+			// filterspecial
+			// 
+			this.filterspecial.Checked = true;
+			this.filterspecial.CheckOnClick = true;
+			this.filterspecial.CheckState = System.Windows.Forms.CheckState.Checked;
+			this.filterspecial.Name = "filterspecial";
+			this.filterspecial.Size = new System.Drawing.Size(124, 22);
+			this.filterspecial.Tag = 16;
+			this.filterspecial.Text = "Special";
+			this.filterspecial.Click += new System.EventHandler(this.filters_Click);
+			// 
+			// searchclear
+			// 
+			this.searchclear.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.searchclear.Image = global::CodeImp.DoomBuilder.Properties.Resources.SearchClear;
+			this.searchclear.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.searchclear.Name = "searchclear";
+			this.searchclear.Size = new System.Drawing.Size(23, 22);
+			this.searchclear.Text = "Clear Filter";
+			this.searchclear.Click += new System.EventHandler(this.searchclear_Click);
+			// 
+			// alwaysontop
+			// 
+			this.alwaysontop.CheckOnClick = true;
+			this.alwaysontop.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.alwaysontop.Image = global::CodeImp.DoomBuilder.Properties.Resources.Pin;
+			this.alwaysontop.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.alwaysontop.Name = "alwaysontop";
+			this.alwaysontop.Size = new System.Drawing.Size(23, 22);
+			this.alwaysontop.Text = "Stay on Top";
+			// 
+			// DebugConsole
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.Controls.Add(this.console);
+			this.Controls.Add(this.toolStrip1);
+			this.Name = "DebugConsole";
+			this.Size = new System.Drawing.Size(800, 150);
+			this.toolStrip1.ResumeLayout(false);
+			this.toolStrip1.PerformLayout();
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.ToolStrip toolStrip1;
+		private System.Windows.Forms.ToolStripButton clearall;
+		private System.Windows.Forms.ToolStripDropDownButton filterselector;
+		private System.Windows.Forms.ToolStripMenuItem filterlog;
+		private System.Windows.Forms.ToolStripMenuItem filterwarning;
+		private System.Windows.Forms.ToolStripMenuItem filtererrors;
+		private System.Windows.Forms.ToolStripMenuItem filterspecial;
+		private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
+		private System.Windows.Forms.ToolStripLabel toolStripLabel1;
+		private System.Windows.Forms.ToolStripTextBox searchbox;
+		private System.Windows.Forms.ToolStripButton searchclear;
+		private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
+		private System.Windows.Forms.ToolStripMenuItem filterinfo;
+		private System.Windows.Forms.ToolStripButton wordwrap;
+		private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
+		private System.Windows.Forms.RichTextBox console;
+		private System.Windows.Forms.ToolStripButton alwaysontop;
+		private CodeImp.DoomBuilder.Controls.ToolStripCheckBox autoscroll;
+	}
+}
diff --git a/Source/Core/Controls/DebugConsole.resx b/Source/Core/Controls/DebugConsole.resx
new file mode 100644
index 0000000..673dcfd
--- /dev/null
+++ b/Source/Core/Controls/DebugConsole.resx
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Controls/Docker.cs b/Source/Core/Controls/Docker.cs
new file mode 100644
index 0000000..7145d1a
--- /dev/null
+++ b/Source/Core/Controls/Docker.cs
@@ -0,0 +1,67 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Windows.Forms;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Controls
+{
+	public class Docker
+	{
+		#region ================== Variables
+		
+		private string shortname;
+		private string fullname;
+		private string title;
+		private Control control;
+		
+		#endregion
+		
+		#region ================== Variables
+		
+		public string Name { get { return shortname; } }
+		internal string FullName { get { return fullname; } }
+		public string Title { get { return title; } }
+		public Control Control { get { return control; } }
+		
+		#endregion
+		
+		#region ================== Constructor
+		
+		// Constructor
+		public Docker(string name, string title, Control control)
+		{
+			this.shortname = name;
+			this.title = title;
+			this.control = control;
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+		
+		// This makes the full name
+		internal void MakeFullName(string prefix)
+		{
+			fullname = prefix + "_" + shortname;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Controls/DockersControl.Designer.cs b/Source/Core/Controls/DockersControl.Designer.cs
new file mode 100644
index 0000000..83192f3
--- /dev/null
+++ b/Source/Core/Controls/DockersControl.Designer.cs
@@ -0,0 +1,108 @@
+namespace CodeImp.DoomBuilder.Controls
+{
+	partial class DockersControl
+	{
+		/// <summary> 
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Component Designer generated code
+
+		/// <summary> 
+		/// Required method for Designer support - do not modify 
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.pinbutton = new System.Windows.Forms.Button();
+			this.splitter = new CodeImp.DoomBuilder.Controls.TransparentPanel();
+			this.tabs = new CodeImp.DoomBuilder.Controls.DockersTabsControl();
+			this.SuspendLayout();
+			// 
+			// pinbutton
+			// 
+			this.pinbutton.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+			this.pinbutton.Image = global::CodeImp.DoomBuilder.Properties.Resources.DockerCollapse;
+			this.pinbutton.Location = new System.Drawing.Point(3, 1);
+			this.pinbutton.Name = "pinbutton";
+			this.pinbutton.Size = new System.Drawing.Size(305, 14);
+			this.pinbutton.TabIndex = 0;
+			this.pinbutton.TabStop = false;
+			this.pinbutton.UseVisualStyleBackColor = true;
+			this.pinbutton.Click += new System.EventHandler(this.pinbutton_Click);
+			// 
+			// splitter
+			// 
+			this.splitter.BackColor = System.Drawing.SystemColors.Control;
+			this.splitter.Cursor = System.Windows.Forms.Cursors.SizeWE;
+			this.splitter.Dock = System.Windows.Forms.DockStyle.Left;
+			this.splitter.Location = new System.Drawing.Point(0, 0);
+			this.splitter.Name = "splitter";
+			this.splitter.Size = new System.Drawing.Size(4, 541);
+			this.splitter.TabIndex = 1;
+			this.splitter.MouseLeave += new System.EventHandler(this.RaiseMouseContainerLeave);
+			this.splitter.MouseMove += new System.Windows.Forms.MouseEventHandler(this.splitter_MouseMove);
+			this.splitter.MouseDown += new System.Windows.Forms.MouseEventHandler(this.splitter_MouseDown);
+			this.splitter.MouseUp += new System.Windows.Forms.MouseEventHandler(this.splitter_MouseUp);
+			this.splitter.MouseEnter += new System.EventHandler(this.RaiseMouseContainerEnter);
+			// 
+			// tabs
+			// 
+			this.tabs.Alignment = System.Windows.Forms.TabAlignment.Left;
+			this.tabs.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.tabs.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.tabs.Location = new System.Drawing.Point(0, 18);
+			this.tabs.Margin = new System.Windows.Forms.Padding(0);
+			this.tabs.Multiline = true;
+			this.tabs.Name = "tabs";
+			this.tabs.Padding = new System.Drawing.Point(10, 5);
+			this.tabs.SelectedIndex = 0;
+			this.tabs.Size = new System.Drawing.Size(308, 523);
+			this.tabs.TabIndex = 0;
+			this.tabs.TabStop = false;
+			this.tabs.MouseLeave += new System.EventHandler(this.RaiseMouseContainerLeave);
+			this.tabs.Selected += new System.Windows.Forms.TabControlEventHandler(this.tabs_Selected);
+			this.tabs.Enter += new System.EventHandler(this.tabs_Enter);
+			this.tabs.MouseUp += new System.Windows.Forms.MouseEventHandler(this.tabs_MouseUp);
+			this.tabs.SelectedIndexChanged += new System.EventHandler(this.tabs_SelectedIndexChanged);
+			this.tabs.MouseEnter += new System.EventHandler(this.RaiseMouseContainerEnter);
+			// 
+			// DockersControl
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.Controls.Add(this.pinbutton);
+			this.Controls.Add(this.splitter);
+			this.Controls.Add(this.tabs);
+			this.Name = "DockersControl";
+			this.Size = new System.Drawing.Size(308, 541);
+			this.MouseLeave += new System.EventHandler(this.RaiseMouseContainerLeave);
+			this.Resize += new System.EventHandler(this.DockersControl_Resize);
+			this.MouseEnter += new System.EventHandler(this.RaiseMouseContainerEnter);
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private DockersTabsControl tabs;
+		private TransparentPanel splitter;
+		private System.Windows.Forms.Button pinbutton;
+	}
+}
diff --git a/Source/Core/Controls/DockersControl.cs b/Source/Core/Controls/DockersControl.cs
new file mode 100644
index 0000000..9eb4892
--- /dev/null
+++ b/Source/Core/Controls/DockersControl.cs
@@ -0,0 +1,471 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Windows.Forms;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Controls
+{
+	internal partial class DockersControl : UserControl
+	{
+		#region ================== Constants
+		
+		#endregion
+
+		#region ================== Delegates
+		
+		public event EventHandler MouseContainerEnter;
+		public event EventHandler MouseContainerLeave;
+		public event EventHandler Collapsed;
+		public event EventHandler Expanded;
+		public event EventHandler UserResize;
+		
+		#endregion
+		
+		#region ================== Variables
+		
+		// Behaviour
+		private bool rightalign;
+		private bool iscollapsed;
+		
+		// Collapsing
+		private int expandedwidth;		// width when expanded
+		private int expandedtab;		// selected tab index when expanded
+		
+		// Splitting
+		private int splitstartoffset;
+		
+		// Selection
+		private string currentselected;
+		private string previousselected;
+		private bool controlledselection;
+		
+		#endregion
+
+		#region ================== Properties
+		
+		public bool IsCollpased { get { return iscollapsed; } }
+		public string SelectedTabName { get { return (tabs.SelectedTab == null ? "None" : tabs.SelectedTab.Text); } } //mxd
+
+		// This returns true when the focus is here, but not in some special cases
+		public bool IsFocused
+		{
+			get
+			{
+				Control ac = FindActiveControl();
+				
+				// We have focus when we need the keyboard for input
+				// Otherwise we don't want the focus and the docker may collapse
+				return (ac is TextBox) || (ac is RichTextBox) || (ac is NumericUpDown) || (ac is ComboBox);
+			}
+		}
+		
+		#endregion
+		
+		#region ================== Constructor
+
+		// Constructor
+		public DockersControl()
+		{
+			InitializeComponent();
+			expandedwidth = (int)(this.Width * (this.CurrentAutoScaleDimensions.Width / this.AutoScaleDimensions.Width));
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+		
+		// This returns the active child control
+		private Control FindActiveControl()
+		{
+			Control c = this.ActiveControl;
+			
+			while(c is IContainerControl)
+			{
+				IContainerControl cc = (c as IContainerControl);
+				if(cc.ActiveControl != null) c = cc.ActiveControl;
+				else break;
+			}
+			
+			return c;
+		}
+		
+		// This sets up the controls for left or right alignment
+		public void Setup(bool right)
+		{
+			int voffset = pinbutton.Bottom + pinbutton.Margin.Bottom; //mxd
+			rightalign = right;
+			if(rightalign)
+			{
+				splitter.Dock = DockStyle.Left;
+				tabs.Alignment = TabAlignment.Right;
+				tabs.Location = new Point(0, voffset);
+			}
+			else
+			{
+				splitter.Dock = DockStyle.Right;
+				tabs.Alignment = TabAlignment.Left;
+				tabs.Location = new Point(-2, voffset);
+			}
+
+			tabs.Size = new Size(this.ClientRectangle.Width + 2, this.ClientRectangle.Height - voffset);
+			tabs.SendToBack();
+			UpdatePinIcon(); //mxd
+		}
+		
+		// This collapses the docker
+		public void Collapse()
+		{
+			if(iscollapsed) return;
+
+			controlledselection = true;
+			splitter.Enabled = false;
+			splitter.BackColor = SystemColors.Control;
+			splitter.Width = (int)(2.0f * (this.CurrentAutoScaleDimensions.Width / this.AutoScaleDimensions.Width));
+			expandedtab = tabs.SelectedIndex;
+			expandedwidth = this.Width;
+			tabs.SelectedIndex = -1;
+			General.MainWindow.LockUpdate();
+			if(rightalign) this.Left = this.Right - GetCollapsedWidth();
+			this.Width = GetCollapsedWidth();
+			General.MainWindow.UnlockUpdate();
+			this.Invalidate(true);
+			controlledselection = false;
+			
+			iscollapsed = true;
+			
+			if(Collapsed != null) Collapsed(this, EventArgs.Empty);
+		}
+		
+		// This expands the docker
+		public void Expand()
+		{
+			if(!iscollapsed) return;
+
+			controlledselection = true;
+			splitter.Enabled = true;
+			splitter.BackColor = Color.Transparent;
+			splitter.Width = (int)(4.0f * (this.CurrentAutoScaleDimensions.Width / this.AutoScaleDimensions.Width));
+			General.MainWindow.LockUpdate();
+			if(rightalign) this.Left = this.Right - expandedwidth;
+			this.Width = expandedwidth;
+			General.MainWindow.UnlockUpdate();
+			tabs.SelectedIndex = expandedtab;
+			tabs.Invalidate(true);
+			controlledselection = false;
+			
+			iscollapsed = false;
+			
+			if(Expanded != null) Expanded(this, EventArgs.Empty);
+		}
+		
+		// This calculates the collapsed width
+		public int GetCollapsedWidth()
+		{
+			Rectangle r;
+			if(tabs.TabPages.Count > 0)
+				r = tabs.GetTabRect(0);
+			else
+				r = new Rectangle(0, 0, 26, 26);
+			return r.Width + (int)(1.0f * (this.CurrentAutoScaleDimensions.Width / this.AutoScaleDimensions.Width));
+		}
+		
+		// This adds a docker
+		public void Add(Docker d)
+		{
+			// Set up page
+			TabPage page = new TabPage(d.Title);
+			page.SuspendLayout();
+			page.Font = this.Font;
+			page.Tag = d;
+			page.UseVisualStyleBackColor = false;
+			page.Controls.Add(d.Control);
+			d.Control.Dock = DockStyle.Fill;
+			tabs.TabPages.Add(page);
+			page.ResumeLayout(true);
+			if(iscollapsed) tabs.SelectedIndex = -1;
+			
+			// Go for all controls to add events
+			Queue<Control> todo = new Queue<Control>();
+			todo.Enqueue(d.Control);
+			while(todo.Count > 0)
+			{
+				Control c = todo.Dequeue();
+				c.MouseEnter += RaiseMouseContainerEnter;
+				c.MouseLeave += RaiseMouseContainerLeave;
+				foreach(Control cc in c.Controls)
+					todo.Enqueue(cc);
+			}
+		}
+		
+		// This removes a docker
+		public bool Remove(Docker d)
+		{
+			foreach(TabPage page in tabs.TabPages)
+			{
+				if((page.Tag as Docker) == d)
+				{
+					// Go for all controls to remove events
+					Queue<Control> todo = new Queue<Control>();
+					todo.Enqueue(d.Control);
+					while(todo.Count > 0)
+					{
+						Control c = todo.Dequeue();
+						c.MouseEnter -= RaiseMouseContainerEnter;
+						c.MouseLeave -= RaiseMouseContainerLeave;
+						foreach(Control cc in c.Controls)
+							todo.Enqueue(cc);
+					}
+					
+					// Take down that page
+					if(page == tabs.SelectedTab || tabs.SelectedTab == null) SelectPrevious();
+					page.Controls.Clear();
+					tabs.TabPages.Remove(page);
+					return true;
+				}
+			}
+			
+			return false;
+		}
+
+		//mxd. This checks if given docker exists in this control
+		public bool Contains(Docker d) 
+		{
+			foreach(TabPage page in tabs.TabPages) 
+				if((page.Tag as Docker) == d) return true;
+			return false;
+		}
+		
+		// This selects a docker
+		public bool SelectDocker(Docker d)
+		{
+			int index = 0;
+			foreach(TabPage page in tabs.TabPages)
+			{
+				if((page.Tag as Docker) == d)
+				{
+					if(iscollapsed)
+					{
+						if(!string.IsNullOrEmpty(currentselected)) previousselected = currentselected; //mxd
+						currentselected = d.FullName; //mxd
+						expandedtab = index;
+					}
+					else
+						tabs.SelectedTab = page;
+					
+					return true;
+				}
+				
+				index++;
+			}
+			
+			return false;
+		}
+		
+		// This selectes the previous docker
+		public void SelectPrevious()
+		{
+			//mxd. First one is better than nothing
+			if(string.IsNullOrEmpty(previousselected) && tabs.TabPages.Count > 0)
+			{
+				previousselected = (tabs.TabPages[0].Tag as Docker).FullName;
+			}
+			
+			if(!string.IsNullOrEmpty(previousselected))
+			{
+				int index = 0;
+				foreach(TabPage page in tabs.TabPages)
+				{
+					if((page.Tag as Docker).FullName == previousselected)
+					{
+						if(iscollapsed)
+						{
+							currentselected = previousselected;
+							expandedtab = index;
+						}
+						else
+							tabs.SelectedTab = page;
+						
+						break;
+					}
+					
+					index++;
+				}
+			}
+		}
+		
+		// This sorts tabs by their full name
+		public void SortTabs(IEnumerable<string> fullnames)
+		{
+			Dictionary<string, TabPage> pages = new Dictionary<string, TabPage>(tabs.TabPages.Count, StringComparer.Ordinal);
+			foreach(TabPage p in tabs.TabPages) pages.Add((p.Tag as Docker).FullName, p);
+			tabs.TabPages.Clear();
+			
+			// Add tabs in order as in fullnames
+			foreach(string name in fullnames)
+			{
+				if(pages.ContainsKey(name))
+				{
+					tabs.TabPages.Add(pages[name]);
+					pages.Remove(name);
+				}
+			}
+			
+			// Add remaining tabs
+			foreach(KeyValuePair<string, TabPage> p in pages)
+				tabs.TabPages.Add(p.Value);
+		}
+
+		//mxd
+		private void UpdatePinIcon() 
+		{
+			if(tabs.Alignment == TabAlignment.Left)
+				pinbutton.Image = (General.Settings.CollapseDockers ? Properties.Resources.DockerCollapse : Properties.Resources.DockerExpand);
+			else
+				pinbutton.Image = (General.Settings.CollapseDockers ? Properties.Resources.DockerExpand : Properties.Resources.DockerCollapse);
+		}
+		
+		#endregion
+		
+		#region ================== Events
+		
+		// This raises the MouseContainerEnter event
+		private void RaiseMouseContainerEnter(object sender, EventArgs e)
+		{
+			if(MouseContainerEnter != null)
+				MouseContainerEnter(sender, e);
+		}
+
+		// This raises the MouseContainerLeave event
+		private void RaiseMouseContainerLeave(object sender, EventArgs e)
+		{
+			if(MouseContainerLeave != null)
+				MouseContainerLeave(sender, e);
+		}
+		
+		// We don't want the focus
+		private void tabs_Enter(object sender, EventArgs e) { General.MainWindow.FocusDisplay(); }
+		private void tabs_MouseUp(object sender, MouseEventArgs e) { General.MainWindow.FocusDisplay(); }
+		private void tabs_Selected(object sender, TabControlEventArgs e) { General.MainWindow.FocusDisplay(); }
+		
+		// Tab selected
+		private void tabs_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if(!controlledselection)
+			{
+				// Keep track of previous selected tab
+				if(!string.IsNullOrEmpty(currentselected)) previousselected = currentselected;
+
+				if(tabs.SelectedTab != null)
+				{
+					Docker d = (tabs.SelectedTab.Tag as Docker);
+					currentselected = d.FullName;
+				}
+				else
+				{
+					currentselected = null;
+				}
+			}
+			
+			General.MainWindow.FocusDisplay();
+		}
+		
+		// Splitting begins
+		private void splitter_MouseDown(object sender, MouseEventArgs e)
+		{
+			if(e.Button == MouseButtons.Left)
+			{
+				splitstartoffset = e.X;
+				splitter.BackColor = SystemColors.Highlight;
+			}
+		}
+		
+		// Splitting ends
+		private void splitter_MouseUp(object sender, MouseEventArgs e)
+		{
+			splitter.BackColor = Color.Transparent;
+			tabs.Invalidate(true);
+			this.Update();
+			General.MainWindow.RedrawDisplay();
+			General.MainWindow.Update();
+		}
+		
+		// Splitting dragged
+		private void splitter_MouseMove(object sender, MouseEventArgs e)
+		{
+			if(e.Button == MouseButtons.Left)
+			{
+				General.MainWindow.LockUpdate();
+				
+				// Resize the control
+				int delta = e.X - splitstartoffset;
+				int collapsedwidth = GetCollapsedWidth();
+				if(rightalign)
+				{
+					if((this.Width > collapsedwidth) || (delta < 0))
+					{
+						this.Left += delta;
+						this.Width -= delta;
+						if(this.Width < collapsedwidth)
+						{
+							this.Left -= collapsedwidth - this.Width;
+							this.Width = collapsedwidth;
+						}
+					}
+				}
+				else
+				{
+					if((this.Width > collapsedwidth) || (delta > 0))
+					{
+						this.Width += delta;
+						if(this.Width < collapsedwidth)
+							this.Width = collapsedwidth;
+					}
+				}
+
+				General.MainWindow.UnlockUpdate();
+				this.Update();
+				General.MainWindow.RedrawDisplay();
+				General.MainWindow.Update();
+				
+				// Raise event
+				if(UserResize != null) UserResize(this, EventArgs.Empty);
+			}
+		}
+
+		//mxd
+		private void pinbutton_Click(object sender, EventArgs e)
+		{
+			General.Settings.CollapseDockers = !General.Settings.CollapseDockers;
+			General.MainWindow.SetupInterface();
+			UpdatePinIcon();
+		}
+
+		//mxd
+		private void DockersControl_Resize(object sender, EventArgs e)
+		{
+			pinbutton.Width = this.Width - pinbutton.Margin.Left - pinbutton.Margin.Right;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Controls/DockersControl.resx b/Source/Core/Controls/DockersControl.resx
new file mode 100644
index 0000000..00e842c
--- /dev/null
+++ b/Source/Core/Controls/DockersControl.resx
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="splitter.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="tabs.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Controls/DockersTabsControl.cs b/Source/Core/Controls/DockersTabsControl.cs
new file mode 100644
index 0000000..608b155
--- /dev/null
+++ b/Source/Core/Controls/DockersTabsControl.cs
@@ -0,0 +1,220 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.Drawing.Text;
+using System.Windows.Forms;
+using System.Windows.Forms.VisualStyles;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Controls
+{
+	internal class DockersTabsControl : TabControl
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+		
+		private int highlighttab;
+		private readonly StringFormat stringformat;
+		
+		#endregion
+
+		#region ================== Constructor
+
+		// Constructor
+		public DockersTabsControl()
+		{
+			if(VisualStyleInformation.IsSupportedByOS && VisualStyleInformation.IsEnabledByUser)
+			{
+				// Style settings
+				this.SetStyle(ControlStyles.UserPaint | ControlStyles.AllPaintingInWmPaint | ControlStyles.DoubleBuffer, true);
+				this.DrawMode = TabDrawMode.OwnerDrawFixed;
+			}
+			
+			stringformat = new StringFormat {Alignment = StringAlignment.Center, HotkeyPrefix = HotkeyPrefix.None, LineAlignment = StringAlignment.Center};
+			highlighttab = -1;
+		}
+		
+		#endregion
+
+		#region ================== Methods
+
+		//mxd
+		private void DrawTab(Graphics graphics, int index)
+		{
+			Rectangle bounds = this.GetTabRect(index);
+			VisualStyleRenderer renderer;
+			bool selected = (index == this.SelectedIndex);
+
+			// Transform bounds?
+			switch(this.Alignment)
+			{
+				case TabAlignment.Right:
+					bounds = new Rectangle((selected ? bounds.X - 1 : bounds.X + 1), bounds.Y, bounds.Height, bounds.Width);
+					break;
+
+				case TabAlignment.Left:
+					bounds = new Rectangle(bounds.X, bounds.Y, bounds.Height, bounds.Width);
+					break;
+
+				default:
+					if(selected) bounds.Y -= 2;
+					break;
+			}
+
+			if(selected)
+			{
+				bounds.Height += 2;
+				renderer = new VisualStyleRenderer(VisualStyleElement.Tab.TabItem.Pressed);
+			}
+			else
+			{
+				renderer = new VisualStyleRenderer(index == highlighttab ? VisualStyleElement.Tab.TabItem.Hot : VisualStyleElement.Tab.TabItem.Normal);
+			}
+
+			Bitmap drawimage = new Bitmap(bounds.Width, bounds.Height, PixelFormat.Format32bppArgb);
+
+			// Draw tab
+			using(Graphics g = Graphics.FromImage(drawimage))
+			{
+				Rectangle bgbounds = new Rectangle(0, 0, bounds.Width, bounds.Height + 1);
+				bgbounds.Inflate(-1, 0);
+				renderer.DrawBackground(g, bgbounds);
+				g.DrawString(this.TabPages[index].Text, this.Font, SystemBrushes.ControlText, new RectangleF(bgbounds.Location, bounds.Size), stringformat);
+			}
+
+			// Rotate image?
+			switch(this.Alignment)
+			{
+				case TabAlignment.Right:
+					drawimage.RotateFlip(RotateFlipType.Rotate270FlipNone);
+					break;
+
+				case TabAlignment.Left:
+					drawimage.RotateFlip(RotateFlipType.Rotate90FlipNone);
+					break;
+			}
+
+			graphics.DrawImage(drawimage, bounds.X, bounds.Y);
+		}
+		
+		#endregion
+		
+		#region ================== Events
+		
+		//mxd. Redrawing needed
+		protected override void OnPaint(PaintEventArgs e)
+		{
+			if(VisualStyleInformation.IsSupportedByOS && VisualStyleInformation.IsEnabledByUser)
+			{
+				// Draw tabs
+				for(int i = 0; i < this.TabPages.Count; i++)
+				{
+					if(i == this.SelectedIndex) continue;
+					DrawTab(e.Graphics, i);
+				}
+
+				// Draw selected tab
+				if(this.SelectedIndex != -1) DrawTab(e.Graphics, this.SelectedIndex);
+			}
+			else
+			{
+				base.OnPaint(e);
+			}
+		}
+		
+		// Mouse moves
+		protected override void OnMouseMove(MouseEventArgs e)
+		{
+			if(VisualStyleInformation.IsSupportedByOS && VisualStyleInformation.IsEnabledByUser)
+			{
+				int foundindex = -1;
+				Rectangle prect = new Rectangle(e.Location, Size.Empty);
+				
+				// Check in which tab the mouse is
+				for(int i = this.TabPages.Count - 1; i >= 0; i--)
+				{
+					Rectangle tabrect = this.GetTabRect(i);
+					tabrect.Inflate(1, 1);
+					if(tabrect.IntersectsWith(prect))
+					{
+						foundindex = i;
+						break;
+					}
+				}
+				
+				// Redraw?
+				if(foundindex != highlighttab)
+				{
+					highlighttab = foundindex;
+					this.Invalidate();
+				}
+			}
+			
+			base.OnMouseMove(e);
+		}
+		
+		// Mouse leaves
+		protected override void OnMouseLeave(EventArgs e)
+		{
+			if(VisualStyleInformation.IsSupportedByOS && VisualStyleInformation.IsEnabledByUser)
+			{
+				// Redraw?
+				if(highlighttab != -1)
+				{
+					highlighttab = -1;
+					this.Invalidate();
+				}
+			}
+			
+			base.OnMouseLeave(e);
+		}
+		
+		// Tabs don't process keys
+		protected override void OnKeyDown(KeyEventArgs ke)
+		{
+			if(this.Parent is DockersControl)
+			{
+				// Only absorb the key press when no focused on an input control, otherwise
+				// the input controls may not receive certain keys such as delete and arrow keys
+				DockersControl docker = (this.Parent as DockersControl);
+				if(!docker.IsFocused) ke.Handled = true;
+			}
+		}
+		
+		// Tabs don't process keys
+		protected override void OnKeyUp(KeyEventArgs e)
+		{
+			if(this.Parent is DockersControl)
+			{
+				// Only absorb the key press when no focused on an input control, otherwise
+				// the input controls may not receive certain keys such as delete and arrow keys
+				DockersControl docker = (this.Parent as DockersControl);
+				if(!docker.IsFocused) e.Handled = true;
+			}
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Controls/FieldsEditorControl.Designer.cs b/Source/Core/Controls/FieldsEditorControl.Designer.cs
new file mode 100644
index 0000000..3866fa8
--- /dev/null
+++ b/Source/Core/Controls/FieldsEditorControl.Designer.cs
@@ -0,0 +1,185 @@
+namespace CodeImp.DoomBuilder.Controls
+{
+	partial class FieldsEditorControl
+	{
+		/// <summary> 
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Component Designer generated code
+
+		/// <summary> 
+		/// Required method for Designer support - do not modify 
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.components = new System.ComponentModel.Container();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+			this.fieldslist = new System.Windows.Forms.DataGridView();
+			this.fieldname = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.fieldtype = new System.Windows.Forms.DataGridViewComboBoxColumn();
+			this.fieldvalue = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.deleterowstimer = new System.Windows.Forms.Timer(this.components);
+			this.browsebutton = new System.Windows.Forms.Button();
+			this.enumscombo = new System.Windows.Forms.ComboBox();
+			((System.ComponentModel.ISupportInitialize)(this.fieldslist)).BeginInit();
+			this.SuspendLayout();
+			// 
+			// fieldslist
+			// 
+			this.fieldslist.AllowUserToResizeColumns = false;
+			this.fieldslist.AllowUserToResizeRows = false;
+			this.fieldslist.BackgroundColor = System.Drawing.SystemColors.Window;
+			this.fieldslist.BorderStyle = System.Windows.Forms.BorderStyle.None;
+			this.fieldslist.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None;
+			this.fieldslist.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable;
+			this.fieldslist.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
+			this.fieldslist.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+			this.fieldslist.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.fieldname,
+            this.fieldtype,
+            this.fieldvalue});
+			dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+			dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window;
+			dataGridViewCellStyle4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText;
+			dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+			dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+			dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+			this.fieldslist.DefaultCellStyle = dataGridViewCellStyle4;
+			this.fieldslist.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;
+			this.fieldslist.Location = new System.Drawing.Point(0, 0);
+			this.fieldslist.MultiSelect = false;
+			this.fieldslist.Name = "fieldslist";
+			this.fieldslist.RowHeadersVisible = false;
+			this.fieldslist.RowTemplate.DefaultCellStyle.BackColor = System.Drawing.SystemColors.Window;
+			this.fieldslist.RowTemplate.DefaultCellStyle.ForeColor = System.Drawing.SystemColors.WindowText;
+			this.fieldslist.RowTemplate.DefaultCellStyle.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+			this.fieldslist.RowTemplate.DefaultCellStyle.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+			this.fieldslist.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
+			this.fieldslist.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+			this.fieldslist.Size = new System.Drawing.Size(444, 263);
+			this.fieldslist.TabIndex = 1;
+			this.fieldslist.Scroll += new System.Windows.Forms.ScrollEventHandler(this.fieldslist_Scroll);
+			this.fieldslist.UserDeletingRow += new System.Windows.Forms.DataGridViewRowCancelEventHandler(this.fieldslist_UserDeletingRow);
+			this.fieldslist.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.fieldslist_CellBeginEdit);
+			this.fieldslist.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.fieldslist_CellDoubleClick);
+			this.fieldslist.ColumnHeaderMouseClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.fieldslist_ColumnHeaderMouseClick);
+			this.fieldslist.MouseUp += new System.Windows.Forms.MouseEventHandler(this.fieldslist_MouseUp);
+			this.fieldslist.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.fieldslist_CellEndEdit);
+			this.fieldslist.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.fieldslist_CellClick);
+			this.fieldslist.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.fieldslist_DataError);
+			this.fieldslist.SelectionChanged += new System.EventHandler(this.fieldslist_SelectionChanged);
+			// 
+			// fieldname
+			// 
+			dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window;
+			dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
+			dataGridViewCellStyle1.NullValue = null;
+			dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+			dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+			this.fieldname.DefaultCellStyle = dataGridViewCellStyle1;
+			this.fieldname.Frozen = true;
+			this.fieldname.HeaderText = "Property";
+			this.fieldname.Name = "fieldname";
+			this.fieldname.Width = 150;
+			// 
+			// fieldtype
+			// 
+			this.fieldtype.AutoComplete = false;
+			dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;
+			dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
+			dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+			dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+			this.fieldtype.DefaultCellStyle = dataGridViewCellStyle2;
+			this.fieldtype.DisplayStyle = System.Windows.Forms.DataGridViewComboBoxDisplayStyle.Nothing;
+			this.fieldtype.HeaderText = "Type";
+			this.fieldtype.Name = "fieldtype";
+			this.fieldtype.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+			this.fieldtype.Sorted = true;
+			this.fieldtype.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+			// 
+			// fieldvalue
+			// 
+			dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window;
+			dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText;
+			dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+			dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+			this.fieldvalue.DefaultCellStyle = dataGridViewCellStyle3;
+			this.fieldvalue.HeaderText = "Value";
+			this.fieldvalue.Name = "fieldvalue";
+			this.fieldvalue.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+			this.fieldvalue.Width = 120;
+			// 
+			// deleterowstimer
+			// 
+			this.deleterowstimer.Interval = 1;
+			this.deleterowstimer.Tick += new System.EventHandler(this.deleterowstimer_Tick);
+			// 
+			// browsebutton
+			// 
+			this.browsebutton.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+			this.browsebutton.Image = global::CodeImp.DoomBuilder.Properties.Resources.List;
+			this.browsebutton.Location = new System.Drawing.Point(343, 75);
+			this.browsebutton.Name = "browsebutton";
+			this.browsebutton.Size = new System.Drawing.Size(28, 22);
+			this.browsebutton.TabIndex = 2;
+			this.browsebutton.TabStop = false;
+			this.browsebutton.UseVisualStyleBackColor = true;
+			this.browsebutton.Click += new System.EventHandler(this.browsebutton_Click);
+			// 
+			// enumscombo
+			// 
+			this.enumscombo.FormattingEnabled = true;
+			this.enumscombo.ItemHeight = 13;
+			this.enumscombo.Location = new System.Drawing.Point(295, 121);
+			this.enumscombo.Name = "enumscombo";
+			this.enumscombo.Size = new System.Drawing.Size(128, 21);
+			this.enumscombo.TabIndex = 3;
+			this.enumscombo.Validating += new System.ComponentModel.CancelEventHandler(this.enumscombo_Validating);
+			// 
+			// FieldsEditorControl
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.Controls.Add(this.enumscombo);
+			this.Controls.Add(this.browsebutton);
+			this.Controls.Add(this.fieldslist);
+			this.Name = "FieldsEditorControl";
+			this.Size = new System.Drawing.Size(474, 286);
+			this.Layout += new System.Windows.Forms.LayoutEventHandler(this.FieldsEditorControl_Layout);
+			this.Resize += new System.EventHandler(this.FieldsEditorControl_Resize);
+			((System.ComponentModel.ISupportInitialize)(this.fieldslist)).EndInit();
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.DataGridView fieldslist;
+		private System.Windows.Forms.Timer deleterowstimer;
+		private System.Windows.Forms.Button browsebutton;
+		private System.Windows.Forms.ComboBox enumscombo;
+		private System.Windows.Forms.DataGridViewTextBoxColumn fieldname;
+		private System.Windows.Forms.DataGridViewComboBoxColumn fieldtype;
+		private System.Windows.Forms.DataGridViewTextBoxColumn fieldvalue;
+	}
+}
diff --git a/Source/Core/Controls/FieldsEditorControl.cs b/Source/Core/Controls/FieldsEditorControl.cs
new file mode 100644
index 0000000..a980da0
--- /dev/null
+++ b/Source/Core/Controls/FieldsEditorControl.cs
@@ -0,0 +1,836 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Map;
+using System.Globalization;
+using CodeImp.DoomBuilder.Types;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Controls
+{
+	/// <summary>
+	/// Control to view and/or change custom UDMF fields.
+	/// </summary>
+	public partial class FieldsEditorControl : UserControl
+	{
+		#region ================== Constants
+
+		// Constants
+		private const string ADD_FIELD_TEXT = "   (click to add custom field)";
+		private const string FIELD_PREFIX_SUGGESTION = "user_";
+
+		#endregion
+		
+		#region ================== Variables
+
+		public delegate void SingleFieldNameEvent(string fieldname);
+		public delegate void DualFieldNameEvent(string oldname, string newname);
+
+		// Events
+		public event SingleFieldNameEvent OnFieldInserted;
+		public event DualFieldNameEvent OnFieldNameChanged;
+		public event SingleFieldNameEvent OnFieldValueChanged;
+		public event SingleFieldNameEvent OnFieldTypeChanged;
+		public event SingleFieldNameEvent OnFieldDeleted;
+		public event SingleFieldNameEvent OnFieldUndefined;
+
+		// Variables
+		private string elementname;
+		private string lasteditfieldname;
+		private bool autoinsertuserprefix;
+		private Dictionary<string, UniversalType> uifields;//mxd
+		
+		#endregion
+
+		#region ================== Properties
+
+		public bool AllowInsert { get { return fieldslist.AllowUserToAddRows; } set { fieldslist.AllowUserToAddRows = value; SetupNewRowStyle(); } }
+		public bool AutoInsertUserPrefix { get { return autoinsertuserprefix; } set { autoinsertuserprefix = value; } }
+		public int PropertyColumnWidth { get { return fieldname.Width; } set { fieldname.Width = value; UpdateValueColumn(); UpdateBrowseButton(); } }
+		public int TypeColumnWidth { get { return fieldtype.Width; } set { fieldtype.Width = value; UpdateValueColumn(); UpdateBrowseButton(); } }
+		public bool PropertyColumnVisible { get { return fieldname.Visible; } set { fieldname.Visible = value; UpdateValueColumn(); UpdateBrowseButton(); } }
+		public bool TypeColumnVisible { get { return fieldtype.Visible; } set { fieldtype.Visible = value; UpdateValueColumn(); UpdateBrowseButton(); } }
+		public bool ValueColumnVisible { get { return fieldvalue.Visible; } set { fieldvalue.Visible = value; UpdateValueColumn(); UpdateBrowseButton(); } }
+		
+		#endregion
+
+		#region ================== Constructor
+
+		// Constructor
+		public FieldsEditorControl()
+		{
+			InitializeComponent();
+			autoinsertuserprefix = true;
+			enumscombo.Location = new Point(-1000, 1);
+		}
+
+		#endregion
+
+		#region ================== Setup / Apply
+
+		// This sets up the control
+		public void Setup(string elementname)
+		{
+			// Keep element name
+			this.elementname = elementname;
+
+			//mxd. get proper UIFields
+			uifields = General.Map.FormatInterface.UIFields[General.Map.FormatInterface.GetElementType(elementname)];
+			
+			// Make types list
+			fieldtype.Items.Clear();
+			fieldtype.Items.AddRange(General.Types.GetCustomUseAttributes());
+		}
+		
+		// This applies last sort order
+		private void Sort()
+		{
+			// Sort
+			int sortcolumn = General.Settings.ReadSetting("customfieldssortcolumn", 0);
+			int sortorder = General.Settings.ReadSetting("customfieldssortorder", (int)ListSortDirection.Ascending);
+
+			switch(sortorder)
+			{
+				case (int)SortOrder.Ascending:
+					fieldslist.Sort(fieldslist.Columns[sortcolumn], ListSortDirection.Ascending);
+					break;
+				case (int)SortOrder.Descending:
+					fieldslist.Sort(fieldslist.Columns[sortcolumn], ListSortDirection.Descending);
+					break;
+			}
+		}
+		
+		// This adds a list of fixed fields (in undefined state)
+		public void ListFixedFields(List<UniversalFieldInfo> list)
+		{
+			// Add all fields
+			foreach(UniversalFieldInfo uf in list) 
+			{
+				if(uifields.ContainsKey(uf.Name)) continue; //mxd
+				fieldslist.Rows.Add(new FieldsEditorRow(fieldslist, uf));
+			}
+
+			// Sort fields
+			Sort();
+
+			// Update new row
+			SetupNewRowStyle();
+		}
+		
+		// Use this in case you don't want the fixed fields
+		public void ListNoFixedFields()
+		{
+			// Update new row
+			SetupNewRowStyle();
+		}
+		
+		// Clear all fields
+		public void ClearFields()
+		{
+			// Trash rows
+			fieldslist.Rows.Clear();
+			
+			// Update new row
+			SetupNewRowStyle();
+		}
+		
+		// This sets up the fields and values from a UniFields object
+		// When first is true, the values are applied unconditionally
+		// When first is false, the values in the grid are erased when
+		// they differ from the given values (for multiselection)
+		public void SetValues(UniFields fromfields, bool first)
+		{
+			// Go for all the fields
+			foreach(KeyValuePair<string, UniValue> f in fromfields)
+			{
+				if(uifields.ContainsKey(f.Key)) continue; //mxd
+				
+				// Go for all rows
+				bool foundrow = false;
+				foreach(DataGridViewRow row in fieldslist.Rows)
+				{
+					// Row is a field?
+					if(row is FieldsEditorRow)
+					{
+						FieldsEditorRow frow = row as FieldsEditorRow;
+						
+						// Row name matches with field
+						if(frow.Name == f.Key)
+						{
+							// First time?
+							if(first)
+							{
+								// Set type when row is not fixed
+								if(!frow.IsFixed) frow.ChangeType(f.Value.Type);
+
+								// Apply value of field to row
+								frow.Define(f.Value.Value);
+							}
+							else
+							{
+								// Check if the value is different
+								if(!frow.TypeHandler.GetValue().Equals(f.Value.Value))
+								{
+									// Clear the value in the row
+									frow.Define(f.Value.Value);
+									frow.Clear();
+								}
+							}
+							
+							// Done
+							foundrow = true;
+							break;
+						}
+					}
+				}
+				
+				// Row not found?
+				if(!foundrow)
+				{
+					// Make new row
+					FieldsEditorRow frow = new FieldsEditorRow(fieldslist, f.Key, f.Value.Type, f.Value.Value);
+					fieldslist.Rows.Insert(fieldslist.Rows.Count - 1, frow);
+					
+					// When not the first, clear the field
+					// because the others did not define this one
+					if(!first) frow.Clear();
+				}
+			}
+			
+			// Now check for rows that the givens fields do NOT have
+			foreach(DataGridViewRow row in fieldslist.Rows)
+			{
+				// Row is a field?
+				if(row is FieldsEditorRow)
+				{
+					FieldsEditorRow frow = row as FieldsEditorRow;
+
+					// Is this row defined previously?
+					if(frow.IsDefined)
+					{
+						// Check if this row can not be found in the fields at all
+						if(!fromfields.ContainsKey(frow.Name))
+						{
+							// It is not defined in these fields, clear the value
+							frow.Clear();
+						}
+					}
+				}
+			}
+			
+			// Sort fields
+			Sort();
+		}
+		
+		// This applies the current fields to a UniFields object
+		public void Apply(UniFields tofields)
+		{
+			tofields.BeforeFieldsChange();
+			
+			// Go for all the fields
+			UniFields tempfields = new UniFields(tofields);
+			foreach(KeyValuePair<string, UniValue> f in tempfields) 
+			{
+				if(uifields.ContainsKey(f.Key)) continue; //mxd
+				
+				// Go for all rows
+				bool foundrow = false;
+				foreach(DataGridViewRow row in fieldslist.Rows)
+				{
+					// Row is a field and matches field name?
+					if((row is FieldsEditorRow) && (row.Cells[0].Value.ToString() == f.Key))
+					{
+						FieldsEditorRow frow = row as FieldsEditorRow;
+
+						// Field is defined?
+						if(frow.IsDefined)
+						{
+							foundrow = true;
+							break;
+						}
+					}
+				}
+
+				// No such row?
+				if(!foundrow)
+				{
+					// Remove the definition from the fields
+					tofields.Remove(f.Key);
+				}
+			}
+			
+			// Go for all rows
+			foreach(DataGridViewRow row in fieldslist.Rows)
+			{
+				// Row is a field?
+				if(row is FieldsEditorRow)
+				{
+					FieldsEditorRow frow = row as FieldsEditorRow;
+					
+					// Field is defined and not empty?
+					if(frow.IsDefined && !frow.IsEmpty)
+					{
+						// Apply field
+						object oldvalue = null;
+						if(tofields.ContainsKey(frow.Name)) oldvalue = tofields[frow.Name].Value;
+						tofields[frow.Name] = new UniValue(frow.TypeHandler.Index, frow.GetResult(oldvalue));
+
+						// Custom row?
+						if(!frow.IsFixed)
+						{
+							// Write type to map configuration
+							General.Map.Options.SetUniversalFieldType(elementname, frow.Name, frow.TypeHandler.Index);
+						}
+					}
+				}
+			}
+		}
+
+		#endregion
+
+		#region ================== Events
+
+		// Column header clicked
+		private void fieldslist_ColumnHeaderMouseClick(object sender, DataGridViewCellMouseEventArgs e)
+		{
+			// Save sort order
+			if(fieldslist.SortedColumn != null)
+			{
+				int sortcolumn = fieldslist.SortedColumn.Index;
+				int sortorder = (int)fieldslist.SortOrder;
+				General.Settings.WriteSetting("customfieldssortcolumn", sortcolumn);
+				General.Settings.WriteSetting("customfieldssortorder", sortorder);
+			}
+			
+			// Stop any cell editing
+			ApplyEnums(true);
+			fieldslist.EndEdit();
+			HideBrowseButton();
+		}
+		
+		// Resized
+		private void FieldsEditorControl_Resize(object sender, EventArgs e)
+		{
+			// Rearrange controls
+			fieldslist.Size = this.ClientSize;
+			UpdateValueColumn();
+			UpdateBrowseButton();
+		}
+
+		// Layout change
+		private void FieldsEditorControl_Layout(object sender, LayoutEventArgs e)
+		{
+			FieldsEditorControl_Resize(sender, EventArgs.Empty);
+		}
+
+		// Cell clicked
+		private void fieldslist_CellClick(object sender, DataGridViewCellEventArgs e)
+		{
+			ApplyEnums(true);
+
+			// Anything selected
+			if(fieldslist.SelectedCells.Count > 0)
+			{
+				if(e.RowIndex == fieldslist.NewRowIndex)
+					fieldslist.BeginEdit(false);
+				else if(e.ColumnIndex > 0)
+					fieldslist.BeginEdit(true);
+			}
+		}
+
+		// Cell doubleclicked
+		private void fieldslist_CellDoubleClick(object sender, DataGridViewCellEventArgs e)
+		{
+			FieldsEditorRow frow = null;
+			
+			// Anything selected
+			if(fieldslist.SelectedRows.Count > 0 && e.RowIndex > -1)
+			{
+				// Get the row
+				DataGridViewRow row = fieldslist.Rows[e.RowIndex];
+				if(row is FieldsEditorRow) frow = row as FieldsEditorRow;
+				
+				// First column?
+				if(e.ColumnIndex == 0)
+				{
+					// Not a fixed field?
+					if((frow != null) && !frow.IsFixed)
+					{
+						lasteditfieldname = frow.Name;
+						fieldslist.CurrentCell = fieldslist.SelectedRows[0].Cells[0];
+						fieldslist.CurrentCell.ReadOnly = false;
+
+						if((e.RowIndex == fieldslist.NewRowIndex) ||
+						   frow.Name.StartsWith(FIELD_PREFIX_SUGGESTION, true, CultureInfo.InvariantCulture))
+							fieldslist.BeginEdit(false);
+						else
+							fieldslist.BeginEdit(true);
+					}
+				}
+			}
+		}
+		
+		// User deletes a row
+		private void fieldslist_UserDeletingRow(object sender, DataGridViewRowCancelEventArgs e)
+		{
+			// Get the row
+			FieldsEditorRow row = e.Row as FieldsEditorRow;
+			
+			// Fixed field?
+			if(row.IsFixed)
+			{
+				// Just undefine the field
+				row.Undefine();
+				e.Cancel = true;
+
+				if(OnFieldUndefined != null)
+					OnFieldUndefined(row.Name);
+			}
+			else
+			{
+				if(OnFieldDeleted != null)
+					OnFieldDeleted(row.Name);
+			}
+		}
+
+		// User selects a cell for editing
+		private void fieldslist_CellBeginEdit(object sender, DataGridViewCellCancelEventArgs e)
+		{
+			// Field name cell?
+			if(e.ColumnIndex == 0)
+			{
+				// New row index?
+				if(e.RowIndex == fieldslist.NewRowIndex)
+				{
+					// Remove all text
+					fieldslist.Rows[e.RowIndex].Cells[0].Style.ForeColor = SystemColors.WindowText;
+					if(autoinsertuserprefix)
+						fieldslist.Rows[e.RowIndex].Cells[0].Value = FIELD_PREFIX_SUGGESTION;
+					else
+						fieldslist.Rows[e.RowIndex].Cells[0].Value = "";
+				}
+			}
+			// Value cell?
+			else if(e.ColumnIndex == 2)
+			{
+				// Get the row
+				DataGridViewRow row = fieldslist.Rows[e.RowIndex];
+				if(row is FieldsEditorRow)
+				{
+					// Get specializedrow
+					FieldsEditorRow frow = row as FieldsEditorRow;
+
+					// Enumerable?
+					if(frow.TypeHandler.IsEnumerable)
+					{
+						// Fill combo with enums
+						enumscombo.SelectedItem = null;
+						enumscombo.Text = "";
+						enumscombo.Items.Clear();
+						enumscombo.Items.AddRange(frow.TypeHandler.GetEnumList().ToArray());
+						enumscombo.Tag = frow;
+						
+						// Lock combo to enums?
+						if(frow.TypeHandler.IsLimitedToEnums)
+							enumscombo.DropDownStyle = ComboBoxStyle.DropDownList;
+						else
+							enumscombo.DropDownStyle = ComboBoxStyle.DropDown;
+						
+						// Position combobox
+						Rectangle cellrect = fieldslist.GetCellDisplayRectangle(2, row.Index, false);
+						enumscombo.Location = new Point(cellrect.Left, cellrect.Top);
+						enumscombo.Width = cellrect.Width;
+						int internalheight = cellrect.Height - (enumscombo.Height - enumscombo.ClientRectangle.Height) - 6;
+						General.SendMessage(enumscombo.Handle, General.CB_SETITEMHEIGHT, -1, internalheight);
+						
+						// Select the value of this field (for DropDownList style combo)
+						foreach(EnumItem i in enumscombo.Items)
+						{
+							// Matches?
+							if(string.Compare(i.Title, frow.TypeHandler.GetStringValue(), true, CultureInfo.InvariantCulture) == 0)
+							{
+								// Select this item
+								enumscombo.SelectedItem = i;
+							}
+						}
+
+						// Put the display text in the text (for DropDown style combo)
+						enumscombo.Text = frow.TypeHandler.GetStringValue();
+						
+						// Show combo
+						enumscombo.Show();
+					}
+				}
+			}
+		}
+
+		// Done editing cell contents
+		private void fieldslist_CellEndEdit(object sender, DataGridViewCellEventArgs e)
+		{
+			FieldsEditorRow frow = null;
+
+			// Get the row
+			DataGridViewRow row = fieldslist.Rows[e.RowIndex];
+			if(row is FieldsEditorRow) frow = row as FieldsEditorRow;
+			
+			// Renaming a field?
+			if(e.ColumnIndex == 0)
+			{
+				// Row is a new row?
+				if(frow == null)
+				{
+					// Name given?
+					if((row.Cells[0].Value != null) && (row.Cells[0].Value.ToString() != FIELD_PREFIX_SUGGESTION))
+					{
+						// Make a valid UDMF field name
+						string validname = UniValue.ValidateName(row.Cells[0].Value.ToString());
+						if(validname.Length > 0) 
+						{
+							if(uifields.ContainsKey(validname)) //mxd
+							{ 
+								MessageBox.Show("Please set this field's value via user interface.");
+							} 
+							else 
+							{
+								// Check if no other row already has this name
+								foreach(DataGridViewRow r in fieldslist.Rows) 
+								{
+									// Name matches and not the same row?
+									if((r.Index != row.Index) && (r.Cells.Count > 0) && (r.Cells[0].Value != null) &&
+									    (r.Cells[0].Value.ToString().ToLowerInvariant() == validname)) 
+									{
+										// Cannot have two rows with same name
+										validname = "";
+										General.ShowWarningMessage("Fields must have unique names!", MessageBoxButtons.OK);
+										break;
+									}
+								}
+
+								// Still valid?
+								if(validname.Length > 0) 
+								{
+									// Try to find the type in the map options
+									int type = General.Map.Options.GetUniversalFieldType(elementname, validname, 0);
+
+									// Make new row
+									frow = new FieldsEditorRow(fieldslist, validname, type, null);
+									frow.Visible = false;
+									fieldslist.Rows.Insert(e.RowIndex + 1, frow);
+
+									if(OnFieldInserted != null)
+										OnFieldInserted(validname);
+								}
+							}
+						}
+					}
+
+					// Mark the row for delete
+					row.ReadOnly = true;
+					deleterowstimer.Start();
+				}
+				else
+				{
+					// Name given?
+					if(row.Cells[0].Value != null)
+					{
+						// Make a valid UDMF field name
+						string validname = UniValue.ValidateName(row.Cells[0].Value.ToString());
+						if(validname.Length > 0 && !uifields.ContainsKey(validname)) //mxd
+						{
+							// Check if no other row already has this name
+							foreach(DataGridViewRow r in fieldslist.Rows)
+							{
+								// Name matches and not the same row?
+								if((r.Index != row.Index) && (r.Cells.Count > 0) && (r.Cells[0].Value != null) &&
+								   (r.Cells[0].Value.ToString().ToLowerInvariant() == validname))
+								{
+									// Cannot have two rows with same name
+									validname = "";
+									row.Cells[0].Value = lasteditfieldname;
+									General.ShowWarningMessage("Fields must have unique names!", MessageBoxButtons.OK);
+									break;
+								}
+							}
+
+							// Still valid?
+							if(validname.Length > 0)
+							{
+								// Try to find the type in the map options
+								int type = General.Map.Options.GetUniversalFieldType(elementname, validname, -1);
+
+								// Rename row and change type
+								row.Cells[0].Value = validname;
+								if(type != -1) frow.ChangeType(type);
+
+								if(OnFieldNameChanged != null)
+									OnFieldNameChanged(lasteditfieldname, validname);
+
+								if(OnFieldTypeChanged != null)
+									OnFieldTypeChanged(validname);
+							}
+							else
+							{
+								// Keep old name
+								row.Cells[0].Value = lasteditfieldname;
+							}
+						}
+						else
+						{
+							// Keep old name
+							row.Cells[0].Value = lasteditfieldname;
+						}
+					}
+					else
+					{
+						// Keep old name
+						row.Cells[0].Value = lasteditfieldname;
+					}
+				}
+			}
+			// Changing field type?
+			if((e.ColumnIndex == 1) && (frow != null))
+			{
+				if(OnFieldTypeChanged != null)
+					OnFieldTypeChanged(frow.Name);
+			}
+			// Changing field value?
+			if((e.ColumnIndex == 2) && (frow != null))
+			{
+				// Apply changes
+				ApplyValue(frow, row.Cells[2].Value);
+			}
+			
+			// Updated
+			if(frow != null) frow.CellChanged();
+			
+			// Update button
+			UpdateBrowseButton();
+		}
+
+		// Time to delete rows
+		private void deleterowstimer_Tick(object sender, EventArgs e)
+		{
+			// Stop timer
+			deleterowstimer.Stop();
+			
+			// Delete all rows that must be deleted
+			for(int i = fieldslist.Rows.Count - 1; i >= 0; i--)
+			{
+				if(fieldslist.Rows[i].ReadOnly)
+					try { fieldslist.Rows.RemoveAt(i); } catch(Exception) { }
+				else
+					fieldslist.Rows[i].Visible = true;
+			}
+
+			// Update new row
+			SetupNewRowStyle();
+			
+			// Update button
+			UpdateBrowseButton();
+		}
+
+		// Selection changes
+		private void fieldslist_SelectionChanged(object sender, EventArgs e)
+		{
+			browsebutton.Visible = false;
+			ApplyEnums(true);
+			
+			// Update button
+			UpdateBrowseButton();
+		}
+
+		// Browse clicked
+		private void browsebutton_Click(object sender, EventArgs e)
+		{
+			// Any row selected?
+			if(fieldslist.SelectedRows.Count > 0)
+			{
+				// Get selected row
+				DataGridViewRow row = fieldslist.SelectedRows[0];
+				if(row is FieldsEditorRow)
+				{
+					// Browse
+					(row as FieldsEditorRow).Browse(this.ParentForm);
+					fieldslist.Focus();
+				}
+			}
+		}
+
+		// This handles field data errors
+		private void fieldslist_DataError(object sender, DataGridViewDataErrorEventArgs e)
+		{
+			// Ignore this, because we want to display values
+			// in the type column that are not in their combobox
+			e.ThrowException = false;
+		}
+
+		// Validate value in enums combobox
+		private void enumscombo_Validating(object sender, CancelEventArgs e)
+		{
+			ApplyEnums(false);
+		}
+
+		// Scrolling
+		private void fieldslist_Scroll(object sender, ScrollEventArgs e)
+		{
+			// Stop any cell editing
+			ApplyEnums(true);
+			fieldslist.EndEdit();
+			HideBrowseButton();
+		}
+
+		// Mouse up event
+		private void fieldslist_MouseUp(object sender, MouseEventArgs e)
+		{
+			// Focus to enums combobox when visible
+			if(enumscombo.Visible)
+			{
+				enumscombo.Focus();
+				enumscombo.SelectAll();
+			}
+		}
+		
+		#endregion
+		
+		#region ================== Private Methods
+
+		// This applies a value to a row
+		private void ApplyValue(FieldsEditorRow frow, object value)
+		{
+			// Defined?
+			if((value != null) && (!frow.IsFixed || !frow.Info.Default.Equals(value)))
+			{
+				frow.Define(value);
+			}
+			else if(frow.IsFixed)
+			{
+				frow.Undefine();
+			}
+			
+			if(OnFieldValueChanged != null)
+				OnFieldValueChanged(frow.Name);
+		}
+		
+		// This applies the contents of the enums combobox and hides (if opened)
+		private void ApplyEnums(bool hide)
+		{
+			// Enums combobox shown?
+			if((enumscombo.Visible) && (enumscombo.Tag is FieldsEditorRow))
+			{
+				// Get the row
+				FieldsEditorRow frow = (enumscombo.Tag as FieldsEditorRow);
+
+				// Take the selected value and apply it
+				ApplyValue(frow, enumscombo.Text);
+				
+				// Updated
+				frow.CellChanged();
+			}
+			
+			if(hide)
+			{
+				// Hide combobox
+				enumscombo.Tag = null;
+				enumscombo.Visible = false;
+				enumscombo.Items.Clear();
+			}
+		}
+		
+		// This sets up the new row
+		private void SetupNewRowStyle()
+		{
+			if(fieldslist.AllowUserToAddRows)
+			{
+				// Show text for new row
+				fieldslist.Rows[fieldslist.NewRowIndex].Cells[0].Value = ADD_FIELD_TEXT;
+				fieldslist.Rows[fieldslist.NewRowIndex].Cells[0].Style.ForeColor = SystemColors.GrayText;
+				fieldslist.Rows[fieldslist.NewRowIndex].Cells[0].ReadOnly = false;
+
+				// Make sure user can only enter property name in a new row
+				fieldslist.Rows[fieldslist.NewRowIndex].Cells[1].ReadOnly = true;
+				fieldslist.Rows[fieldslist.NewRowIndex].Cells[2].ReadOnly = true;
+			}
+		}
+
+		// This hides the browse button
+		private void HideBrowseButton()
+		{
+			browsebutton.Visible = false;
+		}
+
+		// This updates the Value column width
+		private void UpdateValueColumn()
+		{
+			int fieldnamewidth = fieldname.Visible ? fieldname.Width : 0;
+			int fieldtypewidth = fieldtype.Visible ? fieldtype.Width : 0;
+			fieldvalue.Width = fieldslist.ClientRectangle.Width - fieldnamewidth - fieldtypewidth - SystemInformation.VerticalScrollBarWidth - 10;
+		}
+
+		// This updates the button
+		private void UpdateBrowseButton()
+		{
+			FieldsEditorRow frow = null;
+
+			// Any row selected?
+			if(fieldslist.SelectedRows.Count > 0)
+			{
+				// Get selected row
+				DataGridViewRow row = fieldslist.SelectedRows[0];
+				if(row is FieldsEditorRow) frow = row as FieldsEditorRow;
+
+				// Not the new row and FieldsEditorRow available?
+				if((row.Index < fieldslist.NewRowIndex) && (frow != null))
+				{
+					// Browse button available for this type?
+					if(frow.TypeHandler.IsBrowseable && !frow.TypeHandler.IsEnumerable)
+					{
+						Rectangle cellrect = fieldslist.GetCellDisplayRectangle(2, row.Index, false);
+
+						// Show button
+						enumscombo.Visible = false;
+						browsebutton.Image = frow.TypeHandler.BrowseImage;
+						browsebutton.Location = new Point(cellrect.Right - browsebutton.Width, cellrect.Top);
+						browsebutton.Height = cellrect.Height;
+						browsebutton.Visible = true;
+					}
+					else
+					{
+						HideBrowseButton();
+					}
+				}
+				else
+				{
+					HideBrowseButton();
+				}
+			}
+			else
+			{
+				HideBrowseButton();
+			}
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Controls/FieldsEditorControl.resx b/Source/Core/Controls/FieldsEditorControl.resx
new file mode 100644
index 0000000..fca4bd4
--- /dev/null
+++ b/Source/Core/Controls/FieldsEditorControl.resx
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="fieldslist.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="fieldname.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="fieldtype.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="fieldvalue.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="deleterowstimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="browsebutton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="enumscombo.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Controls/FieldsEditorRow.cs b/Source/Core/Controls/FieldsEditorRow.cs
new file mode 100644
index 0000000..6a27630
--- /dev/null
+++ b/Source/Core/Controls/FieldsEditorRow.cs
@@ -0,0 +1,269 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Types;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Controls
+{
+	internal class FieldsEditorRow : DataGridViewRow
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+		
+		// This is true when for a fixed field as defined in the game configuration
+		// This means that the field cannot be deleted (delete will result in a reset)
+		// and cannot change type.
+		private bool isfixed;
+
+		// Field information (only for fixed fields)
+		private UniversalFieldInfo fieldinfo;
+
+		// This is true when the field is defined. Cannot be false when this field
+		// is not fixed, because non-fixed fields are deleted from the list when undefined.
+		private bool isdefined;
+
+		// Type
+		private TypeHandler fieldtype;
+		
+		#endregion
+
+		#region ================== Properties
+
+		public bool IsFixed { get { return isfixed; } }
+		public bool IsDefined { get { return isdefined; } }
+		public bool IsEmpty { get { return (this.Cells[2].Value == null) || (this.Cells[2].Value.ToString().Length == 0); } }
+		public string Name { get { return this.Cells[0].Value.ToString(); } }
+		public TypeHandler TypeHandler { get { return fieldtype; } }
+		public UniversalFieldInfo Info { get { return fieldinfo; } }
+
+		#endregion
+
+		#region ================== Constructor
+
+		// Constructor for a fixed, undefined field
+		public FieldsEditorRow(DataGridView view, UniversalFieldInfo fixedfield)
+		{
+			// Undefined
+			this.DefaultCellStyle.ForeColor = SystemColors.GrayText;
+			isdefined = false;
+			
+			// Fixed
+			this.fieldinfo = fixedfield;
+			isfixed = true;
+			
+			// Type
+			this.fieldtype = General.Types.GetFieldHandler(fixedfield);
+			
+			// Make all cells
+			base.CreateCells(view);
+			
+			// Setup property cell
+			this.Cells[0].Value = fixedfield.Name;
+			this.Cells[0].ReadOnly = true;
+
+			// Setup type cell
+			this.Cells[1].Value = fieldtype.GetDisplayType();
+			this.Cells[1].ReadOnly = true;
+
+			// Setup value cell
+			this.Cells[2].Value = fieldtype.GetStringValue();
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Constructor for a non-fixed, defined field
+		public FieldsEditorRow(DataGridView view, string name, int type, object value)
+		{
+			// Defined
+			this.DefaultCellStyle.ForeColor = SystemColors.WindowText;
+			isdefined = true;
+
+			// Non-fixed
+			isfixed = false;
+
+			// Type
+			this.fieldtype = General.Types.GetFieldHandler(type, value);
+
+			// Make all cells
+			base.CreateCells(view);
+			
+			// Setup property cell
+			this.Cells[0].Value = name;
+			this.Cells[0].ReadOnly = true;
+
+			// Setup type cell
+			this.Cells[1].Value = fieldtype.GetDisplayType();
+			this.Cells[1].ReadOnly = false;
+
+			// Setup value cell
+			this.Cells[2].Value = fieldtype.GetStringValue();
+
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		#endregion
+
+		#region ================== Methods
+		
+		// Browse for value
+		public void Browse(IWin32Window parent)
+		{
+			if(fieldtype != null)
+			{
+				// Browse for value
+				fieldtype.Browse(parent);
+
+				// This is a fixed field?
+				if(isfixed)
+				{
+					// Does this match the default setting?
+					if(fieldtype.GetValue().Equals(fieldinfo.Default))
+					{
+						// Undefine this field!
+						Undefine();
+					}
+					else
+					{
+						// Define
+						Define(fieldtype.GetValue());
+					}
+				}
+				else
+				{
+					// Define
+					Define(fieldtype.GetValue());
+				}
+			}
+		}
+		
+		// This is called when a cell is edited
+		public void CellChanged()
+		{
+			// This gdmn grid thing returns the chosen value as string instead
+			// of the object type I added to the combobox...
+			if(this.Cells[1].Value is string)
+			{
+				// Find the TypeHandlerAttribute with this name
+				TypeHandlerAttribute attrib = General.Types.GetNamedAttribute(this.Cells[1].Value.ToString());
+
+				// Different?
+				if(attrib.Index != fieldtype.Index)
+				{
+					// Change field type!
+					this.ChangeType(attrib.Index);
+				}
+			}
+			
+			// Anything in the box?
+			if((this.Cells[2].Value != null) && (this.Cells[2].Value.ToString().Length > 0))
+			{
+				// Validate value
+				fieldtype.SetValue(this.Cells[2].Value);
+				this.Cells[2].Value = fieldtype.GetStringValue();
+
+				// This is a fixed field?
+				if(isfixed)
+				{
+					// Does this match the default setting?
+					if(fieldtype.GetValue().Equals(fieldinfo.Default))
+					{
+						// Undefine this field!
+						Undefine();
+					}
+				}
+			}
+		}
+		
+		// This undefines the field
+		// ONLY VALID FOR FIXED FIELDS
+		// You should just delete non-fixed fields
+		public void Undefine()
+		{
+			// Must be fixed!
+			if(!isfixed) throw new InvalidOperationException();
+			
+			// Now undefined
+			fieldtype.SetValue(fieldinfo.Default);
+			this.Cells[2].Value = fieldtype.GetStringValue();
+			this.DefaultCellStyle.ForeColor = SystemColors.GrayText;
+			isdefined = false;
+		}
+
+		// This defines the field
+		public void Define(object value)
+		{
+			// Now defined
+			fieldtype.SetValue(value);
+			this.Cells[2].Value = fieldtype.GetStringValue();
+			this.DefaultCellStyle.ForeColor = SystemColors.WindowText;
+			isdefined = true;
+		}
+
+		// This changes the type
+		public void ChangeType(int typeindex)
+		{
+			// Can't do this for a fixed field!
+			if(isfixed) throw new InvalidOperationException();
+			
+			// Different?
+			if(typeindex != fieldtype.Index)
+			{
+				// Change field type!
+				//TypeHandlerAttribute attrib = General.Types.GetAttribute(typeindex); //mxd
+				fieldtype = General.Types.GetFieldHandler(typeindex, this.Cells[2].Value);
+				this.Cells[1].Value = fieldtype.GetDisplayType();
+			}
+		}
+		
+		// This clears the field
+		public void Clear()
+		{
+			this.Cells[2].Value = "";
+		}
+		
+		// This returns the result
+		public object GetResult(object value)
+		{
+			// Anything in the box?
+			if((this.Cells[2].Value != null) && (this.Cells[2].Value.ToString().Length > 0))
+			{
+				// Return validated value
+				fieldtype.SetValue(this.Cells[2].Value);
+				return fieldtype.GetValue();
+			}
+			else
+			{
+				// Return old value
+				return value;
+			}
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Controls/FlatSelectorControl.cs b/Source/Core/Controls/FlatSelectorControl.cs
new file mode 100644
index 0000000..c466a9a
--- /dev/null
+++ b/Source/Core/Controls/FlatSelectorControl.cs
@@ -0,0 +1,82 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Drawing;
+using CodeImp.DoomBuilder.Windows;
+using CodeImp.DoomBuilder.Data;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Controls
+{
+	public class FlatSelectorControl : ImageSelectorControl
+	{
+		// Setup
+		public override void Initialize()
+		{
+			base.Initialize();
+			
+			// Fill autocomplete list
+			name.AutoCompleteCustomSource.AddRange(General.Map.Data.FlatNames.ToArray());
+		}
+		
+		// This finds the image we need for the given flat name
+		protected override Image FindImage(string imagename)
+		{
+			timer.Stop(); //mxd
+
+			// Check if name is a "none" texture
+			if(string.IsNullOrEmpty(imagename))
+			{
+				DisplayImageSize(0, 0); //mxd
+				UpdateToggleImageNameButton(null); //mxd
+				
+				//mxd. Flat required?
+				return multipletextures ? Properties.Resources.ImageStack : Properties.Resources.MissingTexture;
+			} 
+			else if(imagename == "-") //mxd
+			{
+				DisplayImageSize(0, 0);
+				UpdateToggleImageNameButton(null); //mxd
+
+				// Flat required!
+				return Properties.Resources.MissingTexture;
+			}
+			else
+			{
+				ImageData texture = General.Map.Data.GetFlatImage(imagename); //mxd
+				UpdateToggleImageNameButton(texture); //mxd
+
+				if(string.IsNullOrEmpty(texture.FilePathName) || texture is UnknownImage) DisplayImageSize(0, 0); //mxd
+				else DisplayImageSize(texture.ScaledWidth, texture.ScaledHeight); //mxd
+				if(usepreviews ? !texture.IsPreviewLoaded : !texture.IsImageLoaded) timer.Start(); //mxd
+				
+				// Set the image
+				return (usepreviews ? texture.GetPreview() : texture.GetBitmap());
+			}
+		}
+
+		// This browses for a flat
+		protected override string BrowseImage(string imagename)
+		{
+			// Browse for texture
+			string result = TextureBrowserForm.Browse(this.ParentForm, imagename, true);
+			if(result != null) return result; else return imagename;
+		}
+	}
+}
diff --git a/Source/Core/Controls/HintsPanel.Designer.cs b/Source/Core/Controls/HintsPanel.Designer.cs
new file mode 100644
index 0000000..a36cdee
--- /dev/null
+++ b/Source/Core/Controls/HintsPanel.Designer.cs
@@ -0,0 +1,83 @@
+namespace CodeImp.DoomBuilder.Controls
+{
+	partial class HintsPanel
+	{
+		/// <summary> 
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing) 
+		{
+			if(disposing && (components != null)) 
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Component Designer generated code
+
+		/// <summary> 
+		/// Required method for Designer support - do not modify 
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent() 
+		{
+			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(HintsPanel));
+			this.label1 = new System.Windows.Forms.Label();
+			this.hints = new System.Windows.Forms.RichTextBox();
+			this.SuspendLayout();
+			// 
+			// label1
+			// 
+			this.label1.AutoSize = true;
+			this.label1.Location = new System.Drawing.Point(3, 3);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(110, 13);
+			this.label1.TabIndex = 1;
+			this.label1.Text = "hidden focus catcher!";
+			// 
+			// hints
+			// 
+			this.hints.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.hints.BackColor = System.Drawing.SystemColors.Window;
+			this.hints.Cursor = System.Windows.Forms.Cursors.Arrow;
+			this.hints.DetectUrls = false;
+			this.hints.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.hints.Location = new System.Drawing.Point(6, 3);
+			this.hints.Name = "hints";
+			this.hints.ReadOnly = true;
+			this.hints.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.Vertical;
+			this.hints.ShortcutsEnabled = false;
+			this.hints.Size = new System.Drawing.Size(381, 542);
+			this.hints.TabIndex = 2;
+			this.hints.Text = resources.GetString("hints.Text");
+			this.hints.Enter += new System.EventHandler(this.hints_Enter);
+			// 
+			// HintsPanel
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.Controls.Add(this.hints);
+			this.Controls.Add(this.label1);
+			this.Name = "HintsPanel";
+			this.Size = new System.Drawing.Size(390, 548);
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.RichTextBox hints;
+
+	}
+}
diff --git a/Source/Core/Controls/HintsPanel.cs b/Source/Core/Controls/HintsPanel.cs
new file mode 100644
index 0000000..f28fa0d
--- /dev/null
+++ b/Source/Core/Controls/HintsPanel.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Windows.Forms;
+
+namespace CodeImp.DoomBuilder.Controls
+{
+	internal partial class HintsPanel : UserControl
+	{
+		public HintsPanel() 
+		{
+			InitializeComponent();
+			hints.Clear();
+		}
+
+		//hints should be in rtf markup!
+		internal void SetHints(string hintsText) 
+		{
+			hints.Clear();
+			hints.SelectedRtf = hintsText;
+		}
+
+		internal void ClearHints() 
+		{
+			hints.Clear();
+		}
+
+		// Fight TextBoxes habit of not releasing the focus by using a carefully placed label
+		private void hints_Enter(object sender, EventArgs e) 
+		{
+			label1.Focus();
+		}
+	}
+}
diff --git a/Source/Core/Controls/HintsPanel.resx b/Source/Core/Controls/HintsPanel.resx
new file mode 100644
index 0000000..0c31b7e
--- /dev/null
+++ b/Source/Core/Controls/HintsPanel.resx
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="hints.Text" xml:space="preserve">
+    <value>To look around, look around!
+
+Press any key to Jason!
+
+Awesome stuff can be found in the manual!
+
+Press Use to Use Press!
+
+Place things to gain experience!
+
+You can expand your kingdom by adding new sectors!
+
+Beware of exceptions, they can do MASSIVE sanity damage!
+
+Press Space to SPAAACEEEEE!!!
+
+Check our Exception Killer Day One DLC!
+
+GZDB is very easy to use: just learn more than 300 awesome hot keys and you are ready to go!
+
+To find the Broom Closet Ending, create the broom closet!
+
+Press F1 to view Achievements!
+</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Controls/ImageBrowserControl.Designer.cs b/Source/Core/Controls/ImageBrowserControl.Designer.cs
new file mode 100644
index 0000000..567270c
--- /dev/null
+++ b/Source/Core/Controls/ImageBrowserControl.Designer.cs
@@ -0,0 +1,266 @@
+namespace CodeImp.DoomBuilder.Controls
+{
+	partial class ImageBrowserControl
+	{
+		/// <summary> 
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				CleanUp();
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Component Designer generated code
+
+		/// <summary> 
+		/// Required method for Designer support - do not modify 
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.components = new System.ComponentModel.Container();
+			this.labelMixMode = new System.Windows.Forms.Label();
+			this.label = new System.Windows.Forms.Label();
+			this.splitter = new System.Windows.Forms.SplitContainer();
+			this.list = new CodeImp.DoomBuilder.Controls.OptimizedListView();
+			this.showsubdirtextures = new System.Windows.Forms.CheckBox();
+			this.longtexturenames = new System.Windows.Forms.CheckBox();
+			this.filterheightlabel = new System.Windows.Forms.Label();
+			this.filterHeight = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.filterwidthlabel = new System.Windows.Forms.Label();
+			this.filterWidth = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.cbMixMode = new System.Windows.Forms.ComboBox();
+			this.objectname = new System.Windows.Forms.TextBox();
+			this.refreshtimer = new System.Windows.Forms.Timer(this.components);
+			this.splitter.Panel1.SuspendLayout();
+			this.splitter.Panel2.SuspendLayout();
+			this.splitter.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// labelMixMode
+			// 
+			this.labelMixMode.AutoSize = true;
+			this.labelMixMode.Location = new System.Drawing.Point(3, 9);
+			this.labelMixMode.Name = "labelMixMode";
+			this.labelMixMode.Size = new System.Drawing.Size(37, 13);
+			this.labelMixMode.TabIndex = 0;
+			this.labelMixMode.Text = "Show:";
+			// 
+			// label
+			// 
+			this.label.AutoSize = true;
+			this.label.Location = new System.Drawing.Point(131, 9);
+			this.label.Name = "label";
+			this.label.Size = new System.Drawing.Size(32, 13);
+			this.label.TabIndex = 0;
+			this.label.Text = "Filter:";
+			// 
+			// splitter
+			// 
+			this.splitter.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.splitter.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
+			this.splitter.IsSplitterFixed = true;
+			this.splitter.Location = new System.Drawing.Point(0, 0);
+			this.splitter.Name = "splitter";
+			this.splitter.Orientation = System.Windows.Forms.Orientation.Horizontal;
+			// 
+			// splitter.Panel1
+			// 
+			this.splitter.Panel1.Controls.Add(this.list);
+			// 
+			// splitter.Panel2
+			// 
+			this.splitter.Panel2.Controls.Add(this.showsubdirtextures);
+			this.splitter.Panel2.Controls.Add(this.longtexturenames);
+			this.splitter.Panel2.Controls.Add(this.filterheightlabel);
+			this.splitter.Panel2.Controls.Add(this.filterHeight);
+			this.splitter.Panel2.Controls.Add(this.filterwidthlabel);
+			this.splitter.Panel2.Controls.Add(this.filterWidth);
+			this.splitter.Panel2.Controls.Add(this.cbMixMode);
+			this.splitter.Panel2.Controls.Add(this.labelMixMode);
+			this.splitter.Panel2.Controls.Add(this.objectname);
+			this.splitter.Panel2.Controls.Add(this.label);
+			this.splitter.Size = new System.Drawing.Size(840, 346);
+			this.splitter.SplitterDistance = 312;
+			this.splitter.TabIndex = 0;
+			this.splitter.TabStop = false;
+			// 
+			// list
+			// 
+			this.list.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.list.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.list.HideSelection = false;
+			this.list.Location = new System.Drawing.Point(0, 0);
+			this.list.MultiSelect = false;
+			this.list.Name = "list";
+			this.list.OwnerDraw = true;
+			this.list.ShowItemToolTips = true;
+			this.list.Size = new System.Drawing.Size(840, 312);
+			this.list.TabIndex = 1;
+			this.list.TabStop = false;
+			this.list.TileSize = new System.Drawing.Size(90, 90);
+			this.list.UseCompatibleStateImageBehavior = false;
+			this.list.View = System.Windows.Forms.View.Tile;
+			this.list.DrawItem += new System.Windows.Forms.DrawListViewItemEventHandler(this.list_DrawItem);
+			this.list.DoubleClick += new System.EventHandler(this.list_DoubleClick);
+			this.list.ItemSelectionChanged += new System.Windows.Forms.ListViewItemSelectionChangedEventHandler(this.list_ItemSelectionChanged);
+			this.list.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.list_KeyPress);
+			// 
+			// showsubdirtextures
+			// 
+			this.showsubdirtextures.AutoSize = true;
+			this.showsubdirtextures.Location = new System.Drawing.Point(595, 8);
+			this.showsubdirtextures.Name = "showsubdirtextures";
+			this.showsubdirtextures.Size = new System.Drawing.Size(172, 17);
+			this.showsubdirtextures.TabIndex = 0;
+			this.showsubdirtextures.TabStop = false;
+			this.showsubdirtextures.Text = "Show textures in subdirectories";
+			this.showsubdirtextures.UseVisualStyleBackColor = true;
+			this.showsubdirtextures.CheckedChanged += new System.EventHandler(this.showsubdirtextures_CheckedChanged);
+			// 
+			// longtexturenames
+			// 
+			this.longtexturenames.AutoSize = true;
+			this.longtexturenames.Location = new System.Drawing.Point(470, 8);
+			this.longtexturenames.Name = "longtexturenames";
+			this.longtexturenames.Size = new System.Drawing.Size(119, 17);
+			this.longtexturenames.TabIndex = 0;
+			this.longtexturenames.TabStop = false;
+			this.longtexturenames.Text = "Long texture names";
+			this.longtexturenames.UseVisualStyleBackColor = true;
+			this.longtexturenames.CheckedChanged += new System.EventHandler(this.longtexturenames_CheckedChanged);
+			// 
+			// filterheightlabel
+			// 
+			this.filterheightlabel.AutoSize = true;
+			this.filterheightlabel.Location = new System.Drawing.Point(367, 9);
+			this.filterheightlabel.Name = "filterheightlabel";
+			this.filterheightlabel.Size = new System.Drawing.Size(41, 13);
+			this.filterheightlabel.TabIndex = 0;
+			this.filterheightlabel.Text = "Height:";
+			// 
+			// filterHeight
+			// 
+			this.filterHeight.AllowDecimal = false;
+			this.filterHeight.AllowNegative = false;
+			this.filterHeight.AllowRelative = false;
+			this.filterHeight.ButtonStep = 1;
+			this.filterHeight.ButtonStepBig = 10F;
+			this.filterHeight.ButtonStepFloat = 1F;
+			this.filterHeight.ButtonStepSmall = 0.1F;
+			this.filterHeight.ButtonStepsUseModifierKeys = false;
+			this.filterHeight.ButtonStepsWrapAround = false;
+			this.filterHeight.Location = new System.Drawing.Point(410, 4);
+			this.filterHeight.Name = "filterHeight";
+			this.filterHeight.Size = new System.Drawing.Size(54, 24);
+			this.filterHeight.StepValues = null;
+			this.filterHeight.TabIndex = 0;
+			this.filterHeight.TabStop = false;
+			this.filterHeight.WhenTextChanged += new System.EventHandler(this.filterSize_WhenTextChanged);
+			// 
+			// filterwidthlabel
+			// 
+			this.filterwidthlabel.AutoSize = true;
+			this.filterwidthlabel.Location = new System.Drawing.Point(268, 9);
+			this.filterwidthlabel.Name = "filterwidthlabel";
+			this.filterwidthlabel.Size = new System.Drawing.Size(38, 13);
+			this.filterwidthlabel.TabIndex = 0;
+			this.filterwidthlabel.Text = "Width:";
+			// 
+			// filterWidth
+			// 
+			this.filterWidth.AllowDecimal = false;
+			this.filterWidth.AllowNegative = false;
+			this.filterWidth.AllowRelative = false;
+			this.filterWidth.ButtonStep = 1;
+			this.filterWidth.ButtonStepBig = 10F;
+			this.filterWidth.ButtonStepFloat = 1F;
+			this.filterWidth.ButtonStepSmall = 0.1F;
+			this.filterWidth.ButtonStepsUseModifierKeys = false;
+			this.filterWidth.ButtonStepsWrapAround = false;
+			this.filterWidth.Location = new System.Drawing.Point(308, 4);
+			this.filterWidth.Name = "filterWidth";
+			this.filterWidth.Size = new System.Drawing.Size(54, 24);
+			this.filterWidth.StepValues = null;
+			this.filterWidth.TabIndex = 0;
+			this.filterWidth.TabStop = false;
+			this.filterWidth.WhenTextChanged += new System.EventHandler(this.filterSize_WhenTextChanged);
+			// 
+			// cbMixMode
+			// 
+			this.cbMixMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.cbMixMode.FormattingEnabled = true;
+			this.cbMixMode.Items.AddRange(new object[] {
+            "All",
+            "Textures",
+            "Flats",
+            "By sel. type"});
+			this.cbMixMode.Location = new System.Drawing.Point(43, 5);
+			this.cbMixMode.Margin = new System.Windows.Forms.Padding(3, 3, 6, 3);
+			this.cbMixMode.Name = "cbMixMode";
+			this.cbMixMode.Size = new System.Drawing.Size(80, 21);
+			this.cbMixMode.TabIndex = 0;
+			this.cbMixMode.TabStop = false;
+			this.cbMixMode.SelectedIndexChanged += new System.EventHandler(this.cbMixMode_SelectedIndexChanged);
+			// 
+			// objectname
+			// 
+			this.objectname.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
+			this.objectname.Location = new System.Drawing.Point(166, 6);
+			this.objectname.Margin = new System.Windows.Forms.Padding(3, 3, 6, 3);
+			this.objectname.Name = "objectname";
+			this.objectname.Size = new System.Drawing.Size(94, 20);
+			this.objectname.TabIndex = 0;
+			this.objectname.TabStop = false;
+			this.objectname.TextChanged += new System.EventHandler(this.objectname_TextChanged);
+			this.objectname.KeyDown += new System.Windows.Forms.KeyEventHandler(this.objectname_KeyDown);
+			// 
+			// refreshtimer
+			// 
+			this.refreshtimer.Interval = 500;
+			this.refreshtimer.Tick += new System.EventHandler(this.refreshtimer_Tick);
+			// 
+			// ImageBrowserControl
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.Controls.Add(this.splitter);
+			this.Name = "ImageBrowserControl";
+			this.Size = new System.Drawing.Size(840, 346);
+			this.splitter.Panel1.ResumeLayout(false);
+			this.splitter.Panel2.ResumeLayout(false);
+			this.splitter.Panel2.PerformLayout();
+			this.splitter.ResumeLayout(false);
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.SplitContainer splitter;
+		private OptimizedListView list;
+		private System.Windows.Forms.Timer refreshtimer;
+		private System.Windows.Forms.TextBox objectname;
+		private System.Windows.Forms.ComboBox cbMixMode;
+		private System.Windows.Forms.Label label;
+		private System.Windows.Forms.Label labelMixMode;
+		private ButtonsNumericTextbox filterWidth;
+		private System.Windows.Forms.Label filterheightlabel;
+		private ButtonsNumericTextbox filterHeight;
+		private System.Windows.Forms.Label filterwidthlabel;
+		private System.Windows.Forms.CheckBox longtexturenames;
+		private System.Windows.Forms.CheckBox showsubdirtextures;
+
+	}
+}
diff --git a/Source/Core/Controls/ImageBrowserControl.cs b/Source/Core/Controls/ImageBrowserControl.cs
new file mode 100644
index 0000000..ede2166
--- /dev/null
+++ b/Source/Core/Controls/ImageBrowserControl.cs
@@ -0,0 +1,613 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Globalization;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Data;
+using CodeImp.DoomBuilder.Windows;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Controls
+{
+	internal partial class ImageBrowserControl : UserControl
+	{
+		#region ================== Constants
+		
+		#endregion
+		
+		#region ================== Delegates / Events
+
+		public delegate void SelectedItemChangedDelegate();
+		public delegate void SelectedItemDoubleClickDelegate();
+
+		public event SelectedItemChangedDelegate SelectedItemChanged;
+		public event SelectedItemDoubleClickDelegate SelectedItemDoubleClicked;
+		
+		#endregion
+
+		#region ================== Variables
+		
+		// Properties
+		private bool preventselection;
+		
+		// States
+		private bool updating;
+		private int keepselected;
+		private bool browseFlats; //mxd
+		private static bool uselongtexturenames; //mxd
+		private static bool showtexturesfromsubdirs; //mxd
+		private int currentlevel; //mxd
+		
+		// All items
+		private readonly List<ImageBrowserItem> items;
+
+		// Items visible in the list
+		private List<ImageBrowserItem> visibleitems;
+
+		//mxd
+		private static int mixMode;
+		
+		#endregion
+
+		#region ================== Properties
+
+		public bool PreventSelection { get { return preventselection; } set { preventselection = value; } }
+		public bool HideInputBox { get { return splitter.Panel2Collapsed; } set { splitter.Panel2Collapsed = value; } }
+		public bool BrowseFlats { get { return browseFlats; } set { browseFlats = value; } } //mxd
+		public static bool ShowTexturesFromSubDirectories { get { return showtexturesfromsubdirs; } internal set { showtexturesfromsubdirs = value; } } //mxd
+		public static bool UseLongTextureNames { get { return uselongtexturenames; } internal set { uselongtexturenames = value; } } //mxd
+		public ListViewItem SelectedItem { get { if(list.SelectedItems.Count > 0) return list.SelectedItems[0]; else return null; } }
+		
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public ImageBrowserControl()
+		{
+			// Initialize
+			InitializeComponent();
+			items = new List<ImageBrowserItem>();
+
+			//mxd
+			StepsList sizes = new StepsList { 4, 8, 16, 32, 48, 64, 96, 128, 196, 256, 512, 1024 };
+			filterWidth.StepValues = sizes;
+			filterHeight.StepValues = sizes;
+
+			//mxd. Looks like SplitterDistance is unaffected by DPI scaling. Let's fix that...
+			if(MainForm.DPIScaler.Height != 1.0f)
+			{
+				splitter.SplitterDistance = splitter.Height - splitter.Panel2.Height - (int)Math.Round(splitter.SplitterWidth * MainForm.DPIScaler.Height);
+			}
+		}
+		
+		// This applies the application settings
+		public void ApplySettings()
+		{
+			// Force black background?
+			if(General.Settings.BlackBrowsers)
+			{
+				list.BackColor = Color.Black;
+				list.ForeColor = Color.White;
+			}
+
+			// Set the size of preview images
+			if(General.Map != null)
+			{
+				int itemwidth = General.Map.Data.Previews.MaxImageWidth + 26;
+				int itemheight = General.Map.Data.Previews.MaxImageHeight + 26;
+				list.TileSize = new Size(itemwidth, itemheight);
+
+				//mxd
+				if(General.Map.Config.MixTexturesFlats) 
+				{
+					cbMixMode.SelectedIndex = mixMode;
+				} 
+				else 
+				{
+					labelMixMode.Visible = false;
+					cbMixMode.Visible = false;
+					
+					int offset = label.Left - labelMixMode.Left;
+					label.Left -= offset;
+					objectname.Left -= offset;
+					filterWidth.Left -= offset;
+					filterwidthlabel.Left -= offset;
+					filterHeight.Left -= offset;
+					filterheightlabel.Left -= offset;
+					showsubdirtextures.Left -= offset;
+					longtexturenames.Left -= offset;
+					
+					mixMode = 0;
+				}
+
+				//mxd. Use long texture names?
+				longtexturenames.Checked = (uselongtexturenames && General.Map.Config.UseLongTextureNames);
+				longtexturenames.Visible = General.Map.Config.UseLongTextureNames;
+				if(!General.Map.Config.UseLongTextureNames) 
+					showsubdirtextures.Left = longtexturenames.Left; //mxd
+			}
+			else
+			{
+				longtexturenames.Visible = false; //mxd
+				uselongtexturenames = false; //mxd
+				showsubdirtextures.Left = longtexturenames.Left; //mxd
+			}
+
+			//mxd
+			if(!General.Settings.CapitalizeTextureNames)
+				objectname.CharacterCasing = CharacterCasing.Normal;
+
+			//mxd. Show textures in subfolders?
+			showsubdirtextures.Checked = showtexturesfromsubdirs;
+		}
+
+		// This cleans everything up
+		public virtual void CleanUp()
+		{
+			// Stop refresh timer
+			refreshtimer.Enabled = false;
+		}
+
+		#endregion
+
+		#region ================== Rendering
+
+		// Draw item
+		private void list_DrawItem(object sender, DrawListViewItemEventArgs e)
+		{
+			if(!updating) (e.Item as ImageBrowserItem).Draw(e.Graphics, e.Bounds);
+		}
+
+		// Refresher
+		private void refreshtimer_Tick(object sender, EventArgs e)
+		{
+			bool allpreviewsloaded = true;
+			
+			// Go for all items
+			foreach(ImageBrowserItem i in list.Items)
+			{
+				// Check if there are still previews that are not loaded
+				allpreviewsloaded &= i.IsPreviewLoaded;
+				
+				// Items needs to be redrawn?
+				if(i.CheckRedrawNeeded())
+				{
+					// Refresh item in list
+					//list.RedrawItems(i.Index, i.Index, false);
+					list.Invalidate();
+				}
+			}
+
+			// If all previews were loaded, stop this timer
+			if(allpreviewsloaded) refreshtimer.Stop();
+		}
+
+		#endregion
+
+		#region ================== Events
+
+		// Name typed
+		private void objectname_TextChanged(object sender, EventArgs e)
+		{
+			// Update list
+			RefillList(false);
+
+			// No item selected?
+			if(list.SelectedItems.Count == 0)
+			{
+				// Select first
+				SelectFirstItem();
+			}
+		}
+
+		// Key pressed in textbox
+		private void objectname_KeyDown(object sender, KeyEventArgs e)
+		{
+			// Check what key is pressed
+			switch(e.KeyData)
+			{
+				// Cursor keys
+				case Keys.Left: SelectNextItem(SearchDirectionHint.Left); e.SuppressKeyPress = true; break;
+				case Keys.Right: SelectNextItem(SearchDirectionHint.Right); e.SuppressKeyPress = true; break;
+				case Keys.Up: SelectNextItem(SearchDirectionHint.Up); e.SuppressKeyPress = true;  break;
+				case Keys.Down: SelectNextItem(SearchDirectionHint.Down); e.SuppressKeyPress = true; break;
+
+				// Tab
+				case Keys.Tab: GoToNextSameTexture(); e.SuppressKeyPress = true; break;
+			}
+		}
+
+		//mxd
+		private void filterSize_WhenTextChanged(object sender, EventArgs e) 
+		{
+			objectname_TextChanged(sender, e);
+		}
+
+		//mxd
+		protected override bool ProcessTabKey(bool forward)
+		{
+			GoToNextSameTexture();
+			return false;
+		}
+		
+		// Selection changed
+		private void list_ItemSelectionChanged(object sender, ListViewItemSelectionChangedEventArgs e)
+		{
+			if(!e.IsSelected) return; //mxd. Don't want to trigger this twice
+			
+			// Prevent selecting?
+			if(preventselection)
+			{
+				foreach(ListViewItem i in list.SelectedItems) i.Selected = false;
+			}
+			else
+			{
+				// Raise event
+				if(SelectedItemChanged != null) SelectedItemChanged();
+			}
+		}
+		
+		// Doublelicking an item
+		private void list_DoubleClick(object sender, EventArgs e)
+		{
+			if(!preventselection && (list.SelectedItems.Count > 0))
+				if(SelectedItemDoubleClicked != null) SelectedItemDoubleClicked();
+		}
+
+		//mxd. Transfer focus to Filter textbox
+		private void list_KeyPress(object sender, KeyPressEventArgs e)
+		{
+			objectname.Focus();
+			if(e.KeyChar == '\b') // Any better way to check for Backspace?..
+			{
+				if(!string.IsNullOrEmpty(objectname.Text) && objectname.SelectionStart > 0 && objectname.SelectionLength == 0)
+				{
+					int s = objectname.SelectionStart - 1;
+					objectname.Text = objectname.Text.Remove(s, 1);
+					objectname.SelectionStart = s;
+				}
+			}
+			else
+			{
+				objectname.AppendText(e.KeyChar.ToString(CultureInfo.InvariantCulture));
+			}
+		}
+
+		//mxd
+		private void cbMixMode_SelectedIndexChanged(object sender, EventArgs e) 
+		{
+			mixMode = cbMixMode.SelectedIndex;
+			RefillList(false);
+		}
+
+		//mxd
+		private void longtexturenames_CheckedChanged(object sender, EventArgs e)
+		{
+			uselongtexturenames = longtexturenames.Checked;
+			RefillList(false);
+		}
+
+		//mxd
+		private void showsubdirtextures_CheckedChanged(object sender, EventArgs e)
+		{
+			showtexturesfromsubdirs = showsubdirtextures.Checked;
+			RefillList(false);
+		}
+		
+		#endregion
+
+		#region ================== Methods
+
+		// This selects the next texture with the same name as the selected texture
+		public void GoToNextSameTexture()
+		{
+			if(list.SelectedItems.Count > 0)
+			{
+				list.Focus(); //mxd
+				ListViewItem selected = list.SelectedItems[0];
+
+				//mxd
+				foreach(ImageBrowserItem n in visibleitems) 
+				{
+					if(n == selected) continue;
+					if(n.Text == selected.Text) 
+					{
+						if(list.IsGroupCollapsed(n.Group)) list.SetGroupCollapsed(n.Group, false);
+						n.Selected = true;
+						n.Focused = true;
+						n.EnsureVisible();
+						return;
+					}
+				}
+			}
+		}
+
+		// This selects an item by longname (mxd - changed from name to longname)
+		public void SelectItem(long longname, ListViewGroup preferredgroup)
+		{
+			ImageBrowserItem lvi = null; //mxd
+
+			// Not when selecting is prevented
+			if(preventselection) return;
+
+			// Search in preferred group first
+			if(preferredgroup != null)
+			{
+				foreach(ListViewItem item in list.Items)
+				{
+					ImageBrowserItem curitem = item as ImageBrowserItem;
+					if(curitem != null && longname == curitem.Icon.LongName) //mxd
+					{
+						lvi = curitem;
+						if(item.Group == preferredgroup) break;
+					}
+				}
+			}
+			
+			// Select the item
+			if(lvi != null)
+			{
+				// Select this item
+				list.SelectedItems.Clear();
+				lvi.Selected = true;
+				lvi.EnsureVisible();
+			}
+		}
+		
+		// This performs item sleection by keys
+		private void SelectNextItem(SearchDirectionHint dir)
+		{
+			// Not when selecting is prevented
+			if(preventselection) return;
+			
+			// Nothing selected?
+			if(list.SelectedItems.Count == 0)
+			{
+				// Select first
+				SelectFirstItem();
+			}
+			else
+			{
+				// Get selected item
+				ListViewItem lvi = list.SelectedItems[0];
+				Rectangle lvirect = list.GetItemRect(lvi.Index, ItemBoundsPortion.Entire);
+				Point spos = new Point(lvirect.Location.X + lvirect.Width / 2, lvirect.Y + lvirect.Height / 2);
+				
+				// Try finding 5 times in the given direction
+				for(int i = 0; i < 5; i++)
+				{
+					// Move point in given direction
+					switch(dir)
+					{
+						case SearchDirectionHint.Left: spos.X -= list.TileSize.Width / 2; break;
+						case SearchDirectionHint.Right: spos.X += list.TileSize.Width / 2; break;
+						case SearchDirectionHint.Up: spos.Y -= list.TileSize.Height / 2; break;
+						case SearchDirectionHint.Down: spos.Y += list.TileSize.Height / 2; break;
+					}
+					
+					// Test position
+					lvi = list.GetItemAt(spos.X, spos.Y);
+					if(lvi != null)
+					{
+						// Select item
+						list.SelectedItems.Clear();
+						lvi.Selected = true;
+						break;
+					}
+				}
+				
+				// Make selection visible
+				if(list.SelectedItems.Count > 0) list.SelectedItems[0].EnsureVisible();
+			}
+		}
+		
+		// This selectes the first item
+		private void SelectFirstItem()
+		{
+			// Not when selecting is prevented
+			if(preventselection) return;
+			
+			// Select first
+			if(list.Items.Count > 0)
+			{
+				list.SelectedItems.Clear();
+				ListViewItem lvi = list.GetItemAt(list.TileSize.Width / 2, list.TileSize.Height / 2);
+				if(lvi != null)
+				{
+					lvi.Selected = true;
+					lvi.EnsureVisible();
+				}
+			}
+		}
+		
+		// This adds a group
+		public ListViewGroup AddGroup(string name)
+		{
+			ListViewGroup grp = new ListViewGroup(name);
+			list.Groups.Add(grp);
+			return grp;
+		}
+
+		//mxd
+		public bool IsGroupCollapsed(ListViewGroup group)
+		{
+			if(!list.Groups.Contains(group)) return false;
+			return list.IsGroupCollapsed(group);
+		}
+
+		//mxd. This enables group collapsability and optionally collapses it
+		public void SetGroupCollapsed(ListViewGroup group, bool collapse)
+		{
+			if(!list.Groups.Contains(group)) return;
+			list.SetGroupCollapsed(group, collapse);
+		}
+		
+		// This begins adding items
+		public void BeginAdding(bool keepselectedindex) { BeginAdding(0, keepselectedindex); } //mxd
+		public void BeginAdding(int selectedlevel, bool keepselectedindex)
+		{
+			if(keepselectedindex && (list.SelectedItems.Count > 0))
+				keepselected = list.SelectedIndices[0];
+			else
+				keepselected = -1;
+
+			currentlevel = selectedlevel;
+			
+			// Clean list
+			items.Clear();
+			
+			// Stop updating
+			refreshtimer.Enabled = false;
+		}
+
+		// This ends adding items
+		public void EndAdding()
+		{
+			// Fill list with items
+			RefillList(true);
+
+			// Start updating
+			refreshtimer.Enabled = true;
+		}
+		
+		// This adds an item
+		public void Add(ImageData image, object tag, ListViewGroup group)
+		{
+			ImageBrowserItem i = new ImageBrowserItem(image, tag, uselongtexturenames); //mxd
+			i.ListGroup = group;
+			i.Group = group;
+			i.ToolTipText = image.Name; //mxd
+			items.Add(i);
+		}
+		
+		// This adds an item
+		public void Add(ImageData image, object tag, ListViewGroup group, string tooltiptext)
+		{
+			ImageBrowserItem i = new ImageBrowserItem(image, tag, uselongtexturenames); //mxd
+			i.ListGroup = group;
+			i.Group = group;
+			i.ToolTipText = tooltiptext;
+			items.Add(i);
+		}
+
+		// This fills the list based on the objectname filter
+		private void RefillList(bool selectfirst)
+		{
+			visibleitems = new List<ImageBrowserItem>();
+			
+			// Begin updating list
+			updating = true;
+			//list.SuspendLayout();
+			list.BeginUpdate();
+			
+			// Clear list first
+			// Group property of items will be set to null, we will restore it later
+			list.Items.Clear();
+
+			//mxd. Filtering by texture size?
+			int w = filterWidth.GetResult(-1);
+			int h = filterHeight.GetResult(-1);
+			
+			// Go for all items
+			ImageBrowserItem previtem = null; //mxd
+			for(int i = items.Count - 1; i > -1; i--)
+			{
+				// Add item if valid
+				items[i].ShowFullName = uselongtexturenames; //mxd
+				if(ValidateItem(items[i], previtem) && ValidateItemSize(items[i], w, h)) 
+				{
+					items[i].Group = items[i].ListGroup;
+					items[i].Selected = false;
+					visibleitems.Add(items[i]);
+					previtem = items[i];
+				}
+			}
+			
+			// Fill list
+			visibleitems.Sort();
+			ListViewItem[] array = new ListViewItem[visibleitems.Count];
+			for(int i = 0; i < visibleitems.Count; i++) array[i] = visibleitems[i];
+			list.Items.AddRange(array);
+			
+			// Done updating list
+			updating = false;
+			list.EndUpdate();
+			list.Invalidate();
+			//list.ResumeLayout();
+			
+			// Make selection?
+			if(!preventselection && (list.Items.Count > 0))
+			{
+				// Select specific item?
+				if(keepselected > -1)
+				{
+					list.Items[keepselected].Selected = true;
+					list.Items[keepselected].EnsureVisible();
+				}
+				// Select first item?
+				else if(selectfirst)
+				{
+					SelectFirstItem();
+				}
+			}
+			
+			// Raise event
+			if((SelectedItemChanged != null) && !preventselection) SelectedItemChanged();
+		}
+
+		// This validates an item
+		private bool ValidateItem(ImageBrowserItem item, ImageBrowserItem previtem)
+		{
+			//mxd. Don't show duplicate items
+			if(previtem != null && item.TextureName == previtem.TextureName && item.Group == previtem.Group) return false; //mxd
+			
+			//mxd. mixMode: 0 = All, 1 = Textures, 2 = Flats, 3 = Based on BrowseFlats
+			if(!splitter.Panel2Collapsed) 
+			{
+				if(mixMode == 1 && item.Icon.IsFlat) return false;
+				if(mixMode == 2 && !item.Icon.IsFlat) return false;
+				if(mixMode == 3 && (browseFlats != item.Icon.IsFlat)) return false;
+				if(!showtexturesfromsubdirs && item.Icon.Level > currentlevel) return false;
+			}
+
+			return item.Text.ToUpperInvariant().Contains(objectname.Text.ToUpperInvariant());
+		}
+
+		//mxd. This validates an item's texture size
+		private static bool ValidateItemSize(ImageBrowserItem i, int w, int h) 
+		{
+			if(!i.Icon.IsPreviewLoaded) return true;
+			if(w > 0 && i.Icon.Width != w) return false;
+			if(h > 0 && i.Icon.Height != h) return false;
+			return true;
+		}
+		
+		// This sends the focus to the textbox
+		public void FocusTextbox()
+		{
+			objectname.Focus();
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Controls/ImageBrowserControl.resx b/Source/Core/Controls/ImageBrowserControl.resx
new file mode 100644
index 0000000..86d95e5
--- /dev/null
+++ b/Source/Core/Controls/ImageBrowserControl.resx
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="splitter.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="list.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="refreshtimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>103, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Controls/ImageBrowserItem.cs b/Source/Core/Controls/ImageBrowserItem.cs
new file mode 100644
index 0000000..cb262cf
--- /dev/null
+++ b/Source/Core/Controls/ImageBrowserItem.cs
@@ -0,0 +1,190 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Data;
+using System.Drawing.Drawing2D;
+using SlimDX;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Controls
+{
+	internal class ImageBrowserItem : ListViewItem, IComparable<ImageBrowserItem>
+	{
+		#region ================== Constants
+
+		internal const int MAX_NAME_LENGTH = 14; //mxd
+
+		#endregion
+		
+		#region ================== Variables
+
+		// Display image and text
+		public readonly ImageData Icon;
+		private string imagesize; //mxd
+		private bool showfullname; //mxd
+		private static readonly StringFormat format = new StringFormat { Alignment = StringAlignment.Center }; //mxd
+		
+		// Group
+		private ListViewGroup listgroup;
+		
+		// Image cache
+		private bool imageloaded;
+		
+		#endregion
+
+		#region ================== Properties
+
+		public ListViewGroup ListGroup { get { return listgroup; } set { listgroup = value; } }
+		public bool IsPreviewLoaded { get { return imageloaded; } }
+		public bool ShowFullName { set { showfullname = value; UpdateName(); } }
+		public string TextureName { get { return showfullname ? Icon.Name : Icon.ShortName; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructors
+		public ImageBrowserItem(ImageData icon, object tag, bool showfullname)
+		{
+			// Initialize
+			this.Icon = icon;
+			this.Tag = tag;
+			this.showfullname = showfullname; //mxd
+			UpdateName(); //mxd
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+		
+		// This checks if a redraw is needed
+		public bool CheckRedrawNeeded()
+		{
+			UpdateName(); //mxd. Update texture size if needed
+			return (Icon.IsPreviewLoaded != imageloaded);
+		}
+		
+		// This draws the images
+		public void Draw(Graphics g, Rectangle bounds)
+		{
+			Brush forecolor;
+			Brush backcolor;
+
+			// Remember if the preview is loaded
+			imageloaded = Icon.IsPreviewLoaded;
+
+			// Drawing settings
+			g.CompositingQuality = CompositingQuality.HighSpeed;
+			g.InterpolationMode = InterpolationMode.NearestNeighbor;
+			g.SmoothingMode = SmoothingMode.HighSpeed;
+			g.PixelOffsetMode = PixelOffsetMode.None;
+
+			// Determine coordinates
+			SizeF textsize = g.MeasureString(Text, this.ListView.Font, bounds.Width * 2);
+			Rectangle imagerect = new Rectangle(bounds.Left + ((bounds.Width - General.Map.Data.Previews.MaxImageWidth) >> 1),
+				bounds.Top + ((bounds.Height - General.Map.Data.Previews.MaxImageHeight - (int)textsize.Height) >> 1),
+				General.Map.Data.Previews.MaxImageWidth, General.Map.Data.Previews.MaxImageHeight);
+			PointF textpos = new PointF(bounds.Left + (bounds.Width * 0.5f), bounds.Bottom - textsize.Height - 2);
+
+			// Determine colors
+			if(this.Selected)
+			{
+				// Highlighted
+				backcolor = new LinearGradientBrush(new Point(0, bounds.Top - 1), new Point(0, bounds.Bottom + 1),
+					AdjustedColor(SystemColors.Highlight, 0.2f),
+					AdjustedColor(SystemColors.Highlight, -0.1f));
+				forecolor = new SolidBrush(SystemColors.HighlightText);
+			}
+			else
+			{
+				// Normal
+				backcolor = new SolidBrush(base.ListView.BackColor);
+				forecolor = new SolidBrush(base.ListView.ForeColor);
+			}
+
+			// Draw!
+			g.FillRectangle(backcolor, bounds);
+			Icon.DrawPreview(g, imagerect.Location);
+			g.DrawString(Text, this.ListView.Font, forecolor, textpos, format);
+
+			//mxd. Dispose brushes
+			backcolor.Dispose();
+			forecolor.Dispose();
+
+			//mxd. Draw size label?
+			if(General.Settings.ShowTextureSizes && !string.IsNullOrEmpty(imagesize))
+			{
+				// Setup
+				Font sizefont = new Font(this.ListView.Font.FontFamily, this.ListView.Font.SizeInPoints - 1);
+				textsize = g.MeasureString(imagesize, sizefont, bounds.Width * 2);
+				textpos = new PointF(bounds.Left + textsize.Width / 2, bounds.Top + 1);
+				imagerect = new Rectangle(bounds.Left + 1, bounds.Top + 1, (int)textsize.Width, (int)textsize.Height);
+
+				// Draw
+				using(SolidBrush labelbg = new SolidBrush(Color.FromArgb(196, base.ListView.ForeColor)))
+				{
+					g.FillRectangle(labelbg, imagerect);
+				}
+				using(SolidBrush labelcolor = new SolidBrush(base.ListView.BackColor))
+				{
+					g.DrawString(imagesize, sizefont, labelcolor, textpos, format);
+				}
+			}
+		}
+
+		// This brightens or darkens a color
+		private static Color AdjustedColor(Color c, float amount)
+		{
+			Color4 cc = new Color4(c);
+			
+			// Adjust color
+			cc.Red = Saturate((cc.Red * (1f + amount)) + (amount * 0.5f));
+			cc.Green = Saturate((cc.Green * (1f + amount)) + (amount * 0.5f));
+			cc.Blue = Saturate((cc.Blue * (1f + amount)) + (amount * 0.5f));
+			
+			// Return result
+			return Color.FromArgb(cc.ToArgb());
+		}
+
+		// This clamps a value between 0 and 1
+		private static float Saturate(float v)
+		{
+			if(v < 0f) return 0f; else if(v > 1f) return 1f; else return v;
+		}
+
+		//mxd
+		private void UpdateName() 
+		{
+			Text = (showfullname ? Icon.DisplayName : Icon.ShortName);
+			if(General.Settings.ShowTextureSizes && Icon.IsPreviewLoaded)
+				imagesize = Math.Abs(Icon.ScaledWidth) + "x" + Math.Abs(Icon.ScaledHeight);
+		}
+
+		// Comparer
+		public int CompareTo(ImageBrowserItem other)
+		{
+			return this.Text.ToUpperInvariant().CompareTo(other.Text.ToUpperInvariant());
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Controls/ImageSelectorControl.Designer.cs b/Source/Core/Controls/ImageSelectorControl.Designer.cs
new file mode 100644
index 0000000..fb0a6e6
--- /dev/null
+++ b/Source/Core/Controls/ImageSelectorControl.Designer.cs
@@ -0,0 +1,147 @@
+namespace CodeImp.DoomBuilder.Controls
+{
+	partial class ImageSelectorControl
+	{
+		/// <summary> 
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Component Designer generated code
+
+		/// <summary> 
+		/// Required method for Designer support - do not modify 
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.components = new System.ComponentModel.Container();
+			this.preview = new System.Windows.Forms.Panel();
+			this.labelSize = new System.Windows.Forms.Label();
+			this.timer = new System.Windows.Forms.Timer(this.components);
+			this.tooltip = new System.Windows.Forms.ToolTip(this.components);
+			this.togglefullname = new System.Windows.Forms.Button();
+			this.name = new CodeImp.DoomBuilder.Controls.AutoSelectTextbox();
+			this.imagebox = new CodeImp.DoomBuilder.Controls.ConfigurablePictureBox();
+			this.preview.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.imagebox)).BeginInit();
+			this.SuspendLayout();
+			// 
+			// preview
+			// 
+			this.preview.BackColor = System.Drawing.SystemColors.AppWorkspace;
+			this.preview.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
+			this.preview.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+			this.preview.Controls.Add(this.togglefullname);
+			this.preview.Controls.Add(this.labelSize);
+			this.preview.Controls.Add(this.imagebox);
+			this.preview.Location = new System.Drawing.Point(0, 0);
+			this.preview.Name = "preview";
+			this.preview.Size = new System.Drawing.Size(68, 60);
+			this.preview.TabIndex = 1;
+			// 
+			// labelSize
+			// 
+			this.labelSize.AutoSize = true;
+			this.labelSize.BackColor = System.Drawing.SystemColors.ControlText;
+			this.labelSize.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.labelSize.ForeColor = System.Drawing.SystemColors.HighlightText;
+			this.labelSize.Location = new System.Drawing.Point(1, 1);
+			this.labelSize.MaximumSize = new System.Drawing.Size(0, 13);
+			this.labelSize.Name = "labelSize";
+			this.labelSize.Size = new System.Drawing.Size(48, 13);
+			this.labelSize.TabIndex = 0;
+			this.labelSize.Text = "128x128";
+			this.labelSize.Visible = false;
+			// 
+			// timer
+			// 
+			this.timer.Tick += new System.EventHandler(this.timer_Tick);
+			// 
+			// togglefullname
+			// 
+			this.togglefullname.BackColor = System.Drawing.Color.Transparent;
+			this.togglefullname.Image = global::CodeImp.DoomBuilder.Properties.Resources.Collapse;
+			this.togglefullname.Location = new System.Drawing.Point(43, 35);
+			this.togglefullname.Name = "togglefullname";
+			this.togglefullname.Size = new System.Drawing.Size(20, 20);
+			this.togglefullname.TabIndex = 3;
+			this.togglefullname.UseVisualStyleBackColor = false;
+			this.togglefullname.Visible = false;
+			this.togglefullname.Click += new System.EventHandler(this.togglefullname_Click);
+			// 
+			// name
+			// 
+			this.name.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest;
+			this.name.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.CustomSource;
+			this.name.Location = new System.Drawing.Point(0, 64);
+			this.name.MaxLength = 8;
+			this.name.Name = "name";
+			this.name.Size = new System.Drawing.Size(68, 20);
+			this.name.TabIndex = 2;
+			this.name.TextChanged += new System.EventHandler(this.name_TextChanged);
+			// 
+			// imagebox
+			// 
+			this.imagebox.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
+			this.imagebox.CompositingQuality = System.Drawing.Drawing2D.CompositingQuality.Default;
+			this.imagebox.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.imagebox.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.NearestNeighbor;
+			this.imagebox.Location = new System.Drawing.Point(0, 0);
+			this.imagebox.Name = "imagebox";
+			this.imagebox.PageUnit = System.Drawing.GraphicsUnit.Pixel;
+			this.imagebox.PixelOffsetMode = System.Drawing.Drawing2D.PixelOffsetMode.None;
+			this.imagebox.Size = new System.Drawing.Size(66, 58);
+			this.imagebox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
+			this.imagebox.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.Default;
+			this.imagebox.TabIndex = 3;
+			this.imagebox.TabStop = false;
+			this.imagebox.MouseLeave += new System.EventHandler(this.preview_MouseLeave);
+			this.imagebox.Click += new System.EventHandler(this.preview_Click);
+			this.imagebox.MouseDown += new System.Windows.Forms.MouseEventHandler(this.preview_MouseDown);
+			this.imagebox.MouseEnter += new System.EventHandler(this.preview_MouseEnter);
+			// 
+			// ImageSelectorControl
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.Controls.Add(this.name);
+			this.Controls.Add(this.preview);
+			this.Name = "ImageSelectorControl";
+			this.Size = new System.Drawing.Size(115, 136);
+			this.Layout += new System.Windows.Forms.LayoutEventHandler(this.ImageSelectorControl_Layout);
+			this.Resize += new System.EventHandler(this.ImageSelectorControl_Resize);
+			this.EnabledChanged += new System.EventHandler(this.ImageSelectorControl_EnabledChanged);
+			this.preview.ResumeLayout(false);
+			this.preview.PerformLayout();
+			((System.ComponentModel.ISupportInitialize)(this.imagebox)).EndInit();
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		protected System.Windows.Forms.Panel preview;
+		protected CodeImp.DoomBuilder.Controls.AutoSelectTextbox name;
+		private System.Windows.Forms.Label labelSize;
+		protected System.Windows.Forms.Timer timer;
+		private System.Windows.Forms.ToolTip tooltip;
+		private ConfigurablePictureBox imagebox;
+		private System.Windows.Forms.Button togglefullname;
+
+	}
+}
diff --git a/Source/Core/Controls/ImageSelectorControl.cs b/Source/Core/Controls/ImageSelectorControl.cs
new file mode 100644
index 0000000..4e5a6c4
--- /dev/null
+++ b/Source/Core/Controls/ImageSelectorControl.cs
@@ -0,0 +1,281 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Data;
+using SlimDX;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Controls
+{
+	/// <summary>
+	/// Abstract control that provides a list of images.
+	/// </summary>
+	public abstract partial class ImageSelectorControl : UserControl
+	{
+		#region ================== Variables
+
+		public event EventHandler OnValueChanged; //mxd
+		
+		private MouseButtons button;
+		private ImageData image; //mxd
+		private string previousimagename; //mxd
+		protected bool multipletextures; //mxd
+		protected bool usepreviews = true; //mxd
+		
+		#endregion
+
+		#region ================== Properties
+		
+		public string TextureName { get { return name.Text; } set { name.Text = value; } }
+		public bool UsePreviews { get { return usepreviews; } set { usepreviews = value; } } //mxd
+
+		[Browsable(false)]
+		public bool MultipleTextures { get { return multipletextures; } set { multipletextures = value; } }
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		// Constructor
+		protected ImageSelectorControl()
+		{
+			// Initialize
+			InitializeComponent();
+		}
+		
+		// Setup
+		public virtual void Initialize()
+		{
+			// set the max length of texture names
+			name.MaxLength = General.Map.Config.MaxTextureNameLength;
+			if(General.Settings.CapitalizeTextureNames) this.name.CharacterCasing = CharacterCasing.Upper; //mxd
+			labelSize.BackColor = Color.FromArgb(196, labelSize.BackColor);
+		}
+		
+		#endregion
+
+		#region ================== Events
+
+		// When resized
+		private void ImageSelectorControl_Resize(object sender, EventArgs e)
+		{
+			// Fixed size
+			preview.Width = this.ClientSize.Width;
+			preview.Height = this.ClientSize.Height - name.Height - 4;
+			name.Width = this.ClientSize.Width;
+			name.Top = this.ClientSize.Height - name.Height;
+			togglefullname.Left = preview.Right - togglefullname.Width - 1; //mxd
+			togglefullname.Top = preview.Bottom - togglefullname.Height - 1; //mxd
+		}
+		
+		// Layout change
+		private void ImageSelectorControl_Layout(object sender, LayoutEventArgs e)
+		{
+			ImageSelectorControl_Resize(sender, EventArgs.Empty);
+		}
+		
+		// Image clicked
+		private void preview_Click(object sender, EventArgs e)
+		{
+			imagebox.BackColor = SystemColors.Highlight;
+			switch(button)
+			{
+				case MouseButtons.Right: name.Text = "-"; break;
+				case MouseButtons.Left: name.Text = BrowseImage(name.Text); break;
+			}
+		}
+		
+		// Name text changed
+		private void name_TextChanged(object sender, EventArgs e)
+		{
+			// Show it centered
+			ShowPreview(FindImage(name.Text));
+
+			// Update tooltip (mxd)
+			tooltip.SetToolTip(imagebox, name.Text);
+		}
+		
+		// Mouse pressed
+		private void preview_MouseDown(object sender, MouseEventArgs e)
+		{
+			button = e.Button;
+			if((button == MouseButtons.Left) || ((button == MouseButtons.Right)))
+			{
+				imagebox.BackColor = AdjustedColor(SystemColors.Highlight, 0.2f);
+			}
+		}
+
+		// Mouse leaves
+		private void preview_MouseLeave(object sender, EventArgs e)
+		{
+			imagebox.BackColor = SystemColors.AppWorkspace;
+			imagebox.Highlighted = false;
+		}
+		
+		// Mouse enters
+		private void preview_MouseEnter(object sender, EventArgs e)
+		{
+			imagebox.BackColor = SystemColors.Highlight;
+			imagebox.Highlighted = true;
+		}
+
+		//mxd
+		private void timer_Tick(object sender, EventArgs e) 
+		{
+			Refresh();
+		}
+
+		//mxd
+		private void ImageSelectorControl_EnabledChanged(object sender, EventArgs e) 
+		{
+			labelSize.Visible = !(!General.Settings.ShowTextureSizes || !this.Enabled || string.IsNullOrEmpty(labelSize.Text));
+		}
+
+		//mxd
+		private void togglefullname_Click(object sender, EventArgs e)
+		{
+			// Toggle between short and full name
+			name.Text = (name.Text == image.ShortName ? image.Name : image.ShortName);
+
+			// Update icon and tooltip
+			UpdateToggleImageNameButton(image);
+		}
+		
+		#endregion
+
+		#region ================== Methods
+		
+		// This refreshes the control
+		new public void Refresh()
+		{
+			if(General.Map == null) return;
+			ShowPreview(FindImage(name.Text));
+			base.Refresh();
+		}
+
+		//mxd
+		public void StopUpdate()
+		{
+			timer.Stop();
+		}
+		
+		// This redraws the image preview
+		private void ShowPreview(Image image)
+		{
+			// Dispose old image
+			imagebox.Image = null;
+			
+			if(image != null)
+			{
+				// Show it centered
+				imagebox.Image = image;
+				imagebox.Refresh();
+			}
+
+			//mxd. Dispatch event
+			if(OnValueChanged != null && previousimagename != name.Text) 
+			{
+				previousimagename = name.Text;
+				OnValueChanged(this, EventArgs.Empty);
+			}
+		}
+
+		//mxd
+		protected void DisplayImageSize(float width, float height)
+		{
+			width = Math.Abs(width);
+			height = Math.Abs(height);
+			labelSize.Text = (width > 0 && height > 0) ? width + "x" + height : string.Empty;
+			ImageSelectorControl_EnabledChanged(this, EventArgs.Empty);
+		}
+		
+		// This must determine and return the image to show
+		protected abstract Image FindImage(string imagename);
+
+		// This must show the image browser and return the selected texture name
+		protected abstract string BrowseImage(string imagename);
+
+		protected void UpdateToggleImageNameButton(ImageData image)
+		{
+			this.image = image;
+			
+			// Update visibility
+			if(!General.Map.Config.UseLongTextureNames || image == null || !image.HasLongName) 
+			{
+				togglefullname.Visible = false;
+				return;
+			}
+
+			// Update icon and tooltip
+			togglefullname.Visible = true;
+			if(image.ShortName == name.Text)
+			{
+				togglefullname.Image = Properties.Resources.Expand;
+				tooltip.SetToolTip(togglefullname, "Switch to full name");
+			}
+			else
+			{
+				togglefullname.Image = Properties.Resources.Collapse;
+				tooltip.SetToolTip(togglefullname, "Switch to short name");
+			}
+		}
+
+		// This determines the result value
+		public string GetResult(string original)
+		{
+			// Anyting entered?
+			if(name.Text.Trim().Length > 0)
+			{
+				// Return the new value
+				return name.Text;
+			}
+
+			// Nothing given, keep original value
+			return original;
+		}
+
+		// This brightens or darkens a color
+		private static Color AdjustedColor(Color c, float amount)
+		{
+			Color4 cc = new Color4(c);
+
+			// Adjust color
+			cc.Red = Saturate((cc.Red * (1f + amount)) + (amount * 0.5f));
+			cc.Green = Saturate((cc.Green * (1f + amount)) + (amount * 0.5f));
+			cc.Blue = Saturate((cc.Blue * (1f + amount)) + (amount * 0.5f));
+
+			// Return result
+			return Color.FromArgb(cc.ToArgb());
+		}
+
+		// This clamps a value between 0 and 1
+		private static float Saturate(float v)
+		{
+			if(v < 0f) return 0f; 
+			if(v > 1f) return 1f; 
+			return v;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Controls/ImageSelectorControl.resx b/Source/Core/Controls/ImageSelectorControl.resx
new file mode 100644
index 0000000..086d92a
--- /dev/null
+++ b/Source/Core/Controls/ImageSelectorControl.resx
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="preview.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="timer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>97, 17</value>
+  </metadata>
+  <metadata name="name.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Controls/LinedefInfoPanel.Designer.cs b/Source/Core/Controls/LinedefInfoPanel.Designer.cs
new file mode 100644
index 0000000..119f622
--- /dev/null
+++ b/Source/Core/Controls/LinedefInfoPanel.Designer.cs
@@ -0,0 +1,1157 @@
+namespace CodeImp.DoomBuilder.Controls
+{
+	partial class LinedefInfoPanel
+	{
+		/// <summary> 
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Component Designer generated code
+
+		/// <summary> 
+		/// Required method for Designer support - do not modify 
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.actionlabel = new System.Windows.Forms.Label();
+			this.activationlabel = new System.Windows.Forms.Label();
+			this.taglabel = new System.Windows.Forms.Label();
+			this.anglelabel = new System.Windows.Forms.Label();
+			this.lengthlabel = new System.Windows.Forms.Label();
+			this.infopanel = new System.Windows.Forms.GroupBox();
+			this.activation = new System.Windows.Forms.Label();
+			this.unpegged = new System.Windows.Forms.Label();
+			this.peglabel = new System.Windows.Forms.Label();
+			this.arg5 = new System.Windows.Forms.Label();
+			this.arglbl5 = new System.Windows.Forms.Label();
+			this.arglbl4 = new System.Windows.Forms.Label();
+			this.arg4 = new System.Windows.Forms.Label();
+			this.arglbl3 = new System.Windows.Forms.Label();
+			this.arglbl2 = new System.Windows.Forms.Label();
+			this.arg3 = new System.Windows.Forms.Label();
+			this.arglbl1 = new System.Windows.Forms.Label();
+			this.arg2 = new System.Windows.Forms.Label();
+			this.backoffset = new System.Windows.Forms.Label();
+			this.arg1 = new System.Windows.Forms.Label();
+			this.backoffsetlabel = new System.Windows.Forms.Label();
+			this.frontoffset = new System.Windows.Forms.Label();
+			this.frontoffsetlabel = new System.Windows.Forms.Label();
+			this.tag = new System.Windows.Forms.Label();
+			this.angle = new System.Windows.Forms.Label();
+			this.length = new System.Windows.Forms.Label();
+			this.action = new System.Windows.Forms.Label();
+			this.frontpanel = new System.Windows.Forms.GroupBox();
+			this.flowLayoutPanelFront = new System.Windows.Forms.FlowLayoutPanel();
+			this.panelFrontTop = new System.Windows.Forms.Panel();
+			this.frontTopUDMFOffsetLabel = new System.Windows.Forms.Label();
+			this.frontTopUDMFOffset = new System.Windows.Forms.Label();
+			this.frontTopUDMFScaleLabel = new System.Windows.Forms.Label();
+			this.frontTopUDMFScale = new System.Windows.Forms.Label();
+			this.fronthightex = new System.Windows.Forms.Panel();
+			this.labelTextureFrontTop = new System.Windows.Forms.Label();
+			this.fronthighname = new System.Windows.Forms.Label();
+			this.panelFrontMid = new System.Windows.Forms.Panel();
+			this.frontMidUDMFOffsetLabel = new System.Windows.Forms.Label();
+			this.frontMidUDMFOffset = new System.Windows.Forms.Label();
+			this.frontMidUDMFScaleLabel = new System.Windows.Forms.Label();
+			this.frontMidUDMFScale = new System.Windows.Forms.Label();
+			this.frontmidtex = new System.Windows.Forms.Panel();
+			this.labelTextureFrontMid = new System.Windows.Forms.Label();
+			this.frontmidname = new System.Windows.Forms.Label();
+			this.panelFrontLow = new System.Windows.Forms.Panel();
+			this.frontBottomUDMFOffsetLabel = new System.Windows.Forms.Label();
+			this.frontBottomUDMFOffset = new System.Windows.Forms.Label();
+			this.frontBottomUDMFScaleLabel = new System.Windows.Forms.Label();
+			this.frontBottomUDMFScale = new System.Windows.Forms.Label();
+			this.frontlowtex = new System.Windows.Forms.Panel();
+			this.labelTextureFrontBottom = new System.Windows.Forms.Label();
+			this.frontlowname = new System.Windows.Forms.Label();
+			this.backpanel = new System.Windows.Forms.GroupBox();
+			this.flowLayoutPanelBack = new System.Windows.Forms.FlowLayoutPanel();
+			this.panelBackTop = new System.Windows.Forms.Panel();
+			this.backTopUDMFOffsetLabel = new System.Windows.Forms.Label();
+			this.backTopUDMFOffset = new System.Windows.Forms.Label();
+			this.backTopUDMFScaleLabel = new System.Windows.Forms.Label();
+			this.backTopUDMFScale = new System.Windows.Forms.Label();
+			this.backhightex = new System.Windows.Forms.Panel();
+			this.labelTextureBackTop = new System.Windows.Forms.Label();
+			this.backhighname = new System.Windows.Forms.Label();
+			this.panelBackMid = new System.Windows.Forms.Panel();
+			this.backMidUDMFOffsetLabel = new System.Windows.Forms.Label();
+			this.backMidUDMFOffset = new System.Windows.Forms.Label();
+			this.backMidUDMFScaleLabel = new System.Windows.Forms.Label();
+			this.backMidUDMFScale = new System.Windows.Forms.Label();
+			this.backmidtex = new System.Windows.Forms.Panel();
+			this.labelTextureBackMid = new System.Windows.Forms.Label();
+			this.backmidname = new System.Windows.Forms.Label();
+			this.panelBackLow = new System.Windows.Forms.Panel();
+			this.backBottomUDMFOffsetLabel = new System.Windows.Forms.Label();
+			this.backBottomUDMFOffset = new System.Windows.Forms.Label();
+			this.backBottomUDMFScaleLabel = new System.Windows.Forms.Label();
+			this.backBottomUDMFScale = new System.Windows.Forms.Label();
+			this.backlowtex = new System.Windows.Forms.Panel();
+			this.labelTextureBackBottom = new System.Windows.Forms.Label();
+			this.backlowname = new System.Windows.Forms.Label();
+			this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
+			this.flagsPanel = new System.Windows.Forms.GroupBox();
+			this.flags = new System.Windows.Forms.ListView();
+			this.infopanel.SuspendLayout();
+			this.frontpanel.SuspendLayout();
+			this.flowLayoutPanelFront.SuspendLayout();
+			this.panelFrontTop.SuspendLayout();
+			this.fronthightex.SuspendLayout();
+			this.panelFrontMid.SuspendLayout();
+			this.frontmidtex.SuspendLayout();
+			this.panelFrontLow.SuspendLayout();
+			this.frontlowtex.SuspendLayout();
+			this.backpanel.SuspendLayout();
+			this.flowLayoutPanelBack.SuspendLayout();
+			this.panelBackTop.SuspendLayout();
+			this.backhightex.SuspendLayout();
+			this.panelBackMid.SuspendLayout();
+			this.backmidtex.SuspendLayout();
+			this.panelBackLow.SuspendLayout();
+			this.backlowtex.SuspendLayout();
+			this.flowLayoutPanel1.SuspendLayout();
+			this.flagsPanel.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// actionlabel
+			// 
+			this.actionlabel.Location = new System.Drawing.Point(8, 19);
+			this.actionlabel.Name = "actionlabel";
+			this.actionlabel.Size = new System.Drawing.Size(58, 14);
+			this.actionlabel.TabIndex = 0;
+			this.actionlabel.Text = "Action:";
+			this.actionlabel.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// activationlabel
+			// 
+			this.activationlabel.Location = new System.Drawing.Point(8, 34);
+			this.activationlabel.Name = "activationlabel";
+			this.activationlabel.Size = new System.Drawing.Size(58, 14);
+			this.activationlabel.TabIndex = 30;
+			this.activationlabel.Text = "Activation:";
+			this.activationlabel.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// taglabel
+			// 
+			this.taglabel.Location = new System.Drawing.Point(8, 79);
+			this.taglabel.Name = "taglabel";
+			this.taglabel.Size = new System.Drawing.Size(58, 14);
+			this.taglabel.TabIndex = 4;
+			this.taglabel.Text = "Tag:";
+			this.taglabel.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// anglelabel
+			// 
+			this.anglelabel.Location = new System.Drawing.Point(8, 64);
+			this.anglelabel.Name = "anglelabel";
+			this.anglelabel.Size = new System.Drawing.Size(58, 14);
+			this.anglelabel.TabIndex = 3;
+			this.anglelabel.Text = "Angle:";
+			this.anglelabel.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// lengthlabel
+			// 
+			this.lengthlabel.Location = new System.Drawing.Point(8, 49);
+			this.lengthlabel.Name = "lengthlabel";
+			this.lengthlabel.Size = new System.Drawing.Size(58, 14);
+			this.lengthlabel.TabIndex = 2;
+			this.lengthlabel.Text = "Length:";
+			this.lengthlabel.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// infopanel
+			// 
+			this.infopanel.Controls.Add(this.activation);
+			this.infopanel.Controls.Add(this.activationlabel);
+			this.infopanel.Controls.Add(this.unpegged);
+			this.infopanel.Controls.Add(this.peglabel);
+			this.infopanel.Controls.Add(this.arg5);
+			this.infopanel.Controls.Add(this.arglbl5);
+			this.infopanel.Controls.Add(this.arglbl4);
+			this.infopanel.Controls.Add(this.arg4);
+			this.infopanel.Controls.Add(this.arglbl3);
+			this.infopanel.Controls.Add(this.arglbl2);
+			this.infopanel.Controls.Add(this.arg3);
+			this.infopanel.Controls.Add(this.arglbl1);
+			this.infopanel.Controls.Add(this.arg2);
+			this.infopanel.Controls.Add(this.backoffset);
+			this.infopanel.Controls.Add(this.arg1);
+			this.infopanel.Controls.Add(this.backoffsetlabel);
+			this.infopanel.Controls.Add(this.frontoffset);
+			this.infopanel.Controls.Add(this.frontoffsetlabel);
+			this.infopanel.Controls.Add(this.tag);
+			this.infopanel.Controls.Add(this.angle);
+			this.infopanel.Controls.Add(this.length);
+			this.infopanel.Controls.Add(this.taglabel);
+			this.infopanel.Controls.Add(this.anglelabel);
+			this.infopanel.Controls.Add(this.lengthlabel);
+			this.infopanel.Controls.Add(this.action);
+			this.infopanel.Controls.Add(this.actionlabel);
+			this.infopanel.Location = new System.Drawing.Point(0, 0);
+			this.infopanel.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
+			this.infopanel.Name = "infopanel";
+			this.infopanel.Size = new System.Drawing.Size(461, 100);
+			this.infopanel.TabIndex = 1;
+			this.infopanel.TabStop = false;
+			this.infopanel.Text = " Linedef ";
+			// 
+			// activation
+			// 
+			this.activation.AutoSize = true;
+			this.activation.BackColor = System.Drawing.Color.Transparent;
+			this.activation.Location = new System.Drawing.Point(66, 34);
+			this.activation.Name = "activation";
+			this.activation.Size = new System.Drawing.Size(162, 13);
+			this.activation.TabIndex = 31;
+			this.activation.Text = "0 - When player does a barrel roll";
+			this.activation.UseMnemonic = false;
+			// 
+			// unpegged
+			// 
+			this.unpegged.AutoSize = true;
+			this.unpegged.Location = new System.Drawing.Point(180, 49);
+			this.unpegged.Name = "unpegged";
+			this.unpegged.Size = new System.Drawing.Size(33, 13);
+			this.unpegged.TabIndex = 29;
+			this.unpegged.Text = "None";
+			this.unpegged.UseMnemonic = false;
+			// 
+			// peglabel
+			// 
+			this.peglabel.AutoSize = true;
+			this.peglabel.Location = new System.Drawing.Point(118, 49);
+			this.peglabel.Name = "peglabel";
+			this.peglabel.Size = new System.Drawing.Size(60, 13);
+			this.peglabel.TabIndex = 28;
+			this.peglabel.Text = "Unpegged:";
+			// 
+			// arg5
+			// 
+			this.arg5.AutoEllipsis = true;
+			this.arg5.Location = new System.Drawing.Point(373, 79);
+			this.arg5.Name = "arg5";
+			this.arg5.Size = new System.Drawing.Size(83, 14);
+			this.arg5.TabIndex = 27;
+			this.arg5.Text = "Arg 1:";
+			this.arg5.UseMnemonic = false;
+			// 
+			// arglbl5
+			// 
+			this.arglbl5.AutoEllipsis = true;
+			this.arglbl5.BackColor = System.Drawing.Color.Transparent;
+			this.arglbl5.Location = new System.Drawing.Point(246, 79);
+			this.arglbl5.Name = "arglbl5";
+			this.arglbl5.Size = new System.Drawing.Size(121, 14);
+			this.arglbl5.TabIndex = 22;
+			this.arglbl5.Text = "Arg 1:";
+			this.arglbl5.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			this.arglbl5.UseMnemonic = false;
+			// 
+			// arglbl4
+			// 
+			this.arglbl4.AutoEllipsis = true;
+			this.arglbl4.BackColor = System.Drawing.Color.Transparent;
+			this.arglbl4.Location = new System.Drawing.Point(246, 64);
+			this.arglbl4.Name = "arglbl4";
+			this.arglbl4.Size = new System.Drawing.Size(121, 14);
+			this.arglbl4.TabIndex = 21;
+			this.arglbl4.Text = "Arg 1:";
+			this.arglbl4.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			this.arglbl4.UseMnemonic = false;
+			// 
+			// arg4
+			// 
+			this.arg4.AutoEllipsis = true;
+			this.arg4.Location = new System.Drawing.Point(373, 64);
+			this.arg4.Name = "arg4";
+			this.arg4.Size = new System.Drawing.Size(83, 14);
+			this.arg4.TabIndex = 26;
+			this.arg4.Text = "Arg 1:";
+			this.arg4.UseMnemonic = false;
+			// 
+			// arglbl3
+			// 
+			this.arglbl3.AutoEllipsis = true;
+			this.arglbl3.BackColor = System.Drawing.Color.Transparent;
+			this.arglbl3.Location = new System.Drawing.Point(246, 49);
+			this.arglbl3.Name = "arglbl3";
+			this.arglbl3.Size = new System.Drawing.Size(121, 14);
+			this.arglbl3.TabIndex = 20;
+			this.arglbl3.Text = "Arg 1:";
+			this.arglbl3.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			this.arglbl3.UseMnemonic = false;
+			// 
+			// arglbl2
+			// 
+			this.arglbl2.AutoEllipsis = true;
+			this.arglbl2.BackColor = System.Drawing.Color.Transparent;
+			this.arglbl2.Location = new System.Drawing.Point(246, 34);
+			this.arglbl2.Name = "arglbl2";
+			this.arglbl2.Size = new System.Drawing.Size(121, 14);
+			this.arglbl2.TabIndex = 19;
+			this.arglbl2.Text = "Arg 1:";
+			this.arglbl2.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			this.arglbl2.UseMnemonic = false;
+			// 
+			// arg3
+			// 
+			this.arg3.AutoEllipsis = true;
+			this.arg3.Location = new System.Drawing.Point(373, 49);
+			this.arg3.Name = "arg3";
+			this.arg3.Size = new System.Drawing.Size(83, 14);
+			this.arg3.TabIndex = 25;
+			this.arg3.Text = "Arg 1:";
+			this.arg3.UseMnemonic = false;
+			// 
+			// arglbl1
+			// 
+			this.arglbl1.AutoEllipsis = true;
+			this.arglbl1.BackColor = System.Drawing.Color.Transparent;
+			this.arglbl1.Location = new System.Drawing.Point(246, 19);
+			this.arglbl1.Name = "arglbl1";
+			this.arglbl1.Size = new System.Drawing.Size(121, 14);
+			this.arglbl1.TabIndex = 18;
+			this.arglbl1.Text = "Arg 1:";
+			this.arglbl1.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			this.arglbl1.UseMnemonic = false;
+			// 
+			// arg2
+			// 
+			this.arg2.AutoEllipsis = true;
+			this.arg2.Location = new System.Drawing.Point(373, 34);
+			this.arg2.Name = "arg2";
+			this.arg2.Size = new System.Drawing.Size(83, 14);
+			this.arg2.TabIndex = 24;
+			this.arg2.Text = "Arg 1:";
+			this.arg2.UseMnemonic = false;
+			// 
+			// backoffset
+			// 
+			this.backoffset.AutoSize = true;
+			this.backoffset.Location = new System.Drawing.Point(180, 79);
+			this.backoffset.Name = "backoffset";
+			this.backoffset.Size = new System.Drawing.Size(49, 13);
+			this.backoffset.TabIndex = 17;
+			this.backoffset.Text = "100, 100";
+			// 
+			// arg1
+			// 
+			this.arg1.AutoEllipsis = true;
+			this.arg1.Location = new System.Drawing.Point(373, 19);
+			this.arg1.Name = "arg1";
+			this.arg1.Size = new System.Drawing.Size(83, 14);
+			this.arg1.TabIndex = 23;
+			this.arg1.Text = "Arg 1:";
+			this.arg1.UseMnemonic = false;
+			// 
+			// backoffsetlabel
+			// 
+			this.backoffsetlabel.Location = new System.Drawing.Point(107, 79);
+			this.backoffsetlabel.Name = "backoffsetlabel";
+			this.backoffsetlabel.Size = new System.Drawing.Size(70, 14);
+			this.backoffsetlabel.TabIndex = 14;
+			this.backoffsetlabel.Text = "Back offset:";
+			this.backoffsetlabel.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// frontoffset
+			// 
+			this.frontoffset.AutoSize = true;
+			this.frontoffset.Location = new System.Drawing.Point(180, 64);
+			this.frontoffset.Name = "frontoffset";
+			this.frontoffset.Size = new System.Drawing.Size(49, 13);
+			this.frontoffset.TabIndex = 11;
+			this.frontoffset.Text = "100, 100";
+			// 
+			// frontoffsetlabel
+			// 
+			this.frontoffsetlabel.Location = new System.Drawing.Point(107, 64);
+			this.frontoffsetlabel.Name = "frontoffsetlabel";
+			this.frontoffsetlabel.Size = new System.Drawing.Size(70, 14);
+			this.frontoffsetlabel.TabIndex = 8;
+			this.frontoffsetlabel.Text = "Front offset:";
+			this.frontoffsetlabel.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// tag
+			// 
+			this.tag.AutoSize = true;
+			this.tag.Location = new System.Drawing.Point(66, 79);
+			this.tag.Name = "tag";
+			this.tag.Size = new System.Drawing.Size(13, 13);
+			this.tag.TabIndex = 7;
+			this.tag.Text = "0";
+			// 
+			// angle
+			// 
+			this.angle.AutoSize = true;
+			this.angle.Location = new System.Drawing.Point(66, 64);
+			this.angle.Name = "angle";
+			this.angle.Size = new System.Drawing.Size(25, 13);
+			this.angle.TabIndex = 6;
+			this.angle.Text = "360";
+			// 
+			// length
+			// 
+			this.length.AutoSize = true;
+			this.length.Location = new System.Drawing.Point(66, 49);
+			this.length.Name = "length";
+			this.length.Size = new System.Drawing.Size(31, 13);
+			this.length.TabIndex = 5;
+			this.length.Text = "1024";
+			// 
+			// action
+			// 
+			this.action.AutoSize = true;
+			this.action.BackColor = System.Drawing.Color.Transparent;
+			this.action.Location = new System.Drawing.Point(66, 19);
+			this.action.Name = "action";
+			this.action.Size = new System.Drawing.Size(188, 13);
+			this.action.TabIndex = 1;
+			this.action.Text = "0 - Big Door that goes Wobbly Wobbly";
+			this.action.UseMnemonic = false;
+			// 
+			// frontpanel
+			// 
+			this.frontpanel.Controls.Add(this.flowLayoutPanelFront);
+			this.frontpanel.Location = new System.Drawing.Point(464, 0);
+			this.frontpanel.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
+			this.frontpanel.Name = "frontpanel";
+			this.frontpanel.Size = new System.Drawing.Size(495, 100);
+			this.frontpanel.TabIndex = 2;
+			this.frontpanel.TabStop = false;
+			this.frontpanel.Text = " Front ";
+			// 
+			// flowLayoutPanelFront
+			// 
+			this.flowLayoutPanelFront.Controls.Add(this.panelFrontTop);
+			this.flowLayoutPanelFront.Controls.Add(this.panelFrontMid);
+			this.flowLayoutPanelFront.Controls.Add(this.panelFrontLow);
+			this.flowLayoutPanelFront.Location = new System.Drawing.Point(6, 14);
+			this.flowLayoutPanelFront.Margin = new System.Windows.Forms.Padding(0);
+			this.flowLayoutPanelFront.Name = "flowLayoutPanelFront";
+			this.flowLayoutPanelFront.Size = new System.Drawing.Size(484, 82);
+			this.flowLayoutPanelFront.TabIndex = 13;
+			this.flowLayoutPanelFront.WrapContents = false;
+			// 
+			// panelFrontTop
+			// 
+			this.panelFrontTop.Controls.Add(this.frontTopUDMFOffsetLabel);
+			this.panelFrontTop.Controls.Add(this.frontTopUDMFOffset);
+			this.panelFrontTop.Controls.Add(this.frontTopUDMFScaleLabel);
+			this.panelFrontTop.Controls.Add(this.frontTopUDMFScale);
+			this.panelFrontTop.Controls.Add(this.fronthightex);
+			this.panelFrontTop.Controls.Add(this.fronthighname);
+			this.panelFrontTop.Location = new System.Drawing.Point(0, 0);
+			this.panelFrontTop.Margin = new System.Windows.Forms.Padding(0);
+			this.panelFrontTop.Name = "panelFrontTop";
+			this.panelFrontTop.Size = new System.Drawing.Size(160, 82);
+			this.panelFrontTop.TabIndex = 5;
+			// 
+			// frontTopUDMFOffsetLabel
+			// 
+			this.frontTopUDMFOffsetLabel.Location = new System.Drawing.Point(71, 3);
+			this.frontTopUDMFOffsetLabel.Name = "frontTopUDMFOffsetLabel";
+			this.frontTopUDMFOffsetLabel.Size = new System.Drawing.Size(41, 14);
+			this.frontTopUDMFOffsetLabel.TabIndex = 7;
+			this.frontTopUDMFOffsetLabel.Text = "Offset:";
+			this.frontTopUDMFOffsetLabel.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// frontTopUDMFOffset
+			// 
+			this.frontTopUDMFOffset.AutoSize = true;
+			this.frontTopUDMFOffset.Location = new System.Drawing.Point(118, 2);
+			this.frontTopUDMFOffset.Name = "frontTopUDMFOffset";
+			this.frontTopUDMFOffset.Size = new System.Drawing.Size(25, 13);
+			this.frontTopUDMFOffset.TabIndex = 9;
+			this.frontTopUDMFOffset.Text = "--, --";
+			// 
+			// frontTopUDMFScaleLabel
+			// 
+			this.frontTopUDMFScaleLabel.Location = new System.Drawing.Point(71, 20);
+			this.frontTopUDMFScaleLabel.Name = "frontTopUDMFScaleLabel";
+			this.frontTopUDMFScaleLabel.Size = new System.Drawing.Size(41, 14);
+			this.frontTopUDMFScaleLabel.TabIndex = 8;
+			this.frontTopUDMFScaleLabel.Text = "Scale:";
+			this.frontTopUDMFScaleLabel.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// frontTopUDMFScale
+			// 
+			this.frontTopUDMFScale.AutoSize = true;
+			this.frontTopUDMFScale.Location = new System.Drawing.Point(118, 20);
+			this.frontTopUDMFScale.Name = "frontTopUDMFScale";
+			this.frontTopUDMFScale.Size = new System.Drawing.Size(25, 13);
+			this.frontTopUDMFScale.TabIndex = 10;
+			this.frontTopUDMFScale.Text = "--, --";
+			// 
+			// fronthightex
+			// 
+			this.fronthightex.BackColor = System.Drawing.SystemColors.AppWorkspace;
+			this.fronthightex.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
+			this.fronthightex.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+			this.fronthightex.Controls.Add(this.labelTextureFrontTop);
+			this.fronthightex.Location = new System.Drawing.Point(3, 0);
+			this.fronthightex.Name = "fronthightex";
+			this.fronthightex.Size = new System.Drawing.Size(64, 64);
+			this.fronthightex.TabIndex = 0;
+			// 
+			// labelTextureFrontTop
+			// 
+			this.labelTextureFrontTop.AutoSize = true;
+			this.labelTextureFrontTop.BackColor = System.Drawing.Color.Black;
+			this.labelTextureFrontTop.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.labelTextureFrontTop.ForeColor = System.Drawing.Color.White;
+			this.labelTextureFrontTop.Location = new System.Drawing.Point(1, 1);
+			this.labelTextureFrontTop.MaximumSize = new System.Drawing.Size(0, 13);
+			this.labelTextureFrontTop.Name = "labelTextureFrontTop";
+			this.labelTextureFrontTop.Size = new System.Drawing.Size(48, 13);
+			this.labelTextureFrontTop.TabIndex = 0;
+			this.labelTextureFrontTop.Text = "128x128";
+			// 
+			// fronthighname
+			// 
+			this.fronthighname.AutoSize = true;
+			this.fronthighname.BackColor = System.Drawing.SystemColors.Control;
+			this.fronthighname.Location = new System.Drawing.Point(3, 67);
+			this.fronthighname.Name = "fronthighname";
+			this.fronthighname.Size = new System.Drawing.Size(73, 13);
+			this.fronthighname.TabIndex = 1;
+			this.fronthighname.Text = "BROWNHUG";
+			this.fronthighname.UseMnemonic = false;
+			// 
+			// panelFrontMid
+			// 
+			this.panelFrontMid.Controls.Add(this.frontMidUDMFOffsetLabel);
+			this.panelFrontMid.Controls.Add(this.frontMidUDMFOffset);
+			this.panelFrontMid.Controls.Add(this.frontMidUDMFScaleLabel);
+			this.panelFrontMid.Controls.Add(this.frontMidUDMFScale);
+			this.panelFrontMid.Controls.Add(this.frontmidtex);
+			this.panelFrontMid.Controls.Add(this.frontmidname);
+			this.panelFrontMid.Location = new System.Drawing.Point(160, 0);
+			this.panelFrontMid.Margin = new System.Windows.Forms.Padding(0);
+			this.panelFrontMid.Name = "panelFrontMid";
+			this.panelFrontMid.Size = new System.Drawing.Size(160, 82);
+			this.panelFrontMid.TabIndex = 7;
+			// 
+			// frontMidUDMFOffsetLabel
+			// 
+			this.frontMidUDMFOffsetLabel.Location = new System.Drawing.Point(71, 3);
+			this.frontMidUDMFOffsetLabel.Name = "frontMidUDMFOffsetLabel";
+			this.frontMidUDMFOffsetLabel.Size = new System.Drawing.Size(41, 14);
+			this.frontMidUDMFOffsetLabel.TabIndex = 7;
+			this.frontMidUDMFOffsetLabel.Text = "Offset:";
+			this.frontMidUDMFOffsetLabel.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// frontMidUDMFOffset
+			// 
+			this.frontMidUDMFOffset.AutoSize = true;
+			this.frontMidUDMFOffset.Location = new System.Drawing.Point(118, 3);
+			this.frontMidUDMFOffset.Name = "frontMidUDMFOffset";
+			this.frontMidUDMFOffset.Size = new System.Drawing.Size(25, 13);
+			this.frontMidUDMFOffset.TabIndex = 9;
+			this.frontMidUDMFOffset.Text = "--, --";
+			// 
+			// frontMidUDMFScaleLabel
+			// 
+			this.frontMidUDMFScaleLabel.Location = new System.Drawing.Point(71, 20);
+			this.frontMidUDMFScaleLabel.Name = "frontMidUDMFScaleLabel";
+			this.frontMidUDMFScaleLabel.Size = new System.Drawing.Size(41, 14);
+			this.frontMidUDMFScaleLabel.TabIndex = 8;
+			this.frontMidUDMFScaleLabel.Text = "Scale:";
+			this.frontMidUDMFScaleLabel.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// frontMidUDMFScale
+			// 
+			this.frontMidUDMFScale.AutoSize = true;
+			this.frontMidUDMFScale.Location = new System.Drawing.Point(118, 20);
+			this.frontMidUDMFScale.Name = "frontMidUDMFScale";
+			this.frontMidUDMFScale.Size = new System.Drawing.Size(25, 13);
+			this.frontMidUDMFScale.TabIndex = 10;
+			this.frontMidUDMFScale.Text = "--, --";
+			// 
+			// frontmidtex
+			// 
+			this.frontmidtex.BackColor = System.Drawing.SystemColors.AppWorkspace;
+			this.frontmidtex.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
+			this.frontmidtex.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+			this.frontmidtex.Controls.Add(this.labelTextureFrontMid);
+			this.frontmidtex.Location = new System.Drawing.Point(3, 0);
+			this.frontmidtex.Name = "frontmidtex";
+			this.frontmidtex.Size = new System.Drawing.Size(64, 64);
+			this.frontmidtex.TabIndex = 2;
+			// 
+			// labelTextureFrontMid
+			// 
+			this.labelTextureFrontMid.AutoSize = true;
+			this.labelTextureFrontMid.BackColor = System.Drawing.Color.Black;
+			this.labelTextureFrontMid.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.labelTextureFrontMid.ForeColor = System.Drawing.Color.White;
+			this.labelTextureFrontMid.Location = new System.Drawing.Point(1, 1);
+			this.labelTextureFrontMid.MaximumSize = new System.Drawing.Size(0, 13);
+			this.labelTextureFrontMid.Name = "labelTextureFrontMid";
+			this.labelTextureFrontMid.Size = new System.Drawing.Size(48, 13);
+			this.labelTextureFrontMid.TabIndex = 1;
+			this.labelTextureFrontMid.Text = "128x128";
+			// 
+			// frontmidname
+			// 
+			this.frontmidname.AutoSize = true;
+			this.frontmidname.BackColor = System.Drawing.SystemColors.Control;
+			this.frontmidname.Location = new System.Drawing.Point(3, 67);
+			this.frontmidname.Name = "frontmidname";
+			this.frontmidname.Size = new System.Drawing.Size(73, 13);
+			this.frontmidname.TabIndex = 3;
+			this.frontmidname.Text = "BROWNHUG";
+			this.frontmidname.UseMnemonic = false;
+			// 
+			// panelFrontLow
+			// 
+			this.panelFrontLow.Controls.Add(this.frontBottomUDMFOffsetLabel);
+			this.panelFrontLow.Controls.Add(this.frontBottomUDMFOffset);
+			this.panelFrontLow.Controls.Add(this.frontBottomUDMFScaleLabel);
+			this.panelFrontLow.Controls.Add(this.frontBottomUDMFScale);
+			this.panelFrontLow.Controls.Add(this.frontlowtex);
+			this.panelFrontLow.Controls.Add(this.frontlowname);
+			this.panelFrontLow.Location = new System.Drawing.Point(320, 0);
+			this.panelFrontLow.Margin = new System.Windows.Forms.Padding(0);
+			this.panelFrontLow.Name = "panelFrontLow";
+			this.panelFrontLow.Size = new System.Drawing.Size(160, 82);
+			this.panelFrontLow.TabIndex = 12;
+			// 
+			// frontBottomUDMFOffsetLabel
+			// 
+			this.frontBottomUDMFOffsetLabel.Location = new System.Drawing.Point(71, 3);
+			this.frontBottomUDMFOffsetLabel.Name = "frontBottomUDMFOffsetLabel";
+			this.frontBottomUDMFOffsetLabel.Size = new System.Drawing.Size(41, 14);
+			this.frontBottomUDMFOffsetLabel.TabIndex = 7;
+			this.frontBottomUDMFOffsetLabel.Text = "Offset:";
+			this.frontBottomUDMFOffsetLabel.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// frontBottomUDMFOffset
+			// 
+			this.frontBottomUDMFOffset.AutoSize = true;
+			this.frontBottomUDMFOffset.Location = new System.Drawing.Point(118, 3);
+			this.frontBottomUDMFOffset.Name = "frontBottomUDMFOffset";
+			this.frontBottomUDMFOffset.Size = new System.Drawing.Size(25, 13);
+			this.frontBottomUDMFOffset.TabIndex = 9;
+			this.frontBottomUDMFOffset.Text = "--, --";
+			// 
+			// frontBottomUDMFScaleLabel
+			// 
+			this.frontBottomUDMFScaleLabel.Location = new System.Drawing.Point(71, 20);
+			this.frontBottomUDMFScaleLabel.Name = "frontBottomUDMFScaleLabel";
+			this.frontBottomUDMFScaleLabel.Size = new System.Drawing.Size(41, 14);
+			this.frontBottomUDMFScaleLabel.TabIndex = 8;
+			this.frontBottomUDMFScaleLabel.Text = "Scale:";
+			this.frontBottomUDMFScaleLabel.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// frontBottomUDMFScale
+			// 
+			this.frontBottomUDMFScale.AutoSize = true;
+			this.frontBottomUDMFScale.Location = new System.Drawing.Point(118, 20);
+			this.frontBottomUDMFScale.Name = "frontBottomUDMFScale";
+			this.frontBottomUDMFScale.Size = new System.Drawing.Size(25, 13);
+			this.frontBottomUDMFScale.TabIndex = 10;
+			this.frontBottomUDMFScale.Text = "--, --";
+			// 
+			// frontlowtex
+			// 
+			this.frontlowtex.BackColor = System.Drawing.SystemColors.AppWorkspace;
+			this.frontlowtex.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
+			this.frontlowtex.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+			this.frontlowtex.Controls.Add(this.labelTextureFrontBottom);
+			this.frontlowtex.Location = new System.Drawing.Point(3, 0);
+			this.frontlowtex.Name = "frontlowtex";
+			this.frontlowtex.Size = new System.Drawing.Size(64, 64);
+			this.frontlowtex.TabIndex = 4;
+			// 
+			// labelTextureFrontBottom
+			// 
+			this.labelTextureFrontBottom.AutoSize = true;
+			this.labelTextureFrontBottom.BackColor = System.Drawing.Color.Black;
+			this.labelTextureFrontBottom.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.labelTextureFrontBottom.ForeColor = System.Drawing.Color.White;
+			this.labelTextureFrontBottom.Location = new System.Drawing.Point(1, 1);
+			this.labelTextureFrontBottom.MaximumSize = new System.Drawing.Size(0, 13);
+			this.labelTextureFrontBottom.Name = "labelTextureFrontBottom";
+			this.labelTextureFrontBottom.Size = new System.Drawing.Size(48, 13);
+			this.labelTextureFrontBottom.TabIndex = 2;
+			this.labelTextureFrontBottom.Text = "128x128";
+			// 
+			// frontlowname
+			// 
+			this.frontlowname.AutoSize = true;
+			this.frontlowname.BackColor = System.Drawing.SystemColors.Control;
+			this.frontlowname.Location = new System.Drawing.Point(3, 67);
+			this.frontlowname.Name = "frontlowname";
+			this.frontlowname.Size = new System.Drawing.Size(73, 13);
+			this.frontlowname.TabIndex = 5;
+			this.frontlowname.Text = "BROWNHUG";
+			this.frontlowname.UseMnemonic = false;
+			// 
+			// backpanel
+			// 
+			this.backpanel.Controls.Add(this.flowLayoutPanelBack);
+			this.backpanel.Location = new System.Drawing.Point(962, 0);
+			this.backpanel.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
+			this.backpanel.Name = "backpanel";
+			this.backpanel.Size = new System.Drawing.Size(495, 100);
+			this.backpanel.TabIndex = 3;
+			this.backpanel.TabStop = false;
+			this.backpanel.Text = " Back ";
+			// 
+			// flowLayoutPanelBack
+			// 
+			this.flowLayoutPanelBack.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+			this.flowLayoutPanelBack.Controls.Add(this.panelBackTop);
+			this.flowLayoutPanelBack.Controls.Add(this.panelBackMid);
+			this.flowLayoutPanelBack.Controls.Add(this.panelBackLow);
+			this.flowLayoutPanelBack.Location = new System.Drawing.Point(6, 14);
+			this.flowLayoutPanelBack.Name = "flowLayoutPanelBack";
+			this.flowLayoutPanelBack.Size = new System.Drawing.Size(484, 82);
+			this.flowLayoutPanelBack.TabIndex = 4;
+			this.flowLayoutPanelBack.WrapContents = false;
+			// 
+			// panelBackTop
+			// 
+			this.panelBackTop.Controls.Add(this.backTopUDMFOffsetLabel);
+			this.panelBackTop.Controls.Add(this.backTopUDMFOffset);
+			this.panelBackTop.Controls.Add(this.backTopUDMFScaleLabel);
+			this.panelBackTop.Controls.Add(this.backTopUDMFScale);
+			this.panelBackTop.Controls.Add(this.backhightex);
+			this.panelBackTop.Controls.Add(this.backhighname);
+			this.panelBackTop.Location = new System.Drawing.Point(0, 0);
+			this.panelBackTop.Margin = new System.Windows.Forms.Padding(0);
+			this.panelBackTop.Name = "panelBackTop";
+			this.panelBackTop.Size = new System.Drawing.Size(160, 82);
+			this.panelBackTop.TabIndex = 5;
+			// 
+			// backTopUDMFOffsetLabel
+			// 
+			this.backTopUDMFOffsetLabel.Location = new System.Drawing.Point(71, 3);
+			this.backTopUDMFOffsetLabel.Name = "backTopUDMFOffsetLabel";
+			this.backTopUDMFOffsetLabel.Size = new System.Drawing.Size(41, 14);
+			this.backTopUDMFOffsetLabel.TabIndex = 7;
+			this.backTopUDMFOffsetLabel.Text = "Offset:";
+			this.backTopUDMFOffsetLabel.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// backTopUDMFOffset
+			// 
+			this.backTopUDMFOffset.AutoSize = true;
+			this.backTopUDMFOffset.Location = new System.Drawing.Point(118, 3);
+			this.backTopUDMFOffset.Name = "backTopUDMFOffset";
+			this.backTopUDMFOffset.Size = new System.Drawing.Size(25, 13);
+			this.backTopUDMFOffset.TabIndex = 9;
+			this.backTopUDMFOffset.Text = "--, --";
+			// 
+			// backTopUDMFScaleLabel
+			// 
+			this.backTopUDMFScaleLabel.Location = new System.Drawing.Point(71, 20);
+			this.backTopUDMFScaleLabel.Name = "backTopUDMFScaleLabel";
+			this.backTopUDMFScaleLabel.Size = new System.Drawing.Size(41, 14);
+			this.backTopUDMFScaleLabel.TabIndex = 8;
+			this.backTopUDMFScaleLabel.Text = "Scale:";
+			this.backTopUDMFScaleLabel.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// backTopUDMFScale
+			// 
+			this.backTopUDMFScale.AutoSize = true;
+			this.backTopUDMFScale.Location = new System.Drawing.Point(118, 20);
+			this.backTopUDMFScale.Name = "backTopUDMFScale";
+			this.backTopUDMFScale.Size = new System.Drawing.Size(25, 13);
+			this.backTopUDMFScale.TabIndex = 10;
+			this.backTopUDMFScale.Text = "--, --";
+			// 
+			// backhightex
+			// 
+			this.backhightex.BackColor = System.Drawing.SystemColors.AppWorkspace;
+			this.backhightex.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
+			this.backhightex.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+			this.backhightex.Controls.Add(this.labelTextureBackTop);
+			this.backhightex.Location = new System.Drawing.Point(3, 0);
+			this.backhightex.Name = "backhightex";
+			this.backhightex.Size = new System.Drawing.Size(64, 64);
+			this.backhightex.TabIndex = 0;
+			// 
+			// labelTextureBackTop
+			// 
+			this.labelTextureBackTop.AutoSize = true;
+			this.labelTextureBackTop.BackColor = System.Drawing.Color.Black;
+			this.labelTextureBackTop.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.labelTextureBackTop.ForeColor = System.Drawing.Color.White;
+			this.labelTextureBackTop.Location = new System.Drawing.Point(1, 1);
+			this.labelTextureBackTop.MaximumSize = new System.Drawing.Size(0, 13);
+			this.labelTextureBackTop.Name = "labelTextureBackTop";
+			this.labelTextureBackTop.Size = new System.Drawing.Size(48, 13);
+			this.labelTextureBackTop.TabIndex = 3;
+			this.labelTextureBackTop.Text = "128x128";
+			// 
+			// backhighname
+			// 
+			this.backhighname.AutoSize = true;
+			this.backhighname.BackColor = System.Drawing.SystemColors.Control;
+			this.backhighname.Location = new System.Drawing.Point(3, 67);
+			this.backhighname.Name = "backhighname";
+			this.backhighname.Size = new System.Drawing.Size(73, 13);
+			this.backhighname.TabIndex = 1;
+			this.backhighname.Text = "BROWNHUG";
+			this.backhighname.UseMnemonic = false;
+			// 
+			// panelBackMid
+			// 
+			this.panelBackMid.Controls.Add(this.backMidUDMFOffsetLabel);
+			this.panelBackMid.Controls.Add(this.backMidUDMFOffset);
+			this.panelBackMid.Controls.Add(this.backMidUDMFScaleLabel);
+			this.panelBackMid.Controls.Add(this.backMidUDMFScale);
+			this.panelBackMid.Controls.Add(this.backmidtex);
+			this.panelBackMid.Controls.Add(this.backmidname);
+			this.panelBackMid.Location = new System.Drawing.Point(160, 0);
+			this.panelBackMid.Margin = new System.Windows.Forms.Padding(0);
+			this.panelBackMid.Name = "panelBackMid";
+			this.panelBackMid.Size = new System.Drawing.Size(160, 82);
+			this.panelBackMid.TabIndex = 7;
+			// 
+			// backMidUDMFOffsetLabel
+			// 
+			this.backMidUDMFOffsetLabel.Location = new System.Drawing.Point(71, 3);
+			this.backMidUDMFOffsetLabel.Name = "backMidUDMFOffsetLabel";
+			this.backMidUDMFOffsetLabel.Size = new System.Drawing.Size(41, 14);
+			this.backMidUDMFOffsetLabel.TabIndex = 7;
+			this.backMidUDMFOffsetLabel.Text = "Offset:";
+			this.backMidUDMFOffsetLabel.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// backMidUDMFOffset
+			// 
+			this.backMidUDMFOffset.AutoSize = true;
+			this.backMidUDMFOffset.Location = new System.Drawing.Point(118, 3);
+			this.backMidUDMFOffset.Name = "backMidUDMFOffset";
+			this.backMidUDMFOffset.Size = new System.Drawing.Size(25, 13);
+			this.backMidUDMFOffset.TabIndex = 9;
+			this.backMidUDMFOffset.Text = "--, --";
+			// 
+			// backMidUDMFScaleLabel
+			// 
+			this.backMidUDMFScaleLabel.Location = new System.Drawing.Point(71, 20);
+			this.backMidUDMFScaleLabel.Name = "backMidUDMFScaleLabel";
+			this.backMidUDMFScaleLabel.Size = new System.Drawing.Size(41, 14);
+			this.backMidUDMFScaleLabel.TabIndex = 8;
+			this.backMidUDMFScaleLabel.Text = "Scale:";
+			this.backMidUDMFScaleLabel.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// backMidUDMFScale
+			// 
+			this.backMidUDMFScale.AutoSize = true;
+			this.backMidUDMFScale.Location = new System.Drawing.Point(118, 20);
+			this.backMidUDMFScale.Name = "backMidUDMFScale";
+			this.backMidUDMFScale.Size = new System.Drawing.Size(25, 13);
+			this.backMidUDMFScale.TabIndex = 10;
+			this.backMidUDMFScale.Text = "--, --";
+			// 
+			// backmidtex
+			// 
+			this.backmidtex.BackColor = System.Drawing.SystemColors.AppWorkspace;
+			this.backmidtex.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
+			this.backmidtex.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+			this.backmidtex.Controls.Add(this.labelTextureBackMid);
+			this.backmidtex.Location = new System.Drawing.Point(3, 0);
+			this.backmidtex.Name = "backmidtex";
+			this.backmidtex.Size = new System.Drawing.Size(64, 64);
+			this.backmidtex.TabIndex = 2;
+			// 
+			// labelTextureBackMid
+			// 
+			this.labelTextureBackMid.AutoSize = true;
+			this.labelTextureBackMid.BackColor = System.Drawing.Color.Black;
+			this.labelTextureBackMid.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.labelTextureBackMid.ForeColor = System.Drawing.Color.White;
+			this.labelTextureBackMid.Location = new System.Drawing.Point(1, 1);
+			this.labelTextureBackMid.MaximumSize = new System.Drawing.Size(0, 13);
+			this.labelTextureBackMid.Name = "labelTextureBackMid";
+			this.labelTextureBackMid.Size = new System.Drawing.Size(48, 13);
+			this.labelTextureBackMid.TabIndex = 2;
+			this.labelTextureBackMid.Text = "128x128";
+			// 
+			// backmidname
+			// 
+			this.backmidname.AutoSize = true;
+			this.backmidname.BackColor = System.Drawing.SystemColors.Control;
+			this.backmidname.Location = new System.Drawing.Point(3, 67);
+			this.backmidname.Name = "backmidname";
+			this.backmidname.Size = new System.Drawing.Size(73, 13);
+			this.backmidname.TabIndex = 3;
+			this.backmidname.Text = "BROWNHUG";
+			this.backmidname.UseMnemonic = false;
+			// 
+			// panelBackLow
+			// 
+			this.panelBackLow.Controls.Add(this.backBottomUDMFOffsetLabel);
+			this.panelBackLow.Controls.Add(this.backBottomUDMFOffset);
+			this.panelBackLow.Controls.Add(this.backBottomUDMFScaleLabel);
+			this.panelBackLow.Controls.Add(this.backBottomUDMFScale);
+			this.panelBackLow.Controls.Add(this.backlowtex);
+			this.panelBackLow.Controls.Add(this.backlowname);
+			this.panelBackLow.Location = new System.Drawing.Point(320, 0);
+			this.panelBackLow.Margin = new System.Windows.Forms.Padding(0);
+			this.panelBackLow.Name = "panelBackLow";
+			this.panelBackLow.Size = new System.Drawing.Size(160, 82);
+			this.panelBackLow.TabIndex = 12;
+			// 
+			// backBottomUDMFOffsetLabel
+			// 
+			this.backBottomUDMFOffsetLabel.Location = new System.Drawing.Point(71, 3);
+			this.backBottomUDMFOffsetLabel.Name = "backBottomUDMFOffsetLabel";
+			this.backBottomUDMFOffsetLabel.Size = new System.Drawing.Size(41, 14);
+			this.backBottomUDMFOffsetLabel.TabIndex = 7;
+			this.backBottomUDMFOffsetLabel.Text = "Offset:";
+			this.backBottomUDMFOffsetLabel.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// backBottomUDMFOffset
+			// 
+			this.backBottomUDMFOffset.AutoSize = true;
+			this.backBottomUDMFOffset.Location = new System.Drawing.Point(118, 3);
+			this.backBottomUDMFOffset.Name = "backBottomUDMFOffset";
+			this.backBottomUDMFOffset.Size = new System.Drawing.Size(25, 13);
+			this.backBottomUDMFOffset.TabIndex = 9;
+			this.backBottomUDMFOffset.Text = "--, --";
+			// 
+			// backBottomUDMFScaleLabel
+			// 
+			this.backBottomUDMFScaleLabel.Location = new System.Drawing.Point(71, 20);
+			this.backBottomUDMFScaleLabel.Name = "backBottomUDMFScaleLabel";
+			this.backBottomUDMFScaleLabel.Size = new System.Drawing.Size(41, 14);
+			this.backBottomUDMFScaleLabel.TabIndex = 8;
+			this.backBottomUDMFScaleLabel.Text = "Scale:";
+			this.backBottomUDMFScaleLabel.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// backBottomUDMFScale
+			// 
+			this.backBottomUDMFScale.AutoSize = true;
+			this.backBottomUDMFScale.Location = new System.Drawing.Point(118, 20);
+			this.backBottomUDMFScale.Name = "backBottomUDMFScale";
+			this.backBottomUDMFScale.Size = new System.Drawing.Size(25, 13);
+			this.backBottomUDMFScale.TabIndex = 10;
+			this.backBottomUDMFScale.Text = "--, --";
+			// 
+			// backlowtex
+			// 
+			this.backlowtex.BackColor = System.Drawing.SystemColors.AppWorkspace;
+			this.backlowtex.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
+			this.backlowtex.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+			this.backlowtex.Controls.Add(this.labelTextureBackBottom);
+			this.backlowtex.Location = new System.Drawing.Point(3, 0);
+			this.backlowtex.Name = "backlowtex";
+			this.backlowtex.Size = new System.Drawing.Size(64, 64);
+			this.backlowtex.TabIndex = 4;
+			// 
+			// labelTextureBackBottom
+			// 
+			this.labelTextureBackBottom.AutoSize = true;
+			this.labelTextureBackBottom.BackColor = System.Drawing.Color.Black;
+			this.labelTextureBackBottom.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.labelTextureBackBottom.ForeColor = System.Drawing.Color.White;
+			this.labelTextureBackBottom.Location = new System.Drawing.Point(1, 1);
+			this.labelTextureBackBottom.MaximumSize = new System.Drawing.Size(0, 13);
+			this.labelTextureBackBottom.Name = "labelTextureBackBottom";
+			this.labelTextureBackBottom.Size = new System.Drawing.Size(48, 13);
+			this.labelTextureBackBottom.TabIndex = 3;
+			this.labelTextureBackBottom.Text = "128x128";
+			// 
+			// backlowname
+			// 
+			this.backlowname.AutoSize = true;
+			this.backlowname.BackColor = System.Drawing.SystemColors.Control;
+			this.backlowname.Location = new System.Drawing.Point(3, 67);
+			this.backlowname.Name = "backlowname";
+			this.backlowname.Size = new System.Drawing.Size(73, 13);
+			this.backlowname.TabIndex = 5;
+			this.backlowname.Text = "BROWNHUG";
+			this.backlowname.UseMnemonic = false;
+			// 
+			// flowLayoutPanel1
+			// 
+			this.flowLayoutPanel1.Controls.Add(this.infopanel);
+			this.flowLayoutPanel1.Controls.Add(this.frontpanel);
+			this.flowLayoutPanel1.Controls.Add(this.backpanel);
+			this.flowLayoutPanel1.Controls.Add(this.flagsPanel);
+			this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 0);
+			this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(0);
+			this.flowLayoutPanel1.Name = "flowLayoutPanel1";
+			this.flowLayoutPanel1.Size = new System.Drawing.Size(2000, 100);
+			this.flowLayoutPanel1.TabIndex = 4;
+			this.flowLayoutPanel1.WrapContents = false;
+			// 
+			// flagsPanel
+			// 
+			this.flagsPanel.Controls.Add(this.flags);
+			this.flagsPanel.Location = new System.Drawing.Point(1460, 0);
+			this.flagsPanel.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
+			this.flagsPanel.Name = "flagsPanel";
+			this.flagsPanel.Size = new System.Drawing.Size(455, 100);
+			this.flagsPanel.TabIndex = 8;
+			this.flagsPanel.TabStop = false;
+			this.flagsPanel.Text = " Flags";
+			// 
+			// flags
+			// 
+			this.flags.BackColor = System.Drawing.SystemColors.Control;
+			this.flags.BorderStyle = System.Windows.Forms.BorderStyle.None;
+			this.flags.CheckBoxes = true;
+			this.flags.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
+			this.flags.Location = new System.Drawing.Point(6, 18);
+			this.flags.Name = "flags";
+			this.flags.Scrollable = false;
+			this.flags.ShowGroups = false;
+			this.flags.Size = new System.Drawing.Size(443, 73);
+			this.flags.TabIndex = 0;
+			this.flags.UseCompatibleStateImageBehavior = false;
+			this.flags.View = System.Windows.Forms.View.List;
+			// 
+			// LinedefInfoPanel
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.Controls.Add(this.flowLayoutPanel1);
+			this.DoubleBuffered = true;
+			this.MaximumSize = new System.Drawing.Size(10000, 100);
+			this.MinimumSize = new System.Drawing.Size(100, 100);
+			this.Name = "LinedefInfoPanel";
+			this.Size = new System.Drawing.Size(2000, 100);
+			this.infopanel.ResumeLayout(false);
+			this.infopanel.PerformLayout();
+			this.frontpanel.ResumeLayout(false);
+			this.flowLayoutPanelFront.ResumeLayout(false);
+			this.panelFrontTop.ResumeLayout(false);
+			this.panelFrontTop.PerformLayout();
+			this.fronthightex.ResumeLayout(false);
+			this.fronthightex.PerformLayout();
+			this.panelFrontMid.ResumeLayout(false);
+			this.panelFrontMid.PerformLayout();
+			this.frontmidtex.ResumeLayout(false);
+			this.frontmidtex.PerformLayout();
+			this.panelFrontLow.ResumeLayout(false);
+			this.panelFrontLow.PerformLayout();
+			this.frontlowtex.ResumeLayout(false);
+			this.frontlowtex.PerformLayout();
+			this.backpanel.ResumeLayout(false);
+			this.flowLayoutPanelBack.ResumeLayout(false);
+			this.panelBackTop.ResumeLayout(false);
+			this.panelBackTop.PerformLayout();
+			this.backhightex.ResumeLayout(false);
+			this.backhightex.PerformLayout();
+			this.panelBackMid.ResumeLayout(false);
+			this.panelBackMid.PerformLayout();
+			this.backmidtex.ResumeLayout(false);
+			this.backmidtex.PerformLayout();
+			this.panelBackLow.ResumeLayout(false);
+			this.panelBackLow.PerformLayout();
+			this.backlowtex.ResumeLayout(false);
+			this.backlowtex.PerformLayout();
+			this.flowLayoutPanel1.ResumeLayout(false);
+			this.flagsPanel.ResumeLayout(false);
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Label action;
+		private System.Windows.Forms.Label tag;
+		private System.Windows.Forms.Label angle;
+		private System.Windows.Forms.Label length;
+		private System.Windows.Forms.Label frontoffset;
+		private System.Windows.Forms.Label backoffset;
+		private System.Windows.Forms.Panel fronthightex;
+		private System.Windows.Forms.Label frontlowname;
+		private System.Windows.Forms.Panel frontlowtex;
+		private System.Windows.Forms.Label frontmidname;
+		private System.Windows.Forms.Panel frontmidtex;
+		private System.Windows.Forms.Label fronthighname;
+		private System.Windows.Forms.Label backlowname;
+		private System.Windows.Forms.Panel backlowtex;
+		private System.Windows.Forms.Label backmidname;
+		private System.Windows.Forms.Panel backmidtex;
+		private System.Windows.Forms.Label backhighname;
+		private System.Windows.Forms.Panel backhightex;
+		private System.Windows.Forms.GroupBox frontpanel;
+		private System.Windows.Forms.GroupBox backpanel;
+		private System.Windows.Forms.Label backoffsetlabel;
+		private System.Windows.Forms.Label frontoffsetlabel;
+		private System.Windows.Forms.Label arglbl5;
+		private System.Windows.Forms.Label arglbl4;
+		private System.Windows.Forms.Label arglbl3;
+		private System.Windows.Forms.Label arglbl2;
+		private System.Windows.Forms.Label arglbl1;
+		private System.Windows.Forms.Label arg5;
+		private System.Windows.Forms.Label arg4;
+		private System.Windows.Forms.Label arg3;
+		private System.Windows.Forms.Label arg2;
+		private System.Windows.Forms.Label arg1;
+		private System.Windows.Forms.GroupBox infopanel;
+		private System.Windows.Forms.Label unpegged;
+		private System.Windows.Forms.Label peglabel;
+		private System.Windows.Forms.FlowLayoutPanel flowLayoutPanelBack;
+		private System.Windows.Forms.Panel panelBackTop;
+		private System.Windows.Forms.Label backTopUDMFScale;
+		private System.Windows.Forms.Label backTopUDMFOffset;
+		private System.Windows.Forms.Label backTopUDMFScaleLabel;
+		private System.Windows.Forms.Label backTopUDMFOffsetLabel;
+		private System.Windows.Forms.Panel panelBackMid;
+		private System.Windows.Forms.Label backMidUDMFScale;
+		private System.Windows.Forms.Label backMidUDMFOffset;
+		private System.Windows.Forms.Label backMidUDMFScaleLabel;
+		private System.Windows.Forms.Label backMidUDMFOffsetLabel;
+		private System.Windows.Forms.Panel panelBackLow;
+		private System.Windows.Forms.Label backBottomUDMFScale;
+		private System.Windows.Forms.Label backBottomUDMFOffset;
+		private System.Windows.Forms.Label backBottomUDMFScaleLabel;
+		private System.Windows.Forms.Label backBottomUDMFOffsetLabel;
+		private System.Windows.Forms.FlowLayoutPanel flowLayoutPanelFront;
+		private System.Windows.Forms.Panel panelFrontTop;
+		private System.Windows.Forms.Label frontTopUDMFScale;
+		private System.Windows.Forms.Label frontTopUDMFOffset;
+		private System.Windows.Forms.Label frontTopUDMFScaleLabel;
+		private System.Windows.Forms.Label frontTopUDMFOffsetLabel;
+		private System.Windows.Forms.Panel panelFrontMid;
+		private System.Windows.Forms.Label frontMidUDMFScale;
+		private System.Windows.Forms.Label frontMidUDMFOffset;
+		private System.Windows.Forms.Label frontMidUDMFScaleLabel;
+		private System.Windows.Forms.Label frontMidUDMFOffsetLabel;
+		private System.Windows.Forms.Panel panelFrontLow;
+		private System.Windows.Forms.Label frontBottomUDMFScale;
+		private System.Windows.Forms.Label frontBottomUDMFOffset;
+		private System.Windows.Forms.Label frontBottomUDMFScaleLabel;
+		private System.Windows.Forms.Label frontBottomUDMFOffsetLabel;
+		private System.Windows.Forms.Label labelTextureFrontTop;
+		private System.Windows.Forms.Label labelTextureFrontMid;
+		private System.Windows.Forms.Label labelTextureFrontBottom;
+		private System.Windows.Forms.Label labelTextureBackTop;
+		private System.Windows.Forms.Label labelTextureBackMid;
+		private System.Windows.Forms.Label labelTextureBackBottom;
+		private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
+		private System.Windows.Forms.GroupBox flagsPanel;
+		private System.Windows.Forms.ListView flags;
+		private System.Windows.Forms.Label taglabel;
+		private System.Windows.Forms.Label anglelabel;
+		private System.Windows.Forms.Label lengthlabel;
+		private System.Windows.Forms.Label activation;
+		private System.Windows.Forms.Label activationlabel;
+		private System.Windows.Forms.Label actionlabel;
+
+	}
+}
diff --git a/Source/Core/Controls/LinedefInfoPanel.cs b/Source/Core/Controls/LinedefInfoPanel.cs
new file mode 100644
index 0000000..05dbe38
--- /dev/null
+++ b/Source/Core/Controls/LinedefInfoPanel.cs
@@ -0,0 +1,644 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Globalization;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.GZBuilder.Data;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Types;
+using CodeImp.DoomBuilder.GZBuilder;
+using CodeImp.DoomBuilder.Data;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Controls
+{
+	internal partial class LinedefInfoPanel : UserControl
+	{
+		private readonly int hexenformatwidth;
+		private readonly int doomformatwidth;
+		
+		// Constructor
+		public LinedefInfoPanel()
+		{
+			// Initialize
+			InitializeComponent();
+
+			// Hide stuff when in Doom format
+			hexenformatwidth = infopanel.Width;
+			doomformatwidth = infopanel.Width - 190;
+
+			//mxd
+			labelTextureFrontTop.BackColor = Color.FromArgb(128, labelTextureFrontTop.BackColor);
+			labelTextureFrontMid.BackColor = Color.FromArgb(128, labelTextureFrontMid.BackColor);
+			labelTextureFrontBottom.BackColor = Color.FromArgb(128, labelTextureFrontBottom.BackColor);
+
+			labelTextureBackTop.BackColor = Color.FromArgb(128, labelTextureBackTop.BackColor);
+			labelTextureBackMid.BackColor = Color.FromArgb(128, labelTextureBackMid.BackColor);
+			labelTextureBackBottom.BackColor = Color.FromArgb(128, labelTextureBackBottom.BackColor);
+		}
+		
+		// This shows the info
+		public void ShowInfo(Linedef l, Sidedef highlightside)
+		{
+			string peggedness;
+			
+			// Show/hide stuff depending on format
+			if(!General.Map.FormatInterface.HasActionArgs)
+			{
+				arglbl1.Visible = false;
+				arglbl2.Visible = false;
+				arglbl3.Visible = false;
+				arglbl4.Visible = false;
+				arglbl5.Visible = false;
+				arg1.Visible = false;
+				arg2.Visible = false;
+				arg3.Visible = false;
+				arg4.Visible = false;
+				arg5.Visible = false;
+				infopanel.Width = doomformatwidth;
+			}
+			else
+			{
+				arglbl1.Visible = true;
+				arglbl2.Visible = true;
+				arglbl3.Visible = true;
+				arglbl4.Visible = true;
+				arglbl5.Visible = true;
+				arg1.Visible = true;
+				arg2.Visible = true;
+				arg3.Visible = true;
+				arg4.Visible = true;
+				arg5.Visible = true;
+				infopanel.Width = hexenformatwidth;
+			}
+
+			//mxd. Hide activation or tag and rearrange labels 
+			if(!General.Map.FormatInterface.HasBuiltInActivations && General.Map.FormatInterface.HasNumericLinedefActivations) //Hexen map format?
+			{ 
+				activation.Visible = true;
+				activationlabel.Visible = true;
+				taglabel.Visible = false;
+				tag.Visible = false;
+				
+				//set activation
+				foreach(LinedefActivateInfo ai in General.Map.Config.LinedefActivates) 
+				{
+					if(l.Activate == ai.Index) 
+					{
+						activation.Text = ai.Title;
+						break;
+					}
+				}
+
+				activation.Enabled = (l.Activate != 0); //mxd
+				activationlabel.Enabled = (l.Activate != 0); //mxd
+			} 
+			else 
+			{
+				activation.Visible = false;
+				activationlabel.Visible = false;
+				taglabel.Visible = true;
+				tag.Visible = true;
+
+				//mxd. Set tag(s)
+				if(l.Tags.Count > 1)
+				{
+					string[] tags = new string[l.Tags.Count];
+					for(int i = 0; i < l.Tags.Count; i++) tags[i] = l.Tags[i].ToString();
+					tag.Text = string.Join(", ", tags);
+					tag.Enabled = true;
+					taglabel.Enabled = true;
+					taglabel.Text = "Tags:";
+				}
+				else
+				{
+					tag.Text = l.Tag + (General.Map.Options.TagLabels.ContainsKey(l.Tag) ? " - " + General.Map.Options.TagLabels[l.Tag] : string.Empty);
+					tag.Enabled = (l.Tag != 0);
+					taglabel.Enabled = (l.Tag != 0);
+					taglabel.Text = "Tag:";
+				}
+			}
+			
+			// Get line action information
+			LinedefActionInfo act = General.Map.Config.GetLinedefActionInfo(l.Action);
+			
+			// Determine peggedness
+			bool upperunpegged = l.IsFlagSet(General.Map.Config.UpperUnpeggedFlag);
+			bool lowerunpegged = l.IsFlagSet(General.Map.Config.LowerUnpeggedFlag);
+			if(upperunpegged && lowerunpegged)
+				peggedness = "Upper & Lower";
+			else if(upperunpegged)
+				peggedness = "Upper";
+			else if(lowerunpegged)
+				peggedness = "Lower";
+			else
+				peggedness = "None";
+			
+			// Linedef info
+			infopanel.Text = " Linedef " + l.Index + " ";
+			action.Text = act.ToString();
+			length.Text = l.Length.ToString("0.##");
+			angle.Text = General.ClampAngle(l.AngleDeg) + "\u00B0";
+			unpegged.Text = peggedness;
+			unpegged.Enabled = (peggedness != "None"); //mxd
+			peglabel.Enabled = (peggedness != "None"); //mxd
+			action.Enabled = (act.Index != 0);
+			actionlabel.Enabled = (act.Index != 0);
+
+			//mxd. ACS script argument names
+			bool isacsscript = (Array.IndexOf(GZGeneral.ACS_SPECIALS, l.Action) != -1);
+			bool isnamedacsscript = (isacsscript && General.Map.UDMF && l.Fields.ContainsKey("arg0str"));
+			string scriptname = (isnamedacsscript ? l.Fields.GetValue("arg0str", string.Empty) : string.Empty);
+			ScriptItem scriptitem = null;
+
+			// Named script?
+			if(isnamedacsscript && General.Map.NamedScripts.ContainsKey(scriptname.ToLowerInvariant()))
+			{
+				scriptitem = General.Map.NamedScripts[scriptname.ToLowerInvariant()];
+			}
+			// Script number?
+			else if(isacsscript && General.Map.NumberedScripts.ContainsKey(l.Args[0]))
+			{
+				scriptitem = General.Map.NumberedScripts[l.Args[0]];
+				scriptname = (scriptitem.HasCustomName ? scriptitem.Name : scriptitem.Index.ToString());
+			}
+
+			// Apply script args?
+			Label[] arglabels = new[] { arglbl1, arglbl2, arglbl3, arglbl4, arglbl5 };
+			Label[] args = new[] { arg1, arg2, arg3, arg4, arg5 };
+
+			if(scriptitem != null)
+			{
+				string[] argnames = scriptitem.GetArgumentsDescriptions(l.Action);
+				for(int i = 0; i < argnames.Length; i++)
+				{
+					if(!string.IsNullOrEmpty(argnames[i]))
+					{
+						arglabels[i].Text = argnames[i] + ":";
+						arglabels[i].Enabled = true;
+						args[i].Enabled = true;
+					}
+					else
+					{
+						arglabels[i].Text = act.Args[i].Title + ":";
+						arglabels[i].Enabled = act.Args[i].Used;
+						args[i].Enabled = act.Args[i].Used;
+					}
+				}
+			}
+			else
+			{
+				for(int i = 0; i < act.Args.Length; i++)
+				{
+					arglabels[i].Text = act.Args[i].Title + ":";
+					arglabels[i].Enabled = act.Args[i].Used;
+					args[i].Enabled = act.Args[i].Used;
+				}
+			}
+
+			//mxd. Set argument value and label
+			if(!string.IsNullOrEmpty(scriptname)) arg1.Text = scriptname;
+			else SetArgumentText(act.Args[0], arg1, l.Args[0]);
+			SetArgumentText(act.Args[1], arg2, l.Args[1]);
+			SetArgumentText(act.Args[2], arg3, l.Args[2]);
+			SetArgumentText(act.Args[3], arg4, l.Args[3]);
+			SetArgumentText(act.Args[4], arg5, l.Args[4]);
+
+			// Front side available?
+			if(l.Front != null)
+			{
+				//mxd. Extended info shown?
+				bool hasTopFields = false;
+				bool hasMiddleFields = false;
+				bool hasBottomFields = false;
+
+				//mxd. Highlight this side?
+				bool highlight = (l.Front == highlightside);
+				frontpanel.ForeColor = (highlight ? SystemColors.HotTrack : SystemColors.WindowText); //mxd
+				
+				// Show sidedef info
+				frontpanel.Visible = true; //mxd
+				frontpanel.Text = " Front Sidedef " + l.Front.Index;
+				
+				//mxd
+				if(General.Map.UDMF) 
+				{
+					//light
+					frontoffsetlabel.Text = "Front light:";
+					SetUDMFLight(l.Front, frontoffsetlabel, frontoffset, highlight);
+
+					//global offset, sector index
+					frontpanel.Text += ". Offset " + l.Front.OffsetX + ", " + l.Front.OffsetY + ". Sector " + l.Front.Sector.Index + " ";
+					
+					//sidedef top
+					hasTopFields = SetPairedUDMFFieldsLabel(l.Front.Fields, "offsetx_top", "offsety_top", 0.0f, frontTopUDMFOffsetLabel, frontTopUDMFOffset, highlight);
+					hasTopFields |= SetPairedUDMFFieldsLabel(l.Front.Fields, "scalex_top", "scaley_top", 1.0f, frontTopUDMFScaleLabel, frontTopUDMFScale, highlight);
+
+					//sidedef middle
+					hasMiddleFields = SetPairedUDMFFieldsLabel(l.Front.Fields, "offsetx_mid", "offsety_mid", 0.0f, frontMidUDMFOffsetLabel, frontMidUDMFOffset, highlight);
+					hasMiddleFields |= SetPairedUDMFFieldsLabel(l.Front.Fields, "scalex_mid", "scaley_mid", 1.0f, frontMidUDMFScaleLabel, frontMidUDMFScale, highlight);
+
+					//sidedef bottom
+					hasBottomFields = SetPairedUDMFFieldsLabel(l.Front.Fields, "offsetx_bottom", "offsety_bottom", 0.0f, frontBottomUDMFOffsetLabel, frontBottomUDMFOffset, highlight);
+					hasBottomFields |= SetPairedUDMFFieldsLabel(l.Front.Fields, "scalex_bottom", "scaley_bottom", 1.0f, frontBottomUDMFScaleLabel, frontBottomUDMFScale, highlight);
+
+					//visibility
+					frontTopUDMFOffset.Visible = hasTopFields;
+					frontTopUDMFOffsetLabel.Visible = hasTopFields;
+					frontTopUDMFScale.Visible = hasTopFields;
+					frontTopUDMFScaleLabel.Visible = hasTopFields;
+
+					frontMidUDMFOffset.Visible = hasMiddleFields;
+					frontMidUDMFOffsetLabel.Visible = hasMiddleFields;
+					frontMidUDMFScale.Visible = hasMiddleFields;
+					frontMidUDMFScaleLabel.Visible = hasMiddleFields;
+
+					frontBottomUDMFOffset.Visible = hasBottomFields;
+					frontBottomUDMFOffsetLabel.Visible = hasBottomFields;
+					frontBottomUDMFScale.Visible = hasBottomFields;
+					frontBottomUDMFScaleLabel.Visible = hasBottomFields;
+				} 
+				else 
+				{
+					frontoffsetlabel.Text = "Front offset:";
+					if(l.Front.OffsetX != 0 || l.Front.OffsetY != 0)
+					{
+						frontoffset.Text = l.Front.OffsetX + ", " + l.Front.OffsetY;
+						frontoffsetlabel.Enabled = true;
+						frontoffset.Enabled = true;
+
+						frontoffset.ForeColor = (highlight ? SystemColors.HotTrack : SystemColors.WindowText);
+						frontoffsetlabel.ForeColor = frontoffset.ForeColor;
+					}
+					else
+					{
+						frontoffset.Text = "--, --";
+						frontoffsetlabel.Enabled = false;
+						frontoffset.Enabled = false;
+					}
+
+					//mxd. Sector index
+					frontpanel.Text += ". Sector " + l.Front.Sector.Index + " ";
+				}
+
+				//mxd. Set texture names, update panel sizes
+				UpdateTexturePanel(panelFrontTop, l.Front.HighTexture, fronthighname, labelTextureFrontTop,
+					Math.Max(frontTopUDMFOffset.Right, frontTopUDMFScale.Right) + 4, fronthightex,
+					frontTopUDMFOffsetLabel.Left, hasTopFields, l.Front.HighRequired());
+
+				UpdateTexturePanel(panelFrontMid, l.Front.MiddleTexture, frontmidname, labelTextureFrontMid,
+					Math.Max(frontMidUDMFOffset.Right, frontMidUDMFScale.Right) + 4, frontmidtex,
+					frontMidUDMFOffsetLabel.Left, hasMiddleFields, l.Front.MiddleRequired());
+
+				UpdateTexturePanel(panelFrontLow, l.Front.LowTexture, frontlowname, labelTextureFrontBottom,
+					Math.Max(frontBottomUDMFOffset.Right, frontBottomUDMFScale.Right) + 4, frontlowtex,
+					frontBottomUDMFOffsetLabel.Left, hasBottomFields, l.Front.LowRequired());
+
+				//mxd. Resize panel
+				flowLayoutPanelFront.Width = panelFrontLow.Right;
+				frontpanel.Width = flowLayoutPanelFront.Width + flowLayoutPanelFront.Left * 2 - 4;
+			}
+			else
+			{
+				// Show no info
+				if(General.Map.UDMF) //mxd
+				{
+					frontoffsetlabel.Text = "Front light:";
+					frontoffset.Text = "--";
+				} 
+				else 
+				{
+					frontoffsetlabel.Text = "Front offset:";
+					frontoffset.Text = "--, --";
+				}
+
+				frontoffsetlabel.Enabled = false;
+				frontoffset.Enabled = false;
+
+				fronthightex.BackgroundImage = null;
+				frontmidtex.BackgroundImage = null;
+				frontlowtex.BackgroundImage = null;
+
+				frontpanel.Visible = false; //mxd
+			}
+
+			// Back size available?
+			if(l.Back != null)
+			{
+				//mxd. Extended info shown?
+				bool hasTopFields = false;
+				bool hasMiddleFields = false;
+				bool hasBottomFields = false;
+
+				//mxd. Highlight this side?
+				bool highlight = l.Back == highlightside;
+				backpanel.ForeColor = (highlight ? SystemColors.HotTrack : SystemColors.WindowText); //mxd
+
+				// Show sidedef info
+				backpanel.Visible = true; //mxd
+				backpanel.Text = " Back Sidedef " + l.Back.Index;
+
+				//mxd
+				if(General.Map.UDMF) 
+				{
+					//light
+					backoffsetlabel.Text = "Back light:";
+					SetUDMFLight(l.Back, backoffsetlabel, backoffset, highlight);
+
+					//global offset, sector index
+					backpanel.Text += ". Offset " + l.Back.OffsetX + ", " + l.Back.OffsetY + ". Sector " + l.Back.Sector.Index + " ";
+
+					//sidedef top
+					hasTopFields = SetPairedUDMFFieldsLabel(l.Back.Fields, "offsetx_top", "offsety_top", 0f, backTopUDMFOffsetLabel, backTopUDMFOffset, highlight);
+					hasTopFields |= SetPairedUDMFFieldsLabel(l.Back.Fields, "scalex_top", "scaley_top", 1.0f, backTopUDMFScaleLabel, backTopUDMFScale, highlight);
+
+					//sidedef middle
+					hasMiddleFields = SetPairedUDMFFieldsLabel(l.Back.Fields, "offsetx_mid", "offsety_mid", 0f, backMidUDMFOffsetLabel, backMidUDMFOffset, highlight);
+					hasMiddleFields |= SetPairedUDMFFieldsLabel(l.Back.Fields, "scalex_mid", "scaley_mid", 1.0f, backMidUDMFScaleLabel, backMidUDMFScale, highlight);
+
+					//sidedef bottom
+					hasBottomFields = SetPairedUDMFFieldsLabel(l.Back.Fields, "offsetx_bottom", "offsety_bottom", 0f, backBottomUDMFOffsetLabel, backBottomUDMFOffset, highlight);
+					hasBottomFields |= SetPairedUDMFFieldsLabel(l.Back.Fields, "scalex_bottom", "scaley_bottom", 1.0f, backBottomUDMFScaleLabel, backBottomUDMFScale, highlight);
+
+					//visibility
+					backTopUDMFOffset.Visible = hasTopFields;
+					backTopUDMFOffsetLabel.Visible = hasTopFields;
+					backTopUDMFScale.Visible = hasTopFields;
+					backTopUDMFScaleLabel.Visible = hasTopFields;
+
+					backMidUDMFOffset.Visible = hasMiddleFields;
+					backMidUDMFOffsetLabel.Visible = hasMiddleFields;
+					backMidUDMFScale.Visible = hasMiddleFields;
+					backMidUDMFScaleLabel.Visible = hasMiddleFields;
+
+					backBottomUDMFOffset.Visible = hasBottomFields;
+					backBottomUDMFOffsetLabel.Visible = hasBottomFields;
+					backBottomUDMFScale.Visible = hasBottomFields;
+					backBottomUDMFScaleLabel.Visible = hasBottomFields;
+				}
+				else
+				{
+					backoffsetlabel.Text = "Back offset:";
+					if(l.Back.OffsetX != 0 || l.Back.OffsetY != 0)
+					{
+						backoffset.Text = l.Back.OffsetX + ", " + l.Back.OffsetY;
+						backoffsetlabel.Enabled = true;
+						backoffset.Enabled = true;
+
+						backoffset.ForeColor = (highlight ? SystemColors.HotTrack : SystemColors.WindowText);
+						backoffsetlabel.ForeColor = backoffset.ForeColor;
+					}
+					else
+					{
+						backoffset.Text = "--, --";
+						backoffsetlabel.Enabled = false;
+						backoffset.Enabled = false;
+					}
+
+					// Sector index
+					backpanel.Text += ". Sector " + l.Back.Sector.Index + " ";
+				}
+
+				//mxd. Set texture names, update panel sizes
+				UpdateTexturePanel(panelBackTop, l.Back.HighTexture, backhighname, labelTextureBackTop, 
+					Math.Max(backTopUDMFOffset.Right, backTopUDMFScale.Right) + 4, backhightex,
+					backTopUDMFOffsetLabel.Left, hasTopFields, l.Back.HighRequired());
+
+				UpdateTexturePanel(panelBackMid, l.Back.MiddleTexture, backmidname, labelTextureBackMid,
+					Math.Max(backMidUDMFOffset.Right, backMidUDMFScale.Right) + 4, backmidtex,
+					backMidUDMFOffsetLabel.Left, hasMiddleFields, l.Back.MiddleRequired());
+
+				UpdateTexturePanel(panelBackLow, l.Back.LowTexture, backlowname, labelTextureBackBottom,
+					Math.Max(backBottomUDMFOffset.Right, backBottomUDMFScale.Right) + 4, backlowtex,
+					backBottomUDMFOffsetLabel.Left, hasBottomFields, l.Back.LowRequired());
+
+				//mxd. Resize panel
+				flowLayoutPanelBack.Width = panelBackLow.Right;
+				backpanel.Width = flowLayoutPanelBack.Width + flowLayoutPanelBack.Left * 2 - 4;
+			}
+			else
+			{
+				// Show no info
+				if(General.Map.UDMF) //mxd
+				{ 
+					backoffsetlabel.Text = "Back light:";
+					backoffset.Text = "--";
+				} 
+				else 
+				{
+					backoffsetlabel.Text = "Back offset:";
+					backoffset.Text = "--, --";
+				}
+
+				backoffsetlabel.Enabled = false;
+				backoffset.Enabled = false;
+
+				backhightex.BackgroundImage = null;
+				backmidtex.BackgroundImage = null;
+				backlowtex.BackgroundImage = null;
+
+				backpanel.Visible = false; //mxd
+			}
+
+			//mxd. Flags and activations
+			flags.Items.Clear();
+			
+			// Add activations
+			foreach(LinedefActivateInfo ai in General.Map.Config.LinedefActivates)
+			{
+				if(l.Flags.ContainsKey(ai.Key) && l.Flags[ai.Key])
+					flags.Items.Add(new ListViewItem(ai.Title) { Checked = true, ForeColor = SystemColors.HotTrack });
+			}
+
+			// And flags
+			foreach(KeyValuePair<string, string> group in General.Map.Config.LinedefFlags) 
+			{
+				if(l.Flags.ContainsKey(group.Key) && l.Flags[group.Key])
+					flags.Items.Add(new ListViewItem(group.Value) { Checked = true });
+			}
+
+			// And front flags
+			if(l.Front != null)
+			{
+				foreach(KeyValuePair<string, string> group in General.Map.Config.SidedefFlags) 
+				{
+					if(l.Front.Flags.ContainsKey(group.Key) && l.Front.Flags[group.Key])
+						flags.Items.Add(new ListViewItem("Front: " + group.Value) { Checked = true });
+				}
+			}
+
+			// And back flags
+			if(l.Back != null) 
+			{
+				foreach(KeyValuePair<string, string> group in General.Map.Config.SidedefFlags) 
+				{
+					if(l.Back.Flags.ContainsKey(group.Key) && l.Back.Flags[group.Key])
+						flags.Items.Add(new ListViewItem("Back: " + group.Value) { Checked = true });
+				}
+			}
+
+			//mxd. Flags panel visibility and size
+			flagsPanel.Visible = (flags.Items.Count > 0);
+			if(flags.Items.Count > 0) 
+			{
+				flags.Width = flags.GetItemRect(0).Width * (int)Math.Ceiling(flags.Items.Count / 4.0f);
+				flagsPanel.Width = flags.Width + flags.Left * 2;
+			}
+
+			// Show the whole thing
+			this.Show();
+			this.Update();
+		}
+
+		private static void UpdateTexturePanel(Panel panel, string texturename, Label texturenamelabel, Label sizelabel, int maxlabelright, Panel image, int sizeref, bool extendedinfoshown, bool required)
+		{
+			// Set texture name
+			texturenamelabel.Text = texturename;
+
+			// And image
+			DisplayTextureImage(image, sizelabel, texturename, required);
+			
+			//Reposition texture name label?
+			if(texturenamelabel.Width < image.Width + 2)
+				texturenamelabel.Location = new Point(image.Location.X + (image.Width - texturenamelabel.Width) / 2, texturenamelabel.Location.Y);
+			else
+				texturenamelabel.Location = new Point(image.Location.X, texturenamelabel.Location.Y);
+
+			// Resize panel
+			if(!extendedinfoshown)
+				panel.Width = Math.Max(texturenamelabel.Right + image.Location.X + 1, sizeref);
+			else
+				panel.Width = Math.Max(texturenamelabel.Right, maxlabelright) + image.Location.X;
+		}
+
+		//mxd
+		private static bool SetPairedUDMFFieldsLabel(UniFields fields, string paramX, string paramY, float defaultvalue, Label namelabel, Label valuelabel, bool highlight)
+		{
+			float x = UniFields.GetFloat(fields, paramX, defaultvalue);
+			float y = UniFields.GetFloat(fields, paramY, defaultvalue);
+
+			if(fields.ContainsKey(paramX)) x = (float)fields[paramX].Value;
+			if(fields.ContainsKey(paramY)) y = (float)fields[paramY].Value;
+
+			if(x != defaultvalue || y != defaultvalue)
+			{
+				valuelabel.Text = x.ToString(CultureInfo.InvariantCulture) + ", " + y.ToString(CultureInfo.InvariantCulture);
+				valuelabel.Enabled = true;
+				namelabel.Enabled = true;
+				return true;
+			}
+			else
+			{
+				valuelabel.Text = "--, --";
+				valuelabel.Enabled = highlight;
+				namelabel.Enabled = highlight;
+				return false;
+			}
+		}
+
+		//mxd
+		private static void SetUDMFLight(Sidedef sd, Label label, Label value, bool highlight) 
+		{
+			if(sd.Fields.ContainsKey("light")) 
+			{
+				int light = (int)sd.Fields["light"].Value;
+				
+				if(sd.Fields.GetValue("lightabsolute", false))
+					value.Text = light + " (abs.)";
+				else
+					value.Text = light + " (" + Math.Min(255, Math.Max(0, (light + sd.Sector.Brightness))) + ")";
+
+				value.Enabled = true;
+				label.Enabled = true;
+			} 
+			else 
+			{
+				value.Text = "-- (" + sd.Sector.Brightness + ")";
+				label.Enabled = highlight;
+				value.Enabled = highlight;
+			}
+
+			label.ForeColor = (highlight ? SystemColors.HotTrack : SystemColors.WindowText);
+			value.ForeColor = label.ForeColor;
+		}
+
+		//mxd
+		private static void SetArgumentText(ArgumentInfo info, Label label, int value) 
+		{
+			TypeHandler th = General.Types.GetArgumentHandler(info);
+			th.SetValue(value);
+			label.Text = th.GetStringValue();
+		}
+
+		// When visible changed
+		protected override void OnVisibleChanged(EventArgs e)
+		{
+			// Hiding panels
+			if(!this.Visible)
+			{
+				fronthightex.BackgroundImage = null;
+				frontmidtex.BackgroundImage = null;
+				frontlowtex.BackgroundImage = null;
+				backhightex.BackgroundImage = null;
+				backmidtex.BackgroundImage = null;
+				backlowtex.BackgroundImage = null;
+			}
+
+			// Call base
+			base.OnVisibleChanged(e);
+		}
+
+		// This shows a sidedef texture in a panel
+		private static void DisplayTextureImage(Panel panel, Label sizelabel, string name, bool required)
+		{
+			// Check if name is a "none" texture
+			if((name.Length < 1) || (name == "-"))
+			{
+				sizelabel.Visible = false; //mxd
+				
+				// Determine image to show
+				if(required) 
+					General.DisplayZoomedImage(panel, Properties.Resources.MissingTexture);
+				else
+					panel.BackgroundImage = null;
+			}
+			else
+			{
+				//mxd
+				ImageData texture = General.Map.Data.GetTextureImage(name);
+				if(General.Settings.ShowTextureSizes && texture.ImageState == ImageLoadState.Ready && !(texture is UnknownImage)) 
+				{
+					sizelabel.Visible = true;
+					sizelabel.Text = Math.Abs(texture.ScaledWidth) + "x" + Math.Abs(texture.ScaledHeight);
+				} 
+				else 
+				{
+					sizelabel.Visible = false;
+				}
+				
+				// Set the image
+				General.DisplayZoomedImage(panel, texture.GetPreview());
+			}
+		}
+	}
+}
diff --git a/Source/Core/Controls/LinedefInfoPanel.resx b/Source/Core/Controls/LinedefInfoPanel.resx
new file mode 100644
index 0000000..01737c4
--- /dev/null
+++ b/Source/Core/Controls/LinedefInfoPanel.resx
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="unpegged.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="peglabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="arg5.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="arglbl5.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="arglbl4.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="arg4.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="arglbl3.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="arglbl2.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="arg3.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="arglbl1.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="arg2.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="backoffset.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="arg1.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="frontoffset.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Controls/NumericTextbox.cs b/Source/Core/Controls/NumericTextbox.cs
new file mode 100644
index 0000000..167f02d
--- /dev/null
+++ b/Source/Core/Controls/NumericTextbox.cs
@@ -0,0 +1,395 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Globalization;
+using System.Windows.Forms;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Controls
+{
+	public class NumericTextbox : AutoSelectTextbox
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		private bool allownegative;		// Allow negative numbers
+		private bool allowrelative;		// Allow ++, --, * and / prefix for relative changes
+		private bool allowdecimal;		// Allow decimal (float) numbers
+		private bool controlpressed;
+		private int incrementstep; //mxd. Step for +++ and  --- prefixes
+		private readonly ToolTip tooltip; //mxd
+		
+		#endregion
+
+		#region ================== Properties
+
+		public bool AllowNegative { get { return allownegative; } set { allownegative = value; } }
+		public bool AllowRelative { get { return allowrelative; } set { allowrelative = value; UpdateTextboxStyle(); } }
+		public bool AllowDecimal  { get { return allowdecimal; } set { allowdecimal = value; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public NumericTextbox()
+		{
+			this.ImeMode = ImeMode.Off;
+
+			//mxd. Setup tooltip
+			this.tooltip = new ToolTip { AutomaticDelay = 100, AutoPopDelay = 8000, InitialDelay = 100, ReshowDelay = 100 };
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// Key pressed
+		protected override void OnKeyDown(KeyEventArgs e)
+		{
+			controlpressed = e.Control;
+			base.OnKeyDown(e);
+		}
+
+		// Key released
+		protected override void OnKeyUp(KeyEventArgs e)
+		{
+			controlpressed = e.Control;
+			base.OnKeyUp(e);
+		}
+		
+		// When a key is pressed
+		protected override void OnKeyPress(KeyPressEventArgs e)
+		{
+			incrementstep = 0; //mxd
+			string allowedchars = "0123456789\b";
+			
+			// Determine allowed chars
+			if(allownegative) allowedchars += CultureInfo.CurrentCulture.NumberFormat.NegativeSign;
+			if(allowrelative) allowedchars += "+-*/"; //mxd
+			if(controlpressed) allowedchars += "\u0018\u0003\u0016";
+			if(allowdecimal || this.Text.StartsWith("*") || this.Text.StartsWith("/")) //mxd
+				allowedchars += CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator;
+			
+			// Check if key is not allowed
+			if(allowedchars.IndexOf(e.KeyChar) == -1)
+			{
+				// Cancel this
+				e.Handled = true;
+			}
+			else
+			{
+				//mxd. Check if * or / is pressed
+				if(e.KeyChar == '*' || e.KeyChar == '/') 
+				{
+					if(this.SelectionStart - 1 > -1) e.Handled = true; //only valid when at the start of the text
+				}
+				// Check if + or - is pressed
+				else if((e.KeyChar == '+') || (e.KeyChar == '-'))
+				{
+					string nonselectedtext;
+					
+					// Determine non-selected text
+					if(this.SelectionLength > 0)
+					{
+						nonselectedtext = this.Text.Substring(0, this.SelectionStart) +
+							this.Text.Substring(this.SelectionStart + this.SelectionLength);
+					}
+					else if(this.SelectionLength < 0)
+					{
+						nonselectedtext = this.Text.Substring(0, this.SelectionStart + this.SelectionLength) +
+							this.Text.Substring(this.SelectionStart);
+					}
+					else
+					{
+						nonselectedtext = this.Text;
+					}
+					
+					// Not at the start?
+					int selectionpos = this.SelectionStart - 1;
+					if(this.SelectionLength < 0) selectionpos = (this.SelectionStart + this.SelectionLength) - 1;
+					if(selectionpos > -1)
+					{
+						// Find any other characters before the insert position
+						string textpart = this.Text.Substring(0, selectionpos + 1);
+						textpart = textpart.Replace("+", "");
+						textpart = textpart.Replace("-", "");
+						if(textpart.Length > 0)
+						{
+							// Cancel this
+							e.Handled = true;
+						}
+					}
+
+					// Determine other prefix
+					char otherprefix = (e.KeyChar == '+' ? '-' : '+');
+					
+					// Limit the number of + and - allowed
+					int numprefixes = nonselectedtext.Split(e.KeyChar, otherprefix).Length;
+					if(numprefixes > 3)
+					{
+						// Can't have more than 3 prefixes (mxd)
+						e.Handled = true;
+					}
+					else if(numprefixes > 1)
+					{
+						// Must have 2 or 3 same prefixes
+						if(this.Text.IndexOf(e.KeyChar) == -1) e.Handled = true;
+
+						// Double or triple prefix must be allowed
+						if(!allowrelative) e.Handled = true;
+					}
+				}
+			}
+			
+			// Call base
+			base.OnKeyPress(e);
+		}
+
+		// Validate contents
+		protected override void OnValidating(CancelEventArgs e)
+		{
+			//mxd. We may want "++" and "--" on their own...
+			if(allowrelative && (this.Text == "++" || this.Text == "--"))
+			{
+				// Call base and bail out
+				base.OnValidating(e);
+				return;
+			}
+			
+			// Strip prefixes
+			string textpart = this.Text.Replace("+", "").Replace("*", "").Replace("/", ""); //mxd
+			if(!allownegative) textpart = textpart.Replace("-", "");
+			
+			// No numbers left?
+			if(textpart.Length == 0)
+			{
+				// Make the textbox empty
+				this.Text = "";
+			} 
+			
+			// Call base
+			base.OnValidating(e);
+		}
+		
+		// This checks if the number is relative
+		public bool CheckIsRelative()
+		{
+			// Prefixed with +++, ---, ++, --, * or /?
+			return ( (this.Text.Length > 3 && (this.Text.StartsWith("+++") || this.Text.StartsWith("---"))) || //mxd
+				(this.Text.Length > 2 && (this.Text.StartsWith("++") || this.Text.StartsWith("--") || this.Text.StartsWith("**") || this.Text.StartsWith("//"))) || //mxd
+				(this.Text.Length > 1 && (this.Text.StartsWith("*") || this.Text.StartsWith("/"))) ); //mxd
+		}
+		
+		//mxd. This determines the result value
+		public int GetResult(int original)
+		{
+			return GetResult(original, incrementstep++);
+		}
+
+		//mxd. This determines the result value
+		public int GetResult(int original, int step)
+		{
+			string textpart = this.Text;
+			
+			// Strip prefixes
+			textpart = textpart.Replace("+", "").Replace("-", "").Replace("*", "").Replace("/", ""); //mxd
+			
+			// Any numbers left?
+			if(textpart.Length > 0)
+			{
+				int result;
+
+				//mxd. Prefixed with +++?
+				if(this.Text.StartsWith("+++"))
+				{
+					// Add number to original
+					int.TryParse(textpart, out result);
+					return original + result * step;
+				}
+				//mxd. Prefixed with ---?
+				if(this.Text.StartsWith("---"))
+				{
+					// Subtract number from original
+					int.TryParse(textpart, out result);
+					int newvalue = original - result * step;
+					if(!allownegative && (newvalue < 0)) newvalue = 0;
+					return newvalue;
+				}
+				// Prefixed with ++?
+				if(this.Text.StartsWith("++"))
+				{
+					// Add number to original
+					int.TryParse(textpart, out result);
+					return original + result;
+				}
+				// Prefixed with --?
+				if(this.Text.StartsWith("--"))
+				{
+					// Subtract number from original
+					int.TryParse(textpart, out result);
+					int newvalue = original - result;
+					if(!allownegative && (newvalue < 0)) newvalue = 0;
+					return newvalue;
+				}
+				//mxd. Prefixed with *?
+				if(this.Text.StartsWith("*")) 
+				{
+					// Multiply original by number
+					float resultf;
+					float.TryParse(textpart, NumberStyles.Float, CultureInfo.CurrentCulture, out resultf);
+					int newvalue = (int)Math.Round(original * resultf);
+					if(!allownegative && (newvalue < 0)) newvalue = 0;
+					return newvalue;
+				}
+				//mxd. Prefixed with /?
+				if(this.Text.StartsWith("/")) 
+				{
+					// Divide original by number
+					float resultf;
+					float.TryParse(textpart, NumberStyles.Float, CultureInfo.CurrentCulture, out resultf);
+					if(resultf == 0) return original;
+					int newvalue = (int)Math.Round(original / resultf);
+					if(!allownegative && (newvalue < 0)) newvalue = 0;
+					return newvalue;
+				}
+
+				//mxd. Return the new value
+				if(!int.TryParse(this.Text, out result)) return original;
+				if(!allownegative && (result < 0)) return 0;
+				return result;
+			}
+
+			// Nothing given, keep original value
+			return original;
+		}
+
+		//mxd. This determines the result value
+		public float GetResultFloat(float original)
+		{
+			return GetResultFloat(original, incrementstep++);
+		}
+
+		// This determines the result value
+		public float GetResultFloat(float original, int step)
+		{
+			// Strip prefixes
+			string textpart = this.Text.Replace("+", "").Replace("-", "").Replace("*", "").Replace("/", ""); //mxd;
+
+			// Any numbers left?
+			if(textpart.Length > 0)
+			{
+				float result;
+				
+				//mxd. Prefixed with +++?
+				if(this.Text.StartsWith("+++"))
+				{
+					// Add number to original
+					if(!float.TryParse(textpart, NumberStyles.Float, CultureInfo.CurrentCulture, out result)) result = 0;
+					return original + result * step;
+				}
+				//mxd. Prefixed with ---?
+				if(this.Text.StartsWith("---"))
+				{
+					// Subtract number from original
+					if(!float.TryParse(textpart, NumberStyles.Float, CultureInfo.CurrentCulture, out result)) result = 0;
+					float newvalue = original - result * step;
+					if(!allownegative && (newvalue < 0)) newvalue = 0;
+					return newvalue;
+				}
+				// Prefixed with ++?
+				if(this.Text.StartsWith("++"))
+				{
+					// Add number to original
+					if(!float.TryParse(textpart, NumberStyles.Float, CultureInfo.CurrentCulture, out result)) result = 0;
+					return original + result;
+				}
+				// Prefixed with --?
+				if(this.Text.StartsWith("--"))
+				{
+					// Subtract number from original
+					if(!float.TryParse(textpart, NumberStyles.Float, CultureInfo.CurrentCulture, out result)) result = 0;
+					float newvalue = original - result;
+					if(!allownegative && (newvalue < 0)) newvalue = 0;
+					return newvalue;
+				}
+				//mxd. Prefixed with *?
+				if(this.Text.StartsWith("*")) 
+				{
+					// Multiply original by number
+					if(!float.TryParse(textpart, NumberStyles.Float, CultureInfo.CurrentCulture, out result)) result = 0;
+					float newvalue = original * result;
+					if(!allownegative && (newvalue < 0)) newvalue = 0;
+					return newvalue;
+				}
+				//mxd. Prefixed with /?
+				if(this.Text.StartsWith("/")) 
+				{
+					// Divide original by number
+					if(!float.TryParse(textpart, NumberStyles.Float, CultureInfo.CurrentCulture, out result) || result == 0) return original;
+					float newvalue = (float)Math.Round(original / result, 3);
+					if(!allownegative && (newvalue < 0)) newvalue = 0;
+					return newvalue;
+				}
+
+				//mxd. Return the new value
+				if(!float.TryParse(this.Text, NumberStyles.Float, CultureInfo.CurrentCulture, out result)) return original;
+				if(!allownegative && (result < 0)) return 0;
+				return result;
+			}
+
+			// Nothing given, keep original value
+			return original;
+		}
+
+		//mxd
+		public void UpdateTextboxStyle()
+		{
+			UpdateTextboxStyle(string.Empty);
+		}
+
+		//mxd
+		public void UpdateTextboxStyle(string tip) 
+		{
+			this.ForeColor = (allowrelative ? SystemColors.HotTrack : SystemColors.WindowText);
+			if(allowrelative)
+			{
+				tooltip.SetToolTip(this, "Use ++ or -- prefixes to change by given value." + Environment.NewLine +
+					"Use +++ or --- prefixes to incrementally change by given value." + Environment.NewLine + 
+					"Use * or / prefixes to multiply or divide by given value." + Environment.NewLine + tip);
+			}
+			else if(!string.IsNullOrEmpty(tip))
+			{
+				tooltip.SetToolTip(this, tip);
+			}
+			else
+			{
+				tooltip.RemoveAll();
+			}
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Controls/OptimizedListView.cs b/Source/Core/Controls/OptimizedListView.cs
new file mode 100644
index 0000000..ada6cc1
--- /dev/null
+++ b/Source/Core/Controls/OptimizedListView.cs
@@ -0,0 +1,159 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Windows.Forms;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Controls
+{
+	public class OptimizedListView : ListView
+	{
+		#region ================== API Declarations
+
+		[DllImport("user32.dll")]
+		private static extern int SendMessage(IntPtr window, int message, int wParam, ref LVGROUP lParam);
+
+		#endregion
+
+		#region ================== Structs
+
+		[StructLayout(LayoutKind.Sequential)]
+		private struct LVGROUP
+		{
+			public int cbSize;
+			public int mask;
+			[MarshalAs(UnmanagedType.LPTStr)]
+			public string pszHeader;
+			public int cchHeader;
+			[MarshalAs(UnmanagedType.LPTStr)]
+			public string pszFooter;
+			public int cchFooter;
+			public int iGroupId;
+			public int stateMask;
+			public int state;
+			public int uAlign;
+		}
+
+		#endregion
+
+		#region ================== Enums
+
+		[Flags]
+		private enum GroupState
+		{
+			COLLAPSIBLE = 8,
+			COLLAPSED = 1,
+			EXPANDED = 0
+		}
+
+		#endregion
+
+		#region ================== Delegates
+
+		private delegate bool CallBackSetGroupCollapsible(ListViewGroup group, bool collapsed);
+		private delegate bool CallBackGetGroupCollapsed(ListViewGroup group);
+
+		#endregion
+
+		#region ================== Constructor
+
+		// Constructor
+		public OptimizedListView()
+		{
+			this.DoubleBuffered = true;
+			SetStyle(ControlStyles.OptimizedDoubleBuffer, true);
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		//mxd. Collapsible groups support. Created using http://www.codeproject.com/Articles/31276/Add-Group-Collapse-Behavior-on-a-Listview-Control as a reference
+		public bool SetGroupCollapsed(ListViewGroup group, bool collapsed) 
+		{
+			// Insanity checks...
+			if(!this.Groups.Contains(group)) return false;
+			if(Environment.OSVersion.Version.Major < 6) return false; //Only Vista and forward allows collapse of ListViewGroups
+			if(this.InvokeRequired) return (bool)this.Invoke(new CallBackSetGroupCollapsible(SetGroupCollapsed), group, collapsed);
+
+			LVGROUP groupstruct = new LVGROUP();
+			groupstruct.cbSize = Marshal.SizeOf(typeof(LVGROUP));
+			groupstruct.state = (int)((collapsed ? GroupState.COLLAPSED : GroupState.EXPANDED) | GroupState.COLLAPSIBLE);
+			groupstruct.stateMask = (int)(GroupState.COLLAPSIBLE | GroupState.COLLAPSED);
+			groupstruct.mask = 4; // LVGF_STATE 
+			SendMessage(this.Handle, 0x1000 + 147, GetGroupID(group), ref groupstruct); // #define LVM_SETGROUPINFO (LVM_FIRST + 147)
+
+			return true;
+		}
+
+		//mxd. Collapsible groups support. Created using http://fed.googlecode.com/svn/trunk/Plain.Forms/ListViewGroupEx.cs as a reference
+		public bool IsGroupCollapsed(ListViewGroup group) 
+		{
+			// Insanity checks...
+			if(!this.Groups.Contains(group)) return false;
+			if(Environment.OSVersion.Version.Major < 6) return false; //Only Vista and forward allows collapse of ListViewGroups
+			if(this.InvokeRequired) return (bool)this.Invoke(new CallBackGetGroupCollapsed(IsGroupCollapsed), group);
+
+			LVGROUP groupstruct = new LVGROUP();
+			groupstruct.cbSize = Marshal.SizeOf(typeof(LVGROUP));
+			groupstruct.stateMask = (int)(GroupState.COLLAPSIBLE | GroupState.COLLAPSED);
+			groupstruct.mask = 4; // LVGF_STATE
+
+			SendMessage(this.Handle, 0x1000 + 149, GetGroupID(group), ref groupstruct); // #define LVM_GETGROUPINFO (LVM_FIRST + 149)
+			return (groupstruct.state & (int)GroupState.COLLAPSED) != 0;
+		}
+
+		//mxd.
+		private static int GetGroupID(ListViewGroup group) 
+		{
+			int id = int.MinValue;
+			Type grouptype = group.GetType();
+
+			PropertyInfo pi = grouptype.GetProperty("ID", BindingFlags.NonPublic | BindingFlags.Instance);
+			if(pi != null) 
+			{
+				object idprop = pi.GetValue(group, null);
+				if(idprop != null) id = (int)idprop;
+			}
+
+			return id;
+		}
+
+		//mxd. Required to make "Expand/Collapse" group header button work.
+		protected override void WndProc(ref Message m) 
+		{
+			switch(m.Msg) 
+			{
+				case 0x202: // WM_LBUTTONUP
+					base.DefWndProc(ref m);
+					base.WndProc(ref m);
+					break;
+
+				default:
+					base.WndProc(ref m);
+					break;
+			}
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Controls/PasteOptionsControl.Designer.cs b/Source/Core/Controls/PasteOptionsControl.Designer.cs
new file mode 100644
index 0000000..9c59e1a
--- /dev/null
+++ b/Source/Core/Controls/PasteOptionsControl.Designer.cs
@@ -0,0 +1,148 @@
+namespace CodeImp.DoomBuilder.Controls
+{
+	partial class PasteOptionsControl
+	{
+		/// <summary> 
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Component Designer generated code
+
+		/// <summary> 
+		/// Required method for Designer support - do not modify 
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.sectorheightsgroup = new System.Windows.Forms.GroupBox();
+			this.adjustheights = new System.Windows.Forms.CheckBox();
+			this.tagsgroup = new System.Windows.Forms.GroupBox();
+			this.removeactions = new System.Windows.Forms.CheckBox();
+			this.removetags = new System.Windows.Forms.RadioButton();
+			this.renumbertags = new System.Windows.Forms.RadioButton();
+			this.keeptags = new System.Windows.Forms.RadioButton();
+			this.sectorheightsgroup.SuspendLayout();
+			this.tagsgroup.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// sectorheightsgroup
+			// 
+			this.sectorheightsgroup.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.sectorheightsgroup.Controls.Add(this.adjustheights);
+			this.sectorheightsgroup.Location = new System.Drawing.Point(0, 138);
+			this.sectorheightsgroup.Name = "sectorheightsgroup";
+			this.sectorheightsgroup.Size = new System.Drawing.Size(443, 50);
+			this.sectorheightsgroup.TabIndex = 3;
+			this.sectorheightsgroup.TabStop = false;
+			this.sectorheightsgroup.Text = " Floor and Ceiling heights ";
+			// 
+			// adjustheights
+			// 
+			this.adjustheights.AutoSize = true;
+			this.adjustheights.Location = new System.Drawing.Point(30, 24);
+			this.adjustheights.Name = "adjustheights";
+			this.adjustheights.Size = new System.Drawing.Size(292, 17);
+			this.adjustheights.TabIndex = 0;
+			this.adjustheights.Text = "Adjust heights to match relatively with surrounding sector";
+			this.adjustheights.UseVisualStyleBackColor = true;
+			// 
+			// tagsgroup
+			// 
+			this.tagsgroup.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.tagsgroup.Controls.Add(this.removeactions);
+			this.tagsgroup.Controls.Add(this.removetags);
+			this.tagsgroup.Controls.Add(this.renumbertags);
+			this.tagsgroup.Controls.Add(this.keeptags);
+			this.tagsgroup.Location = new System.Drawing.Point(0, 0);
+			this.tagsgroup.Name = "tagsgroup";
+			this.tagsgroup.Size = new System.Drawing.Size(443, 132);
+			this.tagsgroup.TabIndex = 2;
+			this.tagsgroup.TabStop = false;
+			this.tagsgroup.Text = " Tags and Actions ";
+			// 
+			// removeactions
+			// 
+			this.removeactions.AutoSize = true;
+			this.removeactions.Location = new System.Drawing.Point(30, 107);
+			this.removeactions.Name = "removeactions";
+			this.removeactions.Size = new System.Drawing.Size(116, 17);
+			this.removeactions.TabIndex = 3;
+			this.removeactions.Text = "Remove all actions";
+			this.removeactions.UseVisualStyleBackColor = true;
+			// 
+			// removetags
+			// 
+			this.removetags.AutoSize = true;
+			this.removetags.Location = new System.Drawing.Point(30, 71);
+			this.removetags.Name = "removetags";
+			this.removetags.Size = new System.Drawing.Size(101, 17);
+			this.removetags.TabIndex = 2;
+			this.removetags.TabStop = true;
+			this.removetags.Text = "Remove all tags";
+			this.removetags.UseVisualStyleBackColor = true;
+			// 
+			// renumbertags
+			// 
+			this.renumbertags.AutoSize = true;
+			this.renumbertags.Location = new System.Drawing.Point(30, 47);
+			this.renumbertags.Name = "renumbertags";
+			this.renumbertags.Size = new System.Drawing.Size(271, 17);
+			this.renumbertags.TabIndex = 1;
+			this.renumbertags.TabStop = true;
+			this.renumbertags.Text = "Renumber tags to resolve conflicts with existing tags";
+			this.renumbertags.UseVisualStyleBackColor = true;
+			// 
+			// keeptags
+			// 
+			this.keeptags.AutoSize = true;
+			this.keeptags.Location = new System.Drawing.Point(30, 24);
+			this.keeptags.Name = "keeptags";
+			this.keeptags.Size = new System.Drawing.Size(217, 17);
+			this.keeptags.TabIndex = 0;
+			this.keeptags.TabStop = true;
+			this.keeptags.Text = "Keep tags the same as they were copied";
+			this.keeptags.UseVisualStyleBackColor = true;
+			// 
+			// PasteOptionsControl
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.Controls.Add(this.sectorheightsgroup);
+			this.Controls.Add(this.tagsgroup);
+			this.Name = "PasteOptionsControl";
+			this.Size = new System.Drawing.Size(443, 208);
+			this.sectorheightsgroup.ResumeLayout(false);
+			this.sectorheightsgroup.PerformLayout();
+			this.tagsgroup.ResumeLayout(false);
+			this.tagsgroup.PerformLayout();
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.GroupBox sectorheightsgroup;
+		private System.Windows.Forms.CheckBox adjustheights;
+		private System.Windows.Forms.GroupBox tagsgroup;
+		private System.Windows.Forms.CheckBox removeactions;
+		private System.Windows.Forms.RadioButton removetags;
+		private System.Windows.Forms.RadioButton renumbertags;
+		private System.Windows.Forms.RadioButton keeptags;
+	}
+}
diff --git a/Source/Core/Controls/PasteOptionsControl.cs b/Source/Core/Controls/PasteOptionsControl.cs
new file mode 100644
index 0000000..5e08e42
--- /dev/null
+++ b/Source/Core/Controls/PasteOptionsControl.cs
@@ -0,0 +1,79 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Config;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Controls
+{
+	public partial class PasteOptionsControl : UserControl
+	{
+		#region ================== Variables
+
+		#endregion
+		
+		#region ================== Properties
+
+		#endregion
+		
+		#region ================== Constructor
+		
+		// Constructor
+		public PasteOptionsControl()
+		{
+			InitializeComponent();
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+		
+		// This sets the options from the given PasteOptions
+		public void Setup(PasteOptions options)
+		{
+			// Setup controls
+			keeptags.Checked = (options.ChangeTags == 0);
+			renumbertags.Checked = (options.ChangeTags == 1);
+			removetags.Checked = (options.ChangeTags == 2);
+			removeactions.Checked = options.RemoveActions;
+			adjustheights.Checked = options.AdjustHeights;
+		}
+		
+		// This returns the options as set by the user
+		public PasteOptions GetOptions()
+		{
+			PasteOptions options = new PasteOptions();
+			
+			// Collect settings
+			if(keeptags.Checked)
+				options.ChangeTags = 0;
+			else if(renumbertags.Checked)
+				options.ChangeTags = 1;
+			else if(removetags.Checked)
+				options.ChangeTags = 2;
+			options.RemoveActions = removeactions.Checked;
+			options.AdjustHeights = adjustheights.Checked;
+			
+			return options;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Controls/PasteOptionsControl.resx b/Source/Core/Controls/PasteOptionsControl.resx
new file mode 100644
index 0000000..19dc0dd
--- /dev/null
+++ b/Source/Core/Controls/PasteOptionsControl.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Controls/RenderTargetControl.cs b/Source/Core/Controls/RenderTargetControl.cs
new file mode 100644
index 0000000..dd67007
--- /dev/null
+++ b/Source/Core/Controls/RenderTargetControl.cs
@@ -0,0 +1,132 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Drawing;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Rendering;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Controls
+{
+	public class RenderTargetControl : Panel
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		private readonly ToolTip tip; //mxd
+
+		#endregion
+
+		#region ================== Properties
+		
+		public event KeyEventHandler OnKeyReleased; //mxd. Sometimes it's handeled here, not by MainForm
+		public Point LocationAbs { get { return this.PointToScreen(new Point(-(General.MainWindow.Width - General.MainWindow.ClientSize.Width) / 2, 0)); } } //mxd
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		internal RenderTargetControl()
+		{
+			// Initialize
+			this.SetStyle(ControlStyles.FixedWidth, true);
+			this.SetStyle(ControlStyles.FixedHeight, true);
+
+			//mxd. Create tooltip
+			tip = new ToolTip();
+			tip.UseAnimation = false;
+			tip.UseFading = false;
+			tip.InitialDelay = 0;
+			tip.AutoPopDelay = 9000;
+		}
+
+		#endregion
+
+		#region ================== Overrides
+		
+		// Paint method
+		protected override void OnPaint(PaintEventArgs pe)
+		{
+			// Pass on to base
+			// Do we really want this?
+			if(!D3DDevice.IsRendering) base.RaisePaintEvent(this, pe); //mxd. Dont raise event when in the middle of rendering
+		}
+
+		//mxd
+		protected override void OnKeyUp(KeyEventArgs e) 
+		{
+			if(OnKeyReleased != null) OnKeyReleased(this, e);
+		}
+		
+		#endregion
+
+		#region ================== Methods
+
+		// This sets up the control to display the splash logo
+		public void SetSplashLogoDisplay()
+		{
+			// Change display to show splash logo
+			this.SetStyle(ControlStyles.SupportsTransparentBackColor, false);
+			this.SetStyle(ControlStyles.ContainerControl, true);
+			this.SetStyle(ControlStyles.OptimizedDoubleBuffer, true);
+			this.SetStyle(ControlStyles.UserPaint, true);
+			this.SetStyle(ControlStyles.AllPaintingInWmPaint, true);
+			this.SetStyle(ControlStyles.Opaque, false);
+			this.UpdateStyles();
+			this.BackColor = SystemColors.ControlDarkDark;
+			this.BackgroundImage = Properties.Resources.Splash3_trans;
+			this.BackgroundImageLayout = ImageLayout.Center;
+		}
+		
+		// This sets up the control for manual rendering
+		public void SetManualRendering()
+		{
+			// Change display for rendering
+			this.SetStyle(ControlStyles.SupportsTransparentBackColor, false);
+			this.SetStyle(ControlStyles.ContainerControl, true);
+			this.SetStyle(ControlStyles.OptimizedDoubleBuffer, false);
+			this.SetStyle(ControlStyles.UserPaint, true);
+			this.SetStyle(ControlStyles.AllPaintingInWmPaint, true);
+			this.SetStyle(ControlStyles.Opaque, true);
+			this.UpdateStyles();
+			this.BackColor = Color.Black;
+			this.BackgroundImage = null;
+			this.BackgroundImageLayout = ImageLayout.None;
+		}
+
+		//mxd. This shows tooltip at given position
+		public void ShowToolTip(string title, string text, int x, int y)
+		{
+			tip.ToolTipTitle = title;
+			tip.Show(text, this, x, y);
+		}
+
+		//mxd. This hides it
+		public void HideToolTip()
+		{
+			tip.Hide(this);
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Controls/ResourceListEditor.Designer.cs b/Source/Core/Controls/ResourceListEditor.Designer.cs
new file mode 100644
index 0000000..37ff01f
--- /dev/null
+++ b/Source/Core/Controls/ResourceListEditor.Designer.cs
@@ -0,0 +1,231 @@
+namespace CodeImp.DoomBuilder.Controls
+{
+	partial class ResourceListEditor
+	{
+		/// <summary> 
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Component Designer generated code
+
+		/// <summary> 
+		/// Required method for Designer support - do not modify 
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.components = new System.ComponentModel.Container();
+			System.Windows.Forms.ListViewItem listViewItem1 = new System.Windows.Forms.ListViewItem(new string[] {
+            "C:\\Windows\\Doom\\Doom2.wad"}, 3, System.Drawing.SystemColors.GrayText, System.Drawing.SystemColors.Window, null);
+			System.Windows.Forms.ListViewItem listViewItem2 = new System.Windows.Forms.ListViewItem(new string[] {
+            "C:\\My\\Little\\Textures\\"}, 2, System.Drawing.SystemColors.GrayText, System.Drawing.SystemColors.Window, null);
+			System.Windows.Forms.ListViewItem listViewItem3 = new System.Windows.Forms.ListViewItem("C:\\My\\Little\\Pony.wad", 1);
+			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ResourceListEditor));
+			this.editresource = new System.Windows.Forms.Button();
+			this.deleteresources = new System.Windows.Forms.Button();
+			this.addresource = new System.Windows.Forms.Button();
+			this.resourceitems = new CodeImp.DoomBuilder.Controls.ResourceListView();
+			this.column = new System.Windows.Forms.ColumnHeader();
+			this.copypastemenu = new System.Windows.Forms.ContextMenuStrip(this.components);
+			this.copyresources = new System.Windows.Forms.ToolStripMenuItem();
+			this.cutresources = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+			this.pasteresources = new System.Windows.Forms.ToolStripMenuItem();
+			this.replaceresources = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
+			this.removeresources = new System.Windows.Forms.ToolStripMenuItem();
+			this.images = new System.Windows.Forms.ImageList(this.components);
+			this.copypastemenu.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// editresource
+			// 
+			this.editresource.Enabled = false;
+			this.editresource.Location = new System.Drawing.Point(122, 140);
+			this.editresource.Name = "editresource";
+			this.editresource.Size = new System.Drawing.Size(136, 24);
+			this.editresource.TabIndex = 0;
+			this.editresource.Text = "Resource options...";
+			this.editresource.UseVisualStyleBackColor = true;
+			this.editresource.Click += new System.EventHandler(this.editresource_Click);
+			// 
+			// deleteresources
+			// 
+			this.deleteresources.Enabled = false;
+			this.deleteresources.Location = new System.Drawing.Point(259, 140);
+			this.deleteresources.Name = "deleteresources";
+			this.deleteresources.Size = new System.Drawing.Size(88, 24);
+			this.deleteresources.TabIndex = 0;
+			this.deleteresources.Text = "Remove";
+			this.deleteresources.UseVisualStyleBackColor = true;
+			this.deleteresources.Click += new System.EventHandler(this.deleteresources_Click);
+			// 
+			// addresource
+			// 
+			this.addresource.Location = new System.Drawing.Point(3, 140);
+			this.addresource.Name = "addresource";
+			this.addresource.Size = new System.Drawing.Size(118, 24);
+			this.addresource.TabIndex = 0;
+			this.addresource.Text = "Add resource...";
+			this.addresource.UseVisualStyleBackColor = true;
+			this.addresource.Click += new System.EventHandler(this.addresource_Click);
+			// 
+			// resourceitems
+			// 
+			this.resourceitems.AllowDrop = true;
+			this.resourceitems.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+            this.column});
+			this.resourceitems.ContextMenuStrip = this.copypastemenu;
+			this.resourceitems.FullRowSelect = true;
+			this.resourceitems.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
+			this.resourceitems.HideSelection = false;
+			this.resourceitems.Items.AddRange(new System.Windows.Forms.ListViewItem[] {
+            listViewItem1,
+            listViewItem2,
+            listViewItem3});
+			this.resourceitems.Location = new System.Drawing.Point(0, 0);
+			this.resourceitems.Name = "resourceitems";
+			this.resourceitems.ShowGroups = false;
+			this.resourceitems.ShowItemToolTips = true;
+			this.resourceitems.Size = new System.Drawing.Size(350, 138);
+			this.resourceitems.SmallImageList = this.images;
+			this.resourceitems.TabIndex = 0;
+			this.resourceitems.UseCompatibleStateImageBehavior = false;
+			this.resourceitems.View = System.Windows.Forms.View.Details;
+			this.resourceitems.ClientSizeChanged += new System.EventHandler(this.resourceitems_ClientSizeChanged);
+			this.resourceitems.SizeChanged += new System.EventHandler(this.resources_SizeChanged);
+			this.resourceitems.DoubleClick += new System.EventHandler(this.resourceitems_DoubleClick);
+			this.resourceitems.DragDrop += new System.Windows.Forms.DragEventHandler(this.resourceitems_DragDrop);
+			this.resourceitems.ItemSelectionChanged += new System.Windows.Forms.ListViewItemSelectionChangedEventHandler(this.resourceitems_ItemSelectionChanged);
+			this.resourceitems.KeyUp += new System.Windows.Forms.KeyEventHandler(this.resourceitems_KeyUp);
+			this.resourceitems.DragOver += new System.Windows.Forms.DragEventHandler(this.resourceitems_DragOver);
+			// 
+			// column
+			// 
+			this.column.Text = "Resource location";
+			this.column.Width = 200;
+			// 
+			// copypastemenu
+			// 
+			this.copypastemenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.copyresources,
+            this.cutresources,
+            this.toolStripSeparator1,
+            this.pasteresources,
+            this.replaceresources,
+            this.toolStripSeparator2,
+            this.removeresources});
+			this.copypastemenu.Name = "copypastemenu";
+			this.copypastemenu.Size = new System.Drawing.Size(118, 126);
+			this.copypastemenu.Opening += new System.ComponentModel.CancelEventHandler(this.copypastemenu_Opening);
+			// 
+			// copyresources
+			// 
+			this.copyresources.Image = global::CodeImp.DoomBuilder.Properties.Resources.Copy;
+			this.copyresources.Name = "copyresources";
+			this.copyresources.Size = new System.Drawing.Size(117, 22);
+			this.copyresources.Text = "Copy";
+			this.copyresources.Click += new System.EventHandler(this.copyresources_Click);
+			// 
+			// cutresources
+			// 
+			this.cutresources.Image = global::CodeImp.DoomBuilder.Properties.Resources.Cut;
+			this.cutresources.Name = "cutresources";
+			this.cutresources.Size = new System.Drawing.Size(117, 22);
+			this.cutresources.Text = "Cut";
+			this.cutresources.Click += new System.EventHandler(this.cutresources_Click);
+			// 
+			// toolStripSeparator1
+			// 
+			this.toolStripSeparator1.Name = "toolStripSeparator1";
+			this.toolStripSeparator1.Size = new System.Drawing.Size(114, 6);
+			// 
+			// pasteresources
+			// 
+			this.pasteresources.Image = global::CodeImp.DoomBuilder.Properties.Resources.Paste;
+			this.pasteresources.Name = "pasteresources";
+			this.pasteresources.Size = new System.Drawing.Size(117, 22);
+			this.pasteresources.Text = "Paste";
+			this.pasteresources.Click += new System.EventHandler(this.pasteresources_Click);
+			// 
+			// replaceresources
+			// 
+			this.replaceresources.Image = global::CodeImp.DoomBuilder.Properties.Resources.Replace;
+			this.replaceresources.Name = "replaceresources";
+			this.replaceresources.Size = new System.Drawing.Size(117, 22);
+			this.replaceresources.Text = "Replace";
+			this.replaceresources.Click += new System.EventHandler(this.replaceresources_Click);
+			// 
+			// toolStripSeparator2
+			// 
+			this.toolStripSeparator2.Name = "toolStripSeparator2";
+			this.toolStripSeparator2.Size = new System.Drawing.Size(114, 6);
+			// 
+			// removeresources
+			// 
+			this.removeresources.Image = global::CodeImp.DoomBuilder.Properties.Resources.SearchClear;
+			this.removeresources.Name = "removeresources";
+			this.removeresources.Size = new System.Drawing.Size(117, 22);
+			this.removeresources.Text = "Remove";
+			this.removeresources.Click += new System.EventHandler(this.removeresources_Click);
+			// 
+			// images
+			// 
+			this.images.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("images.ImageStream")));
+			this.images.TransparentColor = System.Drawing.Color.Transparent;
+			this.images.Images.SetKeyName(0, "Folder.ico");
+			this.images.Images.SetKeyName(1, "File.ico");
+			this.images.Images.SetKeyName(2, "PK3.ico");
+			this.images.Images.SetKeyName(3, "FolderLocked.ico");
+			this.images.Images.SetKeyName(4, "FileLocked.ico");
+			this.images.Images.SetKeyName(5, "PK3Locked.ico");
+			// 
+			// ResourceListEditor
+			// 
+			this.AllowDrop = true;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.Controls.Add(this.resourceitems);
+			this.Controls.Add(this.addresource);
+			this.Controls.Add(this.editresource);
+			this.Controls.Add(this.deleteresources);
+			this.Name = "ResourceListEditor";
+			this.Size = new System.Drawing.Size(350, 166);
+			this.Resize += new System.EventHandler(this.ResourceListEditor_Resize);
+			this.copypastemenu.ResumeLayout(false);
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Button deleteresources;
+		private System.Windows.Forms.Button editresource;
+		private System.Windows.Forms.Button addresource;
+		private CodeImp.DoomBuilder.Controls.ResourceListView resourceitems;
+		private System.Windows.Forms.ColumnHeader column;
+		private System.Windows.Forms.ImageList images;
+		private System.Windows.Forms.ContextMenuStrip copypastemenu;
+		private System.Windows.Forms.ToolStripMenuItem copyresources;
+		private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
+		private System.Windows.Forms.ToolStripMenuItem pasteresources;
+		private System.Windows.Forms.ToolStripMenuItem replaceresources;
+		private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
+		private System.Windows.Forms.ToolStripMenuItem removeresources;
+		private System.Windows.Forms.ToolStripMenuItem cutresources;
+	}
+}
diff --git a/Source/Core/Controls/ResourceListEditor.cs b/Source/Core/Controls/ResourceListEditor.cs
new file mode 100644
index 0000000..2768c56
--- /dev/null
+++ b/Source/Core/Controls/ResourceListEditor.cs
@@ -0,0 +1,618 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.IO;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Data;
+using CodeImp.DoomBuilder.Windows;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Controls
+{
+	internal partial class ResourceListEditor : UserControl
+	{
+		#region ================== Delegates / Events
+
+		public delegate void ContentChanged();
+		public event ContentChanged OnContentChanged;
+		public string StartPath; //mxd
+
+		#endregion
+
+		#region ================== Variables
+
+		private Point dialogoffset = new Point(40, 20);
+		private readonly DataLocationList copiedresources; //mxd
+		private readonly int copyactionkey;
+		private readonly int cutactionkey;
+		private readonly int pasteactionkey;
+		private readonly int pastespecialactionkey;
+		private readonly int deleteactionkey;
+
+		#endregion
+
+		#region ================== Properties
+
+		public Point DialogOffset { get { return dialogoffset; } set { dialogoffset = value; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public ResourceListEditor()
+		{
+			// Initialize
+			InitializeComponent();
+			ResizeColumnHeader();
+			
+			if(General.Actions != null)
+			{
+				// Get key shortcuts (mxd)
+				copyactionkey = General.Actions.GetActionByName("builder_copyselection").ShortcutKey;
+				cutactionkey = General.Actions.GetActionByName("builder_cutselection").ShortcutKey;
+				pasteactionkey = General.Actions.GetActionByName("builder_pasteselection").ShortcutKey;
+				pastespecialactionkey = General.Actions.GetActionByName("builder_pasteselectionspecial").ShortcutKey;
+				deleteactionkey = General.Actions.GetActionByName("builder_deleteitem").ShortcutKey;
+
+				// Set displayed shortcuts (mxd)
+				copyresources.ShortcutKeyDisplayString = Actions.Action.GetShortcutKeyDesc(copyactionkey);
+				cutresources.ShortcutKeyDisplayString = Actions.Action.GetShortcutKeyDesc(cutactionkey);
+				pasteresources.ShortcutKeyDisplayString = Actions.Action.GetShortcutKeyDesc(pasteactionkey);
+				replaceresources.ShortcutKeyDisplayString = Actions.Action.GetShortcutKeyDesc(pastespecialactionkey);
+				removeresources.ShortcutKeyDisplayString = Actions.Action.GetShortcutKeyDesc(deleteactionkey);
+			}
+
+			// Start with a clear list
+			resourceitems.Items.Clear();
+			copiedresources = new DataLocationList(); //mxd
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This gets the icon index for a resource location type
+		private int GetIconIndex(int locationtype, bool locked)
+		{
+			int lockedaddition;
+			
+			// Locked?
+			if(locked) lockedaddition = (images.Images.Count / 2);
+				else lockedaddition = 0;
+			
+			// What type?
+			switch(locationtype)
+			{
+				case DataLocation.RESOURCE_DIRECTORY:
+					return 0 + lockedaddition;
+
+				case DataLocation.RESOURCE_WAD:
+					return 1 + lockedaddition;
+
+				case DataLocation.RESOURCE_PK3:
+					return 2 + lockedaddition;
+
+				default:
+					return -1;
+			}
+		}
+		
+		// This will show a fixed list
+		public void FixedResourceLocationList(DataLocationList list)
+		{
+			// Start editing list
+			resourceitems.BeginUpdate();
+			
+			// Go for all items
+			for(int i = resourceitems.Items.Count - 1; i >= 0; i--)
+			{
+				// Remove item if not fixed
+				if(resourceitems.Items[i].ForeColor != SystemColors.WindowText)
+					resourceitems.Items.RemoveAt(i);
+			}
+			
+			// Go for all items
+			for(int i = list.Count - 1; i >= 0; i--)
+			{
+				// Add item as fixed
+				resourceitems.Items.Insert(0, new ListViewItem(list[i].location));
+				resourceitems.Items[0].Tag = list[i];
+				resourceitems.Items[0].ImageIndex = GetIconIndex(list[i].type, true);
+
+				// Set disabled
+				resourceitems.Items[0].ForeColor = SystemColors.GrayText;
+
+				// Validate path (mxd)
+				resourceitems.Items[0].BackColor = (list[i].IsValid() ? resourceitems.BackColor : Color.MistyRose);
+			}
+
+			// Done
+			resourceitems.EndUpdate();
+		}
+
+		// This will edit the given list
+		public void EditResourceLocationList(DataLocationList list)
+		{
+			// Start editing list
+			resourceitems.BeginUpdate();
+
+			// Scroll to top
+			if(resourceitems.Items.Count > 0)
+				resourceitems.TopItem = resourceitems.Items[0];
+			
+			// Go for all items
+			for(int i = resourceitems.Items.Count - 1; i >= 0; i--)
+			{
+				// Remove item unless fixed
+				if(resourceitems.Items[i].ForeColor == SystemColors.WindowText)
+					resourceitems.Items.RemoveAt(i);
+			}
+
+			// Go for all items
+			for(int i = 0; i < list.Count; i++)
+			{
+				// Add item
+				AddItem(list[i]);
+			}
+
+			// Done
+			resourceitems.EndUpdate();
+			ResizeColumnHeader();
+			
+			// Raise content changed event
+			if(OnContentChanged != null) OnContentChanged();
+		}
+
+		// This adds a normal item
+		/*public void AddResourceLocation(DataLocation rl)
+		{
+			// Add it
+			AddItem(rl);
+
+			// Raise content changed event
+			if(OnContentChanged != null) OnContentChanged();
+		}*/
+
+		// This adds a normal item
+		private void AddItem(DataLocation rl)
+		{
+			// Start editing list
+			resourceitems.BeginUpdate();
+
+			// Add item
+			int index = resourceitems.Items.Count;
+			resourceitems.Items.Add(new ListViewItem(rl.location));
+			resourceitems.Items[index].Tag = rl;
+			resourceitems.Items[index].ImageIndex = GetIconIndex(rl.type, false);
+			
+			// Set normal color
+			resourceitems.Items[index].ForeColor = SystemColors.WindowText;
+
+			// Validate path (mxd)
+			resourceitems.Items[index].BackColor = (rl.IsValid() ? resourceitems.BackColor : Color.MistyRose);
+
+			// Done
+			resourceitems.EndUpdate();
+		}
+
+		//mxd
+		private void DropItem(IDataObject data) 
+		{
+			if(!data.GetDataPresent(DataFormats.FileDrop)) return;
+
+			string[] paths = (string[])data.GetData(DataFormats.FileDrop);
+			Dictionary<string, bool> curlocations = GetLocationNames();
+			foreach(string path in paths) 
+			{
+				if(curlocations.ContainsKey(path)) continue;
+
+				if(File.Exists(path)) 
+				{
+					string ext = Path.GetExtension(path);
+					if(string.IsNullOrEmpty(ext)) continue;
+					switch(ext.ToLower())
+					{
+						case ".wad":
+							AddItem(new DataLocation(DataLocation.RESOURCE_WAD, path, false, false, false));
+							break;
+						case ".pk7":
+						case ".pk3":
+							AddItem(new DataLocation(DataLocation.RESOURCE_PK3, path, false, false, false));
+							break;
+					}
+				} 
+				else if(Directory.Exists(path)) 
+				{
+					AddItem(new DataLocation(DataLocation.RESOURCE_DIRECTORY, path, false, false, false));
+				}
+			}
+		}
+		
+		// This fixes the column header in the list
+		private void ResizeColumnHeader()
+		{
+			// Resize column header to full extend
+			column.Width = resourceitems.ClientSize.Width - SystemInformation.VerticalScrollBarWidth;
+		}
+
+		// When the resources list resizes
+		private void resources_SizeChanged(object sender, EventArgs e)
+		{
+			// Resize column header also
+			ResizeColumnHeader();
+		}
+
+		// Add a resource
+		private void addresource_Click(object sender, EventArgs e)
+		{
+			// Open resource options dialog
+			ResourceOptionsForm resoptions = new ResourceOptionsForm(new DataLocation(), "Add Resource", StartPath);
+			resoptions.StartPosition = FormStartPosition.Manual;
+			Rectangle startposition = new Rectangle(dialogoffset.X, dialogoffset.Y, 1, 1);
+			startposition = this.RectangleToScreen(startposition);
+			Screen screen = Screen.FromPoint(startposition.Location);
+			if(startposition.X + resoptions.Size.Width > screen.WorkingArea.Right)
+				startposition.X = screen.WorkingArea.Right - resoptions.Size.Width;
+			if(startposition.Y + resoptions.Size.Height > screen.WorkingArea.Bottom)
+				startposition.Y = screen.WorkingArea.Bottom - resoptions.Size.Height;
+			resoptions.Location = startposition.Location;
+			if(resoptions.ShowDialog(this) == DialogResult.OK)
+			{
+				// Add resource
+				AddItem(resoptions.ResourceLocation);
+			}
+
+			// Raise content changed event
+			if(OnContentChanged != null) OnContentChanged();
+		}
+
+		// Edit resource
+		private void editresource_Click(object sender, EventArgs e)
+		{
+			// Anything selected?
+			if(resourceitems.SelectedItems.Count == 1)
+			{
+				// Get selected item
+				ListViewItem selecteditem = resourceitems.SelectedItems[0];
+
+				// Open resource options dialog
+				ResourceOptionsForm resoptions = new ResourceOptionsForm((DataLocation)selecteditem.Tag, "Resource Options", StartPath);
+				resoptions.StartPosition = FormStartPosition.Manual;
+				Rectangle startposition = new Rectangle(dialogoffset.X, dialogoffset.Y, 1, 1);
+				startposition = this.RectangleToScreen(startposition);
+				Screen screen = Screen.FromPoint(startposition.Location);
+				if(startposition.X + resoptions.Size.Width > screen.WorkingArea.Right)
+					startposition.X = screen.WorkingArea.Right - resoptions.Size.Width;
+				if(startposition.Y + resoptions.Size.Height > screen.WorkingArea.Bottom)
+					startposition.Y = screen.WorkingArea.Bottom - resoptions.Size.Height;
+				resoptions.Location = startposition.Location;
+				if(resoptions.ShowDialog(this) == DialogResult.OK)
+				{
+					// Start editing list
+					resourceitems.BeginUpdate();
+
+					// Update item
+					DataLocation rl = resoptions.ResourceLocation;
+					selecteditem.Text = rl.location;
+					selecteditem.Tag = rl;
+					selecteditem.ImageIndex = GetIconIndex(rl.type, false);
+					
+					// Done
+					resourceitems.EndUpdate();
+					
+					// Raise content changed event
+					if(OnContentChanged != null) OnContentChanged();
+				}
+			}
+		}
+
+		// Remove resource
+		private void deleteresources_Click(object sender, EventArgs e)
+		{
+			DeleteSelectedResources(); //mxd
+		}
+		
+		// Item selected
+		private void resourceitems_ItemSelectionChanged(object sender, ListViewItemSelectionChangedEventArgs e)
+		{
+			// Anything selected
+			if(resourceitems.SelectedItems.Count > 0)
+			{
+				// Go for all selected items
+				for(int i = resourceitems.SelectedItems.Count - 1; i >= 0; i--)
+				{
+					// Item grayed? Then deselect.
+					if(resourceitems.SelectedItems[i].ForeColor != SystemColors.WindowText)
+						resourceitems.SelectedItems[i].Selected = false;
+				}
+			}
+
+			// Anything selected
+			if(resourceitems.SelectedItems.Count > 0)
+			{
+				// Enable buttons
+				editresource.Enabled = (resourceitems.SelectedItems.Count == 1);
+				deleteresources.Enabled = true;
+			}
+			else
+			{
+				// Disable buttons
+				editresource.Enabled = false;
+				deleteresources.Enabled = false;
+			}
+		}
+
+		// When an item is double clicked
+		private void resourceitems_DoubleClick(object sender, EventArgs e)
+		{
+			// Click the edit resource button
+			if(editresource.Enabled) editresource_Click(sender, e);
+		}
+
+		// Returns a list of the resources
+		public DataLocationList GetResources()
+		{
+			DataLocationList list = new DataLocationList();
+
+			// Go for all items
+			for(int i = 0; i < resourceitems.Items.Count; i++)
+			{
+				// Item not grayed?
+				if(resourceitems.Items[i].ForeColor == SystemColors.WindowText)
+				{
+					// Add item to list
+					list.Add((DataLocation)resourceitems.Items[i].Tag);
+				}
+			}
+
+			// Return result
+			return list;
+		}
+
+		//mxd
+		public bool ResourcesAreValid()
+		{
+			foreach(ListViewItem item in resourceitems.Items)
+			{
+				if(!((DataLocation)item.Tag).IsValid()) return false;
+			}
+			return true;
+		}
+
+		// Item dragged
+		private void resourceitems_DragOver(object sender, DragEventArgs e)
+		{
+			// Raise content changed event
+			if(OnContentChanged != null) OnContentChanged();
+		}
+
+		// Item dropped
+		private void resourceitems_DragDrop(object sender, DragEventArgs e)
+		{
+			DropItem(e.Data); //mxd
+			
+			// Raise content changed event
+			if(OnContentChanged != null) OnContentChanged();
+		}
+
+		// Client size changed
+		private void resourceitems_ClientSizeChanged(object sender, EventArgs e)
+		{
+			// Resize column header
+			ResizeColumnHeader();
+		}
+
+		#endregion
+
+		#region ================== Copy / Paste (mxd)
+
+		private void CopySelectedResources()
+		{
+			// Don't do stupid things
+			if(resourceitems.SelectedItems.Count == 0) return;
+
+			copiedresources.Clear();
+			foreach(ListViewItem item in resourceitems.SelectedItems) 
+			{
+				if(item.Tag is DataLocation) copiedresources.Add((DataLocation)item.Tag);
+			}
+
+			// Display notification
+			General.Interface.DisplayStatus(StatusType.Info, copiedresources.Count + " Resource" + (copiedresources.Count > 1 ? "s" : "") + " Copied to Clipboard");
+		}
+
+		private void PasteResources()
+		{
+			// Don't do stupid things
+			if(copiedresources.Count == 0) return;
+
+			Dictionary<string, bool> curlocations = GetLocationNames();
+			int pastedcount = 0;
+			foreach(DataLocation dl in copiedresources) 
+			{
+				if(curlocations.ContainsKey(dl.location)) continue;
+				AddItem(dl);
+				pastedcount++;
+			}
+
+			if(pastedcount > 0) 
+			{
+				ResizeColumnHeader();
+
+				// Display notification
+				General.Interface.DisplayStatus(StatusType.Info, pastedcount + " Resource" + (pastedcount > 1 ? "s" : "") + " Pasted");
+
+				// Raise content changed event
+				if(OnContentChanged != null) OnContentChanged();
+			}
+		}
+
+		private void ReplaceResources()
+		{
+			// Don't do stupid things
+			if(copiedresources.Count == 0) return;
+
+			int pastedcount = 0;
+
+			// Delete non-fixed resources
+			for(int i = resourceitems.Items.Count - 1; i > -1; i--) 
+			{
+				if(resourceitems.Items[i].ForeColor != SystemColors.WindowText) break;
+				resourceitems.Items.Remove(resourceitems.Items[i]);
+				pastedcount++;
+			}
+
+			// Paste new resources
+			Dictionary<string, bool> curlocations = GetLocationNames();
+			foreach(DataLocation dl in copiedresources) 
+			{
+				if(curlocations.ContainsKey(dl.location)) continue;
+				AddItem(dl);
+				pastedcount++;
+			}
+
+			if(pastedcount > 0) 
+			{
+				ResizeColumnHeader();
+
+				// Display notification
+				General.Interface.DisplayStatus(StatusType.Info, pastedcount + " Resource" + (pastedcount > 1 ? "s" : "") + " Replaced");
+
+				// Raise content changed event
+				if(OnContentChanged != null) OnContentChanged();
+			}
+		}
+
+		private void DeleteSelectedResources()
+		{
+			// Don't do stupid things
+			if(resourceitems.SelectedItems.Count == 0) return;
+
+			// Remove them (mxd)
+			foreach(ListViewItem item in resourceitems.SelectedItems) 
+			{
+				// Remove item unless fixed
+				if(item.ForeColor == SystemColors.WindowText) resourceitems.Items.Remove(item);
+			}
+
+			ResizeColumnHeader();
+
+			// Raise content changed event
+			if(OnContentChanged != null) OnContentChanged();
+		}
+
+		private Dictionary<string, bool> GetLocationNames() 
+		{
+			Dictionary<string, bool> dict = new Dictionary<string, bool>(resourceitems.Items.Count);
+			foreach(ListViewItem item in resourceitems.Items) 
+			{
+				if(!(item.Tag is DataLocation)) continue;
+				DataLocation dl = (DataLocation)item.Tag;
+				if(!dict.ContainsKey(dl.location)) dict.Add(dl.location, false);
+			}
+
+			return dict;
+		}
+
+		#endregion
+
+		#region ================== Copy / Paste Events (mxd)
+
+		private void copyresources_Click(object sender, EventArgs e)
+		{
+			CopySelectedResources();
+		}
+
+		private void cutresources_Click(object sender, EventArgs e) 
+		{
+			CopySelectedResources();
+			DeleteSelectedResources();
+		}
+
+		private void pasteresources_Click(object sender, EventArgs e)
+		{
+			PasteResources();
+		}
+
+		private void replaceresources_Click(object sender, EventArgs e)
+		{
+			ReplaceResources();
+		}
+
+		private void removeresources_Click(object sender, EventArgs e) 
+		{
+			DeleteSelectedResources();
+		}
+
+		// Update copy/paste menu buttons
+		private void copypastemenu_Opening(object sender, System.ComponentModel.CancelEventArgs e)
+		{
+			copyresources.Enabled = resourceitems.SelectedItems.Count > 0;
+			cutresources.Enabled = resourceitems.SelectedItems.Count > 0;
+			pasteresources.Enabled = copiedresources.Count > 0;
+			replaceresources.Enabled = copiedresources.Count > 0;
+			removeresources.Enabled = resourceitems.SelectedItems.Count > 0;
+		}
+
+		private void resourceitems_KeyUp(object sender, KeyEventArgs e) 
+		{
+			if(sender != resourceitems) return;
+
+			if((int)e.KeyData == copyactionkey) CopySelectedResources();
+			else if((int)e.KeyData == pasteactionkey) PasteResources();
+			else if((int)e.KeyData == pastespecialactionkey) ReplaceResources();
+			else if((int)e.KeyData == deleteactionkey) DeleteSelectedResources();
+			else if((int)e.KeyData == cutactionkey)
+			{
+				CopySelectedResources();
+				DeleteSelectedResources();
+			}
+		}
+
+		#endregion
+
+		#region ================== Events (mxd)
+
+		//mxd. Because anchor-based alignment fails when using high-Dpi settings...
+		private void ResourceListEditor_Resize(object sender, EventArgs e)
+		{
+			resourceitems.Width = this.Width;
+			resourceitems.Height = this.Height - addresource.Height - addresource.Margin.Top - addresource.Margin.Bottom;
+			
+			addresource.Top = resourceitems.Bottom + addresource.Margin.Top;
+			editresource.Top = addresource.Top;
+			deleteresources.Top = addresource.Top;
+
+			int buttonwidth = (this.Width - addresource.Margin.Left * 2) / 3;
+			addresource.Width = buttonwidth;
+			editresource.Width = buttonwidth;
+			deleteresources.Width = buttonwidth;
+
+			addresource.Left = 0;
+			editresource.Left = addresource.Right + addresource.Margin.Left;
+			deleteresources.Left = editresource.Right + addresource.Margin.Left;
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Controls/ResourceListEditor.resx b/Source/Core/Controls/ResourceListEditor.resx
new file mode 100644
index 0000000..6563dbc
--- /dev/null
+++ b/Source/Core/Controls/ResourceListEditor.resx
@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="copypastemenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>195, 17</value>
+  </metadata>
+  <metadata name="images.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <data name="images.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
+        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
+        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAi
+        FgAAAk1TRnQBSQFMAgEBBgEAAZwBAAGcAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        AwABIAMAAQEBAAEgBgABIDcAApYB/wEAApYB/wEAAkAB/wEAAkAB/wEAAkAB/wEAAkAB/y0AApYB/wEA
+        ApYB/wEAAkAB/wEAAkAB/wEAAkAB/wEAAkAB/5QAA4UB/wOFAf8DhQH/A4UB/wEAArkB/wEAApYB/wEA
+        ApYB/wEAAoEB/wEAAoEB/wEAAkAB/xAAA4AB/wOBAf8DgAH/A4AB/wOBAf8DgQH/A4AB/wEAArkB/wEA
+        ApYB/wEAApYB/wEAAoEB/wEAAoEB/wEAAkAB/5AAA4UB/wOFAf8DxgH/A8kB/wPGAf8BAAK5Af8DoAH/
+        A2oB/wNqAf8BAAKBAf8BAAJAAf8MAAOAAf8DVAH/A4AB/wOVAf8DyQH/A9oB/wPaAf8DvAH/AQACuQH/
+        A6gB/wOBAf8DgQH/AQACgQH/AQACQAH/jAADhQH/A8EB/wOFAf8D5QH/A+EB/wPlAf8BAAK5Af8BAAP/
+        AQAD/wEAA/8BAAKBAf8BAAJAAf8IAAOAAf8DgQH/A4EB/wOAAf8DgQH/A4AB/wOBAf8DgAH/A4EB/wEA
+        ArkB/wEAA/8BAAP/AQAD/wEAAoEB/wEAAkAB/4gAA4UB/wPBAf8D0QH/A4UB/wPhAf8D4QH/A+UB/wEA
+        ArkB/wEAApYB/wEAApYB/wEAAoEB/wEAAoEB/wEAAmMB/xAAA48B/wOAAf8DgQH/A4AB/wOBAf8DgAH/
+        A4EB/wEAArkB/wEAApYB/wEAApYB/wEAAoEB/wEAAoEB/wEAAmMB/4gAA4UB/wOFAf8DhQH/A8EB/wPe
+        Af8D3gH/A+EB/wEAArkB/wEAAkAB/wOxAf8DCgH/AQACgQH/AQACQAH/DAADjwH/A+MB/wOPAf8D1QH/
+        A9oB/wPeAf8D4wH/A4AB/wEAArkB/wEAAkAB/wOxAf8DgQH/AQACgQH/AQACQAH/iAADhQH/A+EB/wPR
+        Af8D1QH/A9kB/wPeAf8D4QH/AQACuQH/AQACQAH/AwAB/wMKAf8BAAKWAf8BAAJAAf8MAAOPAf8DjwH/
+        A48B/wPRAf8D2gH/A94B/wPeAf8DgAH/AQACuQH/AQACQAH/AwAB/wEPAQcBCAH/AQAClgH/AQACQAH/
+        iAADhQH/A94B/wPNAf8D0QH/A9UB/wPZAf8D2QH/A94B/wEAArkB/wEAArkB/wEAApYB/wEAAkAB/xAA
+        A48B/wPeAf8D0QH/A9EB/wPVAf8D2gH/A9oB/wOAAf8FAAK5Af8BAAK5Af8BAAKWAf8BAAJAAf+MAAOF
+        Af8D3gH/A80B/wPNAf8D0QH/A9UB/wPZAf8D2QH/A94B/wPZAf8DhQH/FAADjwH/A94B/wPNAf8DzQH/
+        A9EB/wPVAf8D2gH/A4AB/wQAA48B/wOPAf8DgQH/kAADhQH/A94B/wPJAf8DyQH/A80B/wPRAf8D1QH/
+        A9UB/wPZAf8D1QH/A4UB/xQAA48B/wPeAf8DyQH/A8kB/wPNAf8D0QH/A9UB/wOAAf8EAAOBAf8D0QH/
+        A6QB/5AAA4UB/wPeAf8DxgH/A8kB/wPJAf8DzQH/A9EB/wPRAf8D1QH/A9UB/wOFAf8UAAOPAf8D3gH/
+        A8UB/wPFAf8DyQH/A80B/wPNAf8DgQH/BAADjwH/A48B/wOAAf+QAAOFAf8D2QH/A8EB/wPBAf8DxgH/
+        A8kB/wPNAf8DzQH/A9UB/wPRAf8DhQH/FAADjwH/A9oB/wPBAf8DwQH/A8UB/wPJAf8DzQH/A4AB/wQA
+        A4AB/wPRAf8DpAH/kAADhQH/A9kB/wPBAf8DxgH/A8YB/wPJAf8DzQH/A80B/wPRAf8D0QH/A4UB/xQA
+        A48B/wOPAf8DjwH/A48B/wOPAf8DjwH/A48B/wOPAf8EAAOAAf8DoAH/A4EB/5AAA4UB/wP1Af8D4QH/
+        A94B/wPeAf8D2QH/A9kB/wPZAf8D1QH/A9UB/wOFAf8QAAOAAf8DgAH/A4EB/wOAAf8DgQH/A4EB/wOB
+        Af8DgQH/A4EB/wOAAf8DmgH/A58B/wNRAf8DgAH/jAADhQH/A4UB/wOFAf8DhQH/A4UB/wOFAf8DhQH/
+        A4UB/wOFAf8DhQH/A4UB/xQAA4EB/wNaAf8DlQH/A8kB/wPaAf8D2gH/A9oB/wPaAf8D2gH/A7wB/wOA
+        Af8DgAH/A4AB/9AAA4AB/wOAAf8DgAH/A4AB/wOAAf8DgAH/A4AB/wOAAf8DgAH/A4AB/wOAAf//ADQA
+        Af8DAAH/AwAB/wMAAf8tAAKWAf8BAAKWAf8BAAJAAf8BAAJAAf8BAAJAAf8BAAJAAf9YAAMPAf8DDwH/
+        Aw8B/wMPAf8DDwH/Aw8B/wMPAf8DDwH/GAABAgIAAf8BAgIAAf8BAgIAAf8BAgIAAf8BAgIAAf8BAgIA
+        Af8BAgIAAf8BHQETAQ8B/wFkAWABVgH/AVEBTAEfAf8BDgEJAQAB/wECAgAB/ykAArkB/wEAApYB/wEA
+        ApYB/wEAAoEB/wEAAoEB/wEAAkAB/wQAAYEBiAGQAf8BYQGBAZAB/wFhAoEB/wFRAoEB/wFRAWEBgQH/
+        AUEBWQFhAf8BQQFJAVEB/wExATkBQQH/ASECMQH/AiEBMQH/AREBGQEhAf8DEQH/AhEBIQH/HAADDwH/
+        AwEB/wOwAf8DsQH/A7AB/wOtAf8DqwH/A6AB/wMPAf8UAAENAgAB/wExAR8BAAH/AVUBRwEhAf8BnwGC
+        ASgB/wHbAccBkAH/AeYB1wG0Af8B5gHXAbQB/wG0Aa4BjwH/AWcBXQE6Af8BawFdATkB/wFKAT4BFwH/
+        AREBBQEAAf8BAgIAAf8EAAOXAf8DkQH/A4kB/wOEAf8DgQH/A2EB/wNaAf8DTQH/A0AB/wEAArkB/wOg
+        Af8DagH/A2oB/wEAAoEB/wEAAkAB/wQAAYEBiAGQAf8BkAGoAbAB/wGQAagBsAH/AQEBkAHQAf8BAQGQ
+        AdAB/wEBAZAB0AH/AQEBkAHAAf8BEQGIAcAB/wERAYEBsAH/AREBgQGwAf8BIQGBAaAB/wEhAYEBkAH/
+        ASEBSQFhAf8DkgH/FAADDwH/A6oB/wMBAf8D1wH/A9kB/wPcAf8D3wH/A+EB/wPPAf8DDwH/EwAB/wMA
+        Af8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AQ4BBwEDAf8BXgFVAUEB/wFkAVMBJgH/ARwBDQEA
+        Af8BAgIAAf8EAAOXAf8DsQH/A7EB/wOEAf8DhAH/A4QB/wOBAf8DhAH/A4EB/wEAArkB/wEAA/8BAAP/
+        AQAD/wEAAoEB/wEAAkAB/wQAAYEBiAGQAf8BYQHYAv8BkAGoAbAB/wGBAeAC/wFhAdAC/wFRAcgC/wFR
+        AcgC/wFBAcAB8AH/ATEBsAHwAf8BMQGoAfAB/wEhAaAB4AH/AREBkAHQAf8BIQFpAYEB/wFaAWIBaAH/
+        EAADDwH/A6oB/wPBAf8DAQH/A9UB/wPZAf8D3QH/A+EB/wPlAf8D0gH/Aw8B/xgAA1QB/wMAAf8DAAH/
+        AwAB/wMAAf8DAAH/AwAB/wQAASgBIAEaAf8BYAFaAVAB/wELAQEBBAH/CAADngH/A74B/wOxAf8DywH/
+        A74B/wO4Af8DuAH/A6sB/wOkAf8BAAK5Af8BAAKWAf8BAAKWAf8BAAKBAf8BAAKBAf8BAAJjAf8EAAGB
+        AZABoAH/AWEB2AL/AZABqAGwAf8BkAHAAdAB/wGBAdgC/wFhAdAC/wFhAdAC/wFRAcgC/wFRAcAC/wFB
+        AbgB8AH/ATEBsAHwAf8BMQGoAfAB/wERAYgB0AH/ASEBSQFhAf8DkgH/DAADDwH/AwEB/wMBAf8DqgH/
+        A84B/wPTAf8D2AH/A9wB/wPgAf8D0QH/Aw8B/xQAA1QB/wPYAf8DVAH/A8AB/wPOAf8D0wH/A9gB/wMA
+        Af8EAAEiARgBFwH/A8AB/wOBAf8IAAOkAf8DvgH/A7EB/wO+Af8DxAH/A74B/wO+Af8DuAH/A7gB/wEA
+        ArkB/wEAAkAB/wOxAf8DCgH/AQACgQH/AQACQAH/BAABgQGQAaAB/wGBAdgB8AH/AWEB2AL/AZABqAGw
+        Af8BgQHgAv8BgQHQAv8BYQHYAv8BYQHQAv8BYQHQAv8BUQHIAv8BQQHAAfAB/wFBAbgB8AH/ATEBsAHw
+        Af8BIQFpAYEB/wOBAf8MAAMPAf8D1QH/A8EB/wPEAf8DyQH/A88B/wPTAf8D1wH/A9sB/wPNAf8DDwH/
+        FAADVAH/A1QB/wNUAf8DwAH/A8kB/wPPAf8D0wH/AwAB/wQAA1QB/wNUAf8BDgEFAQcB/wgAA6QB/wPE
+        Af8DvgH/A7EB/wPLAf8DxAH/A74B/wO+Af8DvgH/AQACuQH/AQACQAH/AwAB/wMKAf8BAAKWAf8BAAJA
+        Af8EAAGBAZgBoAH/AZAB4AHwAf8BYQHYAv8BkAGoAbAB/wGQAbgBwAH/AYEB2AL/AWEB2AL/AWEB2AL/
+        AWEB2AL/AWEB0AL/AVEB0AL/AVEByAL/AUEBuAHwAf8BMQGgAeAB/wFKAWgBgQH/A5IB/wgAAw8B/wPT
+        Af8DvAH/A8AB/wPFAf8DyQH/A80B/wPRAf8D1QH/A8wB/wMPAf8UAANUAf8D0wH/A7wB/wPAAf8DxQH/
+        A8kB/wPNAf8DAAH/BAABHAESARMB/wPAAf8DgQH/CAADpAH/A8sB/wO+Af8DsQH/A7gB/wPEAf8DvgH/
+        A74B/wO+Af8DvgH/AQACuQH/AQACuQH/AQAClgH/AQACQAH/ATkBVwFnAf8DpAH/AYEBmAGgAf8BkAHg
+        AfAB/wGgAegC/wFhAdgC/wGQAagBsAH/AYEB4AL/AYEB4AL/AYEB4AL/AYEB4AL/AYEB4AL/AYEB4AL/
+        AYEB4AL/AYEB2AL/AYEB2AL/AVEBqAHQAf8DgQH/CAADDwH/A9EB/wO3Af8DuwH/A8AB/wPEAf8DyAH/
+        A8wB/wPRAf8DyQH/Aw8B/xQAA1QB/wPRAf8DtwH/A7sB/wPAAf8DxAH/A8gB/wMAAf8EAANUAf8DVAH/
+        AQcBAAEBAf8IAAOkAf8DywH/A9gB/wO+Af8DsQH/A8sB/wPLAf8DywH/A8sB/wPLAf8DywH/A8sB/wPE
+        Af8DxAH/A6QB/wOJAf8BkAKgAf8BoAHoAfAB/wGgAegC/wGgAegC/wGQAagBsAH/AZABqAGwAf8BkAGo
+        AbAB/wGQAagBsAH/AYEBoAGwAf8BgQGgAbAB/wGBAZgBoAH/AYEBmAGgAf8BgQGQAaAB/wGBAZABoAH/
+        AYEBiAGQAf8BgQGIAZAB/wgAAw8B/wPRAf8DswH/A7UB/wO5Af8DvwH/A8MB/wPHAf8DywH/A8YB/wMP
+        Af8UAANUAf8D0QH/A7MB/wO1Af8DuQH/A78B/wPDAf8DAAH/BAABHAESARMB/wPAAf8DgQH/CAADqwH/
+        A9IB/wPYAf8D2AH/A7EB/wOxAf8DsQH/A7EB/wOrAf8DqwH/A6QB/wOkAf8DpAH/A6QB/wOeAf8DlwH/
+        AZABoAGwAf8BoAHoAfAB/wGgAfAC/wGgAegC/wGgAegC/wGBAdgC/wFhAdgC/wFhAdgC/wFhAdgC/wFh
+        AdgC/wFhAdgC/wFhAdgC/wGBAYgBkAH/FAADDwH/A9EB/wOtAf8DsQH/A7QB/wO5Af8DvAH/A8EB/wPF
+        Af8DxAH/Aw8B/xQAA1QB/wPRAf8DrQH/A7EB/wO0Af8DuQH/A7wB/wMAAf8EAANUAf8DVAH/AQcBAAEB
+        Af8IAAOxAf8D0gH/A9gB/wPYAf8D2AH/A8sB/wO+Af8DvgH/A74B/wO+Af8DvgH/A74B/wOXAf8MAAGQ
+        AaABsAH/AaAC8AH/AbAC8AH/AaAB8AL/AaAB6AL/AaAB6AL/AYEB2AL/AZACoAH/AYEBmAGgAf8BgQGY
+        AaAB/wGBAZABoAH/AYECkAH/AYEBiAGQAf8UAAMPAf8DygH/A6gB/wOsAf8DsAH/A7QB/wO4Af8DvAH/
+        A8AB/wPBAf8DDwH/FAADVAH/A8oB/wOoAf8DrAH/A7AB/wO0Af8DuAH/AwAB/wQAARwBEgETAf8DwAH/
+        A4EB/wgAA7EB/wPSAf8D2AH/A9gB/wPYAf8D2AH/A8QB/wOrAf8DpAH/A6QB/wOkAf8DngH/A5cB/wwA
+        AZABqAGwAf8BoAHQAeAB/wGwAvAB/wGwAvAB/wGgAfAC/wGgAegC/wGQAaABsAH/A5IB/ygAAw8B/wPL
+        Af8DqQH/A6wB/wOwAf8DtAH/A7cB/wO7Af8DvQH/A8AB/wMPAf8UAANUAf8DVAH/A1QB/wNUAf8DVAH/
+        A1QB/wNUAf8DVAH/BAABEQEJAQoB/wGFAYMBYgH/ARMBCgEJAf8IAAOxAf8DywH/A9gB/wPYAf8D2AH/
+        A9gB/wOxAf8DpAH/JAABkAGoAbAB/wGQAagBsAH/AZABqAGwAf8BkAGoAbAB/wGQAagBsAH/A5IB/ywA
+        Aw8B/wPyAf8D1QH/A9IB/wPRAf8DzgH/A8sB/wPKAf8DxwH/A8YB/wMPAf8TAAH/AQICAAH/AQICAAH/
+        AQICAAH/AQICAAH/AQICAAH/AQICAAH/AQICAAH/AQICAAH/AQICAAH/AYEBaAFZAf8BnQGRAUgB/wEt
+        AR0BAAH/AwAB/wgAA7EB/wOxAf8DsQH/A7EB/wOxAf8DpAH/bAADDwH/Aw8B/wMPAf8DDwH/Aw8B/wMP
+        Af8DDwH/Aw8B/wMPAf8DDwH/Aw8B/xQAAQUCAAH/AUUBKQEAAf8BnwGCASgB/wHbAccBkAH/AeYB1wG0
+        Af8B5gHXAbQB/wHmAdcBtAH/AeYB1wG0Af8B4AHVAbEB/wG0Aa4BjwH/AVIBRgEjAf8BFQEIAQAB/wEC
+        AgAB/9MAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8BAgIAAf9IAAFCAU0BPgcA
+        AT4DAAEoAwABQAMAASADAAEBAQABAQYAAQEWAAP/AQAB/wGBAf8BwAQAAfgBAQHgBQAB8AEBAcAFAAHg
+        AQEBgAUAAcABAQHgBQABwAEBAcAFAAHAAQEBwAUAAcABAwHAASEEAAHAAQcBwAEjBAABwAEHAcABIwQA
+        AcABBwHAASMEAAHAAQcBwAEjBAABwAEHAcABIwQAAcABBwGAAQEEAAHAAQcBwAEBBAAC/wHgAQMEAAX/
+        AcMB/wGBAv8B+AEHAeABAQH/AYEBAAEHAfABBwHAAQEBAAEBAQABAwHgAQcBgAEBAQABAQEAAQMBwAEH
+        AeABIwEAAQEBAAEBAcABBwHAASMBAAEBAQABAQHAAQcBwAEjAQABAQIAAcABBwHAASMEAAHAAQcBwAEj
+        BAABwAEHAcABIwMAAQcBwAEHAcABIwEAAQcBAAEHAcABBwHAASMBAAEHAQAB/wHAAQcBwAEjAQAB/wGB
+        Af8BwAEHAYABAQGBA/8BwAEHAcABAQb/AeABAwL/Cw==
+</value>
+  </data>
+  <metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Controls/ResourceListView.cs b/Source/Core/Controls/ResourceListView.cs
new file mode 100644
index 0000000..a33c27b
--- /dev/null
+++ b/Source/Core/Controls/ResourceListView.cs
@@ -0,0 +1,285 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Windows.Forms;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Controls
+{
+	internal class ResourceListView : ListView
+	{
+		#region ================== Constants
+
+		private const string DRAG_TYPE = "ReorderItems";
+
+		#endregion
+
+		#region ================== Variables
+
+		// List of items
+		private readonly List<ListViewItem> dragitems;
+
+		#endregion
+
+		#region ================== Properties
+
+		// Disable sorting
+		public new SortOrder Sorting { get { return SortOrder.None; } set { base.Sorting = SortOrder.None; } }
+
+		#endregion
+
+		#region ================== Constructor
+
+		// Constructor
+		public ResourceListView(): base()
+		{
+			// List for dragged items
+			dragitems = new List<ListViewItem>();
+		}
+
+		#endregion
+
+		#region ================== Overrides
+
+		// When items are dropped
+		protected override void OnDragDrop(DragEventArgs e)
+		{
+			// Pass on to base
+			base.OnDragDrop(e);
+
+			// Leave when no items being dragged
+			if(dragitems.Count == 0) return;
+
+			// Determine where to insert
+			Point cp = base.PointToClient(new Point(e.X, e.Y));
+			ListViewItem insertatitem = base.GetItemAt(cp.X, cp.Y);
+
+			// Leave when nowhere to insert or same as selected item
+			if((insertatitem == null) || (dragitems.Contains(insertatitem))) return;
+			
+			// Leave when item is grayed
+			if(insertatitem.ForeColor != SystemColors.WindowText) return;
+			
+			// Begin updating
+			base.BeginUpdate();
+			
+			// Determine index where to insert
+			int dropindex = insertatitem.Index;
+			if(dropindex > dragitems[0].Index) dropindex++;
+
+			// Deselect items
+			DeselectAll();
+
+			// Insert items
+			for(int i = dragitems.Count - 1; i >= 0; i--)
+			{
+				// Insert a copy of the item here
+				base.Items.Insert(dropindex, (ListViewItem)dragitems[i].Clone());
+				base.Items[dropindex].Selected = true;
+			}
+
+			// Remove old items
+			foreach(ListViewItem lvi in dragitems)
+			{
+				// Remove item from list
+				base.Items.Remove(lvi);
+			}
+
+			// Done
+			base.EndUpdate();
+			dragitems.Clear();
+		}
+		
+		// When items are dragged over
+		protected override void OnDragOver(DragEventArgs e)
+		{
+			//mxd. Check if valid extenal data is present
+			if(e.Data.GetDataPresent(DataFormats.FileDrop)) 
+			{
+				e.Effect = DragDropEffects.Copy;
+				return;
+			}
+
+			// Check if our data format is present
+			if(!e.Data.GetDataPresent(DataFormats.Text))
+			{
+				e.Effect = DragDropEffects.None;
+				return;
+			}
+
+			// Check if the data matches our data
+			String text = (String)e.Data.GetData(DRAG_TYPE.GetType());
+			if(String.Compare(text, DRAG_TYPE + this.Name, StringComparison.Ordinal) == 0)
+			{
+				// Determine where to insert
+				Point cp = base.PointToClient(new Point(e.X, e.Y));
+				ListViewItem insertatitem = base.GetItemAt(cp.X, cp.Y);
+				if(insertatitem == null)
+				{
+					// Cannot insert here
+					e.Effect = DragDropEffects.None;
+					return;
+				}
+
+				// Item is one of the items being dragged?
+				if(dragitems.Contains(insertatitem))
+				{
+					// Show move possibility, but dont do anything
+					e.Effect = DragDropEffects.Move;
+					insertatitem.EnsureVisible();
+					return;
+				}
+
+				// Check if item is grayed
+				if(insertatitem.ForeColor != SystemColors.WindowText)
+				{
+					// Cannot insert here
+					e.Effect = DragDropEffects.None;
+					insertatitem.EnsureVisible();
+					return;
+				}
+				
+				// Pass on to base
+				base.OnDragOver(e);
+
+				// Can insert here
+				e.Effect = DragDropEffects.Move;
+				insertatitem.EnsureVisible();
+
+				// Determine index where to insert
+				int dropindex = insertatitem.Index;
+				if(dropindex > dragitems[0].Index) dropindex++;
+
+				// Begin updating
+				base.BeginUpdate();
+
+				// Deselect items
+				DeselectAll();
+
+				// Insert items
+				for(int i = dragitems.Count - 1; i >= 0; i--)
+				{
+					// Insert a copy of the item here
+					base.Items.Insert(dropindex, (ListViewItem)dragitems[i].Clone());
+					base.Items[dropindex].Selected = true;
+				}
+
+				// Remove old items
+				foreach(ListViewItem lvi in dragitems)
+				{
+					// Remove item from list
+					base.Items.Remove(lvi);
+				}
+
+				// Copy selected items to the list
+				dragitems.Clear();
+				foreach(ListViewItem lvi in base.SelectedItems) dragitems.Add(lvi);
+				
+				// Done
+				base.EndUpdate();
+			}
+			else
+			{
+				// Cannot insert here
+				e.Effect = DragDropEffects.None;	
+			}
+		}		
+
+		// When items are first dragged over
+		protected override void OnDragEnter(DragEventArgs e)
+		{
+			// Pass on to base
+			base.OnDragEnter(e);
+
+			//mxd. Check if valid extenal data is present
+			if(e.Data.GetDataPresent(DataFormats.FileDrop)) 
+			{
+				e.Effect = DragDropEffects.Copy;
+				return;
+			}
+
+			// Check if our data format is present
+			if(!e.Data.GetDataPresent(DataFormats.Text))
+			{
+				// No effect
+				e.Effect = DragDropEffects.None;
+				return;
+			}
+
+			// Check if the data matches our data
+			String text = (String)e.Data.GetData(DRAG_TYPE.GetType());
+			if(text.CompareTo(DRAG_TYPE + base.Name) == 0)
+			{
+				// We're moving these items
+				e.Effect = DragDropEffects.Move;
+			}
+			else
+			{
+				// No effect
+				e.Effect = DragDropEffects.None;	
+			}
+		}
+
+		// When items are first dragged
+		protected override void OnItemDrag(ItemDragEventArgs e)
+		{
+			// Pass on to base
+			base.OnItemDrag(e);
+
+			// Anything selected?
+			if(base.SelectedItems.Count > 0)
+			{
+				// Go for all selected items
+				for(int i = base.SelectedItems.Count - 1; i >= 0; i--)
+				{
+					// Item grayed? Then abort!
+					if(base.SelectedItems[i].ForeColor != SystemColors.WindowText)
+						return;
+				}
+
+				// Copy selected items to the list
+				dragitems.Clear();
+				foreach(ListViewItem lvi in base.SelectedItems) dragitems.Add(lvi);
+
+				// Start drag operation
+				base.DoDragDrop(DRAG_TYPE + base.Name, DragDropEffects.Move);
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This deselects all items
+		private void DeselectAll()
+		{
+			// Go for all selected items
+			for(int i = base.SelectedItems.Count - 1; i >= 0; i--)
+			{
+				// Item grayed? Then abort!
+				base.SelectedItems[i].Selected = false;
+			}
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Controls/ScintillaConstants.cs b/Source/Core/Controls/ScintillaConstants.cs
new file mode 100644
index 0000000..3d9d8ab
--- /dev/null
+++ b/Source/Core/Controls/ScintillaConstants.cs
@@ -0,0 +1,423 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Controls
+{
+	internal struct NotifyHeader
+	{
+		// hwndFrom is really an environment specifc window handle or pointer
+		// but most clients of Scintilla.h do not have this type visible.
+		//WindowID hwndFrom;
+		public IntPtr hwndFrom;
+		public uint idFrom;
+		public uint code;
+	};
+
+	internal struct SCNotification
+	{
+		public NotifyHeader nmhdr;
+		public int position;	// SCN_STYLENEEDED, SCN_MODIFIED, SCN_DWELLSTART, SCN_DWELLEND
+		public int ch;		// SCN_CHARADDED, SCN_KEY
+		public int modifiers;	// SCN_KEY
+		public int modificationType;	// SCN_MODIFIED
+		public IntPtr text;	// SCN_MODIFIED
+		public int length;		// SCN_MODIFIED
+		public int linesAdded;	// SCN_MODIFIED
+		public int message;	// SCN_MACRORECORD
+		public IntPtr wParam;	// SCN_MACRORECORD
+		public IntPtr lParam;	// SCN_MACRORECORD
+		public int line;		// SCN_MODIFIED
+		public int foldLevelNow;	// SCN_MODIFIED
+		public int foldLevelPrev;	// SCN_MODIFIED
+		public int margin;		// SCN_MARGINCLICK
+		public int listType;	// SCN_USERLISTSELECTION
+		public int x;			// SCN_DWELLSTART, SCN_DWELLEND
+		public int y;		// SCN_DWELLSTART, SCN_DWELLEND
+	};
+	
+	internal enum ScriptWhiteSpace
+	{
+		Invisible = 0,
+		VisibleAlways = 1,
+		VisibleAfterIndent = 2
+	}
+
+	internal enum ScriptEndOfLine
+	{
+		CRLF = 0,
+		CR = 1,
+		LF = 2
+	}
+
+	internal enum ScriptMarkerSymbol
+	{
+		Circle = 0,
+		Roundrect = 1,
+		Arrow = 2,
+		SmallRect = 3,
+		ShortArrow = 4,
+		Empty = 5,
+		ArrowDown = 6,
+		Minus = 7,
+		Plus = 8,
+		VLine = 9,
+		LCorner = 10,
+		TCorner = 11,
+		BoxPlus = 12,
+		BoxPlusConnected = 13,
+		BoxMinus = 14,
+		BoxMinusConnected = 15,
+		LCornerCurve = 16,
+		TCornerCurve = 17,
+		CirclePlus = 18,
+		CirclePlusConnected = 19,
+		CircleMinus = 20,
+		CircleMinusConnected = 21,
+		Background = 22,
+		DotDotDot = 23,
+		Arrows = 24,
+		Pixmap = 25,
+		Character = 10000
+	}
+
+	internal enum ScriptMarkerOutline
+	{
+		FolderEnd = 25,
+		FolderOpenMid = 26,
+		FolderMidTail = 27,
+		FolderTail = 28,
+		FolderSub = 29,
+		Folder = 30,
+		FolderOpen = 31
+	}
+
+	internal enum ScriptMarginType
+	{
+		Symbol = 0,
+		Number = 1
+	}
+
+	internal enum ScriptStylesCommon
+	{
+		Default = 32,
+		LineNumber = 33,
+		BraceLight = 34,
+		BraceBad = 35,
+		ControlChar = 36,
+		IndentGuide = 37,
+		LastPredefined = 39,
+		Max = 127
+	}
+
+	internal enum ScriptCharacterSet
+	{
+		Ansi = 0,
+		Default = 1,
+		Baltic = 186,
+		ChineseBig5 = 136,
+		EastEurope = 238,
+		GB2312 = 134,
+		Greek = 161,
+		Hangul = 129,
+		Mac = 77,
+		Oem = 255,
+		Russian = 204,
+		Shiftjis = 128,
+		Symbol = 2,
+		Turkish = 162,
+		Johab = 130,
+		Hebrew = 177,
+		Arabic = 178,
+		Vietnamese = 163,
+		Thai = 222
+	}
+
+	internal enum ScriptCaseVisible
+	{
+		Mixed = 0,
+		Upper = 1,
+		Lower = 2
+	}
+
+	internal enum ScriptIndicatorStyle
+	{
+		Max = 7,
+		Plain = 0,
+		Squiggle = 1,
+		TT = 2,
+		Diagonal = 3,
+		Strike = 4,
+		Hidden = 5,
+		Box = 6
+	}
+
+	internal enum ScriptPrintOption
+	{
+		Normal = 0,
+		InvertLight = 1,
+		BlackOnWhite = 2,
+		ColourOnWhite = 3,
+		ColourOnWhiteDefaultBG = 4
+	}
+
+	internal enum ScriptFindOption
+	{
+		WholeWord = 2,
+		MatchCase = 4,
+		WordStart = 0x00100000,
+		RegExp = 0x00200000,
+		Posix = 0x00400000
+	}
+
+	internal enum ScriptFoldLevel
+	{
+		Base = 0x400,
+		WhiteFlag = 0x1000,
+		HeaderFlag = 0x2000,
+		BoxHeaderFlag = 0x4000,
+		BoxFooterFlag = 0x8000,
+		Contracted = 0x10000,
+		Unindent = 0x20000,
+		NumberMask = 0x0FFF
+	}
+
+	internal enum ScriptFoldFlag
+	{
+		LineBefore_Expanded = 0x0002,
+		LineBefore_Contracted = 0x0004,
+		LineAfter_Expanded = 0x0008,
+		LineAfter_Contracted = 0x0010,
+		LevelNumbers = 0x0040,
+		Box = 0x0001
+	}
+
+	internal enum ScriptWrap
+	{
+		None = 0,
+		Word = 1
+	}
+
+	internal enum ScriptWrapVisualFlag
+	{
+		None = 0x0000,
+		End = 0x0001,
+		Start = 0x0002
+	}
+
+	internal enum ScriptWrapVisualLocation
+	{
+		Default = 0x0000,
+		EndByText = 0x0001,
+		StartByText = 0x0002
+	}
+
+	internal enum ScriptLineCache
+	{
+		None = 0,
+		Caret = 1,
+		Page = 2,
+		Document = 3
+	}
+
+	internal enum ScriptIdentGuides
+	{
+		None = 0,
+		Real = 1,
+		LookForward = 2,
+		LookBoth = 3
+	}
+
+	internal enum ScriptEdgeVisualStyle
+	{
+		None = 0,
+		Line = 1,
+		Background = 2
+	}
+
+	internal enum ScriptCursorShape
+	{
+		Normal = -1,
+		Wait = 4
+	}
+
+	internal enum ScriptCaretPolicy
+	{
+		Slop = 0x01,
+		Strict = 0x04,
+		Jumps = 0x10,
+		Even = 0x08
+	}
+
+	internal enum ScriptSelectionMode
+	{
+		Stream = 0,
+		Rectangle = 1,
+		Lines = 2
+	}
+
+	internal enum ScriptModificationFlags
+	{
+		InsertText = 0x1,
+		DeleteText = 0x2,
+		ChangeStyle = 0x4,
+		ChangeFold = 0x8,
+		User = 0x10,
+		Undo = 0x20,
+		Redo = 0x40,
+		StepInUndoRedo = 0x100,
+		ChangeMarker = 0x200,
+		BeforeInsert = 0x400,
+		BeforeDelete = 0x800
+	}
+
+	internal enum ScriptKeys
+	{
+		Down = 300,
+		Up = 301,
+		Left = 302,
+		Right = 303,
+		Home = 304,
+		End = 305,
+		Prior = 306,
+		Next = 307,
+		Delete = 308,
+		Insert = 309,
+		Escape = 7,
+		Back = 8,
+		Tab = 9,
+		Return = 13,
+		Add = 310,
+		Subtract = 311,
+		Divide = 312
+	}
+
+	internal enum ScriptKeyMod
+	{
+		Shift = 1,
+		Ctrl = 2,
+		Alt = 4
+	}
+
+	internal enum ScriptLexer
+	{
+		Container = 0,
+		Null = 1,
+		Python = 2,
+		Cpp = 3,
+		Html = 4,
+		Xml = 5,
+		Perl = 6,
+		Sql = 7,
+		Vb = 8,
+		Properties = 9,
+		Errorlist = 10,
+		Makefile = 11,
+		Batch = 12,
+		Xcode = 13,
+		Latex = 14,
+		Lua = 15,
+		Diff = 16,
+		Conf = 17,
+		Pascal = 18,
+		Ave = 19,
+		Ada = 20,
+		Lisp = 21,
+		Ruby = 22,
+		Eiffel = 23,
+		Eiffelkw = 24,
+		Tcl = 25,
+		NncronTab = 26,
+		Bullant = 27,
+		VBScript = 28,
+		Asp = 29,
+		Php = 30,
+		Baan = 31,
+		Matlab = 32,
+		Scriptol = 33,
+		Asm = 34,
+		CppNoCase = 35,
+		Fortran = 36,
+		F77 = 37,
+		Css = 38,
+		Pov = 39,
+		Lout = 40,
+		Escript = 41,
+		Ps = 42,
+		Nsis = 43,
+		Mmixal = 44,
+		Clw = 45,
+		Clwnocase = 46,
+		Lot = 47,
+		Yaml = 48,
+		Tex = 49,
+		Metapost = 50,
+		Powerbasic = 51,
+		Forth = 52,
+		Erlang = 53,
+		Octave = 54,
+		Mssql = 55,
+		Verilog = 56,
+		Kix = 57,
+		Gui4cli = 58,
+		Specman = 59,
+		Au3 = 60,
+		Apdl = 61,
+		Bash = 62,
+		Automatic = 1000
+	}
+	
+	internal enum ScintillaEvents
+	{
+		StyleNeeded = 2000,
+		CharAdded = 2001,
+		SavePointReached = 2002,
+		SavePointLeft = 2003,
+		ModifyAttemptRO = 2004,
+		Key = 2005,
+		DoubleClick = 2006,
+		UpdateUI = 2007,
+		Modified = 2008,
+		MacroRecord = 2009,
+		MarginClick = 2010,
+		NeedShown = 2011,
+		Painted = 2013,
+		UserlistSelection = 2014,
+		UriDropped = 2015,
+		DwellStart = 2016,
+		DwellEnd = 2017,
+		Zoom = 2018,
+		HotspotClick = 2019,
+		HotspotDoubleClick = 2020,
+		CallTipClick = 2021
+	}
+	
+	internal enum ScriptStyleType
+	{
+		PlainText = 0,
+		Keyword = 1,
+		Constant = 2,
+		Comment = 3,
+		Literal = 4,
+		LineNumber = 5
+	}
+}
+
diff --git a/Source/Core/Controls/ScintillaControl.cs b/Source/Core/Controls/ScintillaControl.cs
new file mode 100644
index 0000000..67571bf
--- /dev/null
+++ b/Source/Core/Controls/ScintillaControl.cs
@@ -0,0 +1,4988 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Windows.Forms;
+using System.Runtime.InteropServices;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Controls
+{
+	// This is only a wrapper for the Scintilla editor control. Most of this code is
+	// from ScintillaNET project, I only refactored it a bit. See the BuilderScriptControl
+	// for the script editor with Doom Builder features.
+	internal class ScintillaControl : Control
+	{
+		#region ================== API Declarations
+
+		[DllImport(SCINTILLA_FILENAME, EntryPoint = "Scintilla_DirectFunction")]
+		private static extern int Perform(int ptr, UInt32 message, UInt32 wparam, UInt32 lparam);
+		
+		#endregion
+		
+		#region ================== Constants
+
+		// Class library
+		private const string SCINTILLA_FILENAME = "Scintilla.dll";
+		private const string SCINTILLA_CLASSNAME = "Scintilla";
+
+		// Styles
+		private const uint WS_CHILD = (uint)0x40000000L;
+		private const uint WS_VISIBLE = (uint)0x10000000L;
+		private const uint WS_TABSTOP = (uint)0x00010000L;
+		private const int WM_NOTIFY = 0x004E;
+		private const int WM_KEYDOWN = 0x0100;
+		private const int WM_KEYUP = 0x0101;
+		
+		#endregion
+
+		#region ================== Delegates / Events
+
+		public delegate void StyleNeededHandler(ScintillaControl pSender, int position);
+		public delegate void CharAddedHandler(ScintillaControl pSender, int ch);
+		public delegate void SavePointReachedHandler(ScintillaControl pSender);
+		public delegate void SavePointLeftHandler(ScintillaControl pSender);
+		public delegate void ModifyAttemptROHandler(ScintillaControl pSender);
+		public delegate void KeyHandler(ScintillaControl pSender, int ch, int modifiers);
+		public delegate void DoubleClickHandler(ScintillaControl pSender);
+		public delegate void UpdateUIHandler(ScintillaControl pSender);
+		public delegate void ModifiedHandler(ScintillaControl pSender, int position, int modificationType, string text, int length, int linesAdded, int line, int foldLevelNow, int foldLevelPrev);
+		public delegate void MacroRecordHandler(ScintillaControl pSender, int message, IntPtr wParam, IntPtr lParam);
+		public delegate void MarginClickHandler(ScintillaControl pSender, int modifiers, int position, int margin);
+		public delegate void NeedShownHandler(ScintillaControl pSender, int position, int length);
+		public delegate void PaintedHandler(ScintillaControl pSender);
+		public delegate void UserListSelectionHandler(ScintillaControl pSender, int listType, string text);
+		public delegate void URIDroppedHandler(ScintillaControl pSender, string text);
+		public delegate void DwellStartHandler(ScintillaControl pSender, int position);
+		public delegate void DwellEndHandler(ScintillaControl pSender, int position);
+		public delegate void ZoomHandler(ScintillaControl pSender);
+		public delegate void HotSpotClickHandler(ScintillaControl pSender, int modifiers, int position);
+		public delegate void HotSpotDoubleClickHandler(ScintillaControl pSender, int modifiers, int position);
+		public delegate void CallTipClickHandler(ScintillaControl pSender, int position);
+		public delegate void TextInsertedHandler(ScintillaControl pSender, int position, int length, int linesAdded);
+		public delegate void TextDeletedHandler(ScintillaControl pSender, int position, int length, int linesAdded);
+		public delegate void StyleChangedHandler(ScintillaControl pSender, int position, int length);
+		public delegate void FoldChangedHandler(ScintillaControl pSender, int line, int foldLevelNow, int foldLevelPrev);
+		public delegate void UserPerformedHandler(ScintillaControl pSender);
+		public delegate void UndoPerformedHandler(ScintillaControl pSender);
+		public delegate void RedoPerformedHandler(ScintillaControl pSender);
+		public delegate void LastStepInUndoRedoHandler(ScintillaControl pSender);
+		public delegate void MarkerChangedHandler(ScintillaControl pSender, int line);
+		public delegate void BeforeInsertHandler(ScintillaControl pSender, int position, int length);
+		public delegate void BeforeDeleteHandler(ScintillaControl pSender, int position, int length);
+
+		public event StyleNeededHandler StyleNeeded;
+		public event CharAddedHandler CharAdded;
+		public event SavePointReachedHandler SavePointReached;
+		public event SavePointLeftHandler SavePointLeft;
+		public event ModifyAttemptROHandler ModifyAttemptRO;
+		public event KeyHandler Key;
+		public new event DoubleClickHandler DoubleClick;
+		public event UpdateUIHandler UpdateUI;
+		public event ModifiedHandler Modified;
+		public event MacroRecordHandler MacroRecord;
+		public event MarginClickHandler MarginClick;
+		public event NeedShownHandler NeedShown;
+		public event PaintedHandler Painted;
+		//public event UserListSelectionHandler UserListSelection;
+		//public event URIDroppedHandler URIDropped;
+		public event DwellStartHandler DwellStart;
+		public event DwellEndHandler DwellEnd;
+		public event ZoomHandler Zoom;
+		public event HotSpotClickHandler HotSpotClick;
+		public event HotSpotDoubleClickHandler HotSpotDoubleClick;
+		public event CallTipClickHandler CallTipClick;
+		public event TextInsertedHandler TextInserted;
+		public event TextDeletedHandler TextDeleted;
+		public event FoldChangedHandler FoldChanged;
+		public event UserPerformedHandler UserPerformed;
+		public event UndoPerformedHandler UndoPerformed;
+		public event RedoPerformedHandler RedoPerformed;
+		public event LastStepInUndoRedoHandler LastStepInUndoRedo;
+		public event MarkerChangedHandler MarkerChanged;
+		public event BeforeInsertHandler BeforeInsert;
+		public event BeforeDeleteHandler BeforeDelete;
+		public new event StyleChangedHandler StyleChanged;
+		
+		#endregion
+
+		#region ================== Variables
+
+		// Main objects
+		private IntPtr libraryptr = IntPtr.Zero;
+		private IntPtr controlptr = IntPtr.Zero;
+		private int directptr;
+
+		// This ignores key combinations so that they are passed
+		// on to the other controls on the parent form
+		private readonly Dictionary<int, int> ignoredkeys;
+		
+		// States
+		private ScriptMarginType indexmargintype;
+		private ScriptIndicatorStyle indexindicatorstyle;
+		
+		#endregion
+
+		#region ================== Properties
+		
+		/// <summary>
+		/// Are white space characters currently visible?
+		/// Returns one of SCWS_* constants.
+		/// </summary>
+		public ScriptWhiteSpace ViewWhitespace
+		{
+			get { return (ScriptWhiteSpace)ViewWS; }
+			set { ViewWS = (int)value; }
+		}
+
+		/// <summary>
+		/// Retrieve the current end of line mode - one of CRLF, CR, or LF.
+		/// </summary>
+		public ScriptEndOfLine EndOfLineMode
+		{
+			get { return (ScriptEndOfLine)EOLMode; }
+			set { EOLMode = (int)value; }
+		}
+
+		/// <summary>
+		/// The type of a margin.
+		/// </summary>
+		public ScriptMarginType MarginType { get { return indexmargintype; } }
+
+		/// <summary>
+		/// The type of a margin.
+		/// </summary>
+		public ScriptIndicatorStyle IndicatorStyle { get { return indexindicatorstyle; } }
+
+		/// <summary>
+		/// Are there any redoable actions in the undo history?
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN09</remarks>
+		public bool CanRedo
+		{
+			get
+			{
+				return FastPerform(2016, 0, 0) != 0;
+			}
+		}
+
+		/// <summary>
+		/// Is there an auto-completion list visible?
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN09</remarks>
+		public bool IsAutoCActive
+		{
+			get
+			{
+				return FastPerform(2102, 0, 0) != 0;
+			}
+		}
+
+		/// <summary>
+		/// Retrieve the position of the caret when the auto-completion list was displayed.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN10</remarks>
+		public int AutoCPosStart
+		{
+			get
+			{
+				return (int)FastPerform(2103, 0, 0);
+			}
+		}
+
+		/// <summary>
+		/// Will a paste succeed?
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN09</remarks>
+		public bool CanPaste
+		{
+			get
+			{
+				return FastPerform(2173, 0, 0) != 0;
+			}
+		}
+
+		/// <summary>
+		/// Are there any undoable actions in the undo history?
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN09</remarks>
+		public bool CanUndo
+		{
+			get
+			{
+				return FastPerform(2174, 0, 0) != 0;
+			}
+		}
+
+		/// <summary>
+		/// Is there an active call tip?
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN09</remarks>
+		public bool IsCallTipActive
+		{
+			get
+			{
+				return FastPerform(2202, 0, 0) != 0;
+			}
+		}
+
+		/// <summary>
+		/// Retrieve the position where the caret was before displaying the call tip.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN10</remarks>
+		public int CallTipPosStart
+		{
+			get
+			{
+				return (int)FastPerform(2203, 0, 0);
+			}
+		}
+
+		/// <summary>
+		/// Create a new document object.
+		/// Starts with reference count of 1 and not selected into editor.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN10</remarks>
+		public int CreateDocument
+		{
+			get
+			{
+				return (int)FastPerform(2375, 0, 0);
+			}
+		}
+
+		/// <summary>
+		/// Get currently selected item position in the auto-completion list
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN10</remarks>
+		public int AutoCGetCurrent
+		{
+			get
+			{
+				return (int)FastPerform(2445, 0, 0);
+			}
+		}
+
+		/// <summary>
+		/// Width of the the auto-completion list
+		/// </summary>
+		public int AutoCMaximumWidth
+		{
+			get
+			{
+				return (int)FastPerform(2209, 0, 0);
+			}
+			
+			set
+			{
+				FastPerform(2208, (uint)value, 0);
+			}
+		}
+
+		/// <summary>
+		/// Height of the the auto-completion list
+		/// </summary>
+		public int AutoCMaximumHeight
+		{
+			get
+			{
+				return (int)FastPerform(2211, 0, 0);
+			}
+
+			set
+			{
+				FastPerform(2210, (uint)value, 0);
+			}
+		}
+
+		/// <summary>
+		/// Spacing above a line
+		/// </summary>
+		public int ExtraAscent
+		{
+			get
+			{
+				return (int)FastPerform(2526, 0, 0);
+			}
+
+			set
+			{
+				FastPerform(2525, (uint)value, 0);
+			}
+		}
+
+		/// <summary>
+		/// Spacing below a line
+		/// </summary>
+		public int ExtraDescent
+		{
+			get
+			{
+				return (int)FastPerform(2528, 0, 0);
+			}
+
+			set
+			{
+				FastPerform(2527, (uint)value, 0);
+			}
+		}
+
+		/// <summary>
+		/// Returns the number of characters in the document.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN06</remarks>
+		public int Length
+		{
+			get
+			{
+				return (int)FastPerform(2006, 0, 0);
+			}
+		}
+
+		/// <summary>
+		/// Returns the character byte at the position.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN18</remarks>
+		public int CharAt(int pos)
+		{
+			return (int)FastPerform(2007, (uint)pos, 0);
+		}
+
+		/// <summary>
+		/// Returns the position of the caret.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN08</remarks>
+		public int CurrentPos
+		{
+			get
+			{
+				return (int)FastPerform(2008, 0, 0);
+			}
+			set
+			{
+				FastPerform(2141, (uint)value, 0);
+			}
+		}
+
+		/// <summary>
+		/// Returns the position of the opposite end of the selection to the caret.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN08</remarks>
+		public int AnchorPosition
+		{
+			get
+			{
+				return (int)FastPerform(2009, 0, 0);
+			}
+			set
+			{
+				FastPerform(2026, (uint)value, 0);
+			}
+		}
+
+		/// <summary>
+		/// Returns the style byte at the position.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN18</remarks>
+		public int StyleAt(int pos)
+		{
+			return (int)FastPerform(2010, (uint)pos, 0);
+		}
+
+		/// <summary>
+		/// Is undo history being collected?
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN07</remarks>
+		public bool IsUndoCollection
+		{
+			get
+			{
+				return FastPerform(2019, 0, 0) != 0;
+			}
+			set
+			{
+				FastPerform(2012, (uint)(value ? 1 : 0), 0);
+			}
+		}
+
+		/// <summary>
+		/// Are white space characters currently visible?
+		/// Returns one of SCWS_* constants.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN08</remarks>
+		public int ViewWS
+		{
+			get
+			{
+				return (int)FastPerform(2020, 0, 0);
+			}
+			set
+			{
+				FastPerform(2021, (uint)value, 0);
+			}
+		}
+
+		/// <summary>
+		/// Retrieve the position of the last correctly styled character.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN06</remarks>
+		public int EndStyled
+		{
+			get
+			{
+				return (int)FastPerform(2028, 0, 0);
+			}
+		}
+
+		/// <summary>
+		/// Retrieve the current end of line mode - one of CRLF, CR, or LF.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN08</remarks>
+		public int EOLMode
+		{
+			get
+			{
+				return (int)FastPerform(2030, 0, 0);
+			}
+			set
+			{
+				FastPerform(2031, (uint)value, 0);
+			}
+		}
+
+		/// <summary>
+		/// Is drawing done first into a buffer or direct to the screen?
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN07</remarks>
+		public bool IsBufferedDraw
+		{
+			get
+			{
+				return FastPerform(2034, 0, 0) != 0;
+			}
+			set
+			{
+				FastPerform(2035, (uint)(value ? 1 : 0), 0);
+			}
+		}
+
+		/// <summary>
+		/// Retrieve the visible size of a tab.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN08</remarks>
+		public int TabWidth
+		{
+			get
+			{
+				return (int)FastPerform(2121, 0, 0);
+			}
+			set
+			{
+				FastPerform(2036, (uint)value, 0);
+			}
+		}
+
+		/// <summary>
+		/// Retrieve the type of a margin.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN29</remarks>
+		public int GetMarginTypeN(int margin)
+		{
+			return (int)FastPerform(2241, (uint)margin, 0);
+		}
+
+		/// <summary>
+		/// Set a margin to be either numeric or symbolic.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN30</remarks>
+		public void SetMarginTypeN(int margin, int marginType)
+		{
+			FastPerform(2240, (uint)margin, (uint)marginType);
+		}
+
+		/// <summary>
+		/// Retrieve the width of a margin in pixels.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN29</remarks>
+		public int GetMarginWidthN(int margin)
+		{
+			return (int)FastPerform(2243, (uint)margin, 0);
+		}
+
+		/// <summary>
+		/// Set the width of a margin to a width expressed in pixels.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN30</remarks>
+		public void SetMarginWidthN(int margin, int pixelWidth)
+		{
+			FastPerform(2242, (uint)margin, (uint)pixelWidth);
+		}
+
+		/// <summary>
+		/// Retrieve the marker mask of a margin.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN29</remarks>
+		public int GetMarginMaskN(int margin)
+		{
+			return (int)FastPerform(2245, (uint)margin, 0);
+		}
+
+		/// <summary>
+		/// Set a mask that determines which markers are displayed in a margin.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN30</remarks>
+		public void SetMarginMaskN(int margin, int mask)
+		{
+			FastPerform(2244, (uint)margin, (uint)mask);
+		}
+
+		/// <summary>
+		/// Retrieve the mouse click sensitivity of a margin.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN31</remarks>
+		public bool MarginSensitiveN(int margin)
+		{
+			return FastPerform(2247, (uint)margin, 0) != 0;
+		}
+
+		/// <summary>
+		/// Make a margin sensitive or insensitive to mouse clicks.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN32</remarks>
+		public void MarginSensitiveN(int margin, bool sensitive)
+		{
+			FastPerform(2246, (uint)margin, (uint)(sensitive ? 1 : 0));
+		}
+
+		/// <summary>
+		/// Get the time in milliseconds that the caret is on and off.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN08</remarks>
+		public int CaretPeriod
+		{
+			get
+			{
+				return (int)FastPerform(2075, 0, 0);
+			}
+			set
+			{
+				FastPerform(2076, (uint)value, 0);
+			}
+		}
+
+		/// <summary>
+		/// Retrieve the style of an indicator.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN29</remarks>
+		public int GetIndicStyle(int indic)
+		{
+			return (int)FastPerform(2081, (uint)indic, 0);
+		}
+
+		/// <summary>
+		/// Set an indicator to plain, squiggle or TT.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN30</remarks>
+		public void SetIndicStyle(int indic, int style)
+		{
+			FastPerform(2080, (uint)indic, (uint)style);
+		}
+
+		/// <summary>
+		/// Retrieve the foreground colour of an indicator.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN29</remarks>
+		public int GetIndicFore(int indic)
+		{
+			return (int)FastPerform(2083, (uint)indic, 0);
+		}
+
+		/// <summary>
+		/// Set the foreground colour of an indicator.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN30</remarks>
+		public void SetIndicFore(int indic, int fore)
+		{
+			FastPerform(2082, (uint)indic, (uint)fore);
+		}
+
+		/// <summary>
+		/// Retrieve number of bits in style bytes used to hold the lexical state.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN08</remarks>
+		public int StyleBits
+		{
+			get
+			{
+				return (int)FastPerform(2091, 0, 0);
+			}
+			set
+			{
+				FastPerform(2090, (uint)value, 0);
+			}
+		}
+
+		/// <summary>
+		/// Retrieve the extra styling information for a line.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN29</remarks>
+		public int GetLineState(int line)
+		{
+			return (int)FastPerform(2093, (uint)line, 0);
+		}
+
+		/// <summary>
+		/// Used to hold extra styling information for each line.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN30</remarks>
+		public void SetLineState(int line, int state)
+		{
+			FastPerform(2092, (uint)line, (uint)state);
+		}
+
+		/// <summary>
+		/// Retrieve the last line number that has line state.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN06</remarks>
+		public int MaxLineState
+		{
+			get
+			{
+				return (int)FastPerform(2094, 0, 0);
+			}
+		}
+
+		/// <summary>
+		/// Is the background of the line containing the caret in a different colour?
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN07</remarks>
+		public bool IsCaretLineVisible
+		{
+			get
+			{
+				return FastPerform(2095, 0, 0) != 0;
+			}
+			set
+			{
+				FastPerform(2096, (uint)(value ? 1 : 0), 0);
+			}
+		}
+
+		/// <summary>
+		/// Get the colour of the background of the line containing the caret.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN08</remarks>
+		public int CaretLineBack
+		{
+			get
+			{
+				return (int)FastPerform(2097, 0, 0);
+			}
+			set
+			{
+				FastPerform(2098, (uint)value, 0);
+			}
+		}
+
+		/// <summary>
+		/// Retrieve the auto-completion list separator character.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN08</remarks>
+		public int AutoCSeparator
+		{
+			get
+			{
+				return (int)FastPerform(2107, 0, 0);
+			}
+			set
+			{
+				FastPerform(2106, (uint)value, 0);
+			}
+		}
+
+		/// <summary>
+		/// Retrieve whether auto-completion cancelled by backspacing before start.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN07</remarks>
+		public bool IsAutoCGetCancelAtStart
+		{
+			get
+			{
+				return FastPerform(2111, 0, 0) != 0;
+			}
+			set
+			{
+				FastPerform(2110, (uint)(value ? 1 : 0), 0);
+			}
+		}
+
+		/// <summary>
+		/// Retrieve whether a single item auto-completion list automatically choose the item.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN07</remarks>
+		public bool IsAutoCGetChooseSingle
+		{
+			get
+			{
+				return FastPerform(2114, 0, 0) != 0;
+			}
+			set
+			{
+				FastPerform(2113, (uint)(value ? 1 : 0), 0);
+			}
+		}
+
+		/// <summary>
+		/// Retrieve state of ignore case flag.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN07</remarks>
+		public bool IsAutoCGetIgnoreCase
+		{
+			get
+			{
+				return FastPerform(2116, 0, 0) != 0;
+			}
+			set
+			{
+				FastPerform(2115, (uint)(value ? 1 : 0), 0);
+			}
+		}
+
+		/// <summary>
+		/// Retrieve whether or not autocompletion is hidden automatically when nothing matches.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN07</remarks>
+		public bool IsAutoCGetAutoHide
+		{
+			get
+			{
+				return FastPerform(2119, 0, 0) != 0;
+			}
+			set
+			{
+				FastPerform(2118, (uint)(value ? 1 : 0), 0);
+			}
+		}
+
+		/// <summary>
+		/// Retrieve whether or not autocompletion deletes any word characters
+		/// after the inserted text upon completion.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN07</remarks>
+		public bool IsAutoCGetDropRestOfWord
+		{
+			get
+			{
+				return FastPerform(2271, 0, 0) != 0;
+			}
+			set
+			{
+				FastPerform(2270, (uint)(value ? 1 : 0), 0);
+			}
+		}
+
+		/// <summary>
+		/// Retrieve the auto-completion list type-separator character.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN08</remarks>
+		public int AutoCTypeSeparator
+		{
+			get
+			{
+				return (int)FastPerform(2285, 0, 0);
+			}
+			set
+			{
+				FastPerform(2286, (uint)value, 0);
+			}
+		}
+
+		/// <summary>
+		/// Retrieve indentation size.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN08</remarks>
+		public int Indent
+		{
+			get
+			{
+				return (int)FastPerform(2123, 0, 0);
+			}
+			set
+			{
+				FastPerform(2122, (uint)value, 0);
+			}
+		}
+
+		/// <summary>
+		/// Retrieve whether tabs will be used in indentation.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN07</remarks>
+		public bool IsUseTabs
+		{
+			get
+			{
+				return FastPerform(2125, 0, 0) != 0;
+			}
+			set
+			{
+				FastPerform(2124, (uint)(value ? 1 : 0), 0);
+			}
+		}
+
+		/// <summary>
+		/// Retrieve the number of columns that a line is indented.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN29</remarks>
+		public int GetLineIndentation(int line)
+		{
+			return (int)FastPerform(2127, (uint)line, 0);
+		}
+
+		/// <summary>
+		/// Change the indentation of a line to a number of columns.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN30</remarks>
+		public void SetLineIndentation(int line, int indentSize)
+		{
+			FastPerform(2126, (uint)line, (uint)indentSize);
+		}
+
+		/// <summary>
+		/// Retrieve the position before the first non indentation character on a line.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN18</remarks>
+		public int LineIndentPosition(int line)
+		{
+			return (int)FastPerform(2128, (uint)line, 0);
+		}
+
+		/// <summary>
+		/// Retrieve the column number of a position, taking tab width into account.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN18</remarks>
+		public int Column(int pos)
+		{
+			return (int)FastPerform(2129, (uint)pos, 0);
+		}
+
+		/// <summary>
+		/// Is the horizontal scroll bar visible?
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN07</remarks>
+		public bool IsHScrollBar
+		{
+			get
+			{
+				return FastPerform(2131, 0, 0) != 0;
+			}
+			set
+			{
+				FastPerform(2130, (uint)(value ? 1 : 0), 0);
+			}
+		}
+
+		/// <summary>
+		/// Are the indentation guides visible?
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN07</remarks>
+		public int IndentationGuides
+		{
+			get
+			{
+				return (int)FastPerform(2133, 0, 0);
+			}
+			set
+			{
+				FastPerform(2132, (uint)value, 0);
+			}
+		}
+
+		/// <summary>
+		/// Get the highlighted indentation guide column.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN08</remarks>
+		public int HighlightGuide
+		{
+			get
+			{
+				return (int)FastPerform(2135, 0, 0);
+			}
+			set
+			{
+				FastPerform(2134, (uint)value, 0);
+			}
+		}
+
+		/// <summary>
+		/// Get the position after the last visible characters on a line.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN18</remarks>
+		public int LineEndPosition(int line)
+		{
+			return (int)FastPerform(2136, (uint)line, 0);
+		}
+
+		/// <summary>
+		/// Get the code page used to interpret the bytes of the document as characters.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN08</remarks>
+		public int CodePage
+		{
+			get
+			{
+				return (int)FastPerform(2137, 0, 0);
+			}
+			set
+			{
+				FastPerform(2037, (uint)value, 0);
+			}
+		}
+
+		/// <summary>
+		/// Get the foreground colour of the caret.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN08</remarks>
+		public int CaretFore
+		{
+			get
+			{
+				return (int)FastPerform(2138, 0, 0);
+			}
+			set
+			{
+				FastPerform(2069, (uint)value, 0);
+			}
+		}
+
+		/// <summary>
+		/// In palette mode?
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN07</remarks>
+		public bool IsUsePalette
+		{
+			get
+			{
+				return FastPerform(2139, 0, 0) != 0;
+			}
+			set
+			{
+				FastPerform(2039, (uint)(value ? 1 : 0), 0);
+			}
+		}
+
+		/// <summary>
+		/// In read-only mode?
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN07</remarks>
+		public bool IsReadOnly
+		{
+			get
+			{
+				return FastPerform(2140, 0, 0) != 0;
+			}
+			set
+			{
+				FastPerform(2171, (uint)(value ? 1 : 0), 0);
+			}
+		}
+
+		/// <summary>
+		/// Returns the position at the start of the selection.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN08</remarks>
+		public int SelectionStart
+		{
+			get
+			{
+				return (int)FastPerform(2143, 0, 0);
+			}
+			set
+			{
+				FastPerform(2142, (uint)value, 0);
+			}
+		}
+
+		/// <summary>
+		/// Returns the position at the end of the selection.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN08</remarks>
+		public int SelectionEnd
+		{
+			get
+			{
+				return (int)FastPerform(2145, 0, 0);
+			}
+			set
+			{
+				FastPerform(2144, (uint)value, 0);
+			}
+		}
+
+		/// <summary>
+		/// Returns the print magnification.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN08</remarks>
+		public int PrintMagnification
+		{
+			get
+			{
+				return (int)FastPerform(2147, 0, 0);
+			}
+			set
+			{
+				FastPerform(2146, (uint)value, 0);
+			}
+		}
+
+		/// <summary>
+		/// Returns the print colour mode.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN08</remarks>
+		public int PrintColourMode
+		{
+			get
+			{
+				return (int)FastPerform(2149, 0, 0);
+			}
+			set
+			{
+				FastPerform(2148, (uint)value, 0);
+			}
+		}
+
+		/// <summary>
+		/// Retrieve the display line at the top of the display.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN06</remarks>
+		public int FirstVisibleLine
+		{
+			get
+			{
+				return (int)FastPerform(2152, 0, 0);
+			}
+		}
+
+		/// <summary>
+		/// Returns the number of lines in the document. There is always at least one.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN06</remarks>
+		public int LineCount
+		{
+			get
+			{
+				return (int)FastPerform(2154, 0, 0);
+			}
+		}
+
+		/// <summary>
+		/// Returns the size in pixels of the left margin.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN08</remarks>
+		public int MarginLeft
+		{
+			get
+			{
+				return (int)FastPerform(2156, 0, 0);
+			}
+			set
+			{
+				FastPerform(2155, (uint)value, 0);
+			}
+		}
+
+		/// <summary>
+		/// Returns the size in pixels of the right margin.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN08</remarks>
+		public int MarginRight
+		{
+			get
+			{
+				return (int)FastPerform(2158, 0, 0);
+			}
+			set
+			{
+				FastPerform(2157, (uint)value, 0);
+			}
+		}
+
+		/// <summary>
+		/// Is the document different from when it was last saved?
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN05</remarks>
+		public bool IsModify
+		{
+			get
+			{
+				return FastPerform(2159, 0, 0) != 0;
+			}
+		}
+
+		/// <summary>
+		/// Retrieve the number of characters in the document.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN06</remarks>
+		public int TextLength
+		{
+			get
+			{
+				return (int)FastPerform(2183, 0, 0);
+			}
+		}
+
+		/// <summary>
+		/// Retrieve a pointer to a function that processes messages for this Scintilla.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN06</remarks>
+		public int DirectFunction
+		{
+			get
+			{
+				return (int)FastPerform(2184, 0, 0);
+			}
+		}
+
+		/// <summary>
+		/// Retrieve a pointer value to use as the first argument when calling
+		/// the function returned by GetDirectFunction.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN06</remarks>
+		public int DirectPointer
+		{
+			get
+			{
+				return (int)FastPerform(2185, 0, 0);
+			}
+		}
+
+		/// <summary>
+		/// Returns true if overtype mode is active otherwise false is returned.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN07</remarks>
+		public bool IsOvertype
+		{
+			get
+			{
+				return FastPerform(2187, 0, 0) != 0;
+			}
+			set
+			{
+				FastPerform(2186, (uint)(value ? 1 : 0), 0);
+			}
+		}
+
+		/// <summary>
+		/// Returns the width of the insert mode caret.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN08</remarks>
+		public int CaretWidth
+		{
+			get
+			{
+				return (int)FastPerform(2189, 0, 0);
+			}
+			set
+			{
+				FastPerform(2188, (uint)value, 0);
+			}
+		}
+
+		/// <summary>
+		/// Get the position that starts the target.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN08</remarks>
+		public int TargetStart
+		{
+			get
+			{
+				return (int)FastPerform(2191, 0, 0);
+			}
+			set
+			{
+				FastPerform(2190, (uint)value, 0);
+			}
+		}
+
+		/// <summary>
+		/// Get the position that ends the target.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN08</remarks>
+		public int TargetEnd
+		{
+			get
+			{
+				return (int)FastPerform(2193, 0, 0);
+			}
+			set
+			{
+				FastPerform(2192, (uint)value, 0);
+			}
+		}
+
+		/// <summary>
+		/// Get the search flags used by SearchInTarget.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN08</remarks>
+		public int SearchFlags
+		{
+			get
+			{
+				return (int)FastPerform(2199, 0, 0);
+			}
+			set
+			{
+				FastPerform(2198, (uint)value, 0);
+			}
+		}
+
+		/// <summary>
+		/// Retrieve the fold level of a line.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN29</remarks>
+		public int GetFoldLevel(int line)
+		{
+			return (int)FastPerform(2223, (uint)line, 0);
+		}
+
+		/// <summary>
+		/// Set the fold level of a line.
+		/// This encodes an integer level along with flags indicating whether the
+		/// line is a header and whether it is effectively white space.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN30</remarks>
+		public void SetFoldLevel(int line, int level)
+		{
+			FastPerform(2222, (uint)line, (uint)level);
+		}
+
+		/// <summary>
+		/// Find the last child line of a header line.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN19</remarks>
+		public int LastChild(int line, int level)
+		{
+			return (int)FastPerform(2224, (uint)line, (uint)level);
+		}
+
+		/// <summary>
+		/// Find the last child line of a header line.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN18</remarks>
+		public int LastChild(int line)
+		{
+			return (int)FastPerform(2224, (uint)line, 0);
+		}
+
+		/// <summary>
+		/// Find the parent line of a child line.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN18</remarks>
+		public int FoldParent(int line)
+		{
+			return (int)FastPerform(2225, (uint)line, 0);
+		}
+
+		/// <summary>
+		/// Is a line visible?
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN05</remarks>
+		public bool IsLineVisible
+		{
+			get
+			{
+				return FastPerform(2228, 0, 0) != 0;
+			}
+		}
+
+		/// <summary>
+		/// Is a header line expanded?
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN31</remarks>
+		public bool FoldExpanded(int line)
+		{
+			return FastPerform(2230, (uint)line, 0) != 0;
+		}
+
+		/// <summary>
+		/// Show the children of a header line.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN32</remarks>
+		public void FoldExpanded(int line, bool expanded)
+		{
+			FastPerform(2229, (uint)line, (uint)(expanded ? 1 : 0));
+		}
+
+		/// <summary>
+		/// Does a tab pressed when caret is within indentation indent?
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN07</remarks>
+		public bool IsTabIndents
+		{
+			get
+			{
+				return FastPerform(2261, 0, 0) != 0;
+			}
+			set
+			{
+				FastPerform(2260, (uint)(value ? 1 : 0), 0);
+			}
+		}
+
+		/// <summary>
+		/// Does a backspace pressed when caret is within indentation unindent?
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN07</remarks>
+		public bool IsBackSpaceUnIndents
+		{
+			get
+			{
+				return FastPerform(2263, 0, 0) != 0;
+			}
+			set
+			{
+				FastPerform(2262, (uint)(value ? 1 : 0), 0);
+			}
+		}
+
+		/// <summary>
+		/// Retrieve the time the mouse must sit still to generate a mouse dwell event.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN08</remarks>
+		public int MouseDwellTime
+		{
+			get
+			{
+				return (int)FastPerform(2265, 0, 0);
+			}
+			set
+			{
+				FastPerform(2264, (uint)value, 0);
+			}
+		}
+
+		/// <summary>
+		/// Retrieve whether text is word wrapped.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN08</remarks>
+		public int WrapMode
+		{
+			get
+			{
+				return (int)FastPerform(2269, 0, 0);
+			}
+			set
+			{
+				FastPerform(2268, (uint)value, 0);
+			}
+		}
+
+		/// <summary>
+		/// Retrive the display mode of visual flags for wrapped lines.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN08</remarks>
+		public int WrapVisualFlags
+		{
+			get
+			{
+				return (int)FastPerform(2461, 0, 0);
+			}
+			set
+			{
+				FastPerform(2460, (uint)value, 0);
+			}
+		}
+
+		/// <summary>
+		/// Retrive the location of visual flags for wrapped lines.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN08</remarks>
+		public int WrapVisualFlagsLocation
+		{
+			get
+			{
+				return (int)FastPerform(2463, 0, 0);
+			}
+			set
+			{
+				FastPerform(2462, (uint)value, 0);
+			}
+		}
+
+		/// <summary>
+		/// Retrive the start indent for wrapped lines.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN08</remarks>
+		public int WrapStartIndent
+		{
+			get
+			{
+				return (int)FastPerform(2465, 0, 0);
+			}
+			set
+			{
+				FastPerform(2464, (uint)value, 0);
+			}
+		}
+
+		/// <summary>
+		/// Retrieve the degree of caching of layout information.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN08</remarks>
+		public int LayoutCache
+		{
+			get
+			{
+				return (int)FastPerform(2273, 0, 0);
+			}
+			set
+			{
+				FastPerform(2272, (uint)value, 0);
+			}
+		}
+
+		/// <summary>
+		/// Retrieve the document width assumed for scrolling.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN08</remarks>
+		public int ScrollWidth
+		{
+			get
+			{
+				return (int)FastPerform(2275, 0, 0);
+			}
+			set
+			{
+				FastPerform(2274, (uint)value, 0);
+			}
+		}
+
+		/// <summary>
+		/// Retrieve whether the maximum scroll position has the last
+		/// line at the bottom of the view.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN08</remarks>
+		public int EndAtLastLine
+		{
+			get
+			{
+				return (int)FastPerform(2278, 0, 0);
+			}
+			set
+			{
+				FastPerform(2277, (uint)value, 0);
+			}
+		}
+
+		/// <summary>
+		/// Is the vertical scroll bar visible?
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN07</remarks>
+		public bool IsVScrollBar
+		{
+			get
+			{
+				return FastPerform(2281, 0, 0) != 0;
+			}
+			set
+			{
+				FastPerform(2280, (uint)(value ? 1 : 0), 0);
+			}
+		}
+
+		/// <summary>
+		/// Is drawing done in two phases with backgrounds drawn before faoregrounds?
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN07</remarks>
+		public bool IsTwoPhaseDraw
+		{
+			get
+			{
+				return FastPerform(2283, 0, 0) != 0;
+			}
+			set
+			{
+				FastPerform(2284, (uint)(value ? 1 : 0), 0);
+			}
+		}
+
+		/// <summary>
+		/// Are the end of line characters visible?
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN07</remarks>
+		public bool IsViewEOL
+		{
+			get
+			{
+				return FastPerform(2355, 0, 0) != 0;
+			}
+			set
+			{
+				FastPerform(2356, (uint)(value ? 1 : 0), 0);
+			}
+		}
+
+		/// <summary>
+		/// Retrieve a pointer to the document object.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN08</remarks>
+		public int DocPointer
+		{
+			get
+			{
+				return (int)FastPerform(2357, 0, 0);
+			}
+			set
+			{
+				FastPerform(2358, (uint)value, 0);
+			}
+		}
+
+		/// <summary>
+		/// Retrieve the column number which text should be kept within.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN08</remarks>
+		public int EdgeColumn
+		{
+			get
+			{
+				return (int)FastPerform(2360, 0, 0);
+			}
+			set
+			{
+				FastPerform(2361, (uint)value, 0);
+			}
+		}
+
+		/// <summary>
+		/// Retrieve the edge highlight mode.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN08</remarks>
+		public int EdgeMode
+		{
+			get
+			{
+				return (int)FastPerform(2362, 0, 0);
+			}
+			set
+			{
+				FastPerform(2363, (uint)value, 0);
+			}
+		}
+
+		/// <summary>
+		/// Retrieve the colour used in edge indication.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN08</remarks>
+		public int EdgeColour
+		{
+			get
+			{
+				return (int)FastPerform(2364, 0, 0);
+			}
+			set
+			{
+				FastPerform(2365, (uint)value, 0);
+			}
+		}
+
+		/// <summary>
+		/// Retrieves the number of lines completely visible.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN06</remarks>
+		public int LinesOnScreen
+		{
+			get
+			{
+				return (int)FastPerform(2370, 0, 0);
+			}
+		}
+
+		/// <summary>
+		/// Is the selection rectangular? The alternative is the more common stream selection.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN05</remarks>
+		public bool IsSelectionIsRectangle
+		{
+			get
+			{
+				return FastPerform(2372, 0, 0) != 0;
+			}
+		}
+
+		/// <summary>
+		/// Set the zoom level. This number of points is added to the size of all fonts.
+		/// It may be positive to magnify or negative to reduce.
+		/// Retrieve the zoom level.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN08</remarks>
+		public int ZoomLevel
+		{
+			get
+			{
+				return (int)FastPerform(2374, 0, 0);
+			}
+			set
+			{
+				FastPerform(2373, (uint)value, 0);
+			}
+		}
+
+		/// <summary>
+		/// Get which document modification events are sent to the container.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN08</remarks>
+		public int ModEventMask
+		{
+			get
+			{
+				return (int)FastPerform(2378, 0, 0);
+			}
+			set
+			{
+				FastPerform(2359, (uint)value, 0);
+			}
+		}
+
+		/// <summary>
+		/// Change internal focus flag.
+		/// Get internal focus flag.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN07</remarks>
+		public bool IsFocus
+		{
+			get
+			{
+				return FastPerform(2381, 0, 0) != 0;
+			}
+			set
+			{
+				FastPerform(2380, (uint)(value ? 1 : 0), 0);
+			}
+		}
+
+		/// <summary>
+		/// Change error status - 0 = OK.
+		/// Get error status.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN08</remarks>
+		public int Status
+		{
+			get
+			{
+				return (int)FastPerform(2383, 0, 0);
+			}
+			set
+			{
+				FastPerform(2382, (uint)value, 0);
+			}
+		}
+
+		/// <summary>
+		/// Set whether the mouse is captured when its button is pressed.
+		/// Get whether mouse gets captured.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN07</remarks>
+		public bool IsMouseDownCaptures
+		{
+			get
+			{
+				return FastPerform(2385, 0, 0) != 0;
+			}
+			set
+			{
+				FastPerform(2384, (uint)(value ? 1 : 0), 0);
+			}
+		}
+
+		/// <summary>
+		/// Sets the cursor to one of the SC_CURSOR* values.
+		/// Get cursor type.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN08</remarks>
+		public int CursorType
+		{
+			get
+			{
+				return (int)FastPerform(2387, 0, 0);
+			}
+			set
+			{
+				FastPerform(2386, (uint)value, 0);
+			}
+		}
+
+		/// <summary>
+		/// Change the way control characters are displayed:
+		/// If symbol is less than 32, keep the drawn way, else, use the given character.
+		/// Get the way control characters are displayed.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN08</remarks>
+		public int ControlCharSymbol
+		{
+			get
+			{
+				return (int)FastPerform(2389, 0, 0);
+			}
+			set
+			{
+				FastPerform(2388, (uint)value, 0);
+			}
+		}
+
+		/// <summary>
+		/// Get and Set the xOffset (ie, horizonal scroll position).
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN08</remarks>
+		public int XOffset
+		{
+			get
+			{
+				return (int)FastPerform(2398, 0, 0);
+			}
+			set
+			{
+				FastPerform(2397, (uint)value, 0);
+			}
+		}
+
+		/// <summary>
+		/// Is printing line wrapped?
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN08</remarks>
+		public int PrintWrapMode
+		{
+			get
+			{
+				return (int)FastPerform(2407, 0, 0);
+			}
+			set
+			{
+				FastPerform(2406, (uint)value, 0);
+			}
+		}
+
+		/// <summary>
+		/// Get the mode of the current selection.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN08</remarks>
+		public int SelectionMode
+		{
+			get
+			{
+				return (int)FastPerform(2423, 0, 0);
+			}
+			set
+			{
+				FastPerform(2422, (uint)value, 0);
+			}
+		}
+
+		/// <summary>
+		/// Retrieve the lexing language of the document.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN08</remarks>
+		public int Lexer
+		{
+			get
+			{
+				return (int)FastPerform(4002, 0, 0);
+			}
+			set
+			{
+				FastPerform(4001, (uint)value, 0);
+			}
+		}
+
+		/// <summary>
+		/// Clear all the styles and make equivalent to the global default style.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN20</remarks>
+		public void StyleClearAll()
+		{
+			FastPerform(2050, 0, 0);
+		}
+
+		/// <summary>
+		/// Set the foreground colour of a style.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN24</remarks>
+		public void StyleSetFore(int style, int fore)
+		{
+			FastPerform(2051, (uint)style, (uint)fore);
+		}
+
+		/// <summary>
+		/// Set the background colour of a style.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN24</remarks>
+		public void StyleSetBack(int style, int back)
+		{
+			FastPerform(2052, (uint)style, (uint)back);
+		}
+
+		/// <summary>
+		/// Set a style to be bold or not.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN25</remarks>
+		public void StyleSetBold(int style, bool bold)
+		{
+			FastPerform(2053, (uint)style, (uint)(bold ? 1 : 0));
+		}
+
+		/// <summary>
+		/// Set a style to be italic or not.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN25</remarks>
+		public void StyleSetItalic(int style, bool italic)
+		{
+			FastPerform(2054, (uint)style, (uint)(italic ? 1 : 0));
+		}
+
+		/// <summary>
+		/// Set the size of characters of a style.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN24</remarks>
+		public void StyleSetSize(int style, int sizePoints)
+		{
+			FastPerform(2055, (uint)style, (uint)sizePoints);
+		}
+
+		/// <summary>
+		/// Set the font of a style.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN27</remarks>
+		unsafe public void StyleSetFont(int style, string fontName)
+		{
+			if(fontName == null || fontName.Equals(""))
+				fontName = "\0\0";
+
+			fixed(byte* b = System.Text.UTF8Encoding.UTF8.GetBytes(fontName))
+				FastPerform(2056, (uint)style, (uint)b);
+		}
+
+
+		/// <summary>
+		/// Set a style to have its end of line filled or not.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN25</remarks>
+		public void StyleSetEOLFilled(int style, bool filled)
+		{
+			FastPerform(2057, (uint)style, (uint)(filled ? 1 : 0));
+		}
+
+		/// <summary>
+		/// Set a style to be underlined or not.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN25</remarks>
+		public void StyleSetUnderline(int style, bool underline)
+		{
+			FastPerform(2059, (uint)style, (uint)(underline ? 1 : 0));
+		}
+
+		/// <summary>
+		/// Set a style to be mixed case, or to force upper or lower case.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN24</remarks>
+		public void StyleSetCase(int style, int caseForce)
+		{
+			FastPerform(2060, (uint)style, (uint)caseForce);
+		}
+
+		/// <summary>
+		/// Set the character set of the font in a style.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN24</remarks>
+		public void StyleSetCharacterSet(int style, int characterSet)
+		{
+			FastPerform(2066, (uint)style, (uint)characterSet);
+		}
+
+		/// <summary>
+		/// Set a style to be a hotspot or not.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN25</remarks>
+		public void StyleSetHotSpot(int style, bool hotspot)
+		{
+			FastPerform(2409, (uint)style, (uint)(hotspot ? 1 : 0));
+		}
+
+		/// <summary>
+		/// Set a style to be visible or not.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN25</remarks>
+		public void StyleSetVisible(int style, bool visible)
+		{
+			FastPerform(2074, (uint)style, (uint)(visible ? 1 : 0));
+		}
+
+		/// <summary>
+		/// Set the set of characters making up words for when moving or selecting by word.
+		/// First sets deaults like SetCharsDefault.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN28</remarks>
+		unsafe public void WordChars(string characters)
+		{
+			if(characters == null || characters.Equals(""))
+				characters = "\0\0";
+
+			fixed(byte* b = System.Text.UTF8Encoding.UTF8.GetBytes(characters))
+				FastPerform(2077, 0, (uint)b);
+		}
+
+
+		/// <summary>
+		/// Set a style to be changeable or not (read only).
+		/// Experimental feature, currently buggy.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN25</remarks>
+		public void StyleSetChangeable(int style, bool changeable)
+		{
+			FastPerform(2099, (uint)style, (uint)(changeable ? 1 : 0));
+		}
+
+		/// <summary>
+		/// Define a set of characters that when typed will cause the autocompletion to
+		/// choose the selected item.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN28</remarks>
+		unsafe public void AutoCSetFillUps(string characterSet)
+		{
+			if(characterSet == null || characterSet.Equals(""))
+				characterSet = "\0\0";
+
+			fixed(byte* b = System.Text.UTF8Encoding.UTF8.GetBytes(characterSet))
+				FastPerform(2112, 0, (uint)b);
+		}
+
+
+		/// <summary>
+		/// Set a fore colour for active hotspots.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN26</remarks>
+		public void HotspotActiveFore(bool useSetting, int fore)
+		{
+			FastPerform(2410, (uint)(useSetting ? 1 : 0), (uint)fore);
+		}
+
+		/// <summary>
+		/// Set a back colour for active hotspots.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN26</remarks>
+		public void HotspotActiveBack(bool useSetting, int back)
+		{
+			FastPerform(2411, (uint)(useSetting ? 1 : 0), (uint)back);
+		}
+
+		/// <summary>
+		/// Set the set of characters making up whitespace for when moving or selecting by word.
+		/// Should be called after SetWordChars.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN28</remarks>
+		unsafe public void WhitespaceChars(string characters)
+		{
+			if(characters == null || characters.Equals(""))
+				characters = "\0\0";
+
+			fixed(byte* b = System.Text.UTF8Encoding.UTF8.GetBytes(characters))
+				FastPerform(2443, 0, (uint)b);
+		}
+
+
+		/// <summary>
+		/// Set up a value that may be used by a lexer for some optional feature.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN27</remarks>
+		unsafe public void Property(string key, string value)
+		{
+			if(key == null || key.Equals(""))
+				key = "\0\0";
+			if(value == null || value.Equals(""))
+				value = "\0\0";
+
+			fixed(byte* b = System.Text.UTF8Encoding.UTF8.GetBytes(value))
+			fixed(byte* b2 = System.Text.UTF8Encoding.UTF8.GetBytes(key))
+				FastPerform(4004, (uint)b2, (uint)b);
+		}
+
+
+		/// <summary>
+		/// Set up the key words used by the lexer.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN27</remarks>
+		unsafe public void KeyWords(int keywordSet, string keyWords)
+		{
+			if(keyWords == null || keyWords.Equals(""))
+				keyWords = "\0\0";
+
+			fixed(byte* b = System.Text.UTF8Encoding.UTF8.GetBytes(keyWords))
+				FastPerform(4005, (uint)keywordSet, (uint)b);
+		}
+
+
+		/// <summary>
+		/// Set the lexing language of the document based on string name.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN28</remarks>
+		unsafe public void LexerLanguage(string language)
+		{
+			if(language == null || language.Equals(""))
+				language = "\0\0";
+
+			fixed(byte* b = System.Text.UTF8Encoding.UTF8.GetBytes(language))
+				FastPerform(4006, 0, (uint)b);
+		}
+		
+		#endregion
+
+		#region ================== Contructor / Disposer
+
+		// Constructor
+		public ScintillaControl()
+		{
+			this.BackColor = SystemColors.Window;
+			
+			// Setup collections
+			ignoredkeys = new Dictionary<int, int>();
+
+			if(!this.DesignMode) Initialize();
+		}
+
+		// Initializer
+		public void Initialize()
+		{
+			// Initialize control
+			libraryptr = General.LoadLibrary(SCINTILLA_FILENAME);
+			controlptr = General.CreateWindowEx(0, SCINTILLA_CLASSNAME, "", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 0,
+												this.Width, this.Height, this.Handle, 0, new IntPtr(0), null);
+			
+			// Get a direct pointer
+			directptr = (int)SlowPerform(2185, 0, 0);
+
+			// Don't know why this is done here again
+			directptr = (int)FastPerform(2185, 0, 0);
+		}
+		
+		// Disposer
+		protected override void Dispose(bool disposing)
+		{
+			// Disposing?
+			if(!base.IsDisposed)
+			{
+				if(!this.DesignMode)
+				{
+					// Dispose managed resources
+					if(disposing)
+					{
+						
+						
+					}
+					
+					// Clean up
+					// Why does this crash?
+					//ClearRegisteredImages();
+					
+					// Dispose unmanaged elements
+					if(controlptr != IntPtr.Zero) General.DestroyWindow(controlptr);
+					if(libraryptr != IntPtr.Zero) General.FreeLibrary(libraryptr);
+				}
+			}
+			
+			base.Dispose(disposing);
+		}
+		
+		#endregion
+
+		#region ================== Events
+		
+		// When resized
+		protected override void OnResize(EventArgs e)
+		{
+			base.OnResize(e);
+
+			// Resize control
+			//General.SetWindowPos(controlptr, 0, base.Location.X, base.Location.Y, base.Width, base.Height, 0);
+			General.SetWindowPos(controlptr, 0, 0, 0, base.Width, base.Height, 0);
+		}
+		
+		// When a windows message is pre-processed
+		public override bool PreProcessMessage(ref Message m)
+		{
+			switch(m.Msg)
+			{
+				case WM_KEYUP:
+				case WM_KEYDOWN:
+					// Why do I have to call this for my events work properly?
+					// I should be able to call base.PreProcessMessage, but that doesn't raise my events!
+					return base.ProcessKeyEventArgs(ref m);
+			}
+			return false;
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+
+		// Perform a command (using SendMessage)
+		protected UInt32 SlowPerform(UInt32 message, UInt32 wParam, UInt32 lParam)
+		{
+			if(controlptr != IntPtr.Zero)
+			{
+				return (UInt32)General.SendMessage(controlptr, message, (int)wParam, (int)lParam);
+			}
+			else
+			{
+				return 0;
+			}
+		}
+
+		// Immediately perform a command (send directly to control)
+		protected UInt32 FastPerform(UInt32 message, UInt32 wParam, UInt32 lParam)
+		{
+			if(controlptr != IntPtr.Zero)
+			{
+				return (UInt32)Perform(directptr, message, wParam, lParam);
+			}
+			else
+			{
+				return 0;
+			}
+		}
+
+		private void AddIgnoredKey(Shortcut shortcutkey)
+		{
+			int key = (int)shortcutkey;
+			this.ignoredkeys.Add(key, key);
+		}
+
+		public void AddIgnoredKey(Keys key, Keys modifier)
+		{
+			this.ignoredkeys.Add((int)key + (int)modifier, (int)key + (int)modifier);
+		}
+
+		private void AddShortcuts(Menu m)
+		{
+			foreach(MenuItem mi in m.MenuItems)
+			{
+				if(mi.Shortcut != Shortcut.None)
+					AddIgnoredKey(mi.Shortcut);
+				if(mi.MenuItems.Count > 0)
+					AddShortcuts(mi);
+			}
+		}
+
+		protected void AddShortcutsFromForm(Form parentForm)
+		{
+			if((parentForm != null) && (parentForm.Menu != null))
+			{
+				AddShortcuts(parentForm.Menu);
+			}
+		}
+
+		/// <summary>
+		/// Convert all line endings in the document to one mode.
+		/// </summary>
+		public void ConvertEOLs(ScriptEndOfLine eolMode)
+		{
+			ConvertEOLs((int)eolMode);
+		}
+
+		/// <summary>
+		/// Set the symbol used for a particular marker number.
+		/// </summary>
+		public void MarkerDefine(int markerNumber, ScriptMarkerSymbol markerSymbol)
+		{
+			MarkerDefine(markerNumber, (int)markerSymbol);
+		}
+
+		/// <summary>
+		/// Set the character set of the font in a style.
+		/// </summary>
+		public void StyleSetCharacterSet(int style, ScriptCharacterSet characterSet)
+		{
+			StyleSetCharacterSet(style, (int)characterSet);
+		}
+
+		/// <summary>
+		/// Set a style to be mixed case, or to force upper or lower case.
+		/// </summary>
+		public void StyleSetCase(int style, ScriptCaseVisible caseForce)
+		{
+			StyleSetCase(style, (int)caseForce);
+		}
+		
+		#endregion
+
+		#region ================== Message Pump
+		
+		// This handles messages
+		protected override void WndProc(ref Message m)
+		{
+			// Notify message?
+			if(m.Msg == WM_NOTIFY)
+			{
+				SCNotification scn = (SCNotification)Marshal.PtrToStructure(m.LParam, typeof(SCNotification));
+
+				if(scn.nmhdr.hwndFrom == controlptr)
+				{
+					switch(scn.nmhdr.code)
+					{
+						#region "scintilla-event-dispatch"
+
+						case (uint)ScintillaEvents.StyleNeeded:
+							if(StyleNeeded != null)
+								StyleNeeded(this, scn.position);
+							break;
+
+						case (uint)ScintillaEvents.CharAdded:
+							if(CharAdded != null)
+								CharAdded(this, scn.ch);
+							break;
+
+						case (uint)ScintillaEvents.SavePointReached:
+							if(SavePointReached != null)
+								SavePointReached(this);
+							break;
+
+						case (uint)ScintillaEvents.SavePointLeft:
+							if(SavePointLeft != null)
+								SavePointLeft(this);
+							break;
+
+						case (uint)ScintillaEvents.ModifyAttemptRO:
+							if(ModifyAttemptRO != null)
+								ModifyAttemptRO(this);
+							break;
+
+						case (uint)ScintillaEvents.Key:
+							if(Key != null)
+								Key(this, scn.ch, scn.modifiers);
+							break;
+
+						case (uint)ScintillaEvents.DoubleClick:
+							if(DoubleClick != null)
+								DoubleClick(this);
+							break;
+
+						case (uint)ScintillaEvents.UpdateUI:
+							if(UpdateUI != null)
+								UpdateUI(this);
+							break;
+
+						case (uint)ScintillaEvents.MacroRecord:
+							if(MacroRecord != null)
+								MacroRecord(this, scn.message, scn.wParam, scn.lParam);
+							break;
+
+						case (uint)ScintillaEvents.MarginClick:
+							if(MarginClick != null)
+								MarginClick(this, scn.modifiers, scn.position, scn.margin);
+							break;
+
+						case (uint)ScintillaEvents.NeedShown:
+							if(NeedShown != null)
+								NeedShown(this, scn.position, scn.length);
+							break;
+
+						case (uint)ScintillaEvents.Painted:
+							if(Painted != null)
+								Painted(this);
+							break;
+
+						case (uint)ScintillaEvents.UserlistSelection:
+							//if(UserListSelection != null)
+							//	UserListSelection(this, scn.listType, System.Runtime.InteropServices.Marshal.PtrToStringAuto(scn.text));
+							break;
+
+						case (uint)ScintillaEvents.UriDropped:
+							//if(URIDropped != null)
+							//	URIDropped(this, System.Runtime.InteropServices.Marshal.PtrToStringAuto(scn.text));
+							break;
+
+						case (uint)ScintillaEvents.DwellStart:
+							if(DwellStart != null)
+								DwellStart(this, scn.position);
+							break;
+
+						case (uint)ScintillaEvents.DwellEnd:
+							if(DwellEnd != null)
+								DwellEnd(this, scn.position);
+							break;
+
+						case (uint)ScintillaEvents.Zoom:
+							if(Zoom != null)
+								Zoom(this);
+							break;
+
+						case (uint)ScintillaEvents.HotspotClick:
+							if(HotSpotClick != null)
+								HotSpotClick(this, scn.modifiers, scn.position);
+							break;
+
+						case (uint)ScintillaEvents.HotspotDoubleClick:
+							if(HotSpotDoubleClick != null)
+								HotSpotDoubleClick(this, scn.modifiers, scn.position);
+							break;
+
+						case (uint)ScintillaEvents.CallTipClick:
+							if(CallTipClick != null)
+								CallTipClick(this, scn.position);
+							break;
+						#endregion
+
+						case (uint)ScintillaEvents.Modified:
+							if((scn.modificationType & (uint)ScriptModificationFlags.InsertText) > 0)
+								if(TextInserted != null)
+									TextInserted(this, scn.position, scn.length, scn.linesAdded);
+							if((scn.modificationType & (uint)ScriptModificationFlags.DeleteText) > 0)
+								if(TextDeleted != null)
+									TextDeleted(this, scn.position, scn.length, scn.linesAdded);
+							if((scn.modificationType & (uint)ScriptModificationFlags.ChangeStyle) > 0)
+								if(StyleChanged != null)
+									StyleChanged(this, scn.position, scn.length);
+							if((scn.modificationType & (uint)ScriptModificationFlags.ChangeFold) > 0)
+								if(FoldChanged != null)
+									FoldChanged(this, scn.line, scn.foldLevelNow, scn.foldLevelPrev);
+							if((scn.modificationType & (uint)ScriptModificationFlags.User) > 0)
+								if(UserPerformed != null)
+									UserPerformed(this);
+							if((scn.modificationType & (uint)ScriptModificationFlags.Undo) > 0)
+								if(UndoPerformed != null)
+									UndoPerformed(this);
+							if((scn.modificationType & (uint)ScriptModificationFlags.Redo) > 0)
+								if(RedoPerformed != null)
+									RedoPerformed(this);
+							if((scn.modificationType & (uint)ScriptModificationFlags.StepInUndoRedo) > 0)
+								if(LastStepInUndoRedo != null)
+									LastStepInUndoRedo(this);
+							if((scn.modificationType & (uint)ScriptModificationFlags.ChangeMarker) > 0)
+								if(MarkerChanged != null)
+									MarkerChanged(this, scn.line);
+							if((scn.modificationType & (uint)ScriptModificationFlags.BeforeInsert) > 0)
+								if(BeforeInsert != null)
+									BeforeInsert(this, scn.position, scn.length);
+							if((scn.modificationType & (uint)ScriptModificationFlags.BeforeDelete) > 0)
+								if(BeforeDelete != null)
+									BeforeDelete(this, scn.position, scn.length);
+
+								if(Modified != null)
+								{
+									string textstr = null;
+									try
+									{
+										textstr = Marshal.PtrToStringAuto(scn.text);
+									}
+									catch(IndexOutOfRangeException)
+									{
+										// I don't know why this is happening, but I don't need the text here anyways
+									}
+									
+									Modified(this, scn.position, scn.modificationType, textstr, scn.length, scn.linesAdded, scn.line, scn.foldLevelNow, scn.foldLevelPrev);
+								}
+							break;
+
+					}
+				}
+
+			}
+			else
+				base.WndProc(ref m);
+		}
+		
+		#endregion
+		
+		#region ================== Scintilla Functions
+
+		/// <summary>
+		/// Add text to the document at current position.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN22</remarks>
+		unsafe public void AddText(int length, string text)
+		{
+			if(text == null || text.Equals(""))
+				text = "\0\0";
+
+			fixed(byte* b = System.Text.UTF8Encoding.UTF8.GetBytes(text))
+				FastPerform(2001, (uint)length, (uint)b);
+		}
+
+
+		/// <summary>
+		/// Insert string at a position.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN22</remarks>
+		unsafe public void InsertText(int pos, string text)
+		{
+			if(text == null || text.Equals(""))
+				text = "\0\0";
+
+			fixed(byte* b = System.Text.UTF8Encoding.UTF8.GetBytes(text))
+				FastPerform(2003, (uint)pos, (uint)b);
+		}
+
+
+		/// <summary>
+		/// Delete all text in the document.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void ClearAll()
+		{
+			FastPerform(2004, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Set all style bytes to 0, remove all folding information.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void ClearDocumentStyle()
+		{
+			FastPerform(2005, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Redoes the next action on the undo history.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void Redo()
+		{
+			FastPerform(2011, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Select all the text in the document.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void SelectAll()
+		{
+			FastPerform(2013, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Remember the current position in the undo history as the position
+		/// at which the document was saved.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void SetSavePoint()
+		{
+			FastPerform(2014, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Retrieve the line number at which a particular marker is located.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN03</remarks>
+		public int MarkerLineFromHandle(int handle)
+		{
+			return (int)FastPerform(2017, (uint)handle, 0);
+		}
+
+
+		/// <summary>
+		/// Delete a marker.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN03</remarks>
+		public void MarkerDeleteHandle(int handle)
+		{
+			FastPerform(2018, (uint)handle, 0);
+		}
+
+
+		/// <summary>
+		/// Find the position from a point within the window.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN16</remarks>
+		public int PositionFromPoint(int x, int y)
+		{
+			return (int)FastPerform(2022, (uint)x, (uint)y);
+		}
+
+
+		/// <summary>
+		/// Find the position from a point within the window but return
+		/// INVALID_POSITION if not close to text.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN16</remarks>
+		public int PositionFromPointClose(int x, int y)
+		{
+			return (int)FastPerform(2023, (uint)x, (uint)y);
+		}
+
+
+		/// <summary>
+		/// Set caret to start of a line and ensure it is visible.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN03</remarks>
+		public void GotoLine(int line)
+		{
+			FastPerform(2024, (uint)line, 0);
+		}
+
+
+		/// <summary>
+		/// Set caret to a position and ensure it is visible.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN03</remarks>
+		public void GotoPos(int pos)
+		{
+			FastPerform(2025, (uint)pos, 0);
+		}
+
+
+		/// <summary>
+		/// Retrieve the text of the line containing the caret.
+		/// Returns the index of the caret on the line.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN14</remarks>
+		unsafe public string GetCurLine(int length)
+		{
+			int sz = (int)FastPerform(2027, (uint)length, 0);
+
+			byte[] buffer = new byte[sz + 1];
+			fixed(byte* b = buffer)
+				FastPerform(2027, (uint)length + 1, (uint)b);
+			return System.Text.UTF8Encoding.UTF8.GetString(buffer, 0, sz);
+		}
+
+		/// <summary>
+		/// Length Method for : Retrieve the text of the line containing the caret.
+		/// Returns the index of the caret on the line.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN15</remarks>
+		public int CurLineSize
+		{
+			get
+			{
+				return (int)FastPerform(2027, 0, 0);
+			}
+		}
+
+		/// <summary>
+		/// Convert all line endings in the document to one mode.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN03</remarks>
+		public void ConvertEOLs(int eolMode)
+		{
+			FastPerform(2029, (uint)eolMode, 0);
+		}
+
+
+		/// <summary>
+		/// Set the current styling position to pos and the styling mask to mask.
+		/// The styling mask can be used to protect some bits in each styling byte from modification.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN16</remarks>
+		public void StartStyling(int pos, int mask)
+		{
+			FastPerform(2032, (uint)pos, (uint)mask);
+		}
+
+
+		/// <summary>
+		/// Change style from current styling position for length characters to a style
+		/// and move the current styling position to after this newly styled segment.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN16</remarks>
+		public void SetStyling(int length, int style)
+		{
+			FastPerform(2033, (uint)length, (uint)style);
+		}
+
+
+		/// <summary>
+		/// Set the symbol used for a particular marker number.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN16</remarks>
+		public void MarkerDefine(int markerNumber, int markerSymbol)
+		{
+			FastPerform(2040, (uint)markerNumber, (uint)markerSymbol);
+		}
+
+
+		/// <summary>
+		/// Set the foreground colour used for a particular marker number.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN16</remarks>
+		public void MarkerSetFore(int markerNumber, int fore)
+		{
+			FastPerform(2041, (uint)markerNumber, (uint)fore);
+		}
+
+
+		/// <summary>
+		/// Set the background colour used for a particular marker number.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN16</remarks>
+		public void MarkerSetBack(int markerNumber, int back)
+		{
+			FastPerform(2042, (uint)markerNumber, (uint)back);
+		}
+
+
+		/// <summary>
+		/// Add a marker to a line, returning an ID which can be used to find or delete the marker.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN16</remarks>
+		public int MarkerAdd(int line, int markerNumber)
+		{
+			return (int)FastPerform(2043, (uint)line, (uint)markerNumber);
+		}
+
+
+		/// <summary>
+		/// Delete a marker from a line.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN16</remarks>
+		public void MarkerDelete(int line, int markerNumber)
+		{
+			FastPerform(2044, (uint)line, (uint)markerNumber);
+		}
+
+
+		/// <summary>
+		/// Delete all markers with a particular number from all lines.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN03</remarks>
+		public void MarkerDeleteAll(int markerNumber)
+		{
+			FastPerform(2045, (uint)markerNumber, 0);
+		}
+
+
+		/// <summary>
+		/// Get a bit mask of all the markers set on a line.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN03</remarks>
+		public int MarkerGet(int line)
+		{
+			return (int)FastPerform(2046, (uint)line, 0);
+		}
+
+
+		/// <summary>
+		/// Find the next line after lineStart that includes a marker in mask.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN16</remarks>
+		public int MarkerNext(int lineStart, int markerMask)
+		{
+			return (int)FastPerform(2047, (uint)lineStart, (uint)markerMask);
+		}
+
+
+		/// <summary>
+		/// Find the previous line before lineStart that includes a marker in mask.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN16</remarks>
+		public int MarkerPrevious(int lineStart, int markerMask)
+		{
+			return (int)FastPerform(2048, (uint)lineStart, (uint)markerMask);
+		}
+
+
+		/// <summary>
+		/// Define a marker from a pixmap.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN22</remarks>
+		unsafe public void MarkerDefinePixmap(int markerNumber, string pixmap)
+		{
+			if(pixmap == null || pixmap.Equals(""))
+				pixmap = "\0\0";
+
+			fixed(byte* b = System.Text.UTF8Encoding.UTF8.GetBytes(pixmap))
+				FastPerform(2049, (uint)markerNumber, (uint)b);
+		}
+
+
+		/// <summary>
+		/// Reset the default style to its state at startup
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void StyleResetDefault()
+		{
+			FastPerform(2058, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Set the foreground colour of the selection and whether to use this setting.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN21</remarks>
+		public void SetSelFore(bool useSetting, int fore)
+		{
+			FastPerform(2067, (uint)(useSetting ? 1 : 0), (uint)fore);
+		}
+
+
+		/// <summary>
+		/// Set the background colour of the selection and whether to use this setting.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN21</remarks>
+		public void SetSelBack(bool useSetting, int back)
+		{
+			FastPerform(2068, (uint)(useSetting ? 1 : 0), (uint)back);
+		}
+
+
+		/// <summary>
+		/// When key+modifier combination km is pressed perform msg.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN16</remarks>
+		public void AssignCmdKey(int km, int msg)
+		{
+			FastPerform(2070, (uint)km, (uint)msg);
+		}
+
+
+		/// <summary>
+		/// When key+modifier combination km is pressed do nothing.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN03</remarks>
+		public void ClearCmdKey(int km)
+		{
+			FastPerform(2071, (uint)km, 0);
+		}
+
+
+		/// <summary>
+		/// Drop all key mappings.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void ClearAllCmdKeys()
+		{
+			FastPerform(2072, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Set the styles for a segment of the document.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN22</remarks>
+		unsafe public void SetStylingEx(int length, string styles)
+		{
+			if(styles == null || styles.Equals(""))
+				styles = "\0\0";
+
+			fixed(byte* b = System.Text.UTF8Encoding.UTF8.GetBytes(styles))
+				FastPerform(2073, (uint)length, (uint)b);
+		}
+
+
+		/// <summary>
+		/// Start a sequence of actions that is undone and redone as a unit.
+		/// May be nested.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void BeginUndoAction()
+		{
+			FastPerform(2078, 0, 0);
+		}
+
+
+		/// <summary>
+		/// End a sequence of actions that is undone and redone as a unit.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void EndUndoAction()
+		{
+			FastPerform(2079, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Set the foreground colour of all whitespace and whether to use this setting.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN21</remarks>
+		public void SetWhitespaceFore(bool useSetting, int fore)
+		{
+			FastPerform(2084, (uint)(useSetting ? 1 : 0), (uint)fore);
+		}
+
+
+		/// <summary>
+		/// Set the background colour of all whitespace and whether to use this setting.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN21</remarks>
+		public void SetWhitespaceBack(bool useSetting, int back)
+		{
+			FastPerform(2085, (uint)(useSetting ? 1 : 0), (uint)back);
+		}
+
+
+		/// <summary>
+		/// Display a auto-completion list.
+		/// The lenEntered parameter indicates how many characters before
+		/// the caret should be used to provide context.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN22</remarks>
+		unsafe public void AutoCShow(int lenEntered, string itemList)
+		{
+			if(itemList == null || itemList.Equals(""))
+				itemList = "\0\0";
+
+			fixed(byte* b = System.Text.UTF8Encoding.UTF8.GetBytes(itemList))
+				FastPerform(2100, (uint)lenEntered, (uint)b);
+		}
+
+
+		/// <summary>
+		/// Remove the auto-completion list from the screen.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void AutoCCancel()
+		{
+			FastPerform(2101, 0, 0);
+		}
+
+
+		/// <summary>
+		/// User has selected an item so remove the list and insert the selection.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void AutoCComplete()
+		{
+			FastPerform(2104, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Define a set of character that when typed cancel the auto-completion list.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN04</remarks>
+		unsafe public void AutoCStops(string characterSet)
+		{
+			if(characterSet == null || characterSet.Equals(""))
+				characterSet = "\0\0";
+
+			fixed(byte* b = System.Text.UTF8Encoding.UTF8.GetBytes(characterSet))
+				FastPerform(2105, 0, (uint)b);
+		}
+
+
+		/// <summary>
+		/// Select the item in the auto-completion list that starts with a string.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN04</remarks>
+		unsafe public void AutoCSelect(string text)
+		{
+			if(text == null || text.Equals(""))
+				text = "\0\0";
+
+			fixed(byte* b = System.Text.UTF8Encoding.UTF8.GetBytes(text))
+				FastPerform(2108, 0, (uint)b);
+		}
+
+
+		/// <summary>
+		/// Display a list of strings and send notification when user chooses one.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN22</remarks>
+		unsafe public void UserListShow(int listType, string itemList)
+		{
+			if(itemList == null || itemList.Equals(""))
+				itemList = "\0\0";
+
+			fixed(byte* b = System.Text.UTF8Encoding.UTF8.GetBytes(itemList))
+				FastPerform(2117, (uint)listType, (uint)b);
+		}
+
+
+		/// <summary>
+		/// Register an XPM image for use in autocompletion lists.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN22</remarks>
+		unsafe public void RegisterImage(int type, string xpmData)
+		{
+			if(xpmData == null || xpmData.Equals(""))
+				xpmData = "\0\0";
+
+			fixed(byte* b = System.Text.UTF8Encoding.UTF8.GetBytes(xpmData))
+				FastPerform(2405, (uint)type, (uint)b);
+		}
+
+
+		/// <summary>
+		/// Clear all the registered XPM images.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void ClearRegisteredImages()
+		{
+			FastPerform(2408, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Retrieve the contents of a line.
+		/// Returns the length of the line.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN14</remarks>
+		unsafe public string GetLine(int line)
+		{
+			int sz = (int)FastPerform(2153, (uint)line, 0);
+
+			byte[] buffer = new byte[sz + 1];
+			fixed(byte* b = buffer)
+				FastPerform(2153, (uint)line, (uint)b);
+			return System.Text.UTF8Encoding.UTF8.GetString(buffer, 0, sz);
+		}
+
+		/// <summary>
+		/// Length Method for : Retrieve the contents of a line.
+		/// Returns the length of the line.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN15</remarks>
+		public int LineSize
+		{
+			get
+			{
+				return (int)FastPerform(2153, 0, 0);
+			}
+		}
+
+		/// <summary>
+		/// Select a range of text.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN16</remarks>
+		public void SetSel(int start, int end)
+		{
+			FastPerform(2160, (uint)start, (uint)end);
+		}
+
+
+		/// <summary>
+		/// Retrieve the selected text.
+		/// Return the length of the text.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN12</remarks>
+		unsafe public string SelText
+		{
+			get
+			{
+				int sz = (int)FastPerform(2161, 0, 0);
+
+				byte[] buffer = new byte[sz + 1];
+				fixed(byte* b = buffer)
+					FastPerform(2161, (UInt32)sz + 1, (uint)b);
+				return System.Text.UTF8Encoding.UTF8.GetString(buffer, 0, sz);
+			}
+		}
+
+		/// <summary>
+		/// Length Method for : Retrieve the selected text.
+		/// Return the length of the text.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN13</remarks>
+		public int SelTextSize
+		{
+			get
+			{
+				return (int)FastPerform(2161, 0, 0);
+			}
+		}
+
+		/// <summary>
+		/// Draw the selection in normal style or with selection highlighted.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN02</remarks>
+		public void HideSelection(bool normal)
+		{
+			FastPerform(2163, (uint)(normal ? 1 : 0), 0);
+		}
+
+
+		/// <summary>
+		/// Retrieve the x value of the point in the window where a position is displayed.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN11</remarks>
+		public int PointXFromPosition(int pos)
+		{
+			return (int)FastPerform(2164, 0, (uint)pos);
+		}
+
+
+		/// <summary>
+		/// Retrieve the y value of the point in the window where a position is displayed.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN11</remarks>
+		public int PointYFromPosition(int pos)
+		{
+			return (int)FastPerform(2165, 0, (uint)pos);
+		}
+
+
+		/// <summary>
+		/// Retrieve the line containing a position.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN03</remarks>
+		public int LineFromPosition(int pos)
+		{
+			return (int)FastPerform(2166, (uint)pos, 0);
+		}
+
+
+		/// <summary>
+		/// Retrieve the position at the start of a line.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN03</remarks>
+		public int PositionFromLine(int line)
+		{
+			return (int)FastPerform(2167, (uint)line, 0);
+		}
+
+
+		/// <summary>
+		/// Scroll horizontally and vertically.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN16</remarks>
+		public void LineScroll(int columns, int lines)
+		{
+			FastPerform(2168, (uint)columns, (uint)lines);
+		}
+
+
+		/// <summary>
+		/// Ensure the caret is visible.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void ScrollCaret()
+		{
+			FastPerform(2169, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Replace the selected text with the argument text.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN04</remarks>
+		unsafe public void ReplaceSel(string text)
+		{
+			if(text == null || text.Equals(""))
+				text = "\0\0";
+
+			fixed(byte* b = System.Text.UTF8Encoding.UTF8.GetBytes(text))
+				FastPerform(2170, 0, (uint)b);
+		}
+
+
+		/// <summary>
+		/// Null operation.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void Null()
+		{
+			FastPerform(2172, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Delete the undo history.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void EmptyUndoBuffer()
+		{
+			FastPerform(2175, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Undo one action in the undo history.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void Undo()
+		{
+			FastPerform(2176, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Cut the selection to the clipboard.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void Cut()
+		{
+			FastPerform(2177, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Copy the selection to the clipboard.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void Copy()
+		{
+			FastPerform(2178, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Paste the contents of the clipboard into the document replacing the selection.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void Paste()
+		{
+			FastPerform(2179, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Clear the selection.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void Clear()
+		{
+			FastPerform(2180, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Replace the contents of the document with the argument text.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN04</remarks>
+		unsafe public void SetText(byte[] text)
+		{
+			if(text.Length == 0)
+				text = new byte[2] { 0, 0 };
+
+			fixed(byte* b = text)
+				FastPerform(2181, 0, (uint)b);
+		}
+
+
+		/// <summary>
+		/// Retrieve all the text in the document.
+		/// Returns number of characters retrieved.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN14</remarks>
+		unsafe public byte[] GetText(int length)
+		{
+			int sz = (int)FastPerform(2182, (uint)length, 0);
+			if(sz > 0)
+			{
+				byte[] buffer = new byte[sz + 1];
+				fixed(byte* b = buffer)
+					FastPerform(2182, (uint)length + 1, (uint)b);
+				return buffer;
+			}
+			else
+			{
+				return new byte[0];
+			}
+		}
+
+		/// <summary>
+		/// Length Method for : Retrieve all the text in the document.
+		/// Returns number of characters retrieved.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN15</remarks>
+		public int TextSize
+		{
+			get
+			{
+				return (int)FastPerform(2182, 0, 0);
+			}
+		}
+
+		/// <summary>
+		/// Replace the target text with the argument text.
+		/// Text is counted so it can contain NULs.
+		/// Returns the length of the replacement text.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN22</remarks>
+		unsafe public int ReplaceTarget(int length, string text)
+		{
+			if(text == null || text.Equals(""))
+				text = "\0\0";
+
+			fixed(byte* b = System.Text.UTF8Encoding.UTF8.GetBytes(text))
+				return (int)FastPerform(2194, (uint)length, (uint)b);
+		}
+
+
+		/// <summary>
+		/// Replace the target text with the argument text after \d processing.
+		/// Text is counted so it can contain NULs.
+		/// Looks for \d where d is between 1 and 9 and replaces these with the strings
+		/// matched in the last search operation which were surrounded by \( and \).
+		/// Returns the length of the replacement text including any change
+		/// caused by processing the \d patterns.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN22</remarks>
+		unsafe public int ReplaceTargetRE(int length, string text)
+		{
+			if(text == null || text.Equals(""))
+				text = "\0\0";
+
+			fixed(byte* b = System.Text.UTF8Encoding.UTF8.GetBytes(text))
+				return (int)FastPerform(2195, (uint)length, (uint)b);
+		}
+
+
+		/// <summary>
+		/// Search for a counted string in the target and set the target to the found
+		/// range. Text is counted so it can contain NULs.
+		/// Returns length of range or -1 for failure in which case target is not moved.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN22</remarks>
+		unsafe public int SearchInTarget(int length, string text)
+		{
+			if(text == null || text.Equals(""))
+				text = "\0\0";
+
+			fixed(byte* b = System.Text.UTF8Encoding.UTF8.GetBytes(text))
+				return (int)FastPerform(2197, (uint)length, (uint)b);
+		}
+
+
+		/// <summary>
+		/// Show a call tip containing a definition near position pos.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN22</remarks>
+		unsafe public void CallTipShow(int pos, string definition)
+		{
+			if(definition == null || definition.Equals(""))
+				definition = "\0\0";
+
+			fixed(byte* b = System.Text.UTF8Encoding.UTF8.GetBytes(definition))
+				FastPerform(2200, (uint)pos, (uint)b);
+		}
+
+
+		/// <summary>
+		/// Remove the call tip from the screen.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void CallTipCancel()
+		{
+			FastPerform(2201, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Highlight a segment of the definition.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN16</remarks>
+		public void CallTipSetHlt(int start, int end)
+		{
+			FastPerform(2204, (uint)start, (uint)end);
+		}
+
+
+		/// <summary>
+		/// Find the display line of a document line taking hidden lines into account.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN03</remarks>
+		public int VisibleFromDocLine(int line)
+		{
+			return (int)FastPerform(2220, (uint)line, 0);
+		}
+
+
+		/// <summary>
+		/// Find the document line of a display line taking hidden lines into account.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN03</remarks>
+		public int DocLineFromVisible(int lineDisplay)
+		{
+			return (int)FastPerform(2221, (uint)lineDisplay, 0);
+		}
+
+
+		/// <summary>
+		/// Make a range of lines visible.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN16</remarks>
+		public void ShowLines(int lineStart, int lineEnd)
+		{
+			FastPerform(2226, (uint)lineStart, (uint)lineEnd);
+		}
+
+
+		/// <summary>
+		/// Make a range of lines invisible.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN16</remarks>
+		public void HideLines(int lineStart, int lineEnd)
+		{
+			FastPerform(2227, (uint)lineStart, (uint)lineEnd);
+		}
+
+
+		/// <summary>
+		/// Switch a header line between expanded and contracted.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN03</remarks>
+		public void ToggleFold(int line)
+		{
+			FastPerform(2231, (uint)line, 0);
+		}
+
+
+		/// <summary>
+		/// Ensure a particular line is visible by expanding any header line hiding it.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN03</remarks>
+		public void EnsureVisible(int line)
+		{
+			FastPerform(2232, (uint)line, 0);
+		}
+
+
+		/// <summary>
+		/// Set some style options for folding.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN03</remarks>
+		public void SetFoldFlags(int flags)
+		{
+			FastPerform(2233, (uint)flags, 0);
+		}
+
+
+		/// <summary>
+		/// Ensure a particular line is visible by expanding any header line hiding it.
+		/// Use the currently set visibility policy to determine which range to display.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN03</remarks>
+		public void EnsureVisibleEnforcePolicy(int line)
+		{
+			FastPerform(2234, (uint)line, 0);
+		}
+
+
+		/// <summary>
+		/// Get position of start of word.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN23</remarks>
+		public int WordStartPosition(int pos, bool onlyWordCharacters)
+		{
+			return (int)FastPerform(2266, (uint)pos, (uint)(onlyWordCharacters ? 1 : 0));
+		}
+
+
+		/// <summary>
+		/// Get position of end of word.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN23</remarks>
+		public int WordEndPosition(int pos, bool onlyWordCharacters)
+		{
+			return (int)FastPerform(2267, (uint)pos, (uint)(onlyWordCharacters ? 1 : 0));
+		}
+
+
+		/// <summary>
+		/// Measure the pixel width of some text in a particular style.
+		/// NUL terminated text argument.
+		/// Does not handle tab or control characters.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN22</remarks>
+		unsafe public int TextWidth(int style, string text)
+		{
+			if(text == null || text.Equals(""))
+				text = "\0\0";
+
+			fixed(byte* b = System.Text.UTF8Encoding.UTF8.GetBytes(text))
+				return (int)FastPerform(2276, (uint)style, (uint)b);
+		}
+
+
+		/// <summary>
+		/// Retrieve the height of a particular line of text in pixels.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN03</remarks>
+		public int TextHeight(int line)
+		{
+			return (int)FastPerform(2279, (uint)line, 0);
+		}
+
+
+		/// <summary>
+		/// Append a string to the end of the document without changing the selection.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN22</remarks>
+		unsafe public void AppendText(int length, string text)
+		{
+			if(text == null || text.Equals(""))
+				text = "\0\0";
+
+			fixed(byte* b = System.Text.UTF8Encoding.UTF8.GetBytes(text))
+				FastPerform(2282, (uint)length, (uint)b);
+		}
+
+
+		/// <summary>
+		/// Make the target range start and end be the same as the selection range start and end.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void TargetFromSelection()
+		{
+			FastPerform(2287, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Join the lines in the target.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void LinesJoin()
+		{
+			FastPerform(2288, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Split the lines in the target into lines that are less wide than pixelWidth
+		/// where possible.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN03</remarks>
+		public void LinesSplit(int pixelWidth)
+		{
+			FastPerform(2289, (uint)pixelWidth, 0);
+		}
+
+
+		/// <summary>
+		/// Set the colours used as a chequerboard pattern in the fold margin
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN21</remarks>
+		public void SetFoldMarginColour(bool useSetting, int back)
+		{
+			FastPerform(2290, (uint)(useSetting ? 1 : 0), (uint)back);
+		}
+
+
+		/// <summary>
+		/// Set the colours used as a chequerboard pattern in the fold margin
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN21</remarks>
+		public void SetFoldMarginHiColour(bool useSetting, int fore)
+		{
+			FastPerform(2291, (uint)(useSetting ? 1 : 0), (uint)fore);
+		}
+
+
+		/// <summary>
+		/// Move caret down one line.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void LineDown()
+		{
+			FastPerform(2300, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Move caret down one line extending selection to new caret position.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void LineDownExtend()
+		{
+			FastPerform(2301, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Move caret up one line.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void LineUp()
+		{
+			FastPerform(2302, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Move caret up one line extending selection to new caret position.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void LineUpExtend()
+		{
+			FastPerform(2303, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Move caret left one character.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void CharLeft()
+		{
+			FastPerform(2304, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Move caret left one character extending selection to new caret position.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void CharLeftExtend()
+		{
+			FastPerform(2305, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Move caret right one character.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void CharRight()
+		{
+			FastPerform(2306, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Move caret right one character extending selection to new caret position.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void CharRightExtend()
+		{
+			FastPerform(2307, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Move caret left one word.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void WordLeft()
+		{
+			FastPerform(2308, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Move caret left one word extending selection to new caret position.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void WordLeftExtend()
+		{
+			FastPerform(2309, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Move caret right one word.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void WordRight()
+		{
+			FastPerform(2310, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Move caret right one word extending selection to new caret position.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void WordRightExtend()
+		{
+			FastPerform(2311, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Move caret to first position on line.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void Home()
+		{
+			FastPerform(2312, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Move caret to first position on line extending selection to new caret position.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void HomeExtend()
+		{
+			FastPerform(2313, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Move caret to last position on line.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void LineEnd()
+		{
+			FastPerform(2314, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Move caret to last position on line extending selection to new caret position.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void LineEndExtend()
+		{
+			FastPerform(2315, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Move caret to first position in document.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void DocumentStart()
+		{
+			FastPerform(2316, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Move caret to first position in document extending selection to new caret position.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void DocumentStartExtend()
+		{
+			FastPerform(2317, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Move caret to last position in document.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void DocumentEnd()
+		{
+			FastPerform(2318, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Move caret to last position in document extending selection to new caret position.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void DocumentEndExtend()
+		{
+			FastPerform(2319, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Move caret one page up.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void PageUp()
+		{
+			FastPerform(2320, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Move caret one page up extending selection to new caret position.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void PageUpExtend()
+		{
+			FastPerform(2321, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Move caret one page down.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void PageDown()
+		{
+			FastPerform(2322, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Move caret one page down extending selection to new caret position.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void PageDownExtend()
+		{
+			FastPerform(2323, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Switch from insert to overtype mode or the reverse.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void EditToggleOvertype()
+		{
+			FastPerform(2324, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Cancel any modes such as call tip or auto-completion list display.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void Cancel()
+		{
+			FastPerform(2325, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Delete the selection or if no selection, the character before the caret.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void DeleteBack()
+		{
+			FastPerform(2326, 0, 0);
+		}
+
+
+		/// <summary>
+		/// If selection is empty or all on one line replace the selection with a tab character.
+		/// If more than one line selected, indent the lines.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void Tab()
+		{
+			FastPerform(2327, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Dedent the selected lines.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void BackTab()
+		{
+			FastPerform(2328, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Insert a new line, may use a CRLF, CR or LF depending on EOL mode.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void NewLine()
+		{
+			FastPerform(2329, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Insert a Form Feed character.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void FormFeed()
+		{
+			FastPerform(2330, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Move caret to before first visible character on line.
+		/// If already there move to first character on line.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void VCHome()
+		{
+			FastPerform(2331, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Like VCHome but extending selection to new caret position.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void VCHomeExtend()
+		{
+			FastPerform(2332, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Magnify the displayed text by increasing the sizes by 1 point.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void ZoomIn()
+		{
+			FastPerform(2333, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Make the displayed text smaller by decreasing the sizes by 1 point.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void ZoomOut()
+		{
+			FastPerform(2334, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Delete the word to the left of the caret.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void DelWordLeft()
+		{
+			FastPerform(2335, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Delete the word to the right of the caret.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void DelWordRight()
+		{
+			FastPerform(2336, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Cut the line containing the caret.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void LineCut()
+		{
+			FastPerform(2337, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Delete the line containing the caret.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void LineDelete()
+		{
+			FastPerform(2338, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Switch the current line with the previous.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void LineTranspose()
+		{
+			FastPerform(2339, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Duplicate the current line.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void LineDuplicate()
+		{
+			FastPerform(2404, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Transform the selection to lower case.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void LowerCase()
+		{
+			FastPerform(2340, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Transform the selection to upper case.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void UpperCase()
+		{
+			FastPerform(2341, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Scroll the document down, keeping the caret visible.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void LineScrollDown()
+		{
+			FastPerform(2342, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Scroll the document up, keeping the caret visible.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void LineScrollUp()
+		{
+			FastPerform(2343, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Delete the selection or if no selection, the character before the caret.
+		/// Will not delete the character before at the start of a line.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void DeleteBackNotLine()
+		{
+			FastPerform(2344, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Move caret to first position on display line.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void HomeDisplay()
+		{
+			FastPerform(2345, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Move caret to first position on display line extending selection to
+		/// new caret position.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void HomeDisplayExtend()
+		{
+			FastPerform(2346, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Move caret to last position on display line.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void LineEndDisplay()
+		{
+			FastPerform(2347, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Move caret to last position on display line extending selection to new
+		/// caret position.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void LineEndDisplayExtend()
+		{
+			FastPerform(2348, 0, 0);
+		}
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void HomeWrap()
+		{
+			FastPerform(2349, 0, 0);
+		}
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void HomeWrapExtend()
+		{
+			FastPerform(2450, 0, 0);
+		}
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void LineEndWrap()
+		{
+			FastPerform(2451, 0, 0);
+		}
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void LineEndWrapExtend()
+		{
+			FastPerform(2452, 0, 0);
+		}
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void VCHomeWrap()
+		{
+			FastPerform(2453, 0, 0);
+		}
+
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void VCHomeWrapExtend()
+		{
+			FastPerform(2454, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Copy the line containing the caret.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void LineCopy()
+		{
+			FastPerform(2455, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Move the caret inside current view if it's not there already.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void MoveCaretInsideView()
+		{
+			FastPerform(2401, 0, 0);
+		}
+
+
+		/// <summary>
+		/// How many characters are on a line, not including end of line characters?
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN03</remarks>
+		public int LineLength(int line)
+		{
+			return (int)FastPerform(2350, (uint)line, 0);
+		}
+
+
+		/// <summary>
+		/// Highlight the characters at two positions.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN16</remarks>
+		public void BraceHighlight(int pos1, int pos2)
+		{
+			FastPerform(2351, (uint)pos1, (uint)pos2);
+		}
+
+
+		/// <summary>
+		/// Highlight the character at a position indicating there is no matching brace.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN03</remarks>
+		public void BraceBadLight(int pos)
+		{
+			FastPerform(2352, (uint)pos, 0);
+		}
+
+
+		/// <summary>
+		/// Find the position of a matching brace or INVALID_POSITION if no match.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN03</remarks>
+		public int BraceMatch(int pos)
+		{
+			return (int)FastPerform(2353, (uint)pos, 0);
+		}
+
+
+		/// <summary>
+		/// Sets the current caret position to be the search anchor.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void SearchAnchor()
+		{
+			FastPerform(2366, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Find some text starting at the search anchor.
+		/// Does not ensure the selection is visible.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN22</remarks>
+		unsafe public int SearchNext(int flags, string text)
+		{
+			if(text == null || text.Equals(""))
+				text = "\0\0";
+
+			fixed(byte* b = System.Text.UTF8Encoding.UTF8.GetBytes(text))
+				return (int)FastPerform(2367, (uint)flags, (uint)b);
+		}
+
+
+		/// <summary>
+		/// Find some text starting at the search anchor and moving backwards.
+		/// Does not ensure the selection is visible.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN22</remarks>
+		unsafe public int SearchPrev(int flags, string text)
+		{
+			if(text == null || text.Equals(""))
+				text = "\0\0";
+
+			fixed(byte* b = System.Text.UTF8Encoding.UTF8.GetBytes(text))
+				return (int)FastPerform(2368, (uint)flags, (uint)b);
+		}
+
+
+		/// <summary>
+		/// Set whether a pop up menu is displayed automatically when the user presses
+		/// the wrong mouse button.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN02</remarks>
+		public void UsePopUp(bool allowPopUp)
+		{
+			FastPerform(2371, (uint)(allowPopUp ? 1 : 0), 0);
+		}
+
+
+		/// <summary>
+		/// Create a new document object.
+		/// Starts with reference count of 1 and not selected into editor.
+		/// Extend life of document.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN11</remarks>
+		public void AddRefDocument(int doc)
+		{
+			FastPerform(2376, 0, (uint)doc);
+		}
+
+
+		/// <summary>
+		/// Create a new document object.
+		/// Starts with reference count of 1 and not selected into editor.
+		/// Extend life of document.
+		/// Release a reference to the document, deleting document if it fades to black.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN11</remarks>
+		public void ReleaseDocument(int doc)
+		{
+			FastPerform(2377, 0, (uint)doc);
+		}
+
+
+		/// <summary>
+		/// Move to the previous change in capitalisation.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void WordPartLeft()
+		{
+			FastPerform(2390, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Move to the previous change in capitalisation.
+		/// Move to the previous change in capitalisation extending selection
+		/// to new caret position.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void WordPartLeftExtend()
+		{
+			FastPerform(2391, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Move to the previous change in capitalisation.
+		/// Move to the previous change in capitalisation extending selection
+		/// to new caret position.
+		/// Move to the change next in capitalisation.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void WordPartRight()
+		{
+			FastPerform(2392, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Move to the previous change in capitalisation.
+		/// Move to the previous change in capitalisation extending selection
+		/// to new caret position.
+		/// Move to the change next in capitalisation.
+		/// Move to the next change in capitalisation extending selection
+		/// to new caret position.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void WordPartRightExtend()
+		{
+			FastPerform(2393, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Constants for use with SetVisiblePolicy, similar to SetCaretPolicy.
+		/// Set the way the display area is determined when a particular line
+		/// is to be moved to by Find, FindNext, GotoLine, etc.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN16</remarks>
+		public void SetVisiblePolicy(int visiblePolicy, int visibleSlop)
+		{
+			FastPerform(2394, (uint)visiblePolicy, (uint)visibleSlop);
+		}
+
+
+		/// <summary>
+		/// Delete back from the current position to the start of the line.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void DelLineLeft()
+		{
+			FastPerform(2395, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Delete forwards from the current position to the end of the line.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void DelLineRight()
+		{
+			FastPerform(2396, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Set the last x chosen value to be the caret x position.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void ChooseCaretX()
+		{
+			FastPerform(2399, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Set the focus to this Scintilla widget.
+		/// GTK+ Specific.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void GrabFocus()
+		{
+			FastPerform(2400, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Set the way the caret is kept visible when going sideway.
+		/// The exclusion zone is given in pixels.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN16</remarks>
+		public void SetXCaretPolicy(int caretPolicy, int caretSlop)
+		{
+			FastPerform(2402, (uint)caretPolicy, (uint)caretSlop);
+		}
+
+
+		/// <summary>
+		/// Set the way the line the caret is on is kept visible.
+		/// The exclusion zone is given in lines.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN16</remarks>
+		public void SetYCaretPolicy(int caretPolicy, int caretSlop)
+		{
+			FastPerform(2403, (uint)caretPolicy, (uint)caretSlop);
+		}
+
+
+		/// <summary>
+		/// Move caret between paragraphs (delimited by empty lines).
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void ParaDown()
+		{
+			FastPerform(2413, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Move caret between paragraphs (delimited by empty lines).
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void ParaDownExtend()
+		{
+			FastPerform(2414, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Move caret between paragraphs (delimited by empty lines).
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void ParaUp()
+		{
+			FastPerform(2415, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Move caret between paragraphs (delimited by empty lines).
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void ParaUpExtend()
+		{
+			FastPerform(2416, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Given a valid document position, return the previous position taking code
+		/// page into account. Returns 0 if passed 0.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN03</remarks>
+		public int PositionBefore(int pos)
+		{
+			return (int)FastPerform(2417, (uint)pos, 0);
+		}
+
+
+		/// <summary>
+		/// Given a valid document position, return the next position taking code
+		/// page into account. Maximum value returned is the last position in the document.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN03</remarks>
+		public int PositionAfter(int pos)
+		{
+			return (int)FastPerform(2418, (uint)pos, 0);
+		}
+
+
+		/// <summary>
+		/// Copy a range of text to the clipboard. Positions are clipped into the document.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN16</remarks>
+		public void CopyRange(int start, int end)
+		{
+			FastPerform(2419, (uint)start, (uint)end);
+		}
+
+
+		/// <summary>
+		/// Copy argument text to the clipboard.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN22</remarks>
+		unsafe public void CopyText(int length, string text)
+		{
+			if(text == null || text.Equals(""))
+				text = "\0\0";
+
+			fixed(byte* b = System.Text.UTF8Encoding.UTF8.GetBytes(text))
+				FastPerform(2420, (uint)length, (uint)b);
+		}
+
+
+		/// <summary>
+		/// Retrieve the position of the start of the selection at the given line (INVALID_POSITION if no selection on this line).
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN03</remarks>
+		public int GetLineSelStartPosition(int line)
+		{
+			return (int)FastPerform(2424, (uint)line, 0);
+		}
+
+
+		/// <summary>
+		/// Retrieve the position of the end of the selection at the given line (INVALID_POSITION if no selection on this line).
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN03</remarks>
+		public int GetLineSelEndPosition(int line)
+		{
+			return (int)FastPerform(2425, (uint)line, 0);
+		}
+
+
+		/// <summary>
+		/// Move caret down one line, extending rectangular selection to new caret position.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void LineDownRectExtend()
+		{
+			FastPerform(2426, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Move caret up one line, extending rectangular selection to new caret position.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void LineUpRectExtend()
+		{
+			FastPerform(2427, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Move caret left one character, extending rectangular selection to new caret position.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void CharLeftRectExtend()
+		{
+			FastPerform(2428, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Move caret right one character, extending rectangular selection to new caret position.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void CharRightRectExtend()
+		{
+			FastPerform(2429, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Move caret to first position on line, extending rectangular selection to new caret position.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void HomeRectExtend()
+		{
+			FastPerform(2430, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Move caret to before first visible character on line.
+		/// If already there move to first character on line.
+		/// In either case, extend rectangular selection to new caret position.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void VCHomeRectExtend()
+		{
+			FastPerform(2431, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Move caret to last position on line, extending rectangular selection to new caret position.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void LineEndRectExtend()
+		{
+			FastPerform(2432, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Move caret one page up, extending rectangular selection to new caret position.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void PageUpRectExtend()
+		{
+			FastPerform(2433, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Move caret one page down, extending rectangular selection to new caret position.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void PageDownRectExtend()
+		{
+			FastPerform(2434, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Move caret to top of page, or one page up if already at top of page.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void StutteredPageUp()
+		{
+			FastPerform(2435, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Move caret to top of page, or one page up if already at top of page, extending selection to new caret position.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void StutteredPageUpExtend()
+		{
+			FastPerform(2436, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Move caret to bottom of page, or one page down if already at bottom of page.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void StutteredPageDown()
+		{
+			FastPerform(2437, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Move caret to bottom of page, or one page down if already at bottom of page, extending selection to new caret position.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void StutteredPageDownExtend()
+		{
+			FastPerform(2438, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Move caret left one word, position cursor at end of word.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void WordLeftEnd()
+		{
+			FastPerform(2439, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Move caret left one word, position cursor at end of word, extending selection to new caret position.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void WordLeftEndExtend()
+		{
+			FastPerform(2440, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Move caret right one word, position cursor at end of word.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void WordRightEnd()
+		{
+			FastPerform(2441, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Move caret right one word, position cursor at end of word, extending selection to new caret position.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void WordRightEndExtend()
+		{
+			FastPerform(2442, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Reset the set of characters for whitespace and word characters to the defaults.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void SetCharsDefault()
+		{
+			FastPerform(2444, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Enlarge the document to a particular size of text bytes.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN03</remarks>
+		public void Allocate(int bytes)
+		{
+			FastPerform(2446, (uint)bytes, 0);
+		}
+
+
+		/// <summary>
+		/// Start notifying the container of all key presses and commands.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void StartRecord()
+		{
+			FastPerform(3001, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Stop notifying the container of all key presses and commands.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN01</remarks>
+		public void StopRecord()
+		{
+			FastPerform(3002, 0, 0);
+		}
+
+
+		/// <summary>
+		/// Colourise a segment of the document using the current lexing language.
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN16</remarks>
+		public void Colourise(int start, int end)
+		{
+			FastPerform(4003, (uint)start, (uint)end);
+		}
+
+
+		/// <summary>
+		/// Load a lexer library (dll / so).
+		/// 
+		/// </summary>
+		/// <remarks>Autogenerated: IGEN04</remarks>
+		unsafe public void LoadLexerLibrary(string path)
+		{
+			if(path == null || path.Equals(""))
+				path = "\0\0";
+
+			fixed(byte* b = System.Text.UTF8Encoding.UTF8.GetBytes(path))
+				FastPerform(4007, 0, (uint)b);
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Controls/ScriptDocumentTab.cs b/Source/Core/Controls/ScriptDocumentTab.cs
new file mode 100644
index 0000000..bbe14ce
--- /dev/null
+++ b/Source/Core/Controls/ScriptDocumentTab.cs
@@ -0,0 +1,557 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.IO;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Windows;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Compilers;
+using CodeImp.DoomBuilder.GZBuilder.Data;
+using CodeImp.DoomBuilder.GZBuilder.GZDoom;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Controls
+{
+	internal abstract class ScriptDocumentTab : TabPage
+	{
+		#region ================== Constants
+
+		private const int NAVIGATOR_BORDER_TOP = 8; //mxd
+		private const int EDITOR_BORDER_TOP = 33;
+		private const int EDITOR_BORDER_BOTTOM = 4;
+		private const int EDITOR_BORDER_LEFT = 4;
+		private const int EDITOR_BORDER_RIGHT = 4;
+		
+		#endregion
+		
+		#region ================== Variables
+		
+		// The script edit control
+		protected readonly ScriptEditorControl editor;
+		protected readonly ComboBox navigator; //mxd
+		private bool preventchanges; //mxd
+		private string title; //mxd
+
+		// Derived classes must set this!
+		protected ScriptConfiguration config;
+		
+		// The panel we're on
+		protected readonly ScriptEditorPanel panel;
+		
+		#endregion
+
+		#region ================== Properties
+
+		public virtual bool ExplicitSave { get { return true; } }
+		public virtual bool IsSaveAsRequired { get { return true; } }
+		public virtual bool IsClosable { get { return true; } }
+		public virtual bool IsReconfigurable { get { return true; } }
+		public virtual string Filename { get { return null; } }
+		public ScriptEditorPanel Panel { get { return panel; } }
+		public new string Text { get { return title; } } //mxd
+		public bool IsChanged { get { return editor.IsChanged; } internal set { editor.IsChanged = value; } } //mxd. Added setter
+		public int SelectionStart { get { return editor.SelectionStart; } set { editor.SelectionStart = value; } }
+		public int SelectionEnd { get { return editor.SelectionEnd; } set { editor.SelectionEnd = value; } }
+		public ScriptConfiguration Config { get { return config; } }
+		
+		#endregion
+		
+		#region ================== Events (mxd)
+
+		public new event EventHandler OnTextChanged; //mxd
+
+		#endregion
+
+		#region ================== Constructor
+		
+		// Constructor
+		protected ScriptDocumentTab(ScriptEditorPanel panel)
+		{
+			// Keep panel
+			this.panel = panel;
+
+			//mxd
+			navigator = new ComboBox();
+			navigator.Location = new Point(EDITOR_BORDER_LEFT, NAVIGATOR_BORDER_TOP);
+			navigator.Width = this.ClientSize.Width - EDITOR_BORDER_LEFT - EDITOR_BORDER_RIGHT;
+			navigator.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+			navigator.DropDownStyle = ComboBoxStyle.DropDownList;
+			navigator.Name = "navigator";
+			navigator.TabStop = true;
+			navigator.TabIndex = 0;
+			navigator.DropDown += navigator_DropDown;
+			navigator.SelectedIndexChanged += navigator_SelectedIndexChanged;
+			this.Controls.Add(navigator);
+			
+			// Make the script control
+			editor = new ScriptEditorControl();
+			editor.Location = new Point(EDITOR_BORDER_LEFT, EDITOR_BORDER_TOP);
+			editor.Size = new Size(this.ClientSize.Width - EDITOR_BORDER_LEFT - EDITOR_BORDER_RIGHT,
+								   this.ClientSize.Height - EDITOR_BORDER_TOP - EDITOR_BORDER_BOTTOM);
+			editor.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
+			editor.Name = "editor";
+			editor.TabStop = true;
+			editor.TabIndex = 1;
+			this.Controls.Add(editor);
+
+			// Bind events
+			editor.OnExplicitSaveTab += panel.ExplicitSaveCurrentTab;
+			editor.OnOpenScriptBrowser += panel.OpenBrowseScript;
+			editor.OnOpenFindAndReplace += panel.OpenFindAndReplace;
+			editor.OnFindNext += panel.FindNext;
+			editor.OnFindPrevious += panel.FindPrevious; //mxd
+			editor.OnTextChanged += editor_TextChanged; //mxd
+		}
+		
+		// Disposer
+		protected override void Dispose(bool disposing)
+		{
+			// Remove events
+			editor.OnExplicitSaveTab -= panel.ExplicitSaveCurrentTab;
+			editor.OnOpenScriptBrowser -= panel.OpenBrowseScript;
+			editor.OnOpenFindAndReplace -= panel.OpenFindAndReplace;
+			editor.OnFindNext -= panel.FindNext;
+			editor.OnFindPrevious -= panel.FindPrevious; //mxd
+			editor.OnTextChanged -= editor_TextChanged; //mxd
+			
+			base.Dispose(disposing);
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+
+		// This launches keyword help website
+		public bool LaunchKeywordHelp()
+		{
+			return editor.LaunchKeywordHelp();
+		}
+		
+		// This refreshes the style settings
+		public virtual void RefreshSettings()
+		{
+			editor.RefreshStyle();
+		}
+		
+		// This moves the caret to the given line
+		public virtual void MoveToLine(int linenumber)
+		{
+			editor.MoveToLine(linenumber);
+		}
+		
+		// This clears all marks
+		public virtual void ClearMarks()
+		{
+			editor.ClearMarks();
+		}
+		
+		// This creates error marks for errors that apply to this file
+		public virtual void MarkScriptErrors(IEnumerable<CompilerError> errors)
+		{
+			// Clear all marks
+			ClearMarks();
+			
+			// Go for all errors that apply to this script
+			foreach(CompilerError e in errors)
+			{
+				if(VerifyErrorForScript(e))
+				{
+					// Add a mark on the line where this error occurred
+					editor.AddMark(e.linenumber);
+				}
+			}
+		}
+		
+		// This verifies if the specified error applies to this script
+		public virtual bool VerifyErrorForScript(CompilerError e)
+		{
+			return false;
+		}
+
+		// This compiles the script
+		public virtual void Compile() { }
+
+		// This saves the document (used for both explicit and implicit)
+		// Return true when successfully saved
+		public virtual bool Save()
+		{
+			return false;
+		}
+		
+		// This saves the document to a new file
+		// Return true when successfully saved
+		public virtual bool SaveAs(string filename)
+		{
+			return false;
+		}
+		
+		// This changes the script configurations
+		public virtual void ChangeScriptConfig(ScriptConfiguration newconfig)
+		{
+			UpdateNavigator(); //mxd
+		}
+
+		// Call this to set the tab title
+		protected void SetTitle(string title)
+		{
+			this.title = title; //mxd
+			base.Text = (editor.IsChanged ? "\u25CF " + title : title); //mxd
+		}
+
+		//mxd
+		protected void UpdateTitle()
+		{
+			SetTitle(title);
+		}
+
+		// Perform undo
+		public void Undo()
+		{
+			editor.Undo();
+		}
+
+		// Perform redo
+		public void Redo()
+		{
+			editor.Redo();
+		}
+
+		// Perform cut
+		public void Cut()
+		{
+			editor.Cut();
+		}
+
+		// Perform copy
+		public void Copy()
+		{
+			editor.Copy();
+		}
+
+		// Perform paste
+		public void Paste()
+		{
+			editor.Paste();
+		}
+
+		// Find next result (mxd)
+		public bool FindNext(FindReplaceOptions options)
+		{
+			return FindNext(options, false);
+		}
+		
+		// Find next result
+		public bool FindNext(FindReplaceOptions options, bool useselectionstart)
+		{
+			byte[] data = editor.GetText();
+			string text = Encoding.GetEncoding(config.CodePage).GetString(data);
+			StringComparison mode = options.CaseSensitive ? StringComparison.CurrentCulture : StringComparison.CurrentCultureIgnoreCase;
+			int startpos = (useselectionstart ? Math.Min(editor.SelectionStart, editor.SelectionEnd) : Math.Max(editor.SelectionStart, editor.SelectionEnd)); //mxd
+			bool wrapped = false;
+			
+			while(true)
+			{
+				int result = text.IndexOf(options.FindText, startpos, mode);
+				if(result > -1)
+				{
+					// Check to see if it is the whole word
+					if(options.WholeWord)
+					{
+						// Veryfy that we have found a whole word
+						string foundword = editor.GetWordAt(result + 1);
+						if(foundword.Length != options.FindText.Length)
+						{
+							startpos = result + 1;
+							result = -1;
+						}
+					}
+					
+					// Still ok?
+					if(result > -1)
+					{
+						// Select the result
+						editor.SelectionStart = result;
+						editor.SelectionEnd = result + options.FindText.Length;
+						editor.EnsureLineVisible(editor.LineFromPosition(editor.SelectionEnd));
+						return true;
+					}
+				}
+				else
+				{
+					// If we haven't tried from the start, try from the start now
+					if((startpos > 0) && !wrapped)
+					{
+						startpos = 0;
+						wrapped = true;
+					}
+					else
+					{
+						// Can't find it
+						return false;
+					}
+				}
+			}
+		}
+
+		// Find previous result (mxd)
+		public bool FindPrevious(FindReplaceOptions options) 
+		{
+			bool wrapped = false;
+			byte[] data = editor.GetText();
+			string text = Encoding.GetEncoding(config.CodePage).GetString(data);
+			StringComparison mode = options.CaseSensitive ? StringComparison.CurrentCulture : StringComparison.CurrentCultureIgnoreCase;
+			int endpos = Math.Min(editor.SelectionStart, editor.SelectionEnd) - 1;
+			if(endpos < 0)
+			{
+				endpos = text.Length - 1;
+				wrapped = true;
+			}
+
+			while(true) 
+			{
+				int result = text.LastIndexOf(options.FindText, endpos, mode);
+				if(result > -1) 
+				{
+					// Check to see if it is the whole word
+					if(options.WholeWord) 
+					{
+						// Veryfy that we have found a whole word
+						string foundword = editor.GetWordAt(result + 1);
+						if(foundword.Length != options.FindText.Length) 
+						{
+							endpos = result - 1;
+							result = -1;
+						}
+					}
+
+					// Still ok?
+					if(result > -1) 
+					{
+						// Select the result
+						editor.SelectionStart = result;
+						editor.SelectionEnd = result + options.FindText.Length;
+						editor.EnsureLineVisible(editor.LineFromPosition(editor.SelectionEnd));
+						return true;
+					}
+				} 
+				else 
+				{
+					// If we haven't tried from the end, try from the end now
+					if(!wrapped) 
+					{
+						endpos = Math.Max(0, text.Length - 2);
+						wrapped = true;
+					} 
+					else 
+					{
+						// Can't find it
+						return false;
+					}
+				}
+			}
+		}
+		
+		// This replaces the selection with the given text
+		public void ReplaceSelection(string replacement)
+		{
+			editor.ReplaceSelection(replacement);
+		}
+		
+		// This returns the selected text
+		public string GetSelectedText()
+		{
+			byte[] data = editor.GetText();
+			string text = Encoding.GetEncoding(config.CodePage).GetString(data);
+			if(editor.SelectionStart < editor.SelectionEnd)
+				return text.Substring(editor.SelectionStart, editor.SelectionEnd - editor.SelectionStart);
+			return "";
+		}
+
+		//mxd
+		protected void UpdateNavigator() 
+		{
+			switch(config.ScriptType)
+			{
+				case ScriptType.ACS:
+					UpdateNavigatorAcs(new MemoryStream(editor.GetText()));
+					break;
+
+				case ScriptType.DECORATE:
+					UpdateNavigatorDecorate(new MemoryStream(editor.GetText()));
+					break;
+
+				case ScriptType.MODELDEF:
+					UpdateNavigatorModeldef(new MemoryStream(editor.GetText()));
+					break;
+
+				default: // Unsupported script type. Just clear the items
+					navigator.Items.Clear();
+					break;
+			}
+
+			// Put some text in the navigator (but don't actually trigger selection event)
+			navigator.Enabled = (navigator.Items.Count > 0);
+			if(navigator.Items.Count > 0)
+			{
+				preventchanges = true;
+				navigator.Text = navigator.Items[0].ToString();
+				preventchanges = false;
+			}
+		}
+
+		//mxd
+		private void UpdateNavigatorDecorate(MemoryStream stream) 
+		{
+			if(stream == null) return;
+			navigator.Items.Clear();
+
+			DecorateParserSE parser = new DecorateParserSE();
+			if(parser.Parse(stream, "DECORATE", false))
+			{
+				navigator.Items.AddRange(parser.Actors.ToArray());
+			}
+
+			if(parser.HasError)
+			{
+				panel.ShowErrors(new List<CompilerError> { new CompilerError(parser.ErrorDescription, parser.ErrorSource, parser.ErrorLine) });
+			}
+		}
+
+		//mxd
+		private void UpdateNavigatorModeldef(MemoryStream stream) 
+		{
+			if(stream == null) return;
+			navigator.Items.Clear();
+
+			ModeldefParserSE parser = new ModeldefParserSE();
+			if(parser.Parse(stream, "MODELDEF", false))
+			{
+				navigator.Items.AddRange(parser.Models.ToArray());
+			}
+
+			if(parser.HasError)
+			{
+				panel.ShowErrors(new List<CompilerError> { new CompilerError(parser.ErrorDescription, parser.ErrorSource, parser.ErrorLine) });
+			}
+		}
+
+		//mxd
+		private void UpdateNavigatorAcs(MemoryStream stream) 
+		{
+			if(stream == null) return;
+			navigator.Items.Clear();
+
+			AcsParserSE parser = new AcsParserSE { AddArgumentsToScriptNames = true, IsMapScriptsLump = this is ScriptLumpDocumentTab };
+			if(parser.Parse(stream, "SCRIPTS", false))
+			{
+				navigator.Items.AddRange(parser.NamedScripts.ToArray());
+				navigator.Items.AddRange(parser.NumberedScripts.ToArray());
+				navigator.Items.AddRange(parser.Functions.ToArray());
+			}
+
+			if(parser.HasError)
+			{
+				panel.ShowErrors(new List<CompilerError> { new CompilerError(parser.ErrorDescription, parser.ErrorSource, parser.ErrorLine) });
+			}
+		}
+		
+		//mxd
+		internal ScriptType VerifyScriptType() 
+		{
+			ScriptTypeParserSE parser = new ScriptTypeParserSE();
+			if(parser.Parse(new MemoryStream(editor.GetText()), config.Description, false)) 
+			{
+				if(parser.ScriptType != ScriptType.UNKNOWN && config.ScriptType != parser.ScriptType)
+					return parser.ScriptType;
+			}
+
+			if(parser.HasError)
+			{
+				panel.ShowErrors(new List<CompilerError> { new CompilerError(parser.ErrorDescription, parser.ErrorSource, parser.ErrorLine) });
+			}
+
+			return ScriptType.UNKNOWN;
+		}
+
+		//mxd
+		internal void InsertSnippet(string[] lines) 
+		{
+			editor.InsertSnippet(lines);
+		}
+
+		#endregion
+		
+		#region ================== Events
+		
+		// Mouse released
+		protected override void OnMouseUp(MouseEventArgs e)
+		{
+			base.OnMouseUp(e);
+
+			// Focus to the editor!
+			editor.Focus();
+			editor.GrabFocus();
+		}
+		
+		// Receiving focus?
+		protected override void OnGotFocus(EventArgs e)
+		{
+			base.OnGotFocus(e);
+			
+			// Focus to the editor!
+			editor.Focus();
+			editor.GrabFocus();
+		}
+
+		//mxd
+		private void navigator_SelectedIndexChanged(object sender, EventArgs e) 
+		{
+			if(!preventchanges && navigator.SelectedItem is ScriptItem) 
+			{
+				ScriptItem si = navigator.SelectedItem as ScriptItem;
+				editor.EnsureLineVisible(editor.LineFromPosition(si.CursorPosition));
+				editor.SelectionStart = si.CursorPosition;
+				editor.SelectionEnd = si.CursorPosition;
+				
+				// Focus to the editor!
+				editor.Focus();
+				editor.GrabFocus();
+			}
+		}
+
+		//mxd
+		private void navigator_DropDown(object sender, EventArgs e) 
+		{
+			if(!preventchanges && editor.IsChanged) UpdateNavigator();
+		}
+
+		//mxd
+		private void editor_TextChanged(object sender, EventArgs eventArgs)
+		{
+			UpdateTitle();
+			if(OnTextChanged != null) OnTextChanged(this, EventArgs.Empty);
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Controls/ScriptEditorControl.Designer.cs b/Source/Core/Controls/ScriptEditorControl.Designer.cs
new file mode 100644
index 0000000..8f6bf47
--- /dev/null
+++ b/Source/Core/Controls/ScriptEditorControl.Designer.cs
@@ -0,0 +1,167 @@
+namespace CodeImp.DoomBuilder.Controls
+{
+	partial class ScriptEditorControl
+	{
+		/// <summary> 
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Component Designer generated code
+
+		/// <summary> 
+		/// Required method for Designer support - do not modify 
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.functionbar = new System.Windows.Forms.ComboBox();
+			this.scriptedit = new CodeImp.DoomBuilder.Controls.ScintillaControl();
+			this.scriptpanel = new System.Windows.Forms.Panel();
+			this.scriptpanel.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// functionbar
+			// 
+			this.functionbar.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.functionbar.FormattingEnabled = true;
+			this.functionbar.Items.AddRange(new object[] {
+            "Function1",
+            "Function2",
+            "Function3"});
+			this.functionbar.Location = new System.Drawing.Point(0, 0);
+			this.functionbar.Name = "functionbar";
+			this.functionbar.Size = new System.Drawing.Size(474, 21);
+			this.functionbar.TabIndex = 1;
+			this.functionbar.TabStop = false;
+			// 
+			// scriptedit
+			// 
+			this.scriptedit.AnchorPosition = 0;
+			this.scriptedit.AutoCMaximumHeight = 0;
+			this.scriptedit.AutoCMaximumWidth = 0;
+			this.scriptedit.AutoCSeparator = 0;
+			this.scriptedit.AutoCTypeSeparator = 0;
+			this.scriptedit.BackColor = System.Drawing.SystemColors.Window;
+			this.scriptedit.CaretFore = 0;
+			this.scriptedit.CaretLineBack = 0;
+			this.scriptedit.CaretPeriod = 0;
+			this.scriptedit.CaretWidth = 0;
+			this.scriptedit.CodePage = 0;
+			this.scriptedit.ControlCharSymbol = 0;
+			this.scriptedit.CurrentPos = 0;
+			this.scriptedit.CursorType = 0;
+			this.scriptedit.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.scriptedit.DocPointer = 0;
+			this.scriptedit.EdgeColour = 0;
+			this.scriptedit.EdgeColumn = 0;
+			this.scriptedit.EdgeMode = 0;
+			this.scriptedit.EndAtLastLine = 0;
+			this.scriptedit.EndOfLineMode = CodeImp.DoomBuilder.Controls.ScriptEndOfLine.CRLF;
+			this.scriptedit.EOLMode = 0;
+			this.scriptedit.ExtraAscent = 0;
+			this.scriptedit.ExtraDescent = 0;
+			this.scriptedit.HighlightGuide = 0;
+			this.scriptedit.Indent = 0;
+			this.scriptedit.IndentationGuides = 0;
+			this.scriptedit.IsAutoCGetAutoHide = false;
+			this.scriptedit.IsAutoCGetCancelAtStart = false;
+			this.scriptedit.IsAutoCGetChooseSingle = false;
+			this.scriptedit.IsAutoCGetDropRestOfWord = false;
+			this.scriptedit.IsAutoCGetIgnoreCase = false;
+			this.scriptedit.IsBackSpaceUnIndents = false;
+			this.scriptedit.IsBufferedDraw = false;
+			this.scriptedit.IsCaretLineVisible = false;
+			this.scriptedit.IsFocus = false;
+			this.scriptedit.IsHScrollBar = false;
+			this.scriptedit.IsMouseDownCaptures = false;
+			this.scriptedit.IsOvertype = false;
+			this.scriptedit.IsReadOnly = false;
+			this.scriptedit.IsTabIndents = false;
+			this.scriptedit.IsTwoPhaseDraw = false;
+			this.scriptedit.IsUndoCollection = false;
+			this.scriptedit.IsUsePalette = false;
+			this.scriptedit.IsUseTabs = false;
+			this.scriptedit.IsViewEOL = false;
+			this.scriptedit.IsVScrollBar = false;
+			this.scriptedit.LayoutCache = 0;
+			this.scriptedit.Lexer = 0;
+			this.scriptedit.Location = new System.Drawing.Point(0, 0);
+			this.scriptedit.MarginLeft = 0;
+			this.scriptedit.MarginRight = 0;
+			this.scriptedit.ModEventMask = 0;
+			this.scriptedit.MouseDwellTime = 0;
+			this.scriptedit.Name = "scriptedit";
+			this.scriptedit.PrintColourMode = 0;
+			this.scriptedit.PrintMagnification = 0;
+			this.scriptedit.PrintWrapMode = 0;
+			this.scriptedit.ScrollWidth = 0;
+			this.scriptedit.SearchFlags = 0;
+			this.scriptedit.SelectionEnd = 0;
+			this.scriptedit.SelectionMode = 0;
+			this.scriptedit.SelectionStart = 0;
+			this.scriptedit.Size = new System.Drawing.Size(470, 377);
+			this.scriptedit.Status = 0;
+			this.scriptedit.StyleBits = 0;
+			this.scriptedit.TabIndex = 0;
+			this.scriptedit.TabStop = false;
+			this.scriptedit.TabWidth = 0;
+			this.scriptedit.TargetEnd = 0;
+			this.scriptedit.TargetStart = 0;
+			this.scriptedit.ViewWhitespace = CodeImp.DoomBuilder.Controls.ScriptWhiteSpace.Invisible;
+			this.scriptedit.ViewWS = 0;
+			this.scriptedit.WrapMode = 0;
+			this.scriptedit.WrapStartIndent = 0;
+			this.scriptedit.WrapVisualFlags = 0;
+			this.scriptedit.WrapVisualFlagsLocation = 0;
+			this.scriptedit.XOffset = 0;
+			this.scriptedit.ZoomLevel = 0;
+			this.scriptedit.KeyUp += new System.Windows.Forms.KeyEventHandler(this.scriptedit_KeyUp);
+			this.scriptedit.KeyDown += new System.Windows.Forms.KeyEventHandler(this.scriptedit_KeyDown);
+			// 
+			// scriptpanel
+			// 
+			this.scriptpanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.scriptpanel.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+			this.scriptpanel.Controls.Add(this.scriptedit);
+			this.scriptpanel.Location = new System.Drawing.Point(0, 27);
+			this.scriptpanel.Name = "scriptpanel";
+			this.scriptpanel.Size = new System.Drawing.Size(474, 381);
+			this.scriptpanel.TabIndex = 2;
+			// 
+			// ScriptEditorControl
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.Controls.Add(this.scriptpanel);
+			this.Controls.Add(this.functionbar);
+			this.Name = "ScriptEditorControl";
+			this.Size = new System.Drawing.Size(474, 408);
+			this.scriptpanel.ResumeLayout(false);
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private ScintillaControl scriptedit;
+		private System.Windows.Forms.ComboBox functionbar;
+		private System.Windows.Forms.Panel scriptpanel;
+	}
+}
diff --git a/Source/Core/Controls/ScriptEditorControl.cs b/Source/Core/Controls/ScriptEditorControl.cs
new file mode 100644
index 0000000..9b851e5
--- /dev/null
+++ b/Source/Core/Controls/ScriptEditorControl.cs
@@ -0,0 +1,957 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Config;
+using System.IO;
+using CodeImp.DoomBuilder.IO;
+using System.Collections;
+using System.Globalization;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Properties;
+using CodeImp.DoomBuilder.Windows;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Controls
+{
+	internal partial class ScriptEditorControl : UserControl
+	{
+		#region ================== Constants
+		
+		private const string LEXERS_RESOURCE = "Lexers.cfg";
+		private const int DEFAULT_STYLE = (int)ScriptStylesCommon.Default;
+		private const int MAX_BACKTRACK_LENGTH = 200;
+
+		// Index for registered images
+		private enum ImageIndex
+		{
+			ScriptConstant = 0,
+			ScriptKeyword = 1,
+			ScriptError = 2,
+			ScriptSnippet = 3, //mxd
+		}
+		
+		#endregion
+
+		#region ================== Delegates / Events
+
+		public delegate void ExplicitSaveTabDelegate();
+		public delegate void OpenScriptBrowserDelegate();
+		public delegate void OpenFindReplaceDelegate();
+		public delegate void FindNextDelegate();
+		public delegate void FindPreviousDelegate(); //mxd
+
+		public event ExplicitSaveTabDelegate OnExplicitSaveTab;
+		public event OpenScriptBrowserDelegate OnOpenScriptBrowser;
+		public event OpenFindReplaceDelegate OnOpenFindAndReplace;
+		public event FindNextDelegate OnFindNext;
+		public event FindPreviousDelegate OnFindPrevious; //mxd
+		public new event EventHandler OnTextChanged; //mxd
+
+		#endregion
+
+		#region ================== Variables
+		
+		// Script configuration
+		private ScriptConfiguration scriptconfig;
+		
+		// List of keywords and constants, sorted as uppercase
+		private string autocompletestring;
+
+		// Style translation from Scintilla style to ScriptStyleType
+		private Dictionary<int, ScriptStyleType> stylelookup;
+		
+		// Current position information
+		private string curfunctionname = "";
+		private int curargumentindex;
+		private int curfunctionstartpos;
+		
+		// Status
+		private bool changed;
+		
+		#endregion
+
+		#region ================== Properties
+
+		public bool IsChanged { get { return changed; } set { changed = value; } }
+		public int Position { get { return scriptedit.CurrentPos; } set { scriptedit.CurrentPos = value; } }
+		public int SelectionStart { get { return scriptedit.SelectionStart; } set { scriptedit.SelectionStart = value; } }
+		public int SelectionEnd { get { return scriptedit.SelectionEnd; } set { scriptedit.SelectionEnd = value; } }
+		
+		#endregion
+
+		#region ================== Contructor / Disposer
+
+		// Constructor
+		public ScriptEditorControl()
+		{
+			// Initialize
+			InitializeComponent();
+			
+			// Script editor properties
+			// Unfortunately, these cannot be set using the designer
+			// because the control is not really loaded in design mode
+			scriptedit.AutoCMaximumHeight = 8;
+			scriptedit.AutoCSeparator = ' ';
+			scriptedit.AutoCTypeSeparator = '?';
+			scriptedit.AutoCSetFillUps("\r\n();[]");	// I should put this in the script configs
+			scriptedit.CaretWidth = 2;
+			scriptedit.EndAtLastLine = 1;
+			scriptedit.EndOfLineMode = ScriptEndOfLine.CRLF;
+			scriptedit.IsAutoCGetChooseSingle = true;
+			scriptedit.IsAutoCGetIgnoreCase = true;
+			scriptedit.IsBackSpaceUnIndents = true;
+			scriptedit.IsBufferedDraw = true;
+			scriptedit.IsCaretLineVisible = false;
+			scriptedit.IsHScrollBar = true;
+			scriptedit.IndentationGuides = (int)ScriptIdentGuides.None;
+			scriptedit.IsMouseDownCaptures = true;
+			scriptedit.IsTabIndents = true;
+			scriptedit.IsUndoCollection = true;
+			scriptedit.IsUseTabs = true;
+			scriptedit.IsViewEOL = false;
+			scriptedit.IsVScrollBar = true;
+			scriptedit.SetFoldFlags((int)ScriptFoldFlag.Box);
+			scriptedit.TabWidth = 4;
+			scriptedit.Indent = 4;
+			scriptedit.ExtraAscent = 1;
+			scriptedit.ExtraDescent = 1;
+			scriptedit.CursorType = -1;
+
+			// Symbol margin
+			scriptedit.SetMarginTypeN(0, (int)ScriptMarginType.Symbol);
+			scriptedit.SetMarginWidthN(0, 20);
+			scriptedit.SetMarginMaskN(0, -1);	// all
+			
+			// Line numbers margin
+			scriptedit.SetMarginTypeN(1, (int)ScriptMarginType.Number);
+			scriptedit.SetMarginWidthN(1, 40);
+			scriptedit.SetMarginMaskN(1, 0);	// none
+
+			// Spacing margin
+			scriptedit.SetMarginTypeN(2, (int)ScriptMarginType.Symbol);
+			scriptedit.SetMarginWidthN(2, 5);
+			scriptedit.SetMarginMaskN(2, 0);	// none
+			
+			// Setup with default script config
+			// Disabled, the form designer doesn't like this
+			//SetupStyles(new ScriptConfiguration());
+
+			// Images
+			RegisterAutoCompleteImage(ImageIndex.ScriptConstant, Resources.ScriptConstant);
+			RegisterAutoCompleteImage(ImageIndex.ScriptKeyword, Resources.ScriptKeyword);
+			RegisterAutoCompleteImage(ImageIndex.ScriptSnippet, Resources.ScriptSnippet); //mxd
+			RegisterMarkerImage(ImageIndex.ScriptError, Resources.ScriptError);
+
+			// Events
+			scriptedit.ModEventMask = 0x7FFFF;	// Which events to receive (see also ScriptModificationFlags)
+			scriptedit.TextDeleted += scriptedit_TextChanged; //mxd
+			scriptedit.TextInserted += scriptedit_TextChanged; //mxd
+			scriptedit.UndoPerformed += scriptedit_UndoRedoPerformed; //mxd
+			scriptedit.RedoPerformed += scriptedit_UndoRedoPerformed; //mxd
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+		
+		// This launches keyword help website
+		public bool LaunchKeywordHelp()
+		{
+			string helpsite = scriptconfig.KeywordHelp;
+			string currentword = GetCurrentWord();
+			if(!string.IsNullOrEmpty(currentword) && (currentword.Length > 1) && !string.IsNullOrEmpty(helpsite))
+			{
+				currentword = scriptconfig.GetKeywordCase(currentword);
+				helpsite = helpsite.Replace("%K", currentword);
+				General.OpenWebsite(helpsite);
+				return true;
+			}
+			return !string.IsNullOrEmpty(helpsite); //mxd
+		}
+		
+		// This replaces the selection with the given text
+		public void ReplaceSelection(string replacement)
+		{
+			Encoding encoder = Encoding.GetEncoding(scriptedit.CodePage);
+			string text = encoder.GetString(GetText());
+			int selectionstart = scriptedit.SelectionStart;
+			
+			// Make new text
+			StringBuilder newtext = new StringBuilder(text.Length + replacement.Length);
+			newtext.Append(text.Substring(0, scriptedit.SelectionStart));
+			newtext.Append(replacement);
+			newtext.Append(text.Substring(scriptedit.SelectionEnd));
+			
+			SetText(encoder.GetBytes(newtext.ToString()));
+			
+			// Adjust selection
+			scriptedit.SelectionStart = selectionstart;
+			scriptedit.SelectionEnd = selectionstart + replacement.Length;
+		}
+		
+		// This moves the caret to a given line and ensures the line is visible
+		public void MoveToLine(int linenumber)
+		{
+			scriptedit.GotoLine(linenumber);
+			EnsureLineVisible(linenumber);
+		}
+
+		// This makes sure a line is visible
+		public void EnsureLineVisible(int linenumber)
+		{
+			scriptedit.EnsureVisibleEnforcePolicy(linenumber);
+		}
+
+		// This returns the line for a position
+		public int LineFromPosition(int position)
+		{
+			return scriptedit.LineFromPosition(position);
+		}
+		
+		// This clears all marks
+		public void ClearMarks()
+		{
+			scriptedit.MarkerDeleteAll((int)ImageIndex.ScriptError);
+		}
+
+		// This adds a mark on the given line
+		public void AddMark(int linenumber)
+		{
+			scriptedit.MarkerAdd(linenumber, (int)ImageIndex.ScriptError);
+		}
+
+		// This refreshes the style setup
+		public void RefreshStyle()
+		{
+			// Re-setup with the same config
+			SetupStyles(scriptconfig);
+		}
+
+		// This sets up the script editor with a script configuration
+		public void SetupStyles(ScriptConfiguration config)
+		{
+			Configuration lexercfg = new Configuration();
+
+			// Make collections
+			stylelookup = new Dictionary<int, ScriptStyleType>();
+			SortedList<string, string> autocompletelist = new SortedList<string, string>(StringComparer.Ordinal);
+			
+			// Keep script configuration
+			scriptconfig = config;
+			
+			// Find a resource named Lexers.cfg
+			string[] resnames = General.ThisAssembly.GetManifestResourceNames();
+			foreach(string rn in resnames)
+			{
+				// Found one?
+				if(rn.EndsWith(LEXERS_RESOURCE, StringComparison.InvariantCultureIgnoreCase))
+				{
+					// Get a stream from the resource
+					Stream lexersdata = General.ThisAssembly.GetManifestResourceStream(rn);
+					StreamReader lexersreader = new StreamReader(lexersdata, Encoding.ASCII);
+
+					// Load configuration from stream
+					lexercfg.InputConfiguration(lexersreader.ReadToEnd());
+
+					// Done with the resource
+					lexersreader.Dispose();
+					lexersdata.Dispose();
+				}
+			}
+			
+			// Check if specified lexer exists and set the lexer to use
+			string lexername = "lexer" + scriptconfig.Lexer.ToString(CultureInfo.InvariantCulture);
+			if(!lexercfg.SettingExists(lexername)) throw new InvalidOperationException("Unknown lexer " + scriptconfig.Lexer + " specified in script configuration!");
+			scriptedit.Lexer = scriptconfig.Lexer;
+			
+			// Set the default style and settings
+			scriptedit.StyleSetFont(DEFAULT_STYLE, General.Settings.ScriptFontName);
+			scriptedit.StyleSetSize(DEFAULT_STYLE, General.Settings.ScriptFontSize);
+			scriptedit.StyleSetBold(DEFAULT_STYLE, General.Settings.ScriptFontBold);
+			scriptedit.StyleSetItalic(DEFAULT_STYLE, false);
+			scriptedit.StyleSetUnderline(DEFAULT_STYLE, false);
+			scriptedit.StyleSetCase(DEFAULT_STYLE, ScriptCaseVisible.Mixed);
+			scriptedit.StyleSetFore(DEFAULT_STYLE, General.Colors.PlainText.ToInversedColorRef());
+			scriptedit.StyleSetBack(DEFAULT_STYLE, General.Colors.ScriptBackground.ToInversedColorRef());
+			scriptedit.CaretPeriod = SystemInformation.CaretBlinkTime;
+			scriptedit.CaretFore = General.Colors.ScriptBackground.Inverse().ToInversedColorRef();
+			scriptedit.StyleBits = 7;
+			
+			// These don't work?
+			scriptedit.TabWidth = General.Settings.ScriptTabWidth;
+			scriptedit.IsUseTabs = false;
+			scriptedit.IsTabIndents = true;
+			scriptedit.Indent = General.Settings.ScriptTabWidth;
+			scriptedit.IsBackSpaceUnIndents = true;
+			
+			// This applies the default style to all styles
+			scriptedit.StyleClearAll();
+
+			// Set the code page to use
+			scriptedit.CodePage = scriptconfig.CodePage;
+
+			// Set the default to something normal (this is used by the autocomplete list)
+			scriptedit.StyleSetFont(DEFAULT_STYLE, this.Font.Name);
+			scriptedit.StyleSetBold(DEFAULT_STYLE, this.Font.Bold);
+			scriptedit.StyleSetItalic(DEFAULT_STYLE, this.Font.Italic);
+			scriptedit.StyleSetUnderline(DEFAULT_STYLE, this.Font.Underline);
+			scriptedit.StyleSetSize(DEFAULT_STYLE, (int)Math.Round(this.Font.SizeInPoints));
+			
+			// Set style for linenumbers and margins
+			scriptedit.StyleSetBack((int)ScriptStylesCommon.LineNumber, General.Colors.ScriptBackground.ToInversedColorRef());
+ 
+			// Clear all keywords
+			for(int i = 0; i < 9; i++) scriptedit.KeyWords(i, null);
+			
+			// Now go for all elements in the lexer configuration
+			// We are looking for the numeric keys, because these are the
+			// style index to set and the value is our ScriptStyleType
+			IDictionary dic = lexercfg.ReadSetting(lexername, new Hashtable());
+			foreach(DictionaryEntry de in dic)
+			{
+				// Check if this is a numeric key
+				int stylenum;
+				if(int.TryParse(de.Key.ToString(), out stylenum))
+				{
+					// Add style to lookup table
+					stylelookup.Add(stylenum, (ScriptStyleType)(int)de.Value);
+					
+					// Apply color to style
+					int colorindex;
+					switch((ScriptStyleType)(int)de.Value)
+					{
+						case ScriptStyleType.PlainText: colorindex = ColorCollection.PLAINTEXT; break;
+						case ScriptStyleType.Comment: colorindex = ColorCollection.COMMENTS; break;
+						case ScriptStyleType.Constant: colorindex = ColorCollection.CONSTANTS; break;
+						case ScriptStyleType.Keyword: colorindex = ColorCollection.KEYWORDS; break;
+						case ScriptStyleType.LineNumber: colorindex = ColorCollection.LINENUMBERS; break;
+						case ScriptStyleType.Literal: colorindex = ColorCollection.LITERALS; break;
+						default: colorindex = ColorCollection.PLAINTEXT; break;
+					}
+					scriptedit.StyleSetFore(stylenum, General.Colors.Colors[colorindex].ToInversedColorRef());
+				}
+			}
+			
+			// Create the keywords list and apply it
+			string imageindex = ((int)ImageIndex.ScriptKeyword).ToString(CultureInfo.InvariantCulture);
+			int keywordsindex = lexercfg.ReadSetting(lexername + ".keywordsindex", -1);
+			if(keywordsindex > -1)
+			{
+				StringBuilder keywordslist = new StringBuilder("");
+				foreach(string k in scriptconfig.Keywords)
+				{
+					if(keywordslist.Length > 0) keywordslist.Append(" ");
+					keywordslist.Append(k);
+					autocompletelist.Add(k.ToUpperInvariant(), k + "?" + imageindex);
+				}
+				string words = keywordslist.ToString();
+				if(scriptconfig.CaseSensitive)
+					scriptedit.KeyWords(keywordsindex, words);
+				else
+					scriptedit.KeyWords(keywordsindex, words.ToLowerInvariant());
+			}
+
+			// Create the constants list and apply it
+			imageindex = ((int)ImageIndex.ScriptConstant).ToString(CultureInfo.InvariantCulture);
+			int constantsindex = lexercfg.ReadSetting(lexername + ".constantsindex", -1);
+			if(constantsindex > -1)
+			{
+				StringBuilder constantslist = new StringBuilder("");
+				foreach(string c in scriptconfig.Constants)
+				{
+					if(autocompletelist.ContainsKey(c.ToUpperInvariant())) //mxd. This happens when there's a keyword and a constant with the same name...
+					{
+						General.ErrorLogger.Add(ErrorType.Error, "Constant '" + c + "' is double-defined in '" + scriptconfig.Description + "' script configuration!");
+						continue;
+					}
+					
+					if(constantslist.Length > 0) constantslist.Append(" ");
+					constantslist.Append(c);
+					autocompletelist.Add(c.ToUpperInvariant(), c + "?" + imageindex);
+				}
+				string words = constantslist.ToString();
+				if(scriptconfig.CaseSensitive)
+					scriptedit.KeyWords(constantsindex, words);
+				else
+					scriptedit.KeyWords(constantsindex, words.ToLowerInvariant());
+			}
+
+			//mxd. Create the snippets list and apply it
+			imageindex = ((int)ImageIndex.ScriptSnippet).ToString(CultureInfo.InvariantCulture);
+			int snippetindex = lexercfg.ReadSetting(lexername + ".snippetindex", -1);
+			if(snippetindex > -1 && scriptconfig.Snippets.Count > 0) 
+			{
+				StringBuilder snippetslist = new StringBuilder("");
+				foreach(string c in scriptconfig.Snippets.Keys) 
+				{
+					if(autocompletelist.ContainsKey(c.ToUpperInvariant())) continue;
+					if(snippetslist.Length > 0) snippetslist.Append(" ");
+					snippetslist.Append(c);
+					autocompletelist.Add(c.ToUpperInvariant(), c + "?" + imageindex);
+				}
+				string words = snippetslist.ToString();
+				if(scriptconfig.CaseSensitive)
+					scriptedit.KeyWords(snippetindex, words);
+				else
+					scriptedit.KeyWords(snippetindex, words.ToLowerInvariant());
+			}
+			
+			// Sort the autocomplete list
+			List<string> autocompleteplainlist = new List<string>(autocompletelist.Values);
+			autocompletestring = string.Join(" ", autocompleteplainlist.ToArray());
+			
+			// Show/hide the functions bar
+			functionbar.Visible = (scriptconfig.FunctionRegEx.Length > 0);
+
+			// Rearrange the layout
+			bool ischanged = changed; //mxd. Don't want the "changed" status to change when changing text styles
+			scriptedit.ClearDocumentStyle();
+			scriptedit.SetText(scriptedit.GetText(scriptedit.TextSize));
+			changed = ischanged; //mxd
+			this.PerformLayout();
+		}
+		
+		
+		// This returns the current word (where the caret is at)
+		public string GetCurrentWord()
+		{
+			return GetWordAt(scriptedit.CurrentPos);
+		}
+
+
+		// This returns the word at the given position
+		public string GetWordAt(int position)
+		{
+			int wordstart = scriptedit.WordStartPosition(position, true);
+			int wordend = scriptedit.WordEndPosition(position, true);
+
+			// Decode the text
+			byte[] scripttextdata = scriptedit.GetText(scriptedit.TextSize);
+			Encoding encoder = Encoding.GetEncoding(scriptedit.CodePage);
+			string scripttext = encoder.GetString(scripttextdata);
+
+			if(wordstart < wordend)
+				return scripttext.Substring(wordstart, wordend - wordstart);
+			else
+				return "";
+		}
+		
+		
+		// This returns the ScriptStyleType for a given Scintilla style
+		private ScriptStyleType GetScriptStyle(int scintillastyle)
+		{
+			if(stylelookup.ContainsKey(scintillastyle))
+				return stylelookup[scintillastyle];
+			else
+				return ScriptStyleType.PlainText;
+		}
+		
+		
+		// This gathers information about the current caret position
+		private void UpdatePositionInfo()
+		{
+			int bracketlevel = 0;			// bracket level counting
+			int argindex = 0;				// function argument counting
+			int pos = scriptedit.CurrentPos;
+			
+			// Decode the text
+			byte[] scripttextdata = scriptedit.GetText(scriptedit.TextSize);
+			Encoding encoder = Encoding.GetEncoding(scriptedit.CodePage);
+			string scripttext = encoder.GetString(scripttextdata);
+			
+			// Reset position info
+			curfunctionname = "";
+			curargumentindex = 0;
+			curfunctionstartpos = 0;
+			
+			// Determine lowest backtrack position
+			int limitpos = scriptedit.CurrentPos - MAX_BACKTRACK_LENGTH;
+			if(limitpos < 0) limitpos = 0;
+			
+			// We can only do this when we have function syntax information
+			if((scriptconfig.ArgumentDelimiter.Length == 0) || (scriptconfig.FunctionClose.Length == 0) ||
+			   (scriptconfig.FunctionOpen.Length == 0) || (scriptconfig.Terminator.Length == 0)) return;
+			
+			// Get int versions of the function syntax informantion
+			int argumentdelimiter = scriptconfig.ArgumentDelimiter[0];
+			int functionclose = scriptconfig.FunctionClose[0];
+			int functionopen = scriptconfig.FunctionOpen[0];
+			int terminator = scriptconfig.Terminator[0];
+			
+			// Continue backtracking until we reached the limitpos
+			while(pos >= limitpos)
+			{
+				// Backtrack 1 character
+				pos--;
+				
+				// Get the style and character at this position
+				ScriptStyleType curstyle = GetScriptStyle(scriptedit.StyleAt(pos));
+				int curchar = scriptedit.CharAt(pos);
+				
+				// Then meeting ) then increase bracket level
+				// When meeting ( then decrease bracket level
+				// When bracket level goes -1, then the next word should be the function name
+				// Only when at bracket level 0, count the comma's for argument index
+				
+				// TODO:
+				// Original code checked for scope character here and breaks if found
+				
+				// Check if in plain text or keyword
+				if((curstyle == ScriptStyleType.PlainText) || (curstyle == ScriptStyleType.Keyword))
+				{
+					// Closing bracket
+					if(curchar == functionclose)
+					{
+						bracketlevel++;
+					}
+					// Opening bracket
+					else if(curchar == functionopen)
+					{
+						bracketlevel--;
+						
+						// Out of the brackets?
+						if(bracketlevel < 0)
+						{
+							// Skip any whitespace before this bracket
+							do
+							{
+								// Backtrack 1 character
+								curchar = scriptedit.CharAt(--pos);
+							}
+							while((pos >= limitpos) && ((curchar == ' ') || (curchar == '\t') ||
+														(curchar == '\r') || (curchar == '\n')));
+							
+							// NOTE: We may need to set onlyWordCharacters argument in the
+							// following calls to false to get any argument delimiter included,
+							// but this may also cause a valid keyword to be combined with other
+							// surrounding characters that do not belong to the keyword.
+							
+							// Find the word before this bracket
+							int wordstart = scriptedit.WordStartPosition(pos, true);
+							int wordend = scriptedit.WordEndPosition(pos, true);
+							string word = scripttext.Substring(wordstart, wordend - wordstart);
+							if(word.Length > 0)
+							{
+								// Check if this is an argument delimiter
+								// I can't remember why I did this, but I'll probably stumble
+								// upon the problem if this doesn't work right (see note above)
+								if(word[0] == argumentdelimiter)
+								{
+									// We are now in the parent function
+									bracketlevel++;
+									argindex = 0;
+								}
+								// Now check if this is a keyword
+								else if(scriptconfig.IsKeyword(word))
+								{
+									// Found it!
+									curfunctionname = scriptconfig.GetKeywordCase(word);
+									curargumentindex = argindex;
+									curfunctionstartpos = wordstart;
+									break;
+								}
+								else
+								{
+									// Don't know this word
+									break;
+								}
+							}
+						}
+					}
+					// Argument delimiter
+					else if(curchar == argumentdelimiter)
+					{
+						// Only count these at brackt level 0
+						if(bracketlevel == 0) argindex++;
+					}
+					// Terminator
+					else if(curchar == terminator)
+					{
+						// Can't find anything, break now
+						break;
+					}
+				}
+			}
+		}
+		
+		// This clears all undo levels
+		public void ClearUndoRedo()
+		{
+			scriptedit.EmptyUndoBuffer();
+		}
+		
+		// This registers an XPM image for the autocomplete list
+		private void RegisterAutoCompleteImage(ImageIndex index, byte[] imagedata)
+		{
+			// Convert to string
+			string bigstring = Encoding.UTF8.GetString(imagedata);
+			
+			// Register image
+			scriptedit.RegisterImage((int)index, bigstring);
+		}
+
+		// This registers an XPM image for the markes list
+		private void RegisterMarkerImage(ImageIndex index, byte[] imagedata)
+		{
+			// Convert to string
+			string bigstring = Encoding.UTF8.GetString(imagedata);
+
+			// Register image
+			scriptedit.MarkerDefinePixmap((int)index, bigstring);
+		}
+
+		// Perform undo
+		public void Undo()
+		{
+			scriptedit.Undo();
+		}
+
+		// Perform redo
+		public void Redo()
+		{
+			scriptedit.Redo();
+		}
+
+		// Perform cut
+		public void Cut()
+		{
+			scriptedit.Cut();
+		}
+
+		// Perform copy
+		public void Copy()
+		{
+			scriptedit.Copy();
+		}
+
+		// Perform paste
+		public void Paste()
+		{
+			scriptedit.Paste();
+		}
+		
+		// This steals the focus (use with care!)
+		public void GrabFocus()
+		{
+			scriptedit.GrabFocus();
+		}
+
+		public byte[] GetText()
+		{
+			return scriptedit.GetText(scriptedit.TextSize);
+		}
+
+		public void SetText(byte[] text)
+		{
+			scriptedit.SetText(text);
+		}
+
+		//mxd
+		public void InsertSnippet(string[] lines) 
+		{
+			//insert the snippet
+			int curline = scriptedit.LineFromPosition(scriptedit.SelectionStart);
+			int numtabs = scriptedit.GetLineIndentation(curline);
+			string tabs = Environment.NewLine + new String(' ', numtabs);
+			string spaces = new String(' ', General.Settings.ScriptTabWidth);
+			int entrypos = -1;
+			int entryline = -1;
+			string[] processedlines = ProcessLineBreaks(lines);
+
+			for(int i = 0; i < lines.Length; i++) 
+			{
+				processedlines[i] = processedlines[i].Replace("\t", spaces);
+
+				//check if we have the [EP] marker
+				if(entrypos == -1) 
+				{
+					int pos = processedlines[i].IndexOf("[EP]");
+					if(pos != -1) 
+					{
+						entryline = curline + i;
+						entrypos = pos + numtabs;
+						processedlines[i] = processedlines[i].Remove(pos, 4);
+					}
+				}
+			}
+
+			//replace the text
+			string text = string.Join(tabs, processedlines);
+			scriptedit.SelectionStart = scriptedit.WordStartPosition(scriptedit.CurrentPos, true);
+			scriptedit.SelectionEnd = scriptedit.WordEndPosition(scriptedit.CurrentPos, true);
+			scriptedit.ReplaceSel(text);
+
+			//move the cursor if we had the [EP] marker
+			if(entrypos != -1) 
+			{
+				MoveToLine(entryline);
+				scriptedit.SelectionStart = scriptedit.PositionFromLine(entryline) + entrypos;
+				scriptedit.SelectionEnd = scriptedit.PositionFromLine(entryline) + entrypos;
+			}
+		}
+
+		//mxd. This converts [LB] markers to line breaks if necessary
+		private static string[] ProcessLineBreaks(string[] lines) 
+		{
+			List<string> result = new List<string>(lines.Length);
+			string[] separator = new[] { "[LB]" };
+
+			foreach(string line in lines) 
+			{
+				if(line.IndexOf(separator[0]) != -1) 
+				{
+					if(General.Settings.SnippetsAllmanStyle)
+						result.AddRange(line.Split(separator, StringSplitOptions.RemoveEmptyEntries));
+					else
+						result.Add(line.Replace(separator[0], " "));
+				} 
+				else 
+				{
+					result.Add(line);
+				}
+			}
+
+			return result.ToArray();
+		}
+
+		#endregion
+		
+		#region ================== Events
+		
+		// Layout needs to be re-organized
+		protected override void OnLayout(LayoutEventArgs e)
+		{
+			base.OnLayout(e);
+
+			// With or without functions bar?
+			if(functionbar.Visible)
+			{
+				scriptpanel.Top = functionbar.Bottom + 6;
+				scriptpanel.Height = this.ClientSize.Height - scriptpanel.Top;
+			}
+			else
+			{
+				scriptpanel.Top = 0;
+				scriptpanel.Height = this.ClientSize.Height;
+			}
+		}
+
+		//mxd. Script text changed
+		private void scriptedit_UndoRedoPerformed(ScintillaControl pSender)
+		{
+			changed = true;
+			if(OnTextChanged != null) OnTextChanged(this, EventArgs.Empty);
+		}
+
+		//mxd. Script text changed
+		private void scriptedit_TextChanged(ScintillaControl pSender, int position, int length, int linesAdded)
+		{
+			changed = true;
+			if(OnTextChanged != null) OnTextChanged(this, EventArgs.Empty);
+		}
+		
+		// Key pressed down
+		private void scriptedit_KeyDown(object sender, KeyEventArgs e)
+		{
+			// These key combinations put odd characters in the script, so I disabled them
+			if((e.KeyCode == Keys.Q) && ((e.Modifiers & Keys.Control) == Keys.Control)) e.Handled = true;
+			else if((e.KeyCode == Keys.W) && ((e.Modifiers & Keys.Control) == Keys.Control)) e.Handled = true;
+			else if((e.KeyCode == Keys.E) && ((e.Modifiers & Keys.Control) == Keys.Control)) e.Handled = true;
+			else if((e.KeyCode == Keys.R) && ((e.Modifiers & Keys.Control) == Keys.Control)) e.Handled = true;
+			else if((e.KeyCode == Keys.Y) && ((e.Modifiers & Keys.Control) == Keys.Control)) e.Handled = true;
+			else if((e.KeyCode == Keys.U) && ((e.Modifiers & Keys.Control) == Keys.Control)) e.Handled = true;
+			else if((e.KeyCode == Keys.I) && ((e.Modifiers & Keys.Control) == Keys.Control)) e.Handled = true;
+			else if((e.KeyCode == Keys.P) && ((e.Modifiers & Keys.Control) == Keys.Control)) e.Handled = true;
+			else if((e.KeyCode == Keys.A) && ((e.Modifiers & Keys.Control) == Keys.Control) && ((e.Modifiers & Keys.Shift) == Keys.Shift)) e.Handled = true;
+			else if((e.KeyCode == Keys.D) && ((e.Modifiers & Keys.Control) == Keys.Control)) e.Handled = true;
+			else if((e.KeyCode == Keys.G) && ((e.Modifiers & Keys.Control) == Keys.Control)) e.Handled = true;
+			else if((e.KeyCode == Keys.H) && ((e.Modifiers & Keys.Control) == Keys.Control)) e.Handled = true;
+			else if((e.KeyCode == Keys.J) && ((e.Modifiers & Keys.Control) == Keys.Control)) e.Handled = true;
+			else if((e.KeyCode == Keys.K) && ((e.Modifiers & Keys.Control) == Keys.Control)) e.Handled = true;
+			else if((e.KeyCode == Keys.L) && ((e.Modifiers & Keys.Control) == Keys.Control)) e.Handled = true;
+			else if((e.KeyCode == Keys.Z) && ((e.Modifiers & Keys.Control) == Keys.Control) && ((e.Modifiers & Keys.Shift) == Keys.Shift)) e.Handled = true;
+			else if((e.KeyCode == Keys.X) && ((e.Modifiers & Keys.Control) == Keys.Control) && ((e.Modifiers & Keys.Shift) == Keys.Shift)) e.Handled = true;
+			else if((e.KeyCode == Keys.C) && ((e.Modifiers & Keys.Control) == Keys.Control) && ((e.Modifiers & Keys.Shift) == Keys.Shift)) e.Handled = true;
+			else if((e.KeyCode == Keys.V) && ((e.Modifiers & Keys.Control) == Keys.Control) && ((e.Modifiers & Keys.Shift) == Keys.Shift)) e.Handled = true;
+			else if((e.KeyCode == Keys.B) && ((e.Modifiers & Keys.Control) == Keys.Control)) e.Handled = true;
+			else if((e.KeyCode == Keys.N) && ((e.Modifiers & Keys.Control) == Keys.Control)) e.Handled = true;
+			else if((e.KeyCode == Keys.M) && ((e.Modifiers & Keys.Control) == Keys.Control)) e.Handled = true;
+
+			// F3 for Find Next
+			else if((e.KeyCode == Keys.F3) && (e.Modifiers == Keys.None))
+			{
+				if(OnFindNext != null) OnFindNext();
+				e.Handled = true;
+			}
+
+			// F2 for Find Previous (mxd)
+			else if((e.KeyCode == Keys.F2) && (e.Modifiers == Keys.None))
+			{
+				if(OnFindPrevious != null) OnFindPrevious();
+				e.Handled = true;
+			}
+
+			// CTRL+F for find & replace
+			else if((e.KeyCode == Keys.F) && ((e.Modifiers & Keys.Control) == Keys.Control))
+			{
+				if(OnOpenFindAndReplace != null) OnOpenFindAndReplace();
+				e.Handled = true;
+			}
+
+			// CTRL+S for save
+			else if((e.KeyCode == Keys.S) && ((e.Modifiers & Keys.Control) == Keys.Control))
+			{
+				if(OnExplicitSaveTab != null) OnExplicitSaveTab();
+				e.Handled = true;
+			}
+
+			// CTRL+O for open
+			else if((e.KeyCode == Keys.O) && ((e.Modifiers & Keys.Control) == Keys.Control))
+			{
+				if(OnOpenScriptBrowser != null) OnOpenScriptBrowser();
+				e.Handled = true;
+			}
+
+			// CTRL+Space to autocomplete
+			else if((e.KeyCode == Keys.Space) && (e.Modifiers == Keys.Control))
+			{
+				// Hide call tip if any
+				scriptedit.CallTipCancel();
+				
+				// Show autocomplete
+				int currentpos = scriptedit.CurrentPos;
+				int wordstartpos = scriptedit.WordStartPosition(currentpos, true);
+				scriptedit.AutoCShow(currentpos - wordstartpos, autocompletestring);
+				
+				e.Handled = true;
+			}
+
+			//mxd. Tab to expand code snippet
+			// Do it only when the text cursor is at the end of a keyword.
+			else if(e.KeyCode == Keys.Tab) 
+			{
+				string curword = GetCurrentWord().ToLowerInvariant();
+				if(scriptconfig.Snippets.ContainsKey(curword) && scriptedit.CurrentPos == scriptedit.WordEndPosition(scriptedit.CurrentPos, true))
+				{
+					InsertSnippet(scriptconfig.Snippets[curword]);
+					e.Handled = true;
+				}
+			}
+
+			//mxd. Handle screenshot saving
+			else if(DelayedForm.ProcessSaveScreenshotAction((int)e.KeyData))
+			{
+				e.Handled = true;
+			}
+		}
+		
+		// Key released
+		private void scriptedit_KeyUp(object sender, KeyEventArgs e)
+		{
+			bool showcalltip = false;
+			int highlightstart = 0;
+			int highlightend = 0;
+			
+			// Enter pressed?
+			if((e.KeyCode == Keys.Enter) && (e.Modifiers == Keys.None))
+			{
+				// Do we want auto-indent?
+				if(General.Settings.ScriptAutoIndent)
+				{
+					// Get the current line index and check if its not the first line
+					int curline = scriptedit.LineFromPosition(scriptedit.CurrentPos);
+					if(curline > 0 && scriptedit.GetLineIndentation(curline) == 0)
+					{
+						// Apply identation of the previous line to this line
+						int ident = scriptedit.GetLineIndentation(curline - 1);
+						scriptedit.SetLineIndentation(curline, ident);
+						scriptedit.SetSel(scriptedit.SelectionStart + ident, scriptedit.SelectionStart + ident);
+					}
+				}
+			}
+			
+			UpdatePositionInfo();
+			
+			// Call tip shown
+			if(scriptedit.IsCallTipActive)
+			{
+				// Should we hide the call tip?
+				if(curfunctionname.Length == 0)
+				{
+					// Hide the call tip
+					scriptedit.CallTipCancel();
+				}
+				else
+				{
+					// Update the call tip
+					showcalltip = true;
+				}
+			}
+			// No call tip
+			else
+			{
+				// Should we show a call tip?
+				showcalltip = (curfunctionname.Length > 0) && !scriptedit.IsAutoCActive;
+			}
+			
+			// Show or update call tip
+			if(showcalltip)
+			{
+				string functiondef = scriptconfig.GetFunctionDefinition(curfunctionname);
+				if(functiondef != null)
+				{
+					// Determine the range to highlight
+					int argsopenpos = functiondef.IndexOf(scriptconfig.FunctionOpen);
+					int argsclosepos = functiondef.LastIndexOf(scriptconfig.FunctionClose);
+					if((argsopenpos > -1) && (argsclosepos > -1))
+					{
+						string argsstr = functiondef.Substring(argsopenpos + 1, argsclosepos - argsopenpos - 1);
+						string[] args = argsstr.Split(scriptconfig.ArgumentDelimiter[0]);
+						if((curargumentindex >= 0) && (curargumentindex < args.Length))
+						{
+							int argoffset = 0;
+							for(int i = 0; i < curargumentindex; i++) argoffset += args[i].Length + 1;
+							highlightstart = argsopenpos + argoffset + 1;
+							highlightend = highlightstart + args[curargumentindex].Length;
+						}
+					}
+
+					//mxd. If the tip obscures the view, move it down
+					int tippos;
+					int funcline = scriptedit.LineFromPosition(curfunctionstartpos);
+					int curline = scriptedit.LineFromPosition(scriptedit.CurrentPos);
+					if(curline > funcline)
+						tippos = scriptedit.PositionFromLine(curline) + scriptedit.GetLineIndentation(curline); //scriptedit.PositionFromLine(curline) /*+ (curfunctionstartpos - scriptedit.PositionFromLine(funcline))*/;
+					else
+						tippos = curfunctionstartpos;
+					
+					// Show tip
+					scriptedit.CallTipShow(tippos, functiondef);
+					scriptedit.CallTipSetHlt(highlightstart, highlightend);
+				}
+			}
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Controls/ScriptEditorControl.resx b/Source/Core/Controls/ScriptEditorControl.resx
new file mode 100644
index 0000000..19dc0dd
--- /dev/null
+++ b/Source/Core/Controls/ScriptEditorControl.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Controls/ScriptEditorPanel.Designer.cs b/Source/Core/Controls/ScriptEditorPanel.Designer.cs
new file mode 100644
index 0000000..173230d
--- /dev/null
+++ b/Source/Core/Controls/ScriptEditorPanel.Designer.cs
@@ -0,0 +1,561 @@
+namespace CodeImp.DoomBuilder.Controls
+{
+	partial class ScriptEditorPanel
+	{
+		/// <summary> 
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Component Designer generated code
+
+		/// <summary> 
+		/// Required method for Designer support - do not modify 
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.components = new System.ComponentModel.Container();
+			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ScriptEditorPanel));
+			this.tabs = new System.Windows.Forms.TabControl();
+			this.toolbar = new System.Windows.Forms.ToolStrip();
+			this.buttonnew = new System.Windows.Forms.ToolStripDropDownButton();
+			this.buttonopen = new System.Windows.Forms.ToolStripButton();
+			this.buttonsave = new System.Windows.Forms.ToolStripButton();
+			this.buttonsaveall = new System.Windows.Forms.ToolStripButton();
+			this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+			this.buttonundo = new System.Windows.Forms.ToolStripButton();
+			this.buttonredo = new System.Windows.Forms.ToolStripButton();
+			this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
+			this.buttoncut = new System.Windows.Forms.ToolStripButton();
+			this.buttoncopy = new System.Windows.Forms.ToolStripButton();
+			this.buttonpaste = new System.Windows.Forms.ToolStripButton();
+			this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
+			this.buttonsnippets = new System.Windows.Forms.ToolStripDropDownButton();
+			this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
+			this.buttonscriptconfig = new System.Windows.Forms.ToolStripDropDownButton();
+			this.buttoncompile = new System.Windows.Forms.ToolStripButton();
+			this.buttonclose = new System.Windows.Forms.ToolStripButton();
+			this.buttonkeywordhelp = new System.Windows.Forms.ToolStripButton();
+			this.buttonsearch = new System.Windows.Forms.ToolStripButton();
+			this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
+			this.searchbox = new System.Windows.Forms.ToolStripTextBox();
+			this.searchprev = new System.Windows.Forms.ToolStripButton();
+			this.searchnext = new System.Windows.Forms.ToolStripButton();
+			this.searchmatchcase = new System.Windows.Forms.ToolStripButton();
+			this.searchwholeword = new System.Windows.Forms.ToolStripButton();
+			this.openfile = new System.Windows.Forms.OpenFileDialog();
+			this.savefile = new System.Windows.Forms.SaveFileDialog();
+			this.splitter = new System.Windows.Forms.SplitContainer();
+			this.label1 = new System.Windows.Forms.Label();
+			this.errorlist = new System.Windows.Forms.ListView();
+			this.colIndex = new System.Windows.Forms.ColumnHeader();
+			this.colDescription = new System.Windows.Forms.ColumnHeader();
+			this.colFile = new System.Windows.Forms.ColumnHeader();
+			this.errorimages = new System.Windows.Forms.ImageList(this.components);
+			this.statusbar = new System.Windows.Forms.StatusStrip();
+			this.statuslabel = new System.Windows.Forms.ToolStripStatusLabel();
+			this.scripttype = new System.Windows.Forms.ToolStripStatusLabel();
+			this.statusflasher = new System.Windows.Forms.Timer(this.components);
+			this.statusresetter = new System.Windows.Forms.Timer(this.components);
+			this.toolbar.SuspendLayout();
+			this.splitter.Panel1.SuspendLayout();
+			this.splitter.Panel2.SuspendLayout();
+			this.splitter.SuspendLayout();
+			this.statusbar.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// tabs
+			// 
+			this.tabs.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.tabs.Location = new System.Drawing.Point(3, 8);
+			this.tabs.Margin = new System.Windows.Forms.Padding(3, 8, 3, 3);
+			this.tabs.Name = "tabs";
+			this.tabs.Padding = new System.Drawing.Point(12, 3);
+			this.tabs.SelectedIndex = 0;
+			this.tabs.Size = new System.Drawing.Size(720, 379);
+			this.tabs.TabIndex = 0;
+			this.tabs.TabStop = false;
+			this.tabs.Selecting += new System.Windows.Forms.TabControlCancelEventHandler(this.tabs_Selecting);
+			this.tabs.MouseUp += new System.Windows.Forms.MouseEventHandler(this.tabs_MouseUp);
+			// 
+			// toolbar
+			// 
+			this.toolbar.AllowMerge = false;
+			this.toolbar.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;
+			this.toolbar.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.buttonnew,
+            this.buttonopen,
+            this.buttonsave,
+            this.buttonsaveall,
+            this.toolStripSeparator1,
+            this.buttonundo,
+            this.buttonredo,
+            this.toolStripSeparator2,
+            this.buttoncut,
+            this.buttoncopy,
+            this.buttonpaste,
+            this.toolStripSeparator3,
+            this.buttonsnippets,
+            this.toolStripSeparator4,
+            this.buttonscriptconfig,
+            this.buttoncompile,
+            this.buttonclose,
+            this.buttonkeywordhelp,
+            this.buttonsearch,
+            this.toolStripSeparator5,
+            this.searchbox,
+            this.searchprev,
+            this.searchnext,
+            this.searchmatchcase,
+            this.searchwholeword});
+			this.toolbar.Location = new System.Drawing.Point(0, 0);
+			this.toolbar.Name = "toolbar";
+			this.toolbar.Size = new System.Drawing.Size(726, 25);
+			this.toolbar.TabIndex = 1;
+			// 
+			// buttonnew
+			// 
+			this.buttonnew.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttonnew.Image = global::CodeImp.DoomBuilder.Properties.Resources.NewScript;
+			this.buttonnew.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttonnew.Margin = new System.Windows.Forms.Padding(6, 1, 0, 2);
+			this.buttonnew.Name = "buttonnew";
+			this.buttonnew.Size = new System.Drawing.Size(29, 22);
+			this.buttonnew.Text = "New File";
+			// 
+			// buttonopen
+			// 
+			this.buttonopen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttonopen.Image = global::CodeImp.DoomBuilder.Properties.Resources.OpenScript;
+			this.buttonopen.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttonopen.Margin = new System.Windows.Forms.Padding(3, 1, 0, 2);
+			this.buttonopen.Name = "buttonopen";
+			this.buttonopen.Size = new System.Drawing.Size(23, 22);
+			this.buttonopen.Text = "Open File";
+			this.buttonopen.Click += new System.EventHandler(this.buttonopen_Click);
+			// 
+			// buttonsave
+			// 
+			this.buttonsave.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttonsave.Enabled = false;
+			this.buttonsave.Image = global::CodeImp.DoomBuilder.Properties.Resources.SaveScript;
+			this.buttonsave.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttonsave.Name = "buttonsave";
+			this.buttonsave.Size = new System.Drawing.Size(23, 22);
+			this.buttonsave.Text = "Save File";
+			this.buttonsave.Click += new System.EventHandler(this.buttonsave_Click);
+			// 
+			// buttonsaveall
+			// 
+			this.buttonsaveall.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttonsaveall.Enabled = false;
+			this.buttonsaveall.Image = global::CodeImp.DoomBuilder.Properties.Resources.SaveAll;
+			this.buttonsaveall.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttonsaveall.Name = "buttonsaveall";
+			this.buttonsaveall.Size = new System.Drawing.Size(23, 22);
+			this.buttonsaveall.Text = "Save All Files";
+			this.buttonsaveall.Click += new System.EventHandler(this.buttonsaveall_Click);
+			// 
+			// toolStripSeparator1
+			// 
+			this.toolStripSeparator1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+			this.toolStripSeparator1.Name = "toolStripSeparator1";
+			this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25);
+			// 
+			// buttonundo
+			// 
+			this.buttonundo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttonundo.Image = global::CodeImp.DoomBuilder.Properties.Resources.Undo;
+			this.buttonundo.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttonundo.Name = "buttonundo";
+			this.buttonundo.Size = new System.Drawing.Size(23, 22);
+			this.buttonundo.Text = "Undo";
+			this.buttonundo.Click += new System.EventHandler(this.buttonundo_Click);
+			// 
+			// buttonredo
+			// 
+			this.buttonredo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttonredo.Image = global::CodeImp.DoomBuilder.Properties.Resources.Redo;
+			this.buttonredo.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttonredo.Name = "buttonredo";
+			this.buttonredo.Size = new System.Drawing.Size(23, 22);
+			this.buttonredo.Text = "Redo";
+			this.buttonredo.Click += new System.EventHandler(this.buttonredo_Click);
+			// 
+			// toolStripSeparator2
+			// 
+			this.toolStripSeparator2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+			this.toolStripSeparator2.Name = "toolStripSeparator2";
+			this.toolStripSeparator2.Size = new System.Drawing.Size(6, 25);
+			// 
+			// buttoncut
+			// 
+			this.buttoncut.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttoncut.Image = global::CodeImp.DoomBuilder.Properties.Resources.Cut;
+			this.buttoncut.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttoncut.Name = "buttoncut";
+			this.buttoncut.Size = new System.Drawing.Size(23, 22);
+			this.buttoncut.Text = "Cut Selection";
+			this.buttoncut.Click += new System.EventHandler(this.buttoncut_Click);
+			// 
+			// buttoncopy
+			// 
+			this.buttoncopy.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttoncopy.Image = global::CodeImp.DoomBuilder.Properties.Resources.Copy;
+			this.buttoncopy.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttoncopy.Name = "buttoncopy";
+			this.buttoncopy.Size = new System.Drawing.Size(23, 22);
+			this.buttoncopy.Text = "Copy Selection";
+			this.buttoncopy.Click += new System.EventHandler(this.buttoncopy_Click);
+			// 
+			// buttonpaste
+			// 
+			this.buttonpaste.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttonpaste.Image = global::CodeImp.DoomBuilder.Properties.Resources.Paste;
+			this.buttonpaste.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttonpaste.Name = "buttonpaste";
+			this.buttonpaste.Size = new System.Drawing.Size(23, 22);
+			this.buttonpaste.Text = "Paste";
+			this.buttonpaste.Click += new System.EventHandler(this.buttonpaste_Click);
+			// 
+			// toolStripSeparator3
+			// 
+			this.toolStripSeparator3.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+			this.toolStripSeparator3.Name = "toolStripSeparator3";
+			this.toolStripSeparator3.Size = new System.Drawing.Size(6, 25);
+			// 
+			// buttonsnippets
+			// 
+			this.buttonsnippets.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttonsnippets.Enabled = false;
+			this.buttonsnippets.Image = global::CodeImp.DoomBuilder.Properties.Resources.PuzzlePiece;
+			this.buttonsnippets.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttonsnippets.Name = "buttonsnippets";
+			this.buttonsnippets.Size = new System.Drawing.Size(29, 22);
+			this.buttonsnippets.Text = "Insert a Code Snippet";
+			// 
+			// toolStripSeparator4
+			// 
+			this.toolStripSeparator4.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+			this.toolStripSeparator4.Name = "toolStripSeparator4";
+			this.toolStripSeparator4.Size = new System.Drawing.Size(6, 25);
+			// 
+			// buttonscriptconfig
+			// 
+			this.buttonscriptconfig.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttonscriptconfig.Enabled = false;
+			this.buttonscriptconfig.Image = global::CodeImp.DoomBuilder.Properties.Resources.ScriptPalette;
+			this.buttonscriptconfig.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttonscriptconfig.Name = "buttonscriptconfig";
+			this.buttonscriptconfig.Size = new System.Drawing.Size(29, 22);
+			this.buttonscriptconfig.Text = "Change Script Type";
+			// 
+			// buttoncompile
+			// 
+			this.buttoncompile.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttoncompile.Image = global::CodeImp.DoomBuilder.Properties.Resources.ScriptCompile;
+			this.buttoncompile.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttoncompile.Margin = new System.Windows.Forms.Padding(3, 1, 0, 2);
+			this.buttoncompile.Name = "buttoncompile";
+			this.buttoncompile.Size = new System.Drawing.Size(23, 22);
+			this.buttoncompile.Text = "Compile Script";
+			this.buttoncompile.Click += new System.EventHandler(this.buttoncompile_Click);
+			// 
+			// buttonclose
+			// 
+			this.buttonclose.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+			this.buttonclose.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttonclose.Image = global::CodeImp.DoomBuilder.Properties.Resources.Close;
+			this.buttonclose.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttonclose.Name = "buttonclose";
+			this.buttonclose.Size = new System.Drawing.Size(23, 22);
+			this.buttonclose.Text = "Close File";
+			this.buttonclose.Click += new System.EventHandler(this.buttonclose_Click);
+			// 
+			// buttonkeywordhelp
+			// 
+			this.buttonkeywordhelp.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+			this.buttonkeywordhelp.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttonkeywordhelp.Image = global::CodeImp.DoomBuilder.Properties.Resources.ScriptHelp;
+			this.buttonkeywordhelp.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttonkeywordhelp.Name = "buttonkeywordhelp";
+			this.buttonkeywordhelp.Size = new System.Drawing.Size(23, 22);
+			this.buttonkeywordhelp.Text = "Keyword Help";
+			this.buttonkeywordhelp.Click += new System.EventHandler(this.buttonkeywordhelp_Click);
+			// 
+			// buttonsearch
+			// 
+			this.buttonsearch.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+			this.buttonsearch.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttonsearch.Image = global::CodeImp.DoomBuilder.Properties.Resources.Search;
+			this.buttonsearch.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttonsearch.Name = "buttonsearch";
+			this.buttonsearch.Size = new System.Drawing.Size(23, 22);
+			this.buttonsearch.Text = "Open Find and Replace Window";
+			this.buttonsearch.Click += new System.EventHandler(this.buttonsearch_Click);
+			// 
+			// toolStripSeparator5
+			// 
+			this.toolStripSeparator5.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+			this.toolStripSeparator5.Name = "toolStripSeparator5";
+			this.toolStripSeparator5.Size = new System.Drawing.Size(6, 25);
+			// 
+			// searchbox
+			// 
+			this.searchbox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+			this.searchbox.Name = "searchbox";
+			this.searchbox.Size = new System.Drawing.Size(100, 25);
+			this.searchbox.TextChanged += new System.EventHandler(this.searchbox_TextChanged);
+			// 
+			// searchprev
+			// 
+			this.searchprev.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.searchprev.Image = global::CodeImp.DoomBuilder.Properties.Resources.SearchPrev;
+			this.searchprev.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.searchprev.Name = "searchprev";
+			this.searchprev.Size = new System.Drawing.Size(23, 22);
+			this.searchprev.ToolTipText = "Previous Match";
+			this.searchprev.Click += new System.EventHandler(this.searchprev_Click);
+			// 
+			// searchnext
+			// 
+			this.searchnext.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.searchnext.Image = global::CodeImp.DoomBuilder.Properties.Resources.SearchNext;
+			this.searchnext.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.searchnext.Name = "searchnext";
+			this.searchnext.Size = new System.Drawing.Size(23, 22);
+			this.searchnext.ToolTipText = "Next Match";
+			this.searchnext.Click += new System.EventHandler(this.searchnext_Click);
+			// 
+			// searchmatchcase
+			// 
+			this.searchmatchcase.CheckOnClick = true;
+			this.searchmatchcase.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.searchmatchcase.Image = global::CodeImp.DoomBuilder.Properties.Resources.SearchMatchCase;
+			this.searchmatchcase.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.searchmatchcase.Name = "searchmatchcase";
+			this.searchmatchcase.Size = new System.Drawing.Size(23, 22);
+			this.searchmatchcase.ToolTipText = "Match Case";
+			this.searchmatchcase.Click += new System.EventHandler(this.searchbox_TextChanged);
+			// 
+			// searchwholeword
+			// 
+			this.searchwholeword.CheckOnClick = true;
+			this.searchwholeword.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.searchwholeword.Image = global::CodeImp.DoomBuilder.Properties.Resources.SearchMatch;
+			this.searchwholeword.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.searchwholeword.Name = "searchwholeword";
+			this.searchwholeword.Size = new System.Drawing.Size(23, 22);
+			this.searchwholeword.ToolTipText = "Match Whole Word";
+			this.searchwholeword.Click += new System.EventHandler(this.searchbox_TextChanged);
+			// 
+			// openfile
+			// 
+			this.openfile.Multiselect = true;
+			this.openfile.Title = "Open Script";
+			// 
+			// savefile
+			// 
+			this.savefile.Title = "Save Script As";
+			// 
+			// splitter
+			// 
+			this.splitter.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.splitter.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
+			this.splitter.IsSplitterFixed = true;
+			this.splitter.Location = new System.Drawing.Point(0, 25);
+			this.splitter.Name = "splitter";
+			this.splitter.Orientation = System.Windows.Forms.Orientation.Horizontal;
+			// 
+			// splitter.Panel1
+			// 
+			this.splitter.Panel1.Controls.Add(this.tabs);
+			// 
+			// splitter.Panel2
+			// 
+			this.splitter.Panel2.Controls.Add(this.label1);
+			this.splitter.Panel2.Controls.Add(this.errorlist);
+			this.splitter.Size = new System.Drawing.Size(726, 516);
+			this.splitter.SplitterDistance = 390;
+			this.splitter.TabIndex = 2;
+			this.splitter.TabStop = false;
+			// 
+			// label1
+			// 
+			this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.label1.BackColor = System.Drawing.SystemColors.ActiveCaption;
+			this.label1.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.label1.ForeColor = System.Drawing.SystemColors.ActiveCaptionText;
+			this.label1.Location = new System.Drawing.Point(3, 0);
+			this.label1.Name = "label1";
+			this.label1.Padding = new System.Windows.Forms.Padding(1);
+			this.label1.Size = new System.Drawing.Size(720, 16);
+			this.label1.TabIndex = 1;
+			this.label1.Text = "Errors";
+			// 
+			// errorlist
+			// 
+			this.errorlist.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.errorlist.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+            this.colIndex,
+            this.colDescription,
+            this.colFile});
+			this.errorlist.FullRowSelect = true;
+			this.errorlist.GridLines = true;
+			this.errorlist.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
+			this.errorlist.LabelWrap = false;
+			this.errorlist.Location = new System.Drawing.Point(3, 19);
+			this.errorlist.MultiSelect = false;
+			this.errorlist.Name = "errorlist";
+			this.errorlist.ShowGroups = false;
+			this.errorlist.Size = new System.Drawing.Size(720, 100);
+			this.errorlist.SmallImageList = this.errorimages;
+			this.errorlist.TabIndex = 0;
+			this.errorlist.TabStop = false;
+			this.errorlist.UseCompatibleStateImageBehavior = false;
+			this.errorlist.View = System.Windows.Forms.View.Details;
+			this.errorlist.ItemActivate += new System.EventHandler(this.errorlist_ItemActivate);
+			// 
+			// colIndex
+			// 
+			this.colIndex.Text = "";
+			this.colIndex.Width = 45;
+			// 
+			// colDescription
+			// 
+			this.colDescription.Text = "Description";
+			this.colDescription.Width = 500;
+			// 
+			// colFile
+			// 
+			this.colFile.Text = "File";
+			this.colFile.Width = 150;
+			// 
+			// errorimages
+			// 
+			this.errorimages.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("errorimages.ImageStream")));
+			this.errorimages.TransparentColor = System.Drawing.Color.Transparent;
+			this.errorimages.Images.SetKeyName(0, "ScriptError3.png");
+			// 
+			// statusbar
+			// 
+			this.statusbar.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.statuslabel,
+            this.scripttype});
+			this.statusbar.Location = new System.Drawing.Point(0, 541);
+			this.statusbar.Name = "statusbar";
+			this.statusbar.Size = new System.Drawing.Size(726, 22);
+			this.statusbar.TabIndex = 3;
+			this.statusbar.Text = "statusStrip1";
+			// 
+			// statuslabel
+			// 
+			this.statuslabel.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold);
+			this.statuslabel.Image = global::CodeImp.DoomBuilder.Properties.Resources.Status0;
+			this.statuslabel.Margin = new System.Windows.Forms.Padding(3, 3, 0, 2);
+			this.statuslabel.Name = "statuslabel";
+			this.statuslabel.Size = new System.Drawing.Size(60, 17);
+			this.statuslabel.Text = "Ready.";
+			// 
+			// scripttype
+			// 
+			this.scripttype.Name = "scripttype";
+			this.scripttype.Size = new System.Drawing.Size(648, 17);
+			this.scripttype.Spring = true;
+			this.scripttype.Text = "Plain Text";
+			this.scripttype.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+			// 
+			// statusflasher
+			// 
+			this.statusflasher.Tick += new System.EventHandler(this.statusflasher_Tick);
+			// 
+			// statusresetter
+			// 
+			this.statusresetter.Tick += new System.EventHandler(this.statusresetter_Tick);
+			// 
+			// ScriptEditorPanel
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.BackColor = System.Drawing.SystemColors.Control;
+			this.Controls.Add(this.splitter);
+			this.Controls.Add(this.statusbar);
+			this.Controls.Add(this.toolbar);
+			this.Name = "ScriptEditorPanel";
+			this.Size = new System.Drawing.Size(726, 563);
+			this.toolbar.ResumeLayout(false);
+			this.toolbar.PerformLayout();
+			this.splitter.Panel1.ResumeLayout(false);
+			this.splitter.Panel2.ResumeLayout(false);
+			this.splitter.ResumeLayout(false);
+			this.statusbar.ResumeLayout(false);
+			this.statusbar.PerformLayout();
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.TabControl tabs;
+		private System.Windows.Forms.ToolStrip toolbar;
+		private System.Windows.Forms.ToolStripButton buttonopen;
+		private System.Windows.Forms.ToolStripDropDownButton buttonnew;
+		private System.Windows.Forms.OpenFileDialog openfile;
+		private System.Windows.Forms.SaveFileDialog savefile;
+		private System.Windows.Forms.ToolStripButton buttonsave;
+		private System.Windows.Forms.ToolStripButton buttonsaveall;
+		private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
+		private System.Windows.Forms.ToolStripButton buttoncompile;
+		private System.Windows.Forms.ToolStripButton buttonundo;
+		private System.Windows.Forms.ToolStripButton buttonredo;
+		private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
+		private System.Windows.Forms.ToolStripButton buttoncut;
+		private System.Windows.Forms.ToolStripButton buttoncopy;
+		private System.Windows.Forms.ToolStripButton buttonpaste;
+		private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
+		private System.Windows.Forms.ToolStripDropDownButton buttonscriptconfig;
+		private System.Windows.Forms.ToolStripButton buttonclose;
+		private System.Windows.Forms.SplitContainer splitter;
+		private System.Windows.Forms.ListView errorlist;
+		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.ColumnHeader colIndex;
+		private System.Windows.Forms.ColumnHeader colDescription;
+		private System.Windows.Forms.ColumnHeader colFile;
+		private System.Windows.Forms.ImageList errorimages;
+		private System.Windows.Forms.ToolStripButton buttonkeywordhelp;
+		private System.Windows.Forms.ToolStripButton buttonsearch;
+		private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
+		private System.Windows.Forms.ToolStripDropDownButton buttonsnippets;
+		private System.Windows.Forms.ToolStripSeparator toolStripSeparator5;
+		private System.Windows.Forms.ToolStripTextBox searchbox;
+		private System.Windows.Forms.ToolStripButton searchnext;
+		private System.Windows.Forms.ToolStripButton searchprev;
+		private System.Windows.Forms.ToolStripButton searchmatchcase;
+		private System.Windows.Forms.ToolStripButton searchwholeword;
+		private System.Windows.Forms.StatusStrip statusbar;
+		private System.Windows.Forms.ToolStripStatusLabel statuslabel;
+		private System.Windows.Forms.ToolStripStatusLabel scripttype;
+		private System.Windows.Forms.Timer statusflasher;
+		private System.Windows.Forms.Timer statusresetter;
+	}
+}
diff --git a/Source/Core/Controls/ScriptEditorPanel.cs b/Source/Core/Controls/ScriptEditorPanel.cs
new file mode 100644
index 0000000..cb54d15
--- /dev/null
+++ b/Source/Core/Controls/ScriptEditorPanel.cs
@@ -0,0 +1,1063 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Globalization;
+using System.IO;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Compilers;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Windows;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Controls
+{
+	internal partial class ScriptEditorPanel : UserControl
+	{
+		#region ================== Constants
+		
+		#endregion
+		
+		#region ================== Variables
+		
+		private List<ScriptConfiguration> scriptconfigs;
+		private List<CompilerError> compilererrors;
+
+		// Find/Replace
+		private ScriptFindReplaceForm findreplaceform;
+		private FindReplaceOptions findoptions;
+
+		// Quick search bar settings (mxd)
+		private static bool matchwholeword;
+		private static bool matchcase;
+
+		//mxd. Status update
+		private ScriptStatusInfo status;
+		private int statusflashcount;
+		private bool statusflashicon;
+		
+		#endregion
+		
+		#region ================== Properties
+		
+		public ScriptDocumentTab ActiveTab { get { return (tabs.SelectedTab as ScriptDocumentTab); } }
+		
+		#endregion
+		
+		#region ================== Constructor
+		
+		// Constructor
+		public ScriptEditorPanel()
+		{
+			InitializeComponent();
+		}
+		
+		// This initializes the control
+		public void Initialize()
+		{
+			// Make list of script configs
+			scriptconfigs = new List<ScriptConfiguration>(General.ScriptConfigs.Values);
+			scriptconfigs.Add(new ScriptConfiguration());
+			scriptconfigs.Sort();
+			
+			// Fill the list of new document types
+			foreach(ScriptConfiguration cfg in scriptconfigs)
+			{
+				// Button for new script menu
+				ToolStripMenuItem item = new ToolStripMenuItem(cfg.Description);
+				//item.Image = buttonnew.Image;
+				item.Tag = cfg;
+				item.Click += buttonnew_Click;
+				buttonnew.DropDownItems.Add(item);
+				
+				// Button for script type menu
+				item = new ToolStripMenuItem(cfg.Description);
+				//item.Image = buttonnew.Image;
+				item.Tag = cfg;
+				item.Click += buttonscriptconfig_Click;
+				buttonscriptconfig.DropDownItems.Add(item);
+			}
+			
+			// Setup supported extensions
+			string filterall = "";
+			string filterseperate = "";
+			foreach(ScriptConfiguration cfg in scriptconfigs)
+			{
+				if(cfg.Extensions.Length > 0)
+				{
+					string exts = "*." + string.Join(";*.", cfg.Extensions);
+					if(filterseperate.Length > 0) filterseperate += "|";
+					filterseperate += cfg.Description + "|" + exts;
+					if(filterall.Length > 0) filterall += ";";
+					filterall += exts;
+				}
+			}
+			openfile.Filter = "Script files|" + filterall + "|" + filterseperate + "|All files|*.*";
+			
+			// Load the script lumps
+			foreach(MapLumpInfo maplumpinfo in General.Map.Config.MapLumps.Values)
+			{
+				// Is this a script lump?
+				if(maplumpinfo.Script != null)
+				{
+					// Load this!
+					ScriptLumpDocumentTab t = new ScriptLumpDocumentTab(this, maplumpinfo.Name, maplumpinfo.Script);
+					tabs.TabPages.Add(t);
+				} 
+				else if(maplumpinfo.ScriptBuild) //mxd
+				{
+					// Load this!
+					ScriptLumpDocumentTab t = new ScriptLumpDocumentTab(this, maplumpinfo.Name, General.CompiledScriptConfigs[General.Map.Options.ScriptCompiler]);
+					tabs.TabPages.Add(t);
+				}
+			}
+
+			// Load the files that were previously opened for this map
+			foreach(String filename in General.Map.Options.ScriptFiles)
+			{
+				// Does this file exist?
+				if(File.Exists(filename))
+				{
+					// Load this!
+					OpenFile(filename);
+				}
+			}
+
+			//mxd. Select "Scripts" tab, because that's what user will want 99% of time
+			int scriptsindex = GetTabPageIndex("SCRIPTS");
+			tabs.SelectedIndex = (scriptsindex == -1 ? 0 : scriptsindex);
+
+			//mxd. Apply quick search settings
+			searchmatchcase.Checked = matchcase;
+			searchwholeword.Checked = matchwholeword;
+			searchbox_TextChanged(this, EventArgs.Empty);
+			
+			// If the map has remembered any compile errors, then show them
+			ShowErrors(General.Map.Errors);
+			
+			// Done
+			UpdateToolbar(true);
+		}
+		
+		// This applies user preferences
+		public void ApplySettings()
+		{
+			// Apply settings
+			//int panel2size = General.Settings.ReadSetting("scriptspanel.splitter", splitter.ClientRectangle.Height - splitter.SplitterDistance);
+			//splitter.SplitterDistance = splitter.ClientRectangle.Height - panel2size;
+			errorlist.Columns[0].Width = General.Settings.ReadSetting("scriptspanel.errorscolumn0width", errorlist.Columns[0].Width);
+			errorlist.Columns[1].Width = General.Settings.ReadSetting("scriptspanel.errorscolumn1width", errorlist.Columns[1].Width);
+			errorlist.Columns[2].Width = General.Settings.ReadSetting("scriptspanel.errorscolumn2width", errorlist.Columns[2].Width);
+		}
+		
+		// This saves user preferences
+		public void SaveSettings()
+		{
+			//General.Settings.WriteSetting("scriptspanel.splitter", splitter.ClientRectangle.Height - splitter.SplitterDistance);
+			General.Settings.WriteSetting("scriptspanel.errorscolumn0width", errorlist.Columns[0].Width);
+			General.Settings.WriteSetting("scriptspanel.errorscolumn1width", errorlist.Columns[1].Width);
+			General.Settings.WriteSetting("scriptspanel.errorscolumn2width", errorlist.Columns[2].Width);
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+
+		// Find Next
+		public void FindNext(FindReplaceOptions options)
+		{
+			// Save the options
+			findoptions = options;
+			FindNext();
+		}
+
+		// Find Next with saved options
+		public void FindNext()
+		{
+			if(!string.IsNullOrEmpty(findoptions.FindText) && (ActiveTab != null))
+			{
+				if(!ActiveTab.FindNext(findoptions))
+					DisplayStatus(ScriptStatusType.Warning, "Can't find any occurence of \"" + findoptions.FindText + "\".");
+			}
+			else
+			{
+				General.MessageBeep(MessageBeepType.Default);
+			}
+		}
+
+		// Find Previous
+		public void FindPrevious(FindReplaceOptions options) 
+		{
+			// Save the options
+			findoptions = options;
+			FindPrevious();
+		}
+
+		// Find Previous with saved options (mxd)
+		public void FindPrevious() 
+		{
+			if(!string.IsNullOrEmpty(findoptions.FindText) && (ActiveTab != null)) 
+			{
+				if(!ActiveTab.FindPrevious(findoptions))
+					DisplayStatus(ScriptStatusType.Warning, "Can't find any occurence of \"" + findoptions.FindText + "\".");
+			} 
+			else 
+			{
+				General.MessageBeep(MessageBeepType.Default);
+			}
+		}
+		
+		// Replace if possible
+		public void Replace(FindReplaceOptions options)
+		{
+			if(!string.IsNullOrEmpty(findoptions.FindText) && (options.ReplaceWith != null) && (ActiveTab != null))
+			{
+				if(string.Compare(ActiveTab.GetSelectedText(), options.FindText, !options.CaseSensitive) == 0)
+				{
+					// Replace selection
+					ActiveTab.ReplaceSelection(options.ReplaceWith);
+				}
+			}
+			else
+			{
+				General.MessageBeep(MessageBeepType.Default);
+			}
+		}
+		
+		// Replace all
+		public void ReplaceAll(FindReplaceOptions options)
+		{
+			int replacements = 0;
+			findoptions = options;
+			if(!string.IsNullOrEmpty(findoptions.FindText) && (options.ReplaceWith != null) && (ActiveTab != null))
+			{
+				int firstfindpos = -1;
+				int lastpos = -1;
+				bool firstreplace = true;
+				bool wrappedaround = false;
+				int selectionstart = Math.Min(ActiveTab.SelectionStart, ActiveTab.SelectionEnd);
+				
+				// Continue finding and replacing until nothing more found
+				while(ActiveTab.FindNext(findoptions))
+				{
+					int curpos = Math.Min(ActiveTab.SelectionStart, ActiveTab.SelectionEnd);
+					if(curpos <= lastpos)
+						wrappedaround = true;
+					
+					if(firstreplace)
+					{
+						// Remember where we started replacing
+						firstfindpos = curpos;
+					}
+					else if(wrappedaround)
+					{
+						// Make sure we don't go past our start point, or we could be in an endless loop
+						if(curpos >= firstfindpos)
+							break;
+					}
+					
+					Replace(findoptions);
+					replacements++;
+					firstreplace = false;
+
+					lastpos = curpos;
+				}
+
+				// Restore selection
+				ActiveTab.SelectionStart = selectionstart;
+				ActiveTab.SelectionEnd = selectionstart;
+				
+				// Show result
+				if(replacements == 0)
+					DisplayStatus(ScriptStatusType.Warning, "Can't find any occurence of \"" + findoptions.FindText + "\".");
+				else
+					DisplayStatus(ScriptStatusType.Info, "Replaced " + replacements + " occurences of \"" + findoptions.FindText + "\" with \"" + findoptions.ReplaceWith + "\".");
+			}
+			else
+			{
+				General.MessageBeep(MessageBeepType.Default);
+			}
+		}
+		
+		// This closed the Find & Replace subwindow
+		public void CloseFindReplace(bool closing)
+		{
+			if(findreplaceform != null)
+			{
+				if(!closing) findreplaceform.Close();
+				findreplaceform = null;
+			}
+		}
+
+		// This opens the Find & Replace subwindow
+		public void OpenFindAndReplace()
+		{
+			if(findreplaceform == null)
+				findreplaceform = new ScriptFindReplaceForm();
+
+			try
+			{
+				if(findreplaceform.Visible)
+					findreplaceform.Focus();
+				else
+					findreplaceform.Show(this.ParentForm);
+
+				if(ActiveTab.SelectionEnd != ActiveTab.SelectionStart)
+					findreplaceform.SetFindText(ActiveTab.GetSelectedText());
+			}
+			catch(Exception)
+			{
+				// If we can't pop up the find/replace form right now, thats just too bad.
+			}
+		}
+
+		// This refreshes all settings
+		public void RefreshSettings()
+		{
+			foreach(ScriptDocumentTab t in tabs.TabPages)
+			{
+				t.RefreshSettings();
+			}
+		}
+
+		// This clears all error marks and hides the errors list
+		public void ClearErrors()
+		{
+			// Hide list
+			splitter.Panel2Collapsed = true;
+			errorlist.Items.Clear();
+
+			// Clear marks
+			foreach(ScriptDocumentTab t in tabs.TabPages)
+			{
+				t.ClearMarks();
+			}
+		}
+		
+		// This shows the errors panel with the given errors
+		// Also updates the scripts with markers for the given errors
+		public void ShowErrors(IEnumerable<CompilerError> errors)
+		{
+			// Copy list
+			if(errors != null)
+				compilererrors = new List<CompilerError>(errors);
+			else
+				compilererrors = new List<CompilerError>();
+			
+			// Fill list
+			errorlist.BeginUpdate();
+			errorlist.Items.Clear();
+			int listindex = 1;
+			foreach(CompilerError e in compilererrors)
+			{
+				ListViewItem ei = new ListViewItem(listindex.ToString());
+				ei.ImageIndex = 0;
+				ei.SubItems.Add(e.description);
+				string filename = (e.filename.StartsWith("?") ? e.filename.Replace("?", "") : Path.GetFileName(e.filename)); //mxd
+				string linenumber = (e.linenumber != CompilerError.NO_LINE_NUMBER ? " (line " + (e.linenumber + 1) + ")" : String.Empty); //mxd
+				ei.SubItems.Add(filename + linenumber);
+				ei.Tag = e;
+				errorlist.Items.Add(ei);
+				listindex++;
+			}
+			errorlist.EndUpdate();
+			
+			// Show marks on scripts
+			foreach(ScriptDocumentTab t in tabs.TabPages)
+			{
+				t.MarkScriptErrors(compilererrors);
+			}
+			
+			// Show/hide panel
+			splitter.Panel2Collapsed = (errorlist.Items.Count == 0);
+		}
+		
+		// This writes all explicitly opened files to the configuration
+		public void WriteOpenFilesToConfiguration()
+		{
+			List<string> files = new List<string>();
+			foreach(ScriptDocumentTab t in tabs.TabPages)
+			{
+				if(t.ExplicitSave) files.Add(t.Filename);
+			}
+			General.Map.Options.ScriptFiles = files;
+		}
+		
+		// This asks to save files and returns the result
+		public bool AskSaveAll()
+		{
+			foreach(ScriptDocumentTab t in tabs.TabPages)
+			{
+				if(t.ExplicitSave)
+				{
+					if(!CloseScript(t, true)) return false;
+				}
+			}
+			
+			return true;
+		}
+		
+		// This closes a script and returns true when closed
+		private bool CloseScript(ScriptDocumentTab t, bool saveonly)
+		{
+			if(t.IsChanged)
+			{
+				// Ask to save
+				DialogResult result = MessageBox.Show(this.ParentForm, "Do you want to save changes to " + t.Text + "?", "Close File", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question);
+				switch(result)
+				{
+					case DialogResult.Yes:
+						if(!SaveScript(t)) return false;
+						break;
+					case DialogResult.Cancel:
+						return false;
+				}
+			}
+			
+			if(!saveonly)
+			{
+				//mxd. Select tab to the left of the one we are going to close
+				if(t == tabs.SelectedTab && tabs.SelectedIndex > 0)
+					tabs.SelectedIndex--;
+				
+				// Close file
+				tabs.TabPages.Remove(t);
+				t.Dispose();
+			}
+			return true;
+		}
+		
+		// This returns true when any of the implicit-save scripts are changed
+		public bool CheckImplicitChanges()
+		{
+			foreach(ScriptDocumentTab t in tabs.TabPages)
+			{
+				if(!t.ExplicitSave && t.IsChanged) return true;
+			}
+			return false;
+		}
+		
+		// This forces the focus to the script editor
+		public void ForceFocus()
+		{
+			ScriptDocumentTab t = (tabs.SelectedTab as ScriptDocumentTab);
+			tabs.Focus();
+			if(t != null) t.Focus();
+		}
+		
+		// This does an implicit save on all documents that use implicit saving
+		// Call this to save the lumps before disposing the panel!
+		public void ImplicitSave()
+		{
+			// Save all scripts
+			foreach(ScriptDocumentTab t in tabs.TabPages)
+			{
+				if(!t.ExplicitSave) t.Save();
+			}
+			
+			UpdateToolbar(false);
+		}
+		
+		// This updates the toolbar for the current status
+		private void UpdateToolbar(bool focuseditor)
+		{
+			int numscriptsopen = tabs.TabPages.Count;
+			int explicitsavescripts = 0;
+			ScriptDocumentTab t = null;
+			
+			// Any explicit save scripts?
+			foreach(ScriptDocumentTab dt in tabs.TabPages)
+				if(dt.ExplicitSave) explicitsavescripts++;
+			
+			// Get current script, if any are open
+			if(numscriptsopen > 0)
+				t = (tabs.SelectedTab as ScriptDocumentTab);
+			
+			// Enable/disable buttons
+			buttonsave.Enabled = (t != null) && t.ExplicitSave && t.IsChanged;
+			buttonsaveall.Enabled = (explicitsavescripts > 0);
+			buttoncompile.Enabled = (t != null) && (t.Config.Compiler != null);
+			buttonsearch.Enabled = (t != null); //mxd
+			buttonkeywordhelp.Enabled = (t != null) && !string.IsNullOrEmpty(t.Config.KeywordHelp);
+			buttonscriptconfig.Enabled = (t != null) && t.IsReconfigurable;
+			buttonundo.Enabled = (t != null);
+			buttonredo.Enabled = (t != null);
+			buttoncopy.Enabled = (t != null);
+			buttoncut.Enabled = (t != null);
+			buttonpaste.Enabled = (t != null);
+			buttonclose.Enabled = (t != null) && t.IsClosable;
+			buttonsnippets.DropDownItems.Clear(); //mxd
+			buttonsnippets.Enabled = (t != null) && t.Config.Snippets.Count > 0; //mxd
+			
+			if(t != null)
+			{
+				// Check the according script config in menu
+				foreach(ToolStripMenuItem item in buttonscriptconfig.DropDownItems)
+				{
+					ScriptConfiguration config = (item.Tag as ScriptConfiguration);
+					item.Checked = (config == t.Config);
+				}
+
+				//mxd. Add snippets
+				if(t.Config != null && t.Config.Snippets.Count > 0)
+				{
+					if(t.Config.Snippets.Count > 0) foreach(KeyValuePair<string, string[]> group in t.Config.Snippets) buttonsnippets.DropDownItems.Add(group.Key).Click += OnInsertSnippetClick;
+				}
+				
+				// Focus to script editor
+				if(focuseditor) ForceFocus();
+			}
+
+			//mxd. Update script type description
+			scripttype.Text = ((t != null && t.Config != null) ? t.Config.Description : "Plain Text");
+		}
+
+		//mxd
+		private int GetTabPageIndex(string title)
+		{
+			if(tabs.TabPages.Count == 0) return -1;
+
+			for(int i = 0; i < tabs.TabPages.Count; i++)
+			{
+				if(tabs.TabPages[i].Text == title) return i;
+			}
+
+			return -1;
+		}
+
+		// This opens the given file, returns null when failed
+		public ScriptFileDocumentTab OpenFile(string filename)
+		{
+			ScriptConfiguration foundconfig = new ScriptConfiguration();
+
+			// Find the most suitable script configuration to use
+			foreach(ScriptConfiguration cfg in scriptconfigs)
+			{
+				foreach(string ext in cfg.Extensions)
+				{
+					// Use this configuration if the extension matches
+					if(filename.EndsWith("." + ext, true, CultureInfo.InvariantCulture))
+					{
+						foundconfig = cfg;
+						break;
+					}
+				}
+			}
+
+			// Create new document
+			ScriptFileDocumentTab t = new ScriptFileDocumentTab(this, foundconfig);
+			if(t.Open(filename))
+			{
+				//mxd
+				ScriptType st = t.VerifyScriptType();
+				if(st != ScriptType.UNKNOWN) 
+				{
+					foreach(ScriptConfiguration cfg in scriptconfigs) 
+					{
+						if(cfg.ScriptType == st) 
+						{
+							t.ChangeScriptConfig(cfg);
+							break;
+						}
+					}
+				}
+				
+				// Mark any errors this script may have
+				if(compilererrors != null) t.MarkScriptErrors(compilererrors);
+
+				// Add to tabs
+				tabs.TabPages.Add(t);
+				tabs.SelectedTab = t;
+
+				// Done
+				t.OnTextChanged += tabpage_OnTextChanged; //mxd
+				t.IsChanged = false; //mxd. Not changed yet
+				UpdateToolbar(true);
+				return t;
+			}
+			else
+			{
+				// Failed
+				return null;
+			}
+		}
+
+		// This saves the current open script
+		public void ExplicitSaveCurrentTab()
+		{
+			ScriptDocumentTab t = (tabs.SelectedTab as ScriptDocumentTab);
+			if((t != null) && t.ExplicitSave)
+			{
+				buttonsave_Click(this, EventArgs.Empty);
+			}
+			else
+			{
+				General.MessageBeep(MessageBeepType.Default);
+			}
+		}
+		
+		// This opens a script
+		public void OpenBrowseScript()
+		{
+			buttonopen_Click(this, EventArgs.Empty);
+		}
+
+		//mxd. This launches keyword help website
+		public bool LaunchKeywordHelp() 
+		{
+			// Get script
+			ScriptDocumentTab t = (tabs.SelectedTab as ScriptDocumentTab);
+			return t.LaunchKeywordHelp();
+		}
+
+		//mxd. This changes status text
+		private void DisplayStatus(ScriptStatusType type, string message) { DisplayStatus(new ScriptStatusInfo(type, message)); }
+		private void DisplayStatus(ScriptStatusInfo newstatus)
+		{
+			// Stop timers
+			if(!newstatus.displayed)
+			{
+				statusresetter.Stop();
+				statusflasher.Stop();
+				statusflashicon = false;
+			}
+
+			// Determine what to do specifically for this status type
+			switch(newstatus.type)
+			{
+				// Shows information without flashing the icon.
+				case ScriptStatusType.Ready:
+				case ScriptStatusType.Info:
+					if(!newstatus.displayed)
+					{
+						statusresetter.Interval = MainForm.INFO_RESET_DELAY;
+						statusresetter.Start();
+					}
+					break;
+
+				// Shows a warning, makes a warning sound and flashes a warning icon.
+				case ScriptStatusType.Warning:
+					if(!newstatus.displayed)
+					{
+						General.MessageBeep(MessageBeepType.Warning);
+						statusflasher.Interval = MainForm.WARNING_FLASH_INTERVAL;
+						statusflashcount = MainForm.WARNING_FLASH_COUNT;
+						statusflasher.Start();
+						statusresetter.Interval = MainForm.WARNING_RESET_DELAY;
+						statusresetter.Start();
+					}
+					break;
+			}
+
+			// Update status description
+			status = newstatus;
+			status.displayed = true;
+			statuslabel.Text = status.message;
+
+			// Update icon as well
+			UpdateStatusIcon();
+
+			// Refresh
+			statusbar.Invalidate();
+			this.Update();
+		}
+
+		// This updates the status icon
+		private void UpdateStatusIcon()
+		{
+			int statusflashindex = (statusflashicon ? 1 : 0);
+
+			// Status type
+			switch(status.type)
+			{
+				case ScriptStatusType.Ready:
+				case ScriptStatusType.Info:
+					statuslabel.Image = General.MainWindow.STATUS_IMAGES[statusflashindex, 0];
+					break;
+
+				case ScriptStatusType.Busy:
+					statuslabel.Image = General.MainWindow.STATUS_IMAGES[statusflashindex, 2];
+					break;
+
+				case ScriptStatusType.Warning:
+					statuslabel.Image = General.MainWindow.STATUS_IMAGES[statusflashindex, 3];
+					break;
+
+				default:
+					throw new NotImplementedException("Unsupported Script Status Type!");
+			}
+		}
+		
+		#endregion
+		
+		#region ================== Events
+
+		// Called when the window that contains this panel closes
+		public void OnClose()
+		{
+			//mxd. Store quick search settings
+			matchcase = searchmatchcase.Checked;
+			matchwholeword = searchwholeword.Checked;
+
+			//mxd. Stop status timers
+			statusresetter.Stop();
+			statusflasher.Stop();
+			
+			// Close the sub windows now
+			if(findreplaceform != null) findreplaceform.Dispose();
+		}
+
+		// Keyword help requested
+		private void buttonkeywordhelp_Click(object sender, EventArgs e)
+		{
+			LaunchKeywordHelp();
+		}
+
+		// When the user changes the script configuration
+		private void buttonscriptconfig_Click(object sender, EventArgs e)
+		{
+			// Get the tab and new script config
+			ScriptDocumentTab t = (tabs.SelectedTab as ScriptDocumentTab);
+			ScriptConfiguration scriptconfig = ((sender as ToolStripMenuItem).Tag as ScriptConfiguration);
+			
+			// Change script config
+			t.ChangeScriptConfig(scriptconfig);
+
+			//mxd. Update script type description
+			scripttype.Text = scriptconfig.Description;
+
+			// Done
+			UpdateToolbar(true);
+		}
+		
+		// When new script is clicked
+		private void buttonnew_Click(object sender, EventArgs e)
+		{
+			// Get the script config to use
+			ScriptConfiguration scriptconfig = ((sender as ToolStripMenuItem).Tag as ScriptConfiguration);
+			
+			// Create new document
+			ScriptFileDocumentTab t = new ScriptFileDocumentTab(this, scriptconfig);
+			tabs.TabPages.Add(t);
+			tabs.SelectedTab = t;
+			
+			// Done
+			UpdateToolbar(true);
+		}
+		
+		// Open script clicked
+		private void buttonopen_Click(object sender, EventArgs e)
+		{
+			// Show open file dialog
+			if(openfile.ShowDialog(this.ParentForm) == DialogResult.OK)
+			{
+				//mxd. Gather already opened file names
+				List<string> openedfiles = new List<string>();
+				foreach(var page in tabs.TabPages)
+				{
+					var scriptpage = page as ScriptFileDocumentTab;
+					if(scriptpage != null) openedfiles.Add(scriptpage.Filename);
+				}
+
+				//mxd. Add new tabs
+				foreach(string name in openfile.FileNames)
+				{
+					if(!openedfiles.Contains(name)) OpenFile(name);
+				}
+
+				// Select the last new item
+				foreach(var page in tabs.TabPages)
+				{
+					var scriptpage = page as ScriptFileDocumentTab;
+					if(scriptpage != null && scriptpage.Filename == openfile.FileNames[openfile.FileNames.Length - 1])
+					{
+						tabs.SelectedTab = scriptpage;
+						break;
+					}
+				}
+			}
+		}
+
+		// Save script clicked
+		private void buttonsave_Click(object sender, EventArgs e)
+		{
+			// Save the current script
+			ScriptDocumentTab t = (tabs.SelectedTab as ScriptDocumentTab);
+			SaveScript(t);
+			UpdateToolbar(true);
+		}
+
+		// Save All clicked
+		private void buttonsaveall_Click(object sender, EventArgs e)
+		{
+			// Save all scripts
+			foreach(ScriptDocumentTab t in tabs.TabPages)
+			{
+				// Use explicit save for this script?
+				if(t.ExplicitSave)
+				{
+					if(!SaveScript(t)) break;
+				}
+			}
+			
+			UpdateToolbar(true);
+		}
+
+		// This is called by Save and Save All to save a script
+		// Returns false when cancelled by the user
+		private bool SaveScript(ScriptDocumentTab t)
+		{
+			// Do we have to do a save as?
+			if(t.IsSaveAsRequired)
+			{
+				// Setup save dialog
+				string scriptfilter = t.Config.Description + "|*." + string.Join(";*.", t.Config.Extensions);
+				savefile.Filter = scriptfilter + "|All files|*.*";
+				if(savefile.ShowDialog(this.ParentForm) == DialogResult.OK)
+				{
+					// Save to new filename
+					t.SaveAs(savefile.FileName);
+					return true;
+				}
+				else
+				{
+					// Cancelled
+					return false;
+				}
+			}
+			else
+			{
+				// Save to same filename
+				t.Save();
+				return true;
+			}
+		}
+		
+		// A tab is selected
+		private void tabs_Selecting(object sender, TabControlCancelEventArgs e)
+		{
+			UpdateToolbar(true);
+		}
+		
+		// This closes the current file
+		private void buttonclose_Click(object sender, EventArgs e)
+		{
+			ScriptDocumentTab t = (tabs.SelectedTab as ScriptDocumentTab);
+			CloseScript(t, false);
+			UpdateToolbar(true);
+		}
+		
+		// Compile Script clicked
+		private void buttoncompile_Click(object sender, EventArgs e)
+		{
+			// First save all implicit scripts to the temporary wad file
+			ImplicitSave();
+			
+			// Get script
+			ScriptDocumentTab t = (tabs.SelectedTab as ScriptDocumentTab);
+
+			// Check if it must be saved as a new file
+			if(t.ExplicitSave && t.IsSaveAsRequired)
+			{
+				// Save the script first!
+				if(MessageBox.Show(this.ParentForm, "You must save your script before you can compile it. Do you want to save your script now?", "Compile Script", MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.Yes)
+				{
+					if(!SaveScript(t)) return;
+				}
+				else
+				{
+					return;
+				}
+			}
+			else if(t.ExplicitSave && t.IsChanged)
+			{
+				// We can only compile when the script is saved
+				if(!SaveScript(t)) return;
+			}
+
+			// Compile now
+			DisplayStatus(ScriptStatusType.Busy, "Compiling script \"" + t.Text + "\"...");
+			Cursor.Current = Cursors.WaitCursor;
+			t.Compile();
+
+			// Show warning
+			if((compilererrors != null) && (compilererrors.Count > 0))
+				DisplayStatus(ScriptStatusType.Warning, compilererrors.Count + " errors while compiling \"" + t.Text + "\"!");
+			else
+				DisplayStatus(ScriptStatusType.Info, "Script \"" + t.Text + "\" compiled without errors.");
+
+			Cursor.Current = Cursors.Default;
+			UpdateToolbar(true);
+		}
+		
+		// Undo clicked
+		private void buttonundo_Click(object sender, EventArgs e)
+		{
+			ScriptDocumentTab t = (tabs.SelectedTab as ScriptDocumentTab);
+			t.Undo();
+			UpdateToolbar(true);
+		}
+		
+		// Redo clicked
+		private void buttonredo_Click(object sender, EventArgs e)
+		{
+			ScriptDocumentTab t = (tabs.SelectedTab as ScriptDocumentTab);
+			t.Redo();
+			UpdateToolbar(true);
+		}
+		
+		// Cut clicked
+		private void buttoncut_Click(object sender, EventArgs e)
+		{
+			ScriptDocumentTab t = (tabs.SelectedTab as ScriptDocumentTab);
+			t.Cut();
+			UpdateToolbar(true);
+		}
+		
+		// Copy clicked
+		private void buttoncopy_Click(object sender, EventArgs e)
+		{
+			ScriptDocumentTab t = (tabs.SelectedTab as ScriptDocumentTab);
+			t.Copy();
+			UpdateToolbar(true);
+		}
+
+		// Paste clicked
+		private void buttonpaste_Click(object sender, EventArgs e)
+		{
+			ScriptDocumentTab t = (tabs.SelectedTab as ScriptDocumentTab);
+			t.Paste();
+			UpdateToolbar(true);
+		}
+
+		//mxd. Search clicked
+		private void buttonsearch_Click(object sender, EventArgs e) 
+		{
+			OpenFindAndReplace();
+		}
+
+		//mxd
+		private void OnInsertSnippetClick(object sender, EventArgs eventArgs) 
+		{
+			ScriptDocumentTab t = (tabs.SelectedTab as ScriptDocumentTab);
+			t.InsertSnippet( t.Config.Snippets[((ToolStripItem)sender).Text] );
+		}
+		
+		// Mouse released on tabs
+		private void tabs_MouseUp(object sender, MouseEventArgs e)
+		{
+			ForceFocus();
+		}
+
+		//mxd
+		private void tabpage_OnTextChanged(object sender, EventArgs eventArgs)
+		{
+			if(tabs.SelectedTab != null)
+			{
+				ScriptDocumentTab curtab = tabs.SelectedTab as ScriptDocumentTab;
+				buttonsave.Enabled = (curtab != null && curtab.ExplicitSave && curtab.IsChanged);
+			}
+		}
+		
+		// User double-clicks and error in the list
+		private void errorlist_ItemActivate(object sender, EventArgs e)
+		{
+			// Anything selection?
+			if(errorlist.SelectedItems.Count > 0)
+			{
+				// Get the compiler error
+				CompilerError err = (CompilerError)errorlist.SelectedItems[0].Tag;
+				
+				// Show the tab with the script that matches
+				bool foundscript = false;
+				foreach(ScriptDocumentTab t in tabs.TabPages)
+				{
+					if(t.VerifyErrorForScript(err))
+					{
+						tabs.SelectedTab = t;
+						t.MoveToLine(err.linenumber);
+						foundscript = true;
+						break;
+					}
+				}
+
+				// If we don't have the script opened, see if we can find the file and open the script
+				if(!foundscript && File.Exists(err.filename))
+				{
+					ScriptDocumentTab t = OpenFile(err.filename);
+					if(t != null) t.MoveToLine(err.linenumber);
+				}
+				
+				ForceFocus();
+			}
+		}
+		
+		#endregion
+
+		#region ================== Quick Search (mxd)
+
+		private FindReplaceOptions GetQuickSearchOptions()
+		{
+			return new FindReplaceOptions 
+			{
+				CaseSensitive = searchmatchcase.Checked,
+				WholeWord = searchwholeword.Checked,
+				FindText = searchbox.Text
+			};
+		}
+
+		private void searchbox_TextChanged(object sender, EventArgs e)
+		{
+			bool success = (searchbox.Text.Length > 0 && ActiveTab.FindNext(GetQuickSearchOptions(), true));
+			searchbox.BackColor = ((success || searchbox.Text.Length == 0) ? SystemColors.Window : Color.MistyRose);
+			searchnext.Enabled = success;
+			searchprev.Enabled = success;
+		}
+
+		private void searchnext_Click(object sender, EventArgs e)
+		{
+			ActiveTab.FindNext(GetQuickSearchOptions());
+		}
+
+		private void searchprev_Click(object sender, EventArgs e) 
+		{
+			ActiveTab.FindPrevious(GetQuickSearchOptions());
+		}
+
+		//mxd. This flashes the status icon
+		private void statusflasher_Tick(object sender, EventArgs e)
+		{
+			statusflashicon = !statusflashicon;
+			UpdateStatusIcon();
+			statusflashcount--;
+			if(statusflashcount == 0) statusflasher.Stop();
+		}
+
+		//mxd. This resets the status to ready
+		private void statusresetter_Tick(object sender, EventArgs e)
+		{
+			DisplayStatus(ScriptStatusType.Ready, null);
+		}
+
+		#endregion
+		
+	}
+}
diff --git a/Source/Core/Controls/ScriptEditorPanel.resx b/Source/Core/Controls/ScriptEditorPanel.resx
new file mode 100644
index 0000000..d050159
--- /dev/null
+++ b/Source/Core/Controls/ScriptEditorPanel.resx
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="tabs.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="toolbar.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="toolbar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="openfile.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>103, 17</value>
+  </metadata>
+  <metadata name="savefile.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>194, 17</value>
+  </metadata>
+  <metadata name="splitter.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="label1.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="errorlist.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="errorimages.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>283, 17</value>
+  </metadata>
+  <data name="errorimages.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
+        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
+        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADI
+        BQAAAk1TRnQBSQFMAwEBAAGMAQABjAEAARABAAEQAQAE/wEhAQAI/wFCAU0BNgcAATYDAAEoAwABQAMA
+        ARADAAEBAQABIAYAARD/ACMAAc8B2AHyAf8BTwFnAbkB/wEYATMBkwH/ARABJgFsAf8BCQEfAWMB/wEJ
+        ASMBgQH/AT4BVAGkAf8BzwHYAfIB/9wAAYEBlAHUAf8BIwFCAawB/wERATYBuAH/AQEBMQHQAf8BAAEu
+        AeIB/wEAASsB3AH/AQABKAG9Af8BAAEfAZYB/wEAARoBgQH/AVwBbgGyAf/UAAGJAZ0B3AH/ATABTwG7
+        Af8BEQFBAd0B/wEAATkB+gH/AQABNgH5Af8BPAFnAfgB/wE8AWcB+AH/AQABLgHqAf8BAAErAeQB/wEA
+        ASQBtgH/AQABGgGBAf8BXAFuAbIB/8wAAc8B2AHyAf8BRQFgAcYB/wEjAU8B4wH/ARABRwH9Af8BEAFH
+        Af0B/wFLAYEB/gH/A/4B/wP+Af8BTgGBAfoB/wEAAS8B7gH/AQABKwHkAf8BAAEkAbYB/wEAARoBgQH/
+        Ac8B2AHyAf/IAAGnAbYB5QH/AUIBZQHZAf8BIQFUAv8BIgFWAv8BIQFUAv8BWgGLAv8D/gH/A/4B/wFF
+        AW4B+wH/AQABMwH4Af8BAAEvAe4B/wEAASsB5AH/AQABHwGWAf8BPgFUAaQB/8gAAWUBiQHVAf8BQQFo
+        Ae4B/wEzAWIC/wE2AWQC/wEzAWIC/wEuAV8C/wFeAY4C/wFVAYYC/wEQAUcB/QH/AQIBPQH7Af8BAAEz
+        AfgB/wEAAS4B6gH/AQABKAG9Af8BCQEjAYEB/8gAAYEBlAHRAf8BRQFuAfsB/wFHAYEC/wFLAYEB/gH/
+        AUcBgQL/AVUBhgL/A/4B/wP+Af8BMwFiAv8BDQFFAfsB/wEAATkB+gH/AQABMAHzAf8BAAErAdwB/wEJ
+        AR8BYwH/yAABigGbAdQB/wFVAYYB+wH/AVoBiwL/AV4BjgL/AVoBiwL/AZcBsQL/A/4B/wP+Af8BbgGa
+        Av8BFgFMAf0B/wECAT0B+wH/AQABMwH4Af8BAAEuAeIB/wEQASYBbAH/yAABiQGdAdwB/wFuAZYB8gH/
+        AW4BmgL/AYEBnAL/AW4BmgL/AbEBxAL/A/4B/wP+Af8BogG4Af4B/wEdAVEB/gH/AQ0BRQH7Af8BAAE2
+        AfkB/wEBATEB0AH/ARgBMwGTAf/IAAGnAbYB5QH/AY0BowHlAf8BhwGkAv8BjQGoAv8BhwGkAv8BxQHT
+        Af4B/wP+Af8D/gH/AbUBxwH+Af8BIQFUAv8BEAFHAf0B/wEAATkB+gH/AREBNgG4Af8BWQGAAboB/8gA
+        Ac8B2AHyAf8BlwGnAd0B/wGVAasB8QH/AZcBsQL/AY0BqAL/AakBvgL/A/4B/wP+Af8BgwGhAv8BIgFW
+        Av8BEAFHAf0B/wERAUEB3QH/ASMBQgGsAf8BzwHYAfIB/8wAAbQBwgHsAf8BmwGqAd0B/wGVAasB8QH/
+        AYcBpAL/AW4BmgL/AVoBiwL/AUcBgQL/ATMBYgL/ASIBVgL/ASMBTwHjAf8BMAFPAbsB/wFqAYwB1AH/
+        1AABtAHCAewB/wGXAacB3QH/AY0BowHlAf8BbgGWAfIB/wFVAYYB+wH/AUUBbgH7Af8BQQFoAe4B/wFC
+        AWUB2QH/AUUBYAHGAf8BgQGVAdwB/9wAAcwB2AH+Af8BnQGtAeAB/wGJAZ0B3AH/AYoBmwHUAf8BgQGU
+        AdEB/wFlAYkB1QH/AYEBlAHRAf8BzAHYAf4B//8A0QABQgFNAT4HAAE+AwABKAMAAUADAAEQAwABAQEA
+        AQEFAAGAFwAD/wEAAv8GAAHwAQ8GAAHgAQcGAAHAAQMGAAGAAQEGAAGAAQEGAAGAAQEGAAGAAQEGAAGA
+        AQEGAAGAAQEGAAGAAQEGAAGAAQEGAAHAAQMGAAHgAQcGAAHwAQ8GAAL/BgAL
+</value>
+  </data>
+  <metadata name="statusbar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>400, 17</value>
+  </metadata>
+  <metadata name="statusflasher.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>501, 17</value>
+  </metadata>
+  <metadata name="statusresetter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>588, 17</value>
+  </metadata>
+  <metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Controls/ScriptFileDocumentTab.cs b/Source/Core/Controls/ScriptFileDocumentTab.cs
new file mode 100644
index 0000000..96f6f5e
--- /dev/null
+++ b/Source/Core/Controls/ScriptFileDocumentTab.cs
@@ -0,0 +1,368 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Compilers;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.GZBuilder.GZDoom;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Controls
+{
+	internal sealed class ScriptFileDocumentTab : ScriptDocumentTab
+	{
+		#region ================== Constants
+
+		#endregion
+		
+		#region ================== Variables
+		
+		private string filepathname;
+		
+		#endregion
+		
+		#region ================== Properties
+		
+		public override bool IsSaveAsRequired { get { return (filepathname.Length == 0); } }
+		public override string Filename { get { return filepathname; } }
+		
+		#endregion
+		
+		#region ================== Constructor / Disposer
+		
+		// Constructor
+		public ScriptFileDocumentTab(ScriptEditorPanel panel, ScriptConfiguration config) : base(panel)
+		{
+			string ext = "";
+			
+			// Initialize
+			this.filepathname = "";
+			this.config = config;
+			editor.SetupStyles(config);
+			if(config.Extensions.Length > 0) ext = "." + config.Extensions[0];
+			SetTitle("Untitled" + ext);
+			editor.ClearUndoRedo();
+			navigator.Enabled = (config.ScriptType != ScriptType.UNKNOWN); //mxd
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+		
+		// This compiles the script file
+		public override void Compile()
+		{
+			//mxd. ACS requires special handling...
+			if(config.ScriptType == ScriptType.ACS)
+			{
+				CompileACS();
+				return;
+			}
+
+			Compiler compiler;
+			List<CompilerError> errors = new List<CompilerError>();
+			
+			try
+			{
+				// Initialize compiler
+				compiler = config.Compiler.Create();
+			}
+			catch(Exception e)
+			{
+				// Fail
+				errors.Add(new CompilerError("Unable to initialize compiler. " + e.GetType().Name + ": " + e.Message));
+				panel.ShowErrors(errors); //mxd
+				return;
+			}
+			
+			// Copy the source file into the temporary directory
+			string inputfile = Path.Combine(compiler.Location, Path.GetFileName(filepathname));
+			File.Copy(filepathname, inputfile);
+			
+			// Make random output filename
+			string outputfile = General.MakeTempFilename(compiler.Location, "tmp");
+
+			// Run compiler
+			compiler.Parameters = config.Parameters;
+			compiler.InputFile = Path.GetFileName(inputfile);
+			compiler.OutputFile = Path.GetFileName(outputfile);
+			compiler.SourceFile = filepathname;
+			compiler.WorkingDirectory = Path.GetDirectoryName(inputfile);
+			if(compiler.Run())
+			{
+				// Fetch errors
+				foreach(CompilerError e in compiler.Errors)
+				{
+					CompilerError newerr = e;
+
+					// If the error's filename equals our temporary file,
+					// replace it with the original source filename
+					if(string.Compare(e.filename, inputfile, true) == 0)
+						newerr.filename = filepathname;
+
+					errors.Add(newerr);
+				}
+			}
+			
+			// Dispose compiler
+			compiler.Dispose();
+
+			//mxd. Update script navigator
+			UpdateNavigator();
+			
+			// Feed errors to panel
+			panel.ShowErrors(errors);
+		}
+
+		//mxd. ACS requires special handling...
+		private void CompileACS()
+		{
+			Compiler compiler;
+			List<CompilerError> errors = new List<CompilerError>();
+			string inputfile = Path.GetFileName(filepathname);
+
+			// Which compiler to use?
+			ScriptConfiguration scriptconfig;
+			if(!string.IsNullOrEmpty(General.Map.Options.ScriptCompiler))
+			{
+				// Boilderplate
+				if(!General.CompiledScriptConfigs.ContainsKey(General.Map.Options.ScriptCompiler))
+				{
+					General.ShowErrorMessage("Unable to compile '" + inputfile + "'. Unable to find required script compiler configuration ('" + General.Map.Options.ScriptCompiler + "').", MessageBoxButtons.OK);
+					return;
+				}
+
+				scriptconfig = General.CompiledScriptConfigs[General.Map.Options.ScriptCompiler];
+			}
+			else
+			{
+				scriptconfig = config;
+			}
+
+			// Initialize compiler
+			try
+			{
+				compiler = scriptconfig.Compiler.Create();
+			}
+			catch(Exception e)
+			{
+				// Fail
+				errors.Add(new CompilerError("Unable to initialize compiler. " + e.GetType().Name + ": " + e.Message));
+				panel.ShowErrors(errors);
+				return;
+			}
+
+			// Preprocess the file
+			AcsParserSE parser = new AcsParserSE { OnInclude = (se, path, includetype) => se.Parse(General.Map.Data.LoadFile(path), path, true, includetype, false) };
+			using(FileStream stream = File.OpenRead(filepathname))
+			{
+				if(!parser.Parse(stream, filepathname, scriptconfig.Compiler.Files, true, AcsParserSE.IncludeType.NONE, false))
+				{
+					// Check for errors
+					if(parser.HasError)
+					{
+						errors.Add(new CompilerError(parser.ErrorDescription, parser.ErrorSource, parser.ErrorLine));
+						panel.ShowErrors(errors);
+					}
+
+					compiler.Dispose();
+					return;
+				}
+			}
+
+			//mxd. Only works for libraries
+			if(!parser.IsLibrary)
+			{
+				errors.Add(new CompilerError("External ACS files can only be compiled as libraries!", filepathname));
+				panel.ShowErrors(errors);
+				compiler.Dispose();
+				return;
+			}
+
+			// Make random output filename
+			string outputfile = General.MakeTempFilename(compiler.Location, "tmp");
+
+			// Run compiler
+			compiler.Parameters = config.Parameters;
+			compiler.InputFile = inputfile;
+			compiler.OutputFile = outputfile;
+			compiler.SourceFile = filepathname;
+			compiler.WorkingDirectory = Path.GetDirectoryName(filepathname);
+			compiler.Includes = parser.Includes;
+			compiler.CopyIncludesToWorkingDirectory = false;
+			if(compiler.Run())
+			{
+				// Fetch errors
+				foreach(CompilerError e in compiler.Errors)
+				{
+					CompilerError newerr = e;
+
+					// If the error's filename equals our temporary file,
+					// replace it with the original source filename
+					if(string.Compare(e.filename, inputfile, true) == 0)
+						newerr.filename = filepathname;
+
+					errors.Add(newerr);
+				}
+
+				// No errors and output file exists?
+				if(compiler.Errors.Length == 0)
+				{
+					// Output file exists?
+					if(!File.Exists(outputfile))
+					{
+						// Fail
+						compiler.Dispose();
+						errors.Add(new CompilerError("Output file '" + outputfile + "' doesn't exist."));
+						panel.ShowErrors(errors);
+						return;
+					}
+
+					// Rename and copy to source file directory
+					string targetfilename = Path.Combine(Path.GetDirectoryName(filepathname), parser.LibraryName + ".o");
+					try
+					{
+						File.Copy(outputfile, targetfilename, true);
+					}
+					catch(Exception e)
+					{
+						// Fail
+						compiler.Dispose();
+						errors.Add(new CompilerError("Unable to create library file '" + targetfilename + "'. " + e.GetType().Name + ": " + e.Message));
+						panel.ShowErrors(errors);
+						return;
+					}
+				}
+			}
+
+			// Dispose compiler
+			compiler.Dispose();
+
+			// Update script navigator
+			UpdateNavigator();
+
+			// Feed errors to panel
+			panel.ShowErrors(errors);
+		}
+
+		// This checks if a script error applies to this script
+		public override bool VerifyErrorForScript(CompilerError e)
+		{
+			return (string.Compare(e.filename, filepathname, true) == 0);
+		}
+		
+		// This saves the document (used for both explicit and implicit)
+		// Return true when successfully saved
+		public override bool Save()
+		{
+			try
+			{
+				// Write the file
+				File.WriteAllBytes(filepathname, editor.GetText());
+			}
+			catch(Exception e)
+			{
+				// Failed
+				General.ErrorLogger.Add(ErrorType.Error, "Cannot open file '" + filepathname + "' for writing. Make sure the path exists and that the file is not in use by another application.");
+				General.WriteLogLine(e.GetType().Name + ": " + e.Message);
+				General.ShowErrorMessage("Unable to open file \"" + filepathname + "\" for writing. Make sure the path exists and that the file is not in use by another application.", MessageBoxButtons.OK);
+				return false;
+			}
+			
+			// Done
+			editor.IsChanged = false;
+			UpdateTitle(); //mxd
+			return true;
+		}
+		
+		// This saves the document to a new file
+		// Return true when successfully saved
+		public override bool SaveAs(string filename)
+		{
+			string oldfilename = filepathname;
+			filepathname = filename;
+			if(this.Save())
+			{
+				SetTitle(Path.GetFileName(filepathname));
+				return true;
+			}
+			else
+			{
+				this.filepathname = oldfilename;
+				return false;
+			}
+		}
+		
+		// This opens a file and returns true when successful
+		public bool Open(string filepathname)
+		{
+			try
+			{
+				// Read the file
+				editor.SetText(File.ReadAllBytes(filepathname));
+			}
+			catch(Exception e)
+			{
+				// Failed
+				General.ErrorLogger.Add(ErrorType.Error, "Cannot open file '" + filepathname + "' for reading. Make sure the path exists and that the file is not in use by another application.");
+				General.WriteLogLine(e.GetType().Name + ": " + e.Message);
+				General.ShowErrorMessage("Unable to open file \"" + filepathname + "\" for reading. Make sure the path exists and that the file is not in use by another application.", MessageBoxButtons.OK);
+				return false;
+			}
+			
+			// Setup
+			this.filepathname = filepathname;
+			editor.ClearUndoRedo();
+			editor.IsChanged = false; //mxd. Not changed yet
+			SetTitle(Path.GetFileName(filepathname));
+			UpdateNavigator(); //mxd
+
+			return true;
+		}
+
+		// This changes the script configurations
+		public override void ChangeScriptConfig(ScriptConfiguration newconfig)
+		{
+			this.config = newconfig;
+			editor.SetupStyles(config);
+
+			if(filepathname.Length == 0)
+			{
+				string ext = (config.Extensions.Length > 0 ? "." + config.Extensions[0] : "");
+				SetTitle("Untitled" + ext);
+			}
+			else
+			{
+				UpdateTitle(); //mxd
+			}
+
+			//mxd
+			base.ChangeScriptConfig(newconfig);
+		}
+		
+		#endregion
+		
+		#region ================== Events
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Controls/ScriptLumpDocumentTab.cs b/Source/Core/Controls/ScriptLumpDocumentTab.cs
new file mode 100644
index 0000000..404db73
--- /dev/null
+++ b/Source/Core/Controls/ScriptLumpDocumentTab.cs
@@ -0,0 +1,136 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Config;
+using System.IO;
+using CodeImp.DoomBuilder.Compilers;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Controls
+{
+	internal sealed class ScriptLumpDocumentTab : ScriptDocumentTab
+	{
+		#region ================== Constants
+		
+		#endregion
+
+		#region ================== Variables
+
+		private readonly string lumpname;
+		private readonly bool ismapheader;
+		
+		#endregion
+		
+		#region ================== Properties
+		
+		public override bool ExplicitSave { get { return false; } }
+		public override bool IsSaveAsRequired { get { return false; } }
+		public override bool IsClosable { get { return false; } }
+		public override bool IsReconfigurable { get { return false; } }
+		public override string Filename { get { return lumpname; } } //mxd
+		
+		#endregion
+		
+		#region ================== Constructor / Disposer
+		
+		// Constructor
+		public ScriptLumpDocumentTab(ScriptEditorPanel panel, string lumpname, ScriptConfiguration config) : base(panel)
+		{
+			// Initialize
+			if(lumpname == MapManager.CONFIG_MAP_HEADER)
+			{
+				this.lumpname = MapManager.TEMP_MAP_HEADER;
+				this.ismapheader = true;
+			}
+			else
+			{
+				this.lumpname = lumpname;
+				this.ismapheader = false;
+			}
+			
+			this.config = config;
+			editor.SetupStyles(config);
+			
+			// Load the lump data
+			MemoryStream stream = General.Map.GetLumpData(this.lumpname);
+			if(stream != null)
+			{
+				editor.SetText(stream.ToArray());
+				editor.ClearUndoRedo();
+				UpdateNavigator(); //mxd
+			}
+
+			// Set title
+			IsChanged = false; //mxd. Not changed yet
+			SetTitle(ismapheader ? General.Map.Options.CurrentName : this.lumpname.ToUpper());
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+		
+		// Compile script
+		public override void Compile()
+		{
+			//mxd. List of errors. UpdateScriptNames can return errors and also updates acs includes list
+			List<CompilerError> errors = (config.ScriptType == ScriptType.ACS ? General.Map.UpdateScriptNames() : new List<CompilerError>());
+
+			//mxd. Errors already?..
+			if(errors.Count > 0)
+			{
+				// Feed errors to panel
+				panel.ShowErrors(errors);
+				return;
+			}
+
+			// Compile
+			General.Map.CompileLump((ismapheader ? MapManager.CONFIG_MAP_HEADER : lumpname), true);
+			
+			//mxd. Update script navigator
+			UpdateNavigator();
+
+			// Feed errors to panel
+			panel.ShowErrors(General.Map.Errors);
+		}
+		
+		// Implicit save
+		public override bool Save()
+		{
+			// Store the lump data
+			MemoryStream stream = new MemoryStream(editor.GetText());
+			General.Map.SetLumpData(lumpname, stream);
+			editor.IsChanged = false;
+			UpdateTitle(); //mxd
+			return true;
+		}
+
+		// This checks if a script error applies to this script
+		public override bool VerifyErrorForScript(CompilerError e)
+		{
+			return (string.Compare(e.filename, "?" + lumpname, true) == 0);
+		}
+		
+		#endregion
+		
+		#region ================== Events
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Controls/SectorInfoPanel.Designer.cs b/Source/Core/Controls/SectorInfoPanel.Designer.cs
new file mode 100644
index 0000000..10e8512
--- /dev/null
+++ b/Source/Core/Controls/SectorInfoPanel.Designer.cs
@@ -0,0 +1,609 @@
+namespace CodeImp.DoomBuilder.Controls
+{
+	partial class SectorInfoPanel
+	{
+		/// <summary> 
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Component Designer generated code
+
+		/// <summary> 
+		/// Required method for Designer support - do not modify 
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			System.Windows.Forms.Label label13;
+			System.Windows.Forms.Label label5;
+			this.labelfloor = new System.Windows.Forms.Label();
+			this.labelceiling = new System.Windows.Forms.Label();
+			this.taglabel = new System.Windows.Forms.Label();
+			this.effectlabel = new System.Windows.Forms.Label();
+			this.ceilingLightLabel = new System.Windows.Forms.Label();
+			this.ceilingScaleLabel = new System.Windows.Forms.Label();
+			this.ceilingAngleLabel = new System.Windows.Forms.Label();
+			this.ceilingOffsetLabel = new System.Windows.Forms.Label();
+			this.floorOffsetLabel = new System.Windows.Forms.Label();
+			this.floorLightLabel = new System.Windows.Forms.Label();
+			this.floorAngleLabel = new System.Windows.Forms.Label();
+			this.floorScaleLabel = new System.Windows.Forms.Label();
+			this.sectorinfo = new System.Windows.Forms.GroupBox();
+			this.panelFadeColor = new System.Windows.Forms.Panel();
+			this.panelLightColor = new System.Windows.Forms.Panel();
+			this.labelFade = new System.Windows.Forms.Label();
+			this.labelLight = new System.Windows.Forms.Label();
+			this.brightness = new System.Windows.Forms.Label();
+			this.height = new System.Windows.Forms.Label();
+			this.tag = new System.Windows.Forms.Label();
+			this.floor = new System.Windows.Forms.Label();
+			this.ceiling = new System.Windows.Forms.Label();
+			this.effect = new System.Windows.Forms.Label();
+			this.ceilingLight = new System.Windows.Forms.Label();
+			this.ceilingScale = new System.Windows.Forms.Label();
+			this.ceilingAngle = new System.Windows.Forms.Label();
+			this.ceilingOffset = new System.Windows.Forms.Label();
+			this.ceilingpanel = new System.Windows.Forms.GroupBox();
+			this.ceilingname = new System.Windows.Forms.Label();
+			this.ceilingtex = new System.Windows.Forms.Panel();
+			this.labelCeilTextureSize = new System.Windows.Forms.Label();
+			this.floorpanel = new System.Windows.Forms.GroupBox();
+			this.floorLight = new System.Windows.Forms.Label();
+			this.floorScale = new System.Windows.Forms.Label();
+			this.floorOffset = new System.Windows.Forms.Label();
+			this.floorAngle = new System.Windows.Forms.Label();
+			this.floorname = new System.Windows.Forms.Label();
+			this.floortex = new System.Windows.Forms.Panel();
+			this.labelFloorTextureSize = new System.Windows.Forms.Label();
+			this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
+			this.flagsPanel = new System.Windows.Forms.GroupBox();
+			this.flags = new System.Windows.Forms.ListView();
+			label13 = new System.Windows.Forms.Label();
+			label5 = new System.Windows.Forms.Label();
+			this.sectorinfo.SuspendLayout();
+			this.ceilingpanel.SuspendLayout();
+			this.ceilingtex.SuspendLayout();
+			this.floorpanel.SuspendLayout();
+			this.floortex.SuspendLayout();
+			this.flowLayoutPanel1.SuspendLayout();
+			this.flagsPanel.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// label13
+			// 
+			label13.Location = new System.Drawing.Point(183, 64);
+			label13.Name = "label13";
+			label13.Size = new System.Drawing.Size(70, 14);
+			label13.TabIndex = 14;
+			label13.Text = "Brightness:";
+			label13.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// label5
+			// 
+			label5.Location = new System.Drawing.Point(8, 64);
+			label5.Name = "label5";
+			label5.Size = new System.Drawing.Size(44, 14);
+			label5.TabIndex = 8;
+			label5.Text = "Height:";
+			label5.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// labelfloor
+			// 
+			this.labelfloor.Location = new System.Drawing.Point(8, 49);
+			this.labelfloor.Name = "labelfloor";
+			this.labelfloor.Size = new System.Drawing.Size(44, 14);
+			this.labelfloor.TabIndex = 3;
+			this.labelfloor.Text = "Floor:";
+			this.labelfloor.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// labelceiling
+			// 
+			this.labelceiling.Location = new System.Drawing.Point(8, 34);
+			this.labelceiling.Name = "labelceiling";
+			this.labelceiling.Size = new System.Drawing.Size(44, 14);
+			this.labelceiling.TabIndex = 2;
+			this.labelceiling.Text = "Ceiling:";
+			this.labelceiling.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// taglabel
+			// 
+			this.taglabel.Location = new System.Drawing.Point(8, 79);
+			this.taglabel.Name = "taglabel";
+			this.taglabel.Size = new System.Drawing.Size(44, 14);
+			this.taglabel.TabIndex = 4;
+			this.taglabel.Text = "Tag:";
+			this.taglabel.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// labelEffect
+			// 
+			this.effectlabel.Location = new System.Drawing.Point(8, 19);
+			this.effectlabel.Name = "effectlabel";
+			this.effectlabel.Size = new System.Drawing.Size(44, 14);
+			this.effectlabel.TabIndex = 0;
+			this.effectlabel.Text = "Effect:";
+			this.effectlabel.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// ceilingLightLabel
+			// 
+			this.ceilingLightLabel.Location = new System.Drawing.Point(77, 63);
+			this.ceilingLightLabel.Name = "ceilingLightLabel";
+			this.ceilingLightLabel.Size = new System.Drawing.Size(45, 14);
+			this.ceilingLightLabel.TabIndex = 27;
+			this.ceilingLightLabel.Text = "Light:";
+			this.ceilingLightLabel.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// ceilingScaleLabel
+			// 
+			this.ceilingScaleLabel.Location = new System.Drawing.Point(77, 47);
+			this.ceilingScaleLabel.Name = "ceilingScaleLabel";
+			this.ceilingScaleLabel.Size = new System.Drawing.Size(45, 14);
+			this.ceilingScaleLabel.TabIndex = 26;
+			this.ceilingScaleLabel.Text = "Scale:";
+			this.ceilingScaleLabel.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// ceilingAngleLabel
+			// 
+			this.ceilingAngleLabel.Location = new System.Drawing.Point(77, 31);
+			this.ceilingAngleLabel.Name = "ceilingAngleLabel";
+			this.ceilingAngleLabel.Size = new System.Drawing.Size(45, 14);
+			this.ceilingAngleLabel.TabIndex = 24;
+			this.ceilingAngleLabel.Text = "Angle:";
+			this.ceilingAngleLabel.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// ceilingOffsetLabel
+			// 
+			this.ceilingOffsetLabel.Location = new System.Drawing.Point(77, 15);
+			this.ceilingOffsetLabel.Name = "ceilingOffsetLabel";
+			this.ceilingOffsetLabel.Size = new System.Drawing.Size(45, 14);
+			this.ceilingOffsetLabel.TabIndex = 22;
+			this.ceilingOffsetLabel.Text = "Offset:";
+			this.ceilingOffsetLabel.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// floorOffsetLabel
+			// 
+			this.floorOffsetLabel.Location = new System.Drawing.Point(77, 15);
+			this.floorOffsetLabel.Name = "floorOffsetLabel";
+			this.floorOffsetLabel.Size = new System.Drawing.Size(45, 14);
+			this.floorOffsetLabel.TabIndex = 22;
+			this.floorOffsetLabel.Text = "Offset:";
+			this.floorOffsetLabel.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// floorLightLabel
+			// 
+			this.floorLightLabel.Location = new System.Drawing.Point(77, 63);
+			this.floorLightLabel.Name = "floorLightLabel";
+			this.floorLightLabel.Size = new System.Drawing.Size(45, 14);
+			this.floorLightLabel.TabIndex = 27;
+			this.floorLightLabel.Text = "Light:";
+			this.floorLightLabel.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// floorAngleLabel
+			// 
+			this.floorAngleLabel.Location = new System.Drawing.Point(77, 31);
+			this.floorAngleLabel.Name = "floorAngleLabel";
+			this.floorAngleLabel.Size = new System.Drawing.Size(45, 14);
+			this.floorAngleLabel.TabIndex = 24;
+			this.floorAngleLabel.Text = "Angle:";
+			this.floorAngleLabel.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// floorScaleLabel
+			// 
+			this.floorScaleLabel.Location = new System.Drawing.Point(77, 47);
+			this.floorScaleLabel.Name = "floorScaleLabel";
+			this.floorScaleLabel.Size = new System.Drawing.Size(45, 14);
+			this.floorScaleLabel.TabIndex = 26;
+			this.floorScaleLabel.Text = "Scale:";
+			this.floorScaleLabel.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// sectorinfo
+			// 
+			this.sectorinfo.Controls.Add(this.panelFadeColor);
+			this.sectorinfo.Controls.Add(this.panelLightColor);
+			this.sectorinfo.Controls.Add(this.labelFade);
+			this.sectorinfo.Controls.Add(this.labelLight);
+			this.sectorinfo.Controls.Add(this.brightness);
+			this.sectorinfo.Controls.Add(label13);
+			this.sectorinfo.Controls.Add(this.height);
+			this.sectorinfo.Controls.Add(label5);
+			this.sectorinfo.Controls.Add(this.tag);
+			this.sectorinfo.Controls.Add(this.floor);
+			this.sectorinfo.Controls.Add(this.ceiling);
+			this.sectorinfo.Controls.Add(this.taglabel);
+			this.sectorinfo.Controls.Add(this.labelfloor);
+			this.sectorinfo.Controls.Add(this.labelceiling);
+			this.sectorinfo.Controls.Add(this.effect);
+			this.sectorinfo.Controls.Add(this.effectlabel);
+			this.sectorinfo.Location = new System.Drawing.Point(0, 0);
+			this.sectorinfo.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
+			this.sectorinfo.Name = "sectorinfo";
+			this.sectorinfo.Size = new System.Drawing.Size(300, 100);
+			this.sectorinfo.TabIndex = 2;
+			this.sectorinfo.TabStop = false;
+			this.sectorinfo.Text = " Sector ";
+			// 
+			// panelFadeColor
+			// 
+			this.panelFadeColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+			this.panelFadeColor.Location = new System.Drawing.Point(260, 50);
+			this.panelFadeColor.Name = "panelFadeColor";
+			this.panelFadeColor.Size = new System.Drawing.Size(20, 12);
+			this.panelFadeColor.TabIndex = 21;
+			// 
+			// panelLightColor
+			// 
+			this.panelLightColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+			this.panelLightColor.Location = new System.Drawing.Point(260, 35);
+			this.panelLightColor.Name = "panelLightColor";
+			this.panelLightColor.Size = new System.Drawing.Size(20, 12);
+			this.panelLightColor.TabIndex = 20;
+			// 
+			// labelFade
+			// 
+			this.labelFade.Location = new System.Drawing.Point(183, 49);
+			this.labelFade.Name = "labelFade";
+			this.labelFade.Size = new System.Drawing.Size(70, 14);
+			this.labelFade.TabIndex = 19;
+			this.labelFade.Text = "Fade:";
+			this.labelFade.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// labelLight
+			// 
+			this.labelLight.Location = new System.Drawing.Point(183, 34);
+			this.labelLight.Name = "labelLight";
+			this.labelLight.Size = new System.Drawing.Size(70, 14);
+			this.labelLight.TabIndex = 18;
+			this.labelLight.Text = "Light:";
+			this.labelLight.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// brightness
+			// 
+			this.brightness.Location = new System.Drawing.Point(257, 64);
+			this.brightness.Name = "brightness";
+			this.brightness.Size = new System.Drawing.Size(38, 14);
+			this.brightness.TabIndex = 17;
+			this.brightness.Text = "0";
+			// 
+			// height
+			// 
+			this.height.Location = new System.Drawing.Point(55, 64);
+			this.height.Name = "height";
+			this.height.Size = new System.Drawing.Size(38, 14);
+			this.height.TabIndex = 11;
+			this.height.Text = "0";
+			// 
+			// tag
+			// 
+			this.tag.Location = new System.Drawing.Point(55, 79);
+			this.tag.Name = "tag";
+			this.tag.Size = new System.Drawing.Size(239, 14);
+			this.tag.TabIndex = 7;
+			this.tag.Text = "0";
+			// 
+			// floor
+			// 
+			this.floor.Location = new System.Drawing.Point(55, 49);
+			this.floor.Name = "floor";
+			this.floor.Size = new System.Drawing.Size(42, 14);
+			this.floor.TabIndex = 6;
+			this.floor.Text = "360";
+			// 
+			// ceiling
+			// 
+			this.ceiling.Location = new System.Drawing.Point(55, 34);
+			this.ceiling.Name = "ceiling";
+			this.ceiling.Size = new System.Drawing.Size(42, 14);
+			this.ceiling.TabIndex = 5;
+			this.ceiling.Text = "1024";
+			// 
+			// effect
+			// 
+			this.effect.AutoSize = true;
+			this.effect.Location = new System.Drawing.Point(55, 19);
+			this.effect.Name = "effect";
+			this.effect.Size = new System.Drawing.Size(123, 13);
+			this.effect.TabIndex = 1;
+			this.effect.Text = "0 - Whacky Pool of Fluid";
+			// 
+			// ceilingLight
+			// 
+			this.ceilingLight.AutoSize = true;
+			this.ceilingLight.Location = new System.Drawing.Point(124, 63);
+			this.ceilingLight.Name = "ceilingLight";
+			this.ceilingLight.Size = new System.Drawing.Size(13, 13);
+			this.ceilingLight.TabIndex = 29;
+			this.ceilingLight.Text = "--";
+			// 
+			// ceilingScale
+			// 
+			this.ceilingScale.AutoSize = true;
+			this.ceilingScale.Location = new System.Drawing.Point(124, 47);
+			this.ceilingScale.Name = "ceilingScale";
+			this.ceilingScale.Size = new System.Drawing.Size(25, 13);
+			this.ceilingScale.TabIndex = 28;
+			this.ceilingScale.Text = "--, --";
+			// 
+			// ceilingAngle
+			// 
+			this.ceilingAngle.AutoSize = true;
+			this.ceilingAngle.Location = new System.Drawing.Point(124, 31);
+			this.ceilingAngle.Name = "ceilingAngle";
+			this.ceilingAngle.Size = new System.Drawing.Size(13, 13);
+			this.ceilingAngle.TabIndex = 25;
+			this.ceilingAngle.Text = "--";
+			// 
+			// ceilingOffset
+			// 
+			this.ceilingOffset.AutoSize = true;
+			this.ceilingOffset.Location = new System.Drawing.Point(124, 15);
+			this.ceilingOffset.Name = "ceilingOffset";
+			this.ceilingOffset.Size = new System.Drawing.Size(25, 13);
+			this.ceilingOffset.TabIndex = 23;
+			this.ceilingOffset.Text = "--, --";
+			// 
+			// ceilingpanel
+			// 
+			this.ceilingpanel.Controls.Add(this.ceilingOffsetLabel);
+			this.ceilingpanel.Controls.Add(this.ceilingOffset);
+			this.ceilingpanel.Controls.Add(this.ceilingLight);
+			this.ceilingpanel.Controls.Add(this.ceilingAngleLabel);
+			this.ceilingpanel.Controls.Add(this.ceilingAngle);
+			this.ceilingpanel.Controls.Add(this.ceilingScaleLabel);
+			this.ceilingpanel.Controls.Add(this.ceilingScale);
+			this.ceilingpanel.Controls.Add(this.ceilingLightLabel);
+			this.ceilingpanel.Controls.Add(this.ceilingname);
+			this.ceilingpanel.Controls.Add(this.ceilingtex);
+			this.ceilingpanel.Location = new System.Drawing.Point(506, 0);
+			this.ceilingpanel.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
+			this.ceilingpanel.Name = "ceilingpanel";
+			this.ceilingpanel.Size = new System.Drawing.Size(200, 100);
+			this.ceilingpanel.TabIndex = 3;
+			this.ceilingpanel.TabStop = false;
+			this.ceilingpanel.Text = " Ceiling ";
+			// 
+			// ceilingname
+			// 
+			this.ceilingname.AutoSize = true;
+			this.ceilingname.Location = new System.Drawing.Point(6, 81);
+			this.ceilingname.Name = "ceilingname";
+			this.ceilingname.Size = new System.Drawing.Size(73, 13);
+			this.ceilingname.TabIndex = 1;
+			this.ceilingname.Text = "BROWNHUG";
+			// 
+			// ceilingtex
+			// 
+			this.ceilingtex.BackColor = System.Drawing.SystemColors.AppWorkspace;
+			this.ceilingtex.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
+			this.ceilingtex.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+			this.ceilingtex.Controls.Add(this.labelCeilTextureSize);
+			this.ceilingtex.Location = new System.Drawing.Point(7, 14);
+			this.ceilingtex.Name = "ceilingtex";
+			this.ceilingtex.Size = new System.Drawing.Size(64, 64);
+			this.ceilingtex.TabIndex = 0;
+			// 
+			// labelCeilTextureSize
+			// 
+			this.labelCeilTextureSize.AutoSize = true;
+			this.labelCeilTextureSize.BackColor = System.Drawing.Color.Black;
+			this.labelCeilTextureSize.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.labelCeilTextureSize.ForeColor = System.Drawing.Color.White;
+			this.labelCeilTextureSize.Location = new System.Drawing.Point(1, 1);
+			this.labelCeilTextureSize.MaximumSize = new System.Drawing.Size(0, 13);
+			this.labelCeilTextureSize.Name = "labelCeilTextureSize";
+			this.labelCeilTextureSize.Size = new System.Drawing.Size(48, 13);
+			this.labelCeilTextureSize.TabIndex = 1;
+			this.labelCeilTextureSize.Text = "128x128";
+			// 
+			// floorpanel
+			// 
+			this.floorpanel.Controls.Add(this.floorLight);
+			this.floorpanel.Controls.Add(this.floorOffsetLabel);
+			this.floorpanel.Controls.Add(this.floorLightLabel);
+			this.floorpanel.Controls.Add(this.floorScale);
+			this.floorpanel.Controls.Add(this.floorOffset);
+			this.floorpanel.Controls.Add(this.floorAngleLabel);
+			this.floorpanel.Controls.Add(this.floorScaleLabel);
+			this.floorpanel.Controls.Add(this.floorAngle);
+			this.floorpanel.Controls.Add(this.floorname);
+			this.floorpanel.Controls.Add(this.floortex);
+			this.floorpanel.Location = new System.Drawing.Point(303, 0);
+			this.floorpanel.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
+			this.floorpanel.Name = "floorpanel";
+			this.floorpanel.Size = new System.Drawing.Size(200, 100);
+			this.floorpanel.TabIndex = 4;
+			this.floorpanel.TabStop = false;
+			this.floorpanel.Text = " Floor ";
+			// 
+			// floorLight
+			// 
+			this.floorLight.AutoSize = true;
+			this.floorLight.Location = new System.Drawing.Point(124, 63);
+			this.floorLight.Name = "floorLight";
+			this.floorLight.Size = new System.Drawing.Size(13, 13);
+			this.floorLight.TabIndex = 29;
+			this.floorLight.Text = "--";
+			// 
+			// floorScale
+			// 
+			this.floorScale.AutoSize = true;
+			this.floorScale.Location = new System.Drawing.Point(124, 47);
+			this.floorScale.Name = "floorScale";
+			this.floorScale.Size = new System.Drawing.Size(25, 13);
+			this.floorScale.TabIndex = 28;
+			this.floorScale.Text = "--, --";
+			// 
+			// floorOffset
+			// 
+			this.floorOffset.AutoSize = true;
+			this.floorOffset.Location = new System.Drawing.Point(124, 15);
+			this.floorOffset.Name = "floorOffset";
+			this.floorOffset.Size = new System.Drawing.Size(25, 13);
+			this.floorOffset.TabIndex = 23;
+			this.floorOffset.Text = "--, --";
+			// 
+			// floorAngle
+			// 
+			this.floorAngle.AutoSize = true;
+			this.floorAngle.Location = new System.Drawing.Point(124, 31);
+			this.floorAngle.Name = "floorAngle";
+			this.floorAngle.Size = new System.Drawing.Size(13, 13);
+			this.floorAngle.TabIndex = 25;
+			this.floorAngle.Text = "--";
+			// 
+			// floorname
+			// 
+			this.floorname.AutoSize = true;
+			this.floorname.Location = new System.Drawing.Point(6, 81);
+			this.floorname.Name = "floorname";
+			this.floorname.Size = new System.Drawing.Size(73, 13);
+			this.floorname.TabIndex = 1;
+			this.floorname.Text = "BROWNHUG";
+			// 
+			// floortex
+			// 
+			this.floortex.BackColor = System.Drawing.SystemColors.AppWorkspace;
+			this.floortex.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
+			this.floortex.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+			this.floortex.Controls.Add(this.labelFloorTextureSize);
+			this.floortex.Location = new System.Drawing.Point(7, 14);
+			this.floortex.Name = "floortex";
+			this.floortex.Size = new System.Drawing.Size(64, 64);
+			this.floortex.TabIndex = 0;
+			// 
+			// labelFloorTextureSize
+			// 
+			this.labelFloorTextureSize.AutoSize = true;
+			this.labelFloorTextureSize.BackColor = System.Drawing.Color.Black;
+			this.labelFloorTextureSize.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.labelFloorTextureSize.ForeColor = System.Drawing.Color.White;
+			this.labelFloorTextureSize.Location = new System.Drawing.Point(1, 1);
+			this.labelFloorTextureSize.MaximumSize = new System.Drawing.Size(0, 13);
+			this.labelFloorTextureSize.Name = "labelFloorTextureSize";
+			this.labelFloorTextureSize.Size = new System.Drawing.Size(48, 13);
+			this.labelFloorTextureSize.TabIndex = 0;
+			this.labelFloorTextureSize.Text = "128x128";
+			// 
+			// flowLayoutPanel1
+			// 
+			this.flowLayoutPanel1.Controls.Add(this.sectorinfo);
+			this.flowLayoutPanel1.Controls.Add(this.floorpanel);
+			this.flowLayoutPanel1.Controls.Add(this.ceilingpanel);
+			this.flowLayoutPanel1.Controls.Add(this.flagsPanel);
+			this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 0);
+			this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(0);
+			this.flowLayoutPanel1.Name = "flowLayoutPanel1";
+			this.flowLayoutPanel1.Size = new System.Drawing.Size(1400, 100);
+			this.flowLayoutPanel1.TabIndex = 5;
+			this.flowLayoutPanel1.WrapContents = false;
+			// 
+			// flagsPanel
+			// 
+			this.flagsPanel.Controls.Add(this.flags);
+			this.flagsPanel.Location = new System.Drawing.Point(709, 0);
+			this.flagsPanel.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
+			this.flagsPanel.Name = "flagsPanel";
+			this.flagsPanel.Size = new System.Drawing.Size(455, 100);
+			this.flagsPanel.TabIndex = 7;
+			this.flagsPanel.TabStop = false;
+			this.flagsPanel.Text = " Flags";
+			// 
+			// flags
+			// 
+			this.flags.BackColor = System.Drawing.SystemColors.Control;
+			this.flags.BorderStyle = System.Windows.Forms.BorderStyle.None;
+			this.flags.CheckBoxes = true;
+			this.flags.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
+			this.flags.Location = new System.Drawing.Point(6, 18);
+			this.flags.Name = "flags";
+			this.flags.Scrollable = false;
+			this.flags.ShowGroups = false;
+			this.flags.Size = new System.Drawing.Size(443, 73);
+			this.flags.TabIndex = 0;
+			this.flags.UseCompatibleStateImageBehavior = false;
+			this.flags.View = System.Windows.Forms.View.List;
+			// 
+			// SectorInfoPanel
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.Controls.Add(this.flowLayoutPanel1);
+			this.MaximumSize = new System.Drawing.Size(10000, 100);
+			this.MinimumSize = new System.Drawing.Size(100, 100);
+			this.Name = "SectorInfoPanel";
+			this.Size = new System.Drawing.Size(1400, 100);
+			this.sectorinfo.ResumeLayout(false);
+			this.sectorinfo.PerformLayout();
+			this.ceilingpanel.ResumeLayout(false);
+			this.ceilingpanel.PerformLayout();
+			this.ceilingtex.ResumeLayout(false);
+			this.ceilingtex.PerformLayout();
+			this.floorpanel.ResumeLayout(false);
+			this.floorpanel.PerformLayout();
+			this.floortex.ResumeLayout(false);
+			this.floortex.PerformLayout();
+			this.flowLayoutPanel1.ResumeLayout(false);
+			this.flagsPanel.ResumeLayout(false);
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Label brightness;
+		private System.Windows.Forms.Label height;
+		private System.Windows.Forms.Label tag;
+		private System.Windows.Forms.Label floor;
+		private System.Windows.Forms.Label ceiling;
+		private System.Windows.Forms.Label effect;
+		private System.Windows.Forms.GroupBox ceilingpanel;
+		private System.Windows.Forms.Label ceilingname;
+		private System.Windows.Forms.Panel ceilingtex;
+		private System.Windows.Forms.GroupBox floorpanel;
+		private System.Windows.Forms.Label floorname;
+		private System.Windows.Forms.Panel floortex;
+		private System.Windows.Forms.GroupBox sectorinfo;
+		private System.Windows.Forms.Label ceilingLight;
+		private System.Windows.Forms.Label ceilingScale;
+		private System.Windows.Forms.Label ceilingAngle;
+		private System.Windows.Forms.Label ceilingOffset;
+		private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
+		private System.Windows.Forms.Label floorLight;
+		private System.Windows.Forms.Label floorScale;
+		private System.Windows.Forms.Label floorOffset;
+		private System.Windows.Forms.Label floorAngle;
+		private System.Windows.Forms.Label ceilingLightLabel;
+		private System.Windows.Forms.Label ceilingScaleLabel;
+		private System.Windows.Forms.Label ceilingAngleLabel;
+		private System.Windows.Forms.Label ceilingOffsetLabel;
+		private System.Windows.Forms.Label floorOffsetLabel;
+		private System.Windows.Forms.Label floorLightLabel;
+		private System.Windows.Forms.Label floorAngleLabel;
+		private System.Windows.Forms.Label floorScaleLabel;
+		private System.Windows.Forms.Label labelCeilTextureSize;
+		private System.Windows.Forms.Label labelFloorTextureSize;
+		private System.Windows.Forms.Panel panelFadeColor;
+		private System.Windows.Forms.Panel panelLightColor;
+		private System.Windows.Forms.Label labelFade;
+		private System.Windows.Forms.Label labelLight;
+		private System.Windows.Forms.GroupBox flagsPanel;
+		private System.Windows.Forms.ListView flags;
+		private System.Windows.Forms.Label taglabel;
+		private System.Windows.Forms.Label effectlabel;
+		private System.Windows.Forms.Label labelfloor;
+		private System.Windows.Forms.Label labelceiling;
+	}
+}
diff --git a/Source/Core/Controls/SectorInfoPanel.cs b/Source/Core/Controls/SectorInfoPanel.cs
new file mode 100644
index 0000000..66b0cf2
--- /dev/null
+++ b/Source/Core/Controls/SectorInfoPanel.cs
@@ -0,0 +1,405 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Drawing;
+using System.Globalization;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Data;
+using CodeImp.DoomBuilder.Rendering;
+using System.Collections.Generic;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Controls
+{
+	internal partial class SectorInfoPanel : UserControl
+	{
+		private readonly List<Label> floorinfolabels;
+		private readonly List<Label> ceilinfolabels;
+		private readonly List<Label> floorlabels;
+		private readonly List<Label> ceillabels;
+		
+		// Constructor
+		public SectorInfoPanel()
+		{
+			// Initialize
+			InitializeComponent();
+
+			//mxd
+			labelFloorTextureSize.BackColor = Color.FromArgb(128, labelFloorTextureSize.BackColor);
+			labelCeilTextureSize.BackColor = Color.FromArgb(128, labelCeilTextureSize.BackColor);
+
+			floorinfolabels = new List<Label> { floorAngle, floorLight, floorOffset, floorScale };
+			ceilinfolabels = new List<Label> { ceilingAngle, ceilingLight, ceilingOffset, ceilingScale };
+			floorlabels = new List<Label> { floorAngleLabel, floorLightLabel, floorOffsetLabel, floorScaleLabel };
+			ceillabels = new List<Label> { ceilingAngleLabel, ceilingLightLabel, ceilingOffsetLabel, ceilingScaleLabel };
+		}
+
+		// This shows the info
+		public void ShowInfo(Sector s, bool highlightceiling, bool highlightfloor)
+		{
+			int sheight = s.CeilHeight - s.FloorHeight;
+
+			// Lookup effect description in config
+			string effectinfo = s.Effect + " - " + General.Map.Config.GetSectorEffectInfo(s.Effect).Title; //mxd
+
+			// Sector info
+			sectorinfo.Text = " Sector " + s.Index + " (" + (s.Sidedefs == null ? "no" : s.Sidedefs.Count.ToString()) + " sidedefs)"; //mxd
+			effect.Text = effectinfo;
+			ceiling.Text = s.CeilHeight.ToString();
+			floor.Text = s.FloorHeight.ToString();
+			height.Text = sheight.ToString();
+			brightness.Text = s.Brightness.ToString();
+			floorname.Text = s.FloorTexture;
+			ceilingname.Text = s.CeilTexture;
+
+			//mxd. Set tags
+			if(s.Tags.Count > 1)
+			{
+				string[] tags = new string[s.Tags.Count];
+				for(int i = 0; i < s.Tags.Count; i++) tags[i] = s.Tags[i].ToString();
+				tag.Text = string.Join(", ", tags);
+				tag.Enabled = true;
+				taglabel.Enabled = true;
+				taglabel.Text = "Tags:";
+			}
+			else
+			{
+				tag.Text = s.Tag + (General.Map.Options.TagLabels.ContainsKey(s.Tag) ? " - " + General.Map.Options.TagLabels[s.Tag] : string.Empty);
+				tag.Enabled = (s.Tag != 0);
+				taglabel.Enabled = (s.Tag != 0);
+				taglabel.Text = "Tag:";
+			}
+
+			//mxd
+			effect.Enabled = (s.Effect != 0);
+			effectlabel.Enabled = (s.Effect != 0);
+
+			//mxd. Texture size
+			if(s.LongFloorTexture == MapSet.EmptyLongName)
+			{
+				labelFloorTextureSize.Visible = false;
+				General.DisplayZoomedImage(floortex, Properties.Resources.MissingTexture);
+			} 
+			else 
+			{
+				ImageData image = General.Map.Data.GetFlatImage(s.FloorTexture);
+				DisplayTextureSize(labelFloorTextureSize, image);
+				General.DisplayZoomedImage(floortex, image.GetPreview());
+			}
+
+			if(s.LongCeilTexture == MapSet.EmptyLongName) 
+			{
+				labelCeilTextureSize.Visible = false;
+				General.DisplayZoomedImage(ceilingtex, Properties.Resources.MissingTexture);
+			} 
+			else 
+			{
+				ImageData image = General.Map.Data.GetFlatImage(s.CeilTexture);
+				DisplayTextureSize(labelCeilTextureSize, image); //mxd
+				General.DisplayZoomedImage(ceilingtex, image.GetPreview());
+			}
+
+			//mxd
+			bool showExtededFloorInfo = false;
+			bool showExtededCeilingInfo = false;
+			if(General.Map.UDMF) 
+			{
+				if(s.Fields != null) 
+				{
+					//sector colors
+					labelLight.Visible = true;
+					labelFade.Visible = true;
+					panelLightColor.Visible = true;
+					panelFadeColor.Visible = true;
+
+					if(s.Fields.ContainsKey("lightcolor")) 
+					{
+						panelLightColor.BackColor = PixelColor.FromInt(s.Fields.GetValue("lightcolor", 0xFFFFFF)).WithAlpha(255).ToColor();
+						labelLight.Enabled = true;
+					} 
+					else 
+					{
+						panelLightColor.BackColor = SystemColors.Control;
+						labelLight.Enabled = false;
+					}
+
+					if(s.Fields.ContainsKey("fadecolor")) 
+					{
+						panelFadeColor.BackColor = PixelColor.FromInt(s.Fields.GetValue("fadecolor", 0)).WithAlpha(255).ToColor();
+						labelFade.Enabled = true;
+					} 
+					else 
+					{
+						panelFadeColor.BackColor = SystemColors.Control;
+						labelFade.Enabled = false;
+					}
+
+					//light
+					if(s.Fields.ContainsKey("lightceiling") || s.Fields.ContainsKey("lightceilingabsolute")) 
+					{
+						showExtededCeilingInfo = true;
+						ceilingLight.Enabled = true;
+						ceilingLightLabel.Enabled = true;
+
+						int cl = s.Fields.GetValue("lightceiling", 0);
+
+						if(s.Fields.GetValue("lightceilingabsolute", false))
+							ceilingLight.Text = cl + " (abs.)";
+						else
+							ceilingLight.Text = cl + " (" + Math.Min(255, Math.Max(0, (cl + s.Brightness))) + ")";
+
+					} 
+					else 
+					{
+						ceilingLight.Text = "--";
+						ceilingLight.Enabled = false;
+						ceilingLightLabel.Enabled = false;
+					}
+
+					if(s.Fields.ContainsKey("lightfloor") || s.Fields.ContainsKey("lightfloorabsolute")) 
+					{
+						showExtededFloorInfo = true;
+						floorLight.Enabled = true;
+						floorLightLabel.Enabled = true;
+
+						int fl = s.Fields.GetValue("lightfloor", 0);
+
+						if(s.Fields.GetValue("lightfloorabsolute", false))
+							floorLight.Text = fl + " (abs.)";
+						else
+							floorLight.Text = fl + " (" + Math.Min(255, Math.Max(0, (fl + s.Brightness))) + ")";
+
+					} 
+					else 
+					{
+						floorLight.Text = "--";
+						floorLight.Enabled = false;
+						floorLightLabel.Enabled = false;
+					}
+
+					//ceiling offsets
+					float panX = s.Fields.GetValue("xpanningceiling", 0f);
+					float panY = s.Fields.GetValue("ypanningceiling", 0f);
+
+					if(panX != 0 || panY != 0) 
+					{
+						showExtededCeilingInfo = true;
+						ceilingOffset.Enabled = true;
+						ceilingOffsetLabel.Enabled = true;
+						ceilingOffset.Text = panX.ToString(CultureInfo.InvariantCulture) + ", " + panY.ToString(CultureInfo.InvariantCulture);
+					} 
+					else 
+					{
+						ceilingOffset.Text = "--, --";
+						ceilingOffset.Enabled = false;
+						ceilingOffsetLabel.Enabled = false;
+					}
+
+					//floor offsets
+					panX = s.Fields.GetValue("xpanningfloor", 0f);
+					panY = s.Fields.GetValue("ypanningfloor", 0f);
+
+					if(panX != 0 || panY != 0) 
+					{
+						showExtededFloorInfo = true;
+						floorOffset.Enabled = true;
+						floorOffsetLabel.Enabled = true;
+						floorOffset.Text = panX.ToString(CultureInfo.InvariantCulture) + ", " + panY.ToString(CultureInfo.InvariantCulture);
+					} 
+					else 
+					{
+						floorOffset.Text = "--, --";
+						floorOffset.Enabled = false;
+						floorOffsetLabel.Enabled = false;
+					}
+
+					//ceiling scale
+					float scaleX = s.Fields.GetValue("xscaleceiling", 1.0f);
+					float scaleY = s.Fields.GetValue("yscaleceiling", 1.0f);
+
+					if(scaleX != 1.0f || scaleY != 1.0f) 
+					{
+						showExtededCeilingInfo = true;
+						ceilingScale.Enabled = true;
+						ceilingScaleLabel.Enabled = true;
+						ceilingScale.Text = scaleX.ToString(CultureInfo.InvariantCulture) + ", " + scaleY.ToString(CultureInfo.InvariantCulture);
+					} 
+					else 
+					{
+						ceilingScale.Text = "--, --";
+						ceilingScale.Enabled = false;
+						ceilingScaleLabel.Enabled = false;
+					}
+
+					//floor scale
+					scaleX = s.Fields.GetValue("xscalefloor", 1.0f);
+					scaleY = s.Fields.GetValue("yscalefloor", 1.0f);
+
+					if(scaleX != 1.0f || scaleY != 1.0f) 
+					{
+						showExtededFloorInfo = true;
+						floorScale.Enabled = true;
+						floorScaleLabel.Enabled = true;
+						floorScale.Text = scaleX.ToString(CultureInfo.InvariantCulture) + ", " + scaleY.ToString(CultureInfo.InvariantCulture);
+					} 
+					else 
+					{
+						floorScale.Text = "--, --";
+						floorScale.Enabled = false;
+						floorScaleLabel.Enabled = false;
+					}
+
+					//rotation
+					if(s.Fields.ContainsKey("rotationceiling")) 
+					{
+						showExtededCeilingInfo = true;
+						ceilingAngle.Enabled = true;
+						ceilingAngleLabel.Enabled = true;
+						ceilingAngle.Text = s.Fields["rotationceiling"].Value + "\u00B0";
+					} 
+					else 
+					{
+						ceilingAngle.Text = "--";
+						ceilingAngle.Enabled = false;
+						ceilingAngleLabel.Enabled = false;
+					}
+
+					if(s.Fields.ContainsKey("rotationfloor")) 
+					{
+						showExtededFloorInfo = true;
+						floorAngle.Enabled = true;
+						floorAngleLabel.Enabled = true;
+						floorAngle.Text = s.Fields["rotationfloor"].Value + "\u00B0";
+					} 
+					else 
+					{
+						floorAngle.Text = "--";
+						floorAngle.Enabled = false;
+						floorAngleLabel.Enabled = false;
+					}
+				}
+
+				//Flags
+				flags.Items.Clear();
+				foreach(KeyValuePair<string, string> group in General.Map.Config.SectorFlags) 
+				{
+					if(s.Flags.ContainsKey(group.Key) && s.Flags[group.Key])
+						flags.Items.Add(new ListViewItem(group.Value) { Checked = true });
+				}
+
+				//mxd. Flags panel visibility and size
+				flagsPanel.Visible = (flags.Items.Count > 0);
+				if(flags.Items.Count > 0) 
+				{
+					flags.Width = flags.GetItemRect(0).Width * (int)Math.Ceiling(flags.Items.Count / 4.0f);
+					flagsPanel.Width = flags.Width + flags.Left * 2;
+				}
+
+				//mxd. Toggle visibility
+				foreach(Label label in floorinfolabels) label.Visible = showExtededFloorInfo;
+				foreach(Label label in floorlabels) label.Visible = showExtededFloorInfo;
+				foreach(Label label in ceilinfolabels) label.Visible = showExtededCeilingInfo;
+				foreach(Label label in ceillabels) label.Visible = showExtededCeilingInfo;
+			} 
+			else 
+			{
+				panelFadeColor.Visible = false;
+				panelLightColor.Visible = false;
+				labelFade.Visible = false;
+				labelLight.Visible = false;
+				flagsPanel.Visible = false;
+			}
+
+			//mxd. Resize panels
+			UpdateTexturePanel(ceilingpanel, ceilingname, ceilinfolabels, ceilingtex, ceilingOffsetLabel.Location.X - 1, showExtededCeilingInfo);
+			UpdateTexturePanel(floorpanel, floorname, floorinfolabels, floortex, floorOffsetLabel.Location.X - 1, showExtededFloorInfo);
+
+			//mxd. Highlight ceiling or floor?
+			Color floorhighlightcolor = (highlightfloor ? SystemColors.HotTrack : SystemColors.WindowText);
+			Color ceilinghighlightcolor = (highlightceiling ? SystemColors.HotTrack : SystemColors.WindowText);
+			
+			floorpanel.ForeColor = floorhighlightcolor;
+			floor.ForeColor = floorhighlightcolor;
+			labelfloor.ForeColor = floorhighlightcolor;
+
+			ceilingpanel.ForeColor = ceilinghighlightcolor;
+			ceiling.ForeColor = ceilinghighlightcolor;
+			labelceiling.ForeColor = ceilinghighlightcolor;
+
+			// Show the whole thing
+			this.Show();
+			this.Update();
+		}
+
+		//mxd
+		private static void UpdateTexturePanel(GroupBox panel, Label texturename, List<Label> proplabels, Panel image, int sizeref, bool extendedinfoshown)
+		{
+			//Reposition texture name label?
+			if(texturename.Width < image.Width + 2) 
+				texturename.Location = new Point(image.Location.X + (image.Width - texturename.Width) / 2, texturename.Location.Y);
+			else 
+				texturename.Location = new Point(image.Location.X - 1, texturename.Location.Y);
+			
+			// Resize panel
+			if(!extendedinfoshown)
+				panel.Width = Math.Max(texturename.Right + image.Location.X - 1, sizeref);
+			else
+				panel.Width = Math.Max(texturename.Right, GetMaxRight(proplabels)) + image.Location.X;
+		}
+
+		//mxd
+		private static int GetMaxRight(IEnumerable<Label> labels)
+		{
+			int max = 0;
+			foreach(Label label in labels) if(label.Right > max) max = label.Right;
+			return max;
+		}
+
+		//mxd
+		private static void DisplayTextureSize(Label label, ImageData texture) 
+		{
+			if(General.Settings.ShowTextureSizes && texture.ImageState == ImageLoadState.Ready 
+				&& !string.IsNullOrEmpty(texture.Name) && !(texture is UnknownImage)) 
+			{
+				label.Visible = true;
+				label.Text = Math.Abs(texture.ScaledWidth) + "x" + Math.Abs(texture.ScaledHeight);
+			} 
+			else 
+			{
+				label.Visible = false;
+			}
+		}
+
+		// When visible changed
+		protected override void OnVisibleChanged(EventArgs e)
+		{
+			// Hiding panels
+			if(!this.Visible)
+			{
+				floortex.BackgroundImage = null;
+				ceilingtex.BackgroundImage = null;
+			}
+
+			// Call base
+			base.OnVisibleChanged(e);
+		}
+	}
+}
diff --git a/Source/Core/Controls/SectorInfoPanel.resx b/Source/Core/Controls/SectorInfoPanel.resx
new file mode 100644
index 0000000..a3bf4d6
--- /dev/null
+++ b/Source/Core/Controls/SectorInfoPanel.resx
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="label13.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label5.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Controls/SectorSlopeControl.Designer.cs b/Source/Core/Controls/SectorSlopeControl.Designer.cs
new file mode 100644
index 0000000..c86519c
--- /dev/null
+++ b/Source/Core/Controls/SectorSlopeControl.Designer.cs
@@ -0,0 +1,233 @@
+namespace CodeImp.DoomBuilder.Controls
+{
+	partial class SectorSlopeControl
+	{
+		/// <summary> 
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing) 
+		{
+			if(disposing && (components != null)) 
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Component Designer generated code
+
+		/// <summary> 
+		/// Required method for Designer support - do not modify 
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent() 
+		{
+			this.label23 = new System.Windows.Forms.Label();
+			this.label24 = new System.Windows.Forms.Label();
+			this.reset = new System.Windows.Forms.Button();
+			this.label18 = new System.Windows.Forms.Label();
+			this.angletrackbar = new System.Windows.Forms.TrackBar();
+			this.label1 = new System.Windows.Forms.Label();
+			this.pivotmodeselector = new System.Windows.Forms.ComboBox();
+			this.rotationcontrol = new CodeImp.DoomBuilder.GZBuilder.Controls.AngleControl();
+			this.slopeangle = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.sloperotation = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.slopeoffset = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.cbuselineangles = new System.Windows.Forms.CheckBox();
+			((System.ComponentModel.ISupportInitialize)(this.angletrackbar)).BeginInit();
+			this.SuspendLayout();
+			// 
+			// label23
+			// 
+			this.label23.Location = new System.Drawing.Point(3, 83);
+			this.label23.Name = "label23";
+			this.label23.Size = new System.Drawing.Size(76, 14);
+			this.label23.TabIndex = 28;
+			this.label23.Text = "Slope angle:";
+			this.label23.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// label24
+			// 
+			this.label24.Location = new System.Drawing.Point(3, 53);
+			this.label24.Name = "label24";
+			this.label24.Size = new System.Drawing.Size(76, 14);
+			this.label24.TabIndex = 26;
+			this.label24.Text = "Rotation:";
+			this.label24.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// reset
+			// 
+			this.reset.Location = new System.Drawing.Point(85, 138);
+			this.reset.Name = "reset";
+			this.reset.Size = new System.Drawing.Size(82, 23);
+			this.reset.TabIndex = 25;
+			this.reset.Text = "Reset";
+			this.reset.UseVisualStyleBackColor = true;
+			this.reset.Click += new System.EventHandler(this.reset_Click);
+			// 
+			// label18
+			// 
+			this.label18.Location = new System.Drawing.Point(3, 113);
+			this.label18.Name = "label18";
+			this.label18.Size = new System.Drawing.Size(76, 14);
+			this.label18.TabIndex = 23;
+			this.label18.Text = "Height offset:";
+			this.label18.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// angletrackbar
+			// 
+			this.angletrackbar.BackColor = System.Drawing.SystemColors.ControlLightLight;
+			this.angletrackbar.Location = new System.Drawing.Point(173, 82);
+			this.angletrackbar.Maximum = 85;
+			this.angletrackbar.Minimum = -85;
+			this.angletrackbar.Name = "angletrackbar";
+			this.angletrackbar.Size = new System.Drawing.Size(175, 45);
+			this.angletrackbar.TabIndex = 57;
+			this.angletrackbar.TickFrequency = 10;
+			this.angletrackbar.ValueChanged += new System.EventHandler(this.angletrackbar_ValueChanged);
+			// 
+			// label1
+			// 
+			this.label1.Location = new System.Drawing.Point(3, 12);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(76, 14);
+			this.label1.TabIndex = 58;
+			this.label1.Text = "Pivot:";
+			this.label1.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// pivotmodeselector
+			// 
+			this.pivotmodeselector.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.pivotmodeselector.FormattingEnabled = true;
+			this.pivotmodeselector.Items.AddRange(new object[] {
+            "World origin",
+            "Selection center",
+            "Sector center"});
+			this.pivotmodeselector.Location = new System.Drawing.Point(85, 9);
+			this.pivotmodeselector.Name = "pivotmodeselector";
+			this.pivotmodeselector.Size = new System.Drawing.Size(132, 21);
+			this.pivotmodeselector.TabIndex = 59;
+			this.pivotmodeselector.SelectedIndexChanged += new System.EventHandler(this.pivotmodeselector_SelectedIndexChanged);
+			// 
+			// rotationcontrol
+			// 
+			this.rotationcontrol.Angle = 0;
+			this.rotationcontrol.AngleOffset = 0;
+			this.rotationcontrol.Location = new System.Drawing.Point(173, 36);
+			this.rotationcontrol.Name = "rotationcontrol";
+			this.rotationcontrol.Size = new System.Drawing.Size(44, 44);
+			this.rotationcontrol.TabIndex = 56;
+			this.rotationcontrol.AngleChanged += new System.EventHandler(this.rotationcontrol_AngleChanged);
+			// 
+			// slopeangle
+			// 
+			this.slopeangle.AllowDecimal = true;
+			this.slopeangle.AllowNegative = true;
+			this.slopeangle.AllowRelative = true;
+			this.slopeangle.ButtonStep = 1;
+			this.slopeangle.ButtonStepBig = 5F;
+			this.slopeangle.ButtonStepFloat = 1F;
+			this.slopeangle.ButtonStepSmall = 0.1F;
+			this.slopeangle.ButtonStepsUseModifierKeys = true;
+			this.slopeangle.ButtonStepsWrapAround = false;
+			this.slopeangle.Location = new System.Drawing.Point(85, 78);
+			this.slopeangle.Name = "slopeangle";
+			this.slopeangle.Size = new System.Drawing.Size(82, 24);
+			this.slopeangle.StepValues = null;
+			this.slopeangle.TabIndex = 29;
+			this.slopeangle.WhenTextChanged += new System.EventHandler(this.slopeangle_WhenTextChanged);
+			// 
+			// sloperotation
+			// 
+			this.sloperotation.AllowDecimal = true;
+			this.sloperotation.AllowNegative = true;
+			this.sloperotation.AllowRelative = true;
+			this.sloperotation.ButtonStep = 1;
+			this.sloperotation.ButtonStepBig = 5F;
+			this.sloperotation.ButtonStepFloat = 1F;
+			this.sloperotation.ButtonStepSmall = 0.1F;
+			this.sloperotation.ButtonStepsUseModifierKeys = true;
+			this.sloperotation.ButtonStepsWrapAround = false;
+			this.sloperotation.Location = new System.Drawing.Point(85, 48);
+			this.sloperotation.Name = "sloperotation";
+			this.sloperotation.Size = new System.Drawing.Size(82, 24);
+			this.sloperotation.StepValues = null;
+			this.sloperotation.TabIndex = 27;
+			this.sloperotation.WhenTextChanged += new System.EventHandler(this.sloperotation_WhenTextChanged);
+			// 
+			// slopeoffset
+			// 
+			this.slopeoffset.AllowDecimal = true;
+			this.slopeoffset.AllowNegative = true;
+			this.slopeoffset.AllowRelative = true;
+			this.slopeoffset.ButtonStep = 1;
+			this.slopeoffset.ButtonStepBig = 16F;
+			this.slopeoffset.ButtonStepFloat = 8F;
+			this.slopeoffset.ButtonStepSmall = 1F;
+			this.slopeoffset.ButtonStepsUseModifierKeys = true;
+			this.slopeoffset.ButtonStepsWrapAround = false;
+			this.slopeoffset.Location = new System.Drawing.Point(85, 108);
+			this.slopeoffset.Name = "slopeoffset";
+			this.slopeoffset.Size = new System.Drawing.Size(82, 24);
+			this.slopeoffset.StepValues = null;
+			this.slopeoffset.TabIndex = 24;
+			this.slopeoffset.WhenTextChanged += new System.EventHandler(this.slopeoffset_WhenTextChanged);
+			// 
+			// cbuselineangles
+			// 
+			this.cbuselineangles.AutoSize = true;
+			this.cbuselineangles.Location = new System.Drawing.Point(226, 52);
+			this.cbuselineangles.Name = "cbuselineangles";
+			this.cbuselineangles.Size = new System.Drawing.Size(113, 17);
+			this.cbuselineangles.TabIndex = 60;
+			this.cbuselineangles.Tag = "";
+			this.cbuselineangles.Text = "Use linedef angles";
+			this.cbuselineangles.UseVisualStyleBackColor = true;
+			this.cbuselineangles.CheckedChanged += new System.EventHandler(this.cbuselineangles_CheckedChanged);
+			// 
+			// SectorSlopeControl
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.Controls.Add(this.cbuselineangles);
+			this.Controls.Add(this.pivotmodeselector);
+			this.Controls.Add(this.label1);
+			this.Controls.Add(this.angletrackbar);
+			this.Controls.Add(this.rotationcontrol);
+			this.Controls.Add(this.slopeangle);
+			this.Controls.Add(this.label23);
+			this.Controls.Add(this.sloperotation);
+			this.Controls.Add(this.label24);
+			this.Controls.Add(this.reset);
+			this.Controls.Add(this.slopeoffset);
+			this.Controls.Add(this.label18);
+			this.Name = "SectorSlopeControl";
+			this.Size = new System.Drawing.Size(353, 169);
+			((System.ComponentModel.ISupportInitialize)(this.angletrackbar)).EndInit();
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private ButtonsNumericTextbox slopeangle;
+		private System.Windows.Forms.Label label23;
+		private ButtonsNumericTextbox sloperotation;
+		private System.Windows.Forms.Label label24;
+		private System.Windows.Forms.Button reset;
+		private ButtonsNumericTextbox slopeoffset;
+		private System.Windows.Forms.Label label18;
+		private CodeImp.DoomBuilder.GZBuilder.Controls.AngleControl rotationcontrol;
+		private System.Windows.Forms.TrackBar angletrackbar;
+		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.ComboBox pivotmodeselector;
+		private System.Windows.Forms.CheckBox cbuselineangles;
+	}
+}
diff --git a/Source/Core/Controls/SectorSlopeControl.cs b/Source/Core/Controls/SectorSlopeControl.cs
new file mode 100644
index 0000000..da937f3
--- /dev/null
+++ b/Source/Core/Controls/SectorSlopeControl.cs
@@ -0,0 +1,257 @@
+#region ================== Namespaces
+
+using System;
+using System.Windows.Forms;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Controls
+{
+	#region ================== Enums
+
+	internal enum SlopePivotMode
+	{
+		ORIGIN, // pivot around 0, 0
+		GLOBAL, // pivot around selection center
+		LOCAL,  // pivot around sector center
+	}
+
+	#endregion
+
+	public partial class SectorSlopeControl : UserControl
+	{
+
+		#region ================== Events
+
+		public event EventHandler OnAnglesChanged;
+		public event EventHandler OnUseLineAnglesChanged;
+		public event EventHandler OnPivotModeChanged;
+		public event EventHandler OnResetClicked;
+
+		#endregion
+
+		#region ================== Variables
+
+		private bool preventchanges;
+		
+		// Slope values
+		private float anglexy;
+		private float anglez;
+		private float offset;
+
+		#endregion
+
+		#region ================== Properties
+
+		public StepsList StepValues { set { sloperotation.StepValues = value; } }
+		public bool UseLineAngles { get { return cbuselineangles.Checked; } set { preventchanges = true; cbuselineangles.Checked = value; preventchanges = false; } }
+
+		internal SlopePivotMode PivotMode 
+		{
+			get 
+			{
+				return (SlopePivotMode)pivotmodeselector.SelectedIndex;
+			}
+			set 
+			{
+				preventchanges = true;
+				pivotmodeselector.SelectedIndex = (int)value;
+				preventchanges = false;
+			}
+		}
+
+		#endregion
+
+		#region ================== Constructor
+
+		public SectorSlopeControl() 
+		{
+			InitializeComponent();
+		}
+
+		#endregion
+
+		#region ================== Property accessors
+
+		public float GetAngleXY(float defaultvalue) 
+		{
+			return sloperotation.GetResultFloat(defaultvalue);
+		}
+
+		public float GetAngleZ(float defaultvalue) 
+		{
+			return slopeangle.GetResultFloat(defaultvalue);
+		}
+
+		public float GetOffset(float defaultvalue) 
+		{
+			return slopeoffset.GetResultFloat(defaultvalue);
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		public void SetValues(float anglexy, float anglez, float offset, bool first) 
+		{
+			if(first) 
+			{
+				// Set values
+				this.anglexy = anglexy;
+				this.anglez = anglez;
+				this.offset = offset;
+			} 
+			else 
+			{
+				// Or update values
+				if(!float.IsNaN(this.anglexy) && this.anglexy != anglexy) this.anglexy = float.NaN;
+				if(!float.IsNaN(this.anglez) && this.anglez != anglez) this.anglez = float.NaN;
+				if(!float.IsNaN(this.offset) && this.offset != offset) this.offset = float.NaN;
+			}
+		}
+
+		public void SetOffset(float offset, bool first) 
+		{
+			if(first) 
+			{
+				this.offset = offset;
+			} 
+			else if(!float.IsNaN(this.offset) && this.offset != offset)
+			{
+				this.offset = float.NaN;
+			}
+		}
+
+		public void UpdateControls() 
+		{
+			preventchanges = true;
+
+			if(float.IsNaN(anglexy)) 
+			{
+				sloperotation.Text = "";
+				rotationcontrol.Angle = GZBuilder.Controls.AngleControl.NO_ANGLE;
+			} 
+			else 
+			{
+				sloperotation.Text = anglexy.ToString();
+				rotationcontrol.Angle = (int)Math.Round(anglexy + 90);
+			}
+
+			if(float.IsNaN(anglez)) 
+			{
+				slopeangle.Text = "";
+				angletrackbar.Value = 0;
+			} 
+			else 
+			{
+				//clamp value to [-85 .. 85]
+				anglez = General.Clamp(anglez, angletrackbar.Minimum, angletrackbar.Maximum);
+
+				slopeangle.Text = anglez.ToString();
+				angletrackbar.Value = (int)General.Clamp(anglez, angletrackbar.Minimum, angletrackbar.Maximum);
+			}
+
+			slopeoffset.Text = (float.IsNaN(offset) ? "" : offset.ToString());
+
+			preventchanges = false;
+		}
+
+		public void UpdateOffset() 
+		{
+			preventchanges = true;
+			slopeoffset.Text = (float.IsNaN(offset) ? "" : offset.ToString());
+			preventchanges = false;
+		}
+
+		#endregion
+
+		#region ================== Events
+
+		private void sloperotation_WhenTextChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			preventchanges = true;
+
+			anglexy = General.ClampAngle(sloperotation.GetResultFloat(float.NaN));
+			rotationcontrol.Angle = (float.IsNaN(anglexy) ? GZBuilder.Controls.AngleControl.NO_ANGLE : (int)Math.Round(anglexy + 90));
+
+			if(OnAnglesChanged != null) OnAnglesChanged(this, EventArgs.Empty);
+			preventchanges = false;
+		}
+
+		private void rotationcontrol_AngleChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			preventchanges = true;
+
+			anglexy = General.ClampAngle(rotationcontrol.Angle - 90);
+			sloperotation.Text = anglexy.ToString();
+
+			if(OnAnglesChanged != null) OnAnglesChanged(this, EventArgs.Empty);
+			preventchanges = false;
+		}
+
+		private void slopeangle_WhenTextChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			preventchanges = true;
+
+			anglez = General.Clamp((int)Math.Round(slopeangle.GetResultFloat(0f)), angletrackbar.Minimum, angletrackbar.Maximum);
+			angletrackbar.Value = (int)anglez;
+
+			if(OnAnglesChanged != null) OnAnglesChanged(this, EventArgs.Empty);
+			preventchanges = false;
+		}
+
+		private void angletrackbar_ValueChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			preventchanges = true;
+
+			slopeangle.Text = angletrackbar.Value.ToString();
+			anglez = angletrackbar.Value;
+
+			if(OnAnglesChanged != null) OnAnglesChanged(this, EventArgs.Empty);
+			preventchanges = false;
+		}
+
+		private void slopeoffset_WhenTextChanged(object sender, EventArgs e) 
+		{
+			offset = slopeoffset.GetResultFloat(float.NaN);
+			if(OnAnglesChanged != null) OnAnglesChanged(this, EventArgs.Empty);
+		}
+
+		private void reset_Click(object sender, EventArgs e) 
+		{
+			preventchanges = true;
+
+			sloperotation.Text = "0";
+			rotationcontrol.Angle = 90;
+			slopeangle.Text = "0";
+			angletrackbar.Value = 0;
+			slopeoffset.Text = "0";
+			anglexy = 0f;
+			anglez = 0f;
+			offset = 0f;
+
+			if(OnResetClicked != null) OnResetClicked(this, EventArgs.Empty);
+			preventchanges = false;
+		}
+
+		private void pivotmodeselector_SelectedIndexChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			if(OnPivotModeChanged != null) OnPivotModeChanged(this, EventArgs.Empty);
+		}
+
+		private void cbuselineangles_CheckedChanged(object sender, EventArgs e) 
+		{
+			sloperotation.ButtonStepsWrapAround = cbuselineangles.Checked;
+			if(preventchanges) return;
+			if(OnUseLineAnglesChanged != null) OnUseLineAnglesChanged(this, EventArgs.Empty);
+		}
+
+		#endregion
+
+	}
+}
diff --git a/Source/Core/Controls/SectorSlopeControl.resx b/Source/Core/Controls/SectorSlopeControl.resx
new file mode 100644
index 0000000..19dc0dd
--- /dev/null
+++ b/Source/Core/Controls/SectorSlopeControl.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Controls/StatisticsControl.Designer.cs b/Source/Core/Controls/StatisticsControl.Designer.cs
new file mode 100644
index 0000000..9ade8ee
--- /dev/null
+++ b/Source/Core/Controls/StatisticsControl.Designer.cs
@@ -0,0 +1,172 @@
+namespace CodeImp.DoomBuilder.Controls
+{
+	partial class StatisticsControl
+	{
+		/// <summary> 
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing) 
+		{
+			if(disposing && (components != null)) 
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Component Designer generated code
+
+		/// <summary> 
+		/// Required method for Designer support - do not modify 
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent() 
+		{
+			this.thingscount = new System.Windows.Forms.Label();
+			this.sectorscount = new System.Windows.Forms.Label();
+			this.sidedefscount = new System.Windows.Forms.Label();
+			this.linedefscount = new System.Windows.Forms.Label();
+			this.verticescount = new System.Windows.Forms.Label();
+			this.thingslabel = new System.Windows.Forms.Label();
+			this.sectorslabel = new System.Windows.Forms.Label();
+			this.sidedefslabel = new System.Windows.Forms.Label();
+			this.linedefslabel = new System.Windows.Forms.Label();
+			this.verticeslabel = new System.Windows.Forms.Label();
+			this.SuspendLayout();
+			// 
+			// thingscount
+			// 
+			this.thingscount.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.thingscount.Location = new System.Drawing.Point(10, 81);
+			this.thingscount.Name = "thingscount";
+			this.thingscount.Size = new System.Drawing.Size(43, 14);
+			this.thingscount.TabIndex = 19;
+			this.thingscount.Text = "0";
+			this.thingscount.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// sectorscount
+			// 
+			this.sectorscount.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.sectorscount.Location = new System.Drawing.Point(10, 62);
+			this.sectorscount.Name = "sectorscount";
+			this.sectorscount.Size = new System.Drawing.Size(43, 14);
+			this.sectorscount.TabIndex = 18;
+			this.sectorscount.Text = "0";
+			this.sectorscount.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// sidedefscount
+			// 
+			this.sidedefscount.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.sidedefscount.Location = new System.Drawing.Point(10, 44);
+			this.sidedefscount.Name = "sidedefscount";
+			this.sidedefscount.Size = new System.Drawing.Size(43, 14);
+			this.sidedefscount.TabIndex = 17;
+			this.sidedefscount.Text = "0";
+			this.sidedefscount.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// linedefscount
+			// 
+			this.linedefscount.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.linedefscount.Location = new System.Drawing.Point(10, 26);
+			this.linedefscount.Name = "linedefscount";
+			this.linedefscount.Size = new System.Drawing.Size(43, 14);
+			this.linedefscount.TabIndex = 16;
+			this.linedefscount.Text = "0";
+			this.linedefscount.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// verticescount
+			// 
+			this.verticescount.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.verticescount.Location = new System.Drawing.Point(10, 8);
+			this.verticescount.Name = "verticescount";
+			this.verticescount.Size = new System.Drawing.Size(43, 14);
+			this.verticescount.TabIndex = 15;
+			this.verticescount.Text = "0";
+			this.verticescount.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// thingslabel
+			// 
+			this.thingslabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.thingslabel.Location = new System.Drawing.Point(55, 81);
+			this.thingslabel.Name = "thingslabel";
+			this.thingslabel.Size = new System.Drawing.Size(60, 15);
+			this.thingslabel.TabIndex = 14;
+			this.thingslabel.Text = "Things";
+			// 
+			// sectorslabel
+			// 
+			this.sectorslabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.sectorslabel.Location = new System.Drawing.Point(55, 62);
+			this.sectorslabel.Name = "sectorslabel";
+			this.sectorslabel.Size = new System.Drawing.Size(60, 15);
+			this.sectorslabel.TabIndex = 13;
+			this.sectorslabel.Text = "Sectors";
+			// 
+			// sidedefslabel
+			// 
+			this.sidedefslabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.sidedefslabel.Location = new System.Drawing.Point(55, 44);
+			this.sidedefslabel.Name = "sidedefslabel";
+			this.sidedefslabel.Size = new System.Drawing.Size(60, 15);
+			this.sidedefslabel.TabIndex = 12;
+			this.sidedefslabel.Text = "Sidedefs";
+			// 
+			// linedefslabel
+			// 
+			this.linedefslabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.linedefslabel.Location = new System.Drawing.Point(55, 26);
+			this.linedefslabel.Name = "linedefslabel";
+			this.linedefslabel.Size = new System.Drawing.Size(60, 15);
+			this.linedefslabel.TabIndex = 11;
+			this.linedefslabel.Text = "Linedefs";
+			// 
+			// verticeslabel
+			// 
+			this.verticeslabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.verticeslabel.Location = new System.Drawing.Point(55, 8);
+			this.verticeslabel.Name = "verticeslabel";
+			this.verticeslabel.Size = new System.Drawing.Size(60, 15);
+			this.verticeslabel.TabIndex = 10;
+			this.verticeslabel.Text = "Vertices";
+			// 
+			// StatisticsControl
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.Controls.Add(this.thingscount);
+			this.Controls.Add(this.sectorscount);
+			this.Controls.Add(this.sidedefscount);
+			this.Controls.Add(this.linedefscount);
+			this.Controls.Add(this.verticescount);
+			this.Controls.Add(this.thingslabel);
+			this.Controls.Add(this.sectorslabel);
+			this.Controls.Add(this.sidedefslabel);
+			this.Controls.Add(this.linedefslabel);
+			this.Controls.Add(this.verticeslabel);
+			this.ForeColor = System.Drawing.SystemColors.GrayText;
+			this.Name = "StatisticsControl";
+			this.Size = new System.Drawing.Size(118, 104);
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Label thingscount;
+		private System.Windows.Forms.Label sectorscount;
+		private System.Windows.Forms.Label sidedefscount;
+		private System.Windows.Forms.Label linedefscount;
+		private System.Windows.Forms.Label verticescount;
+		private System.Windows.Forms.Label thingslabel;
+		private System.Windows.Forms.Label sectorslabel;
+		private System.Windows.Forms.Label sidedefslabel;
+		private System.Windows.Forms.Label linedefslabel;
+		private System.Windows.Forms.Label verticeslabel;
+	}
+}
diff --git a/Source/Core/Controls/StatisticsControl.cs b/Source/Core/Controls/StatisticsControl.cs
new file mode 100644
index 0000000..d21e122
--- /dev/null
+++ b/Source/Core/Controls/StatisticsControl.cs
@@ -0,0 +1,37 @@
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace CodeImp.DoomBuilder.Controls
+{
+	public partial class StatisticsControl : UserControl
+	{
+		public StatisticsControl() 
+		{
+			InitializeComponent();
+			this.Visible = false;
+		}
+
+		public void UpdateStatistics() 
+		{
+			// Update statistics
+			verticescount.Text = General.Map.Map.Vertices.Count.ToString();
+			linedefscount.Text = General.Map.Map.Linedefs.Count.ToString();
+			sidedefscount.Text = General.Map.Map.Sidedefs.Count.ToString();
+			sectorscount.Text = General.Map.Map.Sectors.Count.ToString();
+			thingscount.Text = General.Map.Map.Things.Count.ToString();
+
+			// Exceeding them limits?
+			verticescount.ForeColor = (General.Map.Map.Vertices.Count > General.Map.FormatInterface.MaxVertices ? Color.Red : SystemColors.GrayText);
+			linedefscount.ForeColor = (General.Map.Map.Linedefs.Count > General.Map.FormatInterface.MaxLinedefs ? Color.Red : SystemColors.GrayText);
+			sidedefscount.ForeColor = (General.Map.Map.Sidedefs.Count > General.Map.FormatInterface.MaxSidedefs ? Color.Red : SystemColors.GrayText);
+			sectorscount.ForeColor = (General.Map.Map.Sectors.Count > General.Map.FormatInterface.MaxSectors ? Color.Red : SystemColors.GrayText);
+			thingscount.ForeColor = (General.Map.Map.Things.Count > General.Map.FormatInterface.MaxThings ? Color.Red : SystemColors.GrayText);
+
+			verticeslabel.ForeColor = verticescount.ForeColor;
+			linedefslabel.ForeColor = linedefscount.ForeColor;
+			sidedefslabel.ForeColor = sidedefscount.ForeColor;
+			sectorslabel.ForeColor = sectorscount.ForeColor;
+			thingslabel.ForeColor = thingscount.ForeColor;
+		}
+	}
+}
diff --git a/Source/Core/Controls/StatisticsControl.resx b/Source/Core/Controls/StatisticsControl.resx
new file mode 100644
index 0000000..19dc0dd
--- /dev/null
+++ b/Source/Core/Controls/StatisticsControl.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Controls/TextureSelectorControl.cs b/Source/Core/Controls/TextureSelectorControl.cs
new file mode 100644
index 0000000..0410e3f
--- /dev/null
+++ b/Source/Core/Controls/TextureSelectorControl.cs
@@ -0,0 +1,92 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Drawing;
+using CodeImp.DoomBuilder.Windows;
+using CodeImp.DoomBuilder.Data;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Controls
+{
+	public class TextureSelectorControl : ImageSelectorControl
+	{
+		// Variables
+		private bool required;
+		
+		// Properties
+		public bool Required { get { return required; } set { required = value; } }
+
+		// Setup
+		public override void Initialize()
+		{
+			base.Initialize();
+			
+			// Fill autocomplete list
+			name.AutoCompleteCustomSource.AddRange(General.Map.Data.TextureNames.ToArray());
+
+			//mxd
+			if(required) Refresh();
+		}
+		
+		// This finds the image we need for the given texture name
+		protected override Image FindImage(string imagename)
+		{
+			timer.Stop(); //mxd
+			
+			// Check if name is a "none" texture
+			if(string.IsNullOrEmpty(imagename)) 
+			{
+				DisplayImageSize(0, 0); //mxd
+				UpdateToggleImageNameButton(null); //mxd
+				
+				//mxd. Determine image to show
+				if(multipletextures) return Properties.Resources.ImageStack;
+				return (required ? Properties.Resources.MissingTexture : null);
+			} 
+			else if(imagename == "-") //mxd
+			{
+				DisplayImageSize(0, 0);
+				UpdateToggleImageNameButton(null); //mxd
+				
+				// Determine image to show
+				return (required ? Properties.Resources.MissingTexture : null);
+			} 
+			else
+			{
+				ImageData texture = General.Map.Data.GetTextureImage(imagename); //mxd
+				UpdateToggleImageNameButton(texture); //mxd
+
+				if(string.IsNullOrEmpty(texture.FilePathName) || texture is UnknownImage) DisplayImageSize(0, 0); //mxd
+				else DisplayImageSize(texture.ScaledWidth, texture.ScaledHeight); //mxd
+				if(usepreviews ? !texture.IsPreviewLoaded : !texture.IsImageLoaded) timer.Start(); //mxd
+				
+				// Set the image
+				return (usepreviews ? texture.GetPreview() : texture.GetBitmap());
+			}
+		}
+
+		// This browses for a texture
+		protected override string BrowseImage(string imagename) 
+		{
+			// Browse for texture
+			string result = TextureBrowserForm.Browse(this.ParentForm, imagename, false);
+			return result ?? imagename;
+		}
+	}
+}
diff --git a/Source/Core/Controls/ThingBrowserControl.Designer.cs b/Source/Core/Controls/ThingBrowserControl.Designer.cs
new file mode 100644
index 0000000..0a1658b
--- /dev/null
+++ b/Source/Core/Controls/ThingBrowserControl.Designer.cs
@@ -0,0 +1,341 @@
+namespace CodeImp.DoomBuilder.Controls
+{
+	partial class ThingBrowserControl
+	{
+		/// <summary> 
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Component Designer generated code
+
+		/// <summary> 
+		/// Required method for Designer support - do not modify 
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.components = new System.ComponentModel.Container();
+			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ThingBrowserControl));
+			this.sizecaption = new System.Windows.Forms.Label();
+			this.blockingcaption = new System.Windows.Forms.Label();
+			this.positioncaption = new System.Windows.Forms.Label();
+			this.typecaption = new System.Windows.Forms.Label();
+			this.sizelabel = new System.Windows.Forms.Label();
+			this.blockinglabel = new System.Windows.Forms.Label();
+			this.positionlabel = new System.Windows.Forms.Label();
+			this.thingimages = new System.Windows.Forms.ImageList(this.components);
+			this.infopanel = new System.Windows.Forms.Panel();
+			this.spritepanel = new System.Windows.Forms.Panel();
+			this.spritetex = new CodeImp.DoomBuilder.Controls.ConfigurablePictureBox();
+			this.classname = new System.Windows.Forms.LinkLabel();
+			this.labelclassname = new System.Windows.Forms.Label();
+			this.typeid = new CodeImp.DoomBuilder.Controls.NumericTextbox();
+			this.label1 = new System.Windows.Forms.Label();
+			this.tbFilter = new System.Windows.Forms.TextBox();
+			this.bClear = new System.Windows.Forms.Button();
+			this.updatetimer = new System.Windows.Forms.Timer(this.components);
+			this.typelist = new CodeImp.DoomBuilder.GZBuilder.Controls.MultiSelectTreeview();
+			this.infopanel.SuspendLayout();
+			this.spritepanel.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.spritetex)).BeginInit();
+			this.SuspendLayout();
+			// 
+			// sizecaption
+			// 
+			this.sizecaption.Location = new System.Drawing.Point(0, 38);
+			this.sizecaption.Name = "sizecaption";
+			this.sizecaption.Size = new System.Drawing.Size(54, 13);
+			this.sizecaption.TabIndex = 16;
+			this.sizecaption.Text = "Size:";
+			this.sizecaption.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+			// 
+			// blockingcaption
+			// 
+			this.blockingcaption.Location = new System.Drawing.Point(0, 54);
+			this.blockingcaption.Name = "blockingcaption";
+			this.blockingcaption.Size = new System.Drawing.Size(54, 13);
+			this.blockingcaption.TabIndex = 14;
+			this.blockingcaption.Text = "Blocking:";
+			this.blockingcaption.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+			// 
+			// positioncaption
+			// 
+			this.positioncaption.Location = new System.Drawing.Point(0, 22);
+			this.positioncaption.Name = "positioncaption";
+			this.positioncaption.Size = new System.Drawing.Size(54, 13);
+			this.positioncaption.TabIndex = 12;
+			this.positioncaption.Text = "Position:";
+			this.positioncaption.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+			// 
+			// typecaption
+			// 
+			this.typecaption.Location = new System.Drawing.Point(0, 6);
+			this.typecaption.Name = "typecaption";
+			this.typecaption.Size = new System.Drawing.Size(54, 13);
+			this.typecaption.TabIndex = 10;
+			this.typecaption.Text = "Type:";
+			this.typecaption.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+			// 
+			// sizelabel
+			// 
+			this.sizelabel.AutoSize = true;
+			this.sizelabel.Location = new System.Drawing.Point(60, 38);
+			this.sizelabel.Name = "sizelabel";
+			this.sizelabel.Size = new System.Drawing.Size(42, 13);
+			this.sizelabel.TabIndex = 17;
+			this.sizelabel.Text = "16 x 96";
+			// 
+			// blockinglabel
+			// 
+			this.blockinglabel.AutoSize = true;
+			this.blockinglabel.Location = new System.Drawing.Point(60, 54);
+			this.blockinglabel.Name = "blockinglabel";
+			this.blockinglabel.Size = new System.Drawing.Size(63, 13);
+			this.blockinglabel.TabIndex = 15;
+			this.blockinglabel.Text = "True-Height";
+			// 
+			// positionlabel
+			// 
+			this.positionlabel.AutoSize = true;
+			this.positionlabel.Location = new System.Drawing.Point(60, 22);
+			this.positionlabel.Name = "positionlabel";
+			this.positionlabel.Size = new System.Drawing.Size(38, 13);
+			this.positionlabel.TabIndex = 13;
+			this.positionlabel.Text = "Ceiling";
+			// 
+			// thingimages
+			// 
+			this.thingimages.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("thingimages.ImageStream")));
+			this.thingimages.TransparentColor = System.Drawing.SystemColors.Window;
+			this.thingimages.Images.SetKeyName(0, "thing00.png");
+			this.thingimages.Images.SetKeyName(1, "thing01.png");
+			this.thingimages.Images.SetKeyName(2, "thing02.png");
+			this.thingimages.Images.SetKeyName(3, "thing03.png");
+			this.thingimages.Images.SetKeyName(4, "thing04.png");
+			this.thingimages.Images.SetKeyName(5, "thing05.png");
+			this.thingimages.Images.SetKeyName(6, "thing06.png");
+			this.thingimages.Images.SetKeyName(7, "thing07.png");
+			this.thingimages.Images.SetKeyName(8, "thing08.png");
+			this.thingimages.Images.SetKeyName(9, "thing09.png");
+			this.thingimages.Images.SetKeyName(10, "thing10.png");
+			this.thingimages.Images.SetKeyName(11, "thing11.png");
+			this.thingimages.Images.SetKeyName(12, "thing12.png");
+			this.thingimages.Images.SetKeyName(13, "thing13.png");
+			this.thingimages.Images.SetKeyName(14, "thing14.png");
+			this.thingimages.Images.SetKeyName(15, "thing15.png");
+			this.thingimages.Images.SetKeyName(16, "thing16.png");
+			this.thingimages.Images.SetKeyName(17, "thing17.png");
+			this.thingimages.Images.SetKeyName(18, "thing18.png");
+			this.thingimages.Images.SetKeyName(19, "thing19.png");
+			this.thingimages.Images.SetKeyName(20, "category00.png");
+			this.thingimages.Images.SetKeyName(21, "category01.png");
+			this.thingimages.Images.SetKeyName(22, "category02.png");
+			this.thingimages.Images.SetKeyName(23, "category03.png");
+			this.thingimages.Images.SetKeyName(24, "category04.png");
+			this.thingimages.Images.SetKeyName(25, "category05.png");
+			this.thingimages.Images.SetKeyName(26, "category06.png");
+			this.thingimages.Images.SetKeyName(27, "category07.png");
+			this.thingimages.Images.SetKeyName(28, "category08.png");
+			this.thingimages.Images.SetKeyName(29, "category09.png");
+			this.thingimages.Images.SetKeyName(30, "category10.png");
+			this.thingimages.Images.SetKeyName(31, "category11.png");
+			this.thingimages.Images.SetKeyName(32, "category12.png");
+			this.thingimages.Images.SetKeyName(33, "category13.png");
+			this.thingimages.Images.SetKeyName(34, "category14.png");
+			this.thingimages.Images.SetKeyName(35, "category15.png");
+			this.thingimages.Images.SetKeyName(36, "category16.png");
+			this.thingimages.Images.SetKeyName(37, "category17.png");
+			this.thingimages.Images.SetKeyName(38, "category18.png");
+			this.thingimages.Images.SetKeyName(39, "category19.png");
+			this.thingimages.Images.SetKeyName(40, "Warning.png");
+			// 
+			// infopanel
+			// 
+			this.infopanel.Controls.Add(this.spritepanel);
+			this.infopanel.Controls.Add(this.classname);
+			this.infopanel.Controls.Add(this.labelclassname);
+			this.infopanel.Controls.Add(this.sizelabel);
+			this.infopanel.Controls.Add(this.typecaption);
+			this.infopanel.Controls.Add(this.sizecaption);
+			this.infopanel.Controls.Add(this.typeid);
+			this.infopanel.Controls.Add(this.blockinglabel);
+			this.infopanel.Controls.Add(this.positioncaption);
+			this.infopanel.Controls.Add(this.blockingcaption);
+			this.infopanel.Controls.Add(this.positionlabel);
+			this.infopanel.Location = new System.Drawing.Point(0, 233);
+			this.infopanel.Name = "infopanel";
+			this.infopanel.Size = new System.Drawing.Size(304, 87);
+			this.infopanel.TabIndex = 18;
+			// 
+			// spritepanel
+			// 
+			this.spritepanel.BackColor = System.Drawing.SystemColors.AppWorkspace;
+			this.spritepanel.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+			this.spritepanel.Controls.Add(this.spritetex);
+			this.spritepanel.Location = new System.Drawing.Point(235, 2);
+			this.spritepanel.Margin = new System.Windows.Forms.Padding(3, 3, 0, 3);
+			this.spritepanel.Name = "spritepanel";
+			this.spritepanel.Size = new System.Drawing.Size(68, 68);
+			this.spritepanel.TabIndex = 23;
+			// 
+			// spritetex
+			// 
+			this.spritetex.CompositingQuality = System.Drawing.Drawing2D.CompositingQuality.Default;
+			this.spritetex.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.spritetex.Highlighted = false;
+			this.spritetex.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.NearestNeighbor;
+			this.spritetex.Location = new System.Drawing.Point(0, 0);
+			this.spritetex.Name = "spritetex";
+			this.spritetex.PageUnit = System.Drawing.GraphicsUnit.Pixel;
+			this.spritetex.PixelOffsetMode = System.Drawing.Drawing2D.PixelOffsetMode.None;
+			this.spritetex.Size = new System.Drawing.Size(64, 64);
+			this.spritetex.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
+			this.spritetex.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.Default;
+			this.spritetex.TabIndex = 0;
+			this.spritetex.TabStop = false;
+			// 
+			// classname
+			// 
+			this.classname.ActiveLinkColor = System.Drawing.SystemColors.Highlight;
+			this.classname.AutoSize = true;
+			this.classname.LinkColor = System.Drawing.SystemColors.HotTrack;
+			this.classname.Location = new System.Drawing.Point(60, 70);
+			this.classname.Name = "classname";
+			this.classname.Size = new System.Drawing.Size(165, 13);
+			this.classname.TabIndex = 27;
+			this.classname.TabStop = true;
+			this.classname.Text = "SuperTurboTurkeyPuncherPlayer";
+			this.classname.VisitedLinkColor = System.Drawing.SystemColors.HotTrack;
+			this.classname.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.classname_LinkClicked);
+			// 
+			// labelclassname
+			// 
+			this.labelclassname.Location = new System.Drawing.Point(0, 70);
+			this.labelclassname.Name = "labelclassname";
+			this.labelclassname.Size = new System.Drawing.Size(54, 13);
+			this.labelclassname.TabIndex = 25;
+			this.labelclassname.Text = "Class:";
+			this.labelclassname.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+			// 
+			// typeid
+			// 
+			this.typeid.AllowDecimal = false;
+			this.typeid.AllowNegative = false;
+			this.typeid.AllowRelative = false;
+			this.typeid.ForeColor = System.Drawing.SystemColors.WindowText;
+			this.typeid.ImeMode = System.Windows.Forms.ImeMode.Off;
+			this.typeid.Location = new System.Drawing.Point(60, 2);
+			this.typeid.Name = "typeid";
+			this.typeid.Size = new System.Drawing.Size(68, 20);
+			this.typeid.TabIndex = 1;
+			this.typeid.TextChanged += new System.EventHandler(this.typeid_TextChanged);
+			// 
+			// label1
+			// 
+			this.label1.AutoSize = true;
+			this.label1.Location = new System.Drawing.Point(3, 6);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(32, 13);
+			this.label1.TabIndex = 19;
+			this.label1.Text = "Filter:";
+			// 
+			// tbFilter
+			// 
+			this.tbFilter.Location = new System.Drawing.Point(42, 3);
+			this.tbFilter.Name = "tbFilter";
+			this.tbFilter.Size = new System.Drawing.Size(232, 20);
+			this.tbFilter.TabIndex = 20;
+			this.tbFilter.TextChanged += new System.EventHandler(this.tbFilter_TextChanged);
+			this.tbFilter.KeyUp += new System.Windows.Forms.KeyEventHandler(this.tbFilter_KeyUp);
+			// 
+			// bClear
+			// 
+			this.bClear.Image = global::CodeImp.DoomBuilder.Properties.Resources.SearchClear;
+			this.bClear.Location = new System.Drawing.Point(277, 1);
+			this.bClear.Name = "bClear";
+			this.bClear.Size = new System.Drawing.Size(24, 23);
+			this.bClear.TabIndex = 21;
+			this.bClear.UseVisualStyleBackColor = true;
+			this.bClear.Click += new System.EventHandler(this.bClear_Click);
+			// 
+			// updatetimer
+			// 
+			this.updatetimer.Tick += new System.EventHandler(this.updatetimer_Tick);
+			// 
+			// typelist
+			// 
+			this.typelist.HideSelection = false;
+			this.typelist.ImageIndex = 0;
+			this.typelist.ImageList = this.thingimages;
+			this.typelist.Location = new System.Drawing.Point(0, 28);
+			this.typelist.Margin = new System.Windows.Forms.Padding(8, 8, 9, 8);
+			this.typelist.Name = "typelist";
+			this.typelist.SelectedImageIndex = 0;
+			this.typelist.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+			this.typelist.SelectionMode = CodeImp.DoomBuilder.GZBuilder.Controls.TreeViewSelectionMode.SingleSelect;
+			this.typelist.ShowNodeToolTips = true;
+			this.typelist.Size = new System.Drawing.Size(304, 203);
+			this.typelist.TabIndex = 22;
+			this.typelist.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.typelist_MouseDoubleClick);
+			this.typelist.MouseEnter += new System.EventHandler(this.typelist_MouseEnter);
+			this.typelist.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.typelist_KeyPress);
+			this.typelist.SelectionsChanged += new System.EventHandler(this.typelist_SelectionsChanged);
+			// 
+			// ThingBrowserControl
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.Controls.Add(this.typelist);
+			this.Controls.Add(this.bClear);
+			this.Controls.Add(this.tbFilter);
+			this.Controls.Add(this.label1);
+			this.Controls.Add(this.infopanel);
+			this.Name = "ThingBrowserControl";
+			this.Size = new System.Drawing.Size(304, 320);
+			this.Resize += new System.EventHandler(this.ThingBrowserControl_Resize);
+			this.infopanel.ResumeLayout(false);
+			this.infopanel.PerformLayout();
+			this.spritepanel.ResumeLayout(false);
+			((System.ComponentModel.ISupportInitialize)(this.spritetex)).EndInit();
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Label sizelabel;
+		private System.Windows.Forms.Label blockinglabel;
+		private System.Windows.Forms.Label positionlabel;
+		private NumericTextbox typeid;
+		private System.Windows.Forms.ImageList thingimages;
+		private System.Windows.Forms.Panel infopanel;
+		private System.Windows.Forms.Label sizecaption;
+		private System.Windows.Forms.Label blockingcaption;
+		private System.Windows.Forms.Label positioncaption;
+		private System.Windows.Forms.Label typecaption;
+		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.TextBox tbFilter;
+		private System.Windows.Forms.Button bClear;
+		private CodeImp.DoomBuilder.GZBuilder.Controls.MultiSelectTreeview typelist;
+		private System.Windows.Forms.Panel spritepanel;
+		private System.Windows.Forms.Timer updatetimer;
+		private ConfigurablePictureBox spritetex;
+		private System.Windows.Forms.LinkLabel classname;
+		private System.Windows.Forms.Label labelclassname;
+	}
+}
diff --git a/Source/Core/Controls/ThingBrowserControl.cs b/Source/Core/Controls/ThingBrowserControl.cs
new file mode 100644
index 0000000..848b0b8
--- /dev/null
+++ b/Source/Core/Controls/ThingBrowserControl.cs
@@ -0,0 +1,504 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Globalization;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Data;
+using CodeImp.DoomBuilder.GZBuilder.Controls;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Controls
+{
+	public partial class ThingBrowserControl : UserControl
+	{
+		#region ================== Constants
+
+		private const int WARNING_ICON_INDEX = 40; //mxd
+
+		#endregion
+
+		#region ================== Events
+
+		public delegate void TypeChangedDeletegate(ThingTypeInfo value);
+		public delegate void TypeDoubleClickDeletegate();
+
+		public event TypeChangedDeletegate OnTypeChanged;
+		public event TypeDoubleClickDeletegate OnTypeDoubleClicked;
+
+		#endregion
+
+		#region ================== Variables
+
+		private List<TreeNode> nodes;
+		private List<TreeNode> validnodes; //mxd
+		private ThingTypeInfo thinginfo;
+		private bool doupdatenode;
+		private bool doupdatetextbox;
+		private TreeNode doubleclickednode; //mxd
+		
+		#endregion
+
+		#region ================== Properties
+
+		public string TypeStringValue { get { return typeid.Text; } }
+		public bool UseMultiSelection { get { return typelist.SelectionMode == TreeViewSelectionMode.MultiSelectSameLevel; } set { typelist.SelectionMode = (value ? TreeViewSelectionMode.MultiSelectSameLevel : TreeViewSelectionMode.SingleSelect); } }
+
+		#endregion
+
+		#region ================== Constructor
+
+		// Constructor
+		public ThingBrowserControl()
+		{
+			InitializeComponent();
+		}
+
+		// This sets up the control
+		public void Setup()
+		{
+			// Go for all predefined categories
+			typelist.Nodes.Clear();
+			nodes = new List<TreeNode>();
+			validnodes = new List<TreeNode>(); //mxd
+			AddThingCategories(General.Map.Data.ThingCategories, typelist.Nodes); //mxd
+			doupdatenode = true;
+			doupdatetextbox = true;
+		}
+
+		//mxd. This recursively creates thing category tree nodes. Returns true when a thing in this category is obsolete
+		private bool AddThingCategories(ICollection<ThingCategory> categories, TreeNodeCollection collection)
+		{
+			bool containsobsoletethings = false;
+			
+			foreach(ThingCategory tc in categories) 
+			{
+				// Create category
+				TreeNode cn = collection.Add(tc.Name, tc.Title);
+
+				// Create subcategories
+				bool isobsolete = AddThingCategories(tc.Children, cn.Nodes);
+
+				// Create things
+				foreach(ThingTypeInfo ti in tc.Things) 
+				{
+					// Create thing
+					TreeNode n = cn.Nodes.Add(ti.Title);
+					n.Tag = ti;
+
+					if(ti.IsObsolete)
+					{
+						n.Text += " - OBSOLETE";
+						n.BackColor = Color.MistyRose;
+						n.ToolTipText = ti.ObsoleteMessage;
+
+						// Set warning icon
+						n.ImageIndex = WARNING_ICON_INDEX;
+						n.SelectedImageIndex = WARNING_ICON_INDEX;
+						isobsolete = true;
+					}
+					else
+					{
+						// Set regular icon
+						if((ti.Color >= 0) && (ti.Color < thingimages.Images.Count)) n.ImageIndex = ti.Color;
+						n.SelectedImageIndex = n.ImageIndex;
+					}
+
+					nodes.Add(n);
+				}
+
+				// Set category icon
+				containsobsoletethings |= isobsolete;
+				if(isobsolete)
+				{
+					cn.BackColor = Color.MistyRose;
+					cn.ImageIndex = WARNING_ICON_INDEX;
+					cn.SelectedImageIndex = WARNING_ICON_INDEX;
+				}
+				else
+				{
+					cn.ImageIndex = thingimages.Images.Count / 2; // Offset to folder icons
+					if((tc.Color >= 0) && (tc.Color < thingimages.Images.Count)) cn.ImageIndex += tc.Color;
+					cn.SelectedImageIndex = cn.ImageIndex;
+				}
+			}
+
+			return containsobsoletethings;
+		}
+
+		#endregion
+		
+		#region ================== Methods
+
+		// Select a type
+		public void SelectType(int type)
+		{
+			// Set type index
+			typeid.Text = type.ToString();
+			typeid_TextChanged(this, EventArgs.Empty);
+		}
+
+		// Return selected type info
+		public ThingTypeInfo GetSelectedInfo()
+		{
+			return thinginfo;
+		}
+
+		// This clears the type
+		public void ClearSelectedType()
+		{
+			doupdatenode = false;
+
+			// Clear selection
+			typelist.SelectedNodes.Clear(); //mxd
+			validnodes.Clear(); //mxd
+			typeid.Text = "";
+
+			// Collapse nodes
+			foreach(TreeNode n in nodes)
+				if(n.Parent.IsExpanded) n.Parent.Collapse();
+			
+			doupdatenode = true;
+		}
+
+		// Result
+		public int GetResult(int original)
+		{
+			//mxd. Get a random ThingTypeInfo from valid nodes?
+			if(typelist.SelectionMode == TreeViewSelectionMode.MultiSelectSameLevel && validnodes.Count > 0) 
+			{
+				return (validnodes[General.Random(0, validnodes.Count - 1)].Tag as ThingTypeInfo).Index;
+			}
+			
+			return typeid.GetResult(original);
+		}
+
+		//mxd
+		public void FocusTextbox()
+		{
+			tbFilter.Focus();
+		}
+
+		//mxd
+		private List<TreeNode> GetValidNodes() 
+		{
+			Dictionary<string, TreeNode> vn = new Dictionary<string, TreeNode>(StringComparer.Ordinal);
+			foreach(TreeNode n in typelist.SelectedNodes) GetValidNodes(n, ref vn);
+			return new List<TreeNode>(vn.Values);
+		}
+
+		private static void GetValidNodes(TreeNode root, ref Dictionary<string, TreeNode> vn)
+		{
+			if(root.Nodes.Count == 0)
+			{
+				if(root.Tag is ThingTypeInfo && !vn.ContainsKey(root.Text)) vn.Add(root.Text, root);
+			}
+			else
+			{
+				foreach(TreeNode n in root.Nodes) GetValidNodes(n, ref vn);
+			}
+		}
+
+		// Update preview image (mxd)
+		private void UpdateThingSprite() 
+		{
+			if(General.Map == null) return;
+			
+			if(thinginfo != null) 
+			{
+				if(thinginfo.Sprite.ToLowerInvariant().StartsWith(DataManager.INTERNAL_PREFIX) &&
+				   (thinginfo.Sprite.Length > DataManager.INTERNAL_PREFIX.Length)) 
+				{
+					spritetex.Image = General.Map.Data.GetSpriteImage(thinginfo.Sprite).GetBitmap();
+					return;
+				} 
+
+				if((thinginfo.Sprite.Length < 9) && (thinginfo.Sprite.Length > 0))
+				{
+					ImageData sprite = General.Map.Data.GetSpriteImage(thinginfo.Sprite);
+					spritetex.Image = sprite.GetPreview();
+					if(!sprite.IsPreviewLoaded) updatetimer.Start();
+					return;
+				}
+			}
+
+			//Show Mixed Things icon?
+			if(validnodes.Count > 1)
+			{
+				spritetex.Image = Properties.Resources.MixedThings;
+				return;
+			}
+
+			spritetex.Image = null;
+		}
+
+		#endregion
+
+		#region ================== Events
+
+		// List double-clicked. e.Node and typelist.SelectedNodes[0] may contain incorrect node, 
+		// so we set the correct one in typelist_AfterSelect handler (mxd)
+		private void typelist_MouseDoubleClick(object sender, MouseEventArgs e) 
+		{
+			if(typelist.SelectedNodes.Count == 1
+			    && doubleclickednode != null
+			    && doubleclickednode.Nodes.Count == 0
+			    && doubleclickednode.Tag is ThingTypeInfo
+			    && OnTypeDoubleClicked != null
+			    && typeid.Text.Length > 0)
+			{
+				OnTypeDoubleClicked();
+			}
+		}
+		
+		// Thing type selection changed
+		private void typelist_SelectionsChanged(object sender, EventArgs e) 
+		{
+			doubleclickednode = null; //mxd
+			if(!doupdatetextbox) return;
+
+			//mxd
+			validnodes = GetValidNodes();
+
+			//mxd. Got a valid multiselection? Well, can't show any useful info about that...
+			if(typelist.SelectionMode == TreeViewSelectionMode.MultiSelectSameLevel && validnodes.Count > 1) 
+			{
+				doupdatenode = false;
+				if(!string.IsNullOrEmpty(typeid.Text))
+				{
+					// Event will be raised in typeid_OnTextChanged
+					typeid.Text = "";
+				}
+				else if(OnTypeChanged != null)
+				{
+					// Or raise event here
+					UpdateThingSprite();
+					OnTypeChanged(thinginfo);
+				}
+				doupdatenode = true;
+			}
+			else if(validnodes.Count == 1) //Anything selected?
+			{
+				// Show info
+				doupdatenode = false;
+				typeid.Text = (validnodes[0].Tag as ThingTypeInfo).Index.ToString();
+				doupdatenode = true;
+
+				// Set as double-clicked only if a single child node is selected
+				if(typelist.SelectedNodes.Count == 1 && typelist.SelectedNodes[0].Nodes.Count == 0)
+				{
+					doubleclickednode = validnodes[0]; //mxd
+				}
+			}
+			else
+			{
+				UpdateThingSprite(); //mxd
+			}
+		}
+
+		// Thing type index changed
+		private void typeid_TextChanged(object sender, EventArgs e)
+		{
+			bool knownthing = false;
+
+			// Any text?
+			if(typeid.Text.Length > 0)
+			{
+				// Get the info
+				int typeindex = typeid.GetResult(0);
+				thinginfo = General.Map.Data.GetThingInfoEx(typeindex);
+				if(thinginfo != null)
+				{
+					knownthing = true;
+
+					// Size
+					sizelabel.Text = (thinginfo.Radius * 2) + " x " + thinginfo.Height;
+
+					// Hangs from ceiling
+					if(thinginfo.Hangs) positionlabel.Text = "Ceiling"; else positionlabel.Text = "Floor";
+
+					// Blocking
+					switch(thinginfo.Blocking)
+					{
+						case ThingTypeInfo.THING_BLOCKING_NONE: blockinglabel.Text = "No"; break;
+						case ThingTypeInfo.THING_BLOCKING_FULL: blockinglabel.Text = "Completely"; break;
+						case ThingTypeInfo.THING_BLOCKING_HEIGHT: blockinglabel.Text = "True-Height"; break;
+						default: blockinglabel.Text = "Unknown"; break;
+					}
+				}
+
+				if(doupdatenode)
+				{
+					doupdatetextbox = false;
+					typelist.SelectedNodes.Clear();
+					validnodes.Clear(); //mxd
+					foreach(TreeNode n in nodes)
+					{
+						// Matching node?
+						if((n.Tag as ThingTypeInfo).Index == typeindex)
+						{
+							// Select this
+							if(n.TreeView != null) //mxd. Tree node may've been removed during filtering
+							{
+								n.Parent.Expand();
+								typelist.SelectedNodes.Add(n);
+								n.EnsureVisible();
+								break;
+							}
+						}
+					}
+					doupdatetextbox = true;
+				}
+			}
+			else
+			{
+				thinginfo = null;
+				if(doupdatenode)
+				{
+					typelist.SelectedNodes.Clear();
+					validnodes.Clear(); //mxd
+				}
+			}
+
+			// No known thing?
+			if(!knownthing)
+			{
+				sizelabel.Text = "-";
+				positionlabel.Text = "-";
+				blockinglabel.Text = "-";
+			}
+
+			//mxd. Update help link
+			bool displayclassname = (thinginfo != null && !string.IsNullOrEmpty(thinginfo.ClassName) && !thinginfo.ClassName.StartsWith("$"));
+			classname.Enabled = (displayclassname && !string.IsNullOrEmpty(General.Map.Config.ThingClassHelp));
+			classname.Text = (displayclassname ? thinginfo.ClassName : "--");
+			labelclassname.Enabled = classname.Enabled;
+
+			// Update icon (mxd)
+			UpdateThingSprite();
+
+			// Raise event
+			if(OnTypeChanged != null) OnTypeChanged(thinginfo);
+		}
+
+		private void updatetimer_Tick(object sender, EventArgs e) 
+		{
+			updatetimer.Stop();
+			UpdateThingSprite();
+		}
+
+		//mxd
+		private void typelist_MouseEnter(object sender, EventArgs e) 
+		{
+			typelist.Focus();
+		}
+
+		//mxd. Transfer focus to Filter textbox
+		private void typelist_KeyPress(object sender, KeyPressEventArgs e)
+		{
+			tbFilter.Focus();
+			if(e.KeyChar == '\b') // Any better way to check for Backspace?..
+			{
+				if(!string.IsNullOrEmpty(tbFilter.Text) && tbFilter.SelectionStart > 0 && tbFilter.SelectionLength == 0)
+				{
+					int s = tbFilter.SelectionStart - 1;
+					tbFilter.Text = tbFilter.Text.Remove(s, 1);
+					tbFilter.SelectionStart = s;
+				}
+			}
+			else
+			{
+				tbFilter.AppendText(e.KeyChar.ToString(CultureInfo.InvariantCulture));
+			}
+		}
+
+		//mxd
+		private void bClear_Click(object sender, EventArgs e) 
+		{
+			tbFilter.Clear();
+		}
+
+		//mxd
+		private void tbFilter_TextChanged(object sender, EventArgs e) 
+		{
+			typelist.SuspendLayout();
+
+			if(string.IsNullOrEmpty(tbFilter.Text.Trim()))
+			{
+				Setup();
+				typeid_TextChanged(this, EventArgs.Empty);
+			}
+			else
+			{
+				// Go for all predefined categories
+				typelist.SelectedNodes.Clear();
+				typelist.Nodes.Clear();
+				validnodes.Clear();
+
+				string match = tbFilter.Text.ToUpperInvariant();
+				foreach(TreeNode node in nodes)
+				{
+					if(node.Text.ToUpperInvariant().Contains(match)) 
+					{
+						typelist.Nodes.Add(node);
+					}
+				}
+
+				doupdatenode = true;
+				doupdatetextbox = true;
+			}
+
+			typelist.ResumeLayout();
+		}
+
+		//mxd. Switch focus to types list?
+		private void tbFilter_KeyUp(object sender, KeyEventArgs e)
+		{
+			if(e.KeyCode == Keys.Down && typelist.Nodes.Count > 0)
+			{
+				typelist.SelectedNodes.Clear();
+				typelist.SelectedNodes.Add(typelist.Nodes[0]);
+				typelist.Focus();
+			}
+		}
+
+		//mxd. Because anchor-based alignment fails when using high-Dpi settings...
+		private void ThingBrowserControl_Resize(object sender, EventArgs e)
+		{
+			infopanel.Top = this.Height - infopanel.Height;
+			infopanel.Width = this.Width;
+			spritepanel.Left = infopanel.Width - spritepanel.Width;
+			typelist.Height = infopanel.Top - typelist.Top;
+			typelist.Width = this.Width;
+			bClear.Left = this.Width - bClear.Width - bClear.Margin.Right;
+			tbFilter.Width = bClear.Left - tbFilter.Left - bClear.Margin.Left;
+		}
+
+		//mxd. If it's clickable, all data is valid.
+		private void classname_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) 
+		{
+			General.OpenWebsite(General.Map.Config.ThingClassHelp.Replace("%K", thinginfo.ClassName));
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Controls/ThingBrowserControl.resx b/Source/Core/Controls/ThingBrowserControl.resx
new file mode 100644
index 0000000..b23c216
--- /dev/null
+++ b/Source/Core/Controls/ThingBrowserControl.resx
@@ -0,0 +1,999 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="thingimages.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <data name="thingimages.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
+        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
+        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADs
+        ygAAAk1TRnQBSQFMAgEBKQEAAZwBAQGcAQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        AwABsAMAAQEBAAEgBgABsP8AEwADFgEeAioBKQE+Ai0BLAFEAS0CLAFDAS0CLAFDAy0BQwEtAiwBQgEt
+        AiwBQgEtAiwBQgMsAUEBLAIrAUABKwIqAT8CKgEpAT4DKQE9AykBPQMhATDAAAF7AnkBsAGyAbsBwAHp
+        AaQBvwHGAeoBqgHCAcgB6gGwAcQBzQHpAbcBzQHUAekBuwHSAdoB6QHBAdoB4QHpAcEB3QHhAekBwAHW
+        Ad8B6AG7Ac0B1gHoAbMBxgHPAecBqwHBAcoB5wGlAbwBxAHnAaYBuwHCAecBhgKEAb7AAAErAioBPwGn
+        AbcBvAHkAVkB9QL/AVIB8gL/AVMB7gL/AVEB6wL/AU8B7wL/AUQBoAG+Af8BVwGEAZQB/wFUAdkC/wFU
+        AeAC/wFVAd8C/wFVAeAC/wFLAeAC/wGaAekC/wFSAlEBfcQAAUgCRgFuAY8B7wL/ARUB4gL/AR8B3gL/
+        ARsB2QL/ARYB3QL/ARIBPwFKAf8BMAEtASoB/wEmAb0B7wH/ARoBygL/ASABxQL/ARsBxQL/ATMBywL/
+        AaYBrQGyAdkDCwEPxAABCAIHAQoBpQGnAagB0gE+AesC/wEUAeIC/wEaAd4C/wEUAeEC/wEzAdAB6wH/
+        ATwBwQHXAf8BDwHKAv8BEAHLAv8BFAHGAv8BCgHAAv8BpAHmAv8BPAI7AVnMAAE1AjQBTgG8AfwB/QH+
+        ARUB7AL/ARsB5QL/ARkB6AL/ASEBYAFrAf8BQAFPAU0B/wEgAbwB5gH/AQ4B0wL/AQgBygL/AUcB1wL/
+        AZMCkgG8AwMBBM8AAQEBiwKIAbMBegP/ASwB/AL/AS8B+QL/ASEBQQFGAf8BKwEiASEB/wEpAb8B4AH/
+        ARUB3wL/AQ4B0wL/AccB8gH2AfgBKAInATjUAAMhAS8B3gLxAfUBPgP/ATwD/wE/AVgBWwH/ATgBLwEu
+        Af8BPAHJAeAB/wEdAfAC/wF9AfkC/wF0AXIBcAGZ3AABZwJkAY8BngP/ASgD/wFMAWIBZQH/AUACOAH/
+        AUEBygHdAf8BPgH+Av8B0wHhAeIB6QMVAR3cAAMRARcByQHUAdMB5AE+A/8BUwFlAWcB/wFTAUABPwH/
+        AUEBzQHdAf8BpwP/AVACTgFz5AABRgJEAWkBrAP/AUQBxgHMAf8BVQGyAbcB/wFZAfMC/wGoAbEBtAHR
+        AwgBC+QAAwUBBwOgAcsBQgP/AQID/wGsAv0B/gE2AjUBT+wAAy8BRgGwAfYB+AH8AUcD/wGBAX8BgQGy
+        AwEBAvAAA3ABpgHJAtkB8gMgAS3/AP8A2gADAQECAxoBJQMcASgDHAEoAxwBKAMcASgDHAEoAxwBKAMc
+        ASgDHAEoAxwBKAMcASgDHAEoAxwBKAMaASUDAQECAwEBAgMaASUDHAEoAxwBKAMcASgDHAEoAxwBKAMc
+        ASgDHAEoAxwBKAMcASgDHAEoAxwBKAMcASgDGgElAwEBAgMBAQIDGgElAxwBKAMcASgDHAEoAxwBKAMc
+        ASgDHAEoAxwBKAMcASgDHAEoAxwBKAMcASgDHAEoAxoBJQMBAQIDAQECAxoBJQMcASgDHAEoAxwBKAMc
+        ASgDHAEoAxwBKAMcASgDHAEoAxwBKAMcASgDHAEoAxwBKAMaASUDAQECA2UB5QFsAWUBmgH/AWwBZQGa
+        Af8BbAFlAZoB/wFsAWUBmgH/AWwBZQGaAf8BbAFlAZoB/wFsAWUBmgH/AWwBZQGaAf8BbAFlAZoB/wFs
+        AWUBmgH/AWwBZQGaAf8BbAFlAZoB/wFsAWUBmgH/AWwBZQGaAf8DZQHlAVQBVwFlAeUBAAFMAZwB/wEA
+        AUwBnAH/AQABTAGcAf8BAAFMAZwB/wEAAUwBnAH/AQABTAGcAf8BAAFMAZwB/wEAAUwBnAH/AQABTAGc
+        Af8BAAFMAZwB/wEAAUwBnAH/AQABTAGcAf8BAAFMAZwB/wEAAUwBnAH/AVQBVwFlAeUBVgJlAeUBHwFm
+        AWoB/wEfAWYBagH/AR8BZgFqAf8BHwFmAWoB/wEfAWYBagH/AR8BZgFqAf8BHwFmAWoB/wEfAWYBagH/
+        AR8BZgFqAf8BHwFmAWoB/wEfAWYBagH/AR8BZgFqAf8BHwFmAWoB/wEfAWYBagH/AVYCZQHlAVQBXgFl
+        AeUBAAFbAYMB/wEAAVsBgwH/AQABWwGDAf8BAAFbAYMB/wEAAVsBgwH/AQABWwGDAf8BAAFbAYMB/wEA
+        AVsBgwH/AQABWwGDAf8BAAFbAYMB/wEAAVsBgwH/AQABWwGDAf8BAAFbAYMB/wEAAVsBgwH/AVQBYwFl
+        AeUBgAFuAakB/wGBAXABqwH/AYEBcAGrAf8BgQFwAasB/wGBAXABqwH/AYEBcAGrAf8BgQFwAasB/wGB
+        AXABqwH/AYEBcAGrAf8BgQFwAasB/wGBAXABqwH/AYEBcAGrAf8BgQFwAasB/wGBAXABqwH/AYEBcAGr
+        Af8BgAFuAakB/wEAAVMBrAH/AQABVAGtAf8BAAFUAa0B/wEAAVQBrQH/AQABVAGtAf8BAAFUAa0B/wEA
+        AVQBrQH/AQABVAGtAf8BAAFUAa0B/wEAAVQBrQH/AQABVAGtAf8BAAFUAa0B/wEAAVQBrQH/AQABVAGt
+        Af8BAAFUAa0B/wEAAVMBrAH/ASMBcAF0Af8BIwFxAXUB/wEjAXEBdQH/ASMBcQF1Af8BIwFxAXUB/wEj
+        AXEBdQH/ASMBcQF1Af8BIwFxAXUB/wEjAXEBdQH/ASMBcQF1Af8BIwFxAXUB/wEjAXEBdQH/ASMBcQF1
+        Af8BIwFxAXUB/wEjAXEBdQH/ASMBcAF0Af8BAAFkAY8B/wEAAWUBkQH/AQABZQGRAf8BAAFlAZEB/wEA
+        AWUBkQH/AQABZQGRAf8BAAFlAZEB/wEAAWUBkQH/AQABZQGRAf8BAAFlAZEB/wEAAWUBkQH/AQABZQGR
+        Af8BAAFlAZEB/wEAAWUBkQH/AQABZQGRAf8BAAFkAY8B/wGFAXQBsQH/AYUBdAGxAf8BhQF0AbEB/wGF
+        AXQBsQH/AYUBdAGxAf8BhQF0AbEB/wGFAXQBsQH/AYUBdAGxAf8BhQF0AbEB/wGFAXQBsQH/AYUBdAGx
+        Af8BhQF0AbEB/wGFAXQBsQH/AYUBdAGxAf8BhQF0AbEB/wGFAXQBsQH/AQABWAGzAf8BAAFYAbMB/wEA
+        AVgBswH/AQABWAGzAf8BAAFYAbMB/wEAAVgBswH/AQABWAGzAf8BAAFYAbMB/wEAAVgBswH/AQABWAGz
+        Af8BAAFYAbMB/wEAAVgBswH/AQABWAGzAf8BAAFYAbMB/wEAAVgBswH/AQABWAGzAf8BJQF1AYIB/wEl
+        AXUBggH/ASUBdQGCAf8BJQF1AYIB/wElAXUBggH/ASUBdQGCAf8BJQF1AYIB/wElAXUBggH/ASUBdQGC
+        Af8BJQF1AYIB/wElAXUBggH/ASUBdQGCAf8BJQF1AYIB/wElAXUBggH/ASUBdQGCAf8BJQF1AYIB/wEA
+        AWkBlgH/AQABaQGWAf8BAAFpAZYB/wEAAWkBlgH/AQABaQGWAf8BAAFpAZYB/wEAAWkBlgH/AQABaQGW
+        Af8BAAFpAZYB/wEAAWkBlgH/AQABaQGWAf8BAAFpAZYB/wEAAWkBlgH/AQABaQGWAf8BAAFpAZYB/wEA
+        AWkBlgH/AYgBdgG1Af8BiAF2AbUB/wGIAXYBtQH/AYgBdgG1Af8BiAF2AbUB/wGIAXYBtQH/AYgBdgG1
+        Af8BiAF2AbUB/wGIAXYBtQH/AYgBdgG1Af8BiAF2AbUB/wGIAXYBtQH/AYgBdgG1Af8BiAF2AbUB/wGI
+        AXYBtQH/AYgBdgG1Af8BAAFaAbcB/wEAAVoBtwH/AQABWgG3Af8BAAFaAbcB/wEAAVoBtwH/AQABWgG3
+        Af8BAAFaAbcB/wEAAVoBtwH/AQABWgG3Af8BAAFaAbcB/wEAAVoBtwH/AQABWgG3Af8BAAFaAbcB/wEA
+        AVoBtwH/AQABWgG3Af8BAAFaAbcB/wEmAYEBhQH/ASYBgQGFAf8BJgGBAYUB/wEmAYEBhQH/ASYBgQGF
+        Af8BJgGBAYUB/wEmAYEBhQH/ASYBgQGFAf8BJgGBAYUB/wEmAYEBhQH/ASYBgQGFAf8BJgGBAYUB/wEm
+        AYEBhQH/ASYBgQGFAf8BJgGBAYUB/wEmAYEBhQH/AQABawGZAf8BAAFrAZkB/wEAAWsBmQH/AQABawGZ
+        Af8BAAFrAZkB/wEAAWsBmQH/AQABawGZAf8BAAFrAZkB/wEAAWsBmQH/AQABawGZAf8BAAFrAZkB/wEA
+        AWsBmQH/AQABawGZAf8BAAFrAZkB/wEAAWsBmQH/AQABawGZAf8BigGBAbcB/wGKAYEBtwH/AYoBgQG3
+        Af8BigGBAbcB/wGKAYEBtwH/AYoBgQG3Af8BigGBAbcB/wGKAYEBtwH/AYoBgQG3Af8BigGBAbcB/wGK
+        AYEBtwH/AYoBgQG3Af8BigGBAbcB/wGKAYEBtwH/AYoBgQG3Af8BigGBAbcB/wEAAVsBuQH/AQABWwG5
+        Af8BAAFbAbkB/wEAAVsBuQH/AQABWwG5Af8BAAFbAbkB/wEAAVsBuQH/AQABWwG5Af8BAAFbAbkB/wEA
+        AVsBuQH/AQABWwG5Af8BAAFbAbkB/wEAAVsBuQH/AQABWwG5Af8BAAFbAbkB/wEAAVsBuQH/ASYBggGH
+        Af8BJgGCAYcB/wEmAYIBhwH/ASYBggGHAf8BJgGCAYcB/wEmAYIBhwH/ASYBggGHAf8BJgGCAYcB/wEm
+        AYIBhwH/ASYBggGHAf8BJgGCAYcB/wEmAYIBhwH/ASYBggGHAf8BJgGCAYcB/wEmAYIBhwH/ASYBggGH
+        Af8BAAFsAZoB/wEAAWwBmgH/AQABbAGaAf8BAAFsAZoB/wEAAWwBmgH/AQABbAGaAf8BAAFsAZoB/wEA
+        AWwBmgH/AQABbAGaAf8BAAFsAZoB/wEAAWwBmgH/AQABbAGaAf8BAAFsAZoB/wEAAWwBmgH/AQABbAGa
+        Af8BAAFsAZoB/wGLAYIBuAH/AYsBggG4Af8BiwGCAbgB/wGLAYIBuAH/AYsBggG4Af8BiwGCAbgB/wGL
+        AYIBuAH/AYsBggG4Af8BiwGCAbgB/wGLAYIBuAH/AYsBggG4Af8BiwGCAbgB/wGLAYIBuAH/AYsBggG4
+        Af8BiwGCAbgB/wGLAYIBuAH/AQABXAG7Af8BAAFcAbsB/wEAAVwBuwH/AQABXAG7Af8BAAFcAbsB/wEA
+        AVwBuwH/AQABXAG7Af8BAAFcAbsB/wEAAVwBuwH/AQABXAG7Af8BAAFcAbsB/wEAAVwBuwH/AQABXAG7
+        Af8BAAFcAbsB/wEAAVwBuwH/AQABXAG7Af8BJwGDAYgB/wEnAYMBiAH/AScBgwGIAf8BJwGDAYgB/wEn
+        AYMBiAH/AScBgwGIAf8BJwGDAYgB/wEnAYMBiAH/AScBgwGIAf8BJwGDAYgB/wEnAYMBiAH/AScBgwGI
+        Af8BJwGDAYgB/wEnAYMBiAH/AScBgwGIAf8BJwGDAYgB/wEAAW0BnAH/AQABbQGcAf8BAAFtAZwB/wEA
+        AW0BnAH/AQABbQGcAf8BAAFtAZwB/wEAAW0BnAH/AQABbQGcAf8BAAFtAZwB/wEAAW0BnAH/AQABbQGc
+        Af8BAAFtAZwB/wEAAW0BnAH/AQABbQGcAf8BAAFtAZwB/wEAAW0BnAH/AYsBggG3Af8BiwGCAbgB/wGO
+        AYUBvAH/AY4BhQG8Af8BjgGFAbwB/wGOAYUBvAH/AY4BhQG8Af8BjgGFAbwB/wGOAYUBvAH/AY4BhQG8
+        Af8BjgGFAbwB/wGOAYUBvAH/AY4BhQG8Af8BjgGFAbwB/wGOAYUBvAH/AY4BhQG8Af8BAAFcAboB/wEA
+        AVwBuwH/AQABXgG/Af8BAAFeAb8B/wEAAV4BvwH/AQABXgG/Af8BAAFeAb8B/wEAAV4BvwH/AQABXgG/
+        Af8BAAFeAb8B/wEAAV4BvwH/AQABXgG/Af8BAAFeAb8B/wEAAV4BvwH/AQABXgG/Af8BAAFeAb8B/wEn
+        AYMBiAH/AScBgwGIAf8BKAGGAYsB/wEoAYYBiwH/ASgBhgGLAf8BKAGGAYsB/wEoAYYBiwH/ASgBhgGL
+        Af8BKAGGAYsB/wEoAYYBiwH/ASgBhgGLAf8BKAGGAYsB/wEoAYYBiwH/ASgBhgGLAf8BKAGGAYsB/wEo
+        AYYBiwH/AQABbQGcAf8BAAFtAZwB/wEAAXABnwH/AQABcAGfAf8BAAFwAZ8B/wEAAXABnwH/AQABcAGf
+        Af8BAAFwAZ8B/wEAAXABnwH/AQABcAGfAf8BAAFwAZ8B/wEAAXABnwH/AQABcAGfAf8BAAFwAZ8B/wEA
+        AXABnwH/AQABcAGfAf8BfwF7AZAB/gGPAYYBvgH/AY8BhgG+Af8BjwGGAb4B/wGPAYYBvgH/AY8BhgG+
+        Af8BjwGGAb4B/wGPAYYBvgH/AY8BhgG+Af8BkQGHAcAB/wGRAYcBwAH/AZEBhwHAAf8BkQGHAcAB/wGR
+        AYcBwAH/AZEBhwHAAf8BkQGHAcAB/wEGAWABkgH+AQABXwHAAf8BAAFfAcAB/wEAAV8BwAH/AQABXwHA
+        Af8BAAFfAcAB/wEAAV8BwAH/AQABXwHAAf8BAAFfAcAB/wEAAWABwgH/AQABYAHCAf8BAAFgAcIB/wEA
+        AWABwgH/AQABYAHCAf8BAAFgAcIB/wEAAWABwgH/ATABfAF/Af4BKAGHAYwB/wEoAYcBjAH/ASgBhwGM
+        Af8BKAGHAYwB/wEoAYcBjAH/ASgBhwGMAf8BKAGHAYwB/wEoAYcBjAH/ASkBiQGOAf8BKQGJAY4B/wEp
+        AYkBjgH/ASkBiQGOAf8BKQGJAY4B/wEpAYkBjgH/ASkBiQGOAf8BBgFvAX8B/gEAAXEBoQH/AQABcQGh
+        Af8BAAFxAaEB/wEAAXEBoQH/AQABcQGhAf8BAAFxAaEB/wEAAXEBoQH/AQABcQGhAf8BAAFyAaIB/wEA
+        AXIBogH/AQABcgGiAf8BAAFyAaIB/wEAAXIBogH/AQABcgGiAf8BAAFyAaIB/wFWAVEBkwH9AWYBXgGT
+        Af8BZwFgAZUB/wFnAWABlQH/AWcBYAGVAf8BZwFgAZUB/wFxAWkBogH/AY4BhQG8Af8BkQGHAcAB/wGS
+        AYkBwgH/AZIBiQHCAf8BkgGJAcIB/wGSAYkBwgH/AZIBiQHCAf8BkgGJAcIB/wGSAYkBwgH/AQ4BQgGV
+        Af0BAAFHAZUB/wEAAUgBlwH/AQABSAGXAf8BAAFIAZcB/wEAAUgBlwH/AQABTwGkAf8BAAFeAb8B/wEA
+        AWABwgH/AQABYQHEAf8BAAFhAcQB/wEAAWEBxAH/AQABYQHEAf8BAAFhAcQB/wEAAWEBxAH/AQABYQHE
+        Af8BMwFSAVQB/QEdAWABYwH/AR0BYQFlAf8BHQFhAWUB/wEdAWEBZQH/AR0BYQFlAf8BIQFqAW4B/wEo
+        AYYBiwH/ASkBiQGOAf8BKQGKAY8B/wEpAYoBjwH/ASkBigGPAf8BKQGKAY8B/wEpAYoBjwH/ASkBigGP
+        Af8BKQGKAY8B/wEOAUwBYwH9AQABVQFzAf8BAAFWAXUB/wEAAVYBdQH/AQABVgF1Af8BAAFWAXUB/wEA
+        AV8BiQH/AQABcAGfAf8BAAFyAaIB/wEAAXMBpAH/AQABcwGkAf8BAAFzAaQB/wEAAXMBpAH/AQABcwGk
+        Af8BAAFzAaQB/wEAAXMBpAH/AV8BVgGdAf0BbQFlAZwB/wFuAWYBngH/AW4BZgGeAf8BbgFmAZ4B/wFu
+        AWYBngH/AW4BZgGeAf8BdQFtAagB/wGVAYsBxgH/AZUBiwHGAf8BlgGNAcgB/wGWAY0ByAH/AZYBjQHI
+        Af8BlgGNAcgB/wGWAY0ByAH/AZYBjQHIAf8BEAFGAZ8B/QEAAUwBngH/AQABTQGgAf8BAAFNAaAB/wEA
+        AU0BoAH/AQABTQGgAf8BAAFNAaAB/wEAAVIBqgH/AQABYwHIAf8BAAFjAcgB/wEAAWQBygH/AQABZAHK
+        Af8BAAFkAcoB/wEAAWQBygH/AQABZAHKAf8BAAFkAcoB/wE2AVcBXAH9AR8BZgFqAf8BIAFoAWwB/wEg
+        AWgBbAH/ASABaAFsAf8BIAFoAWwB/wEgAWgBbAH/ASIBbgFzAf8BKgGNAZIB/wEqAY0BkgH/ASsBjgGT
+        Af8BKwGOAZMB/wErAY4BkwH/ASsBjgGTAf8BKwGOAZMB/wErAY4BkwH/ARABUAGFAf0BAAFbAYQB/wEA
+        AVwBhgH/AQABXAGGAf8BAAFcAYYB/wEAAVwBhgH/AQABXAGGAf8BAAFiAY4B/wEAAXYBpwH/AQABdgGn
+        Af8BAAGAAakB/wEAAYABqQH/AQABgAGpAf8BAAGAAakB/wEAAYABqQH/AQABgAGpAf8DWwHLAXUBbQGo
+        Af8BdgFuAagB/wF2AW4BqAH/AXYBbgGoAf8BdgFuAagB/wF2AW4BqAH/AYEBbwGpAf8BigGBAbYB/wGW
+        AY0BxwH/AZYBjQHIAf8BmAGOAckB/wGYAY4ByQH/AZgBjgHJAf8BlgGNAcgB/wGWAY0BxwH/AVgCWwHL
+        AQABUwGqAf8BAAFSAaoB/wEAAVIBqgH/AQABUgGqAf8BAAFSAaoB/wEAAVIBqgH/AQABUwGsAf8BAAFb
+        AbgB/wEAAWQByQH/AQABZAHKAf8BAAFlAcwB/wEAAWUBzAH/AQABZQHMAf8BAAFkAcoB/wEAAWQByQH/
+        AVgCWwHLASMBbgFzAf8BIwFvAXQB/wEjAW8BdAH/ASMBbwF0Af8BIwFvAXQB/wEjAW8BdAH/ASQBcQF1
+        Af8BJgGCAYcB/wErAY4BkwH/ASsBjgGTAf8BKwGQAZUB/wErAZABlQH/ASsBkAGVAf8BKwGOAZMB/wEr
+        AY4BkwH/AVgCWwHLAQABYwGOAf8BAAFjAY4B/wEAAWMBjgH/AQABYwGOAf8BAAFjAY4B/wEAAWMBjgH/
+        AQABZQGPAf8BAAFsAZoB/wEAAYABqQH/AQABgAGpAf8BAAGBAaoB/wEAAYEBqgH/AQABgQGqAf8BAAGA
+        AakB/wEAAYABqQH/AwEBAgMDAQQDAwEEAwMBBAMDAQQDAwEEAwMBBAMDAQQDBwEKA14B0AGUAYsBxAH/
+        AZUBjQHHAf8BlQGNAccB/wGVAY0BxwH/AZUBjQHHAf8CZQFtAeUDAQECAwMBBAMDAQQDAwEEAwMBBAMD
+        AQQDAwEEAwMBBAMHAQoBWwJeAdABAAFkAcYB/wEAAWQByQH/AQABZAHJAf8BAAFkAckB/wEAAWQByQH/
+        AVQBZQFtAeUDAQECAwMBBAMDAQQDAwEEAwMBBAMDAQQDAwEEAwMBBAMHAQoBWwJeAdABLAGNAZEB/wEs
+        AY4BkwH/ASwBjgGTAf8BLAGOAZMB/wEsAY4BkwH/AVYCZQHlAwEBAgMDAQQDAwEEAwMBBAMDAQQDAwEE
+        AwMBBAMDAQQDBwEKAVsCXgHQAQABdgGmAf8BAAGAAagB/wEAAYABqAH/AQABgAGoAf8BAAGAAagB/wFU
+        AWUBZwHlJAADAQECAw0BEgMbASYDHAEoAxwBKAMaASUDAQECJAADAQECAw0BEgMbASYDHAEoAxwBKAMa
+        ASUDAQECJAADAQECAw0BEgMbASYDHAEoAxwBKAMaASUDAQECJAADAQECAw0BEgMbASYDHAEoAxwBKAMa
+        ASUDAQEC/wD/AAIAAwEBAgMaASUDHAEoAxwBKAMcASgDHAEoAxwBKAMcASgDHAEoAxwBKAMcASgDHAEo
+        AxwBKAMcASgDGgElAwEBAgMBAQIDGgElAxwBKAMcASgDHAEoAxwBKAMcASgDHAEoAxwBKAMcASgDHAEo
+        AxwBKAMcASgDHAEoAxoBJQMBAQIDAQECAxoBJQMcASgDHAEoAxwBKAMcASgDHAEoAxwBKAMcASgDHAEo
+        AxwBKAMcASgDHAEoAxwBKAMaASUDAQECAwEBAgMaASUDHAEoAxwBKAMcASgDHAEoAxwBKAMcASgDHAEo
+        AxwBKAMcASgDHAEoAxwBKAMcASgDGgElAwEBAgJWAWUB5QEKARsBmgH/AQoBGwGaAf8BCgEbAZoB/wEK
+        ARsBmgH/AQoBGwGaAf8BCgEbAZoB/wEKARsBmgH/AQoBGwGaAf8BCgEbAZoB/wEKARsBmgH/AQoBGwGa
+        Af8BCgEbAZoB/wEKARsBmgH/AQoBGwGaAf8CVgFlAeUBZQFWAWUB5QGPASwBjwH/AY8BLAGPAf8BjwEs
+        AY8B/wGPASwBjwH/AY8BLAGPAf8BjwEsAY8B/wGPASwBjwH/AY8BLAGPAf8BjwEsAY8B/wGPASwBjwH/
+        AY8BLAGPAf8BjwEsAY8B/wGPASwBjwH/AY8BLAGPAf8BZQFWAWUB5QFUAmUB5QEAApoB/wEAApoB/wEA
+        ApoB/wEAApoB/wEAApoB/wEAApoB/wEAApoB/wEAApoB/wEAApoB/wEAApoB/wEAApoB/wEAApoB/wEA
+        ApoB/wEAApoB/wFUAmUB5QNlAeUDkQH/A5EB/wORAf8DkQH/A5EB/wORAf8DkQH/A5EB/wORAf8DkQH/
+        A5EB/wORAf8DkQH/A5EB/wNlAeUBDAEdAakB/wELAR4BqwH/AQsBHgGrAf8BCwEeAasB/wELAR4BqwH/
+        AQsBHgGrAf8BCwEeAasB/wELAR4BqwH/AQsBHgGrAf8BCwEeAasB/wELAR4BqwH/AQsBHgGrAf8BCwEe
+        AasB/wELAR4BqwH/AQsBHgGrAf8BDAEdAakB/wGdATIBnQH/AZ8BMgGfAf8BnwEyAZ8B/wGfATIBnwH/
+        AZ8BMgGfAf8BnwEyAZ8B/wGfATIBnwH/AZ8BMgGfAf8BnwEyAZ8B/wGfATIBnwH/AZ8BMgGfAf8BnwEy
+        AZ8B/wGfATIBnwH/AZ8BMgGfAf8BnwEyAZ8B/wGdATIBnQH/AQACqQH/AQACqwH/AQACqwH/AQACqwH/
+        AQACqwH/AQACqwH/AQACqwH/AQACqwH/AQACqwH/AQACqwH/AQACqwH/AQACqwH/AQACqwH/AQACqwH/
+        AQACqwH/AQACqQH/A6AB/wOhAf8DoQH/A6EB/wOhAf8DoQH/A6EB/wOhAf8DoQH/A6EB/wOhAf8DoQH/
+        A6EB/wOhAf8DoQH/A6AB/wEMAR8BsAH/AQwBHwGwAf8BDAEfAbAB/wEMAR8BsAH/AQwBHwGwAf8BDAEf
+        AbAB/wEMAR8BsAH/AQwBHwGwAf8BDAEfAbAB/wEMAR8BsAH/AQwBHwGwAf8BDAEfAbAB/wEMAR8BsAH/
+        AQwBHwGwAf8BDAEfAbAB/wEMAR8BsAH/AaQBNAGkAf8BpAE0AaQB/wGkATQBpAH/AaQBNAGkAf8BpAE0
+        AaQB/wGkATQBpAH/AaQBNAGkAf8BpAE0AaQB/wGkATQBpAH/AaQBNAGkAf8BpAE0AaQB/wGkATQBpAH/
+        AaQBNAGkAf8BpAE0AaQB/wGkATQBpAH/AaQBNAGkAf8BAAKwAf8BAAKwAf8BAAKwAf8BAAKwAf8BAAKw
+        Af8BAAKwAf8BAAKwAf8BAAKwAf8BAAKwAf8BAAKwAf8BAAKwAf8BAAKwAf8BAAKwAf8BAAKwAf8BAAKw
+        Af8BAAKwAf8DpwH/A6cB/wOnAf8DpwH/A6cB/wOnAf8DpwH/A6cB/wOnAf8DpwH/A6cB/wOnAf8DpwH/
+        A6cB/wOnAf8DpwH/AQwBIAG0Af8BDAEgAbQB/wEMASABtAH/AQwBIAG0Af8BDAEgAbQB/wEMASABtAH/
+        AQwBIAG0Af8BDAEgAbQB/wEMASABtAH/AQwBIAG0Af8BDAEgAbQB/wEMASABtAH/AQwBIAG0Af8BDAEg
+        AbQB/wEMASABtAH/AQwBIAG0Af8BqAE1AagB/wGoATUBqAH/AagBNQGoAf8BqAE1AagB/wGoATUBqAH/
+        AagBNQGoAf8BqAE1AagB/wGoATUBqAH/AagBNQGoAf8BqAE1AagB/wGoATUBqAH/AagBNQGoAf8BqAE1
+        AagB/wGoATUBqAH/AagBNQGoAf8BqAE1AagB/wEAArQB/wEAArQB/wEAArQB/wEAArQB/wEAArQB/wEA
+        ArQB/wEAArQB/wEAArQB/wEAArQB/wEAArQB/wEAArQB/wEAArQB/wEAArQB/wEAArQB/wEAArQB/wEA
+        ArQB/wOqAf8DqgH/A6oB/wOqAf8DqgH/A6oB/wOqAf8DqgH/A6oB/wOqAf8DqgH/A6oB/wOqAf8DqgH/
+        A6oB/wOqAf8BDAEgAbYB/wEMASABtgH/AQwBIAG2Af8BDAEgAbYB/wEMASABtgH/AQwBIAG2Af8BDAEg
+        AbYB/wEMASABtgH/AQwBIAG2Af8BDAEgAbYB/wEMASABtgH/AQwBIAG2Af8BDAEgAbYB/wEMASABtgH/
+        AQwBIAG2Af8BDAEgAbYB/wGqATYBqgH/AaoBNgGqAf8BqgE2AaoB/wGqATYBqgH/AaoBNgGqAf8BqgE2
+        AaoB/wGqATYBqgH/AaoBNgGqAf8BqgE2AaoB/wGqATYBqgH/AaoBNgGqAf8BqgE2AaoB/wGqATYBqgH/
+        AaoBNgGqAf8BqgE2AaoB/wGqATYBqgH/AQACtgH/AQACtgH/AQACtgH/AQACtgH/AQACtgH/AQACtgH/
+        AQACtgH/AQACtgH/AQACtgH/AQACtgH/AQACtgH/AQACtgH/AQACtgH/AQACtgH/AQACtgH/AQACtgH/
+        A6wB/wOsAf8DrAH/A6wB/wOsAf8DrAH/A6wB/wOsAf8DrAH/A6wB/wOsAf8DrAH/A6wB/wOsAf8DrAH/
+        A6wB/wENASEBuAH/AQ0BIQG4Af8BDQEhAbgB/wENASEBuAH/AQ0BIQG4Af8BDQEhAbgB/wENASEBuAH/
+        AQ0BIQG4Af8BDQEhAbgB/wENASEBuAH/AQ0BIQG4Af8BDQEhAbgB/wENASEBuAH/AQ0BIQG4Af8BDQEh
+        AbgB/wENASEBuAH/AasBNwGrAf8BqwE3AasB/wGrATcBqwH/AasBNwGrAf8BqwE3AasB/wGrATcBqwH/
+        AasBNwGrAf8BqwE3AasB/wGrATcBqwH/AasBNwGrAf8BqwE3AasB/wGrATcBqwH/AasBNwGrAf8BqwE3
+        AasB/wGrATcBqwH/AasBNwGrAf8BAAK4Af8BAAK4Af8BAAK4Af8BAAK4Af8BAAK4Af8BAAK4Af8BAAK4
+        Af8BAAK4Af8BAAK4Af8BAAK4Af8BAAK4Af8BAAK4Af8BAAK4Af8BAAK4Af8BAAK4Af8BAAK4Af8DrgH/
+        A64B/wOuAf8DrgH/A64B/wOuAf8DrgH/A64B/wOuAf8DrgH/A64B/wOuAf8DrgH/A64B/wOuAf8DrgH/
+        AQ4BIQG3Af8BDQEhAbgB/wENASEBuwH/AQ0BIQG7Af8BDQEhAbsB/wENASEBuwH/AQ0BIQG7Af8BDQEh
+        AbsB/wENASEBuwH/AQ0BIQG7Af8BDQEhAbsB/wENASEBuwH/AQ0BIQG7Af8BDQEhAbsB/wENASEBuwH/
+        AQ0BIQG7Af8BqgE3AaoB/wGrATcBqwH/Aa8BOAGvAf8BrwE4Aa8B/wGvATgBrwH/Aa8BOAGvAf8BrwE4
+        Aa8B/wGvATgBrwH/Aa8BOAGvAf8BrwE4Aa8B/wGvATgBrwH/Aa8BOAGvAf8BrwE4Aa8B/wGvATgBrwH/
+        Aa8BOAGvAf8BrwE4Aa8B/wEAArcB/wEAArgB/wEAArsB/wEAArsB/wEAArsB/wEAArsB/wEAArsB/wEA
+        ArsB/wEAArsB/wEAArsB/wEAArsB/wEAArsB/wEAArsB/wEAArsB/wEAArsB/wEAArsB/wOtAf8DrgH/
+        A7EB/wOxAf8DsQH/A7EB/wOxAf8DsQH/A7EB/wOxAf8DsQH/A7EB/wOxAf8DsQH/A7EB/wOxAf8BGgEs
+        AZAB/gENASIBvQH/AQ0BIgG9Af8BDQEiAb0B/wENASIBvQH/AQ0BIgG9Af8BDQEiAb0B/wENASIBvQH/
+        AQ0BIgG9Af8BDQEiAb8B/wENASIBvwH/AQ0BIgG/Af8BDQEiAb8B/wENASIBvwH/AQ0BIgG/Af8BDQEi
+        Ab8B/wGFAT8BhQH+AbEBOQGxAf8BsQE5AbEB/wGxATkBsQH/AbEBOQGxAf8BsQE5AbEB/wGxATkBsQH/
+        AbEBOQGxAf8BsQE5AbEB/wGyATkBsgH/AbIBOQGyAf8BsgE5AbIB/wGyATkBsgH/AbIBOQGyAf8BsgE5
+        AbIB/wGyATkBsgH/AQYCkAH+AQACvQH/AQACvQH/AQACvQH/AQACvQH/AQACvQH/AQACvQH/AQACvQH/
+        AQACvQH/AQACvwH/AQACvwH/AQACvwH/AQACvwH/AQACvwH/AQACvwH/AQACvwH/A4cB/gOzAf8DswH/
+        A7MB/wOzAf8DswH/A7MB/wOzAf8DswH/A7UB/wO1Af8DtQH/A7UB/wO1Af8DtQH/A7UB/wEfAS8BkgH9
+        AQgBGAGSAf8BCAEYAZQB/wEIARgBlAH/AQgBGAGUAf8BCAEYAZQB/wEKARsBoQH/AQ0BIQG7Af8BDQEi
+        Ab8B/wEOASMBwQH/AQ4BIwHBAf8BDgEjAcEB/wEOASMBwQH/AQ4BIwHBAf8BDgEjAcEB/wEOASMBwQH/
+        AYkBQAGJAf0BiAEqAYgB/wGKASoBigH/AYoBKgGKAf8BigEqAYoB/wGKASoBigH/AZYBLwGWAf8BrwE4
+        Aa8B/wGyATkBsgH/AbQBOgG0Af8BtAE6AbQB/wG0AToBtAH/AbQBOgG0Af8BtAE6AbQB/wG0AToBtAH/
+        AbQBOgG0Af8BDgKSAf0BAAKSAf8BAAKUAf8BAAKUAf8BAAKUAf8BAAKUAf8BAAKhAf8BAAK7Af8BAAK/
+        Af8BAALBAf8BAALBAf8BAALBAf8BAALBAf8BAALBAf8BAALBAf8BAALBAf8DigH9A4oB/wOMAf8DjAH/
+        A4wB/wOMAf8DmAH/A7EB/wO1Af8DtwH/A7cB/wO3Af8DtwH/A7cB/wO3Af8DtwH/ASEBMgGcAf0BCQEa
+        AZwB/wEJARsBnQH/AQkBGwGdAf8BCQEbAZ0B/wEJARsBnQH/AQkBGwGdAf8BCwEdAacB/wEOASMBxQH/
+        AQ4BIwHFAf8BDgEkAccB/wEOASQBxwH/AQ4BJAHHAf8BDgEkAccB/wEOASQBxwH/AQ4BJAHHAf8BkgFA
+        AZIB/QGRAS0BkQH/AZMBLgGTAf8BkwEuAZMB/wGTAS4BkwH/AZMBLgGTAf8BkwEuAZMB/wGcATEBnAH/
+        AbgBOwG4Af8BuAE7AbgB/wG5ATwBuQH/AbkBPAG5Af8BuQE8AbkB/wG5ATwBuQH/AbkBPAG5Af8BuQE8
+        AbkB/wEQApwB/QEAApwB/wEAAp0B/wEAAp0B/wEAAp0B/wEAAp0B/wEAAp0B/wEAAqcB/wEAAsUB/wEA
+        AsUB/wEAAscB/wEAAscB/wEAAscB/wEAAscB/wEAAscB/wEAAscB/wOUAf0DkwH/A5UB/wOVAf8DlQH/
+        A5UB/wOVAf8DngH/A7oB/wO6Af8DvAH/A7wB/wO8Af8DvAH/A7wB/wO8Af8CWAFbAcsBDQEeAacB/wEM
+        AR4BpwH/AQwBHgGnAf8BDAEeAacB/wEMAR4BpwH/AQwBHgGnAf8BDAEeAakB/wENASABtQH/AQ8BJAHG
+        Af8BDgEkAccB/wEOASQByQH/AQ4BJAHJAf8BDgEkAckB/wEOASQBxwH/AQ8BJAHGAf8BWwFYAVsBywGc
+        ATMBnAH/AZwBMQGcAf8BnAExAZwB/wGcATEBnAH/AZwBMQGcAf8BnAExAZwB/wGdATIBnQH/AakBNgGp
+        Af8BuAE8AbgB/wG5ATwBuQH/AbsBPQG7Af8BuwE9AbsB/wG7AT0BuwH/AbkBPAG5Af8BuAE8AbgB/wFY
+        AlsBywEAAqcB/wEAAqcB/wEAAqcB/wEAAqcB/wEAAqcB/wEAAqcB/wEAAqkB/wEAArUB/wEAAsYB/wEA
+        AscB/wEAAskB/wEAAskB/wEAAskB/wEAAscB/wEAAsYB/wNbAcsDngH/A54B/wOeAf8DngH/A54B/wOe
+        Af8DoAH/A6sB/wO7Af8DvAH/A74B/wO+Af8DvgH/A7wB/wO7Af8DAQECAwMBBAMDAQQDAwEEAwMBBAMD
+        AQQDAwEEAwMBBAMHAQoCWwFeAdABEQElAcMB/wEPASUBxgH/AQ8BJQHGAf8BDwElAcYB/wEPASUBxgH/
+        AlYBbQHlAwEBAgMDAQQDAwEEAwMBBAMDAQQDAwEEAwMBBAMDAQQDBwEKAV4BWwFeAdABtwE9AbcB/wG4
+        ATwBuAH/AbgBPAG4Af8BuAE8AbgB/wG4ATwBuAH/AWsBVgFrAeUDAQECAwMBBAMDAQQDAwEEAwMBBAMD
+        AQQDAwEEAwMBBAMHAQoBWwJeAdABAALDAf8BAALGAf8BAALGAf8BAALGAf8BAALGAf8BVAJtAeUDAQEC
+        AwMBBAMDAQQDAwEEAwMBBAMDAQQDAwEEAwMBBAMHAQoDXgHQA7kB/wO7Af8DuwH/A7sB/wO7Af8DawHl
+        JAADAQECAw0BEgMbASYDHAEoAxwBKAMaASUDAQECJAADAQECAw0BEgMbASYDHAEoAxwBKAMaASUDAQEC
+        JAADAQECAw0BEgMbASYDHAEoAxwBKAMaASUDAQECJAADAQECAw0BEgMbASYDHAEoAxwBKAMaASUDAQEC
+        /wD/AAIAAwEBAgMaASUDHAEoAxwBKAMcASgDHAEoAxwBKAMcASgDHAEoAxwBKAMcASgDHAEoAxwBKAMc
+        ASgDGgElAwEBAgMBAQIDGgElAxwBKAMcASgDHAEoAxwBKAMcASgDHAEoAxwBKAMcASgDHAEoAxwBKAMc
+        ASgDHAEoAxoBJQMBAQIDAQECAxoBJQMcASgDHAEoAxwBKAMcASgDHAEoAxwBKAMcASgDHAEoAxwBKAMc
+        ASgDHAEoAxwBKAMaASUDAQECAwEBAgMaASUDHAEoAxwBKAMcASgDHAEoAxwBKAMcASgDHAEoAxwBKAMc
+        ASgDHAEoAxwBKAMcASgDGgElAwEBAgNeAeUDUgH/A1IB/wNSAf8DUgH/A1IB/wNSAf8DUgH/A1IB/wNS
+        Af8DUgH/A1IB/wNSAf8DUgH/A1IB/wNeAeUCZQFUAeUBmwFoAQAB/wGbAWgBAAH/AZsBaAEAAf8BmwFo
+        AQAB/wGbAWgBAAH/AZsBaAEAAf8BmwFoAQAB/wGbAWgBAAH/AZsBaAEAAf8BmwFoAQAB/wGbAWgBAAH/
+        AZsBaAEAAf8BmwFoAQAB/wGbAWgBAAH/AmUBVAHlAVQBZQFUAeUBAAFzAQAB/wEAAXMBAAH/AQABcwEA
+        Af8BAAFzAQAB/wEAAXMBAAH/AQABcwEAAf8BAAFzAQAB/wEAAXMBAAH/AQABcwEAAf8BAAFzAQAB/wEA
+        AXMBAAH/AQABcwEAAf8BAAFzAQAB/wEAAXMBAAH/AVQBZQFUAeUCZQFeAeUCjwFSAf8CjwFSAf8CjwFS
+        Af8CjwFSAf8CjwFSAf8CjwFSAf8CjwFSAf8CjwFSAf8CjwFSAf8CjwFSAf8CjwFSAf8CjwFSAf8CjwFS
+        Af8CjwFSAf8CZQFeAeUDWgH/A1sB/wNbAf8DWwH/A1sB/wNbAf8DWwH/A1sB/wNbAf8DWwH/A1sB/wNb
+        Af8DWwH/A1sB/wNbAf8DWgH/AaoBcgEAAf8BrAFzAQAB/wGsAXMBAAH/AawBcwEAAf8BrAFzAQAB/wGs
+        AXMBAAH/AawBcwEAAf8BrAFzAQAB/wGsAXMBAAH/AawBcwEAAf8BrAFzAQAB/wGsAXMBAAH/AawBcwEA
+        Af8BrAFzAQAB/wGsAXMBAAH/AaoBcgEAAf8BAAGHAQAB/wEAAYgBAAH/AQABiAEAAf8BAAGIAQAB/wEA
+        AYgBAAH/AQABiAEAAf8BAAGIAQAB/wEAAYgBAAH/AQABiAEAAf8BAAGIAQAB/wEAAYgBAAH/AQABiAEA
+        Af8BAAGIAQAB/wEAAYgBAAH/AQABiAEAAf8BAAGHAQAB/wKdAVoB/wKeAVsB/wKeAVsB/wKeAVsB/wKe
+        AVsB/wKeAVsB/wKeAVsB/wKeAVsB/wKeAVsB/wKeAVsB/wKeAVsB/wKeAVsB/wKeAVsB/wKeAVsB/wKe
+        AVsB/wKdAVoB/wNeAf8DXgH/A14B/wNeAf8DXgH/A14B/wNeAf8DXgH/A14B/wNeAf8DXgH/A14B/wNe
+        Af8DXgH/A14B/wNeAf8BsgGAAQAB/wGyAYABAAH/AbIBgAEAAf8BsgGAAQAB/wGyAYABAAH/AbIBgAEA
+        Af8BsgGAAQAB/wGyAYABAAH/AbIBgAEAAf8BsgGAAQAB/wGyAYABAAH/AbIBgAEAAf8BsgGAAQAB/wGy
+        AYABAAH/AbIBgAEAAf8BsgGAAQAB/wEAAY0BAAH/AQABjQEAAf8BAAGNAQAB/wEAAY0BAAH/AQABjQEA
+        Af8BAAGNAQAB/wEAAY0BAAH/AQABjQEAAf8BAAGNAQAB/wEAAY0BAAH/AQABjQEAAf8BAAGNAQAB/wEA
+        AY0BAAH/AQABjQEAAf8BAAGNAQAB/wEAAY0BAAH/AqQBXgH/AqQBXgH/AqQBXgH/AqQBXgH/AqQBXgH/
+        AqQBXgH/AqQBXgH/AqQBXgH/AqQBXgH/AqQBXgH/AqQBXgH/AqQBXgH/AqQBXgH/AqQBXgH/AqQBXgH/
+        AqQBXgH/A2AB/wNgAf8DYAH/A2AB/wNgAf8DYAH/A2AB/wNgAf8DYAH/A2AB/wNgAf8DYAH/A2AB/wNg
+        Af8DYAH/A2AB/wG1AYMBAAH/AbUBgwEAAf8BtQGDAQAB/wG1AYMBAAH/AbUBgwEAAf8BtQGDAQAB/wG1
+        AYMBAAH/AbUBgwEAAf8BtQGDAQAB/wG1AYMBAAH/AbUBgwEAAf8BtQGDAQAB/wG1AYMBAAH/AbUBgwEA
+        Af8BtQGDAQAB/wG1AYMBAAH/AQABkAEAAf8BAAGQAQAB/wEAAZABAAH/AQABkAEAAf8BAAGQAQAB/wEA
+        AZABAAH/AQABkAEAAf8BAAGQAQAB/wEAAZABAAH/AQABkAEAAf8BAAGQAQAB/wEAAZABAAH/AQABkAEA
+        Af8BAAGQAQAB/wEAAZABAAH/AQABkAEAAf8CpwFgAf8CpwFgAf8CpwFgAf8CpwFgAf8CpwFgAf8CpwFg
+        Af8CpwFgAf8CpwFgAf8CpwFgAf8CpwFgAf8CpwFgAf8CpwFgAf8CpwFgAf8CpwFgAf8CpwFgAf8CpwFg
+        Af8DYgH/A2IB/wNiAf8DYgH/A2IB/wNiAf8DYgH/A2IB/wNiAf8DYgH/A2IB/wNiAf8DYgH/A2IB/wNi
+        Af8DYgH/AbcBhAEAAf8BtwGEAQAB/wG3AYQBAAH/AbcBhAEAAf8BtwGEAQAB/wG3AYQBAAH/AbcBhAEA
+        Af8BtwGEAQAB/wG3AYQBAAH/AbcBhAEAAf8BtwGEAQAB/wG3AYQBAAH/AbcBhAEAAf8BtwGEAQAB/wG3
+        AYQBAAH/AbcBhAEAAf8BAAGRAQAB/wEAAZEBAAH/AQABkQEAAf8BAAGRAQAB/wEAAZEBAAH/AQABkQEA
+        Af8BAAGRAQAB/wEAAZEBAAH/AQABkQEAAf8BAAGRAQAB/wEAAZEBAAH/AQABkQEAAf8BAAGRAQAB/wEA
+        AZEBAAH/AQABkQEAAf8BAAGRAQAB/wKpAWIB/wKpAWIB/wKpAWIB/wKpAWIB/wKpAWIB/wKpAWIB/wKp
+        AWIB/wKpAWIB/wKpAWIB/wKpAWIB/wKpAWIB/wKpAWIB/wKpAWIB/wKpAWIB/wKpAWIB/wKpAWIB/wNj
+        Af8DYwH/A2MB/wNjAf8DYwH/A2MB/wNjAf8DYwH/A2MB/wNjAf8DYwH/A2MB/wNjAf8DYwH/A2MB/wNj
+        Af8BuQGGAQAB/wG5AYYBAAH/AbkBhgEAAf8BuQGGAQAB/wG5AYYBAAH/AbkBhgEAAf8BuQGGAQAB/wG5
+        AYYBAAH/AbkBhgEAAf8BuQGGAQAB/wG5AYYBAAH/AbkBhgEAAf8BuQGGAQAB/wG5AYYBAAH/AbkBhgEA
+        Af8BuQGGAQAB/wEAAZMBAAH/AQABkwEAAf8BAAGTAQAB/wEAAZMBAAH/AQABkwEAAf8BAAGTAQAB/wEA
+        AZMBAAH/AQABkwEAAf8BAAGTAQAB/wEAAZMBAAH/AQABkwEAAf8BAAGTAQAB/wEAAZMBAAH/AQABkwEA
+        Af8BAAGTAQAB/wEAAZMBAAH/AqsBYwH/AqsBYwH/AqsBYwH/AqsBYwH/AqsBYwH/AqsBYwH/AqsBYwH/
+        AqsBYwH/AqsBYwH/AqsBYwH/AqsBYwH/AqsBYwH/AqsBYwH/AqsBYwH/AqsBYwH/AqsBYwH/A2MB/wNj
+        Af8DZQH/A2UB/wNlAf8DZQH/A2UB/wNlAf8DZQH/A2UB/wNlAf8DZQH/A2UB/wNlAf8DZQH/A2UB/wG4
+        AYYBAAH/AbkBhgEAAf8BvQGIAQAB/wG9AYgBAAH/Ab0BiAEAAf8BvQGIAQAB/wG9AYgBAAH/Ab0BiAEA
+        Af8BvQGIAQAB/wG9AYgBAAH/Ab0BiAEAAf8BvQGIAQAB/wG9AYgBAAH/Ab0BiAEAAf8BvQGIAQAB/wG9
+        AYgBAAH/AQABkwEAAf8BAAGTAQAB/wEAAZYBAAH/AQABlgEAAf8BAAGWAQAB/wEAAZYBAAH/AQABlgEA
+        Af8BAAGWAQAB/wEAAZYBAAH/AQABlgEAAf8BAAGWAQAB/wEAAZYBAAH/AQABlgEAAf8BAAGWAQAB/wEA
+        AZYBAAH/AQABlgEAAf8CqgFjAf8CqwFjAf8CrgFlAf8CrgFlAf8CrgFlAf8CrgFlAf8CrgFlAf8CrgFl
+        Af8CrgFlAf8CrgFlAf8CrgFlAf8CrgFlAf8CrgFlAf8CrgFlAf8CrgFlAf8CrgFlAf8DZgH+A2YB/wNm
+        Af8DZgH/A2YB/wNmAf8DZgH/A2YB/wNmAf8DZwH/A2cB/wNnAf8DZwH/A2cB/wNnAf8DZwH/AZEBfQEH
+        Af4BvwGKAQAB/wG/AYoBAAH/Ab8BigEAAf8BvwGKAQAB/wG/AYoBAAH/Ab8BigEAAf8BvwGKAQAB/wG/
+        AYoBAAH/AcEBiwEAAf8BwQGLAQAB/wHBAYsBAAH/AcEBiwEAAf8BwQGLAQAB/wHBAYsBAAH/AcEBiwEA
+        Af8BDQF/AQ0B/gEAAZcBAAH/AQABlwEAAf8BAAGXAQAB/wEAAZcBAAH/AQABlwEAAf8BAAGXAQAB/wEA
+        AZcBAAH/AQABlwEAAf8BAAGZAQAB/wEAAZkBAAH/AQABmQEAAf8BAAGZAQAB/wEAAZkBAAH/AQABmQEA
+        Af8BAAGZAQAB/wKEAWYB/gKwAWYB/wKwAWYB/wKwAWYB/wKwAWYB/wKwAWYB/wKwAWYB/wKwAWYB/wKw
+        AWYB/wKyAWcB/wKyAWcB/wKyAWcB/wKyAWcB/wKyAWcB/wKyAWcB/wKyAWcB/wNGAf0DTQH/A04B/wNO
+        Af8DTgH/A04B/wNVAf8DZQH/A2cB/wNoAf8DaAH/A2gB/wNoAf8DaAH/A2gB/wNoAf8BlAFTAQ8B/QGT
+        AWEBAAH/AZUBYwEAAf8BlQFjAQAB/wGVAWMBAAH/AZUBYwEAAf8BowFsAQAB/wG9AYgBAAH/AcEBiwEA
+        Af8BwwGNAQAB/wHDAY0BAAH/AcMBjQEAAf8BwwGNAQAB/wHDAY0BAAH/AcMBjQEAAf8BwwGNAQAB/wEU
+        AVwBFAH9AQABbAEAAf8BAAFtAQAB/wEAAW0BAAH/AQABbQEAAf8BAAFtAQAB/wEAAYEBAAH/AQABlgEA
+        Af8BAAGZAQAB/wEAAZoBAAH/AQABmgEAAf8BAAGaAQAB/wEAAZoBAAH/AQABmgEAAf8BAAGaAQAB/wEA
+        AZoBAAH/AogBRgH9AogBTQH/AooBTgH/AooBTgH/AooBTgH/AooBTgH/ApYBVQH/Aq4BZQH/ArIBZwH/
+        ArMBaAH/ArMBaAH/ArMBaAH/ArMBaAH/ArMBaAH/ArMBaAH/ArMBaAH/A0oB/QNSAf8DUwH/A1MB/wNT
+        Af8DUwH/A1MB/wNZAf8DagH/A2oB/wNrAf8DawH/A2sB/wNrAf8DawH/A2sB/wGeAVoBEQH9AZ0BaAEA
+        Af8BnwFqAQAB/wGfAWoBAAH/AZ8BagEAAf8BnwFqAQAB/wGfAWoBAAH/AagBcAEAAf8BxgGPAQAB/wHG
+        AY8BAAH/AcgBkQEAAf8ByAGRAQAB/wHIAZEBAAH/AcgBkQEAAf8ByAGRAQAB/wHIAZEBAAH/ARYBZAEW
+        Af0BAAFzAQAB/wEAAXUBAAH/AQABdQEAAf8BAAF1AQAB/wEAAXUBAAH/AQABdQEAAf8BAAGFAQAB/wEA
+        AZ0BAAH/AQABnQEAAf8BAAGfAQAB/wEAAZ8BAAH/AQABnwEAAf8BAAGfAQAB/wEAAZ8BAAH/AQABnwEA
+        Af8CkgFKAf0CkQFSAf8CkgFTAf8CkgFTAf8CkgFTAf8CkgFTAf8CkgFTAf8CmwFZAf8CtwFqAf8CtwFq
+        Af8CuQFrAf8CuQFrAf8CuQFrAf8CuQFrAf8CuQFrAf8CuQFrAf8DWwHLA1oB/wNZAf8DWQH/A1kB/wNZ
+        Af8DWQH/A1oB/wNiAf8DawH/A2sB/wNsAf8DbAH/A2wB/wNrAf8DawH/AlsBWAHLAagBcAEAAf8BqAFx
+        AQAB/wGoAXEBAAH/AagBcQEAAf8BqAFxAQAB/wGoAXEBAAH/AaoBcwEAAf8BtgGEAQAB/wHHAZEBAAH/
+        AcgBkQEAAf8BygGSAQAB/wHKAZIBAAH/AcoBkgEAAf8ByAGRAQAB/wHHAZEBAAH/AVgBWwFYAcsBAAGF
+        AQAB/wEAAYUBAAH/AQABhQEAAf8BAAGFAQAB/wEAAYUBAAH/AQABhQEAAf8BAAGHAQAB/wEAAZEBAAH/
+        AQABnwEAAf8BAAGfAQAB/wEAAaABAAH/AQABoAEAAf8BAAGgAQAB/wEAAZ8BAAH/AQABnwEAAf8DWwHL
+        ApsBWgH/ApsBWQH/ApsBWQH/ApsBWQH/ApsBWQH/ApsBWQH/Ap0BWgH/AqgBYgH/ArgBawH/ArkBawH/
+        AroBbAH/AroBbAH/AroBbAH/ArkBawH/ArgBawH/AwEBAgMDAQQDAwEEAwMBBAMDAQQDAwEEAwMBBAMD
+        AQQDBwEKA14B0ANrAf8DawH/A2sB/wNrAf8DawH/A2UB5QMBAQIDAwEEAwMBBAMDAQQDAwEEAwMBBAMD
+        AQQDAwEEAwcBCgJeAVsB0AHEAY4BAAH/AccBkQEAAf8BxwGRAQAB/wHHAZEBAAH/AccBkQEAAf8BbQFl
+        AVQB5QMBAQIDAwEEAwMBBAMDAQQDAwEEAwMBBAMDAQQDAwEEAwcBCgFbAV4BWwHQAQMBnAEDAf8BAAGe
+        AQAB/wEAAZ4BAAH/AQABngEAAf8BAAGeAQAB/wFWAWcBVgHlAwEBAgMDAQQDAwEEAwMBBAMDAQQDAwEE
+        AwMBBAMDAQQDBwEKA14B0AK2AWsB/wK4AWsB/wK4AWsB/wK4AWsB/wK4AWsB/wJrAWUB5SQAAwEBAgMN
+        ARIDGwEmAxwBKAMcASgDGgElAwEBAiQAAwEBAgMNARIDGwEmAxwBKAMcASgDGgElAwEBAiQAAwEBAgMN
+        ARIDGwEmAxwBKAMcASgDGgElAwEBAiQAAwEBAgMNARIDGwEmAxwBKAMcASgDGgElAwEBAv8A/wACAAMB
+        AQIDGgElAxwBKAMcASgDHAEoAxwBKAMcASgDHAEoAxwBKAMcASgDHAEoAxwBKAMcASgDHAEoAxoBJQMB
+        AQIDAQECAxoBJQMcASgDHAEoAxwBKAMcASgDHAEoAxwBKAMcASgDHAEoAxwBKAMcASgDHAEoAxwBKAMa
+        ASUDAQECAwEBAgMaASUDHAEoAxwBKAMcASgDHAEoAxwBKAMcASgDHAEoAxwBKAMcASgDHAEoAxwBKAMc
+        ASgDGgElAwEBAgMBAQIDGgElAxwBKAMcASgDHAEoAxwBKAMcASgDHAEoAxwBKAMcASgDHAEoAxwBKAMc
+        ASgDHAEoAxoBJQMBAQICVAFlAeUCAAFfAf8CAAFfAf8CAAFfAf8CAAFfAf8CAAFfAf8CAAFfAf8CAAFf
+        Af8CAAFfAf8CAAFfAf8CAAFfAf8CAAFfAf8CAAFfAf8CAAFfAf8CAAFfAf8CVAFlAeUBZQFUAVgB5QFz
+        AQABTgH/AXMBAAFOAf8BcwEAAU4B/wFzAQABTgH/AXMBAAFOAf8BcwEAAU4B/wFzAQABTgH/AXMBAAFO
+        Af8BcwEAAU4B/wFzAQABTgH/AXMBAAFOAf8BcwEAAU4B/wFzAQABTgH/AXMBAAFOAf8BZQFUAV4B5QFU
+        AVYBZQHlAQABSAFnAf8BAAFIAWcB/wEAAUgBZwH/AQABSAFnAf8BAAFIAWcB/wEAAUgBZwH/AQABSAFn
+        Af8BAAFIAWcB/wEAAUgBZwH/AQABSAFnAf8BAAFIAWcB/wEAAUgBZwH/AQABSAFnAf8BAAFIAWcB/wFU
+        AVYBZQHlA2UB5QNxAf8DcQH/A3EB/wNxAf8DcQH/A3EB/wNxAf8DcQH/A3EB/wNxAf8DcQH/A3EB/wNx
+        Af8DcQH/A2UB5QIAAWgB/wIAAWkB/wIAAWkB/wIAAWkB/wIAAWkB/wIAAWkB/wIAAWkB/wIAAWkB/wIA
+        AWkB/wIAAWkB/wIAAWkB/wIAAWkB/wIAAWkB/wIAAWkB/wIAAWkB/wIAAWgB/wGIAQABVQH/AYoBAAFW
+        Af8BigEAAVYB/wGKAQABVgH/AYoBAAFWAf8BigEAAVYB/wGKAQABVgH/AYoBAAFWAf8BigEAAVYB/wGK
+        AQABVgH/AYoBAAFWAf8BigEAAVYB/wGKAQABVgH/AYoBAAFWAf8BigEAAVYB/wGIAQABVQH/AQABTwFw
+        Af8BAAFQAXIB/wEAAVABcgH/AQABUAFyAf8BAAFQAXIB/wEAAVABcgH/AQABUAFyAf8BAAFQAXIB/wEA
+        AVABcgH/AQABUAFyAf8BAAFQAXIB/wEAAVABcgH/AQABUAFyAf8BAAFQAXIB/wEAAVABcgH/AQABTwFw
+        Af8DhQH/A4YB/wOGAf8DhgH/A4YB/wOGAf8DhgH/A4YB/wOGAf8DhgH/A4YB/wOGAf8DhgH/A4YB/wOG
+        Af8DhQH/AgABbQH/AgABbQH/AgABbQH/AgABbQH/AgABbQH/AgABbQH/AgABbQH/AgABbQH/AgABbQH/
+        AgABbQH/AgABbQH/AgABbQH/AgABbQH/AgABbQH/AgABbQH/AgABbQH/AY4BAAFZAf8BjgEAAVkB/wGO
+        AQABWQH/AY4BAAFZAf8BjgEAAVkB/wGOAQABWQH/AY4BAAFZAf8BjgEAAVkB/wGOAQABWQH/AY4BAAFZ
+        Af8BjgEAAVkB/wGOAQABWQH/AY4BAAFZAf8BjgEAAVkB/wGOAQABWQH/AY4BAAFZAf8BAAFTAXYB/wEA
+        AVMBdgH/AQABUwF2Af8BAAFTAXYB/wEAAVMBdgH/AQABUwF2Af8BAAFTAXYB/wEAAVMBdgH/AQABUwF2
+        Af8BAAFTAXYB/wEAAVMBdgH/AQABUwF2Af8BAAFTAXYB/wEAAVMBdgH/AQABUwF2Af8BAAFTAXYB/wOL
+        Af8DiwH/A4sB/wOLAf8DiwH/A4sB/wOLAf8DiwH/A4sB/wOLAf8DiwH/A4sB/wOLAf8DiwH/A4sB/wOL
+        Af8CAAFvAf8CAAFvAf8CAAFvAf8CAAFvAf8CAAFvAf8CAAFvAf8CAAFvAf8CAAFvAf8CAAFvAf8CAAFv
+        Af8CAAFvAf8CAAFvAf8CAAFvAf8CAAFvAf8CAAFvAf8CAAFvAf8BkQEAAVsB/wGRAQABWwH/AZEBAAFb
+        Af8BkQEAAVsB/wGRAQABWwH/AZEBAAFbAf8BkQEAAVsB/wGRAQABWwH/AZEBAAFbAf8BkQEAAVsB/wGR
+        AQABWwH/AZEBAAFbAf8BkQEAAVsB/wGRAQABWwH/AZEBAAFbAf8BkQEAAVsB/wEAAVUBggH/AQABVQGC
+        Af8BAAFVAYIB/wEAAVUBggH/AQABVQGCAf8BAAFVAYIB/wEAAVUBggH/AQABVQGCAf8BAAFVAYIB/wEA
+        AVUBggH/AQABVQGCAf8BAAFVAYIB/wEAAVUBggH/AQABVQGCAf8BAAFVAYIB/wEAAVUBggH/A44B/wOO
+        Af8DjgH/A44B/wOOAf8DjgH/A44B/wOOAf8DjgH/A44B/wOOAf8DjgH/A44B/wOOAf8DjgH/A44B/wIA
+        AXEB/wIAAXEB/wIAAXEB/wIAAXEB/wIAAXEB/wIAAXEB/wIAAXEB/wIAAXEB/wIAAXEB/wIAAXEB/wIA
+        AXEB/wIAAXEB/wIAAXEB/wIAAXEB/wIAAXEB/wIAAXEB/wGTAQABXAH/AZMBAAFcAf8BkwEAAVwB/wGT
+        AQABXAH/AZMBAAFcAf8BkwEAAVwB/wGTAQABXAH/AZMBAAFcAf8BkwEAAVwB/wGTAQABXAH/AZMBAAFc
+        Af8BkwEAAVwB/wGTAQABXAH/AZMBAAFcAf8BkwEAAVwB/wGTAQABXAH/AQABVgGDAf8BAAFWAYMB/wEA
+        AVYBgwH/AQABVgGDAf8BAAFWAYMB/wEAAVYBgwH/AQABVgGDAf8BAAFWAYMB/wEAAVYBgwH/AQABVgGD
+        Af8BAAFWAYMB/wEAAVYBgwH/AQABVgGDAf8BAAFWAYMB/wEAAVYBgwH/AQABVgGDAf8DjwH/A48B/wOP
+        Af8DjwH/A48B/wOPAf8DjwH/A48B/wOPAf8DjwH/A48B/wOPAf8DjwH/A48B/wOPAf8DjwH/AgABcgH/
+        AgABcgH/AgABcgH/AgABcgH/AgABcgH/AgABcgH/AgABcgH/AgABcgH/AgABcgH/AgABcgH/AgABcgH/
+        AgABcgH/AgABcgH/AgABcgH/AgABcgH/AgABcgH/AZQBAAFdAf8BlAEAAV0B/wGUAQABXQH/AZQBAAFd
+        Af8BlAEAAV0B/wGUAQABXQH/AZQBAAFdAf8BlAEAAV0B/wGUAQABXQH/AZQBAAFdAf8BlAEAAV0B/wGU
+        AQABXQH/AZQBAAFdAf8BlAEAAV0B/wGUAQABXQH/AZQBAAFdAf8BAAFXAYQB/wEAAVcBhAH/AQABVwGE
+        Af8BAAFXAYQB/wEAAVcBhAH/AQABVwGEAf8BAAFXAYQB/wEAAVcBhAH/AQABVwGEAf8BAAFXAYQB/wEA
+        AVcBhAH/AQABVwGEAf8BAAFXAYQB/wEAAVcBhAH/AQABVwGEAf8BAAFXAYQB/wORAf8DkQH/A5EB/wOR
+        Af8DkQH/A5EB/wORAf8DkQH/A5EB/wORAf8DkQH/A5EB/wORAf8DkQH/A5EB/wORAf8CAAFyAf8CAAFy
+        Af8CAAF0Af8CAAF0Af8CAAF0Af8CAAF0Af8CAAF0Af8CAAF0Af8CAAF0Af8CAAF0Af8CAAF0Af8CAAF0
+        Af8CAAF0Af8CAAF0Af8CAAF0Af8CAAF0Af8BlAEAAV0B/wGUAQABXQH/AZcBAAFfAf8BlwEAAV8B/wGX
+        AQABXwH/AZcBAAFfAf8BlwEAAV8B/wGXAQABXwH/AZcBAAFfAf8BlwEAAV8B/wGXAQABXwH/AZcBAAFf
+        Af8BlwEAAV8B/wGXAQABXwH/AZcBAAFfAf8BlwEAAV8B/wEAAVcBhAH/AQABVwGEAf8BAAFZAYcB/wEA
+        AVkBhwH/AQABWQGHAf8BAAFZAYcB/wEAAVkBhwH/AQABWQGHAf8BAAFZAYcB/wEAAVkBhwH/AQABWQGH
+        Af8BAAFZAYcB/wEAAVkBhwH/AQABWQGHAf8BAAFZAYcB/wEAAVkBhwH/A5EB/wORAf8DkwH/A5MB/wOT
+        Af8DkwH/A5MB/wOTAf8DkwH/A5MB/wOTAf8DkwH/A5MB/wOTAf8DkwH/A5MB/wIGAXMB/gIAAXYB/wIA
+        AXYB/wIAAXYB/wIAAXYB/wIAAXYB/wIAAXYB/wIAAXYB/wIAAXYB/wIAAYAB/wIAAYAB/wIAAYAB/wIA
+        AYAB/wIAAYAB/wIAAYAB/wIAAYAB/wF/AQYBYgH+AZkBAAFgAf8BmQEAAWAB/wGZAQABYAH/AZkBAAFg
+        Af8BmQEAAWAB/wGZAQABYAH/AZkBAAFgAf8BmQEAAWAB/wGaAQABYQH/AZoBAAFhAf8BmgEAAWEB/wGa
+        AQABYQH/AZoBAAFhAf8BmgEAAWEB/wGaAQABYQH/AQYBXAF8Af4BAAFaAYgB/wEAAVoBiAH/AQABWgGI
+        Af8BAAFaAYgB/wEAAVoBiAH/AQABWgGIAf8BAAFaAYgB/wEAAVoBiAH/AQABWwGKAf8BAAFbAYoB/wEA
+        AVsBigH/AQABWwGKAf8BAAFbAYoB/wEAAVsBigH/AQABWwGKAf8DfwH+A5UB/wOVAf8DlQH/A5UB/wOV
+        Af8DlQH/A5UB/wOVAf8DlgH/A5YB/wOWAf8DlgH/A5YB/wOWAf8DlgH/Ag4BTgH9AgABWQH/AgABWgH/
+        AgABWgH/AgABWgH/AgABWgH/AgABYwH/AgABdAH/AgABgAH/AgABgQH/AgABgQH/AgABgQH/AgABgQH/
+        AgABgQH/AgABgQH/AgABgQH/AV4BDgFDAf0BbQEAAUgB/wFvAQABSQH/AW8BAAFJAf8BbwEAAUkB/wFv
+        AQABSQH/AYIBAAFRAf8BlwEAAV8B/wGaAQABYQH/AZwBAAFiAf8BnAEAAWIB/wGcAQABYgH/AZwBAAFi
+        Af8BnAEAAWIB/wGcAQABYgH/AZwBAAFiAf8BDgFAAVIB/QEAAUMBYAH/AQABRAFiAf8BAAFEAWIB/wEA
+        AUQBYgH/AQABRAFiAf8BAAFLAWsB/wEAAVkBhwH/AQABWwGKAf8BAAFcAYsB/wEAAVwBiwH/AQABXAGL
+        Af8BAAFcAYsB/wEAAVwBiwH/AQABXAGLAf8BAAFcAYsB/wNbAf0DagH/A2sB/wNrAf8DawH/A2sB/wN2
+        Af8DkwH/A5YB/wOYAf8DmAH/A5gB/wOYAf8DmAH/A5gB/wOYAf8CEAFSAf0CAAFfAf8CAAFgAf8CAAFg
+        Af8CAAFgAf8CAAFgAf8CAAFgAf8CAAFnAf8CAAGEAf8CAAGEAf8CAAGFAf8CAAGFAf8CAAGFAf8CAAGF
+        Af8CAAGFAf8CAAGFAf8BgAEQAUcB/QF1AQABTgH/AXYBAAFPAf8BdgEAAU8B/wF2AQABTwH/AXYBAAFP
+        Af8BdgEAAU8B/wGHAQABVAH/AZ8BAAFlAf8BnwEAAWUB/wGgAQABZgH/AaABAAFmAf8BoAEAAWYB/wGg
+        AQABZgH/AaABAAFmAf8BoAEAAWYB/wEQAUQBWAH9AQABSAFnAf8BAAFJAWgB/wEAAUkBaAH/AQABSQFo
+        Af8BAAFJAWgB/wEAAUkBaAH/AQABTgFvAf8BAAFeAY4B/wEAAV4BjgH/AQABXwGPAf8BAAFfAY8B/wEA
+        AV8BjwH/AQABXwGPAf8BAAFfAY8B/wEAAV8BjwH/A2IB/QNxAf8DcwH/A3MB/wNzAf8DcwH/A3MB/wOD
+        Af8DmwH/A5sB/wOcAf8DnAH/A5wB/wOcAf8DnAH/A5wB/wJYAVsBywIAAWcB/wIAAWgB/wIAAWgB/wIA
+        AWgB/wIAAWgB/wIAAWgB/wIAAWkB/wIAAXEB/wIAAYUB/wIAAYUB/wIAAYYB/wIAAYYB/wIAAYYB/wIA
+        AYUB/wIAAYUB/wFbAVgBWwHLAYcBAAFVAf8BhwEAAVQB/wGHAQABVAH/AYcBAAFUAf8BhwEAAVQB/wGH
+        AQABVAH/AYgBAAFVAf8BkwEAAVwB/wGgAQABZgH/AaABAAFmAf8BogEAAWcB/wGiAQABZwH/AaIBAAFn
+        Af8BoAEAAWYB/wGgAQABZgH/AVgCWwHLAQABTwFvAf8BAAFOAXAB/wEAAU4BcAH/AQABTgFwAf8BAAFO
+        AXAB/wEAAU4BcAH/AQABTwFxAf8BAAFWAYMB/wEAAV8BjwH/AQABXwGPAf8BAAFgAZAB/wEAAWABkAH/
+        AQABYAGQAf8BAAFfAY8B/wEAAV8BjwH/A1sBywODAf8DgwH/A4MB/wODAf8DgwH/A4MB/wOFAf8DjwH/
+        A5wB/wOcAf8DngH/A54B/wOeAf8DnAH/A5wB/wMBAQIDAwEEAwMBBAMDAQQDAwEEAwMBBAMDAQQDAwEE
+        AwcBCgJbAV4B0AIAAYQB/wIAAYUB/wIAAYUB/wIAAYUB/wIAAYUB/wJUAWUB5QMBAQIDAwEEAwMBBAMD
+        AQQDAwEEAwMBBAMDAQQDAwEEAwcBCgFeAVsBXgHQAZ4BAAFmAf8BnwEAAWYB/wGfAQABZgH/AZ8BAAFm
+        Af8BnwEAAWYB/wFnAVQBZQHlAwEBAgMDAQQDAwEEAwMBBAMDAQQDAwEEAwMBBAMDAQQDBwEKAVsCXgHQ
+        AQABXwGOAf8BAAFfAY8B/wEAAV8BjwH/AQABXwGPAf8BAAFfAY8B/wFUAmUB5QMBAQIDAwEEAwMBBAMD
+        AQQDAwEEAwMBBAMDAQQDAwEEAwcBCgNeAdADmgH/A5sB/wObAf8DmwH/A5sB/wNmAeUkAAMBAQIDDQES
+        AxsBJgMcASgDHAEoAxoBJQMBAQIkAAMBAQIDDQESAxsBJgMcASgDHAEoAxoBJQMBAQIkAAMBAQIDDQES
+        AxsBJgMcASgDHAEoAxoBJQMBAQIkAAMBAQIDDQESAxsBJgMcASgDHAEoAxoBJQMBAQL/AP8AAgADAQEC
+        AxoBJQMcASgDHAEoAxwBKAMcASgDHAEoAxwBKAMcASgDHAEoAxwBKAMcASgDHAEoAxwBKAMaASUDAQEC
+        AwEBAgMaASUDHAEoAxwBKAMcASgDHAEoAxwBKAMcASgDHAEoAxwBKAMcASgDHAEoAxwBKAMcASgDGgEl
+        AwEBAgMBAQIDGgElAxwBKAMcASgDHAEoAxwBKAMcASgDHAEoAxwBKAMcASgDHAEoAxwBKAMcASgDHAEo
+        AxoBJQMBAQIDAQECAxoBJQMcASgDHAEoAxwBKAMcASgDHAEoAxwBKAMcASgDHAEoAxwBKAMcASgDHAEo
+        AxwBKAMaASUDAQECA1YB5QMlAf8DJQH/AyUB/wMlAf8DJQH/AyUB/wMlAf8DJQH/AyUB/wMlAf8DJQH/
+        AyUB/wMlAf8DJQH/A1YB5QFlAlYB5QGIAR8BBwH/AYgBHwEHAf8BiAEfAQcB/wGIAR8BBwH/AYgBHwEH
+        Af8BiAEfAQcB/wGIAR8BBwH/AYgBHwEHAf8BiAEfAQcB/wGIAR8BBwH/AYgBHwEHAf8BiAEfAQcB/wGI
+        AR8BBwH/AYgBHwEHAf8BZQJWAeUBVAFWAVQB5QEAAUoBAAH/AQABSgEAAf8BAAFKAQAB/wEAAUoBAAH/
+        AQABSgEAAf8BAAFKAQAB/wEAAUoBAAH/AQABSgEAAf8BAAFKAQAB/wEAAUoBAAH/AQABSgEAAf8BAAFK
+        AQAB/wEAAUoBAAH/AQABSgEAAf8BVAFWAVQB5QFkAWUBVAHlAV4BYwEAAf8BXgFjAQAB/wFeAWMBAAH/
+        AV4BYwEAAf8BXgFjAQAB/wFeAWMBAAH/AV4BYwEAAf8BXgFjAQAB/wFeAWMBAAH/AV4BYwEAAf8BXgFj
+        AQAB/wFeAWMBAAH/AV4BYwEAAf8BXgFjAQAB/wJlAVQB5QMpAf8DKgH/AyoB/wMqAf8DKgH/AyoB/wMq
+        Af8DKgH/AyoB/wMqAf8DKgH/AyoB/wMqAf8DKgH/AyoB/wMpAf8BlQEiAQkB/wGXASMBCAH/AZcBIwEI
+        Af8BlwEjAQgB/wGXASMBCAH/AZcBIwEIAf8BlwEjAQgB/wGXASMBCAH/AZcBIwEIAf8BlwEjAQgB/wGX
+        ASMBCAH/AZcBIwEIAf8BlwEjAQgB/wGXASMBCAH/AZcBIwEIAf8BlQEiAQkB/wEAAVEBAAH/AQABUgEA
+        Af8BAAFSAQAB/wEAAVIBAAH/AQABUgEAAf8BAAFSAQAB/wEAAVIBAAH/AQABUgEAAf8BAAFSAQAB/wEA
+        AVIBAAH/AQABUgEAAf8BAAFSAQAB/wEAAVIBAAH/AQABUgEAAf8BAAFSAQAB/wEAAVEBAAH/AWcBbQEA
+        Af8BaAFuAQAB/wFoAW4BAAH/AWgBbgEAAf8BaAFuAQAB/wFoAW4BAAH/AWgBbgEAAf8BaAFuAQAB/wFo
+        AW4BAAH/AWgBbgEAAf8BaAFuAQAB/wFoAW4BAAH/AWgBbgEAAf8BaAFuAQAB/wFoAW4BAAH/AWcBbQEA
+        Af8DKwH/AysB/wMrAf8DKwH/AysB/wMrAf8DKwH/AysB/wMrAf8DKwH/AysB/wMrAf8DKwH/AysB/wMr
+        Af8DKwH/AZwBJAEJAf8BnAEkAQkB/wGcASQBCQH/AZwBJAEJAf8BnAEkAQkB/wGcASQBCQH/AZwBJAEJ
+        Af8BnAEkAQkB/wGcASQBCQH/AZwBJAEJAf8BnAEkAQkB/wGcASQBCQH/AZwBJAEJAf8BnAEkAQkB/wGc
+        ASQBCQH/AZwBJAEJAf8BAAFVAQAB/wEAAVUBAAH/AQABVQEAAf8BAAFVAQAB/wEAAVUBAAH/AQABVQEA
+        Af8BAAFVAQAB/wEAAVUBAAH/AQABVQEAAf8BAAFVAQAB/wEAAVUBAAH/AQABVQEAAf8BAAFVAQAB/wEA
+        AVUBAAH/AQABVQEAAf8BAAFVAQAB/wFsAXIBAAH/AWwBcgEAAf8BbAFyAQAB/wFsAXIBAAH/AWwBcgEA
+        Af8BbAFyAQAB/wFsAXIBAAH/AWwBcgEAAf8BbAFyAQAB/wFsAXIBAAH/AWwBcgEAAf8BbAFyAQAB/wFs
+        AXIBAAH/AWwBcgEAAf8BbAFyAQAB/wFsAXIBAAH/AywB/wMsAf8DLAH/AywB/wMsAf8DLAH/AywB/wMs
+        Af8DLAH/AywB/wMsAf8DLAH/AywB/wMsAf8DLAH/AywB/wGfASUBCQH/AZ8BJQEJAf8BnwElAQkB/wGf
+        ASUBCQH/AZ8BJQEJAf8BnwElAQkB/wGfASUBCQH/AZ8BJQEJAf8BnwElAQkB/wGfASUBCQH/AZ8BJQEJ
+        Af8BnwElAQkB/wGfASUBCQH/AZ8BJQEJAf8BnwElAQkB/wGfASUBCQH/AQABVwEAAf8BAAFXAQAB/wEA
+        AVcBAAH/AQABVwEAAf8BAAFXAQAB/wEAAVcBAAH/AQABVwEAAf8BAAFXAQAB/wEAAVcBAAH/AQABVwEA
+        Af8BAAFXAQAB/wEAAVcBAAH/AQABVwEAAf8BAAFXAQAB/wEAAVcBAAH/AQABVwEAAf8BbwF1AQAB/wFv
+        AXUBAAH/AW8BdQEAAf8BbwF1AQAB/wFvAXUBAAH/AW8BdQEAAf8BbwF1AQAB/wFvAXUBAAH/AW8BdQEA
+        Af8BbwF1AQAB/wFvAXUBAAH/AW8BdQEAAf8BbwF1AQAB/wFvAXUBAAH/AW8BdQEAAf8BbwF1AQAB/wMt
+        Af8DLQH/Ay0B/wMtAf8DLQH/Ay0B/wMtAf8DLQH/Ay0B/wMtAf8DLQH/Ay0B/wMtAf8DLQH/Ay0B/wMt
+        Af8BoQElAQkB/wGhASUBCQH/AaEBJQEJAf8BoQElAQkB/wGhASUBCQH/AaEBJQEJAf8BoQElAQkB/wGh
+        ASUBCQH/AaEBJQEJAf8BoQElAQkB/wGhASUBCQH/AaEBJQEJAf8BoQElAQkB/wGhASUBCQH/AaEBJQEJ
+        Af8BoQElAQkB/wEAAVgBAAH/AQABWAEAAf8BAAFYAQAB/wEAAVgBAAH/AQABWAEAAf8BAAFYAQAB/wEA
+        AVgBAAH/AQABWAEAAf8BAAFYAQAB/wEAAVgBAAH/AQABWAEAAf8BAAFYAQAB/wEAAVgBAAH/AQABWAEA
+        Af8BAAFYAQAB/wEAAVgBAAH/AXABdgEAAf8BcAF2AQAB/wFwAXYBAAH/AXABdgEAAf8BcAF2AQAB/wFw
+        AXYBAAH/AXABdgEAAf8BcAF2AQAB/wFwAXYBAAH/AXABdgEAAf8BcAF2AQAB/wFwAXYBAAH/AXABdgEA
+        Af8BcAF2AQAB/wFwAXYBAAH/AXABdgEAAf8DLgH/Ay4B/wMuAf8DLgH/Ay4B/wMuAf8DLgH/Ay4B/wMu
+        Af8DLgH/Ay4B/wMuAf8DLgH/Ay4B/wMuAf8DLgH/AaIBJgEJAf8BogEmAQkB/wGiASYBCQH/AaIBJgEJ
+        Af8BogEmAQkB/wGiASYBCQH/AaIBJgEJAf8BogEmAQkB/wGiASYBCQH/AaIBJgEJAf8BogEmAQkB/wGi
+        ASYBCQH/AaIBJgEJAf8BogEmAQkB/wGiASYBCQH/AaIBJgEJAf8BAAFZAQAB/wEAAVkBAAH/AQABWQEA
+        Af8BAAFZAQAB/wEAAVkBAAH/AQABWQEAAf8BAAFZAQAB/wEAAVkBAAH/AQABWQEAAf8BAAFZAQAB/wEA
+        AVkBAAH/AQABWQEAAf8BAAFZAQAB/wEAAVkBAAH/AQABWQEAAf8BAAFZAQAB/wFxAYABAAH/AXEBgAEA
+        Af8BcQGAAQAB/wFxAYABAAH/AXEBgAEAAf8BcQGAAQAB/wFxAYABAAH/AXEBgAEAAf8BcQGAAQAB/wFx
+        AYABAAH/AXEBgAEAAf8BcQGAAQAB/wFxAYABAAH/AXEBgAEAAf8BcQGAAQAB/wFxAYABAAH/Ay4B/wMu
+        Af8DLwH/Ay8B/wMvAf8DLwH/Ay8B/wMvAf8DLwH/Ay8B/wMvAf8DLwH/Ay8B/wMvAf8DLwH/Ay8B/wGh
+        ASYBCgH/AaIBJgEJAf8BpQEnAQoB/wGlAScBCgH/AaUBJwEKAf8BpQEnAQoB/wGlAScBCgH/AaUBJwEK
+        Af8BpQEnAQoB/wGlAScBCgH/AaUBJwEKAf8BpQEnAQoB/wGlAScBCgH/AaUBJwEKAf8BpQEnAQoB/wGl
+        AScBCgH/AQABWQEAAf8BAAFZAQAB/wEAAVsBAAH/AQABWwEAAf8BAAFbAQAB/wEAAVsBAAH/AQABWwEA
+        Af8BAAFbAQAB/wEAAVsBAAH/AQABWwEAAf8BAAFbAQAB/wEAAVsBAAH/AQABWwEAAf8BAAFbAQAB/wEA
+        AVsBAAH/AQABWwEAAf8BcQGAAQAB/wFxAYABAAH/AXQBgwEAAf8BdAGDAQAB/wF0AYMBAAH/AXQBgwEA
+        Af8BdAGDAQAB/wF0AYMBAAH/AXQBgwEAAf8BdAGDAQAB/wF0AYMBAAH/AXQBgwEAAf8BdAGDAQAB/wF0
+        AYMBAAH/AXQBgwEAAf8BdAGDAQAB/wM3Af4DLwH/Ay8B/wMvAf8DLwH/Ay8B/wMvAf8DLwH/Ay8B/wMw
+        Af8DMAH/AzAB/wMwAf8DMAH/AzAB/wMwAf8BfwEwARcB/gGnAScBCgH/AacBJwEKAf8BpwEnAQoB/wGn
+        AScBCgH/AacBJwEKAf8BpwEnAQoB/wGnAScBCgH/AacBJwEKAf8BqQEoAQoB/wGpASgBCgH/AakBKAEK
+        Af8BqQEoAQoB/wGpASgBCgH/AakBKAEKAf8BqQEoAQoB/wEGAV4BBgH+AQABXAEAAf8BAAFcAQAB/wEA
+        AVwBAAH/AQABXAEAAf8BAAFcAQAB/wEAAVwBAAH/AQABXAEAAf8BAAFcAQAB/wEAAV0BAAH/AQABXQEA
+        Af8BAAFdAQAB/wEAAV0BAAH/AQABXQEAAf8BAAFdAQAB/wEAAV0BAAH/AXIBeQEGAf4BdQGEAQAB/wF1
+        AYQBAAH/AXUBhAEAAf8BdQGEAQAB/wF1AYQBAAH/AXUBhAEAAf8BdQGEAQAB/wF1AYQBAAH/AXYBhgEA
+        Af8BdgGGAQAB/wF2AYYBAAH/AXYBhgEAAf8BdgGGAQAB/wF2AYYBAAH/AXYBhgEAAf8DOAH9AyIB/wMj
+        Af8DIwH/AyMB/wMjAf8DJwH/Ay8B/wMwAf8DMAH/AzAB/wMwAf8DMAH/AzAB/wMwAf8DMAH/AYIBMwEc
+        Af0BgQEcAQYB/wGDAR0BBgH/AYMBHQEGAf8BgwEdAQYB/wGDAR0BBgH/AY4BIAEHAf8BpQEnAQoB/wGp
+        ASgBCgH/AaoBKAEKAf8BqgEoAQoB/wGqASgBCgH/AaoBKAEKAf8BqgEoAQoB/wGqASgBCgH/AaoBKAEK
+        Af8BDgFAAQ4B/QEAAUUBAAH/AQABRgEAAf8BAAFGAQAB/wEAAUYBAAH/AQABRgEAAf8BAAFNAQAB/wEA
+        AVsBAAH/AQABXQEAAf8BAAFeAQAB/wEAAV4BAAH/AQABXgEAAf8BAAFeAQAB/wEAAV4BAAH/AQABXgEA
+        Af8BAAFeAQAB/wFNAVABDgH9AVgBXQEAAf8BWgFeAQAB/wFaAV4BAAH/AVoBXgEAAf8BWgFeAQAB/wFi
+        AWgBAAH/AXQBgwEAAf8BdgGGAQAB/wGAAYcBAAH/AYABhwEAAf8BgAGHAQAB/wGAAYcBAAH/AYABhwEA
+        Af8BgAGHAQAB/wGAAYcBAAH/AzwB/QMlAf8DJgH/AyYB/wMmAf8DJgH/AyYB/wMpAf8DMQH/AzEB/wMy
+        Af8DMgH/AzIB/wMyAf8DMgH/AzIB/wGLATYBHwH9AYkBHwEHAf8BiwEfAQcB/wGLAR8BBwH/AYsBHwEH
+        Af8BiwEfAQcB/wGLAR8BBwH/AZMBIgEIAf8BrgEpAQsB/wGuASkBCwH/Aa8BKgELAf8BrwEqAQsB/wGv
+        ASoBCwH/Aa8BKgELAf8BrwEqAQsB/wGvASoBCwH/ARABRQEQAf0BAAFKAQAB/wEAAUsBAAH/AQABSwEA
+        Af8BAAFLAQAB/wEAAUsBAAH/AQABSwEAAf8BAAFQAQAB/wEAAWABAAH/AQABYAEAAf8BAAFhAQAB/wEA
+        AWEBAAH/AQABYQEAAf8BAAFhAQAB/wEAAWEBAAH/AQABYQEAAf8BUgFVARAB/QFfAWQBAAH/AWABZQEA
+        Af8BYAFlAQAB/wFgAWUBAAH/AWABZQEAAf8BYAFlAQAB/wFmAWwBAAH/AYMBigEAAf8BgwGKAQAB/wGE
+        AYsBAAH/AYQBiwEAAf8BhAGLAQAB/wGEAYsBAAH/AYQBiwEAAf8BhAGLAQAB/wNYAcsDKgH/AykB/wMp
+        Af8DKQH/AykB/wMpAf8DKQH/Ay0B/wMyAf8DMgH/AzMB/wMzAf8DMwH/AzIB/wMyAf8BWwJYAcsBlAEj
+        AQoB/wGTASMBCQH/AZMBIwEJAf8BkwEjAQkB/wGTASMBCQH/AZMBIwEJAf8BlQEjAQkB/wGgASUBCgH/
+        Aa4BKgEMAf8BrwEqAQsB/wGxASoBCwH/AbEBKgELAf8BsQEqAQsB/wGvASoBCwH/Aa4BKgEMAf8BWAFb
+        AVgBywEAAVEBAAH/AQABUAEAAf8BAAFQAQAB/wEAAVABAAH/AQABUAEAAf8BAAFQAQAB/wEAAVEBAAH/
+        AQABWAEAAf8BAAFhAQAB/wEAAWEBAAH/AQABYgEAAf8BAAFiAQAB/wEAAWIBAAH/AQABYQEAAf8BAAFh
+        AQAB/wJbAVgBywFmAWwBAAH/AWcBbQEAAf8BZwFtAQAB/wFnAW0BAAH/AWcBbQEAAf8BZwFtAQAB/wFo
+        AW4BAAH/AXABdgEAAf8BhAGLAQAB/wGEAYsBAAH/AYUBjAEAAf8BhQGMAQAB/wGFAYwBAAH/AYQBiwEA
+        Af8BhAGLAQAB/wMBAQIDAwEEAwMBBAMDAQQDAwEEAwMBBAMDAQQDAwEEAwcBCgNbAdADNAH/AzMB/wMz
+        Af8DMwH/AzMB/wNWAeUDAQECAwMBBAMDAQQDAwEEAwMBBAMDAQQDAwEEAwMBBAMHAQoBXgJbAdABrAEr
+        AQ4B/wGuASsBDAH/Aa4BKwEMAf8BrgErAQwB/wGuASsBDAH/AWsCVgHlAwEBAgMDAQQDAwEEAwMBBAMD
+        AQQDAwEEAwMBBAMDAQQDBwEKAVsBXgFbAdABAAFhAQAB/wEAAWEBAAH/AQABYQEAAf8BAAFhAQAB/wEA
+        AWEBAAH/AVQBZQFUAeUDAQECAwMBBAMDAQQDAwEEAwMBBAMDAQQDAwEEAwMBBAMHAQoCXgFbAdABgwGK
+        AQAB/wGEAYsBAAH/AYQBiwEAAf8BhAGLAQAB/wGEAYsBAAH/AmUBVAHlJAADAQECAw0BEgMbASYDHAEo
+        AxwBKAMaASUDAQECJAADAQECAw0BEgMbASYDHAEoAxwBKAMaASUDAQECJAADAQECAw0BEgMbASYDHAEo
+        AxwBKAMaASUDAQECJAADAQECAw0BEgMbASYDHAEoAxwBKAMaASUDAQEC/wD/ABYAAZQBiwHFAf8BhAFK
+        AcQB/wGBAUEBxAH/AYABPwHDAf8BSwE9AcEB/wFLAT8BtgH/KQABJAGXAf8BAAEVAUwB/wEAAQ4BQAH/
+        AQABDAE9Af8BAAEJATcB/wEAAQIBKgH/KAABGAExATMB/wEJASEBIwH/AQMBGQEbAf8BAQEXARkB/wEA
+        ARMBFQH/AQABCQEKAf8pAAEjATIB/wEAARUBIwH/AQABDwEcAf8BAAEOARsB/wEAAQoBFgH/AQABAQEJ
+        Af8gAAG5AbQB0gH/AZ8BlQHSAf8BngGUAdMB/wGcAZIB0gH/AZsBkQHSAf8BmQGOAdIB/wGVAYoB0AH/
+        AYsBgQHLAf8BgAFAAcUB/wFBATsBkQH/GAABJQGUAcsB/wEAATUBtQH/AQABNQG0Af8BAAEzAbIB/wEA
+        ATIBrwH/AQABMAGrAf8BAAEsAaQB/wEAASABjgH/AQABDgFAAf8BAAEUASkB/xgAAYoBnwGhAf8BIwFH
+        AUoB/wEiAUcBSgH/ASEBRgFJAf8BHwFEAUcB/wEdAUIBRQH/ARoBPQFAAf8BEQEuATEB/wECARkBGwH/
+        ARACFwH/GAABSAGUAaEB/wECATYBTAH/AQEBNwFMAf8BAAE1AUsB/wEAATQBSQH/AQABMgFHAf8BAAEt
+        AUIB/wEAASEBMgH/AQABDwEcAf8BCQESARcB/xQAAbwBtwHYAf8BqwGhAeIB/wGuAaMB6AH/AbABpAHs
+        Af8BrwGkAesB/wGvAaQB6gH/Aa8BpAHqAf8BrQGhAegB/wGqAZ8B4gH/AZ0BkwHTAf8BgwFIAcYB/wFA
+        AToBkQH/EAABJwGbAdQB/wEAAUoB2wH/AQABgQHmAf8BAAGCAe0B/wEAAYEB7AH/AQABgQHqAf8BAAGB
+        AeoB/wEAAYEB5AH/AQABSQHZAf8BAAE0AbMB/wEAARUBgAH/AQABEwEoAf8QAAGNAagBqgH/AS0BkwGY
+        Af8BLQGfAaUB/wEvAaUBqwH/AS8BowGpAf8BLgGiAagB/wEuAaIBqAH/ASwBngGjAf8BKwGTAZgB/wEi
+        AUYBSgH/AQkBIgEkAf8BEAEWARcB/xAAAUcBnAGsAf8BAAGBAaAB/wEAAYkBsQH/AQABkQG9Af8BAAGP
+        AboB/wEAAY0BuAH/AQABjQG4Af8BAAGIAa8B/wEAAYEBoAH/AQABNgFMAf8BAAEWASUB/wEIARIBFgH/
+        EAABrAGiAeMB/wGvAaQB6wH/AbUBqgHwAf8BtQGqAfAB/wG1AaoB8AH/AbUBqgHwAf8BsAGlAe0B/wGx
+        AaYB7wH/Aa0BogHnAf8BlwGNAc8B/wGZAY4B0QH/AYIBRwHGAf8RAAFLAd4B/wEAAYEB7QH/AQABiQH6
+        Af8BAAGJAfoB/wEAAYkB+gH/AQABiQH6Af8BAAGDAfAB/wEAAYUB9AH/AQABgQHkAf8BAAEsAaUB/wEA
+        ATABqwH/AQABFAFLAf8QAAEtAZcBnAH/AS8BpAGqAf8BNgGsAbIB/wE2AawBsgH/ATYBrAGyAf8BNgGs
+        AbIB/wEwAaYBrAH/ATEBqQGvAf8BLQGdAaIB/wEcAT0BQAH/AR4BQQFEAf8BCAEgASIB/xEAAYIBpAH/
+        AQABjwG8Af8BAAGbAc0B/wEAAZsBzQH/AQABmwHNAf8BAAGbAc0B/wEAAZIBwAH/AQABlgHGAf8BAAGH
+        Aa0B/wEAAS4BQQH/AQABMQFGAf8BAAEVASQB/wwAAbIBpwHqAf8BtQGrAe0B/wG0AagB8QH/AbUBqgHw
+        Af8BtQGqAfAB/wG1AaoB7wH/AbMBqAHrAf8BpgGdAdMB/wGCAUgBwAH/ATIBIwGuAf8DAAH/AZkBjwHQ
+        Af8BlQGKAdAB/wGBAUQBvQH/CQABggHvAf8BAAGIAfgB/wEAAYkB+gH/AQABiQH6Af8BAAGJAfoB/wEA
+        AYgB+gH/AQABhAHxAf8BAAE8AcIB/wEAAREBRQH/AwAB/wMAAf8BAAEvAaoB/wEAASwBpAH/AQABCwE6
+        Af8IAAEyAaQBqgH/ATcBqQGvAf8BNAGtAbQB/wE2AawBsgH/ATYBrAGyAf8BNgGrAbEB/wE0AaUBqgH/
+        ASoCgQH/AQYBGwEdAf8DAAH/AwAB/wEeAUEBRAH/ARoBPQFAAf8BAgEUARYB/wkAAZABuwH/AQABlwHG
+        Af8BAAGcAdEB/wEAAZsBzQH/AQABmwHNAf8BAAGaAcsB/wEAAZEBvAH/AQgBPAGBAf8BAAERAR0B/wMA
+        Af8DAAH/AQABMQFFAf8BAAEtAUIB/wEAAQsBFQH/CAABtQGqAfIB/wG/AbUB8wH/AbcBrAHwAf8BtQGq
+        AfAB/wGpAaAB2QH/AYkBgQHEAf8BNwEoAbMB/wExASgBjQH/AwAB/wMAAf8BLQEeAasB/wGtAaIB5QH/
+        AaQBmgHXAf8BiAGAAcgB/wkAAYoB/QH/AQABkgL/AQABiwH+Af8BAAGJAfoB/wEAAUIBzgH/AQABGgGD
+        Af8CAAEHAf8DAAH/AwAB/wMAAf8DAAH/AQABgAHhAf8BAAE9AcQB/wEAARsBhQH/CAABNgGuAbUB/wFE
+        AbUBuwH/ATkBrQGzAf8BNgGsAbIB/wEtAYYBigH/AQ4BJgEoAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wEt
+        AZoBoAH/ASgBgQGDAf8BDQEoASoB/wkAAZ4B0gH/AQABqQHiAf8BAAGdAc8B/wEAAZsBzQH/AQYBRQGM
+        Af8BAAEaASgB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AQABhQGqAf8BAwFAAYYB/wEAARwBLAH/CAABvQGz
+        AfMB/wHGAb0B9QH/AboBsAHwAf8BtQGqAfAB/wGVAYoBygH/AYABQAG8Af8BKgEbAaQB/wMAAf8DAAH/
+        AwAB/wGEAUsBwQH/AbIBpwHwAf8BqQGeAeIB/wGOAYIBzQH/CQABkQL/AQABmAL/AQABjQL/AQABiQH6
+        Af8BAAEnAZwB/wEAAQgBNAH/AwAB/wMAAf8DAAH/AwAB/wEAARQBSgH/AQABhgH2Af8BAAFIAdcB/wEA
+        ASMBlAH/CAABQQG0AboB/wGBAboBwAH/AT4BrwG1Af8BNgGsAbIB/wEZATYBOAH/AQABEAESAf8DAAH/
+        AwAB/wMAAf8DAAH/AQkBHwEgAf8BMgGrAbEB/wErAZIBlwH/ARMBMwE1Af8JAAGnAd4B/wEAAa4B5AH/
+        AQABoAHTAf8BAAGbAc0B/wEAASgBOAH/AQABCAESAf8DAAH/AwAB/wMAAf8DAAH/AQABFAEgAf8BAAGY
+        AcoB/wEAAYEBnwH/AQABJQE3Af8IAAHBAbgB9AH/AcoBwgH1Af8BuwGxAfAB/wG1AaoB8AH/AbUBqgHv
+        Af8BtQGqAe8B/wE/ATIBtwH/AwAB/wMAAf8BKQEbAZ0B/wGoAZ8B1wH/Aa8BpAHrAf8BrQGiAeYB/wGR
+        AYUBzgH/CQABlAL/AQABmwL/AQABjQL/AQABiQH6Af8BAAGIAfoB/wEAAYgB+QH/AgABGQH/AwAB/wMA
+        Af8DAAH/AQABQQHLAf8BAAGBAewB/wEAAYEB4gH/AQABJgGaAf8IAAFGAbcBvQH/AYEBvQHCAf8BPgGv
+        AbQB/wE2AawBsgH/ATYBqwGxAf8BNgGrAbEB/wIAAQEB/wMAAf8DAAH/AwAB/wEsAYMBhwH/AS8BowGp
+        Af8BLAGbAaEB/wEWATYBOQH/CQABqwHjAf8BAAGwAeUB/wEAAZ8B0QH/AQABmwHNAf8BAAGaAcsB/wEA
+        AZkByQH/AgABAQH/AwAB/wMAAf8DAAH/AQcBQwGJAf8BAAGPAboB/wEAAYYBrAH/AQABKAE7Af8IAAHA
+        AbcB9AH/Ac8ByAH2Af8BwAG2AfMB/wG0AakB7AH/AbIBqAHqAf8BRwE6AboB/wELAQABxAH/AYMBSgHC
+        Af8BJgEXAaIB/wE/ATIBtwH/AbUBqgHuAf8BtQGqAfAB/wGrAaEB4wH/AZEBhgHNAf8JAAGUAv8BAAGg
+        Av8BAAGTAv8BAAGFAfQB/wEAAYMB8AH/AQABAQEoAf8DAAH/AQABEwFJAf8DAAH/AgABGQH/AQABiAH4
+        Af8BAAGJAfoB/wEAAUsB3QH/AQABJgGZAf8IAAFFAbYBvAH/AYgBwQHGAf8BRQG1AbsB/wE1AacBrAH/
+        ATMBpAGpAf8BAAEJAQsB/wMAAf8BCAEeASAB/wMAAf8CAAEBAf8BNgGqAbAB/wE2AawBsgH/ASwBlgGb
+        Af8BFgE1ATgB/wkAAaoB4wH/AQYBswHmAf8BAAGpAeEB/wEAAZQBwAH/AQABkAG6Af8BAAEBAQsB/wMA
+        Af8BAAETASAB/wMAAf8CAAEBAf8BAAGYAcgB/wEAAZsBzQH/AQABgQGkAf8BAAEnATkB/wgAAbwBsQHz
+        Af8B0wHMAfcB/wHMAcQB9gH/AbsBsgHqAf8BRwE6AboB/wMAAf8BkwGJAckB/wG3AasB8gH/AT4BMAG2
+        Af8BlQGKAcoB/wG2AasB8QH/AbUBqgHwAf8BqwGhAeIB/wGYAY8BzAH/CQABkAL/AQUBowL/AQABnQL/
+        AQABigH9Af8BAAEBASgB/wMAAf8BAAElAZcB/wEAAYsC/wIAARUB/wEAAScBnAH/AQABiwH+Af8BAAGJ
+        AfoB/wEAAUoB2wH/AQABLAGkAf8IAAE/AbMBuQH/AY0BwwHIAf8BgwG/AcQB/wE/AagBrQH/AQABCQEL
+        Af8DAAH/ARcBMwE1Af8BOAGvAbUB/wMAAf8BGQE2ATgB/wE4Aa8BtQH/ATYBrAGyAf8BLAGUAZgB/wEd
+        ATsBPgH/CQABpQHdAf8BCwG1AeYB/wEAAbEB5QH/AQABlgHAAf8BAAEBAQsB/wMAAf8BAAElATUB/wEA
+        AZ8B1QH/AwAB/wEAASgBOAH/AQABngHTAf8BAAGbAc0B/wEAAYEBoAH/AQABLAE+Af8MAAHTAc0B9wH/
+        AdYB0AH3Af8BqQGjAcwB/wExASgBjQH/AZQBigHKAf8BtgGrAfEB/wG1AaoB7gH/AaQBmwHSAf8BrwGl
+        AeQB/wG1AaoB8AH/AbUBqgHwAf8BrAGiAeQB/xAAAQcBowL/AQsBpQL/AQABOwHAAf8DAAH/AQABJwGb
+        Af8BAAGKAf0B/wEAAYgB+AH/AQABOQG9Af8BAAGBAeQB/wEAAYkB+gH/AQABiQH6Af8BAAFMAeAB/xAA
+        AY4BxAHIAf8BkQHGAcoB/wEuAUkBSwH/AwAB/wEZATUBOAH/ATcBrQG0Af8BNgGqAbAB/wEoAUsBgQH/
+        ATABmgGfAf8BNgGsAbIB/wE2AawBsgH/AS0BmQGeAf8QAAEMAbUB5wH/ARABtgHnAf8BEAE3AUcB/wMA
+        Af8BAAEnATgB/wEAAZ0B0AH/AQABmAHIAf8BBwE6AYEB/wEAAYUBqAH/AQABmwHNAf8BAAGbAc0B/wEA
+        AYMBpwH/EAAB3QHYAfkB/wHaAdUB+AH/AcIBuwHmAf8BsAGqAdUB/wHBAbcB8gH/AbsBsgHuAf8BuQGv
+        Ae8B/wG1AaoB8AH/AbUBqgHwAf8BtQGqAfAB/wG1AaoB8AH/AbwBtgHcAf8QAAFJAcEC/wETAakC/wEA
+        AY4C/wEAAUcB1QH/AQABkwL/AQABjQL/AQABjAL/AQABiQH6Af8BAAGJAfoB/wEAAYkB+gH/AQABiQH6
+        Af8BJAGdAdwB/xAAAbEB1wHaAf8BlwHJAc0B/wFKAaUBqQH/ATUBhwGKAf8BRgG0AboB/wE/Aa0BsgH/
+        AT0BrQGyAf8BNgGsAbIB/wE2AawBsgH/ATYBrAGyAf8BNgGsAbIB/wGLAa8BsgH/EAABgQHPAe8B/wEW
+        AbkB6AH/ARABkwG2Af8BEQFFAYgB/wEAAacB3QH/AQABnQHMAf8BAAGcAc0B/wEAAZsBzQH/AQABmwHN
+        Af8BAAGbAc0B/wEAAZsBzQH/AT8BogG3Af8UAAHhAd0B+gH/AdYB0AH4Af8B0wHMAfcB/wHOAccB9gH/
+        AcUBvAH0Af8BvAGxAfIB/wG3Aa0B8AH/AbMBqAHuAf8BsQGmAe8B/wG/AbgB4QH/GAABgQHFAv8BDAGm
+        Av8BBgGjAv8BAAGfAv8BAAGXAv8BAAGPAv8BAAGLAf4B/wEAAYYB9gH/AQABhQH0Af8BJwGiAeIB/xgA
+        AbUB2QHcAf8BkgHGAcoB/wGNAcQByAH/AYYBwAHFAf8BSwG5Ab8B/wE/AbIBuAH/AToBrQGzAf8BNAGp
+        Aa8B/wExAakBsAH/AY0BtgG5Af8YAAGDAdEB8AH/ARABtwHnAf8BCwG1AeYB/wEEAbIB5QH/AQABrAHk
+        Af8BAAGjAdkB/wEAAZwBzgH/AQABlwHGAf8BAAGWAccB/wE+AakBwgH/IAABwwG6AfQB/wHHAb8B9QH/
+        AcsBwwH1Af8BxQG8AfQB/wG8AbEB8wH/AbEBpgHvAf8pAAGWAv8BAAGZAv8BAAGcAv8BAAGXAv8BAAGQ
+        Av8BAAGFAfQB/ygAAUoBuQG+Af8BgQG7AcAB/wGCAb4BwwH/AUsBuQG/Af8BPwGzAbkB/wExAakBrwH/
+        KQABrAHkAf8BAAGuAeQB/wEAAbAB5QH/AQABrAHkAf8BAAGlAd0B/wEAAZYBxgH//wD/ACoAAQgBFAGC
+        Af8BAAEDAUEB/wIAATgB/wIAATUB/wIAAS8B/wIAAR4B/ygAAZIBIAGSAf8BgQEPAYEB/wFKAQkBSgH/
+        AUgBBwFIAf8BQgEGAUIB/wEyAQYBMgH/KQACkAH/AQACRwH/AQACPAH/AQACOQH/AQACMwH/AQACJgH/
+        KAADpQH/A5EB/wOHAf8DhQH/A4EB/wNHAf8gAAGBAYYBvAH/AQkBGgGmAf8BCAEZAacB/wEHARgBpQH/
+        AQYBFgGjAf8BBAEUAaAB/wECAREBmQH/AQABCQGDAf8CAAE4Af8BDAEPASEB/xgAAb4BkwG+Af8BsAEn
+        AbAB/wGxASUBsQH/AbABIwGwAf8BrwEhAa8B/wGsAR8BrAH/AaYBHAGmAf8BkwEUAZMB/wFKAQgBSgH/
+        AS0BGAEtAf8YAAFJAskB/wEAAq0B/wEAAq0B/wEAAqsB/wEAAqgB/wEAAqQB/wEAAp0B/wEAAogB/wEA
+        AjsB/wELAisB/xgAA8kB/wO7Af8DuwH/A7gB/wO2Af8DtQH/A68B/wOeAf8DhwH/AzsB/xQAAYABhwHL
+        Af8BCgEhAdMB/wELASQB4QH/AQwBJgHpAf8BDAEmAecB/wELASUB5gH/AQsBJQHmAf8BCAEiAeEB/wEH
+        AR8B1QH/AQgBGAGmAf8BAAECAUQB/wELAQ4BIAH/EAABxwGWAccB/wHJATsByQH/AdMBPwHTAf8B2QFB
+        AdkB/wHYAUIB2AH/AdcBQAHXAf8B1wFAAdcB/wHSATwB0gH/AcoBOQHKAf8BsAElAbAB/wGCAQ4BggH/
+        AS0BFwEtAf8QAAFLAtEB/wEAAtEB/wEAAtwB/wEAAuQB/wEAAuIB/wEAAuEB/wEAAuEB/wEAAtoB/wEA
+        AtAB/wEAAqwB/wEAAkgB/wEKAioB/xAAA9EB/wPTAf8D2gH/A98B/wPeAf8D3AH/A9wB/wPZAf8D0gH/
+        A7oB/wOSAf8DOgH/EAABDAEjAdcB/wEMASYB6AH/ARQBLgHwAf8BFAEuAfAB/wEUAS4B8AH/ARQBLgHw
+        Af8BDAEnAesB/wEOASgB7wH/AQsBJAHeAf8BBAETAZgB/wEFARUBnwH/AQABAQFCAf8QAAHLAT0BywH/
+        AdgBQQHYAf8B4AFLAeAB/wHgAUsB4AH/AeABSwHgAf8B4AFLAeAB/wHbAUMB2wH/Ad4BRQHeAf8B0QE+
+        AdEB/wGlAR4BpQH/AasBIAGrAf8BgQENAYEB/xEAAtUB/wEAAuMB/wEAAvAB/wEAAvAB/wEAAvAB/wEA
+        AvAB/wEAAuYB/wEAAukB/wEAAtoB/wEAAp4B/wEAAqQB/wEAAkYB/xAAA9UB/wPfAf8D5gH/A+YB/wPm
+        Af8D5gH/A+AB/wPhAf8D2QH/A7AB/wO1Af8DkAH/DAABEQEqAeUB/wEXATAB6wH/ARABKwH0Af8BFAEu
+        AfAB/wEUAS4B8AH/ARQBLgHvAf8BFAEsAeUB/wERASIBrgH/AQABAgE5Af8DAAH/AwAB/wEGARUBnQH/
+        AQIBEQGZAf8CAAEuAf8IAAHXAUYB1wH/AdwBTAHcAf8B4gFJAeIB/wHgAUsB4AH/AeABSwHgAf8B3wFL
+        Ad8B/wHYAUgB2AH/AbIBNAGyAf8BSgEOAUoB/wENAQABDQH/AwAB/wGqASABqgH/AaYBHAGmAf8BQQEL
+        AUEB/wkAAuUB/wEAAu4B/wEAAvAB/wEAAvAB/wEAAvAB/wEAAu8B/wEAAucB/wEAArkB/wEAAkAB/wMA
+        Af8DAAH/AQACowH/AQACnQH/AQACNgH/CAAD3wH/A+QB/wPmAf8D5gH/A+YB/wPlAf8D4AH/A8MB/wOL
+        Af8DFQH/AwAB/wO0Af8DrwH/A4IB/wgAARMBLgH0Af8BKAFAAfUB/wEZATIB8AH/ARQBLgHwAf8BDgEh
+        AcAB/wEAAQgBRwH/AgABAgH/AwAB/wMAAf8DAAH/AwAB/wEKASMB3AH/AQoBHQG4Af8BAAEGAYAB/wgA
+        AeMBSwHjAf8B5gGLAeYB/wHgAYEB4AH/AeABSwHgAf8BuwE5AbsB/wGGARQBhgH/ARkBAAEZAf8DAAH/
+        AwAB/wMAAf8BBQEAAQUB/wHPAT0BzwH/AbgBMAG4Af8BiwERAYsB/wkAAvIB/wEAA/8BAAL0Af8BAALw
+        Af8BAALFAf8BAAKBAf8BAAIFAf8DAAH/AwAB/wMAAf8DAAH/AQAC2AH/AQACvAH/AQACgQH/CAAD5wH/
+        A/IB/wPnAf8D5gH/A8kB/wOYAf8DJwH/AwAB/wMAAf8DAAH/AwkB/wPWAf8DwwH/A5kB/wgAASQBPAH1
+        Af8BNwGAAfYB/wEgATgB7wH/ARQBLgHwAf8BBQETAYwB/wIAASkB/wMAAf8DAAH/AwAB/wMAAf8BAAEE
+        AT0B/wEOASkB8QH/AQYBHgHUAf8BAAEMAYoB/wgAAeYBhwHmAf8B6QGXAekB/wHhAYMB4QH/AeABSwHg
+        Af8BmgEeAZoB/wE9AQgBPQH/AwAB/wMAAf8DAAH/AwAB/wGBARABgQH/Ad8BRgHfAf8ByQE4AckB/wGZ
+        ARcBmQH/CQAD/wEAA/8BAAL5Af8BAALwAf8BAAKWAf8BAAIwAf8DAAH/AwAB/wMAAf8DAAH/AQACRQH/
+        AQAC7AH/AQACzwH/AQACjgH/CAAD8AH/A/kB/wPrAf8D5gH/A6oB/wOBAf8DAAH/AwAB/wMAAf8DAAH/
+        A5AB/wPiAf8D0AH/A6QB/wgAAS0BRAH2Af8BQAGCAfcB/wEhATkB7gH/ARQBLgHwAf8BFAEuAe8B/wEV
+        AS8B7gH/AgABEgH/AwAB/wMAAf8DAAH/AQ8BIgG7Af8BDAEmAecB/wEJASIB3gH/AQABDQGQAf8IAAHn
+        AY4B5wH/AesBnwHrAf8B4AGDAeAB/wHgAUsB4AH/Ad8BSwHfAf8B3gFLAd4B/wEnAQABJwH/AwAB/wMA
+        Af8DAAH/AbkBOAG5Af8B2AFCAdgB/wHQAT0B0AH/AZ4BGAGeAf8JAAP/AQAD/wEAAvkB/wEAAvAB/wEA
+        Au8B/wEAAu8B/wEAAhYB/wMAAf8DAAH/AwAB/wEAAsIB/wEAAuIB/wEAAtkB/wEAApMB/wgAA/QB/wP9
+        Af8D6wH/A+YB/wPlAf8D5QH/AzkB/wMAAf8DAAH/AwAB/wPIAf8D3gH/A9gB/wOoAf8IAAErAUIB9QH/
+        AUsBjAH3Af8BKgFBAfQB/wEVAS4B5wH/ARMBLAHkAf8CAAEfAf8DAAH/AQABAwE8Af8DAAH/AgABEgH/
+        ARUBLwHtAf8BFAEuAfAB/wEJASEB2AH/AQABDgGNAf8IAAHnAY0B5wH/Ae0BqQHtAf8B5gGMAeYB/wHa
+        AUoB2gH/AdcBRwHXAf8BMwEDATMB/wMAAf8BgQEPAYEB/wMAAf8BJwEAAScB/wHdAUoB3QH/AeABSwHg
+        Af8BzAE7AcwB/wGcARkBnAH/CQAD/wEAA/8BAAP/AQAC6gH/AQAC5gH/AQACJQH/AwAB/wEAAkQB/wMA
+        Af8BAAIWAf8BAALuAf8BAALwAf8BAALUAf8BAAKTAf8IAAPzAf8EAAPzAf8D4gH/A+AB/wNGAf8DAAH/
+        A44B/wMAAf8DOQH/A+QB/wPmAf8D1AH/A6gB/wgAASEBOgH1Af8BgQGSAfgB/wFEAYYB9wH/ASYBPAHi
+        Af8CAAEfAf8DAAH/AQQBEQGHAf8BFQEwAfQB/wIAAQ4B/wEFARMBjAH/ARYBMAHzAf8BFAEuAfAB/wEJ
+        ASEB1AH/AQgBFgGTAf8IAAHlAYQB5QH/Ae4BrwHuAf8B6wGjAesB/wHYAYQB2AH/ATMBAwEzAf8DAAH/
+        AZYBHQGWAf8B4wGAAeMB/wEkAQABJAH/AZoBHgGaAf8B4gGAAeIB/wHgAUsB4AH/AckBOwHJAf8BoQEi
+        AaEB/wkAAv4B/wEAA/8BAAP/AQAC8wH/AQACJQH/AwAB/wEAApEB/wEAAvQB/wEAAhMB/wEAApYB/wEA
+        AvQB/wEAAvAB/wEAAtEB/wEAAp4B/wgAA+4B/wgAA+cB/wNGAf8DAAH/A6YB/wPoAf8DNAH/A6oB/wPn
+        Af8D5gH/A9MB/wOvAf8MAAGCAZMB+AH/AYcBmAH4Af8BHgEqAZ8B/wMAAf8BBQESAYsB/wEVAS8B8gH/
+        ARUBLwHtAf8BEQEhAaoB/wERASgB2AH/ARQBLgHwAf8BFAEuAfAB/wEKASIB2gH/EAAB7gGwAe4B/wHv
+        AbUB7wH/AacBPAGnAf8DAAH/AZkBHgGZAf8B4QFMAeEB/wHdAUoB3QH/AbABMQGwAf8BzQFCAc0B/wHg
+        AUsB4AH/AeABSwHgAf8BzQE9Ac0B/xEAA/8BAAP/AQACuAH/AwAB/wEAApUB/wEAAvIB/wEAAu4B/wEA
+        ArUB/wEAAtoB/wEAAvAB/wEAAvAB/wEAAtcB/xgAA8IB/wMAAf8DqQH/A+cB/wPkAf8DwQH/A9kB/wPm
+        Af8D5gH/A9UB/xAAAaMBsQH6Af8BjwGfAfkB/wE8AUwB1QH/ASEBMAG2Af8BLQFEAfEB/wEkATsB6gH/
+        ASABNwHsAf8BFAEuAfAB/wEUAS4B8AH/ARQBLgHwAf8BFAEuAfAB/wFKAYYB1AH/EAAB8gHBAfIB/wHx
+        AbwB8QH/AdEBkwHRAf8BtgFIAbYB/wHkAY4B5AH/Ad4BhQHeAf8B3gGBAd4B/wHgAUsB4AH/AeABSwHg
+        Af8B4AFLAeAB/wHgAUsB4AH/Ac4BlgHOAf8QAAGYA/8BBgP/AQAC+QH/AQACzAH/AQAD/wEAAvgB/wEA
+        AvYB/wEAAvAB/wEAAvAB/wEAAvAB/wEAAvAB/wFHAtQB/xAAA/wB/wQAA+sB/wPPAf8D8wH/A+sB/wPq
+        Af8D5gH/A+YB/wPmAf8D5gH/A9UB/xQAAawBtwH7Af8BiAGZAfgB/wGBAZMB+AH/AUgBiQH3Af8BNAFK
+        AfYB/wEhAToB8wH/ARoBMwHvAf8BEgEsAe0B/wENASgB8AH/AUsBiAHdAf8YAAH0AckB9AH/Ae8BtgHv
+        Af8B7gGvAe4B/wHsAaYB7AH/AegBlQHoAf8B5AGEAeQB/wHgAYEB4AH/Ad0BSAHdAf8B3gFEAd4B/wHU
+        AZkB1AH/GAABngP/AQAD/wEAA/8BAAP/AQAD/wEAAvwB/wEAAvQB/wEAAuwB/wEAAukB/wFLAtoB/ygA
+        A/cB/wPtAf8D5wH/A+IB/wPhAf8D2QH/IAABMgFIAfYB/wE6AYEB9gH/AUEBhAH3Af8BNAFKAfYB/wEh
+        AToB9QH/AQ4BKAHvAf8oAAHoAZMB6AH/AeoBmgHqAf8B6wGgAesB/wHoAZUB6AH/AeUBhAHlAf8B3gFF
+        Ad4B/ykAA/8BAAP/AQAD/wEAA/8BAAL+Af8BAALpAf8oAAP3Af8D+QH/A/0B/wP3Af8D7gH/A+EB//8A
+        /wAqAAMyAf8DJwH/AyIB/wMhAf8DHwH/AxoB/ygAAZEBPQEAAf8BSwEqAQAB/wFAASEBAAH/AT0BHwEA
+        Af8BNwEaAQAB/wEmARABAAH/KAABBQEvAQUB/wEAASABAAH/AQABGgEAAf8BAAEYAQAB/wEAARMBAAH/
+        AQABCAEAAf8oAAKeARsB/wKWAQAB/wKTAQAB/wKSAQAB/wKNAQAB/wJIAQAB/yAAA5kB/wM/Af8DPwH/
+        Az0B/wM8Af8DOwH/AzcB/wMuAf8DIgH/AyMB/xgAAcYBqQE6Af8BtAGCAQAB/wG0AYEBAAH/AbIBgQEA
+        Af8BrwGBAQAB/wGsAYEBAAH/AaQBSAEAAf8BjgE5AQAB/wFAASABAAH/ASYBGwECAf8YAAGAAZ4BgAH/
+        AQoBRwEKAf8BCQFIAQkB/wEIAUcBCAH/AQcBRQEHAf8BBQFDAQUB/wEDAT0BAwH/AQABLwEAAf8BAAEZ
+        AQAB/wELARYBCwH/GAACwAGbAf8CsgExAf8CtAEvAf8CsgEsAf8CsQEoAf8CsQEkAf8CrQEdAf8CogEH
+        Af8CkwEAAf8CNwEFAf8UAAOfAf8DgQH/A4QB/wOJAf8DiAH/A4YB/wOGAf8DgwH/A4EB/wM+Af8DKAH/
+        AyIB/xAAAdEBsQE8Af8B2QGdAQAB/wHlAaUBAAH/Ae0BrAEAAf8B6wGqAQAB/wHqAagBAAH/AeoBqAEA
+        Af8B4wGkAQAB/wHZAZwBAAH/AbMBgQEAAf8BgAErAQAB/wElARoBAgH/EAABgAGpAYAB/wELAZgBCwH/
+        AQYBqAEGAf8BAwGzAQMB/wEEAbABBAH/AQQBrgEEAf8BBAGuAQQB/wEFAaYBBQH/AQkBmQEJAf8BCQFH
+        AQkB/wEAASIBAAH/AQoBFgEKAf8QAALJAaAB/wLLAUwB/wLUAYEB/wLaAYMB/wLYAYIB/wLXAYIB/wLX
+        AYIB/wLUAYEB/wLMAUgB/wK0AS0B/wKZAQAB/wI4AQMB/xAAA4EB/wOJAf8DkAH/A5AB/wOQAf8DkAH/
+        A4oB/wOMAf8DgwH/AzgB/wM7Af8DJgH/EAAB3AGgAQAB/wHsAaoBAAH/AfYBswEAAf8B9gGzAQAB/wH2
+        AbMBAAH/AfYBswEAAf8B7wGtAQAB/wHyAbABAAH/AeIBpAEAAf8BpAFJAQAB/wGrAYABAAH/AUsBKgEA
+        Af8QAAEKAZ0BCgH/AQMBsQEDAf8BAQHAAQEB/wEBAcABAQH/AQEBwAEBAf8BAQHAAQEB/wECAbYBAgH/
+        AQABuwEAAf8BBwGkAQcB/wEFAT0BBQH/AQYBQgEGAf8BAAEhAQAB/xAAAs0BgQH/AtgBggH/At8BjQH/
+        At8BjQH/At8BjQH/At8BjQH/AtsBgwH/At0BhwH/AtIBgQH/Aq0BIQH/ArABJAH/ApgBAAH/DAADiQH/
+        A44B/wOQAf8DkAH/A5AB/wOPAf8DiwH/A0QB/wMkAf8DAQH/AwAB/wM6Af8DNwH/AyAB/wgAAesBrAEA
+        Af8B8gGyAQAB/wH4AbQBAAH/AfYBswEAAf8B9gGzAQAB/wH1AbIBAAH/AewBrAEAAf8BvgGKAQAB/wFC
+        ASMBAAH/AwAB/wMAAf8BqgGAAQAB/wGkAUgBAAH/ATcBHQEAAf8IAAEGAbEBBgH/AQQBuwEEAf8BAAHE
+        AQAB/wEBAcABAQH/AQEBwAEBAf8BAQG/AQEB/wEHAbIBBwH/ARABgAEQAf8BAAEbAQAB/wMAAf8DAAH/
+        AQYBQQEGAf8BAwE9AQMB/wEAARMBAAH/CAAC2AGHAf8C3AGPAf8C4QGLAf8C3wGNAf8C3wGNAf8C3gGN
+        Af8C2AGKAf8CtQFBAf8CjwEAAf8CGwEAAf8DAAH/Aq4BJAH/Aq0BHQH/AogBAAH/CAADkQH/A5wB/wOR
+        Af8DkAH/A0kB/wMrAf8DCgH/AwAB/wMAAf8DAAH/AwAB/wOBAf8DRQH/AysB/wgAAfkBtgEAAv8BvwEF
+        Af8B+AG3AQAB/wH2AbMBAAH/AcoBkwEAAf8BgQEvAQAB/wEGAgAB/wMAAf8DAAH/AwAB/wMAAf8B4AGj
+        AQAB/wHEAY4BAAH/AYQBMQEAAf8JAAHGAQAB/wEEAdEBBAH/AQIBwwECAf8BAQHAAQEB/wEQAYcBEAH/
+        AQABJQEAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wEIAaEBCAH/AQwBgQEMAf8BAAEoAQAB/wgAAuIBjQH/
+        AuUBoQH/At8BkgH/At8BjQH/Ar8BSAH/ApgBAgH/AiwBAAH/AwAB/wMAAf8DAAH/AhIBAAH/AtEBgQH/
+        ArsBPgH/Ap4BAAH/CAADmgH/A6YB/wOVAf8DkAH/AzUB/wMdAf8DAAH/AwAB/wMAAf8DAAH/AyYB/wON
+        Af8DgQH/AzEB/wgAAf8BvgEBAv8BxQEUAf8B+gG6AQAB/wH2AbMBAAH/AZkBQQEAAf8BMgEXAQAB/wMA
+        Af8DAAH/AwAB/wMAAf8BRwEnAQAB/wH0AbEBAAH/AdgBmwEAAf8BlQE9AQAB/wgAAQEB0AEBAf8BDgHT
+        AQ4B/wEEAcYBBAH/AQEBwAEBAf8BBAE1AQQB/wEAARABAAH/AwAB/wMAAf8DAAH/AwAB/wEAAR4BAAH/
+        AQABvgEAAf8BCQGXAQkB/wEAATMBAAH/CAAC5QGcAf8C6AGtAf8C4QGYAf8C3wGNAf8CpAEbAf8ChQEA
+        Af8CBgEAAf8DAAH/AwAB/wMAAf8CkgEAAf8C3gGIAf8CywFIAf8CpQENAf8IAAOfAf8DqgH/A5UB/wOQ
+        Af8DjwH/A48B/wMTAf8DAAH/AwAB/wMAAf8DSAH/A4gB/wOCAf8DMwH/CAAB/wHBAQoC/wHIARwB/wH5
+        AbkBAAH/AfYBswEAAf8B9QGyAQAB/wH0AbIBAAH/ARgBBQEAAf8DAAH/AwAB/wMAAf8BxwGRAQAB/wHr
+        AaoBAAH/AeIBowEAAf8BmgFBAQAB/wgAAQcB0gEHAf8BEwHVARMB/wEFAcUBBQH/AQEBwAEBAf8BAQG/
+        AQEB/wECAb4BAgH/AwAB/wMAAf8DAAH/AwAB/wEQAYQBEAH/AQQBsAEEAf8BBwGjAQcB/wEAATcBAAH/
+        CAAC5gGkAf8C6wG0Af8C4QGYAf8C3wGNAf8C3gGNAf8C3gGNAf8CPgEAAf8DAAH/AwAB/wMAAf8CvQFH
+        Af8C2AGCAf8C0QGBAf8CqAESAf8IAAOeAf8DsQH/A54B/wONAf8DigH/AxoB/wMAAf8DJgH/AwAB/wMT
+        Af8DjgH/A5AB/wOBAf8DMwH/CAAB/wHAAQgC/wHMAScC/wHBAQcB/wHvAa8BAAH/AesBqwEAAf8BJwEP
+        AQAB/wMAAf8BRgEmAQAB/wMAAf8BGAEFAQAB/wHzAbEBAAH/AfYBswEAAf8B3AGfAQAB/wGZAUEBAAH/
+        CAABBQHSAQUB/wEbAdYBGwH/AQUB0AEFAf8BBgG2AQYB/wEHAbABBwH/AQABCQEAAf8DAAH/AQABHQEA
+        Af8DAAH/AwAB/wEDAb0BAwH/AQEBwAEBAf8BCQGcAQkB/wEBATYBAQH/CAAC5gGiAf8C7QG9Af8C5QGi
+        Af8C2wGLAf8C2AGIAf8CTAEAAf8CGwEAAf8CkgEAAf8DAAH/Aj4BAAH/At0BjQH/At8BjQH/As0BTAH/
+        AqcBFAH/CAADmQH/A7YB/wOtAf8DkQH/AxoB/wMAAf8DMwH/A5MB/wMRAf8DNQH/A5EB/wOQAf8DgQH/
+        AzcB/wgAAf8BvAEAAv8BzgEuAv8ByQEgAf8B8QG0AQEB/wEnAQ8BAAH/AwAB/wGUAT4BAAH/AfoBtgEA
+        Af8BFAECAQAB/wGZAUEBAAH/AfkBtQEAAf8B9gGzAQAB/wHZAZ0BAAH/AaEBSAEAAf8JAAHPAQAB/wEg
+        AdcBIAH/ARYB1QEWAf8BDgG2AQ4B/wEAAQkBAAH/AwAB/wEDATIBAwH/AQABxwEAAf8DAAH/AQQBNQEE
+        Af8BAAHGAQAB/wEBAcABAQH/AQoBmQEKAf8BBwE7AQcB/wgAAuQBmQH/Au4BwgH/AuwBuAH/AtoBmAH/
+        AkwBAAH/AwAB/wKhARcB/wLiAZAB/wI6AQAB/wKkARsB/wLhAZAB/wLfAY0B/wLMAUwB/wKoASIB/wwA
+        A7gB/wO7Af8DQwH/AwAB/wM0Af8DkQH/A44B/wNDAf8DgwH/A5AB/wOQAf8DgQH/EAAB/wHOAS8C/wHQ
+        ATQB/wG1AYkBAAH/AwAB/wGYAUEBAAH/AfgBtAEAAf8B8wGxAQAB/wG6AYcBAAH/Ad8BogEAAf8B9gGz
+        AQAB/wH2AbMBAAH/Ad8BoQEAAf8QAAEhAdgBIQH/ASQB2AEkAf8BFwFFARcB/wMAAf8BBAE1AQQB/wEA
+        AcQBAAH/AQMBvQEDAf8BDwFKAQ8B/wELAaABCwH/AQEBwAEBAf8BAQHAAQEB/wEJAZ8BCQH/EAAC7wHE
+        Af8C8AHIAf8CrgFIAf8DAAH/AqQBGwH/AuEBjwH/At0BjQH/ArQBPgH/AtABggH/At8BjQH/At8BjQH/
+        As8BgQH/EAADygH/A8AB/wOVAf8DgQH/A54B/wOVAf8DlAH/A5AB/wOQAf8DkAH/A5AB/wOhAf8QAAH/
+        Ad0BjgL/AdMBPQH/Ae0BuAELAf8BxwGYAQAB/wH+AcABCAH/AfcBuQEAAf8B9wG3AQAB/wH2AbMBAAH/
+        AfYBswEAAf8B9gGzAQAB/wH2AbMBAAH/AdkBtAE5Af8QAAGKAeYBigH/ASoB2gEqAf8BHQGuAR0B/wEa
+        AYQBGgH/AQkBzQEJAf8BCAHBAQgB/wEGAcEBBgH/AQEBwAEBAf8BAQHAAQEB/wEBAcABAQH/AQEBwAEB
+        Af8BRwGzAUcB/xAAAvMBzwH/AvEBzwH/AtYBpQH/ArwBhQH/AuQBpAH/At4BmQH/At8BlgH/At8BjQH/
+        At8BjQH/At8BjQH/At8BjQH/AtABoQH/FAADzwH/A7sB/wO2Af8DrgH/A6MB/wOXAf8DkQH/A40B/wOM
+        Af8DpQH/GAAB/wHfAZUC/wHQATUC/wHNAS4C/wHLASQC/wHDAREB/wH9AbsBAAH/AfcBtwEAAf8B8gGx
+        AQAB/wHyAa8BAAH/AeABugE7Af8YAAGPAecBjwH/ASUB2QElAf8BIAHYASAB/wEZAdYBGQH/AQwB0wEM
+        Af8BAgHMAQIB/wEDAcIBAwH/AQIBuwECAf8BAAG7AQAB/wFHAbwBRwH/GAAC9AHVAf8C8AHIAf8C7wHD
+        Af8C7QG7Af8C6AGqAf8C4wGZAf8C3wGSAf8C3QGKAf8C3QGHAf8C1gGkAf8gAAOiAf8DpgH/A6oB/wOj
+        Af8DmQH/A4wB/ygAAf8BwwEPAv8BxgEXAv8ByQEeAv8BwgERAv8BvQEAAf8B8gGvAQAB/ygAAQoB0wEK
+        Af8BEAHUARAB/wEUAdUBFAH/AQwB0wEMAf8BAAHPAQAB/wEAAbsBAAH/KAAC5wGoAf8C6gGwAf8C6wG1
+        Af8C6AGqAf8C5AGZAf8C3QGHAf//AP8ALAABIgH/AgABFQH/AgABEAH/AgABDgH/AgABCwH/AwAB/ygA
+        AUoBAAElAf8BMwEAARYB/wEpAQABDwH/AScBAAENAf8BIgEAAQoB/wEYAQABAwH/KQABEwEgAf8BAAEI
+        ARUB/wEAAQMBEAH/AQABAgEOAf8CAAEKAf8DAAH/KAADhQH/A0UB/wM9Af8DOwH/AzcB/wMuAf8gAAIy
+        AYcB/wIAATcB/wIAATcB/wIAATYB/wIAATUB/wIAATIB/wIAAS4B/wIAASEB/wIAARAB/wIAAQsB/xgA
+        AawBDQGJAf8BjwEAATYB/wGPAQABNgH/AY0BAAE1Af8BiwEAATMB/wGIAQABMQH/AYIBAAEtAf8BQwEA
+        ASAB/wEpAQABDgH/ARsBAAENAf8YAAEqAUsBhgH/AQABIgE2Af8BAAEjATcB/wEAASEBNgH/AQABIAE0
+        Af8BAAEfATIB/wEAARsBLgH/AQABEQEhAf8BAAEDARAB/wEAAQYBCgH/GAADtAH/A5cB/wOXAf8DlQH/
+        A5MB/wOSAf8DjQH/A4EB/wM9Af8DLAH/FAACMQGSAf8CAAGEAf8CAAGRAf8CAAGbAf8CAAGZAf8CAAGY
+        Af8CAAGYAf8CAAGQAf8CAAGEAf8CAAE3Af8CAAEXAf8CAAEKAf8QAAG1AQ4BkAH/Aa0BAAFLAf8BtgEA
+        AYEB/wG8AQABgwH/AbsBAAGDAf8BugEAAYIB/wG6AQABggH/AbQBAAGBAf8BrAEAAUoB/wGOAQABNQH/
+        ATQBAAEWAf8BGgEAAQ0B/xAAAScBgQGSAf8BAAE4AYUB/wEAAUEBlAH/AQABRwGfAf8BAAFGAZ0B/wEA
+        AUUBmwH/AQABRQGbAf8BAAFAAZMB/wEAATgBhgH/AQABIgE3Af8BAAEJARYB/wEAAQUBCgH/EAADugH/
+        A6wB/wOyAf8DtgH/A7UB/wO0Af8DtAH/A7EB/wOrAf8DlgH/A0YB/wMsAf8SAAGHAf8CAAGaAf8CAAGo
+        Af8CAAGoAf8CAAGoAf8CAAGoAf8CAAGeAf8CAAGjAf8CAAGPAf8CAAEuAf8CAAEyAf8CAAEVAf8QAAGw
+        AQABgAH/AbwBAAGDAf8BxgEAAYoB/wHGAQABigH/AcYBAAGKAf8BxgEAAYoB/wG+AQABhQH/AcEBAAGH
+        Af8BtAEAAYEB/wGDAQABLQH/AYgBAAExAf8BMgEAARUB/xEAATsBiQH/AQABRgGeAf8BAAGBAa0B/wEA
+        AYEBrQH/AQABgQGtAf8BAAGBAa0B/wEAAUkBowH/AQABTAGnAf8BAAE/AZEB/wEAARwBLgH/AQABHgEy
+        Af8BAAEIARUB/xAAA64B/wO2Af8DvQH/A70B/wO9Af8DvQH/A7cB/wO5Af8DsQH/A44B/wOSAf8DRAH/
+        DgABmQH/AgABogH/AgABqwH/AgABqAH/AgABqAH/AgABpwH/AgABmwH/AgIBPAH/AgABEAH/AwAB/wMA
+        Af8CAAExAf8CAAEuAf8CAAEKAf8IAAG9AQABhAH/AcUBAAGJAf8BxgEAAYoB/wHGAQABigH/AcYBAAGK
+        Af8BxgEAAYoB/wG/AQABhQH/AZkBAAE9Af8BLQEAAREB/wMAAf8DAAH/AYcBAAEwAf8BggEAAS0B/wEl
+        AQABDAH/CQABRwGdAf8BAAGAAacB/wEAAYEBsQH/AQABgQGtAf8BAAGBAa0B/wEAAYEBqwH/AQABSAGe
+        Af8BAAEnATsB/wEAAQQBEAH/AwAB/wMAAf8BAAEeATEB/wEAARsBLgH/AgABCQH/CAADtgH/A7sB/wO9
+        Af8DvQH/A70B/wO8Af8DuAH/A54B/wNAAf8DBQH/AwAB/wORAf8DjQH/AzkB/woAAa0B/wIAAbkB/wIA
+        AaoB/wIAAagB/wICAUYB/wIAARkB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AgABjAH/AgABQQH/AgABHAH/
+        CAAByAEAAYwB/wHXAQABlgH/AckBAAGMAf8BxgEAAYoB/wGjAQABRAH/AToBAAEbAf8DAAH/AwAB/wMA
+        Af8DAAH/AwAB/wGzAQABgQH/AZsBAAE+Af8BOwEAARsB/wkAAYEBswH/AQABigG/Af8BAAGBAa8B/wEA
+        AYEBrQH/AQABLgFGAf8BAAEMARkB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AQABPgGOAf8BAAEqAUEB/wEA
+        AQ0BHAH/CAADvgH/A8cB/wO+Af8DvQH/A6QB/wNLAf8DEwH/AwAB/wMAAf8DAAH/AwAB/wOvAf8DnwH/
+        A0wB/woAAbcB/wIAAcIB/wIAAa0B/wIAAagB/wIAAScB/wIAAQcB/wMAAf8DAAH/AwAB/wMAAf8CAAET
+        Af8CAAGmAf8CAAGDAf8CAAEmAf8IAAHUAQABlAH/AeEBAAGdAf8BzgEAAY8B/wHGAQABigH/AYEBAAEo
+        Af8BIAEAAQgB/wMAAf8DAAH/AwAB/wMAAf8BMQEAARQB/wHDAQABiAH/AasBAAFJAf8BSAEAASQB/wkA
+        AYgBvQH/AQABkAHIAf8BAAGCAbIB/wEAAYEBrQH/AQABFgEmAf8CAAEHAf8DAAH/AwAB/wMAAf8DAAH/
+        AQABBgESAf8BAAGBAasB/wEAATcBhAH/AQABFQEmAf8IAAPFAf8DzgH/A8EB/wO9Af8DiQH/AzQB/wMA
+        Af8DAAH/AwAB/wMAAf8DRAH/A7oB/wOqAf8DhAH/CgABvAH/AgABxwH/AgABrAH/AgABqAH/AgABpwH/
+        AgABpQH/AwAB/wMAAf8DAAH/AwAB/wICAUQB/wIAAZkB/wIAAY0B/wIAASkB/wgAAdoBAAGYAf8B5wEA
+        AaEB/wHOAQABjwH/AcYBAAGKAf8BxgEAAYoB/wHFAQABigH/AQoCAAH/AwAB/wMAAf8DAAH/AaEBAAFC
+        Af8BuwEAAYMB/wGzAQABgQH/AUwBAAEnAf8JAAGMAcIB/wEAAZQBzQH/AQABgQGxAf8BAAGBAa0B/wEA
+        AYEBqwH/AQABgQGqAf8DAAH/AwAB/wMAAf8DAAH/AQABLAFDAf8BAAFGAZ0B/wEAAT8BkAH/AQABFwEp
+        Af8IAAPJAf8D0QH/A8EB/wO9Af8DvAH/A7wB/wMiAf8DAAH/AwAB/wMAAf8DowH/A7UB/wOwAf8DhwH/
+        CgABuwH/AgABzgH/AgABuQH/AgABngH/AgABmQH/AgABAQH/AwAB/wIAARIB/wMAAf8DAAH/AgABpAH/
+        AgABqAH/AgABhwH/AgABJwH/CAAB2QEAAZcB/wHuAQABpgH/AdcBAAGWAf8BwgEAAYcB/wG+AQABhQH/
+        ARYBAAEBAf8DAAH/ATABAAETAf8DAAH/AQoCAAH/AcUBAAGJAf8BxgEAAYoB/wGvAQABTAH/AUwBAAEn
+        Af8JAAGLAcEB/wEAAZkB1AH/AQABiQG+Af8BAAFKAaIB/wEAAUcBnQH/AgABAQH/AwAB/wEAAQYBEgH/
+        AwAB/wMAAf8BAAGAAakB/wEAAYEBrQH/AQABOgGJAf8BAAEWAScB/wgAA8gB/wPWAf8DyAH/A7oB/wO3
+        Af8DLQH/AwAB/wNDAf8DAAH/AyIB/wO7Af8DvQH/A60B/wOHAf8KAAG1Af8CAAHRAf8CAAHJAf8CAAGe
+        Af8CAAEBAf8DAAH/AgABJAH/AgABrgH/AwAB/wIAAScB/wIAAa0B/wIAAagB/wIAAYQB/wIAASwB/wgA
+        AdIBAAGSAf8B8wEAAaoB/wHqAQABowH/AckBAAGMAf8BFgEAAQEB/wMAAf8BSgEAASYB/wHKAQABjQH/
+        AQcCAAH/AYEBAAEoAf8ByQEAAYwB/wHGAQABigH/Aa0BAAFLAf8BggEAAS0B/wkAAYcBuwH/AQABnAHZ
+        Af8BAAGWAdAB/wEAAUsBoQH/AgABAQH/AwAB/wEAARQBJAH/AQABggG0Af8DAAH/AQABFgEmAf8BAAGB
+        AbMB/wEAAYEBrQH/AQABOQGGAf8BAAEaASsB/wgAA8QB/wPZAf8D0wH/A74B/wMtAf8DAAH/A4YB/wO/
+        Af8DHgH/A4kB/wO+Af8DvQH/A6wB/wONAf8OAAHTAf8CAAHWAf8CCQE0Af8DAAH/AgABJgH/AgABqwH/
+        AgABpAH/AgIBOQH/AgABiwH/AgABqAH/AgABqAH/AgABigH/EAAB9AEAAaoB/wH4AQABrQH/AZgBAAE8
+        Af8DAAH/AYABAAEoAf8ByAEAAYwB/wHFAQABiQH/AZYBAAE7Af8BtAEAAYEB/wHGAQABigH/AcYBAAGK
+        Af8BsQEAAYEB/xEAAZ0B2QH/AQABnwHdAf8BAAEjATEB/wMAAf8BAAEWASYB/wEAAYEBsQH/AQABgAGp
+        Af8BAAElATgB/wEAAT0BjAH/AQABgQGtAf8BAAGBAa0B/wEAATwBjAH/EAAD2gH/A9wB/wOdAf8DAAH/
+        A4gB/wO+Af8DuwH/A5wB/wOxAf8DvQH/A70B/wOuAf8QAAIxAdQB/wIAAdoB/wILAZYB/wILAUMB/wIA
+        AbYB/wIAAagB/wIAAagB/wIAAagB/wIAAagB/wIAAagB/wIAAagB/wIqAZ4B/xAAAesBGgG5Af8B/gEA
+        AbEB/wHOAQABkAH/AakBAAFIAf8B1wEAAZYB/wHNAQABjwH/AcsBAAGOAf8BxgEAAYoB/wHGAQABigH/
+        AcYBAAGKAf8BxgEAAYoB/wG8AQwBlQH/EAABHgGwAdkB/wEAAaMB4gH/AQABSAGWAf8BAAEuAUIB/wEA
+        AYgBuwH/AQABgQGsAf8BAAGBAa0B/wEAAYEBrQH/AQABgQGtAf8BAAGBAa0B/wEAAYEBrQH/AR4BhwGf
+        Af8QAAPiAf8D3wH/A8EB/wOpAf8DyAH/A8EB/wPAAf8DvQH/A70B/wO9Af8DvQH/A70B/xQAAjIB2QH/
+        AgAB1gH/AgAB0gH/AgABzAH/AgABvwH/AgABsgH/AgABqQH/AgABowH/AgABowH/AikBpwH/GAAB8QEa
+        Ab4B/wH5AQABrQH/AfQBAAGqAf8B7QEAAaUB/wHfAQABmwH/AdEBAAGSAf8ByQEAAYwB/wHDAQABiAH/
+        AcEBAAGHAf8BwgEOAZkB/xgAAR8BtAHeAf8BAAGfAd0B/wEAAZwB2QH/AQABmAHTAf8BAAGPAcYB/wEA
+        AYUBuAH/AQABgQGvAf8BAAFMAacB/wEAAUwBqAH/ARsBjQGpAf8YAAPmAf8D3AH/A9kB/wPUAf8DzAH/
+        A8MB/wO+Af8DugH/A7kB/wPBAf8iAAG/Af8CAAHDAf8CAAHIAf8CAAG/Af8CAAG1Af8CAAGjAf8oAAHd
+        AQABmgH/AeMBAAGeAf8B6AEAAaIB/wHfAQABmwH/AdIBAAGSAf8BwQEAAYcB/ykAAY4BxQH/AQABkQHK
+        Af8BAAGVAc4B/wEAAY8BxgH/AQABhwG7Af8BAAFMAacB/ygAA8sB/wPOAf8D0QH/A8wB/wPEAf8DuQH/
+        /wD/ACoAAw8B/wMIAf8DBgH/AwUB/wMEAf8DAgH/KAABPgEYAQsB/wEtAQgBAAH/ASUBAgEAAf8BIwEB
+        AQAB/wEeAgAB/wEQAgAB/ykAAREBAAH/AQABBwEAAf8BAAEDAQAB/wEAAQEBAAH/AwAB/wMAAf8oAAEf
+        ASEBAAH/ARMBFQEAAf8BDQEQAQAB/wEMAQ4BAAH/AQkBCwEAAf8DAAH/IAADggH/AxkB/wMZAf8DGAH/
+        AxcB/wMWAf8DEwH/Aw0B/wMGAf8DFQH/GAABogGBAUEB/wGHASIBEAH/AYgBIgEPAf8BhgEhAQ4B/wGE
+        AR8BDQH/AYIBHQELAf8BgQEaAQgB/wE9ARABAgH/ASUBAgEAAf8BFQEJAQQB/xgAAS0BSQEtAf8BAAEi
+        AQAB/wEAASIBAAH/AQABIQEAAf8BAAEgAQAB/wEAAR8BAAH/AQABGwEAAf8BAAERAQAB/wEAAQMBAAH/
+        AQABBQEAAf8YAAGFAYcBMQH/ATMBNwEAAf8BNAE3AQAB/wEzATYBAAH/ATEBNQEAAf8BLwEzAQAB/wEr
+        AS8BAAH/AR8BIgEAAf8BDQEQAQAB/wEKAQsBAAH/FAADiAH/AysB/wMxAf8DNgH/AzUB/wMzAf8DMwH/
+        AzAB/wMqAf8DGQH/AwkB/wMVAf8QAAGwAYEBQAH/AbABLQEQAf8BwgEtAQoB/wHNAS4BCAH/AcoBLgEJ
+        Af8ByQEtAQgB/wHJAS0BCAH/AcEBLAEJAf8BsQErAQ4B/wGHASEBDwH/AS8BCAEAAf8BFAEHAQMB/xAA
+        AS0BgQEtAf8BAAE6AQAB/wEAAUUBAAH/AQABTAEAAf8BAAFKAQAB/wEAAUkBAAH/AQABSQEAAf8BAAFD
+        AQAB/wEAAToBAAH/AQABIgEAAf8BAAEIAQAB/wEAAQUBAAH/EAABjwGSATAB/wGBAYQBAAH/AYsBkgEA
+        Af8BlAGcAQAB/wGSAZkBAAH/AZEBmAEAAf8BkQGYAQAB/wGKAZABAAH/AYEBhAEAAf8BMwE3AQAB/wEV
+        ARcBAAH/AgoBAAH/EAADLQH/AzYB/wM/Af8DPwH/Az8B/wM/Af8DNwH/AzkB/wMwAf8DFAH/AxYB/wMI
+        Af8QAAG1AS0BDwH/AcsBLgEJAf8B1AE1AQ8B/wHUATUBDwH/AdQBNQEPAf8B1AE1AQ8B/wHPAS8BCQH/
+        AdIBMAEKAf8BvgEtAQwB/wGBARsBCgH/AYEBHQELAf8BLQEHAQAB/xEAAT0BAAH/AQABSwEAAf8BAAGD
+        AQAB/wEAAYMBAAH/AQABgwEAAf8BAAGDAQAB/wEAAYEBAAH/AQABgQEAAf8BAAFCAQAB/wEAARsBAAH/
+        AQABHgEAAf8BAAEIAQAB/xAAAYIBiAEAAf8BkwGbAQAB/wGgAagBAAH/AaABqAEAAf8BoAGoAQAB/wGg
+        AagBAAH/AZcBnwEAAf8BmwGjAQAB/wGIAY4BAAH/ASsBLgEAAf8BLwEyAQAB/wETARYBAAH/DAADNgH/
+        AzwB/wM/Af8DPwH/Az8B/wM9Af8DOAH/Ax4B/wMHAf8DAAH/AwAB/wMWAf8DEwH/AwUB/wgAAckBMQEN
+        Af8BzwE1AREB/wHXATMBDAH/AdQBNQEPAf8B1AE1AQ8B/wHTATUBDwH/AcoBMwEPAf8BjgEpARcB/wEm
+        AQYBAAH/AwAB/wMAAf8BgQEdAQwB/wGBARoBCAH/AR0BAQEAAf8JAAFLAQAB/wEAAYEBAAH/AQABhQEA
+        Af8BAAGDAQAB/wEAAYMBAAH/AQABggEAAf8BAAFMAQAB/wEAASYBAAH/AQABAwEAAf8DAAH/AwAB/wEA
+        AR4BAAH/AQABGwEAAf8DAAH/CAABkwGaAQAB/wGbAaMBAAH/AaMBqwEAAf8BoAGoAQAB/wGgAagBAAH/
+        AZ8BpwEAAf8BlAGbAQAB/wE4ATwBAQH/AQ4BEAEAAf8DAAH/AwAB/wEuATEBAAH/ASsBLwEAAf8BCAEK
+        AQAB/wgAA0AB/wOAAf8DQAH/Az8B/wMjAf8DCgH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DLgH/Ax8B/wML
+        Af8IAAHYATUBDgH/AdsBQgEeAf8B1AE4ARIB/wHUATUBDwH/AZwBLAEWAf8BMgENAQEB/wMAAf8DAAH/
+        AwAB/wMAAf8DAAH/AbsBLQENAf8BlQEoARIB/wE2AQ0BAAH/CQABhwEAAf8BAAGQAQAB/wEAAYUBAAH/
+        AQABgwEAAf8BAAEuAQAB/wEAAQsBAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8BAAFAAQAB/wEAASoBAAH/
+        AQABDQEAAf8IAAGkAa0BAAH/AbABugEAAf8BogGqAQAB/wGgAagBAAH/AUIBRgEAAf8BFwEZAQAB/wMA
+        Af8DAAH/AwAB/wMAAf8DAAH/AYYBjAEAAf8BPQFBAQAB/wEZARwBAAH/CAADSgH/A4cB/wNEAf8DPwH/
+        AxEB/wMDAf8DAAH/AwAB/wMAAf8DAAH/AwgB/wM7Af8DKQH/Aw8B/wgAAdoBPwEaAf8B3QFLASoB/wHV
+        ATwBGAH/AdQBNQEPAf8BRQEZAQoB/wEZAgAB/wMAAf8DAAH/AwAB/wMAAf8BKQEIAQAB/wHUATEBCgH/
+        Aa8BKwEOAf8BQwETAQMB/wkAAY4BAAH/AQABlwEAAf8BAAGHAQAB/wEAAYMBAAH/AQABFQEAAf8DAAH/
+        AwAB/wMAAf8DAAH/AwAB/wEAAQYBAAH/AQABgQEAAf8BAAE5AQAB/wEAARQBAAH/CAABrgG3AQAB/wG5
+        AcIBAAH/AaUBrQEAAf8BoAGoAQAB/wEkAScBAAH/AQUBBwEAAf8DAAH/AwAB/wMAAf8DAAH/AREBEwEA
+        Af8BngGmAQAB/wGBAYMBAAH/ASMBJgEAAf8IAAOBAf8DjAH/A0QB/wM/Af8DPQH/Az0B/wMAAf8DAAH/
+        AwAB/wMAAf8DIgH/AzUB/wMvAf8DEAH/CAAB3AFFASEB/wHfAYEBMAH/AdQBPAEZAf8B1AE1AQ8B/wHT
+        ATUBDwH/AdIBNQEQAf8BBgIAAf8DAAH/AwAB/wMAAf8BmQEsARYB/wHKAS4BCQH/Ab0BLAELAf8BRwEV
+        AQUB/wkAAZIBAAH/AQABmwEAAf8BAAGGAQAB/wEAAYMBAAH/AQABggEAAf8BAAGBAQAB/wMAAf8DAAH/
+        AwAB/wMAAf8BAAEsAQAB/wEAAUoBAAH/AQABQQEAAf8BAAEXAQAB/wgAAbMBvAEAAf8BvQHHAQAB/wGk
+        AawBAAH/AaABqAEAAf8BnwGnAQAB/wGeAaYBAAH/AwAB/wMAAf8DAAH/AwAB/wFAAUQBAQH/AZIBmQEA
+        Af8BiAGOAQAB/wEmASkBAAH/CAADgQH/A5YB/wOBAf8DOwH/AzcB/wMCAf8DAAH/AwgB/wMAAf8DAAH/
+        AzwB/wM/Af8DLAH/AxAB/wgAAdwBRAEgAf8B4QGGATkB/wHaAUMBHwH/AcwBNAERAf8ByQEyAQ8B/wER
+        AgAB/wMAAf8BKQEHAQAB/wMAAf8BBgIAAf8B0QE1ARAB/wHUATUBDwH/AbUBLAEOAf8BRQEWAQYB/wkA
+        AZIBAAH/AQABoAEAAf8BAAGQAQAB/wEAAYEBAAH/AQABSgEAAf8DAAH/AwAB/wEAAQUBAAH/AwAB/wMA
+        Af8BAAGBAQAB/wEAAYMBAAH/AQABPQEAAf8BAAEWAQAB/wgAAbIBuwEAAf8BxAHOAQAB/wGwAbkBAAH/
+        AZcBngEAAf8BkwGaAQAB/wEAAQEBAAH/AwAB/wEQARIBAAH/AwAB/wMAAf8BnQGkAQAB/wGgAagBAAH/
+        AYIBhwEAAf8BJQEoAQAB/wgAA0kB/wObAf8DkAH/A0AB/wMCAf8DAAH/AxAB/wNBAf8DAAH/AxEB/wNA
+        Af8DPwH/AysB/wMTAf8IAAHaAT0BGAH/AeIBigE/Af8B3wGBATQB/wHIAT0BHgH/ARECAAH/AwAB/wFB
+        ARcBCAH/AdgBNwEQAf8BAwIAAf8BRQEZAQoB/wHXATYBEAH/AdQBNQEPAf8BsQEsAQ8B/wFLARwBDQH/
+        CQABjQEAAf8BAAGkAQAB/wEAAZ0BAAH/AQABgQEAAf8DAAH/AwAB/wEAARMBAAH/AQABiAEAAf8DAAH/
+        AQABFQEAAf8BAAGHAQAB/wEAAYMBAAH/AQABOgEAAf8BAAEZAQAB/wgAAawBtQEAAf8ByAHSAQAB/wHA
+        AcoBAAH/AZgBngEAAf8BAAEBAQAB/wMAAf8BIgEkAQAB/wGmAa8BAAH/AwAB/wEkAScBAAH/AaUBrQEA
+        Af8BoAGoAQAB/wGBAYQBAAH/ASkBKwEAAf8MAAOeAf8DogH/Ax4B/wMAAf8DEQH/A0AB/wM8Af8DHQH/
+        AzAB/wM/Af8DPwH/Ay0B/xAAAeIBiwFAAf8B4wGPAUQB/wGEAS0BHwH/AwAB/wFEARgBCgH/AdYBNgEQ
+        Af8B0QE1ARAB/wGLASgBFgH/AboBLwERAf8B1AE1AQ8B/wHUATUBDwH/AbkBLQEOAf8RAAGkAQAB/wEA
+        AacBAAH/AQEBIAEBAf8DAAH/AQABFQEAAf8BAAGFAQAB/wEAAYEBAAH/AQABJAEAAf8BAAE/AQAB/wEA
+        AYMBAAH/AQABgwEAAf8BAAE/AQAB/xAAAcgB0wEAAf8BzAHWAQAB/wExATMBCAH/AwAB/wEkASYBAAH/
+        AaMBqwEAAf8BnQGkAQAB/wE2ATkBAQH/AYUBiwEAAf8BoAGoAQAB/wGgAagBAAH/AYQBigEAAf8QAAO3
+        Af8DqAH/A0QB/wMoAf8DgQH/A0QB/wNDAf8DPwH/Az8B/wM/Af8DPwH/A4sB/xAAAegBoAGHAf8B5AGU
+        AUsB/wG9AUgBMAH/AZgBNAEiAf8B1wFEASIB/wHQAT4BHAH/AdEBOwEYAf8B1AE1AQ8B/wHUATUBDwH/
+        AdQBNQEPAf8B1AE1AQ8B/wHAAYEBOQH/EAABMgG1ATIB/wEAAasBAAH/AQUBSQEFAf8BAwEsAQMB/wEA
+        AY4BAAH/AQABgwEAAf8BAAGEAQAB/wEAAYMBAAH/AQABgwEAAf8BAAGDAQAB/wEAAYMBAAH/ASgBiAEo
+        Af8QAAHNAdQBLwH/AdEB3AEAAf8BkAGWAQoB/wE/AUMBCgH/Aa0BtgEAAf8BoQGoAQAB/wGhAakBAAH/
+        AaABqAEAAf8BoAGoAQAB/wGgAagBAAH/AaABqAEAAf8BmgGeASkB/xQAA74B/wOiAf8DmwH/A5IB/wOD
+        Af8DRwH/A0AB/wM7Af8DOQH/A48B/xgAAekBpQGPAf8B4wGPAUUB/wHiAYsBPwH/AeABhAE3Af8B3QFJ
+        AScB/wHYAT0BGQH/AdQBOAETAf8B0AEzAQ4B/wHTATABCQH/AcoBgQE3Af8YAAEzAboBMwH/AQABpwEA
+        Af8BAAGkAQAB/wEAAZ8BAAH/AQABlgEAAf8BAAGLAQAB/wEAAYQBAAH/AQABgQEAAf8BAAGBAQAB/wEo
+        AZABKAH/GAAB0wHaATAB/wHMAdcBAAH/AcgB0gEAAf8BwgHMAQAB/wG3AcABAAH/AaoBswEAAf8BoQGq
+        AQAB/wGbAaMBAAH/AZwBpAEAAf8BogGnASgB/yAAA4IB/wOHAf8DjAH/A4MB/wNJAf8DOQH/KAAB3QFI
+        ASYB/wHeAYABLAH/Ad8BgQEyAf8B3QFJAScB/wHaAT0BGAH/AdIBMAEKAf8pAAGVAQAB/wEAAZkBAAH/
+        AQABnAEAAf8BAAGWAQAB/wEAAY0BAAH/AQABgQEAAf8oAAG2Ab8BAAH/AboBxAEAAf8BvgHIAQAB/wG3
+        AcABAAH/AawBtQEAAf8BmwGjAQAB//8AFQABQgFNAT4HAAE+AwABKAMAAUADAAGwAwABAQEAAQEFAAGA
+        AQUWAAP/AQAC/x4AAYAHAAGAAQEGAAHAAQEGAAHAAQMGAAHgAQcGAAHwAQcGAAHwAQ8GAAH4AQ8GAAH4
+        AR8GAAH8AR8GAAH+AT8GAAL/BgAI/2gAAf8BgAH/AYAB/wGAAf8BgBD/aAAB/wGAAf8BgAH/AYAB/wGA
+        EP9oAAH/AYAB/wGAAf8BgAH/AYAQ/2gAAf8BgAH/AYAB/wGAAf8BgBD/aAAB/wGAAf8BgAH/AYAB/wGA
+        EP8B+AEfAfgBHwH4AR8B+AEfAeABBwHgAQcB4AEHAeABBwHAAQMBwAEDAcABAwHAAQMBwAEDAcABAwHA
+        AQMBwAEDAYABAQGAAQEBgAEBAYABAQGAAQEBgAEBAYABAQGAAQEBgAEBAYABAQGAAQEBgAEBAYABAQGA
+        AQEBgAEBAYABAQGAAQEBgAEBAYABAQGAAQEBgAEBAYABAQGAAQEBgAEBAcABAwHAAQMBwAEDAcABAwHA
+        AQMBwAEDAcABAwHAAQMB4AEHAeABBwHgAQcB4AEHAfgBHwH4AR8B+AEfAfgBHxD/AfgBHwH4AR8B+AEf
+        AfgBHwHgAQcB4AEHAeABBwHgAQcBwAEDAcABAwHAAQMBwAEDAcABAwHAAQMBwAEDAcABAwGAAQEBgAEB
+        AYABAQGAAQEBgAEBAYABAQGAAQEBgAEBAYABAQGAAQEBgAEBAYABAQGAAQEBgAEBAYABAQGAAQEBgAEB
+        AYABAQGAAQEBoAEBAYABAQGAAQEBgAEBAbABAQHAAQMBwAEDAcABAwHwAQMBwAEDAcABAwHAAQMB0AED
+        AeABBwHgAQcB4AEHAf4BBwH4AR8B+AEfAfgBHwH4AR8Q/wH4AR8B+AEfAfgBHwH4AR8B4AEHAeABBwHg
+        AQcB4AEHAcABAwHAAQMBwAEDAcABAwHAAQMBwAEDAcABAwHAAQMBgAEBAYABAQGAAQEBgAEBAYABAQGA
+        AQEBgAEBAYABAQGAAQEBgAEBAYABAQGAAQEBgAEBAYABAQGAAQEBgAEBAYABAQGAAQEBgAEBAYABAQGA
+        AQEBgAEBAYABAQGAAQEBwAEDAcABAwHAAQMBwAEDAcABAwHAAQMBwAEDAcABAwHgAQcB4AEHAeABBwHg
+        AQcB+AEfAfgBHwH4AR8B+AEfEP8B+AEfAfgBHwH4AR8B+AEfAeABBwHgAQcB4AEHAeABBwHAAQMBwAED
+        AcABAwHAAQMBwAEDAcABAwHAAQMBwAEDAYABAQGAAQEBgAEBAYABAQGAAQEBgAEBAYABAQGAAQEBgAEB
+        AYABAQGAAQEBgAEBAYABAQGAAQEBgAEBAYABAQGAAQEBgAEBAYABAQGAAQEBgAEBAYABAQGAAQEBgAEB
+        AcABAwHAAQMBwAEDAcABAwHAAQMBwAEDAcABAwHAAQMB4AEHAeABBwHgAQcB4AEHAfgBHwH4AR8B+AEf
+        AfgBHxD/AfgBHwH4AR8B+AEfAfgBHwHgAQcB4AEHAeABBwHgAQcBwAEDAcABAwHAAQMBwAEDAcABAwHA
+        AQMBwAEDAcABAwGAAQEBgAEBAYABAQGAAQEBgAEBAYABAQGAAQEBgAEBAYABAQGAAQEBgAEBAYABAQGA
+        AQEBgAEBAYABAQGAAQEBgAEBAYABAQGAAQEBgAEBAYABAQGAAQEBgAEBAYABAQHAAQMBwAEDAcABAwHA
+        AQMBwAEDAcABAwHAAQMBwAEDAeABBwHgAQcB4AEHAeABBwH4AR8B+AEfAfgBHwH4AR8I/ws=
+</value>
+  </data>
+  <metadata name="updatetimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>136, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Controls/ThingInfoPanel.Designer.cs b/Source/Core/Controls/ThingInfoPanel.Designer.cs
new file mode 100644
index 0000000..a0a4656
--- /dev/null
+++ b/Source/Core/Controls/ThingInfoPanel.Designer.cs
@@ -0,0 +1,444 @@
+namespace CodeImp.DoomBuilder.Controls
+{
+	partial class ThingInfoPanel
+	{
+		/// <summary> 
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Component Designer generated code
+
+		/// <summary> 
+		/// Required method for Designer support - do not modify 
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			System.Windows.Forms.Label label5;
+			System.Windows.Forms.Label label4;
+			System.Windows.Forms.Label label3;
+			System.Windows.Forms.Label label1;
+			this.labelaction = new System.Windows.Forms.Label();
+			this.infopanel = new System.Windows.Forms.GroupBox();
+			this.anglecontrol = new CodeImp.DoomBuilder.GZBuilder.Controls.AngleControl();
+			this.classname = new System.Windows.Forms.Label();
+			this.labelclass = new System.Windows.Forms.Label();
+			this.arg5 = new System.Windows.Forms.Label();
+			this.arglbl5 = new System.Windows.Forms.Label();
+			this.arglbl4 = new System.Windows.Forms.Label();
+			this.arg4 = new System.Windows.Forms.Label();
+			this.arglbl3 = new System.Windows.Forms.Label();
+			this.arglbl2 = new System.Windows.Forms.Label();
+			this.arg3 = new System.Windows.Forms.Label();
+			this.arglbl1 = new System.Windows.Forms.Label();
+			this.arg2 = new System.Windows.Forms.Label();
+			this.arg1 = new System.Windows.Forms.Label();
+			this.angle = new System.Windows.Forms.Label();
+			this.tag = new System.Windows.Forms.Label();
+			this.position = new System.Windows.Forms.Label();
+			this.action = new System.Windows.Forms.Label();
+			this.type = new System.Windows.Forms.Label();
+			this.spritepanel = new System.Windows.Forms.GroupBox();
+			this.spritename = new System.Windows.Forms.Label();
+			this.panel1 = new System.Windows.Forms.Panel();
+			this.spritetex = new CodeImp.DoomBuilder.Controls.ConfigurablePictureBox();
+			this.flagsPanel = new System.Windows.Forms.GroupBox();
+			this.flags = new System.Windows.Forms.ListView();
+			label5 = new System.Windows.Forms.Label();
+			label4 = new System.Windows.Forms.Label();
+			label3 = new System.Windows.Forms.Label();
+			label1 = new System.Windows.Forms.Label();
+			this.infopanel.SuspendLayout();
+			this.spritepanel.SuspendLayout();
+			this.panel1.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.spritetex)).BeginInit();
+			this.flagsPanel.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// label5
+			// 
+			label5.AutoSize = true;
+			label5.Location = new System.Drawing.Point(165, 79);
+			label5.Name = "label5";
+			label5.Size = new System.Drawing.Size(37, 13);
+			label5.TabIndex = 8;
+			label5.Text = "Angle:";
+			// 
+			// label4
+			// 
+			label4.AutoSize = true;
+			label4.Location = new System.Drawing.Point(30, 79);
+			label4.Name = "label4";
+			label4.Size = new System.Drawing.Size(29, 13);
+			label4.TabIndex = 4;
+			label4.Text = "Tag:";
+			// 
+			// label3
+			// 
+			label3.AutoSize = true;
+			label3.Location = new System.Drawing.Point(11, 64);
+			label3.Name = "label3";
+			label3.Size = new System.Drawing.Size(47, 13);
+			label3.TabIndex = 3;
+			label3.Text = "Position:";
+			// 
+			// label1
+			// 
+			label1.AutoSize = true;
+			label1.Location = new System.Drawing.Point(24, 19);
+			label1.Name = "label1";
+			label1.Size = new System.Drawing.Size(34, 13);
+			label1.TabIndex = 0;
+			label1.Text = "Type:";
+			// 
+			// labelaction
+			// 
+			this.labelaction.AutoSize = true;
+			this.labelaction.Location = new System.Drawing.Point(18, 49);
+			this.labelaction.Name = "labelaction";
+			this.labelaction.Size = new System.Drawing.Size(40, 13);
+			this.labelaction.TabIndex = 2;
+			this.labelaction.Text = "Action:";
+			// 
+			// infopanel
+			// 
+			this.infopanel.Controls.Add(this.anglecontrol);
+			this.infopanel.Controls.Add(this.classname);
+			this.infopanel.Controls.Add(this.labelclass);
+			this.infopanel.Controls.Add(this.arg5);
+			this.infopanel.Controls.Add(this.arglbl5);
+			this.infopanel.Controls.Add(this.arglbl4);
+			this.infopanel.Controls.Add(this.arg4);
+			this.infopanel.Controls.Add(this.arglbl3);
+			this.infopanel.Controls.Add(this.arglbl2);
+			this.infopanel.Controls.Add(this.arg3);
+			this.infopanel.Controls.Add(this.arglbl1);
+			this.infopanel.Controls.Add(this.arg2);
+			this.infopanel.Controls.Add(this.arg1);
+			this.infopanel.Controls.Add(this.angle);
+			this.infopanel.Controls.Add(label5);
+			this.infopanel.Controls.Add(this.tag);
+			this.infopanel.Controls.Add(this.position);
+			this.infopanel.Controls.Add(this.action);
+			this.infopanel.Controls.Add(label4);
+			this.infopanel.Controls.Add(label3);
+			this.infopanel.Controls.Add(this.labelaction);
+			this.infopanel.Controls.Add(this.type);
+			this.infopanel.Controls.Add(label1);
+			this.infopanel.Location = new System.Drawing.Point(0, 0);
+			this.infopanel.Name = "infopanel";
+			this.infopanel.Size = new System.Drawing.Size(473, 100);
+			this.infopanel.TabIndex = 4;
+			this.infopanel.TabStop = false;
+			this.infopanel.Text = " Thing ";
+			// 
+			// anglecontrol
+			// 
+			this.anglecontrol.Angle = 0;
+			this.anglecontrol.AngleOffset = 0;
+			this.anglecontrol.Location = new System.Drawing.Point(235, 73);
+			this.anglecontrol.Name = "anglecontrol";
+			this.anglecontrol.Size = new System.Drawing.Size(24, 24);
+			this.anglecontrol.TabIndex = 38;
+			// 
+			// classname
+			// 
+			this.classname.AutoEllipsis = true;
+			this.classname.Location = new System.Drawing.Point(61, 34);
+			this.classname.Name = "classname";
+			this.classname.Size = new System.Drawing.Size(210, 14);
+			this.classname.TabIndex = 40;
+			this.classname.Text = "CrazyFlyingShotgunSpawner";
+			// 
+			// labelclass
+			// 
+			this.labelclass.AutoSize = true;
+			this.labelclass.Location = new System.Drawing.Point(23, 34);
+			this.labelclass.Name = "labelclass";
+			this.labelclass.Size = new System.Drawing.Size(35, 13);
+			this.labelclass.TabIndex = 39;
+			this.labelclass.Text = "Class:";
+			// 
+			// arg5
+			// 
+			this.arg5.AutoEllipsis = true;
+			this.arg5.Location = new System.Drawing.Point(384, 79);
+			this.arg5.Name = "arg5";
+			this.arg5.Size = new System.Drawing.Size(83, 14);
+			this.arg5.TabIndex = 37;
+			this.arg5.Text = "Arg 1:";
+			// 
+			// arglbl5
+			// 
+			this.arglbl5.AutoEllipsis = true;
+			this.arglbl5.BackColor = System.Drawing.Color.Transparent;
+			this.arglbl5.Location = new System.Drawing.Point(257, 79);
+			this.arglbl5.Name = "arglbl5";
+			this.arglbl5.Size = new System.Drawing.Size(121, 14);
+			this.arglbl5.TabIndex = 32;
+			this.arglbl5.Text = "Arg 1:";
+			this.arglbl5.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// arglbl4
+			// 
+			this.arglbl4.AutoEllipsis = true;
+			this.arglbl4.BackColor = System.Drawing.Color.Transparent;
+			this.arglbl4.Location = new System.Drawing.Point(257, 64);
+			this.arglbl4.Name = "arglbl4";
+			this.arglbl4.Size = new System.Drawing.Size(121, 14);
+			this.arglbl4.TabIndex = 31;
+			this.arglbl4.Text = "Arg 1:";
+			this.arglbl4.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// arg4
+			// 
+			this.arg4.AutoEllipsis = true;
+			this.arg4.Location = new System.Drawing.Point(384, 64);
+			this.arg4.Name = "arg4";
+			this.arg4.Size = new System.Drawing.Size(83, 14);
+			this.arg4.TabIndex = 36;
+			this.arg4.Text = "Arg 1:";
+			// 
+			// arglbl3
+			// 
+			this.arglbl3.AutoEllipsis = true;
+			this.arglbl3.BackColor = System.Drawing.Color.Transparent;
+			this.arglbl3.Location = new System.Drawing.Point(257, 49);
+			this.arglbl3.Name = "arglbl3";
+			this.arglbl3.Size = new System.Drawing.Size(121, 14);
+			this.arglbl3.TabIndex = 30;
+			this.arglbl3.Text = "Arg 1:";
+			this.arglbl3.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// arglbl2
+			// 
+			this.arglbl2.AutoEllipsis = true;
+			this.arglbl2.BackColor = System.Drawing.Color.Transparent;
+			this.arglbl2.Location = new System.Drawing.Point(257, 34);
+			this.arglbl2.Name = "arglbl2";
+			this.arglbl2.Size = new System.Drawing.Size(121, 14);
+			this.arglbl2.TabIndex = 29;
+			this.arglbl2.Text = "Arg 1:";
+			this.arglbl2.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// arg3
+			// 
+			this.arg3.AutoEllipsis = true;
+			this.arg3.Location = new System.Drawing.Point(384, 49);
+			this.arg3.Name = "arg3";
+			this.arg3.Size = new System.Drawing.Size(83, 14);
+			this.arg3.TabIndex = 35;
+			this.arg3.Text = "Arg 1:";
+			// 
+			// arglbl1
+			// 
+			this.arglbl1.AutoEllipsis = true;
+			this.arglbl1.BackColor = System.Drawing.Color.Transparent;
+			this.arglbl1.Location = new System.Drawing.Point(257, 19);
+			this.arglbl1.Name = "arglbl1";
+			this.arglbl1.Size = new System.Drawing.Size(121, 14);
+			this.arglbl1.TabIndex = 28;
+			this.arglbl1.Text = "Arg 1:";
+			this.arglbl1.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// arg2
+			// 
+			this.arg2.AutoEllipsis = true;
+			this.arg2.Location = new System.Drawing.Point(384, 34);
+			this.arg2.Name = "arg2";
+			this.arg2.Size = new System.Drawing.Size(83, 14);
+			this.arg2.TabIndex = 34;
+			this.arg2.Text = "Arg 1:";
+			// 
+			// arg1
+			// 
+			this.arg1.AutoEllipsis = true;
+			this.arg1.Location = new System.Drawing.Point(384, 19);
+			this.arg1.Name = "arg1";
+			this.arg1.Size = new System.Drawing.Size(83, 14);
+			this.arg1.TabIndex = 33;
+			this.arg1.Text = "Arg 1:";
+			// 
+			// angle
+			// 
+			this.angle.AutoSize = true;
+			this.angle.Location = new System.Drawing.Point(206, 79);
+			this.angle.Name = "angle";
+			this.angle.Size = new System.Drawing.Size(25, 13);
+			this.angle.TabIndex = 11;
+			this.angle.Text = "270";
+			// 
+			// tag
+			// 
+			this.tag.AutoSize = true;
+			this.tag.Location = new System.Drawing.Point(61, 79);
+			this.tag.Name = "tag";
+			this.tag.Size = new System.Drawing.Size(13, 13);
+			this.tag.TabIndex = 7;
+			this.tag.Text = "0";
+			// 
+			// position
+			// 
+			this.position.AutoSize = true;
+			this.position.Location = new System.Drawing.Point(61, 64);
+			this.position.Name = "position";
+			this.position.Size = new System.Drawing.Size(91, 13);
+			this.position.TabIndex = 6;
+			this.position.Text = "1024, 1024, 1024";
+			// 
+			// action
+			// 
+			this.action.AutoEllipsis = true;
+			this.action.Location = new System.Drawing.Point(61, 49);
+			this.action.Name = "action";
+			this.action.Size = new System.Drawing.Size(210, 14);
+			this.action.TabIndex = 5;
+			this.action.Text = "0 - Spawn a Blue Poopie and Ammo";
+			// 
+			// type
+			// 
+			this.type.AutoSize = true;
+			this.type.Location = new System.Drawing.Point(61, 19);
+			this.type.Name = "type";
+			this.type.Size = new System.Drawing.Size(96, 13);
+			this.type.TabIndex = 1;
+			this.type.Text = "0 - Big Brown Pimp";
+			// 
+			// spritepanel
+			// 
+			this.spritepanel.Controls.Add(this.spritename);
+			this.spritepanel.Controls.Add(this.panel1);
+			this.spritepanel.Location = new System.Drawing.Point(479, 0);
+			this.spritepanel.Name = "spritepanel";
+			this.spritepanel.Size = new System.Drawing.Size(86, 100);
+			this.spritepanel.TabIndex = 5;
+			this.spritepanel.TabStop = false;
+			this.spritepanel.Text = " Sprite ";
+			// 
+			// spritename
+			// 
+			this.spritename.Location = new System.Drawing.Point(7, 79);
+			this.spritename.Name = "spritename";
+			this.spritename.Size = new System.Drawing.Size(72, 13);
+			this.spritename.TabIndex = 1;
+			this.spritename.Text = "BROWNHUG";
+			this.spritename.TextAlign = System.Drawing.ContentAlignment.TopCenter;
+			// 
+			// panel1
+			// 
+			this.panel1.BackColor = System.Drawing.SystemColors.AppWorkspace;
+			this.panel1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
+			this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+			this.panel1.Controls.Add(this.spritetex);
+			this.panel1.Location = new System.Drawing.Point(12, 14);
+			this.panel1.Name = "panel1";
+			this.panel1.Size = new System.Drawing.Size(64, 64);
+			this.panel1.TabIndex = 0;
+			// 
+			// spritetex
+			// 
+			this.spritetex.CompositingQuality = System.Drawing.Drawing2D.CompositingQuality.Default;
+			this.spritetex.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.spritetex.Highlighted = false;
+			this.spritetex.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.NearestNeighbor;
+			this.spritetex.Location = new System.Drawing.Point(0, 0);
+			this.spritetex.Name = "spritetex";
+			this.spritetex.PageUnit = System.Drawing.GraphicsUnit.Pixel;
+			this.spritetex.PixelOffsetMode = System.Drawing.Drawing2D.PixelOffsetMode.None;
+			this.spritetex.Size = new System.Drawing.Size(60, 60);
+			this.spritetex.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
+			this.spritetex.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.Default;
+			this.spritetex.TabIndex = 0;
+			this.spritetex.TabStop = false;
+			// 
+			// flagsPanel
+			// 
+			this.flagsPanel.Controls.Add(this.flags);
+			this.flagsPanel.Location = new System.Drawing.Point(571, 0);
+			this.flagsPanel.Name = "flagsPanel";
+			this.flagsPanel.Size = new System.Drawing.Size(568, 100);
+			this.flagsPanel.TabIndex = 6;
+			this.flagsPanel.TabStop = false;
+			this.flagsPanel.Text = " Flags";
+			// 
+			// flags
+			// 
+			this.flags.BackColor = System.Drawing.SystemColors.Control;
+			this.flags.BorderStyle = System.Windows.Forms.BorderStyle.None;
+			this.flags.CheckBoxes = true;
+			this.flags.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
+			this.flags.Location = new System.Drawing.Point(6, 18);
+			this.flags.Name = "flags";
+			this.flags.Scrollable = false;
+			this.flags.ShowGroups = false;
+			this.flags.Size = new System.Drawing.Size(556, 73);
+			this.flags.TabIndex = 0;
+			this.flags.UseCompatibleStateImageBehavior = false;
+			this.flags.View = System.Windows.Forms.View.List;
+			// 
+			// ThingInfoPanel
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.Controls.Add(this.flagsPanel);
+			this.Controls.Add(this.spritepanel);
+			this.Controls.Add(this.infopanel);
+			this.MaximumSize = new System.Drawing.Size(10000, 100);
+			this.MinimumSize = new System.Drawing.Size(100, 100);
+			this.Name = "ThingInfoPanel";
+			this.Size = new System.Drawing.Size(1145, 100);
+			this.infopanel.ResumeLayout(false);
+			this.infopanel.PerformLayout();
+			this.spritepanel.ResumeLayout(false);
+			this.panel1.ResumeLayout(false);
+			((System.ComponentModel.ISupportInitialize)(this.spritetex)).EndInit();
+			this.flagsPanel.ResumeLayout(false);
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.GroupBox spritepanel;
+		private System.Windows.Forms.Label spritename;
+		private System.Windows.Forms.Panel panel1;
+		private System.Windows.Forms.Label angle;
+		private System.Windows.Forms.Label tag;
+		private System.Windows.Forms.Label position;
+		private System.Windows.Forms.Label action;
+		private System.Windows.Forms.Label type;
+		private System.Windows.Forms.Label arg5;
+		private System.Windows.Forms.Label arglbl5;
+		private System.Windows.Forms.Label arglbl4;
+		private System.Windows.Forms.Label arg4;
+		private System.Windows.Forms.Label arglbl3;
+		private System.Windows.Forms.Label arglbl2;
+		private System.Windows.Forms.Label arg3;
+		private System.Windows.Forms.Label arglbl1;
+		private System.Windows.Forms.Label arg2;
+		private System.Windows.Forms.Label arg1;
+		private System.Windows.Forms.GroupBox infopanel;
+		private System.Windows.Forms.GroupBox flagsPanel;
+		private System.Windows.Forms.ListView flags;
+		private System.Windows.Forms.Label labelaction;
+		private CodeImp.DoomBuilder.GZBuilder.Controls.AngleControl anglecontrol;
+		private ConfigurablePictureBox spritetex;
+		private System.Windows.Forms.Label classname;
+		private System.Windows.Forms.Label labelclass;
+
+	}
+}
diff --git a/Source/Core/Controls/ThingInfoPanel.cs b/Source/Core/Controls/ThingInfoPanel.cs
new file mode 100644
index 0000000..245226a
--- /dev/null
+++ b/Source/Core/Controls/ThingInfoPanel.cs
@@ -0,0 +1,237 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Globalization;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Data;
+using CodeImp.DoomBuilder.GZBuilder.Data;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Types;
+using CodeImp.DoomBuilder.GZBuilder; //mxd
+using System.Collections.Generic;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Controls
+{
+	internal partial class ThingInfoPanel : UserControl
+	{
+		private readonly int hexenformatwidth;
+		private readonly int doomformatwidth;
+
+		// Constructor
+		public ThingInfoPanel()
+		{
+			// Initialize
+			InitializeComponent();
+
+			// Hide stuff when in Doom format
+			hexenformatwidth = infopanel.Width;
+			doomformatwidth = infopanel.Width - 190;
+		}
+
+		// This shows the info
+		public void ShowInfo(Thing t)
+		{
+			// Show/hide stuff depending on format
+			bool hasArgs = General.Map.FormatInterface.HasActionArgs;
+			arglbl1.Visible = hasArgs;
+			arglbl2.Visible = hasArgs;
+			arglbl3.Visible = hasArgs;
+			arglbl4.Visible = hasArgs;
+			arglbl5.Visible = hasArgs;
+			arg1.Visible = hasArgs;
+			arg2.Visible = hasArgs;
+			arg3.Visible = hasArgs;
+			arg4.Visible = hasArgs;
+			arg5.Visible = hasArgs;
+			infopanel.Width = (hasArgs ? hexenformatwidth : doomformatwidth);
+
+			//mxd
+			action.Visible = General.Map.FormatInterface.HasThingAction;
+			labelaction.Visible = General.Map.FormatInterface.HasThingAction;
+
+			// Move panel
+			spritepanel.Left = infopanel.Left + infopanel.Width + infopanel.Margin.Right + spritepanel.Margin.Left;
+			flagsPanel.Left = spritepanel.Left + spritepanel.Width + spritepanel.Margin.Right + flagsPanel.Margin.Left; //mxd
+			
+			// Lookup thing info
+			ThingTypeInfo ti = General.Map.Data.GetThingInfo(t.Type);
+
+			// Get thing action information
+			LinedefActionInfo act;
+			if(General.Map.Config.LinedefActions.ContainsKey(t.Action)) act = General.Map.Config.LinedefActions[t.Action];
+			else if(t.Action == 0) act = new LinedefActionInfo(0, "None", true, false);
+			else act = new LinedefActionInfo(t.Action, "Unknown", false, false);
+			string actioninfo = act.ToString();
+			
+			// Determine z info to show
+			t.DetermineSector();
+			string zinfo;
+			if(ti.AbsoluteZ || t.Sector == null)
+			{
+				zinfo = t.Position.z.ToString(CultureInfo.InvariantCulture) + " (abs.)"; //mxd
+			}
+			else
+			{
+				// Hangs from ceiling?
+				if(ti.Hangs)
+					zinfo = t.Position.z + " (" + ((float)Math.Round(Sector.GetCeilingPlane(t.Sector).GetZ(t.Position) - t.Position.z - ti.Height, General.Map.FormatInterface.VertexDecimals)).ToString(CultureInfo.InvariantCulture) + ")"; //mxd
+				else
+					zinfo = t.Position.z + " (" + ((float)Math.Round(Sector.GetFloorPlane(t.Sector).GetZ(t.Position) + t.Position.z, General.Map.FormatInterface.VertexDecimals)).ToString(CultureInfo.InvariantCulture) + ")"; //mxd
+			}
+
+			// Thing info
+			infopanel.Text = " Thing " + t.Index + " ";
+			type.Text = t.Type + " - " + ti.Title;
+			if(ti.IsObsolete) type.Text += " - OBSOLETE"; //mxd
+			action.Text = actioninfo;
+			bool displayclassname = !string.IsNullOrEmpty(ti.ClassName) && !ti.ClassName.StartsWith("$"); //mxd
+			labelclass.Enabled = displayclassname; //mxd
+			classname.Enabled = displayclassname; //mxd
+			classname.Text = (displayclassname ? ti.ClassName : "--"); //mxd
+			position.Text = t.Position.x.ToString(CultureInfo.InvariantCulture) + ", " + t.Position.y.ToString(CultureInfo.InvariantCulture) + ", " + zinfo;
+			tag.Text = t.Tag + (General.Map.Options.TagLabels.ContainsKey(t.Tag) ? " - " + General.Map.Options.TagLabels[t.Tag] : string.Empty);
+			angle.Text = t.AngleDoom + "\u00B0";
+			anglecontrol.Angle = t.AngleDoom;
+			anglecontrol.Left = angle.Right + 1;
+			
+			// Sprite
+			if(ti.Sprite.ToLowerInvariant().StartsWith(DataManager.INTERNAL_PREFIX) && (ti.Sprite.Length > DataManager.INTERNAL_PREFIX.Length))
+			{
+				spritename.Text = "";
+				spritetex.Image = General.Map.Data.GetSpriteImage(ti.Sprite).GetBitmap();
+			}
+			else if((ti.Sprite.Length <= 8) && (ti.Sprite.Length > 0))
+			{
+				spritename.Text = ti.Sprite;
+				spritetex.Image = General.Map.Data.GetSpriteImage(ti.Sprite).GetPreview();
+			}
+			else
+			{
+				spritename.Text = "";
+				spritetex.Image = null;
+			}
+
+			// Arguments
+			ArgumentInfo[] arginfo = ((t.Action == 0 && ti.Args[0] != null) ? ti.Args : act.Args); //mxd
+
+			//mxd. ACS script argument names
+			bool isacsscript = (Array.IndexOf(GZGeneral.ACS_SPECIALS, t.Action) != -1);
+			bool isnamedacsscript = (isacsscript && General.Map.UDMF && t.Fields.ContainsKey("arg0str"));
+			string scriptname = (isnamedacsscript ? t.Fields.GetValue("arg0str", string.Empty) : string.Empty);
+			ScriptItem scriptitem = null;
+
+			// Named script?
+			if(isnamedacsscript && General.Map.NamedScripts.ContainsKey(scriptname.ToLowerInvariant()))
+			{
+				scriptitem = General.Map.NamedScripts[scriptname.ToLowerInvariant()];
+			}
+			// Script number?
+			else if(isacsscript && General.Map.NumberedScripts.ContainsKey(t.Args[0]))
+			{
+				scriptitem = General.Map.NumberedScripts[t.Args[0]];
+				scriptname = (scriptitem.HasCustomName ? scriptitem.Name : scriptitem.Index.ToString());
+			}
+
+			// Apply script args?
+			Label[] arglabels = new[] { arglbl1, arglbl2, arglbl3, arglbl4, arglbl5 };
+			Label[] args = new[] { arg1, arg2, arg3, arg4, arg5 };
+
+			if(scriptitem != null)
+			{
+				string[] argnames = scriptitem.GetArgumentsDescriptions(t.Action);
+				for(int i = 0; i < argnames.Length; i++)
+				{
+					if(!string.IsNullOrEmpty(argnames[i]))
+					{
+						arglabels[i].Text = argnames[i] + ":";
+						arglabels[i].Enabled = true;
+						args[i].Enabled = true;
+					}
+					else
+					{
+						arglabels[i].Text = arginfo[i].Title + ":";
+						arglabels[i].Enabled = arginfo[i].Used;
+						args[i].Enabled = arginfo[i].Used;
+					}
+				}
+			}
+			else
+			{
+				for(int i = 0; i < arginfo.Length; i++)
+				{
+					arglabels[i].Text = arginfo[i].Title + ":";
+					arglabels[i].Enabled = arginfo[i].Used;
+					args[i].Enabled = arginfo[i].Used;
+				}
+			}
+
+			//mxd. Set argument value and label
+			if(!string.IsNullOrEmpty(scriptname)) arg1.Text = scriptname;
+			else SetArgumentText(arginfo[0], arg1, t.Args[0]);
+			SetArgumentText(arginfo[1], arg2, t.Args[1]);
+			SetArgumentText(arginfo[2], arg3, t.Args[2]);
+			SetArgumentText(arginfo[3], arg4, t.Args[3]);
+			SetArgumentText(arginfo[4], arg5, t.Args[4]);
+
+			//mxd. Flags
+			flags.Items.Clear();
+			foreach(KeyValuePair<string, string> group in General.Map.Config.ThingFlags)
+			{
+				if(t.Flags.ContainsKey(group.Key) && t.Flags[group.Key])
+					flags.Items.Add(new ListViewItem(group.Value) { Checked = true });
+			}
+
+			//mxd. Flags panel visibility and size
+			flagsPanel.Visible = (flags.Items.Count > 0);
+			if(flags.Items.Count > 0) 
+			{
+				flags.Width = flags.GetItemRect(0).Width * (int)Math.Ceiling(flags.Items.Count / 4.0f);
+				flagsPanel.Width = flags.Width + flags.Left * 2;
+			}
+
+			// Show the whole thing
+			this.Show();
+			this.Update();
+		}
+
+		//mxd
+		private static void SetArgumentText(ArgumentInfo info, Label label, int value) 
+		{
+			TypeHandler th = General.Types.GetArgumentHandler(info);
+			th.SetValue(value);
+			label.Text = th.GetStringValue();
+		}
+
+		// When visible changed
+		protected override void OnVisibleChanged(EventArgs e)
+		{
+			// Hiding panels
+			if(!this.Visible)
+			{
+				spritetex.Image = null;
+			}
+
+			// Call base
+			base.OnVisibleChanged(e);
+		}
+	}
+}
diff --git a/Source/Core/Controls/ThingInfoPanel.resx b/Source/Core/Controls/ThingInfoPanel.resx
new file mode 100644
index 0000000..7a1795c
--- /dev/null
+++ b/Source/Core/Controls/ThingInfoPanel.resx
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="label5.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label4.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label3.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label1.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="infopanel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="arg5.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="arglbl5.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="arglbl4.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="arg4.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="arglbl3.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="arglbl2.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="arg3.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="arglbl1.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="arg2.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="arg1.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Controls/ToolStripCheckBox.cs b/Source/Core/Controls/ToolStripCheckBox.cs
new file mode 100644
index 0000000..7c2f158
--- /dev/null
+++ b/Source/Core/Controls/ToolStripCheckBox.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+
+namespace CodeImp.DoomBuilder.Controls
+{
+	[ToolStripItemDesignerAvailability(ToolStripItemDesignerAvailability.ToolStrip)]
+	public class ToolStripCheckBox : ToolStripControlHost
+	{
+		public event EventHandler CheckedChanged;
+
+		public bool Checked { get { return cb.Checked; } set { cb.Checked = value; } }
+		new public string Text { get { return cb.Text; } set { cb.Text = value; } }
+		private CheckBox cb;
+
+		public ToolStripCheckBox() : base(new CheckBox()) { }
+
+		protected override void OnSubscribeControlEvents(Control control) 
+		{
+			base.OnSubscribeControlEvents(control);
+			cb = control as CheckBox;
+			cb.CheckedChanged += OnCheckedChanged;
+		}
+
+		protected override void OnUnsubscribeControlEvents(Control control) 
+		{
+			base.OnUnsubscribeControlEvents(control);
+			cb.CheckedChanged -= OnCheckedChanged;
+		}
+
+		private void OnCheckedChanged(object sender, EventArgs e) 
+		{
+			if(CheckedChanged != null) CheckedChanged(this, e);
+		}
+	}
+}
diff --git a/Source/Core/Controls/ToolStripNumericUpDown.cs b/Source/Core/Controls/ToolStripNumericUpDown.cs
new file mode 100644
index 0000000..0000942
--- /dev/null
+++ b/Source/Core/Controls/ToolStripNumericUpDown.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+
+namespace CodeImp.DoomBuilder.Controls
+{
+	[ToolStripItemDesignerAvailability(ToolStripItemDesignerAvailability.ToolStrip)]
+	public class ToolStripNumericUpDown : ToolStripControlHost
+	{
+		public event EventHandler ValueChanged;
+		
+		public decimal Value { get { return nud.Value; } set { nud.Value = value; } }
+		public decimal Minimum { get { return nud.Minimum; } set { nud.Minimum = value; } }
+		public decimal Maximum { get { return nud.Maximum; } set { nud.Maximum = value; } }
+
+		private NumericUpDown nud;
+
+		public ToolStripNumericUpDown() : base(new NumericUpDown()) { }
+
+        protected override void OnSubscribeControlEvents(Control control)
+        {
+            base.OnSubscribeControlEvents(control);
+	        nud = control as NumericUpDown;
+	        nud.ValueChanged += OnValueChanged;
+        }
+
+        protected override void OnUnsubscribeControlEvents(Control control)
+        {
+            base.OnUnsubscribeControlEvents(control);
+			nud.ValueChanged -= OnValueChanged;
+        }
+
+        public void OnValueChanged(object sender, EventArgs e)
+        {
+            if(ValueChanged != null) ValueChanged(this, e);
+        }
+	}
+}
diff --git a/Source/Core/Controls/TransparentPanel.cs b/Source/Core/Controls/TransparentPanel.cs
new file mode 100644
index 0000000..08392a3
--- /dev/null
+++ b/Source/Core/Controls/TransparentPanel.cs
@@ -0,0 +1,59 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Drawing;
+using System.Windows.Forms;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Controls
+{
+	public class TransparentPanel : Panel
+	{
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public TransparentPanel()
+		{
+		}
+
+		#endregion
+
+		#region ================== Methods
+		
+		// Override this property
+		protected override CreateParams CreateParams
+		{
+			get
+			{
+				CreateParams cp = base.CreateParams;
+				cp.ExStyle |= 0x20;
+				return cp;
+			}
+		}
+
+		// Disable background drawing by overriding this
+		protected override void OnPaintBackground(PaintEventArgs e)
+		{
+			if(BackColor != Color.Transparent)
+				e.Graphics.Clear(BackColor);
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Controls/VertexInfoPanel.Designer.cs b/Source/Core/Controls/VertexInfoPanel.Designer.cs
new file mode 100644
index 0000000..cfd7192
--- /dev/null
+++ b/Source/Core/Controls/VertexInfoPanel.Designer.cs
@@ -0,0 +1,149 @@
+namespace CodeImp.DoomBuilder.Controls
+{
+	partial class VertexInfoPanel
+	{
+		/// <summary> 
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Component Designer generated code
+
+		/// <summary> 
+		/// Required method for Designer support - do not modify 
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			System.Windows.Forms.Label label1;
+			this.vertexinfo = new System.Windows.Forms.GroupBox();
+			this.panelOffsets = new System.Windows.Forms.Panel();
+			this.zfloor = new System.Windows.Forms.Label();
+			this.labelzceiling = new System.Windows.Forms.Label();
+			this.zceiling = new System.Windows.Forms.Label();
+			this.labelzfloor = new System.Windows.Forms.Label();
+			this.position = new System.Windows.Forms.Label();
+			label1 = new System.Windows.Forms.Label();
+			this.vertexinfo.SuspendLayout();
+			this.panelOffsets.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// label1
+			// 
+			label1.AutoSize = true;
+			label1.Location = new System.Drawing.Point(35, 28);
+			label1.Name = "label1";
+			label1.Size = new System.Drawing.Size(47, 13);
+			label1.TabIndex = 2;
+			label1.Text = "Position:";
+			// 
+			// vertexinfo
+			// 
+			this.vertexinfo.Controls.Add(this.panelOffsets);
+			this.vertexinfo.Controls.Add(this.position);
+			this.vertexinfo.Controls.Add(label1);
+			this.vertexinfo.Location = new System.Drawing.Point(0, 0);
+			this.vertexinfo.Name = "vertexinfo";
+			this.vertexinfo.Size = new System.Drawing.Size(200, 100);
+			this.vertexinfo.TabIndex = 0;
+			this.vertexinfo.TabStop = false;
+			this.vertexinfo.Text = " Vertex ";
+			// 
+			// panelOffsets
+			// 
+			this.panelOffsets.Controls.Add(this.zfloor);
+			this.panelOffsets.Controls.Add(this.labelzceiling);
+			this.panelOffsets.Controls.Add(this.zceiling);
+			this.panelOffsets.Controls.Add(this.labelzfloor);
+			this.panelOffsets.Location = new System.Drawing.Point(6, 49);
+			this.panelOffsets.Name = "panelOffsets";
+			this.panelOffsets.Size = new System.Drawing.Size(151, 46);
+			this.panelOffsets.TabIndex = 1;
+			// 
+			// zfloor
+			// 
+			this.zfloor.AutoSize = true;
+			this.zfloor.Location = new System.Drawing.Point(86, 26);
+			this.zfloor.Name = "zfloor";
+			this.zfloor.Size = new System.Drawing.Size(28, 13);
+			this.zfloor.TabIndex = 7;
+			this.zfloor.Text = "-512";
+			// 
+			// labelzceiling
+			// 
+			this.labelzceiling.AutoSize = true;
+			this.labelzceiling.Location = new System.Drawing.Point(5, 3);
+			this.labelzceiling.Name = "labelzceiling";
+			this.labelzceiling.Size = new System.Drawing.Size(70, 13);
+			this.labelzceiling.TabIndex = 4;
+			this.labelzceiling.Text = "Ceiling offset:";
+			// 
+			// zceiling
+			// 
+			this.zceiling.AutoSize = true;
+			this.zceiling.Location = new System.Drawing.Point(86, 3);
+			this.zceiling.Name = "zceiling";
+			this.zceiling.Size = new System.Drawing.Size(28, 13);
+			this.zceiling.TabIndex = 6;
+			this.zceiling.Text = "-512";
+			// 
+			// labelzfloor
+			// 
+			this.labelzfloor.AutoSize = true;
+			this.labelzfloor.Location = new System.Drawing.Point(12, 26);
+			this.labelzfloor.Name = "labelzfloor";
+			this.labelzfloor.Size = new System.Drawing.Size(62, 13);
+			this.labelzfloor.TabIndex = 5;
+			this.labelzfloor.Text = "Floor offset:";
+			// 
+			// position
+			// 
+			this.position.AutoSize = true;
+			this.position.Location = new System.Drawing.Point(92, 28);
+			this.position.Name = "position";
+			this.position.Size = new System.Drawing.Size(25, 13);
+			this.position.TabIndex = 3;
+			this.position.Text = "0, 0";
+			// 
+			// VertexInfoPanel
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.Controls.Add(this.vertexinfo);
+			this.MaximumSize = new System.Drawing.Size(10000, 100);
+			this.MinimumSize = new System.Drawing.Size(100, 100);
+			this.Name = "VertexInfoPanel";
+			this.Size = new System.Drawing.Size(393, 100);
+			this.vertexinfo.ResumeLayout(false);
+			this.vertexinfo.PerformLayout();
+			this.panelOffsets.ResumeLayout(false);
+			this.panelOffsets.PerformLayout();
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Label position;
+		private System.Windows.Forms.GroupBox vertexinfo;
+		private System.Windows.Forms.Label zfloor;
+		private System.Windows.Forms.Label zceiling;
+		private System.Windows.Forms.Panel panelOffsets;
+		private System.Windows.Forms.Label labelzceiling;
+		private System.Windows.Forms.Label labelzfloor;
+
+	}
+}
diff --git a/Source/Core/Controls/VertexInfoPanel.cs b/Source/Core/Controls/VertexInfoPanel.cs
new file mode 100644
index 0000000..666a89f
--- /dev/null
+++ b/Source/Core/Controls/VertexInfoPanel.cs
@@ -0,0 +1,64 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Globalization;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Map;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Controls
+{
+	internal partial class VertexInfoPanel : UserControl
+	{
+		// Constructor
+		public VertexInfoPanel()
+		{
+			// Initialize
+			InitializeComponent();
+		}
+
+		// This shows the info
+		public void ShowInfo(Vertex v)
+		{
+			// Vertex info
+			vertexinfo.Text = " Vertex " + v.Index + " ";
+			position.Text = v.Position.x.ToString(CultureInfo.InvariantCulture) + ", " + v.Position.y.ToString(CultureInfo.InvariantCulture);
+			
+			//mxd. Height offsets
+			if(General.Map.UDMF)
+			{
+				bool haveoffset = !float.IsNaN(v.ZCeiling);
+				zceiling.Text = (haveoffset ? v.ZCeiling.ToString(CultureInfo.InvariantCulture) : "--");
+				zceiling.Enabled = haveoffset;
+				labelzceiling.Enabled = haveoffset;
+
+				haveoffset = !float.IsNaN(v.ZFloor);
+				zfloor.Text = (haveoffset ? v.ZFloor.ToString(CultureInfo.InvariantCulture) : "--");
+				zfloor.Enabled = haveoffset;
+				labelzfloor.Enabled = haveoffset;
+			}
+
+			panelOffsets.Visible = General.Map.UDMF;
+
+			// Show the whole thing
+			this.Show();
+			this.Update();
+		}
+	}
+}
diff --git a/Source/Core/Controls/VertexInfoPanel.resx b/Source/Core/Controls/VertexInfoPanel.resx
new file mode 100644
index 0000000..34fd59b
--- /dev/null
+++ b/Source/Core/Controls/VertexInfoPanel.resx
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="label1.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="vertexinfo.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Data/BitmapImage.cs b/Source/Core/Data/BitmapImage.cs
new file mode 100644
index 0000000..61fc413
--- /dev/null
+++ b/Source/Core/Data/BitmapImage.cs
@@ -0,0 +1,77 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Drawing;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Data
+{
+	public class BitmapImage : ImageData
+	{
+		#region ================== Variables
+
+		// Image source
+		private Bitmap img;
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public BitmapImage(Bitmap img, string name)
+		{
+			// Initialize
+			this.img = img;
+			this.AllowUnload = false;
+			SetName(name);
+
+			// Get width and height from image
+			width = img.Size.Width;
+			height = img.Size.Height;
+			scale.x = 1.0f;
+			scale.y = 1.0f;
+
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This loads the image
+		protected override void LocalLoadImage()
+		{
+			lock(this)
+			{
+				// No failure checking here. I anything fails here, it is not the user's fault,
+				// because the resources this loads are in the assembly.
+
+				// Get resource from memory
+				bitmap = img;
+
+				// Pass on to base
+				base.LocalLoadImage();
+			}
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Data/CameraTextureImage.cs b/Source/Core/Data/CameraTextureImage.cs
new file mode 100644
index 0000000..24f9fef
--- /dev/null
+++ b/Source/Core/Data/CameraTextureImage.cs
@@ -0,0 +1,120 @@
+#region ================== Namespaces
+
+using System;
+using System.Drawing;
+using System.IO;
+using CodeImp.DoomBuilder.ZDoom;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Data
+{
+	public class CameraTextureImage : ImageData
+	{
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public CameraTextureImage(CameraTextureData data)
+		{
+			// Initialize
+			this.UseColorCorrection = false;
+			this.worldpanning = data.WorldPanning;
+			SetName(data.Name);
+
+			// Get width and height from image
+			this.width = data.Width;
+			this.height = data.Height;
+			scale.x = data.ScaleX;
+			scale.y = data.ScaleY;
+
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This loads the image
+		protected override void LocalLoadImage()
+		{
+			// Leave when already loaded
+			if(this.IsImageLoaded) return;
+			
+			lock(this)
+			{
+				bitmap = new Bitmap(width, height);
+
+				int w = Math.Max(2, Math.Min(width, height) / 24); // line width
+				int o = w / 2; // line center offset
+				int l = w * 3; // line length
+				name = name.ToUpperInvariant();
+
+				using(Graphics g = Graphics.FromImage(bitmap))
+				{
+					// Fill bg
+					g.FillRectangle(Brushes.Black, 0, 0, width, height);
+
+					// Draw corners
+					Color color = General.Colors.BrightColors[General.Random(0, General.Colors.BrightColors.Length - 1)].ToColor();
+					using(var pen = new Pen(color, w))
+					{
+						g.DrawLines(pen, new[] { new Point(l, o), new Point(o, o), new Point(o, l) }); // TL
+						g.DrawLines(pen, new[] { new Point(width - l, o), new Point(width - o, o), new Point(width - o, l) }); // TR
+						g.DrawLines(pen, new[] { new Point(l, height - o), new Point(o, height - o), new Point(o, height - l) }); // BL
+						g.DrawLines(pen, new[] { new Point(width - l, height - o), new Point(width - o, height - o), new Point(width - o, height - l) }); // BR
+					}
+
+					// Calculate required font size
+					const string rec = "\u25CFREC";
+					float targetwidth = Math.Max(l * 2, 22);
+					SizeF fontsize = g.MeasureString(rec, General.MainWindow.Font);
+					float scaleratio = Math.Min(targetwidth / fontsize.Height, targetwidth / fontsize.Width);
+
+					// Draw "REC" text
+					using(Font font = new Font(General.MainWindow.Font.FontFamily, General.MainWindow.Font.Size * scaleratio))
+					{
+						using(var brush = new SolidBrush(Color.Red))
+						{
+							g.DrawString(rec, font, brush, new RectangleF(l / 2, l / 2 - w / 2, fontsize.Width * scaleratio, fontsize.Height * scaleratio));
+						}
+					}
+
+					// Calculate required font size
+					targetwidth = Math.Min(width, height);
+					targetwidth -= targetwidth / 6;
+					fontsize = g.MeasureString(name, General.MainWindow.Font);
+					scaleratio = Math.Min(targetwidth / fontsize.Height, targetwidth / fontsize.Width);
+
+					// Draw texture name
+					using(Font font = new Font(General.MainWindow.Font.FontFamily, General.MainWindow.Font.Size * scaleratio))
+					{
+						using(var brush = new SolidBrush(color))
+						{
+							StringFormat sf = new StringFormat { Alignment = StringAlignment.Center, LineAlignment = StringAlignment.Center };
+							g.DrawString(name, font, brush, new RectangleF(0, 0, width, height), sf);
+						}
+					}
+				}
+
+				// Pass on to base
+				base.LocalLoadImage();
+			}
+		}
+
+		//mxd
+		protected override void SetName(string name)
+		{
+			if(!General.Map.Config.UseLongTextureNames)
+			{
+				if(name.Length > DataManager.CLASIC_IMAGE_NAME_LENGTH) name = name.Substring(0, DataManager.CLASIC_IMAGE_NAME_LENGTH);
+				name = name.ToUpperInvariant();
+			}
+
+			base.SetName(name);
+			this.virtualname = "[CAMERA TEXTURES]" + Path.AltDirectorySeparatorChar + name;
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Data/ColorImage.cs b/Source/Core/Data/ColorImage.cs
new file mode 100644
index 0000000..cd2a1a3
--- /dev/null
+++ b/Source/Core/Data/ColorImage.cs
@@ -0,0 +1,99 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Drawing;
+using System.Drawing.Imaging;
+using CodeImp.DoomBuilder.Rendering;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Data
+{
+	internal sealed unsafe class ColorImage : ImageData
+	{
+		#region ================== Variables
+
+		private PixelColor color;
+
+		#endregion
+		
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public ColorImage(PixelColor color, int width, int height)
+		{
+			// Initialize
+			this.width = width;
+			this.height = height;
+			this.color = color;
+			SetName(color.ToColorValue().ToString());
+
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This loads the image
+		protected override void LocalLoadImage()
+		{
+			// Leave when already loaded
+			if(this.IsImageLoaded) return;
+			if((width == 0) || (height == 0)) return;
+
+			lock(this)
+			{
+				// Create bitmap
+				try
+				{
+					if(bitmap != null) bitmap.Dispose();
+					bitmap = new Bitmap(width, height, PixelFormat.Format32bppArgb);
+					BitmapData bitmapdata = bitmap.LockBits(new Rectangle(0, 0, width, height), ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
+					PixelColor* pixels = (PixelColor*)bitmapdata.Scan0.ToPointer();
+					for(int i = 0; i < (width * height); i++)
+					{
+						*pixels = color;
+						pixels++;
+					}
+					bitmap.UnlockBits(bitmapdata);
+				}
+				catch(Exception e)
+				{
+					// Unable to make bitmap
+					General.ErrorLogger.Add(ErrorType.Error, "Unable to create color image '" + this.Name + "'. " + e.GetType().Name + ": " + e.Message);
+					loadfailed = true;
+				}
+
+				// Dispose bitmap if load failed
+				if(loadfailed && (bitmap != null))
+				{
+					bitmap.Dispose();
+					bitmap = null;
+				}
+				
+				// Pass on to base
+				base.LocalLoadImage();
+			}
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Data/ColormapImage.cs b/Source/Core/Data/ColormapImage.cs
new file mode 100644
index 0000000..487c483
--- /dev/null
+++ b/Source/Core/Data/ColormapImage.cs
@@ -0,0 +1,111 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.IO;
+using CodeImp.DoomBuilder.IO;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Data
+{
+	internal sealed class ColormapImage : ImageData
+	{
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public ColormapImage(string name)
+		{
+			// Initialize
+			SetName(name);
+			virtualname = "[Colormaps]/" + this.name; //mxd
+
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This loads the image
+		protected override void LocalLoadImage()
+		{
+			// Leave when already loaded
+			if(this.IsImageLoaded) return;
+
+			lock(this)
+			{
+				// Get the lump data stream
+				Stream lumpdata = General.Map.Data.GetColormapData(Name);
+				if(lumpdata != null)
+				{
+					// Copy lump data to memory
+					lumpdata.Seek(0, SeekOrigin.Begin);
+					byte[] membytes = new byte[(int)lumpdata.Length];
+					lumpdata.Read(membytes, 0, (int)lumpdata.Length);
+					MemoryStream mem = new MemoryStream(membytes);
+					mem.Seek(0, SeekOrigin.Begin);
+
+					// Get a reader for the data
+					IImageReader reader = ImageDataFormat.GetImageReader(mem, ImageDataFormat.DOOMCOLORMAP, General.Map.Data.Palette);
+					if(reader is UnknownImageReader)
+					{
+						// Data is in an unknown format!
+						General.ErrorLogger.Add(ErrorType.Error, "Colormap lump '" + Name + "' data format could not be read. Does this lump contain valid colormap data at all?");
+						bitmap = null;
+					}
+					else
+					{
+						// Read data as bitmap
+						mem.Seek(0, SeekOrigin.Begin);
+						if(bitmap != null) bitmap.Dispose();
+						bitmap = reader.ReadAsBitmap(mem);
+					}
+
+					// Done
+					mem.Dispose();
+
+					if(bitmap != null)
+					{
+						// Get width and height from image and set the scale
+						width = bitmap.Size.Width;
+						height = bitmap.Size.Height;
+						scale.x = General.Map.Config.DefaultFlatScale;
+						scale.y = General.Map.Config.DefaultFlatScale;
+					}
+					else
+					{
+						loadfailed = true;
+					}
+				}
+				else
+				{
+					// Missing a patch lump!
+					General.ErrorLogger.Add(ErrorType.Error, "Missing colormap lump '" + Name + "'. Did you forget to include required resources?");
+					loadfailed = true;
+				}
+
+				// Pass on to base
+				base.LocalLoadImage();
+			}
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Data/DataLocation.cs b/Source/Core/Data/DataLocation.cs
new file mode 100644
index 0000000..82dcb5d
--- /dev/null
+++ b/Source/Core/Data/DataLocation.cs
@@ -0,0 +1,97 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.IO;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Data
+{
+	public struct DataLocation : IComparable<DataLocation>, IComparable, IEquatable<DataLocation>
+	{
+		// Constants
+		public const int RESOURCE_WAD = 0;
+		public const int RESOURCE_DIRECTORY = 1;
+		public const int RESOURCE_PK3 = 2;
+		
+		// Members
+		public int type;
+		public string location;
+		public bool option1;
+		public bool option2;
+		public bool notfortesting;
+		
+		// Constructor
+		public DataLocation(int type, string location, bool option1, bool option2, bool notfortesting)
+		{
+			// Initialize
+			this.type = type;
+			this.location = location;
+			this.option1 = option1;
+			this.option2 = option2;
+			this.notfortesting = notfortesting;
+		}
+
+		// This displays the struct as string
+		public override string ToString()
+		{
+			// Simply show location
+			return location;
+		}
+
+		// This compares two locations
+		public int CompareTo(DataLocation other)
+		{
+			return string.Compare(this.location, other.location, true);
+		}
+		
+		// This compares two locations
+		public int CompareTo(object obj)
+		{
+			return string.Compare(this.location, ((DataLocation)obj).location, true);
+		}
+		
+		// This compares two locations
+		public bool Equals(DataLocation other)
+		{
+			return (this.CompareTo(other) == 0);
+		}
+
+		//mxd
+		public bool IsValid()
+		{
+			switch(type) 
+			{
+				case RESOURCE_DIRECTORY:
+					if(!Directory.Exists(location)) return false;
+					break;
+
+				case RESOURCE_WAD:
+				case RESOURCE_PK3:
+					if(!File.Exists(location)) return false;
+					break;
+
+				default:
+					throw new NotImplementedException("ResourceListEditor.FixedResourceLocationList: got unknown location type: " + type);
+			}
+
+			return true;
+		}
+	}
+}
diff --git a/Source/Core/Data/DataLocationList.cs b/Source/Core/Data/DataLocationList.cs
new file mode 100644
index 0000000..3c045ab
--- /dev/null
+++ b/Source/Core/Data/DataLocationList.cs
@@ -0,0 +1,117 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using CodeImp.DoomBuilder.IO;
+using System.Collections.Specialized;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Data
+{
+	public sealed class DataLocationList : List<DataLocation>
+	{
+		#region ================== Constructors
+
+		// This creates a new list
+		public DataLocationList()
+		{
+		}
+
+		// This makes a copy of a list
+		public DataLocationList(IEnumerable<DataLocation> list) : base(list)
+		{
+		}
+
+		// This creates a list from a configuration structure
+		internal DataLocationList(Configuration cfg, string path)
+		{
+			// Go for all items in the map info
+			IDictionary resinfo = cfg.ReadSetting(path, new ListDictionary());
+			foreach(DictionaryEntry rl in resinfo)
+			{
+				// Item is a structure?
+				if(rl.Value is IDictionary)
+				{
+					// Create resource location
+					IDictionary rlinfo = (IDictionary)rl.Value;
+					DataLocation res = new DataLocation();
+
+					// Copy information from Configuration to ResourceLocation
+					if(rlinfo.Contains("type") && (rlinfo["type"] is int)) res.type = (int)rlinfo["type"];
+					if(rlinfo.Contains("location") && (rlinfo["location"] is string)) res.location = (string)rlinfo["location"];
+					if(rlinfo.Contains("option1") && (rlinfo["option1"] is int)) res.option1 = General.Int2Bool((int)rlinfo["option1"]);
+					if(rlinfo.Contains("option2") && (rlinfo["option2"] is int)) res.option2 = General.Int2Bool((int)rlinfo["option2"]);
+					if(rlinfo.Contains("notfortesting") && (rlinfo["notfortesting"] is int)) res.notfortesting = General.Int2Bool((int)rlinfo["notfortesting"]);
+
+					// Add resource
+					Add(res);
+				}
+			}
+		}
+		
+		#endregion
+
+		#region ================== Methods
+
+		// This merges two lists together
+		public static DataLocationList Combined(DataLocationList a, DataLocationList b)
+		{
+			DataLocationList result = new DataLocationList();
+			result.AddRange(a);
+			result.AddRange(b);
+			return result;
+		}
+
+		// This writes the list to configuration
+		internal void WriteToConfig(Configuration cfg, string path)
+		{
+			// Fill structure
+			IDictionary resinfo = new ListDictionary();
+			for(int i = 0; i < this.Count; i++)
+			{
+				// Create structure for resource
+				IDictionary rlinfo = new ListDictionary();
+				rlinfo.Add("type", this[i].type);
+				rlinfo.Add("location", this[i].location);
+				rlinfo.Add("option1", General.Bool2Int(this[i].option1));
+				rlinfo.Add("option2", General.Bool2Int(this[i].option2));
+				rlinfo.Add("notfortesting", General.Bool2Int(this[i].notfortesting));
+
+				// Add structure
+				resinfo.Add("resource" + i.ToString(CultureInfo.InvariantCulture), rlinfo);
+			}
+			
+			// Write to config
+			cfg.WriteSetting(path, resinfo);
+		}
+
+		//mxd
+		public bool IsValid()
+		{
+			foreach(DataLocation location in this) if(!location.IsValid()) return false;
+			return true;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Data/DataManager.cs b/Source/Core/Data/DataManager.cs
new file mode 100644
index 0000000..254f50c
--- /dev/null
+++ b/Source/Core/Data/DataManager.cs
@@ -0,0 +1,2266 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.GZBuilder.Data;
+using CodeImp.DoomBuilder.GZBuilder.GZDoom;
+using CodeImp.DoomBuilder.GZBuilder.MD3;
+using CodeImp.DoomBuilder.IO;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Windows;
+using CodeImp.DoomBuilder.ZDoom;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Data
+{
+	public sealed class DataManager
+	{
+		#region ================== Constants
+		
+		public const string INTERNAL_PREFIX = "internal:";
+		public const int CLASIC_IMAGE_NAME_LENGTH = 8; //mxd
+		
+		#endregion
+
+		#region ================== Variables
+		
+		// Data containers
+		private List<DataReader> containers;
+		private DataReader currentreader;
+		
+		// Palette
+		private Playpal palette;
+		
+		// Textures, Flats and Sprites
+		private Dictionary<long, ImageData> textures;
+		private Dictionary<long, long> texturenamesshorttofull; //mxd
+		private List<string> texturenames;
+		private Dictionary<long, ImageData> flats;
+		private Dictionary<long, long> flatnamesshorttofull; //mxd
+		private List<string> flatnames;
+		private Dictionary<long, ImageData> sprites;
+		private List<MatchingTextureSet> texturesets;
+		private List<ResourceTextureSet> resourcetextures;
+		private AllTextureSet alltextures;
+
+		//mxd 
+		private Dictionary<int, ModelData> modeldefentries; //Thing.Type, Model entry
+		private readonly Dictionary<int, DynamicLightData> gldefsentries; //Thing.Type, Light entry
+		private MapInfo mapinfo;
+		private Dictionary<string, KeyValuePair<int, int>> reverbs; //<name, <arg1, arg2> 
+		private Dictionary<long, GlowingFlatData> glowingflats; // Texture name hash, Glowing Flat Data
+		private List<string> soundsequences;
+		
+		// Background loading
+		private Queue<ImageData> imageque;
+		private Thread backgroundloader;
+		private volatile bool updatedusedtextures;
+		private bool notifiedbusy;
+		
+		// Image previews
+		private PreviewManager previews;
+		
+		// Special images
+		private ImageData missingtexture3d;
+		private ImageData unknowntexture3d;
+		private UnknownImage unknownimage; //mxd
+		private ImageData hourglass3d;
+		private ImageData crosshair;
+		private ImageData crosshairbusy;
+		private Dictionary<string, ImageData> internalsprites;
+		private ImageData whitetexture;
+		private ImageData blacktexture; //mxd
+
+		//mxd. Comment icons
+		private ImageData[] commenttextures;
+		
+		// Used images
+		private Dictionary<long, long> usedtextures; //mxd
+		private Dictionary<long, long> usedflats; //mxd. Used only when MixTextursFlats is disabled
+		
+		// Things combined with things created from Decorate
+		private DecorateParser decorate;
+		private List<ThingCategory> thingcategories;
+		private Dictionary<int, ThingTypeInfo> thingtypes;
+		
+		// Timing
+		private float loadstarttime;
+		private float loadfinishtime;
+		
+		// Disposing
+		private bool isdisposed;
+
+		#endregion
+
+		#region ================== Properties
+
+		//mxd
+		internal Dictionary<int, ModelData> ModeldefEntries { get { return modeldefentries; } }
+		internal Dictionary<int, DynamicLightData> GldefsEntries { get { return gldefsentries; } }
+		public MapInfo MapInfo { get { return mapinfo; } }
+		public Dictionary<string, KeyValuePair<int, int>> Reverbs { get { return reverbs; } }
+		public Dictionary<long, GlowingFlatData> GlowingFlats { get { return glowingflats; } }
+		public List<string> SoundSequences { get { return soundsequences; } }
+		internal List<DataReader> Containers { get { return containers; } } //mxd
+
+		public Playpal Palette { get { return palette; } }
+		public PreviewManager Previews { get { return previews; } }
+		public ICollection<ImageData> Textures { get { return textures.Values; } }
+		public ICollection<ImageData> Flats { get { return flats.Values; } }
+		public List<string> TextureNames { get { return texturenames; } }
+		public List<string> FlatNames { get { return flatnames; } }
+		public bool IsDisposed { get { return isdisposed; } }
+		public ImageData MissingTexture3D { get { return missingtexture3d; } }
+		public ImageData UnknownTexture3D { get { return unknowntexture3d; } }
+		public ImageData Hourglass3D { get { return hourglass3d; } }
+		public ImageData Crosshair3D { get { return crosshair; } }
+		public ImageData CrosshairBusy3D { get { return crosshairbusy; } }
+		public ImageData WhiteTexture { get { return whitetexture; } }
+		public ImageData BlackTexture { get { return blacktexture; } } //mxd
+		public ImageData[] CommentTextures { get { return commenttextures; } } //mxd
+		public List<ThingCategory> ThingCategories { get { return thingcategories; } }
+		public ICollection<ThingTypeInfo> ThingTypes { get { return thingtypes.Values; } }
+		public DecorateParser Decorate { get { return decorate; } }
+		internal ICollection<MatchingTextureSet> TextureSets { get { return texturesets; } }
+		internal ICollection<ResourceTextureSet> ResourceTextureSets { get { return resourcetextures; } }
+		internal AllTextureSet AllTextureSet { get { return alltextures; } }
+		
+		public bool IsLoading
+		{
+			get
+			{
+				if(imageque != null)
+					return (backgroundloader != null) && backgroundloader.IsAlive && ((imageque.Count > 0) || previews.IsLoading);
+				return false;
+			}
+		}
+		
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		internal DataManager()
+		{
+			// We have no destructor
+			GC.SuppressFinalize(this);
+
+			//mxd.
+			modeldefentries = new Dictionary<int, ModelData>();
+			gldefsentries = new Dictionary<int, DynamicLightData>();
+			reverbs = new Dictionary<string, KeyValuePair<int, int>>();
+			glowingflats = new Dictionary<long, GlowingFlatData>();
+			soundsequences = new List<string>();
+
+			// Load special images (mxd: the rest is loaded in LoadInternalTextures())
+			whitetexture = new ResourceImage("CodeImp.DoomBuilder.Resources.White.png") { UseColorCorrection = false };
+			whitetexture.LoadImage();
+			whitetexture.CreateTexture();
+			blacktexture = new ResourceImage("CodeImp.DoomBuilder.Resources.Black.png") { UseColorCorrection = false }; //mxd
+			blacktexture.LoadImage(); //mxd
+			blacktexture.CreateTexture(); //mxd
+			unknownimage = new UnknownImage(Properties.Resources.UnknownImage); //mxd. There should be only one!
+
+			//mxd. Create comment icons
+			commenttextures = new ImageData[]
+			                  {
+				                  new ResourceImage("CodeImp.DoomBuilder.Resources.CommentRegular.png"),
+								  new ResourceImage("CodeImp.DoomBuilder.Resources.CommentInfo.png"),
+								  new ResourceImage("CodeImp.DoomBuilder.Resources.CommentQuestion.png"),
+								  new ResourceImage("CodeImp.DoomBuilder.Resources.CommentProblem.png"),
+								  new ResourceImage("CodeImp.DoomBuilder.Resources.CommentSmile.png"),
+			                  };
+
+			//mxd. Load comment icons
+			foreach(ImageData data in commenttextures)
+			{
+				data.LoadImage();
+				data.CreateTexture();
+			}
+		}
+		
+		// Disposer
+		internal void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Clean up
+				Unload();
+				missingtexture3d.Dispose();
+				missingtexture3d = null;
+				unknowntexture3d.Dispose();
+				unknowntexture3d = null;
+				hourglass3d.Dispose();
+				hourglass3d = null;
+				crosshair.Dispose();
+				crosshair = null;
+				crosshairbusy.Dispose();
+				crosshairbusy = null;
+				whitetexture.Dispose();
+				whitetexture = null;
+				blacktexture.Dispose(); //mxd
+				blacktexture = null; //mxd
+				unknownimage.Dispose(); //mxd
+				unknownimage = null; //mxd
+				foreach(ImageData i in commenttextures) i.Dispose(); //mxd
+				commenttextures = null;
+				
+				// Done
+				isdisposed = true;
+			}
+		}
+
+		#endregion
+
+		#region ================== Loading / Unloading
+
+		// This loads all data resources
+		internal void Load(DataLocationList configlist, DataLocationList maplist, DataLocation maplocation)
+		{
+			DataLocationList all = DataLocationList.Combined(configlist, maplist);
+			all.Add(maplocation);
+			Load(all);
+		}
+
+		// This loads all data resources
+		internal void Load(DataLocationList configlist, DataLocationList maplist)
+		{
+			DataLocationList all = DataLocationList.Combined(configlist, maplist);
+			Load(all);
+		}
+
+		// This loads all data resources
+		internal void Load(DataLocationList locations)
+		{
+			Dictionary<long, ImageData> texturesonly = new Dictionary<long, ImageData>();
+			Dictionary<long, ImageData> colormapsonly = new Dictionary<long, ImageData>();
+			Dictionary<long, ImageData> flatsonly = new Dictionary<long, ImageData>();
+
+			// Create collections
+			containers = new List<DataReader>();
+			textures = new Dictionary<long, ImageData>();
+			flats = new Dictionary<long, ImageData>();
+			sprites = new Dictionary<long, ImageData>();
+			texturenames = new List<string>();
+			flatnames = new List<string>();
+			texturenamesshorttofull = new Dictionary<long, long>(); //mxd
+			flatnamesshorttofull = new Dictionary<long, long>(); //mxd
+			imageque = new Queue<ImageData>();
+			previews = new PreviewManager();
+			texturesets = new List<MatchingTextureSet>();
+			usedtextures = new Dictionary<long, long>(); //mxd
+			usedflats = new Dictionary<long, long>(); //mxd
+			internalsprites = new Dictionary<string, ImageData>(StringComparer.Ordinal);
+			thingcategories = General.Map.Config.GetThingCategories();
+			thingtypes = General.Map.Config.GetThingTypes();
+			
+			// Load texture sets
+			foreach(DefinedTextureSet ts in General.Map.ConfigSettings.TextureSets)
+				texturesets.Add(new MatchingTextureSet(ts));
+			
+			// Sort the texture sets
+			texturesets.Sort();
+			
+			// Special textures sets
+			alltextures = new AllTextureSet();
+			resourcetextures = new List<ResourceTextureSet>();
+			
+			// Go for all locations
+			foreach(DataLocation dl in locations)
+			{
+				// Nothing chosen yet
+				DataReader c = null;
+
+				// TODO: Make this work more elegant using reflection.
+				// Make DataLocation.type of type Type and assign the
+				// types of the desired reader classes.
+
+				try
+				{
+					// Choose container type
+					switch(dl.type)
+					{
+						// WAD file container
+						case DataLocation.RESOURCE_WAD:
+							c = new WADReader(dl);
+							break;
+
+						// Directory container
+						case DataLocation.RESOURCE_DIRECTORY:
+							c = new DirectoryReader(dl);
+							break;
+
+						// PK3 file container
+						case DataLocation.RESOURCE_PK3:
+							c = new PK3Reader(dl);
+							break;
+					}
+				}
+				catch(Exception e)
+				{
+					// Unable to load resource
+					General.ErrorLogger.Add(ErrorType.Error, "Unable to load resources from location \"" + dl.location + "\". Please make sure the location is accessible and not in use by another program. The resources will now be loaded with this location excluded. You may reload the resources to try again.\n" + e.GetType().Name + " when creating data reader: " + e.Message);
+					General.WriteLogLine(e.StackTrace);
+					continue;
+				}	
+
+				// Add container
+				if(c != null)
+				{
+					containers.Add(c);
+					resourcetextures.Add(c.TextureSet);
+				}
+			}
+			
+			// Load stuff
+			LoadPalette();
+			int texcount = LoadTextures(texturesonly, texturenamesshorttofull);
+			int flatcount = LoadFlats(flatsonly, flatnamesshorttofull);
+			int colormapcount = LoadColormaps(colormapsonly);
+			LoadSprites();
+
+			//mxd. Load MAPINFO. Should happen before parisng DECORATE
+			Dictionary<int, string> spawnnums;
+			Dictionary<int, string> doomednums;
+			LoadMapInfo(out spawnnums, out doomednums);
+
+			int thingcount = LoadDecorateThings(spawnnums, doomednums);
+			int spritecount = LoadThingSprites();
+			LoadInternalSprites();
+			LoadInternalTextures(); //mxd
+
+			//mxd. Load more stuff
+			LoadReverbs();
+			LoadSndSeq();
+			LoadVoxels();
+			Dictionary<string, int> actorsbyclass = CreateActorsByClassList();
+			LoadModeldefs(actorsbyclass);
+			foreach(Thing t in General.Map.Map.Things) t.UpdateCache();
+			General.MainWindow.DisplayReady();
+			
+			// Process colormaps (we just put them in as textures)
+			foreach(KeyValuePair<long, ImageData> t in colormapsonly)
+			{
+				textures.Add(t.Key, t.Value);
+				texturenames.Add(t.Value.Name);
+			}
+			
+			// Process textures
+			foreach(KeyValuePair<long, ImageData> t in texturesonly)
+			{
+				if(!textures.ContainsKey(t.Key))
+				{
+					textures.Add(t.Key, t.Value);
+
+					//mxd. Add both short and long names?
+					if(t.Value.HasLongName) texturenames.Add(t.Value.ShortName);
+					texturenames.Add(t.Value.Name);
+				}
+			}
+
+			// Process flats
+			foreach(KeyValuePair<long, ImageData> f in flatsonly) 
+			{
+				flats.Add(f.Key, f.Value);
+
+				//mxd. Add both short and long names?
+				if(f.Value.HasLongName) flatnames.Add(f.Value.ShortName);
+				flatnames.Add(f.Value.Name);
+			}
+
+			// Mixed textures and flats?
+			if(General.Map.Config.MixTexturesFlats) 
+			{
+				// Add textures to flats
+				foreach(KeyValuePair<long, ImageData> t in texturesonly) 
+				{
+					if(!flats.ContainsKey(t.Key)) 
+					{
+						flats.Add(t.Key, t.Value);
+
+						//mxd. Add both short and long names?
+						if(t.Value.HasLongName) flatnames.Add(t.Value.ShortName);
+						flatnames.Add(t.Value.Name);
+					}
+					else if(t.Value is HighResImage || t.Value is SimpleTextureImage) //mxd. Textures defined in TEXTURES or placed between TX_START and TX_END markers override "regular" flats in ZDoom
+					{
+						//TODO: check this!
+						flats[t.Key] = t.Value;
+					}
+				}
+
+				//mxd
+				foreach(KeyValuePair<long, long> t in texturenamesshorttofull)
+					if(!flatnamesshorttofull.ContainsKey(t.Key)) flatnamesshorttofull.Add(t.Key, t.Value);
+
+				// Add flats to textures
+				foreach(KeyValuePair<long, ImageData> f in flatsonly) 
+				{
+					if(!textures.ContainsKey(f.Key)) 
+					{
+						textures.Add(f.Key, f.Value);
+
+						//mxd. Add both short and long names?
+						if(f.Value.HasLongName) texturenames.Add(f.Value.ShortName);
+						texturenames.Add(f.Value.Name);
+					}
+				}
+
+				//mxd
+				foreach(KeyValuePair<long, long> t in flatnamesshorttofull)
+					if(!texturenamesshorttofull.ContainsKey(t.Key)) texturenamesshorttofull.Add(t.Key, t.Value);
+
+				// Do the same on the data readers
+				foreach(DataReader dr in containers)
+					dr.TextureSet.MixTexturesAndFlats();
+			}
+
+			//mxd. Should be done after loading textures...
+			LoadGldefs(actorsbyclass);
+
+			//mxd. Create camera textures. Should be done after loading textures.
+			LoadAnimdefs();
+			
+			// Sort names
+			texturenames.Sort();
+			flatnames.Sort();
+
+			// Sort things
+			foreach(ThingCategory tc in thingcategories) tc.SortIfNeeded();
+
+			// Update the used textures
+			General.Map.Data.UpdateUsedTextures();
+			
+			// Add texture names to texture sets
+			foreach(KeyValuePair<long, ImageData> img in textures)
+			{
+				// Add to all sets
+				foreach(MatchingTextureSet ms in texturesets)
+					ms.AddTexture(img.Value);
+
+				// Add to all
+				alltextures.AddTexture(img.Value);
+			}
+			
+			// Add flat names to texture sets
+			foreach(KeyValuePair<long, ImageData> img in flats)
+			{
+				// Add to all sets
+				foreach(MatchingTextureSet ms in texturesets)
+					ms.AddFlat(img.Value);
+				
+				// Add to all
+				alltextures.AddFlat(img.Value);
+			}
+			
+			// Start background loading
+			StartBackgroundLoader();
+			
+			// Output info
+			General.WriteLogLine("Loaded " + texcount + " textures, " + flatcount + " flats, " + 
+				colormapcount + " colormaps, " + spritecount + " sprites, " + 
+				thingcount + " decorate things, " + modeldefentries.Count + " model/voxel deinitions, " + 
+				gldefsentries.Count + " dynamic light definitions, " + 
+				glowingflats.Count + " glowing flat definitions, " + reverbs.Count + " sound environment definitions");
+		}
+		
+		// This unloads all data
+		private void Unload()
+		{
+			// Stop background loader
+			StopBackgroundLoader();
+			
+			// Dispose preview manager
+			previews.Dispose();
+			previews = null;
+			
+			// Dispose decorate
+			decorate.Dispose();
+			
+			// Dispose resources
+			foreach(KeyValuePair<long, ImageData> i in textures) i.Value.Dispose();
+			foreach(KeyValuePair<long, ImageData> i in flats) i.Value.Dispose();
+			foreach(KeyValuePair<long, ImageData> i in sprites) i.Value.Dispose();
+			palette = null;
+
+			//mxd. Dispose models
+			foreach(KeyValuePair<int, ModelData> i in modeldefentries) i.Value.Dispose();
+		
+			// Dispose containers
+			foreach(DataReader c in containers) c.Dispose();
+			containers.Clear();
+			
+			// Trash collections
+			decorate = null;
+			containers = null;
+			textures = null;
+			flats = null;
+			sprites = null;
+			modeldefentries = null;//mxd
+			texturenames = null;
+			flatnames = null;
+			imageque = null;
+			internalsprites = null;
+			mapinfo = null; //mxd
+		}
+		
+		#endregion
+		
+		#region ================== Suspend / Resume
+
+		// This suspends data resources
+		internal void Suspend()
+		{
+			// Stop background loader
+			StopBackgroundLoader();
+			
+			// Go for all containers
+			foreach(DataReader d in containers)
+			{
+				// Suspend
+				General.WriteLogLine("Suspended data resource '" + d.Location.location + "'");
+				d.Suspend();
+			}
+		}
+
+		// This resumes data resources
+		internal void Resume()
+		{
+			// Go for all containers
+			foreach(DataReader d in containers)
+			{
+				try
+				{
+					// Resume
+					General.WriteLogLine("Resumed data resource '" + d.Location.location + "'");
+					d.Resume();
+				}
+				catch(Exception e)
+				{
+					// Unable to load resource
+					General.ErrorLogger.Add(ErrorType.Error, "Unable to load resources from location \"" + d.Location.location + "\". Please make sure the location is accessible and not in use by another program. The resources will now be loaded with this location excluded. You may reload the resources to try again.\n" + e.GetType().Name + " when resuming data reader: " + e.Message + ")");
+					General.WriteLogLine(e.StackTrace);
+				}
+			}
+			
+			// Start background loading
+			StartBackgroundLoader();
+		}
+		
+		#endregion
+
+		#region ================== Background Loading
+		
+		// This starts background loading
+		private void StartBackgroundLoader()
+		{
+			// Timing
+			loadstarttime = Clock.CurrentTime;
+			loadfinishtime = 0;
+			
+			// If a loader is already running, stop it first
+			if(backgroundloader != null) StopBackgroundLoader();
+
+			// Start a low priority thread to load images in background
+			General.WriteLogLine("Starting background resource loading...");
+			backgroundloader = new Thread(BackgroundLoad);
+			backgroundloader.Name = "Background Loader";
+			backgroundloader.Priority = ThreadPriority.Lowest;
+			backgroundloader.IsBackground = true;
+			backgroundloader.Start();
+		}
+		
+		// This stops background loading
+		private void StopBackgroundLoader()
+		{
+			General.WriteLogLine("Stopping background resource loading...");
+			if(backgroundloader != null)
+			{
+				// Stop the thread and wait for it to end
+				backgroundloader.Interrupt();
+				backgroundloader.Join();
+
+				// Reset load states on all images in the list
+				while(imageque.Count > 0)
+				{
+					ImageData img = imageque.Dequeue();
+					
+					switch(img.ImageState)
+					{
+						case ImageLoadState.Loading:
+							img.ImageState = ImageLoadState.None;
+							break;
+
+						case ImageLoadState.Unloading:
+							img.ImageState = ImageLoadState.Ready;
+							break;
+					}
+
+					switch(img.PreviewState)
+					{
+						case ImageLoadState.Loading:
+							img.PreviewState = ImageLoadState.None;
+							break;
+
+						case ImageLoadState.Unloading:
+							img.PreviewState = ImageLoadState.Ready;
+							break;
+					}
+				}
+				
+				// Done
+				notifiedbusy = false;
+				backgroundloader = null;
+				General.SendMessage(General.MainWindow.Handle, (int)MainForm.ThreadMessages.UpdateStatus, 0, 0);
+			}
+		}
+		
+		// The background loader
+		private void BackgroundLoad()
+		{
+			try
+			{
+				do
+				{
+					// Do we have to update the used-in-map status?
+					if(updatedusedtextures) BackgroundUpdateUsedTextures();
+					
+					// Get next item
+					ImageData image = null;
+					lock(imageque)
+					{
+						// Fetch next image to process
+						if(imageque.Count > 0) image = imageque.Dequeue();
+					}
+					
+					// Any image to process?
+					if(image != null)
+					{
+						// Load this image?
+						if(image.IsReferenced && (image.ImageState != ImageLoadState.Ready))
+						{
+							image.LoadImage();
+						}
+						// Unload this image?
+						else if(!image.IsReferenced && image.AllowUnload && (image.ImageState != ImageLoadState.None))
+						{
+							// Still unreferenced?
+							image.UnloadImage();
+						}
+					}
+					
+					// Doing something?
+					if(image != null)
+					{
+						// Wait a bit and update icon
+						if(!notifiedbusy)
+						{
+							notifiedbusy = true;
+							General.SendMessage(General.MainWindow.Handle, (int)MainForm.ThreadMessages.UpdateStatus, 0, 0);
+						}
+						Thread.Sleep(0);
+					}
+					else
+					{
+						// Process previews only when we don't have images to process
+						// because these are lower priority than the actual images
+						if(previews.BackgroundLoad())
+						{
+							// Wait a bit and update icon
+							if(!notifiedbusy)
+							{
+								notifiedbusy = true;
+								General.SendMessage(General.MainWindow.Handle, (int)MainForm.ThreadMessages.UpdateStatus, 0, 0);
+							}
+							Thread.Sleep(0);
+						}
+						else
+						{
+							if(notifiedbusy)
+							{
+								notifiedbusy = false;
+								General.SendMessage(General.MainWindow.Handle, (int)MainForm.ThreadMessages.UpdateStatus, 0, 0);
+							}
+							
+							// Timing
+							if(loadfinishtime == 0)
+							{
+								//mxd. Release PK3 files
+								foreach(DataReader reader in containers)
+								{
+									if(reader is PK3Reader) (reader as PK3Reader).BathMode = false;
+								}
+								
+								loadfinishtime = Clock.CurrentTime;
+								float deltatimesec = (loadfinishtime - loadstarttime) / 1000.0f;
+								General.WriteLogLine("Resources loading took " + deltatimesec.ToString("########0.00") + " seconds");
+							}
+							
+							// Wait longer to release CPU resources
+							Thread.Sleep(50);
+						}
+					}
+				}
+				while(true);
+			}
+			catch(ThreadInterruptedException)
+			{
+				return;
+			}
+		}
+		
+		// This adds an image for background loading or unloading
+		internal void ProcessImage(ImageData img)
+		{
+			// Load this image?
+			if((img.ImageState == ImageLoadState.None) && img.IsReferenced)
+			{
+				// Add for loading
+				img.ImageState = ImageLoadState.Loading;
+				lock(imageque) { imageque.Enqueue(img); }
+			}
+			
+			// Unload this image?
+			if((img.ImageState == ImageLoadState.Ready) && !img.IsReferenced && img.AllowUnload)
+			{
+				// Add for unloading
+				img.ImageState = ImageLoadState.Unloading;
+				lock(imageque) { imageque.Enqueue(img); }
+			}
+			
+			// Update icon
+			General.SendMessage(General.MainWindow.Handle, (int)MainForm.ThreadMessages.UpdateStatus, 0, 0);
+		}
+
+		//mxd. This loads a model
+		internal bool ProcessModel(int type) 
+		{
+			if(modeldefentries[type].LoadState != ModelLoadState.None) return true;
+
+			//create models
+			ModelReader.Load(modeldefentries[type], containers, General.Map.Graphics.Device);
+
+			if(modeldefentries[type].Model != null) 
+			{
+				modeldefentries[type].LoadState = ModelLoadState.Ready;
+				return true;
+			}
+
+			modeldefentries.Remove(type);
+			return false;
+		}
+
+		// This updates the used-in-map status on all textures and flats
+		private void BackgroundUpdateUsedTextures()
+		{
+			if(General.Map.Config.MixTexturesFlats)
+			{
+				lock(usedtextures)
+				{
+					// Set used on all textures
+					foreach(KeyValuePair<long, ImageData> i in textures)
+					{
+						i.Value.SetUsedInMap(usedtextures.ContainsKey(i.Key));
+						if(i.Value.IsImageLoaded != i.Value.IsReferenced) ProcessImage(i.Value);
+					}
+
+					// Set used on all flats
+					foreach(KeyValuePair<long, ImageData> i in flats)
+					{
+						i.Value.SetUsedInMap(usedtextures.ContainsKey(i.Key));
+						if(i.Value.IsImageLoaded != i.Value.IsReferenced) ProcessImage(i.Value);
+					}
+
+					// Done
+					updatedusedtextures = false;
+				}
+			}
+			//mxd. Use separate collections
+			else
+			{
+				lock(usedtextures)
+				{
+					// Set used on all textures
+					foreach(KeyValuePair<long, ImageData> i in textures)
+					{
+						i.Value.SetUsedInMap(usedtextures.ContainsKey(i.Key));
+						if(i.Value.IsImageLoaded != i.Value.IsReferenced) ProcessImage(i.Value);
+					}
+				}
+
+				lock(usedflats)
+				{
+					// Set used on all flats
+					foreach(KeyValuePair<long, ImageData> i in flats)
+					{
+						i.Value.SetUsedInMap(usedflats.ContainsKey(i.Key));
+						if(i.Value.IsImageLoaded != i.Value.IsReferenced) ProcessImage(i.Value);
+					}
+				}
+				
+				// Done
+				updatedusedtextures = false;
+			}
+		}
+		
+		#endregion
+		
+		#region ================== Palette
+
+		// This loads the PLAYPAL palette
+		private void LoadPalette()
+		{
+			// Go for all opened containers
+			for(int i = containers.Count - 1; i >= 0; i--)
+			{
+				// Load palette
+				palette = containers[i].LoadPalette();
+				if(palette != null) break;
+			}
+
+			// Make empty palette when still no palette found
+			if(palette == null)
+			{
+				General.ErrorLogger.Add(ErrorType.Warning, "None of the loaded resources define a color palette. Did you forget to configure an IWAD for this game configuration?");
+				palette = new Playpal();
+			}
+		}
+
+		#endregion
+
+		#region ================== Colormaps
+
+		// This loads the colormaps
+		private int LoadColormaps(Dictionary<long, ImageData> list)
+		{
+			int counter = 0;
+
+			// Go for all opened containers
+			foreach(DataReader dr in containers)
+			{
+				// Load colormaps
+				ICollection<ImageData> images = dr.LoadColormaps();
+				if(images != null)
+				{
+					// Go for all colormaps
+					foreach(ImageData img in images)
+					{
+						// Add or replace in flats list
+						list.Remove(img.LongName);
+						list.Add(img.LongName, img);
+						counter++;
+
+						// Add to preview manager
+						previews.AddImage(img);
+					}
+				}
+			}
+
+			// Output info
+			return counter;
+		}
+
+		// This returns a specific colormap stream
+		internal Stream GetColormapData(string pname)
+		{
+			// Go for all opened containers
+			for(int i = containers.Count - 1; i >= 0; i--)
+			{
+				// This contain provides this flat?
+				Stream colormap = containers[i].GetColormapData(pname);
+				if(colormap != null) return colormap;
+			}
+
+			// No such patch found
+			return null;
+		}
+
+		#endregion
+
+		#region ================== Textures
+
+		// This loads the textures
+		private int LoadTextures(Dictionary<long, ImageData> list, Dictionary<long, long> nametranslation)
+		{
+			PatchNames pnames = new PatchNames();
+			int counter = 0;
+
+			// Go for all opened containers
+			foreach(DataReader dr in containers)
+			{
+				// Load PNAMES info
+				// Note that pnames is NOT set to null in the loop
+				// because if a container has no pnames, the pnames
+				// of the previous (higher) container should be used.
+				PatchNames newpnames = dr.LoadPatchNames();
+				if(newpnames != null) pnames = newpnames;
+
+				// Load textures
+				ICollection<ImageData> images = dr.LoadTextures(pnames);
+				if(images != null)
+				{
+					// Go for all textures
+					foreach(ImageData img in images)
+					{
+						// Add or replace in textures list
+						list.Remove(img.LongName);
+						list.Add(img.LongName, img);
+						counter++;
+
+						//mxd. Also add as short name when texture name is longer than 8 chars
+						// Or remove when a wad image with short name overrides previously added 
+						// resource image with long name
+						if(img.HasLongName) 
+						{
+							long longshortname = Lump.MakeLongName(Path.GetFileNameWithoutExtension(img.Name), false);
+							nametranslation.Remove(longshortname);
+							nametranslation.Add(longshortname, img.LongName);
+						} 
+						else if(img is TextureImage && nametranslation.ContainsKey(img.LongName))
+						{
+							nametranslation.Remove(img.LongName);
+						}
+						
+						// Add to preview manager
+						previews.AddImage(img);
+					}
+				}
+			}
+			
+			// Output info
+			return counter;
+		}
+		
+		// This returns a specific patch stream
+		internal Stream GetPatchData(string pname, bool longname)
+		{
+			// Go for all opened containers
+			for(int i = containers.Count - 1; i > -1; i--)
+			{
+				// This contain provides this patch?
+				Stream patch = containers[i].GetPatchData(pname, longname);
+				if(patch != null) return patch;
+			}
+
+			// No such patch found
+			return null;
+		}
+
+		// This returns a specific texture stream
+		internal Stream GetTextureData(string pname, bool longname)
+		{
+			// Go for all opened containers
+			for(int i = containers.Count - 1; i >= 0; i--)
+			{
+				// This contain provides this patch?
+				Stream patch = containers[i].GetTextureData(pname, longname);
+				if(patch != null) return patch;
+			}
+
+			// No such patch found
+			return null;
+		}
+		
+		// This checks if a given texture is known
+		public bool GetTextureExists(string name)
+		{
+			return GetTextureExists(Lump.MakeLongName(name)); //mxd
+		}
+		
+		// This checks if a given texture is known
+		public bool GetTextureExists(long longname)
+		{
+			return textures.ContainsKey(longname) || texturenamesshorttofull.ContainsKey(longname);
+		}
+		
+		// This returns an image by string
+		public ImageData GetTextureImage(string name)
+		{
+			// Get the long name
+			long longname = Lump.MakeLongName(name);
+			return GetTextureImage(longname);
+		}
+		
+		// This returns an image by long
+		public ImageData GetTextureImage(long longname)
+		{
+			// Does this texture exist?
+			if(textures.ContainsKey(longname) && textures[longname] is HighResImage) return textures[longname]; //TEXTURES textures should still override regular ones...
+			if(texturenamesshorttofull.ContainsKey(longname)) return textures[texturenamesshorttofull[longname]]; //mxd
+			if(textures.ContainsKey(longname)) return textures[longname];
+
+			// Return null image
+			return unknownimage; //mxd
+		}
+
+		//mxd
+		public string GetFullTextureName(string name)
+		{
+			if(Path.GetFileNameWithoutExtension(name) == name && name.Length > CLASIC_IMAGE_NAME_LENGTH) 
+				name = name.Substring(0, CLASIC_IMAGE_NAME_LENGTH);
+			long hash = MurmurHash2.Hash(name.Trim().ToUpperInvariant());
+
+			if(textures.ContainsKey(hash) && textures[hash] is HighResImage) return textures[hash].Name; //TEXTURES textures should still override regular ones...
+			if(texturenamesshorttofull.ContainsKey(hash)) return textures[texturenamesshorttofull[hash]].Name;
+			if(textures.ContainsKey(hash)) return textures[hash].Name;
+			return name;
+		}
+
+		//mxd
+		internal long GetFullLongTextureName(long hash)
+		{
+			if(textures.ContainsKey(hash) && textures[hash] is HighResImage) return hash; //TEXTURES textures should still override regular ones...
+			return (General.Map.Config.UseLongTextureNames && texturenamesshorttofull.ContainsKey(hash) ? texturenamesshorttofull[hash] : hash);
+		}
+
+		//mxd
+		private void LoadInternalTextures()
+		{
+			missingtexture3d = LoadInternalTexture("MissingTexture3D.png"); //mxd
+			unknowntexture3d = LoadInternalTexture("UnknownTexture3D.png"); //mxd
+			hourglass3d = LoadInternalTexture("Hourglass3D.png"); //mxd
+			crosshair = LoadInternalTexture("Crosshair.png"); //mxd
+			crosshairbusy = LoadInternalTexture("CrosshairBusy.png"); //mxd
+		}
+
+		//mxd
+		private static ImageData LoadInternalTexture(string name)
+		{
+			ImageData result;
+			string path = Path.Combine(General.TexturesPath, name);
+			if(File.Exists(path))
+			{
+				result = new FileImage(name, path) { AllowUnload = false };
+			}
+			else
+			{
+				General.ErrorLogger.Add(ErrorType.Warning, "Unable to load editor texture '" + name + "'. Using built-in one instead.");
+				result = new ResourceImage("CodeImp.DoomBuilder.Resources." + name);
+			}
+
+			result.LoadImage();
+			return result;
+		}
+		
+		#endregion
+
+		#region ================== Flats
+
+		// This loads the flats
+		private int LoadFlats(Dictionary<long, ImageData> list, Dictionary<long, long> nametranslation)
+		{
+			int counter = 0;
+			
+			// Go for all opened containers
+			foreach(DataReader dr in containers)
+			{
+				// Load flats
+				ICollection<ImageData> images = dr.LoadFlats();
+				if(images != null)
+				{
+					// Go for all flats
+					foreach(ImageData img in images)
+					{
+						// Add or replace in flats list
+						list.Remove(img.LongName);
+						list.Add(img.LongName, img);
+						counter++;
+
+						//mxd. Also add as short name when texture name is longer than 8 chars
+						// Or remove when a wad image with short name overrides previously added 
+						// resource image with long name
+						if(img.HasLongName)
+						{
+							long longshortname = Lump.MakeLongName(Path.GetFileNameWithoutExtension(img.Name), false);
+							nametranslation.Remove(longshortname);
+							nametranslation.Add(longshortname, img.LongName);
+						} 
+						else if(img is FlatImage && nametranslation.ContainsKey(img.LongName)) 
+						{
+							nametranslation.Remove(img.LongName);
+						}
+
+						// Add to preview manager
+						previews.AddImage(img);
+					}
+				}
+			}
+
+			// Output info
+			return counter;
+		}
+
+		// This returns a specific flat stream
+		internal Stream GetFlatData(string pname, bool longname)
+		{
+			// Go for all opened containers
+			for(int i = containers.Count - 1; i >= 0; i--)
+			{
+				// This contain provides this flat?
+				Stream flat = containers[i].GetFlatData(pname, longname);
+				if(flat != null) return flat;
+			}
+
+			// No such patch found
+			return null;
+		}
+
+		// This checks if a flat is known
+		public bool GetFlatExists(string name)
+		{
+			return GetFlatExists(Lump.MakeLongName(name)); //mxd
+		}
+
+		// This checks if a flat is known
+		public bool GetFlatExists(long longname)
+		{
+			return flats.ContainsKey(longname) || flatnamesshorttofull.ContainsKey(longname);
+		}
+		
+		// This returns an image by string
+		public ImageData GetFlatImage(string name)
+		{
+			// Get the long name
+			long longname = Lump.MakeLongName(name);
+			return GetFlatImage(longname);
+		}
+
+		// This returns an image by long
+		public ImageData GetFlatImage(long longname)
+		{
+			// Does this flat exist?
+			if(flats.ContainsKey(longname) && flats[longname] is HighResImage) return flats[longname]; //TEXTURES flats should still override regular ones...
+			if(flatnamesshorttofull.ContainsKey(longname)) return flats[flatnamesshorttofull[longname]]; //mxd
+			if(flats.ContainsKey(longname)) return flats[longname];
+			
+			// Return null image
+			return unknownimage; //mxd
+		}
+
+		// This returns an image by long and doesn't check if it exists
+		/*public ImageData GetFlatImageKnown(long longname)
+		{
+			// Return flat
+			return flatnamesshorttofull.ContainsKey(longname) ? flats[flatnamesshorttofull[longname]] : flats[longname]; //mxd
+		}*/
+
+		//mxd. Gets full flat name by short flat name
+		public string GetFullFlatName(string name)
+		{
+			if(Path.GetFileNameWithoutExtension(name) == name && name.Length > CLASIC_IMAGE_NAME_LENGTH)
+				name = name.Substring(0, CLASIC_IMAGE_NAME_LENGTH);
+			long hash = MurmurHash2.Hash(name.ToUpperInvariant());
+
+			if(flats.ContainsKey(hash) && flats[hash] is HighResImage) return flats[hash].Name; //TEXTURES flats should still override regular ones...
+			if(flatnamesshorttofull.ContainsKey(hash)) return flats[flatnamesshorttofull[hash]].Name;
+			if(flats.ContainsKey(hash)) return flats[hash].Name;
+			return name;
+		}
+
+		//mxd
+		internal long GetFullLongFlatName(long hash)
+		{
+			if(flats.ContainsKey(hash) && flats[hash] is HighResImage) return hash; //TEXTURES flats should still override regular ones...
+			return (General.Map.Config.UseLongTextureNames && flatnamesshorttofull.ContainsKey(hash) ? flatnamesshorttofull[hash] : hash);
+		}
+		
+		#endregion
+
+		#region ================== Sprites
+
+		// This loads the hard defined sprites (not all the lumps, we do that on a need-to-know basis, see LoadThingSprites)
+		private int LoadSprites()
+		{
+			int counter = 0;
+			
+			// Load all defined sprites. Note that we do not use all sprites,
+			// so we don't add them for previews just yet.
+			foreach(DataReader dr in containers)
+			{
+				// Load sprites
+				ICollection<ImageData> images = dr.LoadSprites();
+				if(images != null)
+				{
+					// Add or replace in sprites list
+					foreach(ImageData img in images)
+					{
+						sprites[img.LongName] = img;
+						counter++;
+					}
+				}
+			}
+			
+			// Output info
+			return counter;
+		}
+		
+		// This loads the sprites that we really need for things
+		private int LoadThingSprites()
+		{
+			// Go for all things
+			foreach(ThingTypeInfo ti in General.Map.Data.ThingTypes)
+			{
+				// Valid sprite name?
+				if(ti.Sprite.Length == 0 || ti.Sprite.Length > CLASIC_IMAGE_NAME_LENGTH) continue; //mxd
+					
+				ImageData image = null;
+
+				// Sprite not in our collection yet?
+				if(!sprites.ContainsKey(ti.SpriteLongName)) 
+				{
+					// Find sprite data
+					Stream spritedata = GetSpriteData(ti.Sprite);
+					if(spritedata != null) 
+					{
+						// Make new sprite image
+						image = new SpriteImage(ti.Sprite);
+
+						// Add to collection
+						sprites.Add(ti.SpriteLongName, image);
+					} 
+					else //mxd
+					{
+						General.ErrorLogger.Add(ErrorType.Error, "Missing sprite lump '" + ti.Sprite + "'. Forgot to include required resources?");
+					}
+				} 
+				else 
+				{
+					image = sprites[ti.SpriteLongName];
+				}
+
+				// Add to preview manager
+				if(image != null) previews.AddImage(image);
+			}
+			
+			// Output info
+			return sprites.Count;
+		}
+		
+		// This returns a specific patch stream
+		internal Stream GetSpriteData(string pname)
+		{
+			if(!string.IsNullOrEmpty(pname))
+			{
+				// Go for all opened containers
+				for(int i = containers.Count - 1; i >= 0; i--)
+				{
+					// This contain provides this patch?
+					Stream spritedata = containers[i].GetSpriteData(pname);
+					if(spritedata != null) return spritedata;
+				}
+			}
+			
+			// No such patch found
+			return null;
+		}
+
+		// This tests if a given sprite can be found
+		internal bool GetSpriteExists(string pname)
+		{
+			if(!string.IsNullOrEmpty(pname))
+			{
+				long longname = Lump.MakeLongName(pname);
+				if(sprites.ContainsKey(longname)) return true;
+				
+				// Go for all opened containers
+				for(int i = containers.Count - 1; i >= 0; i--)
+				{
+					// This contain provides this patch?
+					if(containers[i].GetSpriteExists(pname)) return true;
+				}
+			}
+			
+			// No such patch found
+			return false;
+		}
+		
+		// This loads the internal sprites
+		private void LoadInternalSprites()
+		{
+			// Add sprite icon files from directory
+			string[] files = Directory.GetFiles(General.SpritesPath, "*.png", SearchOption.TopDirectoryOnly);
+			foreach(string spritefile in files)
+			{
+				ImageData img = new FileImage(Path.GetFileNameWithoutExtension(spritefile).ToLowerInvariant(), spritefile);
+				img.LoadImage();
+				img.AllowUnload = false;
+				internalsprites.Add(img.Name, img);
+			}
+			
+			// Add some internal resources
+			if(!internalsprites.ContainsKey("nothing"))
+			{
+				ImageData img = new ResourceImage("CodeImp.DoomBuilder.Resources.Nothing.png");
+				img.LoadImage();
+				img.AllowUnload = false;
+				internalsprites.Add("nothing", img);
+			}
+			
+			if(!internalsprites.ContainsKey("unknownthing"))
+			{
+				ImageData img = new ResourceImage("CodeImp.DoomBuilder.Resources.UnknownThing.png");
+				img.LoadImage();
+				img.AllowUnload = false;
+				internalsprites.Add("unknownthing", img);
+			}
+
+			//mxd
+			if(!internalsprites.ContainsKey("missingthing")) 
+			{
+				ImageData img = new ResourceImage("CodeImp.DoomBuilder.Resources.MissingThing.png");
+				img.LoadImage();
+				img.AllowUnload = false;
+				internalsprites.Add("missingthing", img);
+			}
+		}
+		
+		// This returns an image by name
+		public ImageData GetSpriteImage(string name)
+		{
+			// Is this referring to an internal sprite image?
+			if((name.Length > INTERNAL_PREFIX.Length) && name.ToLowerInvariant().StartsWith(INTERNAL_PREFIX))
+			{
+				// Get the internal sprite
+				string internalname = name.Substring(INTERNAL_PREFIX.Length).ToLowerInvariant();
+				if(internalsprites.ContainsKey(internalname))
+					return internalsprites[internalname];
+
+				return internalsprites["unknownthing"]; //mxd
+			}
+			else
+			{
+				// Get the long name
+				long longname = Lump.MakeLongName(name);
+
+				// Sprite already loaded?
+				if(sprites.ContainsKey(longname))
+				{
+					// Return exiting sprite
+					return sprites[longname];
+				}
+				else
+				{
+					Stream spritedata = null;
+					
+					// Go for all opened containers
+					for(int i = containers.Count - 1; i >= 0; i--)
+					{
+						// This container provides this sprite?
+						spritedata = containers[i].GetSpriteData(name);
+						if(spritedata != null) break;
+					}
+					
+					// Found anything?
+					if(spritedata != null)
+					{
+						// Make new sprite image
+						SpriteImage image = new SpriteImage(name);
+
+						// Add to collection
+						sprites.Add(longname, image);
+
+						// Return result
+						return image;
+					}
+					else //mxd
+					{
+						ImageData img = string.IsNullOrEmpty(name) ? internalsprites["unknownthing"] : internalsprites["missingthing"];
+						
+						// Add to collection
+						sprites.Add(longname, img);
+					
+						// Return image
+						return img; 
+					}
+				}
+			}
+		}
+		
+		#endregion
+
+		#region ================== Things
+		
+		// This loads the things from Decorate
+		private int LoadDecorateThings(Dictionary<int, string> spawnnumsoverride, Dictionary<int, string> doomednumsoverride)
+		{
+			int counter = 0;
+			char[] catsplitter = new[] {Path.AltDirectorySeparatorChar}; //mxd
+			
+			// Create new parser
+			decorate = new DecorateParser { OnInclude = LoadDecorateFromLocation };
+
+			// Only load these when the game configuration supports the use of decorate
+			if(!string.IsNullOrEmpty(General.Map.Config.DecorateGames))
+			{
+				// Go for all opened containers
+				foreach(DataReader dr in containers)
+				{
+					// Load Decorate info cumulatively (the last Decorate is added to the previous)
+					// I'm not sure if this is the right thing to do though.
+					currentreader = dr;
+					Dictionary<string, Stream> decostreams = dr.GetDecorateData("DECORATE");
+					foreach(KeyValuePair<string, Stream> group in decostreams)
+					{
+						// Parse the data
+						group.Value.Seek(0, SeekOrigin.Begin);
+						decorate.Parse(group.Value, group.Key, true);
+						
+						//mxd. DECORATE lumps are interdepandable. Can't carry on...
+						if(decorate.HasError)
+						{
+							decorate.LogError(); //mxd
+							return counter;
+						}
+					}
+				}
+				
+				currentreader = null;
+				
+				if(!decorate.HasError)
+				{
+					// Step 1. Go for all actors in the decorate to make things or update things
+					foreach(ActorStructure actor in decorate.Actors)
+					{
+						// Check if we want to add this actor
+						if(actor.DoomEdNum > 0)
+						{
+							string catname = ZDTextParser.StripQuotes(actor.GetPropertyAllValues("$category"));
+							string[] catnames; //mxd
+							if(string.IsNullOrEmpty(catname.Trim()))
+								catnames = new[] { "decorate" };
+							else
+								catnames = catname.Split(catsplitter, StringSplitOptions.RemoveEmptyEntries); //mxd
+							
+							// Check if we can find this thing in our existing collection
+							if(thingtypes.ContainsKey(actor.DoomEdNum))
+							{
+								// Update the thing
+								thingtypes[actor.DoomEdNum].ModifyByDecorateActor(actor);
+							}
+							else
+							{
+								// Find the category to put the actor in
+								ThingCategory cat = GetThingCategory(null, thingcategories, catnames); //mxd
+								
+								// Add new thing
+								ThingTypeInfo t = new ThingTypeInfo(cat, actor);
+								cat.AddThing(t);
+								thingtypes.Add(t.Index, t);
+							}
+							
+							// Count
+							counter++;
+						}
+					}
+
+					//mxd. Step 2. Apply DoomEdNum MAPINFO overrides, remove actors disabled in MAPINFO
+					if(doomednumsoverride.Count > 0) 
+					{
+						List<int> toremove = new List<int>();
+						Dictionary<string, ThingTypeInfo> thingtypesbyclass = new Dictionary<string, ThingTypeInfo>();
+						foreach(KeyValuePair<int, ThingTypeInfo> group in thingtypes)
+						{
+							if(string.IsNullOrEmpty(group.Value.ClassName)) continue;
+							thingtypesbyclass[group.Value.ClassName.ToLowerInvariant()] = group.Value;
+						}
+
+						foreach(KeyValuePair<int, string> group in doomednumsoverride) 
+						{
+							// Remove thing from the list?
+							if(group.Value == "none") 
+							{
+								toremove.Add(group.Key);
+								continue;
+							}
+
+							// Skip if already added.
+							if(thingtypes.ContainsKey(group.Key) && thingtypes[group.Key].ClassName.ToLowerInvariant() == group.Value) 
+							{
+								continue;
+							}
+
+							// Try to find the actor...
+							ActorStructure actor = null;
+
+							//... in ActorsByClass
+							if(decorate.ActorsByClass.ContainsKey(group.Value))
+							{
+								actor = decorate.ActorsByClass[group.Value];
+							}
+							// Try finding in ArchivedActors
+							else if(decorate.AllActorsByClass.ContainsKey(group.Value))
+							{
+								actor = decorate.AllActorsByClass[group.Value];
+							}
+
+							if(actor != null)
+							{
+								// Find the category to put the actor in
+								string catname = ZDTextParser.StripQuotes(actor.GetPropertyAllValues("$category"));
+								string[] catnames; //mxd
+								if(string.IsNullOrEmpty(catname.Trim()))
+									catnames = new[] { "decorate" };
+								else
+									catnames = catname.Split(catsplitter, StringSplitOptions.RemoveEmptyEntries); //mxd
+
+								ThingCategory cat = GetThingCategory(null, thingcategories, catnames); //mxd
+
+								// Add a new ThingTypeInfo, replacing already existing one if necessary
+								ThingTypeInfo info = new ThingTypeInfo(cat, actor, group.Key);
+								thingtypes[group.Key] = info;
+								cat.AddThing(info);
+							}
+							// Check thingtypes...
+							else if(thingtypesbyclass.ContainsKey(group.Value))
+							{
+								ThingTypeInfo t = new ThingTypeInfo(group.Key, thingtypesbyclass[group.Value]);
+
+								// Add new thing, replacing already existing one if necessary
+								t.Category.AddThing(t);
+								thingtypes[group.Key] = t;
+							}
+							// Loudly give up...
+							else
+							{
+								General.ErrorLogger.Add(ErrorType.Warning, "Failed to apply MAPINFO DoomEdNum override '" + group.Key + " = " + group.Value + ": failed to find corresponding actor class...");
+							}
+						}
+
+						// Remove items
+						foreach(int id in toremove) 
+						{
+							if(thingtypes.ContainsKey(id))
+							{
+								thingtypes[id].Category.RemoveThing(thingtypes[id]);
+								thingtypes.Remove(id);
+							}
+						}
+					}
+
+					//mxd. Step 3. Gather DECORATE SpawnIDs
+					Dictionary<int, EnumItem> configspawnnums = new Dictionary<int, EnumItem>();
+
+					// Update or create the main enums list
+					if(General.Map.Config.Enums.ContainsKey("spawnthing")) 
+					{
+						foreach(EnumItem item in General.Map.Config.Enums["spawnthing"])
+							configspawnnums.Add(item.GetIntValue(), item);
+					}
+
+					bool spawnidschanged = false;
+					if(!decorate.HasError)
+					{
+						foreach(ActorStructure actor in decorate.Actors)
+						{
+							int spawnid = actor.GetPropertyValueInt("spawnid", 0);
+							if(spawnid != 0)
+							{
+								configspawnnums[spawnid] = new EnumItem(spawnid.ToString(), (actor.HasPropertyWithValue("$title") ? actor.GetPropertyAllValues("$title") : actor.ClassName));
+								spawnidschanged = true;
+							}
+						}
+					}
+
+					//mxd. Step 4. Update SpawnNums using MAPINFO overrides
+					if(spawnnumsoverride.Count > 0)
+					{
+						// Modify by MAPINFO data
+						foreach(KeyValuePair<int, string> group in spawnnumsoverride) 
+						{
+							configspawnnums[group.Key] = new EnumItem(group.Key.ToString(), (thingtypes.ContainsKey(group.Key) ? thingtypes[group.Key].Title : group.Value));
+						}
+
+						spawnidschanged = true;
+					}
+
+					if(spawnidschanged)
+					{
+						// Update the main collection
+						EnumList newenums = new EnumList();
+						newenums.AddRange(configspawnnums.Values);
+						newenums.Sort();
+						General.Map.Config.Enums["spawnthing"] = newenums;
+
+						// Update all ArgumentInfos...
+						foreach(ThingTypeInfo info in thingtypes.Values)
+						{
+							foreach(ArgumentInfo ai in info.Args) 
+								if(ai.Enum.Name == "spawnthing") ai.Enum = newenums;
+						}
+
+						foreach(LinedefActionInfo info in General.Map.Config.LinedefActions.Values)
+						{
+							foreach(ArgumentInfo ai in info.Args)
+								if(ai.Enum.Name == "spawnthing") ai.Enum = newenums;
+						}
+					}
+				}
+			}
+			
+			// Output info
+			return counter;
+		}
+
+		//mxd
+		private static ThingCategory GetThingCategory(ThingCategory parent, List<ThingCategory> categories, string[] catnames) 
+		{
+			// Find the category to put the actor in
+			ThingCategory cat = null;
+			string catname = catnames[0].ToLowerInvariant().Trim();
+			if(string.IsNullOrEmpty(catname)) catname = "decorate";
+
+			// First search by Title...
+			foreach(ThingCategory c in categories) 
+			{
+				if(c.Title.ToLowerInvariant() == catname) cat = c;
+			}
+
+			// Make full name
+			if(parent != null) catname = parent.Name.ToLowerInvariant() + "." + catname;
+
+			//...then - by Name
+			if(cat == null) 
+			{
+				foreach(ThingCategory c in categories) 
+				{
+					if(c.Name.ToLowerInvariant() == catname) cat = c;
+				}
+			}
+
+			// Make the category if needed
+			if(cat == null)
+			{
+				string cattitle = catnames[0].Trim();
+				if(string.IsNullOrEmpty(cattitle)) cattitle = "Decorate";
+				cat = new ThingCategory(parent, catname, cattitle);
+				categories.Add(cat); // ^.^
+			}
+
+			// Still have subcategories?
+			if(catnames.Length > 1)
+			{
+				string[] remainingnames = new string[catnames.Length - 1];
+				Array.Copy(catnames, 1, remainingnames, 0, remainingnames.Length);
+				return GetThingCategory(cat, cat.Children, remainingnames);
+			}
+
+			return cat;
+		}
+		
+		// This loads Decorate data from a specific file or lump name
+		private void LoadDecorateFromLocation(DecorateParser parser, string location)
+		{
+			//General.WriteLogLine("Including DECORATE resource '" + location + "'...");
+			Dictionary<string, Stream> decostreams = currentreader.GetDecorateData(location);
+			foreach(KeyValuePair<string, Stream> group in decostreams)
+			{
+				// Parse this data
+				parser.Parse(group.Value, Path.Combine(currentreader.Location.location, group.Key), false);
+
+				//mxd. DECORATE lumps are interdepandable. Can't carry on...
+				if(parser.HasError)
+				{
+					decorate.LogError();
+					return;
+				}
+			}
+		}
+		
+		// This gets thing information by index
+		public ThingTypeInfo GetThingInfo(int thingtype)
+		{
+			// Index in config?
+			if(thingtypes.ContainsKey(thingtype))
+			{
+				// Return from config
+				return thingtypes[thingtype];
+			}
+
+			// Create unknown thing info
+			return new ThingTypeInfo(thingtype);
+		}
+
+		// This gets thing information by index
+		// Returns null when thing type info could not be found
+		public ThingTypeInfo GetThingInfoEx(int thingtype)
+		{
+			// Index in config?
+			if(thingtypes.ContainsKey(thingtype))
+			{
+				// Return from config
+				return thingtypes[thingtype];
+			}
+
+			// No such thing type known
+			return null;
+		}
+		
+		#endregion
+
+		#region ================== mxd. Modeldef, Voxeldef, Gldefs, Mapinfo
+
+		//mxd. This creates <Actor Class, Thing.Type> dictionary. Should be called after all DECORATE actors are parsed
+		private Dictionary<string, int> CreateActorsByClassList() 
+		{
+			Dictionary<string, int> actors = new Dictionary<string, int>(StringComparer.Ordinal);
+			if(string.IsNullOrEmpty(General.Map.Config.DecorateGames)) return actors;
+
+			//read our new shiny ClassNames for default game things
+			foreach(KeyValuePair<int, ThingTypeInfo> ti in thingtypes) 
+			{
+				if(!string.IsNullOrEmpty(ti.Value.ClassName))
+				{
+					string classname = ti.Value.ClassName.ToLowerInvariant();
+
+					if(actors.ContainsKey(classname) && actors[classname] != ti.Key)
+						General.ErrorLogger.Add(ErrorType.Warning, "actor '" + ti.Value.ClassName + "' has several editor numbers! Only the last one (" + ti.Key + ") will be used.");
+					actors[classname] = ti.Key;
+				}
+			}
+
+			if(actors.Count == 0) 
+				General.ErrorLogger.Add(ErrorType.Warning, "unable to find any DECORATE actor definitions!");
+
+			return actors;
+		}
+
+		//mxd
+		public void ReloadModeldef() 
+		{
+			if(modeldefentries != null) 
+			{
+				foreach(KeyValuePair<int, ModelData> group in modeldefentries)
+					group.Value.Dispose();
+			}
+
+			// Bail out when not supported by current game configuration
+			if(string.IsNullOrEmpty(General.Map.Config.DecorateGames)) return;
+
+			General.MainWindow.DisplayStatus(StatusType.Busy, "Reloading model definitions...");
+			LoadModeldefs(CreateActorsByClassList());
+
+			General.MainWindow.DisplayStatus(StatusType.Busy, "Reloading voxel definitions...");
+			LoadVoxels();
+
+			foreach(Thing t in General.Map.Map.Things) t.UpdateCache();
+
+			//rebuild geometry if in Visual mode
+			if(General.Editing.Mode != null && General.Editing.Mode.GetType().Name == "BaseVisualMode") 
+			{
+				General.Editing.Mode.OnReloadResources();
+			}
+
+			General.MainWindow.DisplayReady();
+		}
+
+		//mxd
+		public void ReloadGldefs() 
+		{
+			// Bail out when not supported by current game configuration
+			if(string.IsNullOrEmpty(General.Map.Config.DecorateGames)) return;
+			
+			General.MainWindow.DisplayStatus(StatusType.Busy, "Reloading GLDEFS...");
+
+			try 
+			{
+				LoadGldefs(CreateActorsByClassList());
+			} 
+			catch(ArgumentNullException) 
+			{
+				MessageBox.Show("GLDEFS reload failed. Try using 'Reload Resources' instead.\nCheck 'Errors and Warnings' window for more details.");
+				General.MainWindow.DisplayReady();
+				return;
+			}
+
+			//rebuild geometry if in Visual mode
+			if(General.Editing.Mode != null && General.Editing.Mode.GetType().Name == "BaseVisualMode") 
+			{
+				General.Editing.Mode.OnReloadResources();
+			}
+
+			General.MainWindow.DisplayReady();
+		}
+
+		//mxd. This parses modeldefs. Should be called after all DECORATE actors are parsed and actorsByClass dictionary created
+		private void LoadModeldefs(Dictionary<string, int> actorsbyclass) 
+		{
+			//if no actors defined in DECORATE or game config...
+			if(actorsbyclass.Count == 0) return;
+
+			Dictionary<string, ModelData> modeldefentriesbyname = new Dictionary<string, ModelData>(StringComparer.Ordinal);
+			ModeldefParser parser = new ModeldefParser(actorsbyclass);
+
+			foreach(DataReader dr in containers) 
+			{
+				currentreader = dr;
+
+				Dictionary<string, Stream> streams = dr.GetModeldefData();
+				foreach(KeyValuePair<string, Stream> group in streams) 
+				{
+					// Parse the data
+					if(parser.Parse(group.Value, currentreader.Location.location + "\\" + group.Key, true)) 
+					{
+						foreach(KeyValuePair<string, ModelData> g in parser.Entries) 
+						{
+							if(modeldefentriesbyname.ContainsKey(g.Key)) 
+								General.ErrorLogger.Add(ErrorType.Warning, "Model definition for actor '" + g.Key + "' is double-defined in '" + group.Key + "'");
+							
+							modeldefentriesbyname[g.Key] = g.Value;
+						}
+					}
+
+					// Modeldefs are independable, so parsing fail in one file should not affect the others
+					if(parser.HasError) parser.LogError();
+				}
+			}
+
+			currentreader = null;
+
+			foreach(KeyValuePair<string, ModelData> e in modeldefentriesbyname) 
+			{
+				if(actorsbyclass.ContainsKey(e.Key))
+					modeldefentries[actorsbyclass[e.Key]] = modeldefentriesbyname[e.Key];
+				else if(!decorate.ActorsByClass.ContainsKey(e.Key))
+					General.ErrorLogger.Add(ErrorType.Warning, "Got MODELDEF override for class '" + e.Key + "', but haven't found such class in Decorate");
+			}
+		}
+
+		//mxd
+		private void LoadVoxels() 
+		{
+			// Bail out when not supported by current game configuration
+			if(string.IsNullOrEmpty(General.Map.Config.DecorateGames)) return;
+			
+			//Get names of all voxel models, which can be used "as is"
+			Dictionary<string, bool> voxelNames = new Dictionary<string, bool>(StringComparer.Ordinal);
+			
+			foreach(DataReader dr in containers) 
+			{
+				currentreader = dr;
+
+				IEnumerable<string> result = dr.GetVoxelNames();
+				if(result == null) continue;
+
+				foreach(string s in result) 
+				{
+					if(!voxelNames.ContainsKey(s)) voxelNames.Add(s, false);
+				}
+			}
+
+			Dictionary<string, List<int>> sprites = new Dictionary<string, List<int>>(StringComparer.Ordinal);
+
+			// Go for all things
+			foreach(ThingTypeInfo ti in thingtypes.Values) 
+			{
+				// Valid sprite name?
+				string sprite;
+
+				if(ti.Sprite.Length == 0 || ti.Sprite.Length > CLASIC_IMAGE_NAME_LENGTH) 
+				{
+					if(ti.Actor == null) continue;
+					sprite = ti.Actor.FindSuitableVoxel(voxelNames);
+				} 
+				else 
+				{
+					sprite = ti.Sprite;
+				}
+
+				if(string.IsNullOrEmpty(sprite)) continue;
+				if(!sprites.ContainsKey(sprite)) sprites.Add(sprite, new List<int>());
+				sprites[sprite].Add(ti.Index);
+			}
+
+			VoxeldefParser parser = new VoxeldefParser();
+			Dictionary<string, bool> processed = new Dictionary<string, bool>(StringComparer.Ordinal);
+
+			//parse VOXLEDEF
+			foreach(DataReader dr in containers) 
+			{
+				currentreader = dr;
+
+				KeyValuePair<string, Stream> group = dr.GetVoxeldefData();
+				if(group.Value != null) 
+				{
+					if(parser.Parse(group.Value, group.Key, true))
+					{
+						foreach(KeyValuePair<string, ModelData> entry in parser.Entries)
+						{
+							foreach(KeyValuePair<string, List<int>> sc in sprites)
+							{
+								if(sc.Key.Contains(entry.Key))
+								{
+									foreach(int id in sc.Value) modeldefentries[id] = entry.Value;
+									processed.Add(entry.Key, false);
+								}
+							}
+						}
+					}
+
+					// Report errors?
+					if(parser.HasError) parser.LogError();
+				}
+			}
+
+			currentreader = null;
+
+			//get voxel models
+			foreach(KeyValuePair<string, bool> group in voxelNames) 
+			{
+				if(processed.ContainsKey(group.Key)) continue;
+				foreach(KeyValuePair<string, List<int>> sc in sprites) 
+				{
+					if(sc.Key.Contains(group.Key)) 
+					{
+						//it's a model without a definition, and it corresponds to a sprite we can display, so let's add it
+						ModelData data = new ModelData { IsVoxel = true };
+						data.ModelNames.Add(group.Key);
+
+						foreach(int id in sprites[sc.Key]) modeldefentries[id] = data;
+					}
+				}
+			}
+		}
+
+		//mxd. This parses gldefs. Should be called after all DECORATE actors are parsed
+		private void LoadGldefs(Dictionary<string, int> actorsbyclass) 
+		{
+			//if no actors defined in DECORATE or game config...
+			if(actorsbyclass.Count == 0) return;
+
+			GldefsParser parser = new GldefsParser { OnInclude = ParseFromLocation };
+
+			// Load gldefs from resources
+			foreach(DataReader dr in containers) 
+			{
+				currentreader = dr;
+				parser.ClearIncludesList();
+				Dictionary<string, Stream> streams = dr.GetGldefsData(General.Map.Config.GameType);
+
+				foreach(KeyValuePair<string, Stream> group in streams)
+				{
+					parser.Parse(group.Value, group.Key, false);
+					
+					// Gldefs can be interdependable. Can't carry on
+					if(parser.HasError)
+					{
+						parser.LogError();
+						return;
+					}
+				}
+			}
+
+			//create Gldefs Entries dictionary
+			foreach(KeyValuePair<string, string> e in parser.Objects) //<ClassName, Light name>
+			{ 
+				//if we have decorate actor and light definition for given ClassName...
+				if(actorsbyclass.ContainsKey(e.Key) && parser.LightsByName.ContainsKey(e.Value)) 
+					gldefsentries[actorsbyclass[e.Key]] = parser.LightsByName[e.Value];
+				else if(!decorate.AllActorsByClass.ContainsKey(e.Key))
+					General.ErrorLogger.Add(ErrorType.Warning, "Got GLDEFS light for class '" + e.Key + "', but haven't found such class in DECORATE");
+			}
+
+			// Grab them glowy flats!
+			glowingflats = parser.GlowingFlats;
+		}
+
+		//mxd. This loads (Z)MAPINFO
+		private void LoadMapInfo(out Dictionary<int, string> spawnnums, out Dictionary<int, string> doomednums)
+		{
+			MapinfoParser parser = new MapinfoParser { OnInclude = ParseFromLocation };
+			
+			foreach(DataReader dr in containers)
+			{
+				currentreader = dr;
+
+				Dictionary<string, Stream> streams = dr.GetMapinfoData();
+				foreach(KeyValuePair<string, Stream> group in streams) 
+				{
+					// Parse the data
+					parser.Parse(group.Value, Path.Combine(currentreader.Location.location, group.Key), General.Map.Options.LevelName, false);
+
+					//MAPINFO lumps are interdependable. Can't carry on...
+					if(parser.HasError)
+					{
+						parser.LogError();
+
+						// No nulls allowed!
+						spawnnums = new Dictionary<int, string>();
+						doomednums = new Dictionary<int, string>();
+						mapinfo = new MapInfo();
+
+						return;
+					}
+				}
+			}
+
+			// Set the output values
+			spawnnums = parser.SpawnNums;
+			doomednums = parser.DoomEdNums;
+
+			// Store to our MapInfo property
+			currentreader = null;
+			mapinfo = parser.MapInfo ?? new MapInfo();
+		}
+
+		private void ParseFromLocation(ZDTextParser parser, string location, bool clearerrors)
+		{
+			if(currentreader.IsSuspended) throw new Exception("Data reader is suspended");
+			parser.Parse(currentreader.LoadFile(location), location, clearerrors);
+		}
+
+		//mxd. This loads REVERBS
+		private void LoadReverbs() 
+		{
+			reverbs.Clear();
+
+			// Bail out when not supported by current game configuration
+			if(string.IsNullOrEmpty(General.Map.Config.DecorateGames)) return;
+
+			ReverbsParser parser = new ReverbsParser();
+			foreach(DataReader dr in containers) 
+			{
+				currentreader = dr;
+				Dictionary<string, Stream> streams = dr.GetReverbsData();
+				foreach(KeyValuePair<string, Stream> group in streams) 
+				{
+					// Parse the data
+					parser.Parse(group.Value, group.Key, true);
+
+					// Report errors?
+					if(parser.HasError) parser.LogError();
+				}
+			}
+
+			currentreader = null;
+			reverbs = parser.GetReverbs();
+		}
+
+		//mxd. This loads SNDSEQ
+		private void LoadSndSeq()
+		{
+			soundsequences.Clear();
+
+			// Bail out when not supported by current game configuration
+			if(string.IsNullOrEmpty(General.Map.Config.DecorateGames)) return;
+
+			SndSeqParser parser = new SndSeqParser();
+			foreach(DataReader dr in containers) 
+			{
+				currentreader = dr;
+				Dictionary<string, Stream> streams = dr.GetSndSeqData();
+
+				// Parse the data
+				foreach(KeyValuePair<string, Stream> group in streams)
+				{
+					parser.Parse(group.Value, group.Key, true);
+
+					// Report errors?
+					if(parser.HasError) parser.LogError();
+				}
+			}
+
+			currentreader = null;
+			soundsequences = parser.GetSoundSequences();
+		}
+
+		//mxd. This loads cameratextures from ANIMDEFS
+		private void LoadAnimdefs()
+		{
+			// Bail out when not supported by current game configuration
+			if(string.IsNullOrEmpty(General.Map.Config.DecorateGames)) return;
+
+			AnimdefsParser parser = new AnimdefsParser();
+			foreach(DataReader dr in containers)
+			{
+				currentreader = dr;
+				Dictionary<string, Stream> streams = dr.GetAnimdefsData();
+
+				// Parse the data
+				foreach(KeyValuePair<string, Stream> group in streams)
+				{
+					parser.Parse(group.Value, group.Key, true);
+
+					// Report errors?
+					if(parser.HasError) parser.LogError();
+
+					// Create images
+					foreach(var g in parser.CameraTextures)
+					{
+						// Grab a local copy
+						CameraTextureData data = g.Value;
+
+						// Apply texture size override?
+						if(!data.FitTexture)
+						{
+							long longname = Lump.MakeLongName(data.Name);
+
+							if(textures.ContainsKey(longname))
+							{
+								data.ScaleX = (float)textures[longname].Width / data.Width;
+								data.ScaleY = (float)textures[longname].Height / data.Height;
+							}
+							else if(flats.ContainsKey(longname))
+							{
+								data.ScaleX = (float)flats[longname].Width / data.Width;
+								data.ScaleY = (float)flats[longname].Height / data.Height;
+							}
+						}
+
+						// Create texture
+						CameraTextureImage camteximage = new CameraTextureImage(data);
+
+						// Add to flats and textures
+						texturenames.Add(camteximage.Name);
+						flatnames.Add(camteximage.Name);
+
+						//TODO: Do cameratextures override stuff like this?..
+						textures[camteximage.LongName] = camteximage;
+						flats[camteximage.LongName] = camteximage;
+
+						// Add to preview manager
+						previews.AddImage(camteximage);
+
+						// Add to container's texture set
+						currentreader.TextureSet.AddFlat(camteximage);
+						currentreader.TextureSet.AddTexture(camteximage);
+					}
+				}
+			}
+
+			currentreader = null;
+		}
+
+		//mxd
+		internal Stream LoadFile(string name) 
+		{
+			// Filesystem path?
+			if(Path.IsPathRooted(name))
+				return (File.Exists(name) ? File.OpenRead(name) : null);
+
+			foreach(DataReader dr in containers)
+				if(dr.FileExists(name)) return dr.LoadFile(name);
+
+			return null;
+		}
+
+		#endregion
+
+		#region ================== Tools
+
+		// This finds the first IWAD resource
+		// Returns false when not found
+		public bool FindFirstIWAD(out DataLocation result)
+		{
+			// Go for all data containers
+			foreach(DataReader dr in containers)
+			{
+				// Container is a WAD file?
+				if(dr is WADReader)
+				{
+					// Check if it is an IWAD
+					WADReader wr = dr as WADReader;
+					if(wr.IsIWAD)
+					{
+						// Return location!
+						result = wr.Location;
+						return true;
+					}
+				}
+			}
+
+			// No IWAD found
+			result = new DataLocation();
+			return false;
+		}
+
+		// This signals the background thread to update the
+		// used-in-map status on all textures and flats
+		public void UpdateUsedTextures()
+		{
+			if(General.Map.Config.MixTexturesFlats)
+			{
+				lock(usedtextures)
+				{
+					usedtextures.Clear();
+
+					// Go through the map to find the used textures
+					foreach(Sidedef sd in General.Map.Map.Sidedefs)
+					{
+						// Add used textures to dictionary
+						if(sd.LongHighTexture != MapSet.EmptyLongName) usedtextures[sd.LongHighTexture] = 0;
+						if(sd.LongMiddleTexture != MapSet.EmptyLongName) usedtextures[sd.LongMiddleTexture] = 0;
+						if(sd.LongLowTexture != MapSet.EmptyLongName) usedtextures[sd.LongLowTexture] = 0;
+					}
+
+					// Go through the map to find the used flats
+					foreach(Sector s in General.Map.Map.Sectors)
+					{
+						// Add used flats to dictionary
+						usedtextures[s.LongFloorTexture] = 0;
+						usedtextures[s.LongCeilTexture] = 0;
+					}
+
+					// Notify the background thread that it needs to update the images
+					updatedusedtextures = true;
+				}
+			}
+			//mxd. Use separate collections
+			else
+			{
+				lock(usedtextures)
+				{
+					usedtextures.Clear();
+
+					// Go through the map to find the used textures
+					foreach(Sidedef sd in General.Map.Map.Sidedefs)
+					{
+						// Add used textures to dictionary
+						if(sd.LongHighTexture != MapSet.EmptyLongName) usedtextures[sd.LongHighTexture] = 0;
+						if(sd.LongMiddleTexture != MapSet.EmptyLongName) usedtextures[sd.LongMiddleTexture] = 0;
+						if(sd.LongLowTexture != MapSet.EmptyLongName) usedtextures[sd.LongLowTexture] = 0;
+					}
+				}
+
+				lock(usedflats)
+				{
+					usedflats.Clear();
+
+					// Go through the map to find the used flats
+					foreach(Sector s in General.Map.Map.Sectors)
+					{
+						// Add used flats to dictionary
+						usedflats[s.LongFloorTexture] = 0;
+						usedflats[s.LongCeilTexture] = 0;
+					}
+				}
+				
+				// Notify the background thread that it needs to update the images
+				updatedusedtextures = true;
+			}
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Data/DataReader.cs b/Source/Core/Data/DataReader.cs
new file mode 100644
index 0000000..98b97cc
--- /dev/null
+++ b/Source/Core/Data/DataReader.cs
@@ -0,0 +1,191 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using System.IO;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.GZBuilder.Data;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Data
+{
+	internal abstract class DataReader
+	{
+		#region ================== Constants
+
+		protected const string SPRITE_NAME_PATTERN = "(?i)\\A[a-z0-9]{4}([a-z][0-9]{0,2})$"; //mxd
+
+		#endregion
+
+		#region ================== Variables
+
+		protected DataLocation location;
+		protected bool issuspended;
+		protected bool isdisposed;
+		protected ResourceTextureSet textureset;
+
+		#endregion
+
+		#region ================== Properties
+
+		public DataLocation Location { get { return location; } }
+		public bool IsDisposed { get { return isdisposed; } }
+		public bool IsSuspended { get { return issuspended; } }
+		public ResourceTextureSet TextureSet { get { return textureset; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		protected DataReader(DataLocation dl)
+		{
+			// Keep information
+			location = dl;
+			textureset = new ResourceTextureSet(GetTitle(), dl);
+		}
+
+		// Disposer
+		public virtual void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Done
+				textureset = null;
+				isdisposed = true;
+			}
+		}
+
+		#endregion
+
+		#region ================== Management
+
+		// This returns a short name
+		public abstract string GetTitle();
+
+		// This suspends use of this resource
+		public virtual void Suspend()
+		{
+			issuspended = true;
+		}
+
+		// This resumes use of this resource
+		public virtual void Resume()
+		{
+			issuspended = false;
+		}
+
+		#endregion
+
+		#region ================== Palette
+
+		// When implemented, this should find and load a PLAYPAL palette
+		public virtual Playpal LoadPalette() { return null; }
+		
+		#endregion
+
+		#region ================== Colormaps
+
+		// When implemented, this loads the colormaps
+		public virtual ICollection<ImageData> LoadColormaps() { return null; }
+
+		// When implemented, this returns the colormap lump
+		public virtual Stream GetColormapData(string pname) { return null; }
+
+		#endregion
+
+		#region ================== Textures
+
+		// When implemented, this should read the patch names
+		public virtual PatchNames LoadPatchNames() { return null; }
+
+		// When implemented, this returns the patch lump
+		public virtual Stream GetPatchData(string pname, bool longname) { return null; }
+
+		// When implemented, this returns the texture lump
+		public virtual Stream GetTextureData(string pname, bool longname) { return null; }
+
+		// When implemented, this loads the textures
+		public virtual ICollection<ImageData> LoadTextures(PatchNames pnames) { return null; }
+		
+		#endregion
+
+		#region ================== Flats
+		
+		// When implemented, this loads the flats
+		public virtual ICollection<ImageData> LoadFlats() { return null; }
+
+		// When implemented, this returns the flat lump
+		public virtual Stream GetFlatData(string pname, bool longname) { return null; }
+		
+		#endregion
+		
+		#region ================== Sprites
+
+		// When implemented, this loads the sprites
+		public virtual ICollection<ImageData> LoadSprites() { return null; }
+		
+		// When implemented, this returns the sprite lump
+		public virtual Stream GetSpriteData(string pname) { return null; }
+
+		// When implemented, this checks if the given sprite lump exists
+		public virtual bool GetSpriteExists(string pname) { return false; }
+		
+		#endregion
+
+		#region ================== Decorate, Modeldef, Mapinfo, Gldefs, etc...
+
+		// When implemented, this returns the DECORATE lump
+		public abstract Dictionary<string, Stream> GetDecorateData(string pname); // { return new Dictionary<string, Stream>(); }
+
+		//mxd. When implemented, this returns the MODELDEF lump
+		public abstract Dictionary<string, Stream> GetModeldefData(); // { return new Dictionary<string, Stream>(); }
+
+		//mxd. When implemented, this returns the MAPINFO lump
+		public abstract Dictionary<string, Stream> GetMapinfoData(); // { return new Dictionary<string, Stream>(); }
+
+		//mxd. When implemented, this returns the GLDEFS lump
+		public abstract Dictionary<string, Stream> GetGldefsData(GameType gametype); // { return new Dictionary<string, Stream>(); }
+
+		//mxd. When implemented, this returns the REVERBS lump
+		public abstract Dictionary<string, Stream> GetReverbsData(); // { return new Dictionary<string, Stream>(); }
+
+		//mxd. When implemented, this returns the VOXELDEF lump
+		public abstract KeyValuePair<string, Stream> GetVoxeldefData(); // { return new KeyValuePair<string, Stream>(); }
+
+		//mxd. When implemented, this returns the SNDSEQ lump
+		public abstract Dictionary<string, Stream> GetSndSeqData(); // { return new Dictionary<string, Stream>(); }
+
+		//mxd. When implemented, this returns the ANIMDEFS lump
+		public abstract Dictionary<string, Stream> GetAnimdefsData();
+
+		//mxd. When implemented, this returns the list of voxel model names
+		public abstract IEnumerable<string> GetVoxelNames(); // { return null; }
+
+		//mxd. When implemented, this returns the voxel lump
+		public abstract Stream GetVoxelData(string name); // { return null; }
+
+		//mxd
+		internal abstract MemoryStream LoadFile(string name);// { return null; }
+		internal abstract bool FileExists(string filename);// { return false; }
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Data/DirectoryReader.cs b/Source/Core/Data/DirectoryReader.cs
new file mode 100644
index 0000000..1024d38
--- /dev/null
+++ b/Source/Core/Data/DirectoryReader.cs
@@ -0,0 +1,414 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.IO;
+using CodeImp.DoomBuilder.IO;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Data
+{
+	internal sealed class DirectoryReader : PK3StructuredReader
+	{
+		#region ================== Variables
+
+		private DirectoryFilesList files;
+
+		#endregion
+		
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public DirectoryReader(DataLocation dl) : base(dl)
+		{
+			General.WriteLogLine("Opening directory resource '" + location.location + "'");
+			
+			// Initialize
+			files = new DirectoryFilesList(dl.location, true);
+			Initialize();
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+		
+		// Disposer
+		public override void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				General.WriteLogLine("Closing directory resource '" + location.location + "'");
+				
+				// Done
+				base.Dispose();
+			}
+		}
+		
+		#endregion
+
+		#region ================== Textures
+
+		// This finds and returns a patch stream
+		public override Stream GetPatchData(string pname, bool longname)
+		{
+			// Error when suspended
+			if(issuspended) throw new Exception("Data reader is suspended");
+
+			// Find in any of the wad files
+			// Note the backward order, because the last wad's images have priority
+			if(!longname) //mxd. Patches with long names can't be in wads
+			{
+				for(int i = wads.Count - 1; i > -1; i--)
+				{
+					Stream data = wads[i].GetPatchData(pname, false);
+					if(data != null) return data;
+				}
+			}
+
+			try
+			{
+				if(longname)
+				{
+					//mxd. Long names are absolute
+					pname = pname.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
+					return (FileExists(pname) ? LoadFile(pname) : null);
+				}
+				else if(General.Map.Config.MixTexturesFlats)
+				{
+					//mxd. Find in directories ZDoom expects them to be
+					string dir = Path.GetDirectoryName(pname);
+					string name = Path.GetFileName(pname);
+					foreach(string loc in PatchLocations)
+					{
+						string path = Path.Combine(loc, dir);
+						string filename = FindFirstFile(path, name, true);
+						if(!string.IsNullOrEmpty(filename) && FileExists(filename)) 
+							return LoadFile(filename);
+					}
+				}
+				else
+				{
+					// Find in patches directory
+					string path = Path.Combine(PATCHES_DIR, Path.GetDirectoryName(pname));
+					string filename = FindFirstFile(path, Path.GetFileName(pname), true);
+					if(!string.IsNullOrEmpty(filename) && FileExists(filename))
+						return LoadFile(filename);
+				}
+			}
+			catch(Exception e)
+			{
+				General.ErrorLogger.Add(ErrorType.Error, e.GetType().Name + " while loading patch '" + pname + "' from directory: " + e.Message);
+			}
+
+			// Nothing found
+			return null;
+		}
+
+		// This finds and returns a textue stream
+		public override Stream GetTextureData(string pname, bool longname)
+		{
+			// Error when suspended
+			if(issuspended) throw new Exception("Data reader is suspended");
+
+			// Find in any of the wad files
+			// Note the backward order, because the last wad's images have priority
+			if(!longname) //mxd. Textures with long names can't be in wads
+			{
+				for(int i = wads.Count - 1; i >= 0; i--)
+				{
+					Stream data = wads[i].GetTextureData(pname, false);
+					if(data != null) return data;
+				}
+			}
+			
+			try
+			{
+				//mxd. Long names are absolute
+				if(longname)
+				{
+					pname = pname.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
+					return (FileExists(pname) ? LoadFile(pname) : null);
+				}
+				else
+				{
+					// Find in textures directory
+					string path = Path.Combine(TEXTURES_DIR, Path.GetDirectoryName(pname));
+					string filename = FindFirstFile(path, Path.GetFileName(pname), true);
+					if(!string.IsNullOrEmpty(filename) && FileExists(filename)) 
+						return LoadFile(filename);
+				}
+			}
+			catch(Exception e)
+			{
+				General.ErrorLogger.Add(ErrorType.Error, e.GetType().Name + " while loading texture '" + pname + "' from directory: " + e.Message);
+			}
+
+			// Nothing found
+			return null;
+		}
+
+		// This finds and returns a colormap stream
+		public override Stream GetColormapData(string pname)
+		{
+			// Error when suspended
+			if(issuspended) throw new Exception("Data reader is suspended");
+
+			// Find in any of the wad files
+			// Note the backward order, because the last wad's images have priority
+			for(int i = wads.Count - 1; i >= 0; i--)
+			{
+				Stream data = wads[i].GetColormapData(pname);
+				if(data != null) return data;
+			}
+
+			try
+			{
+				// Find in patches directory
+				string path = Path.Combine(COLORMAPS_DIR, Path.GetDirectoryName(pname));
+				string filename = FindFirstFile(path, Path.GetFileName(pname), true);
+				if((filename != null) && FileExists(filename))
+				{
+					return LoadFile(filename);
+				}
+			}
+			catch(Exception e)
+			{
+				General.ErrorLogger.Add(ErrorType.Error, e.GetType().Name + " while loading colormap '" + pname + "' from directory: " + e.Message);
+			}
+
+			// Nothing found
+			return null;
+		}
+
+		#endregion
+
+		#region ================== Sprites
+
+		// This finds and returns a sprite stream
+		public override Stream GetSpriteData(string pname)
+		{
+			// Error when suspended
+			if(issuspended) throw new Exception("Data reader is suspended");
+
+			// Find in any of the wad files
+			for(int i = wads.Count - 1; i >= 0; i--)
+			{
+				Stream sprite = wads[i].GetSpriteData(pname);
+				if(sprite != null) return sprite;
+			}
+			
+			try
+			{
+				// Find in sprites directory
+				string path = Path.Combine(SPRITES_DIR, Path.GetDirectoryName(pname));
+				string filename = FindFirstFile(path, Path.GetFileName(pname), true);
+				if((filename != null) && FileExists(filename))
+				{
+					return LoadFile(filename);
+				}
+			}
+			catch(Exception e)
+			{
+				General.ErrorLogger.Add(ErrorType.Error, e.GetType().Name + " while loading sprite '" + pname + "' from directory: " + e.Message);
+			}
+			
+			// Nothing found
+			return null;
+		}
+
+		// This checks if the given sprite exists
+		public override bool GetSpriteExists(string pname)
+		{
+			// Error when suspended
+			if(issuspended) throw new Exception("Data reader is suspended");
+
+			// Find in any of the wad files
+			for(int i = wads.Count - 1; i >= 0; i--)
+			{
+				if(wads[i].GetSpriteExists(pname)) return true;
+			}
+
+			// Find in sprites directory
+			try
+			{
+				string path = Path.Combine(SPRITES_DIR, Path.GetDirectoryName(pname));
+				string filename = FindFirstFile(path, Path.GetFileName(pname), true);
+				if((filename != null) && FileExists(filename))
+				{
+					return true;
+				}
+			}
+			catch(Exception e)
+			{
+				General.ErrorLogger.Add(ErrorType.Error, e.GetType().Name + " while checking sprite '" + pname + "' existance in directory: " + e.Message);
+			}
+			
+			// Nothing found
+			return false;
+		}
+
+		#endregion
+
+		#region ================== Voxels (mxd)
+
+		//mxd.  This finds and returns a voxel stream
+		public override Stream GetVoxelData(string name)
+		{
+			// Error when suspended
+			if(issuspended) throw new Exception("Data reader is suspended");
+
+			// Find in any of the wad files
+			for(int i = wads.Count - 1; i >= 0; i--)
+			{
+				Stream voxel = wads[i].GetVoxelData(name);
+				if(voxel != null) return voxel;
+			}
+
+			try
+			{
+				// Find in voxels directory
+				string path = Path.Combine(VOXELS_DIR, Path.GetDirectoryName(name));
+				string filename = FindFirstFile(path, Path.GetFileName(name), true);
+				if((filename != null) && FileExists(filename))
+				{
+					return LoadFile(filename);
+				}
+			}
+			catch(Exception e)
+			{
+				General.ErrorLogger.Add(ErrorType.Error, e.GetType().Name + " while loading voxel '" + name + "' from directory: " + e.Message);
+			}
+
+			// Nothing found
+			return null;
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// Return a short name for this data location
+		public override string GetTitle()
+		{
+			return Path.GetFileName(location.location);
+		}
+
+		// This creates an image
+		protected override ImageData CreateImage(string filename, int imagetype)
+		{
+			switch(imagetype)
+			{
+				case ImageDataFormat.DOOMFLAT:
+					return new FileImage(filename, Path.Combine(location.location, filename), true);
+				
+				case ImageDataFormat.DOOMPICTURE:
+					return new FileImage(filename, Path.Combine(location.location, filename), false);
+					
+				case ImageDataFormat.DOOMCOLORMAP:
+					return new ColormapImage(Path.GetFileNameWithoutExtension(filename));
+
+				default:
+					throw new ArgumentException("Invalid image format specified!");
+			}
+		}
+
+		// This returns true if the specified file exists
+		internal override bool FileExists(string filename)
+		{
+			return files.FileExists(filename);
+		}
+		
+		// This returns all files in a given directory
+		protected override string[] GetAllFiles(string path, bool subfolders)
+		{
+			return files.GetAllFiles(path, subfolders).ToArray();
+		}
+		
+		// This returns all files in a given directory that have the given file title
+		protected override string[] GetAllFilesWithTitle(string path, string title, bool subfolders)
+		{
+			return files.GetAllFilesWithTitle(path, title, subfolders).ToArray();
+		}
+
+		//mxd. This returns all files in a given directory which title starts with given title
+		protected override string[] GetAllFilesWhichTitleStartsWith(string path, string title) 
+		{
+			return files.GetAllFilesWhichTitleStartsWith(path, title).ToArray();
+		}
+		
+		// This returns all files in a given directory that match the given extension
+		protected override string[] GetFilesWithExt(string path, string extension, bool subfolders)
+		{
+			return files.GetAllFiles(path, extension, subfolders).ToArray();
+		}
+
+		// This finds the first file that has the specific name, regardless of file extension
+		protected override string FindFirstFile(string beginswith, bool subfolders)
+		{
+			return files.GetFirstFile(beginswith, subfolders);
+		}
+
+		// This finds the first file that has the specific name, regardless of file extension
+		protected override string FindFirstFile(string path, string beginswith, bool subfolders)
+		{
+			return files.GetFirstFile(path, beginswith, subfolders);
+		}
+
+		// This finds the first file that has the specific name
+		protected override string FindFirstFileWithExt(string path, string beginswith, bool subfolders)
+		{
+			string title = Path.GetFileNameWithoutExtension(beginswith);
+			string ext = Path.GetExtension(beginswith);
+			ext = (!string.IsNullOrEmpty(ext) && ext.Length > 1 ? ext.Substring(1) : string.Empty);
+			return files.GetFirstFile(path, title, subfolders, ext);
+		}
+		
+		// This loads an entire file in memory and returns the stream
+		// NOTE: Callers are responsible for disposing the stream!
+		internal override MemoryStream LoadFile(string filename)
+		{
+			MemoryStream s = null;
+
+			try 
+			{
+				lock(this)
+				{
+					s = new MemoryStream(File.ReadAllBytes(Path.Combine(location.location, filename)));
+				}
+			} 
+			catch(Exception e) 
+			{
+				General.ErrorLogger.Add(ErrorType.Error, "Unable to load file: "+e.Message);
+			}
+			return s;
+		}
+
+		// This creates a temp file for the speciied file and return the absolute path to the temp file
+		// NOTE: Callers are responsible for removing the temp file when done!
+		protected override string CreateTempFile(string filename)
+		{
+			// Just copy the file
+			string tempfile = General.MakeTempFilename(General.Map.TempPath, "wad");
+			File.Copy(Path.Combine(location.location, filename), tempfile);
+			return tempfile;
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Data/DynamicBitmapImage.cs b/Source/Core/Data/DynamicBitmapImage.cs
new file mode 100644
index 0000000..3f0ec09
--- /dev/null
+++ b/Source/Core/Data/DynamicBitmapImage.cs
@@ -0,0 +1,77 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Drawing;
+using CodeImp.DoomBuilder.Rendering;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Data
+{
+	public class DynamicBitmapImage : BitmapImage, ID3DResource
+	{
+		#region ================== Variables
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public DynamicBitmapImage(Bitmap img, string name) : base(img, name)
+		{
+			// Initialize
+			this.UseColorCorrection = false;
+			this.dynamictexture = true;
+
+			// This resource is volatile
+			General.Map.Graphics.RegisterResource(this);
+		}
+
+		// Disposer
+		public override void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Clean up
+				General.Map.Graphics.UnregisterResource(this);
+
+				// Done
+				base.Dispose();
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// Unload the resource because Direct3D says so
+		public void UnloadResource()
+		{
+			ReleaseTexture();
+		}
+
+		// Reload the resource
+		public void ReloadResource()
+		{
+			CreateTexture();
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Data/FileImage.cs b/Source/Core/Data/FileImage.cs
new file mode 100644
index 0000000..adfefe4
--- /dev/null
+++ b/Source/Core/Data/FileImage.cs
@@ -0,0 +1,193 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.IO;
+using CodeImp.DoomBuilder.IO;
+using CodeImp.DoomBuilder.Controls;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Data
+{
+	public sealed class FileImage : ImageData
+	{
+		#region ================== Variables
+
+		private readonly int probableformat;
+		
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public FileImage(string name, string filepathname, bool asflat)
+		{
+			// Initialize
+			this.isFlat = asflat; //mxd
+			SetName(name, filepathname);
+
+			if(asflat)
+			{
+				probableformat = ImageDataFormat.DOOMFLAT;
+				this.scale.x = General.Map.Config.DefaultFlatScale;
+				this.scale.y = General.Map.Config.DefaultFlatScale;
+			}
+			else
+			{
+				probableformat = ImageDataFormat.DOOMPICTURE;
+				this.scale.x = General.Map.Config.DefaultTextureScale;
+				this.scale.y = General.Map.Config.DefaultTextureScale;
+			}
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Constructor
+		public FileImage(string name, string filepathname, bool asflat, float scalex, float scaley)
+		{
+			// Initialize
+			this.scale.x = scalex;
+			this.scale.y = scaley;
+			this.isFlat = asflat; //mxd
+			SetName(name, filepathname);
+
+			probableformat = (asflat ? ImageDataFormat.DOOMFLAT : ImageDataFormat.DOOMPICTURE);
+
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		//mxd. Constructor for loading internal images
+		internal FileImage(string name, string filepathname)
+		{
+			// Initialize
+			SetName(name, filepathname, true, true);
+
+			probableformat = ImageDataFormat.DOOMPICTURE;
+
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		//mxd: name is relative path to the image ("\Textures\sometexture.png")
+		//mxd: filepathname is absolute path to the image ("D:\Doom\MyCoolProject\Textures\sometexture.png")
+		//mxd: also, zdoom uses '/' as directory separator char.
+		//mxd: and doesn't recognize long texture names in a root folder / pk3/7 root
+		private void SetName(string name, string filepathname)
+		{
+			SetName(name, filepathname, General.Map.Config.UseLongTextureNames, false);
+		}
+
+		private void SetName(string name, string filepathname, bool uselongtexturenames, bool forcelongtexturename)
+		{
+			name = name.Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
+
+			if(!uselongtexturenames || (!forcelongtexturename && string.IsNullOrEmpty(Path.GetDirectoryName(name))))
+			{
+				this.name = Path.GetFileNameWithoutExtension(name.ToUpperInvariant());
+				if(this.name.Length > DataManager.CLASIC_IMAGE_NAME_LENGTH)
+				{
+					this.name = this.name.Substring(0, DataManager.CLASIC_IMAGE_NAME_LENGTH);
+				}
+				this.virtualname = Path.Combine(Path.GetDirectoryName(name), this.name).Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
+				this.displayname = this.name;
+				this.shortname = this.name;
+			}
+			else
+			{
+				this.name = name;
+				this.virtualname = name;
+				this.displayname = Path.GetFileNameWithoutExtension(name);
+				this.shortname = this.displayname.ToUpperInvariant();
+				if(this.shortname.Length > DataManager.CLASIC_IMAGE_NAME_LENGTH)
+				{
+					this.shortname = this.shortname.Substring(0, DataManager.CLASIC_IMAGE_NAME_LENGTH);
+				}
+				hasLongName = true;
+			}
+
+			this.longname = Lump.MakeLongName(this.name, uselongtexturenames);
+			this.filepathname = filepathname;
+			this.level = virtualname.Split(new[] { Path.AltDirectorySeparatorChar }).Length - 1;
+
+			if(General.Settings.CapitalizeTextureNames && !string.IsNullOrEmpty(this.displayname))
+			{
+				this.displayname = this.displayname.ToUpperInvariant();
+			}
+
+			if(this.displayname.Length > ImageBrowserItem.MAX_NAME_LENGTH)
+			{
+				this.displayname = this.displayname.Substring(0, ImageBrowserItem.MAX_NAME_LENGTH);
+			}
+		}
+
+		// This loads the image
+		protected override void LocalLoadImage()
+		{
+			// Leave when already loaded
+			if(this.IsImageLoaded) return;
+
+			lock(this)
+			{
+				// Load file data
+				if(bitmap != null) bitmap.Dispose(); bitmap = null;
+
+				MemoryStream filedata = new MemoryStream(File.ReadAllBytes(filepathname));
+
+				// Get a reader for the data
+				IImageReader reader = ImageDataFormat.GetImageReader(filedata, probableformat, General.Map.Data.Palette);
+				if(!(reader is UnknownImageReader)) 
+				{
+					// Load the image
+					filedata.Seek(0, SeekOrigin.Begin);
+					try { bitmap = reader.ReadAsBitmap(filedata); } 
+					catch(InvalidDataException) 
+					{
+						// Data cannot be read!
+						bitmap = null;
+					}
+				}
+
+				// Not loaded?
+				if(bitmap == null) 
+				{
+					General.ErrorLogger.Add(ErrorType.Error, "Image file '" + filepathname + "' data format could not be read, while loading image '" + this.Name + "'. Is this a valid picture file at all?");
+					loadfailed = true;
+				} 
+				else 
+				{
+					// Get width and height
+					width = bitmap.Size.Width;
+					height = bitmap.Size.Height;
+				}
+
+				// Pass on to base
+				filedata.Dispose();
+				base.LocalLoadImage();
+			}
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Data/FlatImage.cs b/Source/Core/Data/FlatImage.cs
new file mode 100644
index 0000000..578a6c8
--- /dev/null
+++ b/Source/Core/Data/FlatImage.cs
@@ -0,0 +1,112 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.IO;
+using CodeImp.DoomBuilder.IO;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Data
+{
+	internal sealed class FlatImage : ImageData
+	{
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public FlatImage(string name)
+		{
+			// Initialize
+			SetName(name);
+			virtualname = "[Flats]/" + this.name; //mxd
+			isFlat = true; //mxd
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This loads the image
+		protected override void LocalLoadImage()
+		{
+			// Leave when already loaded
+			if(this.IsImageLoaded) return;
+
+			lock(this)
+			{
+				// Get the lump data stream
+				Stream lumpdata = General.Map.Data.GetFlatData(Name, hasLongName);
+				if(lumpdata != null)
+				{
+					// Copy lump data to memory
+					lumpdata.Seek(0, SeekOrigin.Begin);
+					byte[] membytes = new byte[(int)lumpdata.Length];
+					lumpdata.Read(membytes, 0, (int)lumpdata.Length);
+					MemoryStream mem = new MemoryStream(membytes);
+					mem.Seek(0, SeekOrigin.Begin);
+
+					// Get a reader for the data
+					IImageReader reader = ImageDataFormat.GetImageReader(mem, ImageDataFormat.DOOMFLAT, General.Map.Data.Palette);
+					if(reader is UnknownImageReader)
+					{
+						// Data is in an unknown format!
+						General.ErrorLogger.Add(ErrorType.Error, "Flat lump '" + Name + "' data format could not be read. Does this lump contain valid picture data at all?");
+						bitmap = null;
+					}
+					else
+					{
+						// Read data as bitmap
+						mem.Seek(0, SeekOrigin.Begin);
+						if(bitmap != null) bitmap.Dispose();
+						bitmap = reader.ReadAsBitmap(mem);
+					}
+
+					// Done
+					mem.Dispose();
+
+					if(bitmap != null)
+					{
+						// Get width and height from image and set the scale
+						width = bitmap.Size.Width;
+						height = bitmap.Size.Height;
+						scale.x = General.Map.Config.DefaultFlatScale;
+						scale.y = General.Map.Config.DefaultFlatScale;
+					}
+					else
+					{
+						loadfailed = true;
+					}
+				}
+				else
+				{
+					// Missing a patch lump!
+					General.ErrorLogger.Add(ErrorType.Error, "Missing flat lump '" + Name + "'. Did you forget to include required resources?");
+					loadfailed = true;
+				}
+
+				// Pass on to base
+				base.LocalLoadImage();
+			}
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Data/HighResImage.cs b/Source/Core/Data/HighResImage.cs
new file mode 100644
index 0000000..052e017
--- /dev/null
+++ b/Source/Core/Data/HighResImage.cs
@@ -0,0 +1,418 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.IO;
+using CodeImp.DoomBuilder.Controls;
+using CodeImp.DoomBuilder.IO;
+using CodeImp.DoomBuilder.Rendering;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Data
+{
+	internal sealed unsafe class HighResImage : ImageData
+	{
+		#region ================== Variables
+
+		private readonly List<TexturePatch> patches; //mxd
+		
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public HighResImage(string name, string virtualpath, int width, int height, float scalex, float scaley, bool worldpanning, bool isflat)
+		{
+			// Initialize
+			this.width = width;
+			this.height = height;
+			this.scale.x = scalex;
+			this.scale.y = scaley;
+			this.worldpanning = worldpanning;
+			this.patches = new List<TexturePatch>(1);
+
+			//mxd
+			SetName(name);
+			this.virtualname = "[TEXTURES]" + Path.AltDirectorySeparatorChar + (!string.IsNullOrEmpty(virtualpath) ? virtualpath + Path.AltDirectorySeparatorChar : "") + this.name;
+			this.level = virtualname.Split(new[] { Path.AltDirectorySeparatorChar }).Length - 1;
+			this.isFlat = isflat;
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		//mxd
+		protected override void SetName(string name) 
+		{
+			if(!General.Map.Config.UseLongTextureNames) 
+			{
+				if(name.Length > DataManager.CLASIC_IMAGE_NAME_LENGTH)
+					name = name.Substring(0, DataManager.CLASIC_IMAGE_NAME_LENGTH);
+				name = name.ToUpperInvariant();
+			}
+			
+			base.SetName(name);
+
+			if(General.Settings.CapitalizeTextureNames && !string.IsNullOrEmpty(this.displayname)) 
+			{
+				this.displayname = this.displayname.ToUpperInvariant();
+			}
+
+			if(this.displayname.Length > ImageBrowserItem.MAX_NAME_LENGTH) 
+			{
+				this.displayname = this.displayname.Substring(0, ImageBrowserItem.MAX_NAME_LENGTH);
+			}
+
+			this.shortname = this.displayname.ToUpperInvariant();
+			if(this.shortname.Length > DataManager.CLASIC_IMAGE_NAME_LENGTH) 
+			{
+				this.shortname = this.shortname.Substring(0, DataManager.CLASIC_IMAGE_NAME_LENGTH);
+			}
+		}
+
+		// This adds a patch to the texture
+		public void AddPatch(TexturePatch patch)
+		{
+			// Add it
+			patches.Add(patch);
+			if(patch.lumpname == Name) hasPatchWithSameName = true; //mxd
+		}
+		
+		// This loads the image
+		protected override void LocalLoadImage()
+		{
+			// Checks
+			if(this.IsImageLoaded || width == 0 || height == 0) return;
+
+			Graphics g = null;
+			
+			lock(this)
+			{
+				// Create texture bitmap
+				try
+				{
+					if(bitmap != null) bitmap.Dispose();
+					bitmap = new Bitmap(width, height, PixelFormat.Format32bppArgb);
+					BitmapData bitmapdata = bitmap.LockBits(new Rectangle(0, 0, width, height), ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
+					PixelColor* pixels = (PixelColor*)bitmapdata.Scan0.ToPointer();
+					General.ZeroMemory(new IntPtr(pixels), width * height * sizeof(PixelColor));
+					bitmap.UnlockBits(bitmapdata);
+					g = Graphics.FromImage(bitmap);
+				}
+				catch(Exception e)
+				{
+					// Unable to make bitmap
+					General.ErrorLogger.Add(ErrorType.Error, "Unable to load texture image '" + this.Name + "'. " + e.GetType().Name + ": " + e.Message);
+					loadfailed = true;
+				}
+
+				int missingpatches = 0; //mxd
+
+				if(!loadfailed)
+				{
+					// Go for all patches
+					foreach(TexturePatch p in patches)
+					{
+						// Get the patch data stream
+						Stream patchdata = General.Map.Data.GetPatchData(p.lumpname, p.haslongname);
+
+						if(patchdata != null)
+						{
+							// Copy patch data to memory
+							patchdata.Seek(0, SeekOrigin.Begin);
+							byte[] membytes = new byte[(int)patchdata.Length];
+							patchdata.Read(membytes, 0, (int)patchdata.Length);
+							MemoryStream mem = new MemoryStream(membytes);
+							mem.Seek(0, SeekOrigin.Begin);
+
+							// Get a reader for the data
+							IImageReader reader = ImageDataFormat.GetImageReader(mem, ImageDataFormat.DOOMPICTURE, General.Map.Data.Palette);
+							if(reader is UnknownImageReader)
+							{
+								//mxd. Probably that's a flat?..
+								if(General.Map.Config.MixTexturesFlats) 
+								{
+									reader = ImageDataFormat.GetImageReader(mem, ImageDataFormat.DOOMFLAT, General.Map.Data.Palette);
+								}
+
+								if(reader is UnknownImageReader) 
+								{
+									// Data is in an unknown format!
+									General.ErrorLogger.Add(ErrorType.Error, "Patch lump '" + p.lumpname + "' data format could not be read, while loading texture '" + this.Name + "'");
+									missingpatches++; //mxd
+								}
+							}
+
+							if(!(reader is UnknownImageReader)) 
+							{
+								// Get the patch
+								mem.Seek(0, SeekOrigin.Begin);
+								Bitmap patchbmp = null;
+								try { patchbmp = reader.ReadAsBitmap(mem); }
+								catch(InvalidDataException)
+								{
+									// Data cannot be read!
+									General.ErrorLogger.Add(ErrorType.Error, "Patch lump '" + p.lumpname + "' data format could not be read, while loading texture '" + this.Name + "'");
+									missingpatches++; //mxd
+								}
+
+								if(patchbmp != null)
+								{
+									//mxd. Apply transformations from TexturePatch 
+									patchbmp = TransformPatch(p, patchbmp);
+
+									// Draw the patch on the texture image
+									Rectangle tgtrect = new Rectangle(p.x, p.y, patchbmp.Size.Width, patchbmp.Size.Height);
+									g.DrawImageUnscaledAndClipped(patchbmp, tgtrect);
+									patchbmp.Dispose();
+								}
+							}
+
+							// Done
+							mem.Dispose();
+						}
+						else
+						{
+							//mxd. ZDoom can use any known graphic as patch
+							if(General.Map.Config.MixTexturesFlats)
+							{
+								ImageData img = General.Map.Data.GetTextureImage(p.lumpname);
+								if(!(img is UnknownImage))
+								{
+									if(!img.IsImageLoaded) img.LoadImage();
+
+									//mxd. Apply transformations from TexturePatch. We don't want to modify the original bitmap here, so make a copy
+									Bitmap patchbmp = TransformPatch(p, new Bitmap(img.GetBitmap()));
+
+									// Draw the patch on the texture image
+									Rectangle tgtrect = new Rectangle(p.x, p.y, patchbmp.Size.Width, patchbmp.Size.Height);
+									g.DrawImageUnscaledAndClipped(patchbmp, tgtrect);
+									patchbmp.Dispose();
+
+									continue;
+								}
+							}
+							
+							// Missing a patch lump!
+							General.ErrorLogger.Add(ErrorType.Error, "Missing patch lump '" + p.lumpname + "' while loading texture '" + this.Name + "'");
+							missingpatches++; //mxd
+						}
+					}
+				}
+				
+				// Dispose bitmap if load failed
+				if((bitmap != null) && (loadfailed || missingpatches >= patches.Count)) //mxd. We can still display texture if at least one of the patches was loaded
+				{
+					bitmap.Dispose();
+					bitmap = null;
+					loadfailed = true;
+				}
+
+				// Pass on to base
+				base.LocalLoadImage();
+			}
+		}
+
+		//mxd
+		private Bitmap TransformPatch(TexturePatch p, Bitmap patchbmp)
+		{
+			//mxd. Flip
+			if(p.flipx || p.flipy)
+			{
+				RotateFlipType flip;
+				if(p.flipx && !p.flipy)
+					flip = RotateFlipType.RotateNoneFlipX;
+				else if(!p.flipx && p.flipy)
+					flip = RotateFlipType.RotateNoneFlipY;
+				else
+					flip = RotateFlipType.RotateNoneFlipXY;
+				patchbmp.RotateFlip(flip);
+			}
+
+			//mxd. Then rotate. I do it this way because RotateFlip function rotates THEN flips, and GZDoom does it the other way around.
+			if(p.rotate != 0)
+			{
+				RotateFlipType rotate;
+				switch(p.rotate)
+				{
+					case 90:
+						rotate = RotateFlipType.Rotate90FlipNone;
+						break;
+					case 180:
+						rotate = RotateFlipType.Rotate180FlipNone;
+						break;
+					default:
+						rotate = RotateFlipType.Rotate270FlipNone;
+						break;
+				}
+				patchbmp.RotateFlip(rotate);
+			}
+
+			// Adjust patch alpha, apply tint or blend
+			if(p.blendstyle != TexturePathBlendStyle.None || p.style != TexturePathRenderStyle.Copy)
+			{
+				BitmapData bmpdata = null;
+
+				try
+				{
+					bmpdata = patchbmp.LockBits(new Rectangle(0, 0, patchbmp.Size.Width, patchbmp.Size.Height), ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb);
+				}
+				catch(Exception e)
+				{
+					General.ErrorLogger.Add(ErrorType.Error, "Cannot lock image '" + p.lumpname + "' for alpha adjustment. " + e.GetType().Name + ": " + e.Message);
+				}
+
+				if(bmpdata != null)
+				{
+					PixelColor* pixels = (PixelColor*)(bmpdata.Scan0.ToPointer());
+					int numpixels = bmpdata.Width * bmpdata.Height;
+					int patchalpha = (int)Math.Round(General.Clamp(p.alpha, 0f, 1f) * 255); //convert alpha to [0-255] range
+
+					//mxd. Blend/Tint support
+					if(p.blendstyle == TexturePathBlendStyle.Blend)
+					{
+						for(PixelColor* cp = pixels + numpixels - 1; cp >= pixels; cp--)
+						{
+							cp->r = (byte)((cp->r * p.blend.r) * PixelColor.BYTE_TO_FLOAT);
+							cp->g = (byte)((cp->g * p.blend.g) * PixelColor.BYTE_TO_FLOAT);
+							cp->b = (byte)((cp->b * p.blend.b) * PixelColor.BYTE_TO_FLOAT);
+						}
+					}
+					else if(p.blendstyle == TexturePathBlendStyle.Tint)
+					{
+						float tintammount = p.tintammount - 0.1f;
+
+						if(tintammount > 0)
+						{
+							float br = p.blend.r * PixelColor.BYTE_TO_FLOAT * tintammount;
+							float bg = p.blend.g * PixelColor.BYTE_TO_FLOAT * tintammount;
+							float bb = p.blend.b * PixelColor.BYTE_TO_FLOAT * tintammount;
+							float invTint = 1.0f - tintammount;
+
+							for(PixelColor* cp = pixels + numpixels - 1; cp >= pixels; cp--)
+							{
+								cp->r = (byte)(((cp->r * PixelColor.BYTE_TO_FLOAT) * invTint + br) * 255.0f);
+								cp->g = (byte)(((cp->g * PixelColor.BYTE_TO_FLOAT) * invTint + bg) * 255.0f);
+								cp->b = (byte)(((cp->b * PixelColor.BYTE_TO_FLOAT) * invTint + bb) * 255.0f);
+							}
+						}
+					}
+
+					//mxd. Apply RenderStyle
+					if(p.style == TexturePathRenderStyle.Blend)
+					{
+						for(PixelColor* cp = pixels + numpixels - 1; cp >= pixels; cp--)
+							cp->a = (byte)((cp->a * patchalpha) * PixelColor.BYTE_TO_FLOAT);
+					}
+					//mxd. We need a copy of underlying part of texture for these styles
+					else if(p.style != TexturePathRenderStyle.Copy)
+					{
+						// Copy portion of texture
+						int lockWidth = (p.x + patchbmp.Size.Width > bitmap.Width) ? bitmap.Width - p.x : patchbmp.Size.Width;
+						int lockHeight = (p.y + patchbmp.Size.Height > bitmap.Height) ? bitmap.Height - p.y : patchbmp.Size.Height;
+
+						Bitmap source = new Bitmap(patchbmp.Size.Width, patchbmp.Size.Height);
+						using(Graphics sg = Graphics.FromImage(source))
+							sg.DrawImageUnscaled(bitmap, new Rectangle(-p.x, -p.y, lockWidth, lockHeight));
+
+						// Lock texture
+						BitmapData texturebmpdata = null;
+
+						try
+						{
+							texturebmpdata = source.LockBits(new Rectangle(0, 0, source.Width, source.Height), ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb);
+						}
+						catch(Exception e)
+						{
+							General.ErrorLogger.Add(ErrorType.Error, "Cannot lock texture '" + this.Name + "' to apply render style. " + e.GetType().Name + ": " + e.Message);
+						}
+
+						if(texturebmpdata != null)
+						{
+							PixelColor* texturepixels = (PixelColor*)(texturebmpdata.Scan0.ToPointer());
+							PixelColor* tcp = texturepixels + numpixels - 1;
+
+							switch(p.style)
+							{
+								case TexturePathRenderStyle.Add:
+									for(PixelColor* cp = pixels + numpixels - 1; cp >= pixels; cp--)
+									{
+										cp->r = (byte)Math.Min(255, cp->r + tcp->r);
+										cp->g = (byte)Math.Min(255, cp->g + tcp->g);
+										cp->b = (byte)Math.Min(255, cp->b + tcp->b);
+										cp->a = (byte)((cp->a * patchalpha) * PixelColor.BYTE_TO_FLOAT);
+										tcp--;
+									}
+									break;
+
+								case TexturePathRenderStyle.Subtract:
+									for(PixelColor* cp = pixels + numpixels - 1; cp >= pixels; cp--)
+									{
+										cp->r = (byte)Math.Max(0, tcp->r - cp->r);
+										cp->g = (byte)Math.Max(0, tcp->g - cp->g);
+										cp->b = (byte)Math.Max(0, tcp->b - cp->b);
+										cp->a = (byte)((cp->a * patchalpha) * PixelColor.BYTE_TO_FLOAT);
+										tcp--;
+									}
+									break;
+
+								case TexturePathRenderStyle.ReverseSubtract:
+									for(PixelColor* cp = pixels + numpixels - 1; cp >= pixels; cp--)
+									{
+										cp->r = (byte)Math.Max(0, cp->r - tcp->r);
+										cp->g = (byte)Math.Max(0, cp->g - tcp->g);
+										cp->b = (byte)Math.Max(0, cp->b - tcp->b);
+										cp->a = (byte)((cp->a * patchalpha) * PixelColor.BYTE_TO_FLOAT);
+										tcp--;
+									}
+									break;
+
+								case TexturePathRenderStyle.Modulate:
+									for(PixelColor* cp = pixels + numpixels - 1; cp >= pixels; cp--)
+									{
+										cp->r = (byte)((cp->r * tcp->r) * PixelColor.BYTE_TO_FLOAT);
+										cp->g = (byte)((cp->g * tcp->g) * PixelColor.BYTE_TO_FLOAT);
+										cp->b = (byte)((cp->b * tcp->b) * PixelColor.BYTE_TO_FLOAT);
+										tcp--;
+									}
+									break;
+
+							}
+
+							source.UnlockBits(texturebmpdata);
+						}
+					}
+
+					patchbmp.UnlockBits(bmpdata);
+				}
+			}
+
+			return patchbmp;
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Data/ImageData.cs b/Source/Core/Data/ImageData.cs
new file mode 100644
index 0000000..afb5e3d
--- /dev/null
+++ b/Source/Core/Data/ImageData.cs
@@ -0,0 +1,579 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Drawing.Imaging;
+using System.IO;
+using System.Runtime.InteropServices;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.IO;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Windows;
+using SlimDX;
+using SlimDX.Direct3D9;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Data
+{
+	public abstract unsafe class ImageData
+	{
+		#region ================== Constants
+		
+		#endregion
+		
+		#region ================== Variables
+		
+		// Properties
+		protected string name;
+		protected long longname;
+		protected int width;
+		protected int height;
+		protected Vector2D scale;
+		protected bool worldpanning;
+		private bool usecolorcorrection;
+		protected string filepathname; //mxd. Absolute path to the image;
+		protected string shortname; //mxd. Name in uppercase and clamped to DataManager.CLASIC_IMAGE_NAME_LENGTH
+		protected string virtualname; //mxd. Path of this name is used in TextureBrowserForm
+		protected string displayname; //mxd. Name to display in TextureBrowserForm
+		protected bool isFlat; //mxd. if false, it's a texture
+		protected bool istranslucent; //mxd
+		protected bool hasLongName; //mxd. Texture name is longer than DataManager.CLASIC_IMAGE_NAME_LENGTH
+		protected bool hasPatchWithSameName; //mxd
+		protected int level; //mxd. Folder depth of this item
+
+		//mxd. Hashing
+		private static int hashcounter;
+		private readonly int hashcode;
+		
+		// Loading
+		private volatile ImageLoadState previewstate;
+		private volatile ImageLoadState imagestate;
+		private volatile int previewindex;
+		protected volatile bool loadfailed;
+		private volatile bool allowunload;
+		
+		// References
+		private volatile bool usedinmap;
+		private volatile int references;
+		
+		// GDI bitmap
+		protected Bitmap bitmap;
+		
+		// Direct3D texture
+		private int mipmaplevels;	// 0 = all mipmaps
+		protected bool dynamictexture;
+		private Texture texture;
+		
+		// Disposing
+		protected bool isdisposed;
+		
+		#endregion
+		
+		#region ================== Properties
+		
+		public string Name { get { return name; } }
+		public long LongName { get { return longname; } }
+		public string ShortName { get { return shortname; } } //mxd
+		public string FilePathName { get { return filepathname; } } //mxd
+		public string VirtualName { get { return virtualname; } } //mxd
+		public string DisplayName { get { return displayname; } } //mxd
+		public bool IsFlat { get { return isFlat; } } //mxd
+		public bool IsTranslucent { get { return istranslucent; } } //mxd
+		public bool HasPatchWithSameName { get { return hasPatchWithSameName; } } //mxd
+		internal bool HasLongName { get { return hasLongName; } } //mxd
+		public bool UseColorCorrection { get { return usecolorcorrection; } set { usecolorcorrection = value; } }
+		public Texture Texture { get { lock(this) { return texture; } } }
+		public bool IsPreviewLoaded { get { return (previewstate == ImageLoadState.Ready); } }
+		public bool IsImageLoaded { get { return (imagestate == ImageLoadState.Ready); } }
+		public bool LoadFailed { get { return loadfailed; } }
+		public bool IsDisposed { get { return isdisposed; } }
+		public bool AllowUnload { get { return allowunload; } set { allowunload = value; } }
+		public ImageLoadState ImageState { get { return imagestate; } internal set { imagestate = value; } }
+		public ImageLoadState PreviewState { get { return previewstate; } internal set { previewstate = value; } }
+		public bool IsReferenced { get { return (references > 0) || usedinmap; } }
+		public bool UsedInMap { get { return usedinmap; } }
+		public int MipMapLevels { get { return mipmaplevels; } set { mipmaplevels = value; } }
+		public int Width { get { return width; } }
+		public int Height { get { return height; } }
+		internal int PreviewIndex { get { return previewindex; } set { previewindex = value; } }
+		//mxd. Scaled texture size is integer in ZDoom.
+		public float ScaledWidth { get { return (float)Math.Round(width * scale.x); } }
+		public float ScaledHeight { get { return (float)Math.Round(height * scale.y); } }
+		public Vector2D Scale { get { return scale; } }
+		public bool WorldPanning { get { return worldpanning; } }
+		public int Level { get { return level; } } //mxd
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		protected ImageData()
+		{
+			// Defaults
+			usecolorcorrection = true;
+			allowunload = true;
+
+			//mxd. Hashing
+			hashcode = hashcounter++;
+		}
+
+		// Destructor
+		~ImageData()
+		{
+			this.Dispose();
+		}
+		
+		// Disposer
+		public virtual void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				lock(this)
+				{
+					// Clean up
+					if(bitmap != null) bitmap.Dispose();
+					if(texture != null) texture.Dispose();
+					bitmap = null;
+					texture = null;
+					
+					// Done
+					usedinmap = false;
+					imagestate = ImageLoadState.None;
+					previewstate = ImageLoadState.None;
+					isdisposed = true;
+				}
+			}
+		}
+		
+		#endregion
+		
+		#region ================== Management
+		
+		// This sets the status of the texture usage in the map
+		internal void SetUsedInMap(bool used)
+		{
+			if(used != usedinmap)
+			{
+				usedinmap = used;
+				General.Map.Data.ProcessImage(this);
+			}
+		}
+		
+		// This adds a reference
+		public void AddReference()
+		{
+			references++;
+			if(references == 1) General.Map.Data.ProcessImage(this);
+		}
+		
+		// This removes a reference
+		public void RemoveReference()
+		{
+			references--;
+			if(references < 0) General.Fail("FAIL! (references < 0) Somewhere this image is dereferenced more than it was referenced.");
+			if(references == 0) General.Map.Data.ProcessImage(this);
+		}
+		
+		// This sets the name
+		protected virtual void SetName(string name)
+		{
+			this.name = name;
+			this.filepathname = name; //mxd
+			this.shortname = name; //mxd
+			this.virtualname = name; //mxd
+			this.displayname = name; //mxd
+			this.longname = Lump.MakeLongName(name); //mxd
+		}
+		
+		// This unloads the image
+		public virtual void UnloadImage()
+		{
+			lock(this)
+			{
+				if(bitmap != null) bitmap.Dispose();
+				bitmap = null;
+				imagestate = ImageLoadState.None;
+			}
+		}
+
+		// This returns the bitmap image
+		public Bitmap GetBitmap()
+		{
+			lock(this)
+			{
+				// Image loaded successfully?
+				if(!loadfailed && (imagestate == ImageLoadState.Ready) && (bitmap != null))
+					return bitmap;
+				
+				// Image loading failed?
+				return (loadfailed ? Properties.Resources.Failed : Properties.Resources.Hourglass);
+			}
+		}
+		
+		// This loads the image
+		public virtual void LoadImage()
+		{
+			// Do the loading
+			LocalLoadImage();
+
+			// Notify the main thread about the change so that sectors can update their buffers
+			IntPtr strptr = Marshal.StringToCoTaskMemAuto(this.name);
+			General.SendMessage(General.MainWindow.Handle, (int)MainForm.ThreadMessages.ImageDataLoaded, strptr.ToInt32(), 0);
+		}
+		
+		// This requests loading the image
+		protected virtual void LocalLoadImage()
+		{
+			lock(this)
+			{
+				// Bitmap loaded successfully?
+				if(bitmap != null)
+				{
+					// Bitmap has incorrect format?
+					if(bitmap.PixelFormat != PixelFormat.Format32bppArgb)
+					{
+						if(dynamictexture)
+							throw new Exception("Dynamic images must be in 32 bits ARGB format.");
+						
+						//General.ErrorLogger.Add(ErrorType.Warning, "Image '" + name + "' does not have A8R8G8B8 pixel format. Conversion was needed.");
+						Bitmap oldbitmap = bitmap;
+						try
+						{
+							// Convert to desired pixel format
+							bitmap = new Bitmap(oldbitmap.Size.Width, oldbitmap.Size.Height, PixelFormat.Format32bppArgb);
+							Graphics g = Graphics.FromImage(bitmap);
+							g.PageUnit = GraphicsUnit.Pixel;
+							g.CompositingQuality = CompositingQuality.HighQuality;
+							g.InterpolationMode = InterpolationMode.NearestNeighbor;
+							g.SmoothingMode = SmoothingMode.None;
+							g.PixelOffsetMode = PixelOffsetMode.None;
+							g.Clear(Color.Transparent);
+							g.DrawImage(oldbitmap, 0, 0, oldbitmap.Size.Width, oldbitmap.Size.Height);
+							g.Dispose();
+							oldbitmap.Dispose();
+						}
+						catch(Exception e)
+						{
+							bitmap = oldbitmap;
+							General.ErrorLogger.Add(ErrorType.Warning, "Cannot lock image '" + name + "' for pixel format conversion. The image may not be displayed correctly.\n" + e.GetType().Name + ": " + e.Message);
+						}
+					}
+					
+					// This applies brightness correction on the image
+					if(usecolorcorrection)
+					{
+						BitmapData bmpdata = null;
+						
+						try
+						{
+							// Try locking the bitmap
+							bmpdata = bitmap.LockBits(new Rectangle(0, 0, bitmap.Size.Width, bitmap.Size.Height), ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb);
+						}
+						catch(Exception e)
+						{
+							General.ErrorLogger.Add(ErrorType.Warning, "Cannot lock image '" + name + "' for color correction. The image may not be displayed correctly.\n" + e.GetType().Name + ": " + e.Message);
+						}
+
+						// Bitmap locked?
+						if(bmpdata != null)
+						{
+							// Apply color correction
+							PixelColor* pixels = (PixelColor*)(bmpdata.Scan0.ToPointer());
+							General.Colors.ApplyColorCorrection(pixels, bmpdata.Width * bmpdata.Height);
+							bitmap.UnlockBits(bmpdata);
+						}
+					}
+				}
+				else
+				{
+					// Loading failed
+					// We still mark the image as ready so that it will
+					// not try loading again until Reload Resources is used
+					loadfailed = true;
+					bitmap = new Bitmap(Properties.Resources.Failed);
+				}
+
+				if(bitmap != null)
+				{
+					width = bitmap.Size.Width;
+					height = bitmap.Size.Height;
+
+					if(dynamictexture)
+					{
+						if((width != General.NextPowerOf2(width)) || (height != General.NextPowerOf2(height)))
+							throw new Exception("Dynamic images must have a size in powers of 2.");
+					}
+
+					// Do we still have to set a scale?
+					if((scale.x == 0.0f) && (scale.y == 0.0f))
+					{
+						if((General.Map != null) && (General.Map.Config != null))
+						{
+							scale.x = General.Map.Config.DefaultTextureScale;
+							scale.y = General.Map.Config.DefaultTextureScale;
+						}
+						else
+						{
+							scale.x = 1.0f;
+							scale.y = 1.0f;
+						}
+					}
+
+					//mxd. Calculate average color?
+					if(General.Map != null && General.Map.Data != null && General.Map.Data.GlowingFlats != null && 
+					   General.Map.Data.GlowingFlats.ContainsKey(longname) &&
+					   General.Map.Data.GlowingFlats[longname].CalculateTextureColor)
+					{
+						BitmapData bmpdata = null;
+						try { bmpdata = bitmap.LockBits(new Rectangle(0, 0, bitmap.Size.Width, bitmap.Size.Height), ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb); }
+						catch(Exception e) { General.ErrorLogger.Add(ErrorType.Error, "Cannot lock image '" + this.filepathname + "' for glow color calculation. " + e.GetType().Name + ": " + e.Message); }
+
+						if(bmpdata != null)
+						{
+							PixelColor* pixels = (PixelColor*) (bmpdata.Scan0.ToPointer());
+							int numpixels = bmpdata.Width * bmpdata.Height;
+							uint r = 0;
+							uint g = 0;
+							uint b = 0;
+
+							for(PixelColor* cp = pixels + numpixels - 1; cp >= pixels; cp--)
+							{
+								r += cp->r;
+								g += cp->g;
+								b += cp->b;
+
+								// Also check alpha
+								if(cp->a > 0 && cp->a < 255) istranslucent = true;
+							}
+
+							// Update glow data
+							int br = (int)(r / numpixels);
+							int bg = (int)(g / numpixels);
+							int bb = (int)(b / numpixels);
+
+							int max = Math.Max(br, Math.Max(bg, bb));
+							
+							// Black can't glow...
+							if(max == 0)
+							{
+								General.Map.Data.GlowingFlats.Remove(longname);
+							}
+							else
+							{
+								// That's how it's done in GZDoom (and I may be totally wrong about this)
+								br = Math.Min(255, br * 153 / max);
+								bg = Math.Min(255, bg * 153 / max);
+								bb = Math.Min(255, bb * 153 / max);
+								
+								General.Map.Data.GlowingFlats[longname].Color = new PixelColor(255, (byte)br, (byte)bg, (byte)bb);
+								General.Map.Data.GlowingFlats[longname].CalculateTextureColor = false;
+								if(!General.Map.Data.GlowingFlats[longname].Fullbright)
+									General.Map.Data.GlowingFlats[longname].Brightness = (br + bg + bb) / 3;
+							}
+
+							// Release the data
+							bitmap.UnlockBits(bmpdata);
+						}
+					}
+					//mxd. Check if the texture is translucent
+					else
+					{
+						BitmapData bmpdata = null;
+						try { bmpdata = bitmap.LockBits(new Rectangle(0, 0, bitmap.Size.Width, bitmap.Size.Height), ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb); }
+						catch(Exception e) { General.ErrorLogger.Add(ErrorType.Error, "Cannot lock image '" + this.filepathname + "' for translucency check. " + e.GetType().Name + ": " + e.Message); }
+
+						if(bmpdata != null)
+						{
+							PixelColor* pixels = (PixelColor*)(bmpdata.Scan0.ToPointer());
+							int numpixels = bmpdata.Width * bmpdata.Height;
+
+							for(PixelColor* cp = pixels + numpixels - 1; cp >= pixels; cp--)
+							{
+								// Check alpha
+								if(cp->a > 0 && cp->a < 255)
+								{
+									istranslucent = true;
+									break;
+								}
+							}
+
+							// Release the data
+							bitmap.UnlockBits(bmpdata);
+						}
+					}
+				}
+				
+				// Image is ready
+				imagestate = ImageLoadState.Ready;
+			}
+		}
+		
+		// This creates the Direct3D texture
+		public virtual void CreateTexture()
+		{
+			lock(this)
+			{
+				// Only do this when texture is not created yet
+				if(((texture == null) || (texture.Disposed)) && this.IsImageLoaded && !loadfailed)
+				{
+					Image img = bitmap;
+					if(loadfailed) img = Properties.Resources.Failed;
+					
+					// Write to memory stream and read from memory
+					MemoryStream memstream = new MemoryStream((img.Size.Width * img.Size.Height * 4) + 4096);
+					img.Save(memstream, ImageFormat.Bmp);
+					memstream.Seek(0, SeekOrigin.Begin);
+					if(dynamictexture)
+					{
+						texture = Texture.FromStream(General.Map.Graphics.Device, memstream, (int)memstream.Length,
+										img.Size.Width, img.Size.Height, mipmaplevels, Usage.Dynamic, Format.A8R8G8B8,
+										Pool.Default, General.Map.Graphics.PostFilter, General.Map.Graphics.MipGenerateFilter, 0);
+					}
+					else
+					{
+						texture = Texture.FromStream(General.Map.Graphics.Device, memstream, (int)memstream.Length,
+										img.Size.Width, img.Size.Height, mipmaplevels, Usage.None, Format.Unknown,
+										Pool.Managed, General.Map.Graphics.PostFilter, General.Map.Graphics.MipGenerateFilter, 0);
+					}
+					memstream.Dispose();
+					
+					if(dynamictexture)
+					{
+						if((width != texture.GetLevelDescription(0).Width) || (height != texture.GetLevelDescription(0).Height))
+							throw new Exception("Could not create a texture with the same size as the image.");
+					}
+				}
+			}
+		}
+
+		// This updates a dynamic texture
+		public void UpdateTexture()
+		{
+			if(!dynamictexture)
+				throw new Exception("The image must be a dynamic image to support direct updating.");
+			
+			lock(this)
+			{
+				if((texture != null) && !texture.Disposed)
+				{
+					// Lock the bitmap and texture
+					BitmapData bmpdata = bitmap.LockBits(new Rectangle(0, 0, bitmap.Size.Width, bitmap.Size.Height), ImageLockMode.ReadOnly, PixelFormat.Format32bppArgb);
+					DataRectangle texdata = texture.LockRectangle(0, LockFlags.Discard);
+
+					// Copy data
+					int* bp = (int*)bmpdata.Scan0.ToPointer();
+					int* tp = (int*)texdata.Data.DataPointer.ToPointer();
+					for(int y = 0; y < bmpdata.Height; y++)
+					{
+						for(int x = 0; x < bmpdata.Width; x++)
+						{
+							*tp = *bp;
+							bp++;
+							tp++;
+						}
+
+						// Skip extra data in texture
+						int extrapitch = (texdata.Pitch >> 2) - bmpdata.Width;
+						tp += extrapitch;
+					}
+
+					// Unlock
+					texture.UnlockRectangle(0);
+					bitmap.UnlockBits(bmpdata);
+				}
+			}
+		}
+		
+		// This destroys the Direct3D texture
+		public void ReleaseTexture()
+		{
+			lock(this)
+			{
+				// Trash it
+				if(texture != null) texture.Dispose();
+				texture = null;
+			}
+		}
+
+		// This draws a preview
+		public virtual void DrawPreview(Graphics target, Point targetpos)
+		{
+			lock(this)
+			{
+				// Preview ready?
+				if(!loadfailed && (previewstate == ImageLoadState.Ready))
+				{
+					// Draw preview
+					General.Map.Data.Previews.DrawPreview(previewindex, target, targetpos);
+				}
+				// Loading failed?
+				else if(loadfailed)
+				{
+					// Draw error bitmap
+					targetpos = new Point(targetpos.X + ((General.Map.Data.Previews.MaxImageWidth - Properties.Resources.Hourglass.Width) >> 1),
+										  targetpos.Y + ((General.Map.Data.Previews.MaxImageHeight - Properties.Resources.Hourglass.Height) >> 1));
+					target.DrawImageUnscaled(Properties.Resources.Failed, targetpos);
+				}
+				else
+				{
+					// Draw loading bitmap
+					targetpos = new Point(targetpos.X + ((General.Map.Data.Previews.MaxImageWidth - Properties.Resources.Hourglass.Width) >> 1),
+										  targetpos.Y + ((General.Map.Data.Previews.MaxImageHeight - Properties.Resources.Hourglass.Height) >> 1));
+					target.DrawImageUnscaled(Properties.Resources.Hourglass, targetpos);
+				}
+			}
+		}
+		
+		// This returns a preview image
+		public virtual Image GetPreview()
+		{
+			lock(this)
+			{
+				// Preview ready?
+				if(previewstate == ImageLoadState.Ready)
+				{
+					// Make a copy
+					return General.Map.Data.Previews.GetPreviewCopy(previewindex);
+				}
+				
+				// Loading failed?
+				if(loadfailed)
+				{
+					// Return error bitmap
+					return Properties.Resources.Failed;
+				}
+
+				// Return loading bitmap
+				return Properties.Resources.Hourglass;
+			}
+		}
+
+		//mxd. This greatly speeds up Dictionary lookups
+		public override int GetHashCode()
+		{
+			return hashcode;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Data/ImageDataFormat.cs b/Source/Core/Data/ImageDataFormat.cs
new file mode 100644
index 0000000..539244c
--- /dev/null
+++ b/Source/Core/Data/ImageDataFormat.cs
@@ -0,0 +1,132 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.IO;
+using CodeImp.DoomBuilder.IO;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Data
+{
+	internal static class ImageDataFormat
+	{
+		// Input guess formats
+		public const int UNKNOWN = 0;			// No clue.
+		public const int DOOMPICTURE = 1;		// Could be Doom Picture format	(column list rendered data)
+		public const int DOOMFLAT = 2;			// Could be Doom Flat format	(raw 8-bit pixel data)
+		public const int DOOMCOLORMAP = 3;		// Could be Doom Colormap format (raw 8-bit pixel palette mapping)
+		
+		// File format signatures
+		private static readonly int[] PNG_SIGNATURE = new[] { 137, 80, 78, 71, 13, 10, 26, 10 };
+		private static readonly int[] GIF_SIGNATURE = new[] { 71, 73, 70 };
+		private static readonly int[] BMP_SIGNATURE = new[] { 66, 77 }; 
+		private static readonly int[] DDS_SIGNATURE = new[] { 68, 68, 83, 32 };
+		private static readonly int[] JPG_SIGNATURE = new[] { 255, 216, 255 }; //mxd
+		private static readonly int[] TGA_SIGNATURE = new[] { 0, 0, 2, 0 }; //mxd
+		private static readonly int[] PCX_SIGNATURE = new[] { 10, 5, 1, 8 }; //mxd
+
+		// This check image data and returns the appropriate image reader
+		public static IImageReader GetImageReader(Stream data, int guessformat, Playpal palette)
+		{
+			if(data == null) return new UnknownImageReader(); //mxd
+			
+			// Data long enough to check for signatures?
+			if(data.Length > 10) 
+			{
+				// Check for PNG signature
+				data.Seek(0, SeekOrigin.Begin);
+				if(CheckSignature(data, PNG_SIGNATURE))
+					return new FileImageReader(DevilImageType.IL_PNG);
+
+				// Check for DDS signature
+				data.Seek(0, SeekOrigin.Begin);
+				if(CheckSignature(data, DDS_SIGNATURE))
+					return new FileImageReader(DevilImageType.IL_DDS);
+
+				// Check for GIF signature
+				data.Seek(0, SeekOrigin.Begin);
+				if(CheckSignature(data, GIF_SIGNATURE))
+					return new UnknownImageReader(); //mxd. Not supported by (G)ZDoom
+
+				//mxd. Check for PCX signature
+				data.Seek(0, SeekOrigin.Begin);
+				if(CheckSignature(data, PCX_SIGNATURE))
+					return new FileImageReader(DevilImageType.IL_PCX);
+
+				//mxd. Check for JPG signature
+				data.Seek(0, SeekOrigin.Begin);
+				if(CheckSignature(data, JPG_SIGNATURE))
+					return new FileImageReader(DevilImageType.IL_JPG);
+
+				//mxd. Check for TGA signature
+				data.Seek(0, SeekOrigin.Begin);
+				if(CheckSignature(data, TGA_SIGNATURE))
+					return new FileImageReader(DevilImageType.IL_TGA);
+
+				// Check for BMP signature
+				data.Seek(0, SeekOrigin.Begin);
+				if(CheckSignature(data, BMP_SIGNATURE))
+					return new UnknownImageReader(); //mxd. Not supported by (G)ZDoom
+			}
+				
+			// Could it be a doom picture?
+			switch(guessformat) 
+			{
+				case DOOMPICTURE:
+					// Check if data is valid for a doom picture
+					data.Seek(0, SeekOrigin.Begin);
+					DoomPictureReader picreader = new DoomPictureReader(palette);
+					if(picreader.Validate(data)) return picreader;
+					break;
+
+				case DOOMFLAT:
+					// Check if data is valid for a doom flat
+					data.Seek(0, SeekOrigin.Begin);
+					DoomFlatReader flatreader = new DoomFlatReader(palette);
+					if(flatreader.Validate(data)) return flatreader;
+					break;
+
+				case DOOMCOLORMAP:
+					// Check if data is valid for a doom colormap
+					data.Seek(0, SeekOrigin.Begin);
+					DoomColormapReader colormapreader = new DoomColormapReader(palette);
+					if(colormapreader.Validate(data)) return colormapreader;
+					break;
+			}
+			
+			// Format not supported
+			return new UnknownImageReader();
+		}
+
+		// This checks a signature as byte array
+		// NOTE: Expects the stream position to be at the start of the
+		// signature, and expects the stream to be long enough.
+		private static bool CheckSignature(Stream data, int[] sig)
+		{
+			// Go for all bytes
+			foreach(int s in sig)
+			{
+				// When byte doesnt match the signature, leave
+				if(data.ReadByte() != s) return false;
+			}
+
+			// Signature matches
+			return true;
+		}
+	}
+}
diff --git a/Source/Core/Data/ImageLoadState.cs b/Source/Core/Data/ImageLoadState.cs
new file mode 100644
index 0000000..61349e5
--- /dev/null
+++ b/Source/Core/Data/ImageLoadState.cs
@@ -0,0 +1,30 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Data
+{
+	public enum ImageLoadState : int
+	{
+		None,
+		Loading,
+		Ready,
+		Unloading
+	}
+}
diff --git a/Source/Core/Data/PK3FileImage.cs b/Source/Core/Data/PK3FileImage.cs
new file mode 100644
index 0000000..33da887
--- /dev/null
+++ b/Source/Core/Data/PK3FileImage.cs
@@ -0,0 +1,163 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.IO;
+using CodeImp.DoomBuilder.Controls;
+using CodeImp.DoomBuilder.IO;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Data
+{
+	public sealed class PK3FileImage : ImageData
+	{
+		#region ================== Variables
+
+		private readonly PK3Reader datareader;
+		private readonly int probableformat;
+		
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		internal PK3FileImage(PK3Reader datareader, string filepathname, bool asflat)
+		{
+			// Initialize
+			this.datareader = datareader;
+			this.isFlat = asflat; //mxd
+			SetName(filepathname);
+
+			if(asflat)
+			{
+				probableformat = ImageDataFormat.DOOMFLAT;
+				this.scale.x = General.Map.Config.DefaultFlatScale;
+				this.scale.y = General.Map.Config.DefaultFlatScale;
+			}
+			else
+			{
+				probableformat = ImageDataFormat.DOOMPICTURE;
+				this.scale.x = General.Map.Config.DefaultTextureScale;
+				this.scale.y = General.Map.Config.DefaultTextureScale;
+			}
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		//mxd: filepathname is relative path to the image ("Textures\sometexture.png")
+		protected override void SetName(string filepathname) 
+		{
+			if(!General.Map.Config.UseLongTextureNames || string.IsNullOrEmpty(Path.GetDirectoryName(filepathname))) 
+			{
+				this.name = Path.GetFileNameWithoutExtension(filepathname.ToUpperInvariant());
+				if(this.name.Length > DataManager.CLASIC_IMAGE_NAME_LENGTH)
+				{
+					this.name = this.name.Substring(0, DataManager.CLASIC_IMAGE_NAME_LENGTH);
+				}
+				this.displayname = this.name;
+				this.shortname = this.name;
+			} 
+			else 
+			{
+				this.name = filepathname.Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
+				this.displayname = Path.GetFileNameWithoutExtension(name);
+				this.shortname = this.displayname.ToUpperInvariant();
+				if(this.shortname.Length > DataManager.CLASIC_IMAGE_NAME_LENGTH)
+				{
+					this.shortname = this.shortname.Substring(0, DataManager.CLASIC_IMAGE_NAME_LENGTH);
+				}
+				this.hasLongName = true;
+			}
+
+			this.longname = Lump.MakeLongName(this.name);
+			this.virtualname = filepathname.Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
+			this.filepathname = filepathname;
+			this.level = virtualname.Split(new[] { Path.AltDirectorySeparatorChar }).Length - 1;
+
+			if(General.Settings.CapitalizeTextureNames && !string.IsNullOrEmpty(this.displayname)) 
+			{
+				this.displayname = this.displayname.ToUpperInvariant();
+			}
+
+			if(this.displayname.Length > ImageBrowserItem.MAX_NAME_LENGTH) 
+			{
+				this.displayname = this.displayname.Substring(0, ImageBrowserItem.MAX_NAME_LENGTH);
+			}
+		}
+
+		// This loads the image
+		protected override void LocalLoadImage()
+		{
+			// Leave when already loaded
+			if(this.IsImageLoaded) return;
+
+			lock(this)
+			{
+				// Load file data
+				if(bitmap != null) bitmap.Dispose(); bitmap = null;
+				MemoryStream filedata = datareader.LoadFile(filepathname); //mxd
+				
+				if(filedata != null)
+				{
+					// Get a reader for the data
+					IImageReader reader = ImageDataFormat.GetImageReader(filedata, probableformat, General.Map.Data.Palette);
+					if(!(reader is UnknownImageReader))
+					{
+						// Load the image
+						filedata.Seek(0, SeekOrigin.Begin);
+						try
+						{
+							bitmap = reader.ReadAsBitmap(filedata);
+						}
+						catch (InvalidDataException)
+						{
+							// Data cannot be read!
+							bitmap = null;
+						}
+					}
+
+					// Not loaded?
+					if(bitmap == null)
+					{
+						General.ErrorLogger.Add(ErrorType.Error, "Image file '" + filepathname + "' data format could not be read, while loading texture '" + this.Name + "'");
+						loadfailed = true;
+					}
+					else
+					{
+						// Get width and height from image
+						width = bitmap.Size.Width;
+						height = bitmap.Size.Height;
+					}
+
+					filedata.Dispose();
+				}
+
+				// Pass on to base
+				base.LocalLoadImage();
+			}
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Data/PK3Reader.cs b/Source/Core/Data/PK3Reader.cs
new file mode 100644
index 0000000..9069d01
--- /dev/null
+++ b/Source/Core/Data/PK3Reader.cs
@@ -0,0 +1,496 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using CodeImp.DoomBuilder.IO;
+using SharpCompress.Archive; //mxd
+using SharpCompress.Common; //mxd
+using SharpCompress.Reader; //mxd
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Data
+{
+	internal sealed class PK3Reader : PK3StructuredReader
+	{
+		#region ================== Variables
+
+		private readonly DirectoryFilesList files;
+		private IArchive archive; //mxd
+		private readonly ArchiveType archivetype; //mxd
+		private readonly Dictionary<string, byte[]> sevenzipentries; //mxd
+		private bool bathmode = true; //mxd
+
+		#endregion
+
+		#region ================== Properties (mxd)
+
+		public bool BathMode { get { return bathmode; } set { bathmode = value; UpdateArchive(bathmode); } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public PK3Reader(DataLocation dl) : base(dl)
+		{
+			General.WriteLogLine("Opening " + Path.GetExtension(location.location).ToUpper().Replace(".", "") + " resource '" + location.location + "'");
+
+			if(!File.Exists(location.location))
+				throw new FileNotFoundException("Could not find the file \"" + location.location + "\"", location.location);
+
+			// Make list of all files
+			List<DirectoryFileEntry> fileentries = new List<DirectoryFileEntry>();
+
+			// Create archive
+			archive = ArchiveFactory.Open(location.location, Options.KeepStreamsOpen);
+			archivetype = archive.Type;
+
+			// Random access of 7z archives works TERRIBLY slow in SharpCompress
+			if(archivetype == ArchiveType.SevenZip) 
+			{
+				sevenzipentries = new Dictionary<string, byte[]>(StringComparer.Ordinal);
+
+				IReader reader = archive.ExtractAllEntries();
+				while(reader.MoveToNextEntry()) 
+				{
+					if(reader.Entry.IsDirectory || !CheckInvalidPathChars(reader.Entry.Key)) continue;
+
+					MemoryStream s = new MemoryStream();
+					reader.WriteEntryTo(s);
+					sevenzipentries.Add(reader.Entry.Key.ToLowerInvariant(), s.ToArray());
+					fileentries.Add(new DirectoryFileEntry(reader.Entry.Key));
+				}
+			} 
+			else 
+			{
+				foreach(IArchiveEntry entry in archive.Entries) 
+				{
+					if(!entry.IsDirectory && CheckInvalidPathChars(entry.Key))
+						fileentries.Add(new DirectoryFileEntry(entry.Key));
+				}
+			}
+
+			// Get rid of archive
+			archive.Dispose();
+			archive = null;
+
+			// Make files list
+			files = new DirectoryFilesList(fileentries);
+			
+			// Initialize without path (because we use paths relative to the PK3 file)
+			Initialize();
+
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Disposer
+		public override void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				General.WriteLogLine("Closing " + Path.GetExtension(location.location).ToUpper().Replace(".", "") + " resource '" + location.location + "'");
+				
+				//mxd
+				if(archive != null)
+				{
+					archive.Dispose();
+					archive = null;
+				}
+
+				// Done
+				base.Dispose();
+			}
+		}
+
+		//mxd
+		private void UpdateArchive(bool enable) 
+		{
+			if(archivetype == ArchiveType.SevenZip) return;
+
+			if(enable && archive == null)
+			{
+				archive = ArchiveFactory.Open(location.location);
+			} 
+			else if(!enable && !bathmode && archive != null)
+			{
+				archive.Dispose();
+				archive = null;
+			}
+		}
+
+		#endregion
+
+		#region ================== Textures
+
+		// This finds and returns a patch stream
+		public override Stream GetPatchData(string pname, bool longname)
+		{
+			// Error when suspended
+			if(issuspended) throw new Exception("Data reader is suspended");
+
+			// Find in any of the wad files
+			// Note the backward order, because the last wad's images have priority
+			if(!longname) //mxd. Patches with long names can't be in wads
+			{
+				for(int i = wads.Count - 1; i >= 0; i--)
+				{
+					Stream data = wads[i].GetPatchData(pname, false);
+					if(data != null) return data;
+				}
+			}
+			else
+			{
+				//mxd. Long names are absolute
+				return (FileExists(pname) ? LoadFile(pname) : null);
+			}
+
+			if(General.Map.Config.MixTexturesFlats)
+			{
+				//mxd. Find in directories ZDoom expects them to be
+				foreach(string loc in PatchLocations)
+				{
+					string filename = FindFirstFile(loc, pname, true);
+					if((filename != null) && FileExists(filename)) 
+						return LoadFile(filename);
+				}
+			}
+			else
+			{
+				// Find in patches directory
+				string filename = FindFirstFile(PATCHES_DIR, pname, true);
+				if((filename != null) && FileExists(filename))
+					return LoadFile(filename);
+			}
+
+			// Nothing found
+			return null;
+		}
+
+		// This finds and returns a textue stream
+		public override Stream GetTextureData(string pname, bool longname)
+		{
+			// Error when suspended
+			if(issuspended) throw new Exception("Data reader is suspended");
+
+			// Find in any of the wad files
+			// Note the backward order, because the last wad's images have priority
+			if(!longname) //mxd. Textures with long names can't be in wads
+			{
+				for(int i = wads.Count - 1; i >= 0; i--)
+				{
+					Stream data = wads[i].GetTextureData(pname, false);
+					if(data != null) return data;
+				}
+			}
+			else
+			{
+				//mxd. Long names are absolute
+				return (FileExists(pname) ? LoadFile(pname) : null);
+			}
+
+			// Find in textures directory
+			string filename = FindFirstFile(TEXTURES_DIR, pname, true);
+			if(!string.IsNullOrEmpty(filename) && FileExists(filename))
+				return LoadFile(filename);
+
+			// Nothing found
+			return null;
+		}
+
+		// This finds and returns a colormap stream
+		public override Stream GetColormapData(string pname)
+		{
+			// Error when suspended
+			if(issuspended) throw new Exception("Data reader is suspended");
+
+			// Find in any of the wad files
+			// Note the backward order, because the last wad's images have priority
+			for(int i = wads.Count - 1; i >= 0; i--)
+			{
+				Stream data = wads[i].GetColormapData(pname);
+				if(data != null) return data;
+			}
+
+			// Find in patches directory
+			string filename = FindFirstFile(COLORMAPS_DIR, pname, true);
+			if((filename != null) && FileExists(filename))
+			{
+				return LoadFile(filename);
+			}
+
+			// Nothing found
+			return null;
+		}
+
+		#endregion
+
+		#region ================== Sprites
+
+		// This finds and returns a sprite stream
+		public override Stream GetSpriteData(string pname)
+		{
+			string pfilename = pname.Replace('\\', '^');
+
+			// Error when suspended
+			if(issuspended) throw new Exception("Data reader is suspended");
+
+			// Find in any of the wad files
+			for(int i = wads.Count - 1; i >= 0; i--)
+			{
+				Stream sprite = wads[i].GetSpriteData(pname);
+				if(sprite != null) return sprite;
+			}
+
+			// Find in sprites directory
+			string filename = FindFirstFile(SPRITES_DIR, pfilename, true);
+			if((filename != null) && FileExists(filename))
+			{
+				return LoadFile(filename);
+			}
+
+			// Nothing found
+			return null;
+		}
+
+		// This checks if the given sprite exists
+		public override bool GetSpriteExists(string pname)
+		{
+			// Error when suspended
+			if(issuspended) throw new Exception("Data reader is suspended");
+
+			string pfilename = pname.Replace('\\', '^');
+
+			// Find in any of the wad files
+			for(int i = wads.Count - 1; i >= 0; i--)
+			{
+				if(wads[i].GetSpriteExists(pname)) return true;
+			}
+
+			// Find in sprites directory
+			string filename = FindFirstFile(SPRITES_DIR, pfilename, true);
+			if((filename != null) && FileExists(filename))
+			{
+				return true;
+			}
+
+			// Nothing found
+			return false;
+		}
+
+		#endregion
+
+		#region ================== Voxels (mxd)
+
+		//mxd. This finds and returns a voxel stream or null if no voxel was found
+		public override Stream GetVoxelData(string name) 
+		{
+			// Error when suspended
+			if(issuspended) throw new Exception("Data reader is suspended");
+
+			// Find in any of the wad files
+			for(int i = wads.Count - 1; i >= 0; i--) 
+			{
+				Stream voxel = wads[i].GetVoxelData(name);
+				if(voxel != null) return voxel;
+			}
+
+			string pfilename = name.Replace('\\', '^');
+
+			// Find in sprites directory
+			string filename = FindFirstFile(VOXELS_DIR, pfilename, true);
+			if((filename != null) && FileExists(filename)) 
+			{
+				return LoadFile(filename);
+			}
+
+			// Nothing found
+			return null;
+		}
+
+		#endregion
+		
+		#region ================== Methods
+
+		// Return a short name for this data location
+		public override string GetTitle()
+		{
+			return Path.GetFileName(location.location);
+		}
+
+		// This creates an image
+		protected override ImageData CreateImage(string filename, int imagetype)
+		{
+			switch(imagetype)
+			{
+				case ImageDataFormat.DOOMFLAT:
+					return new PK3FileImage(this, filename, true);
+
+				case ImageDataFormat.DOOMPICTURE:
+					return new PK3FileImage(this, filename, false);
+
+				case ImageDataFormat.DOOMCOLORMAP:
+					return new ColormapImage(Path.GetFileNameWithoutExtension(filename));
+					
+				default:
+					throw new ArgumentException("Invalid image format specified!");
+			}
+		}
+
+		// This returns true if the specified file exists
+		internal override bool FileExists(string filename)
+		{
+			return files.FileExists(filename);
+		}
+
+		// This returns all files in a given directory
+		protected override string[] GetAllFiles(string path, bool subfolders)
+		{
+			return files.GetAllFiles(path, subfolders).ToArray();
+		}
+		
+		// This returns all files in a given directory that have the given title
+		protected override string[] GetAllFilesWithTitle(string path, string title, bool subfolders)
+		{
+			return files.GetAllFilesWithTitle(path, title, subfolders).ToArray();
+		}
+
+		//mxd. This returns all files in a given directory which title starts with given title
+		protected override string[] GetAllFilesWhichTitleStartsWith(string path, string title) 
+		{
+			return files.GetAllFilesWhichTitleStartsWith(path, title).ToArray();
+		}
+		
+		// This returns all files in a given directory that match the given extension
+		protected override string[] GetFilesWithExt(string path, string extension, bool subfolders)
+		{
+			return files.GetAllFiles(path, extension, subfolders).ToArray();
+		}
+
+		// This finds the first file that has the specific name, regardless of file extension
+		protected override string FindFirstFile(string beginswith, bool subfolders)
+		{
+			return files.GetFirstFile(beginswith, subfolders);
+		}
+
+		// This finds the first file that has the specific name, regardless of file extension
+		protected override string FindFirstFile(string path, string beginswith, bool subfolders)
+		{
+			return files.GetFirstFile(path, beginswith, subfolders);
+		}
+
+		// This finds the first file that has the specific name
+		protected override string FindFirstFileWithExt(string path, string beginswith, bool subfolders)
+		{
+			string title = Path.GetFileNameWithoutExtension(beginswith);
+			string ext = Path.GetExtension(beginswith);
+			ext = (!string.IsNullOrEmpty(ext) && ext.Length > 1 ? ext.Substring(1) : "");
+			return files.GetFirstFile(path, title, subfolders, ext);
+		}
+
+		// This loads an entire file in memory and returns the stream
+		// NOTE: Callers are responsible for disposing the stream!
+		internal override MemoryStream LoadFile(string filename)
+		{
+			MemoryStream filedata = null;
+			string fn = filename.Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar); //mxd
+
+			//mxd. This works waaaaaay faster with 7z archive
+			if(archivetype == ArchiveType.SevenZip)
+			{
+				fn = fn.ToLowerInvariant();
+				if(sevenzipentries.ContainsKey(fn)) filedata = new MemoryStream(sevenzipentries[fn]);
+			} 
+			else 
+			{
+				lock(this)
+				{
+					UpdateArchive(true);
+
+					foreach(var entry in archive.Entries)
+					{
+						if(entry.IsDirectory) continue;
+
+						// Is this the entry we are looking for?
+						if(string.Compare(entry.Key, fn, true) == 0)
+						{
+							filedata = new MemoryStream();
+							entry.WriteTo(filedata);
+							break;
+						}
+					}
+
+					UpdateArchive(false);
+				}
+			}
+			
+			// Nothing found?
+			if(filedata == null)
+			{
+				//mxd
+				General.ErrorLogger.Add(ErrorType.Error, "Cannot find the file '" + filename + "' in archive '" + location.location + "'.");
+				return null;
+			}
+
+			filedata.Position = 0; //mxd. rewind before use
+			return filedata;
+		}
+
+		// This creates a temp file for the speciied file and return the absolute path to the temp file
+		// NOTE: Callers are responsible for removing the temp file when done!
+		protected override string CreateTempFile(string filename)
+		{
+			// Just copy the file
+			string tempfile = General.MakeTempFilename(General.Map.TempPath, "wad");
+			MemoryStream filedata = LoadFile(filename);
+			File.WriteAllBytes(tempfile, filedata.ToArray());
+			filedata.Dispose();
+			return tempfile;
+		}
+
+		//mxd. This replicates System.IO.Path.CheckInvalidPathChars() internal function
+		private bool CheckInvalidPathChars(string path)
+		{
+			foreach(char c in path)
+			{
+				int num = c;
+				switch(num)
+				{
+					case 34:
+					case 60:
+					case 62:
+					case 124:
+						General.ErrorLogger.Add(ErrorType.Error, "Error in \"" + location.location + "\": unsupported character \"" + c + "\" in path \"" + path + "\". File loading was skipped.");
+						return false;
+
+					default:
+						if(num >= 32) continue;
+						else goto case 34;
+				}
+			}
+
+			return true;
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Data/PK3StructuredReader.cs b/Source/Core/Data/PK3StructuredReader.cs
new file mode 100644
index 0000000..8f4c125
--- /dev/null
+++ b/Source/Core/Data/PK3StructuredReader.cs
@@ -0,0 +1,764 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text.RegularExpressions;
+using CodeImp.DoomBuilder.GZBuilder.Data;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Data
+{
+	internal abstract class PK3StructuredReader : DataReader
+	{
+		#region ================== Constants
+
+		protected const string PATCHES_DIR = "patches";
+		protected const string TEXTURES_DIR = "textures";
+		protected const string FLATS_DIR = "flats";
+		protected const string HIRES_DIR = "hires";
+		protected const string SPRITES_DIR = "sprites";
+		protected const string COLORMAPS_DIR = "colormaps";
+		protected const string GRAPHICS_DIR = "graphics"; //mxd
+		protected const string VOXELS_DIR = "voxels"; //mxd
+		
+		#endregion
+
+		#region ================== Variables
+		
+		// Source
+		protected bool roottextures;
+		protected bool rootflats;
+		
+		// WAD files that must be loaded as well
+		protected List<WADReader> wads;
+		
+		#endregion
+
+		#region ================== Properties
+
+		protected readonly string[] PatchLocations = { PATCHES_DIR, TEXTURES_DIR, FLATS_DIR, SPRITES_DIR, GRAPHICS_DIR }; //mxd. Because ZDoom looks for patches and sprites in this order
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+		
+		// Constructor
+		protected PK3StructuredReader(DataLocation dl) : base(dl)
+		{
+			// Initialize
+			this.roottextures = dl.option1;
+			this.rootflats = dl.option2;
+		}
+		
+		// Call this to initialize this class
+		protected virtual void Initialize()
+		{
+			// Load all WAD files in the root as WAD resources
+			string[] wadfiles = GetFilesWithExt("", "wad", false);
+			wads = new List<WADReader>(wadfiles.Length);
+			foreach(string w in wadfiles)
+			{
+				string tempfile = CreateTempFile(w);
+				DataLocation wdl = new DataLocation(DataLocation.RESOURCE_WAD, tempfile, false, false, true);
+				wads.Add(new WADReader(wdl));
+			}
+		}
+		
+		// Disposer
+		public override void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Clean up
+				foreach(WADReader wr in wads) wr.Dispose();
+				
+				// Remove temp files
+				foreach(WADReader wr in wads)
+				{
+					try { File.Delete(wr.Location.location); }
+					catch(Exception) { }
+				}
+				
+				// Done
+				base.Dispose();
+			}
+		}
+		
+		#endregion
+		
+		#region ================== Management
+		
+		// This suspends use of this resource
+		public override void Suspend()
+		{
+			foreach(WADReader wr in wads) wr.Suspend();
+			base.Suspend();
+		}
+		
+		// This resumes use of this resource
+		public override void Resume()
+		{
+			foreach(WADReader wr in wads) wr.Resume();
+			base.Resume();
+		}
+		
+		#endregion
+		
+		#region ================== Palette
+
+		// This loads the PLAYPAL palette
+		public override Playpal LoadPalette()
+		{
+			// Error when suspended
+			if(issuspended) throw new Exception("Data reader is suspended");
+			
+			// Palette from wad(s)
+			Playpal palette = null;
+			foreach(WADReader wr in wads)
+			{
+				Playpal wadpalette = wr.LoadPalette();
+				if(wadpalette != null) return wadpalette;
+			}
+			
+			// Find in root directory
+			string foundfile = FindFirstFile("PLAYPAL", false);
+			if((foundfile != null) && FileExists(foundfile))
+			{
+				MemoryStream stream = LoadFile(foundfile);
+
+				if(stream.Length > 767) //mxd
+					palette = new Playpal(stream);
+				else
+					General.ErrorLogger.Add(ErrorType.Warning, "Warning: invalid palette '"+foundfile+"'");
+				stream.Dispose();
+			}
+			
+			// Done
+			return palette;
+		}
+
+		#endregion
+		
+		#region ================== Textures
+
+		// This loads the textures
+		public override ICollection<ImageData> LoadTextures(PatchNames pnames)
+		{
+			// Error when suspended
+			if(issuspended) throw new Exception("Data reader is suspended");
+
+			Dictionary<long, ImageData> images = new Dictionary<long, ImageData>();
+			ICollection<ImageData> collection;
+			
+			// Load from wad files (NOTE: backward order, because the last wad's images have priority)
+			for(int i = wads.Count - 1; i >= 0; i--)
+			{
+				PatchNames wadpnames = wads[i].LoadPatchNames(); //mxd
+				collection = wads[i].LoadTextures((wadpnames != null && wadpnames.Length > 0) ? wadpnames : pnames); //mxd
+				AddImagesToList(images, collection);
+			}
+			
+			// Should we load the images in this directory as textures?
+			if(roottextures)
+			{
+				collection = LoadDirectoryImages("", ImageDataFormat.DOOMPICTURE, false);
+				AddImagesToList(images, collection);
+			}
+			
+			// Load TEXTURE1 lump file
+			List<ImageData> imgset = new List<ImageData>();
+			string texture1file = FindFirstFile("TEXTURE1", false);
+			if((texture1file != null) && FileExists(texture1file))
+			{
+				MemoryStream filedata = LoadFile(texture1file);
+				WADReader.LoadTextureSet("TEXTURE1", filedata, ref imgset, pnames);
+				filedata.Dispose();
+			}
+
+			// Load TEXTURE2 lump file
+			string texture2file = FindFirstFile("TEXTURE2", false);
+			if((texture2file != null) && FileExists(texture2file))
+			{
+				MemoryStream filedata = LoadFile(texture2file);
+				WADReader.LoadTextureSet("TEXTURE2", filedata, ref imgset, pnames);
+				filedata.Dispose();
+			}
+			
+			// Add images from TEXTURE1 and TEXTURE2 lump files
+			AddImagesToList(images, imgset);
+			
+			// Load TEXTURES lump files
+			imgset.Clear();
+			string[] alltexturefiles = GetAllFilesWhichTitleStartsWith("", "TEXTURES"); //mxd
+			foreach(string texturesfile in alltexturefiles)
+			{
+				MemoryStream filedata = LoadFile(texturesfile);
+				WADReader.LoadHighresTextures(filedata, texturesfile, ref imgset, images, null);
+				filedata.Dispose();
+			}
+			
+			// Add images from TEXTURES lump file
+			AddImagesToList(images, imgset);
+
+			//mxd. Add images from texture directory. Textures defined in TEXTURES override ones in "textures" folder
+			collection = LoadDirectoryImages(TEXTURES_DIR, ImageDataFormat.DOOMPICTURE, true);
+			AddImagesToList(images, collection);
+			
+			// Add images to the container-specific texture set
+			foreach(ImageData img in images.Values)
+				textureset.AddTexture(img);
+			
+			return new List<ImageData>(images.Values);
+		}
+		
+		// This returns the patch names from the PNAMES lump
+		// A directory resource does not support this lump, but the wads in the directory may contain this lump
+		public override PatchNames LoadPatchNames()
+		{
+			PatchNames pnames;
+			
+			// Error when suspended
+			if(issuspended) throw new Exception("Data reader is suspended");
+			
+			// Load from wad files
+			// Note the backward order, because the last wad's images have priority
+			for(int i = wads.Count - 1; i >= 0; i--)
+			{
+				pnames = wads[i].LoadPatchNames();
+				if(pnames != null) return pnames;
+			}
+			
+			// If none of the wads provides patch names, let's see if we can
+			string pnamesfile = FindFirstFile("PNAMES", false);
+			if((pnamesfile != null) && FileExists(pnamesfile))
+			{
+				MemoryStream pnamesdata = LoadFile(pnamesfile);
+				pnames = new PatchNames(pnamesdata);
+				pnamesdata.Dispose();
+				return pnames;
+			}
+			
+			return null;
+		}
+		
+		#endregion
+
+		#region ================== Flats
+		
+		// This loads the textures
+		public override ICollection<ImageData> LoadFlats()
+		{
+			Dictionary<long, ImageData> images = new Dictionary<long, ImageData>();
+			ICollection<ImageData> collection;
+			List<ImageData> imgset = new List<ImageData>();
+			
+			// Error when suspended
+			if(issuspended) throw new Exception("Data reader is suspended");
+			
+			// Load from wad files
+			// Note the backward order, because the last wad's images have priority
+			for(int i = wads.Count - 1; i >= 0; i--)
+			{
+				collection = wads[i].LoadFlats();
+				AddImagesToList(images, collection);
+			}
+			
+			// Should we load the images in this directory as flats?
+			if(rootflats)
+			{
+				collection = LoadDirectoryImages("", ImageDataFormat.DOOMFLAT, false);
+				AddImagesToList(images, collection);
+			}
+
+			// Add images from flats directory
+			collection = LoadDirectoryImages(FLATS_DIR, ImageDataFormat.DOOMFLAT, true);
+			AddImagesToList(images, collection);
+
+			// Load TEXTURES lump file
+			string[] alltexturefiles = GetAllFilesWhichTitleStartsWith("", "TEXTURES"); //mxd
+			foreach(string texturesfile in alltexturefiles)
+			{
+				MemoryStream filedata = LoadFile(texturesfile);
+				WADReader.LoadHighresFlats(filedata, texturesfile, ref imgset, null, images);
+				filedata.Dispose();
+			}
+
+			// Add images from TEXTURES lump file
+			AddImagesToList(images, imgset);
+
+			// Add images to the container-specific texture set
+			foreach(ImageData img in images.Values) 
+				textureset.AddFlat(img);
+
+			// Add images from TEXTURES lump file
+			AddImagesToList(images, imgset);
+			
+			return new List<ImageData>(images.Values);
+		}
+
+		//mxd.
+		public override Stream GetFlatData(string pname, bool longname) 
+		{
+			// Error when suspended
+			if(issuspended) throw new Exception("Data reader is suspended");
+
+			// Find in any of the wad files
+			// Note the backward order, because the last wad's images have priority
+			if(!longname) //mxd. Flats with long names can't be in wads
+			{
+				for(int i = wads.Count - 1; i > -1; i--)
+				{
+					Stream data = wads[i].GetFlatData(pname, false);
+					if(data != null) return data;
+				}
+			}
+
+			// Nothing found
+			return null;
+		}
+		
+		#endregion
+
+		#region ================== Sprites
+
+		// This loads the textures
+		public override ICollection<ImageData> LoadSprites()
+		{
+			Dictionary<long, ImageData> images = new Dictionary<long, ImageData>();
+			List<ImageData> imgset = new List<ImageData>();
+			
+			// Error when suspended
+			if(issuspended) throw new Exception("Data reader is suspended");
+			
+			// Load from wad files
+			// Note the backward order, because the last wad's images have priority
+			for(int i = wads.Count - 1; i >= 0; i--)
+			{
+				ICollection<ImageData> collection = wads[i].LoadSprites();
+				AddImagesToList(images, collection);
+			}
+			
+			// Load TEXTURES lump file
+			imgset.Clear();
+			string[] alltexturefiles = GetAllFilesWhichTitleStartsWith("", "TEXTURES"); //mxd
+			foreach(string texturesfile in alltexturefiles)
+			{
+				MemoryStream filedata = LoadFile(texturesfile);
+				WADReader.LoadHighresSprites(filedata, texturesfile, ref imgset, null, null);
+				filedata.Dispose();
+			}
+			
+			// Add images from TEXTURES lump file
+			AddImagesToList(images, imgset);
+			
+			return new List<ImageData>(images.Values);
+		}
+		
+		#endregion
+
+		#region ================== Colormaps
+
+		// This loads the textures
+		public override ICollection<ImageData> LoadColormaps()
+		{
+			Dictionary<long, ImageData> images = new Dictionary<long, ImageData>();
+			ICollection<ImageData> collection;
+
+			// Error when suspended
+			if(issuspended) throw new Exception("Data reader is suspended");
+
+			// Load from wad files
+			// Note the backward order, because the last wad's images have priority
+			for(int i = wads.Count - 1; i >= 0; i--)
+			{
+				collection = wads[i].LoadColormaps();
+				AddImagesToList(images, collection);
+			}
+
+			// Add images from flats directory
+			collection = LoadDirectoryImages(COLORMAPS_DIR, ImageDataFormat.DOOMCOLORMAP, true);
+			AddImagesToList(images, collection);
+
+			// Add images to the container-specific texture set
+			foreach(ImageData img in images.Values)
+				textureset.AddFlat(img);
+
+			return new List<ImageData>(images.Values);
+		}
+
+		#endregion
+
+		#region ================== DECORATE
+
+		// This finds and returns a sprite stream
+		public override Dictionary<string, Stream> GetDecorateData(string pname)
+		{
+			Dictionary<string, Stream> result = new Dictionary<string, Stream>();
+			string[] allfilenames;
+			
+			// Error when suspended
+			if(issuspended) throw new Exception("Data reader is suspended");
+			
+			// Find in root directory
+			string filename = Path.GetFileName(pname);
+			string pathname = Path.GetDirectoryName(pname);
+			
+			if(filename.IndexOf('.') > -1)
+			{
+				string fullName = Path.Combine(pathname, filename);
+				if(FileExists(fullName)) 
+				{
+					allfilenames = new string[1];
+					allfilenames[0] = Path.Combine(pathname, filename);
+				} 
+				else 
+				{
+					allfilenames = new string[0];
+					General.ErrorLogger.Add(ErrorType.Warning, "Unable to load DECORATE file '" + fullName + "'");
+				}
+			}
+			else
+				allfilenames = GetAllFilesWithTitle(pathname, filename, false);
+
+			foreach(string foundfile in allfilenames)
+			{
+				result.Add(foundfile, LoadFile(foundfile));
+			}
+			
+			// Find in any of the wad files
+			for(int i = wads.Count - 1; i >= 0; i--)
+			{
+				Dictionary<string, Stream> wadresult = wads[i].GetDecorateData(pname);
+				foreach(KeyValuePair<string, Stream> group in wadresult)
+				{
+					result.Add(group.Key, group.Value);
+				}
+			}
+
+			return result;
+		}
+
+		#endregion
+
+		#region ================== MODELDEF (mxd)
+
+		//mxd
+		public override Dictionary<string, Stream> GetModeldefData() 
+		{
+			// Error when suspended
+			if(issuspended) throw new Exception("Data reader is suspended");
+
+			// Modedef should be in root folder
+			string[] files = GetAllFiles("", false);
+			Dictionary<string, Stream> streams = new Dictionary<string, Stream>(StringComparer.Ordinal);
+
+			foreach(string s in files) 
+			{
+				if(Path.GetFileNameWithoutExtension(s).ToUpperInvariant().StartsWith("MODELDEF")) 
+					streams.Add(s, LoadFile(s));
+			}
+
+			return streams;
+		}
+
+		#endregion 
+
+		#region ================== VOXELDEF (mxd)
+
+		//mxd. This returns the list of voxels, which can be used without VOXELDEF definition
+		public override IEnumerable<string> GetVoxelNames() 
+		{
+			// Error when suspended
+			if(issuspended) throw new Exception("Data reader is suspended");
+
+			string[] files = GetAllFiles("voxels", false);
+			List<string> voxels = new List<string>();
+			Regex spritename = new Regex(SPRITE_NAME_PATTERN);
+
+			foreach(string t in files)
+			{
+				string s = Path.GetFileNameWithoutExtension(t).ToUpperInvariant();
+				if(spritename.IsMatch(s)) voxels.Add(s);
+			}
+
+			return voxels.ToArray();
+		}
+
+		//mxd
+		public override KeyValuePair<string, Stream> GetVoxeldefData() 
+		{
+			// Error when suspended
+			if(issuspended) throw new Exception("Data reader is suspended");
+
+			//voxeldef should be in root folder
+			string[] files = GetAllFiles("", false);
+
+			foreach(string s in files) 
+			{
+				if(Path.GetFileNameWithoutExtension(s).ToUpperInvariant() == "VOXELDEF") 
+					return new KeyValuePair<string,Stream>(s, LoadFile(s));
+			}
+
+			return new KeyValuePair<string,Stream>();
+		}
+
+		#endregion
+
+		#region ================== (Z)MAPINFO (mxd)
+
+		//mxd
+		public override Dictionary<string, Stream> GetMapinfoData() 
+		{
+			// Error when suspended
+			if(issuspended) throw new Exception("Data reader is suspended");
+
+			//mapinfo should be in root folder
+			Dictionary<string, Stream> streams = new Dictionary<string, Stream>(StringComparer.Ordinal);
+			string[] files = GetAllFiles("", false);
+
+			//try to find (z)mapinfo
+			foreach(string s in files)
+			{
+				string filename = Path.GetFileNameWithoutExtension(s.ToLowerInvariant());
+				if(filename == "zmapinfo" || filename == "mapinfo")
+					streams.Add(s, LoadFile(s));
+			}
+
+			return streams;
+		}
+
+		#endregion
+
+		#region ================== GLDEFS (mxd)
+
+		//mxd
+		public override Dictionary<string, Stream> GetGldefsData(GameType gametype) 
+		{
+			// Error when suspended
+			if(issuspended) throw new Exception("Data reader is suspended");
+
+			Dictionary<string, Stream> streams = new Dictionary<string, Stream>(StringComparer.Ordinal);
+
+			//at least one of gldefs should be in root folder
+			string[] files = GetAllFiles("", false);
+
+			//try to load game specific GLDEFS first
+			if(gametype != GameType.UNKNOWN) 
+			{
+				string lumpname = Gldefs.GLDEFS_LUMPS_PER_GAME[(int)gametype];
+				foreach(string s in files) 
+				{
+					if(Path.GetFileNameWithoutExtension(s).ToUpperInvariant() == lumpname)
+						streams.Add(s, LoadFile(s));
+				}
+			}
+
+			// Can be several entries
+			foreach(string s in files)
+			{
+				if(Path.GetFileNameWithoutExtension(s).ToUpperInvariant().StartsWith("GLDEFS"))
+					streams.Add(s, LoadFile(s));
+			}
+
+			return streams;
+		}
+
+		#endregion
+
+		#region ================== REVERBS (mxd)
+
+		public override Dictionary<string, Stream> GetReverbsData() 
+		{
+			// Error when suspended
+			if(issuspended) throw new Exception("Data reader is suspended");
+
+			Dictionary<string, Stream> streams = new Dictionary<string, Stream>();
+
+			// Get from wads first
+			//TODO: is this the correct order?..
+			foreach(WADReader wr in wads) 
+			{
+				Dictionary<string, Stream> wadstreams = wr.GetReverbsData();
+				foreach(KeyValuePair<string, Stream> pair in wadstreams) streams.Add(pair.Key, pair.Value);
+			}
+
+			// Then from our own files
+			string foundfile = FindFirstFile("reverbs", false);
+			if((foundfile != null) && FileExists(foundfile)) 
+			{
+				streams.Add(foundfile, LoadFile(foundfile));
+			}
+
+			return streams;
+		}
+
+		#endregion
+
+		#region ================== SNDSEQ (mxd)
+
+		public override Dictionary<string, Stream> GetSndSeqData() 
+		{
+			// Error when suspended
+			if(issuspended) throw new Exception("Data reader is suspended");
+
+			Dictionary<string, Stream> streams = new Dictionary<string, Stream>();
+
+			// Get from wads first
+			//TODO: is this the correct order?..
+			foreach(WADReader wr in wads) 
+			{
+				Dictionary<string, Stream> wadstreams = wr.GetSndSeqData();
+				foreach(KeyValuePair<string, Stream> pair in wadstreams) streams.Add(pair.Key, pair.Value);
+			}
+
+			// Then from our own files
+			string foundfile = FindFirstFile("sndseq", false);
+			if(!string.IsNullOrEmpty(foundfile) && FileExists(foundfile))
+			{
+				streams.Add(foundfile, LoadFile(foundfile));
+			}
+
+			return streams;
+		}
+
+		#endregion
+
+		#region ================== ANIMDEFS (mxd)
+
+		public override Dictionary<string, Stream> GetAnimdefsData()
+		{
+			// Error when suspended
+			if(issuspended) throw new Exception("Data reader is suspended");
+
+			Dictionary<string, Stream> streams = new Dictionary<string, Stream>();
+
+			// Get from wads first
+			//TODO: is this the correct order?..
+			foreach(WADReader wr in wads)
+			{
+				Dictionary<string, Stream> wadstreams = wr.GetAnimdefsData();
+				foreach(KeyValuePair<string, Stream> pair in wadstreams)
+					streams.Add(pair.Key, pair.Value);
+			}
+
+			// Then from our own files
+			string foundfile = FindFirstFile("animdefs", false);
+			if(!string.IsNullOrEmpty(foundfile) && FileExists(foundfile))
+			{
+				streams.Add(foundfile, LoadFile(foundfile));
+			}
+
+			return streams;
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This loads the images in this directory
+		private ICollection<ImageData> LoadDirectoryImages(string path, int imagetype, bool includesubdirs)
+		{
+			List<ImageData> images = new List<ImageData>();
+			
+			// Go for all files
+			string[] files = GetAllFiles(path, includesubdirs);
+			foreach(string f in files)
+			{
+				if(string.IsNullOrEmpty(Path.GetFileNameWithoutExtension(f))) 
+				{
+					// Can't load image without name
+					General.ErrorLogger.Add(ErrorType.Error, "Can't load an unnamed texture from \"" + path + "\". Please consider giving names to your resources.");
+				} 
+				else 
+				{
+					// Add image to list
+					images.Add(CreateImage(f, imagetype));
+				}
+			}
+			
+			// Return result
+			return images;
+		}
+		
+		// This copies images from a collection unless they already exist in the list
+		private static void AddImagesToList(Dictionary<long, ImageData> targetlist, ICollection<ImageData> sourcelist)
+		{
+			// Go for all source images
+			foreach(ImageData src in sourcelist)
+			{
+				// Check if exists in target list
+				if(!targetlist.ContainsKey(src.LongName))
+					targetlist.Add(src.LongName, src);
+			}
+		}
+		
+		// This must create an image
+		protected abstract ImageData CreateImage(string filename, int imagetype);
+
+		// This must return all files in a given directory
+		protected abstract string[] GetAllFiles(string path, bool subfolders);
+
+		// This must return all files in a given directory that have the given file title
+		protected abstract string[] GetAllFilesWithTitle(string path, string title, bool subfolders);
+
+		//mxd. This must return all files in a given directory which title starts with given title
+		protected abstract string[] GetAllFilesWhichTitleStartsWith(string path, string title);
+
+		// This must return all files in a given directory that match the given extension
+		protected abstract string[] GetFilesWithExt(string path, string extension, bool subfolders);
+
+		// This must find the first file that has the specific name, regardless of file extension
+		protected abstract string FindFirstFile(string beginswith, bool subfolders);
+
+		// This must find the first file that has the specific name, regardless of file extension
+		protected abstract string FindFirstFile(string path, string beginswith, bool subfolders);
+
+		// This must find the first file that has the specific name
+		protected abstract string FindFirstFileWithExt(string path, string beginswith, bool subfolders);
+	
+		// This must create a temp file for the speciied file and return the absolute path to the temp file
+		// NOTE: Callers are responsible for removing the temp file when done!
+		protected abstract string CreateTempFile(string filename);
+
+		// This makes the path relative to the directory, if needed
+		protected virtual string MakeRelativePath(string anypath)
+		{
+			if(Path.IsPathRooted(anypath))
+			{
+				// Make relative
+				string lowpath = anypath.ToLowerInvariant();
+				string lowlocation = location.location.ToLowerInvariant();
+				if((lowpath.Length > (lowlocation.Length + 1)) && lowpath.StartsWith(lowlocation))
+					return anypath.Substring(lowlocation.Length + 1);
+				else
+					return anypath;
+			}
+			else
+			{
+				// Path is already relative
+				return anypath;
+			}
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Data/PatchNames.cs b/Source/Core/Data/PatchNames.cs
new file mode 100644
index 0000000..a78d8fc
--- /dev/null
+++ b/Source/Core/Data/PatchNames.cs
@@ -0,0 +1,80 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.IO;
+using CodeImp.DoomBuilder.IO;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Data
+{
+	internal sealed class PatchNames
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		private string[] pnames;
+
+		#endregion
+
+		#region ================== Properties
+
+		public string this[int index] { get { return pnames[index]; } }
+		public int Length { get { return pnames.Length; } }
+		
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor for empty list
+		public PatchNames()
+		{
+			// Create array
+			pnames = new string[0];
+		}
+
+		// Constructor
+		public PatchNames(Stream stream)
+		{
+			BinaryReader reader = new BinaryReader(stream);
+
+			// Read length of array
+			stream.Seek(0, SeekOrigin.Begin);
+			uint length = reader.ReadUInt32();
+			
+			// Create array
+			pnames = new string[length];
+
+			// Read all patch names
+			for(uint i = 0; i < length; i++)
+			{
+				byte[] bytes = reader.ReadBytes(8);
+				pnames[i] = Lump.MakeNormalName(bytes, WAD.ENCODING).ToUpperInvariant();
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Data/Playpal.cs b/Source/Core/Data/Playpal.cs
new file mode 100644
index 0000000..efd92e4
--- /dev/null
+++ b/Source/Core/Data/Playpal.cs
@@ -0,0 +1,89 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.IO;
+using CodeImp.DoomBuilder.Rendering;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Data
+{
+	public sealed class Playpal
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		private PixelColor[] colors;
+
+		#endregion
+
+		#region ================== Properties
+
+		public PixelColor this[int index] { get { return colors[index]; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public Playpal()
+		{
+			// Create array
+			colors = new PixelColor[256];
+
+			// Set all palette entries
+			for(int i = 0; i < 256; i++)
+			{
+				// Set colors to gray
+				colors[i].r = 127;
+				colors[i].g = 127;
+				colors[i].b = 127;
+				colors[i].a = 255;
+			}
+		}
+
+		// Constructor
+		public Playpal(Stream stream)
+		{
+			BinaryReader reader = new BinaryReader(stream);
+			
+			// Create array
+			colors = new PixelColor[256];
+
+			// Read all palette entries
+			stream.Seek(0, SeekOrigin.Begin);
+			for(int i = 0; i < 256; i++)
+			{
+				// Read colors
+				colors[i].r = reader.ReadByte();
+				colors[i].g = reader.ReadByte();
+				colors[i].b = reader.ReadByte();
+				colors[i].a = 255;
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Data/PreviewManager.cs b/Source/Core/Data/PreviewManager.cs
new file mode 100644
index 0000000..47c5e16
--- /dev/null
+++ b/Source/Core/Data/PreviewManager.cs
@@ -0,0 +1,275 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.Drawing.Drawing2D;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Data
+{
+	public class PreviewManager
+	{
+		#region ================== Constants
+
+		// Image format
+		private const PixelFormat IMAGE_FORMAT = PixelFormat.Format32bppArgb;
+
+		// Dimensions of a single preview image
+		public static readonly int[] PREVIEW_SIZES = new[] { 48, 64, 80, 96, 112, 128 };
+
+		#endregion
+
+		#region ================== Variables
+		
+		// Dimensions of a single preview image
+		private int maxpreviewwidth = 64;
+		private int maxpreviewheight = 64;
+		
+		// Images
+		private List<Bitmap> images;
+		
+		// Processing
+		private Queue<ImageData> imageque;
+		
+		// Disposing
+		private bool isdisposed;
+
+		#endregion
+
+		#region ================== Properties
+
+		// Constants
+		public int MaxImageWidth { get { return maxpreviewwidth; } }
+		public int MaxImageHeight { get { return maxpreviewheight; } }
+		
+		// Disposing
+		internal bool IsDisposed { get { return isdisposed; } }
+		
+		// Loading
+		internal bool IsLoading
+		{
+			get
+			{
+				return (imageque.Count > 0);
+			}
+		}
+		
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		internal PreviewManager()
+		{
+			// Initialize
+			images = new List<Bitmap>();
+			imageque = new Queue<ImageData>();
+			maxpreviewwidth = PREVIEW_SIZES[General.Settings.PreviewImageSize];
+			maxpreviewheight = PREVIEW_SIZES[General.Settings.PreviewImageSize];
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Disposer
+		internal void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Clean up
+				foreach(Bitmap b in images) b.Dispose();
+				images = null;
+				
+				// Done
+				isdisposed = true;
+			}
+		}
+
+		#endregion
+		
+		#region ================== Private Methods
+		
+		// This makes a preview for the given image and updates the image settings
+		private void MakeImagePreview(ImageData img)
+		{
+			lock(img)
+			{
+				// Load image if needed
+				if(!img.IsImageLoaded) img.LoadImage();
+				int imagewidth, imageheight;
+				if(!img.LoadFailed)
+				{
+					imagewidth = img.Width;
+					imageheight = img.Height;
+				}
+				else
+				{
+					Size size = img.GetBitmap().Size; //mxd
+					imagewidth = size.Width;
+					imageheight = size.Height;
+				}
+				
+				// Determine preview size
+				float scalex = (img.Width > maxpreviewwidth) ? (maxpreviewwidth / (float)imagewidth) : 1.0f;
+				float scaley = (img.Height > maxpreviewheight) ? (maxpreviewheight / (float)imageheight) : 1.0f;
+				float scale = Math.Min(scalex, scaley);
+				int previewwidth = (int)(imagewidth * scale);
+				int previewheight = (int)(imageheight * scale);
+				if(previewwidth < 1) previewwidth = 1;
+				if(previewheight < 1) previewheight = 1;
+
+				// Make new image
+				Bitmap preview = new Bitmap(previewwidth, previewheight, IMAGE_FORMAT);
+				Graphics g = Graphics.FromImage(preview);
+				g.PageUnit = GraphicsUnit.Pixel;
+				//g.CompositingQuality = CompositingQuality.HighQuality; //mxd
+				g.InterpolationMode = InterpolationMode.NearestNeighbor;
+				//g.SmoothingMode = SmoothingMode.HighQuality; //mxd
+				g.PixelOffsetMode = PixelOffsetMode.None;
+				//g.Clear(Color.Transparent); //mxd
+				
+				// Draw image onto atlas
+				Rectangle atlasrect = new Rectangle(0, 0, previewwidth, previewheight);
+				RectangleF imgrect = General.MakeZoomedRect(new Size(imagewidth, imageheight), atlasrect);
+				if(imgrect.Width < 1.0f)
+				{
+					imgrect.X -= 0.5f - imgrect.Width * 0.5f;
+					imgrect.Width = 1.0f;
+				}
+				if(imgrect.Height < 1.0f)
+				{
+					imgrect.Y -= 0.5f - imgrect.Height * 0.5f;
+					imgrect.Height = 1.0f;
+				}
+				g.DrawImage(img.GetBitmap(), imgrect);
+				g.Dispose();
+				
+				// Unload image if no longer needed
+				if(!img.IsReferenced) img.UnloadImage();
+				
+				lock(images)
+				{
+					// Set numbers
+					img.PreviewIndex = images.Count;
+					img.PreviewState = ImageLoadState.Ready;
+					
+					// Add to previews list
+					images.Add(preview);
+				}
+			}
+		}
+
+		#endregion
+		
+		#region ================== Public Methods
+
+		// This draws a preview centered in a target
+		internal void DrawPreview(int previewindex, Graphics target, Point targetpos)
+		{
+			Bitmap image;
+
+			// Get the preview we need
+			lock(images) { image = images[previewindex]; }
+
+			// Adjust offset for the size of the preview image
+			targetpos.X += (maxpreviewwidth - image.Width) >> 1;
+			targetpos.Y += (maxpreviewheight - image.Height) >> 1;
+			
+			// Draw from atlas to target
+			lock(image)
+			{
+				target.DrawImageUnscaled(image, targetpos.X, targetpos.Y);
+			}
+		}
+
+		// This returns a copy of the preview
+		internal Bitmap GetPreviewCopy(int previewindex)
+		{
+			Bitmap image;
+
+			// Get the preview we need
+			lock(images) { image = images[previewindex]; }
+
+			// Make a copy
+			lock(image)
+			{
+				return new Bitmap(image);
+			}
+		}
+
+		// Background loading
+		// Return true when we have more work to do, so that the
+		// thread will not wait too long before calling again
+		internal bool BackgroundLoad()
+		{
+			// Get next item
+			ImageData image = null;
+			lock(imageque)
+			{
+				// Fetch next image to process
+				if(imageque.Count > 0) image = imageque.Dequeue();
+			}
+
+			// Any image to process?
+			if(image != null)
+			{
+				// Make image preview?
+				if(!image.IsPreviewLoaded) MakeImagePreview(image);
+			}
+
+			return (image != null);
+		}
+		
+		// This adds an image for preview creation
+		internal void AddImage(ImageData image)
+		{
+			lock(imageque)
+			{
+				// Add to list
+				image.PreviewState = ImageLoadState.Loading;
+				imageque.Enqueue(image);
+			}
+		}
+
+
+		#if DEBUG
+		/*internal void DumpAtlases()
+		{
+			lock(images)
+			{
+				int index = 0;
+				foreach(Bitmap a in images)
+				{
+					lock(a)
+					{
+						string file = Path.Combine(General.AppPath, "atlas" + index++ + ".png");
+						a.Save(file, ImageFormat.Png);
+					}
+				}
+			}
+		}*/
+		#endif
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Data/ResourceImage.cs b/Source/Core/Data/ResourceImage.cs
new file mode 100644
index 0000000..d0ade4a
--- /dev/null
+++ b/Source/Core/Data/ResourceImage.cs
@@ -0,0 +1,100 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Reflection;
+using System.Drawing;
+using System.IO;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Data
+{
+	public class ResourceImage : ImageData
+	{
+		#region ================== Variables
+
+		// Image source
+		private readonly Assembly assembly;
+		private readonly string resourcename;
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public ResourceImage(string resourcename)
+		{
+			// Initialize
+			this.assembly = Assembly.GetCallingAssembly();
+			this.resourcename = resourcename;
+			this.AllowUnload = false;
+			SetName(resourcename);
+
+			// Temporarily load resource from memory
+			Stream bitmapdata = assembly.GetManifestResourceStream(resourcename);
+			Bitmap bmp = (Bitmap)Image.FromStream(bitmapdata);
+
+			// Get width and height from image
+			width = bmp.Size.Width;
+			height = bmp.Size.Height;
+			scale.x = 1.0f;
+			scale.y = 1.0f;
+			
+			// Done
+			bmp.Dispose();
+			bitmapdata.Dispose();
+
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This loads the image
+		protected override void LocalLoadImage()
+		{
+			if(IsImageLoaded) return; //mxd. ResourceImages can't be unloaded, so no need to reload them.
+			
+			lock(this)
+			{
+				// No failure checking here. If anything fails here, it is not the user's fault,
+				// because the resources this loads are in the assembly.
+				
+				// Get resource from memory
+				Stream bitmapdata = assembly.GetManifestResourceStream(resourcename);
+				if(bitmap != null) bitmap.Dispose();
+				bitmap = (Bitmap)Image.FromStream(bitmapdata);
+				bitmapdata.Dispose();
+				
+				// Pass on to base
+				base.LocalLoadImage();
+			}
+		}
+
+		//mxd
+		public override Image GetPreview() 
+		{
+			return base.GetBitmap();
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Data/SimpleTextureImage.cs b/Source/Core/Data/SimpleTextureImage.cs
new file mode 100644
index 0000000..eb79db4
--- /dev/null
+++ b/Source/Core/Data/SimpleTextureImage.cs
@@ -0,0 +1,122 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using CodeImp.DoomBuilder.IO;
+using System.IO;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Data
+{
+	internal class SimpleTextureImage : ImageData
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		private string lumpname;
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public SimpleTextureImage(string name, string lumpname, float scalex, float scaley)
+		{
+			// Initialize
+			this.scale.x = scalex;
+			this.scale.y = scaley;
+			this.lumpname = lumpname;
+			SetName(name);
+			virtualname = "[Textures]/" + this.name; //mxd
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This loads the image
+		protected override void LocalLoadImage()
+		{
+			// Checks
+			if(this.IsImageLoaded) return;
+
+			lock(this)
+			{
+				// Get the patch data stream
+				if(bitmap != null) bitmap.Dispose(); bitmap = null;
+				Stream patchdata = General.Map.Data.GetTextureData(lumpname, hasLongName);
+				if(patchdata != null)
+				{
+					// Copy patch data to memory
+					patchdata.Seek(0, SeekOrigin.Begin);
+					byte[] membytes = new byte[(int)patchdata.Length];
+					patchdata.Read(membytes, 0, (int)patchdata.Length);
+					MemoryStream mem = new MemoryStream(membytes);
+					mem.Seek(0, SeekOrigin.Begin);
+
+					// Get a reader for the data
+					IImageReader reader = ImageDataFormat.GetImageReader(mem, ImageDataFormat.DOOMPICTURE, General.Map.Data.Palette);
+					if(!(reader is UnknownImageReader))
+					{
+						// Load the image
+						mem.Seek(0, SeekOrigin.Begin);
+						try { bitmap = reader.ReadAsBitmap(mem); }
+						catch(InvalidDataException)
+						{
+							// Data cannot be read!
+							bitmap = null;
+						}
+					}
+
+					// Not loaded?
+					if(bitmap == null)
+					{
+						General.ErrorLogger.Add(ErrorType.Error, "Image lump '" + lumpname + "' data format could not be read, while loading texture '" + this.Name + "'. Does this lump contain valid picture data at all?");
+						loadfailed = true;
+					}
+					else
+					{
+						// Get width and height from image
+						width = bitmap.Size.Width;
+						height = bitmap.Size.Height;
+					}
+
+					// Done
+					mem.Dispose();
+				}
+				else
+				{
+					General.ErrorLogger.Add(ErrorType.Error, "Image lump '" + lumpname + "' could not be found, while loading texture '" + this.Name + "'. Did you forget to include required resources?");
+					loadfailed = true;
+				}
+				
+				// Pass on to base
+				base.LocalLoadImage();
+			}
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Data/SpriteImage.cs b/Source/Core/Data/SpriteImage.cs
new file mode 100644
index 0000000..6c92b27
--- /dev/null
+++ b/Source/Core/Data/SpriteImage.cs
@@ -0,0 +1,143 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using CodeImp.DoomBuilder.IO;
+using System.IO;
+using System.Runtime.InteropServices;
+using CodeImp.DoomBuilder.Windows;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Data
+{
+	public sealed class SpriteImage : ImageData
+	{
+		#region ================== Variables
+
+		protected int offsetx;
+		protected int offsety;
+		
+		#endregion
+
+		#region ================== Properties
+
+		public int OffsetX { get { return offsetx; } }
+		public int OffsetY { get { return offsety; } }
+		
+		#endregion
+		
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		internal SpriteImage(string name)
+		{
+			// Initialize
+			SetName(name);
+
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		//mxd
+		override public void LoadImage()
+		{
+			// Do the loading
+			LocalLoadImage();
+
+			// Notify the main thread about the change to redraw display
+			IntPtr strptr = Marshal.StringToCoTaskMemAuto(this.Name);
+			General.SendMessage(General.MainWindow.Handle, (int)MainForm.ThreadMessages.SpriteDataLoaded, strptr.ToInt32(), 0);
+		}
+
+		// This loads the image
+		protected override void LocalLoadImage()
+		{
+			// Leave when already loaded
+			if(this.IsImageLoaded) return;
+
+			lock(this)
+			{
+				// Get the lump data stream
+				Stream lumpdata = General.Map.Data.GetSpriteData(Name);
+				if(lumpdata != null)
+				{
+					// Copy lump data to memory
+					lumpdata.Seek(0, SeekOrigin.Begin);
+					byte[] membytes = new byte[(int)lumpdata.Length];
+					lumpdata.Read(membytes, 0, (int)lumpdata.Length);
+					MemoryStream mem = new MemoryStream(membytes);
+					mem.Seek(0, SeekOrigin.Begin);
+					
+					// Get a reader for the data
+					IImageReader reader = ImageDataFormat.GetImageReader(mem, ImageDataFormat.DOOMPICTURE, General.Map.Data.Palette);
+					if(reader is UnknownImageReader)
+					{
+						// Data is in an unknown format!
+						General.ErrorLogger.Add(ErrorType.Error, "Sprite lump '" + Name + "' data format could not be read. Does this lump contain valid picture data at all?");
+						bitmap = null;
+					}
+					else
+					{
+						// Read data as bitmap
+						mem.Seek(0, SeekOrigin.Begin);
+						if(bitmap != null) bitmap.Dispose();
+						bitmap = reader.ReadAsBitmap(mem, out offsetx, out offsety);
+					}
+					
+					// Done
+					mem.Dispose();
+
+					if(bitmap != null)
+					{
+						// Get width and height from image
+						width = bitmap.Size.Width;
+						height = bitmap.Size.Height;
+						scale.x = 1.0f;
+						scale.y = 1.0f;
+						
+						// Make offset corrections if the offset was not given
+						if((offsetx == int.MinValue) || (offsety == int.MinValue))
+						{
+							offsetx = (int)((width * scale.x) * 0.5f);
+							offsety = (int)(height * scale.y);
+						}
+					}
+					else
+					{
+						loadfailed = true;
+					}
+				}
+				else
+				{
+					// Missing a patch lump!
+					General.ErrorLogger.Add(ErrorType.Error, "Missing sprite lump '" + Name + "'. Forgot to include required resources?");
+				}
+
+				// Pass on to base
+				base.LocalLoadImage();
+			}
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Data/TextureImage.cs b/Source/Core/Data/TextureImage.cs
new file mode 100644
index 0000000..9ca200b
--- /dev/null
+++ b/Source/Core/Data/TextureImage.cs
@@ -0,0 +1,178 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Drawing.Imaging;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.IO;
+using System.IO;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Data
+{
+	internal sealed unsafe class TextureImage : ImageData
+	{
+		#region ================== Variables
+
+		private List<TexturePatch> patches;
+		
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public TextureImage(string group, string name, int width, int height, float scalex, float scaley)
+		{
+			// Initialize
+			this.width = width;
+			this.height = height;
+			this.scale.x = scalex;
+			this.scale.y = scaley;
+			this.patches = new List<TexturePatch>();
+			SetName(name);
+			virtualname = "[" + group + "]/" + this.name; //mxd
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This adds a patch to the texture
+		public void AddPatch(TexturePatch patch)
+		{
+			// Add it
+			patches.Add(patch);
+
+			if(patch.lumpname == Name) hasPatchWithSameName = true; //mxd
+		}
+		
+		// This loads the image
+		protected override void LocalLoadImage()
+		{
+			// Checks
+			if(this.IsImageLoaded || width == 0 || height == 0) return;
+
+			BitmapData bitmapdata = null;
+			PixelColor* pixels = (PixelColor*)0;
+			
+			lock(this)
+			{
+				// Create texture bitmap
+				try
+				{
+					if(bitmap != null) bitmap.Dispose();
+					bitmap = new Bitmap(width, height, PixelFormat.Format32bppArgb);
+					bitmapdata = bitmap.LockBits(new Rectangle(0, 0, width, height), ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
+					pixels = (PixelColor*)bitmapdata.Scan0.ToPointer();
+					General.ZeroMemory(new IntPtr(pixels), width * height * sizeof(PixelColor));
+				}
+				catch(Exception e)
+				{
+					// Unable to make bitmap
+					General.ErrorLogger.Add(ErrorType.Error, "Unable to load texture image '" + this.Name + "'. " + e.GetType().Name + ": " + e.Message);
+					loadfailed = true;
+				}
+
+				int missingpatches = 0; //mxd
+
+				if(!loadfailed)
+				{
+					// Go for all patches
+					foreach(TexturePatch p in patches)
+					{
+						// Get the patch data stream
+						Stream patchdata = General.Map.Data.GetPatchData(p.lumpname, p.haslongname);
+						if(patchdata != null)
+						{
+							// Copy patch data to memory
+							patchdata.Seek(0, SeekOrigin.Begin);
+							byte[] membytes = new byte[(int)patchdata.Length];
+							patchdata.Read(membytes, 0, (int)patchdata.Length);
+							MemoryStream mem = new MemoryStream(membytes);
+							mem.Seek(0, SeekOrigin.Begin);
+
+							// Get a reader for the data
+							IImageReader reader = ImageDataFormat.GetImageReader(mem, ImageDataFormat.DOOMPICTURE, General.Map.Data.Palette);
+							if(reader is UnknownImageReader)
+							{
+								//mxd. Probably that's a flat?..
+								if(General.Map.Config.MixTexturesFlats) 
+								{
+									reader = ImageDataFormat.GetImageReader(mem, ImageDataFormat.DOOMFLAT, General.Map.Data.Palette);
+								}
+								if(reader is UnknownImageReader) 
+								{
+									// Data is in an unknown format!
+									General.ErrorLogger.Add(ErrorType.Error, "Patch lump '" + p.lumpname + "' data format could not be read, while loading texture '" + this.Name + "'. Does this lump contain valid picture data at all?");
+									loadfailed = true;
+									missingpatches++; //mxd
+								}
+							}
+
+							if(!(reader is UnknownImageReader))
+							{
+								// Draw the patch
+								mem.Seek(0, SeekOrigin.Begin);
+								try { reader.DrawToPixelData(mem, pixels, width, height, p.x, p.y); }
+								catch(InvalidDataException)
+								{
+									// Data cannot be read!
+									General.ErrorLogger.Add(ErrorType.Error, "Patch lump '" + p.lumpname + "' data format could not be read, while loading texture '" + this.Name + "'. Does this lump contain valid picture data at all?");
+									loadfailed = true;
+									missingpatches++; //mxd
+								}
+							}
+
+							// Done
+							mem.Dispose();
+						}
+						else
+						{
+							// Missing a patch lump!
+							General.ErrorLogger.Add(ErrorType.Error, "Missing patch lump '" + p.lumpname + "' while loading texture '" + this.Name + "'. Did you forget to include required resources?");
+							loadfailed = true;
+							missingpatches++; //mxd
+						}
+					}
+
+					// Done
+					bitmap.UnlockBits(bitmapdata);
+				}
+				
+				// Dispose bitmap if load failed
+				if((bitmap != null) && (loadfailed || missingpatches >= patches.Count)) //mxd. We can still display texture if at least one of the patches was loaded
+				{
+					bitmap.Dispose();
+					bitmap = null;
+					loadfailed = true;
+				}
+
+				// Pass on to base
+				base.LocalLoadImage();
+			}
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Data/TexturePatch.cs b/Source/Core/Data/TexturePatch.cs
new file mode 100644
index 0000000..35fcfd9
--- /dev/null
+++ b/Source/Core/Data/TexturePatch.cs
@@ -0,0 +1,115 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.IO;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.ZDoom;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Data
+{
+	public enum TexturePathRenderStyle
+	{
+		Copy,
+		Blend,
+		Add,
+		Subtract,
+		ReverseSubtract,
+		Modulate,
+		CopyAlpha,
+		CopyNewAlpha, //mxd
+		Overlay, //mxd
+	}
+
+	public enum TexturePathBlendStyle //mxd
+	{
+		None,
+		Blend,
+		Tint
+	}
+	
+	internal struct TexturePatch
+	{
+		public readonly string lumpname;
+		public readonly int x;
+		public readonly int y;
+		public readonly bool flipx;
+		public readonly bool flipy;
+		public readonly bool haslongname; //mxd
+		public readonly int rotate;
+		public PixelColor blend;
+		public readonly float alpha;
+		public readonly TexturePathRenderStyle style;
+		public readonly TexturePathBlendStyle blendstyle; //mxd
+		public readonly float tintammount;//mxd
+		
+		// Constructor for simple patches
+		public TexturePatch(string lumpname, int x, int y)
+		{
+			// Initialize
+			this.lumpname = lumpname;
+			this.x = x;
+			this.y = y;
+			this.flipx = false;
+			this.flipy = false;
+			this.rotate = 0;
+			this.blend = new PixelColor(0, 0, 0, 0);
+			this.alpha = 1.0f;
+			this.style = TexturePathRenderStyle.Copy;
+			this.blendstyle = TexturePathBlendStyle.None;//mxd
+			this.tintammount = 0; //mxd
+			this.haslongname = false; //mxd
+		}
+
+		//mxd. Constructor for hires patches
+		public TexturePatch(PatchStructure patch) 
+		{
+			// Initialize
+			this.lumpname = patch.Name.ToUpperInvariant();
+			this.x = patch.OffsetX;
+			this.y = patch.OffsetY;
+			this.flipx = patch.FlipX;
+			this.flipy = patch.FlipY;
+			this.rotate = patch.Rotation;
+			this.blend = patch.BlendColor;
+			this.alpha = patch.Alpha;
+			this.style = patch.RenderStyle;
+			this.blendstyle = patch.BlendStyle;
+			this.tintammount = patch.TintAmmount;
+			this.haslongname = (Path.GetFileNameWithoutExtension(this.lumpname) != this.lumpname);
+
+			//mxd. Check data so we don't perform unneeded operations later on
+			if(this.alpha == 1.0f) 
+			{
+				switch(this.style)
+				{
+					case TexturePathRenderStyle.Blend:
+					case TexturePathRenderStyle.CopyAlpha:
+					case TexturePathRenderStyle.CopyNewAlpha:
+					case TexturePathRenderStyle.Overlay:
+						this.style = TexturePathRenderStyle.Copy;
+						break;
+				}
+			}
+
+			//mxd. and get rid of render styles we don't support
+			if(this.style == TexturePathRenderStyle.Overlay) this.style = TexturePathRenderStyle.Copy;
+		}
+	}
+}
diff --git a/Source/Core/Data/UnknownImage.cs b/Source/Core/Data/UnknownImage.cs
new file mode 100644
index 0000000..9eb59e9
--- /dev/null
+++ b/Source/Core/Data/UnknownImage.cs
@@ -0,0 +1,77 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Drawing;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Data
+{
+	public sealed class UnknownImage : ImageData
+	{
+		#region ================== Variables
+
+		private readonly Bitmap loadbitmap;
+		
+		#endregion
+		
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public UnknownImage(Bitmap image)
+		{
+			// Initialize
+			this.width = 0;
+			this.height = 0;
+			this.loadbitmap = image;
+			SetName("");
+			
+			LocalLoadImage();
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		#endregion
+
+		#region ================== Methods
+		
+		// This 'loads' the image
+		protected override void LocalLoadImage()
+		{
+			//mxd. Leave when already loaded
+			if(this.IsImageLoaded) return;
+			
+			bitmap = loadbitmap;
+			base.LocalLoadImage();
+		}
+
+		// This returns a preview image
+		public override Image GetPreview()
+		{
+			lock(this)
+			{
+				// Make a copy
+				return new Bitmap(loadbitmap);
+			}
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Data/WADReader.cs b/Source/Core/Data/WADReader.cs
new file mode 100644
index 0000000..fa717c5
--- /dev/null
+++ b/Source/Core/Data/WADReader.cs
@@ -0,0 +1,930 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using CodeImp.DoomBuilder.IO;
+using CodeImp.DoomBuilder.ZDoom;
+using CodeImp.DoomBuilder.GZBuilder.Data;
+using System.Text.RegularExpressions;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Data
+{
+	internal sealed class WADReader : DataReader
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Structures
+
+		private struct LumpRange
+		{
+			public int start;
+			public int end;
+		}
+
+		#endregion
+
+		#region ================== Variables
+
+		// Source
+		private WAD file;
+		private bool is_iwad;
+		private bool strictpatches;
+		
+		// Lump ranges
+		private List<LumpRange> flatranges;
+		private List<LumpRange> invertedflatranges; //mxd
+		private List<LumpRange> patchranges;
+		private List<LumpRange> spriteranges;
+		private List<LumpRange> textureranges;
+		private List<LumpRange> colormapranges;
+		private List<LumpRange> voxelranges; //mxd
+		
+		#endregion
+
+		#region ================== Properties
+
+		public bool IsIWAD { get { return is_iwad; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public WADReader(DataLocation dl) : base(dl)
+		{
+			General.WriteLogLine("Opening WAD resource '" + location.location + "'");
+
+			if(!File.Exists(location.location))
+				throw new FileNotFoundException("Could not find the file \"" + location.location + "\"", location.location);
+			
+			// Initialize
+			file = new WAD(location.location, true);
+			is_iwad = (file.Type == WAD.TYPE_IWAD);
+			strictpatches = dl.option1;
+			patchranges = new List<LumpRange>();
+			spriteranges = new List<LumpRange>();
+			flatranges = new List<LumpRange>();
+			textureranges = new List<LumpRange>();
+			colormapranges = new List<LumpRange>();
+			voxelranges = new List<LumpRange>(); //mxd
+			
+			// Find ranges
+			FindRanges(patchranges, General.Map.Config.PatchRanges, "patches");
+			FindRanges(spriteranges, General.Map.Config.SpriteRanges, "sprites");
+			FindRanges(flatranges, General.Map.Config.FlatRanges, "flats");
+			FindRanges(textureranges, General.Map.Config.TextureRanges, "textures");
+			FindRanges(colormapranges, General.Map.Config.ColormapRanges, "colormaps");
+			FindRanges(voxelranges, General.Map.Config.VoxelRanges, "voxels");
+
+			//mxd
+			invertedflatranges = new List<LumpRange>();
+
+			if(flatranges.Count > 0) 
+			{
+				//add range before the first flatrange
+				if(flatranges[0].start > 0) 
+				{
+					LumpRange range = new LumpRange {start = 0, end = flatranges[0].start - 1};
+					invertedflatranges.Add(range);
+				}
+
+				//add ranges between flatranges
+				for(int i = 1; i < flatranges.Count; i++) 
+				{
+					LumpRange range = new LumpRange { start = flatranges[i - 1].end + 1, end = flatranges[i].start - 1 };
+					invertedflatranges.Add(range);
+				}
+
+				//add range after the last flatrange
+				if(flatranges[flatranges.Count - 1].end < file.Lumps.Count - 1) 
+				{
+					LumpRange range = new LumpRange { start = flatranges[flatranges.Count - 1].end + 1, end = file.Lumps.Count - 1 };
+					invertedflatranges.Add(range);
+				}
+			} 
+			else // No flat ranges? Make one giant range then... 
+			{ 
+				LumpRange range = new LumpRange {start = 0, end = file.Lumps.Count - 1};
+				invertedflatranges.Add(range);
+			}
+
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Disposer
+		public override void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				General.WriteLogLine("Closing WAD resource '" + location.location + "'");
+
+				// Clean up
+				file.Dispose();
+				
+				// Done
+				base.Dispose();
+			}
+		}
+
+		#endregion
+
+		#region ================== Management
+
+		// Return a short name for this data location
+		public override string GetTitle()
+		{
+			return Path.GetFileName(location.location);
+		}
+
+		// This suspends use of this resource
+		public override void Suspend()
+		{
+			file.Dispose();
+			base.Suspend();
+		}
+
+		// This resumes use of this resource
+		public override void Resume()
+		{
+			file = new WAD(location.location, true);
+			is_iwad = (file.Type == WAD.TYPE_IWAD);
+			base.Resume();
+		}
+
+		// This fills a ranges list
+		private void FindRanges(List<LumpRange> ranges, IDictionary rangeinfos, string rangename)
+		{
+			Dictionary<LumpRange, KeyValuePair<string, string>> failedranges = new Dictionary<LumpRange, KeyValuePair<string, string>>(); //mxd
+			Dictionary<int, bool> successfulrangestarts = new Dictionary<int, bool>(); //mxd
+			Dictionary<int, bool> failedrangestarts = new Dictionary<int, bool>(); //mxd
+			
+			foreach(DictionaryEntry r in rangeinfos)
+			{
+				// Read start and end
+				string rangestart = General.Map.Config.ReadSetting(rangename + "." + r.Key + ".start", "");
+				string rangeend = General.Map.Config.ReadSetting(rangename + "." + r.Key + ".end", "");
+				if((rangestart.Length > 0) && (rangeend.Length > 0))
+				{
+					// Find ranges
+					int startindex = file.FindLumpIndex(rangestart);
+					while(startindex > -1)
+					{
+						LumpRange range = new LumpRange();
+						range.start = startindex;
+						range.end = file.FindLumpIndex(rangeend, startindex);
+						if(range.end > -1)
+						{
+							if(!successfulrangestarts.ContainsKey(startindex)) successfulrangestarts.Add(startindex, false); //mxd
+							ranges.Add(range);
+							startindex = file.FindLumpIndex(rangestart, range.end);
+						}
+						else
+						{
+							//mxd
+							if(!failedrangestarts.ContainsKey(startindex))
+							{
+								failedranges.Add(range, new KeyValuePair<string, string>(rangestart, rangeend)); //mxd
+								failedrangestarts.Add(startindex, false);
+							}
+							
+							startindex = -1;
+						}
+					}
+				}
+			}
+
+			//mxd. Display warnings for unclosed ranges
+			foreach(KeyValuePair<LumpRange, KeyValuePair<string, string>> group in failedranges)
+			{
+				if(successfulrangestarts.ContainsKey(group.Key.start)) continue;
+				General.ErrorLogger.Add(ErrorType.Warning, "'" + group.Value.Key + "' range at index " + group.Key.start + " is not closed in '" + location.location + "' ('" + group.Value.Value + "' marker is missing)!");
+			}
+		}
+		
+		#endregion
+
+		#region ================== Palette
+
+		// This loads the PLAYPAL palette
+		public override Playpal LoadPalette()
+		{
+			// Error when suspended
+			if(issuspended) throw new Exception("Data reader is suspended");
+			
+			// Look for a lump named PLAYPAL
+			Lump lump = file.FindLump("PLAYPAL");
+			if(lump != null) return new Playpal(lump.Stream); // Read the PLAYPAL from stream
+			return null; // No palette
+		}
+
+		#endregion
+
+		#region ================== Colormaps
+
+		// This loads the textures
+		public override ICollection<ImageData> LoadColormaps()
+		{
+			List<ImageData> images = new List<ImageData>();
+
+			// Error when suspended
+			if(issuspended) throw new Exception("Data reader is suspended");
+
+			// Read ranges from configuration
+			foreach(DictionaryEntry r in General.Map.Config.ColormapRanges)
+			{
+				// Read start and end
+				string rangestart = General.Map.Config.ReadSetting("colormaps." + r.Key + ".start", "");
+				string rangeend = General.Map.Config.ReadSetting("colormaps." + r.Key + ".end", "");
+				if((rangestart.Length > 0) && (rangeend.Length > 0))
+				{
+					// Load texture range
+					LoadColormapsRange(rangestart, rangeend, ref images);
+				}
+			}
+
+			// Add images to the container-specific texture set
+			foreach(ImageData img in images) textureset.AddFlat(img);
+
+			// Return result
+			return images;
+		}
+
+		// This loads a range of colormaps
+		private void LoadColormapsRange(string startlump, string endlump, ref List<ImageData> images)
+		{
+			// Continue until no more start can be found
+			int startindex = file.FindLumpIndex(startlump);
+			while(startindex > -1)
+			{
+				// Find end index
+				int endindex = file.FindLumpIndex(endlump, startindex + 1);
+				if(endindex > -1)
+				{
+					// Go for all lumps between start and end exclusive
+					for(int i = startindex + 1; i < endindex; i++)
+					{
+						// Lump not zero-length?
+						if(file.Lumps[i].Length > 0)
+						{
+							// Make the image object
+							ColormapImage image = new ColormapImage(file.Lumps[i].Name);
+
+							// Add image to collection
+							images.Add(image);
+						}
+					}
+				}
+
+				// Find the next start
+				startindex = file.FindLumpIndex(startlump, startindex + 1);
+			}
+		}
+
+		// This finds and returns a colormap stream
+		public override Stream GetColormapData(string pname)
+		{
+			// Error when suspended
+			if(issuspended) throw new Exception("Data reader is suspended");
+
+			// Strictly read patches only between C_START and C_END?
+			if(strictpatches)
+			{
+				// Find the lump in ranges
+				foreach(LumpRange range in colormapranges)
+				{
+					Lump lump = file.FindLump(pname, range.start, range.end);
+					if(lump != null) return lump.Stream;
+				}
+			}
+			else
+			{
+				// Find the lump anywhere
+				Lump lump = file.FindLump(pname);
+				if(lump != null) return lump.Stream;
+			}
+
+			return null;
+		}
+
+		#endregion
+
+		#region ================== Textures
+
+		// This loads the textures
+		public override ICollection<ImageData> LoadTextures(PatchNames pnames)
+		{
+			// Error when suspended
+			if(issuspended) throw new Exception("Data reader is suspended");
+
+			List<ImageData> images = new List<ImageData>();
+			float defaultscale = General.Map.Config.DefaultTextureScale; //mxd
+
+			// Load two sets of textures, if available
+			Lump lump = file.FindLump("TEXTURE1");
+			if(lump != null) 
+			{
+				LoadTextureSet("TEXTURE1", lump.Stream, ref images, pnames);
+				if(images.Count > 0) images.RemoveAt(0); //mxd. The first TEXTURE1 texture cannot be used. Let's remove it here
+			}
+			lump = file.FindLump("TEXTURE2");
+			if(lump != null) LoadTextureSet("TEXTURE2", lump.Stream, ref images, pnames);
+			
+			// Read ranges from configuration
+			foreach(LumpRange range in textureranges)
+			{
+				// Go for all lumps between start and end exclusive
+				for(int i = range.start + 1; i < range.end; i++) 
+				{
+					// Lump not zero length?
+					if(file.Lumps[i].Length > 0) 
+					{
+						// Make the image
+						SimpleTextureImage image = new SimpleTextureImage(file.Lumps[i].Name, file.Lumps[i].Name, defaultscale, defaultscale);
+
+						// Add image to collection
+						images.Add(image);
+					} 
+					else 
+					{
+						// Can't load image without size
+						General.ErrorLogger.Add(ErrorType.Error, "Can't load texture '" + file.Lumps[i].Name + "' because it doesn't contain any data.");
+					}
+				}
+			}
+			
+			// Load TEXTURES lump file
+			int lumpindex = file.FindLumpIndex("TEXTURES");
+			while(lumpindex > -1)
+			{
+				MemoryStream filedata = new MemoryStream(file.Lumps[lumpindex].Stream.ReadAllBytes());
+				WADReader.LoadHighresTextures(filedata, "TEXTURES", ref images, null, null);
+				filedata.Dispose();
+				
+				// Find next
+				lumpindex = file.FindLumpIndex("TEXTURES", lumpindex + 1);
+			}
+			
+			// Add images to the container-specific texture set
+			foreach(ImageData img in images) textureset.AddTexture(img);
+
+			// Return result
+			return images;
+		}
+
+		// This loads the texture definitions from a TEXTURES lump
+		public static void LoadHighresTextures(Stream stream, string filename, ref List<ImageData> images, Dictionary<long, ImageData> textures, Dictionary<long, ImageData> flats)
+		{
+			// Parse the data
+			TexturesParser parser = new TexturesParser();
+			parser.Parse(stream, filename, false);
+			if(parser.HasError) parser.LogError(); //mxd
+
+			// Make the textures
+			foreach(TextureStructure t in parser.Textures)
+			{
+				// Add the texture
+				ImageData img = t.MakeImage();
+				images.Add(img);
+			}
+		}
+		
+		// This loads a set of textures
+		public static void LoadTextureSet(string sourcename, Stream texturedata, ref List<ImageData> images, PatchNames pnames)
+		{
+			if(texturedata.Length == 0) return;
+			BinaryReader reader = new BinaryReader(texturedata);
+
+			// Determine default scale
+			float defaultscale = General.Map.Config.DefaultTextureScale;
+			
+			// Get number of textures
+			texturedata.Seek(0, SeekOrigin.Begin);
+			uint numtextures = reader.ReadUInt32();
+			
+			// Skip offset bytes (we will read all textures sequentially)
+			texturedata.Seek(4 * numtextures, SeekOrigin.Current);
+
+			// Go for all textures defined in this lump
+			for(uint i = 0; i < numtextures; i++)
+			{
+				// Read texture properties
+				byte[] namebytes = reader.ReadBytes(8);
+				int flags = reader.ReadUInt16();
+				byte scalebytex = reader.ReadByte();
+				byte scalebytey = reader.ReadByte();
+				int width = reader.ReadInt16();
+				int height = reader.ReadInt16();
+				int patches = reader.ReadInt16();
+				
+				// Check for doom or strife data format
+				bool strifedata;
+				if(patches == 0)
+				{
+					// Ignore 2 bytes and then read number of patches
+					texturedata.Seek(2, SeekOrigin.Current);
+					patches = reader.ReadInt16();
+					strifedata = false;
+				}
+				else
+				{
+					// Texture data is in strife format
+					strifedata = true;
+				}
+
+				// Determine actual scales
+				float scalex = (scalebytex == 0 ? defaultscale : 1f / (scalebytex / 8f));
+				float scaley = (scalebytey == 0 ? defaultscale : 1f / (scalebytey / 8f));
+				
+				// Validate data
+				if((width > 0) && (height > 0) && (patches > 0) && (scalex != 0) || (scaley != 0))
+				{
+					string texname = Lump.MakeNormalName(namebytes, WAD.ENCODING);
+					TextureImage image = null;
+					if(texname.Length > 0)
+					{
+						// Make the image object
+						image = new TextureImage(sourcename, Lump.MakeNormalName(namebytes, WAD.ENCODING),
+												 width, height, scalex, scaley);
+					}
+					else
+					{
+						// Can't load image without name
+						General.ErrorLogger.Add(ErrorType.Error, "Can't load an unnamed texture from \"" + sourcename + "\". Please consider giving names to your resources.");
+					}
+					
+					// Go for all patches in texture
+					for(int p = 0; p < patches; p++)
+					{
+						// Read patch properties
+						int px = reader.ReadInt16();
+						int py = reader.ReadInt16();
+						int pi = reader.ReadUInt16();
+						if(!strifedata) texturedata.Seek(4, SeekOrigin.Current);
+						
+						// Validate data
+						if((pi >= 0) && (pi < pnames.Length))
+						{
+							if(pnames[pi].Length > 0)
+							{
+								// Create patch on image
+								if(image != null) image.AddPatch(new TexturePatch(pnames[pi], px, py));
+							}
+							else
+							{
+								// Can't load image without name
+								General.ErrorLogger.Add(ErrorType.Error, "Can't use an unnamed patch referenced in \"" + sourcename + "\". Please consider giving names to your resources.");
+							}
+						}
+					}
+					
+					// Add image to collection
+					if(image != null) images.Add(image);
+				}
+				else
+				{
+					// Skip patches data
+					texturedata.Seek(6 * patches, SeekOrigin.Current);
+					if(!strifedata) texturedata.Seek(4 * patches, SeekOrigin.Current);
+				}
+			}
+		}
+
+		// This returns the patch names from the PNAMES lump
+		public override PatchNames LoadPatchNames()
+		{
+			// Error when suspended
+			if(issuspended) throw new Exception("Data reader is suspended");
+
+			// Look for a lump named PNAMES
+			Lump lump = file.FindLump("PNAMES");
+			if(lump != null) return new PatchNames(lump.Stream); // Read the PNAMES from stream
+			return null; // No patch names found
+		}
+
+		// This finds and returns a patch stream
+		public override Stream GetPatchData(string pname, bool longname)
+		{
+			// Error when suspended
+			if(issuspended) throw new Exception("Data reader is suspended");
+			if(longname) return null; //mxd
+			Lump lump;
+
+			// mxd. First strictly read patches between P_START and P_END
+			foreach(LumpRange range in patchranges) 
+			{
+				lump = file.FindLump(pname, range.start, range.end);
+				if(lump != null) return lump.Stream;
+			}
+			
+			if(!strictpatches) 
+			{
+				//mxd. Find the lump anywhere EXCEPT flat ranges (the way it's done in ZDoom)
+				foreach(LumpRange range in invertedflatranges) 
+				{
+					lump = file.FindLump(pname, range.start, range.end);
+					if(lump != null) return lump.Stream;
+				}
+
+				// Find the lump anywhere IN flat ranges
+				foreach(LumpRange range in flatranges) 
+				{
+					lump = file.FindLump(pname, range.start, range.end);
+					if(lump != null) return lump.Stream;
+				}
+			}
+			
+			return null;
+		}
+
+		// This finds and returns a texture stream
+		public override Stream GetTextureData(string pname, bool longname)
+		{
+			// Error when suspended
+			if(issuspended) throw new Exception("Data reader is suspended");
+			if(longname) return null; //mxd
+
+			// Find the lump in ranges
+			foreach(LumpRange range in textureranges)
+			{
+				Lump lump = file.FindLump(pname, range.start, range.end);
+				if(lump != null) return lump.Stream;
+			}
+
+			return null;
+		}
+
+		#endregion
+		
+		#region ================== Flats
+
+		//mxd. This loads the flats
+		public override ICollection<ImageData> LoadFlats() 
+		{
+			// Error when suspended
+			if(issuspended) throw new Exception("Data reader is suspended");
+
+			List<ImageData> images = new List<ImageData>();
+			foreach(LumpRange range in flatranges)
+			{
+				if(range.end < range.start + 2) continue;
+
+				for(int i = range.start + 1; i < range.end; i++) 
+				{
+					// Lump not zero-length?
+					if(file.Lumps[i].Length > 0)
+					{
+						// Make the image object
+						FlatImage image = new FlatImage(file.Lumps[i].Name);
+
+						// Add image to collection
+						images.Add(image);
+					}
+				}
+			}
+
+			// Load TEXTURES lump file
+			int lumpindex = file.FindLumpIndex("TEXTURES");
+			while(lumpindex > -1) 
+			{
+				MemoryStream filedata = new MemoryStream(file.Lumps[lumpindex].Stream.ReadAllBytes());
+				WADReader.LoadHighresFlats(filedata, "TEXTURES", ref images, null, null);
+				filedata.Dispose();
+
+				// Find next
+				lumpindex = file.FindLumpIndex("TEXTURES", lumpindex + 1);
+			}
+
+			// Add images to the container-specific texture set
+			foreach(ImageData img in images) textureset.AddFlat(img);
+
+			// Return result
+			return images;
+		}
+
+		// This loads the flat definitions from a TEXTURES lump
+		public static void LoadHighresFlats(Stream stream, string filename, ref List<ImageData> images, Dictionary<long, ImageData> textures, Dictionary<long, ImageData> flats)
+		{
+			// Parse the data
+			TexturesParser parser = new TexturesParser();
+			parser.Parse(stream, filename, false);
+			if(parser.HasError) parser.LogError(); //mxd
+
+			// Make the textures
+			foreach(TextureStructure t in parser.Flats)
+			{
+				// Add the texture
+				ImageData img = t.MakeImage();
+				images.Add(img);
+			}
+		}
+		
+		// This finds and returns a patch stream
+		public override Stream GetFlatData(string pname, bool longname)
+		{
+			// Error when suspended
+			if(issuspended) throw new Exception("Data reader is suspended");
+			if(longname) return null; //mxd
+
+			// Find the lump in ranges
+			foreach(LumpRange range in flatranges)
+			{
+				Lump lump = file.FindLump(pname, range.start, range.end);
+				if(lump != null) return lump.Stream;
+			}
+			
+			return null;
+		}
+		
+		#endregion
+
+		#region ================== Sprite
+
+		// This loads the textures
+		public override ICollection<ImageData> LoadSprites()
+		{
+			// Error when suspended
+			if(issuspended) throw new Exception("Data reader is suspended");
+
+			List<ImageData> images = new List<ImageData>();
+			
+			// Load TEXTURES lump file
+			int lumpindex = file.FindLumpIndex("TEXTURES");
+			while(lumpindex > -1)
+			{
+				MemoryStream filedata = new MemoryStream(file.Lumps[lumpindex].Stream.ReadAllBytes());
+				WADReader.LoadHighresSprites(filedata, "TEXTURES", ref images, null, null);
+				filedata.Dispose();
+				
+				// Find next
+				lumpindex = file.FindLumpIndex("TEXTURES", lumpindex + 1);
+			}
+			
+			// Return result
+			return images;
+		}
+
+		// This loads the sprites definitions from a TEXTURES lump
+		public static void LoadHighresSprites(Stream stream, string filename, ref List<ImageData> images, Dictionary<long, ImageData> textures, Dictionary<long, ImageData> flats)
+		{
+			// Parse the data
+			TexturesParser parser = new TexturesParser();
+			parser.Parse(stream, filename, false);
+			if(parser.HasError) parser.LogError(); //mxd
+			
+			// Make the textures
+			foreach(TextureStructure t in parser.Sprites)
+			{
+				// Add the sprite
+				ImageData img = t.MakeImage();
+				images.Add(img);
+			}
+		}
+		
+		// This finds and returns a sprite stream
+		public override Stream GetSpriteData(string pname)
+		{
+			// Error when suspended
+			if(issuspended) throw new Exception("Data reader is suspended");
+
+			// Find the lump in ranges
+			foreach(LumpRange range in spriteranges)
+			{
+				Lump lump = file.FindLump(pname, range.start, range.end);
+				if(lump != null) return lump.Stream;
+			}
+
+			return null;
+		}
+		
+		// This checks if the given sprite exists
+		public override bool GetSpriteExists(string pname)
+		{
+			// Error when suspended
+			if(issuspended) throw new Exception("Data reader is suspended");
+
+			// Find the lump in ranges
+			foreach(LumpRange range in spriteranges)
+			{
+				Lump lump = file.FindLump(pname, range.start, range.end);
+				if(lump != null) return true;
+			}
+
+			return false;
+		}
+		
+		#endregion
+
+		#region ================== Voxels (mxd)
+
+		//mxd. This returns the list of voxels, which can be used without VOXELDEF definition
+		public override IEnumerable<string> GetVoxelNames() 
+		{
+			// Error when suspended
+			if(issuspended) throw new Exception("Data reader is suspended");
+
+			List<string> voxels = new List<string>();
+			Regex spriteName = new Regex(SPRITE_NAME_PATTERN);
+
+			foreach(LumpRange range in voxelranges) 
+			{
+				if(range.start == range.end) continue;
+
+				for(int i = range.start + 1; i < range.end; i++) 
+				{
+					if(spriteName.IsMatch(file.Lumps[i].Name)) voxels.Add(file.Lumps[i].Name);
+				}
+			}
+
+			return voxels.ToArray();
+		}
+
+		//mxd
+		public override KeyValuePair<string, Stream> GetVoxeldefData() 
+		{
+			Lump lump = file.FindLump("VOXELDEF");
+			if(lump != null) return new KeyValuePair<string, Stream>("VOXELDEF", lump.Stream);
+			return new KeyValuePair<string, Stream>();
+		}
+
+		//mxd. This finds and returns a voxel stream or null if no voxel was found
+		public override Stream GetVoxelData(string name) 
+		{
+			// Error when suspended
+			if(issuspended) throw new Exception("Data reader is suspended");
+
+			foreach(LumpRange range in voxelranges) 
+			{
+				if(range.start == range.end) continue;
+				Lump lump = file.FindLump(name, range.start, range.end);
+				if(lump != null) return lump.Stream;
+			}
+
+			return null;
+		}
+
+		#endregion
+
+		#region ================== Decorate, Gldefs, Mapinfo, etc...
+
+		// This finds and returns a sprite stream
+		public override Dictionary<string, Stream> GetDecorateData(string pname)
+		{
+			// Error when suspended
+			if(issuspended) throw new Exception("Data reader is suspended");
+
+			Dictionary<string, Stream> result = new Dictionary<string, Stream>();
+
+			// Find all lumps named 'DECORATE'
+			int lumpindex = file.FindLumpIndex(pname);
+			while(lumpindex > -1)
+			{
+				//mxd. Since we are using Dictionary, all names should be unique
+				result.Add(Path.Combine(file.Filename, pname + "#" + lumpindex), file.Lumps[lumpindex].Stream);
+				
+				// Find next
+				lumpindex = file.FindLumpIndex(pname, lumpindex + 1);
+			}
+			
+			return result;
+		}
+
+		//mxd
+		public override Dictionary<string, Stream> GetMapinfoData() 
+		{
+			if(issuspended) throw new Exception("Data reader is suspended");
+
+			Dictionary<string, Stream> streams = new Dictionary<string, Stream>(StringComparer.Ordinal);
+			string src = "ZMAPINFO";
+
+			//should be only one entry per wad
+			//first look for ZMAPINFO
+			int lumpindex = file.FindLumpIndex(src);
+
+			//then for MAPINFO
+			if(lumpindex == -1) 
+			{
+				src = "MAPINFO";
+				lumpindex = file.FindLumpIndex(src);
+			}
+
+			if(lumpindex != -1) streams.Add(src, file.Lumps[lumpindex].Stream);
+			return streams;
+		}
+
+		//mxd
+		public override Dictionary<string, Stream> GetGldefsData(GameType gameType) 
+		{
+			if(issuspended) throw new Exception("Data reader is suspended");
+
+			Dictionary<string, Stream> streams = new Dictionary<string, Stream>(StringComparer.Ordinal);
+			int lumpindex;
+
+			//try to load game specific GLDEFS first
+			if(gameType != GameType.UNKNOWN) 
+			{
+				string lumpName = Gldefs.GLDEFS_LUMPS_PER_GAME[(int)gameType];
+				lumpindex = file.FindLumpIndex(lumpName);
+
+				if(lumpindex != -1)
+					streams.Add(lumpName, file.Lumps[lumpindex].Stream);
+			}
+
+			//should be only one entry per wad
+			lumpindex = file.FindLumpIndex("GLDEFS");
+			
+			if(lumpindex != -1) streams.Add("GLDEFS", file.Lumps[lumpindex].Stream);
+			return streams;
+		}
+
+		//mxd
+		public override Dictionary<string, Stream> GetModeldefData() 
+		{
+			if(issuspended) throw new Exception("Data reader is suspended");
+
+			Dictionary<string, Stream> streams = new Dictionary<string, Stream>(StringComparer.Ordinal);
+			int lumpindex = file.FindLumpIndex("MODELDEF");
+
+			if(lumpindex != -1) streams.Add("MODELDEF", file.Lumps[lumpindex].Stream);
+			return streams;
+		}
+
+		//mxd
+		public override Dictionary<string, Stream> GetReverbsData() 
+		{
+			if(issuspended) throw new Exception("Data reader is suspended");
+
+			Dictionary<string, Stream> result = new Dictionary<string, Stream>();
+			Lump lump = file.FindLump("REVERBS");
+			if(lump != null) result.Add(Path.Combine(location.location, "REVERBS"), lump.Stream);
+			return result;
+		}
+
+		//mxd
+		public override Dictionary<string, Stream> GetSndSeqData() 
+		{
+			if(issuspended) throw new Exception("Data reader is suspended");
+
+			Dictionary<string, Stream> result = new Dictionary<string, Stream>();
+			Lump lump = file.FindLump("SNDSEQ");
+			if(lump != null) result.Add(Path.Combine(location.location, "SNDSEQ"), lump.Stream);
+			return result;
+		}
+
+		//mxd
+		public override Dictionary<string, Stream> GetAnimdefsData()
+		{
+			if(issuspended) throw new Exception("Data reader is suspended");
+
+			Dictionary<string, Stream> result = new Dictionary<string, Stream>();
+			Lump lump = file.FindLump("ANIMDEFS");
+			if(lump != null) result.Add(Path.Combine(location.location, "ANIMDEFS"), lump.Stream);
+			return result;
+		}
+
+		//mxd
+		internal override MemoryStream LoadFile(string name) 
+		{
+			Lump l = file.FindLump(name);
+
+			if(l != null) 
+			{
+				l.Stream.Seek(0, SeekOrigin.Begin);
+				return new MemoryStream(l.Stream.ReadAllBytes());
+			}
+
+			return null;
+		}
+
+		//mxd
+		internal override bool FileExists(string name) 
+		{
+			return file.FindLumpIndex(name) != -1;
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Editing/ClassicMode.cs b/Source/Core/Editing/ClassicMode.cs
new file mode 100644
index 0000000..e9d2d64
--- /dev/null
+++ b/Source/Core/Editing/ClassicMode.cs
@@ -0,0 +1,939 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Actions;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.VisualModes;
+using CodeImp.DoomBuilder.Windows;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Editing
+{
+	/// <summary>
+	/// Provides specialized functionality for a classic (2D) Doom Builder editing mode.
+	/// </summary>
+	public abstract class ClassicMode : EditMode
+	{
+		#region ================== Constants
+
+		private const float SCALE_MAX = 90f;
+		private const float SCALE_MIN = 0.01f;
+		private const float SELECTION_BORDER_SIZE = 2f;
+		private const int SELECTION_ALPHA = 200;
+		private const float CENTER_VIEW_PADDING = 0.06f;
+		private const float AUTOPAN_BORDER_SIZE = 100.0f;
+
+		#endregion
+
+		#region ================== Variables
+
+		// Cancelled?
+		protected bool cancelled;
+
+		// Graphics
+		protected IRenderer2D renderer;
+		private Renderer2D renderer2d;
+		
+		// Mouse status
+		protected Vector2D mousepos;
+		protected Vector2D mouselastpos;
+		protected Vector2D mousemappos;
+		protected Vector2D mousedownpos;
+		protected Vector2D mousedownmappos;
+		protected MouseButtons mousebuttons;
+		protected bool mouseinside;
+		protected MouseButtons mousedragging = MouseButtons.None;
+		
+		// Selection
+		protected bool selecting;
+		protected bool selectpressed; //mxd
+		private Vector2D selectstart;
+		protected RectangleF selectionrect;
+		protected MarqueSelectionMode marqueSelectionMode; //mxd
+
+		// View panning
+		protected bool panning;
+		private bool autopanenabled;
+
+		//mxd. used in "Play From Here" Action
+		private Thing playerStart;
+		private Vector3D playerStartPosition;
+		
+		#endregion
+
+		#region ================== Properties
+		
+		// Mouse status
+		public Vector2D MousePos { get { return mousepos; } }
+		public Vector2D MouseLastPos { get { return mouselastpos; } }
+		public Vector2D MouseMapPos { get { return mousemappos; } }
+		public Vector2D MouseDownPos { get { return mousedownpos; } }
+		public Vector2D MouseDownMapPos { get { return mousedownmappos; } }
+		public MouseButtons MouseButtons { get { return mousebuttons; } }
+		public bool IsMouseInside { get { return mouseinside; } }
+		public MouseButtons MouseDragging { get { return mousedragging; } }
+
+		// Selection
+		public bool IsSelecting { get { return selecting; } }
+		public Vector2D SelectionStart { get { return selectstart; } }
+		public RectangleF SelectionRect { get { return selectionrect; } }
+		
+		// Panning
+		public bool IsPanning { get { return panning; } }
+
+		// Rendering
+		public IRenderer2D Renderer { get { return renderer; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		/// <summary>
+		/// Provides specialized functionality for a classic (2D) Doom Builder editing mode.
+		/// </summary>
+		protected ClassicMode()
+		{
+			// Initialize
+			this.renderer = General.Map.Renderer2D;
+			this.renderer2d = (Renderer2D)General.Map.Renderer2D;
+
+			// If the current mode is a ClassicMode, copy mouse properties
+			if(General.Editing.Mode is ClassicMode)
+			{
+				ClassicMode oldmode = General.Editing.Mode as ClassicMode;
+
+				// Copy mouse properties
+				mousepos = oldmode.mousepos;
+				mousemappos = oldmode.mousemappos;
+				mousedownpos = oldmode.mousedownpos;
+				mousedownmappos = oldmode.mousedownmappos;
+				mousebuttons = oldmode.mousebuttons;
+				mouseinside = oldmode.mouseinside;
+				mousedragging = oldmode.mousedragging;
+			}
+		}
+
+		// Disposer
+		public override void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Clean up
+
+				// Dispose base
+				base.Dispose();
+			}
+		}
+
+		#endregion
+
+		#region ================== Scroll / Zoom
+
+		// This scrolls the view north
+		[BeginAction("scrollnorth", BaseAction = true)]
+		public virtual void ScrollNorth()
+		{
+			// Scroll
+			ScrollBy(0f, 100f / renderer2d.Scale);
+		}
+
+		// This scrolls the view south
+		[BeginAction("scrollsouth", BaseAction = true)]
+		public virtual void ScrollSouth()
+		{
+			// Scroll
+			ScrollBy(0f, -100f / renderer2d.Scale);
+		}
+
+		// This scrolls the view west
+		[BeginAction("scrollwest", BaseAction = true)]
+		public virtual void ScrollWest()
+		{
+			// Scroll
+			ScrollBy(-100f / renderer2d.Scale, 0f);
+		}
+
+		// This scrolls the view east
+		[BeginAction("scrolleast", BaseAction = true)]
+		public virtual void ScrollEast()
+		{
+			// Scroll
+			ScrollBy(100f / renderer2d.Scale, 0f);
+		}
+
+		// This zooms in
+		[BeginAction("zoomin", BaseAction = true)]
+		public virtual void ZoomIn()
+		{
+			float z = 1.0f + General.Settings.ZoomFactor * 0.1f;
+
+			// Zoom
+			ZoomBy(z);
+		}
+
+		// This zooms out
+		[BeginAction("zoomout", BaseAction = true)]
+		public virtual void ZoomOut()
+		{
+			float z = 1.0f + General.Settings.ZoomFactor * 0.1f;
+
+			// Zoom
+			ZoomBy(1.0f / z);
+		}
+
+		// This scrolls anywhere
+		private void ScrollBy(float deltax, float deltay)
+		{
+			// Scroll now
+			renderer2d.PositionView(renderer2d.OffsetX + deltax, renderer2d.OffsetY + deltay);
+			this.OnViewChanged();
+			
+			// Redraw
+			General.MainWindow.RedrawDisplay();
+
+			// Determine new unprojected mouse coordinates
+			mousemappos = renderer2d.DisplayToMap(mousepos);
+			General.MainWindow.UpdateCoordinates(mousemappos);
+		}
+
+		// This sets the view to be centered at x,y
+		/*private void ScrollTo(float x, float y)
+		{
+			// Scroll now
+			renderer2d.PositionView(x, y);
+			this.OnViewChanged();
+
+			// Redraw
+			General.MainWindow.RedrawDisplay();
+
+			// Determine new unprojected mouse coordinates
+			mousemappos = renderer2d.DisplayToMap(mousepos);
+			General.MainWindow.UpdateCoordinates(mousemappos);
+		}*/
+
+		// This zooms
+		private void ZoomBy(float deltaz)
+		{
+			Vector2D zoompos;
+
+			// This will be the new zoom scale
+			float newscale = renderer2d.Scale * deltaz;
+
+			// Limit scale
+			if(newscale > SCALE_MAX) newscale = SCALE_MAX;
+			if(newscale < SCALE_MIN) newscale = SCALE_MIN;
+			
+			// Get the dimensions of the display
+			Vector2D clientsize = new Vector2D(General.Map.Graphics.RenderTarget.ClientSize.Width,
+			                                   General.Map.Graphics.RenderTarget.ClientSize.Height);
+			
+			// When mouse is inside display
+			if(mouseinside)
+			{
+				// Zoom into or from mouse position
+				zoompos = (mousepos / clientsize) - new Vector2D(0.5f, 0.5f);
+			}
+			else
+			{
+				// Zoom into or from center
+				zoompos = new Vector2D(0f, 0f);
+			}
+
+			// Calculate view position difference
+			Vector2D diff = ((clientsize / newscale) - (clientsize / renderer2d.Scale)) * zoompos;
+
+			// Zoom now
+			renderer2d.PositionView(renderer2d.OffsetX - diff.x, renderer2d.OffsetY + diff.y);
+			renderer2d.ScaleView(newscale);
+			this.OnViewChanged();
+
+			//mxd. Change grid size?
+			MatchGridSizeToDisplayScale();
+
+			// Redraw
+			General.MainWindow.RedrawDisplay();
+			
+			// Give a new mousemove event to update coordinates
+			if(mouseinside) OnMouseMove(new MouseEventArgs(mousebuttons, 0, (int)mousepos.x, (int)mousepos.y, 0));
+		}
+
+		//mxd. This changes current grid size based on current zoom level
+		internal void MatchGridSizeToDisplayScale()
+		{
+			if(!General.Settings.DynamicGridSize) return;
+
+			// Get the dimensions of the display
+			Vector2D clientsize = new Vector2D(General.Map.Graphics.RenderTarget.ClientSize.Width,
+											   General.Map.Graphics.RenderTarget.ClientSize.Height);
+
+			Vector2D clientscale = clientsize / renderer2d.Scale;
+			int targetsize = (int)Math.Ceiling(Math.Min(clientscale.x, clientscale.y) / 32);
+
+			// Convert to nearest power of 2
+			targetsize--;
+			targetsize |= targetsize >> 1;
+			targetsize |= targetsize >> 2;
+			targetsize |= targetsize >> 4;
+			targetsize |= targetsize >> 8;
+			targetsize |= targetsize >> 16;
+			targetsize++;
+
+			// Apply changes
+			General.Map.Grid.SetGridSize(targetsize);
+		}
+
+		// This zooms to a specific level
+		public void SetZoom(float newscale)
+		{
+			// Zoom now
+			renderer2d.ScaleView(newscale);
+			this.OnViewChanged();
+
+			//mxd. Change grid size?
+			MatchGridSizeToDisplayScale();
+
+			// Redraw
+			//General.Map.Map.Update();
+			General.MainWindow.RedrawDisplay();
+
+			// Give a new mousemove event to update coordinates
+			if(mouseinside) OnMouseMove(new MouseEventArgs(mousebuttons, 0, (int)mousepos.x, (int)mousepos.y, 0));
+		}
+		
+		// This zooms and scrolls to fit the map in the window
+		[BeginAction("centerinscreen", BaseAction = true)]
+		public void CenterInScreen()
+		{
+			float left = float.MaxValue;
+			float top = float.MaxValue;
+			float right = float.MinValue;
+			float bottom = float.MinValue;
+			bool anything = false;
+			
+			// Go for all vertices
+			foreach(Vertex v in General.Map.Map.Vertices)
+			{
+				// Vertex used?
+				if(v.Linedefs.Count > 0)
+				{
+					// Adjust boundaries by vertices
+					if(v.Position.x < left) left = v.Position.x;
+					if(v.Position.x > right) right = v.Position.x;
+					if(v.Position.y < top) top = v.Position.y;
+					if(v.Position.y > bottom) bottom = v.Position.y;
+					anything = true;
+				}
+			}
+
+			// Not already found something to center in view?
+			if(!anything)
+			{
+				// Go for all things
+				foreach(Thing t in General.Map.Map.Things)
+				{
+					// Adjust boundaries by vertices
+					if(t.Position.x < left) left = t.Position.x;
+					if(t.Position.x > right) right = t.Position.x;
+					if(t.Position.y < top) top = t.Position.y;
+					if(t.Position.y > bottom) bottom = t.Position.y;
+					anything = true;
+				}
+			}
+			
+			// Anything found to center in view?
+			if(anything)
+			{
+				RectangleF area = new RectangleF(left, top, (right - left), (bottom - top));
+				CenterOnArea(area, CENTER_VIEW_PADDING);
+			}
+			else
+			{
+				// Default view
+				SetDefaultZoom();
+			}
+		}
+		
+		// This zooms and moves to view the given area
+		public void CenterOnArea(RectangleF area, float padding)
+		{
+			// Add size to the area for better overview
+			area.Inflate(area.Width * padding, area.Height * padding);
+			
+			// Calculate scale to view map at
+			float scalew = General.Map.Graphics.RenderTarget.ClientSize.Width / area.Width;
+			float scaleh = General.Map.Graphics.RenderTarget.ClientSize.Height / area.Height;
+			float scale = scalew < scaleh ? scalew : scaleh;
+			
+			//mxd. Change the view to see the whole map
+			CenterOnCoordinates(new Vector2D(area.Left + area.Width * 0.5f, area.Top + area.Height * 0.5f), scale);
+		}
+
+		//mxd
+		public void CenterOnCoordinates(Vector2D offset, float scale)
+		{
+			// Change the view
+			renderer2d.ScaleView(scale);
+			renderer2d.PositionView(offset.x, offset.y);
+			this.OnViewChanged();
+
+			//mxd. Change grid size?
+			MatchGridSizeToDisplayScale();
+			
+			// Redraw
+			General.MainWindow.RedrawDisplay();
+			
+			// Give a new mousemove event to update coordinates
+			if(mouseinside) OnMouseMove(new MouseEventArgs(mousebuttons, 0, (int)mousepos.x, (int)mousepos.y, 0));
+		}
+		
+		// This sets up the default view
+		public void SetDefaultZoom()
+		{
+			// View middle of map at 50% zoom
+			renderer2d.ScaleView(0.5f);
+			renderer2d.PositionView(0.0f, 0.0f);
+			this.OnViewChanged();
+
+			//mxd. Change grid size?
+			MatchGridSizeToDisplayScale();
+			
+			// Redraw
+			General.MainWindow.RedrawDisplay();
+
+			// Give a new mousemove event to update coordinates
+			if(mouseinside) OnMouseMove(new MouseEventArgs(mousebuttons, 0, (int)mousepos.x, (int)mousepos.y, 0));
+		}
+		
+		/// <summary>
+		/// This is called when the view changes (scroll/zoom), before the display is redrawn.
+		/// </summary>
+		protected virtual void OnViewChanged()
+		{
+		}
+		
+		// This enabled automatic panning, if preferred
+		protected void EnableAutoPanning()
+		{
+			if(General.Settings.AutoScrollSpeed > 0)
+			{
+				if(!autopanenabled)
+				{
+					autopanenabled = true;
+					General.MainWindow.EnableProcessing();
+				}
+			}
+		}
+
+		// This disabls automatic panning
+		protected void DisableAutoPanning()
+		{
+			if(autopanenabled)
+			{
+				autopanenabled = false;
+				General.MainWindow.DisableProcessing();
+			}
+		}
+		
+		#endregion
+
+		#region ================== Processing
+
+		// Processing
+		public override void OnProcess(float deltatime)
+		{
+			base.OnProcess(deltatime);
+
+			if(autopanenabled)
+			{
+				Vector2D panamount = new Vector2D();
+				
+				// How much to pan the view in X?
+				if(mousepos.x < AUTOPAN_BORDER_SIZE)
+					panamount.x = -AUTOPAN_BORDER_SIZE + mousepos.x;
+				else if(mousepos.x > (General.MainWindow.Display.ClientSize.Width - AUTOPAN_BORDER_SIZE))
+					panamount.x = mousepos.x - (General.MainWindow.Display.ClientSize.Width - AUTOPAN_BORDER_SIZE);
+
+				// How much to pan the view in Y?
+				if(mousepos.y < AUTOPAN_BORDER_SIZE)
+					panamount.y = AUTOPAN_BORDER_SIZE - mousepos.y;
+				else if(mousepos.y > (General.MainWindow.Display.ClientSize.Height - AUTOPAN_BORDER_SIZE))
+					panamount.y = -(mousepos.y - (General.MainWindow.Display.ClientSize.Height - AUTOPAN_BORDER_SIZE));
+
+				// Do any panning?
+				if(panamount.GetManhattanLength() > 0.0f)
+				{
+					// Scale and power this for nicer usability
+					Vector2D pansign = panamount.GetSign();
+					panamount = (panamount * panamount) * pansign * 0.0001f * General.Settings.AutoScrollSpeed / renderer.Scale;
+					
+					// Multiply by delta time
+					panamount.x *= deltatime;
+					panamount.y *= deltatime;
+
+					// Pan the view
+					ScrollBy(panamount.x, panamount.y);
+				}
+			}
+		}
+
+		#endregion
+
+		#region ================== Input
+
+		// Mouse leaves the display
+		public override void OnMouseLeave(EventArgs e)
+		{
+			// Mouse is outside the display
+			mouseinside = false;
+			mousepos = new Vector2D(float.NaN, float.NaN);
+			mousemappos = mousepos;
+			mousebuttons = MouseButtons.None;
+			
+			// Determine new unprojected mouse coordinates
+			General.MainWindow.UpdateCoordinates(mousemappos);
+			
+			// Let the base class know
+			base.OnMouseLeave(e);
+		}
+
+		// Mouse moved inside the display
+		public override void OnMouseMove(MouseEventArgs e)
+		{
+			// Record last position
+			mouseinside = true;
+			mouselastpos = mousepos;
+			mousepos = new Vector2D(e.X, e.Y);
+			mousemappos = renderer2d.DisplayToMap(mousepos);
+			mousebuttons = e.Button;
+			
+			// Update labels in main window
+			General.MainWindow.UpdateCoordinates(mousemappos);
+			
+			// Holding a button?
+			if(e.Button != MouseButtons.None)
+			{
+				// Not dragging?
+				if(mousedragging == MouseButtons.None)
+				{
+					// Check if moved enough pixels for dragging
+					Vector2D delta = mousedownpos - mousepos;
+					if((Math.Abs(delta.x) > DRAG_START_MOVE_PIXELS) ||
+					   (Math.Abs(delta.y) > DRAG_START_MOVE_PIXELS))
+					{
+						// Dragging starts now
+						mousedragging = e.Button;
+						OnDragStart(e);
+					}
+				}
+			}
+			
+			// Selecting?
+			if(selecting) OnUpdateMultiSelection();
+
+			// Panning?
+			if(panning) OnUpdateViewPanning();
+			
+			// Let the base class know
+			base.OnMouseMove(e);
+		}
+
+		// Mouse button pressed
+		public override void OnMouseDown(MouseEventArgs e)
+		{
+			// Save mouse down position
+			mousedownpos = mousepos;
+			mousedownmappos = mousemappos;
+			
+			// Let the base class know
+			base.OnMouseDown(e);
+		}
+
+		// Mouse button released
+		public override void OnMouseUp(MouseEventArgs e)
+		{
+			// Releasing drag button?
+			if(e.Button == mousedragging)
+			{
+				// No longer dragging
+				OnDragStop(e);
+				mousedragging = MouseButtons.None;
+			}
+			
+			// Let the base class know
+			base.OnMouseUp(e);
+		}
+
+		/// <summary>
+		/// Automatically called when dragging operation starts.
+		/// </summary>
+		protected virtual void OnDragStart(MouseEventArgs e)
+		{
+		}
+
+		/// <summary>
+		/// Automatically called when dragging operation stops.
+		/// </summary>
+		protected virtual void OnDragStop(MouseEventArgs e)
+		{
+		}
+		
+		#endregion
+
+		#region ================== Display
+
+		// This just refreshes the display
+		public override void OnPresentDisplay()
+		{
+			renderer2d.Present();
+		}
+
+		// This sets the view mode
+		private static void SetViewMode(ViewMode mode)
+		{
+			General.Map.CRenderer2D.SetViewMode(mode);
+			General.MainWindow.UpdateInterface();
+			General.MainWindow.RedrawDisplay();
+		}
+		
+		#endregion
+
+		#region ================== Methods
+
+		/// <summary>
+		/// Automatically called by the core when this editing mode is engaged.
+		/// </summary>
+		public override void OnEngage()
+		{
+			//mxd. Clear display overlay
+			if(renderer.StartOverlay(true))
+			{
+				//mxd. Center 2d view on camera position in 3d view
+				if(General.Settings.GZSynchCameras && General.Editing.PreviousMode != null && General.Editing.PreviousMode.IsSubclassOf(typeof (VisualMode)))
+				{
+					Vector2D campos = new Vector2D(General.Map.VisualCamera.Position.x, General.Map.VisualCamera.Position.y);
+					renderer2d.PositionView(campos.x, campos.y);
+				}
+
+				renderer.Finish();
+			}
+			
+			base.OnEngage();
+		}
+
+		/// <summary>
+		/// Called when the user requests to cancel this editing mode.
+		/// </summary>
+		public override void OnCancel()
+		{
+			cancelled = true;
+			base.OnCancel();
+		}
+
+		//mxd
+		public override bool OnMapTestBegin(bool testFromCurrentPosition) 
+		{
+			if(testFromCurrentPosition) 
+			{
+				if(!mouseinside)
+				{
+					General.MainWindow.DisplayStatus(StatusType.Warning, "Can't test from current position: mouse is outside editing vindow!");
+					return false;
+				}
+				
+				//find Single Player Start. Should be type 1 in all games
+				Thing start = null;
+				
+				foreach(Thing t in General.Map.Map.Things) 
+				{
+					if(t.Type == 1) 
+					{
+						//store thing and position
+						if(start == null) 
+						{
+							start = t;
+						} 
+						else if(t.Index > start.Index) 
+						{
+							//if there are several Player Start 1 things, GZDoom uses one with the biggest index.
+							start = t;
+						}
+					}
+				}
+
+				if(start == null) 
+				{
+					General.MainWindow.DisplayStatus(StatusType.Warning, "Can't test from current position: no Player 1 start found!");
+					return false;
+				}
+
+				//now check if cursor is located inside a sector
+				Sector s = General.Map.Map.GetSectorByCoordinates(mousemappos);
+
+				if(s == null)
+				{
+					General.MainWindow.DisplayStatus(StatusType.Warning, "Can't test from current position: cursor is not inside sector!");
+					return false;
+				}
+
+				//41 = player's height in Doom. Is that so in all other games as well?
+				if(s.CeilHeight - s.FloorHeight < 41) 
+				{
+					General.MainWindow.DisplayStatus(StatusType.Warning, "Can't test from current position: sector is too low!");
+					return false;
+				}
+				
+				//store initial position
+				playerStart = start;
+				playerStartPosition = start.Position;
+
+				//everything should be valid, let's move player start here
+				start.Move(new Vector3D(mousemappos.x, mousemappos.y, s.FloorHeight));
+			}
+
+			return true;
+		}
+
+		public override void OnMapTestEnd(bool testFromCurrentPosition) 
+		{
+			if(testFromCurrentPosition) 
+			{
+				//restore position
+				playerStart.Move(playerStartPosition);
+				playerStart = null;
+			}
+		}
+
+		/// <summary>
+		/// This is called automatically when the Edit button is pressed.
+		/// (in Doom Builder 1, this was always the right mousebutton)
+		/// </summary>
+		[BeginAction("classicedit", BaseAction = true)]
+		protected virtual void OnEditBegin()
+		{
+		}
+
+		/// <summary>
+		/// This is called automatically when the Edit button is released.
+		/// (in Doom Builder 1, this was always the right mousebutton)
+		/// </summary>
+		[EndAction("classicedit", BaseAction = true)]
+		protected virtual void OnEditEnd()
+		{
+		}
+
+		/// <summary>
+		/// This is called automatically when the Select button is pressed.
+		/// (in Doom Builder 1, this was always the left mousebutton)
+		/// </summary>
+		[BeginAction("classicselect", BaseAction = true)]
+		protected virtual void OnSelectBegin()
+		{
+			selectpressed = true;//mxd
+		}
+
+		/// <summary>
+		/// This is called automatically when the Select button is released.
+		/// (in Doom Builder 1, this was always the left mousebutton)
+		/// </summary>
+		[EndAction("classicselect", BaseAction = true)]
+		protected virtual void OnSelectEnd()
+		{
+			selectpressed = false;//mxd
+			if(selecting) OnEndMultiSelection();
+		}
+
+		/// <summary>
+		/// This is called automatically when a rectangular multi-selection ends.
+		/// </summary>
+		protected virtual void OnEndMultiSelection()
+		{
+			selecting = false;
+			General.Hints.ShowHints(this.GetType(), HintsManager.GENERAL);
+		}
+
+		/// <summary>
+		/// Call this to initiate a rectangular multi-selection.
+		/// </summary>
+		protected virtual void StartMultiSelection()
+		{
+			selecting = true;
+			selectstart = mousemappos;
+			selectionrect = new RectangleF(selectstart.x, selectstart.y, 0, 0);
+
+			//mxd
+			General.Hints.ShowHints(this.GetType(), HintsManager.MULTISELECTION);
+		}
+
+		/// <summary>
+		/// This is called automatically when a multi-selection is updated.
+		/// </summary>
+		protected virtual void OnUpdateMultiSelection()
+		{
+			selectionrect.X = selectstart.x;
+			selectionrect.Y = selectstart.y;
+			selectionrect.Width = mousemappos.x - selectstart.x;
+			selectionrect.Height = mousemappos.y - selectstart.y;
+			
+			if(selectionrect.Width < 0f)
+			{
+				selectionrect.Width = -selectionrect.Width;
+				selectionrect.X -= selectionrect.Width;
+			}
+			
+			if(selectionrect.Height < 0f)
+			{
+				selectionrect.Height = -selectionrect.Height;
+				selectionrect.Y -= selectionrect.Height;
+			}
+		}
+
+		/// <summary>
+		/// Call this to draw the selection on the overlay layer.
+		/// Must call renderer.StartOverlay first!
+		/// </summary>
+		protected virtual void RenderMultiSelection()
+		{
+			//mxd
+			PixelColor marqueColor;
+
+			switch(marqueSelectionMode) 
+			{
+				case MarqueSelectionMode.SELECT:
+					marqueColor = General.Colors.Selection.WithAlpha(SELECTION_ALPHA);
+					break;
+
+				case MarqueSelectionMode.ADD:
+					marqueColor = General.Colors.Highlight.WithAlpha(SELECTION_ALPHA);
+					break;
+
+				case MarqueSelectionMode.SUBTRACT:
+					marqueColor = General.Colors.Selection.WithAlpha(SELECTION_ALPHA).InverseKeepAlpha();
+					break;
+
+				default: //should be Intersect
+					marqueColor = General.Colors.Highlight.WithAlpha(SELECTION_ALPHA).InverseKeepAlpha();
+					break;
+			}
+						
+			renderer.RenderRectangle(selectionrect, SELECTION_BORDER_SIZE, marqueColor, true);
+		}
+
+		/// <summary>
+		/// This is called automatically when the mouse is moved while panning
+		/// </summary>
+		protected virtual void OnUpdateViewPanning()
+		{
+			// We can only drag the map when the mouse pointer is inside
+			// otherwise we don't have coordinates where to drag the map to
+			if(mouseinside && !float.IsNaN(mouselastpos.x) && !float.IsNaN(mouselastpos.y))
+			{
+				// Get the map coordinates of the last mouse posision (before it moved)
+				Vector2D lastmappos = renderer2d.DisplayToMap(mouselastpos);
+				
+				// Do the scroll
+				ScrollBy(lastmappos.x - mousemappos.x, lastmappos.y - mousemappos.y);
+			}
+		}
+
+		/// <summary>
+		/// This selects given map element (mxd)
+		/// </summary>
+		public virtual void SelectMapElement(SelectableElement element) 
+		{
+			element.Selected = true;
+		}
+		
+		#endregion
+		
+		#region ================== Actions
+
+		[BeginAction("gridsetup", BaseAction = true)]
+		protected void ShowGridSetup()
+		{
+			GridSetup.ShowGridSetup();
+		}
+		
+		[BeginAction("pan_view", BaseAction = true)]
+		protected virtual void BeginViewPan()
+		{
+			panning = true;
+		}
+
+		[EndAction("pan_view", BaseAction = true)]
+		protected virtual void EndViewPan()
+		{
+			panning = false;
+		}
+
+		[BeginAction("viewmodenormal", BaseAction = true)]
+		protected virtual void ViewModeNormal()
+		{
+			SetViewMode(ViewMode.Normal);
+		}
+
+		[BeginAction("viewmodebrightness", BaseAction = true)]
+		protected virtual void ViewModeBrightness()
+		{
+			SetViewMode(ViewMode.Brightness);
+		}
+
+		[BeginAction("viewmodefloors", BaseAction = true)]
+		protected virtual void ViewModeFloors()
+		{
+			SetViewMode(ViewMode.FloorTextures);
+		}
+
+		[BeginAction("viewmodeceilings", BaseAction = true)]
+		protected virtual void ViewModeCeilings()
+		{
+			SetViewMode(ViewMode.CeilingTextures);
+		}
+
+		//mxd
+		[BeginAction("centeroncoordinates", BaseAction = true)]
+		protected virtual void CenterOnCoordinates() 
+		{
+			//show form...
+			CenterOnCoordinatesForm form = new CenterOnCoordinatesForm();
+			if(form.ShowDialog() == DialogResult.OK) 
+			{
+				//center view
+				renderer2d.PositionView(form.Coordinates.x, form.Coordinates.y);
+				General.Interface.RedrawDisplay();
+			}
+		}
+
+		#endregion
+	}
+
+	//mxd
+	public enum MarqueSelectionMode
+	{
+		SELECT,
+		ADD,
+		SUBTRACT,
+		INTERSECT,
+	}
+}
diff --git a/Source/Core/Editing/CopyPasteManager.cs b/Source/Core/Editing/CopyPasteManager.cs
new file mode 100644
index 0000000..b4db87b
--- /dev/null
+++ b/Source/Core/Editing/CopyPasteManager.cs
@@ -0,0 +1,604 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Actions;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.GZBuilder.Data;
+using CodeImp.DoomBuilder.IO;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Windows;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Editing
+{
+	public class CopyPasteManager
+	{
+		#region ================== Constants
+		
+		private const string CLIPBOARD_DATA_FORMAT = "GZDOOM_BUILDER_GEOMETRY";
+
+		#endregion
+		
+		#region ================== Variables
+		
+		// Disposing
+		private bool isdisposed;
+		
+		// Last inserted prefab
+		private string lastprefabfile;
+		
+		#endregion
+		
+		#region ================== Properties
+		
+		public bool IsDisposed { get { return isdisposed; } }
+		public bool IsPreviousPrefabAvailable { get { return (lastprefabfile != null); } }
+
+		#endregion
+		
+		#region ================== Constructor / Disposer
+		
+		// Constructor
+		internal CopyPasteManager()
+		{
+			// Initialize
+			
+			// Bind any methods
+			General.Actions.BindMethods(this);
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Disposer
+		internal void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Unbind any methods
+				General.Actions.UnbindMethods(this);
+				
+				// Done
+				isdisposed = true;
+			}
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+		
+		// This makes a prefab of the selection. Returns null when cancelled.
+		private static MemoryStream MakePrefab()
+		{
+			// Let the plugins know
+			if(General.Plugins.OnCopyBegin())
+			{
+				// Ask the editing mode to prepare selection for copying.
+				// The edit mode should mark all vertices, lines and sectors
+				// that need to be copied.
+				if(General.Editing.Mode.OnCopyBegin())
+				{
+					// Copy the marked geometry
+					// This links sidedefs that are not linked to a marked sector to a virtual sector
+					MapSet copyset = General.Map.Map.CloneMarked();
+					
+					// Convert flags and activations to UDMF fields, if needed
+					if(!(General.Map.FormatInterface is UniversalMapSetIO)) copyset.TranslateToUDMF(General.Map.FormatInterface.GetType());
+
+					// Write data to stream
+					MemoryStream memstream = new MemoryStream();
+					UniversalStreamWriter writer = new UniversalStreamWriter();
+					writer.RememberCustomTypes = false;
+					writer.Write(copyset, memstream, null);
+
+					// Compress the stream
+					memstream.Seek(0, SeekOrigin.Begin);
+					MemoryStream compressed = SharpCompressHelper.CompressStream(memstream);//mxd
+
+					// Done
+					memstream.Dispose();
+					General.Editing.Mode.OnCopyEnd();
+					General.Plugins.OnCopyEnd();
+					return compressed;
+				}
+			}
+
+			// Aborted
+			return null;
+		}
+
+		// This pastes a prefab. Returns false when paste was cancelled.
+		public void InsertPrefabStream(Stream stream, PasteOptions options)
+		{
+			// Cancel volatile mode
+			General.Editing.DisengageVolatileMode();
+
+			// Let the plugins know
+			if(General.Plugins.OnPasteBegin(options))
+			{
+				// Ask the editing mode to prepare selection for pasting.
+				if(General.Editing.Mode.OnPasteBegin(options))
+				{
+					Cursor oldcursor = Cursor.Current;
+					Cursor.Current = Cursors.WaitCursor;
+					
+					if(stream != null)
+						PastePrefab(stream, options);
+					
+					General.MainWindow.UpdateInterface();
+					
+					Cursor.Current = oldcursor;
+				}
+			}
+		}
+		
+		// This pastes a prefab. Returns false when paste was cancelled.
+		private static void PastePrefab(Stream filedata, PasteOptions options)
+		{
+			// Create undo
+			General.MainWindow.DisplayStatus(StatusType.Action, "Inserted prefab.");
+			General.Map.UndoRedo.CreateUndo("Insert prefab");
+			
+			// Decompress stream
+			MemoryStream memstream; //mxd
+			
+			try 
+			{
+				memstream = SharpCompressHelper.DecompressStream(filedata); //mxd
+				memstream.Seek(0, SeekOrigin.Begin);
+			}
+			catch(Exception e)
+			{
+				General.ErrorLogger.Add(ErrorType.Error, e.GetType().Name + " while reading prefab from file: " + e.Message);
+				General.WriteLogLine(e.StackTrace);
+				General.ShowErrorMessage("Unable to load prefab. See log file for error details.", MessageBoxButtons.OK);
+				return;
+			}
+			
+			// Mark all current geometry
+			General.Map.Map.ClearAllMarks(true);
+			
+			// Read data stream
+			UniversalStreamReader reader = new UniversalStreamReader(General.Map.FormatInterface.UIFields); //mxd
+			reader.StrictChecking = false;
+			General.Map.Map.BeginAddRemove();
+
+			//mxd. UniversalStreamReader can now throw errors
+			try
+			{
+				reader.Read(General.Map.Map, memstream);
+			}
+			catch(Exception e)
+			{
+				General.ErrorLogger.Add(ErrorType.Error, "Unable to load prefab. " + e.GetType().Name + ": " + e.Message);
+				General.ShowErrorMessage("Unable to load prefab." + Environment.NewLine + Environment.NewLine + e.Message, MessageBoxButtons.OK);
+				return;
+			}
+			finally
+			{
+				General.Map.Map.EndAddRemove();
+			}
+			
+			// The new geometry is not marked, so invert the marks to get it marked
+			General.Map.Map.InvertAllMarks();
+			
+			// Convert UDMF fields back to flags and activations, if needed
+			if(!(General.Map.FormatInterface is UniversalMapSetIO)) General.Map.Map.TranslateFromUDMF();
+
+			// Modify tags and actions if preferred
+			if(options.ChangeTags == PasteOptions.TAGS_REMOVE) Tools.RemoveMarkedTags();
+			if(options.ChangeTags == PasteOptions.TAGS_RENUMBER) Tools.RenumberMarkedTags();
+			if(options.RemoveActions) Tools.RemoveMarkedActions();
+			
+			// Done
+			memstream.Dispose();
+			General.Map.Map.UpdateConfiguration();
+			General.Map.ThingsFilter.Update();
+			General.Editing.Mode.OnPasteEnd(options);
+			General.Plugins.OnPasteEnd(options);
+		}
+		
+		// This performs the copy. Returns false when copy was cancelled.
+		private static bool DoCopySelection(string desc)
+		{
+			// Check if possible to copy/paste
+			if(General.Editing.Mode.Attributes.AllowCopyPaste)
+			{
+				// Let the plugins know
+				if(General.Plugins.OnCopyBegin())
+				{
+					// Ask the editing mode to prepare selection for copying.
+					// The edit mode should mark all vertices, lines and sectors
+					// that need to be copied.
+					if(General.Editing.Mode.OnCopyBegin())
+					{
+						General.MainWindow.DisplayStatus(StatusType.Action, desc);
+
+						// Copy the marked geometry
+						// This links sidedefs that are not linked to a marked sector to a virtual sector
+						MapSet copyset = General.Map.Map.CloneMarked();
+
+						// Convert flags and activations to UDMF fields, if needed
+						if(!(General.Map.FormatInterface is UniversalMapSetIO)) copyset.TranslateToUDMF(General.Map.FormatInterface.GetType());
+
+						// Write data to stream
+						MemoryStream memstream = new MemoryStream();
+						ClipboardStreamWriter writer = new ClipboardStreamWriter(); //mxd
+						writer.Write(copyset, memstream, General.Map.Config.UseLongTextureNames);
+
+						// Set on clipboard
+						Clipboard.SetData(CLIPBOARD_DATA_FORMAT, memstream);
+
+						// Done
+						memstream.Dispose();
+						General.Editing.Mode.OnCopyEnd();
+						General.Plugins.OnCopyEnd();
+						return true;
+					}
+				}
+			}
+			else
+			{
+				// Copy not allowed
+				General.MessageBeep(MessageBeepType.Warning);
+			}
+			
+			// Aborted
+			return false;
+		}
+		
+		// This performs the paste. Returns false when paste was cancelled.
+		private static void DoPasteSelection(PasteOptions options)
+		{
+			// Check if possible to copy/paste
+			if(General.Editing.Mode.Attributes.AllowCopyPaste)
+			{
+				// Anything to paste?
+				if(Clipboard.ContainsData(CLIPBOARD_DATA_FORMAT))
+				{
+					// Cancel volatile mode
+					General.Editing.DisengageVolatileMode();
+					
+					// Let the plugins know
+					if(General.Plugins.OnPasteBegin(options))
+					{
+						// Ask the editing mode to prepare selection for pasting.
+						if(General.Editing.Mode.OnPasteBegin(options.Copy()))
+						{
+							// Create undo
+							General.MainWindow.DisplayStatus(StatusType.Action, "Pasted selected elements.");
+							General.Map.UndoRedo.CreateUndo("Paste");
+							
+							// Read from clipboard
+							Stream memstream = (Stream)Clipboard.GetData(CLIPBOARD_DATA_FORMAT);
+							memstream.Seek(0, SeekOrigin.Begin);
+
+							// Mark all current geometry
+							General.Map.Map.ClearAllMarks(true);
+
+							// Read data stream
+							ClipboardStreamReader reader = new ClipboardStreamReader(); //mxd
+							General.Map.Map.BeginAddRemove();
+							reader.Read(General.Map.Map, memstream);
+							General.Map.Map.EndAddRemove();
+							
+							// The new geometry is not marked, so invert the marks to get it marked
+							General.Map.Map.InvertAllMarks();
+
+							// Convert UDMF fields back to flags and activations, if needed
+							if(!(General.Map.FormatInterface is UniversalMapSetIO)) General.Map.Map.TranslateFromUDMF();
+
+							//mxd. Translate texture names
+							General.Map.Map.TranslateTextureNames(General.Map.Config.UseLongTextureNames, true);
+							
+							// Modify tags and actions if preferred
+							if(options.ChangeTags == PasteOptions.TAGS_REMOVE) Tools.RemoveMarkedTags();
+							if(options.ChangeTags == PasteOptions.TAGS_RENUMBER) Tools.RenumberMarkedTags();
+							if(options.RemoveActions) Tools.RemoveMarkedActions();
+
+							// Clean up
+							memstream.Dispose();
+
+							// Check if anything was pasted
+							List<Thing> things = General.Map.Map.GetMarkedThings(true); //mxd
+							int totalpasted = things.Count;
+							totalpasted += General.Map.Map.GetMarkedVertices(true).Count;
+							totalpasted += General.Map.Map.GetMarkedLinedefs(true).Count;
+							totalpasted += General.Map.Map.GetMarkedSidedefs(true).Count;
+							totalpasted += General.Map.Map.GetMarkedSectors(true).Count;
+							if(totalpasted > 0)
+							{
+								foreach(Thing t in things) t.UpdateConfiguration(); //mxd
+								General.Map.ThingsFilter.Update();
+								General.Editing.Mode.OnPasteEnd(options.Copy());
+								General.Plugins.OnPasteEnd(options);
+							}
+							return;
+						}
+					}
+				}
+				else
+				{
+					// Nothing usefull on the clipboard
+					General.MessageBeep(MessageBeepType.Warning);
+				}
+			}
+			else
+			{
+				// Paste not allowed
+				General.MessageBeep(MessageBeepType.Warning);
+			}
+		}
+		
+		#endregion
+		
+		#region ================== Actions
+		
+		// This copies the current selection
+		[BeginAction("copyselection")]
+		public void CopySelection()
+		{
+			DoCopySelection("Copied selected elements.");
+		}
+		
+		// This cuts the current selection
+		[BeginAction("cutselection")]
+		public void CutSelection()
+		{
+			// Copy selected geometry
+			if(DoCopySelection("Cut selected elements."))
+			{
+				// Get the delete action and check if it's bound
+				Actions.Action deleteitem = General.Actions["builder_deleteitem"];
+				if(deleteitem.BeginBound)
+				{
+					// Perform delete action
+					deleteitem.Begin();
+					deleteitem.End();
+				}
+				else
+				{
+					// Action not bound
+					General.Interface.DisplayStatus(StatusType.Warning, "Cannot remove that in this mode.");
+				}
+			}
+		}
+		
+		// This pastes what is on the clipboard and marks the new geometry
+		[BeginAction("pasteselectionspecial")]
+		public void PasteSelectionSpecial()
+		{
+			// Check if possible to copy/paste
+			if(General.Editing.Mode.Attributes.AllowCopyPaste)
+			{
+				PasteOptionsForm form = new PasteOptionsForm();
+				DialogResult result = form.ShowDialog(General.MainWindow);
+				if(result == DialogResult.OK) DoPasteSelection(form.Options);
+				form.Dispose();
+			}
+			else
+			{
+				// Paste not allowed
+				General.MessageBeep(MessageBeepType.Warning);
+			}
+		}
+		
+		// This pastes what is on the clipboard and marks the new geometry
+		[BeginAction("pasteselection")]
+		public void PasteSelection()
+		{
+			DoPasteSelection(General.Settings.PasteOptions);
+		}
+
+		// This creates a new prefab from selection
+		[BeginAction("createprefab")]
+		public void CreatePrefab()
+		{
+			// Check if possible to copy/paste
+			if(General.Editing.Mode.Attributes.AllowCopyPaste)
+			{
+				Cursor oldcursor = Cursor.Current;
+				Cursor.Current = Cursors.WaitCursor;
+				
+				MemoryStream data = MakePrefab();
+				if(data != null)
+				{
+					Cursor.Current = oldcursor;
+					
+					SaveFileDialog savefile = new SaveFileDialog();
+					savefile.Filter = "Doom Builder Prefabs (*.dbprefab)|*.dbprefab";
+					savefile.Title = "Save Prefab As";
+					savefile.AddExtension = true;
+					savefile.CheckPathExists = true;
+					savefile.OverwritePrompt = true;
+					savefile.ValidateNames = true;
+					if(savefile.ShowDialog(General.MainWindow) == DialogResult.OK)
+					{
+						try
+						{
+							Cursor.Current = Cursors.WaitCursor;
+							if(File.Exists(savefile.FileName)) File.Delete(savefile.FileName);
+							File.WriteAllBytes(savefile.FileName, data.ToArray());
+						}
+						catch(Exception e)
+						{
+							Cursor.Current = oldcursor;
+							General.ErrorLogger.Add(ErrorType.Error, e.GetType().Name + " while writing prefab to file: " + e.Message);
+							General.WriteLogLine(e.StackTrace);
+							General.ShowErrorMessage("Error while writing prefab to file! See log file for error details.", MessageBoxButtons.OK);
+						}
+					}
+					data.Dispose();
+				}
+				else
+				{
+					// Can't make a prefab right now
+					General.MessageBeep(MessageBeepType.Warning);
+				}
+				
+				// Done
+				General.MainWindow.UpdateInterface();
+				Cursor.Current = oldcursor;
+			}
+			else
+			{
+				// Create prefab not allowed
+				General.MessageBeep(MessageBeepType.Warning);
+			}
+		}
+		
+		// This pastes a prefab from file
+		[BeginAction("insertprefabfile")]
+		public void InsertPrefabFile()
+		{
+			// Check if possible to copy/paste
+			if(General.Editing.Mode.Attributes.AllowCopyPaste)
+			{
+				PasteOptions options = General.Settings.PasteOptions.Copy();
+
+				// Cancel volatile mode
+				General.Editing.DisengageVolatileMode();
+
+				// Let the plugins know
+				if(General.Plugins.OnPasteBegin(options))
+				{
+					// Ask the editing mode to prepare selection for pasting.
+					if(General.Editing.Mode.OnPasteBegin(options))
+					{
+						Cursor oldcursor = Cursor.Current;
+
+						OpenFileDialog openfile = new OpenFileDialog();
+						openfile.Filter = "Doom Builder Prefabs (*.dbprefab)|*.dbprefab";
+						openfile.Title = "Open Prefab";
+						openfile.AddExtension = false;
+						openfile.CheckFileExists = true;
+						openfile.Multiselect = false;
+						openfile.ValidateNames = true;
+						if(openfile.ShowDialog(General.MainWindow) == DialogResult.OK)
+						{
+							FileStream stream = null;
+
+							try
+							{
+								Cursor.Current = Cursors.WaitCursor;
+								stream = File.OpenRead(openfile.FileName);
+							}
+							catch(Exception e)
+							{
+								Cursor.Current = oldcursor;
+								General.ErrorLogger.Add(ErrorType.Error, e.GetType().Name + " while reading prefab from file: " + e.Message);
+								General.WriteLogLine(e.StackTrace);
+								General.ShowErrorMessage("Error while reading prefab from file! See log file for error details.", MessageBoxButtons.OK);
+							}
+
+							if(stream != null)
+							{
+								PastePrefab(stream, options);
+								lastprefabfile = openfile.FileName;
+							}
+							General.MainWindow.UpdateInterface();
+							stream.Dispose();
+						}
+
+						Cursor.Current = oldcursor;
+					}
+				}
+			}
+			else
+			{
+				// Insert not allowed
+				General.MessageBeep(MessageBeepType.Warning);
+			}
+		}
+		
+		// This pastes the previously inserted prefab
+		[BeginAction("insertpreviousprefab")]
+		public void InsertPreviousPrefab()
+		{
+			// Check if possible to copy/paste
+			if(General.Editing.Mode.Attributes.AllowCopyPaste)
+			{
+				PasteOptions options = General.Settings.PasteOptions.Copy();
+
+				// Is there a previously inserted prefab?
+				if(IsPreviousPrefabAvailable)
+				{
+					// Does the file still exist?
+					if(File.Exists(lastprefabfile))
+					{
+						// Cancel volatile mode
+						General.Editing.DisengageVolatileMode();
+
+						// Let the plugins know
+						if(General.Plugins.OnPasteBegin(options))
+						{
+							// Ask the editing mode to prepare selection for pasting.
+							if(General.Editing.Mode.OnPasteBegin(options))
+							{
+								Cursor oldcursor = Cursor.Current;
+								FileStream stream = null;
+
+								try
+								{
+									Cursor.Current = Cursors.WaitCursor;
+									stream = File.OpenRead(lastprefabfile);
+								}
+								catch(Exception e)
+								{
+									Cursor.Current = oldcursor;
+									General.ErrorLogger.Add(ErrorType.Error, e.GetType().Name + " while reading prefab from file: " + e.Message);
+									General.WriteLogLine(e.StackTrace);
+									General.ShowErrorMessage("Error while reading prefab from file! See log file for error details.", MessageBoxButtons.OK);
+								}
+
+								if(stream != null) PastePrefab(stream, options);
+								stream.Dispose();
+								General.MainWindow.UpdateInterface();
+								Cursor.Current = oldcursor;
+							}
+						}
+					}
+					else
+					{
+						General.MessageBeep(MessageBeepType.Warning);
+						lastprefabfile = null;
+						General.MainWindow.UpdateInterface();
+					}
+				}
+				else
+				{
+					General.MessageBeep(MessageBeepType.Warning);
+				}
+			}
+			else
+			{
+				// Insert not allowed
+				General.MessageBeep(MessageBeepType.Warning);
+			}
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Editing/CustomThingsFilter.cs b/Source/Core/Editing/CustomThingsFilter.cs
new file mode 100644
index 0000000..6231ed9
--- /dev/null
+++ b/Source/Core/Editing/CustomThingsFilter.cs
@@ -0,0 +1,70 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+/*#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Editing
+{
+	public class CustomThingsFilter : ThingsFilter
+	{
+		#region ================== Variables
+
+		#endregion
+
+		#region ================== Properties
+
+		new public string Name { get { return name; } set { name = value; } }
+		new public string CategoryName { get { return categoryname; } set { categoryname = value; } }
+		new public int ThingType { get { return thingtype; } set { thingtype = value; } }
+		new public ICollection<string> RequiredFields { get { return requiredfields; } }
+		new public ICollection<string> ForbiddenFields { get { return forbiddenfields; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor for a new filter
+		public CustomThingsFilter()
+		{
+			// Initialize
+			requiredfields = new List<string>();
+			forbiddenfields = new List<string>();
+			categoryname = "";
+			thingtype = -1;
+			name = "Unnamed filter";
+
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Disposer
+		new public virtual void Dispose()
+		{
+			base.Dispose();
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		#endregion
+	}
+}*/
diff --git a/Source/Core/Editing/EditMode.cs b/Source/Core/Editing/EditMode.cs
new file mode 100644
index 0000000..31825fc
--- /dev/null
+++ b/Source/Core/Editing/EditMode.cs
@@ -0,0 +1,260 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Windows.Forms;
+using System.Reflection;
+using System.Diagnostics;
+using CodeImp.DoomBuilder.Actions;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Windows;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Editing
+{
+	/// <summary>
+	/// Provides basic user input interface functionality for a Doom Builder editing mode.
+	/// </summary>
+	public abstract class EditMode
+	{
+		#region ================== Constants
+
+		public const int DRAG_START_MOVE_PIXELS = 5;
+
+		#endregion
+
+		#region ================== Variables
+		
+		// Attributes
+		private EditModeAttribute attributes;
+		
+		// Disposing
+		protected bool isdisposed;
+
+		#endregion
+
+		#region ================== Properties
+
+		public bool IsDisposed { get { return isdisposed; } }
+
+		public EditModeAttribute Attributes { get { return attributes; } }
+		
+		// Unless overriden, this returns the name of this mode
+		// for checking the appropriate button on the toolbar.
+		public virtual string EditModeButtonName { get { return GetType().Name; } }
+
+		// Override this to provide a highlighted object, if applicable
+		public virtual object HighlightedObject { get { return null; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		/// <summary>
+		/// Provides basic user input interface functionality for a Doom Builder editing mode.
+		/// </summary>
+		protected EditMode()
+		{
+			// Fetch attributes
+			object[] attrs = this.GetType().GetCustomAttributes(true);
+			foreach(object a in attrs)
+			{
+				if(a is EditModeAttribute)
+				{
+					attributes = (EditModeAttribute)a;
+					break;
+				}
+			}
+
+			// No attributes found?
+			if(attributes == null) throw new Exception("Editing mode \"" + this.GetType().Name + "\" is missing EditMode attributes!");
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Disposer
+		public virtual void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Clean up
+
+				// Done
+				isdisposed = true;
+			}
+		}
+
+		#endregion
+
+		#region ================== Static Methods
+
+		// This creates an instance of a specific mode
+		public static EditMode Create(Type modetype, object[] args)
+		{
+			try
+			{
+				// Create new mode
+				return (EditMode)General.ThisAssembly.CreateInstance(modetype.FullName, false,
+					BindingFlags.Default, null, args, CultureInfo.CurrentCulture, new object[0]);
+			}
+			// Catch errors
+			catch(TargetInvocationException e)
+			{
+				// Throw the actual exception
+				Debug.WriteLine(DateTime.Now.ToShortDateString() + " " + DateTime.Now.ToShortTimeString());
+				Debug.WriteLine(e.InnerException.Source + " throws " + e.InnerException.GetType().Name + ":");
+				Debug.WriteLine(e.InnerException.Message);
+				Debug.WriteLine(e.InnerException.StackTrace);
+				throw e.InnerException;
+			}
+		}
+		
+		#endregion
+
+		#region ================== Methods
+
+		//mxd
+		public virtual void UpdateSelectionInfo()
+		{
+			// Collect info
+			List<string> info = new List<string>();
+
+			if(General.Map.Map.SelectedSectorsCount > 0)
+				info.Add(General.Map.Map.SelectedSectorsCount + (General.Map.Map.SelectedSectorsCount == 1 ? " sector" : " sectors"));
+
+			if(General.Map.Map.SelectedLinedefsCount > 0)
+				info.Add(General.Map.Map.SelectedLinedefsCount + (General.Map.Map.SelectedLinedefsCount == 1 ? " linedef" : " linedefs"));
+
+			if(General.Map.Map.SelectedVerticessCount > 0)
+				info.Add(General.Map.Map.SelectedVerticessCount + (General.Map.Map.SelectedVerticessCount == 1 ? " vertex" : " vertices"));
+
+			if(General.Map.Map.SelectedThingsCount > 0)
+				info.Add(General.Map.Map.SelectedThingsCount + (General.Map.Map.SelectedThingsCount == 1 ? " thing" : " things"));
+
+			// Display results
+			string result = string.Empty;
+			if(info.Count > 0)
+			{
+				result = string.Join(", ", info.ToArray());
+				int pos = result.LastIndexOf(",", StringComparison.Ordinal);
+				if(pos != -1) result = result.Remove(pos, 1).Insert(pos, " and");
+				result += " selected.";
+			}
+
+			General.Interface.DisplayStatus(StatusType.Selection, result);
+		}
+
+		#endregion
+
+		#region ================== Events
+
+		//
+		// Order in which events occur for the old and new modes:
+		// 
+		// - Constructor of new mode is called
+		// - Disengage of old mode is called
+		// ----- Mode switches -----
+		// - Engage of new mode is called
+		// - Dispose of old mode is called
+		//
+		
+		// Mode engages
+		public virtual void OnEngage()
+		{
+			// Bind any methods
+			General.Actions.BindMethods(this);
+
+			//mxd. Show hints for this mode
+			General.Hints.ShowHints(this.GetType(), HintsManager.GENERAL);
+
+			//mxd. Display new mode name
+			General.Interface.HideInfo();
+		}
+
+		// Mode disengages
+		public virtual void OnDisengage()
+		{
+			// Unbind any methods
+			General.Actions.UnbindMethods(this);
+		}
+
+		// Called when the user presses F1 for Help
+		public virtual void OnHelp() { }
+
+		// This forces the mode to cancel and return to the "parent" mode
+		public virtual void OnCancel() { }
+		public virtual void OnAccept() { }
+
+		// Called before copying. Return false when copying should be cancelled.
+		// The edit mode should mark all vertices, lines and sectors
+		// that need to be copied.
+		public virtual bool OnCopyBegin() { return false; }
+
+		// Called when the marked geometry has been copied.
+		public virtual void OnCopyEnd() { }
+		
+		// Called before pasting. Override this and return true to indicate that paste is allowed to contiue.
+		public virtual bool OnPasteBegin(PasteOptions options) { return false; }
+
+		// Called after new geometry has been pasted in. The new geometry is marked.
+		public virtual void OnPasteEnd(PasteOptions options) { }
+		
+		// Called when undo/redo is used
+		// Return false to cancel undo action
+		public virtual bool OnUndoBegin() { return true; }
+		public virtual bool OnRedoBegin() { return true; }
+		public virtual void OnUndoEnd() { General.Map.Renderer2D.UpdateExtraFloorFlag(); } //mxd
+		public virtual void OnRedoEnd() { General.Map.Renderer2D.UpdateExtraFloorFlag(); } //mxd
+		
+		// Interface events
+		public virtual void OnMouseClick(MouseEventArgs e) { }
+		public virtual void OnMouseDoubleClick(MouseEventArgs e) { }
+		public virtual void OnMouseDown(MouseEventArgs e) { }
+		public virtual void OnMouseEnter(EventArgs e) { }
+		public virtual void OnMouseLeave(EventArgs e) { }
+		public virtual void OnMouseMove(MouseEventArgs e) { }
+		public virtual void OnMouseUp(MouseEventArgs e) { }
+		public virtual void OnKeyDown(KeyEventArgs e) { }
+		public virtual void OnKeyUp(KeyEventArgs e) { }
+		public virtual void OnMouseInput(Vector2D delta) { }
+		
+		// Rendering events
+		public virtual void OnRedrawDisplay() { }
+		public virtual void OnPresentDisplay() { }
+
+		// Processing events
+		public virtual void OnProcess(float deltatime) { }
+		
+		// Generic events
+		public virtual void OnReloadResources() { }
+		public virtual void OnMapSetChangeBegin() { }
+		public virtual void OnMapSetChangeEnd() { }
+
+		//mxd. map testing events
+		public virtual bool OnMapTestBegin(bool testFromCurrentPosition) { return true; } //called before test map is launched. Returns false if map launch is impossible
+		public virtual void OnMapTestEnd(bool testFromCurrentPosition) { } //called after game engine is closed
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Editing/EditModeAttribute.cs b/Source/Core/Editing/EditModeAttribute.cs
new file mode 100644
index 0000000..662a2a9
--- /dev/null
+++ b/Source/Core/Editing/EditModeAttribute.cs
@@ -0,0 +1,137 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Editing
+{
+	/// <summary>
+	/// This registers an EditMode derived class as a known editing mode within Doom Builder.
+	/// Allows automatic binding with an action and a button on the toolbar/menu.
+	/// </summary>
+	[AttributeUsage(AttributeTargets.Class, Inherited = true, AllowMultiple = true)]
+	public class EditModeAttribute : Attribute
+	{
+		#region ================== Variables
+		
+		// Properties
+		private string switchaction;
+		private string buttonimage;
+		private int buttonorder;
+		private string buttongroup = "~none";
+		private bool optional = true;
+		private bool isvolatile;
+		private string displayname = "<unnamed mode>";
+		private bool allowcopypaste = true;
+		private bool usebydefault;
+		private bool safestartmode;
+		private string[] supportedmapformats; //mxd
+		
+		#endregion
+		
+		#region ================== Properties
+
+		/// <summary>
+		/// Sets the action name (as defined in the Actions.cfg resource) to
+		/// switch to this mode by using a shortcut key, toolbar button or menu item.
+		/// </summary>
+		public string SwitchAction { get { return switchaction; } set { switchaction = value; } }
+
+		/// <summary>
+		/// Image resource name of the embedded resource that will be used for the
+		/// toolbar button and menu item. Leave this property out or set to null to
+		/// display no button for this mode.
+		/// </summary>
+		public string ButtonImage { get { return buttonimage; } set { buttonimage = value; } }
+
+		/// <summary>
+		/// Sorting number for the order of buttons on the toolbar. Buttons with
+		/// lower values will be more to the left than buttons with higher values.
+		/// </summary>
+		public int ButtonOrder { get { return buttonorder; } set { buttonorder = value; } }
+
+		/// <summary>
+		/// Grouping name for buttons on the toolbar. Groups are sorted alphabetically.
+		/// </summary>
+		public string ButtonGroup { get { return buttongroup; } set { buttongroup = value; } }
+
+		/// <summary>
+		/// When set to false, this mode will always be available for use and the user cannot
+		/// change this in the game configuration.
+		/// </summary>
+		public bool Optional { get { return optional; } set { optional = value; } }
+
+		/// <summary>
+		/// Set this to true to select this editing mode for use in all game configurations
+		/// by default. This only applies the first time and can still be changed by the user.
+		/// THIS OPTION MAY BE INTRUSIVE TO THE USER, USE WITH GREAT CARE!
+		/// </summary>
+		public bool UseByDefault { get { return usebydefault; } set { usebydefault = value; } }
+
+		/// <summary>
+		/// When set to true, this mode is cancelled when core actions like
+		/// undo and save are performed. The editing mode should then return to
+		/// a non-volatile mode.
+		/// </summary>
+		public bool Volatile { get { return isvolatile; } set { isvolatile = value; } }
+
+		/// <summary>
+		/// Name to display in the game configuration editing modes list and on the
+		/// information bar when the mode is currently active.
+		/// </summary>
+		public string DisplayName { get { return displayname; } set { displayname = value; } }
+
+		/// <summary>
+		/// When set to false, the actions Cut, Copy and Paste cannot be used
+		/// in this mode. Default for this property is true.
+		/// </summary>
+		public bool AllowCopyPaste { get { return allowcopypaste; } set { allowcopypaste = value; } }
+
+		/// <summary>
+		/// Set this to true when it is safe to have the editor start in this mode when
+		/// opening a map. The user can then select this as starting mode in the configuration.
+		/// </summary>
+		public bool SafeStartMode { get { return safestartmode; } set { safestartmode = value; } }
+
+		/// <summary>
+		/// List of map formats this mode can work with. Null means all map formats are supported (mxd)
+		/// </summary>
+		public string[] SupportedMapFormats { get { return supportedmapformats; } set { supportedmapformats = value; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		/// <summary>
+		/// This registers an EditMode derived class as a known editing mode within Doom Builder.
+		/// Allows automatic binding with an action and a button on the toolbar/menu.
+		/// </summary>
+		public EditModeAttribute()
+		{
+			// Initialize
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Editing/EditModeInfo.cs b/Source/Core/Editing/EditModeInfo.cs
new file mode 100644
index 0000000..a236035
--- /dev/null
+++ b/Source/Core/Editing/EditModeInfo.cs
@@ -0,0 +1,222 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Drawing;
+using System.IO;
+using CodeImp.DoomBuilder.Actions;
+using CodeImp.DoomBuilder.Plugins;
+using CodeImp.DoomBuilder.VisualModes;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Editing
+{
+	internal class EditModeInfo : IComparable<EditModeInfo>
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		// Mode type
+		private Plugin plugin;
+		private readonly Type type;
+		private readonly EditModeAttribute attribs;
+		
+		// Mode switching
+		private readonly BeginActionAttribute switchactionattr;
+		private ActionDelegate switchactiondel;
+
+		// Mode button
+		private readonly Image buttonimage;
+		private readonly string buttondesc;
+		private readonly int buttonorder = int.MaxValue;
+
+		//mxd. Disposing
+		private bool isdisposed;
+		
+		#endregion
+
+		#region ================== Properties
+
+		public Plugin Plugin { get { return plugin; } }
+		public Type Type { get { return type; } }
+		public bool IsOptional { get { return ((switchactionattr != null) || (buttonimage != null)) && attribs.Optional; } }
+		public BeginActionAttribute SwitchAction { get { return switchactionattr; } }
+		public Image ButtonImage { get { return buttonimage; } }
+		public string ButtonDesc { get { return buttondesc; } }
+		public EditModeAttribute Attributes { get { return attribs; } }
+		
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public EditModeInfo(Plugin plugin, Type type, EditModeAttribute attr)
+		{
+			// Initialize
+			this.plugin = plugin;
+			this.type = type;
+			this.attribs = attr;
+			
+			// Make switch action info
+			if(!string.IsNullOrEmpty(attribs.SwitchAction))
+				switchactionattr = new BeginActionAttribute(attribs.SwitchAction);
+			
+			// Make button info
+			if(!string.IsNullOrEmpty(attr.ButtonImage))
+			{
+				using(Stream stream = plugin.GetResourceStream(attr.ButtonImage))
+				{
+					if(stream != null)
+					{
+						buttonimage = Image.FromStream(stream);
+						buttondesc = attr.DisplayName;
+						buttonorder = attr.ButtonOrder;
+					}
+				}
+			}
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Disposer
+		public void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Dispose
+				UnbindSwitchAction();
+				if(buttonimage != null) buttonimage.Dispose();
+
+				// Clean up
+				plugin = null;
+
+				// Done
+				isdisposed = true;
+			}
+		}
+		
+		#endregion
+
+		#region ================== Methods
+		
+		// This binds the action to switch to this editing mode
+		public void BindSwitchAction()
+		{
+			if((switchactiondel == null) && (switchactionattr != null))
+			{
+				switchactiondel = UserSwitchToMode;
+				General.Actions.BindBeginDelegate(plugin.Assembly, switchactiondel, switchactionattr);
+			}
+		}
+		
+		// This unbind the switch action
+		public void UnbindSwitchAction()
+		{
+			if(switchactiondel != null)
+			{
+				General.Actions.UnbindBeginDelegate(plugin.Assembly, switchactiondel, switchactionattr);
+				switchactiondel = null;
+			}
+		}
+		
+		// This switches to the mode by user command
+		// (when user presses shortcut key)
+		public void UserSwitchToMode()
+		{
+			// Only when a map is opened
+			if(General.Map != null)
+			{
+				// Switching from volatile mode to volatile mode?
+				if((General.Editing.Mode != null) && General.Editing.Mode.Attributes.Volatile && this.attribs.Volatile)
+				{
+					// First cancel previous volatile mode
+					General.Editing.CancelVolatileMode();
+				}
+				
+				// When in VisualMode and switching to the same VisualMode, then we switch back to the previous classic mode
+				if((General.Editing.Mode is VisualMode) && (type == General.Editing.Mode.GetType()))
+				{
+					// Switch back to last classic mode
+					General.Editing.ChangeMode(General.Editing.PreviousClassicMode.Name);
+				}
+				else
+				{
+					// Create instance
+					EditMode newmode = plugin.CreateObject<EditMode>(type);
+					
+					//mxd. Switch mode?
+					if(newmode != null) General.Editing.ChangeMode(newmode);
+				}
+			}
+		}
+		
+		// This switches to the mode
+		public void SwitchToMode()
+		{
+			// Only when a map is opened
+			if(General.Map != null)
+			{
+				// Create instance
+				EditMode newmode = plugin.CreateObject<EditMode>(type);
+
+				//mxd. Switch mode?
+				if(newmode != null) General.Editing.ChangeMode(newmode);
+			}
+		}
+
+		// This switches to the mode with arguments
+		public void SwitchToMode(object[] args)
+		{
+			// Only when a map is opened
+			if(General.Map != null)
+			{
+				// Create instance
+				EditMode newmode = plugin.CreateObjectA<EditMode>(type, args);
+
+				// Switch mode
+				if(!General.Editing.ChangeMode(newmode))
+				{
+					// When cancelled, dispose mode
+					newmode.Dispose();
+				}
+			}
+		}
+		
+		// String representation
+		public override string ToString()
+		{
+			return attribs.DisplayName;
+		}
+
+		// Compare by button order
+		public int CompareTo(EditModeInfo other)
+		{
+			if(this.buttonorder > other.buttonorder) return 1;
+			if(this.buttonorder < other.buttonorder) return -1;
+			return 0;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Editing/EditingManager.cs b/Source/Core/Editing/EditingManager.cs
new file mode 100644
index 0000000..fc189bf
--- /dev/null
+++ b/Source/Core/Editing/EditingManager.cs
@@ -0,0 +1,453 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Windows;
+using CodeImp.DoomBuilder.Actions;
+using CodeImp.DoomBuilder.Plugins;
+using CodeImp.DoomBuilder.VisualModes;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Editing
+{
+	public sealed class EditingManager
+	{
+		#region ================== Constants
+		
+		#endregion
+		
+		#region ================== Variables
+		
+		// All editing mode groups, sorted alphabetically
+		private List<string> groups;
+		
+		// All editing modes available
+		private List<EditModeInfo> allmodes;
+		
+		// Editing modes selected through configuration
+		private List<EditModeInfo> usedmodes;
+		
+		// Status
+		private EditMode mode;
+		private EditMode newmode;
+		private Type prevmode;
+		private Type prevstablemode;
+		private Type prevclassicmode;
+		private bool disengaging;
+
+		// Disposing
+		private bool isdisposed;
+		
+		#endregion
+		
+		#region ================== Properties
+		
+		internal List<EditModeInfo> ModesInfo { get { return allmodes; } }
+		public EditMode Mode { get { return mode; } }
+		public EditMode NewMode { get { return newmode; } }
+		public Type PreviousMode { get { return prevmode; } }
+		public Type PreviousStableMode { get { return prevstablemode; } }
+		public Type PreviousClassicMode { get { return prevclassicmode; } }
+		public bool IsDisposed { get { return isdisposed; } }
+		
+		#endregion
+		
+		#region ================== Constructor / Disposer
+		
+		// Constructor
+		internal EditingManager()
+		{
+			// Initialize
+			allmodes = new List<EditModeInfo>();
+			usedmodes = new List<EditModeInfo>();
+			groups = new List<string>();
+			
+			// Bind any methods
+			General.Actions.BindMethods(this);
+			
+			// Make list of all editing modes we can find
+			foreach(Plugin p in General.Plugins.Plugins)
+			{
+				// For all classes that inherit from EditMode
+				Type[] editclasses = p.FindClasses(typeof(EditMode));
+				foreach(Type t in editclasses)
+				{
+					// For all defined EditMode attributes
+					EditModeAttribute[]  emattrs = (EditModeAttribute[])t.GetCustomAttributes(typeof(EditModeAttribute), false);
+					foreach(EditModeAttribute a in emattrs)
+					{
+						// Make edit mode information
+						EditModeInfo modeinfo = new EditModeInfo(p, t, a);
+						allmodes.Add(modeinfo);
+						
+						// Add group if not added yet
+						if(!groups.Contains(modeinfo.Attributes.ButtonGroup))
+							groups.Add(modeinfo.Attributes.ButtonGroup);
+					}
+				}
+			}
+			
+			// Sort the lists
+			allmodes.Sort();
+			groups.Sort();
+			
+			// Update modes
+			UpdateCurrentEditModes();
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+		
+		// Disposer
+		internal void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Unbind any methods
+				General.Actions.UnbindMethods(this);
+				
+				// Clean up
+				foreach(EditModeInfo i in allmodes) i.Dispose(); //mxd
+				
+				// Done
+				isdisposed = true;
+			}
+		}
+		
+		#endregion
+
+		#region ================== Switch Actions
+		
+		// This unbinds all editing mode switch actions
+		private void UnbindSwitchActions()
+		{
+			foreach(EditModeInfo emi in allmodes)
+			{
+				emi.UnbindSwitchAction();
+			}
+		}
+		
+		// This binds all editing mode switch actions for the available modes only
+		private void BindAvailableSwitchActions()
+		{
+			// In case of VisualMode, we only bind the switch action
+			// of the VisualMode to switch back to the previous mode
+			if(mode is VisualMode)
+			{
+				// Bind only the switch action for this mode
+				EditModeInfo info = GetEditModeInfo(mode.GetType());
+				info.BindSwitchAction();
+			}
+			else
+			{
+				// Bind all available mode swtich actions
+				foreach(EditModeInfo emi in usedmodes)
+				{
+					emi.BindSwitchAction();
+				}
+			}
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+		
+		// This cancels a volatile mode, as if the user presses cancel
+		public bool CancelVolatileMode()
+		{
+			// Volatile mode?
+			if((General.Map != null) & (mode != null) && mode.Attributes.Volatile && !disengaging)
+			{
+				// Cancel
+				disengaging = true;
+				General.Plugins.OnEditCancel();
+				mode.OnCancel();
+				return true;
+			}
+			else
+			{
+				// Mode is not volatile
+				return false;
+			}
+		}
+		
+		// This disengages a volatile mode, leaving the choice to cancel or accept to the editing mode
+		public bool DisengageVolatileMode()
+		{
+			// Volatile mode?
+			if((General.Map != null) && (mode != null) && mode.Attributes.Volatile && !disengaging)
+			{
+				// Change back to normal mode
+				disengaging = true;
+				ChangeMode(prevstablemode.Name);
+				return true;
+			}
+			else
+			{
+				// Mode is not volatile
+				return false;
+			}
+		}
+		
+		// This returns specific editing mode info by name
+		internal EditModeInfo GetEditModeInfo(string editmodename)
+		{
+			// Find the edit mode
+			foreach(EditModeInfo emi in usedmodes)
+			{
+				// Mode matches class name?
+				if(emi.Type.Name == editmodename) return emi;
+			}
+			
+			// No such mode found
+			return null;
+		}
+		
+		// This returns specific editing mode info by name
+		internal EditModeInfo GetEditModeInfo(Type modetype)
+		{
+			// Find the edit mode
+			foreach(EditModeInfo emi in usedmodes)
+			{
+				// Mode matches class name?
+				if(emi.Type == modetype) return emi;
+			}
+			
+			// No such mode found
+			return null;
+		}
+		
+		// This is called when the editing modes must update
+		internal void UpdateCurrentEditModes()
+		{
+			// Unbind editing mode switch actions
+			UnbindSwitchActions();
+			
+			// Rebuild list of used modes
+			usedmodes.Clear();
+			if(General.Map != null)
+			{
+				foreach(EditModeInfo emi in allmodes)
+				{
+					// Include the mode if it supports current map format (mxd)
+					// Also include the mode when it is listed and enabled or when it's not optional
+					if( (emi.Attributes.SupportedMapFormats == null || Array.IndexOf(emi.Attributes.SupportedMapFormats, General.Map.Config.FormatInterface) != -1) &&
+						((General.Map.ConfigSettings.EditModes.ContainsKey(emi.Type.FullName) && 
+						General.Map.ConfigSettings.EditModes[emi.Type.FullName] ) 
+						 || !emi.IsOptional) )
+					{
+						// Add the mode to be used and bind switch action
+						usedmodes.Add(emi);
+					}
+				}
+			}
+			
+			// Bind switch action for used modes
+			BindAvailableSwitchActions();
+			
+			// Remove editing mode buttons from interface
+			General.MainWindow.RemoveEditModeButtons();
+			
+			// Go for all the editing mode groups
+			foreach(string grp in groups)
+			{
+				General.MainWindow.AddEditModeSeperator(grp);
+				
+				// Go for all used edit modes to add buttons
+				foreach(EditModeInfo emi in usedmodes)
+				{
+					if((emi.ButtonImage != null) && (emi.ButtonDesc != null) &&
+					   (emi.Attributes.ButtonGroup == grp))
+						General.MainWindow.AddEditModeButton(emi);
+				}
+			}
+		}
+		
+		//
+		// This changes the editing mode.
+		// Order in which events occur for the old and new modes:
+		// 
+		// - Constructor of new mode is called
+		// - Disengage of old mode is called
+		// ----- Mode switches -----
+		// - Engage of new mode is called
+		// - Dispose of old mode is called
+		//
+		// Returns false when cancelled
+		public bool ChangeMode(EditMode nextmode)
+		{
+			EditMode oldmode = mode;
+			
+			if(nextmode != null)
+			{
+				// Verify that this mode is usable
+				bool allowuse = false;
+				foreach(EditModeInfo emi in usedmodes)
+				{
+					if(emi.Type.FullName == nextmode.GetType().FullName)
+					{
+						allowuse = true;
+						break;
+					}
+				}
+
+				if(!allowuse)
+				{
+					General.Interface.MessageBeep(MessageBeepType.Error);
+					General.WriteLogLine("Attempt to switch to an invalid edit mode " + nextmode.GetType().Name + "!");
+					return false;
+				}
+				else
+				{
+					General.WriteLogLine("Preparing to change editing mode to " + nextmode.GetType().Name + "...");
+				}
+			}
+			else
+			{
+				General.WriteLogLine("Stopping editing mode...");
+			}
+			
+			// Remember previous mode
+			newmode = nextmode;
+			if(mode != null)
+			{
+				prevmode = mode.GetType();
+				if(!mode.Attributes.Volatile)
+				{
+					prevstablemode = prevmode;
+					if(mode is ClassicMode) prevclassicmode = prevmode;
+				}
+			}
+			else
+			{
+				prevmode = null;
+				prevstablemode = null;
+				prevclassicmode = null;
+			}
+			
+			// Let the plugins know beforehand and check if not cancelled
+			if(General.Plugins.ModeChanges(oldmode, newmode))
+			{
+				// Disenagage old mode
+				disengaging = true;
+				if(oldmode != null)
+				{
+					General.Plugins.OnEditDisengage(oldmode, newmode);
+					oldmode.OnDisengage();
+				}
+				
+				// Reset cursor
+				General.Interface.SetCursor(Cursors.Default);
+				
+				// Apply new mode
+				General.WriteLogLine("Editing mode changes from " + TypeNameOrNull(oldmode) + " to " + TypeNameOrNull(nextmode));
+				General.WriteLogLine("Previous stable mode is " + TypeNameOrNull(prevstablemode) + ", previous classic mode is " + TypeNameOrNull(prevclassicmode));
+				mode = newmode;
+				disengaging = false;
+				
+				// Engage new mode
+				if(newmode != null)
+				{
+					newmode.OnEngage();
+					General.Plugins.OnEditEngage(oldmode, newmode);
+				}
+				
+				// Bind new switch actions
+				UnbindSwitchActions();
+				BindAvailableSwitchActions();
+				
+				// Update the interface
+				General.MainWindow.EditModeChanged();
+				
+				// Dispose old mode
+				if(oldmode != null) oldmode.Dispose();
+				
+				// Done switching
+				General.WriteLogLine("Editing mode change complete.");
+				newmode = null;
+				
+				// Redraw the display
+				General.MainWindow.RedrawDisplay();
+				return true;
+			}
+			else
+			{
+				// Cancelled
+				General.WriteLogLine("Editing mode change cancelled.");
+				return false;
+			}
+		}
+		
+		// This changes mode by class name and optionally with arguments
+		public void ChangeMode(string classname, params object[] args)
+		{
+			EditModeInfo emi = GetEditModeInfo(classname);
+			if(emi != null) emi.SwitchToMode(args);
+		}
+
+		// This returns the type name as string
+		private static string TypeNameOrNull(Type type)
+		{
+			return (type != null) ? type.Name : "NULL";
+		}
+
+		// This returns the type name as string
+		private static string TypeNameOrNull(object obj)
+		{
+			return (obj != null) ? obj.GetType().Name : "NULL";
+		}
+		
+		#endregion
+		
+		#region ================== Actions
+		
+		/// <summary>
+		/// This cancels the current mode.
+		/// </summary>
+		[BeginAction("cancelmode")]
+		public void CancelMode()
+		{
+			// Let the mode know
+			if(mode != null)
+			{
+				General.Plugins.OnEditCancel();
+				mode.OnCancel();
+			}
+		}
+		
+		/// <summary>
+		/// This accepts the changes in the current mode.
+		/// </summary>
+		[BeginAction("acceptmode")]
+		public void AcceptMode()
+		{
+			// Let the mode know
+			if(mode != null)
+			{
+				General.Plugins.OnEditAccept();
+				mode.OnAccept();
+			}
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Editing/GridSetup.cs b/Source/Core/Editing/GridSetup.cs
new file mode 100644
index 0000000..a053d69
--- /dev/null
+++ b/Source/Core/Editing/GridSetup.cs
@@ -0,0 +1,320 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.IO;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Windows;
+using CodeImp.DoomBuilder.IO;
+using CodeImp.DoomBuilder.Actions;
+using CodeImp.DoomBuilder.Data;
+using CodeImp.DoomBuilder.Geometry;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Editing
+{
+	public class GridSetup
+	{
+		#region ================== Constants
+
+		private const int DEFAULT_GRID_SIZE = 32;
+		private const int MINIMUM_GRID_SIZE = 1; //mxd
+
+		public const int SOURCE_TEXTURES = 0;
+		public const int SOURCE_FLATS = 1;
+		public const int SOURCE_FILE = 2;
+
+		#endregion
+
+		#region ================== Variables
+
+		// Grid
+		private int gridsize;
+		private float gridsizef;
+		private float gridsizefinv;
+
+		// Background
+		private string background = "";
+		private int backsource;
+		private ImageData backimage = new UnknownImage(null);
+		private int backoffsetx, backoffsety;
+		private float backscalex, backscaley;
+
+		// Disposing
+		private bool isdisposed;
+		
+		#endregion
+
+		#region ================== Properties
+
+		public int GridSize { get { return gridsize; } }
+		public float GridSizeF { get { return gridsizef; } }
+		internal string BackgroundName { get { return background; } }
+		internal int BackgroundSource { get { return backsource; } }
+		internal ImageData Background { get { return backimage; } }
+		internal int BackgroundX { get { return backoffsetx; } }
+		internal int BackgroundY { get { return backoffsety; } }
+		internal float BackgroundScaleX { get { return backscalex; } }
+		internal float BackgroundScaleY { get { return backscaley; } }
+		internal bool Disposed { get { return isdisposed; } }
+		
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		internal GridSetup()
+		{
+			// Initialize
+			SetGridSize(DEFAULT_GRID_SIZE);
+			backscalex = 1.0f;
+			backscaley = 1.0f;
+			
+			// Register actions
+			General.Actions.BindMethods(this);
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Disposer
+		internal void Dispose()
+		{
+			if(!isdisposed)
+			{
+				// Dispose image if needed
+				if(backimage is FileImage) (backimage as FileImage).Dispose();
+				
+				// Clean up
+				backimage = null;
+
+				// Unregister actions
+				General.Actions.UnbindMethods(this);
+
+				// Done
+				isdisposed = true;
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// Write settings to configuration
+		internal void WriteToConfig(Configuration cfg, string path)
+		{
+			// Write settings
+			cfg.WriteSetting(path + ".background", background);
+			cfg.WriteSetting(path + ".backsource", backsource);
+			cfg.WriteSetting(path + ".backoffsetx", backoffsetx);
+			cfg.WriteSetting(path + ".backoffsety", backoffsety);
+			cfg.WriteSetting(path + ".backscalex", (int)(backscalex * 100.0f));
+			cfg.WriteSetting(path + ".backscaley", (int)(backscaley * 100.0f));
+			cfg.WriteSetting(path + ".gridsize", gridsize);
+		}
+
+		// Read settings from configuration
+		internal void ReadFromConfig(Configuration cfg, string path, bool uselongtexturenames)
+		{
+			// Read settings
+			background = cfg.ReadSetting(path + ".background", "");
+			backsource = cfg.ReadSetting(path + ".backsource", 0);
+			backoffsetx = cfg.ReadSetting(path + ".backoffsetx", 0);
+			backoffsety = cfg.ReadSetting(path + ".backoffsety", 0);
+			backscalex = cfg.ReadSetting(path + ".backscalex", 100) / 100.0f;
+			backscaley = cfg.ReadSetting(path + ".backscaley", 100) / 100.0f;
+			gridsize = cfg.ReadSetting(path + ".gridsize", DEFAULT_GRID_SIZE);
+
+			//mxd. Translate background name?
+			TranslateBackgroundName(uselongtexturenames);
+
+			// Setup
+			SetGridSize(gridsize);
+			LinkBackground();
+		}
+
+		// This sets the grid size
+		internal void SetGridSize(int size)
+		{
+			//mxd. Bad things happen when size <= 0
+			size = Math.Max(size, MINIMUM_GRID_SIZE);
+			
+			// Change grid
+			this.gridsize = size;
+			this.gridsizef = gridsize;
+			this.gridsizefinv = 1f / gridsizef;
+
+			// Update in main window
+			General.MainWindow.UpdateGrid(gridsize);
+		}
+
+		// This sets the background
+		internal void SetBackground(string name, int source)
+		{
+			// Set background
+			if(name == null) name = "";
+			this.backsource = source;
+			this.background = name;
+
+			// Find this image
+			LinkBackground();
+		}
+
+		//mxd
+		internal void TranslateBackgroundName(bool uselongtexturenames)
+		{
+			if(string.IsNullOrEmpty(background)) return;
+
+			switch(backsource) 
+			{
+				case SOURCE_TEXTURES:
+					background = (uselongtexturenames ? General.Map.Data.GetFullTextureName(background) : MapSet.GetShortTextureName(background));
+					break;
+
+				case SOURCE_FLATS:
+					background = (uselongtexturenames ? General.Map.Data.GetFullFlatName(background) : MapSet.GetShortTextureName(background));
+					break;
+			}
+		}
+
+		// This sets the background view
+		internal void SetBackgroundView(int offsetx, int offsety, float scalex, float scaley)
+		{
+			// Set background offset
+			this.backoffsetx = offsetx;
+			this.backoffsety = offsety;
+			this.backscalex = scalex;
+			this.backscaley = scaley;
+		}
+		
+		// This finds and links the background image
+		internal void LinkBackground()
+		{
+			// Dispose image if needed
+			if(backimage is FileImage) (backimage as FileImage).Dispose();
+			
+			// Where to load background from?
+			switch(backsource)
+			{
+				case SOURCE_TEXTURES:
+					backimage = General.Map.Data.GetTextureImage(background);
+					break;
+
+				case SOURCE_FLATS:
+					backimage = General.Map.Data.GetFlatImage(background);
+					break;
+
+				case SOURCE_FILE:
+					backimage = new FileImage(Path.GetFileNameWithoutExtension(background), background, false, 1.0f, 1.0f);
+					break;
+			}
+
+			// Make sure it is loaded
+			backimage.LoadImage();
+			backimage.CreateTexture();
+		}
+		
+		// This returns the next higher coordinate
+		public float GetHigher(float offset)
+		{
+			return (float)Math.Round((offset + (gridsizef * 0.5f)) * gridsizefinv) * gridsizef;
+		}
+
+		// This returns the next lower coordinate
+		public float GetLower(float offset)
+		{
+			return (float)Math.Round((offset - (gridsizef * 0.5f)) * gridsizefinv) * gridsizef;
+		}
+		
+		// This snaps to the nearest grid coordinate
+		public Vector2D SnappedToGrid(Vector2D v)
+		{
+			return GridSetup.SnappedToGrid(v, gridsizef, gridsizefinv);
+		}
+
+		// This snaps to the nearest grid coordinate
+		public static Vector2D SnappedToGrid(Vector2D v, float gridsize, float gridsizeinv)
+		{
+			Vector2D sv = new Vector2D((float)Math.Round(v.x * gridsizeinv) * gridsize,
+								(float)Math.Round(v.y * gridsizeinv) * gridsize);
+
+			if(sv.x < General.Map.Config.LeftBoundary) sv.x = General.Map.Config.LeftBoundary;
+			else if(sv.x > General.Map.Config.RightBoundary) sv.x = General.Map.Config.RightBoundary;
+
+			if(sv.y > General.Map.Config.TopBoundary) sv.y = General.Map.Config.TopBoundary;
+			else if(sv.y < General.Map.Config.BottomBoundary) sv.y = General.Map.Config.BottomBoundary;
+
+			return sv;
+		}
+
+		#endregion
+
+		#region ================== Actions
+
+		// This shows the grid setup dialog
+		internal static void ShowGridSetup()
+		{
+			// Show preferences dialog
+			GridSetupForm gridform = new GridSetupForm();
+			if(gridform.ShowDialog(General.MainWindow) == DialogResult.OK)
+			{
+				// Redraw display
+				General.MainWindow.RedrawDisplay();
+			}
+
+			// Done
+			gridform.Dispose();
+		}
+		
+		// This changes grid size
+		// Note: these were incorrectly swapped before, hence the wrong action name
+		[BeginAction("gridinc")]
+		internal void DecreaseGrid()
+		{
+			// Not lower than 1
+			if(gridsize >= 2)
+			{
+				// Change grid
+				SetGridSize(gridsize >> 1);
+				
+				// Redraw display
+				General.MainWindow.RedrawDisplay();
+			}
+		}
+
+		// This changes grid size
+		// Note: these were incorrectly swapped before, hence the wrong action name
+		[BeginAction("griddec")]
+		internal void IncreaseGrid()
+		{
+			// Not higher than 1024
+			if(gridsize <= 512)
+			{
+				// Change grid
+				SetGridSize(gridsize << 1);
+
+				// Redraw display
+				General.MainWindow.RedrawDisplay();
+			}
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Editing/NullThingsFilter.cs b/Source/Core/Editing/NullThingsFilter.cs
new file mode 100644
index 0000000..57a8823
--- /dev/null
+++ b/Source/Core/Editing/NullThingsFilter.cs
@@ -0,0 +1,65 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Map;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Editing
+{
+	internal class NullThingsFilter : ThingsFilter
+	{
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		internal NullThingsFilter()
+		{
+			this.name = "(show all)";
+		}
+		
+		// Disposer
+		internal override void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Clean up
+
+				// Done
+				base.Dispose();
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This updates the lists
+		public override void Update()
+		{
+			// Make lists
+			visiblethings = new List<Thing>(General.Map.Map.Things);
+			hiddenthings = new List<Thing>(0);
+			thingsvisiblestate = new Dictionary<Thing, bool>(General.Map.Map.Things.Count);
+			foreach(Thing t in visiblethings) thingsvisiblestate.Add(t, true);
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Editing/ThingsFilter.cs b/Source/Core/Editing/ThingsFilter.cs
new file mode 100644
index 0000000..5abc4ba
--- /dev/null
+++ b/Source/Core/Editing/ThingsFilter.cs
@@ -0,0 +1,463 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Globalization;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.IO;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Geometry;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Editing
+{
+	public enum ThingsFilterDisplayMode //mxd
+	{
+		ALWAYS,
+		CLASSIC_MODES_ONLY,
+		VISUAL_MODES_ONLY
+	}
+	
+	public class ThingsFilter
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		// Display name of this filter
+		protected string name;
+
+		//mxd. Invert this filter?
+		protected bool invert;
+
+		//mxd. Display mode
+		protected ThingsFilterDisplayMode displaymode;
+		
+		// Filter by category
+		protected string categoryname;
+
+		// Filter by properties
+		protected int thingtype;		// -1 indicates not used
+		protected int thingangle;		// -1 indicates not used
+		protected int thingzheight;		// int.MinValue indicates not used
+		
+		// Filter by fields
+		protected List<string> requiredfields;
+		protected List<string> forbiddenfields;
+		
+		// Filter by action/tag
+		protected int thingaction;		// -1 indicates not used
+		protected int[] thingargs;		// -1 indicates not used
+		protected int thingtag;			// -1 indicates not used
+		
+		// Filter by custom fields
+		protected UniFields customfields;
+		
+		// List of things
+		protected List<Thing> visiblethings;
+		protected List<Thing> hiddenthings;
+		protected Dictionary<Thing, bool> thingsvisiblestate;
+		
+		// Disposing
+		protected bool isdisposed;
+
+		#endregion
+
+		#region ================== Properties
+
+		public string Name { get { return name; } internal set { name = value; } }
+		public string CategoryName { get { return categoryname; } internal set { categoryname = value; } }
+		public bool Invert { get { return invert; } internal set { invert = value; } } //mxd
+		public ThingsFilterDisplayMode DisplayMode { get { return displaymode; } internal set { displaymode = value; } } //mxd
+		internal int ThingType { get { return thingtype; } set { thingtype = value; } }
+		internal int ThingAngle { get { return thingangle; } set { thingangle = value; } }
+		internal int ThingZHeight { get { return thingzheight; } set { thingzheight = value; } }
+		internal int ThingAction { get { return thingaction; } set { thingaction = value; } }
+		internal int[] ThingArgs { get { return thingargs; } set { Array.Copy(value, thingargs, Thing.NUM_ARGS); } }
+		internal int ThingTag { get { return thingtag; } set { thingtag = value; } }
+		internal UniFields ThingCustomFields { get { return customfields; } set { customfields = new UniFields(value); } }
+		internal ICollection<string> RequiredFields { get { return requiredfields; } }
+		internal ICollection<string> ForbiddenFields { get { return forbiddenfields; } }
+		public ICollection<Thing> VisibleThings { get { return visiblethings; } }
+		public ICollection<Thing> HiddenThings { get { return hiddenthings; } }
+		internal bool IsDisposed { get { return isdisposed; } }
+		public const string DEFAULT_NAME = "Unnamed filter"; //mxd
+		
+		#endregion
+		
+		#region ================== Constructor / Disposer
+		
+		// Copy constructor
+		internal ThingsFilter(ThingsFilter f)
+		{
+			// Copy
+			name = f.name;
+			categoryname = f.categoryname;
+			invert = f.invert; //mxd
+			displaymode = f.displaymode; //mxd
+			thingtype = f.thingtype;
+			thingzheight = f.thingzheight;
+			thingangle = f.thingangle;
+			thingaction = f.thingaction;
+			thingargs = new int[Thing.NUM_ARGS];
+			Array.Copy(f.thingargs, thingargs, Thing.NUM_ARGS);
+			thingtag = f.thingtag;
+			customfields = new UniFields(f.customfields);
+			requiredfields = new List<string>(f.requiredfields);
+			forbiddenfields = new List<string>(f.forbiddenfields);
+			
+			AdjustForMapFormat();
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+		
+		// Constructor for filter from configuration
+		internal ThingsFilter(Configuration cfg, string path)
+		{
+			// Initialize
+			requiredfields = new List<string>();
+			forbiddenfields = new List<string>();
+			thingargs = new int[Thing.NUM_ARGS];
+			customfields = new UniFields();
+			
+			// Read settings from config
+			name = cfg.ReadSetting(path + ".name", DEFAULT_NAME);
+			categoryname = cfg.ReadSetting(path + ".category", "");
+			invert = cfg.ReadSetting(path + ".invert", false); //mxd
+			displaymode = (ThingsFilterDisplayMode)cfg.ReadSetting(path + ".displaymode", 0); //mxd
+			thingtype = cfg.ReadSetting(path + ".type", -1);
+			thingangle = cfg.ReadSetting(path + ".angle", -1);
+			thingzheight = cfg.ReadSetting(path + ".zheight", int.MinValue);
+			thingaction = cfg.ReadSetting(path + ".action", -1);
+			for(int i = 0; i < Thing.NUM_ARGS; i++)
+				thingargs[i] = cfg.ReadSetting(path + ".arg" + i.ToString(CultureInfo.InvariantCulture), -1);
+			thingtag = cfg.ReadSetting(path + ".tag", -1);
+			
+			// Read flags
+			// key is string, value must be boolean which indicates if
+			// its a required field (true) or forbidden field (false).
+			IDictionary fields = cfg.ReadSetting(path + ".fields", new Hashtable());
+			foreach(DictionaryEntry de in fields)
+			{
+				// Add to the corresponding list
+				if((bool)de.Value)
+					requiredfields.Add(de.Key.ToString());
+				else
+					forbiddenfields.Add(de.Key.ToString());
+			}
+			
+			// Custom fields
+			IDictionary fieldvalues = cfg.ReadSetting(path + ".customfieldvalues", new Hashtable());
+			foreach(DictionaryEntry fv in fieldvalues)
+			{
+				int ft = cfg.ReadSetting(path + ".customfieldtypes." + fv.Key, 0);
+				customfields.Add(fv.Key.ToString(), new UniValue(ft, fv.Value));
+			}
+			
+			AdjustForMapFormat();
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Constructor for a new filter
+		internal ThingsFilter()
+		{
+			// Initialize everything as <any>
+			requiredfields = new List<string>();
+			forbiddenfields = new List<string>();
+			customfields = new UniFields();
+			categoryname = "";
+			thingtype = -1;
+			thingangle = -1;
+			thingzheight = int.MinValue;
+			thingaction = -1;
+			thingargs = new int[Thing.NUM_ARGS];
+			for(int i = 0 ; i < Thing.NUM_ARGS; i++) thingargs[i] = -1;
+			thingtag = -1;
+			name = DEFAULT_NAME;
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Disposer
+		internal virtual void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Clean up
+				visiblethings = null;
+				hiddenthings = null;
+				thingsvisiblestate = null;
+				
+				// Done
+				isdisposed = true;
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+		
+		// This sets some fields to <any> when they are not valid for the current map format
+		private void AdjustForMapFormat()
+		{
+			if((General.Map != null) && (General.Map.FormatInterface != null))
+			{
+				// Adjust as needed for map format
+				if(!General.Map.FormatInterface.HasThingHeight) thingzheight = int.MinValue;
+				if(!General.Map.FormatInterface.HasThingAction) thingaction = -1;
+				if(!General.Map.FormatInterface.HasThingTag) thingtag = -1;
+				if(!General.Map.FormatInterface.HasActionArgs)
+				{
+					for(int i = 0; i < Thing.NUM_ARGS; i++) thingargs[i] = -1;
+				}
+				if(!General.Map.FormatInterface.HasCustomFields) customfields.Clear();
+			}
+		}
+
+		//mxd
+		public void Validate() 
+		{
+			AdjustForMapFormat();
+
+			//mxd. We don't want to keep unknown flags (like flags from different map format)
+			if(General.Map.Config != null && General.Map.Config.ThingFlags != null)
+			{
+				List<String> unknownfields = new List<string>();
+				foreach(String s in forbiddenfields)
+				{
+					if(!General.Map.Config.ThingFlags.ContainsKey(s)) unknownfields.Add(s);
+				}
+
+				if(unknownfields.Count > 0)
+				{
+					foreach(String s in unknownfields) forbiddenfields.Remove(s);
+				}
+
+				unknownfields.Clear();
+				foreach(String s in requiredfields)
+				{
+					if(!General.Map.Config.ThingFlags.ContainsKey(s)) unknownfields.Add(s);
+				}
+
+				if(unknownfields.Count > 0)
+				{
+					foreach(String s in unknownfields) requiredfields.Remove(s);
+				}
+			}
+
+			//Integrity check
+			if(!IsValid())
+				General.ErrorLogger.Add(ErrorType.Warning, "Things filter '" + name + "' has invalid properties. Configure the things filter to fix this!");
+		}
+
+		//mxd
+		public bool IsValid()
+		{
+			return (!string.IsNullOrEmpty(categoryname) 
+				|| thingtype > 0 
+				|| thingangle != -1
+				|| thingzheight != int.MinValue 
+				|| thingaction != -1 
+				|| thingtag != -1
+				|| requiredfields.Count > 0 
+				|| forbiddenfields.Count > 0 
+				|| customfields.Count > 0);
+		}
+		
+		/// <summary>
+		/// This checks if a thing is visible. Throws an exception when the specified Thing does not exist in the map (filter not updated?).
+		/// </summary>
+		public bool IsThingVisible(Thing t)
+		{
+			return (!t.IsDisposed && thingsvisiblestate[t]);
+		}
+
+		// This writes the filter to configuration
+		internal void WriteSettings(Configuration cfg, string path)
+		{
+			// Write settings to config
+			cfg.WriteSetting(path + ".name", name);
+			cfg.WriteSetting(path + ".category", categoryname);
+			cfg.WriteSetting(path + ".invert", invert); //mxd
+			cfg.WriteSetting(path + ".displaymode", (int)displaymode); //mxd
+			cfg.WriteSetting(path + ".type", thingtype);
+			cfg.WriteSetting(path + ".angle", thingangle);
+			cfg.WriteSetting(path + ".zheight", thingzheight);
+			cfg.WriteSetting(path + ".action", thingaction);
+			for(int i = 0; i < Thing.NUM_ARGS; i++)
+				cfg.WriteSetting(path + ".arg" + i.ToString(CultureInfo.InvariantCulture), thingargs[i]);
+			cfg.WriteSetting(path + ".tag", thingtag);
+			
+			// Write required fields to config
+			foreach(string s in requiredfields)
+				cfg.WriteSetting(path + ".fields." + s, true);
+			
+			// Write forbidden fields to config
+			foreach(string s in forbiddenfields)
+				cfg.WriteSetting(path + ".fields." + s, false);
+			
+			// Custom fields
+			foreach(KeyValuePair<string, UniValue> u in customfields)
+			{
+				cfg.WriteSetting(path + ".customfieldtypes." + u.Key, u.Value.Type);
+				cfg.WriteSetting(path + ".customfieldvalues." + u.Key, u.Value.Value);
+			}
+		}
+		
+		// This is called when the filter is activated
+		internal virtual void Activate()
+		{
+			// Update the list of things
+			Update();
+		}
+		
+		// This is called when the filter is deactivates
+		internal virtual void Deactivate()
+		{
+			// Clear lists
+			visiblethings = null;
+			hiddenthings = null;
+			thingsvisiblestate = null;
+		}
+		
+		/// <summary>
+		/// This updates the list of things.
+		/// </summary>
+		public virtual void Update()
+		{
+			AdjustForMapFormat();
+			
+			// Make new list
+			visiblethings = new List<Thing>(General.Map.Map.Things.Count);
+			hiddenthings = new List<Thing>(General.Map.Map.Things.Count);
+			thingsvisiblestate = new Dictionary<Thing, bool>(General.Map.Map.Things.Count);
+			foreach(Thing t in General.Map.Map.Things)
+			{
+				bool qualifies = true;
+
+				// Get thing info
+				ThingTypeInfo ti = General.Map.Data.GetThingInfo(t.Type);
+				
+				// Check against simple properties
+				qualifies &= (thingtype == -1) || (t.Type == thingtype);
+				qualifies &= (thingangle == -1) || (Angle2D.RealToDoom(t.Angle) == thingangle);
+				qualifies &= (thingzheight == int.MinValue) || ((int)(t.Position.z) == thingzheight);
+				qualifies &= (thingaction == -1) || (t.Action == thingaction);
+				qualifies &= (thingtag == -1) || (t.Tag == thingtag);
+				for(int i = 0; i < Thing.NUM_ARGS; i++)
+					qualifies &= (thingargs[i] == -1) || (t.Args[i] == thingargs[i]);
+				
+				// Still qualifies?
+				if(qualifies)
+				{
+					// Check thing category
+					if(ti.Category == null)
+						qualifies = (categoryname.Length == 0);
+					else
+						qualifies = ((ti.Category.Name == categoryname) || (categoryname.Length == 0));
+				}
+				
+				// Still qualifies?
+				if(qualifies)
+				{
+					// Go for all required fields
+					foreach(string s in requiredfields)
+					{
+						if(t.Flags.ContainsKey(s))
+						{
+							if(t.Flags[s] == false)
+							{
+								qualifies = false;
+								break;
+							}
+						}
+						else
+						{
+							qualifies = false;
+							break;
+						}
+					}
+				}
+
+				// Still qualifies?
+				if(qualifies)
+				{
+					// Go for all forbidden fields
+					foreach(string s in forbiddenfields)
+					{
+						if(t.Flags.ContainsKey(s))
+						{
+							if(t.Flags[s])
+							{
+								qualifies = false;
+								break;
+							}
+						}
+					}
+				}
+				
+				// Still qualifies?
+				if(qualifies)
+				{
+					// Go for all required custom fields
+					foreach(KeyValuePair<string, UniValue> kv in customfields)
+					{
+						if(t.Fields.ContainsKey(kv.Key))
+						{
+							if(!((t.Fields[kv.Key].Type == kv.Value.Type) && (t.Fields[kv.Key].Value.Equals(kv.Value.Value))))
+							{
+								qualifies = false;
+								break;
+							}
+						}
+						else
+						{
+							qualifies = false;
+							break;
+						}
+					}
+				}
+
+				//mxd. Apply inversion
+				qualifies ^= invert;
+				
+				// Put the thing in the lists. mxd: visiblethings and hiddenthings are only used from classic modes, IsThingVisible() is only used from visual mode.
+				if(qualifies || displaymode == ThingsFilterDisplayMode.VISUAL_MODES_ONLY) visiblethings.Add(t); else hiddenthings.Add(t);
+				thingsvisiblestate.Add(t, qualifies || (displaymode == ThingsFilterDisplayMode.CLASSIC_MODES_ONLY));
+			}
+		}
+
+		// String representation
+		public override string ToString()
+		{
+			return name;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Editing/UndoManager.cs b/Source/Core/Editing/UndoManager.cs
new file mode 100644
index 0000000..3d22060
--- /dev/null
+++ b/Source/Core/Editing/UndoManager.cs
@@ -0,0 +1,1312 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Windows.Forms;
+using System.IO;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Plugins;
+using CodeImp.DoomBuilder.Windows;
+using CodeImp.DoomBuilder.IO;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Actions;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Editing
+{
+	public class UndoManager
+	{
+		#region ================== Constants
+
+		// Maximum undo/redo levels
+		private const int MAX_UNDO_LEVELS = 2000;
+		
+		// Default stream capacity
+		private const int STREAM_CAPACITY = 1000;
+		
+		// Stream codes
+		// "Prp" stands for property changes (uses the ReadWrite functions)
+		// "Ref" stands for reference changes
+		private enum StreamCodes : byte
+		{
+			AddVertex,
+			RemVertex,
+			PrpVertex,
+			AddLinedef,
+			RemLinedef,
+			PrpLinedef,
+			RefLinedefStart,
+			RefLinedefEnd,
+			RefLinedefFront,
+			RefLinedefBack,
+			AddSidedef,
+			RemSidedef,
+			PrpSidedef,
+			RefSidedefSector,
+			AddSector,
+			RemSector,
+			PrpSector,
+			AddThing,
+			RemThing,
+			PrpThing,
+		}
+		
+		#endregion
+
+		#region ================== Variables
+
+		// Undo and redo stacks
+		private List<UndoSnapshot> undos;
+		private List<UndoSnapshot> redos;
+
+		// Grouping
+		private Plugin lastgroupplugin;
+		private int lastgroupid;
+		private int lastgrouptag;
+		
+		// Unique tickets
+		private int ticketid;
+		
+		// Writing stream
+		private UndoSnapshot snapshot;
+		private bool isundosnapshot;
+		private MemoryStream stream;
+		private SerializerStream ss;
+		private int commandswritten;
+		private long prevstreamlength;
+		private bool ignorepropchanges;
+		private bool isrecordingcommand;
+		private MapElement propsrecorded;
+		private bool geometrychanged;
+		private bool populationchanged;
+		
+		// Background thread
+		private volatile bool dobackgroundwork;
+		private Thread backgroundthread;
+		
+		// Disposing
+		private bool isdisposed;
+
+		#endregion
+
+		#region ================== Properties
+
+		public UndoSnapshot NextUndo
+		{
+			get
+			{
+				if(!isundosnapshot && (snapshot != null))
+					return snapshot;
+				else if(undos.Count > 0)
+					return undos[0];
+				else
+					return null;
+			}
+		}
+		
+		public UndoSnapshot NextRedo
+		{
+			get
+			{
+				if(isundosnapshot && (snapshot != null))
+					return snapshot;
+				else if(redos.Count > 0)
+					return redos[0];
+				else
+					return null;
+			}
+		}
+		
+		public bool IsDisposed { get { return isdisposed; } }
+		
+		/// <summary>
+		/// This can be used to ignore insignificant element property changes. Any property changes
+		/// that are made while this is set to True will not be undoable. Use with great care!
+		/// </summary>
+		public bool IgnorePropChanges { get { return ignorepropchanges; } set { ignorepropchanges = value; } }
+		
+		/// <summary>
+		/// After undo or redo, this returns if the geometry changed. This includes add/remove operations
+		/// on sectors, linedefs, sidedefs and vertices, references changes and property changes on vertices.
+		/// </summary>
+		public bool GeometryChanged { get { return geometrychanged; } }
+
+		/// <summary>
+		/// After undo or redo, this returns if things were added/removed. This does not include thing property changes.
+		/// </summary>
+		public bool PopulationChanged { get { return populationchanged; } }
+		
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		internal UndoManager()
+		{
+			// Initialize
+			ticketid = 1;
+			undos = new List<UndoSnapshot>(MAX_UNDO_LEVELS + 1);
+			redos = new List<UndoSnapshot>(MAX_UNDO_LEVELS + 1);
+			
+			// Bind any methods
+			General.Actions.BindMethods(this);
+
+			// Start background thread
+			backgroundthread = new Thread(BackgroundThread);
+			backgroundthread.Name = "Snapshot Compressor";
+			backgroundthread.Priority = ThreadPriority.Lowest;
+			backgroundthread.IsBackground = true;
+			backgroundthread.Start();
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Disposer
+		internal void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Unbind any methods
+				General.Actions.UnbindMethods(this);
+
+				// Stop the thread and wait for it to end
+				backgroundthread.Interrupt();
+				backgroundthread.Join();
+				backgroundthread = null;
+				
+				// Clean up
+				ClearUndos();
+				ClearRedos();
+				General.WriteLogLine("All undo and redo levels cleared.");
+				
+				// Done
+				isdisposed = true;
+			}
+		}
+
+		#endregion
+
+		#region ================== Private Methods
+
+		// This clears the redos
+		private void ClearRedos()
+		{
+			lock(redos)
+			{
+				// Dispose all redos
+				foreach(UndoSnapshot u in redos) u.Dispose();
+				redos.Clear();
+				
+				// If the current snapshot is meant for redo, trash it also
+				if(isundosnapshot && (snapshot != null))
+				{
+					FinishRecording();
+					isundosnapshot = false;
+					snapshot = null;
+				}
+			}
+		}
+
+		// This clears the undos
+		private void ClearUndos()
+		{
+			lock(undos)
+			{
+				// Dispose all undos
+				foreach(UndoSnapshot u in undos) u.Dispose();
+				undos.Clear();
+				
+				// If the current snapshot is meant for undo, trash it also
+				if(!isundosnapshot && (snapshot != null))
+				{
+					FinishRecording();
+					isundosnapshot = false;
+					snapshot = null;
+				}
+			}
+		}
+
+		// This checks and removes a level when the limit is reached
+		private static void LimitUndoRedoLevel(List<UndoSnapshot> list)
+		{
+			// Too many?
+			if(list.Count > MAX_UNDO_LEVELS)
+			{
+				// Remove one and dispose map
+				UndoSnapshot u = list[list.Count - 1];
+				u.Dispose();
+				list.RemoveAt(list.Count - 1);
+			}
+		}
+
+		// Background thread
+		private void BackgroundThread()
+		{
+			while(true)
+			{
+				if(dobackgroundwork)
+				{
+					// First set dobackgroundwork to false before performing the work so
+					// that it can be set to true again when another pass is needed
+					dobackgroundwork = false;
+
+					int undolevel = 0;
+					UndoSnapshot us;
+					while(true)
+					{
+						// Get the next snapshot or leave
+						lock(undos)
+						{
+							if(undolevel < undos.Count)
+								us = undos[undolevel];
+							else
+								break;
+						}
+
+						// Write to file or load from file, if needed
+						if(us.StoreOnDisk && !us.IsOnDisk)
+							us.WriteToFile();
+						else if(!us.StoreOnDisk && us.IsOnDisk)
+							us.RestoreFromFile();
+
+						// Next
+						undolevel++;
+					}
+
+					int redolevel = 0;
+					while(true)
+					{
+						// Get the next snapshot or leave
+						lock(redos)
+						{
+							if(redolevel < redos.Count)
+								us = redos[redolevel];
+							else
+								break;
+						}
+
+						// Write to file or load from file, if needed
+						if(us.StoreOnDisk && !us.IsOnDisk)
+							us.WriteToFile();
+						else if(!us.StoreOnDisk && us.IsOnDisk)
+							us.RestoreFromFile();
+
+						// Next
+						redolevel++;
+					}
+				}
+
+				try { Thread.Sleep(30); }
+				catch(ThreadInterruptedException) { break; }
+			}
+		}
+		
+		// This starts a new recording
+		private void StartRecording(string description)
+		{
+			stream = new MemoryStream(STREAM_CAPACITY);
+			ss = new SerializerStream(stream);
+			ss.Begin();
+			commandswritten = 0;
+			propsrecorded = null;
+			snapshot = new UndoSnapshot(description, stream, ticketid);
+		}
+
+		// This finishes recording
+		private void FinishRecording()
+		{
+			// End current recording
+			if((stream != null) && (ss != null))
+			{
+				propsrecorded = null;
+				ss.wInt(commandswritten);
+				ss.End();
+				ss = null;
+			}
+		}
+		
+		// This begins writing to the record stream
+		private bool BeginRecordData(StreamCodes code)
+		{
+			if((ss == null) || isdisposed) return false;
+			isrecordingcommand = true;
+			prevstreamlength = stream.Length;
+			ss.wByte((byte)code);
+			return true;
+		}
+
+		// This ends writing to the record stream
+		private void EndRecordData()
+		{
+			// We write the difference in bytes to the stream so that
+			// the stream can be read from the end backwards
+			int delta = (int)(stream.Length - prevstreamlength);
+			ss.wInt(delta);
+			commandswritten++;
+			isrecordingcommand = false;
+		}
+
+		// This outputs record info, if desired
+		private void LogRecordInfo(string info)
+		{
+			#if DEBUG
+				//General.WriteLogLine(info);
+			#endif
+		}
+
+		// This plays back a stream in reverse
+		private void PlaybackStream(MemoryStream pstream)
+		{
+			General.Map.Map.AutoRemove = false;
+			
+			pstream.Seek(0, SeekOrigin.Begin);
+			DeserializerStream ds = new DeserializerStream(pstream);
+			ds.Begin();
+			
+			if(pstream.Length > 4)
+			{
+				// Start at the end
+				pstream.Seek(ds.EndPosition - 4, SeekOrigin.Begin);
+				int numcmds; ds.rInt(out numcmds);
+				pstream.Seek(-8, SeekOrigin.Current);
+				while(numcmds > 0)
+				{
+					// Go back up the stream to the beginning of the prev command
+					int len; ds.rInt(out len);
+					pstream.Seek(-(len + 4), SeekOrigin.Current);
+
+					// Play back the command
+					long beginpos = pstream.Position;
+					byte cmd; ds.rByte(out cmd);
+					switch((StreamCodes)cmd)
+					{
+						case StreamCodes.AddVertex: PlayAddVertex(ds); break;
+						case StreamCodes.RemVertex: PlayRemVertex(ds); break;
+						case StreamCodes.PrpVertex: PlayPrpVertex(ds); break;
+						case StreamCodes.AddLinedef: PlayAddLinedef(ds); break;
+						case StreamCodes.RemLinedef: PlayRemLinedef(ds); break;
+						case StreamCodes.PrpLinedef: PlayPrpLinedef(ds); break;
+						case StreamCodes.RefLinedefStart: PlayRefLinedefStart(ds); break;
+						case StreamCodes.RefLinedefEnd: PlayRefLinedefEnd(ds); break;
+						case StreamCodes.RefLinedefFront: PlayRefLinedefFront(ds); break;
+						case StreamCodes.RefLinedefBack: PlayRefLinedefBack(ds); break;
+						case StreamCodes.AddSidedef: PlayAddSidedef(ds); break;
+						case StreamCodes.RemSidedef: PlayRemSidedef(ds); break;
+						case StreamCodes.PrpSidedef: PlayPrpSidedef(ds); break;
+						case StreamCodes.RefSidedefSector: PlayRefSidedefSector(ds); break;
+						case StreamCodes.AddSector: PlayAddSector(ds); break;
+						case StreamCodes.RemSector: PlayRemSector(ds); break;
+						case StreamCodes.PrpSector: PlayPrpSector(ds); break;
+						case StreamCodes.AddThing: PlayAddThing(ds); break;
+						case StreamCodes.RemThing: PlayRemThing(ds); break;
+						case StreamCodes.PrpThing: PlayPrpThing(ds); break;
+					}
+					
+					// Sanity check
+					if((beginpos + len) != pstream.Position)
+						throw new Exception("The last command did not read the same amount of data that was written for this command!");
+					
+					// Go back for next command
+					pstream.Seek(-(len + 4), SeekOrigin.Current);
+
+					numcmds--;
+				}
+			}
+			
+			General.Map.Map.AutoRemove = true;
+		}
+		
+		#endregion
+		
+		#region ================== Public Methods
+		
+		// This makes a list of the undo levels in order they will be undone
+		public List<UndoSnapshot> GetUndoList()
+		{
+			List<UndoSnapshot> list = new List<UndoSnapshot>(undos.Count + 1);
+			if(!isundosnapshot && (snapshot != null))
+				list.Add(snapshot);
+			list.AddRange(undos);
+			return list;
+		}
+		
+		// This makes a list of the redo levels in order they will be undone
+		public List<UndoSnapshot> GetRedoList()
+		{
+			List<UndoSnapshot> list = new List<UndoSnapshot>(redos.Count + 1);
+			if(isundosnapshot && (snapshot != null))
+				list.Add(snapshot);
+			list.AddRange(redos);
+			return list;
+		}
+		
+		// This clears all redos
+		public void ClearAllRedos()
+		{
+			ClearRedos();
+			General.MainWindow.UpdateInterface();
+		}
+
+		// This clears all undos (mxd)
+		internal void ClearAllUndos() 
+		{
+			ClearUndos();
+			General.MainWindow.UpdateInterface();
+		}
+
+		/// <summary>
+		/// This makes an undo and returns the unique ticket id. Also automatically indicates that the map is changed.
+		/// </summary>
+		/// <param name="description">Any description you want the undo to be named. Should be something related to the changes you are about to make.</param>
+		/// <returns>Ticket ID that identifies the created undo level.</returns>
+		public int CreateUndo(string description)
+		{
+			return CreateUndo(description, null, 0, 0);
+		}
+		
+		/// <summary>
+		/// This makes an undo and returns the unique ticket id. Also automatically indicates that the map is changed.
+		/// </summary>
+		/// <param name="description">Any description you want the undo to be named. Should be something related to the changes you are about to make.</param>
+		/// <param name="groupsource">The object creating the undo. All objects from within the same plugin are equal, so it is safe to just use 'this' everywhere. This is only used for undo grouping and you can use 'null' if you don't want undo grouping.</param>
+		/// <param name="groupid">The undo group id you want this undo level to group with (undos only group together if the previous undo has the same source, id and tag). Group 0 indicates no grouping.</param>
+		/// <param name="grouptag">The undo group tag you want this undo level to group with (undos only group together if the previous undo has the same source, id and tag). Use at your own discretion.</param>
+		/// <returns>Ticket ID that identifies the created undo level. Returns -1 when no undo level was created.</returns>
+		public int CreateUndo(string description, object groupsource, int groupid, int grouptag)
+		{
+			//UndoSnapshot u;
+			Plugin p = null;
+			string groupsourcename = "Null";
+			
+			// Figure out the source plugin
+			if(groupsource != null)
+			{
+				p = General.Plugins.FindPluginByAssembly(groupsource.GetType().Assembly);
+				if(p != null) groupsourcename = p.Name;
+			}
+
+			// Not the same as previous group, or no grouping desired...
+			if((p == null) || (lastgroupplugin == null) || (p != lastgroupplugin) ||
+			   (groupid == 0) || (lastgroupid == 0) || (groupid != lastgroupid) ||
+			   (grouptag != lastgrouptag))
+			{
+				FinishRecording();
+				
+				// Next ticket id
+				if(++ticketid == int.MaxValue) ticketid = 1;
+				
+				General.WriteLogLine("Creating undo snapshot \"" + description + "\", Source " + groupsourcename + ", Group " + groupid + ", Tag " + grouptag + ", Ticket ID " + ticketid + "...");
+				
+				if((snapshot != null) && !isundosnapshot)
+				{
+					lock(undos)
+					{
+						// The current top of the stack can now be written to disk
+						// because it is no longer the next immediate undo level
+						if(undos.Count > 0) undos[0].StoreOnDisk = true;
+						
+						// Put it on the stack
+						undos.Insert(0, snapshot);
+						LimitUndoRedoLevel(undos);
+					}
+				}
+
+				StartRecording(description);
+				isundosnapshot = false;
+
+				// Clear all redos
+				ClearRedos();
+
+				// Keep grouping info
+				lastgroupplugin = p;
+				lastgroupid = groupid;
+				lastgrouptag = grouptag;
+				
+				// Map changes!
+				General.Map.IsChanged = true;
+
+				// Update
+				dobackgroundwork = true;
+				General.Plugins.OnUndoCreated();
+				General.MainWindow.UpdateInterface();
+				
+				// Done
+				return ticketid;
+			}
+			else
+			{
+				return -1;
+			}
+		}
+
+		// This removes a previously made undo
+		public void WithdrawUndo()
+		{
+			// Previously, withdrawing an undo level was possible, because each undo level contained
+			// an entire snapshot of the map. With the new progressive undo system, you cannot ignore
+			// any changes, so we have to actually perform the undo and trash the redo it creates.
+			PerformUndo(1, false);
+			ClearAllRedos();
+			
+			General.Plugins.OnUndoWithdrawn();
+		}
+		
+		// This performs an undo
+		[BeginAction("undo")]
+		public void PerformUndo()
+		{
+			PerformUndo(1);
+		}
+		
+		// This performs one or more undo levels
+		public void PerformUndo(int levels) { PerformUndo(levels, true); }
+		private void PerformUndo(int levels, bool showmessage)
+		{
+			UndoSnapshot u = null;
+			Cursor oldcursor = Cursor.Current;
+			Cursor.Current = Cursors.WaitCursor;
+			int levelsundone = 0;
+			
+			// Anything to undo?
+			if((undos.Count > 0) || ((snapshot != null) && !isundosnapshot))
+			{
+				// Let the plugins know
+				if(General.Plugins.OnUndoBegin())
+				{
+					// Call UndoBegin event
+					if(General.Editing.Mode.OnUndoBegin())
+					{
+						// Cancel volatile mode, if any
+						// This returns false when mode was not volatile
+						if(!General.Editing.CancelVolatileMode())
+						{
+							geometrychanged = false;
+							populationchanged = false;
+							General.Map.Map.ClearAllMarks(false);
+							General.Map.Map.BeginAddRemove();
+							
+							// Go for all levels to undo
+							for(int lvl = 0; lvl < levels; lvl++)
+							{
+								FinishRecording();
+								
+								if(isundosnapshot)
+								{
+									if(snapshot != null)
+									{
+										// This snapshot was made by a previous call to this
+										// function and should go on the redo list
+										lock(redos)
+										{
+											// The current top of the stack can now be written to disk
+											// because it is no longer the next immediate redo level
+											if(redos.Count > 0) redos[0].StoreOnDisk = true;
+											
+											// Put it on the stack
+											redos.Insert(0, snapshot);
+											LimitUndoRedoLevel(redos);
+										}
+									}
+								}
+								else
+								{
+									// The snapshot can be undone immediately and it will
+									// be recorded for the redo list
+									if(snapshot != null)
+										u = snapshot;
+								}
+								
+								// No immediate snapshot to undo? Then get the next one from the stack
+								if(u == null)
+								{
+									lock(undos)
+									{
+										if(undos.Count > 0)
+										{
+											// Get undo snapshot
+											u = undos[0];
+											undos.RemoveAt(0);
+											
+											// Make the current top of the stack load into memory
+											// because it just became the next immediate undo level
+											if(undos.Count > 0) undos[0].StoreOnDisk = false;
+										}
+										else
+										{
+											// Nothing more to undo
+											u = null;
+											break;
+										}
+									}
+								}
+								
+								General.WriteLogLine("Performing undo \"" + u.Description + "\", Ticket ID " + u.TicketID + "...");
+								
+								if((levels == 1) && showmessage)
+									General.Interface.DisplayStatus(StatusType.Action, u.Description + " undone.");
+								
+								// Make a snapshot for redo
+								StartRecording(u.Description);
+								isundosnapshot = true;
+								
+								// Reset grouping
+								lastgroupplugin = null;
+
+								// Play back the stream in reverse
+								MemoryStream data = u.GetStream();
+								PlaybackStream(data);
+								data.Dispose();
+								
+								// Done with this snapshot
+								u = null;
+								levelsundone++;
+							}
+							
+							General.Map.Map.EndAddRemove();
+							
+							if((levels > 1) && showmessage)
+								General.Interface.DisplayStatus(StatusType.Action, "Undone " + levelsundone + " changes.");
+							
+							// Remove selection
+							General.Map.Map.ClearAllSelected();
+							
+							// Update map
+							General.Map.Map.Update();
+							foreach(Thing t in General.Map.Map.Things) if(t.Marked) t.UpdateConfiguration();
+							General.Map.ThingsFilter.Update();
+							General.Map.Data.UpdateUsedTextures();
+							General.MainWindow.RefreshInfo();
+							//General.MainWindow.RedrawDisplay();
+							
+							// Map changed!
+							General.Map.IsChanged = true;
+							
+							// Done
+							General.Editing.Mode.OnUndoEnd();
+							General.Plugins.OnUndoEnd();
+
+							// Update interface
+							General.MainWindow.RedrawDisplay(); //mxd
+							General.Editing.Mode.UpdateSelectionInfo(); //mxd
+							dobackgroundwork = true;
+							General.MainWindow.UpdateInterface();
+						}
+					}
+				}
+			}
+			
+			Cursor.Current = oldcursor;
+		}
+		
+		// This performs a redo
+		[BeginAction("redo")]
+		public void PerformRedo()
+		{
+			PerformRedo(1);
+		}
+		
+		public void PerformRedo(int levels)
+		{
+			UndoSnapshot r = null;
+			Cursor oldcursor = Cursor.Current;
+			Cursor.Current = Cursors.WaitCursor;
+			int levelsundone = 0;
+			
+			// Anything to redo?
+			if((redos.Count > 0) || ((snapshot != null) && isundosnapshot))
+			{
+				// Let the plugins know
+				if(General.Plugins.OnRedoBegin())
+				{
+					// Call RedoBegin event
+					if(General.Editing.Mode.OnRedoBegin())
+					{
+						// Cancel volatile mode, if any
+						// This returns false when mode was not volatile
+						if(!General.Editing.CancelVolatileMode())
+						{
+							geometrychanged = false;
+							populationchanged = false;
+							General.Map.Map.ClearAllMarks(false);
+							General.Map.Map.BeginAddRemove();
+							
+							// Go for all levels to redo
+							for(int lvl = 0; lvl < levels; lvl++)
+							{
+								FinishRecording();
+								
+								if(isundosnapshot)
+								{
+									// This snapshot was started by PerformUndo, which means
+									// it can directly be used to redo to previous undo
+									if(snapshot != null)
+										r = snapshot;
+								}
+								else
+								{
+									if(snapshot != null)
+									{
+										// This snapshot was made by a previous call to this
+										// function and should go on the undo list
+										lock(undos)
+										{
+											// The current top of the stack can now be written to disk
+											// because it is no longer the next immediate undo level
+											if(undos.Count > 0) undos[0].StoreOnDisk = true;
+
+											// Put it on the stack
+											undos.Insert(0, snapshot);
+											LimitUndoRedoLevel(undos);
+										}
+									}
+								}
+								
+								// No immediate snapshot to redo? Then get the next one from the stack
+								if(r == null)
+								{
+									lock(redos)
+									{
+										if(redos.Count > 0)
+										{
+											// Get redo snapshot
+											r = redos[0];
+											redos.RemoveAt(0);
+											
+											// Make the current top of the stack load into memory
+											// because it just became the next immediate undo level
+											if(redos.Count > 0) redos[0].StoreOnDisk = false;
+										}
+										else
+										{
+											// Nothing more to redo
+											r = null;
+											break;
+										}
+									}
+								}
+
+								General.WriteLogLine("Performing redo \"" + r.Description + "\", Ticket ID " + r.TicketID + "...");
+
+								if(levels == 1)
+									General.Interface.DisplayStatus(StatusType.Action, r.Description + " redone.");
+
+								StartRecording(r.Description);
+								isundosnapshot = false;
+								
+								// Reset grouping
+								lastgroupplugin = null;
+
+								// Play back the stream in reverse
+								MemoryStream data = r.GetStream();
+								PlaybackStream(data);
+								data.Dispose();
+								
+								// Done with this snapshot
+								r = null;
+								levelsundone++;
+							}
+							
+							General.Map.Map.EndAddRemove();
+							
+							if(levels > 1)
+								General.Interface.DisplayStatus(StatusType.Action, "Redone " + levelsundone + " changes.");
+							
+							// Remove selection
+							General.Map.Map.ClearAllSelected();
+
+							// Update map
+							General.Map.Map.Update();
+							foreach(Thing t in General.Map.Map.Things) if(t.Marked) t.UpdateConfiguration();
+							General.Map.ThingsFilter.Update();
+							General.Map.Data.UpdateUsedTextures();
+							General.MainWindow.RefreshInfo();
+							//General.MainWindow.RedrawDisplay();
+							
+							// Map changed!
+							General.Map.IsChanged = true;
+							
+							// Done
+							General.Editing.Mode.OnRedoEnd();
+							General.Plugins.OnRedoEnd();
+
+							// Update interface
+							General.MainWindow.RedrawDisplay(); //mxd
+							General.Editing.Mode.UpdateSelectionInfo(); //mxd
+							dobackgroundwork = true;
+							General.MainWindow.UpdateInterface();
+						}
+					}
+				}
+			}
+			
+			Cursor.Current = oldcursor;
+		}
+		
+		#endregion
+		
+		#region ================== Record and Playback
+
+		internal void RecAddVertex(Vertex v)
+		{
+			if(!BeginRecordData(StreamCodes.AddVertex)) return;
+			ss.wInt(v.Index);
+			EndRecordData();
+
+			//LogRecordInfo("REC: Adding vertex " + v.Index + " at " + v.Position);
+			propsrecorded = null;
+		}
+
+		private void PlayAddVertex(DeserializerStream ds)
+		{
+			int index; ds.rInt(out index);
+			//LogRecordInfo("PLY: Removing vertex " + index);
+			Vertex v = General.Map.Map.GetVertexByIndex(index);
+			foreach(Linedef l in v.Linedefs) l.Marked = true;
+			v.Dispose();
+			geometrychanged = true;
+		}
+
+		internal void RecRemVertex(Vertex v)
+		{
+			if(!BeginRecordData(StreamCodes.RemVertex)) return;
+			ss.wInt(v.Index);
+			ss.wVector2D(v.Position);
+			v.ReadWrite(ss);
+			EndRecordData();
+
+			//LogRecordInfo("REC: Removing vertex " + v.Index + " (at " + v.Position + ")");
+			propsrecorded = null;
+		}
+
+		private void PlayRemVertex(DeserializerStream ds)
+		{
+			int index; ds.rInt(out index);
+			Vector2D pos; ds.rVector2D(out pos);
+			//LogRecordInfo("PLY: Adding vertex " + index + " at " + pos);
+			Vertex v = General.Map.Map.CreateVertex(index, pos);
+			v.ReadWrite(ds);
+			v.Marked = true;
+			geometrychanged = true;
+		}
+		
+		internal void RecPrpVertex(Vertex v)
+		{
+			if(!ignorepropchanges && !isrecordingcommand && !object.ReferenceEquals(v, propsrecorded))
+			{
+				if(!BeginRecordData(StreamCodes.PrpVertex)) return;
+				ss.wInt(v.Index);
+				v.ReadWrite(ss);
+				EndRecordData();
+				propsrecorded = v;
+			}
+		}
+
+		private void PlayPrpVertex(DeserializerStream ds)
+		{
+			int index; ds.rInt(out index);
+			Vertex v = General.Map.Map.GetVertexByIndex(index);
+			v.ReadWrite(ds);
+			v.Marked = true;
+			geometrychanged = true;
+		}
+
+		internal void RecAddLinedef(Linedef l)
+		{
+			if(!BeginRecordData(StreamCodes.AddLinedef)) return;
+			ss.wInt(l.Index);
+			EndRecordData();
+
+			//LogRecordInfo("REC: Adding linedef " + l.Index + " from " + ((l.Start != null) ? l.Start.Index : -1) + " to " + ((l.End != null) ? l.End.Index : -1));
+			propsrecorded = null;
+		}
+
+		private void PlayAddLinedef(DeserializerStream ds)
+		{
+			int index; ds.rInt(out index);
+			//LogRecordInfo("PLY: Removing linedef " + index);
+			Linedef l = General.Map.Map.GetLinedefByIndex(index);
+			if(l.Front != null) l.Front.Marked = true;
+			if(l.Back != null) l.Back.Marked = true;
+			l.Dispose();
+			geometrychanged = true;
+		}
+
+		internal void RecRemLinedef(Linedef l)
+		{
+			if(!BeginRecordData(StreamCodes.RemLinedef)) return;
+			ss.wInt(l.Index);
+			ss.wInt(l.Start.Index);
+			ss.wInt(l.End.Index);
+			l.ReadWrite(ss);
+			EndRecordData();
+
+			//LogRecordInfo("REC: Removing linedef " + l.Index + " (from " + ((l.Start != null) ? l.Start.Index : -1) + " to " + ((l.End != null) ? l.End.Index : -1) + ")");
+			propsrecorded = null;
+		}
+
+		private void PlayRemLinedef(DeserializerStream ds)
+		{
+			int index; ds.rInt(out index);
+			int sindex; ds.rInt(out sindex);
+			int eindex; ds.rInt(out eindex);
+			//LogRecordInfo("PLY: Adding linedef " + index + " from " + sindex + " to " + eindex);
+			Vertex vs = General.Map.Map.GetVertexByIndex(sindex);
+			Vertex ve = General.Map.Map.GetVertexByIndex(eindex);
+			Linedef l = General.Map.Map.CreateLinedef(index, vs, ve);
+			l.ReadWrite(ds);
+			l.Marked = true;
+			geometrychanged = true;
+		}
+
+		internal void RecPrpLinedef(Linedef l)
+		{
+			if(!ignorepropchanges && !isrecordingcommand && !object.ReferenceEquals(l, propsrecorded))
+			{
+				if(!BeginRecordData(StreamCodes.PrpLinedef)) return;
+				ss.wInt(l.Index);
+				l.ReadWrite(ss);
+				EndRecordData();
+				propsrecorded = l;
+			}
+		}
+
+		private static void PlayPrpLinedef(DeserializerStream ds)
+		{
+			int index; ds.rInt(out index);
+			Linedef l = General.Map.Map.GetLinedefByIndex(index);
+			l.ReadWrite(ds);
+			l.Marked = true;
+		}
+
+		internal void RecRefLinedefStart(Linedef l)
+		{
+			if(!BeginRecordData(StreamCodes.RefLinedefStart)) return;
+			ss.wInt(l.Index);
+			if(l.Start != null) ss.wInt(l.Start.Index); else ss.wInt(-1);
+			EndRecordData();
+
+			//LogRecordInfo("REC: Setting linedef " + l.Index + " start vertex " + ((l.Start != null) ? l.Start.Index : -1));
+			propsrecorded = null;
+		}
+
+		private void PlayRefLinedefStart(DeserializerStream ds)
+		{
+			int index; ds.rInt(out index);
+			Linedef l = General.Map.Map.GetLinedefByIndex(index);
+			int vindex; ds.rInt(out vindex);
+			//LogRecordInfo("PLY: Setting linedef " + index + " start vertex " + vindex);
+			Vertex v = (vindex >= 0) ? General.Map.Map.GetVertexByIndex(vindex) : null;
+			l.SetStartVertex(v);
+			l.Marked = true;
+			if(v != null) v.Marked = true;
+			geometrychanged = true;
+		}
+
+		internal void RecRefLinedefEnd(Linedef l)
+		{
+			if(!BeginRecordData(StreamCodes.RefLinedefEnd)) return;
+			ss.wInt(l.Index);
+			if(l.End != null) ss.wInt(l.End.Index); else ss.wInt(-1);
+			EndRecordData();
+
+			//LogRecordInfo("REC: Setting linedef " + l.Index + " end vertex " + ((l.End != null) ? l.End.Index : -1));
+			propsrecorded = null;
+		}
+
+		private void PlayRefLinedefEnd(DeserializerStream ds)
+		{
+			int index; ds.rInt(out index);
+			Linedef l = General.Map.Map.GetLinedefByIndex(index);
+			int vindex; ds.rInt(out vindex);
+			//LogRecordInfo("PLY: Setting linedef " + index + " end vertex " + vindex);
+			Vertex v = (vindex >= 0) ? General.Map.Map.GetVertexByIndex(vindex) : null;
+			l.SetEndVertex(v);
+			l.Marked = true;
+			if(v != null) v.Marked = true;
+			geometrychanged = true;
+		}
+
+		internal void RecRefLinedefFront(Linedef l)
+		{
+			if(!BeginRecordData(StreamCodes.RefLinedefFront)) return;
+			ss.wInt(l.Index);
+			if(l.Front != null) ss.wInt(l.Front.Index); else ss.wInt(-1);
+			EndRecordData();
+
+			//LogRecordInfo("REC: Setting linedef " + l.Index + " front sidedef " + ((l.Front != null) ? l.Front.Index : -1));
+			propsrecorded = null;
+		}
+
+		private void PlayRefLinedefFront(DeserializerStream ds)
+		{
+			int index; ds.rInt(out index);
+			Linedef l = General.Map.Map.GetLinedefByIndex(index);
+			int sindex; ds.rInt(out sindex);
+			//LogRecordInfo("PLY: Setting linedef " + index + " front sidedef " + sindex);
+			Sidedef sd = (sindex >= 0) ? General.Map.Map.GetSidedefByIndex(sindex) : null;
+			l.AttachFront(sd);
+			l.Marked = true;
+			if(sd != null) sd.Marked = true;
+			geometrychanged = true;
+		}
+
+		internal void RecRefLinedefBack(Linedef l)
+		{
+			if(!BeginRecordData(StreamCodes.RefLinedefBack)) return;
+			ss.wInt(l.Index);
+			if(l.Back != null) ss.wInt(l.Back.Index); else ss.wInt(-1);
+			EndRecordData();
+
+			//LogRecordInfo("REC: Setting linedef " + l.Index + " back sidedef " + ((l.Back != null) ? l.Back.Index : -1));
+			propsrecorded = null;
+		}
+
+		private void PlayRefLinedefBack(DeserializerStream ds)
+		{
+			int index; ds.rInt(out index);
+			Linedef l = General.Map.Map.GetLinedefByIndex(index);
+			int sindex; ds.rInt(out sindex);
+			//LogRecordInfo("PLY: Setting linedef " + index + " back sidedef " + sindex);
+			Sidedef sd = (sindex >= 0) ? General.Map.Map.GetSidedefByIndex(sindex) : null;
+			l.AttachBack(sd);
+			l.Marked = true;
+			if(sd != null) sd.Marked = true;
+			geometrychanged = true;
+		}
+
+		internal void RecAddSidedef(Sidedef s)
+		{
+			if(!BeginRecordData(StreamCodes.AddSidedef)) return;
+			ss.wInt(s.Index);
+			EndRecordData();
+
+			//LogRecordInfo("REC: Adding sidedef " + s.Index + " to linedef " + s.Line.Index + (s.IsFront ? " front" : " back") + " and sector " + s.Sector.Index);
+			propsrecorded = null;
+		}
+
+		private void PlayAddSidedef(DeserializerStream ds)
+		{
+			int index; ds.rInt(out index);
+			//LogRecordInfo("PLY: Removing sidedef " + index);
+			Sidedef s = General.Map.Map.GetSidedefByIndex(index);
+			if(s.Sector != null) s.Sector.Marked = true;
+			s.Dispose();
+			geometrychanged = true;
+		}
+
+		internal void RecRemSidedef(Sidedef s)
+		{
+			if(!BeginRecordData(StreamCodes.RemSidedef)) return;
+			ss.wInt(s.Index);
+			ss.wInt(s.Line.Index);
+			ss.wBool(s.IsFront);
+			ss.wInt(s.Sector.Index);
+			s.ReadWrite(ss);
+			EndRecordData();
+
+			//LogRecordInfo("REC: Removing sidedef " + s.Index + " (from linedef " + s.Line.Index + (s.IsFront ? " front" : " back") + " and sector " + s.Sector.Index + ")");
+			propsrecorded = null;
+		}
+
+		private void PlayRemSidedef(DeserializerStream ds)
+		{
+			int index; ds.rInt(out index);
+			int dindex; ds.rInt(out dindex);
+			bool front; ds.rBool(out front);
+			int sindex; ds.rInt(out sindex);
+			//LogRecordInfo("PLY: Adding sidedef " + index + " to linedef " + dindex + (front ? " front" : " back") + " and sector " + sindex);
+			Linedef l = General.Map.Map.GetLinedefByIndex(dindex);
+			Sector s = General.Map.Map.GetSectorByIndex(sindex);
+			Sidedef sd = General.Map.Map.CreateSidedef(index, l, front, s);
+			sd.ReadWrite(ds);
+			sd.Marked = true;
+			geometrychanged = true;
+		}
+
+		internal void RecPrpSidedef(Sidedef s)
+		{
+			if(!ignorepropchanges && !isrecordingcommand && !object.ReferenceEquals(s, propsrecorded))
+			{
+				if(!BeginRecordData(StreamCodes.PrpSidedef)) return;
+				ss.wInt(s.Index);
+				s.ReadWrite(ss);
+				EndRecordData();
+				propsrecorded = s;
+			}
+		}
+
+		private static void PlayPrpSidedef(DeserializerStream ds)
+		{
+			int index; ds.rInt(out index);
+			Sidedef s = General.Map.Map.GetSidedefByIndex(index);
+			s.ReadWrite(ds);
+			s.Marked = true;
+		}
+
+		internal void RecRefSidedefSector(Sidedef s)
+		{
+			if(!BeginRecordData(StreamCodes.RefSidedefSector)) return;
+			ss.wInt(s.Index);
+			if(s.Sector != null) ss.wInt(s.Sector.Index); else ss.wInt(-1);
+			EndRecordData();
+
+			//LogRecordInfo("REC: Setting sidedef " + s.Index + " sector " + ((s.Sector != null) ? s.Sector.Index : -1));
+			propsrecorded = null;
+		}
+
+		private void PlayRefSidedefSector(DeserializerStream ds)
+		{
+			int index; ds.rInt(out index);
+			Sidedef sd = General.Map.Map.GetSidedefByIndex(index);
+			int sindex; ds.rInt(out sindex);
+			//LogRecordInfo("PLY: Setting sidedef " + index + " sector " + sindex);
+			Sector sc = (sindex >= 0) ? General.Map.Map.GetSectorByIndex(sindex) : null;
+			sd.SetSector(sc);
+			sd.Marked = true;
+			if(sc != null) sc.Marked = true;
+			geometrychanged = true;
+		}
+
+		internal void RecAddSector(Sector s)
+		{
+			if(!BeginRecordData(StreamCodes.AddSector)) return;
+			ss.wInt(s.Index);
+			EndRecordData();
+
+			//LogRecordInfo("REC: Adding sector " + s.Index);
+			propsrecorded = null;
+		}
+
+		private void PlayAddSector(DeserializerStream ds)
+		{
+			int index; ds.rInt(out index);
+			//LogRecordInfo("PLY: Removing sector " + index);
+			Sector s = General.Map.Map.GetSectorByIndex(index);
+			s.Dispose();
+			geometrychanged = true;
+		}
+
+		internal void RecRemSector(Sector s)
+		{
+			if(!BeginRecordData(StreamCodes.RemSector)) return;
+			ss.wInt(s.Index);
+			s.ReadWrite(ss);
+			EndRecordData();
+
+			//LogRecordInfo("REC: Removing sector " + s.Index);
+			propsrecorded = null;
+		}
+
+		private void PlayRemSector(DeserializerStream ds)
+		{
+			int index; ds.rInt(out index);
+			//LogRecordInfo("PLY: Adding sector " + index);
+			Sector s = General.Map.Map.CreateSector(index);
+			s.ReadWrite(ds);
+			s.Marked = true;
+			geometrychanged = true;
+		}
+
+		internal void RecPrpSector(Sector s)
+		{
+			if(!ignorepropchanges && !isrecordingcommand && !object.ReferenceEquals(s, propsrecorded))
+			{
+				if(!BeginRecordData(StreamCodes.PrpSector)) return;
+				ss.wInt(s.Index);
+				s.ReadWrite(ss);
+				EndRecordData();
+				propsrecorded = s;
+			}
+		}
+
+		private static void PlayPrpSector(DeserializerStream ds)
+		{
+			int index; ds.rInt(out index);
+			Sector s = General.Map.Map.GetSectorByIndex(index);
+			s.ReadWrite(ds);
+			s.Marked = true;
+		}
+
+		internal void RecAddThing(Thing t)
+		{
+			if(!BeginRecordData(StreamCodes.AddThing)) return;
+			ss.wInt(t.Index);
+			EndRecordData();
+
+			//LogRecordInfo("REC: Adding thing " + t.Index);
+			propsrecorded = null;
+		}
+
+		private void PlayAddThing(DeserializerStream ds)
+		{
+			int index; ds.rInt(out index);
+			//LogRecordInfo("PLY: Removing thing " + index);
+			Thing t = General.Map.Map.GetThingByIndex(index);
+			t.Dispose();
+			populationchanged = true;
+		}
+
+		internal void RecRemThing(Thing t)
+		{
+			if(!BeginRecordData(StreamCodes.RemThing)) return;
+			ss.wInt(t.Index);
+			t.ReadWrite(ss);
+			EndRecordData();
+
+			//LogRecordInfo("REC: Removing thing " + t.Index);
+			propsrecorded = null;
+		}
+
+		private void PlayRemThing(DeserializerStream ds)
+		{
+			int index; ds.rInt(out index);
+			//LogRecordInfo("PLY: Adding thing " + index);
+			Thing t = General.Map.Map.CreateThing(index);
+			t.ReadWrite(ds);
+			t.Marked = true;
+			populationchanged = true;
+		}
+
+		internal void RecPrpThing(Thing t)
+		{
+			if(!ignorepropchanges && !isrecordingcommand && !object.ReferenceEquals(t, propsrecorded))
+			{
+				if(!BeginRecordData(StreamCodes.PrpThing)) return;
+				ss.wInt(t.Index);
+				t.ReadWrite(ss);
+				EndRecordData();
+				propsrecorded = t;
+			}
+		}
+
+		private static void PlayPrpThing(DeserializerStream ds)
+		{
+			int index; ds.rInt(out index);
+			Thing t = General.Map.Map.GetThingByIndex(index);
+			t.ReadWrite(ds);
+			t.Marked = true;
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Editing/UndoSnapshot.cs b/Source/Core/Editing/UndoSnapshot.cs
new file mode 100644
index 0000000..d994ba4
--- /dev/null
+++ b/Source/Core/Editing/UndoSnapshot.cs
@@ -0,0 +1,154 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.IO;
+using CodeImp.DoomBuilder.GZBuilder.Data; //mxd
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Editing
+{
+	public class UndoSnapshot
+	{
+		#region ================== Variables
+
+		private MemoryStream recstream;
+		private string filename;
+		private string description;
+		private int ticketid;			// For safe withdrawing
+		private volatile bool storeondisk;
+		private volatile bool isondisk;
+		private bool isdisposed;
+		//private Dictionary<string, MemoryStream> customdata;
+		
+		#endregion
+
+		#region ================== Properties
+
+		public string Description { get { return description; } set { description = value; } }
+		public int TicketID { get { return ticketid; } }
+		internal bool StoreOnDisk { get { return storeondisk; } set { storeondisk = value; } }
+		public bool IsOnDisk { get { return isondisk; } }
+		
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		internal UndoSnapshot(string description, MemoryStream recstream, int ticketid)
+		{
+			if(recstream == null) General.Fail("Argument cannot be null!");
+			this.ticketid = ticketid;
+			this.description = description;
+			this.recstream = recstream;
+			this.filename = null;
+		}
+
+		// Constructor
+		internal UndoSnapshot(UndoSnapshot info, MemoryStream recstream)
+		{
+			if(recstream == null) General.Fail("Argument cannot be null!");
+			this.ticketid = info.ticketid;
+			this.description = info.description;
+			this.recstream = recstream;
+			this.filename = null;
+		}
+
+		// Disposer
+		internal void Dispose()
+		{
+			lock(this)
+			{
+				isdisposed = true;
+				if(recstream != null) recstream.Dispose();
+				recstream = null;
+				if(isondisk) File.Delete(filename);
+				isondisk = false;
+			}
+		}
+
+		#endregion
+		
+		#region ================== Methods
+
+		// This returns the map data
+		internal MemoryStream GetStream()
+		{
+			lock(this)
+			{
+				// Restore into memory if needed
+				if(isondisk) RestoreFromFile();
+				
+				// Return the buffer
+				return recstream;
+			}
+		}
+		
+		// This moves the snapshot from memory to harddisk
+		internal void WriteToFile()
+		{
+			lock(this)
+			{
+				if(isdisposed) return;
+				if(isondisk) return;
+				isondisk = true;
+				
+				// Compress data
+				recstream.Seek(0, SeekOrigin.Begin);
+				MemoryStream outstream = SharpCompressHelper.CompressStream(recstream); //mxd
+
+				// Make temporary file
+				filename = General.MakeTempFilename(General.Map.TempPath, "snapshot");
+
+				// Write data to file
+				File.WriteAllBytes(filename, outstream.ToArray());
+
+				// Remove data from memory
+				recstream.Dispose();
+				recstream = null;
+				outstream.Dispose();
+			}
+		}
+
+		// This loads the snapshot from harddisk into memory
+		internal void RestoreFromFile()
+		{
+			lock(this)
+			{
+				if(isdisposed) return;
+				if(!isondisk) return;
+				isondisk = false;
+
+				// Read the file data
+				MemoryStream instream = new MemoryStream(File.ReadAllBytes(filename));
+				
+				// Decompress data
+				MemoryStream outstream = SharpCompressHelper.DecompressStream(instream); //mxd
+				recstream = new MemoryStream(outstream.ToArray());
+				
+				// Clean up
+				instream.Dispose();
+				File.Delete(filename);
+				filename = null;
+				outstream.Dispose();
+			}
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/GZBuilder/Controls/AngleControl.Designer.cs b/Source/Core/GZBuilder/Controls/AngleControl.Designer.cs
new file mode 100644
index 0000000..e0ece7a
--- /dev/null
+++ b/Source/Core/GZBuilder/Controls/AngleControl.Designer.cs
@@ -0,0 +1,55 @@
+namespace CodeImp.DoomBuilder.GZBuilder.Controls
+{
+	partial class AngleControl
+	{
+		/// <summary> 
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing) 
+		{
+			if(disposing && (components != null)) 
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Component Designer generated code
+
+		/// <summary> 
+		/// Required method for Designer support - do not modify 
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent() 
+		{
+			this.components = new System.ComponentModel.Container();
+			this.toolTip = new System.Windows.Forms.ToolTip(this.components);
+			this.SuspendLayout();
+			// 
+			// AngleControl
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.Name = "AngleControl";
+			this.Size = new System.Drawing.Size(40, 40);
+			this.toolTip.SetToolTip(this, "Left-click (and drag) to set angle snapped to 45-degree increment.\r\nRight-click (" +
+					"and drag) to set precise angle.");
+			this.Load += new System.EventHandler(this.AngleSelector_Load);
+			this.MouseMove += new System.Windows.Forms.MouseEventHandler(this.AngleSelector_MouseMove);
+			this.MouseDown += new System.Windows.Forms.MouseEventHandler(this.AngleSelector_MouseDown);
+			this.SizeChanged += new System.EventHandler(this.AngleSelector_SizeChanged);
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.ToolTip toolTip;
+	}
+}
diff --git a/Source/Core/GZBuilder/Controls/AngleControl.cs b/Source/Core/GZBuilder/Controls/AngleControl.cs
new file mode 100644
index 0000000..fa4c0be
--- /dev/null
+++ b/Source/Core/GZBuilder/Controls/AngleControl.cs
@@ -0,0 +1,209 @@
+#region Namespaces
+
+//Downloaded from
+//Visual C# Kicks - http://vckicks.110mb.com
+//The Code Project - http://www.codeproject.com
+
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Geometry;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.GZBuilder.Controls
+{
+	public partial class AngleControl : UserControl
+	{
+		#region Variables
+
+		private int angle;
+		private int angleoffset;
+
+		private Rectangle drawRegion;
+		private const int drawOffset = 2;
+		private const int markScaler = 5;
+		private Point origin;
+
+		//UI colors
+		private readonly Color fillColor = SystemColors.Window;
+		private readonly Color fillInactiveColor = SystemColors.Control;
+		private readonly Color outlineColor = SystemColors.WindowFrame;
+		private readonly Color outlineInactiveColor = SystemColors.ControlDarkDark;
+		private readonly Color needleColor = SystemColors.ControlText;
+		private readonly Color needleInactiveColor = SystemColors.ControlDarkDark;
+		private readonly Color marksColor = SystemColors.ActiveBorder;
+		private readonly Color marksInactiveColor = SystemColors.ControlDark;
+
+		#endregion
+
+		#region Properties
+
+		public event EventHandler AngleChanged;
+
+		public int Angle { get { return (angle == NO_ANGLE ? NO_ANGLE : angle - angleoffset); } set { angle = (value == NO_ANGLE ? NO_ANGLE : value + angleoffset); this.Refresh(); } }
+		public int AngleOffset { get { return angleoffset; } set { angleoffset = value; this.Refresh(); } }
+		public const int NO_ANGLE = int.MinValue;
+
+		#endregion
+
+		public AngleControl() 
+		{
+			InitializeComponent();
+			this.DoubleBuffered = true;
+		}
+
+		#region Methods
+
+		private void SetDrawRegion() 
+		{
+			drawRegion = new Rectangle(0, 0, this.Width, this.Height);
+			drawRegion.X += 2;
+			drawRegion.Y += 2;
+			drawRegion.Width -= 4;
+			drawRegion.Height -= 4;
+
+			origin = new Point(drawRegion.Width / 2 + drawOffset, drawRegion.Height / 2 + drawOffset);
+
+			this.Refresh();
+		}
+
+		private static PointF DegreesToXY(float degrees, float radius, Point origin) 
+		{
+			PointF xy = new PointF();
+			float radians = degrees * Angle2D.PI / 180.0f;
+
+			xy.X = (float)Math.Cos(radians) * radius + origin.X;
+			xy.Y = (float)Math.Sin(-radians) * radius + origin.Y;
+
+			return xy;
+		}
+
+		private static int XYToDegrees(Point xy, Point origin) 
+		{
+			float xDiff = xy.X - origin.X;
+			float yDiff = xy.Y - origin.Y;
+			return ((int)Math.Round(Math.Atan2(-yDiff, xDiff) * 180.0 / Angle2D.PI) + 360) % 360;
+		}
+
+		#endregion
+
+		#region Events
+
+		private void AngleSelector_Load(object sender, EventArgs e) 
+		{
+			SetDrawRegion();
+		}
+
+		private void AngleSelector_SizeChanged(object sender, EventArgs e) 
+		{
+			this.Height = this.Width; // Keep it there and keep it square!
+			SetDrawRegion();
+		}
+
+		protected override void OnPaint(PaintEventArgs e) 
+		{
+			Graphics g = e.Graphics;
+
+			Pen outline;
+			Pen needle;
+			Pen marks;
+			SolidBrush fill;
+			Brush center;
+
+			if(this.Enabled) 
+			{
+				outline = new Pen(outlineColor, 2.0f);
+				fill = new SolidBrush(fillColor);
+				needle = new Pen(needleColor);
+				center = new SolidBrush(needleColor);
+				marks = new Pen(marksColor);
+			} 
+			else 
+			{
+				outline = new Pen(outlineInactiveColor, 2.0f);
+				fill = new SolidBrush(fillInactiveColor);
+				needle = new Pen(needleInactiveColor);
+				center = new SolidBrush(needleInactiveColor);
+				marks = new Pen(marksInactiveColor);
+			}
+
+			Rectangle originSquare = new Rectangle(origin.X - 1, origin.Y - 1, 3, 3);
+
+			//Draw circle
+			g.SmoothingMode = SmoothingMode.AntiAlias;
+			g.DrawEllipse(outline, drawRegion);
+			g.FillEllipse(fill, drawRegion);
+
+			// Draw angle marks
+			int offset = this.Height / markScaler;
+			for(int i = 0; i < 360; i += 45) 
+			{
+				PointF p1 = DegreesToXY(i, origin.X - 6, origin);
+				PointF p2 = DegreesToXY(i, origin.X - offset, origin);
+				g.DrawLine(marks, p1, p2);
+			}
+
+			// Draw needle
+			if(angle != NO_ANGLE) 
+			{
+				PointF anglePoint = DegreesToXY(angle, origin.X - 4, origin);
+				g.DrawLine(needle, origin, anglePoint);
+			}
+
+			g.SmoothingMode = SmoothingMode.HighSpeed; //Make the square edges sharp
+			g.FillRectangle(center, originSquare);
+
+			//mxd. Dispose brushes
+			fill.Dispose();
+			center.Dispose();
+			outline.Dispose();
+			marks.Dispose();
+			needle.Dispose();
+
+			base.OnPaint(e);
+		}
+
+		private void AngleSelector_MouseDown(object sender, MouseEventArgs e) 
+		{
+			int thisAngle = XYToDegrees(new Point(e.X, e.Y), origin);
+
+			if(e.Button == MouseButtons.Left) 
+			{
+				thisAngle = (int)Math.Round(thisAngle / 45f) * 45;
+				if(thisAngle == 360) thisAngle = 0;
+			}
+
+			if(thisAngle != angle) 
+			{
+				angle = thisAngle;
+				if(!this.DesignMode && AngleChanged != null) AngleChanged(this, EventArgs.Empty); //Raise event
+				this.Refresh();
+			}
+		}
+
+		private void AngleSelector_MouseMove(object sender, MouseEventArgs e) 
+		{
+			if(e.Button == MouseButtons.Left || e.Button == MouseButtons.Right) 
+			{
+				int thisAngle = XYToDegrees(new Point(e.X, e.Y), origin);
+
+				if(e.Button == MouseButtons.Left) 
+				{
+					thisAngle = (int)Math.Round(thisAngle / 45f) * 45;
+					if(thisAngle == 360) thisAngle = 0;
+				}
+
+				if(thisAngle != angle) 
+				{
+					angle = thisAngle;
+					if(!this.DesignMode && AngleChanged != null) AngleChanged(this, EventArgs.Empty); //Raise event
+					this.Refresh();
+				}
+			}
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/GZBuilder/Controls/AngleControl.resx b/Source/Core/GZBuilder/Controls/AngleControl.resx
new file mode 100644
index 0000000..5deed0a
--- /dev/null
+++ b/Source/Core/GZBuilder/Controls/AngleControl.resx
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Core/GZBuilder/Controls/ColorFieldsControl.Designer.cs b/Source/Core/GZBuilder/Controls/ColorFieldsControl.Designer.cs
new file mode 100644
index 0000000..ab97148
--- /dev/null
+++ b/Source/Core/GZBuilder/Controls/ColorFieldsControl.Designer.cs
@@ -0,0 +1,87 @@
+namespace CodeImp.DoomBuilder.GZBuilder.Controls
+{
+	partial class ColorFieldsControl
+	{
+		/// <summary> 
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing) 
+		{
+			if(disposing && (components != null)) 
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Component Designer generated code
+
+		/// <summary> 
+		/// Required method for Designer support - do not modify 
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent() 
+		{
+			this.bReset = new System.Windows.Forms.Button();
+			this.cpColor = new CodeImp.DoomBuilder.Controls.ColorControl();
+			this.tbColor = new CodeImp.DoomBuilder.Controls.AutoSelectTextbox();
+			this.SuspendLayout();
+			// 
+			// bReset
+			// 
+			this.bReset.Image = global::CodeImp.DoomBuilder.Properties.Resources.Reset;
+			this.bReset.Location = new System.Drawing.Point(179, 3);
+			this.bReset.Name = "bReset";
+			this.bReset.Size = new System.Drawing.Size(23, 23);
+			this.bReset.TabIndex = 43;
+			this.bReset.UseVisualStyleBackColor = true;
+			this.bReset.Visible = false;
+			this.bReset.Click += new System.EventHandler(this.bReset_Click);
+			// 
+			// cpColor
+			// 
+			this.cpColor.BackColor = System.Drawing.Color.Transparent;
+			this.cpColor.Label = "Light:";
+			this.cpColor.Location = new System.Drawing.Point(3, 3);
+			this.cpColor.MaximumSize = new System.Drawing.Size(10000, 23);
+			this.cpColor.MinimumSize = new System.Drawing.Size(100, 23);
+			this.cpColor.Name = "cpColor";
+			this.cpColor.Size = new System.Drawing.Size(100, 23);
+			this.cpColor.TabIndex = 41;
+			this.cpColor.ColorChanged += new System.EventHandler(this.cpColor_ColorChanged);
+			// 
+			// tbColor
+			// 
+			this.tbColor.Location = new System.Drawing.Point(109, 5);
+			this.tbColor.Name = "tbColor";
+			this.tbColor.Size = new System.Drawing.Size(64, 20);
+			this.tbColor.TabIndex = 45;
+			this.tbColor.TextChanged += new System.EventHandler(this.tbColor_TextChanged);
+			// 
+			// ColorFieldsControl
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.Controls.Add(this.tbColor);
+			this.Controls.Add(this.bReset);
+			this.Controls.Add(this.cpColor);
+			this.Name = "ColorFieldsControl";
+			this.Size = new System.Drawing.Size(207, 29);
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Button bReset;
+		private CodeImp.DoomBuilder.Controls.ColorControl cpColor;
+		private CodeImp.DoomBuilder.Controls.AutoSelectTextbox tbColor;
+	}
+}
diff --git a/Source/Core/GZBuilder/Controls/ColorFieldsControl.cs b/Source/Core/GZBuilder/Controls/ColorFieldsControl.cs
new file mode 100644
index 0000000..b3beb7e
--- /dev/null
+++ b/Source/Core/GZBuilder/Controls/ColorFieldsControl.cs
@@ -0,0 +1,109 @@
+#region ================== Namespaces
+
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+using System.Globalization;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Map;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.GZBuilder.Controls
+{
+	public partial class ColorFieldsControl : UserControl
+	{
+		#region ================== Events
+
+		public event EventHandler OnValueChanged; //mxd
+
+		#endregion
+
+		#region ================== Variables
+
+		private int defaultValue;
+		private string field;
+		private bool blockUpdate;
+
+		#endregion
+
+		#region ================== Properties
+
+		public int DefaultValue { get { return defaultValue; } set { defaultValue = value; } }
+		public string Label { get { return cpColor.Label; } set { cpColor.Label = value; } }
+		public string Field { get { return field; } set { field = value; } }
+
+		#endregion
+		
+		public ColorFieldsControl() 
+		{
+			InitializeComponent();
+		}
+
+		public void SetValueFrom(UniFields fields) 
+		{
+			string newValue = String.Format("{0:X6}", UniFields.GetInteger(fields, field, defaultValue));
+			tbColor.Text = ((!string.IsNullOrEmpty(tbColor.Text) && tbColor.Text != newValue) ? "" : newValue);
+			CheckColor();
+		}
+
+		public void ApplyTo(UniFields fields, int oldValue) 
+		{
+			if(string.IsNullOrEmpty(tbColor.Text)) 
+			{
+				UniFields.SetInteger(fields, field, oldValue, defaultValue);
+			} 
+			else 
+			{
+				UniFields.SetInteger(fields, field, (cpColor.Color.ToInt() & 0x00ffffff), defaultValue);
+			}
+		}
+
+		private void CheckColor() 
+		{
+			bool changed = string.IsNullOrEmpty(tbColor.Text) || (cpColor.Color.ToInt() & 0x00ffffff) != defaultValue;
+			bReset.Visible = changed;
+			tbColor.ForeColor = changed ? SystemColors.WindowText : SystemColors.GrayText;
+		}
+
+		#region ================== Events
+
+		private void bReset_Click(object sender, EventArgs e) 
+		{
+			cpColor.Color = PixelColor.FromInt(defaultValue).WithAlpha(255);
+			cpColor_ColorChanged(this, EventArgs.Empty);
+		}
+
+		private void cpColor_ColorChanged(object sender, EventArgs e) 
+		{
+			if(blockUpdate)	return;
+
+			blockUpdate = true;
+			tbColor.Text = String.Format("{0:X6}", (cpColor.Color.ToInt() & 0x00ffffff));
+			blockUpdate = false;
+
+			CheckColor();
+			if(OnValueChanged != null) OnValueChanged(this, EventArgs.Empty);
+		}
+
+		private void tbColor_TextChanged(object sender, EventArgs e) 
+		{
+			if(blockUpdate)	return;
+			int colorVal;
+
+			if(int.TryParse(tbColor.Text, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out colorVal))
+			{
+				colorVal = General.Clamp(colorVal, 0, 16777215);
+
+				blockUpdate = true;
+				cpColor.Color = PixelColor.FromInt(colorVal).WithAlpha(255);
+				blockUpdate = false;
+			}
+
+			CheckColor();
+			if(OnValueChanged != null) OnValueChanged(this, EventArgs.Empty);
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/GZBuilder/Controls/ColorFieldsControl.resx b/Source/Core/GZBuilder/Controls/ColorFieldsControl.resx
new file mode 100644
index 0000000..19dc0dd
--- /dev/null
+++ b/Source/Core/GZBuilder/Controls/ColorFieldsControl.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/Source/Core/GZBuilder/Controls/MultiSelectTreeview.cs b/Source/Core/GZBuilder/Controls/MultiSelectTreeview.cs
new file mode 100644
index 0000000..da76af7
--- /dev/null
+++ b/Source/Core/GZBuilder/Controls/MultiSelectTreeview.cs
@@ -0,0 +1,1718 @@
+#region ================== Copyright
+
+// *****************************************************************************
+// 
+//  Copyright 2004, Coder's Lab
+//  All rights reserved. The software and associated documentation 
+//  supplied hereunder are the proprietary information of Coder's Lab
+//  and are supplied subject to licence terms.
+//  
+//
+//  You can use this control freely in your projects, but let me know if you
+//  are using it so I can add you to a list of references. 
+//
+//  Email: ludwig.stuyck@coders-lab.be
+//  Home page: http://www.coders-lab.be
+//
+//  History
+//		18/07/2004	
+//			- Control creation	
+//		24/07/2004	
+//			- Implemented rubberband selection; also combination keys work: 
+//			  ctrl, shift, ctrl+shift	
+//		25/08/2004	
+//			- Rubberband selection temporary removed due to scrolling problems. 
+//			- Renamed TreeViewSelectionMode property to SelectionMode.
+//			- Renamed SelectionModes enumeration to TreeViewSelectionMode.
+//			- Added MultiSelectSameParent selection mode.
+//			- Added keyboard functionality.
+//			- Enhanced selection drawing.
+//			- Added SelectionBackColor property.	
+//		02/09/2004	
+//			- When shift/ctrl was pressed, treeview scrolled to last selected 
+//			  node. Fixed.
+//			- Moved TreeViewSelectionMode outside the TreeView class.
+//			- BeforeSelect was fired multiple times, AfterSelect was never 
+//			  fired. Fixed.
+//			- Collapsing/Expanding node changed selection. This does not happen 
+//			  anymore, except if a node that has selected descendants is 
+//			  collapsed; then all descendants are unselected and the collapsed 
+//			  node becomes selected.
+//			- If in the BeforeSelect event, e.Cancel is set to true, then node 
+//			  will not be selected
+//			- SHIFT selection sometimes didn’t behave correctly. Fixed.
+//		04/09/2004	
+//			- SelectedNodes is no longer an array of tree nodes, but a 
+//			  SelectedNodesCollection
+//			- In the AfterSelect event, the SelectedNodes contained two tree 
+//			  nodes; the old one and the new one. Fixed.
+//		05/09/2004	
+//			- Added Home, End, PgUp and PgDwn keys functionality	
+//		08/10/2004
+//			- SelectedNodeCollection renamed to NodeCollection
+//			- Fixes by GKM
+//
+//		18/8/2005
+//			- Added events BeforeDeselect and AfterDeselect
+//		09/5/2007
+//			- Added an InvokeRequired check to Flashnode()
+//		16/5/2007
+//			- Gave the document a consistant format
+//			- Created a new event 'SelectionsChanged'
+// 
+// *****************************************************************************
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.GZBuilder.Controls
+{
+	#region TreeViewSelectionMode enumeration
+
+	/// <summary>
+	/// Selection mode for the treeview.	
+	/// </summary>
+	/// <remarks>
+	/// The Selection mode determines how treeview nodes can be selected.
+	/// </remarks>
+	public enum TreeViewSelectionMode
+	{
+		/// <summary>
+		/// Only one node can be selected at a time.
+		/// </summary>
+		SingleSelect,
+		/// <summary>
+		/// Multiple nodes can be selected at the same time without restriction.
+		/// </summary>
+		MultiSelect,
+		/// <summary>
+		/// Multiple nodes that belong to the same root branch can be selected at the same time.
+		/// </summary>
+		MultiSelectSameRootBranch,
+		/// <summary>
+		/// Multiple nodes that belong to the same level can be selected at the same time.
+		/// </summary>
+		MultiSelectSameLevel,
+		/// <summary>
+		/// Multiple nodes that belong to the same level and same root branch can be selected at the same time.
+		/// </summary>
+		MultiSelectSameLevelAndRootBranch,
+		/// <summary>
+		/// Only nodes that belong to the same direct parent can be selected at the same time.
+		/// </summary>
+		MultiSelectSameParent
+	}
+
+	#endregion
+
+	#region Delegates
+
+	/// <summary>
+	/// Delegate used for tree node events.
+	/// </summary>
+	public delegate void TreeNodeEventHandler(TreeNode tn);
+
+	#endregion
+
+	/// <summary>
+	/// The TreeView control is a regular treeview with multi-selection capability.
+	/// </summary>
+	[ToolboxItem(true)]
+	public class MultiSelectTreeview : TreeView
+	{
+		public event TreeViewEventHandler AfterDeselect;
+		public event TreeViewEventHandler BeforeDeselect;
+		public event EventHandler SelectionsChanged;
+
+		protected void OnAfterDeselect(TreeNode tn)
+		{
+			if(AfterDeselect != null)
+			{
+				AfterDeselect(this, new TreeViewEventArgs(tn));
+			}
+		}
+
+		protected void OnBeforeDeselect(TreeNode tn)
+		{
+			if(BeforeDeselect != null)
+			{
+				BeforeDeselect(this, new TreeViewEventArgs(tn));
+			}
+		}
+
+		protected void OnSelectionsChanged()
+		{
+			if(blnSelectionChanged)
+				if(SelectionsChanged != null)
+				{
+					SelectionsChanged(this, new EventArgs());
+				}
+		}
+
+		#region Private variables
+
+		/// <summary> 
+		/// Required designer variable.
+		/// </summary>
+		private Container components;
+
+		/// <summary>
+		/// Used to make sure that SelectedNode can only be used from within this class.
+		/// </summary>
+		private bool blnInternalCall;
+
+		/// <summary>
+		/// Hashtable that contains all selected nodes.
+		/// </summary>
+		private Hashtable htblSelectedNodes = new Hashtable();
+
+		/// <summary>
+		/// Track whether the total SelectedNodes changed across multiple operations
+		/// for SelectionsChanged event
+		/// </summary>
+		private bool blnSelectionChanged;
+
+		/// <summary>
+		/// Hashtable to preserve Node's original colors (colors can be set on the TreeView, or individual nodes)
+		/// (GKM)
+		/// </summary>
+		private Hashtable htblSelectedNodesOrigColors = new Hashtable();
+
+		/// <summary>
+		/// Keeps track of node that has to be pu in edit mode.
+		/// </summary>
+		private TreeNode tnNodeToStartEditOn;
+
+		/// <summary>
+		/// Remembers whether mouse click on a node was single or double click.
+		/// </summary>
+		private bool blnWasDoubleClick;
+
+		/// <summary>
+		/// Keeps track of most recent selected node.
+		/// </summary>
+		private TreeNode tnMostRecentSelectedNode;
+
+		/// <summary>
+		/// Keeps track of the selection mirror point; this is the last selected node without SHIFT key pressed.
+		/// It is used as the mirror node during SHIFT selection.
+		/// </summary>
+		private TreeNode tnSelectionMirrorPoint;
+
+		/// <summary>
+		/// Keeps track of the number of mouse clicks.
+		/// </summary>
+		private int intMouseClicks;
+
+		/// <summary>
+		/// Selection mode.
+		/// </summary>
+		private TreeViewSelectionMode selectionMode = TreeViewSelectionMode.SingleSelect;
+
+		/// <summary>
+		/// Backcolor for selected nodes.
+		/// </summary>
+		private Color selectionBackColor = SystemColors.Highlight;
+
+		/// <summary>
+		/// Keeps track whether a node click has been handled by the mouse down event. This is almost always the
+		/// case, except when a selected node has been clicked again. Then, it will not be handled in the mouse
+		/// down event because we might want to drag the node and if that's the case, node should not go in edit 
+		/// mode.
+		/// </summary>
+		private bool blnNodeProcessedOnMouseDown;
+
+		/// <summary>
+		/// Holds node that needs to be flashed.
+		/// </summary>
+		private TreeNode tnToFlash;
+
+		/// <summary>
+		/// Keeps track of the first selected node when selection has begun with the keyboard.
+		/// </summary>
+		private TreeNode tnKeysStartNode;
+
+		#endregion
+
+		#region SelectedNode, SelectionMode, SelectionBackColor, SelectedNodes + events
+
+		/// <summary>
+		/// This property is for internal use only. Use SelectedNodes instead.
+		/// </summary>
+		public new TreeNode SelectedNode
+		{
+			get
+			{
+				if(!blnInternalCall)
+				{
+					throw new NotSupportedException("Use SelectedNodes instead of SelectedNode.");
+				}
+				else
+				{
+					return base.SelectedNode;
+				}
+			}
+			set
+			{
+				if(!blnInternalCall)
+				{
+					throw new NotSupportedException("Use SelectedNodes instead of SelectedNode.");
+				}
+				else
+				{
+					base.SelectedNode = value;
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets/sets selection mode.
+		/// </summary>
+		public TreeViewSelectionMode SelectionMode
+		{
+			get
+			{
+				return selectionMode;
+			}
+			set
+			{
+				selectionMode = value;
+			}
+		}
+
+		/// <summary>
+		/// Gets/sets backcolor for selected nodes.
+		/// </summary>
+		public Color SelectionBackColor
+		{
+			get
+			{
+				return selectionBackColor;
+			}
+			set
+			{
+				selectionBackColor = value;
+			}
+		}
+
+		/// <summary>
+		/// Gets selected nodes.
+		/// </summary>
+		public NodesCollection SelectedNodes
+		{
+			get
+			{
+				// Create a SelectedNodesCollection to return, and add event handlers to catch actions on it
+				NodesCollection selectedNodesCollection = new NodesCollection();
+				foreach(TreeNode tn in htblSelectedNodes.Values)
+				{
+					selectedNodesCollection.Add(tn);
+				}
+
+				selectedNodesCollection.TreeNodeAdded += new TreeNodeEventHandler(SelectedNodes_TreeNodeAdded);
+				selectedNodesCollection.TreeNodeInserted += new TreeNodeEventHandler(SelectedNodes_TreeNodeInserted);
+				selectedNodesCollection.TreeNodeRemoved += new TreeNodeEventHandler(SelectedNodes_TreeNodeRemoved);
+				selectedNodesCollection.SelectedNodesCleared += new EventHandler(SelectedNodes_SelectedNodesCleared);
+
+				return selectedNodesCollection;
+			}
+		}
+
+		/// <summary>
+		/// Occurs when a tree node is added to the SelectedNodes collection.
+		/// </summary>
+		/// <param name="tn">Tree node that was added.</param>
+		private void SelectedNodes_TreeNodeAdded(TreeNode tn)
+		{
+			blnSelectionChanged = false;
+
+			SelectNode(tn, true, TreeViewAction.Unknown);
+			//ProcessNodeRange(null, tn, new MouseEventArgs(MouseButtons.Left, 1, Cursor.Position.X,  Cursor.Position.Y, 0), Keys.None, TreeViewAction.ByKeyboard, false); 
+
+			OnSelectionsChanged();
+		}
+
+		/// <summary>
+		/// Occurs when a tree node is inserted to the SelectedNodes collection.
+		/// </summary>
+		/// <param name="tn">tree node that was inserted.</param>
+		private void SelectedNodes_TreeNodeInserted(TreeNode tn)
+		{
+			blnSelectionChanged = false;
+
+			SelectNode(tn, true, TreeViewAction.Unknown);
+
+			OnSelectionsChanged();
+		}
+
+		/// <summary>
+		/// Occurs when a tree node is removed from the SelectedNodes collection.
+		/// </summary>
+		/// <param name="tn">Tree node that was removed.</param>
+		private void SelectedNodes_TreeNodeRemoved(TreeNode tn)
+		{
+			blnSelectionChanged = false;
+
+			SelectNode(tn, false, TreeViewAction.Unknown);
+
+			OnSelectionsChanged();
+		}
+
+		/// <summary>
+		/// Occurs when the SelectedNodes collection was cleared.
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="e"></param>
+		private void SelectedNodes_SelectedNodesCleared(object sender, EventArgs e)
+		{
+			blnSelectionChanged = false;
+
+			UnselectAllNodes(TreeViewAction.Unknown);
+
+			OnSelectionsChanged();
+		}
+
+		#endregion
+
+		#region Node selection methods
+
+		/// <summary>
+		/// Unselects all selected nodes.
+		/// </summary>
+		/// <param name="tva">Specifies the action that caused the selection change.</param>
+		private void UnselectAllNodes(TreeViewAction tva)
+		{
+			UnselectAllNodesExceptNode(null, tva);
+		}
+
+		/// <summary>
+		/// Unselects all selected nodes that don't belong to the specified level.
+		/// </summary>
+		/// <param name="level">Node level.</param>
+		/// <param name="tva">Specifies the action that caused the selection change.</param>
+		private void UnselectAllNodesNotBelongingToLevel(int level, TreeViewAction tva)
+		{
+			// First, build list of nodes that need to be unselected
+			List<TreeNode> arrNodesToDeselect = new List<TreeNode>(); //mxd
+			foreach(TreeNode selectedTreeNode in htblSelectedNodes.Values)
+			{
+				if(GetNodeLevel(selectedTreeNode) != level)
+				{
+					arrNodesToDeselect.Add(selectedTreeNode);
+				}
+			}
+
+			// Do the actual unselect
+			foreach(TreeNode tnToDeselect in arrNodesToDeselect)
+			{
+				SelectNode(tnToDeselect, false, tva);
+			}
+		}
+
+		/// <summary>
+		/// Unselects all selected nodes that don't belong directly to the specified parent.
+		/// </summary>
+		/// <param name="parent">Parent node.</param>
+		/// <param name="tva">Specifies the action that caused the selection change.</param>
+		private void UnselectAllNodesNotBelongingDirectlyToParent(TreeNode parent, TreeViewAction tva)
+		{
+			// First, build list of nodes that need to be unselected
+			List<TreeNode> arrNodesToDeselect = new List<TreeNode>(); //mxd
+			foreach(TreeNode selectedTreeNode in htblSelectedNodes.Values)
+			{
+				if(selectedTreeNode.Parent != parent)
+				{
+					arrNodesToDeselect.Add(selectedTreeNode);
+				}
+			}
+
+			// Do the actual unselect
+			foreach(TreeNode tnToDeselect in arrNodesToDeselect)
+			{
+				SelectNode(tnToDeselect, false, tva);
+			}
+		}
+
+		/// <summary>
+		/// Unselects all selected nodes that don't belong directly or indirectly to the specified parent.
+		/// </summary>
+		/// <param name="parent">Parent node.</param>
+		/// <param name="tva">Specifies the action that caused the selection change.</param>
+		private void UnselectAllNodesNotBelongingToParent(TreeNode parent, TreeViewAction tva)
+		{
+			// First, build list of nodes that need to be unselected
+			List<TreeNode> arrNodesToDeselect = new List<TreeNode>(); //mxd
+			foreach(TreeNode selectedTreeNode in htblSelectedNodes.Values)
+			{
+				if(!IsChildOf(selectedTreeNode, parent))
+				{
+					arrNodesToDeselect.Add(selectedTreeNode);
+				}
+			}
+
+			// Do the actual unselect
+			foreach(TreeNode tnToDeselect in arrNodesToDeselect)
+			{
+				SelectNode(tnToDeselect, false, tva);
+			}
+		}
+
+		/// <summary>
+		/// Unselects all selected nodes, except for the specified node which should not be touched.
+		/// </summary>
+		/// <param name="nodeKeepSelected">Node not to touch.</param>
+		/// <param name="tva">Specifies the action that caused the selection change.</param>
+		private void UnselectAllNodesExceptNode(TreeNode nodeKeepSelected, TreeViewAction tva)
+		{
+			// First, build list of nodes that need to be unselected
+			List<TreeNode> arrNodesToDeselect = new List<TreeNode>(); //mxd
+			foreach(TreeNode selectedTreeNode in htblSelectedNodes.Values)
+			{
+				if(nodeKeepSelected == null)
+				{
+					arrNodesToDeselect.Add(selectedTreeNode);
+				}
+				else if((nodeKeepSelected != null) && (selectedTreeNode != nodeKeepSelected))
+				{
+					arrNodesToDeselect.Add(selectedTreeNode);
+				}
+			}
+
+			// Do the actual unselect
+			foreach(TreeNode tnToDeselect in arrNodesToDeselect)
+			{
+				SelectNode(tnToDeselect, false, tva);
+			}
+		}
+
+		/// <summary>
+		/// occurs when a node is about to be selected.
+		/// </summary>
+		/// <param name="e">TreeViewCancelEventArgs.</param>
+		protected override void OnBeforeSelect(TreeViewCancelEventArgs e)
+		{
+			// We don't want the base TreeView to handle the selection, because it can only handle single selection. 
+			// Instead, we'll handle the selection ourselves by keeping track of the selected nodes and drawing the 
+			// selection ourselves.
+			e.Cancel = true;
+		}
+
+		/// <summary>
+		/// Determines whether the specified node is selected or not.
+		/// </summary>
+		/// <param name="tn">Node to check.</param>
+		/// <returns>True if specified node is selected, false if not.</returns>
+		private bool IsNodeSelected(TreeNode tn)
+		{
+			if(tn != null)
+				return htblSelectedNodes.ContainsKey(tn.GetHashCode());
+			return false;
+		}
+
+		private void PreserveNodeColors(TreeNode tn)
+		{
+			if(tn == null) return;
+
+			if(htblSelectedNodesOrigColors.ContainsKey(tn.GetHashCode()))
+			{
+				//				Color[] color = (Color[])htblSelectedNodesOrigColors[tn.GetHashCode()];
+				//				color[0]=tn.BackColor;
+				//				color[1]=tn.ForeColor;
+			}
+			else
+			{
+				htblSelectedNodesOrigColors.Add(tn.GetHashCode(), new[] { tn.BackColor, tn.ForeColor });
+			}
+		}
+
+		/// <summary>
+		/// (Un)selects the specified node.
+		/// </summary>
+		/// <param name="tn">Node to (un)select.</param>
+		/// <param name="select">True to select node, false to unselect node.</param>
+		/// <param name="tva">Specifies the action that caused the selection change.</param>
+		/// <returns>True if node was selected, false if not.</returns>
+		private bool SelectNode(TreeNode tn, bool select, TreeViewAction tva)
+		{
+			bool blnSelected = false;
+
+			if(tn == null)
+				return false;
+
+			if(select)
+			{
+				// Only try to select node if it was not already selected																		
+				if(!IsNodeSelected(tn))
+				{
+					// Check if node selection is cancelled
+					TreeViewCancelEventArgs tvcea = new TreeViewCancelEventArgs(tn, false, tva);
+					base.OnBeforeSelect(tvcea);
+					if(tvcea.Cancel)
+					{
+						// This node selection was cancelled!						
+						return false;
+					}
+
+					PreserveNodeColors(tn);
+
+					tn.BackColor = SelectionBackColor; // GKM moved from above
+					tn.ForeColor = BackColor; // GKM moved from above									
+
+					htblSelectedNodes.Add(tn.GetHashCode(), tn);
+					blnSelected = true;
+					blnSelectionChanged = true;
+
+					base.OnAfterSelect(new TreeViewEventArgs(tn, tva));
+				}
+
+				tnMostRecentSelectedNode = tn;
+			}
+			else
+			{
+				// Only unselect node if it was selected
+				if(IsNodeSelected(tn))
+				{
+					OnBeforeDeselect(tn);
+
+					Color[] originalColors = (Color[])this.htblSelectedNodesOrigColors[tn.GetHashCode()];
+					if(originalColors != null)
+					{
+						htblSelectedNodes.Remove(tn.GetHashCode());
+						blnSelectionChanged = true;
+						htblSelectedNodesOrigColors.Remove(tn.GetHashCode());
+
+						// GKM - Restore original node colors
+						tn.BackColor = originalColors[0]; // GKM - was BackColor;
+						tn.ForeColor = originalColors[1]; // GKM - was ForeColor;
+					}
+
+					OnAfterDeselect(tn);
+				}
+			}
+
+			return blnSelected;
+		}
+
+		/// <summary>
+		/// Selects nodes within the specified range.
+		/// </summary>
+		/// <param name="startNode">Start node.</param>
+		/// <param name="endNode">End Node.</param>
+		/// <param name="tva">Specifies the action that caused the selection change.</param>
+		private void SelectNodesInsideRange(TreeNode startNode, TreeNode endNode, TreeViewAction tva)
+		{
+			// Calculate start node and end node
+			TreeNode firstNode, lastNode;
+			if(startNode.Bounds.Y < endNode.Bounds.Y)
+			{
+				firstNode = startNode;
+				lastNode = endNode;
+			}
+			else
+			{
+				firstNode = endNode;
+				lastNode = startNode;
+			}
+
+			// Select each node in range
+			SelectNode(firstNode, true, tva);
+			TreeNode tnTemp = firstNode;
+			while(tnTemp != lastNode)
+			{
+				tnTemp = tnTemp.NextVisibleNode;
+				if(tnTemp != null)
+				{
+					SelectNode(tnTemp, true, tva);
+				}
+			}
+			SelectNode(lastNode, true, tva);
+		}
+
+		/// <summary>
+		/// Unselects nodes outside the specified range.
+		/// </summary>
+		/// <param name="startNode">Start node.</param>
+		/// <param name="endNode">End node.</param>
+		/// <param name="tva">Specifies the action that caused the selection change.</param>
+		private void UnselectNodesOutsideRange(TreeNode startNode, TreeNode endNode, TreeViewAction tva)
+		{
+			// Calculate start node and end node
+			TreeNode firstNode, lastNode;
+			if(startNode.Bounds.Y < endNode.Bounds.Y)
+			{
+				firstNode = startNode;
+				lastNode = endNode;
+			}
+			else
+			{
+				firstNode = endNode;
+				lastNode = startNode;
+			}
+
+			// Unselect each node outside range
+			TreeNode tnTemp = firstNode;
+			while(tnTemp != null)
+			{
+				tnTemp = tnTemp.PrevVisibleNode;
+				if(tnTemp != null)
+				{
+					SelectNode(tnTemp, false, tva);
+				}
+			}
+
+			tnTemp = lastNode;
+			while(tnTemp != null)
+			{
+				tnTemp = tnTemp.NextVisibleNode;
+				if(tnTemp != null)
+				{
+					SelectNode(tnTemp, false, tva);
+				}
+			}
+		}
+
+		/// <summary>
+		/// Recursively unselect node.
+		/// </summary>
+		/// <param name="tn">Node to recursively unselect.</param>
+		/// <param name="tva">Specifies the action that caused the selection change.</param>
+		private void UnselectNodesRecursively(TreeNode tn, TreeViewAction tva)
+		{
+			SelectNode(tn, false, tva);
+			foreach(TreeNode child in tn.Nodes)
+			{
+				UnselectNodesRecursively(child, tva);
+			}
+		}
+
+		#endregion
+
+		#region Helper methods
+
+		/// <summary>
+		/// Determines whether a mouse click was inside the node bounds or outside the node bounds..
+		/// </summary>
+		/// <param name="tn">TreeNode to check.</param>
+		/// <param name="e">MouseEventArgs.</param>
+		/// <returns>True is mouse was clicked inside the node bounds, false if it was clicked ouside the node bounds.</returns>
+		private static bool IsClickOnNode(TreeNode tn, MouseEventArgs e)
+		{
+			if(tn == null) return false;
+
+			// GKM
+			// Determine the rightmost position we'll process clicks (so that the click has to be on the node's bounds, 
+			// like the .NET treeview
+			int rightMostX = tn.Bounds.X + tn.Bounds.Width;
+			return (tn != null && e.X < rightMostX); // GKM
+		}
+
+		/// <summary>
+		/// Gets level of specified node.
+		/// </summary>
+		/// <param name="node">Node.</param>
+		/// <returns>Level of node.</returns>
+		public int GetNodeLevel(TreeNode node)
+		{
+			int level = 0;
+			while((node = node.Parent) != null)
+				level++;
+			return level;
+		}
+
+		/// <summary>
+		/// Determines whether the specified node is a child (indirect or direct) of the specified parent.
+		/// </summary>
+		/// <param name="child">Node to check.</param>
+		/// <param name="parent">Parent node.</param>
+		/// <returns>True if specified node is a direct or indirect child of parent node, false if not.</returns>
+		private static bool IsChildOf(TreeNode child, TreeNode parent)
+		{
+			bool blnChild = false;
+
+			TreeNode tnTemp = child;
+			while(tnTemp != null)
+			{
+				if(tnTemp == parent)
+				{
+					blnChild = true;
+					break;
+				}
+				else
+				{
+					tnTemp = tnTemp.Parent;
+				}
+			}
+
+			return blnChild;
+		}
+
+		/// <summary>
+		/// Gets root parent of specified node.
+		/// </summary>
+		/// <param name="child">Node.</param>
+		/// <returns>Root parent of specified node.</returns>
+		public TreeNode GetRootParent(TreeNode child)
+		{
+			TreeNode tnParent = child;
+
+			while(tnParent.Parent != null)
+			{
+				tnParent = tnParent.Parent;
+			}
+
+			return tnParent;
+		}
+
+		/// <summary>
+		/// Gets number of visible nodes.
+		/// </summary>
+		/// <returns>Number of visible nodes.</returns>
+		private int GetNumberOfVisibleNodes()
+		{
+			int intCounter = 0;
+
+			TreeNode tnTemp = this.Nodes[0];
+
+			while(tnTemp != null)
+			{
+				if(tnTemp.IsVisible)
+				{
+					intCounter++;
+				}
+
+				tnTemp = tnTemp.NextVisibleNode;
+			}
+
+			return intCounter;
+		}
+
+		/// <summary>
+		/// Gets last visible node.
+		/// </summary>
+		/// <returns>Last visible node.</returns>
+		private TreeNode GetLastVisibleNode()
+		{
+			TreeNode tnTemp = this.Nodes[0];
+
+			while(tnTemp.NextVisibleNode != null)
+			{
+				tnTemp = tnTemp.NextVisibleNode;
+			}
+
+			return tnTemp;
+		}
+
+		/// <summary>
+		/// Gets next tree node(s), starting from the specified node and direction.
+		/// </summary>
+		/// <param name="start">Node to start from.</param>
+		/// <param name="down">True to go down, false to go up.</param>
+		/// <param name="intNumber">Number of nodes to go down or up.</param>
+		/// <returns>Next node.</returns>
+		private static TreeNode GetNextTreeNode(TreeNode start, bool down, int intNumber)
+		{
+			int intCounter = 0;
+			TreeNode tnTemp = start;
+			while(intCounter < intNumber)
+			{
+				if(down)
+				{
+					if(tnTemp.NextVisibleNode != null)
+						tnTemp = tnTemp.NextVisibleNode;
+					else
+						break;
+				}
+				else
+				{
+					if(tnTemp.PrevVisibleNode != null)
+						tnTemp = tnTemp.PrevVisibleNode;
+					else
+						break;
+				}
+
+				intCounter++;
+			}
+
+			return tnTemp;
+		}
+
+		/// <summary>
+		/// makes focus rectangle visible or hides it.
+		/// </summary>
+		/// <param name="tn">Node to make focus rectangle (in)visible for.</param>
+		/// <param name="visible">True to make focus rectangle visible, false to hide it.</param>
+		private void SetFocusToNode(TreeNode tn, bool visible)
+		{
+			Graphics g = this.CreateGraphics();
+			Rectangle rect = new Rectangle(tn.Bounds.X, tn.Bounds.Y, tn.Bounds.Width, tn.Bounds.Height);
+			if(visible)
+			{
+				this.Invalidate(rect, false);
+				Update();
+				if(tn.BackColor != SelectionBackColor)
+				{
+					using(Pen p = new Pen(SelectionBackColor, 1)) g.DrawRectangle(p, rect);
+				}
+			}
+			else
+			{
+				if(tn.BackColor != SelectionBackColor)
+				{
+					using (Pen p = new Pen(BackColor, 1))
+					{
+						g.DrawRectangle(p, tnMostRecentSelectedNode.Bounds.X, tnMostRecentSelectedNode.Bounds.Y, tnMostRecentSelectedNode.Bounds.Width, tnMostRecentSelectedNode.Bounds.Height);
+					}
+				}
+				this.Invalidate(rect, false);
+				Update();
+			}
+		}
+
+		#endregion
+
+		#region Dispose
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing)
+			{
+				if(components != null)
+				{
+					components.Dispose();
+				}
+			}
+			base.Dispose(disposing);
+		}
+
+		#endregion
+
+		#region Component Designer generated code
+
+		/// <summary> 
+		/// Required method for Designer support - do not modify 
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			components = new System.ComponentModel.Container();
+			DoubleBuffered = true; //mxd
+			SetStyle(ControlStyles.OptimizedDoubleBuffer, true); //mxd
+		}
+
+		#endregion
+
+		#region OnMouseUp, OnMouseDown
+
+		/// <summary>
+		/// Occurs when mouse button is up after a click.
+		/// </summary>
+		/// <param name="e"></param>
+		protected override void OnMouseUp(MouseEventArgs e)
+		{
+#if DEBUG
+			try
+			{
+#endif
+				if(!this.blnNodeProcessedOnMouseDown)
+				{
+					TreeNode tn = this.GetNodeAt(e.X, e.Y);
+
+					// Mouse click has not been handled by the mouse down event, so do it here. This is the case when
+					// a selected node was clicked again; in that case we handle that click here because in case the
+					// user is dragging the node, we should not put it in edit mode.					
+
+					if(IsClickOnNode(tn, e))
+					{
+						this.ProcessNodeRange(this.tnMostRecentSelectedNode, tn, e, Control.ModifierKeys, TreeViewAction.ByMouse, true);
+					}
+				}
+
+				this.blnNodeProcessedOnMouseDown = false;
+
+				base.OnMouseUp(e);
+#if DEBUG
+			}
+			catch (Exception ex)
+			{
+				// GKM - Untrapped exceptions were killing me for debugging purposes.
+				// It probably shouldn't be here permanently, but it was causing real trouble for me.
+				MessageBox.Show(this, ex.ToString());
+			}
+#endif
+		}
+
+		private bool IsPlusMinusClicked(TreeNode tn, MouseEventArgs e)
+		{
+			int intNodeLevel = GetNodeLevel(tn);
+			bool blnPlusMinusClicked = e.X < 20 + (intNodeLevel * 20);
+
+			return blnPlusMinusClicked;
+		}
+
+		/// <summary>
+		/// Occurs when mouse is down.
+		/// </summary>
+		/// <param name="e"></param>
+		protected override void OnMouseDown(MouseEventArgs e)
+		{
+			tnKeysStartNode = null;
+
+			// Store number of mouse clicks in OnMouseDown event, because here we also get e.Clicks = 2 when an item was doubleclicked
+			// in OnMouseUp we seem to get always e.Clicks = 1, also when item is doubleclicked
+			intMouseClicks = e.Clicks;
+
+			TreeNode tn = this.GetNodeAt(e.X, e.Y);
+
+			if(tn == null) return;
+
+			// Preserve colors here, because if you do it later then it will already have selected colors 
+			// Don't know why...!
+			PreserveNodeColors(tn);
+
+			// If +/- was clicked, we should not process the node.
+			if(!IsPlusMinusClicked(tn, e))
+			{
+				// If mouse down on a node that is already selected, then we should process this node in the mouse up event, because we
+				// might want to drag it and it should not be put in edit mode.
+				// Also, only process node if click was in node's bounds.
+				if((tn != null) && (IsClickOnNode(tn, e)) && (!IsNodeSelected(tn)))
+				{
+					// Flash node. In case the node selection is cancelled by the user, this gives the effect that it
+					// was selected and unselected again.
+					tnToFlash = tn;
+					System.Threading.Thread t = new System.Threading.Thread(new System.Threading.ThreadStart(FlashNode));
+					t.Start();
+
+					blnNodeProcessedOnMouseDown = true;
+
+					ProcessNodeRange(tnMostRecentSelectedNode, tn, e, Control.ModifierKeys, TreeViewAction.ByMouse, true);
+				}
+			}
+
+			base.OnMouseDown(e);
+		}
+
+		#endregion
+
+		#region FlashNode, StartEdit
+
+		/// <summary>
+		/// Flashes node.
+		/// </summary>
+		private void FlashNode()
+		{
+			if(this.InvokeRequired)
+			{
+				this.Invoke(new MethodInvoker(FlashNode));
+				return;
+			}
+
+			TreeNode tn = tnToFlash;
+			// Only flash node is it's not yet selected
+			if(!IsNodeSelected(tn))
+			{
+				tn.BackColor = SelectionBackColor;
+				tn.ForeColor = this.BackColor;
+				this.Invalidate();
+				this.Refresh();
+				Application.DoEvents();
+				System.Threading.Thread.Sleep(200);
+			}
+
+			// If node is not selected yet, restore default colors to end flashing
+			if(!IsNodeSelected(tn))
+			{
+				tn.BackColor = BackColor;
+				tn.ForeColor = this.ForeColor;
+			}
+		}
+
+		/// <summary>
+		/// Starts edit on a node.
+		/// </summary>
+		private void StartEdit()
+		{
+			System.Threading.Thread.Sleep(200);
+			if(!blnWasDoubleClick)
+			{
+				blnInternalCall = true;
+				SelectedNode = tnNodeToStartEditOn;
+				blnInternalCall = false;
+				tnNodeToStartEditOn.BeginEdit();
+			}
+			else
+			{
+				blnWasDoubleClick = false;
+			}
+		}
+
+		#endregion
+
+		#region ProcessNodeRange
+
+		/// <summary>
+		/// Processes a node range.
+		/// </summary>
+		/// <param name="startNode">Start node of range.</param>
+		/// <param name="endNode">End node of range.</param>
+		/// <param name="e">MouseEventArgs.</param>
+		/// <param name="keys">Keys.</param>
+		/// <param name="tva">TreeViewAction.</param>
+		/// <param name="allowStartEdit">True if node can go to edit mode, false if not.</param>
+		private void ProcessNodeRange(TreeNode startNode, TreeNode endNode, MouseEventArgs e, Keys keys, TreeViewAction tva, bool allowStartEdit)
+		{
+			blnSelectionChanged = false; // prepare for OnSelectionsChanged
+
+			if(e.Button == MouseButtons.Left)
+			{
+				blnWasDoubleClick = (intMouseClicks == 2);
+
+				TreeNode tnTemp;
+				int intNodeLevelStart;
+
+				if(((keys & Keys.Control) == 0) && ((keys & Keys.Shift) == 0))
+				{
+					// CTRL and SHIFT not held down							
+					tnSelectionMirrorPoint = endNode;
+					int intNumberOfSelectedNodes = SelectedNodes.Count;
+
+					// If it was a double click, select node and suspend further processing					
+					if(blnWasDoubleClick)
+					{
+						base.OnMouseDown(e);
+						return;
+					}
+
+					if(!IsPlusMinusClicked(endNode, e))
+					{
+						bool blnNodeWasSelected = IsNodeSelected(endNode);
+
+						UnselectAllNodesExceptNode(endNode, tva);
+						SelectNode(endNode, true, tva);
+
+
+						if((blnNodeWasSelected) && (LabelEdit) && (allowStartEdit) && (!blnWasDoubleClick) && (intNumberOfSelectedNodes <= 1))
+						{
+							// Node should be put in edit mode					
+							tnNodeToStartEditOn = endNode;
+							System.Threading.Thread t = new System.Threading.Thread(new System.Threading.ThreadStart(StartEdit));
+							t.Start();
+						}
+					}
+				}
+				else if(((keys & Keys.Control) != 0) && ((keys & Keys.Shift) == 0))
+				{
+					// CTRL held down
+					tnSelectionMirrorPoint = null;
+
+					if(!IsNodeSelected(endNode))
+					{
+						switch(selectionMode)
+						{
+							case TreeViewSelectionMode.SingleSelect:
+								UnselectAllNodesExceptNode(endNode, tva);
+								break;
+
+							case TreeViewSelectionMode.MultiSelectSameRootBranch:
+								TreeNode tnAbsoluteParent2 = GetRootParent(endNode);
+								UnselectAllNodesNotBelongingToParent(tnAbsoluteParent2, tva);
+								break;
+
+							case TreeViewSelectionMode.MultiSelectSameLevel:
+								UnselectAllNodesNotBelongingToLevel(GetNodeLevel(endNode), tva);
+								break;
+
+							case TreeViewSelectionMode.MultiSelectSameLevelAndRootBranch:
+								TreeNode tnAbsoluteParent = GetRootParent(endNode);
+								UnselectAllNodesNotBelongingToParent(tnAbsoluteParent, tva);
+								UnselectAllNodesNotBelongingToLevel(GetNodeLevel(endNode), tva);
+								break;
+
+							case TreeViewSelectionMode.MultiSelectSameParent:
+								TreeNode tnParent = endNode.Parent;
+								UnselectAllNodesNotBelongingDirectlyToParent(tnParent, tva);
+								break;
+						}
+
+						SelectNode(endNode, true, tva);
+					}
+					else
+					{
+						SelectNode(endNode, false, tva);
+					}
+				}
+				else if(((keys & Keys.Control) == 0) && ((keys & Keys.Shift) != 0))
+				{
+					// SHIFT pressed
+					if(tnSelectionMirrorPoint == null)
+					{
+						tnSelectionMirrorPoint = startNode;
+					}
+
+					switch(selectionMode)
+					{
+						case TreeViewSelectionMode.SingleSelect:
+							UnselectAllNodesExceptNode(endNode, tva);
+							SelectNode(endNode, true, tva);
+							break;
+
+						case TreeViewSelectionMode.MultiSelectSameRootBranch:
+							TreeNode tnAbsoluteParentStartNode = GetRootParent(startNode);
+							tnTemp = startNode;
+							// Check each visible node from startNode to endNode and select it if needed
+							while((tnTemp != null) && (tnTemp != endNode))
+							{
+								if(startNode.Bounds.Y > endNode.Bounds.Y)
+									tnTemp = tnTemp.PrevVisibleNode;
+								else
+									tnTemp = tnTemp.NextVisibleNode;
+								if(tnTemp != null)
+								{
+									TreeNode tnAbsoluteParent = GetRootParent(tnTemp);
+									if(tnAbsoluteParent == tnAbsoluteParentStartNode)
+									{
+										SelectNode(tnTemp, true, tva);
+									}
+								}
+							}
+							UnselectAllNodesNotBelongingToParent(tnAbsoluteParentStartNode, tva);
+							UnselectNodesOutsideRange(tnSelectionMirrorPoint, endNode, tva);
+							break;
+
+						case TreeViewSelectionMode.MultiSelectSameLevel:
+							intNodeLevelStart = GetNodeLevel(startNode);
+							tnTemp = startNode;
+							// Check each visible node from startNode to endNode and select it if needed
+							while((tnTemp != null) && (tnTemp != endNode))
+							{
+								if(startNode.Bounds.Y > endNode.Bounds.Y)
+									tnTemp = tnTemp.PrevVisibleNode;
+								else
+									tnTemp = tnTemp.NextVisibleNode;
+								if(tnTemp != null)
+								{
+									int intNodeLevel = GetNodeLevel(tnTemp);
+									if(intNodeLevel == intNodeLevelStart)
+									{
+										SelectNode(tnTemp, true, tva);
+									}
+								}
+							}
+							UnselectAllNodesNotBelongingToLevel(intNodeLevelStart, tva);
+							UnselectNodesOutsideRange(tnSelectionMirrorPoint, endNode, tva);
+							break;
+
+						case TreeViewSelectionMode.MultiSelectSameLevelAndRootBranch:
+							TreeNode tnAbsoluteParentStart = GetRootParent(startNode);
+							intNodeLevelStart = GetNodeLevel(startNode);
+							tnTemp = startNode;
+							// Check each visible node from startNode to endNode and select it if needed
+							while((tnTemp != null) && (tnTemp != endNode))
+							{
+								if(startNode.Bounds.Y > endNode.Bounds.Y)
+									tnTemp = tnTemp.PrevVisibleNode;
+								else
+									tnTemp = tnTemp.NextVisibleNode;
+								if(tnTemp != null)
+								{
+									int intNodeLevel = GetNodeLevel(tnTemp);
+									TreeNode tnAbsoluteParent = GetRootParent(tnTemp);
+									if((intNodeLevel == intNodeLevelStart) && (tnAbsoluteParent == tnAbsoluteParentStart))
+									{
+										SelectNode(tnTemp, true, tva);
+									}
+								}
+							}
+							UnselectAllNodesNotBelongingToParent(tnAbsoluteParentStart, tva);
+							UnselectAllNodesNotBelongingToLevel(intNodeLevelStart, tva);
+							UnselectNodesOutsideRange(tnSelectionMirrorPoint, endNode, tva);
+							break;
+
+						case TreeViewSelectionMode.MultiSelect:
+							SelectNodesInsideRange(tnSelectionMirrorPoint, endNode, tva);
+							UnselectNodesOutsideRange(tnSelectionMirrorPoint, endNode, tva);
+							break;
+
+						case TreeViewSelectionMode.MultiSelectSameParent:
+							TreeNode tnParentStartNode = startNode.Parent;
+							tnTemp = startNode;
+							// Check each visible node from startNode to endNode and select it if needed
+							while((tnTemp != null) && (tnTemp != endNode))
+							{
+								if(startNode.Bounds.Y > endNode.Bounds.Y)
+									tnTemp = tnTemp.PrevVisibleNode;
+								else
+									tnTemp = tnTemp.NextVisibleNode;
+								if(tnTemp != null)
+								{
+									TreeNode tnParent = tnTemp.Parent;
+									if(tnParent == tnParentStartNode)
+									{
+										SelectNode(tnTemp, true, tva);
+									}
+								}
+							}
+							UnselectAllNodesNotBelongingDirectlyToParent(tnParentStartNode, tva);
+							UnselectNodesOutsideRange(tnSelectionMirrorPoint, endNode, tva);
+							break;
+					}
+				}
+				else if(((keys & Keys.Control) != 0) && ((keys & Keys.Shift) != 0))
+				{
+					// SHIFT AND CTRL pressed
+					switch(selectionMode)
+					{
+						case TreeViewSelectionMode.SingleSelect:
+							UnselectAllNodesExceptNode(endNode, tva);
+							SelectNode(endNode, true, tva);
+							break;
+
+						case TreeViewSelectionMode.MultiSelectSameRootBranch:
+							TreeNode tnAbsoluteParentStartNode = GetRootParent(startNode);
+							tnTemp = startNode;
+							// Check each visible node from startNode to endNode and select it if needed
+							while((tnTemp != null) && (tnTemp != endNode))
+							{
+								if(startNode.Bounds.Y > endNode.Bounds.Y)
+									tnTemp = tnTemp.PrevVisibleNode;
+								else
+									tnTemp = tnTemp.NextVisibleNode;
+								if(tnTemp != null)
+								{
+									TreeNode tnAbsoluteParent = GetRootParent(tnTemp);
+									if(tnAbsoluteParent == tnAbsoluteParentStartNode)
+									{
+										SelectNode(tnTemp, true, tva);
+									}
+								}
+							}
+							UnselectAllNodesNotBelongingToParent(tnAbsoluteParentStartNode, tva);
+							break;
+
+						case TreeViewSelectionMode.MultiSelectSameLevel:
+							intNodeLevelStart = GetNodeLevel(startNode);
+							tnTemp = startNode;
+							// Check each visible node from startNode to endNode and select it if needed
+							while((tnTemp != null) && (tnTemp != endNode))
+							{
+								if(startNode.Bounds.Y > endNode.Bounds.Y)
+									tnTemp = tnTemp.PrevVisibleNode;
+								else
+									tnTemp = tnTemp.NextVisibleNode;
+								if(tnTemp != null)
+								{
+									int intNodeLevel = GetNodeLevel(tnTemp);
+									if(intNodeLevel == intNodeLevelStart)
+									{
+										SelectNode(tnTemp, true, tva);
+									}
+								}
+							}
+							UnselectAllNodesNotBelongingToLevel(intNodeLevelStart, tva);
+							break;
+
+						case TreeViewSelectionMode.MultiSelectSameLevelAndRootBranch:
+							TreeNode tnAbsoluteParentStart = GetRootParent(startNode);
+							intNodeLevelStart = GetNodeLevel(startNode);
+							tnTemp = startNode;
+							// Check each visible node from startNode to endNode and select it if needed
+							while((tnTemp != null) && (tnTemp != endNode))
+							{
+								if(startNode.Bounds.Y > endNode.Bounds.Y)
+									tnTemp = tnTemp.PrevVisibleNode;
+								else
+									tnTemp = tnTemp.NextVisibleNode;
+								if(tnTemp != null)
+								{
+									int intNodeLevel = GetNodeLevel(tnTemp);
+									TreeNode tnAbsoluteParent = GetRootParent(tnTemp);
+									if((intNodeLevel == intNodeLevelStart) && (tnAbsoluteParent == tnAbsoluteParentStart))
+									{
+										SelectNode(tnTemp, true, tva);
+									}
+								}
+							}
+							UnselectAllNodesNotBelongingToParent(tnAbsoluteParentStart, tva);
+							UnselectAllNodesNotBelongingToLevel(intNodeLevelStart, tva);
+							break;
+
+						case TreeViewSelectionMode.MultiSelect:
+							tnTemp = startNode;
+							// Check each visible node from startNode to endNode and select it if needed
+							while((tnTemp != null) && (tnTemp != endNode))
+							{
+								if(startNode.Bounds.Y > endNode.Bounds.Y)
+									tnTemp = tnTemp.PrevVisibleNode;
+								else
+									tnTemp = tnTemp.NextVisibleNode;
+								if(tnTemp != null)
+								{
+									SelectNode(tnTemp, true, tva);
+								}
+							}
+							break;
+
+						case TreeViewSelectionMode.MultiSelectSameParent:
+							TreeNode tnParentStartNode = startNode.Parent;
+							tnTemp = startNode;
+							// Check each visible node from startNode to endNode and select it if needed
+							while((tnTemp != null) && (tnTemp != endNode))
+							{
+								if(startNode.Bounds.Y > endNode.Bounds.Y)
+									tnTemp = tnTemp.PrevVisibleNode;
+								else
+									tnTemp = tnTemp.NextVisibleNode;
+								if(tnTemp != null)
+								{
+									TreeNode tnParent = tnTemp.Parent;
+									if(tnParent == tnParentStartNode)
+									{
+										SelectNode(tnTemp, true, tva);
+									}
+								}
+							}
+							UnselectAllNodesNotBelongingDirectlyToParent(tnParentStartNode, tva);
+							break;
+					}
+				}
+			}
+			else if(e.Button == MouseButtons.Right)
+			{
+				// if right mouse button clicked, clear selection and select right-clicked node
+				if(!IsNodeSelected(endNode))
+				{
+					UnselectAllNodes(tva);
+					SelectNode(endNode, true, tva);
+				}
+			}
+			OnSelectionsChanged();
+		}
+
+		#endregion
+
+		#region OnBeforeLabelEdit
+
+		/// <summary>
+		/// Occurs before node goes into edit mode.
+		/// </summary>
+		/// <param name="e"></param>
+		protected override void OnBeforeLabelEdit(NodeLabelEditEventArgs e)
+		{
+			blnSelectionChanged = false; // prepare for OnSelectionsChanged
+
+			// Make sure that it's the only selected node
+			SelectNode(e.Node, true, TreeViewAction.ByMouse);
+			UnselectAllNodesExceptNode(e.Node, TreeViewAction.ByMouse);
+
+			OnSelectionsChanged();
+
+			base.OnBeforeLabelEdit(e);
+		}
+
+		#endregion
+
+		#region OnKeyDown
+
+		/// <summary>
+		/// occurs when a key is down.
+		/// </summary>
+		/// <param name="e"></param>
+		protected override void OnKeyDown(KeyEventArgs e)
+		{
+			Keys kMod = Keys.None;
+			switch(e.Modifiers)
+			{
+				case Keys.Shift:
+				case Keys.Control:
+				case Keys.Control | Keys.Shift:
+					kMod = Keys.Shift;
+					if(tnKeysStartNode == null)
+						tnKeysStartNode = tnMostRecentSelectedNode;
+					break;
+				default:
+					tnKeysStartNode = null;
+					break;
+			}
+
+			int intNumber = 0;
+
+			TreeNode tnNewlySelectedNodeWithKeys = null;
+			switch(e.KeyCode)
+			{
+				case Keys.Down:
+					tnNewlySelectedNodeWithKeys = tnMostRecentSelectedNode.NextVisibleNode;
+					break;
+
+				case Keys.Up:
+					tnNewlySelectedNodeWithKeys = tnMostRecentSelectedNode.PrevVisibleNode;
+					break;
+
+				case Keys.Left:
+					if(tnMostRecentSelectedNode.IsExpanded) 
+						tnMostRecentSelectedNode.Collapse(); 
+					else
+						tnNewlySelectedNodeWithKeys = tnMostRecentSelectedNode.Parent; 
+					break;
+
+				case Keys.Right:
+					if(!tnMostRecentSelectedNode.IsExpanded) 
+						tnMostRecentSelectedNode.Expand(); 
+					else 
+						if(tnMostRecentSelectedNode.Nodes != null) 
+							tnNewlySelectedNodeWithKeys = tnMostRecentSelectedNode.Nodes[0];
+					break;
+
+				case Keys.Home:
+					tnNewlySelectedNodeWithKeys = this.Nodes[0];
+					break;
+
+				case Keys.End:
+					tnNewlySelectedNodeWithKeys = GetLastVisibleNode();
+					break;
+
+				case Keys.PageDown:
+
+					intNumber = GetNumberOfVisibleNodes();
+					tnNewlySelectedNodeWithKeys = GetNextTreeNode(tnMostRecentSelectedNode, true, intNumber);
+					break;
+
+				case Keys.PageUp:
+
+					intNumber = GetNumberOfVisibleNodes();
+					tnNewlySelectedNodeWithKeys = GetNextTreeNode(tnMostRecentSelectedNode, false, intNumber);
+					break;
+
+				default:
+					base.OnKeyDown(e); // GKM
+					return;
+			}
+
+			if((tnNewlySelectedNodeWithKeys != null))
+			{
+				SetFocusToNode(tnMostRecentSelectedNode, false);
+				ProcessNodeRange(tnKeysStartNode, tnNewlySelectedNodeWithKeys, new MouseEventArgs(MouseButtons.Left, 1, Cursor.Position.X, Cursor.Position.Y, 0), kMod, TreeViewAction.ByKeyboard, false);
+				tnMostRecentSelectedNode = tnNewlySelectedNodeWithKeys;
+				SetFocusToNode(tnMostRecentSelectedNode, true);
+			}
+
+			// Ensure visibility
+			if(tnMostRecentSelectedNode != null)
+			{
+				TreeNode tnToMakeVisible = null;
+				switch(e.KeyCode)
+				{
+					case Keys.Down:
+					case Keys.Right:
+						tnToMakeVisible = GetNextTreeNode(tnMostRecentSelectedNode, true, 5);
+						break;
+
+					case Keys.Up:
+					case Keys.Left:
+						tnToMakeVisible = GetNextTreeNode(tnMostRecentSelectedNode, false, 5);
+						break;
+
+					case Keys.Home:
+					case Keys.End:
+						tnToMakeVisible = tnMostRecentSelectedNode;
+						break;
+
+					case Keys.PageDown:
+						tnToMakeVisible = GetNextTreeNode(tnMostRecentSelectedNode, true, intNumber - 2);
+						break;
+
+					case Keys.PageUp:
+						tnToMakeVisible = GetNextTreeNode(tnMostRecentSelectedNode, false, intNumber - 2);
+						break;
+				}
+
+				if(tnToMakeVisible != null)
+					tnToMakeVisible.EnsureVisible();
+			}
+
+			base.OnKeyDown(e);
+		}
+
+		#endregion
+
+		#region OnAfterCollapse
+
+		/// <summary>
+		/// Occurs after a node is collapsed.
+		/// </summary>
+		/// <param name="e"></param>
+		protected override void OnAfterCollapse(TreeViewEventArgs e)
+		{
+			blnSelectionChanged = false;
+
+			// All child nodes should be deselected
+			bool blnChildSelected = false;
+			foreach(TreeNode tn in e.Node.Nodes)
+			{
+				if(IsNodeSelected(tn))
+				{
+					blnChildSelected = true;
+				}
+				UnselectNodesRecursively(tn, TreeViewAction.Collapse);
+			}
+
+			if(blnChildSelected)
+			{
+				SelectNode(e.Node, true, TreeViewAction.Collapse);
+			}
+
+			OnSelectionsChanged();
+
+			base.OnAfterCollapse(e);
+		}
+
+		#endregion
+
+		#region OnItemDrag
+
+		/// <summary>
+		/// Occurs when an item is being dragged.
+		/// </summary>
+		/// <param name="e"></param>
+		protected override void OnItemDrag(ItemDragEventArgs e)
+		{
+			e = new ItemDragEventArgs(MouseButtons.Left, this.SelectedNodes);
+			base.OnItemDrag(e);
+		}
+
+		#endregion
+
+	}
+
+	#region SelectedNodesCollection
+
+	/// <summary>
+	/// Collection of selected nodes.
+	/// </summary>
+	public class NodesCollection : CollectionBase
+	{
+		#region Events
+
+		/// <summary>
+		/// Event fired when a tree node has been added to the collection.
+		/// </summary>
+		internal event TreeNodeEventHandler TreeNodeAdded;
+
+		/// <summary>
+		/// Event fired when a tree node has been removed to the collection.
+		/// </summary>
+		internal event TreeNodeEventHandler TreeNodeRemoved;
+
+		/// <summary>
+		/// Event fired when a tree node has been inserted to the collection.
+		/// </summary>
+		internal event TreeNodeEventHandler TreeNodeInserted;
+
+		/// <summary>
+		/// Event fired the collection has been cleared.
+		/// </summary>
+		internal event EventHandler SelectedNodesCleared;
+
+		#endregion
+
+		#region CollectionBase members
+
+		/// <summary>
+		/// Gets tree node at specified index.
+		/// </summary>
+		public TreeNode this[int index]
+		{
+			get { return ((TreeNode)List[index]); }
+		}
+
+		/// <summary>
+		/// Adds a tree node to the collection.
+		/// </summary>
+		/// <param name="treeNode">Tree node to add.</param>
+		/// <returns>The position into which the new element was inserted.</returns>
+		public int Add(TreeNode treeNode)
+		{
+			if(TreeNodeAdded != null)
+				TreeNodeAdded(treeNode);
+
+			return List.Add(treeNode);
+		}
+
+		/// <summary>
+		/// Inserts a tree node at specified index.
+		/// </summary>
+		/// <param name="index">The position into which the new element has to be inserted.</param>
+		/// <param name="treeNode">Tree node to insert.</param>
+		public void Insert(int index, TreeNode treeNode)
+		{
+			if(TreeNodeInserted != null)
+				TreeNodeInserted(treeNode);
+
+			List.Add(treeNode);
+		}
+
+		/// <summary>
+		/// Removed a tree node from the collection.
+		/// </summary>
+		/// <param name="treeNode">Tree node to remove.</param>
+		public void Remove(TreeNode treeNode)
+		{
+			if(TreeNodeRemoved != null)
+				TreeNodeRemoved(treeNode);
+
+			List.Remove(treeNode);
+		}
+
+		/// <summary>
+		/// Determines whether treenode belongs to the collection.
+		/// </summary>
+		/// <param name="treeNode">Tree node to check.</param>
+		/// <returns>True if tree node belongs to the collection, false if not.</returns>
+		public bool Contains(TreeNode treeNode)
+		{
+			return List.Contains(treeNode);
+		}
+
+		/// <summary>
+		/// Gets index of tree node in the collection.
+		/// </summary>
+		/// <param name="treeNode">Tree node to get index of.</param>
+		/// <returns>Index of tree node in the collection.</returns>
+		public int IndexOf(TreeNode treeNode)
+		{
+			return List.IndexOf(treeNode);
+		}
+
+		#endregion
+
+		#region OnClear
+
+		/// <summary>
+		/// Occurs when collection is being cleared.
+		/// </summary>
+		protected override void OnClear()
+		{
+			if(SelectedNodesCleared != null)
+				SelectedNodesCleared(this, EventArgs.Empty);
+
+			base.OnClear();
+		}
+
+		#endregion
+
+	}
+
+	#endregion
+}
diff --git a/Source/Core/GZBuilder/Controls/PairedFieldsControl.Designer.cs b/Source/Core/GZBuilder/Controls/PairedFieldsControl.Designer.cs
new file mode 100644
index 0000000..46427a6
--- /dev/null
+++ b/Source/Core/GZBuilder/Controls/PairedFieldsControl.Designer.cs
@@ -0,0 +1,111 @@
+namespace CodeImp.DoomBuilder.GZBuilder.Controls
+{
+	partial class PairedFieldsControl
+	{
+		/// <summary> 
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing) 
+		{
+			if(disposing && (components != null)) 
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Component Designer generated code
+
+		/// <summary> 
+		/// Required method for Designer support - do not modify 
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent() 
+		{
+			this.bReset = new System.Windows.Forms.Button();
+			this.bLink = new System.Windows.Forms.Button();
+			this.value1 = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.value2 = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.SuspendLayout();
+			// 
+			// bReset
+			// 
+			this.bReset.Image = global::CodeImp.DoomBuilder.Properties.Resources.Reset;
+			this.bReset.Location = new System.Drawing.Point(161, 1);
+			this.bReset.Name = "bReset";
+			this.bReset.Size = new System.Drawing.Size(23, 23);
+			this.bReset.TabIndex = 40;
+			this.bReset.UseVisualStyleBackColor = true;
+			this.bReset.Visible = false;
+			this.bReset.Click += new System.EventHandler(this.bReset_Click);
+			// 
+			// bLink
+			// 
+			this.bLink.Image = global::CodeImp.DoomBuilder.Properties.Resources.Link;
+			this.bLink.Location = new System.Drawing.Point(136, 1);
+			this.bLink.Name = "bLink";
+			this.bLink.Size = new System.Drawing.Size(23, 23);
+			this.bLink.TabIndex = 39;
+			this.bLink.UseVisualStyleBackColor = true;
+			this.bLink.Click += new System.EventHandler(this.bLink_Click);
+			// 
+			// value1
+			// 
+			this.value1.AllowDecimal = false;
+			this.value1.AllowNegative = true;
+			this.value1.AllowRelative = true;
+			this.value1.ButtonStep = 1;
+			this.value1.ButtonStepFloat = 1F;
+			this.value1.ButtonStepsWrapAround = false;
+			this.value1.Location = new System.Drawing.Point(3, 1);
+			this.value1.Name = "value1";
+			this.value1.Size = new System.Drawing.Size(62, 24);
+			this.value1.StepValues = null;
+			this.value1.TabIndex = 37;
+			this.value1.Tag = "offsetx_top";
+			this.value1.WhenTextChanged += new System.EventHandler(this.value1_WhenTextChanged);
+			// 
+			// value2
+			// 
+			this.value2.AllowDecimal = false;
+			this.value2.AllowNegative = true;
+			this.value2.AllowRelative = true;
+			this.value2.ButtonStep = 1;
+			this.value2.ButtonStepFloat = 1F;
+			this.value2.ButtonStepsWrapAround = false;
+			this.value2.Location = new System.Drawing.Point(71, 1);
+			this.value2.Name = "value2";
+			this.value2.Size = new System.Drawing.Size(62, 24);
+			this.value2.StepValues = null;
+			this.value2.TabIndex = 38;
+			this.value2.Tag = "offsety_top";
+			this.value2.WhenTextChanged += new System.EventHandler(this.value2_WhenTextChanged);
+			// 
+			// PairedFieldsControl
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.Controls.Add(this.bReset);
+			this.Controls.Add(this.bLink);
+			this.Controls.Add(this.value1);
+			this.Controls.Add(this.value2);
+			this.Name = "PairedFieldsControl";
+			this.Size = new System.Drawing.Size(186, 26);
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Button bLink;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox value1;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox value2;
+		private System.Windows.Forms.Button bReset;
+	}
+}
diff --git a/Source/Core/GZBuilder/Controls/PairedFieldsControl.cs b/Source/Core/GZBuilder/Controls/PairedFieldsControl.cs
new file mode 100644
index 0000000..c5babdc
--- /dev/null
+++ b/Source/Core/GZBuilder/Controls/PairedFieldsControl.cs
@@ -0,0 +1,180 @@
+#region ================== Namespaces
+
+using System;
+using System.Globalization;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Properties;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.GZBuilder.Controls
+{
+	public partial class PairedFieldsControl : UserControl
+	{
+		#region ================== Events
+
+		public event EventHandler OnValuesChanged;
+
+		#endregion
+
+		#region ================== Variables
+
+		private float defaultValue;
+		private string field1;
+		private string field2;
+		private bool allowValueLinking;
+		private bool linkValues;
+		private bool blockUpdate;
+		private readonly int bResetOffsetX;
+		private bool changed;
+
+		#endregion
+
+		#region ================== Properties
+
+		public bool NonDefaultValue { get { return changed; } }
+		public float DefaultValue { get { return defaultValue; } set { defaultValue = value; } }
+		public string Field1 { get { return field1; } set { field1 = value; } }
+		public string Field2 { get { return field2; } set { field2 = value; } }
+		public bool AllowDecimal { get { return value1.AllowDecimal; } set { value1.AllowDecimal = value; value2.AllowDecimal = value; } }
+		public int ButtonStep { get { return value1.ButtonStep; } set { value1.ButtonStep = value; value2.ButtonStep = value; } }
+		public float ButtonStepFloat { get { return value1.ButtonStepFloat; } set { value1.ButtonStepFloat = value; value2.ButtonStepFloat = value; } }
+		public float ButtonStepBig { get { return value1.ButtonStepBig; } set { value1.ButtonStepBig = value; value2.ButtonStepBig = value; } }
+		public float ButtonStepSmall { get { return value1.ButtonStepSmall; } set { value1.ButtonStepSmall = value; value2.ButtonStepSmall = value; } }
+		public bool ButtonStepsUseModifierKeys { get { return value1.ButtonStepsUseModifierKeys; } set { value1.ButtonStepsUseModifierKeys = value; value2.ButtonStepsUseModifierKeys = value; } }
+		public bool AllowValueLinking { get { return allowValueLinking; } set { allowValueLinking = value; UpdateButtons(); } }
+		public bool LinkValues { get { return linkValues; } set { linkValues = value; UpdateButtons(); } }
+
+		#endregion
+
+		#region ================== Constructor
+
+		public PairedFieldsControl() 
+		{
+			InitializeComponent();
+			bResetOffsetX = this.Width - bReset.Left;
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		public void SetValuesFrom(UniFields fields, bool first) 
+		{
+			blockUpdate = true;
+			
+			string newValue1;
+			string newValue2;
+
+			if(AllowDecimal) 
+			{
+				newValue1 = ((float)Math.Round(UniFields.GetFloat(fields, field1, defaultValue), 2)).ToString();
+				newValue2 = ((float)Math.Round(UniFields.GetFloat(fields, field2, defaultValue), 2)).ToString();
+			} 
+			else 
+			{
+				newValue1 = ((float)Math.Round(UniFields.GetFloat(fields, field1, defaultValue))).ToString();
+				newValue2 = ((float)Math.Round(UniFields.GetFloat(fields, field2, defaultValue))).ToString();
+			}
+
+			if(first) 
+			{
+				value1.Text = newValue1;
+				value2.Text = newValue2;
+			} 
+			else
+			{
+				if(!string.IsNullOrEmpty(value1.Text)) value1.Text = (value1.Text != newValue1 ? string.Empty : newValue1);
+				if(!string.IsNullOrEmpty(value2.Text)) value2.Text = (value2.Text != newValue2 ? string.Empty : newValue2);
+			}
+			CheckValues();
+
+			blockUpdate = false;
+		}
+
+		public void ApplyTo(UniFields fields, int min, int max, float oldValue1, float oldValue2) 
+		{
+			if(value1.Text != string.Empty)
+				UniFields.SetFloat(fields, field1, General.Clamp(value1.GetResultFloat(oldValue1), min, max), defaultValue);
+			else
+				UniFields.SetFloat(fields, field1, oldValue1, defaultValue);
+
+			if(value2.Text != string.Empty)
+				UniFields.SetFloat(fields, field2, General.Clamp(value2.GetResultFloat(oldValue2), min, max), defaultValue);
+			else
+				UniFields.SetFloat(fields, field2, oldValue2, defaultValue);
+		}
+
+		private void CheckValues() 
+		{
+			changed = string.IsNullOrEmpty(value1.Text) || string.IsNullOrEmpty(value2.Text)
+				|| value1.GetResultFloat(defaultValue, 0) != defaultValue || value2.GetResultFloat(defaultValue, 0) != defaultValue;
+			bReset.Visible = changed;
+
+			if(!blockUpdate && OnValuesChanged != null)	OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void UpdateButtons() 
+		{
+			bLink.Visible = allowValueLinking;
+			
+			if(!allowValueLinking) 
+			{
+				bReset.Left = bLink.Left;
+			} 
+			else 
+			{
+				bReset.Left = this.Width - bResetOffsetX;
+				bLink.Image = (linkValues ? Resources.Link : Resources.Unlink);
+			}
+		}
+
+		#endregion
+
+		#region ================== Events
+
+		private void bLink_Click(object sender, EventArgs e) 
+		{
+			linkValues = !linkValues;
+			bLink.Image = (linkValues ? Resources.Link : Resources.Unlink);
+		}
+
+		private void bReset_Click(object sender, EventArgs e) 
+		{
+			value1.Text = defaultValue.ToString(CultureInfo.CurrentCulture);
+			value2.Text = defaultValue.ToString(CultureInfo.CurrentCulture);
+			CheckValues();
+		}
+
+		private void value1_WhenTextChanged(object sender, EventArgs e) 
+		{
+			if(blockUpdate) return;
+			
+			if(linkValues) 
+			{
+				blockUpdate = true;
+				value2.Text = value1.Text;
+				blockUpdate = false;
+			}
+			
+			CheckValues();
+		}
+
+		private void value2_WhenTextChanged(object sender, EventArgs e) 
+		{
+			if(blockUpdate)	return;
+
+			if(linkValues) 
+			{
+				blockUpdate = true;
+				value1.Text = value2.Text;
+				blockUpdate = false;
+			}
+
+			CheckValues();
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/GZBuilder/Controls/PairedFieldsControl.resx b/Source/Core/GZBuilder/Controls/PairedFieldsControl.resx
new file mode 100644
index 0000000..19dc0dd
--- /dev/null
+++ b/Source/Core/GZBuilder/Controls/PairedFieldsControl.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/Source/Core/GZBuilder/Controls/PairedFloatControl.Designer.cs b/Source/Core/GZBuilder/Controls/PairedFloatControl.Designer.cs
new file mode 100644
index 0000000..f4d4ab7
--- /dev/null
+++ b/Source/Core/GZBuilder/Controls/PairedFloatControl.Designer.cs
@@ -0,0 +1,116 @@
+namespace CodeImp.DoomBuilder.GZBuilder.Controls
+{
+    partial class PairedFloatControl
+    {
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if(disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Component Designer generated code
+
+        /// <summary> 
+        /// Required method for Designer support - do not modify 
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+			this.value1 = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.value2 = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.bReset = new System.Windows.Forms.Button();
+			this.bLink = new System.Windows.Forms.Button();
+			this.SuspendLayout();
+			// 
+			// value1
+			// 
+			this.value1.AllowDecimal = true;
+			this.value1.AllowNegative = true;
+			this.value1.AllowRelative = true;
+			this.value1.ButtonStep = 1;
+			this.value1.ButtonStepFloat = 1F;
+			this.value1.ButtonStepsWrapAround = false;
+			this.value1.Location = new System.Drawing.Point(2, 1);
+			this.value1.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
+			this.value1.Name = "value1";
+			this.value1.Size = new System.Drawing.Size(62, 24);
+			this.value1.StepValues = null;
+			this.value1.TabIndex = 42;
+			this.value1.Tag = "offsetx_top";
+			this.value1.WhenTextChanged += new System.EventHandler(this.value1_WhenTextChanged);
+			// 
+			// value2
+			// 
+			this.value2.AllowDecimal = true;
+			this.value2.AllowNegative = true;
+			this.value2.AllowRelative = true;
+			this.value2.ButtonStep = 1;
+			this.value2.ButtonStepFloat = 1F;
+			this.value2.ButtonStepsWrapAround = false;
+			this.value2.Location = new System.Drawing.Point(71, 1);
+			this.value2.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
+			this.value2.Name = "value2";
+			this.value2.Size = new System.Drawing.Size(62, 24);
+			this.value2.StepValues = null;
+			this.value2.TabIndex = 43;
+			this.value2.Tag = "offsety_top";
+			this.value2.WhenTextChanged += new System.EventHandler(this.value2_WhenTextChanged);
+			// 
+			// bReset
+			// 
+			this.bReset.Image = global::CodeImp.DoomBuilder.Properties.Resources.Reset;
+			this.bReset.Location = new System.Drawing.Point(161, 1);
+			this.bReset.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
+			this.bReset.Name = "bReset";
+			this.bReset.Size = new System.Drawing.Size(23, 23);
+			this.bReset.TabIndex = 45;
+			this.bReset.UseVisualStyleBackColor = true;
+			this.bReset.Visible = false;
+			this.bReset.Click += new System.EventHandler(this.bReset_Click);
+			// 
+			// bLink
+			// 
+			this.bLink.Image = global::CodeImp.DoomBuilder.Properties.Resources.Unlink;
+			this.bLink.Location = new System.Drawing.Point(136, 1);
+			this.bLink.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
+			this.bLink.Name = "bLink";
+			this.bLink.Size = new System.Drawing.Size(23, 23);
+			this.bLink.TabIndex = 44;
+			this.bLink.UseVisualStyleBackColor = true;
+			this.bLink.Click += new System.EventHandler(this.bLink_Click);
+			// 
+			// PairedFloatControl
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.Controls.Add(this.bReset);
+			this.Controls.Add(this.bLink);
+			this.Controls.Add(this.value1);
+			this.Controls.Add(this.value2);
+			this.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
+			this.Name = "PairedFloatControl";
+			this.Size = new System.Drawing.Size(186, 26);
+			this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Button bReset;
+        private System.Windows.Forms.Button bLink;
+        private DoomBuilder.Controls.ButtonsNumericTextbox value1;
+		private DoomBuilder.Controls.ButtonsNumericTextbox value2;
+    }
+}
diff --git a/Source/Core/GZBuilder/Controls/PairedFloatControl.cs b/Source/Core/GZBuilder/Controls/PairedFloatControl.cs
new file mode 100644
index 0000000..ec1e0d5
--- /dev/null
+++ b/Source/Core/GZBuilder/Controls/PairedFloatControl.cs
@@ -0,0 +1,126 @@
+using System;
+using System.Globalization;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Properties;
+
+namespace CodeImp.DoomBuilder.GZBuilder.Controls
+{
+    public partial class PairedFloatControl : UserControl
+    {
+        #region ================== Events
+
+        public event EventHandler OnValuesChanged;
+
+        #endregion
+
+        #region ================== Variables
+
+        private float defaultValue;
+        private bool blockUpdate;
+        private bool linkValues;
+		private bool changed;
+
+        #endregion
+
+        #region ================== Properties
+
+		public bool NonDefaultValue { get { return changed; } }
+        public float DefaultValue { get { return defaultValue; } set { defaultValue = value; } }
+        public float ButtonStep { get { return value1.ButtonStepFloat; } set { value1.ButtonStepFloat = value; value2.ButtonStepFloat = value; } }
+		public float ButtonStepBig { get { return value1.ButtonStepBig; } set { value1.ButtonStepBig = value; value2.ButtonStepBig = value; } }
+		public float ButtonStepSmall { get { return value1.ButtonStepSmall; } set { value1.ButtonStepSmall = value; value2.ButtonStepSmall = value; } }
+		public bool ButtonStepsUseModifierKeys { get { return value1.ButtonStepsUseModifierKeys; } set { value1.ButtonStepsUseModifierKeys = value; value2.ButtonStepsUseModifierKeys = value; } }
+		public bool LinkValues { get { return linkValues; } set { linkValues = value; bLink.Image = (linkValues ? Resources.Link : Resources.Unlink); } }
+
+        #endregion
+        
+        public PairedFloatControl()
+        {
+            InitializeComponent();
+        }
+
+        public void SetValues(float val1, float val2, bool first)
+        {
+            blockUpdate = true;
+
+            if(first) 
+			{
+                value1.Text = val1.ToString(CultureInfo.CurrentCulture);
+				value2.Text = val2.ToString(CultureInfo.CurrentCulture);
+            } 
+			else 
+			{
+				if(!string.IsNullOrEmpty(value1.Text) && value1.Text != val1.ToString(CultureInfo.CurrentCulture))
+                    value1.Text = string.Empty;
+
+				if(!string.IsNullOrEmpty(value2.Text) && value2.Text != val2.ToString(CultureInfo.CurrentCulture))
+                    value2.Text = string.Empty;
+            }
+
+            CheckValues();
+
+            blockUpdate = false;
+        }
+
+        public float GetValue1(float original)
+        {
+            return value1.GetResultFloat(original);
+        }
+
+        public float GetValue2(float original)
+        {
+            return value2.GetResultFloat(original);
+        }
+
+        private void CheckValues()
+        {
+            changed = (string.IsNullOrEmpty(value1.Text) || string.IsNullOrEmpty(value2.Text)
+                || value1.GetResultFloat(defaultValue, 0) != defaultValue || value2.GetResultFloat(defaultValue, 0) != defaultValue);
+            bReset.Visible = changed;
+
+            if(!blockUpdate && OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+        }
+
+        private void bReset_Click(object sender, EventArgs e)
+        {
+	        string newValue = defaultValue.ToString(CultureInfo.CurrentCulture);
+            value1.Text = newValue;
+            value2.Text = newValue;
+            CheckValues();
+        }
+
+        private void bLink_Click(object sender, EventArgs e)
+        {
+            linkValues = !linkValues;
+            bLink.Image = (linkValues ? Resources.Link : Resources.Unlink);
+        }
+
+        private void value1_WhenTextChanged(object sender, EventArgs e)
+        {
+            if(blockUpdate) return;
+            
+            if(linkValues) 
+			{
+                blockUpdate = true;
+                value2.Text = value1.Text;
+                blockUpdate = false;
+            }
+            
+            CheckValues();
+        }
+
+        private void value2_WhenTextChanged(object sender, EventArgs e)
+        {
+            if(blockUpdate) return;
+
+            if(linkValues) 
+			{
+                blockUpdate = true;
+                value1.Text = value2.Text;
+                blockUpdate = false;
+            }
+
+            CheckValues();
+        }
+    }
+}
diff --git a/Source/Core/GZBuilder/Controls/PairedFloatControl.resx b/Source/Core/GZBuilder/Controls/PairedFloatControl.resx
new file mode 100644
index 0000000..7080a7d
--- /dev/null
+++ b/Source/Core/GZBuilder/Controls/PairedFloatControl.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/Source/Core/GZBuilder/Controls/PairedIntControl.Designer.cs b/Source/Core/GZBuilder/Controls/PairedIntControl.Designer.cs
new file mode 100644
index 0000000..5a0b91a
--- /dev/null
+++ b/Source/Core/GZBuilder/Controls/PairedIntControl.Designer.cs
@@ -0,0 +1,98 @@
+namespace CodeImp.DoomBuilder.GZBuilder.Controls
+{
+	partial class PairedIntControl
+	{
+		/// <summary> 
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing) 
+		{
+			if(disposing && (components != null)) 
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Component Designer generated code
+
+		/// <summary> 
+		/// Required method for Designer support - do not modify 
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent() 
+		{
+			this.bReset = new System.Windows.Forms.Button();
+			this.value1 = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.value2 = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.SuspendLayout();
+			// 
+			// bReset
+			// 
+			this.bReset.Image = global::CodeImp.DoomBuilder.Properties.Resources.Reset;
+			this.bReset.Location = new System.Drawing.Point(136, 1);
+			this.bReset.Name = "bReset";
+			this.bReset.Size = new System.Drawing.Size(23, 23);
+			this.bReset.TabIndex = 43;
+			this.bReset.UseVisualStyleBackColor = true;
+			this.bReset.Visible = false;
+			this.bReset.Click += new System.EventHandler(this.bReset_Click);
+			// 
+			// value1
+			// 
+			this.value1.AllowDecimal = false;
+			this.value1.AllowNegative = true;
+			this.value1.AllowRelative = true;
+			this.value1.ButtonStep = 1;
+			this.value1.ButtonStepFloat = 1F;
+			this.value1.ButtonStepsWrapAround = false;
+			this.value1.Location = new System.Drawing.Point(3, 1);
+			this.value1.Name = "value1";
+			this.value1.Size = new System.Drawing.Size(62, 24);
+			this.value1.StepValues = null;
+			this.value1.TabIndex = 41;
+			this.value1.Tag = "offsetx_top";
+			this.value1.WhenTextChanged += new System.EventHandler(this.value1_WhenTextChanged);
+			// 
+			// value2
+			// 
+			this.value2.AllowDecimal = false;
+			this.value2.AllowNegative = true;
+			this.value2.AllowRelative = true;
+			this.value2.ButtonStep = 1;
+			this.value2.ButtonStepFloat = 1F;
+			this.value2.ButtonStepsWrapAround = false;
+			this.value2.Location = new System.Drawing.Point(71, 1);
+			this.value2.Name = "value2";
+			this.value2.Size = new System.Drawing.Size(62, 24);
+			this.value2.StepValues = null;
+			this.value2.TabIndex = 42;
+			this.value2.Tag = "offsety_top";
+			this.value2.WhenTextChanged += new System.EventHandler(this.value1_WhenTextChanged);
+			// 
+			// PairedIntControl
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.Controls.Add(this.bReset);
+			this.Controls.Add(this.value1);
+			this.Controls.Add(this.value2);
+			this.Name = "PairedIntControl";
+			this.Size = new System.Drawing.Size(186, 26);
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Button bReset;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox value1;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox value2;
+	}
+}
diff --git a/Source/Core/GZBuilder/Controls/PairedIntControl.cs b/Source/Core/GZBuilder/Controls/PairedIntControl.cs
new file mode 100644
index 0000000..b7ca52e
--- /dev/null
+++ b/Source/Core/GZBuilder/Controls/PairedIntControl.cs
@@ -0,0 +1,95 @@
+#region ================== Namespaces
+
+using System;
+using System.Globalization;
+using System.Windows.Forms;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.GZBuilder.Controls
+{
+	public partial class PairedIntControl : UserControl
+	{
+		#region ================== Events
+
+		public event EventHandler OnValuesChanged;
+
+		#endregion
+
+		#region ================== Variables
+
+		private int defaultValue;
+		private bool blockUpdate;
+		private bool changed;
+
+		#endregion
+
+		#region ================== Properties
+
+		public bool NonDefaultValue { get { return changed; } }
+		public int DefaultValue { get { return defaultValue; } set { defaultValue = value; } }
+		public int ButtonStep { get { return value1.ButtonStep; } set { value1.ButtonStep = value; value2.ButtonStep = value; } }
+		public float ButtonStepBig { get { return value1.ButtonStepBig; } set { value1.ButtonStepBig = value; value2.ButtonStepBig = value; } }
+		public float ButtonStepSmall { get { return value1.ButtonStepSmall; } set { value1.ButtonStepSmall = value; value2.ButtonStepSmall = value; } }
+		public bool ButtonStepsUseModifierKeys { get { return value1.ButtonStepsUseModifierKeys; } set { value1.ButtonStepsUseModifierKeys = value; value2.ButtonStepsUseModifierKeys = value; } }
+
+		#endregion
+
+		public PairedIntControl() 
+		{
+			InitializeComponent();
+		}
+
+		public void SetValues(int val1, int val2, bool first) 
+		{
+			blockUpdate = true;
+
+			if(first) 
+			{
+				value1.Text = val1.ToString(CultureInfo.InvariantCulture);
+				value2.Text = val2.ToString(CultureInfo.InvariantCulture);
+			} 
+			else 
+			{
+				if(!string.IsNullOrEmpty(value1.Text) && value1.Text != val1.ToString(CultureInfo.InvariantCulture))
+					value1.Text = string.Empty;
+
+				if(!string.IsNullOrEmpty(value2.Text) && value2.Text != val2.ToString(CultureInfo.InvariantCulture))
+					value2.Text = string.Empty;
+			}
+
+			blockUpdate = false;
+		}
+
+		public int GetValue1(int original) 
+		{
+			return value1.GetResult(original);
+		}
+
+		public int GetValue2(int original) 
+		{
+			return value2.GetResult(original);
+		}
+
+		private void CheckValues() 
+		{
+			changed = string.IsNullOrEmpty(value1.Text) || string.IsNullOrEmpty(value2.Text) 
+				|| value1.GetResult(defaultValue, 0) != defaultValue || value2.GetResult(defaultValue, 0) != defaultValue;
+			bReset.Visible = changed;
+
+			if(!blockUpdate && OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void bReset_Click(object sender, EventArgs e) 
+		{
+			value1.Text = defaultValue.ToString(CultureInfo.InvariantCulture);
+			value2.Text = defaultValue.ToString(CultureInfo.InvariantCulture);
+			CheckValues();
+		}
+
+		private void value1_WhenTextChanged(object sender, EventArgs e) 
+		{
+			CheckValues();
+		}
+	}
+}
diff --git a/Source/Core/GZBuilder/Controls/PairedIntControl.resx b/Source/Core/GZBuilder/Controls/PairedIntControl.resx
new file mode 100644
index 0000000..19dc0dd
--- /dev/null
+++ b/Source/Core/GZBuilder/Controls/PairedIntControl.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/Source/Core/GZBuilder/Controls/TagSelector.Designer.cs b/Source/Core/GZBuilder/Controls/TagSelector.Designer.cs
new file mode 100644
index 0000000..be89edf
--- /dev/null
+++ b/Source/Core/GZBuilder/Controls/TagSelector.Designer.cs
@@ -0,0 +1,131 @@
+namespace CodeImp.DoomBuilder.GZBuilder.Controls
+{
+	partial class TagSelector
+	{
+		/// <summary> 
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing) 
+		{
+			if(disposing && (components != null)) 
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Component Designer generated code
+
+		/// <summary> 
+		/// Required method for Designer support - do not modify 
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent() 
+		{
+			this.components = new System.ComponentModel.Container();
+			this.label1 = new System.Windows.Forms.Label();
+			this.cbTagPicker = new System.Windows.Forms.ComboBox();
+			this.newTag = new System.Windows.Forms.Button();
+			this.unusedTag = new System.Windows.Forms.Button();
+			this.tooltip = new System.Windows.Forms.ToolTip(this.components);
+			this.clear = new System.Windows.Forms.Button();
+			this.SuspendLayout();
+			// 
+			// label1
+			// 
+			this.label1.AutoSize = true;
+			this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.label1.ForeColor = System.Drawing.SystemColors.HotTrack;
+			this.label1.Location = new System.Drawing.Point(7, 10);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(29, 13);
+			this.label1.TabIndex = 0;
+			this.label1.Text = "Tag:";
+			this.tooltip.SetToolTip(this.label1, "Use \">=\" or \"<=\" prefixes to create\r\nacsending or descending tags range.\r\nUse \"++" +
+					"\" or \"--\" prefixes to increment\r\nor decrement already existing tags \r\nby given v" +
+					"alue.");
+			// 
+			// cbTagPicker
+			// 
+			this.cbTagPicker.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest;
+			this.cbTagPicker.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems;
+			this.cbTagPicker.FormattingEnabled = true;
+			this.cbTagPicker.Location = new System.Drawing.Point(42, 7);
+			this.cbTagPicker.Name = "cbTagPicker";
+			this.cbTagPicker.Size = new System.Drawing.Size(165, 21);
+			this.cbTagPicker.TabIndex = 1;
+			// 
+			// newTag
+			// 
+			this.newTag.Location = new System.Drawing.Point(213, 5);
+			this.newTag.Name = "newTag";
+			this.newTag.Size = new System.Drawing.Size(54, 24);
+			this.newTag.TabIndex = 2;
+			this.newTag.Text = "New";
+			this.tooltip.SetToolTip(this.newTag, "Finds a tag, which is not used as a tag or tag action argument \r\nby any map eleme" +
+					"nt");
+			this.newTag.UseVisualStyleBackColor = true;
+			this.newTag.Click += new System.EventHandler(this.newTag_Click);
+			// 
+			// unusedTag
+			// 
+			this.unusedTag.Location = new System.Drawing.Point(270, 5);
+			this.unusedTag.Name = "unusedTag";
+			this.unusedTag.Size = new System.Drawing.Size(54, 24);
+			this.unusedTag.TabIndex = 3;
+			this.unusedTag.Text = "Unused";
+			this.tooltip.SetToolTip(this.unusedTag, "Finds a tag, which is not used as a tag \r\nby any map element of this type");
+			this.unusedTag.UseVisualStyleBackColor = true;
+			this.unusedTag.Click += new System.EventHandler(this.unusedTag_Click);
+			// 
+			// tooltip
+			// 
+			this.tooltip.AutomaticDelay = 10;
+			this.tooltip.AutoPopDelay = 10000;
+			this.tooltip.InitialDelay = 10;
+			this.tooltip.ReshowDelay = 100;
+			// 
+			// clear
+			// 
+			this.clear.Image = global::CodeImp.DoomBuilder.Properties.Resources.Reset;
+			this.clear.Location = new System.Drawing.Point(327, 5);
+			this.clear.Name = "clear";
+			this.clear.Size = new System.Drawing.Size(26, 24);
+			this.clear.TabIndex = 4;
+			this.tooltip.SetToolTip(this.clear, "Sets tag to 0");
+			this.clear.UseVisualStyleBackColor = true;
+			this.clear.Click += new System.EventHandler(this.clear_Click);
+			// 
+			// TagSelector
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.Controls.Add(this.clear);
+			this.Controls.Add(this.unusedTag);
+			this.Controls.Add(this.newTag);
+			this.Controls.Add(this.cbTagPicker);
+			this.Controls.Add(this.label1);
+			this.Name = "TagSelector";
+			this.Size = new System.Drawing.Size(356, 35);
+			this.Resize += new System.EventHandler(this.TagSelector_Resize);
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.ComboBox cbTagPicker;
+		private System.Windows.Forms.Button newTag;
+		private System.Windows.Forms.Button unusedTag;
+		private System.Windows.Forms.ToolTip tooltip;
+		private System.Windows.Forms.Button clear;
+	}
+}
diff --git a/Source/Core/GZBuilder/Controls/TagSelector.cs b/Source/Core/GZBuilder/Controls/TagSelector.cs
new file mode 100644
index 0000000..b874443
--- /dev/null
+++ b/Source/Core/GZBuilder/Controls/TagSelector.cs
@@ -0,0 +1,265 @@
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Map;
+using System.Globalization;
+using CodeImp.DoomBuilder.Types;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.GZBuilder.Controls
+{
+	internal struct TagInfo
+	{
+		public readonly string Label;
+		public readonly int Tag;
+
+		public TagInfo(int tag, string label) 
+		{
+			Label = (string.IsNullOrEmpty(label) ? tag.ToString() : tag + " - " + label);
+			Tag = tag;
+		}
+
+		public override string ToString() 
+		{
+			return Label;
+		}
+	}
+	
+	public partial class TagSelector : UserControl
+	{
+		#region ================== Variables
+
+		private List<int> tags;
+		private List<TagInfo> infos;
+		private bool valid;
+		private int tag;
+		private UniversalType elementtype;
+		private int rangemode; //0 - none, 1 - positive (>=), -1 - negative (<=)
+		private int offsetmode; //0 - none, 1 - positive (++), -1 - negative (--)
+
+		#endregion
+
+		#region ================== Constructor
+
+		public TagSelector() 
+		{
+			InitializeComponent();
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		public void Setup(UniversalType mapelementtype) 
+		{
+			tags = new List<int>();
+			infos = new List<TagInfo>();
+			this.elementtype = mapelementtype;
+
+			//collect used tags from appropriate element type...
+			switch(elementtype)
+			{
+				case UniversalType.SectorTag:
+					foreach(Sector s in General.Map.Map.Sectors)
+					{
+						foreach(int t in s.Tags)
+						{
+							if(t == 0 || tags.Contains(t)) continue;
+							tags.Add(t);
+						}
+					}
+					break;
+
+				case UniversalType.LinedefTag:
+					if(General.Map.FormatInterface.HasLinedefTag)
+					{
+						foreach(Linedef l in General.Map.Map.Linedefs)
+						{
+							foreach(int t in l.Tags)
+							{
+								if(t == 0 || tags.Contains(t)) continue;
+								tags.Add(t);
+							}
+						}
+					}
+					break;
+
+				case UniversalType.ThingTag:
+					if(General.Map.FormatInterface.HasThingTag)
+					{
+						foreach(Thing t in General.Map.Map.Things)
+						{
+							if(t.Tag == 0 || tags.Contains(t.Tag)) continue;
+							tags.Add(t.Tag);
+						}
+					}
+					break;
+			}
+
+			//now sort them in descending order
+			tags.Sort((a, b) => -1 * a.CompareTo(b));
+
+			//create tag infos
+			foreach(int tag in tags)
+			{
+				if(General.Map.Options.TagLabels.ContainsKey(tag)) //tag labels
+					infos.Add(new TagInfo(tag, General.Map.Options.TagLabels[tag]));
+				else
+					infos.Add(new TagInfo(tag, string.Empty));
+			}
+
+			foreach(TagInfo info in infos) cbTagPicker.Items.Add(info);
+			cbTagPicker.DropDownWidth = DoomBuilder.Geometry.Tools.GetDropDownWidth(cbTagPicker);
+		}
+
+		public void SetTag(int newTag) 
+		{
+			if(tags.Contains(newTag)) 
+			{
+				cbTagPicker.SelectedIndex = tags.IndexOf(newTag);
+			} 
+			else 
+			{
+				cbTagPicker.SelectedIndex = -1;
+				cbTagPicker.Text = newTag.ToString();
+			}
+			tag = newTag;
+			valid = true;
+		}
+
+		public void ClearTag() 
+		{
+			cbTagPicker.SelectedIndex = -1;
+			cbTagPicker.Text = string.Empty;
+			rangemode = 0;
+			offsetmode = 0;
+			valid = false;
+		}
+
+		public int GetTag(int original) 
+		{
+			return (valid ? tag : original);
+		}
+
+		public int GetSmartTag(int original, int offset) 
+		{
+			if(!valid) return original;
+			if(rangemode != 0) return tag + offset * rangemode;
+			if(offsetmode != 0) return original + tag * offsetmode;
+			return tag;
+		}
+
+		public void ValidateTag() 
+		{
+			rangemode = 0;
+			offsetmode = 0;
+			
+			if(cbTagPicker.SelectedIndex != -1) 
+			{
+				tag = infos[cbTagPicker.SelectedIndex].Tag;
+				valid = true;
+				return;
+			}
+
+			//check text
+			string text = cbTagPicker.Text.Trim().ToLowerInvariant();
+			if(string.IsNullOrEmpty(text)) 
+			{
+				valid = false;
+				return;
+			}
+
+			//incremental?
+			if(text.Length > 2)
+			{
+				if(text.StartsWith(">=")) //range up
+				{ 
+					rangemode = 1;
+					text = text.Substring(2, text.Length - 2);
+				} 
+				else if(text.StartsWith("<=")) //range down
+				{ 
+					rangemode = -1;
+					text = text.Substring(2, text.Length - 2);
+				} 
+				else if(text.StartsWith("++")) //relative up
+				{ 
+					offsetmode = 1;
+					text = text.Substring(2, text.Length - 2);
+				} 
+				else if(text.StartsWith("--")) //relative down
+				{ 
+					offsetmode = -1;
+					text = text.Substring(2, text.Length - 2);
+				}
+			} 
+
+			if(!int.TryParse(text, NumberStyles.Integer, CultureInfo.InvariantCulture, out tag)) 
+			{
+				//maybe it's user-pasted label?
+				foreach(TagInfo info in infos) 
+				{
+					if(info.Label.ToLowerInvariant().Contains(text)) 
+					{
+						tag = info.Tag;
+						valid = true;
+						return;
+					}
+				}
+				
+				tag = General.Map.Map.GetNewTag();
+
+				//create new tag label
+				if(General.Map.Options.TagLabels.ContainsKey(tag))
+					General.Map.Options.TagLabels[tag] = cbTagPicker.Text.Trim();
+				else
+					General.Map.Options.TagLabels.Add(tag, cbTagPicker.Text.Trim());
+			}
+
+			valid = true;
+		}
+
+		#endregion
+
+		#region ================== Events
+
+		private void newTag_Click(object sender, EventArgs e) 
+		{
+			//todo: check tag labels?
+			tag = General.Map.Map.GetNewTag();
+			cbTagPicker.SelectedIndex = -1;
+			cbTagPicker.Text = tag.ToString();
+			valid = true;
+		}
+
+		private void unusedTag_Click(object sender, EventArgs e) 
+		{
+			tag = General.Map.Map.GetNewTag(elementtype);
+			cbTagPicker.SelectedIndex = -1;
+			cbTagPicker.Text = tag.ToString();
+			valid = true;
+		}
+
+		private void clear_Click(object sender, EventArgs e) 
+		{
+			tag = 0;
+			cbTagPicker.SelectedIndex = -1;
+			cbTagPicker.Text = tag.ToString();
+			valid = true;
+		}
+
+		//mxd. Because anchor-based alignment fails when using high-Dpi settings...
+		private void TagSelector_Resize(object sender, EventArgs e)
+		{
+			clear.Left = this.Width - clear.Width - clear.Margin.Right;
+			unusedTag.Left = clear.Left - clear.Margin.Left - unusedTag.Margin.Right - unusedTag.Width;
+			newTag.Left = unusedTag.Left - unusedTag.Margin.Left - newTag.Margin.Right - newTag.Width;
+			cbTagPicker.Width = newTag.Left - newTag.Margin.Left - cbTagPicker.Margin.Right - cbTagPicker.Left;
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/GZBuilder/Controls/TagSelector.resx b/Source/Core/GZBuilder/Controls/TagSelector.resx
new file mode 100644
index 0000000..b9dfa25
--- /dev/null
+++ b/Source/Core/GZBuilder/Controls/TagSelector.resx
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Core/GZBuilder/Controls/TagsSelector.Designer.cs b/Source/Core/GZBuilder/Controls/TagsSelector.Designer.cs
new file mode 100644
index 0000000..733e6b9
--- /dev/null
+++ b/Source/Core/GZBuilder/Controls/TagsSelector.Designer.cs
@@ -0,0 +1,190 @@
+namespace CodeImp.DoomBuilder.GZBuilder.Controls
+{
+	partial class TagsSelector
+	{
+		/// <summary> 
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing) {
+			if(disposing && (components != null)) {
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Component Designer generated code
+
+		/// <summary> 
+		/// Required method for Designer support - do not modify 
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent() {
+			this.components = new System.ComponentModel.Container();
+			this.curtaglabel = new System.Windows.Forms.Label();
+			this.tagpicker = new System.Windows.Forms.ComboBox();
+			this.newtag = new System.Windows.Forms.Button();
+			this.unusedtag = new System.Windows.Forms.Button();
+			this.tooltip = new System.Windows.Forms.ToolTip(this.components);
+			this.removetag = new System.Windows.Forms.Button();
+			this.addtag = new System.Windows.Forms.Button();
+			this.clear = new System.Windows.Forms.Button();
+			this.clearalltags = new System.Windows.Forms.Button();
+			this.tagslist = new System.Windows.Forms.LinkLabel();
+			this.label1 = new System.Windows.Forms.Label();
+			this.SuspendLayout();
+			// 
+			// curtaglabel
+			// 
+			this.curtaglabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.curtaglabel.ForeColor = System.Drawing.SystemColors.HotTrack;
+			this.curtaglabel.Location = new System.Drawing.Point(8, 10);
+			this.curtaglabel.Name = "curtaglabel";
+			this.curtaglabel.Size = new System.Drawing.Size(52, 13);
+			this.curtaglabel.TabIndex = 0;
+			this.curtaglabel.Text = "Tag 1:";
+			this.curtaglabel.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			this.tooltip.SetToolTip(this.curtaglabel, "Use \">=\" or \"<=\" prefixes to create\r\nacsending or descending tags range.\r\nUse \"++" +
+					"\" or \"--\" prefixes to increment\r\nor decrement already existing tags \r\nby given v" +
+					"alue.");
+			// 
+			// tagpicker
+			// 
+			this.tagpicker.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest;
+			this.tagpicker.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems;
+			this.tagpicker.FormattingEnabled = true;
+			this.tagpicker.Location = new System.Drawing.Point(65, 7);
+			this.tagpicker.Name = "tagpicker";
+			this.tagpicker.Size = new System.Drawing.Size(230, 21);
+			this.tagpicker.TabIndex = 1;
+			this.tagpicker.TextChanged += new System.EventHandler(this.tagpicker_TextChanged);
+			// 
+			// newtag
+			// 
+			this.newtag.Location = new System.Drawing.Point(299, 5);
+			this.newtag.Name = "newtag";
+			this.newtag.Size = new System.Drawing.Size(54, 24);
+			this.newtag.TabIndex = 2;
+			this.newtag.Text = "New";
+			this.tooltip.SetToolTip(this.newtag, "Find number, which is not used as a tag\r\nor tag action argument by any map elemen" +
+					"t");
+			this.newtag.UseVisualStyleBackColor = true;
+			this.newtag.Click += new System.EventHandler(this.newtag_Click);
+			// 
+			// unusedtag
+			// 
+			this.unusedtag.Location = new System.Drawing.Point(356, 5);
+			this.unusedtag.Name = "unusedtag";
+			this.unusedtag.Size = new System.Drawing.Size(54, 24);
+			this.unusedtag.TabIndex = 3;
+			this.unusedtag.Text = "Unused";
+			this.tooltip.SetToolTip(this.unusedtag, "Find number, which is not used as a tag \r\nby any map element of this type");
+			this.unusedtag.UseVisualStyleBackColor = true;
+			this.unusedtag.Click += new System.EventHandler(this.unusedtag_Click);
+			// 
+			// removetag
+			// 
+			this.removetag.Image = global::CodeImp.DoomBuilder.Properties.Resources.SearchClear;
+			this.removetag.Location = new System.Drawing.Point(413, 33);
+			this.removetag.Name = "removetag";
+			this.removetag.Size = new System.Drawing.Size(26, 24);
+			this.removetag.TabIndex = 7;
+			this.tooltip.SetToolTip(this.removetag, "Remove selected tag");
+			this.removetag.UseVisualStyleBackColor = true;
+			this.removetag.Click += new System.EventHandler(this.removetag_Click);
+			// 
+			// addtag
+			// 
+			this.addtag.Image = global::CodeImp.DoomBuilder.Properties.Resources.Add;
+			this.addtag.Location = new System.Drawing.Point(384, 33);
+			this.addtag.Name = "addtag";
+			this.addtag.Size = new System.Drawing.Size(26, 24);
+			this.addtag.TabIndex = 8;
+			this.tooltip.SetToolTip(this.addtag, "Add new tag");
+			this.addtag.UseVisualStyleBackColor = true;
+			this.addtag.Click += new System.EventHandler(this.addtag_Click);
+			// 
+			// clear
+			// 
+			this.clear.Image = global::CodeImp.DoomBuilder.Properties.Resources.Reset;
+			this.clear.Location = new System.Drawing.Point(413, 5);
+			this.clear.Name = "clear";
+			this.clear.Size = new System.Drawing.Size(26, 24);
+			this.clear.TabIndex = 9;
+			this.tooltip.SetToolTip(this.clear, "Set current tag to 0");
+			this.clear.UseVisualStyleBackColor = true;
+			this.clear.Click += new System.EventHandler(this.clear_Click);
+			// 
+			// clearalltags
+			// 
+			this.clearalltags.Image = global::CodeImp.DoomBuilder.Properties.Resources.Clear;
+			this.clearalltags.Location = new System.Drawing.Point(0, 33);
+			this.clearalltags.Name = "clearalltags";
+			this.clearalltags.Size = new System.Drawing.Size(24, 24);
+			this.clearalltags.TabIndex = 10;
+			this.tooltip.SetToolTip(this.clearalltags, "Remove all tags");
+			this.clearalltags.UseVisualStyleBackColor = true;
+			this.clearalltags.Click += new System.EventHandler(this.clearalltags_Click);
+			// 
+			// tagslist
+			// 
+			this.tagslist.AutoSize = true;
+			this.tagslist.Location = new System.Drawing.Point(63, 39);
+			this.tagslist.Name = "tagslist";
+			this.tagslist.Size = new System.Drawing.Size(82, 13);
+			this.tagslist.TabIndex = 5;
+			this.tagslist.TabStop = true;
+			this.tagslist.Text = "12 ,  ??? , [667]";
+			this.tagslist.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.tagslist_LinkClicked);
+			// 
+			// label1
+			// 
+			this.label1.AutoSize = true;
+			this.label1.Location = new System.Drawing.Point(28, 39);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(34, 13);
+			this.label1.TabIndex = 6;
+			this.label1.Text = "Tags:";
+			// 
+			// TagsSelector
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.Controls.Add(this.clearalltags);
+			this.Controls.Add(this.clear);
+			this.Controls.Add(this.addtag);
+			this.Controls.Add(this.removetag);
+			this.Controls.Add(this.label1);
+			this.Controls.Add(this.tagslist);
+			this.Controls.Add(this.unusedtag);
+			this.Controls.Add(this.newtag);
+			this.Controls.Add(this.tagpicker);
+			this.Controls.Add(this.curtaglabel);
+			this.Name = "TagsSelector";
+			this.Size = new System.Drawing.Size(442, 60);
+			this.Resize += new System.EventHandler(this.TagsSelector_Resize);
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Label curtaglabel;
+		private System.Windows.Forms.ComboBox tagpicker;
+		private System.Windows.Forms.Button newtag;
+		private System.Windows.Forms.Button unusedtag;
+		private System.Windows.Forms.ToolTip tooltip;
+		private System.Windows.Forms.LinkLabel tagslist;
+		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.Button removetag;
+		private System.Windows.Forms.Button addtag;
+		private System.Windows.Forms.Button clear;
+		private System.Windows.Forms.Button clearalltags;
+	}
+}
diff --git a/Source/Core/GZBuilder/Controls/TagsSelector.cs b/Source/Core/GZBuilder/Controls/TagsSelector.cs
new file mode 100644
index 0000000..26c4297
--- /dev/null
+++ b/Source/Core/GZBuilder/Controls/TagsSelector.cs
@@ -0,0 +1,425 @@
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Types;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.GZBuilder.Controls
+{
+	public partial class TagsSelector : UserControl
+	{
+		#region ================== Structs
+
+		private struct TagLinkData
+		{
+			public int Index;
+			public int Tag;
+		}
+
+		#endregion
+
+		#region ================== Variables
+
+		private List<int> usedtags; //tags already used in the map
+		private List<TagInfo> infos;
+		private List<int> tags; //tags being edited
+		private List<int> rangemodes; //0 - none, 1 - positive (>=), -1 - negative (<=)
+		private List<int> offsetmodes; //0 - none, 1 - positive (++), -1 - negative (--)
+		private UniversalType elementtype;
+		private const string TAGS_SEPARATOR = ", ";
+		private int curtagindex;
+		private bool blockupdate;
+
+		#endregion
+
+		#region ================== Constructor
+
+		public TagsSelector()
+		{
+			InitializeComponent();
+		}
+
+		#endregion
+
+		#region ================== Setup
+
+		public void Setup(UniversalType mapelementtype)
+		{
+			tags = new List<int>();
+			usedtags = new List<int>();
+			rangemodes = new List<int>();
+			offsetmodes = new List<int>();
+			infos = new List<TagInfo>();
+			elementtype = mapelementtype;
+
+			//collect used tags from appropriate element type...
+			switch(elementtype)
+			{
+				case UniversalType.SectorTag:
+					foreach(Sector s in General.Map.Map.Sectors)
+					{
+						foreach(int tag in s.Tags)
+						{
+							if(tag == 0 || usedtags.Contains(tag)) continue;
+							usedtags.Add(tag);
+						}
+					}
+					break;
+
+				case UniversalType.LinedefTag:
+					if(General.Map.FormatInterface.HasLinedefTag)
+					{
+						foreach(Linedef l in General.Map.Map.Linedefs)
+						{
+							foreach(int tag in l.Tags)
+							{
+								if(tag == 0 || usedtags.Contains(tag)) continue;
+								usedtags.Add(tag);
+							}
+						}
+					}
+					break;
+
+				default:
+					throw new NotSupportedException(elementtype + " doesn't support 'moreids' property!");
+			}
+
+			//now sort them in descending order
+			usedtags.Sort((a, b) => -1 * a.CompareTo(b));
+
+			//create tag infos
+			foreach(int tag in usedtags)
+			{
+				if(General.Map.Options.TagLabels.ContainsKey(tag)) //tag labels
+					infos.Add(new TagInfo(tag, General.Map.Options.TagLabels[tag]));
+				else
+					infos.Add(new TagInfo(tag, string.Empty));
+			}
+
+			foreach(TagInfo info in infos) tagpicker.Items.Add(info);
+			tagpicker.DropDownWidth = DoomBuilder.Geometry.Tools.GetDropDownWidth(tagpicker);
+		}
+
+		// Update collections and controls
+		public void FinishSetup()
+		{
+			if(tags.Count == 0) tags.Add(0);
+
+			// Initialize modifier modes
+			for(int i = 0; i < tags.Count; i++)
+			{
+				rangemodes.Add(0);
+				offsetmodes.Add(0);
+			}
+
+			// Update controls
+			UpdateTagPicker(tags[0]);
+			UpdateTagsList();
+			removetag.Enabled = (tags.Count > 1);
+		}
+
+		public void SetValue(List<int> newtags, bool first)
+		{
+			if(first)
+			{
+				foreach(int tag in newtags) tags.Add(tag);
+				return;
+			}
+
+			for(int i = 0; i < newtags.Count; i++)
+			{
+				if(i < tags.Count && newtags[i] != tags[i])
+					tags[i] = int.MinValue;
+				else if(i >= tags.Count)
+					tags.Add(int.MinValue);
+			}
+		}
+
+		#endregion
+
+		#region ================== Apply
+
+		public void ApplyTo(Linedef mo, int offset)
+		{
+			int[] oldtags = new int[mo.Tags.Count];
+			mo.Tags.CopyTo(oldtags);
+			mo.Tags.Clear();
+			mo.Tags.AddRange(GetResultTags(oldtags, offset));
+		}
+
+		public void ApplyTo(Sector mo, int offset)
+		{
+			int[] oldtags = new int[mo.Tags.Count];
+			mo.Tags.CopyTo(oldtags);
+			mo.Tags.Clear();
+			mo.Tags.AddRange(GetResultTags(oldtags, offset));
+		}
+
+		private IEnumerable<int> GetResultTags(int[] oldtags, int offset)
+		{
+			Dictionary<int, bool> newtags = new Dictionary<int, bool>();
+
+			for(int i = 0; i < tags.Count; i++)
+			{
+				if(tags[i] == int.MinValue && oldtags.Length > i)
+				{
+					if(!newtags.ContainsKey(oldtags[i])) newtags.Add(oldtags[i], false);
+				}
+				else if(tags[i] != 0 && tags[i] != int.MinValue)
+				{
+					int tag;
+					if(rangemodes[i] != 0)
+						tag = tags[i] + offset * rangemodes[i];
+					else if(offsetmodes[i] != 0 && oldtags.Length > i)
+						tag = oldtags[i] + tags[i] * offsetmodes[i];
+					else
+						tag = tags[i];
+
+					if(!newtags.ContainsKey(tag)) newtags.Add(tag, false);
+				}
+			}
+
+			if(newtags.Count == 0) newtags.Add(0, false);
+			return newtags.Keys;
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		private void UpdateTagsList()
+		{
+			string[] displaytags = new string[tags.Count];
+			int displaytagslen = 0;
+			tagslist.Links.Clear();
+
+			// Gather tags into a single string collection
+			for(int i = 0; i < tags.Count; i++)
+			{
+				displaytags[i] = (tags[i] == int.MinValue ? "???" : tags[i].ToString());
+
+				// Add modify mode markers
+				if(offsetmodes[i] == -1) displaytags[i] = "--" + displaytags[i];
+				else if(offsetmodes[i] == 1) displaytags[i] = "++" + displaytags[i];
+				else if(rangemodes[i] == -1) displaytags[i] = "<=" + displaytags[i];
+				else if(rangemodes[i] == 1) displaytags[i] = ">=" + displaytags[i];
+
+				// Add selection indictor
+				if(curtagindex == i) displaytags[i] = "[" + displaytags[i] + "]";
+				else displaytags[i] = " " + displaytags[i] + " ";
+
+				int start = displaytagslen + i * TAGS_SEPARATOR.Length;
+				tagslist.Links.Add(new LinkLabel.Link(start, displaytags[i].Length, new TagLinkData { Index = i, Tag = tags[i] }));
+				displaytagslen += displaytags[i].Length;
+			}
+
+			// Create label text
+			tagslist.Text = string.Join(TAGS_SEPARATOR, displaytags);
+
+			// Update current tag label
+			curtaglabel.Text = "Tag " + (curtagindex + 1) + ":";
+		}
+
+		private void UpdateTagPicker(int tag)
+		{
+			blockupdate = true;
+
+			tagpicker.SelectedIndex = -1;
+
+			if(tag == int.MinValue)
+			{
+				tagpicker.Text = string.Empty;
+			}
+			else if(rangemodes[curtagindex] != 0 && tag != 0)
+			{
+				tagpicker.Text = (rangemodes[curtagindex] == 1 ? ">=" : "<=") + tag;
+			}
+			else if(offsetmodes[curtagindex] != 0 && tag != 0)
+			{
+				tagpicker.Text = (offsetmodes[curtagindex] == 1 ? "++" : "--") + tag;
+			}
+			else
+			{
+				foreach(var item in tagpicker.Items)
+					if(((TagInfo)item).Tag == tag) tagpicker.SelectedItem = item;
+
+				if(tagpicker.SelectedIndex == -1) tagpicker.Text = tag.ToString();
+			}
+
+			blockupdate = false;
+		}
+
+		#endregion
+
+		#region ================== Events
+
+		private void newtag_Click(object sender, EventArgs e)
+		{
+			tagpicker.SelectedIndex = -1;
+			tagpicker.Text = General.Map.Map.GetNewTag().ToString();
+		}
+
+		private void unusedtag_Click(object sender, EventArgs e)
+		{
+			tagpicker.SelectedIndex = -1;
+			tagpicker.Text = General.Map.Map.GetNewTag(elementtype).ToString();
+		}
+
+		private void clear_Click(object sender, EventArgs e)
+		{
+			tagpicker.SelectedIndex = -1;
+			tagpicker.Text = "0";
+		}
+
+		private void addtag_Click(object sender, EventArgs e)
+		{
+			// When an item has no tags, act like "New Tag" button
+			if(tags.Count == 1 && tags[0] == 0)
+			{
+				newtag_Click(sender, e);
+				return;
+			}
+			
+			int nt = General.Map.Map.GetNewTag(tags);
+			tags.Add(nt);
+			rangemodes.Add(0);
+			offsetmodes.Add(0);
+			curtagindex = tags.Count - 1;
+
+			// Update controls
+			blockupdate = true;
+			tagpicker.Text = nt.ToString();
+			blockupdate = false;
+
+			removetag.Enabled = true;
+			UpdateTagsList();
+		}
+
+		private void removetag_Click(object sender, EventArgs e)
+		{
+			tags.RemoveAt(curtagindex);
+			rangemodes.RemoveAt(curtagindex);
+			offsetmodes.RemoveAt(curtagindex);
+			if(curtagindex >= tags.Count) curtagindex = tags.Count - 1;
+
+			// Update controls
+			UpdateTagPicker(tags[curtagindex]);
+
+			removetag.Enabled = (tags.Count > 1);
+			UpdateTagsList();
+		}
+
+		private void clearalltags_Click(object sender, EventArgs e)
+		{
+			curtagindex = 0;
+			
+			// Clear collections
+			tags.Clear();
+			tags.Add(0);
+			rangemodes.Clear();
+			rangemodes.Add(0);
+			offsetmodes.Clear();
+			offsetmodes.Add(0);
+
+			// Update controls
+			blockupdate = true;
+			tagpicker.Text = "0";
+			blockupdate = false;
+
+			removetag.Enabled = false;
+			UpdateTagsList();
+		}
+
+		private void tagslist_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+		{
+			TagLinkData data = (TagLinkData)e.Link.LinkData;
+			curtagindex = data.Index;
+			curtaglabel.Text = "Tag " + (curtagindex + 1) + ":";
+
+			// Update interface
+			UpdateTagPicker(data.Tag);
+			UpdateTagsList();
+		}
+
+		private void tagpicker_TextChanged(object sender, EventArgs e)
+		{
+			if(blockupdate) return;
+
+			if(tagpicker.SelectedItem != null)
+			{
+				TagInfo info = (TagInfo)tagpicker.SelectedItem;
+				tags[curtagindex] = info.Tag;
+				UpdateTagsList();
+				return;
+			}
+
+			string text = tagpicker.Text.Trim();
+			if(string.IsNullOrEmpty(text))
+			{
+				tags[curtagindex] = int.MinValue;
+				UpdateTagsList();
+				return;
+			}
+
+			//incremental?
+			int rangemode = 0;
+			int offsetmode = 0;
+			if(text.Length > 2)
+			{
+				if(text.StartsWith(">=")) //range up
+				{
+					rangemode = 1;
+					text = text.Substring(2, text.Length - 2);
+				}
+				else if(text.StartsWith("<=")) //range down
+				{
+					rangemode = -1;
+					text = text.Substring(2, text.Length - 2);
+				}
+				else if(text.StartsWith("++")) //relative up
+				{
+					offsetmode = 1;
+					text = text.Substring(2, text.Length - 2);
+				}
+				else if(text.StartsWith("--")) //relative down
+				{
+					offsetmode = -1;
+					text = text.Substring(2, text.Length - 2);
+				}
+			} 
+
+			int tag;
+			if(int.TryParse(text, out tag))
+			{
+				// Validate entered tag
+				if((tag < General.Map.FormatInterface.MinTag) || (tag > General.Map.FormatInterface.MaxTag))
+				{
+					General.ShowWarningMessage("Sector tag must be between " + General.Map.FormatInterface.MinTag + " and " + General.Map.FormatInterface.MaxTag + ".", MessageBoxButtons.OK);
+					return;
+				}
+
+				tags[curtagindex] = tag;
+				rangemodes[curtagindex] = rangemode;
+				offsetmodes[curtagindex] = offsetmode;
+				UpdateTagsList();
+			}
+		}
+
+		//mxd. Because anchor-based alignment fails when using high-Dpi settings...
+		private void TagsSelector_Resize(object sender, EventArgs e)
+		{
+			clear.Left = this.Width - clear.Width - clear.Margin.Right;
+			unusedtag.Left = clear.Left - clear.Margin.Left - unusedtag.Margin.Right - unusedtag.Width;
+			newtag.Left = unusedtag.Left - unusedtag.Margin.Left - newtag.Margin.Right - newtag.Width;
+			tagpicker.Width = newtag.Left - newtag.Margin.Left - tagpicker.Margin.Right - tagpicker.Left;
+			removetag.Left = clear.Left;
+			addtag.Left = removetag.Left - removetag.Margin.Left - addtag.Margin.Right - addtag.Width;
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/GZBuilder/Controls/TagsSelector.resx b/Source/Core/GZBuilder/Controls/TagsSelector.resx
new file mode 100644
index 0000000..b9dfa25
--- /dev/null
+++ b/Source/Core/GZBuilder/Controls/TagsSelector.resx
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Core/GZBuilder/Data/BoundingBox.cs b/Source/Core/GZBuilder/Data/BoundingBox.cs
new file mode 100644
index 0000000..b8a1537
--- /dev/null
+++ b/Source/Core/GZBuilder/Data/BoundingBox.cs
@@ -0,0 +1,48 @@
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Rendering;
+using SlimDX;
+
+namespace CodeImp.DoomBuilder.GZBuilder.Data
+{
+	public struct BoundingBoxSizes
+	{
+		public int MinX;
+		public int MaxX;
+		public int MinY;
+		public int MaxY;
+		public int MinZ;
+		public int MaxZ;
+
+		//we need some reference here
+		public BoundingBoxSizes(WorldVertex v) 
+		{
+			MinX = MaxX = (int)v.x;
+			MinY = MaxY = (int)v.y;
+			MinZ = MaxZ = (int)v.z;
+		}
+	}
+
+	public static class BoundingBoxTools
+	{
+		public static Vector3D[] CalculateBoundingPlane(BoundingBoxSizes bbs) 
+		{
+			//mxd. looks like I need only these 2 points, so...
+			//center
+			Vector3D v0 = new Vector3D(bbs.MinX + (bbs.MaxX - bbs.MinX) / 2, bbs.MinY + (bbs.MaxY - bbs.MinY) / 2, bbs.MinZ + (bbs.MaxZ - bbs.MinZ) / 2);
+			Vector3D v1 = new Vector3D(bbs.MinX, bbs.MinY, bbs.MinZ);
+			return new[] { v0, v1 };
+		}
+
+		public static void UpdateBoundingBoxSizes(ref BoundingBoxSizes bbs, WorldVertex v) 
+		{
+			if(v.x < bbs.MinX) bbs.MinX = (int)v.x;
+			else if(v.x > bbs.MaxX) bbs.MaxX = (int)v.x;
+
+			if(v.z < bbs.MinZ) bbs.MinZ = (int)v.z;
+			else if(v.z > bbs.MaxZ) bbs.MaxZ = (int)v.z;
+
+			if(v.y < bbs.MinY) bbs.MinY = (int)v.y;
+			else if(v.y > bbs.MaxY) bbs.MaxY = (int)v.y;
+		}
+	}
+}
diff --git a/Source/Core/GZBuilder/Data/DynamicLight.cs b/Source/Core/GZBuilder/Data/DynamicLight.cs
new file mode 100644
index 0000000..655b37e
--- /dev/null
+++ b/Source/Core/GZBuilder/Data/DynamicLight.cs
@@ -0,0 +1,44 @@
+using SlimDX;
+
+namespace CodeImp.DoomBuilder.GZBuilder.Data
+{
+	public sealed class DynamicLightData 
+	{
+		public DynamicLightType Type; //holds DynamicLightType
+		public Color3 Color;
+		public int PrimaryRadius;
+		public int SecondaryRadius;
+		public int Interval;
+		public Vector3 Offset;
+		public bool Subtractive;
+		public bool DontLightSelf;
+
+		public DynamicLightData() 
+		{
+			Color = new Color3();
+			Offset = new Vector3();
+		}
+	}
+
+	public enum DynamicLightType
+	{
+		NONE = -1,
+		NORMAL = 0,
+		PULSE = 1,
+		FLICKER = 2,
+		SECTOR = 3,
+		RANDOM = 4,
+		VAVOOM = 1502,
+		VAVOOM_COLORED = 1503,
+	}
+
+	//divide these by 100 to get light color alpha
+	public enum DynamicLightRenderStyle
+	{
+		NONE = 0,
+		NORMAL = 99,
+		VAVOOM = 50,
+		ADDITIVE = 25,
+		NEGATIVE = 100,
+	}
+}
diff --git a/Source/Core/GZBuilder/Data/EngineInfo.cs b/Source/Core/GZBuilder/Data/EngineInfo.cs
new file mode 100644
index 0000000..070b7ce
--- /dev/null
+++ b/Source/Core/GZBuilder/Data/EngineInfo.cs
@@ -0,0 +1,64 @@
+using System;
+using System.Drawing;
+using System.IO;
+
+namespace CodeImp.DoomBuilder.GZBuilder.Data 
+{
+	public class EngineInfo 
+	{
+		public const string DEFAULT_ENGINE_NAME = "Engine with no name";
+		
+		private string testprogramname;
+		public string TestProgramName { get { return testprogramname; } set { testprogramname = value; CheckProgramName(); } }
+		public string TestProgram;
+		public string TestParameters;
+		public bool CustomParameters;
+		public int TestSkill;
+		public bool TestShortPaths;
+		private Bitmap icon;
+		public Bitmap TestProgramIcon { get { return icon; } }
+
+		public EngineInfo() 
+		{
+			testprogramname = DEFAULT_ENGINE_NAME;
+		}
+
+		public EngineInfo(EngineInfo other) 
+		{
+			testprogramname = other.TestProgramName;
+			TestProgram = other.TestProgram;
+			TestParameters = other.TestParameters;
+			CustomParameters = other.CustomParameters;
+			TestSkill = other.TestSkill;
+			TestShortPaths = other.TestShortPaths;
+			icon = other.icon;
+		}
+
+		private void CheckProgramName() 
+		{
+			if(testprogramname == DEFAULT_ENGINE_NAME && !String.IsNullOrEmpty(TestProgram)) 
+			{
+				//get engine name from path
+				testprogramname = Path.GetFileNameWithoutExtension(TestProgram);
+			}
+
+			// Update icon
+			if(icon != null)
+			{
+				icon.Dispose();
+				icon = null;
+			}
+
+			if(File.Exists(TestProgram))
+			{
+				Icon i = Icon.ExtractAssociatedIcon(TestProgram);
+				if(i != null) icon = i.ToBitmap();
+			}
+			
+			if(icon == null)
+			{
+				icon = new Bitmap(16, 16);
+			}
+		}
+	}
+}
diff --git a/Source/Core/GZBuilder/Data/GameType.cs b/Source/Core/GZBuilder/Data/GameType.cs
new file mode 100644
index 0000000..875dd70
--- /dev/null
+++ b/Source/Core/GZBuilder/Data/GameType.cs
@@ -0,0 +1,17 @@
+
+namespace CodeImp.DoomBuilder.GZBuilder.Data 
+{
+	public enum GameType 
+	{
+		UNKNOWN = 0,
+		DOOM = 1,
+		HERETIC = 2,
+		HEXEN = 3,
+		STRIFE = 4,
+	}
+
+	public struct Gldefs 
+	{
+		public static readonly string[] GLDEFS_LUMPS_PER_GAME = { "UNKNOWN_GAME", "DOOMDEFS", "HTICDEFS", "HEXNDEFS", "STRFDEFS" };
+	}
+}
diff --git a/Source/Core/GZBuilder/Data/GlowingFlatData.cs b/Source/Core/GZBuilder/Data/GlowingFlatData.cs
new file mode 100644
index 0000000..993e137
--- /dev/null
+++ b/Source/Core/GZBuilder/Data/GlowingFlatData.cs
@@ -0,0 +1,15 @@
+using CodeImp.DoomBuilder.Rendering;
+
+namespace CodeImp.DoomBuilder.GZBuilder.Data
+{
+	public class GlowingFlatData
+	{
+		public PixelColor Color;
+		public int Height;
+		public int Brightness = 255;
+		public bool Fullbright;
+		public bool Fullblack; // GLOOME only
+		public bool Subtractive; // GLOOME only
+		public bool CalculateTextureColor;
+	}
+}
diff --git a/Source/Core/GZBuilder/Data/LinedefColorPreset.cs b/Source/Core/GZBuilder/Data/LinedefColorPreset.cs
new file mode 100644
index 0000000..76201f1
--- /dev/null
+++ b/Source/Core/GZBuilder/Data/LinedefColorPreset.cs
@@ -0,0 +1,101 @@
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.GZBuilder.Data
+{
+	public class LinedefColorPreset
+	{
+		#region ================== Properties
+
+		public string Name;
+		public PixelColor Color;
+		public bool Enabled;
+		public int Action;
+		public int Activation; //Hexen activation type
+		public readonly List<string> Flags;
+		public readonly List<string> RestrictedFlags;
+
+		#endregion
+
+		#region ================== Constructors
+
+		public LinedefColorPreset(string name, PixelColor linecolor) 
+		{
+			Name = name;
+			Color = linecolor;
+			Flags = new List<string>();
+			RestrictedFlags = new List<string>();
+			Enabled = true;
+		}
+
+		public LinedefColorPreset(string name, PixelColor linecolor, int action, int activation, List<string> flags, List<string> restrictedFlags, bool enabled) 
+		{
+			Name = name;
+			Color = linecolor;
+			Action = action;
+			Activation = activation;
+			Flags = flags;
+			RestrictedFlags = restrictedFlags;
+			Enabled = enabled;
+		}
+
+		public LinedefColorPreset(LinedefColorPreset other) 
+		{
+			Name = other.Name;
+			Color = other.Color;
+			Action = other.Action;
+			Activation = other.Activation;
+			Enabled = other.Enabled;
+			Flags = new List<string>(other.Flags);
+			RestrictedFlags = new List<string>(other.RestrictedFlags);
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		public bool Matches(Linedef l)
+		{
+			if(!Enabled) return false;
+			
+			// Check action; -1 means Any Action
+			if(Action != 0) 
+			{
+				if((Action == -1 && l.Action == 0) || (Action != -1 && l.Action != Action))
+					return false;
+			}
+
+			// Check activation; -1 means Any Activation
+			if(Activation != 0) 
+			{
+				if(!General.Map.UDMF && (l.Activate != Activation || (Activation == -1 && l.Activate == 0)))
+					return false;
+			}
+
+			// Check flags
+			if(Flags.Count > 0) foreach(string s in Flags) if(!l.IsFlagSet(s)) return false;
+
+			// Check flags, which should be disabled
+			if(RestrictedFlags.Count > 0) foreach(string s in RestrictedFlags) if(l.IsFlagSet(s)) return false;
+
+			return true;
+		}
+
+		public bool IsValid()
+		{
+			return Action != 0 || Flags.Count > 0 || RestrictedFlags.Count > 0 || Activation != 0;
+		}
+
+		public override string ToString() 
+		{
+			return Name;
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/GZBuilder/Data/LinksCollector.cs b/Source/Core/GZBuilder/Data/LinksCollector.cs
new file mode 100644
index 0000000..beefbe8
--- /dev/null
+++ b/Source/Core/GZBuilder/Data/LinksCollector.cs
@@ -0,0 +1,397 @@
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.GZBuilder.Geometry;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.VisualModes;
+
+namespace CodeImp.DoomBuilder.GZBuilder.Data 
+{
+	public static class LinksCollector 
+	{
+		private class SpecialThings 
+		{
+			public readonly Dictionary<int, List<Thing>> PatrolPoints; // PatrolPoint tag, list of PatrolPoints
+			public readonly Dictionary<int, List<PathNode>> InterpolationPoints; // InterpolationPoint tag, list of InterpolationPoints
+			public readonly List<Thing> ThingsWithGoal;
+			public readonly List<Thing> Cameras;
+			public readonly Dictionary<int, List<Thing>> ActorMovers; // ActorMover target tag, list of ActorMovers
+			public readonly List<Thing> PathFollowers;
+			public readonly Dictionary<int, List<Thing>> PolyobjectAnchors; //angle, list of PolyobjectAnchors
+			public readonly Dictionary<int, List<Thing>> PolyobjectStartSpots; //angle, list of PolyobjectStartSpots
+
+			public SpecialThings()
+			{
+				PatrolPoints = new Dictionary<int, List<Thing>>();
+				InterpolationPoints = new Dictionary<int, List<PathNode>>();
+				ThingsWithGoal = new List<Thing>();
+				Cameras = new List<Thing>();
+				ActorMovers = new Dictionary<int, List<Thing>>();
+				PathFollowers = new List<Thing>();
+				PolyobjectAnchors = new Dictionary<int, List<Thing>>();
+				PolyobjectStartSpots = new Dictionary<int, List<Thing>>();
+			}
+		}
+
+		private class PathNode
+		{
+			private readonly Thing thing;
+			private readonly Vector3D position;
+			private readonly Dictionary<int, PathNode> nextnodes;
+			private readonly Dictionary<int, PathNode> prevnodes;
+
+			public Thing Thing { get { return thing; } }
+			public Dictionary<int, PathNode> NextNodes { get { return nextnodes; } } // Thing index, PathNode
+			public Dictionary<int, PathNode> PreviousNodes { get { return prevnodes; } } // Thing index, PathNode
+			public Vector3D Position { get { return position; } }
+			public bool IsCurved;
+
+			public PathNode(Thing t, VisualBlockMap blockmap)
+			{
+				thing = t;
+				position = new Vector3D(t.Position, (blockmap != null ? t.Position.z + GetCorrectHeight(t, blockmap) : t.Position.z));
+				nextnodes = new Dictionary<int, PathNode>();
+				prevnodes = new Dictionary<int, PathNode>();
+			}
+
+			internal void PropagateCurvedFlag()
+			{
+				if(!IsCurved) return;
+				foreach(PathNode node in nextnodes.Values)
+				{
+					if(node.IsCurved) continue;
+					node.IsCurved = true;
+					node.PropagateCurvedFlag();
+				}
+				foreach(PathNode node in prevnodes.Values)
+				{
+					if(node.IsCurved) continue;
+					node.IsCurved = true;
+					node.PropagateCurvedFlag();
+				}
+			}
+		}
+
+		public static List<Line3D> GetThingLinks(IEnumerable<Thing> things) { return GetThingLinks(things, null); }
+		public static List<Line3D> GetThingLinks(IEnumerable<Thing> things, VisualBlockMap blockmap) 
+		{
+			return GetThingLinks(GetSpecialThings(things, blockmap), blockmap);
+		}
+
+		private static SpecialThings GetSpecialThings(IEnumerable<Thing> things, VisualBlockMap blockmap) 
+		{
+			SpecialThings result = new SpecialThings();
+
+			// Process oh so special things
+			foreach(Thing t in things)
+			{
+				ThingTypeInfo info = General.Map.Data.GetThingInfoEx(t.Type);
+				if(info == null) continue;
+				switch(info.ClassName.ToLowerInvariant())
+				{
+					case "patrolpoint":
+						if(t.Tag != 0 || t.Args[0] != 0)
+						{
+							if(!result.PatrolPoints.ContainsKey(t.Tag)) result.PatrolPoints.Add(t.Tag, new List<Thing>());
+							result.PatrolPoints[t.Tag].Add(t);
+						}
+						break;
+
+					case "$polyanchor":
+						if(!result.PolyobjectAnchors.ContainsKey(t.AngleDoom)) result.PolyobjectAnchors[t.AngleDoom] = new List<Thing>();
+						result.PolyobjectAnchors[t.AngleDoom].Add(t);
+						break;
+
+					case "$polyspawn":
+					case "$polyspawncrush":
+					case "$polyspawnhurt":
+						if(!result.PolyobjectStartSpots.ContainsKey(t.AngleDoom)) result.PolyobjectStartSpots[t.AngleDoom] = new List<Thing>();
+						result.PolyobjectStartSpots[t.AngleDoom].Add(t);
+						break;
+				}
+
+				// Process Thing_SetGoal action
+				if(t.Action != 0 
+					&& General.Map.Config.LinedefActions.ContainsKey(t.Action) 
+					&& General.Map.Config.LinedefActions[t.Action].Id.ToLowerInvariant() == "thing_setgoal"
+					&& (t.Args[0] == 0 || t.Args[0] == t.Tag)
+					&& t.Args[1] != 0)
+				{
+					result.ThingsWithGoal.Add(t);
+				}
+			}
+
+			// We may need all of these actors...
+			foreach(Thing t in General.Map.ThingsFilter.VisibleThings)
+			{
+				ThingTypeInfo info = General.Map.Data.GetThingInfoEx(t.Type);
+				if(info == null) continue;
+				switch(info.ClassName.ToLowerInvariant())
+				{
+					case "interpolationpoint":
+						if(!result.InterpolationPoints.ContainsKey(t.Tag)) result.InterpolationPoints.Add(t.Tag, new List<PathNode>());
+						result.InterpolationPoints[t.Tag].Add(new PathNode(t, blockmap));
+						break;
+
+					case "movingcamera":
+						if(t.Args[0] != 0 || t.Args[1] != 0) result.Cameras.Add(t);
+						break;
+
+					case "pathfollower":
+						if(t.Args[0] != 0 || t.Args[1] != 0) result.PathFollowers.Add(t);
+						break;
+
+					case "actormover":
+						if((t.Args[0] != 0 || t.Args[1] != 0) && t.Args[3] != 0)
+						{
+							if(!result.ActorMovers.ContainsKey(t.Args[3])) result.ActorMovers.Add(t.Args[3], new List<Thing>());
+							result.ActorMovers[t.Args[3]].Add(t);
+						}
+						break;
+				}
+			}
+
+			return result;
+		}
+
+		private static List<Line3D> GetThingLinks(SpecialThings result, VisualBlockMap blockmap) 
+		{
+			var lines = new List<Line3D>();
+			var actormovertargets = new Dictionary<int, List<Thing>>();
+
+			// Get ActorMover targets
+			if(result.ActorMovers.Count > 0)
+			{
+				foreach(Thing t in General.Map.Map.Things) 
+				{
+					if(t.Tag == 0 || !result.ActorMovers.ContainsKey(t.Tag)) continue;
+					if(!actormovertargets.ContainsKey(t.Tag)) actormovertargets[t.Tag] = new List<Thing>();
+					actormovertargets[t.Tag].Add(t);
+				}
+			}
+
+			Vector3D start, end;
+
+			// Process patrol points
+			foreach(KeyValuePair<int, List<Thing>> group in result.PatrolPoints) 
+			{
+				foreach(Thing t in group.Value) 
+				{
+					if(!result.PatrolPoints.ContainsKey(t.Args[0])) continue;
+					
+					start = t.Position;
+					start.z += GetCorrectHeight(t, blockmap);
+
+					foreach(Thing tt in result.PatrolPoints[t.Args[0]])
+					{
+						end = tt.Position;
+						end.z += GetCorrectHeight(tt, blockmap);
+						lines.Add(new Line3D(start, end));
+					}
+				}
+			}
+
+			// Process things with Thing_SetGoal
+			foreach(Thing t in result.ThingsWithGoal) 
+			{
+				if(!result.PatrolPoints.ContainsKey(t.Args[1])) continue;
+
+				start = t.Position;
+				start.z += GetCorrectHeight(t, blockmap);
+
+				foreach(Thing tt in result.PatrolPoints[t.Args[1]]) 
+				{
+					end = tt.Position;
+					end.z += GetCorrectHeight(tt, blockmap);
+
+					lines.Add(new Line3D(start, end, General.Colors.Selection));
+				}
+			}
+
+			// Process cameras [CAN USE INTERPOLATION]
+			foreach(Thing t in result.Cameras)
+			{
+				int targettag = t.Args[0] + (t.Args[1] << 8);
+				if(targettag == 0 || !result.InterpolationPoints.ContainsKey(targettag)) continue; //no target / target desn't exist
+				bool interpolatepath = ((t.Args[2] & 1) != 1);
+
+				start = t.Position;
+				start.z += GetCorrectHeight(t, blockmap);
+
+				foreach(PathNode node in result.InterpolationPoints[targettag]) 
+				{
+					node.IsCurved = interpolatepath;
+					lines.Add(new Line3D(start, node.Position, General.Colors.Selection));
+				}
+			}
+
+			//process actor movers [CAN USE INTERPOLATION]
+			foreach(List<Thing> things in result.ActorMovers.Values) 
+			{
+				foreach(Thing t in things)
+				{
+					int targettag = t.Args[0] + (t.Args[1] << 8);
+
+					// Add interpolation point targets
+					if(targettag != 0 && result.InterpolationPoints.ContainsKey(targettag))
+					{
+						bool interpolatepath = ((t.Args[2] & 1) != 1);
+						start = t.Position;
+						start.z += GetCorrectHeight(t, blockmap);
+
+						foreach(PathNode node in result.InterpolationPoints[targettag])
+						{
+							node.IsCurved = interpolatepath;
+							lines.Add(new Line3D(start, node.Position, General.Colors.Selection));
+						}
+					}
+
+					// Add thing-to-move targets
+					if(actormovertargets.ContainsKey(t.Args[3]))
+					{
+						start = t.Position;
+						start.z += GetCorrectHeight(t, blockmap);
+
+						foreach(Thing tt in actormovertargets[t.Args[3]])
+						{
+							end = tt.Position;
+							end.z += GetCorrectHeight(tt, blockmap);
+							lines.Add(new Line3D(start, end, General.Colors.Selection));
+						}
+					}
+				}
+			}
+
+			// Process path followers [CAN USE INTERPOLATION]
+			foreach(Thing t in result.PathFollowers)
+			{
+				int targettag = t.Args[0] + (t.Args[1] << 8);
+				if(targettag == 0 || !result.InterpolationPoints.ContainsKey(targettag)) continue; //no target / target desn't exist
+				bool interpolatepath = (t.Args[2] & 1) != 1;
+
+				start = t.Position;
+				start.z += GetCorrectHeight(t, blockmap);
+
+				foreach(PathNode node in result.InterpolationPoints[targettag])
+				{
+					node.IsCurved = interpolatepath;
+					lines.Add(new Line3D(start, node.Position, General.Colors.Selection));
+				}
+			}
+
+			// Process polyobjects
+			foreach(KeyValuePair<int, List<Thing>> group in result.PolyobjectAnchors)
+			{
+				if(!result.PolyobjectStartSpots.ContainsKey(group.Key)) continue;
+				foreach(Thing anchor in group.Value)
+				{
+					start = anchor.Position;
+					start.z += GetCorrectHeight(anchor, blockmap);
+
+					foreach(Thing startspot in result.PolyobjectStartSpots[group.Key]) 
+					{
+						end = startspot.Position;
+						end.z += GetCorrectHeight(startspot, blockmap);
+						lines.Add(new Line3D(start, end, General.Colors.Selection));
+					}
+				}
+			}
+
+			// Process interpolation points [CAN BE INTERPOLATED]
+			// 1. Connect PathNodes
+			foreach(KeyValuePair<int, List<PathNode>> group in result.InterpolationPoints)
+			{
+				foreach(PathNode node in group.Value)
+				{
+					int targettag = node.Thing.Args[3] + (node.Thing.Args[4] << 8);
+					if(targettag == 0 || !result.InterpolationPoints.ContainsKey(targettag)) continue;
+
+					foreach(PathNode targetnode in result.InterpolationPoints[targettag])
+					{
+						// Connect both ways
+						if(!node.NextNodes.ContainsKey(targetnode.Thing.Index)) node.NextNodes.Add(targetnode.Thing.Index, targetnode);
+						if(!targetnode.PreviousNodes.ContainsKey(node.Thing.Index)) targetnode.PreviousNodes.Add(node.Thing.Index, node);
+					}
+				}
+			}
+
+			// 2. Propagate IsCurved flag
+			foreach(KeyValuePair<int, List<PathNode>> group in result.InterpolationPoints)
+			{
+				foreach(PathNode node in group.Value) node.PropagateCurvedFlag();
+			}
+
+			// 3. Make lines
+			HashSet<int> processedindices = new HashSet<int>();
+			foreach(KeyValuePair<int, List<PathNode>> group in result.InterpolationPoints)
+			{
+				foreach(PathNode node in group.Value)
+				{
+					// Draw as a curve?
+					if(node.IsCurved && !processedindices.Contains(node.Thing.Index) && node.NextNodes.Count > 0 && node.PreviousNodes.Count > 0)
+					{
+						PathNode prev = General.GetByIndex(node.PreviousNodes, 0).Value;
+						PathNode next = General.GetByIndex(node.NextNodes, 0).Value;
+						if(next.NextNodes.Count > 0)
+						{
+							PathNode nextnext = General.GetByIndex(next.NextNodes, 0).Value;
+								
+								// Generate curve points
+								List<Vector3D> points = new List<Vector3D>(11);
+								for(int i = 0; i < 11; i++)
+								{
+									float u = i * 0.1f;
+									points.Add(new Vector3D(
+										SplineLerp(u, prev.Position.x, node.Position.x, next.Position.x, nextnext.Position.x),
+										SplineLerp(u, prev.Position.y, node.Position.y, next.Position.y, nextnext.Position.y),
+										(blockmap == null ? 0 : SplineLerp(u, prev.Position.z, node.Position.z, next.Position.z, nextnext.Position.z))
+									));
+								}
+
+								// Add line segments
+								for(int i = 1; i < 11; i++)
+								{
+									lines.Add(new Line3D(points[i - 1], points[i], i == 10));
+								}
+
+								continue;
+						}
+					}
+
+					// Draw regular lines
+					bool startnode = (node.IsCurved && node.PreviousNodes.Count == 0); // When using curves, this node won't be used by camera (the last node won't be used as well), so draw them using different color
+					foreach(PathNode targetnode in node.NextNodes.Values)
+					{
+						bool isskipped = (startnode || (targetnode.IsCurved && targetnode.NextNodes.Count == 0));
+						lines.Add(new Line3D(node.Position, targetnode.Position, (isskipped ? General.Colors.Highlight : General.Colors.InfoLine), !isskipped));
+					}
+				}
+			}
+
+			return lines;
+		}
+
+		// Taken from Xabis' "curved interpolation points paths" patch.
+		private static float SplineLerp(float u, float p1, float p2, float p3, float p4)
+		{
+			float t2 = u;
+			float res = 2 * p2;
+			res += (p3 - p1) * u;
+			t2 *= u;
+			res += (2 * p1 - 5 * p2 + 4 * p3 - p4) * t2;
+			t2 *= u;
+			res += (3 * p2 - 3 * p3 + p4 - p1) * t2;
+			return 0.5f * res;
+		}
+
+		// Required only when called from VisualMode
+		private static float GetCorrectHeight(Thing thing, VisualBlockMap blockmap)
+		{
+			if(blockmap == null) return 0f;
+			float height = thing.Height / 2f;
+			if(thing.Sector == null) thing.DetermineSector(blockmap);
+			if(thing.Sector != null) height += thing.Sector.FloorHeight;
+			return height;
+		}
+	}
+}
diff --git a/Source/Core/GZBuilder/Data/MapInfo.cs b/Source/Core/GZBuilder/Data/MapInfo.cs
new file mode 100644
index 0000000..a204492
--- /dev/null
+++ b/Source/Core/GZBuilder/Data/MapInfo.cs
@@ -0,0 +1,30 @@
+using SlimDX;
+
+namespace CodeImp.DoomBuilder.GZBuilder.Data 
+{
+	public sealed class MapInfo 
+	{
+		public string Sky1;
+		public float Sky1ScrollSpeed;
+		public string Sky2;
+		public float Sky2ScrollSpeed;
+		public bool DoubleSky;
+		public bool HasFadeColor;
+		public Color4 FadeColor;
+		public bool HasOutsideFogColor;
+		public Color4 OutsideFogColor;
+		public int FogDensity;
+		public int OutsideFogDensity;
+
+		public bool EvenLighting;
+		public bool SmoothLighting;
+		public int VertWallShade;
+		public int HorizWallShade;
+
+		public MapInfo() 
+		{
+			VertWallShade = 16;
+			HorizWallShade = -16;
+		}
+	}
+}
diff --git a/Source/Core/GZBuilder/Data/ModelData.cs b/Source/Core/GZBuilder/Data/ModelData.cs
new file mode 100644
index 0000000..4df9e4a
--- /dev/null
+++ b/Source/Core/GZBuilder/Data/ModelData.cs
@@ -0,0 +1,104 @@
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.GZBuilder.MD3;
+using CodeImp.DoomBuilder.Rendering;
+using SlimDX;
+using SlimDX.Direct3D9;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.GZBuilder.Data
+{
+	internal sealed class ModelData
+	{
+		#region ================== Constants
+
+		public static readonly string[] SUPPORTED_TEXTURE_EXTENSIONS = { ".jpg", ".tga", ".png", ".dds", ".pcx" };
+
+		#endregion
+
+		#region ================== Variables
+
+		private ModelLoadState loadstate;
+		private Vector3 scale;
+		private Matrix transform;
+		private Matrix transformstretched;
+
+		#endregion
+
+		#region ================== Properties
+
+		internal List<string> ModelNames;
+		internal List<string> TextureNames;
+		internal List<string> FrameNames;
+		internal List<int> FrameIndices;
+
+		internal GZModel Model;
+
+		internal Vector3 Scale { get { return scale; } }
+		internal Matrix Transform { get { return (General.Settings.GZStretchView ? transformstretched : transform); } }
+		internal bool OverridePalette; //used for voxel models only 
+		internal bool InheritActorPitch;
+		internal bool InheritActorRoll;
+
+		internal bool IsVoxel;
+
+		// Hashing
+		private static int hashcounter;
+		private readonly int hashcode;
+
+		// Disposing
+		private bool isdisposed;
+
+		public ModelLoadState LoadState { get { return loadstate; } internal set { loadstate = value; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		internal ModelData() 
+		{
+			ModelNames = new List<string>();
+			TextureNames = new List<string>();
+			FrameNames = new List<string>();
+			FrameIndices = new List<int>();
+			transform = Matrix.Identity;
+			transformstretched = Matrix.Identity;
+			hashcode = hashcounter++;
+		}
+
+		internal void Dispose() 
+		{
+			// Not already disposed?
+			if(!isdisposed) 
+			{
+				// Clean up
+				if(Model != null)
+				{
+					foreach(Mesh mesh in Model.Meshes) mesh.Dispose();
+					foreach(Texture t in Model.Textures) t.Dispose();
+					loadstate = ModelLoadState.None;
+				}
+
+				// Done
+				isdisposed = true;
+			}
+		}
+
+		internal void SetTransform(Matrix rotation, Matrix offset, Vector3 scale)
+		{
+			this.scale = scale;
+			this.transform = rotation * Matrix.Scaling(scale) * offset;
+			this.transformstretched = rotation * Matrix.Scaling(scale.X, scale.Y, scale.Z * Renderer3D.GZDOOM_INVERTED_VERTICAL_VIEW_STRETCH) * offset;
+		}
+
+		//mxd. This greatly speeds up Dictionary lookups
+		public override int GetHashCode()
+		{
+			return hashcode;
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/GZBuilder/Data/ModelLoadState.cs b/Source/Core/GZBuilder/Data/ModelLoadState.cs
new file mode 100644
index 0000000..c0628bf
--- /dev/null
+++ b/Source/Core/GZBuilder/Data/ModelLoadState.cs
@@ -0,0 +1,9 @@
+namespace CodeImp.DoomBuilder.GZBuilder.Data
+{
+	public enum ModelLoadState
+	{
+		None,
+		Loading,
+		Ready
+	}
+}
diff --git a/Source/Core/GZBuilder/Data/ScriptItem.cs b/Source/Core/GZBuilder/Data/ScriptItem.cs
new file mode 100644
index 0000000..d68a32b
--- /dev/null
+++ b/Source/Core/GZBuilder/Data/ScriptItem.cs
@@ -0,0 +1,120 @@
+using System;
+using System.Collections.Generic;
+
+namespace CodeImp.DoomBuilder.GZBuilder.Data 
+{
+	internal sealed class ScriptItem : Object 
+	{
+		private readonly string name;
+		private readonly List<string> argnames;
+		private readonly int index;
+		private readonly int cursorposition;
+		private readonly bool isinclude;
+		private readonly bool customname;
+
+		internal string Name { get { return name; } }
+		internal int Index { get { return index; } }
+		internal int CursorPosition { get { return cursorposition; } }
+		internal bool IsInclude { get { return isinclude; } }
+		internal bool HasCustomName { get { return customname; } }
+
+		// Constructor for misc usage
+		internal ScriptItem(string name, int cursorposition, bool isinclude)
+		{
+			this.name = name;
+			this.argnames = new List<string>();
+			this.index = int.MinValue;
+			this.cursorposition = cursorposition;
+			this.isinclude = isinclude;
+			this.customname = true;
+		}
+
+		// Constructor for numbered script
+		internal ScriptItem(int index, string name, List<string> argnames, int cursorposition, bool isinclude, bool customname)
+		{
+			this.name = name;
+			this.argnames = argnames;
+			this.index = index;
+			this.cursorposition = cursorposition;
+			this.isinclude = isinclude;
+			this.customname = customname;
+		}
+
+		// Constructor for named script
+		internal ScriptItem(string name, List<string> argnames, int cursorposition, bool isinclude)
+		{
+			this.name = name;
+			this.argnames = argnames;
+			this.index = int.MinValue;
+			this.cursorposition = cursorposition;
+			this.isinclude = isinclude;
+			this.customname = true;
+		}
+
+		internal static int SortByIndex(ScriptItem i1, ScriptItem i2) 
+		{
+			if(i1.isinclude && !i2.isinclude) return 1;
+			if(!i1.isinclude && i2.isinclude) return -1;
+			if(i1.Index > i2.Index) return 1;
+			if(i1.Index == i2.Index) return 0;
+			return -1;
+		}
+
+		internal static int SortByName(ScriptItem i1, ScriptItem i2)
+		{
+			if(i1.isinclude && !i2.isinclude) return 1;
+			if(!i1.isinclude && i2.isinclude) return -1;
+			
+			if(i1.Name == i2.Name) return 0;
+			if(i1.Name.ToUpper()[0] > i2.Name.ToUpper()[0]) return 1;
+			if(i1.Name.ToUpper()[0] == i2.Name.ToUpper()[0]) 
+			{
+				int len = Math.Min(i1.Name.Length, i2.Name.Length);
+				for(int i = 0; i < len; i++) 
+				{
+					if(i1.Name.ToUpper()[i] > i2.Name.ToUpper()[i]) return 1;
+					if(i1.Name.ToUpper()[i] < i2.Name.ToUpper()[i]) return -1;
+				}
+				if(i1.Name.Length > i2.Name.Length) return 1;
+				return -1;
+			} 
+			return -1;
+		}
+
+		// God awful, but will do...
+		internal string[] GetArgumentsDescriptions(int action)
+		{
+			string[] result = new[] { index == int.MinValue ? "Script Name" : "Script Number", string.Empty, string.Empty, string.Empty, string.Empty };
+			switch(action)
+			{
+				case 80:        //ACS_Execute (script, map, s_arg1, s_arg2, s_arg3)
+				case 226: //ACS_ExecuteAlways (script, map, s_arg1, s_arg2, s_arg3)
+					argnames.CopyTo(0, result, 2, argnames.Count < 3 ? argnames.Count : 3);
+					break;
+
+				case 83:     //ACS_LockedExecute (script, map, s_arg1, s_arg2, lock)
+				case 85: //ACS_LockedExecuteDoor (script, map, s_arg1, s_arg2, lock)
+					argnames.CopyTo(0, result, 2, argnames.Count < 2 ? argnames.Count : 2);
+					break;
+
+				case 84: //ACS_ExecuteWithResult (script, s_arg1, s_arg2, s_arg3, s_arg4)
+					argnames.CopyTo(0, result, 1, argnames.Count < 4 ? argnames.Count : 4);
+					break;
+
+				case 81:   //ACS_Suspend (script, map)
+				case 82: //ACS_Terminate (script, map)
+					return result;
+
+				default:
+					return new[] { string.Empty, string.Empty, string.Empty, string.Empty, string.Empty };
+			}
+
+			return result;
+		}
+
+		public override string ToString() 
+		{
+			return name;
+		}
+	}
+}
diff --git a/Source/Core/GZBuilder/Data/SharpCompressHelper.cs b/Source/Core/GZBuilder/Data/SharpCompressHelper.cs
new file mode 100644
index 0000000..9bf0423
--- /dev/null
+++ b/Source/Core/GZBuilder/Data/SharpCompressHelper.cs
@@ -0,0 +1,38 @@
+using System.IO;
+using SharpCompress.Compressor;
+using SharpCompress.Compressor.BZip2;
+
+namespace CodeImp.DoomBuilder.GZBuilder.Data
+{
+	internal static class SharpCompressHelper
+	{
+		internal static MemoryStream CompressStream(Stream stream) 
+		{
+			byte[] arr = new byte[stream.Length];
+			stream.Read(arr, 0, (int)stream.Length);
+
+			MemoryStream ms = new MemoryStream();
+			BZip2Stream bzip = new BZip2Stream(ms, CompressionMode.Compress, true, false);
+
+			bzip.Write(arr, 0, arr.Length);
+			bzip.Close();
+
+			return ms;
+		}
+
+		internal static MemoryStream DecompressStream(Stream stream) 
+		{
+			stream.Seek(0, SeekOrigin.Begin);
+			BZip2Stream bzip = new BZip2Stream(stream, CompressionMode.Decompress, false, false);
+
+			byte[] buffer = new byte[16 * 1024];
+			MemoryStream ms = new MemoryStream();
+
+			int read;
+			while((read = bzip.Read(buffer, 0, buffer.Length)) > 0)
+				ms.Write(buffer, 0, read);
+
+			return ms;
+		}
+	}
+}
diff --git a/Source/Core/GZBuilder/Data/ThingCopyData.cs b/Source/Core/GZBuilder/Data/ThingCopyData.cs
new file mode 100644
index 0000000..33d1883
--- /dev/null
+++ b/Source/Core/GZBuilder/Data/ThingCopyData.cs
@@ -0,0 +1,59 @@
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Geometry;
+
+namespace CodeImp.DoomBuilder.GZBuilder.Data 
+{
+	public sealed class ThingCopyData 
+	{
+		// Properties
+		private readonly int type;
+		private readonly Vector3D pos;
+		private readonly int angledoom;	// Angle as entered / stored in file
+		private readonly Dictionary<string, bool> flags;
+		private readonly int tag;
+		private readonly int action;
+		private readonly int[] args;
+		private readonly UniFields fields;
+
+		public Vector3D Position { get { return pos; } }
+		
+		public ThingCopyData(Thing t) 
+		{
+			type = t.Type;
+			angledoom = t.AngleDoom;
+			pos = t.Position;
+			flags = new Dictionary<string, bool>(t.Flags);
+			tag = t.Tag;
+			action = t.Action;
+			args = (int[])t.Args.Clone();
+			fields = new UniFields(t, t.Fields);
+		}
+
+		public void ApplyTo(Thing t) 
+		{
+			t.Type = type;
+			t.Rotate(angledoom);
+			t.Move(pos);
+
+			foreach(KeyValuePair<string, bool> group in flags)
+				t.SetFlag(group.Key, group.Value);
+
+			t.Tag = tag;
+			t.Action = action;
+
+			for(int i = 0; i < args.Length; i++) 
+				t.Args[i] = args[i];
+
+			foreach(KeyValuePair<string, UniValue> group in fields) 
+			{
+				if(t.Fields.ContainsKey(group.Key))
+					t.Fields[group.Key] = group.Value;
+				else
+					t.Fields.Add(group.Key, group.Value);
+			}
+
+			t.UpdateConfiguration();
+		}
+	}
+}
diff --git a/Source/Core/GZBuilder/GZDoom/AcsParserSE.cs b/Source/Core/GZBuilder/GZDoom/AcsParserSE.cs
new file mode 100644
index 0000000..4f0ceb4
--- /dev/null
+++ b/Source/Core/GZBuilder/GZDoom/AcsParserSE.cs
@@ -0,0 +1,348 @@
+using System;
+using System.IO;
+using System.Collections.Generic;
+using System.Globalization;
+using CodeImp.DoomBuilder.ZDoom;
+using CodeImp.DoomBuilder.GZBuilder.Data;
+
+//mxd. ACS parser used to create ScriptItems for use in script editor's navigator
+namespace CodeImp.DoomBuilder.GZBuilder.GZDoom
+{
+	internal sealed class AcsParserSE : ZDTextParser
+	{
+		internal delegate void IncludeDelegate(AcsParserSE parser, string includefile, IncludeType includetype);
+		internal IncludeDelegate OnInclude;
+
+		private readonly HashSet<string> parsedlumps;
+		private readonly HashSet<string> includes;
+		private HashSet<string> includestoskip;
+		private string libraryname;
+
+		private readonly List<ScriptItem> namedscripts;
+		private readonly List<ScriptItem> numberedscripts;
+		private readonly List<ScriptItem> functions;
+
+		internal List<ScriptItem> NamedScripts { get { return namedscripts; } }
+		internal List<ScriptItem> NumberedScripts { get { return numberedscripts; } }
+		internal List<ScriptItem> Functions { get { return functions; } }
+		internal HashSet<string> Includes { get { return includes; } }
+		internal bool IsLibrary { get { return !string.IsNullOrEmpty(libraryname); } }
+		internal string LibraryName { get { return libraryname; } }
+
+		internal bool AddArgumentsToScriptNames;
+		internal bool IsMapScriptsLump;
+
+		internal enum IncludeType
+		{
+			NONE,
+			INCLUDE,
+			LIBRARY
+		}
+
+		internal AcsParserSE() 
+		{
+			namedscripts = new List<ScriptItem>();
+			numberedscripts = new List<ScriptItem>();
+			functions = new List<ScriptItem>();
+			parsedlumps = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+			includes = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+			includestoskip = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+			specialtokens += "(,)";
+		}
+
+		public override bool Parse(Stream stream, string sourcefilename, bool clearerrors) 
+		{
+			return Parse(stream, sourcefilename, new HashSet<string>(), false, IncludeType.NONE, clearerrors);
+		}
+
+		public bool Parse(Stream stream, string sourcefilename, bool processincludes, IncludeType includetype, bool clearerrors)
+		{
+			return Parse(stream, sourcefilename, includestoskip, processincludes, includetype, clearerrors);
+		}
+
+		public bool Parse(Stream stream, string sourcefilename, HashSet<string> configincludes, bool processincludes, IncludeType includetype, bool clearerrors) 
+		{
+			string source = sourcefilename.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
+
+			// Duplicate checks
+			if(parsedlumps.Contains(source))
+			{
+				ReportError("Already parsed '" + source + "'. Check your #include directives");
+				return false;
+			}
+			
+			parsedlumps.Add(source);
+			includestoskip = configincludes;
+			int bracelevel = 0;
+
+			if(!base.Parse(stream, sourcefilename, clearerrors)) return false;
+
+			// Keep local data
+			Stream localstream = datastream;
+			string localsourcename = sourcename;
+			BinaryReader localreader = datareader;
+
+			// Continue until at the end of the stream
+			while(SkipWhitespace(true)) 
+			{
+				string token = ReadToken();
+				if(string.IsNullOrEmpty(token)) continue;
+
+				// Ignore inner scope stuff
+				if(token == "{") { bracelevel++; continue; }
+				if(token == "}") { bracelevel--; continue; }
+				if(bracelevel > 0) continue;
+
+				switch(token.ToLowerInvariant())
+				{
+					case "script":
+					{
+						SkipWhitespace(true);
+						int startpos = (int)stream.Position;
+						token = ReadToken();
+
+						//is it named script?
+						if(token.IndexOf('"') != -1) 
+						{
+							startpos += 1;
+							string scriptname = StripTokenQuotes(token);
+
+							// Try to parse argument names
+							List<KeyValuePair<string, string>> args = ParseArgs();
+							List<string> argnames = new List<string>();
+							foreach(KeyValuePair<string, string> group in args) argnames.Add(group.Value);
+
+							// Make full name
+							if(AddArgumentsToScriptNames) scriptname += " " + GetArgumentNames(args);
+
+							// Add to collection
+							namedscripts.Add(new ScriptItem(scriptname, argnames, startpos, includetype != IncludeType.NONE));
+						} 
+						else //should be numbered script
+						{ 
+							int n;
+							if(int.TryParse(token, NumberStyles.Integer, CultureInfo.InvariantCulture, out n)) 
+							{
+								// Try to parse argument names
+								List<KeyValuePair<string, string>> args = ParseArgs();
+								
+								// Now find the opening brace
+								do 
+								{
+									if(!SkipWhitespace(true)) break;
+									token = ReadToken();
+								} while(!string.IsNullOrEmpty(token) && token != "{");
+
+								token = ReadLine();
+								string name = "";
+								bracelevel = 1;
+
+								if(!string.IsNullOrEmpty(token))
+								{
+									int commentstart = token.IndexOf("//", System.StringComparison.Ordinal);
+									if(commentstart != -1) //found comment
+									{ 
+										commentstart += 2;
+										name = token.Substring(commentstart, token.Length - commentstart).Trim();
+									}
+								}
+
+								bool customname = (name.Length > 0);
+								name = (customname ? name + " [Script " + n + "]" : "Script " + n);
+								
+								List<string> argnames = new List<string>();
+								foreach(KeyValuePair<string, string> group in args) argnames.Add(group.Value);
+
+								// Make full name
+								if(AddArgumentsToScriptNames) name += " " + GetArgumentNames(args);
+
+								// Add to collection
+								numberedscripts.Add(new ScriptItem(n, name, argnames, startpos, includetype != IncludeType.NONE, customname));
+							}
+						}
+					}
+					break;
+
+					case "function":
+					{
+						SkipWhitespace(true);
+						int startpos = (int)stream.Position;
+						string funcname = ReadToken(); //read return type
+						SkipWhitespace(true);
+						funcname += " " + ReadToken(); //read function name
+
+						// Try to parse argument names
+						List<KeyValuePair<string, string>> args = ParseArgs();
+						List<string> argnames = new List<string>();
+						foreach(KeyValuePair<string, string> group in args) argnames.Add(group.Value);
+
+						// Make full name
+						if(AddArgumentsToScriptNames) funcname += GetArgumentNames(args);
+
+						// Add to collection
+						functions.Add(new ScriptItem(funcname, argnames, startpos, includetype != IncludeType.NONE));
+					}
+					break;
+
+					case "#library":
+						if(IsMapScriptsLump)
+						{
+							ReportError("SCRIPTS lump can not be compiled as a library");
+							return false;
+						}
+						
+						SkipWhitespace(true);
+						string libname = ReadToken(false); // Don't skip newline
+
+						if(!libname.StartsWith("\"") || !libname.EndsWith("\""))
+						{
+							ReportError("#library name should be quoted");
+							return false;
+						}
+
+						libname = StripTokenQuotes(libname);
+
+						if(string.IsNullOrEmpty(libname))
+						{
+							ReportError("Expected library name");
+							return false;
+						}
+
+						// Store only when the script compiling was executed for is library
+						if(includetype == IncludeType.NONE)
+						{
+							libraryname = libname;
+							includetype = IncludeType.LIBRARY;
+						}
+
+						break;
+
+					default:
+						if(processincludes && (token == "#include" || token == "#import")) 
+						{
+							//INFO: ZDoom ACC include paths can be absolute ("d:\stuff\coollib.acs"), relative ("../coollib.acs") 
+							//and can use forward and backward slashes ("acs\map01/script.acs")
+							//also include paths must be quoted
+							//long filenames are supported
+							bool islibrary = (token == "#import" || includetype == IncludeType.LIBRARY);
+							SkipWhitespace(true);
+							string includelump = ReadToken(false); // Don't skip newline
+
+							if(!includelump.StartsWith("\"") || !includelump.EndsWith("\""))
+							{
+								ReportError(token + " filename should be quoted");
+								return false;
+							}
+
+							includelump = StripTokenQuotes(includelump);
+
+							if(string.IsNullOrEmpty(includelump))
+							{
+								ReportError("Expected file name to " + token);
+								return false;
+							}
+
+							includelump = includelump.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
+
+							// Compiler files?
+							if(includestoskip.Contains(includelump)) continue;
+
+							// Convert to a path we can use
+							string includelumppath = GetRootedPath(source, includelump);
+
+							// Rooting succeeded?
+							if(HasError || string.IsNullOrEmpty(includelumppath)) return false;
+
+							// Already parsed?
+							if(includes.Contains(includelumppath))
+							{
+								//INFO: files included or imported inside a library are not visible to the code outside it 
+								//and must be included/imported separately
+								if(!islibrary)
+								{
+									ReportError("Already parsed '" + includelump + "'. Check your " + token + " directives");
+									return false;
+								}
+							}
+							else
+							{
+								// Add to collections
+								includes.Add(includelumppath);
+
+								// Callback to parse this file
+								if(OnInclude != null)
+								{
+									OnInclude(this, includelumppath, islibrary ? IncludeType.LIBRARY : IncludeType.INCLUDE);
+								}
+
+								// Bail out on error
+								if(this.HasError) return false;
+
+								// Set our buffers back to continue parsing
+								datastream = localstream;
+								datareader = localreader;
+								sourcename = localsourcename;
+							}
+						}
+						break;
+				}
+			}
+			return true;
+		}
+
+		private List<KeyValuePair<string, string>> ParseArgs() //type, name
+		{
+			List<KeyValuePair<string, string>> argnames = new List<KeyValuePair<string, string>>();
+			SkipWhitespace(true);
+			string token = ReadToken();
+			
+			// Should be ENTER/OPEN etc. script type
+			if(token != "(")
+			{
+				argnames.Add(new KeyValuePair<string, string>(token.ToUpperInvariant(), string.Empty));
+				return argnames;
+			}
+
+			while(SkipWhitespace(true))
+			{
+				string argtype = ReadToken(); // should be type
+				if(IsSpecialToken(argtype)) break;
+				if(argtype.ToUpperInvariant() == "VOID")
+				{
+					argnames.Add(new KeyValuePair<string, string>("void", string.Empty));
+					break;
+				}
+
+				SkipWhitespace(true);
+				token = ReadToken(); // should be arg name
+				argnames.Add(new KeyValuePair<string, string>(argtype, token));
+
+				SkipWhitespace(true);
+				token = ReadToken(); // should be comma or ")"
+				if(token != ",") break;
+			}
+
+			return argnames;
+		}
+
+		private static string GetArgumentNames(List<KeyValuePair<string, string>> args)
+		{
+			// Make full name
+			if(args.Count > 0)
+			{
+				List<string> argdescs = new List<string>(args.Count);
+				foreach(KeyValuePair<string, string> group in args)
+					argdescs.Add((group.Key + " " + group.Value).TrimEnd());
+
+				return "(" + string.Join(", ", argdescs.ToArray()) + ")";
+			}
+
+			return "(void)";
+		}
+
+		protected override string GetLanguageType()
+		{
+			return "ACS";
+		}
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/GZBuilder/GZDoom/DecorateParserSE.cs b/Source/Core/GZBuilder/GZDoom/DecorateParserSE.cs
new file mode 100644
index 0000000..1d6ec34
--- /dev/null
+++ b/Source/Core/GZBuilder/GZDoom/DecorateParserSE.cs
@@ -0,0 +1,56 @@
+using System.IO;
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.ZDoom;
+using CodeImp.DoomBuilder.GZBuilder.Data;
+
+//mxd. Decorate parser used to create ScriptItems for use in script editor's navigator
+//Should be able to parse actor definitions even from invalid DECORATE and should never fail parsing
+namespace CodeImp.DoomBuilder.GZBuilder.GZDoom
+{
+	internal sealed class DecorateParserSE : ZDTextParser
+	{
+		private readonly List<ScriptItem> actors;
+		public List<ScriptItem> Actors { get { return actors; } }
+
+		public DecorateParserSE() 
+		{
+			actors = new List<ScriptItem>();
+		}
+
+		public override bool Parse(Stream stream, string sourcefilename, bool clearerrors) 
+		{
+			if(!base.Parse(stream, sourcefilename, clearerrors)) return false;
+
+			// Continue until at the end of the stream
+			while(SkipWhitespace(true)) 
+			{
+				string token = ReadToken();
+				if(string.IsNullOrEmpty(token) || token.ToUpperInvariant() != "ACTOR") continue;
+
+				SkipWhitespace(true);
+				int startpos = (int)stream.Position;
+
+				List<string> definition = new List<string>();
+
+				do
+				{
+					token = ReadToken(false); // Don't skip newline
+					if(string.IsNullOrEmpty(token) || token == "{" || token == "}") break;
+					definition.Add(token);
+				} while(SkipWhitespace(false)); // Don't skip newline
+
+				string name = string.Join(" ", definition.ToArray());
+				if(!string.IsNullOrEmpty(name)) actors.Add(new ScriptItem(name, startpos, false));
+			}
+
+			// Sort nodes
+			actors.Sort(ScriptItem.SortByName);
+			return true;
+		}
+
+		protected override string GetLanguageType()
+		{
+			return "DECORATE";
+		}
+	}
+}
diff --git a/Source/Core/GZBuilder/GZDoom/GldefsParser.cs b/Source/Core/GZBuilder/GZDoom/GldefsParser.cs
new file mode 100644
index 0000000..940918e
--- /dev/null
+++ b/Source/Core/GZBuilder/GZDoom/GldefsParser.cs
@@ -0,0 +1,753 @@
+#region ================== Namespaces
+
+using System;
+using System.Drawing;
+using System.IO;
+using System.Collections.Generic;
+using System.Globalization;
+using CodeImp.DoomBuilder.ZDoom;
+using CodeImp.DoomBuilder.GZBuilder.Data;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.IO;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.GZBuilder.GZDoom
+{
+	internal sealed class GldefsParser : ZDTextParser
+	{
+		#region ================== Constants
+
+		private const int DEFAULT_GLOW_HEIGHT = 64;
+
+		#endregion
+
+		#region ================== Structs
+
+		private struct GldefsLightType
+		{
+			public const string POINT = "pointlight";
+			public const string PULSE = "pulselight";
+			public const string FLICKER = "flickerlight";
+			public const string FLICKER2 = "flickerlight2";
+			public const string SECTOR = "sectorlight";
+
+			public static readonly Dictionary<string, DynamicLightType> GLDEFS_TO_GZDOOM_LIGHT_TYPE = new Dictionary<string, DynamicLightType>(StringComparer.Ordinal) { { POINT, DynamicLightType.NORMAL }, { PULSE, DynamicLightType.PULSE }, { FLICKER, DynamicLightType.FLICKER }, { FLICKER2, DynamicLightType.RANDOM }, { SECTOR, DynamicLightType.SECTOR } };
+		}
+
+		#endregion
+
+		#region ================== Delegates
+
+		public delegate void IncludeDelegate(GldefsParser parser, string includefile, bool clearerrors);
+		public IncludeDelegate OnInclude;
+
+		#endregion
+
+		#region ================== Variables
+
+		private readonly Dictionary<string, DynamicLightData> lightsByName; //LightName, light definition
+		private readonly Dictionary<string, string> objects; //ClassName, LightName
+		private readonly Dictionary<long, GlowingFlatData> glowingflats;
+		private readonly HashSet<string> parsedlumps;
+
+		#endregion
+
+		#region ================== Properties
+
+		public Dictionary<string, DynamicLightData> LightsByName { get { return lightsByName; } }
+		public Dictionary<string, string> Objects { get { return objects; } }
+		internal Dictionary<long, GlowingFlatData> GlowingFlats { get { return glowingflats; } }
+
+		#endregion
+
+		#region ================== Constructor
+
+		public GldefsParser() 
+		{
+			// Syntax
+			whitespace = "\n \t\r\u00A0";
+			specialtokens = ",{}\n";
+			
+			parsedlumps = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+			lightsByName = new Dictionary<string, DynamicLightData>(StringComparer.Ordinal); //LightName, Light params
+			objects = new Dictionary<string, string>(StringComparer.Ordinal); //ClassName, LightName
+			glowingflats = new Dictionary<long, GlowingFlatData>(); // Texture name hash, Glowing Flat Data
+		}
+
+		#endregion
+
+		#region ================== Parsing
+
+		public override bool Parse(Stream stream, string sourcefilename, bool clearerrors) 
+		{
+			if(!base.Parse(stream, sourcefilename, clearerrors)) return false;
+
+			// Keep local data
+			Stream localstream = datastream;
+			string localsourcename = sourcename;
+			BinaryReader localreader = datareader;
+
+			// Continue until at the end of the stream
+			while(SkipWhitespace(true)) 
+			{
+				string token = StripTokenQuotes(ReadToken()).ToLowerInvariant(); //Quotes can be anywhere! ANYWHERE!!! And GZDoom will still parse data correctly
+				if(string.IsNullOrEmpty(token)) break;
+
+				//got light structure
+				if(token == GldefsLightType.POINT || token == GldefsLightType.PULSE || token == GldefsLightType.FLICKER 
+					|| token == GldefsLightType.FLICKER2 || token == GldefsLightType.SECTOR) 
+				{
+					string lightType = token;
+					DynamicLightData light = new DynamicLightData { Type = GldefsLightType.GLDEFS_TO_GZDOOM_LIGHT_TYPE[lightType] };
+
+					//find classname
+					SkipWhitespace(true);
+					string lightName = StripTokenQuotes(ReadToken()).ToLowerInvariant();
+
+					if(string.IsNullOrEmpty(lightName))
+					{
+						ReportError("Expected " + token + " name");
+						return false;
+					}
+
+					//now find opening brace
+					if(!NextTokenIs("{", false))
+					{
+						ReportError("Expected opening brace");
+						return false;
+					}
+
+					//read gldefs light structure
+					while(SkipWhitespace(true)) 
+					{
+						token = ReadToken().ToLowerInvariant();
+						if(!string.IsNullOrEmpty(token)) 
+						{
+//color
+							if(token == "color") 
+							{
+								SkipWhitespace(true);
+
+								token = StripTokenQuotes(ReadToken());
+								if(!float.TryParse(token, NumberStyles.Float, CultureInfo.InvariantCulture, out light.Color.Red)) 
+								{
+									// Not numeric!
+									ReportError("Expected Red color value, but got '" + token + "'");
+									return false;
+								}
+
+								SkipWhitespace(true);
+
+								token = StripTokenQuotes(ReadToken());
+								if(!float.TryParse(token, NumberStyles.Float, CultureInfo.InvariantCulture, out light.Color.Green)) 
+								{
+									// Not numeric!
+									ReportError("Expected Green color value, but got '" + token + "'");
+									return false;
+								}
+
+								SkipWhitespace(true);
+
+								token = StripTokenQuotes(ReadToken());
+								if(!float.TryParse(token, NumberStyles.Float, CultureInfo.InvariantCulture, out light.Color.Blue)) 
+								{
+									// Not numeric!
+									ReportError("Expected Blue color value, but got '" + token + "'");
+									return false;
+								}
+//size
+							} 
+							else if(token == "size") 
+							{
+								if(lightType != GldefsLightType.SECTOR) 
+								{
+									SkipWhitespace(true);
+
+									token = StripTokenQuotes(ReadToken());
+									if(!int.TryParse(token, NumberStyles.Integer, CultureInfo.InvariantCulture, out light.PrimaryRadius)) 
+									{
+										// Not numeric!
+										ReportError("Expected Size value, but got '" + token + "'");
+										return false;
+									}
+									light.PrimaryRadius *= 2;
+
+								} 
+								else 
+								{
+									ReportError("'" + token + "' is not valid property for " + lightType);
+									return false;
+								}
+//offset
+							} 
+							else if(token == "offset") 
+							{
+								SkipWhitespace(true);
+
+								token = StripTokenQuotes(ReadToken());
+								if(!ReadSignedFloat(token, ref light.Offset.X)) 
+								{
+									// Not numeric!
+									ReportError("Expected Offset X value, but got '" + token + "'");
+									return false;
+								}
+
+								SkipWhitespace(true);
+
+								token = StripTokenQuotes(ReadToken());
+								if(!ReadSignedFloat(token, ref light.Offset.Z)) 
+								{
+									// Not numeric!
+									ReportError("Expected Offset Y value, but got '" + token + "'");
+									return false;
+								}
+
+								SkipWhitespace(true);
+
+								token = StripTokenQuotes(ReadToken());
+								if(!ReadSignedFloat(token, ref light.Offset.Y)) 
+								{
+									// Not numeric!
+									ReportError("Expected Offset Z value, but got '" + token + "'");
+									return false;
+								}
+//subtractive
+							} 
+							else if(token == "subtractive") 
+							{
+								SkipWhitespace(true);
+
+								token = StripTokenQuotes(ReadToken());
+								int i;
+								if(!int.TryParse(token, NumberStyles.Integer, CultureInfo.InvariantCulture, out i)) 
+								{
+									// Not numeric!
+									ReportError("expected Subtractive value, but got '" + token + "'");
+									return false;
+								}
+
+								light.Subtractive = i == 1;
+//dontlightself
+							} 
+							else if(token == "dontlightself") 
+							{
+								SkipWhitespace(true);
+
+								token = StripTokenQuotes(ReadToken());
+								int i;
+								if(!int.TryParse(token, NumberStyles.Integer, CultureInfo.InvariantCulture, out i)) 
+								{
+									// Not numeric!
+									ReportError("Expected DontLightSelf value, but got '" + token + "'");
+									return false;
+								}
+
+								light.DontLightSelf = (i == 1);
+//interval
+							} 
+							else if(token == "interval") 
+							{
+								if(lightType == GldefsLightType.PULSE || lightType == GldefsLightType.FLICKER2) 
+								{
+									SkipWhitespace(true);
+
+									token = StripTokenQuotes(ReadToken());
+									float interval;
+									if(!float.TryParse(token, NumberStyles.Float, CultureInfo.InvariantCulture, out interval)) 
+									{
+										// Not numeric!
+										ReportError("Expected Interval value, but got '" + token + "'");
+										return false;
+									}
+
+									if(interval == 0) LogWarning("Interval value should be greater than zero");
+
+									//I wrote logic for dynamic lights animation first, so here I modify gldefs settings to fit in existing logic
+									if(lightType == GldefsLightType.PULSE) 
+									{
+										light.Interval = (int)(interval * 35); //measured in tics (35 per second) in PointLightPulse, measured in seconds in gldefs' PulseLight
+									} 
+									else //FLICKER2. Seems like PointLightFlickerRandom to me
+									{ 
+										light.Interval = (int)(interval * 350); //0.1 is one second for FlickerLight2
+									}
+								} 
+								else 
+								{
+									ReportError("'" + token + "' is not valid property for " + lightType);
+									return false;
+								}
+//secondarysize
+							} 
+							else if(token == "secondarysize") 
+							{
+								if(lightType == GldefsLightType.PULSE || lightType == GldefsLightType.FLICKER || lightType == GldefsLightType.FLICKER2) 
+								{
+									SkipWhitespace(true);
+
+									token = StripTokenQuotes(ReadToken());
+									if(!int.TryParse(token, NumberStyles.Integer, CultureInfo.InvariantCulture, out light.SecondaryRadius)) 
+									{
+										// Not numeric!
+										ReportError("Expected SecondarySize value, but got '" + token + "'");
+										return false;
+									}
+									light.SecondaryRadius *= 2;
+								} 
+								else 
+								{
+									ReportError("'" + token + "' is not valid property for " + lightType);
+									return false;
+								}
+//chance
+							} 
+							else if(token == "chance") 
+							{
+								if(lightType == GldefsLightType.FLICKER) 
+								{
+									SkipWhitespace(true);
+
+									token = StripTokenQuotes(ReadToken());
+									float chance;
+									if(!float.TryParse(token, NumberStyles.Float, CultureInfo.InvariantCulture, out chance)) 
+									{
+										// Not numeric!
+										ReportError("Expected Chance value, but got '" + token + "'");
+										return false;
+									}
+
+									//transforming from 0.0 .. 1.0 to 0 .. 359 to fit in existing logic
+									light.Interval = (int)(chance * 359.0f);
+								} 
+								else 
+								{
+									ReportError("'" + token + "' is not valid property for " + lightType);
+									return false;
+								}
+//scale
+							} 
+							else if(token == "scale") 
+							{
+								if(lightType == GldefsLightType.SECTOR) 
+								{
+									SkipWhitespace(true);
+
+									token = StripTokenQuotes(ReadToken());
+									float scale;
+									if(!float.TryParse(token, NumberStyles.Float, CultureInfo.InvariantCulture, out scale)) 
+									{
+										// Not numeric!
+										ReportError("Expected Scale value, but got '" + token + "'");
+										return false;
+									}
+
+									if(scale > 1.0f) 
+									{
+										ReportError("Scale must be in 0.0 - 1.0 range, but is " + scale);
+										return false;
+									}
+
+									//sector light doesn't have animation, so we will store it's size in Interval
+									//transforming from 0.0 .. 1.0 to 0 .. 10 to preserve value.
+									light.Interval = (int)(scale * 10.0f);
+								} 
+								else 
+								{
+									ReportError("'" + token + "' is not valid property for " + lightType);
+									return false;
+								}
+							} 
+							//end of structure
+							else if(token == "}") 
+							{
+								bool skip = false;
+
+								//general checks
+								if(light.Color.Red == 0.0f && light.Color.Green == 0.0f && light.Color.Blue == 0.0f) 
+								{
+									LogWarning("'" + lightName + "' light Color is " + light.Color.Red + "," + light.Color.Green + "," + light.Color.Blue + ". It won't be shown in GZDoom");
+									skip = true;
+								}
+
+								//light-type specific checks
+								if(light.Type == DynamicLightType.NORMAL && light.PrimaryRadius == 0) 
+								{
+									LogWarning("'" + lightName + "' light Size is 0. It won't be shown in GZDoom");
+									skip = true;
+								}
+
+								if(light.Type == DynamicLightType.FLICKER || light.Type == DynamicLightType.PULSE || light.Type == DynamicLightType.RANDOM) 
+								{
+									if(light.PrimaryRadius == 0 && light.SecondaryRadius == 0)
+									{
+										LogWarning("'" + lightName + "' light Size and SecondarySize are 0. This light won't be shown in GZDoom");
+										skip = true;
+									}
+								}
+
+								//offset it slightly to avoid shading glitches
+								if(light.Offset.Z == 0.0f) light.Offset.Z = 0.1f;
+
+								// Add to the collection?
+								if(!skip) lightsByName[lightName] = light;
+
+								//break out of this parsing loop
+								break; 
+							}
+						}
+					}
+				} 
+				else if(token == "object") 
+				{
+					SkipWhitespace(true);
+
+					//read object class
+					string objectClass = StripTokenQuotes(ReadToken()).ToLowerInvariant();
+
+					if(string.IsNullOrEmpty(objectClass))
+					{
+						ReportError("Expected object class");
+						return false;
+					}
+
+					//now find opening brace
+					if(!NextTokenIs("{", false))
+					{
+						ReportError("Expected opening brace");
+						return false;
+					}
+
+					int bracesCount = 1;
+					bool foundLight = false;
+					bool foundFrame = false;
+
+					//read frames structure
+					while(SkipWhitespace(true)) 
+					{
+						token = ReadToken();
+						if(!string.IsNullOrEmpty(token)) 
+						{
+							token = StripTokenQuotes(token).ToLowerInvariant();
+							if(!foundLight && !foundFrame && token == "frame") 
+							{
+								SkipWhitespace(true);
+								token = ReadToken().ToLowerInvariant(); //should be frame name
+
+								//use this frame if it's 4 characters long or it's the first frame
+								foundFrame = (token.Length == 4 || (token.Length > 4 && token[4] == 'a'));
+							} 
+							else if(!foundLight && foundFrame && token == "light") //just use first light and be done with it
+							{ 
+								SkipWhitespace(true);
+								token = ReadToken().ToLowerInvariant(); //should be light name
+
+								if(!string.IsNullOrEmpty(token)) 
+								{
+									if(lightsByName.ContainsKey(token)) 
+									{
+										objects[objectClass] = token;
+										foundLight = true;
+									} 
+									else 
+									{
+										LogWarning("Light declaration not found for light '" + token + "'");
+									}
+								}
+							} 
+							else if(token == "{") //continue in this loop until object structure ends
+							{ 
+								bracesCount++;
+							} 
+							else if(token == "}") 
+							{
+								if(--bracesCount < 1) break; //This was Cave Johnson. And we are done here.
+							}
+						}
+					}
+				}
+				//Glowing flats block start
+				else if(token == "glow")
+				{
+					// Next sould be opening brace
+					if(!NextTokenIs("{", false))
+					{
+						ReportError("Expected opening brace");
+						return false;
+					}
+
+					// Parse inner blocks
+					while(SkipWhitespace(true))
+					{
+						token = ReadToken().ToLowerInvariant();
+						if(token == "}")
+						{
+							// End of Glow structure
+							break;
+						}
+						else if(token == "flats" || token == "walls") 
+						{
+							// Next sould be opening brace
+							if(!NextTokenIs("{", false))
+							{
+								ReportError("Expected opening brace");
+								return false;
+							}
+
+							// Read flat names
+							while(SkipWhitespace(true))
+							{
+								token = ReadToken();
+								if(token == "}") break;
+
+								// Add glow data
+								glowingflats[General.Map.Data.GetFullLongFlatName(Lump.MakeLongName(token, General.Map.Options.UseLongTextureNames))] = new GlowingFlatData {
+									Height = DEFAULT_GLOW_HEIGHT * 2,
+									Fullbright = true,
+									Color = new PixelColor(255, 255, 255, 255),
+									CalculateTextureColor = true
+								};
+							}
+						} 
+						// GLOOME subtractive flats
+						else if(token == "subflats" || token == "subwalls")
+						{
+							// Next sould be opening brace
+							if(!NextTokenIs("{", false))
+							{
+								ReportError("Expected opening brace");
+								return false;
+							}
+
+							// Read flat names
+							while(SkipWhitespace(true))
+							{
+								token = ReadToken();
+								if(token == "}") break;
+
+								// Add glow data
+								glowingflats[General.Map.Data.GetFullLongFlatName(Lump.MakeLongName(token, General.Map.Options.UseLongTextureNames))] = new GlowingFlatData {
+									Height = DEFAULT_GLOW_HEIGHT * 2,
+									Fullblack = true,
+									Subtractive = true,
+									Color = new PixelColor(255, 0, 0, 0),
+									CalculateTextureColor = false
+								};
+							}
+						}
+						else if(token == "texture" || token == "subtexture")
+						{
+							int color;
+							int glowheight = DEFAULT_GLOW_HEIGHT;
+							bool subtractivetexture = (token == "subtexture");
+							string texturename = StripTokenQuotes(ReadToken(false));
+
+							if(string.IsNullOrEmpty(texturename))
+							{
+								ReportError("expected " + token + " name");
+								return false;
+							}
+							
+							// Now we should find a comma
+							if(!NextTokenIs(",", false))
+							{
+								ReportError("Expected a comma");
+								return false;
+							}
+
+							// Next is color
+							SkipWhitespace(true);
+							token = ReadToken();
+
+							if(!int.TryParse(token, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out color)) 
+							{
+								//probably it's a color name?
+								Color c = Color.FromName(token); //should be similar to C++ color name detection, I suppose
+								if(c.IsKnownColor)
+								{
+									color = PixelColor.FromColor(c).ToInt();
+								}
+								else
+								{
+									ReportError("expected glow color value, but got '" + token + "'");
+									return false;
+								}
+							}
+
+							// The glow data is valid at thispoint. Let's get texture hash 
+							long texturehash = General.Map.Data.GetFullLongFlatName(Lump.MakeLongName(texturename, General.Map.Options.UseLongTextureNames));
+
+							// Now we can find a comma
+							if(!NextTokenIs(",", false))
+							{
+								// Add glow data
+								glowingflats[texturehash] = new GlowingFlatData {
+									Height = glowheight * 2,
+									Subtractive = subtractivetexture,
+									Color = PixelColor.FromInt(color).WithAlpha(255),
+									CalculateTextureColor = false
+								};
+
+								continue;
+							}
+
+							// Can be glow height
+							SkipWhitespace(true);
+							token = ReadToken();
+
+							int h;
+							if(int.TryParse(token, NumberStyles.Integer, CultureInfo.InvariantCulture, out h))
+							{
+								// Can't pass glowheight directly cause TryParse will unconditionally set it to 0
+								glowheight = h;
+								
+								// Now we can find a comma
+								if(!NextTokenIs(",", false))
+								{
+									// Add glow data
+									glowingflats[texturehash] = new GlowingFlatData {
+										Height = glowheight * 2,
+										Subtractive = subtractivetexture,
+										Color = PixelColor.FromInt(color).WithAlpha(255),
+										CalculateTextureColor = false
+									};
+
+									continue;
+								}
+
+								// Read the flag
+								SkipWhitespace(true);
+								token = ReadToken().ToLowerInvariant();
+							}
+
+							// Next is "fullbright" or "fullblack" flag
+							bool fullbright = (token == "fullbright");
+							bool fullblack = (!subtractivetexture && token == "fullblack");
+
+							if(!fullblack && !fullbright)
+							{
+								string expectedflags = (subtractivetexture ? "'fullbright'" : "'fullbright' or 'fullblack'");
+								ReportError("expected " + expectedflags + " flag, but got '" + token + "'");
+								return false;
+							}
+
+							// Add glow data
+							glowingflats[texturehash] = new GlowingFlatData {
+								Height = glowheight * 2,
+								Fullbright = fullbright,
+								Fullblack = fullblack,
+								Subtractive = subtractivetexture,
+								Color = PixelColor.FromInt(color).WithAlpha(255),
+								CalculateTextureColor = false
+							};
+						}
+					}
+				}
+				else if(token == "#include") 
+				{
+					//INFO: ZDoom GLDEFS include paths can't be relative ("../glstuff.txt") 
+					//or absolute ("d:/project/glstuff.txt") 
+					//or have backward slashes ("info\glstuff.txt")
+					//include paths are relative to the first parsed entry, not the current one 
+					//also include paths may or may not be quoted
+					SkipWhitespace(true);
+					string includelump = StripTokenQuotes(ReadToken(false)); // Don't skip newline
+
+					// Sanity checks
+					if(string.IsNullOrEmpty(includelump))
+					{
+						ReportError("Expected file name to include");
+						return false;
+					}
+
+					// Absolute paths are not supported...
+					if(Path.IsPathRooted(includelump))
+					{
+						ReportError("Absolute include paths are not supported by ZDoom");
+						return false;
+					}
+
+					// Relative paths are not supported
+					if(includelump.StartsWith(RELATIVE_PATH_MARKER) || includelump.StartsWith(CURRENT_FOLDER_PATH_MARKER) ||
+					   includelump.StartsWith(ALT_RELATIVE_PATH_MARKER) || includelump.StartsWith(ALT_CURRENT_FOLDER_PATH_MARKER))
+					{
+						ReportError("Relative include paths are not supported by ZDoom");
+						return false;
+					}
+
+					// Backward slashes are not supported
+					if(includelump.Contains(Path.DirectorySeparatorChar.ToString(CultureInfo.InvariantCulture)))
+					{
+						ReportError("Only forward slashes are supported by ZDoom");
+						return false;
+					}
+				
+					// Already parsed?
+					if(parsedlumps.Contains(includelump))
+					{
+						ReportError("Already parsed '" + includelump + "'. Check your #include directives");
+						return false;
+					}
+
+					// Add to collection
+					parsedlumps.Add(includelump);
+
+					// Callback to parse this file
+					if(OnInclude != null) OnInclude(this, includelump, clearerrors);
+
+					// Bail out on error
+					if(this.HasError) return false;
+
+					// Set our buffers back to continue parsing
+					datastream = localstream;
+					datareader = localreader;
+					sourcename = localsourcename;
+				} 
+				else if(token == "$gzdb_skip") //mxd
+				{
+					break;
+				}
+				else 
+				{
+					// Unknown structure!
+					string token2;
+					do 
+					{
+						if(!SkipWhitespace(true)) break;
+						token2 = ReadToken();
+						if(string.IsNullOrEmpty(token2)) break;
+					}
+					while(token2 != "{");
+					int scopelevel = 1;
+					do 
+					{
+						if(!SkipWhitespace(true)) break;
+						token2 = ReadToken();
+						if(string.IsNullOrEmpty(token2)) break;
+						if(token2 == "{") scopelevel++;
+						if(token2 == "}") scopelevel--;
+					}
+					while(scopelevel > 0);
+				}
+			}
+
+			return !this.HasError;
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		internal void ClearIncludesList() 
+		{
+			parsedlumps.Clear();
+		}
+
+		protected override string GetLanguageType()
+		{
+			return "GLDEFS";
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/GZBuilder/GZDoom/MapinfoParser.cs b/Source/Core/GZBuilder/GZDoom/MapinfoParser.cs
new file mode 100644
index 0000000..dd24da5
--- /dev/null
+++ b/Source/Core/GZBuilder/GZDoom/MapinfoParser.cs
@@ -0,0 +1,573 @@
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Globalization;
+using System.IO;
+using SlimDX;
+using CodeImp.DoomBuilder.ZDoom;
+using CodeImp.DoomBuilder.GZBuilder.Data;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.GZBuilder.GZDoom 
+{
+	internal sealed class MapinfoParser : ZDTextParser
+	{
+		#region ================== Delegates
+
+		public delegate void IncludeDelegate(MapinfoParser parser, string includefile, bool clearerror);
+		public IncludeDelegate OnInclude;
+
+		#endregion
+
+		#region ================== Variables
+
+		private MapInfo mapinfo;
+		private string mapname;
+		private readonly Dictionary<int, string> spawnnums;
+		private readonly Dictionary<int, string> doomednums; // <DoomEdNum, <lowercase classname, List of default arguments>>
+		private readonly HashSet<string> parsedlumps;
+
+		#endregion
+
+		#region ================== Properties
+
+		public MapInfo MapInfo { get { return mapinfo; } }
+		public Dictionary<int, string> SpawnNums { get { return spawnnums; } }
+		public Dictionary<int, string> DoomEdNums { get { return doomednums; } }
+
+		#endregion
+
+		#region ================== Constructor
+
+		public MapinfoParser()
+		{
+			// Syntax
+			whitespace = "\n \t\r\u00A0";
+			specialtokens = ",{}=\n";
+			
+			mapinfo = new MapInfo();
+			spawnnums = new Dictionary<int, string>();
+			doomednums = new Dictionary<int, string>();
+			parsedlumps = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+		}
+
+		#endregion
+
+		#region ================== Parsing
+
+
+		override public bool Parse(Stream stream, string sourcefilename, bool clearerrors)
+		{
+			if(string.IsNullOrEmpty(mapname)) throw new NotSupportedException("MapName is required!");
+			return Parse(stream, sourcefilename, mapname, clearerrors);
+		}
+
+		public bool Parse(Stream stream, string sourcefilename, string mapname, bool clearerrors) 
+		{
+			this.mapname = mapname.ToLowerInvariant();
+			if(!base.Parse(stream, sourcefilename, clearerrors)) return false;
+
+			while(SkipWhitespace(true)) 
+			{
+				string token = ReadToken();
+				if(!string.IsNullOrEmpty(token)) 
+				{
+					token = token.ToLowerInvariant();
+					if(ParseBlock(token, clearerrors)) break;
+				}
+			}
+
+			//check values
+			if(mapinfo.FadeColor.Red > 0 || mapinfo.FadeColor.Green > 0 || mapinfo.FadeColor.Blue > 0)
+				mapinfo.HasFadeColor = true;
+
+			if(mapinfo.OutsideFogColor.Red > 0 || mapinfo.OutsideFogColor.Green > 0 || mapinfo.OutsideFogColor.Blue > 0)
+				mapinfo.HasOutsideFogColor = true;
+
+			//Cannot fail here
+			return true;
+		}
+
+		//returns true if parsing is finished
+		private bool ParseBlock(string token, bool clearerrors) 
+		{
+			// Keep local data
+			Stream localstream = datastream;
+			string localsourcename = sourcename;
+			BinaryReader localreader = datareader;
+			
+			if(token == "map" || token == "defaultmap" || token == "adddefaultmap") 
+			{
+				switch(token)
+				{
+					case "map":
+						//get map name
+						SkipWhitespace(true);
+						token = ReadToken().ToLowerInvariant();
+						if(token != mapname) return false; //not finished, search for next "map", "defaultmap" or "adddefaultmap" block
+						break;
+
+					case "defaultmap":
+						//reset MapInfo
+						mapinfo = new MapInfo();
+						break;
+				}
+
+				// Track brace level
+				int bracelevel = 0;
+
+				//search for required keys
+				while(SkipWhitespace(true)) 
+				{
+					token = ReadToken().ToLowerInvariant();
+//sky1 or sky2
+					if(token == "sky1" || token == "sky2") 
+					{
+						string skyType = token;
+						SkipWhitespace(true);
+						token = StripTokenQuotes(ReadToken()).ToLowerInvariant();
+
+						//new format
+						if(token == "=") 
+						{
+							SkipWhitespace(true);
+
+							//should be sky texture name
+							token = StripTokenQuotes(ReadToken());
+							bool gotComma = (token.IndexOf(",", StringComparison.Ordinal) != -1);
+							if(gotComma) token = token.Replace(",", "");
+							string skyTexture = StripTokenQuotes(token).ToLowerInvariant();
+
+							if(!string.IsNullOrEmpty(skyTexture)) 
+							{
+								if(skyType == "sky1")
+									mapinfo.Sky1 = skyTexture;
+								else
+									mapinfo.Sky2 = skyTexture;
+
+								//check if we have scrollspeed
+								SkipWhitespace(true);
+								token = StripTokenQuotes(ReadToken());
+
+								if(!gotComma && token == ",") 
+								{
+									gotComma = true;
+									SkipWhitespace(true);
+									token = ReadToken();
+								}
+
+								if(gotComma) 
+								{
+									float scrollSpeed = 0;
+									if(!ReadSignedFloat(token, ref scrollSpeed)) 
+									{
+										// Not numeric!
+										ReportError("Expected " + skyType + " scroll speed value, but got '" + token + "'");
+										return false;
+									}
+
+									if(skyType == "sky1")
+										mapinfo.Sky1ScrollSpeed = scrollSpeed;
+									else
+										mapinfo.Sky2ScrollSpeed = scrollSpeed;
+								} 
+								else 
+								{
+									datastream.Seek(-token.Length - 1, SeekOrigin.Current); //step back and try parsing this token again
+								}
+							} 
+							else 
+							{
+								ReportError("Expected " + skyType + " texture name");
+								return false;
+							}
+						}
+						//old format
+						else 
+						{
+							//token should be sky1/2 name
+							if(!string.IsNullOrEmpty(token)) 
+							{
+								if(skyType == "sky1")
+									mapinfo.Sky1 = token;
+								else
+									mapinfo.Sky2 = token;
+
+								//try to read scroll speed
+								SkipWhitespace(true);
+								token = StripTokenQuotes(ReadToken());
+
+								float scrollSpeed = 0;
+								if(!ReadSignedFloat(token, ref scrollSpeed)) 
+								{
+									// Not numeric!
+									datastream.Seek(-token.Length - 1, SeekOrigin.Current); //step back and try parsing this token again
+									continue;
+								}
+
+								if(skyType == "sky1")
+									mapinfo.Sky1ScrollSpeed = scrollSpeed;
+								else
+									mapinfo.Sky2ScrollSpeed = scrollSpeed;
+
+							} 
+							else 
+							{
+								ReportError("Expected " + skyType + " texture name");
+								return false;
+							}
+						}
+					}
+//fade or outsidefog
+					else if(token == "fade" || token == "outsidefog") 
+					{
+						string fadeType = token;
+						SkipWhitespace(true);
+						token = StripTokenQuotes(ReadToken()).ToLowerInvariant();
+
+						//new format?
+						if(token == "=") 
+						{
+							SkipWhitespace(true);
+							token = ReadToken();
+						}
+
+						//get the color value
+						string colorVal = StripTokenQuotes(token).ToLowerInvariant().Replace(" ", "");
+						if(!string.IsNullOrEmpty(colorVal)) 
+						{
+							Color4 color = new Color4();
+							//try to get the color...
+							if(GetColor(colorVal, ref color)) 
+							{
+								if(fadeType == "fade")
+									mapinfo.FadeColor = color;
+								else
+									mapinfo.OutsideFogColor = color;
+							} 
+							else //...or not
+							{ 
+								ReportError("Failed to parse " + fadeType + " value from string '" + colorVal + "'");
+								return false;
+							}
+						} 
+						else 
+						{
+							ReportError("Expected " + fadeType + " color value");
+							return false;
+						}
+					}
+//vertwallshade or horizwallshade
+					else if(token == "vertwallshade" || token == "horizwallshade") 
+					{
+						string shadeType = token;
+						SkipWhitespace(true);
+						token = StripTokenQuotes(ReadToken());
+
+						//new format
+						if(token == "=") 
+						{
+							SkipWhitespace(true);
+							token = StripTokenQuotes(ReadToken());
+						}
+
+						int val = 0;
+						if(!ReadSignedInt(token, ref val)) 
+						{
+							// Not numeric!
+							ReportError("Expected " + shadeType + " value, but got '" + token + "'");
+							return false;
+						}
+
+						if(shadeType == "vertwallshade")
+							mapinfo.VertWallShade = General.Clamp(val, -255, 255);
+						else
+							mapinfo.HorizWallShade = General.Clamp(val, -255, 255);
+					}
+//fogdensity or outsidefogdensity
+					else if(token == "fogdensity" || token == "outsidefogdensity") 
+					{
+						string densityType = token;
+						SkipWhitespace(true);
+						token = StripTokenQuotes(ReadToken());
+
+						//new format
+						if(token == "=") 
+						{
+							SkipWhitespace(true);
+							token = StripTokenQuotes(ReadToken());
+						}
+
+						int val;
+						if(!int.TryParse(token, NumberStyles.Integer, CultureInfo.InvariantCulture, out val)) 
+						{
+							// Not numeric!
+							ReportError("Expected " + densityType + " value, but got '" + token + "'");
+							return false;
+						}
+
+						if(densityType == "fogdensity")
+							mapinfo.FogDensity = (int)(1024 * (256.0f / val));
+						else
+							mapinfo.OutsideFogDensity = (int)(1024 * (256.0f / val));
+					}
+//doublesky
+					else if(token == "doublesky") 
+					{
+						mapinfo.DoubleSky = true;
+					}
+//evenlighting
+					else if(token == "evenlighting") 
+					{
+						mapinfo.EvenLighting = true;
+					}
+//smoothlighting
+					else if(token == "smoothlighting") 
+					{
+						mapinfo.SmoothLighting = true;
+					}
+//block end
+					else if(token == "}") 
+					{
+						return ParseBlock(token, clearerrors);
+					}
+//child block
+					else if(token == "{")
+					{
+						// Skip inner properties
+						bracelevel++;
+						if(bracelevel > 1)
+						{
+							do
+							{
+								SkipWhitespace(true);
+								token = ReadToken();
+								if(token == "{") bracelevel++;
+								else if(token == "}") bracelevel--;
+							} while(!string.IsNullOrEmpty(token) && bracelevel > 1);
+						}
+					}
+				}
+			}
+			else if(token == "include") // It's "include", not "#include". Cause fuck consistency.
+			{
+				SkipWhitespace(true);
+				string includelump = StripTokenQuotes(ReadToken(false)); // Don't skip newline
+
+				//INFO: ZDoom MAPINFO include paths can't be relative ("../mapstuff.txt") 
+				//or absolute ("d:/project/mapstuff.txt") 
+				//or have backward slashes ("info\mapstuff.txt")
+				//include paths are relative to the first parsed entry, not the current one 
+				//also include paths may or may not be quoted
+				if(!string.IsNullOrEmpty(includelump)) 
+				{
+					// Absolute paths are not supported...
+					if(Path.IsPathRooted(includelump))
+					{
+						ReportError("Absolute include paths are not supported by ZDoom");
+						return false;
+					}
+
+					// Relative paths are not supported
+					if(includelump.StartsWith(RELATIVE_PATH_MARKER) || includelump.StartsWith(CURRENT_FOLDER_PATH_MARKER) ||
+					   includelump.StartsWith(ALT_RELATIVE_PATH_MARKER) || includelump.StartsWith(ALT_CURRENT_FOLDER_PATH_MARKER))
+					{
+						ReportError("Relative include paths are not supported by ZDoom");
+						return false;
+					}
+
+					// Backward slashes are not supported
+					if(includelump.Contains(Path.DirectorySeparatorChar.ToString(CultureInfo.InvariantCulture)))
+					{
+						ReportError("Only forward slashes are supported by ZDoom");
+						return false;
+					}
+
+					// Already parsed?
+					if(parsedlumps.Contains(includelump))
+					{
+						ReportError("Already parsed '" + includelump + "'. Check your include directives");
+						return false;
+					}
+
+					// Add to collection
+					parsedlumps.Add(includelump);
+
+					// Callback to parse this file
+					if(OnInclude != null) OnInclude(this, includelump, clearerrors);
+
+					// Bail out on error
+					if(this.HasError) return false;
+
+					// Set our buffers back to continue parsing
+					datastream = localstream;
+					datareader = localreader;
+					sourcename = localsourcename;
+				} 
+				else 
+				{
+					ReportError("Expected filename to include");
+					return false;
+				}
+			}
+			else if(token == "gameinfo")
+			{
+				if(!NextTokenIs("{")) return false; // Finished with this file
+
+				while(SkipWhitespace(true))
+				{
+					token = ReadToken();
+					if(string.IsNullOrEmpty(token))
+					{
+						ReportError("Failed to find the end of GameInfo block");
+						return false; // Finished with this file
+					}
+					if(token == "}") break;
+
+					if(token == "skyflatname")
+					{
+						if(!NextTokenIs("=")) return false; // Finished with this file
+						SkipWhitespace(true);
+						string skyflatname = StripTokenQuotes(ReadToken());
+						if(string.IsNullOrEmpty(skyflatname)) 
+						{
+							ReportError("Unable to get SkyFlatName value");
+							return false; // Finished with this file
+						}
+
+						General.Map.Config.SkyFlatName = skyflatname.ToUpperInvariant();
+					}
+				}
+			}
+			else if(token == "doomednums")
+			{
+				if(!NextTokenIs("{")) return false; // Finished with this file
+
+				while(SkipWhitespace(true)) 
+				{
+					token = ReadToken();
+					if(string.IsNullOrEmpty(token)) 
+					{
+						ReportError("Failed to find the end of DoomEdNums block");
+						return false; // Finished with this file
+					}
+					if(token == "}") break;
+
+					// First must be a number
+					int id;
+					if(!int.TryParse(token, NumberStyles.Integer, CultureInfo.InvariantCulture, out id)) 
+					{
+						// Not numeric!
+						ReportError("Expected DoomEdNums entry number, but got '" + token + "'");
+						return false; // Finished with this file
+					}
+
+					// Then "="
+					if(!NextTokenIs("=")) return false; // Finished with this file
+
+					// Then actor class
+					SkipWhitespace(false);
+					string classname = StripTokenQuotes(ReadToken());
+					if(string.IsNullOrEmpty(classname)) 
+					{
+						ReportError("Unable to get DoomEdNums entry class definition");
+						return false; // Finished with this file
+					}
+
+					// Possible special and args. We'll skip them
+					for(int i = 0; i < 6; i++)
+					{
+						if(!NextTokenIs(",", false)) break;
+
+						// Read special name or arg value
+						if(!SkipWhitespace(true) || string.IsNullOrEmpty(ReadToken())) return false;
+					}
+
+					// Add to collection?
+					if(id != 0) doomednums[id] = classname.ToLowerInvariant();
+				}
+			} 
+			else if(token == "spawnnums")
+			{
+				if(!NextTokenIs("{")) return false; // Finished with this file
+
+				while(SkipWhitespace(true))
+				{
+					token = ReadToken();
+					if(string.IsNullOrEmpty(token)) 
+					{
+						ReportError("Failed to find the end of SpawnNums block");
+						return false; // Finished with this file
+					}
+					if(token == "}") break;
+
+					// First must be a number
+					int id;
+					if(!int.TryParse(token, NumberStyles.Integer, CultureInfo.InvariantCulture, out id)) 
+					{
+						// Not numeric!
+						ReportError("Expected SpawnNums number, but got '" + token + "'");
+						return false; // Finished with this file
+					}
+
+					// Then "="
+					if(!NextTokenIs("=")) return false; // Finished with this file
+
+					// Then actor class
+					SkipWhitespace(false);
+					token = StripTokenQuotes(ReadToken());
+					if(string.IsNullOrEmpty(token))
+					{
+						ReportError("Unable to get SpawnNums entry class definition");
+						return false;
+					}
+
+					// Add to collection
+					spawnnums[id] = token.ToLowerInvariant();
+				}
+			} 
+			else if(token == "$gzdb_skip")
+			{
+				return true; // Finished with this file
+			}
+
+			return false; // Not done yet
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		private static bool GetColor(string name, ref Color4 color) 
+		{
+			if(name == "black") return true;
+
+			//probably it's a hex color (like FFCC11)?
+			int ci;
+			if(int.TryParse(name, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out ci)) 
+			{
+				color = new Color4(ci) {Alpha = 1.0f};
+				return true;
+			}
+
+			//probably it's a color name?
+			Color c = Color.FromName(name); //should be similar to C++ color name detection, I suppose
+			if(c.IsKnownColor) 
+			{
+				color = new Color4(c);
+				return true;
+			}
+			return false;
+		}
+
+		protected override string GetLanguageType()
+		{
+			return "MAPINFO";
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/GZBuilder/GZDoom/ModeldefParser.cs b/Source/Core/GZBuilder/GZDoom/ModeldefParser.cs
new file mode 100644
index 0000000..8614893
--- /dev/null
+++ b/Source/Core/GZBuilder/GZDoom/ModeldefParser.cs
@@ -0,0 +1,112 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using CodeImp.DoomBuilder.ZDoom;
+using CodeImp.DoomBuilder.GZBuilder.Data;
+
+namespace CodeImp.DoomBuilder.GZBuilder.GZDoom 
+{
+	internal class ModeldefParser : ZDTextParser
+	{
+		private readonly Dictionary<string, int> actorsbyclass;
+		internal Dictionary<string, int> ActorsByClass { get { return actorsbyclass; } }
+
+		private Dictionary<string, ModelData> entries; //classname, entry
+		internal Dictionary<string, ModelData> Entries { get { return entries; } }
+
+		internal ModeldefParser(Dictionary<string, int> actorsbyclass)
+		{
+			this.actorsbyclass = actorsbyclass;
+			this.entries = new Dictionary<string, ModelData>(StringComparer.Ordinal);
+		}
+
+		//should be called after all decorate actors are parsed 
+		public override bool Parse(Stream stream, string sourcefilename, bool clearerrors)
+		{
+			entries = new Dictionary<string, ModelData>(StringComparer.Ordinal);
+			if(!base.Parse(stream, sourcefilename, clearerrors)) return false;
+
+			// Continue until at the end of the stream
+			while(SkipWhitespace(true)) 
+			{
+				string token = ReadToken();
+				if(!string.IsNullOrEmpty(token)) 
+				{
+					token = StripTokenQuotes(token).ToLowerInvariant();
+					if(token == "model") //model structure start
+					{ 
+						//find classname
+						SkipWhitespace(true);
+						string displayclassname = StripTokenQuotes(ReadToken(ActorStructure.ACTOR_CLASS_SPECIAL_TOKENS));
+						string classname = displayclassname.ToLowerInvariant();
+
+						if(!string.IsNullOrEmpty(classname) && !entries.ContainsKey(classname)) 
+						{
+							//now find opening brace
+							SkipWhitespace(true);
+							token = ReadToken();
+							if(token != "{") 
+							{
+								General.ErrorLogger.Add(ErrorType.Error, "Unexpected token found in '" + sourcefilename + "' at line " + GetCurrentLineNumber() + ": expected '{', but got '" + token + "'");
+								continue; //something wrong with modeldef declaration, continue to next one
+							}
+
+							ModeldefStructure mds = new ModeldefStructure();
+							if(mds.Parse(this, displayclassname) && mds.ModelData != null)
+							{
+								entries.Add(classname, mds.ModelData);
+							}
+							
+							if(HasError)
+							{
+								LogError();
+								ClearError();
+							}
+
+							// Skip untill current structure end
+							if(!mds.ParsingFinished) SkipStructure(1);
+						}
+					} 
+					else 
+					{
+						// Unknown structure!
+						if(token != "{")
+						{
+							string token2;
+							do
+							{
+								if(!SkipWhitespace(true)) break;
+								token2 = ReadToken();
+								if(string.IsNullOrEmpty(token2)) break;
+							} 
+							while(token2 != "{");
+						}
+
+						SkipStructure(1);
+					}
+				}
+			}
+
+			return entries.Count > 0;
+		}
+
+		// Skips untill current structure end
+		private void SkipStructure(int scopelevel)
+		{
+			do
+			{
+				if(!SkipWhitespace(true)) break;
+				string token = ReadToken();
+				if(string.IsNullOrEmpty(token)) break;
+				if(token == "{") scopelevel++;
+				if(token == "}") scopelevel--;
+			}
+			while(scopelevel > 0);
+		}
+
+		protected override string GetLanguageType()
+		{
+			return "MODELDEF";
+		}
+	}
+}
diff --git a/Source/Core/GZBuilder/GZDoom/ModeldefParserSE.cs b/Source/Core/GZBuilder/GZDoom/ModeldefParserSE.cs
new file mode 100644
index 0000000..76e389a
--- /dev/null
+++ b/Source/Core/GZBuilder/GZDoom/ModeldefParserSE.cs
@@ -0,0 +1,64 @@
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using System.IO;
+using CodeImp.DoomBuilder.GZBuilder.Data;
+using CodeImp.DoomBuilder.ZDoom;
+
+#endregion
+
+//mxd. Modeldef parser used to create ScriptItems for use in script editor's navigator
+//Should be parse model definitions even from invalid MODELDEF and should never fail parsing
+namespace CodeImp.DoomBuilder.GZBuilder.GZDoom 
+{
+	internal sealed class ModeldefParserSE : ZDTextParser 
+	{
+		private readonly List<ScriptItem> models;
+		internal List<ScriptItem> Models { get { return models; } }
+
+		public ModeldefParserSE() 
+		{
+			models = new List<ScriptItem>();
+		}
+
+		public override bool Parse(Stream stream, string sourcefilename, bool clearerrors) 
+		{
+			if(!base.Parse(stream, sourcefilename, clearerrors)) return false;
+
+			// Continue until at the end of the stream
+			while(SkipWhitespace(true)) 
+			{
+				string token = ReadToken();
+				if(string.IsNullOrEmpty(token) || token.ToUpperInvariant() != "MODEL") continue; 
+
+				SkipWhitespace(true);
+				int startpos = (int)stream.Position;
+				string modelname = ReadToken();
+
+				SkipWhitespace(true);
+				token = ReadToken(); //this should be "{"
+
+				if(token == "{") 
+				{
+					ScriptItem i = new ScriptItem(modelname, startpos, false);
+					models.Add(i);
+				}
+
+				while(SkipWhitespace(true))
+				{
+					token = ReadToken();
+					if(string.IsNullOrEmpty(token) || token == "}") break;
+				}
+			}
+
+			// Sort nodes
+			models.Sort(ScriptItem.SortByName);
+			return true;
+		}
+
+		protected override string GetLanguageType()
+		{
+			return "MODELDEF";
+		}
+	}
+}
diff --git a/Source/Core/GZBuilder/GZDoom/ModeldefStructure.cs b/Source/Core/GZBuilder/GZDoom/ModeldefStructure.cs
new file mode 100644
index 0000000..20da229
--- /dev/null
+++ b/Source/Core/GZBuilder/GZDoom/ModeldefStructure.cs
@@ -0,0 +1,486 @@
+#region ================== Namespaces
+
+using System;
+using System.IO;
+using System.Globalization;
+using SlimDX;
+using CodeImp.DoomBuilder.GZBuilder.Data;
+using CodeImp.DoomBuilder.Geometry;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.GZBuilder.GZDoom 
+{
+	internal sealed class ModeldefStructure 
+	{
+		private const int MAX_MODELS = 4; //maximum models per modeldef entry, zero-based
+		private bool parsingfinished;
+
+		internal ModelData ModelData;
+		internal bool ParsingFinished { get { return parsingfinished; } }
+
+		internal bool Parse(ModeldefParser parser, string classname)
+		{
+
+#region ================== Vars
+
+			string[] textureNames = new string[MAX_MODELS];
+			string[] modelNames = new string[MAX_MODELS];
+			string[] frameNames = new string[MAX_MODELS];
+			int[] frameIndices = new int[MAX_MODELS];
+			bool[] modelsUsed = new bool[MAX_MODELS];
+			string path = "";
+			Vector3 scale = new Vector3(1, 1, 1);
+			Vector3 offset = new Vector3();
+			float angleOffset = 0;
+			float pitchOffset = 0;
+			float rollOffset = 0;
+			bool inheritactorpitch = false; 
+			bool inheritactorroll = false;
+
+			string token;
+
+#endregion
+
+			//read modeldef structure contents
+			parsingfinished = false;
+			while(!parsingfinished && parser.SkipWhitespace(true)) 
+			{
+				token = parser.ReadToken();
+				if(!string.IsNullOrEmpty(token)) 
+				{
+					token = parser.StripTokenQuotes(token).ToLowerInvariant(); //ANYTHING can be quoted...
+					switch(token)
+					{
+
+#region ================== Path
+
+						case "path":
+							parser.SkipWhitespace(true);
+							path = parser.StripTokenQuotes(parser.ReadToken(false)).Replace("/", "\\"); // Don't skip newline
+							if(string.IsNullOrEmpty(path))
+							{
+								parser.ReportError("Expected model path, but got '" + token + "'");
+								return false;
+							}
+							break;
+
+#endregion
+
+#region ================== Model
+
+						case "model":
+							parser.SkipWhitespace(true);
+
+							//model index
+							int index;
+							token = parser.StripTokenQuotes(parser.ReadToken());
+							if(!int.TryParse(token, NumberStyles.Integer, CultureInfo.InvariantCulture, out index)) 
+							{
+								// Not numeric!
+								parser.ReportError("Expected model index, but got '" + token + "'");
+								return false;
+							}
+
+							if(index >= MAX_MODELS) 
+							{
+								parser.ReportError("GZDoom doesn't allow more than " + MAX_MODELS + " models per MODELDEF entry");
+								return false;
+							}
+
+							parser.SkipWhitespace(true);
+
+							//model path
+							token = parser.StripTokenQuotes(parser.ReadToken(false)).ToLowerInvariant(); // Don't skip newline
+							if(string.IsNullOrEmpty(token)) 
+							{
+								parser.ReportError("Expected model name");
+								return false;
+							} 
+
+							//check extension
+							string fileExt = Path.GetExtension(token);
+							if(string.IsNullOrEmpty(fileExt)) 
+							{
+								parser.ReportError("Model '" + token + "' won't be loaded. Models without extension are not supported by GZDoom");
+								return false;
+							}
+
+							if(fileExt != ".md3" && fileExt != ".md2") 
+							{
+								parser.ReportError("Model '" + token + "' won't be loaded. Only MD2 and MD3 models are supported");
+								return false;
+							}
+
+							//GZDoom allows models with identical modelIndex, it uses the last one encountered
+							modelNames[index] = Path.Combine(path, token);
+							break;
+
+#endregion
+
+#region ================== Skin
+
+						case "skin":
+							parser.SkipWhitespace(true);
+
+							//skin index
+							int skinIndex;
+							token = parser.StripTokenQuotes(parser.ReadToken());
+							if(!int.TryParse(token, NumberStyles.Integer, CultureInfo.InvariantCulture, out skinIndex)) 
+							{
+								// Not numeric!
+								parser.ReportError("Expected skin index, but got '" + token + "'");
+								return false;
+							}
+
+							if(skinIndex >= MAX_MODELS) 
+							{
+								parser.ReportError("GZDoom doesn't allow more than " + MAX_MODELS + " skins per MODELDEF entry");
+								return false;
+							}
+
+							parser.SkipWhitespace(true);
+
+							//skin path
+							token = parser.StripTokenQuotes(parser.ReadToken(false)).ToLowerInvariant(); // Don't skip newline
+							if(string.IsNullOrEmpty(token)) 
+							{
+								parser.ReportError("Skin path required");
+								return false;
+							} 
+
+							//check extension
+							string ext = Path.GetExtension(token);
+							if(Array.IndexOf(ModelData.SUPPORTED_TEXTURE_EXTENSIONS, ext) == -1) 
+							{
+								parser.ReportError("Image format '" + ext + "' is not supported");
+								return false;
+							} 
+
+							//GZDoom allows skins with identical modelIndex, it uses the last one encountered
+							textureNames[skinIndex] = Path.Combine(path, token);
+							break;
+
+#endregion
+
+#region ================== Scale
+
+						case "scale":
+							parser.SkipWhitespace(true);
+							token = parser.StripTokenQuotes(parser.ReadToken());
+							if(!parser.ReadSignedFloat(token, ref scale.Y)) 
+							{
+								// Not numeric!
+								parser.ReportError("Expected Scale X value, but got '" + token + "'");
+								return false;
+							}
+
+							parser.SkipWhitespace(true);
+							token = parser.StripTokenQuotes(parser.ReadToken());
+							if(!parser.ReadSignedFloat(token, ref scale.X)) 
+							{
+								// Not numeric!
+								parser.ReportError("Expected Scale Y value, but got '" + token + "'");
+								return false;
+							}
+
+							parser.SkipWhitespace(true);
+							token = parser.StripTokenQuotes(parser.ReadToken());
+							if(!parser.ReadSignedFloat(token, ref scale.Z)) 
+							{
+								// Not numeric!
+								parser.ReportError("Expected Scale Z value, but got '" + token + "'");
+								return false;
+							}
+							break;
+
+#endregion
+
+#region ================== Offset
+
+						case "offset":
+							parser.SkipWhitespace(true);
+							token = parser.StripTokenQuotes(parser.ReadToken());
+							if(!parser.ReadSignedFloat(token, ref offset.X)) 
+							{
+								// Not numeric!
+								parser.ReportError("Expected Offset X value, but got '" + token + "'");
+								return false;
+							}
+
+							parser.SkipWhitespace(true);
+							token = parser.StripTokenQuotes(parser.ReadToken());
+							if(!parser.ReadSignedFloat(token, ref offset.Y)) 
+							{
+								// Not numeric!
+								parser.ReportError("Expected Offset Y value, but got '" + token + "'");
+								return false;
+							}
+
+							parser.SkipWhitespace(true);
+							token = parser.StripTokenQuotes(parser.ReadToken());
+							if(!parser.ReadSignedFloat(token, ref offset.Z)) 
+							{
+								// Not numeric!
+								parser.ReportError("Expected Offset Z value, but got '" + token + "'");
+								return false;
+							}
+							break;
+
+#endregion
+
+#region ================== ZOffset
+
+						case "zoffset":
+							parser.SkipWhitespace(true);
+							token = parser.StripTokenQuotes(parser.ReadToken());
+							if(!parser.ReadSignedFloat(token, ref offset.Z)) 
+							{
+								// Not numeric!
+								parser.ReportError("Expected ZOffset value, but got '" + token + "'");
+								return false;
+							}
+							break;
+
+#endregion
+
+#region ================== AngleOffset
+
+						case "angleoffset":
+							parser.SkipWhitespace(true);
+							token = parser.StripTokenQuotes(parser.ReadToken());
+							if(!parser.ReadSignedFloat(token, ref angleOffset)) 
+							{
+								// Not numeric!
+								parser.ReportError("Expected AngleOffset value, but got '" + token + "'");
+								return false;
+							}
+							break;
+
+#endregion
+
+#region ================== PitchOffset
+
+						case "pitchoffset":
+							parser.SkipWhitespace(true);
+							token = parser.StripTokenQuotes(parser.ReadToken());
+							if(!parser.ReadSignedFloat(token, ref pitchOffset)) 
+							{
+								// Not numeric!
+								parser.ReportError("Expected PitchOffset value, but got '" + token + "'");
+								return false;
+							}
+							break;
+
+#endregion
+
+#region ================== RollOffset
+
+						case "rolloffset":
+							parser.SkipWhitespace(true);
+							token = parser.StripTokenQuotes(parser.ReadToken());
+							if(!parser.ReadSignedFloat(token, ref rollOffset)) 
+							{
+								// Not numeric!
+								parser.ReportError("Expected RollOffset value, but got '" + token + "'");
+								return false;
+							}
+							break;
+
+#endregion
+
+#region ================== InheritActorPitch
+
+						case "inheritactorpitch":
+							inheritactorpitch = true;
+							break;
+
+#endregion
+
+#region ================== InheritActorRoll
+
+						case "inheritactorroll":
+							inheritactorroll = true;
+							break;
+
+#endregion
+
+#region ================== Frame / FrameIndex
+
+						case "frameindex":
+						case "frame":
+							//parsed all required fields. if got more than one model - find which one(s) should be displayed 
+							if(modelNames.GetLength(0) > 1) 
+							{
+								string spriteLump = null;
+								string spriteFrame = null;
+
+								//step back
+								parser.DataStream.Seek(-token.Length - 1, SeekOrigin.Current);
+
+								//here we check which models are used in first encountered lump and frame
+								while(parser.SkipWhitespace(true)) 
+								{
+									token = parser.StripTokenQuotes(parser.ReadToken()).ToLowerInvariant();
+									if(token == "frameindex" || token == "frame") 
+									{
+										bool frameIndex = (token == "frameindex");
+										parser.SkipWhitespace(true);
+
+										//should be sprite lump
+										token = parser.StripTokenQuotes(parser.ReadToken()).ToLowerInvariant();
+										if(string.IsNullOrEmpty(spriteLump)) 
+										{
+											spriteLump = token;
+										} 
+										else if(spriteLump != token) //got another lump
+										{ 
+											for(int i = 0; i < modelsUsed.Length; i++) 
+											{
+												if(!modelsUsed[i]) 
+												{
+													modelNames[i] = null;
+													textureNames[i] = null;
+												}
+											}
+											break;
+										}
+
+										parser.SkipWhitespace(true);
+
+										//should be sprite frame
+										token = parser.StripTokenQuotes(parser.ReadToken()).ToLowerInvariant();
+										if(string.IsNullOrEmpty(spriteFrame)) 
+										{
+											spriteFrame = token;
+										} 
+										else if(spriteFrame != token) //got another frame
+										{
+											for(int i = 0; i < modelsUsed.Length; i++) 
+											{
+												if(!modelsUsed[i]) 
+												{
+													modelNames[i] = null;
+													textureNames[i] = null;
+												}
+											}
+											break;
+										}
+
+										parser.SkipWhitespace(true);
+
+										//should be model index
+										token = parser.StripTokenQuotes(parser.ReadToken());
+
+										int modelIndex;
+										if(!int.TryParse(token, NumberStyles.Integer, CultureInfo.InvariantCulture, out modelIndex)) 
+										{
+											// Not numeric!
+											parser.ReportError("Expected model index, but got '" + token + "'");
+											return false;
+										}
+
+										if(modelIndex >= MAX_MODELS) 
+										{
+											parser.ReportError("GZDoom doesn't allow more than " + MAX_MODELS + " models per MODELDEF entry");
+											return false;
+										}
+
+										if(modelNames[modelIndex] == null) 
+										{
+											parser.ReportError("Model index doesn't correspond to any defined model");
+											return false;
+										}
+
+										modelsUsed[modelIndex] = true;
+
+										parser.SkipWhitespace(true);
+
+										// Should be frame name or index
+										token = parser.StripTokenQuotes(parser.ReadToken());
+										if(frameIndex)
+										{
+											int frame = 0;
+											if(!parser.ReadSignedInt(token, ref frame))
+											{
+												// Not numeric!
+												parser.ReportError("Expected model frame index, but got '" + token + "'");
+												return false;
+											}
+
+											// Skip the model if frame index is -1
+											if(frame == -1) modelsUsed[modelIndex] = false;
+											else frameIndices[modelIndex] = frame;
+										}
+										else
+										{
+											if(string.IsNullOrEmpty(token))
+											{
+												// Missing!
+												parser.ReportError("Expected model frame name");
+												return false;
+											}
+
+											frameNames[modelIndex] = token.ToLowerInvariant();
+										}
+									} 
+									else 
+									{
+										//must be "}", step back
+										parser.DataStream.Seek(-token.Length - 1, SeekOrigin.Current);
+										break;
+									}
+								}
+							}
+
+							parsingfinished = true;
+							break;
+
+#endregion
+					}
+				}
+			}
+
+			// Find closing brace, then quit
+			while(parser.SkipWhitespace(true)) 
+			{
+				token = parser.ReadToken();
+				if(string.IsNullOrEmpty(token) || token == "}") break;
+			}
+
+			// Bail out when got errors or no models are used
+			if(Array.IndexOf(modelsUsed, true) == -1)
+			{
+				parser.ReportError("No models are used by '" + classname + "'");
+				return false;
+			}
+			
+			// Classname is set in ModeldefParser
+			ModelData = new ModelData();
+			ModelData.InheritActorPitch = inheritactorpitch;
+			ModelData.InheritActorRoll = inheritactorroll;
+			Matrix moffset = Matrix.Translation(offset.Y, -offset.X, offset.Z); // Things are complicated in GZDoom...
+			Matrix mrotation = Matrix.RotationY(-Angle2D.DegToRad(rollOffset)) * Matrix.RotationX(-Angle2D.DegToRad(pitchOffset)) * Matrix.RotationZ(Angle2D.DegToRad(angleOffset));
+			ModelData.SetTransform(mrotation, moffset, scale);
+
+			for(int i = 0; i < modelNames.Length; i++) 
+			{
+				if(!string.IsNullOrEmpty(modelNames[i]) && modelsUsed[i]) 
+				{
+					ModelData.TextureNames.Add(string.IsNullOrEmpty(textureNames[i]) ? string.Empty : textureNames[i].ToLowerInvariant());
+					ModelData.ModelNames.Add(modelNames[i].ToLowerInvariant());
+					ModelData.FrameNames.Add(frameNames[i]);
+					ModelData.FrameIndices.Add(frameIndices[i]);
+				}
+			}
+
+			if(ModelData.ModelNames.Count == 0)
+			{
+				parser.ReportError("'" + classname + "' has no models");
+				return false;
+			}
+
+			return true;
+		}
+	}
+}
diff --git a/Source/Core/GZBuilder/GZDoom/ScriptTypeParserSE.cs b/Source/Core/GZBuilder/GZDoom/ScriptTypeParserSE.cs
new file mode 100644
index 0000000..b03aab6
--- /dev/null
+++ b/Source/Core/GZBuilder/GZDoom/ScriptTypeParserSE.cs
@@ -0,0 +1,99 @@
+#region ================== Namespaces
+
+using System.IO;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.ZDoom;
+
+#endregion
+
+//mxd. Parser used to determine which script type given text is.
+namespace CodeImp.DoomBuilder.GZBuilder.GZDoom 
+{
+	internal sealed class ScriptTypeParserSE :ZDTextParser 
+	{
+		private ScriptType scriptType;
+		internal ScriptType ScriptType { get { return scriptType; } }
+
+		internal ScriptTypeParserSE() 
+		{
+			scriptType = ScriptType.UNKNOWN;
+		}
+		
+		public override bool Parse(Stream stream, string sourcefilename, bool clearerrors) 
+		{
+			if(!base.Parse(stream, sourcefilename, clearerrors)) return false;
+
+			// Continue until at the end of the stream
+			while(SkipWhitespace(true)) 
+			{
+				string token = ReadToken();
+
+				if(!string.IsNullOrEmpty(token)) 
+				{
+					token = token.ToUpperInvariant();
+
+					if(token == "MODEL") 
+					{
+						SkipWhitespace(true);
+						ReadToken(); //should be model name
+						SkipWhitespace(true);
+						token = ReadToken();//should be opening brace
+						
+						if(token == "{") 
+						{
+							scriptType = ScriptType.MODELDEF;
+							return true;
+						}
+
+					}
+					else if(token == "SCRIPT")
+					{
+						SkipWhitespace(true);
+						ReadToken(); //should be script name or number
+						SkipWhitespace(true);
+						ReadToken(); //should be script parameters/type
+						SkipWhitespace(true);
+						token = ReadToken(); //should be opening brace
+						
+						if(token == "{") 
+						{
+							scriptType = ScriptType.ACS;
+							return true;
+						}
+
+					}
+					else if(token == "ACTOR")
+					{
+						SkipWhitespace(true);
+						ReadToken(); //should be actor name
+
+						SkipWhitespace(true);
+						token = ReadToken();
+
+						if(token == ":" || token == "{" || token == "REPLACES") 
+						{
+							scriptType = ScriptType.DECORATE;
+							return true;
+						}
+
+						SkipWhitespace(true);
+						token = ReadToken(); //should be actor name
+
+						if(token == "{") 
+						{
+							scriptType = ScriptType.DECORATE;
+							return true;
+						}
+					}
+				}
+			}
+
+			return false;
+		}
+
+		protected override string GetLanguageType()
+		{
+			return "SCRIPT TYPE CHECKER";
+		}
+	}
+}
diff --git a/Source/Core/GZBuilder/GZGeneral.cs b/Source/Core/GZBuilder/GZGeneral.cs
new file mode 100644
index 0000000..6cf2a72
--- /dev/null
+++ b/Source/Core/GZBuilder/GZGeneral.cs
@@ -0,0 +1,159 @@
+#region ================== Namespaces
+
+using CodeImp.DoomBuilder.Actions;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Windows;
+using CodeImp.DoomBuilder.GZBuilder.Data;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.GZBuilder
+{
+	//mxd. should get rid of this class one day...
+	public static class GZGeneral
+	{
+		#region ================== Properties
+
+		//gzdoom light types
+		private static readonly int[] gzLights = { /* normal lights */ 9800, 9801, 9802, 9803, 9804, /* additive lights */ 9810, 9811, 9812, 9813, 9814, /* negative lights */ 9820, 9821, 9822, 9823, 9824, /* vavoom lights */ 1502, 1503};
+		public static int[] GZ_LIGHTS { get { return gzLights; } }
+		private static readonly int[] gzLightTypes = { 5, 10, 15 }; //these are actually offsets in gz_lights
+		public static int[] GZ_LIGHT_TYPES { get { return gzLightTypes; } }
+		private static readonly DynamicLightType[] gzAnimatedLightTypes = { DynamicLightType.FLICKER, DynamicLightType.RANDOM, DynamicLightType.PULSE };
+		public static DynamicLightType[] GZ_ANIMATED_LIGHT_TYPES { get { return gzAnimatedLightTypes; } }
+
+		//asc script action specials
+		private static readonly int[] acsSpecials = { 80, 81, 82, 83, 84, 85, 226 };
+		public static int[] ACS_SPECIALS { get { return acsSpecials; } }
+
+		#endregion
+
+		#region ================== Methods
+
+		public static void Init() 
+		{
+			//bind actions
+			General.Actions.BindMethods(typeof(GZGeneral));
+		}
+
+		#endregion
+
+		#region ================== Actions
+
+		[BeginAction("gztogglemodels")]
+		private static void ToggleModelsRenderingMode() 
+		{
+			switch(General.Settings.GZDrawModelsMode)
+			{
+				case ModelRenderMode.NONE:
+					General.Settings.GZDrawModelsMode = ModelRenderMode.SELECTION;
+					General.MainWindow.DisplayStatus(StatusType.Action, "Models rendering mode: SELECTION ONLY");
+					break;
+
+				case ModelRenderMode.SELECTION:
+					General.Settings.GZDrawModelsMode = ModelRenderMode.ACTIVE_THINGS_FILTER;
+					General.MainWindow.DisplayStatus(StatusType.Action, "Models rendering mode: ACTIVE THINGS FILTER ONLY");
+					break;
+
+				case ModelRenderMode.ACTIVE_THINGS_FILTER:
+					General.Settings.GZDrawModelsMode = ModelRenderMode.ALL;
+					General.MainWindow.DisplayStatus(StatusType.Action, "Models rendering mode: ALL");
+					break;
+
+				case ModelRenderMode.ALL:
+					General.Settings.GZDrawModelsMode = ModelRenderMode.NONE;
+					General.MainWindow.DisplayStatus(StatusType.Action, "Models rendering mode: NONE");
+					break;
+			}
+			
+			General.MainWindow.RedrawDisplay();
+			General.MainWindow.UpdateGZDoomPanel();
+		}
+
+		[BeginAction("gztogglelights")]
+		private static void ToggleLightsRenderingMode() 
+		{
+			switch(General.Settings.GZDrawLightsMode) 
+			{
+				case LightRenderMode.NONE:
+					General.Settings.GZDrawLightsMode = LightRenderMode.ALL;
+					General.MainWindow.DisplayStatus(StatusType.Action, "Dynamic lights rendering mode: ALL");
+					break;
+
+				case LightRenderMode.ALL:
+					General.Settings.GZDrawLightsMode = LightRenderMode.ALL_ANIMATED;
+					General.MainWindow.DisplayStatus(StatusType.Action, "Models rendering mode: ANIMATED");
+					break;
+
+				case LightRenderMode.ALL_ANIMATED:
+					General.Settings.GZDrawLightsMode = LightRenderMode.NONE;
+					General.MainWindow.DisplayStatus(StatusType.Action, "Models rendering mode: NONE");
+					break;
+			}
+			
+			General.MainWindow.RedrawDisplay();
+			General.MainWindow.UpdateGZDoomPanel();
+		}
+
+		[BeginAction("gztogglefog")]
+		private static void ToggleFog() 
+		{
+			General.Settings.GZDrawFog = !General.Settings.GZDrawFog;
+			General.MainWindow.DisplayStatus(StatusType.Action, "Fog rendering is " + (General.Settings.GZDrawFog ? "ENABLED" : "DISABLED"));
+			General.MainWindow.RedrawDisplay();
+			General.MainWindow.UpdateGZDoomPanel();
+		}
+
+		[BeginAction("gztogglefx")]
+		private static void ToggleFx() 
+		{
+			int on = 0;
+			on += General.Settings.GZDrawFog ? 1 : -1;
+			on += General.Settings.GZDrawLightsMode != LightRenderMode.NONE ? 1 : -1;
+			on += General.Settings.GZDrawModelsMode != ModelRenderMode.NONE ? 1 : -1;
+
+			bool enable = (on < 0);
+
+			General.Settings.GZDrawFog = enable;
+			General.Settings.GZDrawLightsMode = (enable ? LightRenderMode.ALL : LightRenderMode.NONE);
+			General.Settings.GZDrawModelsMode = (enable ? ModelRenderMode.ALL : ModelRenderMode.NONE);
+			General.MainWindow.DisplayStatus(StatusType.Action, "Advanced effects are " + (enable ? "ENABLED" : "DISABLED") );
+
+			General.MainWindow.RedrawDisplay();
+			General.MainWindow.UpdateGZDoomPanel();
+		}
+
+		[BeginAction("gztoggleeventlines")]
+		private static void ToggleEventLines() 
+		{
+			General.Settings.GZShowEventLines = !General.Settings.GZShowEventLines;
+			General.MainWindow.DisplayStatus(StatusType.Action, "Event lines are " + (General.Settings.GZShowEventLines ? "ENABLED" : "DISABLED"));
+			General.MainWindow.RedrawDisplay();
+			General.MainWindow.UpdateGZDoomPanel();
+		}
+
+		[BeginAction("gztogglevisualvertices")]
+		private static void ToggleVisualVertices() 
+		{
+			General.Settings.GZShowVisualVertices = !General.Settings.GZShowVisualVertices;
+			General.MainWindow.DisplayStatus(StatusType.Action, "Visual vertices are " + (General.Settings.GZShowVisualVertices ? "ENABLED" : "DISABLED"));
+			General.MainWindow.RedrawDisplay();
+			General.MainWindow.UpdateGZDoomPanel();
+		}
+
+		//main menu actions
+		[BeginAction("gzreloadmodeldef")]
+		private static void ReloadModeldef() 
+		{
+			if(General.Map != null) General.Map.Data.ReloadModeldef();
+		}
+
+		[BeginAction("gzreloadgldefs")]
+		private static void ReloadGldefs() 
+		{
+			if(General.Map != null) General.Map.Data.ReloadGldefs();
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/GZBuilder/Geometry/Line3D.cs b/Source/Core/GZBuilder/Geometry/Line3D.cs
new file mode 100644
index 0000000..9cd3703
--- /dev/null
+++ b/Source/Core/GZBuilder/Geometry/Line3D.cs
@@ -0,0 +1,63 @@
+using System;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Rendering;
+
+namespace CodeImp.DoomBuilder.GZBuilder.Geometry 
+{
+	public class Line3D 
+	{
+		// Coordinates
+		public Vector3D Start;
+		public Vector3D End;
+		public PixelColor Color;
+		public readonly bool RenderArrowhead;
+
+		// Changed by Renderer2D.RenderArrows()
+		internal Vector2D Start2D;
+		internal Vector2D End2D;
+		internal bool SkipRendering;
+
+		// Constructors
+		public Line3D(Vector3D start, Vector3D end) 
+		{
+			this.Start = start;
+			this.End = end;
+			this.Color = General.Colors.InfoLine;
+			this.RenderArrowhead = true;
+		}
+
+		public Line3D(Vector3D start, Vector3D end, bool renderArrowhead)
+		{
+			this.Start = start;
+			this.End = end;
+			this.Color = General.Colors.InfoLine;
+			this.RenderArrowhead = renderArrowhead;
+		}
+
+		public Line3D(Vector3D start, Vector3D end, PixelColor color) 
+		{
+			this.Start = start;
+			this.End = end;
+			this.Color = color;
+			this.RenderArrowhead = true;
+		}
+
+		public Line3D(Vector3D start, Vector3D end, PixelColor color, bool renderArrowhead)
+		{
+			this.Start = start;
+			this.End = end;
+			this.Color = color;
+			this.RenderArrowhead = renderArrowhead;
+		}
+
+		public Vector3D GetDelta() { return End - Start; }
+
+		// This calculates the angle
+		public float GetAngle() 
+		{
+			// Calculate and return the angle
+			Vector2D d = GetDelta();
+			return -(float)Math.Atan2(-d.y, d.x) + Angle2D.PIHALF;
+		}
+	}
+}
diff --git a/Source/Core/GZBuilder/Rendering/SizelessVisualThingCage.cs b/Source/Core/GZBuilder/Rendering/SizelessVisualThingCage.cs
new file mode 100644
index 0000000..f6896b8
--- /dev/null
+++ b/Source/Core/GZBuilder/Rendering/SizelessVisualThingCage.cs
@@ -0,0 +1,93 @@
+/*#region ================== Namespaces
+
+using System;
+using SlimDX.Direct3D9;
+using CodeImp.DoomBuilder.Rendering;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.GZBuilder.Rendering
+{
+	internal sealed class SizelessVisualThingCage : IDisposable, ID3DResource
+	{
+		#region ================== Constants
+
+		private const float RADIUS = 1.0f;
+
+		#endregion
+
+		#region ================== Variables
+
+		private VertexBuffer shape;
+		private bool isdisposed;
+
+		#endregion
+
+		#region ================== Properties
+
+		public VertexBuffer Shape { get { return shape; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		public SizelessVisualThingCage() 
+		{
+			// Create geometry
+			ReloadResource();
+
+			// Register as resource
+			General.Map.Graphics.RegisterResource(this);
+		}
+
+		public void Dispose() 
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Clean up
+				if(shape != null) shape.Dispose();
+				shape = null;
+
+				// Unregister resource
+				General.Map.Graphics.UnregisterResource(this);
+
+				// Done
+				isdisposed = true;
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This is called resets when the device is reset
+		// (when resized or display adapter was changed)
+		public void ReloadResource()
+		{
+			WorldVertex v0 = new WorldVertex(-RADIUS, -RADIUS, 0f);
+			WorldVertex v1 = new WorldVertex(RADIUS, RADIUS, 0f);
+			WorldVertex v2 = new WorldVertex(RADIUS, -RADIUS, 0f);
+			WorldVertex v3 = new WorldVertex(-RADIUS, RADIUS, 0f);
+			WorldVertex v4 = new WorldVertex(0f, 0f, RADIUS);
+			WorldVertex v5 = new WorldVertex(0f, 0f, -RADIUS);
+
+			WorldVertex[] vs = new[] { v0, v1, v2, v3, v4, v5 };
+
+			shape = new VertexBuffer(General.Map.Graphics.Device, WorldVertex.Stride * vs.Length, Usage.WriteOnly | Usage.Dynamic, VertexFormat.None, Pool.Default);
+			shape.Lock(0, WorldVertex.Stride * vs.Length, LockFlags.None).WriteRange(vs);
+			shape.Unlock();
+		}
+
+		// This is called before a device is reset
+		// (when resized or display adapter was changed)
+		public void UnloadResource() 
+		{
+			// Trash geometry buffer
+			if(shape != null) shape.Dispose();
+			shape = null;
+		}
+
+		#endregion
+	}
+}*/
diff --git a/Source/Core/GZBuilder/Rendering/ThingBoundingBox.cs b/Source/Core/GZBuilder/Rendering/ThingBoundingBox.cs
new file mode 100644
index 0000000..b4825f5
--- /dev/null
+++ b/Source/Core/GZBuilder/Rendering/ThingBoundingBox.cs
@@ -0,0 +1,124 @@
+/*#region ================== Namespaces
+
+using System;
+using SlimDX.Direct3D9;
+using CodeImp.DoomBuilder.Rendering;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.GZBuilder.Rendering
+{
+	sealed class ThingBoundingBox : IDisposable, ID3DResource
+	{
+
+		#region ================== Variables
+
+		private VertexBuffer cage;
+		private VertexBuffer arrow;
+		private bool isdisposed;
+
+		#endregion
+
+		#region ================== Properties
+
+		public VertexBuffer Cage { get { return cage; } }
+		public VertexBuffer Arrow { get { return arrow; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		public ThingBoundingBox() 
+		{
+			// Create geometry
+			ReloadResource();
+
+			// Register as resource
+			General.Map.Graphics.RegisterResource(this);
+		}
+
+		public void Dispose() 
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				if(arrow != null) arrow.Dispose();
+				if(cage != null) cage.Dispose();
+
+				// Unregister resource
+				General.Map.Graphics.UnregisterResource(this);
+
+				// Done
+				isdisposed = true;
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This is called resets when the device is reset
+		// (when resized or display adapter was changed)
+		public void ReloadResource() 
+		{
+			WorldVertex v0 = new WorldVertex(-1.0f, -1.0f, 0.0f);
+			WorldVertex v1 = new WorldVertex(-1.0f, 1.0f, 0.0f);
+			WorldVertex v2 = new WorldVertex(1.0f, 1.0f, 0.0f);
+			WorldVertex v3 = new WorldVertex(1.0f, -1.0f, 0.0f);
+
+			WorldVertex v4 = new WorldVertex(-1.0f, -1.0f, 1.0f);
+			WorldVertex v5 = new WorldVertex(-1.0f, 1.0f, 1.0f);
+			WorldVertex v6 = new WorldVertex(1.0f, 1.0f, 1.0f);
+			WorldVertex v7 = new WorldVertex(1.0f, -1.0f, 1.0f);
+
+			//cage
+			WorldVertex[] cageVerts = new WorldVertex[] { v0, v1,
+														  v1, v2,
+														  v2, v3,
+														  v3, v0,
+														  v4, v5, 
+														  v5, v6,
+														  v6, v7,
+														  v7, v4,
+														  v0, v4,
+														  v1, v5,
+														  v2, v6,
+														  v3, v7 };
+
+			cage = new VertexBuffer(General.Map.Graphics.Device, WorldVertex.Stride * cageVerts.Length, Usage.WriteOnly | Usage.Dynamic, VertexFormat.None, Pool.Default);
+			cage.Lock(0, WorldVertex.Stride * cageVerts.Length, LockFlags.None).WriteRange(cageVerts);
+			cage.Unlock();
+
+			//arrow
+			WorldVertex a0 = new WorldVertex(); //start
+			WorldVertex a1 = new WorldVertex( 0.0f, -1.5f,  0.0f); //end
+			WorldVertex a2 = new WorldVertex( 0.2f, -1.1f,  0.2f);
+			WorldVertex a3 = new WorldVertex(-0.2f, -1.1f,  0.2f);
+			WorldVertex a4 = new WorldVertex( 0.2f, -1.1f, -0.2f);
+			WorldVertex a5 = new WorldVertex(-0.2f, -1.1f, -0.2f);
+
+			WorldVertex[] arrowVerts = new WorldVertex[] {a0, a1,
+														  a1, a2,
+														  a1, a3,
+														  a1, a4,
+														  a1, a5};
+
+			arrow = new VertexBuffer(General.Map.Graphics.Device, WorldVertex.Stride * arrowVerts.Length, Usage.WriteOnly | Usage.Dynamic, VertexFormat.None, Pool.Default);
+			arrow.Lock(0, WorldVertex.Stride * arrowVerts.Length, LockFlags.None).WriteRange(arrowVerts);
+			arrow.Unlock();
+		}
+
+		// This is called before a device is reset
+		// (when resized or display adapter was changed)
+		public void UnloadResource() 
+		{
+			// Trash geometry buffers
+			if(cage != null) cage.Dispose();
+			if(arrow != null) arrow.Dispose();
+			cage = null;
+			arrow = null;
+		}
+
+		#endregion
+	}
+}*/
diff --git a/Source/Core/GZBuilder/Rendering/VisualVertexHandle.cs b/Source/Core/GZBuilder/Rendering/VisualVertexHandle.cs
new file mode 100644
index 0000000..eac7e3d
--- /dev/null
+++ b/Source/Core/GZBuilder/Rendering/VisualVertexHandle.cs
@@ -0,0 +1,119 @@
+#region ================== Namespaces
+
+using System;
+using CodeImp.DoomBuilder.VisualModes;
+using SlimDX.Direct3D9;
+using CodeImp.DoomBuilder.Rendering;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.GZBuilder.Rendering
+{
+	internal sealed class VisualVertexHandle : IDisposable, ID3DResource
+	{
+		#region ================== Variables
+
+		private VertexBuffer upper;
+		private VertexBuffer lower;
+		private bool isdisposed;
+
+		#endregion
+
+		#region ================== Properties
+
+		public VertexBuffer Upper { get { return upper; } }
+		public VertexBuffer Lower { get { return lower; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		public VisualVertexHandle() 
+		{
+			// Create geometry
+			ReloadResource();
+
+			// Register as resource
+			General.Map.Graphics.RegisterResource(this);
+		}
+
+		public void Dispose() 
+		{
+			// Not already disposed?
+			if(!isdisposed) 
+			{
+				if(upper != null) upper.Dispose();
+				if(lower != null) lower.Dispose();
+
+				// Unregister resource
+				General.Map.Graphics.UnregisterResource(this);
+
+				// Done
+				isdisposed = true;
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This is called resets when the device is reset
+		// (when resized or display adapter was changed)
+		public void ReloadResource() 
+		{
+			float radius = VisualVertex.DEFAULT_SIZE * General.Settings.GZVertexScale3D;
+
+			WorldVertex c = new WorldVertex();
+			WorldVertex v0 = new WorldVertex(-radius, -radius, -radius);
+			WorldVertex v1 = new WorldVertex(-radius, radius, -radius);
+			WorldVertex v2 = new WorldVertex(radius, radius, -radius);
+			WorldVertex v3 = new WorldVertex(radius, -radius, -radius);
+
+			WorldVertex v4 = new WorldVertex(-radius, -radius, radius);
+			WorldVertex v5 = new WorldVertex(-radius, radius, radius);
+			WorldVertex v6 = new WorldVertex(radius, radius, radius);
+			WorldVertex v7 = new WorldVertex(radius, -radius, radius);
+
+			WorldVertex[] vu = new []{ c, v0,
+									   c, v1,
+									   c, v2,
+									   c, v3,
+
+									   v0, v1,
+									   v1, v2,
+									   v2, v3,
+									   v3, v0 };
+
+			upper = new VertexBuffer(General.Map.Graphics.Device, WorldVertex.Stride * vu.Length, Usage.WriteOnly | Usage.Dynamic, VertexFormat.None, Pool.Default);
+			upper.Lock(0, WorldVertex.Stride * vu.Length, LockFlags.None).WriteRange(vu);
+			upper.Unlock();
+
+			WorldVertex[] vl = new[]{ c, v4,
+									  c, v5,
+									  c, v6,
+									  c, v7,
+
+									  v4, v5, 
+									  v5, v6,
+									  v6, v7,
+									  v7, v4 };
+
+			lower = new VertexBuffer(General.Map.Graphics.Device, WorldVertex.Stride * vl.Length, Usage.WriteOnly | Usage.Dynamic, VertexFormat.None, Pool.Default);
+			lower.Lock(0, WorldVertex.Stride * vl.Length, LockFlags.None).WriteRange(vl);
+			lower.Unlock();
+		}
+
+		// This is called before a device is reset
+		// (when resized or display adapter was changed)
+		public void UnloadResource() 
+		{
+			// Trash geometry buffers
+			if(upper != null) upper.Dispose();
+			if(lower != null) lower.Dispose();
+			upper = null;
+			lower = null;
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/GZBuilder/Windows/ExceptionDialog.cs b/Source/Core/GZBuilder/Windows/ExceptionDialog.cs
new file mode 100644
index 0000000..c1542c8
--- /dev/null
+++ b/Source/Core/GZBuilder/Windows/ExceptionDialog.cs
@@ -0,0 +1,220 @@
+#region ================== Namespaces
+
+using System;
+using System.IO;
+using System.Management;
+using System.Windows.Forms;
+using System.Threading;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.GZBuilder.Windows
+{
+	public partial class ExceptionDialog : Form
+	{
+		private readonly bool cannotContinue;
+		private readonly string logPath;
+		
+		public ExceptionDialog(UnhandledExceptionEventArgs e) 
+		{
+			InitializeComponent();
+
+			logPath = Path.Combine(General.SettingsPath, @"GZCrash.txt");
+			Exception ex = (Exception)e.ExceptionObject;
+			errorDescription.Text = "Error in " + ex.Source + ":";
+			using(StreamWriter sw = File.CreateText(logPath)) 
+			{
+				sw.Write(GetExceptionDescription(ex));
+			}
+
+			errorMessage.Text = ex.Message + Environment.NewLine + ex.StackTrace;
+			cannotContinue = true;  //cannot recover from this...
+		}
+
+		public ExceptionDialog(ThreadExceptionEventArgs e) 
+		{
+			InitializeComponent();
+
+			logPath = Path.Combine(General.SettingsPath, @"GZCrash.txt");
+			errorDescription.Text = "Error in " + e.Exception.Source + ":";
+			string sysinfo = GetSystemInfo();
+			using(StreamWriter sw = File.CreateText(logPath)) 
+			{
+				sw.Write(sysinfo + GetExceptionDescription(e.Exception));
+			}
+
+			errorMessage.Text = sysinfo + "********EXCEPTION DETAILS********" + Environment.NewLine 
+				+ e.Exception.Message + Environment.NewLine + e.Exception.StackTrace;
+		}
+
+		public void Setup() 
+		{
+			bContinue.Enabled = !cannotContinue;
+
+			string[] titles = {
+								  "0x000000 at 0xFFFFFF. That's probaby bad",
+								  "Here we go again...",
+								  "Uh oh, you're screwed",
+								  "All is lost!",
+								  "Achievement unlocked: CRASH TIME!",
+								  "OH NOES! TEH ERROR!",
+								  "0001000001111011000000000011001101011110110111",
+								  "Nuclear launch detected!",
+								  "Don't send this to Microsoft",
+								  "You. Shall. Not. Pass!!!",
+								  "Yep, we have bugs",
+								  "It's dangerous to go alone. Take this!",
+								  "The operation completed successfully",
+								  "Security Alert – Moving cursor is not as safe as you thought",
+								  "Random error appears from north",
+								  "ERROR: NO_ERROR",
+								  "Epic fail",
+								  "At least it's not BSoD...",
+								  "User Error. Please Replace User",
+								  "Brought to you by MaxED!",
+								  "GZDoom Builder proudly presents:",
+								  "You aren't expected to understand this",
+								  "Back to the drawing board...",
+								  "I'm sorry... :(",
+								  "This is a horrbble day for you, and of course, the world",
+								  "Abort, Retry, Fail?",
+								  "You are making progress. I'm afraid that's something I can't allow to happen",
+								  "You are making progress. That's not OK",
+								  "No errors found, restarting computer",
+								  "Does Not Compute!",
+								  "I’m sorry, Dave, I’m afraid I can’t do that",
+								  "What's that? Chicken?",
+								  "It can only be attributable to human error",
+								  "It's now safe to turn off your computer",
+								  "I've got a bad feeling about this",
+								  "YOU CAN’T DO THAT!",
+								  "Man the Lifeboats! Women and children first!",
+								  "IMPOSSIBURU!!!",
+								  "Now deleting all files. Goodbye",
+								  "General Failure",
+								  "Invalid Error",
+								  "Beam me up Scotty, there’s no life out here",
+								  "Well, you ran into something and the game is over",
+								  "I'm good at writing bad code",
+								  "$FUNNY_ERROR_CAPTION",
+								  "In Soviet Russia, exception throws YOU!",
+								  "...and then GZDB was the demons!",
+								  "B U S T E D",
+								  "Freeze mode enabled",
+								  "You feel strange...",
+								  "That doesn't seem to work",
+								  "This function is only available in the retail version of GZDoom Builder",
+								  "You picked up the Random Exception.",
+								  "Pinky says that you're the new hope. Bear that in mind.",
+								  "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+								  "Deal with it",
+								  "Error 47",
+								  "YOU DIED",
+								  "Thanks, Obama",
+								  "The God Of Exceptions Demands MORE Exceptions!",
+								  "Good. It's boring here anyway.",
+								  "Shameful display!",
+								  "It's CRASHENING!",
+								  "W-W-W-WIPEOUT!",
+								  "EVERYTHING IS LOST!",
+								  "Your empty is full!",
+								  "Let's see how far this infinite loop goes...",
+							  };
+			this.Text = titles[new Random().Next(0, titles.Length - 1)];
+		}
+
+		private static string GetSystemInfo()
+		{
+			string result = "***********SYSTEM INFO***********" + Environment.NewLine;
+			
+			// Get OS name
+			ManagementObjectSearcher searcher = new ManagementObjectSearcher("SELECT Caption FROM Win32_OperatingSystem");
+			foreach(ManagementObject mo in searcher.Get())
+			{
+				result += "OS: " + mo["Caption"] + Environment.NewLine;
+				break;
+			}
+
+			// Get GPU name
+			searcher = new ManagementObjectSearcher("SELECT * FROM Win32_VideoController");
+			foreach(ManagementObject mo in searcher.Get())
+			{
+				PropertyData bpp = mo.Properties["CurrentBitsPerPixel"];
+				PropertyData description = mo.Properties["Description"];
+				if(bpp != null && description != null && bpp.Value != null)
+				{
+					result += "GPU: " + description.Value + Environment.NewLine;
+					break;
+				}
+			}
+
+			// Get GZDB version
+			result += "GZDB: R" + General.ThisAssembly.GetName().Version.Revision + Environment.NewLine + Environment.NewLine;
+
+			return result;
+		}
+
+		private static string GetExceptionDescription(Exception ex) 
+		{
+			//add to error logger
+			General.ErrorLogger.Add(ErrorType.Error, "**** " + ex.Source + ": " + ex.Message + " ****");
+
+			string message = "********EXCEPTION DETAILS********"
+							 + Environment.NewLine + ex.Source + ": " + ex.Message + Environment.NewLine + ex.StackTrace;
+
+			if(File.Exists(General.LogFile)) 
+			{
+				try 
+				{
+					string[] lines = File.ReadAllLines(General.LogFile);
+					message += Environment.NewLine + Environment.NewLine + "***********ACTIONS LOG***********";
+					for(int i = lines.Length - 1; i > -1; i--) 
+						message += Environment.NewLine + lines[i];
+				} catch(Exception) { }
+			}
+
+			return message;
+		}
+
+		private void reportLink_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) 
+		{
+			if(!File.Exists(logPath)) return;
+			System.Diagnostics.Process.Start("explorer.exe", @"/select, " + logPath);
+			reportLink.LinkVisited = true;
+		}
+
+		private void threadLink_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) 
+		{
+			try 
+			{
+				System.Diagnostics.Process.Start("http://forum.zdoom.org/viewtopic.php?f=3&t=32392&start=9999999");
+			} 
+			catch(Exception) 
+			{
+				MessageBox.Show("Unable to open URL...");
+			}
+			
+			threadLink.LinkVisited = true;
+		}
+
+		private void bContinue_Click(object sender, EventArgs e) 
+		{
+			this.DialogResult = DialogResult.OK;
+			this.Close();
+		}
+
+		private void bQuit_Click(object sender, EventArgs e)
+		{
+			if(General.Map != null) General.Map.SaveMapBackup();
+			this.DialogResult = DialogResult.Cancel;
+			this.Close();
+		}
+
+		private void bToClipboard_Click(object sender, EventArgs e) 
+		{
+			errorMessage.SelectAll();
+			errorMessage.Copy();
+			errorMessage.DeselectAll();
+		}
+	}
+}
diff --git a/Source/Core/GZBuilder/Windows/ExceptionDialog.designer.cs b/Source/Core/GZBuilder/Windows/ExceptionDialog.designer.cs
new file mode 100644
index 0000000..576854f
--- /dev/null
+++ b/Source/Core/GZBuilder/Windows/ExceptionDialog.designer.cs
@@ -0,0 +1,181 @@
+namespace CodeImp.DoomBuilder.GZBuilder.Windows
+{
+	partial class ExceptionDialog
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing) 
+		{
+			if(disposing && (components != null)) 
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent() 
+		{
+			this.bQuit = new System.Windows.Forms.Button();
+			this.bContinue = new System.Windows.Forms.Button();
+			this.errorMessage = new System.Windows.Forms.TextBox();
+			this.pictureBox1 = new System.Windows.Forms.PictureBox();
+			this.reportLink = new System.Windows.Forms.LinkLabel();
+			this.threadLink = new System.Windows.Forms.LinkLabel();
+			this.bToClipboard = new System.Windows.Forms.Button();
+			this.errorDescription = new System.Windows.Forms.Label();
+			((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+			this.SuspendLayout();
+			// 
+			// bQuit
+			// 
+			this.bQuit.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.bQuit.Image = global::CodeImp.DoomBuilder.Properties.Resources.SearchClear;
+			this.bQuit.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+			this.bQuit.Location = new System.Drawing.Point(537, 212);
+			this.bQuit.Name = "bQuit";
+			this.bQuit.Size = new System.Drawing.Size(75, 28);
+			this.bQuit.TabIndex = 0;
+			this.bQuit.Text = "Quit";
+			this.bQuit.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+			this.bQuit.UseVisualStyleBackColor = true;
+			this.bQuit.Click += new System.EventHandler(this.bQuit_Click);
+			// 
+			// bContinue
+			// 
+			this.bContinue.Image = global::CodeImp.DoomBuilder.Properties.Resources.Test;
+			this.bContinue.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+			this.bContinue.Location = new System.Drawing.Point(446, 212);
+			this.bContinue.Name = "bContinue";
+			this.bContinue.Size = new System.Drawing.Size(85, 28);
+			this.bContinue.TabIndex = 1;
+			this.bContinue.Text = "Continue";
+			this.bContinue.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+			this.bContinue.UseVisualStyleBackColor = true;
+			this.bContinue.Click += new System.EventHandler(this.bContinue_Click);
+			// 
+			// errorMessage
+			// 
+			this.errorMessage.Location = new System.Drawing.Point(77, 28);
+			this.errorMessage.Multiline = true;
+			this.errorMessage.Name = "errorMessage";
+			this.errorMessage.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
+			this.errorMessage.Size = new System.Drawing.Size(535, 151);
+			this.errorMessage.TabIndex = 3;
+			this.errorMessage.Text = "Stack trace";
+			// 
+			// pictureBox1
+			// 
+			this.pictureBox1.Image = global::CodeImp.DoomBuilder.Properties.Resources.MCrash;
+			this.pictureBox1.Location = new System.Drawing.Point(7, 9);
+			this.pictureBox1.Name = "pictureBox1";
+			this.pictureBox1.Size = new System.Drawing.Size(64, 64);
+			this.pictureBox1.TabIndex = 2;
+			this.pictureBox1.TabStop = false;
+			// 
+			// reportLink
+			// 
+			this.reportLink.AutoSize = true;
+			this.reportLink.LinkArea = new System.Windows.Forms.LinkArea(53, 4);
+			this.reportLink.LinkColor = System.Drawing.SystemColors.HotTrack;
+			this.reportLink.Location = new System.Drawing.Point(77, 188);
+			this.reportLink.Name = "reportLink";
+			this.reportLink.Size = new System.Drawing.Size(286, 17);
+			this.reportLink.TabIndex = 5;
+			this.reportLink.TabStop = true;
+			this.reportLink.Text = "Error report with additional information was created here";
+			this.reportLink.UseCompatibleTextRendering = true;
+			this.reportLink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.reportLink_LinkClicked);
+			// 
+			// threadLink
+			// 
+			this.threadLink.AutoSize = true;
+			this.threadLink.LinkArea = new System.Windows.Forms.LinkArea(101, 28);
+			this.threadLink.LinkColor = System.Drawing.SystemColors.HotTrack;
+			this.threadLink.Location = new System.Drawing.Point(77, 210);
+			this.threadLink.Name = "threadLink";
+			this.threadLink.Size = new System.Drawing.Size(349, 30);
+			this.threadLink.TabIndex = 8;
+			this.threadLink.TabStop = true;
+			this.threadLink.Text = "You can help fixing this error if you provide the ways to reproduce it \r\nand the " +
+				"error report at the official thread at ZDoom.org";
+			this.threadLink.UseCompatibleTextRendering = true;
+			this.threadLink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.threadLink_LinkClicked);
+			// 
+			// bToClipboard
+			// 
+			this.bToClipboard.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.bToClipboard.Image = global::CodeImp.DoomBuilder.Properties.Resources.Copy;
+			this.bToClipboard.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+			this.bToClipboard.Location = new System.Drawing.Point(446, 184);
+			this.bToClipboard.Name = "bToClipboard";
+			this.bToClipboard.Size = new System.Drawing.Size(166, 24);
+			this.bToClipboard.TabIndex = 9;
+			this.bToClipboard.Text = "Copy to clipboard";
+			this.bToClipboard.UseVisualStyleBackColor = true;
+			this.bToClipboard.Click += new System.EventHandler(this.bToClipboard_Click);
+			// 
+			// errorDescription
+			// 
+			this.errorDescription.AutoSize = true;
+			this.errorDescription.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.errorDescription.Location = new System.Drawing.Point(77, 9);
+			this.errorDescription.Name = "errorDescription";
+			this.errorDescription.Size = new System.Drawing.Size(176, 13);
+			this.errorDescription.TabIndex = 10;
+			this.errorDescription.Text = "An application error occurred:";
+			// 
+			// ExceptionDialog
+			// 
+			this.AcceptButton = this.bContinue;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.CancelButton = this.bQuit;
+			this.ClientSize = new System.Drawing.Size(624, 244);
+			this.Controls.Add(this.reportLink);
+			this.Controls.Add(this.errorDescription);
+			this.Controls.Add(this.bToClipboard);
+			this.Controls.Add(this.threadLink);
+			this.Controls.Add(this.errorMessage);
+			this.Controls.Add(this.pictureBox1);
+			this.Controls.Add(this.bContinue);
+			this.Controls.Add(this.bQuit);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "ExceptionDialog";
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+			this.Text = "OH NOES! MOAR ERRORS!";
+			this.TopMost = true;
+			((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Button bQuit;
+		private System.Windows.Forms.Button bContinue;
+		private System.Windows.Forms.PictureBox pictureBox1;
+		private System.Windows.Forms.TextBox errorMessage;
+		private System.Windows.Forms.LinkLabel reportLink;
+		private System.Windows.Forms.LinkLabel threadLink;
+		private System.Windows.Forms.Button bToClipboard;
+		private System.Windows.Forms.Label errorDescription;
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/GZBuilder/Windows/ExceptionDialog.resx b/Source/Core/GZBuilder/Windows/ExceptionDialog.resx
new file mode 100644
index 0000000..19dc0dd
--- /dev/null
+++ b/Source/Core/GZBuilder/Windows/ExceptionDialog.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/Source/Core/GZBuilder/Windows/TagStatisticsForm.Designer.cs b/Source/Core/GZBuilder/Windows/TagStatisticsForm.Designer.cs
new file mode 100644
index 0000000..dd4821b
--- /dev/null
+++ b/Source/Core/GZBuilder/Windows/TagStatisticsForm.Designer.cs
@@ -0,0 +1,214 @@
+namespace CodeImp.DoomBuilder.GZBuilder.Windows
+{
+	partial class TagStatisticsForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing) 
+		{
+			if(disposing && (components != null)) 
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent() 
+		{
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TagStatisticsForm));
+			this.dataGridView = new System.Windows.Forms.DataGridView();
+			this.TagColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.Label = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.Sectors = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.Linedefs = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.Things = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.apply = new System.Windows.Forms.Button();
+			this.cancel = new System.Windows.Forms.Button();
+			this.hint = new System.Windows.Forms.TextBox();
+			((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
+			this.SuspendLayout();
+			// 
+			// dataGridView
+			// 
+			this.dataGridView.AllowUserToAddRows = false;
+			this.dataGridView.AllowUserToDeleteRows = false;
+			this.dataGridView.AllowUserToResizeColumns = false;
+			this.dataGridView.AllowUserToResizeRows = false;
+			this.dataGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.dataGridView.BackgroundColor = System.Drawing.SystemColors.Window;
+			this.dataGridView.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+			this.dataGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None;
+			this.dataGridView.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
+			dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+			dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
+			dataGridViewCellStyle1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
+			dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+			dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+			dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+			this.dataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
+			this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+			this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.TagColumn,
+            this.Label,
+            this.Sectors,
+            this.Linedefs,
+            this.Things});
+			this.dataGridView.Location = new System.Drawing.Point(12, 12);
+			this.dataGridView.MultiSelect = false;
+			this.dataGridView.Name = "dataGridView";
+			this.dataGridView.RowHeadersVisible = false;
+			this.dataGridView.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
+			this.dataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
+			this.dataGridView.Size = new System.Drawing.Size(477, 256);
+			this.dataGridView.TabIndex = 3;
+			this.dataGridView.CellMouseClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dataGridView_CellMouseClick);
+			this.dataGridView.CellMouseDoubleClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dataGridView_CellMouseDoubleClick);
+			// 
+			// TagColumn
+			// 
+			this.TagColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader;
+			dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+			this.TagColumn.DefaultCellStyle = dataGridViewCellStyle2;
+			this.TagColumn.HeaderText = "Tag";
+			this.TagColumn.Name = "TagColumn";
+			this.TagColumn.ReadOnly = true;
+			this.TagColumn.Width = 51;
+			// 
+			// Label
+			// 
+			this.Label.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+			dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+			this.Label.DefaultCellStyle = dataGridViewCellStyle3;
+			this.Label.HeaderText = "Label";
+			this.Label.Name = "Label";
+			// 
+			// Sectors
+			// 
+			this.Sectors.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader;
+			dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+			this.Sectors.DefaultCellStyle = dataGridViewCellStyle4;
+			this.Sectors.HeaderText = "Sectors";
+			this.Sectors.Name = "Sectors";
+			this.Sectors.ReadOnly = true;
+			this.Sectors.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+			this.Sectors.Width = 68;
+			// 
+			// Linedefs
+			// 
+			this.Linedefs.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader;
+			dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+			this.Linedefs.DefaultCellStyle = dataGridViewCellStyle5;
+			this.Linedefs.HeaderText = "Linedefs";
+			this.Linedefs.Name = "Linedefs";
+			this.Linedefs.ReadOnly = true;
+			this.Linedefs.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+			this.Linedefs.Width = 72;
+			// 
+			// Things
+			// 
+			this.Things.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader;
+			dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+			this.Things.DefaultCellStyle = dataGridViewCellStyle6;
+			this.Things.HeaderText = "Things";
+			this.Things.Name = "Things";
+			this.Things.ReadOnly = true;
+			this.Things.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+			this.Things.Width = 64;
+			// 
+			// apply
+			// 
+			this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.apply.Location = new System.Drawing.Point(303, 319);
+			this.apply.Name = "apply";
+			this.apply.Size = new System.Drawing.Size(90, 23);
+			this.apply.TabIndex = 4;
+			this.apply.Text = "OK";
+			this.apply.UseVisualStyleBackColor = true;
+			this.apply.Click += new System.EventHandler(this.apply_Click);
+			// 
+			// cancel
+			// 
+			this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.cancel.Location = new System.Drawing.Point(399, 319);
+			this.cancel.Name = "cancel";
+			this.cancel.Size = new System.Drawing.Size(90, 23);
+			this.cancel.TabIndex = 5;
+			this.cancel.Text = "Cancel";
+			this.cancel.UseVisualStyleBackColor = true;
+			this.cancel.Click += new System.EventHandler(this.cancel_Click);
+			// 
+			// hint
+			// 
+			this.hint.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.hint.BackColor = System.Drawing.SystemColors.Control;
+			this.hint.BorderStyle = System.Windows.Forms.BorderStyle.None;
+			this.hint.Location = new System.Drawing.Point(12, 274);
+			this.hint.Multiline = true;
+			this.hint.Name = "hint";
+			this.hint.Size = new System.Drawing.Size(477, 68);
+			this.hint.TabIndex = 7;
+			this.hint.Text = resources.GetString("hint.Text");
+			// 
+			// TagStatisticsForm
+			// 
+			this.AcceptButton = this.apply;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.CancelButton = this.cancel;
+			this.ClientSize = new System.Drawing.Size(501, 348);
+			this.Controls.Add(this.cancel);
+			this.Controls.Add(this.apply);
+			this.Controls.Add(this.hint);
+			this.Controls.Add(this.dataGridView);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow;
+			this.MinimizeBox = false;
+			this.MinimumSize = new System.Drawing.Size(120, 80);
+			this.Name = "TagStatisticsForm";
+			this.Opacity = 1;
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.Text = "Tag statistics";
+			this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.TagStatisticsForm_FormClosing);
+			((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.DataGridView dataGridView;
+		private System.Windows.Forms.Button apply;
+		private System.Windows.Forms.Button cancel;
+		private System.Windows.Forms.TextBox hint;
+		private System.Windows.Forms.DataGridViewTextBoxColumn TagColumn;
+		private System.Windows.Forms.DataGridViewTextBoxColumn Label;
+		private System.Windows.Forms.DataGridViewTextBoxColumn Sectors;
+		private System.Windows.Forms.DataGridViewTextBoxColumn Linedefs;
+		private System.Windows.Forms.DataGridViewTextBoxColumn Things;
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/GZBuilder/Windows/TagStatisticsForm.cs b/Source/Core/GZBuilder/Windows/TagStatisticsForm.cs
new file mode 100644
index 0000000..2255f53
--- /dev/null
+++ b/Source/Core/GZBuilder/Windows/TagStatisticsForm.cs
@@ -0,0 +1,436 @@
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Editing;
+using CodeImp.DoomBuilder.Windows;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.GZBuilder.Windows
+{
+	public partial class TagStatisticsForm : DelayedForm
+	{
+		private static Size size = Size.Empty;
+		private static Point location = Point.Empty;
+
+		#region ================== Constructor
+
+		public TagStatisticsForm() 
+		{
+			InitializeComponent();
+
+			//apply window size and location
+			if(!size.IsEmpty && !location.IsEmpty)
+			{
+				this.StartPosition = FormStartPosition.Manual;
+				this.Size = size;
+				this.Location = location;
+			}
+
+			Setup();
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		private void Setup() 
+		{
+			//collect all tags
+			HashSet<int> tags = new HashSet<int>();
+			Dictionary<int, int> sectorsCountByTag = new Dictionary<int, int>();
+			Dictionary<int, int> linedefsCountByTag = new Dictionary<int, int>();
+			Dictionary<int, int> thingsCountByTag = new Dictionary<int, int>();
+
+			//collect used tags from sectors...
+			foreach(Sector s in General.Map.Map.Sectors) 
+			{
+				if(s.Tag == 0) continue;
+				tags.UnionWith(s.Tags);
+				foreach(int tag in s.Tags)
+				{
+					if(!sectorsCountByTag.ContainsKey(tag)) sectorsCountByTag.Add(tag, 0);
+					sectorsCountByTag[tag]++;
+				}
+			}
+
+			//...and linedefs...
+			if(General.Map.FormatInterface.HasLinedefTag) 
+			{
+				foreach(Linedef l in General.Map.Map.Linedefs) 
+				{
+					if(l.Tag == 0) continue;
+					tags.UnionWith(l.Tags);
+					foreach(int tag in l.Tags)
+					{
+						if(!linedefsCountByTag.ContainsKey(tag)) linedefsCountByTag.Add(tag, 0);
+						linedefsCountByTag[tag]++;
+					}
+				}
+			} 
+			else 
+			{
+				Linedefs.Visible = false;
+			}
+
+			//...and things...
+			if(General.Map.FormatInterface.HasThingTag) 
+			{
+				foreach(Thing t in General.Map.Map.Things) 
+				{
+					if(t.Tag == 0) continue;
+					if(!tags.Contains(t.Tag)) tags.Add(t.Tag);
+
+					if(!thingsCountByTag.ContainsKey(t.Tag)) thingsCountByTag.Add(t.Tag, 0);
+					thingsCountByTag[t.Tag]++;
+				}
+			} 
+			else 
+			{
+				Things.Visible = false;
+			}
+
+			//create rows
+			dataGridView.Rows.Clear();
+			foreach(int tag in tags) 
+			{
+				AddRow(tag,
+					General.Map.Options.TagLabels.ContainsKey(tag) ? General.Map.Options.TagLabels[tag] : string.Empty,
+					sectorsCountByTag.ContainsKey(tag) ? sectorsCountByTag[tag] : 0,
+					linedefsCountByTag.ContainsKey(tag) ? linedefsCountByTag[tag] : 0,
+					thingsCountByTag.ContainsKey(tag) ? thingsCountByTag[tag] : 0);
+			}
+
+			dataGridView.Sort(TagColumn, ListSortDirection.Ascending);
+		}
+
+		private void AddRow(int tag, string label, int sectorsCount, int linesCount, int thingsCount) 
+		{
+			DataGridViewRow row = new DataGridViewRow();
+
+			row.Cells.Add(new DataGridViewTextBoxCell { Value = tag });
+			row.Cells.Add(new DataGridViewTextBoxCell { Value = label });
+			row.Cells.Add(new DataGridViewTextBoxCell { Value = sectorsCount });
+			row.Cells.Add(new DataGridViewTextBoxCell { Value = linesCount });
+			row.Cells.Add(new DataGridViewTextBoxCell { Value = thingsCount });
+
+			dataGridView.Rows.Add(row);
+		}
+
+		private static List<Sector> GetSectorsWithTag(int tag, int count) 
+		{
+			List<Sector> list = new List<Sector>();
+			foreach(Sector s in General.Map.Map.Sectors) 
+			{
+				if(s.Tags.Contains(tag))
+				{
+					list.Add(s);
+					if(list.Count == count) break;
+				}
+			}
+
+			return list;
+		}
+
+		private static List<Linedef> GetLinedefsWithTag(int tag, int count) 
+		{
+			List<Linedef> list = new List<Linedef>();
+			foreach(Linedef l in General.Map.Map.Linedefs) 
+			{
+				if(l.Tags.Contains(tag))
+				{
+					list.Add(l);
+					if(list.Count == count) break;
+				}
+			}
+
+			return list;
+		}
+
+		private static List<Thing> GetThingsWithTag(int tag, int count) 
+		{
+			List<Thing> list = new List<Thing>();
+			foreach(Thing t in General.Map.Map.Things) 
+			{
+				if(t.Tag == tag) 
+				{
+					list.Add(t);
+					if(list.Count == count) break;
+				}
+			}
+
+			return list;
+		}
+
+		private static void ShowSelection(List<Vector2D> points) 
+		{
+			RectangleF area = MapSet.CreateEmptyArea();
+			
+			// Make a view area from the points
+			foreach(Vector2D p in points) area = MapSet.IncreaseArea(area, p);
+
+			// Make the area square, using the largest side
+			if(area.Width > area.Height) 
+			{
+				float delta = area.Width - area.Height;
+				area.Y -= delta * 0.5f;
+				area.Height += delta;
+			} 
+			else 
+			{
+				float delta = area.Height - area.Width;
+				area.X -= delta * 0.5f;
+				area.Width += delta;
+			}
+
+			// Add padding
+			area.Inflate(100f, 100f);
+
+			// Zoom to area
+			if(General.Editing.Mode is ClassicMode)
+			{
+				ClassicMode editmode = (General.Editing.Mode as ClassicMode);
+				editmode.CenterOnArea(area, 0.6f);
+			}
+		}
+
+		#endregion
+
+		#region ================== Events
+
+		private void apply_Click(object sender, EventArgs e) 
+		{
+			//refill TagLabels with table data
+			dataGridView.Sort(TagColumn, ListSortDirection.Ascending);
+			General.Map.Options.TagLabels.Clear();
+
+			foreach(DataGridViewRow row in dataGridView.Rows) 
+			{
+				string label = row.Cells[1].Value.ToString();
+				if(!string.IsNullOrEmpty(label))
+					General.Map.Options.TagLabels.Add((int)row.Cells[0].Value, label);
+			}
+			
+			this.Close();
+		}
+
+		private void cancel_Click(object sender, EventArgs e) 
+		{
+			this.Close();
+		}
+
+		private void dataGridView_CellMouseClick(object sender, DataGridViewCellMouseEventArgs e) 
+		{
+			if(e.ColumnIndex < 2 || e.RowIndex == -1) return;
+			
+			//select 
+			if(e.Button == MouseButtons.Left) 
+			{
+				int tag = (int)dataGridView.Rows[e.RowIndex].Cells[0].Value;
+
+				if(e.ColumnIndex == 2) //sectors
+				{ 
+					List<Sector> list = GetSectorsWithTag(tag, (int)dataGridView.Rows[e.RowIndex].Cells[2].Value);
+					if(list.Count > 0) 
+					{
+						General.Map.Map.ClearSelectedSectors();
+						General.Map.Map.ClearSelectedLinedefs();
+						
+						List<Vector2D> points = new List<Vector2D>();
+						General.Editing.ChangeMode("SectorsMode");
+						ClassicMode mode = (ClassicMode)General.Editing.Mode;
+
+						foreach(Sector s in list) 
+						{
+							mode.SelectMapElement(s);
+
+							foreach(Sidedef sd in s.Sidedefs) 
+							{
+								points.Add(sd.Line.Start.Position);
+								points.Add(sd.Line.End.Position);
+							}
+						}
+
+						ShowSelection(points);
+					}
+				} 
+				else if(e.ColumnIndex == 3) //linedefs
+				{ 
+					List<Linedef> list = GetLinedefsWithTag(tag, (int)dataGridView.Rows[e.RowIndex].Cells[3].Value);
+					if(list.Count > 0) 
+					{
+						General.Map.Map.ClearSelectedSectors();
+						General.Map.Map.ClearSelectedLinedefs();
+
+						List<Vector2D> points = new List<Vector2D>();
+						foreach(Linedef l in list) 
+						{
+							l.Selected = true;
+							points.Add(l.Start.Position);
+							points.Add(l.End.Position);
+						}
+
+						General.Map.Map.Update();
+						General.Editing.ChangeMode("LinedefsMode");
+						ShowSelection(points);
+					}
+				} 
+				else if(e.ColumnIndex == 4) //things
+				{ 
+					List<Thing> list = GetThingsWithTag(tag, (int)dataGridView.Rows[e.RowIndex].Cells[4].Value);
+					if(list.Count > 0) 
+					{
+						General.Map.Map.ClearSelectedThings();
+
+						List<Vector2D> points = new List<Vector2D>();
+						foreach(Thing t in list) 
+						{
+							t.Selected = true;
+
+							Vector2D p = t.Position;
+							points.Add(p);
+							points.Add(p + new Vector2D(t.Size * 2.0f, t.Size * 2.0f));
+							points.Add(p + new Vector2D(t.Size * 2.0f, -t.Size * 2.0f));
+							points.Add(p + new Vector2D(-t.Size * 2.0f, t.Size * 2.0f));
+							points.Add(p + new Vector2D(-t.Size * 2.0f, -t.Size * 2.0f));
+						}
+
+						General.Map.Map.Update();
+						General.Editing.ChangeMode("ThingsMode");
+						ShowSelection(points);
+					}
+				}
+
+			
+			} 
+			else if(e.Button == MouseButtons.Right) //open properties window
+			{
+				dataGridView.Rows[e.RowIndex].Cells[e.ColumnIndex].Selected = true;
+				int tag = (int)dataGridView.Rows[e.RowIndex].Cells[0].Value;
+
+				if(e.ColumnIndex == 2) //sectors
+				{ 
+					List<Sector> list = GetSectorsWithTag(tag, (int)dataGridView.Rows[e.RowIndex].Cells[2].Value);
+					if(list.Count > 0) 
+					{
+						General.MainWindow.ShowEditSectors(list);
+						General.Map.Map.Update();
+						Setup();
+					}
+				} 
+				else if(e.ColumnIndex == 3) //linedefs
+				{ 
+					List<Linedef> list = GetLinedefsWithTag(tag, (int)dataGridView.Rows[e.RowIndex].Cells[3].Value);
+					if(list.Count > 0) 
+					{
+						General.MainWindow.ShowEditLinedefs(list);
+						General.Map.Map.Update();
+						Setup();
+					}
+				} 
+				else if(e.ColumnIndex == 4) //things
+				{ 
+					List<Thing> list = GetThingsWithTag(tag, (int)dataGridView.Rows[e.RowIndex].Cells[4].Value);
+					if(list.Count > 0) 
+					{
+						General.MainWindow.ShowEditThings(list);
+						General.Map.Map.Update();
+						Setup();
+					}
+				}
+			}
+		}
+
+		private void dataGridView_CellMouseDoubleClick(object sender, DataGridViewCellMouseEventArgs e) 
+		{
+			if(e.ColumnIndex < 2 || e.RowIndex == -1) return;
+			int tag = (int)dataGridView.Rows[e.RowIndex].Cells[0].Value;
+
+			if(e.ColumnIndex == 2) //sectors
+			{ 
+				List<Sector> list = GetSectorsWithTag(tag, (int)dataGridView.Rows[e.RowIndex].Cells[2].Value);
+				if(list.Count > 0) 
+				{
+					General.Map.Map.ClearSelectedSectors();
+					General.Map.Map.ClearSelectedLinedefs();
+
+					List<Vector2D> points = new List<Vector2D>();
+					foreach(Sector s in list) 
+					{
+						s.Selected = true;
+
+						foreach(Sidedef sd in s.Sidedefs) 
+						{
+							points.Add(sd.Line.Start.Position);
+							points.Add(sd.Line.End.Position);
+						}
+					}
+					
+					General.Map.Map.Update();
+					General.Editing.ChangeMode("SectorsMode");
+					ShowSelection(points);
+				}
+			} 
+			else if(e.ColumnIndex == 3) //linedefs
+			{ 
+				List<Linedef> list = GetLinedefsWithTag(tag, (int)dataGridView.Rows[e.RowIndex].Cells[3].Value);
+				if(list.Count > 0) 
+				{
+					General.Map.Map.ClearSelectedSectors();
+					General.Map.Map.ClearSelectedLinedefs();
+
+					List<Vector2D> points = new List<Vector2D>();
+					foreach(Linedef l in list) 
+					{
+						l.Selected = true;
+						points.Add(l.Start.Position);
+						points.Add(l.End.Position);
+					}
+
+					General.Map.Map.Update();
+					General.Editing.ChangeMode("LinedefsMode");
+					ShowSelection(points);
+				}
+			} 
+			else if(e.ColumnIndex == 4) //things
+			{ 
+				List<Thing> list = GetThingsWithTag(tag, (int)dataGridView.Rows[e.RowIndex].Cells[4].Value);
+				if(list.Count > 0) 
+				{
+					General.Map.Map.ClearSelectedThings();
+
+					List<Vector2D> points = new List<Vector2D>();
+					foreach(Thing t in list) 
+					{
+						t.Selected = true;
+						
+						Vector2D p = t.Position;
+						points.Add(p);
+						points.Add(p + new Vector2D(t.Size * 2.0f, t.Size * 2.0f));
+						points.Add(p + new Vector2D(t.Size * 2.0f, -t.Size * 2.0f));
+						points.Add(p + new Vector2D(-t.Size * 2.0f, t.Size * 2.0f));
+						points.Add(p + new Vector2D(-t.Size * 2.0f, -t.Size * 2.0f));
+					}
+
+					General.Map.Map.Update();
+					General.Editing.ChangeMode("ThingsMode");
+					ShowSelection(points);
+				}
+			}
+		}
+
+		private void TagStatisticsForm_FormClosing(object sender, FormClosingEventArgs e) 
+		{
+			size = this.Size;
+			location = this.Location;
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/GZBuilder/Windows/TagStatisticsForm.resx b/Source/Core/GZBuilder/Windows/TagStatisticsForm.resx
new file mode 100644
index 0000000..8a33e51
--- /dev/null
+++ b/Source/Core/GZBuilder/Windows/TagStatisticsForm.resx
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="TagColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Label.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Sectors.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Linedefs.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Things.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <data name="hint.Text" xml:space="preserve">
+    <value>Click on a cell in Sectors, Linedefs or Things column to select map elements with given tag.
+Right click to open Properties form for map elements with given tag.
+Click or press F2 in the Label cells to edit tag labels.</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Source/Core/GZBuilder/Windows/ThingStatisticsForm.Designer.cs b/Source/Core/GZBuilder/Windows/ThingStatisticsForm.Designer.cs
new file mode 100644
index 0000000..e3f5819
--- /dev/null
+++ b/Source/Core/GZBuilder/Windows/ThingStatisticsForm.Designer.cs
@@ -0,0 +1,181 @@
+namespace CodeImp.DoomBuilder.GZBuilder.Windows
+{
+    partial class ThingStatisticsForm
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if(disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
+			this.apply = new System.Windows.Forms.Button();
+			this.dataGridView = new System.Windows.Forms.DataGridView();
+			this.ThingType = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.ThingTitle = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.ThingClassName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.ThingCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.hideUnused = new System.Windows.Forms.CheckBox();
+			((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
+			this.SuspendLayout();
+			// 
+			// apply
+			// 
+			this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.apply.Location = new System.Drawing.Point(369, 319);
+			this.apply.Name = "apply";
+			this.apply.Size = new System.Drawing.Size(120, 23);
+			this.apply.TabIndex = 7;
+			this.apply.Text = "Close";
+			this.apply.UseVisualStyleBackColor = true;
+			this.apply.Click += new System.EventHandler(this.apply_Click);
+			// 
+			// dataGridView
+			// 
+			this.dataGridView.AllowUserToAddRows = false;
+			this.dataGridView.AllowUserToDeleteRows = false;
+			this.dataGridView.AllowUserToResizeColumns = false;
+			this.dataGridView.AllowUserToResizeRows = false;
+			this.dataGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.dataGridView.BackgroundColor = System.Drawing.SystemColors.Window;
+			this.dataGridView.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+			this.dataGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None;
+			this.dataGridView.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
+			dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+			dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
+			dataGridViewCellStyle1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
+			dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+			dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+			dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+			this.dataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
+			this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+			this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.ThingType,
+            this.ThingTitle,
+            this.ThingClassName,
+            this.ThingCount});
+			this.dataGridView.Location = new System.Drawing.Point(12, 12);
+			this.dataGridView.MultiSelect = false;
+			this.dataGridView.Name = "dataGridView";
+			this.dataGridView.ReadOnly = true;
+			this.dataGridView.RowHeadersVisible = false;
+			this.dataGridView.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
+			this.dataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+			this.dataGridView.Size = new System.Drawing.Size(477, 301);
+			this.dataGridView.TabIndex = 6;
+			this.dataGridView.CellMouseClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dataGridView_CellMouseClick);
+			// 
+			// ThingType
+			// 
+			this.ThingType.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
+			dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+			this.ThingType.DefaultCellStyle = dataGridViewCellStyle2;
+			this.ThingType.HeaderText = "Type";
+			this.ThingType.Name = "ThingType";
+			this.ThingType.ReadOnly = true;
+			this.ThingType.Width = 56;
+			// 
+			// ThingTitle
+			// 
+			this.ThingTitle.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+			dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+			this.ThingTitle.DefaultCellStyle = dataGridViewCellStyle3;
+			this.ThingTitle.HeaderText = "Title";
+			this.ThingTitle.Name = "ThingTitle";
+			this.ThingTitle.ReadOnly = true;
+			// 
+			// ThingClassName
+			// 
+			this.ThingClassName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
+			dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+			this.ThingClassName.DefaultCellStyle = dataGridViewCellStyle4;
+			this.ThingClassName.HeaderText = "Class Name";
+			this.ThingClassName.Name = "ThingClassName";
+			this.ThingClassName.ReadOnly = true;
+			this.ThingClassName.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+			this.ThingClassName.Width = 88;
+			// 
+			// ThingCount
+			// 
+			this.ThingCount.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader;
+			dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+			this.ThingCount.DefaultCellStyle = dataGridViewCellStyle5;
+			this.ThingCount.HeaderText = "Count";
+			this.ThingCount.Name = "ThingCount";
+			this.ThingCount.ReadOnly = true;
+			this.ThingCount.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+			this.ThingCount.Width = 60;
+			// 
+			// hideUnused
+			// 
+			this.hideUnused.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.hideUnused.AutoSize = true;
+			this.hideUnused.Location = new System.Drawing.Point(13, 323);
+			this.hideUnused.Name = "hideUnused";
+			this.hideUnused.Size = new System.Drawing.Size(123, 17);
+			this.hideUnused.TabIndex = 8;
+			this.hideUnused.Text = "Hide Unused Things";
+			this.hideUnused.UseVisualStyleBackColor = true;
+			this.hideUnused.CheckedChanged += new System.EventHandler(this.hideUnused_CheckedChanged);
+			// 
+			// ThingStatisticsForm
+			// 
+			this.AcceptButton = this.apply;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.ClientSize = new System.Drawing.Size(501, 348);
+			this.Controls.Add(this.hideUnused);
+			this.Controls.Add(this.apply);
+			this.Controls.Add(this.dataGridView);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow;
+			this.MinimizeBox = false;
+			this.Name = "ThingStatisticsForm";
+			this.Opacity = 1;
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.Text = "Thing statistics";
+			this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.ThingStatisticsForm_FormClosing);
+			((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Button apply;
+		private System.Windows.Forms.DataGridView dataGridView;
+        private System.Windows.Forms.CheckBox hideUnused;
+		private System.Windows.Forms.DataGridViewTextBoxColumn ThingType;
+		private System.Windows.Forms.DataGridViewTextBoxColumn ThingTitle;
+		private System.Windows.Forms.DataGridViewTextBoxColumn ThingClassName;
+		private System.Windows.Forms.DataGridViewTextBoxColumn ThingCount;
+    }
+}
\ No newline at end of file
diff --git a/Source/Core/GZBuilder/Windows/ThingStatisticsForm.cs b/Source/Core/GZBuilder/Windows/ThingStatisticsForm.cs
new file mode 100644
index 0000000..3e06c73
--- /dev/null
+++ b/Source/Core/GZBuilder/Windows/ThingStatisticsForm.cs
@@ -0,0 +1,177 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Editing;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Windows;
+
+namespace CodeImp.DoomBuilder.GZBuilder.Windows
+{
+    public partial class ThingStatisticsForm : DelayedForm
+    {
+        private static Size size = Size.Empty;
+        private static Point location = Point.Empty;
+
+        public ThingStatisticsForm() 
+		{
+            InitializeComponent();
+
+            //apply window size and location
+            if(!size.IsEmpty && !location.IsEmpty) 
+			{
+                this.StartPosition = FormStartPosition.Manual;
+                this.Size = size;
+                this.Location = location;
+            }
+
+            Setup();
+        }
+
+        private void Setup() 
+		{
+            Dictionary<int, int> thingcounts = new Dictionary<int, int>();
+            Dictionary<int, string> thingtitles = new Dictionary<int, string>();
+            Dictionary<int, string> thingclasses = new Dictionary<int, string>();
+            dataGridView.Rows.Clear();
+
+            foreach(ThingTypeInfo ti in General.Map.Data.ThingTypes) 
+			{
+                thingcounts.Add(ti.Index, 0);
+                thingtitles.Add(ti.Index, ti.Title);
+                thingclasses.Add(ti.Index, ti.ClassName);
+            }
+
+            foreach(Thing t in General.Map.Map.Things) 
+			{
+                if(thingcounts.ContainsKey(t.Type)) 
+				{
+                    thingcounts[t.Type]++;
+                } 
+				else 
+				{
+                    thingcounts.Add(t.Type, 1);
+                    thingtitles.Add(t.Type, "Unknown thing");
+                    thingclasses.Add(t.Type, "-");
+                }
+            }
+
+            //add rows
+            foreach(KeyValuePair<int, int> group in thingcounts) 
+			{
+                if(hideUnused.Checked && group.Value == 0) continue;
+                
+                DataGridViewRow row = new DataGridViewRow();
+
+                row.Cells.Add(new DataGridViewTextBoxCell { Value = group.Key }); //type
+                row.Cells.Add(new DataGridViewTextBoxCell { Value = thingtitles[group.Key] }); //title
+                row.Cells.Add(new DataGridViewTextBoxCell { Value = thingclasses[group.Key] }); //class
+                row.Cells.Add(new DataGridViewTextBoxCell { Value = group.Value }); //count
+
+                dataGridView.Rows.Add(row);
+            }
+
+            dataGridView.Sort(ThingType, ListSortDirection.Ascending);
+        }
+
+        private static List<Thing> GetThingsByType(int type) 
+		{
+            List<Thing> list = new List<Thing>();
+            foreach(Thing t in General.Map.Map.Things)
+                if(t.Type == type) list.Add(t);
+
+            return list;
+        }
+
+        private static void ShowSelection(List<Vector2D> points) 
+		{
+            RectangleF area = MapSet.CreateEmptyArea();
+
+            // Make a view area from the points
+            foreach(Vector2D p in points) area = MapSet.IncreaseArea(area, p);
+
+            // Make the area square, using the largest side
+            if(area.Width > area.Height) 
+			{
+                float delta = area.Width - area.Height;
+                area.Y -= delta * 0.5f;
+                area.Height += delta;
+            } 
+			else 
+			{
+                float delta = area.Height - area.Width;
+                area.X -= delta * 0.5f;
+                area.Width += delta;
+            }
+
+            // Add padding
+            area.Inflate(100f, 100f);
+
+            // Zoom to area
+	        if(General.Editing.Mode is ClassicMode) 
+			{
+		        ClassicMode editmode = (General.Editing.Mode as ClassicMode);
+		        editmode.CenterOnArea(area, 0.6f);
+	        }
+        }
+
+        private void dataGridView_CellMouseClick(object sender, DataGridViewCellMouseEventArgs e) 
+		{
+            if(e.RowIndex == -1) return;
+			if(e.Button == MouseButtons.Left) //select
+			{ 
+                List<Thing> list = GetThingsByType((int)dataGridView.Rows[e.RowIndex].Cells[0].Value);
+                if(list.Count > 0) 
+				{
+                    General.Map.Map.ClearSelectedThings();
+
+                    List<Vector2D> points = new List<Vector2D>();
+                    foreach(Thing t in list) 
+					{
+                        t.Selected = true;
+
+                        Vector2D p = t.Position;
+                        points.Add(p);
+                        points.Add(p + new Vector2D(t.Size * 2.0f, t.Size * 2.0f));
+                        points.Add(p + new Vector2D(t.Size * 2.0f, -t.Size * 2.0f));
+                        points.Add(p + new Vector2D(-t.Size * 2.0f, t.Size * 2.0f));
+                        points.Add(p + new Vector2D(-t.Size * 2.0f, -t.Size * 2.0f));
+                    }
+
+                    General.Map.Map.Update();
+                    General.Editing.ChangeMode("ThingsMode");
+                    ShowSelection(points);
+                }
+            } 
+			else if(e.Button == MouseButtons.Right) //edit
+			{ 
+                List<Thing> list = GetThingsByType((int)dataGridView.Rows[e.RowIndex].Cells[0].Value);
+                if(list.Count > 0) 
+				{
+                    General.MainWindow.ShowEditThings(list);
+                    General.Map.Map.Update();
+                    Setup();
+                }
+            }
+        }
+
+        private void hideUnused_CheckedChanged(object sender, EventArgs e)
+        {
+            Setup();
+        }
+
+        private void apply_Click(object sender, EventArgs e) 
+		{
+            this.Close();
+        }
+
+        private void ThingStatisticsForm_FormClosing(object sender, FormClosingEventArgs e) 
+		{
+            size = this.Size;
+            location = this.Location;
+        }
+    }
+}
diff --git a/Source/Core/GZBuilder/Windows/ThingStatisticsForm.resx b/Source/Core/GZBuilder/Windows/ThingStatisticsForm.resx
new file mode 100644
index 0000000..ca97df2
--- /dev/null
+++ b/Source/Core/GZBuilder/Windows/ThingStatisticsForm.resx
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="ThingType.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ThingTitle.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ThingClassName.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ThingCount.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Core/GZBuilder/md3/GZModel.cs b/Source/Core/GZBuilder/md3/GZModel.cs
new file mode 100644
index 0000000..557aff8
--- /dev/null
+++ b/Source/Core/GZBuilder/md3/GZModel.cs
@@ -0,0 +1,18 @@
+using System.Collections.Generic;
+using SlimDX.Direct3D9;
+
+namespace CodeImp.DoomBuilder.GZBuilder.MD3
+{
+	internal class GZModel 
+	{
+		internal readonly List<Mesh> Meshes;
+		internal readonly List<Texture> Textures;
+		internal float Radius;
+
+		internal GZModel() 
+		{
+			Meshes = new List<Mesh>();
+			Textures = new List<Texture>();
+		}
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/GZBuilder/md3/ModelReader.cs b/Source/Core/GZBuilder/md3/ModelReader.cs
new file mode 100644
index 0000000..69f6e19
--- /dev/null
+++ b/Source/Core/GZBuilder/md3/ModelReader.cs
@@ -0,0 +1,985 @@
+#region ================== Namespaces
+
+using System;
+using System.IO;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.Text;
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.IO;
+using CodeImp.DoomBuilder.Data;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.GZBuilder.Data;
+using SlimDX;
+using SlimDX.Direct3D9;
+using CodeImp.DoomBuilder.Geometry;
+
+#endregion
+
+//mxd. Original version taken from here: http://colladadotnet.codeplex.com/SourceControl/changeset/view/40680
+namespace CodeImp.DoomBuilder.GZBuilder.MD3
+{
+	internal static class ModelReader
+	{
+		#region ================== Variables
+
+		private class MD3LoadResult
+		{
+			public List<string> Skins;
+			public List<Mesh> Meshes;
+			public string Errors;
+
+			public MD3LoadResult() 
+			{
+				Skins = new List<string>();
+				Meshes = new List<Mesh>();
+			}
+		}
+
+		private static readonly VertexElement[] vertexElements = new[] 
+		{
+			new VertexElement(0, 0, DeclarationType.Float3, DeclarationMethod.Default, DeclarationUsage.Position, 0),
+			new VertexElement(0, 12, DeclarationType.Color, DeclarationMethod.Default, DeclarationUsage.Color, 0),
+			new VertexElement(0, 16, DeclarationType.Float2, DeclarationMethod.Default, DeclarationUsage.TextureCoordinate, 0),
+			new VertexElement(0, 24, DeclarationType.Float3, DeclarationMethod.Default, DeclarationUsage.Normal, 0),
+			VertexElement.VertexDeclarationEnd
+		};
+
+		#endregion
+
+		#region ================== Load
+
+		public static void Load(ModelData mde, List<DataReader> containers, Device device) 
+		{
+			if(mde.IsVoxel) LoadKVX(mde, containers, device);
+			else LoadModel(mde, containers, device);
+		}
+
+		private static void LoadKVX(ModelData mde, List<DataReader> containers, Device device) 
+		{
+			mde.Model = new GZModel();
+			foreach(string name in mde.ModelNames)
+			{
+				//find the model
+				foreach(DataReader dr in containers) 
+				{
+					Stream ms = dr.GetVoxelData(name);
+					if(ms == null) continue;
+
+					//load kvx
+					ReadKVX(mde, ms, device);
+
+					//done
+					ms.Close();
+					ms.Dispose();
+					break;
+				}
+			}
+
+			//clear unneeded data
+			mde.TextureNames = null;
+			mde.ModelNames = null;
+
+			if(mde.Model.Meshes == null || mde.Model.Meshes.Count == 0) 
+			{
+				mde.Model = null;
+			}
+		}
+
+		private static void LoadModel(ModelData mde, List<DataReader> containers, Device device) 
+		{
+			mde.Model = new GZModel();
+			BoundingBoxSizes bbs = new BoundingBoxSizes();
+			MD3LoadResult result = new MD3LoadResult();
+
+			//load models and textures
+			for(int i = 0; i < mde.ModelNames.Count; i++) 
+			{
+				//need to use model skins?
+				bool useSkins = string.IsNullOrEmpty(mde.TextureNames[i]);
+			
+				//load mesh
+				MemoryStream ms = LoadFile(containers, mde.ModelNames[i], true);
+				if(ms == null) 
+				{
+					General.ErrorLogger.Add(ErrorType.Error, "Error while loading '" + mde.ModelNames[i] + "': unable to find file.");
+					continue;
+				}
+
+				string ext = Path.GetExtension(mde.ModelNames[i]);
+				switch(ext)
+				{
+					case ".md3":
+						if(!string.IsNullOrEmpty(mde.FrameNames[i]))
+						{
+							General.ErrorLogger.Add(ErrorType.Error, "Error while loading '" + mde.ModelNames[i] + "': frame names are not supported for MD3 models!");
+							continue;
+						}
+						result = ReadMD3Model(ref bbs, useSkins, ms, device, mde.FrameIndices[i]);
+						break;
+					case ".md2":
+						result = ReadMD2Model(ref bbs, ms, device, mde.FrameIndices[i], mde.FrameNames[i]);
+						break;
+					default:
+						result.Errors = "model format is not supported";
+						break;
+				}
+
+				ms.Close();
+				ms.Dispose();
+
+				//got errors?
+				if(!String.IsNullOrEmpty(result.Errors)) 
+				{
+					General.ErrorLogger.Add(ErrorType.Error, "Error while loading '" + mde.ModelNames[i] + "': " + result.Errors);
+				} 
+				else 
+				{
+					//add loaded data to ModeldefEntry
+					mde.Model.Meshes.AddRange(result.Meshes);
+
+					//prepare UnknownTexture3D... just in case :)
+					if(General.Map.Data.UnknownTexture3D.Texture == null || General.Map.Data.UnknownTexture3D.Texture.Disposed)
+						General.Map.Data.UnknownTexture3D.CreateTexture();
+
+					//load texture
+					List<string> errors = new List<string>();
+
+					// Texture not defined in MODELDEF?
+					if(useSkins) 
+					{
+						//try to use model's own skins 
+						for(int m = 0; m < result.Meshes.Count; m++) 
+						{
+							if(string.IsNullOrEmpty(result.Skins[m])) 
+							{
+								mde.Model.Textures.Add(General.Map.Data.UnknownTexture3D.Texture);
+								errors.Add("texture not found in MODELDEF or model skin.");
+								continue;
+							}
+
+							string path = result.Skins[m].Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
+							ext = Path.GetExtension(path);
+
+							if(Array.IndexOf(ModelData.SUPPORTED_TEXTURE_EXTENSIONS, ext) == -1) 
+							{
+								mde.Model.Textures.Add(General.Map.Data.UnknownTexture3D.Texture);
+								errors.Add("image format '" + ext + "' is not supported!");
+								continue;
+							}
+
+							//relative path?
+							if(path.IndexOf(Path.DirectorySeparatorChar) == -1)
+								path = Path.Combine(Path.GetDirectoryName(mde.ModelNames[useSkins ? i : m]), path);
+
+							Texture t = LoadTexture(containers, path, device);
+
+							if(t == null) 
+							{
+								mde.Model.Textures.Add(General.Map.Data.UnknownTexture3D.Texture);
+								errors.Add("unable to load skin '" + result.Skins[m] + "'");
+								continue;
+							} 
+
+							mde.Model.Textures.Add(t);
+						}
+					}
+					//Try to use texture loaded from MODELDEFS
+					else
+					{
+						Texture t = LoadTexture(containers, mde.TextureNames[i], device);
+						if(t == null) 
+						{
+							mde.Model.Textures.Add(General.Map.Data.UnknownTexture3D.Texture);
+							errors.Add("unable to load texture '" + mde.TextureNames[i] + "'");
+						} 
+						else 
+						{
+							mde.Model.Textures.Add(t);
+						}
+					}
+
+					//report errors
+					if(errors.Count > 0) 
+					{
+						foreach(string e in errors)
+							General.ErrorLogger.Add(ErrorType.Error, "Error while loading '" + mde.ModelNames[i] + "': " + e);
+					}
+				}
+			}
+
+			//clear unneeded data
+			mde.TextureNames = null;
+			mde.ModelNames = null;
+
+			if(mde.Model.Meshes == null || mde.Model.Meshes.Count == 0) 
+			{
+				mde.Model = null;
+				return;
+			}
+
+			//scale bbs
+			bbs.MaxX = (int)(bbs.MaxX * mde.Scale.X);
+			bbs.MinX = (int)(bbs.MinX * mde.Scale.X);
+			bbs.MaxY = (int)(bbs.MaxY * mde.Scale.Y);
+			bbs.MinY = (int)(bbs.MinY * mde.Scale.Y);
+
+			//calculate model radius
+			mde.Model.Radius = Math.Max(Math.Max(Math.Abs(bbs.MinY), Math.Abs(bbs.MaxY)), Math.Max(Math.Abs(bbs.MinX), Math.Abs(bbs.MaxX))); 
+		}
+
+		#endregion
+
+		#region ================== MD3
+
+		private static MD3LoadResult ReadMD3Model(ref BoundingBoxSizes bbs, bool useSkins, MemoryStream s, Device device, int frame) 
+		{
+			long start = s.Position;
+			MD3LoadResult result = new MD3LoadResult();
+
+			using(var br = new BinaryReader(s, Encoding.ASCII)) 
+			{
+				string magic = ReadString(br, 4);
+				if(magic != "IDP3")
+				{
+					result.Errors = "unknown header: expected 'IDP3', but got '" + magic + "'";
+					return result;
+				}
+
+				int modelVersion = br.ReadInt32();
+				if(modelVersion != 15) //MD3 version. Must be equal to 15
+				{
+					result.Errors = "expected MD3 version 15, but got " + modelVersion;
+					return result;
+				}
+
+				s.Position += 76;
+				int numSurfaces = br.ReadInt32();
+				s.Position += 12;
+				int ofsSurfaces = br.ReadInt32();
+
+				s.Position = ofsSurfaces + start;
+
+				List<int> polyIndecesList = new List<int>();
+				List<WorldVertex> vertList = new List<WorldVertex>();
+
+				Dictionary<string, List<List<int>>> polyIndecesListsPerTexture = new Dictionary<string, List<List<int>>>(StringComparer.Ordinal);
+				Dictionary<string, List<WorldVertex>> vertListsPerTexture = new Dictionary<string, List<WorldVertex>>(StringComparer.Ordinal);
+				Dictionary<string, List<int>> vertexOffsets = new Dictionary<string, List<int>>(StringComparer.Ordinal);
+
+				for(int c = 0; c < numSurfaces; c++) 
+				{
+					string skin = "";
+					string error = ReadSurface(ref bbs, ref skin, br, polyIndecesList, vertList, frame);
+
+					if(!string.IsNullOrEmpty(error)) 
+					{
+						result.Errors = error;
+						return result;
+					}
+
+					if(useSkins) 
+					{
+						if(polyIndecesListsPerTexture.ContainsKey(skin)) 
+						{
+							polyIndecesListsPerTexture[skin].Add(polyIndecesList);
+							vertListsPerTexture[skin].AddRange(vertList.ToArray());
+							vertexOffsets[skin].Add(vertList.Count);
+						} 
+						else 
+						{
+							polyIndecesListsPerTexture.Add(skin, new List<List<int>> { polyIndecesList } );
+							vertListsPerTexture.Add(skin, vertList);
+							vertexOffsets.Add(skin, new List<int> { vertList.Count });
+						}
+
+						//reset lists
+						polyIndecesList = new List<int>();
+						vertList = new List<WorldVertex>();
+					}
+				}
+
+				if(!useSkins) 
+				{ 
+					//create mesh
+					CreateMesh(device, ref result, vertList, polyIndecesList);
+					result.Skins.Add("");
+				} 
+				else 
+				{
+					//create a mesh for each surface texture
+					foreach(KeyValuePair<string, List<List<int>>> group in polyIndecesListsPerTexture) 
+					{
+						polyIndecesList = new List<int>();
+						int offset = 0;
+						
+						//collect indices, fix vertex offsets
+						for(int i = 0; i < group.Value.Count; i++) 
+						{
+							if(i > 0) 
+							{
+								//TODO: Damn I need to rewrite all of this stuff from scratch...
+								offset += vertexOffsets[group.Key][i - 1]; 
+								for(int c = 0; c < group.Value[i].Count; c++)
+									group.Value[i][c] += offset;
+							}
+							polyIndecesList.AddRange(group.Value[i].ToArray());
+						}
+
+						CreateMesh(device, ref result, vertListsPerTexture[group.Key], polyIndecesList);
+						result.Skins.Add(group.Key.ToLowerInvariant());
+					}
+				}
+			}
+
+			return result;
+		}
+
+		private static string ReadSurface(ref BoundingBoxSizes bbs, ref string skin, BinaryReader br, List<int> polyIndecesList, List<WorldVertex> vertList, int frame) 
+		{
+			int vertexOffset = vertList.Count;
+			long start = br.BaseStream.Position;
+			
+			string magic = ReadString(br, 4);
+			if(magic != "IDP3") return "error while reading surface. Unknown header: expected 'IDP3', but got '" + magic + "'";
+
+			string name = ReadString(br, 64);
+			int flags = br.ReadInt32();
+			int numFrames = br.ReadInt32(); //Number of animation frames. This should match NUM_FRAMES in the MD3 header.
+			int numShaders = br.ReadInt32(); //Number of Shader objects defined in this Surface, with a limit of MD3_MAX_SHADERS. Current value of MD3_MAX_SHADERS is 256.
+			int numVerts = br.ReadInt32(); //Number of Vertex objects defined in this Surface, up to MD3_MAX_VERTS. Current value of MD3_MAX_VERTS is 4096.
+			int numTriangles = br.ReadInt32(); //Number of Triangle objects defined in this Surface, maximum of MD3_MAX_TRIANGLES. Current value of MD3_MAX_TRIANGLES is 8192.
+			int ofsTriangles = br.ReadInt32(); //Relative offset from SURFACE_START where the list of Triangle objects starts.
+			int ofsShaders = br.ReadInt32();
+			int ofsST = br.ReadInt32(); //Relative offset from SURFACE_START where the list of ST objects (s-t texture coordinates) starts.
+			int ofsNormal = br.ReadInt32(); //Relative offset from SURFACE_START where the list of Vertex objects (X-Y-Z-N vertices) starts.
+			int ofsEnd = br.ReadInt32(); //Relative offset from SURFACE_START to where the Surface object ends.
+
+			// Sanity check
+			if(frame < 0 || frame > numFrames)
+			{
+				return "invalid frame number! (frame number: " + frame + ", total frames: " + numFrames + ")";
+			}
+
+			// Polygons
+			if(start + ofsTriangles != br.BaseStream.Position)
+				br.BaseStream.Position = start + ofsTriangles;
+
+			for(int i = 0; i < numTriangles * 3; i++)
+				polyIndecesList.Add(vertexOffset + br.ReadInt32());
+
+			// Shaders
+			if(start + ofsShaders != br.BaseStream.Position)
+				br.BaseStream.Position = start + ofsShaders;
+
+			skin = ReadString(br, 64); //we are interested only in the first one
+
+			// Vertices
+			if(start + ofsST != br.BaseStream.Position)
+				br.BaseStream.Position = start + ofsST;
+
+			for(int i = 0; i < numVerts; i++) 
+			{
+				WorldVertex v = new WorldVertex();
+				v.c = -1; //white
+				v.u = br.ReadSingle();
+				v.v = br.ReadSingle();
+
+				vertList.Add(v);
+			}
+
+			// Positions and normals
+			long vertoffset = start + ofsNormal + numVerts * 8 * frame; // The length of Vertex struct is 8 bytes
+			if(br.BaseStream.Position != vertoffset) br.BaseStream.Position = vertoffset;
+
+			for(int i = vertexOffset; i < vertexOffset + numVerts; i++) 
+			{
+				WorldVertex v = vertList[i];
+
+				//read vertex
+				v.y = -(float)br.ReadInt16() / 64;
+				v.x = (float)br.ReadInt16() / 64;
+				v.z = (float)br.ReadInt16() / 64;
+
+				//bounding box
+				BoundingBoxTools.UpdateBoundingBoxSizes(ref bbs, v);
+
+				var lat = br.ReadByte() * (2 * Math.PI) / 255.0;
+				var lng = br.ReadByte() * (2 * Math.PI) / 255.0;
+
+				v.nx = (float)(Math.Sin(lng) * Math.Sin(lat));
+				v.ny = -(float)(Math.Cos(lng) * Math.Sin(lat));
+				v.nz = (float)(Math.Cos(lat));
+
+				vertList[i] = v;
+			}
+
+			if(start + ofsEnd != br.BaseStream.Position)
+				br.BaseStream.Position = start + ofsEnd;
+			return "";
+		}
+
+		#endregion
+
+		#region ================== MD2
+
+		private static MD3LoadResult ReadMD2Model(ref BoundingBoxSizes bbs, MemoryStream s, Device device, int frame, string framename) 
+		{
+			long start = s.Position;
+			MD3LoadResult result = new MD3LoadResult();
+
+			using(var br = new BinaryReader(s, Encoding.ASCII)) 
+			{
+				string magic = ReadString(br, 4);
+				if(magic != "IDP2") //magic number: "IDP2"
+				{  
+					result.Errors = "unknown header: expected 'IDP2', but got '" + magic + "'";
+					return result;
+				}
+
+				int modelVersion = br.ReadInt32();
+				if(modelVersion != 8) //MD2 version. Must be equal to 8
+				{ 
+					result.Errors = "expected MD3 version 15, but got " + modelVersion;
+					return result;
+				}
+
+				int texWidth = br.ReadInt32();
+				int texHeight = br.ReadInt32();
+				int framesize = br.ReadInt32(); // Size of one frame in bytes
+				s.Position += 4; //Number of textures
+				int num_verts = br.ReadInt32(); //Number of vertices
+				int num_uv = br.ReadInt32(); //The number of UV coordinates in the model
+				int num_tris = br.ReadInt32(); //Number of triangles
+				s.Position += 4; //Number of OpenGL commands
+				int num_frames = br.ReadInt32(); //Total number of frames
+
+				// Sanity checks
+				if(num_frames == 0) 
+				{
+					result.Errors = "model has 0 frames.";
+					return result;
+				}
+
+				if(num_frames < frame || frame < 0)
+				{
+					result.Errors = "invalid target frame! (target frame: " + frame + ", total frames: " + num_frames + ")";
+					return result;
+				}
+
+				s.Position += 4; //Offset to skin names (each skin name is an unsigned char[64] and are null terminated)
+				int ofs_uv = br.ReadInt32();//Offset to s-t texture coordinates
+				int ofs_tris = br.ReadInt32(); //Offset to triangles
+				int ofs_animFrame = br.ReadInt32(); //An offset to the first animation frame
+
+				List<int> polyIndecesList = new List<int>();
+				List<int> uvIndecesList = new List<int>();
+				List<Vector2> uvCoordsList = new List<Vector2>();
+				List<WorldVertex> vertList = new List<WorldVertex>();
+
+				// Polygons
+				s.Position = ofs_tris + start;
+
+				for(int i = 0; i < num_tris; i++) 
+				{
+					polyIndecesList.Add(br.ReadUInt16());
+					polyIndecesList.Add(br.ReadUInt16());
+					polyIndecesList.Add(br.ReadUInt16());
+
+					uvIndecesList.Add(br.ReadUInt16());
+					uvIndecesList.Add(br.ReadUInt16());
+					uvIndecesList.Add(br.ReadUInt16());
+				}
+
+				// UV coords
+				s.Position = ofs_uv + start;
+
+				for(int i = 0; i < num_uv; i++) 
+					uvCoordsList.Add(new Vector2((float)br.ReadInt16() / texWidth, (float)br.ReadInt16() / texHeight));
+
+				// Frames
+				// Find correct frame
+				if(!string.IsNullOrEmpty(framename))
+				{
+					// Skip frames untill frame name matches
+					bool framefound = false;
+					for(int i = 0; i < num_frames; i++)
+					{
+						s.Position = ofs_animFrame + start + i * framesize;
+						s.Position += 24; // Skip scale and translate
+						string curframename = ReadString(br, 16).ToLowerInvariant();
+
+						if(curframename == framename)
+						{
+							// Step back so scale and translate can be read
+							s.Position -= 40;
+							framefound = true;
+							break;
+						}
+					}
+
+					// No dice? Bail out!
+					if(!framefound)
+					{
+						result.Errors = "unable to find frame '" + framename + "'!";
+						return result;
+					}
+				}
+				else
+				{
+					// If we have frame number, we can go directly to target frame
+					s.Position = ofs_animFrame + start + frame * framesize;
+				}
+
+				Vector3 scale = new Vector3(br.ReadSingle(), br.ReadSingle(), br.ReadSingle());
+				Vector3 translate = new Vector3(br.ReadSingle(), br.ReadSingle(), br.ReadSingle());
+
+				s.Position += 16; // Skip frame name
+
+				// Prepare to fix rotation angle
+				float angleOfsetCos = (float)Math.Cos(-Angle2D.PIHALF);
+				float angleOfsetSin = (float)Math.Sin(-Angle2D.PIHALF);
+
+				//verts
+				for(int i = 0; i < num_verts; i++) 
+				{
+					WorldVertex v = new WorldVertex();
+
+					v.x = (br.ReadByte() * scale.X + translate.X);
+					v.y = (br.ReadByte() * scale.Y + translate.Y);
+					v.z = (br.ReadByte() * scale.Z + translate.Z);
+
+					// Fix rotation angle
+					float rx = angleOfsetCos * v.x - angleOfsetSin * v.y;
+					float ry = angleOfsetSin * v.x + angleOfsetCos * v.y;
+					v.y = ry;
+					v.x = rx;
+
+					vertList.Add(v);
+					s.Position += 1; //vertex normal
+				}
+
+				for(int i = 0; i < polyIndecesList.Count; i++) 
+				{
+					WorldVertex v = vertList[polyIndecesList[i]];
+					
+					//bounding box
+					BoundingBoxTools.UpdateBoundingBoxSizes(ref bbs, new WorldVertex(v.y, v.x, v.z));
+
+					//uv
+					float tu = uvCoordsList[uvIndecesList[i]].X;
+					float tv = uvCoordsList[uvIndecesList[i]].Y;
+
+					//uv-coordinates already set?
+					if(v.c == -1 && (v.u != tu || v.v != tv)) 
+					{ 
+						//add a new vertex
+						vertList.Add(new WorldVertex(v.x, v.y, v.z, -1, tu, tv));
+						polyIndecesList[i] = vertList.Count - 1;
+					} 
+					else 
+					{
+						v.u = tu;
+						v.v = tv;
+						v.c = -1; //set color to white
+
+						//return to proper place
+						vertList[polyIndecesList[i]] = v;
+					}
+				}
+
+				//mesh
+				Mesh mesh = new Mesh(device, polyIndecesList.Count / 3, vertList.Count, MeshFlags.Use32Bit | MeshFlags.IndexBufferManaged | MeshFlags.VertexBufferManaged, vertexElements);
+
+				using(DataStream stream = mesh.LockVertexBuffer(LockFlags.None)) 
+				{
+					stream.WriteRange(vertList.ToArray());
+				}
+				mesh.UnlockVertexBuffer();
+
+				using(DataStream stream = mesh.LockIndexBuffer(LockFlags.None)) 
+				{
+					stream.WriteRange(polyIndecesList.ToArray());
+				}
+				mesh.UnlockIndexBuffer();
+
+				mesh.OptimizeInPlace(MeshOptimizeFlags.AttributeSort);
+
+				//store in result
+				result.Meshes.Add(mesh);
+				result.Skins.Add(""); //no skin support for MD2
+			}
+
+			return result;
+		}
+
+		#endregion
+
+		#region ================== KVX
+
+		private static void ReadKVX(ModelData mde, Stream stream, Device device) 
+		{
+			PixelColor[] palette = new PixelColor[256];
+			List<WorldVertex> verts = new List<WorldVertex>();
+			int xsize, ysize, zsize;
+			Vector3D pivot;
+
+			using(BinaryReader reader = new BinaryReader(stream, Encoding.ASCII)) 
+			{
+				reader.ReadInt32(); //numbytes, we don't use that
+				xsize = reader.ReadInt32();
+				ysize = reader.ReadInt32();
+				zsize = reader.ReadInt32();
+
+				pivot = new Vector3D();
+				pivot.x = reader.ReadInt32() / 256f;
+				pivot.y = reader.ReadInt32() / 256f;
+				pivot.z = reader.ReadInt32() / 256f;
+
+				//read offsets
+				int[] xoffset = new int[xsize + 1]; //why is it xsize + 1, not xsize?..
+				short[,] xyoffset = new short[xsize, ysize + 1]; //why is it ysize + 1, not ysize?..
+
+				for(int i = 0; i < xoffset.Length; i++) 
+				{
+					xoffset[i] = reader.ReadInt32();
+				}
+
+				for(int x = 0; x < xsize; x++) 
+				{
+					for(int y = 0; y < ysize + 1; y++) 
+					{
+						xyoffset[x, y] = reader.ReadInt16();
+					}
+				}
+
+				//read slabs
+				List<int> offsets = new List<int>(xsize * ysize);
+				for(int x = 0; x < xsize; x++) 
+				{
+					for(int y = 0; y < ysize; y++) 
+					{
+						offsets.Add(xoffset[x] + xyoffset[x, y] + 28); //for some reason offsets are counted from start of xoffset[]...
+					}
+				}
+
+				int counter = 0;
+				int slabsEnd = (int)(reader.BaseStream.Length - 768);
+
+				//read palette
+				if(!mde.OverridePalette) 
+				{
+					reader.BaseStream.Position = slabsEnd;
+					for(int i = 0; i < 256; i++) 
+					{
+						byte r = (byte)(reader.ReadByte() * 4);
+						byte g = (byte)(reader.ReadByte() * 4);
+						byte b = (byte)(reader.ReadByte() * 4);
+						palette[i] = new PixelColor(255, r, g, b);
+					}
+				} 
+				else 
+				{
+					for(int i = 0; i < 256; i++ ) 
+					{
+						palette[i] = General.Map.Data.Palette[i];
+					}
+				}
+
+				for(int x = 0; x < xsize; x++) 
+				{
+					for(int y = 0; y < ysize; y++) 
+					{
+						reader.BaseStream.Position = offsets[counter];
+						int next = (counter < offsets.Count - 1 ? offsets[counter + 1] : slabsEnd);
+
+						//read slab
+						while(reader.BaseStream.Position < next) 
+						{
+							int ztop = reader.ReadByte();
+							int zleng = reader.ReadByte();
+							if(ztop + zleng > zsize) break;
+							int flags = reader.ReadByte();
+
+							if(zleng > 0) 
+							{
+								List<int> colorIndices = new List<int>(zleng);
+								for(int i = 0; i < zleng; i++) 
+								{
+									colorIndices.Add(reader.ReadByte());
+								}
+
+								if((flags & 16) != 0) 
+								{
+									AddFace(verts, new Vector3D(x, y, ztop), new Vector3D(x + 1, y, ztop), new Vector3D(x, y + 1, ztop), new Vector3D(x + 1, y + 1, ztop), pivot, colorIndices[0]);
+								}
+
+								int z = ztop;
+								int cstart = 0;
+								while(z < ztop + zleng) 
+								{
+									int c = 0;
+									while(z + c < ztop + zleng && colorIndices[cstart + c] == colorIndices[cstart]) c++;
+
+									if((flags & 1) != 0) 
+									{
+										AddFace(verts, new Vector3D(x, y, z), new Vector3D(x, y + 1, z), new Vector3D(x, y, z + c), new Vector3D(x, y + 1, z + c), pivot, colorIndices[cstart]);
+									}
+									if((flags & 2) != 0) 
+									{
+										AddFace(verts, new Vector3D(x + 1, y + 1, z), new Vector3D(x + 1, y, z), new Vector3D(x + 1, y + 1, z + c), new Vector3D(x + 1, y, z + c), pivot, colorIndices[cstart]);
+									}
+									if((flags & 4) != 0) 
+									{
+										AddFace(verts, new Vector3D(x + 1, y, z), new Vector3D(x, y, z), new Vector3D(x + 1, y, z + c), new Vector3D(x, y, z + c), pivot, colorIndices[cstart]);
+									}
+									if((flags & 8) != 0) 
+									{
+										AddFace(verts, new Vector3D(x, y + 1, z), new Vector3D(x + 1, y + 1, z), new Vector3D(x, y + 1, z + c), new Vector3D(x + 1, y + 1, z + c), pivot, colorIndices[cstart]);
+									}
+
+									if(c == 0) c++;
+									z += c;
+									cstart += c;
+								}
+
+								if((flags & 32) != 0) 
+								{
+									z = ztop + zleng - 1;
+									AddFace(verts, new Vector3D(x + 1, y, z + 1), new Vector3D(x, y, z + 1), new Vector3D(x + 1, y + 1, z + 1), new Vector3D(x, y + 1, z + 1), pivot, colorIndices[zleng - 1]);
+								}
+							}
+						}
+
+						counter++;
+					}
+				}
+			}
+
+			// get model extents
+			int minX = (int)((xsize / 2f - pivot.x) * mde.Scale.X);
+			int maxX = (int)((xsize / 2f + pivot.x) * mde.Scale.X);
+			int minY = (int)((ysize / 2f - pivot.y) * mde.Scale.Y);
+			int maxY = (int)((ysize / 2f + pivot.y) * mde.Scale.Y);
+			
+			// calculate model radius
+			mde.Model.Radius = Math.Max(Math.Max(Math.Abs(minY), Math.Abs(maxY)), Math.Max(Math.Abs(minX), Math.Abs(maxX)));
+
+			//create texture
+			MemoryStream memstream = new MemoryStream((4096 * 4) + 4096);
+			using (Bitmap bmp = CreateVoxelTexture(palette)) bmp.Save(memstream, ImageFormat.Bmp);
+			memstream.Seek(0, SeekOrigin.Begin);
+
+			Texture texture = Texture.FromStream(device, memstream, (int)memstream.Length, 64, 64, 0, Usage.None, Format.Unknown, Pool.Managed, Filter.Point, Filter.Box, 0);
+			memstream.Dispose();
+
+			//add texture
+			mde.Model.Textures.Add(texture);
+
+			//create mesh
+			int[] indices = new int[verts.Count];
+			for(int i = 0; i < verts.Count; i++) 
+			{
+				indices[i] = i;
+			}
+
+			Mesh mesh = new Mesh(device, verts.Count / 3, verts.Count, MeshFlags.Use32Bit | MeshFlags.IndexBufferManaged | MeshFlags.VertexBufferManaged, vertexElements);
+
+			DataStream mstream = mesh.VertexBuffer.Lock(0, 0, LockFlags.None);
+			mstream.WriteRange(verts.ToArray());
+			mesh.VertexBuffer.Unlock();
+
+			mstream = mesh.IndexBuffer.Lock(0, 0, LockFlags.None);
+			mstream.WriteRange(indices);
+			mesh.IndexBuffer.Unlock();
+
+			mesh.OptimizeInPlace(MeshOptimizeFlags.AttributeSort);
+
+			//add mesh
+			mde.Model.Meshes.Add(mesh);
+		}
+
+		// Shameless GZDoom rip-off
+		private static void AddFace(List<WorldVertex> verts, Vector3D v1, Vector3D v2, Vector3D v3, Vector3D v4, Vector3D pivot, int colorIndex) 
+		{
+			float pu0 = (colorIndex % 16) / 16f;
+			float pu1 = pu0 + 0.0001f;
+			float pv0 = (colorIndex / 16) / 16f;
+			float pv1 = pv0 + 0.0001f;
+			
+			WorldVertex wv1 = new WorldVertex();
+			wv1.x = v1.x - pivot.x;
+			wv1.y = -v1.y + pivot.y;
+			wv1.z = -v1.z + pivot.z;
+			wv1.c = -1;
+			wv1.u = pu0;
+			wv1.v = pv0;
+			verts.Add(wv1);
+
+			WorldVertex wv2 = new WorldVertex();
+			wv2.x = v2.x - pivot.x;
+			wv2.y = -v2.y + pivot.y;
+			wv2.z = -v2.z + pivot.z;
+			wv2.c = -1;
+			wv2.u = pu1;
+			wv2.v = pv1;
+			verts.Add(wv2);
+
+			WorldVertex wv4 = new WorldVertex();
+			wv4.x = v4.x - pivot.x;
+			wv4.y = -v4.y + pivot.y;
+			wv4.z = -v4.z + pivot.z;
+			wv4.c = -1;
+			wv4.u = pu0;
+			wv4.v = pv0;
+			verts.Add(wv4);
+
+			WorldVertex wv3 = new WorldVertex();
+			wv3.x = v3.x - pivot.x;
+			wv3.y = -v3.y + pivot.y;
+			wv3.z = -v3.z + pivot.z;
+			wv3.c = -1;
+			wv3.u = pu1;
+			wv3.v = pv1;
+			verts.Add(wv3);
+
+			verts.Add(wv1);
+			verts.Add(wv4);
+		}
+
+		private unsafe static Bitmap CreateVoxelTexture(PixelColor[] palette) 
+		{
+			Bitmap bmp = new Bitmap(16, 16);
+			BitmapData bmpdata = bmp.LockBits(new Rectangle(0, 0, 16, 16), ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
+
+			if(bmpdata != null) 
+			{
+				PixelColor* pixels = (PixelColor*)(bmpdata.Scan0.ToPointer());
+				const int numpixels = 256;
+				int i = 255;
+
+				for(PixelColor* cp = pixels + numpixels - 1; cp >= pixels; cp--, i--) 
+				{
+					cp->r = palette[i].r;
+					cp->g = palette[i].g;
+					cp->b = palette[i].b;
+					cp->a = palette[i].a;
+				}
+				bmp.UnlockBits(bmpdata);
+			}
+
+			//scale bitmap, so colors stay (almost) the same when bilinear filtering is enabled
+			Bitmap scaled = new Bitmap(64, 64);
+			using(Graphics gs = Graphics.FromImage(scaled)) 
+			{
+				gs.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.NearestNeighbor;
+				gs.DrawImage(bmp, new Rectangle(0, 0, 64, 64), new Rectangle(0, 0, 16, 16), GraphicsUnit.Pixel);
+			}
+			bmp.Dispose();
+
+			return scaled;
+		}
+
+		#endregion
+
+		#region ================== Utility
+
+		private static MemoryStream LoadFile(List<DataReader> containers, string path, bool isModel) 
+		{
+			foreach(DataReader dr in containers) 
+			{
+				if(isModel && dr is WADReader) continue;  //models cannot be stored in WADs
+
+				//load file
+				if(dr.FileExists(path)) return dr.LoadFile(path);
+			}
+			return null;
+		}
+
+		private static Texture LoadTexture(List<DataReader> containers, string path, Device device) 
+		{
+			if(string.IsNullOrEmpty(path)) return null;
+
+			MemoryStream ms = LoadFile(containers, path, false);
+			if(ms == null) return null;
+
+			Texture texture = null;
+
+			//create texture
+			if(Path.GetExtension(path) == ".pcx") //pcx format requires special handling...
+			{ 
+				FileImageReader fir = new FileImageReader();
+				Bitmap bitmap = fir.ReadAsBitmap(ms);
+
+				ms.Close();
+				ms.Dispose();
+
+				if(bitmap != null) 
+				{
+					BitmapData bmlock = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height), ImageLockMode.ReadOnly, bitmap.PixelFormat);
+					texture = new Texture(device, bitmap.Width, bitmap.Height, 1, Usage.None, Format.A8R8G8B8, Pool.Managed);
+
+					DataRectangle textureLock = texture.LockRectangle(0, LockFlags.None);
+					textureLock.Data.WriteRange(bmlock.Scan0, bmlock.Height * bmlock.Stride);
+
+					bitmap.UnlockBits(bmlock);
+					texture.UnlockRectangle(0);
+				}
+			} 
+			else 
+			{
+				texture = Texture.FromStream(device, ms);
+
+				ms.Close();
+				ms.Dispose();
+			}
+
+			return texture;
+		}
+
+		private static void CreateMesh(Device device, ref MD3LoadResult result, List<WorldVertex> verts, List<int> indices)
+		{
+			//create mesh
+			Mesh mesh = new Mesh(device, indices.Count / 3, verts.Count, MeshFlags.Use32Bit | MeshFlags.IndexBufferManaged | MeshFlags.VertexBufferManaged, vertexElements);
+
+			using(DataStream stream = mesh.LockVertexBuffer(LockFlags.None))
+			{
+				stream.WriteRange(verts.ToArray());
+			}
+			mesh.UnlockVertexBuffer();
+
+			using(DataStream stream = mesh.LockIndexBuffer(LockFlags.None))
+			{
+				stream.WriteRange(indices.ToArray());
+			}
+			mesh.UnlockIndexBuffer();
+
+			mesh.OptimizeInPlace(MeshOptimizeFlags.AttributeSort);
+
+			//store in result
+			result.Meshes.Add(mesh);
+		}
+
+		private static string ReadString(BinaryReader br, int len) 
+		{
+			string result = string.Empty;
+			int i;
+
+			for(i = 0; i < len; ++i) 
+			{
+				var c = br.ReadChar();
+				if(c == '\0') 
+				{
+					++i;
+					break;
+				}
+				result += c;
+			}
+
+			for(; i < len; ++i) br.ReadChar();
+			return result;
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/General/BinaryHeap.cs b/Source/Core/General/BinaryHeap.cs
new file mode 100644
index 0000000..6da6a88
--- /dev/null
+++ b/Source/Core/General/BinaryHeap.cs
@@ -0,0 +1,257 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+/*#region ================== Namespaces
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+
+#endregion
+
+namespace CodeImp.DoomBuilder
+{
+	internal class BinaryHeap<T> : IEnumerable<T>, ICollection<T> where T : IComparable<T>
+	{
+		#region ================== Variables
+
+		// This will keep all items
+		private List<T> heap;
+
+		#endregion
+
+		#region ================== Properties
+
+		public int Count { get { return heap.Count; } }
+		public virtual bool IsReadOnly { get { return false; } }
+		public T Root { get { if(heap.Count > 0) return heap[0]; else return default(T); } }
+		public T this[int index] { get { return ItemAt(index); } }
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		// Constructor
+		public BinaryHeap()
+		{
+			// Initialize with default capacity
+			heap = new List<T>();
+		}
+
+		// Constructor
+		public BinaryHeap(int capacity)
+		{
+			// Initialize with specified capacity
+			heap = new List<T>(capacity);
+		}
+
+		// Destructor
+		~BinaryHeap()
+		{
+			// Clean up
+			heap = null;
+		}
+
+		#endregion
+
+		#region ================== Methods
+		
+		// Methods to find our way through the heap
+		private static int ParentOf(int index) { return (index - 1) >> 1; }
+		private static int LeftOf(int index) { return (index << 1) + 1; }
+		private static int RightOf(int index) { return (index << 1) + 2; }
+		
+		// This swaps two items in place
+		protected virtual void SwapItems(int index1, int index2)
+		{
+			// Swap items
+			T tempitem = heap[index1];
+			heap[index1] = heap[index2];
+			heap[index2] = tempitem;
+		}
+
+		// This adds an item to the list
+		// This is an O(log n) operation, where n is Count
+		public virtual void Add(T item)
+		{
+			int index = heap.Count;
+			
+			// Add to the end of the heap
+			heap.Add(item);
+			
+			// Continue until the item is at the top
+			// or compares higher to the parent item
+			while((index > 0) && (heap[index].CompareTo(heap[ParentOf(index)]) > 0))
+			{
+				// Swap with parent item
+				SwapItems(index, ParentOf(index));
+				index = ParentOf(index);
+			}
+		}
+
+		// Finds and returns the index of an item
+		// This is an O(n) operation, where n is Count
+		public virtual int IndexOf(T item)
+		{
+			return heap.IndexOf(item);
+		}
+		
+		// This returns the item at the given index
+		// This is an O(1) operation
+		public virtual T ItemAt(int index)
+		{
+			return heap[index];
+		}
+		
+		// This removes an item from the list
+		// This is an O(log n) operation, where n is Count
+		public virtual void RemoveAt(int index)
+		{
+			int newindex = index;
+			
+			// Replace with last item
+			heap[index] = heap[heap.Count - 1];
+			heap.RemoveAt(heap.Count - 1);
+			
+			// Continue while item has at least a left child
+			while(LeftOf(index) < heap.Count)
+			{
+				// Right childs also available?
+				if(RightOf(index) < heap.Count)
+				{
+					// Compare with both childs
+					// NOTE: Using newindex as indexer in the second line to ensure the lowest of both is chosen
+					if(heap[index].CompareTo(heap[LeftOf(index)]) < 0) newindex = LeftOf(index);
+					if(heap[newindex].CompareTo(heap[RightOf(index)]) < 0) newindex = RightOf(index);
+				}
+				// Only left child available
+				else
+				{
+					// Compare with left child
+					if(heap[index].CompareTo(heap[LeftOf(index)]) < 0) newindex = LeftOf(index);
+				}
+
+				// Item should move down?
+				if(newindex != index)
+				{
+					// Swap the items
+					SwapItems(index, newindex);
+					index = newindex;
+				}
+				else
+				{
+					// Item is fine where it is, we're done
+					break;
+				}
+			}
+		}
+
+		// This removes the root item from the list
+		// This is an O(log n) operation, where n is Count
+		public virtual void RemoveRoot()
+		{
+			// Remove the root item
+			RemoveAt(0);
+		}
+
+		// This removes a specific item from the list
+		// This is an O(n) operation, where n is Count
+		public virtual bool Remove(T item)
+		{
+			// Find the item in the heap
+			int index = IndexOf(item);
+			if(index > -1)
+			{
+				// Remove the item from the heap
+				RemoveAt(index);
+				return true;
+			}
+			else
+			{
+				// No such item
+				return false;
+			}
+		}
+
+		// This clears the heap
+		public virtual void Clear()
+		{
+			// Clear the heap
+			heap.Clear();
+		}
+		
+		// This checks if the heap contains a specific item
+		// This is an O(n) operation, where n is Count
+		public virtual bool Contains(T item)
+		{
+			return (IndexOf(item) > -1);
+		}
+
+		// This copies all items to an array
+		public virtual void CopyTo(T[] array)
+		{
+			// Copy items
+			heap.CopyTo(array);
+		}
+		
+		// This copies all items to an array
+		public virtual void CopyTo(T[] array, int arrayindex)
+		{
+			// Copy items
+			heap.CopyTo(array, arrayindex);
+		}
+
+		// This copies all items to an array
+		public virtual void CopyTo(int index, T[] array, int arrayindex, int count)
+		{
+			// Copy items
+			heap.CopyTo(index, array, arrayindex, count);
+		}
+		
+		// Implemented to display the list
+		// This is an O(n) operation, where n is Count
+		public override string ToString()
+		{
+			StringBuilder str = new StringBuilder(heap.Count * 5);
+
+			// Go for all items
+			for(int i = 0; i < heap.Count; i++)
+			{
+				// Append item to string
+				if(i > 0) str.Append(", ");
+				str.Append(heap[i]);
+			}
+
+			// Return the string
+			return str.ToString();
+		}
+
+		// This returns an enumerator
+		public IEnumerator<T> GetEnumerator()
+		{
+			return heap.GetEnumerator();
+		}
+		
+		// This returns an enumerator
+		IEnumerator IEnumerable.GetEnumerator()
+		{
+			return heap.GetEnumerator();
+		}
+		
+		#endregion
+	}
+}*/
diff --git a/Source/Core/General/CRC.cs b/Source/Core/General/CRC.cs
new file mode 100644
index 0000000..3f9e505
--- /dev/null
+++ b/Source/Core/General/CRC.cs
@@ -0,0 +1,219 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+
+#endregion
+
+namespace CodeImp.DoomBuilder
+{
+	public class CRC
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		private Crc32 crc;
+
+		#endregion
+
+		#region ================== Properties
+
+		public long Value { get { return crc.Value; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public CRC()
+		{
+			crc = new Crc32();
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		public void Add(long value)
+		{
+			uint lo = (uint)((ulong)value & 0x00000000FFFFFFFF);
+			uint hi = (uint)(((ulong)value & 0xFFFFFFFF00000000) >> 32);
+			crc.Update(unchecked((int)lo));
+			crc.Update(unchecked((int)hi));
+		}
+
+		public void Add(int value)
+		{
+			crc.Update(value);
+		}
+
+		public void Add(byte[] data)
+		{
+			crc.Update(data);
+		}
+
+		public void Reset()
+		{
+			crc.Reset();
+		}
+
+		#endregion
+
+		//mxd. Taken from SharpZip
+		#region ================== Crc32
+		sealed class Crc32
+		{
+			const uint CRC_SEED = 0xFFFFFFFF;
+
+			readonly static uint[] CRC_TABLE = new uint[] {
+			0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419,
+			0x706AF48F, 0xE963A535, 0x9E6495A3, 0x0EDB8832, 0x79DCB8A4,
+			0xE0D5E91E, 0x97D2D988, 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07,
+			0x90BF1D91, 0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE,
+			0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7, 0x136C9856,
+			0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, 0x14015C4F, 0x63066CD9,
+			0xFA0F3D63, 0x8D080DF5, 0x3B6E20C8, 0x4C69105E, 0xD56041E4,
+			0xA2677172, 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,
+			0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940, 0x32D86CE3,
+			0x45DF5C75, 0xDCD60DCF, 0xABD13D59, 0x26D930AC, 0x51DE003A,
+			0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423, 0xCFBA9599,
+			0xB8BDA50F, 0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924,
+			0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D, 0x76DC4190,
+			0x01DB7106, 0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F,
+			0x9FBFE4A5, 0xE8B8D433, 0x7807C9A2, 0x0F00F934, 0x9609A88E,
+			0xE10E9818, 0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,
+			0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E, 0x6C0695ED,
+			0x1B01A57B, 0x8208F4C1, 0xF50FC457, 0x65B0D9C6, 0x12B7E950,
+			0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3,
+			0xFBD44C65, 0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2,
+			0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB, 0x4369E96A,
+			0x346ED9FC, 0xAD678846, 0xDA60B8D0, 0x44042D73, 0x33031DE5,
+			0xAA0A4C5F, 0xDD0D7CC9, 0x5005713C, 0x270241AA, 0xBE0B1010,
+			0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
+			0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17,
+			0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD, 0xEDB88320, 0x9ABFB3B6,
+			0x03B6E20C, 0x74B1D29A, 0xEAD54739, 0x9DD277AF, 0x04DB2615,
+			0x73DC1683, 0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8,
+			0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1, 0xF00F9344,
+			0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB,
+			0x196C3671, 0x6E6B06E7, 0xFED41B76, 0x89D32BE0, 0x10DA7A5A,
+			0x67DD4ACC, 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,
+			0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1,
+			0xA6BC5767, 0x3FB506DD, 0x48B2364B, 0xD80D2BDA, 0xAF0A1B4C,
+			0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55, 0x316E8EEF,
+			0x4669BE79, 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236,
+			0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F, 0xC5BA3BBE,
+			0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, 0xB5D0CF31,
+			0x2CD99E8B, 0x5BDEAE1D, 0x9B64C2B0, 0xEC63F226, 0x756AA39C,
+			0x026D930A, 0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,
+			0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, 0x92D28E9B,
+			0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21, 0x86D3D2D4, 0xF1D4E242,
+			0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1,
+			0x18B74777, 0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C,
+			0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45, 0xA00AE278,
+			0xD70DD2EE, 0x4E048354, 0x3903B3C2, 0xA7672661, 0xD06016F7,
+			0x4969474D, 0x3E6E77DB, 0xAED16A4A, 0xD9D65ADC, 0x40DF0B66,
+			0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
+			0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605,
+			0xCDD70693, 0x54DE5729, 0x23D967BF, 0xB3667A2E, 0xC4614AB8,
+			0x5D681B02, 0x2A6F2B94, 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B,
+			0x2D02EF8D
+			};
+
+			/*internal static uint ComputeCrc32(uint oldCrc, byte value) 
+			{
+				return (Crc32.CrcTable[(oldCrc ^ value) & 0xFF] ^ (oldCrc >> 8));
+			}*/
+
+			/// <summary>
+			/// The crc data checksum so far.
+			/// </summary>
+			uint crc;
+
+			/// <summary>
+			/// Returns the CRC32 data checksum computed so far.
+			/// </summary>
+			public long Value { get { return crc; } set { crc = (uint)value; } }
+
+			/// <summary>
+			/// Resets the CRC32 data checksum as if no update was ever called.
+			/// </summary>
+			public void Reset() { crc = 0; }
+
+			/// <summary>
+			/// Updates the checksum with the int bval.
+			/// </summary>
+			/// <param name = "value">
+			/// the byte is taken as the lower 8 bits of value
+			/// </param>
+			public void Update(int value) 
+			{
+				crc ^= CRC_SEED;
+				crc = CRC_TABLE[(crc ^ value) & 0xFF] ^ (crc >> 8);
+				crc ^= CRC_SEED;
+			}
+
+			/// <summary>
+			/// Updates the checksum with the bytes taken from the array.
+			/// </summary>
+			/// <param name="buffer">
+			/// buffer an array of bytes
+			/// </param>
+			public void Update(byte[] buffer) 
+			{
+				if(buffer == null) throw new ArgumentNullException("buffer");
+				Update(buffer, 0, buffer.Length);
+			}
+
+			/// <summary>
+			/// Adds the byte array to the data checksum.
+			/// </summary>
+			/// <param name = "buffer">
+			/// The buffer which contains the data
+			/// </param>
+			/// <param name = "offset">
+			/// The offset in the buffer where the data starts
+			/// </param>
+			/// <param name = "count">
+			/// The number of data bytes to update the CRC with.
+			/// </param>
+			public void Update(byte[] buffer, int offset, int count) 
+			{
+				if(buffer == null) throw new ArgumentNullException("buffer");
+				if(count < 0) throw new ArgumentOutOfRangeException("count", "Count cannot be less than zero");
+				if(offset < 0 || offset + count > buffer.Length) throw new ArgumentOutOfRangeException("offset");
+
+				crc ^= CRC_SEED;
+
+				while(--count >= 0) 
+				{
+					crc = CRC_TABLE[(crc ^ buffer[offset++]) & 0xFF] ^ (crc >> 8);
+				}
+
+				crc ^= CRC_SEED;
+			}
+		}
+		#endregion
+	}
+}
diff --git a/Source/Core/General/Clock.cs b/Source/Core/General/Clock.cs
new file mode 100644
index 0000000..8b848fd
--- /dev/null
+++ b/Source/Core/General/Clock.cs
@@ -0,0 +1,26 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+using SlimDX;
+
+namespace CodeImp.DoomBuilder
+{
+	public class Clock
+	{
+		// This queries the system for the current time
+		public static float CurrentTime { get { return Configuration.Timer.ElapsedMilliseconds; } }
+	}
+}
diff --git a/Source/Core/General/ErrorItem.cs b/Source/Core/General/ErrorItem.cs
new file mode 100644
index 0000000..50d4a19
--- /dev/null
+++ b/Source/Core/General/ErrorItem.cs
@@ -0,0 +1,47 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+#endregion
+
+namespace CodeImp.DoomBuilder
+{
+	internal struct ErrorItem
+	{
+		public ErrorType type;
+		public string message;
+		
+		internal ErrorItem(ErrorType type, string message)
+		{
+			this.type = type;
+			this.message = message;
+		}
+	}
+	
+	public enum ErrorType
+	{
+		/// <summary>
+		/// This indicates a significant error that may cause problems for the data displayed or editing behaviour.
+		/// </summary>
+		Error,
+		
+		/// <summary>
+		/// This indicates a potential problem.
+		/// </summary>
+		Warning
+	}
+}
diff --git a/Source/Core/General/ErrorLogger.cs b/Source/Core/General/ErrorLogger.cs
new file mode 100644
index 0000000..f2a9794
--- /dev/null
+++ b/Source/Core/General/ErrorLogger.cs
@@ -0,0 +1,131 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections.Generic;
+
+#endregion
+
+namespace CodeImp.DoomBuilder
+{
+	public class ErrorLogger
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+		
+		private List<ErrorItem> errors;
+		private volatile bool changed;
+		private volatile bool erroradded;
+		private volatile bool warningadded;
+		
+		#endregion
+
+		#region ================== Properties
+		
+		public bool HasErrors { get { return (errors.Count > 0); } }
+		public int ErrorsCount { get { return errors.Count; } } //mxd
+		public bool HasChanged { get { return changed; } set { changed = value; } }
+		public bool IsErrorAdded { get { return erroradded; } set { erroradded = value; } }
+		public bool IsWarningAdded { get { return warningadded; } set { warningadded = value; } }
+		
+		#endregion
+
+		#region ================== Constructor / Disposer
+		
+		// Constructor
+		internal ErrorLogger()
+		{
+			errors = new List<ErrorItem>();
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+
+		// This clears the errors
+		public void Clear()
+		{
+			lock(this)
+			{
+				changed = false;
+				erroradded = false;
+				warningadded = false;
+				errors.Clear();
+
+				//mxd
+				General.MainWindow.SetWarningsCount(0, false);
+			}
+		}
+		
+		// This adds a new error
+		public void Add(ErrorType type, string message)
+		{
+			string prefix = "";
+			
+			lock(this)
+			{
+				//mxd. Don't add duplicate messages
+				if(errors.Count == 0 || message != errors[errors.Count - 1].message || type != errors[errors.Count - 1].type)
+				{
+					errors.Add(new ErrorItem(type, message));
+					switch(type)
+					{
+						case ErrorType.Error:
+							erroradded = true;
+							prefix = "ERROR: ";
+#if DEBUG
+							DebugConsole.WriteLine(DebugMessageType.ERROR, message);
+#endif
+							break;
+
+						case ErrorType.Warning:
+							warningadded = true;
+							prefix = "WARNING: ";
+#if DEBUG
+							DebugConsole.WriteLine(DebugMessageType.WARNING, message);
+#endif
+							break;
+					}
+
+					changed = true;
+					General.WriteLogLine(prefix + message);
+					General.MainWindow.SetWarningsCount(errors.Count, erroradded); //mxd
+				}
+				//mxd. But still blink the indicator on errors
+				else if(type == ErrorType.Error)
+				{
+					General.MainWindow.SetWarningsCount(errors.Count, true);
+				}
+			}
+		}
+		
+		// This returns the list of errors
+		internal List<ErrorItem> GetErrors()
+		{
+			lock(this)
+			{
+				List<ErrorItem> copylist = new List<ErrorItem>(errors);
+				return copylist;
+			}
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/General/FileLockChecker.cs b/Source/Core/General/FileLockChecker.cs
new file mode 100644
index 0000000..79aa82c
--- /dev/null
+++ b/Source/Core/General/FileLockChecker.cs
@@ -0,0 +1,205 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Runtime.InteropServices;
+
+namespace CodeImp.DoomBuilder
+{
+	internal static class FileLockChecker
+	{
+		internal class FileLockCheckResult //mxd
+		{
+			public string Error;
+			public List<Process> Processes = new List<Process>();
+		}
+		
+		[StructLayout(LayoutKind.Sequential)]
+		private struct RM_UNIQUE_PROCESS
+		{
+			public int dwProcessId;
+			public System.Runtime.InteropServices.ComTypes.FILETIME ProcessStartTime;
+		}
+
+		private const int RmRebootReasonNone = 0;
+		private const int CCH_RM_MAX_APP_NAME = 255;
+		private const int CCH_RM_MAX_SVC_NAME = 63;
+
+		private enum RM_APP_TYPE
+		{
+			RmUnknownApp = 0,
+			RmMainWindow = 1,
+			RmOtherWindow = 2,
+			RmService = 3,
+			RmExplorer = 4,
+			RmConsole = 5,
+			RmCritical = 1000
+		}
+
+		[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+		private struct RM_PROCESS_INFO
+		{
+			public RM_UNIQUE_PROCESS Process;
+
+			[MarshalAs(UnmanagedType.ByValTStr, SizeConst = CCH_RM_MAX_APP_NAME + 1)]
+			public string strAppName;
+
+			[MarshalAs(UnmanagedType.ByValTStr, SizeConst = CCH_RM_MAX_SVC_NAME + 1)]
+			public string strServiceShortName;
+
+			public RM_APP_TYPE ApplicationType;
+			public uint AppStatus;
+			public uint TSSessionId;
+			[MarshalAs(UnmanagedType.Bool)]
+			public bool bRestartable;
+		}
+
+		[DllImport("rstrtmgr.dll", CharSet = CharSet.Unicode)]
+		private static extern int RmRegisterResources(uint pSessionHandle,
+											  UInt32 nFiles,
+											  string[] rgsFilenames,
+											  UInt32 nApplications,
+											  [In] RM_UNIQUE_PROCESS[] rgApplications,
+											  UInt32 nServices,
+											  string[] rgsServiceNames);
+
+		[DllImport("rstrtmgr.dll", CharSet = CharSet.Auto)]
+		private static extern int RmStartSession(out uint pSessionHandle, int dwSessionFlags, string strSessionKey);
+
+		[DllImport("rstrtmgr.dll")]
+		private static extern int RmEndSession(uint pSessionHandle);
+
+		[DllImport("rstrtmgr.dll")]
+		private static extern int RmGetList(uint dwSessionHandle,
+									out uint pnProcInfoNeeded,
+									ref uint pnProcInfo,
+									[In, Out] RM_PROCESS_INFO[] rgAffectedApps,
+									ref uint lpdwRebootReasons);
+
+		/// <summary>
+		/// Find out what process(es) have a lock on the specified file.
+		/// </summary>
+		/// <param name="path">Path of the file.</param>
+		/// <returns>Processes locking the file</returns>
+		/// <remarks>See also:
+		/// http://msdn.microsoft.com/en-us/library/windows/desktop/aa373661(v=vs.85).aspx
+		/// http://wyupdate.googlecode.com/svn-history/r401/trunk/frmFilesInUse.cs (no copyright in code at time of viewing)
+		/// 
+		/// </remarks>
+		static public FileLockCheckResult CheckFile(string path)
+		{
+			//mxd. Do it the clunky way? (WinXP)
+			if(Environment.OSVersion.Version.Major < 6)
+			{
+				bool locked = false;
+				
+				try
+				{
+					using(File.Open(path, FileMode.Open)) { }
+				}
+				catch(IOException e)
+				{
+					int errorcode = Marshal.GetHRForException(e) & ((1 << 16) - 1);
+					locked = (errorcode == 32 || errorcode == 33);
+				}
+
+				return new FileLockCheckResult { Error = (locked ? "Unable to save the map. Map file is locked by another process." : string.Empty) };
+			}
+
+			//mxd. Needs Vista or newer...
+			uint handle;
+			string key = Guid.NewGuid().ToString();
+			FileLockCheckResult result = new FileLockCheckResult(); //mxd
+			string errorstart = "Unable to save the map: target file is locked by another process."
+			                    + Environment.NewLine + "Also, unable to get the name of the offending process:"
+			                    + Environment.NewLine + Environment.NewLine;
+
+			int res = RmStartSession(out handle, 0, key);
+			if(res != 0)
+			{
+				RmEndSession(handle); //mxd
+				result.Error = errorstart + "Error " + res + ". Could not begin restart session. Unable to determine file locker."; //mxd
+				return result;
+			}
+
+			try
+			{
+				const int ERROR_MORE_DATA = 234;
+				uint pnProcInfoNeeded,
+					 pnProcInfo = 0,
+					 lpdwRebootReasons = RmRebootReasonNone;
+
+				string[] resources = new[] { path }; // Just checking on one resource.
+				res = RmRegisterResources(handle, (uint)resources.Length, resources, 0, null, 0, null);
+				if(res != 0)
+				{
+					result.Error = errorstart + "Error " + res + ". Could not register resource."; //mxd
+					return result;
+				}
+
+				//Note: there's a race condition here -- the first call to RmGetList() returns
+				//      the total number of process. However, when we call RmGetList() again to get
+				//      the actual processes this number may have increased.
+				res = RmGetList(handle, out pnProcInfoNeeded, ref pnProcInfo, null, ref lpdwRebootReasons);
+				if(res == ERROR_MORE_DATA)
+				{
+					// Create an array to store the process results
+					RM_PROCESS_INFO[] processInfo = new RM_PROCESS_INFO[pnProcInfoNeeded];
+					pnProcInfo = pnProcInfoNeeded;
+
+					// Get the list
+					res = RmGetList(handle, out pnProcInfoNeeded, ref pnProcInfo, processInfo, ref lpdwRebootReasons);
+					if(res == 0)
+					{
+						result.Processes = new List<Process>((int)pnProcInfo);
+
+						// Enumerate all of the results and add them to the 
+						// list to be returned
+						for(int i = 0; i < pnProcInfo; i++)
+						{
+							try
+							{
+								Process process = Process.GetProcessById(processInfo[i].Process.dwProcessId);
+								result.Processes.Add(process);
+							}
+							// catch the error -- in case the process is no longer running
+							catch(ArgumentException) {}
+						}
+
+						//mxd
+						if(result.Processes.Count > 0)
+						{
+							result.Error = "Unable to save the map: target file is locked by the following process"
+							               + (result.Processes.Count > 1 ? "es" : "") + ":"
+							               + Environment.NewLine + Environment.NewLine;
+
+							foreach(Process process in result.Processes)
+							{
+								result.Error += Path.GetFileName(process.MainModule.FileName)
+									+ " ('" + process.MainModule.FileName
+									+ "', started at " + process.StartTime + ")" 
+									+ Environment.NewLine + Environment.NewLine;
+							}
+						}
+					}
+					else
+					{
+						result.Error = "Error " + res + ". Could not list processes locking resource."; //mxd
+						return result;
+					}
+				}
+				else if(res != 0)
+				{
+					result.Error = "Error " + res + ". Could not list processes locking resource. Failed to get size of result."; //mxd
+					return result;
+				}
+			}
+			finally
+			{
+				RmEndSession(handle);
+			}
+
+			return result;
+		}
+	}
+}
diff --git a/Source/Core/General/General.cs b/Source/Core/General/General.cs
new file mode 100644
index 0000000..28cade3
--- /dev/null
+++ b/Source/Core/General/General.cs
@@ -0,0 +1,2151 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Drawing;
+using System.IO;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Security.AccessControl;
+using System.Security.Principal;
+using System.Text;
+using System.Threading;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Actions;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Data;
+using CodeImp.DoomBuilder.Editing;
+using CodeImp.DoomBuilder.IO;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Plugins;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Types;
+using CodeImp.DoomBuilder.Windows;
+using Microsoft.Win32;
+using SlimDX.Direct3D9;
+
+#endregion
+
+namespace CodeImp.DoomBuilder
+{
+	public static class General
+	{
+		#region ================== API Declarations
+
+		[DllImport("devil.dll")]
+		private static extern void ilInit();
+
+		[DllImport("user32.dll")]
+		internal static extern bool LockWindowUpdate(IntPtr hwnd);
+
+		[DllImport("kernel32.dll", EntryPoint = "RtlZeroMemory", SetLastError = false)]
+		internal static extern void ZeroMemory(IntPtr dest, int size);
+
+		[DllImport("kernel32.dll", EntryPoint = "RtlMoveMemory", SetLastError = false)]
+		internal static extern unsafe void CopyMemory(void* dst, void* src, uint length);
+
+		[DllImport("user32.dll", EntryPoint = "SendMessage", SetLastError = true, CallingConvention = CallingConvention.StdCall)]
+		internal static extern int SendMessage(IntPtr hwnd, uint Msg, int wParam, int lParam);
+
+		[DllImport("user32.dll", SetLastError = true)]
+		internal static extern bool MessageBeep(MessageBeepType type);
+
+		[DllImport("kernel32.dll")]
+		internal extern static IntPtr LoadLibrary(string filename);
+
+		[DllImport("kernel32.dll")]
+		internal extern static bool FreeLibrary(IntPtr moduleptr);
+
+		[DllImport("user32.dll")]
+		internal static extern IntPtr CreateWindowEx(uint exstyle, string classname, string windowname, uint style,
+												   int x, int y, int width, int height, IntPtr parentptr, int menu,
+												   IntPtr instanceptr, string param);
+
+		[DllImport("user32.dll")]
+		internal static extern bool DestroyWindow(IntPtr windowptr);
+
+		[DllImport("user32.dll")]
+		internal static extern int SetWindowPos(IntPtr windowptr, int insertafterptr, int x, int y, int cx, int cy, int flags);
+		
+		[DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)]
+		private static extern uint GetShortPathName([MarshalAs(UnmanagedType.LPTStr)] string longpath, [MarshalAs(UnmanagedType.LPTStr)]StringBuilder shortpath, uint buffersize);
+
+		//[DllImport("user32.dll")]
+		//internal static extern int SetScrollInfo(IntPtr windowptr, int bar, IntPtr scrollinfo, bool redraw);
+
+		//[DllImport("user32.dll")]
+		//internal static extern int GetScrollInfo(IntPtr windowptr, int bar, IntPtr scrollinfo);
+
+		#endregion
+
+		#region ================== Constants
+
+		// SendMessage API
+		internal const int WM_USER = 0x400;
+		internal const int WM_SYSCOMMAND = 0x112;
+		internal const int SC_KEYMENU = 0xF100;
+		internal const int CB_SETITEMHEIGHT = 0x153;
+		//internal const int CB_SHOWDROPDOWN = 0x14F;
+		//internal const int EM_GETSCROLLPOS = WM_USER + 221;
+		//internal const int EM_SETSCROLLPOS = WM_USER + 222;
+		//internal const int SB_HORZ = 0;
+		//internal const int SB_VERT = 1;
+		//internal const int SB_CTL = 2;
+		//internal const int SIF_RANGE = 0x1;
+		//internal const int SIF_PAGE = 0x2;
+		//internal const int SIF_POS = 0x4;
+		//internal const int SIF_DISABLENOSCROLL = 0x8;
+		//internal const int SIF_TRACKPOS = 0x16;
+		//internal const int SIF_ALL = SIF_RANGE + SIF_PAGE + SIF_POS + SIF_TRACKPOS;
+		
+		// Files and Folders
+		private const string SETTINGS_FILE = "GZBuilder.cfg";
+		private const string DEFAULT_SETTINGS_FILE = "GZBuilder.default.cfg"; //mxd
+		private const string SETTINGS_DIR = "Doom Builder";
+		private const string LOG_FILE = "GZBuilder.log";
+		private const string GAME_CONFIGS_DIR = "Configurations";
+		private const string COMPILERS_DIR = "Compilers";
+		private const string PLUGINS_DIR = "Plugins";
+		private const string SCRIPTS_DIR = "Scripting";
+		private const string SCREENSHOTS_DIR = "Screenshots"; //mxd
+		private const string SNIPPETS_DIR = "Snippets"; //mxd
+		private const string MAP_RESTORE_DIR = "Restore"; //mxd
+		private const string SETUP_DIR = "Setup";
+		private const string SPRITES_DIR = "Sprites";
+		private const string TEXTURES_DIR = "Textures"; //mxd
+		private const string HELP_FILE = "Refmanual.chm";
+
+		// SCROLLINFO structure
+		/*internal struct ScrollInfo
+		{
+			public int size;		// size of this structure
+			public uint mask;		// combination of SIF_ constants
+			public int min;			// minimum scrolling position
+			public int max;			// maximum scrolling position
+			public uint page;		// page size (scroll bar uses this value to determine the appropriate size of the proportional scroll box)
+			public int pos;			// position of the scroll box
+			public int trackpos;	// immediate position of a scroll box that the user is dragging
+		}*/
+
+		#endregion
+
+		#region ================== Variables
+
+		// Files and Folders
+		private static string apppath;
+		private static string setuppath;
+		private static string settingspath;
+		private static string restorepath; //mxd
+		private static string logfile;
+		private static string temppath;
+		private static string configspath;
+		private static string compilerspath;
+		private static string scriptspath;
+		private static string snippetspath; //mxd
+		private static string screenshotspath; //mxd
+		private static string pluginspath;
+		private static string spritespath;
+		private static string texturespath; //mxd
+		
+		// Main objects
+		private static Assembly thisasm;
+		private static MainForm mainwindow;
+		private static ProgramConfiguration settings;
+		private static MapManager map;
+		private static EditingManager editing;
+		private static ActionManager actions;
+		private static HintsManager hints; //mxd
+		private static PluginManager plugins;
+		private static ColorCollection colors;
+		private static TypesManager types;
+		private static Clock clock;
+		private static ErrorLogger errorlogger;
+		//private static Mutex appmutex;
+		
+		// Configurations
+		private static List<ConfigurationInfo> configs;
+		private static List<CompilerInfo> compilers;
+		private static List<NodebuilderInfo> nodebuilders;
+		private static Dictionary<string, ScriptConfiguration> scriptconfigs;
+		private static Dictionary<string, ScriptConfiguration> compiledscriptconfigs; //mxd
+		
+		// States
+		private static bool debugbuild;
+		
+		// Command line arguments
+		private static string[] cmdargs;
+		private static string autoloadfile;
+		private static string autoloadmap;
+		private static string autoloadconfig;
+		private static bool autoloadstrictpatches;
+		private static DataLocationList autoloadresources;
+		private static bool delaymainwindow;
+		private static bool nosettings;
+		private static bool portablemode; //mxd
+
+		//misc
+		private static readonly Random random = new Random(); //mxd
+
+		#endregion
+
+		#region ================== Properties
+
+		public static Assembly ThisAssembly { get { return thisasm; } }
+		public static string AppPath { get { return apppath; } }
+		public static string TempPath { get { return temppath; } }
+		public static string ConfigsPath { get { return configspath; } }
+		internal static string SettingsPath { get { return settingspath; } } //mxd
+		internal static string MapRestorePath { get { return restorepath; } } //mxd
+		internal static string LogFile { get { return logfile; } } //mxd
+		public static string CompilersPath { get { return compilerspath; } }
+		public static string PluginsPath { get { return pluginspath; } }
+		public static string SpritesPath { get { return spritespath; } }
+		internal static string TexturesPath { get { return texturespath; } } //mxd
+		public static string SnippetsPath { get { return snippetspath; } } //mxd
+		public static string DefaultScreenshotsPath { get { return screenshotspath; } } //mxd
+		public static ICollection<string> CommandArgs { get { return Array.AsReadOnly(cmdargs); } }
+		internal static MainForm MainWindow { get { return mainwindow; } }
+		public static IMainForm Interface { get { return mainwindow; } }
+		public static ProgramConfiguration Settings { get { return settings; } }
+		public static ColorCollection Colors { get { return colors; } }
+		internal static List<ConfigurationInfo> Configs { get { return configs; } }
+		internal static List<NodebuilderInfo> Nodebuilders { get { return nodebuilders; } }
+		internal static List<CompilerInfo> Compilers { get { return compilers; } }
+		internal static Dictionary<string, ScriptConfiguration> ScriptConfigs { get { return scriptconfigs; } }
+		internal static Dictionary<string, ScriptConfiguration> CompiledScriptConfigs { get { return compiledscriptconfigs; } } //mxd
+		public static MapManager Map { get { return map; } }
+		public static ActionManager Actions { get { return actions; } }
+		public static HintsManager Hints { get { return hints; } } //mxd
+		internal static PluginManager Plugins { get { return plugins; } }
+		public static Clock Clock { get { return clock; } }
+		public static bool DebugBuild { get { return debugbuild; } }
+		internal static TypesManager Types { get { return types; } }
+		public static string AutoLoadFile { get { return autoloadfile; } }
+		public static string AutoLoadMap { get { return autoloadmap; } }
+		public static string AutoLoadConfig { get { return autoloadconfig; } }
+		public static bool AutoLoadStrictPatches { get { return autoloadstrictpatches; } }
+		public static DataLocationList AutoLoadResources { get { return new DataLocationList(autoloadresources); } }
+		public static bool DelayMainWindow { get { return delaymainwindow; } }
+		public static bool NoSettings { get { return nosettings; } }
+		public static EditingManager Editing { get { return editing; } }
+		public static ErrorLogger ErrorLogger { get { return errorlogger; } }
+
+		#endregion
+
+		#region ================== Configurations
+
+		// This returns the game configuration info by filename
+		internal static ConfigurationInfo GetConfigurationInfo(string filename)
+		{
+			// Go for all config infos
+			foreach(ConfigurationInfo ci in configs)
+			{
+				// Check if filename matches
+				if(string.Compare(Path.GetFileNameWithoutExtension(ci.Filename),
+								  Path.GetFileNameWithoutExtension(filename), true) == 0)
+				{
+					// Return this info
+					return ci;
+				}
+			}
+
+			// None found
+			return null;
+		}
+
+		// This loads and returns a game configuration
+		private static Configuration LoadGameConfiguration(string filename)
+		{
+			// Make the full filepathname
+			string filepathname = Path.Combine(configspath, filename);
+			
+			// Load configuration
+			try
+			{
+				// Try loading the configuration
+				Configuration cfg = new Configuration(filepathname, true);
+
+				// Check for erors
+				if(cfg.ErrorResult)
+				{
+					// Error in configuration
+					errorlogger.Add(ErrorType.Error, "Unable to load the game configuration file \"" + filename + "\". " +
+													 "Error in file \"" + cfg.ErrorFile + "\" near line " + cfg.ErrorLine + ": " + cfg.ErrorDescription);
+					return null;
+				}
+				// Check if this is a Doom Builder 2 config
+				if(cfg.ReadSetting("type", "") != "Doom Builder 2 Game Configuration")
+				{
+					// Old configuration
+					errorlogger.Add(ErrorType.Error, "Unable to load the game configuration file \"" + filename + "\". " +
+													 "This configuration is not a Doom Builder 2 game configuration.");
+					return null;
+				}
+
+				// Return config
+				return cfg;
+			}
+			catch(Exception e)
+			{
+				// Unable to load configuration
+				errorlogger.Add(ErrorType.Error, "Unable to load the game configuration file \"" + filename + "\". " + e.GetType().Name + ": " + e.Message);
+				General.WriteLog(e.StackTrace);
+				return null;
+			}
+		}
+
+		// This loads all game configurations
+		private static void LoadAllGameConfigurations()
+		{
+			// Display status
+			mainwindow.DisplayStatus(StatusType.Busy, "Loading game configurations...");
+
+			// Make array
+			configs = new List<ConfigurationInfo>();
+
+			// Go for all cfg files in the configurations directory
+			string[] filenames = Directory.GetFiles(configspath, "*.cfg", SearchOption.TopDirectoryOnly);
+
+			foreach(string filepath in filenames)
+			{
+				// Check if it can be loaded
+				Configuration cfg = LoadGameConfiguration(Path.GetFileName(filepath));
+				if(cfg != null)
+				{
+					string fullfilename = Path.GetFileName(filepath);
+					ConfigurationInfo cfginfo = new ConfigurationInfo(cfg, fullfilename);
+					
+					// Add to lists
+					General.WriteLogLine("Registered game configuration '" + cfginfo.Name + "' from '" + fullfilename + "'");
+					configs.Add(cfginfo);
+				}
+			}
+
+			// Sort the configs
+			configs.Sort();
+		}
+
+		// This loads all nodebuilder configurations
+		private static void LoadAllNodebuilderConfigurations()
+		{
+			// Display status
+			mainwindow.DisplayStatus(StatusType.Busy, "Loading nodebuilder configurations...");
+
+			// Make array
+			nodebuilders = new List<NodebuilderInfo>();
+
+			// Go for all cfg files in the compilers directory
+			string[] filenames = Directory.GetFiles(compilerspath, "*.cfg", SearchOption.AllDirectories);
+			foreach(string filepath in filenames)
+			{
+				try
+				{
+					// Try loading the configuration
+					Configuration cfg = new Configuration(filepath, true);
+
+					// Check for erors
+					if(cfg.ErrorResult)
+					{
+						// Error in configuration
+						errorlogger.Add(ErrorType.Error, "Unable to load the compiler configuration file \"" + Path.GetFileName(filepath) + "\". " +
+														 "Error in file \"" + cfg.ErrorFile + "\" near line " + cfg.ErrorLine + ": " + cfg.ErrorDescription);
+					}
+					else
+					{
+						// Get structures
+						IDictionary builderslist = cfg.ReadSetting("nodebuilders", new Hashtable());
+						foreach(DictionaryEntry de in builderslist)
+						{
+							// Check if this is a structure
+							if(de.Value is IDictionary)
+							{
+								try
+								{
+									// Make nodebuilder info
+									nodebuilders.Add(new NodebuilderInfo(Path.GetFileName(filepath), de.Key.ToString(), cfg));
+								}
+								catch(Exception e)
+								{
+									// Unable to load configuration
+									errorlogger.Add(ErrorType.Error, "Unable to load the nodebuilder configuration '" + de.Key + "' from \"" + Path.GetFileName(filepath) + "\". Error: " + e.Message);
+								}
+							}
+						}
+					}
+				}
+				catch(Exception)
+				{
+					// Unable to load configuration
+					errorlogger.Add(ErrorType.Error, "Unable to load the compiler configuration file \"" + Path.GetFileName(filepath) + "\".");
+				}
+			}
+
+			// Sort the list
+			nodebuilders.Sort();
+		}
+
+		// This loads all script configurations
+		private static void LoadAllScriptConfigurations()
+		{
+			// Display status
+			mainwindow.DisplayStatus(StatusType.Busy, "Loading script configurations...");
+			
+			// Make collection
+			scriptconfigs = new Dictionary<string, ScriptConfiguration>(StringComparer.Ordinal);
+			compiledscriptconfigs = new Dictionary<string, ScriptConfiguration>(StringComparer.Ordinal); //mxd
+			
+			// Go for all cfg files in the scripts directory
+			string[] filenames = Directory.GetFiles(scriptspath, "*.cfg", SearchOption.TopDirectoryOnly);
+			foreach(string filepath in filenames)
+			{
+				try
+				{
+					// Try loading the configuration
+					Configuration cfg = new Configuration(filepath, true);
+
+					// Check for erors
+					if(cfg.ErrorResult)
+					{
+						// Error in configuration
+						errorlogger.Add(ErrorType.Error, "Unable to load the script configuration file \"" + Path.GetFileName(filepath) + "\". " +
+														"Error in file \"" + cfg.ErrorFile + "\" near line " + cfg.ErrorLine + ": " + cfg.ErrorDescription);
+					}
+					else
+					{
+						try
+						{
+							// Make script configuration
+							ScriptConfiguration scfg = new ScriptConfiguration(cfg);
+							string filename = Path.GetFileName(filepath);
+							scriptconfigs.Add(filename.ToLowerInvariant(), scfg);
+
+							//mxd. Store acc compilers in a separate dictionary
+							if(scfg.ScriptType == ScriptType.ACS)
+								compiledscriptconfigs.Add(filename.ToLowerInvariant(), scfg);
+						}
+						catch(Exception e)
+						{
+							// Unable to load configuration
+							errorlogger.Add(ErrorType.Error, "Unable to load the script configuration \"" + Path.GetFileName(filepath) + "\". Error: " + e.Message);
+						}
+					}
+				}
+				catch(Exception e)
+				{
+					// Unable to load configuration
+					errorlogger.Add(ErrorType.Error, "Unable to load the script configuration file \"" + Path.GetFileName(filepath) + "\". Error: " + e.Message);
+					General.WriteLogLine(e.StackTrace);
+				}
+			}
+		}
+
+		// This loads all compiler configurations
+		private static void LoadAllCompilerConfigurations()
+		{
+			Dictionary<string, CompilerInfo> addedcompilers = new Dictionary<string, CompilerInfo>(StringComparer.Ordinal);
+
+			// Display status
+			mainwindow.DisplayStatus(StatusType.Busy, "Loading compiler configurations...");
+
+			// Make array
+			compilers = new List<CompilerInfo>();
+
+			// Go for all cfg files in the compilers directory
+			string[] filenames = Directory.GetFiles(compilerspath, "*.cfg", SearchOption.AllDirectories);
+			foreach(string filepath in filenames)
+			{
+				try
+				{
+					// Try loading the configuration
+					Configuration cfg = new Configuration(filepath, true);
+
+					// Check for erors
+					if(cfg.ErrorResult)
+					{
+						// Error in configuration
+						errorlogger.Add(ErrorType.Error, "Unable to load the compiler configuration file \"" + Path.GetFileName(filepath) + "\". " +
+														 "Error in file \"" + cfg.ErrorFile + "\" near line " + cfg.ErrorLine + ": " + cfg.ErrorDescription);
+					}
+					else
+					{
+						// Get structures
+						IDictionary compilerslist = cfg.ReadSetting("compilers", new Hashtable());
+						foreach(DictionaryEntry de in compilerslist)
+						{
+							// Check if this is a structure
+							if(de.Value is IDictionary)
+							{
+								// Make compiler info
+								CompilerInfo info = new CompilerInfo(Path.GetFileName(filepath), de.Key.ToString(), Path.GetDirectoryName(filepath), cfg);
+								if(!addedcompilers.ContainsKey(info.Name))
+								{
+									compilers.Add(info);
+									addedcompilers.Add(info.Name, info);
+								}
+								else
+								{
+									errorlogger.Add(ErrorType.Error, "Compiler \"" + info.Name + "\" is defined more than once. The first definition in " + addedcompilers[info.Name].FileName + " will be used.");
+								}
+							}
+						}
+					}
+				}
+				catch(Exception e)
+				{
+					// Unable to load configuration
+					errorlogger.Add(ErrorType.Error, "Unable to load the compiler configuration file \"" + Path.GetFileName(filepath) + "\". " + e.GetType().Name + ": " + e.Message);
+					General.WriteLogLine(e.StackTrace);
+				}
+			}
+		}
+		
+		// This returns a nodebuilder by name
+		internal static NodebuilderInfo GetNodebuilderByName(string name)
+		{
+			// Go for all nodebuilders
+			foreach(NodebuilderInfo n in nodebuilders)
+			{
+				// Name matches?
+				if(n.Name == name) return n;
+			}
+
+			// Cannot find that nodebuilder
+			return null;
+		}
+		
+		#endregion
+
+		#region ================== Startup
+
+		// Main program entry
+		[STAThread]
+		internal static void Main(string[] args)
+		{
+			// Determine states
+			#if DEBUG
+				debugbuild = true;
+			#else
+				debugbuild = false;
+				//mxd. Custom exception dialog.
+				AppDomain.CurrentDomain.UnhandledException += CurrentDomainOnUnhandledException;
+				Application.ThreadException += Application_ThreadException;
+			#endif
+
+			// Enable OS visual styles
+			Application.EnableVisualStyles();
+			Application.DoEvents();		// This must be here to work around a .NET bug
+			ToolStripManager.Renderer = new ToolStripProfessionalRenderer(new TanColorTable());
+			
+			// Hook to DLL loading failure event
+			AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve;
+			
+			// Set current thread name
+			Thread.CurrentThread.Name = "Main Application";
+
+			// Application is running
+			//appmutex = new Mutex(false, "gzdoombuilder"); //"doombuilder2"
+			
+			// Get a reference to this assembly
+			thisasm = Assembly.GetExecutingAssembly();
+			
+			// Find application path
+			//Uri localpath = new Uri(Path.GetDirectoryName(thisasm.GetName().CodeBase));
+			//apppath = Uri.UnescapeDataString(localpath.AbsolutePath);
+			apppath = Path.GetDirectoryName(Application.ExecutablePath); //mxd. What was the point of using Uri here (other than to prevent lauching from a shared folder)?
+
+			// Parse command-line arguments
+			ParseCommandLineArgs(args);
+
+			// Setup directories
+			temppath = Path.GetTempPath();
+			setuppath = Path.Combine(apppath, SETUP_DIR);
+			settingspath = (portablemode ? apppath : Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), SETTINGS_DIR)); //mxd
+			restorepath = Path.Combine(settingspath, MAP_RESTORE_DIR);
+			configspath = Path.Combine(apppath, GAME_CONFIGS_DIR);
+			compilerspath = Path.Combine(apppath, COMPILERS_DIR);
+			pluginspath = Path.Combine(apppath, PLUGINS_DIR);
+			scriptspath = Path.Combine(apppath, SCRIPTS_DIR);
+			snippetspath = Path.Combine(apppath, SNIPPETS_DIR); //mxd
+			screenshotspath = Path.Combine(apppath, SCREENSHOTS_DIR).Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar); //mxd
+			spritespath = Path.Combine(apppath, SPRITES_DIR);
+			texturespath = Path.Combine(apppath, TEXTURES_DIR); //mxd
+			logfile = Path.Combine(settingspath, LOG_FILE);
+			
+			// Make program settings directory if missing
+			if(!portablemode && !Directory.Exists(settingspath)) Directory.CreateDirectory(settingspath);
+			
+			// Remove the previous log file and start logging
+			if(File.Exists(logfile)) File.Delete(logfile);
+			General.WriteLogLine("GZDoom Builder R" + thisasm.GetName().Version.Revision + " startup"); //mxd
+			General.WriteLogLine("Application path:        " + apppath);
+			General.WriteLogLine("Temporary path:          " + temppath);
+			General.WriteLogLine("Local settings path:     " + settingspath);
+			General.WriteLogLine("Command-line arguments:  " + args.Length);
+			for(int i = 0; i < args.Length; i++)
+				General.WriteLogLine("Argument " + i + ":   \"" + args[i] + "\"");
+			
+			// Load configuration
+			General.WriteLogLine("Loading program configuration...");
+			settings = new ProgramConfiguration();
+			string defaultsettingsfile = Path.Combine(apppath, DEFAULT_SETTINGS_FILE);
+			string usersettingsfile = nosettings ? defaultsettingsfile : Path.Combine(settingspath, SETTINGS_FILE);
+			if(settings.Load(usersettingsfile, defaultsettingsfile))
+			{
+				// Create error logger
+				errorlogger = new ErrorLogger();
+				
+				// Create action manager
+				actions = new ActionManager();
+				
+				// Bind static methods to actions
+				General.Actions.BindMethods(typeof(General));
+
+				//mxd. Create hints manager
+				hints = new HintsManager();
+
+				// Initialize static classes
+				MapSet.Initialize();
+				ilInit();
+
+				// Create main window
+				General.WriteLogLine("Loading main interface window...");
+				mainwindow = new MainForm();
+				mainwindow.SetupInterface();
+				mainwindow.UpdateInterface();
+				mainwindow.UpdateThingsFilters();
+
+				if(!delaymainwindow)
+				{
+					// Show main window
+					General.WriteLogLine("Showing main interface window...");
+					mainwindow.Show();
+					mainwindow.Update();
+				}
+				
+				// Start Direct3D
+				General.WriteLogLine("Starting Direct3D graphics driver...");
+				try { D3DDevice.Startup(); }
+				catch(Direct3D9NotFoundException e) { AskDownloadDirectX(e.Message); return; }
+				catch(Direct3DX9NotFoundException e) { AskDownloadDirectX(e.Message); return; }
+				
+				// Load plugin manager
+				General.WriteLogLine("Loading plugins...");
+				plugins = new PluginManager();
+				plugins.LoadAllPlugins();
+				
+				// Load game configurations
+				General.WriteLogLine("Loading game configurations...");
+				LoadAllGameConfigurations();
+
+				// Create editing modes
+				General.WriteLogLine("Creating editing modes manager...");
+				editing = new EditingManager();
+				
+				// Now that all settings have been combined (core & plugins) apply the defaults
+				General.WriteLogLine("Applying configuration settings...");
+				actions.ApplyDefaultShortcutKeys();
+				mainwindow.ApplyShortcutKeys();
+				foreach(ConfigurationInfo info in configs) info.ApplyDefaults(null);
+				
+				// Load compiler configurations
+				General.WriteLogLine("Loading compiler configurations...");
+				LoadAllCompilerConfigurations();
+
+				// Load nodebuilder configurations
+				General.WriteLogLine("Loading nodebuilder configurations...");
+				LoadAllNodebuilderConfigurations();
+				
+				// Load script configurations
+				General.WriteLogLine("Loading script configurations...");
+				LoadAllScriptConfigurations();
+				
+				// Load color settings
+				General.WriteLogLine("Loading color settings...");
+				colors = new ColorCollection(settings.Config);
+				
+				// Create application clock
+				General.WriteLogLine("Creating application clock...");
+				clock = new Clock();
+				
+				// Create types manager
+				General.WriteLogLine("Creating types manager...");
+				types = new TypesManager();
+
+				//mxd. init gzdoom builder
+				GZBuilder.GZGeneral.Init();
+				
+				// Do auto map loading when window is delayed
+				if(delaymainwindow)
+					mainwindow.PerformAutoMapLoading();
+				
+				// All done
+				General.WriteLogLine("Startup done");
+				mainwindow.DisplayReady();
+				
+				// Show any errors if preferred
+				if(errorlogger.IsErrorAdded)
+				{
+					mainwindow.DisplayStatus(StatusType.Warning, "There were errors during program statup!");
+					if(!delaymainwindow && General.Settings.ShowErrorsWindow) mainwindow.ShowErrors();
+				}
+
+				//mxd. Check enabled game configuration
+				bool noneenabled = true;
+				for(int i = 0; i < configs.Count; i++) 
+				{
+					if(configs[i].Enabled) 
+					{
+						noneenabled = false;
+						break;
+					}
+				}
+
+				if(noneenabled) 
+				{
+					if(MessageBox.Show("No game configurations are currently enabled.\nPlease enable at least one game configuration", "Warning", MessageBoxButtons.OK) == DialogResult.OK) 
+						mainwindow.ShowConfiguration();
+				}
+
+				//mxd. Check backup files
+				if(Directory.Exists(restorepath))
+				{
+					foreach(string backup in Directory.GetFiles(restorepath, "*.restore"))
+					{
+						// Remove if created more than a month ago
+						if((DateTime.Now - File.GetLastWriteTime(backup)).TotalDays > 30)
+						{
+							File.Delete(backup);
+							WriteLogLine("Removed '" + backup + "' map backup.");
+						}
+					}
+				}
+
+				//mxd. Check for updates?
+				if(General.Settings.CheckForUpdates) UpdateChecker.PerformCheck(false);
+				
+				// Run application from the main window
+				Application.Run(mainwindow);
+			}
+			else
+			{
+				// Terminate
+				Terminate(false);
+			}
+		}
+
+		// This handles DLL linking errors
+		private static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args)
+		{
+			// Check if SlimDX failed loading
+			if(args.Name.Contains("SlimDX")) AskDownloadSlimDX();
+
+			// Return null
+			return null;
+		}
+		
+		// This asks the user to download DirectX
+		private static void AskDownloadDirectX(string message)
+		{
+			// Cancel loading map from command-line parameters, if any.
+			// This causes problems, because when the window is shown, the map will
+			// be loaded and DirectX is initialized (which we seem to be missing)
+			CancelAutoMapLoad();
+			
+			// Ask the user to download DirectX
+			if(MessageBox.Show("Unable to initialize DirectX: " + message + Environment.NewLine + Environment.NewLine +
+				"Do you want to install and/or update Microsoft DirectX 9.0 now?", "DirectX 9.0 Error", MessageBoxButtons.YesNo,
+				MessageBoxIcon.Exclamation) == DialogResult.Yes)
+			{
+				// Go to DirectX End-User Runtime Web Installer page (mxd)
+				OpenWebsite("http://www.microsoft.com/en-us/download/details.aspx?id=35");
+			}
+
+			// End program here
+			Terminate(false);
+		}
+
+		// This asks the user to download SlimDX (mxd)
+		private static void AskDownloadSlimDX() 
+		{
+			// Cancel loading map from command-line parameters, if any.
+			// This causes problems, because when the window is shown, the map will
+			// be loaded and SlimDX is initialized (which we seem to be missing)
+			CancelAutoMapLoad();
+
+			// Ask the user to download SlimDX
+			if(MessageBox.Show("This application requires the latest version of SlimDX for .NET 2.0 installed on your computer." + Environment.NewLine +
+				"Do you want to install SlimDX now?", "SlimDX Error", MessageBoxButtons.YesNo,
+				MessageBoxIcon.Exclamation) == DialogResult.Yes) 
+			{
+				// Go to SlimDX download page
+				OpenWebsite("http://slimdx.org/download.php");
+			}
+
+			// End program here
+			Terminate(false);
+		}
+
+		// This parses the command line arguments
+		private static void ParseCommandLineArgs(string[] args)
+		{
+			autoloadresources = new DataLocationList();
+			
+			// Keep a copy
+			cmdargs = args;
+			
+			// Make a queue so we can parse the values from left to right
+			Queue<string> argslist = new Queue<string>(args);
+			
+			// Parse list
+			while(argslist.Count > 0)
+			{
+				// Get next arg
+				string curarg = argslist.Dequeue();
+				
+				// Delay window?
+				if(string.Compare(curarg, "-DELAYWINDOW", true) == 0)
+				{
+					// Delay showing the main window
+					delaymainwindow = true;
+				}
+				// No settings?
+				else if(string.Compare(curarg, "-NOSETTINGS", true) == 0)
+				{
+					// Don't load or save program settings
+					nosettings = true;
+				}
+				// Map name info?
+				else if(string.Compare(curarg, "-MAP", true) == 0)
+				{
+					// Store next arg as map name information
+					autoloadmap = argslist.Dequeue();
+				}
+				// Config name info?
+				else if((string.Compare(curarg, "-CFG", true) == 0) ||
+						(string.Compare(curarg, "-CONFIG", true) == 0))
+				{
+					// Store next arg as config filename information
+					autoloadconfig = argslist.Dequeue();
+				}
+				// Strict patches rules?
+				else if(string.Compare(curarg, "-STRICTPATCHES", true) == 0)
+				{
+					autoloadstrictpatches = true;
+				}
+				//mxd. Portable mode?
+				else if(string.Compare(curarg, "-PORTABLE", true) == 0)
+				{
+					// Can we write stuff to apppath?
+					try
+					{
+						WindowsIdentity identity = WindowsIdentity.GetCurrent();
+						if(identity != null)
+						{
+							WindowsPrincipal principal = new WindowsPrincipal(identity);
+							DirectorySecurity security = Directory.GetAccessControl(apppath);
+							AuthorizationRuleCollection authrules = security.GetAccessRules(true, true, typeof(SecurityIdentifier));
+
+							foreach(FileSystemAccessRule accessrule in authrules)
+							{
+								SecurityIdentifier id = accessrule.IdentityReference as SecurityIdentifier;
+								if(id == null || !principal.IsInRole(id)) continue;
+								if((FileSystemRights.WriteData & accessrule.FileSystemRights) != FileSystemRights.WriteData) continue;
+								
+								if(accessrule.AccessControlType == AccessControlType.Allow) 
+								{
+									portablemode = true;
+								} 
+								else if(accessrule.AccessControlType == AccessControlType.Deny) 
+								{
+									//Deny usually overrides any Allow
+									portablemode = false;
+									break;
+								}
+							}
+						}
+					} 
+					catch(Exception) { }
+
+					// Warn the user?
+					if(!portablemode) ShowWarningMessage("Failed to enable portable mode.\nMake sure you have write premission for '" + apppath + "' directory.", MessageBoxButtons.OK);
+				}
+				// Resource?
+				else if(string.Compare(curarg, "-RESOURCE", true) == 0)
+				{
+					DataLocation dl = new DataLocation();
+
+					// Parse resource type
+					string resourcetype = argslist.Dequeue();
+					if(string.Compare(resourcetype, "WAD", true) == 0)
+						dl.type = DataLocation.RESOURCE_WAD;
+					else if(string.Compare(resourcetype, "DIR", true) == 0)
+						dl.type = DataLocation.RESOURCE_DIRECTORY;
+					else if(string.Compare(resourcetype, "PK3", true) == 0)
+						dl.type = DataLocation.RESOURCE_PK3;
+					else
+					{
+						General.WriteLogLine("Unexpected resource type \"" + resourcetype + "\" in program parameters. Expected \"wad\", \"dir\" or \"pk3\".");
+						break;
+					}
+
+					// We continue parsing args until an existing filename is found
+					// all other arguments must be one of the optional keywords.
+					while(string.IsNullOrEmpty(dl.location))
+					{
+						curarg = argslist.Dequeue();
+
+						if((string.Compare(curarg, "ROOTTEXTURES", true) == 0) &&
+						   (dl.type == DataLocation.RESOURCE_DIRECTORY))
+						{
+							// Load images in the root directory of the resource as textures
+							dl.option1 = true;
+						}
+						else if((string.Compare(curarg, "ROOTFLATS", true) == 0) &&
+								(dl.type == DataLocation.RESOURCE_DIRECTORY))
+						{
+							// Load images in the root directory of the resource as flats
+							dl.option2 = true;
+						}
+						else if((string.Compare(curarg, "STRICTPATCHES", true) == 0) &&
+								(dl.type == DataLocation.RESOURCE_WAD))
+						{
+							// Use strict rules for patches
+							dl.option1 = true;
+						}
+						else if(string.Compare(curarg, "NOTEST", true) == 0)
+						{
+							// Exclude this resource from testing parameters
+							dl.notfortesting = true;
+						}
+						else
+						{
+							// This must be an existing file, or it is an invalid argument
+							if(dl.type == DataLocation.RESOURCE_DIRECTORY)
+							{
+								if(Directory.Exists(curarg))
+									dl.location = curarg;
+							}
+							else
+							{
+								if(File.Exists(curarg))
+									dl.location = curarg;
+							}
+							
+							if(string.IsNullOrEmpty(dl.location))
+							{
+								General.WriteLogLine("Unexpected argument \"" + curarg + "\" in program parameters. Expected a valid resource option or a resource filename.");
+								break;
+							}
+						}
+					}
+
+					// Add resource to list
+					if(!string.IsNullOrEmpty(dl.location))
+						autoloadresources.Add(dl);
+				}
+				// Every other arg
+				else
+				{
+					// No command to load file yet?
+					if(autoloadfile == null)
+					{
+						// Check if this is a file we can load
+						if(File.Exists(curarg))
+						{
+							// Load this file!
+							autoloadfile = curarg.Trim();
+						}
+						else
+						{
+							// Note in the log that we cannot find this file
+							General.WriteLogLine("Cannot find the specified file \"" + curarg + "\"");
+						}
+					}
+				}
+			}
+		}
+		
+		// This cancels automatic map loading
+		internal static void CancelAutoMapLoad()
+		{
+			autoloadfile = null;
+		}
+		
+		#endregion
+		
+		#region ================== Terminate
+
+		// This is for plugins to use
+		public static void Exit(bool properexit)
+		{
+			// Plugin wants to exit nicely?
+			if(properexit)
+			{
+				// Close dialog forms first
+				while((Form.ActiveForm != mainwindow) && (Form.ActiveForm != null))
+					Form.ActiveForm.Close();
+
+				// Close main window
+				mainwindow.Close();
+			}
+			else
+			{
+				// Terminate, no questions asked
+				Terminate(true);
+			}
+		}
+		
+		// This terminates the program
+		internal static void Terminate(bool properexit)
+		{
+			// Terminate properly?
+			if(properexit)
+			{
+				General.WriteLogLine("Termination requested");
+				
+				// Unbind static methods from actions
+				General.Actions.UnbindMethods(typeof(General));
+				
+				// Save colors
+				colors.SaveColors(settings.Config);
+				
+				// Save action controls
+				actions.SaveSettings();
+				
+				// Save game configuration settings
+				foreach(ConfigurationInfo ci in configs) ci.SaveSettings();
+				
+				// Save settings configuration
+				if(!General.NoSettings)
+					settings.Save(Path.Combine(settingspath, SETTINGS_FILE));
+				
+				// Clean up
+				if(map != null) { map.Dispose(); map = null; }
+				if(editing != null) { editing.Dispose(); editing = null; }
+				if(plugins != null) { plugins.Dispose(); plugins = null; }
+				if(mainwindow != null) { mainwindow.Dispose(); mainwindow = null; }
+				if(actions != null) { actions.Dispose(); actions = null; }
+				if(types != null) { types.Dispose(); types = null; }
+				try { D3DDevice.Terminate(); } catch(Exception) { }
+
+				// Application ends here and now
+				General.WriteLogLine("Termination done");
+				Application.Exit();
+			}
+			else
+			{
+				// Just end now
+				General.WriteLogLine("Immediate program termination");
+				Application.Exit();
+			}
+
+			// Die.
+			Process.GetCurrentProcess().Kill();
+		}
+		
+		#endregion
+		
+		#region ================== Management
+		
+		// This creates a new map
+		[BeginAction("newmap")]
+		internal static void NewMap()
+		{
+			MapOptions newoptions = new MapOptions();
+
+			// Cancel volatile mode, if any
+			editing.DisengageVolatileMode();
+			
+			// Ask the user to save changes (if any)
+			if(AskSaveMap())
+			{
+				// Open map options dialog
+				MapOptionsForm optionswindow = new MapOptionsForm(newoptions, true);
+				if(optionswindow.ShowDialog(mainwindow) == DialogResult.OK)
+				{
+					// Display status
+					mainwindow.DisplayStatus(StatusType.Busy, "Creating new map...");
+					Cursor.Current = Cursors.WaitCursor;
+					
+					// Clear the display
+					mainwindow.ClearDisplay();
+					mainwindow.RemoveHintsDocker(); //mxd
+
+					// Trash the current map, if any
+					if(map != null) map.Dispose();
+					
+					// Let the plugins know
+					plugins.OnMapNewBegin();
+
+					// Clear old errors (mxd)
+					errorlogger.Clear();
+					
+					// Create map manager with given options
+					map = new MapManager();
+					if(map.InitializeNewMap(newoptions))
+					{
+						settings.FindDefaultDrawSettings(); //mxd
+
+						// Let the plugins know
+						plugins.OnMapNewEnd();
+
+						// All done
+						mainwindow.SetupInterface();
+						mainwindow.RedrawDisplay();
+						mainwindow.UpdateThingsFilters();
+						mainwindow.UpdateLinedefColorPresets(); //mxd
+						mainwindow.UpdateInterface();
+						mainwindow.AddHintsDocker(); //mxd
+						mainwindow.UpdateGZDoomPanel(); //mxd
+						mainwindow.HideInfo(); //mxd
+					}
+					else
+					{
+						// Unable to create map manager
+						map.Dispose();
+						map = null;
+
+						// Show splash logo on display
+						mainwindow.ShowSplashDisplay();
+					}
+
+					if(errorlogger.IsErrorAdded)
+					{
+						// Show any errors if preferred
+						mainwindow.DisplayStatus(StatusType.Warning, "There were errors during loading!");
+						if(!delaymainwindow && settings.ShowErrorsWindow) mainwindow.ShowErrors();
+					}
+					else
+						mainwindow.DisplayReady();
+					
+					Cursor.Current = Cursors.Default;
+				}
+			}
+		}
+
+		// This closes the current map
+		[BeginAction("closemap")]
+		internal static void ActionCloseMap() { CloseMap(); }
+		internal static bool CloseMap()
+		{
+			// Cancel volatile mode, if any
+			editing.DisengageVolatileMode();
+
+			// Ask the user to save changes (if any)
+			if(AskSaveMap())
+			{
+				// Display status
+				mainwindow.DisplayStatus(StatusType.Busy, "Closing map...");
+				WriteLogLine("Unloading map...");
+				Cursor.Current = Cursors.WaitCursor;
+				
+				// Trash the current map
+				if(map != null) map.Dispose();
+				map = null;
+				
+				// Clear errors
+				errorlogger.Clear();
+
+				//mxd. Clear Console
+#if DEBUG
+				DebugConsole.Clear();
+#endif
+				
+				// Show splash logo on display
+				mainwindow.ShowSplashDisplay();
+				
+				// Done
+				Cursor.Current = Cursors.Default;
+				editing.UpdateCurrentEditModes();
+				mainwindow.SetupInterface();
+				mainwindow.RedrawDisplay();
+				mainwindow.HideInfo();
+				mainwindow.UpdateThingsFilters();
+				//mxd
+				mainwindow.UpdateLinedefColorPresets();
+				mainwindow.RemoveHintsDocker();
+				mainwindow.UpdateGZDoomPanel();
+				mainwindow.UpdateInterface();
+				mainwindow.DisplayReady();
+				WriteLogLine("Map unload done");
+				return true;
+			}
+			else
+			{
+				// User cancelled
+				return false;
+			}
+		}
+
+		// This loads a map from file
+		[BeginAction("openmap")]
+		internal static void OpenMap()
+		{
+			// Cancel volatile mode, if any
+			editing.DisengageVolatileMode();
+
+			// Open map file dialog
+			OpenFileDialog openfile = new OpenFileDialog();
+			openfile.Filter = "Doom WAD Files (*.wad)|*.wad";
+			openfile.Title = "Open Map";
+			if(!string.IsNullOrEmpty(settings.LastUsedMapFolder) && Directory.Exists(settings.LastUsedMapFolder)) //mxd
+				openfile.InitialDirectory = settings.LastUsedMapFolder; //mxd
+			openfile.AddExtension = false;
+			openfile.CheckFileExists = true;
+			openfile.Multiselect = false;
+			openfile.ValidateNames = true;
+			if(openfile.ShowDialog(mainwindow) == DialogResult.OK)
+			{
+				// Update main window
+				mainwindow.Update();
+
+				// Open map file
+				OpenMapFile(openfile.FileName, null);
+			}
+
+			openfile.Dispose();
+		}
+
+		//mxd. This loads a different map from same wad file without reloading resources
+		[BeginAction("openmapincurrentwad")]
+		internal static void OpenMapInCurrentWad() 
+		{
+			if(map == null || string.IsNullOrEmpty(map.FilePathName) || !File.Exists(map.FilePathName))
+			{
+				Interface.DisplayStatus(StatusType.Warning, "Unable to open map from current WAD!");
+				return;
+			}
+
+			// Cancel volatile mode, if any
+			Editing.DisengageVolatileMode();
+
+			// Ask the user to save changes (if any)
+			if(!AskSaveMap()) return;
+
+			// Open map options dialog
+			ChangeMapForm changemapwindow = new ChangeMapForm(map.FilePathName, map.Options);
+			if(changemapwindow.ShowDialog(mainwindow) != DialogResult.OK) return;
+
+			// If resources don't match, perform regular map loading
+			bool resourcesmismatch = changemapwindow.Options.Resources.Count != map.Options.Resources.Count;
+			if(!resourcesmismatch)
+			{
+				for(int i = 0; i < changemapwindow.Options.Resources.Count; i++) 
+				{
+					if(changemapwindow.Options.Resources[i].location != map.Options.Resources[i].location)
+					{
+						resourcesmismatch = true;
+						break;
+					}
+				}
+			}
+
+			if(resourcesmismatch) 
+			{
+				OpenMapFileWithOptions(map.FilePathName, changemapwindow.Options);
+				return;
+			}
+
+			// Display status
+			mainwindow.DisplayStatus(StatusType.Busy, "Switching to map '" + changemapwindow.Options.CurrentName + "'...");
+			WriteLogLine("Switching to map '" + changemapwindow.Options.CurrentName + "'...");
+			
+			Cursor.Current = Cursors.WaitCursor;
+
+			// Let the plugins know
+			plugins.OnMapCloseBegin();
+
+			// Clear the display
+			mainwindow.ClearDisplay();
+			mainwindow.RemoveHintsDocker(); //mxd
+
+			//mxd. Close the script editor
+			map.CloseScriptEditor(false);
+
+			// Let the plugins know
+			plugins.OnMapCloseEnd();
+			plugins.OnMapOpenBegin();
+
+			// Clear old errors
+			ErrorLogger.Clear();
+
+			if(!map.InitializeSwitchMap(changemapwindow.Options)) return;
+
+			// Clear undo history
+			map.UndoRedo.ClearAllUndos();
+			map.UndoRedo.ClearAllRedos();
+
+			settings.FindDefaultDrawSettings(); //mxd
+
+			// Let the plugins know
+			plugins.OnMapOpenEnd();
+
+			// All done
+			mainwindow.SetupInterface();
+			mainwindow.RedrawDisplay();
+			mainwindow.UpdateThingsFilters();
+			mainwindow.UpdateLinedefColorPresets(); //mxd
+			mainwindow.UpdateInterface();
+			mainwindow.HideInfo();
+			mainwindow.AddHintsDocker(); //mxd
+			mainwindow.UpdateGZDoomPanel(); //mxd
+
+			if(errorlogger.IsErrorAdded)
+			{
+				// Show any errors if preferred
+				mainwindow.DisplayStatus(StatusType.Warning, "There were errors during loading!");
+				if(!delaymainwindow && Settings.ShowErrorsWindow)
+					mainwindow.ShowErrors();
+			} 
+			else 
+			{
+				mainwindow.DisplayReady();
+			}
+
+			Cursor.Current = Cursors.Default;
+		}
+
+		// This opens the specified file
+		internal static void OpenMapFile(string filename, MapOptions options)
+		{
+			// Cancel volatile mode, if any
+			editing.DisengageVolatileMode();
+			
+			// Ask the user to save changes (if any)
+			if(AskSaveMap())
+			{
+				// Open map options dialog
+				OpenMapOptionsForm openmapwindow = (options != null ? new OpenMapOptionsForm(filename, options) : new OpenMapOptionsForm(filename));
+
+				if(openmapwindow.ShowDialog(mainwindow) == DialogResult.OK)
+					OpenMapFileWithOptions(filename, openmapwindow.Options);
+			}
+		}
+		
+		// This opens the specified file without dialog
+		internal static void OpenMapFileWithOptions(string filename, MapOptions options)
+		{
+			// Display status
+			mainwindow.DisplayStatus(StatusType.Busy, "Opening map file...");
+			Cursor.Current = Cursors.WaitCursor;
+
+			// Clear the display
+			mainwindow.ClearDisplay();
+			mainwindow.RemoveHintsDocker(); //mxd
+
+			// Trash the current map, if any
+			if(map != null) map.Dispose();
+
+			// Let the plugins know
+			plugins.OnMapOpenBegin();
+
+			// mxd. Clear old errors
+			errorlogger.Clear();
+
+			// Create map manager with given options
+			map = new MapManager();
+			if(map.InitializeOpenMap(filename, options))
+			{
+				// Add recent file
+				mainwindow.AddRecentFile(filename);
+
+				//mxd
+				mainwindow.UpdateGZDoomPanel();
+				settings.LastUsedMapFolder = Path.GetDirectoryName(filename);
+				settings.FindDefaultDrawSettings();
+
+				// Let the plugins know
+				plugins.OnMapOpenEnd();
+
+				// All done
+				mainwindow.SetupInterface();
+				mainwindow.UpdateThingsFilters();
+				mainwindow.UpdateLinedefColorPresets(); //mxd
+				mainwindow.UpdateInterface();
+				mainwindow.HideInfo();
+				mainwindow.AddHintsDocker(); //mxd
+
+				//mxd. Center map in screen or on stored coordinates. Done here to avoid the view jerking around when updating the interface.
+				if(Editing.Mode is ClassicMode)
+				{
+					ClassicMode mode = Editing.Mode as ClassicMode;
+					if(options != null && options.ViewPosition.IsFinite() && !float.IsNaN(options.ViewScale))
+						mode.CenterOnCoordinates(options.ViewPosition, options.ViewScale);
+					else
+						mode.CenterInScreen();
+				}
+
+				mainwindow.RedrawDisplay();
+			}
+			else
+			{
+				// Unable to create map manager
+				map.Dispose();
+				map = null;
+
+				// Show splash logo on display
+				mainwindow.ShowSplashDisplay();
+			}
+
+			if(errorlogger.IsErrorAdded)
+			{
+				// Show any errors if preferred
+				mainwindow.DisplayStatus(StatusType.Warning, "There were errors during loading!");
+				if(!delaymainwindow && settings.ShowErrorsWindow) mainwindow.ShowErrors();
+			}
+			else
+				mainwindow.DisplayReady();
+			
+			Cursor.Current = Cursors.Default;
+		}
+		
+		// This saves the current map
+		// Returns tre when saved, false when cancelled or failed
+		[BeginAction("savemap")]
+		internal static void ActionSaveMap() { SaveMap(); }
+		internal static bool SaveMap()
+		{
+			if(map == null) return false;
+			bool result = false;
+			
+			// Cancel volatile mode, if any
+			editing.DisengageVolatileMode();
+			
+			// Check if a wad file is known
+			if(map.FilePathName == "")
+			{
+				// Call to SaveMapAs
+				result = SaveMapAs();
+			}
+			else
+			{
+				//mxd. Do we need to save the map?
+				if(!map.MapSaveRequired(map.FilePathName, SavePurpose.Normal))
+				{
+					// Still save settings file
+					result = map.SaveSettingsFile(map.FilePathName);
+					
+					// Display status
+					mainwindow.DisplayStatus(StatusType.Info, "Map is up to date. Updated map settings file.");
+
+					// All done
+					mainwindow.UpdateInterface();
+					return result;
+				}
+				
+				// Display status
+				mainwindow.DisplayStatus(StatusType.Busy, "Saving map file...");
+				Cursor.Current = Cursors.WaitCursor;
+
+				// Set this to false so we can see if errors are added
+				errorlogger.IsErrorAdded = false;
+				
+				// Save the map
+				plugins.OnMapSaveBegin(SavePurpose.Normal);
+				if(map.SaveMap(map.FilePathName, SavePurpose.Normal))
+				{
+					// Add recent file
+					mainwindow.AddRecentFile(map.FilePathName);
+					result = true;
+				}
+				plugins.OnMapSaveEnd(SavePurpose.Normal);
+
+				// All done
+				mainwindow.UpdateInterface();
+
+				if(errorlogger.IsErrorAdded)
+				{
+					// Show any errors if preferred
+					mainwindow.DisplayStatus(StatusType.Warning, "There were errors during saving!");
+					if(!delaymainwindow && settings.ShowErrorsWindow) mainwindow.ShowErrors();
+				}
+				else
+					mainwindow.DisplayStatus(StatusType.Info, "Map saved in " + map.FileTitle + ".");
+
+				Cursor.Current = Cursors.Default;
+			}
+
+			return result;
+		}
+
+
+		// This saves the current map as a different file
+		// Returns tre when saved, false when cancelled or failed
+		[BeginAction("savemapas")]
+		internal static void ActionSaveMapAs() { SaveMapAs(); }
+		internal static bool SaveMapAs()
+		{
+			if(map == null) return false;
+			bool result = false;
+
+			// Cancel volatile mode, if any
+			editing.DisengageVolatileMode();
+
+			// Show save as dialog
+			SaveFileDialog savefile = new SaveFileDialog();
+			savefile.Filter = "Doom WAD Files (*.wad)|*.wad";
+			savefile.Title = "Save Map As";
+			savefile.AddExtension = true;
+			savefile.CheckPathExists = true;
+			savefile.OverwritePrompt = true;
+			savefile.ValidateNames = true;
+			savefile.FileName = map.FileTitle; //mxd
+			if(savefile.ShowDialog(mainwindow) == DialogResult.OK)
+			{
+				// Check if we're saving to the same file as the original.
+				// Because some muppets use Save As even when saving to the same file.
+				string currentfilename = (map.FilePathName.Length > 0) ? Path.GetFullPath(map.FilePathName).ToLowerInvariant() : "";
+				string savefilename = Path.GetFullPath(savefile.FileName).ToLowerInvariant();
+				if(currentfilename == savefilename)
+				{
+					SaveMap();
+				}
+				else
+				{
+					// Display status
+					mainwindow.DisplayStatus(StatusType.Busy, "Saving map file...");
+					Cursor.Current = Cursors.WaitCursor;
+					
+					// Set this to false so we can see if errors are added
+					errorlogger.IsErrorAdded = false;
+					
+					// Save the map
+					plugins.OnMapSaveBegin(SavePurpose.AsNewFile);
+					if(map.SaveMap(savefile.FileName, SavePurpose.AsNewFile))
+					{
+						// Add recent file
+						mainwindow.AddRecentFile(map.FilePathName);
+						settings.LastUsedMapFolder = Path.GetDirectoryName(map.FilePathName); //mxd
+						result = true;
+					}
+					plugins.OnMapSaveEnd(SavePurpose.AsNewFile);
+					
+					// All done
+					mainwindow.UpdateInterface();
+					
+					if(errorlogger.IsErrorAdded)
+					{
+						// Show any errors if preferred
+						mainwindow.DisplayStatus(StatusType.Warning, "There were errors during saving!");
+						if(!delaymainwindow && General.Settings.ShowErrorsWindow) mainwindow.ShowErrors();
+					}
+					else
+						mainwindow.DisplayStatus(StatusType.Info, "Map saved in " + map.FileTitle + ".");
+					
+					Cursor.Current = Cursors.Default;
+				}
+			}
+			
+			savefile.Dispose();
+			return result;
+		}
+
+
+		// This saves the current map as a different file
+		// Returns tre when saved, false when cancelled or failed
+		[BeginAction("savemapinto")]
+		internal static void ActionSaveMapInto() { SaveMapInto(); }
+		internal static bool SaveMapInto()
+		{
+			if(map == null) return false;
+			bool result = false;
+
+			// Cancel volatile mode, if any
+			editing.DisengageVolatileMode();
+
+			// Show save as dialog
+			SaveFileDialog savefile = new SaveFileDialog();
+			savefile.Filter = "Doom WAD Files (*.wad)|*.wad";
+			savefile.Title = "Save Map Into";
+			savefile.AddExtension = true;
+			savefile.CheckPathExists = true;
+			savefile.OverwritePrompt = false;
+			savefile.ValidateNames = true;
+			if(savefile.ShowDialog(mainwindow) == DialogResult.OK)
+			{
+				// Display status
+				mainwindow.DisplayStatus(StatusType.Busy, "Saving map file...");
+				Cursor.Current = Cursors.WaitCursor;
+
+				// Set this to false so we can see if errors are added
+				errorlogger.IsErrorAdded = false;
+				
+				// Save the map
+				plugins.OnMapSaveBegin(SavePurpose.IntoFile);
+				if(map.SaveMap(savefile.FileName, SavePurpose.IntoFile))
+				{
+					// Add recent file
+					mainwindow.AddRecentFile(map.FilePathName);
+					result = true;
+				}
+				plugins.OnMapSaveEnd(SavePurpose.IntoFile);
+
+				// All done
+				mainwindow.UpdateInterface();
+
+				if(errorlogger.IsErrorAdded)
+				{
+					// Show any errors if preferred
+					mainwindow.DisplayStatus(StatusType.Warning, "There were errors during saving!");
+					if(!delaymainwindow && settings.ShowErrorsWindow) mainwindow.ShowErrors();
+				}
+				else
+					mainwindow.DisplayStatus(StatusType.Info, "Map saved into " + map.FileTitle + ".");
+
+				Cursor.Current = Cursors.Default;
+			}
+
+			savefile.Dispose();
+			return result;
+		}
+		
+		// This asks to save the map if needed
+		// Returns false when action was cancelled
+		internal static bool AskSaveMap()
+		{
+			// Map open and not saved?
+			if(map != null)
+			{
+				if(map.IsChanged)
+				{
+					// Ask to save changes
+					DialogResult result = MessageBox.Show(mainwindow, "Do you want to save changes to " + map.FileTitle + " (" + map.Options.CurrentName + ")?", Application.ProductName, MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question);
+					if(result == DialogResult.Yes)
+					{
+						// Save map
+						if(SaveMap())
+						{
+							// Ask to save changes to scripts
+							return map.AskSaveScriptChanges();
+						}
+						else
+						{
+							// Failed to save map
+							return false;
+						}
+					}
+					else if(result == DialogResult.Cancel)
+					{
+						// Abort
+						return false;
+					}
+					else
+					{
+						// Ask to save changes to scripts
+						return map.AskSaveScriptChanges();
+					}
+				}
+				else
+				{
+					// Ask to save changes to scripts
+					return map.AskSaveScriptChanges();
+				}
+			}
+			else
+			{
+				return true;
+			}
+		}
+		
+		#endregion
+
+		#region ================== Debug
+		
+		// This shows a major failure
+		public static void Fail(string message)
+		{
+			WriteLogLine("FAIL: " + message);
+#if DEBUG
+			Debug.Fail(message);
+#else
+			//mxd. Lets notify the user about our Epic Failure before crashing...
+			ShowErrorMessage(message, MessageBoxButtons.OK);
+#endif
+			Terminate(false);
+		}
+		
+		// This outputs log information
+		public static void WriteLogLine(string line)
+		{
+#if DEBUG
+			// Output to consoles
+			Console.WriteLine(line);
+			DebugConsole.WriteLine(DebugMessageType.LOG, line); //mxd
+#endif
+			// Write to log file
+			try { File.AppendAllText(logfile, line + Environment.NewLine); }
+			catch(Exception) { }
+		}
+
+		// This outputs log information
+		public static void WriteLog(string text)
+		{
+#if DEBUG
+			// Output to consoles
+			Console.Write(text);
+			DebugConsole.Write(DebugMessageType.LOG, text);
+#endif
+
+			// Write to log file
+			try { File.AppendAllText(logfile, text); }
+			catch(Exception) { }
+		}
+		
+		#endregion
+
+		#region ================== Tools
+		
+		// This swaps two pointers
+		public static void Swap<T>(ref T a, ref T b)
+		{
+			T t = a;
+			a = b;
+			b = t;
+		}
+
+		// This calculates the bits needed for a number
+		public static int BitsForInt(int v)
+		{
+			int[] LOGTABLE = new[] {
+			  0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3,
+			  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+			  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+			  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+			  6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+			  6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+			  6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+			  6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+			  7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+			  7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+			  7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+			  7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+			  7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+			  7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+			  7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+			  7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7 };
+			
+			int r;	// r will be lg(v)
+			int t, tt;
+
+			if(Int2Bool(tt = v >> 16))
+			{
+				r = Int2Bool(t = tt >> 8) ? 24 + LOGTABLE[t] : 16 + LOGTABLE[tt];
+			}
+			else
+			{
+				r = Int2Bool(t = v >> 8) ? 8 + LOGTABLE[t] : LOGTABLE[v];
+			}
+			
+			return r;
+		}
+		
+		// This clamps a value
+		public static float Clamp(float value, float min, float max)
+		{
+			return Math.Min(Math.Max(min, value), max);
+		}
+
+		// This clamps a value
+		public static int Clamp(int value, int min, int max)
+		{
+			return Math.Min(Math.Max(min, value), max);
+		}
+
+		// This clamps a value
+		public static byte Clamp(byte value, byte min, byte max)
+		{
+			return Math.Min(Math.Max(min, value), max);
+		}
+
+		//mxd. This clamps angle between 0 and 359
+		public static int ClampAngle(int angle) 
+		{
+			return (angle + 360) % 360;
+		}
+
+		//mxd. This clamps angle between 0 and 359
+		public static float ClampAngle(float angle) 
+		{
+			return (angle + 360) % 360;
+		}
+
+		//mxd
+		public static int Random(int min, int max) 
+		{
+			return random.Next(min, max + 1); //because max is never rolled
+		}
+
+		//mxd
+		public static float Random(float min, float max) 
+		{
+			return (float)Math.Round(min + (max - min) * random.NextDouble(), 2);
+		}
+		
+		// This returns an element from a collection by index
+		public static T GetByIndex<T>(ICollection<T> collection, int index)
+		{
+			IEnumerator<T> e = collection.GetEnumerator();
+			for(int i = -1; i < index; i++) e.MoveNext();
+			return e.Current;
+		}
+
+		// This returns the next power of 2
+		public static int NextPowerOf2(int v)
+		{
+			int p = 0;
+
+			// Continue increasing until higher than v
+			while(Math.Pow(2, p) < v) p++;
+
+			// Return power
+			return (int)Math.Pow(2, p);
+		}
+		
+		// Convert bool to integer
+		internal static int Bool2Int(bool v)
+		{
+			return v ? 1 : 0;
+		}
+
+		// Convert integer to bool
+		internal static bool Int2Bool(int v)
+		{
+			return (v != 0);
+		}
+
+		// This shows a message and logs the message
+		public static DialogResult ShowErrorMessage(string message, MessageBoxButtons buttons)
+		{
+			return ShowErrorMessage(message, buttons, true);
+		}
+
+		// This shows a message and logs the message
+		public static DialogResult ShowErrorMessage(string message, MessageBoxButtons buttons, bool log)
+		{
+			//mxd. Log the message?
+			if(log) WriteLogLine(message);
+			
+			// Use normal cursor
+			Cursor oldcursor = Cursor.Current;
+			Cursor.Current = Cursors.Default;
+			
+			// Show message
+			IWin32Window window = null;
+			if((Form.ActiveForm != null) && Form.ActiveForm.Visible) window = Form.ActiveForm;
+			DialogResult result = MessageBox.Show(window, message, Application.ProductName, buttons, MessageBoxIcon.Error);
+
+			// Restore old cursor
+			Cursor.Current = oldcursor;
+			
+			// Return result
+			return result;
+		}
+
+		// This shows a message and logs the message
+		public static DialogResult ShowWarningMessage(string message, MessageBoxButtons buttons)
+		{
+			return ShowWarningMessage(message, buttons, MessageBoxDefaultButton.Button1, true);
+		}
+
+		// This shows a message and logs the message
+		public static DialogResult ShowWarningMessage(string message, MessageBoxButtons buttons, MessageBoxDefaultButton defaultbutton)
+		{
+			return ShowWarningMessage(message, buttons, defaultbutton, true);
+		}
+
+		// This shows a message and logs the message
+		public static DialogResult ShowWarningMessage(string message, MessageBoxButtons buttons, MessageBoxDefaultButton defaultbutton, bool log)
+		{
+			//mxd. Log the message?
+			if(log) WriteLogLine(message);
+
+			// Use normal cursor
+			Cursor oldcursor = Cursor.Current;
+			Cursor.Current = Cursors.Default;
+
+			// Show message
+			IWin32Window window = null;
+			if((Form.ActiveForm != null) && Form.ActiveForm.Visible) window = Form.ActiveForm;
+			DialogResult result = MessageBox.Show(window, message, Application.ProductName, buttons, MessageBoxIcon.Warning, defaultbutton);
+
+			// Restore old cursor
+			Cursor.Current = oldcursor;
+
+			// Return result
+			return result;
+		}
+
+		// This shows the reference manual
+		public static void ShowHelp(string pagefile)
+		{
+			ShowHelp(pagefile, HELP_FILE);
+		}
+
+		// This shows the reference manual
+		public static void ShowHelp(string pagefile, string chmfile)
+		{
+			// Check if the file can be found in the root
+			string filepathname = Path.Combine(apppath, chmfile);
+			if(!File.Exists(filepathname))
+			{
+				// Check if the file exists in the plugins directory
+				filepathname = Path.Combine(pluginspath, chmfile);
+				if(!File.Exists(filepathname))
+				{
+					// Fail
+					WriteLogLine("ERROR: Can't find the help file \"" + chmfile + "\"");
+					return;
+				}
+			}
+			
+			// Show help file
+			Help.ShowHelp(mainwindow, filepathname, HelpNavigator.Topic, pagefile);
+		}
+
+		// This returns a unique temp filename
+		internal static string MakeTempFilename(string tempdir)
+		{
+			return MakeTempFilename(tempdir, "tmp");
+		}
+
+		// This returns a unique temp filename
+		internal static string MakeTempFilename(string tempdir, string extension)
+		{
+			string filename;
+			const string chars = "abcdefghijklmnopqrstuvwxyz1234567890";
+
+			do
+			{
+				// Generate a filename
+				filename = "";
+				for(int i = 0; i < 8; i++) filename += chars[Random(0, chars.Length - 1)];
+				filename = Path.Combine(tempdir, filename + "." + extension);
+			}
+			// Continue while file is not unique
+			while(File.Exists(filename) || Directory.Exists(filename));
+
+			// Return the filename
+			return filename;
+		}
+
+		// This returns a unique temp directory name
+		internal static string MakeTempDirname()
+		{
+			string dirname;
+			const string chars = "abcdefghijklmnopqrstuvwxyz1234567890";
+
+			do
+			{
+				// Generate a filename
+				dirname = "";
+				for(int i = 0; i < 8; i++) dirname += chars[Random(0, chars.Length - 1)];
+				dirname = Path.Combine(temppath, dirname);
+			}
+			// Continue while file is not unique
+			while(File.Exists(dirname) || Directory.Exists(dirname));
+
+			// Return the filename
+			return dirname;
+		}
+
+		// This shows an image in a panel either zoomed or centered depending on size
+		public static void DisplayZoomedImage(Panel panel, Image image)
+		{
+			// Image not null?
+			if(image != null)
+			{
+				// Set the image
+				panel.BackgroundImage = image;
+
+				// Display zoomed
+				panel.BackgroundImageLayout = ImageLayout.Zoom;
+			}
+		}
+
+		// This calculates the new rectangle when one is scaled into another keeping aspect ratio
+		public static RectangleF MakeZoomedRect(Size source, RectangleF target)
+		{
+			return MakeZoomedRect(new SizeF(source.Width, source.Height), target);
+		}
+
+		// This calculates the new rectangle when one is scaled into another keeping aspect ratio
+		public static RectangleF MakeZoomedRect(Size source, Rectangle target)
+		{
+			return MakeZoomedRect(new SizeF(source.Width, source.Height),
+								  new RectangleF(target.Left, target.Top, target.Width, target.Height));
+		}
+		
+		// This calculates the new rectangle when one is scaled into another keeping aspect ratio
+		public static RectangleF MakeZoomedRect(SizeF source, RectangleF target)
+		{
+			float scale;
+			
+			// Image fits?
+			if((source.Width <= target.Width) && (source.Height <= target.Height))
+			{
+				// Just center
+				scale = 1.0f;
+			}
+			// Image is wider than tall?
+			else if((source.Width - target.Width) > (source.Height - target.Height))
+			{
+				// Scale down by width
+				scale = target.Width / source.Width;
+			}
+			else
+			{
+				// Scale down by height
+				scale = target.Height / source.Height;
+			}
+			
+			// Return centered and scaled
+			return new RectangleF(target.Left + (target.Width - source.Width * scale) * 0.5f,
+								  target.Top + (target.Height - source.Height * scale) * 0.5f,
+								  source.Width * scale, source.Height * scale);
+		}
+
+		// This opens a URL in the default browser
+		public static void OpenWebsite(string url)
+		{
+			RegistryKey key = null;
+			Process p = null;
+			string browser;
+
+			try
+			{
+				// Get the registry key where default browser is stored
+				key = Registry.ClassesRoot.OpenSubKey(@"HTTP\shell\open\command", false);
+
+				// Trim off quotes
+				browser = key.GetValue(null).ToString().ToLower().Replace("\"", "");
+
+				// String doesnt end in EXE?
+				if(!browser.EndsWith("exe"))
+				{
+					// Get rid of everything after the ".exe"
+					browser = browser.Substring(0, browser.LastIndexOf(".exe") + 4);
+				}
+			}
+			finally
+			{
+				// Clean up
+				if(key != null) key.Close();
+			}
+
+			try
+			{
+				// Fork a process
+				p = new Process();
+				p.StartInfo.FileName = browser;
+				p.StartInfo.Arguments = url;
+				p.Start();
+			}
+			catch(Exception) { }
+
+			// Clean up
+			if(p != null) p.Dispose();
+		}
+		
+		// This returns the short path name for a file
+		public static string GetShortFilePath(string longpath)
+		{
+			const int maxlen = 256;
+			StringBuilder shortname = new StringBuilder(maxlen);
+			GetShortPathName(longpath, shortname, maxlen);
+			return shortname.ToString();
+		}
+		
+		#endregion
+
+		#region ==================  mxd. Uncaught exceptions handling
+
+		private static void Application_ThreadException(object sender, ThreadExceptionEventArgs e) 
+		{
+			try 
+			{
+				GZBuilder.Windows.ExceptionDialog dlg = new GZBuilder.Windows.ExceptionDialog(e);
+				dlg.Setup();
+				if(dlg.ShowDialog() == DialogResult.Cancel) Application.Exit();
+			} 
+			catch 
+			{
+				try 
+				{
+					MessageBox.Show("Fatal Windows Forms Error", "Fatal Windows Forms Error", MessageBoxButtons.AbortRetryIgnore, MessageBoxIcon.Stop);
+				} 
+				finally 
+				{
+					Application.Exit();
+				}
+			}
+		}
+
+		private static void CurrentDomainOnUnhandledException(object sender, UnhandledExceptionEventArgs e) 
+		{
+			string exceptionmsg = string.Empty;
+			
+			try 
+			{
+				Exception ex = (Exception)e.ExceptionObject;
+				exceptionmsg = "An application error occurred: " + ex.Message + "\n\nStack Trace:\n" + ex.StackTrace;
+
+				// Since we can't prevent the app from terminating, log this to the event log.
+				try 
+				{
+					if(!EventLog.SourceExists("ThreadException"))
+						EventLog.CreateEventSource("ThreadException", "Application");
+
+					// Create an EventLog instance and assign its source.
+					using (EventLog myLog = new EventLog()) 
+					{
+						myLog.Source = "ThreadException";
+						myLog.WriteEntry(exceptionmsg);
+					}
+				}
+				catch (Exception exc) 
+				{
+					MessageBox.Show("Could not write the error to the event log.\nReason: "
+						+ exc.Message + "\n\nInitial exception:\n" + exceptionmsg, "Fatal Non-UI Error", MessageBoxButtons.OK, MessageBoxIcon.Stop);
+				}
+
+				GZBuilder.Windows.ExceptionDialog dlg = new GZBuilder.Windows.ExceptionDialog(e);
+				dlg.Setup();
+				dlg.ShowDialog();
+			} 
+			catch(Exception exc) 
+			{
+				try 
+				{
+					MessageBox.Show("Failed to write the error to the event log or to show the Exception Dialog.\n\nReason: "
+						+ exc.Message + "\n\nInitial exception:\n" + exceptionmsg, "Fatal Non-UI Error", MessageBoxButtons.OK, MessageBoxIcon.Stop);
+				} 
+				finally 
+				{
+					Application.Exit();
+				}
+			}
+		}
+
+		#endregion
+
+	}
+}
+
diff --git a/Source/Core/General/Launcher.cs b/Source/Core/General/Launcher.cs
new file mode 100644
index 0000000..0721843
--- /dev/null
+++ b/Source/Core/General/Launcher.cs
@@ -0,0 +1,389 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.IO;
+using CodeImp.DoomBuilder.Data;
+using System.Diagnostics;
+using CodeImp.DoomBuilder.Actions;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Windows;
+using CodeImp.DoomBuilder.IO;
+using CodeImp.DoomBuilder.Editing;
+
+#endregion
+
+namespace CodeImp.DoomBuilder
+{
+	internal class Launcher : IDisposable
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		private string tempwad;
+		private Process process; //mxd
+		private bool isdisposed;
+
+		delegate void EngineExitedCallback(); //mxd
+		
+		#endregion
+
+		#region ================== Properties
+
+		public string TempWAD { get { return tempwad; } }
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		// Constructor
+		public Launcher(MapManager manager)
+		{
+			// Initialize
+			CleanTempFile(manager);
+
+			// Bind actions
+			General.Actions.BindMethods(this);
+		}
+
+		// Disposer
+		public void Dispose()
+		{
+			// Not yet disposed?
+			if(!isdisposed)
+			{
+				// Unbind actions
+				General.Actions.UnbindMethods(this);
+
+				//mxd. Terminate process?
+				if(process != null) 
+				{
+					process.CloseMainWindow();
+					process.Close();
+				}
+				
+				// Remove temporary file
+				try { File.Delete(tempwad); }
+				catch(Exception) { }
+				
+				// Done
+				isdisposed = true;
+			}
+		}
+
+		#endregion
+
+		#region ================== Parameters
+
+		// This takes the unconverted parameters (with placeholders) and converts it
+		// to parameters with full paths, names and numbers where placeholders were put.
+		// The tempfile must be the full path and filename to the PWAD file to test.
+		public string ConvertParameters(string parameters, int skill, bool shortpaths)
+		{
+			string outp = parameters;
+			DataLocation iwadloc;
+			string p_wp = "", p_wf = "";
+			string p_ap = "", p_apq = "";
+			string p_l1 = "", p_l2 = "";
+			string p_nm = "";
+			string f = tempwad;
+			
+			// Make short path if needed
+			if(shortpaths) f = General.GetShortFilePath(f);
+			
+			// Find the first IWAD file
+			if(General.Map.Data.FindFirstIWAD(out iwadloc))
+			{
+				// %WP and %WF result in IWAD file
+				p_wp = iwadloc.location;
+				p_wf = Path.GetFileName(p_wp);
+				if(shortpaths)
+				{
+					p_wp = General.GetShortFilePath(p_wp);
+					p_wf = General.GetShortFilePath(p_wf);
+				}
+			}
+			
+			// Make a list of all data locations, including map location
+			DataLocation maplocation = new DataLocation(DataLocation.RESOURCE_WAD, General.Map.FilePathName, false, false, false);
+			DataLocationList locations = new DataLocationList();
+			locations.AddRange(General.Map.ConfigSettings.Resources);
+			locations.AddRange(General.Map.Options.Resources);
+			if(!string.IsNullOrEmpty(maplocation.location)) locations.Add(maplocation); //mxd. maplocation.location will be empty when a newly created map was not saved yet.
+			
+			// Go for all data locations
+			foreach(DataLocation dl in locations)
+			{
+				// Location not the IWAD file?
+				if((dl.type != DataLocation.RESOURCE_WAD) || (dl.location != iwadloc.location))
+				{
+					// Location not included?
+					if(!dl.notfortesting)
+					{
+						// Add to string of files
+						if(shortpaths)
+						{
+							p_ap += General.GetShortFilePath(dl.location) + " ";
+							p_apq += "\"" + General.GetShortFilePath(dl.location) + "\" ";
+						}
+						else
+						{
+							p_ap += dl.location + " ";
+							p_apq += "\"" + dl.location + "\" ";
+						}
+					}
+				}
+			}
+
+			// Trim last space from resource file locations
+			p_ap = p_ap.TrimEnd(' ');
+			p_apq = p_apq.TrimEnd(' ');
+
+			// Try finding the L1 and L2 numbers from the map name
+			string numstr = "";
+			bool first = true;
+			foreach(char c in General.Map.Options.CurrentName)
+			{
+				// Character is a number?
+				if(Configuration.NUMBERS.IndexOf(c) > -1)
+				{
+					// Include it
+					numstr += c;
+				}
+				else
+				{
+					// Store the number if we found one
+					if(numstr.Length > 0)
+					{
+						int num;
+						int.TryParse(numstr, out num);
+						if(first) p_l1 = num.ToString(); else p_l2 = num.ToString();
+						numstr = "";
+						first = false;
+					}
+				}
+			}
+			
+			// Store the number if we found one
+			if(numstr.Length > 0)
+			{
+				int num;
+				int.TryParse(numstr, out num);
+				if(first) p_l1 = num.ToString(); else p_l2 = num.ToString();
+			}
+
+			// No monsters?
+			if(!General.Settings.TestMonsters) p_nm = "-nomonsters";
+			
+			// Make sure all our placeholders are in uppercase
+			outp = outp.Replace("%f", "%F");
+			outp = outp.Replace("%wp", "%WP");
+			outp = outp.Replace("%wf", "%WF");
+			outp = outp.Replace("%wP", "%WP");
+			outp = outp.Replace("%wF", "%WF");
+			outp = outp.Replace("%Wp", "%WP");
+			outp = outp.Replace("%Wf", "%WF");
+			outp = outp.Replace("%l1", "%L1");
+			outp = outp.Replace("%l2", "%L2");
+			outp = outp.Replace("%l", "%L");
+			outp = outp.Replace("%ap", "%AP");
+			outp = outp.Replace("%aP", "%AP");
+			outp = outp.Replace("%Ap", "%AP");
+			outp = outp.Replace("%s", "%S");
+			outp = outp.Replace("%nM", "%NM");
+			outp = outp.Replace("%Nm", "%NM");
+			outp = outp.Replace("%nm", "%NM");
+			
+			// Replace placeholders with actual values
+			outp = outp.Replace("%F", f);
+			outp = outp.Replace("%WP", p_wp);
+			outp = outp.Replace("%WF", p_wf);
+			outp = outp.Replace("%L1", p_l1);
+			outp = outp.Replace("%L2", p_l2);
+			outp = outp.Replace("%L", General.Map.Options.CurrentName);
+			outp = outp.Replace("\"%AP\"", p_apq);
+			outp = outp.Replace("%AP", p_ap);
+			outp = outp.Replace("%S", skill.ToString());
+			outp = outp.Replace("%NM", p_nm);
+			
+			// Return result
+			return outp;
+		}
+
+		//mxd
+		private bool AlreadyTesting()
+		{
+			if(process != null)
+			{
+				General.ShowWarningMessage("Game engine is already running." + Environment.NewLine + "Please close '" + process.MainModule.FileName + "' first.", MessageBoxButtons.OK);
+				return true;
+			}
+
+			return false;
+		}
+
+		#endregion
+
+		#region ================== Test
+
+		// This saves the map to a temporary file and launches a test
+		[BeginAction("testmap")]
+		public void Test()
+		{
+			if(AlreadyTesting() || !General.Editing.Mode.OnMapTestBegin(false)) return; //mxd
+			TestAtSkill(General.Map.ConfigSettings.TestSkill);
+			General.Editing.Mode.OnMapTestEnd(false); //mxd
+		}
+
+		//mxd
+		[BeginAction("testmapfromview")]
+		public void TestFromView() 
+		{
+			if(AlreadyTesting() || !General.Editing.Mode.OnMapTestBegin(true)) return;
+			TestAtSkill(General.Map.ConfigSettings.TestSkill);
+			General.Editing.Mode.OnMapTestEnd(true);
+		}
+		
+		// This saves the map to a temporary file and launches a test with the given skill
+		public void TestAtSkill(int skill)
+		{
+			Cursor oldcursor = Cursor.Current;
+
+			// Check if configuration is OK
+			if(General.Map.ConfigSettings.TestProgram == "" || !File.Exists(General.Map.ConfigSettings.TestProgram))
+			{
+				//mxd. Let's be more precise
+				string message;
+				if(General.Map.ConfigSettings.TestProgram == "")
+					message = "Your test program is not set for the current game configuration";
+				else
+					message = "Current test program has invalid path";
+				
+				// Show message
+				Cursor.Current = Cursors.Default;
+				DialogResult result = General.ShowWarningMessage(message + ". Would you like to set up your test program now?", MessageBoxButtons.YesNo);
+				if(result == DialogResult.Yes)
+				{
+					// Show game configuration on the right page
+					General.MainWindow.ShowConfigurationPage(2);
+				}
+				return;
+			}
+
+			// No custom parameters?
+			if(!General.Map.ConfigSettings.CustomParameters)
+			{
+				// Set parameters to the default ones
+				General.Map.ConfigSettings.TestParameters = General.Map.Config.TestParameters;
+				General.Map.ConfigSettings.TestShortPaths = General.Map.Config.TestShortPaths;
+			}
+			
+			// Remove temporary file
+			try { File.Delete(tempwad); }
+			catch(Exception) { }
+			
+			// Save map to temporary file
+			Cursor.Current = Cursors.WaitCursor;
+			tempwad = General.MakeTempFilename(General.Map.TempPath, "wad");
+			General.Plugins.OnMapSaveBegin(SavePurpose.Testing);
+			if(General.Map.SaveMap(tempwad, SavePurpose.Testing))
+			{
+				// No compiler errors?
+				if(General.Map.Errors.Count == 0)
+				{
+					// Make arguments
+					string args = ConvertParameters(General.Map.ConfigSettings.TestParameters, skill, General.Map.ConfigSettings.TestShortPaths);
+
+					// Setup process info
+					ProcessStartInfo processinfo = new ProcessStartInfo();
+					processinfo.Arguments = args;
+					processinfo.FileName = General.Map.ConfigSettings.TestProgram;
+					processinfo.CreateNoWindow = false;
+					processinfo.ErrorDialog = false;
+					processinfo.UseShellExecute = true;
+					processinfo.WindowStyle = ProcessWindowStyle.Normal;
+					processinfo.WorkingDirectory = Path.GetDirectoryName(processinfo.FileName);
+
+					// Output info
+					General.WriteLogLine("Running test program: " + processinfo.FileName);
+					General.WriteLogLine("Program parameters:  " + processinfo.Arguments);
+					General.MainWindow.DisplayStatus(StatusType.Info, "Launching " + processinfo.FileName + "...");
+
+					try
+					{
+						// Start the program
+						process = Process.Start(processinfo);
+						process.EnableRaisingEvents = true; //mxd
+						process.Exited += ProcessOnExited; //mxd
+						Cursor.Current = oldcursor; //mxd
+					}
+					catch(Exception e)
+					{
+						// Unable to start the program
+						General.ShowErrorMessage("Unable to start the test program, " + e.GetType().Name + ": " + e.Message, MessageBoxButtons.OK);
+					}
+				}
+				else
+				{
+					General.MainWindow.DisplayStatus(StatusType.Warning, "Unable to test the map due to script errors.");
+				}
+			}
+		}
+
+		//mxd
+		private void TestingFinished() 
+		{
+			//Done
+			TimeSpan deltatime = TimeSpan.FromTicks(process.ExitTime.Ticks - process.StartTime.Ticks);
+			process = null;
+			General.WriteLogLine("Test program has finished.");
+			General.WriteLogLine("Run time: " + deltatime.TotalSeconds.ToString("###########0.00") + " seconds");
+			General.MainWindow.DisplayReady();
+
+			// Clean up temp file
+			CleanTempFile(General.Map);
+
+			General.Plugins.OnMapSaveEnd(SavePurpose.Testing);
+			General.MainWindow.FocusDisplay();
+			if(General.Editing.Mode is ClassicMode) General.MainWindow.RedrawDisplay();
+		}
+
+		//mxd
+		private void ProcessOnExited(object sender, EventArgs eventArgs) 
+		{
+			General.MainWindow.Invoke(new EngineExitedCallback(TestingFinished));
+		}
+
+		// This deletes the previous temp file and creates a new, empty temp file
+		private void CleanTempFile(MapManager manager)
+		{
+			// Remove temporary file
+			try { File.Delete(tempwad); }
+			catch(Exception) { }
+			
+			// Make new empty temp file
+			tempwad = General.MakeTempFilename(manager.TempPath, "wad");
+			File.WriteAllText(tempwad, "");
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/General/MapManager.cs b/Source/Core/General/MapManager.cs
new file mode 100644
index 0000000..48000a5
--- /dev/null
+++ b/Source/Core/General/MapManager.cs
@@ -0,0 +1,2460 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Drawing;
+using System.IO;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Actions;
+using CodeImp.DoomBuilder.Compilers;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Data;
+using CodeImp.DoomBuilder.Editing;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.GZBuilder.Data; //mxd
+using CodeImp.DoomBuilder.GZBuilder.GZDoom; //mxd
+using CodeImp.DoomBuilder.IO;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.VisualModes;
+using CodeImp.DoomBuilder.Windows;
+
+#endregion
+
+namespace CodeImp.DoomBuilder 
+{
+	public sealed class MapManager 
+	{
+		#region ================== Constants
+
+		// Map header name in temporary file
+		internal const string TEMP_MAP_HEADER = "TEMPMAP";
+		internal const string BUILD_MAP_HEADER = "MAP01";
+		public const string CONFIG_MAP_HEADER = "~MAP";
+
+		#endregion
+
+		#region ================== Variables
+
+		// Status
+		private bool changed;
+		private bool scriptschanged;
+		private bool maploading; //mxd
+
+		// Map information
+		private string filetitle;
+		private string filepathname;
+		private string temppath;
+		private string origmapconfigname; //mxd. Map configuration, which was used to open the map.
+
+		// Main objects
+		private MapSet map;
+		private MapSetIO io;
+		private MapOptions options;
+		private ConfigurationInfo configinfo;
+		private GameConfiguration config;
+		private DataManager data;
+		private D3DDevice graphics;
+		private Renderer2D renderer2d;
+		private Renderer3D renderer3d;
+		private WAD tempwad;
+		private GridSetup grid;
+		private UndoManager undoredo;
+		private CopyPasteManager copypaste;
+		private Launcher launcher;
+		private ThingsFilter thingsfilter;
+		private ScriptEditorForm scriptwindow;
+		private List<CompilerError> errors;
+		private VisualCamera visualcamera;
+
+		//mxd
+		private Dictionary<string, ScriptItem> namedscripts;
+		private Dictionary<int, ScriptItem> numberedscripts;
+		private readonly HashSet<string> scriptincludes;
+
+		// Disposing
+		private bool isdisposed;
+
+		#endregion
+
+		#region ================== Properties
+
+		public string FilePathName { get { return filepathname; } }
+		public string FileTitle { get { return filetitle; } internal set { filetitle = value; } } //mxd. Added setter
+		public string TempPath { get { return temppath; } }
+		public MapOptions Options { get { return options; } }
+		public MapSet Map { get { return map; } }
+		public DataManager Data { get { return data; } }
+		public bool IsChanged { get { return changed | CheckScriptChanged(); } set { changed |= value; if(!maploading) General.MainWindow.UpdateMapChangedStatus(); } }
+		public bool IsDisposed { get { return isdisposed; } }
+		internal D3DDevice Graphics { get { return graphics; } }
+		public IRenderer2D Renderer2D { get { return renderer2d; } }
+		public IRenderer3D Renderer3D { get { return renderer3d; } }
+		internal Renderer2D CRenderer2D { get { return renderer2d; } }
+		internal Renderer3D CRenderer3D { get { return renderer3d; } }
+		public GameConfiguration Config { get { return config; } }
+		public ConfigurationInfo ConfigSettings { get { return configinfo; } }
+		public GridSetup Grid { get { return grid; } }
+		public UndoManager UndoRedo { get { return undoredo; } }
+		internal CopyPasteManager CopyPaste { get { return copypaste; } }
+		public IMapSetIO FormatInterface { get { return io; } }
+		internal Launcher Launcher { get { return launcher; } }
+		public ThingsFilter ThingsFilter { get { return thingsfilter; } }
+		internal List<CompilerError> Errors { get { return errors; } }
+		internal ScriptEditorForm ScriptEditor { get { return scriptwindow; } }
+		public VisualCamera VisualCamera { get { return visualcamera; } set { visualcamera = value; } }
+		public bool IsScriptsWindowOpen { get { return (scriptwindow != null) && !scriptwindow.IsDisposed; } }
+
+		//mxd. Map format
+		public bool UDMF { get { return config.UDMF; } }
+		public bool HEXEN { get { return config.HEXEN; } }
+		public bool DOOM { get { return config.DOOM; } }
+
+		//mxd. Scripts
+		internal Dictionary<string, ScriptItem> NamedScripts { get { return namedscripts; } }
+		internal Dictionary<int, ScriptItem> NumberedScripts { get { return numberedscripts; } }
+		internal HashSet<string> ScriptIncludes { get { return scriptincludes; } }
+
+		public ViewMode ViewMode { get { return renderer2d.ViewMode; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		internal MapManager() 
+		{
+			// We have no destructor
+			GC.SuppressFinalize(this);
+
+			// Create temporary path
+			temppath = General.MakeTempDirname();
+			Directory.CreateDirectory(temppath);
+			General.WriteLogLine("Temporary directory:  " + temppath);
+
+			// Basic objects
+			grid = new GridSetup();
+			undoredo = new UndoManager();
+			copypaste = new CopyPasteManager();
+			launcher = new Launcher(this);
+			thingsfilter = new NullThingsFilter();
+			errors = new List<CompilerError>();
+
+			//mxd
+			numberedscripts = new Dictionary<int, ScriptItem>();
+			namedscripts = new Dictionary<string, ScriptItem>();
+			scriptincludes = new HashSet<string>();
+		}
+
+		// Disposer
+		internal bool Dispose() 
+		{
+			// Not already disposed?
+			if(!isdisposed) 
+			{
+				// Let the plugins know
+				General.Plugins.OnMapCloseBegin();
+
+				// Stop processing
+				General.MainWindow.StopProcessing();
+
+				// Close script editor
+				CloseScriptEditor(false);
+
+				// Change to no mode
+				General.Editing.ChangeMode((EditMode)null);
+
+				// Unbind any methods
+				General.Actions.UnbindMethods(this);
+
+				// Dispose
+				maploading = true; //mxd
+				if(grid != null) grid.Dispose();
+				if(launcher != null) launcher.Dispose();
+				if(copypaste != null) copypaste.Dispose();
+				if(undoredo != null) undoredo.Dispose();
+				General.WriteLogLine("Unloading data resources...");
+				if(data != null) data.Dispose();
+				General.WriteLogLine("Closing temporary file...");
+				if(tempwad != null) tempwad.Dispose();
+				General.WriteLogLine("Unloading map data...");
+				if(map != null) map.Dispose();
+				General.WriteLogLine("Stopping graphics device...");
+				if(renderer2d != null) renderer2d.Dispose();
+				if(renderer3d != null) renderer3d.Dispose();
+				if(graphics != null) graphics.Dispose();
+				visualcamera = null;
+				grid = null;
+				launcher = null;
+				copypaste = null;
+				undoredo = null;
+				data = null;
+				tempwad = null;
+				map = null;
+				renderer2d = null;
+				renderer3d = null;
+				graphics = null;
+
+				// We may spend some time to clean things up here
+				GC.Collect();
+				GC.WaitForPendingFinalizers(); //mxd
+				GC.Collect(); //mxd
+
+				// Remove temp file
+				General.WriteLogLine("Removing temporary directory...");
+				try
+				{
+					Directory.Delete(temppath, true);
+				} 
+				catch(Exception e) 
+				{
+					General.WriteLogLine(e.GetType().Name + ": " + e.Message);
+					General.WriteLogLine("Failed to remove temporary directory!");
+				}
+
+				// Let the plugins know
+				General.Plugins.OnMapCloseEnd();
+
+				// Done
+				isdisposed = true;
+				return true;
+			}
+
+			// Already closed
+			return true;
+		}
+
+		#endregion
+
+		#region ================== New / Open
+
+		// Initializes for a new map
+		internal bool InitializeNewMap(MapOptions options) 
+		{
+#if DEBUG
+			DebugConsole.Clear();
+#endif
+			
+			// Apply settings
+			this.filetitle = options.CurrentName + ".wad";
+			this.filepathname = "";
+			this.maploading = true; //mxd
+			this.changed = false;
+			this.options = options;
+
+			General.WriteLogLine("Creating new map '" + options.CurrentName + "' with configuration '" + options.ConfigFile + "'");
+
+			// Initiate graphics
+			General.WriteLogLine("Initializing graphics device...");
+			graphics = new D3DDevice(General.MainWindow.Display);
+			if(!graphics.Initialize()) return false;
+
+			// Create renderers
+			renderer2d = new Renderer2D(graphics);
+			renderer3d = new Renderer3D(graphics);
+
+			// Load game configuration
+			General.WriteLogLine("Loading game configuration...");
+			configinfo = General.GetConfigurationInfo(options.ConfigFile);
+			config = new GameConfiguration(configinfo.Configuration); //mxd
+			origmapconfigname = configinfo.Filename;//mxd
+			configinfo.ApplyDefaults(config);
+			General.Editing.UpdateCurrentEditModes();
+
+			// Create map data
+			map = new MapSet();
+
+			// Create temp wadfile
+			string tempfile = General.MakeTempFilename(temppath);
+			General.WriteLogLine("Creating temporary file: " + tempfile);
+#if DEBUG
+			tempwad = new WAD(tempfile);
+#else
+			try { tempwad = new WAD(tempfile); }
+			catch(Exception e)
+			{
+				General.ShowErrorMessage("Error while creating a temporary wad file:\n" + e.GetType().Name + ": " + e.Message, MessageBoxButtons.OK);
+				return false;
+			}
+#endif
+
+			// Read the map from temp file
+			General.WriteLogLine("Initializing map format interface " + config.FormatInterface + "...");
+			io = MapSetIO.Create(config.FormatInterface, tempwad, this);
+
+			// Create required lumps
+			General.WriteLogLine("Creating map data structures...");
+			tempwad.Insert(TEMP_MAP_HEADER, 0, 0);
+			io.Write(map, TEMP_MAP_HEADER, 1);
+			CreateRequiredLumps(tempwad, TEMP_MAP_HEADER);
+
+			// Load data manager
+			General.WriteLogLine("Loading data resources...");
+			data = new DataManager();
+			data.Load(configinfo.Resources, options.Resources);
+
+			// Update structures
+			options.ApplyGridSettings();
+			map.UpdateConfiguration();
+			map.Update();
+			thingsfilter.Update();
+
+			namedscripts = new Dictionary<string, ScriptItem>(); //mxd
+			numberedscripts = new Dictionary<int, ScriptItem>(); //mxd
+
+			// Bind any methods
+			General.Actions.BindMethods(this);
+
+			// Set defaults
+			this.visualcamera = new VisualCamera();
+			General.Editing.ChangeMode(configinfo.StartMode);
+			ClassicMode cmode = (General.Editing.Mode as ClassicMode);
+			if(cmode != null) cmode.SetZoom(0.5f);
+			renderer2d.SetViewMode((ViewMode)General.Settings.DefaultViewMode);
+			General.Settings.SetDefaultThingFlags(config.DefaultThingFlags);
+
+			// Success
+			this.changed = false;
+			this.maploading = false; //mxd
+			General.WriteLogLine("Map creation done");
+			General.MainWindow.UpdateMapChangedStatus(); //mxd
+			return true;
+		}
+
+		// Initializes for an existing map
+		internal bool InitializeOpenMap(string filepathname, MapOptions options) 
+		{
+			WAD mapwad;
+
+#if DEBUG
+			DebugConsole.Clear();
+#endif
+
+			// Apply settings
+			this.filetitle = Path.GetFileName(filepathname);
+			this.filepathname = filepathname;
+			this.changed = false;
+			this.maploading = true; //mxd
+			this.options = options;
+
+			General.WriteLogLine("Opening map '" + options.CurrentName + "' with configuration '" + options.ConfigFile + "'");
+
+			// Initiate graphics
+			General.WriteLogLine("Initializing graphics device...");
+			graphics = new D3DDevice(General.MainWindow.Display);
+			if(!graphics.Initialize()) return false;
+
+			// Create renderers
+			renderer2d = new Renderer2D(graphics);
+			renderer3d = new Renderer3D(graphics);
+
+			// Load game configuration
+			General.WriteLogLine("Loading game configuration...");
+			configinfo = General.GetConfigurationInfo(options.ConfigFile);
+			config = new GameConfiguration(configinfo.Configuration);
+			origmapconfigname = configinfo.Filename;//mxd
+			configinfo.ApplyDefaults(config);
+			General.Editing.UpdateCurrentEditModes();
+
+			// Create map data
+			map = new MapSet();
+
+			// Create temp wadfile
+			string tempfile = General.MakeTempFilename(temppath);
+			General.WriteLogLine("Creating temporary file: " + tempfile);
+#if DEBUG
+			tempwad = new WAD(tempfile);
+#else
+			try { tempwad = new WAD(tempfile); } catch(Exception e) 
+			{
+				General.ShowErrorMessage("Error while creating a temporary wad file:\n" + e.GetType().Name + ": " + e.Message, MessageBoxButtons.OK);
+				return false;
+			}
+#endif
+
+			// Now open the map file
+			General.WriteLogLine("Opening source file: " + filepathname);
+#if DEBUG
+			mapwad = new WAD(filepathname, true);
+#else
+			try { mapwad = new WAD(filepathname, true); } catch(Exception e) 
+			{
+				General.ShowErrorMessage("Error while opening source wad file:\n" + e.GetType().Name + ": " + e.Message, MessageBoxButtons.OK);
+				return false;
+			}
+#endif
+
+			// Copy the map lumps to the temp file
+			General.WriteLogLine("Copying map lumps to temporary file...");
+			CopyLumpsByType(mapwad, options.CurrentName, tempwad, TEMP_MAP_HEADER,
+							true, true, true, true);
+
+			// Close the map file
+			mapwad.Dispose();
+
+			//mxd. Create MapSet
+			bool maprestored;
+			if(!CreateMapSet(map, filepathname, options, out maprestored)) return false;
+
+			// Load data manager
+			General.WriteLogLine("Loading data resources...");
+			data = new DataManager();
+			DataLocation maplocation = new DataLocation(DataLocation.RESOURCE_WAD, filepathname, options.StrictPatches, false, false);
+			data.Load(configinfo.Resources, options.Resources, maplocation);
+
+			// Remove unused sectors
+			map.RemoveUnusedSectors(true);
+
+			//mxd. Translate to long or short texture names.
+			bool nameschanged = map.TranslateTextureNames(config.UseLongTextureNames, false);
+			grid.TranslateBackgroundName(config.UseLongTextureNames);
+
+			//mxd. Sector textures may've been changed 
+			if(nameschanged) data.UpdateUsedTextures();
+
+			// Update structures
+			options.ApplyGridSettings();
+			map.UpdateConfiguration();
+			map.SnapAllToAccuracy();
+			map.Update();
+			thingsfilter.Update();
+
+			//mxd. Update includes list and script names
+			UpdateScriptNames(true);
+
+			//mxd. Restore selection groups
+			options.ReadSelectionGroups();
+
+			// Bind any methods
+			General.Actions.BindMethods(this);
+
+			// Set defaults
+			this.visualcamera = new VisualCamera();
+			General.Editing.ChangeMode(configinfo.StartMode);
+			renderer2d.SetViewMode((ViewMode)General.Settings.DefaultViewMode);
+			General.Settings.SetDefaultThingFlags(config.DefaultThingFlags);
+
+			// Center map in screen
+			//if(General.Editing.Mode is ClassicMode) (General.Editing.Mode as ClassicMode).CenterInScreen();
+
+			// Success
+			this.changed = maprestored; //mxd
+			this.maploading = false; //mxd
+			General.WriteLogLine("Map loading done");
+			General.MainWindow.UpdateMapChangedStatus(); //mxd
+			return true;
+		}
+
+		//mxd. This switches to another map in the same wad 
+		internal bool InitializeSwitchMap(MapOptions options)
+		{
+#if DEBUG
+			DebugConsole.Clear();
+#endif
+			
+			this.changed = false;
+			this.maploading = true; //mxd
+			this.options = options;
+
+			// Create map data
+			MapSet newmap = new MapSet();
+			WAD mapwad;
+
+			// Create temp wadfile
+			string tempfile = General.MakeTempFilename(temppath);
+			General.WriteLogLine("Creating temporary file: " + tempfile);
+			if(tempwad != null) tempwad.Dispose();
+
+#if DEBUG
+			tempwad = new WAD(tempfile);
+#else
+			try { tempwad = new WAD(tempfile); } catch(Exception e) 
+			{
+				General.ShowErrorMessage("Error while creating a temporary wad file:\n" + e.GetType().Name + ": " + e.Message, MessageBoxButtons.OK);
+				return false;
+			}
+#endif
+
+			// Now open the map file
+			General.WriteLogLine("Opening source file: " + filepathname);
+			
+#if DEBUG
+			mapwad = new WAD(filepathname, true);
+#else
+			try { mapwad = new WAD(filepathname, true); } catch(Exception e) 
+			{
+				General.ShowErrorMessage("Error while opening source wad file:\n" + e.GetType().Name + ": " + e.Message, MessageBoxButtons.OK);
+				return false;
+			}
+#endif
+
+			// Copy the map lumps to the temp file
+			General.WriteLogLine("Copying map lumps to temporary file...");
+			CopyLumpsByType(mapwad, options.CurrentName, tempwad, TEMP_MAP_HEADER, true, true, true, true);
+
+			// Close the map file
+			mapwad.Dispose();
+
+			//mxd. Create MapSet
+			bool maprestored;
+			if(!CreateMapSet(newmap, filepathname, options, out maprestored)) return false;
+
+			//mxd. And switch to it
+			ChangeMapSet(newmap);
+
+			//mxd. Translate texture names
+			map.TranslateTextureNames(config.UseLongTextureNames, false);
+			grid.TranslateBackgroundName(config.UseLongTextureNames);
+
+			//mxd. Sector textures may've been changed 
+			data.UpdateUsedTextures();
+
+			//mxd. Update includes list and script names
+			UpdateScriptNames(true);
+
+			//mxd. Restore selection groups
+			options.ReadSelectionGroups();
+
+			//mxd. Center map in screen or on stored coordinates
+			if(General.Editing.Mode is ClassicMode) 
+			{
+				ClassicMode mode = General.Editing.Mode as ClassicMode;
+				mode.OnRedoEnd();
+
+				if(options.ViewPosition.IsFinite() && !float.IsNaN(options.ViewScale))
+					mode.CenterOnCoordinates(options.ViewPosition, options.ViewScale);
+				else
+					mode.CenterInScreen();
+			}
+
+			// Success
+			this.changed = maprestored;
+			this.maploading = false; //mxd
+			General.WriteLogLine("Map switching done");
+			General.MainWindow.UpdateMapChangedStatus(); //mxd
+			return true;
+		}
+
+		//mxd
+		private bool CreateMapSet(MapSet newmap, string filepathname, MapOptions options, out bool maprestored)
+		{
+			maprestored = false;
+			string wadname = Path.GetFileNameWithoutExtension(filepathname);
+			if(!string.IsNullOrEmpty(wadname))
+			{
+				string hash = MurmurHash2.Hash(wadname + options.LevelName + File.GetLastWriteTime(filepathname)).ToString();
+				string backuppath = Path.Combine(General.MapRestorePath, wadname + "." + hash + ".restore");
+
+				// Backup exists and it's newer than the map itself?
+				if(File.Exists(backuppath) && File.GetLastWriteTime(backuppath) > File.GetLastWriteTime(filepathname))
+				{
+					if(General.ShowWarningMessage("Looks like your previous editing session has gone terribly wrong." + Environment.NewLine
+						   + "Would you like to restore the map from the backup?", MessageBoxButtons.YesNo) == DialogResult.Yes)
+					{
+						General.WriteLogLine("Initializing map format interface " + config.FormatInterface + "...");
+						io = MapSetIO.Create(config.FormatInterface, tempwad, this);
+						General.WriteLogLine("Restoring map from '" + backuppath + "'...");
+						
+#if DEBUG
+						// Restore map
+						newmap.Deserialize(SharpCompressHelper.DecompressStream(new MemoryStream(File.ReadAllBytes(backuppath))));
+#else
+						try
+						{
+							// Restore map
+							newmap.Deserialize(SharpCompressHelper.DecompressStream(new MemoryStream(File.ReadAllBytes(backuppath))));
+
+							// Delete the backup
+							File.Delete(backuppath);
+						}
+						catch(Exception e) 
+						{
+							General.ErrorLogger.Add(ErrorType.Error, "Unable to restore the map data structures from the backup. " + e.GetType().Name + ": " + e.Message);
+							General.ShowErrorMessage("Unable to restore the map data structures from the backup.", MessageBoxButtons.OK);
+							return false;
+						}	
+#endif
+						maprestored = true;
+					}
+				}
+			}
+
+			// Read the map from temp file
+			if(!maprestored)
+			{
+				newmap.BeginAddRemove();
+				General.WriteLogLine("Initializing map format interface " + config.FormatInterface + "...");
+				io = MapSetIO.Create(config.FormatInterface, tempwad, this);
+				General.WriteLogLine("Reading map data from file...");
+#if DEBUG
+				newmap = io.Read(newmap, TEMP_MAP_HEADER);
+#else
+				try { newmap = io.Read(newmap, TEMP_MAP_HEADER); } catch(Exception e) 
+				{
+					General.ErrorLogger.Add(ErrorType.Error, "Unable to read the map data with the specified configuration. " + e.GetType().Name + ": " + e.Message);
+					General.ShowErrorMessage("Unable to read the map data with the specified configuration." + Environment.NewLine + Environment.NewLine + e.Message, MessageBoxButtons.OK);
+					return false;
+				}
+#endif
+				newmap.EndAddRemove();
+			}
+
+			return true;
+		}
+
+		#endregion
+
+		#region ================== Save
+
+		/// <summary>
+		/// This exports the structures from memory into a WAD file with the current map format.
+		/// </summary>
+		public bool ExportToFile(string filepathname) 
+		{
+			return SaveMap(filepathname, SavePurpose.Testing);
+		}
+
+		// Initializes for an existing map
+		internal bool SaveMap(string newfilepathname, SavePurpose purpose) 
+		{
+			string settingsfile;
+			WAD targetwad;
+			int index;
+			bool includenodes;
+
+			General.WriteLogLine("Saving map to file: " + newfilepathname);
+
+			// Scripts changed?
+			bool localscriptschanged = CheckScriptChanged();
+
+			// If the scripts window is open, save the scripts first
+			if(IsScriptsWindowOpen) scriptwindow.Editor.ImplicitSave();
+
+			// Only recompile scripts when the scripts have changed
+			// (not when only the map changed)
+			if(localscriptschanged && !CompileScriptLumps()) 
+			{
+				// Compiler failure
+				if(errors.Count > 0)
+					General.ShowErrorMessage("Error while compiling scripts: " + errors[0].description, MessageBoxButtons.OK);
+				else
+					General.ShowErrorMessage("Unknown compiler error while compiling scripts!", MessageBoxButtons.OK);
+			}
+
+			// Show script window if there are any errors and we are going to test the map
+			// and always update the errors on the scripts window.
+			if((errors.Count > 0) && (scriptwindow == null) && (purpose == SavePurpose.Testing)) ShowScriptEditor();
+			if(scriptwindow != null) scriptwindow.Editor.ShowErrors(errors);
+
+			// Only write the map and rebuild nodes when the actual map has changed
+			// (not when only scripts have changed)
+			if(changed) 
+			{
+				// Make a copy of the map data
+				MapSet outputset = map.Clone();
+
+				// Remove all flags from all 3D Start things
+				foreach(Thing t in outputset.Things) 
+				{
+					if(t.Type == config.Start3DModeThingType) 
+					{
+						// We're not using SetFlag here, this doesn't have to be undone.
+						// Please note that this is totally exceptional!
+						List<string> flagkeys = new List<string>(t.Flags.Keys);
+						foreach(string k in flagkeys) t.Flags[k] = false;
+					}
+				}
+
+				// Do we need sidedefs compression?
+				StatusInfo oldstatus;
+				if(map.Sidedefs.Count > io.MaxSidedefs) 
+				{
+					// Compress sidedefs
+					oldstatus = General.MainWindow.Status;
+					General.MainWindow.DisplayStatus(StatusType.Busy, "Compressing sidedefs...");
+					outputset.CompressSidedefs();
+					General.MainWindow.DisplayStatus(oldstatus);
+
+					// Check if it still doesnt fit
+					if(outputset.Sidedefs.Count > io.MaxSidedefs) 
+					{
+						// Problem! Can't save the map like this!
+						General.ShowErrorMessage("Unable to save the map: There are too many unique sidedefs!", MessageBoxButtons.OK);
+						return false;
+					}
+				}
+
+				// Check things
+				if(map.Things.Count > io.MaxThings) 
+				{
+					General.ShowErrorMessage("Unable to save the map: There are too many things!", MessageBoxButtons.OK);
+					return false;
+				}
+
+				// Check sectors
+				if(map.Sectors.Count > io.MaxSectors) 
+				{
+					General.ShowErrorMessage("Unable to save the map: There are too many sectors!", MessageBoxButtons.OK);
+					return false;
+				}
+
+				// Check linedefs
+				if(map.Linedefs.Count > io.MaxLinedefs) 
+				{
+					General.ShowErrorMessage("Unable to save the map: There are too many linedefs!", MessageBoxButtons.OK);
+					return false;
+				}
+
+				// Check vertices
+				if(map.Vertices.Count > io.MaxVertices) 
+				{
+					General.ShowErrorMessage("Unable to save the map: There are too many vertices!", MessageBoxButtons.OK);
+					return false;
+				}
+
+				// TODO: Check for more limitations
+
+				// Write to temporary file
+				General.WriteLogLine("Writing map data structures to file...");
+				index = tempwad.FindLumpIndex(TEMP_MAP_HEADER);
+				if(index == -1) index = 0;
+				io.Write(outputset, TEMP_MAP_HEADER, index);
+				outputset.Dispose();
+
+				// Get the corresponding nodebuilder
+				string nodebuildername = (purpose == SavePurpose.Testing) ? configinfo.NodebuilderTest : configinfo.NodebuilderSave;
+
+				// Build the nodes
+				oldstatus = General.MainWindow.Status;
+				General.MainWindow.DisplayStatus(StatusType.Busy, "Building map nodes...");
+				includenodes = (!string.IsNullOrEmpty(nodebuildername) && BuildNodes(nodebuildername, true));
+				General.MainWindow.DisplayStatus(oldstatus);
+			}
+			else 
+			{
+				// Check if we have nodebuilder lumps
+				includenodes = VerifyNodebuilderLumps(tempwad, TEMP_MAP_HEADER);
+			}
+
+			// Suspend data resources
+			data.Suspend();
+
+			//mxd. Check if the target file is locked
+			FileLockChecker.FileLockCheckResult checkresult = FileLockChecker.CheckFile(newfilepathname);
+			if(!string.IsNullOrEmpty(checkresult.Error))
+			{
+				if(checkresult.Processes.Count > 0)
+				{
+					string rest = "Press 'Retry' to close " + (checkresult.Processes.Count > 1 ? "all processes" : "the process") 
+						+ " and retry." + Environment.NewLine + "Press 'Cancel' to cancel saving.";
+					
+					if(General.ShowErrorMessage(checkresult.Error + rest, MessageBoxButtons.RetryCancel) == DialogResult.Retry)
+					{
+						// Close all processes
+						foreach(Process process in checkresult.Processes)
+						{
+							try
+							{
+								if(!process.HasExited) process.Kill();
+							}
+							catch(Exception e)
+							{
+								General.ShowErrorMessage("Failed to close " + Path.GetFileName(process.MainModule.FileName) + ":" + Environment.NewLine + Environment.NewLine + e.Message, MessageBoxButtons.OK);
+								data.Resume();
+								General.WriteLogLine("Map saving failed: failed to close " + Path.GetFileName(process.MainModule.FileName));
+								return false;
+							}
+						}
+
+						// Retry
+						data.Resume();
+						General.WriteLogLine("Map saving restarted...");
+						return SaveMap(newfilepathname, purpose);
+					}
+					else
+					{
+						data.Resume();
+						General.WriteLogLine("Map saving cancelled...");
+						return false;
+					}
+				}
+				else
+				{
+					General.ShowErrorMessage(checkresult.Error, MessageBoxButtons.OK);
+					data.Resume();
+					General.WriteLogLine("Map saving failed: " + checkresult.Error);
+					return false;
+				}
+			}
+
+			// Determine original map name
+			string origmapname = (options.PreviousName != "" && purpose != SavePurpose.IntoFile) ? options.PreviousName : options.CurrentName;
+			string origwadfile = string.Empty; //mxd
+
+			try 
+			{
+				if(File.Exists(newfilepathname)) 
+				{
+					// mxd. Check if target wad already has a map with the same name
+					if(purpose == SavePurpose.IntoFile) 
+					{
+						WAD wad = new WAD(newfilepathname, true);
+						int mapindex = wad.FindLumpIndex(origmapname);
+						wad.Dispose();
+
+						if(mapindex != -1 && MessageBox.Show(General.MainWindow, "Target file already contains map '" + origmapname + "'\nDo you want to replace it?", "Map already exists!", MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.No) 
+						{
+							data.Resume();
+							General.WriteLogLine("Map saving cancelled...");
+							return false;
+						}
+					}
+
+					// Backup existing file, if any
+					if(File.Exists(newfilepathname + ".backup3")) File.Delete(newfilepathname + ".backup3");
+					if(File.Exists(newfilepathname + ".backup2")) File.Move(newfilepathname + ".backup2", newfilepathname + ".backup3");
+					if(File.Exists(newfilepathname + ".backup1")) File.Move(newfilepathname + ".backup1", newfilepathname + ".backup2");
+					File.Copy(newfilepathname, newfilepathname + ".backup1");
+				}
+
+				// Except when saving INTO another file,
+				// kill the target file if it is different from source file
+				if((purpose != SavePurpose.IntoFile) && (newfilepathname != filepathname)) 
+				{
+					// Kill target file
+					if(File.Exists(newfilepathname)) File.Delete(newfilepathname);
+
+					// Kill .dbs settings file
+					settingsfile = newfilepathname.Substring(0, newfilepathname.Length - 4) + ".dbs";
+					if(File.Exists(settingsfile)) File.Delete(settingsfile);
+				}
+
+				// On Save AS we have to copy the previous file to the new file
+				if((purpose == SavePurpose.AsNewFile) && (filepathname != "")) 
+				{
+					// Copy if original file still exists
+					if(File.Exists(filepathname)) File.Copy(filepathname, newfilepathname, true);
+				}
+
+				// If the target file exists, we need to rebuild it
+				if(File.Exists(newfilepathname)) 
+				{
+					// Move the target file aside
+					origwadfile = newfilepathname + ".temp";
+					File.Move(newfilepathname, origwadfile);
+
+					// Open original file
+					WAD origwad = new WAD(origwadfile, true);
+
+					// Create new target file
+					targetwad = new WAD(newfilepathname);
+
+					// Copy all lumps, except the original map
+					GameConfiguration origcfg; //mxd
+					if(origmapconfigname == configinfo.Filename) 
+					{
+						origcfg = config;
+					} 
+					else 
+					{
+						ConfigurationInfo ci = General.GetConfigurationInfo(origmapconfigname);
+						origcfg = new GameConfiguration(ci.Configuration);
+					}
+
+					CopyAllLumpsExceptMap(origwad, targetwad, origcfg, origmapname);
+
+					// Close original file and delete it
+					origwad.Dispose();
+					File.Delete(origwadfile);
+				}
+				else 
+				{
+					// Create new target file
+					targetwad = new WAD(newfilepathname);
+				}
+			} 
+			catch (IOException) 
+			{
+				General.ShowErrorMessage("IO Error while writing target file: " + newfilepathname + ". Please make sure the location is accessible and not in use by another program.", MessageBoxButtons.OK);
+				if(!string.IsNullOrEmpty(origwadfile) && File.Exists(origwadfile)) File.Delete(origwadfile); //mxd. Clean-up
+				data.Resume();
+				General.WriteLogLine("Map saving failed");
+				return false;
+			} 
+			catch (UnauthorizedAccessException) 
+			{
+				General.ShowErrorMessage("Error while accessing target file: " + newfilepathname + ". Please make sure the location is accessible and not in use by another program.", MessageBoxButtons.OK);
+				if(!string.IsNullOrEmpty(origwadfile) && File.Exists(origwadfile)) File.Delete(origwadfile); //mxd. Clean-up
+				data.Resume();
+				General.WriteLogLine("Map saving failed");
+				return false;
+			}
+
+			// Copy map lumps to target file
+			CopyLumpsByType(tempwad, TEMP_MAP_HEADER, targetwad, origmapname, true, true, includenodes, true);
+
+			// mxd. Was the map renamed?
+			if(options.LevelNameChanged) 
+			{
+				if(purpose != SavePurpose.IntoFile) 
+				{
+					General.WriteLogLine("Changing map name from '" + options.PreviousName + "' to '" + options.CurrentName + "'");
+
+					// Find the map header in target
+					index = targetwad.FindLumpIndex(options.PreviousName);
+					if(index > -1) 
+					{
+						// Rename the map lump name
+						targetwad.Lumps[index].Rename(options.CurrentName);
+					} 
+					else 
+					{
+						// Houston, we've got a problem!
+						General.ShowErrorMessage("Error renaming map lump name: the original map lump could not be found!", MessageBoxButtons.OK);
+						options.CurrentName = options.PreviousName;
+					}
+					
+				}
+				options.PreviousName = "";
+			}
+
+			// Done with the target file
+			targetwad.Dispose();
+
+			// Resume data resources
+			data.Resume();
+
+			// Not saved for testing purpose?
+			if(purpose != SavePurpose.Testing) 
+			{
+				// Saved in a different file?
+				if(newfilepathname != filepathname) 
+				{
+					// Keep new filename
+					filepathname = newfilepathname;
+					filetitle = Path.GetFileName(filepathname);
+
+					// Reload resources
+					ReloadResources();
+				}
+
+				try 
+				{
+					// Open or create the map settings
+					settingsfile = newfilepathname.Substring(0, newfilepathname.Length - 4) + ".dbs";
+					options.WriteConfiguration(settingsfile);
+				} 
+				catch (Exception e) 
+				{
+					// Warning only
+					General.ErrorLogger.Add(ErrorType.Warning, "Could not write the map settings configuration file. " + e.GetType().Name + ": " + e.Message);
+				}
+
+				// Changes saved
+				changed = false;
+				scriptschanged = false;
+			}
+
+			// Success!
+			General.WriteLogLine("Map saving done");
+			General.MainWindow.UpdateMapChangedStatus(); //mxd
+			return true;
+		}
+
+		//mxd. Don't save the map if it was not changed
+		internal bool MapSaveRequired(string newfilepathname, SavePurpose purpose)
+		{
+			return (changed || scriptschanged || CheckScriptChanged() || options.LevelNameChanged || newfilepathname != filepathname || purpose != SavePurpose.Normal);
+		}
+
+		//mxd. Saves .dbs file
+		internal bool SaveSettingsFile(string newfilepathname)
+		{
+			try 
+			{
+				string settingsfile = newfilepathname.Substring(0, newfilepathname.Length - 4) + ".dbs";
+				options.WriteConfiguration(settingsfile);
+			} 
+			catch(Exception e) 
+			{
+				// Warning only
+				General.ErrorLogger.Add(ErrorType.Warning, "Could not write the map settings configuration file. " + e.GetType().Name + ": " + e.Message);
+				return false;
+			}
+
+			return true;
+		}
+
+		//mxd
+		internal void SaveMapBackup()
+		{
+			if(isdisposed || map == null || map.IsDisposed || string.IsNullOrEmpty(filepathname) || options == null)
+			{
+				General.WriteLogLine("Map backup saving failed: required structures already disposed...");
+				return;
+			}
+
+#if !DEBUG
+			try
+			{
+#endif
+				string wadname = Path.GetFileNameWithoutExtension(filepathname);
+				if(!string.IsNullOrEmpty(wadname))
+				{
+					// Make backup file path
+					if(!Directory.Exists(General.MapRestorePath)) Directory.CreateDirectory(General.MapRestorePath);
+					string hash = MurmurHash2.Hash(wadname + options.LevelName + File.GetLastWriteTime(filepathname)).ToString();
+					string backuppath = Path.Combine(General.MapRestorePath, wadname + "." + hash + ".restore");
+
+					// Export map
+					MemoryStream ms = map.Serialize();
+					ms.Seek(0, SeekOrigin.Begin);
+					File.WriteAllBytes(backuppath, SharpCompressHelper.CompressStream(ms).ToArray());
+
+					// Log it
+					General.WriteLogLine("Map backup saved to '" + backuppath + "'");
+				}
+				else
+				{
+					// Log it
+					General.WriteLogLine("Map backup saving failed: invalid map WAD name");
+				}
+#if !DEBUG
+			}
+			catch(Exception e)
+			{
+				// Log it
+				General.WriteLogLine("Map backup saving failed: " + e.Source + ": " + e.Message);
+			}
+#endif
+		}
+
+		#endregion
+
+		#region ================== Nodebuild
+
+		// This builds the nodes in the temproary file with the given configuration name
+		private bool BuildNodes(string nodebuildername, bool failaswarning) 
+		{
+			bool lumpscomplete = false;
+			WAD buildwad;
+
+			// Find the nodebuilder
+			NodebuilderInfo nodebuilder = General.GetNodebuilderByName(nodebuildername);
+			if(nodebuilder == null) 
+			{
+				// Problem! Can't find that nodebuilder!
+				General.ShowWarningMessage("Unable to build the nodes: The configured nodebuilder cannot be found.\nPlease check your game configuration settings!", MessageBoxButtons.OK);
+				return false;
+			}
+			else 
+			{
+				// Create the compiler interface that will run the nodebuilder
+				// This automatically creates a temporary directory for us
+				Compiler compiler = nodebuilder.CreateCompiler();
+
+				// Make temporary filename
+				string tempfile1 = General.MakeTempFilename(compiler.Location);
+
+				// Make the temporary WAD file
+				General.WriteLogLine("Creating temporary build file: " + tempfile1);
+#if DEBUG
+				buildwad = new WAD(tempfile1);
+#else
+				try { buildwad = new WAD(tempfile1); }
+				catch(Exception e)
+				{
+					General.ShowErrorMessage("Error while creating a temporary wad file:\n" + e.GetType().Name + ": " + e.Message, MessageBoxButtons.OK);
+					return false;
+				}
+#endif
+
+				// Determine source file
+				string sourcefile = (filepathname.Length > 0 ? filepathname : tempwad.Filename);
+
+				//mxd.
+				RemoveUnneededLumps(tempwad, TEMP_MAP_HEADER, true);
+
+				// Copy lumps to buildwad
+				General.WriteLogLine("Copying map lumps to temporary build file...");
+				CopyLumpsByType(tempwad, TEMP_MAP_HEADER, buildwad, BUILD_MAP_HEADER, true, false, false, true);
+
+				// Close buildwad
+				buildwad.Dispose();
+
+				// Does the nodebuilder require an output file?
+				string tempfile2;
+				if(nodebuilder.HasSpecialOutputFile) 
+				{
+					// Make a temporary output file for the nodebuilder
+					tempfile2 = General.MakeTempFilename(compiler.Location);
+					General.WriteLogLine("Temporary output file: " + tempfile2);
+				}
+				else 
+				{
+					// Output file is same as input file
+					tempfile2 = tempfile1;
+				}
+
+				// Run the nodebuilder
+				compiler.Parameters = nodebuilder.Parameters;
+				compiler.InputFile = Path.GetFileName(tempfile1);
+				compiler.OutputFile = Path.GetFileName(tempfile2);
+				compiler.SourceFile = sourcefile;
+				compiler.WorkingDirectory = Path.GetDirectoryName(tempfile1);
+				if(compiler.Run()) 
+				{
+					// Open the output file
+					try { buildwad = new WAD(tempfile2); } 
+					catch(Exception e) 
+					{
+						General.WriteLogLine(e.GetType().Name + " while reading build wad file: " + e.Message);
+						buildwad = null;
+					}
+
+					if(buildwad != null) 
+					{
+						// Output lumps complete?
+						lumpscomplete = VerifyNodebuilderLumps(buildwad, BUILD_MAP_HEADER);
+					}
+
+					if(lumpscomplete) 
+					{
+						// Copy nodebuilder lumps to temp file
+						General.WriteLogLine("Copying nodebuilder lumps to temporary file...");
+						CopyLumpsByType(buildwad, BUILD_MAP_HEADER, tempwad, TEMP_MAP_HEADER, false, false, true, false);
+					}
+					else 
+					{
+						//mxd. collect errors
+						string compilererrors = "";
+						foreach(CompilerError e in compiler.Errors)
+							compilererrors += Environment.NewLine + e.description;
+
+						// Nodebuilder did not build the lumps!
+						if(failaswarning)
+							General.ShowWarningMessage("Unable to build the nodes: The nodebuilder failed to build the expected data structures.\nThe map will be saved without the nodes." + (compiler.Errors.Length > 0 ? Environment.NewLine + compilererrors : ""), MessageBoxButtons.OK);
+						else
+							General.ShowErrorMessage("Unable to build the nodes: The nodebuilder failed to build the expected data structures." + (compiler.Errors.Length > 0 ? Environment.NewLine + compilererrors : ""), MessageBoxButtons.OK);
+					}
+
+					// Done with the build wad
+					if(buildwad != null) buildwad.Dispose();
+				}
+				else //mxd
+				{
+					//collect errors
+					string compilererrors = "";
+					foreach(CompilerError e in compiler.Errors)
+						compilererrors += Environment.NewLine + e.description;
+
+					// Nodebuilder did not build the lumps!
+					General.ShowErrorMessage("Unable to build the nodes: The nodebuilder failed to build the expected data structures" + (compiler.Errors.Length > 0 ? ":" + Environment.NewLine + compilererrors : "."), MessageBoxButtons.OK);
+				}
+
+				// Clean up
+				compiler.Dispose();
+
+				// Return result
+				return lumpscomplete;
+			}
+		}
+
+		// This verifies if the nodebuilder lumps exist in a WAD file
+		private bool VerifyNodebuilderLumps(WAD wad, string mapheader) 
+		{
+			bool lumpscomplete = false;
+
+			// Find the map header in source
+			int srcindex = wad.FindLumpIndex(mapheader);
+			
+			if(srcindex > -1) 
+			{
+				// Go for all the map lump names
+				lumpscomplete = true;
+				
+				foreach(KeyValuePair<string, MapLumpInfo> group in config.MapLumps) 
+				{
+					// Check if this lump should exist
+					if(group.Value.NodeBuild && !group.Value.AllowEmpty && group.Value.Required) 
+					{
+						//mxd
+						string lumpname = group.Key;
+						if(lumpname.Contains(CONFIG_MAP_HEADER)) lumpname = lumpname.Replace(CONFIG_MAP_HEADER, mapheader);
+						
+						// Find the lump in the source
+						if(wad.FindLump(lumpname, srcindex, srcindex + config.MapLumps.Count + 2) == null) 
+						{
+							// Missing a lump!
+							lumpscomplete = false;
+							break;
+						}
+					}
+				}
+			}
+
+			return lumpscomplete;
+		}
+
+		#endregion
+
+		#region ================== Lumps
+
+		// This returns a copy of the requested lump stream data
+		// This is copied from the temp wad file and returns null when the lump is not found
+		public MemoryStream GetLumpData(string lumpname) 
+		{
+			Lump l = tempwad.FindLump(lumpname);
+			if(l != null) 
+			{
+				l.Stream.Seek(0, SeekOrigin.Begin);
+				return new MemoryStream(l.Stream.ReadAllBytes());
+			}
+			return null;
+		}
+
+		// This writes a copy of the data to a lump in the temp file
+		public void SetLumpData(string lumpname, MemoryStream lumpdata) 
+		{
+			int insertindex = tempwad.Lumps.Count;
+
+			// Remove the lump if it already exists
+			int li = tempwad.FindLumpIndex(lumpname);
+			if(li > -1)
+			{
+				insertindex = li;
+				tempwad.RemoveAt(li);
+			}
+
+			// Insert new lump
+			Lump l = tempwad.Insert(lumpname, insertindex, (int)lumpdata.Length);
+			l.Stream.Seek(0, SeekOrigin.Begin);
+			lumpdata.WriteTo(l.Stream);
+
+			//mxd. Mark the map as changed (will also update the title)
+			IsChanged = true;
+		}
+
+		// This checks if the specified lump exists in the temp file
+		public bool LumpExists(string lumpname) 
+		{
+			return (tempwad.FindLumpIndex(lumpname) > -1);
+		}
+
+		// This creates empty lumps for those required
+		private void CreateRequiredLumps(WAD target, string mapname) 
+		{
+			// Find the map header in target
+			int headerindex = target.FindLumpIndex(mapname);
+			if(headerindex == -1) 
+			{
+				// If this header doesnt exists in the target
+				// then insert at the end of the target
+				headerindex = target.Lumps.Count;
+			}
+
+			// Begin inserting at target header index
+			int insertindex = headerindex;
+
+			// Go for all the map lump names
+			foreach(KeyValuePair<string, MapLumpInfo> group in config.MapLumps)
+			{
+				// Check if this lump is required
+				if(group.Value.Required) 
+				{
+					// Get the lump name
+					string lumpname = (group.Key.Contains(CONFIG_MAP_HEADER) ? group.Key.Replace(CONFIG_MAP_HEADER, mapname) : group.Key); //mxd
+
+					// Check if the lump is missing at the target
+					int targetindex = FindSpecificLump(target, lumpname, headerindex, mapname, config.MapLumps);
+					if(targetindex == -1) 
+					{
+						// Determine target index
+						insertindex++;
+						if(insertindex > target.Lumps.Count) insertindex = target.Lumps.Count;
+
+						// Create new, emtpy lump
+						General.WriteLogLine(lumpname + " is required! Created empty lump.");
+						target.Insert(lumpname, insertindex, 0);
+					}
+					else
+					{
+						// Move insert index
+						insertindex = targetindex;
+					}
+				}
+			}
+		}
+
+		//mxd. This is called on tempwad, which should only have the current map inside it.
+		private void RemoveUnneededLumps(WAD target, string mapname, bool glnodesonly) 
+		{
+			//Get the list of lumps required by current map format
+			List<string> requiredLumps = new List<string>();
+			foreach(KeyValuePair<string, MapLumpInfo> group in config.MapLumps) 
+			{
+				//this lump well be recreated by a nodebuilder when saving the map 
+				//(or it won't be if the new map format or nodebuilder doesn't require / build this lump, 
+				//so it will just stay there, possibly messing things up)
+				if(group.Value.NodeBuild && (!glnodesonly || group.Key.ToUpperInvariant().StartsWith("GL_"))) continue; 
+
+				string lumpname = group.Key;
+				if(lumpname == CONFIG_MAP_HEADER) lumpname = mapname;
+				requiredLumps.Add(lumpname);
+			}
+
+			//Remove lumps, which are not required
+			List<Lump> toRemove = new List<Lump>();
+			foreach(Lump lump in target.Lumps)
+				if(!requiredLumps.Contains(lump.Name)) toRemove.Add(lump);
+
+			foreach(Lump lump in toRemove) target.Remove(lump);
+		}
+
+		// This copies all lumps, except those of a specific map
+		private static void CopyAllLumpsExceptMap(WAD source, WAD target, GameConfiguration mapconfig, string sourcemapname) 
+		{
+			// Go for all lumps
+			bool skipping = false;
+			foreach(Lump srclump in source.Lumps)
+			{
+				// Check if we should stop skipping lumps here
+				if(skipping) 
+				{
+					//mxd
+					string srclumpname = srclump.Name;
+					if(srclumpname.Contains(sourcemapname)) srclumpname = srclumpname.Replace(sourcemapname, CONFIG_MAP_HEADER);
+
+					if(!mapconfig.MapLumps.ContainsKey(srclumpname)) 
+					{
+						// Stop skipping
+						skipping = false;
+					}
+				}
+
+				// Check if we should start skipping lumps here
+				if(!skipping && (srclump.Name == sourcemapname)) 
+				{
+					// We have encountered the map header, start skipping!
+					skipping = true;
+				}
+
+				// Not skipping this lump?
+				if(!skipping) 
+				{
+					// Copy lump over!
+					Lump tgtlump = target.Insert(srclump.Name, target.Lumps.Count, srclump.Length);
+					srclump.CopyTo(tgtlump);
+				}
+			}
+		}
+
+		// This copies specific map lumps from one WAD to another
+		private void CopyLumpsByType(WAD source, string sourcemapname,
+									 WAD target, string targetmapname,
+									 bool copyrequired, bool copyblindcopy,
+									 bool copynodebuild, bool copyscript) 
+		{
+			// Find the map header in target
+			int tgtheaderindex = target.FindLumpIndex(targetmapname);
+			if(tgtheaderindex == -1) 
+			{
+				// If this header doesnt exists in the target
+				// then insert at the end of the target
+				tgtheaderindex = target.Lumps.Count;
+			}
+
+			// Begin inserting at target header index
+			int targetindex = tgtheaderindex;
+
+			// Find the map header in source
+			int srcheaderindex = source.FindLumpIndex(sourcemapname);
+			if(srcheaderindex > -1) 
+			{
+				// Go for all the map lump names
+				foreach(KeyValuePair<string, MapLumpInfo> group in config.MapLumps) 
+				{
+					// Check if this lump should be copied
+					if((group.Value.Required && copyrequired) || (group.Value.BlindCopy && copyblindcopy) ||
+					   (group.Value.NodeBuild && copynodebuild) || ((group.Value.Script != null || group.Value.ScriptBuild) && copyscript)) 
+					{
+						// Get the lump name
+						string srclumpname = (group.Key.Contains(CONFIG_MAP_HEADER) ? group.Key.Replace(CONFIG_MAP_HEADER, sourcemapname) : group.Key); //mxd
+						string tgtlumpname = (group.Key.Contains(CONFIG_MAP_HEADER) ? group.Key.Replace(CONFIG_MAP_HEADER, targetmapname) : group.Key); //mxd
+
+						// Find the lump in the source
+						int sourceindex = FindSpecificLump(source, srclumpname, srcheaderindex, sourcemapname, config.MapLumps);
+						if(sourceindex > -1) 
+						{
+							// Remove lump at target
+							int lumpindex = RemoveSpecificLump(target, tgtlumpname, tgtheaderindex, targetmapname, config.MapLumps);
+
+							// Determine target index
+							// When original lump was found and removed then insert at that position
+							// otherwise insert after last insertion position
+							if(lumpindex > -1) targetindex = lumpindex; else targetindex++;
+							if(targetindex > target.Lumps.Count) targetindex = target.Lumps.Count;
+
+							// Copy the lump to the target
+							//General.WriteLogLine(srclumpname + " copying as " + tgtlumpname);
+							Lump lump = source.Lumps[sourceindex];
+							Lump newlump = target.Insert(tgtlumpname, targetindex, lump.Length);
+							lump.CopyTo(newlump);
+						}
+						else 
+						{
+							// We don't want to bother the user with this. There are a lot of lumps in
+							// the game configs that are trivial and don't need to be found.
+							if(group.Value.Required) 
+							{
+								General.ErrorLogger.Add(ErrorType.Warning, group.Key + " (required lump) should be read but was not found in the WAD file.");
+							}
+						}
+					}
+				}
+			}
+		}
+
+		// This finds a lump within the range of known lump names
+		// Returns -1 when the lump cannot be found
+		private static int FindSpecificLump(WAD source, string lumpname, int mapheaderindex, string mapheadername, Dictionary<string, MapLumpInfo> maplumps) 
+		{
+			// Use the configured map lump names to find the specific lump within range,
+			// because when an unknown lump is met, this search must stop.
+
+			// Go for all lumps in order to find the specified lump
+			for(int i = 0; i < maplumps.Count + 1; i++) 
+			{
+				// Still within bounds?
+				if((mapheaderindex + i) < source.Lumps.Count) 
+				{
+					// Check if this is a known lump name
+					string srclumpname = source.Lumps[mapheaderindex + i].Name; //mxd
+					if(srclumpname.Contains(mapheadername)) srclumpname = srclumpname.Replace(mapheadername, CONFIG_MAP_HEADER);
+
+					if(maplumps.ContainsKey(srclumpname)) //mxd
+					{
+						// Is this the lump we are looking for?
+						if(source.Lumps[mapheaderindex + i].Name == lumpname) 
+						{
+							// Return this index
+							return mapheaderindex + i;
+						}
+					}
+					else
+					{
+						// Unknown lump hit, abort search
+						break;
+					}
+				}
+			}
+
+			// Nothing found
+			return -1;
+		}
+
+		// This removes a specific lump and returns the position where the lump was removed
+		// Returns -1 when the lump could not be found
+		internal static int RemoveSpecificLump(WAD source, string lumpname, int mapheaderindex, string mapheadername, Dictionary<string, MapLumpInfo> maplumps) 
+		{
+			// Find the specific lump index
+			int lumpindex = FindSpecificLump(source, lumpname, mapheaderindex, mapheadername, maplumps);
+			if(lumpindex > -1) 
+			{
+				// Remove this lump
+				//General.WriteLogLine(lumpname + " removed");
+				source.RemoveAt(lumpindex);
+			}
+			/*else 
+			{
+				// Lump not found
+				General.ErrorLogger.Add(ErrorType.Warning, lumpname + " should be removed but was not found!");
+			}*/
+
+			// Return result
+			return lumpindex;
+		}
+
+		#endregion
+
+		#region ================== Selection Groups
+
+		// This adds selection to a group
+		private void AddSelectionToGroup(int groupindex) 
+		{
+			General.Interface.SetCursor(Cursors.WaitCursor);
+
+			// Make selection
+			map.AddSelectionToGroup(groupindex); //mxd. switched groupmask to groupindex
+
+			General.Interface.DisplayStatus(StatusType.Action, "Assigned selection to group " + (groupindex + 1));
+			General.Interface.SetCursor(Cursors.Default);
+		}
+
+		// This selects a group
+		private void SelectGroup(int groupindex)
+		{
+			// Select
+			int groupmask = 0x01 << groupindex;
+			map.SelectVerticesByGroup(groupmask);
+			map.SelectLinedefsByGroup(groupmask);
+			map.SelectSectorsByGroup(groupmask);
+			map.SelectThingsByGroup(groupmask);
+
+			// Redraw to show selection
+			General.Interface.DisplayStatus(StatusType.Action, "Selected group " + (groupindex + 1));
+			General.Interface.RedrawDisplay();
+		}
+
+		//mxd. This clears a group
+		private void ClearGroup(int groupindex)
+		{
+			General.Interface.SetCursor(Cursors.WaitCursor);
+
+			// Clear group
+			map.ClearGroup(0x01 << groupindex);
+
+			General.Interface.DisplayStatus(StatusType.Action, "Cleared group " + (groupindex + 1));
+			General.Interface.SetCursor(Cursors.Default);
+		}
+
+		// Select actions
+		[BeginAction("selectgroup1")]
+		internal void SelectGroup1() { SelectGroup(0); }
+		[BeginAction("selectgroup2")]
+		internal void SelectGroup2() { SelectGroup(1); }
+		[BeginAction("selectgroup3")]
+		internal void SelectGroup3() { SelectGroup(2); }
+		[BeginAction("selectgroup4")]
+		internal void SelectGroup4() { SelectGroup(3); }
+		[BeginAction("selectgroup5")]
+		internal void SelectGroup5() { SelectGroup(4); }
+		[BeginAction("selectgroup6")]
+		internal void SelectGroup6() { SelectGroup(5); }
+		[BeginAction("selectgroup7")]
+		internal void SelectGroup7() { SelectGroup(6); }
+		[BeginAction("selectgroup8")]
+		internal void SelectGroup8() { SelectGroup(7); }
+		[BeginAction("selectgroup9")]
+		internal void SelectGroup9() { SelectGroup(8); }
+		[BeginAction("selectgroup10")]
+		internal void SelectGroup10() { SelectGroup(9); }
+
+		// Assign actions
+		[BeginAction("assigngroup1")]
+		internal void AssignGroup1() { AddSelectionToGroup(0); }
+		[BeginAction("assigngroup2")]
+		internal void AssignGroup2() { AddSelectionToGroup(1); }
+		[BeginAction("assigngroup3")]
+		internal void AssignGroup3() { AddSelectionToGroup(2); }
+		[BeginAction("assigngroup4")]
+		internal void AssignGroup4() { AddSelectionToGroup(3); }
+		[BeginAction("assigngroup5")]
+		internal void AssignGroup5() { AddSelectionToGroup(4); }
+		[BeginAction("assigngroup6")]
+		internal void AssignGroup6() { AddSelectionToGroup(5); }
+		[BeginAction("assigngroup7")]
+		internal void AssignGroup7() { AddSelectionToGroup(6); }
+		[BeginAction("assigngroup8")]
+		internal void AssignGroup8() { AddSelectionToGroup(7); }
+		[BeginAction("assigngroup9")]
+		internal void AssignGroup9() { AddSelectionToGroup(8); }
+		[BeginAction("assigngroup10")]
+		internal void AssignGroup10() { AddSelectionToGroup(9); }
+
+		//mxd. Clear actions
+		[BeginAction("cleargroup1")]
+		internal void ClearGroup1() { ClearGroup(0); }
+		[BeginAction("cleargroup2")]
+		internal void ClearGroup2() { ClearGroup(1); }
+		[BeginAction("cleargroup3")]
+		internal void ClearGroup3() { ClearGroup(2); }
+		[BeginAction("cleargroup4")]
+		internal void ClearGroup4() { ClearGroup(3); }
+		[BeginAction("cleargroup5")]
+		internal void ClearGroup5() { ClearGroup(4); }
+		[BeginAction("cleargroup6")]
+		internal void ClearGroup6() { ClearGroup(5); }
+		[BeginAction("cleargroup7")]
+		internal void ClearGroup7() { ClearGroup(6); }
+		[BeginAction("cleargroup8")]
+		internal void ClearGroup8() { ClearGroup(7); }
+		[BeginAction("cleargroup9")]
+		internal void ClearGroup9() { ClearGroup(8); }
+		[BeginAction("cleargroup10")]
+		internal void ClearGroup10() { ClearGroup(9); }
+
+		#endregion
+
+		#region ================== Script Editing
+
+		// Show the script editor
+		[BeginAction("openscripteditor")]
+		internal void ShowScriptEditor() 
+		{
+			Cursor.Current = Cursors.WaitCursor;
+
+			if(scriptwindow == null) 
+			{
+				// Load the window
+				scriptwindow = new ScriptEditorForm();
+			}
+
+			// Window not yet visible?
+			if(!scriptwindow.Visible) 
+			{
+				// Show the window
+				if(General.Settings.ScriptOnTop) 
+				{
+					if(scriptwindow.Visible && (scriptwindow.Owner == null)) scriptwindow.Hide();
+					scriptwindow.Show(General.MainWindow);
+				}
+				else 
+				{
+					if(scriptwindow.Visible && (scriptwindow.Owner != null)) scriptwindow.Hide();
+					scriptwindow.Show();
+				}
+			}
+
+			if(scriptwindow.WindowState == FormWindowState.Minimized) scriptwindow.WindowState = FormWindowState.Normal; //mxd
+			scriptwindow.Activate();
+			scriptwindow.Focus();
+			Cursor.Current = Cursors.Default;
+		}
+
+		// This asks the user to save changes in script files
+		// Returns false when cancelled by the user
+		internal bool AskSaveScriptChanges() 
+		{
+			// Window open?
+			if(scriptwindow != null) 
+			{
+				// Ask to save changes
+				// This also saves implicitly
+				return scriptwindow.AskSaveAll();
+			}
+
+			// No problems
+			return true;
+		}
+
+		// This applies the changed status for internal scripts
+		internal void ApplyScriptChanged() 
+		{
+			// Remember if lumps are changed
+			scriptschanged |= scriptwindow.Editor.CheckImplicitChanges();
+		}
+
+		// Close the script editor
+		// Specify true for the closing parameter when
+		// the window is already in the closing process
+		internal void CloseScriptEditor(bool closing) 
+		{
+			if(scriptwindow != null) 
+			{
+				if(!scriptwindow.IsDisposed) 
+				{
+					// Remember what files were open
+					scriptwindow.Editor.WriteOpenFilesToConfiguration();
+
+					// Close now
+					if(!closing) scriptwindow.Close();
+				}
+
+				// Done
+				scriptwindow = null;
+			}
+		}
+
+		// This checks if the scripts are changed
+		private bool CheckScriptChanged() 
+		{
+			if(scriptwindow != null) 
+			{
+				// Check if scripts are changed			
+				return scriptschanged || scriptwindow.Editor.CheckImplicitChanges();
+			}
+	
+			return scriptschanged;
+		}
+
+		// This compiles all lumps that require compiling and stores the results
+		// Returns true when our code worked properly (even when the compiler returned errors)
+		private bool CompileScriptLumps() 
+		{
+			bool success = true;
+			errors.Clear();
+
+			// Go for all the map lumps
+			foreach(MapLumpInfo lumpinfo in config.MapLumps.Values) 
+			{
+				// Is this a script lump?
+				if(lumpinfo.Script != null || lumpinfo.ScriptBuild) 
+				{
+					// Compile it now
+					success &= CompileLump(lumpinfo.Name, false);
+				}
+			}
+
+			return success;
+		}
+
+		// This compiles a script lump and returns any errors that may have occurred
+		// Returns true when our code worked properly (even when the compiler returned errors)
+		internal bool CompileLump(string lumpname, bool clearerrors) 
+		{
+			//mxd. Boilerplate
+			if(!config.MapLumps.ContainsKey(lumpname))
+			{
+				General.ShowErrorMessage("Unable to compile lump '" + lumpname + "'. This lump is not defined in the current game configuration.", MessageBoxButtons.OK);
+				return false;
+			}
+			
+			string inputfile;
+			Compiler compiler;
+			string reallumpname = lumpname;
+
+			//mxd. Does lump require compiling?
+			ScriptConfiguration scriptconfig;
+			if(config.MapLumps[lumpname].ScriptBuild) 
+			{
+				//mxd. More boilderplate
+				if(!General.CompiledScriptConfigs.ContainsKey(General.Map.Options.ScriptCompiler))
+				{
+					General.ShowErrorMessage("Unable to compile lump '" + lumpname + "'. Unable to find required script compiler configuration ('" + General.Map.Options.ScriptCompiler + "').", MessageBoxButtons.OK);
+					return false;
+				}
+				
+				scriptconfig = General.CompiledScriptConfigs[General.Map.Options.ScriptCompiler];
+			} 
+			else 
+			{
+				scriptconfig = config.MapLumps[lumpname].Script;
+			}
+			if(scriptconfig.Compiler == null) return true;
+
+			// Find the lump
+			if(lumpname == CONFIG_MAP_HEADER) reallumpname = TEMP_MAP_HEADER;
+			Lump lump = tempwad.FindLump(reallumpname);
+			if(lump == null) throw new Exception("No such lump in temporary wad file '" + reallumpname + "'.");
+
+			// Determine source file
+			string sourcefile = (filepathname.Length > 0 ? filepathname : tempwad.Filename);
+
+			// New list of errors
+			if(clearerrors) errors.Clear();
+
+			// Determine the script configuration to use
+			try 
+			{
+				// Initialize compiler
+				compiler = scriptconfig.Compiler.Create();
+			} 
+			catch(Exception e) 
+			{
+				// Fail
+				errors.Add(new CompilerError("Unable to initialize compiler. " + e.GetType().Name + ": " + e.Message));
+				return false;
+			}
+
+			try 
+			{
+				// Write lump data to temp script file in compiler's temp directory
+				inputfile = General.MakeTempFilename(compiler.Location, "tmp");
+				lump.Stream.Seek(0, SeekOrigin.Begin);
+				BinaryReader reader = new BinaryReader(lump.Stream);
+				File.WriteAllBytes(inputfile, reader.ReadBytes((int)lump.Stream.Length));
+			} 
+			catch(Exception e) 
+			{
+				// Fail
+				compiler.Dispose();
+				errors.Add(new CompilerError("Unable to write script to working file. " + e.GetType().Name + ": " + e.Message));
+				return false;
+			}
+
+			// Make random output filename
+			string outputfile = General.MakeTempFilename(compiler.Location, "tmp");
+
+			// Run compiler
+			compiler.Parameters = scriptconfig.Parameters;
+			compiler.InputFile = Path.GetFileName(inputfile);
+			compiler.OutputFile = Path.GetFileName(outputfile);
+			compiler.SourceFile = sourcefile;
+			compiler.WorkingDirectory = Path.GetDirectoryName(inputfile);
+
+			//mxd
+			if(scriptconfig.ScriptType == ScriptType.ACS)
+			{
+				compiler.Includes = General.Map.ScriptIncludes;
+				compiler.CopyIncludesToWorkingDirectory = true;
+			}
+
+			if(compiler.Run()) 
+			{
+				// Process errors
+				foreach(CompilerError e in compiler.Errors) 
+				{
+					CompilerError newerror = e;
+
+					// If the error's filename equals our temporary file,
+					// use the lump name instead and prefix it with ?
+					if(string.Compare(e.filename, inputfile, true) == 0)
+						newerror.filename = "?" + reallumpname;
+
+					errors.Add(newerror);
+				}
+
+				// No errors?
+				if(compiler.Errors.Length == 0) 
+				{
+					// Output file exists?
+					if(File.Exists(outputfile)) 
+					{
+						// Copy output file data into a lump?
+						if(!string.IsNullOrEmpty(scriptconfig.ResultLump)) 
+						{
+							// Do that now then
+							byte[] filedata;
+
+							try 
+							{
+								filedata = File.ReadAllBytes(outputfile);
+							} 
+							catch(Exception e) 
+							{
+								// Fail
+								compiler.Dispose();
+								errors.Add(new CompilerError("Unable to read compiler output file. " + e.GetType().Name + ": " + e.Message));
+								return false;
+							}
+
+							// Store data
+							MemoryStream stream = new MemoryStream(filedata);
+							SetLumpData(scriptconfig.ResultLump, stream);
+						}
+					}
+				}
+
+				// Clean up
+				compiler.Dispose();
+
+				// Done
+				return true;
+			}
+
+			// Fail
+			compiler.Dispose();
+			errors.Clear(); //mxd
+			return false;
+		}
+
+		// This clears all compiler errors
+		/*internal void ClearCompilerErrors() 
+		{
+			errors.Clear();
+		}*/
+
+		//mxd. Update includes list and script names
+		internal List<CompilerError> UpdateScriptNames(bool logerrors)
+		{
+			List<CompilerError> compilererrors = UpdateScriptNames();
+			if(logerrors && compilererrors.Count > 0)
+			{
+				//INFO: CompileLump() prepends lumpname with "?" to distinguish between temporary files and files compiled in place
+				//INFO: also, error.linenumber is zero-based
+				foreach(CompilerError error in compilererrors)
+				{
+					General.ErrorLogger.Add(ErrorType.Error, "ACS error in '" + (error.filename.StartsWith("?") ? error.filename.Replace("?", "") : error.filename)
+						+ (error.linenumber != CompilerError.NO_LINE_NUMBER ? "', line " + (error.linenumber + 1) : "'") 
+						+ ". " + error.description + ".");
+				}
+			}
+
+			return compilererrors;
+		}
+
+		//mxd. Update includes list and script names
+		internal List<CompilerError> UpdateScriptNames()
+		{
+			List<ScriptItem> namedscriptslist = new List<ScriptItem>();
+			List<ScriptItem> numberedscriptslist = new List<ScriptItem>();
+			List<string> scripincludeslist = new List<string>();
+			List<CompilerError> compilererrors = new List<CompilerError>();
+
+			// Load the script lumps
+			foreach(MapLumpInfo maplumpinfo in config.MapLumps.Values) 
+			{
+				// Is this a script lump?
+				if((maplumpinfo.ScriptBuild || maplumpinfo.Script != null) && maplumpinfo.Name == "SCRIPTS") 
+				{
+					ScriptConfiguration scriptconfig;
+					if(maplumpinfo.ScriptBuild)
+					{
+						//mxd. More boilderplate
+						if(!General.CompiledScriptConfigs.ContainsKey(General.Map.Options.ScriptCompiler))
+						{
+							compilererrors.Add(new CompilerError("Unable to compile lump '" + maplumpinfo.Name + "'. Unable to find required script compiler configuration ('" + General.Map.Options.ScriptCompiler + "')."));
+							return compilererrors;
+						}
+
+						scriptconfig = General.CompiledScriptConfigs[General.Map.Options.ScriptCompiler];
+					}
+					else
+					{
+						scriptconfig = maplumpinfo.Script;
+					}
+					
+					// Load the lump data
+					MemoryStream stream = GetLumpData(maplumpinfo.Name);
+					if(stream != null && stream.Length > 0 && scriptconfig != null && scriptconfig.Compiler != null)
+					{
+						// Get script names
+						AcsParserSE parser = new AcsParserSE { OnInclude = (se, path, includetype) => se.Parse(General.Map.Data.LoadFile(path), path, true, includetype, false) };
+
+						//INFO: CompileLump() prepends lumpname with "?" to distinguish between temporary files and files compiled in place
+						if(parser.Parse(stream, "?SCRIPTS", scriptconfig.Compiler.Files, true, AcsParserSE.IncludeType.NONE, false))
+						{
+							// Add them to arrays
+							namedscriptslist.AddRange(parser.NamedScripts);
+							numberedscriptslist.AddRange(parser.NumberedScripts);
+							scripincludeslist.AddRange(parser.Includes);
+						}
+						
+						// Check for errors
+						if(parser.HasError)
+						{
+							compilererrors.Add(new CompilerError(parser.ErrorDescription, parser.ErrorSource, parser.ErrorLine));
+							break;
+						}
+					}
+				}
+			}
+
+			// Add to collections
+			scriptincludes.Clear();
+			if(compilererrors.Count == 0)
+			{
+				namedscripts = new Dictionary<string, ScriptItem>(namedscriptslist.Count);
+				numberedscripts = new Dictionary<int, ScriptItem>(numberedscriptslist.Count);
+
+				// Sort script names
+				namedscriptslist.Sort(ScriptItem.SortByName);
+				numberedscriptslist.Sort(ScriptItem.SortByIndex);
+
+				foreach(ScriptItem item in namedscriptslist)
+					if(!namedscripts.ContainsKey(item.Name.ToLowerInvariant())) namedscripts.Add(item.Name.ToLowerInvariant(), item);
+				foreach(ScriptItem item in numberedscriptslist)
+					if(!numberedscripts.ContainsKey(item.Index)) numberedscripts.Add(item.Index, item);
+				foreach(string include in scripincludeslist)
+					if(!scriptincludes.Contains(include)) scriptincludes.Add(include);
+			}
+			else
+			{
+				// Clear collections
+				namedscripts.Clear();
+				numberedscripts.Clear();
+			}
+
+			return compilererrors;
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This updates everything after the configuration or settings have been changed
+		internal void UpdateConfiguration() 
+		{
+			// Update map
+			map.UpdateConfiguration();
+
+			// Update settings
+			renderer3d.CreateProjection();
+			renderer3d.UpdateVertexHandle(); //mxd
+
+			// Things filters
+			General.MainWindow.UpdateThingsFilters();
+		}
+
+		// This changes thing filter
+		public void ChangeThingFilter(ThingsFilter newfilter) 
+		{
+			// We have a special filter for null
+			if(newfilter == null) newfilter = new NullThingsFilter();
+
+			// Deactivate old filter
+			if(thingsfilter != null) thingsfilter.Deactivate();
+
+			// Change
+			thingsfilter = newfilter;
+
+			// Activate filter
+			thingsfilter.Activate();
+
+			// Update interface
+			General.MainWindow.ReflectThingsFilter();
+
+			// Redraw
+			General.MainWindow.RedrawDisplay();
+		}
+
+		// This sets a new mapset for editing
+		private void ChangeMapSet(MapSet newmap) 
+		{
+			// Let the plugin and editing mode know
+			General.Plugins.OnMapSetChangeBegin();
+			if(General.Editing.Mode != null) General.Editing.Mode.OnMapSetChangeBegin();
+			this.visualcamera.Sector = null;
+
+			// Can't have a selection in an old map set
+			map.ClearAllSelected();
+
+			// Reset surfaces
+			renderer2d.Surfaces.Reset();
+
+			// Apply
+			map.Dispose();
+			map = newmap;
+			map.UpdateConfiguration();
+			map.SnapAllToAccuracy();
+			map.Update();
+			thingsfilter.Update();
+
+			// Let the plugin and editing mode know
+			General.Plugins.OnMapSetChangeEnd();
+			if(General.Editing.Mode != null) General.Editing.Mode.OnMapSetChangeEnd();
+		}
+
+		// This reloads resources
+		[BeginAction("reloadresources")]
+		internal void DoReloadResource() 
+		{
+			//mxd. Get rid of old errors
+			General.ErrorLogger.Clear();
+			
+			// Set this to false so we can see if errors are added
+			General.ErrorLogger.IsErrorAdded = false;
+
+#if DEBUG 
+			DebugConsole.Clear();
+#endif
+
+			ReloadResources();
+
+			if(General.ErrorLogger.IsErrorAdded)
+			{
+				// Show any errors if preferred
+				General.MainWindow.DisplayStatus(StatusType.Warning, "There were errors during resources loading!");
+				if(General.Settings.ShowErrorsWindow) General.MainWindow.ShowErrors();
+			}
+			else
+			{
+				General.MainWindow.DisplayReady();
+			}
+
+		}
+
+		internal void ReloadResources() 
+		{
+			// Keep old display info
+			StatusInfo oldstatus = General.MainWindow.Status;
+			Cursor oldcursor = Cursor.Current;
+
+			// Show status
+			General.MainWindow.DisplayStatus(StatusType.Busy, "Reloading data resources...");
+			Cursor.Current = Cursors.WaitCursor;
+
+			// Clean up
+			data.Dispose();
+			data = null;
+			config = null;
+			configinfo = null;
+			GC.Collect();
+			GC.WaitForPendingFinalizers();
+			GC.Collect(); //mxd
+
+			// Clear errors
+			General.ErrorLogger.Clear();
+
+			// Reload game configuration
+			General.WriteLogLine("Reloading game configuration...");
+			configinfo = General.GetConfigurationInfo(options.ConfigFile);
+			config = new GameConfiguration(configinfo.Configuration); //mxd
+			General.Editing.UpdateCurrentEditModes();
+
+			// Reload data resources
+			General.WriteLogLine("Reloading data resources...");
+			data = new DataManager();
+			if(!string.IsNullOrEmpty(filepathname)) 
+			{
+				DataLocation maplocation = new DataLocation(DataLocation.RESOURCE_WAD, filepathname, false, false, false);
+				data.Load(configinfo.Resources, options.Resources, maplocation);
+			}
+			else 
+			{
+				data.Load(configinfo.Resources, options.Resources);
+			}
+
+			// Apply new settings to map elements
+			map.UpdateConfiguration();
+
+			// Re-link the background image
+			grid.LinkBackground();
+
+			// Inform all plugins that the resources are reloaded
+			General.Plugins.ReloadResources();
+
+			// Inform editing mode that the resources are reloaded
+			if(General.Editing.Mode != null) General.Editing.Mode.OnReloadResources();
+
+			// Reset status
+			General.MainWindow.DisplayStatus(oldstatus);
+			Cursor.Current = oldcursor;
+
+			//mxd. Update includes list and script names
+			UpdateScriptNames(true);
+		}
+
+		// Game Configuration action
+		[BeginAction("mapoptions")]
+		internal void ShowMapOptions() 
+		{
+			// Cancel volatile mode, if any
+			General.Editing.DisengageVolatileMode();
+
+			// Show map options dialog
+			MapOptionsForm optionsform = new MapOptionsForm(options, false);
+			if(optionsform.ShowDialog(General.MainWindow) == DialogResult.OK) 
+			{
+				// Update interface
+				//General.MainWindow.UpdateInterface();
+
+				// Stop data manager
+				data.Dispose();
+
+				// Apply new options
+				this.options = optionsform.Options;
+
+				// Load new game configuration
+				General.WriteLogLine("Loading game configuration '" + options.ConfigFile + "'...");
+				configinfo = General.GetConfigurationInfo(options.ConfigFile);
+				Type oldiotype = io.GetType(); //mxd
+
+				//mxd. Step 1 of hackish way to translate SP/MP thing flags to Hexen map format...
+				//TODO: add proper Doom -> Hexen thing flags translation to the configs?
+				if(oldiotype == typeof(DoomMapSetIO) && configinfo.FormatInterface == "hexenmapsetio")
+				{
+					// Translate to UDMF using Doom things flags translation table
+					foreach(Thing t in General.Map.Map.Things) t.TranslateToUDMF();
+				}
+
+				config = new GameConfiguration(configinfo.Configuration); //mxd
+				configinfo.ApplyDefaults(config);
+				General.Editing.UpdateCurrentEditModes();
+
+				// Setup new map format IO
+				General.WriteLogLine("Initializing map format interface " + config.FormatInterface + "...");
+				io = MapSetIO.Create(config.FormatInterface, tempwad, this);
+
+				//mxd. Some lumps may've become unneeded during map format conversion. 
+				if(oldiotype != io.GetType())
+					RemoveUnneededLumps(tempwad, TEMP_MAP_HEADER, false);
+
+				// Create required lumps if they don't exist yet
+				CreateRequiredLumps(tempwad, TEMP_MAP_HEADER);
+
+				// Let the plugins know
+				General.Plugins.MapReconfigure();
+
+				//mxd. Update linedef color presets and flags if required
+				if(oldiotype == typeof(UniversalMapSetIO) && !(io is UniversalMapSetIO)) 
+				{
+					foreach(Linedef l in General.Map.Map.Linedefs) l.TranslateFromUDMF();
+					foreach(Thing t in General.Map.Map.Things) t.TranslateFromUDMF();
+				} 
+				else if(oldiotype != typeof(UniversalMapSetIO) && io is UniversalMapSetIO) 
+				{
+					foreach(Linedef l in General.Map.Map.Linedefs) l.TranslateToUDMF(oldiotype);
+					foreach(Thing t in General.Map.Map.Things) t.TranslateToUDMF();
+				} 
+				else if(oldiotype != typeof(DoomMapSetIO) && io is DoomMapSetIO) 
+				{ 
+					// Drop all arguments
+					foreach(Linedef l in General.Map.Map.Linedefs) 
+						for(int i = 0; i < l.Args.Length; i++) l.Args[i] = 0;
+					foreach(Thing t in General.Map.Map.Things) 
+						for(int i = 0; i < t.Args.Length; i++) t.Args[i] = 0;
+				}
+				else if(oldiotype == typeof(DoomMapSetIO) && io is HexenMapSetIO)
+				{
+					// Step 2 of hackish way to translate SP/MP thing flags to Hexen map format...
+					foreach(Thing t in General.Map.Map.Things) t.TranslateFromUDMF();
+				}
+				map.UpdateCustomLinedefColors();
+
+				// Update interface
+				General.MainWindow.SetupInterface();
+				General.MainWindow.UpdateThingsFilters();
+				General.MainWindow.UpdateLinedefColorPresets(); //mxd
+				General.MainWindow.UpdateInterface();
+
+				// Reload resources
+				ReloadResources();
+
+				//mxd. Translate texture names
+				bool nameschanged = map.TranslateTextureNames(config.UseLongTextureNames, false);
+				grid.TranslateBackgroundName(config.UseLongTextureNames);
+				
+				//mxd. Sector textures may've been changed 
+				if(nameschanged) data.UpdateUsedTextures();
+
+				// Done
+				General.MainWindow.DisplayReady();
+				General.MainWindow.RedrawDisplay(); //mxd
+			}
+
+			// Done
+			optionsform.Dispose();
+		}
+
+		// This shows the things filters setup
+		[BeginAction("thingsfilterssetup")]
+		internal void ShowThingsFiltersSetup() 
+		{
+			new ThingsFiltersForm().ShowDialog(General.MainWindow);
+		}
+
+		//mxd. This shows the linedef color presets window
+		[BeginAction("linedefcolorssetup")]
+		internal void ShowLinedefColorsSetup()
+		{
+			// Show things filter dialog
+			new LinedefColorPresetsForm().ShowDialog(General.MainWindow);
+		}
+
+		// This returns true is the given type matches
+		public bool IsType(Type t) 
+		{
+			return io.GetType() == t;
+		}
+
+		//mxd
+		public SizeF GetTextSize(string text, float scale) 
+		{
+			return graphics.Font.GetTextSize(text, scale);
+		}
+
+		//mxd
+		[BeginAction("snapvertstogrid")]
+		private void SnapSelectedMapElementsToGrid() 
+		{
+			// Get selected elements
+			ICollection<Vertex> verts = map.GetSelectedVertices(true);
+			ICollection<Linedef> lines = map.GetSelectedLinedefs(true); // Sector lines are auto-selected when a sector is selected
+			ICollection<Thing> things = map.GetSelectedThings(true);
+
+			// Get vertices from selection
+			Dictionary<int, Vertex> vertstosnap = new Dictionary<int, Vertex>(verts.Count);
+			foreach(Vertex v in verts) vertstosnap.Add(v.Index, v);
+			foreach(Linedef l in lines)
+			{
+				if(!vertstosnap.ContainsKey(l.Start.Index)) vertstosnap.Add(l.Start.Index, l.Start);
+				if(!vertstosnap.ContainsKey(l.End.Index)) vertstosnap.Add(l.End.Index, l.End);
+			}
+
+			// Anything to snap?
+			if(vertstosnap.Count == 0 && things.Count == 0) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "Select any map element first!");
+				return;
+			}
+
+			// Make undo
+			undoredo.CreateUndo("Snap map elements to grid");
+
+			// Do the snapping
+			Cursor.Current = Cursors.AppStarting;
+
+			// Snap vertices?
+			int snappedverts = (vertstosnap.Count > 0 ? SnapVertices(vertstosnap.Values) : 0);
+
+			// Snap things?..
+			int snappedthings = (things.Count > 0 ? SnapThings(things) : 0);
+
+			// Assemble status message
+			List<string> message = new List<string>();
+			if(snappedverts > 0) message.Add(snappedverts + " vertices");
+			if(snappedthings > 0) message.Add(snappedthings + " things");
+
+			// Map changed?
+			if(message.Count > 0) 
+			{
+				// Display status
+				General.Interface.DisplayStatus(StatusType.Info, "Snapped " + string.Join(" and ", message.ToArray()));
+
+				// Warn the user
+				/*if(snappedverts > 0) 
+				{
+					MessageBox.Show("Snapped " + snappedverts + " vertices to grid." + Environment.NewLine +
+					                "It's a good idea to run Map Analysis Mode now.");
+				}*/
+
+				// Invoke clear selection to update sector highlight overlay
+				General.Actions.InvokeAction("builder_clearselection");
+
+				// Update cached values
+				General.Map.Map.Update();
+
+				// Map is changed
+				General.Map.IsChanged = true;
+			}
+			else 
+			{
+				// Display status
+				General.Interface.DisplayStatus(StatusType.Info, "Selected map elements were already on the grid.");
+
+				// Withdraw undo
+				undoredo.WithdrawUndo();
+			}
+
+			// Done
+			General.Interface.RedrawDisplay();
+			Cursor.Current = Cursors.Default;
+		}
+
+		//mxd
+		private int SnapVertices(IEnumerable<Vertex> verts)
+		{
+			int snappedCount = 0;
+			List<Vertex> movedVerts = new List<Vertex>();
+			List<Linedef> movedLines = new List<Linedef>();
+
+			//snap them all!
+			foreach(Vertex v in verts) 
+			{
+				Vector2D pos = v.Position;
+				v.SnapToGrid();
+
+				if(v.Position.x != pos.x || v.Position.y != pos.y) 
+				{
+					snappedCount++;
+					movedVerts.Add(v);
+					foreach(Linedef l in v.Linedefs) 
+					{
+						if(!movedLines.Contains(l)) movedLines.Add(l);
+					}
+				}
+			}
+
+			//Create blockmap
+			RectangleF area = MapSet.CreateArea(General.Map.Map.Vertices);
+			BlockMap<BlockEntry> blockmap = new BlockMap<BlockEntry>(area);
+			blockmap.AddVerticesSet(General.Map.Map.Vertices);
+
+			//merge overlapping vertices using teh power of BLOCKMAP!!!11
+			foreach(Vertex v in movedVerts) 
+			{
+				BlockEntry block = blockmap.GetBlockAt(v.Position);
+				if(block == null) continue;
+
+				foreach(Vertex blockVert in block.Vertices) 
+				{
+					if(blockVert.IsDisposed || blockVert.Index == v.Index || blockVert.Position != v.Position)
+						continue;
+
+					foreach(Linedef l in blockVert.Linedefs) 
+					{
+						if(!movedLines.Contains(l)) movedLines.Add(l);
+					}
+					v.Join(blockVert);
+					break;
+				}
+			}
+
+			// Update cached values of lines because we may need their length/angle
+			General.Map.Map.Update(true, false);
+
+			General.Map.Map.BeginAddRemove();
+			MapSet.RemoveLoopedLinedefs(movedLines);
+			MapSet.JoinOverlappingLines(movedLines);
+			General.Map.Map.EndAddRemove();
+
+			//get changed sectors
+			List<Sector> changedSectors = new List<Sector>();
+			foreach(Linedef l in movedLines) 
+			{
+				if(l == null || l.IsDisposed) continue;
+				if(l.Front != null && l.Front.Sector != null && !changedSectors.Contains(l.Front.Sector))
+					changedSectors.Add(l.Front.Sector);
+				if(l.Back != null && l.Back.Sector != null && !changedSectors.Contains(l.Back.Sector))
+					changedSectors.Add(l.Back.Sector);
+			}
+
+			// Now update area of sectors
+			General.Map.Map.Update(false, true);
+
+			//fix invalid sectors
+			foreach(Sector s in changedSectors) 
+			{
+				if(s.BBox.IsEmpty) 
+				{
+					s.Dispose();
+				} 
+				else if(s.Sidedefs.Count < 3) 
+				{
+					bool merged = false;
+					foreach(Sidedef side in s.Sidedefs) 
+					{
+						if(side.Other != null && side.Other.Sector != null) 
+						{
+							s.Join(side.Other.Sector);
+							merged = true;
+							break;
+						}
+					}
+
+					//oh well, I don't know what else I can do here...
+					if(!merged) s.Dispose();
+				}
+			}
+
+			return snappedCount;
+		}
+
+		//mxd
+		private static int SnapThings(IEnumerable<Thing> things)
+		{
+			int snappedCount = 0;
+
+			//snap them all!
+			foreach(Thing t in things) 
+			{
+				Vector2D pos = t.Position;
+				t.SnapToGrid();
+				if(t.Position.x != pos.x || t.Position.y != pos.y) snappedCount++;
+			}
+
+			return snappedCount;
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/General/MurmurHash2.cs b/Source/Core/General/MurmurHash2.cs
new file mode 100644
index 0000000..e10f0f3
--- /dev/null
+++ b/Source/Core/General/MurmurHash2.cs
@@ -0,0 +1,109 @@
+#region ============== License
+
+/***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is HashTableHashing.MurmurHash2.
+ *
+ * The Initial Developer of the Original Code is
+ * Davy Landman.
+ * Portions created by the Initial Developer are Copyright (C) 2009
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#endregion
+
+using System;
+using System.Text;
+
+namespace CodeImp.DoomBuilder
+{
+	public static class MurmurHash2
+	{
+		private const UInt32 m = 0x5bd1e995;
+		private const Int32 r = 24;
+
+		public static UInt32 Hash(string data) 
+		{
+			return Hash(Encoding.ASCII.GetBytes(data), 0xc58f1a7b);
+		}
+
+		private static unsafe UInt32 Hash(Byte[] data, UInt32 seed) 
+		{
+			Int32 length = data.Length;
+			if(length == 0) return 0;
+
+			UInt32 h = seed ^ (UInt32)length;
+			Int32 remainingBytes = length & 3; // mod 4
+			Int32 numberOfLoops = length >> 2; // div 4
+			
+			fixed(byte* firstByte = &(data[0])) 
+			{
+				UInt32* realData = (UInt32*)firstByte;
+				while(numberOfLoops != 0) 
+				{
+					UInt32 k = *realData;
+					k *= m;
+					k ^= k >> r;
+					k *= m;
+
+					h *= m;
+					h ^= k;
+					numberOfLoops--;
+					realData++;
+				}
+
+				switch(remainingBytes) 
+				{
+					case 3:
+						h ^= (UInt16)(*realData);
+						h ^= ((UInt32)(*(((Byte*)(realData)) + 2))) << 16;
+						h *= m;
+						break;
+					case 2:
+						h ^= (UInt16)(*realData);
+						h *= m;
+						break;
+					case 1:
+						h ^= *((Byte*)realData);
+						h *= m;
+						break;
+				}
+			}
+
+			// Do a few final mixes of the hash to ensure the last few
+			// bytes are well-incorporated.
+			h ^= h >> 13;
+			h *= m;
+			h ^= h >> 15;
+
+			return h;
+		}
+	}
+}
diff --git a/Source/Core/General/SavePurpose.cs b/Source/Core/General/SavePurpose.cs
new file mode 100644
index 0000000..5f4d696
--- /dev/null
+++ b/Source/Core/General/SavePurpose.cs
@@ -0,0 +1,31 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+#endregion
+
+namespace CodeImp.DoomBuilder
+{
+	public enum SavePurpose
+	{
+		Normal = 0,
+		AsNewFile = 1,
+		IntoFile = 2,
+		Testing = 3
+	}
+}
+
diff --git a/Source/Core/General/StepsList.cs b/Source/Core/General/StepsList.cs
new file mode 100644
index 0000000..17be3fa
--- /dev/null
+++ b/Source/Core/General/StepsList.cs
@@ -0,0 +1,122 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+
+#endregion
+
+namespace CodeImp.DoomBuilder
+{
+	public class StepsList : List<int>
+	{
+		// This returns a step higher
+		public int GetNextHigher(int level)
+		{
+			int low = 0;
+			int high = base.Count - 1;
+
+			while(low < high)
+			{
+				int mid = (int)Math.Floor((low + high) * 0.5f);
+				int l = base[mid];
+
+				if(l <= level)
+					low = mid + 1;
+				else
+					high = mid;
+			}
+			
+			return base[high];
+		}
+		
+		// This returns a step lower
+		public int GetNextLower(int level)
+		{
+			int low = 0;
+			int high = base.Count - 1;
+
+			while(low < high)
+			{
+				int mid = (int)Math.Ceiling((low + high) * 0.5f);
+				int l = base[mid];
+
+				if(l >= level)
+					high = mid - 1;
+				else
+					low = mid;
+			}
+
+			return base[low];
+		}
+
+		//mxd. This returns a step higher, or lowest step if level is already the highest possible value
+		public int GetNextHigherWrap(int level, bool wraparound) 
+		{
+			int result = GetNextHigher(level);
+			if(!wraparound) return result;
+			return (result == level ? this[0] : result);
+		}
+
+		//mxd. This returns a step lower, or highest step if level is already the lowest possible value
+		public int GetNextLowerWrap(int level, bool wraparound) 
+		{
+			int result = GetNextLower(level);
+			if(!wraparound) return result;
+			return (result == level ? this[this.Count - 1] : result);
+		}
+
+		//mxd. This returns a step higher for UDMF relative light range (-255..255)
+		public int GetNextHigher(int level, bool absolute) 
+		{
+			if(absolute || level >= 0) return GetNextHigher(level);
+			return -GetNextLower(Math.Abs(level));
+		}
+
+		//mxd. This returns a step lower for UDMF relative light range (-255..255)
+		public int GetNextLower(int level, bool absolute) 
+		{
+			if(absolute || level > 0) return GetNextLower(level);
+			return -GetNextHigher(Math.Abs(level));
+		}
+
+		// This returns the nearest step
+		public int GetNearest(int level)
+		{
+			int low = 0;
+			int high = base.Count - 1;
+
+			while(low < high)
+			{
+				int mid = (int)Math.Floor((low + high) * 0.5f);
+				int l = base[mid];
+
+				if(l <= level)
+					low = mid + 1;
+				else
+					high = mid;
+			}
+
+			// Find which one is nearest
+			low = (high > 0) ? (high - 1) : 0;
+			int dlow = level - base[low];
+			int dhigh = base[high] - level;
+			return (dlow < dhigh) ? base[low] : base[high];
+		}
+	}
+}
diff --git a/Source/Core/General/UpdateChecker.cs b/Source/Core/General/UpdateChecker.cs
new file mode 100644
index 0000000..26c34fc
--- /dev/null
+++ b/Source/Core/General/UpdateChecker.cs
@@ -0,0 +1,235 @@
+using System;
+using System.ComponentModel;
+using System.IO;
+using System.Net;
+using System.Text;
+using System.Windows.Forms;
+using System.Xml;
+
+namespace CodeImp.DoomBuilder
+{
+	internal static class UpdateChecker
+	{
+		private static BackgroundWorker worker;
+		private static string errordesc;
+		private static bool verbose;
+
+		internal static void PerformCheck(bool verbosemode)
+		{
+			// Update check already runing?
+			if(worker != null && worker.IsBusy)
+			{
+				if(verbosemode)
+				{
+					General.ShowWarningMessage("Update check is already running!", MessageBoxButtons.OK);
+				}
+				else
+				{
+					General.ErrorLogger.Add(ErrorType.Warning, "Update check is already running!");
+					General.MainWindow.ShowErrors();
+				}
+				return;
+			}
+
+			// Start checking
+			verbose = verbosemode;
+			worker = new BackgroundWorker();
+			worker.DoWork += DoWork;
+			worker.RunWorkerCompleted += RunWorkerCompleted;
+			worker.WorkerSupportsCancellation = true;
+			worker.RunWorkerAsync();
+		}
+
+		private static void DoWork(object sender, DoWorkEventArgs e)
+		{
+			string updaterpath = Path.Combine(General.AppPath, "Updater.exe");
+			if(!File.Exists(updaterpath))
+			{
+				errordesc = "Update check failed: '" + updaterpath + "' does not exist!";
+				e.Cancel = true;
+				return;
+			} 
+			
+			string inipath = Path.Combine(General.AppPath, "Updater.ini");
+			if(!File.Exists(inipath))
+			{
+				errordesc = "Update check failed: '" + inipath + "' does not exist!";
+				e.Cancel = true;
+				return;
+			}
+
+			string url = GetDownloadUrl(inipath);
+			if(string.IsNullOrEmpty(url))
+			{
+				errordesc = "Update check failed: failed to get update url from Updater.ini!";
+				e.Cancel = true;
+				return;
+			}
+
+			// Get local revision number
+			int localrev = General.ThisAssembly.GetName().Version.Revision;
+			int actuallocalrev = localrev;
+			if(!verbose) localrev = Math.Max(localrev, General.Settings.IgnoredRemoteRevision);
+
+			// Get remote revision number
+			int remoterev;
+			using(MemoryStream stream = DownloadWebFile(Path.Combine(url, "Version.txt")))
+			{
+				if(stream == null)
+				{
+					errordesc = "Update check failed: failed to retrieve remote revision info.";
+					e.Cancel = true;
+					return;
+				}
+
+				string s;
+				using(StreamReader reader = new StreamReader(stream))
+				{
+					s = reader.ReadToEnd();
+				}
+
+				if(!int.TryParse(s, out remoterev))
+				{
+					errordesc = "Update check failed: failed to retrieve remote revision number.";
+					e.Cancel = true;
+					return;
+				}
+			}
+
+			if(remoterev > localrev)
+			{
+				// Get changelog info
+				string changelog = GetChangelog(url, actuallocalrev);
+
+				if(string.IsNullOrEmpty(changelog))
+				{
+					errordesc = "Update check failed: failed to retrieve changelog.";
+					e.Cancel = true;
+					return;
+				}
+
+				// Pass data to MainForm
+				General.MainWindow.UpdateAvailable(remoterev, changelog);
+			}
+			else if(verbose)
+			{
+				errordesc = "Your version is up to date";
+			}
+		}
+
+		private static void RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs runWorkerCompletedEventArgs)
+		{
+			worker = null;
+			if(!string.IsNullOrEmpty(errordesc))
+			{
+				if(verbose)
+				{
+					General.ShowWarningMessage(errordesc, MessageBoxButtons.OK);
+				}
+				else
+				{
+					General.ErrorLogger.Add(ErrorType.Warning, errordesc);
+					General.MainWindow.ShowErrors();
+				}
+			}
+		}
+
+		private static string GetChangelog(string url, int localrev)
+		{
+			StringBuilder sb = new StringBuilder(@"{\rtf1");
+			
+			using(MemoryStream stream = DownloadWebFile(Path.Combine(url, "Changelog.xml")))
+			{
+				if(stream == null) return string.Empty;
+				
+				XmlDocument doc = new XmlDocument();
+				doc.Load(stream);
+
+				// Revision infos go in descending order
+				if(doc.ChildNodes.Count == 0) return string.Empty;
+				foreach(XmlNode log in doc.ChildNodes)
+				{
+					if(log.ChildNodes.Count == 0) continue;
+					foreach(XmlNode logentry in log.ChildNodes)
+					{
+						int noderev;
+						if(logentry.Attributes == null || !int.TryParse(logentry.Attributes.GetNamedItem("revision").Value, out noderev)) continue;
+						if(noderev <= localrev) break;
+
+						// Add info
+						sb.Append(@"{\b R" + noderev + @":}\par ");
+
+						foreach(XmlNode prop in logentry.ChildNodes)
+						{
+							if(prop.Name == "msg")
+							{
+								sb.Append(prop.InnerText.Trim().Replace(Environment.NewLine, @"\par ")).Append(@"\par\par ");
+								break;
+							}
+						}
+					}
+				}
+			}
+
+			sb.Append("}");
+			return sb.ToString();
+		}
+
+		private static MemoryStream DownloadWebFile(string url)
+		{
+			// Open a data stream from the supplied URL
+			WebRequest webReq = WebRequest.Create(url);
+			WebResponse webResponse;
+
+			try
+			{
+				webResponse = webReq.GetResponse();
+			}
+			catch(WebException)
+			{
+				return null;
+			}
+			
+			Stream dataStream = webResponse.GetResponseStream();
+
+			// Download the data in chuncks
+			byte[] dataBuffer = new byte[1024];
+
+			// Download the data
+			MemoryStream memoryStream = new MemoryStream();
+			while(!General.MainWindow.IsDisposed)
+			{
+				// Let's try and read the data
+				int bytesFromStream = dataStream.Read(dataBuffer, 0, dataBuffer.Length);
+				if(bytesFromStream == 0)
+				{
+					// Download complete
+					break;
+				}
+				else 
+				{
+					// Write the downloaded data
+					memoryStream.Write(dataBuffer, 0, bytesFromStream);
+				}
+			}
+
+			// Release resources
+			dataStream.Close();
+
+			// Rewind and return the stream
+			memoryStream.Position = 0;
+			return memoryStream;
+		}
+
+		private static string GetDownloadUrl(string filename)
+		{
+			string[] lines = File.ReadAllLines(filename);
+			foreach(string line in lines)
+			{
+				if(line.StartsWith("URL")) return line.Substring(3).Trim();
+			}
+
+			return string.Empty;
+		}
+	}
+}
diff --git a/Source/Core/Geometry/Angle2D.cs b/Source/Core/Geometry/Angle2D.cs
new file mode 100644
index 0000000..9d6a1de
--- /dev/null
+++ b/Source/Core/Geometry/Angle2D.cs
@@ -0,0 +1,87 @@
+	
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Geometry
+{
+	public struct Angle2D
+	{
+		#region ================== Constants
+
+		public const float PI = (float)Math.PI;
+		public const float PIHALF = (float)Math.PI * 0.5f;
+		public const float PI2 = (float)Math.PI * 2f;
+		public const float PIDEG = 57.295779513082320876798154814105f;
+		public const float SQRT2 = 1.4142135623730950488016887242097f;
+		
+		#endregion
+
+		#region ================== Methods
+
+		// This converts doom angle to real angle
+		public static float DoomToReal(int doomangle)
+		{
+			return (float)Math.Round(Normalized(DegToRad((doomangle + 90))), 4);
+		}
+
+		// This converts real angle to doom angle
+		public static int RealToDoom(float realangle)
+		{
+			return (int)Math.Round(RadToDeg(Normalized(realangle - PIHALF)));
+		}
+
+		// This converts degrees to radians
+		public static float DegToRad(float deg)
+		{
+			return deg / PIDEG;
+		}
+
+		// This converts radians to degrees
+		public static float RadToDeg(float rad)
+		{
+			return rad * PIDEG;
+		}
+
+		// This normalizes an angle
+		public static float Normalized(float a)
+		{
+			while(a < 0f) a += PI2;
+			while(a >= PI2) a -= PI2;
+			return a;
+		}
+
+		// This returns the difference between two angles
+		public static float Difference(float a, float b)
+		{
+			// Calculate delta angle
+			float d = Normalized(a) - Normalized(b);
+
+			// Make corrections for zero barrier
+			if(d < 0f) d += PI2;
+			if(d > PI) d = PI2 - d;
+
+			// Return result
+			return d;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Geometry/CurveTools.cs b/Source/Core/Geometry/CurveTools.cs
new file mode 100644
index 0000000..1acbc9f
--- /dev/null
+++ b/Source/Core/Geometry/CurveTools.cs
@@ -0,0 +1,376 @@
+using System;
+using System.Collections.Generic;
+
+namespace CodeImp.DoomBuilder.Geometry
+{
+	/// <summary>
+	/// mxd. Tools to work with curves.
+	/// </summary>
+	public static class CurveTools
+	{
+		//mxd. Ported from Cubic Bezier curve tools by Andy Woodruff (http://cartogrammar.com/source/CubicBezier.as)
+		//"default" values: z = 0.5, angleFactor = 0.75; if targetSegmentLength <= 0, will return lines
+		public static Curve CurveThroughPoints(List<Vector2D> points, float z, float angleFactor, int targetSegmentLength) 
+		{
+			Curve result = new Curve();
+
+			// First calculate all the curve control points
+			// None of this junk will do any good if there are only two points
+			if(points.Count > 2 && targetSegmentLength > 0) 
+			{
+				List<List<Vector2D>> controlPts = new List<List<Vector2D>>();	// An array to store the two control points (of a cubic Bézier curve) for each point
+
+				// Make sure z is between 0 and 1 (too messy otherwise)
+				if(z <= 0) z = 0.1f;
+				else if(z > 1) z = 1;
+
+				// Make sure angleFactor is between 0 and 1
+				if(angleFactor < 0) angleFactor = 0;
+				else if(angleFactor > 1) angleFactor = 1;
+
+				// Ordinarily, curve calculations will start with the second point and go through the second-to-last point
+				int firstPt = 1;
+				int lastPt = points.Count - 1;
+
+				// Check if this is a closed line (the first and last points are the same)
+				if(points[0].x == points[points.Count - 1].x && points[0].y == points[points.Count - 1].y) 
+				{
+					// Include first and last points in curve calculations
+					firstPt = 0;
+					lastPt = points.Count;
+				} 
+				else 
+				{
+					controlPts.Add(new List<Vector2D>()); //add a dummy entry
+				}
+
+				// Loop through all the points (except the first and last if not a closed line) to get curve control points for each.
+				for(int i = firstPt; i < lastPt; i++) 
+				{
+					// The previous, current, and next points
+					Vector2D p0 = (i - 1 < 0) ? points[points.Count - 2] : points[i - 1];	// If the first point (of a closed line), use the second-to-last point as the previous point
+					Vector2D p1 = points[i];
+					Vector2D p2 = (i + 1 == points.Count) ? points[1] : points[i + 1];		// If the last point (of a closed line), use the second point as the next point
+
+					float a = Vector2D.Distance(p0, p1);	// Distance from previous point to current point
+					if(a < 0.001) a = 0.001f;		        // Correct for near-zero distances, a cheap way to prevent division by zero
+					float b = Vector2D.Distance(p1, p2);	// Distance from current point to next point
+					if(b < 0.001) b = 0.001f;
+					float c = Vector2D.Distance(p0, p2);	// Distance from previous point to next point
+					if(c < 0.001) c = 0.001f;
+
+					float cos = (b * b + a * a - c * c) / (2 * b * a);
+					// Make sure above value is between -1 and 1 so that Math.acos will work
+					if(cos < -1) cos = -1;
+					else if(cos > 1) cos = 1;
+
+					float C = (float)Math.Acos(cos); // Angle formed by the two sides of the triangle (described by the three points above) adjacent to the current point
+
+					// Duplicate set of points. Start by giving previous and next points values RELATIVE to the current point.
+					Vector2D aPt = new Vector2D(p0.x - p1.x, p0.y - p1.y);
+					Vector2D bPt = new Vector2D(p1.x, p1.y);
+					Vector2D cPt = new Vector2D(p2.x - p1.x, p2.y - p1.y);
+
+					/*
+					We'll be adding adding the vectors from the previous and next points to the current point,
+					but we don't want differing magnitudes (i.e. line segment lengths) to affect the direction
+					of the new vector. Therefore we make sure the segments we use, based on the duplicate points
+					created above, are of equal length. The angle of the new vector will thus bisect angle C
+					(defined above) and the perpendicular to this is nice for the line tangent to the curve.
+					The curve control points will be along that tangent line.
+					*/
+					if(a > b) aPt = aPt.GetNormal() * b;	    // Scale the segment to aPt (bPt to aPt) to the size of b (bPt to cPt) if b is shorter.
+					else if(b > a) cPt = cPt.GetNormal() * a;	// Scale the segment to cPt (bPt to cPt) to the size of a (aPt to bPt) if a is shorter.
+
+					// Offset aPt and cPt by the current point to get them back to their absolute position.
+					aPt += p1;
+					cPt += p1;
+
+					// Get the sum of the two vectors, which is perpendicular to the line along which our curve control points will lie.
+					float ax = bPt.x - aPt.x;	// x component of the segment from previous to current point
+					float ay = bPt.y - aPt.y;
+					float bx = bPt.x - cPt.x;	// x component of the segment from next to current point
+					float by = bPt.y - cPt.y;
+					float rx = ax + bx;	// sum of x components
+					float ry = ay + by;
+
+					// Correct for three points in a line by finding the angle between just two of them
+					if(rx == 0 && ry == 0) 
+					{
+						rx = -bx;	// Really not sure why this seems to have to be negative
+						ry = by;
+					}
+
+					// Switch rx and ry when y or x difference is 0. This seems to prevent the angle from being perpendicular to what it should be.
+					if(ay == 0 && by == 0) 
+					{
+						rx = 0;
+						ry = 1;
+					} 
+					else if(ax == 0 && bx == 0) 
+					{
+						rx = 1;
+						ry = 0;
+					}
+
+					//float r = (float)Math.Sqrt(rx * rx + ry * ry);	// length of the summed vector - not being used, but there it is anyway
+					float theta = (float)Math.Atan2(ry, rx);	// angle of the new vector
+
+					float controlDist = Math.Min(a, b) * z;	// Distance of curve control points from current point: a fraction the length of the shorter adjacent triangle side
+					float controlScaleFactor = C / Angle2D.PI;	// Scale the distance based on the acuteness of the angle. Prevents big loops around long, sharp-angled triangles.
+					controlDist *= ((1 - angleFactor) + angleFactor * controlScaleFactor);	// Mess with this for some fine-tuning
+					float controlAngle = theta + Angle2D.PIHALF;	// The angle from the current point to control points: the new vector angle plus 90 degrees (tangent to the curve).
+
+					Vector2D controlPoint2 = new Vector2D(controlDist, 0);
+					Vector2D controlPoint1 = new Vector2D(controlDist, 0);
+					controlPoint2 = controlPoint2.GetRotated(controlAngle);
+					controlPoint1 = controlPoint1.GetRotated(controlAngle + Angle2D.PI);
+
+					// Offset control points to put them in the correct absolute position
+					controlPoint1 += p1;
+					controlPoint2 += p1;
+
+					/*
+					Haven't quite worked out how this happens, but some control points will be reversed.
+					In this case controlPoint2 will be farther from the next point than controlPoint1 is.
+					Check for that and switch them if it's true.
+					*/
+					if(Vector2D.Distance(controlPoint2, p2) > Vector2D.Distance(controlPoint1, p2))
+						controlPts.Add(new List<Vector2D> { controlPoint2, controlPoint1 });
+					else
+						controlPts.Add(new List<Vector2D> { controlPoint1, controlPoint2 });
+				}
+
+				// If this isn't a closed line, draw a regular quadratic Bézier curve from the first to second points, using the first control point of the second point
+				if(firstPt == 1) 
+				{
+					float length = (points[1] - points[0]).GetLength();
+					int numSteps = Math.Max(1, (int)Math.Round(length / targetSegmentLength));
+					CurveSegment segment = new CurveSegment();
+					segment.Start = points[0];
+					segment.CPMid = controlPts[1][0];
+					segment.End = points[1];
+					CreateQuadraticCurve(segment, numSteps);
+
+					result.Segments.Add(segment);
+				}
+
+				// Loop through points to draw cubic Bézier curves through the penultimate point, or through the last point if the line is closed.
+				for(int i = firstPt; i < lastPt - 1; i++) 
+				{
+					float length = (points[i + 1] - points[i]).GetLength();
+					int numSteps = Math.Max(1, (int)Math.Round(length / targetSegmentLength));
+
+					CurveSegment segment = new CurveSegment();
+					segment.CPStart = controlPts[i][1];
+					segment.CPEnd = controlPts[i + 1][0];
+					segment.Start = points[i];
+					segment.End = points[i + 1];
+					CreateCubicCurve(segment, numSteps);
+
+					result.Segments.Add(segment);
+				}
+
+				// If this isn't a closed line, curve to the last point using the second control point of the penultimate point.
+				if(lastPt == points.Count - 1) 
+				{
+					float length = (points[lastPt] - points[lastPt - 1]).GetLength();
+					int numSteps = Math.Max(1, (int)Math.Round(length / targetSegmentLength));
+
+					CurveSegment segment = new CurveSegment();
+					segment.Start = points[lastPt - 1];
+					segment.CPMid = controlPts[lastPt - 1][1];
+					segment.End = points[lastPt];
+					CreateQuadraticCurve(segment, numSteps);
+
+					result.Segments.Add(segment);
+				}
+
+				// create lines
+			} 
+			else if(points.Count >= 2) 
+			{
+				for(int i = 0; i < points.Count - 1; i++) 
+				{
+					CurveSegment segment = new CurveSegment();
+					segment.Start = points[i];
+					segment.End = points[i + 1];
+					segment.Points = new[] { segment.Start, segment.End };
+					segment.UpdateLength();
+					result.Segments.Add(segment);
+				}
+			}
+
+			result.UpdateShape();
+			return result;
+		}
+
+		public static void CreateQuadraticCurve(CurveSegment segment, int steps) 
+		{
+			segment.CurveType = CurveSegmentType.QUADRATIC;
+			segment.Points = GetQuadraticCurve(segment.Start, segment.CPMid, segment.End, steps);
+			segment.UpdateLength();
+		}
+
+		//this returns array of Vector2D to draw 3-point bezier curve
+		public static Vector2D[] GetQuadraticCurve(Vector2D p1, Vector2D p2, Vector2D p3, int steps) 
+		{
+			if(steps < 0) return null;
+
+			int totalSteps = steps + 1;
+			Vector2D[] points = new Vector2D[totalSteps];
+			float step = 1f / steps;
+			float curStep = 0f;
+
+			for(int i = 0; i < totalSteps; i++) 
+			{
+				points[i] = GetPointOnQuadraticCurve(p1, p2, p3, curStep);
+				curStep += step;
+			}
+
+			return points;
+		}
+
+		public static void CreateCubicCurve(CurveSegment segment, int steps) 
+		{
+			segment.CurveType = CurveSegmentType.CUBIC;
+			segment.Points = GetCubicCurve(segment.Start, segment.End, segment.CPStart, segment.CPEnd, steps);
+			segment.UpdateLength();
+		}
+
+		//this returns array of Vector2D to draw 4-point bezier curve
+		public static Vector2D[] GetCubicCurve(Vector2D p1, Vector2D p2, Vector2D cp1, Vector2D cp2, int steps) 
+		{
+			if(steps < 0) return null;
+
+			int totalSteps = steps + 1;
+			Vector2D[] points = new Vector2D[totalSteps];
+			float step = 1f / steps;
+			float curStep = 0f;
+
+			for(int i = 0; i < totalSteps; i++) 
+			{
+				points[i] = GetPointOnCubicCurve(p1, p2, cp1, cp2, curStep);
+				curStep += step;
+			}
+			return points;
+		}
+
+		public static Vector2D GetPointOnCurve(CurveSegment segment, float delta) 
+		{
+			if(segment.CurveType == CurveSegmentType.QUADRATIC)
+				return GetPointOnQuadraticCurve(segment.Start, segment.CPMid, segment.End, delta);
+
+			if(segment.CurveType == CurveSegmentType.CUBIC)
+				return GetPointOnCubicCurve(segment.Start, segment.End, segment.CPStart, segment.CPEnd, delta);
+
+			if(segment.CurveType == CurveSegmentType.LINE)
+				return GetPointOnLine(segment.Start, segment.End, delta);
+
+			throw new Exception("GetPointOnCurve: got unknown curve type: " + segment.CurveType);
+		}
+
+		public static Vector2D GetPointOnQuadraticCurve(Vector2D p1, Vector2D p2, Vector2D p3, float delta) 
+		{
+			float invDelta = 1f - delta;
+
+			float m1 = invDelta * invDelta;
+			float m2 = 2 * invDelta * delta;
+			float m3 = delta * delta;
+
+			int px = (int)(m1 * p1.x + m2 * p2.x + m3 * p3.x);
+			int py = (int)(m1 * p1.y + m2 * p2.y + m3 * p3.y);
+
+			return new Vector2D(px, py);
+		}
+
+		public static Vector2D GetPointOnCubicCurve(Vector2D p1, Vector2D p2, Vector2D cp1, Vector2D cp2, float delta) 
+		{
+			float invDelta = 1f - delta;
+
+			float m1 = invDelta * invDelta * invDelta;
+			float m2 = 3 * delta * invDelta * invDelta;
+			float m3 = 3 * delta * delta * invDelta;
+			float m4 = delta * delta * delta;
+
+			int px = (int)Math.Round(m1 * p1.x + m2 * cp1.x + m3 * cp2.x + m4 * p2.x);
+			int py = (int)Math.Round(m1 * p1.y + m2 * cp1.y + m3 * cp2.y + m4 * p2.y);
+
+			return new Vector2D(px, py);
+		}
+
+		//it's basically 2-point bezier curve
+		public static Vector2D GetPointOnLine(Vector2D p1, Vector2D p2, float delta) 
+		{
+			return new Vector2D((int)((1f - delta) * p1.x + delta * p2.x), (int)((1f - delta) * p1.y + delta * p2.y));
+		}
+	}
+
+	public class Curve
+	{
+		public List<CurveSegment> Segments;
+		public List<Vector2D> Shape;
+		public float Length;
+
+		public Curve() 
+		{
+			Segments = new List<CurveSegment>();
+		}
+
+		public void UpdateShape() 
+		{
+			Shape = new List<Vector2D>();
+			Length = 0;
+
+			foreach(CurveSegment segment in Segments) 
+			{
+				Length += segment.Length;
+
+				foreach(Vector2D point in segment.Points) 
+				{
+					if(Shape.Count == 0 || point != Shape[Shape.Count - 1])
+						Shape.Add(point);
+				}
+			}
+
+			/*float curDelta = 0;
+			for(int i = 0; i < Segments.Count; i++) 
+			{
+				Segments[i].Delta = Segments[i].Length / Length;
+				curDelta += Segments[i].Delta;
+				Segments[i].GlobalDelta = curDelta;
+			}*/
+		}
+	}
+
+	public class CurveSegment
+	{
+		public Vector2D[] Points;
+		public Vector2D Start;
+		public Vector2D End;
+		public Vector2D CPStart;
+		public Vector2D CPMid;
+		public Vector2D CPEnd;
+		public float Length;
+		//public float Delta; //length of this segment / total curve length
+		//public float GlobalDelta; //length of this segment / total curve length + deltas of previous segments
+		public CurveSegmentType CurveType;
+
+		public void UpdateLength() 
+		{
+			if(Points.Length < 2)
+				return;
+
+			Length = 0;
+			for(int i = 1; i < Points.Length; i++)
+				Length += Vector2D.Distance(Points[i], Points[i - 1]);
+		}
+	}
+
+	public enum CurveSegmentType
+	{
+		LINE,
+		QUADRATIC,
+		CUBIC,
+	}
+}
diff --git a/Source/Core/Geometry/DrawnVertex.cs b/Source/Core/Geometry/DrawnVertex.cs
new file mode 100644
index 0000000..972fb71
--- /dev/null
+++ b/Source/Core/Geometry/DrawnVertex.cs
@@ -0,0 +1,29 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Geometry
+{
+	public struct DrawnVertex
+	{
+		public Vector2D pos;
+		public bool stitch;
+		public bool stitchline;
+	}
+}
diff --git a/Source/Core/Geometry/EarClipPolygon.cs b/Source/Core/Geometry/EarClipPolygon.cs
new file mode 100644
index 0000000..c8cc7f1
--- /dev/null
+++ b/Source/Core/Geometry/EarClipPolygon.cs
@@ -0,0 +1,194 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Geometry
+{
+	public sealed class EarClipPolygon : LinkedList<EarClipVertex>
+	{
+		#region ================== Variables
+
+		// Tree variables
+		private List<EarClipPolygon> children;
+		private bool inner;
+
+		#endregion
+
+		#region ================== Properties
+
+		public List<EarClipPolygon> Children { get { return children; } }
+		public bool Inner { get { return inner; } set { inner = value; } }
+
+		#endregion
+
+		#region ================== Constructors
+
+		// Constructor
+		internal EarClipPolygon()
+		{
+			// Initialize
+			children = new List<EarClipPolygon>();
+		}
+
+		// Constructor
+		internal EarClipPolygon(EarClipPolygon p, EarClipVertex add) : base(p)
+		{
+			// Initialize
+			base.AddLast(add);
+			children = new List<EarClipPolygon>();
+		}
+
+		#endregion
+		
+		#region ================== Methods
+
+		// This merges a polygon into this one
+		public void Add(EarClipPolygon p)
+		{
+			// Initialize
+			foreach(EarClipVertex v in p) base.AddLast(v);
+		}
+
+		// This calculates the area
+		public float CalculateArea()
+		{
+			// Multiply the x coordinate of each vertex by the y coordinate of the next vertex.
+			// Multiply the y coordinate of each vertex by the x coordinate of the next vertex.
+			// Subtract these.
+			float result = 0.0f;
+			int firstcalculated = 0;
+			LinkedListNode<EarClipVertex> n1 = base.First;
+			while(firstcalculated < 2)
+			{
+				LinkedListNode<EarClipVertex> n2 = n1.Next ?? base.First;
+				float a = n1.Value.Position.x * n2.Value.Position.y;
+				float b = n1.Value.Position.y * n2.Value.Position.x;
+				result += a - b;
+				n1 = n2;
+				if(n2 == base.First) firstcalculated++;
+			}
+			return Math.Abs(result / 2.0f);
+		}
+		
+		// This creates a bounding box from the outer polygon
+		public RectangleF CreateBBox()
+		{
+			float left = float.MaxValue;
+			float right = float.MinValue;
+			float top = float.MaxValue;
+			float bottom = float.MinValue;
+			foreach(EarClipVertex v in this)
+			{
+				if(v.Position.x < left) left = v.Position.x;
+				if(v.Position.x > right) right = v.Position.x;
+				if(v.Position.y < top) top = v.Position.y;
+				if(v.Position.y > bottom) bottom = v.Position.y;
+			}
+			return new RectangleF(left, top, right - left, bottom - top);
+		}
+		
+		// Point inside the polygon?
+		// See: http://local.wasp.uwa.edu.au/~pbourke/geometry/insidepoly/
+		public bool Intersect(Vector2D p)
+		{
+			Vector2D v1 = base.Last.Value.Position;
+			LinkedListNode<EarClipVertex> n = base.First;
+			uint c = 0;
+			
+			// Go for all vertices
+			while(n != null)
+			{
+				// Get next vertex
+				Vector2D v2 = n.Value.Position;
+
+				// Determine min/max values
+				float miny = Math.Min(v1.y, v2.y);
+				float maxy = Math.Max(v1.y, v2.y);
+				float maxx = Math.Max(v1.x, v2.x);
+
+				// Check for intersection
+				if((p.y > miny) && (p.y <= maxy))
+				{
+					if(p.x <= maxx)
+					{
+						if(v1.y != v2.y)
+						{
+							float xint = (p.y - v1.y) * (v2.x - v1.x) / (v2.y - v1.y) + v1.x;
+							if((v1.x == v2.x) || (p.x <= xint)) c++;
+						}
+					}
+				}
+				
+				// Move to next
+				v1 = v2;
+				n = n.Next;
+			}
+
+			// Inside this polygon?
+			if((c & 0x00000001UL) != 0)
+			{
+				// Check if not inside the children
+				foreach(EarClipPolygon child in children)
+				{
+					// Inside this child? Then it is not inside this polygon.
+					if(child.Intersect(p)) return false;
+				}
+
+				// Inside polygon!
+				return true;
+			}
+			else
+			{
+				// Not inside the polygon
+				return false;
+			}
+		}
+		
+		// This inserts a polygon if it is a child of this one
+		public bool InsertChild(EarClipPolygon p)
+		{
+			// Polygon must have at least 1 vertex
+			if(p.Count == 0) return false;
+			
+			// Check if it can be inserted at a lower level
+			foreach(EarClipPolygon child in children)
+			{
+				if(child.InsertChild(p)) return true;
+			}
+
+			// Check if it can be inserted here
+			if(this.Intersect(p.First.Value.Position))
+			{
+				// Make the polygon the inverse of this one
+				p.Inner = !inner;
+				children.Add(p);
+				return true;
+			}
+
+			// Can't insert it as a child
+			return false;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Geometry/EarClipVertex.cs b/Source/Core/Geometry/EarClipVertex.cs
new file mode 100644
index 0000000..64203ce
--- /dev/null
+++ b/Source/Core/Geometry/EarClipVertex.cs
@@ -0,0 +1,153 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Map;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Geometry
+{
+	public sealed class EarClipVertex
+	{
+		#region ================== Variables
+		
+		// Position
+		private Vector2D pos;
+		
+		// Along a sidedef?
+		private Sidedef sidedef;
+		
+		// Lists
+		private LinkedListNode<EarClipVertex> vertslink;
+		private LinkedListNode<EarClipVertex> reflexlink;
+		private LinkedListNode<EarClipVertex> eartiplink;
+		
+		#endregion
+
+		#region ================== Properties
+
+		public Vector2D Position { get { return pos; } }
+		internal LinkedListNode<EarClipVertex> MainListNode { get { return vertslink; } }
+		public bool IsReflex { get { return (reflexlink != null); } }
+		public bool IsEarTip { get { return (eartiplink != null); } }
+		internal Sidedef Sidedef { get { return sidedef; } set { sidedef = value; } }
+		
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Copy constructor
+		internal EarClipVertex(EarClipVertex v)
+		{
+			// Initialize
+			this.pos = v.pos;
+			this.sidedef = v.sidedef;
+
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Copy constructor
+		internal EarClipVertex(EarClipVertex v, Sidedef sidedef)
+		{
+			// Initialize
+			this.pos = v.pos;
+			this.sidedef = sidedef;
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Constructor
+		internal EarClipVertex(Vector2D v, Sidedef sidedef)
+		{
+			// Initialize
+			this.pos = v;
+			this.sidedef = sidedef;
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Disposer
+		internal void Dispose()
+		{
+			reflexlink = null;
+			eartiplink = null;
+			vertslink = null;
+			sidedef = null;
+		}
+		
+		#endregion
+
+		#region ================== Methods
+
+		// This sets the main linked list node
+		internal void SetVertsLink(LinkedListNode<EarClipVertex> link)
+		{
+			this.vertslink = link;
+		}
+		
+		// This removes the item from all lists
+		internal void Remove()
+		{
+			vertslink.List.Remove(vertslink);
+			if(reflexlink != null) reflexlink.List.Remove(reflexlink);
+			if(eartiplink != null) eartiplink.List.Remove(eartiplink);
+			reflexlink = null;
+			eartiplink = null;
+			vertslink = null;
+		}
+
+		// This adds to reflexes list
+		public void AddReflex(LinkedList<EarClipVertex> reflexes)
+		{
+			#if DEBUG
+			if(vertslink == null) throw new Exception();
+			#endif
+			if(reflexlink == null) reflexlink = reflexes.AddLast(this);
+		}
+
+		// This removes from reflexes list
+		internal void RemoveReflex()
+		{
+			if(reflexlink != null) reflexlink.List.Remove(reflexlink);
+			reflexlink = null;
+		}
+
+		// This adds to eartips list
+		internal void AddEarTip(LinkedList<EarClipVertex> eartips)
+		{
+			#if DEBUG
+			if(vertslink == null) throw new Exception();
+			#endif
+			if(eartiplink == null) eartiplink = eartips.AddLast(this);
+		}
+
+		// This removes from eartips list
+		internal void RemoveEarTip()
+		{
+			if(eartiplink != null) eartiplink.List.Remove(eartiplink);
+			eartiplink = null;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Geometry/InterpolationTools.cs b/Source/Core/Geometry/InterpolationTools.cs
new file mode 100644
index 0000000..7ca42aa
--- /dev/null
+++ b/Source/Core/Geometry/InterpolationTools.cs
@@ -0,0 +1,70 @@
+using System;
+using CodeImp.DoomBuilder.Rendering;
+
+namespace CodeImp.DoomBuilder.Geometry
+{
+	public static class InterpolationTools
+	{
+		public enum Mode
+		{
+			LINEAR,
+			EASE_IN_OUT_SINE,
+			EASE_IN_SINE,
+			EASE_OUT_SINE,
+		}
+
+		public static int Interpolate(float val1, float val2, float delta, Mode mode)
+		{
+			switch(mode)
+			{
+				case Mode.LINEAR: return Linear(val1, val2, delta);
+				case Mode.EASE_IN_SINE: return EaseInSine(val1, val2, delta);
+				case Mode.EASE_OUT_SINE: return EaseOutSine(val1, val2, delta);
+				case Mode.EASE_IN_OUT_SINE: return EaseInOutSine(val1, val2, delta);
+				default: throw new NotImplementedException("InterpolationTools.Interpolate: '" + mode + "' mode is not supported!");
+			}
+		}
+		
+		//Based on Robert Penner's original easing equations (http://www.robertpenner.com/easing/)
+		public static int Linear(float val1, float val2, float delta)
+		{
+			return (int)Math.Round(delta * val2 + (1.0f - delta) * val1);
+		}
+		
+		/**
+		 * Easing equation function for a sinusoidal (sin(t)) easing in: accelerating from zero velocity.
+		 */
+		public static int EaseInSine(float val1, float val2, float delta) 
+		{
+			float f_val1 = val1;
+			float f_val2 = val2 - f_val1;
+			return (int)Math.Round(-f_val2 * Math.Cos(delta * Angle2D.PIHALF) + f_val2 + f_val1);
+		}
+
+		/**
+		 * Easing equation function for a sinusoidal (sin(t)) easing out: decelerating from zero velocity.
+		 */
+		public static int EaseOutSine(float val1, float val2, float delta) 
+		{
+			return (int)Math.Round((val2 - val1) * Math.Sin(delta * Angle2D.PIHALF) + val1);
+		}
+
+		/**
+		 * Easing equation function for a sinusoidal (sin(t)) easing in/out: acceleration until halfway, then deceleration.
+		 */
+		public static int EaseInOutSine(float val1, float val2, float delta)
+		{
+			return (int)Math.Round(-(val2 - val1) / 2 * (float)(Math.Cos(Math.PI * delta) - 1) + val1);
+		}
+
+		//mxd
+		public static int InterpolateColor(PixelColor c1, PixelColor c2, float delta)
+		{
+			float invdelta = 1.0f - delta;
+			byte r = (byte)(c1.r * delta + c2.r * invdelta);
+			byte g = (byte)(c1.g * delta + c2.g * invdelta);
+			byte b = (byte)(c1.b * delta + c2.b * invdelta);
+			return new PixelColor(255, r, g, b).ToInt();
+		}
+	}
+}
diff --git a/Source/Core/Geometry/LabelPositionInfo.cs b/Source/Core/Geometry/LabelPositionInfo.cs
new file mode 100644
index 0000000..fc14e7f
--- /dev/null
+++ b/Source/Core/Geometry/LabelPositionInfo.cs
@@ -0,0 +1,36 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Geometry
+{
+	public struct LabelPositionInfo
+	{
+		// Members
+		public Vector2D position;
+		public float radius;
+		
+		// Constructor
+		public LabelPositionInfo(Vector2D position, float radius)
+		{
+			this.position = position;
+			this.radius = radius;
+		}
+	}
+}
diff --git a/Source/Core/Geometry/Line2D.cs b/Source/Core/Geometry/Line2D.cs
new file mode 100644
index 0000000..abd1479
--- /dev/null
+++ b/Source/Core/Geometry/Line2D.cs
@@ -0,0 +1,282 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Geometry
+{
+	public struct Line2D
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		// Coordinates
+		public Vector2D v1;
+		public Vector2D v2;
+		
+		#endregion
+		
+		#region ================== Constructors
+		
+		// Constructor
+		public Line2D(Vector2D v1, Vector2D v2)
+		{
+			this.v1 = v1;
+			this.v2 = v2;
+		}
+		
+		// Constructor
+		public Line2D(Vector2D v1, float x2, float y2)
+		{
+			this.v1 = v1;
+			this.v2 = new Vector2D(x2, y2);
+		}
+
+		// Constructor
+		public Line2D(float x1, float y1, Vector2D v2)
+		{
+			this.v1 = new Vector2D(x1, y1);
+			this.v2 = v2;
+		}
+		
+		// Constructor
+		public Line2D(float x1, float y1, float x2, float y2)
+		{
+			this.v1 = new Vector2D(x1, y1);
+			this.v2 = new Vector2D(x2, y2);
+		}
+		
+		#endregion
+
+		#region ================== Statics
+
+		// This calculates the length
+		public static float GetLength(float dx, float dy)
+		{
+			// Calculate and return the length
+			return (float)Math.Sqrt(GetLengthSq(dx, dy));
+		}
+
+		// This calculates the square of the length
+		public static float GetLengthSq(float dx, float dy)
+		{
+			// Calculate and return the length
+			return dx * dx + dy * dy;
+		}
+
+		// This calculates the normal of a line
+		public static Vector2D GetNormal(float dx, float dy)
+		{
+			return new Vector2D(dx, dy).GetNormal();
+		}
+
+		//mxd. This tests if given lines intersects
+		public static bool GetIntersection(Line2D line1, Line2D line2) 
+		{
+			return GetIntersection(line1.v1, line1.v2, line2.v1.x, line2.v1.y, line2.v2.x, line2.v2.y);
+		}
+
+		// This tests if the line intersects with the given line coordinates
+		public static bool GetIntersection(Vector2D v1, Vector2D v2, float x3, float y3, float x4, float y4)
+		{
+			float u_ray, u_line;
+			return GetIntersection(v1, v2, x3, y3, x4, y4, out u_ray, out u_line);
+		}
+
+		// This tests if the line intersects with the given line coordinates
+		public static bool GetIntersection(Vector2D v1, Vector2D v2, float x3, float y3, float x4, float y4, out float u_ray)
+		{
+			float u_line;
+			return GetIntersection(v1, v2, x3, y3, x4, y4, out u_ray, out u_line);
+		}
+
+		// This tests if the line intersects with the given line coordinates
+		public static bool GetIntersection(Vector2D v1, Vector2D v2, float x3, float y3, float x4, float y4, out float u_ray, out float u_line)
+		{
+			// Calculate divider
+			float div = (y4 - y3) * (v2.x - v1.x) - (x4 - x3) * (v2.y - v1.y);
+
+			// Can this be tested?
+			if(div != 0.0f)
+			{
+				// Calculate the intersection distance from the line
+				u_line = ((x4 - x3) * (v1.y - y3) - (y4 - y3) * (v1.x - x3)) / div;
+
+				// Calculate the intersection distance from the ray
+				u_ray = ((v2.x - v1.x) * (v1.y - y3) - (v2.y - v1.y) * (v1.x - x3)) / div;
+
+				// Return if intersecting
+				if(u_ray < 0.0f || u_ray > 1.0f || u_line < 0.0f || u_line > 1.0f) return false; //mxd
+				return true;
+			}
+
+			// Unable to detect intersection
+			u_line = float.NaN;
+			u_ray = float.NaN;
+			return false;
+		}
+
+		// This tests on which side of the line the given coordinates are
+		// returns < 0 for front (right) side, > 0 for back (left) side and 0 if on the line
+		public static float GetSideOfLine(Vector2D v1, Vector2D v2, Vector2D p)
+		{
+			// Calculate and return side information
+			return (p.y - v1.y) * (v2.x - v1.x) - (p.x - v1.x) * (v2.y - v1.y);
+		}
+
+		// This returns the shortest distance from given coordinates to line
+		public static float GetDistanceToLine(Vector2D v1, Vector2D v2, Vector2D p, bool bounded)
+		{
+			return (float)Math.Sqrt(GetDistanceToLineSq(v1, v2, p, bounded));
+		}
+
+		// This returns the shortest distance from given coordinates to line
+		public static float GetDistanceToLineSq(Vector2D v1, Vector2D v2, Vector2D p, bool bounded)
+		{
+			// Calculate intersection offset
+			float u = ((p.x - v1.x) * (v2.x - v1.x) + (p.y - v1.y) * (v2.y - v1.y)) / GetLengthSq(v2.x - v1.x, v2.y - v1.y);
+
+			if(bounded)
+			{
+				/*
+				// Limit intersection offset to the line
+				float lbound = 1f / GetLength(v2.x - v1.x, v2.y - v1.y);
+				float ubound = 1f - lbound;
+				if(u < lbound) u = lbound;
+				if(u > ubound) u = ubound;
+				*/
+				if(u < 0f) u = 0f; else if(u > 1f) u = 1f;
+			}
+
+			// Calculate intersection point
+			Vector2D i = v1 + u * (v2 - v1);
+
+			// Return distance between intersection and point
+			// which is the shortest distance to the line
+			float ldx = p.x - i.x;
+			float ldy = p.y - i.y;
+			return ldx * ldx + ldy * ldy;
+		}
+
+		// This returns the offset coordinates on the line nearest to the given coordinates
+		public static float GetNearestOnLine(Vector2D v1, Vector2D v2, Vector2D p)
+		{
+			// Calculate and return intersection offset
+			return ((p.x - v1.x) * (v2.x - v1.x) + (p.y - v1.y) * (v2.y - v1.y)) / GetLengthSq(v2.x - v1.x, v2.y - v1.y);
+		}
+
+		// This returns the coordinates at a specific position on the line
+		public static Vector2D GetCoordinatesAt(Vector2D v1, Vector2D v2, float u)
+		{
+			// Calculate and return intersection offset
+			return new Vector2D(v1.x + u * (v2.x - v1.x), v1.y + u * (v2.y - v1.y));
+		}
+		
+		#endregion
+
+		#region ================== Methods
+
+		// This returns the perpendicular vector by simply making a normal
+		public Vector2D GetPerpendicular()
+		{
+			Vector2D d = GetDelta();
+			return new Vector2D(-d.y, d.x);
+		}
+
+		// This calculates the angle
+		public float GetAngle()
+		{
+			// Calculate and return the angle
+			Vector2D d = GetDelta();
+			return -(float)Math.Atan2(-d.y, d.x) + Angle2D.PIHALF;
+		}
+		
+		public Vector2D GetDelta() { return v2 - v1; }
+		
+		public float GetLength() { return Line2D.GetLength(v2.x - v1.x, v2.y - v1.y); }
+		public float GetLengthSq() { return Line2D.GetLengthSq(v2.x - v1.x, v2.y - v1.y); }
+
+		// Output
+		public override string ToString()
+		{
+			return "(" + v1 + ") - (" + v2 + ")";
+		}
+		
+		public bool GetIntersection(float x3, float y3, float x4, float y4)
+		{
+			return Line2D.GetIntersection(v1, v2, x3, y3, x4, y4);
+		}
+
+		public bool GetIntersection(float x3, float y3, float x4, float y4, out float u_ray)
+		{
+			return Line2D.GetIntersection(v1, v2, x3, y3, x4, y4, out u_ray);
+		}
+
+		public bool GetIntersection(float x3, float y3, float x4, float y4, out float u_ray, out float u_line)
+		{
+			return Line2D.GetIntersection(v1, v2, x3, y3, x4, y4, out u_ray, out u_line);
+		}
+
+		public bool GetIntersection(Line2D ray)
+		{
+			return Line2D.GetIntersection(v1, v2, ray.v1.x, ray.v1.y, ray.v2.x, ray.v2.y);
+		}
+
+		public bool GetIntersection(Line2D ray, out float u_ray)
+		{
+			return Line2D.GetIntersection(v1, v2, ray.v1.x, ray.v1.y, ray.v2.x, ray.v2.y, out u_ray);
+		}
+
+		public bool GetIntersection(Line2D ray, out float u_ray, out float u_line)
+		{
+			return Line2D.GetIntersection(v1, v2, ray.v1.x, ray.v1.y, ray.v2.x, ray.v2.y, out u_ray, out u_line);
+		}
+
+		public float GetSideOfLine(Vector2D p)
+		{
+			return Line2D.GetSideOfLine(v1, v2, p);
+		}
+
+		public float GetDistanceToLine(Vector2D p, bool bounded)
+		{
+			return Line2D.GetDistanceToLine(v1, v2, p, bounded);
+		}
+
+		public float GetDistanceToLineSq(Vector2D p, bool bounded)
+		{
+			return Line2D.GetDistanceToLineSq(v1, v2, p, bounded);
+		}
+
+		public float GetNearestOnLine(Vector2D p)
+		{
+			return Line2D.GetNearestOnLine(v1, v2, p);
+		}
+
+		public Vector2D GetCoordinatesAt(float u)
+		{
+			return Line2D.GetCoordinatesAt(v1, v2, u);
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Geometry/LinedefAngleSorter.cs b/Source/Core/Geometry/LinedefAngleSorter.cs
new file mode 100644
index 0000000..8cf27c4
--- /dev/null
+++ b/Source/Core/Geometry/LinedefAngleSorter.cs
@@ -0,0 +1,86 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Map;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Geometry
+{
+	public sealed class LinedefAngleSorter : IComparer<Linedef>
+	{
+		// Variables
+		private readonly Linedef baseline;
+		private readonly bool front;
+		private readonly Vertex basevertex;
+
+		// Constructor
+		public LinedefAngleSorter(Linedef baseline, bool front, Vertex fromvertex)
+		{
+			// Initialize
+			this.baseline = baseline;
+			this.basevertex = fromvertex;
+			
+			// Determine rotation direction
+			if(baseline.End == basevertex) this.front = !front; else this.front = front;
+
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// This calculates the relative angle between two lines
+		private float CalculateRelativeAngle(Linedef a, Linedef b)
+		{
+			// Determine angles
+			float ana = a.Angle; if(a.End == basevertex) ana += Angle2D.PI;
+			float anb = b.Angle; if(b.End == basevertex) anb += Angle2D.PI;
+			
+			// Take the difference from angles
+			float n = Angle2D.Difference(ana, anb);
+			
+			// Get line end vertices a and b that are not connected to basevertex
+			Vector2D va = (a.Start == basevertex ? a.End.Position : a.Start.Position);
+			Vector2D vb = (b.Start == basevertex ? b.End.Position : b.Start.Position);
+			
+			// Check to which side the angle goes and adjust angle as needed
+			float s = Line2D.GetSideOfLine(va, vb, basevertex.Position);
+			if(((s < 0) && front) || ((s > 0) && !front)) n = Angle2D.PI2 - n;
+			
+			// Return result
+			return n;
+		}
+		
+		// Comparer
+		public int Compare(Linedef x, Linedef y)
+		{
+			// Calculate angles
+			float ax = CalculateRelativeAngle(baseline, x);
+			float ay = CalculateRelativeAngle(baseline, y);
+			
+			// Compare results
+			/*
+			if(ax < ay) return 1;
+			else if(ax > ay) return -1;
+			else return 0;
+			*/
+			return Math.Sign(ay - ax);
+		}
+	}
+}
diff --git a/Source/Core/Geometry/LinedefSide.cs b/Source/Core/Geometry/LinedefSide.cs
new file mode 100644
index 0000000..a4768b6
--- /dev/null
+++ b/Source/Core/Geometry/LinedefSide.cs
@@ -0,0 +1,108 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using CodeImp.DoomBuilder.Map;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Geometry
+{
+	/// <summary>
+	/// This is used to indicate a side of a line without the need for a sidedef.
+	/// </summary>
+	public sealed class LinedefSide
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		private Linedef line;
+		private bool front;
+		
+		#endregion
+
+		#region ================== Properties
+
+		public Linedef Line { get { return line; } set { line = value; } }
+		public bool Front { get { return front; } set { front = value; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		/// <summary>
+		/// This is used to indicate a side of a line without the need for a sidedef.
+		/// </summary>
+		public LinedefSide(Linedef line, bool front)
+		{
+			// Initialize
+			this.line = line;
+			this.front = front;
+		}
+
+		/// <summary>
+		/// This makes a copy of the linedef side.
+		/// </summary>
+		public LinedefSide(LinedefSide original)
+		{
+			// Initialize
+			this.line = original.line;
+			this.front = original.front;
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This compares a linedef side
+		public static bool operator ==(LinedefSide a, LinedefSide b)
+		{
+			if((object.Equals(a, null)) && (object.Equals(b, null))) return true;
+			if((!object.Equals(a, null)) && (object.Equals(b, null))) return false;
+			if(object.Equals(a, null)) return false;
+			return (a.line == b.line) && (a.front == b.front);
+		}
+
+		// This compares a linedef side
+		public static bool operator !=(LinedefSide a, LinedefSide b)
+		{
+			if((object.Equals(a, null)) && (object.Equals(b, null))) return false;
+			if((!object.Equals(a, null)) && (object.Equals(b, null))) return true;
+			if(object.Equals(a, null)) return true;
+			return (a.line != b.line) || (a.front != b.front);
+		}
+
+		//mxd. Addeed to make compiler a bit more happy...
+		public override int GetHashCode() 
+		{
+			return base.GetHashCode();
+		}
+
+		//mxd. Addeed to make compiler a bit more happy...
+		public override bool Equals(object obj) 
+		{
+			if(object.Equals(obj, null)) return false;
+			LinedefSide other = (LinedefSide)obj;
+			return (this.line == other.line) && (this.front == other.front);
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Geometry/LinedefsTracePath.cs b/Source/Core/Geometry/LinedefsTracePath.cs
new file mode 100644
index 0000000..f485701
--- /dev/null
+++ b/Source/Core/Geometry/LinedefsTracePath.cs
@@ -0,0 +1,126 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Map;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Geometry
+{
+	public sealed class LinedefTracePath : List<Linedef>
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		#endregion
+
+		#region ================== Properties
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public LinedefTracePath()
+		{
+			// Initialize
+		}
+
+		// Constructor
+		public LinedefTracePath(IEnumerable<Linedef> lines) : base(lines)
+		{
+			// Initialize
+		}
+
+		// Constructor
+		public LinedefTracePath(ICollection<LinedefSide> lines) : base(lines.Count)
+		{
+			// Initialize
+			foreach(LinedefSide ls in lines) base.Add(ls.Line);
+		}
+
+		// Constructor
+		public LinedefTracePath(LinedefTracePath p, Linedef add) : base(p)
+		{
+			// Initialize
+			base.Add(add);
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This checks if the polygon is closed
+		public bool CheckIsClosed()
+		{
+			// There must be at least 2 sidedefs
+			if(base.Count > 1)
+			{
+				// The end sidedef must share a vertex with the first
+				return (base[0].Start == base[base.Count - 1].Start) ||
+					   (base[0].Start == base[base.Count - 1].End) ||
+					   (base[0].End == base[base.Count - 1].Start) ||
+					   (base[0].End == base[base.Count - 1].End);
+			}
+			else
+			{
+				// Not closed
+				return false;
+			}
+		}
+		
+		// This makes a polygon from the path
+		public EarClipPolygon MakePolygon(bool startfront)
+		{
+			EarClipPolygon p = new EarClipPolygon();
+			bool forward = startfront;
+			
+			// Any sides at all?
+			if(base.Count > 0)
+			{
+				if(forward)
+					p.AddLast(new EarClipVertex(base[0].Start.Position, base[0].Front));
+				else
+					p.AddLast(new EarClipVertex(base[0].End.Position, base[0].Back));
+				
+				// Add all lines, but the first
+				for(int i = 1; i < base.Count; i++)
+				{
+					// Traverse direction changes?
+					if((base[i - 1].Start == base[i].Start) ||
+					   (base[i - 1].End == base[i].End))
+						forward = !forward;
+
+					// Add next vertex
+					if(forward)
+						p.AddLast(new EarClipVertex(base[i].Start.Position, base[i].Front));
+					else
+						p.AddLast(new EarClipVertex(base[i].End.Position, base[i].Back));
+				}
+			}
+			
+			return p;
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Geometry/Plane.cs b/Source/Core/Geometry/Plane.cs
new file mode 100644
index 0000000..23d3e87
--- /dev/null
+++ b/Source/Core/Geometry/Plane.cs
@@ -0,0 +1,177 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Geometry
+{
+	public struct Plane
+	{
+		#region ================== Constants
+		
+		#endregion
+		
+		#region ================== Variables
+		
+		//
+		// Plane definition:
+		// A * x + B * y + C * z + D = 0
+		//
+		// A, B, C is the normal
+		// D is the offset along the normal (negative)
+		//
+		private Vector3D normal;
+		private float offset;
+		
+		#endregion
+		
+		#region ================== Properties
+		
+		public Vector3D Normal { get { return normal; } }
+		public float Offset { get { return offset; } set { offset = value; } }
+		public float a { get { return normal.x; } }
+		public float b { get { return normal.y; } }
+		public float c { get { return normal.z; } }
+		public float d { get { return offset; } set { offset = value; } }
+		
+		#endregion
+		
+		#region ================== Constructors
+		
+		/// <summary></summary>
+		public Plane(Vector3D normal, float offset)
+		{
+			#if DEBUG
+				if(!normal.IsNormalized())
+					throw new NotSupportedException("Attempt to create a plane with a vector that is not normalized!"); // General.Fail("Attempt to create a plane with a vector that is not normalized!");
+			#endif
+			this.normal = normal;
+			this.offset = offset;
+		}
+
+		/// <summary></summary>
+		public Plane(Vector3D normal, Vector3D position)
+		{
+			#if DEBUG
+				if(!normal.IsNormalized())
+					throw new NotSupportedException("Attempt to create a plane with a vector that is not normalized!"); //General.Fail("Attempt to create a plane with a vector that is not normalized!");
+			#endif
+			this.normal = normal;
+			this.offset = -Vector3D.DotProduct(normal, position);
+		}
+
+		/// <summary></summary>
+		public Plane(Vector3D p1, Vector3D p2, Vector3D p3, bool up)
+		{
+			this.normal = Vector3D.CrossProduct(p2 - p1, p3 - p1).GetNormal();
+			
+			if((up && (this.normal.z < 0.0f)) || (!up && (this.normal.z > 0.0f)))
+				this.normal = -this.normal;
+			
+			this.offset = -Vector3D.DotProduct(normal, p3);
+		}
+
+		/// <summary></summary>
+		public Plane(Vector3D center, float anglexy, float anglez, bool up) //mxd
+		{
+			Vector2D point = new Vector2D(center.x + (float)Math.Cos(anglexy) * (float)Math.Sin(anglez), center.y + (float)Math.Sin(anglexy) * (float)Math.Sin(anglez));
+			Vector2D perpendicular = new Line2D(center, point).GetPerpendicular();
+
+			Vector3D p2 = new Vector3D(point.x + perpendicular.x, point.y + perpendicular.y, center.z + (float)Math.Cos(anglez));
+			Vector3D p3 = new Vector3D(point.x - perpendicular.x, point.y - perpendicular.y, center.z + (float)Math.Cos(anglez));
+
+			this.normal = Vector3D.CrossProduct(p2 - center, p3 - center).GetNormal();
+
+			if((up && (this.normal.z < 0.0f)) || (!up && (this.normal.z > 0.0f)))
+				this.normal = -this.normal;
+
+			this.offset = -Vector3D.DotProduct(normal, p3);
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+		
+		/// <summary>
+		/// This tests for intersection with a line.
+		/// See http://local.wasp.uwa.edu.au/~pbourke/geometry/planeline/
+		/// </summary>
+		public bool GetIntersection(Vector3D from, Vector3D to, ref float u_ray)
+		{
+			float w = Vector3D.DotProduct(normal, from - to);
+			if(w != 0.0f)
+			{
+				float v = Vector3D.DotProduct(normal, from);
+				u_ray = (offset + v) / w;
+				return true;
+			}
+			else
+			{
+				return false;
+			}
+		}
+		
+		/// <summary>
+		/// This returns the smallest distance to the plane and the side on which the point lies.
+		/// Greater than 0 means the point lies on the front of the plane
+		/// Less than 0 means the point lies behind the plane
+		/// See http://mathworld.wolfram.com/Point-PlaneDistance.html
+		/// </summary>
+		public float Distance(Vector3D p)
+		{
+			return Vector3D.DotProduct(normal, p) + offset;
+		}
+		
+		/// <summary>
+		/// This returns a point on the plane closest to the given point
+		/// </summary>
+		public Vector3D ClosestOnPlane(Vector3D p)
+		{
+			float d = this.Distance(p);
+			return p - normal * d;
+		}
+
+		/// <summary>
+		/// This returns Z on the plane at X, Y
+		/// </summary>
+		public float GetZ(Vector2D pos)
+		{
+			return (-offset - Vector2D.DotProduct(normal, pos)) / normal.z;
+		}
+
+		/// <summary>
+		/// This returns Z on the plane at X, Y
+		/// </summary>
+		public float GetZ(float x, float y)
+		{
+			return (-offset - (normal.x * x + normal.y * y)) / normal.z;
+		}
+
+		/// <summary>
+		/// This inverts the plane
+		/// </summary>
+		public Plane GetInverted()
+		{
+			return new Plane(-normal, -offset);
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Geometry/ProjectedFrustum2D.cs b/Source/Core/Geometry/ProjectedFrustum2D.cs
new file mode 100644
index 0000000..eb77efc
--- /dev/null
+++ b/Source/Core/Geometry/ProjectedFrustum2D.cs
@@ -0,0 +1,151 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Geometry
+{
+	public class ProjectedFrustum2D
+	{
+		#region ================== Variables
+		
+		// Frustum settings
+		private readonly float near;
+		private readonly float far;
+		private readonly float fov;
+		private readonly Vector2D pos;
+		private readonly float xyangle;
+		private readonly float zangle;
+		
+		// Frustum lines
+		private readonly Line2D[] lines;
+
+		// Circle
+		private readonly Vector2D center;
+		private readonly float radius;
+		
+		#endregion
+
+		#region ================== Properties
+
+		public float Near { get { return near; } }
+		public float Far { get { return far; } }
+		public float Fov { get { return fov; } }
+		public Vector2D Position { get { return pos; } }
+		public float XYAngle { get { return xyangle; } }
+		public float ZAngle { get { return zangle; } }
+		public Line2D[] Lines { get { return lines; } }
+		public Vector2D Center { get { return center; } }
+		public float Radius { get { return radius; } }
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		// Constructor
+		public ProjectedFrustum2D(Vector2D pos, float xyangle, float zangle, float near, float far, float fov)
+		{
+			Vector2D[] forwards = new Vector2D[4];
+			Vector2D[] downwards = new Vector2D[4];
+			Vector2D[] corners = new Vector2D[4];
+			
+			// Initialize
+			this.pos = pos;
+			this.xyangle = xyangle;
+			this.zangle = zangle;
+			this.near = near;
+			this.far = far;
+			this.fov = fov;
+			
+			// Make the corners for a forward frustum
+			// The corners are in this order: Left-Far, Right-Far, Left-Near, Right-Near
+			float fovhalf = fov * 0.5f;
+			float fovhalfcos = (float)Math.Cos(fovhalf);
+			float farsidelength = far / fovhalfcos;
+			float nearsidelength = near / fovhalfcos;
+			forwards[0] = pos + Vector2D.FromAngle(xyangle - fovhalf, farsidelength);
+			forwards[1] = pos + Vector2D.FromAngle(xyangle + fovhalf, farsidelength);
+			forwards[2] = pos + Vector2D.FromAngle(xyangle - fovhalf, nearsidelength);
+			forwards[3] = pos + Vector2D.FromAngle(xyangle + fovhalf, nearsidelength);
+			
+			// Make the corners for a downward frustum
+			// The corners are in the same order as above
+			//float farradius = far * (float)Math.Tan(fovhalf) * Angle2D.SQRT2;
+			float farradius = far * 0.5f * Angle2D.SQRT2;
+			downwards[0] = pos + Vector2D.FromAngle(xyangle - Angle2D.PI * 0.25f, farradius);
+			downwards[1] = pos + Vector2D.FromAngle(xyangle + Angle2D.PI * 0.25f, farradius);
+			downwards[2] = pos + Vector2D.FromAngle(xyangle - Angle2D.PI * 0.75f, farradius);
+			downwards[3] = pos + Vector2D.FromAngle(xyangle + Angle2D.PI * 0.75f, farradius);
+			
+			// Interpolate between the two to make the final corners depending on the z angle
+			float d = Math.Abs((float)Math.Sin(zangle));
+			corners[0] = forwards[0] * (1.0f - d) + downwards[0] * d;
+			corners[1] = forwards[1] * (1.0f - d) + downwards[1] * d;
+			corners[2] = forwards[2] * (1.0f - d) + downwards[2] * d;
+			corners[3] = forwards[3] * (1.0f - d) + downwards[3] * d;
+			
+			// Make the frustum lines
+			// Note that the lines all have their right side inside the frustum!
+			lines = new Line2D[4];
+			lines[0] = new Line2D(corners[2], corners[0]);
+			lines[1] = new Line2D(corners[1], corners[3]);
+			lines[2] = new Line2D(corners[3], corners[2]);
+			lines[3] = new Line2D(corners[0], corners[1]);
+
+			// Calculate the circle center
+			center = (corners[0] + corners[1] + corners[2] + corners[3]) * 0.25f;
+			
+			// Calculate the radius from the center to the farthest corner
+			float radius2 = 0.0f;
+			for(int i = 0; i < corners.Length; i++)
+			{
+				float distance2 = Vector2D.DistanceSq(center, corners[i]);
+				if(distance2 > radius2) radius2 = distance2;
+			}
+			radius = (float)Math.Sqrt(radius2);
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This checks if a specified circle is intersecting the frustum
+		// NOTE: This checks only against the actual frustum and does not use the frustum circle!
+		public bool IntersectCircle(Vector2D circlecenter, float circleradius)
+		{
+			// Go for all frustum lines
+			for(int i = 0; i < lines.Length; i++)
+			{
+				// Check on which side the circle center lies
+				if(lines[i].GetSideOfLine(circlecenter) < 0)
+				{
+					// Center is outside the frustum
+					// If the circle is not overlapping, it is not intersecting.
+					if(lines[i].GetDistanceToLineSq(circlecenter, false) > (circleradius * circleradius)) return false;
+				}
+			}
+
+			// Intersecting!
+			return true;
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Geometry/SidedefAngleSorter.cs b/Source/Core/Geometry/SidedefAngleSorter.cs
new file mode 100644
index 0000000..2a27509
--- /dev/null
+++ b/Source/Core/Geometry/SidedefAngleSorter.cs
@@ -0,0 +1,86 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Map;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Geometry
+{
+	public sealed class SidedefAngleSorter : IComparer<Sidedef>
+	{
+		// Variables
+		private Sidedef baseside;
+		private Vertex basevertex;
+		
+		// Constructor
+		public SidedefAngleSorter(Sidedef baseside, Vertex fromvertex)
+		{
+			// Initialize
+			this.baseside = baseside;
+			this.basevertex = fromvertex;
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// This calculates the relative angle between two sides
+		private float CalculateRelativeAngle(Sidedef a, Sidedef b)
+		{
+			// Determine angles
+			float ana = a.Line.Angle; if(a.Line.End == basevertex) ana += Angle2D.PI;
+			float anb = b.Line.Angle; if(b.Line.End == basevertex) anb += Angle2D.PI;
+			
+			// Take the difference from angles
+			float n = Angle2D.Difference(ana, anb);
+			
+			// Get line end vertices a and b that are not connected to basevertex
+			Vector2D va = (a.Line.Start == basevertex ? a.Line.End.Position : a.Line.Start.Position);
+			Vector2D vb = (b.Line.Start == basevertex ? b.Line.End.Position : b.Line.Start.Position);
+			
+			// Determine rotation direction
+			bool dir = baseside.IsFront;
+			if(baseside.Line.End == basevertex) dir = !dir;
+			
+			// Check to which side the angle goes and adjust angle as needed
+			float s = Line2D.GetSideOfLine(va, vb, basevertex.Position);
+			if((s < 0) && dir) n = Angle2D.PI2 - n;
+			if((s > 0) && !dir) n = Angle2D.PI2 - n;
+			
+			// Return result
+			return n;
+		}
+		
+		// Comparer
+		public int Compare(Sidedef x, Sidedef y)
+		{
+			// Somehow, in a release build without debugger attached,
+			// the code above is not always the same when x == y... don't ask.
+			if(x == y) return 0;
+			
+			// Calculate angles
+			float ax = CalculateRelativeAngle(baseside, x);
+			float ay = CalculateRelativeAngle(baseside, y);
+			
+			// Compare results
+			return Math.Sign(ay - ax);
+		}
+	}
+}
diff --git a/Source/Core/Geometry/SidedefsTracePath.cs b/Source/Core/Geometry/SidedefsTracePath.cs
new file mode 100644
index 0000000..1683374
--- /dev/null
+++ b/Source/Core/Geometry/SidedefsTracePath.cs
@@ -0,0 +1,102 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Map;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Geometry
+{
+	public sealed class SidedefsTracePath : List<Sidedef>
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		#endregion
+
+		#region ================== Properties
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public SidedefsTracePath()
+		{
+			// Initialize
+		}
+
+		// Constructor
+		public SidedefsTracePath(SidedefsTracePath p, Sidedef add) : base(p)
+		{
+			// Initialize
+			base.Add(add);
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This checks if the polygon is closed
+		public bool CheckIsClosed()
+		{
+			// There must be at least 2 sidedefs
+			if(base.Count > 1)
+			{
+				// The end sidedef must share a vertex with the first
+				return (base[0].Line.Start == base[base.Count - 1].Line.Start) ||
+					   (base[0].Line.Start == base[base.Count - 1].Line.End) ||
+					   (base[0].Line.End == base[base.Count - 1].Line.Start) ||
+					   (base[0].Line.End == base[base.Count - 1].Line.End);
+			}
+			else
+			{
+				// Not closed
+				return false;
+			}
+		}
+		
+		// This makes a polygon from the path
+		public EarClipPolygon MakePolygon()
+		{
+			EarClipPolygon p = new EarClipPolygon();
+			
+			// Any sides at all?
+			if(base.Count > 0)
+			{
+				// Add all sides
+				for(int i = 0; i < base.Count; i++)
+				{
+					// On front or back?
+					if(base[i].IsFront)
+						p.AddLast(new EarClipVertex(base[i].Line.End.Position, base[i]));
+					else
+						p.AddLast(new EarClipVertex(base[i].Line.Start.Position, base[i]));
+				}
+			}
+			
+			return p;
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Geometry/Tools.cs b/Source/Core/Geometry/Tools.cs
new file mode 100644
index 0000000..775c3fe
--- /dev/null
+++ b/Source/Core/Geometry/Tools.cs
@@ -0,0 +1,2360 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Data;
+using CodeImp.DoomBuilder.GZBuilder.Data;
+using CodeImp.DoomBuilder.GZBuilder.Geometry;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Types;
+using CodeImp.DoomBuilder.VisualModes;
+using SlimDX;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Geometry
+{
+	/// <summary>
+	/// Tools to work with geometry.
+	/// </summary>
+	public static class Tools
+	{
+		#region ================== Structures
+
+		private struct SidedefSettings
+		{
+			public string newtexhigh;
+			public string newtexmid;
+			public string newtexlow;
+		}
+
+		private struct SidedefFillJob
+		{
+			public Sidedef sidedef;
+
+			// Moving forward along the sidedef?
+			public bool forward;
+		}
+
+		#endregion
+		
+		#region ================== Constants
+		
+		#endregion
+
+		#region ================== Polygons and Triangles
+
+		// Point inside the polygon?
+		// See: http://local.wasp.uwa.edu.au/~pbourke/geometry/insidepoly/
+		public static bool PointInPolygon(ICollection<Vector2D> polygon, Vector2D point)
+		{
+			Vector2D v1 = General.GetByIndex(polygon, polygon.Count - 1);
+			uint c = 0;
+
+			// Go for all vertices
+			foreach(Vector2D v2 in polygon)
+			{
+				// Determine min/max values
+				float miny = Math.Min(v1.y, v2.y);
+				float maxy = Math.Max(v1.y, v2.y);
+				float maxx = Math.Max(v1.x, v2.x);
+
+				// Check for intersection
+				if((point.y > miny) && (point.y <= maxy))
+				{
+					if(point.x <= maxx)
+					{
+						if(v1.y != v2.y)
+						{
+							float xint = (point.y - v1.y) * (v2.x - v1.x) / (v2.y - v1.y) + v1.x;
+							if((v1.x == v2.x) || (point.x <= xint)) c++;
+						}
+					}
+				}
+
+				// Move to next
+				v1 = v2;
+			}
+
+			// Inside this polygon?
+			return (c & 0x00000001UL) != 0;
+		}
+		
+		#endregion
+		
+		#region ================== Pathfinding
+
+		/// <summary>
+		/// This finds a potential sector at the given coordinates,
+		/// or returns null when a sector is not possible there.
+		/// </summary>
+		public static List<LinedefSide> FindPotentialSectorAt(Vector2D pos)
+		{
+			// Find the nearest line and determine side, then use the other method to create the sector
+			Linedef l = General.Map.Map.NearestLinedef(pos);
+			return FindPotentialSectorAt(l, (l.SideOfLine(pos) <= 0));
+		}
+
+		/// <summary>
+		/// This finds a potential sector starting at the given line and side,
+		/// or returns null when sector is not possible.
+		/// </summary>
+		public static List<LinedefSide> FindPotentialSectorAt(Linedef line, bool front)
+		{
+			List<LinedefSide> alllines = new List<LinedefSide>();
+			
+			// Find the outer lines
+			EarClipPolygon p = FindOuterLines(line, front, alllines);
+			if(p != null)
+			{
+				// Find the inner lines
+				FindInnerLines(p, alllines);
+				return alllines;
+			}
+
+			return null;
+		}
+
+		// This finds the inner lines of the sector and adds them to the sector polygon
+		private static void FindInnerLines(EarClipPolygon p, List<LinedefSide> alllines)
+		{
+			bool findmore;
+			float foundangle = 0f;
+			RectangleF bbox = p.CreateBBox();
+			
+			do
+			{
+				findmore = false;
+
+				// Go for all vertices to find the right-most vertex inside the polygon
+				Vertex foundv = null;
+				foreach(Vertex v in General.Map.Map.Vertices)
+				{
+					// Inside the polygon bounding box?
+					if(v.Position.x < bbox.Left || v.Position.x > bbox.Right || v.Position.y < bbox.Top || v.Position.y > bbox.Bottom)
+						continue;
+
+					// More to the right?
+					if((foundv == null) || (v.Position.x >= foundv.Position.x)) 
+					{
+						// Vertex is inside the polygon?
+						if(p.Intersect(v.Position)) 
+						{
+							// Vertex has lines attached?
+							if(v.Linedefs.Count > 0)
+							{
+								// Go for all lines to see if the vertex is not of the polygon itsself
+								bool vvalid = true;
+								foreach(LinedefSide ls in alllines) 
+								{
+									if((ls.Line.Start == v) || (ls.Line.End == v)) 
+									{
+										vvalid = false;
+										break;
+									}
+								}
+
+								// Valid vertex?
+								if(vvalid) foundv = v;
+							}
+						}
+					}
+				}
+
+				// Found a vertex inside the polygon?
+				if(foundv != null)
+				{
+					// Find the attached linedef with the smallest angle to the right
+					const float targetangle = Angle2D.PIHALF;
+					Linedef foundline = null;
+					foreach(Linedef l in foundv.Linedefs)
+					{
+						// We need an angle unrelated to line direction, so correct for that
+						float lineangle = l.Angle;
+						if(l.End == foundv) lineangle += Angle2D.PI;
+
+						// Better result?
+						float deltaangle = Angle2D.Difference(targetangle, lineangle);
+						if((foundline == null) || (deltaangle < foundangle))
+						{
+							foundline = l;
+							foundangle = deltaangle;
+						}
+					}
+
+					// We already know that each linedef will go from this vertex
+					// to the left, because this is the right-most vertex in this area.
+					// If the line would go to the right, that means the other vertex of
+					// that line must lie outside this area and the mapper made an error.
+					// Should I check for this error and fail to create a sector in
+					// that case or ignore it and create a malformed sector (possibly
+					// breaking another sector also)?
+
+					// Find the side at which to start pathfinding
+					Vector2D testpos = new Vector2D(100.0f, 0.0f);
+					bool foundlinefront = (foundline.SideOfLine(foundv.Position + testpos) < 0.0f);
+
+					// Find inner path
+					List<LinedefSide> innerlines = FindClosestPath(foundline, foundlinefront, true);
+					if(innerlines != null)
+					{
+						// Make polygon
+						LinedefTracePath tracepath = new LinedefTracePath(innerlines);
+						EarClipPolygon innerpoly = tracepath.MakePolygon(true);
+
+						// Check if the front of the line is outside the polygon
+						if(!innerpoly.Intersect(foundline.GetSidePoint(foundlinefront)))
+						{
+							// Valid hole found!
+							alllines.AddRange(innerlines);
+							p.InsertChild(innerpoly);
+							findmore = true;
+						}
+					}
+				}
+			}
+			// Continue until no more holes found
+			while(findmore);
+		}
+
+		// This finds the outer lines of the sector as a polygon
+		// Returns null when no valid outer polygon can be found
+		private static EarClipPolygon FindOuterLines(Linedef line, bool front, List<LinedefSide> alllines)
+		{
+			Linedef scanline = line;
+			bool scanfront = front;
+
+			do
+			{
+				// Find closest path
+				List<LinedefSide> pathlines = FindClosestPath(scanline, scanfront, true);
+				if(pathlines != null)
+				{
+					// Make polygon
+					LinedefTracePath tracepath = new LinedefTracePath(pathlines);
+					EarClipPolygon poly = tracepath.MakePolygon(true);
+
+					// Check if the front of the line is inside the polygon
+					if(poly.Intersect(line.GetSidePoint(front)))
+					{
+						// Outer lines found!
+						alllines.AddRange(pathlines);
+						return poly;
+					}
+					else
+					{
+						// Inner lines found. This is not what we need, we want the outer lines.
+						// Find the right-most vertex to start a scan from there towards the outer lines.
+						Vertex foundv = null;
+						foreach(LinedefSide ls in pathlines)
+						{
+							if((foundv == null) || (ls.Line.Start.Position.x > foundv.Position.x))
+								foundv = ls.Line.Start;
+							
+							if((foundv == null) || (ls.Line.End.Position.x > foundv.Position.x))
+								foundv = ls.Line.End;
+						}
+
+						// If foundv is null then something is horribly wrong with the
+						// path we received from FindClosestPath!
+						if(foundv == null) throw new Exception("FAIL!");
+						
+						// From the right-most vertex trace outward to the right to
+						// find the next closest linedef, this is based on the idea that
+						// all sectors are closed.
+						Vector2D lineoffset = new Vector2D(100.0f, 0.0f);
+						Line2D testline = new Line2D(foundv.Position, foundv.Position + lineoffset);
+						scanline = null;
+						float foundu = float.MaxValue;
+
+						float px = foundv.Position.x; //mxd
+						float py = foundv.Position.y; //mxd
+
+						foreach(Linedef ld in General.Map.Map.Linedefs) 
+						{
+							// Line to the right of start point?
+							if((ld.Start.Position.x > px) || (ld.End.Position.x > px)) 
+							{
+								// Line intersecting the y axis?
+								if((ld.Start.Position.y >= py && ld.End.Position.y <= py) 
+									|| (ld.Start.Position.y <= py && ld.End.Position.y >= py)) //mxd
+								{ 
+									// Check if this linedef intersects our test line at a closer range
+									float thisu;
+									ld.Line.GetIntersection(testline, out thisu);
+									if((thisu > 0.00001f) && (thisu < foundu) && !float.IsNaN(thisu))
+									{
+										scanline = ld;
+										foundu = thisu;
+									}
+								}
+							}
+						}
+
+						// Did we meet another line?
+						if(scanline != null)
+						{
+							// Determine on which side we should start the next pathfind
+							scanfront = (scanline.SideOfLine(foundv.Position) < 0.0f);
+						}
+						else
+						{
+							// Appearently we reached the end of the map, no sector possible here
+							return null;
+						}
+					}
+				}
+				else
+				{
+					// Can't find a path
+					return null;
+				}
+			}
+			while(true);
+		}
+
+		/// <summary>
+		/// This finds the closest path from the beginning of a line to the end of the line.
+		/// When turnatends is true, the algorithm will continue at the other side of the
+		/// line when a dead end has been reached. Returns null when no path could be found.
+		/// </summary>
+		public static List<LinedefSide> FindClosestPath(Linedef startline, bool startfront, bool turnatends)
+		{
+			return FindClosestPath(startline, startfront, startline, startfront, turnatends);
+		}
+		
+		/// <summary>
+		/// This finds the closest path from the beginning of a line to the end of the line.
+		/// When turnatends is true, the algorithm will continue at the other side of the
+		/// line when a dead end has been reached. Returns null when no path could be found.
+		/// </summary>
+		public static List<LinedefSide> FindClosestPath(Linedef startline, bool startfront, Linedef endline, bool endfront, bool turnatends)
+		{
+			List<LinedefSide> path = new List<LinedefSide>();
+			Dictionary<Linedef, int> tracecount = new Dictionary<Linedef, int>();
+			Linedef nextline = startline;
+			bool nextfront = startfront;
+
+			do
+			{
+				// Add line to path
+				path.Add(new LinedefSide(nextline, nextfront));
+				if(!tracecount.ContainsKey(nextline)) tracecount.Add(nextline, 1); else tracecount[nextline]++;
+
+				// Determine next vertex to use
+				Vertex v = nextfront ? nextline.End : nextline.Start;
+
+				// Get list of linedefs and sort by angle
+				List<Linedef> lines = new List<Linedef>(v.Linedefs);
+				LinedefAngleSorter sorter = new LinedefAngleSorter(nextline, nextfront, v);
+				lines.Sort(sorter);
+
+				// Source line is the only one?
+				if(lines.Count == 1)
+				{
+					// Are we allowed to trace along this line again?
+					if(turnatends && (!tracecount.ContainsKey(nextline) || (tracecount[nextline] < 3)))
+					{
+						// Turn around and go back along the other side of the line
+						nextfront = !nextfront;
+					}
+					else
+					{
+						// No more lines, trace ends here
+						path = null;
+					}
+				}
+				else
+				{
+					// Trace along the next line
+					Linedef prevline = nextline;
+					nextline = (lines[0] == nextline ? lines[1] : lines[0]);
+
+					// Are we allowed to trace this line again?
+					if(!tracecount.ContainsKey(nextline) || (tracecount[nextline] < 3))
+					{
+						// Check if front side changes
+						if((prevline.Start == nextline.Start) ||
+						   (prevline.End == nextline.End)) nextfront = !nextfront;
+					}
+					else
+					{
+						// No more lines, trace ends here
+						path = null;
+					}
+				}
+			}
+			// Continue as long as we have not reached the start yet
+			// or we have no next line to trace
+			while((path != null) && ((nextline != endline) || (nextfront != endfront)));
+
+			// If start and front are not the same, add the end to the list also
+			if((path != null) && ((startline != endline) || (startfront != endfront)))
+				path.Add(new LinedefSide(endline, endfront));
+			
+			// Return path (null when trace failed)
+			return path;
+		}
+
+		#endregion
+		
+		#region ================== Sector Making
+
+		// This makes the sector from the given lines and sides
+		// If nearbylines is not null, then this method will find the default
+		// properties from the nearest line in this collection when the
+		// default properties can't be found in the alllines collection.
+		// Return null when no new sector could be made.
+		public static Sector MakeSector(List<LinedefSide> alllines, List<Linedef> nearbylines, bool useOverrides)
+		{
+			Sector sourcesector = null;
+			SidedefSettings sourceside = new SidedefSettings();
+			bool foundsidedefaults = false;
+
+			if(General.Map.Map.Sectors.Count >= General.Map.FormatInterface.MaxSectors)
+				return null;
+
+			Sector newsector = General.Map.Map.CreateSector();
+			if(newsector == null) return null;
+			
+			// Check if any of the sides already has a sidedef
+			// Then we use information from that sidedef to make the others
+			foreach(LinedefSide ls in alllines)
+			{
+				if(ls.Front)
+				{
+					if(ls.Line.Front != null)
+					{
+						// Copy sidedef information if not already found
+						if(sourcesector == null) sourcesector = ls.Line.Front.Sector;
+						TakeSidedefSettings(ref sourceside, ls.Line.Front);
+						foundsidedefaults = true;
+						break;
+					}
+				}
+				else
+				{
+					if(ls.Line.Back != null)
+					{
+						// Copy sidedef information if not already found
+						if(sourcesector == null) sourcesector = ls.Line.Back.Sector;
+						TakeSidedefSettings(ref sourceside, ls.Line.Back);
+						foundsidedefaults = true;
+						break;
+					}
+				}
+			}
+			
+			// Now do the same for the other sides
+			// Note how information is only copied when not already found
+			// so this won't override information from the sides searched above
+			foreach(LinedefSide ls in alllines)
+			{
+				if(ls.Front)
+				{
+					if(ls.Line.Back != null)
+					{
+						// Copy sidedef information if not already found
+						if(sourcesector == null) sourcesector = ls.Line.Back.Sector;
+						TakeSidedefSettings(ref sourceside, ls.Line.Back);
+						foundsidedefaults = true;
+						break;
+					}
+				}
+				else
+				{
+					if(ls.Line.Front != null)
+					{
+						// Copy sidedef information if not already found
+						if(sourcesector == null) sourcesector = ls.Line.Front.Sector;
+						TakeSidedefSettings(ref sourceside, ls.Line.Front);
+						foundsidedefaults = true;
+						break;
+					}
+				}
+			}
+			
+			// Use default settings from the nearest linedef, if settings have not been found yet
+			Sector nearestsector = null; //mxd
+			if( (nearbylines != null) && (alllines.Count > 0) && (!foundsidedefaults || (sourcesector == null)) )
+			{
+				Vector2D testpoint = alllines[0].Line.GetSidePoint(alllines[0].Front);
+				Linedef nearest = MapSet.NearestLinedef(nearbylines, testpoint);
+				if(nearest != null)
+				{
+					float side = nearest.SideOfLine(testpoint);
+					Sidedef defaultside = (side < 0.0f ? nearest.Front : nearest.Back);
+
+					if(defaultside != null)
+					{
+						if(sourcesector == null) sourcesector = defaultside.Sector;
+						TakeSidedefSettings(ref sourceside, defaultside);
+					}
+					else
+					{
+						//mxd. Any side is better than no side (but we'll want only basic settings from that)...
+						defaultside = (side < 0.0f ? nearest.Back : nearest.Front);
+						if(defaultside != null)
+						{
+							TakeSidedefSettings(ref sourceside, defaultside);
+							nearestsector = defaultside.Sector;
+						}
+					}
+				}
+			}
+			
+			// Use defaults where no settings could be found
+			TakeSidedefDefaults(ref sourceside);
+			
+			// Found a source sector?
+			if(sourcesector != null)
+			{
+				// Copy properties from source to new sector
+				sourcesector.CopyPropertiesTo(newsector);
+			}
+			else if(nearestsector != null)
+			{
+				//mxd. Apply basic properties from the nearest sector
+				newsector.SetFloorTexture(nearestsector.FloorTexture);
+				newsector.SetCeilTexture(nearestsector.CeilTexture);
+				newsector.FloorHeight = nearestsector.FloorHeight;
+				newsector.CeilHeight = nearestsector.CeilHeight;
+				newsector.Brightness = nearestsector.Brightness;
+			}
+			else
+			{
+				// No source sector, apply default sector properties
+				newsector.SetFloorTexture(General.Map.Options.DefaultFloorTexture);
+				newsector.SetCeilTexture(General.Map.Options.DefaultCeilingTexture);
+				newsector.FloorHeight = General.Settings.DefaultFloorHeight;
+				newsector.CeilHeight = General.Settings.DefaultCeilingHeight;
+				newsector.Brightness = General.Settings.DefaultBrightness;
+			}
+
+			//mxd. Apply overrides?
+			if(useOverrides) 
+			{
+				if(General.Map.Options.OverrideCeilingTexture) newsector.SetCeilTexture(General.Map.Options.DefaultCeilingTexture);
+				if(General.Map.Options.OverrideFloorTexture) newsector.SetFloorTexture(General.Map.Options.DefaultFloorTexture);
+				if(General.Map.Options.OverrideCeilingHeight) newsector.CeilHeight = General.Map.Options.CustomCeilingHeight;
+				if(General.Map.Options.OverrideFloorHeight) newsector.FloorHeight = General.Map.Options.CustomFloorHeight;
+				if(General.Map.Options.OverrideBrightness) newsector.Brightness = General.Map.Options.CustomBrightness;
+			}
+
+			// Go for all sides to make sidedefs
+			foreach(LinedefSide ls in alllines)
+			{
+				// We may only remove a useless middle texture when
+				// the line was previously singlesided
+				bool wassinglesided = (ls.Line.Back == null) || (ls.Line.Front == null);
+				
+				if(ls.Front)
+				{
+					// Create sidedef is needed and ensure it points to the new sector
+					if(ls.Line.Front == null) General.Map.Map.CreateSidedef(ls.Line, true, newsector);
+					if(ls.Line.Front == null) return null;
+					if(ls.Line.Front.Sector != newsector) ls.Line.Front.SetSector(newsector);
+					ApplyDefaultsToSidedef(ls.Line.Front, sourceside);
+				}
+				else
+				{
+					// Create sidedef is needed and ensure it points to the new sector
+					if(ls.Line.Back == null) General.Map.Map.CreateSidedef(ls.Line, false, newsector);
+					if(ls.Line.Back == null) return null;
+					if(ls.Line.Back.Sector != newsector) ls.Line.Back.SetSector(newsector);
+					ApplyDefaultsToSidedef(ls.Line.Back, sourceside);
+				}
+
+				// Update line
+				if(ls.Line.Front != null)ls.Line.Front.RemoveUnneededTextures(wassinglesided, false, wassinglesided);
+				if(ls.Line.Back != null) ls.Line.Back.RemoveUnneededTextures(wassinglesided, false, wassinglesided);
+
+				// Apply single/double sided flags if the double-sided-ness changed
+				if( (wassinglesided && ((ls.Line.Front != null) && (ls.Line.Back != null))) ||
+					(!wassinglesided && ((ls.Line.Front == null) || (ls.Line.Back == null))))
+					ls.Line.ApplySidedFlags();
+			}
+
+			// Return the new sector
+			return newsector;
+		}
+
+
+		// This joins a sector with the given lines and sides. Returns null when operation could not be completed.
+		public static Sector JoinSector(List<LinedefSide> alllines, Sidedef original)
+		{
+			SidedefSettings sourceside = new SidedefSettings();
+			
+			// Take settings fro mthe original side
+			TakeSidedefSettings(ref sourceside, original);
+
+			// Use defaults where no settings could be found
+			TakeSidedefDefaults(ref sourceside);
+
+			// Go for all sides to make sidedefs
+			foreach(LinedefSide ls in alllines)
+			{
+				if(ls.Front)
+				{
+					// Create sidedef if needed
+					if(ls.Line.Front == null)
+					{
+						Sidedef sd = General.Map.Map.CreateSidedef(ls.Line, true, original.Sector);
+						if(sd == null) return null;
+						ApplyDefaultsToSidedef(ls.Line.Front, sourceside);
+						ls.Line.ApplySidedFlags();
+						
+						// We must remove the (now useless) middle texture on the other side
+						if(ls.Line.Back != null) ls.Line.Back.RemoveUnneededTextures(true, true, true);
+					}
+					// Added 23-9-08, can we do this or will it break things?
+					else if(!original.Sector.IsDisposed) //mxd
+					{
+						// Link to the new sector
+						ls.Line.Front.SetSector(original.Sector);
+					}
+				}
+				else
+				{
+					// Create sidedef if needed
+					if(ls.Line.Back == null)
+					{
+						Sidedef sd = General.Map.Map.CreateSidedef(ls.Line, false, original.Sector);
+						if(sd == null) return null;
+						ApplyDefaultsToSidedef(ls.Line.Back, sourceside);
+						ls.Line.ApplySidedFlags();
+
+						// We must remove the (now useless) middle texture on the other side
+						if(ls.Line.Front != null) ls.Line.Front.RemoveUnneededTextures(true, true, true);
+					}
+					// Added 23-9-08, can we do this or will it break things?
+					else if(!original.Sector.IsDisposed) //mxd
+					{
+						// Link to the new sector
+						ls.Line.Back.SetSector(original.Sector);
+					}
+				}
+			}
+
+			// Return the new sector
+			return original.Sector;
+		}
+
+		//mxd. This merges sectors, which have less than 3 sides, with surrounding sectors.
+		//Most of the logic is taken from MakeSectorsMode.
+		//Vector2D is sector's center BEFORE sides were removed.
+		//See VerticesMode.DeleteItem() for usage example
+		public static void MergeInvalidSectors(Dictionary<Sector, Vector2D> toMerge) 
+		{
+			foreach(KeyValuePair<Sector, Vector2D> group in toMerge) 
+			{
+				if(!group.Key.IsDisposed && group.Key.Sidedefs.Count > 0 && group.Key.Sidedefs.Count < 3) 
+				{
+					group.Key.Dispose();
+
+					List<LinedefSide> sides = Tools.FindPotentialSectorAt(group.Value);
+
+					if(sides != null) 
+					{
+						// Mark the lines we are going to use for this sector
+						General.Map.Map.ClearAllMarks(true);
+						foreach(LinedefSide ls in sides) ls.Line.Marked = false;
+						List<Linedef> oldlines = General.Map.Map.GetMarkedLinedefs(true);
+
+						// Make the sector
+						Sector s = Tools.MakeSector(sides, oldlines, false);
+
+						if(s != null) 
+						{
+							// Now we go for all the lines along the sector to
+							// see if they only have a back side. In that case we want
+							// to flip the linedef to that it only has a front side.
+							foreach(Sidedef sd in s.Sidedefs) 
+							{
+								if((sd.Line.Front == null) && (sd.Line.Back != null)) 
+								{
+									// Flip linedef
+									sd.Line.FlipVertices();
+									sd.Line.FlipSidedefs();
+								}
+							}
+
+							General.Map.Data.UpdateUsedTextures();
+						}
+					}
+				}
+			}
+		}
+
+		// This takes default settings if not taken yet
+		private static void TakeSidedefDefaults(ref SidedefSettings settings)
+		{
+			// Use defaults where no settings could be found
+			if(settings.newtexhigh == null) settings.newtexhigh = General.Map.Options.DefaultTopTexture;
+			if(settings.newtexmid == null) settings.newtexmid = General.Map.Options.DefaultWallTexture;
+			if(settings.newtexlow == null) settings.newtexlow = General.Map.Options.DefaultBottomTexture;
+		}
+
+		// This takes sidedef settings if not taken yet
+		private static void TakeSidedefSettings(ref SidedefSettings settings, Sidedef side)
+		{
+			if((side.LongHighTexture != MapSet.EmptyLongName) && (settings.newtexhigh == null))
+				settings.newtexhigh = side.HighTexture;
+			if((side.LongMiddleTexture != MapSet.EmptyLongName) && (settings.newtexmid == null))
+				settings.newtexmid = side.MiddleTexture;
+			if((side.LongLowTexture != MapSet.EmptyLongName) && (settings.newtexlow == null))
+				settings.newtexlow = side.LowTexture;
+		}
+		
+		// This applies defaults to a sidedef
+		private static void ApplyDefaultsToSidedef(Sidedef sd, SidedefSettings defaults)
+		{
+			if(sd.HighRequired() && sd.LongHighTexture == MapSet.EmptyLongName) sd.SetTextureHigh(defaults.newtexhigh); //mxd
+			if(sd.MiddleRequired() && sd.LongMiddleTexture == MapSet.EmptyLongName) sd.SetTextureMid(defaults.newtexmid); //mxd
+			if(sd.LowRequired() && sd.LongLowTexture == MapSet.EmptyLongName) sd.SetTextureLow(defaults.newtexlow); //mxd
+		}
+
+		//mxd. This applies overrides to a sidedef
+		private static void ApplyOverridesToSidedef(Sidedef sd) 
+		{
+			if(General.Map.Options.OverrideTopTexture) sd.SetTextureHigh(General.Map.Options.DefaultTopTexture);
+			if(sd.MiddleRequired() && General.Map.Options.OverrideMiddleTexture) sd.SetTextureMid(General.Map.Options.DefaultWallTexture);
+			if(General.Map.Options.OverrideBottomTexture) sd.SetTextureLow(General.Map.Options.DefaultBottomTexture);
+		}
+		
+		#endregion
+		
+		#region ================== Sector Labels
+		
+		// This finds the ideal label positions for a sector
+		public static List<LabelPositionInfo> FindLabelPositions(Sector s)
+		{
+			List<LabelPositionInfo> positions = new List<LabelPositionInfo>(2);
+			int islandoffset = 0;
+			
+			// Do we have a triangulation?
+			Triangulation triangles = s.Triangles;
+			if(triangles != null)
+			{
+				// Go for all islands
+				for(int i = 0; i < triangles.IslandVertices.Count; i++)
+				{
+					Dictionary<Sidedef, Linedef> sides = new Dictionary<Sidedef, Linedef>(triangles.IslandVertices[i] >> 1);
+					List<Vector2D> candidatepositions = new List<Vector2D>(triangles.IslandVertices[i] >> 1);
+					float founddistance = float.MinValue;
+					Vector2D foundposition = new Vector2D();
+					float minx = float.MaxValue;
+					float miny = float.MaxValue;
+					float maxx = float.MinValue;
+					float maxy = float.MinValue;
+					
+					// Make candidate lines that are not along sidedefs
+					// We do this before testing the candidate against the sidedefs so that
+					// we can collect the relevant sidedefs first in the same run
+					for(int t = 0; t < triangles.IslandVertices[i]; t += 3)
+					{
+						int triangleoffset = islandoffset + t;
+						Vector2D v1 = triangles.Vertices[triangleoffset + 2];
+						Sidedef sd = triangles.Sidedefs[triangleoffset + 2];
+						for(int v = 0; v < 3; v++)
+						{
+							Vector2D v2 = triangles.Vertices[triangleoffset + v];
+							
+							// Not along a sidedef? Then this line is across the sector
+							// and guaranteed to be inside the sector!
+							if(sd == null)
+							{
+								// Make the line
+								candidatepositions.Add(v1 + (v2 - v1) * 0.5f);
+							}
+							else
+							{
+								// This sidedefs is part of this island and must be checked
+								// so add it to the dictionary
+								sides[sd] = sd.Line;
+							}
+							
+							// Make bbox of this island
+							minx = Math.Min(minx, v1.x);
+							miny = Math.Min(miny, v1.y);
+							maxx = Math.Max(maxx, v1.x);
+							maxy = Math.Max(maxy, v1.y);
+							
+							// Next
+							sd = triangles.Sidedefs[triangleoffset + v];
+							v1 = v2;
+						}
+					}
+
+					// Any candidate lines found at all?
+					if(candidatepositions.Count > 0)
+					{
+						// Start with the first line
+						foreach(Vector2D candidatepos in candidatepositions)
+						{
+							// Check distance against other lines
+							float smallestdist = int.MaxValue;
+							foreach(KeyValuePair<Sidedef, Linedef> sd in sides)
+							{
+								// Check the distance
+								float distance = sd.Value.DistanceToSq(candidatepos, true);
+								smallestdist = Math.Min(smallestdist, distance);
+							}
+							
+							// Keep this candidate if it is better than previous
+							if(smallestdist > founddistance)
+							{
+								foundposition = candidatepos;
+								founddistance = smallestdist;
+							}
+						}
+						
+						// No cceptable line found, just use the first!
+						positions.Add(new LabelPositionInfo(foundposition, (float)Math.Sqrt(founddistance)));
+					}
+					else
+					{
+						// No candidate lines found.
+						
+						// Check to see if the island is a triangle
+						if(triangles.IslandVertices[i] == 3)
+						{
+							// Use the center of the triangle
+							// TODO: Use the 'incenter' instead, see http://mathworld.wolfram.com/Incenter.html
+							Vector2D v = (triangles.Vertices[islandoffset] + triangles.Vertices[islandoffset + 1] + triangles.Vertices[islandoffset + 2]) / 3.0f;
+							float d = Line2D.GetDistanceToLineSq(triangles.Vertices[islandoffset], triangles.Vertices[islandoffset + 1], v, false);
+							d = Math.Min(d, Line2D.GetDistanceToLineSq(triangles.Vertices[islandoffset + 1], triangles.Vertices[islandoffset + 2], v, false));
+							d = Math.Min(d, Line2D.GetDistanceToLineSq(triangles.Vertices[islandoffset + 2], triangles.Vertices[islandoffset], v, false));
+							positions.Add(new LabelPositionInfo(v, (float)Math.Sqrt(d)));
+						}
+						else
+						{
+							// Use the center of this island.
+							float d = Math.Min((maxx - minx) * 0.5f, (maxy - miny) * 0.5f);
+							positions.Add(new LabelPositionInfo(new Vector2D(minx + (maxx - minx) * 0.5f, miny + (maxy - miny) * 0.5f), d));
+						}
+					}
+					
+					// Done with this island
+					islandoffset += triangles.IslandVertices[i];
+				}
+			}
+			else
+			{
+				// No triangulation was made. FAIL!
+				General.Fail("No triangulation exists for sector " + s + " Triangulation is required to create label positions for a sector.");
+			}
+			
+			// Done
+			return positions;
+		}
+		
+		#endregion
+
+		#region ================== Drawing
+
+		//mxd
+		public static bool DrawLines(IList<DrawnVertex> points) 
+		{
+			return DrawLines(points, false, false);
+		}
+		
+		/// <summary>
+		/// This draws lines with the given points. Note that this tool removes any existing geometry
+		/// marks and marks the new lines and vertices when done. Also marks the sectors that were added.
+		/// Returns false when the drawing failed.
+		/// </summary>
+		public static bool DrawLines(IList<DrawnVertex> points, bool useOverrides, bool autoAlignTextureOffsets)
+		{
+			List<Vertex> newverts = new List<Vertex>();
+			List<Vertex> intersectverts = new List<Vertex>();
+			List<Linedef> newlines = new List<Linedef>();
+			List<Linedef> oldlines = new List<Linedef>(General.Map.Map.Linedefs);
+			List<Sidedef> insidesides = new List<Sidedef>();
+			List<Vertex> mergeverts = new List<Vertex>();
+			List<Vertex> nonmergeverts = new List<Vertex>(General.Map.Map.Vertices);
+			MapSet map = General.Map.Map;
+
+			General.Map.Map.ClearAllMarks(false);
+			
+			// Any points to do?
+			if(points.Count > 0)
+			{
+				/***************************************************\
+					Create the drawing
+				\***************************************************/
+
+				// Make first vertex
+				Vertex v1 = map.CreateVertex(points[0].pos);
+				if(v1 == null) return false;
+				v1.Marked = true;
+
+				// Keep references
+				newverts.Add(v1);
+				if(points[0].stitch) mergeverts.Add(v1); else nonmergeverts.Add(v1);
+
+				// Go for all other points
+				for(int i = 1; i < points.Count; i++)
+				{
+					// Create vertex for point
+					Vertex v2 = map.CreateVertex(points[i].pos);
+					if(v2 == null) return false;
+					v2.Marked = true;
+
+					// Keep references
+					newverts.Add(v2);
+					if(points[i].stitch) mergeverts.Add(v2); else nonmergeverts.Add(v2);
+
+					// Create line between point and previous
+					Linedef ld = map.CreateLinedef(v1, v2);
+					if(ld == null) return false;
+					ld.Marked = true;
+					ld.ApplySidedFlags();
+					ld.UpdateCache();
+					newlines.Add(ld);
+
+					// Should we split this line to merge with intersecting lines?
+					if(points[i - 1].stitchline && points[i].stitchline)
+					{
+						// Check if any other lines intersect this line
+						List<float> intersections = new List<float>();
+						Line2D measureline = ld.Line;
+						Dictionary<Linedef, bool> processed = new Dictionary<Linedef, bool>(); //mxd
+
+						//mxd
+						foreach(Sector s in map.Sectors) 
+						{
+							//line intersects with sector's bounding box?
+							if((MapSet.GetCSFieldBits(measureline.v1, s.BBox) & MapSet.GetCSFieldBits(measureline.v2, s.BBox)) == 0) 
+							{
+								foreach(Sidedef side in s.Sidedefs) 
+								{
+									if(processed.ContainsKey(side.Line)) continue;
+									if(side.Line == ld) continue;
+
+									float u;
+									if(side.Line.Line.GetIntersection(measureline, out u)) 
+									{
+										if(float.IsNaN(u) || (u <= 0.0f) || (u >= 1.0f)) continue;
+										intersections.Add(u);
+									}
+
+									processed.Add(side.Line, false);
+								}
+							}
+						}
+
+						// Sort the intersections
+						intersections.Sort();
+
+						// Go for all found intersections
+						Linedef splitline = ld;
+						foreach(float u in intersections)
+						{
+							// Calculate exact coordinates where to split
+							// We use measureline for this, because the original line
+							// may already have changed in length due to a previous split
+							Vector2D splitpoint = measureline.GetCoordinatesAt(u);
+
+							// Make the vertex
+							Vertex splitvertex = map.CreateVertex(splitpoint);
+							if(splitvertex == null) return false;
+							splitvertex.Marked = true;
+							newverts.Add(splitvertex);
+							mergeverts.Add(splitvertex);			// <-- add to merge?
+							intersectverts.Add(splitvertex);
+							
+							// The Split method ties the end of the original line to the given
+							// vertex and starts a new line at the given vertex, so continue
+							// splitting with the new line, because the intersections are sorted
+							// from low to high (beginning at the original line start)
+							splitline = splitline.Split(splitvertex);
+							if(splitline == null) return false;
+							splitline.ApplySidedFlags();
+							newlines.Add(splitline);
+						}
+					}
+
+					// Next
+					v1 = v2;
+				}
+
+				// Join merge vertices so that overlapping vertices in the draw become one.
+				map.BeginAddRemove();
+				MapSet.JoinVertices(mergeverts, MapSet.STITCH_DISTANCE); //mxd
+				map.EndAddRemove();
+				
+				/***************************************************\
+					Find a way to close the drawing
+				\***************************************************/
+
+				// We prefer a closed polygon, because then we can determine the interior properly
+				// Check if the two ends of the polygon are closed
+				bool splittingonly = false;
+				bool drawingclosed = false; //mxd
+				if(newlines.Count > 0)
+				{
+					Linedef firstline = newlines[0];
+					Linedef lastline = newlines[newlines.Count - 1];
+					drawingclosed = (firstline.Start == lastline.End);
+					if(!drawingclosed)
+					{
+						// When not closed, we will try to find a path to close it.
+						// But first we check if any of our new lines are inside existing sectors, because
+						// if they are then we are splitting sectors and cannot accurately find a closed path
+						// to close our polygon. In that case, we want to do sector splits only.
+						foreach(Linedef ld in newlines)
+						{
+							Vector2D ldcp = ld.GetCenterPoint();
+							Linedef nld = MapSet.NearestLinedef(oldlines, ldcp);
+							if(nld != null)
+							{
+								float ldside = nld.SideOfLine(ldcp);
+								if(ldside < 0.0f)
+								{
+									if(nld.Front != null)
+									{
+										splittingonly = true;
+										break;
+									}
+								}
+								else if(ldside > 0.0f)
+								{
+									if(nld.Back != null)
+									{
+										splittingonly = true;
+										break;
+									}
+								}
+								/*else
+								{
+									// We can't tell, so lets ignore this for now.
+								}*/
+							}
+						}
+
+						// Not splitting only?
+						if(!splittingonly)
+						{
+							// First and last vertex stitch with geometry?
+							if(points[0].stitch && points[points.Count - 1].stitch)
+							{
+								List<LinedefSide> startpoints = new List<LinedefSide>();
+								List<LinedefSide> endpoints = new List<LinedefSide>();
+
+								// Find out where the start will stitch and create test points
+								Linedef l1 = MapSet.NearestLinedefRange(oldlines, firstline.Start.Position, MapSet.STITCH_DISTANCE);
+								Vertex vv1 = null;
+								if(l1 != null)
+								{
+									startpoints.Add(new LinedefSide(l1, true));
+									startpoints.Add(new LinedefSide(l1, false));
+								}
+								else
+								{
+									// Not stitched with a linedef, so check if it will stitch with a vertex
+									vv1 = MapSet.NearestVertexSquareRange(nonmergeverts, firstline.Start.Position, MapSet.STITCH_DISTANCE);
+									if((vv1 != null) && (vv1.Linedefs.Count > 0))
+									{
+										// Now we take the two linedefs with adjacent angles to the drawn line
+										List<Linedef> lines = new List<Linedef>(vv1.Linedefs);
+										lines.Sort(new LinedefAngleSorter(firstline, true, firstline.Start));
+										startpoints.Add(new LinedefSide(lines[0], true));
+										startpoints.Add(new LinedefSide(lines[0], false));
+										lines.Sort(new LinedefAngleSorter(firstline, false, firstline.Start));
+										startpoints.Add(new LinedefSide(lines[0], true));
+										startpoints.Add(new LinedefSide(lines[0], false));
+									}
+								}
+
+								// Find out where the end will stitch and create test points
+								Linedef l2 = MapSet.NearestLinedefRange(oldlines, lastline.End.Position, MapSet.STITCH_DISTANCE);
+								Vertex vv2 = null;
+								if(l2 != null)
+								{
+									endpoints.Add(new LinedefSide(l2, true));
+									endpoints.Add(new LinedefSide(l2, false));
+								}
+								else
+								{
+									// Not stitched with a linedef, so check if it will stitch with a vertex
+									vv2 = MapSet.NearestVertexSquareRange(nonmergeverts, lastline.End.Position, MapSet.STITCH_DISTANCE);
+									if((vv2 != null) && (vv2.Linedefs.Count > 0))
+									{
+										// Now we take the two linedefs with adjacent angles to the drawn line
+										List<Linedef> lines = new List<Linedef>(vv2.Linedefs);
+										lines.Sort(new LinedefAngleSorter(firstline, true, lastline.End));
+										endpoints.Add(new LinedefSide(lines[0], true));
+										endpoints.Add(new LinedefSide(lines[0], false));
+										lines.Sort(new LinedefAngleSorter(firstline, false, lastline.End));
+										endpoints.Add(new LinedefSide(lines[0], true));
+										endpoints.Add(new LinedefSide(lines[0], false));
+									}
+								}
+
+								// Found any start and end points?
+								if((startpoints.Count > 0) && (endpoints.Count > 0))
+								{
+									List<LinedefSide> shortestpath = null;
+
+									// Both stitched to the same line?
+									if((l1 == l2) && (l1 != null))
+									{
+										// Then just connect the two
+										shortestpath = new List<LinedefSide>();
+										shortestpath.Add(new LinedefSide(l1, true));
+									}
+									// One stitched to a line and the other to a vertex of that line?
+									else if((l1 != null) && (vv2 != null) && ((l1.Start == vv2) || (l1.End == vv2)))
+									{
+										// Then just connect the two
+										shortestpath = new List<LinedefSide>();
+										shortestpath.Add(new LinedefSide(l1, true));
+									}
+									// The other stitched to a line and the first to a vertex of that line?
+									else if((l2 != null) && (vv1 != null) && ((l2.Start == vv1) || (l2.End == vv1)))
+									{
+										// Then just connect the two
+										shortestpath = new List<LinedefSide>();
+										shortestpath.Add(new LinedefSide(l2, true));
+									}
+									else
+									{
+										// Find the shortest, closest path between start and end points
+										foreach(LinedefSide startp in startpoints)
+										{
+											foreach(LinedefSide endp in endpoints)
+											{
+												List<LinedefSide> p = Tools.FindClosestPath(startp.Line, startp.Front, endp.Line, endp.Front, true);
+												if((p != null) && ((shortestpath == null) || (p.Count < shortestpath.Count))) shortestpath = p;
+												p = Tools.FindClosestPath(endp.Line, endp.Front, startp.Line, startp.Front, true);
+												if((p != null) && ((shortestpath == null) || (p.Count < shortestpath.Count))) shortestpath = p;
+											}
+										}
+									}
+
+									// Found a path?
+									if(shortestpath != null)
+									{
+										// Check which direction the path goes in
+										bool pathforward = false;
+										foreach(LinedefSide startp in startpoints)
+										{
+											if(shortestpath[0].Line == startp.Line)
+											{
+												pathforward = true;
+												break;
+											}
+										}
+
+										// TEST
+										/*
+										General.Map.Renderer2D.StartOverlay(true);
+										foreach(LinedefSide lsd in shortestpath)
+										{
+											General.Map.Renderer2D.RenderLine(lsd.Line.Start.Position, lsd.Line.End.Position, 2, new PixelColor(255, 0, 255, 0), true);
+										}
+										General.Map.Renderer2D.Finish();
+										General.Map.Renderer2D.Present();
+										Thread.Sleep(1000);
+										*/
+										
+										// Begin at first vertex in path
+										v1 = (pathforward ? firstline.Start : lastline.End);
+
+										// Go for all vertices in the path to make additional lines
+										for(int i = 1; i < shortestpath.Count; i++)
+										{
+											// Get the next position
+											Vector2D v2pos = shortestpath[i].Front ? shortestpath[i].Line.Start.Position : shortestpath[i].Line.End.Position;
+
+											// Make the new vertex
+											Vertex v2 = map.CreateVertex(v2pos);
+											if(v2 == null) return false;
+											v2.Marked = true;
+											mergeverts.Add(v2);
+
+											// Make the line
+											Linedef ld = map.CreateLinedef(v1, v2);
+											if(ld == null) return false;
+											ld.Marked = true;
+											ld.ApplySidedFlags();
+											ld.UpdateCache();
+											newlines.Add(ld);
+
+											// Next
+											v1 = v2;
+										}
+
+										// Make the final line
+										Linedef lld;
+										if(pathforward)
+											lld = map.CreateLinedef(v1, lastline.End);
+										else
+											lld = map.CreateLinedef(v1, firstline.Start);
+
+										if(lld == null) return false;
+										
+										// Setup line
+										lld.Marked = true;
+										lld.ApplySidedFlags();
+										lld.UpdateCache();
+										newlines.Add(lld);
+
+										// Drawing is now closed
+										drawingclosed = true;
+
+										// Join merge vertices so that overlapping vertices in the draw become one.
+										MapSet.JoinVertices(mergeverts, MapSet.STITCH_DISTANCE); //mxd
+									}
+								}
+							}
+						}
+					}
+				}
+
+				// Merge intersetion vertices with the new lines. This completes the
+				// self intersections for which splits were made above.
+				map.Update(true, false);
+				map.BeginAddRemove();
+				MapSet.SplitLinesByVertices(newlines, intersectverts, MapSet.STITCH_DISTANCE, null);
+				MapSet.SplitLinesByVertices(newlines, mergeverts, MapSet.STITCH_DISTANCE, null);
+				map.EndAddRemove();
+				
+				/***************************************************\
+					Determine drawing interior
+				\***************************************************/
+
+				// In step 3 we will make sectors on the interior sides and join sectors on the
+				// exterior sides, but because the user could have drawn counterclockwise or just
+				// some weird polygon. The following code figures out the interior side of all
+				// new lines.
+				map.Update(true, false);
+				foreach(Linedef ld in newlines)
+				{
+					// Find closest path starting with the front of this linedef
+					List<LinedefSide> pathlines = Tools.FindClosestPath(ld, true, true);
+					if(pathlines != null)
+					{
+						// Make polygon
+						LinedefTracePath tracepath = new LinedefTracePath(pathlines);
+						EarClipPolygon pathpoly = tracepath.MakePolygon(true);
+						
+						// Check if the front of the line is outside the polygon
+						if((pathpoly.CalculateArea() > 0.001f) && !pathpoly.Intersect(ld.GetSidePoint(true)))
+						{
+							// Now trace from the back side of the line to see if
+							// the back side lies in the interior. I don't want to
+							// flip the line if it is not helping.
+
+							// Find closest path starting with the back of this linedef
+							pathlines = Tools.FindClosestPath(ld, false, true);
+							if(pathlines != null)
+							{
+								// Make polygon
+								tracepath = new LinedefTracePath(pathlines);
+								pathpoly = tracepath.MakePolygon(true);
+
+								// Check if the front of the line is inside the polygon
+								ld.FrontInterior = (pathpoly.CalculateArea() < 0.001f) || pathpoly.Intersect(ld.GetSidePoint(true));
+							}
+							else
+							{
+								ld.FrontInterior = true;
+							}
+						}
+						else
+						{
+							ld.FrontInterior = true;
+						}
+					}
+					else
+					{
+						ld.FrontInterior = true;
+					}
+				}
+
+				/***************************************************\
+					Merge the new geometry
+				\***************************************************/
+
+				// Mark only the vertices that should be merged
+				map.ClearMarkedVertices(false);
+				foreach(Vertex v in mergeverts) v.Marked = true;
+
+				// Before this point, the new geometry is not linked with the existing geometry.
+				// Now perform standard geometry stitching to merge the new geometry with the rest
+				// of the map. The marked vertices indicate the new geometry.
+				map.StitchGeometry();
+				map.Update(true, false);
+
+				// Find our new lines again, because they have been merged with the other geometry
+				// but their Marked property is copied where they have joined.
+				newlines = map.GetMarkedLinedefs(true);
+				
+				// Remove any disposed old lines
+				List<Linedef> prevoldlines = oldlines;
+				oldlines = new List<Linedef>(prevoldlines.Count);
+				foreach(Linedef ld in prevoldlines)
+					if(!ld.IsDisposed) oldlines.Add(ld);
+				
+				/***************************************************\
+					Join and create new sectors
+				\***************************************************/
+
+				// The code below atempts to create sectors on the interior sides of the drawn
+				// geometry and joins sectors on the other sides of the drawn geometry.
+				// This code does not change any geometry, it only makes/updates sidedefs.
+				bool sidescreated = false;
+				bool[] frontsdone = new bool[newlines.Count];
+				bool[] backsdone = new bool[newlines.Count];
+				for(int i = 0; i < newlines.Count; i++)
+				{
+					Linedef ld = newlines[i];
+
+					// Interior not done yet?
+					if((ld.FrontInterior && !frontsdone[i]) || (!ld.FrontInterior && !backsdone[i]))
+					{
+						// Find a way to create a sector here
+						List<LinedefSide> sectorlines = Tools.FindPotentialSectorAt(ld, ld.FrontInterior);
+						if(sectorlines != null)
+						{
+							sidescreated = true;
+
+							// When none of the linedef sides exist yet, this is a true new
+							// sector that will be created out of the void!
+							bool istruenewsector = true;
+							foreach(LinedefSide ls in sectorlines)
+							{
+								if((ls.Front && (ls.Line.Front != null)) ||
+								   (!ls.Front && (ls.Line.Back != null)))
+								{
+									istruenewsector = false;
+									break;
+								}
+							}
+
+							// But we don't want to create sectors out of the void when we
+							// decided that we only want to split sectors.
+							if(!istruenewsector || !splittingonly)
+							{
+								// Make the new sector
+								//mxd. Apply sector overrides only if a closed drawing is created
+								Sector newsector = Tools.MakeSector(sectorlines, oldlines, (useOverrides && drawingclosed && newlines.Count > 2));
+								if(newsector == null) return false;
+
+								if(istruenewsector) newsector.Marked = true;
+
+								// Go for all sidedefs in this new sector
+								foreach(Sidedef sd in newsector.Sidedefs)
+								{
+									// Keep list of sides inside created sectors
+									insidesides.Add(sd);
+
+									// Side matches with a side of our new lines?
+									int lineindex = newlines.IndexOf(sd.Line);
+									if(lineindex > -1)
+									{
+										// Mark this side as done
+										if(sd.IsFront)
+											frontsdone[lineindex] = true;
+										else
+											backsdone[lineindex] = true;
+									}
+								}
+							}
+						}
+					}
+
+					// Exterior not done yet?
+					if((ld.FrontInterior && !backsdone[i]) || (!ld.FrontInterior && !frontsdone[i]))
+					{
+						// Find a way to create a sector here
+						List<LinedefSide> sectorlines = Tools.FindPotentialSectorAt(ld, !ld.FrontInterior);
+						if(sectorlines != null)
+						{
+							// Check if any of the surrounding lines originally have sidedefs we can join
+							Sidedef joinsidedef = null;
+							foreach(LinedefSide ls in sectorlines)
+							{
+								if(ls.Front && (ls.Line.Front != null))
+								{
+									joinsidedef = ls.Line.Front;
+									break;
+								}
+								if(!ls.Front && (ls.Line.Back != null))
+								{
+									joinsidedef = ls.Line.Back;
+									break;
+								}
+							}
+
+							// Join?
+							if(joinsidedef != null)
+							{
+								sidescreated = true;
+
+								// We only want to modify our new lines when joining a sector
+								// (or it may break nearby self-referencing sectors)
+								List<LinedefSide> newsectorlines = new List<LinedefSide>(sectorlines.Count);
+								foreach(LinedefSide sd in sectorlines)
+								{
+									// Side matches with a side of our new lines?
+									int lineindex = newlines.IndexOf(sd.Line);
+									if(lineindex > -1)
+									{
+										// Add to list
+										newsectorlines.Add(sd);
+										
+										// Mark this side as done
+										if(sd.Front)
+											frontsdone[lineindex] = true;
+										else
+											backsdone[lineindex] = true;
+									}
+								}
+								
+								// Have our new lines join the existing sector
+								if(Tools.JoinSector(newsectorlines, joinsidedef) == null)
+									return false;
+							}
+						}
+					}
+				}
+
+				/***************************************************\
+					Corrections and clean up
+				\***************************************************/
+
+				// Make corrections for backward linedefs
+				MapSet.FlipBackwardLinedefs(newlines);
+
+				// Check if any of our new lines have sides
+				if(sidescreated)
+				{
+					// Then remove the lines which have no sides at all
+					for(int i = newlines.Count - 1; i >= 0; i--)
+					{
+						// Remove the line if it has no sides
+						if((newlines[i].Front != null) || (newlines[i].Back != null)) continue; 
+						newlines[i].Dispose();
+					}
+
+					//mxd. Apply texture overrides
+					if(useOverrides && !General.Settings.AutoClearSidedefTextures) 
+					{
+						//if new sectors are created, apply overrides to the sides of these sectors, otherwise, apply overrides to all new lines
+						if(insidesides.Count > 0) 
+						{
+							foreach(Sidedef side in insidesides) ApplyOverridesToSidedef(side);
+						} 
+						else 
+						{
+							foreach(Linedef l in newlines) 
+							{
+								if(l.IsDisposed) continue;
+								if(!newverts.Contains(l.Start) || !newverts.Contains(l.End)) continue;
+								ApplyOverridesToSidedef(l.Front);
+								if(l.Back != null) ApplyOverridesToSidedef(l.Back);
+							}
+						}
+					}
+
+					//mxd. Auto-align new lines
+					if(autoAlignTextureOffsets && newlines.Count > 1 && !splittingonly) 
+					{
+						List<List<Linedef>> strips = new List<List<Linedef>>();
+						strips.Add(new List<Linedef> { newlines[0] });
+
+						for(int i = 1; i < newlines.Count; i++) 
+						{
+							//skip double-sided line if it doesn't have lower or upper parts or they are not part of newly created sectors
+							if(newlines[i].Back != null
+								&& (((!newlines[i].Front.LowRequired() && !newlines[i].Front.HighRequired()) || !insidesides.Contains(newlines[i].Front))
+								&& ((!newlines[i].Back.LowRequired() && !newlines[i].Back.HighRequired()) || !insidesides.Contains(newlines[i].Back))))
+								continue;
+
+							bool added = false;
+							foreach(List<Linedef> strip in strips) 
+							{
+								if(newlines[i].Start == strip[0].Start || newlines[i].End == strip[0].Start) 
+								{
+									strip.Insert(0, newlines[i]);
+									added = true;
+									break;
+								}
+
+								if(newlines[i].Start == strip[strip.Count - 1].End || newlines[i].End == strip[strip.Count - 1].End) 
+								{
+									strip.Add(newlines[i]);
+									added = true;
+									break;
+								}
+							}
+
+							if(!added) strips.Add(new List<Linedef> { newlines[i] });
+						}
+
+						foreach(List<Linedef> strip in strips) 
+						{
+							if(strip.Count < 2) continue;
+							AutoAlignLinedefStrip(strip);
+						}
+					}
+				}
+
+				// Mark new geometry only
+				General.Map.Map.ClearMarkedLinedefs(false);
+				General.Map.Map.ClearMarkedVertices(false);
+				foreach(Vertex v in newverts) v.Marked = true;
+				foreach(Linedef l in newlines) l.Marked = true;
+			}
+
+			return true;
+		}
+
+		//mxd
+		private static void AutoAlignLinedefStrip(List<Linedef> strip) 
+		{
+			if(strip.Count < 2) return;
+
+			float totalLength = 0f;
+			foreach(Linedef l in strip) totalLength += l.Length;
+
+			if(General.Map.UDMF)
+				AutoAlignTexturesOnSidesUdmf(strip, totalLength, (strip[0].End != strip[1].Start));
+			else
+				AutoAlignTexturesOnSides(strip, totalLength, (strip[0].End != strip[1].Start));	
+		}
+
+		//mxd
+		private static void AutoAlignTexturesOnSides(List<Linedef> lines, float totalLength, bool reversed) 
+		{
+			float curLength = 0f;
+			
+			foreach(Linedef l in lines) 
+			{
+				if(l.Front != null) 
+				{
+					ImageData texture = null;
+
+					if(l.Front.MiddleRequired() && l.Front.LongMiddleTexture != MapSet.EmptyLongName && General.Map.Data.GetTextureExists(l.Front.LongMiddleTexture))
+						texture = General.Map.Data.GetTextureImage(l.Front.LongMiddleTexture);
+					else if(l.Front.HighRequired() && l.Front.LongHighTexture != MapSet.EmptyLongName && General.Map.Data.GetTextureExists(l.Front.LongHighTexture))
+						texture = General.Map.Data.GetTextureImage(l.Front.LongHighTexture);
+					else if(l.Front.LowRequired() && l.Front.LongLowTexture != MapSet.EmptyLongName && General.Map.Data.GetTextureExists(l.Front.LongLowTexture))
+						texture = General.Map.Data.GetTextureImage(l.Front.LongLowTexture);
+
+					if(texture != null)
+						l.Front.OffsetX = (int)Math.Round((reversed ? totalLength - curLength - l.Length : curLength)) % texture.Width;
+				}
+
+				if(l.Back != null) 
+				{
+					ImageData texture = null;
+
+					if(l.Back.MiddleRequired() && l.Back.LongMiddleTexture != MapSet.EmptyLongName && General.Map.Data.GetTextureExists(l.Back.LongMiddleTexture))
+						texture = General.Map.Data.GetTextureImage(l.Back.LongMiddleTexture);
+					else if(l.Back.HighRequired() && l.Back.LongHighTexture != MapSet.EmptyLongName && General.Map.Data.GetTextureExists(l.Back.LongHighTexture))
+						texture = General.Map.Data.GetTextureImage(l.Back.LongHighTexture);
+					else if(l.Back.LowRequired() && l.Back.LongLowTexture != MapSet.EmptyLongName && General.Map.Data.GetTextureExists(l.Back.LongLowTexture))
+						texture = General.Map.Data.GetTextureImage(l.Back.LongLowTexture);
+
+					if(texture != null)
+						l.Back.OffsetX = (int)Math.Round((reversed ? totalLength - curLength - l.Length : curLength)) % texture.Width;
+				}
+
+				curLength += l.Length;
+			}
+		}
+
+		//mxd
+		private static void AutoAlignTexturesOnSidesUdmf(List<Linedef> lines, float totalLength, bool reversed) 
+		{
+			float curLength = 0f;
+
+			foreach(Linedef l in lines) 
+			{
+				if(l.Front != null) 
+				{
+					if(l.Front.MiddleRequired() && l.Front.LongMiddleTexture != MapSet.EmptyLongName && General.Map.Data.GetTextureExists(l.Front.LongMiddleTexture)) 
+					{
+						ImageData texture = General.Map.Data.GetTextureImage(l.Front.LongMiddleTexture);
+						float offset = (int)Math.Round((reversed ? totalLength - curLength - l.Length : curLength)) % texture.Width;
+
+						if(offset > 0) UniFields.SetFloat(l.Front.Fields, "offsetx_mid", offset);
+					}
+
+					if(l.Front.HighRequired() && l.Front.LongHighTexture != MapSet.EmptyLongName && General.Map.Data.GetTextureExists(l.Front.LongHighTexture)) 
+					{
+						ImageData texture = General.Map.Data.GetTextureImage(l.Front.LongHighTexture);
+						float offset = (int)Math.Round((reversed ? totalLength - curLength - l.Length : curLength)) % texture.Width;
+
+						if(offset > 0) UniFields.SetFloat(l.Front.Fields, "offsetx_top", offset);
+					}
+
+					if(l.Front.LowRequired() && l.Front.LongLowTexture != MapSet.EmptyLongName && General.Map.Data.GetTextureExists(l.Front.LongLowTexture)) 
+					{
+						ImageData texture = General.Map.Data.GetTextureImage(l.Front.LongLowTexture);
+						float offset = (int)Math.Round((reversed ? totalLength - curLength - l.Length : curLength)) % texture.Width;
+
+						if(offset > 0) UniFields.SetFloat(l.Front.Fields, "offsetx_bottom", offset);
+					}
+				}
+
+				if(l.Back != null) 
+				{
+					if(l.Back.MiddleRequired() && l.Back.LongMiddleTexture != MapSet.EmptyLongName && General.Map.Data.GetTextureExists(l.Back.LongMiddleTexture)) 
+					{
+						ImageData texture = General.Map.Data.GetTextureImage(l.Back.LongMiddleTexture);
+						float offset = (int)Math.Round((reversed ? totalLength - curLength - l.Length : curLength)) % texture.Width;
+
+						if(offset > 0) UniFields.SetFloat(l.Back.Fields, "offsetx_mid", offset);
+					}
+
+					if(l.Back.HighRequired() && l.Back.LongHighTexture != MapSet.EmptyLongName && General.Map.Data.GetTextureExists(l.Back.LongHighTexture)) 
+					{
+						ImageData texture = General.Map.Data.GetTextureImage(l.Back.LongHighTexture);
+						float offset = (int)Math.Round((reversed ? totalLength - curLength - l.Length : curLength)) % texture.Width;
+
+						if(offset > 0) UniFields.SetFloat(l.Back.Fields, "offsetx_top", offset);
+					}
+
+					if(l.Back.LowRequired() && l.Back.LongLowTexture != MapSet.EmptyLongName && General.Map.Data.GetTextureExists(l.Back.LongLowTexture)) 
+					{
+						ImageData texture = General.Map.Data.GetTextureImage(l.Back.LongLowTexture);
+						float offset = (int)Math.Round((reversed ? totalLength - curLength - l.Length : curLength)) % texture.Width;
+
+						if(offset > 0) UniFields.SetFloat(l.Back.Fields, "offsetx_bottom", offset);
+					}
+				}
+
+				curLength += l.Length;
+			}
+		}
+		
+		#endregion
+
+		#region ================== Flat Floodfill
+
+		// This performs flat floodfill over sector floors or ceilings that match with the same flat
+		// NOTE: This method uses the sectors marking to indicate which sides have been filled
+		// When resetsectormarks is set to true, all sectors will first be marked false (not aligned).
+		// Setting resetsectormarks to false is usefull to fill only within a specific selection
+		// (set the marked property to true for the sectors outside the selection)
+		public static void FloodfillFlats(Sector start, bool fillceilings, long originalflat, string fillflat, bool resetsectormarks)
+		{
+			Stack<Sector> todo = new Stack<Sector>(50);
+
+			// Mark all sectors false (they will be marked true when the flat is modified)
+			if(resetsectormarks) General.Map.Map.ClearMarkedSectors(false);
+			
+			// Begin with first sector
+			if(((start.LongFloorTexture == originalflat) && !fillceilings) ||
+			   ((start.LongCeilTexture == originalflat) && fillceilings))
+			{
+				todo.Push(start);
+			}
+
+			// Continue until nothing more to align
+			while(todo.Count > 0)
+			{
+				// Get the sector to do
+				Sector s = todo.Pop();
+				
+				// Apply new flat
+				if(fillceilings) s.SetCeilTexture(fillflat);
+				else s.SetFloorTexture(fillflat);
+				s.Marked = true;
+				
+				// Go for all sidedefs to add neighbouring sectors
+				foreach(Sidedef sd in s.Sidedefs)
+				{
+					// Sector on the other side of the line that we haven't checked yet?
+					if((sd.Other != null) && !sd.Other.Sector.Marked)
+					{
+						Sector os = sd.Other.Sector;
+						
+						// Check if texture matches
+						if(((os.LongFloorTexture == originalflat) && !fillceilings) ||
+						   ((os.LongCeilTexture == originalflat) && fillceilings))
+						{
+							todo.Push(os);
+						}
+					}
+				}
+			}
+		}
+
+		#endregion
+
+		#region ================== Texture Floodfill
+
+		// This performs texture floodfill along all walls that match with the same texture
+		// NOTE: This method uses the sidedefs marking to indicate which sides have been filled
+		// When resetsidemarks is set to true, all sidedefs will first be marked false (not aligned).
+		// Setting resetsidemarks to false is usefull to fill only within a specific selection
+		// (set the marked property to true for the sidedefs outside the selection)
+		public static void FloodfillTextures(Sidedef start, long originaltexture, string filltexture, bool resetsidemarks)
+		{
+			Stack<SidedefFillJob> todo = new Stack<SidedefFillJob>(50);
+
+			// Mark all sidedefs false (they will be marked true when the texture is aligned)
+			if(resetsidemarks) General.Map.Map.ClearMarkedSidedefs(false);
+			
+			// Begin with first sidedef
+			if(SidedefTextureMatch(start, originaltexture))
+			{
+				SidedefFillJob first = new SidedefFillJob();
+				first.sidedef = start;
+				first.forward = true;
+				todo.Push(first);
+			}
+			
+			// Continue until nothing more to align
+			while(todo.Count > 0)
+			{
+				// Get the align job to do
+				SidedefFillJob j = todo.Pop();
+
+				// Apply texturing
+				if(j.sidedef.HighRequired() && j.sidedef.LongHighTexture == originaltexture) j.sidedef.SetTextureHigh(filltexture);
+				if((j.sidedef.LongMiddleTexture != MapSet.EmptyLongName || j.sidedef.MiddleRequired()) &&
+				   (j.sidedef.LongMiddleTexture == originaltexture)) j.sidedef.SetTextureMid(filltexture);
+				if(j.sidedef.LowRequired() && j.sidedef.LongLowTexture == originaltexture) j.sidedef.SetTextureLow(filltexture);
+				
+				j.sidedef.Marked = true;
+				
+				if(j.forward)
+				{
+					// Add sidedefs forward (connected to the right vertex)
+					Vertex v = j.sidedef.IsFront ? j.sidedef.Line.End : j.sidedef.Line.Start;
+					AddSidedefsForFloodfill(todo, v, true, originaltexture);
+
+					// Add sidedefs backward (connected to the left vertex)
+					v = j.sidedef.IsFront ? j.sidedef.Line.Start : j.sidedef.Line.End;
+					AddSidedefsForFloodfill(todo, v, false, originaltexture);
+				}
+				else
+				{
+					// Add sidedefs backward (connected to the left vertex)
+					Vertex v = j.sidedef.IsFront ? j.sidedef.Line.Start : j.sidedef.Line.End;
+					AddSidedefsForFloodfill(todo, v, false, originaltexture);
+
+					// Add sidedefs forward (connected to the right vertex)
+					v = j.sidedef.IsFront ? j.sidedef.Line.End : j.sidedef.Line.Start;
+					AddSidedefsForFloodfill(todo, v, true, originaltexture);
+				}
+			}
+		}
+
+		// This adds the matching, unmarked sidedefs from a vertex for texture alignment
+		private static void AddSidedefsForFloodfill(Stack<SidedefFillJob> stack, Vertex v, bool forward, long texturelongname)
+		{
+			foreach(Linedef ld in v.Linedefs)
+			{
+				Sidedef side1 = forward ? ld.Front : ld.Back;
+				Sidedef side2 = forward ? ld.Back : ld.Front;
+				if((ld.Start == v) && (side1 != null) && !side1.Marked)
+				{
+					if(SidedefTextureMatch(side1, texturelongname))
+					{
+						SidedefFillJob nj = new SidedefFillJob();
+						nj.forward = forward;
+						nj.sidedef = side1;
+						stack.Push(nj);
+					}
+				}
+				else if((ld.End == v) && (side2 != null) && !side2.Marked)
+				{
+					if(SidedefTextureMatch(side2, texturelongname))
+					{
+						SidedefFillJob nj = new SidedefFillJob();
+						nj.forward = forward;
+						nj.sidedef = side2;
+						stack.Push(nj);
+					}
+				}
+			}
+		}
+
+		#endregion
+
+		#region ================== Texture Alignment
+		
+		// This checks if any of the sidedef texture match the given texture
+		public static bool SidedefTextureMatch(Sidedef sd, long texturelongname)
+		{
+			return ((sd.LongHighTexture == texturelongname) && sd.HighRequired()) ||
+				   ((sd.LongLowTexture == texturelongname) && sd.LowRequired()) ||
+				   ((sd.LongMiddleTexture == texturelongname) && (sd.MiddleRequired() || sd.LongMiddleTexture != MapSet.EmptyLongName)) ;
+		}
+
+		//mxd. This converts offsetY from/to "normalized" offset for given wall part
+		public static float GetSidedefOffsetY(Sidedef side, VisualGeometryType part, float offset, float scaleY, bool fromNormalized)
+		{
+			switch(part)
+			{
+				case VisualGeometryType.WALL_UPPER:
+					return GetSidedefTopOffsetY(side, offset, scaleY, fromNormalized);
+				
+				case VisualGeometryType.WALL_MIDDLE:
+				case VisualGeometryType.WALL_MIDDLE_3D:
+					return GetSidedefMiddleOffsetY(side, offset, scaleY, fromNormalized);
+
+				case VisualGeometryType.WALL_LOWER:
+					return GetSidedefBottomOffsetY(side, offset, scaleY, fromNormalized);
+
+				default:
+					throw new NotSupportedException("Tools.GetSidedefOffsetY: '" + part + "' geometry type is not supported!");
+			}
+		}
+
+		//mxd. This converts offsetY from/to "normalized" offset for given upper wall
+		public static float GetSidedefTopOffsetY(Sidedef side, float offset, float scaleY, bool fromNormalized) 
+		{
+			if(side.Line.IsFlagSet(General.Map.Config.UpperUnpeggedFlag) || side.Other == null || side.Other.Sector == null)
+				return offset;
+
+			//if we don't have UpperUnpegged flag, normalize offset
+			float surfaceHeight = side.GetHighHeight() * scaleY;
+			return (float)Math.Round((fromNormalized ? offset + surfaceHeight : offset - surfaceHeight), General.Map.FormatInterface.VertexDecimals);
+		}
+
+		//mxd. This converts offsetY from/to "normalized" offset for given middle wall
+		public static float GetSidedefMiddleOffsetY(Sidedef side, float offset, float scaleY, bool fromNormalized) 
+		{
+			if(side.Sector == null) return offset;
+
+			// Normalize offset
+			float surfaceHeight;
+			if(side.Other != null && side.Other.Sector != null)
+			{
+				if(side.Line.IsFlagSet(General.Map.Config.LowerUnpeggedFlag)) 
+				{
+					// Double-sided with LowerUnpeggedFlag set
+					surfaceHeight = (side.Sector.CeilHeight - Math.Max(side.Sector.FloorHeight, side.Other.Sector.FloorHeight)) * scaleY;
+				} 
+				else 
+				{
+					// Double-sided without LowerUnpeggedFlag
+					surfaceHeight = Math.Abs(side.Sector.CeilHeight - side.Other.Sector.CeilHeight) * scaleY;
+				}
+			}
+			else
+			{
+				if(side.Line.IsFlagSet(General.Map.Config.LowerUnpeggedFlag))
+				{
+					// Single-sided with LowerUnpeggedFlag set
+					// Absolute value is used because ceiling height of vavoom-type 3d floors 
+					// is lower than floor height
+					surfaceHeight = (Math.Abs(side.Sector.CeilHeight - side.Sector.FloorHeight)) * scaleY;
+				}
+				else
+				{
+					// Single-sided without LowerUnpeggedFlag
+					return offset;
+				}
+			}
+
+			return (float)Math.Round((fromNormalized ? offset + surfaceHeight : offset - surfaceHeight), General.Map.FormatInterface.VertexDecimals);
+		}
+
+		//mxd. This converts offsetY from/to "normalized" offset for given lower wall
+		public static float GetSidedefBottomOffsetY(Sidedef side, float offset, float scaleY, bool fromNormalized) 
+		{
+			float surfaceHeight;
+			if(side.Line.IsFlagSet(General.Map.Config.LowerUnpeggedFlag)) 
+			{
+				if(side.Other == null || side.Other.Sector == null || side.Sector.CeilTexture != General.Map.Config.SkyFlatName ||
+					side.Other.Sector.CeilTexture != General.Map.Config.SkyFlatName)
+					return offset;
+
+				//normalize offset the way Doom does it when front and back sector's ceiling is sky
+				surfaceHeight = (side.Sector.CeilHeight - side.Other.Sector.CeilHeight) * scaleY;
+			} 
+			else 
+			{
+				//normalize offset
+				surfaceHeight = (side.Sector.CeilHeight - side.Other.Sector.FloorHeight) * scaleY;
+			}
+
+			return (float)Math.Round((fromNormalized ? offset + surfaceHeight : offset - surfaceHeight), General.Map.FormatInterface.VertexDecimals);
+		}
+		
+		#endregion
+		
+		#region ================== Tags and Actions
+		
+		/// <summary>
+		/// This removes all tags on the marked geometry.
+		/// </summary>
+		public static void RemoveMarkedTags()
+		{
+			General.Map.Map.ForAllTags<object>(RemoveTagHandler, true, null);
+		}
+		
+		// This removes tags
+		private static void RemoveTagHandler(MapElement element, bool actionargument, UniversalType type, ref int value, object obj)
+		{
+			value = 0;
+		}
+		
+		/// <summary>
+		/// This renumbers all tags on the marked geometry.
+		/// </summary>
+		public static void RenumberMarkedTags()
+		{
+			Dictionary<int, int> tagsmap = new Dictionary<int, int>();
+			
+			// Collect the tag numbers used in the marked geometry
+			General.Map.Map.ForAllTags(CollectTagNumbersHandler, true, tagsmap);
+			
+			// Get new tags that are unique within unmarked geometry
+			List<int> newtags = General.Map.Map.GetMultipleNewTags(tagsmap.Count, false);
+			
+			// Map the old tags with the new tags
+			int index = 0;
+			List<int> oldkeys = new List<int>(tagsmap.Keys);
+			foreach(int ot in oldkeys) tagsmap[ot] = newtags[index++];
+			
+			// Now renumber the old tags with the new ones
+			General.Map.Map.ForAllTags(RenumberTagsHandler, true, tagsmap);
+		}
+		
+		// This collects tags in a dictionary
+		private static void CollectTagNumbersHandler(MapElement element, bool actionargument, UniversalType type, ref int value, Dictionary<int, int> tagsmap)
+		{
+			if(value != 0)
+				tagsmap[value] = value;
+		}
+
+		// This remaps tags from a dictionary
+		private static void RenumberTagsHandler(MapElement element, bool actionargument, UniversalType type, ref int value, Dictionary<int, int> tagsmap)
+		{
+			if(value != 0)
+				value = tagsmap[value];
+		}
+		
+		/// <summary>
+		/// This removes all actions on the marked geometry.
+		/// </summary>
+		public static void RemoveMarkedActions()
+		{
+			// Remove actions from things
+			foreach(Thing t in General.Map.Map.Things)
+			{
+				if(t.Marked)
+				{
+					t.Action = 0;
+					for(int i = 0; i < Thing.NUM_ARGS; i++) t.Args[i] = 0;
+				}
+			}
+			
+			// Remove actions from linedefs
+			foreach(Linedef l in General.Map.Map.Linedefs)
+			{
+				if(l.Marked)
+				{
+					l.Action = 0;
+					for(int i = 0; i < Linedef.NUM_ARGS; i++) l.Args[i] = 0;
+				}
+			}
+		}
+		
+		#endregion
+
+		#region ================== Things (mxd)
+
+		public static bool TryAlignThingToLine(Thing t, Linedef l) 
+		{
+			if(l.Back == null) 
+			{
+				if(CanAlignThingTo(t, l.Front.Sector))
+				{
+					AlignThingToLine(t, l, true);
+					return true;
+				}
+				return false;
+			}
+
+			if(l.Front == null ) 
+			{
+				if(CanAlignThingTo(t, l.Back.Sector)) 
+				{
+					AlignThingToLine(t, l, false);
+					return true;
+				}
+				return false;
+			}
+
+			float side = l.SideOfLine(t.Position);
+
+			//already on line
+			if(side == 0) 
+			{ 
+				t.Rotate(General.ClampAngle(180 + l.AngleDeg));
+				return true;
+			}
+
+			//thing is on front side of the line
+			if(side < 0) 
+			{ 
+				//got any walls to align to?
+				if(CanAlignThingTo(t, l.Front.Sector, l.Back.Sector)) 
+				{
+					AlignThingToLine(t, l, true);
+					return true;
+				}
+
+				return false;
+			}
+
+			//thing is on back side of the line
+			//got any walls to align to?
+			if(CanAlignThingTo(t, l.Back.Sector, l.Front.Sector)) 
+			{
+				AlignThingToLine(t, l, false);
+				return true;
+			}
+
+			return false;
+		}
+
+		// Checks if there's a wall at appropriate height to align thing to
+		private static bool CanAlignThingTo(Thing t, Sector front, Sector back) 
+		{
+			ThingTypeInfo ti = General.Map.Data.GetThingInfo(t.Type);
+			int absz = GetThingAbsoluteZ(t, ti);
+			int height = ti.Height == 0 ? 1 : (int)ti.Height;
+			Rectangle thing =  new Rectangle(0, ti.Hangs ? absz - height : absz, 1, height);
+
+			if(front.FloorHeight < back.FloorHeight) 
+			{
+				Rectangle lower = new Rectangle(0, front.FloorHeight, 1, back.FloorHeight - front.FloorHeight);
+				if(thing.IntersectsWith(lower)) return true;
+			}
+
+			if(front.CeilHeight > back.CeilHeight) 
+			{
+				Rectangle upper = new Rectangle(0, back.CeilHeight, 1, front.CeilHeight - back.CeilHeight);
+				if(thing.IntersectsWith(upper)) return true;
+			}
+
+			return false;
+		}
+
+		// Checks if there's a wall at appropriate height to align thing to
+		private static bool CanAlignThingTo(Thing t, Sector sector) 
+		{
+			ThingTypeInfo ti = General.Map.Data.GetThingInfo(t.Type);
+			int absz = GetThingAbsoluteZ(t, ti);
+			Rectangle thing = new Rectangle(0, absz, 1, ti.Height == 0 ? 1 : (int)ti.Height);
+
+			Rectangle middle = new Rectangle(0, sector.FloorHeight, 1, sector.CeilHeight - sector.FloorHeight);
+			return thing.IntersectsWith(middle);
+		}
+
+		private static void AlignThingToLine(Thing t, Linedef l, bool front) 
+		{
+			//get aligned position
+			Vector2D pos = l.NearestOnLine(t.Position);
+			Sector initialSector = t.Sector;
+
+			//add a small offset so we don't end up moving thing into void
+			if(front)
+				t.Move(new Vector2D(pos.x - (float)Math.Cos(l.Angle), pos.y - (float)Math.Sin(l.Angle)));
+			else
+				t.Move(new Vector2D(pos.x + (float)Math.Cos(l.Angle), pos.y + (float)Math.Sin(l.Angle)));
+
+			//apply new settings
+			t.SnapToAccuracy();
+			t.DetermineSector();
+			t.Rotate(General.ClampAngle(front ? 180 + l.AngleDeg : l.AngleDeg));
+
+			//keep thing height constant
+			if(initialSector != t.Sector && General.Map.FormatInterface.HasThingHeight) 
+			{
+				ThingTypeInfo ti = General.Map.Data.GetThingInfo(t.Type);
+				if(ti.AbsoluteZ) return;
+
+				if(ti.Hangs && initialSector.CeilHeight != t.Sector.CeilHeight) 
+				{
+					t.Move(t.Position.x, t.Position.y, t.Position.z - (initialSector.CeilHeight - t.Sector.CeilHeight));
+					return;
+				}
+
+				if(initialSector.FloorHeight != t.Sector.FloorHeight)
+					t.Move(t.Position.x, t.Position.y, t.Position.z + (initialSector.FloorHeight - t.Sector.FloorHeight));
+			}
+		}
+
+		public static int GetThingAbsoluteZ(Thing t, ThingTypeInfo ti) 
+		{
+			// Determine z info
+			if(ti.AbsoluteZ) return (int)t.Position.z;
+
+			if(t.Sector != null) 
+			{
+				// Hangs from ceiling?
+				if(ti.Hangs) return (int)(t.Sector.CeilHeight - t.Position.z - ti.Height);
+				
+				return (int)(t.Sector.FloorHeight + t.Position.z);
+			}
+			return (int)t.Position.z;
+		}
+
+		public static List<Line3D> GetDynamicLightShapes()
+		{
+			List<Line3D> circles = new List<Line3D>();
+			foreach(Thing t in General.Map.Map.Things)
+			{
+				int lightid = Array.IndexOf(GZBuilder.GZGeneral.GZ_LIGHTS, t.Type);
+				if(lightid == -1) continue;
+
+				// TODO: this basically duplicates VisualThing.UpdateLight()...
+				// Determine light radiii
+				int primaryradius;
+				int secondaryradius = 0;
+
+				if(lightid < GZBuilder.GZGeneral.GZ_LIGHT_TYPES[2]) //if it's gzdoom light
+				{
+					int n;
+					if(lightid < GZBuilder.GZGeneral.GZ_LIGHT_TYPES[0]) n = 0;
+					else if(lightid < GZBuilder.GZGeneral.GZ_LIGHT_TYPES[1]) n = 10;
+					else n = 20;
+					DynamicLightType lightType = (DynamicLightType)(t.Type - 9800 - n);
+
+					if(lightType == DynamicLightType.SECTOR)
+					{
+						if(t.Sector == null) t.DetermineSector();
+						int scaler = (t.Sector != null ? t.Sector.Brightness / 4 : 2);
+						primaryradius = (int)Math.Round((t.Args[3] * scaler) * General.Settings.GZDynamicLightRadius);
+					}
+					else
+					{
+						primaryradius = (int)Math.Round((t.Args[3] * 2) * General.Settings.GZDynamicLightRadius); //works... that.. way in GZDoom
+						if(lightType > 0)
+							secondaryradius = (int)Math.Round((t.Args[4] * 2) * General.Settings.GZDynamicLightRadius);
+					}
+				}
+				else //it's one of vavoom lights
+				{
+					primaryradius = (int)Math.Round((t.Args[0] * 8) * General.Settings.GZDynamicLightRadius);
+				}
+
+				// Check radii...
+				if(primaryradius < 1 && secondaryradius < 1) continue;
+
+				// Determine light color
+				PixelColor color;
+				switch(t.Type)
+				{
+					case 1502: // Vavoom light
+						color = new PixelColor(255, 255, 255, 255);
+						break;
+
+					case 1503: // Vavoom colored light
+						color = new PixelColor(255, (byte)t.Args[1], (byte)t.Args[2], (byte)t.Args[3]);
+						break;
+
+					default:
+						color = new PixelColor(255, (byte)t.Args[0], (byte)t.Args[1], (byte)t.Args[2]);
+						break;
+				}
+
+				// Add lines if visible
+				const int numsides = 24;
+				if(primaryradius > 0) circles.AddRange(MakeCircleLines(t.Position, color, primaryradius, numsides));
+				if(secondaryradius > 0) circles.AddRange(MakeCircleLines(t.Position, color, secondaryradius, numsides));
+			}
+
+			// Done
+			return circles;
+		}
+
+		private static IEnumerable<Line3D> MakeCircleLines(Vector2D pos, PixelColor color, float radius, int numsides)
+		{
+			List<Line3D> result = new List<Line3D>(numsides);
+			Vector2D start = new Vector2D(pos.x, pos.y + radius);
+			float anglestep = Angle2D.PI2 / numsides;
+			
+			for(int i = 1; i < numsides + 1; i++)
+			{
+				Vector2D end = pos + new Vector2D((float)Math.Sin(anglestep * i) * radius, (float)Math.Cos(anglestep * i) * radius);
+				result.Add(new Line3D(start, end, color, false));
+				start = end;
+			}
+
+			return result;
+		} 
+
+		#endregion
+
+		#region ================== Linedefs (mxd)
+
+		/// <summary>Flips sector linedefs so they all face either inward or outward.</summary>
+		public static void FlipSectorLinedefs(ICollection<Sector> sectors, bool selectedlinesonly) 
+		{
+			Dictionary<Linedef, bool> processed = new Dictionary<Linedef, bool>();
+			
+			foreach(Sector s in sectors) 
+			{
+				List<Linedef> frontlines = new List<Linedef>();
+				List<Linedef> backlines = new List<Linedef>();
+				int unselectedfrontlines = 0;
+				int unselectedbacklines = 0;
+
+				//sort lines
+				foreach(Sidedef side in s.Sidedefs) 
+				{
+					if(processed.ContainsKey(side.Line)) continue;
+					if(selectedlinesonly && !side.Line.Selected)
+					{
+						if(side == side.Line.Front) unselectedfrontlines++;
+						else unselectedbacklines++;
+						continue;
+					}
+					
+					if(side == side.Line.Front) 
+						frontlines.Add(side.Line);
+					else
+						backlines.Add(side.Line);
+
+					processed.Add(side.Line, false);
+				}
+
+				//flip lines
+				if(frontlines.Count == 0 || (frontlines.Count + unselectedfrontlines > backlines.Count + unselectedbacklines && backlines.Count > 0)) 
+				{
+					foreach(Linedef l in backlines) 
+					{
+						l.FlipVertices();
+						l.FlipSidedefs();
+					}
+				} 
+				else 
+				{
+					foreach(Linedef l in frontlines) 
+					{
+						l.FlipVertices();
+						l.FlipSidedefs();
+					}
+				}
+			}
+		}
+
+		#endregion
+
+		#region ================== Sidedefs (mxd)
+
+		/// <summary>Updates the 'lightfog' UDMF flag to display sidedef brightness on fogged walls. Returns 1 if flag was added, -1 if it was removed, 0 if flag wasn't changed</summary>
+		public static int UpdateLightFogFlag(Sidedef side) 
+		{
+			//Side requires the flag?
+			if(side.Sector == null) return 0;
+			if(!side.Fields.ContainsKey("light")) 
+			{
+				//Unset the flag
+				if(side.IsFlagSet("lightfog")) 
+				{
+					side.SetFlag("lightfog", false);
+					return -1;
+				}
+				return 0;
+			}
+
+			//Update the flag
+			if(General.Map.Data.MapInfo.HasFadeColor ||
+			   (General.Map.Data.MapInfo.HasOutsideFogColor && side.Sector.CeilTexture == General.Map.Config.SkyFlatName) ||
+			   side.Sector.Fields.ContainsKey("fadecolor")) 
+			{
+				//Set the flag
+				if(!side.IsFlagSet("lightfog")) 
+				{
+					side.SetFlag("lightfog", true);
+					return 1;
+				}
+			} 
+			else 
+			{
+				//Unset the flag
+				if(side.IsFlagSet("lightfog")) 
+				{
+					side.SetFlag("lightfog", false);
+					return -1;
+				}
+			}
+
+			return 0;
+		}
+
+		#endregion
+
+		#region ================== Misc Exported Functions
+
+		/// <summary>
+		/// This performs a Hermite spline interpolation and returns the result position.
+		/// Where u (0 - 1) is the wanted position on the curve between p1 (using tangent t1) and p2 (using tangent t2).
+		/// </summary>
+		public static Vector2D HermiteSpline(Vector2D p1, Vector2D t1, Vector2D p2, Vector2D t2, float u)
+		{
+			return D3DDevice.V2D(Vector2.Hermite(D3DDevice.V2(p1), D3DDevice.V2(t1), D3DDevice.V2(p2), D3DDevice.V2(t2), u));
+		}
+
+		/// <summary>
+		/// This performs a Hermite spline interpolation and returns the result position.
+		/// Where u (0 - 1) is the wanted position on the curve between p1 (using tangent t1) and p2 (using tangent t2).
+		/// </summary>
+		public static Vector3D HermiteSpline(Vector3D p1, Vector3D t1, Vector3D p2, Vector3D t2, float u)
+		{
+			return D3DDevice.V3D(Vector3.Hermite(D3DDevice.V3(p1), D3DDevice.V3(t1), D3DDevice.V3(p2), D3DDevice.V3(t2), u));
+		}
+
+		//mxd
+		public static int GetDropDownWidth(ComboBox cb) 
+		{
+			int maxwidth = 0;
+			foreach(var obj in cb.Items)
+			{
+				int temp = TextRenderer.MeasureText(obj.ToString(), cb.Font).Width;
+				if(temp > maxwidth) maxwidth = temp;
+			}
+			return maxwidth > 0 ? maxwidth + 6 : 1;
+		}
+
+		//mxd
+		public static Color GetSectorFadeColor(Sector s)
+		{
+			if(s.Fields.ContainsKey("fadecolor")) return PixelColor.FromInt(s.Fields.GetValue("fadecolor", 0)).ToColor();
+			if(General.Map.Data.MapInfo.HasOutsideFogColor && s.CeilTexture == General.Map.Config.SkyFlatName)
+			{
+				return General.Map.Data.MapInfo.OutsideFogColor.ToColor();
+			}
+ 
+			return (General.Map.Data.MapInfo.HasFadeColor ? General.Map.Data.MapInfo.FadeColor.ToColor() : Color.Black);
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Geometry/Triangulation.cs b/Source/Core/Geometry/Triangulation.cs
new file mode 100644
index 0000000..ff0f1a9
--- /dev/null
+++ b/Source/Core/Geometry/Triangulation.cs
@@ -0,0 +1,951 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Map;
+using System.Collections.ObjectModel;
+using CodeImp.DoomBuilder.IO;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Geometry
+{
+	/// <summary>
+	/// Responsible for creating sector polygons.
+	/// Performs triangulation of sectors by using ear clipping.
+	/// </summary>
+	public sealed class Triangulation
+	{
+		#region ================== Delegates
+
+		#if DEBUG
+		
+		// For debugging purpose only!
+		// These are not called in a release build
+		public delegate void ShowPolygon(LinkedList<EarClipVertex> p);
+		public delegate void ShowEarClip(EarClipVertex[] found, LinkedList<EarClipVertex> remaining);
+		public delegate void ShowRemaining(LinkedList<EarClipVertex> remaining);
+		
+		// For debugging purpose only!
+		// These are not called in a release build
+		public ShowPolygon OnShowPolygon;
+		public ShowEarClip OnShowEarClip;
+		public ShowRemaining OnShowRemaining;
+		
+		#endif
+
+		#endregion
+
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		// Number of vertices per island
+		private ReadOnlyCollection<int> islandvertices;
+		
+		// Vertices that result from the triangulation, 3 per triangle.
+		private ReadOnlyCollection<Vector2D> vertices;
+
+		// These sidedefs match with the vertices. If a vertex is not the start
+		// along a sidedef, this list contains a null entry for that vertex.
+		private ReadOnlyCollection<Sidedef> sidedefs;
+		
+		// Temporary array for the sidedefs deserialization
+		private int[] sidedefindices;
+		
+		#endregion
+		
+		#region ================== Properties
+		
+		public ReadOnlyCollection<int> IslandVertices { get { return islandvertices; } }
+		public ReadOnlyCollection<Vector2D> Vertices { get { return vertices; } }
+		public ReadOnlyCollection<Sidedef> Sidedefs { get { return sidedefs; } }
+		
+		#endregion
+		
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public static Triangulation Create(Sector sector)
+		{
+			Triangulation t = new Triangulation();
+			t.Triangulate(sector);
+			return t;
+		}
+
+		// Constructor
+		public Triangulation()
+		{
+			islandvertices = Array.AsReadOnly(new int[0]);
+			vertices = Array.AsReadOnly(new Vector2D[0]);
+			sidedefs = Array.AsReadOnly(new Sidedef[0]);
+		}
+
+		// This performs the triangulation
+		public void Triangulate(Sector s)
+		{
+			// Initialize
+			List<int> islandslist = new List<int>();
+			List<Vector2D> verticeslist = new List<Vector2D>();
+			List<Sidedef> sidedefslist = new List<Sidedef>();
+
+			// We have no destructor
+			GC.SuppressFinalize(this);
+			
+			/*
+			 * This process is divided into several steps:
+			 * 
+			 * 1) Tracing the sector lines to find clockwise outer polygons
+			 * and counter-clockwise inner polygons. These are arranged in a
+			 * polygon tree for the next step.
+			 * 
+			 * 2) Cutting the inner polygons to make a flat list of only
+			 * outer polygons.
+			 * 
+			 * 3) Ear-clipping the polygons to create triangles.
+			 * 
+			 */
+
+			// TRACING
+			List<EarClipPolygon> polys = DoTrace(s);
+			
+			// CUTTING
+			DoCutting(polys);
+			
+			// EAR-CLIPPING
+			foreach(EarClipPolygon p in polys)
+				islandslist.Add(DoEarClip(p, verticeslist, sidedefslist));
+
+			// Make arrays
+			islandvertices = Array.AsReadOnly(islandslist.ToArray());
+			vertices = Array.AsReadOnly(verticeslist.ToArray());
+			sidedefs = Array.AsReadOnly(sidedefslist.ToArray());
+		}
+
+		#endregion
+		
+		#region ================== Serialization
+		
+		// Serialize / deserialize
+		internal void ReadWrite(IReadWriteStream s)
+		{
+			if(s.IsWriting)
+			{
+				s.wInt(islandvertices.Count);
+				for(int i = 0; i < islandvertices.Count; i++) s.wInt(islandvertices[i]);
+				
+				s.wInt(vertices.Count);
+				for(int i = 0; i < vertices.Count; i++) s.wVector2D(vertices[i]);
+				
+				s.wInt(sidedefs.Count);
+				for(int i = 0; i < sidedefs.Count; i++)
+				{
+					if(sidedefs[i] != null)
+						s.wInt(sidedefs[i].SerializedIndex);
+					else
+						s.wInt(-1);
+				}
+			}
+			else
+			{
+				int c;
+				
+				s.rInt(out c);
+				int[] islandverticeslist = new int[c];
+				for(int i = 0; i < c; i++) s.rInt(out islandverticeslist[i]);
+				islandvertices = Array.AsReadOnly(islandverticeslist);
+				
+				s.rInt(out c);
+				Vector2D[] verticeslist = new Vector2D[c];
+				for(int i = 0; i < c; i++) s.rVector2D(out verticeslist[i]);
+				vertices = Array.AsReadOnly(verticeslist);
+				
+				s.rInt(out c);
+				sidedefindices = new int[c];
+				for(int i = 0; i < c; i++) s.rInt(out sidedefindices[i]);
+			}
+		}
+		
+		// After deserialization we need to find the actual sidedefs back
+		internal void PostDeserialize(MapSet map)
+		{
+			// Find our sidedefs
+			List<Sidedef> sides = new List<Sidedef>(sidedefindices.Length);
+			for(int i = 0; i < sidedefindices.Length; i++)
+			{
+				if(sidedefindices[i] >= 0)
+					sides.Add(map.SidedefIndices[sidedefindices[i]]);
+				else
+					sides.Add(null);
+			}
+			
+			// We don't need this array any longer
+			sidedefindices = null;
+			
+			// Keep readonly array
+			sidedefs = Array.AsReadOnly(sides.ToArray());
+		}
+		
+		
+		#endregion
+		
+		#region ================== Tracing
+
+		// This traces sector lines to create a polygon tree
+		private static List<EarClipPolygon> DoTrace(Sector s)
+		{
+			Dictionary<Sidedef, bool> todosides = new Dictionary<Sidedef, bool>(s.Sidedefs.Count);
+			Dictionary<Vertex, Vertex> ignores = new Dictionary<Vertex,Vertex>();
+			List<EarClipPolygon> root = new List<EarClipPolygon>();
+
+			// Fill the dictionary
+			// The bool value is used to indicate lines which has been visited in the trace
+			foreach(Sidedef sd in s.Sidedefs) todosides.Add(sd, false);
+			
+			// First remove all sides that refer to the same sector on both sides of the line
+			RemoveDoubleSidedefReferences(todosides, s.Sidedefs);
+
+			// Continue until all sidedefs have been processed
+			while(todosides.Count > 0)
+			{
+				// Reset all visited indicators
+				foreach(Sidedef sd in s.Sidedefs) if(todosides.ContainsKey(sd)) todosides[sd] = false;
+				
+				// Find the right-most vertex to start a trace with.
+				// This guarantees that we start out with an outer polygon and we just
+				// have to check if it is inside a previously found polygon.
+				Vertex start = FindRightMostVertex(todosides, ignores);
+
+				// No more possible start vertex found?
+				// Then leave with what we have up till now.
+				if(start == null) break;
+				
+				// Trace to find a polygon
+				SidedefsTracePath path = DoTracePath(new SidedefsTracePath(), start, null, s, todosides);
+
+				// If tracing is not possible (sector not closed?)
+				// then add the start to the ignore list and try again later
+				if(path == null)
+				{
+					// Ignore vertex as start
+					ignores.Add(start, start);
+				}
+				else
+				{
+					// Remove the sides found in the path
+					foreach(Sidedef sd in path) todosides.Remove(sd);
+
+					// Create the polygon
+					EarClipPolygon newpoly = path.MakePolygon();
+					
+					// Determine where this polygon goes in our tree
+					foreach(EarClipPolygon p in root)
+					{
+						// Insert if it belongs as a child
+						if(p.InsertChild(newpoly))
+						{
+							// Done
+							newpoly = null;
+							break;
+						}
+					}
+
+					// Still not inserted in our tree?
+					if(newpoly != null)
+					{
+						// Then add it at root level as outer polygon
+						newpoly.Inner = false;
+						root.Add(newpoly);
+					}
+				}
+			}
+
+			// Return result
+			return root;
+		}
+
+		// This recursively traces a path
+		// Returns the resulting TracePath when the search is complete
+		// or returns null when no path found.
+		private static SidedefsTracePath DoTracePath(SidedefsTracePath history, Vertex fromhere, Vertex findme, Sector sector, Dictionary<Sidedef, bool> sides)
+		{
+			// Found the vertex we are tracing to?
+			if(fromhere == findme) return history;
+
+			// On the first run, findme is null (otherwise the trace would end
+			// immeditely when it starts) so set findme here on the first run.
+			if(findme == null) findme = fromhere;
+
+			// Make a list of sides referring to the same sector
+			List<Sidedef> allsides = new List<Sidedef>(fromhere.Linedefs.Count * 2);
+			foreach(Linedef l in fromhere.Linedefs)
+			{
+				// Should we go along the front or back side?
+				// This is very important for clockwise polygon orientation!
+				if(l.Start == fromhere)
+				{
+					// Front side of line connected to sector?
+					if((l.Front != null) && (l.Front.Sector == sector))
+					{
+						// Visit here when not visited yet
+						if(sides.ContainsKey(l.Front) && !sides[l.Front]) allsides.Add(l.Front);
+					}
+				}
+				else
+				{
+					// Back side of line connected to sector?
+					if((l.Back != null) && (l.Back.Sector == sector))
+					{
+						// Visit here when not visited yet
+						if(sides.ContainsKey(l.Back) && !sides[l.Back]) allsides.Add(l.Back);
+					}
+				}
+			}
+
+			// Previous line available?
+			if(history.Count > 0)
+			{
+				// This is done to ensure the tracing works along vertices that are shared by
+				// more than 2 lines/sides of the same sector. We must continue tracing along
+				// the first next smallest delta angle! This sorts the smallest delta angle to
+				// the top of the list.
+				SidedefAngleSorter sorter = new SidedefAngleSorter(history[history.Count - 1], fromhere);
+				allsides.Sort(sorter);
+			}
+			
+			// Go for all lines connected to this vertex
+			foreach(Sidedef s in allsides)
+			{
+				// Mark sidedef as visited and move to next vertex
+				sides[s] = true;
+				SidedefsTracePath nextpath = new SidedefsTracePath(history, s);
+				Vertex nextvertex = (s.Line.Start == fromhere ? s.Line.End : s.Line.Start);
+				
+				SidedefsTracePath result = DoTracePath(nextpath, nextvertex, findme, sector, sides);
+				if(result != null) return result;
+			}
+
+			// Nothing found
+			return null;
+		}
+
+		// This removes all sidedefs which has a sidedefs on the other side
+		// of the same line that refers to the same sector. These are removed
+		// because they are useless and make the triangulation inefficient.
+		private static void RemoveDoubleSidedefReferences(Dictionary<Sidedef, bool> todosides, ICollection<Sidedef> sides)
+		{
+			// Go for all sides
+			foreach(Sidedef sd in sides)
+			{
+				// Double sided?
+				if(sd.Other != null)
+				{
+					// Referring to the same sector on both sides?
+					if(sd.Sector == sd.Other.Sector)
+					{
+						// Remove this one
+						todosides.Remove(sd);
+					}
+				}
+			}
+		}
+
+		// This finds the right-most vertex to start tracing with
+		private static Vertex FindRightMostVertex(Dictionary<Sidedef, bool> sides, Dictionary<Vertex, Vertex> ignores)
+		{
+			Vertex found = null;
+			
+			// Go for all sides to find the right-most side
+			foreach(KeyValuePair<Sidedef, bool> sd in sides)
+			{
+				// First found?
+				if((found == null) && !ignores.ContainsKey(sd.Key.Line.Start)) found = sd.Key.Line.Start;
+				if((found == null) && !ignores.ContainsKey(sd.Key.Line.End)) found = sd.Key.Line.End;
+				
+				// Compare?
+				if(found != null)
+				{
+					// Check if more to the right than the previous found
+					if((sd.Key.Line.Start.Position.x > found.Position.x) && !ignores.ContainsKey(sd.Key.Line.Start)) found = sd.Key.Line.Start;
+					if((sd.Key.Line.End.Position.x > found.Position.x) && !ignores.ContainsKey(sd.Key.Line.End)) found = sd.Key.Line.End;
+				}
+			}
+			
+			// Return result
+			return found;
+		}
+		
+		#endregion
+
+		#region ================== Cutting
+
+		// This cuts into outer polygons to solve inner polygons and make the polygon tree flat
+		private void DoCutting(List<EarClipPolygon> polys)
+		{
+			Queue<EarClipPolygon> todo = new Queue<EarClipPolygon>(polys);
+			
+			// Begin processing outer polygons
+			while(todo.Count > 0)
+			{
+				// Get outer polygon to process
+				EarClipPolygon p = todo.Dequeue();
+
+				// Any inner polygons to work with?
+				if(p.Children.Count > 0)
+				{
+					// Go for all the children
+					foreach(EarClipPolygon c in p.Children)
+					{
+						// The children of the children are outer polygons again,
+						// so move them to the root and add for processing
+						polys.AddRange(c.Children);
+						foreach(EarClipPolygon sc in c.Children) todo.Enqueue(sc);
+
+						// Remove from inner polygon
+						c.Children.Clear();
+					}
+
+					// Now do some cutting on this polygon to merge the inner polygons
+					MergeInnerPolys(p);
+				}
+			}
+		}
+
+		// This takes an outer polygon and a set of inner polygons to start cutting on
+		private static void MergeInnerPolys(EarClipPolygon p)
+		{
+			LinkedList<EarClipPolygon> todo = new LinkedList<EarClipPolygon>(p.Children);
+
+			// Continue until no more inner polygons to process
+			while(todo.Count > 0)
+			{
+				// Find the inner polygon with the highest x vertex
+				LinkedListNode<EarClipPolygon> found = null;
+				LinkedListNode<EarClipVertex> foundstart = null;
+				LinkedListNode<EarClipPolygon> ip = todo.First;
+				while(ip != null)
+				{
+					LinkedListNode<EarClipVertex> start = FindRightMostVertex(ip.Value);
+					if((foundstart == null) || (start.Value.Position.x > foundstart.Value.Position.x))
+					{
+						// Found a better start
+						found = ip;
+						foundstart = start;
+					}
+					
+					// Next!
+					ip = ip.Next;
+				}
+				
+				// Remove from todo list
+				todo.Remove(found);
+
+				// Get cut start and end
+				SplitOuterWithInner(foundstart, p);
+			}
+			
+			// Remove the children, they should be merged in the polygon by now
+			p.Children.Clear();
+		}
+
+		// This finds the right-most vertex in an inner polygon to use for cut startpoint.
+		private static LinkedListNode<EarClipVertex> FindRightMostVertex(EarClipPolygon p)
+		{
+			LinkedListNode<EarClipVertex> found = p.First;
+			LinkedListNode<EarClipVertex> v = found.Next;
+			
+			// Go for all vertices to find the on with the biggest x value
+			while(v != null)
+			{
+				if(v.Value.Position.x > found.Value.Position.x) found = v;
+				v = v.Next;
+			}
+
+			// Return result
+			return found;
+		}
+		
+		// This finds the cut coordinates and splits the other poly with inner vertices
+		private static void SplitOuterWithInner(LinkedListNode<EarClipVertex> start, EarClipPolygon p)
+		{
+			LinkedListNode<EarClipVertex> insertbefore = null;
+			float foundu = float.MaxValue;
+			Vector2D foundpos = new Vector2D();
+
+			// Create a line from start that goes beyond the right most vertex of p
+			LinkedListNode<EarClipVertex> pr = FindRightMostVertex(p);
+			float startx = start.Value.Position.x;
+			float endx = pr.Value.Position.x + 10.0f;
+			Line2D starttoright = new Line2D(start.Value.Position, new Vector2D(endx, start.Value.Position.y));
+			
+			// Calculate a small bonus (0.1 mappixel)
+			float bonus = starttoright.GetNearestOnLine(new Vector2D(start.Value.Position.x + 0.1f, start.Value.Position.y));
+			
+			// Go for all lines in the outer polygon
+			LinkedListNode<EarClipVertex> v1 = p.Last;
+			LinkedListNode<EarClipVertex> v2 = p.First;
+			while(v2 != null)
+			{
+				// Check if the line goes between startx and endx
+				if((v1.Value.Position.x > startx || v2.Value.Position.x > startx) &&
+				   (v1.Value.Position.x < endx || v2.Value.Position.x < endx))
+				{
+					// Find intersection
+					Line2D pl = new Line2D(v1.Value.Position, v2.Value.Position);
+					float u, ul;
+					pl.GetIntersection(starttoright, out u, out ul);
+					if(float.IsNaN(u))
+					{
+						// We have found a line that is perfectly horizontal
+						// (parallel to the cut scan line) Check if the line
+						// is overlapping the cut scan line.
+						if(v1.Value.Position.y == start.Value.Position.y)
+						{
+							// This is an exceptional situation which causes a bit of a problem, because
+							// this could be a previously made cut, which overlaps another line from the
+							// same cut and we have to determine which of the two we will join with. If we
+							// pick the wrong one, the polygon is no longer valid and triangulation will fail.
+							
+							// Calculate distance of each vertex in units
+							u = starttoright.GetNearestOnLine(v1.Value.Position);
+							ul = starttoright.GetNearestOnLine(v2.Value.Position);
+							
+							// Rule out vertices before the scan line
+							if(u < 0.0f) u = float.MaxValue;
+							if(ul < 0.0f) ul = float.MaxValue;
+							
+							float insert_u = Math.Min(u, ul);
+							Vector2D inserpos = starttoright.GetCoordinatesAt(insert_u);
+							
+							// Check in which direction the line goes.
+							if(v1.Value.Position.x > v2.Value.Position.x)
+							{
+								// The line goes from right to left (towards our start point)
+								// so we must always insert our cut after this line.
+								
+								// If the next line goes up, we consider this a better candidate than
+								// a horizontal line that goes from left to right (the other cut line)
+								// so we give it a small bonus.
+								LinkedListNode<EarClipVertex> v3 = v2.Next ?? v2.List.First;
+								if(v3.Value.Position.y < v2.Value.Position.y)
+									insert_u -= bonus;
+								
+								// Remember this when it is a closer match
+								if(insert_u <= foundu)
+								{
+									insertbefore = v2.Next ?? v2.List.First;
+									foundu = insert_u;
+									foundpos = inserpos;
+								}
+							}
+							else
+							{
+								// The line goes from left to right (away from our start point)
+								// so we must always insert our cut before this line.
+								
+								// If the previous line goes down, we consider this a better candidate than
+								// a horizontal line that goes from right to left (the other cut line)
+								// so we give it a small bonus.
+								LinkedListNode<EarClipVertex> v3 = v1.Previous ?? v1.List.Last;
+								if(v3.Value.Position.y > v1.Value.Position.y)
+									insert_u -= bonus;
+								
+								// Remember this when it is a closer match
+								if(insert_u <= foundu)
+								{
+									insertbefore = v2;
+									foundu = insert_u;
+									foundpos = inserpos;
+								}
+							}
+						}
+					}
+					// Found a closer match?
+					else if((ul >= 0.0f) && (ul <= 1.0f) && (u > 0.0f) && (u <= foundu))
+					{
+						// Found a closer intersection
+						insertbefore = v2;
+						foundu = u;
+						foundpos = starttoright.GetCoordinatesAt(u);
+					}
+				}
+				
+				// Next
+				v1 = v2;
+				v2 = v2.Next;
+			}
+			
+			// Found anything?
+			if(insertbefore != null)
+			{
+				Sidedef sd = (insertbefore.Previous == null) ? insertbefore.List.Last.Value.Sidedef : insertbefore.Previous.Value.Sidedef;
+				
+				// Find the position where we have to split the outer polygon
+				EarClipVertex split = new EarClipVertex(foundpos, null);
+				
+				// Insert manual split vertices
+				p.AddBefore(insertbefore, new EarClipVertex(split, sd));
+				
+				// Start inserting from the start (do I make sense this time?)
+				v1 = start;
+				do
+				{
+					// Insert inner polygon vertex
+					p.AddBefore(insertbefore, new EarClipVertex(v1.Value));
+					v1 = (v1.Next ?? v1.List.First);
+				} while(v1 != start);
+				
+				// Insert manual split vertices
+				p.AddBefore(insertbefore, new EarClipVertex(start.Value, sd));
+				if(split.Position != insertbefore.Value.Position)
+					p.AddBefore(insertbefore, new EarClipVertex(split, sd));
+			}
+		}
+
+		#endregion
+
+		#region ================== Ear Clipping
+
+		// This clips a polygon and returns the triangles
+		// The polygon may not have any holes or islands
+		// See: http://www.geometrictools.com/Documentation/TriangulationByEarClipping.pdf
+		private int DoEarClip(EarClipPolygon poly, List<Vector2D> verticeslist, List<Sidedef> sidedefslist)
+		{
+			LinkedList<EarClipVertex> verts = new LinkedList<EarClipVertex>();
+			List<EarClipVertex> convexes = new List<EarClipVertex>(poly.Count);
+			LinkedList<EarClipVertex> reflexes = new LinkedList<EarClipVertex>();
+			LinkedList<EarClipVertex> eartips = new LinkedList<EarClipVertex>();
+			LinkedListNode<EarClipVertex> n2;
+			EarClipVertex[] t;
+			int countvertices = 0;
+
+			// Go for all vertices to fill list
+			foreach(EarClipVertex vec in poly)
+				vec.SetVertsLink(verts.AddLast(vec));
+
+			// Remove any zero-length lines, these will give problems
+			LinkedListNode<EarClipVertex> n1 = verts.First;
+			do
+			{
+				// Continue until adjacent zero-length lines are removed
+				n2 = n1.Next ?? verts.First;
+				Vector2D d = n1.Value.Position - n2.Value.Position;
+				while((Math.Abs(d.x) < 0.00001f) && (Math.Abs(d.y) < 0.00001f))
+				{
+					n2.Value.Remove();
+					n2 = n1.Next ?? verts.First;
+					if(n2 != null) d = n1.Value.Position - n2.Value.Position; else break;
+				}
+
+				// Next!
+				n1 = n2;
+			}
+			while(n1 != verts.First);
+			
+			// Optimization: Vertices which have lines with the
+			// same angle are useless. Remove them!
+			n1 = verts.First;
+			while(n1 != null)
+			{
+				// Get the next vertex
+				n2 = n1.Next;
+				
+				// Get triangle for v
+				t = GetTriangle(n1.Value);
+				
+				// Check if both lines have the same angle
+				Line2D a = new Line2D(t[0].Position, t[1].Position);
+				Line2D b = new Line2D(t[1].Position, t[2].Position);
+				if(Math.Abs(Angle2D.Difference(a.GetAngle(), b.GetAngle())) < 0.00001f)
+				{
+					// Same angles, remove vertex
+					n1.Value.Remove();
+				}
+				
+				// Next!
+				n1 = n2;
+			}
+
+			// Go for all vertices to determine reflex or convex
+			foreach(EarClipVertex vv in verts)
+			{
+				// Add to reflex or convex list
+				if(IsReflex(GetTriangle(vv))) vv.AddReflex(reflexes); else convexes.Add(vv);
+			}
+
+			// Go for all convex vertices to see if they are ear tips
+			foreach(EarClipVertex cv in convexes)
+			{
+				// Add when this is a valid ear
+				t = GetTriangle(cv);
+				if(CheckValidEar(t, reflexes)) cv.AddEarTip(eartips);
+			}
+
+			#if DEBUG
+			if(OnShowPolygon != null) OnShowPolygon(verts);
+			#endif
+			
+			// Process ears until done
+			while((eartips.Count > 0) && (verts.Count > 2))
+			{
+				// Get next ear
+				EarClipVertex v = eartips.First.Value;
+				t = GetTriangle(v);
+
+				// Only save this triangle when it has an area
+				if(TriangleHasArea(t))
+				{
+					// Add ear as triangle
+					AddTriangleToList(t, verticeslist, sidedefslist, (verts.Count == 3));
+					countvertices += 3;
+				}
+				
+				// Remove this ear from all lists
+				v.Remove();
+				EarClipVertex v1 = t[0];
+				EarClipVertex v2 = t[2];
+
+				#if DEBUG
+				if(TriangleHasArea(t))
+				{
+					if(OnShowEarClip != null) OnShowEarClip(t, verts);
+				}
+				#endif
+				
+				// Test first neighbour
+				EarClipVertex[] t1 = GetTriangle(v1);
+				//bool t1a = true;	//TriangleHasArea(t1);
+				if(/*t1a && */IsReflex(t1))
+				{
+					// List as reflex if not listed yet
+					if(!v1.IsReflex) v1.AddReflex(reflexes);
+					v1.RemoveEarTip();
+				}
+				else
+				{
+					// Remove from reflexes
+					v1.RemoveReflex();
+				}
+				
+				// Test second neighbour
+				EarClipVertex[] t2 = GetTriangle(v2);
+				//bool t2a = true;	//TriangleHasArea(t2);
+				if(/*t2a && */IsReflex(t2))
+				{
+					// List as reflex if not listed yet
+					if(!v2.IsReflex) v2.AddReflex(reflexes);
+					v2.RemoveEarTip();
+				}
+				else
+				{
+					// Remove from reflexes
+					v2.RemoveReflex();
+				}
+				
+				// Check if any neightbour have become a valid or invalid ear
+				if(!v1.IsReflex && (/*!t1a || */CheckValidEar(t1, reflexes))) v1.AddEarTip(eartips); else v1.RemoveEarTip();
+				if(!v2.IsReflex && (/*!t2a || */CheckValidEar(t2, reflexes))) v2.AddEarTip(eartips); else v2.RemoveEarTip();
+			}
+
+			#if DEBUG
+			if(OnShowRemaining != null) OnShowRemaining(verts);
+			#endif
+			
+			// Dispose remaining vertices
+			foreach(EarClipVertex ecv in verts) ecv.Dispose();
+
+			// Return the number of vertices in the result
+			return countvertices;
+		}
+
+		// This checks if a given ear is a valid (no intersections from reflex vertices)
+		private static bool CheckValidEar(EarClipVertex[] t, LinkedList<EarClipVertex> reflexes)
+		{
+			// Go for all reflex vertices
+			foreach(EarClipVertex rv in reflexes)
+			{
+				// Not one of the triangle corners?
+				if((rv.Position != t[0].Position) && (rv.Position != t[1].Position) && (rv.Position != t[2].Position))
+				{
+					// Return false on intersection
+					if(PointInsideTriangle(t, rv.MainListNode)) return false;
+				}
+			}
+
+			// Valid ear!
+			return true;
+		}
+		
+		// This returns the 3-vertex array triangle for an ear
+		private static EarClipVertex[] GetTriangle(EarClipVertex v)
+		{
+			EarClipVertex[] t = new EarClipVertex[3];
+			t[0] = (v.MainListNode.Previous == null) ? v.MainListNode.List.Last.Value : v.MainListNode.Previous.Value;
+			t[1] = v;
+			t[2] = (v.MainListNode.Next == null) ? v.MainListNode.List.First.Value : v.MainListNode.Next.Value;
+			return t;
+		}
+		
+		// This checks if a vertex is reflex (corner > 180 deg) or convex (corner < 180 deg)
+		private static bool IsReflex(EarClipVertex[] t)
+		{
+			// Return true when corner is > 180 deg
+			return (Line2D.GetSideOfLine(t[0].Position, t[2].Position, t[1].Position) < 0.0f);
+		}
+		
+		// This checks if a point is inside a triangle
+		// When the point is on an edge of the triangle, it depends on the lines
+		// adjacent to the point if it is considered inside or not
+		// NOTE: vertices in t must be in clockwise order!
+		private static bool PointInsideTriangle(EarClipVertex[] t, LinkedListNode<EarClipVertex> p)
+		{
+			// If the triangle has no area, there can never be a point inside
+			if(TriangleHasArea(t))
+			{
+				float lineside01 = Line2D.GetSideOfLine(t[0].Position, t[1].Position, p.Value.Position);
+				float lineside12 = Line2D.GetSideOfLine(t[1].Position, t[2].Position, p.Value.Position);
+				float lineside20 = Line2D.GetSideOfLine(t[2].Position, t[0].Position, p.Value.Position);
+				float u_on_line = 0.5f;
+
+				// If point p is on the line of an edge, find out where on the edge segment p is.
+				if(lineside01 == 0.0f)
+					u_on_line = Line2D.GetNearestOnLine(t[0].Position, t[1].Position, p.Value.Position);
+				else if(lineside12 == 0.0f)
+					u_on_line = Line2D.GetNearestOnLine(t[1].Position, t[2].Position, p.Value.Position);
+				else if(lineside20 == 0.0f)
+					u_on_line = Line2D.GetNearestOnLine(t[2].Position, t[0].Position, p.Value.Position);
+				
+				// If any of the lineside results are 0 then that means the point p lies on that edge and we
+				// need to test if the lines adjacent to the point p are in the triangle or not.
+				// If the lines are intersecting the triangle, we also consider the point inside.
+				if((lineside01 == 0.0f) || (lineside12 == 0.0f) || (lineside20 == 0.0f))
+				{
+					// When the point p is outside the edge segment, then it is not inside the triangle
+					if((u_on_line < 0.0f) || (u_on_line > 1.0f))
+						return false;
+
+					// Point p is on an edge segment. We'll have to decide by it's lines if we call it inside or outside the triangle.
+					LinkedListNode<EarClipVertex> p1 = p.Previous ?? p.List.Last;
+					LinkedListNode<EarClipVertex> p2 = p.Next ?? p.List.First;
+					if(LineInsideTriangle(t, p.Value.Position, p1.Value.Position)) return true;
+					if(LineInsideTriangle(t, p.Value.Position, p2.Value.Position)) return true;
+					
+					return false;
+				}
+				else
+				{
+					return (lineside01 < 0.0f) && (lineside12 < 0.0f) && (lineside20 < 0.0f);
+				}
+			}
+			else
+			{
+				return false;
+			}
+		}
+		
+		// This checks if a line is inside a triangle (touching the triangle is allowed)
+		// NOTE: We already know p1 is on an edge segment of the triangle
+		private static bool LineInsideTriangle(EarClipVertex[] t, Vector2D p1, Vector2D p2)
+		{
+			float s01 = Line2D.GetSideOfLine(t[0].Position, t[1].Position, p2);
+			float s12 = Line2D.GetSideOfLine(t[1].Position, t[2].Position, p2);
+			float s20 = Line2D.GetSideOfLine(t[2].Position, t[0].Position, p2);
+			float p2_on_edge = 2.0f;		// somewhere outside the 0 .. 1 range
+			float p1_on_same_edge = 2.0f;
+			
+			// Test if p2 is inside the triangle
+			if((s01 < 0.0f) && (s12 < 0.0f) && (s20 < 0.0f))
+			{
+				// Line is inside triangle, because p2 is
+				return true;
+			}
+			// Test if p2 is on an edge of the triangle and if it is we would
+			// like to know where on the edge segment p2 is
+			else if(s01 == 0.0f)
+			{
+				p2_on_edge = Line2D.GetNearestOnLine(t[0].Position, t[1].Position, p2);
+				p1_on_same_edge = Line2D.GetSideOfLine(t[0].Position, t[1].Position, p1);
+			}
+			else if(s12 == 0.0f)
+			{
+				p2_on_edge = Line2D.GetNearestOnLine(t[1].Position, t[2].Position, p2);
+				p1_on_same_edge = Line2D.GetSideOfLine(t[1].Position, t[2].Position, p1);
+			}
+			else if(s20 == 0.0f)
+			{
+				p2_on_edge = Line2D.GetNearestOnLine(t[2].Position, t[0].Position, p2);
+				p1_on_same_edge = Line2D.GetSideOfLine(t[2].Position, t[0].Position, p1);
+			}
+
+			// Is p2 actually on the edge segment?
+			if((p2_on_edge >= 0.0f) && (p2_on_edge <= 1.0f))
+			{
+				// If p1 is on the same edge (or the unlimited line of that edge)
+				// then the line is not inside this triangle.
+				if(p1_on_same_edge == 0.0f)
+					return false;
+			}
+			
+			// Do a complete line-triangle intersection test
+			// We already know p1 is not inside the triangle (possibly on an edge)
+			Line2D p = new Line2D(p1, p2);
+			Line2D t01 = new Line2D(t[0].Position, t[1].Position);
+			Line2D t12 = new Line2D(t[1].Position, t[2].Position);
+			Line2D t20 = new Line2D(t[2].Position, t[0].Position);
+			float pu, pt;
+			
+			// Test intersections
+			t01.GetIntersection(p, out pu, out pt);
+			if(!float.IsNaN(pu) && (pu >= 0.0f) && (pu <= 1.0f) && (pt >= 0.0f) && (pt <= 1.0f)) return true;
+			t12.GetIntersection(p, out pu, out pt);
+			if(!float.IsNaN(pu) && (pu >= 0.0f) && (pu <= 1.0f) && (pt >= 0.0f) && (pt <= 1.0f)) return true;
+			t20.GetIntersection(p, out pu, out pt);
+			if(!float.IsNaN(pu) && (pu >= 0.0f) && (pu <= 1.0f) && (pt >= 0.0f) && (pt <= 1.0f)) return true;
+			
+			return false;
+		}
+		
+		// This checks if the triangle has an area greater than 0
+		private static bool TriangleHasArea(EarClipVertex[] t)
+		{
+			return ((t[0].Position.x * (t[1].Position.y - t[2].Position.y) +
+					 t[1].Position.x * (t[2].Position.y - t[0].Position.y) +
+					 t[2].Position.x * (t[0].Position.y - t[1].Position.y)) != 0.0f);
+		}
+		
+		// This adds an array of vertices
+		private static void AddTriangleToList(EarClipVertex[] triangle, List<Vector2D> verticeslist, List<Sidedef> sidedefslist, bool last)
+		{
+			// Create triangle
+			verticeslist.Add(triangle[0].Position);
+			sidedefslist.Add(triangle[0].Sidedef);
+			verticeslist.Add(triangle[1].Position);
+			sidedefslist.Add(triangle[1].Sidedef);
+			verticeslist.Add(triangle[2].Position);
+			if(!last) sidedefslist.Add(null); else sidedefslist.Add(triangle[2].Sidedef);
+			
+			// Modify the first earclipvertex of this triangle, it no longer lies along a sidedef
+			triangle[0].Sidedef = null;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Geometry/Vector2D.cs b/Source/Core/Geometry/Vector2D.cs
new file mode 100644
index 0000000..3bf2fd3
--- /dev/null
+++ b/Source/Core/Geometry/Vector2D.cs
@@ -0,0 +1,370 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Geometry
+{
+	public struct Vector2D
+	{
+		#region ================== Constants
+
+		private const float TINY_VALUE = 0.0000000001f;
+
+		#endregion
+
+		#region ================== Variables
+
+		// Coordinates
+		public float x;
+		public float y;
+		
+		#endregion
+		
+		#region ================== Constructors
+
+		// Constructor
+		public Vector2D(float x, float y)
+		{
+			this.x = x;
+			this.y = y;
+		}
+
+		// Constructor
+		public Vector2D(Vector3D v)
+		{
+			this.x = v.x;
+			this.y = v.y;
+		}
+		
+		#endregion
+
+		#region ================== Statics
+
+		// Conversion to Vector3D
+		public static implicit operator Vector3D(Vector2D a)
+		{
+			return new Vector3D(a);
+		}
+
+		// This adds two vectors
+		public static Vector2D operator +(Vector2D a, Vector2D b)
+		{
+			return new Vector2D(a.x + b.x, a.y + b.y);
+		}
+
+		// This adds to a vector
+		public static Vector2D operator +(float a, Vector2D b)
+		{
+			return new Vector2D(a + b.x, a + b.y);
+		}
+
+		// This adds to a vector
+		public static Vector2D operator +(Vector2D a, float b)
+		{
+			return new Vector2D(a.x + b, a.y + b);
+		}
+
+		// This subtracts two vectors
+		public static Vector2D operator -(Vector2D a, Vector2D b)
+		{
+			return new Vector2D(a.x - b.x, a.y - b.y);
+		}
+
+		// This subtracts from a vector
+		public static Vector2D operator -(Vector2D a, float b)
+		{
+			return new Vector2D(a.x - b, a.y - b);
+		}
+
+		// This subtracts from a vector
+		public static Vector2D operator -(float a, Vector2D b)
+		{
+			return new Vector2D(a - b.x, a - b.y);
+		}
+
+		// This reverses a vector
+		public static Vector2D operator -(Vector2D a)
+		{
+			return new Vector2D(-a.x, -a.y);
+		}
+
+		// This scales a vector
+		public static Vector2D operator *(float s, Vector2D a)
+		{
+			return new Vector2D(a.x * s, a.y * s);
+		}
+
+		// This scales a vector
+		public static Vector2D operator *(Vector2D a, float s)
+		{
+			return new Vector2D(a.x * s, a.y * s);
+		}
+
+		// This scales a vector
+		public static Vector2D operator *(Vector2D a, Vector2D b)
+		{
+			return new Vector2D(a.x * b.x, a.y * b.y);
+		}
+
+		// This scales a vector
+		public static Vector2D operator /(float s, Vector2D a)
+		{
+			return new Vector2D(a.x / s, a.y / s);
+		}
+
+		// This scales a vector
+		public static Vector2D operator /(Vector2D a, float s)
+		{
+			return new Vector2D(a.x / s, a.y / s);
+		}
+
+		// This scales a vector
+		public static Vector2D operator /(Vector2D a, Vector2D b)
+		{
+			return new Vector2D(a.x / b.x, a.y / b.y);
+		}
+
+		// This calculates the dot product
+		public static float DotProduct(Vector2D a, Vector2D b)
+		{
+			// Calculate and return the dot product
+			return a.x * b.x + a.y * b.y;
+		}
+
+		// This calculates the cross product
+		public static Vector2D CrossProduct(Vector2D a, Vector2D b)
+		{
+			Vector2D result = new Vector2D();
+
+			// Calculate and return the dot product
+			result.x = a.y * b.x;
+			result.y = a.x * b.y;
+			return result;
+		}
+		
+		// This compares a vector
+		public static bool operator ==(Vector2D a, Vector2D b)
+		{
+			return (a.x == b.x) && (a.y == b.y);
+		}
+
+		// This compares a vector
+		public static bool operator !=(Vector2D a, Vector2D b)
+		{
+			return (a.x != b.x) || (a.y != b.y);
+		}
+		
+		// This reflects the vector v over mirror m
+		// Note that mirror m must be normalized!
+		// R = V - 2 * M * (M dot V)
+		public static Vector2D Reflect(Vector2D v, Vector2D m)
+		{
+			// Get the dot product of v and m
+			float dp = Vector2D.DotProduct(m, v);
+
+			// Make the reflected vector
+			Vector2D mv = new Vector2D();
+			mv.x = v.x - (2f * m.x * dp);
+			mv.y = v.y - (2f * m.y * dp);
+
+			// Return the reflected vector
+			return mv;
+		}
+
+		// This returns the reversed vector
+		public static Vector2D Reversed(Vector2D v)
+		{
+			// Return reversed vector
+			return new Vector2D(-v.x, -v.y);
+		}
+
+		// This returns a vector from an angle
+		public static Vector2D FromAngle(float angle)
+		{
+			// Return vector from angle
+			return new Vector2D((float)Math.Sin(angle), -(float)Math.Cos(angle));
+		}
+
+		// This returns a vector from an angle with a given legnth
+		public static Vector2D FromAngle(float angle, float length)
+		{
+			// Return vector from angle
+			return FromAngle(angle) * length;
+		}
+
+		// This calculates the angle
+		public static float GetAngle(Vector2D a, Vector2D b)
+		{
+			// Calculate and return the angle
+			return -(float)Math.Atan2(-(a.y - b.y), (a.x - b.x)) + Angle2D.PIHALF;//mxd //(float)Math.PI * 0.5f;
+		}
+
+		// This returns the square distance between two points
+		public static float DistanceSq(Vector2D a, Vector2D b)
+		{
+			Vector2D d = a - b;
+			return d.GetLengthSq();
+		}
+
+		// This returns the distance between two points
+		public static float Distance(Vector2D a, Vector2D b)
+		{
+			Vector2D d = a - b;
+			return d.GetLength();
+		}
+
+		// This returns the manhattan distance between two points
+		public static float ManhattanDistance(Vector2D a, Vector2D b)
+		{
+			Vector2D d = a - b;
+			return Math.Abs(d.x) + Math.Abs(d.y);
+		}
+		
+		#endregion
+
+		#region ================== Methods
+
+		// This returns the perpendicular vector by simply making a normal
+		public Vector2D GetPerpendicular()
+		{
+			return new Vector2D(-y, x);
+		}
+		
+		// This returns a vector with the sign of all components
+		public Vector2D GetSign()
+		{
+			return new Vector2D(Math.Sign(x), Math.Sign(y));
+		}
+		
+		// This calculates the angle
+		public float GetAngle()
+		{
+			// Calculate and return the angle
+			return -(float)Math.Atan2(-y, x) + Angle2D.PIHALF; //mxd
+		}
+
+		// This calculates the length
+		public float GetLength()
+		{
+			// Calculate and return the length
+			return (float)Math.Sqrt(x * x + y * y);
+		}
+
+		// This calculates the square length
+		public float GetLengthSq()
+		{
+			// Calculate and return the square length
+			return x * x + y * y;
+		}
+
+		// This calculates the length
+		public float GetManhattanLength()
+		{
+			// Calculate and return the length
+			return Math.Abs(x) + Math.Abs(y);
+		}
+
+		// This returns a normalized vector
+		public Vector2D GetNormal()
+		{
+			float lensq = this.GetLengthSq();
+			if(lensq > TINY_VALUE)
+			{
+				// Divide each element by the length
+				float mul = 1f / (float)Math.Sqrt(lensq);
+				return new Vector2D(x * mul, y * mul);
+			}
+			else
+			{
+				// Cannot make normal
+				return new Vector2D(0f, 0f);
+			}
+		}
+
+		// This scales the vector
+		public Vector2D GetScaled(float s)
+		{
+			// Scale the vector
+			return new Vector2D(x * s, y * s);
+		}
+
+		// This changes the vector length
+		public Vector2D GetFixedLength(float l)
+		{
+			// Normalize, then scale
+			return this.GetNormal().GetScaled(l);
+		}
+		
+		// Output
+		public override string ToString()
+		{
+			return x + ", " + y;
+		}
+
+		// Transform
+		public Vector2D GetTransformed(float offsetx, float offsety, float scalex, float scaley)
+		{
+			return new Vector2D((x + offsetx) * scalex, (y + offsety) * scaley);
+		}
+
+		// Inverse Transform
+		public Vector2D GetInvTransformed(float invoffsetx, float invoffsety, float invscalex, float invscaley)
+		{
+			return new Vector2D((x * invscalex) + invoffsetx, (y * invscaley) + invoffsety);
+		}
+		
+		// Rotate (Added by Anders Åstrand 2008-05-18)
+		public Vector2D GetRotated(float theta)
+		{
+			float cos = (float)Math.Cos(theta);
+			float sin = (float)Math.Sin(theta);
+			float rx = cos * x - sin * y;
+			float ry = sin * x + cos * y;
+			return new Vector2D(rx, ry);
+		}
+
+		// Checks if the Vector has valid values for x and y
+		public bool IsFinite()
+		{
+			return !float.IsNaN(x) && !float.IsNaN(y) && !float.IsInfinity(x) && !float.IsInfinity(y);
+		}
+
+		//mxd. Addeed to make compiler a bit more happy...
+		public override int GetHashCode() 
+		{
+			return base.GetHashCode();
+		}
+
+		//mxd. Addeed to make compiler a bit more happy...
+		public override bool Equals(object obj) 
+		{
+			if(!(obj is Vector2D)) return false;
+
+			Vector2D other = (Vector2D)obj;
+
+			if(x != other.x) return false;
+			if(y != other.y) return false;
+			return true;
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Geometry/Vector3D.cs b/Source/Core/Geometry/Vector3D.cs
new file mode 100644
index 0000000..4a2aa03
--- /dev/null
+++ b/Source/Core/Geometry/Vector3D.cs
@@ -0,0 +1,372 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using SlimDX;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Geometry
+{
+	public struct Vector3D
+	{
+		#region ================== Constants
+
+		private const float TINY_VALUE = 0.0000000001f;
+		
+		#endregion
+
+		#region ================== Variables
+
+		// Coordinates
+		public float x;
+		public float y;
+		public float z;
+
+		#endregion
+
+		#region ================== Constructors
+
+		// Constructor
+		public Vector3D(float x, float y, float z)
+		{
+			this.x = x;
+			this.y = y;
+			this.z = z;
+		}
+
+		// Constructor
+		public Vector3D(Vector2D v)
+		{
+			this.x = v.x;
+			this.y = v.y;
+			this.z = 0f;
+		}
+
+		// Constructor (mxd)
+		public Vector3D(Vector2D v, float z) 
+		{
+			this.x = v.x;
+			this.y = v.y;
+			this.z = z;
+		}
+		
+		#endregion
+
+		#region ================== Statics
+
+		// Conversion to Vector2D
+		public static implicit operator Vector2D(Vector3D a)
+		{
+			return new Vector2D(a);
+		}
+
+		// This adds two vectors
+		public static Vector3D operator +(Vector3D a, Vector3D b)
+		{
+			return new Vector3D(a.x + b.x, a.y + b.y, a.z + b.z);
+		}
+
+		// This adds to all dimensions
+		public static Vector3D operator +(Vector3D a, float b)
+		{
+			return new Vector3D(a.x + b, a.y + b, a.z + b);
+		}
+
+		// This adds to all dimensions
+		public static Vector3D operator +(float b, Vector3D a)
+		{
+			return new Vector3D(a.x + b, a.y + b, a.z + b);
+		}
+
+		// This subtracts two vectors
+		public static Vector3D operator -(Vector3D a, Vector3D b)
+		{
+			return new Vector3D(a.x - b.x, a.y - b.y, a.z - b.z);
+		}
+
+		// This subtracts from all dimensions
+		public static Vector3D operator -(Vector3D a, float b)
+		{
+			return new Vector3D(a.x - b, a.y - b, a.z - b);
+		}
+
+		// This subtracts from all dimensions
+		public static Vector3D operator -(float a, Vector3D b)
+		{
+			return new Vector3D(a - b.x, a - b.y, a - b.z);
+		}
+
+		// This reverses a vector
+		public static Vector3D operator -(Vector3D a)
+		{
+			return new Vector3D(-a.x, -a.y, -a.z);
+		}
+
+		// This scales a vector
+		public static Vector3D operator *(float s, Vector3D a)
+		{
+			return new Vector3D(a.x * s, a.y * s, a.z * s);
+		}
+
+		// This scales a vector
+		public static Vector3D operator *(Vector3D a, float s)
+		{
+			return new Vector3D(a.x * s, a.y * s, a.z * s);
+		}
+
+		// This scales a vector
+		public static Vector3D operator *(Vector3D a, Vector3D b)
+		{
+			return new Vector3D(a.x * b.x, a.y * b.y, a.z * b.z);
+		}
+		
+		// This scales a vector
+		public static Vector3D operator /(float s, Vector3D a)
+		{
+			return new Vector3D(a.x / s, a.y / s, a.z / s);
+		}
+
+		// This scales a vector
+		public static Vector3D operator /(Vector3D a, float s)
+		{
+			return new Vector3D(a.x / s, a.y / s, a.z / s);
+		}
+
+		// This scales a vector
+		public static Vector3D operator /(Vector3D a, Vector3D b)
+		{
+			return new Vector3D(a.x / b.x, a.y / b.y, a.z / b.z);
+		}
+
+		// This compares a vector
+		public static bool operator ==(Vector3D a, Vector3D b)
+		{
+			return (a.x == b.x) && (a.y == b.y) && (a.z == b.z);
+		}
+
+		// This compares a vector
+		public static bool operator !=(Vector3D a, Vector3D b)
+		{
+			return (a.x != b.x) || (a.y != b.y) || (a.z != b.z);
+		}
+
+		// This calculates the cross product
+		public static Vector3D CrossProduct(Vector3D a, Vector3D b)
+		{
+			Vector3D result = new Vector3D();
+
+			// Calculate and return the dot product
+			result.x = a.y * b.z - a.z * b.y;
+			result.y = a.z * b.x - a.x * b.z;
+			result.z = a.x * b.y - a.y * b.x;
+			return result;
+		}
+
+		// This calculates the dot product
+		public static float DotProduct(Vector3D a, Vector3D b)
+		{
+			// Calculate and return the dot product
+			return a.x * b.x + a.y * b.y + a.z * b.z;
+		}
+
+		// This reflects the vector v over mirror m
+		// Note that mirror m must be normalized!
+		public static Vector3D Reflect(Vector3D v, Vector3D m)
+		{
+			// Get the dot product of v and m
+			float dp = Vector3D.DotProduct(v, m);
+
+			// Make the reflected vector
+			Vector3D mv = new Vector3D();
+			mv.x = -v.x + 2f * m.x * dp;
+			mv.y = -v.y + 2f * m.y * dp;
+			mv.z = -v.z + 2f * m.z * dp;
+
+			// Return the reflected vector
+			return mv;
+		}
+
+		// This returns the reversed vector
+		public static Vector3D Reversed(Vector3D v)
+		{
+			// Return reversed vector
+			return new Vector3D(-v.x, -v.y, -v.z);
+		}
+
+		// This returns a vector from an angle
+		public static Vector3D FromAngleXY(float angle)
+		{
+			// Return vector from angle
+			return new Vector3D((float)Math.Sin(angle), -(float)Math.Cos(angle), 0f);
+		}
+		
+		// This returns a vector from an angle with a given legnth
+		public static Vector3D FromAngleXY(float angle, float length)
+		{
+			// Return vector from angle
+			return FromAngleXY(angle) * length;
+		}
+
+		// This returns a vector from an angle with a given legnth
+		public static Vector3D FromAngleXYZ(float anglexy, float anglez)
+		{
+			// Calculate x y and z
+			float ax = (float)Math.Sin(anglexy) * (float)Math.Cos(anglez);
+			float ay = -(float)Math.Cos(anglexy) * (float)Math.Cos(anglez);
+			float az = (float)Math.Sin(anglez);
+
+			// Return vector
+			return new Vector3D(ax, ay, az);
+		}
+
+		//mxd
+		public static Vector3D Transform(Vector3D v, Matrix m)
+		{
+			return new Vector3D
+			{
+				x = m.M11 * v.x + m.M21 * v.y + m.M31 * v.z + m.M41,
+				y = m.M12 * v.x + m.M22 * v.y + m.M32 * v.z + m.M42,
+				z = m.M13 * v.x + m.M23 * v.y + m.M33 * v.z + m.M43,
+			};
+		}
+
+		//mxd
+		public static Vector3D Transform(float x, float y, float z, Matrix m)
+		{
+			return new Vector3D
+			{
+				x = m.M11 * x + m.M21 * y + m.M31 * z + m.M41,
+				y = m.M12 * x + m.M22 * y + m.M32 * z + m.M42,
+				z = m.M13 * x + m.M23 * y + m.M33 * z + m.M43,
+			};
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+
+		// This calculates the angle
+		public float GetAngleXY()
+		{
+			// Calculate and return the angle
+			return -(float)Math.Atan2(-y, x) + Angle2D.PIHALF;//mxd // (float)Math.PI * 0.5f;
+		}
+
+		// This calculates the angle
+		public float GetAngleZ()
+		{
+			Vector2D xy = new Vector2D(x, y);
+
+			// Calculate and return the angle
+			return (float)Math.Atan2(xy.GetLength(), z) + Angle2D.PIHALF;//mxd // (float)Math.PI * 0.5f;
+		}
+
+		// This calculates the length
+		public float GetLength()
+		{
+			// Calculate and return the length
+			return (float)Math.Sqrt(x * x + y * y + z * z);
+		}
+
+		// This calculates the squared length
+		public float GetLengthSq()
+		{
+			// Calculate and return the length
+			return x * x + y * y + z * z;
+		}
+
+		// This calculates the length
+		public float GetManhattanLength()
+		{
+			// Calculate and return the length
+			return Math.Abs(x) + Math.Abs(y) + Math.Abs(z);
+		}
+
+		// This normalizes the vector
+		public Vector3D GetNormal()
+		{
+			float lensq = this.GetLengthSq();
+			if(lensq > TINY_VALUE)
+			{
+				// Divide each element by the length
+				float mul = 1f / (float)Math.Sqrt(lensq);
+				return new Vector3D(x * mul, y * mul, z * mul);
+			}
+			else
+			{
+				// Cannot normalize
+				return new Vector3D(0f, 0f, 0f);
+			}
+		}
+
+		// This scales the vector
+		public Vector3D GetScaled(float s)
+		{
+			// Scale the vector
+			return new Vector3D(x * s, y * s, z * s);
+		}
+
+		// This changes the vector length
+		public Vector3D GetFixedLength(float l)
+		{
+			// Normalize, then scale
+			return this.GetNormal().GetScaled(l);
+		}
+		
+		// This checks if the vector is normalized
+		public bool IsNormalized()
+		{
+			return (Math.Abs(GetLengthSq() - 1.0f) < 0.0001f);
+		}
+		
+		// Output
+		public override string ToString()
+		{
+			return x + ", " + y + ", " + z;
+		}
+
+		// Checks if the Vector has valid values for x, y and z
+		public bool IsFinite()
+		{
+			return !float.IsNaN(x) && !float.IsNaN(y) && !float.IsNaN(z) && !float.IsInfinity(x) && !float.IsInfinity(y) && !float.IsInfinity(z);
+		}
+
+		//mxd. Addeed to make compiler a bit more happy...
+		public override int GetHashCode() 
+		{
+			return base.GetHashCode();
+		}
+
+		//mxd. Addeed to make compiler a bit more happy...
+		public override bool Equals(object obj) 
+		{
+			if(!(obj is Vector3D)) return false;
+
+			Vector3D other = (Vector3D)obj;
+
+			if(x != other.x) return false;
+			if(y != other.y) return false;
+			if(z != other.z) return false;
+			return true;
+		}
+
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/IO/ClipboardStreamReader.cs b/Source/Core/IO/ClipboardStreamReader.cs
new file mode 100644
index 0000000..bb47500
--- /dev/null
+++ b/Source/Core/IO/ClipboardStreamReader.cs
@@ -0,0 +1,411 @@
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Types;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.IO
+{
+	internal class ClipboardStreamReader
+	{
+
+		#region ================== Variables
+
+		private struct SidedefData
+		{
+			public int OffsetX;
+			public int OffsetY;
+			public int SectorID;
+			public string HighTexture;
+			public string MiddleTexture;
+			public string LowTexture;
+			public Dictionary<string, UniValue> Fields;
+			public Dictionary<string, bool> Flags;
+		}
+
+		private bool uselongtexturenames; //mxd
+
+		#endregion 
+
+		#region ================== Properties
+
+		public bool UseLongTextureNames { get { return uselongtexturenames; } } //mxd
+
+		#endregion
+
+		#region ================== Reading
+
+		// This reads from a stream
+		public MapSet Read(MapSet map, Stream stream) 
+		{
+			BinaryReader reader = new BinaryReader(stream);
+
+			// Read the map
+			uselongtexturenames = reader.ReadBoolean(); //mxd
+			Dictionary<int, Vertex> vertexlink = ReadVertices(map, reader);
+			Dictionary<int, Sector> sectorlink = ReadSectors(map, reader);
+			Dictionary<int, SidedefData> sidedeflink = ReadSidedefs(reader);
+			ReadLinedefs(map, reader, vertexlink, sectorlink, sidedeflink);
+			ReadThings(map, reader);
+
+			return map;
+		}
+
+		private static Dictionary<int, Vertex> ReadVertices(MapSet map, BinaryReader reader) 
+		{
+			int count = reader.ReadInt32();
+
+			// Create lookup table
+			Dictionary<int, Vertex> link = new Dictionary<int, Vertex>(count);
+
+			// Go for all collections
+			map.SetCapacity(map.Vertices.Count + count, 0, 0, 0, 0);
+			for(int i = 0; i < count; i++) 
+			{
+				float x = reader.ReadSingle();
+				float y = reader.ReadSingle();
+				float zc = reader.ReadSingle();
+				float zf = reader.ReadSingle();
+
+				// Create new item
+				Dictionary<string, UniValue> fields = ReadCustomFields(reader);
+				Vertex v = map.CreateVertex(new Vector2D(x, y));
+				if(v != null) 
+				{
+					//zoffsets
+					v.ZCeiling = zc;
+					v.ZFloor = zf;
+
+					// Add custom fields
+					v.Fields.BeforeFieldsChange();
+					foreach(KeyValuePair<string, UniValue> group in fields) 
+					{
+						v.Fields.Add(group.Key, group.Value);
+					}
+
+					// Add it to the lookup table
+					link.Add(i, v);
+				}
+			}
+
+			// Return lookup table
+			return link;
+		}
+
+		private static Dictionary<int, Sector> ReadSectors(MapSet map, BinaryReader reader) 
+		{
+			int count = reader.ReadInt32();
+
+			// Create lookup table
+			Dictionary<int, Sector> link = new Dictionary<int, Sector>(count);
+
+			// Go for all collections
+			map.SetCapacity(0, 0, 0, map.Sectors.Count + count, 0);
+
+			for(int i = 0; i < count; i++) 
+			{
+				int effect = reader.ReadInt32();
+				int hfloor = reader.ReadInt32();
+				int hceil = reader.ReadInt32();
+				int bright = reader.ReadInt32();
+
+				//mxd. Tags
+				int numtags = reader.ReadInt32(); //mxd
+				List<int> tags = new List<int>(numtags); //mxd
+				for(int a = 0; a < numtags; a++) tags.Add(reader.ReadInt32()); //mxd
+
+				string tfloor = ReadString(reader);
+				string tceil = ReadString(reader);
+
+				//mxd. Slopes
+				float foffset = reader.ReadSingle();
+				Vector3D fslope = new Vector3D(reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle());
+				float coffset = reader.ReadSingle();
+				Vector3D cslope = new Vector3D(reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle());
+
+				//flags
+				Dictionary<string, bool> stringflags = new Dictionary<string, bool>(StringComparer.Ordinal);
+				int numFlags = reader.ReadInt32();
+				for(int f = 0; f < numFlags; f++) stringflags.Add(ReadString(reader), true);
+
+				//add missing flags
+				foreach(KeyValuePair<string, string> flag in General.Map.Config.SectorFlags) 
+				{
+					if(stringflags.ContainsKey(flag.Key)) continue;
+					stringflags.Add(flag.Key, false);
+				}
+
+				// Create new item
+				Dictionary<string, UniValue> fields = ReadCustomFields(reader);
+				Sector s = map.CreateSector();
+				if(s != null) 
+				{
+					s.Update(hfloor, hceil, tfloor, tceil, effect, stringflags, tags, bright, foffset, fslope, coffset, cslope);
+
+					// Add custom fields
+					s.Fields.BeforeFieldsChange();
+					foreach(KeyValuePair<string, UniValue> group in fields) 
+					{
+						s.Fields.Add(group.Key, group.Value);
+					}
+
+					// Add it to the lookup table
+					link.Add(i, s);
+				}
+			}
+
+			// Return lookup table
+			return link;
+		}
+
+		// This reads the linedefs and sidedefs
+		private static void ReadLinedefs(MapSet map, BinaryReader reader, Dictionary<int, Vertex> vertexlink, Dictionary<int, Sector> sectorlink, Dictionary<int, SidedefData> sidedeflink) 
+		{
+			int count = reader.ReadInt32();
+
+			// Go for all lines
+			map.SetCapacity(0, map.Linedefs.Count + count, map.Sidedefs.Count + sidedeflink.Count, 0, 0);
+			for(int i = 0; i < count; i++) 
+			{
+				int[] args = new int[Linedef.NUM_ARGS];
+				int v1 = reader.ReadInt32();
+				int v2 = reader.ReadInt32();
+				int s1 = reader.ReadInt32();
+				int s2 = reader.ReadInt32();
+				int special = reader.ReadInt32();
+				for(int a = 0; a < Linedef.NUM_ARGS; a++) args[a] = reader.ReadInt32();
+				int numtags = reader.ReadInt32(); //mxd
+				List<int> tags = new List<int>(numtags); //mxd
+				for(int a = 0; a < numtags; a++) tags.Add(reader.ReadInt32()); //mxd
+
+				//flags
+				Dictionary<string, bool> stringflags = new Dictionary<string, bool>(StringComparer.Ordinal);
+				int numFlags = reader.ReadInt32();
+				for(int f = 0; f < numFlags; f++) stringflags.Add(ReadString(reader), true);
+
+				//add missing flags
+				foreach(KeyValuePair<string, string> flag in General.Map.Config.LinedefFlags) 
+				{
+					if(stringflags.ContainsKey(flag.Key)) continue;
+					stringflags.Add(flag.Key, false);
+				}
+
+				//add missing activations
+				foreach(LinedefActivateInfo activate in General.Map.Config.LinedefActivates) 
+				{
+					if(stringflags.ContainsKey(activate.Key)) continue;
+					stringflags.Add(activate.Key, false);
+				}
+
+				// Read custom fields
+				Dictionary<string, UniValue> fields = ReadCustomFields(reader);
+
+				// Check if not zero-length
+				if(Vector2D.ManhattanDistance(vertexlink[v1].Position, vertexlink[v2].Position) > 0.0001f) 
+				{
+					// Create new linedef
+					Linedef l = map.CreateLinedef(vertexlink[v1], vertexlink[v2]);
+					if(l != null) 
+					{
+						l.Update(stringflags, 0, tags, special, args);
+						l.UpdateCache();
+
+						// Add custom fields
+						l.Fields.BeforeFieldsChange();
+						foreach(KeyValuePair<string, UniValue> group in fields) 
+						{
+							l.Fields.Add(group.Key, group.Value);
+						}
+
+						// Connect sidedefs to the line
+						if(s1 > -1) 
+						{
+							if(s1 < sidedeflink.Count)
+								AddSidedef(map, sidedeflink[s1], l, true, sectorlink);
+							else
+								General.ErrorLogger.Add(ErrorType.Warning, "Linedef " + i + " references invalid front sidedef " + s1 + ". Sidedef has been removed.");
+						}
+
+						if(s2 > -1) 
+						{
+							if(s2 < sidedeflink.Count)
+								AddSidedef(map, sidedeflink[s2], l, false, sectorlink);
+							else
+								General.ErrorLogger.Add(ErrorType.Warning, "Linedef " + i + " references invalid back sidedef " + s1 + ". Sidedef has been removed.");
+						}
+					}
+				} 
+				else 
+				{
+					General.ErrorLogger.Add(ErrorType.Warning, "Linedef " + i + " is zero-length. Linedef has been removed.");
+				}
+			}
+		}
+
+		private static void AddSidedef(MapSet map, SidedefData data, Linedef ld, bool front, Dictionary<int, Sector> sectorlink) 
+		{
+			// Create sidedef
+			if(sectorlink.ContainsKey(data.SectorID))
+			{
+				Sidedef s = map.CreateSidedef(ld, front, sectorlink[data.SectorID]);
+				if(s != null) 
+				{
+					s.Update(data.OffsetX, data.OffsetY, data.HighTexture, data.MiddleTexture, data.LowTexture, data.Flags);
+
+					// Add custom fields
+					foreach(KeyValuePair<string, UniValue> group in data.Fields) 
+					{
+						s.Fields.Add(group.Key, group.Value);
+					}
+				}
+			} 
+			else 
+			{
+				General.ErrorLogger.Add(ErrorType.Warning, "Sidedef references invalid sector " + data.SectorID + ". Sidedef has been removed.");
+			}
+		}
+
+		private static Dictionary<int, SidedefData> ReadSidedefs(BinaryReader reader) 
+		{
+			Dictionary<int, SidedefData> sidedeflink = new Dictionary<int, SidedefData>();
+			int count = reader.ReadInt32();
+
+			for(int i = 0; i < count; i++) 
+			{
+				SidedefData data = new SidedefData();
+				data.OffsetX = reader.ReadInt32();
+				data.OffsetY = reader.ReadInt32();
+				data.SectorID = reader.ReadInt32();
+
+				data.HighTexture = ReadString(reader);
+				data.MiddleTexture = ReadString(reader);
+				data.LowTexture = ReadString(reader);
+
+				//flags
+				data.Flags = new Dictionary<string, bool>(StringComparer.Ordinal);
+				int numFlags = reader.ReadInt32();
+				for(int f = 0; f < numFlags; f++)
+					data.Flags.Add(ReadString(reader), true);
+
+				//add missing flags
+				foreach(KeyValuePair<string, string> flag in General.Map.Config.SidedefFlags) 
+				{
+					if(data.Flags.ContainsKey(flag.Key)) continue;
+					data.Flags.Add(flag.Key, false);
+				}
+
+				//custom fields
+				data.Fields = ReadCustomFields(reader);
+				sidedeflink.Add(i, data);
+			}
+
+			return sidedeflink;
+		}
+
+		private static void ReadThings(MapSet map, BinaryReader reader) 
+		{
+			int count = reader.ReadInt32();
+
+			// Go for all collections
+			map.SetCapacity(0, 0, 0, 0, map.Things.Count + count);
+			for(int i = 0; i < count; i++) 
+			{
+				int[] args = new int[Linedef.NUM_ARGS];
+				int tag = reader.ReadInt32();
+				float x = reader.ReadSingle();
+				float y = reader.ReadSingle();
+				float height = reader.ReadSingle();
+				int angledeg = reader.ReadInt32();
+				int pitch = reader.ReadInt32(); //mxd
+				int roll = reader.ReadInt32(); //mxd
+				float scaleX = reader.ReadSingle(); //mxd
+				float scaleY = reader.ReadSingle(); //mxd
+				int type = reader.ReadInt32();
+				int special = reader.ReadInt32();
+				for(int a = 0; a < Linedef.NUM_ARGS; a++) args[a] = reader.ReadInt32();
+
+				//flags
+				Dictionary<string, bool> stringflags = new Dictionary<string, bool>(StringComparer.Ordinal);
+				int numFlags = reader.ReadInt32();
+				for(int f = 0; f < numFlags; f++) stringflags.Add(ReadString(reader), true);
+
+				//add missing flags
+				foreach(KeyValuePair<string, string> flag in General.Map.Config.ThingFlags) 
+				{
+					if(stringflags.ContainsKey(flag.Key)) continue;
+					stringflags.Add(flag.Key, false);
+				}
+
+				// Create new item
+				Dictionary<string, UniValue> fields = ReadCustomFields(reader);
+				Thing t = map.CreateThing();
+				if(t != null) 
+				{
+					t.Update(type, x, y, height, angledeg, pitch, roll, scaleX, scaleY, stringflags, tag, special, args);
+
+					// Add custom fields
+					t.Fields.BeforeFieldsChange();
+					foreach(KeyValuePair<string, UniValue> group in fields) 
+					{
+						t.Fields.Add(group.Key, group.Value);
+					}
+				}
+			}
+		}
+
+		private static Dictionary<string, UniValue> ReadCustomFields(BinaryReader reader) 
+		{
+			Dictionary<string, UniValue> fields = new Dictionary<string, UniValue>(StringComparer.Ordinal);
+			int fieldscount = reader.ReadInt32();
+
+			for(int f = 0; f < fieldscount; f++) 
+			{
+				string name = ReadString(reader);
+				UniversalType type = (UniversalType)reader.ReadInt32();
+				UniversalType valueType = (UniversalType)reader.ReadInt32();
+
+				switch(valueType) 
+				{
+					case UniversalType.Float:
+						fields.Add(name, new UniValue(type, reader.ReadSingle()));
+						break;
+
+					case UniversalType.Boolean:
+						fields.Add(name, new UniValue(type, reader.ReadBoolean()));
+						break;
+
+					case UniversalType.Integer:
+						fields.Add(name, new UniValue(type, reader.ReadInt32()));
+						break;
+
+					case UniversalType.String:
+						fields.Add(name, new UniValue(type, ReadString(reader)));
+						break;
+
+					default: //WOLOLO! ERRORS!
+						throw new Exception("Got unknown value type while reading custom fields from clipboard data! Field '" + name + "', type '" + type + "', primitive type '" + valueType + "'");
+				}
+			}
+
+			return fields;
+		}
+
+		private static string ReadString(BinaryReader reader) 
+		{
+			int len = reader.ReadInt32();
+			if(len == 0) return string.Empty;
+			char[] chars = new char[len];
+			for(int i = 0; i < len; ++i) chars[i] = reader.ReadChar();
+			return new string(chars);
+		}
+
+		#endregion
+
+	}
+}
diff --git a/Source/Core/IO/ClipboardStreamWriter.cs b/Source/Core/IO/ClipboardStreamWriter.cs
new file mode 100644
index 0000000..0f69dde
--- /dev/null
+++ b/Source/Core/IO/ClipboardStreamWriter.cs
@@ -0,0 +1,322 @@
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using CodeImp.DoomBuilder.Map;
+using System.IO;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Types;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.IO
+{
+	internal class ClipboardStreamWriter
+	{
+		#region ================== Constants
+
+		private const string UDMF_CONFIG_NAME = "UDMF.cfg";
+
+		#endregion
+		
+		#region ================== Variables
+
+		private Configuration config;
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		public ClipboardStreamWriter() 
+		{
+			// Make configurations
+			config = new Configuration();
+
+			// Find a resource named UDMF.cfg
+			string[] resnames = General.ThisAssembly.GetManifestResourceNames();
+			foreach(string rn in resnames) 
+			{
+				// Found it?
+				if(rn.EndsWith(UDMF_CONFIG_NAME, StringComparison.InvariantCultureIgnoreCase)) 
+				{
+					// Get a stream from the resource
+					Stream udmfcfg = General.ThisAssembly.GetManifestResourceStream(rn);
+					StreamReader udmfcfgreader = new StreamReader(udmfcfg, Encoding.ASCII);
+
+					// Load configuration from stream
+					config.InputConfiguration(udmfcfgreader.ReadToEnd());
+
+					// Now we add the linedef flags, activations and thing flags
+					// to this list, so that these don't show up in the custom
+					// fields list either. We use true as dummy value (it has no meaning)
+
+					// Add linedef flags
+					foreach(KeyValuePair<string, string> flag in General.Map.Config.LinedefFlags)
+						config.WriteSetting("managedfields.linedef." + flag.Key, true);
+
+					// Add linedef activations
+					foreach(LinedefActivateInfo activate in General.Map.Config.LinedefActivates)
+						config.WriteSetting("managedfields.linedef." + activate.Key, true);
+
+					//mxd. Add sidedef flags
+					foreach(KeyValuePair<string, string> flag in General.Map.Config.SidedefFlags)
+						config.WriteSetting("managedfields.sidedef." + flag.Key, true);
+
+					//mxd. Add sector flags
+					foreach(KeyValuePair<string, string> flag in General.Map.Config.SectorFlags)
+						config.WriteSetting("managedfields.sector." + flag.Key, true);
+
+					// Add thing flags
+					foreach(KeyValuePair<string, string> flag in General.Map.Config.ThingFlags)
+						config.WriteSetting("managedfields.thing." + flag.Key, true);
+
+					// Done
+					udmfcfgreader.Dispose();
+					udmfcfg.Dispose();
+					break;
+				}
+			}
+		}
+
+		#endregion
+
+		#region ================== Writing
+
+		public void Write(MapSet map, Stream stream, bool longtexturenames) 
+		{
+			Write(map.Vertices, map.Linedefs, map.Sidedefs, map.Sectors, map.Things, stream, longtexturenames);
+		}
+
+		public void Write(ICollection<Vertex> vertices, ICollection<Linedef> linedefs, ICollection<Sidedef> sidedefs, 
+						  ICollection<Sector> sectors, ICollection<Thing> things, Stream stream, bool longtexturenames) 
+		{
+			// Create collections
+			Dictionary<Vertex, int> vertexids = new Dictionary<Vertex, int>();
+			Dictionary<Sidedef, int> sidedefids = new Dictionary<Sidedef, int>();
+			Dictionary<Sector, int> sectorids = new Dictionary<Sector, int>();
+
+			// Index the elements in the data structures
+			foreach(Vertex v in vertices) vertexids.Add(v, vertexids.Count);
+			foreach(Sidedef sd in sidedefs) sidedefids.Add(sd, sidedefids.Count);
+			foreach(Sector s in sectors) sectorids.Add(s, sectorids.Count);
+
+			BinaryWriter writer = new BinaryWriter(stream);
+			
+			// Write the data structures to stream
+			writer.Write(longtexturenames); //mxd
+			WriteVertices(vertices, writer);
+			WriteSectors(sectors, writer);
+			WriteSidedefs(sidedefs, writer, sectorids);
+			WriteLinedefs(linedefs, writer, sidedefids, vertexids);
+			WriteThings(things, writer);
+			writer.Flush();
+		}
+
+		private void WriteVertices(ICollection<Vertex> vertices, BinaryWriter writer) 
+		{
+			writer.Write(vertices.Count);
+			
+			foreach(Vertex v in vertices) 
+			{
+				//write "static" properties
+				writer.Write(v.Position.x);
+				writer.Write(v.Position.y);
+				writer.Write(v.ZCeiling);
+				writer.Write(v.ZFloor);
+
+				// Write custom fields
+				AddCustomFields(v.Fields, "vertex", writer);
+			}
+		}
+
+		// This adds linedefs
+		private void WriteLinedefs(ICollection<Linedef> linedefs, BinaryWriter writer, IDictionary<Sidedef, int> sidedefids, IDictionary<Vertex, int> vertexids) 
+		{
+			writer.Write(linedefs.Count);
+			
+			// Go for all linedefs
+			foreach(Linedef l in linedefs) 
+			{
+				//write "static" properties
+				writer.Write(vertexids[l.Start]);
+				writer.Write(vertexids[l.End]);
+
+				//sidedefs
+				writer.Write((l.Front != null && sidedefids.ContainsKey(l.Front)) ? sidedefids[l.Front] : -1);
+				writer.Write((l.Back != null && sidedefids.ContainsKey(l.Back)) ? sidedefids[l.Back] : -1);
+
+				//action and args
+				writer.Write(l.Action);
+				for(int i = 0; i < l.Args.Length; i++) writer.Write(l.Args[i]);
+
+				//mxd. Tags
+				writer.Write(l.Tags.Count);
+				for(int i = 0; i < l.Tags.Count; i++) writer.Write(l.Tags[i]);
+
+				AddFlags(l.Flags, writer);
+				AddCustomFields(l.Fields, "linedef", writer);
+			}
+		}
+
+		// This adds sidedefs
+		private void WriteSidedefs(ICollection<Sidedef> sidedefs, BinaryWriter writer, IDictionary<Sector, int> sectorids) 
+		{
+			writer.Write(sidedefs.Count);
+			
+			// Go for all sidedefs
+			foreach(Sidedef s in sidedefs) 
+			{
+				//write "static" properties
+				writer.Write(s.OffsetX);
+				writer.Write(s.OffsetY);
+				writer.Write(sectorids[s.Sector]);
+
+				//textures
+				writer.Write(s.HighTexture.Length);
+				writer.Write(s.HighTexture.ToCharArray());
+				writer.Write(s.MiddleTexture.Length);
+				writer.Write(s.MiddleTexture.ToCharArray());
+				writer.Write(s.LowTexture.Length);
+				writer.Write(s.LowTexture.ToCharArray());
+
+				AddFlags(s.Flags, writer);
+				AddCustomFields(s.Fields, "sidedef", writer);
+			}
+		}
+
+		// This adds sectors
+		private void WriteSectors(ICollection<Sector> sectors, BinaryWriter writer) 
+		{
+			writer.Write(sectors.Count);
+			
+			// Go for all sectors
+			foreach(Sector s in sectors) 
+			{
+				//write "static" properties
+				writer.Write(s.Effect);
+				writer.Write(s.FloorHeight);
+				writer.Write(s.CeilHeight);
+				writer.Write(s.Brightness);
+
+				//mxd. Tags
+				writer.Write(s.Tags.Count);
+				for(int i = 0; i < s.Tags.Count; i++) writer.Write(s.Tags[i]);
+
+				//textures
+				writer.Write(s.FloorTexture.Length);
+				writer.Write(s.FloorTexture.ToCharArray());
+				writer.Write(s.CeilTexture.Length);
+				writer.Write(s.CeilTexture.ToCharArray());
+
+				//mxd. Slopes
+				writer.Write(s.FloorSlopeOffset);
+				writer.Write(s.FloorSlope.x);
+				writer.Write(s.FloorSlope.y);
+				writer.Write(s.FloorSlope.z);
+				writer.Write(s.CeilSlopeOffset);
+				writer.Write(s.CeilSlope.x);
+				writer.Write(s.CeilSlope.y);
+				writer.Write(s.CeilSlope.z);
+
+				AddFlags(s.Flags, writer);
+				AddCustomFields(s.Fields, "sector", writer);
+			}
+		}
+
+		// This adds things
+		private void WriteThings(ICollection<Thing> things, BinaryWriter writer) 
+		{
+			writer.Write(things.Count);
+			
+			// Go for all things
+			foreach(Thing t in things) 
+			{
+				//write "static" properties
+				writer.Write(t.Tag);
+				writer.Write(t.Position.x);
+				writer.Write(t.Position.y);
+				writer.Write(t.Position.z);
+				writer.Write(t.AngleDoom);
+				writer.Write(t.Pitch); //mxd
+				writer.Write(t.Roll); //mxd
+				writer.Write(t.ScaleX); //mxd
+				writer.Write(t.ScaleY); //mxd
+				writer.Write(t.Type);
+				writer.Write(t.Action);
+				for(int i = 0; i < t.Args.Length; i++) writer.Write(t.Args[i]);
+
+				AddFlags(t.Flags, writer);
+				AddCustomFields(t.Fields, "thing", writer);
+			}
+		}
+
+		private void AddCustomFields(UniFields elementFields, string elementname, BinaryWriter writer) 
+		{
+			Dictionary<string, UniValue> fields = new Dictionary<string, UniValue>(StringComparer.Ordinal);
+
+			foreach(KeyValuePair<string, UniValue> f in elementFields) 
+			{
+				if(config.SettingExists("managedfields." + elementname + "." + f.Key)) continue;
+				fields.Add(f.Key, f.Value);
+			}
+
+			writer.Write(fields.Count);
+
+			foreach(KeyValuePair<string, UniValue> f in fields) 
+			{
+				writer.Write(f.Key.Length);
+				writer.Write(f.Key.ToCharArray());
+
+				writer.Write(f.Value.Type);
+				if(f.Value.Value is bool) 
+				{
+					writer.Write((int)UniversalType.Boolean);
+					writer.Write((bool)f.Value.Value);
+				} 
+				else if(f.Value.Value is float) 
+				{
+					writer.Write((int)UniversalType.Float);
+					writer.Write((float)f.Value.Value);
+				} 
+				else if(f.Value.Value.GetType().IsPrimitive) 
+				{
+					writer.Write((int)UniversalType.Integer);
+					writer.Write((int)f.Value.Value);
+				} 
+				else if(f.Value.Value is string) 
+				{
+					writer.Write((int)UniversalType.String);
+					string s = (string)f.Value.Value;
+					writer.Write(s.Length);
+					writer.Write(s.ToCharArray());
+				} 
+				else //WOLOLO! ERRORS!
+				{ 
+					General.ErrorLogger.Add(ErrorType.Error, "Unable to copy Universal Field '" + f.Key + "' to clipboard: unknown value type '" + f.Value.Type + "'!");
+				}
+			}
+		}
+
+		private static void AddFlags(Dictionary<string, bool> elementFlags, BinaryWriter writer) 
+		{
+			List<string> flags = new List<string>();
+
+			foreach(KeyValuePair<string, bool> f in elementFlags) 
+			{
+				if(!f.Value) continue;
+				flags.Add(f.Key);
+			}
+
+			writer.Write(flags.Count);
+
+			foreach(string s in flags) 
+			{
+				writer.Write(s.Length);
+				writer.Write(s.ToCharArray());
+			}
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/IO/ClippedStream.cs b/Source/Core/IO/ClippedStream.cs
new file mode 100644
index 0000000..2592cea
--- /dev/null
+++ b/Source/Core/IO/ClippedStream.cs
@@ -0,0 +1,271 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.IO;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.IO
+{
+	internal class ClippedStream : Stream
+	{
+		#region ================== Variables
+
+		// Base stream
+		private Stream basestream;
+
+		// Data limit
+		private int offset;
+		private int length;
+		private long position;
+
+		// Disposing
+		private bool isdisposed;
+		
+		#endregion
+
+		#region ================== Properties
+
+		public override long Length { get { return length; } }
+		public override long Position { get { return position; } set { this.Seek(value, SeekOrigin.Begin); } }
+		public override bool CanRead { get { return basestream.CanRead; } }
+		public override bool CanSeek { get { return basestream.CanSeek; } }
+		public override bool CanWrite { get { return basestream.CanWrite; }	}
+		public bool IsDisposed { get { return isdisposed; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public ClippedStream(Stream basestream, int offset, int length)
+		{
+			// Can only create from a stream that can seek
+			if(!basestream.CanSeek) throw new ArgumentException("ClippedStream can only be created with a Stream that allows Seeking.");
+
+			// Initialize
+			this.basestream = basestream;
+			this.position = 0;
+			this.offset = offset;
+			this.length = length;
+
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Disposer
+		public new void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Already set isdisposed to prevent recursion
+				isdisposed = true;
+				
+				// Clean up
+				basestream = null;
+				
+				// Dispose base
+				base.Dispose();
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This flushes the written changes
+		public override void Flush()
+		{
+			// Flush base stream
+			basestream.Flush();
+		}
+
+		// This reads from the stream
+		public override int Read(byte[] buffer, int offset, int count)
+		{
+			// Check if this exceeds limits
+			if((this.position + count) > (this.length + 1))
+			{
+				// Read only within limits
+				count = this.length - (int)this.position;
+			}
+
+			// Anything to read?
+			if(count > 0)
+			{
+				// Seek if needed
+				if(basestream.Position != (this.offset + this.position))
+					basestream.Seek(this.offset + this.position, SeekOrigin.Begin);
+
+				// Read from base stream
+				position += count;
+				return basestream.Read(buffer, offset, count);
+			}
+			else
+			{
+				return 0;
+			}
+		}
+
+		// This writes to the stream
+		public override void Write(byte[] buffer, int offset, int count)
+		{
+			// Check if this exceeds limits
+			if((this.position + count) > (this.length + 1))
+				throw new ArgumentException("Attempted to write outside the range of the stream.");
+
+			// Seek if needed
+			if(basestream.Position != (this.offset + this.position))
+				basestream.Seek(this.offset + this.position, SeekOrigin.Begin);
+
+			// Read from base stream
+			position += count;
+			basestream.Write(buffer, offset, count);
+		}
+		
+		// Seek within clipped buffer
+		public override long Seek(long offset, SeekOrigin origin)
+		{
+			// Seeking from beginning
+			if(origin == SeekOrigin.Begin)
+			{
+				// Check if this exceeds limits
+				if((offset > this.length) || (offset < 0))
+					throw new ArgumentException("Attempted to seek outside the range of the stream.");
+				
+				// Seek
+				position = basestream.Seek(this.offset + offset, SeekOrigin.Begin) - this.offset;
+			}
+			// Seeking from current position
+			else if(origin == SeekOrigin.Current)
+			{
+				// Check if this exceeds limits
+				if((this.position + offset > this.length) || (this.position + offset < 0))
+					throw new ArgumentException("Attempted to seek outside the range of the stream.");
+
+				// Seek
+				position = basestream.Seek(this.offset + this.position + offset, SeekOrigin.Begin) - this.offset;
+			}
+			// Seeking from end
+			else
+			{
+				// Check if this exceeds limits
+				if((offset > 0) || (this.length + offset < 0))
+					throw new ArgumentException("Attempted to seek outside the range of the stream.");
+
+				// Seek
+				position = basestream.Seek(this.offset + this.length + offset, SeekOrigin.Begin) - this.offset;
+			}
+
+			// Return new position
+			return position;
+		}
+
+		// Change the length of the steam
+		public override void SetLength(long value)
+		{
+			// Not supported
+			throw new NotSupportedException("This operation is not supported.");
+		}
+
+		// Asynchronous read from stream
+		public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
+		{
+			// Check if this exceeds limits
+			if((this.position + count) > (this.length + 1))
+				throw new ArgumentException("Attempted to read outside the range of the stream.");
+
+			// Seek if needed
+			if(basestream.Position != (this.offset + this.position))
+				basestream.Seek(this.offset + this.position, SeekOrigin.Begin);
+			
+			// Read
+			position += count;
+			return base.BeginRead(buffer, offset, count, callback, state);
+		}
+
+		// Asynchronous write to stream
+		public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
+		{
+			// Check if this exceeds limits
+			if((this.position + count) > (this.length + 1))
+				throw new ArgumentException("Attempted to write outside the range of the stream.");
+
+			// Seek if needed
+			if(basestream.Position != (this.offset + this.position))
+				basestream.Seek(this.offset + this.position, SeekOrigin.Begin);
+			
+			// Write
+			position += count;
+			return base.BeginWrite(buffer, offset, count, callback, state);
+		}
+
+		// This closes the stream
+		public override void Close()
+		{
+			basestream = null;
+			base.Close();
+			this.Dispose();
+		}
+		
+		// This reads a single byte from the stream
+		public override int ReadByte()
+		{
+			// Check if this exceeds limits
+			if((this.position + 1) > (this.length + 1))
+				throw new ArgumentException("Attempted to read outside the range of the stream.");
+
+			// Seek if needed
+			if(basestream.Position != (this.offset + this.position))
+				basestream.Seek(this.offset + this.position, SeekOrigin.Begin);
+
+			// Read from base stream
+			position++;
+			return basestream.ReadByte();
+		}
+
+		// This writes a single byte to the stream
+		public override void WriteByte(byte value)
+		{
+			// Check if this exceeds limits
+			if((this.position + 1) > (this.length + 1))
+				throw new ArgumentException("Attempted to write outside the range of the stream.");
+
+			// Seek if needed
+			if(basestream.Position != (this.offset + this.position))
+				basestream.Seek(this.offset + this.position, SeekOrigin.Begin);
+
+			// Read from base stream
+			position++;
+			basestream.WriteByte(value);
+		}
+		
+		// This returns all the bytes in the stream
+		public byte[] ReadAllBytes()
+		{
+			byte[] bytes = new byte[length];
+			Seek(0, SeekOrigin.Begin);
+			Read(bytes, 0, length);
+			return bytes;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/IO/Configuration.cs b/Source/Core/IO/Configuration.cs
new file mode 100644
index 0000000..56843ee
--- /dev/null
+++ b/Source/Core/IO/Configuration.cs
@@ -0,0 +1,1537 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== CFG file structure syntax
+
+/*
+' ====================================================================================
+'    CONFIGURATION FILE STRUCTURE SYNTAX
+' ====================================================================================
+'
+'    Whitepace is always allowed. This includes spaces, tabs
+'    linefeeds (10) and carriage returns (13)
+'
+'    Keys may not have spaces or assignment operator = in them.
+'
+'    Comments start with // (unless used within strings)
+'    and count as comment for the rest of the line. Or use /* and */				/*
+'    to mark the beginning and end of a comment.
+'
+'    Simple setting:
+'
+'              key = value;
+'
+'    Example:  speed = 345;
+'              cars = 8;
+'
+'    Strings must be in quotes.
+'
+'    Example:  nickname = "Gherkin";
+'              altnick = "Gherk inn";
+'
+'    String Escape Sequences:
+'        \n    New line (10)
+'        \r    Carriage return (13)
+'        \t    Tab (9)
+'        \"    Double-quotation mark
+'        \\    Backslash
+'        \000  Any ASCII character (MUST be 3 digits! So for 13 you use \013)
+'
+'    Decimals ALWAYS use a dot, NEVER comma!
+'
+'    Example:  pressure = 15.29;
+'              acceleration = 1.0023;
+'
+'    true, false and null are valid keywords.
+'    null values can be left out.
+'
+'    In this example, both items are null.
+'    Example:  myitem = null;
+'              myotheritem;
+'
+'    Structures must use brackets.
+'
+'    Structure Example:
+'
+'              key
+'              {
+'                   key = value;
+'                   key = value;
+'
+'                   key
+'                   {
+'                        key = value;
+'                        key = value;
+'                        key = value;
+'                   }
+'
+'                   key = value;
+'                   key = value;
+'                   key = value;
+'                   key = value;
+'                   key = value;
+'              }
+'
+'    As you can see, structures inside structures are allowed
+'    and you may go as deep as you want. Note that only the root structures
+'    can be readed from config using ReadSetting. ReadSetting will return a
+'    Dictionary object containing everything in that root structure.
+'
+'    Key names must be unique within their scope.
+'
+'    This is NOT allowed, it may not have 'father' more
+'    than once in the same scope:
+'
+'              mother = 45;
+'              father = 52;
+'
+'              father
+'              {
+'                   length = 1.87;
+'              }
+'
+'    This however is allowed, because father
+'    now exists in a different scope:
+'
+'              mother = 45;
+'              father = 52;
+'
+'              parents
+'              {
+'                   father = 52;
+'              }
+'
+'    This too is allowed, both 'age' are in a different scope:
+'
+'              mother
+'              {
+'                   age = 45;
+'              }
+'
+'              father
+'              {
+'                   age = 52;
+'              }
+*/
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Globalization;
+using System.Collections;
+using System.Collections.Specialized;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.IO
+{
+	public sealed class Configuration
+	{
+		#region ================== Constants
+		
+		// Path seperator
+		public const string DEFAULT_SEPERATOR = ".";
+		
+		// Error strings
+		private const string ERROR_KEYMISSING = "Missing key name in assignment or scope.";
+		private const string ERROR_KEYSPACES = "Spaces not allowed in key names.";
+		private const string ERROR_ASSIGNINVALID = "Invalid assignment. Missing a previous terminator symbol?";
+		private const string ERROR_VALUEINVALID = "Invalid value in assignment. Missing a previous terminator symbol?";
+		private const string ERROR_VALUETOOBIG = "Value too big.";
+		//private const string ERROR_KEYNOTUNQIUE = "Key is not unique within scope.";
+		private const string ERROR_KEYWORDUNKNOWN = "Unknown keyword in assignment. Missing a previous terminator symbol?";
+		private const string ERROR_UNEXPECTED_END = "Unexpected end of data. Missing a previous terminator symbol?";
+		private const string ERROR_UNKNOWN_FUNCTION = "Unknown function call.";
+		private const string ERROR_INVALID_ARGS = "Invalid function arguments.";
+		private const string ERROR_INCLUDE_UNSUPPORTED = "Include function is not supported in data parsed from stream.";
+
+		public const string NUMBERS = "0123456789"; 
+		public const string NUMBERS2 = "0123456789-.&"; 
+
+		#endregion
+		
+		#region ================== Variables
+		
+		// Error result
+		private bool cpErrorResult;
+		private string cpErrorDescription = "";
+		private int cpErrorLine;
+		private string cpErrorFile = "";
+		private static readonly char[] space = new[] { ' ' }; //mxd
+		private static readonly char[] newline = new[] { '\n' }; //mxd
+		
+		// Configuration root
+		private IDictionary root;
+
+		//mxd. Cache
+		private static Dictionary<string, IDictionary> cfgcache = new Dictionary<string, IDictionary>(StringComparer.Ordinal);
+		
+		#endregion
+		
+		#region ================== Properties
+		
+		// Properties
+		public bool ErrorResult { get { return cpErrorResult; } }
+		public string ErrorDescription { get { return cpErrorDescription; } }
+		public int ErrorLine { get { return cpErrorLine; } }
+		public string ErrorFile { get { return cpErrorFile; } }
+		public IDictionary Root { get { return root; } set { root = value; } }
+		public bool Sorted { get { return (root is ListDictionary); } }
+		
+		#endregion
+		
+		#region ================== Constructor / Destructor
+		
+		// Constructor
+		public Configuration()
+		{
+			// Standard new configuration
+			NewConfiguration();
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+		
+		// Constructor
+		public Configuration(bool sorted)
+		{
+			// Standard new configuration
+			NewConfiguration(sorted);
+
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+		
+		// Constructor to load a file immediately
+		public Configuration(string filename)
+		{
+			// Load configuration from file
+			LoadConfiguration(filename);
+
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+		
+		// Constructor to load a file immediately
+		public Configuration(string filename, bool sorted)
+		{
+			// Load configuration from file
+			LoadConfiguration(filename, sorted);
+
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+		
+		#endregion
+		
+		#region ================== Private Methods
+		
+		// This merges two structures
+		private static IDictionary Combine(IDictionary d1, IDictionary d2, bool sorted)
+		{
+			// Create new dictionary
+			IDictionary result;
+			if(sorted) result = new ListDictionary(); else result = new Hashtable();
+			
+			// Copy all items from d1 to result
+			IDictionaryEnumerator d1e = d1.GetEnumerator();
+			while(d1e.MoveNext()) result.Add(d1e.Key, d1e.Value);
+			
+			// Go for all items in d2
+			IDictionaryEnumerator d2e = d2.GetEnumerator();
+			while(d2e.MoveNext())
+			{
+				// Check if this is another Hashtable
+				if(d2e.Value is IDictionary)
+				{
+					// Check if already in result
+					if(result.Contains(d2e.Key) && (result[d2e.Key] is IDictionary))
+					{
+						// Modify result
+						result[d2e.Key] = Combine((IDictionary)result[d2e.Key], (IDictionary)d2e.Value, sorted);
+					}
+					else
+					{
+						// Copy from d2
+						if(sorted)
+						{
+							// Sorted combine
+							result[d2e.Key] = Combine(new ListDictionary(), (IDictionary)d2e.Value, true);
+						}
+						else
+						{
+							// Unsorted combine
+							result[d2e.Key] = Combine(new Hashtable(), (IDictionary)d2e.Value, false);
+						}
+					}
+				}
+				else
+				{
+					// Check if also in d1
+					if(result.Contains(d2e.Key))
+					{
+						// Modify result
+						result[d2e.Key] = d2e.Value;
+					}
+					else
+					{
+						// Copy
+						result.Add(d2e.Key, d2e.Value);
+					}
+				}
+			}
+			
+			// Return result
+			return result;
+		}
+		
+		// This is called by all the ReadSetting overloads to perform the read
+		private bool CheckSetting(IDictionary dic, string setting, string pathseperator)
+		{
+			// Split the path in an array
+			string[] keys = setting.Split(pathseperator.ToCharArray());
+
+			// Get the root item
+			object item = dic;
+
+			// Go for each item
+			foreach(string key in keys)
+			{
+				// Check if the current item is of ConfigStruct type
+				if(item is IDictionary)
+				{
+					// Check if the key is valid
+					if(ValidateKey(key.Trim(), "", -1))
+					{
+						// Cast to ConfigStruct
+						IDictionary cs = (IDictionary)item;
+						
+						// Check if the requested item exists
+						if(cs.Contains(key))
+						{
+							// Set the item to the next item
+							item = cs[key];
+						}
+						else
+						{
+							// Key not found
+							return false;
+						}
+					}
+					else
+					{
+						// Invalid key in path
+						return false;
+					}
+				}
+				else
+				{
+					// Unable to go any further
+					return false;
+				}
+			}
+
+			// Return result
+			return true;
+		}
+		
+		// This is called by all the ReadSetting overloads to perform the read
+		private object ReadAnySetting(string setting, object defaultsetting, string pathseperator) { return ReadAnySetting(root, setting, defaultsetting, pathseperator); }
+		private object ReadAnySetting(IDictionary dic, string setting, object defaultsetting, string pathseperator) { return ReadAnySetting(dic, "", -1, setting, defaultsetting, pathseperator); }
+		private object ReadAnySetting(IDictionary dic, string file, int line, string setting, object defaultsetting, string pathseperator)
+		{
+			// Split the path in an array
+			string[] keys = setting.Split(pathseperator.ToCharArray());
+			
+			// Get the root item
+			object item = dic;
+			
+			// Go for each item
+			foreach(string key in keys)
+			{
+				// Check if the current item is of ConfigStruct type
+				if(item is IDictionary)
+				{
+					// Check if the key is valid
+					if(ValidateKey(key.Trim(), file, line))
+					{
+						// Cast to ConfigStruct
+						IDictionary cs = (IDictionary)item;
+						
+						// Check if the requested item exists
+						if(cs.Contains(key))
+						{
+							// Set the item to the next item
+							item = cs[key];
+						}
+						else
+						{
+							// Key not found
+							// return default setting
+							return defaultsetting;
+						}
+					}
+					else
+					{
+						// Invalid key in path
+						// return default setting
+						return defaultsetting;
+					}
+				}
+				else
+				{
+					// Unable to go any further
+					// return default setting
+					return defaultsetting;
+				}
+			}
+			
+			// Return the item
+			return item;
+		}
+		
+		
+		// This returns a string added with escape characters
+		private static string EscapedString(string str)
+		{
+			// Replace the \ with \\ first!
+			str = str.Replace("\\", "\\\\");
+			str = str.Replace("\n", "\\n");
+			str = str.Replace("\r", "\\r");
+			str = str.Replace("\t", "\\t");
+			str = str.Replace("\"", "\\\"");
+			
+			// Return result
+			return str;
+		}
+		
+		
+		// This raises an error
+		private void RaiseError(string file, int line, string description)
+		{
+			// Raise error
+			if(!cpErrorResult)
+			{
+				cpErrorResult = true;
+				cpErrorDescription = description;
+				cpErrorLine = line;
+				cpErrorFile = file;
+			}
+		}
+		
+		
+		// This validates a given key and sets
+		// error properties if key is invalid and errorline > -1
+		private bool ValidateKey(string key, string file, int errorline)
+		{
+			bool validateresult;
+			
+			// Check if key is an empty string
+			if(key == "")
+			{
+				// ERROR: Missing key name in statement
+				if(errorline > -1) RaiseError(file, errorline, ERROR_KEYMISSING);
+				validateresult = false;
+			}
+			else
+			{
+				// Check if there are spaces in the key
+				if(key.IndexOfAny(space) > -1)
+				{
+					// ERROR: Spaces not allowed in key names
+					if(errorline > -1) RaiseError(file, errorline, ERROR_KEYSPACES);
+					validateresult = false;
+				}
+				else
+				{
+					// Check if we can test existance
+					//if(container != null)
+					//{
+						/*
+						// Test if the key exists in this container
+						if(container.Contains(key) == true)
+						{
+							// ERROR: Key is not unique within struct
+							if(errorline > -1) RaiseError(file, errorline, ERROR_KEYNOTUNQIUE);
+							validateresult = false;
+						}
+						else
+						*/
+						//{
+							// Key OK
+							//validateresult = true;
+						//}
+					//}
+					//else
+					//{
+						// Key OK
+						validateresult = true;
+					//}
+				}
+			}
+			
+			// Return result
+			return validateresult;
+		}
+		
+		
+		// This validates a given keyword and sets
+		// error properties if keyword is invalid and errorline > -1
+		private bool ValidateKeyword(string keyword, string file, int errorline)
+		{
+			bool validateresult;
+			
+			// Check if key is an empty string
+			if(keyword == "")
+			{
+				// ERROR: Missing key name in statement
+				if(errorline > -1) RaiseError(file, errorline, ERROR_ASSIGNINVALID);
+				validateresult = false;
+			}
+			else
+			{
+				// Check if there are spaces in the key
+				if(keyword.IndexOfAny(space) > -1)
+				{
+					// ERROR: Spaces not allowed in key names
+					if(errorline > -1) RaiseError(file, errorline, ERROR_ASSIGNINVALID);
+					validateresult = false;
+				}
+				else
+				{
+					// Key OK
+					validateresult = true;
+				}
+			}
+			
+			// Return result
+			return validateresult;
+		}
+		
+		#endregion
+		
+		#region ================== Parsing
+		
+		// This parses an assignment
+		private object ParseAssignment(ref string file, ref string data, ref int pos, ref int line)
+		{
+			object val = null;
+			
+			while((pos < data.Length) && !cpErrorResult)
+			{
+				// Get current character
+				char c = data[pos++];
+				
+				// Check for string opening
+				if(c == '\"')
+				{
+					// Now parsing a string
+					val = ParseString(ref file, ref data, ref pos, ref line);
+					if(cpErrorResult) return null;
+				}
+				// Check for numeric character
+				else if(NUMBERS2.IndexOf(c.ToString(CultureInfo.InvariantCulture), StringComparison.Ordinal) > -1)
+				{
+					// Go one byte back, because this
+					// byte is part of the number!
+					pos--;
+					
+					// Now parsing a number
+					val = ParseNumber(ref file, ref data, ref pos, ref line);
+					if(cpErrorResult) return null;
+				}
+				// Check for new line
+				else if(c == '\n')
+				{
+					// Count the new line
+					line++;
+				}
+				// Check if assignment ends
+				else if(c == ';')
+				{
+					// End of assignment
+					return val;
+				}
+				// Otherwise (if not whitespace) it is a keyword
+				else if((c != ' ') && (c != '\t'))
+				{
+					// Go one byte back, because this
+					// byte is part of the keyword!
+					pos--;
+					
+					// Now parsing a keyword
+					val = ParseKeyword(ref file, ref data, ref pos, ref line);
+					if(cpErrorResult) return null;
+				}
+			}
+			
+			RaiseError(file, line, ERROR_UNEXPECTED_END);
+			return null;
+		}
+		
+		
+		// This parses a string
+		private string ParseString(ref string file, ref string data, ref int pos, ref int line)
+		{
+			string val = "";
+			
+			// In escape sequence?
+			bool escape = false;
+			
+			while((pos < data.Length) && !cpErrorResult)
+			{
+				// Get current character
+				char c = data[pos++];
+				
+				// Check if in an escape sequence
+				if(escape)
+				{
+					// What character?
+					switch(c)
+					{
+						case '\\': val += "\\"; break;
+						case 'n': val += "\n"; break;
+						case '\"': val += "\""; break;
+						case 'r': val += "\r"; break;
+						case 't': val += "\t"; break;
+						default:
+
+							// Is it a number?
+							if(NUMBERS.IndexOf(c.ToString(CultureInfo.InvariantCulture), StringComparison.Ordinal) > -1)
+							{
+								int vv;
+								char vc;
+
+								// Convert the next 3 characters to a number
+								string v = data.Substring(pos, 3);
+								try { vv = Convert.ToInt32(v.Trim(), CultureInfo.InvariantCulture); }
+								catch(FormatException)
+								{
+									// ERROR: Invalid value in assignment
+									RaiseError(file, line, ERROR_VALUEINVALID);
+									return null;
+								}
+
+								// Convert the number to a char
+								try { vc = Convert.ToChar(vv, CultureInfo.InvariantCulture); }
+								catch(FormatException)
+								{
+									// ERROR: Invalid value in assignment
+									RaiseError(file, line, ERROR_VALUEINVALID);
+									return null;
+								}
+
+								// Add the char
+								val += vc.ToString(CultureInfo.InvariantCulture);
+							}
+							else
+							{
+								// Add the character as it is
+								val += c.ToString(CultureInfo.InvariantCulture);
+							}
+
+							// Leave switch
+							break;
+					}
+
+					// End of escape sequence
+					escape = false;
+				}
+				else
+				{
+					switch(c) //mxd
+					{ 
+						// Check for sequence start
+						case '\\':
+							// Next character is of escape sequence
+							escape = true;
+							break;
+
+						// Check if string ends
+						case '\"':
+							return val;
+
+						// Check for new line
+						case '\n':
+							// Count the new line
+							line++;
+							break;
+
+						// Everything else is just part of string
+						default:
+							// Add to value
+							val += c.ToString(CultureInfo.InvariantCulture);
+							break;
+					}
+				}
+			}
+			
+			RaiseError(file, line, ERROR_UNEXPECTED_END);
+			return null;
+		}
+		
+		
+		// Parsing a number
+		private object ParseNumber(ref string file, ref string data, ref int pos, ref int line)
+		{
+			string val = "";
+			
+			while((pos < data.Length) && !cpErrorResult)
+			{
+				// Get current character
+				char c = data[pos++];
+				
+				// Check if number ends here
+				if((c == ';') || (c == ',') || (c == ')'))
+				{
+					// One byte back, because this
+					// is also the end of the assignment
+					pos--;
+					
+					// Floating point?
+					if(val.IndexOf("f", StringComparison.Ordinal) > -1)
+					{
+						float fval;
+						
+						// Convert to float (remove the f first)
+						try { fval = Convert.ToSingle(val.Trim().Replace("f", ""), CultureInfo.InvariantCulture); }
+						catch(FormatException)
+						{
+							// ERROR: Invalid value in assignment
+							RaiseError(file, line, ERROR_VALUEINVALID);
+							return null;
+						}
+						return fval;
+					}
+					else
+					{
+						// Convert to int
+						try
+						{
+							// Convert to value
+							int ival = Convert.ToInt32(val.Trim(), CultureInfo.InvariantCulture);
+							return ival;
+						}
+						catch(OverflowException)
+						{
+							// Too large for Int32, try Int64
+							try
+							{
+								// Convert to value
+								long lval = Convert.ToInt64(val.Trim(), CultureInfo.InvariantCulture);
+								return lval;
+							}
+							catch(OverflowException)
+							{
+								// Too large for Int64, return error
+								RaiseError(file, line, ERROR_VALUETOOBIG);
+								return null;
+							}
+							catch(FormatException)
+							{
+								// ERROR: Invalid value in assignment
+								RaiseError(file, line, ERROR_VALUEINVALID);
+								return null;
+							}
+						}
+						catch(FormatException)
+						{
+							// ERROR: Invalid value in assignment
+							RaiseError(file, line, ERROR_VALUEINVALID);
+							return null;
+						}
+					}
+				}
+				// Check for new line
+				else if(c == '\n')
+				{
+					// Count the new line
+					line++;
+				}
+				// Everything else is part of the value
+				else
+				{
+					val += c.ToString(CultureInfo.InvariantCulture);
+				}
+			}
+			
+			RaiseError(file, line, ERROR_UNEXPECTED_END);
+			return null;
+		}
+		
+		
+		// Parsing a keyword
+		private object ParseKeyword(ref string file, ref string data, ref int pos, ref int line)
+		{
+			string val = "";
+			
+			while((pos < data.Length) && !cpErrorResult)
+			{
+				// Get current character
+				char c = data[pos++];
+				
+				// Check if keyword ends
+				if((c == ';') || (c == ',') || (c == ')'))
+				{
+					// One byte back, because this
+					// is also the end of the assignment
+					pos--;
+					
+					// Validate the keyword
+					if(ValidateKeyword(val.Trim(), file, line))
+					{
+						// Return result depending on the keyword
+						switch(val.Trim().ToLowerInvariant())
+						{
+							case "true": return true;
+							case "false": return false;
+							case "null": return null;
+							default: RaiseError(file, line, ERROR_KEYWORDUNKNOWN + "\nUnrecognized token: '" + val.Trim().ToLowerInvariant() + "'"); return null;
+						}
+					}
+				}
+				// Check for new line
+				else if(c == '\n')
+				{
+					// Count the new line
+					line++;
+				}
+				// Everything else is just part of keyword
+				else
+				{
+					// Add to value
+					val += c.ToString(CultureInfo.InvariantCulture);
+				}
+			}
+			
+			RaiseError(file, line, ERROR_UNEXPECTED_END);
+			return null;
+		}
+		
+		
+		// This includes another file
+		private void FunctionInclude(IDictionary cs, List<object> args, ref string file, int line)
+		{
+			string data;
+			
+			if(string.IsNullOrEmpty(file)) RaiseError(file, line, ERROR_INCLUDE_UNSUPPORTED);
+			if(args.Count < 1) RaiseError(file, line, ERROR_INVALID_ARGS);
+			if(!(args[0] is string)) RaiseError(file, line, ERROR_INVALID_ARGS + " Expected a string for argument 1.");
+			if((args.Count > 1) && !(args[1] is string)) RaiseError(file, line, ERROR_INVALID_ARGS + " Expected a string for argument 2.");
+			string filename = Path.GetFileName(file);
+			if(string.IsNullOrEmpty(filename)) RaiseError(file, line, "Invalid include statement: file name is missing."); //mxd
+			else if(args[0].ToString().ToUpperInvariant() == filename.ToUpperInvariant()) RaiseError(file, line, "A file cannot call include() on itself."); //mxd
+			if(cpErrorResult) return;
+			
+			// Determine the full path of the file to include
+			string includefile = Path.GetDirectoryName(file) + Path.DirectorySeparatorChar + args[0];
+
+			//mxd. Caching
+			if(cfgcache.ContainsKey(includefile)) 
+			{
+				IDictionary cinc = cfgcache[includefile];
+				
+				// Check if a path is given
+				if((args.Count > 1) && !string.IsNullOrEmpty(args[1].ToString())) 
+				{
+					IDictionary def;
+					if(cs is ListDictionary) def = new ListDictionary(); else def = new Hashtable();
+					if(CheckSetting(cinc, args[1].ToString(), DEFAULT_SEPERATOR)) 
+					{
+						cinc = (IDictionary)ReadAnySetting(cinc, file, line, args[1].ToString(), def, DEFAULT_SEPERATOR);
+					} 
+					else 
+					{
+						RaiseError(file, line, "Include missing structure '" + args[1] + "' in file '" + includefile + "'");
+						return;
+					}
+				}
+
+				// Recursively merge the structures with the current structure
+				IDictionary newcs = Combine(cs, cinc, (cs is ListDictionary));
+				cs.Clear();
+				foreach(DictionaryEntry de in newcs) cs.Add(de.Key, de.Value);
+				return;
+			}
+			
+			try
+			{
+				// Load the file contents
+				FileStream fstream = File.OpenRead(includefile);
+				byte[] fbuffer = new byte[fstream.Length];
+				fstream.Read(fbuffer, 0, fbuffer.Length);
+				fstream.Close();
+				
+				// Convert byte array to string
+				data = Encoding.UTF8.GetString(fbuffer);
+			}
+			catch(Exception e)
+			{
+				RaiseError(file, line, "Unable to include file '" + includefile + "'. " + e.GetType().Name + ": " + e.Message);
+				return;
+			}
+			
+			// Remove returns and tabs because the
+			// parser only uses newline for new lines.
+			data = data.Replace("\r", "");
+			data = data.Replace("\t", "");
+			
+			// Parse the data
+			IDictionary inc;
+			if(cs is ListDictionary) inc = new ListDictionary(); else inc = new Hashtable();
+			int npos = 0, nline = 1;
+			InputStructure(inc, ref includefile, ref data, ref npos, ref nline);
+			if(!cpErrorResult)
+			{
+				//mxd. Add to cache
+				cfgcache.Add(includefile, inc);
+				
+				// Check if a path is given
+				if((args.Count > 1) && !string.IsNullOrEmpty(args[1].ToString()))
+				{
+					IDictionary def;
+					if(cs is ListDictionary) def = new ListDictionary(); else def = new Hashtable();
+					if(CheckSetting(inc, args[1].ToString(), DEFAULT_SEPERATOR))
+					{
+						inc = (IDictionary)ReadAnySetting(inc, file, line, args[1].ToString(), def, DEFAULT_SEPERATOR);
+					}
+					else
+					{
+						RaiseError(file, line, "Include missing structure '" + args[1] + "' in file '" + includefile + "'");
+						return;
+					}
+				}
+				
+				// Recursively merge the structures with the current structure
+				IDictionary newcs = Combine(cs, inc, (cs is ListDictionary));
+				cs.Clear();
+				foreach(DictionaryEntry de in newcs) cs.Add(de.Key, de.Value);
+			}
+		}
+		
+		
+		// This parses a function
+		private void ParseFunction(IDictionary cs, ref string file, ref string data, ref int pos, ref int line, ref string functionname)
+		{
+			// We now parse arguments, separated by commas, until we reach the end of the function
+			List<object> args = new List<object>();
+			while((pos < data.Length) && !cpErrorResult)
+			{
+				// Get current character
+				char c = data[pos++];
+				
+				// Check for end of function
+				if(c == ')')
+				{
+					// Check what function to run
+					switch(functionname.Trim().ToLowerInvariant())
+					{
+						// Include another file in here
+						case "include":
+							FunctionInclude(cs, args, ref file, line);
+							return;
+							
+						default:
+							RaiseError(file, line, ERROR_UNKNOWN_FUNCTION);
+							return;
+					}
+				}
+
+				// Check for string opening
+				if(c == '\"')
+				{
+					// Now parsing a string
+					object val = ParseString(ref file, ref data, ref pos, ref line);
+					if(cpErrorResult) return;
+					args.Add(val);
+				}
+				// Check for numeric character
+				else if(NUMBERS2.IndexOf(c.ToString(CultureInfo.InvariantCulture), StringComparison.Ordinal) > -1)
+				{
+					// Go one byte back, because this
+					// byte is part of the number!
+					pos--;
+					
+					// Now parsing a number
+					object val = ParseNumber(ref file, ref data, ref pos, ref line);
+					if(cpErrorResult) return;
+					args.Add(val);
+				}
+				// Check for new line
+				else if(c == '\n')
+				{
+					// Count the new line
+					line++;
+				}
+				// Check if argument ends
+				else if(c == ',')
+				{
+					// End of argument
+				}
+				// Otherwise (if not whitespace) it is a keyword
+				else if((c != ' ') && (c != '\t'))
+				{
+					// Go one byte back, because this
+					// byte is part of the keyword!
+					pos--;
+					
+					// Now parsing a keyword
+					object val = ParseKeyword(ref file, ref data, ref pos, ref line);
+					if(cpErrorResult) return;
+					args.Add(val);
+				}
+			}
+			
+			RaiseError(file, line, ERROR_UNEXPECTED_END);
+		}
+		
+		
+		// This parses a structure in the given data starting
+		// from the given pos and line and updates pos and line.
+		private void InputStructure(IDictionary cs, ref string file, ref string data, ref int pos, ref int line)
+		{
+			string key = "";
+			
+			// Go through all of the data until
+			// the end or until the struct closes
+			// or when an arror occurred
+			while((pos < data.Length) && !cpErrorResult)
+			{
+				// Get current character
+				char c = data[pos++];
+				
+				// Check what character this is
+				switch(c)
+				{
+					case '{': // Begin of new struct
+						
+						// Validate key
+						if(ValidateKey(key.Trim(), file, line))
+						{
+							// Parse this struct and add it
+							IDictionary cs2;
+							if(cs is ListDictionary) cs2 = new ListDictionary(); else cs2 = new Hashtable();
+							InputStructure(cs2, ref file, ref data, ref pos, ref line);
+							if(cs.Contains(key.Trim()) && (cs[key.Trim()] is IDictionary))
+								cs[key.Trim()] = Combine((IDictionary)cs[key.Trim()], cs2, (cs is ListDictionary));
+							else
+								cs[key.Trim()] = cs2;
+							key = "";
+						}
+						break;
+						
+					case '}': // End of this struct
+						
+						// Stop parsing in this struct
+						return;
+						
+					case '(': // Function
+						ParseFunction(cs, ref file, ref data, ref pos, ref line, ref key);
+						key = "";
+						break;
+						
+					case '=': // Assignment
+						
+						// Validate key
+						if(ValidateKey(key.Trim(), file, line))
+						{
+							// Now parsing assignment
+							object val = ParseAssignment(ref file, ref data, ref pos, ref line);
+							if(!cpErrorResult)
+							{
+								cs[key.Trim()] = val;
+								key = "";
+							}
+						}
+						break;
+						
+					case ';': // Terminator
+						
+						// Validate key
+						if(!string.IsNullOrEmpty(key))
+						{
+							if(ValidateKey(key.Trim(), file, line))
+							{
+								// Add the key with null as value
+								cs[key.Trim()] = null;
+								key = "";
+							}
+						}
+						break;
+						
+					case '\n': // New line
+						
+						// Count the line
+						line++;
+						
+						// Add this to the key as a space.
+						// Spaces are not allowed, but it will be trimmed
+						// when its the first or last character.
+						key += " ";
+						break;
+						
+					case '\\': // Possible comment
+					case '/':
+						
+						// Backtrack to use previous character also
+						pos--;
+						
+						// Check for the line comment //
+						if(data.Substring(pos, 2) == "//")
+						{
+							// Find the next line
+							int np = data.IndexOf("\n", pos, StringComparison.Ordinal);
+							
+							// Next line found?
+							if(np > -1)
+							{
+								// Count the line
+								line++;
+								
+								// Skip everything on this line
+								pos = np + 1;
+							}
+							else
+							{
+								// No end of line
+								// Skip everything else
+								pos = data.Length + 1;
+							}
+						}
+						// Check for the block comment /* */
+						else if(data.Substring(pos, 2) == "/*")
+						{
+							// Find the next closing block comment
+							int np = data.IndexOf("*/", pos, StringComparison.Ordinal);
+							
+							// Closing block comment found?
+							if(np > -1)
+							{
+								// Count the lines in the block comment
+								string blockdata = data.Substring(pos, np - pos + 2);
+								line += (blockdata.Split(newline).Length - 1);
+								
+								// Skip everything in this block
+								pos = np + 2;
+							}
+							else
+							{
+								// No end of line
+								// Skip everything else
+								pos = data.Length + 1;
+							}
+						}
+						else
+						{
+							// No whitespace
+							pos++;
+						}
+						break;
+						
+					default: // Everything else
+						
+						// Add character to key
+						key += c.ToString(CultureInfo.InvariantCulture);
+						break;
+				}
+			}
+		}
+		
+		#endregion
+
+		#region ================== Writing
+
+		// This will create a data structure from the given object
+		private static string OutputStructure(IDictionary cs, int level, string newline, bool whitespace)
+		{
+			string leveltabs = "";
+			string spacing = "";
+			StringBuilder db = new StringBuilder("");
+			
+			// Check if this ConfigStruct is not empty
+			if(cs.Count > 0)
+			{
+				// Create whitespace
+				if(whitespace)
+				{
+					for(int i = 0; i < level; i++) leveltabs += "\t";
+					spacing = " ";
+				}
+				
+				// Get enumerator
+				IDictionaryEnumerator de = cs.GetEnumerator();
+				
+				// Go for each item
+				for(int i = 0; i < cs.Count; i++)
+				{
+					// Go to next item
+					de.MoveNext();
+					
+					// Check if the value is null
+					if(de.Value == null)
+					{
+						// Output key only
+						db.Append(leveltabs); db.Append(de.Key); db.Append(";"); db.Append(newline);
+					}
+					// Check if the value if of ConfigStruct type
+					else if(de.Value is IDictionary)
+					{
+						// Output recursive structure
+						if(whitespace) { db.Append(leveltabs); db.Append(newline); }
+						db.Append(leveltabs); db.Append(de.Key); db.Append(newline);
+						db.Append(leveltabs); db.Append("{"); db.Append(newline);
+						db.Append(OutputStructure((IDictionary)de.Value, level + 1, newline, whitespace));
+						db.Append(leveltabs); db.Append("}"); db.Append(newline);
+						//if(whitespace) { db.Append(leveltabs); db.Append(newline); }
+					}
+					// Check if the value is of boolean type
+					else if(de.Value is bool)
+					{
+						// Check value
+						if((bool)de.Value)
+						{
+							// Output the keyword "true"
+							db.Append(leveltabs); db.Append(de.Key); db.Append(spacing);
+							db.Append("="); db.Append(spacing); db.Append("true;"); db.Append(newline);
+						}
+						else
+						{
+							// Output the keyword "false"
+							db.Append(leveltabs); db.Append(de.Key); db.Append(spacing);
+							db.Append("="); db.Append(spacing); db.Append("false;"); db.Append(newline);
+						}
+					}
+					// Check if value is of float type
+					else if(de.Value is float)
+					{
+						// Output the value with a postfixed f
+						db.Append(leveltabs); db.Append(de.Key); db.Append(spacing); db.Append("=");
+						db.Append(spacing); db.Append(String.Format(CultureInfo.InvariantCulture, "{0}", de.Value)); db.Append("f;"); db.Append(newline);
+					}
+					// Check if value is of other numeric type
+					else if(de.Value.GetType().IsPrimitive)
+					{
+						// Output the value unquoted
+						db.Append(leveltabs); db.Append(de.Key); db.Append(spacing); db.Append("=");
+						db.Append(spacing); db.Append(String.Format(CultureInfo.InvariantCulture, "{0}", de.Value)); db.Append(";"); db.Append(newline);
+					}
+					else
+					{
+						// Output the value with quotes and escape characters
+						db.Append(leveltabs); db.Append(de.Key); db.Append(spacing); db.Append("=");
+						db.Append(spacing); db.Append("\""); db.Append(EscapedString(de.Value.ToString())); db.Append("\";"); db.Append(newline);
+					}
+				}
+			}
+			
+			// Return the structure
+			return db.ToString();
+		}
+		
+		#endregion
+		
+		#region ================== Public Methods
+		
+		// This clears the last error
+		public void ClearError()
+		{
+			// Clear error
+			cpErrorResult = false;
+			cpErrorDescription = "";
+			cpErrorLine = 0;
+			cpErrorFile = "";
+		}
+		
+		
+		// This creates a new configuration
+		public void NewConfiguration() { NewConfiguration(false); }
+		public void NewConfiguration(bool sorted)
+		{
+			// Create new configuration
+			if(sorted) root = new ListDictionary(); else root = new Hashtable();
+		}
+		
+		// This checks if a given setting exists (disregards type)
+		public bool SettingExists(string setting) { return CheckSetting(root, setting, DEFAULT_SEPERATOR); }
+		public bool SettingExists(string setting, string pathseperator) { return CheckSetting(root, setting, pathseperator); }
+		
+		// This can give a value of a key specified in a path form
+		// also, this does not error when the setting does not exist,
+		// but instead returns the given default value.
+		public string ReadSetting(string setting, string defaultsetting) { object r = ReadAnySetting(setting, defaultsetting, DEFAULT_SEPERATOR); if(r != null) return r.ToString(); else return null; }
+		public string ReadSetting(string setting, string defaultsetting, string pathseperator) { object r = ReadAnySetting(setting, defaultsetting, pathseperator); if(r != null) return r.ToString(); else return null; }
+		public int ReadSetting(string setting, int defaultsetting) { return Convert.ToInt32(ReadAnySetting(setting, defaultsetting, DEFAULT_SEPERATOR), CultureInfo.InvariantCulture); }
+		public int ReadSetting(string setting, int defaultsetting, string pathseperator) { return Convert.ToInt32(ReadAnySetting(setting, defaultsetting, pathseperator), CultureInfo.InvariantCulture); }
+		public float ReadSetting(string setting, float defaultsetting) { return Convert.ToSingle(ReadAnySetting(setting, defaultsetting, DEFAULT_SEPERATOR), CultureInfo.InvariantCulture); }
+		public float ReadSetting(string setting, float defaultsetting, string pathseperator) { return Convert.ToSingle(ReadAnySetting(setting, defaultsetting, pathseperator), CultureInfo.InvariantCulture); }
+		public short ReadSetting(string setting, short defaultsetting) { return Convert.ToInt16(ReadAnySetting(setting, defaultsetting, DEFAULT_SEPERATOR), CultureInfo.InvariantCulture); }
+		public short ReadSetting(string setting, short defaultsetting, string pathseperator) { return Convert.ToInt16(ReadAnySetting(setting, defaultsetting, pathseperator), CultureInfo.InvariantCulture); }
+		public long ReadSetting(string setting, long defaultsetting) { return Convert.ToInt64(ReadAnySetting(setting, defaultsetting, DEFAULT_SEPERATOR), CultureInfo.InvariantCulture); }
+		public long ReadSetting(string setting, long defaultsetting, string pathseperator) { return Convert.ToInt64(ReadAnySetting(setting, defaultsetting, pathseperator), CultureInfo.InvariantCulture); }
+		public bool ReadSetting(string setting, bool defaultsetting) { return Convert.ToBoolean(ReadAnySetting(setting, defaultsetting, DEFAULT_SEPERATOR), CultureInfo.InvariantCulture); }
+		public bool ReadSetting(string setting, bool defaultsetting, string pathseperator) { return Convert.ToBoolean(ReadAnySetting(setting, defaultsetting, pathseperator), CultureInfo.InvariantCulture); }
+		public byte ReadSetting(string setting, byte defaultsetting) { return Convert.ToByte(ReadAnySetting(setting, defaultsetting, DEFAULT_SEPERATOR), CultureInfo.InvariantCulture); }
+		public byte ReadSetting(string setting, byte defaultsetting, string pathseperator) { return Convert.ToByte(ReadAnySetting(setting, defaultsetting, pathseperator), CultureInfo.InvariantCulture); }
+		public IDictionary ReadSetting(string setting, IDictionary defaultsetting) { return (IDictionary)ReadAnySetting(setting, defaultsetting, DEFAULT_SEPERATOR); }
+		public IDictionary ReadSetting(string setting, IDictionary defaultsetting, string pathseperator) { return (IDictionary)ReadAnySetting(setting, defaultsetting, pathseperator); }
+
+		public object ReadSettingObject(string setting, object defaultsetting) { return ReadAnySetting(setting, defaultsetting, DEFAULT_SEPERATOR); }
+		
+		
+		// This writes a given setting to the configuration.
+		// Wont change existing structs, but will add them as needed.
+		// Returns true when written, false when failed.
+		public bool WriteSetting(string setting, object settingvalue) { return WriteSetting(setting, settingvalue, DEFAULT_SEPERATOR); }
+		public bool WriteSetting(string setting, object settingvalue, string pathseperator)
+		{
+			IDictionary cs;
+			
+			// Split the path in an array
+			string[] keys = setting.Split(pathseperator.ToCharArray());
+			string finalkey = keys[keys.Length - 1];
+			
+			// Get the root item
+			object item = root;
+			
+			// Go for each path item
+			for(int i = 0; i < (keys.Length - 1); i++)
+			{
+				// Check if the key is valid
+				if(ValidateKey(keys[i].Trim(), "", -1))
+				{
+					// Cast to ConfigStruct
+					cs = (IDictionary)item;
+					
+					// Check if the requested item exists
+					if(cs.Contains(keys[i]))
+					{
+						// Check if the requested item is a ConfigStruct
+						if(cs[keys[i]] is IDictionary)
+						{
+							// Set the item to the next item
+							item = cs[keys[i]];
+						}
+						else
+						{
+							// Cant proceed with path
+							return false;
+						}
+					}
+					else
+					{
+						// Key not found
+						// Create it now
+						IDictionary ncs;
+						if(root is ListDictionary) ncs = new ListDictionary(); else ncs = new Hashtable();
+						cs.Add(keys[i], ncs);
+						
+						// Set the item to the next item
+						item = cs[keys[i]];
+					}
+				}
+				else
+				{
+					// Invalid key in path
+					return false;
+				}
+			}
+			
+			// Cast to ConfigStruct
+			cs = (IDictionary)item;
+			
+			// Check if the key already exists
+			if(cs.Contains(finalkey))
+			{
+				// Update the value
+				cs[finalkey] = settingvalue;
+			}
+			else
+			{
+				// Create the key/value pair
+				cs.Add(finalkey, settingvalue);
+			}
+			
+			// Return success
+			return true;
+		}
+		
+		
+		// This removes a given setting from the configuration.
+		public bool DeleteSetting(string setting) { return DeleteSetting(setting, DEFAULT_SEPERATOR); }
+		public bool DeleteSetting(string setting, string pathseperator)
+		{
+			IDictionary cs;
+			
+			// Split the path in an array
+			string[] keys = setting.Split(pathseperator.ToCharArray());
+			string finalkey = keys[keys.Length - 1];
+			
+			// Get the root item
+			object item = root;
+			
+			// Go for each path item
+			for(int i = 0; i < (keys.Length - 1); i++)
+			{
+				// Check if the key is valid
+				if(ValidateKey(keys[i].Trim(), "", -1))
+				{
+					// Cast to ConfigStruct
+					cs = (IDictionary)item;
+					
+					// Check if the requested item exists
+					if(cs.Contains(keys[i]))
+					{
+						// Check if the requested item is a ConfigStruct
+						if(cs[keys[i]] is IDictionary)
+						{
+							// Set the item to the next item
+							item = cs[keys[i]];
+						}
+						else
+						{
+							// Cant proceed with path
+							return false;
+						}
+					}
+					else
+					{
+						// Key not found
+						// Create it now
+						IDictionary ncs;
+						if(root is ListDictionary) ncs = new ListDictionary(); else ncs = new Hashtable();
+						cs.Add(keys[i], ncs);
+						
+						// Set the item to the next item
+						item = cs[keys[i]];
+					}
+				}
+				else
+				{
+					// Invalid key in path
+					return false;
+				}
+			}
+			
+			// Cast to ConfigStruct
+			cs = (IDictionary)item;
+			
+			// Arrived at our destination
+			// Delete the key if the key exists
+			if(cs.Contains(finalkey))
+			{
+				// Key exists, delete it
+				cs.Remove(finalkey);
+				
+				// Return success
+				return true;
+			}
+			else
+			{
+				// Key not found, return fail
+				return false;
+			}
+		}
+		
+		
+		// This will save the current configuration to the specified file
+		public bool SaveConfiguration(string filename) { return SaveConfiguration(filename, "\r\n", true); }
+		public bool SaveConfiguration(string filename, string newline) { return SaveConfiguration(filename, newline, true); }
+		public bool SaveConfiguration(string filename, string newline, bool whitespace)
+		{
+			// Kill the file if it exists
+			if(File.Exists(filename)) File.Delete(filename);
+			
+			// Open file stream for writing
+			FileStream fstream = File.OpenWrite(filename);
+			
+			// Create output structure and write to file
+			string data = OutputConfiguration(newline, whitespace);
+			byte[] baData= Encoding.UTF8.GetBytes(data);
+			fstream.Write(baData, 0, baData.Length);
+			fstream.Flush();
+			fstream.Close();
+			
+			// Return true when done, false when errors occurred
+			return !cpErrorResult;
+		}
+		
+		
+		// This will output the current configuration as a string
+		public string OutputConfiguration() { return OutputConfiguration("\r\n", true); }
+		public string OutputConfiguration(string newline) { return OutputConfiguration(newline, true); }
+		public string OutputConfiguration(string newline, bool whitespace)
+		{
+			// Simply return the configuration structure as string
+			return OutputStructure(root, 0, newline, whitespace);
+		}
+		
+		
+		// This will load a configuration from file
+		public bool LoadConfiguration(string filename) { return LoadConfiguration(filename, false); }
+		public bool LoadConfiguration(string filename, bool sorted)
+		{
+			// Check if the file is missing
+			if(!File.Exists(filename))
+			{
+				throw(new FileNotFoundException("File not found \"" + filename + "\"", filename));
+			}
+			else
+			{
+				// Load the file contents
+				FileStream fstream = File.OpenRead(filename);
+				byte[] fbuffer = new byte[fstream.Length];
+				fstream.Read(fbuffer, 0, fbuffer.Length);
+				fstream.Close();
+				
+				// Convert byte array to string
+				string data = Encoding.UTF8.GetString(fbuffer);
+				
+				// Load the configuration from this data
+				return InputConfiguration(filename, data, sorted);
+			}
+		}
+		
+		
+		// This will load a configuration from string
+		public bool InputConfiguration(string data) { return InputConfiguration(data, false); }
+		public bool InputConfiguration(string data, bool sorted) { return InputConfiguration("", data, sorted); }
+		private bool InputConfiguration(string file, string data, bool sorted)
+		{
+			// Remove returns and tabs because the
+			// parser only uses newline for new lines.
+			data = data.Replace("\r", "");
+			data = data.Replace("\t", "");
+			
+			// Clear errors
+			ClearError();
+			
+			// Parse the data to the root structure
+			if(sorted) root = new ListDictionary(); else root = new Hashtable();
+			int pos = 0, line = 1;
+			InputStructure(root, ref file, ref data, ref pos, ref line);
+			
+			// Return true when done, false when errors occurred
+			return !cpErrorResult;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/IO/DeserializerStream.cs b/Source/Core/IO/DeserializerStream.cs
new file mode 100644
index 0000000..9c571ae
--- /dev/null
+++ b/Source/Core/IO/DeserializerStream.cs
@@ -0,0 +1,196 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Geometry;
+using System.IO;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.IO
+{
+	internal sealed class DeserializerStream : IReadWriteStream
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		private Stream stream;
+		private BinaryReader reader;
+		private string[] stringstable;
+		private int stringtablepos;
+
+		#endregion
+
+		#region ================== Properties
+
+		public bool IsWriting { get { return false; } }
+
+		public int EndPosition { get { return stringtablepos; } }
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		// Constructor
+		public DeserializerStream(Stream stream)
+		{
+			// Initialize
+			this.stream = stream;
+			this.reader = new BinaryReader(stream);
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// Management
+		public void Begin()
+		{
+			// First 4 bytes are reserved for the offset of the strings table
+			stringtablepos = reader.ReadInt32();
+			stream.Seek(stringtablepos, SeekOrigin.Begin);
+			
+			// Read the strings
+			List<string> strings = new List<string>();
+			while(stream.Position < (int)stream.Length)
+				strings.Add(reader.ReadString());
+			stringstable = strings.ToArray();
+
+			// Back to start
+			stream.Seek(4, SeekOrigin.Begin);
+		}
+		
+		public void End()
+		{
+		}
+
+		// Bidirectional
+		public void rwInt(ref int v) { v = reader.ReadInt32(); }
+
+		public void rwByte(ref byte v) { v = reader.ReadByte(); }
+
+		public void rwShort(ref short v) { v = reader.ReadInt16(); }
+
+		public void rwString(ref string v)
+		{
+			ushort index = reader.ReadUInt16();
+			v = stringstable[index];
+		}
+
+		public void rwLong(ref long v) { v = reader.ReadInt64(); }
+
+		public void rwUInt(ref uint v) { v = reader.ReadUInt32(); }
+
+		public void rwUShort(ref ushort v) { v = reader.ReadUInt16(); }
+
+		public void rwULong(ref ulong v) { v = reader.ReadUInt64(); }
+
+		public void rwFloat(ref float v) { v = reader.ReadSingle(); }
+
+		public void rwBool(ref bool v) { v = reader.ReadBoolean(); }
+
+		public void rwVector2D(ref Vector2D v)
+		{
+			v.x = reader.ReadSingle();
+			v.y = reader.ReadSingle();
+		}
+
+		public void rwVector3D(ref Vector3D v)
+		{
+			v.x = reader.ReadSingle();
+			v.y = reader.ReadSingle();
+			v.z = reader.ReadSingle();
+		}
+
+		// Write-only is not supported
+		public void wInt(int v) { General.Fail("Write-only is not supported on deserialization stream. Consider passing the element by reference for bidirectional support."); }
+
+		public void wByte(byte v) { General.Fail("Write-only is not supported on deserialization stream. Consider passing the element by reference for bidirectional support."); }
+
+		public void wShort(short v) { General.Fail("Write-only is not supported on deserialization stream. Consider passing the element by reference for bidirectional support."); }
+
+		public void wString(string v) { General.Fail("Write-only is not supported on deserialization stream. Consider passing the element by reference for bidirectional support."); }
+
+		public void wLong(long v) { General.Fail("Write-only is not supported on deserialization stream. Consider passing the element by reference for bidirectional support."); }
+
+		public void wUInt(uint v) { General.Fail("Write-only is not supported on deserialization stream. Consider passing the element by reference for bidirectional support."); }
+
+		public void wUShort(ushort v) { General.Fail("Write-only is not supported on deserialization stream. Consider passing the element by reference for bidirectional support."); }
+
+		public void wULong(ulong v) { General.Fail("Write-only is not supported on deserialization stream. Consider passing the element by reference for bidirectional support."); }
+
+		public void wFloat(float v) { General.Fail("Write-only is not supported on deserialization stream. Consider passing the element by reference for bidirectional support."); }
+
+		public void wBool(bool v) { General.Fail("Write-only is not supported on deserialization stream. Consider passing the element by reference for bidirectional support."); }
+
+		public void wVector2D(Vector2D v)
+		{
+			General.Fail("Write-only is not supported on deserialization stream. Consider passing the element by reference for bidirectional support.");
+		}
+
+		public void wVector3D(Vector3D v)
+		{
+			General.Fail("Write-only is not supported on deserialization stream. Consider passing the element by reference for bidirectional support.");
+		}
+
+		// Read-only
+		public void rInt(out int v) { v = reader.ReadInt32(); }
+
+		public void rByte(out byte v) { v = reader.ReadByte(); }
+
+		public void rShort(out short v) { v = reader.ReadInt16(); }
+
+		public void rString(out string v)
+		{
+			ushort index = reader.ReadUInt16();
+			v = stringstable[index];
+		}
+
+		public void rLong(out long v) { v = reader.ReadInt64(); }
+
+		public void rUInt(out uint v) { v = reader.ReadUInt32(); }
+
+		public void rUShort(out ushort v) { v = reader.ReadUInt16(); }
+
+		public void rULong(out ulong v) { v = reader.ReadUInt64(); }
+
+		public void rFloat(out float v) { v = reader.ReadSingle(); }
+
+		public void rBool(out bool v) { v = reader.ReadBoolean(); }
+
+		public void rVector2D(out Vector2D v)
+		{
+			v = new Vector2D();
+			v.x = reader.ReadSingle();
+			v.y = reader.ReadSingle();
+		}
+
+		public void rVector3D(out Vector3D v)
+		{
+			v = new Vector3D();
+			v.x = reader.ReadSingle();
+			v.y = reader.ReadSingle();
+			v.z = reader.ReadSingle();
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/IO/DirectoryFileEntry.cs b/Source/Core/IO/DirectoryFileEntry.cs
new file mode 100644
index 0000000..faf175a
--- /dev/null
+++ b/Source/Core/IO/DirectoryFileEntry.cs
@@ -0,0 +1,86 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.IO;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.IO
+{
+	internal struct DirectoryFileEntry
+	{
+										// Example for:   C:\WADs\Foo\Bar.WAD
+										// Created from:  C:\WADs
+		// Members
+		public string filename;			// bar.wad
+		public string filetitle;		// bar
+		public string extension;		// wad
+		public string path;				// foo\
+		public string filepathname;		// Foo\Bar.WAD
+		public string filepathtitle;	// Foo\Bar
+
+		// Constructor
+		public DirectoryFileEntry(string fullname, string frompath)
+		{
+			// Get the information we need
+			filename = Path.GetFileName(fullname);
+			filetitle = Path.GetFileNameWithoutExtension(fullname);
+			extension = Path.GetExtension(fullname);
+			if(extension.Length > 1)
+				extension = extension.Substring(1);
+			else
+				extension = "";
+			path = Path.GetDirectoryName(fullname);
+			if(path.Length > (frompath.Length + 1))
+				path = path.Substring(frompath.Length + 1) + Path.DirectorySeparatorChar;
+			else
+				path = "";
+			filepathname = Path.Combine(path, filename);
+			filepathtitle = Path.Combine(path, filetitle);
+
+			// Make some lowercase
+			filename = filename.ToLowerInvariant();
+			filetitle = filetitle.ToLowerInvariant();
+			extension = extension.ToLowerInvariant();
+			path = path.ToLowerInvariant();
+		}
+
+		// Constructor
+		public DirectoryFileEntry(string fullname)
+		{
+			// Get the information we need
+			filename = Path.GetFileName(fullname);
+			filetitle = Path.GetFileNameWithoutExtension(fullname);
+			extension = Path.GetExtension(fullname);
+			if(extension.Length > 1)
+				extension = extension.Substring(1);
+			else
+				extension = "";
+			path = Path.GetDirectoryName(fullname);
+			if(!string.IsNullOrEmpty(path)) path += Path.DirectorySeparatorChar; //mxd
+			filepathname = Path.Combine(path, filename);
+			filepathtitle = Path.Combine(path, filetitle);
+
+			// Make some lowercase
+			filename = filename.ToLowerInvariant();
+			filetitle = filetitle.ToLowerInvariant();
+			extension = extension.ToLowerInvariant();
+			path = path.ToLowerInvariant();
+		}
+	}
+}
diff --git a/Source/Core/IO/DirectoryFilesList.cs b/Source/Core/IO/DirectoryFilesList.cs
new file mode 100644
index 0000000..5dcee53
--- /dev/null
+++ b/Source/Core/IO/DirectoryFilesList.cs
@@ -0,0 +1,311 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.IO
+{
+	internal sealed class DirectoryFilesList
+	{
+		#region ================== Variables
+
+		private readonly DirectoryFileEntry[] entries;
+		private readonly Dictionary<string, DirectoryFileEntry> hashedentries;
+		
+		#endregion
+
+		#region ================== Properties
+
+		public int Count { get { return entries.Length; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor to fill list from directory and optionally subdirectories
+		public DirectoryFilesList(string path, bool subdirectories)
+		{
+			path = Path.GetFullPath(path);
+			string[] files = Directory.GetFiles(path, "*", subdirectories ? SearchOption.AllDirectories : SearchOption.TopDirectoryOnly);
+			Array.Sort(files); //mxd
+			entries = new DirectoryFileEntry[files.Length];
+			hashedentries = new Dictionary<string, DirectoryFileEntry>(files.Length, StringComparer.Ordinal);
+			for(int i = 0; i < files.Length; i++)
+			{
+				entries[i] = new DirectoryFileEntry(files[i], path);
+				string hashkey = entries[i].filepathname.ToLowerInvariant();
+				if(hashedentries.ContainsKey(hashkey))
+					throw new IOException("Multiple files with the same filename in the same directory are not allowed. See: \"" + entries[i].filepathname + "\"");
+				hashedentries.Add(hashkey, entries[i]);
+			}
+		}
+
+		// Constructor for custom list
+		public DirectoryFilesList(ICollection<DirectoryFileEntry> sourceentries)
+		{
+			int index = 0;
+			entries = new DirectoryFileEntry[sourceentries.Count];
+			hashedentries = new Dictionary<string, DirectoryFileEntry>(sourceentries.Count, StringComparer.Ordinal);
+			foreach(DirectoryFileEntry e in sourceentries)
+			{
+				entries[index] = e;
+				string hashkey = e.filepathname.ToLowerInvariant();
+				if(hashedentries.ContainsKey(hashkey))
+					throw new IOException("Multiple files with the same filename in the same directory are not allowed. See: \"" + e.filepathname + "\"");
+				hashedentries.Add(hashkey, e);
+				index++;
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This checks if a given file exists
+		// The given file path must not be absolute
+		public bool FileExists(string filepathname)
+		{
+			return hashedentries.ContainsKey(filepathname.ToLowerInvariant());
+		}
+
+		// This returns file information for the given file
+		// The given file path must not be absolute
+		public DirectoryFileEntry GetFileInfo(string filepathname)
+		{
+			return hashedentries[filepathname.ToLowerInvariant()];
+		}
+		
+		// This returns a list of all files (filepathname)
+		public List<string> GetAllFiles()
+		{
+			List<string> files = new List<string>(entries.Length);
+			for(int i = 0; i < entries.Length; i++) files.Add(entries[i].filepathname);
+			return files;
+		}
+
+		// This returns a list of all files optionally with subdirectories included
+		public List<string> GetAllFiles(bool subdirectories)
+		{
+			if(subdirectories)
+				return GetAllFiles();
+			else
+			{
+				List<string> files = new List<string>(entries.Length);
+				for(int i = 0; i < entries.Length; i++)
+					if(entries[i].path.Length == 0) files.Add(entries[i].filepathname);
+				return files;
+			}
+		}
+
+		// This returns a list of all files that are in the given path and optionally in subdirectories
+		public List<string> GetAllFiles(string path, bool subdirectories)
+		{
+			path = CorrectPath(path).ToLowerInvariant();
+			if(subdirectories)
+			{
+				List<string> files = new List<string>(entries.Length);
+				for(int i = 0; i < entries.Length; i++)
+					if(entries[i].path.StartsWith(path)) files.Add(entries[i].filepathname);
+				return files;
+			}
+			else
+			{
+				List<string> files = new List<string>(entries.Length);
+				for(int i = 0; i < entries.Length; i++)
+					if(entries[i].path == path) files.Add(entries[i].filepathname);
+				return files;
+			}
+		}
+
+		// This returns a list of all files that are in the given path and subdirectories and have the given title
+		public List<string> GetAllFilesWithTitle(string path, string title)
+		{
+			path = CorrectPath(path).ToLowerInvariant();
+			title = title.ToLowerInvariant();
+			List<string> files = new List<string>(entries.Length);
+			for(int i = 0; i < entries.Length; i++)
+				if(entries[i].path.StartsWith(path) && (entries[i].filetitle == title))
+					files.Add(entries[i].filepathname);
+			return files;
+		}
+
+		// This returns a list of all files that are in the given path (optionally in subdirectories) and have the given title
+		public List<string> GetAllFilesWithTitle(string path, string title, bool subdirectories)
+		{
+			if(subdirectories)
+				return GetAllFilesWithTitle(path, title);
+			else
+			{
+				path = CorrectPath(path).ToLowerInvariant();
+				title = title.ToLowerInvariant();
+				List<string> files = new List<string>(entries.Length);
+				for(int i = 0; i < entries.Length; i++)
+					if((entries[i].path == path) && (entries[i].filetitle == title))
+						files.Add(entries[i].filepathname);
+				return files;
+			}
+		}
+
+		//mxd. This returns a list of all files that are in the given path and which names starts with title
+		public List<string> GetAllFilesWhichTitleStartsWith(string path, string title) 
+		{
+			path = CorrectPath(path).ToLowerInvariant();
+			title = title.ToLowerInvariant();
+			List<string> files = new List<string>(entries.Length);
+			for(int i = 0; i < entries.Length; i++)
+			{
+				if((entries[i].path == path) && (entries[i].filetitle.StartsWith(title))) 
+					files.Add(entries[i].filepathname);
+			}
+			return files;
+		}
+
+		// This returns a list of all files that are in the given path and subdirectories and have the given extension
+		public List<string> GetAllFiles(string path, string extension)
+		{
+			path = CorrectPath(path).ToLowerInvariant();
+			extension = extension.ToLowerInvariant();
+			List<string> files = new List<string>(entries.Length);
+			for(int i = 0; i < entries.Length; i++)
+				if(entries[i].path.StartsWith(path) && (entries[i].extension == extension))
+					files.Add(entries[i].filepathname);
+			return files;
+		}
+
+		// This returns a list of all files that are in the given path (optionally in subdirectories) and have the given extension
+		public List<string> GetAllFiles(string path, string extension, bool subdirectories)
+		{
+			if(subdirectories)
+				return GetAllFiles(path, extension);
+			else
+			{
+				path = CorrectPath(path).ToLowerInvariant();
+				extension = extension.ToLowerInvariant();
+				List<string> files = new List<string>(entries.Length);
+				for(int i = 0; i < entries.Length; i++)
+					if((entries[i].path == path) && (entries[i].extension == extension))
+						files.Add(entries[i].filepathname);
+				return files;
+			}
+		}
+
+		// This finds the first file that has the specified name, regardless of file extension
+		public string GetFirstFile(string title, bool subdirectories)
+		{
+			title = title.ToLowerInvariant();
+			if(subdirectories)
+			{
+				for(int i = 0; i < entries.Length; i++)
+					if(entries[i].filetitle == title)
+						return entries[i].filepathname;
+			}
+			else
+			{
+				for(int i = 0; i < entries.Length; i++)
+					if((entries[i].filetitle == title) && (entries[i].path.Length == 0))
+						return entries[i].filepathname;
+			}
+
+			return null;
+		}
+
+		// This finds the first file that has the specified name and extension
+		public string GetFirstFile(string title, bool subdirectories, string extension)
+		{
+			title = title.ToLowerInvariant();
+			extension = extension.ToLowerInvariant();
+			if(subdirectories)
+			{
+				for(int i = 0; i < entries.Length; i++)
+					if((entries[i].filetitle == title) && (entries[i].extension == extension))
+						return entries[i].filepathname;
+			}
+			else
+			{
+				for(int i = 0; i < entries.Length; i++)
+					if((entries[i].filetitle == title) && (entries[i].path.Length == 0) && (entries[i].extension == extension))
+						return entries[i].filepathname;
+			}
+
+			return null;
+		}
+
+		// This finds the first file that has the specified name, regardless of file extension, and is in the given path
+		public string GetFirstFile(string path, string title, bool subdirectories)
+		{
+			title = title.ToLowerInvariant();
+			path = CorrectPath(path).ToLowerInvariant();
+			if(subdirectories)
+			{
+				for(int i = 0; i < entries.Length; i++)
+					if((entries[i].filetitle == title) && entries[i].path.StartsWith(path))
+						return entries[i].filepathname;
+			}
+			else
+			{
+				for(int i = 0; i < entries.Length; i++)
+					if((entries[i].filetitle == title) && (entries[i].path == path))
+						return entries[i].filepathname;
+			}
+
+			return null;
+		}
+
+		// This finds the first file that has the specified name, is in the given path and has the given extension
+		public string GetFirstFile(string path, string title, bool subdirectories, string extension)
+		{
+			title = title.ToLowerInvariant();
+			path = CorrectPath(path).ToLowerInvariant();
+			extension = extension.ToLowerInvariant();
+			if(subdirectories)
+			{
+				for(int i = 0; i < entries.Length; i++)
+					if((entries[i].filetitle == title) && entries[i].path.StartsWith(path) && (entries[i].extension == extension))
+						return entries[i].filepathname;
+			}
+			else
+			{
+				for(int i = 0; i < entries.Length; i++)
+					if((entries[i].filetitle == title) && (entries[i].path == path) && (entries[i].extension == extension))
+						return entries[i].filepathname;
+			}
+
+			return null;
+		}
+		
+		// This fixes a path so that it ends with the proper directory separator (mxd)
+		private static string CorrectPath(string path)
+		{
+			if(path.Length > 0)
+			{
+				if(path[path.Length - 1] == Path.DirectorySeparatorChar) return path;
+				if(path[path.Length - 1] == Path.AltDirectorySeparatorChar)
+					path = path.Substring(0, path.Length - 1);
+				return path + Path.DirectorySeparatorChar;
+			}
+
+			return path;
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/IO/DoomColormapReader.cs b/Source/Core/IO/DoomColormapReader.cs
new file mode 100644
index 0000000..9a8d521
--- /dev/null
+++ b/Source/Core/IO/DoomColormapReader.cs
@@ -0,0 +1,218 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.IO;
+using System.Drawing;
+using CodeImp.DoomBuilder.Data;
+using CodeImp.DoomBuilder.Rendering;
+using System.Drawing.Imaging;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.IO
+{
+	internal class DoomColormapReader : IImageReader
+	{
+		#region ================== Variables
+
+		// Palette to use
+		private readonly Playpal palette;
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public DoomColormapReader(Playpal palette)
+		{
+			// Initialize
+			this.palette = palette;
+
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This validates the data as doom flat
+		public bool Validate(Stream stream)
+		{
+			// Check if the data can be divided by 256 (each palette is 256 bytes)
+			int remainder = (int)stream.Length % 256;
+			if(remainder == 0)
+			{
+				// Success when not 0
+				return (stream.Length > 0);
+			}
+			
+			// Format invalid
+			return false;
+		}
+
+		// This creates a Bitmap from the given data
+		// Returns null on failure
+		public Bitmap ReadAsBitmap(Stream stream, out int offsetx, out int offsety)
+		{
+			offsetx = int.MinValue;
+			offsety = int.MinValue;
+			return ReadAsBitmap(stream);
+		}
+
+		// This creates a Bitmap from the given data
+		// Returns null on failure
+		public unsafe Bitmap ReadAsBitmap(Stream stream)
+		{
+			int width, height;
+
+			// Read pixel data
+			PixelColorBlock pixeldata = ReadAsPixelData(stream, out width, out height);
+			if(pixeldata != null)
+			{
+				try
+				{
+					// Create bitmap and lock pixels
+					Bitmap bmp = new Bitmap(width, height, PixelFormat.Format32bppArgb);
+					BitmapData bitmapdata = bmp.LockBits(new Rectangle(0, 0, width, height), ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
+					PixelColor* targetdata = (PixelColor*)bitmapdata.Scan0.ToPointer();
+
+					// Copy the pixels
+					General.CopyMemory(targetdata, pixeldata.Pointer, (uint)(width * height * sizeof(PixelColor)));
+
+					// Done
+					bmp.UnlockBits(bitmapdata);
+					return bmp;
+				}
+				catch(Exception e)
+				{
+					// Unable to make bitmap
+					General.ErrorLogger.Add(ErrorType.Error, "Unable to make Doom flat data. " + e.GetType().Name + ": " + e.Message);
+					return null;
+				}
+			}
+			else
+			{
+				// Failed loading picture
+				return null;
+			}
+		}
+
+		// This draws the picture to the given pixel color data
+		// Throws exception on failure
+		public unsafe void DrawToPixelData(Stream stream, PixelColor* target, int targetwidth, int targetheight, int x, int y)
+		{
+			// Get bitmap
+			Bitmap bmp = ReadAsBitmap(stream);
+			int width = bmp.Size.Width;
+			int height = bmp.Size.Height;
+
+			// Lock bitmap pixels
+			BitmapData bmpdata = bmp.LockBits(new Rectangle(0, 0, width, height), ImageLockMode.ReadOnly, PixelFormat.Format32bppArgb);
+			PixelColor* pixels = (PixelColor*)bmpdata.Scan0.ToPointer();
+
+			// Go for all pixels in the original image
+			for(int ox = 0; ox < width; ox++)
+			{
+				for(int oy = 0; oy < height; oy++)
+				{
+					// Copy this pixel?
+					if(pixels[oy * width + ox].a > 0.5f)
+					{
+						// Calculate target pixel and copy when within bounds
+						int tx = x + ox;
+						int ty = y + oy;
+						if((tx >= 0) && (tx < targetwidth) && (ty >= 0) && (ty < targetheight))
+							target[ty * targetwidth + tx] = pixels[oy * width + ox];
+					}
+				}
+			}
+
+			// Done
+			bmp.UnlockBits(bmpdata);
+			bmp.Dispose();
+		}
+
+		// This creates pixel color data from the given data
+		// Returns null on failure
+		private unsafe PixelColorBlock ReadAsPixelData(Stream stream, out int width, out int height)
+		{
+			// Image will be 128x128
+			width = 128;
+			height = 128;
+
+#if !DEBUG
+			try
+			{
+#endif
+
+			// Allocate memory
+			PixelColorBlock pixeldata = new PixelColorBlock(width, height);
+			pixeldata.Clear();
+
+			// Read flat bytes from stream
+			byte[] bytes = new byte[width * height];
+			stream.Read(bytes, 0, width * height);
+
+			// Draw blocks using the palette
+			// We want to draw 8x8 blocks for each color
+			// 16 wide and 16 high
+			uint i = 0;
+			for(int by = 0; by < 16; by++)
+			{
+				for(int bx = 0; bx < 16; bx++)
+				{
+					PixelColor bc = palette[bytes[i++]];
+					PixelColor bc1 = General.Colors.CreateBrightVariant(palette[bytes[i++]]);
+					PixelColor bc2 = General.Colors.CreateDarkVariant(palette[bytes[i++]]);
+					for(int py = 0; py < 8; py++)
+					{
+						for(int px = 0; px < 8; px++)
+						{
+							int p = ((by * 8) + py) * width + (bx * 8) + px;
+							
+							// We make the borders slightly brighter and darker
+							if((py == 0) || (px == 0))
+								pixeldata.Pointer[p] = bc1;
+							else if((py == 7) || (px  == 7))
+								pixeldata.Pointer[p] = bc2;
+							else
+								pixeldata.Pointer[p] = bc;
+						}
+					}
+				}
+			}
+			
+			// Return pointer
+			return pixeldata;
+
+#if !DEBUG
+			}
+			catch(Exception)
+			{
+				// Return nothing
+				return null;
+			}
+#endif
+		}
+
+		#endregion
+
+	}
+}
diff --git a/Source/Core/IO/DoomFlatReader.cs b/Source/Core/IO/DoomFlatReader.cs
new file mode 100644
index 0000000..de2e7dd
--- /dev/null
+++ b/Source/Core/IO/DoomFlatReader.cs
@@ -0,0 +1,216 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.IO;
+using System.Drawing;
+using CodeImp.DoomBuilder.Data;
+using CodeImp.DoomBuilder.Rendering;
+using System.Drawing.Imaging;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.IO
+{
+	internal unsafe class DoomFlatReader : IImageReader
+	{
+		#region ================== Variables
+
+		// Palette to use
+		private readonly Playpal palette;
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public DoomFlatReader(Playpal palette)
+		{
+			// Initialize
+			this.palette = palette;
+
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This validates the data as doom flat
+		public bool Validate(Stream stream)
+		{
+			// Check if the flat is square
+			float sqrlength = (float)Math.Sqrt(stream.Length);
+			if(sqrlength == (float)Math.Truncate(sqrlength))
+			{
+				// Success when not 0
+				return ((int)sqrlength > 0);
+			}
+			// Valid if the data is more than 4096
+			return stream.Length > 4096;
+		}
+
+		// This creates a Bitmap from the given data
+		// Returns null on failure
+		public Bitmap ReadAsBitmap(Stream stream, out int offsetx, out int offsety)
+		{
+			offsetx = int.MinValue;
+			offsety = int.MinValue;
+			return ReadAsBitmap(stream);
+		}
+		
+		// This creates a Bitmap from the given data
+		// Returns null on failure
+		public Bitmap ReadAsBitmap(Stream stream)
+		{
+			int width, height;
+			Bitmap bmp;
+
+			// Read pixel data
+			PixelColorBlock pixeldata = ReadAsPixelData(stream, out width, out height);
+			if(pixeldata != null)
+			{
+				try
+				{
+					// Create bitmap and lock pixels
+					bmp = new Bitmap(width, height, PixelFormat.Format32bppArgb);
+					BitmapData bitmapdata = bmp.LockBits(new Rectangle(0, 0, width, height), ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
+					PixelColor* targetdata = (PixelColor*)bitmapdata.Scan0.ToPointer();
+
+					// Copy the pixels
+					General.CopyMemory(targetdata, pixeldata.Pointer, (uint)(width * height * sizeof(PixelColor)));
+
+					// Done
+					bmp.UnlockBits(bitmapdata);
+				}
+				catch(Exception e)
+				{
+					// Unable to make bitmap
+					General.ErrorLogger.Add(ErrorType.Error, "Unable to make Doom flat data. " + e.GetType().Name + ": " + e.Message);
+					return null;
+				}
+			}
+			else
+			{
+				// Failed loading picture
+				bmp = null;
+			}
+
+			// Return result
+			return bmp;
+		}
+
+		// This draws the picture to the given pixel color data
+		// Throws exception on failure
+		public void DrawToPixelData(Stream stream, PixelColor* target, int targetwidth, int targetheight, int x, int y)
+		{
+			// Get bitmap
+			Bitmap bmp = ReadAsBitmap(stream);
+			int width = bmp.Size.Width;
+			int height = bmp.Size.Height;
+
+			// Lock bitmap pixels
+			BitmapData bmpdata = bmp.LockBits(new Rectangle(0, 0, width, height), ImageLockMode.ReadOnly, PixelFormat.Format32bppArgb);
+			PixelColor* pixels = (PixelColor*)bmpdata.Scan0.ToPointer();
+
+			// Go for all pixels in the original image
+			for(int ox = 0; ox < width; ox++)
+			{
+				for(int oy = 0; oy < height; oy++)
+				{
+					// Copy this pixel?
+					if(pixels[oy * width + ox].a > 0.5f)
+					{
+						// Calculate target pixel and copy when within bounds
+						int tx = x + ox;
+						int ty = y + oy;
+						if((tx >= 0) && (tx < targetwidth) && (ty >= 0) && (ty < targetheight))
+							target[ty * targetwidth + tx] = pixels[oy * width + ox];
+					}
+				}
+			}
+
+			// Done
+			bmp.UnlockBits(bmpdata);
+			bmp.Dispose();
+		}
+
+		// This creates pixel color data from the given data
+		// Returns null on failure
+		private PixelColorBlock ReadAsPixelData(Stream stream, out int width, out int height)
+		{
+			// Check if the flat is square
+			float sqrlength = (float)Math.Sqrt(stream.Length);
+			if(sqrlength == (float)Math.Truncate(sqrlength))
+			{
+				// Calculate image size
+				width = (int)sqrlength;
+				height = (int)sqrlength;
+			}
+			// Check if the data is more than 4096
+			else if(stream.Length > 4096)
+			{
+				// Image will be 64x64
+				width = 64;
+				height = 64;
+			}
+			else
+			{
+				// Invalid
+				width = 0;
+				height = 0;
+				return null;
+			}
+
+			#if !DEBUG
+			try
+			{
+			#endif
+			
+			// Valid width and height?
+			if((width <= 0) || (height <= 0)) return null;
+
+			// Allocate memory
+			PixelColorBlock pixeldata = new PixelColorBlock(width, height);
+			pixeldata.Clear();
+
+			// Read flat bytes from stream
+			byte[] bytes = new byte[width * height];
+			stream.Read(bytes, 0, width * height);
+
+			// Convert bytes with palette
+			for(uint i = 0; i < width * height; i++) pixeldata.Pointer[i] = palette[bytes[i]];
+
+			// Return pointer
+			return pixeldata;
+			
+			#if !DEBUG
+			}
+			catch(Exception)
+			{
+				// Return nothing
+				return null;
+			}
+			#endif
+		}
+		
+		#endregion
+
+	}
+}
diff --git a/Source/Core/IO/DoomMapSetIO.cs b/Source/Core/IO/DoomMapSetIO.cs
new file mode 100644
index 0000000..a218ec3
--- /dev/null
+++ b/Source/Core/IO/DoomMapSetIO.cs
@@ -0,0 +1,572 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Types;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.IO
+{
+	internal class DoomMapSetIO : MapSetIO
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public DoomMapSetIO(WAD wad, MapManager manager) : base(wad, manager)
+		{
+		}
+
+		#endregion
+
+		#region ================== Properties
+
+		public override int MaxSidedefs { get { return ushort.MaxValue; } }
+		public override int MaxVertices { get { return ushort.MaxValue; } }
+		public override int MaxLinedefs { get { return ushort.MaxValue; } }
+		public override int MaxSectors { get { return ushort.MaxValue; } }
+		public override int MaxThings { get { return int.MaxValue; } }
+		public override int MinTextureOffset { get { return short.MinValue; } }
+		public override int MaxTextureOffset { get { return short.MaxValue; } }
+		public override int VertexDecimals { get { return 0; } }
+		public override string DecimalsFormat { get { return "0"; } }
+		public override bool HasLinedefTag { get { return true; } }
+		public override bool HasThingTag { get { return false; } }
+		public override bool HasThingAction { get { return false; } }
+		public override bool HasCustomFields { get { return false; } }
+		public override bool HasThingHeight { get { return false; } }
+		public override bool HasActionArgs { get { return false; } }
+		public override bool HasMixedActivations { get { return false; } }
+		public override bool HasPresetActivations { get { return false; } }
+		public override bool HasBuiltInActivations { get { return true; } }
+		public override bool HasNumericLinedefFlags { get { return true; } }
+		public override bool HasNumericThingFlags { get { return true; } }
+		public override bool HasNumericLinedefActivations { get { return true; } }
+		public override int MaxTag { get { return ushort.MaxValue; } }
+		public override int MinTag { get { return ushort.MinValue; } }
+		public override int MaxAction { get { return ushort.MaxValue; } }
+		public override int MinAction { get { return ushort.MinValue; } }
+		public override int MaxArgument { get { return 0; } }
+		public override int MinArgument { get { return 0; } }
+		public override int MaxEffect { get { return ushort.MaxValue; } }
+		public override int MinEffect { get { return ushort.MinValue; } }
+		public override int MaxBrightness { get { return short.MaxValue; } }
+		public override int MinBrightness { get { return short.MinValue; } }
+		public override int MaxThingType { get { return ushort.MaxValue; } }
+		public override int MinThingType { get { return ushort.MinValue; } }
+		public override float MaxCoordinate { get { return short.MaxValue; } }
+		public override float MinCoordinate { get { return short.MinValue; } }
+		public override int MaxThingAngle { get { return short.MaxValue; } }
+		public override int MinThingAngle { get { return short.MinValue; } }
+		public override Dictionary<MapElementType, Dictionary<string, UniversalType>> UIFields { get { return uifields; } } //mxd
+		
+		#endregion
+
+		#region ================== Reading
+
+		// This reads a map from the file and returns a MapSet
+		public override MapSet Read(MapSet map, string mapname)
+		{
+			// Find the index where first map lump begins
+			int firstindex = wad.FindLumpIndex(mapname) + 1;
+
+			// Read vertices
+			Dictionary<int, Vertex> vertexlink = ReadVertices(map, firstindex);
+
+			// Read sectors
+			Dictionary<int, Sector> sectorlink = ReadSectors(map, firstindex);
+
+			// Read linedefs and sidedefs
+			ReadLinedefs(map, firstindex, vertexlink, sectorlink);
+
+			// Read things
+			ReadThings(map, firstindex);
+			
+			// Remove unused vertices
+			map.RemoveUnusedVertices();
+			
+			// Return result;
+			return map;
+		}
+
+		// This reads the THINGS from WAD file
+		private void ReadThings(MapSet map, int firstindex)
+		{
+			// Get the lump from wad file
+			Lump lump = wad.FindLump("THINGS", firstindex);
+			if(lump == null) throw new Exception("Could not find required lump THINGS!");
+			
+			// Prepare to read the items
+			MemoryStream mem = new MemoryStream(lump.Stream.ReadAllBytes());
+			int num = (int)lump.Stream.Length / 10;
+			BinaryReader reader = new BinaryReader(mem);
+			
+			// Read items from the lump
+			map.SetCapacity(0, 0, 0, 0, map.Things.Count + num);
+			for(int i = 0; i < num; i++)
+			{
+				// Read properties from stream
+				int x = reader.ReadInt16();
+				int y = reader.ReadInt16();
+				int angle = reader.ReadInt16();
+				int type = reader.ReadUInt16();
+				int flags = reader.ReadUInt16();
+				
+				// Make string flags
+				Dictionary<string, bool> stringflags = new Dictionary<string, bool>(StringComparer.Ordinal);
+				foreach(KeyValuePair<string, string> f in manager.Config.ThingFlags)
+				{
+					int fnum;
+					if(int.TryParse(f.Key, out fnum)) stringflags[f.Key] = ((flags & fnum) == fnum);
+				}
+				
+				// Create new item
+				Thing t = map.CreateThing();
+				t.Update(type, x, y, 0, angle, 0, 0, 1.0f, 1.0f, stringflags, 0, 0, new int[Thing.NUM_ARGS]);
+			}
+
+			// Done
+			mem.Dispose();
+		}
+
+		// This reads the VERTICES from WAD file
+		// Returns a lookup table with indices
+		private Dictionary<int, Vertex> ReadVertices(MapSet map, int firstindex)
+		{
+			// Get the lump from wad file
+			Lump lump = wad.FindLump("VERTEXES", firstindex);
+			if(lump == null) throw new Exception("Could not find required lump VERTEXES!");
+
+			// Prepare to read the items
+			MemoryStream mem = new MemoryStream(lump.Stream.ReadAllBytes());
+			int num = (int)lump.Stream.Length / 4;
+			BinaryReader reader = new BinaryReader(mem);
+
+			// Create lookup table
+			Dictionary<int, Vertex> link = new Dictionary<int, Vertex>(num);
+
+			// Read items from the lump
+			map.SetCapacity(map.Vertices.Count + num, 0, 0, 0, 0);
+			for(int i = 0; i < num; i++)
+			{
+				// Read properties from stream
+				int x = reader.ReadInt16();
+				int y = reader.ReadInt16();
+
+				// Create new item
+				Vertex v = map.CreateVertex(new Vector2D(x, y));
+				
+				// Add it to the lookup table
+				link.Add(i, v);
+			}
+
+			// Done
+			mem.Dispose();
+
+			// Return lookup table
+			return link;
+		}
+
+		// This reads the SECTORS from WAD file
+		// Returns a lookup table with indices
+		private Dictionary<int, Sector> ReadSectors(MapSet map, int firstindex)
+		{
+			// Get the lump from wad file
+			Lump lump = wad.FindLump("SECTORS", firstindex);
+			if(lump == null) throw new Exception("Could not find required lump SECTORS!");
+
+			// Prepare to read the items
+			MemoryStream mem = new MemoryStream(lump.Stream.ReadAllBytes());
+			int num = (int)lump.Stream.Length / 26;
+			BinaryReader reader = new BinaryReader(mem);
+
+			// Create lookup table
+			Dictionary<int, Sector> link = new Dictionary<int, Sector>(num);
+
+			// Read items from the lump
+			map.SetCapacity(0, 0, 0, map.Sectors.Count + num, 0);
+			for(int i = 0; i < num; i++)
+			{
+				// Read properties from stream
+				int hfloor = reader.ReadInt16();
+				int hceil = reader.ReadInt16();
+				string tfloor = Lump.MakeNormalName(reader.ReadBytes(8), WAD.ENCODING);
+				string tceil = Lump.MakeNormalName(reader.ReadBytes(8), WAD.ENCODING);
+				int bright = reader.ReadInt16();
+				int special = reader.ReadUInt16();
+				int tag = reader.ReadUInt16();
+				
+				// Create new item
+				Sector s = map.CreateSector();
+				s.Update(hfloor, hceil, tfloor, tceil, special, tag, bright);
+
+				// Add it to the lookup table
+				link.Add(i, s);
+			}
+
+			// Done
+			mem.Dispose();
+
+			// Return lookup table
+			return link;
+		}
+		
+		// This reads the LINEDEFS and SIDEDEFS from WAD file
+		private void ReadLinedefs(MapSet map, int firstindex,
+			Dictionary<int, Vertex> vertexlink, Dictionary<int, Sector> sectorlink)
+		{
+			// Get the linedefs lump from wad file
+			Lump linedefslump = wad.FindLump("LINEDEFS", firstindex);
+			if(linedefslump == null) throw new Exception("Could not find required lump LINEDEFS!");
+
+			// Get the sidedefs lump from wad file
+			Lump sidedefslump = wad.FindLump("SIDEDEFS", firstindex);
+			if(sidedefslump == null) throw new Exception("Could not find required lump SIDEDEFS!");
+
+			// Prepare to read the items
+			MemoryStream linedefsmem = new MemoryStream(linedefslump.Stream.ReadAllBytes());
+			MemoryStream sidedefsmem = new MemoryStream(sidedefslump.Stream.ReadAllBytes());
+			int num = (int)linedefslump.Stream.Length / 14;
+			int numsides = (int)sidedefslump.Stream.Length / 30;
+			BinaryReader readline = new BinaryReader(linedefsmem);
+			BinaryReader readside = new BinaryReader(sidedefsmem);
+
+			// Read items from the lump
+			map.SetCapacity(0, map.Linedefs.Count + num, map.Sidedefs.Count + numsides, 0, 0);
+			for(int i = 0; i < num; i++)
+			{
+				// Read properties from stream
+				int v1 = readline.ReadUInt16();
+				int v2 = readline.ReadUInt16();
+				int flags = readline.ReadUInt16();
+				int action = readline.ReadUInt16();
+				int tag = readline.ReadUInt16();
+				int s1 = readline.ReadUInt16();
+				int s2 = readline.ReadUInt16();
+
+				// Make string flags
+				Dictionary<string, bool> stringflags = new Dictionary<string, bool>(StringComparer.Ordinal);
+				foreach(string f in manager.Config.SortedLinedefFlags)
+				{
+					int fnum;
+					if(int.TryParse(f, out fnum)) stringflags[f] = ((flags & fnum) == fnum);
+				}
+
+				// Create new linedef
+				if(vertexlink.ContainsKey(v1) && vertexlink.ContainsKey(v2))
+				{
+					// Check if not zero-length
+					if(Vector2D.ManhattanDistance(vertexlink[v1].Position, vertexlink[v2].Position) > 0.0001f)
+					{
+						Linedef l = map.CreateLinedef(vertexlink[v1], vertexlink[v2]);
+						l.Update(stringflags, 0, new List<int> { tag }, action, new int[Linedef.NUM_ARGS]);
+						l.UpdateCache();
+
+						string thigh, tmid, tlow;
+						int offsetx, offsety, sc;
+						Sidedef s;
+
+						// Line has a front side?
+						if(s1 != ushort.MaxValue)
+						{
+							// Read front sidedef
+							if((s1 * 30L) <= (sidedefsmem.Length - 30L))
+							{
+								sidedefsmem.Seek(s1 * 30, SeekOrigin.Begin);
+								offsetx = readside.ReadInt16();
+								offsety = readside.ReadInt16();
+								thigh = Lump.MakeNormalName(readside.ReadBytes(8), WAD.ENCODING);
+								tlow = Lump.MakeNormalName(readside.ReadBytes(8), WAD.ENCODING);
+								tmid = Lump.MakeNormalName(readside.ReadBytes(8), WAD.ENCODING);
+								sc = readside.ReadUInt16();
+
+								// Create front sidedef
+								if(sectorlink.ContainsKey(sc))
+								{
+									s = map.CreateSidedef(l, true, sectorlink[sc]);
+									s.Update(offsetx, offsety, thigh, tmid, tlow);
+								}
+								else
+								{
+									General.ErrorLogger.Add(ErrorType.Warning, "Sidedef " + s1 + " references invalid sector " + sc + ". Sidedef has been removed.");
+								}
+							}
+							else
+							{
+								General.ErrorLogger.Add(ErrorType.Warning, "Linedef references invalid sidedef " + s1 + ". Sidedef has been removed.");
+							}
+						}
+
+						// Line has a back side?
+						if(s2 != ushort.MaxValue)
+						{
+							// Read back sidedef
+							if((s2 * 30L) <= (sidedefsmem.Length - 30L))
+							{
+								sidedefsmem.Seek(s2 * 30, SeekOrigin.Begin);
+								offsetx = readside.ReadInt16();
+								offsety = readside.ReadInt16();
+								thigh = Lump.MakeNormalName(readside.ReadBytes(8), WAD.ENCODING);
+								tlow = Lump.MakeNormalName(readside.ReadBytes(8), WAD.ENCODING);
+								tmid = Lump.MakeNormalName(readside.ReadBytes(8), WAD.ENCODING);
+								sc = readside.ReadUInt16();
+
+								// Create back sidedef
+								if(sectorlink.ContainsKey(sc))
+								{
+									s = map.CreateSidedef(l, false, sectorlink[sc]);
+									s.Update(offsetx, offsety, thigh, tmid, tlow);
+								}
+								else
+								{
+									General.ErrorLogger.Add(ErrorType.Warning, "Sidedef " + s2 + " references invalid sector " + sc + ". Sidedef has been removed.");
+								}
+							}
+							else
+							{
+								General.ErrorLogger.Add(ErrorType.Warning, "Linedef " + i + " references invalid sidedef " + s2 + ". Sidedef has been removed.");
+							}
+						}
+					}
+					else
+					{
+						General.ErrorLogger.Add(ErrorType.Warning, "Linedef " + i + " is zero-length. Linedef has been removed.");
+					}
+				}
+				else
+				{
+					General.ErrorLogger.Add(ErrorType.Warning, "Linedef " + i + " references one or more invalid vertices. Linedef has been removed.");
+				}
+			}
+
+			// Done
+			linedefsmem.Dispose();
+			sidedefsmem.Dispose();
+		}
+		
+		#endregion
+
+		#region ================== Writing
+
+		// This writes a MapSet to the file
+		public override void Write(MapSet map, string mapname, int position)
+		{
+			Dictionary<Vertex, int> vertexids = new Dictionary<Vertex,int>();
+			Dictionary<Sidedef, int> sidedefids = new Dictionary<Sidedef,int>();
+			Dictionary<Sector, int> sectorids = new Dictionary<Sector,int>();
+			
+			// First index everything
+			foreach(Vertex v in map.Vertices) vertexids.Add(v, vertexids.Count);
+			foreach(Sidedef sd in map.Sidedefs) sidedefids.Add(sd, sidedefids.Count);
+			foreach(Sector s in map.Sectors) sectorids.Add(s, sectorids.Count);
+			
+			// Write lumps to wad (note the backwards order because they
+			// are all inserted at position+1 when not found)
+			WriteSectors(map, position, manager.Config.MapLumps);
+			WriteVertices(map, position, manager.Config.MapLumps);
+			WriteSidedefs(map, position, manager.Config.MapLumps, sectorids);
+			WriteLinedefs(map, position, manager.Config.MapLumps, sidedefids, vertexids);
+			WriteThings(map, position, manager.Config.MapLumps);
+		}
+
+		// This writes the THINGS to WAD file
+		private void WriteThings(MapSet map, int position, Dictionary<string, MapLumpInfo> maplumps)
+		{
+			// Create memory to write to
+			MemoryStream mem = new MemoryStream();
+			BinaryWriter writer = new BinaryWriter(mem, WAD.ENCODING);
+			
+			// Go for all things
+			foreach(Thing t in map.Things)
+			{
+				// Convert flags
+				int flags = 0;
+				foreach(KeyValuePair<string, bool> f in t.Flags)
+				{
+					int fnum;
+					if(f.Value && int.TryParse(f.Key, out fnum)) flags |= fnum;
+				}
+
+				// Write properties to stream
+				writer.Write((Int16)t.Position.x);
+				writer.Write((Int16)t.Position.y);
+				writer.Write((Int16)t.AngleDoom);
+				writer.Write((UInt16)t.Type);
+				writer.Write((UInt16)flags);
+			}
+			
+			// Find insert position and remove old lump
+			int insertpos = MapManager.RemoveSpecificLump(wad, "THINGS", position, MapManager.TEMP_MAP_HEADER, maplumps);
+			if(insertpos == -1) insertpos = position + 1;
+			if(insertpos > wad.Lumps.Count) insertpos = wad.Lumps.Count;
+			
+			// Create the lump from memory
+			Lump lump = wad.Insert("THINGS", insertpos, (int)mem.Length);
+			lump.Stream.Seek(0, SeekOrigin.Begin);
+			mem.WriteTo(lump.Stream);
+			mem.Flush();
+		}
+
+		// This writes the VERTEXES to WAD file
+		private void WriteVertices(MapSet map, int position, Dictionary<string, MapLumpInfo> maplumps)
+		{
+			// Create memory to write to
+			MemoryStream mem = new MemoryStream();
+			BinaryWriter writer = new BinaryWriter(mem, WAD.ENCODING);
+
+			// Go for all vertices
+			foreach(Vertex v in map.Vertices)
+			{
+				// Write properties to stream
+				writer.Write((Int16)(int)Math.Round(v.Position.x));
+				writer.Write((Int16)(int)Math.Round(v.Position.y));
+			}
+
+			// Find insert position and remove old lump
+			int insertpos = MapManager.RemoveSpecificLump(wad, "VERTEXES", position, MapManager.TEMP_MAP_HEADER, maplumps);
+			if(insertpos == -1) insertpos = position + 1;
+			if(insertpos > wad.Lumps.Count) insertpos = wad.Lumps.Count;
+
+			// Create the lump from memory
+			Lump lump = wad.Insert("VERTEXES", insertpos, (int)mem.Length);
+			lump.Stream.Seek(0, SeekOrigin.Begin);
+			mem.WriteTo(lump.Stream);
+			mem.Flush();
+		}
+
+		// This writes the LINEDEFS to WAD file
+		private void WriteLinedefs(MapSet map, int position, Dictionary<string, MapLumpInfo> maplumps, IDictionary<Sidedef, int> sidedefids, IDictionary<Vertex, int> vertexids)
+		{
+			// Create memory to write to
+			MemoryStream mem = new MemoryStream();
+			BinaryWriter writer = new BinaryWriter(mem, WAD.ENCODING);
+
+			// Go for all lines
+			foreach(Linedef l in map.Linedefs)
+			{
+				// Convert flags
+				int flags = 0;
+				foreach(KeyValuePair<string, bool> f in l.Flags)
+				{
+					int fnum;
+					if(f.Value && int.TryParse(f.Key, out fnum)) flags |= fnum;
+				}
+
+				// Write properties to stream
+				writer.Write((UInt16)vertexids[l.Start]);
+				writer.Write((UInt16)vertexids[l.End]);
+				writer.Write((UInt16)flags);
+				writer.Write((UInt16)l.Action);
+				writer.Write((UInt16)l.Tag);
+
+				// Front sidedef
+				ushort sid = (l.Front == null ? ushort.MaxValue : (UInt16)sidedefids[l.Front]);
+				writer.Write(sid);
+
+				// Back sidedef
+				sid = (l.Back == null ? ushort.MaxValue : (UInt16)sidedefids[l.Back]);
+				writer.Write(sid);
+			}
+
+			// Find insert position and remove old lump
+			int insertpos = MapManager.RemoveSpecificLump(wad, "LINEDEFS", position, MapManager.TEMP_MAP_HEADER, maplumps);
+			if(insertpos == -1) insertpos = position + 1;
+			if(insertpos > wad.Lumps.Count) insertpos = wad.Lumps.Count;
+
+			// Create the lump from memory
+			Lump lump = wad.Insert("LINEDEFS", insertpos, (int)mem.Length);
+			lump.Stream.Seek(0, SeekOrigin.Begin);
+			mem.WriteTo(lump.Stream);
+			mem.Flush();
+		}
+
+		// This writes the SIDEDEFS to WAD file
+		private void WriteSidedefs(MapSet map, int position, Dictionary<string, MapLumpInfo> maplumps, IDictionary<Sector, int> sectorids)
+		{
+			// Create memory to write to
+			MemoryStream mem = new MemoryStream();
+			BinaryWriter writer = new BinaryWriter(mem, WAD.ENCODING);
+
+			// Go for all sidedefs
+			foreach(Sidedef sd in map.Sidedefs)
+			{
+				// Write properties to stream
+				writer.Write((Int16)sd.OffsetX);
+				writer.Write((Int16)sd.OffsetY);
+				writer.Write(Lump.MakeFixedName(sd.HighTexture, WAD.ENCODING));
+				writer.Write(Lump.MakeFixedName(sd.LowTexture, WAD.ENCODING));
+				writer.Write(Lump.MakeFixedName(sd.MiddleTexture, WAD.ENCODING));
+				writer.Write((UInt16)sectorids[sd.Sector]);
+			}
+
+			// Find insert position and remove old lump
+			int insertpos = MapManager.RemoveSpecificLump(wad, "SIDEDEFS", position, MapManager.TEMP_MAP_HEADER, maplumps);
+			if(insertpos == -1) insertpos = position + 1;
+			if(insertpos > wad.Lumps.Count) insertpos = wad.Lumps.Count;
+
+			// Create the lump from memory
+			Lump lump = wad.Insert("SIDEDEFS", insertpos, (int)mem.Length);
+			lump.Stream.Seek(0, SeekOrigin.Begin);
+			mem.WriteTo(lump.Stream);
+			mem.Flush();
+		}
+
+		// This writes the SECTORS to WAD file
+		private void WriteSectors(MapSet map, int position, Dictionary<string, MapLumpInfo> maplumps)
+		{
+			// Create memory to write to
+			MemoryStream mem = new MemoryStream();
+			BinaryWriter writer = new BinaryWriter(mem, WAD.ENCODING);
+
+			// Go for all sectors
+			foreach(Sector s in map.Sectors)
+			{
+				// Write properties to stream
+				writer.Write((Int16)s.FloorHeight);
+				writer.Write((Int16)s.CeilHeight);
+				writer.Write(Lump.MakeFixedName(s.FloorTexture, WAD.ENCODING));
+				writer.Write(Lump.MakeFixedName(s.CeilTexture, WAD.ENCODING));
+				writer.Write((Int16)s.Brightness);
+				writer.Write((UInt16)s.Effect);
+				writer.Write((UInt16)s.Tag);
+			}
+
+			// Find insert position and remove old lump
+			int insertpos = MapManager.RemoveSpecificLump(wad, "SECTORS", position, MapManager.TEMP_MAP_HEADER, maplumps);
+			if(insertpos == -1) insertpos = position + 1;
+			if(insertpos > wad.Lumps.Count) insertpos = wad.Lumps.Count;
+
+			// Create the lump from memory
+			Lump lump = wad.Insert("SECTORS", insertpos, (int)mem.Length);
+			lump.Stream.Seek(0, SeekOrigin.Begin);
+			mem.WriteTo(lump.Stream);
+			mem.Flush();
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/IO/DoomPictureReader.cs b/Source/Core/IO/DoomPictureReader.cs
new file mode 100644
index 0000000..2a856fa
--- /dev/null
+++ b/Source/Core/IO/DoomPictureReader.cs
@@ -0,0 +1,259 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.IO;
+using System.Drawing;
+using CodeImp.DoomBuilder.Data;
+using CodeImp.DoomBuilder.Rendering;
+using System.Drawing.Imaging;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.IO
+{
+	internal unsafe class DoomPictureReader : IImageReader
+	{
+		#region ================== Variables
+
+		// Palette to use
+		private readonly Playpal palette;
+		
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public DoomPictureReader(Playpal palette)
+		{
+			// Initialize
+			this.palette = palette;
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		#endregion
+
+		#region ================== Methods
+		
+		// This validates the data as doom picture
+		public bool Validate(Stream stream)
+		{
+			BinaryReader reader = new BinaryReader(stream);
+
+			// Initialize
+			int datalength = (int)stream.Length - (int)stream.Position;
+
+			// Need at least 4 bytes
+			if(datalength < 4) return false;
+
+			// Read size and offset
+			int width = reader.ReadInt16();
+			int height = reader.ReadInt16();
+			reader.ReadInt16();
+			reader.ReadInt16();
+
+			// Valid width and height?
+			if(width < 1 || height < 1) return false;
+			
+			// Go for all columns
+			for(int x = 0; x < width; x++)
+			{
+				// Get column address
+				int columnaddr = reader.ReadInt32();
+
+				// Check if address is outside valid range
+				if((columnaddr < (8 + width * 4)) || (columnaddr >= datalength)) return false;
+			}
+
+			// Return success
+			return true;
+		}
+		
+		// This creates a Bitmap from the given data
+		// Returns null on failure
+		public Bitmap ReadAsBitmap(Stream stream)
+		{
+			int x, y;
+			return ReadAsBitmap(stream, out x, out y);
+		}
+		
+		// This creates a Bitmap from the given data
+		// Returns null on failure
+		public Bitmap ReadAsBitmap(Stream stream, out int offsetx, out int offsety)
+		{
+			int width, height;
+			Bitmap bmp;
+
+			// Read pixel data
+			PixelColorBlock pixeldata = ReadAsPixelData(stream, out width, out height, out offsetx, out offsety);
+			if(pixeldata != null)
+			{
+				// Create bitmap and lock pixels
+				try
+				{
+					bmp = new Bitmap(width, height, PixelFormat.Format32bppArgb);
+					BitmapData bitmapdata = bmp.LockBits(new Rectangle(0, 0, width, height), ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
+					PixelColor* targetdata = (PixelColor*)bitmapdata.Scan0.ToPointer();
+
+					// Copy the pixels
+					General.CopyMemory(targetdata, pixeldata.Pointer, (uint)(width * height * sizeof(PixelColor)));
+
+					// Done
+					bmp.UnlockBits(bitmapdata);
+				}
+				catch(Exception e)
+				{
+					// Unable to make bitmap
+					General.ErrorLogger.Add(ErrorType.Error, "Unable to make Doom picture data. " + e.GetType().Name + ": " + e.Message);
+					return null;
+				}
+			}
+			else
+			{
+				// Failed loading picture
+				bmp = null;
+			}
+
+			// Return result
+			return bmp;
+		}
+		
+		// This draws the picture to the given pixel color data
+		// Throws exception on failure
+		public void DrawToPixelData(Stream stream, PixelColor* target, int targetwidth, int targetheight, int x, int y)
+		{
+			int width, height, ox, oy;
+
+			// Read pixel data
+			PixelColorBlock pixeldata = ReadAsPixelData(stream, out width, out height, out ox, out oy);
+			if(pixeldata != null)
+			{
+				// Go for all source pixels
+				// We don't care about the original image offset, so reuse ox/oy
+				for(ox = 0; ox < width; ox++)
+				{
+					for(oy = 0; oy < height; oy++)
+					{
+						// Copy this pixel?
+						if(pixeldata.Pointer[oy * width + ox].a > 0.5f)
+						{
+							// Calculate target pixel and copy when within bounds
+							int tx = x + ox;
+							int ty = y + oy;
+							if((tx >= 0) && (tx < targetwidth) && (ty >= 0) && (ty < targetheight))
+								target[ty * targetwidth + tx] = pixeldata.Pointer[oy * width + ox];
+						}
+					}
+				}
+			}
+		}
+
+		// This creates pixel color data from the given data
+		// Returns null on failure
+		private PixelColorBlock ReadAsPixelData(Stream stream, out int width, out int height, out int offsetx, out int offsety)
+		{
+			BinaryReader reader = new BinaryReader(stream);
+
+			// Initialize
+			width = 0;
+			height = 0;
+			offsetx = 0;
+			offsety = 0;
+			int dataoffset = (int)stream.Position;
+
+			// Need at least 4 bytes
+			if((stream.Length - stream.Position) < 4) return null;
+			
+			#if !DEBUG
+			try
+			{
+			#endif
+			
+			// Read size and offset
+			width = reader.ReadInt16();
+			height = reader.ReadInt16();
+			offsetx = reader.ReadInt16();
+			offsety = reader.ReadInt16();
+			
+			// Valid width and height?
+			if((width <= 0) || (height <= 0)) return null;
+			
+			// Read the column addresses
+			int[] columns = new int[width];
+			for(int x = 0; x < width; x++) columns[x] = reader.ReadInt32();
+			
+			// Allocate memory
+			PixelColorBlock pixeldata = new PixelColorBlock(width, height);
+			pixeldata.Clear();
+			
+			// Go for all columns
+			for(int x = 0; x < width; x++)
+			{
+				// Seek to column start
+				stream.Seek(dataoffset + columns[x], SeekOrigin.Begin);
+				
+				// Read first post start
+				int y = reader.ReadByte();
+				int read_y = y;
+				
+				// Continue while not end of column reached
+				while(read_y < 255)
+				{
+					// Read number of pixels in post
+					int count = reader.ReadByte();
+
+					// Skip unused pixel
+					stream.Seek(1, SeekOrigin.Current);
+
+					// Draw post
+					for(int yo = 0; yo < count; yo++)
+					{
+						// Read pixel color index
+						int p = reader.ReadByte();
+
+						// Draw pixel
+						pixeldata.Pointer[(y + yo) * width + x] = palette[p];
+					}
+
+					// Skip unused pixel
+					stream.Seek(1, SeekOrigin.Current);
+
+					// Read next post start
+					read_y = reader.ReadByte();
+					if(read_y < y || (height > 255 && read_y == y)) y += read_y; else y = read_y; //mxd. Fix for tall patches higher than 508 pixels
+				}
+			}
+
+			// Return pointer
+			return pixeldata;
+			
+			#if !DEBUG
+			}
+			catch(Exception)
+			{
+				// Return nothing
+				return null;
+			}
+			#endif
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/IO/FileImageReader.cs b/Source/Core/IO/FileImageReader.cs
new file mode 100644
index 0000000..b23889a
--- /dev/null
+++ b/Source/Core/IO/FileImageReader.cs
@@ -0,0 +1,518 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Runtime.InteropServices;
+using System.IO;
+using System.Drawing;
+using CodeImp.DoomBuilder.Rendering;
+using System.Drawing.Imaging;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.IO
+{
+	//mxd
+	internal struct DevilImageType
+	{
+		internal const int IL_TYPE_UNKNOWN = 0x0000;
+		//internal const int IL_DOOM = 0x0422;  //!< DooM walls - no specific extension
+		//internal const int IL_DOOM_FLAT = 0x0423;  //!< DooM flats - no specific extension
+
+		internal const int IL_JPG = 0x0425;  //!< JPEG - .jpg, .jpe and .jpeg extensions
+		internal const int IL_PCX = 0x0428;  //!< ZSoft PCX - .pcx extension
+		internal const int IL_PNG = 0x042A;  //!< Portable Network Graphics - .png extension
+		internal const int IL_TGA = 0x042D;  //!< TrueVision Targa File - .tga, .vda, .icb and .vst extensions
+		internal const int IL_GIF = 0x0436;  //!< Graphics Interchange Format - .gif extension
+		internal const int IL_DDS = 0x0437;  //!< DirectDraw Surface - .dds extension
+	}
+	
+	internal unsafe class FileImageReader : IImageReader
+	{
+		#region ================== APIs
+
+		[DllImport("devil.dll")]
+		private static extern void ilGenImages(int num, IntPtr images);
+
+		[DllImport("devil.dll")]
+		private static extern void ilBindImage(uint image);
+
+		[DllImport("devil.dll")]
+		private static extern void ilDeleteImages(int num, IntPtr images);
+
+		[DllImport("devil.dll")]
+		private static extern bool ilLoadL(uint type, IntPtr lump, uint size);
+
+		[DllImport("devil.dll")]
+		private static extern int ilGetInteger(uint mode);
+
+		[DllImport("devil.dll")]
+		private static extern int ilConvertImage(uint destformat, uint desttype);
+
+		[DllImport("devil.dll")]
+		private static extern uint ilCopyPixels(uint xoff, uint yoff, uint zoff, uint width, uint height, uint depth, uint format, uint type, IntPtr data);
+		
+		//mxd. Look's like we don't need many of those...
+		//  Matches OpenGL's right now.
+		//! Data formats \link Formats Formats\endlink
+		//private const int IL_COLOUR_INDEX     = 0x1900;
+		//private const int IL_COLOR_INDEX      = 0x1900;
+		//private const int IL_ALPHA			= 0x1906;
+		//private const int IL_RGB              = 0x1907;
+		//private const int IL_RGBA             = 0x1908;
+		//private const int IL_BGR              = 0x80E0;
+		private const int IL_BGRA             = 0x80E1;
+		//private const int IL_LUMINANCE        = 0x1909;
+		//private const int IL_LUMINANCE_ALPHA  = 0x190A;
+
+		//! Data types \link Types Types\endlink
+		//private const int IL_BYTE           = 0x1400;
+		private const int IL_UNSIGNED_BYTE  = 0x1401;
+		/*private const int IL_SHORT          = 0x1402;
+		private const int IL_UNSIGNED_SHORT = 0x1403;
+		private const int IL_INT            = 0x1404;
+		private const int IL_UNSIGNED_INT   = 0x1405;
+		private const int IL_FLOAT          = 0x1406;
+		private const int IL_DOUBLE         = 0x140A;
+		private const int IL_HALF           = 0x140B;*/
+
+		// Image types
+		//private const int IL_TYPE_UNKNOWN = 0x0000;
+		/*private const int IL_BMP          = 0x0420;  //!< Microsoft Windows Bitmap - .bmp extension
+		private const int IL_CUT          = 0x0421;  //!< Dr. Halo - .cut extension
+		private const int IL_DOOM         = 0x0422;  //!< DooM walls - no specific extension
+		private const int IL_DOOM_FLAT    = 0x0423;  //!< DooM flats - no specific extension
+		private const int IL_ICO          = 0x0424;  //!< Microsoft Windows Icons and Cursors - .ico and .cur extensions
+		private const int IL_JPG          = 0x0425;  //!< JPEG - .jpg, .jpe and .jpeg extensions
+		private const int IL_JFIF         = 0x0425;  //!<
+		private const int IL_ILBM         = 0x0426;  //!< Amiga IFF (FORM ILBM) - .iff, .ilbm, .lbm extensions
+		private const int IL_PCD          = 0x0427;  //!< Kodak PhotoCD - .pcd extension
+		private const int IL_PCX          = 0x0428;  //!< ZSoft PCX - .pcx extension
+		private const int IL_PIC          = 0x0429;  //!< PIC - .pic extension
+		private const int IL_PNG          = 0x042A;  //!< Portable Network Graphics - .png extension
+		private const int IL_PNM          = 0x042B;  //!< Portable Any Map - .pbm, .pgm, .ppm and .pnm extensions
+		private const int IL_SGI          = 0x042C;  //!< Silicon Graphics - .sgi, .bw, .rgb and .rgba extensions
+		private const int IL_TGA          = 0x042D;  //!< TrueVision Targa File - .tga, .vda, .icb and .vst extensions
+		private const int IL_TIF          = 0x042E;  //!< Tagged Image File Format - .tif and .tiff extensions
+		private const int IL_CHEAD        = 0x042F;  //!< C-Style Header - .h extension
+		private const int IL_RAW          = 0x0430;  //!< Raw Image Data - any extension
+		private const int IL_MDL          = 0x0431;  //!< Half-Life Model Texture - .mdl extension
+		private const int IL_WAL          = 0x0432;  //!< Quake 2 Texture - .wal extension
+		private const int IL_LIF          = 0x0434;  //!< Homeworld Texture - .lif extension
+		private const int IL_MNG          = 0x0435;  //!< Multiple-image Network Graphics - .mng extension
+		private const int IL_JNG          = 0x0435;  //!< 
+		private const int IL_GIF          = 0x0436;  //!< Graphics Interchange Format - .gif extension
+		private const int IL_DDS          = 0x0437;  //!< DirectDraw Surface - .dds extension
+		private const int IL_DCX          = 0x0438;  //!< ZSoft Multi-PCX - .dcx extension
+		private const int IL_PSD          = 0x0439;  //!< Adobe PhotoShop - .psd extension
+		private const int IL_EXIF         = 0x043A;  //!< 
+		private const int IL_PSP          = 0x043B;  //!< PaintShop Pro - .psp extension
+		private const int IL_PIX          = 0x043C;  //!< PIX - .pix extension
+		private const int IL_PXR          = 0x043D;  //!< Pixar - .pxr extension
+		private const int IL_XPM          = 0x043E;  //!< X Pixel Map - .xpm extension
+		private const int IL_HDR          = 0x043F;  //!< Radiance High Dynamic Range - .hdr extension
+		private const int IL_ICNS = 0x0440;  //!< Macintosh Icon - .icns extension
+		private const int IL_JP2 = 0x0441;  //!< Jpeg 2000 - .jp2 extension
+		private const int IL_EXR = 0x0442;  //!< OpenEXR - .exr extension
+		private const int IL_WDP = 0x0443;  //!< Microsoft HD Photo - .wdp and .hdp extension
+		private const int IL_VTF = 0x0444;  //!< Valve Texture Format - .vtf extension
+		private const int IL_WBMP = 0x0445;  //!< Wireless Bitmap - .wbmp extension
+		private const int IL_SUN = 0x0446;  //!< Sun Raster - .sun, .ras, .rs, .im1, .im8, .im24 and .im32 extensions
+		private const int IL_IFF = 0x0447;  //!< Interchange File Format - .iff extension
+		private const int IL_TPL = 0x0448;  //!< Gamecube Texture - .tpl extension
+		private const int IL_FITS = 0x0449;  //!< Flexible Image Transport System - .fit and .fits extensions
+		private const int IL_DICOM = 0x044A;  //!< Digital Imaging and Communications in Medicine (DICOM) - .dcm and .dicom extensions
+		private const int IL_IWI = 0x044B;  //!< Call of Duty Infinity Ward Image - .iwi extension
+		private const int IL_BLP = 0x044C;  //!< Blizzard Texture Format - .blp extension
+		private const int IL_FTX = 0x044D;  //!< Heavy Metal: FAKK2 Texture - .ftx extension
+		private const int IL_ROT = 0x044E;  //!< Homeworld 2 - Relic Texture - .rot extension
+		private const int IL_TEXTURE = 0x044F;  //!< Medieval II: Total War Texture - .texture extension
+		private const int IL_DPX = 0x0450;  //!< Digital Picture Exchange - .dpx extension
+		private const int IL_UTX = 0x0451;  //!< Unreal (and Unreal Tournament) Texture - .utx extension
+		private const int IL_MP3 = 0x0452;  //!< MPEG-1 Audio Layer 3 - .mp3 extension*/
+
+		//private const int IL_JASC_PAL     = 0x0475;  //!< PaintShop Pro Palette
+
+
+		// Error Types
+		/*private const int IL_NO_ERROR             = 0x0000;
+		private const int IL_INVALID_ENUM         = 0x0501;
+		private const int IL_OUT_OF_MEMORY        = 0x0502;
+		private const int IL_FORMAT_NOT_SUPPORTED = 0x0503;
+		private const int IL_INTERNAL_ERROR       = 0x0504;
+		private const int IL_INVALID_VALUE        = 0x0505;
+		private const int IL_ILLEGAL_OPERATION    = 0x0506;
+		private const int IL_ILLEGAL_FILE_VALUE   = 0x0507;
+		private const int IL_INVALID_FILE_HEADER  = 0x0508;
+		private const int IL_INVALID_PARAM        = 0x0509;
+		private const int IL_COULD_NOT_OPEN_FILE  = 0x050A;
+		private const int IL_INVALID_EXTENSION    = 0x050B;
+		private const int IL_FILE_ALREADY_EXISTS  = 0x050C;
+		private const int IL_OUT_FORMAT_SAME      = 0x050D;
+		private const int IL_STACK_OVERFLOW       = 0x050E;
+		private const int IL_STACK_UNDERFLOW      = 0x050F;
+		private const int IL_INVALID_CONVERSION   = 0x0510;
+		private const int IL_BAD_DIMENSIONS       = 0x0511;
+		private const int IL_FILE_READ_ERROR      = 0x0512;  // 05/12/2002: Addition by Sam.
+		private const int IL_FILE_WRITE_ERROR     = 0x0512;*/
+
+		/*private const int IL_LIB_GIF_ERROR  = 0x05E1;
+		private const int IL_LIB_JPEG_ERROR = 0x05E2;
+		private const int IL_LIB_PNG_ERROR  = 0x05E3;
+		private const int IL_LIB_TIFF_ERROR = 0x05E4;
+		private const int IL_LIB_MNG_ERROR  = 0x05E5;
+		private const int IL_LIB_JP2_ERROR  = 0x05E6;
+		private const int IL_LIB_EXR_ERROR  = 0x05E7;
+		private const int IL_UNKNOWN_ERROR  = 0x05FF;*/
+
+
+		// Origin Definitions
+		/*private const int IL_ORIGIN_SET        = 0x0600;
+		private const int IL_ORIGIN_LOWER_LEFT = 0x0601;
+		private const int IL_ORIGIN_UPPER_LEFT = 0x0602;
+		private const int IL_ORIGIN_MODE       = 0x0603;*/
+
+
+		// Format and Type Mode Definitions
+		/*private const int IL_FORMAT_SET  = 0x0610;
+		private const int IL_FORMAT_MODE = 0x0611;
+		private const int IL_TYPE_SET    = 0x0612;
+		private const int IL_TYPE_MODE   = 0x0613;*/
+
+
+		// File definitions
+		/*private const int IL_FILE_OVERWRITE	= 0x0620;
+		private const int IL_FILE_MODE		= 0x0621;
+		*/
+
+		// Palette definitions
+		//private const int IL_CONV_PAL			= 0x0630;
+
+
+		// Load fail definitions
+		//private const int IL_DEFAULT_ON_FAIL	= 0x0632;
+
+
+		// Key colour and alpha definitions
+		/*private const int IL_USE_KEY_COLOUR	= 0x0635;
+		private const int IL_USE_KEY_COLOR	= 0x0635;
+		private const int IL_BLIT_BLEND		= 0x0636;*/
+
+
+		// Interlace definitions
+		/*private const int IL_SAVE_INTERLACED	= 0x0639;
+		private const int IL_INTERLACE_MODE	= 0x063A;*/
+
+
+		// Quantization definitions
+		/*private const int IL_QUANTIZATION_MODE = 0x0640;
+		private const int IL_WU_QUANT          = 0x0641;
+		private const int IL_NEU_QUANT         = 0x0642;
+		private const int IL_NEU_QUANT_SAMPLE  = 0x0643;
+		private const int IL_MAX_QUANT_INDEXS  = 0x0644; //XIX : ILint : Maximum number of colors to reduce to, default of 256. and has a range of 2-256
+		private const int IL_MAX_QUANT_INDICES = 0x0644; // Redefined, since the above private const int is misspelled*/
+
+
+		// Hints
+		/*private const int IL_FASTEST          = 0x0660;
+		private const int IL_LESS_MEM         = 0x0661;
+		private const int IL_DONT_CARE        = 0x0662;
+		private const int IL_MEM_SPEED_HINT   = 0x0665;
+		private const int IL_USE_COMPRESSION  = 0x0666;
+		private const int IL_NO_COMPRESSION   = 0x0667;
+		private const int IL_COMPRESSION_HINT = 0x0668;*/
+
+
+		// Compression
+		/*private const int IL_NVIDIA_COMPRESS	= 0x0670;
+		private const int IL_SQUISH_COMPRESS	= 0x0671;*/
+
+
+		// Subimage types
+		/*private const int IL_SUB_NEXT   = 0x0680;
+		private const int IL_SUB_MIPMAP = 0x0681;
+		private const int IL_SUB_LAYER  = 0x0682;*/
+		
+
+		// Compression definitions
+		/*private const int IL_COMPRESS_MODE = 0x0700;
+		private const int IL_COMPRESS_NONE = 0x0701;
+		private const int IL_COMPRESS_RLE  = 0x0702;
+		private const int IL_COMPRESS_LZO  = 0x0703;
+		private const int IL_COMPRESS_ZLIB = 0x0704;*/
+
+
+		// File format-specific values
+		/*private const int IL_TGA_CREATE_STAMP        = 0x0710;
+		private const int IL_JPG_QUALITY             = 0x0711;
+		private const int IL_PNG_INTERLACE           = 0x0712;
+		private const int IL_TGA_RLE                 = 0x0713;
+		private const int IL_BMP_RLE                 = 0x0714;
+		private const int IL_SGI_RLE                 = 0x0715;
+		private const int IL_TGA_ID_STRING           = 0x0717;
+		private const int IL_TGA_AUTHNAME_STRING     = 0x0718;
+		private const int IL_TGA_AUTHCOMMENT_STRING  = 0x0719;
+		private const int IL_PNG_AUTHNAME_STRING     = 0x071A;
+		private const int IL_PNG_TITLE_STRING        = 0x071B;
+		private const int IL_PNG_DESCRIPTION_STRING  = 0x071C;
+		private const int IL_TIF_DESCRIPTION_STRING  = 0x071D;
+		private const int IL_TIF_HOSTCOMPUTER_STRING = 0x071E;
+		private const int IL_TIF_DOCUMENTNAME_STRING = 0x071F;
+		private const int IL_TIF_AUTHNAME_STRING     = 0x0720;
+		private const int IL_JPG_SAVE_FORMAT         = 0x0721;
+		private const int IL_CHEAD_HEADER_STRING     = 0x0722;
+		private const int IL_PCD_PICNUM              = 0x0723;
+		private const int IL_PNG_ALPHA_INDEX = 0x0724; //XIX : ILint : the color in the palette at this index value (0-255) is considered transparent, -1 for no trasparent color
+		private const int IL_JPG_PROGRESSIVE         = 0x0725;
+		private const int IL_VTF_COMP                = 0x0726;*/
+
+
+		// DXTC definitions
+		/*private const int IL_DXTC_FORMAT      = 0x0705;
+		private const int IL_DXT1             = 0x0706;
+		private const int IL_DXT2             = 0x0707;
+		private const int IL_DXT3             = 0x0708;
+		private const int IL_DXT4             = 0x0709;
+		private const int IL_DXT5             = 0x070A;
+		private const int IL_DXT_NO_COMP      = 0x070B;
+		private const int IL_KEEP_DXTC_DATA   = 0x070C;
+		private const int IL_DXTC_DATA_FORMAT = 0x070D;
+		private const int IL_3DC              = 0x070E;
+		private const int IL_RXGB             = 0x070F;
+		private const int IL_ATI1N            = 0x0710;
+		private const int IL_DXT1A            = 0x0711; // Normally the same as IL_DXT1, except for nVidia Texture Tools.*/
+
+		// Environment map definitions
+		/*private const int IL_CUBEMAP_POSITIVEX = 0x00000400;
+		private const int IL_CUBEMAP_NEGATIVEX = 0x00000800;
+		private const int IL_CUBEMAP_POSITIVEY = 0x00001000;
+		private const int IL_CUBEMAP_NEGATIVEY = 0x00002000;
+		private const int IL_CUBEMAP_POSITIVEZ = 0x00004000;
+		private const int IL_CUBEMAP_NEGATIVEZ = 0x00008000;
+		private const int IL_SPHEREMAP         = 0x00010000;*/
+
+
+		// Values
+		//private const int IL_VERSION_NUM           = 0x0DE2;
+		private const int IL_IMAGE_WIDTH           = 0x0DE4;
+		private const int IL_IMAGE_HEIGHT          = 0x0DE5;
+		/*private const int IL_IMAGE_DEPTH           = 0x0DE6;
+		private const int IL_IMAGE_SIZE_OF_DATA    = 0x0DE7;
+		private const int IL_IMAGE_BPP             = 0x0DE8;
+		private const int IL_IMAGE_BYTES_PER_PIXEL = 0x0DE8;
+		private const int IL_IMAGE_BITS_PER_PIXEL  = 0x0DE9;
+		private const int IL_IMAGE_FORMAT          = 0x0DEA;
+		private const int IL_IMAGE_TYPE            = 0x0DEB;
+		private const int IL_PALETTE_TYPE          = 0x0DEC;
+		private const int IL_PALETTE_SIZE          = 0x0DED;
+		private const int IL_PALETTE_BPP           = 0x0DEE;
+		private const int IL_PALETTE_NUM_COLS      = 0x0DEF;
+		private const int IL_PALETTE_BASE_TYPE     = 0x0DF0;
+		private const int IL_NUM_FACES             = 0x0DE1;
+		private const int IL_NUM_IMAGES            = 0x0DF1;
+		private const int IL_NUM_MIPMAPS           = 0x0DF2;
+		private const int IL_NUM_LAYERS            = 0x0DF3;
+		private const int IL_ACTIVE_IMAGE          = 0x0DF4;
+		private const int IL_ACTIVE_MIPMAP         = 0x0DF5;
+		private const int IL_ACTIVE_LAYER          = 0x0DF6;
+		private const int IL_ACTIVE_FACE           = 0x0E00;
+		private const int IL_CUR_IMAGE             = 0x0DF7;
+		private const int IL_IMAGE_DURATION        = 0x0DF8;
+		private const int IL_IMAGE_PLANESIZE       = 0x0DF9;
+		private const int IL_IMAGE_BPC             = 0x0DFA;
+		private const int IL_IMAGE_OFFX            = 0x0DFB;
+		private const int IL_IMAGE_OFFY            = 0x0DFC;
+		private const int IL_IMAGE_CUBEFLAGS       = 0x0DFD;
+		private const int IL_IMAGE_ORIGIN          = 0x0DFE;
+		private const int IL_IMAGE_CHANNELS        = 0x0DFF;*/
+
+		//mxd
+		private readonly uint imagetype;
+		
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public FileImageReader()
+		{
+			imagetype = DevilImageType.IL_TYPE_UNKNOWN;//mxd
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		//mxd
+		public FileImageReader(uint devilImagetype) 
+		{
+			imagetype = devilImagetype;//mxd
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This creates a Bitmap from the given data
+		// Returns null on failure
+		public Bitmap ReadAsBitmap(Stream stream, out int offsetx, out int offsety)
+		{
+			offsetx = int.MinValue;
+			offsety = int.MinValue;
+			Bitmap bmp = ReadAsBitmap(stream);
+
+			//mxd. Read PNG offsets
+			if(imagetype == DevilImageType.IL_PNG && bmp != null)
+			{
+				stream.Position = 8;
+				using(BinaryReader reader = new BinaryReader(stream))
+				{
+					// Read chunks untill we encounter either "grAb" or "IDAT"
+					while(reader.BaseStream.Position < reader.BaseStream.Length)
+					{
+						// Big Endian!
+						int chunklength = ToInt32BigEndian(reader.ReadBytes(4));
+						string chunkname = new string(reader.ReadChars(4));
+
+						if(chunkname == "grAb")
+						{
+							offsetx = ToInt32BigEndian(reader.ReadBytes(4));
+							offsety = ToInt32BigEndian(reader.ReadBytes(4));
+							break;
+						}
+						else if(chunkname == "IDAT")
+						{
+							break;
+						}
+						else
+						{
+							// Skip the rest of the chunk
+							reader.BaseStream.Position += chunklength + 4;
+						}
+					}
+				}
+			}
+
+			// Return the image
+			return bmp;
+		}
+
+		// This reads the image and returns a Bitmap
+		public Bitmap ReadAsBitmap(Stream stream)
+		{
+			try
+			{
+				// Create an image in DevIL
+				uint imageid = 0;
+				ilGenImages(1, new IntPtr(&imageid));
+				ilBindImage(imageid);
+				
+				// Read image data from stream
+				byte[] bytes = new byte[stream.Length - stream.Position];
+				stream.Read(bytes, 0, bytes.Length);
+				fixed(byte* bptr = bytes)
+				{
+					if(!ilLoadL(imagetype, new IntPtr(bptr), (uint)bytes.Length))
+						throw new BadImageFormatException();
+				}
+				
+				// Get the image properties
+				int width = ilGetInteger(IL_IMAGE_WIDTH);
+				int height = ilGetInteger(IL_IMAGE_HEIGHT);
+				if((width < 1) || (height < 1))
+					throw new BadImageFormatException();
+				
+				// Convert the image to ARGB if needed
+				ilConvertImage(IL_BGRA, IL_UNSIGNED_BYTE);
+
+				// Copy the image pixels to a Bitmap
+				Bitmap bmp = new Bitmap(width, height, PixelFormat.Format32bppArgb);
+				BitmapData bmpdata = bmp.LockBits(new Rectangle(0, 0, width, height), ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
+				ilCopyPixels(0, 0, 0, (uint)width, (uint)height, 1, IL_BGRA, IL_UNSIGNED_BYTE, bmpdata.Scan0);
+				bmp.UnlockBits(bmpdata);
+
+				// Clean up
+				ilDeleteImages(1, new IntPtr(&imageid));
+
+				//mxd. TGA fix
+				if(imagetype == DevilImageType.IL_TGA)
+					bmp.RotateFlip(RotateFlipType.RotateNoneFlipY);
+
+				return bmp;
+			}
+			catch(Exception e)
+			{
+				// Unable to make bitmap
+				General.ErrorLogger.Add(ErrorType.Error, "Unable to make file image. " + e.GetType().Name + ": " + e.Message);
+				return null;
+			}
+		}
+
+		// This draws the picture to the given pixel color data
+		// Throws exception on failure
+		public void DrawToPixelData(Stream stream, PixelColor* target, int targetwidth, int targetheight, int x, int y)
+		{
+			// Get bitmap
+			Bitmap bmp = ReadAsBitmap(stream);
+			if(bmp != null)
+			{
+				int width = bmp.Size.Width;
+				int height = bmp.Size.Height;
+
+				// Lock bitmap pixels
+				BitmapData bmpdata = bmp.LockBits(new Rectangle(0, 0, width, height), ImageLockMode.ReadOnly, PixelFormat.Format32bppArgb);
+				PixelColor* pixels = (PixelColor*)bmpdata.Scan0.ToPointer();
+
+				// Go for all pixels in the original image
+				for(int ox = 0; ox < width; ox++)
+				{
+					for(int oy = 0; oy < height; oy++)
+					{
+						// Copy this pixel?
+						if(pixels[oy * width + ox].a > 0.5f)
+						{
+							// Calculate target pixel and copy when within bounds
+							int tx = x + ox;
+							int ty = y + oy;
+							if((tx >= 0) && (tx < targetwidth) && (ty >= 0) && (ty < targetheight))
+								target[ty * targetwidth + tx] = pixels[oy * width + ox];
+						}
+					}
+				}
+
+				// Done
+				bmp.UnlockBits(bmpdata);
+				bmp.Dispose();
+			}
+			else
+			{
+				throw new InvalidDataException();
+			}
+		}
+
+		//mxd
+		private static int ToInt32BigEndian(byte[] buffer)
+		{
+			return (buffer[0] << 24) | (buffer[1] << 16) | (buffer[2] << 8) | buffer[3];
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/IO/HexenMapSetIO.cs b/Source/Core/IO/HexenMapSetIO.cs
new file mode 100644
index 0000000..5802ad1
--- /dev/null
+++ b/Source/Core/IO/HexenMapSetIO.cs
@@ -0,0 +1,597 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Types;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.IO
+{
+	internal class HexenMapSetIO : MapSetIO
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public HexenMapSetIO(WAD wad, MapManager manager) : base(wad, manager) { }
+
+		#endregion
+
+		#region ================== Properties
+
+		public override int MaxSidedefs { get { return ushort.MaxValue; } }
+		public override int MaxVertices { get { return ushort.MaxValue; } }
+		public override int MaxLinedefs { get { return ushort.MaxValue; } }
+		public override int MaxSectors { get { return ushort.MaxValue; } }
+		public override int MaxThings { get { return int.MaxValue; } }
+		public override int MinTextureOffset { get { return short.MinValue; } }
+		public override int MaxTextureOffset { get { return short.MaxValue; } }
+		public override int VertexDecimals { get { return 0; } }
+		public override string DecimalsFormat { get { return "0"; } }
+		public override bool HasLinedefTag { get { return false; } }
+		public override bool HasThingTag { get { return true; } }
+		public override bool HasThingAction { get { return true; } }
+		public override bool HasCustomFields { get { return false; } }
+		public override bool HasThingHeight { get { return true; } }
+		public override bool HasActionArgs { get { return true; } }
+		public override bool HasMixedActivations { get { return false; } }
+		public override bool HasPresetActivations { get { return true; } }
+		public override bool HasBuiltInActivations { get { return false; } }
+		public override bool HasNumericLinedefFlags { get { return true; } }
+		public override bool HasNumericThingFlags { get { return true; } }
+		public override bool HasNumericLinedefActivations { get { return true; } }
+		public override int MaxTag { get { return ushort.MaxValue; } }
+		public override int MinTag { get { return ushort.MinValue; } }
+		public override int MaxAction { get { return byte.MaxValue; } }
+		public override int MinAction { get { return byte.MinValue; } }
+		public override int MaxArgument { get { return byte.MaxValue; } }
+		public override int MinArgument { get { return byte.MinValue; } }
+		public override int MaxEffect { get { return ushort.MaxValue; } }
+		public override int MinEffect { get { return ushort.MinValue; } }
+		public override int MaxBrightness { get { return short.MaxValue; } }
+		public override int MinBrightness { get { return short.MinValue; } }
+		public override int MaxThingType { get { return ushort.MaxValue; } }
+		public override int MinThingType { get { return ushort.MinValue; } }
+		public override float MaxCoordinate { get { return short.MaxValue; } }
+		public override float MinCoordinate { get { return short.MinValue; } }
+		public override int MaxThingAngle { get { return short.MaxValue; } }
+		public override int MinThingAngle { get { return short.MinValue; } }
+		public override Dictionary<MapElementType, Dictionary<string, UniversalType>> UIFields { get { return uifields; } } //mxd
+		
+		#endregion
+
+		#region ================== Reading
+
+		// This reads a map from the file and returns a MapSet
+		public override MapSet Read(MapSet map, string mapname)
+		{
+			// Find the index where first map lump begins
+			int firstindex = wad.FindLumpIndex(mapname) + 1;
+
+			// Read vertices
+			Dictionary<int, Vertex> vertexlink = ReadVertices(map, firstindex);
+
+			// Read sectors
+			Dictionary<int, Sector> sectorlink = ReadSectors(map, firstindex);
+
+			// Read linedefs and sidedefs
+			ReadLinedefs(map, firstindex, vertexlink, sectorlink);
+
+			// Read things
+			ReadThings(map, firstindex);
+			
+			// Remove unused vertices
+			map.RemoveUnusedVertices();
+			
+			// Return result;
+			return map;
+		}
+
+		// This reads the THINGS from WAD file
+		private void ReadThings(MapSet map, int firstindex)
+		{
+			int[] args = new int[Thing.NUM_ARGS];
+
+			// Get the lump from wad file
+			Lump lump = wad.FindLump("THINGS", firstindex);
+			if(lump == null) throw new Exception("Could not find required lump THINGS!");
+			
+			// Prepare to read the items
+			MemoryStream mem = new MemoryStream(lump.Stream.ReadAllBytes());
+			int num = (int)lump.Stream.Length / 20;
+			BinaryReader reader = new BinaryReader(mem);
+			
+			// Read items from the lump
+			map.SetCapacity(0, 0, 0, 0, map.Things.Count + num);
+			for(int i = 0; i < num; i++)
+			{
+				// Read properties from stream
+				int tag = reader.ReadUInt16();
+				int x = reader.ReadInt16();
+				int y = reader.ReadInt16();
+				int z = reader.ReadInt16();
+				int angle = reader.ReadInt16();
+				int type = reader.ReadUInt16();
+				int flags = reader.ReadUInt16();
+				int action = reader.ReadByte();
+				args[0] = reader.ReadByte();
+				args[1] = reader.ReadByte();
+				args[2] = reader.ReadByte();
+				args[3] = reader.ReadByte();
+				args[4] = reader.ReadByte();
+
+				// Make string flags
+				Dictionary<string, bool> stringflags = new Dictionary<string, bool>(StringComparer.Ordinal);
+				foreach(KeyValuePair<string, string> f in manager.Config.ThingFlags)
+				{
+					int fnum;
+					if(int.TryParse(f.Key, out fnum)) stringflags[f.Key] = ((flags & fnum) == fnum);
+				}
+				
+				// Create new item
+				Thing t = map.CreateThing();
+				t.Update(type, x, y, z, angle, 0, 0, 1.0f, 1.0f, stringflags, tag, action, args);
+			}
+
+			// Done
+			mem.Dispose();
+		}
+
+		// This reads the VERTICES from WAD file
+		// Returns a lookup table with indices
+		private Dictionary<int, Vertex> ReadVertices(MapSet map, int firstindex)
+		{
+			// Get the lump from wad file
+			Lump lump = wad.FindLump("VERTEXES", firstindex);
+			if(lump == null) throw new Exception("Could not find required lump VERTEXES!");
+
+			// Prepare to read the items
+			MemoryStream mem = new MemoryStream(lump.Stream.ReadAllBytes());
+			int num = (int)lump.Stream.Length / 4;
+			BinaryReader reader = new BinaryReader(mem);
+
+			// Create lookup table
+			Dictionary<int, Vertex> link = new Dictionary<int, Vertex>(num);
+
+			// Read items from the lump
+			map.SetCapacity(map.Vertices.Count + num, 0, 0, 0, 0);
+			for(int i = 0; i < num; i++)
+			{
+				// Read properties from stream
+				int x = reader.ReadInt16();
+				int y = reader.ReadInt16();
+
+				// Create new item
+				Vertex v = map.CreateVertex(new Vector2D(x, y));
+				
+				// Add it to the lookup table
+				link.Add(i, v);
+			}
+
+			// Done
+			mem.Dispose();
+
+			// Return lookup table
+			return link;
+		}
+
+		// This reads the SECTORS from WAD file
+		// Returns a lookup table with indices
+		private Dictionary<int, Sector> ReadSectors(MapSet map, int firstindex)
+		{
+			// Get the lump from wad file
+			Lump lump = wad.FindLump("SECTORS", firstindex);
+			if(lump == null) throw new Exception("Could not find required lump SECTORS!");
+
+			// Prepare to read the items
+			MemoryStream mem = new MemoryStream(lump.Stream.ReadAllBytes());
+			int num = (int)lump.Stream.Length / 26;
+			BinaryReader reader = new BinaryReader(mem);
+
+			// Create lookup table
+			Dictionary<int, Sector> link = new Dictionary<int, Sector>(num);
+
+			// Read items from the lump
+			map.SetCapacity(0, 0, 0, map.Sectors.Count + num, 0);
+			for(int i = 0; i < num; i++)
+			{
+				// Read properties from stream
+				int hfloor = reader.ReadInt16();
+				int hceil = reader.ReadInt16();
+				string tfloor = Lump.MakeNormalName(reader.ReadBytes(8), WAD.ENCODING);
+				string tceil = Lump.MakeNormalName(reader.ReadBytes(8), WAD.ENCODING);
+				int bright = reader.ReadInt16();
+				int special = reader.ReadUInt16();
+				int tag = reader.ReadUInt16();
+				
+				// Create new item
+				Sector s = map.CreateSector();
+				s.Update(hfloor, hceil, tfloor, tceil, special, tag, bright);
+
+				// Add it to the lookup table
+				link.Add(i, s);
+			}
+
+			// Done
+			mem.Dispose();
+
+			// Return lookup table
+			return link;
+		}
+		
+		// This reads the LINEDEFS and SIDEDEFS from WAD file
+		private void ReadLinedefs(MapSet map, int firstindex,
+			Dictionary<int, Vertex> vertexlink, Dictionary<int, Sector> sectorlink)
+		{
+			int[] args = new int[Linedef.NUM_ARGS];
+
+			// Get the linedefs lump from wad file
+			Lump linedefslump = wad.FindLump("LINEDEFS", firstindex);
+			if(linedefslump == null) throw new Exception("Could not find required lump LINEDEFS!");
+
+			// Get the sidedefs lump from wad file
+			Lump sidedefslump = wad.FindLump("SIDEDEFS", firstindex);
+			if(sidedefslump == null) throw new Exception("Could not find required lump SIDEDEFS!");
+
+			// Prepare to read the items
+			MemoryStream linedefsmem = new MemoryStream(linedefslump.Stream.ReadAllBytes());
+			MemoryStream sidedefsmem = new MemoryStream(sidedefslump.Stream.ReadAllBytes());
+			int num = (int)linedefslump.Stream.Length / 16;
+			int numsides = (int)sidedefslump.Stream.Length / 30;
+			BinaryReader readline = new BinaryReader(linedefsmem);
+			BinaryReader readside = new BinaryReader(sidedefsmem);
+
+			// Read items from the lump
+			map.SetCapacity(0, map.Linedefs.Count + num, map.Sidedefs.Count + numsides, 0, 0);
+			for(int i = 0; i < num; i++)
+			{
+				// Read properties from stream
+				int v1 = readline.ReadUInt16();
+				int v2 = readline.ReadUInt16();
+				int flags = readline.ReadUInt16();
+				int action = readline.ReadByte();
+				args[0] = readline.ReadByte();
+				args[1] = readline.ReadByte();
+				args[2] = readline.ReadByte();
+				args[3] = readline.ReadByte();
+				args[4] = readline.ReadByte();
+				int s1 = readline.ReadUInt16();
+				int s2 = readline.ReadUInt16();
+				
+				// Make string flags
+				Dictionary<string, bool> stringflags = new Dictionary<string, bool>(StringComparer.Ordinal);
+				foreach(string f in manager.Config.SortedLinedefFlags)
+				{
+					int fnum;
+					if(int.TryParse(f, out fnum)) stringflags[f] = ((flags & fnum) == fnum);
+				}
+				
+				// Create new linedef
+				if(vertexlink.ContainsKey(v1) && vertexlink.ContainsKey(v2))
+				{
+					// Check if not zero-length
+					if(Vector2D.ManhattanDistance(vertexlink[v1].Position, vertexlink[v2].Position) > 0.0001f)
+					{
+						Linedef l = map.CreateLinedef(vertexlink[v1], vertexlink[v2]);
+						l.Update(stringflags, (flags & manager.Config.LinedefActivationsFilter), new List<int> { 0 }, action, args);
+						l.UpdateCache();
+
+						Sidedef s;
+						string thigh, tmid, tlow;
+						int offsetx, offsety, sc;
+
+						// Line has a front side?
+						if(s1 != ushort.MaxValue)
+						{
+							// Read front sidedef
+							sidedefsmem.Seek(s1 * 30, SeekOrigin.Begin);
+							if((s1 * 30L) <= (sidedefsmem.Length - 30L))
+							{
+								offsetx = readside.ReadInt16();
+								offsety = readside.ReadInt16();
+								thigh = Lump.MakeNormalName(readside.ReadBytes(8), WAD.ENCODING);
+								tlow = Lump.MakeNormalName(readside.ReadBytes(8), WAD.ENCODING);
+								tmid = Lump.MakeNormalName(readside.ReadBytes(8), WAD.ENCODING);
+								sc = readside.ReadUInt16();
+
+								// Create front sidedef
+								if(sectorlink.ContainsKey(sc))
+								{
+									s = map.CreateSidedef(l, true, sectorlink[sc]);
+									s.Update(offsetx, offsety, thigh, tmid, tlow);
+								}
+								else
+								{
+									General.ErrorLogger.Add(ErrorType.Warning, "Sidedef " + s1 + " references invalid sector " + sc + ". Sidedef has been removed.");
+								}
+							}
+							else
+							{
+								General.ErrorLogger.Add(ErrorType.Warning, "Linedef " + i + " references invalid sidedef " + s1 + ". Sidedef has been removed.");
+							}
+						}
+
+						// Line has a back side?
+						if(s2 != ushort.MaxValue)
+						{
+							// Read back sidedef
+							sidedefsmem.Seek(s2 * 30, SeekOrigin.Begin);
+							if((s2 * 30L) <= (sidedefsmem.Length - 30L))
+							{
+								offsetx = readside.ReadInt16();
+								offsety = readside.ReadInt16();
+								thigh = Lump.MakeNormalName(readside.ReadBytes(8), WAD.ENCODING);
+								tlow = Lump.MakeNormalName(readside.ReadBytes(8), WAD.ENCODING);
+								tmid = Lump.MakeNormalName(readside.ReadBytes(8), WAD.ENCODING);
+								sc = readside.ReadUInt16();
+
+								// Create back sidedef
+								if(sectorlink.ContainsKey(sc))
+								{
+									s = map.CreateSidedef(l, false, sectorlink[sc]);
+									s.Update(offsetx, offsety, thigh, tmid, tlow);
+								}
+								else
+								{
+									General.ErrorLogger.Add(ErrorType.Warning, "Sidedef " + s2 + " references invalid sector " + sc + ". Sidedef has been removed.");
+								}
+							}
+							else
+							{
+								General.ErrorLogger.Add(ErrorType.Warning, "Linedef " + i + " references invalid sidedef " + s2 + ". Sidedef has been removed.");
+							}
+						}
+					}
+					else
+					{
+						General.ErrorLogger.Add(ErrorType.Warning, "Linedef " + i + " is zero-length. Linedef has been removed.");
+					}
+				}
+				else
+				{
+					General.ErrorLogger.Add(ErrorType.Warning, "Linedef " + i + " references one or more invalid vertices. Linedef has been removed.");
+				}
+			}
+
+			// Done
+			linedefsmem.Dispose();
+			sidedefsmem.Dispose();
+		}
+		
+		#endregion
+
+		#region ================== Writing
+
+		// This writes a MapSet to the file
+		public override void Write(MapSet map, string mapname, int position)
+		{
+			Dictionary<Vertex, int> vertexids = new Dictionary<Vertex,int>();
+			Dictionary<Sidedef, int> sidedefids = new Dictionary<Sidedef,int>();
+			Dictionary<Sector, int> sectorids = new Dictionary<Sector,int>();
+			
+			// First index everything
+			foreach(Vertex v in map.Vertices) vertexids.Add(v, vertexids.Count);
+			foreach(Sidedef sd in map.Sidedefs) sidedefids.Add(sd, sidedefids.Count);
+			foreach(Sector s in map.Sectors) sectorids.Add(s, sectorids.Count);
+			
+			// Write lumps to wad (note the backwards order because they
+			// are all inserted at position+1 when not found)
+			WriteSectors(map, position, manager.Config.MapLumps);
+			WriteVertices(map, position, manager.Config.MapLumps);
+			WriteSidedefs(map, position, manager.Config.MapLumps, sectorids);
+			WriteLinedefs(map, position, manager.Config.MapLumps, sidedefids, vertexids);
+			WriteThings(map, position, manager.Config.MapLumps);
+		}
+
+		// This writes the THINGS to WAD file
+		private void WriteThings(MapSet map, int position, Dictionary<string, MapLumpInfo> maplumps)
+		{
+			// Create memory to write to
+			MemoryStream mem = new MemoryStream();
+			BinaryWriter writer = new BinaryWriter(mem, WAD.ENCODING);
+			
+			// Go for all things
+			foreach(Thing t in map.Things)
+			{
+				// Convert flags
+				int flags = 0;
+				foreach(KeyValuePair<string, bool> f in t.Flags)
+				{
+					int fnum;
+					if(f.Value && int.TryParse(f.Key, out fnum)) flags |= fnum;
+				}
+
+				// Write properties to stream
+				// Write properties to stream
+				writer.Write((UInt16)t.Tag);
+				writer.Write((Int16)t.Position.x);
+				writer.Write((Int16)t.Position.y);
+				writer.Write((Int16)t.Position.z);
+				writer.Write((Int16)t.AngleDoom);
+				writer.Write((UInt16)t.Type);
+				writer.Write((UInt16)flags);
+				writer.Write((Byte)t.Action);
+				writer.Write((Byte)t.Args[0]);
+				writer.Write((Byte)t.Args[1]);
+				writer.Write((Byte)t.Args[2]);
+				writer.Write((Byte)t.Args[3]);
+				writer.Write((Byte)t.Args[4]);
+			}
+			
+			// Find insert position and remove old lump
+			int insertpos = MapManager.RemoveSpecificLump(wad, "THINGS", position, MapManager.TEMP_MAP_HEADER, maplumps);
+			if(insertpos == -1) insertpos = position + 1;
+			if(insertpos > wad.Lumps.Count) insertpos = wad.Lumps.Count;
+			
+			// Create the lump from memory
+			Lump lump = wad.Insert("THINGS", insertpos, (int)mem.Length);
+			lump.Stream.Seek(0, SeekOrigin.Begin);
+			mem.WriteTo(lump.Stream);
+		}
+
+		// This writes the VERTEXES to WAD file
+		private void WriteVertices(MapSet map, int position, Dictionary<string, MapLumpInfo> maplumps)
+		{
+			// Create memory to write to
+			MemoryStream mem = new MemoryStream();
+			BinaryWriter writer = new BinaryWriter(mem, WAD.ENCODING);
+
+			// Go for all vertices
+			foreach(Vertex v in map.Vertices)
+			{
+				// Write properties to stream
+				writer.Write((Int16)(int)Math.Round(v.Position.x));
+				writer.Write((Int16)(int)Math.Round(v.Position.y));
+			}
+
+			// Find insert position and remove old lump
+			int insertpos = MapManager.RemoveSpecificLump(wad, "VERTEXES", position, MapManager.TEMP_MAP_HEADER, maplumps);
+			if(insertpos == -1) insertpos = position + 1;
+			if(insertpos > wad.Lumps.Count) insertpos = wad.Lumps.Count;
+
+			// Create the lump from memory
+			Lump lump = wad.Insert("VERTEXES", insertpos, (int)mem.Length);
+			lump.Stream.Seek(0, SeekOrigin.Begin);
+			mem.WriteTo(lump.Stream);
+		}
+
+		// This writes the LINEDEFS to WAD file
+		private void WriteLinedefs(MapSet map, int position, Dictionary<string, MapLumpInfo> maplumps, IDictionary<Sidedef, int> sidedefids, IDictionary<Vertex, int> vertexids)
+		{
+			// Create memory to write to
+			MemoryStream mem = new MemoryStream();
+			BinaryWriter writer = new BinaryWriter(mem, WAD.ENCODING);
+
+			// Go for all lines
+			foreach(Linedef l in map.Linedefs)
+			{
+				// Convert flags
+				int flags = 0;
+				foreach(KeyValuePair<string, bool> f in l.Flags)
+				{
+					int fnum;
+					if(f.Value && int.TryParse(f.Key, out fnum)) flags |= fnum;
+				}
+
+				// Add activates to flags
+				flags |= (l.Activate & manager.Config.LinedefActivationsFilter);
+				
+				// Write properties to stream
+				writer.Write((UInt16)vertexids[l.Start]);
+				writer.Write((UInt16)vertexids[l.End]);
+				writer.Write((UInt16)flags);
+				writer.Write((Byte)l.Action);
+				writer.Write((Byte)l.Args[0]);
+				writer.Write((Byte)l.Args[1]);
+				writer.Write((Byte)l.Args[2]);
+				writer.Write((Byte)l.Args[3]);
+				writer.Write((Byte)l.Args[4]);
+
+				// Front sidedef
+				ushort sid = (l.Front == null ? ushort.MaxValue : (UInt16)sidedefids[l.Front]);
+				writer.Write(sid);
+
+				// Back sidedef
+				sid = (l.Back == null ? ushort.MaxValue : (UInt16)sidedefids[l.Back]);
+				writer.Write(sid);
+			}
+
+			// Find insert position and remove old lump
+			int insertpos = MapManager.RemoveSpecificLump(wad, "LINEDEFS", position, MapManager.TEMP_MAP_HEADER, maplumps);
+			if(insertpos == -1) insertpos = position + 1;
+			if(insertpos > wad.Lumps.Count) insertpos = wad.Lumps.Count;
+
+			// Create the lump from memory
+			Lump lump = wad.Insert("LINEDEFS", insertpos, (int)mem.Length);
+			lump.Stream.Seek(0, SeekOrigin.Begin);
+			mem.WriteTo(lump.Stream);
+		}
+
+		// This writes the SIDEDEFS to WAD file
+		private void WriteSidedefs(MapSet map, int position, Dictionary<string, MapLumpInfo> maplumps, IDictionary<Sector, int> sectorids)
+		{
+			// Create memory to write to
+			MemoryStream mem = new MemoryStream();
+			BinaryWriter writer = new BinaryWriter(mem, WAD.ENCODING);
+
+			// Go for all sidedefs
+			foreach(Sidedef sd in map.Sidedefs)
+			{
+				// Write properties to stream
+				writer.Write((Int16)sd.OffsetX);
+				writer.Write((Int16)sd.OffsetY);
+				writer.Write(Lump.MakeFixedName(sd.HighTexture, WAD.ENCODING));
+				writer.Write(Lump.MakeFixedName(sd.LowTexture, WAD.ENCODING));
+				writer.Write(Lump.MakeFixedName(sd.MiddleTexture, WAD.ENCODING));
+				writer.Write((UInt16)sectorids[sd.Sector]);
+			}
+
+			// Find insert position and remove old lump
+			int insertpos = MapManager.RemoveSpecificLump(wad, "SIDEDEFS", position, MapManager.TEMP_MAP_HEADER, maplumps);
+			if(insertpos == -1) insertpos = position + 1;
+			if(insertpos > wad.Lumps.Count) insertpos = wad.Lumps.Count;
+
+			// Create the lump from memory
+			Lump lump = wad.Insert("SIDEDEFS", insertpos, (int)mem.Length);
+			lump.Stream.Seek(0, SeekOrigin.Begin);
+			mem.WriteTo(lump.Stream);
+		}
+
+		// This writes the SECTORS to WAD file
+		private void WriteSectors(MapSet map, int position, Dictionary<string, MapLumpInfo> maplumps)
+		{
+			// Create memory to write to
+			MemoryStream mem = new MemoryStream();
+			BinaryWriter writer = new BinaryWriter(mem, WAD.ENCODING);
+
+			// Go for all sectors
+			foreach(Sector s in map.Sectors)
+			{
+				// Write properties to stream
+				writer.Write((Int16)s.FloorHeight);
+				writer.Write((Int16)s.CeilHeight);
+				writer.Write(Lump.MakeFixedName(s.FloorTexture, WAD.ENCODING));
+				writer.Write(Lump.MakeFixedName(s.CeilTexture, WAD.ENCODING));
+				writer.Write((Int16)s.Brightness);
+				writer.Write((UInt16)s.Effect);
+				writer.Write((UInt16)s.Tag);
+			}
+
+			// Find insert position and remove old lump
+			int insertpos = MapManager.RemoveSpecificLump(wad, "SECTORS", position, MapManager.TEMP_MAP_HEADER, maplumps);
+			if(insertpos == -1) insertpos = position + 1;
+			if(insertpos > wad.Lumps.Count) insertpos = wad.Lumps.Count;
+
+			// Create the lump from memory
+			Lump lump = wad.Insert("SECTORS", insertpos, (int)mem.Length);
+			lump.Stream.Seek(0, SeekOrigin.Begin);
+			mem.WriteTo(lump.Stream);
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/IO/IImageReader.cs b/Source/Core/IO/IImageReader.cs
new file mode 100644
index 0000000..60b33db
--- /dev/null
+++ b/Source/Core/IO/IImageReader.cs
@@ -0,0 +1,34 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.IO;
+using System.Drawing;
+using CodeImp.DoomBuilder.Rendering;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.IO
+{
+	internal unsafe interface IImageReader
+	{
+		// Methods
+		Bitmap ReadAsBitmap(Stream stream);
+		Bitmap ReadAsBitmap(Stream stream, out int offsetx, out int offsety);
+		void DrawToPixelData(Stream stream, PixelColor* target, int targetwidth, int targetheight, int x, int y);
+	}
+}
diff --git a/Source/Core/IO/IMapSetIO.cs b/Source/Core/IO/IMapSetIO.cs
new file mode 100644
index 0000000..465cc30
--- /dev/null
+++ b/Source/Core/IO/IMapSetIO.cs
@@ -0,0 +1,70 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Types;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.IO
+{
+	public interface IMapSetIO
+	{
+		int MaxSidedefs { get; }
+		int VertexDecimals { get; }
+		string DecimalsFormat { get; }
+		int MaxVertices { get; }
+		int MaxLinedefs { get; }
+		int MaxSectors { get; }
+		int MaxThings { get; }
+		int MinTextureOffset { get; }
+		int MaxTextureOffset { get; }
+		bool HasLinedefTag { get; }
+		bool HasThingTag { get; }
+		bool HasThingAction { get; }
+		bool HasCustomFields { get; }
+		bool HasThingHeight { get; }
+		bool HasActionArgs { get; }
+		bool HasMixedActivations { get; }
+		bool HasPresetActivations { get; }
+		bool HasBuiltInActivations { get; }
+		bool HasNumericLinedefFlags { get; }
+		bool HasNumericThingFlags { get; }
+		bool HasNumericLinedefActivations { get; }
+		int MaxTag { get; }
+		int MinTag { get; }
+		int MaxAction { get; }
+		int MinAction { get; }
+		int MaxArgument { get; }
+		int MinArgument { get; }
+		int MaxEffect { get; }
+		int MinEffect { get; }
+		int MaxBrightness { get; }
+		int MinBrightness { get; }
+		int MaxThingType { get; }
+		int MinThingType { get; }
+		float MaxCoordinate { get; }
+		float MinCoordinate { get; }
+		int MaxThingAngle { get; }
+		int MinThingAngle { get; }
+		Dictionary<MapElementType, Dictionary<string, UniversalType>> UIFields { get; } //mxd. Element type (like "sector"), list of uifields.
+		string GetElementName(MapElementType elementtype); //mxd
+		MapElementType GetElementType(string elementname); //mxd
+	}
+}
diff --git a/Source/Core/IO/IReadWriteStream.cs b/Source/Core/IO/IReadWriteStream.cs
new file mode 100644
index 0000000..50db559
--- /dev/null
+++ b/Source/Core/IO/IReadWriteStream.cs
@@ -0,0 +1,76 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using CodeImp.DoomBuilder.Geometry;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.IO
+{
+	internal interface IReadWriteStream
+	{
+		// Properties
+		bool IsWriting { get; }
+		
+		// Management
+		void Begin();
+		void End();
+		
+		// Bidirectional members
+		void rwInt(ref int v);
+		void rwByte(ref byte v);
+		void rwShort(ref short v);
+		void rwString(ref string v);
+		void rwLong(ref long v);
+		void rwUInt(ref uint v);
+		void rwUShort(ref ushort v);
+		void rwULong(ref ulong v);
+		void rwFloat(ref float v);
+		void rwVector2D(ref Vector2D v);
+		void rwVector3D(ref Vector3D v);
+		void rwBool(ref bool v);
+
+		// Write-only members
+		void wInt(int v);
+		void wByte(byte v);
+		void wShort(short v);
+		void wString(string v);
+		void wLong(long v);
+		void wUInt(uint v);
+		void wUShort(ushort v);
+		void wULong(ulong v);
+		void wFloat(float v);
+		void wVector2D(Vector2D v);
+		void wVector3D(Vector3D v);
+		void wBool(bool v);
+
+		// Read-only members
+		void rInt(out int v);
+		void rByte(out byte v);
+		void rShort(out short v);
+		void rString(out string v);
+		void rLong(out long v);
+		void rUInt(out uint v);
+		void rUShort(out ushort v);
+		void rULong(out ulong v);
+		void rFloat(out float v);
+		void rVector2D(out Vector2D v);
+		void rVector3D(out Vector3D v);
+		void rBool(out bool v);
+	}
+}
diff --git a/Source/Core/IO/Lump.cs b/Source/Core/IO/Lump.cs
new file mode 100644
index 0000000..a356f1b
--- /dev/null
+++ b/Source/Core/IO/Lump.cs
@@ -0,0 +1,204 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Text;
+using System.IO;
+using CodeImp.DoomBuilder.Data;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.IO
+{
+	public class Lump
+	{
+		#region ================== Methods
+
+		// Allowed characters in a map lump name
+		internal const string MAP_LUMP_NAME_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890_";
+
+		#endregion
+
+		#region ================== Variables
+
+		// Owner
+		private WAD owner;
+		
+		// Data stream
+		private ClippedStream stream;
+		
+		// Data info
+		private string name;
+		private long longname;
+		private byte[] fixedname;
+		private int offset;
+		private int length;
+
+		// Disposing
+		private bool isdisposed;
+
+		#endregion
+
+		#region ================== Properties
+
+		internal WAD Owner { get { return owner; } }
+		internal string Name { get { return name; } }
+		internal long LongName { get { return longname; } }
+		internal byte[] FixedName { get { return fixedname; } }
+		internal int Offset { get { return offset; } }
+		internal int Length { get { return length; } }
+		internal ClippedStream Stream { get { return stream; } }
+		internal bool IsDisposed { get { return isdisposed; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		internal Lump(Stream data, WAD owner, byte[] fixedname, int offset, int length)
+		{
+			// Initialize
+			this.stream = new ClippedStream(data, offset, length);
+			this.owner = owner;
+			this.fixedname = fixedname;
+			this.offset = offset;
+			this.length = length;
+
+			// Make name
+			this.name = MakeNormalName(fixedname, WAD.ENCODING).ToUpperInvariant();
+			this.fixedname = MakeFixedName(name, WAD.ENCODING);
+			this.longname = MakeLongName(name, false); //mxd
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Disposer
+		internal void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Clean up
+				stream.Dispose();
+				owner = null;
+
+				// Done
+				isdisposed = true;
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This returns the long value for a 8 byte texture name
+		/*public static unsafe long MakeLongName(string name)
+		{
+			long value = 0;
+			byte[] namebytes = Encoding.ASCII.GetBytes(name.Trim().ToUpper());
+			uint bytes = (uint)namebytes.Length;
+			if(bytes > 8) bytes = 8;
+
+			fixed(void* bp = namebytes)
+			{
+				General.CopyMemory(&value, bp, bytes);
+			}
+
+			return value;
+		}*/
+
+		//mxd. This returns (hopefully) unique hash value for a texture name of any length
+		public static long MakeLongName(string name)
+		{
+			return MakeLongName(name, General.Map != null && General.Map.Config != null &&  General.Map.Config.UseLongTextureNames);
+		}
+
+		//mxd. This returns (hopefully) unique hash value for a texture name of any length
+		public static long MakeLongName(string name, bool uselongnames)
+		{
+			name = name.Trim().ToUpper();
+			if(!uselongnames && name.Length > DataManager.CLASIC_IMAGE_NAME_LENGTH)
+			{
+				name = name.Substring(0, DataManager.CLASIC_IMAGE_NAME_LENGTH);
+			}
+			return MurmurHash2.Hash(name);
+		}
+		
+		// This makes the normal name from fixed name
+		public static string MakeNormalName(byte[] fixedname, Encoding encoding)
+		{
+			int length = 0;
+			
+			// Figure out the length of the lump name
+			while((length < fixedname.Length) && (fixedname[length] != 0)) length++;
+			
+			// Make normal name
+			return encoding.GetString(fixedname, 0, length).Trim().ToUpper();
+		}
+
+		// This makes the fixed name from normal name
+		public static byte[] MakeFixedName(string name, Encoding encoding)
+		{
+			// Make uppercase name and count bytes
+			string uppername = name.Trim().ToUpper();
+			int bytes = encoding.GetByteCount(uppername);
+			if(bytes < 8) bytes = 8;
+			
+			// Make 8 bytes, all zeros
+			byte[] fixedname = new byte[bytes];
+
+			// Write the name in bytes
+			encoding.GetBytes(uppername, 0, uppername.Length, fixedname, 0);
+
+			// Return result
+			return fixedname;
+		}
+
+		// This copies lump data to another lump
+		internal void CopyTo(Lump lump)
+		{
+			// Create a reader
+			BinaryReader reader = new BinaryReader(stream);
+
+			// Copy bytes over
+			stream.Seek(0, SeekOrigin.Begin);
+			lump.Stream.Write(reader.ReadBytes((int)stream.Length), 0, (int)stream.Length);
+		}
+		
+		// String representation
+		public override string ToString()
+		{
+			return name;
+		}
+		
+		// This renames the lump
+		internal void Rename(string newname)
+		{
+			// Make name
+			this.fixedname = MakeFixedName(newname, WAD.ENCODING);
+			this.name = MakeNormalName(this.fixedname, WAD.ENCODING).ToUpperInvariant();
+			this.longname = MakeLongName(newname);
+
+			// Write changes
+			owner.WriteHeaders();
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/IO/MapSetIO.cs b/Source/Core/IO/MapSetIO.cs
new file mode 100644
index 0000000..a3cba78
--- /dev/null
+++ b/Source/Core/IO/MapSetIO.cs
@@ -0,0 +1,192 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.Reflection;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Types;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.IO
+{
+	internal abstract class MapSetIO : IMapSetIO
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		// WAD File
+		protected WAD wad;
+
+		// Map manager
+		protected MapManager manager;
+
+		//mxd
+		protected Dictionary<MapElementType, Dictionary<string, UniversalType>> uifields;
+
+		#endregion
+
+		#region ================== Properties
+
+		public abstract int MaxSidedefs { get; }
+		public abstract int MaxVertices { get; }
+		public abstract int MaxLinedefs { get; }
+		public abstract int MaxSectors { get; }
+		public abstract int MaxThings { get; }
+		public abstract int MinTextureOffset { get; }
+		public abstract int MaxTextureOffset { get; }
+		public abstract int VertexDecimals { get; }
+		public abstract string DecimalsFormat { get; }
+		public abstract bool HasLinedefTag { get; }
+		public abstract bool HasThingTag { get; }
+		public abstract bool HasThingAction { get; }
+		public abstract bool HasCustomFields { get; }
+		public abstract bool HasThingHeight { get; }
+		public abstract bool HasActionArgs { get; }
+		public abstract bool HasMixedActivations { get; }
+		public abstract bool HasPresetActivations { get; }
+		public abstract bool HasBuiltInActivations { get; }
+		public abstract bool HasNumericLinedefFlags { get; }
+		public abstract bool HasNumericThingFlags { get; }
+		public abstract bool HasNumericLinedefActivations { get; }
+		public abstract int MaxTag { get; }
+		public abstract int MinTag { get; }
+		public abstract int MaxAction { get; }
+		public abstract int MinAction { get; }
+		public abstract int MaxArgument { get; }
+		public abstract int MinArgument { get; }
+		public abstract int MaxEffect { get; }
+		public abstract int MinEffect { get; }
+		public abstract int MaxBrightness { get; }
+		public abstract int MinBrightness { get; }
+		public abstract int MaxThingType { get; }
+		public abstract int MinThingType { get; }
+		public abstract float MaxCoordinate { get; }
+		public abstract float MinCoordinate { get; }
+		public abstract int MaxThingAngle { get; }
+		public abstract int MinThingAngle { get; }
+		public abstract Dictionary<MapElementType, Dictionary<string, UniversalType>> UIFields { get; } //mxd
+		
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		protected MapSetIO(WAD wad, MapManager manager)
+		{
+			// Initialize
+			this.wad = wad;
+			this.manager = manager;
+			this.uifields = new Dictionary<MapElementType, Dictionary<string, UniversalType>>(); //mxd
+		}
+		
+		#endregion
+
+		#region ================== Static Methods
+
+		// This returns and instance of the specified IO class
+		public static MapSetIO Create(string classname)
+		{
+			return Create(classname, null, null);
+		}
+		
+		// This returns and instance of the specified IO class
+		public static MapSetIO Create(string classname, WAD wadfile, MapManager manager)
+		{
+			try
+			{
+				// Create arguments
+				object[] args = new object[2];
+				args[0] = wadfile;
+				args[1] = manager;
+				
+				// Make the full class name
+				string fullname = "CodeImp.DoomBuilder.IO." + classname;
+				
+				// Create IO class
+				MapSetIO result = (MapSetIO)General.ThisAssembly.CreateInstance(fullname, false,
+					BindingFlags.Default, null, args, CultureInfo.CurrentCulture, new object[0]);
+				
+				// Check result
+				if(result != null)
+				{
+					// Success
+					return result;
+				}
+				else
+				{
+					// No such class
+					throw new ArgumentException("No such map format interface found: \"" + classname + "\"");
+				}
+			}
+			// Catch errors
+			catch(TargetInvocationException e)
+			{
+				// Throw the actual exception
+				Debug.WriteLine(DateTime.Now.ToShortDateString() + " " + DateTime.Now.ToShortTimeString());
+				Debug.WriteLine(e.InnerException.Source + " throws " + e.InnerException.GetType().Name + ":");
+				Debug.WriteLine(e.InnerException.Message);
+				Debug.WriteLine(e.InnerException.StackTrace);
+				throw e.InnerException;
+			}
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+
+		// Required implementations
+		public abstract MapSet Read(MapSet map, string mapname);
+		public abstract void Write(MapSet map, string mapname, int position);
+
+		//mxd.
+		public string GetElementName(MapElementType elementtype)
+		{
+			switch(elementtype)
+			{
+				case MapElementType.VERTEX:  return "vertex";
+				case MapElementType.LINEDEF: return "linedef";
+				case MapElementType.SIDEDEF: return "sidedef";
+				case MapElementType.SECTOR:  return "sector";
+				case MapElementType.THING:   return "thing";
+				default: throw new NotSupportedException("Tried to get element name of unsupported map element type!");
+			}
+		}
+
+		public MapElementType GetElementType(string elementname)
+		{
+			switch(elementname)
+			{
+				case "vertex":  return MapElementType.VERTEX;
+				case "linedef": return MapElementType.LINEDEF;
+				case "sidedef": return MapElementType.SIDEDEF;
+				case "sector":  return MapElementType.SECTOR;
+				case "thing":   return MapElementType.THING;
+				default: throw new NotSupportedException("Tried to get element type of unsupported map element type!");
+			}
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/IO/SerializerStream.cs b/Source/Core/IO/SerializerStream.cs
new file mode 100644
index 0000000..6e02f59
--- /dev/null
+++ b/Source/Core/IO/SerializerStream.cs
@@ -0,0 +1,203 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Geometry;
+using System.IO;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.IO
+{
+	internal sealed class SerializerStream : IReadWriteStream
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		//private Stream stream;
+		private BinaryWriter writer;
+		private Dictionary<string, ushort> stringstable;
+
+		#endregion
+
+		#region ================== Properties
+
+		public bool IsWriting { get { return true; } }
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		// Constructor
+		public SerializerStream(Stream stream)
+		{
+			// Initialize
+			//this.stream = stream;
+			this.writer = new BinaryWriter(stream);
+			this.stringstable = new Dictionary<string, ushort>(StringComparer.Ordinal);
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// Management
+		public void Begin()
+		{
+			// First 4 bytes are reserved for the offset of the strings table
+			const int offset = 0;
+			writer.Write(offset);
+		}
+
+		public void End()
+		{
+			// Write the offset bytes
+			int offset = (int)writer.BaseStream.Length;
+			writer.Seek(0, SeekOrigin.Begin);
+			writer.Write(offset);
+
+			// Write the strings
+			writer.Seek(0, SeekOrigin.End);
+			foreach(KeyValuePair<string, ushort> str in stringstable)
+				writer.Write(str.Key);
+		}
+
+		// Bidirectional
+		public void rwInt(ref int v) { writer.Write(v); }
+
+		public void rwByte(ref byte v) { writer.Write(v); }
+
+		public void rwShort(ref short v) { writer.Write(v); }
+
+		public void rwString(ref string v)
+		{
+			ushort index;
+			if(stringstable.ContainsKey(v))
+				index = stringstable[v];
+			else
+				index = stringstable[v] = (ushort)stringstable.Count;
+			writer.Write(index);
+		}
+
+		public void rwLong(ref long v) { writer.Write(v); }
+
+		public void rwUInt(ref uint v) { writer.Write(v); }
+
+		public void rwUShort(ref ushort v) { writer.Write(v); }
+
+		public void rwULong(ref ulong v) { writer.Write(v); }
+
+		public void rwFloat(ref float v) { writer.Write(v); }
+
+		public void rwBool(ref bool v) { writer.Write(v); }
+
+		public void rwVector2D(ref Vector2D v)
+		{
+			writer.Write(v.x);
+			writer.Write(v.y);
+		}
+
+		public void rwVector3D(ref Vector3D v)
+		{
+			writer.Write(v.x);
+			writer.Write(v.y);
+			writer.Write(v.z);
+		}
+
+		// Write-only
+		public void wInt(int v) { writer.Write(v); }
+
+		public void wByte(byte v) { writer.Write(v); }
+
+		public void wShort(short v) { writer.Write(v); }
+
+		public void wString(string v)
+		{
+			ushort index;
+			if(stringstable.ContainsKey(v))
+				index = stringstable[v];
+			else
+				index = stringstable[v] = (ushort)stringstable.Count;
+			writer.Write(index);
+		}
+
+		public void wLong(long v) { writer.Write(v); }
+
+		public void wUInt(uint v) { writer.Write(v); }
+
+		public void wUShort(ushort v) { writer.Write(v); }
+
+		public void wULong(ulong v) { writer.Write(v); }
+
+		public void wFloat(float v) { writer.Write(v); }
+
+		public void wBool(bool v) { writer.Write(v); }
+
+		public void wVector2D(Vector2D v)
+		{
+			writer.Write(v.x);
+			writer.Write(v.y);
+		}
+
+		public void wVector3D(Vector3D v)
+		{
+			writer.Write(v.x);
+			writer.Write(v.y);
+			writer.Write(v.z);
+		}
+
+		// Read-only is not supported
+		public void rInt(out int v) { v = 0; General.Fail("Read-only is not supported on serialization stream. Consider passing the element by reference for bidirectional support."); }
+
+		public void rByte(out byte v) { v = 0; General.Fail("Read-only is not supported on serialization stream. Consider passing the element by reference for bidirectional support."); }
+
+		public void rShort(out short v) { v = 0; General.Fail("Read-only is not supported on serialization stream. Consider passing the element by reference for bidirectional support."); }
+
+		public void rString(out string v) { v = ""; General.Fail("Read-only is not supported on serialization stream. Consider passing the element by reference for bidirectional support."); }
+
+		public void rLong(out long v) { v = 0; General.Fail("Read-only is not supported on serialization stream. Consider passing the element by reference for bidirectional support."); }
+
+		public void rUInt(out uint v) { v = 0; General.Fail("Read-only is not supported on serialization stream. Consider passing the element by reference for bidirectional support."); }
+
+		public void rUShort(out ushort v) { v = 0; General.Fail("Read-only is not supported on serialization stream. Consider passing the element by reference for bidirectional support."); }
+
+		public void rULong(out ulong v) { v = 0; General.Fail("Read-only is not supported on serialization stream. Consider passing the element by reference for bidirectional support."); }
+
+		public void rFloat(out float v) { v = 0; General.Fail("Read-only is not supported on serialization stream. Consider passing the element by reference for bidirectional support."); }
+
+		public void rBool(out bool v) { v = false; General.Fail("Read-only is not supported on serialization stream. Consider passing the element by reference for bidirectional support."); }
+
+		public void rVector2D(out Vector2D v)
+		{
+			v = new Vector2D();
+			General.Fail("Read-only is not supported on serialization stream. Consider passing the element by reference for bidirectional support.");
+		}
+
+		public void rVector3D(out Vector3D v)
+		{
+			v = new Vector3D();
+			General.Fail("Read-only is not supported on serialization stream. Consider passing the element by reference for bidirectional support.");
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/IO/UniversalCollection.cs b/Source/Core/IO/UniversalCollection.cs
new file mode 100644
index 0000000..72f46b5
--- /dev/null
+++ b/Source/Core/IO/UniversalCollection.cs
@@ -0,0 +1,39 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections.Generic;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.IO
+{
+	public sealed class UniversalCollection : List<UniversalEntry>
+	{
+		// Variables
+		private string comment;
+		
+		// Properties
+		public string Comment { get { return comment; } set { comment = value; } }
+
+		// Overload
+		public void Add(string key, object value)
+		{
+			base.Add(new UniversalEntry(key, value));
+		}
+	}
+}
diff --git a/Source/Core/IO/UniversalEntry.cs b/Source/Core/IO/UniversalEntry.cs
new file mode 100644
index 0000000..a69b948
--- /dev/null
+++ b/Source/Core/IO/UniversalEntry.cs
@@ -0,0 +1,74 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.IO
+{
+	public sealed class UniversalEntry
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		private string key;
+		private object value;
+		
+		#endregion
+
+		#region ================== Properties
+
+		public string Key { get { return key; } }
+		public object Value { get { return value; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public UniversalEntry(string key, object value)
+		{
+			// Initialize
+			this.key = key;
+			this.value = value;
+		}
+		
+		#endregion
+
+		#region ================== Methods
+
+		// This checks if the value is of the given type
+		// Will throw and exception when it is not
+		public void ValidateType(Type t)
+		{
+			if(value.GetType() != t) throw new Exception("The value of entry '" + key + "' is of incompatible type (expected " + t.Name + ")");
+		}
+
+		//mxd 
+		public bool IsValidType(Type t) 
+		{
+			return value.GetType() == t;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/IO/UniversalMapSetIO.cs b/Source/Core/IO/UniversalMapSetIO.cs
new file mode 100644
index 0000000..59b99a9
--- /dev/null
+++ b/Source/Core/IO/UniversalMapSetIO.cs
@@ -0,0 +1,194 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.IO;
+using CodeImp.DoomBuilder.Map;
+using System.Collections;
+using CodeImp.DoomBuilder.Types;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.IO
+{
+	internal class UniversalMapSetIO : MapSetIO
+	{
+		#region ================== Constants
+
+		// Name of the UDMF configuration file
+		private const string UDMF_UI_CONFIG_NAME = "UDMF_UI.cfg";
+		
+		#endregion
+		
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public UniversalMapSetIO(WAD wad, MapManager manager) : base(wad, manager)
+		{
+			if((manager != null) && (manager.Config != null))
+			{
+				// Make configuration
+				Configuration config = new Configuration();
+				
+				//mxd. Find a resource named UDMF_UI.cfg
+				string[] resnames = General.ThisAssembly.GetManifestResourceNames();
+				foreach(string rn in resnames)
+				{
+					// Found it?
+					if(rn.EndsWith(UDMF_UI_CONFIG_NAME, StringComparison.InvariantCultureIgnoreCase))
+					{
+						// Get a stream from the resource
+						Stream udmfcfg = General.ThisAssembly.GetManifestResourceStream(rn);
+						StreamReader udmfcfgreader = new StreamReader(udmfcfg, Encoding.ASCII);
+						
+						// Load configuration from stream
+						config.InputConfiguration(udmfcfgreader.ReadToEnd());
+						Dictionary<string, MapElementType> elements = new Dictionary<string, MapElementType>
+						                                              {
+							                                              { "vertex", MapElementType.VERTEX },
+																		  { "linedef", MapElementType.LINEDEF },
+																		  { "sidedef", MapElementType.SIDEDEF },
+																		  { "sector", MapElementType.SECTOR },
+																		  { "thing", MapElementType.THING }
+						                                              };
+
+						foreach(KeyValuePair<string, MapElementType> group in elements) 
+						{
+							IDictionary dic = config.ReadSetting("uifields." + group.Key, new Hashtable());
+
+							Dictionary<string, UniversalType> values = new Dictionary<string, UniversalType>(StringComparer.Ordinal);
+							foreach(DictionaryEntry de in dic) 
+							{
+								values.Add(de.Key.ToString(), (UniversalType)de.Value);
+							}
+
+							uifields.Add(group.Value, values);
+						}
+						
+						// Done
+						udmfcfgreader.Dispose();
+						udmfcfg.Dispose();
+						break;
+					}
+				}
+			}
+		}
+
+		#endregion
+
+		#region ================== Properties
+
+		public override int MaxSidedefs { get { return int.MaxValue; } }
+		public override int MaxVertices { get { return int.MaxValue; } }
+		public override int MaxLinedefs { get { return int.MaxValue; } }
+		public override int MaxSectors { get { return int.MaxValue; } }
+		public override int MaxThings { get { return int.MaxValue; } }
+		public override int MinTextureOffset { get { return int.MinValue; } }
+		public override int MaxTextureOffset { get { return int.MaxValue; } }
+		public override int VertexDecimals { get { return 3; } }
+		public override string DecimalsFormat { get { return "0.000"; } }
+		public override bool HasLinedefTag { get { return true; } }
+		public override bool HasThingTag { get { return true; } }
+		public override bool HasThingAction { get { return true; } }
+		public override bool HasCustomFields { get { return true; } }
+		public override bool HasThingHeight { get { return true; } }
+		public override bool HasActionArgs { get { return true; } }
+		public override bool HasMixedActivations { get { return true; } }
+		public override bool HasPresetActivations { get { return false; } }
+		public override bool HasBuiltInActivations { get { return false; } }
+		public override bool HasNumericLinedefFlags { get { return false; } }
+		public override bool HasNumericThingFlags { get { return false; } }
+		public override bool HasNumericLinedefActivations { get { return false; } }
+		public override int MaxTag { get { return int.MaxValue; } }
+		public override int MinTag { get { return int.MinValue; } }
+		public override int MaxAction { get { return int.MaxValue; } }
+		public override int MinAction { get { return int.MinValue; } }
+		public override int MaxArgument { get { return int.MaxValue; } }
+		public override int MinArgument { get { return int.MinValue; } }
+		public override int MaxEffect { get { return int.MaxValue; } }
+		public override int MinEffect { get { return int.MinValue; } }
+		public override int MaxBrightness { get { return int.MaxValue; } }
+		public override int MinBrightness { get { return int.MinValue; } }
+		public override int MaxThingType { get { return int.MaxValue; } }
+		public override int MinThingType { get { return int.MinValue; } }
+		public override float MaxCoordinate { get { return short.MaxValue; } } //mxd. UDMF maps are still bounded to -32768 .. 32767 range
+		public override float MinCoordinate { get { return short.MinValue; } } //mxd
+		public override int MaxThingAngle { get { return int.MaxValue; } }
+		public override int MinThingAngle { get { return int.MinValue; } }
+		public override Dictionary<MapElementType, Dictionary<string, UniversalType>> UIFields { get { return uifields; } } //mxd
+		
+		#endregion
+
+		#region ================== Reading
+		
+		// This reads a map from the file and returns a MapSet
+		public override MapSet Read(MapSet map, string mapname)
+		{
+			UniversalStreamReader udmfreader = new UniversalStreamReader(uifields); //mxd
+			
+			// Find the index where first map lump begins
+			int firstindex = wad.FindLumpIndex(mapname) + 1;
+			
+			// Get the TEXTMAP lump from wad file
+			Lump lump = wad.FindLump("TEXTMAP", firstindex);
+			if(lump == null) throw new Exception("Could not find required lump TEXTMAP!");
+
+			// Read the UDMF data
+			lump.Stream.Seek(0, SeekOrigin.Begin);
+			udmfreader.SetKnownCustomTypes = true;
+			udmfreader.Read(map, lump.Stream);
+			
+			// Return result
+			return map;
+		}
+		
+		#endregion
+
+		#region ================== Writing
+
+		// This writes a MapSet to the file
+		public override void Write(MapSet map, string mapname, int position)
+		{
+			UniversalStreamWriter udmfwriter = new UniversalStreamWriter();
+			
+			// Write map to memory stream
+			MemoryStream memstream = new MemoryStream();
+			memstream.Seek(0, SeekOrigin.Begin);
+			udmfwriter.RememberCustomTypes = true;
+			udmfwriter.Write(map, memstream, manager.Config.EngineName);
+
+			// Find insert position and remove old lump
+			int insertpos = MapManager.RemoveSpecificLump(wad, "TEXTMAP", position, MapManager.TEMP_MAP_HEADER, manager.Config.MapLumps);
+			if(insertpos == -1) insertpos = position + 1;
+			if(insertpos > wad.Lumps.Count) insertpos = wad.Lumps.Count;
+
+			// Create the lump from memory
+			Lump lump = wad.Insert("TEXTMAP", insertpos, (int)memstream.Length);
+			lump.Stream.Seek(0, SeekOrigin.Begin);
+			memstream.WriteTo(lump.Stream);
+
+			// Done
+			memstream.Dispose();
+		}
+		
+		#endregion
+	}
+}
+
diff --git a/Source/Core/IO/UniversalParser.cs b/Source/Core/IO/UniversalParser.cs
new file mode 100644
index 0000000..5946d42
--- /dev/null
+++ b/Source/Core/IO/UniversalParser.cs
@@ -0,0 +1,847 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.IO;
+using System.Text;
+using System.Globalization;
+using System.Collections.Generic;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.IO
+{
+	public sealed class UniversalParser
+	{
+		#region ================== Constants
+		
+		// Path seperator
+		//public const string DEFAULT_SEPERATOR = ".";
+		
+		// Allowed characters in a key
+		private const string KEY_CHARACTERS = "abcdefghijklmnopqrstuvwxyz0123456789_";
+		
+		// Parse mode constants
+		private const int PM_NOTHING = 0;
+		private const int PM_ASSIGNMENT = 1;
+		private const int PM_NUMBER = 2;
+		private const int PM_STRING = 3;
+		private const int PM_KEYWORD = 4;
+		
+		// Error strings
+		private const string ERROR_KEYMISSING = "Missing key name in assignment or scope.";
+		private const string ERROR_KEYCHARACTERS = "Invalid characters in key name.";
+		//private const string ERROR_ASSIGNINVALID = "Invalid assignment. Missing a previous terminator symbol?";
+		private const string ERROR_VALUEINVALID = "Invalid value in assignment. Missing a previous terminator symbol?";
+		private const string ERROR_VALUETOOBIG = "Value too big.";
+		private const string ERROR_KEYWITHOUTVALUE = "Key has no value assigned.";
+		private const string ERROR_KEYWORDUNKNOWN = "Unknown keyword in assignment. Missing a previous terminator symbol?";
+		
+		#endregion
+		
+		#region ================== Variables
+		
+		// Error result
+		private int cpErrorResult;
+		private string cpErrorDescription = "";
+		private int cpErrorLine;
+		
+		// Configuration root
+		private UniversalCollection root;
+
+		private const string newline = "\n";
+		private StringBuilder key;  //mxd
+		private StringBuilder val;  //mxd
+		private Dictionary<string, UniversalEntry> matches; //mxd
+
+		// Settings
+		private bool strictchecking = true;
+		
+		#endregion
+		
+		#region ================== Properties
+		
+		// Properties
+		public int ErrorResult { get { return cpErrorResult; } }
+		public string ErrorDescription { get { return cpErrorDescription; } }
+		public int ErrorLine { get { return cpErrorLine; } }
+		public UniversalCollection Root { get { return root; } }
+		public bool StrictChecking { get { return strictchecking; } set { strictchecking = value; } }
+		
+		#endregion
+		
+		#region ================== Constructor / Destructor
+		
+		// Constructor
+		public UniversalParser()
+		{
+			// Standard new configuration
+			NewConfiguration();
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+		
+		// Constructor to load a file immediately
+		public UniversalParser(string filename)
+		{
+			// Load configuration from file
+			LoadConfiguration(filename);
+
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+		
+		#endregion
+		
+		#region ================== Private Methods
+
+		// This returns a string added with escape characters
+		private static string EscapedString(string str)
+		{
+			// Replace the \ with \\ first!
+			str = str.Replace("\\", "\\\\");
+			str = str.Replace(newline, "\\n");
+			str = str.Replace("\r", "\\r");
+			str = str.Replace("\t", "\\t");
+			str = str.Replace("\"", "\\\"");
+			
+			// Return result
+			return str;
+		}
+		
+		
+		// This raises an error
+		private void RaiseError(int line, string description)
+		{
+			// Raise error
+			cpErrorResult = 1;
+			cpErrorDescription = description;
+			cpErrorLine = line + 1; //mxd
+		}
+		
+		
+		// This validates a given key and sets
+		// error properties if key is invalid and errorline > -1
+		private bool ValidateKey(string key, int errorline)
+		{
+			// Check if key is an empty string
+			if(key.Length == 0)
+			{
+				// ERROR: Missing key name in statement
+				if(errorline > -1) RaiseError(errorline, ERROR_KEYMISSING);
+				return false;
+			}
+
+			//Only when strict checking
+			if(strictchecking) 
+			{
+				// Check if all characters are valid
+				string keylc = key.ToLowerInvariant(); //mxd. UDMF key names are case-insensitive
+				foreach(char c in keylc) 
+				{
+					if(KEY_CHARACTERS.IndexOf(c) == -1) 
+					{
+						// ERROR: Invalid characters in key name
+						if(errorline > -1) RaiseError(errorline, ERROR_KEYCHARACTERS);
+						return false;
+					}
+				}
+			}
+			
+			// Key is valid
+			return true;
+		}
+		
+		
+		// This parses a structure in the given data starting
+		// from the given pos and line and updates pos and line.
+		private UniversalCollection InputStructure(ref string[] data, ref int pos, ref int line, bool topLevel)
+		{
+			int pm = PM_NOTHING;			// current parse mode
+			key.Remove(0, key.Length);
+			val.Remove(0, val.Length);
+			bool escape = false;			// escape sequence?
+			bool endofstruct = false;		// true as soon as this level struct ends
+			UniversalCollection cs = new UniversalCollection();
+			
+			// Go through all of the data until
+			// the end or until the struct closes
+			// or when an arror occurred
+			while((cpErrorResult == 0) && (endofstruct == false))
+			{
+				// Get current character
+				if(line == data.Length - 1) break;
+				if(pos > data[line].Length - 1) 
+				{
+					pos = 0;
+					line++;
+					if(string.IsNullOrEmpty(data[line])) continue; //mxd. Skip empty lines here so correct line number is displayed on errors
+				}
+
+				char c = data[line][pos]; // current data character
+				
+				// ================ What parse mode are we at?
+				if(pm == PM_NOTHING)
+				{
+					// Now check what character this is
+					switch(c)
+					{
+						case '{': // Begin of new struct
+							// Validate key
+							string s = key.ToString().Trim();
+							if(ValidateKey(s, line))
+							{
+								// Next character
+								pos++;
+								
+								// Parse this struct and add it
+								cs.Add(new UniversalEntry(s.ToLowerInvariant(), InputStructure(ref data, ref pos, ref line, false)));
+								
+								// Check the last character
+								pos--;
+								
+								// Reset the key
+								key.Remove(0, key.Length);
+							}
+							
+							// Leave switch
+							break;
+							
+						case '}': // End of this struct
+							// Stop parsing in this struct
+							endofstruct = true;
+							
+							// Leave the loop
+							break;
+							
+						case '=': // Assignment
+							// Validate key
+							if(ValidateKey(key.ToString().Trim(), line))
+							{
+								// Now parsing assignment
+								pm = PM_ASSIGNMENT;
+							}
+							
+							// Leave switch
+							break;
+							
+						case ';': // Terminator
+							
+							// Validate key
+							if(ValidateKey(key.ToString().Trim(), line))
+							{
+								// Error: No value
+								RaiseError(line, ERROR_KEYWITHOUTVALUE);
+							}
+							
+							// Leave switch
+							break;
+							
+						case '\n': // New line
+							// Count the line
+							line++;
+							pos = -1;
+							
+							// Add this to the key as a space.
+							// Spaces are not allowed, but it will be trimmed
+							// when its the first or last character.
+							key.Append(" ");
+							
+							// Leave switch
+							break;
+							
+						case '\\': // Possible comment
+						case '/':
+							// Check for the line comment //
+							if(data[line].Substring(pos, 2) == "//")
+							{
+								// Skip everything on this line
+								pos = -1;
+								
+								// Have next line?
+								if(line < data.Length - 1) line++;
+							}
+							// Check for the block comment /* */
+							else if(data[line].Substring(pos, 2) == "/*")
+							{
+								// Block comment closes on the same line?.. (mxd)
+								int np = data[line].IndexOf("*/", pos);
+								if(np > -1)
+								{
+									pos = np + 1;
+								}
+								else
+								{
+									// Find the next closing block comment
+									line++;
+									while((np = data[line].IndexOf("*/", 0)) == -1) 
+									{
+										if(line == data.Length - 1) break;
+										line++;
+									}
+
+									// Closing block comment found?
+									if(np > -1) 
+									{
+										// Skip everything in this block
+										pos = np + 1;
+									}
+								}
+							}
+							
+							// Leave switch
+							break;
+							
+						default: // Everything else
+							if(!topLevel && pos == 0) 
+							{
+								while(matches.ContainsKey(data[line])) 
+								{
+									cs.Add(matches[data[line]].Key, matches[data[line]].Value);
+									line++;
+									pos = -1;
+								}
+							}
+
+							// Add character to key
+							if(pos != -1) key.Append(c);
+
+							// Leave switch
+							break;
+					}
+				}
+				// ================ Parsing an assignment
+				else if(pm == PM_ASSIGNMENT)
+				{
+					// Check for string opening
+					if(c == '\"')
+					{
+						// Now parsing string
+						pm = PM_STRING; //numbers
+					}
+					// Check for numeric character numbers
+					else if(Configuration.NUMBERS2.IndexOf(c) > -1)
+					{
+						// Now parsing number
+						pm = PM_NUMBER;
+						
+						// Go one byte back, because this
+						// byte is part of the number!
+						pos--;
+					}
+					// Check for new line
+					else if(c == '\n')
+					{
+						// Count the new line
+						line++;
+					}
+					// Check if assignment ends
+					else if(c == ';')
+					{
+						// End of assignment
+						pm = PM_NOTHING;
+						
+						// Remove this if it causes problems
+						key.Remove(0, key.Length);
+						val.Remove(0, val.Length);
+					}
+					// Otherwise (if not whitespace) it will be a keyword
+					else if((c != ' ') && (c != '\t'))
+					{
+						// Now parsing a keyword
+						pm = PM_KEYWORD;
+						
+						// Go one byte back, because this
+						// byte is part of the keyword!
+						pos--;
+					}
+				}
+				// ================ Parsing a number
+				else if(pm == PM_NUMBER)
+				{
+					// Check if number ends here
+					if(c == ';')
+					{
+						// Hexadecimal?
+						string s = val.ToString();
+						if((s.Length > 2) && s.StartsWith("0x", StringComparison.InvariantCultureIgnoreCase))
+						{
+							// Convert to int
+							try
+							{
+								// Convert to value
+								int ival = Convert.ToInt32(s.Substring(2).Trim(), 16);
+
+								// Add it to struct
+								UniversalEntry entry = new UniversalEntry(key.ToString().Trim().ToLowerInvariant(), ival);
+								cs.Add(entry);
+								if(!matches.ContainsKey(data[line])) matches.Add(data[line], entry);
+							}
+							catch(OverflowException)
+							{
+								// Too large for Int32, try Int64
+								try
+								{
+									// Convert to value
+									long lval = Convert.ToInt64(s.Substring(2).Trim(), 16);
+
+									// Add it to struct
+									UniversalEntry entry = new UniversalEntry(key.ToString().Trim().ToLowerInvariant(), lval);
+									cs.Add(entry);
+									if(!matches.ContainsKey(data[line])) matches.Add(data[line], entry);
+								}
+								catch(OverflowException)
+								{
+									// Too large for Int64, return error
+									RaiseError(line, ERROR_VALUETOOBIG);
+								}
+								catch(FormatException)
+								{
+									// ERROR: Invalid value in assignment
+									RaiseError(line, ERROR_VALUEINVALID + "\n\nUnrecognized token: '" + s.Trim() + "'");
+								}
+							}
+							catch(FormatException)
+							{
+								// ERROR: Invalid value in assignment
+								RaiseError(line, ERROR_VALUEINVALID + "\n\nUnrecognized token: '" + s.Trim() + "'");
+							}
+						}
+						// Floating point?
+						//mxd. Can be in scientific notation (like "1E-06")
+						else if(s.IndexOf('.') > -1 || s.ToLowerInvariant().Contains("e-"))
+						{
+							float fval = 0;
+							
+							// Convert to float (remove the f first)
+							try { fval = Convert.ToSingle(s.Trim(), CultureInfo.InvariantCulture); }
+							catch(FormatException)
+							{ 
+								// ERROR: Invalid value in assignment
+								RaiseError(line, ERROR_VALUEINVALID + "\n\nUnrecognized token: '" + s.Trim() + "'");
+							}
+							
+							// Add it to struct
+							UniversalEntry entry = new UniversalEntry(key.ToString().Trim().ToLowerInvariant(), fval);
+							cs.Add(entry);
+							if(!matches.ContainsKey(data[line])) matches.Add(data[line], entry);
+						}
+						else
+						{
+							// Convert to int
+							try
+							{
+								// Convert to value
+								int ival = Convert.ToInt32(s.Trim(), CultureInfo.InvariantCulture);
+								
+								// Add it to struct
+								UniversalEntry entry = new UniversalEntry(key.ToString().Trim().ToLowerInvariant(), ival);
+								cs.Add(entry);
+								if(!matches.ContainsKey(data[line])) matches.Add(data[line], entry);
+							}
+							catch(OverflowException)
+							{
+								// Too large for Int32, try Int64
+								try
+								{
+									// Convert to value
+									long lval = Convert.ToInt64(s.Trim(), CultureInfo.InvariantCulture);
+									
+									// Add it to struct
+									UniversalEntry entry = new UniversalEntry(key.ToString().Trim().ToLowerInvariant(), lval);
+									cs.Add(entry);
+									if(!matches.ContainsKey(data[line])) matches.Add(data[line], entry);
+								}
+								catch(OverflowException)
+								{
+									// Too large for Int64, return error
+									RaiseError(line, ERROR_VALUETOOBIG);
+								}
+								catch(FormatException)
+								{ 
+									// ERROR: Invalid value in assignment
+									RaiseError(line, ERROR_VALUEINVALID + "\n\nUnrecognized token: '" + s.Trim() + "'");
+								}
+							}
+							catch(FormatException)
+							{ 
+								// ERROR: Invalid value in assignment
+								RaiseError(line, ERROR_VALUEINVALID + "\n\nUnrecognized token: '" + s.Trim() + "'");
+							}
+						}
+						
+						// Reset key and value
+						key.Remove(0, key.Length);
+						val.Remove(0, val.Length);
+						
+						// End of assignment
+						pm = PM_NOTHING;
+					}
+					// Check for new line
+					else if(c == '\n')
+					{
+						// Count the new line
+						line++;
+						pos = -1;
+					}
+					// Everything else is part of the value
+					else
+					{
+						val.Append(c);
+					}
+				}
+				// ================ Parsing a string
+				else if(pm == PM_STRING)
+				{
+					// Check if in an escape sequence
+					if(escape)
+					{
+						// What character?
+						switch(c)
+						{
+							case '\\': val.Append('\\'); break;
+							case 'n': val.Append(newline); break;
+							case '\"': val.Append('\"'); break;
+							case 'r': val.Append('\r'); break;
+							case 't': val.Append('\t'); break;
+							default:
+								// Is it a number?
+								if(Configuration.NUMBERS.IndexOf(c) > -1)
+								{
+									int vv = 0;
+									char vc = '0';
+									
+									// Convert the next 3 characters to a number
+									string v = data[line].Substring(pos, 3);
+									try { vv = Convert.ToInt32(v.Trim(), CultureInfo.InvariantCulture); }
+									catch(FormatException)
+									{ 
+										// ERROR: Invalid value in assignment
+										RaiseError(line, ERROR_VALUEINVALID + "\n\nUnrecognized token: '" + v.Trim() + "'");
+									}
+									
+									// Convert the number to a char
+									try { vc = Convert.ToChar(vv, CultureInfo.InvariantCulture); }
+									catch(FormatException)
+									{ 
+										// ERROR: Invalid value in assignment
+										RaiseError(line, ERROR_VALUEINVALID + "\n\nUnrecognized token: '" + v.Trim() + "'");
+									}
+									
+									// Add the char
+									val.Append(vc);
+								}
+								else
+								{
+									// Add the character as it is
+									val.Append(c);
+								}
+								
+								// Leave switch
+								break;
+						}
+						
+						// End of escape sequence
+						escape = false;
+					}
+					else
+					{
+						// Check for sequence start
+						if(c == '\\')
+						{
+							// Next character is of escape sequence
+							escape = true;
+						}
+						// Check if string ends
+						else if(c == '\"')
+						{
+							// Add string to struct
+							UniversalEntry entry = new UniversalEntry(key.ToString().Trim().ToLowerInvariant(), val.ToString());
+							cs.Add(entry);
+							if(!matches.ContainsKey(data[line])) matches.Add(data[line], entry);
+							
+							// End of assignment
+							pm = PM_ASSIGNMENT;
+							
+							// Reset key and value
+							key.Remove(0, key.Length);
+							val.Remove(0, val.Length);
+						}
+						// Check for new line
+						else if(c == '\n')
+						{
+							// Count the new line
+							line++;
+							pos = -1;
+						}
+						// Everything else is just part of string
+						else
+						{
+							// Add to value
+							val.Append(c);
+						}
+					}
+				}
+				// ================ Parsing a keyword
+				else if(pm == PM_KEYWORD)
+				{
+					// Check if keyword ends
+					if(c == ';')
+					{
+						// Add to the struct depending on the keyword
+						switch(val.ToString().Trim().ToLowerInvariant())
+						{
+							case "true":
+								// Add boolean true
+								UniversalEntry t = new UniversalEntry(key.ToString().Trim().ToLowerInvariant(), true);
+								cs.Add(t);
+								if(!matches.ContainsKey(data[line])) matches.Add(data[line], t);
+								break;
+								
+							case "false":
+								// Add boolean false
+								UniversalEntry f = new UniversalEntry(key.ToString().Trim().ToLowerInvariant(), false);
+								cs.Add(f);
+								if(!matches.ContainsKey(data[line])) matches.Add(data[line], f);
+								break;
+								
+							default:
+								// Unknown keyword
+								RaiseError(line, ERROR_KEYWORDUNKNOWN + "\n\nUnrecognized token: '" + val.ToString().Trim() + "'");
+								break;
+						}
+						
+						// End of assignment
+						pm = PM_NOTHING;
+						
+						// Reset key and value
+						key.Remove(0, key.Length);
+						val.Remove(0, val.Length);
+					}
+					// Check for new line
+					else if(c == '\n')
+					{
+						// Count the new line
+						line++;
+						pos = -1;
+					}
+					// Everything else is just part of keyword
+					else
+					{
+						// Add to value
+						val.Append(c);
+					}
+				}
+				
+				// Next character
+				pos++;
+			}
+			
+			// Return the parsed result
+			return cs;
+		}
+		
+		
+		// This will create a data structure from the given object
+		private string OutputStructure(UniversalCollection cs, int level, string newline, bool whitespace)
+		{
+			string leveltabs = "";
+			string spacing = "";
+			StringBuilder db = new StringBuilder("");
+			
+			// Check if this ConfigStruct is not empty
+			if(cs.Count > 0)
+			{
+				// Create whitespace
+				if(whitespace)
+				{
+					for(int i = 0; i < level; i++) leveltabs += "\t";
+					spacing = " ";
+				}
+				
+				// Go for each item
+				for(int i = 0; i < cs.Count; i++)
+				{
+					// Check if the value if of collection type
+					if(cs[i].Value is UniversalCollection)
+					{
+						UniversalCollection c = (UniversalCollection)cs[i].Value;
+						
+						// Output recursive structure
+						if(whitespace) { db.Append(leveltabs); db.Append(newline); }
+						db.Append(leveltabs); db.Append(cs[i].Key);
+						if(!string.IsNullOrEmpty(c.Comment))
+						{
+							if(whitespace) db.Append("\t");
+							db.Append("// " + c.Comment);
+						}
+						db.Append(newline);
+						db.Append(leveltabs); db.Append("{"); db.Append(newline);
+						db.Append(OutputStructure(c, level + 1, newline, whitespace));
+						db.Append(leveltabs); db.Append("}"); db.Append(newline);
+						//if(whitespace) { db.Append(leveltabs); db.Append(newline); } //mxd. Let's save a few Kbs by using single line breaks...
+					}
+					// Check if the value is of boolean type
+					else if(cs[i].Value is bool)
+					{
+						db.Append(leveltabs); db.Append(cs[i].Key); db.Append(spacing); db.Append("="); db.Append(spacing);
+						db.Append((bool)cs[i].Value ? "true;" : "false;"); db.Append(newline);
+					}
+					// Check if value is of float type
+					else if(cs[i].Value is float)
+					{
+						// Output the value as float (3 decimals)
+						float f = (float)cs[i].Value;
+						db.Append(leveltabs); db.Append(cs[i].Key); db.Append(spacing); db.Append("=");
+						db.Append(spacing); db.Append(f.ToString("0.000", CultureInfo.InvariantCulture)); db.Append(";"); db.Append(newline);
+					}
+					//mxd. Check if value is of double type
+					else if(cs[i].Value is double)
+					{
+						// Output the value as double (7 decimals)
+						double d = (double)cs[i].Value;
+						db.Append(leveltabs); db.Append(cs[i].Key); db.Append(spacing); db.Append("=");
+						db.Append(spacing); db.Append(d.ToString("0.0000000", CultureInfo.InvariantCulture)); db.Append(";"); db.Append(newline);
+					}
+					// Check if value is of other numeric type
+					else if(cs[i].Value.GetType().IsPrimitive)
+					{
+						// Output the value unquoted
+						db.Append(leveltabs); db.Append(cs[i].Key); db.Append(spacing); db.Append("=");
+						db.Append(spacing); db.Append(String.Format(CultureInfo.InvariantCulture, "{0}", cs[i].Value)); db.Append(";"); db.Append(newline);
+					}
+					else
+					{
+						// Output the value with quotes and escape characters
+						db.Append(leveltabs); db.Append(cs[i].Key); db.Append(spacing); db.Append("=");
+						db.Append(spacing); db.Append("\""); db.Append(EscapedString(cs[i].Value.ToString())); db.Append("\";"); db.Append(newline);
+					}
+				}
+			}
+			
+			// Return the structure
+			return db.ToString();
+		}
+		
+		#endregion
+		
+		#region ================== Public Methods
+		
+		// This clears the last error
+		public void ClearError()
+		{
+			// Clear error
+			cpErrorResult = 0;
+			cpErrorDescription = "";
+			cpErrorLine = 0;
+		}
+		
+		
+		// This creates a new configuration
+		public void NewConfiguration()
+		{
+			// Create new configuration
+			root = new UniversalCollection();
+		}
+		
+		
+		// This will save the current configuration to the specified file
+		public bool SaveConfiguration(string filename) { return SaveConfiguration(filename, "\r\n", true); }
+		public bool SaveConfiguration(string filename, string newline) { return SaveConfiguration(filename, newline, true); }
+		public bool SaveConfiguration(string filename, string newline, bool whitespace)
+		{
+			// Kill the file if it exists
+			if(File.Exists(filename)) File.Delete(filename);
+			
+			// Open file stream for writing
+			FileStream fstream = File.OpenWrite(filename);
+			
+			// Create output structure and write to file
+			string data = OutputConfiguration(newline, whitespace);
+			byte[] baData= Encoding.ASCII.GetBytes(data);
+			fstream.Write(baData, 0, baData.Length);
+			fstream.Flush();
+			fstream.Close();
+			
+			// Return true when done, false when errors occurred
+			return cpErrorResult == 0;
+		}
+		
+		
+		// This will output the current configuration as a string
+		public string OutputConfiguration() { return OutputConfiguration("\r\n", true); }
+		public string OutputConfiguration(string newline) { return OutputConfiguration(newline, true); }
+		public string OutputConfiguration(string newline, bool whitespace)
+		{
+			// Simply return the configuration structure as string
+			return OutputStructure(root, 0, newline, whitespace);
+		}
+		
+		
+		// This will load a configuration from file
+		public bool LoadConfiguration(string filename)
+		{
+			// Check if the file is missing
+			if(!File.Exists(filename))
+			{
+				throw(new FileNotFoundException("File not found \"" + filename + "\"", filename));
+			}
+			else
+			{
+				// Load the file contents
+				List<string> data = new List<string>(100);
+				using(FileStream stream = File.OpenRead(filename)) 
+				{
+					StreamReader reader = new StreamReader(stream, Encoding.ASCII);
+					
+					while(!reader.EndOfStream) 
+					{
+						string line = reader.ReadLine();
+						if(string.IsNullOrEmpty(line)) continue;
+						data.Add(line);
+					}
+				}
+
+				// Load the configuration from this data
+				return InputConfiguration(data.ToArray());
+			}
+		}
+		
+		
+		// This will load a configuration from string
+		public bool InputConfiguration(string[] data)
+		{
+			// Clear errors
+			ClearError();
+			
+			// Parse the data to the root structure
+			int pos = 0;
+			int line = 0; //mxd
+			matches = new Dictionary<string, UniversalEntry>(StringComparer.Ordinal); //mxd
+			key = new StringBuilder(16); //mxd
+			val = new StringBuilder(16); //mxd
+			root = InputStructure(ref data, ref pos, ref line, true);
+			
+			// Return true when done, false when errors occurred
+			return (cpErrorResult == 0);
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/IO/UniversalStreamReader.cs b/Source/Core/IO/UniversalStreamReader.cs
new file mode 100644
index 0000000..30b1604
--- /dev/null
+++ b/Source/Core/IO/UniversalStreamReader.cs
@@ -0,0 +1,613 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.IO;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Types;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.IO
+{
+	internal class UniversalStreamReader
+	{
+		#region ================== Constants
+
+		// Name of the UDMF configuration file
+		private const string UDMF_CONFIG_NAME = "UDMF.cfg";
+
+		#endregion
+
+		#region ================== Variables
+
+		private readonly Configuration config;
+		private bool setknowncustomtypes;
+		private bool strictchecking = true;
+		private readonly Dictionary<MapElementType, Dictionary<string, UniversalType>> uifields; //mxd
+		
+		#endregion
+
+		#region ================== Properties
+
+		public bool SetKnownCustomTypes { get { return setknowncustomtypes; } set { setknowncustomtypes = value; } }
+		public bool StrictChecking { get { return strictchecking; } set { strictchecking = value; } }
+		
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public UniversalStreamReader(Dictionary<MapElementType, Dictionary<string, UniversalType>> uifields)
+		{
+			this.uifields = uifields;
+			
+			// Make configuration
+			config = new Configuration();
+			
+			// Find a resource named UDMF.cfg
+			string[] resnames = General.ThisAssembly.GetManifestResourceNames();
+			foreach(string rn in resnames)
+			{
+				// Found it?
+				if(rn.EndsWith(UDMF_CONFIG_NAME, StringComparison.InvariantCultureIgnoreCase))
+				{
+					// Get a stream from the resource
+					Stream udmfcfg = General.ThisAssembly.GetManifestResourceStream(rn);
+					StreamReader udmfcfgreader = new StreamReader(udmfcfg, Encoding.ASCII);
+
+					// Load configuration from stream
+					config.InputConfiguration(udmfcfgreader.ReadToEnd());
+
+					// Now we add the linedef flags, activations and thing flags
+					// to this list, so that these don't show up in the custom
+					// fields list either. We use true as dummy value (it has no meaning)
+
+					// Add linedef flags
+					foreach(KeyValuePair<string, string> flag in General.Map.Config.LinedefFlags)
+						config.WriteSetting("managedfields.linedef." + flag.Key, true);
+
+					// Add linedef activations
+					foreach(LinedefActivateInfo activate in General.Map.Config.LinedefActivates)
+						config.WriteSetting("managedfields.linedef." + activate.Key, true);
+					
+					// Add linedef flag translations
+					foreach(FlagTranslation f in General.Map.Config.LinedefFlagsTranslation)
+					{
+						foreach(string fn in f.Fields)
+							config.WriteSetting("managedfields.linedef." + fn, true);
+					}
+
+					//mxd. Add sidedef flags
+					foreach(KeyValuePair<string, string> flag in General.Map.Config.SidedefFlags)
+						config.WriteSetting("managedfields.sidedef." + flag.Key, true);
+
+					//mxd. Add sector flags
+					foreach(KeyValuePair<string, string> flag in General.Map.Config.SectorFlags)
+						config.WriteSetting("managedfields.sector." + flag.Key, true);
+
+					// Add thing flags
+					foreach(KeyValuePair<string, string> flag in General.Map.Config.ThingFlags)
+						config.WriteSetting("managedfields.thing." + flag.Key, true);
+
+					// Add thing flag translations
+					foreach(FlagTranslation f in General.Map.Config.ThingFlagsTranslation)
+					{
+						foreach(string fn in f.Fields)
+							config.WriteSetting("managedfields.thing." + fn, true);
+					}
+
+					// Done
+					udmfcfgreader.Dispose();
+					udmfcfg.Dispose();
+					break;
+				}
+			}
+		}
+
+		#endregion
+
+		#region ================== Reading
+
+		// This reads from a stream
+		public void Read(MapSet map, Stream stream)
+		{
+			StreamReader reader = new StreamReader(stream, Encoding.ASCII);
+			UniversalParser textmap = new UniversalParser();
+			textmap.StrictChecking = strictchecking;
+			
+			// Read UDMF from stream
+			List<string> data = new List<string>(1000);
+			while(!reader.EndOfStream) data.Add(reader.ReadLine());
+
+			// Parse it
+			textmap.InputConfiguration(data.ToArray());
+
+			// Check for errors
+			if(textmap.ErrorResult != 0)
+			{
+				//mxd. Throw parse error
+				throw new Exception("Error on line " + textmap.ErrorLine + " while parsing UDMF map data:\n" + textmap.ErrorDescription);
+			}
+
+			// Read the map
+			Dictionary<int, Vertex> vertexlink = ReadVertices(map, textmap);
+			Dictionary<int, Sector> sectorlink = ReadSectors(map, textmap);
+			ReadLinedefs(map, textmap, vertexlink, sectorlink);
+			ReadThings(map, textmap);
+		}
+
+		// This reads the things
+		private void ReadThings(MapSet map, UniversalParser textmap)
+		{
+			// Get list of entries
+			List<UniversalCollection> collections = GetNamedCollections(textmap.Root, "thing");
+
+			// Go for all collections
+			map.SetCapacity(0, 0, 0, 0, map.Things.Count + collections.Count);
+			for(int i = 0; i < collections.Count; i++)
+			{
+				// Read fields
+				UniversalCollection c = collections[i];
+				int[] args = new int[Linedef.NUM_ARGS];
+				string where = "thing " + i;
+				float x = GetCollectionEntry(c, "x", true, 0.0f, where);
+				float y = GetCollectionEntry(c, "y", true, 0.0f, where);
+				float height = GetCollectionEntry(c, "height", false, 0.0f, where);
+				int tag = GetCollectionEntry(c, "id", false, 0, where);
+				int angledeg = GetCollectionEntry(c, "angle", false, 0, where);
+				int pitch = GetCollectionEntry(c, "pitch", false, 0, where); //mxd
+				int roll = GetCollectionEntry(c, "roll", false, 0, where); //mxd
+				float scaleX = GetCollectionEntry(c, "scalex", false, 1.0f, where); //mxd
+				float scaleY = GetCollectionEntry(c, "scaley", false, 1.0f, where); //mxd
+				float scale = GetCollectionEntry(c, "scale", false, 0f, where); //mxd
+				int type = GetCollectionEntry(c, "type", true, 0, where);
+				int special = GetCollectionEntry(c, "special", false, 0, where);
+				args[0] = GetCollectionEntry(c, "arg0", false, 0, where);
+				args[1] = GetCollectionEntry(c, "arg1", false, 0, where);
+				args[2] = GetCollectionEntry(c, "arg2", false, 0, where);
+				args[3] = GetCollectionEntry(c, "arg3", false, 0, where);
+				args[4] = GetCollectionEntry(c, "arg4", false, 0, where);
+
+				if(scale != 0) //mxd
+				{
+					scaleX = scale;
+					scaleY = scale;
+				}
+
+				// Flags
+				Dictionary<string, bool> stringflags = new Dictionary<string, bool>(StringComparer.Ordinal);
+				foreach(KeyValuePair<string, string> flag in General.Map.Config.ThingFlags)
+					stringflags[flag.Key] = GetCollectionEntry(c, flag.Key, false, false, where);
+				foreach(FlagTranslation ft in General.Map.Config.ThingFlagsTranslation)
+				{
+					foreach(string field in ft.Fields)
+						stringflags[field] = GetCollectionEntry(c, field, false, false, where);
+				}
+
+				// Create new item
+				Thing t = map.CreateThing();
+				if(t != null)
+				{
+					t.Update(type, x, y, height, angledeg, pitch, roll, scaleX, scaleY, stringflags, tag, special, args);
+
+					// Custom fields
+					ReadCustomFields(c, t, "thing");
+				}
+			}
+		}
+
+		// This reads the linedefs and sidedefs
+		private void ReadLinedefs(MapSet map, UniversalParser textmap,
+			Dictionary<int, Vertex> vertexlink, Dictionary<int, Sector> sectorlink)
+		{
+			// Get list of entries
+			List<UniversalCollection> linescolls = GetNamedCollections(textmap.Root, "linedef");
+			List<UniversalCollection> sidescolls = GetNamedCollections(textmap.Root, "sidedef");
+
+			// Go for all lines
+			map.SetCapacity(0, map.Linedefs.Count + linescolls.Count, map.Sidedefs.Count + sidescolls.Count, 0, 0);
+			char[] splitter = new[] { ' ' }; //mxd
+			for(int i = 0; i < linescolls.Count; i++)
+			{
+				// Read fields
+				UniversalCollection lc = linescolls[i];
+				int[] args = new int[Linedef.NUM_ARGS];
+				string where = "linedef " + i;
+				int v1 = GetCollectionEntry(lc, "v1", true, 0, where);
+				int v2 = GetCollectionEntry(lc, "v2", true, 0, where);
+
+				if(!vertexlink.ContainsKey(v1) || !vertexlink.ContainsKey(v2)) { //mxd
+					General.ErrorLogger.Add(ErrorType.Warning, "Linedef " + i + " references one or more invalid vertices. Linedef has been removed.");
+					continue;
+				}
+
+				int tag = GetCollectionEntry(lc, "id", false, 0, where);
+				int special = GetCollectionEntry(lc, "special", false, 0, where);
+				args[0] = GetCollectionEntry(lc, "arg0", false, 0, where);
+				args[1] = GetCollectionEntry(lc, "arg1", false, 0, where);
+				args[2] = GetCollectionEntry(lc, "arg2", false, 0, where);
+				args[3] = GetCollectionEntry(lc, "arg3", false, 0, where);
+				args[4] = GetCollectionEntry(lc, "arg4", false, 0, where);
+				int s1 = GetCollectionEntry(lc, "sidefront", true, -1, where);
+				int s2 = GetCollectionEntry(lc, "sideback", false, -1, where);
+
+				//mxd. MoreIDs
+				List<int> tags = new List<int> { tag };
+				string moreids = GetCollectionEntry(lc, "moreids", false, string.Empty, where);
+				if(!string.IsNullOrEmpty(moreids))
+				{
+					string[] moreidscol = moreids.Split(splitter, StringSplitOptions.RemoveEmptyEntries);
+					foreach(string sid in moreidscol)
+					{
+						int id;
+						if(int.TryParse(sid.Trim(), out id) && id != 0 && !tags.Contains(id))
+						{
+							tags.Add(id);
+						}
+					}
+				}
+				if(tag == 0 && tags.Count > 1) tags.RemoveAt(0);
+
+				// Flags
+				Dictionary<string, bool> stringflags = new Dictionary<string, bool>(StringComparer.Ordinal);
+				foreach(KeyValuePair<string, string> flag in General.Map.Config.LinedefFlags)
+					stringflags[flag.Key] = GetCollectionEntry(lc, flag.Key, false, false, where);
+				foreach(FlagTranslation ft in General.Map.Config.LinedefFlagsTranslation)
+				{
+					foreach(string field in ft.Fields)
+						stringflags[field] = GetCollectionEntry(lc, field, false, false, where);
+				}
+				
+				// Activations
+				foreach(LinedefActivateInfo activate in General.Map.Config.LinedefActivates)
+					stringflags[activate.Key] = GetCollectionEntry(lc, activate.Key, false, false, where);
+
+				// Check if not zero-length
+				if(Vector2D.ManhattanDistance(vertexlink[v1].Position, vertexlink[v2].Position) > 0.0001f) 
+				{
+					// Create new linedef
+					Linedef l = map.CreateLinedef(vertexlink[v1], vertexlink[v2]);
+					if(l != null)
+					{
+						l.Update(stringflags, 0, tags, special, args);
+						l.UpdateCache();
+
+						// Custom fields
+						ReadCustomFields(lc, l, "linedef");
+
+						// Read sidedefs and connect them to the line
+						if(s1 > -1)
+						{
+							if(s1 < sidescolls.Count) 
+								ReadSidedef(map, sidescolls[s1], l, true, sectorlink, s1);
+							else
+								General.ErrorLogger.Add(ErrorType.Warning, "Linedef " + i + " references invalid front sidedef " + s1 + ". Sidedef has been removed.");
+						}
+
+						if(s2 > -1)
+						{
+							if(s2 < sidescolls.Count) 
+								ReadSidedef(map, sidescolls[s2], l, false, sectorlink, s2);
+							else
+								General.ErrorLogger.Add(ErrorType.Warning, "Linedef " + i + " references invalid back sidedef " + s1 + ". Sidedef has been removed.");
+						}
+					}
+				} 
+				else 
+				{
+					General.ErrorLogger.Add(ErrorType.Warning, "Linedef " + i + " is zero-length. Linedef has been removed.");
+				}
+			}
+		}
+
+		// This reads a single sidedef and connects it to the given linedef
+		private void ReadSidedef(MapSet map, UniversalCollection sc, Linedef ld,
+								 bool front, Dictionary<int, Sector> sectorlink, int index)
+		{
+			// Read fields
+			string where = "linedef " + ld.Index + (front ? " front sidedef " : " back sidedef ") + index;
+			int offsetx = GetCollectionEntry(sc, "offsetx", false, 0, where);
+			int offsety = GetCollectionEntry(sc, "offsety", false, 0, where);
+			string thigh = GetCollectionEntry(sc, "texturetop", false, "-", where);
+			string tlow = GetCollectionEntry(sc, "texturebottom", false, "-", where);
+			string tmid = GetCollectionEntry(sc, "texturemiddle", false, "-", where);
+			int sector = GetCollectionEntry(sc, "sector", true, 0, where);
+
+			//mxd. Flags
+			Dictionary<string, bool> stringflags = new Dictionary<string, bool>(StringComparer.Ordinal);
+			foreach(KeyValuePair<string, string> flag in General.Map.Config.SidedefFlags)
+				stringflags[flag.Key] = GetCollectionEntry(sc, flag.Key, false, false, where);
+
+			// Create sidedef
+			if(sectorlink.ContainsKey(sector))
+			{
+				Sidedef s = map.CreateSidedef(ld, front, sectorlink[sector]);
+				if(s != null)
+				{
+					s.Update(offsetx, offsety, thigh, tmid, tlow, stringflags);
+
+					// Custom fields
+					ReadCustomFields(sc, s, "sidedef");
+				}
+			}
+			else
+			{
+				General.ErrorLogger.Add(ErrorType.Warning, "Sidedef references invalid sector " + sector + ". Sidedef has been removed.");
+			}
+		}
+
+		// This reads the sectors
+		private Dictionary<int, Sector> ReadSectors(MapSet map, UniversalParser textmap)
+		{
+			// Get list of entries
+			List<UniversalCollection> collections = GetNamedCollections(textmap.Root, "sector");
+
+			// Create lookup table
+			Dictionary<int, Sector> link = new Dictionary<int, Sector>(collections.Count);
+
+			// Go for all collections
+			map.SetCapacity(0, 0, 0, map.Sectors.Count + collections.Count, 0);
+			char[] splitter = new[] { ' ' }; //mxd
+			for(int i = 0; i < collections.Count; i++)
+			{
+				// Read fields
+				UniversalCollection c = collections[i];
+				string where = "sector " + i;
+				int hfloor = GetCollectionEntry(c, "heightfloor", false, 0, where);
+				int hceil = GetCollectionEntry(c, "heightceiling", false, 0, where);
+				string tfloor = GetCollectionEntry(c, "texturefloor", true, "-", where);
+				string tceil = GetCollectionEntry(c, "textureceiling", true, "-", where);
+				int bright = GetCollectionEntry(c, "lightlevel", false, 160, where);
+				int special = GetCollectionEntry(c, "special", false, 0, where);
+				int tag = GetCollectionEntry(c, "id", false, 0, where);
+
+				//mxd. MoreIDs
+				List<int> tags = new List<int> { tag };
+				string moreids = GetCollectionEntry(c, "moreids", false, string.Empty, where);
+				if(!string.IsNullOrEmpty(moreids)) 
+				{
+					string[] moreidscol = moreids.Split(splitter, StringSplitOptions.RemoveEmptyEntries);
+					foreach(string sid in moreidscol)
+					{
+						int id;
+						if(int.TryParse(sid.Trim(), out id) && id != 0 && !tags.Contains(id)) 
+						{
+							tags.Add(id);
+						}
+					}
+				}
+				if(tag == 0 && tags.Count > 1) tags.RemoveAt(0);
+
+				//mxd. Read slopes
+				float fslopex = GetCollectionEntry(c, "floorplane_a", false, 0.0f, where);
+				float fslopey = GetCollectionEntry(c, "floorplane_b", false, 0.0f, where);
+				float fslopez = GetCollectionEntry(c, "floorplane_c", false, 0.0f, where);
+				float foffset = GetCollectionEntry(c, "floorplane_d", false, float.NaN, where);
+
+				float cslopex = GetCollectionEntry(c, "ceilingplane_a", false, 0.0f, where);
+				float cslopey = GetCollectionEntry(c, "ceilingplane_b", false, 0.0f, where);
+				float cslopez = GetCollectionEntry(c, "ceilingplane_c", false, 0.0f, where);
+				float coffset = GetCollectionEntry(c, "ceilingplane_d", false, float.NaN, where);
+
+				//mxd. Read flags
+				Dictionary<string, bool> stringflags = new Dictionary<string, bool>(StringComparer.Ordinal);
+				foreach(KeyValuePair<string, string> flag in General.Map.Config.SectorFlags)
+					stringflags[flag.Key] = GetCollectionEntry(c, flag.Key, false, false, where);
+
+				// Create new item
+				Sector s = map.CreateSector();
+				if(s != null)
+				{
+					s.Update(hfloor, hceil, tfloor, tceil, special, stringflags, tags, bright, foffset, new Vector3D(fslopex, fslopey, fslopez).GetNormal(), coffset, new Vector3D(cslopex, cslopey, cslopez).GetNormal());
+
+					// Custom fields
+					ReadCustomFields(c, s, "sector");
+
+					// Add it to the lookup table
+					link.Add(i, s);
+				}
+			}
+
+			// Return lookup table
+			return link;
+		}
+
+		// This reads the vertices
+		private Dictionary<int, Vertex> ReadVertices(MapSet map, UniversalParser textmap)
+		{
+			// Get list of entries
+			List<UniversalCollection> collections = GetNamedCollections(textmap.Root, "vertex");
+
+			// Create lookup table
+			Dictionary<int, Vertex> link = new Dictionary<int, Vertex>(collections.Count);
+
+			// Go for all collections
+			map.SetCapacity(map.Vertices.Count + collections.Count, 0, 0, 0, 0);
+			for(int i = 0; i < collections.Count; i++)
+			{
+				// Read fields
+				UniversalCollection c = collections[i];
+				string where = "vertex " + i;
+				float x = GetCollectionEntry(c, "x", true, 0.0f, where);
+				float y = GetCollectionEntry(c, "y", true, 0.0f, where);
+
+				// Create new item
+				Vertex v = map.CreateVertex(new Vector2D(x, y));
+				if(v != null)
+				{
+					//mxd. zoffsets
+					v.ZCeiling = GetCollectionEntry(c, "zceiling", false, float.NaN, where); //mxd
+					v.ZFloor = GetCollectionEntry(c, "zfloor", false, float.NaN, where); //mxd
+					
+					// Custom fields
+					ReadCustomFields(c, v, "vertex");
+
+					// Add it to the lookup table
+					link.Add(i, v);
+				}
+			}
+
+			// Return lookup table
+			return link;
+		}
+
+		// This reads custom fields from a collection and adds them to a map element
+		private void ReadCustomFields(UniversalCollection collection, MapElement element, string elementname)
+		{
+			element.Fields.BeforeFieldsChange();
+			
+			// Go for all the elements in the collection
+			foreach(UniversalEntry e in collection)
+			{
+				// mxd. Check if uifield
+				if(uifields.ContainsKey(element.ElementType) && uifields[element.ElementType].ContainsKey(e.Key)) 
+				{
+					int type = (int)uifields[element.ElementType][e.Key];
+
+					//mxd. Check type
+					object value = e.Value;
+
+					// Let's be kind and cast any int to a float if needed
+					if(type == (int)UniversalType.Float && e.Value is int) 
+					{
+						value = (float)(int)e.Value;
+					} 
+					else if(!e.IsValidType(e.Value.GetType())) 
+					{
+						General.ErrorLogger.Add(ErrorType.Warning, element + ": the value of entry '" + e.Key + "' is of incompatible type (expected " + e.GetType().Name + ", but got " + e.Value.GetType().Name + "). If you save the map, this value will be ignored.");
+						continue;
+					}
+
+					// Make custom field
+					element.Fields[e.Key] = new UniValue(type, value);
+
+				} // Check if not a managed field
+				else if(!config.SettingExists("managedfields." + elementname + "." + e.Key)) 
+				{
+					int type = (int)UniversalType.Integer;
+
+					//mxd. Try to find the type from configuration
+					if(setknowncustomtypes) 
+					{
+						type = General.Map.Config.ReadSetting("universalfields." + elementname + "." + e.Key + ".type", -1);
+
+						if(type != -1) 
+						{
+							object value = e.Value;
+
+							// Let's be kind and cast any int to a float if needed
+							if(type == (int)UniversalType.Float && e.Value is int) 
+							{
+								value = (float)(int)e.Value;
+							} 
+							else if(!e.IsValidType(e.Value.GetType())) 
+							{
+								General.ErrorLogger.Add(ErrorType.Warning, element + ": the value of entry '" + e.Key + "' is of incompatible type (expected " + e.GetType().Name + ", but got " + e.Value.GetType().Name + "). If you save the map, this value will be ignored.");
+								continue;
+							}
+
+							// Make custom field
+							element.Fields[e.Key] = new UniValue(type, value);
+							continue;
+						}
+					}
+
+					// Determine default type
+					if(e.Value is int) type = (int)UniversalType.Integer;
+					else if(e.Value is float) type = (int)UniversalType.Float;
+					else if(e.Value is bool) type = (int)UniversalType.Boolean;
+					else if(e.Value is string) type = (int)UniversalType.String;
+
+					// Make custom field
+					element.Fields[e.Key] = new UniValue(type, e.Value);
+				}
+			}
+		}
+
+		// This validates and returns an entry
+		private static T GetCollectionEntry<T>(UniversalCollection c, string entryname, bool required, T defaultvalue, string where)
+		{
+			T result = default(T);
+			bool found = false;
+
+			// Find the entry
+			foreach(UniversalEntry e in c)
+			{
+				// Check if matches
+				if(e.Key == entryname)
+				{
+					// Let's be kind and cast any int to a float if needed
+					if((typeof(T) == typeof(float)) && (e.Value is int))
+					{
+						// Make it a float
+						object fvalue = (float)(int)e.Value;
+						result = (T)fvalue;
+					}
+					else
+					{
+						// Verify type
+						e.ValidateType(typeof(T));
+
+						// Found it!
+						result = (T)e.Value;
+					}
+
+					// Done
+					found = true;
+				}
+			}
+
+			// Not found?
+			if(!found)
+			{
+				// Report error when entry is required!
+				if(required)
+					General.ErrorLogger.Add(ErrorType.Error, "Error while reading UDMF map data: Missing required field '" + entryname + "' at " + where + ".");
+
+				// Make default entry
+				result = defaultvalue;
+			}
+
+			// Return result
+			return result;
+		}
+
+		// This makes a list of all collections with the given name
+		private static List<UniversalCollection> GetNamedCollections(UniversalCollection collection, string entryname)
+		{
+			List<UniversalCollection> list = new List<UniversalCollection>();
+
+			// Make list
+			foreach(UniversalEntry e in collection) 
+			{
+				if(!(e.Value is UniversalCollection) || (e.Key != entryname)) continue; //mxd
+				list.Add(e.Value as UniversalCollection);
+			}
+
+			return list;
+		}
+
+		#endregion
+	}
+}
+
diff --git a/Source/Core/IO/UniversalStreamWriter.cs b/Source/Core/IO/UniversalStreamWriter.cs
new file mode 100644
index 0000000..a010f38
--- /dev/null
+++ b/Source/Core/IO/UniversalStreamWriter.cs
@@ -0,0 +1,386 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.IO;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Config;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.IO
+{
+	internal class UniversalStreamWriter
+	{
+		#region ================== Constants
+
+		// Name of the UDMF configuration file
+		private const string UDMF_CONFIG_NAME = "UDMF.cfg";
+
+		#endregion
+
+		#region ================== Variables
+
+		private Configuration config;
+		private bool remembercustomtypes;
+		
+		#endregion
+
+		#region ================== Properties
+
+		public bool RememberCustomTypes { get { return remembercustomtypes; } set { remembercustomtypes = value; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public UniversalStreamWriter()
+		{
+			// Make configurations
+			config = new Configuration();
+			
+			// Find a resource named UDMF.cfg
+			string[] resnames = General.ThisAssembly.GetManifestResourceNames();
+			foreach(string rn in resnames)
+			{
+				// Found it?
+				if(rn.EndsWith(UDMF_CONFIG_NAME, StringComparison.InvariantCultureIgnoreCase))
+				{
+					// Get a stream from the resource
+					Stream udmfcfg = General.ThisAssembly.GetManifestResourceStream(rn);
+					StreamReader udmfcfgreader = new StreamReader(udmfcfg, Encoding.ASCII);
+
+					// Load configuration from stream
+					config.InputConfiguration(udmfcfgreader.ReadToEnd());
+
+					// Now we add the linedef flags, activations and thing flags
+					// to this list, so that these don't show up in the custom
+					// fields list either. We use true as dummy value (it has no meaning)
+
+					// Add linedef flags
+					foreach(KeyValuePair<string, string> flag in General.Map.Config.LinedefFlags)
+						config.WriteSetting("managedfields.linedef." + flag.Key, true);
+
+					// Add linedef activations
+					foreach(LinedefActivateInfo activate in General.Map.Config.LinedefActivates)
+						config.WriteSetting("managedfields.linedef." + activate.Key, true);
+
+					//mxd. Add sidedef flags
+					foreach(KeyValuePair<string, string> flag in General.Map.Config.SidedefFlags)
+						config.WriteSetting("managedfields.sidedef." + flag.Key, true);
+
+					//mxd. Add sector flags
+					foreach(KeyValuePair<string, string> flag in General.Map.Config.SectorFlags)
+						config.WriteSetting("managedfields.sector." + flag.Key, true);
+
+					// Add thing flags
+					foreach(KeyValuePair<string, string> flag in General.Map.Config.ThingFlags)
+						config.WriteSetting("managedfields.thing." + flag.Key, true);
+
+					// Done
+					udmfcfgreader.Dispose();
+					udmfcfg.Dispose();
+					break;
+				}
+			}
+		}
+
+		#endregion
+
+		#region ================== Writing
+
+		// This writes the structures to a stream
+		// writenamespace may be null to omit writing the namespace to the stream
+		public void Write(MapSet map, Stream stream, string writenamespace)
+		{
+			Write(map.Vertices, map.Linedefs, map.Sidedefs, map.Sectors, map.Things, stream, writenamespace);
+		}
+
+		// This writes the structures to a stream
+		// NOTE: writenamespace may be null to omit writing the namespace to the stream.
+		// NOTE: The given structures must be complete, with the exception of the sidedefs.
+		// If there are missing sidedefs, their reference will be removed from the linedefs.
+		public void Write(ICollection<Vertex> vertices, ICollection<Linedef> linedefs,
+						  ICollection<Sidedef> sidedefs, ICollection<Sector> sectors,
+						  ICollection<Thing> things, Stream stream, string writenamespace)
+		{
+			UniversalParser textmap = new UniversalParser();
+
+			// Begin with fields that must be at the top
+			if(writenamespace != null) textmap.Root.Add("namespace", writenamespace);
+
+			Dictionary<Vertex, int> vertexids = new Dictionary<Vertex, int>(vertices.Count); //mxd
+			Dictionary<Sidedef, int> sidedefids = new Dictionary<Sidedef, int>(sidedefs.Count); //mxd
+			Dictionary<Sector, int> sectorids = new Dictionary<Sector, int>(sectors.Count); //mxd
+
+			// Index the elements in the data structures
+			int counter = 0; //mxd
+			foreach(Vertex v in vertices) vertexids.Add(v, counter++);
+			counter = 0; //mxd
+			foreach(Sidedef sd in sidedefs) sidedefids.Add(sd, counter++);
+			counter = 0; //mxd
+			foreach(Sector s in sectors) sectorids.Add(s, counter++);
+
+			// If we write the custom field types again, then forget
+			// all previous field types (this gets rid of unused field types)
+			if(remembercustomtypes) General.Map.Options.ForgetUniversalFieldTypes();
+
+			// Write the data structures to textmap
+			WriteVertices(vertices, textmap);
+			WriteLinedefs(linedefs, textmap, sidedefids, vertexids);
+			WriteSidedefs(sidedefs, textmap, sectorids);
+			WriteSectors(sectors, textmap);
+			WriteThings(things, textmap);
+
+			// Get the textmap as string
+			string textmapstr = textmap.OutputConfiguration();
+
+			// Write to stream
+			StreamWriter writer = new StreamWriter(stream, Encoding.ASCII);
+			writer.Write(textmapstr);
+			writer.Flush();
+		}
+
+		// This adds vertices
+		private void WriteVertices(ICollection<Vertex> vertices, UniversalParser textmap)
+		{
+			// Go for all vertices
+			foreach(Vertex v in vertices)
+			{
+				// Make collection
+				UniversalCollection coll = new UniversalCollection();
+				coll.Add("x", v.Position.x);
+				coll.Add("y", v.Position.y);
+				if(!float.IsNaN(v.ZCeiling)) coll.Add("zceiling", v.ZCeiling); //mxd
+				if(!float.IsNaN(v.ZFloor)) coll.Add("zfloor", v.ZFloor); //mxd
+				coll.Comment = v.Index.ToString();
+
+				// Add custom fields
+				AddCustomFields(v, "vertex", coll);
+
+				// Store
+				textmap.Root.Add("vertex", coll);
+			}
+		}
+
+		// This adds linedefs
+		private void WriteLinedefs(ICollection<Linedef> linedefs, UniversalParser textmap, IDictionary<Sidedef, int> sidedefids, IDictionary<Vertex, int> vertexids)
+		{
+			// Go for all linedefs
+			foreach(Linedef l in linedefs)
+			{
+				// Make collection
+				UniversalCollection coll = new UniversalCollection();
+				if(l.Tag != 0) coll.Add("id", l.Tag);
+				coll.Add("v1", vertexids[l.Start]);
+				coll.Add("v2", vertexids[l.End]);
+				coll.Comment = l.Index.ToString();
+
+				//mxd. MoreIDs
+				if(l.Tags.Count > 1) //first entry is saved as "id"
+				{
+					string[] moreidscol = new string[l.Tags.Count - 1];
+					for(int i = 1; i < l.Tags.Count; i++)
+					{
+						moreidscol[i - 1] = l.Tags[i].ToString();
+					}
+					coll.Add("moreids", string.Join(" ", moreidscol));
+				}
+				
+				// Sidedef references
+				if((l.Front != null) && sidedefids.ContainsKey(l.Front))
+					coll.Add("sidefront", sidedefids[l.Front]);
+				else
+					coll.Add("sidefront", -1);
+				
+				if((l.Back != null) && sidedefids.ContainsKey(l.Back))
+					coll.Add("sideback", sidedefids[l.Back]);
+				else
+					coll.Add("sideback", -1);
+				
+				// Special
+				if(l.Action != 0) coll.Add("special", l.Action);
+				if(l.Args[0] != 0) coll.Add("arg0", l.Args[0]);
+				if(l.Args[1] != 0) coll.Add("arg1", l.Args[1]);
+				if(l.Args[2] != 0) coll.Add("arg2", l.Args[2]);
+				if(l.Args[3] != 0) coll.Add("arg3", l.Args[3]);
+				if(l.Args[4] != 0) coll.Add("arg4", l.Args[4]);
+
+				// Flags
+				foreach(KeyValuePair<string, bool> flag in l.Flags)
+					if(flag.Value) coll.Add(flag.Key, flag.Value);
+
+				// Add custom fields
+				AddCustomFields(l, "linedef", coll);
+
+				// Store
+				textmap.Root.Add("linedef", coll);
+			}
+		}
+
+		// This adds sidedefs
+		private void WriteSidedefs(ICollection<Sidedef> sidedefs, UniversalParser textmap, IDictionary<Sector, int> sectorids)
+		{
+			// Go for all sidedefs
+			foreach(Sidedef s in sidedefs)
+			{
+				// Make collection
+				UniversalCollection coll = new UniversalCollection();
+				if(s.OffsetX != 0) coll.Add("offsetx", s.OffsetX);
+				if(s.OffsetY != 0) coll.Add("offsety", s.OffsetY);
+				if(s.LongHighTexture != MapSet.EmptyLongName) coll.Add("texturetop", s.HighTexture);
+				if(s.LongLowTexture != MapSet.EmptyLongName) coll.Add("texturebottom", s.LowTexture);
+				if(s.LongMiddleTexture != MapSet.EmptyLongName) coll.Add("texturemiddle", s.MiddleTexture);
+				coll.Add("sector", sectorids[s.Sector]);
+				coll.Comment = s.Index.ToString();
+
+				//mxd. Flags
+				foreach(KeyValuePair<string, bool> flag in s.Flags)
+					if(flag.Value) coll.Add(flag.Key, flag.Value);
+				
+				// Add custom fields
+				AddCustomFields(s, "sidedef", coll);
+
+				// Store
+				textmap.Root.Add("sidedef", coll);
+			}
+		}
+
+		// This adds sectors
+		private void WriteSectors(ICollection<Sector> sectors, UniversalParser textmap)
+		{
+			// Go for all sectors
+			foreach(Sector s in sectors)
+			{
+				// Make collection
+				UniversalCollection coll = new UniversalCollection();
+				coll.Add("heightfloor", s.FloorHeight);
+				coll.Add("heightceiling", s.CeilHeight);
+				coll.Add("texturefloor", s.FloorTexture);
+				coll.Add("textureceiling", s.CeilTexture);
+				coll.Add("lightlevel", s.Brightness);
+				if(s.Effect != 0) coll.Add("special", s.Effect);
+				if(s.Tag != 0) coll.Add("id", s.Tag);
+				coll.Comment = s.Index.ToString();
+
+				//mxd. MoreIDs
+				if(s.Tags.Count > 1) //first entry is saved as "id"
+				{
+					string[] moreidscol = new string[s.Tags.Count - 1];
+					for(int i = 1; i < s.Tags.Count; i++) 
+					{
+						moreidscol[i - 1] = s.Tags[i].ToString();
+					}
+					coll.Add("moreids", string.Join(" ", moreidscol));
+				}
+
+				//mxd. Slopes
+				if(s.FloorSlope.GetLengthSq() > 0) 
+				{
+					coll.Add("floorplane_a", Math.Round(s.FloorSlope.x, Sector.SLOPE_DECIMALS));
+					coll.Add("floorplane_b", Math.Round(s.FloorSlope.y, Sector.SLOPE_DECIMALS));
+					coll.Add("floorplane_c", Math.Round(s.FloorSlope.z, Sector.SLOPE_DECIMALS));
+					coll.Add("floorplane_d",
+						(float.IsNaN(s.FloorSlopeOffset) ? 0f : Math.Round(s.FloorSlopeOffset, Sector.SLOPE_DECIMALS)));
+				}
+
+				if(s.CeilSlope.GetLengthSq() > 0) 
+				{
+					coll.Add("ceilingplane_a", Math.Round(s.CeilSlope.x, Sector.SLOPE_DECIMALS));
+					coll.Add("ceilingplane_b", Math.Round(s.CeilSlope.y, Sector.SLOPE_DECIMALS));
+					coll.Add("ceilingplane_c", Math.Round(s.CeilSlope.z, Sector.SLOPE_DECIMALS));
+					coll.Add("ceilingplane_d",
+						(float.IsNaN(s.CeilSlopeOffset) ? 0f : Math.Round(s.CeilSlopeOffset, Sector.SLOPE_DECIMALS)));
+				}
+
+				//mxd. Flags
+				foreach(KeyValuePair<string, bool> flag in s.Flags)
+					if(flag.Value) coll.Add(flag.Key, flag.Value);
+
+				// Add custom fields
+				AddCustomFields(s, "sector", coll);
+
+				// Store
+				textmap.Root.Add("sector", coll);
+			}
+		}
+
+		// This adds things
+		private void WriteThings(ICollection<Thing> things, UniversalParser textmap)
+		{
+			// Go for all things
+			foreach(Thing t in things)
+			{
+				// Make collection
+				UniversalCollection coll = new UniversalCollection();
+				if(t.Tag != 0) coll.Add("id", t.Tag);
+				coll.Add("x", t.Position.x);
+				coll.Add("y", t.Position.y);
+				if(t.Position.z != 0.0f) coll.Add("height", t.Position.z);
+				coll.Add("angle", t.AngleDoom);
+				if(t.Pitch != 0) coll.Add("pitch", t.Pitch); //mxd
+				if(t.Roll != 0) coll.Add("roll", t.Roll); //mxd
+				if(t.ScaleX != 0 && t.ScaleX != 1.0f) coll.Add("scalex", t.ScaleX); //mxd
+				if(t.ScaleY != 0 && t.ScaleY != 1.0f) coll.Add("scaley", t.ScaleY); //mxd
+				coll.Add("type", t.Type);
+				if(t.Action != 0) coll.Add("special", t.Action);
+				if(t.Args[0] != 0) coll.Add("arg0", t.Args[0]);
+				if(t.Args[1] != 0) coll.Add("arg1", t.Args[1]);
+				if(t.Args[2] != 0) coll.Add("arg2", t.Args[2]);
+				if(t.Args[3] != 0) coll.Add("arg3", t.Args[3]);
+				if(t.Args[4] != 0) coll.Add("arg4", t.Args[4]);
+				coll.Comment = t.Index.ToString();
+
+				// Flags
+				foreach(KeyValuePair<string, bool> flag in t.Flags)
+					if(flag.Value) coll.Add(flag.Key, flag.Value);
+
+				// Add custom fields
+				AddCustomFields(t, "thing", coll);
+
+				// Store
+				textmap.Root.Add("thing", coll);
+			}
+		}
+
+		// This adds custom fields from a map element to a collection
+		private void AddCustomFields(MapElement element, string elementname, UniversalCollection collection)
+		{
+			// Add custom fields
+			foreach(KeyValuePair<string, UniValue> f in element.Fields)
+			{
+				// Not a managed field?
+				if(!config.SettingExists("managedfields." + elementname + "." + f.Key))
+				{
+					// Add type information to DBS file for map
+					if(remembercustomtypes)
+						General.Map.Options.SetUniversalFieldType(elementname, f.Key, f.Value.Type);
+
+					// Store field
+					collection.Add(f.Key, f.Value.Value);
+				}
+			}
+		}
+
+		#endregion
+	}
+}
+
diff --git a/Source/Core/IO/UnknownImageReader.cs b/Source/Core/IO/UnknownImageReader.cs
new file mode 100644
index 0000000..edbe2d8
--- /dev/null
+++ b/Source/Core/IO/UnknownImageReader.cs
@@ -0,0 +1,102 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.IO;
+using System.Drawing;
+using CodeImp.DoomBuilder.Rendering;
+using System.Drawing.Imaging;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.IO
+{
+	internal class UnknownImageReader : IImageReader
+	{
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public UnknownImageReader()
+		{
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This creates a Bitmap from the given data
+		// Returns null on failure
+		public Bitmap ReadAsBitmap(Stream stream, out int offsetx, out int offsety)
+		{
+			offsetx = int.MinValue;
+			offsety = int.MinValue;
+			return ReadAsBitmap(stream);
+		}
+
+		// This reads the image and returns a Bitmap
+		public Bitmap ReadAsBitmap(Stream stream)
+		{
+			return new Bitmap(Properties.Resources.Failed);
+		}
+
+		// This reads the image and returns a Bitmap
+		/*public static Bitmap ReadAsBitmap() //mxd. Never used
+		{
+			return new Bitmap(Properties.Resources.Failed);
+		}*/
+
+		// This draws the picture to the given pixel color data
+		// Throws exception on failure
+		public unsafe void DrawToPixelData(Stream stream, PixelColor* target, int targetwidth, int targetheight, int x, int y)
+		{
+			// Get bitmap
+			Bitmap bmp = ReadAsBitmap(stream);
+			int width = bmp.Size.Width;
+			int height = bmp.Size.Height;
+
+			// Lock bitmap pixels
+			BitmapData bmpdata = bmp.LockBits(new Rectangle(0, 0, width, height), ImageLockMode.ReadOnly, PixelFormat.Format32bppArgb);
+			PixelColor* pixels = (PixelColor*)bmpdata.Scan0.ToPointer();
+
+			// Go for all pixels in the original image
+			for(int ox = 0; ox < width; ox++)
+			{
+				for(int oy = 0; oy < height; oy++)
+				{
+					// Copy this pixel?
+					if(pixels[oy * width + ox].a > 0.5f)
+					{
+						// Calculate target pixel and copy when within bounds
+						int tx = x + ox;
+						int ty = y + oy;
+						if((tx >= 0) && (tx < targetwidth) && (ty >= 0) && (ty < targetheight))
+							target[ty * targetwidth + tx] = pixels[oy * width + ox];
+					}
+				}
+			}
+
+			// Done
+			bmp.UnlockBits(bmpdata);
+			bmp.Dispose();
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/IO/WAD.cs b/Source/Core/IO/WAD.cs
new file mode 100644
index 0000000..9cc35f4
--- /dev/null
+++ b/Source/Core/IO/WAD.cs
@@ -0,0 +1,380 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.IO;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.IO
+{
+	internal class WAD
+	{
+		#region ================== Constants
+
+		// WAD types
+		public const string TYPE_IWAD = "IWAD";
+		public const string TYPE_PWAD = "PWAD";
+		
+		// Encoder
+		public static readonly Encoding ENCODING = Encoding.ASCII;
+		
+		#endregion
+
+		#region ================== Variables
+
+		// File objects
+		private string filename;
+		private FileStream file;
+		private BinaryReader reader;
+		private BinaryWriter writer;
+		
+		// Header
+		private string type;
+		private int numlumps;
+		private int lumpsoffset;
+		
+		// Lumps
+		private List<Lump> lumps;
+		
+		// Status
+		private readonly bool isreadonly;
+		private bool isdisposed;
+
+		#endregion
+
+		#region ================== Properties
+
+		public string Filename { get { return filename; } }
+		public string Type { get { return type; } }
+		public Encoding Encoding { get { return ENCODING; } }
+		public bool IsReadOnly { get { return isreadonly; } }
+		public bool IsDisposed { get { return isdisposed; } }
+		public List<Lump> Lumps { get { return lumps; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor to open or create a WAD file
+		public WAD(string pathfilename)
+		{
+			// Initialize
+			this.isreadonly = false;
+			this.Open(pathfilename);
+		}
+
+		// Constructor to open or create a WAD file
+		public WAD(string pathfilename, bool openreadonly)
+		{
+			// Initialize
+			this.isreadonly = openreadonly;
+			this.Open(pathfilename);
+		}
+
+		// Destructor
+		/*~WAD()
+		{
+			// Make sure everything is disposed
+			this.Dispose();
+		}*/
+		
+		// Disposer
+		public void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Only possible when not read-only
+				if(!isreadonly)
+				{
+					// Flush writing changes
+					if(writer != null) writer.Flush();
+					if(file != null) file.Flush();
+				}
+				
+				// Clean up
+				if(lumps != null) foreach(Lump l in lumps) l.Dispose();
+				if(writer != null) writer.Close();
+				if(reader != null) reader.Close();
+				if(file != null) file.Dispose();
+				
+				// Done
+				isdisposed = true;
+				GC.SuppressFinalize(this); //mxd
+			}
+		}
+
+		#endregion
+
+		#region ================== IO
+
+		// Open a WAD file
+		private void Open(string pathfilename)
+		{
+			FileAccess access;
+			FileShare share;
+			
+			// Determine if opening for read only
+			if(isreadonly)
+			{
+				// Read only
+				access = FileAccess.Read;
+				share = FileShare.ReadWrite;
+			}
+			else
+			{
+				// Private access
+				access = FileAccess.ReadWrite;
+				share = FileShare.Read;
+			}
+			
+			// Keep filename
+			filename = pathfilename;
+			
+			// Open the file stream
+			file = File.Open(pathfilename, FileMode.OpenOrCreate, access, share);
+
+			// Create file handling tools
+			reader = new BinaryReader(file, ENCODING);
+			if(!isreadonly) writer = new BinaryWriter(file, ENCODING);
+
+			// Is the WAD file zero length?
+			if(file.Length == 0)
+			{
+				// Create the headers in file
+				CreateHeaders();
+			}
+			else
+			{
+				// Read information from file
+				ReadHeaders();
+			}
+		}
+
+		// This creates new file headers
+		private void CreateHeaders()
+		{
+			// Default settings
+			type = TYPE_PWAD;
+			lumpsoffset = 12;
+
+			// New lumps array
+			lumps = new List<Lump>(numlumps);
+			
+			// Write the headers
+			WriteHeaders();
+		}
+		
+		// This reads the WAD header and lumps table
+		private void ReadHeaders()
+		{
+			// Make sure the write is finished writing
+			if(!isreadonly) writer.Flush();
+
+			// Seek to beginning
+			file.Seek(0, SeekOrigin.Begin);
+
+			// Read WAD type
+			type = ENCODING.GetString(reader.ReadBytes(4));
+			
+			// Number of lumps
+			numlumps = reader.ReadInt32();
+			if(numlumps < 0) throw new IOException("Invalid number of lumps in wad file.");
+
+			// Lumps table offset
+			lumpsoffset = reader.ReadInt32();
+			if(lumpsoffset < 0) throw new IOException("Invalid lumps offset in wad file.");
+
+			// Seek to the lumps table
+			file.Seek(lumpsoffset, SeekOrigin.Begin);
+			
+			// Dispose old lumps and create new list
+			if(lumps != null) foreach(Lump l in lumps) l.Dispose();
+			lumps = new List<Lump>(numlumps);
+
+			// Go for all lumps
+			for(int i = 0; i < numlumps; i++)
+			{
+				// Read lump information
+				int offset = reader.ReadInt32();
+				int length = reader.ReadInt32();
+				byte[] fixedname = reader.ReadBytes(8);
+
+				// Create the lump
+				lumps.Add(new Lump(file, this, fixedname, offset, length));
+			}
+		}
+
+		// This reads the WAD header and lumps table
+		public void WriteHeaders()
+		{
+			// Seek to beginning
+			file.Seek(0, SeekOrigin.Begin);
+
+			// Write WAD type
+			writer.Write(ENCODING.GetBytes(type));
+
+			// Number of lumps
+			writer.Write(numlumps);
+
+			// Lumps table offset
+			writer.Write(lumpsoffset);
+
+			// Seek to the lumps table
+			file.Seek(lumpsoffset, SeekOrigin.Begin);
+
+			// Go for all lumps
+			for(int i = 0; i < lumps.Count; i++)
+			{
+				// Write lump information
+				writer.Write(lumps[i].Offset);
+				writer.Write(lumps[i].Length);
+				writer.Write(lumps[i].FixedName);
+			}
+		}
+		
+		// This flushes writing changes
+		/*public void Flush()
+		{
+			// Only possible when not read-only
+			if(!isreadonly)
+			{
+				// Flush writing changes
+				if(writer != null) writer.Flush();
+				if(file != null) file.Flush();
+			}
+		}*/
+		
+		#endregion
+		
+		#region ================== Lumps
+
+		// This creates a new lump in the WAD file
+		public Lump Insert(string name, int position, int datalength)
+		{
+			// We will be adding a lump
+			numlumps++;
+			
+			// Extend the file
+			file.SetLength(file.Length + datalength + 16);
+			
+			// Create the lump
+			Lump lump = new Lump(file, this, Lump.MakeFixedName(name, ENCODING), lumpsoffset, datalength);
+			lumps.Insert(position, lump);
+			
+			// Advance lumps table offset
+			lumpsoffset += datalength;
+
+			// Write the new headers
+			WriteHeaders();
+
+			// Return the new lump
+			return lump;
+		}
+
+		// This removes a lump from the WAD file by index
+		public void RemoveAt(int index)
+		{
+			// Remove from list
+			Lump l = lumps[index];
+			lumps.RemoveAt(index);
+			l.Dispose();
+			numlumps--;
+			
+			// Write the new headers
+			WriteHeaders();
+		}
+		
+		// This removes a lump from the WAD file
+		public void Remove(Lump lump)
+		{
+			// Remove from list
+			lumps.Remove(lump);
+			lump.Dispose();
+			numlumps--;
+			
+			// Write the new headers
+			WriteHeaders();
+		}
+		
+		// This finds a lump by name, returns null when not found
+		public Lump FindLump(string name)
+		{
+			int index = FindLumpIndex(name);
+			return (index == -1 ? null : lumps[index]);
+		}
+
+		// This finds a lump by name, returns null when not found
+		public Lump FindLump(string name, int start)
+		{
+			int index = FindLumpIndex(name, start);
+			return (index == -1 ? null : lumps[index]);
+		}
+
+		// This finds a lump by name, returns null when not found
+		public Lump FindLump(string name, int start, int end)
+		{
+			int index = FindLumpIndex(name, start, end);
+			return (index == -1 ? null : lumps[index]);
+		}
+
+		// This finds a lump by name, returns -1 when not found
+		public int FindLumpIndex(string name)
+		{
+			// Do search
+			return FindLumpIndex(name, 0, lumps.Count - 1);
+		}
+
+		// This finds a lump by name, returns -1 when not found
+		public int FindLumpIndex(string name, int start)
+		{
+			// Do search
+			return FindLumpIndex(name, start, lumps.Count - 1);
+		}
+		
+		// This finds a lump by name, returns -1 when not found
+		public int FindLumpIndex(string name, int start, int end)
+		{
+			if(name.Length > 8)	return -1;//mxd. Can't be here. Go away!
+			
+			long longname = Lump.MakeLongName(name);
+			
+			// Fix end when it exceeds length
+			if(end > (lumps.Count - 1)) end = lumps.Count - 1;
+
+			// Loop through the lumps
+			for(int i = start; i <= end; i++)
+			{
+				// Check if the lump name matches
+				if(lumps[i].LongName == longname)
+				{
+					// Found the lump!
+					return i;
+				}
+			}
+
+			// Nothing found
+			return -1;
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Map/BlockEntry.cs b/Source/Core/Map/BlockEntry.cs
new file mode 100644
index 0000000..3c51d19
--- /dev/null
+++ b/Source/Core/Map/BlockEntry.cs
@@ -0,0 +1,59 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections.Generic;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Map
+{
+	public class BlockEntry
+	{
+		#region ================== Variables
+		
+		// Members
+		private List<Linedef> lines;
+		private List<Thing> things;
+		private List<Sector> sectors;
+		private List<Vertex> verts; //mxd
+		
+		#endregion
+		
+		#region ================== Properties
+		
+		public List<Linedef> Lines { get { return lines; } }
+		public List<Thing> Things { get { return things; } }
+		public List<Sector> Sectors { get { return sectors; } }
+		public List<Vertex> Vertices { get { return verts; } } //mxd
+		
+		#endregion
+		
+		#region ================== Constructor
+		
+		// Constructor for empty block
+		public BlockEntry()
+		{
+			lines = new List<Linedef>(2);
+			things = new List<Thing>(2);
+			sectors = new List<Sector>(2);
+			verts = new List<Vertex>(2); //mxd
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Map/BlockMap.cs b/Source/Core/Map/BlockMap.cs
new file mode 100644
index 0000000..6711a9c
--- /dev/null
+++ b/Source/Core/Map/BlockMap.cs
@@ -0,0 +1,512 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Geometry;
+using System.Drawing;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Map
+{
+	public class BlockMap<BE> where BE : BlockEntry, new()
+	{
+		#region ================== Constants
+		
+		#endregion
+		
+		#region ================== Variables
+		
+		// Blocks
+		protected BE[,] blockmap;
+		protected int blocksizeshift;
+		protected int blocksize;
+		protected Size size;
+		protected RectangleF range;
+		protected Vector2D rangelefttop;
+		
+		// State
+		private bool isdisposed;
+		
+		#endregion
+		
+		#region ================== Properties
+		
+		public bool IsDisposed { get { return isdisposed; } }
+		public Size Size { get { return size; } }
+		public RectangleF Range { get { return range; } }
+		public int BlockSize { get { return blocksize; } }
+		internal BE[,] Map { get { return blockmap; } }
+		
+		#endregion
+		
+		#region ================== Constructor / Disposer
+		
+		// Constructor
+		public BlockMap(RectangleF range)
+		{
+			Initialize(range, 128);
+		}
+
+		// Constructor
+		public BlockMap(RectangleF range, int blocksize)
+		{
+			Initialize(range, blocksize);
+		}
+
+		// This initializes the blockmap
+		private void Initialize(RectangleF range, int blocksize)
+		{
+			// Initialize
+			this.range = range;
+			this.blocksizeshift = General.BitsForInt(blocksize);
+			this.blocksize = 1 << blocksizeshift;
+			if((this.blocksize != blocksize) || (this.blocksize <= 1)) throw new ArgumentException("Block size must be a power of 2 greater than 1");
+			rangelefttop = new Vector2D(range.Left, range.Top);
+			Point lefttop = new Point((int)range.Left >> blocksizeshift, (int)range.Top >> blocksizeshift);
+			Point rightbottom = new Point((int)range.Right >> blocksizeshift, (int)range.Bottom >> blocksizeshift);
+			size = new Size((rightbottom.X - lefttop.X) + 1, (rightbottom.Y - lefttop.Y) + 1);
+			blockmap = new BE[size.Width, size.Height];
+			Clear();
+		}
+		
+		// Disposer
+		public void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Clean up
+				blockmap = null;
+				
+				// Done
+				isdisposed = true;
+			}
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+		
+		// This returns the block coordinates
+		protected Point GetBlockCoordinates(Vector2D v)
+		{
+			return new Point((int)(v.x - range.Left) >> blocksizeshift,
+							 (int)(v.y - range.Top) >> blocksizeshift);
+		}
+
+		// This returns the block center in world coordinates
+		protected Vector2D GetBlockCenter(Point p)
+		{
+			return new Vector2D(((p.X << blocksizeshift) + (blocksize >> 1)) + range.Left,
+								((p.Y << blocksizeshift) + (blocksize >> 1)) + range.Top);
+		}
+		
+		// This returns true when the given block is inside range
+		protected bool IsInRange(Point p)
+		{
+			return (p.X >= 0) && (p.X < size.Width) && (p.Y >= 0) && (p.Y < size.Height);
+		}
+		
+		// This returns true when the given block is inside range
+		public bool IsInRange(Vector2D p)
+		{
+			return (p.x >= range.Left) && (p.x < range.Right) && (p.y >= range.Top) && (p.y < range.Bottom);
+		}
+		
+		// This crops a point into the range
+		protected Point CropToRange(Point p)
+		{
+			return new Point(Math.Min(Math.Max(p.X, 0), size.Width - 1),
+							 Math.Min(Math.Max(p.Y, 0), size.Height - 1));
+		}
+
+		// This crops a point into the range
+		protected int CropToRangeX(int x)
+		{
+			return Math.Min(Math.Max(x, 0), size.Width - 1);
+		}
+
+		// This crops a point into the range
+		protected int CropToRangeY(int y)
+		{
+			return Math.Min(Math.Max(y, 0), size.Height - 1);
+		}
+		
+		// This clears the blockmap
+		public virtual void Clear()
+		{
+			for(int x = 0; x < size.Width; x++)
+			{
+				for(int y = 0; y < size.Height; y++)
+				{
+					blockmap[x, y] = new BE();
+				}
+			}
+		}
+
+		// This returns a blocks at the given coordinates, if any
+		// Returns null when out of range
+		public virtual BE GetBlockAt(Vector2D pos)
+		{
+			// Calculate block coordinates
+			Point p = GetBlockCoordinates(pos);
+			return IsInRange(p) ? blockmap[p.X, p.Y] : null;
+		}
+
+		// This returns a range of blocks in a square
+		public virtual List<BE> GetSquareRange(RectangleF rect)
+		{
+			// Calculate block coordinates
+			Point lt = GetBlockCoordinates(new Vector2D(rect.Left, rect.Top));
+			Point rb = GetBlockCoordinates(new Vector2D(rect.Right, rect.Bottom));
+			
+			// Crop coordinates to range
+			lt = CropToRange(lt);
+			rb = CropToRange(rb);
+			
+			// Go through the range to make a list
+			int entriescount = ((rb.X - lt.X) + 1) * ((rb.Y - lt.Y) + 1);
+			List<BE> entries = new List<BE>(entriescount);
+			for(int x = lt.X; x <= rb.X; x++)
+			{
+				for(int y = lt.Y; y <= rb.Y; y++)
+				{
+					entries.Add(blockmap[x, y]);
+				}
+			}
+			
+			// Return list
+			return entries;
+		}
+
+		// This returns all blocks along the given line
+		public virtual List<BE> GetLineBlocks(Vector2D v1, Vector2D v2)
+		{
+			int dirx, diry;
+			
+			// Estimate number of blocks we will go through and create list
+			int entriescount = (int)(Vector2D.ManhattanDistance(v1, v2) * 2.0f) / blocksize;
+			List<BE> entries = new List<BE>(entriescount);
+
+			// Find start and end block
+			Point pos = GetBlockCoordinates(v1);
+			Point end = GetBlockCoordinates(v2);
+			v1 -= rangelefttop;
+			v2 -= rangelefttop;
+
+			// Horizontal straight line?
+			if(pos.Y == end.Y)
+			{
+				// Simple loop
+				pos.X = CropToRangeX(pos.X);
+				end.X = CropToRangeX(end.X);
+				if(IsInRange(new Point(pos.X, pos.Y)))
+				{
+					dirx = Math.Sign(v2.x - v1.x);
+					if(dirx != 0)
+					{
+						for(int x = pos.X; x != end.X; x += dirx)
+						{
+							entries.Add(blockmap[x, pos.Y]);
+						}
+					}
+					entries.Add(blockmap[end.X, end.Y]);
+				}
+			}
+			// Vertical straight line?
+			else if(pos.X == end.X)
+			{
+				// Simple loop
+				pos.Y = CropToRangeY(pos.Y);
+				end.Y = CropToRangeY(end.Y);
+				if(IsInRange(new Point(pos.X, pos.Y)))
+				{
+					diry = Math.Sign(v2.y - v1.y);
+					if(diry != 0)
+					{
+						for(int y = pos.Y; y != end.Y; y += diry)
+						{
+							entries.Add(blockmap[pos.X, y]);
+						}
+					}
+					entries.Add(blockmap[end.X, end.Y]);
+				}
+			}
+			else
+			{
+				// Add this block
+				if(IsInRange(pos)) entries.Add(blockmap[pos.X, pos.Y]);
+
+				// Moving outside the block?
+				if(pos != end)
+				{
+					// Calculate current block edges
+					float cl = pos.X * blocksize;
+					float cr = (pos.X + 1) * blocksize;
+					float ct = pos.Y * blocksize;
+					float cb = (pos.Y + 1) * blocksize;
+
+					// Line directions
+					dirx = Math.Sign(v2.x - v1.x);
+					diry = Math.Sign(v2.y - v1.y);
+
+					// Calculate offset and delta movement over x
+					float posx, deltax;
+					if(dirx >= 0)
+					{
+						posx = (cr - v1.x) / (v2.x - v1.x);
+						deltax = blocksize / (v2.x - v1.x);
+					}
+					else
+					{
+						// Calculate offset and delta movement over x
+						posx = (v1.x - cl) / (v1.x - v2.x);
+						deltax = blocksize / (v1.x - v2.x);
+					}
+
+					// Calculate offset and delta movement over y
+					float posy, deltay;
+					if(diry >= 0)
+					{
+						posy = (cb - v1.y) / (v2.y - v1.y);
+						deltay = blocksize / (v2.y - v1.y);
+					}
+					else
+					{
+						posy = (v1.y - ct) / (v1.y - v2.y);
+						deltay = blocksize / (v1.y - v2.y);
+					}
+
+					// Continue while not reached the end
+					while(pos != end)
+					{
+						// Check in which direction to move
+						if(posx < posy)
+						{
+							// Move horizontally
+							posx += deltax;
+							if(pos.X != end.X) pos.X += dirx;
+						}
+						else
+						{
+							// Move vertically
+							posy += deltay;
+							if(pos.Y != end.Y) pos.Y += diry;
+						}
+						
+						// Add lines to this block
+						if(IsInRange(pos)) entries.Add(blockmap[pos.X, pos.Y]);
+					}
+				}
+			}
+			
+			// Return list
+			return entries;
+		}
+
+		// This puts things in the blockmap
+		public virtual void AddThingsSet(ICollection<Thing> things)
+		{
+			foreach(Thing t in things) AddThing(t);
+		}
+		
+		// This puts a thing in the blockmap
+		public virtual void AddThing(Thing t)
+		{
+			Point p = GetBlockCoordinates(t.Position);
+			if(IsInRange(p)) blockmap[p.X, p.Y].Things.Add(t);
+		}
+
+		//mxd. This puts vertices in the blockmap
+		public virtual void AddVerticesSet(ICollection<Vertex> verts) 
+		{
+			foreach(Vertex v in verts) AddVertex(v);
+		}
+
+		//mxd. This puts a vertex in the blockmap
+		public virtual void AddVertex(Vertex v) 
+		{
+			Point p = GetBlockCoordinates(v.Position);
+			if(IsInRange(p)) blockmap[p.X, p.Y].Vertices.Add(v);
+		}
+
+		// This puts sectors in the blockmap
+		public virtual void AddSectorsSet(ICollection<Sector> sectors)
+		{
+			foreach(Sector s in sectors) AddSector(s);
+		}
+
+		// This puts a sector in the blockmap
+		public virtual void AddSector(Sector s)
+		{
+			Point p1 = GetBlockCoordinates(new Vector2D(s.BBox.Left, s.BBox.Top));
+			Point p2 = GetBlockCoordinates(new Vector2D(s.BBox.Right, s.BBox.Bottom));
+			p1 = CropToRange(p1);
+			p2 = CropToRange(p2);
+			for(int x = p1.X; x <= p2.X; x++)
+			{
+				for(int y = p1.Y; y <= p2.Y; y++)
+				{
+					blockmap[x, y].Sectors.Add(s);
+				}
+			}
+		}
+		
+		// This puts a whole set of linedefs in the blocks they cross
+		public virtual void AddLinedefsSet(ICollection<Linedef> lines)
+		{
+			foreach(Linedef l in lines) AddLinedef(l);
+		}
+		
+		// This puts a single linedef in all blocks it crosses
+		public virtual void AddLinedef(Linedef line)
+		{
+			int dirx, diry;
+
+			// Get coordinates
+			Vector2D v1 = line.Start.Position;
+			Vector2D v2 = line.End.Position;
+			
+			// Find start and end block
+			Point pos = GetBlockCoordinates(v1);
+			Point end = GetBlockCoordinates(v2);
+			v1 -= rangelefttop;
+			v2 -= rangelefttop;
+			
+			// Horizontal straight line?
+			if(pos.Y == end.Y)
+			{
+				// Simple loop
+				pos.X = CropToRangeX(pos.X);
+				end.X = CropToRangeX(end.X);
+				if(IsInRange(new Point(pos.X, pos.Y)))
+				{
+					dirx = Math.Sign(v2.x - v1.x);
+					if(dirx != 0)
+					{
+						for(int x = pos.X; x != end.X; x += dirx)
+						{
+							blockmap[x, pos.Y].Lines.Add(line);
+						}
+					}
+					blockmap[end.X, end.Y].Lines.Add(line);
+				}
+			}
+			// Vertical straight line?
+			else if(pos.X == end.X)
+			{
+				// Simple loop
+				pos.Y = CropToRangeY(pos.Y);
+				end.Y = CropToRangeY(end.Y);
+				if(IsInRange(new Point(pos.X, pos.Y)))
+				{
+					diry = Math.Sign(v2.y - v1.y);
+					if(diry != 0)
+					{
+						for(int y = pos.Y; y != end.Y; y += diry)
+						{
+							blockmap[pos.X, y].Lines.Add(line);
+						}
+					}
+					blockmap[end.X, end.Y].Lines.Add(line);
+				}
+			}
+			else
+			{
+				// Add lines to this block
+				if(IsInRange(pos)) blockmap[pos.X, pos.Y].Lines.Add(line);
+				
+				// Moving outside the block?
+				if(pos != end)
+				{
+					// Calculate current block edges
+					float cl = pos.X * blocksize;
+					float cr = (pos.X + 1) * blocksize;
+					float ct = pos.Y * blocksize;
+					float cb = (pos.Y + 1) * blocksize;
+					
+					// Line directions
+					dirx = Math.Sign(v2.x - v1.x);
+					diry = Math.Sign(v2.y - v1.y);
+					
+					// Calculate offset and delta movement over x
+					float posx, deltax;
+					if(dirx == 0)
+					{
+						posx = float.MaxValue;
+						deltax = float.MaxValue;
+					}
+					else if(dirx > 0)
+					{
+						posx = (cr - v1.x) / (v2.x - v1.x);
+						deltax = blocksize / (v2.x - v1.x);
+					}
+					else
+					{
+						// Calculate offset and delta movement over x
+						posx = (v1.x - cl) / (v1.x - v2.x);
+						deltax = blocksize / (v1.x - v2.x);
+					}
+					
+					// Calculate offset and delta movement over y
+					float posy, deltay;
+					if(diry == 0)
+					{
+						posy = float.MaxValue;
+						deltay = float.MaxValue;
+					}
+					else if(diry > 0)
+					{
+						posy = (cb - v1.y) / (v2.y - v1.y);
+						deltay = blocksize / (v2.y - v1.y);
+					}
+					else
+					{
+						posy = (v1.y - ct) / (v1.y - v2.y);
+						deltay = blocksize / (v1.y - v2.y);
+					}
+					
+					// Continue while not reached the end
+					while(pos != end)
+					{
+						// Check in which direction to move
+						if(posx < posy)
+						{
+							// Move horizontally
+							posx += deltax;
+							if(pos.X != end.X) pos.X += dirx;
+						}
+						else
+						{
+							// Move vertically
+							posy += deltay;
+							if(pos.Y != end.Y) pos.Y += diry;
+						}
+						
+						// Add lines to this block
+						if(IsInRange(pos)) blockmap[pos.X, pos.Y].Lines.Add(line);
+					}
+				}
+			}
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Map/GroupInfo.cs b/Source/Core/Map/GroupInfo.cs
new file mode 100644
index 0000000..7c59033
--- /dev/null
+++ b/Source/Core/Map/GroupInfo.cs
@@ -0,0 +1,42 @@
+using System.Collections.Generic;
+
+namespace CodeImp.DoomBuilder.Map
+{
+	public class GroupInfo
+	{
+		private readonly int numSectors;
+		private readonly int numLines;
+		private readonly int numVerts;
+		private readonly int numThings;
+
+		private readonly int index;
+		private readonly bool empty;
+
+		public bool Empty { get { return empty; } }
+		public int Index { get { return index; } }
+
+		public GroupInfo(int index, int numSectors, int numLines, int numVerts, int numThings) 
+		{
+			this.index = index;
+			this.numSectors = numSectors;
+			this.numLines = numLines;
+			this.numVerts = numVerts;
+			this.numThings = numThings;
+
+			empty = (numSectors == 0 && numLines == 0 && numVerts == 0 && numThings == 0);
+		}
+
+		public override string ToString() 
+		{
+			if(empty) return index + ": Empty";
+			List<string> result = new List<string>();
+
+			if(numSectors > 0) result.Add(numSectors + (numSectors > 1 ? " sectors" : " sector"));
+			if(numLines > 0)   result.Add(numLines + (numLines > 1 ? " lines" : " line"));
+			if(numVerts > 0)   result.Add(numVerts + (numVerts > 1 ? " vertices" : " vertex"));
+			if(numThings > 0)  result.Add(numThings + (numThings > 1 ? " things" : " thing"));
+
+			return index + ": " + string.Join(", ", result.ToArray());
+		}
+	}
+}
diff --git a/Source/Core/Map/Linedef.cs b/Source/Core/Map/Linedef.cs
new file mode 100644
index 0000000..dd7bbf9
--- /dev/null
+++ b/Source/Core/Map/Linedef.cs
@@ -0,0 +1,1496 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Data;
+using CodeImp.DoomBuilder.Geometry;
+using System.Drawing;
+using CodeImp.DoomBuilder.IO;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Map
+{
+	public sealed class Linedef : SelectableElement
+	{
+		#region ================== Constants
+
+		public const float SIDE_POINT_DISTANCE = 0.01f;
+		public const int NUM_ARGS = 5;
+		
+		#endregion
+
+		#region ================== Variables
+
+		// Map
+		private MapSet map;
+
+		// List items
+		private LinkedListNode<Linedef> startvertexlistitem;
+		private LinkedListNode<Linedef> endvertexlistitem;
+		private LinkedListNode<Linedef> selecteditem;
+		
+		// Vertices
+		private Vertex start;
+		private Vertex end;
+		
+		// Sidedefs
+		private Sidedef front;
+		private Sidedef back;
+
+		// Cache
+		private bool updateneeded;
+		private float lengthsq;
+		private float lengthsqinv;
+		private float length;
+		private float lengthinv;
+		private float angle;
+		private RectangleF rect;
+		private bool impassableflag;
+		
+		// Properties
+		private Dictionary<string, bool> flags;
+		private int action;
+		private int activate;
+		private List<int> tags; //mxd
+		private int[] args;
+		private bool frontinterior;		// for drawing only
+		private int colorPresetIndex;//mxd
+
+		// Clone
+		private int serializedindex;
+		
+		#endregion
+
+		#region ================== Properties
+
+		public MapSet Map { get { return map; } }
+		public Vertex Start { get { return start; } }
+		public Vertex End { get { return end; } }
+		public Sidedef Front { get { return front; } }
+		public Sidedef Back { get { return back; } }
+		public Line2D Line { get { return new Line2D(start.Position, end.Position); } }
+		internal Dictionary<string, bool> Flags { get { return flags; } }
+		public int Action { get { return action; } set { BeforePropsChange(); action = value; UpdateColorPreset(); } }
+		public int Activate { get { return activate; } set { BeforePropsChange(); activate = value; UpdateColorPreset(); } }
+
+		public int Tag { get { return tags[0]; } set { BeforePropsChange(); tags[0] = value; if((value < General.Map.FormatInterface.MinTag) || (value > General.Map.FormatInterface.MaxTag)) throw new ArgumentOutOfRangeException("Tag", "Invalid tag number"); } } //mxd
+		public List<int> Tags { get { return tags; } set { BeforePropsChange(); tags = value; } } //mxd
+		public float LengthSq { get { return lengthsq; } }
+		public float Length { get { return length; } }
+		public float LengthInv { get { return lengthinv; } }
+		public float Angle { get { return angle; } }
+		public int AngleDeg { get { return (int)(angle * Angle2D.PIDEG); } }
+		public RectangleF Rect { get { return rect; } }
+		public int[] Args { get { return args; } }
+		internal int SerializedIndex { get { return serializedindex; } set { serializedindex = value; } }
+		internal bool FrontInterior { get { return frontinterior; } set { frontinterior = value; } }
+		internal bool ImpassableFlag { get { return impassableflag; } }
+		internal int ColorPresetIndex { get { return colorPresetIndex; } } //mxd
+		internal bool ExtraFloorFlag; //mxd
+		
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		internal Linedef(MapSet map, int listindex, Vertex start, Vertex end)
+		{
+			// Initialize
+			this.elementtype = MapElementType.LINEDEF; //mxd
+			this.map = map;
+			this.listindex = listindex;
+			this.updateneeded = true;
+			this.args = new int[NUM_ARGS];
+			this.tags = new List<int> { 0 }; //mxd
+			this.flags = new Dictionary<string, bool>(StringComparer.Ordinal);
+			this.colorPresetIndex = -1;//mxd
+			
+			// Attach to vertices
+			this.start = start;
+			this.startvertexlistitem = start.AttachLinedefP(this);
+			this.end = end;
+			this.endvertexlistitem = end.AttachLinedefP(this);
+			
+			if(map == General.Map.Map)
+				General.Map.UndoRedo.RecAddLinedef(this);
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+		
+		// Disposer
+		public override void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Already set isdisposed so that changes can be prohibited
+				isdisposed = true;
+
+				// Dispose sidedefs
+				if((front != null) && map.AutoRemove) front.Dispose(); else AttachFrontP(null);
+				if((back != null) && map.AutoRemove) back.Dispose(); else AttachBackP(null);
+				
+				if(map == General.Map.Map)
+					General.Map.UndoRedo.RecRemLinedef(this);
+
+				// Remove from main list
+				map.RemoveLinedef(listindex);
+				
+				// Detach from vertices
+				if(startvertexlistitem != null) start.DetachLinedefP(startvertexlistitem);
+				startvertexlistitem = null;
+				start = null;
+				if(endvertexlistitem != null) end.DetachLinedefP(endvertexlistitem);
+				endvertexlistitem = null;
+				end = null;
+				
+				// Clean up
+				start = null;
+				end = null;
+				front = null;
+				back = null;
+				map = null;
+
+				//mxd. Restore isdisposed so base classes can do their disposal job
+				isdisposed = false;
+
+				// Clean up base
+				base.Dispose();
+			}
+		}
+
+		#endregion
+
+		#region ================== Management
+		
+		// Call this before changing properties
+		protected override void BeforePropsChange()
+		{
+			if(map == General.Map.Map)
+				General.Map.UndoRedo.RecPrpLinedef(this);
+		}
+		
+		// Serialize / deserialize (passive: doesn't record)
+		new internal void ReadWrite(IReadWriteStream s)
+		{
+			if(!s.IsWriting)
+			{
+				BeforePropsChange();
+				updateneeded = true;
+			}
+			
+			base.ReadWrite(s);
+			
+			if(s.IsWriting)
+			{
+				s.wInt(flags.Count);
+				
+				foreach(KeyValuePair<string, bool> f in flags)
+				{
+					s.wString(f.Key);
+					s.wBool(f.Value);
+				}
+			}
+			else
+			{
+				int c; s.rInt(out c);
+
+				flags = new Dictionary<string, bool>(c, StringComparer.Ordinal);
+				for(int i = 0; i < c; i++)
+				{
+					string t; s.rString(out t);
+					bool b; s.rBool(out b);
+					flags.Add(t, b);
+				}
+			}
+
+			s.rwInt(ref action);
+			s.rwInt(ref activate);
+
+			//mxd
+			if(s.IsWriting)
+			{
+				s.wInt(tags.Count);
+				foreach(int tag in tags) s.wInt(tag);
+			}
+			else
+			{
+				int c; s.rInt(out c);
+				tags = new List<int>(c);
+				for(int i = 0; i < c; i++) 
+				{
+					int t; s.rInt(out t);
+					tags.Add(t);
+				}
+			}
+
+			for(int i = 0; i < NUM_ARGS; i++) s.rwInt(ref args[i]);
+
+			//mxd
+			if(!s.IsWriting) UpdateColorPreset();
+		}
+
+		// This sets new start vertex
+		public void SetStartVertex(Vertex v)
+		{
+			if(map == General.Map.Map)
+				General.Map.UndoRedo.RecRefLinedefStart(this);
+			
+			// Change start
+			if(startvertexlistitem != null) start.DetachLinedefP(startvertexlistitem);
+			startvertexlistitem = null;
+			start = v;
+			if(start != null) startvertexlistitem = start.AttachLinedefP(this);
+			this.updateneeded = true;
+		}
+
+		// This sets new end vertex
+		public void SetEndVertex(Vertex v)
+		{
+			if(map == General.Map.Map)
+				General.Map.UndoRedo.RecRefLinedefEnd(this);
+
+			// Change end
+			if(endvertexlistitem != null) end.DetachLinedefP(endvertexlistitem);
+			endvertexlistitem = null;
+			end = v;
+			if(end != null) endvertexlistitem = end.AttachLinedefP(this);
+			this.updateneeded = true;
+		}
+
+		// This detaches a vertex
+		internal void DetachVertexP(Vertex v)
+		{
+			if(v == start)
+			{
+				if(startvertexlistitem != null) start.DetachLinedefP(startvertexlistitem);
+				startvertexlistitem = null;
+				start = null;
+			}
+			else if(v == end)
+			{
+				if(endvertexlistitem != null) end.DetachLinedefP(endvertexlistitem);
+				endvertexlistitem = null;
+				end = null;
+			}
+			else 
+				throw new Exception("Specified Vertex is not attached to this Linedef.");
+		}
+		
+		// This copies all properties to another line
+		new public void CopyPropertiesTo(Linedef l)
+		{
+			l.BeforePropsChange();
+			
+			// Copy properties
+			l.action = action;
+			l.args = (int[])args.Clone();
+			l.flags = new Dictionary<string, bool>(flags);
+			l.tags = new List<int>(tags); //mxd
+			l.updateneeded = true;
+			l.activate = activate;
+			l.impassableflag = impassableflag;
+			l.UpdateColorPreset();//mxd
+			base.CopyPropertiesTo(l);
+		}
+		
+		// This attaches a sidedef on the front
+		internal void AttachFront(Sidedef s)
+		{
+			if(map == General.Map.Map)
+				General.Map.UndoRedo.RecRefLinedefFront(this);
+			
+			// Attach and recalculate
+			AttachFrontP(s);
+		}
+		
+		// Passive version, does not record the change
+		internal void AttachFrontP(Sidedef s)
+		{
+			// Attach and recalculate
+			front = s;
+			if(front != null) front.SetLinedefP(this);
+			updateneeded = true;
+		}
+
+		// This attaches a sidedef on the back
+		internal void AttachBack(Sidedef s)
+		{
+			if(map == General.Map.Map)
+				General.Map.UndoRedo.RecRefLinedefBack(this);
+
+			// Attach and recalculate
+			AttachBackP(s);
+		}
+		
+		// Passive version, does not record the change
+		internal void AttachBackP(Sidedef s)
+		{
+			// Attach and recalculate
+			back = s;
+			if(back != null) back.SetLinedefP(this);
+			updateneeded = true;
+		}
+
+		// This detaches a sidedef from the front
+		internal void DetachSidedefP(Sidedef s)
+		{
+			// Sidedef is on the front?
+			if(front == s)
+			{
+				// Remove sidedef reference
+				if(front != null) front.SetLinedefP(null);
+				front = null;
+				updateneeded = true;
+			}
+			// Sidedef is on the back?
+			else if(back == s)
+			{
+				// Remove sidedef reference
+				if(back != null) back.SetLinedefP(null);
+				back = null;
+				updateneeded = true;
+			}
+			//else throw new Exception("Specified Sidedef is not attached to this Linedef.");
+		}
+		
+		// This updates the line when changes have been made
+		public void UpdateCache()
+		{
+			// Update if needed
+			if(updateneeded)
+			{
+				// Delta vector
+				Vector2D delta = end.Position - start.Position;
+
+				// Recalculate values
+				lengthsq = delta.GetLengthSq();
+				length = (float)Math.Sqrt(lengthsq);
+				if(length > 0f) lengthinv = 1f / length; else lengthinv = 1f / 0.0000000001f;
+				if(lengthsq > 0f) lengthsqinv = 1f / lengthsq; else lengthsqinv = 1f / 0.0000000001f;
+				angle = delta.GetAngle();
+				float l = Math.Min(start.Position.x, end.Position.x);
+				float t = Math.Min(start.Position.y, end.Position.y);
+				float r = Math.Max(start.Position.x, end.Position.x);
+				float b = Math.Max(start.Position.y, end.Position.y);
+				rect = new RectangleF(l, t, r - l, b - t);
+				
+				// Cached flags
+				impassableflag = IsFlagSet(General.Map.Config.ImpassableFlag);
+
+				//mxd. Color preset
+				UpdateColorPreset();
+				
+				// Updated
+				updateneeded = false;
+			}
+		}
+
+		// This flags the line needs an update because it moved
+		public void NeedUpdate()
+		{
+			// Update this line
+			updateneeded = true;
+
+			// Update sectors as well
+			if(front != null) front.Sector.UpdateNeeded = true;
+			if(back != null) back.Sector.UpdateNeeded = true;
+		}
+		
+		// This translates the flags and activations into UDMF fields
+		internal void TranslateToUDMF(Type previousmapformatinterfacetype)
+		{
+			// First make a single integer with all bits from activation and flags
+			int bits = activate;
+			int flagbit;
+			foreach(KeyValuePair<string, bool> f in flags)
+				if(int.TryParse(f.Key, out flagbit) && f.Value) bits |= flagbit;
+			
+			// Now make the new flags
+			flags.Clear();
+
+			//mxd. Add default activation flag if needed
+			if(action != 0 && activate == 0 && !string.IsNullOrEmpty(General.Map.Config.DefaultLinedefActivationFlag)) 
+				flags[General.Map.Config.DefaultLinedefActivationFlag] = true;
+
+			foreach(FlagTranslation f in General.Map.Config.LinedefFlagsTranslation)
+			{
+				// Flag found in bits?
+				if((bits & f.Flag) == f.Flag)
+				{
+					// Add fields and remove bits
+					bits &= ~f.Flag;
+					for(int i = 0; i < f.Fields.Count; i++)
+						flags[f.Fields[i]] = f.FieldValues[i];
+				}
+				else
+				{
+					// Add fields with inverted value
+					for(int i = 0; i < f.Fields.Count; i++) 
+					{
+						if(!flags.ContainsKey(f.Fields[i])) //mxd
+							flags[f.Fields[i]] = !f.FieldValues[i];
+					}
+				}
+			}
+
+			//mxd. Hexen -> UDMF action translation. Hardcoded for now...
+			if(previousmapformatinterfacetype == typeof(HexenMapSetIO)) 
+			{
+				switch(Action) 
+				{
+					case 121: //Line_SetIdentification
+						//Convert arg0 to tag
+						tags[0] = args[0] + args[4] * 256;
+
+						//Convert arg1 to flags
+						ConvertArgToFlags(1);
+
+						//clear action and arguments
+						action = 0;
+						for(int i = 0; i < args.Length; i++) args[i] = 0;
+						break;
+
+					case 208: //TranslucentLine
+						//Convert arg0 to tag
+						tags[0] = args[0];
+
+						//Convert arg3 to flags
+						ConvertArgToFlags(3);
+						break;
+
+					case 1: ConvertArgToTag(3, true); break; //Polyobj_StartLine
+					case 5: ConvertArgToTag(4, true); break; //Polyobj_ExplicitLine
+					case 181: ConvertArgToTag(2, true); break; //Plane_Align
+					case 215: ConvertArgToTag(0, true); break; //Teleport_Line
+					case 222: ConvertArgToTag(0, false); break; //Scroll_Texture_Model
+
+					case 160: //Sector_3DFloor
+						// Convert to UDMF
+						if((args[1] & 8) == 8) // arg4 is LineID?
+						{
+							tags[0] = args[4];
+							args[1] &= ~8; // Unset flag
+						}
+						else // It's sector's HiTag then
+						{
+							args[0] += args[4] * 256;
+						}
+
+						// Clear arg
+						args[4] = 0;
+						break;
+				}
+			}
+
+			//mxd. Update cached flags
+			impassableflag = IsFlagSet(General.Map.Config.ImpassableFlag);
+
+			// Update color preset
+			UpdateColorPreset();
+		}
+		
+		// This translates UDMF fields back into the normal flags and activations
+		internal void TranslateFromUDMF()
+		{
+			//mxd. Clear UDMF-related properties
+			this.Fields.Clear();
+			ExtraFloorFlag = false;
+			
+			// Make copy of the flags
+			Dictionary<string, bool> oldfields = new Dictionary<string, bool>(flags);
+
+			// Make the flags
+			flags.Clear();
+			foreach(KeyValuePair<string, string> f in General.Map.Config.LinedefFlags)
+			{
+				// Flag must be numeric
+				int flagbit;
+				if(int.TryParse(f.Key, out flagbit))
+				{
+					foreach(FlagTranslation ft in General.Map.Config.LinedefFlagsTranslation)
+					{
+						if(ft.Flag == flagbit)
+						{
+							// Only set this flag when the fields match
+							bool fieldsmatch = true;
+							for(int i = 0; i < ft.Fields.Count; i++)
+							{
+								if(!oldfields.ContainsKey(ft.Fields[i]) || (oldfields[ft.Fields[i]] != ft.FieldValues[i]))
+								{
+									fieldsmatch = false;
+									break;
+								}
+							}
+							
+							// Field match? Then add the flag.
+							if(fieldsmatch)
+							{
+								flags.Add(f.Key, true);
+								break;
+							}
+						}
+					}
+				}
+			}
+			
+			// Make the activation
+			foreach(LinedefActivateInfo a in General.Map.Config.LinedefActivates)
+			{
+				bool foundactivation = false;
+				foreach(FlagTranslation ft in General.Map.Config.LinedefFlagsTranslation)
+				{
+					if(ft.Flag == a.Index)
+					{
+						// Only set this activation when the fields match
+						bool fieldsmatch = true;
+						for(int i = 0; i < ft.Fields.Count; i++)
+						{
+							if(!oldfields.ContainsKey(ft.Fields[i]) || (oldfields[ft.Fields[i]] != ft.FieldValues[i]))
+							{
+								fieldsmatch = false;
+								break;
+							}
+						}
+
+						// Field match? Then add the flag.
+						if(fieldsmatch)
+						{
+							activate = a.Index;
+							foundactivation = true;
+							break;
+						}
+					}
+				}
+				if(foundactivation) break;
+			}
+
+			//mxd. UDMF -> Hexen action translation. Hardcoded for now...
+			if(General.Map.FormatInterface is HexenMapSetIO)
+			{
+				switch(action)
+				{
+					case 208: //TranslucentLine
+						//Convert tag to arg0
+						if(tags[0] < General.Map.FormatInterface.MinArgument || tags[0] > General.Map.FormatInterface.MaxArgument)
+						{
+							General.ErrorLogger.Add(ErrorType.Warning, "Linedef " + Index + ": unable to convert Tag (" + tags[0] + ") to LineID because it's outside of supported argument range [" + General.Map.FormatInterface.MinArgument + ".." + General.Map.FormatInterface.MaxArgument + "].");
+						}
+						else
+						{
+							args[0] = tags[0];
+						}
+
+						//Convert flags to arg3
+						ConvertFlagsToArg(oldfields, 3);
+						break;
+
+					case 1: ConvertTagToArg(3); break; //Polyobj_StartLine
+					case 5: ConvertTagToArg(4); break; //Polyobj_ExplicitLine
+					case 181: ConvertTagToArg(2); break; //Plane_Align
+					case 215: ConvertTagToArg(0); break; //Teleport_Line
+					case 222: ConvertTagToArg(0); break; //Scroll_Texture_Model
+
+					case 160: //Sector_3DFloor
+						if(args[0] > General.Map.FormatInterface.MaxArgument) // Split sector tag?
+						{
+							int hitag = args[0] / 256;
+							int lotag = args[0] - hitag;
+
+							args[0] = lotag;
+							args[4] = hitag;
+
+							if(tags[0] != 0)
+							{
+								General.ErrorLogger.Add(ErrorType.Warning, "Linedef " + Index + ": unable to convert Tag (" + tags[0] + ") to LineID, because target sector tag (arg0) is greater than " + General.Map.FormatInterface.MaxArgument + ".");
+							}
+						}
+						else if(args[0] < General.Map.FormatInterface.MinArgument) 
+						{
+							General.ErrorLogger.Add(ErrorType.Warning, "Linedef " + Index + ": unable to convert arg0 (" + args[0] + "), because it's outside of supported argument range [" + General.Map.FormatInterface.MinArgument + ".." + General.Map.FormatInterface.MaxArgument + "].");
+						} 
+						else if(tags[0] > General.Map.FormatInterface.MinArgument) // Convert to LineID?
+						{
+							if(tags[0] > General.Map.FormatInterface.MaxArgument)
+							{
+								General.ErrorLogger.Add(ErrorType.Warning, "Linedef " + Index + ": unable to convert Tag (" + tags[0] + ") to LineID, because linedef tag is greater than " + General.Map.FormatInterface.MaxArgument + ".");
+							}
+							else
+							{
+								args[4] = tags[0];
+								args[1] |= 8; // Add "Use arg4 as LineID" flag
+							}
+						}
+						break;
+
+					default: // Convert tag to Line_SetIdentification?
+						if(tags[0] > General.Map.FormatInterface.MinArgument)
+						{
+							if(action != 0)
+							{
+								General.ErrorLogger.Add(ErrorType.Warning, "Linedef " + Index + ": unable to convert Tag (" + tags[0] + ") to LineID, because linedef already has an action.");
+							}
+							else // Convert to Line_SetIdentification
+							{
+								int hiid = tags[0] / 256;
+								int loid = tags[0] - hiid;
+
+								action = 121;
+								args[0] = loid;
+								args[4] = hiid;
+								ConvertFlagsToArg(oldfields, 1);
+							}
+						} 
+						else if(tags[0] < General.Map.FormatInterface.MinArgument) 
+						{
+							General.ErrorLogger.Add(ErrorType.Warning, "Linedef " + Index + ": unable to convert Tag (" + tags[0] + ") to LineID, because it's outside of supported argument range [" + General.Map.FormatInterface.MinArgument + ".." + General.Map.FormatInterface.MaxArgument + "].");
+						}
+						break;
+				}
+
+				// Clear tag
+				tags[0] = 0;
+			}
+
+			//mxd. Update cached flags
+			impassableflag = IsFlagSet(General.Map.Config.ImpassableFlag);
+
+			// Update color preset
+			UpdateColorPreset();
+		}
+
+		//mxd
+		private void ConvertArgToTag(int argnum, bool cleararg) 
+		{
+			// Convert arg to tag
+			tags[0] = args[argnum];
+
+			// Clear obsolete arg
+			if(cleararg) args[argnum] = 0;
+		}
+
+		//mxd
+		private void ConvertTagToArg(int argnum) 
+		{
+			if(tags[0] < General.Map.FormatInterface.MinArgument || tags[0] > General.Map.FormatInterface.MaxArgument)
+			{
+				General.ErrorLogger.Add(ErrorType.Warning, "Linedef " + Index + ": unable to convert Tag (" + tags[0] + ") to LineID because it's outside of supported argument range [" + General.Map.FormatInterface.MinArgument + ".." + General.Map.FormatInterface.MaxArgument + "].");
+			}
+			else
+			{
+				args[argnum] = tags[0];
+			}
+		}
+
+		//mxd
+		private void ConvertArgToFlags(int argnum) 
+		{
+			if(args[argnum] == 0) return;
+
+			// Convert to flags
+			if((args[argnum] & 1) == 1) flags["zoneboundary"] = true;
+			if((args[argnum] & 2) == 2) flags["jumpover"] = true;
+			if((args[argnum] & 4) == 4) flags["blockfloaters"] = true;
+			if((args[argnum] & 8) == 8) flags["clipmidtex"] = true;
+			if((args[argnum] & 16) == 16) flags["wrapmidtex"] = true;
+			if((args[argnum] & 32) == 32) flags["midtex3d"] = true;
+			if((args[argnum] & 64) == 64) flags["checkswitchrange"] = true;
+			if((args[argnum] & 128) == 128) flags["firstsideonly"] = true;
+
+			// Clear obsolete arg
+			args[argnum] = 0;
+		}
+
+		//mxd
+		private void ConvertFlagsToArg(Dictionary<string, bool> oldflags, int argnum)
+		{
+			int bits = 0;
+			if(oldflags.ContainsKey("zoneboundary") && oldflags["zoneboundary"]) bits &= 1;
+			if(oldflags.ContainsKey("jumpover") && oldflags["jumpover"]) bits &= 2;
+			if(oldflags.ContainsKey("blockfloaters") && oldflags["blockfloaters"]) bits &= 4;
+			if(oldflags.ContainsKey("clipmidtex") && oldflags["clipmidtex"]) bits &= 8;
+			if(oldflags.ContainsKey("wrapmidtex") && oldflags["wrapmidtex"]) bits &= 16;
+			if(oldflags.ContainsKey("midtex3d") && oldflags["midtex3d"]) bits &= 32;
+			if(oldflags.ContainsKey("checkswitchrange") && oldflags["checkswitchrange"]) bits &= 64;
+			if(oldflags.ContainsKey("firstsideonly") && oldflags["firstsideonly"]) bits &= 128;
+			
+			// Set arg
+			args[argnum] = bits;
+		}
+
+		// Selected
+		protected override void DoSelect()
+		{
+			base.DoSelect();
+			selecteditem = map.SelectedLinedefs.AddLast(this);
+		}
+
+		// Deselect
+		protected override void DoUnselect()
+		{
+			base.DoUnselect();
+			if(selecteditem.List != null) selecteditem.List.Remove(selecteditem);
+			selecteditem = null;
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+
+		// This checks and returns a flag without creating it
+		public bool IsFlagSet(string flagname)
+		{
+			return flags.ContainsKey(flagname) && flags[flagname];
+		}
+
+		// This sets a flag
+		public void SetFlag(string flagname, bool value)
+		{
+			if(!flags.ContainsKey(flagname) || (IsFlagSet(flagname) != value))
+			{
+				BeforePropsChange();
+				
+				flags[flagname] = value;
+
+				// Cached flags
+				if(flagname == General.Map.Config.ImpassableFlag) impassableflag = value;
+
+				//mxd
+				UpdateColorPreset();
+			}
+		}
+
+		// This returns a copy of the flags dictionary
+		public Dictionary<string, bool> GetFlags()
+		{
+			return new Dictionary<string, bool>(flags);
+		}
+		
+		// This clears all flags
+		public void ClearFlags()
+		{
+			BeforePropsChange();
+			flags.Clear();
+			impassableflag = false;
+
+			//mxd
+			UpdateColorPreset();
+		}
+		
+		// This flips the linedef's vertex attachments
+		public void FlipVertices()
+		{
+			// make sure the start/end vertices are not automatically
+			// deleted if they do not belong to any other line
+			General.Map.Map.AutoRemove = false;
+
+			// Flip vertices
+			Vertex oldstart = start;
+			Vertex oldend = end;
+			SetStartVertex(oldend);
+			SetEndVertex(oldstart);
+
+			General.Map.Map.AutoRemove = true;
+			
+			// For drawing, the interior now lies on the other side
+			frontinterior = !frontinterior;
+
+			// Update required (angle changed)
+			NeedUpdate();
+			General.Map.IsChanged = true;
+		}
+
+		// This flips the sidedefs
+		public void FlipSidedefs()
+		{
+			// Flip sidedefs
+			Sidedef oldfront = front;
+			Sidedef oldback = back;
+			AttachFront(oldback);
+			AttachBack(oldfront);
+			
+			General.Map.IsChanged = true;
+		}
+		
+		// This returns a point for testing on one side
+		public Vector2D GetSidePoint(bool front)
+		{
+			Vector2D n = new Vector2D();
+			n.x = (end.Position.x - start.Position.x) * lengthinv * SIDE_POINT_DISTANCE;
+			n.y = (end.Position.y - start.Position.y) * lengthinv * SIDE_POINT_DISTANCE;
+
+			if(front)
+			{
+				n.x = -n.x;
+				n.y = -n.y;
+			}
+
+			Vector2D p = new Vector2D();
+			p.x = start.Position.x + (end.Position.x - start.Position.x) * 0.5f - n.y;
+			p.y = start.Position.y + (end.Position.y - start.Position.y) * 0.5f + n.x;
+
+			return p;
+		}
+
+		// This returns a point in the middle of the line
+		public Vector2D GetCenterPoint()
+		{
+			return start.Position + (end.Position - start.Position) * 0.5f;
+		}
+		
+		// This applies single/double sided flags
+		public void ApplySidedFlags()
+		{
+			// Doublesided?
+			if((front != null) && (back != null))
+			{
+				// Apply or remove flags for doublesided line
+				SetFlag(General.Map.Config.SingleSidedFlag, false);
+				SetFlag(General.Map.Config.DoubleSidedFlag, true);
+			}
+			else
+			{
+				// Apply or remove flags for singlesided line
+				SetFlag(General.Map.Config.SingleSidedFlag, true);
+				SetFlag(General.Map.Config.DoubleSidedFlag, false);
+			}
+			
+			General.Map.IsChanged = true;
+		}
+
+		// This returns all points at which the line intersects with the grid
+		public List<Vector2D> GetGridIntersections() 
+		{
+			return GetGridIntersections(new Vector2D());
+		}
+
+		// This returns all points at which the line intersects with the grid
+		public List<Vector2D> GetGridIntersections(Vector2D gridoffset)
+		{
+			List<Vector2D> coords = new List<Vector2D>();
+			Vector2D v = new Vector2D();
+			float minx, maxx, miny, maxy;
+			bool reversex, reversey;
+			
+			if(start.Position.x > end.Position.x)
+			{
+				minx = end.Position.x;
+				maxx = start.Position.x;
+				reversex = true;
+			}
+			else
+			{
+				minx = start.Position.x;
+				maxx = end.Position.x;
+				reversex = false;
+			}
+
+			if(start.Position.y > end.Position.y)
+			{
+				miny = end.Position.y;
+				maxy = start.Position.y;
+				reversey = true;
+			}
+			else
+			{
+				miny = start.Position.y;
+				maxy = end.Position.y;
+				reversey = false;
+			}
+
+			// Go for all vertical grid lines in between line start and end
+			float gx = General.Map.Grid.GetHigher(minx) + gridoffset.x;
+			if(gx < maxx)
+			{
+				for(; gx < maxx; gx += General.Map.Grid.GridSizeF)
+				{
+					// Add intersection point at this x coordinate
+					float u = (gx - minx) / (maxx - minx);
+					if(reversex) u = 1.0f - u;
+					v.x = gx;
+					v.y = start.Position.y + (end.Position.y - start.Position.y) * u;
+					coords.Add(v);
+				}
+			}
+			
+			// Go for all horizontal grid lines in between line start and end
+			float gy = General.Map.Grid.GetHigher(miny) + gridoffset.y;
+			if(gy < maxy)
+			{
+				for(; gy < maxy; gy += General.Map.Grid.GridSizeF)
+				{
+					// Add intersection point at this y coordinate
+					float u = (gy - miny) / (maxy - miny);
+					if(reversey) u = 1.0f - u;
+					v.x = start.Position.x + (end.Position.x - start.Position.x) * u;
+					v.y = gy;
+					coords.Add(v);
+				}
+			}
+			
+			// Profit
+			return coords;
+		}
+		
+		// This returns the closest coordinates ON the line
+		public Vector2D NearestOnLine(Vector2D pos)
+		{
+			float u = Line2D.GetNearestOnLine(start.Position, end.Position, pos);
+			if(u < 0f) u = 0f; else if(u > 1f) u = 1f;
+			return Line2D.GetCoordinatesAt(start.Position, end.Position, u);
+		}
+
+		// This returns the shortest distance from given coordinates to line
+		public float SafeDistanceToSq(Vector2D p, bool bounded)
+		{
+			Vector2D v1 = start.Position;
+			Vector2D v2 = end.Position;
+
+			// Calculate intersection offset
+			float u = ((p.x - v1.x) * (v2.x - v1.x) + (p.y - v1.y) * (v2.y - v1.y)) * lengthsqinv;
+
+			// Limit intersection offset to the line
+			if(bounded) if(u < lengthinv) u = lengthinv; else if(u > (1f - lengthinv)) u = 1f - lengthinv;
+
+			// Calculate intersection point
+			Vector2D i = v1 + u * (v2 - v1);
+
+			// Return distance between intersection and point
+			// which is the shortest distance to the line
+			float ldx = p.x - i.x;
+			float ldy = p.y - i.y;
+			return ldx * ldx + ldy * ldy;
+		}
+
+		// This returns the shortest distance from given coordinates to line
+		public float SafeDistanceTo(Vector2D p, bool bounded)
+		{
+			return (float)Math.Sqrt(SafeDistanceToSq(p, bounded));
+		}
+
+		// This returns the shortest distance from given coordinates to line
+		public float DistanceToSq(Vector2D p, bool bounded)
+		{
+			Vector2D v1 = start.Position;
+			Vector2D v2 = end.Position;
+			
+			// Calculate intersection offset
+			float u = ((p.x - v1.x) * (v2.x - v1.x) + (p.y - v1.y) * (v2.y - v1.y)) * lengthsqinv;
+
+			// Limit intersection offset to the line
+			if(bounded) if(u < 0f) u = 0f; else if(u > 1f) u = 1f;
+			
+			// Calculate intersection point
+			Vector2D i = v1 + u * (v2 - v1);
+
+			// Return distance between intersection and point
+			// which is the shortest distance to the line
+			float ldx = p.x - i.x;
+			float ldy = p.y - i.y;
+			return ldx * ldx + ldy * ldy;
+		}
+
+		// This returns the shortest distance from given coordinates to line
+		public float DistanceTo(Vector2D p, bool bounded)
+		{
+			return (float)Math.Sqrt(DistanceToSq(p, bounded));
+		}
+
+		// This tests on which side of the line the given coordinates are
+		// returns < 0 for front (right) side, > 0 for back (left) side and 0 if on the line
+		public float SideOfLine(Vector2D p)
+		{
+			Vector2D v1 = start.Position;
+			Vector2D v2 = end.Position;
+			
+			// Calculate and return side information
+			return (p.y - v1.y) * (v2.x - v1.x) - (p.x - v1.x) * (v2.y - v1.y);
+		}
+
+		// This splits this line by vertex v
+		// Returns the new line resulting from the split, or null when it failed
+		public Linedef Split(Vertex v)
+		{
+			Sidedef nsd;
+
+			// Copy linedef and change vertices
+			Linedef nl = map.CreateLinedef(v, end);
+			if(nl == null) return null;
+			CopyPropertiesTo(nl);
+			SetEndVertex(v);
+			nl.Selected = this.Selected;
+			nl.marked = this.marked;
+			nl.ExtraFloorFlag = this.ExtraFloorFlag; //mxd
+			
+			// Copy front sidedef if exists
+			if(front != null)
+			{
+				nsd = map.CreateSidedef(nl, true, front.Sector);
+				if(nsd == null) return null;
+				front.CopyPropertiesTo(nsd);
+				nsd.Marked = front.Marked;
+			}
+
+			// Copy back sidedef if exists
+			if(back != null)
+			{
+				nsd = map.CreateSidedef(nl, false, back.Sector);
+				if(nsd == null) return null;
+				back.CopyPropertiesTo(nsd);
+				nsd.Marked = back.Marked;
+			}
+
+			//mxd
+			AdjustSplitCoordinates(this, nl, General.Settings.SplitLineBehavior);
+
+			// Return result
+			General.Map.IsChanged = true;
+			return nl;
+		}
+		
+		// This joins the line with another line
+		// This line will be disposed
+		// Returns false when the operation could not be completed
+		public bool Join(Linedef other)
+		{
+			// Check which lines were 2 sided
+			bool l1was2s = ((other.Front != null) && (other.Back != null));
+			bool l2was2s = ((this.Front != null) && (this.Back != null));
+			
+			// Get sector references
+			Sector l1fs = other.front != null ? other.front.Sector : null;
+			Sector l1bs = other.back != null ? other.back.Sector : null;
+			Sector l2fs = this.front != null ? this.front.Sector : null;
+			Sector l2bs = this.back != null ? this.back.Sector : null;
+
+			// This line has no sidedefs?
+			if((l2fs == null) && (l2bs == null))
+			{
+				// We have no sidedefs, so we have no influence
+				// Nothing to change on the other line
+			}
+			// Other line has no sidedefs?
+			else if((l1fs == null) && (l1bs == null))
+			{
+				// The other has no sidedefs, so it has no influence
+				// Copy my sidedefs to the other
+				if(this.Start == other.Start)
+				{
+					if(!JoinChangeSidedefs(other, true, front)) return false;
+					if(!JoinChangeSidedefs(other, false, back)) return false;
+				}
+				else
+				{
+					if(!JoinChangeSidedefs(other, false, front)) return false;
+					if(!JoinChangeSidedefs(other, true, back)) return false;
+				}
+
+				// Copy my properties to the other
+				this.CopyPropertiesTo(other);
+			}
+			else
+			{
+				// Compare front sectors
+				if((l1fs != null) && (l1fs == l2fs))
+				{
+					// Copy textures
+					if(other.front != null) other.front.AddTexturesTo(this.back);
+					if(this.front != null) this.front.AddTexturesTo(other.back);
+
+					// Change sidedefs
+					if(!JoinChangeSidedefs(other, true, back)) return false;
+				}
+				// Compare back sectors
+				else if((l1bs != null) && (l1bs == l2bs))
+				{
+					// Copy textures
+					if(other.back != null) other.back.AddTexturesTo(this.front);
+					if(this.back != null) this.back.AddTexturesTo(other.front);
+
+					// Change sidedefs
+					if(!JoinChangeSidedefs(other, false, front)) return false;
+				}
+				// Compare front and back
+				else if((l1fs != null) && (l1fs == l2bs))
+				{
+					// Copy textures
+					if(other.front != null) other.front.AddTexturesTo(this.front);
+					if(this.back != null) this.back.AddTexturesTo(other.back);
+
+					// Change sidedefs
+					if(!JoinChangeSidedefs(other, true, front)) return false;
+				}
+				// Compare back and front
+				else if((l1bs != null) && (l1bs == l2fs))
+				{
+					// Copy textures
+					if(other.back != null) other.back.AddTexturesTo(this.back);
+					if(this.front != null) this.front.AddTexturesTo(other.front);
+
+					// Change sidedefs
+					if(!JoinChangeSidedefs(other, false, back)) return false;
+				}
+				else
+				{
+					// Other line single sided?
+					if(other.back == null)
+					{
+						// This line with its back to the other?
+						if(this.start == other.end)
+						{
+							// Copy textures
+							if(other.back != null) other.back.AddTexturesTo(this.front);
+							if(this.back != null) this.back.AddTexturesTo(other.front);
+
+							// Change sidedefs
+							if(!JoinChangeSidedefs(other, false, front)) return false;
+						}
+						else
+						{
+							// Copy textures
+							if(other.back != null) other.back.AddTexturesTo(this.back);
+							if(this.front != null) this.front.AddTexturesTo(other.front);
+
+							// Change sidedefs
+							if(!JoinChangeSidedefs(other, false, back)) return false;
+						}
+					}
+					// This line single sided?
+					else if(this.back == null)
+					{
+						// Other line with its back to this?
+						if(other.start == this.end)
+						{
+							// Copy textures
+							if(other.back != null) other.back.AddTexturesTo(this.front);
+							if(this.back != null) this.back.AddTexturesTo(other.front);
+
+							// Change sidedefs
+							if(!JoinChangeSidedefs(other, false, front)) return false;
+						}
+						else
+						{
+							// Copy textures
+							if(other.front != null) other.front.AddTexturesTo(this.front);
+							if(this.back != null) this.back.AddTexturesTo(other.back);
+
+							// Change sidedefs
+							if(!JoinChangeSidedefs(other, true, front)) return false;
+						}
+					}
+					else
+					{
+						// This line with its back to the other?
+						if(this.start == other.end)
+						{
+							// Copy textures
+							if(other.back != null) other.back.AddTexturesTo(this.front);
+							if(this.back != null) this.back.AddTexturesTo(other.front);
+
+							// Change sidedefs
+							if(!JoinChangeSidedefs(other, false, front)) return false;
+						}
+						else
+						{
+							// Copy textures
+							if(other.back != null) other.back.AddTexturesTo(this.back);
+							if(this.front != null) this.front.AddTexturesTo(other.front);
+
+							// Change sidedefs
+							if(!JoinChangeSidedefs(other, false, back)) return false;
+						}
+					}
+				}
+				
+				// Apply single/double sided flags if the double-sided-ness changed
+				if( (!l1was2s && ((other.Front != null) && (other.Back != null))) ||
+					(l1was2s && ((other.Front == null) || (other.Back == null))) )
+					other.ApplySidedFlags();
+				
+				// Remove unneeded textures
+				if(other.front != null) other.front.RemoveUnneededTextures(!(l1was2s && l2was2s));
+				if(other.back != null) other.back.RemoveUnneededTextures(!(l1was2s && l2was2s));
+			}
+			
+			// If either of the two lines was selected, keep the other selected
+			if(this.Selected) other.Selected = true;
+			if(this.marked) other.marked = true;
+			
+			// I got killed by the other.
+			this.Dispose();
+			General.Map.IsChanged = true;
+			return true;
+		}
+		
+		// This changes sidedefs (used for joining lines)
+		// target:		The linedef on which to remove or create a new sidedef
+		// front:		Side on which to remove or create the sidedef (true for front side)
+		// newside:		The side from which to copy the properties to the new sidedef.
+		//				If this is null, no sidedef will be created (only removed)
+		// Returns false when the operation could not be completed.
+		private bool JoinChangeSidedefs(Linedef target, bool front, Sidedef newside)
+		{
+			// Change sidedefs
+			if(front)
+			{
+				if(target.front != null) target.front.Dispose();
+			}
+			else
+			{
+				if(target.back != null) target.back.Dispose();
+			}
+			
+			if(newside != null)
+			{
+				Sidedef sd = map.CreateSidedef(target, front, newside.Sector);
+				if(sd == null) return false;
+				newside.CopyPropertiesTo(sd);
+				sd.Marked = newside.Marked;
+			}
+
+			return true;
+		}
+
+		//mxd
+		internal void UpdateColorPreset() 
+		{
+			for(int i = 0; i < General.Map.ConfigSettings.LinedefColorPresets.Length; i++) 
+			{
+				if(General.Map.ConfigSettings.LinedefColorPresets[i].Matches(this)) 
+				{
+					colorPresetIndex = i;
+					return;
+				}
+			}
+			colorPresetIndex = -1;
+		}
+
+		// String representation
+		public override string ToString()
+		{
+			return "Linedef " + listindex;
+		}
+		
+		#endregion
+
+		#region ================== Changes
+		
+		// This updates all properties
+		public void Update(Dictionary<string, bool> flags, int activate, List<int> tags, int action, int[] args)
+		{
+			BeforePropsChange();
+			
+			// Apply changes
+			this.flags = new Dictionary<string, bool>(flags);
+			this.tags = new List<int>(tags); //mxd
+			this.activate = activate;
+			this.action = action;
+			this.args = new int[NUM_ARGS];
+			args.CopyTo(this.args, 0);
+			this.updateneeded = true;
+		}
+
+		// mxd. Moved here from BuilderModes.BuilderPlug
+		// This adjusts texture coordinates for splitted lines according to the user preferences
+		private static void AdjustSplitCoordinates(Linedef oldline, Linedef newline, SplitLineBehavior splitlinebehavior) 
+		{
+			switch(splitlinebehavior) 
+			{
+				case SplitLineBehavior.Interpolate:
+					//Make texture offset adjustments
+					if(oldline.back != null) 
+					{
+						if((oldline.back.MiddleRequired() && oldline.back.LongMiddleTexture != MapSet.EmptyLongName) || oldline.back.HighRequired() || oldline.back.LowRequired()) 
+						{
+							int distance = (int)Vector2D.Distance(newline.start.Position, newline.end.Position);
+							if(General.Map.UDMF) 
+							{
+								if(distance != 0) oldline.back.SetUdmfTextureOffsetX(distance);
+							} 
+							else 
+							{
+								oldline.back.OffsetX += distance;
+							}
+						}
+					}
+
+					if(newline.front != null && ((newline.front.MiddleRequired() || newline.front.LongMiddleTexture != MapSet.EmptyLongName) || newline.front.HighRequired() || newline.front.LowRequired())) 
+					{
+						int distance = (int)Vector2D.Distance(oldline.start.Position, oldline.end.Position);
+						if(General.Map.UDMF) 
+						{
+							if(distance != 0) newline.front.SetUdmfTextureOffsetX(distance);
+						} 
+						else 
+						{
+							newline.front.OffsetX += distance;
+						}
+					}
+
+					//Clamp texture coordinates
+					if((oldline.front != null) && (newline.front != null)) 
+					{
+						//get texture
+						ImageData texture = null;
+
+						if(newline.front.MiddleRequired() && newline.front.LongMiddleTexture != MapSet.EmptyLongName && General.Map.Data.GetTextureExists(newline.front.LongMiddleTexture)) 
+							texture = General.Map.Data.GetTextureImage(newline.front.MiddleTexture);
+						else if(newline.front.HighRequired() && newline.front.LongHighTexture != MapSet.EmptyLongName && General.Map.Data.GetTextureExists(newline.front.LongHighTexture)) 
+							texture = General.Map.Data.GetTextureImage(newline.front.HighTexture);
+						else if(newline.front.LowRequired() && newline.front.LongLowTexture != MapSet.EmptyLongName && General.Map.Data.GetTextureExists(newline.front.LongLowTexture)) 
+							texture = General.Map.Data.GetTextureImage(newline.front.LowTexture);
+
+						//clamp offsetX
+						if(texture != null) newline.front.OffsetX %= texture.Width;
+					}
+
+					if((oldline.back != null) && (newline.back != null)) 
+					{
+						//get texture
+						ImageData texture = null;
+
+						if(newline.back.MiddleRequired() && newline.back.LongMiddleTexture != MapSet.EmptyLongName && General.Map.Data.GetTextureExists(newline.back.LongMiddleTexture))
+							texture = General.Map.Data.GetTextureImage(newline.back.MiddleTexture);
+						else if(newline.back.HighRequired() && newline.back.LongHighTexture != MapSet.EmptyLongName && General.Map.Data.GetTextureExists(newline.back.LongHighTexture))
+							texture = General.Map.Data.GetTextureImage(newline.back.HighTexture);
+						else if(newline.back.LowRequired() && newline.back.LongLowTexture != MapSet.EmptyLongName && General.Map.Data.GetTextureExists(newline.back.LongLowTexture))
+							texture = General.Map.Data.GetTextureImage(newline.back.LowTexture);
+
+						//clamp offsetX
+						if(texture != null) newline.back.OffsetX %= texture.Width;
+					}
+
+					break;
+
+				case SplitLineBehavior.CopyXY:
+					if((oldline.front != null) && (newline.front != null)) 
+					{
+						newline.front.OffsetX = oldline.front.OffsetX;
+						newline.front.OffsetY = oldline.front.OffsetY;
+
+						//mxd. Copy UDMF offsets as well
+						if(General.Map.UDMF) 
+						{
+							UniFields.SetFloat(newline.front.Fields, "offsetx_top", oldline.front.Fields.GetValue("offsetx_top", 0f));
+							UniFields.SetFloat(newline.front.Fields, "offsetx_mid", oldline.front.Fields.GetValue("offsetx_mid", 0f));
+							UniFields.SetFloat(newline.front.Fields, "offsetx_bottom", oldline.front.Fields.GetValue("offsetx_bottom", 0f));
+
+							UniFields.SetFloat(newline.front.Fields, "offsety_top", oldline.front.Fields.GetValue("offsety_top", 0f));
+							UniFields.SetFloat(newline.front.Fields, "offsety_mid", oldline.front.Fields.GetValue("offsety_mid", 0f));
+							UniFields.SetFloat(newline.front.Fields, "offsety_bottom", oldline.front.Fields.GetValue("offsety_bottom", 0f));
+						}
+					}
+
+					if((oldline.back != null) && (newline.back != null)) 
+					{
+						newline.back.OffsetX = oldline.back.OffsetX;
+						newline.back.OffsetY = oldline.back.OffsetY;
+
+						//mxd. Copy UDMF offsets as well
+						if(General.Map.UDMF) 
+						{
+							UniFields.SetFloat(newline.back.Fields, "offsetx_top", oldline.back.Fields.GetValue("offsetx_top", 0f));
+							UniFields.SetFloat(newline.back.Fields, "offsetx_mid", oldline.back.Fields.GetValue("offsetx_mid", 0f));
+							UniFields.SetFloat(newline.back.Fields, "offsetx_bottom", oldline.back.Fields.GetValue("offsetx_bottom", 0f));
+
+							UniFields.SetFloat(newline.back.Fields, "offsety_top", oldline.back.Fields.GetValue("offsety_top", 0f));
+							UniFields.SetFloat(newline.back.Fields, "offsety_mid", oldline.back.Fields.GetValue("offsety_mid", 0f));
+							UniFields.SetFloat(newline.back.Fields, "offsety_bottom", oldline.back.Fields.GetValue("offsety_bottom", 0f));
+						}
+					}
+					break;
+
+				case SplitLineBehavior.ResetXCopyY:
+					if((oldline.front != null) && (newline.front != null)) 
+					{
+						newline.front.OffsetX = 0;
+						newline.front.OffsetY = oldline.front.OffsetY;
+
+						//mxd. Reset UDMF X offset as well
+						if(General.Map.UDMF) 
+						{
+							UniFields.SetFloat(newline.front.Fields, "offsetx_top", 0f);
+							UniFields.SetFloat(newline.front.Fields, "offsetx_mid", 0f);
+							UniFields.SetFloat(newline.front.Fields, "offsetx_bottom", 0f);
+						}
+					}
+
+					if((oldline.back != null) && (newline.back != null)) 
+					{
+						newline.back.OffsetX = 0;
+						newline.back.OffsetY = oldline.back.OffsetY;
+
+						//mxd. Reset UDMF X offset and copy Y offset as well
+						if(General.Map.UDMF) 
+						{
+							UniFields.SetFloat(newline.back.Fields, "offsetx_top", 0f);
+							UniFields.SetFloat(newline.back.Fields, "offsetx_mid", 0f);
+							UniFields.SetFloat(newline.back.Fields, "offsetx_bottom", 0f);
+
+							UniFields.SetFloat(newline.back.Fields, "offsety_top", oldline.back.Fields.GetValue("offsety_top", 0f));
+							UniFields.SetFloat(newline.back.Fields, "offsety_mid", oldline.back.Fields.GetValue("offsety_mid", 0f));
+							UniFields.SetFloat(newline.back.Fields, "offsety_bottom", oldline.back.Fields.GetValue("offsety_bottom", 0f));
+						}
+					}
+					break;
+
+				case SplitLineBehavior.ResetXY:
+					if(newline.front != null) 
+					{
+						newline.front.OffsetX = 0;
+						newline.front.OffsetY = 0;
+
+						if(General.Map.UDMF) 
+						{
+							UniFields.SetFloat(newline.front.Fields, "offsetx_top", 0f);
+							UniFields.SetFloat(newline.front.Fields, "offsetx_mid", 0f);
+							UniFields.SetFloat(newline.front.Fields, "offsetx_bottom", 0f);
+
+							UniFields.SetFloat(newline.front.Fields, "offsety_top", 0f);
+							UniFields.SetFloat(newline.front.Fields, "offsety_mid", 0f);
+							UniFields.SetFloat(newline.front.Fields, "offsety_bottom", 0f);
+						}
+					}
+
+					if(newline.back != null) 
+					{
+						newline.back.OffsetX = 0;
+						newline.back.OffsetY = 0;
+
+						if(General.Map.UDMF) 
+						{
+							UniFields.SetFloat(newline.back.Fields, "offsetx_top", 0f);
+							UniFields.SetFloat(newline.back.Fields, "offsetx_mid", 0f);
+							UniFields.SetFloat(newline.back.Fields, "offsetx_bottom", 0f);
+
+							UniFields.SetFloat(newline.back.Fields, "offsety_top", 0f);
+							UniFields.SetFloat(newline.back.Fields, "offsety_mid", 0f);
+							UniFields.SetFloat(newline.back.Fields, "offsety_bottom", 0f);
+						}
+					}
+					break;
+			}
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Map/MapElement.cs b/Source/Core/Map/MapElement.cs
new file mode 100644
index 0000000..3d9d0f8
--- /dev/null
+++ b/Source/Core/Map/MapElement.cs
@@ -0,0 +1,159 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.IO;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Map
+{
+	public enum MapElementType
+	{
+		UNKNOWN,
+		VERTEX,
+		SIDEDEF,
+		LINEDEF,
+		SECTOR,
+		THING
+	}
+	
+	public abstract class MapElement : IDisposable
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+		
+		// List index
+		protected int listindex;
+		
+		// Univeral fields
+		private UniFields fields;
+		
+		// Marking
+		protected bool marked;
+		
+		// Disposing
+		protected bool isdisposed;
+		
+		// Error Ignoring (mxd)
+		private List<Type> ignorederrorchecks;
+
+		//mxd. Hashing
+		private static int hashcounter;
+		private readonly int hashcode;
+
+		//mxd. Element type
+		protected MapElementType elementtype;
+		
+		#endregion
+		
+		#region ================== Properties
+
+		public int Index { get { return listindex; } internal set { listindex = value; } }
+		public UniFields Fields { get { return fields; } }
+		public bool Marked { get { return marked; } set { marked = value; } }
+		public bool IsDisposed { get { return isdisposed; } }
+		public List<Type> IgnoredErrorChecks { get { return ignorederrorchecks; } } //mxd
+		public MapElementType ElementType { get { return elementtype; } } //mxd
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		protected MapElement()
+		{
+			// Initialize
+			fields = new UniFields(this);
+			ignorederrorchecks = new List<Type>(); //mxd
+			hashcode = hashcounter++; //mxd
+		}
+
+		// Disposer
+		public virtual void Dispose()
+		{
+			if(!isdisposed)
+			{
+				// Clean up
+				fields.Owner = null;
+				fields = null;
+
+				// Done
+				isdisposed = true;
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// Serialize / deserialize
+		internal void ReadWrite(IReadWriteStream s)
+		{
+			int c = fields.Count;
+			s.rwInt(ref c);
+
+			if(s.IsWriting)
+			{
+				foreach(KeyValuePair<string, UniValue> f in fields)
+				{
+					s.wString(f.Key);
+					f.Value.ReadWrite(s);
+				}
+			}
+			else
+			{
+				fields = new UniFields(this, c);
+				for(int i = 0; i < c; i++)
+				{
+					string t; s.rString(out t);
+					UniValue v = new UniValue(); v.ReadWrite(s);
+					fields.Add(t, v);
+				}
+			}
+		}
+
+		// This copies properties to any other element
+		public void CopyPropertiesTo(MapElement element)
+		{
+			//element.fields = new UniFields(this, this.fields);
+			element.fields = new UniFields(element, this.fields); //mxd
+		}
+		
+		// This must implement the call to the undo system to record the change of properties
+		protected abstract void BeforePropsChange();
+		
+		// This is called before the custom fields change
+		internal void BeforeFieldsChange()
+		{
+			BeforePropsChange();
+		}
+
+		//mxd. This greatly speeds up Dictionary lookups
+		public override int GetHashCode()
+		{
+			return hashcode;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Map/MapElementCollection.cs b/Source/Core/Map/MapElementCollection.cs
new file mode 100644
index 0000000..9b50a54
--- /dev/null
+++ b/Source/Core/Map/MapElementCollection.cs
@@ -0,0 +1,79 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Map
+{
+	public sealed class MapElementCollection<T> : ICollection<T> where T: MapElement
+	{
+		// Members
+		private int numitems;
+		private T[] array;
+		
+		// Constructor
+		public MapElementCollection(ref T[] array, int numitems)
+		{
+			this.numitems = numitems;
+			this.array = array;
+		}
+		
+		public void Add(T item)
+		{
+			throw new NotSupportedException();
+		}
+		
+		public void Clear()
+		{
+			throw new NotSupportedException();
+		}
+		
+		public bool Contains(T item)
+		{
+			throw new NotSupportedException();
+		}
+		
+		public void CopyTo(T[] array, int arrayIndex)
+		{
+			this.array.CopyTo(array, arrayIndex);
+		}
+		
+		public int Count { get { return numitems; } }
+		
+		public bool IsReadOnly { get { return true; } }
+		
+		public bool Remove(T item)
+		{
+			throw new NotSupportedException();
+		}
+		
+		public IEnumerator<T> GetEnumerator()
+		{
+			throw new NotSupportedException("This array is locked for modification and cannot currently be enumerated.");
+		}
+		
+		IEnumerator IEnumerable.GetEnumerator()
+		{
+			throw new NotSupportedException("This array is locked for modification and cannot currently be enumerated.");
+		}
+	}
+}
diff --git a/Source/Core/Map/MapOptions.cs b/Source/Core/Map/MapOptions.cs
new file mode 100644
index 0000000..374a2ff
--- /dev/null
+++ b/Source/Core/Map/MapOptions.cs
@@ -0,0 +1,505 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Reflection;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.IO;
+using System.IO;
+using CodeImp.DoomBuilder.Data;
+using CodeImp.DoomBuilder.Plugins;
+using System.Collections.Specialized;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Map
+{
+	public sealed class MapOptions
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		// Map configuration
+		private Configuration mapconfig;
+		
+		// Game configuration
+		private string configfile;
+		
+		// Map header name
+		private string currentname;
+		private string previousname;		// When zero length string, map has not renamed
+		
+		// Strict pathes loading?
+		private bool strictpatches;
+		
+		// Additional resources
+		private DataLocationList resources;
+
+		// Script files opened
+		private List<string> scriptfiles;
+
+		// mxd. Script compiler
+		private string scriptcompiler;
+
+		//mxd. Sector drawing options
+		private string defaultfloortexture;
+		private string defaultceiltexture;
+		private string defaulttoptexture;
+		private string defaultwalltexture;
+		private string defaultbottomtexture;
+		private int custombrightness;
+		private int customfloorheight;
+		private int customceilheight;
+
+		//mxd. Sector drawing overrides
+		private bool overridefloortexture;
+		private bool overrideceiltexture;
+		private bool overridetoptexture;
+		private bool overridemiddletexture;
+		private bool overridebottomtexture;
+		private bool overridefloorheight;
+		private bool overrideceilheight;
+		private bool overridebrightness;
+
+		//mxd.
+		private bool uselongtexturenames;
+
+		//mxd. Position and scale
+		private Vector2D viewposition;
+		private float viewscale;
+		
+		#endregion
+
+		#region ================== Properties
+
+		internal string ConfigFile { get { return configfile; } set { configfile = value; } }
+		internal DataLocationList Resources { get { return resources; } }
+		internal bool StrictPatches { get { return strictpatches; } set { strictpatches = value; } }
+		internal List<string> ScriptFiles { get { return scriptfiles; } set { scriptfiles = value; } }
+		internal string ScriptCompiler { get { return scriptcompiler; } set { scriptcompiler = value; } } //mxd
+		internal string PreviousName { get { return previousname; } set { previousname = value; } }
+		internal string CurrentName
+		{
+			get { return currentname; }
+
+			set
+			{
+				// Change the name, but keep previous name
+				if(currentname != value)
+				{
+					if(previousname == "") previousname = currentname;
+					currentname = value;
+				}
+			}
+		}
+		internal bool LevelNameChanged { get { return (!string.IsNullOrEmpty(previousname) && previousname != currentname); } } //mxd
+
+		public string LevelName { get { return currentname; } }
+		public Dictionary<int, string> TagLabels { get { return tagLabels; } internal set { tagLabels = value; } } //mxd 
+		private Dictionary<int, string> tagLabels;
+
+		//mxd. Sector drawing options
+		public string DefaultTopTexture { get { return defaulttoptexture; } set { defaulttoptexture = value; } }
+		public string DefaultWallTexture { get { return defaultwalltexture; } set { defaultwalltexture = value; } }
+		public string DefaultBottomTexture { get { return defaultbottomtexture; } set { defaultbottomtexture = value; } }
+		public string DefaultFloorTexture { get { return defaultfloortexture; } set { defaultfloortexture = value; } }
+		public string DefaultCeilingTexture { get { return defaultceiltexture; } set { defaultceiltexture = value; } }
+		public int CustomBrightness { get { return custombrightness; } set { custombrightness = value; } }
+		public int CustomFloorHeight { get { return customfloorheight; } set { customfloorheight = value; } }
+		public int CustomCeilingHeight { get { return customceilheight; } set { customceilheight = value; } }
+
+		//mxd. Sector drawing overrides
+		public bool OverrideFloorTexture { get { return overridefloortexture; } set { overridefloortexture = value; } }
+		public bool OverrideCeilingTexture { get { return overrideceiltexture; } set { overrideceiltexture = value; } }
+		public bool OverrideTopTexture { get { return overridetoptexture; } set { overridetoptexture = value; } }
+		public bool OverrideMiddleTexture { get { return overridemiddletexture; } set { overridemiddletexture = value; } }
+		public bool OverrideBottomTexture { get { return overridebottomtexture; } set { overridebottomtexture = value; } }
+		public bool OverrideFloorHeight { get { return overridefloorheight; } set { overridefloorheight = value; } }
+		public bool OverrideCeilingHeight { get { return overrideceilheight; } set { overrideceilheight = value; } }
+		public bool OverrideBrightness { get { return overridebrightness; } set { overridebrightness = value; } }
+
+		//mxd
+		public bool UseLongTextureNames { get { return uselongtexturenames; } set { uselongtexturenames = value; } }
+
+		//mxd. Position and scale
+		public Vector2D ViewPosition { get { return viewposition; } }
+		public float ViewScale { get { return viewscale; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		internal MapOptions()
+		{
+			// Initialize
+			this.previousname = "";
+			this.currentname = "";
+			this.configfile = "";
+			this.strictpatches = false;
+			this.resources = new DataLocationList();
+			this.mapconfig = new Configuration(true);
+			this.scriptfiles = new List<string>();
+			this.scriptcompiler = ""; //mxd
+			this.tagLabels = new Dictionary<int, string>(); //mxd
+			this.viewposition = new Vector2D(float.NaN, float.NaN); //mxd
+			this.viewscale = float.NaN; //mxd
+
+			//mxd. Sector drawing options
+			this.custombrightness = 196;
+			this.customceilheight = 128;
+		}
+
+		// Constructor to load from Doom Builder Map Settings Configuration
+		internal MapOptions(Configuration cfg, string mapname, bool longtexturenamessupported)
+		{
+			// Initialize
+			this.previousname = "";
+			this.currentname = mapname;
+			this.strictpatches = General.Int2Bool(cfg.ReadSetting("strictpatches", 0));
+			this.configfile = cfg.ReadSetting("gameconfig", "");
+			this.resources = new DataLocationList();
+			this.mapconfig = new Configuration(true);
+			this.scriptfiles = new List<string>();
+			
+			// Read map configuration
+			this.mapconfig.Root = cfg.ReadSetting("maps." + mapname, new Hashtable());
+
+			//mxd. Read Tag Labels
+			this.tagLabels = new Dictionary<int, string>();
+			ListDictionary tagLabelsData = (ListDictionary)this.mapconfig.ReadSetting("taglabels", new ListDictionary());
+
+			foreach(DictionaryEntry tagLabelsEntry in tagLabelsData) 
+			{
+				int tag = 0;
+				string label = string.Empty;
+
+				foreach(DictionaryEntry entry in (ListDictionary)tagLabelsEntry.Value) 
+				{
+					switch((string)entry.Key)
+					{
+						case "tag": tag = (int)entry.Value; break;
+						case "label": label = (string)entry.Value; break;
+					}
+				}
+
+				if(tag != 0 && !string.IsNullOrEmpty(label))
+					tagLabels.Add(tag, label);
+			}
+
+			//mxd. Script compiler
+			scriptcompiler = this.mapconfig.ReadSetting("scriptcompiler", string.Empty);
+
+			//mxd. Read Sector drawing options
+			defaultfloortexture = this.mapconfig.ReadSetting("defaultfloortexture", string.Empty);
+			defaultceiltexture = this.mapconfig.ReadSetting("defaultceiltexture", string.Empty);
+			defaulttoptexture = this.mapconfig.ReadSetting("defaulttoptexture", string.Empty);
+			defaultwalltexture = this.mapconfig.ReadSetting("defaultwalltexture", string.Empty);
+			defaultbottomtexture = this.mapconfig.ReadSetting("defaultbottomtexture", string.Empty);
+			custombrightness = General.Clamp(this.mapconfig.ReadSetting("custombrightness", 196), 0, 255);
+			customfloorheight = this.mapconfig.ReadSetting("customfloorheight", 0);
+			customceilheight = this.mapconfig.ReadSetting("customceilheight", 128);
+
+			//mxd. Read Sector drawing overrides
+			overridefloortexture = this.mapconfig.ReadSetting("overridefloortexture", false);
+			overrideceiltexture = this.mapconfig.ReadSetting("overrideceiltexture", false);
+			overridetoptexture = this.mapconfig.ReadSetting("overridetoptexture", false);
+			overridemiddletexture = this.mapconfig.ReadSetting("overridemiddletexture", false);
+			overridebottomtexture = this.mapconfig.ReadSetting("overridebottomtexture", false);
+			overridefloorheight = this.mapconfig.ReadSetting("overridefloorheight", false);
+			overrideceilheight = this.mapconfig.ReadSetting("overrideceilheight", false);
+			overridebrightness = this.mapconfig.ReadSetting("overridebrightness", false);
+
+			//mxd
+			uselongtexturenames = longtexturenamessupported && this.mapconfig.ReadSetting("uselongtexturenames", false);
+
+			//mxd. Position and scale
+			float vpx = this.mapconfig.ReadSetting("viewpositionx", float.NaN);
+			float vpy = this.mapconfig.ReadSetting("viewpositiony", float.NaN);
+			if(!float.IsNaN(vpx) && !float.IsNaN(vpy)) viewposition = new Vector2D(vpx, vpy);
+			viewscale = this.mapconfig.ReadSetting("viewscale", float.NaN);
+
+			// Resources
+			IDictionary reslist = this.mapconfig.ReadSetting("resources", new Hashtable());
+			foreach(DictionaryEntry mp in reslist)
+			{
+				// Item is a structure?
+				if(mp.Value is IDictionary)
+				{
+					// Create resource
+					IDictionary resinfo = (IDictionary)mp.Value;
+					DataLocation res = new DataLocation();
+					
+					// Copy information from Configuration to ResourceLocation
+					if(resinfo.Contains("type") && (resinfo["type"] is int)) res.type = (int)resinfo["type"];
+					if(resinfo.Contains("location") && (resinfo["location"] is string)) res.location = (string)resinfo["location"];
+					if(resinfo.Contains("textures") && (resinfo["textures"] is bool)) res.option1 = (bool)resinfo["textures"];
+					if(resinfo.Contains("flats") && (resinfo["flats"] is bool)) res.option2 = (bool)resinfo["flats"];
+
+					// Add resource
+					AddResource(res);
+				}
+			}
+
+			// Scripts
+			IDictionary scplist = this.mapconfig.ReadSetting("scripts", new Hashtable());
+			foreach(DictionaryEntry mp in scplist)
+				scriptfiles.Add(mp.Value.ToString());
+		}
+
+		~MapOptions()
+		{
+			// Clean up
+			this.resources = null;
+			this.scriptfiles = null;
+		}
+		
+		#endregion
+
+		#region ================== Methods
+
+		// This makes the path prefix for the given assembly
+		private static string GetPluginPathPrefix(Assembly asm)
+		{
+			Plugin p = General.Plugins.FindPluginByAssembly(asm);
+			return "plugins." + p.Name.ToLowerInvariant() + ".";
+		}
+
+		// ReadPluginSetting
+		public string ReadPluginSetting(string setting, string defaultsetting) { return mapconfig.ReadSetting(GetPluginPathPrefix(Assembly.GetCallingAssembly()) + setting, defaultsetting); }
+		public int ReadPluginSetting(string setting, int defaultsetting) { return mapconfig.ReadSetting(GetPluginPathPrefix(Assembly.GetCallingAssembly()) + setting, defaultsetting); }
+		public float ReadPluginSetting(string setting, float defaultsetting) { return mapconfig.ReadSetting(GetPluginPathPrefix(Assembly.GetCallingAssembly()) + setting, defaultsetting); }
+		public short ReadPluginSetting(string setting, short defaultsetting) { return mapconfig.ReadSetting(GetPluginPathPrefix(Assembly.GetCallingAssembly()) + setting, defaultsetting); }
+		public long ReadPluginSetting(string setting, long defaultsetting) { return mapconfig.ReadSetting(GetPluginPathPrefix(Assembly.GetCallingAssembly()) + setting, defaultsetting); }
+		public bool ReadPluginSetting(string setting, bool defaultsetting) { return mapconfig.ReadSetting(GetPluginPathPrefix(Assembly.GetCallingAssembly()) + setting, defaultsetting); }
+		public byte ReadPluginSetting(string setting, byte defaultsetting) { return mapconfig.ReadSetting(GetPluginPathPrefix(Assembly.GetCallingAssembly()) + setting, defaultsetting); }
+		public IDictionary ReadPluginSetting(string setting, IDictionary defaultsetting) { return mapconfig.ReadSetting(GetPluginPathPrefix(Assembly.GetCallingAssembly()) + setting, defaultsetting); }
+
+		// ReadPluginSetting with specific plugin
+		public string ReadPluginSetting(string pluginname, string setting, string defaultsetting) { return mapconfig.ReadSetting(pluginname.ToLowerInvariant() + "." + setting, defaultsetting); }
+		public int ReadPluginSetting(string pluginname, string setting, int defaultsetting) { return mapconfig.ReadSetting(pluginname.ToLowerInvariant() + "." + setting, defaultsetting); }
+		public float ReadPluginSetting(string pluginname, string setting, float defaultsetting) { return mapconfig.ReadSetting(pluginname.ToLowerInvariant() + "." + setting, defaultsetting); }
+		public short ReadPluginSetting(string pluginname, string setting, short defaultsetting) { return mapconfig.ReadSetting(pluginname.ToLowerInvariant() + "." + setting, defaultsetting); }
+		public long ReadPluginSetting(string pluginname, string setting, long defaultsetting) { return mapconfig.ReadSetting(pluginname.ToLowerInvariant() + "." + setting, defaultsetting); }
+		public bool ReadPluginSetting(string pluginname, string setting, bool defaultsetting) { return mapconfig.ReadSetting(pluginname.ToLowerInvariant() + "." + setting, defaultsetting); }
+		public byte ReadPluginSetting(string pluginname, string setting, byte defaultsetting) { return mapconfig.ReadSetting(pluginname.ToLowerInvariant() + "." + setting, defaultsetting); }
+		public IDictionary ReadPluginSetting(string pluginname, string setting, IDictionary defaultsetting) { return mapconfig.ReadSetting(pluginname.ToLowerInvariant() + "." + setting, defaultsetting); }
+
+		// WritePluginSetting
+		public bool WritePluginSetting(string setting, object settingvalue) { return mapconfig.WriteSetting(GetPluginPathPrefix(Assembly.GetCallingAssembly()) + setting, settingvalue); }
+
+		// DeletePluginSetting
+		public bool DeletePluginSetting(string setting) { return mapconfig.DeleteSetting(GetPluginPathPrefix(Assembly.GetCallingAssembly()) + setting); }
+		
+		// This stores the map options in a configuration
+		internal void WriteConfiguration(string settingsfile)
+		{
+			Configuration wadcfg;
+			
+			// Write resources to config
+			resources.WriteToConfig(mapconfig, "resources");
+
+			//mxd. Save selection groups
+			General.Map.Map.WriteSelectionGroups(mapconfig);
+
+			//mxd. Save Tag Labels
+			if(tagLabels.Count > 0) 
+			{
+				ListDictionary tagLabelsData = new ListDictionary();
+				int counter = 1;
+
+				foreach(KeyValuePair<int, string> group in tagLabels)
+				{
+					ListDictionary data = new ListDictionary();
+					data.Add("tag", group.Key);
+					data.Add("label", group.Value);
+					tagLabelsData.Add("taglabel"+counter, data);
+					counter++;
+				}
+
+				mapconfig.WriteSetting("taglabels", tagLabelsData);
+			}
+
+			//mxd. Write Sector drawing options
+			mapconfig.WriteSetting("defaultfloortexture", defaultfloortexture);
+			mapconfig.WriteSetting("defaultceiltexture", defaultceiltexture);
+			mapconfig.WriteSetting("defaulttoptexture", defaulttoptexture);
+			mapconfig.WriteSetting("defaultwalltexture", defaultwalltexture);
+			mapconfig.WriteSetting("defaultbottomtexture", defaultbottomtexture);
+			mapconfig.WriteSetting("custombrightness", custombrightness);
+			mapconfig.WriteSetting("customfloorheight", customfloorheight);
+			mapconfig.WriteSetting("customceilheight", customceilheight);
+
+			//mxd. Write Sector drawing overrides
+			mapconfig.WriteSetting("overridefloortexture", overridefloortexture);
+			mapconfig.WriteSetting("overrideceiltexture", overrideceiltexture);
+			mapconfig.WriteSetting("overridetoptexture", overridetoptexture);
+			mapconfig.WriteSetting("overridemiddletexture", overridemiddletexture);
+			mapconfig.WriteSetting("overridebottomtexture", overridebottomtexture);
+			mapconfig.WriteSetting("overridefloorheight", overridefloorheight);
+			mapconfig.WriteSetting("overrideceilheight", overrideceilheight);
+			mapconfig.WriteSetting("overridebrightness", overridebrightness);
+
+			//mxd
+			mapconfig.WriteSetting("uselongtexturenames", uselongtexturenames);
+
+			//mxd. Position and scale
+			mapconfig.WriteSetting("viewpositionx", General.Map.Renderer2D.OffsetX);
+			mapconfig.WriteSetting("viewpositiony", General.Map.Renderer2D.OffsetY);
+			mapconfig.WriteSetting("viewscale", General.Map.Renderer2D.Scale);
+
+			//mxd. Write script compiler
+			if(!string.IsNullOrEmpty(scriptcompiler))
+				mapconfig.WriteSetting("scriptcompiler", scriptcompiler);
+
+			// Write grid settings
+			General.Map.Grid.WriteToConfig(mapconfig, "grid");
+
+			// Write scripts to config
+			mapconfig.DeleteSetting("scripts");
+			for(int i = 0; i < scriptfiles.Count; i++)
+				mapconfig.WriteSetting("scripts." + "file" + i.ToString(CultureInfo.InvariantCulture), scriptfiles[i]);
+
+			// Load the file or make a new file
+			if(File.Exists(settingsfile))
+				wadcfg = new Configuration(settingsfile, true);
+			else
+				wadcfg = new Configuration(true);
+			
+			// Write configuration type information
+			wadcfg.WriteSetting("type", "Doom Builder Map Settings Configuration");
+			wadcfg.WriteSetting("gameconfig", configfile);
+			wadcfg.WriteSetting("strictpatches", General.Bool2Int(strictpatches));
+			
+			// Update the settings file with this map configuration
+			wadcfg.WriteSetting("maps." + currentname, mapconfig.Root);
+
+			// Save file
+			wadcfg.SaveConfiguration(settingsfile);
+		}
+		
+		// This adds a resource location and returns the index where the item was added
+		internal int AddResource(DataLocation res)
+		{
+			// Get a fully qualified path
+			res.location = Path.GetFullPath(res.location);
+			
+			// Go for all items in the list
+			for(int i = 0; i < resources.Count; i++)
+			{
+				// Check if location is already added
+				if(Path.GetFullPath(resources[i].location) == res.location)
+				{
+					// Update the item in the list
+					resources[i] = res;
+					return i;
+				}
+			}
+
+			// Add to list
+			resources.Add(res);
+			return resources.Count - 1;
+		}
+
+		/// <summary>
+		/// This returns the resource locations as configured.
+		/// </summary>
+		public DataLocationList GetResources()
+		{
+			return new DataLocationList(resources);
+		}
+
+		// This clears all reasource
+		internal void ClearResources()
+		{
+			// Clear list
+			resources.Clear();
+		}
+		
+		// This removes a resource by index
+		internal void RemoveResource(int index)
+		{
+			// Remove the item
+			resources.RemoveAt(index);
+		}
+		
+		// This copies resources from a list
+		internal void CopyResources(DataLocationList fromlist)
+		{
+			// Clear this list
+			resources.Clear();
+			resources.AddRange(fromlist);
+		}
+
+		// This loads the grid settings
+		internal void ApplyGridSettings()
+		{
+			General.Map.Grid.ReadFromConfig(mapconfig, "grid", General.Map.Config.UseLongTextureNames);
+		}
+
+		//mxd. This reads stored selection groups from the map configuration
+		internal void ReadSelectionGroups() 
+		{
+			General.Map.Map.ReadSelectionGroups(mapconfig);
+		}
+		
+		// This displays the current map name
+		public override string ToString()
+		{
+			return currentname;
+		}
+		
+		// This returns the UDMF field type
+		internal int GetUniversalFieldType(string elementname, string fieldname, int defaulttype)
+		{
+			// Check if the field type is set in the game configuration
+			int type = General.Map.Config.ReadSetting("universalfields." + elementname + "." + fieldname + ".type", -1);
+			if(type == -1)
+			{
+				// Read from map configuration
+				type = mapconfig.ReadSetting("fieldtypes." + elementname + "." + fieldname, defaulttype);
+			}
+
+			return type;
+		}
+
+		// This stores the UDMF field type
+		internal void SetUniversalFieldType(string elementname, string fieldname, int type)
+		{
+			// Check if the type of this field is not set in the game configuration
+			if(General.Map.Config.ReadSetting("universalfields." + elementname + "." + fieldname + ".type", -1) == -1)
+			{
+				// Write type to map configuration
+				mapconfig.WriteSetting("fieldtypes." + elementname + "." + fieldname, type);
+			}
+		}
+		
+		// This removes all UDMF field types
+		internal void ForgetUniversalFieldTypes()
+		{
+			mapconfig.DeleteSetting("fieldtypes");
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Map/MapSet.cs b/Source/Core/Map/MapSet.cs
new file mode 100644
index 0000000..5140763
--- /dev/null
+++ b/Source/Core/Map/MapSet.cs
@@ -0,0 +1,3434 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Drawing;
+using System.IO;
+using System.Linq;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.IO;
+using CodeImp.DoomBuilder.Types;
+using CodeImp.DoomBuilder.Windows;
+using CodeImp.DoomBuilder.VisualModes;
+using CodeImp.DoomBuilder.Data;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Map
+{
+	/// <summary>
+	/// Manages all geometry structures and things in a map. Also provides
+	/// methods to works with selections and marking elements for any purpose.
+	/// Note that most methods are of O(n) complexity.
+	/// </summary>
+	public sealed class MapSet
+	{
+		#region ================== Constants
+
+		/// <summary>Stiching distance. This is only to get around inaccuracies. Basically,
+		/// geometry only stitches when exactly on top of each other.</summary>
+		public const float STITCH_DISTANCE = 0.001f;
+		
+		// Virtual sector identification
+		// This contains a character that is invalid in the UDMF standard, but valid
+		// in our parser, so that it can only be used by Doom Builder and will never
+		// conflict with any other valid UDMF field.
+		internal const string VIRTUAL_SECTOR_FIELD = "!virtual_sector";
+		
+		//mxd
+		private const string SELECTION_GROUPS_PATH = "selectiongroups";
+		
+		// Handler for tag fields
+		public delegate void TagHandler<T>(MapElement element, bool actionargument, UniversalType type, ref int value, T obj);
+		
+		#endregion
+
+		#region ================== Variables
+
+		// Sector indexing
+		private List<int> indexholes;
+		private int lastsectorindex;
+		
+		// Sidedef indexing for (de)serialization
+		private Sidedef[] sidedefindices;
+		
+		// Map structures
+		private Vertex[] vertices;
+		private Linedef[] linedefs;
+		private Sidedef[] sidedefs;
+		private Sector[] sectors;
+		private Thing[] things;
+		private int numvertices;
+		private int numlinedefs;
+		private int numsidedefs;
+		private int numsectors;
+		private int numthings;
+		
+		// Behavior
+		private int freezearrays;
+		private bool autoremove;
+		
+		// Selected elements
+		private LinkedList<Vertex> sel_vertices;
+		private LinkedList<Linedef> sel_linedefs;
+		private LinkedList<Sector> sel_sectors;
+		private LinkedList<Thing> sel_things;
+		private SelectionType sel_type;
+		
+		// Statics
+		private static long emptylongname;
+		private static UniValue virtualsectorvalue;
+		
+		// Disposing
+		private bool isdisposed;
+
+		#endregion
+
+		#region ================== Properties
+		
+		/// <summary>Returns the number of selected sectors.</summary>
+		public int SelectedSectorsCount { get { return sel_sectors.Count; } }
+
+		/// <summary>Returns the number of selected linedefs.</summary>
+		public int SelectedLinedefsCount { get { return sel_linedefs.Count; } }
+
+		/// <summary>Returns the number of selected vertices.</summary>
+		public int SelectedVerticessCount { get { return sel_vertices.Count; } }
+
+		/// <summary>Returns the number of selected things.</summary>
+		public int SelectedThingsCount { get { return sel_things.Count; } }
+		
+		/// <summary>Returns a reference to the list of all vertices.</summary>
+		public ICollection<Vertex> Vertices { get { if(freezearrays == 0) return vertices; else return new MapElementCollection<Vertex>(ref vertices, numvertices); } }
+
+		/// <summary>Returns a reference to the list of all linedefs.</summary>
+		public ICollection<Linedef> Linedefs { get { if(freezearrays == 0) return linedefs; else return new MapElementCollection<Linedef>(ref linedefs, numlinedefs); } }
+
+		/// <summary>Returns a reference to the list of all sidedefs.</summary>
+		public ICollection<Sidedef> Sidedefs { get { if(freezearrays == 0) return sidedefs; else return new MapElementCollection<Sidedef>(ref sidedefs, numsidedefs); } }
+
+		/// <summary>Returns a reference to the list of all sectors.</summary>
+		public ICollection<Sector> Sectors { get { if(freezearrays == 0) return sectors; else return new MapElementCollection<Sector>(ref sectors, numsectors); } }
+
+		/// <summary>Returns a reference to the list of all things.</summary>
+		public ICollection<Thing> Things { get { if(freezearrays == 0) return things; else return new MapElementCollection<Thing>(ref things, numthings); } }
+
+		/// <summary>Indicates if the map is disposed.</summary>
+		public bool IsDisposed { get { return isdisposed; } }
+		
+		/// <summary>Returns a reference to the list of selected vertices.</summary>
+		internal LinkedList<Vertex> SelectedVertices { get { return sel_vertices; } }
+
+		/// <summary>Returns a reference to the list of selected linedefs.</summary>
+		internal LinkedList<Linedef> SelectedLinedefs { get { return sel_linedefs; } }
+
+		/// <summary>Returns a reference to the list of selected sectors.</summary>
+		internal LinkedList<Sector> SelectedSectors { get { return sel_sectors; } }
+
+		/// <summary>Returns a reference to the list of selected things.</summary>
+		internal LinkedList<Thing> SelectedThings { get { return sel_things; } }
+		
+		/// <summary>Returns the current type of selection.</summary>
+		public SelectionType SelectionType { get { return sel_type; } set { sel_type = value; } }
+
+		/// <summary>Long name to indicate "no texture". This is the long name for a single dash.</summary>
+		public static long EmptyLongName { get { return emptylongname; } }
+
+		/// <summary>Returns the name of the custom field that marks virtual sectors in pasted geometry.</summary>
+		public static string VirtualSectorField { get { return VIRTUAL_SECTOR_FIELD; } }
+
+		/// <summary>Returns the value of the custom field that marks virtual sectors in pasted geometry.</summary>
+		public static UniValue VirtualSectorValue { get { return virtualsectorvalue; } }
+		
+		internal Sidedef[] SidedefIndices { get { return sidedefindices; } }
+
+		internal bool AutoRemove { get { return autoremove; } set { autoremove = value; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor for new empty map
+		internal MapSet()
+		{
+			// Initialize
+			vertices = new Vertex[0];
+			linedefs = new Linedef[0];
+			sidedefs = new Sidedef[0];
+			sectors = new Sector[0];
+			things = new Thing[0];
+			sel_vertices = new LinkedList<Vertex>();
+			sel_linedefs = new LinkedList<Linedef>();
+			sel_sectors = new LinkedList<Sector>();
+			sel_things = new LinkedList<Thing>();
+			indexholes = new List<int>();
+			lastsectorindex = 0;
+			autoremove = true;
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Constructor for map to deserialize
+		internal MapSet(MemoryStream stream)
+		{
+			// Initialize
+			vertices = new Vertex[0];
+			linedefs = new Linedef[0];
+			sidedefs = new Sidedef[0];
+			sectors = new Sector[0];
+			things = new Thing[0];
+			sel_vertices = new LinkedList<Vertex>();
+			sel_linedefs = new LinkedList<Linedef>();
+			sel_sectors = new LinkedList<Sector>();
+			sel_things = new LinkedList<Thing>();
+			indexholes = new List<int>();
+			lastsectorindex = 0;
+			autoremove = true;
+
+			// Deserialize
+			Deserialize(stream);
+
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Disposer
+		internal void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Already set isdisposed so that changes can be prohibited
+				isdisposed = true;
+				BeginAddRemove();
+				
+				// Dispose all things
+				while((things.Length > 0) && (things[0] != null))
+					things[0].Dispose();
+
+				// Dispose all sectors
+				while((sectors.Length > 0) && (sectors[0] != null))
+					sectors[0].Dispose();
+
+				// Dispose all sidedefs
+				while((sidedefs.Length > 0) && (sidedefs[0] != null))
+					sidedefs[0].Dispose();
+
+				// Dispose all linedefs
+				while((linedefs.Length > 0) && (linedefs[0] != null))
+					linedefs[0].Dispose();
+
+				// Dispose all vertices
+				while((vertices.Length > 0) && (vertices[0] != null))
+					vertices[0].Dispose();
+
+				// Clean up
+				vertices = null;
+				linedefs = null;
+				sidedefs = null;
+				sectors = null;
+				things = null;
+				sel_vertices = null;
+				sel_linedefs = null;
+				sel_sectors = null;
+				sel_things = null;
+				indexholes = null;
+				
+				// Done
+				isdisposed = true;
+			}
+		}
+
+		// Static initializer
+		internal static void Initialize()
+		{
+			emptylongname = Lump.MakeLongName("-", false);
+			virtualsectorvalue = new UniValue((int)UniversalType.Integer, 0);
+		}
+
+		#endregion
+
+		#region ================== Management
+		
+		// This begins large add/remove operations
+		public void BeginAddRemove()
+		{
+			freezearrays++;
+		}
+
+		// This allocates the arrays to a minimum size so that
+		// a lot of items can be created faster. This function will never
+		// allocate less than the current number of items.
+		public void SetCapacity(int nvertices, int nlinedefs, int nsidedefs, int nsectors, int nthings)
+		{
+			if(freezearrays == 0)
+				throw new Exception("You must call BeginAddRemove before setting the reserved capacity.");
+
+			if(numvertices < nvertices)
+				Array.Resize(ref vertices, nvertices);
+
+			if(numlinedefs < nlinedefs)
+				Array.Resize(ref linedefs, nlinedefs);
+
+			if(numsidedefs < nsidedefs)
+				Array.Resize(ref sidedefs, nsidedefs);
+
+			if(numsectors < nsectors)
+				Array.Resize(ref sectors, nsectors);
+
+			if(numthings < nthings)
+				Array.Resize(ref things, nthings);
+		}
+		
+		// This ends add/remove operations and crops the arrays
+		public void EndAddRemove()
+		{
+			if(freezearrays > 0)
+				freezearrays--;
+
+			if(freezearrays == 0)
+			{
+				if(numvertices < vertices.Length)
+					Array.Resize(ref vertices, numvertices);
+
+				if(numlinedefs < linedefs.Length)
+					Array.Resize(ref linedefs, numlinedefs);
+
+				if(numsidedefs < sidedefs.Length)
+					Array.Resize(ref sidedefs, numsidedefs);
+
+				if(numsectors < sectors.Length)
+					Array.Resize(ref sectors, numsectors);
+
+				if(numthings < things.Length)
+					Array.Resize(ref things, numthings);
+			}
+		}
+		
+		/// <summary>
+		/// This makes a deep copy and returns the new MapSet.
+		/// </summary>
+		public MapSet Clone()
+		{
+			// Create the map set
+			MapSet newset = new MapSet();
+			newset.BeginAddRemove();
+			newset.SetCapacity(numvertices, numlinedefs, numsidedefs, numsectors, numthings);
+			
+			// Go for all vertices
+			foreach(Vertex v in vertices)
+			{
+				// Make new vertex
+				v.Clone = newset.CreateVertex(v.Position);
+				v.CopyPropertiesTo(v.Clone);
+			}
+
+			// Go for all sectors
+			foreach(Sector s in sectors)
+			{
+				// Make new sector
+				s.Clone = newset.CreateSector();
+				s.CopyPropertiesTo(s.Clone);
+			}
+
+			// Go for all linedefs
+			foreach(Linedef l in linedefs)
+			{
+				// Make new linedef
+				Linedef nl = newset.CreateLinedef(l.Start.Clone, l.End.Clone);
+				l.CopyPropertiesTo(nl);
+
+				// Linedef has a front side?
+				if(l.Front != null)
+				{
+					// Make new sidedef
+					Sidedef nd = newset.CreateSidedef(nl, true, l.Front.Sector.Clone);
+					l.Front.CopyPropertiesTo(nd);
+				}
+
+				// Linedef has a back side?
+				if(l.Back != null)
+				{
+					// Make new sidedef
+					Sidedef nd = newset.CreateSidedef(nl, false, l.Back.Sector.Clone);
+					l.Back.CopyPropertiesTo(nd);
+				}
+			}
+			
+			// Go for all things
+			foreach(Thing t in things)
+			{
+				// Make new thing
+				Thing nt = newset.CreateThing();
+				t.CopyPropertiesTo(nt);
+			}
+			
+			// Remove clone references
+			foreach(Vertex v in vertices) v.Clone = null;
+			foreach(Sector s in sectors) s.Clone = null;
+			
+			// Return the new set
+			newset.EndAddRemove();
+			return newset;
+		}
+
+		// This makes a deep copy of the marked geometry and binds missing sectors to a virtual sector
+		internal MapSet CloneMarked()
+		{
+			Sector virtualsector = null;
+			
+			// Create the map set
+			MapSet newset = new MapSet();
+			newset.BeginAddRemove();
+
+			// Get marked geometry
+			ICollection<Vertex> mvertices = GetMarkedVertices(true);
+			ICollection<Linedef> mlinedefs = GetMarkedLinedefs(true);
+			ICollection<Sector> msectors = GetMarkedSectors(true);
+			ICollection<Thing> mthings = GetMarkedThings(true);
+			newset.SetCapacity(mvertices.Count, mlinedefs.Count, numsidedefs, msectors.Count, mthings.Count);
+			
+			// Go for all vertices
+			foreach(Vertex v in mvertices)
+			{
+				// Make new vertex
+				v.Clone = newset.CreateVertex(v.Position);
+				v.CopyPropertiesTo(v.Clone);
+			}
+
+			// Go for all sectors
+			foreach(Sector s in msectors)
+			{
+				// Make new sector
+				s.Clone = newset.CreateSector();
+				s.CopyPropertiesTo(s.Clone);
+			}
+
+			// Go for all linedefs
+			foreach(Linedef l in mlinedefs)
+			{
+				// Make new linedef
+				Linedef nl = newset.CreateLinedef(l.Start.Clone, l.End.Clone);
+				l.CopyPropertiesTo(nl);
+
+				// Linedef has a front side?
+				if(l.Front != null)
+				{
+					Sidedef nd;
+					
+					// Sector on front side marked?
+					if(l.Front.Sector.Marked)
+					{
+						// Make new sidedef
+						nd = newset.CreateSidedef(nl, true, l.Front.Sector.Clone);
+					}
+					else
+					{
+						// Make virtual sector if needed
+						if(virtualsector == null)
+						{
+							virtualsector = newset.CreateSector();
+							l.Front.Sector.CopyPropertiesTo(virtualsector);
+							virtualsector.Fields.BeforeFieldsChange();
+							virtualsector.Fields[VIRTUAL_SECTOR_FIELD] = new UniValue(virtualsectorvalue);
+						}
+						
+						// Make new sidedef that links to the virtual sector
+						nd = newset.CreateSidedef(nl, true, virtualsector);
+					}
+					
+					l.Front.CopyPropertiesTo(nd);
+				}
+
+				// Linedef has a back side?
+				if(l.Back != null)
+				{
+					Sidedef nd;
+
+					// Sector on front side marked?
+					if(l.Back.Sector.Marked)
+					{
+						// Make new sidedef
+						nd = newset.CreateSidedef(nl, false, l.Back.Sector.Clone);
+					}
+					else
+					{
+						// Make virtual sector if needed
+						if(virtualsector == null)
+						{
+							virtualsector = newset.CreateSector();
+							l.Back.Sector.CopyPropertiesTo(virtualsector);
+							virtualsector.Fields.BeforeFieldsChange();
+							virtualsector.Fields[VIRTUAL_SECTOR_FIELD] = new UniValue(virtualsectorvalue);
+						}
+
+						// Make new sidedef that links to the virtual sector
+						nd = newset.CreateSidedef(nl, false, virtualsector);
+					}
+					
+					l.Back.CopyPropertiesTo(nd);
+				}
+			}
+
+			// Go for all things
+			foreach(Thing t in mthings)
+			{
+				// Make new thing
+				Thing nt = newset.CreateThing();
+				t.CopyPropertiesTo(nt);
+			}
+
+			// Remove clone references
+			foreach(Vertex v in vertices) v.Clone = null;
+			foreach(Sector s in sectors) s.Clone = null;
+
+			// Return the new set
+			newset.EndAddRemove();
+			return newset;
+		}
+		
+		/// <summary>This creates a new vertex and returns it.</summary>
+		public Vertex CreateVertex(Vector2D pos)
+		{
+			if(numvertices == General.Map.FormatInterface.MaxVertices)
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "Failed to complete operation: maximum number of vertices reached.");
+				return null;
+			}
+			
+			// Make the vertex
+			Vertex v = new Vertex(this, numvertices, pos);
+			AddItem(v, ref vertices, numvertices, ref numvertices);
+			return v;
+		}
+
+		/// <summary>This creates a new vertex and returns it.</summary>
+		public Vertex CreateVertex(int index, Vector2D pos)
+		{
+			if(numvertices == General.Map.FormatInterface.MaxVertices)
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "Failed to complete operation: maximum number of vertices reached.");
+				return null;
+			}
+
+			// Make the vertex
+			Vertex v = new Vertex(this, index, pos);
+			AddItem(v, ref vertices, index, ref numvertices);
+			return v;
+		}
+
+		/// <summary>This creates a new linedef and returns it.</summary>
+		public Linedef CreateLinedef(Vertex start, Vertex end)
+		{
+			if(numlinedefs == General.Map.FormatInterface.MaxLinedefs)
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "Failed to complete operation: maximum number of linedefs reached.");
+				return null;
+			}
+
+			// Make the linedef
+			Linedef l = new Linedef(this, numlinedefs, start, end);
+			AddItem(l, ref linedefs, numlinedefs, ref numlinedefs);
+			return l;
+		}
+
+		/// <summary>This creates a new linedef and returns it.</summary>
+		public Linedef CreateLinedef(int index, Vertex start, Vertex end)
+		{
+			if(numlinedefs == General.Map.FormatInterface.MaxLinedefs)
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "Failed to complete operation: maximum number of linedefs reached.");
+				return null;
+			}
+
+			// Make the linedef
+			Linedef l = new Linedef(this, index, start, end);
+			AddItem(l, ref linedefs, index, ref numlinedefs);
+			return l;
+		}
+
+		/// <summary>This creates a new sidedef and returns it.</summary>
+		public Sidedef CreateSidedef(Linedef l, bool front, Sector s)
+		{
+			if(numsidedefs == int.MaxValue)
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "Failed to complete operation: maximum number of sidedefs reached.");
+				return null;
+			}
+			
+			// Make the sidedef
+			Sidedef sd = new Sidedef(this, numsidedefs, l, front, s);
+			AddItem(sd, ref sidedefs, numsidedefs, ref numsidedefs);
+			return sd;
+		}
+
+		/// <summary>This creates a new sidedef and returns it.</summary>
+		public Sidedef CreateSidedef(int index, Linedef l, bool front, Sector s)
+		{
+			if(numsidedefs == int.MaxValue)
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "Failed to complete operation: maximum number of sidedefs reached.");
+				return null;
+			}
+
+			// Make the sidedef
+			Sidedef sd = new Sidedef(this, index, l, front, s);
+			AddItem(sd, ref sidedefs, index, ref numsidedefs);
+			return sd;
+		}
+
+		/// <summary>This creates a new sector and returns it.</summary>
+		public Sector CreateSector()
+		{
+			// Make the sector
+			return CreateSector(numsectors);
+		}
+
+		/// <summary>This creates a new sector and returns it.</summary>
+		public Sector CreateSector(int index)
+		{
+			int fixedindex;
+
+			if(numsectors == General.Map.FormatInterface.MaxSectors)
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "Failed to complete operation: maximum number of sectors reached.");
+				return null;
+			}
+
+			// Do we have any index holes we can use?
+			if(indexholes.Count > 0)
+			{
+				// Take one of the index holes
+				fixedindex = indexholes[indexholes.Count - 1];
+				indexholes.RemoveAt(indexholes.Count - 1);
+			}
+			else
+			{
+				// Make a new index
+				fixedindex = lastsectorindex++;
+			}
+			
+			// Make the sector
+			return CreateSectorEx(fixedindex, index);
+		}
+
+		// This creates a new sector with a specific fixed index
+		private Sector CreateSectorEx(int fixedindex, int index)
+		{
+			if(numsectors == General.Map.FormatInterface.MaxSectors)
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "Failed to complete operation: maximum number of sectors reached.");
+				return null;
+			}
+
+			// Make the sector
+			Sector s = new Sector(this, index, fixedindex);
+			AddItem(s, ref sectors, index, ref numsectors);
+			return s;
+		}
+
+		/// <summary>This creates a new thing and returns it.</summary>
+		public Thing CreateThing()
+		{
+			if(numthings == General.Map.FormatInterface.MaxThings)
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "Failed to complete operation: maximum number of things reached.");
+				return null;
+			}
+
+			// Make the thing
+			Thing t = new Thing(this, numthings);
+			AddItem(t, ref things, numthings, ref numthings);
+			return t;
+		}
+
+		/// <summary>This creates a new thing and returns it.</summary>
+		public Thing CreateThing(int index)
+		{
+			if(numthings == General.Map.FormatInterface.MaxThings)
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "Failed to complete operation: maximum number of things reached.");
+				return null;
+			}
+
+			// Make the thing
+			Thing t = new Thing(this, index);
+			AddItem(t, ref things, index, ref numthings);
+			return t;
+		}
+
+		// This increases the size of the array to add an item
+		private void AddItem<T>(T item, ref T[] array, int index, ref int counter) where T: MapElement
+		{
+			// Only resize when there are no more free entries
+			if(counter == array.Length)
+			{
+				if(freezearrays == 0)
+					Array.Resize(ref array, counter + 1);
+				else
+					Array.Resize(ref array, counter + 10);
+			}
+			
+			// Move item at the given index if the new item is not added at the end
+			if(index != counter)
+			{
+				array[counter] = array[index];
+				array[counter].Index = counter;
+			}
+
+			// Add item
+			array[index] = item;
+			counter++;
+		}
+		
+		// This adds a sector index hole
+		internal void AddSectorIndexHole(int index)
+		{
+			indexholes.Add(index);
+		}
+		
+		private void RemoveItem<T>(ref T[] array, int index, ref int counter) where T: MapElement
+		{
+			if(index == (counter - 1))
+			{
+				array[index] = null;
+			}
+			else
+			{
+				array[index] = array[counter - 1];
+				array[index].Index = index;
+				array[counter - 1] = null;
+			}
+			
+			counter--;
+
+			if(freezearrays == 0)
+				Array.Resize(ref array, counter);
+		}
+		
+		internal void RemoveVertex(int index)
+		{
+			RemoveItem(ref vertices, index, ref numvertices);
+		}
+
+		internal void RemoveLinedef(int index)
+		{
+			RemoveItem(ref linedefs, index, ref numlinedefs);
+		}
+
+		internal void RemoveSidedef(int index)
+		{
+			RemoveItem(ref sidedefs, index, ref numsidedefs);
+		}
+
+		internal void RemoveSector(int index)
+		{
+			RemoveItem(ref sectors, index, ref numsectors);
+		}
+
+		internal void RemoveThing(int index)
+		{
+			RemoveItem(ref things, index, ref numthings);
+		}		
+		
+		#endregion
+
+		#region ================== Serialization
+
+		// This serializes the MapSet
+		internal MemoryStream Serialize()
+		{
+			MemoryStream stream = new MemoryStream(20000000);	// Yes that is about 20 MB.
+			SerializerStream serializer = new SerializerStream(stream);
+			
+			// Index the sidedefs
+			int sidedefindex = 0;
+			foreach(Sidedef sd in sidedefs)
+				sd.SerializedIndex = sidedefindex++;
+
+			serializer.Begin();
+
+			// Write private data
+			serializer.wInt(lastsectorindex);
+			serializer.wInt(indexholes.Count);
+			foreach(int i in indexholes) serializer.wInt(i);
+
+			// Write map data
+			WriteVertices(serializer);
+			WriteSectors(serializer);
+			WriteLinedefs(serializer);
+			WriteSidedefs(serializer);
+			WriteThings(serializer);
+
+			serializer.End();
+
+			// Reallocate to keep only the used memory
+			stream.Capacity = (int)stream.Length;
+			
+			return stream;
+		}
+
+		// This serializes things
+		private void WriteThings(SerializerStream stream)
+		{
+			stream.wInt(numthings);
+			
+			// Go for all things
+			foreach(Thing t in things)
+			{
+				t.ReadWrite(stream);
+			}
+		}
+
+		// This serializes vertices
+		private void WriteVertices(SerializerStream stream)
+		{
+			stream.wInt(numvertices);
+
+			// Go for all vertices
+			int index = 0;
+			foreach(Vertex v in vertices)
+			{
+				v.SerializedIndex = index++;
+				
+				v.ReadWrite(stream);
+			}
+		}
+
+		// This serializes linedefs
+		private void WriteLinedefs(SerializerStream stream)
+		{
+			stream.wInt(numlinedefs);
+
+			// Go for all lines
+			int index = 0;
+			foreach(Linedef l in linedefs)
+			{
+				l.SerializedIndex = index++;
+				
+				stream.wInt(l.Start.SerializedIndex);
+				
+				stream.wInt(l.End.SerializedIndex);
+
+				l.ReadWrite(stream);
+			}
+		}
+
+		// This serializes sidedefs
+		private void WriteSidedefs(SerializerStream stream)
+		{
+			stream.wInt(numsidedefs);
+
+			// Go for all sidedefs
+			foreach(Sidedef sd in sidedefs)
+			{
+				stream.wInt(sd.Line.SerializedIndex);
+				
+				stream.wInt(sd.Sector.SerializedIndex);
+
+				stream.wBool(sd.IsFront);
+
+				sd.ReadWrite(stream);
+			}
+		}
+
+		// This serializes sectors
+		private void WriteSectors(SerializerStream stream)
+		{
+			stream.wInt(numsectors);
+
+			// Go for all sectors
+			int index = 0;
+			foreach(Sector s in sectors)
+			{
+				s.SerializedIndex = index++;
+
+				s.ReadWrite(stream);
+				s.Triangles.ReadWrite(stream); //mxd
+			}
+		}
+
+		#endregion
+
+		#region ================== Deserialization
+
+		// This deserializes the MapSet
+		internal void Deserialize(MemoryStream stream)
+		{
+			stream.Seek(0, SeekOrigin.Begin);
+			DeserializerStream deserializer = new DeserializerStream(stream);
+
+			deserializer.Begin();
+
+			// Read private data
+			int c;
+			deserializer.rInt(out lastsectorindex);
+			deserializer.rInt(out c);
+			indexholes = new List<int>(c);
+			for(int i = 0; i < c; i++)
+			{
+				int index; deserializer.rInt(out index);
+				indexholes.Add(index);
+			}
+
+			// Read map data
+			Vertex[] verticesarray = ReadVertices(deserializer);
+			Sector[] sectorsarray = ReadSectors(deserializer);
+			Linedef[] linedefsarray = ReadLinedefs(deserializer, verticesarray);
+			ReadSidedefs(deserializer, linedefsarray, sectorsarray);
+			ReadThings(deserializer);
+
+			deserializer.End();
+
+			// Make table of sidedef indices
+			sidedefindices = new Sidedef[numsidedefs];
+			foreach(Sidedef sd in sidedefs)
+				sidedefindices[sd.SerializedIndex] = sd;
+				
+			// Call PostDeserialize
+			foreach(Sector s in sectors)
+				s.PostDeserialize(this);
+		}
+		
+		// This deserializes things
+		private void ReadThings(DeserializerStream stream)
+		{
+			int c; stream.rInt(out c);
+
+			// Go for all things
+			for(int i = 0; i < c; i++)
+			{
+				Thing t = CreateThing();
+				t.ReadWrite(stream);
+			}
+		}
+
+		// This deserializes vertices
+		private Vertex[] ReadVertices(DeserializerStream stream)
+		{
+			int c; stream.rInt(out c);
+
+			Vertex[] array = new Vertex[c];
+
+			// Go for all vertices
+			for(int i = 0; i < c; i++)
+			{
+				array[i] = CreateVertex(new Vector2D());
+				array[i].ReadWrite(stream);
+			}
+
+			return array;
+		}
+
+		// This deserializes linedefs
+		private Linedef[] ReadLinedefs(DeserializerStream stream, Vertex[] verticesarray)
+		{
+			int c; stream.rInt(out c);
+
+			Linedef[] array = new Linedef[c];
+
+			// Go for all lines
+			for(int i = 0; i < c; i++)
+			{
+				int start, end;
+				
+				stream.rInt(out start);
+
+				stream.rInt(out end);
+
+				array[i] = CreateLinedef(verticesarray[start], verticesarray[end]);
+				array[i].ReadWrite(stream);
+			}
+
+			return array;
+		}
+
+		// This deserializes sidedefs
+		private void ReadSidedefs(DeserializerStream stream, Linedef[] linedefsarray, Sector[] sectorsarray)
+		{
+			int c; stream.rInt(out c);
+
+			// Go for all sidedefs
+			for(int i = 0; i < c; i++)
+			{
+				int lineindex, sectorindex;
+				bool front;
+				
+				stream.rInt(out lineindex);
+
+				stream.rInt(out sectorindex);
+
+				stream.rBool(out front);
+
+				Sidedef sd = CreateSidedef(linedefsarray[lineindex], front, sectorsarray[sectorindex]);
+				sd.ReadWrite(stream);
+			}
+		}
+
+		// This deserializes sectors
+		private Sector[] ReadSectors(DeserializerStream stream)
+		{
+			int c; stream.rInt(out c);
+
+			Sector[] array = new Sector[c];
+
+			// Go for all sectors
+			for(int i = 0; i < c; i++)
+			{
+				array[i] = CreateSector();
+				array[i].ReadWrite(stream);
+				array[i].Triangles.ReadWrite(stream); //mxd
+			}
+
+			return array;
+		}
+
+		#endregion
+
+		#region ================== Updating
+
+		/// <summary>
+		/// This updates the cache of all elements where needed. You must call this after making changes to the map.
+		/// </summary>
+		public void Update()
+		{
+			// Update all!
+			Update(true, true);
+		}
+
+		/// <summary>
+		/// This updates the cache of all elements where needed. It is not recommended to use this version, please use Update() instead.
+		/// </summary>
+		public void Update(bool dolines, bool dosectors)
+		{
+			// Update all linedefs
+			if(dolines) foreach(Linedef l in linedefs) l.UpdateCache();
+			
+			// Update all sectors
+			if(dosectors)
+			{
+				foreach(Sector s in sectors) s.Triangulate();
+				General.Map.CRenderer2D.Surfaces.AllocateBuffers();
+				foreach(Sector s in sectors) s.CreateSurfaces();
+				General.Map.CRenderer2D.Surfaces.UnlockBuffers();
+			}
+		}
+		
+		/// <summary>
+		/// This updates the cache of all elements that is required after a configuration or settings change.
+		/// </summary>
+		public void UpdateConfiguration()
+		{
+			// Update all things
+			foreach(Thing t in things) t.UpdateConfiguration();
+		}
+		
+		#endregion
+
+		#region ================== Selection
+		
+		// This checks a flag in a selection type
+		private static bool InSelectionType(SelectionType value, SelectionType bits)
+		{
+			return (value & bits) == bits;
+		}
+
+		/// <summary>This converts the current selection to a different type of selection as specified.
+		/// Note that this function uses the markings to convert the selection.</summary>
+		public void ConvertSelection(SelectionType target)
+		{
+			ConvertSelection(SelectionType.All, target);
+		}
+
+		/// <summary>This converts the current selection to a different type of selection as specified.
+		/// Note that this function uses the markings to convert the selection.</summary>
+		public void ConvertSelection(SelectionType source, SelectionType target)
+		{
+			ClearAllMarks(false);
+			
+			switch(target)
+			{
+				// Convert geometry selection to vertices only
+				case SelectionType.Vertices:
+					if(InSelectionType(source, SelectionType.Linedefs)) MarkSelectedLinedefs(true, true);
+					if(InSelectionType(source, SelectionType.Sectors)) General.Map.Map.MarkSelectedSectors(true, true);
+					ICollection<Vertex> verts = General.Map.Map.GetVerticesFromLinesMarks(true);
+					foreach(Vertex v in verts) v.Selected = true;
+					verts = General.Map.Map.GetVerticesFromSectorsMarks(true);
+					foreach(Vertex v in verts) v.Selected = true;
+					General.Map.Map.ClearSelectedSectors();
+					General.Map.Map.ClearSelectedLinedefs();
+					break;
+					
+				// Convert geometry selection to linedefs only
+				case SelectionType.Linedefs:
+					if(InSelectionType(source, SelectionType.Vertices)) MarkSelectedVertices(true, true);
+					if(!InSelectionType(source, SelectionType.Linedefs)) ClearSelectedLinedefs();
+					ICollection<Linedef> lines = General.Map.Map.LinedefsFromMarkedVertices(false, true, false);
+					foreach(Linedef l in lines) l.Selected = true;
+					if(InSelectionType(source, SelectionType.Sectors))
+					{
+						foreach(Sector s in General.Map.Map.Sectors)
+						{
+							if(s.Selected)
+							{
+								foreach(Sidedef sd in s.Sidedefs)
+									sd.Line.Selected = true;
+							}
+						}
+					}
+					General.Map.Map.ClearSelectedSectors();
+					General.Map.Map.ClearSelectedVertices();
+					break;
+					
+				// Convert geometry selection to sectors only
+				case SelectionType.Sectors:
+					if(InSelectionType(source, SelectionType.Vertices)) MarkSelectedVertices(true, true);
+					if(!InSelectionType(source, SelectionType.Linedefs)) ClearSelectedLinedefs();
+					lines = LinedefsFromMarkedVertices(false, true, false);
+					foreach(Linedef l in lines) l.Selected = true;
+					ClearMarkedSectors(true);
+					foreach(Linedef l in linedefs)
+					{
+						if(!l.Selected)
+						{
+							if(l.Front != null) l.Front.Sector.Marked = false;
+							if(l.Back != null) l.Back.Sector.Marked = false;
+						}
+					}
+					ClearSelectedLinedefs();
+					ClearSelectedVertices();
+					if(InSelectionType(source, SelectionType.Sectors))
+					{
+						foreach(Sector s in General.Map.Map.Sectors)
+						{
+							if(s.Selected || (s.Marked && s.Sidedefs.Count > 0))
+							{
+								s.Selected = true;
+								foreach(Sidedef sd in s.Sidedefs)
+									sd.Line.Selected = true;
+							}
+						}
+					}
+					else
+					{
+						foreach(Sector s in General.Map.Map.Sectors)
+						{
+							if(s.Marked && s.Sidedefs.Count > 0)
+							{
+								s.Selected = true;
+								foreach(Sidedef sd in s.Sidedefs)
+									sd.Line.Selected = true;
+							}
+							else
+							{
+								s.Selected = false;
+							}
+						}
+					}
+					break;
+					
+				default:
+					throw new ArgumentException("Unsupported selection target conversion");
+			}
+			
+			// New selection type
+			sel_type = target;
+		}
+
+		/// <summary>This clears all selected items</summary>
+		public void ClearAllSelected()
+		{
+			ClearSelectedVertices();
+			ClearSelectedThings();
+			ClearSelectedLinedefs();
+			ClearSelectedSectors();
+		}
+
+		/// <summary>This clears selected vertices.</summary>
+		public void ClearSelectedVertices()
+		{
+			sel_vertices.Clear();
+			foreach(Vertex v in vertices) v.Selected = false;
+		}
+
+		/// <summary>This clears selected things.</summary>
+		public void ClearSelectedThings()
+		{
+			sel_things.Clear();
+			foreach(Thing t in things) t.Selected = false;
+		}
+
+		/// <summary>This clears selected linedefs.</summary>
+		public void ClearSelectedLinedefs()
+		{
+			sel_linedefs.Clear();
+			foreach(Linedef l in linedefs) l.Selected = false;
+		}
+
+		/// <summary>This clears selected sectors.</summary>
+		public void ClearSelectedSectors()
+		{
+			sel_sectors.Clear();
+			foreach(Sector s in sectors) s.Selected = false;
+		}
+
+		/// <summary>Returns a collection of vertices that match a selected state.</summary>
+		public ICollection<Vertex> GetSelectedVertices(bool selected)
+		{
+			if(selected)
+			{
+				return new List<Vertex>(sel_vertices);
+			}
+			else
+			{
+				List<Vertex> list = new List<Vertex>(numvertices - sel_vertices.Count);
+				foreach(Vertex v in vertices) if(!v.Selected) list.Add(v);
+				return list;
+			}
+		}
+
+		/// <summary>Returns a collection of things that match a selected state.</summary>
+		public ICollection<Thing> GetSelectedThings(bool selected)
+		{
+			if(selected)
+			{
+				return new List<Thing>(sel_things);
+			}
+			else
+			{
+				List<Thing> list = new List<Thing>(numthings - sel_things.Count);
+				foreach(Thing t in things) if(!t.Selected) list.Add(t);
+				return list;
+			}
+		}
+
+		/// <summary>Returns a collection of linedefs that match a selected state.</summary>
+		public ICollection<Linedef> GetSelectedLinedefs(bool selected)
+		{
+			if(selected)
+			{
+				return new List<Linedef>(sel_linedefs);
+			}
+			else
+			{
+				List<Linedef> list = new List<Linedef>(numlinedefs - sel_linedefs.Count);
+				foreach(Linedef l in linedefs) if(!l.Selected) list.Add(l);
+				return list;
+			}
+		}
+
+		/// <summary>Returns a collection of sidedefs that match a selected linedefs state.</summary>
+		public ICollection<Sidedef> GetSidedefsFromSelectedLinedefs(bool selected)
+		{
+			if(selected)
+			{
+				List<Sidedef> list = new List<Sidedef>(sel_linedefs.Count);
+				foreach(Linedef ld in sel_linedefs)
+				{
+					if(ld.Front != null) list.Add(ld.Front);
+					if(ld.Back != null) list.Add(ld.Back);
+				}
+				return list;
+			}
+			else
+			{
+				List<Sidedef> list = new List<Sidedef>(numlinedefs - sel_linedefs.Count);
+				foreach(Linedef ld in linedefs)
+				{
+					if(!ld.Selected && (ld.Front != null)) list.Add(ld.Front);
+					if(!ld.Selected && (ld.Back != null)) list.Add(ld.Back);
+				}
+				return list;
+			}
+		}
+
+		/// <summary>Returns a collection of sectors that match a selected state.</summary>
+		public ICollection<Sector> GetSelectedSectors(bool selected)
+		{
+			if(selected)
+			{
+				return new List<Sector>(sel_sectors);
+			}
+			else
+			{
+				List<Sector> list = new List<Sector>(numsectors - sel_sectors.Count);
+				foreach(Sector s in sectors) if(!s.Selected) list.Add(s);
+				return list;
+			}
+		}
+
+		/// <summary>This selects or deselectes geometry based on marked elements.</summary>
+		public void SelectMarkedGeometry(bool mark, bool select)
+		{
+			SelectMarkedVertices(mark, select);
+			SelectMarkedLinedefs(mark, select);
+			SelectMarkedSectors(mark, select);
+			SelectMarkedThings(mark, select);
+		}
+
+		/// <summary>This selects or deselectes geometry based on marked elements.</summary>
+		public void SelectMarkedVertices(bool mark, bool select)
+		{
+			foreach(Vertex v in vertices) if(v.Marked == mark) v.Selected = select;
+		}
+
+		/// <summary>This selects or deselectes geometry based on marked elements.</summary>
+		public void SelectMarkedLinedefs(bool mark, bool select)
+		{
+			foreach(Linedef l in linedefs) if(l.Marked == mark) l.Selected = select;
+		}
+
+		/// <summary>This selects or deselectes geometry based on marked elements.</summary>
+		public void SelectMarkedSectors(bool mark, bool select)
+		{
+			foreach(Sector s in sectors) if(s.Marked == mark) s.Selected = select;
+		}
+
+		/// <summary>This selects or deselectes geometry based on marked elements.</summary>
+		public void SelectMarkedThings(bool mark, bool select)
+		{
+			foreach(Thing t in things) if(t.Marked == mark) t.Selected = select;
+		}
+
+		#endregion
+
+		#region ================== Selection groups
+
+		/// <summary>This selects geometry by selection group index.</summary>
+		public void SelectVerticesByGroup(int groupmask)
+		{
+			foreach(Vertex e in vertices) e.SelectByGroup(groupmask);
+		}
+
+		/// <summary>This selects geometry by selection group index.</summary>
+		public void SelectLinedefsByGroup(int groupmask)
+		{
+			foreach(Linedef e in linedefs) e.SelectByGroup(groupmask);
+		}
+
+		/// <summary>This selects geometry by selection group index.</summary>
+		public void SelectSectorsByGroup(int groupmask)
+		{
+			foreach(Sector e in sectors) e.SelectByGroup(groupmask);
+		}
+
+		/// <summary>This selects geometry by selection group index.</summary>
+		public void SelectThingsByGroup(int groupmask)
+		{
+			foreach(Thing e in things) e.SelectByGroup(groupmask);
+		}
+
+		/// <summary>This adds the current selection to the specified selection group.</summary>
+		//mxd. switched groupmask to groupindex
+		public void AddSelectionToGroup(int groupindex)
+		{
+			int groupmask = 0x01 << groupindex;
+			foreach(Vertex e in vertices) if(e.Selected) e.AddToGroup(groupmask);
+			foreach(Linedef e in linedefs) if(e.Selected) e.AddToGroup(groupmask);
+			foreach(Sector e in sectors) if(e.Selected) e.AddToGroup(groupmask);
+			foreach(Thing e in things) if(e.Selected) e.AddToGroup(groupmask);
+		}
+
+		/// <summary>This clears specified selection group.</summary>
+		//mxd
+		public void ClearGroup(int groupmask) 
+		{
+			foreach(Vertex e in vertices)  e.RemoveFromGroup(groupmask);
+			foreach(Linedef e in linedefs) e.RemoveFromGroup(groupmask);
+			foreach(Sector e in sectors)   e.RemoveFromGroup(groupmask);
+			foreach(Thing e in things)     e.RemoveFromGroup(groupmask);
+		}
+
+		//mxd
+		internal GroupInfo GetGroupInfo(int groupindex) 
+		{
+			int numSectors = 0;
+			int numLines = 0;
+			int numVerts = 0;
+			int numThings = 0;
+			int groupmask = 0x01 << groupindex;
+
+			foreach(Vertex e in vertices)  if(e.IsInGroup(groupmask)) numVerts++; //mxd
+			foreach(Linedef e in linedefs) if(e.IsInGroup(groupmask)) numLines++; //mxd
+			foreach(Sector e in sectors)   if(e.IsInGroup(groupmask)) numSectors++; //mxd
+			foreach(Thing e in things)     if(e.IsInGroup(groupmask)) numThings++; //mxd
+
+			return new GroupInfo(groupindex + 1, numSectors, numLines, numVerts, numThings);
+		}
+
+		//mxd
+		internal void WriteSelectionGroups(Configuration cfg) 
+		{
+			// Fill structure
+			IDictionary groups = new ListDictionary();
+			for(int i = 0; i < 10; i++) 
+			{
+				IDictionary group = new ListDictionary();
+				int groupmask = 0x01 << i;
+
+				//store verts
+				List<string> indices = new List<string>();
+				foreach(Vertex e in vertices) if(e.IsInGroup(groupmask)) indices.Add(e.Index.ToString());
+				if(indices.Count > 0) group.Add("vertices", string.Join(" ", indices.ToArray()));
+
+				//store linedefs
+				indices.Clear();
+				foreach(Linedef e in linedefs) if(e.IsInGroup(groupmask)) indices.Add(e.Index.ToString());
+				if(indices.Count > 0) group.Add("linedefs", string.Join(" ", indices.ToArray()));
+
+				//store sectors
+				indices.Clear();
+				foreach(Sector e in sectors) if(e.IsInGroup(groupmask)) indices.Add(e.Index.ToString());
+				if(indices.Count > 0) group.Add("sectors", string.Join(" ", indices.ToArray()));
+
+				//store things
+				indices.Clear();
+				foreach(Thing e in things) if(e.IsInGroup(groupmask)) indices.Add(e.Index.ToString());
+				if(indices.Count > 0) group.Add("things", string.Join(" ", indices.ToArray()));
+
+				//add to main collection
+				if(group.Count > 0) groups.Add(i, group);
+			}
+
+			// Write to config
+			if(groups.Count > 0) cfg.WriteSetting(SELECTION_GROUPS_PATH, groups);
+		}
+
+		//mxd
+		internal void ReadSelectionGroups(Configuration cfg) 
+		{
+			IDictionary grouplist = cfg.ReadSetting(SELECTION_GROUPS_PATH, new Hashtable());
+
+			foreach(DictionaryEntry mp in grouplist) 
+			{
+				// Item is a structure?
+				if(mp.Value is IDictionary) 
+				{
+					//get group number
+					int groupnum;
+					if(!int.TryParse(mp.Key as string, out groupnum)) continue;
+
+					int groupmask = 0x01 << General.Clamp(groupnum, 0, 10);
+					IDictionary groupinfo = (IDictionary)mp.Value;
+
+					if(groupinfo.Contains("vertices")) 
+					{
+						string s = groupinfo["vertices"] as string;
+						if(!string.IsNullOrEmpty(s)) 
+						{
+							List<int> indices = GetIndices(groupinfo["vertices"] as string);
+							foreach(int index in indices) 
+							{
+								if(index > vertices.Length) continue;
+								vertices[index].AddToGroup(groupmask);
+							}
+						}
+					}
+
+					if(groupinfo.Contains("linedefs")) 
+					{
+						string s = groupinfo["linedefs"] as string;
+						if(!string.IsNullOrEmpty(s)) 
+						{
+							List<int> indices = GetIndices(groupinfo["linedefs"] as string);
+							foreach(int index in indices) 
+							{
+								if(index > linedefs.Length) continue;
+								linedefs[index].AddToGroup(groupmask);
+							}
+						}
+					}
+
+					if(groupinfo.Contains("sectors")) 
+					{
+						string s = groupinfo["sectors"] as string;
+						if(!string.IsNullOrEmpty(s)) 
+						{
+							List<int> indices = GetIndices(groupinfo["sectors"] as string);
+							foreach(int index in indices) 
+							{
+								if(index > sectors.Length) continue;
+								sectors[index].AddToGroup(groupmask);
+							}
+						}
+					}
+
+					if(groupinfo.Contains("things")) 
+					{
+						string s = groupinfo["things"] as string;
+						if(!string.IsNullOrEmpty(s)) 
+						{
+							List<int> indices = GetIndices(groupinfo["things"] as string);
+							foreach(int index in indices) 
+							{
+								if(index > things.Length) continue;
+								things[index].AddToGroup(groupmask);
+							}
+						}
+					}
+				}
+			}
+		}
+
+		//mxd
+		private static List<int> GetIndices(string input) 
+		{
+			string[] parts = input.Split(new[] {' '}, StringSplitOptions.RemoveEmptyEntries);
+			int index;
+			List<int> result = new List<int>(parts.Length);
+
+			foreach(string part in parts) if(int.TryParse(part, out index)) result.Add(index);
+
+			return result;
+		}
+		
+		#endregion
+
+		#region ================== Marking
+
+		/// <summary>This clears all marks on all elements.</summary>
+		public void ClearAllMarks(bool mark)
+		{
+			ClearMarkedVertices(mark);
+			ClearMarkedThings(mark);
+			ClearMarkedLinedefs(mark);
+			ClearMarkedSectors(mark);
+			ClearMarkedSidedefs(mark);
+		}
+
+		/// <summary>This clears all marks on all vertices.</summary>
+		public void ClearMarkedVertices(bool mark)
+		{
+			foreach(Vertex v in vertices) v.Marked = mark;
+		}
+
+		/// <summary>This clears all marks on all things.</summary>
+		public void ClearMarkedThings(bool mark)
+		{
+			foreach(Thing t in things) t.Marked = mark;
+		}
+
+		/// <summary>This clears all marks on all linedefs.</summary>
+		public void ClearMarkedLinedefs(bool mark)
+		{
+			foreach(Linedef l in linedefs) l.Marked = mark;
+		}
+
+		/// <summary>This clears all marks on all sidedefs.</summary>
+		public void ClearMarkedSidedefs(bool mark)
+		{
+			foreach(Sidedef s in sidedefs) s.Marked = mark;
+		}
+
+		/// <summary>This clears all marks on all sectors.</summary>
+		public void ClearMarkedSectors(bool mark)
+		{
+			foreach(Sector s in sectors) s.Marked = mark;
+		}
+
+		/// <summary>This inverts all marks on all elements.</summary>
+		public void InvertAllMarks()
+		{
+			InvertMarkedVertices();
+			InvertMarkedThings();
+			InvertMarkedLinedefs();
+			InvertMarkedSectors();
+			InvertMarkedSidedefs();
+		}
+
+		/// <summary>This inverts all marks on all vertices.</summary>
+		public void InvertMarkedVertices()
+		{
+			foreach(Vertex v in vertices) v.Marked = !v.Marked;
+		}
+
+		/// <summary>This inverts all marks on all things.</summary>
+		public void InvertMarkedThings()
+		{
+			foreach(Thing t in things) t.Marked = !t.Marked;
+		}
+
+		/// <summary>This inverts all marks on all linedefs.</summary>
+		public void InvertMarkedLinedefs()
+		{
+			foreach(Linedef l in linedefs) l.Marked = !l.Marked;
+		}
+
+		/// <summary>This inverts all marks on all sidedefs.</summary>
+		public void InvertMarkedSidedefs()
+		{
+			foreach(Sidedef s in sidedefs) s.Marked = !s.Marked;
+		}
+
+		/// <summary>This inverts all marks on all sectors.</summary>
+		public void InvertMarkedSectors()
+		{
+			foreach(Sector s in sectors) s.Marked = !s.Marked;
+		}
+
+		/// <summary>Returns a collection of vertices that match a marked state.</summary>
+		public List<Vertex> GetMarkedVertices(bool mark)
+		{
+			List<Vertex> list = new List<Vertex>(numvertices >> 1);
+			foreach(Vertex v in vertices) if(v.Marked == mark) list.Add(v);
+			return list;
+		}
+
+		/// <summary>Returns a collection of things that match a marked state.</summary>
+		public List<Thing> GetMarkedThings(bool mark)
+		{
+			List<Thing> list = new List<Thing>(numthings >> 1);
+			foreach(Thing t in things) if(t.Marked == mark) list.Add(t);
+			return list;
+		}
+
+		/// <summary>Returns a collection of linedefs that match a marked state.</summary>
+		public List<Linedef> GetMarkedLinedefs(bool mark)
+		{
+			List<Linedef> list = new List<Linedef>(numlinedefs >> 1);
+			foreach(Linedef l in linedefs) if(l.Marked == mark) list.Add(l);
+			return list;
+		}
+
+		/// <summary>Returns a collection of sidedefs that match a marked state.</summary>
+		public List<Sidedef> GetMarkedSidedefs(bool mark)
+		{
+			List<Sidedef> list = new List<Sidedef>(numsidedefs >> 1);
+			foreach(Sidedef s in sidedefs) if(s.Marked == mark) list.Add(s);
+			return list;
+		}
+
+		/// <summary>Returns a collection of sectors that match a marked state.</summary>
+		public List<Sector> GetMarkedSectors(bool mark)
+		{
+			List<Sector> list = new List<Sector>(numsectors >> 1);
+			foreach(Sector s in sectors) if(s.Marked == mark) list.Add(s);
+			return list;
+		}
+
+		/// <summary>This marks vertices based on selected vertices.</summary>
+		public void MarkSelectedVertices(bool selected, bool mark)
+		{
+			foreach(Vertex v in sel_vertices) v.Marked = mark;
+		}
+
+		/// <summary>This marks linedefs based on selected linedefs.</summary>
+		public void MarkSelectedLinedefs(bool selected, bool mark)
+		{
+			foreach(Linedef l in sel_linedefs) l.Marked = mark;
+		}
+
+		/// <summary>This marks sectors based on selected sectors.</summary>
+		public void MarkSelectedSectors(bool selected, bool mark)
+		{
+			foreach(Sector s in sel_sectors) s.Marked = mark;
+		}
+
+		/// <summary>This marks things based on selected things.</summary>
+		public void MarkSelectedThings(bool selected, bool mark)
+		{
+			foreach(Thing t in sel_things) t.Marked = mark;
+		}
+
+		/// <summary>
+		/// This marks the front and back sidedefs on linedefs with the matching mark.
+		/// </summary>
+		public void MarkSidedefsFromLinedefs(bool matchmark, bool setmark)
+		{
+			foreach(Linedef l in linedefs)
+			{
+				if(l.Marked == matchmark)
+				{
+					if(l.Front != null) l.Front.Marked = setmark;
+					if(l.Back != null) l.Back.Marked = setmark;
+				}
+			}
+		}
+
+		/// <summary>
+		/// This marks the sidedefs that make up the sectors with the matching mark.
+		/// </summary>
+		public void MarkSidedefsFromSectors(bool matchmark, bool setmark)
+		{
+			foreach(Sidedef sd in sidedefs)
+			{
+				if(sd.Sector.Marked == matchmark) sd.Marked = setmark;
+			}
+		}
+
+		/// <summary>
+		/// Returns a collection of vertices that match a marked state on the linedefs.
+		/// </summary>
+		public ICollection<Vertex> GetVerticesFromLinesMarks(bool mark)
+		{
+			List<Vertex> list = new List<Vertex>(numvertices >> 1);
+			foreach(Vertex v in vertices)
+			{
+				foreach(Linedef l in v.Linedefs)
+				{
+					if(l.Marked == mark)
+					{
+						list.Add(v);
+						break;
+					}
+				}
+			}
+			return list;
+		}
+
+		/// <summary>
+		/// Returns a collection of vertices that match a marked state on the linedefs.
+		/// The difference with GetVerticesFromLinesMarks is that in this method
+		/// ALL linedefs of a vertex must match the specified marked state.
+		/// </summary>
+		public ICollection<Vertex> GetVerticesFromAllLinesMarks(bool mark)
+		{
+			List<Vertex> list = new List<Vertex>(numvertices >> 1);
+			foreach(Vertex v in vertices)
+			{
+				bool qualified = true;
+				foreach(Linedef l in v.Linedefs)
+				{
+					if(l.Marked != mark)
+					{
+						qualified = false;
+						break;
+					}
+				}
+				if(qualified) list.Add(v);
+			}
+			return list;
+		}
+
+		/// <summary>
+		/// Returns a collection of vertices that match a marked state on the linedefs.
+		/// </summary>
+		public ICollection<Vertex> GetVerticesFromSectorsMarks(bool mark)
+		{
+			List<Vertex> list = new List<Vertex>(numvertices >> 1);
+			foreach(Vertex v in vertices)
+			{
+				foreach(Linedef l in v.Linedefs)
+				{
+					if(((l.Front != null) && (l.Front.Sector != null) && (l.Front.Sector.Marked == mark)) ||
+						((l.Back != null) && (l.Back.Sector != null) && (l.Back.Sector.Marked == mark)))
+					{
+						list.Add(v);
+						break;
+					}
+				}
+			}
+			return list;
+		}
+
+		/// <summary>
+		/// This marks all selected geometry, including sidedefs from sectors.
+		/// When sidedefsfromsectors is true, then the sidedefs are marked according to the
+		/// marked sectors. Otherwise the sidedefs are marked according to the marked linedefs.
+		/// </summary>
+		public void MarkAllSelectedGeometry(bool mark, bool linedefsfromvertices, bool verticesfromlinedefs, bool sectorsfromlinedefs, bool sidedefsfromsectors)
+		{
+			General.Map.Map.ClearAllMarks(!mark);
+
+			// Direct vertices
+			General.Map.Map.MarkSelectedVertices(true, mark);
+
+			// Direct linedefs
+			General.Map.Map.MarkSelectedLinedefs(true, mark);
+
+			// Linedefs from vertices
+			// We do this before "vertices from lines" because otherwise we get lines marked that we didn't select
+			if(linedefsfromvertices)
+			{
+				ICollection<Linedef> lines = General.Map.Map.LinedefsFromMarkedVertices(!mark, mark, !mark);
+				foreach(Linedef l in lines) l.Marked = mark;
+			}
+			
+			// Vertices from linedefs
+			if(verticesfromlinedefs)
+			{
+				ICollection<Vertex> verts = General.Map.Map.GetVerticesFromLinesMarks(mark);
+				foreach(Vertex v in verts) v.Marked = mark;
+			}
+			
+			// Mark sectors from linedefs (note: this must be the first to mark
+			// sectors, because this clears the sector marks!)
+			if(sectorsfromlinedefs)
+			{
+				General.Map.Map.ClearMarkedSectors(mark);
+				foreach(Linedef l in General.Map.Map.Linedefs)
+				{
+					if(!l.Selected)
+					{
+						if(l.Front != null) l.Front.Sector.Marked = !mark;
+						if(l.Back != null) l.Back.Sector.Marked = !mark;
+					}
+				}
+			}
+			
+			// Direct sectors
+			General.Map.Map.MarkSelectedSectors(true, mark);
+
+			// Direct things
+			General.Map.Map.MarkSelectedThings(true, mark);
+
+			// Sidedefs from linedefs or sectors
+			if(sidedefsfromsectors)
+				General.Map.Map.MarkSidedefsFromSectors(true, mark);
+			else
+				General.Map.Map.MarkSidedefsFromLinedefs(true, mark);
+		}
+		
+		#endregion
+
+		#region ================== Indexing
+		
+		/// <summary>
+		/// Returns the vertex at the specified index. Returns null when index is out of range. This is an O(1) operation.
+		/// </summary>
+		public Vertex GetVertexByIndex(int index)
+		{
+			return index < numvertices ? vertices[index] : null;
+		}
+
+		/// <summary>
+		/// Returns the linedef at the specified index. Returns null when index is out of range. This is an O(1) operation.
+		/// </summary>
+		public Linedef GetLinedefByIndex(int index)
+		{
+			return index < numlinedefs ? linedefs[index] : null;
+		}
+
+		/// <summary>
+		/// Returns the sidedef at the specified index. Returns null when index is out of range. This is an O(1) operation.
+		/// </summary>
+		public Sidedef GetSidedefByIndex(int index)
+		{
+			return index < numsidedefs ? sidedefs[index] : null;
+		}
+
+		/// <summary>
+		/// Returns the sector at the specified index. Returns null when index is out of range. This is an O(1) operation.
+		/// </summary>
+		public Sector GetSectorByIndex(int index)
+		{
+			return index < numsectors ? sectors[index] : null;
+		}
+
+		/// <summary>
+		/// Returns the thing at the specified index. Returns null when index is out of range. This is an O(1) operation.
+		/// </summary>
+		public Thing GetThingByIndex(int index)
+		{
+			return index < numthings ? things[index] : null;
+		}
+
+		#endregion
+		
+		#region ================== Areas
+
+		/// <summary>This creates an initial, undefined area.</summary>
+		public static RectangleF CreateEmptyArea()
+		{
+			return new RectangleF(float.MaxValue / 2, float.MaxValue / 2, -float.MaxValue, -float.MaxValue);
+		}
+
+		/// <summary>This creates an area from vertices.</summary>
+		public static RectangleF CreateArea(ICollection<Vertex> verts)
+		{
+			float l = float.MaxValue;
+			float t = float.MaxValue;
+			float r = float.MinValue;
+			float b = float.MinValue;
+
+			// Go for all vertices
+			foreach(Vertex v in verts)
+			{
+				// Adjust boundaries by vertices
+				if(v.Position.x < l) l = v.Position.x;
+				if(v.Position.x > r) r = v.Position.x;
+				if(v.Position.y < t) t = v.Position.y;
+				if(v.Position.y > b) b = v.Position.y;
+			}
+
+			// Return a rect
+			return new RectangleF(l, t, r - l, b - t);
+		}
+
+		/// <summary>This increases and existing area with the given vertices.</summary>
+		public static RectangleF IncreaseArea(RectangleF area, ICollection<Vertex> verts)
+		{
+			float l = area.Left;
+			float t = area.Top;
+			float r = area.Right;
+			float b = area.Bottom;
+			
+			// Go for all vertices
+			foreach(Vertex v in verts)
+			{
+				// Adjust boundaries by vertices
+				if(v.Position.x < l) l = v.Position.x;
+				if(v.Position.x > r) r = v.Position.x;
+				if(v.Position.y < t) t = v.Position.y;
+				if(v.Position.y > b) b = v.Position.y;
+			}
+			
+			// Return a rect
+			return new RectangleF(l, t, r - l, b - t);
+		}
+
+		/// <summary>This increases and existing area with the given things.</summary>
+		public static RectangleF IncreaseArea(RectangleF area, ICollection<Thing> things)
+		{
+			float l = area.Left;
+			float t = area.Top;
+			float r = area.Right;
+			float b = area.Bottom;
+			
+			// Go for all vertices
+			foreach(Thing th in things)
+			{
+				// Adjust boundaries by vertices
+				if(th.Position.x < l) l = th.Position.x;
+				if(th.Position.x > r) r = th.Position.x;
+				if(th.Position.y < t) t = th.Position.y;
+				if(th.Position.y > b) b = th.Position.y;
+			}
+			
+			// Return a rect
+			return new RectangleF(l, t, r - l, b - t);
+		}
+
+		/// <summary>This increases and existing area with the given vertices.</summary>
+		public static RectangleF IncreaseArea(RectangleF area, ICollection<Vector2D> verts)
+		{
+			float l = area.Left;
+			float t = area.Top;
+			float r = area.Right;
+			float b = area.Bottom;
+			
+			// Go for all vertices
+			foreach(Vector2D v in verts)
+			{
+				// Adjust boundaries by vertices
+				if(v.x < l) l = v.x;
+				if(v.x > r) r = v.x;
+				if(v.y < t) t = v.y;
+				if(v.y > b) b = v.y;
+			}
+			
+			// Return a rect
+			return new RectangleF(l, t, r - l, b - t);
+		}
+
+		/// <summary>This increases and existing area with the given vertex.</summary>
+		public static RectangleF IncreaseArea(RectangleF area, Vector2D vert)
+		{
+			float l = area.Left;
+			float t = area.Top;
+			float r = area.Right;
+			float b = area.Bottom;
+			
+			// Adjust boundaries by vertices
+			if(vert.x < l) l = vert.x;
+			if(vert.x > r) r = vert.x;
+			if(vert.y < t) t = vert.y;
+			if(vert.y > b) b = vert.y;
+			
+			// Return a rect
+			return new RectangleF(l, t, r - l, b - t);
+		}
+
+		/// <summary>This creates an area from linedefs.</summary>
+		public static RectangleF CreateArea(ICollection<Linedef> lines)
+		{
+			float l = float.MaxValue;
+			float t = float.MaxValue;
+			float r = float.MinValue;
+			float b = float.MinValue;
+
+			// Go for all linedefs
+			foreach(Linedef ld in lines)
+			{
+				// Adjust boundaries by vertices
+				if(ld.Start.Position.x < l) l = ld.Start.Position.x;
+				if(ld.Start.Position.x > r) r = ld.Start.Position.x;
+				if(ld.Start.Position.y < t) t = ld.Start.Position.y;
+				if(ld.Start.Position.y > b) b = ld.Start.Position.y;
+				if(ld.End.Position.x < l) l = ld.End.Position.x;
+				if(ld.End.Position.x > r) r = ld.End.Position.x;
+				if(ld.End.Position.y < t) t = ld.End.Position.y;
+				if(ld.End.Position.y > b) b = ld.End.Position.y;
+			}
+
+			// Return a rect
+			return new RectangleF(l, t, r - l, b - t);
+		}
+
+		/// <summary>This filters lines by a rectangular area.</summary>
+		public static ICollection<Linedef> FilterByArea(ICollection<Linedef> lines, ref RectangleF area)
+		{
+			ICollection<Linedef> newlines = new List<Linedef>(lines.Count);
+			
+			// Go for all lines
+			foreach(Linedef l in lines)
+			{
+				// Check the cs field bits
+				if((GetCSFieldBits(l.Start.Position, area) & GetCSFieldBits(l.End.Position, area)) == 0) 
+				{
+					// The line could be in the area
+					newlines.Add(l);
+				}
+			}
+			
+			// Return result
+			return newlines;
+		}
+
+		/// <summary> This returns the cohen-sutherland field bits for a vector in a rectangle area</summary>
+		public static int GetCSFieldBits(Vector2D v, RectangleF area) 
+		{
+			int bits = 0;
+			if(v.y < area.Top) bits |= 0x01;
+			if(v.y > area.Bottom) bits |= 0x02;
+			if(v.x < area.Left) bits |= 0x04;
+			if(v.x > area.Right) bits |= 0x08;
+			return bits;
+		}
+
+		/// <summary>This filters vertices by a rectangular area.</summary>
+		public static ICollection<Vertex> FilterByArea(ICollection<Vertex> verts, ref RectangleF area)
+		{
+			ICollection<Vertex> newverts = new List<Vertex>(verts.Count);
+
+			// Go for all verts
+			foreach(Vertex v in verts)
+			{
+				// Within rect?
+				if((v.Position.x < area.Left) || (v.Position.x > area.Right) ||
+					(v.Position.y < area.Top) || (v.Position.y > area.Bottom)) continue;
+
+				// The vertex is in the area
+				newverts.Add(v);
+			}
+
+			// Return result
+			return newverts;
+		}
+
+		#endregion
+
+		#region ================== Stitching
+
+		/// <summary>
+		/// Stitches marked geometry with non-marked geometry. Returns false when the operation failed.
+		/// </summary>
+		public bool StitchGeometry()
+		{
+			// Find vertices
+			ICollection<Vertex> movingverts = General.Map.Map.GetMarkedVertices(true);
+			ICollection<Vertex> fixedverts = General.Map.Map.GetMarkedVertices(false);
+			
+			// Find lines that moved during the drag
+			ICollection<Linedef> movinglines = LinedefsFromMarkedVertices(false, true, true);
+			
+			// Find all non-moving lines
+			ICollection<Linedef> fixedlines = LinedefsFromMarkedVertices(true, false, false);
+			
+			// Determine area in which we are editing
+			RectangleF editarea = CreateArea(movinglines);
+			editarea = IncreaseArea(editarea, movingverts);
+			editarea.Inflate(1.0f, 1.0f);
+			
+			// Join nearby vertices
+			BeginAddRemove();
+			JoinVertices(fixedverts, movingverts, true, STITCH_DISTANCE);
+			EndAddRemove();
+			
+			// Update cached values of lines because we need their length/angle
+			Update(true, false);
+
+			BeginAddRemove();
+			
+			// Split moving lines with unselected vertices
+			ICollection<Vertex> nearbyfixedverts = FilterByArea(fixedverts, ref editarea);
+			if(!SplitLinesByVertices(movinglines, nearbyfixedverts, STITCH_DISTANCE, movinglines))
+				return false;
+			
+			// Split non-moving lines with selected vertices
+			fixedlines = FilterByArea(fixedlines, ref editarea);
+			if(!SplitLinesByVertices(fixedlines, movingverts, STITCH_DISTANCE, movinglines))
+				return false;
+			
+			// Remove looped linedefs
+			RemoveLoopedLinedefs(movinglines);
+			
+			// Join overlapping lines
+			if(!JoinOverlappingLines(movinglines))
+				return false;
+			
+			EndAddRemove();
+			
+			return true;
+		}
+		
+		#endregion
+		
+		#region ================== Geometry Tools
+
+		/// <summary>This removes any virtual sectors in the map and returns the number of sectors removed.</summary>
+		public int RemoveVirtualSectors()
+		{
+			int count = 0;
+			int index = 0;
+			
+			// Go for all sectors
+			while(index < numsectors)
+			{
+				// Remove when virtual
+				if(sectors[index].Fields.ContainsKey(VIRTUAL_SECTOR_FIELD))
+				{
+					sectors[index].Dispose();
+					count++;
+				}
+				else
+				{
+					index++;
+				}
+			}
+			
+			return count;
+		}
+
+		/// <summary>This removes unused sectors and returns the number of removed sectors.</summary>
+		public int RemoveUnusedSectors(bool reportwarnings)
+		{
+			int count = 0;
+			int index = numsectors - 1;
+			
+			// Go for all sectors
+			while(index >= 0)
+			{
+				// Remove when unused
+				if(sectors[index].Sidedefs.Count == 0)
+				{
+					if(reportwarnings)
+						General.ErrorLogger.Add(ErrorType.Warning, "Sector " + index + " was unused and has been removed.");
+
+					sectors[index].Dispose();
+					count++;
+				}
+
+				index--;
+			}
+			
+			return count;
+		}
+
+		/// <summary>This joins overlapping lines together. Returns false when the operation failed.</summary>
+		public static bool JoinOverlappingLines(ICollection<Linedef> lines)
+		{
+			bool joined;
+			
+			do
+			{
+				// No joins yet
+				joined = false;
+
+				// Go for all the lines
+				foreach(Linedef l1 in lines)
+				{
+					// Check if these vertices have lines that overlap
+					foreach(Linedef l2 in l1.Start.Linedefs)
+					{
+						//mxd. The same line?
+						if(l1.Index == l2.Index) continue;
+						
+						// Sharing vertices?
+						if((l1.End == l2.End) ||
+						   (l1.End == l2.Start))
+						{
+							bool oppositedirection = (l1.End == l2.Start);
+							bool l2marked = l2.Marked;
+
+							// Merge these two linedefs
+							while(lines.Remove(l2));
+							if(!l2.Join(l1)) return false;
+
+							// If l2 was marked as new geometry, we have to make sure
+							// that l1's FrontInterior is correct for the drawing procedure
+							if(l2marked) 
+							{
+								l1.FrontInterior = l2.FrontInterior ^ oppositedirection;
+							}
+								// If l1 is marked as new geometry, we may need to flip it to preserve
+								// orientation of the original geometry, and update its FrontInterior
+							else if(l1.Marked) 
+							{
+								if(oppositedirection) 
+								{
+									l1.FlipVertices();		// This also flips FrontInterior
+									l1.FlipSidedefs();
+								}
+							}
+
+							joined = true;
+							break;
+						}
+					}
+					
+					// Will have to restart when joined
+					if(joined) break;
+					
+					// Check if these vertices have lines that overlap
+					foreach(Linedef l2 in l1.End.Linedefs)
+					{
+						//mxd. The same line?
+						if(l1.Index == l2.Index) continue;
+						
+						// Sharing vertices?
+						if((l1.Start == l2.End) ||
+						   (l1.Start == l2.Start))
+						{
+							bool oppositedirection = (l1.Start == l2.End);
+							bool l2marked = l2.Marked;
+
+							// Merge these two linedefs
+							while(lines.Remove(l2));
+							if(!l2.Join(l1)) return false;
+
+							// If l2 was marked as new geometry, we have to make sure
+							// that l1's FrontInterior is correct for the drawing procedure
+							if(l2marked) 
+							{
+								l1.FrontInterior = l2.FrontInterior ^ oppositedirection;
+							}
+								// If l1 is marked as new geometry, we may need to flip it to preserve
+								// orientation of the original geometry, and update its FrontInterior
+							else if(l1.Marked) 
+							{
+								if(oppositedirection) 
+								{
+									l1.FlipVertices();		// This also flips FrontInterior
+									l1.FlipSidedefs();
+								}
+							}
+
+							joined = true;
+							break;
+						}
+					}
+					
+					// Will have to restart when joined
+					if(joined) break;
+				}
+			}
+			while(joined);
+
+			// Return result
+			return true;
+		}
+
+		/// <summary>This removes looped linedefs (linedefs which reference the same vertex for
+		/// start and end) and returns the number of linedefs removed.</summary>
+		public static int RemoveLoopedLinedefs(ICollection<Linedef> lines)
+		{
+			int linesremoved = 0;
+			bool removedline;
+
+			do
+			{
+				// Nothing removed yet
+				removedline = false;
+
+				// Go for all the lines
+				foreach(Linedef l in lines)
+				{
+					// Check if referencing the same vertex twice
+					if(l.Start == l.End)
+					{
+						// Remove this line
+						while(lines.Remove(l));
+						l.Dispose();
+						linesremoved++;
+						removedline = true;
+						break;
+					}
+				}
+			}
+			while(removedline);
+
+			// Return result
+			return linesremoved;
+		}
+
+		/// <summary>This joins nearby vertices from two collections. This does NOT join vertices
+		/// within the same collection, only if they exist in both collections.
+		/// The vertex from the second collection is moved to match the first vertex.
+		/// When keepsecond is true, the vertex in the second collection is kept,
+		/// otherwise the vertex in the first collection is kept.
+		/// Returns the number of joins made.</summary>
+		public static int JoinVertices(ICollection<Vertex> set1, ICollection<Vertex> set2, bool keepsecond, float joindist)
+		{
+			float joindist2 = joindist * joindist;
+			int joinsdone = 0;
+			bool joined;
+
+			do
+			{
+				// No joins yet
+				joined = false;
+
+				// Go for all vertices in the first set
+				foreach(Vertex v1 in set1)
+				{
+					// Go for all vertices in the second set
+					foreach(Vertex v2 in set2)
+					{
+						// Check if vertices are close enough
+						if(v1.DistanceToSq(v2.Position) <= joindist2)
+						{
+							// Check if not the same vertex
+							if(v1 != v2)
+							{
+								// Move the second vertex to match the first
+								v2.Move(v1.Position);
+								
+								// Check which one to keep
+								if(keepsecond)
+								{
+									// Join the first into the second
+									// Second is kept, first is removed
+									v1.Join(v2);
+									set1.Remove(v1);
+									set2.Remove(v1);
+								}
+								else
+								{
+									// Join the second into the first
+									// First is kept, second is removed
+									v2.Join(v1);
+									set1.Remove(v2);
+									set2.Remove(v2);
+								}
+								
+								// Count the join
+								joinsdone++;
+								joined = true;
+								break;
+							}
+						}
+					}
+
+					// Will have to restart when joined
+					if(joined) break;
+				}
+			}
+			while(joined);
+
+			// Return result
+			return joinsdone;
+		}
+
+		/// <summary>This joins nearby vertices in the same collection </summary>
+		public static int JoinVertices(List<Vertex> set, float joindist) 
+		{
+			float joindist2 = joindist * joindist;
+			int joinsdone = 0;
+			bool joined;
+
+			do 
+			{
+				// No joins yet
+				joined = false;
+
+				// Go for all vertices in the first set
+				for(int i = 0; i < set.Count - 1; i++) 
+				{
+					for(int c = i + 1; c < set.Count; c++) 
+					{
+						Vertex v1 = set[i];
+						Vertex v2 = set[c];
+
+						// Check if vertices are close enough
+						if(v1.DistanceToSq(v2.Position) <= joindist2) 
+						{
+							// Check if not the same vertex
+							if(v1.Index != v2.Index) 
+							{
+								// Move the second vertex to match the first
+								v2.Move(v1.Position);
+
+								// Join the second into the first
+								v2.Join(v1);
+								set.Remove(v2);
+
+								// Count the join
+								joinsdone++;
+								joined = true;
+								break;
+							}
+						}
+					}
+				}
+			} while(joined);
+
+			// Return result
+			return joinsdone;
+		}
+
+		/// <summary>This corrects lines that have a back sidedef but no front sidedef by flipping them. Returns the number of flips made.</summary>
+		public static int FlipBackwardLinedefs(ICollection<Linedef> lines)
+		{
+			int flipsdone = 0;
+			
+			// Examine all lines
+			foreach(Linedef l in lines)
+			{
+				// Back side but no front side?
+				if((l.Back != null) && (l.Front == null))
+				{
+					// Flip that linedef!
+					l.FlipVertices();
+					l.FlipSidedefs();
+					flipsdone++;
+				}
+			}
+
+			// Return result
+			return flipsdone;
+		}
+
+		/// <summary>This splits the given lines with the given vertices. All affected lines
+		/// will be added to changedlines. Returns false when the operation failed.</summary>
+		public static bool SplitLinesByVertices(ICollection<Linedef> lines, ICollection<Vertex> verts, float splitdist, ICollection<Linedef> changedlines)
+		{
+			if(verts.Count == 0 || lines.Count == 0) return true; //mxd
+			
+			float splitdist2 = splitdist * splitdist;
+			bool splitted;
+
+			//mxd. Create blockmap
+			RectangleF area = CreateArea(lines);
+			IncreaseArea(area, verts);
+			BlockMap<BlockEntry> blockmap = new BlockMap<BlockEntry>(area);
+			blockmap.AddVerticesSet(verts);
+			blockmap.AddLinedefsSet(lines);
+			int bmWidth = blockmap.Size.Width;
+			int bmHeight = blockmap.Size.Height;
+			BlockEntry[,] bmap = blockmap.Map;
+
+			do
+			{
+				// No split yet
+				splitted = false;
+
+				for(int w = 0; w < bmWidth; w++) 
+				{
+					for(int h = 0; h < bmHeight; h++) 
+					{
+						BlockEntry block = bmap[w, h];
+						if(block.Vertices.Count == 0 || block.Lines.Count == 0) continue;
+
+						// Go for all the lines
+						foreach(Linedef l in block.Lines) 
+						{
+							// Go for all the vertices
+							foreach(Vertex v in block.Vertices) 
+							{
+								// Check if v is close enough to l for splitting
+								if(l.DistanceToSq(v.Position, true) <= splitdist2) 
+								{
+									// Line is not already referencing v?
+									Vector2D deltastart = l.Start.Position - v.Position;
+									Vector2D deltaend = l.End.Position - v.Position;
+									if(((Math.Abs(deltastart.x) > 0.001f) || (Math.Abs(deltastart.y) > 0.001f)) &&
+									   ((Math.Abs(deltaend.x) > 0.001f) || (Math.Abs(deltaend.y) > 0.001f))) 
+									{
+										// Split line l with vertex v
+										Linedef nl = l.Split(v);
+										if(nl == null) return false;
+
+										// Add the new line to the list
+										lines.Add(nl);
+										blockmap.AddLinedef(nl);
+
+										// Both lines must be updated because their new length
+										// is relevant for next iterations!
+										l.UpdateCache();
+										nl.UpdateCache();
+
+										// Add both lines to changedlines
+										if(changedlines != null) 
+										{
+											changedlines.Add(l);
+											changedlines.Add(nl);
+										}
+
+										// Count the split
+										splitted = true;
+										break;
+									}
+								}
+							}
+
+							// Will have to restart when splitted
+							// TODO: If we make (linked) lists from the collections first,
+							// we don't have to restart when splitted?
+							if(splitted) break;
+						}
+					}
+				}
+			}
+			while(splitted);
+			
+			return true;
+		}
+
+		/// <summary>This finds the side closest to the specified position.</summary>
+		public static Sidedef NearestSidedef(ICollection<Sidedef> selection, Vector2D pos)
+		{
+			Sidedef closest = null;
+			float distance = float.MaxValue;
+			
+			// Go for all sidedefs in selection
+			foreach(Sidedef sd in selection)
+			{
+				// Calculate distance and check if closer than previous find
+				float d = sd.Line.SafeDistanceToSq(pos, true);
+				if(d == distance)
+				{
+					// Same distance, so only pick the one that is on the right side of the line
+					float side = sd.Line.SideOfLine(pos);
+					if(((side <= 0.0f) && sd.IsFront) || ((side > 0.0f) && !sd.IsFront))
+					{
+						closest = sd;
+						distance = d;
+					}
+				}
+				else if(d < distance)
+				{
+					// This one is closer
+					closest = sd;
+					distance = d;
+				}
+			}
+			
+			// Return result
+			return closest;
+		}
+
+		/// <summary>This finds the line closest to the specified position.</summary>
+		public static Linedef NearestLinedef(ICollection<Linedef> selection, Vector2D pos)
+		{
+			Linedef closest = null;
+			float distance = float.MaxValue;
+
+			// Go for all linedefs in selection
+			foreach(Linedef l in selection)
+			{
+				// Calculate distance and check if closer than previous find
+				float d = l.SafeDistanceToSq(pos, true);
+				if(d < distance)
+				{
+					// This one is closer
+					closest = l;
+					distance = d;
+				}
+			}
+
+			// Return result
+			return closest;
+		}
+
+		/// <summary>This finds the line closest to the specified position.</summary>
+		public static Linedef NearestLinedefRange(ICollection<Linedef> selection, Vector2D pos, float maxrange)
+		{
+			Linedef closest = null;
+			float distance = float.MaxValue;
+			float maxrangesq = maxrange * maxrange;
+
+			// Go for all linedefs in selection
+			foreach(Linedef l in selection)
+			{
+				// Calculate distance and check if closer than previous find
+				float d = l.SafeDistanceToSq(pos, true);
+				if(d < distance && d <= maxrangesq)
+				{
+					// This one is closer
+					closest = l;
+					distance = d;
+				}
+			}
+			
+			// Return result
+			return closest;
+		}
+
+		/// <summary>mxd. This finds the line closest to the specified position excluding given list of linedefs.</summary>
+		public Linedef NearestLinedef(Vector2D pos, List<Linedef> linesToExclude) 
+		{
+			Linedef closest = null;
+			float distance = float.MaxValue;
+
+			// Go for all linedefs in selection
+			foreach(Linedef l in linedefs) 
+			{
+				if(linesToExclude.Contains(l))	continue;
+				// Calculate distance and check if closer than previous find
+				float d = l.SafeDistanceToSq(pos, true);
+				if(d < distance) 
+				{
+					// This one is closer
+					closest = l;
+					distance = d;
+				}
+			}
+
+			// Return result
+			return closest;
+		}
+
+		/// <summary>This finds the vertex closest to the specified position.</summary>
+		public static Vertex NearestVertex(ICollection<Vertex> selection, Vector2D pos)
+		{
+			Vertex closest = null;
+			float distance = float.MaxValue;
+
+			// Go for all vertices in selection
+			foreach(Vertex v in selection)
+			{
+				// Calculate distance and check if closer than previous find
+				float d = v.DistanceToSq(pos);
+				if(d < distance)
+				{
+					// This one is closer
+					closest = v;
+					distance = d;
+				}
+			}
+
+			// Return result
+			return closest;
+		}
+
+		/// <summary>This finds the thing closest to the specified position.</summary>
+		public static Thing NearestThing(ICollection<Thing> selection, Vector2D pos)
+		{
+			Thing closest = null;
+			float distance = float.MaxValue;
+
+			// Go for all things in selection
+			foreach(Thing t in selection)
+			{
+				// Calculate distance and check if closer than previous find
+				float d = t.DistanceToSq(pos);
+				if(d < distance)
+				{
+					// This one is closer
+					closest = t;
+					distance = d;
+				}
+			}
+
+			// Return result
+			return closest;
+		}
+
+		/// <summary>mxd. This finds the thing closest to the specified thing.</summary>
+		public static Thing NearestThing(ICollection<Thing> selection, Thing thing) 
+		{
+			Thing closest = null;
+			float distance = float.MaxValue;
+
+			// Go for all things in selection
+			foreach(Thing t in selection) 
+			{
+				if(t == thing) continue;
+
+				// Calculate distance and check if closer than previous find
+				float d = t.DistanceToSq(thing.Position);
+				if(d < distance) 
+				{
+					// This one is closer
+					closest = t;
+					distance = d;
+				}
+			}
+
+			// Return result
+			return closest;
+		}
+
+		/// <summary>This finds the vertex closest to the specified position.</summary>
+		public static Vertex NearestVertexSquareRange(ICollection<Vertex> selection, Vector2D pos, float maxrange)
+		{
+			RectangleF range = RectangleF.FromLTRB(pos.x - maxrange, pos.y - maxrange, pos.x + maxrange, pos.y + maxrange);
+			Vertex closest = null;
+			float distance = float.MaxValue;
+
+			// Go for all vertices in selection
+			foreach(Vertex v in selection)
+			{
+				float px = v.Position.x;
+				float py = v.Position.y;
+				
+				//mxd. Within range?
+				if((v.Position.x < range.Left) || (v.Position.x > range.Right) 
+					|| (v.Position.y < range.Top) || (v.Position.y > range.Bottom))
+					continue;
+
+				// Close than previous find?
+				float d = Math.Abs(px - pos.x) + Math.Abs(py - pos.y);
+				if(d < distance) 
+				{
+					// This one is closer
+					closest = v;
+					distance = d;
+				}
+			}
+
+			// Return result
+			return closest;
+		}
+
+		/// <summary>This finds the thing closest to the specified position.</summary>
+		public static Thing NearestThingSquareRange(ICollection<Thing> selection, Vector2D pos, float maxrange)
+		{
+			RectangleF range = RectangleF.FromLTRB(pos.x - maxrange, pos.y - maxrange, pos.x + maxrange, pos.y + maxrange);
+			Thing closest = null;
+			float distance = float.MaxValue;
+			float size = float.MaxValue; //mxd
+
+			// Go for all things in selection
+			foreach(Thing t in selection)
+			{
+				float px = t.Position.x;
+				float py = t.Position.y;
+				float ts = ((t.FixedSize && General.Map.Renderer2D.Scale > 1.0f) ? t.Size / General.Map.Renderer2D.Scale : t.Size);
+
+				//mxd. Within range?
+				if(px < range.Left - ts || px > range.Right + ts || py < range.Top - ts || py > range.Bottom + ts) continue;
+
+				// Closer than previous find? mxd. Or smaller when distance is the same?
+				float d = Math.Abs(px - pos.x) + Math.Abs(py - pos.y);
+				if(d < distance || (d == distance && ts < size))
+				{
+					// This one is closer
+					closest = t;
+					distance = d;
+					size = ts; //mxd
+				}
+			}
+
+			// Return result
+			return closest;
+		}
+		
+		#endregion
+
+		#region ================== Tools
+
+		/// <summary>This snaps all vertices to the map format accuracy. Call this to ensure the vertices are at valid coordinates.</summary>
+		public void SnapAllToAccuracy()
+		{
+			SnapAllToAccuracy(true);
+		}
+
+		/// <summary>This snaps all vertices to the map format accuracy. Call this to ensure the vertices are at valid coordinates.</summary>
+		public void SnapAllToAccuracy(bool usepreciseposition)
+		{
+			foreach(Vertex v in vertices) v.SnapToAccuracy(usepreciseposition);
+			foreach(Thing t in things) t.SnapToAccuracy(usepreciseposition);
+		}
+
+		/// <summary>This returns the next unused tag number.</summary>
+		public int GetNewTag()
+		{
+			Dictionary<int, bool> usedtags = new Dictionary<int, bool>();
+			ForAllTags(NewTagHandler, false, usedtags);
+			ForAllTags(NewTagHandler, true, usedtags);
+			
+			// Now find the first unused index
+			for(int i = 1; i <= General.Map.FormatInterface.MaxTag; i++)
+				if(!usedtags.ContainsKey(i)) return i;
+			
+			// All tags used!
+			return 0;
+		}
+
+		//mxd
+		/// <summary>This returns the next unused tag number.</summary>
+		public int GetNewTag(List<int> moreusedtags)
+		{
+			Dictionary<int, bool> usedtags = new Dictionary<int, bool>();
+			foreach(int t in moreusedtags) if(!usedtags.ContainsKey(t)) usedtags.Add(t, true); 
+			ForAllTags(NewTagHandler, false, usedtags);
+			ForAllTags(NewTagHandler, true, usedtags);
+
+			// Now find the first unused index
+			for(int i = 1; i <= General.Map.FormatInterface.MaxTag; i++)
+				if(!usedtags.ContainsKey(i)) return i;
+
+			// All tags used!
+			return 0;
+		}
+
+		//mxd
+		/// <summary>This returns the tag number, which is not used by any map element of given type. This method doesn't check action arguments!</summary>
+		public int GetNewTag(UniversalType elementType) 
+		{
+			Dictionary<int, bool> usedtags = new Dictionary<int, bool>();
+
+			switch(elementType) 
+			{
+				case UniversalType.ThingTag:
+					for(int i = 0; i < things.Length; i++) 
+					{
+						if(things[i].Tag > 0 && !usedtags.ContainsKey(things[i].Tag))
+							usedtags.Add(things[i].Tag, false);
+					}
+					break;
+
+				case UniversalType.LinedefTag:
+					for(int i = 0; i < linedefs.Length; i++) 
+					{
+						foreach(int tag in linedefs[i].Tags)
+						{
+							if(tag == 0) continue;
+							if(!usedtags.ContainsKey(tag)) usedtags.Add(tag, false);
+						}
+					}
+					break;
+
+				case UniversalType.SectorTag:
+					for(int i = 0; i < sectors.Length; i++) 
+					{
+						foreach(int tag in sectors[i].Tags)
+						{
+							if(tag == 0) continue;
+							if(!usedtags.ContainsKey(tag)) usedtags.Add(tag, false);
+						}
+					}
+					break;
+			}
+
+			// Now find the first unused index
+			for(int i = 1; i <= General.Map.FormatInterface.MaxTag; i++)
+				if(!usedtags.ContainsKey(i)) return i;
+			
+			// All tags used!
+			return 0;
+		}
+
+		/// <summary>This returns the next unused tag number within the marked geometry.</summary>
+		public int GetNewTag(bool marked)
+		{
+			Dictionary<int, bool> usedtags = new Dictionary<int, bool>();
+			ForAllTags(NewTagHandler, marked, usedtags);
+
+			// Now find the first unused index
+			for(int i = 1; i <= General.Map.FormatInterface.MaxTag; i++)
+				if(!usedtags.ContainsKey(i)) return i;
+
+			// All tags used!
+			return 0;
+		}
+
+		/// <summary>This returns the next unused tag number.</summary>
+		public List<int> GetMultipleNewTags(int count)
+		{
+			List<int> newtags = new List<int>(count);
+			if(count > 0)
+			{
+				Dictionary<int, bool> usedtags = new Dictionary<int, bool>();
+				ForAllTags(NewTagHandler, false, usedtags);
+				ForAllTags(NewTagHandler, true, usedtags);
+				
+				// Find unused tags and add them
+				for(int i = 1; i <= General.Map.FormatInterface.MaxTag; i++)
+				{
+					if(!usedtags.ContainsKey(i))
+					{
+						newtags.Add(i);
+						if(newtags.Count == count) break;
+					}
+				}
+			}
+			
+			return newtags;
+		}
+
+		/// <summary>This returns the next unused tag number within the marked geometry.</summary>
+		public List<int> GetMultipleNewTags(int count, bool marked)
+		{
+			List<int> newtags = new List<int>(count);
+			if(count > 0)
+			{
+				Dictionary<int, bool> usedtags = new Dictionary<int, bool>();
+				ForAllTags(NewTagHandler, marked, usedtags);
+
+				// Find unused tags and add them
+				for(int i = 1; i <= General.Map.FormatInterface.MaxTag; i++)
+				{
+					if(!usedtags.ContainsKey(i))
+					{
+						newtags.Add(i);
+						if(newtags.Count == count) break;
+					}
+				}
+			}
+			
+			return newtags;
+		}
+
+		// Handler for finding a new tag
+		private static void NewTagHandler(MapElement element, bool actionargument, UniversalType type, ref int value, Dictionary<int, bool> usedtags)
+		{
+			usedtags[value] = true;
+		}
+
+		/// <summary>This calls a function for all tag fields in the marked or unmarked geometry. The obj parameter can be anything you wish to pass on to your TagHandler function.</summary>
+		public void ForAllTags<T>(TagHandler<T> handler, bool marked, T obj)
+		{
+			// Call handler on sectors tags
+			foreach(Sector s in sectors)
+			{
+				if(s.Marked == marked)
+				{
+					//mxd. Multiple tags support...
+					bool changed = false;
+					for(int i = 0; i < s.Tags.Count; i++)
+					{
+						int tag = s.Tags[i];
+						handler(s, false, UniversalType.SectorTag, ref tag, obj);
+						if(tag != s.Tags[i])
+						{
+							s.Tags[i] = tag;
+							changed = true;
+						}
+					}
+
+					if(changed) s.Tags = s.Tags.Distinct().ToList();
+				}
+			}
+
+			// Call handler on things tags
+			if(General.Map.FormatInterface.HasThingTag)
+			{
+				foreach(Thing t in things)
+				{
+					if(t.Marked == marked)
+					{
+						int tag = t.Tag;
+						handler(t, false, UniversalType.ThingTag, ref tag, obj);
+						if(tag != t.Tag) t.Tag = tag;
+					}
+				}
+			}
+
+			// Call handler on things action
+			if(General.Map.FormatInterface.HasThingAction && General.Map.FormatInterface.HasActionArgs)
+			{
+				foreach(Thing t in things)
+				{
+					if(t.Marked == marked)
+					{
+						LinedefActionInfo info = General.Map.Config.GetLinedefActionInfo(t.Action);
+						for(int i = 0; i < Thing.NUM_ARGS; i++)
+						{
+							if(info.Args[i].Used && CheckIsTagType(info.Args[i].Type))
+							{
+								int tag = t.Args[i];
+								handler(t, true, (UniversalType)(info.Args[i].Type), ref tag, obj);
+								if(tag != t.Args[i]) t.Args[i] = tag;
+							}
+						}
+					}
+				}
+			}
+
+			// Call handler on linedefs tags
+			if(General.Map.FormatInterface.HasLinedefTag)
+			{
+				foreach(Linedef l in linedefs)
+				{
+					if(l.Marked == marked)
+					{
+						//mxd. Multiple tags support...
+						bool changed = false;
+						for(int i = 0; i < l.Tags.Count; i++)
+						{
+							int tag = l.Tags[i];
+							handler(l, false, UniversalType.LinedefTag, ref tag, obj);
+							if(tag != l.Tags[i])
+							{
+								l.Tags[i] = tag;
+								changed = true;
+							}
+						}
+
+						if(changed) l.Tags = l.Tags.Distinct().ToList();
+					}
+				}
+			}
+
+			// Call handler on linedefs action
+			if(General.Map.FormatInterface.HasActionArgs)
+			{
+				foreach(Linedef l in linedefs)
+				{
+					if(l.Marked == marked)
+					{
+						LinedefActionInfo info = General.Map.Config.GetLinedefActionInfo(l.Action);
+						for(int i = 0; i < Linedef.NUM_ARGS; i++)
+						{
+							if(info.Args[i].Used && CheckIsTagType(info.Args[i].Type))
+							{
+								int tag = l.Args[i];
+								handler(l, true, (UniversalType)(info.Args[i].Type), ref tag, obj);
+								if(tag != l.Args[i]) l.Args[i] = tag;
+							}
+						}
+					}
+				}
+			}
+		}
+		
+		// This checks if the given action argument type is a tag type
+		private static bool CheckIsTagType(int argtype)
+		{
+			return (argtype == (int)UniversalType.LinedefTag) ||
+				   (argtype == (int)UniversalType.SectorTag) ||
+				   (argtype == (int)UniversalType.ThingTag);
+		}
+		
+		/// <summary>This makes a list of lines related to marked vertices.
+		/// A line is unstable when one vertex is marked and the other isn't.</summary>
+		public ICollection<Linedef> LinedefsFromMarkedVertices(bool includeunselected, bool includestable, bool includeunstable)
+		{
+			List<Linedef> list = new List<Linedef>((numlinedefs / 2) + 1);
+			
+			// Go for all lines
+			foreach(Linedef l in linedefs)
+			{
+				// Check if this is to be included
+				if((includestable && (l.Start.Marked && l.End.Marked)) ||
+				   (includeunstable && (l.Start.Marked ^ l.End.Marked)) ||
+				   (includeunselected && (!l.Start.Marked && !l.End.Marked)))
+				{
+					// Add to list
+					list.Add(l);
+				}
+			}
+
+			// Return result
+			return list;
+		}
+
+		/// <summary>This makes a list of unstable lines from the given vertices.
+		/// A line is unstable when one vertex is selected and the other isn't.</summary>
+		public static ICollection<Linedef> UnstableLinedefsFromVertices(ICollection<Vertex> verts)
+		{
+			Dictionary<Linedef, Linedef> lines = new Dictionary<Linedef, Linedef>();
+
+			// Go for all vertices
+			foreach(Vertex v in verts)
+			{
+				// Go for all lines
+				foreach(Linedef l in v.Linedefs)
+				{
+					// If the line exists in the list
+					if(lines.ContainsKey(l))
+					{
+						// Remove it
+						lines.Remove(l);
+					}
+					// Otherwise add it
+					else
+					{
+						// Add the line
+						lines.Add(l, l);
+					}
+				}
+			}
+			
+			// Return result
+			return new List<Linedef>(lines.Values);
+		}
+
+		//mxd
+		/// <summary>This returns a sector if given coordinates are inside one.</summary>
+		public Sector GetSectorByCoordinates(Vector2D pos) 
+		{
+			foreach(Sector s in sectors) 
+			{
+				if(s.Intersect(pos)) return s;
+			}
+			return null;
+		}
+
+		//mxd
+		/// <summary>This returns a sector if given coordinates are inside one.</summary>
+		public Sector GetSectorByCoordinates(Vector2D pos, VisualBlockMap blockmap) 
+		{
+			// Find nearest sectors using the blockmap
+			List<Sector> possiblesectors = blockmap.GetBlock(blockmap.GetBlockCoordinates(pos)).Sectors;
+			foreach(Sector s in possiblesectors) 
+			{
+				if(s.Intersect(pos)) return s;
+			}
+
+			return null;
+		}
+
+		/// <summary>This finds the line closest to the specified position.</summary>
+		public Linedef NearestLinedef(Vector2D pos) { return MapSet.NearestLinedef(linedefs, pos); }
+
+		/// <summary>This finds the line closest to the specified position.</summary>
+		public Linedef NearestLinedefRange(Vector2D pos, float maxrange) { return MapSet.NearestLinedefRange(linedefs, pos, maxrange); }
+
+		/// <summary>This finds the vertex closest to the specified position.</summary>
+		public Vertex NearestVertex(Vector2D pos) { return MapSet.NearestVertex(vertices, pos); }
+
+		/// <summary>This finds the vertex closest to the specified position.</summary>
+		public Vertex NearestVertexSquareRange(Vector2D pos, float maxrange) { return MapSet.NearestVertexSquareRange(vertices, pos, maxrange); }
+
+		/// <summary>This finds the thing closest to the specified position.</summary>
+		public Thing NearestThingSquareRange(Vector2D pos, float maxrange) { return MapSet.NearestThingSquareRange(things, pos, maxrange); }
+
+		/// <summary>This finds the closest unselected linedef that is not connected to the given vertex.</summary>
+		public Linedef NearestUnselectedUnreferencedLinedef(Vector2D pos, float maxrange, Vertex v, out float distance)
+		{
+			Linedef closest = null;
+			distance = float.MaxValue;
+			float maxrangesq = maxrange * maxrange;
+
+			// Go for all linedefs in selection
+			foreach(Linedef l in linedefs)
+			{
+				// Calculate distance and check if closer than previous find
+				float d = l.SafeDistanceToSq(pos, true);
+				if((d <= maxrangesq) && (d < distance))
+				{
+					// Check if not selected
+
+					// Check if linedef is not connected to v
+					if((l.Start != v) && (l.End != v))
+					{
+						// This one is closer
+						closest = l;
+						distance = d;
+					}
+				}
+			}
+
+			// Return result
+			return closest;
+		}
+		
+		// This performs sidedefs compression
+		// Note: Only use this for saving, because this messes up the expected data structure horribly.
+		internal void CompressSidedefs()
+		{
+			Dictionary<uint, List<Sidedef>> storedsides = new Dictionary<uint, List<Sidedef>>(numsidedefs);
+			int originalsidescount = numsidedefs;
+			float starttime = Clock.CurrentTime;
+
+			BeginAddRemove();
+			
+			int sn = 0;
+			while(sn < numsidedefs)
+			{
+				Sidedef stored = null;
+				Sidedef snsd = sidedefs[sn];
+
+				// Check if checksum is stored
+				bool samesidedef = false;
+				uint checksum = snsd.GetChecksum();
+				bool checksumstored = storedsides.ContainsKey(checksum);
+				if(checksumstored)
+				{
+					List<Sidedef> othersides = storedsides[checksum];
+					foreach(Sidedef os in othersides)
+					{
+						// They must be in the same sector
+						if(snsd.Sector == os.Sector)
+						{
+							// Check if sidedefs are really the same
+							stored = os;
+							MemoryStream sidemem = new MemoryStream(1024);
+							SerializerStream sidedata = new SerializerStream(sidemem);
+							MemoryStream othermem = new MemoryStream(1024);
+							SerializerStream otherdata = new SerializerStream(othermem);
+							snsd.ReadWrite(sidedata);
+							os.ReadWrite(otherdata);
+							if(sidemem.Length == othermem.Length)
+							{
+								samesidedef = true;
+								sidemem.Seek(0, SeekOrigin.Begin);
+								othermem.Seek(0, SeekOrigin.Begin);
+								for(int i = 0; i < sidemem.Length; i++)
+								{
+									if(sidemem.ReadByte() != othermem.ReadByte())
+									{
+										samesidedef = false;
+										break;
+									}
+								}
+							}
+
+							if(samesidedef) break;
+						}
+					}
+				}
+
+				// Same sidedef?
+				if(samesidedef)
+				{
+					// Replace with stored sidedef
+					bool isfront = snsd.IsFront;
+					Linedef ld = snsd.Line;
+					snsd.Line.DetachSidedefP(snsd);
+					if(isfront)
+						ld.AttachFront(stored);
+					else
+						ld.AttachBack(stored);
+					
+					// Remove the sidedef
+					snsd.SetSector(null);
+					RemoveSidedef(sn);
+				}
+				else
+				{
+					// Store this new one
+					if(checksumstored)
+					{
+						storedsides[checksum].Add(snsd);
+					}
+					else
+					{
+						List<Sidedef> newlist = new List<Sidedef>(4) {snsd};
+						storedsides.Add(checksum, newlist);
+					}
+					
+					// Next
+					sn++;
+				}
+			}
+
+			EndAddRemove();
+
+			// Output info
+			float endtime = Clock.CurrentTime;
+			float deltatimesec = (endtime - starttime) / 1000.0f;
+			float ratio = 100.0f - ((numsidedefs / (float)originalsidescount) * 100.0f);
+			General.WriteLogLine("Sidedefs compressed: " + numsidedefs + " remaining out of " + originalsidescount + " (" + ratio.ToString("########0.00") + "%) in " + deltatimesec.ToString("########0.00") + " seconds");
+		}
+
+		// This converts flags and activations to UDMF fields
+		internal void TranslateToUDMF(Type previousmapformatinterfacetype)
+		{
+			foreach(Linedef l in linedefs) l.TranslateToUDMF(previousmapformatinterfacetype);
+			foreach(Thing t in things) t.TranslateToUDMF();
+		}
+
+		// This converts UDMF fields back into flags and activations
+		// NOTE: Only converts the marked items
+		internal void TranslateFromUDMF()
+		{
+			foreach(Linedef l in linedefs) if(l.Marked) l.TranslateFromUDMF();
+			foreach(Sidedef s in sidedefs) if(s.Marked) s.TranslateFromUDMF(); //mxd
+			foreach(Sector s in sectors) if(s.Marked) s.TranslateFromUDMF(); //mxd
+			foreach(Thing t in things) if(t.Marked) t.TranslateFromUDMF();
+		}
+
+		//mxd
+		internal bool TranslateTextureNames(bool uselongnames, bool markedonly)
+		{
+			if(markedonly)
+			{
+				List<Sector> markedsectors = GetMarkedSectors(true);
+				List<Sidedef> markedsides = GetMarkedSidedefs(true);
+				if(uselongnames) return TranslateToLongTextureNames(markedsectors, markedsides);
+				return TranslateToShortTextureNames(markedsectors, markedsides);
+			}
+			else
+			{
+				if(uselongnames) return TranslateToLongTextureNames(sectors, sidedefs);
+				return TranslateToShortTextureNames(sectors, sidedefs);
+			}
+		}
+
+		//mxd
+		private static bool TranslateToLongTextureNames(IEnumerable<Sector> sectors, IEnumerable<Sidedef> sidedefs)
+		{
+			bool changed = false;
+			
+			foreach(Sector s in sectors)
+			{
+				if(s.FloorTexture != "-")
+				{
+					string ft = General.Map.Data.GetFullFlatName(s.FloorTexture);
+					if(ft != s.FloorTexture)
+					{
+						s.SetFloorTexture(Lump.MakeLongName(ft));
+						changed = true;
+					}
+				}
+				if(s.CeilTexture != "-")
+				{
+					string ct = General.Map.Data.GetFullFlatName(s.CeilTexture);
+					if(ct != s.CeilTexture)
+					{
+						s.SetCeilTexture(Lump.MakeLongName(ct));
+						changed = true;
+					}
+				}
+			}
+
+			foreach(Sidedef s in sidedefs)
+			{
+				if(s.HighTexture != "-")
+				{
+					string ht = General.Map.Data.GetFullTextureName(s.HighTexture);
+					if(ht != s.HighTexture)
+					{
+						s.SetTextureHigh(Lump.MakeLongName(ht));
+						changed = true;
+					}
+				}
+				if(s.MiddleTexture != "-")
+				{
+					string mt = General.Map.Data.GetFullTextureName(s.MiddleTexture);
+					if(mt != s.MiddleTexture)
+					{
+						s.SetTextureMid(Lump.MakeLongName(mt));
+						changed = true;
+					}
+				}
+				if(s.LowTexture != "-")
+				{
+					string lt = General.Map.Data.GetFullTextureName(s.LowTexture);
+					if(lt != s.LowTexture)
+					{
+						s.SetTextureLow(Lump.MakeLongName(lt));
+						changed = true;
+					}
+				}
+			}
+
+			return changed;
+		}
+
+		private static bool TranslateToShortTextureNames(IEnumerable<Sector> sectors, IEnumerable<Sidedef> sidedefs)
+		{
+			bool changed = false;
+			
+			foreach(Sector s in sectors) 
+			{
+				if(s.FloorTexture != "-") 
+				{
+					string ft = GetShortTextureName(s.FloorTexture);
+					if(ft != s.FloorTexture)
+					{
+						s.SetFloorTexture(ft);
+						changed = true;
+					}
+				}
+				if(s.CeilTexture != "-") 
+				{
+					string ct = GetShortTextureName(s.CeilTexture);
+					if(ct != s.CeilTexture)
+					{
+						s.SetCeilTexture(ct);
+						changed = true;
+					}
+				}
+			}
+
+			foreach(Sidedef s in sidedefs) 
+			{
+				if(s.HighTexture != "-") 
+				{
+					string ht = GetShortTextureName(s.HighTexture);
+					if(ht != s.HighTexture)
+					{
+						s.SetTextureHigh(ht);
+						changed = true;
+					}
+				}
+				if(s.MiddleTexture != "-") 
+				{
+					string mt = GetShortTextureName(s.MiddleTexture);
+					if(mt != s.MiddleTexture)
+					{
+						s.SetTextureMid(mt);
+						changed = true;
+					}
+				}
+				if(s.LowTexture != "-") 
+				{
+					string lt = GetShortTextureName(s.LowTexture);
+					if(lt != s.LowTexture)
+					{
+						s.SetTextureLow(lt);
+						changed = true;
+					}
+				}
+			}
+
+			return changed;
+		}
+
+		internal static string GetShortTextureName(string name)
+		{
+			string shortname = Path.GetFileNameWithoutExtension(name).ToUpperInvariant();
+			if(shortname.Length > DataManager.CLASIC_IMAGE_NAME_LENGTH) shortname = shortname.Substring(0, DataManager.CLASIC_IMAGE_NAME_LENGTH);
+			return shortname;
+		}
+
+		/// <summary>This removes unused vertices.</summary>
+		public void RemoveUnusedVertices()
+		{
+			// Go for all vertices
+			int index = numvertices - 1;
+			while(index >= 0)
+			{
+				if((vertices[index] != null) && (vertices[index].Linedefs.Count == 0))
+					vertices[index].Dispose();
+				else
+					index--;
+			}
+		}
+
+		//mxd
+		public void UpdateCustomLinedefColors() 
+		{
+			foreach(Linedef l in linedefs) l.UpdateColorPreset();
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Map/Sector.cs b/Source/Core/Map/Sector.cs
new file mode 100644
index 0000000..533aedd
--- /dev/null
+++ b/Source/Core/Map/Sector.cs
@@ -0,0 +1,899 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.IO;
+using CodeImp.DoomBuilder.Geometry;
+using System.Drawing;
+using CodeImp.DoomBuilder.Rendering;
+using System.Collections.ObjectModel;
+using SlimDX;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Map
+{
+	public sealed class Sector : SelectableElement
+	{
+		#region ================== Constants
+
+		internal const int SLOPE_DECIMALS = 7;
+
+		#endregion
+
+		#region ================== Variables
+
+		// Map
+		private MapSet map;
+
+		// List items
+		private LinkedListNode<Sector> selecteditem;
+		
+		// Sidedefs
+		private LinkedList<Sidedef> sidedefs;
+		
+		// Properties
+		private int fixedindex;
+		private int floorheight;
+		private int ceilheight;
+		private string floortexname;
+		private string ceiltexname;
+		private long longfloortexname;
+		private long longceiltexname;
+		private int effect;
+		private List<int> tags; //mxd
+		private int brightness;
+
+		//mxd. UDMF properties
+		private Dictionary<string, bool> flags;
+
+		// Cloning
+		private Sector clone;
+		private int serializedindex;
+		
+		// Triangulation
+		private bool updateneeded;
+		private bool triangulationneeded;
+		private RectangleF bbox;
+		private Triangulation triangles;
+		private FlatVertex[] flatvertices;
+		private ReadOnlyCollection<LabelPositionInfo> labels;
+		private readonly SurfaceEntryCollection surfaceentries;
+
+		//mxd. Rendering
+		private Color4 fogColor;
+		private bool hasFogColor;
+		private bool useOutsideFog;
+
+		//mxd. Slopes
+		private Vector3D floorslope;
+		private float flooroffset;
+		private Vector3D ceilslope;
+		private float ceiloffset;
+		
+		#endregion
+
+		#region ================== Properties
+
+		public MapSet Map { get { return map; } }
+		public ICollection<Sidedef> Sidedefs { get { return sidedefs; } }
+
+		/// <summary>
+		/// An unique index that does not change when other sectors are removed.
+		/// </summary>
+		public int FixedIndex { get { return fixedindex; } }
+		public int FloorHeight { get { return floorheight; } set { BeforePropsChange(); floorheight = value; } }
+		public int CeilHeight { get { return ceilheight; } set { BeforePropsChange(); ceilheight = value; } }
+		public string FloorTexture { get { return floortexname; } }
+		public string CeilTexture { get { return ceiltexname; } }
+		public long LongFloorTexture { get { return longfloortexname; } }
+		public long LongCeilTexture { get { return longceiltexname; } }
+		internal Dictionary<string, bool> Flags { get { return flags; } } //mxd
+		public int Effect { get { return effect; } set { BeforePropsChange(); effect = value; } }
+		public int Tag { get { return tags[0]; } set { BeforePropsChange(); tags[0] = value; if((value < General.Map.FormatInterface.MinTag) || (value > General.Map.FormatInterface.MaxTag)) throw new ArgumentOutOfRangeException("Tag", "Invalid tag number"); } } //mxd
+		public List<int> Tags { get { return tags; } set { BeforePropsChange(); tags = value; } } //mxd
+		public int Brightness { get { return brightness; } set { BeforePropsChange(); brightness = value; updateneeded = true; } }
+		public bool UpdateNeeded { get { return updateneeded; } set { updateneeded |= value; triangulationneeded |= value; } }
+		public RectangleF BBox { get { return bbox; } }
+		internal Sector Clone { get { return clone; } set { clone = value; } }
+		internal int SerializedIndex { get { return serializedindex; } set { serializedindex = value; } }
+		public Triangulation Triangles { get { return triangles; } }
+		public FlatVertex[] FlatVertices { get { return flatvertices; } }
+		public ReadOnlyCollection<LabelPositionInfo> Labels { get { return labels; } }
+
+		//mxd. Rednering
+		public Color4 FogColor { get { return fogColor; } }
+		public bool HasFogColor { get { return hasFogColor; } }
+		public bool UsesOutsideFog { get { return useOutsideFog; } }
+
+		//mxd. Slopes
+		public Vector3D FloorSlope { get { return floorslope; } set { BeforePropsChange(); floorslope = value; updateneeded = true; } }
+		public float FloorSlopeOffset { get { return flooroffset; } set { BeforePropsChange(); flooroffset = value; updateneeded = true; } }
+		public Vector3D CeilSlope { get { return ceilslope; } set { BeforePropsChange(); ceilslope = value; updateneeded = true; } }
+		public float CeilSlopeOffset { get { return ceiloffset; } set { BeforePropsChange(); ceiloffset = value; updateneeded = true; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		internal Sector(MapSet map, int listindex, int index)
+		{
+			// Initialize
+			this.elementtype = MapElementType.SECTOR; //mxd
+			this.map = map;
+			this.listindex = listindex;
+			this.sidedefs = new LinkedList<Sidedef>();
+			this.fixedindex = index;
+			this.floortexname = "-";
+			this.ceiltexname = "-";
+			this.longfloortexname = MapSet.EmptyLongName;
+			this.longceiltexname = MapSet.EmptyLongName;
+			this.flags = new Dictionary<string, bool>(StringComparer.Ordinal); //mxd
+			this.tags = new List<int> { 0 }; //mxd
+			this.updateneeded = true;
+			this.triangulationneeded = true;
+			this.triangles = new Triangulation(); //mxd
+			this.surfaceentries = new SurfaceEntryCollection();
+
+			if(map == General.Map.Map)
+				General.Map.UndoRedo.RecAddSector(this);
+
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Disposer
+		public override void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Already set isdisposed so that changes can be prohibited
+				isdisposed = true;
+				
+				// Dispose the sidedefs that are attached to this sector
+				// because a sidedef cannot exist without reference to its sector.
+				if(map.AutoRemove)
+					foreach(Sidedef sd in sidedefs) sd.Dispose();
+				else
+					foreach(Sidedef sd in sidedefs) sd.SetSectorP(null);
+				
+				if(map == General.Map.Map)
+					General.Map.UndoRedo.RecRemSector(this);
+
+				// Remove from main list
+				map.RemoveSector(listindex);
+				
+				// Register the index as free
+				map.AddSectorIndexHole(fixedindex);
+				
+				// Free surface entry
+				General.Map.CRenderer2D.Surfaces.FreeSurfaces(surfaceentries);
+
+				// Clean up
+				sidedefs = null;
+				map = null;
+
+				//mxd. Restore isdisposed so base classes can do their disposal job
+				isdisposed = false;
+				
+				// Dispose base
+				base.Dispose();
+			}
+		}
+
+		#endregion
+
+		#region ================== Management
+
+		// Call this before changing properties
+		protected override void BeforePropsChange()
+		{
+			if(map == General.Map.Map)
+				General.Map.UndoRedo.RecPrpSector(this);
+		}
+
+		// Serialize / deserialize (passive: this doesn't record)
+		new internal void ReadWrite(IReadWriteStream s)
+		{
+			if(!s.IsWriting)
+			{
+				BeforePropsChange();
+				updateneeded = true;
+			}
+			
+			base.ReadWrite(s);
+
+			//mxd
+			if(s.IsWriting)
+			{
+				s.wInt(flags.Count);
+
+				foreach(KeyValuePair<string, bool> f in flags)
+				{
+					s.wString(f.Key);
+					s.wBool(f.Value);
+				}
+			}
+			else
+			{
+				int c; s.rInt(out c);
+
+				flags = new Dictionary<string, bool>(c, StringComparer.Ordinal);
+				for(int i = 0; i < c; i++)
+				{
+					string t; s.rString(out t);
+					bool b; s.rBool(out b);
+					flags.Add(t, b);
+				}
+			}
+
+			s.rwInt(ref fixedindex);
+			s.rwInt(ref floorheight);
+			s.rwInt(ref ceilheight);
+			s.rwString(ref floortexname);
+			s.rwString(ref ceiltexname);
+			s.rwLong(ref longfloortexname);
+			s.rwLong(ref longceiltexname);
+			s.rwInt(ref effect);
+			s.rwInt(ref brightness);
+
+			//mxd. (Re)store tags
+			if(s.IsWriting) 
+			{
+				s.wInt(tags.Count);
+				foreach(int tag in tags) s.wInt(tag);
+			} 
+			else 
+			{
+				int c;
+				s.rInt(out c);
+				tags = new List<int>(c);
+				for(int i = 0; i < c; i++)
+				{
+					int t;
+					s.rInt(out t);
+					tags.Add(t);
+				}
+			}
+
+			//mxd. Slopes
+			s.rwFloat(ref flooroffset);
+			s.rwVector3D(ref floorslope);
+			s.rwFloat(ref ceiloffset);
+			s.rwVector3D(ref ceilslope);
+		}
+		
+		// After deserialization
+		internal void PostDeserialize(MapSet map)
+		{
+			triangles.PostDeserialize(map);
+			updateneeded = true;
+			triangulationneeded = true;
+		}
+		
+		// This copies all properties to another sector
+		public void CopyPropertiesTo(Sector s)
+		{
+			s.BeforePropsChange();
+			
+			// Copy properties
+			s.ceilheight = ceilheight;
+			s.ceiltexname = ceiltexname;
+			s.longceiltexname = longceiltexname;
+			s.floorheight = floorheight;
+			s.floortexname = floortexname;
+			s.longfloortexname = longfloortexname;
+			s.effect = effect;
+			s.tags = new List<int>(tags); //mxd
+			s.flags = new Dictionary<string, bool>(flags); //mxd
+			s.brightness = brightness;
+			s.flooroffset = flooroffset; //mxd
+			s.floorslope = floorslope; //mxd
+			s.ceiloffset = ceiloffset; //mxd
+			s.ceilslope = ceilslope; //mxd
+			s.updateneeded = true;
+			base.CopyPropertiesTo(s);
+		}
+
+		// This attaches a sidedef and returns the listitem
+		internal LinkedListNode<Sidedef> AttachSidedefP(Sidedef sd)
+		{
+			updateneeded = true;
+			triangulationneeded = true;
+			return sidedefs.AddLast(sd);
+		}
+
+		// This detaches a sidedef
+		internal void DetachSidedefP(LinkedListNode<Sidedef> l)
+		{
+			// Not disposing?
+			if(!isdisposed)
+			{
+				// Remove sidedef
+				updateneeded = true;
+				triangulationneeded = true;
+				sidedefs.Remove(l);
+
+				// No more sidedefs left?
+				if((sidedefs.Count == 0) && map.AutoRemove)
+				{
+					// This sector is now useless, dispose it
+					this.Dispose();
+				}
+			}
+		}
+		
+		// This triangulates the sector geometry
+		internal void Triangulate()
+		{
+			if(updateneeded)
+			{
+				// Triangulate again?
+				if(triangulationneeded || (triangles == null))
+				{
+					// Triangulate sector
+					triangles = Triangulation.Create(this);
+					triangulationneeded = false;
+					updateneeded = true;
+					
+					// Make label positions
+					labels = Array.AsReadOnly(Tools.FindLabelPositions(this).ToArray());
+					
+					// Number of vertices changed?
+					if(triangles.Vertices.Count != surfaceentries.totalvertices)
+						General.Map.CRenderer2D.Surfaces.FreeSurfaces(surfaceentries);
+				}
+			}
+		}
+		
+		// This makes new vertices as well as floor and ceiling surfaces
+		internal void CreateSurfaces()
+		{
+			if(updateneeded)
+			{
+				// Brightness color
+				int brightint = General.Map.Renderer2D.CalculateBrightness(brightness);
+				
+				// Make vertices
+				flatvertices = new FlatVertex[triangles.Vertices.Count];
+				for(int i = 0; i < triangles.Vertices.Count; i++)
+				{
+					flatvertices[i].x = triangles.Vertices[i].x;
+					flatvertices[i].y = triangles.Vertices[i].y;
+					flatvertices[i].z = 1.0f;
+					flatvertices[i].c = brightint;
+					flatvertices[i].u = triangles.Vertices[i].x;
+					flatvertices[i].v = triangles.Vertices[i].y;
+				}
+
+				// Create bounding box
+				bbox = CreateBBox();
+				
+				// Make update info (this lets the plugin fill in texture coordinates and such)
+				SurfaceUpdate updateinfo = new SurfaceUpdate(flatvertices.Length, true, true);
+				flatvertices.CopyTo(updateinfo.floorvertices, 0);
+				General.Plugins.OnSectorFloorSurfaceUpdate(this, ref updateinfo.floorvertices);
+				flatvertices.CopyTo(updateinfo.ceilvertices, 0);
+				General.Plugins.OnSectorCeilingSurfaceUpdate(this, ref updateinfo.ceilvertices);
+				updateinfo.floortexture = longfloortexname;
+				updateinfo.ceiltexture = longceiltexname;
+
+				// Update surfaces
+				General.Map.CRenderer2D.Surfaces.UpdateSurfaces(surfaceentries, updateinfo);
+
+				// Updated
+				updateneeded = false;
+			}
+		}
+
+		// This updates the floor surface
+		public void UpdateFloorSurface()
+		{
+			if(flatvertices == null) return;
+			
+			// Create floor vertices
+			SurfaceUpdate updateinfo = new SurfaceUpdate(flatvertices.Length, true, false);
+			flatvertices.CopyTo(updateinfo.floorvertices, 0);
+			General.Plugins.OnSectorFloorSurfaceUpdate(this, ref updateinfo.floorvertices);
+			updateinfo.floortexture = longfloortexname;
+			
+			// Update entry
+			General.Map.CRenderer2D.Surfaces.UpdateSurfaces(surfaceentries, updateinfo);
+			General.Map.CRenderer2D.Surfaces.UnlockBuffers();
+		}
+
+		// This updates the ceiling surface
+		public void UpdateCeilingSurface()
+		{
+			if(flatvertices == null) return;
+
+			// Create ceiling vertices
+			SurfaceUpdate updateinfo = new SurfaceUpdate(flatvertices.Length, false, true);
+			flatvertices.CopyTo(updateinfo.ceilvertices, 0);
+			General.Plugins.OnSectorCeilingSurfaceUpdate(this, ref updateinfo.ceilvertices);
+			updateinfo.ceiltexture = longceiltexname;
+			
+			// Update entry
+			General.Map.CRenderer2D.Surfaces.UpdateSurfaces(surfaceentries, updateinfo);
+			General.Map.CRenderer2D.Surfaces.UnlockBuffers();
+		}
+		
+		// This updates the sector when changes have been made
+		public void UpdateCache()
+		{
+			// Update if needed
+			if(updateneeded)
+			{
+				Triangulate();
+				
+				CreateSurfaces();
+
+				General.Map.CRenderer2D.Surfaces.UnlockBuffers();
+			}
+		}
+
+		// Selected
+		protected override void DoSelect()
+		{
+			base.DoSelect();
+			selecteditem = map.SelectedSectors.AddLast(this);
+		}
+
+		// Deselect
+		protected override void DoUnselect()
+		{
+			base.DoUnselect();
+			if(selecteditem.List != null) selecteditem.List.Remove(selecteditem);
+			selecteditem = null;
+		}
+
+		// This removes UDMF stuff (mxd)
+		internal void TranslateFromUDMF() 
+		{
+			// Clear UDMF-related properties (but keep VirtualSectorField!)
+			bool isvirtual = this.Fields.ContainsKey(MapSet.VirtualSectorField);
+			this.Fields.Clear();
+			if(isvirtual) this.Fields.Add(MapSet.VirtualSectorField, MapSet.VirtualSectorValue);
+			this.Flags.Clear();
+			hasFogColor = false;
+			useOutsideFog = false;
+
+			// Reset Slopes
+			floorslope = new Vector3D();
+			flooroffset = 0;
+			ceilslope = new Vector3D();
+			ceiloffset = 0;
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+
+		// This checks and returns a flag without creating it
+		public bool IsFlagSet(string flagname)
+		{
+			return flags.ContainsKey(flagname) && flags[flagname];
+		}
+
+		// This sets a flag
+		public void SetFlag(string flagname, bool value) 
+		{
+			if(!flags.ContainsKey(flagname) || (IsFlagSet(flagname) != value)) 
+			{
+				BeforePropsChange();
+
+				flags[flagname] = value;
+			}
+		}
+
+		// This returns a copy of the flags dictionary
+		public Dictionary<string, bool> GetFlags() 
+		{
+			return new Dictionary<string, bool>(flags);
+		}
+
+		// This clears all flags
+		public void ClearFlags() 
+		{
+			BeforePropsChange();
+			flags.Clear();
+		}
+		
+		// This checks if the given point is inside the sector polygon
+		public bool Intersect(Vector2D p) 
+		{
+			//mxd. Check bounding box first
+			if(p.x < bbox.Left || p.x > bbox.Right || p.y < bbox.Top || p.y > bbox.Bottom) return false;
+			
+			uint c = 0;
+			
+			// Go for all sidedefs
+			foreach(Sidedef sd in sidedefs)
+			{
+				// Get vertices
+				Vector2D v1 = sd.Line.Start.Position;
+				Vector2D v2 = sd.Line.End.Position;
+
+				//mxd. On top of a vertex?
+				if(p == v1 || p == v2) return true;
+				
+				// Determine min/max values
+				float miny = Math.Min(v1.y, v2.y);
+				float maxy = Math.Max(v1.y, v2.y);
+				float maxx = Math.Max(v1.x, v2.x);
+				
+				// Check for intersection
+				if((p.y > miny) && (p.y <= maxy))
+				{
+					if(p.x <= maxx)
+					{
+						if(v1.y != v2.y)
+						{
+							float xint = (p.y - v1.y) * (v2.x - v1.x) / (v2.y - v1.y) + v1.x;
+							if((v1.x == v2.x) || (p.x <= xint)) c++;
+						}
+					}
+				}
+			}
+			
+			// Inside this polygon?
+			return ((c & 0x00000001UL) != 0);
+		}
+		
+		// This creates a bounding box rectangle
+		// This requires the sector triangulation to be up-to-date!
+		private RectangleF CreateBBox()
+		{
+			if(sidedefs.Count == 0) return  new RectangleF(); //mxd
+			
+			// Setup
+			float left = float.MaxValue;
+			float top = float.MaxValue;
+			float right = float.MinValue;
+			float bottom = float.MinValue;
+
+			Dictionary<Vertex, bool> processed = new Dictionary<Vertex, bool>(); //mxd
+
+			//mxd. This way bbox will be created even if triangulation failed (sector with 2 or less sidedefs and 2 vertices)
+			foreach(Sidedef s in sidedefs) 
+			{
+				//start...
+				if(!processed.ContainsKey(s.Line.Start)) 
+				{
+					if(s.Line.Start.Position.x < left) left = s.Line.Start.Position.x;
+					if(s.Line.Start.Position.x > right) right = s.Line.Start.Position.x;
+					if(s.Line.Start.Position.y < top) top = s.Line.Start.Position.y;
+					if(s.Line.Start.Position.y > bottom) bottom = s.Line.Start.Position.y;
+					processed.Add(s.Line.Start, false);
+				}
+
+				//end...
+				if(!processed.ContainsKey(s.Line.End)) 
+				{
+					if(s.Line.End.Position.x < left) left = s.Line.End.Position.x;
+					if(s.Line.End.Position.x > right) right = s.Line.End.Position.x;
+					if(s.Line.End.Position.y < top) top = s.Line.End.Position.y;
+					if(s.Line.End.Position.y > bottom) bottom = s.Line.End.Position.y;
+					processed.Add(s.Line.End, false);
+				}
+			}
+			
+			// Return rectangle
+			return new RectangleF(left, top, right - left, bottom - top);
+		}
+		
+		// This joins the sector with another sector
+		// This sector will be disposed
+		public void Join(Sector other)
+		{
+			// Any sidedefs to move?
+			if(sidedefs.Count > 0)
+			{
+				// Change secter reference on my sidedefs
+				// This automatically disposes this sector
+				while(sidedefs != null)
+					sidedefs.First.Value.SetSector(other);
+			}
+			else
+			{
+				// No sidedefs attached
+				// Dispose manually
+				this.Dispose();
+			}
+			
+			General.Map.IsChanged = true;
+		}
+
+		//mxd
+		public static Geometry.Plane GetFloorPlane(Sector s)
+		{
+			if(General.Map.UDMF)
+			{
+				// UDMF Sector slope?
+				if(s.FloorSlope.GetLengthSq() > 0 && !float.IsNaN(s.FloorSlopeOffset / s.FloorSlope.z)) 
+					return new Geometry.Plane(s.FloorSlope, s.FloorSlopeOffset);
+
+				if(s.sidedefs.Count == 3)
+				{
+					Geometry.Plane floor = new Geometry.Plane(new Vector3D(0, 0, 1), -s.FloorHeight);
+					Vector3D[] verts = new Vector3D[3];
+					bool sloped = false;
+					int index = 0;
+					
+					// Check vertices
+					foreach(Sidedef sd in s.Sidedefs) 
+					{
+						Vertex v = sd.IsFront ? sd.Line.End : sd.Line.Start;
+
+						//create "normal" vertices
+						verts[index] = new Vector3D(v.Position);
+
+						// Check floor
+						if(!float.IsNaN(v.ZFloor)) 
+						{
+							//vertex offset is absolute
+							verts[index].z = v.ZFloor;
+							sloped = true;
+						} 
+						else 
+						{
+							verts[index].z = floor.GetZ(v.Position);
+						}
+
+						index++;
+					}
+
+					// Have slope?
+					return (sloped ? new Geometry.Plane(verts[0], verts[1], verts[2], true) : floor);
+				}
+			}
+
+			// Have line slope?
+			foreach(Sidedef side in s.sidedefs)
+			{
+				// Carbon copy of EffectLineSlope class here...
+				if(side.Line.Action == 181 && ((side.Line.Args[0] == 1 && side == side.Line.Front) || side.Line.Args[0] == 2) && side.Other != null)
+				{
+					Linedef l = side.Line;
+					
+					// Find the vertex furthest from the line
+					Vertex foundv = null;
+					float founddist = -1.0f;
+					foreach(Sidedef sd in s.Sidedefs) 
+					{
+						Vertex v = sd.IsFront ? sd.Line.Start : sd.Line.End;
+						float d = l.DistanceToSq(v.Position, false);
+						if(d > founddist) 
+						{
+							foundv = v;
+							founddist = d;
+						}
+					}
+
+					Vector3D v1 = new Vector3D(l.Start.Position.x, l.Start.Position.y, side.Other.Sector.FloorHeight);
+					Vector3D v2 = new Vector3D(l.End.Position.x, l.End.Position.y, side.Other.Sector.FloorHeight);
+					Vector3D v3 = new Vector3D(foundv.Position.x, foundv.Position.y, s.FloorHeight);
+
+					return (l.SideOfLine(v3) < 0.0f ? new Geometry.Plane(v1, v2, v3, true) : new Geometry.Plane(v2, v1, v3, true));
+				}
+			}
+
+			//TODO: other types of slopes...
+
+			// Normal (flat) floor plane
+			return new Geometry.Plane(new Vector3D(0, 0, 1), -s.FloorHeight);
+		}
+
+		//mxd
+		public static Geometry.Plane GetCeilingPlane(Sector s)
+		{
+			if(General.Map.UDMF) 
+			{
+				// UDMF Sector slope?
+				if(s.CeilSlope.GetLengthSq() > 0 && !float.IsNaN(s.CeilSlopeOffset / s.CeilSlope.z))
+					return new Geometry.Plane(s.CeilSlope, s.CeilSlopeOffset);
+
+				if(s.sidedefs.Count == 3) 
+				{
+					Geometry.Plane ceiling = new Geometry.Plane(new Vector3D(0, 0, -1), s.CeilHeight);
+					Vector3D[] verts = new Vector3D[3];
+					bool sloped = false;
+					int index = 0;
+
+					// Check vertices
+					foreach(Sidedef sd in s.Sidedefs) 
+					{
+						Vertex v = sd.IsFront ? sd.Line.End : sd.Line.Start;
+
+						//create "normal" vertices
+						verts[index] = new Vector3D(v.Position);
+
+						// Check floor
+						if(!float.IsNaN(v.ZCeiling)) 
+						{
+							//vertex offset is absolute
+							verts[index].z = v.ZCeiling;
+							sloped = true;
+						} 
+						else 
+						{
+							verts[index].z = ceiling.GetZ(v.Position);
+						}
+
+						index++;
+					}
+
+					// Have slope?
+					return (sloped ? new Geometry.Plane(verts[0], verts[2], verts[1], false) : ceiling);
+				}
+			}
+
+			// Have line slope?
+			foreach(Sidedef side in s.sidedefs) 
+			{
+				// Carbon copy of EffectLineSlope class here...
+				if(side.Line.Action == 181 && ((side.Line.Args[1] == 1 && side == side.Line.Front) || side.Line.Args[1] == 2) && side.Other != null) 
+				{
+					Linedef l = side.Line;
+
+					// Find the vertex furthest from the line
+					Vertex foundv = null;
+					float founddist = -1.0f;
+					foreach(Sidedef sd in s.Sidedefs) 
+					{
+						Vertex v = sd.IsFront ? sd.Line.Start : sd.Line.End;
+						float d = l.DistanceToSq(v.Position, false);
+						if(d > founddist) 
+						{
+							foundv = v;
+							founddist = d;
+						}
+					}
+
+					Vector3D v1 = new Vector3D(l.Start.Position.x, l.Start.Position.y, side.Other.Sector.CeilHeight);
+					Vector3D v2 = new Vector3D(l.End.Position.x, l.End.Position.y, side.Other.Sector.CeilHeight);
+					Vector3D v3 = new Vector3D(foundv.Position.x, foundv.Position.y, s.CeilHeight);
+
+					return (l.SideOfLine(v3) > 0.0f ? new Geometry.Plane(v1, v2, v3, false) : new Geometry.Plane(v2, v1, v3, false));
+				}
+			}
+
+			//TODO: other types of slopes...
+
+			// Normal (flat) ceiling plane
+			return new Geometry.Plane(new Vector3D(0, 0, -1), s.CeilHeight);
+		}
+
+		// String representation
+		public override string ToString()
+		{
+			return "Sector " + listindex;
+		}
+		
+		#endregion
+
+		#region ================== Changes
+
+		//mxd. This updates all properties (Doom/Hexen version)
+		public void Update(int hfloor, int hceil, string tfloor, string tceil, int effect, int tag, int brightness) 
+		{
+			Update(hfloor, hceil, tfloor, tceil, effect, new Dictionary<string, bool>(StringComparer.Ordinal), new List<int> { tag }, brightness, 0, new Vector3D(), 0, new Vector3D());
+		}
+
+		//mxd. This updates all properties (UDMF version)
+		public void Update(int hfloor, int hceil, string tfloor, string tceil, int effect, Dictionary<string, bool> flags, List<int> tags, int brightness, float flooroffset, Vector3D floorslope, float ceiloffset, Vector3D ceilslope)
+		{
+			BeforePropsChange();
+			
+			// Apply changes
+			this.floorheight = hfloor;
+			this.ceilheight = hceil;
+			//SetFloorTexture(tfloor);
+			//SetCeilTexture(tceil);
+			this.effect = effect;
+			this.tags = new List<int>(tags); //mxd
+			this.flags = new Dictionary<string, bool>(flags); //mxd
+			this.brightness = brightness;
+			this.flooroffset = flooroffset; //mxd
+			this.floorslope = floorslope; //mxd
+			this.ceiloffset = ceiloffset; //mxd
+			this.ceilslope = ceilslope; //mxd
+
+			//mxd. Set ceil texture
+			if(string.IsNullOrEmpty(tceil)) tceil = "-";
+			ceiltexname = tceil;
+			longceiltexname = Lump.MakeLongName(ceiltexname);
+
+			//mxd. Set floor texture
+			if(string.IsNullOrEmpty(tfloor)) tfloor = "-"; //mxd
+			floortexname = tfloor;
+			longfloortexname = Lump.MakeLongName(tfloor);
+
+			//mxd. Map is changed
+			General.Map.IsChanged = true;
+			updateneeded = true;
+		}
+
+		// This sets texture
+		public void SetFloorTexture(string name)
+		{
+			BeforePropsChange();
+			
+			if(string.IsNullOrEmpty(name)) name = "-"; //mxd
+			floortexname = name;
+			longfloortexname = General.Map.Data.GetFullLongFlatName(Lump.MakeLongName(name)); //mxd
+			updateneeded = true;
+			General.Map.IsChanged = true;
+		}
+
+		// This sets texture
+		public void SetCeilTexture(string name)
+		{
+			BeforePropsChange();
+			
+			if(string.IsNullOrEmpty(name)) name = "-"; //mxd
+			ceiltexname = name;
+			longceiltexname = General.Map.Data.GetFullLongFlatName(Lump.MakeLongName(name)); //mxd
+			updateneeded = true;
+			General.Map.IsChanged = true;
+		}
+
+		//mxd. This sets texture lookup
+		internal void SetFloorTexture(long hash)
+		{
+			BeforePropsChange();
+
+			longfloortexname = hash;
+			updateneeded = true;
+			General.Map.IsChanged = true;
+		}
+
+		//mxd. This sets texture lookup
+		internal void SetCeilTexture(long hash)
+		{
+			BeforePropsChange();
+
+			longceiltexname = hash;
+			updateneeded = true;
+			General.Map.IsChanged = true;
+		}
+
+		//mxd
+		public void UpdateFogColor() 
+		{
+			// Sector uses outisde fog when it's ceiling is sky or Sector_Outside effect (87) is set
+			useOutsideFog = (General.Map.Data.MapInfo.HasOutsideFogColor && (ceiltexname == General.Map.Config.SkyFlatName || (effect == 87 && General.Map.Config.SectorEffects.ContainsKey(effect))));
+
+			if(General.Map.UDMF && Fields.ContainsKey("fadecolor"))
+				fogColor = new Color4((int)Fields["fadecolor"].Value);
+			else if(useOutsideFog)
+				fogColor = General.Map.Data.MapInfo.OutsideFogColor;
+			else if(General.Map.Data.MapInfo.HasFadeColor)
+				fogColor = General.Map.Data.MapInfo.FadeColor;
+			else
+				fogColor = new Color4();
+
+			hasFogColor = fogColor.Red > 0 || fogColor.Green > 0 || fogColor.Blue > 0;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Map/SelectableElement.cs b/Source/Core/Map/SelectableElement.cs
new file mode 100644
index 0000000..4452592
--- /dev/null
+++ b/Source/Core/Map/SelectableElement.cs
@@ -0,0 +1,111 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Map
+{
+	public abstract class SelectableElement : MapElement
+	{
+		#region ================== Constants
+		
+		#endregion
+		
+		#region ================== Variables
+		
+		// Selected or not?
+		private bool selected;
+		
+		// Group bitmask
+		private int groups;
+		
+		#endregion
+		
+		#region ================== Properties
+
+		public bool Selected { get { return selected; } set { if(value && !selected) DoSelect(); else if(!value && selected) DoUnselect(); } }
+		
+		#endregion
+		
+		#region ================== Constructor / Disposer
+		
+		// Disposer
+		public override void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Remove from selection
+				if(selected) Selected = false;
+
+				// Done
+				base.Dispose();
+			}
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+
+		// This makes the selection
+		protected virtual void DoSelect()
+		{
+			selected = true;
+		}
+
+		// This removes the selection
+		protected virtual void DoUnselect()
+		{
+			selected = false;
+		}
+		
+		// This copies properties to any other element
+		public void CopyPropertiesTo(SelectableElement element)
+		{
+			element.groups = this.groups;
+			element.Selected = this.selected;
+			base.CopyPropertiesTo(element);
+		}
+		
+		// This adds the element to one or more groups
+		public void AddToGroup(int groupsmask)
+		{
+			groups |= groupsmask;
+		}
+		
+		// This removes the elements from one or more groups
+		public void RemoveFromGroup(int groupsmask)
+		{
+			groups &= ~groupsmask;
+		}
+		
+		// This selects by group
+		public void SelectByGroup(int groupsmask)
+		{
+			this.Selected = ((groups & groupsmask) != 0);
+		}
+
+		//mxd. This checks if given element belongs to a particular group
+		public bool IsInGroup(int groupsmask) 
+		{
+			return ((groups & groupsmask) != 0);
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Map/SelectionType.cs b/Source/Core/Map/SelectionType.cs
new file mode 100644
index 0000000..9dab0c4
--- /dev/null
+++ b/Source/Core/Map/SelectionType.cs
@@ -0,0 +1,35 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Map
+{
+	[Flags]
+	public enum SelectionType
+	{
+		None = 0,
+		Vertices = 1,
+		Linedefs = 2,
+		Sectors = 4,
+		Things = 8,
+		All = 0x7FFFFFFF,
+	}
+}
diff --git a/Source/Core/Map/Sidedef.cs b/Source/Core/Map/Sidedef.cs
new file mode 100644
index 0000000..0712ac2
--- /dev/null
+++ b/Source/Core/Map/Sidedef.cs
@@ -0,0 +1,774 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.IO;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Data;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Map
+{
+	public sealed class Sidedef : MapElement
+	{
+		#region ================== Variables
+
+		// Map
+		private MapSet map;
+
+		// List items
+		private LinkedListNode<Sidedef> sectorlistitem;
+
+		// Owner
+		private Linedef linedef;
+		
+		// Sector
+		private Sector sector;
+
+		// Properties
+		private int offsetx;
+		private int offsety;
+		private string texnamehigh;
+		private string texnamemid;
+		private string texnamelow;
+		private long longtexnamehigh;
+		private long longtexnamemid;
+		private long longtexnamelow;
+
+		//mxd. UDMF properties
+		private Dictionary<string, bool> flags;
+
+		// Clone
+		private int serializedindex;
+		
+		#endregion
+
+		#region ================== Properties
+
+		public MapSet Map { get { return map; } }
+		public bool IsFront { get { return (linedef != null) && (this == linedef.Front); } }
+		public Linedef Line { get { return linedef; } }
+		public Sidedef Other { get { return (this == linedef.Front ? linedef.Back : linedef.Front); } }
+		public Sector Sector { get { return sector; } }
+		internal Dictionary<string, bool> Flags { get { return flags; } } //mxd
+		public float Angle { get { return (IsFront ? linedef.Angle : Angle2D.Normalized(linedef.Angle + Angle2D.PI)); } }
+		public int OffsetX { get { return offsetx; } set { BeforePropsChange(); offsetx = value; } }
+		public int OffsetY { get { return offsety; } set { BeforePropsChange(); offsety = value; } }
+		public string HighTexture { get { return texnamehigh; } }
+		public string MiddleTexture { get { return texnamemid; } }
+		public string LowTexture { get { return texnamelow; } }
+		public long LongHighTexture { get { return longtexnamehigh; } }
+		public long LongMiddleTexture { get { return longtexnamemid; } }
+		public long LongLowTexture { get { return longtexnamelow; } }
+		internal int SerializedIndex { get { return serializedindex; } set { serializedindex = value; } }
+		
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		internal Sidedef(MapSet map, int listindex, Linedef l, bool front, Sector s)
+		{
+			// Initialize
+			this.elementtype = MapElementType.SIDEDEF; //mxd
+			this.map = map;
+			this.listindex = listindex;
+			this.texnamehigh = "-";
+			this.texnamemid = "-";
+			this.texnamelow = "-";
+			this.longtexnamehigh = MapSet.EmptyLongName;
+			this.longtexnamemid = MapSet.EmptyLongName;
+			this.longtexnamelow = MapSet.EmptyLongName;
+			this.flags = new Dictionary<string, bool>(StringComparer.Ordinal); //mxd
+			
+			// Attach linedef
+			this.linedef = l;
+			if(l != null)
+			{
+				if(front)
+					l.AttachFrontP(this);
+				else
+					l.AttachBackP(this);
+			}
+			
+			// Attach sector
+			SetSectorP(s);
+			
+			if(map == General.Map.Map)
+				General.Map.UndoRedo.RecAddSidedef(this);
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Disposer
+		public override void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Already set isdisposed so that changes can be prohibited
+				isdisposed = true;
+
+				if(map == General.Map.Map)
+					General.Map.UndoRedo.RecRemSidedef(this);
+
+				// Remove from main list
+				map.RemoveSidedef(listindex);
+
+				// Detach from linedef
+				if(linedef != null) linedef.DetachSidedefP(this);
+				
+				// Detach from sector
+				SetSectorP(null);
+
+				// Clean up
+				sectorlistitem = null;
+				linedef = null;
+				map = null;
+				sector = null;
+
+				//mxd. Restore isdisposed so base classes can do their disposal job
+				isdisposed = false;
+
+				// Dispose base
+				base.Dispose();
+			}
+		}
+
+		#endregion
+
+		#region ================== Management
+		
+		// Call this before changing properties
+		protected override void BeforePropsChange()
+		{
+			if(map == General.Map.Map)
+				General.Map.UndoRedo.RecPrpSidedef(this);
+		}
+		
+		// Serialize / deserialize (passive: this doesn't record)
+		new internal void ReadWrite(IReadWriteStream s)
+		{
+			if(!s.IsWriting) BeforePropsChange();
+			
+			base.ReadWrite(s);
+
+			//mxd
+			if(s.IsWriting) 
+			{
+				s.wInt(flags.Count);
+
+				foreach(KeyValuePair<string, bool> f in flags) 
+				{
+					s.wString(f.Key);
+					s.wBool(f.Value);
+				}
+			} 
+			else 
+			{
+				int c;
+				s.rInt(out c);
+
+				flags = new Dictionary<string, bool>(c, StringComparer.Ordinal);
+				for(int i = 0; i < c; i++) 
+				{
+					string t;
+					s.rString(out t);
+					bool b;
+					s.rBool(out b);
+					flags.Add(t, b);
+				}
+			}
+
+			s.rwInt(ref offsetx);
+			s.rwInt(ref offsety);
+			s.rwString(ref texnamehigh);
+			s.rwString(ref texnamemid);
+			s.rwString(ref texnamelow);
+			s.rwLong(ref longtexnamehigh);
+			s.rwLong(ref longtexnamemid);
+			s.rwLong(ref longtexnamelow);
+		}
+		
+		// This copies all properties to another sidedef
+		public void CopyPropertiesTo(Sidedef s)
+		{
+			s.BeforePropsChange();
+			
+			// Copy properties
+			s.offsetx = offsetx;
+			s.offsety = offsety;
+			s.texnamehigh = texnamehigh;
+			s.texnamemid = texnamemid;
+			s.texnamelow = texnamelow;
+			s.longtexnamehigh = longtexnamehigh;
+			s.longtexnamemid = longtexnamemid;
+			s.longtexnamelow = longtexnamelow;
+			s.flags = new Dictionary<string, bool>(flags); //mxd
+			base.CopyPropertiesTo(s);
+		}
+
+		// This changes sector
+		public void SetSector(Sector newsector)
+		{
+			if(map == General.Map.Map)
+				General.Map.UndoRedo.RecRefSidedefSector(this);
+			
+			// Change sector
+			SetSectorP(newsector);
+		}
+
+		internal void SetSectorP(Sector newsector)
+		{
+			// Detach from sector
+			if(sector != null && !sector.IsDisposed) //mxd
+				sector.DetachSidedefP(sectorlistitem);
+
+			// Change sector
+			sector = newsector;
+
+			// Attach to sector
+			if(sector != null && !sector.IsDisposed) //mxd
+				sectorlistitem = sector.AttachSidedefP(this);
+
+			General.Map.IsChanged = true;
+		}
+
+		// This sets the linedef
+		public void SetLinedef(Linedef ld, bool front)
+		{
+			if(linedef != null) linedef.DetachSidedefP(this);
+			
+			if(ld != null)
+			{
+				if(front)
+					ld.AttachFront(this);
+				else
+					ld.AttachBack(this);
+			}
+		}
+
+		// This sets the linedef (passive: this doesn't tell the linedef and doesn't record)
+		internal void SetLinedefP(Linedef ld)
+		{
+			linedef = ld;
+		}
+
+		//mxd. This translates UDMF fields back into the normal flags and activations
+		internal void TranslateFromUDMF() 
+		{
+			// Try to translate UDMF texture offsets to regular ones
+			if(longtexnamemid != MapSet.EmptyLongName && MiddleRequired()) 
+			{
+				offsetx += (int)UniFields.GetFloat(this.Fields, "offsetx_mid");
+				offsety += (int)UniFields.GetFloat(this.Fields, "offsety_mid");
+			}
+			else if(longtexnamehigh != MapSet.EmptyLongName && HighRequired()) 
+			{
+				offsetx += (int)UniFields.GetFloat(this.Fields, "offsetx_top");
+				offsety += (int)UniFields.GetFloat(this.Fields, "offsety_top");
+			}
+			else if(longtexnamelow != MapSet.EmptyLongName && LowRequired()) 
+			{
+				offsetx += (int)UniFields.GetFloat(this.Fields, "offsetx_bottom");
+				offsety += (int)UniFields.GetFloat(this.Fields, "offsety_bottom");
+			}
+			
+			// Clear UDMF-related properties
+			this.Fields.Clear();
+			this.Flags.Clear();
+		}
+		
+		#endregion
+
+		#region ================== Methods
+
+		// This checks and returns a flag without creating it
+		public bool IsFlagSet(string flagname) 
+		{
+			return (flags.ContainsKey(flagname) && flags[flagname]);
+		}
+
+		// This sets a flag
+		public void SetFlag(string flagname, bool value) 
+		{
+			if(!flags.ContainsKey(flagname) || (IsFlagSet(flagname) != value)) 
+			{
+				BeforePropsChange();
+				flags[flagname] = value;
+			}
+		}
+
+		// This returns a copy of the flags dictionary
+		public Dictionary<string, bool> GetFlags() 
+		{
+			return new Dictionary<string, bool>(flags);
+		}
+
+		// This clears all flags
+		public void ClearFlags() 
+		{
+			BeforePropsChange();
+			flags.Clear();
+		}
+		
+		// This removes textures that are not required
+		public void RemoveUnneededTextures(bool removemiddle)
+		{
+			RemoveUnneededTextures(removemiddle, false, false);
+		}
+
+		// This removes textures that are not required
+		public void RemoveUnneededTextures(bool removemiddle, bool force) 
+		{
+			RemoveUnneededTextures(removemiddle, force, false);
+		}
+		
+		// This removes textures that are not required
+		public void RemoveUnneededTextures(bool removemiddle, bool force, bool shiftmiddle)
+		{
+			bool changed = false; //mxd
+
+			// Check if the line or sectors have no action or tags because
+			// if they do, any texture on this side could be needed
+			if(force || ((linedef.Tag == 0) && (linedef.Action == 0) && (sector.Tag == 0) &&
+				((Other == null) || (Other.sector.Tag == 0))))
+			{
+				if(!HighRequired())
+				{
+					BeforePropsChange(); //mxd
+					changed = true;
+					this.texnamehigh = "-";
+					this.longtexnamehigh = MapSet.EmptyLongName;
+					General.Map.IsChanged = true;
+				} 
+				else if(shiftmiddle && this.longtexnamehigh == MapSet.EmptyLongName) //mxd
+				{
+					SetTextureHigh(this.texnamemid);
+					changed = true;
+				}
+
+				if(!LowRequired())
+				{
+					if(!changed) //mxd
+					{
+						BeforePropsChange();
+						changed = true;
+					}
+					this.texnamelow = "-";
+					this.longtexnamelow = MapSet.EmptyLongName;
+					General.Map.IsChanged = true;
+				} 
+				else if(shiftmiddle && this.longtexnamelow == MapSet.EmptyLongName) //mxd 
+				{
+					SetTextureLow(this.texnamemid);
+					changed = true;
+				}
+			}
+
+			// The middle texture can be removed regardless of any sector tag or linedef action
+			if(!MiddleRequired() && removemiddle) 
+			{
+				if(!changed) BeforePropsChange(); //mxd
+				this.texnamemid = "-";
+				this.longtexnamemid = MapSet.EmptyLongName;
+				General.Map.IsChanged = true;
+			}
+		}
+		
+		/// <summary>
+		/// This checks if a texture is required
+		/// </summary>
+		public bool HighRequired()
+		{
+			// Doublesided?
+			if(Other != null)
+			{
+				//mxd. Check sloped ceilings...
+				if(General.Map.UDMF && this.sector != Other.Sector) 
+				{
+					float thisstartz = this.sector.CeilHeight;
+					float thisendz = this.sector.CeilHeight;
+					float otherstartz = Other.sector.CeilHeight;
+					float otherendz = Other.sector.CeilHeight;
+
+					// Check if this side is affected by UDMF slope (it overrides vertex heights, riiiiiight?..) TODO: check this!
+					if(this.sector.CeilSlope.GetLengthSq() > 0) 
+					{
+						Plane ceil = new Plane(this.sector.CeilSlope, this.sector.CeilSlopeOffset);
+						thisstartz = ceil.GetZ(this.Line.Start.Position);
+						thisendz = ceil.GetZ(this.Line.End.Position);
+					} 
+					else if(this.sector.Sidedefs.Count == 3) // Check vertex heights on this side
+					{
+						if(!float.IsNaN(this.Line.Start.ZCeiling)) thisstartz = this.Line.Start.ZCeiling;
+						if(!float.IsNaN(this.Line.End.ZCeiling)) thisendz = this.Line.End.ZCeiling;
+					}
+
+					// Check if other side is affected by UDMF slope (it overrides vertex heights, riiiiiight?..) TODO: check this!
+					if(Other.sector.CeilSlope.GetLengthSq() > 0) 
+					{
+						Plane ceil = new Plane(Other.sector.CeilSlope, Other.sector.CeilSlopeOffset);
+						otherstartz = ceil.GetZ(this.Line.Start.Position);
+						otherendz = ceil.GetZ(this.Line.End.Position);
+					} 
+					else if(Other.sector.Sidedefs.Count == 3) // Check other line's vertex heights
+					{
+						if(!float.IsNaN(this.Line.Start.ZCeiling)) otherstartz = this.Line.Start.ZCeiling;
+						if(!float.IsNaN(this.Line.End.ZCeiling)) otherendz = this.Line.End.ZCeiling;
+					}
+
+					// Texture is required when our start or end vertex is higher than on the other side.
+					if(thisstartz > otherstartz || thisendz > otherendz) return true;
+				}
+				
+				// Texture is required when ceiling of other side is lower
+				return (Other.sector.CeilHeight < this.sector.CeilHeight);
+			}
+
+			return false;
+		}
+
+		/// <summary>
+		/// This checks if a texture is required
+		/// </summary>
+		public bool MiddleRequired()
+		{
+			// Texture is required when the line is singlesided
+			return (Other == null);
+		}
+
+		/// <summary>
+		/// This checks if a texture is required
+		/// </summary>
+		public bool LowRequired()
+		{
+			// Doublesided?
+			if(Other != null)
+			{
+				//mxd. Check sloped floors...
+				if(General.Map.UDMF && this.sector != Other.Sector)
+				{
+					float thisstartz = this.sector.FloorHeight;
+					float thisendz = this.sector.FloorHeight;
+					float otherstartz = Other.sector.FloorHeight;
+					float otherendz = Other.sector.FloorHeight;
+
+					// Check if this side is affected by UDMF slope (it overrides vertex heights, riiiiiight?..) TODO: check this!
+					if(this.sector.FloorSlope.GetLengthSq() > 0) 
+					{
+						Plane floor = new Plane(this.sector.FloorSlope, this.sector.FloorSlopeOffset);
+						thisstartz = floor.GetZ(this.Line.Start.Position);
+						thisendz = floor.GetZ(this.Line.End.Position);
+					} 
+					else if(this.sector.Sidedefs.Count == 3) // Check vertex heights on this side
+					{
+						if(!float.IsNaN(this.Line.Start.ZFloor)) thisstartz = this.Line.Start.ZFloor;
+						if(!float.IsNaN(this.Line.End.ZFloor)) thisendz = this.Line.End.ZFloor;
+					}
+					
+					// Check if other side is affected by UDMF slope (it overrides vertex heights, riiiiiight?..) TODO: check this!
+					if(Other.sector.FloorSlope.GetLengthSq() > 0)
+					{
+						Plane floor = new Plane(Other.sector.FloorSlope, Other.sector.FloorSlopeOffset);
+						otherstartz = floor.GetZ(this.Line.Start.Position);
+						otherendz = floor.GetZ(this.Line.End.Position);
+					}
+					else if(Other.sector.Sidedefs.Count == 3) // Check other line's vertex heights
+					{
+						if(!float.IsNaN(this.Line.Start.ZFloor)) otherstartz = this.Line.Start.ZFloor;
+						if(!float.IsNaN(this.Line.End.ZFloor)) otherendz = this.Line.End.ZFloor;
+					}
+
+					// Texture is required when our start or end vertex is lower than on the other side.
+					if(thisstartz < otherstartz || thisendz < otherendz) return true;
+				}
+
+				// Texture is required when floor of other side is higher
+				return (Other.sector.FloorHeight > this.sector.FloorHeight);
+			}
+
+			return false;
+		}
+
+		/// <summary>
+		/// This returns the height of the upper wall part. Returns 0 when no upper part exists.
+		/// </summary>
+		public int GetHighHeight()
+		{
+			Sidedef other = this.Other;
+			if(other != null)
+			{
+				int top = this.sector.CeilHeight;
+				int bottom = other.sector.CeilHeight;
+				int height = top - bottom;
+				return (height > 0) ? height : 0;
+			}
+
+			return 0;
+		}
+
+		/// <summary>
+		/// This returns the height of the middle wall part.
+		/// </summary>
+		public int GetMiddleHeight()
+		{
+			Sidedef other = this.Other;
+			if(other != null)
+			{
+				int top = Math.Min(this.Sector.CeilHeight, other.Sector.CeilHeight);
+				int bottom = Math.Max(this.Sector.FloorHeight, other.Sector.FloorHeight);
+				int height = top - bottom;
+				return (height > 0) ? height : 0;
+			}
+			else
+			{
+				int top = this.Sector.CeilHeight;
+				int bottom = this.Sector.FloorHeight;
+				int height = top - bottom;
+				return (height > 0) ? height : 0;
+			}
+		}
+
+		/// <summary>
+		/// This returns the height of the lower wall part. Returns 0 when no lower part exists.
+		/// </summary>
+		public int GetLowHeight()
+		{
+			Sidedef other = this.Other;
+			if(other != null)
+			{
+				int top = other.sector.FloorHeight;
+				int bottom = this.sector.FloorHeight;
+				int height = top - bottom;
+				return (height > 0) ? height : 0;
+			}
+
+			return 0;
+		}
+		
+		// This creates a checksum from the sidedef properties
+		// Used for faster sidedefs compression
+		public uint GetChecksum()
+		{
+			CRC crc = new CRC();
+			crc.Add(sector.FixedIndex);
+			crc.Add(offsetx);
+			crc.Add(offsety);
+			crc.Add(longtexnamehigh);
+			crc.Add(longtexnamelow);
+			crc.Add(longtexnamemid);
+			return (uint)(crc.Value & 0x00000000FFFFFFFF);
+		}
+
+		// This copies textures to another sidedef
+		// And possibly also the offsets
+		public void AddTexturesTo(Sidedef s)
+		{
+			int copyoffsets = 0;
+
+			// s cannot be null
+			if(s == null) return;
+
+			s.BeforePropsChange();
+
+			// Upper texture set?
+			if((texnamehigh.Length > 0) && (texnamehigh != "-"))
+			{
+				// Copy upper texture
+				s.texnamehigh = texnamehigh;
+				s.longtexnamehigh = longtexnamehigh;
+
+				// Counts as a half coice for copying offsets
+				copyoffsets += 1;
+			}
+
+			// Middle texture set?
+			if((texnamemid.Length > 0) && (texnamemid != "-"))
+			{
+				// Copy middle texture
+				s.texnamemid = texnamemid;
+				s.longtexnamemid = longtexnamemid;
+
+				// Counts for copying offsets
+				copyoffsets += 2;
+			}
+
+			// Lower texture set?
+			if((texnamelow.Length > 0) && (texnamelow != "-"))
+			{
+				// Copy middle texture
+				s.texnamelow = texnamelow;
+				s.longtexnamelow = longtexnamelow;
+
+				// Counts as a half coice for copying offsets
+				copyoffsets += 1;
+			}
+
+			// Copy offsets also?
+			if(copyoffsets >= 2)
+			{
+				// Copy offsets
+				s.offsetx = offsetx;
+				s.offsety = offsety;
+			}
+
+			General.Map.IsChanged = true;
+		}
+		
+		#endregion
+
+		#region ================== Changes
+
+		// This updates all properties
+		public void Update(int offsetx, int offsety, string thigh, string tmid, string tlow) 
+		{
+			Update(offsetx, offsety, thigh, tmid, tlow, new Dictionary<string, bool>(StringComparer.Ordinal));
+		}
+
+		//mxd. This updates all properties (UDMF version)
+		public void Update(int offsetx, int offsety, string thigh, string tmid, string tlow, Dictionary<string, bool> flags)
+		{
+			BeforePropsChange();
+			
+			// Apply changes
+			this.offsetx = offsetx;
+			this.offsety = offsety;
+			this.flags = new Dictionary<string, bool>(flags); //mxd
+			//SetTextureMid(tmid);
+			//SetTextureLow(tlow);
+			//SetTextureHigh(thigh);
+
+			//mxd. Set mid texture
+			texnamemid = string.IsNullOrEmpty(tmid) ? "-" : tmid;
+			longtexnamemid = Lump.MakeLongName(tmid);
+
+			//mxd. Set low texture
+			texnamelow = string.IsNullOrEmpty(tlow) ? "-" : tlow;
+			longtexnamelow = Lump.MakeLongName(tlow);
+
+			//mxd. Set high texture
+			texnamehigh = string.IsNullOrEmpty(thigh) ? "-" : thigh;
+			longtexnamehigh = Lump.MakeLongName(texnamehigh);
+
+			//mxd. Map is changed
+			General.Map.IsChanged = true;
+		}
+
+		// This sets texture
+		public void SetTextureHigh(string name)
+		{
+			BeforePropsChange();
+			
+			texnamehigh = string.IsNullOrEmpty(name) ? "-" : name; //mxd
+			longtexnamehigh = General.Map.Data.GetFullLongTextureName(Lump.MakeLongName(name)); //mxd
+			General.Map.IsChanged = true;
+		}
+
+		// This sets texture
+		public void SetTextureMid(string name)
+		{
+			BeforePropsChange();
+			
+			texnamemid = string.IsNullOrEmpty(name) ? "-" : name; //mxd;
+			longtexnamemid = General.Map.Data.GetFullLongTextureName(Lump.MakeLongName(name)); //mxd
+			General.Map.IsChanged = true;
+		}
+
+		// This sets texture
+		public void SetTextureLow(string name)
+		{
+			BeforePropsChange();
+			
+			texnamelow = string.IsNullOrEmpty(name) ? "-" : name; //mxd;
+			longtexnamelow = General.Map.Data.GetFullLongTextureName(Lump.MakeLongName(name)); //mxd
+			General.Map.IsChanged = true;
+		}
+
+		//mxd. This sets texture lookup
+		public void SetTextureHigh(long hash) 
+		{
+			BeforePropsChange();
+
+			longtexnamehigh = hash;
+			General.Map.IsChanged = true;
+		}
+
+		//mxd. This sets texture lookup
+		public void SetTextureMid(long hash) 
+		{
+			BeforePropsChange();
+
+			longtexnamemid = hash;
+			General.Map.IsChanged = true;
+		}
+
+		//mxd. This sets texture lookup
+		public void SetTextureLow(long hash) 
+		{
+			BeforePropsChange();
+
+			longtexnamelow = hash;
+			General.Map.IsChanged = true;
+		}
+
+		// This sets udmf texture offset
+		public void SetUdmfTextureOffsetX(int offset) 
+		{
+			this.Fields.BeforeFieldsChange();
+
+			//top
+			if(longtexnamehigh != MapSet.EmptyLongName && General.Map.Data.GetTextureExists(texnamehigh)) 
+			{
+				ImageData texture = General.Map.Data.GetTextureImage(texnamehigh);
+				float scaleTop = Fields.GetValue("scalex_top", 1.0f);
+
+				float value = Fields.GetValue("offsetx_top", 0f);
+				float result = (float)(Math.Round(value + offset * scaleTop) % texture.Width);
+				UniFields.SetFloat(Fields, "offsetx_top", result);
+			}
+
+			//middle
+			if(longtexnamemid != MapSet.EmptyLongName && General.Map.Data.GetTextureExists(texnamemid)) 
+			{
+				ImageData texture = General.Map.Data.GetTextureImage(texnamemid);
+				float scaleMid = Fields.GetValue("scalex_mid", 1.0f);
+
+				float value = Fields.GetValue("offsetx_mid", 0f);
+				float result = (float)(Math.Round(value + offset * scaleMid) % texture.Width);
+				UniFields.SetFloat(Fields, "offsetx_mid", result);
+			}
+
+			//bottom
+			if(longtexnamelow != MapSet.EmptyLongName && General.Map.Data.GetTextureExists(texnamelow)) 
+			{
+				ImageData texture = General.Map.Data.GetTextureImage(texnamelow);
+				float scaleLow = Fields.GetValue("scalex_bottom", 1.0f);
+
+				float value = Fields.GetValue("offsetx_bottom", 0f);
+				float result = (float)(Math.Round(value + offset * scaleLow) % texture.Width);
+				UniFields.SetFloat(Fields, "offsetx_bottom", result);
+			}
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Map/SidedefPart.cs b/Source/Core/Map/SidedefPart.cs
new file mode 100644
index 0000000..02cd477
--- /dev/null
+++ b/Source/Core/Map/SidedefPart.cs
@@ -0,0 +1,30 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Map
+{
+	public enum SidedefPart
+	{
+		None = 0,
+		Upper = 1,
+		Middle = 2,
+		Lower = 3
+	}
+}
diff --git a/Source/Core/Map/SplitLineBehavior.cs b/Source/Core/Map/SplitLineBehavior.cs
new file mode 100644
index 0000000..dbb9061
--- /dev/null
+++ b/Source/Core/Map/SplitLineBehavior.cs
@@ -0,0 +1,10 @@
+namespace CodeImp.DoomBuilder.Map
+{
+	public enum SplitLineBehavior
+	{
+		Interpolate,
+		CopyXY,
+		ResetXCopyY,
+		ResetXY,
+	}
+}
diff --git a/Source/Core/Map/Thing.cs b/Source/Core/Map/Thing.cs
new file mode 100644
index 0000000..fc76188
--- /dev/null
+++ b/Source/Core/Map/Thing.cs
@@ -0,0 +1,651 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.GZBuilder.Data;
+using CodeImp.DoomBuilder.IO;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Types;
+using CodeImp.DoomBuilder.VisualModes;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Map
+{
+	public sealed class Thing : SelectableElement
+	{
+		#region ================== Constants
+
+		public const int NUM_ARGS = 5;
+
+		#endregion
+
+		#region ================== Enums
+
+		public enum SpriteRenderMode
+		{
+			NORMAL,
+			WALL_SPRITE,
+			FLOOR_SPRITE,
+			CEILING_SPRITE
+		}
+
+		#endregion
+
+		#region ================== Variables
+
+		// Map
+		private MapSet map;
+
+		// Sector
+		private Sector sector;
+
+		// List items
+		private LinkedListNode<Thing> selecteditem;
+		
+		// Properties
+		private int type;
+		private Vector3D pos;
+		private int angledoom;		// Angle as entered / stored in file
+		private float anglerad;		// Angle in radians
+		private Dictionary<string, bool> flags;
+		private int tag;
+		private int action;
+		private int[] args;
+		private float scaleX; //mxd
+		private float scaleY; //mxd
+		private SizeF spritescale; //mxd
+		private int pitch; //mxd. Used in model rendering
+		private int roll; //mxd. Used in model rendering
+		private float pitchrad; //mxd
+		private float rollrad; //mxd
+		private bool ismodel; //mxd
+		private bool highlighted; //mxd
+
+		//mxd. GLOOME rendering settings
+		private bool rollsprite; //mxd
+
+		// Configuration
+		private float size;
+		private float height; //mxd
+		private PixelColor color;
+		private bool fixedsize;
+		private bool directional; //mxd. If true, we need to render an arrow
+
+		#endregion
+
+		#region ================== Properties
+
+		public MapSet Map { get { return map; } }
+		public int Type { get { return type; } set { BeforePropsChange(); type = value; } } //mxd
+		public Vector3D Position { get { return pos; } }
+		public float ScaleX { get { return scaleX; } } //mxd. This is UDMF property, not actual scale!
+		public float ScaleY { get { return scaleY; } } //mxd. This is UDMF property, not actual scale!
+		public int Pitch { get { return pitch; } } //mxd
+		public float PitchRad { get { return pitchrad; } }
+		public int Roll { get { return roll; } } //mxd
+		public float RollRad { get { return rollrad; } }
+		public SizeF ActorScale { get { return spritescale; } } //mxd. Actor scale set in DECORATE
+		public float Angle { get { return anglerad; } }
+		public int AngleDoom { get { return angledoom; } }
+		internal Dictionary<string, bool> Flags { get { return flags; } }
+		public int Action { get { return action; } set { BeforePropsChange(); action = value; } }
+		public int[] Args { get { return args; } }
+		public float Size { get { return size; } }
+		public float Height { get { return height; } } //mxd
+		public PixelColor Color { get { return color; } }
+		public bool FixedSize { get { return fixedsize; } }
+		public int Tag { get { return tag; } set { BeforePropsChange(); tag = value; if((tag < General.Map.FormatInterface.MinTag) || (tag > General.Map.FormatInterface.MaxTag)) throw new ArgumentOutOfRangeException("Tag", "Invalid tag number"); } }
+		public Sector Sector { get { return sector; } }
+		public bool IsModel { get { return ismodel; } } //mxd
+		public bool IsDirectional { get { return directional; } } //mxd
+		public bool Highlighted { get { return highlighted; } set { highlighted = value; } } //mxd
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		internal Thing(MapSet map, int listindex)
+		{
+			// Initialize
+			this.elementtype = MapElementType.THING; //mxd
+			this.map = map;
+			this.listindex = listindex;
+			this.flags = new Dictionary<string, bool>(StringComparer.Ordinal);
+			this.args = new int[NUM_ARGS];
+			this.scaleX = 1.0f;
+			this.scaleY = 1.0f;
+			this.spritescale = new SizeF(1.0f, 1.0f);
+			
+			if(map == General.Map.Map)
+				General.Map.UndoRedo.RecAddThing(this);
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Disposer
+		public override void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				if(map == General.Map.Map)
+					General.Map.UndoRedo.RecRemThing(this);
+
+				// Remove from main list
+				map.RemoveThing(listindex);
+				
+				// Clean up
+				map = null;
+				sector = null;
+
+				// Dispose base
+				base.Dispose();
+			}
+		}
+
+		#endregion
+
+		#region ================== Management
+		
+		// Call this before changing properties
+		protected override void BeforePropsChange()
+		{
+			if(map == General.Map.Map)
+				General.Map.UndoRedo.RecPrpThing(this);
+		}
+		
+		// Serialize / deserialize
+		new internal void ReadWrite(IReadWriteStream s)
+		{
+			if(!s.IsWriting) BeforePropsChange();
+			
+			base.ReadWrite(s);
+
+			if(s.IsWriting)
+			{
+				s.wInt(flags.Count);
+				
+				foreach(KeyValuePair<string, bool> f in flags)
+				{
+					s.wString(f.Key);
+					s.wBool(f.Value);
+				}
+			}
+			else
+			{
+				int c; s.rInt(out c);
+
+				flags = new Dictionary<string, bool>(c, StringComparer.Ordinal);
+				for(int i = 0; i < c; i++)
+				{
+					string t; s.rString(out t);
+					bool b; s.rBool(out b);
+					flags.Add(t, b);
+				}
+			}
+			
+			s.rwInt(ref type);
+			s.rwVector3D(ref pos);
+			s.rwInt(ref angledoom);
+			s.rwInt(ref pitch); //mxd
+			s.rwInt(ref roll); //mxd
+			s.rwFloat(ref scaleX); //mxd
+			s.rwFloat(ref scaleY); //mxd
+			s.rwInt(ref tag);
+			s.rwInt(ref action);
+			for(int i = 0; i < NUM_ARGS; i++) s.rwInt(ref args[i]);
+
+			if(!s.IsWriting) 
+			{
+				anglerad = Angle2D.DoomToReal(angledoom);
+				UpdateCache(); //mxd
+			}
+		}
+
+		// This copies all properties to another thing
+		public void CopyPropertiesTo(Thing t)
+		{
+			t.BeforePropsChange();
+			
+			// Copy properties
+			t.type = type;
+			t.anglerad = anglerad;
+			t.angledoom = angledoom;
+			t.roll = roll; //mxd
+			t.pitch = pitch; //mxd
+			t.rollrad = rollrad; //mxd
+			t.pitchrad = pitchrad; //mxd
+			t.scaleX = scaleX; //mxd
+			t.scaleY = scaleY; //mxd
+			t.spritescale = spritescale; //mxd
+			t.pos = pos;
+			t.flags = new Dictionary<string,bool>(flags);
+			t.tag = tag;
+			t.action = action;
+			t.args = (int[])args.Clone();
+			t.size = size;
+			t.height = height; //mxd
+			t.color = color;
+			t.directional = directional;
+			t.fixedsize = fixedsize;
+			t.ismodel = ismodel; //mxd
+			t.rollsprite = rollsprite; //mxd
+
+			base.CopyPropertiesTo(t);
+		}
+
+		// This determines which sector the thing is in and links it
+		public void DetermineSector()
+		{
+			//mxd
+			sector = map.GetSectorByCoordinates(pos);
+		}
+
+		// This determines which sector the thing is in and links it
+		public void DetermineSector(VisualBlockMap blockmap)
+		{
+			// Find nearest sectors using the blockmap
+			List<Sector> possiblesectors = blockmap.GetBlock(blockmap.GetBlockCoordinates(pos)).Sectors;
+
+			// Check in which sector we are
+			sector = null;
+			foreach(Sector s in possiblesectors)
+			{
+				if(s.Intersect(pos))
+				{
+					sector = s;
+					break;
+				}
+			}
+		}
+
+		// This translates the flags into UDMF fields
+		internal void TranslateToUDMF()
+		{
+			// First make a single integer with all flags
+			int bits = 0;
+			int flagbit;
+			foreach(KeyValuePair<string, bool> f in flags)
+				if(int.TryParse(f.Key, out flagbit) && f.Value) bits |= flagbit;
+
+			// Now make the new flags
+			flags.Clear();
+			foreach(FlagTranslation f in General.Map.Config.ThingFlagsTranslation)
+			{
+				// Flag found in bits?
+				if((bits & f.Flag) == f.Flag)
+				{
+					// Add fields and remove bits
+					bits &= ~f.Flag;
+					for(int i = 0; i < f.Fields.Count; i++)
+						flags[f.Fields[i]] = f.FieldValues[i];
+				}
+				else
+				{
+					// Add fields with inverted value
+					for(int i = 0; i < f.Fields.Count; i++)
+						flags[f.Fields[i]] = !f.FieldValues[i];
+				}
+			}
+		}
+
+		// This translates UDMF fields back into the normal flags
+		internal void TranslateFromUDMF()
+		{
+			//mxd. Clear UDMF-related properties
+			this.Fields.Clear();
+			scaleX = 1.0f;
+			scaleY = 1.0f;
+			pitch = 0;
+			pitchrad = 0;
+			roll = 0;
+			rollrad = 0;
+			
+			// Make copy of the flags
+			Dictionary<string, bool> oldfields = new Dictionary<string, bool>(flags);
+
+			// Make the flags
+			flags.Clear();
+			foreach(KeyValuePair<string, string> f in General.Map.Config.ThingFlags)
+			{
+				// Flag must be numeric
+				int flagbit;
+				if(int.TryParse(f.Key, out flagbit))
+				{
+					foreach(FlagTranslation ft in General.Map.Config.ThingFlagsTranslation)
+					{
+						if(ft.Flag == flagbit)
+						{
+							// Only set this flag when the fields match
+							bool fieldsmatch = true;
+							for(int i = 0; i < ft.Fields.Count; i++)
+							{
+								if(!oldfields.ContainsKey(ft.Fields[i]) || (oldfields[ft.Fields[i]] != ft.FieldValues[i]))
+								{
+									fieldsmatch = false;
+									break;
+								}
+							}
+
+							// Field match? Then add the flag.
+							if(fieldsmatch)
+							{
+								flags.Add(f.Key, true);
+								break;
+							}
+						}
+					}
+				}
+			}
+		}
+
+		// Selected
+		protected override void DoSelect()
+		{
+			base.DoSelect();
+			selecteditem = map.SelectedThings.AddLast(this);
+		}
+
+		// Deselect
+		protected override void DoUnselect()
+		{
+			base.DoUnselect();
+			if(selecteditem.List != null) selecteditem.List.Remove(selecteditem);
+			selecteditem = null;
+		}
+		
+		#endregion
+		
+		#region ================== Changes
+
+		// This moves the thing
+		// NOTE: This does not update sector! (call DetermineSector)
+		public void Move(Vector3D newpos)
+		{
+			BeforePropsChange();
+			
+			// Change position
+			this.pos = newpos;
+			
+			if(type != General.Map.Config.Start3DModeThingType)
+				General.Map.IsChanged = true;
+		}
+
+		// This moves the thing
+		// NOTE: This does not update sector! (call DetermineSector)
+		public void Move(Vector2D newpos)
+		{
+			BeforePropsChange();
+			
+			// Change position
+			this.pos = new Vector3D(newpos.x, newpos.y, pos.z);
+			
+			if(type != General.Map.Config.Start3DModeThingType)
+				General.Map.IsChanged = true;
+		}
+
+		// This moves the thing
+		// NOTE: This does not update sector! (call DetermineSector)
+		public void Move(float x, float y, float zoffset)
+		{
+			BeforePropsChange();
+			
+			// Change position
+			this.pos = new Vector3D(x, y, zoffset);
+			
+			if(type != General.Map.Config.Start3DModeThingType)
+				General.Map.IsChanged = true;
+		}
+		
+		// This rotates the thing
+		public void Rotate(float newangle)
+		{
+			BeforePropsChange();
+			
+			// Change angle
+			this.anglerad = newangle;
+			this.angledoom = Angle2D.RealToDoom(newangle);
+			
+			if(type != General.Map.Config.Start3DModeThingType)
+				General.Map.IsChanged = true;
+		}
+		
+		// This rotates the thing
+		public void Rotate(int newangle)
+		{
+			BeforePropsChange();
+			
+			// Change angle
+			anglerad = Angle2D.DoomToReal(newangle);
+			angledoom = newangle;
+			
+			if(type != General.Map.Config.Start3DModeThingType)
+				General.Map.IsChanged = true;
+		}
+
+		//mxd
+		public void SetPitch(int newpitch)
+		{
+			BeforePropsChange();
+
+			pitch = General.ClampAngle(newpitch);
+			pitchrad = ((ismodel && General.Map.Data.ModeldefEntries[type].InheritActorPitch) ? Angle2D.DegToRad(pitch) : 0);
+
+			if(type != General.Map.Config.Start3DModeThingType)
+				General.Map.IsChanged = true;
+		}
+
+		//mxd
+		public void SetRoll(int newroll)
+		{
+			BeforePropsChange();
+
+			roll = General.ClampAngle(newroll);
+			rollrad = ( (rollsprite || (ismodel && General.Map.Data.ModeldefEntries[type].InheritActorRoll)) ? Angle2D.DegToRad(roll) : 0);
+
+			if(type != General.Map.Config.Start3DModeThingType)
+				General.Map.IsChanged = true;
+		}
+
+		//mxd
+		public void SetScale(float scalex, float scaley)
+		{
+			BeforePropsChange();
+
+			scaleX = scalex;
+			scaleY = scaley;
+
+			if(type != General.Map.Config.Start3DModeThingType)
+				General.Map.IsChanged = true;
+		}
+		
+		// This updates all properties
+		// NOTE: This does not update sector! (call DetermineSector)
+		public void Update(int type, float x, float y, float zoffset, int angle, int pitch, int roll, float scaleX, float scaleY,
+						   Dictionary<string, bool> flags, int tag, int action, int[] args)
+		{
+			// Apply changes
+			this.type = type;
+			this.anglerad = Angle2D.DoomToReal(angle);
+			this.angledoom = angle;
+			this.pitch = pitch; //mxd
+			this.roll = roll; //mxd
+			this.scaleX = (scaleX == 0 ? 1.0f : scaleX); //mxd
+			this.scaleY = (scaleY == 0 ? 1.0f : scaleY); //mxd
+			this.flags = new Dictionary<string, bool>(flags);
+			this.tag = tag;
+			this.action = action;
+			this.args = new int[NUM_ARGS];
+			args.CopyTo(this.args, 0);
+			this.Move(x, y, zoffset);
+
+			UpdateCache(); //mxd
+		}
+		
+		// This updates the settings from configuration
+		public void UpdateConfiguration()
+		{
+			// Lookup settings
+			ThingTypeInfo ti = General.Map.Data.GetThingInfo(type);
+			
+			// Apply size
+			size = ti.Radius;
+			height = ti.Height; //mxd
+			fixedsize = ti.FixedSize;
+			spritescale = ti.SpriteScale; //mxd
+
+			//mxd. Apply radius and height overrides?
+			for(int i = 0; i < ti.Args.Length; i++)
+			{
+				if(ti.Args[i] == null) continue;
+				if(ti.Args[i].Type == (int)UniversalType.ThingRadius && args[i] > 0)
+					size = args[i];
+				else if(ti.Args[i].Type == (int)UniversalType.ThingHeight && args[i] > 0)
+					height = args[i];
+			}
+			
+			// Color valid?
+			if((ti.Color >= 0) && (ti.Color < ColorCollection.NUM_THING_COLORS))
+			{
+				// Apply color
+				color = General.Colors.Colors[ti.Color + ColorCollection.THING_COLORS_OFFSET];
+			}
+			else
+			{
+				// Unknown thing color
+				color = General.Colors.Colors[ColorCollection.THING_COLORS_OFFSET];
+			}
+			
+			directional = ti.Arrow; //mxd
+			rollsprite = ti.RollSprite; //mxd
+			UpdateCache(); //mxd
+		}
+
+		//mxd. This checks if the thing has model override
+		internal void UpdateCache()
+		{
+			if(General.Map.Data == null)
+			{
+				ismodel = false;
+				return;
+			}
+
+			ismodel = General.Map.Data.ModeldefEntries.ContainsKey(type);
+			if(ismodel && General.Map.Data.ModeldefEntries[type].LoadState == ModelLoadState.None)
+				ismodel = General.Map.Data.ProcessModel(type);
+
+			if(ismodel) 
+			{
+				rollrad = (General.Map.Data.ModeldefEntries[type].InheritActorRoll ? Angle2D.DegToRad(roll) : 0);
+				pitchrad = (General.Map.Data.ModeldefEntries[type].InheritActorPitch ? Angle2D.DegToRad(pitch) : 0);
+			}
+			else if(rollsprite)
+			{
+				rollrad = Angle2D.DegToRad(roll);
+				pitchrad = 0;
+			}
+			else
+			{
+				rollrad = 0;
+				pitchrad = 0;
+			}
+		}
+		
+		#endregion
+
+		#region ================== Methods
+		
+		// This checks and returns a flag without creating it
+		public bool IsFlagSet(string flagname)
+		{
+			if(flags.ContainsKey(flagname))
+				return flags[flagname];
+			else
+				return false;
+		}
+		
+		// This sets a flag
+		public void SetFlag(string flagname, bool value)
+		{
+			if(!flags.ContainsKey(flagname) || (IsFlagSet(flagname) != value))
+			{
+				BeforePropsChange();
+
+				flags[flagname] = value;
+			}
+		}
+		
+		// This returns a copy of the flags dictionary
+		public Dictionary<string, bool> GetFlags()
+		{
+			return new Dictionary<string,bool>(flags);
+		}
+
+		// This clears all flags
+		public void ClearFlags()
+		{
+			BeforePropsChange();
+			
+			flags.Clear();
+		}
+		
+		// This snaps the vertex to the grid
+		public void SnapToGrid()
+		{
+			// Calculate nearest grid coordinates
+			this.Move(General.Map.Grid.SnappedToGrid(pos));
+		}
+
+		// This snaps the vertex to the map format accuracy
+		public void SnapToAccuracy()
+		{
+			SnapToAccuracy(true);
+		}
+
+		// This snaps the vertex to the map format accuracy
+		public void SnapToAccuracy(bool usepreciseposition)
+		{
+			// Round the coordinates
+			Vector3D newpos = new Vector3D((float)Math.Round(pos.x, (usepreciseposition ? General.Map.FormatInterface.VertexDecimals : 0)),
+										   (float)Math.Round(pos.y, (usepreciseposition ? General.Map.FormatInterface.VertexDecimals : 0)),
+										   (float)Math.Round(pos.z, (usepreciseposition ? General.Map.FormatInterface.VertexDecimals : 0)));
+			this.Move(newpos);
+		}
+		
+		// This returns the distance from given coordinates
+		public float DistanceToSq(Vector2D p)
+		{
+			return Vector2D.DistanceSq(p, pos);
+		}
+
+		// This returns the distance from given coordinates
+		public float DistanceTo(Vector2D p)
+		{
+			return Vector2D.Distance(p, pos);
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Map/UniFields.cs b/Source/Core/Map/UniFields.cs
new file mode 100644
index 0000000..636338c
--- /dev/null
+++ b/Source/Core/Map/UniFields.cs
@@ -0,0 +1,267 @@
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Types;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Map
+{
+	/// <summary>
+	/// List of universal fields and their values.
+	/// </summary>
+	public class UniFields : Dictionary<string, UniValue>
+	{
+		#region ================== Variables
+
+		// Owner of this list
+		private MapElement owner;
+
+		#endregion
+
+		#region ================== Properties
+		
+		public MapElement Owner { get { return owner; } internal set { owner = value; } }
+
+		#endregion
+
+		#region ================== Constructors
+
+		// New constructor
+		///<summary></summary>
+		public UniFields() : base(2) { }
+
+		// New constructor
+		///<summary></summary>
+		public UniFields(int capacity) : base(capacity) { }
+
+		// Copy constructor (makes a deep copy)
+		///<summary></summary>
+		public UniFields(UniFields copyfrom) : base(copyfrom.Count)
+		{
+			foreach(KeyValuePair<string, UniValue> v in copyfrom)
+				this.Add(v.Key, new UniValue(v.Value));
+		}
+		
+		// New constructor
+		///<summary></summary>
+		public UniFields(MapElement owner) : base(2)
+		{
+			this.owner = owner;
+		}
+
+		// New constructor
+		///<summary></summary>
+		public UniFields(MapElement owner, int capacity) : base(capacity)
+		{
+			this.owner = owner;
+		}
+
+		// Copy constructor
+		///<summary></summary>
+		public UniFields(MapElement owner, UniFields copyfrom) : base(copyfrom.Count)
+		{
+			this.owner = owner;
+
+			foreach(KeyValuePair<string, UniValue> v in copyfrom) //mxd. No-no-no, David Blaine, I don't want to copy these by reference!
+				this.Add(v.Key, new UniValue(v.Value));
+		}
+
+		#endregion
+
+		#region ================== Mathods
+
+		/// <summary>Call this before making changes to the fields, or they may not be updated correctly with undo/redo!</summary>
+		public void BeforeFieldsChange()
+		{
+			if(owner != null) owner.BeforeFieldsChange();
+		}
+		
+		/// <summary>This returns the value of a field by name, or returns the specified value when no such field exists or the field value fails to convert to the same datatype.</summary>
+		public T GetValue<T>(string fieldname, T defaultvalue)
+		{
+			if(!this.ContainsKey(fieldname)) return defaultvalue;
+
+			try
+			{
+				T val = (T)this[fieldname].Value;
+				return val;
+			}
+			catch(InvalidCastException)
+			{
+				return defaultvalue;
+			}
+		}
+
+		#endregion
+
+		#region ================== mxd. Static methods
+
+		// float
+		public static void SetFloat(UniFields fields, string key, float value) { SetFloat(fields, key, value, 0f); }
+		public static void SetFloat(UniFields fields, string key, float value, float defaultvalue)
+		{
+			if(fields == null) return;
+			if(value != defaultvalue)
+			{
+				if(!fields.ContainsKey(key)) fields.Add(key, new UniValue(UniversalType.Float, value));
+				else fields[key].Value = value;
+			}
+			// Don't save default value
+			else if(fields.ContainsKey(key)) 
+			{
+				fields.Remove(key);
+			}
+		}
+
+		public static float GetFloat(UniFields fields, string key) { return GetFloat(fields, key, 0f); }
+		public static float GetFloat(UniFields fields, string key, float defaultvalue)
+		{
+			if(fields == null) return defaultvalue;
+			return fields.GetValue(key, defaultvalue);
+		}
+
+		// int
+		public static void SetInteger(UniFields fields, string key, int value) { SetInteger(fields, key, value, 0); }
+		public static void SetInteger(UniFields fields, string key, int value, int defaultvalue)
+		{
+			if(fields == null) return;
+			if(value != defaultvalue)
+			{
+				if(!fields.ContainsKey(key)) fields.Add(key, new UniValue(UniversalType.Integer, value));
+				else fields[key].Value = value;
+			}
+			// Don't save default value
+			else if(fields.ContainsKey(key)) 
+			{
+				fields.Remove(key);
+			}
+		}
+
+		public static int GetInteger(UniFields fields, string key) { return GetInteger(fields, key, 0); }
+		public static int GetInteger(UniFields fields, string key, int defaultvalue)
+		{
+			if(fields == null) return defaultvalue;
+			return fields.GetValue(key, defaultvalue);
+		}
+
+		// String
+		public static void SetString(UniFields fields, string key, string value, string defaultvalue)
+		{
+			if(fields == null) return;
+			if(value != defaultvalue)
+			{
+				if(!fields.ContainsKey(key)) fields.Add(key, new UniValue(UniversalType.String, value));
+				else fields[key].Value = value;
+			}
+			// Don't save default value
+			else if(fields.ContainsKey(key)) 
+			{
+				fields.Remove(key);
+			}
+		}
+
+		/// <summary>This removes fields with given names.</summary>
+		public static void RemoveFields(UniFields fields, IEnumerable<string> keys)
+		{
+			if(fields == null) return;
+			foreach(string key in keys) 
+				if(fields.ContainsKey(key)) fields.Remove(key);
+		}
+
+		/// <summary>This removes a field with given name.</summary>
+		public static void RemoveField(UniFields fields, string key)
+		{
+			if(fields == null || !fields.ContainsKey(key)) return;
+			fields.Remove(key);
+		}
+
+		/// <summary>This compares all fields.</summary>
+		public static bool AllFieldsMatch(UniFields fields1, UniFields fields2)
+		{
+			if(fields1.Keys.Count != fields2.Keys.Count) return false;
+			foreach(KeyValuePair<string, UniValue> group in fields1)
+			{
+				if(!fields2.ContainsKey(group.Key) || !UniValuesMatch(fields1[group.Key], fields2[group.Key]))
+					return false;
+			}
+			return true;
+		}
+
+		/// <summary>This compares non-UI fields (e.g. fields, visible in the "Custom" tab).</summary>
+		public static bool CustomFieldsMatch(UniFields fields1, UniFields fields2)
+		{
+			if(fields1.owner == null || fields2.owner == null) throw new NotSupportedException("Cannot compare custom fields without owners!");
+			if(fields1.owner.ElementType != fields2.owner.ElementType) return false;
+			return CustomFieldsMatch(fields1, fields2, fields1.owner.ElementType);
+		}
+
+		private static bool CustomFieldsMatch(UniFields fields1, UniFields fields2, MapElementType type)
+		{
+			// Collect non-UI fields
+			UniFields filtered1 = new UniFields();
+			UniFields filtered2 = new UniFields();
+
+			foreach(string key in fields1.Keys)
+			{
+				if(!General.Map.FormatInterface.UIFields[type].ContainsKey(key))
+					filtered1.Add(key, fields1[key]);
+			}
+
+			foreach(string key in fields2.Keys)
+			{
+				if(!General.Map.FormatInterface.UIFields[type].ContainsKey(key))
+					filtered2.Add(key, fields2[key]);
+			}
+
+			if(filtered1.Keys.Count != filtered2.Keys.Count) return false;
+			return AllFieldsMatch(filtered1, filtered2);
+		}
+
+		/// <summary>This compares types and values of given UniValues.</summary>
+		public static bool UniValuesMatch(UniValue val1, UniValue val2)
+		{
+			if(val1.Type != val2.Type) return false;
+			if(val1.Value is int) return (int)val1.Value != (int)val2.Value;
+			if(val1.Value is float) return (float)val1.Value != (float)val2.Value;
+			if(val1.Value is bool) return (bool)val1.Value != (bool)val2.Value;
+			if(val1.Value is string) return (string)val1.Value != (string)val2.Value;
+			throw new Exception("Got unknown Custom Field type to compare: " + val1.Value.GetType());
+		}
+
+		/// <summary>This compares types and values of given UniFields by key.</summary>
+		public static bool ValuesMatch(string key, UniFields fields1, UniFields fields2)
+		{
+			bool f1 = fields1.ContainsKey(key);
+			bool f2 = fields2.ContainsKey(key);
+			if(!f1 && !f2) return true;
+			if(f1 != f2) return false;
+			return UniValuesMatch(fields1[key], fields2[key]);
+		}
+
+		/// <summary>This compares types and values of given UniFields by 2 keys. Returns true when both values match.</summary>
+		public static bool ValuesMatch(string key1, string key2, UniFields fields1, UniFields fields2)
+		{
+			return ValuesMatch(key1, fields1, fields2) && ValuesMatch(key2, fields1, fields2);
+		}
+
+		/// <summary>This compares UniFields types and values of given MapElements by key.</summary>
+		public static bool ValuesMatch(string key, MapElement e1, MapElement e2)
+		{
+			if(e1.ElementType != e2.ElementType || (e1.Fields == null && e2.Fields != null) || e2.Fields == null) return false;
+			if(e1.Fields == null && e2.Fields == null) return true;
+			return ValuesMatch(key, e1.Fields, e2.Fields);
+		}
+
+		/// <summary>This compares UniFields types and values of given MapElements by 2 keys. Returns true when both values match.</summary>
+		public static bool ValuesMatch(string key1, string key2, MapElement e1, MapElement e2)
+		{
+			if(e1.ElementType != e2.ElementType || (e1.Fields == null && e2.Fields != null) || e2.Fields == null) return false;
+			if(e1.Fields == null && e2.Fields == null) return true;
+			return ValuesMatch(key1, key2, e1.Fields, e2.Fields);
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Map/UniValue.cs b/Source/Core/Map/UniValue.cs
new file mode 100644
index 0000000..885f4a6
--- /dev/null
+++ b/Source/Core/Map/UniValue.cs
@@ -0,0 +1,194 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using CodeImp.DoomBuilder.Types;
+using CodeImp.DoomBuilder.IO;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Map
+{
+	public class UniValue
+	{
+		#region ================== Constants
+
+		private const string NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789_";
+		private const string START_CHARS = "abcdefghijklmnopqrstuvwxyz_";
+		
+		#endregion
+
+		#region ================== Variables
+		
+		private object value;
+		private int type;
+
+		#endregion
+
+		#region ================== Properties
+
+		public object Value
+		{
+			get
+			{
+				return this.value;
+			}
+			
+			set
+			{
+				// Value may only be a primitive type
+				if((!(value is int) && !(value is float) && !(value is string) && !(value is bool)) || (value == null))
+					throw new ArgumentException("Universal field values can only be of type int, float, string or bool.");
+				
+				this.value = value;
+			}
+		}
+		
+		public int Type { get { return this.type; } set { this.type = value; } }
+
+		#endregion
+
+		#region ================== Constructor
+
+		// Constructor
+		public UniValue(int type, object value)
+		{
+			this.type = type;
+			this.value = value;
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Constructor
+		public UniValue(UniversalType type, object value)
+		{
+			this.type = (int)type;
+			this.value = value;
+
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Constructor
+		public UniValue(UniValue v)
+		{
+			this.type = v.type;
+			this.value = v.value;
+
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Constructor
+		public UniValue()
+		{
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+		
+		#endregion
+
+		#region ================== Methods
+
+		// Serialize / deserialize
+		internal void ReadWrite(IReadWriteStream s)
+		{
+			s.rwInt(ref type);
+			switch((UniversalType)type)
+			{
+				case UniversalType.AngleRadians:
+				case UniversalType.AngleDegreesFloat:
+				case UniversalType.Float:
+				{
+					float v = 0.0f;
+					//mxd. Seems to work faster this way
+					//try { v = (float)value; } catch(NullReferenceException e) { }
+					if(value != null) v = (float)value;
+					s.rwFloat(ref v);
+					value = v;
+					break;
+				}
+				
+				case UniversalType.AngleDegrees:
+				case UniversalType.Color:
+				case UniversalType.EnumBits:
+				case UniversalType.EnumOption:
+				case UniversalType.Integer:
+				case UniversalType.LinedefTag:
+				case UniversalType.LinedefType:
+				case UniversalType.SectorEffect:
+				case UniversalType.SectorTag:
+				case UniversalType.ThingTag:
+				case UniversalType.ThingType:
+				{
+					int v = 0;
+					//mxd. Seems to work faster this way
+					//try { v = (int)value; } catch(NullReferenceException e) { }
+					if(value != null) v = (int)value;
+					s.rwInt(ref v);
+					value = v;
+					break;
+				}
+
+				case UniversalType.Boolean:
+				{
+					bool v = false;
+					//mxd. Seems to work faster this way
+					//try { v = (bool)value; } catch(NullReferenceException e) { }
+					if(value != null) v = (bool)value;
+					s.rwBool(ref v);
+					value = v;
+					break;
+				}
+				
+				case UniversalType.Flat:
+				case UniversalType.String:
+				case UniversalType.Texture:
+				case UniversalType.EnumStrings:
+				case UniversalType.ThingClass:
+				{
+					string v = (string)value;
+					s.rwString(ref v);
+					value = v;
+					break;
+				}
+				
+				default:
+					General.Fail("Unknown field type to read/write!");
+					break;
+			}
+		}
+		
+		// This validates a UDMF field name and returns the valid part
+		public static string ValidateName(string name)
+		{
+			// Keep only valid characters
+			string fieldname = name.Trim().ToLowerInvariant();
+			string validname = "";
+			for(int c = 0; c < fieldname.Length; c++)
+			{
+				string valid_chars = (validname.Length > 0) ? NAME_CHARS : START_CHARS;
+				if(valid_chars.IndexOf(fieldname[c]) > -1) validname += fieldname[c];
+			}
+			return validname;
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Map/Vertex.cs b/Source/Core/Map/Vertex.cs
new file mode 100644
index 0000000..0bb6df1
--- /dev/null
+++ b/Source/Core/Map/Vertex.cs
@@ -0,0 +1,337 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.IO;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Map
+{
+	public sealed class Vertex : SelectableElement
+	{
+		#region ================== Constants
+		
+		public const int BUFFERVERTICES = 1;
+		public const int RENDERPRIMITIVES = 1;
+		
+		#endregion
+
+		#region ================== Variables
+
+		// Map
+		private MapSet map;
+		
+		// List items
+		private LinkedListNode<Vertex> selecteditem;
+
+		// Position
+		private Vector2D pos;
+
+		//mxd. Height
+		private float zfloor;
+		private float zceiling;
+
+		// References
+		private LinkedList<Linedef> linedefs;
+		
+		// Cloning
+		private Vertex clone;
+		private int serializedindex;
+		
+		#endregion
+
+		#region ================== Properties
+
+		public MapSet Map { get { return map; } }
+		public ICollection<Linedef> Linedefs { get { return linedefs; } }
+		public Vector2D Position { get { return pos; } }
+		internal Vertex Clone { get { return clone; } set { clone = value; } }
+		internal int SerializedIndex { get { return serializedindex; } set { serializedindex = value; } }
+		public float ZCeiling {	//mxd
+			get { return zceiling; }
+			set {
+				if(zceiling != value) 
+				{
+					BeforeFieldsChange();
+					zceiling = value;
+				}
+			}
+		}
+		public float ZFloor { //mxd
+			get { return zfloor; }
+			set {
+				if(zfloor != value) 
+				{
+					BeforeFieldsChange();
+					zfloor = value;
+				}
+			}
+		}
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		internal Vertex(MapSet map, int listindex, Vector2D pos)
+		{
+			// Initialize
+			this.elementtype = MapElementType.VERTEX; //mxd
+			this.map = map;
+			this.linedefs = new LinkedList<Linedef>();
+			this.listindex = listindex;
+			this.pos = pos;
+			this.zceiling = float.NaN; //mxd
+			this.zfloor = float.NaN; //mxd
+			
+			if(map == General.Map.Map)
+				General.Map.UndoRedo.RecAddVertex(this);
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Disposer
+		public override void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Already set isdisposed so that changes can be prohibited
+				isdisposed = true;
+
+				if(map.AutoRemove)
+				{
+					// Dispose the lines that are attached to this vertex
+					// because a linedef cannot exist without 2 vertices.
+					foreach(Linedef ld in linedefs) ld.Dispose();
+				}
+				else
+				{
+					// Detach from linedefs
+					foreach(Linedef ld in linedefs) ld.DetachVertexP(this);
+				}
+				
+				if(map == General.Map.Map)
+					General.Map.UndoRedo.RecRemVertex(this);
+				
+				// Remove from main list
+				map.RemoveVertex(listindex);
+
+				// Clean up
+				linedefs = null;
+				map = null;
+
+				//mxd. Restore isdisposed so base classes can do their disposal job
+				isdisposed = false;
+
+				// Dispose base
+				base.Dispose();
+			}
+		}
+
+		#endregion
+
+		#region ================== Management
+
+		// Call this before changing properties
+		protected override void BeforePropsChange()
+		{
+			if(map == General.Map.Map)
+				General.Map.UndoRedo.RecPrpVertex(this);
+		}
+
+		// This attaches a linedef and returns the listitem
+		internal LinkedListNode<Linedef> AttachLinedefP(Linedef l)
+		{
+			return linedefs.AddLast(l);
+		}
+
+		// This detaches a linedef
+		internal void DetachLinedefP(LinkedListNode<Linedef> l)
+		{
+			// Not disposing?
+			if(!isdisposed)
+			{
+				// Remove linedef
+				linedefs.Remove(l);
+
+				// No more linedefs left?
+				if((linedefs.Count == 0) && map.AutoRemove)
+				{
+					// This vertex is now useless, dispose it
+					this.Dispose();
+				}
+			}
+		}
+
+		// Serialize / deserialize
+		new internal void ReadWrite(IReadWriteStream s)
+		{
+			if(!s.IsWriting) BeforePropsChange();
+			
+			base.ReadWrite(s);
+			
+			s.rwVector2D(ref pos);
+			s.rwFloat(ref zceiling); //mxd
+			s.rwFloat(ref zfloor); //mxd
+			
+			if(s.IsWriting)
+			{
+				// Let all lines know they need an update
+				foreach(Linedef l in linedefs) l.NeedUpdate();
+			}
+		}
+
+		// Selected
+		protected override void DoSelect()
+		{
+			base.DoSelect();
+			selecteditem = map.SelectedVertices.AddLast(this);
+		}
+
+		// Deselect
+		protected override void DoUnselect()
+		{
+			base.DoUnselect();
+			if(selecteditem.List != null) selecteditem.List.Remove(selecteditem);
+			selecteditem = null;
+		}
+
+		#endregion
+		
+		#region ================== Methods
+
+		// This copies all properties to another thing
+		public void CopyPropertiesTo(Vertex v)
+		{
+			v.BeforePropsChange();
+			
+			// Copy properties
+			v.pos = pos;
+			v.zceiling = zceiling; //mxd
+			v.zfloor = zfloor; //mxd
+			base.CopyPropertiesTo(v);
+		}
+		
+		// This returns the distance from given coordinates
+		public float DistanceToSq(Vector2D p)
+		{
+			return (p.x - pos.x) * (p.x - pos.x) + (p.y - pos.y) * (p.y - pos.y);
+		}
+		
+		// This returns the distance from given coordinates
+		public float DistanceTo(Vector2D p)
+		{
+			return Vector2D.Distance(p, pos);
+		}
+
+		// This finds the line closest to the specified position
+		public Linedef NearestLinedef(Vector2D pos) { return MapSet.NearestLinedef(linedefs, pos); }
+
+		// This moves the vertex
+		public void Move(Vector2D newpos)
+		{
+			// Do we actually move?
+			if(newpos != pos)
+			{
+				BeforePropsChange();
+				
+				// Change position
+				pos = newpos;
+
+				#if DEBUG
+				if(float.IsNaN(pos.x) || float.IsNaN(pos.y) ||
+				   float.IsInfinity(pos.x) || float.IsInfinity(pos.y))
+				{
+					General.Fail("Invalid vertex position! The given vertex coordinates cannot be NaN or Infinite.");
+				}
+				#endif
+
+				// Let all lines know they need an update
+				foreach(Linedef l in linedefs) l.NeedUpdate();
+				General.Map.IsChanged = true;
+			}
+		}
+
+		// This snaps the vertex to the map format accuracy
+		public void SnapToAccuracy()
+		{
+			SnapToAccuracy(true);
+		}
+
+		// This snaps the vertex to the map format accuracy
+		public void SnapToAccuracy(bool usepreciseposition)
+		{
+			// Round the coordinates
+			Vector2D newpos = new Vector2D((float)Math.Round(pos.x, (usepreciseposition ? General.Map.FormatInterface.VertexDecimals : 0)),
+										   (float)Math.Round(pos.y, (usepreciseposition ? General.Map.FormatInterface.VertexDecimals : 0)));
+			this.Move(newpos);
+		}
+
+		// This snaps the vertex to the grid
+		public void SnapToGrid()
+		{
+			// Calculate nearest grid coordinates
+			this.Move(General.Map.Grid.SnappedToGrid(pos));
+		}
+		
+		// This joins another vertex
+		// Which means this vertex is removed and the other is kept!
+		public void Join(Vertex other)
+		{
+			// If either of the two vertices was selected, keep the other selected
+			if(this.Selected) other.Selected = true;
+			if(this.marked) other.marked = true;
+
+			// Any linedefs to move?
+			if(linedefs.Count > 0)
+			{
+				// Detach all linedefs and attach them to the other
+				// This will automatically dispose this vertex
+				while(linedefs != null)
+				{
+					// Move the line to the other vertex
+					if(linedefs.First.Value.Start == this)
+						linedefs.First.Value.SetStartVertex(other);
+					else
+						linedefs.First.Value.SetEndVertex(other);
+				}
+			}
+			else
+			{
+				// No lines attached
+				// Dispose manually
+				this.Dispose();
+			}
+
+			General.Map.IsChanged = true;
+		}
+
+		// String representation
+		public override string ToString()
+		{
+			return "Vertex (" + pos + ")";
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Plugins/Plug.cs b/Source/Core/Plugins/Plug.cs
new file mode 100644
index 0000000..2a4d48a
--- /dev/null
+++ b/Source/Core/Plugins/Plug.cs
@@ -0,0 +1,333 @@
+#region ================== Namespaces
+
+using System;
+using System.Drawing;
+using System.IO;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Editing;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Windows;
+using CodeImp.DoomBuilder.Config;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Plugins
+{
+	/// <summary>
+	/// This is the key link between the Doom Builder core and the plugin.
+	/// Every plugin must expose a single class that inherits this class.
+	/// </summary>
+	public class Plug : IDisposable
+	{
+		#region ================== Constants
+
+		#endregion
+		
+		#region ================== Variables
+
+		// Internals
+		private Plugin plugin;
+		
+		// Disposing
+		private bool isdisposed;
+
+		#endregion
+		
+		#region ================== Properties
+		
+		// Internals
+		internal Plugin Plugin { get { return plugin; } set { plugin = value; } }
+		
+		/// <summary>
+		/// Indicates if the plugin has been disposed.
+		/// </summary>
+		public bool IsDisposed { get { return isdisposed; } }
+		
+		/// <summary>
+		/// Override this to return a more descriptive name for your plugin.
+		/// Default is the library filename without extension.
+		/// </summary>
+		public virtual string Name { get { return plugin.Name; } }
+
+		/// <summary>
+		/// Override this to return the minimum revision of the Doom Builder 2 core that is
+		/// required to use this plugin. You can find the revision number in the About dialog,
+		/// it is the right most part of the version number.
+		/// </summary>
+		public virtual int MinimumRevision { get { return 0; } }
+		
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		/// <summary>
+		/// This is the key link between the Doom Builder core and the plugin.
+		/// Every plugin must expose a single class that inherits this class.
+		/// <para>
+		/// NOTE: Some methods cannot be used in this constructor, because the plugin
+		/// is not yet fully initialized. Instead, use the Initialize method to do
+		/// your initializations.
+		/// </para>
+		/// </summary>
+		public Plug()
+		{
+			// Initialize
+
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		/// <summary>
+		/// This is called by the Doom Builder core when the plugin is being disposed.
+		/// </summary>
+		public virtual void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Clean up
+				plugin = null;
+				
+				// Done
+				isdisposed = true;
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		/// <summary>
+		/// This finds the embedded resource with the specified name in the plugin and creates
+		/// a Stream from it. Returns null when the embedded resource cannot be found.
+		/// </summary>
+		/// <param name="resourcename">Name of the resource in the plugin.</param>
+		/// <returns>Returns a Stream of the embedded resource,
+		/// or null when the resource cannot be found.</returns>
+		public Stream GetResourceStream(string resourcename)
+		{
+			return plugin.GetResourceStream(resourcename);
+		}
+
+		#endregion
+
+		#region ================== Events
+
+		/// <summary>
+		/// This iscalled when the ceiling surface buffer is updated for a sector. The plugin can
+		/// modify the vertices to change how the surface is presented to the user.
+		/// </summary>
+		public virtual void OnSectorCeilingSurfaceUpdate(Sector s, ref FlatVertex[] vertices) { }
+
+		/// <summary>
+		/// This iscalled when the floor surface buffer is updated for a sector. The plugin can
+		/// modify the vertices to change how the surface is presented to the user.
+		/// </summary>
+		public virtual void OnSectorFloorSurfaceUpdate(Sector s, ref FlatVertex[] vertices) { }
+
+		/// <summary>
+		/// Occurs before a map is opened.
+		/// </summary>
+		public virtual void OnMapOpenBegin() { }
+
+		/// <summary>
+		/// Occurs after a map is opened.
+		/// </summary>
+		public virtual void OnMapOpenEnd() { }
+
+		/// <summary>
+		/// Occurs before a new map is created.
+		/// </summary>
+		public virtual void OnMapNewBegin() { }
+
+		/// <summary>
+		/// Occurs after a new map is created.
+		/// </summary>
+		public virtual void OnMapNewEnd() { }
+
+		/// <summary>
+		/// Occurs before the map is closed.
+		/// </summary>
+		public virtual void OnMapCloseBegin() { }
+
+		/// <summary>
+		/// Occurs after a the map is closed.
+		/// </summary>
+		public virtual void OnMapCloseEnd() { }
+
+		/// <summary>
+		/// Occurs before a map is saved.
+		/// </summary>
+		public virtual void OnMapSaveBegin(SavePurpose purpose) { }
+
+		/// <summary>
+		/// Occurs after a map is saved.
+		/// </summary>
+		public virtual void OnMapSaveEnd(SavePurpose purpose) { }
+
+		/// <summary>
+		/// Occurs before the MapSet is changed. This means that the active MapSet will be disposed and changed to a new one.
+		/// </summary>
+		public virtual void OnMapSetChangeBegin() { }
+
+		/// <summary>
+		/// Occurs after the MapSet is changed.
+		/// </summary>
+		public virtual void OnMapSetChangeEnd() { }
+
+		/// <summary>
+		/// This is called after the constructor to allow a plugin to initialize.
+		/// </summary>
+		public virtual void OnInitialize() { }
+
+		/// <summary>
+		/// This is called when the user chose to reload the resources.
+		/// </summary>
+		public virtual void OnReloadResources() { }
+
+		/// <summary>
+		/// This is called by the Doom Builder core when the editing mode changes.
+		/// Return false to abort the mode change.
+		/// </summary>
+		/// <param name="oldmode">The previous editing mode</param>
+		/// <param name="newmode">The new editing mode</param>
+		public virtual bool OnModeChange(EditMode oldmode, EditMode newmode) { return true; }
+
+		/// <summary>
+		/// Called by the Doom Builder core when the user changes the program configuration (F5).
+		/// </summary>
+		public virtual void OnProgramReconfigure() { }
+
+		/// <summary>
+		/// Called by the Doom Builder core when the user changes the map settings (F2).
+		/// </summary>
+		public virtual void OnMapReconfigure() { }
+
+		/// <summary>
+		/// Called by the Doom Builder core when the user wants to copy selected geometry.
+		/// Return false to abort the copy operation.
+		/// The result parameter is false when the operation was already aborted by another plugin.
+		/// </summary>
+		public virtual bool OnCopyBegin(bool result) { return true; }
+
+		/// <summary>
+		/// Called by the Doom Builder core when the user has copied geometry.
+		/// </summary>
+		public virtual void OnCopyEnd() { }
+
+		/// <summary>
+		/// Called by the Doom Builder core when the user wants to paste geometry into the map.
+		/// Return false to abort the paste operation.
+		/// The result parameter is false when the operation was already aborted by another plugin.
+		/// </summary>
+		public virtual bool OnPasteBegin(PasteOptions options, bool result) { return true; }
+
+		/// <summary>
+		/// Called by the Doom Builder core when the user pastes geometry into the map. The new geometry is created and marked before this method is called.
+		/// </summary>
+		public virtual void OnPasteEnd(PasteOptions options) { }
+
+		/// <summary>
+		/// Called by the Doom Builder core when the user wants to undo the previous action.
+		/// Return false to abort the operation.
+		/// The result parameter is false when the operation was already aborted by another plugin.
+		/// </summary>
+		public virtual bool OnUndoBegin(bool result) { return true; }
+
+		/// <summary>
+		/// Called by the Doom Builder core when the user has undone the previous action.
+		/// </summary>
+		public virtual void OnUndoEnd() { }
+
+		/// <summary>
+		/// Called by the Doom Builder core when the user wants to redo the previously undone action.
+		/// Return false to abort the operation.
+		/// The result parameter is false when the operation was already aborted by another plugin.
+		/// </summary>
+		public virtual bool OnRedoBegin(bool result) { return true; }
+
+		/// <summary>
+		/// Called by the Doom Builder core when the user has redone the action.
+		/// </summary>
+		public virtual void OnRedoEnd() { }
+
+		/// <summary>
+		/// Called by the Doom Builder core when a new undo level has been created.
+		/// </summary>
+		public virtual void OnUndoCreated() { }
+
+		/// <summary>
+		/// Called by the Doom Builder core when an undo level has been withdrawn.
+		/// </summary>
+		public virtual void OnUndoWithdrawn() { }
+
+		/// <summary>
+		/// Called when the user opens the Preferences dialog.
+		/// </summary>
+		public virtual void OnShowPreferences(PreferencesController controller) { }
+
+		/// <summary>
+		/// Called when the user closes the Preferences dialog by either accepting the changes or cancelling.
+		/// </summary>
+		public virtual void OnClosePreferences(PreferencesController controller) { }
+
+		/// <summary>
+		/// Called when an Action begins.
+		/// </summary>
+		public virtual void OnActionBegin(Actions.Action action) { }
+
+		/// <summary>
+		/// Called when an Action ends.
+		/// </summary>
+		public virtual void OnActionEnd(Actions.Action action) { }
+
+		/// <summary>
+		/// Called when an Editing Mode engages
+		/// </summary>
+		public virtual void OnEditEngage(EditMode oldmode, EditMode newmode) { }
+
+		/// <summary>
+		/// Called when an Editing Mode disengages
+		/// </summary>
+		public virtual void OnEditDisengage(EditMode oldmode, EditMode newmode) { }
+
+		/// <summary>
+		/// Called when an Editing Mode is cancelled
+		/// </summary>
+		public virtual void OnEditCancel() { }
+
+		/// <summary>
+		/// Called when an Editing Mode is accepted
+		/// </summary>
+		public virtual void OnEditAccept() { }
+
+		// Interface events
+		public virtual void OnEditMouseClick(MouseEventArgs e) { }
+		public virtual void OnEditMouseDoubleClick(MouseEventArgs e) { }
+		public virtual void OnEditMouseDown(MouseEventArgs e) { }
+		public virtual void OnEditMouseEnter(EventArgs e) { }
+		public virtual void OnEditMouseLeave(EventArgs e) { }
+		public virtual void OnEditMouseMove(MouseEventArgs e) { }
+		public virtual void OnEditMouseUp(MouseEventArgs e) { }
+		public virtual void OnEditKeyDown(KeyEventArgs e) { }
+		public virtual void OnEditKeyUp(KeyEventArgs e) { }
+		public virtual void OnEditMouseInput(Vector2D delta) { }
+
+		// Rendering events
+		public virtual void OnEditRedrawDisplayBegin() { }
+		public virtual void OnEditRedrawDisplayEnd() { }
+		public virtual void OnPresentDisplayBegin() { }
+
+		//mxd. Highlight events
+		public virtual void OnHighlightSector(Sector s) { }
+		public virtual void OnHighlightLinedef(Linedef l) { }
+		public virtual void OnHighlightThing(Thing t) { }
+		public virtual void OnHighlightVertex(Vertex v) { }
+		public virtual void OnHighlightRefreshed(object o) { }
+		public virtual void OnHighlightLost() { }
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Plugins/Plugin.cs b/Source/Core/Plugins/Plugin.cs
new file mode 100644
index 0000000..051ec82
--- /dev/null
+++ b/Source/Core/Plugins/Plugin.cs
@@ -0,0 +1,219 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Reflection;
+using System.Windows.Forms;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Plugins
+{
+	internal class Plugin : IDisposable
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		// The plugin assembly
+		private Assembly asm;
+		
+		// The plug
+		private Plug plug;
+		
+		// Unique name used to refer to this assembly
+		private readonly string name;
+		
+		// Disposing
+		private bool isdisposed;
+
+		#endregion
+
+		#region ================== Properties
+
+		public Assembly Assembly { get { return asm; } }
+		public Plug Plug { get { return plug; } }
+		public string Name { get { return name; } }
+		public bool IsDisposed { get { return isdisposed; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public Plugin(string filename)
+		{
+			// Initialize
+			string shortfilename = Path.GetFileName(filename);
+			name = Path.GetFileNameWithoutExtension(filename);
+			General.WriteLogLine("Loading plugin '" + name + "' from '" + shortfilename + "'...");
+
+			try
+			{
+				// Load assembly
+				//asm = Assembly.LoadFile(filename); //mxd
+				asm = Assembly.LoadFrom(filename);
+			}
+			catch(Exception)
+			{
+				General.ErrorLogger.Add(ErrorType.Error, "Could not load plugin \"" + shortfilename + "\", the DLL file could not be read. This file is not supposed to be in the Plugins subdirectory.");
+				throw new InvalidProgramException();
+			}
+			
+			// Find the class that inherits from Plugin
+			Type t = FindSingleClass(typeof(Plug));
+			if(t != null)
+			{
+				// Are the multiple plug classes?
+				if(FindClasses(typeof(Plug)).Length > 1)
+				{
+					// Show a warning
+					General.ErrorLogger.Add(ErrorType.Warning, "Plugin \"" + shortfilename + "\" has more than one Plug class. The following class is used to create in instance: " + t.FullName);
+				}
+				
+				// Make plug instance
+				plug = CreateObject<Plug>(t);
+				plug.Plugin = this;
+
+				// Verify minimum revision number
+				int thisrevision = General.ThisAssembly.GetName().Version.Revision;
+				if((thisrevision != 0) && (plug.MinimumRevision > thisrevision))
+				{
+					// Can't load this plugin because it is meant for a newer version
+					General.ErrorLogger.Add(ErrorType.Error, "Could not load plugin \"" + shortfilename + "\", the Plugin is made for GZDoom Builder R" + plug.MinimumRevision + " or newer and you are running R" + thisrevision + ".");
+					throw new InvalidProgramException();
+				}
+			}
+			else
+			{
+				// How can we plug something in without a plug?
+				General.ErrorLogger.Add(ErrorType.Error, "Could not load plugin \"" + shortfilename + "\", plugin is missing the Plug class. This file is not supposed to be in the Plugins subdirectory.");
+				throw new InvalidProgramException();
+			}
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Disposer
+		public void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Clean up
+				plug.Dispose(); //mxd
+				plug = null; //mxd
+				asm = null;
+				
+				// Done
+				isdisposed = true;
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+		
+		// This creates a stream to read a resource or returns null when not found
+		public Stream GetResourceStream(string resourcename)
+		{
+			// Find a resource
+			resourcename = "." + resourcename; //mxd. Otherwise, we can get Properties.Resources.SuperCoolMode.png while searching for CoolMode.png
+			string[] resnames = asm.GetManifestResourceNames();
+			foreach(string rn in resnames)
+			{
+				// Found it?
+				if(rn.EndsWith(resourcename, StringComparison.InvariantCultureIgnoreCase))
+				{
+					// Get a stream from the resource
+					return asm.GetManifestResourceStream(rn);
+				}
+			}
+
+			// Nothing found
+			return null;
+		}
+		
+		// This finds all class types that inherits from the given type
+		public Type[] FindClasses(Type t)
+		{
+			List<Type> found = new List<Type>();
+
+			// Get all exported types
+			Type[] types = asm.GetExportedTypes();
+			foreach(Type it in types)
+			{
+				// Compare types
+				if(t.IsAssignableFrom(it)) found.Add(it);
+			}
+
+			// Return list
+			return found.ToArray();
+		}
+
+		// This finds a single class type that inherits from the given type
+		// Returns null when no valid type was found
+		public Type FindSingleClass(Type t)
+		{
+			Type[] types = FindClasses(t);
+			return (types.Length > 0 ? types[0] : null);
+		}
+		
+		// This creates an instance of a class
+		public T CreateObject<T>(Type t, params object[] args)
+		{
+			return CreateObjectA<T>(t, args);
+		}
+
+		// This creates an instance of a class
+		public T CreateObjectA<T>(Type t, object[] args)
+		{
+			try
+			{
+				// Create instance
+				return (T)asm.CreateInstance(t.FullName, false, BindingFlags.Default, null, args, CultureInfo.CurrentCulture, new object[0]);
+			}
+			catch(TargetInvocationException e)
+			{
+				// Error!
+				string error = "Failed to create class instance '" + t.Name + "' from plugin '" + name + "'.";
+				General.ShowErrorMessage(error + Environment.NewLine + Environment.NewLine + "See the error log for more details", MessageBoxButtons.OK, false);
+				General.WriteLogLine(error + " " + e.InnerException.GetType().Name + " at target: " 
+					+ e.InnerException.Message + Environment.NewLine + "Stacktrace: " + e.InnerException.StackTrace.Trim());
+				return default(T);
+			}
+			catch(Exception e)
+			{
+				// Error!
+				string error = "Failed to create class instance '" + t.Name + "' from plugin '" + name + "'.";
+				General.ShowErrorMessage(error + Environment.NewLine + Environment.NewLine + "See the error log for more details", MessageBoxButtons.OK, false);
+				General.WriteLogLine(error + " " + e.GetType().Name + ": " + e.Message + Environment.NewLine
+					+ "Stacktrace: " + e.StackTrace.Trim());
+				return default(T);
+			}
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Plugins/PluginManager.cs b/Source/Core/Plugins/PluginManager.cs
new file mode 100644
index 0000000..a007330
--- /dev/null
+++ b/Source/Core/Plugins/PluginManager.cs
@@ -0,0 +1,315 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Editing;
+using System.Reflection;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Windows;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.IO;
+using System.Collections.Specialized;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Plugins
+{
+	internal class PluginManager
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		// Plugins
+		private List<Plugin> plugins;
+		
+		// Disposing
+		private bool isdisposed;
+
+		#endregion
+
+		#region ================== Properties
+		
+		internal List<Plugin> Plugins { get { return plugins; } }
+		public bool IsDisposed { get { return isdisposed; } }
+		
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public PluginManager()
+		{
+			// Make lists
+			this.plugins = new List<Plugin>();
+
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Disposer
+		public void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Clean up
+				foreach(Plugin p in plugins) p.Dispose();
+				
+				// Done
+				isdisposed = true;
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+		
+		// This creates a list of assemblies
+		public List<Assembly> GetPluginAssemblies()
+		{
+			List<Assembly> asms = new List<Assembly>(plugins.Count);
+			foreach(Plugin p in plugins)
+				asms.Add(p.Assembly);
+			return asms;
+		}
+		
+		
+		// This loads all plugins
+		public void LoadAllPlugins()
+		{
+			IDictionary loadorderfiles = new ListDictionary();
+			
+			try
+			{
+				// Load the load order cfg
+				Configuration cfg = new Configuration(Path.Combine(General.PluginsPath, "Loadorder.cfg"), true);
+
+				// Check for erors
+				if(cfg.ErrorResult)
+				{
+					// Error in configuration
+					General.ErrorLogger.Add(ErrorType.Error, "Unable to read the load order configuration file \"Loadorder.cfg\". " +
+											"Error in file \"" + cfg.ErrorFile + "\" near line " + cfg.ErrorLine + ": " + cfg.ErrorDescription);
+				}
+				else
+				{
+					loadorderfiles = cfg.ReadSetting("loadorder", new ListDictionary());
+				}
+			}
+			catch(Exception e)
+			{
+				// Unable to load configuration
+				General.ErrorLogger.Add(ErrorType.Error, "Unable to read the load order configuration file \"Loadorder.cfg\". " + e.GetType().Name + ": " + e.Message);
+				General.WriteLogLine(e.StackTrace);
+			}
+			
+			// Find all .dll files
+			List<string> filenames = new List<string>(Directory.GetFiles(General.PluginsPath, "*.dll", SearchOption.TopDirectoryOnly));
+			
+			// Load the ones in order as specified by the load order cfg
+			foreach(DictionaryEntry de in loadorderfiles)
+			{
+				string loadfilename = de.Key.ToString();
+				
+				// Find the file in the list
+				int filenameindex = -1;
+				for(int i = 0; i < filenames.Count; i++)
+					if(string.Compare(Path.GetFileName(filenames[i]), loadfilename, true) == 0)
+						filenameindex = i;
+				
+				if(filenameindex > -1)
+				{
+					// Load plugin from this file
+					Plugin p;
+					try
+					{
+						p = new Plugin(filenames[filenameindex]);
+					}
+					catch(InvalidProgramException)
+					{
+						p = null;
+					}
+					
+					// Continue if no errors
+					if((p != null) && (!p.IsDisposed))
+					{
+						// Add to plugins
+						this.plugins.Add(p);
+						
+						// Load actions
+						General.Actions.LoadActions(p.Assembly);
+
+						//mxd. And hints
+						General.Hints.LoadHints(p.Assembly);
+						
+						// Plugin is now initialized
+						p.Plug.OnInitialize();
+					}
+					
+					// Remove the plugin from list
+					filenames.RemoveAt(filenameindex);
+				}
+			}
+			
+			// Now load the remaining files
+			foreach(string fn in filenames)
+			{
+				// Load plugin from this file
+				Plugin p;
+				try
+				{
+					p = new Plugin(fn);
+				}
+				catch(InvalidProgramException)
+				{
+					p = null;
+				}
+				
+				// Continue if no errors
+				if((p != null) && (!p.IsDisposed))
+				{
+					// Add to plugins
+					this.plugins.Add(p);
+					
+					// Load actions
+					General.Actions.LoadActions(p.Assembly);
+
+					//mxd. And hints
+					General.Hints.LoadHints(p.Assembly);
+					
+					// Plugin is now initialized
+					p.Plug.OnInitialize();
+				}
+			}
+		}
+		
+		// This returns a plugin by assembly, or null when plugin cannot be found
+		public Plugin FindPluginByAssembly(Assembly assembly)
+		{
+			// Go for all plugins the find the one with matching assembly
+			foreach(Plugin p in plugins)
+			{
+				if(Equals(p.Assembly, assembly)) return p;
+			}
+
+			// Nothing found
+			return null;
+		}
+
+		#endregion
+
+		#region ================== Events
+		
+		public bool ModeChanges(EditMode oldmode, EditMode newmode)
+		{
+			bool result = true;
+			foreach(Plugin p in plugins) result &= p.Plug.OnModeChange(oldmode, newmode);
+			return result;
+		}
+
+		public bool OnCopyBegin()
+		{
+			bool result = true;
+			foreach(Plugin p in plugins) result &= p.Plug.OnCopyBegin(result);
+			return result;
+		}
+
+		public bool OnPasteBegin(PasteOptions options)
+		{
+			bool result = true;
+			foreach(Plugin p in plugins) result &= p.Plug.OnPasteBegin(options.Copy(), result);
+			return result;
+		}
+
+		public bool OnUndoBegin()
+		{
+			bool result = true;
+			foreach(Plugin p in plugins) result &= p.Plug.OnUndoBegin(result);
+			return result;
+		}
+
+		public bool OnRedoBegin()
+		{
+			bool result = true;
+			foreach(Plugin p in plugins) result &= p.Plug.OnRedoBegin(result);
+			return result;
+		}
+
+		public void ReloadResources() { foreach(Plugin p in plugins) p.Plug.OnReloadResources(); }
+		public void ProgramReconfigure() { foreach(Plugin p in plugins) p.Plug.OnProgramReconfigure(); }
+		public void MapReconfigure() { foreach(Plugin p in plugins) p.Plug.OnMapReconfigure(); }
+		public void OnCopyEnd() { foreach(Plugin p in plugins) p.Plug.OnCopyEnd(); }
+		public void OnPasteEnd(PasteOptions options) { foreach(Plugin p in plugins) p.Plug.OnPasteEnd(options.Copy()); }
+		public void OnUndoEnd() { foreach(Plugin p in plugins) p.Plug.OnUndoEnd(); }
+		public void OnRedoEnd() { foreach(Plugin p in plugins) p.Plug.OnRedoEnd(); }
+		public void OnUndoCreated() { foreach(Plugin p in plugins) p.Plug.OnUndoCreated(); }
+		public void OnUndoWithdrawn() { foreach(Plugin p in plugins) p.Plug.OnUndoWithdrawn(); }
+		public void OnMapOpenBegin() { foreach(Plugin p in plugins) p.Plug.OnMapOpenBegin(); }
+		public void OnMapOpenEnd() { foreach(Plugin p in plugins) p.Plug.OnMapOpenEnd(); }
+		public void OnMapNewBegin() { foreach(Plugin p in plugins) p.Plug.OnMapNewBegin(); }
+		public void OnMapNewEnd() { foreach(Plugin p in plugins) p.Plug.OnMapNewEnd(); }
+		public void OnMapCloseBegin() { foreach(Plugin p in plugins) p.Plug.OnMapCloseBegin(); }
+		public void OnMapCloseEnd() { foreach(Plugin p in plugins) p.Plug.OnMapCloseEnd(); }
+		public void OnMapSaveBegin(SavePurpose purpose) { foreach(Plugin p in plugins) p.Plug.OnMapSaveBegin(purpose); }
+		public void OnMapSaveEnd(SavePurpose purpose) { foreach(Plugin p in plugins) p.Plug.OnMapSaveEnd(purpose); }
+		public void OnMapSetChangeBegin() { foreach(Plugin p in plugins) p.Plug.OnMapSetChangeBegin(); }
+		public void OnMapSetChangeEnd() { foreach(Plugin p in plugins) p.Plug.OnMapSetChangeEnd(); }
+		public void OnSectorCeilingSurfaceUpdate(Sector s, ref FlatVertex[] vertices) { foreach(Plugin p in plugins) p.Plug.OnSectorCeilingSurfaceUpdate(s, ref vertices); }
+		public void OnSectorFloorSurfaceUpdate(Sector s, ref FlatVertex[] vertices) { foreach(Plugin p in plugins) p.Plug.OnSectorFloorSurfaceUpdate(s, ref vertices); }
+		public void OnShowPreferences(PreferencesController controller) { foreach(Plugin p in plugins) p.Plug.OnShowPreferences(controller); }
+		public void OnClosePreferences(PreferencesController controller) { foreach(Plugin p in plugins) p.Plug.OnClosePreferences(controller); }
+		public void OnActionBegin(Actions.Action action) { foreach(Plugin p in plugins) p.Plug.OnActionBegin(action); }
+		public void OnActionEnd(Actions.Action action) { foreach(Plugin p in plugins) p.Plug.OnActionEnd(action); }
+		public void OnEditEngage(EditMode oldmode, EditMode newmode) { foreach(Plugin p in plugins) p.Plug.OnEditEngage(oldmode, newmode); }
+		public void OnEditDisengage(EditMode oldmode, EditMode newmode) { foreach(Plugin p in plugins) p.Plug.OnEditDisengage(oldmode, newmode); }
+		public void OnEditCancel() { foreach(Plugin p in plugins) p.Plug.OnEditCancel(); }
+		public void OnEditAccept() { foreach(Plugin p in plugins) p.Plug.OnEditAccept(); }
+		public void OnEditMouseClick(MouseEventArgs e) { foreach(Plugin p in plugins) p.Plug.OnEditMouseClick(e); }
+		public void OnEditMouseDoubleClick(MouseEventArgs e) { foreach(Plugin p in plugins) p.Plug.OnEditMouseDoubleClick(e); }
+		public void OnEditMouseDown(MouseEventArgs e) { foreach(Plugin p in plugins) p.Plug.OnEditMouseDown(e); }
+		public void OnEditMouseEnter(EventArgs e) { foreach(Plugin p in plugins) p.Plug.OnEditMouseEnter(e); }
+		public void OnEditMouseLeave(EventArgs e) { foreach(Plugin p in plugins) p.Plug.OnEditMouseLeave(e); }
+		public void OnEditMouseMove(MouseEventArgs e) { foreach(Plugin p in plugins) p.Plug.OnEditMouseMove(e); }
+		public void OnEditMouseUp(MouseEventArgs e) { foreach(Plugin p in plugins) p.Plug.OnEditMouseUp(e); }
+		public void OnEditKeyDown(KeyEventArgs e) { foreach(Plugin p in plugins) p.Plug.OnEditKeyDown(e); }
+		public void OnEditKeyUp(KeyEventArgs e) { foreach(Plugin p in plugins) p.Plug.OnEditKeyUp(e); }
+		public void OnEditMouseInput(Vector2D delta) { foreach(Plugin p in plugins) p.Plug.OnEditMouseInput(delta); }
+		public void OnEditRedrawDisplayBegin() { foreach(Plugin p in plugins) p.Plug.OnEditRedrawDisplayBegin(); }
+		public void OnEditRedrawDisplayEnd() { foreach(Plugin p in plugins) p.Plug.OnEditRedrawDisplayEnd(); }
+		public void OnPresentDisplayBegin() { foreach(Plugin p in plugins) p.Plug.OnPresentDisplayBegin(); }
+
+		//mxd. Hilight events
+		public void OnHighlightSector(Sector s) { foreach(Plugin p in plugins) p.Plug.OnHighlightSector(s); }
+		public void OnHighlightLinedef(Linedef l) { foreach(Plugin p in plugins) p.Plug.OnHighlightLinedef(l); }
+		public void OnHighlightThing(Thing t) { foreach(Plugin p in plugins) p.Plug.OnHighlightThing(t); }
+		public void OnHighlightVertex(Vertex v) { foreach(Plugin p in plugins) p.Plug.OnHighlightVertex(v); }
+		public void OnHighlightRefreshed(object o) { foreach(Plugin p in plugins) p.Plug.OnHighlightRefreshed(o); }
+		public void OnHighlightLost() { foreach(Plugin p in plugins) p.Plug.OnHighlightLost(); }
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Properties/AssemblyInfo.cs b/Source/Core/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..cfa4e14
--- /dev/null
+++ b/Source/Core/Properties/AssemblyInfo.cs
@@ -0,0 +1,31 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("GZDoom Builder")]
+[assembly: AssemblyDescription("ZDoom, GZDoom and Zandronum map editor")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("CodeImp, MaxED")]
+[assembly: AssemblyProduct("GZDoom Builder")]
+[assembly: AssemblyCopyright("Copyright © 2007, 2015")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("767cd97a-8b1f-42b3-9086-a5ab9cdbe4ab")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+[assembly: AssemblyVersion("2.3.0.2411")]
\ No newline at end of file
diff --git a/Source/Core/Properties/Resources.Designer.cs b/Source/Core/Properties/Resources.Designer.cs
new file mode 100644
index 0000000..84d6f14
--- /dev/null
+++ b/Source/Core/Properties/Resources.Designer.cs
@@ -0,0 +1,1483 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:4.0.30319.42000
+//
+//     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace CodeImp.DoomBuilder.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
+    /// </summary>
+    // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
+    // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
+    // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
+    // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("CodeImp.DoomBuilder.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
+        ///   Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap About {
+            get {
+                object obj = ResourceManager.GetObject("About", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Add {
+            get {
+                object obj = ResourceManager.GetObject("Add", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Angle {
+            get {
+                object obj = ResourceManager.GetObject("Angle", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ArrowDown {
+            get {
+                object obj = ResourceManager.GetObject("ArrowDown", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ArrowUp {
+            get {
+                object obj = ResourceManager.GetObject("ArrowUp", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Brightness {
+            get {
+                object obj = ResourceManager.GetObject("Brightness", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Check {
+            get {
+                object obj = ResourceManager.GetObject("Check", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Clear {
+            get {
+                object obj = ResourceManager.GetObject("Clear", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ClearTextures {
+            get {
+                object obj = ResourceManager.GetObject("ClearTextures", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap CLogo {
+            get {
+                object obj = ResourceManager.GetObject("CLogo", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Close {
+            get {
+                object obj = ResourceManager.GetObject("Close", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Collapse {
+            get {
+                object obj = ResourceManager.GetObject("Collapse", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ColorPick {
+            get {
+                object obj = ResourceManager.GetObject("ColorPick", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Comment {
+            get {
+                object obj = ResourceManager.GetObject("Comment", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap CommentInfo {
+            get {
+                object obj = ResourceManager.GetObject("CommentInfo", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap CommentProblem {
+            get {
+                object obj = ResourceManager.GetObject("CommentProblem", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap CommentQuestion {
+            get {
+                object obj = ResourceManager.GetObject("CommentQuestion", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap CommentRegular {
+            get {
+                object obj = ResourceManager.GetObject("CommentRegular", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap CommentSmile {
+            get {
+                object obj = ResourceManager.GetObject("CommentSmile", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Configuration {
+            get {
+                object obj = ResourceManager.GetObject("Configuration", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Copy {
+            get {
+                object obj = ResourceManager.GetObject("Copy", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Cursor {
+            get {
+                object obj = ResourceManager.GetObject("Cursor", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Cut {
+            get {
+                object obj = ResourceManager.GetObject("Cut", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap DockerCollapse {
+            get {
+                object obj = ResourceManager.GetObject("DockerCollapse", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap DockerExpand {
+            get {
+                object obj = ResourceManager.GetObject("DockerExpand", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ErrorLarge {
+            get {
+                object obj = ResourceManager.GetObject("ErrorLarge", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Expand {
+            get {
+                object obj = ResourceManager.GetObject("Expand", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Failed {
+            get {
+                object obj = ResourceManager.GetObject("Failed", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap File {
+            get {
+                object obj = ResourceManager.GetObject("File", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Filter {
+            get {
+                object obj = ResourceManager.GetObject("Filter", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap fog {
+            get {
+                object obj = ResourceManager.GetObject("fog", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Folder {
+            get {
+                object obj = ResourceManager.GetObject("Folder", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap FolderExplore {
+            get {
+                object obj = ResourceManager.GetObject("FolderExplore", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap fx {
+            get {
+                object obj = ResourceManager.GetObject("fx", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Grid2 {
+            get {
+                object obj = ResourceManager.GetObject("Grid2", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Grid2_arrowup {
+            get {
+                object obj = ResourceManager.GetObject("Grid2_arrowup", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Grid4 {
+            get {
+                object obj = ResourceManager.GetObject("Grid4", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap GridDecrease {
+            get {
+                object obj = ResourceManager.GetObject("GridDecrease", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap GridDynamic {
+            get {
+                object obj = ResourceManager.GetObject("GridDynamic", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap GridIncrease {
+            get {
+                object obj = ResourceManager.GetObject("GridIncrease", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Group {
+            get {
+                object obj = ResourceManager.GetObject("Group", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap GroupAdd {
+            get {
+                object obj = ResourceManager.GetObject("GroupAdd", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap GroupRemove {
+            get {
+                object obj = ResourceManager.GetObject("GroupRemove", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap GZDB_Logo_small {
+            get {
+                object obj = ResourceManager.GetObject("GZDB_Logo_small", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol).
+        /// </summary>
+        internal static System.Drawing.Icon GZDB2 {
+            get {
+                object obj = ResourceManager.GetObject("GZDB2", resourceCulture);
+                return ((System.Drawing.Icon)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Help {
+            get {
+                object obj = ResourceManager.GetObject("Help", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Hourglass {
+            get {
+                object obj = ResourceManager.GetObject("Hourglass", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ImageStack {
+            get {
+                object obj = ResourceManager.GetObject("ImageStack", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap InfoLine {
+            get {
+                object obj = ResourceManager.GetObject("InfoLine", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap InfoPanelCollapse {
+            get {
+                object obj = ResourceManager.GetObject("InfoPanelCollapse", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap InfoPanelExpand {
+            get {
+                object obj = ResourceManager.GetObject("InfoPanelExpand", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Keyboard {
+            get {
+                object obj = ResourceManager.GetObject("Keyboard", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap KnownTextureSet {
+            get {
+                object obj = ResourceManager.GetObject("KnownTextureSet", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Light {
+            get {
+                object obj = ResourceManager.GetObject("Light", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Light_animate {
+            get {
+                object obj = ResourceManager.GetObject("Light_animate", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Lightbulb {
+            get {
+                object obj = ResourceManager.GetObject("Lightbulb", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap LightDisabled {
+            get {
+                object obj = ResourceManager.GetObject("LightDisabled", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap LinedefColorPresets {
+            get {
+                object obj = ResourceManager.GetObject("LinedefColorPresets", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Link {
+            get {
+                object obj = ResourceManager.GetObject("Link", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap List {
+            get {
+                object obj = ResourceManager.GetObject("List", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap List_Images {
+            get {
+                object obj = ResourceManager.GetObject("List_Images", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Marine {
+            get {
+                object obj = ResourceManager.GetObject("Marine", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap MCrash {
+            get {
+                object obj = ResourceManager.GetObject("MCrash", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap mergegeometry {
+            get {
+                object obj = ResourceManager.GetObject("mergegeometry", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap mergegeometry2 {
+            get {
+                object obj = ResourceManager.GetObject("mergegeometry2", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap MissingTexture {
+            get {
+                object obj = ResourceManager.GetObject("MissingTexture", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap MissingThing {
+            get {
+                object obj = ResourceManager.GetObject("MissingThing", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap MixedThings {
+            get {
+                object obj = ResourceManager.GetObject("MixedThings", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap MLogo {
+            get {
+                object obj = ResourceManager.GetObject("MLogo", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Model {
+            get {
+                object obj = ResourceManager.GetObject("Model", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Model_selected {
+            get {
+                object obj = ResourceManager.GetObject("Model_selected", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ModelDisabled {
+            get {
+                object obj = ResourceManager.GetObject("ModelDisabled", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ModelFiltered {
+            get {
+                object obj = ResourceManager.GetObject("ModelFiltered", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Monster2 {
+            get {
+                object obj = ResourceManager.GetObject("Monster2", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Monster3 {
+            get {
+                object obj = ResourceManager.GetObject("Monster3", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap NewMap {
+            get {
+                object obj = ResourceManager.GetObject("NewMap", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap NewScript {
+            get {
+                object obj = ResourceManager.GetObject("NewScript", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap OpenMap {
+            get {
+                object obj = ResourceManager.GetObject("OpenMap", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap OpenScript {
+            get {
+                object obj = ResourceManager.GetObject("OpenScript", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Paste {
+            get {
+                object obj = ResourceManager.GetObject("Paste", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap PasteSpecial {
+            get {
+                object obj = ResourceManager.GetObject("PasteSpecial", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Pin {
+            get {
+                object obj = ResourceManager.GetObject("Pin", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Prefab {
+            get {
+                object obj = ResourceManager.GetObject("Prefab", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Prefab2 {
+            get {
+                object obj = ResourceManager.GetObject("Prefab2", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Preferences {
+            get {
+                object obj = ResourceManager.GetObject("Preferences", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Properties {
+            get {
+                object obj = ResourceManager.GetObject("Properties", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap PuzzlePiece {
+            get {
+                object obj = ResourceManager.GetObject("PuzzlePiece", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Question {
+            get {
+                object obj = ResourceManager.GetObject("Question", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Redo {
+            get {
+                object obj = ResourceManager.GetObject("Redo", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Reload {
+            get {
+                object obj = ResourceManager.GetObject("Reload", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Replace {
+            get {
+                object obj = ResourceManager.GetObject("Replace", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Reset {
+            get {
+                object obj = ResourceManager.GetObject("Reset", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap SaveAll {
+            get {
+                object obj = ResourceManager.GetObject("SaveAll", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap SaveMap {
+            get {
+                object obj = ResourceManager.GetObject("SaveMap", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap SaveScript {
+            get {
+                object obj = ResourceManager.GetObject("SaveScript", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Screenshot {
+            get {
+                object obj = ResourceManager.GetObject("Screenshot", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ScreenshotActiveWindow {
+            get {
+                object obj = ResourceManager.GetObject("ScreenshotActiveWindow", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Script2 {
+            get {
+                object obj = ResourceManager.GetObject("Script2", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ScriptCompile {
+            get {
+                object obj = ResourceManager.GetObject("ScriptCompile", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Byte[].
+        /// </summary>
+        internal static byte[] ScriptConstant {
+            get {
+                object obj = ResourceManager.GetObject("ScriptConstant", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Byte[].
+        /// </summary>
+        internal static byte[] ScriptError {
+            get {
+                object obj = ResourceManager.GetObject("ScriptError", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ScriptHelp {
+            get {
+                object obj = ResourceManager.GetObject("ScriptHelp", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Byte[].
+        /// </summary>
+        internal static byte[] ScriptKeyword {
+            get {
+                object obj = ResourceManager.GetObject("ScriptKeyword", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ScriptPalette {
+            get {
+                object obj = ResourceManager.GetObject("ScriptPalette", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Byte[].
+        /// </summary>
+        internal static byte[] ScriptSnippet {
+            get {
+                object obj = ResourceManager.GetObject("ScriptSnippet", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Search {
+            get {
+                object obj = ResourceManager.GetObject("Search", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap SearchClear {
+            get {
+                object obj = ResourceManager.GetObject("SearchClear", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap SearchMatch {
+            get {
+                object obj = ResourceManager.GetObject("SearchMatch", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap SearchMatchCase {
+            get {
+                object obj = ResourceManager.GetObject("SearchMatchCase", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap SearchNext {
+            get {
+                object obj = ResourceManager.GetObject("SearchNext", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap SearchPrev {
+            get {
+                object obj = ResourceManager.GetObject("SearchPrev", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap SlimDX_small {
+            get {
+                object obj = ResourceManager.GetObject("SlimDX_small", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap SnapVerts {
+            get {
+                object obj = ResourceManager.GetObject("SnapVerts", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Splash3_small {
+            get {
+                object obj = ResourceManager.GetObject("Splash3_small", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Splash3_trans {
+            get {
+                object obj = ResourceManager.GetObject("Splash3_trans", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Status0 {
+            get {
+                object obj = ResourceManager.GetObject("Status0", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Status1 {
+            get {
+                object obj = ResourceManager.GetObject("Status1", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Status10 {
+            get {
+                object obj = ResourceManager.GetObject("Status10", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Status11 {
+            get {
+                object obj = ResourceManager.GetObject("Status11", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Status12 {
+            get {
+                object obj = ResourceManager.GetObject("Status12", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Status2 {
+            get {
+                object obj = ResourceManager.GetObject("Status2", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap TagStatistics {
+            get {
+                object obj = ResourceManager.GetObject("TagStatistics", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Test {
+            get {
+                object obj = ResourceManager.GetObject("Test", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Text {
+            get {
+                object obj = ResourceManager.GetObject("Text", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ThingStatistics {
+            get {
+                object obj = ResourceManager.GetObject("ThingStatistics", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap treeview {
+            get {
+                object obj = ResourceManager.GetObject("treeview", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Undo {
+            get {
+                object obj = ResourceManager.GetObject("Undo", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap UnknownImage {
+            get {
+                object obj = ResourceManager.GetObject("UnknownImage", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Unlink {
+            get {
+                object obj = ResourceManager.GetObject("Unlink", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Unpin {
+            get {
+                object obj = ResourceManager.GetObject("Unpin", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Update {
+            get {
+                object obj = ResourceManager.GetObject("Update", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ViewBrightness {
+            get {
+                object obj = ResourceManager.GetObject("ViewBrightness", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ViewNormal {
+            get {
+                object obj = ResourceManager.GetObject("ViewNormal", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ViewTextureCeiling {
+            get {
+                object obj = ResourceManager.GetObject("ViewTextureCeiling", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ViewTextureFloor {
+            get {
+                object obj = ResourceManager.GetObject("ViewTextureFloor", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap VisualVertices {
+            get {
+                object obj = ResourceManager.GetObject("VisualVertices", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Warning {
+            get {
+                object obj = ResourceManager.GetObject("Warning", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap WarningLarge {
+            get {
+                object obj = ResourceManager.GetObject("WarningLarge", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap WarningOff {
+            get {
+                object obj = ResourceManager.GetObject("WarningOff", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap WordWrap {
+            get {
+                object obj = ResourceManager.GetObject("WordWrap", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Zoom {
+            get {
+                object obj = ResourceManager.GetObject("Zoom", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Zoom_arrowup {
+            get {
+                object obj = ResourceManager.GetObject("Zoom_arrowup", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+    }
+}
diff --git a/Source/Core/Properties/Resources.resx b/Source/Core/Properties/Resources.resx
new file mode 100644
index 0000000..8598720
--- /dev/null
+++ b/Source/Core/Properties/Resources.resx
@@ -0,0 +1,547 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="Zoom" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Zoom.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Clear" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Clear.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Cut" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Cut.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ArrowUp" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ArrowUp.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Keyboard" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Keyboard.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="SaveMap" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\SaveMap.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="SaveScript" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\SaveScript.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ColorPick" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ColorPick.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="SearchMatchCase" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\SearchMatchCase.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="File" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\NewMap.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="GZDB_Logo_small" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\GZDB_Logo_small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="SaveAll" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\SaveAll.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Monster2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Monster2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="CommentQuestion" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\CommentQuestion.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ViewTextureCeiling" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ViewTextureCeiling.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Filter" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Filter.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Replace" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Replace.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Grid4" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Grid4.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="MixedThings" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\MixedThings.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Marine" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Marine.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="InfoPanelCollapse" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\InfoPanelCollapse.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Splash3_small" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Splash3_small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="VisualVertices" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\VisualVertices.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Screenshot" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Screenshot.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ScriptPalette" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ScriptPalette.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ScriptHelp" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ScriptHelp.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="CommentSmile" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\CommentSmile.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="KnownTextureSet" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\KnownTextureSet.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Splash3_trans" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Splash3_trans.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Close" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Close.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ThingStatistics" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ThingStatistics.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Expand" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Expand.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Redo" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Redo.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Status0" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Status0.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Model" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Model.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="mergegeometry" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\mergegeometry.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ScriptSnippet" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ScriptSnippet.xpm;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="CommentProblem" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\CommentProblem.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="List_Images" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\List_Images.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="MLogo" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\MLogo.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="UnknownImage" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\UnknownImage.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Paste" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Paste.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="LightDisabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\LightDisabled.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ScriptConstant" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ScriptConstant.xpm;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="FolderExplore" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\FolderExplore.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Warning" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Warning.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="fx" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\fx.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="mergegeometry2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\mergegeometry2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="CLogo" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\CLogo.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="WarningOff" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\WarningOff.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="List" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\List.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="LinedefColorPresets" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\LinedefColorPresets.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Question" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Question.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="CommentInfo" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\CommentInfo.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="CommentRegular" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\CommentRegular.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Cursor" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Cursor.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Grid2_arrowup" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Grid2_arrowup.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Reset" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Reset.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="OpenMap" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\OpenMap.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="treeview" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\treeview.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Status1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Status1.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ArrowDown" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ArrowDown.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="PasteSpecial" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\PasteSpecial.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Failed" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Failed.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="NewMap" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\NewMap2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="SearchClear" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\SearchClear.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Prefab2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Prefab2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Grid2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Grid2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="WordWrap" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\WordWrap.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="fog" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\fog.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="InfoLine" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\InfoLine.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="MissingTexture" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\MissingTexture.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ErrorLarge" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ErrorLarge.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ScriptError" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ScriptError.xpm;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="Lightbulb" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Lightbulb.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="MCrash" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\MCrash.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="DockerExpand" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\DockerExpand.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ModelDisabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ModelDisabled.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ModelFiltered" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ModelFiltered.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Zoom_arrowup" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Zoom_arrowup.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ScriptCompile" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ScriptCompile.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="PuzzlePiece" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\PuzzlePiece.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="SearchPrev" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\SearchPrev.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Model_selected" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Model_selected.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Collapse" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Collapse.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="NewScript" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\NewScript.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="SnapVerts" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\SnapVerts.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Unlink" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Unlink.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Status10" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Status10.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Properties" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Properties.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Script2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Script2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ClearTextures" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ClearTextures.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Prefab" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Prefab.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ImageStack" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ImageStack.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="SearchMatch" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\SearchMatch.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Hourglass" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Hourglass.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Folder" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Folder.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="GZDB2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\GZDB2.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Comment" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Comment.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Status12" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Status12.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="SearchNext" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\SearchNext.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Status2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Status2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Link" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Link.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Brightness" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Brightness.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="TagStatistics" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\TagStatistics.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Add" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Add.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Test" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Test.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Undo" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Undo.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="InfoPanelExpand" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\InfoPanelExpand.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Unpin" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Unpin.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Angle" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Angle.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ViewTextureFloor" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ViewTextureFloor.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Light_animate" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Light_animate.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Pin" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Pin.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ViewNormal" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ViewNormal.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ScriptKeyword" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ScriptKeyword.xpm;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="MissingThing" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\MissingThing.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Monster3" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Monster3.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="DockerCollapse" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\DockerCollapse.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Copy" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Copy.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ViewBrightness" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ViewBrightness.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Light" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Light.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Help" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Help.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="OpenScript" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\OpenScript.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="SlimDX_small" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\SlimDX_small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Status11" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Status11.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ScreenshotActiveWindow" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ScreenshotActiveWindow.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="WarningLarge" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\WarningLarge.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Search" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Search.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Text" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Text.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Check" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Check.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="GridDynamic" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\GridDynamic.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="About" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\About.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Configuration" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Configuration.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Preferences" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Preferences.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Reload" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Reload.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Update" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Update.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Group" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Group.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="GroupAdd" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\GroupAdd.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="GroupRemove" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\GroupRemove.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="GridDecrease" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\GridDecrease.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="GridIncrease" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\GridIncrease.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Rendering/ColorCollection.cs b/Source/Core/Rendering/ColorCollection.cs
new file mode 100644
index 0000000..1b38263
--- /dev/null
+++ b/Source/Core/Rendering/ColorCollection.cs
@@ -0,0 +1,278 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Globalization;
+using System.Drawing;
+using SlimDX;
+
+using Configuration = CodeImp.DoomBuilder.IO.Configuration;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Rendering
+{
+	public sealed class ColorCollection
+	{
+		#region ================== Constants
+
+		// Assist color creation
+		private const float BRIGHT_MULTIPLIER = 1.0f;
+		private const float BRIGHT_ADDITION = 0.4f;
+		private const float DARK_MULTIPLIER = 0.9f;
+		private const float DARK_ADDITION = -0.2f;
+
+		// Palette size
+		private const int NUM_COLORS = 41;
+		public const int NUM_THING_COLORS = 20;
+		public const int THING_COLORS_OFFSET = 20;
+
+		// Colors!
+		public const int BACKGROUND = 0;
+		public const int VERTICES = 1;
+		public const int LINEDEFS = 2;
+		public const int MODELWIRECOLOR = 3; //mxd
+		public const int INFOLINECOLOR = 4; //mxd
+		public const int HIGHLIGHT = 5;
+		public const int SELECTION = 6;
+		public const int INDICATION = 7;
+		public const int GRID = 8;
+		public const int GRID64 = 9;
+		public const int CROSSHAIR3D = 10;
+		public const int HIGHLIGHT3D = 11;
+		public const int SELECTION3D = 12;
+		public const int SCRIPTBACKGROUND = 13;
+		public const int LINENUMBERS = 14;
+		public const int PLAINTEXT = 15;
+		public const int COMMENTS = 16;
+		public const int KEYWORDS = 17;
+		public const int LITERALS = 18;
+		public const int CONSTANTS = 19;
+		public const int THINGCOLOR00 = 20;
+		public const int THINGCOLOR01 = 21;
+		public const int THINGCOLOR02 = 22;
+		public const int THINGCOLOR03 = 23;
+		public const int THINGCOLOR04 = 24;
+		public const int THINGCOLOR05 = 25;
+		public const int THINGCOLOR06 = 26;
+		public const int THINGCOLOR07 = 27;
+		public const int THINGCOLOR08 = 28;
+		public const int THINGCOLOR09 = 29;
+		public const int THINGCOLOR10 = 30;
+		public const int THINGCOLOR11 = 31;
+		public const int THINGCOLOR12 = 32;
+		public const int THINGCOLOR13 = 33;
+		public const int THINGCOLOR14 = 34;
+		public const int THINGCOLOR15 = 35;
+		public const int THINGCOLOR16 = 36;
+		public const int THINGCOLOR17 = 37;
+		public const int THINGCOLOR18 = 38;
+		public const int THINGCOLOR19 = 39;
+		public const int THREEDFLOORCOLOR = 40; //mxd
+
+		
+		#endregion
+
+		#region ================== Variables
+
+		// Colors
+		private PixelColor[] colors;
+		private PixelColor[] brightcolors;
+		private PixelColor[] darkcolors;
+		
+		// Color-correction table
+		private byte[] correctiontable;
+		
+		#endregion
+		
+		#region ================== Properties
+		
+		public PixelColor[] Colors { get { return colors; } }
+		public PixelColor[] BrightColors { get { return brightcolors; } }
+		public PixelColor[] DarkColors { get { return darkcolors; } }
+		
+		public PixelColor Background { get { return colors[BACKGROUND]; } internal set { colors[BACKGROUND] = value; } }
+		public PixelColor Vertices { get { return colors[VERTICES]; } internal set { colors[VERTICES] = value; } }
+		public PixelColor Linedefs { get { return colors[LINEDEFS]; } internal set { colors[LINEDEFS] = value; } }
+		public PixelColor Highlight { get { return colors[HIGHLIGHT]; } internal set { colors[HIGHLIGHT] = value; } }
+		public PixelColor Selection { get { return colors[SELECTION]; } internal set { colors[SELECTION] = value; } }
+		public PixelColor Indication { get { return colors[INDICATION]; } internal set { colors[INDICATION] = value; } }
+		public PixelColor Grid { get { return colors[GRID]; } internal set { colors[GRID] = value; } }
+		public PixelColor Grid64 { get { return colors[GRID64]; } internal set { colors[GRID64] = value; } }
+
+		//mxd
+		public PixelColor ModelWireframe { get { return colors[MODELWIRECOLOR]; } internal set { colors[MODELWIRECOLOR] = value; } }
+		public PixelColor InfoLine { get { return colors[INFOLINECOLOR]; } internal set { colors[INFOLINECOLOR] = value; } }
+		public PixelColor ThreeDFloor { get { return colors[THREEDFLOORCOLOR]; } internal set { colors[THREEDFLOORCOLOR] = value;} }
+		
+		public PixelColor Crosshair3D { get { return colors[CROSSHAIR3D]; } internal set { colors[CROSSHAIR3D] = value; } }
+		public PixelColor Highlight3D { get { return colors[HIGHLIGHT3D]; } internal set { colors[HIGHLIGHT3D] = value; } }
+		public PixelColor Selection3D { get { return colors[SELECTION3D]; } internal set { colors[SELECTION3D] = value; } }
+		
+		public PixelColor ScriptBackground { get { return colors[SCRIPTBACKGROUND]; } internal set { colors[SCRIPTBACKGROUND] = value; } }
+		public PixelColor LineNumbers { get { return colors[LINENUMBERS]; } internal set { colors[LINENUMBERS] = value; } }
+		public PixelColor PlainText { get { return colors[PLAINTEXT]; } internal set { colors[PLAINTEXT] = value; } }
+		public PixelColor Comments { get { return colors[COMMENTS]; } internal set { colors[COMMENTS] = value; } }
+		public PixelColor Keywords { get { return colors[KEYWORDS]; } internal set { colors[KEYWORDS] = value; } }
+		public PixelColor Literals { get { return colors[LITERALS]; } internal set { colors[LITERALS] = value; } }
+		public PixelColor Constants { get { return colors[CONSTANTS]; } internal set { colors[CONSTANTS] = value; } }
+		
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor for settings from configuration
+		internal ColorCollection(Configuration cfg)
+		{
+			// Initialize
+			colors = new PixelColor[NUM_COLORS];
+			brightcolors = new PixelColor[NUM_COLORS];
+			darkcolors = new PixelColor[NUM_COLORS];
+			
+			// Read all colors from config
+			for(int i = 0; i < NUM_COLORS; i++)
+			{
+				// Read color
+				colors[i] = PixelColor.FromInt(cfg.ReadSetting("colors.color" + i.ToString(CultureInfo.InvariantCulture), -16711872)); //mxd. changed default color from transparent to light-green
+			}
+
+			// Set new colors
+			if(colors[THINGCOLOR00].ToInt() == 0) colors[THINGCOLOR00] = PixelColor.FromColor(Color.DimGray);
+			if(colors[THINGCOLOR01].ToInt() == 0) colors[THINGCOLOR01] = PixelColor.FromColor(Color.RoyalBlue);
+			if(colors[THINGCOLOR02].ToInt() == 0) colors[THINGCOLOR02] = PixelColor.FromColor(Color.ForestGreen);
+			if(colors[THINGCOLOR03].ToInt() == 0) colors[THINGCOLOR03] = PixelColor.FromColor(Color.LightSeaGreen);
+			if(colors[THINGCOLOR04].ToInt() == 0) colors[THINGCOLOR04] = PixelColor.FromColor(Color.Firebrick);
+			if(colors[THINGCOLOR05].ToInt() == 0) colors[THINGCOLOR05] = PixelColor.FromColor(Color.DarkViolet);
+			if(colors[THINGCOLOR06].ToInt() == 0) colors[THINGCOLOR06] = PixelColor.FromColor(Color.DarkGoldenrod);
+			if(colors[THINGCOLOR07].ToInt() == 0) colors[THINGCOLOR07] = PixelColor.FromColor(Color.Silver);
+			if(colors[THINGCOLOR08].ToInt() == 0) colors[THINGCOLOR08] = PixelColor.FromColor(Color.Gray);
+			if(colors[THINGCOLOR09].ToInt() == 0) colors[THINGCOLOR09] = PixelColor.FromColor(Color.DeepSkyBlue);
+			if(colors[THINGCOLOR10].ToInt() == 0) colors[THINGCOLOR10] = PixelColor.FromColor(Color.LimeGreen);
+			if(colors[THINGCOLOR11].ToInt() == 0) colors[THINGCOLOR11] = PixelColor.FromColor(Color.PaleTurquoise);
+			if(colors[THINGCOLOR12].ToInt() == 0) colors[THINGCOLOR12] = PixelColor.FromColor(Color.Tomato);
+			if(colors[THINGCOLOR13].ToInt() == 0) colors[THINGCOLOR13] = PixelColor.FromColor(Color.Violet);
+			if(colors[THINGCOLOR14].ToInt() == 0) colors[THINGCOLOR14] = PixelColor.FromColor(Color.Yellow);
+			if(colors[THINGCOLOR15].ToInt() == 0) colors[THINGCOLOR15] = PixelColor.FromColor(Color.WhiteSmoke);
+			if(colors[THINGCOLOR16].ToInt() == 0) colors[THINGCOLOR16] = PixelColor.FromColor(Color.LightPink);
+			if(colors[THINGCOLOR17].ToInt() == 0) colors[THINGCOLOR17] = PixelColor.FromColor(Color.DarkOrange);
+			if(colors[THINGCOLOR18].ToInt() == 0) colors[THINGCOLOR18] = PixelColor.FromColor(Color.DarkKhaki);
+			if(colors[THINGCOLOR19].ToInt() == 0) colors[THINGCOLOR19] = PixelColor.FromColor(Color.Goldenrod);
+			
+			// Create assist colors
+			CreateAssistColors();
+			
+			// Create color correction table
+			CreateCorrectionTable();
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		#endregion
+
+		#region ================== Methods
+		
+		// This generates a color-correction table
+		internal void CreateCorrectionTable()
+		{
+			// Determine amounts
+			float gamma = (General.Settings.ImageBrightness + 10) * 0.1f;
+			float bright = General.Settings.ImageBrightness * 5f;
+			
+			// Make table
+			correctiontable = new byte[256];
+			
+			// Fill table
+			for(int i = 0; i < 256; i++)
+			{
+				byte b;
+				float a = i * gamma + bright;
+				if(a < 0f) b = 0; else if(a > 255f) b = 255; else b = (byte)a;
+				correctiontable[i] = b;
+			}
+		}
+		
+		// This applies color-correction over a block of pixel data
+		internal unsafe void ApplyColorCorrection(PixelColor* pixels, int numpixels)
+		{
+			for(PixelColor* cp = pixels + numpixels - 1; cp >= pixels; cp--)
+			{
+				cp->r = correctiontable[cp->r];
+				cp->g = correctiontable[cp->g];
+				cp->b = correctiontable[cp->b];
+			}
+		}
+		
+		// This clamps a value between 0 and 1
+		private static float Saturate(float v)
+		{
+			if(v < 0f) return 0f; else if(v > 1f) return 1f; else return v;
+		}
+
+		// This creates assist colors
+		internal void CreateAssistColors()
+		{
+			// Go for all colors
+			for(int i = 0; i < NUM_COLORS; i++)
+			{
+				// Create assist colors
+				brightcolors[i] = CreateBrightVariant(colors[i]);
+				darkcolors[i] = CreateDarkVariant(colors[i]);
+			}
+		}
+		
+		// This creates a brighter color
+		public PixelColor CreateBrightVariant(PixelColor pc)
+		{
+			Color4 o = pc.ToColorValue();
+			Color4 c = new Color4(1f, 0f, 0f, 0f);
+						
+			// Create brighter color
+			c.Red = Saturate(o.Red * BRIGHT_MULTIPLIER + BRIGHT_ADDITION);
+			c.Green = Saturate(o.Green * BRIGHT_MULTIPLIER + BRIGHT_ADDITION);
+			c.Blue = Saturate(o.Blue * BRIGHT_MULTIPLIER + BRIGHT_ADDITION);
+			return PixelColor.FromInt(c.ToArgb());
+		}
+
+		// This creates a darker color
+		public PixelColor CreateDarkVariant(PixelColor pc)
+		{
+			Color4 o = pc.ToColorValue();
+			Color4 c = new Color4(1f, 0f, 0f, 0f);
+
+			// Create darker color
+			c.Red = Saturate(o.Red * DARK_MULTIPLIER + DARK_ADDITION);
+			c.Green = Saturate(o.Green * DARK_MULTIPLIER + DARK_ADDITION);
+			c.Blue = Saturate(o.Blue * DARK_MULTIPLIER + DARK_ADDITION);
+			return PixelColor.FromInt(c.ToArgb());
+		}
+
+		// This saves colors to configuration
+		internal void SaveColors(Configuration cfg)
+		{
+			// Write all colors to config
+			for(int i = 0; i < NUM_COLORS; i++)
+			{
+				// Write color
+				cfg.WriteSetting("colors.color" + i.ToString(CultureInfo.InvariantCulture), colors[i].ToInt());
+			}
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Rendering/ColorSetting.cs b/Source/Core/Rendering/ColorSetting.cs
new file mode 100644
index 0000000..d044565
--- /dev/null
+++ b/Source/Core/Rendering/ColorSetting.cs
@@ -0,0 +1,90 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Drawing;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Rendering
+{
+	internal sealed class ColorSetting : IEquatable<ColorSetting>
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		private string name;
+		private PixelColor color;
+
+		#endregion
+
+		#region ================== Properties
+
+		public Color Color { get { return Color.FromArgb(color.ToInt()); } set { color = PixelColor.FromColor(value); } }
+		public PixelColor PixelColor { get { return color; } set { color = value; } }
+		public string Name { get { return name; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public ColorSetting(string name, PixelColor color)
+		{
+			// Initialize
+			this.name = name;
+			this.color = color;
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This returns a PixelColor with adjusted alpha
+		public PixelColor WithAlpha(byte a)
+		{
+			return new PixelColor(color, a);
+		}
+		
+		// Equal?
+		public bool Equals(ColorSetting other)
+		{
+			return this.name == other.name;
+		}
+
+		// To PixelColor
+		public static implicit operator PixelColor(ColorSetting c)
+		{
+			return c.color;
+		}
+
+		// To Color
+		public static implicit operator Color(ColorSetting c)
+		{
+			return Color.FromArgb(c.color.ToInt());
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Rendering/CommentType.cs b/Source/Core/Rendering/CommentType.cs
new file mode 100644
index 0000000..35995d4
--- /dev/null
+++ b/Source/Core/Rendering/CommentType.cs
@@ -0,0 +1,13 @@
+namespace CodeImp.DoomBuilder.Rendering
+{
+	public struct CommentType
+	{
+		private const string REGULAR = "";
+		private const string INFO = "[i]";
+		private const string QUESTION = "[?]";
+		private const string PROBLEM = "[!]";
+		private const string SMILE = "[:]";
+
+		public static readonly string[] Types = new[] { REGULAR, INFO, QUESTION, PROBLEM, SMILE };
+	}
+}
diff --git a/Source/Core/Rendering/D3DDevice.cs b/Source/Core/Rendering/D3DDevice.cs
new file mode 100644
index 0000000..e1df922
--- /dev/null
+++ b/Source/Core/Rendering/D3DDevice.cs
@@ -0,0 +1,578 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
+using System.Drawing;
+using SlimDX.Direct3D9;
+using CodeImp.DoomBuilder.Geometry;
+using SlimDX;
+using CodeImp.DoomBuilder.Data;
+using CodeImp.DoomBuilder.Controls;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Rendering
+{
+	internal class D3DDevice
+	{
+		#region ================== Constants
+
+		// NVPerfHUD device name
+		public const string NVPERFHUD_ADAPTER = "NVPerfHUD";
+
+		#endregion
+
+		#region ================== Variables
+
+		// Settings
+		private int adapter;
+		private Filter postfilter;
+		private Filter mipgeneratefilter;
+		private static bool isrendering; //mxd
+		
+		// Main objects
+		private static Direct3D d3d;
+		private RenderTargetControl rendertarget;
+		private Capabilities devicecaps;
+		private Device device;
+		private Viewport viewport;
+		private Dictionary<ID3DResource, ID3DResource> resources;
+		private ShaderManager shaders;
+		private Surface backbuffer;
+		private Surface depthbuffer;
+		private TextFont font;
+		private ResourceImage fonttexture;
+		
+		// Disposing
+		private bool isdisposed;
+
+		#endregion
+
+		#region ================== Properties
+
+		internal Device Device { get { return device; } }
+		public bool IsDisposed { get { return isdisposed; } }
+		public static bool IsRendering { get { return isrendering; } } //mxd
+		internal RenderTargetControl RenderTarget { get { return rendertarget; } }
+		internal Viewport Viewport { get { return viewport; } }
+		internal ShaderManager Shaders { get { return shaders; } }
+		internal Surface BackBuffer { get { return backbuffer; } }
+		internal Surface DepthBuffer { get { return depthbuffer; } }
+		internal TextFont Font { get { return font; } }
+		internal Texture FontTexture { get { return fonttexture.Texture; } }
+		internal Filter PostFilter { get { return postfilter; } }
+		internal Filter MipGenerateFilter { get { return mipgeneratefilter; } }
+		
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		internal D3DDevice(RenderTargetControl rendertarget)
+		{
+			// Set render target
+			this.rendertarget = rendertarget;
+
+			// Create resources list
+			resources = new Dictionary<ID3DResource, ID3DResource>();
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Disposer
+		internal void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Clean up
+				foreach(ID3DResource res in resources.Values) res.UnloadResource();
+				if(shaders != null) shaders.Dispose();
+				rendertarget = null;
+				if(backbuffer != null) backbuffer.Dispose();
+				if(depthbuffer != null) depthbuffer.Dispose();
+				if(device != null) device.Dispose();
+				if(font != null) font.Dispose();
+				if(fonttexture != null) fonttexture.Dispose();
+				isrendering = false; //mxd
+				
+				// Done
+				isdisposed = true;
+			}
+		}
+
+		#endregion
+
+		#region ================== Renderstates
+
+		// This completes initialization after the device has started or has been reset
+		public void SetupSettings()
+		{
+			// Setup renderstates
+			device.SetRenderState(RenderState.AlphaBlendEnable, false);
+			device.SetRenderState(RenderState.AlphaBlendEnable, false);
+			device.SetRenderState(RenderState.AlphaFunc, Compare.GreaterEqual);
+			device.SetRenderState(RenderState.AlphaRef, 0x0000007E);
+			device.SetRenderState(RenderState.AlphaTestEnable, false);
+			device.SetRenderState(RenderState.Ambient, Color.White.ToArgb());
+			device.SetRenderState(RenderState.AmbientMaterialSource, ColorSource.Material);
+			device.SetRenderState(RenderState.AntialiasedLineEnable, false);
+			device.SetRenderState(RenderState.Clipping, true);
+			device.SetRenderState(RenderState.ColorVertex, false);
+			device.SetRenderState(RenderState.ColorWriteEnable, ColorWriteEnable.Red | ColorWriteEnable.Green | ColorWriteEnable.Blue | ColorWriteEnable.Alpha);
+			device.SetRenderState(RenderState.CullMode, Cull.None);
+			device.SetRenderState(RenderState.DestinationBlend, Blend.InverseSourceAlpha);
+			device.SetRenderState(RenderState.DiffuseMaterialSource, ColorSource.Color1);
+			device.SetRenderState(RenderState.DitherEnable, true);
+			device.SetRenderState(RenderState.FillMode, FillMode.Solid);
+			device.SetRenderState(RenderState.FogEnable, false);
+			device.SetRenderState(RenderState.FogTableMode, FogMode.Linear);
+			device.SetRenderState(RenderState.Lighting, false);
+			device.SetRenderState(RenderState.LocalViewer, false);
+			device.SetRenderState(RenderState.NormalizeNormals, false);
+			device.SetRenderState(RenderState.PointSpriteEnable, false);
+			device.SetRenderState(RenderState.RangeFogEnable, false);
+			device.SetRenderState(RenderState.SourceBlend, Blend.SourceAlpha);
+			device.SetRenderState(RenderState.SpecularEnable, false);
+			device.SetRenderState(RenderState.StencilEnable, false);
+			device.SetRenderState(RenderState.TextureFactor, -1);
+			device.SetRenderState(RenderState.ZEnable, false);
+			device.SetRenderState(RenderState.ZWriteEnable, false);
+			device.PixelShader = null;
+			device.VertexShader = null;
+
+			// Matrices
+			device.SetTransform(TransformState.World, Matrix.Identity);
+			device.SetTransform(TransformState.View, Matrix.Identity);
+			device.SetTransform(TransformState.Projection, Matrix.Identity);
+			
+			// Sampler settings
+			if(General.Settings.ClassicBilinear)
+			{
+				device.SetSamplerState(0, SamplerState.MagFilter, TextureFilter.Linear);
+				device.SetSamplerState(0, SamplerState.MinFilter, TextureFilter.Linear);
+				device.SetSamplerState(0, SamplerState.MipFilter, TextureFilter.Linear);
+				device.SetSamplerState(0, SamplerState.MipMapLodBias, 0f);
+			}
+			else
+			{
+				device.SetSamplerState(0, SamplerState.MagFilter, TextureFilter.Point);
+				device.SetSamplerState(0, SamplerState.MinFilter, TextureFilter.Point);
+				device.SetSamplerState(0, SamplerState.MipFilter, TextureFilter.Point);
+				device.SetSamplerState(0, SamplerState.MipMapLodBias, 0f);
+			}
+			
+			// Texture addressing
+			device.SetSamplerState(0, SamplerState.AddressU, TextureAddress.Wrap);
+			device.SetSamplerState(0, SamplerState.AddressV, TextureAddress.Wrap);
+			device.SetSamplerState(0, SamplerState.AddressW, TextureAddress.Wrap);
+
+			// First texture stage
+			device.SetTextureStageState(0, TextureStage.ColorOperation, TextureOperation.Modulate);
+			device.SetTextureStageState(0, TextureStage.ColorArg1, TextureArgument.Texture);
+			device.SetTextureStageState(0, TextureStage.ColorArg2, TextureArgument.Diffuse);
+			device.SetTextureStageState(0, TextureStage.ResultArg, TextureArgument.Current);
+			device.SetTextureStageState(0, TextureStage.TexCoordIndex, 0);
+
+			// Second texture stage
+			device.SetTextureStageState(1, TextureStage.ColorOperation, TextureOperation.Modulate);
+			device.SetTextureStageState(1, TextureStage.ColorArg1, TextureArgument.Current);
+			device.SetTextureStageState(1, TextureStage.ColorArg2, TextureArgument.TFactor);
+			device.SetTextureStageState(1, TextureStage.ResultArg, TextureArgument.Current);
+			device.SetTextureStageState(1, TextureStage.TexCoordIndex, 0);
+
+			// No more further stages
+			device.SetTextureStageState(2, TextureStage.ColorOperation, TextureOperation.Disable);
+			
+			// First alpha stage
+			device.SetTextureStageState(0, TextureStage.AlphaOperation, TextureOperation.Modulate);
+			device.SetTextureStageState(0, TextureStage.AlphaArg1, TextureArgument.Texture);
+			device.SetTextureStageState(0, TextureStage.AlphaArg2, TextureArgument.Diffuse);
+
+			// Second alpha stage
+			device.SetTextureStageState(1, TextureStage.AlphaOperation, TextureOperation.Modulate);
+			device.SetTextureStageState(1, TextureStage.AlphaArg1, TextureArgument.Current);
+			device.SetTextureStageState(1, TextureStage.AlphaArg2, TextureArgument.TFactor);
+			
+			// No more further stages
+			device.SetTextureStageState(2, TextureStage.AlphaOperation, TextureOperation.Disable);
+			
+			// Setup material
+			Material material = new Material();
+			material.Ambient = new Color4(Color.White);
+			material.Diffuse = new Color4(Color.White);
+			material.Specular = new Color4(Color.White);
+			device.Material = material;
+			
+			// Shader settings
+			shaders.World3D.SetConstants(General.Settings.VisualBilinear, true, General.Settings.FilterAnisotropy);
+			
+			// Texture filters
+			postfilter = Filter.Point;
+			mipgeneratefilter = Filter.Box;
+			
+			// Initialize presentations
+			Presentation.Initialize();
+		}
+
+		#endregion
+
+		#region ================== Initialization
+		
+		// This starts up Direct3D
+		public static void Startup()
+		{
+			d3d = new Direct3D();
+		}
+		
+		// This terminates Direct3D
+		public static void Terminate()
+		{
+			if(d3d != null)
+			{
+				d3d.Dispose();
+				d3d = null;
+			}
+		}
+		
+		// This initializes the graphics
+		public bool Initialize()
+		{
+			// Use default adapter
+			this.adapter = 0; // Manager.Adapters.Default.Adapter;
+
+			try
+			{
+				// Make present parameters
+				PresentParameters displaypp = CreatePresentParameters(adapter);
+
+				// Determine device type for compatability with NVPerfHUD
+				DeviceType devtype;
+				if(d3d.Adapters[adapter].Details.Description.EndsWith(NVPERFHUD_ADAPTER))
+					devtype = DeviceType.Reference;
+				else
+					devtype = DeviceType.Hardware;
+
+				// Get the device capabilities
+				devicecaps = d3d.GetDeviceCaps(adapter, devtype);
+
+				// Check if this adapter supports TnL
+				if((devicecaps.DeviceCaps & DeviceCaps.HWTransformAndLight) != 0)
+				{
+					// Initialize with hardware TnL
+					device = new Device(d3d, adapter, devtype, rendertarget.Handle,
+								CreateFlags.HardwareVertexProcessing, displaypp);
+				}
+				else
+				{
+					// Initialize with software TnL
+					device = new Device(d3d, adapter, devtype, rendertarget.Handle,
+								CreateFlags.SoftwareVertexProcessing, displaypp);
+				}
+			}
+			catch(Exception)
+			{
+				// Failed
+				MessageBox.Show(General.MainWindow, "Unable to initialize the Direct3D video device. Another application may have taken exclusive mode on this video device or the device does not support Direct3D at all.", Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Error);
+				return false;
+			}
+
+			// Add event to cancel resize event
+			//device.DeviceResizing += new CancelEventHandler(CancelResize);
+
+			// Keep a reference to the original buffers
+			backbuffer = device.GetBackBuffer(0, 0);
+			depthbuffer = device.DepthStencilSurface;
+
+			// Get the viewport
+			viewport = device.Viewport;
+
+			// Create shader manager
+			shaders = new ShaderManager(this);
+			
+			// Font
+			postfilter = Filter.Box;		// Only for the font. This will be reset in SetupSettings (see below)
+			font = new TextFont();
+			fonttexture = new ResourceImage("CodeImp.DoomBuilder.Resources.Font.png");
+			fonttexture.LoadImage();
+			fonttexture.MipMapLevels = 2;
+			fonttexture.CreateTexture();
+			
+			// Initialize settings
+			SetupSettings();
+			
+			// Done
+			return true;
+		}
+
+		// This is to disable the automatic resize reset
+		/*private static void CancelResize(object sender, CancelEventArgs e)
+		{
+			// Cancel resize event
+			e.Cancel = true;
+		}*/
+		
+		// This creates present parameters
+		private PresentParameters CreatePresentParameters(int adapter)
+		{
+			PresentParameters displaypp = new PresentParameters();
+
+			// Get current display mode
+			DisplayMode currentmode = d3d.Adapters[adapter].CurrentDisplayMode;
+
+			// Make present parameters
+			displaypp.Windowed = true;
+			displaypp.SwapEffect = SwapEffect.Discard;
+			displaypp.BackBufferCount = 1;
+			displaypp.BackBufferFormat = currentmode.Format;
+			displaypp.BackBufferWidth = rendertarget.ClientSize.Width;
+			displaypp.BackBufferHeight = rendertarget.ClientSize.Height;
+			displaypp.EnableAutoDepthStencil = true;
+			displaypp.AutoDepthStencilFormat = Format.D16;
+			displaypp.Multisample = MultisampleType.None;
+			displaypp.PresentationInterval = PresentInterval.Immediate;
+
+			// Return result
+			return displaypp;
+		}
+		
+		#endregion
+
+		#region ================== Resetting
+
+		// This registers a resource
+		internal void RegisterResource(ID3DResource res)
+		{
+			// Add resource
+			resources.Add(res, res);
+		}
+
+		// This unregisters a resource
+		internal void UnregisterResource(ID3DResource res)
+		{
+			// Remove resource
+			resources.Remove(res);
+		}
+		
+		// This resets the device and returns true on success
+		internal bool Reset()
+		{
+			// Unload all Direct3D resources
+			foreach(ID3DResource res in resources.Values) res.UnloadResource();
+
+			// Lose backbuffers
+			if(backbuffer != null) backbuffer.Dispose();
+			if(depthbuffer != null) depthbuffer.Dispose();
+			backbuffer = null;
+			depthbuffer = null;
+
+			try
+			{
+				// Make present parameters
+				PresentParameters displaypp = CreatePresentParameters(adapter);
+				
+				// Reset the device
+				device.Reset(displaypp);
+			}
+#if DEBUG
+			catch(Exception e)
+			{
+				// Failed to re-initialize
+				Console.WriteLine("Device reset failed: " + e.Message);
+				return false;
+			}
+#else
+			catch(Exception) 
+			{
+				// Failed to re-initialize
+				return false;
+			}
+#endif
+
+			// Keep a reference to the original buffers
+			backbuffer = device.GetBackBuffer(0, 0);
+			depthbuffer = device.DepthStencilSurface;
+
+			// Get the viewport
+			viewport = device.Viewport;
+
+			// Reload all Direct3D resources
+			foreach(ID3DResource res in resources.Values) res.ReloadResource();
+
+			// Re-apply settings
+			SetupSettings();
+			
+			// Success
+			return true;
+		}
+
+		#endregion
+		
+		#region ================== Rendering
+
+		// This begins a drawing session
+		public bool StartRendering(bool clear, Color4 backcolor, Surface target, Surface depthbuffer)
+		{
+			// Check if we can render
+			if(CheckAvailability() && !isrendering) //mxd. Added isrendering check
+			{
+				// Set rendertarget
+				device.DepthStencilSurface = depthbuffer;
+				device.SetRenderTarget(0, target);
+				
+				// Clear the screen
+				if(clear)
+				{
+					if(depthbuffer != null)
+						device.Clear(ClearFlags.Target | ClearFlags.ZBuffer, backcolor, 1f, 0);
+					else
+						device.Clear(ClearFlags.Target, backcolor, 1f, 0);
+				}
+
+				// Ready to render
+				device.BeginScene();
+				isrendering = true; //mxd
+				return true;
+			}
+			else
+			{
+				// Minimized, you cannot see anything
+				isrendering = false; //mxd
+				return false;
+			}
+		}
+
+		// This clears a target
+		public void ClearRendertarget(Color4 backcolor, Surface target, Surface depthbuffer)
+		{
+			// Set rendertarget
+			device.DepthStencilSurface = depthbuffer;
+			device.SetRenderTarget(0, target);
+
+			if(depthbuffer != null)
+				device.Clear(ClearFlags.Target | ClearFlags.ZBuffer, backcolor, 1f, 0);
+			else
+				device.Clear(ClearFlags.Target, backcolor, 1f, 0);
+		}
+
+		// This ends a drawing session
+		public void FinishRendering()
+		{
+			try
+			{
+				// Done
+				device.EndScene();
+				isrendering = false; //mxd
+			}
+			// Errors are not a problem here
+			catch(Exception) { }
+		}
+
+		// This presents what has been drawn
+		public void Present()
+		{
+			try
+			{
+				device.Present();
+				isrendering = false; //mxd
+			}
+			// Errors are not a problem here
+			catch(Exception) { }
+		}
+		
+		// This checks if we can use the hardware at this moment
+		public bool CheckAvailability()
+		{
+			// When minimized, the hardware is not available
+			if(General.MainWindow.WindowState != FormWindowState.Minimized)
+			{
+				// Test the cooperative level
+				Result coopresult = device.TestCooperativeLevel();
+
+				// Check if device must be reset
+				if(!coopresult.IsSuccess)
+				{
+					// Should we reset?
+					if(coopresult.Name == "D3DERR_DEVICENOTRESET")
+					{
+						// Device is lost and must be reset now
+						Reset();
+					}
+
+					// Impossible to render at this point
+					return false;
+				}
+				else
+				{
+					// Ready to go!
+					return true;
+				}
+			}
+			else
+			{
+				// Minimized
+				return false;
+			}
+		}
+		
+		#endregion
+
+		#region ================== Tools
+
+		// Make a color from ARGB
+		public static int ARGB(float a, float r, float g, float b)
+		{
+			return Color.FromArgb((int)(a * 255f), (int)(r * 255f), (int)(g * 255f), (int)(b * 255f)).ToArgb();
+		}
+
+		// Make a color from RGB
+		public static int RGB(int r, int g, int b)
+		{
+			return Color.FromArgb(255, r, g, b).ToArgb();
+		}
+
+		// This makes a Vector3 from Vector3D
+		public static Vector3 V3(Vector3D v3d)
+		{
+			return new Vector3(v3d.x, v3d.y, v3d.z);
+		}
+
+		// This makes a Vector3D from Vector3
+		public static Vector3D V3D(Vector3 v3)
+		{
+			return new Vector3D(v3.X, v3.Y, v3.Z);
+		}
+
+		// This makes a Vector2 from Vector2D
+		public static Vector2 V2(Vector2D v2d)
+		{
+			return new Vector2(v2d.x, v2d.y);
+		}
+
+		// This makes a Vector2D from Vector2
+		public static Vector2D V2D(Vector2 v2)
+		{
+			return new Vector2D(v2.X, v2.Y);
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Rendering/D3DShader.cs b/Source/Core/Rendering/D3DShader.cs
new file mode 100644
index 0000000..2e5a465
--- /dev/null
+++ b/Source/Core/Rendering/D3DShader.cs
@@ -0,0 +1,181 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.IO;
+using SlimDX.Direct3D9;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Rendering
+{
+	internal abstract class D3DShader
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		// The manager
+		protected ShaderManager manager;
+		
+		// The effect
+		protected Effect effect;
+
+		// The vertex declaration
+		protected VertexDeclaration vertexdecl;
+		
+		// Disposing
+		protected bool isdisposed;
+
+		//mxd. Settings changes
+		protected bool settingschanged;
+
+		#endregion
+
+		#region ================== Properties
+
+		// Disposing
+		public bool IsDisposed { get { return isdisposed; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		protected D3DShader(ShaderManager manager)
+		{
+			// Initialize
+			this.manager = manager;
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Disposer
+		public virtual void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Clean up
+				manager = null;
+				if(effect != null) effect.Dispose();
+				vertexdecl.Dispose();
+				
+				// Done
+				isdisposed = true;
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This loads an effect
+		protected Effect LoadEffect(string fxfile)
+		{
+			// Return null when not using shaders
+			if(!manager.Enabled) return null;
+
+			Effect fx;
+			string errors = string.Empty;
+			
+			// Load the resource
+			Stream fxdata = General.ThisAssembly.GetManifestResourceStream("CodeImp.DoomBuilder.Resources." + fxfile);
+			fxdata.Seek(0, SeekOrigin.Begin);
+			
+			try
+			{
+				// Compile effect
+				fx = Effect.FromStream(General.Map.Graphics.Device, fxdata, null, null, null, ShaderFlags.None, null, out errors);
+				if(!string.IsNullOrEmpty(errors))
+				{
+					throw new Exception("Errors in effect file " + fxfile + ": " + errors);
+				}
+			}
+			catch(Exception)
+			{
+				// Compiling failed, try with debug information
+				try
+				{
+					// Compile effect
+					fx = Effect.FromStream(General.Map.Graphics.Device, fxdata, null, null, null, ShaderFlags.Debug, null, out errors);
+					if(!string.IsNullOrEmpty(errors))
+					{
+						throw new Exception("Errors in effect file " + fxfile + ": " + errors);
+					}
+				}
+				catch(Exception e)
+				{
+					// No debug information, just crash
+					throw new Exception(e.GetType().Name + " while loading effect " + fxfile + ": " + e.Message + "\nInitial message: " + errors);
+				}
+			}
+			
+			fxdata.Dispose();
+			
+			// Set the technique to use
+			fx.Technique = manager.ShaderTechnique;
+
+			// Return result
+			return fx;
+		}
+
+		// This applies the shader
+		public void Begin()
+		{
+			// Set vertex declaration
+			General.Map.Graphics.Device.VertexDeclaration = vertexdecl;
+
+			// Set effect
+			if(manager.Enabled) effect.Begin(FX.DoNotSaveState);
+		}
+
+		// This begins a pass
+		public virtual void BeginPass(int index)
+		{
+			if(manager.Enabled) effect.BeginPass(index);
+		}
+
+		// This ends a pass
+		public void EndPass()
+		{
+			if(manager.Enabled) effect.EndPass();
+		}
+		
+		// This ends te shader
+		public void End()
+		{
+			if(manager.Enabled) effect.End();
+		}
+
+		// This applies properties during a pass
+		public void ApplySettings()
+		{
+			if(manager.Enabled && settingschanged)
+			{
+				effect.CommitChanges();
+				settingschanged = false; //mxd
+			}
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Rendering/Display2DShader.cs b/Source/Core/Rendering/Display2DShader.cs
new file mode 100644
index 0000000..908c6bd
--- /dev/null
+++ b/Source/Core/Rendering/Display2DShader.cs
@@ -0,0 +1,177 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using SlimDX.Direct3D9;
+using SlimDX;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Rendering
+{
+	internal sealed class Display2DShader : D3DShader
+	{
+		#region ================== Variables
+
+		// Property handlers
+		private readonly EffectHandle texture1;
+		private readonly EffectHandle rendersettings;
+		private readonly EffectHandle transformsettings;
+		private readonly EffectHandle filtersettings;
+		
+		#endregion
+
+		#region ================== Properties
+
+		public Texture Texture1 { set { if(manager.Enabled) effect.SetTexture(texture1, value); settingschanged = true; } }
+		
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public Display2DShader(ShaderManager manager) : base(manager)
+		{
+			// Load effect from file
+			effect = LoadEffect("display2d.fx");
+
+			// Get the property handlers from effect
+			if(effect != null)
+			{
+				texture1 = effect.GetParameter(null, "texture1");
+				rendersettings = effect.GetParameter(null, "rendersettings");
+				transformsettings = effect.GetParameter(null, "transformsettings");
+				filtersettings = effect.GetParameter(null, "filtersettings");
+			}
+			
+			// Initialize world vertex declaration
+			VertexElement[] elements = new[]
+			{
+				new VertexElement(0, 0, DeclarationType.Float3, DeclarationMethod.Default, DeclarationUsage.Position, 0),
+				new VertexElement(0, 12, DeclarationType.Color, DeclarationMethod.Default, DeclarationUsage.Color, 0),
+				new VertexElement(0, 16, DeclarationType.Float2, DeclarationMethod.Default, DeclarationUsage.TextureCoordinate, 0),
+				VertexElement.VertexDeclarationEnd
+			};
+			vertexdecl = new VertexDeclaration(General.Map.Graphics.Device, elements);
+
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Disposer
+		public override void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Clean up
+				if(texture1 != null) texture1.Dispose();
+				if(rendersettings != null) rendersettings.Dispose();
+				if(transformsettings != null) transformsettings.Dispose();
+				if(filtersettings != null) filtersettings.Dispose();
+				
+				// Done
+				base.Dispose();
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This sets the settings
+		public void SetSettings(float texelx, float texely, float fsaafactor, float alpha, bool bilinear)
+		{
+			if(manager.Enabled)
+			{
+				Vector4 values = new Vector4(texelx, texely, fsaafactor, alpha);
+				effect.SetValue(rendersettings, values);
+				Matrix world = manager.D3DDevice.Device.GetTransform(TransformState.World);
+				Matrix view = manager.D3DDevice.Device.GetTransform(TransformState.View);
+				effect.SetValue(transformsettings, world * view);
+				TextureFilter filter = (bilinear ? TextureFilter.Linear : TextureFilter.Point);
+				effect.SetValue(filtersettings, (int)filter);
+				settingschanged = true; //mxd
+			}
+		}
+
+		// This sets up the render pipeline
+		public override void BeginPass(int index)
+		{
+			Device device = manager.D3DDevice.Device;
+
+			if(!manager.Enabled)
+			{
+				// Sampler settings
+				if(General.Settings.ClassicBilinear)
+				{
+					device.SetSamplerState(0, SamplerState.MagFilter, TextureFilter.Linear);
+					device.SetSamplerState(0, SamplerState.MinFilter, TextureFilter.Linear);
+					device.SetSamplerState(0, SamplerState.MipFilter, TextureFilter.Linear);
+					device.SetSamplerState(0, SamplerState.MipMapLodBias, 0f);
+				}
+				else
+				{
+					device.SetSamplerState(0, SamplerState.MagFilter, TextureFilter.Point);
+					device.SetSamplerState(0, SamplerState.MinFilter, TextureFilter.Point);
+					device.SetSamplerState(0, SamplerState.MipFilter, TextureFilter.Point);
+					device.SetSamplerState(0, SamplerState.MipMapLodBias, 0f);
+				}
+
+				// Texture addressing
+				device.SetSamplerState(0, SamplerState.AddressU, TextureAddress.Wrap);
+				device.SetSamplerState(0, SamplerState.AddressV, TextureAddress.Wrap);
+				device.SetSamplerState(0, SamplerState.AddressW, TextureAddress.Wrap);
+
+				// First texture stage
+				device.SetTextureStageState(0, TextureStage.ColorOperation, TextureOperation.Modulate);
+				device.SetTextureStageState(0, TextureStage.ColorArg1, TextureArgument.Texture);
+				device.SetTextureStageState(0, TextureStage.ColorArg2, TextureArgument.Diffuse);
+				device.SetTextureStageState(0, TextureStage.ResultArg, TextureArgument.Current);
+				device.SetTextureStageState(0, TextureStage.TexCoordIndex, 0);
+
+				// Second texture stage
+				device.SetTextureStageState(1, TextureStage.ColorOperation, TextureOperation.Modulate);
+				device.SetTextureStageState(1, TextureStage.ColorArg1, TextureArgument.Current);
+				device.SetTextureStageState(1, TextureStage.ColorArg2, TextureArgument.TFactor);
+				device.SetTextureStageState(1, TextureStage.ResultArg, TextureArgument.Current);
+				device.SetTextureStageState(1, TextureStage.TexCoordIndex, 0);
+
+				// No more further stages
+				device.SetTextureStageState(2, TextureStage.ColorOperation, TextureOperation.Disable);
+
+				// First alpha stage
+				device.SetTextureStageState(0, TextureStage.AlphaOperation, TextureOperation.Modulate);
+				device.SetTextureStageState(0, TextureStage.AlphaArg1, TextureArgument.Texture);
+				device.SetTextureStageState(0, TextureStage.AlphaArg2, TextureArgument.Diffuse);
+
+				// Second alpha stage
+				device.SetTextureStageState(1, TextureStage.AlphaOperation, TextureOperation.Modulate);
+				device.SetTextureStageState(1, TextureStage.AlphaArg1, TextureArgument.Current);
+				device.SetTextureStageState(1, TextureStage.AlphaArg2, TextureArgument.TFactor);
+
+				// No more further stages
+				device.SetTextureStageState(2, TextureStage.AlphaOperation, TextureOperation.Disable);
+			}
+
+			base.BeginPass(index);
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Rendering/FlatQuad.cs b/Source/Core/Rendering/FlatQuad.cs
new file mode 100644
index 0000000..d44b3f4
--- /dev/null
+++ b/Source/Core/Rendering/FlatQuad.cs
@@ -0,0 +1,267 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Drawing;
+using SlimDX.Direct3D9;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Rendering
+{
+	// FlatQuad
+	internal class FlatQuad
+	{
+		#region ================== Variables
+
+		// Vertices
+		private FlatVertex[] vertices;
+		private PrimitiveType type;
+		private int numvertices;
+		
+		#endregion
+
+		#region ================== Properties
+
+		public FlatVertex[] Vertices { get { return vertices; } }
+		public PrimitiveType Type { get { return type; } }
+		
+		#endregion
+
+		#region ================== Constructors
+
+		// Constructor
+		public FlatQuad(PrimitiveType type, float left, float top, float right, float bottom)
+		{
+			// Initialize
+			Initialize(type);
+			
+			// Set coordinates
+			switch(type)
+			{
+				case PrimitiveType.TriangleList:
+					SetTriangleListCoordinates(left, top, right, bottom, 0f, 0f, 1f, 1f);
+					break;
+				case PrimitiveType.TriangleStrip:
+					SetTriangleStripCoordinates(left, top, right, bottom, 0f, 0f, 1f, 1f);
+					break;
+			}
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Constructor
+		public FlatQuad(PrimitiveType type, float left, float top, float right, float bottom, float twidth, float theight)
+		{
+			// Initialize
+			Initialize(type);
+
+			// Determine texture size dividers
+			float twd = 1f / twidth;
+			float thd = 1f / theight;
+			
+			// Set coordinates
+			switch(type)
+			{
+				case PrimitiveType.TriangleList:
+					SetTriangleListCoordinates(left, top, right, bottom, twd, thd, 1f - twd, 1f - thd);
+					break;
+				case PrimitiveType.TriangleStrip:
+					SetTriangleStripCoordinates(left, top, right, bottom, twd, thd, 1f - twd, 1f - thd);
+					break;
+			}
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Constructor
+		public FlatQuad(PrimitiveType type, RectangleF pos, float tl, float tt, float tr, float tb)
+		{
+			// Initialize
+			Initialize(type);
+
+			// Set coordinates
+			switch(type)
+			{
+				case PrimitiveType.TriangleList:
+					SetTriangleListCoordinates(pos.Left, pos.Top, pos.Right, pos.Bottom, tl, tt, tr, tb);
+					break;
+				case PrimitiveType.TriangleStrip:
+					SetTriangleStripCoordinates(pos.Left, pos.Top, pos.Right, pos.Bottom, tl, tt, tr, tb);
+					break;
+			}
+
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Constructor
+		public FlatQuad(PrimitiveType type, float left, float top, float right, float bottom, float tl, float tt, float tr, float tb)
+		{
+			// Initialize
+			Initialize(type);
+			
+			// Set coordinates
+			switch(type)
+			{
+				case PrimitiveType.TriangleList:
+					SetTriangleListCoordinates(left, top, right, bottom, tl, tt, tr, tb);
+					break;
+				case PrimitiveType.TriangleStrip:
+					SetTriangleStripCoordinates(left, top, right, bottom, tl, tt, tr, tb);
+					break;
+			}
+
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This sets the color on all vertices
+		public void SetColors(int color)
+		{
+			// Go for all vertices to set the color
+			for(int i = 0; i < numvertices; i++)
+				vertices[i].c = color;
+		}
+
+		// This sets the color on all vertices
+		public void SetColors(int clt, int crt, int clb, int crb)
+		{
+			// Determine polygon type
+			switch(type)
+			{
+				case PrimitiveType.TriangleList:
+					vertices[0].c = clt;
+					vertices[1].c = crt;
+					vertices[2].c = clb;
+					vertices[3].c = clb;
+					vertices[4].c = crt;
+					vertices[5].c = crb;
+					break;
+				case PrimitiveType.TriangleStrip:
+					vertices[0].c = clt;
+					vertices[1].c = crt;
+					vertices[2].c = clb;
+					vertices[3].c = crb;
+					break;
+			}
+		}
+
+		// This applies coordinates for TriangleList type
+		private void SetTriangleListCoordinates(float vl, float vt, float vr, float vb,
+												float tl, float tt, float tr, float tb)
+		{
+			// Setup coordinates
+			vertices[0].x = vl;
+			vertices[0].y = vt;
+			vertices[1].x = vr;
+			vertices[1].y = vt;
+			vertices[2].x = vl;
+			vertices[2].y = vb;
+			vertices[3].x = vl;
+			vertices[3].y = vb;
+			vertices[4].x = vr;
+			vertices[4].y = vt;
+			vertices[5].x = vr;
+			vertices[5].y = vb;
+			
+			// Set texture coordinates
+			vertices[0].u = tl;
+			vertices[0].v = tt;
+			vertices[1].u = tr;
+			vertices[1].v = tt;
+			vertices[2].u = tl;
+			vertices[2].v = tb;
+			vertices[3].u = tl;
+			vertices[3].v = tb;
+			vertices[4].u = tr;
+			vertices[4].v = tt;
+			vertices[5].u = tr;
+			vertices[5].v = tb;
+		}
+
+		// This applies coordinates for TriangleStrip type
+		private void SetTriangleStripCoordinates(float vl, float vt, float vr, float vb,
+												 float tl, float tt, float tr, float tb)
+		{
+			// Setup coordinates
+			vertices[0].x = vl;
+			vertices[0].y = vt;
+			vertices[1].x = vr;
+			vertices[1].y = vt;
+			vertices[2].x = vl;
+			vertices[2].y = vb;
+			vertices[3].x = vr;
+			vertices[3].y = vb;
+
+			// Set texture coordinates
+			vertices[0].u = tl;
+			vertices[0].v = tt;
+			vertices[1].u = tr;
+			vertices[1].v = tt;
+			vertices[2].u = tl;
+			vertices[2].v = tb;
+			vertices[3].u = tr;
+			vertices[3].v = tb;
+		}
+		
+		// This initializes vertices to default values
+		private void Initialize(PrimitiveType type)
+		{
+			// Determine primitive type
+			this.type = type;
+
+			// Determine number of vertices
+			switch(type)
+			{
+				case PrimitiveType.TriangleList: numvertices = 6; break;
+				case PrimitiveType.TriangleStrip: numvertices = 4; break;
+				default: throw new NotSupportedException("Unsupported PrimitiveType");
+			}
+			
+			// Make the array
+			vertices = new FlatVertex[numvertices];
+
+			// Go for all vertices
+			for(int i = 0; i < numvertices; i++)
+			{
+				// Initialize to defaults
+				vertices[i].c = -1;
+			}
+		}
+
+		#endregion
+		
+		#region ================== Rendering
+
+		// This renders the quad
+		public void Render(D3DDevice device)
+		{
+			// Render the quad
+			device.Device.DrawUserPrimitives(type, 0, 2, vertices);
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Rendering/FlatVertex.cs b/Source/Core/Rendering/FlatVertex.cs
new file mode 100644
index 0000000..7ff6044
--- /dev/null
+++ b/Source/Core/Rendering/FlatVertex.cs
@@ -0,0 +1,37 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Rendering
+{
+	// FlatVertex
+	public struct FlatVertex
+	{
+		// Vertex format
+		public const int Stride = 24; //6 * 4
+
+		// Members
+		public float x;
+		public float y;
+		public float z;
+		public int c;
+		public float u;
+		public float v;
+	}
+}
diff --git a/Source/Core/Rendering/ID3DResource.cs b/Source/Core/Rendering/ID3DResource.cs
new file mode 100644
index 0000000..4d7f085
--- /dev/null
+++ b/Source/Core/Rendering/ID3DResource.cs
@@ -0,0 +1,31 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Rendering
+{
+	internal interface ID3DResource
+	{
+		// This is used to unload the resouce
+		void UnloadResource();
+		
+		// This is used to reload the resource
+		void ReloadResource();
+	}
+}
diff --git a/Source/Core/Rendering/IRenderer2D.cs b/Source/Core/Rendering/IRenderer2D.cs
new file mode 100644
index 0000000..ba4bf08
--- /dev/null
+++ b/Source/Core/Rendering/IRenderer2D.cs
@@ -0,0 +1,81 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using System.Drawing;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Data;
+using CodeImp.DoomBuilder.GZBuilder.Geometry;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Rendering
+{
+	public interface IRenderer2D
+	{
+		// Properties
+		float OffsetX { get; }
+		float OffsetY { get; }
+		float TranslateX { get; }
+		float TranslateY { get; }
+		float Scale { get; }
+		int VertexSize { get; }
+		ViewMode ViewMode { get; }
+
+		// View methods
+		Vector2D DisplayToMap(Vector2D mousepos);
+		Vector2D MapToDisplay(Vector2D mappos);
+		
+		// Color methods
+		PixelColor DetermineLinedefColor(Linedef l);
+		PixelColor DetermineThingColor(Thing t);
+		int DetermineVertexColor(Vertex v);
+		int CalculateBrightness(int level);
+		void UpdateExtraFloorFlag(); //mxd
+		
+		// Rendering management methods
+		bool StartPlotter(bool clear);
+		bool StartThings(bool clear);
+		bool StartOverlay(bool clear);
+		void Finish();
+		void SetPresentation(Presentation present);
+		void Present();
+
+		// Drawing methods
+		void PlotLine(Vector2D start, Vector2D end, PixelColor c);
+		void PlotLinedef(Linedef l, PixelColor c);
+		void PlotLinedefSet(ICollection<Linedef> linedefs);
+		void PlotSector(Sector s);
+		void PlotSector(Sector s, PixelColor c);
+		void PlotVertex(Vertex v, int colorindex);
+		void PlotVertexAt(Vector2D v, int colorindex);
+		void PlotVerticesSet(ICollection<Vertex> vertices);
+		void RenderThing(Thing t, PixelColor c, float alpha);
+		void RenderThingSet(ICollection<Thing> things, float alpha);
+		void RenderRectangle(RectangleF rect, float bordersize, PixelColor c, bool transformrect);
+		void RenderRectangleFilled(RectangleF rect, PixelColor c, bool transformrect);
+		void RenderRectangleFilled(RectangleF rect, PixelColor c, bool transformrect, ImageData texture);
+		void RenderLine(Vector2D start, Vector2D end, float thickness, PixelColor c, bool transformcoords);
+		void RenderArrows(ICollection<Line3D> line); //mxd
+		void RenderText(TextLabel text);
+		void RenderGeometry(FlatVertex[] vertices, ImageData texture, bool transformcoords);
+		void RenderHighlight(FlatVertex[] vertices, int color); //mxd
+		void RedrawSurface();
+	}
+}
diff --git a/Source/Core/Rendering/IRenderer3D.cs b/Source/Core/Rendering/IRenderer3D.cs
new file mode 100644
index 0000000..2165ae9
--- /dev/null
+++ b/Source/Core/Rendering/IRenderer3D.cs
@@ -0,0 +1,59 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.GZBuilder.Geometry;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.VisualModes;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Rendering
+{
+	public interface IRenderer3D
+	{
+		// Properties
+		ProjectedFrustum2D Frustum2D { get; }
+		bool DrawThingCages { get; set; }
+		bool ShowSelection { get; set; }
+		bool ShowHighlight { get; set; }
+		
+		// General methods
+		void PositionAndLookAt(Vector3D pos, Vector3D lookat);
+		
+		// Presenting methods
+		void Finish();
+		bool Start();
+		void StartGeometry();
+		void FinishGeometry();
+
+		// Rendering methods
+		int CalculateBrightness(int level);
+		int CalculateBrightness(int level, Sidedef sd); //mxd
+
+		void SetHighlightedObject(IVisualPickable obj);
+		void AddSectorGeometry(VisualGeometry g);
+		void AddThingGeometry(VisualThing t);
+		void SetVisualVertices(List<VisualVertex> verts);
+		void SetEventLines(List<Line3D> lines);
+		void RenderCrosshair();
+		void SetFogMode(bool usefog);
+		void SetCrosshairBusy(bool busy);
+	}
+}
diff --git a/Source/Core/Rendering/PixelColor.cs b/Source/Core/Rendering/PixelColor.cs
new file mode 100644
index 0000000..a94b303
--- /dev/null
+++ b/Source/Core/Rendering/PixelColor.cs
@@ -0,0 +1,214 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Drawing;
+using SlimDX;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Rendering
+{
+	public struct PixelColor
+	{
+		#region ================== Constants
+		
+		public const float BYTE_TO_FLOAT = 0.00392156862745098f;
+
+		//mxd. Some color constants, full alpha
+		public const int INT_BLACK = -16777216;
+		public const int INT_WHITE = -1;
+		
+		#endregion
+
+		#region ================== Statics
+
+		public static readonly PixelColor Transparent = new PixelColor(0, 0, 0, 0);
+		
+		#endregion
+
+		#region ================== Variables
+
+		// Members
+		public byte b;
+		public byte g;
+		public byte r;
+		public byte a;
+
+		#endregion
+
+		#region ================== Constructors
+
+		// Constructor
+		public PixelColor(byte a, byte r, byte g, byte b)
+		{
+			// Initialize
+			this.a = a;
+			this.r = r;
+			this.g = g;
+			this.b = b;
+		}
+
+		// Constructor
+		public PixelColor(PixelColor p, byte a)
+		{
+			// Initialize
+			this.a = a;
+			this.r = p.r;
+			this.g = p.g;
+			this.b = p.b;
+		}
+
+		#endregion
+
+		#region ================== Methods
+		
+		// Construct from color
+		public static PixelColor FromColor(Color c)
+		{
+			return new PixelColor(c.A, c.R, c.G, c.B);
+		}
+		
+		// Construct from int
+		public static PixelColor FromInt(int c)
+		{
+			return FromColor(Color.FromArgb(c));
+		}
+		
+		// Return the inverse color
+		public PixelColor Inverse()
+		{
+			return new PixelColor((byte)(255 - a), (byte)(255 - r), (byte)(255 - g), (byte)(255 - b));
+		}
+		
+		// Return the inverse color, but keep same alpha
+		public PixelColor InverseKeepAlpha()
+		{
+			return new PixelColor(a, (byte)(255 - r), (byte)(255 - g), (byte)(255 - b));
+		}
+		
+		// To int
+		public int ToInt()
+		{
+			return Color.FromArgb(a, r, g, b).ToArgb();
+		}
+
+		// To Color
+		public Color ToColor()
+		{
+			return Color.FromArgb(a, r, g, b);
+		}
+
+		//To ColorRef (alpha-less). mxd. Changed function name to more descriptive one...
+		public int ToInversedColorRef()
+		{
+			return (r + (b << 16) + (g << 8));
+		}
+		
+		// To ColorValue
+		public Color4 ToColorValue()
+		{
+			return new Color4(a * BYTE_TO_FLOAT,
+							  r * BYTE_TO_FLOAT,
+							  g * BYTE_TO_FLOAT,
+							  b * BYTE_TO_FLOAT);
+		}
+
+		// To ColorValue
+		public Color4 ToColorValue(float withalpha)
+		{
+			return new Color4(withalpha,
+							  r * BYTE_TO_FLOAT,
+							  g * BYTE_TO_FLOAT,
+							  b * BYTE_TO_FLOAT);
+		}
+		
+		// This returns a new PixelColor with adjusted alpha
+		public PixelColor WithAlpha(byte a)
+		{
+			return new PixelColor(this, a);
+		}
+		
+		// This blends two colors with respect to alpha
+		public PixelColor Blend(PixelColor a, PixelColor b)
+		{
+			PixelColor c = new PixelColor();
+
+			float ba = a.a * BYTE_TO_FLOAT;
+			c.r = (byte)(a.r * (1f - ba) + b.r * ba);
+			c.g = (byte)(a.g * (1f - ba) + b.g * ba);
+			c.b = (byte)(a.b * (1f - ba) + b.b * ba);
+			c.a = (byte)(a.a * (1f - ba) + ba);
+			
+			return c;
+		}
+
+		//mxd. This adds two colors
+		public static PixelColor Add(PixelColor a, PixelColor b)
+		{
+			return new PixelColor
+			{
+				a = (byte)(Math.Min(a.a + b.a, 255)), 
+				r = (byte)(Math.Min(a.r + b.r, 255)), 
+				g = (byte)(Math.Min(a.g + b.g, 255)), 
+				b = (byte)(Math.Min(a.b + b.b, 255))
+			};
+		}
+
+		//mxd. This subtracts two colors
+		public static PixelColor Subtract(PixelColor a, PixelColor b)
+		{
+			return new PixelColor
+			{
+				a = (byte)(Math.Max(a.a , b.a)), // Not sure about that...
+				r = (byte)(Math.Max(a.r - b.r, 0)),
+				g = (byte)(Math.Max(a.g - b.g, 0)),
+				b = (byte)(Math.Max(a.b - b.b, 0))
+			};
+		}
+		
+		// This modulates two colors
+		public static PixelColor Modulate(PixelColor a, PixelColor b)
+		{
+			float aa = a.a * BYTE_TO_FLOAT;
+			float ar = a.r * BYTE_TO_FLOAT;
+			float ag = a.g * BYTE_TO_FLOAT;
+			float ab = a.b * BYTE_TO_FLOAT;
+			float ba = b.a * BYTE_TO_FLOAT;
+			float br = b.r * BYTE_TO_FLOAT;
+			float bg = b.g * BYTE_TO_FLOAT;
+			float bb = b.b * BYTE_TO_FLOAT;
+			
+			return new PixelColor
+			{
+				a = (byte)((aa * ba) * 255.0f), 
+				r = (byte)((ar * br) * 255.0f), 
+				g = (byte)((ag * bg) * 255.0f), 
+				b = (byte)((ab * bb) * 255.0f)
+			};
+		}
+
+		//mxd. Handy while debugging
+		public override string ToString()
+		{
+			return "[A=" + a + ", R=" + r + ", G=" + g + ", B=" + b + "]";
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Rendering/PixelColorBlock.cs b/Source/Core/Rendering/PixelColorBlock.cs
new file mode 100644
index 0000000..516174f
--- /dev/null
+++ b/Source/Core/Rendering/PixelColorBlock.cs
@@ -0,0 +1,85 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Runtime.InteropServices;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Rendering
+{
+	public unsafe class PixelColorBlock
+	{
+		#region ================== Variables
+
+		private int width;
+		private int height;
+		private int memorysize;
+		private PixelColor* memory;
+		
+		#endregion
+
+		#region ================== Properties
+
+		public int Width { get { return width; } }
+		public int Height { get { return height; } }
+		public int Length { get { return memorysize; } }
+		public PixelColor this[int index] { get { return memory[index]; } set { memory[index] = value; } }
+		public PixelColor* Pointer { get { return memory; } }
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		// Constructor
+		public PixelColorBlock(int width, int height)
+		{
+			// Check input
+			if((width <= 0) || (height <= 0)) throw new ArgumentException("Cannot allocate a memory block of zero size!");
+			
+			// Initialize
+			this.width = width;
+			this.height = height;
+			this.memorysize = width * height * sizeof(PixelColor);
+			this.memory = (PixelColor*)Marshal.AllocCoTaskMem(memorysize);
+			if(this.memory == (PixelColor*)0) throw new OutOfMemoryException();
+			GC.AddMemoryPressure(memorysize);
+		}
+
+		// Destructor
+		~PixelColorBlock()
+		{
+			// Terminate
+			Marshal.FreeCoTaskMem(new IntPtr(memory));
+			GC.RemoveMemoryPressure(memorysize);
+			memorysize = 0;
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This clears the memory black
+		public void Clear()
+		{
+			if(memorysize > 0) General.ZeroMemory(new IntPtr(memory), memorysize);
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Rendering/Plotter.cs b/Source/Core/Rendering/Plotter.cs
new file mode 100644
index 0000000..67da866
--- /dev/null
+++ b/Source/Core/Rendering/Plotter.cs
@@ -0,0 +1,357 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using CodeImp.DoomBuilder.Geometry;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Rendering
+{
+	internal unsafe sealed class Plotter
+	{
+		#region ================== Constants
+
+		private const int DASH_INTERVAL = 16; //mxd
+
+		#endregion
+
+		#region ================== Variables
+
+		// Memory
+		private PixelColor* pixels;
+		private int width;
+		private int height;
+		private int visiblewidth;
+		private int visibleheight;
+
+		#endregion
+
+		#region ================== Properties
+
+		public int VisibleWidth { get { return visiblewidth; } }
+		public int VisibleHeight { get { return visibleheight; } }
+		public int Width { get { return width; } }
+		public int Height { get { return height; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public Plotter(PixelColor* pixels, int width, int height, int visiblewidth, int visibleheight)
+		{
+			// Initialize
+			this.pixels = pixels;
+			this.width = width;
+			this.height = height;
+			this.visiblewidth = width;
+			this.visibleheight = height;
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		#endregion
+
+		#region ================== Pixel Rendering
+		
+		// This clears all pixels black
+		public void Clear()
+		{
+			// Clear memory
+			General.ZeroMemory(new IntPtr(pixels), width * height * sizeof(PixelColor));
+		}
+		
+		// This draws a pixel normally
+		public void DrawPixelSolid(int x, int y, ref PixelColor c)
+		{
+			// Draw pixel when within range
+			if((x >= 0) && (x < visiblewidth) && (y >= 0) && (y < visibleheight))
+				pixels[y * width + x] = c;
+		}
+
+		// This draws a pixel normally
+		public void DrawVertexSolid(int x, int y, int size, ref PixelColor c, ref PixelColor l, ref PixelColor d)
+		{
+			int x1 = x - size;
+			int x2 = x + size;
+			int y1 = y - size;
+			int y2 = y + size;
+
+			// Do unchecked?
+			if((x1 >= 0) && (x2 < visiblewidth) && (y1 >= 0) && (y2 < visibleheight))
+			{
+				// Filled square
+				for(int yp = y1; yp <= y2; yp++)
+					for(int xp = x1; xp <= x2; xp++)
+						pixels[yp * width + xp] = c;
+
+				// Vertical edges
+				for(int yp = y1 + 1; yp <= y2 - 1; yp++)
+				{
+					pixels[yp * width + x1] = l;
+					pixels[yp * width + x2] = d;
+				}
+
+				// Horizontal edges
+				for(int xp = x1 + 1; xp <= x2 - 1; xp++)
+				{
+					pixels[y1 * width + xp] = l;
+					pixels[y2 * width + xp] = d;
+				}
+
+				// Corners
+				pixels[y2 * width + x2] = d;
+				pixels[y1 * width + x1] = l;
+			}
+			/*
+			else
+			{
+				// Filled square
+				for(yp = y - size; yp <= y + size; yp++)
+					for(xp = x - size; xp <= x + size; xp++)
+						DrawPixelSolid(xp, yp, c);
+
+				// Vertical edges
+				for(yp = y - size + 1; yp <= y + size - 1; yp++)
+				{
+					DrawPixelSolid(x - size, yp, l);
+					DrawPixelSolid(x + size, yp, d);
+				}
+
+				// Horizontal edges
+				for(xp = x - size + 1; xp <= x + size - 1; xp++)
+				{
+					DrawPixelSolid(xp, y - size, l);
+					DrawPixelSolid(xp, y + size, d);
+				}
+
+				// Corners
+				DrawPixelSolid(x + size, y + size, d);
+				DrawPixelSolid(x - size, y - size, l);
+			}
+			*/
+		}
+
+		// This draws a dotted grid line horizontally
+		public void DrawGridLineH(int y, int x1, int x2, ref PixelColor c)
+		{
+			int numpixels = visiblewidth >> 1;
+			int offset = y & 0x01;
+			int ywidth = y * width;
+			x1 = General.Clamp(x1 >> 1, 0, numpixels - 1);
+			x2 = General.Clamp(x2 >> 1, 0, numpixels - 1);
+			
+			if((y >= 0) && (y < height))
+			{
+				// Draw all pixels on this line
+				for(int i = x1; i < x2; i++) pixels[ywidth + ((i << 1) | offset)] = c;
+			}
+		}
+
+		// This draws a dotted grid line vertically
+		public void DrawGridLineV(int x, int y1, int y2, ref PixelColor c)
+		{
+			int numpixels = visibleheight >> 1;
+			int offset = x & 0x01;
+			y1 = General.Clamp(y1 >> 1, 0, numpixels - 1);
+			y2 = General.Clamp(y2 >> 1, 0, numpixels - 1);
+			
+			if((x >= 0) && (x < width))
+			{
+				// Draw all pixels on this line
+				for(int i = y1; i < y2; i++) pixels[((i << 1) | offset) * width + x] = c;
+			}
+		}
+
+		// This draws a pixel alpha blended
+		public void DrawPixelAlpha(int x, int y, ref PixelColor c)
+		{
+			// Draw only when within range
+			if((x >= 0) && (x < visiblewidth) && (y >= 0) && (y < visibleheight))
+			{
+				// Get the target pixel
+				PixelColor* p = pixels + (y * width + x);
+
+				// Not drawn on target yet?
+				if(*(int*)p == 0)
+				{
+					// Simply apply color to pixel
+					*p = c;
+				}
+				else
+				{
+					// Blend with pixel
+					float a = c.a * 0.003921568627450980392156862745098f;
+					if(p->a + c.a > 255) p->a = 255; else p->a += c.a;
+					p->r = (byte)(p->r * (1f - a) + c.r * a);
+					p->g = (byte)(p->g * (1f - a) + c.g * a);
+					p->b = (byte)(p->b * (1f - a) + c.b * a);
+				}
+			}
+		}
+
+		// This draws a line normally
+		// See: http://en.wikipedia.org/wiki/Bresenham%27s_line_algorithm
+		public void DrawLineSolid(int x1, int y1, int x2, int y2, ref PixelColor c)
+		{
+			// Check if the line is outside the screen for sure.
+			// This is quickly done by checking in which area both points are. When this
+			// is above, below, right or left of the screen, then skip drawing the line.
+			if(((x1 < 0) && (x2 < 0)) ||
+			   ((x1 > visiblewidth) && (x2 > visiblewidth)) ||
+			   ((y1 < 0) && (y2 < 0)) ||
+			   ((y1 > visibleheight) && (y2 > visibleheight))) return;
+
+			// Distance of the line
+			int dx = x2 - x1;
+			int dy = y2 - y1;
+
+			// Positive (absolute) distance
+			int dxabs = Math.Abs(dx);
+			int dyabs = Math.Abs(dy);
+
+			// Half distance
+			int x = dyabs >> 1;
+			int y = dxabs >> 1;
+
+			// Direction
+			int sdx = Math.Sign(dx);
+			int sdy = Math.Sign(dy);
+
+			// Start position
+			int px = x1;
+			int py = y1;
+
+			// When the line is completely inside screen,
+			// then do an unchecked draw, because all of its pixels are
+			// guaranteed to be within the memory range
+			if((x1 >= 0) && (x2 >= 0) && (x1 < visiblewidth) && (x2 < visiblewidth) &&
+			   (y1 >= 0) && (y2 >= 0) && (y1 < visibleheight) && (y2 < visibleheight))
+			{
+				// Draw first pixel
+				pixels[py * width + px] = c;
+
+				// Check if the line is more horizontal than vertical
+				if(dxabs >= dyabs)
+				{
+					for(int i = 0; i < dxabs; i++)
+					{
+						y += dyabs;
+						if(y >= dxabs)
+						{
+							y -= dxabs;
+							py += sdy;
+						}
+						px += sdx;
+
+						// Draw pixel
+						pixels[py * width + px] = c;
+					}
+				}
+				// Else the line is more vertical than horizontal
+				else
+				{
+					for(int i = 0; i < dyabs; i++)
+					{
+						x += dxabs;
+						if(x >= dyabs)
+						{
+							x -= dyabs;
+							px += sdx;
+						}
+						py += sdy;
+
+						// Draw pixel
+						pixels[py * width + px] = c;
+					}
+				}
+			}
+			else
+			{
+				// Draw first pixel
+				if((px >= 0) && (px < visiblewidth) && (py >= 0) && (py < visibleheight))
+					pixels[py * width + px] = c;
+				
+				// Check if the line is more horizontal than vertical
+				if(dxabs >= dyabs)
+				{
+					for(int i = 0; i < dxabs; i++)
+					{
+						y += dyabs;
+						if(y >= dxabs)
+						{
+							y -= dxabs;
+							py += sdy;
+						}
+						px += sdx;
+						
+						// Draw pixel
+						if((px >= 0) && (px < visiblewidth) && (py >= 0) && (py < visibleheight))
+							pixels[py * width + px] = c;
+					}
+				}
+				// Else the line is more vertical than horizontal
+				else
+				{
+					for(int i = 0; i < dyabs; i++)
+					{
+						x += dxabs;
+						if(x >= dyabs)
+						{
+							x -= dyabs;
+							px += sdx;
+						}
+						py += sdy;
+						
+						// Draw pixel
+						if((px >= 0) && (px < visiblewidth) && (py >= 0) && (py < visibleheight))
+							pixels[py * width + px] = c;
+					}
+				}
+			}
+		}
+
+		//mxd
+		public void DrawLine3DFloor(Vector2D start, Vector2D end, ref PixelColor c, PixelColor c2) 
+		{
+			Vector2D delta = end - start;
+			float length = delta.GetLength();
+
+			if(length < DASH_INTERVAL * 2) 
+			{
+				DrawLineSolid((int)start.x, (int)start.y, (int)end.x, (int)end.y, ref c2);
+			} 
+			else 
+			{
+				float d1 = DASH_INTERVAL / length;
+				float d2 = 1.0f - d1;
+
+				Vector2D p1 = CurveTools.GetPointOnLine(start, end, d1);
+				Vector2D p2 = CurveTools.GetPointOnLine(start, end, d2);
+
+				DrawLineSolid((int)start.x, (int)start.y, (int)p1.x, (int)p1.y, ref c2);
+				DrawLineSolid((int)p1.x, (int)p1.y, (int)p2.x, (int)p2.y, ref c);
+				DrawLineSolid((int)p2.x, (int)p2.y, (int)end.x, (int)end.y, ref c2);
+			}
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Rendering/Presentation.cs b/Source/Core/Rendering/Presentation.cs
new file mode 100644
index 0000000..05f8ef1
--- /dev/null
+++ b/Source/Core/Rendering/Presentation.cs
@@ -0,0 +1,158 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections.Generic;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Rendering
+{
+	/// <summary>
+	/// Presentation settings
+	/// </summary>
+	public class Presentation
+	{
+		// Constants for static instances
+		public const float THINGS_BACK_ALPHA = 0.3f;
+		public const float THINGS_HIDDEN_ALPHA = 0.66f;
+		public const float THINGS_ALPHA = 1.0f; //mxd
+		
+		// Static instances
+		private static Presentation standard;
+		private static Presentation things;
+		
+		// Static properties
+		public static Presentation Standard { get { return standard; } }
+		public static Presentation Things { get { return things; } }
+		
+		// Variables
+		protected internal List<PresentLayer> layers;
+		
+		// Constructor
+		public Presentation()
+		{
+			// Initialize
+			layers = new List<PresentLayer>();
+		}
+
+		// Copy constructor
+		public Presentation(Presentation p)
+		{
+			layers = new List<PresentLayer>(p.layers);
+		}
+
+		// This creates the static instances
+		internal static void Initialize()
+		{
+			// Standard classic mode
+			standard = new Presentation();
+			standard.layers.Add(new PresentLayer(RendererLayer.Background, BlendingMode.Mask, General.Settings.BackgroundAlpha));
+			standard.layers.Add(new PresentLayer(RendererLayer.Surface, BlendingMode.Mask));
+			standard.layers.Add(new PresentLayer(RendererLayer.Things, BlendingMode.Alpha, THINGS_BACK_ALPHA));
+			standard.layers.Add(new PresentLayer(RendererLayer.Grid, BlendingMode.Mask));
+			standard.layers.Add(new PresentLayer(RendererLayer.Geometry, BlendingMode.Alpha, 1f, true));
+			standard.layers.Add(new PresentLayer(RendererLayer.Overlay, BlendingMode.Alpha, 1f, true));
+			
+			// Things classic mode
+			things = new Presentation();
+			things.layers.Add(new PresentLayer(RendererLayer.Background, BlendingMode.Mask, General.Settings.BackgroundAlpha));
+			things.layers.Add(new PresentLayer(RendererLayer.Surface, BlendingMode.Mask));
+			things.layers.Add(new PresentLayer(RendererLayer.Things, BlendingMode.Alpha, 1f));
+			things.layers.Add(new PresentLayer(RendererLayer.Grid, BlendingMode.Mask));
+			things.layers.Add(new PresentLayer(RendererLayer.Geometry, BlendingMode.Alpha, 1f, true));
+			things.layers.Add(new PresentLayer(RendererLayer.Overlay, BlendingMode.Alpha, 1f, true));
+			things.layers.Add(new PresentLayer(RendererLayer.Things, BlendingMode.Alpha, 0.5f)); //mxd
+		}
+	}
+
+	/// <summary>
+	/// Customizable Presentation
+	/// </summary>
+	public class CustomPresentation : Presentation
+	{
+		// Allow public adding
+		public void AddLayer(PresentLayer layer)
+		{
+			this.layers.Add(layer);
+		}
+	}
+	
+	public struct PresentLayer
+	{
+		public RendererLayer layer;
+		public BlendingMode blending;
+		public float alpha;
+		public bool antialiasing;
+
+		// Constructor
+		public PresentLayer(RendererLayer layer, BlendingMode blending, float alpha, bool antialiasing)
+		{
+			this.layer = layer;
+			this.blending = blending;
+			this.alpha = alpha;
+			this.antialiasing = antialiasing;
+		}
+
+		// Constructor
+		public PresentLayer(RendererLayer layer, BlendingMode blending, float alpha)
+		{
+			this.layer = layer;
+			this.blending = blending;
+			this.alpha = alpha;
+			this.antialiasing = false;
+		}
+
+		// Constructor
+		public PresentLayer(RendererLayer layer, BlendingMode blending)
+		{
+			this.layer = layer;
+			this.blending = blending;
+			this.alpha = 1f;
+			this.antialiasing = false;
+		}
+
+		// Constructor
+		public PresentLayer(RendererLayer layer)
+		{
+			this.layer = layer;
+			this.blending = BlendingMode.None;
+			this.alpha = 1f;
+			this.antialiasing = false;
+		}
+	}
+	
+	// The different layers
+	public enum RendererLayer
+	{
+		Background,
+		Grid,
+		Things,
+		Geometry,
+		Overlay,
+		Surface
+	}
+
+	// Blending modes
+	public enum BlendingMode
+	{
+		None,
+		Mask,
+		Alpha,
+		Additive,
+	}
+}
diff --git a/Source/Core/Rendering/RenderLayers.cs b/Source/Core/Rendering/RenderLayers.cs
new file mode 100644
index 0000000..cdaeb53
--- /dev/null
+++ b/Source/Core/Rendering/RenderLayers.cs
@@ -0,0 +1,16 @@
+#region ================== Namespaces
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Rendering
+{
+	internal enum RenderLayers : int
+	{
+		None = 0,
+		Background = 1,
+		Plotter = 2,
+		Things = 3,
+		Overlay = 4,
+		Surface = 5
+	}
+}
diff --git a/Source/Core/Rendering/RenderPasses.cs b/Source/Core/Rendering/RenderPasses.cs
new file mode 100644
index 0000000..7319f95
--- /dev/null
+++ b/Source/Core/Rendering/RenderPasses.cs
@@ -0,0 +1,31 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Rendering
+{
+	public enum RenderPass : int
+	{
+		Solid = 0,
+		Mask = 1,
+		Alpha = 2,
+		Additive = 3
+	}
+}
+
diff --git a/Source/Core/Rendering/Renderer.cs b/Source/Core/Rendering/Renderer.cs
new file mode 100644
index 0000000..51a65e8
--- /dev/null
+++ b/Source/Core/Rendering/Renderer.cs
@@ -0,0 +1,170 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Drawing;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Geometry;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Rendering
+{
+	internal abstract class Renderer : ID3DResource
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		// Graphics
+		protected D3DDevice graphics;
+		protected static bool fullbrightness;
+
+		// Disposing
+		protected bool isdisposed;
+
+		#endregion
+
+		#region ================== Properties
+
+		// Disposing
+		public bool IsDisposed { get { return isdisposed; } }
+		public static bool FullBrightness { get { return fullbrightness; } set { fullbrightness = value; } } //mxd
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		protected Renderer(D3DDevice g)
+		{
+			// Initialize
+			this.graphics = g;
+
+			// Register as resource
+			g.RegisterResource(this);
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Disposer
+		internal virtual void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Clean up
+
+				// Unregister resource
+				graphics.UnregisterResource(this);
+				
+				// Done
+				graphics = null;
+				isdisposed = true;
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This calculates the sector brightness level
+		public int CalculateBrightness(int level)
+		{
+			float flevel = level;
+
+			// Simulat doom light levels
+			if((level < 192) && General.Map.Config.DoomLightLevels)
+				flevel = (192.0f - (192 - level) * 1.5f);
+			
+			byte blevel = (byte)General.Clamp((int)flevel, 0, 255);
+			PixelColor c = new PixelColor(255, blevel, blevel, blevel);
+			return c.ToInt();
+		}
+
+		//mxd. This calculates wall brightness level with doom-style shading
+		public int CalculateBrightness(int level, Sidedef sd) 
+		{
+			if(level < 253 && sd != null) 
+			{
+				bool evenlighting = General.Map.Data.MapInfo.EvenLighting;
+				bool smoothlighting = General.Map.Data.MapInfo.SmoothLighting;
+
+				//check for possiburu UDMF overrides
+				if(General.Map.UDMF) 
+				{
+					if(sd.IsFlagSet("lightabsolute") && sd.Fields.ContainsKey("light")) 
+					{
+						evenlighting = true;
+					} 
+					else 
+					{
+						if(sd.IsFlagSet("nofakecontrast"))
+							evenlighting = true;
+						if(sd.IsFlagSet("smoothlighting"))
+							smoothlighting = true;
+					}
+				}
+
+				if(!evenlighting) 
+				{
+					//all walls are shaded by their angle
+					if(smoothlighting) 
+					{
+						float ammount = Math.Abs((float)Math.Sin(sd.Angle));
+						int hAmmount = (int)((1.0f - ammount) * General.Map.Data.MapInfo.HorizWallShade);
+						int vAmmount = (int)(ammount * General.Map.Data.MapInfo.VertWallShade);
+
+						level = General.Clamp(level - hAmmount - vAmmount, 0, 255);
+
+					} 
+					else //only horizontal/verticel walls are shaded
+					{
+						switch((int)Angle2D.RadToDeg(sd.Angle))
+						{
+							// Horizontal wall
+							case 90:
+							case 270:
+								level = General.Clamp(level + General.Map.Data.MapInfo.HorizWallShade, 0, 255);
+								break;
+							// Vertical wall
+							case 180:
+							case 0:
+								level = General.Clamp(level + General.Map.Data.MapInfo.VertWallShade, 0, 255);
+								break;
+						}
+					}
+				}
+			}
+
+			return CalculateBrightness(level);
+		}
+
+		// This is called when the graphics need to be reset
+		public virtual void Reset() { }
+
+		// For DirectX resources
+		public virtual void UnloadResource() { }
+		public virtual void ReloadResource() { }
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Rendering/Renderer2D.cs b/Source/Core/Rendering/Renderer2D.cs
new file mode 100644
index 0000000..c7538a0
--- /dev/null
+++ b/Source/Core/Rendering/Renderer2D.cs
@@ -0,0 +1,2013 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using CodeImp.DoomBuilder.Map;
+using SlimDX.Direct3D9;
+using SlimDX;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Data;
+using CodeImp.DoomBuilder.Editing;
+using CodeImp.DoomBuilder.GZBuilder.Data; //mxd
+using CodeImp.DoomBuilder.GZBuilder.Geometry; //mxd
+using CodeImp.DoomBuilder.Config; //mxd
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Rendering
+{
+
+	/* This renders a 2D presentation of the map. This is done in several
+	 * layers which each are optimized for a different purpose. Set the
+	 * PresentationLayer(s) to specify how to present these layers.
+	 */
+
+	internal sealed class Renderer2D : Renderer, IRenderer2D
+	{
+		#region ================== Constants
+
+		private const float FSAA_FACTOR = 0.6f;
+		private const int MAP_CENTER_SIZE = 16; //mxd
+		private const float THING_ARROW_SIZE = 1.4f;
+		//private const float THING_ARROW_SHRINK = 2f;
+		//private const float THING_CIRCLE_SIZE = 1f;
+		private const float THING_SPRITE_SHRINK = 2f;
+		private const int THING_BUFFER_SIZE = 100;
+		private const float MINIMUM_THING_RADIUS = 1.5f; //mxd
+		private const float MINIMUM_SPRITE_RADIUS = 5.5f; //mxd
+
+		private const string FONT_NAME = "Verdana";
+		private const int FONT_WIDTH = 0;
+		private const int FONT_HEIGHT = 0;
+
+		internal const int NUM_VIEW_MODES = 4;
+		
+		#endregion
+
+		#region ================== Variables
+
+		// Rendertargets
+		private Texture backtex;
+		private Texture plottertex;
+		private Texture thingstex;
+		private Texture overlaytex;
+		private Texture surfacetex;
+
+		// Locking data
+		private DataRectangle plotlocked;
+		private Surface targetsurface;
+
+		// Rendertarget sizes
+		private Size windowsize;
+		private Size structsize;
+		private Size thingssize;
+		private Size overlaysize;
+		private Size backsize;
+		
+		// Font
+		private SlimDX.Direct3D9.Font font;
+
+		// Geometry plotter
+		private Plotter plotter;
+
+		// Vertices to present the textures
+		private VertexBuffer screenverts;
+		private FlatVertex[] backimageverts;
+		
+		// Batch buffer for things rendering
+		private VertexBuffer thingsvertices;
+		
+		// Render settings
+		private int vertexsize;
+		private RenderLayers renderlayer = RenderLayers.None;
+		
+		// Surfaces
+		private SurfaceManager surfaces;
+		
+		// Images
+		private ResourceImage thingtexture;
+		
+		// View settings (world coordinates)
+		private ViewMode viewmode;
+		private float scale;
+		private float scaleinv;
+		private float offsetx;
+		private float offsety;
+		private float translatex;
+		private float translatey;
+		private float linenormalsize;
+		private float minlinelength; //mxd. Linedef should be longer than this to be rendered
+		private float minlinenormallength; //mxd. Linedef direction indicator should be longer than this to be rendered 
+		private float lastgridscale = -1f;
+		private int lastgridsize;
+		private float lastgridx;
+		private float lastgridy;
+		private RectangleF viewport;
+		private RectangleF yviewport;
+
+		// Presentation
+		private Presentation present;
+		
+		#endregion
+
+		#region ================== Properties
+
+		public float OffsetX { get { return offsetx; } }
+		public float OffsetY { get { return offsety; } }
+		public float TranslateX { get { return translatex; } }
+		public float TranslateY { get { return translatey; } }
+		public float Scale { get { return scale; } }
+		public int VertexSize { get { return vertexsize; } }
+		public ViewMode ViewMode { get { return viewmode; } }
+		public SurfaceManager Surfaces { get { return surfaces; } }
+		public RectangleF Viewport { get { return viewport; } } //mxd
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+		
+		// Constructor
+		internal Renderer2D(D3DDevice graphics) : base(graphics)
+		{
+			//mxd. Load thing texture
+			thingtexture = new ResourceImage("CodeImp.DoomBuilder.Resources.Thing2D.png") { UseColorCorrection = false };
+			thingtexture.LoadImage();
+			thingtexture.CreateTexture();
+
+			// Create surface manager
+			surfaces = new SurfaceManager();
+
+			// Create rendertargets
+			CreateRendertargets();
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Disposer
+		internal override void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Destroy rendertargets
+				DestroyRendertargets();
+				thingtexture.Dispose(); //mxd
+				
+				// Dispose surface manager
+				surfaces.Dispose();
+				
+				// Done
+				base.Dispose();
+			}
+		}
+
+		#endregion
+
+		#region ================== Presenting
+
+		// This sets the presentation to use
+		public void SetPresentation(Presentation present)
+		{
+			this.present = new Presentation(present);
+		}
+		
+		// This draws the image on screen
+		public unsafe void Present()
+		{
+			General.Plugins.OnPresentDisplayBegin();
+			
+			// Start drawing
+			if(graphics.StartRendering(true, General.Colors.Background.ToColorValue(), graphics.BackBuffer, graphics.DepthBuffer))
+			{
+				// Renderstates that count for this whole sequence
+				graphics.Device.SetRenderState(RenderState.CullMode, Cull.None);
+				graphics.Device.SetRenderState(RenderState.ZEnable, false);
+				graphics.Device.SetRenderState(RenderState.FogEnable, false);
+				graphics.Device.SetStreamSource(0, screenverts, 0, sizeof(FlatVertex));
+				graphics.Device.SetTransform(TransformState.World, Matrix.Identity);
+				graphics.Shaders.Display2D.Begin();
+
+				// Go for all layers
+				foreach(PresentLayer layer in present.layers)
+				{
+					int aapass;
+
+					// Set blending mode
+					switch(layer.blending)
+					{
+						case BlendingMode.None:
+							graphics.Device.SetRenderState(RenderState.AlphaBlendEnable, false);
+							graphics.Device.SetRenderState(RenderState.AlphaTestEnable, false);
+							graphics.Device.SetRenderState(RenderState.TextureFactor, -1);
+							break;
+
+						case BlendingMode.Mask:
+							graphics.Device.SetRenderState(RenderState.AlphaBlendEnable, false);
+							graphics.Device.SetRenderState(RenderState.AlphaTestEnable, true);
+							graphics.Device.SetRenderState(RenderState.TextureFactor, -1);
+							break;
+
+						case BlendingMode.Alpha:
+							graphics.Device.SetRenderState(RenderState.AlphaBlendEnable, true);
+							graphics.Device.SetRenderState(RenderState.AlphaTestEnable, false);
+							graphics.Device.SetRenderState(RenderState.SourceBlend, Blend.SourceAlpha);
+							graphics.Device.SetRenderState(RenderState.DestinationBlend, Blend.InverseSourceAlpha);
+							graphics.Device.SetRenderState(RenderState.TextureFactor, (new Color4(layer.alpha, 1f, 1f, 1f)).ToArgb());
+							break;
+
+						case BlendingMode.Additive:
+							graphics.Device.SetRenderState(RenderState.AlphaBlendEnable, true);
+							graphics.Device.SetRenderState(RenderState.AlphaTestEnable, false);
+							graphics.Device.SetRenderState(RenderState.SourceBlend, Blend.SourceAlpha);
+							graphics.Device.SetRenderState(RenderState.DestinationBlend, Blend.One);
+							graphics.Device.SetRenderState(RenderState.TextureFactor, (new Color4(layer.alpha, 1f, 1f, 1f)).ToArgb());
+							break;
+					}
+
+					// Check which pass to use
+					if(layer.antialiasing && General.Settings.QualityDisplay) aapass = 0; else aapass = 1;
+
+					// Render layer
+					switch(layer.layer)
+					{
+						// BACKGROUND
+						case RendererLayer.Background:
+							if((backimageverts == null) || (General.Map.Grid.Background.Texture == null)) break;
+							graphics.Device.SetTexture(0, General.Map.Grid.Background.Texture);
+							graphics.Shaders.Display2D.Texture1 = General.Map.Grid.Background.Texture;
+							graphics.Shaders.Display2D.SetSettings(1f / windowsize.Width, 1f / windowsize.Height, FSAA_FACTOR, layer.alpha, false);
+							graphics.Shaders.Display2D.BeginPass(aapass);
+							graphics.Device.DrawUserPrimitives(PrimitiveType.TriangleStrip, 0, 2, backimageverts);
+							graphics.Shaders.Display2D.EndPass();
+							graphics.Device.SetStreamSource(0, screenverts, 0, sizeof(FlatVertex));
+							break;
+
+						// GRID
+						case RendererLayer.Grid:
+							graphics.Device.SetTexture(0, backtex);
+							graphics.Shaders.Display2D.Texture1 = backtex;
+							graphics.Shaders.Display2D.SetSettings(1f / backsize.Width, 1f / backsize.Height, FSAA_FACTOR, layer.alpha, false);
+							graphics.Shaders.Display2D.BeginPass(aapass);
+							graphics.Device.DrawPrimitives(PrimitiveType.TriangleStrip, 0, 2);
+							graphics.Shaders.Display2D.EndPass();
+							break;
+
+						// GEOMETRY
+						case RendererLayer.Geometry:
+							graphics.Device.SetTexture(0, plottertex);
+							graphics.Shaders.Display2D.Texture1 = plottertex;
+							graphics.Shaders.Display2D.SetSettings(1f / structsize.Width, 1f / structsize.Height, FSAA_FACTOR, layer.alpha, false);
+							graphics.Shaders.Display2D.BeginPass(aapass);
+							graphics.Device.DrawPrimitives(PrimitiveType.TriangleStrip, 0, 2);
+							graphics.Shaders.Display2D.EndPass();
+							break;
+
+						// THINGS
+						case RendererLayer.Things:
+							graphics.Device.SetTexture(0, thingstex);
+							graphics.Shaders.Display2D.Texture1 = thingstex;
+							graphics.Shaders.Display2D.SetSettings(1f / thingssize.Width, 1f / thingssize.Height, FSAA_FACTOR, layer.alpha, false);
+							graphics.Shaders.Display2D.BeginPass(aapass);
+							graphics.Device.DrawPrimitives(PrimitiveType.TriangleStrip, 0, 2);
+							graphics.Shaders.Display2D.EndPass();
+							break;
+
+						// OVERLAY
+						case RendererLayer.Overlay:
+							graphics.Device.SetTexture(0, overlaytex);
+							graphics.Shaders.Display2D.Texture1 = overlaytex;
+							graphics.Shaders.Display2D.SetSettings(1f / overlaysize.Width, 1f / overlaysize.Height, FSAA_FACTOR, layer.alpha, false);
+							graphics.Shaders.Display2D.BeginPass(aapass);
+							graphics.Device.DrawPrimitives(PrimitiveType.TriangleStrip, 0, 2);
+							graphics.Shaders.Display2D.EndPass();
+							break;
+
+						// SURFACE
+						case RendererLayer.Surface:
+							graphics.Device.SetTexture(0, surfacetex);
+							graphics.Shaders.Display2D.Texture1 = surfacetex;
+							graphics.Shaders.Display2D.SetSettings(1f / overlaysize.Width, 1f / overlaysize.Height, FSAA_FACTOR, layer.alpha, false);
+							graphics.Shaders.Display2D.BeginPass(aapass);
+							graphics.Device.DrawPrimitives(PrimitiveType.TriangleStrip, 0, 2);
+							graphics.Shaders.Display2D.EndPass();
+							break;
+					}
+				}
+
+				// Done
+				graphics.Shaders.Display2D.End();
+				graphics.FinishRendering();
+				graphics.Present();
+
+				// Release binds
+				graphics.Device.SetTexture(0, null);
+				graphics.Shaders.Display2D.Texture1 = null;
+				graphics.Device.SetStreamSource(0, null, 0, 0);
+			}
+			else
+			{
+				// Request delayed redraw
+				General.MainWindow.DelayedRedraw();
+			}
+		}
+		
+		#endregion
+
+		#region ================== Management
+
+		// This is called before a device is reset
+		// (when resized or display adapter was changed)
+		public override void UnloadResource()
+		{
+			// Destroy rendertargets
+			DestroyRendertargets();
+		}
+		
+		// This is called resets when the device is reset
+		// (when resized or display adapter was changed)
+		public override void ReloadResource()
+		{
+			// Re-create rendertargets
+			CreateRendertargets();
+		}
+
+		// This resets the graphics
+		public override void Reset()
+		{
+			UnloadResource();
+			ReloadResource();
+		}
+
+		// This destroys the rendertargets
+		public void DestroyRendertargets()
+		{
+			// Trash rendertargets
+			if(plottertex != null) plottertex.Dispose();
+			if(thingstex != null) thingstex.Dispose();
+			if(overlaytex != null) overlaytex.Dispose();
+			if(surfacetex != null) surfacetex.Dispose();
+			if(backtex != null) backtex.Dispose();
+			if(screenverts != null) screenverts.Dispose();
+			plottertex = null;
+			thingstex = null;
+			backtex = null;
+			screenverts = null;
+			overlaytex = null;
+			surfacetex = null;
+			
+			// Trash things batch buffer
+			if(thingsvertices != null) thingsvertices.Dispose();
+			thingsvertices = null;
+			lastgridscale = -1f;
+			lastgridsize = 0;
+
+			// Trash font
+			if(font != null) font.Dispose();
+			font = null;
+		}
+		
+		// Allocates new image memory to render on
+		public unsafe void CreateRendertargets()
+		{
+			// Destroy rendertargets
+			DestroyRendertargets();
+			
+			// Get new width and height
+			windowsize.Width = graphics.RenderTarget.ClientSize.Width;
+			windowsize.Height = graphics.RenderTarget.ClientSize.Height;
+
+			// Create rendertargets textures
+			plottertex = new Texture(graphics.Device, windowsize.Width, windowsize.Height, 1, Usage.None, Format.A8R8G8B8, Pool.Managed);
+			thingstex = new Texture(graphics.Device, windowsize.Width, windowsize.Height, 1, Usage.RenderTarget, Format.A8R8G8B8, Pool.Default);
+			backtex = new Texture(graphics.Device, windowsize.Width, windowsize.Height, 1, Usage.None, Format.A8R8G8B8, Pool.Managed);
+			overlaytex = new Texture(graphics.Device, windowsize.Width, windowsize.Height, 1, Usage.RenderTarget, Format.A8R8G8B8, Pool.Default);
+			surfacetex = new Texture(graphics.Device, windowsize.Width, windowsize.Height, 1, Usage.RenderTarget, Format.A8R8G8B8, Pool.Default);
+			
+			// Get the real surface sizes
+			SurfaceDescription sd = plottertex.GetLevelDescription(0);
+			structsize.Width = sd.Width;
+			structsize.Height = sd.Height;
+			sd = thingstex.GetLevelDescription(0);
+			thingssize.Width = sd.Width;
+			thingssize.Height = sd.Height;
+			sd = backtex.GetLevelDescription(0);
+			backsize.Width = sd.Width;
+			backsize.Height = sd.Height;
+			sd = overlaytex.GetLevelDescription(0);
+			overlaysize.Width = sd.Width;
+			overlaysize.Height = sd.Height;
+			
+			// Clear rendertargets
+			// This may cause a crash when resetting because it recursively
+			// calls Reset in the Start functions and doesn't get to Finish
+			//StartPlotter(true); Finish();
+			//StartThings(true); Finish();
+			//StartOverlay(true); Finish();
+			graphics.ClearRendertarget(General.Colors.Background.WithAlpha(0).ToColorValue(), thingstex.GetSurfaceLevel(0), null);
+			graphics.ClearRendertarget(General.Colors.Background.WithAlpha(0).ToColorValue(), overlaytex.GetSurfaceLevel(0), null);
+			
+			// Create font
+			font = new SlimDX.Direct3D9.Font(graphics.Device, FONT_WIDTH, FONT_HEIGHT, FontWeight.Bold, 1, false, CharacterSet.Ansi, Precision.Default, FontQuality.Antialiased, PitchAndFamily.Default, FONT_NAME);
+			
+			// Create vertex buffers
+			screenverts = new VertexBuffer(graphics.Device, 4 * sizeof(FlatVertex), Usage.Dynamic | Usage.WriteOnly, VertexFormat.None, Pool.Default);
+			thingsvertices = new VertexBuffer(graphics.Device, THING_BUFFER_SIZE * 12 * sizeof(FlatVertex), Usage.Dynamic | Usage.WriteOnly, VertexFormat.None, Pool.Default);
+
+			// Make screen vertices
+			DataStream stream = screenverts.Lock(0, 4 * sizeof(FlatVertex), LockFlags.Discard | LockFlags.NoSystemLock);
+			FlatVertex[] verts = CreateScreenVerts(structsize);
+			stream.WriteRange(verts);
+			screenverts.Unlock();
+			stream.Dispose();
+			
+			// Force update of view
+			lastgridscale = -1f;
+			lastgridsize = 0;
+			lastgridx = 0.0f;
+			lastgridy = 0.0f;
+			UpdateTransformations();
+		}
+
+		// This makes screen vertices for display
+		private static FlatVertex[] CreateScreenVerts(Size texturesize)
+		{
+			FlatVertex[] screenverts = new FlatVertex[4];
+			screenverts[0].x = 0.5f;
+			screenverts[0].y = 0.5f;
+			screenverts[0].c = -1;
+			screenverts[0].u = 1f / texturesize.Width;
+			screenverts[0].v = 1f / texturesize.Height;
+			screenverts[1].x = texturesize.Width - 1.5f;
+			screenverts[1].y = 0.5f;
+			screenverts[1].c = -1;
+			screenverts[1].u = 1f - 1f / texturesize.Width;
+			screenverts[1].v = 1f / texturesize.Height;
+			screenverts[2].x = 0.5f;
+			screenverts[2].y = texturesize.Height - 1.5f;
+			screenverts[2].c = -1;
+			screenverts[2].u = 1f / texturesize.Width;
+			screenverts[2].v = 1f - 1f / texturesize.Height;
+			screenverts[3].x = texturesize.Width - 1.5f;
+			screenverts[3].y = texturesize.Height - 1.5f;
+			screenverts[3].c = -1;
+			screenverts[3].u = 1f - 1f / texturesize.Width;
+			screenverts[3].v = 1f - 1f / texturesize.Height;
+			return screenverts;
+		}
+
+		#endregion
+		
+		#region ================== View
+
+		// This changes view mode
+		public void SetViewMode(ViewMode mode)
+		{
+			viewmode = mode;
+		}
+		
+		// This changes view position
+		public void PositionView(float x, float y)
+		{
+			// Change position in world coordinates
+			offsetx = x;
+			offsety = y;
+			UpdateTransformations();
+		}
+		
+		// This changes zoom
+		public void ScaleView(float scale)
+		{
+			// Change zoom scale
+			this.scale = scale;
+			UpdateTransformations();
+			
+			// Show zoom on main window
+			General.MainWindow.UpdateZoom(scale);
+		}
+
+		// This updates some maths
+		private void UpdateTransformations()
+		{
+			scaleinv = 1f / scale;
+			translatex = -offsetx + (windowsize.Width * 0.5f) * scaleinv;
+			translatey = -offsety - (windowsize.Height * 0.5f) * scaleinv;
+			linenormalsize = 10f * scaleinv;
+			minlinelength = linenormalsize * 0.0625f; //mxd
+			minlinenormallength = linenormalsize * 2f; //mxd
+
+			vertexsize = (int)(1.7f * General.Settings.GZVertexScale2D * scale + 0.5f); //mxd. added GZVertexScale2D
+			if(vertexsize < 0) vertexsize = 0;
+			if(vertexsize > 4) vertexsize = 4;
+
+			Matrix scaling = Matrix.Scaling((1f / windowsize.Width) * 2f, (1f / windowsize.Height) * -2f, 1f);
+			Matrix translate = Matrix.Translation(-(float)windowsize.Width * 0.5f, -(float)windowsize.Height * 0.5f, 0f);
+			graphics.Device.SetTransform(TransformState.View, translate * scaling);
+			graphics.Device.SetTransform(TransformState.Projection, Matrix.Identity);
+			Vector2D lt = DisplayToMap(new Vector2D(0.0f, 0.0f));
+			Vector2D rb = DisplayToMap(new Vector2D(windowsize.Width, windowsize.Height));
+			viewport = new RectangleF(lt.x, lt.y, rb.x - lt.x, rb.y - lt.y);
+			yviewport = new RectangleF(lt.x, rb.y, rb.x - lt.x, lt.y - rb.y);
+		}
+
+		// This sets the world matrix for transformation
+		private void SetWorldTransformation(bool transform)
+		{
+			if(transform)
+			{
+				Matrix translate = Matrix.Translation(translatex, translatey, 0f);
+				Matrix scaling = Matrix.Scaling(scale, -scale, 1f);
+				graphics.Device.SetTransform(TransformState.World, translate * scaling);
+			}
+			else
+			{
+				graphics.Device.SetTransform(TransformState.World, Matrix.Identity);
+			}
+		}
+		
+		/// <summary>
+		/// This unprojects display coordinates (screen space) to map coordinates
+		/// </summary>
+		public Vector2D DisplayToMap(Vector2D mousepos)
+		{
+			return mousepos.GetInvTransformed(-translatex, -translatey, scaleinv, -scaleinv);
+		}
+		
+		/// <summary>
+		/// This projects map coordinates to display coordinates (screen space)
+		/// </summary>
+		public Vector2D MapToDisplay(Vector2D mappos)
+		{
+			return mappos.GetTransformed(translatex, translatey, scale, -scale);
+		}
+		
+		#endregion
+
+		#region ================== Colors
+
+		// This returns the color for a thing
+		public PixelColor DetermineThingColor(Thing t)
+		{
+			// Determine color
+			if(t.Selected) return General.Colors.Selection;
+			
+			//mxd. If thing is light, set it's color to light color:
+			if(Array.IndexOf(GZBuilder.GZGeneral.GZ_LIGHTS, t.Type) != -1)
+			{
+				if(t.Type == 1502) //vavoom light
+					return new PixelColor(255, 255, 255, 255);
+				if(t.Type == 1503) //vavoom colored light
+					return new PixelColor(255, (byte)t.Args[1], (byte)t.Args[2], (byte)t.Args[3]);
+				return new PixelColor(255, (byte)t.Args[0], (byte)t.Args[1], (byte)t.Args[2]);
+			}
+
+			return t.Color;
+		}
+
+		// This returns the color for a vertex
+		public int DetermineVertexColor(Vertex v)
+		{
+			// Determine color
+			if(v.Selected) return ColorCollection.SELECTION;
+			return ColorCollection.VERTICES;
+		}
+
+		// This returns the color for a linedef
+		public PixelColor DetermineLinedefColor(Linedef l)
+		{
+			if(l.Selected) return General.Colors.Selection;
+
+			//mxd. Impassable lines
+			if(l.ImpassableFlag) 
+			{
+				if(l.ColorPresetIndex != -1)
+					return General.Map.ConfigSettings.LinedefColorPresets[l.ColorPresetIndex].Color;
+				return General.Colors.Linedefs;
+			}
+
+			//mxd. Passable lines
+			if(l.ColorPresetIndex != -1)
+				return General.Map.ConfigSettings.LinedefColorPresets[l.ColorPresetIndex].Color.WithAlpha(General.Settings.DoubleSidedAlphaByte);
+			return General.Colors.Linedefs.WithAlpha(General.Settings.DoubleSidedAlphaByte);
+		}
+
+		//mxd. This collects indices of linedefs, which are parts of sectors with 3d floors
+		public void UpdateExtraFloorFlag() 
+		{
+			HashSet<int> tags = new HashSet<int>();
+			
+			//find lines with 3d floor action and collect sector tags
+			foreach(Linedef l in General.Map.Map.Linedefs)
+			{
+				if(l.Action == 160) 
+				{
+					int sectortag = (General.Map.UDMF || (l.Args[1] & 8) != 0) ? l.Args[0] : l.Args[0] + (l.Args[4] << 8);
+					if(sectortag != 0 && !tags.Contains(sectortag)) tags.Add(sectortag);
+				}
+			}
+
+			//find lines, which are related to sectors with 3d floors, and collect their valuable indices
+			foreach(Linedef l in General.Map.Map.Linedefs) 
+			{
+				if(l.Front != null && l.Front.Sector != null && l.Front.Sector.Tag != 0 && tags.Overlaps(l.Front.Sector.Tags)) 
+				{
+					l.ExtraFloorFlag = true;
+					continue;
+				}
+				if(l.Back != null && l.Back.Sector != null && l.Back.Sector.Tag != 0 && tags.Overlaps(l.Back.Sector.Tags)) 
+				{
+					l.ExtraFloorFlag = true;
+					continue;
+				}
+
+				l.ExtraFloorFlag = false;
+			}
+		}
+
+		#endregion
+
+		#region ================== Start / Finish
+
+		// This begins a drawing session
+		public unsafe bool StartPlotter(bool clear)
+		{
+			if(renderlayer != RenderLayers.None)
+			{
+#if DEBUG
+				throw new InvalidOperationException("Renderer starting called before finished previous layer. Call Finish() first!");
+#else
+				return false; //mxd. Can't render. Most probably because previous frame or render layer wasn't finished yet.
+#endif
+			}
+
+			renderlayer = RenderLayers.Plotter;
+			try { graphics.Device.SetRenderState(RenderState.FogEnable, false); } catch(Exception) { }
+			
+			// Rendertargets available?
+			if(plottertex != null)
+			{
+				// Lock structures rendertarget memory
+				plotlocked = plottertex.LockRectangle(0, LockFlags.NoSystemLock);
+
+				// Create structures plotter
+				plotter = new Plotter((PixelColor*)plotlocked.Data.DataPointer.ToPointer(), plotlocked.Pitch / sizeof(PixelColor), structsize.Height, structsize.Width, structsize.Height);
+
+				// Redraw grid when structures image was cleared
+				if(clear)
+				{
+					plotter.Clear();
+					RenderBackgroundGrid();
+					SetupBackground();
+				}
+				
+				// Ready for rendering
+				UpdateTransformations();
+				return true;
+			}
+
+			// Can't render!
+			Finish();
+			return false;
+		}
+
+		// This begins a drawing session
+		public bool StartThings(bool clear)
+		{
+			if(renderlayer != RenderLayers.None)
+			{
+#if DEBUG
+				throw new InvalidOperationException("Renderer starting called before finished previous layer. Call Finish() first!");
+#else
+				return false; //mxd. Can't render. Most probably because previous frame or render layer wasn't finished yet.
+#endif
+			}
+
+			renderlayer = RenderLayers.Things;
+			try { graphics.Device.SetRenderState(RenderState.FogEnable, false); } catch(Exception) { }
+			
+			// Rendertargets available?
+			if(thingstex != null)
+			{
+				// Set the rendertarget to the things texture
+				targetsurface = thingstex.GetSurfaceLevel(0);
+				if(graphics.StartRendering(clear, General.Colors.Background.WithAlpha(0).ToColorValue(), targetsurface, null))
+				{
+					// Ready for rendering
+					UpdateTransformations();
+					return true;
+				}
+
+				// Can't render!
+				Finish();
+				return false;
+			}
+
+			// Can't render!
+			Finish();
+			return false;
+		}
+
+		// This begins a drawing session
+		public bool StartOverlay(bool clear)
+		{
+			if(renderlayer != RenderLayers.None)
+			{
+#if DEBUG
+				throw new InvalidOperationException("Renderer starting called before finished previous layer. Call Finish() first!");
+#else
+				return false; //mxd. Can't render. Most probably because previous frame or render layer wasn't finished yet.
+#endif
+			}
+
+			renderlayer = RenderLayers.Overlay;
+			try { graphics.Device.SetRenderState(RenderState.FogEnable, false); } catch(Exception) { }
+			
+			// Rendertargets available?
+			if(overlaytex != null)
+			{
+				// Set the rendertarget to the things texture
+				targetsurface = overlaytex.GetSurfaceLevel(0);
+				if(graphics.StartRendering(clear, General.Colors.Background.WithAlpha(0).ToColorValue(), targetsurface, null))
+				{
+					// Ready for rendering
+					UpdateTransformations();
+					return true;
+				}
+
+				// Can't render!
+				Finish();
+				return false;
+			}
+
+			// Can't render!
+			Finish();
+			return false;
+		}
+
+		// This ends a drawing session
+		public void Finish()
+		{
+			// Clean up plotter
+			if(renderlayer == RenderLayers.Plotter)
+			{
+				if(plottertex != null) plottertex.UnlockRectangle(0);
+				if(plotlocked.Data != null) plotlocked.Data.Dispose();
+				plotter = null;
+			}
+			
+			// Clean up things / overlay
+			if((renderlayer == RenderLayers.Things) || (renderlayer == RenderLayers.Overlay) || (renderlayer == RenderLayers.Surface))
+			{
+				// Stop rendering
+				graphics.FinishRendering();
+				
+				// Release rendertarget
+				try
+				{
+					graphics.Device.DepthStencilSurface = graphics.DepthBuffer;
+					graphics.Device.SetRenderTarget(0, graphics.BackBuffer);
+				}
+				catch(Exception) { }
+				if(targetsurface != null) targetsurface.Dispose();
+				targetsurface = null;
+			}
+			
+			// Done
+			renderlayer = RenderLayers.None;
+		}
+
+		#endregion
+
+		#region ================== Background
+
+		// This sets up background image vertices
+		private void SetupBackground()
+		{
+			// Only if a background image is set
+			if((General.Map.Grid.Background != null) && !(General.Map.Grid.Background is UnknownImage))
+			{
+				Vector2D backoffset = new Vector2D(General.Map.Grid.BackgroundX, General.Map.Grid.BackgroundY);
+				Vector2D backimagesize = new Vector2D(General.Map.Grid.Background.ScaledWidth, General.Map.Grid.Background.ScaledHeight);
+				Vector2D backimagescale = new Vector2D(General.Map.Grid.BackgroundScaleX, General.Map.Grid.BackgroundScaleY);
+
+				// Scale the background image size
+				backimagesize *= backimagescale;
+				
+				// Make vertices
+				backimageverts = CreateScreenVerts(windowsize);
+
+				// Determine map coordinates for view window
+				Vector2D ltpos = DisplayToMap(new Vector2D(0f, 0f));
+				Vector2D rbpos = DisplayToMap(new Vector2D(windowsize.Width, windowsize.Height));
+				
+				// Offset by given background offset
+				ltpos -= backoffset;
+				rbpos -= backoffset;
+				
+				// Calculate UV coordinates
+				// NOTE: backimagesize.y is made negative to match Doom's coordinate system
+				backimageverts[0].u = ltpos.x / backimagesize.x;
+				backimageverts[0].v = ltpos.y / -backimagesize.y;
+				backimageverts[1].u = rbpos.x / backimagesize.x;
+				backimageverts[1].v = ltpos.y / -backimagesize.y;
+				backimageverts[2].u = ltpos.x / backimagesize.x;
+				backimageverts[2].v = rbpos.y / -backimagesize.y;
+				backimageverts[3].u = rbpos.x / backimagesize.x;
+				backimageverts[3].v = rbpos.y / -backimagesize.y;
+			}
+			else
+			{
+				// No background image
+				backimageverts = null;
+			}
+		}
+
+		// This renders all grid
+		private unsafe void RenderBackgroundGrid()
+		{
+			// Do we need to redraw grid?
+			if((lastgridsize != General.Map.Grid.GridSize) || (lastgridscale != scale) ||
+			   (lastgridx != offsetx) || (lastgridy != offsety))
+			{
+				// Lock background rendertarget memory
+				DataRectangle lockedrect = backtex.LockRectangle(0, LockFlags.NoSystemLock);
+
+				// Create a plotter
+				Plotter gridplotter = new Plotter((PixelColor*)lockedrect.Data.DataPointer.ToPointer(), lockedrect.Pitch / sizeof(PixelColor), backsize.Height, backsize.Width, backsize.Height);
+				gridplotter.Clear();
+
+				if(General.Settings.RenderGrid) //mxd
+				{
+					// Render normal grid
+					RenderGrid(General.Map.Grid.GridSize, General.Colors.Grid, gridplotter);
+
+					// Render 64 grid
+					if(General.Map.Grid.GridSize <= 64) RenderGrid(64f, General.Colors.Grid64, gridplotter);
+				}
+				else
+				{
+					//mxd. Render map format bounds
+					Vector2D tl = new Vector2D(General.Map.Config.LeftBoundary, General.Map.Config.TopBoundary).GetTransformed(translatex, translatey, scale, -scale);
+					Vector2D rb = new Vector2D(General.Map.Config.RightBoundary, General.Map.Config.BottomBoundary).GetTransformed(translatex, translatey, scale, -scale);
+					PixelColor g = General.Colors.Grid64;
+					gridplotter.DrawGridLineH((int)tl.y, (int)tl.x, (int)rb.x, ref g);
+					gridplotter.DrawGridLineH((int)rb.y, (int)tl.x, (int)rb.x, ref g);
+					gridplotter.DrawGridLineV((int)tl.x, (int)tl.y, (int)rb.y, ref g);
+					gridplotter.DrawGridLineV((int)rb.x, (int)tl.y, (int)rb.y, ref g);
+				}
+
+				//mxd. Render center of map
+				Vector2D center = new Vector2D().GetTransformed(translatex, translatey, scale, -scale);
+				int cx = (int)center.x;
+				int cy = (int)center.y;
+				PixelColor c = General.Colors.Highlight;
+				gridplotter.DrawLineSolid(cx, cy + MAP_CENTER_SIZE, cx, cy - MAP_CENTER_SIZE, ref c);
+				gridplotter.DrawLineSolid(cx - MAP_CENTER_SIZE, cy, cx + MAP_CENTER_SIZE, cy, ref c);
+
+				// Done
+				backtex.UnlockRectangle(0);
+				lockedrect.Data.Dispose();
+				lastgridscale = scale;
+				lastgridsize = General.Map.Grid.GridSize;
+				lastgridx = offsetx;
+				lastgridy = offsety;
+			}
+		}
+		
+		// This renders the grid
+		private void RenderGrid(float size, PixelColor c, Plotter gridplotter)
+		{
+			Vector2D pos = new Vector2D();
+
+			//mxd. Increase rendered grid size if needed
+			if(!General.Settings.DynamicGridSize && size * scale <= 6f)
+				do { size *= 2; } while(size * scale <= 6f);
+			float sizeinv = 1f / size;
+
+			// Determine map coordinates for view window
+			Vector2D ltpos = DisplayToMap(new Vector2D(0, 0));
+			Vector2D rbpos = DisplayToMap(new Vector2D(windowsize.Width, windowsize.Height));
+
+			// Clip to nearest grid
+			ltpos = GridSetup.SnappedToGrid(ltpos, size, sizeinv);
+			rbpos = GridSetup.SnappedToGrid(rbpos, size, sizeinv);
+
+			// Translate top left boundary and right bottom boundary of map to screen coords
+			Vector2D tlb = new Vector2D(General.Map.Config.LeftBoundary, General.Map.Config.TopBoundary).GetTransformed(translatex, translatey, scale, -scale);
+			Vector2D rbb = new Vector2D(General.Map.Config.RightBoundary, General.Map.Config.BottomBoundary).GetTransformed(translatex, translatey, scale, -scale);
+
+			// Draw all horizontal grid lines
+			float ystart = rbpos.y > General.Map.Config.BottomBoundary ? rbpos.y : General.Map.Config.BottomBoundary;
+			float yend = ltpos.y < General.Map.Config.TopBoundary ? ltpos.y : General.Map.Config.TopBoundary;
+
+			for(float y = ystart; y < yend + size; y += size) 
+			{
+				if(y > General.Map.Config.TopBoundary) y = General.Map.Config.TopBoundary;
+				else if(y < General.Map.Config.BottomBoundary) y = General.Map.Config.BottomBoundary;
+
+				float from = tlb.x < 0 ? 0 : tlb.x;
+				float to = rbb.x > windowsize.Width ? windowsize.Width : rbb.x;
+
+				pos.y = y;
+				pos = pos.GetTransformed(translatex, translatey, scale, -scale);
+
+				// Note: I'm not using Math.Ceiling in this case, because that doesn't work right.
+				gridplotter.DrawGridLineH((int)pos.y, (int)Math.Round(from + 0.49999f), (int)Math.Round(to + 0.49999f), ref c);
+			}
+
+			// Draw all vertical grid lines
+			float xstart = ltpos.x > General.Map.Config.LeftBoundary ? ltpos.x : General.Map.Config.LeftBoundary;
+			float xend = rbpos.x < General.Map.Config.RightBoundary ? rbpos.x : General.Map.Config.RightBoundary;
+
+			for(float x = xstart; x < xend + size; x += size) 
+			{
+				if(x > General.Map.Config.RightBoundary) x = General.Map.Config.RightBoundary;
+				else if(x < General.Map.Config.LeftBoundary) x = General.Map.Config.LeftBoundary;
+
+				float from = tlb.y < 0 ? 0 : tlb.y;
+				float to = rbb.y > windowsize.Height ? windowsize.Height : rbb.y;
+
+				pos.x = x;
+				pos = pos.GetTransformed(translatex, translatey, scale, -scale);
+
+				// Note: I'm not using Math.Ceiling in this case, because that doesn't work right.
+				gridplotter.DrawGridLineV((int)pos.x, (int)Math.Round(from + 0.49999f), (int)Math.Round(to + 0.49999f), ref c);
+			}
+		}
+
+		//mxd
+		internal void GridVisibilityChanged()
+		{
+			lastgridscale = -1;
+		}
+
+		#endregion
+
+		#region ================== Things
+
+		// This makes vertices for a thing
+		// Returns false when not on the screen
+		private bool CreateThingBoxVerts(Thing t, ref FlatVertex[] verts, Dictionary<Thing, Vector2D> thingsByPosition, int offset, PixelColor c)
+		{
+			if(t.Size * scale < MINIMUM_THING_RADIUS) return false; //mxd. Don't render tiny little things
+
+			// Determine size
+			float circlesize = (t.FixedSize && (scale > 1.0f) ? t.Size /* * THING_CIRCLE_SIZE*/ : t.Size * scale /* * THING_CIRCLE_SIZE*/);
+			
+			// Transform to screen coordinates
+			Vector2D screenpos = ((Vector2D)t.Position).GetTransformed(translatex, translatey, scale, -scale);
+			
+			// Check if the thing is actually on screen
+			if(((screenpos.x + circlesize) <= 0.0f) || ((screenpos.x - circlesize) >= windowsize.Width) ||
+			   ((screenpos.y + circlesize) <= 0.0f) || ((screenpos.y - circlesize) >= windowsize.Height))
+				return false;
+
+			// Get integral color
+			int color = c.ToInt();
+
+			// Setup fixed rect for circle
+			verts[offset].x = screenpos.x - circlesize;
+			verts[offset].y = screenpos.y - circlesize;
+			verts[offset].c = color;
+			verts[offset].u = 0f;
+			verts[offset].v = 0f;
+			offset++;
+			verts[offset].x = screenpos.x + circlesize;
+			verts[offset].y = screenpos.y - circlesize;
+			verts[offset].c = color;
+			verts[offset].u = 0.5f;
+			verts[offset].v = 0f;
+			offset++;
+			verts[offset].x = screenpos.x - circlesize;
+			verts[offset].y = screenpos.y + circlesize;
+			verts[offset].c = color;
+			verts[offset].u = 0f;
+			verts[offset].v = 1f;
+			offset++;
+			verts[offset] = verts[offset - 2];
+			offset++;
+			verts[offset] = verts[offset - 2];
+			offset++;
+			verts[offset].x = screenpos.x + circlesize;
+			verts[offset].y = screenpos.y + circlesize;
+			verts[offset].c = color;
+			verts[offset].u = 0.5f;
+			verts[offset].v = 1f;
+
+			//mxd. Add to list
+			thingsByPosition.Add(t, screenpos);
+
+			// Done
+			return true;
+		}
+
+		//mxd
+		private void CreateThingArrowVerts(Thing t, ref FlatVertex[] verts, Vector2D screenpos, int offset) 
+		{
+			// Determine size
+			float arrowsize = (t.FixedSize && (scale > 1.0f) ? t.Size : t.Size * scale) * THING_ARROW_SIZE; //mxd
+
+			// Setup rotated rect for arrow
+			float sinarrowsize = (float)Math.Sin(t.Angle + Angle2D.PI * 0.25f) * arrowsize;
+			float cosarrowsize = (float)Math.Cos(t.Angle + Angle2D.PI * 0.25f) * arrowsize;
+
+			verts[offset].x = screenpos.x + sinarrowsize;
+			verts[offset].y = screenpos.y + cosarrowsize;
+			verts[offset].c = -1;
+			verts[offset].u = 0.501f;
+			verts[offset].v = 0.001f;
+			offset++;
+			verts[offset].x = screenpos.x - cosarrowsize;
+			verts[offset].y = screenpos.y + sinarrowsize;
+			verts[offset].c = -1;
+			verts[offset].u = 0.999f;
+			verts[offset].v = 0.001f;
+			offset++;
+			verts[offset].x = screenpos.x + cosarrowsize;
+			verts[offset].y = screenpos.y - sinarrowsize;
+			verts[offset].c = -1;
+			verts[offset].u = 0.501f;
+			verts[offset].v = 0.999f;
+			offset++;
+			verts[offset] = verts[offset - 2];
+			offset++;
+			verts[offset] = verts[offset - 2];
+			offset++;
+			verts[offset].x = screenpos.x - sinarrowsize;
+			verts[offset].y = screenpos.y - cosarrowsize;
+			verts[offset].c = -1;
+			verts[offset].u = 0.999f;
+			verts[offset].v = 0.999f;
+		}
+
+		//mxd
+		private static void CreateThingSpriteVerts(Vector2D screenpos, float width, float height, ref FlatVertex[] verts, int offset, int color) 
+		{
+			// Setup fixed rect for circle
+			verts[offset].x = screenpos.x - width;
+			verts[offset].y = screenpos.y - height;
+			verts[offset].c = color;
+			verts[offset].u = 0;
+			verts[offset].v = 0;
+			offset++;
+			verts[offset].x = screenpos.x + width;
+			verts[offset].y = screenpos.y - height;
+			verts[offset].c = color;
+			verts[offset].u = 1;
+			verts[offset].v = 0;
+			offset++;
+			verts[offset].x = screenpos.x - width;
+			verts[offset].y = screenpos.y + height;
+			verts[offset].c = color;
+			verts[offset].u = 0;
+			verts[offset].v = 1;
+			offset++;
+			verts[offset] = verts[offset - 2];
+			offset++;
+			verts[offset] = verts[offset - 2];
+			offset++;
+			verts[offset].x = screenpos.x + width;
+			verts[offset].y = screenpos.y + height;
+			verts[offset].c = color;
+			verts[offset].u = 1;
+			verts[offset].v = 1;
+		}
+		
+		// This draws a set of things
+		private void RenderThingsBatch(ICollection<Thing> things, float alpha, bool fixedcolor, PixelColor c)
+		{
+			// Anything to render?
+			if(things.Count > 0)
+			{
+				DataStream stream;
+				
+				// Make alpha color
+				Color4 alphacolor = new Color4(alpha, 1.0f, 1.0f, 1.0f);
+				
+				// Set renderstates for things rendering
+				graphics.Device.SetRenderState(RenderState.CullMode, Cull.None);
+				graphics.Device.SetRenderState(RenderState.ZEnable, false);
+				graphics.Device.SetRenderState(RenderState.AlphaBlendEnable, true);
+				graphics.Device.SetRenderState(RenderState.SourceBlend, Blend.SourceAlpha);
+				graphics.Device.SetRenderState(RenderState.DestinationBlend, Blend.InverseSourceAlpha);
+				graphics.Device.SetRenderState(RenderState.AlphaTestEnable, false);
+				graphics.Device.SetRenderState(RenderState.FogEnable, false);
+				graphics.Device.SetRenderState(RenderState.TextureFactor, alphacolor.ToArgb());
+				graphics.Device.SetStreamSource(0, thingsvertices, 0, FlatVertex.Stride);
+				
+				// Set things texture
+				graphics.Device.SetTexture(0, thingtexture.Texture);
+				graphics.Shaders.Things2D.Texture1 = thingtexture.Texture;
+				SetWorldTransformation(false);
+				graphics.Shaders.Things2D.SetSettings(alpha);
+				
+				// Begin drawing
+				graphics.Shaders.Things2D.Begin();
+				graphics.Shaders.Things2D.BeginPass(0);
+
+				// Determine next lock size
+				int locksize = (things.Count > THING_BUFFER_SIZE) ? THING_BUFFER_SIZE : things.Count;
+				FlatVertex[] verts = new FlatVertex[THING_BUFFER_SIZE * 6];
+
+				//mxd
+				Dictionary<int, List<Thing>> thingsByType = new Dictionary<int, List<Thing>>();
+				Dictionary<int, List<Thing>> modelsByType = new Dictionary<int, List<Thing>>();
+				Dictionary<Thing, Vector2D> thingsByPosition = new Dictionary<Thing, Vector2D>();
+
+				// Go for all things
+				int buffercount = 0;
+				int totalcount = 0;
+				foreach(Thing t in things)
+				{
+					//mxd. Highlighted thing should be rendered separately
+					if(!fixedcolor && t.Highlighted) continue;
+					
+					//collect models
+					if(t.IsModel) 
+					{
+						if(!modelsByType.ContainsKey(t.Type)) modelsByType.Add(t.Type, new List<Thing>());
+						modelsByType[t.Type].Add(t);
+					}
+					
+					// Create vertices
+					PixelColor tc = fixedcolor ? c : DetermineThingColor(t);
+					if(CreateThingBoxVerts(t, ref verts, thingsByPosition, buffercount * 6, tc)) 
+					{
+						buffercount++;
+
+						//mxd
+						if(!thingsByType.ContainsKey(t.Type)) thingsByType.Add(t.Type, new List<Thing>());
+						thingsByType[t.Type].Add(t);
+					}
+					
+					totalcount++;
+					
+					// Buffer filled?
+					if(buffercount == locksize)
+					{
+						// Write to buffer
+						stream = thingsvertices.Lock(0, locksize * 6 * FlatVertex.Stride, LockFlags.Discard);
+						stream.WriteRange(verts, 0, buffercount * 6);
+						thingsvertices.Unlock();
+						stream.Dispose();
+						
+						// Draw!
+						graphics.Device.DrawPrimitives(PrimitiveType.TriangleList, 0, buffercount * 2);
+						buffercount = 0;
+						
+						// Determine next lock size
+						locksize = ((things.Count - totalcount) > THING_BUFFER_SIZE) ? THING_BUFFER_SIZE : (things.Count - totalcount);
+					}
+				}
+
+				// Write to buffer
+				stream = thingsvertices.Lock(0, locksize * 6 * FlatVertex.Stride, LockFlags.Discard);
+				if(buffercount > 0) stream.WriteRange(verts, 0, buffercount * 6);
+				thingsvertices.Unlock();
+				stream.Dispose();
+				
+				// Draw what's still remaining
+				if(buffercount > 0)
+					graphics.Device.DrawPrimitives(PrimitiveType.TriangleList, 0, buffercount * 2);
+
+				// Done
+				graphics.Shaders.Things2D.EndPass();
+
+				//mxd. Render sprites
+				int selectionColor = General.Colors.Selection.ToInt();
+				graphics.Shaders.Things2D.BeginPass(1);
+
+				foreach(KeyValuePair<int, List<Thing>> group in thingsByType)
+				{
+					// Find thing information
+					ThingTypeInfo info = General.Map.Data.GetThingInfo(group.Key);
+
+					// Find sprite texture
+					if(info.Sprite.Length == 0) continue;
+
+					ImageData sprite = General.Map.Data.GetSpriteImage(info.Sprite);
+					if(sprite == null) continue; 
+					if(!sprite.IsImageLoaded) 
+					{
+						sprite.SetUsedInMap(true);
+						continue;
+					}
+					if(sprite.Texture == null) sprite.CreateTexture();
+
+					graphics.Device.SetTexture(0, sprite.Texture);
+					graphics.Shaders.Things2D.Texture1 = sprite.Texture;
+
+					// Determine next lock size
+					locksize = (group.Value.Count > THING_BUFFER_SIZE) ? THING_BUFFER_SIZE : group.Value.Count;
+					verts = new FlatVertex[THING_BUFFER_SIZE * 6];
+
+					// Go for all things
+					buffercount = 0;
+					totalcount = 0;
+
+					float spriteWidth, spriteHeight;
+					float spriteScale = (group.Value[0].FixedSize && (scale > 1.0f)) ? 1.0f : scale;
+
+					if(sprite.Width > sprite.Height) 
+					{
+						spriteWidth = info.Radius * spriteScale - THING_SPRITE_SHRINK * spriteScale;
+						spriteHeight = spriteWidth * ((float)sprite.Height / sprite.Width);
+					} 
+					else if(sprite.Width < sprite.Height) 
+					{
+						spriteHeight = info.Radius * spriteScale - THING_SPRITE_SHRINK * spriteScale;
+						spriteWidth = spriteHeight * ((float)sprite.Width / sprite.Height);
+					} 
+					else 
+					{
+						spriteWidth = info.Radius * spriteScale - THING_SPRITE_SHRINK * spriteScale;
+						spriteHeight = spriteWidth;
+					}
+
+					foreach(Thing t in group.Value) 
+					{
+						if(t.IsModel && (General.Settings.GZDrawModelsMode == ModelRenderMode.ALL || (General.Settings.GZDrawModelsMode == ModelRenderMode.SELECTION && t.Selected) || (General.Settings.GZDrawModelsMode == ModelRenderMode.ACTIVE_THINGS_FILTER && alpha == 1.0f))) continue;
+						float scaler = t.Size / info.Radius;
+						if(Math.Max(spriteWidth, spriteHeight) * scaler < MINIMUM_SPRITE_RADIUS) continue; //don't render tiny little sprites
+						
+						CreateThingSpriteVerts(thingsByPosition[t], spriteWidth * scaler, spriteHeight * scaler, ref verts, buffercount * 6, t.Selected ? selectionColor : 0xFFFFFF);
+						buffercount++;
+						totalcount++;
+
+						// Buffer filled?
+						if(buffercount == locksize) 
+						{
+							// Write to buffer
+							stream = thingsvertices.Lock(0, locksize * 6 * FlatVertex.Stride, LockFlags.Discard);
+							stream.WriteRange(verts, 0, buffercount * 6);
+							thingsvertices.Unlock();
+							stream.Dispose();
+
+							// Draw!
+							graphics.Device.DrawPrimitives(PrimitiveType.TriangleList, 0, buffercount * 2);
+
+							buffercount = 0;
+
+							// Determine next lock size
+							locksize = ((group.Value.Count - totalcount) > THING_BUFFER_SIZE) ? THING_BUFFER_SIZE : (group.Value.Count - totalcount);
+						}
+					}
+
+					// Write to buffer
+					stream = thingsvertices.Lock(0, locksize * 6 * FlatVertex.Stride, LockFlags.Discard);
+					if(buffercount > 0) stream.WriteRange(verts, 0, buffercount * 6);
+					thingsvertices.Unlock();
+					stream.Dispose();
+
+					// Draw what's still remaining
+					if(buffercount > 0) 
+						graphics.Device.DrawPrimitives(PrimitiveType.TriangleList, 0, buffercount * 2);
+				}
+
+				// Done
+				graphics.Shaders.Things2D.EndPass();
+
+				//mxd. Render thing arrows
+				graphics.Device.SetTexture(0, thingtexture.Texture);
+				graphics.Shaders.Things2D.Texture1 = thingtexture.Texture;
+				graphics.Shaders.Things2D.BeginPass(0);
+
+				// Determine next lock size
+				locksize = (thingsByPosition.Count > THING_BUFFER_SIZE) ? THING_BUFFER_SIZE : thingsByPosition.Count;
+				verts = new FlatVertex[THING_BUFFER_SIZE * 6];
+
+				// Go for all things
+				buffercount = 0;
+				totalcount = 0;
+
+				foreach(KeyValuePair<Thing, Vector2D> group in thingsByPosition) 
+				{
+					if(!group.Key.IsDirectional) continue;
+
+					CreateThingArrowVerts(group.Key, ref verts, group.Value, buffercount * 6);
+					buffercount++;
+					totalcount++;
+
+					// Buffer filled?
+					if(buffercount == locksize) 
+					{
+						// Write to buffer
+						stream = thingsvertices.Lock(0, locksize * 6 * FlatVertex.Stride, LockFlags.Discard);
+						stream.WriteRange(verts, 0, buffercount * 6);
+						thingsvertices.Unlock();
+						stream.Dispose();
+
+						// Draw!
+						graphics.Device.DrawPrimitives(PrimitiveType.TriangleList, 0, buffercount * 2);
+						buffercount = 0;
+
+						// Determine next lock size
+						locksize = ((thingsByPosition.Count - totalcount) > THING_BUFFER_SIZE) ? THING_BUFFER_SIZE : (thingsByPosition.Count - totalcount);
+					}
+				}
+
+				// Write to buffer
+				stream = thingsvertices.Lock(0, locksize * 6 * FlatVertex.Stride, LockFlags.Discard);
+				if(buffercount > 0) stream.WriteRange(verts, 0, buffercount * 6);
+				thingsvertices.Unlock();
+				stream.Dispose();
+
+				// Draw what's still remaining
+				if(buffercount > 0) 
+					graphics.Device.DrawPrimitives(PrimitiveType.TriangleList, 0, buffercount * 2);
+
+				//Done with this pass
+				graphics.Shaders.Things2D.EndPass();
+
+				//mxd. Render models
+				if(General.Settings.GZDrawModelsMode != ModelRenderMode.NONE) 
+				{
+					// Set renderstates for rendering
+					graphics.Device.SetRenderState(RenderState.AlphaBlendEnable, false);
+					graphics.Device.SetRenderState(RenderState.TextureFactor, -1);
+					graphics.Device.SetRenderState(RenderState.FillMode, FillMode.Wireframe);
+
+					graphics.Shaders.Things2D.BeginPass(2);
+
+					Color4 cSelection = General.Colors.Selection.ToColorValue();
+					Color4 cWire = ((c.ToInt() == General.Colors.Highlight.ToInt()) ? General.Colors.Highlight.ToColorValue() : General.Colors.ModelWireframe.ToColorValue());
+
+					cSelection.Alpha = ((alpha < 1.0f) ? alpha * 0.25f : 0.6f);
+					cWire.Alpha = cSelection.Alpha;
+
+					Matrix viewscale = Matrix.Scaling(scale, -scale, 0.0f);
+
+					foreach(KeyValuePair<int, List<Thing>> group in modelsByType)
+					{
+						ModelData mde = General.Map.Data.ModeldefEntries[@group.Key];
+						foreach(Thing t in group.Value) 
+						{
+							if((General.Settings.GZDrawModelsMode == ModelRenderMode.SELECTION && !t.Selected) || (General.Settings.GZDrawModelsMode == ModelRenderMode.ACTIVE_THINGS_FILTER && alpha < 1.0f)) continue;
+							Vector2D screenpos = ((Vector2D)t.Position).GetTransformed(translatex, translatey, scale, -scale);
+							float modelScale = scale * t.ActorScale.Width * t.ScaleX;
+
+							//should we render this model?
+							if(((screenpos.x + mde.Model.Radius * modelScale) <= 0.0f) || ((screenpos.x - mde.Model.Radius * modelScale) >= windowsize.Width) ||
+							((screenpos.y + mde.Model.Radius * modelScale) <= 0.0f) || ((screenpos.y - mde.Model.Radius * modelScale) >= windowsize.Height))
+								continue;
+
+							graphics.Shaders.Things2D.FillColor = (t.Selected ? cSelection : cWire);
+
+							// Set transform settings
+							float sx = t.ScaleX * t.ActorScale.Width;
+							float sy = t.ScaleY * t.ActorScale.Height;
+							
+							Matrix modelscale = Matrix.Scaling(sx, sx, sy);
+							Matrix rotation = Matrix.RotationY(-t.RollRad) * Matrix.RotationX(-t.PitchRad) * Matrix.RotationZ(t.Angle);
+							Matrix position = Matrix.Translation(screenpos.x, screenpos.y, 0.0f);
+							Matrix world = General.Map.Data.ModeldefEntries[t.Type].Transform * modelscale * rotation * viewscale * position;
+
+							graphics.Shaders.Things2D.SetTransformSettings(world);
+							graphics.Shaders.Things2D.ApplySettings();
+
+							// Draw
+							foreach(Mesh mesh in mde.Model.Meshes) mesh.DrawSubset(0);
+						}
+					}
+
+					//Done with this pass
+					graphics.Shaders.Things2D.EndPass();
+					graphics.Device.SetRenderState(RenderState.FillMode, FillMode.Solid);
+				}
+
+				graphics.Shaders.Things2D.End();
+			}
+		}
+		
+		// This adds a thing in the things buffer for rendering
+		public void RenderThing(Thing t, PixelColor c, float alpha)
+		{
+			List<Thing> things = new List<Thing>(1);
+			things.Add(t);
+			RenderThingsBatch(things, alpha, true, c);
+		}
+		
+		// This adds a thing in the things buffer for rendering
+		public void RenderThingSet(ICollection<Thing> things, float alpha)
+		{
+			RenderThingsBatch(things, alpha, false, new PixelColor());
+		}
+		
+		#endregion
+
+		#region ================== Surface
+
+		// This redraws the surface
+		public void RedrawSurface()
+		{
+			if(renderlayer != RenderLayers.None) return; //mxd
+			renderlayer = RenderLayers.Surface;
+
+			// Rendertargets available?
+			if(surfacetex != null)
+			{
+				// Set the rendertarget to the surface texture
+				targetsurface = surfacetex.GetSurfaceLevel(0);
+				if(graphics.StartRendering(true, General.Colors.Background.WithAlpha(0).ToColorValue(), targetsurface, null))
+				{
+					// Make sure anything we need is loaded
+					General.Map.Data.UnknownTexture3D.CreateTexture();
+					General.Map.Data.MissingTexture3D.CreateTexture(); //mxd
+
+					// Set transformations
+					UpdateTransformations();
+
+					// Set states
+					graphics.Device.SetRenderState(RenderState.CullMode, Cull.None);
+					graphics.Device.SetRenderState(RenderState.ZEnable, false);
+					graphics.Device.SetRenderState(RenderState.AlphaBlendEnable, false);
+					graphics.Device.SetRenderState(RenderState.AlphaTestEnable, false);
+					graphics.Device.SetRenderState(RenderState.TextureFactor, -1);
+					graphics.Device.SetRenderState(RenderState.FogEnable, false);
+					SetWorldTransformation(true);
+					graphics.Shaders.Display2D.SetSettings(1f, 1f, 0f, 1f, General.Settings.ClassicBilinear);
+					
+					// Prepare for rendering
+					switch(viewmode)
+					{
+						case ViewMode.Brightness:
+							surfaces.RenderSectorBrightness(yviewport);
+							surfaces.RenderSectorSurfaces(graphics);
+							break;
+							
+						case ViewMode.FloorTextures:
+							surfaces.RenderSectorFloors(yviewport);
+							surfaces.RenderSectorSurfaces(graphics);
+							break;
+							
+						case ViewMode.CeilingTextures:
+							surfaces.RenderSectorCeilings(yviewport);
+							surfaces.RenderSectorSurfaces(graphics);
+							break;
+					}
+				}
+			}
+			
+			// Done
+			Finish();
+		}
+
+		#endregion
+
+		#region ================== Overlay
+
+		// This renders geometry
+		// The geometry must be a triangle list
+		public void RenderGeometry(FlatVertex[] vertices, ImageData texture, bool transformcoords)
+		{
+			if(vertices.Length > 0)
+			{
+				Texture t;
+				
+				if(texture != null)
+				{
+					// Make sure the texture is loaded
+					if(!texture.IsImageLoaded) texture.LoadImage();
+					if(texture.Texture == null) texture.CreateTexture();
+					t = texture.Texture;
+				}
+				else
+				{
+					t = General.Map.Data.WhiteTexture.Texture;
+				}
+
+				// Set renderstates for rendering
+				graphics.Device.SetRenderState(RenderState.CullMode, Cull.None);
+				graphics.Device.SetRenderState(RenderState.ZEnable, false);
+				graphics.Device.SetRenderState(RenderState.AlphaBlendEnable, false);
+				graphics.Device.SetRenderState(RenderState.AlphaTestEnable, false);
+				graphics.Device.SetRenderState(RenderState.TextureFactor, -1);
+				graphics.Device.SetRenderState(RenderState.FogEnable, false);
+				graphics.Shaders.Display2D.Texture1 = t;
+				graphics.Device.SetTexture(0, t);
+				SetWorldTransformation(transformcoords);
+				graphics.Shaders.Display2D.SetSettings(1f, 1f, 0f, 1f, General.Settings.ClassicBilinear);
+				
+				// Draw
+				graphics.Shaders.Display2D.Begin();
+				graphics.Shaders.Display2D.BeginPass(1);
+				graphics.Device.DrawUserPrimitives(PrimitiveType.TriangleList, 0, vertices.Length / 3, vertices);
+				graphics.Shaders.Display2D.EndPass();
+				graphics.Shaders.Display2D.End();
+			}
+		}
+
+		//mxd
+		public void RenderHighlight(FlatVertex[] vertices, int color) 
+		{
+			if(vertices.Length < 3) return;
+
+			// Set renderstates for rendering
+			graphics.Device.SetRenderState(RenderState.CullMode, Cull.None);
+			graphics.Device.SetRenderState(RenderState.ZEnable, false);
+			graphics.Device.SetRenderState(RenderState.AlphaBlendEnable, false);
+			graphics.Device.SetRenderState(RenderState.AlphaTestEnable, false);
+			graphics.Device.SetRenderState(RenderState.TextureFactor, -1);
+			graphics.Device.SetRenderState(RenderState.FogEnable, false);
+
+			SetWorldTransformation(true);
+			graphics.Shaders.Things2D.FillColor = new Color4(color);
+			graphics.Shaders.Things2D.SetSettings(1.0f);
+
+			// Draw
+			graphics.Shaders.Things2D.Begin();
+			graphics.Shaders.Things2D.BeginPass(2);
+			graphics.Device.DrawUserPrimitives(PrimitiveType.TriangleList, 0, vertices.Length / 3, vertices);
+			graphics.Shaders.Things2D.EndPass();
+			graphics.Shaders.Things2D.End();
+		}
+
+		// This renders text
+		public void RenderText(TextLabel text)
+		{
+			// Update the text if needed
+			text.Update(translatex, translatey, scale, -scale);
+			
+			// Text is created?
+			if(text.VertexBuffer != null)
+			{
+				// Set renderstates for rendering
+				graphics.Device.SetRenderState(RenderState.CullMode, Cull.None);
+				graphics.Device.SetRenderState(RenderState.ZEnable, false);
+				graphics.Device.SetRenderState(RenderState.AlphaBlendEnable, true);
+				graphics.Device.SetRenderState(RenderState.AlphaTestEnable, false);
+				graphics.Device.SetRenderState(RenderState.TextureFactor, -1);
+				graphics.Device.SetRenderState(RenderState.FogEnable, false);
+				graphics.Shaders.Display2D.Texture1 = graphics.FontTexture;
+				SetWorldTransformation(false);
+				graphics.Shaders.Display2D.SetSettings(1f, 1f, 0f, 1f, true);
+				graphics.Device.SetTexture(0, graphics.FontTexture);
+				graphics.Device.SetStreamSource(0, text.VertexBuffer, 0, FlatVertex.Stride);
+
+				// Draw
+				graphics.Shaders.Display2D.Begin();
+				graphics.Shaders.Display2D.BeginPass(1); //mxd
+				//graphics.Device.DrawPrimitives(PrimitiveType.TriangleList, 0, text.NumFaces >> 1); //mxd. Seems to be working fine without this line, soooo...
+				graphics.Device.DrawPrimitives(PrimitiveType.TriangleList, 0, text.NumFaces);
+				graphics.Shaders.Display2D.EndPass();
+				graphics.Shaders.Display2D.End();
+			}
+		}
+		
+		// This renders a rectangle with given border size and color
+		public void RenderRectangle(RectangleF rect, float bordersize, PixelColor c, bool transformrect)
+		{
+			FlatQuad[] quads = new FlatQuad[4];
+			
+			/*
+			 * Rectangle setup:
+			 * 
+			 *  --------------------------
+			 *  |___________0____________|
+			 *  |  |                  |  |
+			 *  |  |                  |  |
+			 *  |  |                  |  |
+			 *  | 2|                  |3 |
+			 *  |  |                  |  |
+			 *  |  |                  |  |
+			 *  |__|__________________|__|
+			 *  |           1            |
+			 *  --------------------------
+			 * 
+			 * Don't you just love ASCII art?
+			 */
+			
+			// Calculate positions
+			Vector2D lt = new Vector2D(rect.Left, rect.Top);
+			Vector2D rb = new Vector2D(rect.Right, rect.Bottom);
+			if(transformrect)
+			{
+				lt = lt.GetTransformed(translatex, translatey, scale, -scale);
+				rb = rb.GetTransformed(translatex, translatey, scale, -scale);
+			}
+			
+			// Make quads
+			quads[0] = new FlatQuad(PrimitiveType.TriangleStrip, lt.x, lt.y, rb.x, lt.y - bordersize);
+			quads[1] = new FlatQuad(PrimitiveType.TriangleStrip, lt.x, rb.y + bordersize, rb.x, rb.y);
+			quads[2] = new FlatQuad(PrimitiveType.TriangleStrip, lt.x, lt.y - bordersize, lt.x + bordersize, rb.y + bordersize);
+			quads[3] = new FlatQuad(PrimitiveType.TriangleStrip, rb.x - bordersize, lt.y - bordersize, rb.x, rb.y + bordersize);
+			quads[0].SetColors(c.ToInt());
+			quads[1].SetColors(c.ToInt());
+			quads[2].SetColors(c.ToInt());
+			quads[3].SetColors(c.ToInt());
+			
+			// Set renderstates for rendering
+			graphics.Device.SetRenderState(RenderState.CullMode, Cull.None);
+			graphics.Device.SetRenderState(RenderState.ZEnable, false);
+			graphics.Device.SetRenderState(RenderState.AlphaBlendEnable, false);
+			graphics.Device.SetRenderState(RenderState.AlphaTestEnable, false);
+			graphics.Device.SetRenderState(RenderState.TextureFactor, -1);
+			graphics.Device.SetRenderState(RenderState.FogEnable, false);
+			SetWorldTransformation(false);
+			graphics.Device.SetTexture(0, General.Map.Data.WhiteTexture.Texture);
+			graphics.Shaders.Display2D.Texture1 = General.Map.Data.WhiteTexture.Texture;
+			graphics.Shaders.Display2D.SetSettings(1f, 1f, 0f, 1f, General.Settings.ClassicBilinear);
+			
+			// Draw
+			graphics.Shaders.Display2D.Begin();
+			graphics.Shaders.Display2D.BeginPass(1);
+			quads[0].Render(graphics);
+			quads[1].Render(graphics);
+			quads[2].Render(graphics);
+			quads[3].Render(graphics);
+			graphics.Shaders.Display2D.EndPass();
+			graphics.Shaders.Display2D.End();
+		}
+
+		// This renders a filled rectangle with given color
+		public void RenderRectangleFilled(RectangleF rect, PixelColor c, bool transformrect)
+		{
+			// Calculate positions
+			Vector2D lt = new Vector2D(rect.Left, rect.Top);
+			Vector2D rb = new Vector2D(rect.Right, rect.Bottom);
+			if(transformrect)
+			{
+				lt = lt.GetTransformed(translatex, translatey, scale, -scale);
+				rb = rb.GetTransformed(translatex, translatey, scale, -scale);
+			}
+
+			// Make quad
+			FlatQuad quad = new FlatQuad(PrimitiveType.TriangleStrip, lt.x, lt.y, rb.x, rb.y);
+			quad.SetColors(c.ToInt());
+			
+			// Set renderstates for rendering
+			graphics.Device.SetRenderState(RenderState.CullMode, Cull.None);
+			graphics.Device.SetRenderState(RenderState.ZEnable, false);
+			graphics.Device.SetRenderState(RenderState.AlphaBlendEnable, false);
+			graphics.Device.SetRenderState(RenderState.AlphaTestEnable, false);
+			graphics.Device.SetRenderState(RenderState.TextureFactor, -1);
+			graphics.Device.SetRenderState(RenderState.FogEnable, false);
+			SetWorldTransformation(false);
+			graphics.Device.SetTexture(0, General.Map.Data.WhiteTexture.Texture);
+			graphics.Shaders.Display2D.Texture1 = General.Map.Data.WhiteTexture.Texture;
+			graphics.Shaders.Display2D.SetSettings(1f, 1f, 0f, 1f, General.Settings.ClassicBilinear);
+
+			// Draw
+			graphics.Shaders.Display2D.Begin();
+			graphics.Shaders.Display2D.BeginPass(1);
+			quad.Render(graphics);
+			graphics.Shaders.Display2D.EndPass();
+			graphics.Shaders.Display2D.End();
+		}
+
+		// This renders a filled rectangle with given color
+		public void RenderRectangleFilled(RectangleF rect, PixelColor c, bool transformrect, ImageData texture)
+		{
+			// Calculate positions
+			Vector2D lt = new Vector2D(rect.Left, rect.Top);
+			Vector2D rb = new Vector2D(rect.Right, rect.Bottom);
+			if(transformrect)
+			{
+				lt = lt.GetTransformed(translatex, translatey, scale, -scale);
+				rb = rb.GetTransformed(translatex, translatey, scale, -scale);
+			}
+
+			// Make quad
+			FlatQuad quad = new FlatQuad(PrimitiveType.TriangleStrip, lt.x, lt.y, rb.x, rb.y);
+			quad.SetColors(c.ToInt());
+
+			// Set renderstates for rendering
+			graphics.Device.SetRenderState(RenderState.CullMode, Cull.None);
+			graphics.Device.SetRenderState(RenderState.ZEnable, false);
+			graphics.Device.SetRenderState(RenderState.AlphaBlendEnable, false);
+			graphics.Device.SetRenderState(RenderState.AlphaTestEnable, false);
+			graphics.Device.SetRenderState(RenderState.TextureFactor, -1);
+			graphics.Device.SetRenderState(RenderState.FogEnable, false);
+			SetWorldTransformation(false);
+			graphics.Device.SetTexture(0, texture.Texture);
+			graphics.Shaders.Display2D.Texture1 = texture.Texture;
+			graphics.Shaders.Display2D.SetSettings(1f, 1f, 0f, 1f, General.Settings.ClassicBilinear);
+
+			// Draw
+			graphics.Shaders.Display2D.Begin();
+			graphics.Shaders.Display2D.BeginPass(1);
+			quad.Render(graphics);
+			graphics.Shaders.Display2D.EndPass();
+			graphics.Shaders.Display2D.End();
+		}
+
+		//mxd
+		public void RenderArrows(ICollection<Line3D> lines) 
+		{
+			if(lines.Count == 0) return;
+			int pointscount = 0;
+
+			// Translate to screen coords, determine renderability
+			foreach(Line3D line in lines)
+			{
+				// Calculate screen positions
+				line.Start2D = ((Vector2D)line.Start).GetTransformed(translatex, translatey, scale, -scale); //start
+				line.End2D = ((Vector2D)line.End).GetTransformed(translatex, translatey, scale, -scale); //end
+
+				float maxx = Math.Max(line.Start2D.x, line.End2D.x);
+				float minx = Math.Min(line.Start2D.x, line.End2D.x);
+				float maxy = Math.Max(line.Start2D.y, line.End2D.y);
+				float miny = Math.Min(line.Start2D.y, line.End2D.y);
+
+				// Too small / not on screen?
+				if(((line.End2D - line.Start2D).GetLengthSq() < MINIMUM_SPRITE_RADIUS) || ((maxx <= 0.0f) || (minx >= windowsize.Width) || (maxy <= 0.0f) || (miny >= windowsize.Height)))
+				{
+					line.SkipRendering = true;
+				}
+				else
+				{
+					pointscount += (line.RenderArrowhead ? 6 : 2); // 4 extra points for the arrowhead
+					line.SkipRendering = false;
+				}
+			}
+
+			// Anything to do?
+			if(pointscount < 2) return;
+
+			FlatVertex[] verts = new FlatVertex[pointscount];
+			float scaler = 16f / scale;
+
+			// Create verts array
+			pointscount = 0;
+			foreach(Line3D line in lines)
+			{
+				if(line.SkipRendering) continue;
+				int color = line.Color.ToInt();
+
+				// Add regular points
+				verts[pointscount].x = line.Start2D.x;
+				verts[pointscount].y = line.Start2D.y;
+				verts[pointscount].c = color;
+				pointscount++;
+
+				verts[pointscount].x = line.End2D.x;
+				verts[pointscount].y = line.End2D.y;
+				verts[pointscount].c = color;
+				pointscount++;
+
+				// Add arrowhead
+				if(line.RenderArrowhead)
+				{
+					float angle = line.GetAngle();
+					Vector2D a1 = new Vector2D(line.End.x - scaler * (float)Math.Sin(angle - 0.46f), line.End.y + scaler * (float)Math.Cos(angle - 0.46f)).GetTransformed(translatex, translatey, scale, -scale); //arrowhead end 1
+					Vector2D a2 = new Vector2D(line.End.x - scaler * (float)Math.Sin(angle + 0.46f), line.End.y + scaler * (float)Math.Cos(angle + 0.46f)).GetTransformed(translatex, translatey, scale, -scale); //arrowhead end 2
+					
+					verts[pointscount] = verts[pointscount - 1];
+					verts[pointscount + 1].x = a1.x;
+					verts[pointscount + 1].y = a1.y;
+					verts[pointscount + 1].c = color;
+
+					verts[pointscount + 2] = verts[pointscount - 1];
+					verts[pointscount + 3].x = a2.x;
+					verts[pointscount + 3].y = a2.y;
+					verts[pointscount + 3].c = color;
+
+					pointscount += 4;
+				}
+			}
+
+			// Write to buffer
+			VertexBuffer vb = new VertexBuffer(General.Map.Graphics.Device, FlatVertex.Stride * verts.Length, Usage.WriteOnly | Usage.Dynamic, VertexFormat.None, Pool.Default);
+			DataStream s = vb.Lock(0, FlatVertex.Stride * verts.Length, LockFlags.Discard);
+			s.WriteRange(verts);
+			vb.Unlock();
+			s.Dispose();
+
+			// Set renderstates for rendering
+			graphics.Device.SetRenderState(RenderState.CullMode, Cull.None);
+			graphics.Device.SetRenderState(RenderState.ZEnable, false);
+			graphics.Device.SetRenderState(RenderState.AlphaBlendEnable, false);
+			graphics.Device.SetRenderState(RenderState.AlphaTestEnable, false);
+			graphics.Device.SetRenderState(RenderState.TextureFactor, -1);
+			graphics.Device.SetRenderState(RenderState.FogEnable, false);
+			SetWorldTransformation(false);
+			graphics.Device.SetTexture(0, General.Map.Data.WhiteTexture.Texture);
+			graphics.Shaders.Display2D.Texture1 = General.Map.Data.WhiteTexture.Texture;
+			graphics.Shaders.Display2D.SetSettings(1f, 1f, 0f, 1f, General.Settings.ClassicBilinear);
+
+			// Draw
+			graphics.Shaders.Display2D.Begin();
+			graphics.Shaders.Display2D.BeginPass(1);
+			graphics.Device.SetStreamSource(0, vb, 0, FlatVertex.Stride);
+			graphics.Device.DrawPrimitives(PrimitiveType.LineList, 0, pointscount / 2);
+			graphics.Shaders.Display2D.EndPass();
+			graphics.Shaders.Display2D.End();
+			vb.Dispose();
+		}
+
+		// This renders a line with given color
+		public void RenderLine(Vector2D start, Vector2D end, float thickness, PixelColor c, bool transformcoords)
+		{
+			FlatVertex[] verts = new FlatVertex[4];
+			
+			// Calculate positions
+			if(transformcoords)
+			{
+				start = start.GetTransformed(translatex, translatey, scale, -scale);
+				end = end.GetTransformed(translatex, translatey, scale, -scale);
+			}
+
+			// Calculate offsets
+			Vector2D delta = end - start;
+			Vector2D dn = delta.GetNormal() * thickness;
+			
+			// Make vertices
+			verts[0].x = start.x - dn.x + dn.y;
+			verts[0].y = start.y - dn.y - dn.x;
+			verts[0].z = 0.0f;
+			verts[0].c = c.ToInt();
+			verts[1].x = start.x - dn.x - dn.y;
+			verts[1].y = start.y - dn.y + dn.x;
+			verts[1].z = 0.0f;
+			verts[1].c = c.ToInt();
+			verts[2].x = end.x + dn.x + dn.y;
+			verts[2].y = end.y + dn.y - dn.x;
+			verts[2].z = 0.0f;
+			verts[2].c = c.ToInt();
+			verts[3].x = end.x + dn.x - dn.y;
+			verts[3].y = end.y + dn.y + dn.x;
+			verts[3].z = 0.0f;
+			verts[3].c = c.ToInt();
+			
+			// Set renderstates for rendering
+			graphics.Device.SetRenderState(RenderState.CullMode, Cull.None);
+			graphics.Device.SetRenderState(RenderState.ZEnable, false);
+			graphics.Device.SetRenderState(RenderState.AlphaBlendEnable, false);
+			graphics.Device.SetRenderState(RenderState.AlphaTestEnable, false);
+			graphics.Device.SetRenderState(RenderState.TextureFactor, -1);
+			graphics.Device.SetRenderState(RenderState.FogEnable, false);
+			SetWorldTransformation(false);
+			graphics.Device.SetTexture(0, General.Map.Data.WhiteTexture.Texture);
+			graphics.Shaders.Display2D.Texture1 = General.Map.Data.WhiteTexture.Texture;
+			graphics.Shaders.Display2D.SetSettings(1f, 1f, 0f, 1f, General.Settings.ClassicBilinear);
+
+			// Draw
+			graphics.Shaders.Display2D.Begin();
+			graphics.Shaders.Display2D.BeginPass(0);
+			graphics.Device.DrawUserPrimitives(PrimitiveType.TriangleStrip, 0, 2, verts);
+			graphics.Shaders.Display2D.EndPass();
+			graphics.Shaders.Display2D.End();
+		}
+
+		#endregion
+
+		#region ================== Geometry
+
+		// This renders the linedefs of a sector with special color
+		public void PlotSector(Sector s, PixelColor c)
+		{
+			// Go for all sides in the sector
+			foreach(Sidedef sd in s.Sidedefs)
+			{
+				// Render this linedef
+				PlotLinedef(sd.Line, c);
+
+				// Render the two vertices on top
+				PlotVertex(sd.Line.Start, DetermineVertexColor(sd.Line.Start));
+				PlotVertex(sd.Line.End, DetermineVertexColor(sd.Line.End));
+			}
+		}
+
+		// This renders the linedefs of a sector
+		public void PlotSector(Sector s)
+		{
+			// Go for all sides in the sector
+			foreach(Sidedef sd in s.Sidedefs)
+			{
+				// Render this linedef
+				PlotLinedef(sd.Line, DetermineLinedefColor(sd.Line));
+
+				// Render the two vertices on top
+				PlotVertex(sd.Line.Start, DetermineVertexColor(sd.Line.Start));
+				PlotVertex(sd.Line.End, DetermineVertexColor(sd.Line.End));
+			}
+		}	
+
+		// This renders a simple line
+		public void PlotLine(Vector2D start, Vector2D end, PixelColor c)
+		{
+			// Transform coordinates
+			Vector2D v1 = start.GetTransformed(translatex, translatey, scale, -scale);
+			Vector2D v2 = end.GetTransformed(translatex, translatey, scale, -scale);
+			
+			//mxd. Should we bother?
+			if((v2 - v1).GetLengthSq() < linenormalsize * 0.0625f) return;
+
+			// Draw line
+			plotter.DrawLineSolid((int)v1.x, (int)v1.y, (int)v2.x, (int)v2.y, ref c);
+		}
+		
+		// This renders a single linedef
+		public void PlotLinedef(Linedef l, PixelColor c)
+		{
+			// Transform vertex coordinates
+			Vector2D v1 = l.Start.Position.GetTransformed(translatex, translatey, scale, -scale);
+			Vector2D v2 = l.End.Position.GetTransformed(translatex, translatey, scale, -scale);
+			
+			//mxd. Should we bother?
+			float lengthsq = (v2 - v1).GetLengthSq();
+			if(lengthsq < minlinelength) return; //mxd
+
+			// Draw line. mxd: added 3d-floor indication
+			if(l.ExtraFloorFlag && General.Settings.GZMarkExtraFloors)
+				plotter.DrawLine3DFloor(v1, v2, ref c, General.Colors.ThreeDFloor);
+			else
+				plotter.DrawLineSolid((int)v1.x, (int)v1.y, (int)v2.x, (int)v2.y, ref c);
+
+			//mxd. Should we bother?
+			if(lengthsq < minlinenormallength) return; //mxd
+
+			// Calculate normal indicator
+			float mx = (v2.x - v1.x) * 0.5f;
+			float my = (v2.y - v1.y) * 0.5f;
+
+			// Draw normal indicator
+			plotter.DrawLineSolid((int)(v1.x + mx), (int)(v1.y + my),
+								  (int)((v1.x + mx) - (my * l.LengthInv) * linenormalsize),
+								  (int)((v1.y + my) + (mx * l.LengthInv) * linenormalsize), ref c);
+		}
+		
+		// This renders a set of linedefs
+		public void PlotLinedefSet(ICollection<Linedef> linedefs)
+		{
+			// Go for all linedefs
+			foreach(Linedef l in linedefs)
+			{
+				// Transform vertex coordinates
+				Vector2D v1 = l.Start.Position.GetTransformed(translatex, translatey, scale, -scale);
+				Vector2D v2 = l.End.Position.GetTransformed(translatex, translatey, scale, -scale);
+
+				//mxd. Should we bother?
+				float lengthsq = (v2 - v1).GetLengthSq();
+				if(lengthsq < minlinelength) continue; //mxd
+
+				// Determine color
+				PixelColor c = DetermineLinedefColor(l);
+
+				// Draw line. mxd: added 3d-floor indication
+				if(l.ExtraFloorFlag && General.Settings.GZMarkExtraFloors)
+					plotter.DrawLine3DFloor(v1, v2, ref c, General.Colors.ThreeDFloor);
+				else
+					plotter.DrawLineSolid((int)v1.x, (int)v1.y, (int)v2.x, (int)v2.y, ref c);
+
+				//mxd. Should we bother?
+				if(lengthsq < minlinenormallength) continue; //mxd
+
+				// Calculate normal indicator
+				float mx = (v2.x - v1.x) * 0.5f;
+				float my = (v2.y - v1.y) * 0.5f;
+
+				// Draw normal indicator
+				plotter.DrawLineSolid((int)(v1.x + mx), (int)(v1.y + my),
+									  (int)((v1.x + mx) - (my * l.LengthInv) * linenormalsize),
+									  (int)((v1.y + my) + (mx * l.LengthInv) * linenormalsize), ref c);
+			}
+		}
+
+		// This renders a single vertex
+		public void PlotVertex(Vertex v, int colorindex)
+		{
+			// Transform vertex coordinates
+			Vector2D nv = v.Position.GetTransformed(translatex, translatey, scale, -scale);
+
+			// Draw pixel here
+			plotter.DrawVertexSolid((int)nv.x, (int)nv.y, vertexsize, ref General.Colors.Colors[colorindex], ref General.Colors.BrightColors[colorindex], ref General.Colors.DarkColors[colorindex]);
+		}
+
+		// This renders a single vertex at specified coordinates
+		public void PlotVertexAt(Vector2D v, int colorindex)
+		{
+			// Transform vertex coordinates
+			Vector2D nv = v.GetTransformed(translatex, translatey, scale, -scale);
+
+			// Draw pixel here
+			plotter.DrawVertexSolid((int)nv.x, (int)nv.y, vertexsize, ref General.Colors.Colors[colorindex], ref General.Colors.BrightColors[colorindex], ref General.Colors.DarkColors[colorindex]);
+		}
+		
+		// This renders a set of vertices
+		public void PlotVerticesSet(ICollection<Vertex> vertices)
+		{
+			// Go for all vertices
+			foreach(Vertex v in vertices) PlotVertex(v, DetermineVertexColor(v));
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Rendering/Renderer3D.cs b/Source/Core/Rendering/Renderer3D.cs
new file mode 100644
index 0000000..b03b024
--- /dev/null
+++ b/Source/Core/Rendering/Renderer3D.cs
@@ -0,0 +1,1794 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Data;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.GZBuilder.Data;
+using CodeImp.DoomBuilder.GZBuilder.Geometry;
+using CodeImp.DoomBuilder.GZBuilder.MD3;
+using CodeImp.DoomBuilder.GZBuilder.Rendering;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.VisualModes;
+using SlimDX;
+using SlimDX.Direct3D9;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Rendering
+{
+	internal sealed class Renderer3D : Renderer, IRenderer3D
+	{
+		#region ================== Constants
+
+		private const float PROJ_NEAR_PLANE = 1f;
+		private const float FOG_RANGE = 0.9f;
+		internal const float GZDOOM_VERTICAL_VIEW_STRETCH = 1.2f;
+		internal const float GZDOOM_INVERTED_VERTICAL_VIEW_STRETCH = 1.0f / GZDOOM_VERTICAL_VIEW_STRETCH;
+		
+		#endregion
+
+		#region ================== Variables
+
+		// Matrices
+		private Matrix projection;
+		private Matrix view3d;
+		private Matrix viewproj; //mxd
+		private Matrix billboard;
+		private Matrix view2d;
+		private Matrix world;
+		private Vector3D cameraposition;
+		private int shaderpass;
+		
+		// Window size
+		private Size windowsize;
+		
+		// Frustum
+		private ProjectedFrustum2D frustum;
+		
+		// Thing cage
+		private bool renderthingcages;
+		//mxd
+		private VisualVertexHandle vertexHandle;
+		private int[] lightOffsets;
+		
+		// Crosshair
+		private FlatVertex[] crosshairverts;
+		private bool crosshairbusy;
+
+		// Highlighting
+		private IVisualPickable highlighted;
+		private float highlightglow;
+		private float highlightglowinv;
+		private ColorImage highlightimage;
+		private ColorImage selectionimage;
+		private bool showselection;
+		private bool showhighlight;
+		
+		//mxd. Solid geometry to be rendered. Must be sorted by sector.
+		private Dictionary<ImageData, List<VisualGeometry>> solidgeo;
+
+		//mxd. Masked geometry to be rendered. Must be sorted by sector.
+		private Dictionary<ImageData, List<VisualGeometry>> maskedgeo;
+
+		//mxd. Translucent geometry to be rendered. Must be sorted by camera distance.
+		private List<VisualGeometry> translucentgeo;
+
+		//mxd. Solid things to be rendered (currently(?) there won't be any). Must be sorted by sector.
+		private Dictionary<ImageData, List<VisualThing>> solidthings;
+
+		//mxd. Masked things to be rendered. Must be sorted by sector.
+		private Dictionary<ImageData, List<VisualThing>> maskedthings;
+
+		//mxd. Translucent things to be rendered. Must be sorted by camera distance.
+		private List<VisualThing> translucentthings;
+
+		//mxd. Things with attached dynamic lights
+		private List<VisualThing> lightthings;
+		
+		//mxd. Things, which should be rendered as models
+		private Dictionary<ModelData, List<VisualThing>> maskedmodelthings;
+
+		//mxd. Things, which should be rendered as translucent models
+		private List<VisualThing> translucentmodelthings;
+
+		//mxd. All things. Used to render thing cages
+		private List<VisualThing> allthings;
+
+		//mxd. Visual vertices
+		private List<VisualVertex> visualvertices;
+
+		//mxd. Event lines
+		private List<Line3D> eventlines;
+		
+		#endregion
+
+		#region ================== Properties
+
+		public ProjectedFrustum2D Frustum2D { get { return frustum; } }
+		public bool DrawThingCages { get { return renderthingcages; } set { renderthingcages = value; } }
+		public bool ShowSelection { get { return showselection; } set { showselection = value; } }
+		public bool ShowHighlight { get { return showhighlight; } set { showhighlight = value; } }
+		
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		internal Renderer3D(D3DDevice graphics) : base(graphics)
+		{
+			// Initialize
+			CreateProjection();
+			CreateMatrices2D();
+			SetupHelperObjects(); //mxd
+			SetupTextures();
+			renderthingcages = true;
+			showselection = true;
+			showhighlight = true;
+			eventlines = new List<Line3D>(); //mxd
+			
+			// Dummy frustum
+			frustum = new ProjectedFrustum2D(new Vector2D(), 0.0f, 0.0f, PROJ_NEAR_PLANE,
+				General.Settings.ViewDistance, Angle2D.DegToRad(General.Settings.VisualFOV));
+
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Disposer
+		internal override void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Clean up
+				if(selectionimage != null) selectionimage.Dispose();
+				if(highlightimage != null) highlightimage.Dispose();
+				selectionimage = null;
+				highlightimage = null;
+				vertexHandle.Dispose(); //mxd
+				
+				// Done
+				base.Dispose();
+			}
+		}
+
+		#endregion
+
+		#region ================== Management
+
+		// This is called before a device is reset
+		// (when resized or display adapter was changed)
+		public override void UnloadResource()
+		{
+			crosshairverts = null;
+
+			if(selectionimage != null) selectionimage.Dispose();
+			if(highlightimage != null) highlightimage.Dispose();
+			selectionimage = null;
+			highlightimage = null;
+		}
+		
+		// This is called resets when the device is reset
+		// (when resized or display adapter was changed)
+		public override void ReloadResource()
+		{
+			CreateMatrices2D();
+			SetupTextures();
+		}
+
+		// This makes screen vertices for display
+		private void CreateCrosshairVerts(Size texturesize)
+		{
+			// Determine coordinates
+			float width = windowsize.Width;
+			float height = windowsize.Height;
+			RectangleF rect = new RectangleF((float)Math.Round((width - texturesize.Width) * 0.5f), (float)Math.Round((height - texturesize.Height) * 0.5f), texturesize.Width, texturesize.Height);
+			
+			// Make vertices
+			crosshairverts = new FlatVertex[4];
+			crosshairverts[0].x = rect.Left;
+			crosshairverts[0].y = rect.Top;
+			crosshairverts[0].c = -1;
+			crosshairverts[1].x = rect.Right;
+			crosshairverts[1].y = rect.Top;
+			crosshairverts[1].c = -1;
+			crosshairverts[1].u = 1.0f;
+			crosshairverts[2].x = rect.Left;
+			crosshairverts[2].y = rect.Bottom;
+			crosshairverts[2].c = -1;
+			crosshairverts[2].v = 1.0f;
+			crosshairverts[3].x = rect.Right;
+			crosshairverts[3].y = rect.Bottom;
+			crosshairverts[3].c = -1;
+			crosshairverts[3].u = 1.0f;
+			crosshairverts[3].v = 1.0f;
+		}
+		
+		#endregion
+
+		#region ================== Resources
+
+		// This loads the textures for highlight and selection if we need them
+		private void SetupTextures()
+		{
+			if(!graphics.Shaders.Enabled)
+			{
+				highlightimage = new ColorImage(General.Colors.Highlight, 32, 32);
+				highlightimage.LoadImage();
+				highlightimage.CreateTexture();
+				
+				selectionimage = new ColorImage(General.Colors.Selection, 32, 32);
+				selectionimage.LoadImage();
+				selectionimage.CreateTexture();
+			}
+		}
+
+		//mxd
+		private void SetupHelperObjects() 
+		{
+			vertexHandle = new VisualVertexHandle();
+		}
+
+		//mxd
+		internal void UpdateVertexHandle()
+		{
+			vertexHandle.UnloadResource();
+			vertexHandle.ReloadResource();
+		}
+
+		#endregion
+		
+		#region ================== Presentation
+
+		// This creates the projection
+		internal void CreateProjection()
+		{
+			// Calculate aspect
+			float screenheight = General.Map.Graphics.RenderTarget.ClientSize.Height * (General.Settings.GZStretchView ? GZDOOM_INVERTED_VERTICAL_VIEW_STRETCH : 1.0f); //mxd
+			float aspect = General.Map.Graphics.RenderTarget.ClientSize.Width / screenheight;
+			
+			// The DirectX PerspectiveFovRH matrix method calculates the scaling in X and Y as follows:
+			// yscale = 1 / tan(fovY / 2)
+			// xscale = yscale / aspect
+			// The fov specified in the method is the FOV over Y, but we want the user to specify the FOV
+			// over X, so calculate what it would be over Y first;
+			float fov = Angle2D.DegToRad(General.Settings.VisualFOV);
+			float reversefov = 1.0f / (float)Math.Tan(fov / 2.0f);
+			float reversefovy = reversefov * aspect;
+			float fovy = (float)Math.Atan(1.0f / reversefovy) * 2.0f;
+			
+			// Make the projection matrix
+			projection = Matrix.PerspectiveFovRH(fovy, aspect, PROJ_NEAR_PLANE, General.Settings.ViewDistance);
+
+			// Apply matrices
+			ApplyMatrices3D();
+		}
+		
+		// This creates matrices for a camera view
+		public void PositionAndLookAt(Vector3D pos, Vector3D lookat)
+		{
+			// Calculate delta vector
+			cameraposition = pos;
+			Vector3D delta = lookat - pos;
+			float anglexy = delta.GetAngleXY();
+			float anglez = delta.GetAngleZ();
+
+			// Create frustum
+			frustum = new ProjectedFrustum2D(pos, anglexy, anglez, PROJ_NEAR_PLANE,
+				General.Settings.ViewDistance, Angle2D.DegToRad(General.Settings.VisualFOV));
+			
+			// Make the view matrix
+			view3d = Matrix.LookAtRH(D3DDevice.V3(pos), D3DDevice.V3(lookat), new Vector3(0f, 0f, 1f));
+			viewproj = view3d * projection; //mxd
+			
+			// Make the billboard matrix
+			billboard = Matrix.RotationZ(anglexy + Angle2D.PI);
+		}
+		
+		// This creates 2D view matrix
+		private void CreateMatrices2D()
+		{
+			windowsize = graphics.RenderTarget.ClientSize;
+			Matrix scaling = Matrix.Scaling((1f / windowsize.Width) * 2f, (1f / windowsize.Height) * -2f, 1f);
+			Matrix translate = Matrix.Translation(-(float)windowsize.Width * 0.5f, -(float)windowsize.Height * 0.5f, 0f);
+			view2d = translate * scaling;
+		}
+		
+		// This applies the matrices
+		private void ApplyMatrices3D()
+		{
+			graphics.Shaders.World3D.WorldViewProj = world * viewproj; //mxd. Multiplication is ~2x faster than "world * view3d * projection";
+		}
+
+		// This sets the appropriate view matrix
+		public void ApplyMatrices2D()
+		{
+			graphics.Device.SetTransform(TransformState.World, world);
+			graphics.Device.SetTransform(TransformState.Projection, Matrix.Identity);
+			graphics.Device.SetTransform(TransformState.View, view2d);
+		}
+		
+		#endregion
+
+		#region ================== Start / Finish
+
+		// This starts rendering
+		public bool Start()
+		{
+			// Start drawing
+			if(graphics.StartRendering(true, General.Colors.Background.ToColorValue(), graphics.BackBuffer, graphics.DepthBuffer))
+			{
+				// Beginning renderstates
+				graphics.Device.SetRenderState(RenderState.CullMode, Cull.None);
+				graphics.Device.SetRenderState(RenderState.ZEnable, false);
+				graphics.Device.SetRenderState(RenderState.AlphaBlendEnable, false);
+				graphics.Device.SetRenderState(RenderState.AlphaTestEnable, false);
+				graphics.Device.SetRenderState(RenderState.SourceBlend, Blend.SourceAlpha);
+				graphics.Device.SetRenderState(RenderState.DestinationBlend, Blend.InverseSourceAlpha);
+				graphics.Device.SetRenderState(RenderState.FogEnable, false);
+				graphics.Device.SetRenderState(RenderState.FogDensity, 1.0f);
+				graphics.Device.SetRenderState(RenderState.FogColor, General.Colors.Background.ToInt());
+				graphics.Device.SetRenderState(RenderState.FogStart, General.Settings.ViewDistance * FOG_RANGE);
+				graphics.Device.SetRenderState(RenderState.FogEnd, General.Settings.ViewDistance);
+				graphics.Device.SetRenderState(RenderState.FogTableMode, FogMode.Linear);
+				graphics.Device.SetRenderState(RenderState.RangeFogEnable, false);
+				graphics.Device.SetRenderState(RenderState.TextureFactor, -1);
+				graphics.Shaders.World3D.HighlightColor = new Color4(); //mxd
+
+				// Texture addressing
+				graphics.Device.SetSamplerState(0, SamplerState.AddressU, TextureAddress.Wrap);
+				graphics.Device.SetSamplerState(0, SamplerState.AddressV, TextureAddress.Wrap);
+				graphics.Device.SetSamplerState(0, SamplerState.AddressW, TextureAddress.Wrap);
+
+				// Matrices
+				world = Matrix.Identity;
+				ApplyMatrices3D();
+
+				// Highlight
+				if(General.Settings.AnimateVisualSelection)
+				{
+					float time = Clock.CurrentTime;
+					highlightglow = (float)Math.Sin(time / 100.0f) * 0.1f + 0.4f;
+					highlightglowinv = -highlightglow + 0.8f;
+				}
+				else
+				{
+					highlightglow = 0.4f;
+					highlightglowinv = 0.3f;
+				}
+				
+				// Determine shader pass to use
+				shaderpass = (fullbrightness ? 1 : 0);
+
+				// Create crosshair vertices
+				if(crosshairverts == null)
+					CreateCrosshairVerts(new Size(General.Map.Data.Crosshair3D.Width, General.Map.Data.Crosshair3D.Height));
+				
+				// Ready
+				return true;
+			}
+			else
+			{
+				// Can't render now
+				return false;
+			}
+		}
+		
+		// This begins rendering world geometry
+		public void StartGeometry()
+		{
+			// Make collections
+			solidgeo = new Dictionary<ImageData, List<VisualGeometry>>(); //mxd
+			maskedgeo = new Dictionary<ImageData, List<VisualGeometry>>(); //mxd
+			translucentgeo = new List<VisualGeometry>(); //mxd
+
+			solidthings = new Dictionary<ImageData, List<VisualThing>>(); //mxd
+			maskedthings = new Dictionary<ImageData, List<VisualThing>>(); //mxd
+			translucentthings = new List<VisualThing>(); //mxd
+			
+			maskedmodelthings = new Dictionary<ModelData, List<VisualThing>>(); //mxd
+			translucentmodelthings = new List<VisualThing>(); //mxd
+			lightthings = new List<VisualThing>(); //mxd
+			allthings = new List<VisualThing>(); //mxd
+		}
+
+		// This ends rendering world geometry
+		public void FinishGeometry()
+		{
+			//mxd. Sort lights
+			if(General.Settings.GZDrawLightsMode != LightRenderMode.NONE && !fullbrightness && lightthings.Count > 0)
+				UpdateLights();
+			
+			// Initial renderstates
+			graphics.Device.SetRenderState(RenderState.CullMode, Cull.Counterclockwise);
+			graphics.Device.SetRenderState(RenderState.ZEnable, true);
+			graphics.Device.SetRenderState(RenderState.ZWriteEnable, true);
+			graphics.Device.SetRenderState(RenderState.AlphaBlendEnable, false);
+			graphics.Device.SetRenderState(RenderState.AlphaTestEnable, false);
+			graphics.Device.SetRenderState(RenderState.TextureFactor, -1);
+			graphics.Shaders.World3D.Begin();
+
+			// SOLID PASS
+			world = Matrix.Identity;
+			ApplyMatrices3D();
+			RenderSinglePass(solidgeo, solidthings);
+
+			//mxd. Render models, without backface culling
+			if(maskedmodelthings.Count > 0)
+			{
+				graphics.Device.SetRenderState(RenderState.AlphaTestEnable, true);
+				graphics.Device.SetRenderState(RenderState.CullMode, Cull.None);
+				RenderModels();
+				graphics.Device.SetRenderState(RenderState.CullMode, Cull.Counterclockwise);
+			}
+
+			// MASK PASS
+			if(maskedgeo.Count > 0 || maskedthings.Count > 0)
+			{
+				world = Matrix.Identity;
+				ApplyMatrices3D();
+				graphics.Device.SetRenderState(RenderState.AlphaTestEnable, true);
+				RenderSinglePass(maskedgeo, maskedthings);
+			}
+
+			//mxd. LIGHT PASS
+			if(General.Settings.GZDrawLightsMode != LightRenderMode.NONE && !fullbrightness && lightthings.Count > 0)
+			{
+				world = Matrix.Identity;
+				ApplyMatrices3D();
+				graphics.Device.SetRenderState(RenderState.AlphaBlendEnable, true);
+				graphics.Device.SetRenderState(RenderState.AlphaTestEnable, false);
+				graphics.Device.SetRenderState(RenderState.ZWriteEnable, false);
+				graphics.Device.SetRenderState(RenderState.DestinationBlend, Blend.One);
+				
+				RenderLights(solidgeo, lightthings);
+				RenderLights(maskedgeo, lightthings);
+			}
+
+			// ALPHA AND ADDITIVE PASS
+			if(translucentgeo.Count > 0 || translucentthings.Count > 0)
+			{
+				world = Matrix.Identity;
+				ApplyMatrices3D();
+				graphics.Device.SetRenderState(RenderState.AlphaBlendEnable, true);
+				graphics.Device.SetRenderState(RenderState.AlphaTestEnable, false);
+				graphics.Device.SetRenderState(RenderState.ZWriteEnable, false);
+				graphics.Device.SetRenderState(RenderState.SourceBlend, Blend.SourceAlpha);
+				RenderTranslucentPass(translucentgeo, translucentthings);
+			}
+
+			//mxd. Render translucent models, with backface culling
+			if(translucentmodelthings.Count > 0)
+			{
+				graphics.Device.SetRenderState(RenderState.AlphaBlendEnable, true);
+				graphics.Device.SetRenderState(RenderState.AlphaTestEnable, false);
+				graphics.Device.SetRenderState(RenderState.ZWriteEnable, false);
+				graphics.Device.SetRenderState(RenderState.SourceBlend, Blend.SourceAlpha);
+				RenderTranslucentModels();
+			}
+
+			// THING CAGES
+			if(renderthingcages)
+			{
+				world = Matrix.Identity;
+				ApplyMatrices3D();
+				RenderThingCages();
+			}
+
+			//mxd. Visual vertices
+			RenderVertices();
+
+			//mxd. Event lines
+			if(General.Settings.GZShowEventLines) RenderArrows(eventlines);
+			
+			// Remove references
+			graphics.Shaders.World3D.Texture1 = null;
+			
+			// Done
+			graphics.Shaders.World3D.End();
+
+			//mxd. Trash collections
+			solidgeo = null;
+			maskedgeo = null;
+			translucentgeo = null;
+
+			solidthings = null;
+			maskedthings = null;
+			translucentthings = null;
+			
+			allthings = null;
+			lightthings = null;
+			maskedmodelthings = null;
+			translucentmodelthings = null;
+
+			visualvertices = null;
+		}
+
+		//mxd
+		private void UpdateLights()
+		{
+			if(lightthings.Count > General.Settings.GZMaxDynamicLights) 
+			{
+				// Calculate distance to camera
+				foreach(VisualThing t in lightthings) t.CalculateCameraDistance(cameraposition);
+
+				// Sort by it, closer ones first
+				lightthings.Sort((t1, t2) => Math.Sign(t1.CameraDistance - t2.CameraDistance));
+				
+				// Gather the closest
+				List<VisualThing> tl = new List<VisualThing>(General.Settings.GZMaxDynamicLights);
+				for(int i = 0; i < General.Settings.GZMaxDynamicLights; i++) tl.Add(lightthings[i]);
+				lightthings = tl;
+			}
+
+			// Sort things by light render style
+			lightthings.Sort((t1, t2) => Math.Sign(t1.LightRenderStyle - t2.LightRenderStyle));
+			lightOffsets = new int[3];
+
+			foreach(VisualThing t in lightthings) 
+			{
+				//add light to apropriate array.
+				switch(t.LightRenderStyle) 
+				{
+					case DynamicLightRenderStyle.NORMAL:
+					case DynamicLightRenderStyle.VAVOOM: lightOffsets[0]++; break;
+					case DynamicLightRenderStyle.ADDITIVE: lightOffsets[1]++; break;
+					default: lightOffsets[2]++; break;
+				}
+			}
+		}
+
+		//mxd.
+		//I never particularly liked old ThingCages, so I wrote this instead.
+		//It should render faster and it has fancy arrow! :)
+		private void RenderThingCages() 
+		{
+			graphics.Device.SetRenderState(RenderState.AlphaBlendEnable, true);
+			graphics.Device.SetRenderState(RenderState.AlphaTestEnable, false);
+			graphics.Device.SetRenderState(RenderState.ZWriteEnable, false);
+			graphics.Device.SetRenderState(RenderState.SourceBlend, Blend.SourceAlpha);
+			graphics.Device.SetRenderState(RenderState.DestinationBlend, Blend.SourceAlpha);
+
+			graphics.Shaders.World3D.BeginPass(16);
+
+			foreach(VisualThing t in allthings)
+			{
+				// Setup color
+				Color4 thingcolor;
+				if(t.Selected && showselection) 
+				{
+					thingcolor = General.Colors.Selection3D.ToColorValue();
+				} 
+				else
+				{
+					thingcolor = t.CageColor;
+					if(t != highlighted) thingcolor.Alpha = 0.6f;
+				}
+				graphics.Shaders.World3D.VertexColor = thingcolor;
+
+				//Render cage
+				graphics.Shaders.World3D.ApplySettings();
+				graphics.Device.SetStreamSource(0, t.CageBuffer, 0, WorldVertex.Stride);
+				graphics.Device.DrawPrimitives(PrimitiveType.LineList, 0, t.CageLength);
+			}
+
+			// Done
+			graphics.Shaders.World3D.EndPass();
+			graphics.Device.SetRenderState(RenderState.TextureFactor, -1);
+		}
+
+		//mxd
+		private void RenderVertices() 
+		{
+			if(visualvertices == null) return;
+
+			graphics.Device.SetRenderState(RenderState.AlphaBlendEnable, true);
+			graphics.Device.SetRenderState(RenderState.AlphaTestEnable, false);
+			graphics.Device.SetRenderState(RenderState.ZWriteEnable, false);
+			graphics.Device.SetRenderState(RenderState.SourceBlend, Blend.SourceAlpha);
+			graphics.Device.SetRenderState(RenderState.DestinationBlend, Blend.SourceAlpha);
+
+			graphics.Shaders.World3D.BeginPass(16);
+
+			foreach(VisualVertex v in visualvertices) 
+			{
+				world = v.Position;
+				ApplyMatrices3D();
+
+				// Setup color
+				Color4 color;
+				if(v.Selected && showselection) 
+				{
+					color = General.Colors.Selection3D.ToColorValue();
+				} 
+				else 
+				{
+					color = v.HaveHeightOffset ? General.Colors.InfoLine.ToColorValue() : General.Colors.Vertices.ToColorValue();
+					if(v != highlighted) color.Alpha = 0.6f;
+				}
+				graphics.Shaders.World3D.VertexColor = color;
+
+				//Commence drawing!!11
+				graphics.Shaders.World3D.ApplySettings();
+				graphics.Device.SetStreamSource(0, v.CeilingVertex ? vertexHandle.Upper : vertexHandle.Lower, 0, WorldVertex.Stride);
+				graphics.Device.DrawPrimitives(PrimitiveType.LineList, 0, 8);
+			}
+
+			// Done
+			graphics.Shaders.World3D.EndPass();
+			graphics.Device.SetRenderState(RenderState.TextureFactor, -1);
+		}
+
+		//mxd
+		private void RenderArrows(ICollection<Line3D> lines) 
+		{
+			// Calculate required points count
+			if(lines.Count == 0) return;
+			int pointscount = 0;
+			foreach(Line3D line in lines) pointscount += (line.RenderArrowhead ? 6 : 2); // 4 extra points for the arrowhead
+			if(pointscount < 2) return;
+			
+			//create vertices
+			WorldVertex[] verts = new WorldVertex[pointscount];
+			const float scaler = 20f;
+			pointscount = 0;
+
+			foreach(Line3D line in lines)
+			{
+				int color = line.Color.ToInt();
+
+				// Add regular points
+				verts[pointscount].x = line.Start.x;
+				verts[pointscount].y = line.Start.y;
+				verts[pointscount].z = line.Start.z;
+				verts[pointscount].c = color;
+				pointscount++;
+
+				verts[pointscount].x = line.End.x;
+				verts[pointscount].y = line.End.y;
+				verts[pointscount].z = line.End.z;
+				verts[pointscount].c = color;
+				pointscount++;
+
+				// Add arrowhead
+				if(line.RenderArrowhead)
+				{
+					float nz = line.GetDelta().GetNormal().z * scaler;
+					float angle = line.GetAngle();
+					Vector3D a1 = new Vector3D(line.End.x - scaler * (float)Math.Sin(angle - 0.46f), line.End.y + scaler * (float)Math.Cos(angle - 0.46f), line.End.z - nz);
+					Vector3D a2 = new Vector3D(line.End.x - scaler * (float)Math.Sin(angle + 0.46f), line.End.y + scaler * (float)Math.Cos(angle + 0.46f), line.End.z - nz);
+
+					verts[pointscount] = verts[pointscount - 1];
+					verts[pointscount + 1].x = a1.x;
+					verts[pointscount + 1].y = a1.y;
+					verts[pointscount + 1].z = a1.z;
+					verts[pointscount + 1].c = color;
+
+					verts[pointscount + 2] = verts[pointscount - 1];
+					verts[pointscount + 3].x = a2.x;
+					verts[pointscount + 3].y = a2.y;
+					verts[pointscount + 3].z = a2.z;
+					verts[pointscount + 3].c = color;
+
+					pointscount += 4;
+				}
+			}
+
+			VertexBuffer vb = new VertexBuffer(General.Map.Graphics.Device, WorldVertex.Stride * verts.Length, Usage.WriteOnly | Usage.Dynamic, VertexFormat.None, Pool.Default);
+			DataStream s = vb.Lock(0, WorldVertex.Stride * verts.Length, LockFlags.Discard);
+			s.WriteRange(verts);
+			vb.Unlock();
+			s.Dispose();
+			
+			//begin rendering
+			graphics.Device.SetRenderState(RenderState.AlphaBlendEnable, true);
+			graphics.Device.SetRenderState(RenderState.AlphaTestEnable, false);
+			graphics.Device.SetRenderState(RenderState.ZWriteEnable, false);
+			graphics.Device.SetRenderState(RenderState.SourceBlend, Blend.SourceAlpha);
+			graphics.Device.SetRenderState(RenderState.DestinationBlend, Blend.SourceAlpha);
+
+			graphics.Shaders.World3D.BeginPass(15);
+
+			world = Matrix.Identity;
+			ApplyMatrices3D();
+
+			//render
+			graphics.Shaders.World3D.ApplySettings();
+			graphics.Device.SetStreamSource(0, vb, 0, WorldVertex.Stride);
+			graphics.Device.DrawPrimitives(PrimitiveType.LineList, 0, pointscount / 2);
+
+			// Done
+			graphics.Shaders.World3D.EndPass();
+			graphics.Device.SetRenderState(RenderState.TextureFactor, -1);
+			vb.Dispose();
+		}
+
+		// This performs a single render pass
+		private void RenderSinglePass(Dictionary<ImageData, List<VisualGeometry>> geopass, Dictionary<ImageData, List<VisualThing>> thingspass)
+		{
+			ImageData curtexture;
+			int currentshaderpass = shaderpass;
+			int highshaderpass = shaderpass + 2;
+
+			// Begin rendering with this shader
+			graphics.Shaders.World3D.BeginPass(shaderpass);
+
+			// Render the geometry collected
+			foreach(KeyValuePair<ImageData, List<VisualGeometry>> group in geopass)
+			{
+				// What texture to use?
+				if(group.Key is UnknownImage)
+					curtexture = General.Map.Data.UnknownTexture3D;
+				else if(group.Key.IsImageLoaded && !group.Key.IsDisposed)
+					curtexture = group.Key;
+				else
+					curtexture = General.Map.Data.Hourglass3D;
+
+				// Create Direct3D texture if still needed
+				if((curtexture.Texture == null) || curtexture.Texture.Disposed)
+					curtexture.CreateTexture();
+
+				// Apply texture
+				graphics.Shaders.World3D.Texture1 = curtexture.Texture;
+				
+				//mxd. Sort geometry by sector index
+				group.Value.Sort((g1, g2) => g1.Sector.Sector.FixedIndex - g2.Sector.Sector.FixedIndex);
+
+				// Go for all geometry that uses this texture
+				VisualSector sector = null;
+				
+				foreach(VisualGeometry g in group.Value)
+				{
+					// Changing sector?
+					if(!object.ReferenceEquals(g.Sector, sector))
+					{
+						// Update the sector if needed
+						if(g.Sector.NeedsUpdateGeo) g.Sector.Update();
+
+						// Only do this sector when a vertexbuffer is created
+						//mxd. No Map means that sector was deleted recently, I suppose
+						if(g.Sector.GeometryBuffer != null && g.Sector.Sector.Map != null) 
+						{
+							// Change current sector
+							sector = g.Sector;
+
+							// Set stream source
+							graphics.Device.SetStreamSource(0, sector.GeometryBuffer, 0, WorldVertex.Stride);
+						}
+						else
+						{
+							sector = null;
+						}
+					}
+
+					if(sector != null) 
+					{
+						// Determine the shader pass we want to use for this object
+						int wantedshaderpass = (((g == highlighted) && showhighlight) || (g.Selected && showselection)) ? highshaderpass : shaderpass;
+
+						//mxd. Render fog?
+						if(General.Settings.GZDrawFog && !fullbrightness && sector.Sector.Brightness < 248)
+							wantedshaderpass += 8;
+
+						// Switch shader pass?
+						if(currentshaderpass != wantedshaderpass)
+						{
+							graphics.Shaders.World3D.EndPass();
+							graphics.Shaders.World3D.BeginPass(wantedshaderpass);
+							currentshaderpass = wantedshaderpass;
+
+							//mxd. Set variables for fog rendering?
+							if(wantedshaderpass > 7)
+							{
+								graphics.Shaders.World3D.World = world;
+							}
+						}
+
+						//mxd. Set variables for fog rendering?
+						if(wantedshaderpass > 7)
+						{
+							graphics.Shaders.World3D.CameraPosition = new Vector4(cameraposition.x, cameraposition.y, cameraposition.z, g.FogFactor);
+							graphics.Shaders.World3D.LightColor = sector.Sector.FogColor;
+						}
+
+						// Set the colors to use
+						graphics.Shaders.World3D.HighlightColor = CalculateHighlightColor((g == highlighted) && showhighlight, (g.Selected && showselection));
+
+						// Apply changes
+						graphics.Shaders.World3D.ApplySettings();
+						
+						// Render!
+						graphics.Device.DrawPrimitives(PrimitiveType.TriangleList, g.VertexOffset, g.Triangles);
+					}
+				}
+			}
+
+			// Get things for this pass
+			if(thingspass.Count > 0)
+			{
+				// Texture addressing
+				graphics.Device.SetSamplerState(0, SamplerState.AddressU, TextureAddress.Clamp);
+				graphics.Device.SetSamplerState(0, SamplerState.AddressV, TextureAddress.Clamp);
+				graphics.Device.SetSamplerState(0, SamplerState.AddressW, TextureAddress.Clamp);
+				graphics.Device.SetRenderState(RenderState.CullMode, Cull.None); //mxd. Disable backside culling, because otherwise sprites with positive ScaleY and negative ScaleX will be facing away from the camera...
+
+				Color4 vertexcolor = new Color4(); //mxd
+
+				// Render things collected
+				foreach(KeyValuePair<ImageData, List<VisualThing>> group in thingspass)
+				{
+					if(group.Key is UnknownImage) continue;
+					
+					// What texture to use?
+					if(!group.Key.IsImageLoaded || group.Key.IsDisposed)
+						curtexture = General.Map.Data.Hourglass3D;
+					else 
+						curtexture = group.Key;
+
+					// Create Direct3D texture if still needed
+					if((curtexture.Texture == null) || curtexture.Texture.Disposed)
+						curtexture.CreateTexture();
+
+					// Apply texture
+					graphics.Shaders.World3D.Texture1 = curtexture.Texture;
+
+					// Render all things with this texture
+					foreach(VisualThing t in group.Value)
+					{
+						// Update buffer if needed
+						t.Update();
+
+						// Only do this sector when a vertexbuffer is created
+						if(t.GeometryBuffer != null) 
+						{
+							// Determine the shader pass we want to use for this object
+							int wantedshaderpass = (((t == highlighted) && showhighlight) || (t.Selected && showselection)) ? highshaderpass : shaderpass;
+
+							//mxd. If fog is enagled, switch to shader, which calculates it
+							if(General.Settings.GZDrawFog && !fullbrightness && t.Thing.Sector != null && (t.Thing.Sector.HasFogColor || t.Thing.Sector.Brightness < 248))
+								wantedshaderpass += 8;
+
+							//mxd. Create the matrix for positioning 
+							world = CreateThingPositionMatrix(t);
+
+							//mxd. If current thing is light - set it's color to light color
+							Color4 litcolor;
+							if(Array.IndexOf(GZBuilder.GZGeneral.GZ_LIGHTS, t.Thing.Type) != -1 && !fullbrightness) 
+							{
+								wantedshaderpass += 4; // Render using one of passes, which uses World3D.VertexColor
+								litcolor = t.LightColor;
+								vertexcolor = t.LightColor;
+							}
+							//mxd. Check if Thing is affected by dynamic lights and set color accordingly
+							else if(General.Settings.GZDrawLightsMode != LightRenderMode.NONE && !fullbrightness && lightthings.Count > 0)
+							{
+								litcolor = GetLitColorForThing(t);
+								if(litcolor.ToArgb() != 0)
+								{
+									wantedshaderpass += 4; // Render using one of passes, which uses World3D.VertexColor
+									vertexcolor = new Color4(t.VertexColor) + litcolor;
+								}
+							}
+							else
+							{
+								litcolor = new Color4();
+								vertexcolor = new Color4();
+							}
+
+							// Switch shader pass?
+							if(currentshaderpass != wantedshaderpass) 
+							{
+								graphics.Shaders.World3D.EndPass();
+								graphics.Shaders.World3D.BeginPass(wantedshaderpass);
+								currentshaderpass = wantedshaderpass;
+							}
+
+							//mxd. Set variables for fog rendering?
+							if(wantedshaderpass > 7)
+							{
+								graphics.Shaders.World3D.World = world;
+								float fogfactor = (litcolor.ToArgb() != 0 ? VisualThing.LIT_FOG_DENSITY_SCALER : t.FogFactor);
+								graphics.Shaders.World3D.CameraPosition = new Vector4(cameraposition.x, cameraposition.y, cameraposition.z, fogfactor);
+							}
+
+							// Set the colors to use
+							if(t.Thing.Sector != null) graphics.Shaders.World3D.LightColor = t.Thing.Sector.FogColor;
+							graphics.Shaders.World3D.VertexColor = vertexcolor;
+							graphics.Shaders.World3D.HighlightColor = CalculateHighlightColor((t == highlighted) && showhighlight, (t.Selected && showselection));
+
+							// Apply changes
+							ApplyMatrices3D();
+							graphics.Shaders.World3D.ApplySettings();
+
+							// Apply buffer
+							graphics.Device.SetStreamSource(0, t.GeometryBuffer, 0, WorldVertex.Stride);
+
+							// Render!
+							graphics.Device.DrawPrimitives(PrimitiveType.TriangleList, 0, t.Triangles);
+						}
+					}
+				}
+
+				// Texture addressing
+				graphics.Device.SetSamplerState(0, SamplerState.AddressU, TextureAddress.Wrap);
+				graphics.Device.SetSamplerState(0, SamplerState.AddressV, TextureAddress.Wrap);
+				graphics.Device.SetSamplerState(0, SamplerState.AddressW, TextureAddress.Wrap);
+				graphics.Device.SetRenderState(RenderState.CullMode, Cull.Counterclockwise); //mxd
+			}
+
+			// Done rendering with this shader
+			graphics.Shaders.World3D.EndPass();
+		}
+
+		//mxd
+		private void RenderTranslucentPass(List<VisualGeometry> geopass, List<VisualThing> thingspass)
+		{
+			int currentshaderpass = shaderpass;
+			int highshaderpass = shaderpass + 2;
+
+			// Sort geometry by camera distance. First vertex of the BoundingBox is it's center
+			if(General.Map.VisualCamera.Sector != null)
+			{
+				// If the camera is inside a sector, compare z coordinates
+				translucentgeo.Sort(delegate(VisualGeometry vg1, VisualGeometry vg2)
+				{
+					float camdist1, camdist2;
+
+					if((vg1.GeometryType == VisualGeometryType.FLOOR || vg1.GeometryType == VisualGeometryType.CEILING)
+						&& General.Map.VisualCamera.Sector.Index == vg1.Sector.Sector.Index)
+					{
+						camdist1 = Math.Abs(General.Map.VisualCamera.Position.z - vg1.BoundingBox[0].z);
+					}
+					else
+					{
+						camdist1 = (General.Map.VisualCamera.Position - vg1.BoundingBox[0]).GetLengthSq();
+					}
+
+					if((vg2.GeometryType == VisualGeometryType.FLOOR || vg2.GeometryType == VisualGeometryType.CEILING)
+						&& General.Map.VisualCamera.Sector.Index == vg2.Sector.Sector.Index)
+					{
+						camdist2 = Math.Abs(General.Map.VisualCamera.Position.z - vg2.BoundingBox[0].z);
+					}
+					else
+					{
+						camdist2 = (General.Map.VisualCamera.Position - vg2.BoundingBox[0]).GetLengthSq();
+					}
+
+					return (int)(camdist2 - camdist1);
+				});
+			}
+			else
+			{
+				translucentgeo.Sort((vg1, vg2) => (int)((General.Map.VisualCamera.Position - vg2.BoundingBox[0]).GetLengthSq()
+													  - (General.Map.VisualCamera.Position - vg1.BoundingBox[0]).GetLengthSq()));
+			}
+
+			ImageData curtexture;
+			VisualSector sector = null;
+			RenderPass currentpass = RenderPass.Solid;
+			long curtexturename = 0;
+			float fogfactor = -1;
+
+			// Begin rendering with this shader
+			graphics.Shaders.World3D.BeginPass(shaderpass);
+
+			// Go for all geometry
+			foreach(VisualGeometry g in geopass)
+			{
+				// Change blend mode?
+				if(g.RenderPass != currentpass)
+				{
+					switch(g.RenderPass)
+					{
+						case RenderPass.Additive:
+							graphics.Device.SetRenderState(RenderState.DestinationBlend, Blend.One);
+							break;
+
+						case RenderPass.Alpha:
+							graphics.Device.SetRenderState(RenderState.DestinationBlend, Blend.InverseSourceAlpha);
+							break;
+					}
+
+					currentpass = g.RenderPass;
+				}
+
+				// Change texture?
+				if(g.Texture.LongName != curtexturename)
+				{
+					// What texture to use?
+					if(g.Texture is UnknownImage)
+						curtexture = General.Map.Data.UnknownTexture3D;
+					else if(g.Texture.IsImageLoaded && !g.Texture.IsDisposed)
+						curtexture = g.Texture;
+					else
+						curtexture = General.Map.Data.Hourglass3D;
+
+					// Create Direct3D texture if still needed
+					if((curtexture.Texture == null) || curtexture.Texture.Disposed)
+						curtexture.CreateTexture();
+
+					// Apply texture
+					graphics.Shaders.World3D.Texture1 = curtexture.Texture;
+					curtexturename = g.Texture.LongName;
+				}
+
+				// Changing sector?
+				if(!object.ReferenceEquals(g.Sector, sector))
+				{
+					// Update the sector if needed
+					if(g.Sector.NeedsUpdateGeo) g.Sector.Update();
+
+					// Only do this sector when a vertexbuffer is created
+					//mxd. No Map means that sector was deleted recently, I suppose
+					if(g.Sector.GeometryBuffer != null && g.Sector.Sector.Map != null)
+					{
+						// Change current sector
+						sector = g.Sector;
+
+						// Set stream source
+						graphics.Device.SetStreamSource(0, sector.GeometryBuffer, 0, WorldVertex.Stride);
+					}
+					else
+					{
+						sector = null;
+					}
+				}
+
+				if(sector != null)
+				{
+					// Determine the shader pass we want to use for this object
+					int wantedshaderpass = (((g == highlighted) && showhighlight) || (g.Selected && showselection)) ? highshaderpass : shaderpass;
+
+					//mxd. Render fog?
+					if(General.Settings.GZDrawFog && !fullbrightness && sector.Sector.Brightness < 248)
+						wantedshaderpass += 8;
+
+					// Switch shader pass?
+					if(currentshaderpass != wantedshaderpass)
+					{
+						graphics.Shaders.World3D.EndPass();
+						graphics.Shaders.World3D.BeginPass(wantedshaderpass);
+						currentshaderpass = wantedshaderpass;
+
+						//mxd. Set variables for fog rendering?
+						if(wantedshaderpass > 7)
+						{
+							graphics.Shaders.World3D.World = world;
+						}
+					}
+
+					// Set variables for fog rendering?
+					if(wantedshaderpass > 7 && g.FogFactor != fogfactor)
+					{
+						graphics.Shaders.World3D.CameraPosition = new Vector4(cameraposition.x, cameraposition.y, cameraposition.z, g.FogFactor);
+						fogfactor = g.FogFactor;
+					}
+
+					// Set the colors to use
+					graphics.Shaders.World3D.LightColor = sector.Sector.FogColor;
+					graphics.Shaders.World3D.HighlightColor = CalculateHighlightColor((g == highlighted) && showhighlight, (g.Selected && showselection));
+
+					// Apply changes
+					graphics.Shaders.World3D.ApplySettings();
+
+					// Render!
+					graphics.Device.DrawPrimitives(PrimitiveType.TriangleList, g.VertexOffset, g.Triangles);
+				}
+			}
+
+			// Get things for this pass
+			if(thingspass.Count > 0)
+			{
+				// Texture addressing
+				graphics.Device.SetSamplerState(0, SamplerState.AddressU, TextureAddress.Clamp);
+				graphics.Device.SetSamplerState(0, SamplerState.AddressV, TextureAddress.Clamp);
+				graphics.Device.SetSamplerState(0, SamplerState.AddressW, TextureAddress.Clamp);
+				graphics.Device.SetRenderState(RenderState.CullMode, Cull.None); //mxd. Disable backside culling, because otherwise sprites with positive ScaleY and negative ScaleX will be facing away from the camera...
+
+				// Sort geometry by camera distance. First vertex of the BoundingBox is it's center
+				thingspass.Sort((vt1, vt2) => (int)((General.Map.VisualCamera.Position - vt2.BoundingBox[0]).GetLengthSq()
+												  - (General.Map.VisualCamera.Position - vt1.BoundingBox[0]).GetLengthSq()));
+
+				// Reset vars
+				currentpass = RenderPass.Solid;
+				curtexturename = 0;
+				Color4 vertexcolor = new Color4();
+				fogfactor = -1;
+
+				// Render things collected
+				foreach(VisualThing t in thingspass)
+				{
+					if(t.Texture is UnknownImage) continue;
+					
+					// Change blend mode?
+					if(t.RenderPass != currentpass)
+					{
+						switch(t.RenderPass)
+						{
+							case RenderPass.Additive:
+								graphics.Device.SetRenderState(RenderState.DestinationBlend, Blend.One);
+								break;
+
+							case RenderPass.Alpha:
+								graphics.Device.SetRenderState(RenderState.DestinationBlend, Blend.InverseSourceAlpha);
+								break;
+						}
+
+						currentpass = t.RenderPass;
+					}
+
+					// Change texture?
+					if(t.Texture.LongName != curtexturename)
+					{
+						// What texture to use?
+						if(t.Texture.IsImageLoaded && !t.Texture.IsDisposed)
+							curtexture = t.Texture;
+						else
+							curtexture = General.Map.Data.Hourglass3D;
+
+						// Create Direct3D texture if still needed
+						if((curtexture.Texture == null) || curtexture.Texture.Disposed)
+							curtexture.CreateTexture();
+
+						// Apply texture
+						graphics.Shaders.World3D.Texture1 = curtexture.Texture;
+						curtexturename = t.Texture.LongName;
+					}
+
+					// Update buffer if needed
+					t.Update();
+
+					// Only do this sector when a vertexbuffer is created
+					if(t.GeometryBuffer != null)
+					{
+						// Determine the shader pass we want to use for this object
+						int wantedshaderpass = (((t == highlighted) && showhighlight) || (t.Selected && showselection)) ? highshaderpass : shaderpass;
+
+						//mxd. if fog is enagled, switch to shader, which calculates it
+						if(General.Settings.GZDrawFog && !fullbrightness && t.Thing.Sector != null && (t.Thing.Sector.HasFogColor || t.Thing.Sector.Brightness < 248))
+							wantedshaderpass += 8;
+
+						//mxd. Create the matrix for positioning 
+						world = CreateThingPositionMatrix(t);
+
+						//mxd. If current thing is light - set it's color to light color
+						Color4 litcolor;
+						if(Array.IndexOf(GZBuilder.GZGeneral.GZ_LIGHTS, t.Thing.Type) != -1 && !fullbrightness)
+						{
+							wantedshaderpass += 4; // Render using one of passes, which uses World3D.VertexColor
+							litcolor = t.LightColor;
+							vertexcolor = t.LightColor;
+						}
+						//mxd. Check if Thing is affected by dynamic lights and set color accordingly
+						else if(General.Settings.GZDrawLightsMode != LightRenderMode.NONE && !fullbrightness && lightthings.Count > 0)
+						{
+							litcolor = GetLitColorForThing(t);
+							if(litcolor.ToArgb() != 0)
+							{
+								wantedshaderpass += 4; // Render using one of passes, which uses World3D.VertexColor
+								vertexcolor = new Color4(t.VertexColor) + litcolor;
+							}
+						}
+						else
+						{
+							litcolor = new Color4();
+							vertexcolor = new Color4();
+						}
+
+						// Switch shader pass?
+						if(currentshaderpass != wantedshaderpass)
+						{
+							graphics.Shaders.World3D.EndPass();
+							graphics.Shaders.World3D.BeginPass(wantedshaderpass);
+							currentshaderpass = wantedshaderpass;
+						}
+
+						//mxd. set variables for fog rendering?
+						if(wantedshaderpass > 7)
+						{
+							graphics.Shaders.World3D.World = world;
+
+							float curfogfactor = (litcolor.ToArgb() != 0 ? VisualThing.LIT_FOG_DENSITY_SCALER : t.FogFactor);
+							if(curfogfactor != fogfactor)
+							{
+								graphics.Shaders.World3D.CameraPosition = new Vector4(cameraposition.x, cameraposition.y, cameraposition.z, curfogfactor);
+								fogfactor = curfogfactor;
+							}
+						}
+
+						// Set the colors to use
+						graphics.Shaders.World3D.LightColor = t.Thing.Sector.FogColor;
+						graphics.Shaders.World3D.VertexColor = vertexcolor;
+						graphics.Shaders.World3D.HighlightColor = CalculateHighlightColor((t == highlighted) && showhighlight, (t.Selected && showselection));
+
+						// Apply changes
+						ApplyMatrices3D();
+						graphics.Shaders.World3D.ApplySettings();
+
+						// Apply buffer
+						graphics.Device.SetStreamSource(0, t.GeometryBuffer, 0, WorldVertex.Stride);
+
+						// Render!
+						graphics.Device.DrawPrimitives(PrimitiveType.TriangleList, 0, t.Triangles);
+					}
+				}
+
+				// Texture addressing
+				graphics.Device.SetSamplerState(0, SamplerState.AddressU, TextureAddress.Wrap);
+				graphics.Device.SetSamplerState(0, SamplerState.AddressV, TextureAddress.Wrap);
+				graphics.Device.SetSamplerState(0, SamplerState.AddressW, TextureAddress.Wrap);
+				graphics.Device.SetRenderState(RenderState.CullMode, Cull.Counterclockwise); //mxd
+			}
+
+			// Done rendering with this shader
+			graphics.Shaders.World3D.EndPass();
+		}
+
+		//mxd
+		private Matrix CreateThingPositionMatrix(VisualThing t)
+		{
+			//mxd. Create the matrix for positioning 
+			if(t.Info.RenderMode == Thing.SpriteRenderMode.NORMAL) // Apply billboarding?
+			{
+				if(t.Info.XYBillboard)
+				{
+					return Matrix.Translation(0f, 0f, -t.LocalCenterZ)
+						* Matrix.RotationX(Angle2D.PI - General.Map.VisualCamera.AngleZ)
+						* Matrix.Translation(0f, 0f, t.LocalCenterZ)
+						* billboard
+						* Matrix.Scaling(t.Thing.ScaleX, t.Thing.ScaleX, t.Thing.ScaleY)
+						* t.Position;
+				}
+				else
+				{
+					return billboard
+							* Matrix.Scaling(t.Thing.ScaleX, t.Thing.ScaleX, t.Thing.ScaleY)
+							* t.Position;
+				}
+			}
+			else
+			{
+				return Matrix.Scaling(t.Thing.ScaleX, t.Thing.ScaleX, t.Thing.ScaleY)
+						* t.Position;
+			}
+		}
+
+		//mxd. Dynamic lights pass!
+		private void RenderLights(Dictionary<ImageData, List<VisualGeometry>> geometrytolit, List<VisualThing> lights)
+		{
+			// Anything to do?
+			if(geometrytolit.Count == 0) return;
+			
+			graphics.Shaders.World3D.World = Matrix.Identity;
+			graphics.Shaders.World3D.BeginPass(17);
+
+			VisualSector sector = null;
+
+			graphics.Device.SetRenderState(RenderState.SourceBlend, Blend.One);
+			graphics.Device.SetRenderState(RenderState.DestinationBlend, Blend.BlendFactor);
+
+			foreach(KeyValuePair<ImageData, List<VisualGeometry>> group in geometrytolit) 
+			{
+				if(group.Key.Texture == null) continue;
+				graphics.Shaders.World3D.Texture1 = group.Key.Texture;
+
+				foreach(VisualGeometry g in group.Value) 
+				{
+					// Changing sector?
+					if(!object.ReferenceEquals(g.Sector, sector))
+					{
+						// Only do this sector when a vertexbuffer is created
+						// mxd. no Map means that sector was deleted recently, I suppose
+						if(g.Sector.GeometryBuffer != null && g.Sector.Sector.Map != null)
+						{
+							// Change current sector
+							sector = g.Sector;
+
+							// Set stream source
+							graphics.Device.SetStreamSource(0, sector.GeometryBuffer, 0, WorldVertex.Stride);
+						}
+						else
+						{
+							sector = null;
+						}
+					}
+
+					if(sector == null) continue;
+
+					//normal lights
+					int count = lightOffsets[0];
+					Vector4 lpr;
+					if(lightOffsets[0] > 0) 
+					{
+						graphics.Device.SetRenderState(RenderState.BlendOperation, BlendOperation.Add);
+
+						for(int i = 0; i < count; i++) 
+						{
+							if(BoundingBoxesIntersect(g.BoundingBox, lights[i].BoundingBox)) 
+							{
+								lpr = new Vector4(lights[i].Center, lights[i].LightRadius);
+								if(lpr.W == 0) continue;
+								graphics.Shaders.World3D.LightColor = lights[i].LightColor;
+								graphics.Shaders.World3D.LightPositionAndRadius = lpr;
+								graphics.Shaders.World3D.ApplySettings();
+								graphics.Device.DrawPrimitives(PrimitiveType.TriangleList, g.VertexOffset, g.Triangles);
+							}
+						}
+					}
+
+					//additive lights
+					if(lightOffsets[1] > 0) 
+					{
+						count += lightOffsets[1];
+						graphics.Device.SetRenderState(RenderState.BlendOperation, BlendOperation.Add);
+
+						for(int i = lightOffsets[0]; i < count; i++) 
+						{
+							if(BoundingBoxesIntersect(g.BoundingBox, lights[i].BoundingBox)) 
+							{
+								lpr = new Vector4(lights[i].Center, lights[i].LightRadius);
+								if(lpr.W == 0) continue;
+								graphics.Shaders.World3D.LightColor = lights[i].LightColor;
+								graphics.Shaders.World3D.LightPositionAndRadius = lpr;
+								graphics.Shaders.World3D.ApplySettings();
+								graphics.Device.DrawPrimitives(PrimitiveType.TriangleList, g.VertexOffset, g.Triangles);
+						   }
+						}
+					}
+
+					//negative lights
+					if(lightOffsets[2] > 0) 
+					{
+						count += lightOffsets[2];
+						graphics.Device.SetRenderState(RenderState.BlendOperation, BlendOperation.ReverseSubtract);
+
+						for(int i = lightOffsets[0] + lightOffsets[1]; i < count; i++) 
+						{
+							if(BoundingBoxesIntersect(g.BoundingBox, lights[i].BoundingBox)) 
+							{
+								lpr = new Vector4(lights[i].Center, lights[i].LightRadius);
+								if(lpr.W == 0) continue;
+								Color4 lc = lights[i].LightColor;
+								graphics.Shaders.World3D.LightColor = new Color4(lc.Alpha, (lc.Green + lc.Blue) / 2, (lc.Red + lc.Blue) / 2, (lc.Green + lc.Red) / 2);
+								graphics.Shaders.World3D.LightPositionAndRadius = lpr;
+								graphics.Shaders.World3D.ApplySettings();
+								graphics.Device.DrawPrimitives(PrimitiveType.TriangleList, g.VertexOffset, g.Triangles);
+							}
+						}
+					}
+				}
+			}
+
+			graphics.Shaders.World3D.EndPass();
+			graphics.Device.SetRenderState(RenderState.BlendOperation, BlendOperation.Add);
+		}
+
+		//mxd. render models
+		private void RenderModels() 
+		{
+			int shaderpass = (fullbrightness ? 1 : 4);
+			int currentshaderpass = shaderpass;
+			int highshaderpass = shaderpass + 2;
+
+			// Begin rendering with this shader
+			graphics.Shaders.World3D.BeginPass(currentshaderpass);
+
+			foreach(KeyValuePair<ModelData, List<VisualThing>> group in maskedmodelthings) 
+			{
+				foreach(VisualThing t in group.Value) 
+				{
+					t.Update();
+					
+					Color4 vertexcolor = new Color4(t.VertexColor);
+
+					//check if model is affected by dynamic lights and set color accordingly
+					Color4 litcolor;
+					if(General.Settings.GZDrawLightsMode != LightRenderMode.NONE && !fullbrightness && lightthings.Count > 0) 
+					{
+						litcolor = GetLitColorForThing(t);
+						graphics.Shaders.World3D.VertexColor = vertexcolor + litcolor;
+					} 
+					else 
+					{
+						graphics.Shaders.World3D.VertexColor = vertexcolor;
+						litcolor = new Color4();
+					}
+
+					// Determine the shader pass we want to use for this object
+					int wantedshaderpass = ((((t == highlighted) && showhighlight) || (t.Selected && showselection)) ? highshaderpass : shaderpass);
+
+					//mxd. if fog is enagled, switch to shader, which calculates it
+					if(General.Settings.GZDrawFog && !fullbrightness && t.Thing.Sector != null && (t.Thing.Sector.HasFogColor || t.Thing.Sector.Brightness < 248))
+						wantedshaderpass += 8;
+
+					// Switch shader pass?
+					if(currentshaderpass != wantedshaderpass) 
+					{
+						graphics.Shaders.World3D.EndPass();
+						graphics.Shaders.World3D.BeginPass(wantedshaderpass);
+						currentshaderpass = wantedshaderpass;
+					}
+
+					// Set the colors to use
+					graphics.Shaders.World3D.HighlightColor = CalculateHighlightColor((t == highlighted) && showhighlight, (t.Selected && showselection));
+
+					// Create the matrix for positioning / rotation
+					float sx = t.Thing.ScaleX * t.Thing.ActorScale.Width;
+					float sy = t.Thing.ScaleY * t.Thing.ActorScale.Height;
+
+					Matrix modelscale = Matrix.Scaling(sx, sx, sy);
+					Matrix modelrotation = Matrix.RotationY(-t.Thing.RollRad) * Matrix.RotationX(-t.Thing.PitchRad) * Matrix.RotationZ(t.Thing.Angle);
+
+					world = General.Map.Data.ModeldefEntries[t.Thing.Type].Transform * modelscale * modelrotation * t.Position;
+					ApplyMatrices3D();
+
+					//mxd. set variables for fog rendering
+					if(wantedshaderpass > 7)
+					{
+						graphics.Shaders.World3D.World = world;
+						if(t.Thing.Sector != null) graphics.Shaders.World3D.LightColor = t.Thing.Sector.FogColor;
+						float fogfactor = (litcolor.ToArgb() != 0 ? VisualThing.LIT_FOG_DENSITY_SCALER : t.FogFactor);
+						graphics.Shaders.World3D.CameraPosition = new Vector4(cameraposition.x, cameraposition.y, cameraposition.z, fogfactor);
+					}
+
+					for(int i = 0; i < group.Key.Model.Meshes.Count; i++) 
+					{
+						graphics.Shaders.World3D.Texture1 = group.Key.Model.Textures[i];
+						graphics.Shaders.World3D.ApplySettings();
+
+						// Render!
+						group.Key.Model.Meshes[i].DrawSubset(0);
+					}
+				}
+			}
+
+			graphics.Shaders.World3D.EndPass();
+		}
+
+		//mxd. Render additive/translucent models
+		private void RenderTranslucentModels()
+		{
+			int shaderpass = (fullbrightness ? 1 : 4);
+			int currentshaderpass = shaderpass;
+			int highshaderpass = shaderpass + 2;
+			RenderPass currentpass = RenderPass.Solid;
+
+			// Sort models by camera distance. First vertex of the BoundingBox is it's center
+			translucentmodelthings.Sort((vt1, vt2) => (int)((General.Map.VisualCamera.Position - vt2.BoundingBox[0]).GetLengthSq()
+										  - (General.Map.VisualCamera.Position - vt1.BoundingBox[0]).GetLengthSq()));
+
+			// Begin rendering with this shader
+			graphics.Shaders.World3D.BeginPass(currentshaderpass);
+
+			foreach(VisualThing t in translucentmodelthings)
+			{
+				// Change blend mode?
+				if(t.RenderPass != currentpass)
+				{
+					switch(t.RenderPass)
+					{
+						case RenderPass.Additive:
+							graphics.Device.SetRenderState(RenderState.DestinationBlend, Blend.One);
+							break;
+
+						case RenderPass.Alpha:
+							graphics.Device.SetRenderState(RenderState.DestinationBlend, Blend.InverseSourceAlpha);
+							break;
+					}
+
+					currentpass = t.RenderPass;
+				}
+				
+				t.Update();
+				Color4 vertexcolor = new Color4(t.VertexColor);
+
+				//check if model is affected by dynamic lights and set color accordingly
+				Color4 litcolor;
+				if(General.Settings.GZDrawLightsMode != LightRenderMode.NONE && !fullbrightness && lightthings.Count > 0)
+				{
+					litcolor = GetLitColorForThing(t);
+					graphics.Shaders.World3D.VertexColor = vertexcolor + litcolor;
+				}
+				else
+				{
+					graphics.Shaders.World3D.VertexColor = vertexcolor;
+					litcolor = new Color4();
+				}
+
+				// Determine the shader pass we want to use for this object
+				int wantedshaderpass = ((((t == highlighted) && showhighlight) || (t.Selected && showselection)) ? highshaderpass : shaderpass);
+
+				//mxd. if fog is enagled, switch to shader, which calculates it
+				if(General.Settings.GZDrawFog && !fullbrightness && t.Thing.Sector != null && (t.Thing.Sector.HasFogColor || t.Thing.Sector.Brightness < 248))
+					wantedshaderpass += 8;
+
+				// Switch shader pass?
+				if(currentshaderpass != wantedshaderpass)
+				{
+					graphics.Shaders.World3D.EndPass();
+					graphics.Shaders.World3D.BeginPass(wantedshaderpass);
+					currentshaderpass = wantedshaderpass;
+				}
+
+				// Set the colors to use
+				graphics.Shaders.World3D.HighlightColor = CalculateHighlightColor((t == highlighted) && showhighlight, (t.Selected && showselection));
+
+				// Create the matrix for positioning / rotation
+				float sx = t.Thing.ScaleX * t.Thing.ActorScale.Width;
+				float sy = t.Thing.ScaleY * t.Thing.ActorScale.Height;
+
+				Matrix modelscale = Matrix.Scaling(sx, sx, sy);
+				Matrix modelrotation = Matrix.RotationY(-t.Thing.RollRad) * Matrix.RotationX(-t.Thing.PitchRad) * Matrix.RotationZ(t.Thing.Angle);
+
+				world = General.Map.Data.ModeldefEntries[t.Thing.Type].Transform * modelscale * modelrotation * t.Position;
+				ApplyMatrices3D();
+
+				//mxd. set variables for fog rendering
+				if(wantedshaderpass > 7)
+				{
+					graphics.Shaders.World3D.World = world;
+					if(t.Thing.Sector != null) graphics.Shaders.World3D.LightColor = t.Thing.Sector.FogColor;
+					float fogfactor = (litcolor.ToArgb() != 0 ? VisualThing.LIT_FOG_DENSITY_SCALER : t.FogFactor);
+					graphics.Shaders.World3D.CameraPosition = new Vector4(cameraposition.x, cameraposition.y, cameraposition.z, fogfactor);
+				}
+
+				GZModel model = General.Map.Data.ModeldefEntries[t.Thing.Type].Model;
+				for(int i = 0; i < model.Meshes.Count; i++)
+				{
+					graphics.Shaders.World3D.Texture1 = model.Textures[i];
+					graphics.Shaders.World3D.ApplySettings();
+
+					// Render!
+					model.Meshes[i].DrawSubset(0);
+				}
+			}
+
+			graphics.Shaders.World3D.EndPass();
+		}
+
+		//mxd. This gets color from dynamic lights based on distance to thing. 
+		//thing position must be in absolute cordinates 
+		//(thing.Position.Z value is relative to floor of the sector the thing is in)
+		private Color4 GetLitColorForThing(VisualThing t) 
+		{
+			Color4 litColor = new Color4();
+			foreach(VisualThing lt in lightthings)
+			{
+				// Don't light self
+				if(General.Map.Data.GldefsEntries.ContainsKey(t.Thing.Type) && General.Map.Data.GldefsEntries[t.Thing.Type].DontLightSelf && t.Thing.Index == lt.Thing.Index)
+					continue;
+
+				float distSquared = Vector3.DistanceSquared(lt.Center, t.PositionV3);
+				float radiusSquared = lt.LightRadius * lt.LightRadius;
+				if(distSquared < radiusSquared) 
+				{
+					int sign = (lt.LightRenderStyle == DynamicLightRenderStyle.NEGATIVE ? -1 : 1);
+					float scaler = 1 - distSquared / radiusSquared * lt.LightColor.Alpha;
+					litColor.Red += lt.LightColor.Red * scaler * sign;
+					litColor.Green += lt.LightColor.Green * scaler * sign;
+					litColor.Blue += lt.LightColor.Blue * scaler * sign;
+				}
+			}
+
+			return litColor;
+		}
+
+		// This calculates the highlight/selection color
+		private Color4 CalculateHighlightColor(bool ishighlighted, bool isselected)
+		{
+			Color4 highlightcolor = isselected ? General.Colors.Selection.ToColorValue() : General.Colors.Highlight.ToColorValue();
+			highlightcolor.Alpha = ishighlighted ? highlightglowinv : highlightglow;
+			return highlightcolor;
+		}
+		
+		// This finishes rendering
+		public void Finish()
+		{
+			General.Plugins.OnPresentDisplayBegin();
+
+			// Done
+			graphics.FinishRendering();
+			graphics.Present();
+			highlighted = null;
+		}
+		
+		#endregion
+		
+		#region ================== Rendering
+		
+		// This sets the highlighted object for the rendering
+		public void SetHighlightedObject(IVisualPickable obj)
+		{
+			highlighted = obj;
+		}
+		
+		// This collects a visual sector's geometry for rendering
+		public void AddSectorGeometry(VisualGeometry g)
+		{
+			// Must have a texture and vertices
+			if(g.Texture != null && g.Triangles > 0)
+			{
+				switch(g.RenderPass)
+				{
+					case RenderPass.Solid:
+						if(!solidgeo.ContainsKey(g.Texture)) solidgeo.Add(g.Texture, new List<VisualGeometry>());
+						solidgeo[g.Texture].Add(g);
+						break;
+
+					case RenderPass.Mask:
+						if(!maskedgeo.ContainsKey(g.Texture)) maskedgeo.Add(g.Texture, new List<VisualGeometry>());
+						maskedgeo[g.Texture].Add(g);
+						break;
+
+					case RenderPass.Additive: case RenderPass.Alpha:
+						translucentgeo.Add(g);
+						break;
+
+					default:
+						throw new NotImplementedException("Geometry rendering of " + g.RenderPass + " render pass is not implemented!");
+				}
+			}
+		}
+
+		// This collects a visual sector's geometry for rendering
+		public void AddThingGeometry(VisualThing t)
+		{
+			//mxd. Gather lights
+			if(General.Settings.GZDrawLightsMode != LightRenderMode.NONE && !fullbrightness && t.LightType != DynamicLightType.NONE) 
+			{
+				t.UpdateLightRadius();
+				if(t.LightRadius > 0)
+				{
+					if(Array.IndexOf(GZBuilder.GZGeneral.GZ_ANIMATED_LIGHT_TYPES, t.LightType) != -1)
+						t.UpdateBoundingBox();
+					lightthings.Add(t);
+				}
+			}
+
+			//mxd. Gather models
+			if(t.Thing.IsModel && 
+				(General.Settings.GZDrawModelsMode == ModelRenderMode.ALL ||
+				 General.Settings.GZDrawModelsMode == ModelRenderMode.ACTIVE_THINGS_FILTER ||
+				(General.Settings.GZDrawModelsMode == ModelRenderMode.SELECTION && t.Selected))) 
+			{
+				switch(t.RenderPass)
+				{
+					case RenderPass.Mask:
+					case RenderPass.Solid:
+						ModelData mde = General.Map.Data.ModeldefEntries[t.Thing.Type];
+						if(!maskedmodelthings.ContainsKey(mde)) maskedmodelthings.Add(mde, new List<VisualThing>());
+						maskedmodelthings[mde].Add(t);
+						break;
+
+					case RenderPass.Additive:
+					case RenderPass.Alpha:
+						translucentmodelthings.Add(t);
+						break;
+
+					default:
+						throw new NotImplementedException("Thing model rendering of " + t.RenderPass + " render pass is not implemented!");
+				}
+			}
+			// Gather regular things
+			else if(t.Texture != null) //Must have a texture!
+			{
+				//mxd
+				switch(t.RenderPass)
+				{
+					case RenderPass.Solid:
+						if(!solidthings.ContainsKey(t.Texture)) solidthings.Add(t.Texture, new List<VisualThing>());
+						solidthings[t.Texture].Add(t);
+						break;
+
+					case RenderPass.Mask:
+						if(!maskedthings.ContainsKey(t.Texture)) maskedthings.Add(t.Texture, new List<VisualThing>());
+						maskedthings[t.Texture].Add(t);
+						break;
+
+					case RenderPass.Additive:
+					case RenderPass.Alpha:
+						translucentthings.Add(t);
+						break;
+
+					default:
+						throw new NotImplementedException("Thing rendering of " + t.RenderPass + " render pass is not implemented!");
+				}
+			}
+
+			//mxd. Add to the plain list
+			allthings.Add(t);
+		}
+
+		//mxd
+		public void SetVisualVertices(List<VisualVertex> verts) { visualvertices = verts; }
+
+		//mxd
+		public void SetEventLines(List<Line3D> lines) { eventlines = lines; }
+
+		//mxd
+		private static bool BoundingBoxesIntersect(Vector3D[] bbox1, Vector3D[] bbox2) 
+		{
+			Vector3D dist = bbox1[0] - bbox2[0];
+
+			Vector3D halfSize1 = bbox1[0] - bbox1[1];
+			Vector3D halfSize2 = bbox2[0] - bbox2[1];
+
+			return (halfSize1.x + halfSize2.x >= Math.Abs(dist.x) && halfSize1.y + halfSize2.y >= Math.Abs(dist.y) && halfSize1.z + halfSize2.z >= Math.Abs(dist.z));
+		}
+
+		// This renders the crosshair
+		public void RenderCrosshair()
+		{
+			//mxd
+			world = Matrix.Identity;
+			ApplyMatrices3D();
+			
+			// Set renderstates
+			graphics.Device.SetRenderState(RenderState.CullMode, Cull.None);
+			graphics.Device.SetRenderState(RenderState.ZEnable, false);
+			graphics.Device.SetRenderState(RenderState.AlphaBlendEnable, true);
+			graphics.Device.SetRenderState(RenderState.AlphaTestEnable, false);
+			graphics.Device.SetRenderState(RenderState.SourceBlend, Blend.SourceAlpha);
+			graphics.Device.SetRenderState(RenderState.DestinationBlend, Blend.InverseSourceAlpha);
+			graphics.Device.SetRenderState(RenderState.TextureFactor, -1);
+			graphics.Device.SetTransform(TransformState.World, Matrix.Identity);
+			graphics.Device.SetTransform(TransformState.Projection, Matrix.Identity);
+			ApplyMatrices2D();
+			
+			// Texture
+			if(crosshairbusy)
+			{
+				if(General.Map.Data.CrosshairBusy3D.Texture == null) General.Map.Data.CrosshairBusy3D.CreateTexture();
+				graphics.Device.SetTexture(0, General.Map.Data.CrosshairBusy3D.Texture);
+				graphics.Shaders.Display2D.Texture1 = General.Map.Data.CrosshairBusy3D.Texture;
+			}
+			else
+			{
+				if(General.Map.Data.Crosshair3D.Texture == null) General.Map.Data.Crosshair3D.CreateTexture();
+				graphics.Device.SetTexture(0, General.Map.Data.Crosshair3D.Texture);
+				graphics.Shaders.Display2D.Texture1 = General.Map.Data.Crosshair3D.Texture;
+			}
+			
+			// Draw
+			graphics.Shaders.Display2D.Begin();
+			graphics.Shaders.Display2D.SetSettings(1.0f, 1.0f, 0.0f, 1.0f, true);
+			graphics.Shaders.Display2D.BeginPass(1);
+			graphics.Device.DrawUserPrimitives(PrimitiveType.TriangleStrip, 0, 2, crosshairverts);
+			graphics.Shaders.Display2D.EndPass();
+			graphics.Shaders.Display2D.End();
+		}
+
+		// This switches fog on and off
+		public void SetFogMode(bool usefog)
+		{
+			graphics.Device.SetRenderState(RenderState.FogEnable, usefog);
+		}
+
+		// This siwtches crosshair busy icon on and off
+		public void SetCrosshairBusy(bool busy)
+		{
+			crosshairbusy = busy;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Rendering/ShaderManager.cs b/Source/Core/Rendering/ShaderManager.cs
new file mode 100644
index 0000000..2ae4005
--- /dev/null
+++ b/Source/Core/Rendering/ShaderManager.cs
@@ -0,0 +1,127 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using SlimDX.Direct3D9;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Rendering
+{
+	internal class ShaderManager : ID3DResource
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		// Settings
+		private string shadertechnique;
+		private bool useshaders;
+		
+		// Shaders
+		private Display2DShader display2dshader;
+		private Things2DShader things2dshader;
+		private World3DShader world3dshader;
+		
+		// Device
+		private D3DDevice device;
+		
+		// Disposing
+		private bool isdisposed;
+
+		#endregion
+
+		#region ================== Properties
+
+		public bool Enabled { get { return useshaders; } }
+		public string ShaderTechnique { get { return shadertechnique; } }
+		public Display2DShader Display2D { get { return display2dshader; } }
+		public Things2DShader Things2D { get { return things2dshader; } }
+		public World3DShader World3D { get { return world3dshader; } }
+		public bool IsDisposed { get { return isdisposed; } }
+		internal D3DDevice D3DDevice { get { return device; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public ShaderManager(D3DDevice device)
+		{
+			// Initialize
+			this.device = device;
+			
+			// Load
+			ReloadResource();
+
+			// Register as resource
+			device.RegisterResource(this);
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Disposer
+		public void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Clean up
+				UnloadResource();
+
+				// Unregister as resource
+				device.UnregisterResource(this);
+				
+				// Done
+				device = null;
+				isdisposed = true;
+			}
+		}
+
+		#endregion
+
+		#region ================== Resources
+
+		// Clean up resources
+		public void UnloadResource()
+		{
+			display2dshader.Dispose();
+			things2dshader.Dispose();
+			world3dshader.Dispose();
+		}
+
+		// Load resources
+		public void ReloadResource()
+		{
+			// Check if we can use shaders
+			Capabilities caps = General.Map.Graphics.Device.Capabilities;
+			useshaders = (caps.PixelShaderVersion.Major >= 2);
+			shadertechnique = "SM20";
+
+			// Initialize effects
+			display2dshader = new Display2DShader(this);
+			things2dshader = new Things2DShader(this);
+			world3dshader = new World3DShader(this);
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Rendering/SurfaceBufferSet.cs b/Source/Core/Rendering/SurfaceBufferSet.cs
new file mode 100644
index 0000000..3159c4e
--- /dev/null
+++ b/Source/Core/Rendering/SurfaceBufferSet.cs
@@ -0,0 +1,42 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using SlimDX.Direct3D9;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Rendering
+{
+	internal struct SurfaceBufferSet
+	{
+		// The number of vertices per sector that this set is for
+		public int numvertices;
+		
+		// These are the vertex buffers. They are hashed by an integer key which
+		// is the number of vertices per sector geometry the buffer if meant for.
+		public List<VertexBuffer> buffers;
+		public List<int> buffersizes;
+
+		// These are the entries that contain information for the contents of the buffers.
+		public List<SurfaceEntry> entries;
+
+		// These are the empty entries in buferrs that are available.
+		public List<SurfaceEntry> holes;
+	}
+}
diff --git a/Source/Core/Rendering/SurfaceEntry.cs b/Source/Core/Rendering/SurfaceEntry.cs
new file mode 100644
index 0000000..6b95dde
--- /dev/null
+++ b/Source/Core/Rendering/SurfaceEntry.cs
@@ -0,0 +1,87 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Drawing;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Rendering
+{
+	// This is an entry is the surface manager and contains the information
+	// needed for a sector to place it's ceiling and floor surface geometry
+	// in a vertexbuffer. Sectors keep a reference to this entry to tell the
+	// surface manager to remove them if needed.
+	internal class SurfaceEntry
+	{
+		// Number of vertices in the geometry and index of the buffer
+		// This tells the surface manager which vertexbuffer this is in.
+		public int numvertices;
+		public int bufferindex;
+		
+		// Bounding box for fast culling
+		public RectangleF bbox;
+		
+		// Offset in the buffer (in number of vertices)
+		public int vertexoffset;
+		
+		// Sector geometry (local copy used to quickly refill buffers)
+		// The sector must set these!
+		public FlatVertex[] floorvertices;
+		public FlatVertex[] ceilvertices;
+		
+		// Sector images
+		// The sector must set these!
+		public long floortexture;
+		public long ceiltexture;
+		
+		// Constructor
+		internal SurfaceEntry(int numvertices, int bufferindex, int vertexoffset)
+		{
+			this.numvertices = numvertices;
+			this.bufferindex = bufferindex;
+			this.vertexoffset = vertexoffset;
+		}
+
+		// Constructor that copies the entry, but does not copy the vertices
+		internal SurfaceEntry(SurfaceEntry oldentry)
+		{
+			this.numvertices = oldentry.numvertices;
+			this.bufferindex = oldentry.bufferindex;
+			this.vertexoffset = oldentry.vertexoffset;
+		}
+
+		// This calculates the bounding box from the vertices
+		public void UpdateBBox()
+		{
+			float left = float.MaxValue;
+			float right = float.MinValue;
+			float top = float.MaxValue;
+			float bottom = float.MinValue;
+			
+			for(int i = 0; i < floorvertices.Length; i++)
+			{
+				if(floorvertices[i].x < left) left = floorvertices[i].x;
+				if(floorvertices[i].x > right) right = floorvertices[i].x;
+				if(floorvertices[i].y < top) top = floorvertices[i].y;
+				if(floorvertices[i].y > bottom) bottom = floorvertices[i].y;
+			}
+
+			bbox = new RectangleF(left, top, right - left, bottom - top);
+		}
+	}
+}
diff --git a/Source/Core/Rendering/SurfaceEntryCollection.cs b/Source/Core/Rendering/SurfaceEntryCollection.cs
new file mode 100644
index 0000000..1f70107
--- /dev/null
+++ b/Source/Core/Rendering/SurfaceEntryCollection.cs
@@ -0,0 +1,31 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections.Generic;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Rendering
+{
+	// This contains information to update surface entries with. This may exceed the maximum number
+	// of sector vertices, the surface manager will take care of splitting it up in several SurfaceEntries.
+	internal class SurfaceEntryCollection : List<SurfaceEntry>
+	{
+		public int totalvertices;
+	}
+}
diff --git a/Source/Core/Rendering/SurfaceManager.cs b/Source/Core/Rendering/SurfaceManager.cs
new file mode 100644
index 0000000..5e1c7f6
--- /dev/null
+++ b/Source/Core/Rendering/SurfaceManager.cs
@@ -0,0 +1,696 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Drawing;
+using CodeImp.DoomBuilder.IO;
+using CodeImp.DoomBuilder.Map;
+using SlimDX.Direct3D9;
+using SlimDX;
+using CodeImp.DoomBuilder.Data;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Rendering
+{
+	internal class SurfaceManager : ID3DResource
+	{
+		#region ================== Constants
+		
+		// The true maximum lies at 65535 if I remember correctly, but that
+		// is a scary big number for a vertexbuffer.
+		private const int MAX_VERTICES_PER_BUFFER = 30000;
+		
+		// When a sector exceeds this number of vertices, it should split up it's triangles
+		// This number must be a multiple of 3.
+		public const int MAX_VERTICES_PER_SECTOR = 6000;
+		
+		#endregion
+		
+		#region ================== Variables
+		
+		// Set of buffers for a specific number of vertices per sector
+		private Dictionary<int, SurfaceBufferSet> sets;
+		
+		// List of buffers that are locked
+		// This is null when not in the process of updating
+		private List<VertexBuffer> lockedbuffers;
+		
+		// Surface to be rendered.
+		// Each BinaryHeap in the Dictionary contains all geometry that needs
+		// to be rendered with the associated ImageData.
+		// The BinaryHeap sorts the geometry by sector to minimize stream switchs.
+		// This is null when not in the process of rendering
+		private Dictionary<ImageData, List<SurfaceEntry>> surfaces;
+		
+		// This is 1 to add the number of vertices to the offset
+		// (effectively rendering the ceiling vertices instead of floor vertices)
+		private int surfacevertexoffsetmul;
+		
+		// This is set to true when the resources have been unloaded
+		private bool resourcesunloaded;
+
+		#endregion
+
+		#region ================== Properties
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+		
+		// Constructor
+		public SurfaceManager()
+		{
+			sets = new Dictionary<int, SurfaceBufferSet>();
+			lockedbuffers = new List<VertexBuffer>();
+
+			General.Map.Graphics.RegisterResource(this);
+		}
+		
+		// Disposer
+		public void Dispose()
+		{
+			if(sets != null)
+			{
+				General.Map.Graphics.UnregisterResource(this);
+				
+				// Dispose all sets
+				foreach(KeyValuePair<int, SurfaceBufferSet> set in sets)
+				{
+					// Dispose vertex buffers
+					for(int i = 0; i < set.Value.buffers.Count; i++)
+					{
+						if(set.Value.buffers[i] != null)
+						{
+							set.Value.buffers[i].Dispose();
+							set.Value.buffers[i] = null;
+						}
+					}
+				}
+				
+				sets = null;
+			}
+		}
+		
+		#endregion
+
+		#region ================== Management
+
+		// Called when all resource must be unloaded
+		public void UnloadResource()
+		{
+			resourcesunloaded = true;
+			foreach(KeyValuePair<int, SurfaceBufferSet> set in sets)
+			{
+				// Dispose vertex buffers
+				for(int i = 0; i < set.Value.buffers.Count; i++)
+				{
+					if(set.Value.buffers[i] != null)
+					{
+						set.Value.buffers[i].Dispose();
+						set.Value.buffers[i] = null;
+					}
+				}
+			}
+			
+			lockedbuffers.Clear();
+		}
+
+		// Called when all resource must be reloaded
+		public void ReloadResource()
+		{
+			foreach(KeyValuePair<int, SurfaceBufferSet> set in sets)
+			{
+				// Rebuild vertex buffers
+				for(int i = 0; i < set.Value.buffersizes.Count; i++)
+				{
+					// Make the new buffer!
+					VertexBuffer b = new VertexBuffer(General.Map.Graphics.Device, FlatVertex.Stride * set.Value.buffersizes[i],
+													Usage.WriteOnly | Usage.Dynamic, VertexFormat.None, Pool.Default);
+
+					// Start refilling the buffer with sector geometry
+					DataStream bstream = b.Lock(0, FlatVertex.Stride * set.Value.buffersizes[i], LockFlags.Discard);
+					foreach(SurfaceEntry e in set.Value.entries)
+					{
+						if(e.bufferindex == i)
+						{
+							// Fill buffer
+							bstream.Seek(e.vertexoffset * FlatVertex.Stride, SeekOrigin.Begin);
+							bstream.WriteRange(e.floorvertices);
+							bstream.WriteRange(e.ceilvertices);
+						}
+					}
+
+					// Unlock buffer
+					b.Unlock();
+					bstream.Dispose();
+					
+					// Add to list
+					set.Value.buffers[i] = b;
+				}
+			}
+			
+			resourcesunloaded = false;
+		}
+		
+		// This resets all buffers and requires all sectors to get new entries
+		public void Reset()
+		{
+			// Clear all items
+			foreach(KeyValuePair<int, SurfaceBufferSet> set in sets)
+			{
+				foreach(SurfaceEntry entry in set.Value.entries)
+				{
+					entry.numvertices = -1;
+					entry.bufferindex = -1;
+				}
+				
+				foreach(SurfaceEntry entry in set.Value.holes)
+				{
+					entry.numvertices = -1;
+					entry.bufferindex = -1;
+				}
+
+				foreach(VertexBuffer vb in set.Value.buffers)
+					vb.Dispose();
+			}
+
+			// New dictionary
+			sets = new Dictionary<int, SurfaceBufferSet>();
+		}
+
+		// Updating sector surface geometry should go in this order;
+		// - Triangulate sectors
+		// - Call FreeSurfaces to remove entries that have changed number of vertices
+		// - Call AllocateBuffers
+		// - Call UpdateSurfaces to add/update entries
+		// - Call UnlockBuffers
+		
+		// This (re)allocates the buffers based on an analysis of the map
+		// The map must be updated (triangulated) before calling this
+		public void AllocateBuffers()
+		{
+			// Make analysis of sector geometry
+			Dictionary<int, int> sectorverts = new Dictionary<int, int>();
+			foreach(Sector s in General.Map.Map.Sectors)
+			{
+				if(s.Triangles != null)
+				{
+					int numvertices = s.Triangles.Vertices.Count;
+					while(numvertices > 0)
+					{
+						// Determine for how many vertices in this entry
+						int vertsinentry = (numvertices > MAX_VERTICES_PER_SECTOR) ? MAX_VERTICES_PER_SECTOR : numvertices;
+						
+						// We count the number of sectors that have specific number of vertices
+						if(!sectorverts.ContainsKey(vertsinentry))
+							sectorverts.Add(vertsinentry, 0);
+						sectorverts[vertsinentry]++;
+
+						numvertices -= vertsinentry;
+					}
+				}
+			}
+			
+			// Now (re)allocate the needed buffers
+			foreach(KeyValuePair<int, int> sv in sectorverts)
+			{
+				// Zero vertices can't be drawn
+				if(sv.Key > 0)
+				{
+					SurfaceBufferSet set = GetSet(sv.Key);
+					
+					// Calculte how many free entries we need
+					int neededentries = sv.Value;
+					int freeentriesneeded = neededentries - set.entries.Count;
+
+					// Allocate the space needed
+					EnsureFreeBufferSpace(set, freeentriesneeded);
+				}
+			}
+		}
+
+		// This ensures there is enough space for a given number of free entries (also adds new bufers if needed)
+		private void EnsureFreeBufferSpace(SurfaceBufferSet set, int freeentries)
+		{
+			DataStream bstream = null;
+			VertexBuffer vb = null;
+			
+			// Check if we have to add entries
+			int addentries = freeentries - set.holes.Count;
+
+			// Begin resizing buffers starting with the last in this set
+			int bufferindex = set.buffers.Count - 1;
+
+			// Calculate the maximum number of entries we can put in a new buffer
+			// Note that verticesperentry is the number of vertices multiplied by 2, because
+			// we have to store both the floor and ceiling
+			int verticesperentry = set.numvertices * 2;
+			int maxentriesperbuffer = MAX_VERTICES_PER_BUFFER / verticesperentry;
+
+			// Make a new bufer when the last one is full
+			if((bufferindex > -1) && (set.buffersizes[bufferindex] >= (maxentriesperbuffer * verticesperentry)))
+				bufferindex = -1;
+			
+			while(addentries > 0)
+			{
+				// Create a new buffer?
+				if((bufferindex == -1) || (bufferindex > (set.buffers.Count - 1)))
+				{
+					// Determine the number of entries we will be making this buffer for
+					int bufferentries = (addentries > maxentriesperbuffer) ? maxentriesperbuffer : addentries;
+
+					// Calculate the number of vertices that will be
+					int buffernumvertices = bufferentries * verticesperentry;
+
+					if(!resourcesunloaded)
+					{
+						// Make the new buffer!
+						vb = new VertexBuffer(General.Map.Graphics.Device, FlatVertex.Stride * buffernumvertices,
+												Usage.WriteOnly | Usage.Dynamic, VertexFormat.None, Pool.Default);
+
+						// Add it.
+						set.buffers.Add(vb);
+					}
+					else
+					{
+						// We can't make a vertexbuffer right now
+						set.buffers.Add(null);
+					}
+					
+					// Also add available entries as holes, because they are not used yet.
+					set.buffersizes.Add(buffernumvertices);
+					for(int i = 0; i < bufferentries; i++)
+						set.holes.Add(new SurfaceEntry(set.numvertices, set.buffers.Count - 1, i * verticesperentry));
+
+					// Done
+					addentries -= bufferentries;
+				}
+				// Reallocate a buffer
+				else
+				{
+					// Trash the old buffer
+					if(set.buffers[bufferindex].Tag != null)
+					{
+						bstream = (DataStream)set.buffers[bufferindex].Tag;
+						set.buffers[bufferindex].Unlock();
+						bstream.Dispose();
+						set.buffers[bufferindex].Tag = null;
+					}
+
+					if((set.buffers[bufferindex] != null) && !resourcesunloaded)
+						set.buffers[bufferindex].Dispose();
+
+					// Get the entries that are in this buffer only
+					List<SurfaceEntry> theseentries = new List<SurfaceEntry>();
+					foreach(SurfaceEntry e in set.entries)
+					{
+						if(e.bufferindex == bufferindex)
+							theseentries.Add(e);
+					}
+
+					// Determine the number of entries we will be making this buffer for
+					int bufferentries = ((theseentries.Count + addentries) > maxentriesperbuffer) ? maxentriesperbuffer : (theseentries.Count + addentries);
+
+					// Calculate the number of vertices that will be
+					int buffernumvertices = bufferentries * verticesperentry;
+
+					if(!resourcesunloaded)
+					{
+						// Make the new buffer and lock it
+						vb = new VertexBuffer(General.Map.Graphics.Device, FlatVertex.Stride * buffernumvertices,
+												Usage.WriteOnly | Usage.Dynamic, VertexFormat.None, Pool.Default);
+						bstream = vb.Lock(0, FlatVertex.Stride * theseentries.Count * verticesperentry, LockFlags.Discard);
+					}
+					
+					// Start refilling the buffer with sector geometry
+					int vertexoffset = 0;
+					foreach(SurfaceEntry e in theseentries)
+					{
+						if(!resourcesunloaded)
+						{
+							// Fill buffer
+							bstream.WriteRange(e.floorvertices);
+							bstream.WriteRange(e.ceilvertices);
+						}
+
+						// Set the new location in the buffer
+						e.vertexoffset = vertexoffset;
+
+						// Move on
+						vertexoffset += verticesperentry;
+					}
+
+					if(!resourcesunloaded)
+					{
+						// Unlock buffer
+						vb.Unlock();
+						bstream.Dispose();
+						set.buffers[bufferindex] = vb;
+					}
+					else
+					{
+						// No vertex buffer at this time, sorry
+						set.buffers[bufferindex] = null;
+					}
+
+					// Set the new buffer and add available entries as holes, because they are not used yet.
+					set.buffersizes[bufferindex] = buffernumvertices;
+					set.holes.Clear();
+					for(int i = 0; i < bufferentries - theseentries.Count; i++)
+						set.holes.Add(new SurfaceEntry(set.numvertices, bufferindex, i * verticesperentry + vertexoffset));
+
+					// Done
+					addentries -= bufferentries;
+				}
+
+				// Always continue in next (new) buffer
+				bufferindex = set.buffers.Count;
+			}
+		}
+		
+		// This adds or updates sector geometry into a buffer.
+		// Modiies the list of SurfaceEntries with the new surface entry for the stored geometry.
+		public void UpdateSurfaces(SurfaceEntryCollection entries, SurfaceUpdate update)
+		{
+			// Free entries when number of vertices has changed
+			if((entries.Count > 0) && (entries.totalvertices != update.numvertices))
+			{
+				FreeSurfaces(entries);
+				entries.Clear();
+			}
+			
+			if((entries.Count == 0) && (update.numvertices > 0))
+			{
+				#if DEBUG
+				if((update.floorvertices == null) || (update.ceilvertices == null))
+					General.Fail("We need both floor and ceiling vertices when the number of vertices changes!");
+				#endif
+				
+				// If we have no entries yet, we have to make them now
+				int vertsremaining = update.numvertices;
+				while(vertsremaining > 0)
+				{
+					// Determine for how many vertices in this entry
+					int vertsinentry = (vertsremaining > MAX_VERTICES_PER_SECTOR) ? MAX_VERTICES_PER_SECTOR : vertsremaining;
+
+					// Lookup the set that holds entries for this number of vertices
+					SurfaceBufferSet set = GetSet(vertsinentry);
+
+					// Make sure we can get a new entry in this set
+					EnsureFreeBufferSpace(set, 1);
+
+					// Get a new entry in this set
+					SurfaceEntry e = set.holes[set.holes.Count - 1];
+					set.holes.RemoveAt(set.holes.Count - 1);
+					set.entries.Add(e);
+					
+					// Fill the entry data
+					e.floorvertices = new FlatVertex[vertsinentry];
+					e.ceilvertices = new FlatVertex[vertsinentry];
+					Array.Copy(update.floorvertices, update.numvertices - vertsremaining, e.floorvertices, 0, vertsinentry);
+					Array.Copy(update.ceilvertices, update.numvertices - vertsremaining, e.ceilvertices, 0, vertsinentry);
+					e.floortexture = update.floortexture;
+					e.ceiltexture = update.ceiltexture;
+					
+					entries.Add(e);
+					vertsremaining -= vertsinentry;
+				}
+			}
+			else
+			{
+				// We re-use the same entries, just copy over the updated data
+				int vertsremaining = update.numvertices;
+				foreach(SurfaceEntry e in entries)
+				{
+					if(update.floorvertices != null)
+					{
+						Array.Copy(update.floorvertices, update.numvertices - vertsremaining, e.floorvertices, 0, e.numvertices);
+						e.floortexture = update.floortexture;
+					}
+
+					if(update.ceilvertices != null)
+					{
+						Array.Copy(update.ceilvertices, update.numvertices - vertsremaining, e.ceilvertices, 0, e.numvertices);
+						e.ceiltexture = update.ceiltexture;
+					}
+
+					vertsremaining -= e.numvertices;
+				}
+			}
+
+			entries.totalvertices = update.numvertices;
+			
+			// Time to update or create the buffers
+			foreach(SurfaceEntry e in entries)
+			{
+				SurfaceBufferSet set = GetSet(e.numvertices);
+
+				// Update bounding box
+				e.UpdateBBox();
+				
+				if(!resourcesunloaded)
+				{
+					// Lock the buffer
+					DataStream bstream;
+					VertexBuffer vb = set.buffers[e.bufferindex];
+					if(vb.Tag == null)
+					{
+						// Note: DirectX warns me that I am not using LockFlags.Discard or LockFlags.NoOverwrite here,
+						// but we don't have much of a choice since we want to update our data and not destroy other data
+						bstream = vb.Lock(0, set.buffersizes[e.bufferindex] * FlatVertex.Stride, LockFlags.None);
+						vb.Tag = bstream;
+						lockedbuffers.Add(vb);
+					}
+					else
+					{
+						bstream = (DataStream)vb.Tag;
+					}
+
+					// Write the vertices to buffer
+					bstream.Seek(e.vertexoffset * FlatVertex.Stride, SeekOrigin.Begin);
+					bstream.WriteRange(e.floorvertices);
+					bstream.WriteRange(e.ceilvertices);
+				}
+			}
+		}
+
+		// This frees the given surface entry
+		public void FreeSurfaces(SurfaceEntryCollection entries)
+		{
+			foreach(SurfaceEntry e in entries)
+			{
+				if((e.numvertices > 0) && (e.bufferindex > -1))
+				{
+					SurfaceBufferSet set = sets[e.numvertices];
+					set.entries.Remove(e);
+					SurfaceEntry newentry = new SurfaceEntry(e);
+					set.holes.Add(newentry);
+				}
+				e.numvertices = -1;
+				e.bufferindex = -1;
+			}
+		}
+		
+		// This unlocks the locked buffers
+		public void UnlockBuffers()
+		{
+			if(!resourcesunloaded)
+			{
+				foreach(VertexBuffer vb in lockedbuffers)
+				{
+					if(vb.Tag != null)
+					{
+						DataStream bstream = (DataStream)vb.Tag;
+						vb.Unlock();
+						bstream.Dispose();
+						vb.Tag = null;
+					}
+				}
+
+				// Clear list
+				lockedbuffers = new List<VertexBuffer>();
+			}
+		}
+		
+		// This gets or creates a set for a specific number of vertices
+		private SurfaceBufferSet GetSet(int numvertices)
+		{
+			SurfaceBufferSet set;
+			
+			// Get or create the set
+			if(!sets.ContainsKey(numvertices))
+			{
+				set = new SurfaceBufferSet();
+				set.numvertices = numvertices;
+				set.buffers = new List<VertexBuffer>();
+				set.buffersizes = new List<int>();
+				set.entries = new List<SurfaceEntry>();
+				set.holes = new List<SurfaceEntry>();
+				sets.Add(numvertices, set);
+			}
+			else
+			{
+				set = sets[numvertices];
+			}
+
+			return set;
+		}
+		
+		#endregion
+		
+		#region ================== Rendering
+		
+		// This renders all sector floors
+		internal void RenderSectorFloors(RectangleF viewport)
+		{
+			surfaces = new Dictionary<ImageData, List<SurfaceEntry>>();
+			surfacevertexoffsetmul = 0;
+			
+			// Go for all surfaces as they are sorted in the buffers, so that
+			// they are automatically already sorted by vertexbuffer
+			foreach(KeyValuePair<int, SurfaceBufferSet> set in sets)
+			{
+				foreach(SurfaceEntry entry in set.Value.entries)
+				{
+					if(entry.bbox.IntersectsWith(viewport))
+						AddSurfaceEntryForRendering(entry, entry.floortexture);
+				}
+			}
+		}
+		
+		// This renders all sector ceilings
+		internal void RenderSectorCeilings(RectangleF viewport)
+		{
+			surfaces = new Dictionary<ImageData, List<SurfaceEntry>>();
+			surfacevertexoffsetmul = 1;
+			
+			// Go for all surfaces as they are sorted in the buffers, so that
+			// they are automatically already sorted by vertexbuffer
+			foreach(KeyValuePair<int, SurfaceBufferSet> set in sets)
+			{
+				foreach(SurfaceEntry entry in set.Value.entries)
+				{
+					if(entry.bbox.IntersectsWith(viewport))
+						AddSurfaceEntryForRendering(entry, entry.ceiltexture);
+				}
+			}
+		}
+
+		// This renders all sector brightness levels
+		internal void RenderSectorBrightness(RectangleF viewport)
+		{
+			surfaces = new Dictionary<ImageData, List<SurfaceEntry>>();
+			surfacevertexoffsetmul = 0;
+			
+			// Go for all surfaces as they are sorted in the buffers, so that
+			// they are automatically already sorted by vertexbuffer
+			foreach(KeyValuePair<int, SurfaceBufferSet> set in sets)
+			{
+				foreach(SurfaceEntry entry in set.Value.entries)
+				{
+					if(entry.bbox.IntersectsWith(viewport))
+						AddSurfaceEntryForRendering(entry, 0);
+				}
+			}
+		}
+
+		// This adds a surface entry to the list of surfaces
+		private void AddSurfaceEntryForRendering(SurfaceEntry entry, long longimagename)
+		{
+			// Determine texture to use
+			ImageData img;
+			if(longimagename == 0)
+			{
+				img = General.Map.Data.WhiteTexture;
+			}
+			else
+			{
+				if(longimagename == MapSet.EmptyLongName) 
+				{
+					img = General.Map.Data.MissingTexture3D;
+				}
+				else 
+				{
+					img = General.Map.Data.GetFlatImage(longimagename);
+
+					if(img is UnknownImage)
+					{
+						img = General.Map.Data.UnknownTexture3D;
+					}
+					else
+					{
+						if(img.IsImageLoaded && !img.LoadFailed) 
+						{
+							if(img.Texture == null) img.CreateTexture();
+						}
+						else 
+						{
+							img = General.Map.Data.WhiteTexture;
+						}
+					}
+				}
+			}
+			
+			// Store by texture
+			if(!surfaces.ContainsKey(img)) surfaces.Add(img, new List<SurfaceEntry>());
+			surfaces[img].Add(entry);
+		}
+		
+		// This renders the sorted sector surfaces
+		internal void RenderSectorSurfaces(D3DDevice graphics)
+		{
+			if(!resourcesunloaded)
+			{
+				int pass = Renderer.FullBrightness ? 2 : 1; //mxd
+				graphics.Shaders.Display2D.Begin();
+				foreach(KeyValuePair<ImageData, List<SurfaceEntry>> imgsurfaces in surfaces)
+				{
+					// Set texture
+					graphics.Shaders.Display2D.Texture1 = imgsurfaces.Key.Texture;
+					if(!graphics.Shaders.Enabled) graphics.Device.SetTexture(0, imgsurfaces.Key.Texture);
+
+					graphics.Shaders.Display2D.BeginPass(pass);
+					
+					// Go for all surfaces
+					VertexBuffer lastbuffer = null;
+					foreach(SurfaceEntry entry in imgsurfaces.Value)
+					{
+						// Set the vertex buffer
+						SurfaceBufferSet set = sets[entry.numvertices];
+						if(set.buffers[entry.bufferindex] != lastbuffer)
+						{
+							lastbuffer = set.buffers[entry.bufferindex];
+							graphics.Device.SetStreamSource(0, lastbuffer, 0, FlatVertex.Stride);
+						}
+
+						// Draw
+						graphics.Device.DrawPrimitives(PrimitiveType.TriangleList, entry.vertexoffset + (entry.numvertices * surfacevertexoffsetmul), entry.numvertices / 3);
+					}
+					
+					graphics.Shaders.Display2D.EndPass();
+				}
+				graphics.Shaders.Display2D.End();
+			}
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Rendering/SurfaceUpdate.cs b/Source/Core/Rendering/SurfaceUpdate.cs
new file mode 100644
index 0000000..0c0815f
--- /dev/null
+++ b/Source/Core/Rendering/SurfaceUpdate.cs
@@ -0,0 +1,50 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Rendering
+{
+	// This contains information to update surface entries with. This may exceed the maximum number
+	// of sector vertices, the surface manager will take care of splitting it up in several SurfaceEntries.
+	internal class SurfaceUpdate
+	{
+		public readonly int numvertices;
+		
+		// Sector geometry (local copy used to quickly refill buffers)
+		// The sector must set these!
+		public FlatVertex[] floorvertices;
+		public FlatVertex[] ceilvertices;
+		
+		// Sector images
+		// The sector must set these!
+		public long floortexture;
+		public long ceiltexture;
+		
+		// Constructor
+		internal SurfaceUpdate(int numvertices, bool updatefloor, bool updateceiling)
+		{
+			this.numvertices = numvertices;
+			this.floortexture = 0;
+			this.ceiltexture = 0;
+			
+			this.floorvertices = (updatefloor ? new FlatVertex[numvertices] : null);
+			this.ceilvertices = (updateceiling ? new FlatVertex[numvertices] : null);
+		}
+	}
+}
diff --git a/Source/Core/Rendering/TextAlignment.cs b/Source/Core/Rendering/TextAlignment.cs
new file mode 100644
index 0000000..9d0d70b
--- /dev/null
+++ b/Source/Core/Rendering/TextAlignment.cs
@@ -0,0 +1,38 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Rendering
+{
+	// This enumeration defines horizontal alignment
+	public enum TextAlignmentX : int
+	{
+		Left = 0,
+		Center = 1,
+		Right = 2
+	}
+
+	// This enumeration defines vertical alignment
+	public enum TextAlignmentY : int
+	{
+		Top = 0,
+		Middle = 1,
+		Bottom = 2
+	}
+}
diff --git a/Source/Core/Rendering/TextFont.cs b/Source/Core/Rendering/TextFont.cs
new file mode 100644
index 0000000..dad5df3
--- /dev/null
+++ b/Source/Core/Rendering/TextFont.cs
@@ -0,0 +1,248 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections;
+using System.Text;
+using System.IO;
+using System.Drawing;
+using SlimDX;
+
+using Configuration = CodeImp.DoomBuilder.IO.Configuration;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Rendering
+{
+	internal class TextFont : IDisposable
+	{
+		#region ================== Structures
+		
+		// This structure defines character properties
+		private struct FontCharacter
+		{
+			// Variables
+			public float width;
+			public float height;
+			public float u1;
+			public float v1;
+			public float u2;
+			public float v2;
+		}
+
+		#endregion
+		
+		#region ================== Constants
+
+		// Font resource name
+		private const string FONT_RESOURCE = "Font.cfg";
+		
+		// Spacing adjustments
+		private const float ADJUST_SPACING = -0.08f;
+		
+		#endregion
+
+		#region ================== Variables
+
+		// Characters
+		private FontCharacter[] characters;
+		
+		// Disposing
+		private bool isdisposed;
+
+		#endregion
+
+		#region ================== Properties
+
+		public bool IsDisposed { get { return isdisposed; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		internal TextFont()
+		{
+			// Initialize
+			characters = new FontCharacter[256];
+
+			// Make chars configuration
+			Configuration cfg = new Configuration();
+			
+			// Find a resource named Font.cfg
+			string[] resnames = General.ThisAssembly.GetManifestResourceNames();
+			foreach(string rn in resnames)
+			{
+				// Found it?
+				if(rn.EndsWith(FONT_RESOURCE, StringComparison.InvariantCultureIgnoreCase))
+				{
+					// Get a stream from the resource
+					Stream fontdata = General.ThisAssembly.GetManifestResourceStream(rn);
+					StreamReader fontreader = new StreamReader(fontdata, Encoding.ASCII);
+
+					// Load configuration from stream
+					cfg.InputConfiguration(fontreader.ReadToEnd());
+
+					// Done
+					fontreader.Dispose();
+					fontdata.Dispose();
+					break;
+				}
+			}
+			
+			// Get the charset from configuration
+			IDictionary cfgchars = cfg.ReadSetting("chars", new Hashtable());
+
+			// Go for all defined chars
+			foreach(DictionaryEntry item in cfgchars)
+			{
+				// Get the character Hashtable
+				IDictionary chr = (IDictionary)item.Value;
+				int i = Convert.ToInt32(item.Key);
+
+				// This is ancient code of mine.
+				// The charater sizes were based on 800x600 resolution.
+				characters[i].width = (int)chr["width"] / 40f;
+				characters[i].height = (int)chr["height"] / 30f;
+				characters[i].u1 = (float)chr["u1"];
+				characters[i].v1 = (float)chr["v1"];
+				characters[i].u2 = (float)chr["u2"];
+				characters[i].v2 = (float)chr["v2"];
+			}
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Diposer
+		public void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Done
+				isdisposed = true;
+			}
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+
+		// This sets up vertices for a specific character
+		// also advances vertsoffset and textx
+		public void SetupVertices(DataStream stream, byte c, float scale, int color,
+						ref float textx, float texty, float textheight, float offsetv)
+		{
+			FlatVertex vert = new FlatVertex();
+
+			// Get the character information
+			FontCharacter cinfo = characters[c];
+			float cwidth = cinfo.width * scale;
+
+			// Create lefttop vertex
+			vert.c = color;
+			vert.u = cinfo.u1;
+			vert.v = cinfo.v1 * 0.5f + offsetv;
+			vert.x = textx;
+			vert.y = texty;
+			stream.Write(vert);
+
+			// Create leftbottom vertex
+			vert.c = color;
+			vert.u = cinfo.u1;
+			vert.v = cinfo.v2 * 0.5f + offsetv;
+			vert.x = textx;
+			vert.y = texty + textheight;
+			stream.Write(vert);
+
+			// Create righttop vertex
+			vert.c = color;
+			vert.u = cinfo.u2;
+			vert.v = cinfo.v1 * 0.5f + offsetv;
+			vert.x = textx + cwidth;
+			vert.y = texty;
+			stream.Write(vert);
+
+			// Create leftbottom vertex
+			vert.c = color;
+			vert.u = cinfo.u1;
+			vert.v = cinfo.v2 * 0.5f + offsetv;
+			vert.x = textx;
+			vert.y = texty + textheight;
+			stream.Write(vert);
+
+			// Create righttop vertex
+			vert.c = color;
+			vert.u = cinfo.u2;
+			vert.v = cinfo.v1 * 0.5f + offsetv;
+			vert.x = textx + cwidth;
+			vert.y = texty;
+			stream.Write(vert);
+
+			// Create rightbottom vertex
+			vert.c = color;
+			vert.u = cinfo.u2;
+			vert.v = cinfo.v2 * 0.5f + offsetv;
+			vert.x = textx + cwidth;
+			vert.y = texty + textheight;
+			stream.Write(vert);
+
+			textx += (cwidth + (ADJUST_SPACING * scale));
+		}
+		
+		// This checks if the given character exists in the charset
+		public bool Contains(char c)
+		{
+			// Convert character to ASCII
+			byte[] keybyte = Encoding.ASCII.GetBytes(c.ToString());
+			return Contains(keybyte[0]);
+		}
+		
+		// This checks if the given character exists in the charset
+		public bool Contains(byte b)
+		{
+			// Check if the character has been set
+			return ((characters[b].width > 0.000000001f) ||
+					(characters[b].height > 0.000000001f));
+		}
+
+		// This calculates the size of a text string at a given scale
+		public SizeF GetTextSize(string text, float scale)
+		{
+			// Size items
+			float sizex = 0, sizey = 0;
+
+			// Get the ASCII bytes for the text
+			byte[] btext = Encoding.ASCII.GetBytes(text);
+
+			// Go for all chars in text to calculate final text size
+			foreach(byte b in btext)
+			{
+				// Add to the final size
+				sizex += characters[b].width * scale;
+				sizey = characters[b].height * scale;
+			}
+
+			// Return size
+			return new SizeF(sizex, sizey);
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Rendering/TextLabel.cs b/Source/Core/Rendering/TextLabel.cs
new file mode 100644
index 0000000..f53eaaf
--- /dev/null
+++ b/Source/Core/Rendering/TextLabel.cs
@@ -0,0 +1,271 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Text;
+using System.Drawing;
+using SlimDX.Direct3D9;
+using SlimDX;
+using CodeImp.DoomBuilder.Geometry;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Rendering
+{
+	public class TextLabel : IDisposable, ID3DResource
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		// The text is stored as a polygon in a vertex buffer
+		private VertexBuffer textbuffer;
+		private int numfaces;
+		private int capacity;
+		
+		// Text settings
+		private string text;
+		private RectangleF rect;
+		private bool transformcoords;
+		private PixelColor color;
+		private PixelColor backcolor;
+		private float scale;
+		private TextAlignmentX alignx;
+		private TextAlignmentY aligny;
+		private SizeF size;
+		
+		// This keeps track if changes were made
+		private bool updateneeded;
+		private float lasttranslatex = float.MinValue;
+		private float lasttranslatey;
+		private float lastscalex;
+		private float lastscaley;
+		
+		// Disposing
+		private bool isdisposed;
+
+		#endregion
+
+		#region ================== Properties
+
+		// Properties
+		public RectangleF Rectangle { get { return rect; } set { rect = value; updateneeded = true; } }
+		public float Left { get { return rect.X; } set { rect.X = value; updateneeded = true; } }
+		public float Top { get { return rect.Y; } set { rect.Y = value; updateneeded = true; } }
+		public float Width { get { return rect.Width; } set { rect.Width = value; updateneeded = true; } }
+		public float Height { get { return rect.Height; } set { rect.Height = value; updateneeded = true; } }
+		public float Right { get { return rect.Right; } set { rect.Width = value - rect.X + 1f; updateneeded = true; } }
+		public float Bottom { get { return rect.Bottom; } set { rect.Height = value - rect.Y + 1f; updateneeded = true; } }
+		public string Text { get { return text; } set { if(text != value.ToUpperInvariant()) { text = value.ToUpperInvariant(); updateneeded = true; } } }
+		public bool TransformCoords { get { return transformcoords; } set { transformcoords = value; updateneeded = true; } }
+		public SizeF TextSize { get { return size; } }
+		public float Scale { get { return scale; } set { scale = value; updateneeded = true; } }
+		public TextAlignmentX AlignX { get { return alignx; } set { alignx = value; updateneeded = true; } }
+		public TextAlignmentY AlignY { get { return aligny; } set { aligny = value; updateneeded = true; } }
+		public PixelColor Color { get { return color; } set { color = value; updateneeded = true; } }
+		public PixelColor Backcolor { get { return backcolor; } set { backcolor = value; updateneeded = true; } }
+		internal VertexBuffer VertexBuffer { get { return textbuffer; } }
+		internal int NumFaces { get { return numfaces; } }
+		
+		// Disposing
+		public bool IsDisposed { get { return isdisposed; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public TextLabel(int capacity)
+		{
+			// Initialize
+			this.text = "";
+			this.rect = new RectangleF(0f, 0f, 1f, 1f);
+			this.color = new PixelColor(255, 255, 255, 255);
+			this.backcolor = new PixelColor(0, 0, 0, 0);
+			this.scale = 10f;
+			this.alignx = TextAlignmentX.Center;
+			this.aligny = TextAlignmentY.Top;
+			this.size = new SizeF(0f, 0f);
+			this.updateneeded = true;
+			this.numfaces = 0;
+			this.capacity = capacity;
+			
+			// Register as resource
+			General.Map.Graphics.RegisterResource(this);
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Diposer
+		public void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Clean up
+				UnloadResource();
+				
+				// Unregister resource
+				General.Map.Graphics.UnregisterResource(this);
+				
+				// Done
+				isdisposed = true;
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+		
+		// This updates the text if needed
+		internal void Update(float translatex, float translatey, float scalex, float scaley)
+		{
+			// Check if transformation changed and needs to be updated
+			if(transformcoords)
+			{
+				if(translatex != lasttranslatex || translatey != lasttranslatey ||
+				   scalex != lastscalex || scaley != lastscaley)
+				{
+					lasttranslatex = translatex; //mxd
+					lasttranslatey = translatey; //mxd
+					lastscalex = scalex; //mxd
+					lastscaley = scaley; //mxd
+					updateneeded = true;
+				}
+			}
+			
+			// Update if needed
+			if(updateneeded)
+			{
+				// Only build when there are any vertices
+				if(text.Length > 0)
+				{
+					// Do we have to make a new buffer?
+					if((textbuffer == null) || (text.Length > capacity))
+					{
+						// Dispose previous
+						if(textbuffer != null) textbuffer.Dispose();
+						
+						// Determine new capacity
+						if(capacity < text.Length) capacity = text.Length;
+						
+						// Create the buffer
+						textbuffer = new VertexBuffer(General.Map.Graphics.Device,
+													  capacity * 12 * FlatVertex.Stride,
+													  Usage.Dynamic | Usage.WriteOnly,
+													  VertexFormat.None, Pool.Default);
+					}
+					
+					// Transform?
+					RectangleF absview;
+					if(transformcoords)
+					{
+						// Calculate absolute coordinates
+						Vector2D lt = new Vector2D(rect.Left, rect.Top);
+						Vector2D rb = new Vector2D(rect.Right, rect.Bottom);
+						lt = lt.GetTransformed(translatex, translatey, scalex, scaley);
+						rb = rb.GetTransformed(translatex, translatey, scalex, scaley);
+						absview = new RectangleF(lt.x, lt.y, rb.x - lt.x, rb.y - lt.y);
+					}
+					else
+					{
+						// Fixed coordinates
+						absview = rect;
+					}
+					
+					// Calculate text dimensions
+					size = General.Map.Graphics.Font.GetTextSize(text, scale);
+
+					// Align the text horizontally
+					float beginx = 0;
+					switch(alignx)
+					{
+						case TextAlignmentX.Left: beginx = absview.X; break;
+						case TextAlignmentX.Center: beginx = absview.X + (absview.Width - size.Width) * 0.5f; break;
+						case TextAlignmentX.Right: beginx = absview.X + absview.Width - size.Width; break;
+					}
+
+					// Align the text vertically
+					float beginy = 0;
+					switch(aligny)
+					{
+						case TextAlignmentY.Top: beginy = absview.Y; break;
+						case TextAlignmentY.Middle: beginy = absview.Y + (absview.Height - size.Height) * 0.5f; break;
+						case TextAlignmentY.Bottom: beginy = absview.Y + absview.Height - size.Height; break;
+					}
+
+					// Get the ASCII bytes for the text
+					byte[] textbytes = Encoding.ASCII.GetBytes(text);
+
+					// Lock the buffer
+					DataStream stream = textbuffer.Lock(0, capacity * 12 * FlatVertex.Stride,
+									LockFlags.Discard | LockFlags.NoSystemLock);
+					
+					// Go for all chars in text to create the backgrounds
+					float textx = beginx;
+					foreach(byte b in textbytes)
+						General.Map.Graphics.Font.SetupVertices(stream, b, scale, backcolor.ToInt(),
+															ref textx, beginy, size.Height, 0.5f);
+
+					// Go for all chars in text to create the text
+					textx = beginx;
+					foreach(byte b in textbytes)
+						General.Map.Graphics.Font.SetupVertices(stream, b, scale, color.ToInt(),
+															ref textx, beginy, size.Height, 0.0f);
+
+					// Done filling the vertex buffer
+					textbuffer.Unlock();
+					stream.Dispose();
+
+					// Calculate number of triangles
+					numfaces = text.Length * 4;
+				}
+				else
+				{
+					// No faces in polygon
+					numfaces = 0;
+					size = new SizeF(0f, 0f);
+				}
+
+				// Text updated
+				updateneeded = false;
+			}
+		}
+
+		// This unloads the resources
+		public void UnloadResource()
+		{
+			// Clean up
+			if(textbuffer != null) textbuffer.Dispose();
+			textbuffer = null;
+
+			// Need to update before we can render
+			updateneeded = true;
+		}
+
+		// This (re)loads the resources
+		public void ReloadResource()
+		{
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Rendering/Things2DShader.cs b/Source/Core/Rendering/Things2DShader.cs
new file mode 100644
index 0000000..c096939
--- /dev/null
+++ b/Source/Core/Rendering/Things2DShader.cs
@@ -0,0 +1,201 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using SlimDX.Direct3D9;
+using SlimDX;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Rendering
+{
+	internal sealed class Things2DShader : D3DShader
+	{
+		#region ================== Variables
+
+		// Property handlers
+		private readonly EffectHandle texture1;
+		private readonly EffectHandle rendersettings;
+		private readonly EffectHandle transformsettings;
+		private readonly EffectHandle fillcolor; //mxd
+
+		#endregion
+
+		#region ================== Properties
+
+		public Texture Texture1 { set { if(manager.Enabled) effect.SetTexture(texture1, value); settingschanged = true; } }
+		
+		//mxd
+		private Color4 fc;
+		public Color4 FillColor
+		{
+			set
+			{
+				if(manager.Enabled && fc != value)
+				{
+					effect.SetValue(fillcolor, value);
+					fc = value;
+					settingschanged = true;
+				}
+			}
+		}
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public Things2DShader(ShaderManager manager) : base(manager)
+		{
+			// Load effect from file
+			effect = LoadEffect("things2d.fx");
+
+			// Get the property handlers from effect
+			if(effect != null)
+			{
+				texture1 = effect.GetParameter(null, "texture1");
+				rendersettings = effect.GetParameter(null, "rendersettings");
+				transformsettings = effect.GetParameter(null, "transformsettings");
+				fillcolor = effect.GetParameter(null, "fillColor"); //mxd
+			}
+
+			// Initialize world vertex declaration
+			VertexElement[] elements = new[]
+			{
+				new VertexElement(0, 0, DeclarationType.Float3, DeclarationMethod.Default, DeclarationUsage.Position, 0),
+				new VertexElement(0, 12, DeclarationType.Color, DeclarationMethod.Default, DeclarationUsage.Color, 0),
+				new VertexElement(0, 16, DeclarationType.Float2, DeclarationMethod.Default, DeclarationUsage.TextureCoordinate, 0),
+				VertexElement.VertexDeclarationEnd
+			};
+			vertexdecl = new VertexDeclaration(General.Map.Graphics.Device, elements);
+
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Disposer
+		public override void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Clean up
+				if(texture1 != null) texture1.Dispose();
+				if(rendersettings != null) rendersettings.Dispose();
+				if(transformsettings != null) transformsettings.Dispose();
+				if(fillcolor != null) fillcolor.Dispose(); //mxd
+
+				// Done
+				base.Dispose();
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This sets the settings
+		public void SetSettings(float alpha)
+		{
+			if(manager.Enabled)
+			{
+				Vector4 values = new Vector4(0.0f, 0.0f, 1.0f, alpha);
+				effect.SetValue(rendersettings, values);
+				Matrix world = manager.D3DDevice.Device.GetTransform(TransformState.World);
+				Matrix view = manager.D3DDevice.Device.GetTransform(TransformState.View);
+				effect.SetValue(transformsettings, world * view);
+				settingschanged = true; //mxd
+			}
+		}
+
+		//mxd. Used to render models
+		public void SetTransformSettings(Matrix world)
+		{
+			if(manager.Enabled) 
+			{
+				Matrix view = manager.D3DDevice.Device.GetTransform(TransformState.View);
+				effect.SetValue(transformsettings, world * view);
+				settingschanged = true;
+			}
+		}
+		
+		// This sets up the render pipeline
+		public override void BeginPass(int index)
+		{
+			Device device = manager.D3DDevice.Device;
+
+			if(!manager.Enabled)
+			{
+				// Sampler settings
+				if(General.Settings.ClassicBilinear)
+				{
+					device.SetSamplerState(0, SamplerState.MagFilter, TextureFilter.Linear);
+					device.SetSamplerState(0, SamplerState.MinFilter, TextureFilter.Linear);
+					device.SetSamplerState(0, SamplerState.MipFilter, TextureFilter.Linear);
+					device.SetSamplerState(0, SamplerState.MipMapLodBias, 0f);
+				}
+				else
+				{
+					device.SetSamplerState(0, SamplerState.MagFilter, TextureFilter.Point);
+					device.SetSamplerState(0, SamplerState.MinFilter, TextureFilter.Point);
+					device.SetSamplerState(0, SamplerState.MipFilter, TextureFilter.Point);
+					device.SetSamplerState(0, SamplerState.MipMapLodBias, 0f);
+				}
+
+				// Texture addressing
+				device.SetSamplerState(0, SamplerState.AddressU, TextureAddress.Wrap);
+				device.SetSamplerState(0, SamplerState.AddressV, TextureAddress.Wrap);
+				device.SetSamplerState(0, SamplerState.AddressW, TextureAddress.Wrap);
+
+				// First texture stage
+				device.SetTextureStageState(0, TextureStage.ColorOperation, TextureOperation.Modulate);
+				device.SetTextureStageState(0, TextureStage.ColorArg1, TextureArgument.Texture);
+				device.SetTextureStageState(0, TextureStage.ColorArg2, TextureArgument.Diffuse);
+				device.SetTextureStageState(0, TextureStage.ResultArg, TextureArgument.Current);
+				device.SetTextureStageState(0, TextureStage.TexCoordIndex, 0);
+
+				// Second texture stage
+				device.SetTextureStageState(1, TextureStage.ColorOperation, TextureOperation.Modulate);
+				device.SetTextureStageState(1, TextureStage.ColorArg1, TextureArgument.Current);
+				device.SetTextureStageState(1, TextureStage.ColorArg2, TextureArgument.TFactor);
+				device.SetTextureStageState(1, TextureStage.ResultArg, TextureArgument.Current);
+				device.SetTextureStageState(1, TextureStage.TexCoordIndex, 0);
+
+				// No more further stages
+				device.SetTextureStageState(2, TextureStage.ColorOperation, TextureOperation.Disable);
+
+				// First alpha stage
+				device.SetTextureStageState(0, TextureStage.AlphaOperation, TextureOperation.Modulate);
+				device.SetTextureStageState(0, TextureStage.AlphaArg1, TextureArgument.Texture);
+				device.SetTextureStageState(0, TextureStage.AlphaArg2, TextureArgument.Diffuse);
+
+				// Second alpha stage
+				device.SetTextureStageState(1, TextureStage.AlphaOperation, TextureOperation.Modulate);
+				device.SetTextureStageState(1, TextureStage.AlphaArg1, TextureArgument.Current);
+				device.SetTextureStageState(1, TextureStage.AlphaArg2, TextureArgument.TFactor);
+
+				// No more further stages
+				device.SetTextureStageState(2, TextureStage.AlphaOperation, TextureOperation.Disable);
+			}
+
+			base.BeginPass(index);
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Rendering/ViewMode.cs b/Source/Core/Rendering/ViewMode.cs
new file mode 100644
index 0000000..2740f1c
--- /dev/null
+++ b/Source/Core/Rendering/ViewMode.cs
@@ -0,0 +1,30 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Rendering
+{
+	public enum ViewMode : int
+	{
+		Normal = 0,
+		Brightness = 1,
+		FloorTextures = 2,
+		CeilingTextures = 3
+	}
+}
diff --git a/Source/Core/Rendering/World3DShader.cs b/Source/Core/Rendering/World3DShader.cs
new file mode 100644
index 0000000..98161bf
--- /dev/null
+++ b/Source/Core/Rendering/World3DShader.cs
@@ -0,0 +1,398 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using SlimDX.Direct3D9;
+using SlimDX;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Rendering
+{
+	internal sealed class World3DShader : D3DShader
+	{
+		#region ================== Variables
+
+		// Property handlers
+		private readonly EffectHandle texture1;
+		private readonly EffectHandle worldviewproj;
+		private readonly EffectHandle minfiltersettings;
+		private readonly EffectHandle magfiltersettings;
+		private readonly EffectHandle mipfiltersettings;
+		private readonly EffectHandle maxanisotropysetting;
+		private readonly EffectHandle highlightcolor;
+
+		//mxd
+		private readonly EffectHandle vertexColorHadle;
+		//lights
+		private readonly EffectHandle lightPositionAndRadiusHandle;
+		private readonly EffectHandle lightColorHandle;
+		private readonly EffectHandle world;
+		//fog
+		private readonly EffectHandle camPosHandle;
+		//used in ModelReader
+		private readonly VertexElement[] vertexElements;
+
+		
+		#endregion
+
+		#region ================== Properties
+
+		private Matrix wwp;
+		public Matrix WorldViewProj
+		{
+			set
+			{
+				if(manager.Enabled && wwp != value)
+				{
+					effect.SetValue(worldviewproj, value);
+					wwp = value;
+					settingschanged = true;
+				}
+			}
+		}
+
+		public Texture Texture1 { set { if(manager.Enabled) effect.SetTexture(texture1, value); settingschanged = true; } }
+
+		//mxd
+		private Color4 vertexcolor;
+		public Color4 VertexColor
+		{
+			set 
+			{
+				if(manager.Enabled && vertexcolor != value)
+				{
+					effect.SetValue(vertexColorHadle, value);
+					vertexcolor = value;
+					settingschanged = true; 
+				}
+			} 
+		}
+		
+		//lights
+		private Color4 lightcolor;
+		public Color4 LightColor
+		{
+			set
+			{
+				if(manager.Enabled && lightcolor != value)
+				{
+					effect.SetValue(lightColorHandle, value);
+					lightcolor = value;
+					settingschanged = true;
+				}
+			}
+		}
+
+		private Vector4 lightpos;
+		public Vector4 LightPositionAndRadius
+		{
+			set
+			{
+				if(manager.Enabled && value != lightpos)
+				{
+					effect.SetValue(lightPositionAndRadiusHandle, value);
+					lightpos = value;
+					settingschanged = true;
+				} 
+			}
+		}
+		
+		//fog
+		private Vector4 campos;
+		public Vector4 CameraPosition
+		{
+			set
+			{
+				if(manager.Enabled && campos != value)
+				{
+					effect.SetValue(camPosHandle, value);
+					campos = value;
+					settingschanged = true;
+				}
+			}
+		}
+
+		private Matrix mworld;
+		public Matrix World
+		{
+			set
+			{
+				if(manager.Enabled && mworld != value)
+				{
+					effect.SetValue(world, value);
+					mworld = value;
+					settingschanged = true;
+				}
+			}
+		}
+
+		//mxd. This sets the highlight color
+		private Color4 hicolor;
+		public Color4 HighlightColor
+		{
+			set
+			{
+				if(manager.Enabled && hicolor != value)
+				{
+					effect.SetValue(highlightcolor, value);
+					hicolor = value;
+					settingschanged = true;
+				}
+			}
+		}
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public World3DShader(ShaderManager manager) : base(manager)
+		{
+			// Load effect from file
+			effect = LoadEffect("world3d.fx");
+
+			// Get the property handlers from effect
+			if(effect != null)
+			{
+				worldviewproj = effect.GetParameter(null, "worldviewproj");
+				texture1 = effect.GetParameter(null, "texture1");
+				minfiltersettings = effect.GetParameter(null, "minfiltersettings");
+				magfiltersettings = effect.GetParameter(null, "magfiltersettings");
+				mipfiltersettings = effect.GetParameter(null, "mipfiltersettings");
+				highlightcolor = effect.GetParameter(null, "highlightcolor");
+				maxanisotropysetting = effect.GetParameter(null, "maxanisotropysetting");
+
+				//mxd
+				vertexColorHadle = effect.GetParameter(null, "vertexColor");
+				//lights
+				lightPositionAndRadiusHandle = effect.GetParameter(null, "lightPosAndRadius");
+				lightColorHandle = effect.GetParameter(null, "lightColor");
+				//fog
+				camPosHandle = effect.GetParameter(null, "cameraPos");
+
+				world = effect.GetParameter(null, "world");
+			}
+
+			// Initialize world vertex declaration
+			if(manager.Enabled) //mxd
+			{ 
+				vertexElements = new[] 
+				{
+					new VertexElement(0, 0, DeclarationType.Float3, DeclarationMethod.Default, DeclarationUsage.Position, 0),
+					new VertexElement(0, 12, DeclarationType.Color, DeclarationMethod.Default, DeclarationUsage.Color, 0),
+					new VertexElement(0, 16, DeclarationType.Float2, DeclarationMethod.Default, DeclarationUsage.TextureCoordinate, 0),
+					new VertexElement(0, 24, DeclarationType.Float3, DeclarationMethod.Default, DeclarationUsage.Normal, 0), //mxd
+					VertexElement.VertexDeclarationEnd
+				};
+			} 
+			else 
+			{
+				vertexElements = new[] 
+				{
+					new VertexElement(0, 0, DeclarationType.Float3, DeclarationMethod.Default, DeclarationUsage.Position, 0),
+					new VertexElement(0, 12, DeclarationType.Color, DeclarationMethod.Default, DeclarationUsage.Color, 0),
+					new VertexElement(0, 16, DeclarationType.Float2, DeclarationMethod.Default, DeclarationUsage.TextureCoordinate, 0),
+					VertexElement.VertexDeclarationEnd
+				};
+			}
+			vertexdecl = new VertexDeclaration(General.Map.Graphics.Device, vertexElements);
+
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Disposer
+		public override void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Clean up
+				if(texture1 != null) texture1.Dispose();
+				if(worldviewproj != null) worldviewproj.Dispose();
+				if(minfiltersettings != null) minfiltersettings.Dispose();
+				if(magfiltersettings != null) magfiltersettings.Dispose();
+				if(mipfiltersettings != null) mipfiltersettings.Dispose();
+				if(highlightcolor != null) highlightcolor.Dispose();
+				if(maxanisotropysetting != null) maxanisotropysetting.Dispose();
+
+				//mxd
+				if(vertexColorHadle != null) vertexColorHadle.Dispose();
+				if(lightColorHandle != null) lightColorHandle.Dispose();
+				if(lightPositionAndRadiusHandle != null) lightPositionAndRadiusHandle.Dispose();
+				if(camPosHandle != null) camPosHandle.Dispose();
+				if(world != null) world.Dispose();
+
+				// Done
+				base.Dispose();
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This sets the constant settings
+		public void SetConstants(bool bilinear, bool useanisotropic, float maxanisotropy)
+		{
+			if(manager.Enabled)
+			{
+				if(bilinear)
+				{
+					if(useanisotropic)
+					{
+						effect.SetValue(magfiltersettings, (int)TextureFilter.Linear);
+						effect.SetValue(minfiltersettings, (int)TextureFilter.Anisotropic);
+						effect.SetValue(mipfiltersettings, (int)TextureFilter.Linear);
+						effect.SetValue(maxanisotropysetting, maxanisotropy);
+					}
+					else
+					{
+						effect.SetValue(magfiltersettings, (int)TextureFilter.Linear);
+						effect.SetValue(minfiltersettings, (int)TextureFilter.Linear);
+						effect.SetValue(mipfiltersettings, (int)TextureFilter.Linear);
+						effect.SetValue(maxanisotropysetting, 1.0f);
+					}
+				}
+				else
+				{
+					effect.SetValue(magfiltersettings, (int)TextureFilter.Point);
+					effect.SetValue(minfiltersettings, (int)TextureFilter.Point);
+					effect.SetValue(mipfiltersettings, (int)TextureFilter.Linear);
+					effect.SetValue(maxanisotropysetting, 1.0f);
+				}
+
+				settingschanged = true; //mxd
+			}
+		}
+
+		// This sets up the render pipeline
+		public override void BeginPass(int index)
+		{
+			Device device = manager.D3DDevice.Device;
+
+			if(!manager.Enabled)
+			{
+				// Sampler settings
+				if(General.Settings.VisualBilinear)
+				{
+					device.SetSamplerState(0, SamplerState.MagFilter, TextureFilter.Linear);
+					device.SetSamplerState(0, SamplerState.MinFilter, TextureFilter.Linear);
+					device.SetSamplerState(0, SamplerState.MipFilter, TextureFilter.Linear);
+					device.SetSamplerState(0, SamplerState.MipMapLodBias, 0f);
+				}
+				else
+				{
+					device.SetSamplerState(0, SamplerState.MagFilter, TextureFilter.Point);
+					device.SetSamplerState(0, SamplerState.MinFilter, TextureFilter.Point);
+					device.SetSamplerState(0, SamplerState.MipFilter, TextureFilter.Linear);
+					device.SetSamplerState(0, SamplerState.MipMapLodBias, 0f);
+				}
+
+				// Texture addressing
+				device.SetSamplerState(0, SamplerState.AddressU, TextureAddress.Wrap);
+				device.SetSamplerState(0, SamplerState.AddressV, TextureAddress.Wrap);
+				device.SetSamplerState(0, SamplerState.AddressW, TextureAddress.Wrap);
+				
+				// First texture stage
+				//mxd
+				//if((index == 0) || (index == 2))
+				if((index == 0) || (index == 2) || (index == 4) || (index == 6) || (index == 8) || (index == 10) || (index == 12) || (index == 14) || index > 15)
+				{
+					// Normal
+					device.SetTextureStageState(0, TextureStage.ColorOperation, TextureOperation.Modulate);
+					device.SetTextureStageState(0, TextureStage.ColorArg1, TextureArgument.Texture);
+					device.SetTextureStageState(0, TextureStage.ColorArg2, TextureArgument.Diffuse);
+					device.SetTextureStageState(0, TextureStage.ResultArg, TextureArgument.Current);
+					device.SetTextureStageState(0, TextureStage.TexCoordIndex, 0);
+				}
+				else
+				{
+					// Full brightness
+					device.SetTextureStageState(0, TextureStage.ColorOperation, TextureOperation.SelectArg1);
+					device.SetTextureStageState(0, TextureStage.ColorArg1, TextureArgument.Texture);
+					device.SetTextureStageState(0, TextureStage.ResultArg, TextureArgument.Current);
+					device.SetTextureStageState(0, TextureStage.TexCoordIndex, 0);
+				}
+
+				// First alpha stage
+				device.SetTextureStageState(0, TextureStage.AlphaOperation, TextureOperation.Modulate);
+				device.SetTextureStageState(0, TextureStage.AlphaArg1, TextureArgument.Texture);
+				device.SetTextureStageState(0, TextureStage.AlphaArg2, TextureArgument.Diffuse);
+				
+				// Second texture stage
+				device.SetTextureStageState(1, TextureStage.ColorOperation, TextureOperation.Modulate);
+				device.SetTextureStageState(1, TextureStage.ColorArg1, TextureArgument.Current);
+				device.SetTextureStageState(1, TextureStage.ColorArg2, TextureArgument.TFactor);
+				device.SetTextureStageState(1, TextureStage.ResultArg, TextureArgument.Current);
+				device.SetTextureStageState(1, TextureStage.TexCoordIndex, 0);
+
+				// Second alpha stage
+				device.SetTextureStageState(1, TextureStage.AlphaOperation, TextureOperation.Modulate);
+				device.SetTextureStageState(1, TextureStage.AlphaArg1, TextureArgument.Current);
+				device.SetTextureStageState(1, TextureStage.AlphaArg2, TextureArgument.TFactor);
+
+				// Highlight?
+				//mxd
+				//if(index > 1) 2 3 6 10 14
+				//if((index > 1 && index < 4) || (index > 5 && index < 8) || (index > 9 && index < 12) || (index > 13 && index < 16))
+				if(index == 2 || index == 3 || index == 6 || index == 10 || index == 14)
+				{
+					// Third texture stage
+					device.SetTextureStageState(2, TextureStage.ColorOperation, TextureOperation.AddSigned);
+					device.SetTextureStageState(2, TextureStage.ColorArg1, TextureArgument.Current);
+					device.SetTextureStageState(2, TextureStage.ColorArg2, TextureArgument.Texture);
+					device.SetTextureStageState(2, TextureStage.ColorArg0, TextureArgument.Texture);
+					device.SetTextureStageState(2, TextureStage.ResultArg, TextureArgument.Current);
+					device.SetTextureStageState(2, TextureStage.TexCoordIndex, 0);
+
+					// Third alpha stage
+					device.SetTextureStageState(2, TextureStage.AlphaOperation, TextureOperation.SelectArg1);
+					device.SetTextureStageState(2, TextureStage.AlphaArg1, TextureArgument.Current);
+
+					// Fourth texture stage
+					device.SetTextureStageState(3, TextureStage.ColorOperation, TextureOperation.AddSigned);
+					device.SetTextureStageState(3, TextureStage.ColorArg1, TextureArgument.Current);
+					device.SetTextureStageState(3, TextureStage.ColorArg2, TextureArgument.Texture);
+					device.SetTextureStageState(3, TextureStage.ColorArg0, TextureArgument.Texture);
+					device.SetTextureStageState(3, TextureStage.ResultArg, TextureArgument.Current);
+					device.SetTextureStageState(3, TextureStage.TexCoordIndex, 0);
+
+					// Fourth alpha stage
+					device.SetTextureStageState(3, TextureStage.AlphaOperation, TextureOperation.SelectArg1);
+					device.SetTextureStageState(3, TextureStage.AlphaArg1, TextureArgument.Current);
+
+					// No more further stages
+					device.SetTextureStageState(4, TextureStage.ColorOperation, TextureOperation.Disable);
+					device.SetTextureStageState(4, TextureStage.AlphaOperation, TextureOperation.Disable);
+				}
+				else
+				{
+					// No more further stages
+					device.SetTextureStageState(2, TextureStage.ColorOperation, TextureOperation.Disable);
+					device.SetTextureStageState(2, TextureStage.AlphaOperation, TextureOperation.Disable);
+				}
+			}
+
+			base.BeginPass(index);
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Rendering/WorldVertex.cs b/Source/Core/Rendering/WorldVertex.cs
new file mode 100644
index 0000000..e4e17f4
--- /dev/null
+++ b/Source/Core/Rendering/WorldVertex.cs
@@ -0,0 +1,236 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using CodeImp.DoomBuilder.Geometry;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Rendering
+{
+	// WorldVertex
+	public struct WorldVertex
+	{
+		// Vertex format
+		public const int Stride = 36; //mxd: 9 * 4, was 6 * 4
+
+		// Members
+		public float x;
+		public float y;
+		public float z;
+		public int c;
+		public float u;
+		public float v;
+
+		//mxd
+		public float nx;
+		public float ny;
+		public float nz;
+
+		// Constructor
+		public WorldVertex(float x, float y, float z, int c, float u, float v)
+		{
+			this.x = x;
+			this.y = y;
+			this.z = z;
+			this.c = c;
+			this.u = u;
+			this.v = v;
+
+			//mxd
+			this.nx = 0.0f;
+			this.ny = 0.0f;
+			this.nz = 0.0f;
+		}
+
+		// Constructor
+		/*public WorldVertex(float x, float y, float z, int c, Vector2D t)
+		{
+			this.x = x;
+			this.y = y;
+			this.z = z;
+			this.c = c;
+			this.u = t.x;
+			this.v = t.y;
+
+			//mxd
+			this.nx = 0.0f;
+			this.ny = 0.0f;
+			this.nz = 0.0f;
+		}*/
+
+		// Constructor
+		/*public WorldVertex(Vector3D p, int c, float u, float v)
+		{
+			this.x = p.x;
+			this.y = p.y;
+			this.z = p.z;
+			this.c = c;
+			this.u = u;
+			this.v = v;
+
+			//mxd
+			this.nx = 0.0f;
+			this.ny = 0.0f;
+			this.nz = 0.0f;
+		}*/
+
+		// Constructor
+		public WorldVertex(Vector3D p, int c, Vector2D t)
+		{
+			this.x = p.x;
+			this.y = p.y;
+			this.z = p.z;
+			this.c = c;
+			this.u = t.x;
+			this.v = t.y;
+
+			//mxd
+			this.nx = 0.0f;
+			this.ny = 0.0f;
+			this.nz = 0.0f;
+		}
+
+		// Constructor
+		/*public WorldVertex(float x, float y, float z, float u, float v)
+		{
+			this.x = x;
+			this.y = y;
+			this.z = z;
+			this.c = -1;
+			this.u = u;
+			this.v = v;
+
+			//mxd
+			this.nx = 0.0f;
+			this.ny = 0.0f;
+			this.nz = 0.0f;
+		}*/
+
+		// Constructor
+		/*public WorldVertex(float x, float y, float z, Vector2D t)
+		{
+			this.x = x;
+			this.y = y;
+			this.z = z;
+			this.c = -1;
+			this.u = t.x;
+			this.v = t.y;
+
+			//mxd
+			this.nx = 0.0f;
+			this.ny = 0.0f;
+			this.nz = 0.0f;
+		}*/
+
+		// Constructor
+		/*public WorldVertex(Vector3D p, float u, float v)
+		{
+			this.x = p.x;
+			this.y = p.y;
+			this.z = p.z;
+			this.c = -1;
+			this.u = u;
+			this.v = v;
+
+			//mxd
+			this.nx = 0.0f;
+			this.ny = 0.0f;
+			this.nz = 0.0f;
+		}*/
+
+		// Constructor
+		/*public WorldVertex(Vector3D p, Vector2D t)
+		{
+			this.x = p.x;
+			this.y = p.y;
+			this.z = p.z;
+			this.c = -1;
+			this.u = t.x;
+			this.v = t.y;
+
+			//mxd
+			this.nx = 0.0f;
+			this.ny = 0.0f;
+			this.nz = 0.0f;
+		}*/
+
+		// Constructor
+		/*public WorldVertex(float x, float y, float z, int c)
+		{
+			this.x = x;
+			this.y = y;
+			this.z = z;
+			this.c = c;
+			this.u = 0.0f;
+			this.v = 0.0f;
+
+			//mxd
+			this.nx = 0.0f;
+			this.ny = 0.0f;
+			this.nz = 0.0f;
+		}*/
+
+		// Constructor
+		/*public WorldVertex(Vector3D p, int c)
+		{
+			this.x = p.x;
+			this.y = p.y;
+			this.z = p.z;
+			this.c = c;
+			this.u = 0.0f;
+			this.v = 0.0f;
+
+			//mxd
+			this.nx = 0.0f;
+			this.ny = 0.0f;
+			this.nz = 0.0f;
+		}*/
+
+		// Constructor
+		public WorldVertex(float x, float y, float z)
+		{
+			this.x = x;
+			this.y = y;
+			this.z = z;
+			this.c = -1;
+			this.u = 0.0f;
+			this.v = 0.0f;
+
+			//mxd
+			this.nx = 0.0f;
+			this.ny = 0.0f;
+			this.nz = 0.0f;
+		}
+
+		// Constructor
+		public WorldVertex(Vector3D p)
+		{
+			this.x = p.x;
+			this.y = p.y;
+			this.z = p.z;
+			this.c = -1;
+			this.u = 0.0f;
+			this.v = 0.0f;
+
+			//mxd
+			this.nx = 0.0f;
+			this.ny = 0.0f;
+			this.nz = 0.0f;
+		}
+	}
+}
diff --git a/Source/Core/Resources/About.png b/Source/Core/Resources/About.png
new file mode 100644
index 0000000..6b26413
Binary files /dev/null and b/Source/Core/Resources/About.png differ
diff --git a/Source/Core/Resources/Actions.cfg b/Source/Core/Resources/Actions.cfg
new file mode 100644
index 0000000..96979c7
--- /dev/null
+++ b/Source/Core/Resources/Actions.cfg
@@ -0,0 +1,1272 @@
+/******************************************\
+	Doom Builder Actions Configuration
+\******************************************/
+
+// Categories for the Controls preferences
+categories
+{
+	file = "File";
+	edit = "Edit";
+	view = "View";
+	modes = "Modes";
+	tools = "Tools";
+	prefabs = "Prefabs";
+	classic = "Classic Modes";
+	visual = "Visual Modes";
+	selecting = "Selecting";
+	gzdoombuilder = "Rendering";
+}
+
+// This just defines which actions there are, what description they have and
+// some behaviour options. The Doom Builder core will bind to these actions
+// with delegates (function pointers) where you use the BeginAction and
+// EndAction attributes.
+
+// Options:
+//
+// allowkeys:       Allows the user to bind standard keys to this action.
+// allowmouse:      Allows the user to bind mouse buttons to this action.
+// allowscroll:     Allows the user to bind the scrollwheel to this action.
+// disregardshift:  This action will trigger regardless if Shift is used.
+// disregardcontrol: This action will be triggered regardless if Control is used.
+// disregardalt:    This action will be triggered regardless if Alt is used (mxd).
+// repeat:          BeginAction will be called for automatic key repetition.
+// default:         Default key is only used when the action is loaded for the first
+//                  time and the default key is not used by any other action.
+//
+// allowkeys and allowmouse are true by default, the others are false by default.
+//
+
+/*
+testaction
+{
+	title = "Developer Test";
+	category = "tools";
+	description = "Does whatever the developer wants to test.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+*/
+
+newmap
+{
+	title = "New Map";
+	category = "file";
+	description = "Starts with a new, empty workspace to begin drawing a map from scratch.";
+	allowkeys = true;
+	allowmouse = false;
+	allowscroll = false;
+}
+
+openmap
+{
+	title = "Open Map";
+	category = "file";
+	description = "Opens an existing map from WAD file for viewing or modifying.";
+	allowkeys = true;
+	allowmouse = false;
+	allowscroll = false;
+}
+
+//mxd
+openmapincurrentwad
+{
+	title = "Open Map in current WAD";
+	category = "file";
+	description = "Opens an existing map from already loaded WAD file for viewing or modifying.";
+	allowkeys = true;
+	allowmouse = false;
+	allowscroll = false;
+	default = 196687; //Ctrl-Shift-O
+}
+
+closemap
+{
+	title = "Close Map";
+	category = "file";
+	description = "Closes the current map and the WAD file in which it exists.";
+	allowkeys = true;
+	allowmouse = false;
+	allowscroll = false;
+}
+
+savemap
+{
+	title = "Save Map";
+	category = "file";
+	description = "Saves the current map to the opened source WAD file.";
+	allowkeys = true;
+	allowmouse = false;
+	allowscroll = false;
+}
+
+savemapas
+{
+	title = "Save Map As";
+	category = "file";
+	description = "Saves the current map and all resources from the source WAD file to a new WAD file.";
+	allowkeys = true;
+	allowmouse = false;
+	allowscroll = false;
+}
+
+savemapinto
+{
+	title = "Save Map Into";
+	category = "file";
+	description = "Saves the current map without any other resources into an existing or new WAD file.";
+	allowkeys = true;
+	allowmouse = false;
+	allowscroll = false;
+}
+
+mapoptions
+{
+	title = "Map Options";
+	category = "edit";
+	description = "Shows the Map Options dialog which allows changing the map lump name, game configuration and custom resources.";
+	allowkeys = true;
+	allowmouse = false;
+	allowscroll = false;
+}
+
+//mxd
+snapvertstogrid
+{
+	title = "Snap Selected Map Elements to Grid";
+	category = "edit";
+	description = "Snaps selected map elements to grid.";
+	allowkeys = true;
+	allowmouse = false;
+	allowscroll = false;
+}
+
+configuration
+{
+	title = "Game Configurations";
+	category = "tools";
+	description = "Shows the Game Configurations dialog which allows you to configure settings such as nodebuilder, testing program and resources.";
+	allowkeys = true;
+	allowmouse = false;
+	allowscroll = false;
+}
+
+preferences
+{
+	title = "Preferences";
+	category = "tools";
+	description = "Shows the Preferences dialog.";
+	allowkeys = true;
+	allowmouse = false;
+	allowscroll = false;
+}
+
+reloadresources
+{
+	title = "Reload Resources";
+	category = "tools";
+	description = "Reloads all data resources such as game configuration, textures and flats. Useful when resource files have been changed outside of Doom Builder.";
+	allowkeys = true;
+	allowmouse = false;
+	allowscroll = false;
+}
+
+//mxd
+savescreenshot
+{
+	title = "Save Screenshot";
+	category = "tools";
+	description = "Saves a screenshot of editor's window into 'Screenshots' folder.";
+	allowkeys = true;
+	allowmouse = false;
+	allowscroll = false;
+	default = 123; //F12
+}
+
+//mxd
+saveeditareascreenshot
+{
+	title = "Save Screenshot (active window)";
+	category = "tools";
+	description = "Saves a screenshot of currently active window, or editing area if no windows are open into 'Screenshots' folder.";
+	allowkeys = true;
+	allowmouse = false;
+	allowscroll = false;
+	default = 131195; //Ctrl-F12
+}
+
+//mxd
+viewusedtags
+{
+	title = "View Used Tags";
+	category = "edit";
+	description = "Opens Tag Statistics form, which shows all tags, which are used in current map, and allows to create and edit tag labels.";
+	allowkeys = true;
+	allowmouse = false;
+	allowscroll = false;
+}
+
+//mxd
+viewthingtypes
+{
+	title = "View Thing Types";
+	category = "edit";
+	description = "Opens Thing Statistics form, which shows all thing types available in current game configuration.";
+	allowkeys = true;
+	allowmouse = false;
+	allowscroll = false;
+}
+
+cancelmode
+{
+	title = "Cancel Action";
+	category = "classic";
+	description = "Cancels the current action and switches back to normal editing mode.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+acceptmode
+{
+	title = "Accept Action";
+	category = "classic";
+	description = "Accepts the changes in the current action and switches back to normal editing mode.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+classicselect
+{
+	title = "Select";
+	category = "classic";
+	description = "Selects the highlighted item. Also allows selection by dragging a rectangle. Hold shift while dragging a rectangle to toggle additive or normal selection. Hold Ctrl to enable subtractive selection. Hold Ctrl-Shift to intersect with current selection.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+	disregardshift = true;
+	disregardcontrol = true;
+	disregardalt = true; //mxd
+}
+
+classicedit
+{
+	title = "Edit";
+	category = "classic";
+	description = "Edits the properties of the selected items or drags the selected items. Also initiates drawing or inserts new things when no selection is made. Can be used in combination with Control and Shift for the first drawn vertex.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+	disregardshift = true;
+	disregardcontrol = true;
+	disregardalt = true; //mxd
+}
+
+scrollwest
+{
+	title = "Scroll West";
+	category = "classic";
+	description = "Scrolls the 2D map view to the left.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	repeat = true;
+}
+
+scrolleast
+{
+	title = "Scroll East";
+	category = "classic";
+	description = "Scrolls the 2D map view to the right.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	repeat = true;
+}
+
+scrollnorth
+{
+	title = "Scroll North";
+	category = "classic";
+	description = "Scrolls the 2D map view up.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	repeat = true;
+}
+
+scrollsouth
+{
+	title = "Scroll South";
+	category = "classic";
+	description = "Scrolls the 2D map view down.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	repeat = true;
+}
+
+pan_view
+{
+	title = "Pan View";
+	category = "classic";
+	description = "Pans the map in the direction of the mouse while held down.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+}
+
+zoomin
+{
+	title = "Zoom In";
+	category = "classic";
+	description = "Zooms in on the map at the current mouse location.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	repeat = true;
+}
+
+zoomout
+{
+	title = "Zoom Out";
+	category = "classic";
+	description = "Zooms out on the map from the current mouse location.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	repeat = true;
+}
+
+centerinscreen
+{
+	title = "Fit To Screen";
+	category = "classic";
+	description = "Zooms out the map and centers it to make it completely fit in the screen, giving a high overview of the map.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+insertitem
+{
+	title = "Insert Item";
+	category = "edit";
+	description = "Creates a new item depending on the editing mode you are in.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+deleteitem
+{
+	title = "Delete Item";
+	category = "edit";
+	description = "Deletes the highlighted or selected items, depending on the editing mode you are in.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+//mxd
+dissolveitem
+{
+	title = "Dissolve Item";
+	category = "edit";
+	description = "Deletes the highlighted or selected items in classic modes, trying to preserve the rest of the map geometry intact.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	default = 131118; //Ctrl-Del
+}
+
+//mxd
+togglegrid
+{
+	title = "Toggle Grid";
+	category = "classic";
+	description = "Toggles grid rendering in classic modes.";
+	allowkeys = true;
+	allowmouse = false;
+	allowscroll = false;
+	default = 262215; //Alt-G
+}
+
+//mxd
+toggledynamicgrid
+{
+	title = "Toggle Dynamic Grid Size";
+	category = "classic";
+	description = "Toggles automatic grid size adjustment in classic modes.";
+	allowkeys = true;
+	allowmouse = false;
+	allowscroll = false;
+	default = 393287; //Ctrl-Alt-G
+}
+
+gridsetup
+{
+	title = "Grid Setup";
+	category = "classic";
+	description = "Shows the Custom Grid Setup dialog which allows you to set custom grid sizes and a background image.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+griddec		// Note, these were incorrectly swapped before, hence the wrong action name
+{
+	title = "Grid Increase";
+	category = "edit";
+	description = "Increases the grid size, decreasing the grid density.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+
+gridinc		// Note, these were incorrectly swapped before, hence the wrong action name
+{
+	title = "Grid Decrease";
+	category = "edit";
+	description = "Decreases the grid size, increasing the grid density.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+undo
+{
+	title = "Undo";
+	category = "edit";
+	description = "Restores the current map as it was before last action(s) performed.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+redo
+{
+	title = "Redo";
+	category = "edit";
+	description = "Repeats the action(s) performed before Undo was used.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+togglesnap
+{
+	title = "Snap to Grid";
+	category = "edit";
+	description = "Toggles snapping to the grid for things and vertices that are being dragged.";
+	allowkeys = true;
+	allowmouse = false;
+	allowscroll = false;
+}
+
+toggleautomerge
+{
+	title = "Merge Geometry";
+	category = "edit";
+	description = "Toggles automatic merging of geometry for vertices and structures that are being dragged.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+//mxd
+toggleautoclearsidetextures
+{
+	title = "Auto Clear Sidedef Textures";
+	category = "edit";
+	description = "Toggles automatic removal of sidedef textures when floor or ceiling height is changed or when geometry is drawn, copied or pasted.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+clearselection
+{
+	title = "Clear Selection";
+	category = "edit";
+	description = "Deselects all selected elements.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+moveforward
+{
+	title = "Move Forward";
+	category = "visual";
+	description = "Moves the camera forward in 3D Visual Mode. Use in combination with Shift for double the speed.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	disregardshift = true;
+}
+
+movebackward
+{
+	title = "Move Backward";
+	category = "visual";
+	description = "Moves the camera backward in 3D Visual Mode. Use in combination with Shift for double the speed.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	disregardshift = true;
+}
+
+moveleft
+{
+	title = "Move Left (strafe)";
+	category = "visual";
+	description = "Strafes the camera left in 3D Visual Mode. Use in combination with Shift for double the speed.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	disregardshift = true;
+}
+
+moveright
+{
+	title = "Move Right (strafe)";
+	category = "visual";
+	description = "Strafes the camera right in 3D Visual Mode. Use in combination with Shift for double the speed.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	disregardshift = true;
+}
+
+moveup
+{
+	title = "Move Up";
+	category = "visual";
+	description = "Moves the camera up in 3D Visual Mode. Use in combination with Shift for double the speed.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	disregardshift = true;
+}
+
+movedown
+{
+	title = "Move Down";
+	category = "visual";
+	description = "Moves the camera down in 3D Visual Mode. Use in combination with Shift for double the speed.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	disregardshift = true;
+}
+
+testmap
+{
+	title = "Test Map";
+	category = "tools";
+	description = "Starts the game and loads this map for playing.";
+	allowkeys = true;
+	allowmouse = false;
+	allowscroll = false;
+}
+
+//mxd
+testmapfromview
+{
+	title = "Test map from current position";
+	category = "tools";
+	description = "Starts the game and loads this map for playing. Player start is placed either at cursor position (in 2D-Modes) or at camera position (in Visual Modes).";
+	allowkeys = true;
+	allowmouse = false;
+	allowscroll = false;
+	default = 131192;
+}
+
+thingsfilterssetup
+{
+	title = "Configure Things Filters";
+	category = "tools";
+	description = "Shows the Things Filters setup dialog, which allows you to add, remove and change the things filters.";
+	allowkeys = true;
+	allowmouse = false;
+	allowscroll = false;
+}
+
+linedefcolorssetup
+{
+	title = "Configure Linedefs Colors";
+	category = "tools";
+	description = "Shows the Linedef Color Presets setup dialog, which allows you to add, remove and change linedef color presets.";
+	allowkeys = true;
+	allowmouse = false;
+	allowscroll = false;
+}
+
+copyselection
+{
+	title = "Copy Selection";
+	category = "edit";
+	description = "Copies the current selection to the clipboard.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+}
+
+cutselection
+{
+	title = "Cut Selection";
+	category = "edit";
+	description = "Copies the current selection to the clipboard and removes it from the map.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+}
+
+pasteselection
+{
+	title = "Paste Selection";
+	category = "edit";
+	description = "Pastes the current contents of the clipboard into the map as a new selection.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+}
+
+pasteselectionspecial
+{
+	title = "Paste Selection Special";
+	category = "edit";
+	description = "Allows you to choose options or pasting and then pastes the current contents of the clipboard into the map as a new selection.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+}
+
+selectgroup1
+{
+	title = "Select Group 1";
+	category = "selecting";
+	description = "Selects all geometry that was assigned to group 1";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+}
+
+selectgroup2
+{
+	title = "Select Group 2";
+	category = "selecting";
+	description = "Selects all geometry that was assigned to group 2";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+}
+
+selectgroup3
+{
+	title = "Select Group 3";
+	category = "selecting";
+	description = "Selects all geometry that was assigned to group 3";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+}
+
+selectgroup4
+{
+	title = "Select Group 4";
+	category = "selecting";
+	description = "Selects all geometry that was assigned to group 4";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+}
+
+selectgroup5
+{
+	title = "Select Group 5";
+	category = "selecting";
+	description = "Selects all geometry that was assigned to group 5";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+}
+
+selectgroup6
+{
+	title = "Select Group 6";
+	category = "selecting";
+	description = "Selects all geometry that was assigned to group 6";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+}
+
+selectgroup7
+{
+	title = "Select Group 7";
+	category = "selecting";
+	description = "Selects all geometry that was assigned to group 7";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+}
+
+selectgroup8
+{
+	title = "Select Group 8";
+	category = "selecting";
+	description = "Selects all geometry that was assigned to group 8";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+}
+
+selectgroup9
+{
+	title = "Select Group 9";
+	category = "selecting";
+	description = "Selects all geometry that was assigned to group 9";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+}
+
+selectgroup10
+{
+	title = "Select Group 10";
+	category = "selecting";
+	description = "Selects all geometry that was assigned to group 10";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+}
+
+assigngroup1
+{
+	title = "Assign Group 1";
+	category = "selecting";
+	description = "Assigns the selected geometry to group 1";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+}
+
+assigngroup2
+{
+	title = "Assign Group 2";
+	category = "selecting";
+	description = "Assigns the selected geometry to group 2";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+}
+
+assigngroup3
+{
+	title = "Assign Group 3";
+	category = "selecting";
+	description = "Assigns the selected geometry to group 3";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+}
+
+assigngroup4
+{
+	title = "Assign Group 4";
+	category = "selecting";
+	description = "Assigns the selected geometry to group 4";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+}
+
+assigngroup5
+{
+	title = "Assign Group 5";
+	category = "selecting";
+	description = "Assigns the selected geometry to group 5";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+}
+
+assigngroup6
+{
+	title = "Assign Group 6";
+	category = "selecting";
+	description = "Assigns the selected geometry to group 6";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+}
+
+assigngroup7
+{
+	title = "Assign Group 7";
+	category = "selecting";
+	description = "Assigns the selected geometry to group 7";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+}
+
+assigngroup8
+{
+	title = "Assign Group 8";
+	category = "selecting";
+	description = "Assigns the selected geometry to group 8";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+}
+
+assigngroup9
+{
+	title = "Assign Group 9";
+	category = "selecting";
+	description = "Assigns the selected geometry to group 9";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+}
+
+assigngroup10
+{
+	title = "Assign Group 10";
+	category = "selecting";
+	description = "Assigns the selected geometry to group 10";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+}
+
+//mxd
+cleargroup1
+{
+	title = "Clear Group 1";
+	category = "selecting";
+	description = "Clears group 1";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+	default = 196657; //Ctrl-Shift-1
+}
+
+//mxd
+cleargroup2
+{
+	title = "Clear Group 2";
+	category = "selecting";
+	description = "Clears group 2";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+	default = 196658;
+}
+
+//mxd
+cleargroup3
+{
+	title = "Clear Group 3";
+	category = "selecting";
+	description = "Clears group 3";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+	default = 196659;
+}
+
+//mxd
+cleargroup4
+{
+	title = "Clear Group 4";
+	category = "selecting";
+	description = "Clears group 4";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+	default = 196660;
+}
+
+//mxd
+cleargroup5
+{
+	title = "Clear Group 5";
+	category = "selecting";
+	description = "Clears group 5";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+	default = 196661;
+}
+
+//mxd
+cleargroup6
+{
+	title = "Clear Group 6";
+	category = "selecting";
+	description = "Clears group 6";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+	default = 196662;
+}
+
+//mxd
+cleargroup7
+{
+	title = "Clear Group 7";
+	category = "selecting";
+	description = "Clears group 7";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+	default = 196663;
+}
+
+//mxd
+cleargroup8
+{
+	title = "Clear Group 8";
+	category = "selecting";
+	description = "Clears group 8";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+	default = 196664;
+}
+
+//mxd
+cleargroup9
+{
+	title = "Clear Group 9";
+	category = "selecting";
+	description = "Clears group 9";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+	default = 196665;
+}
+
+//mxd
+cleargroup10
+{
+	title = "Clear Group 10";
+	category = "selecting";
+	description = "Clears group 10";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+	default = 196656;
+}
+
+openscripteditor
+{
+	title = "Script Editor";
+	category = "view";
+	description = "This opens the script editor that allows you to edit any scripts in your map or any script files.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+}
+
+viewmodenormal
+{
+	title = "View Wireframe";
+	category = "view";
+	description = "This sets the view mode to Wireframe. This shows only the map elements without any sector filling.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+}
+
+viewmodebrightness
+{
+	title = "View Brightness Levels";
+	category = "view";
+	description = "This sets the view mode to Brightness Levels. This fills all sectors with their brightness levels.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+}
+
+viewmodefloors
+{
+	title = "View Floor Textures";
+	category = "view";
+	description = "This sets the view mode to Floor Textures. In this view mode the sectors are filled with their floor texture and with their brightness level applied.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+}
+
+viewmodeceilings
+{
+	title = "View Ceiling Textures";
+	category = "view";
+	description = "This sets the view mode to Ceiling Textures. In this view mode the sectors are filled with their ceiling texture and with their brightness level applied.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+}
+
+togglecomments //mxd
+{
+	title = "Toggle Comments";
+	category = "view";
+	description = "Toggles rendering of comment icons in Sectors, Things and Linedefs modes (UDMF only).";
+	allowkeys = true;
+	allowmouse = false;
+	allowscroll = false;
+}
+
+togglebrightness //mxd
+{
+	title = "Toggle Full Brightness";
+	category = "view";
+	description = "Toggles the use of sector brightness on and off. When sector brightness is off, the world is displayed fully bright, without lighting effects.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	default = 66; //B
+}
+
+visualselect
+{
+	title = "Select";
+	category = "visual";
+	description = "Selects the highlighted item. Hold Shift to select adjacent surfaces with the same texture. Hold Ctrl to select adjacent surfaces with the same height. Hold Alt to stop selecting adjacent surfaces when already selected surface is encountered.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+	disregardcontrol = true;
+	disregardshift = true;
+	disregardalt = true;
+}
+
+visualedit
+{
+	title = "Edit";
+	category = "visual";
+	description = "Edits the properties of the selected items or drags the selected items.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+}
+
+createprefab
+{
+	title = "Create Prefab";
+	category = "prefabs";
+	description = "Creates a prefab from the selected geometry and saves it to a prefab file.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+}
+
+insertprefabfile
+{
+	title = "Insert Prefab File";
+	category = "prefabs";
+	description = "Browses for a Prefab file and inserts the prefab geometry into the map.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+}
+
+insertpreviousprefab
+{
+	title = "Insert Previous Prefab";
+	category = "prefabs";
+	description = "Inserts the previously opened Prefab file again.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+}
+
+toggleinfopanel
+{
+	title = "Toggle Info Panel";
+	category = "view";
+	description = "Toggles the info panel between expanded and collapsed.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+}
+
+centeroncoordinates
+{
+	title = "Go To Coordinates";
+	category = "view";
+	description = "Centers the view on given map coordinates.";
+	allowkeys = true;
+	allowmouse = false;
+	allowscroll = false;
+	default = 196679; //Ctrl-Shift-G
+}
+
+showerrors
+{
+	title = "Show Errors and Warnings";
+	category = "tools";
+	description = "Shows the errors and warnings that may have occurred during loading or editing operations.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+	default = 122;
+}
+
+/////////////////////////
+//GZDOOMBUILDER ACTIONS//
+/////////////////////////
+gztogglemodels
+{
+	title = "Toggle models rendering";
+	category = "gzdoombuilder";
+	description = "Cycles through all models rendering modes in Classic and Visual modes.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+}
+
+gztogglelights
+{
+	title = "Toggle dynamic lights rendering";
+	category = "gzdoombuilder";
+	description = "Cycles through all dynamic light rendering modes in Visual mode.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+}
+
+gztogglefog
+{
+	title = "Toggle fog rendering";
+	category = "gzdoombuilder";
+	description = "Toggles fog rendering in Visual mode.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+}
+
+gztogglefx
+{
+	title = "Toggle models, dynamic lights and fog rendering";
+	category = "gzdoombuilder";
+	description = "This is a combo action, which toggles models, dynamic lights and fog rendering.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+	default = 20; // CapsLock
+}
+
+gztoggleeventlines
+{
+	title = "Toggle Event lines";
+	category = "view";
+	description = "When enabled, shows order, in which patrol points and interpolation points are connected. Also shows action target for currently highlighted item in 2D modes.";
+	allowkeys = true;
+	allowmouse = false;
+	allowscroll = false;
+	default = 73;
+}
+
+gztogglevisualvertices
+{
+	title = "Toggle Visual Vertices";
+	category = "visual";
+	description = "When enabled, shows vertices, which heights can be changed, in Visual mode (UDMF only).";
+	allowkeys = true;
+	allowmouse = false;
+	allowscroll = false;
+	default = 262230;
+}
+
+//////////////////////////////
+//GZDOOMBUILDER MENU ACTIONS//
+//////////////////////////////
+gzreloadmodeldef
+{
+	title = "Reload MODELDEF/VOXELDEF";
+	category = "tools";
+	description = "Reloads MODELDEF and VOXELDEF. Useful when resource files have been changed outside of Doom Builder.";
+	allowkeys = true;
+	allowmouse = false;
+	allowscroll = false;
+	default = 131188;
+}
+
+gzreloadgldefs
+{
+	title = "Reload GLDEFS";
+	category = "tools";
+	description = "Reloads GLDEFS. Useful when resource files have been changed outside of Doom Builder.";
+	allowkeys = true;
+	allowmouse = false;
+	allowscroll = false;
+	default = 131189;
+}
+
+/////////////////////////////////////////
+//GZDOOMBUILDER EXTENDED THING MOVEMENT//
+/////////////////////////////////////////
+movethingleft
+{
+	title = "Move Thing Left";
+	category = "visual";
+	description = "Moves selected Things left in Visual Modes.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	repeat = true;
+}
+
+movethingright
+{
+	title = "Move Thing Right";
+	category = "visual";
+	description = "Moves selected Things right in Visual Modes.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	repeat = true;
+}
+
+movethingfwd
+{
+	title = "Move Thing Forward";
+	category = "visual";
+	description = "Moves selected Things away from camera in Visual Modes.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	repeat = true;
+}
+
+movethingback
+{
+	title = "Move Thing Backward";
+	category = "visual";
+	description = "Moves selected Things closer to camera in Visual Modes.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	repeat = true;
+}
+
+placethingatcursor
+{
+	title = "Move Thing to Cursor Location";
+	category = "visual";
+	description = "Moves selected Things to cursor location preserving relative offsets in Visual Modes.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+	default = 131076;
+}
diff --git a/Source/Core/Resources/Add.png b/Source/Core/Resources/Add.png
new file mode 100644
index 0000000..79f062a
Binary files /dev/null and b/Source/Core/Resources/Add.png differ
diff --git a/Source/Core/Resources/Angle.png b/Source/Core/Resources/Angle.png
new file mode 100644
index 0000000..a0d67d2
Binary files /dev/null and b/Source/Core/Resources/Angle.png differ
diff --git a/Source/Core/Resources/ArchiveImage.png b/Source/Core/Resources/ArchiveImage.png
new file mode 100644
index 0000000..b652e6e
Binary files /dev/null and b/Source/Core/Resources/ArchiveImage.png differ
diff --git a/Source/Core/Resources/ArrowDown.png b/Source/Core/Resources/ArrowDown.png
new file mode 100644
index 0000000..ea152a5
Binary files /dev/null and b/Source/Core/Resources/ArrowDown.png differ
diff --git a/Source/Core/Resources/ArrowUp.png b/Source/Core/Resources/ArrowUp.png
new file mode 100644
index 0000000..6cb821c
Binary files /dev/null and b/Source/Core/Resources/ArrowUp.png differ
diff --git a/Source/Core/Resources/Black.png b/Source/Core/Resources/Black.png
new file mode 100644
index 0000000..66af9b2
Binary files /dev/null and b/Source/Core/Resources/Black.png differ
diff --git a/Source/Core/Resources/Brightness.png b/Source/Core/Resources/Brightness.png
new file mode 100644
index 0000000..2d40389
Binary files /dev/null and b/Source/Core/Resources/Brightness.png differ
diff --git a/Source/Core/Resources/Builder16.png b/Source/Core/Resources/Builder16.png
new file mode 100644
index 0000000..d4dec72
Binary files /dev/null and b/Source/Core/Resources/Builder16.png differ
diff --git a/Source/Core/Resources/CLogo.png b/Source/Core/Resources/CLogo.png
new file mode 100644
index 0000000..0dee254
Binary files /dev/null and b/Source/Core/Resources/CLogo.png differ
diff --git a/Source/Core/Resources/Check.png b/Source/Core/Resources/Check.png
new file mode 100644
index 0000000..286686e
Binary files /dev/null and b/Source/Core/Resources/Check.png differ
diff --git a/Source/Core/Resources/Clear.png b/Source/Core/Resources/Clear.png
new file mode 100644
index 0000000..7107473
Binary files /dev/null and b/Source/Core/Resources/Clear.png differ
diff --git a/Source/Core/Resources/ClearTextures.png b/Source/Core/Resources/ClearTextures.png
new file mode 100644
index 0000000..05dbc78
Binary files /dev/null and b/Source/Core/Resources/ClearTextures.png differ
diff --git a/Source/Core/Resources/Close.png b/Source/Core/Resources/Close.png
new file mode 100644
index 0000000..5cc28f5
Binary files /dev/null and b/Source/Core/Resources/Close.png differ
diff --git a/Source/Core/Resources/Collapse.png b/Source/Core/Resources/Collapse.png
new file mode 100644
index 0000000..7b2831d
Binary files /dev/null and b/Source/Core/Resources/Collapse.png differ
diff --git a/Source/Core/Resources/ColorPick.png b/Source/Core/Resources/ColorPick.png
new file mode 100644
index 0000000..e9d0ae1
Binary files /dev/null and b/Source/Core/Resources/ColorPick.png differ
diff --git a/Source/Core/Resources/Comment.png b/Source/Core/Resources/Comment.png
new file mode 100644
index 0000000..15abdc1
Binary files /dev/null and b/Source/Core/Resources/Comment.png differ
diff --git a/Source/Core/Resources/CommentInfo.png b/Source/Core/Resources/CommentInfo.png
new file mode 100644
index 0000000..27385c5
Binary files /dev/null and b/Source/Core/Resources/CommentInfo.png differ
diff --git a/Source/Core/Resources/CommentProblem.png b/Source/Core/Resources/CommentProblem.png
new file mode 100644
index 0000000..13d394f
Binary files /dev/null and b/Source/Core/Resources/CommentProblem.png differ
diff --git a/Source/Core/Resources/CommentQuestion.png b/Source/Core/Resources/CommentQuestion.png
new file mode 100644
index 0000000..815bd99
Binary files /dev/null and b/Source/Core/Resources/CommentQuestion.png differ
diff --git a/Source/Core/Resources/CommentRegular.png b/Source/Core/Resources/CommentRegular.png
new file mode 100644
index 0000000..62890a5
Binary files /dev/null and b/Source/Core/Resources/CommentRegular.png differ
diff --git a/Source/Core/Resources/CommentSmile.png b/Source/Core/Resources/CommentSmile.png
new file mode 100644
index 0000000..581ad96
Binary files /dev/null and b/Source/Core/Resources/CommentSmile.png differ
diff --git a/Source/Core/Resources/Configuration.png b/Source/Core/Resources/Configuration.png
new file mode 100644
index 0000000..4dd253a
Binary files /dev/null and b/Source/Core/Resources/Configuration.png differ
diff --git a/Source/Core/Resources/Copy.png b/Source/Core/Resources/Copy.png
new file mode 100644
index 0000000..cb3d871
Binary files /dev/null and b/Source/Core/Resources/Copy.png differ
diff --git a/Source/Core/Resources/Crosshair.png b/Source/Core/Resources/Crosshair.png
new file mode 100644
index 0000000..7d069a2
Binary files /dev/null and b/Source/Core/Resources/Crosshair.png differ
diff --git a/Source/Core/Resources/CrosshairBusy.png b/Source/Core/Resources/CrosshairBusy.png
new file mode 100644
index 0000000..c534727
Binary files /dev/null and b/Source/Core/Resources/CrosshairBusy.png differ
diff --git a/Source/Core/Resources/Cursor.png b/Source/Core/Resources/Cursor.png
new file mode 100644
index 0000000..2428122
Binary files /dev/null and b/Source/Core/Resources/Cursor.png differ
diff --git a/Source/Core/Resources/Cut.png b/Source/Core/Resources/Cut.png
new file mode 100644
index 0000000..51449ba
Binary files /dev/null and b/Source/Core/Resources/Cut.png differ
diff --git a/Source/Core/Resources/DB2.ico b/Source/Core/Resources/DB2.ico
new file mode 100644
index 0000000..a50ce40
Binary files /dev/null and b/Source/Core/Resources/DB2.ico differ
diff --git a/Source/Core/Resources/DockerCollapse.png b/Source/Core/Resources/DockerCollapse.png
new file mode 100644
index 0000000..b7874e7
Binary files /dev/null and b/Source/Core/Resources/DockerCollapse.png differ
diff --git a/Source/Core/Resources/DockerExpand.png b/Source/Core/Resources/DockerExpand.png
new file mode 100644
index 0000000..4c13906
Binary files /dev/null and b/Source/Core/Resources/DockerExpand.png differ
diff --git a/Source/Core/Resources/ErrorLarge.png b/Source/Core/Resources/ErrorLarge.png
new file mode 100644
index 0000000..1b1368f
Binary files /dev/null and b/Source/Core/Resources/ErrorLarge.png differ
diff --git a/Source/Core/Resources/Expand.png b/Source/Core/Resources/Expand.png
new file mode 100644
index 0000000..a56c8bd
Binary files /dev/null and b/Source/Core/Resources/Expand.png differ
diff --git a/Source/Core/Resources/Failed.png b/Source/Core/Resources/Failed.png
new file mode 100644
index 0000000..b977254
Binary files /dev/null and b/Source/Core/Resources/Failed.png differ
diff --git a/Source/Core/Resources/Filter.png b/Source/Core/Resources/Filter.png
new file mode 100644
index 0000000..334c89b
Binary files /dev/null and b/Source/Core/Resources/Filter.png differ
diff --git a/Source/Core/Resources/Folder.png b/Source/Core/Resources/Folder.png
new file mode 100644
index 0000000..1d415fd
Binary files /dev/null and b/Source/Core/Resources/Folder.png differ
diff --git a/Source/Core/Resources/FolderExplore.png b/Source/Core/Resources/FolderExplore.png
new file mode 100644
index 0000000..c830338
Binary files /dev/null and b/Source/Core/Resources/FolderExplore.png differ
diff --git a/Source/Core/Resources/FolderImage.png b/Source/Core/Resources/FolderImage.png
new file mode 100644
index 0000000..7448b9a
Binary files /dev/null and b/Source/Core/Resources/FolderImage.png differ
diff --git a/Source/Core/Resources/Font.cfg b/Source/Core/Resources/Font.cfg
new file mode 100644
index 0000000..8a0f9fd
--- /dev/null
+++ b/Source/Core/Resources/Font.cfg
@@ -0,0 +1,710 @@
+count = 64;
+
+chars
+{
+	
+	65
+	{
+		width = 26;
+		height = 42;
+		u1 = 0.011719f;
+		v1 = -0.003906f;
+		u2 = 0.078125f;
+		v2 = 0.195313f;
+	}
+	
+	
+	66
+	{
+		width = 26;
+		height = 42;
+		u1 = 0.082031f;
+		v1 = -0.003906f;
+		u2 = 0.148438f;
+		v2 = 0.195313f;
+	}
+	
+	
+	67
+	{
+		width = 26;
+		height = 42;
+		u1 = 0.152344f;
+		v1 = -0.003906f;
+		u2 = 0.21875f;
+		v2 = 0.195313f;
+	}
+	
+	
+	68
+	{
+		width = 26;
+		height = 42;
+		u1 = 0.222656f;
+		v1 = -0.003906f;
+		u2 = 0.289063f;
+		v2 = 0.195313f;
+	}
+	
+	
+	69
+	{
+		width = 24;
+		height = 42;
+		u1 = 0.292969f;
+		v1 = -0.003906f;
+		u2 = 0.355469f;
+		v2 = 0.195313f;
+	}
+	
+	
+	70
+	{
+		width = 22;
+		height = 42;
+		u1 = 0.359375f;
+		v1 = -0.003906f;
+		u2 = 0.417969f;
+		v2 = 0.195313f;
+	}
+	
+	
+	71
+	{
+		width = 28;
+		height = 42;
+		u1 = 0.421875f;
+		v1 = -0.003906f;
+		u2 = 0.492188f;
+		v2 = 0.195313f;
+	}
+	
+	
+	72
+	{
+		width = 28;
+		height = 42;
+		u1 = 0.496094f;
+		v1 = -0.003906f;
+		u2 = 0.566406f;
+		v2 = 0.195313f;
+	}
+	
+	
+	73
+	{
+		width = 13;
+		height = 42;
+		u1 = 0.570313f;
+		v1 = -0.003906f;
+		u2 = 0.611328f;
+		v2 = 0.195313f;
+	}
+	
+	
+	74
+	{
+		width = 22;
+		height = 42;
+		u1 = 0.615234f;
+		v1 = -0.003906f;
+		u2 = 0.673828f;
+		v2 = 0.195313f;
+	}
+	
+	
+	75
+	{
+		width = 28;
+		height = 42;
+		u1 = 0.677734f;
+		v1 = -0.003906f;
+		u2 = 0.748047f;
+		v2 = 0.195313f;
+	}
+	
+	
+	76
+	{
+		width = 22;
+		height = 42;
+		u1 = 0.751953f;
+		v1 = -0.003906f;
+		u2 = 0.810547f;
+		v2 = 0.195313f;
+	}
+	
+	
+	77
+	{
+		width = 31;
+		height = 42;
+		u1 = 0.814453f;
+		v1 = -0.003906f;
+		u2 = 0.890625f;
+		v2 = 0.195313f;
+	}
+	
+	
+	78
+	{
+		width = 28;
+		height = 42;
+		u1 = 0.894531f;
+		v1 = -0.003906f;
+		u2 = 0.964844f;
+		v2 = 0.195313f;
+	}
+	
+	
+	79
+	{
+		width = 28;
+		height = 42;
+		u1 = 0.011719f;
+		v1 = 0.183594f;
+		u2 = 0.082031f;
+		v2 = 0.382813f;
+	}
+	
+	
+	80
+	{
+		width = 24;
+		height = 42;
+		u1 = 0.085938f;
+		v1 = 0.183594f;
+		u2 = 0.148438f;
+		v2 = 0.382813f;
+	}
+	
+	
+	81
+	{
+		width = 28;
+		height = 42;
+		u1 = 0.152344f;
+		v1 = 0.183594f;
+		u2 = 0.222656f;
+		v2 = 0.382813f;
+	}
+	
+	
+	82
+	{
+		width = 26;
+		height = 42;
+		u1 = 0.226563f;
+		v1 = 0.183594f;
+		u2 = 0.292969f;
+		v2 = 0.382813f;
+	}
+	
+	
+	83
+	{
+		width = 24;
+		height = 42;
+		u1 = 0.296875f;
+		v1 = 0.183594f;
+		u2 = 0.359375f;
+		v2 = 0.382813f;
+	}
+	
+	
+	84
+	{
+		width = 24;
+		height = 42;
+		u1 = 0.363281f;
+		v1 = 0.183594f;
+		u2 = 0.425781f;
+		v2 = 0.382813f;
+	}
+	
+	
+	85
+	{
+		width = 28;
+		height = 42;
+		u1 = 0.429688f;
+		v1 = 0.183594f;
+		u2 = 0.5f;
+		v2 = 0.382813f;
+	}
+	
+	
+	86
+	{
+		width = 26;
+		height = 42;
+		u1 = 0.503906f;
+		v1 = 0.183594f;
+		u2 = 0.570313f;
+		v2 = 0.382813f;
+	}
+	
+	
+	87
+	{
+		width = 33;
+		height = 42;
+		u1 = 0.574219f;
+		v1 = 0.183594f;
+		u2 = 0.654297f;
+		v2 = 0.382813f;
+	}
+	
+	
+	88
+	{
+		width = 26;
+		height = 42;
+		u1 = 0.658203f;
+		v1 = 0.183594f;
+		u2 = 0.724609f;
+		v2 = 0.382813f;
+	}
+	
+	
+	89
+	{
+		width = 26;
+		height = 42;
+		u1 = 0.728516f;
+		v1 = 0.183594f;
+		u2 = 0.794922f;
+		v2 = 0.382813f;
+	}
+	
+	
+	90
+	{
+		width = 24;
+		height = 42;
+		u1 = 0.798828f;
+		v1 = 0.183594f;
+		u2 = 0.861328f;
+		v2 = 0.382813f;
+	}
+	
+	
+	48
+	{
+		width = 22;
+		height = 42;
+		u1 = 0.865234f;
+		v1 = 0.183594f;
+		u2 = 0.923828f;
+		v2 = 0.382813f;
+	}
+	
+	
+	49
+	{
+		width = 22;
+		height = 42;
+		u1 = 0.927734f;
+		v1 = 0.183594f;
+		u2 = 0.986328f;
+		v2 = 0.382813f;
+	}
+	
+	
+	50
+	{
+		width = 22;
+		height = 42;
+		u1 = 0.011719f;
+		v1 = 0.371094f;
+		u2 = 0.070313f;
+		v2 = 0.570313f;
+	}
+	
+	
+	51
+	{
+		width = 22;
+		height = 42;
+		u1 = 0.074219f;
+		v1 = 0.371094f;
+		u2 = 0.132813f;
+		v2 = 0.570313f;
+	}
+	
+	
+	52
+	{
+		width = 22;
+		height = 42;
+		u1 = 0.136719f;
+		v1 = 0.371094f;
+		u2 = 0.195313f;
+		v2 = 0.570313f;
+	}
+	
+	
+	53
+	{
+		width = 22;
+		height = 42;
+		u1 = 0.199219f;
+		v1 = 0.371094f;
+		u2 = 0.257813f;
+		v2 = 0.570313f;
+	}
+	
+	
+	54
+	{
+		width = 22;
+		height = 42;
+		u1 = 0.261719f;
+		v1 = 0.371094f;
+		u2 = 0.320313f;
+		v2 = 0.570313f;
+	}
+	
+	
+	55
+	{
+		width = 22;
+		height = 42;
+		u1 = 0.324219f;
+		v1 = 0.371094f;
+		u2 = 0.382813f;
+		v2 = 0.570313f;
+	}
+	
+	
+	56
+	{
+		width = 22;
+		height = 42;
+		u1 = 0.386719f;
+		v1 = 0.371094f;
+		u2 = 0.445313f;
+		v2 = 0.570313f;
+	}
+	
+	
+	57
+	{
+		width = 22;
+		height = 42;
+		u1 = 0.449219f;
+		v1 = 0.371094f;
+		u2 = 0.507813f;
+		v2 = 0.570313f;
+	}
+	
+	
+	32
+	{
+		width = 12;
+		height = 42;
+		u1 = 0.511719f;
+		v1 = 0.371094f;
+		u2 = 0.550781f;
+		v2 = 0.570313f;
+	}
+	
+	
+	33
+	{
+		width = 12;
+		height = 42;
+		u1 = 0.554688f;
+		v1 = 0.371094f;
+		u2 = 0.59375f;
+		v2 = 0.570313f;
+	}
+	
+	
+	64
+	{
+		width = 25;
+		height = 42;
+		u1 = 0.597656f;
+		v1 = 0.371094f;
+		u2 = 0.662109f;
+		v2 = 0.570313f;
+	}
+	
+	
+	35
+	{
+		width = 22;
+		height = 42;
+		u1 = 0.666016f;
+		v1 = 0.371094f;
+		u2 = 0.724609f;
+		v2 = 0.570313f;
+	}
+	
+	
+	36
+	{
+		width = 22;
+		height = 42;
+		u1 = 0.728516f;
+		v1 = 0.371094f;
+		u2 = 0.787109f;
+		v2 = 0.570313f;
+	}
+	
+	
+	37
+	{
+		width = 33;
+		height = 42;
+		u1 = 0.791016f;
+		v1 = 0.371094f;
+		u2 = 0.871094f;
+		v2 = 0.570313f;
+	}
+	
+	
+	94
+	{
+		width = 22;
+		height = 42;
+		u1 = 0.875f;
+		v1 = 0.371094f;
+		u2 = 0.933594f;
+		v2 = 0.570313f;
+	}
+	
+	
+	38
+	{
+		width = 29;
+		height = 42;
+		u1 = 0.011719f;
+		v1 = 0.558594f;
+		u2 = 0.083984f;
+		v2 = 0.757813f;
+	}
+	
+	
+	42
+	{
+		width = 19;
+		height = 42;
+		u1 = 0.087891f;
+		v1 = 0.558594f;
+		u2 = 0.140625f;
+		v2 = 0.757813f;
+	}
+	
+	
+	40
+	{
+		width = 13;
+		height = 42;
+		u1 = 0.144531f;
+		v1 = 0.558594f;
+		u2 = 0.185547f;
+		v2 = 0.757813f;
+	}
+	
+	
+	41
+	{
+		width = 13;
+		height = 42;
+		u1 = 0.189453f;
+		v1 = 0.558594f;
+		u2 = 0.230469f;
+		v2 = 0.757813f;
+	}
+	
+	
+	95
+	{
+		width = 17;
+		height = 42;
+		u1 = 0.234375f;
+		v1 = 0.558594f;
+		u2 = 0.283203f;
+		v2 = 0.757813f;
+	}
+	
+	
+	43
+	{
+		width = 22;
+		height = 42;
+		u1 = 0.287109f;
+		v1 = 0.558594f;
+		u2 = 0.345703f;
+		v2 = 0.757813f;
+	}
+	
+	
+	61
+	{
+		width = 22;
+		height = 42;
+		u1 = 0.349609f;
+		v1 = 0.558594f;
+		u2 = 0.408203f;
+		v2 = 0.757813f;
+	}
+	
+	
+	45
+	{
+		width = 12;
+		height = 42;
+		u1 = 0.412109f;
+		v1 = 0.558594f;
+		u2 = 0.451172f;
+		v2 = 0.757813f;
+	}
+	
+	
+	91
+	{
+		width = 13;
+		height = 42;
+		u1 = 0.455078f;
+		v1 = 0.558594f;
+		u2 = 0.496094f;
+		v2 = 0.757813f;
+	}
+	
+	
+	93
+	{
+		width = 13;
+		height = 42;
+		u1 = 0.5f;
+		v1 = 0.558594f;
+		u2 = 0.541016f;
+		v2 = 0.757813f;
+	}
+	
+	
+	58
+	{
+		width = 12;
+		height = 42;
+		u1 = 0.544922f;
+		v1 = 0.558594f;
+		u2 = 0.583984f;
+		v2 = 0.757813f;
+	}
+	
+	
+	59
+	{
+		width = 12;
+		height = 42;
+		u1 = 0.587891f;
+		v1 = 0.558594f;
+		u2 = 0.626953f;
+		v2 = 0.757813f;
+	}
+	
+	
+	39
+	{
+		width = 10;
+		height = 42;
+		u1 = 0.630859f;
+		v1 = 0.558594f;
+		u2 = 0.666016f;
+		v2 = 0.757813f;
+	}
+	
+	
+	34
+	{
+		width = 17;
+		height = 42;
+		u1 = 0.669922f;
+		v1 = 0.558594f;
+		u2 = 0.71875f;
+		v2 = 0.757813f;
+	}
+	
+	
+	44
+	{
+		width = 12;
+		height = 42;
+		u1 = 0.722656f;
+		v1 = 0.558594f;
+		u2 = 0.761719f;
+		v2 = 0.757813f;
+	}
+	
+	
+	46
+	{
+		width = 12;
+		height = 42;
+		u1 = 0.765625f;
+		v1 = 0.558594f;
+		u2 = 0.804688f;
+		v2 = 0.757813f;
+	}
+	
+	
+	60
+	{
+		width = 22;
+		height = 42;
+		u1 = 0.808594f;
+		v1 = 0.558594f;
+		u2 = 0.867188f;
+		v2 = 0.757813f;
+	}
+	
+	
+	62
+	{
+		width = 22;
+		height = 42;
+		u1 = 0.871094f;
+		v1 = 0.558594f;
+		u2 = 0.929688f;
+		v2 = 0.757813f;
+	}
+	
+	
+	47
+	{
+		width = 10;
+		height = 42;
+		u1 = 0.933594f;
+		v1 = 0.558594f;
+		u2 = 0.96875f;
+		v2 = 0.757813f;
+	}
+	
+	
+	63
+	{
+		width = 21;
+		height = 42;
+		u1 = 0.011719f;
+		v1 = 0.746094f;
+		u2 = 0.068359f;
+		v2 = 0.945313f;
+	}
+	
+	
+	92
+	{
+		width = 10;
+		height = 42;
+		u1 = 0.072266f;
+		v1 = 0.746094f;
+		u2 = 0.107422f;
+		v2 = 0.945313f;
+	}
+	
+}
+
diff --git a/Source/Core/Resources/Font.png b/Source/Core/Resources/Font.png
new file mode 100644
index 0000000..c7986dc
Binary files /dev/null and b/Source/Core/Resources/Font.png differ
diff --git a/Source/Core/Resources/GZDB2.ico b/Source/Core/Resources/GZDB2.ico
new file mode 100644
index 0000000..5091522
Binary files /dev/null and b/Source/Core/Resources/GZDB2.ico differ
diff --git a/Source/Core/Resources/GZDB_Logo_small.png b/Source/Core/Resources/GZDB_Logo_small.png
new file mode 100644
index 0000000..3ed95cc
Binary files /dev/null and b/Source/Core/Resources/GZDB_Logo_small.png differ
diff --git a/Source/Core/Resources/Grid2.png b/Source/Core/Resources/Grid2.png
new file mode 100644
index 0000000..fb984ab
Binary files /dev/null and b/Source/Core/Resources/Grid2.png differ
diff --git a/Source/Core/Resources/Grid2_arrowup.png b/Source/Core/Resources/Grid2_arrowup.png
new file mode 100644
index 0000000..7b9d3eb
Binary files /dev/null and b/Source/Core/Resources/Grid2_arrowup.png differ
diff --git a/Source/Core/Resources/Grid4.png b/Source/Core/Resources/Grid4.png
new file mode 100644
index 0000000..039cfdc
Binary files /dev/null and b/Source/Core/Resources/Grid4.png differ
diff --git a/Source/Core/Resources/GridDecrease.png b/Source/Core/Resources/GridDecrease.png
new file mode 100644
index 0000000..68d287e
Binary files /dev/null and b/Source/Core/Resources/GridDecrease.png differ
diff --git a/Source/Core/Resources/GridDynamic.png b/Source/Core/Resources/GridDynamic.png
new file mode 100644
index 0000000..d26bbec
Binary files /dev/null and b/Source/Core/Resources/GridDynamic.png differ
diff --git a/Source/Core/Resources/GridIncrease.png b/Source/Core/Resources/GridIncrease.png
new file mode 100644
index 0000000..c3f1355
Binary files /dev/null and b/Source/Core/Resources/GridIncrease.png differ
diff --git a/Source/Core/Resources/Group.png b/Source/Core/Resources/Group.png
new file mode 100644
index 0000000..2f3f760
Binary files /dev/null and b/Source/Core/Resources/Group.png differ
diff --git a/Source/Core/Resources/GroupAdd.png b/Source/Core/Resources/GroupAdd.png
new file mode 100644
index 0000000..852f403
Binary files /dev/null and b/Source/Core/Resources/GroupAdd.png differ
diff --git a/Source/Core/Resources/GroupRemove.png b/Source/Core/Resources/GroupRemove.png
new file mode 100644
index 0000000..6610367
Binary files /dev/null and b/Source/Core/Resources/GroupRemove.png differ
diff --git a/Source/Core/Resources/Help.png b/Source/Core/Resources/Help.png
new file mode 100644
index 0000000..cd784fb
Binary files /dev/null and b/Source/Core/Resources/Help.png differ
diff --git a/Source/Core/Resources/Hourglass.png b/Source/Core/Resources/Hourglass.png
new file mode 100644
index 0000000..94c428c
Binary files /dev/null and b/Source/Core/Resources/Hourglass.png differ
diff --git a/Source/Core/Resources/Hourglass3D.png b/Source/Core/Resources/Hourglass3D.png
new file mode 100644
index 0000000..f3a1b7d
Binary files /dev/null and b/Source/Core/Resources/Hourglass3D.png differ
diff --git a/Source/Core/Resources/ImageStack.png b/Source/Core/Resources/ImageStack.png
new file mode 100644
index 0000000..8fe9623
Binary files /dev/null and b/Source/Core/Resources/ImageStack.png differ
diff --git a/Source/Core/Resources/InfoLine.png b/Source/Core/Resources/InfoLine.png
new file mode 100644
index 0000000..13acaee
Binary files /dev/null and b/Source/Core/Resources/InfoLine.png differ
diff --git a/Source/Core/Resources/InfoPanelCollapse.png b/Source/Core/Resources/InfoPanelCollapse.png
new file mode 100644
index 0000000..14dea37
Binary files /dev/null and b/Source/Core/Resources/InfoPanelCollapse.png differ
diff --git a/Source/Core/Resources/InfoPanelExpand.png b/Source/Core/Resources/InfoPanelExpand.png
new file mode 100644
index 0000000..bf7b50a
Binary files /dev/null and b/Source/Core/Resources/InfoPanelExpand.png differ
diff --git a/Source/Core/Resources/Keyboard.png b/Source/Core/Resources/Keyboard.png
new file mode 100644
index 0000000..501bcf6
Binary files /dev/null and b/Source/Core/Resources/Keyboard.png differ
diff --git a/Source/Core/Resources/KnownTextureSet.png b/Source/Core/Resources/KnownTextureSet.png
new file mode 100644
index 0000000..36c25b5
Binary files /dev/null and b/Source/Core/Resources/KnownTextureSet.png differ
diff --git a/Source/Core/Resources/Lexers.cfg b/Source/Core/Resources/Lexers.cfg
new file mode 100644
index 0000000..29c2911
--- /dev/null
+++ b/Source/Core/Resources/Lexers.cfg
@@ -0,0 +1,96 @@
+
+// This configuration holds information we need for the Scintilla lexers in our script editor.
+// This indicates which styles to configure for the syntax highlighting we want. It also maps our
+// keywords and constants to the indices and styles for every lexer.
+// -1 indicates it is an unused style or index.
+
+// NOTE: The styles are mapped backwards with the scintilla style as key and our style as value.
+// Styles that are not mapped will be set to the plain text style. For our styles see the
+// ScriptStyleType enum. The indices for keywords and constants are mapped forwards (the value
+// is the index for the Scintilla control).
+
+
+lexer1	// None
+{
+	0 = 0;		// plain text
+	33 = 5;	  // line numbers
+	37 = 5;   // ident guides
+	
+	keywordsindex = -1;
+	constantsindex = -1;
+}
+
+
+lexer3	// CPP-style, case-sensitive
+{
+	0 = 0;		// plain text
+	33 = 5;	  // line numbers
+	1 = 3;		// comments
+	2 = 3;		// comments
+	5 = 1;		// keywords
+	4 = 4;		// literal
+	6 = 4;		// literal
+	7 = 4;		// literal
+	16 = 2;	  // constants
+	37 = 5;   // ident guides
+	
+	keywordsindex = 0;
+	constantsindex = 1;
+	snippetindex = 2;
+}
+
+
+lexer6	// Perl-style
+{
+	0 = 0;		// plain text
+	2 = 3;		// comments
+	4 = 4;		// literal
+	5 = 1;		// keywords
+	6 = 4;		// literal
+	7 = 4;		// literal
+	33 = 5;	  // line numbers
+	37 = 5;   // ident guides
+	
+	keywordsindex = 0;
+	constantsindex = -1;
+}
+
+
+lexer18	// Pascal-style
+{
+	0 = 0;		// plain text
+	33 = 5;	  // line numbers
+	1 = 3;		// comments
+	2 = 3;		// comments
+	5 = 1;		// keywords
+	4 = 4;		// literal
+	6 = 4;		// literal
+	7 = 4;		// literal
+	16 = 2;	  // constants
+	37 = 5;   // ident guides
+	
+	keywordsindex = 0;
+	constantsindex = 1;
+	snippetindex = 2;
+}
+
+
+lexer35	// CPP-style, case-insensitive
+{
+	0 = 0;		// plain text
+	33 = 5;	  // line numbers
+	1 = 3;		// comments
+	2 = 3;		// comments
+	5 = 1;		// keywords
+	4 = 4;		// literal
+	6 = 4;		// literal
+	7 = 4;		// literal
+	16 = 2;	  // constants
+	37 = 5;   // ident guides
+	
+	keywordsindex = 0;
+	constantsindex = 1;
+	snippetindex = 2;
+}
+
+
diff --git a/Source/Core/Resources/Light.png b/Source/Core/Resources/Light.png
new file mode 100644
index 0000000..bde5831
Binary files /dev/null and b/Source/Core/Resources/Light.png differ
diff --git a/Source/Core/Resources/LightDisabled.png b/Source/Core/Resources/LightDisabled.png
new file mode 100644
index 0000000..964f5c6
Binary files /dev/null and b/Source/Core/Resources/LightDisabled.png differ
diff --git a/Source/Core/Resources/Light_animate.png b/Source/Core/Resources/Light_animate.png
new file mode 100644
index 0000000..9a4cb40
Binary files /dev/null and b/Source/Core/Resources/Light_animate.png differ
diff --git a/Source/Core/Resources/Lightbulb.png b/Source/Core/Resources/Lightbulb.png
new file mode 100644
index 0000000..449d95d
Binary files /dev/null and b/Source/Core/Resources/Lightbulb.png differ
diff --git a/Source/Core/Resources/LinedefColorPresets.png b/Source/Core/Resources/LinedefColorPresets.png
new file mode 100644
index 0000000..8507322
Binary files /dev/null and b/Source/Core/Resources/LinedefColorPresets.png differ
diff --git a/Source/Core/Resources/Link.png b/Source/Core/Resources/Link.png
new file mode 100644
index 0000000..85006a7
Binary files /dev/null and b/Source/Core/Resources/Link.png differ
diff --git a/Source/Core/Resources/List.png b/Source/Core/Resources/List.png
new file mode 100644
index 0000000..acc30b8
Binary files /dev/null and b/Source/Core/Resources/List.png differ
diff --git a/Source/Core/Resources/List_Images.png b/Source/Core/Resources/List_Images.png
new file mode 100644
index 0000000..248eaf1
Binary files /dev/null and b/Source/Core/Resources/List_Images.png differ
diff --git a/Source/Core/Resources/MCrash.png b/Source/Core/Resources/MCrash.png
new file mode 100644
index 0000000..357dece
Binary files /dev/null and b/Source/Core/Resources/MCrash.png differ
diff --git a/Source/Core/Resources/MLogo.png b/Source/Core/Resources/MLogo.png
new file mode 100644
index 0000000..6ae0ce3
Binary files /dev/null and b/Source/Core/Resources/MLogo.png differ
diff --git a/Source/Core/Resources/Marine.png b/Source/Core/Resources/Marine.png
new file mode 100644
index 0000000..7fb05ff
Binary files /dev/null and b/Source/Core/Resources/Marine.png differ
diff --git a/Source/Core/Resources/MissingTexture.png b/Source/Core/Resources/MissingTexture.png
new file mode 100644
index 0000000..5197ac9
Binary files /dev/null and b/Source/Core/Resources/MissingTexture.png differ
diff --git a/Source/Core/Resources/MissingTexture3D.png b/Source/Core/Resources/MissingTexture3D.png
new file mode 100644
index 0000000..1e24d4c
Binary files /dev/null and b/Source/Core/Resources/MissingTexture3D.png differ
diff --git a/Source/Core/Resources/MissingThing.png b/Source/Core/Resources/MissingThing.png
new file mode 100644
index 0000000..6312660
Binary files /dev/null and b/Source/Core/Resources/MissingThing.png differ
diff --git a/Source/Core/Resources/MixedThings.png b/Source/Core/Resources/MixedThings.png
new file mode 100644
index 0000000..6acb60e
Binary files /dev/null and b/Source/Core/Resources/MixedThings.png differ
diff --git a/Source/Core/Resources/Model.png b/Source/Core/Resources/Model.png
new file mode 100644
index 0000000..f161504
Binary files /dev/null and b/Source/Core/Resources/Model.png differ
diff --git a/Source/Core/Resources/ModelDisabled.png b/Source/Core/Resources/ModelDisabled.png
new file mode 100644
index 0000000..9e963b9
Binary files /dev/null and b/Source/Core/Resources/ModelDisabled.png differ
diff --git a/Source/Core/Resources/ModelFiltered.png b/Source/Core/Resources/ModelFiltered.png
new file mode 100644
index 0000000..b5c7bc3
Binary files /dev/null and b/Source/Core/Resources/ModelFiltered.png differ
diff --git a/Source/Core/Resources/Model_selected.png b/Source/Core/Resources/Model_selected.png
new file mode 100644
index 0000000..fe9c36e
Binary files /dev/null and b/Source/Core/Resources/Model_selected.png differ
diff --git a/Source/Core/Resources/Monster2.png b/Source/Core/Resources/Monster2.png
new file mode 100644
index 0000000..7542cfe
Binary files /dev/null and b/Source/Core/Resources/Monster2.png differ
diff --git a/Source/Core/Resources/Monster3.png b/Source/Core/Resources/Monster3.png
new file mode 100644
index 0000000..7da1760
Binary files /dev/null and b/Source/Core/Resources/Monster3.png differ
diff --git a/Source/Core/Resources/NewMap.png b/Source/Core/Resources/NewMap.png
new file mode 100644
index 0000000..d8a0cc0
Binary files /dev/null and b/Source/Core/Resources/NewMap.png differ
diff --git a/Source/Core/Resources/NewMap2.png b/Source/Core/Resources/NewMap2.png
new file mode 100644
index 0000000..aee6681
Binary files /dev/null and b/Source/Core/Resources/NewMap2.png differ
diff --git a/Source/Core/Resources/NewScript.png b/Source/Core/Resources/NewScript.png
new file mode 100644
index 0000000..9e6fe95
Binary files /dev/null and b/Source/Core/Resources/NewScript.png differ
diff --git a/Source/Core/Resources/Nothing.png b/Source/Core/Resources/Nothing.png
new file mode 100644
index 0000000..5d1275a
Binary files /dev/null and b/Source/Core/Resources/Nothing.png differ
diff --git a/Source/Core/Resources/OpenMap.png b/Source/Core/Resources/OpenMap.png
new file mode 100644
index 0000000..b3731a6
Binary files /dev/null and b/Source/Core/Resources/OpenMap.png differ
diff --git a/Source/Core/Resources/OpenScript.png b/Source/Core/Resources/OpenScript.png
new file mode 100644
index 0000000..210ff23
Binary files /dev/null and b/Source/Core/Resources/OpenScript.png differ
diff --git a/Source/Core/Resources/Paste.png b/Source/Core/Resources/Paste.png
new file mode 100644
index 0000000..95d9df6
Binary files /dev/null and b/Source/Core/Resources/Paste.png differ
diff --git a/Source/Core/Resources/PasteSpecial.png b/Source/Core/Resources/PasteSpecial.png
new file mode 100644
index 0000000..cc39545
Binary files /dev/null and b/Source/Core/Resources/PasteSpecial.png differ
diff --git a/Source/Core/Resources/Pin.png b/Source/Core/Resources/Pin.png
new file mode 100644
index 0000000..bb232eb
Binary files /dev/null and b/Source/Core/Resources/Pin.png differ
diff --git a/Source/Core/Resources/Prefab.png b/Source/Core/Resources/Prefab.png
new file mode 100644
index 0000000..54561df
Binary files /dev/null and b/Source/Core/Resources/Prefab.png differ
diff --git a/Source/Core/Resources/Prefab2.png b/Source/Core/Resources/Prefab2.png
new file mode 100644
index 0000000..c46beb6
Binary files /dev/null and b/Source/Core/Resources/Prefab2.png differ
diff --git a/Source/Core/Resources/Preferences.png b/Source/Core/Resources/Preferences.png
new file mode 100644
index 0000000..305e2ca
Binary files /dev/null and b/Source/Core/Resources/Preferences.png differ
diff --git a/Source/Core/Resources/Properties.png b/Source/Core/Resources/Properties.png
new file mode 100644
index 0000000..e3cfc7c
Binary files /dev/null and b/Source/Core/Resources/Properties.png differ
diff --git a/Source/Core/Resources/PuzzlePiece.png b/Source/Core/Resources/PuzzlePiece.png
new file mode 100644
index 0000000..6d48833
Binary files /dev/null and b/Source/Core/Resources/PuzzlePiece.png differ
diff --git a/Source/Core/Resources/Question.png b/Source/Core/Resources/Question.png
new file mode 100644
index 0000000..7727557
Binary files /dev/null and b/Source/Core/Resources/Question.png differ
diff --git a/Source/Core/Resources/Redo.png b/Source/Core/Resources/Redo.png
new file mode 100644
index 0000000..3e05a40
Binary files /dev/null and b/Source/Core/Resources/Redo.png differ
diff --git a/Source/Core/Resources/Reload.png b/Source/Core/Resources/Reload.png
new file mode 100644
index 0000000..9b2f5b7
Binary files /dev/null and b/Source/Core/Resources/Reload.png differ
diff --git a/Source/Core/Resources/Replace.png b/Source/Core/Resources/Replace.png
new file mode 100644
index 0000000..a223647
Binary files /dev/null and b/Source/Core/Resources/Replace.png differ
diff --git a/Source/Core/Resources/Reset.png b/Source/Core/Resources/Reset.png
new file mode 100644
index 0000000..2e09b44
Binary files /dev/null and b/Source/Core/Resources/Reset.png differ
diff --git a/Source/Core/Resources/SaveAll.png b/Source/Core/Resources/SaveAll.png
new file mode 100644
index 0000000..845a49c
Binary files /dev/null and b/Source/Core/Resources/SaveAll.png differ
diff --git a/Source/Core/Resources/SaveMap.png b/Source/Core/Resources/SaveMap.png
new file mode 100644
index 0000000..e4adbbc
Binary files /dev/null and b/Source/Core/Resources/SaveMap.png differ
diff --git a/Source/Core/Resources/SaveScript.png b/Source/Core/Resources/SaveScript.png
new file mode 100644
index 0000000..e5ac50d
Binary files /dev/null and b/Source/Core/Resources/SaveScript.png differ
diff --git a/Source/Core/Resources/Screenshot.png b/Source/Core/Resources/Screenshot.png
new file mode 100644
index 0000000..18db7f4
Binary files /dev/null and b/Source/Core/Resources/Screenshot.png differ
diff --git a/Source/Core/Resources/ScreenshotActiveWindow.png b/Source/Core/Resources/ScreenshotActiveWindow.png
new file mode 100644
index 0000000..a1fb4d6
Binary files /dev/null and b/Source/Core/Resources/ScreenshotActiveWindow.png differ
diff --git a/Source/Core/Resources/Script2.png b/Source/Core/Resources/Script2.png
new file mode 100644
index 0000000..80f929b
Binary files /dev/null and b/Source/Core/Resources/Script2.png differ
diff --git a/Source/Core/Resources/ScriptCompile.png b/Source/Core/Resources/ScriptCompile.png
new file mode 100644
index 0000000..8e5d4d6
Binary files /dev/null and b/Source/Core/Resources/ScriptCompile.png differ
diff --git a/Source/Core/Resources/ScriptConstant.xpm b/Source/Core/Resources/ScriptConstant.xpm
new file mode 100644
index 0000000..cb7a992
--- /dev/null
+++ b/Source/Core/Resources/ScriptConstant.xpm
@@ -0,0 +1,95 @@
+/* XPM */
+static char *image_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 74 1",
+"  c #00ffff",
+". c #eceff4",
+"+ c #e5e8ee",
+"@ c #4e607a",
+"# c #fbfbfc",
+"$ c #c4ccda",
+"% c #a2adc4",
+"& c #3f546e",
+"* c #8494ad",
+"= c #8796af",
+"- c #ffffff",
+"; c #d3dae3",
+"> c #485c75",
+", c #93a2bb",
+"' c #9da9c1",
+") c #96a3bc",
+"! c #eceff3",
+"~ c #dce0e8",
+"{ c #556880",
+"] c #f4f6f8",
+"^ c #9ba8bf",
+"/ c #dce0e9",
+"( c #52667e",
+"_ c #e4e7ee",
+": c #a6b1c6",
+"< c #586a83",
+"[ c #ccd2df",
+"} c #b5bdc8",
+"| c #b5bed0",
+"1 c #40546e",
+"2 c #adb8cc",
+"3 c #9fabc3",
+"4 c #edeff3",
+"5 c #ccd3df",
+"6 c #e4e8ef",
+"7 c #8b9ab3",
+"8 c #d8dde6",
+"9 c #f4f5f8",
+"0 c #acb8cb",
+"a c #798aa3",
+"b c #909eb7",
+"c c #d3d9e3",
+"d c #d4d9e3",
+"e c #e4e8ee",
+"f c #fafbfc",
+"g c #aab4c9",
+"h c #3b4f6a",
+"i c #d3d9e4",
+"j c #b4bed0",
+"k c #e5e7ee",
+"l c #374b67",
+"m c #334863",
+"n c #a5b1c6",
+"o c #52657e",
+"p c #a9b4c9",
+"q c #dce1e9",
+"r c #66778e",
+"s c #435771",
+"t c #a4aeba",
+"u c #5d7088",
+"v c #f5f6f9",
+"w c #465a73",
+"x c #8e9cb5",
+"y c #7f8fa8",
+"z c #394e68",
+"A c #ccd2de",
+"B c #c5ccda",
+"C c #a3afc5",
+"D c #3e536d",
+"E c #bcc5d5",
+"F c #8998b2",
+"G c #ccd3de",
+"H c #cbd3df",
+"I c #dbe1e9",
+"                ",
+"                ",
+"                ",
+"                ",
+"   8p%^,xF*ya}  ",
+"   g--f9!k~d5r  ",
+"   C-#v._IiABu  ",
+"   '#].(&mG$E{  ",
+"   )]46/cHBE|@  ",
+"   b!e~o1mEj0w  ",
+"   7+qd[$E|2nD  ",
+"   =/;G$E|0:3z  ",
+"   }u<o@>sDhlt  ",
+"                ",
+"                ",
+"                ",
+};
\ No newline at end of file
diff --git a/Source/Core/Resources/ScriptError.xpm b/Source/Core/Resources/ScriptError.xpm
new file mode 100644
index 0000000..38a7d55
--- /dev/null
+++ b/Source/Core/Resources/ScriptError.xpm
@@ -0,0 +1,100 @@
+/* XPM */
+static char *image_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 79 1",
+"  c #00ffff",
+". c #f33b00",
+"+ c #ea3900",
+"@ c #ee3a00",
+"# c #e43600",
+"$ c #ba7a64",
+"% c #ff8b65",
+"& c #ff7c52",
+"* c #ffbea9",
+"= c #ffa183",
+"- c #f87247",
+"; c #ff9a79",
+"> c #d49b8a",
+", c #bd3306",
+"' c #f1ab95",
+") c #ff6a39",
+"! c #ff6f41",
+"~ c #d19481",
+"{ c #fb7950",
+"] c #7c250a",
+"^ c #fe5c28",
+"/ c #ff5f2c",
+"( c #ff8e69",
+"_ c #dc9d89",
+": c #e5b6a7",
+"< c #ff9c7c",
+"[ c #fe7f56",
+"} c #fb8660",
+"| c #fa8059",
+"1 c #fd5721",
+"2 c #f29679",
+"3 c #ffa487",
+"4 c #fa4409",
+"5 c #fb480d",
+"6 c #e0ad9d",
+"7 c #dc957e",
+"8 c #b9725a",
+"9 c #bb5a3b",
+"0 c #e23903",
+"a c #77311b",
+"b c #e35a2e",
+"c c #b62f05",
+"d c #feb8a2",
+"e c #fed8cc",
+"f c #f83e02",
+"g c #7f2e14",
+"h c #6e2a14",
+"i c #d03c0c",
+"j c #dda797",
+"k c #fec7b5",
+"l c #b27967",
+"m c #fed3c5",
+"n c #fb5018",
+"o c #f94107",
+"p c #a45f49",
+"q c #f2d8cf",
+"r c #ddaa9b",
+"s c #ffa88d",
+"t c #ff6d3e",
+"u c #ac4d2e",
+"v c #ff612d",
+"w c #fefefe",
+"x c #fd521b",
+"y c #b8411c",
+"z c #ffc4b1",
+"A c #c66b50",
+"B c #d48c75",
+"C c #dc3602",
+"D c #dd4c1c",
+"E c #d4947f",
+"F c #ee734c",
+"G c #962a09",
+"H c #ff8660",
+"I c #933e23",
+"J c #d9704d",
+"K c #ffb197",
+"L c #d58970",
+"M c #e5a38d",
+"N c #ecc2b4",
+"                ",
+"    e6_>~L~e    ",
+"   NjM2}{FJA7   ",
+"  Nr'3;%&tvb9B  ",
+" qj'Ks*ww=vxDuq ",
+" :M3s3mwwk/x4y$ ",
+" _2;<;zwwd^noiI ",
+" >}%(%Kww;15f0a ",
+" ~{&[&Hwwtn4.Ch ",
+" LFt!t)(Hx5f+,g ",
+" :J/v/%ww{f@#Gp ",
+" qAbxx[ww|@#c]q ",
+"  _9D4o--+#c]l  ",
+"   Euyi0C,G]l   ",
+"    q8Iahgpq    ",
+"                ",
+};
\ No newline at end of file
diff --git a/Source/Core/Resources/ScriptHelp.png b/Source/Core/Resources/ScriptHelp.png
new file mode 100644
index 0000000..c319c00
Binary files /dev/null and b/Source/Core/Resources/ScriptHelp.png differ
diff --git a/Source/Core/Resources/ScriptKeyword.xpm b/Source/Core/Resources/ScriptKeyword.xpm
new file mode 100644
index 0000000..40fe11d
--- /dev/null
+++ b/Source/Core/Resources/ScriptKeyword.xpm
@@ -0,0 +1,92 @@
+/* XPM */
+static char *image_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 71 1",
+"  c #00ffff",
+". c #8e468f",
+"+ c #edd8ed",
+"@ c #8d358e",
+"# c #f4e6f4",
+"$ c #a74fa8",
+"% c #a950aa",
+"& c #d5d5ac",
+"* c #a952aa",
+"= c #f0e3f0",
+"- c #acb4ae",
+"; c #e2afe2",
+"> c #712472",
+", c #f2dbf2",
+"' c #f0d4f0",
+") c #7c2d7d",
+"! c #ee9def",
+"~ c #7e2e7e",
+"{ c #d36ed4",
+"] c #eb91ec",
+"^ c #f0d5f0",
+"/ c #9f3c9f",
+"( c #752775",
+"_ c #cb67cc",
+": c #eea5ef",
+"< c #e8d1e8",
+"[ c #965297",
+"} c #a650a7",
+"| c #c1c4ac",
+"1 c #d56fd5",
+"2 c #f3e3f3",
+"3 c #fefbfe",
+"4 c #7f3080",
+"5 c #ecd2ec",
+"6 c #d26bd3",
+"7 c #7e307f",
+"8 c #eebeee",
+"9 c #a850a9",
+"0 c #7a2b7b",
+"a c #e9e5ab",
+"b c #953896",
+"c c #fa9bfb",
+"d c #b5bbad",
+"e c #bc70bd",
+"f c #fa98fb",
+"g c #904e91",
+"h c #e698e7",
+"i c #e5e2ab",
+"j c #faaefb",
+"k c #dd98de",
+"l c #e4cae4",
+"m c #e6cce6",
+"n c #7c2e7c",
+"o c #ccceac",
+"p c #faabfb",
+"q c #9ca7ae",
+"r c #bb6fbc",
+"s c #cf88cf",
+"t c #9c3c9d",
+"u c #e990ea",
+"v c #e3ace3",
+"w c #f7f0ab",
+"x c #d16ad2",
+"y c #fa9ffb",
+"z c #ebd1eb",
+"A c #acb5ad",
+"B c #8a99ae",
+"C c #fa99fb",
+"D c #f2e0f3",
+"E c #98a4ae",
+"F c #d16dd2",
+"                ",
+"           3    ",
+"          ,s=   ",
+"         ,svs2  ",
+"        's8j]sD ",
+"   w&-B s;pffus#",
+"        }r:cfChg",
+" wa&|AE $Fr:y![n",
+"        *x1ek.t~",
+"  wiodq l96{7/@)",
+"         <%_~b0^",
+"          +94(z ",
+"           5>m  ",
+"                ",
+"                ",
+"                ",
+};
\ No newline at end of file
diff --git a/Source/Core/Resources/ScriptPalette.png b/Source/Core/Resources/ScriptPalette.png
new file mode 100644
index 0000000..20f9d69
Binary files /dev/null and b/Source/Core/Resources/ScriptPalette.png differ
diff --git a/Source/Core/Resources/ScriptSnippet.xpm b/Source/Core/Resources/ScriptSnippet.xpm
new file mode 100644
index 0000000..cca5cc1
--- /dev/null
+++ b/Source/Core/Resources/ScriptSnippet.xpm
@@ -0,0 +1,86 @@
+/* XPM */
+static char *PuzzlePiece___[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 64 1",
+"  c #3C8C38",
+". c #41903C",
+"X c #469541",
+"o c #4A9945",
+"O c #4E9D48",
+"+ c #51A04B",
+"@ c #52A14C",
+"# c #55A44F",
+"$ c #59B54F",
+"% c #5AA853",
+"& c #5EAC57",
+"* c #5CB752",
+"= c #62AE5C",
+"- c #60B955",
+"; c #66B55F",
+": c #63BA58",
+"> c #65BB59",
+", c #66BB5D",
+"< c #68BC5B",
+"1 c #69BD5D",
+"2 c #6CBE5F",
+"3 c #6DB566",
+"4 c #6AB862",
+"5 c #6BBD62",
+"6 c #6DBF60",
+"7 c #6EBC65",
+"8 c #6FC064",
+"9 c #72C165",
+"0 c #72C169",
+"q c #76C26A",
+"w c #77C46D",
+"e c #78C66F",
+"r c #7AC072",
+"t c #7AC770",
+"y c #7CC376",
+"u c #7BC971",
+"i c #7DC973",
+"p c #7ECB74",
+"a c #80CE76",
+"s c #81C67B",
+"d c #87CB79",
+"f c #82CE79",
+"g c #84C87D",
+"h c #83D079",
+"j c #87CA80",
+"k c #88CA81",
+"l c #89CA83",
+"z c #8ACB83",
+"x c #8BCC83",
+"c c #8DCD85",
+"v c #91CF89",
+"b c #94CF8B",
+"n c #96D18D",
+"m c #99D290",
+"M c #9CD493",
+"N c #9ED595",
+"B c #A1D797",
+"V c #A2D897",
+"C c #A2D798",
+"Z c #A3D899",
+"A c #A4D899",
+"S c #A7D99C",
+"D c #E6F5E4",
+"F c None",
+/* pixels */
+"FFFFFFFFFFFFFFFF",
+"FFFFFfaiiFFFFFFF",
+"FFFFDfSVwFFFFFFF",
+"FFFFFiVnqFFFFFFF",
+"FhapueBM74;=FFFF",
+"FaSACBNMmnb&FFFF",
+"FpZBdq9999b%FFFF",
+"FtwgM9821>v3@OoF",
+"FFF7m211>-8xkkXF",
+"FFF4n1>>-*5kgg.F",
+"F74rb>*-*$j=X..F",
+"F4bv0cclk,gXFFFF",
+"F;v-c3@O=gs.FFFF",
+"F=cxl@FFXsy FFFF",
+"F&%#@OFF..  FFFF",
+"FFFFFFFFFFFFFFFF"
+};
diff --git a/Source/Core/Resources/Search.png b/Source/Core/Resources/Search.png
new file mode 100644
index 0000000..8d7b573
Binary files /dev/null and b/Source/Core/Resources/Search.png differ
diff --git a/Source/Core/Resources/SearchClear.png b/Source/Core/Resources/SearchClear.png
new file mode 100644
index 0000000..9f5eda7
Binary files /dev/null and b/Source/Core/Resources/SearchClear.png differ
diff --git a/Source/Core/Resources/SearchMatch.png b/Source/Core/Resources/SearchMatch.png
new file mode 100644
index 0000000..d73992c
Binary files /dev/null and b/Source/Core/Resources/SearchMatch.png differ
diff --git a/Source/Core/Resources/SearchMatchCase.png b/Source/Core/Resources/SearchMatchCase.png
new file mode 100644
index 0000000..2a9965e
Binary files /dev/null and b/Source/Core/Resources/SearchMatchCase.png differ
diff --git a/Source/Core/Resources/SearchNext.png b/Source/Core/Resources/SearchNext.png
new file mode 100644
index 0000000..3e8df20
Binary files /dev/null and b/Source/Core/Resources/SearchNext.png differ
diff --git a/Source/Core/Resources/SearchPrev.png b/Source/Core/Resources/SearchPrev.png
new file mode 100644
index 0000000..58043fe
Binary files /dev/null and b/Source/Core/Resources/SearchPrev.png differ
diff --git a/Source/Core/Resources/SlimDX_small.png b/Source/Core/Resources/SlimDX_small.png
new file mode 100644
index 0000000..c074552
Binary files /dev/null and b/Source/Core/Resources/SlimDX_small.png differ
diff --git a/Source/Core/Resources/SnapVerts.png b/Source/Core/Resources/SnapVerts.png
new file mode 100644
index 0000000..e46f54e
Binary files /dev/null and b/Source/Core/Resources/SnapVerts.png differ
diff --git a/Source/Core/Resources/Splash3_small.png b/Source/Core/Resources/Splash3_small.png
new file mode 100644
index 0000000..e9cc678
Binary files /dev/null and b/Source/Core/Resources/Splash3_small.png differ
diff --git a/Source/Core/Resources/Splash3_trans.png b/Source/Core/Resources/Splash3_trans.png
new file mode 100644
index 0000000..23a06db
Binary files /dev/null and b/Source/Core/Resources/Splash3_trans.png differ
diff --git a/Source/Core/Resources/Status0.png b/Source/Core/Resources/Status0.png
new file mode 100644
index 0000000..641be4f
Binary files /dev/null and b/Source/Core/Resources/Status0.png differ
diff --git a/Source/Core/Resources/Status1.png b/Source/Core/Resources/Status1.png
new file mode 100644
index 0000000..0144d4d
Binary files /dev/null and b/Source/Core/Resources/Status1.png differ
diff --git a/Source/Core/Resources/Status10.png b/Source/Core/Resources/Status10.png
new file mode 100644
index 0000000..22b62a0
Binary files /dev/null and b/Source/Core/Resources/Status10.png differ
diff --git a/Source/Core/Resources/Status11.png b/Source/Core/Resources/Status11.png
new file mode 100644
index 0000000..4518038
Binary files /dev/null and b/Source/Core/Resources/Status11.png differ
diff --git a/Source/Core/Resources/Status12.png b/Source/Core/Resources/Status12.png
new file mode 100644
index 0000000..1260e7c
Binary files /dev/null and b/Source/Core/Resources/Status12.png differ
diff --git a/Source/Core/Resources/Status2.png b/Source/Core/Resources/Status2.png
new file mode 100644
index 0000000..a06e292
Binary files /dev/null and b/Source/Core/Resources/Status2.png differ
diff --git a/Source/Core/Resources/TagStatistics.png b/Source/Core/Resources/TagStatistics.png
new file mode 100644
index 0000000..c8c54b5
Binary files /dev/null and b/Source/Core/Resources/TagStatistics.png differ
diff --git a/Source/Core/Resources/Test.png b/Source/Core/Resources/Test.png
new file mode 100644
index 0000000..48195ef
Binary files /dev/null and b/Source/Core/Resources/Test.png differ
diff --git a/Source/Core/Resources/Text.png b/Source/Core/Resources/Text.png
new file mode 100644
index 0000000..82b80f3
Binary files /dev/null and b/Source/Core/Resources/Text.png differ
diff --git a/Source/Core/Resources/Thing2D.png b/Source/Core/Resources/Thing2D.png
new file mode 100644
index 0000000..1969e2f
Binary files /dev/null and b/Source/Core/Resources/Thing2D.png differ
diff --git a/Source/Core/Resources/ThingStatistics.png b/Source/Core/Resources/ThingStatistics.png
new file mode 100644
index 0000000..f1d27ac
Binary files /dev/null and b/Source/Core/Resources/ThingStatistics.png differ
diff --git a/Source/Core/Resources/UDMF.cfg b/Source/Core/Resources/UDMF.cfg
new file mode 100644
index 0000000..7b76a70
--- /dev/null
+++ b/Source/Core/Resources/UDMF.cfg
@@ -0,0 +1,84 @@
+/********************************************************************\
+	Configuration for UDMF map reader/writer (UniversalMapSetIO)
+\********************************************************************/
+
+// These are the fields managed by Doom Builder (either handled or ignored intentionally)
+// and are no to be shown in the custom fields of the map elements.
+managedfields
+{
+	vertex
+	{
+		x;
+		y;
+		zceiling;
+		zfloor;
+	}
+	
+	linedef
+	{
+		id;
+		moreids;
+		v1;
+		v2;
+		special;
+		arg0;
+		arg1;
+		arg2;
+		arg3;
+		arg4;
+		sidefront;
+		sideback;
+	}
+	
+	sidedef
+	{
+		offsetx;
+		offsety;
+		texturetop;
+		texturebottom;
+		texturemiddle;
+		sector;
+	}
+	
+	sector
+	{
+		heightfloor;
+		heightceiling;
+		texturefloor;
+		textureceiling;
+		lightlevel;
+		special;
+		id;
+		moreids;
+		floorplane_a;
+		floorplane_b;
+		floorplane_c;
+		floorplane_d;
+		ceilingplane_a;
+		ceilingplane_b;
+		ceilingplane_c;
+		ceilingplane_d;
+	}
+	
+	thing
+	{
+		id;
+		x;
+		y;
+		height;
+		angle;
+		pitch;
+		roll;
+		scalex;
+		scaley;
+		scale;
+		type;
+		special;
+		arg0;
+		arg1;
+		arg2;
+		arg3;
+		arg4;		
+	}
+}
+
diff --git a/Source/Core/Resources/UDMF_UI.cfg b/Source/Core/Resources/UDMF_UI.cfg
new file mode 100644
index 0000000..4e47a97
--- /dev/null
+++ b/Source/Core/Resources/UDMF_UI.cfg
@@ -0,0 +1,76 @@
+/********************************************************************\
+	Configuration for UDMF map reader/writer (UniversalMapSetIO)
+\********************************************************************/
+
+//mxd. These are the fields, which are managed by GZDoom Builder's UI, but are still stored as UniversalFields. Values are UniversalType. I should turn all of these into properties one day. But not today.
+uifields
+{
+	linedef
+	{
+		alpha = 1;
+		renderstyle = 2;
+		arg0str = 2;
+		locknumber = 0;
+		comment = 2;
+	}
+	
+	sidedef
+	{
+		scalex_top = 1;
+		scaley_top = 1;
+		scalex_mid = 1;
+		scaley_mid = 1;
+		scalex_bottom = 1;
+		scaley_bottom = 1;
+		offsetx_top = 1;
+		offsety_top = 1;
+		offsetx_mid = 1;
+		offsety_mid = 1;
+		offsetx_bottom = 1;
+		offsety_bottom = 1;
+		light = 0;
+		lightabsolute = 3;
+	}
+	
+	sector
+	{
+		xpanningfloor = 1;
+		ypanningfloor = 1;
+		xpanningceiling = 1;
+		ypanningceiling = 1;
+		xscalefloor = 1;
+		yscalefloor = 1;
+		xscaleceiling = 1;
+		yscaleceiling = 1;
+		rotationfloor = 1;
+		rotationceiling = 1;
+		lightfloor = 0;
+		lightfloorabsolute = 3;
+		lightceiling = 0;
+		lightceilingabsolute = 3;
+		alphafloor = 1;
+		alphaceiling = 1;
+		renderstylefloor = 2;
+		renderstyleceiling = 2;
+		gravity = 1;
+		lightcolor = 0;
+		fadecolor = 0;
+		desaturation = 1;
+		soundsequence = 2;
+		comment = 2;
+	}
+	
+	thing
+	{
+		arg0str = 2;
+		conversation = 0;
+		gravity = 1;
+		health = 0;
+		fillcolor = 0;
+		alpha = 1;
+		score = 0;
+		renderstyle = 2;
+		floatbobphase = 0;
+		comment = 2;
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Resources/Undo.png b/Source/Core/Resources/Undo.png
new file mode 100644
index 0000000..a5226e3
Binary files /dev/null and b/Source/Core/Resources/Undo.png differ
diff --git a/Source/Core/Resources/UnknownImage.png b/Source/Core/Resources/UnknownImage.png
new file mode 100644
index 0000000..272dffd
Binary files /dev/null and b/Source/Core/Resources/UnknownImage.png differ
diff --git a/Source/Core/Resources/UnknownTexture3D.png b/Source/Core/Resources/UnknownTexture3D.png
new file mode 100644
index 0000000..7f31fa0
Binary files /dev/null and b/Source/Core/Resources/UnknownTexture3D.png differ
diff --git a/Source/Core/Resources/UnknownThing.png b/Source/Core/Resources/UnknownThing.png
new file mode 100644
index 0000000..76d2f6a
Binary files /dev/null and b/Source/Core/Resources/UnknownThing.png differ
diff --git a/Source/Core/Resources/Unlink.png b/Source/Core/Resources/Unlink.png
new file mode 100644
index 0000000..ab2b8c9
Binary files /dev/null and b/Source/Core/Resources/Unlink.png differ
diff --git a/Source/Core/Resources/Unpin.png b/Source/Core/Resources/Unpin.png
new file mode 100644
index 0000000..d194f8f
Binary files /dev/null and b/Source/Core/Resources/Unpin.png differ
diff --git a/Source/Core/Resources/Update.png b/Source/Core/Resources/Update.png
new file mode 100644
index 0000000..16c6ee1
Binary files /dev/null and b/Source/Core/Resources/Update.png differ
diff --git a/Source/Core/Resources/ViewBrightness.png b/Source/Core/Resources/ViewBrightness.png
new file mode 100644
index 0000000..9b6df92
Binary files /dev/null and b/Source/Core/Resources/ViewBrightness.png differ
diff --git a/Source/Core/Resources/ViewNormal.png b/Source/Core/Resources/ViewNormal.png
new file mode 100644
index 0000000..785bd8f
Binary files /dev/null and b/Source/Core/Resources/ViewNormal.png differ
diff --git a/Source/Core/Resources/ViewTextureCeiling.png b/Source/Core/Resources/ViewTextureCeiling.png
new file mode 100644
index 0000000..584d83d
Binary files /dev/null and b/Source/Core/Resources/ViewTextureCeiling.png differ
diff --git a/Source/Core/Resources/ViewTextureFloor.png b/Source/Core/Resources/ViewTextureFloor.png
new file mode 100644
index 0000000..65617fd
Binary files /dev/null and b/Source/Core/Resources/ViewTextureFloor.png differ
diff --git a/Source/Core/Resources/VisualVertices.png b/Source/Core/Resources/VisualVertices.png
new file mode 100644
index 0000000..a07f000
Binary files /dev/null and b/Source/Core/Resources/VisualVertices.png differ
diff --git a/Source/Core/Resources/Warning.png b/Source/Core/Resources/Warning.png
new file mode 100644
index 0000000..083b8cb
Binary files /dev/null and b/Source/Core/Resources/Warning.png differ
diff --git a/Source/Core/Resources/WarningLarge.png b/Source/Core/Resources/WarningLarge.png
new file mode 100644
index 0000000..5a5eea4
Binary files /dev/null and b/Source/Core/Resources/WarningLarge.png differ
diff --git a/Source/Core/Resources/WarningOff.png b/Source/Core/Resources/WarningOff.png
new file mode 100644
index 0000000..5532475
Binary files /dev/null and b/Source/Core/Resources/WarningOff.png differ
diff --git a/Source/Core/Resources/White.png b/Source/Core/Resources/White.png
new file mode 100644
index 0000000..0f4ea34
Binary files /dev/null and b/Source/Core/Resources/White.png differ
diff --git a/Source/Core/Resources/WordWrap.png b/Source/Core/Resources/WordWrap.png
new file mode 100644
index 0000000..7f63034
Binary files /dev/null and b/Source/Core/Resources/WordWrap.png differ
diff --git a/Source/Core/Resources/Zoom.png b/Source/Core/Resources/Zoom.png
new file mode 100644
index 0000000..a295c92
Binary files /dev/null and b/Source/Core/Resources/Zoom.png differ
diff --git a/Source/Core/Resources/Zoom_arrowup.png b/Source/Core/Resources/Zoom_arrowup.png
new file mode 100644
index 0000000..95fad62
Binary files /dev/null and b/Source/Core/Resources/Zoom_arrowup.png differ
diff --git a/Source/Core/Resources/display2d.fx b/Source/Core/Resources/display2d.fx
new file mode 100644
index 0000000..aecb87f
--- /dev/null
+++ b/Source/Core/Resources/display2d.fx
@@ -0,0 +1,130 @@
+// 2D display rendering shader
+// Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+
+// Vertex input data
+struct VertexData
+{
+	float3 pos		: POSITION;
+	float4 color	: COLOR0;
+	float2 uv		: TEXCOORD0;
+};
+
+// Pixel input data
+struct PixelData
+{
+	float4 pos		: POSITION;
+	float4 color	: COLOR0;
+	float2 uv		: TEXCOORD0;
+};
+
+// Render settings
+// x = texel width
+// y = texel height
+// z = FSAA blend factor
+// w = transparency
+float4 rendersettings;
+
+// Transform settings
+float4x4 transformsettings;
+
+// Filter settings
+dword filtersettings;
+
+// Texture1 input
+texture texture1
+<
+	string UIName = "Texture1";
+	string ResourceType = "2D";
+>;
+
+// Texture sampler settings
+sampler2D texture1samp = sampler_state
+{
+	Texture = <texture1>;
+	MagFilter = filtersettings;
+	MinFilter = filtersettings;
+	MipFilter = filtersettings;
+	AddressU = Wrap;
+	AddressV = Wrap;
+	MipMapLodBias = 0.0f;
+};
+
+// Transformation
+PixelData vs_transform(VertexData vd)
+{
+	PixelData pd = (PixelData)0;
+	pd.pos = mul(float4(vd.pos, 1.0f), transformsettings);
+	pd.color = vd.color;
+	pd.uv = vd.uv;
+	return pd;
+}
+
+// This blends the max of 2 pixels
+float4 addcolor(float4 c1, float4 c2)
+{
+	return float4(max(c1.r, c2.r),
+				  max(c1.g, c2.g),
+				  max(c1.b, c2.b),
+				  saturate(c1.a + c2.a * 0.5f));
+}
+
+// Pixel shader for antialiased drawing
+float4 ps_fsaa(PixelData pd) : COLOR
+{
+	// Take this pixel's color
+	float4 c = tex2D(texture1samp, pd.uv);
+	
+	// If this pixel is not drawn on...
+	if(c.a < 0.1f)
+	{
+		// Mix the colors of nearby pixels
+		float4 n = (float4)0;
+		n = addcolor(n, tex2D(texture1samp, float2(pd.uv.x + rendersettings.x, pd.uv.y)));
+		n = addcolor(n, tex2D(texture1samp, float2(pd.uv.x - rendersettings.x, pd.uv.y)));
+		n = addcolor(n, tex2D(texture1samp, float2(pd.uv.x, pd.uv.y + rendersettings.y)));
+		n = addcolor(n, tex2D(texture1samp, float2(pd.uv.x, pd.uv.y - rendersettings.y)));
+		
+		// If any pixels nearby where found, return a blend, otherwise return nothing
+		//if(n.a > 0.1f) return float4(n.rgb, n.a * settings.z); else return (float4)0;
+		return float4(n.rgb, n.a * rendersettings.z * rendersettings.w);
+	}
+	else return float4(c.rgb, c.a * rendersettings.w) * pd.color;
+}
+
+// Pixel shader for normal drawing
+float4 ps_normal(PixelData pd) : COLOR
+{
+	// Take this pixel's color
+	float4 c = tex2D(texture1samp, pd.uv);
+	return float4(c.rgb, c.a * rendersettings.w) * pd.color;
+}
+
+//mxd. Pixel shader for full bright drawing
+float4 ps_fullbright(PixelData pd) : COLOR
+{
+	// Take this pixel's color
+	float4 c = tex2D(texture1samp, pd.uv);
+	return float4(c.rgb, c.a * rendersettings.w);
+}
+
+// Technique for shader model 2.0
+technique SM20
+{
+	pass p0
+	{
+		VertexShader = compile vs_2_0 vs_transform();
+		PixelShader = compile ps_2_0 ps_fsaa();
+	}
+	
+	pass p1
+	{
+		VertexShader = compile vs_2_0 vs_transform();
+		PixelShader = compile ps_2_0 ps_normal();
+	}
+	
+	pass p2 //mxd
+	{
+		VertexShader = compile vs_2_0 vs_transform();
+		PixelShader = compile ps_2_0 ps_fullbright();
+	}
+}
diff --git a/Source/Core/Resources/fog.png b/Source/Core/Resources/fog.png
new file mode 100644
index 0000000..1ce62f6
Binary files /dev/null and b/Source/Core/Resources/fog.png differ
diff --git a/Source/Core/Resources/fx.png b/Source/Core/Resources/fx.png
new file mode 100644
index 0000000..5b4dcc2
Binary files /dev/null and b/Source/Core/Resources/fx.png differ
diff --git a/Source/Core/Resources/mergegeometry.png b/Source/Core/Resources/mergegeometry.png
new file mode 100644
index 0000000..c9c4427
Binary files /dev/null and b/Source/Core/Resources/mergegeometry.png differ
diff --git a/Source/Core/Resources/mergegeometry2.png b/Source/Core/Resources/mergegeometry2.png
new file mode 100644
index 0000000..f8af3f1
Binary files /dev/null and b/Source/Core/Resources/mergegeometry2.png differ
diff --git a/Source/Core/Resources/things2d.fx b/Source/Core/Resources/things2d.fx
new file mode 100644
index 0000000..6e5027c
--- /dev/null
+++ b/Source/Core/Resources/things2d.fx
@@ -0,0 +1,122 @@
+// Things 2D rendering shader
+// Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+
+// Vertex input data
+struct VertexData
+{
+	float3 pos		: POSITION;
+	float4 color	: COLOR0;
+	float2 uv		: TEXCOORD0;
+};
+
+// Pixel input data
+struct PixelData
+{
+	float4 pos		: POSITION;
+	float4 color	: COLOR0;
+	float2 uv		: TEXCOORD0;
+};
+
+// Render settings
+// w = transparency
+float4 rendersettings;
+
+//mxd. solid fill color. used in model wireframe rendering
+float4 fillColor;
+
+// Transform settings
+float4x4 transformsettings;
+
+// Texture1 input
+texture texture1
+<
+	string UIName = "Texture1";
+	string ResourceType = "2D";
+>;
+
+// Texture sampler settings
+sampler2D texture1samp = sampler_state
+{
+	Texture = <texture1>;
+	MagFilter = Linear;
+	MinFilter = Linear;
+	MipFilter = Linear;
+	AddressU = Wrap;
+	AddressV = Wrap;
+	MipMapLodBias = -0.9f;
+};
+
+//mxd. Texture sampler settings for sprite rendering
+sampler2D texture1sprite = sampler_state
+{
+	Texture = <texture1>;
+	MagFilter = Point;
+	MinFilter = Point;
+	MipFilter = Point;
+	AddressU = Clamp;
+	AddressV = Clamp;
+	MipMapLodBias = 0.0f;
+};
+
+// Transformation
+PixelData vs_transform(VertexData vd)
+{
+	PixelData pd = (PixelData)0;
+	pd.pos = mul(float4(vd.pos, 1.0f), transformsettings);
+	pd.color = vd.color;
+	pd.uv = vd.uv;
+	return pd;
+}
+
+//mxd. Pixel shader for sprite drawing
+float4 ps_sprite(PixelData pd) : COLOR
+{
+	// Take this pixel's color
+	float4 c = tex2D(texture1sprite, pd.uv);
+	
+	// Modulate it by selection color
+	if(pd.color.a > 0)
+	{
+		return float4((c.r + pd.color.r) / 2.0f, (c.g + pd.color.g) / 2.0f, (c.b + pd.color.b) / 2.0f, c.a * rendersettings.w * pd.color.a);
+	}
+
+	// Or leave it as it is
+	return float4(c.rgb, c.a * rendersettings.w);
+}
+
+//mxd. Pixel shader for thing box and arrow drawing
+float4 ps_thing(PixelData pd) : COLOR
+{
+	// Take this pixel's color
+	float4 c = tex2D(texture1samp, pd.uv);
+	return float4(c.rgb, c.a * rendersettings.w) * pd.color;
+}
+
+//mxd. Pretty darn simple pixel shader for wireframe rendering :)
+float4 ps_fill(PixelData pd) : COLOR 
+{
+	return fillColor;
+}
+
+// Technique for shader model 2.0
+technique SM20
+{
+	pass p0 //mxd
+	{
+		VertexShader = compile vs_2_0 vs_transform();
+		PixelShader = compile ps_2_0 ps_thing();
+	}
+
+	pass p1 //mxd
+	{
+		VertexShader = compile vs_2_0 vs_transform();
+		PixelShader = compile ps_2_0 ps_sprite();
+	}
+
+
+	pass p2 //mxd
+	{
+		VertexShader = compile vs_2_0 vs_transform();
+		PixelShader = compile ps_2_0 ps_fill();
+	}
+}
diff --git a/Source/Core/Resources/treeview.png b/Source/Core/Resources/treeview.png
new file mode 100644
index 0000000..0bbd274
Binary files /dev/null and b/Source/Core/Resources/treeview.png differ
diff --git a/Source/Core/Resources/world3d.fx b/Source/Core/Resources/world3d.fx
new file mode 100644
index 0000000..1661905
--- /dev/null
+++ b/Source/Core/Resources/world3d.fx
@@ -0,0 +1,348 @@
+// 3D world rendering shader
+// Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+
+// Vertex input data
+struct VertexData
+{
+	float3 pos		  : POSITION;
+	float4 color	  : COLOR0;
+	float2 uv		    : TEXCOORD0;
+	float3 normal   : NORMAL; //mxd
+};
+
+// Pixel input data
+struct PixelData
+{
+	float4 pos		: POSITION;
+	float4 color	: COLOR0;
+	float2 uv		  : TEXCOORD0;
+};
+
+//mxd
+// Pixel input data for light pass
+struct LitPixelData
+{
+	float4 pos		  : POSITION;
+	float4 color	  : COLOR0;
+	float2 uv		    : TEXCOORD0;
+	float3 pos_w    : TEXCOORD1; //mxd. pixel position in world space
+	float3 normal   : TEXCOORD2; //mxd. normal
+};
+
+// Highlight color
+float4 highlightcolor;
+
+// Matrix for final transformation
+const float4x4 worldviewproj;
+
+//mxd
+float4x4 world;
+float4 vertexColor;
+
+//light
+float4 lightPosAndRadius;
+float4 lightColor; //also used as fog color
+
+//fog
+const float4 cameraPos;  //w is set to fade factor (distance, at wich fog color completely overrides pixel color)
+
+// Texture input
+const texture texture1;
+
+// Filter settings
+const dword minfiltersettings;
+const dword magfiltersettings;
+const dword mipfiltersettings;
+const float maxanisotropysetting;
+
+// Texture sampler settings
+sampler2D texturesamp = sampler_state
+{
+	Texture = <texture1>;
+	MagFilter = magfiltersettings;
+	MinFilter = minfiltersettings;
+	MipFilter = mipfiltersettings;
+	MipMapLodBias = 0.0f;
+	MaxAnisotropy = maxanisotropysetting;
+};
+
+// Vertex shader
+PixelData vs_main(VertexData vd) 
+{
+	PixelData pd;
+	
+	// Fill pixel data input
+	pd.pos = mul(float4(vd.pos, 1.0f), worldviewproj);
+	pd.color = vd.color;
+	pd.uv = vd.uv;
+	
+	// Return result
+	return pd;
+}
+
+//mxd. same as vs_main, but uses vertexColor var instead of actual vertex color. used in models rendering
+PixelData vs_customvertexcolor(VertexData vd) 
+{
+	PixelData pd;
+	
+	// Fill pixel data input
+	pd.pos = mul(float4(vd.pos, 1.0f), worldviewproj);
+	pd.color = vertexColor;
+	pd.uv = vd.uv;
+	
+	// Return result
+	return pd;
+}
+
+LitPixelData vs_customvertexcolor_fog(VertexData vd) 
+{
+	LitPixelData pd;
+	
+	// Fill pixel data input
+	pd.pos = mul(float4(vd.pos, 1.0f), worldviewproj);
+	pd.pos_w = mul(float4(vd.pos, 1.0f), world);
+	pd.color = vertexColor;
+	pd.uv = vd.uv;
+	pd.normal = vd.normal;
+	
+	// Return result
+	return pd;
+}
+
+//mxd. light pass vertex shader
+LitPixelData vs_lightpass(VertexData vd) 
+{
+	LitPixelData pd;
+	pd.pos = mul(float4(vd.pos, 1.0f), worldviewproj);
+	pd.pos_w = mul(float4(vd.pos, 1.0f), world);
+	pd.color = vd.color;
+	pd.uv = vd.uv;
+	pd.normal = vd.normal;
+
+	// Return result
+	return pd;
+}
+
+// Normal pixel shader
+float4 ps_main(PixelData pd) : COLOR
+{
+	float4 tcolor = tex2D(texturesamp, pd.uv);
+	return tcolor * pd.color;
+}
+
+// Full-bright pixel shader
+float4 ps_fullbright(PixelData pd) : COLOR
+{
+	float4 tcolor = tex2D(texturesamp, pd.uv);
+	tcolor.a *= pd.color.a;
+	return tcolor;
+}
+
+// Normal pixel shader with highlight
+float4 ps_main_highlight(PixelData pd) : COLOR
+{
+	float4 tcolor = tex2D(texturesamp, pd.uv);
+	if(tcolor.a == 0) clip(-1);
+	
+	// Blend texture color and vertex color
+	float4 ncolor = tcolor * pd.color;
+	
+	return float4(highlightcolor.rgb * highlightcolor.a + (ncolor.rgb - 0.4f * highlightcolor.a), max(pd.color.a + 0.25f, 0.5f));
+}
+
+// Full-bright pixel shader with highlight
+float4 ps_fullbright_highlight(PixelData pd) : COLOR
+{
+	float4 tcolor = tex2D(texturesamp, pd.uv);
+	if(tcolor.a == 0) clip(-1);
+	
+	// Blend texture color and vertex color
+	float4 ncolor = tcolor * pd.color;
+	
+	return float4(highlightcolor.rgb * highlightcolor.a + (tcolor.rgb - 0.4f * highlightcolor.a), max(pd.color.a + 0.25f, 0.5f));
+}
+
+//mxd. This adds fog color to current pixel color
+float4 getFogColor(LitPixelData pd, float4 color)
+{
+	float fogdist = max(16.0f, distance(pd.pos_w, cameraPos.xyz));
+	float fogfactor = exp2(cameraPos.w * fogdist);
+
+	color.rgb = lerp(lightColor.rgb, color.rgb, fogfactor);
+	return color;
+}
+
+//mxd. Shaders with fog calculation
+// Normal pixel shader
+float4 ps_main_fog(LitPixelData pd) : COLOR 
+{
+	float4 tcolor = tex2D(texturesamp, pd.uv);
+	if(tcolor.a == 0) clip(-1);
+	
+	return getFogColor(pd, tcolor * pd.color);
+}
+
+// Normal pixel shader with highlight
+float4 ps_main_highlight_fog(LitPixelData pd) : COLOR 
+{
+	float4 tcolor = tex2D(texturesamp, pd.uv);
+	if(tcolor.a == 0) clip(-1);
+	
+	// Blend texture color and vertex color
+	float4 ncolor = getFogColor(pd, tcolor * pd.color);
+	
+	return float4(highlightcolor.rgb * highlightcolor.a + (ncolor.rgb - 0.4f * highlightcolor.a), max(ncolor.a + 0.25f, 0.5f));
+}
+
+//mxd: used to draw bounding boxes
+float4 ps_constant_color(PixelData pd) : COLOR 
+{
+	return vertexColor;
+}
+
+//mxd: used to draw event lines
+float4 ps_vertex_color(PixelData pd) : COLOR 
+{
+	return pd.color;
+}
+
+//mxd. dynamic light pixel shader pass, dood!
+float4 ps_lightpass(LitPixelData pd) : COLOR 
+{
+	//is face facing away from light source?
+	if(dot(pd.normal, (lightPosAndRadius.xyz - pd.pos_w)) < -0.1f) // (lightPosAndRadius.xyz - pd.pos_w) == direction from light to current pixel
+		clip(-1);
+
+	//is pixel in light range?
+	float dist = distance(pd.pos_w, lightPosAndRadius.xyz);
+	if(dist > lightPosAndRadius.w)
+		clip(-1);
+	
+	//is pixel tranparent?
+	float4 tcolor = tex2D(texturesamp, pd.uv);
+	if(tcolor.a == 0.0f)
+		clip(-1);
+
+	//if it is - calculate color at current pixel
+	float4 lightColorMod = float4(0.0f, 0.0f, 0.0f, 0.0f);
+
+	lightColorMod.rgb = lightColor.rgb * max(lightPosAndRadius.w - dist, 0.0f) / lightPosAndRadius.w;
+	if(lightColorMod.r > 0.0f || lightColorMod.g > 0.0f || lightColorMod.b > 0.0f)
+	{
+		lightColorMod.rgb *= lightColor.a;
+		if(lightColor.a > 0.4f) //Normal, vavoom or negative light
+			return tcolor * lightColorMod;
+		return lightColorMod; //Additive light
+	}
+	clip(-1);
+	return lightColorMod; //should never get here
+}
+
+// Technique for shader model 2.0
+technique SM20 
+{
+	// Normal
+	pass p0 
+	{
+		VertexShader = compile vs_2_0 vs_main();
+		PixelShader = compile ps_2_0 ps_main();
+	}
+	
+	// Full brightness mode
+	pass p1 
+	{
+		VertexShader = compile vs_2_0 vs_main();
+		PixelShader = compile ps_2_0 ps_fullbright();
+	}
+
+	// Normal with highlight
+	pass p2 
+	{
+		VertexShader = compile vs_2_0 vs_main();
+		PixelShader = compile ps_2_0 ps_main_highlight();
+	}
+	
+	// Full brightness mode with highlight
+	pass p3 
+	{
+		VertexShader = compile vs_2_0 vs_main();
+		PixelShader = compile ps_2_0 ps_fullbright_highlight();
+	}
+	
+	//mxd. same as p0-p3, but using vertexColor variable
+	// Normal
+	pass p4 
+	{
+		VertexShader = compile vs_2_0 vs_customvertexcolor();
+		PixelShader = compile ps_2_0 ps_main();
+	}
+	
+	pass p5 {} //mxd. need this only to maintain offset
+	
+	// Normal with highlight
+	pass p6 
+	{
+		VertexShader = compile vs_2_0 vs_customvertexcolor();
+		PixelShader = compile ps_2_0 ps_main_highlight();
+	}
+
+	pass p7 {} //mxd. need this only to maintain offset
+	
+	//mxd. same as p0-p3, but with fog calculation
+	// Normal
+	pass p8 
+	{
+		VertexShader = compile vs_2_0 vs_lightpass();
+		PixelShader = compile ps_2_0 ps_main_fog();
+	}
+	
+	pass p9 {} //mxd. need this only to maintain offset
+
+	// Normal with highlight
+	pass p10 
+	{
+		VertexShader = compile vs_2_0 vs_lightpass();
+		PixelShader = compile ps_2_0 ps_main_highlight_fog();
+	}
+
+	pass p11 {} //mxd. need this only to maintain offset
+	
+	//mxd. same as p4-p7, but with fog calculation
+	// Normal
+	pass p12 
+	{
+		VertexShader = compile vs_2_0 vs_customvertexcolor_fog();
+		PixelShader = compile ps_2_0 ps_main_fog();
+	}
+
+	pass p13 {} //mxd. need this only to maintain offset
+	
+	// Normal with highlight
+	pass p14 
+	{
+		VertexShader = compile vs_2_0 vs_customvertexcolor_fog();
+		PixelShader = compile ps_2_0 ps_main_highlight_fog();
+	}
+
+	//mxd. Used to render event lines
+	pass p15
+	{
+		VertexShader = compile vs_2_0 vs_main();
+		PixelShader  = compile ps_2_0 ps_vertex_color();
+	}
+	
+	//mxd. Just fills everything with vertexColor. Used in ThingCage rendering.
+	pass p16 
+	{
+		VertexShader = compile vs_2_0 vs_customvertexcolor();
+		PixelShader  = compile ps_2_0 ps_constant_color();
+	}
+	
+	//mxd. Light pass
+	pass p17 
+	{
+		VertexShader = compile vs_2_0 vs_lightpass();
+		PixelShader  = compile ps_2_0 ps_lightpass();
+		AlphaBlendEnable = true;
+	}
+}
diff --git a/Source/Core/Types/AngleByteHandler.cs b/Source/Core/Types/AngleByteHandler.cs
new file mode 100644
index 0000000..7db8502
--- /dev/null
+++ b/Source/Core/Types/AngleByteHandler.cs
@@ -0,0 +1,23 @@
+#region ================== Namespaces
+
+using System;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Windows;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Types
+{
+	[TypeHandler(UniversalType.AngleByte, "Byte Angle", true)]
+	internal class AngleByteHandler : AngleDegreesHandler
+	{
+		#region ================== Methods
+
+		public override void Browse(IWin32Window parent) 
+		{
+			value = (int)Math.Round((float)AngleForm.ShowDialog(parent, (int)Math.Round((float)value / 256 * 360)) / 360 * 256);
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Types/AngleDegreesFloatHandler.cs b/Source/Core/Types/AngleDegreesFloatHandler.cs
new file mode 100644
index 0000000..82b074a
--- /dev/null
+++ b/Source/Core/Types/AngleDegreesFloatHandler.cs
@@ -0,0 +1,107 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Drawing;
+using System.Globalization;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Windows;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Types
+{
+	[TypeHandler(UniversalType.AngleDegreesFloat, "Degrees (Decimal)", true)]
+	internal class AngleDegreesFloatHandler : TypeHandler
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		private float value;
+
+		#endregion
+
+		#region ================== Properties
+
+		public override bool IsBrowseable { get { return true; } }
+
+		public override Image BrowseImage { get { return Properties.Resources.Angle; } }
+		
+		#endregion
+
+		#region ================== Constructor
+
+		#endregion
+
+		#region ================== Methods
+
+		public override void Browse(IWin32Window parent)
+		{
+			int oldvalue = (int)Math.Round(value);
+			int newvalue = AngleForm.ShowDialog(parent, oldvalue);
+			if(newvalue != oldvalue) value = newvalue;
+		}
+		
+		public override void SetValue(object value)
+		{
+			// Null?
+			if(value == null)
+			{
+				this.value = 0.0f;
+			}
+			// Compatible type?
+			else if((value is int) || (value is float) || (value is bool))
+			{
+				// Set directly
+				this.value = Convert.ToSingle(value);
+			}
+			else {
+				// Try parsing as string
+				float result;
+				if(float.TryParse(value.ToString(), NumberStyles.Float, CultureInfo.CurrentCulture, out result))
+				{
+					this.value = result;
+				}
+				else
+				{
+					this.value = 0.0f;
+				}
+			}
+		}
+
+		public override object GetValue()
+		{
+			return this.value;
+		}
+
+		public override int GetIntValue()
+		{
+			return (int)this.value;
+		}
+
+		public override string GetStringValue()
+		{
+			return this.value.ToString();
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Types/AngleDegreesHandler.cs b/Source/Core/Types/AngleDegreesHandler.cs
new file mode 100644
index 0000000..ec4e7c9
--- /dev/null
+++ b/Source/Core/Types/AngleDegreesHandler.cs
@@ -0,0 +1,106 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Drawing;
+using System.Globalization;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Windows;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Types
+{
+	[TypeHandler(UniversalType.AngleDegrees, "Degrees (Integer)", true)]
+	internal class AngleDegreesHandler : TypeHandler
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		protected int value;
+
+		#endregion
+
+		#region ================== Properties
+
+		public override bool IsBrowseable { get { return true; } }
+
+		public override Image BrowseImage { get { return Properties.Resources.Angle; } }
+		
+		#endregion
+
+		#region ================== Constructor
+
+		#endregion
+
+		#region ================== Methods
+
+		public override void Browse(IWin32Window parent)
+		{
+			value = AngleForm.ShowDialog(parent, value);
+		}
+
+		public override void SetValue(object value)
+		{
+			// Null?
+			if(value == null)
+			{
+				this.value = 0;
+			}
+			// Compatible type?
+			else if((value is int) || (value is float) || (value is bool))
+			{
+				// Set directly
+				this.value = Convert.ToInt32(value);
+			}
+			else
+			{
+				// Try parsing as string
+				int result;
+				if(int.TryParse(value.ToString(), NumberStyles.Integer, CultureInfo.CurrentCulture, out result))
+				{
+					this.value = result;
+				}
+				else
+				{
+					this.value = 0;
+				}
+			}
+		}
+
+		public override object GetValue()
+		{
+			return this.value;
+		}
+
+		public override int GetIntValue()
+		{
+			return this.value;
+		}
+
+		public override string GetStringValue()
+		{
+			return this.value.ToString();
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Types/AngleRadiansHandler.cs b/Source/Core/Types/AngleRadiansHandler.cs
new file mode 100644
index 0000000..57a9315
--- /dev/null
+++ b/Source/Core/Types/AngleRadiansHandler.cs
@@ -0,0 +1,107 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Drawing;
+using System.Globalization;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Windows;
+using CodeImp.DoomBuilder.Geometry;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Types
+{
+	[TypeHandler(UniversalType.AngleRadians, "Radians", true)]
+	internal class AngleRadiansHandler : TypeHandler
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		private float value;
+
+		#endregion
+
+		#region ================== Properties
+
+		public override bool IsBrowseable { get { return true; } }
+
+		public override Image BrowseImage { get { return Properties.Resources.Angle; } }
+		
+		#endregion
+
+		#region ================== Constructor
+
+		#endregion
+
+		#region ================== Methods
+
+		public override void Browse(IWin32Window parent)
+		{
+			value = Angle2D.DoomToReal(AngleForm.ShowDialog(parent, Angle2D.RealToDoom(value)));
+		}
+
+		public override void SetValue(object value)
+		{
+			// Null?
+			if(value == null)
+			{
+				this.value = 0.0f;
+			}
+			// Compatible type?
+			else if((value is int) || (value is float) || (value is bool))
+			{
+				// Set directly
+				this.value = Convert.ToSingle(value);
+			}
+			else
+			{
+				// Try parsing as string
+				float result;
+				if(float.TryParse(value.ToString(), NumberStyles.Float, CultureInfo.CurrentCulture, out result))
+				{
+					this.value = result;
+				}
+				else
+				{
+					this.value = 0.0f;
+				}
+			}
+		}
+
+		public override object GetValue()
+		{
+			return this.value;
+		}
+
+		public override int GetIntValue()
+		{
+			return (int)this.value;
+		}
+
+		public override string GetStringValue()
+		{
+			return this.value.ToString();
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Types/BoolHandler.cs b/Source/Core/Types/BoolHandler.cs
new file mode 100644
index 0000000..0b3f369
--- /dev/null
+++ b/Source/Core/Types/BoolHandler.cs
@@ -0,0 +1,112 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using CodeImp.DoomBuilder.Config;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Types
+{
+	[TypeHandler(UniversalType.Boolean, "Boolean", true)]
+	internal class BoolHandler : TypeHandler
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		private EnumList list;
+		private bool value;
+
+		#endregion
+
+		#region ================== Properties
+
+		public override bool IsEnumerable { get { return true; } }
+		public override bool IsLimitedToEnums { get { return true; } }
+		
+		#endregion
+
+		#region ================== Constructor
+
+		// When set up for an argument
+		public BoolHandler() : base()
+		{
+			// Make enums
+			list = new EnumList();
+			list.Add(new EnumItem("true", "True"));
+			list.Add(new EnumItem("false", "False"));
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		public override void SetValue(object value)
+		{
+			// null?
+			if(value == null)
+			{
+				this.value = false;
+			}
+			// Compatible type?
+			else if((value is int) || (value is float) || (value is bool))
+			{
+				this.value = Convert.ToBoolean(value);
+			}
+			// string?
+			else if(value is string)
+			{
+				// Try parsing as string
+				if(value.ToString().ToLowerInvariant().StartsWith("t"))
+					this.value = true;
+				else
+					this.value = false;
+			}
+			else
+			{
+				this.value = false;
+			}
+		}
+
+		public override object GetValue()
+		{
+			return this.value;
+		}
+
+		public override int GetIntValue()
+		{
+			if(this.value) return 1; else return 0;
+		}
+
+		public override string GetStringValue()
+		{
+			return this.value.ToString();
+		}
+
+		// This returns an enum list
+		public override EnumList GetEnumList()
+		{
+			return list;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Types/ColorHandler.cs b/Source/Core/Types/ColorHandler.cs
new file mode 100644
index 0000000..37f7ac9
--- /dev/null
+++ b/Source/Core/Types/ColorHandler.cs
@@ -0,0 +1,118 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Globalization;
+using System.Windows.Forms;
+using System.Drawing;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Types
+{
+	[TypeHandler(UniversalType.Color, "Color", true)]
+	internal class ColorHandler : TypeHandler
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		private int value;		// XXRRGGBB color
+
+		#endregion
+
+		#region ================== Properties
+
+		public override bool IsBrowseable { get { return true; } }
+
+		public override Image BrowseImage { get { return Properties.Resources.ColorPick; } }
+		
+		#endregion
+
+		#region ================== Constructor
+
+		#endregion
+
+		#region ================== Methods
+
+		public override void Browse(IWin32Window parent)
+		{
+			ColorDialog dialog = new ColorDialog();
+			dialog.AllowFullOpen = true;
+			dialog.AnyColor = true;
+			dialog.Color = Color.FromArgb((value >> 16) & 0xFF, (value >> 8) & 0xFF, value & 0xFF);
+			dialog.FullOpen = true;
+			if(dialog.ShowDialog(parent) == DialogResult.OK)
+			{
+				value = dialog.Color.ToArgb() & 0x00FFFFFF;
+			}
+		}
+
+		public override void SetValue(object value)
+		{
+			// Null?
+			if(value == null)
+			{
+				this.value = 0;
+			}
+			// Compatible type?
+			else if((value is int) || (value is float) || (value is bool))
+			{
+				// Set directly
+				this.value = Convert.ToInt32(value);
+			}
+			// String?
+			else if(value is string)
+			{
+				// Try parsing as string
+				int result;
+				if(int.TryParse(value.ToString(), NumberStyles.HexNumber, CultureInfo.CurrentCulture, out result))
+				{
+					this.value = result;
+				}
+				else
+				{
+					this.value = 0;
+				}
+			}
+			else
+			{
+				this.value = 0;
+			}
+		}
+
+		public override object GetValue()
+		{
+			return this.value;
+		}
+
+		public override int GetIntValue()
+		{
+			return this.value;
+		}
+
+		public override string GetStringValue()
+		{
+			return this.value.ToString("X6");
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Types/EnumBitsHandler.cs b/Source/Core/Types/EnumBitsHandler.cs
new file mode 100644
index 0000000..c392bf5
--- /dev/null
+++ b/Source/Core/Types/EnumBitsHandler.cs
@@ -0,0 +1,125 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Drawing;
+using System.Globalization;
+using CodeImp.DoomBuilder.Config;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Windows;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Types
+{
+	[TypeHandler(UniversalType.EnumBits, "Options", false)]
+	internal class EnumBitsHandler : TypeHandler
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		private EnumList list;
+		private int value;
+		private int defaultValue; //mxd
+
+		#endregion
+
+		#region ================== Properties
+
+		public override bool IsBrowseable { get { return true; } }
+
+		public override Image BrowseImage { get { return Properties.Resources.List; } }
+		
+		#endregion
+
+		#region ================== Constructor
+
+		// When set up for an argument
+		public override void SetupArgument(TypeHandlerAttribute attr, ArgumentInfo arginfo)
+		{
+			defaultValue = (int)arginfo.DefaultValue;//mxd
+			base.SetupArgument(attr, arginfo);
+
+			// Keep enum list reference
+			list = arginfo.Enum;
+		}
+
+		#endregion
+		
+		#region ================== Methods
+
+		public override void Browse(IWin32Window parent)
+		{
+			value = BitFlagsForm.ShowDialog(parent, list, value);
+		}
+
+		public override void SetValue(object value)
+		{
+			// Null?
+			if(value == null)
+			{
+				this.value = 0;
+			}
+			// Compatible type?
+			else if((value is int) || (value is float) || (value is bool))
+			{
+				// Set directly
+				this.value = Convert.ToInt32(value);
+			}
+			else
+			{
+				// Try parsing as string
+				int result;
+				if(int.TryParse(value.ToString(), NumberStyles.Integer, CultureInfo.CurrentCulture, out result))
+				{
+					this.value = result;
+				}
+				else
+				{
+					this.value = 0;
+				}
+			}
+		}
+
+		//mxd
+		public override void SetDefaultValue() 
+		{
+			value = defaultValue;
+		}
+
+		public override object GetValue()
+		{
+			return this.value;
+		}
+
+		public override int GetIntValue()
+		{
+			return this.value;
+		}
+
+		public override string GetStringValue()
+		{
+			return this.value.ToString();
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Types/EnumOptionHandler.cs b/Source/Core/Types/EnumOptionHandler.cs
new file mode 100644
index 0000000..30184b1
--- /dev/null
+++ b/Source/Core/Types/EnumOptionHandler.cs
@@ -0,0 +1,195 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Globalization;
+using CodeImp.DoomBuilder.Config;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Types
+{
+	[TypeHandler(UniversalType.EnumOption, "Setting", false)]
+	internal class EnumOptionHandler : TypeHandler
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		private EnumList list;
+		private EnumItem value;
+		private EnumItem defaultvalue; //mxd
+		
+		#endregion
+
+		#region ================== Properties
+
+		public override bool IsBrowseable { get { return true; } }
+		public override bool IsEnumerable { get { return true; } }
+		
+		#endregion
+
+		#region ================== Setup
+
+		// When set up for an argument
+		public override void SetupArgument(TypeHandlerAttribute attr, ArgumentInfo arginfo)
+		{
+			defaultvalue = new EnumItem(arginfo.DefaultValue.ToString(), arginfo.DefaultValue.ToString());//mxd
+			base.SetupArgument(attr, arginfo);
+
+			// Keep enum list reference
+			list = arginfo.Enum;
+		}
+
+		// When set up for a universal field
+		public override void SetupField(TypeHandlerAttribute attr, UniversalFieldInfo fieldinfo)
+		{
+			base.SetupField(attr, fieldinfo);
+
+			// Keep enum list reference
+			list = (fieldinfo != null ? fieldinfo.Enum : new EnumList());
+		}
+
+		#endregion
+		
+		#region ================== Methods
+		
+		public override void SetValue(object value)
+		{
+			this.value = null;
+
+			// Input null?
+			if(value == null)
+			{
+				this.value = new EnumItem("0", "NULL");
+			}
+			else
+			{
+				// Compatible type?
+				if((value is int) || (value is float) || (value is bool))
+				{
+					int intvalue = Convert.ToInt32(value);
+
+					// First try to match the value against the enum values
+					foreach(EnumItem item in list)
+					{
+						// Matching value?
+						if(item.GetIntValue() == intvalue)
+						{
+							// Set this value
+							this.value = item;
+						}
+					}
+				}
+
+				// No match found yet?
+				if(this.value == null)
+				{
+					// First try to match the value against the enum values
+					foreach(EnumItem item in list)
+					{
+						// Matching value?
+						if(item.Value == value.ToString())
+						{
+							// Set this value
+							this.value = item;
+						}
+					}
+				}
+
+				// No match found yet?
+				if(this.value == null)
+				{
+					// Try to match against the titles
+					foreach(EnumItem item in list)
+					{
+						// Matching value?
+						if(item.Title.ToLowerInvariant() == value.ToString().ToLowerInvariant())
+						{
+							// Set this value
+							this.value = item;
+						}
+					}
+				}
+
+				// Still no match found?
+				if(this.value == null)
+				{
+					// Make a dummy value
+					this.value = new EnumItem(value.ToString(), value.ToString());
+					this.value = new EnumItem(this.value.GetIntValue().ToString(CultureInfo.InvariantCulture), value.ToString());
+				}
+			}
+		}
+
+		//mxd
+		public override void SetDefaultValue() 
+		{
+			value = defaultvalue;
+		}
+
+		public override object GetValue()
+		{
+			return GetIntValue();
+		}
+		
+		public override int GetIntValue()
+		{
+			if(this.value != null)
+			{
+				// Parse the value to integer
+				int result;
+				if(int.TryParse(this.value.Value, NumberStyles.Integer,
+								CultureInfo.InvariantCulture, out result))
+				{
+					return result;
+				}
+				else
+				{
+					return 0;
+				}
+			}
+			else
+			{
+				return 0;
+			}
+		}
+		
+		public override string GetStringValue() 
+		{
+			return (this.value != null ? this.value.Title : "NULL");
+		}
+
+		// This returns an enum list
+		public override EnumList GetEnumList()
+		{
+			return list;
+		}
+
+		// This returns the type to display for fixed fields
+		// Must be a custom usable type
+		public override TypeHandlerAttribute GetDisplayType()
+		{
+			return General.Types.GetAttribute((int)UniversalType.Integer);
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Types/EnumStringsHandler.cs b/Source/Core/Types/EnumStringsHandler.cs
new file mode 100644
index 0000000..0ad1d6d
--- /dev/null
+++ b/Source/Core/Types/EnumStringsHandler.cs
@@ -0,0 +1,176 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Globalization;
+using CodeImp.DoomBuilder.Config;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Types
+{
+	[TypeHandler(UniversalType.EnumStrings, "Setting", false)]
+	internal class EnumStringsHandler : TypeHandler
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		private EnumList list;
+		private EnumItem value;
+		private EnumItem defaultValue; //mxd
+
+		#endregion
+
+		#region ================== Properties
+
+		public override bool IsBrowseable { get { return true; } }
+		public override bool IsEnumerable { get { return true; } }
+
+		#endregion
+
+		#region ================== Constructor
+
+		// When set up for an argument
+		public override void SetupArgument(TypeHandlerAttribute attr, ArgumentInfo arginfo)
+		{
+			defaultValue = new EnumItem(arginfo.DefaultValue.ToString(), arginfo.DefaultValue.ToString()); //mxd
+			base.SetupArgument(attr, arginfo);
+
+			// Keep enum list reference
+			list = arginfo.Enum;
+		}
+
+		// When set up for a universal field
+		public override void SetupField(TypeHandlerAttribute attr, UniversalFieldInfo fieldinfo)
+		{
+			base.SetupField(attr, fieldinfo);
+
+			// Keep enum list reference
+			if(fieldinfo != null) list = fieldinfo.Enum; else list = new EnumList();
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		public override void SetValue(object value)
+		{
+			this.value = null;
+
+			// Input null?
+			if(value == null)
+			{
+				this.value = new EnumItem("", "");
+			}
+			else
+			{
+				// No match found yet?
+				if(this.value == null)
+				{
+					// First try to match the value against the enum values
+					foreach(EnumItem item in list)
+					{
+						// Matching value?
+						if(item.Value == value.ToString())
+						{
+							// Set this value
+							this.value = item;
+						}
+					}
+				}
+
+				// No match found yet?
+				if(this.value == null)
+				{
+					// Try to match against the titles
+					foreach(EnumItem item in list)
+					{
+						// Matching value?
+						if(item.Title.ToLowerInvariant() == value.ToString().ToLowerInvariant())
+						{
+							// Set this value
+							this.value = item;
+						}
+					}
+				}
+
+				// Still no match found?
+				if(this.value == null)
+				{
+					// Make a dummy value
+					this.value = new EnumItem(value.ToString(), value.ToString());
+				}
+			}
+		}
+
+		//mxd
+		public override void SetDefaultValue() 
+		{
+			value = defaultValue;
+		}
+
+		public override object GetValue()
+		{
+			if(this.value != null) return this.value.Value; else return "";
+		}
+
+		public override int GetIntValue()
+		{
+			if(this.value != null)
+			{
+				// Parse the value to integer
+				int result;
+				if(int.TryParse(this.value.Value, NumberStyles.Integer,
+								CultureInfo.InvariantCulture, out result))
+				{
+					return result;
+				}
+				else
+				{
+					return 0;
+				}
+			}
+			else
+			{
+				return 0;
+			}
+		}
+
+		public override string GetStringValue()
+		{
+			if(this.value != null) return this.value.Title; else return "NULL";
+		}
+
+		// This returns an enum list
+		public override EnumList GetEnumList()
+		{
+			return list;
+		}
+
+		// This returns the type to display for fixed fields
+		// Must be a custom usable type
+		public override TypeHandlerAttribute GetDisplayType()
+		{
+			return General.Types.GetAttribute((int)UniversalType.String);
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Types/FlatHandler.cs b/Source/Core/Types/FlatHandler.cs
new file mode 100644
index 0000000..339ac1f
--- /dev/null
+++ b/Source/Core/Types/FlatHandler.cs
@@ -0,0 +1,75 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Drawing;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Windows;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Types
+{
+	[TypeHandler(UniversalType.Flat, "Flat", true)]
+	internal class FlatHandler : TypeHandler
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		private string value = "";
+
+		#endregion
+
+		#region ================== Properties
+
+		public override bool IsBrowseable { get { return true; } }
+
+		public override Image BrowseImage { get { return Properties.Resources.List_Images; } }
+		
+		#endregion
+
+		#region ================== Methods
+
+		public override void Browse(IWin32Window parent)
+		{
+			this.value = TextureBrowserForm.Browse(parent, this.value, true); //mxd. was FlatBrowserForm
+		}
+
+		public override void SetValue(object value)
+		{
+			if(value != null)
+				this.value = value.ToString();
+			else
+				this.value = "";
+		}
+
+		public override object GetValue()
+		{
+			return this.value;
+		}
+
+		public override string GetStringValue()
+		{
+			return this.value;
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Types/FloatHandler.cs b/Source/Core/Types/FloatHandler.cs
new file mode 100644
index 0000000..4cb05ed
--- /dev/null
+++ b/Source/Core/Types/FloatHandler.cs
@@ -0,0 +1,90 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Globalization;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Types
+{
+	[TypeHandler(UniversalType.Float, "Decimal", true)]
+	internal class FloatHandler : TypeHandler
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		private float value;
+
+		#endregion
+
+		#region ================== Properties
+
+		#endregion
+
+		#region ================== Methods
+
+		public override void SetValue(object value)
+		{
+			// Null?
+			if(value == null)
+			{
+				this.value = 0.0f;
+			}
+			// Compatible type?
+			else if((value is int) || (value is float) || (value is bool))
+			{
+				// Set directly
+				this.value = Convert.ToSingle(value);
+			}
+			else
+			{
+				// Try parsing as string
+				float result;
+				if(float.TryParse(value.ToString(), NumberStyles.Float, CultureInfo.CurrentCulture, out result))
+				{
+					this.value = result;
+				}
+				else
+				{
+					this.value = 0.0f;
+				}
+			}
+		}
+
+		public override object GetValue()
+		{
+			return this.value;
+		}
+
+		public override int GetIntValue()
+		{
+			return (int)this.value;
+		}
+
+		public override string GetStringValue()
+		{
+			return this.value.ToString();
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Types/IntegerHandler.cs b/Source/Core/Types/IntegerHandler.cs
new file mode 100644
index 0000000..c6fab35
--- /dev/null
+++ b/Source/Core/Types/IntegerHandler.cs
@@ -0,0 +1,110 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Globalization;
+using CodeImp.DoomBuilder.Config;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Types
+{
+	[TypeHandler(UniversalType.Integer, "Integer", true)]
+	internal class IntegerHandler : TypeHandler
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		private int value;
+		private int defaultValue; //mxd
+		
+		#endregion
+
+		#region ================== Properties
+
+		#endregion
+
+		#region ================== Methods
+
+		//mxd
+		public override void SetupArgument(TypeHandlerAttribute attr, ArgumentInfo arginfo) 
+		{
+			defaultValue = (int)arginfo.DefaultValue;
+			base.SetupArgument(attr, arginfo);
+		}
+
+		public override void SetValue(object value)
+		{
+			// Null?
+			if(value == null)
+			{
+				this.value = 0;
+			}
+			// Compatible type?
+			else if((value is int) || (value is float) || (value is bool))
+			{
+				// Set directly
+				this.value = Convert.ToInt32(value);
+			}
+			else
+			{
+				// Try parsing as string
+				int result;
+				if(int.TryParse(value.ToString(), NumberStyles.Integer, CultureInfo.CurrentCulture, out result))
+				{
+					this.value = result;
+				}
+				else
+				{
+					this.value = 0;
+				}
+			}
+
+			if(forargument)
+			{
+				this.value = General.Clamp(this.value, General.Map.FormatInterface.MinArgument, General.Map.FormatInterface.MaxArgument);
+			}
+		}
+
+		//mxd
+		public override void SetDefaultValue() 
+		{
+			value = defaultValue;
+		}
+
+		public override object GetValue()
+		{
+			return this.value;
+		}
+		
+		public override int GetIntValue()
+		{
+			return this.value;
+		}
+
+		public override string GetStringValue()
+		{
+			return this.value.ToString();
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Types/LinedefTagHandler.cs b/Source/Core/Types/LinedefTagHandler.cs
new file mode 100644
index 0000000..9cd7c57
--- /dev/null
+++ b/Source/Core/Types/LinedefTagHandler.cs
@@ -0,0 +1,63 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Map;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Types
+{
+	[TypeHandler(UniversalType.LinedefTag, "Linedef Tag", true)]
+	internal class LinedefTagHandler : SectorTagHandler
+	{
+		#region ================== Setup
+
+		protected override EnumList CreateTagList()
+		{
+			//collect tags
+			List<int> tags = new List<int>();
+			HashSet<int> tagshash = new HashSet<int>();
+			EnumList taglist = new EnumList();
+
+			foreach(Linedef l in General.Map.Map.Linedefs)
+			{
+				if(l.Tag == 0 || tagshash.IsSupersetOf(l.Tags)) continue;
+				tags.AddRange(l.Tags);
+				foreach(int i in l.Tags) tagshash.Add(i);
+			}
+
+			//now sort them in descending order
+			tags.Sort((a, b) => -1 * a.CompareTo(b));
+
+			//create enum items
+			foreach(int tag in tags) 
+			{
+				if(General.Map.Options.TagLabels.ContainsKey(tag)) //tag labels
+					taglist.Add(new EnumItem(tag.ToString(), General.Map.Options.TagLabels[tag]));
+				else
+					taglist.Add(new EnumItem(tag.ToString(), tag.ToString()));
+			}
+
+			return taglist;
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Types/LinedefTypeHandler.cs b/Source/Core/Types/LinedefTypeHandler.cs
new file mode 100644
index 0000000..db7c5b9
--- /dev/null
+++ b/Source/Core/Types/LinedefTypeHandler.cs
@@ -0,0 +1,106 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Drawing;
+using System.Globalization;
+using CodeImp.DoomBuilder.Windows;
+using System.Windows.Forms;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Types
+{
+	[TypeHandler(UniversalType.LinedefType, "Linedef Action", true)]
+	internal class LinedefTypeHandler : TypeHandler
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		private int value;
+
+		#endregion
+
+		#region ================== Properties
+
+		public override bool IsBrowseable { get { return true; } }
+
+		public override Image BrowseImage { get { return Properties.Resources.List; } }
+		
+		#endregion
+
+		#region ================== Constructor
+
+		#endregion
+
+		#region ================== Methods
+
+		public override void Browse(IWin32Window parent)
+		{
+			this.value = ActionBrowserForm.BrowseAction(parent, this.value);
+		}
+		
+		public override void SetValue(object value)
+		{
+			// Null?
+			if(value == null)
+			{
+				this.value = 0;
+			}
+			// Compatible type?
+			else if((value is int) || (value is float) || (value is bool))
+			{
+				// Set directly
+				this.value = Convert.ToInt32(value);
+			}
+			else
+			{
+				// Try parsing as string
+				int result;
+				if(int.TryParse(value.ToString(), NumberStyles.Integer, CultureInfo.CurrentCulture, out result))
+				{
+					this.value = result;
+				}
+				else
+				{
+					this.value = 0;
+				}
+			}
+		}
+
+		public override object GetValue()
+		{
+			return this.value;
+		}
+
+		public override int GetIntValue()
+		{
+			return this.value;
+		}
+
+		public override string GetStringValue()
+		{
+			return this.value.ToString();
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Types/NullHandler.cs b/Source/Core/Types/NullHandler.cs
new file mode 100644
index 0000000..2de10e8
--- /dev/null
+++ b/Source/Core/Types/NullHandler.cs
@@ -0,0 +1,68 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Types
+{
+	internal class NullHandler : TypeHandler
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		private object value = 0;
+
+		#endregion
+
+		#region ================== Properties
+
+		#endregion
+
+		#region ================== Methods
+
+		public override void SetValue(object value)
+		{
+			if(value != null)
+				this.value = value;
+			else
+				this.value = 0;
+		}
+
+		public override object GetValue()
+		{
+			return this.value.ToString();
+		}
+
+		public override int GetIntValue()
+		{
+			int result;
+			if(int.TryParse(this.value.ToString(), out result)) return result;
+			return 0;
+		}
+		
+		public override string GetStringValue()
+		{
+			return this.value.ToString();
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Types/RandomFloatHandler.cs b/Source/Core/Types/RandomFloatHandler.cs
new file mode 100644
index 0000000..0d26774
--- /dev/null
+++ b/Source/Core/Types/RandomFloatHandler.cs
@@ -0,0 +1,112 @@
+#region ================== Namespaces
+
+using System;
+using System.Globalization;
+using CodeImp.DoomBuilder.Config;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Types
+{
+	[TypeHandler(UniversalType.RandomFloat, "Decimal (Random)", true)]
+	internal class RandomFloatHandler : TypeHandler
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		private float value;
+		private bool randomValue;
+		private float min;
+		private float max;
+
+		#endregion
+
+		#region ================== Properties
+
+		#endregion
+
+		#region ================== Methods
+
+		public override void SetupArgument(TypeHandlerAttribute attr, ArgumentInfo arginfo) 
+		{
+			base.SetupArgument(attr, arginfo);
+
+			//mxd. We don't want to store this type
+			index = (int)UniversalType.Float;
+		}
+
+		public override void SetupField(TypeHandlerAttribute attr, UniversalFieldInfo fieldinfo) 
+		{
+			base.SetupField(attr, fieldinfo);
+
+			//mxd. We don't want to store this type
+			index = (int)UniversalType.Float;
+		}
+
+		public override void SetValue(object value) 
+		{
+			// Null?
+			if(value == null) 
+			{
+				this.value = 0.0f;
+			}
+			// Compatible type?
+			else if((value is int) || (value is float) || (value is bool)) 
+			{
+				// Set directly
+				this.value = Convert.ToSingle(value);
+			} 
+			else
+			{
+				// Try parsing as string
+				float result;
+				if(float.TryParse(value.ToString(), NumberStyles.Float, CultureInfo.CurrentCulture, out result)) 
+				{
+					this.value = result;
+				} 
+				else 
+				{
+					//mxd. Try to parse value as random range
+					string[] parts = value.ToString().Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
+
+					if(parts.Length == 2) 
+					{
+						if(float.TryParse(parts[0], NumberStyles.Float, CultureInfo.CurrentCulture, out min) &&
+						   float.TryParse(parts[1], NumberStyles.Float, CultureInfo.CurrentCulture, out max)) 
+						{
+							randomValue = (min != max);
+
+							if(min == max) this.value = min;
+							else if(min > max) General.Swap(ref min, ref max);
+						}
+					}
+
+					this.value = 0.0f;
+				}
+			}
+		}
+
+		public override object GetValue() 
+		{
+			if(randomValue)	return General.Random(min, max); //mxd
+			return this.value;
+		}
+
+		public override int GetIntValue() 
+		{
+			if(randomValue)	return (int)General.Random(min, max); //mxd
+			return (int)this.value;
+		}
+
+		public override string GetStringValue() 
+		{
+			if(randomValue) return General.Random(min, max).ToString(CultureInfo.InvariantCulture); //mxd
+			return this.value.ToString(CultureInfo.InvariantCulture);
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Types/RandomIntegerHandler.cs b/Source/Core/Types/RandomIntegerHandler.cs
new file mode 100644
index 0000000..208168d
--- /dev/null
+++ b/Source/Core/Types/RandomIntegerHandler.cs
@@ -0,0 +1,117 @@
+#region ================== Namespaces
+
+using System;
+using System.Globalization;
+using CodeImp.DoomBuilder.Config;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Types
+{
+	[TypeHandler(UniversalType.RandomInteger, "Integer (Random)", true)]
+	internal class RandomIntegerHandler : TypeHandler
+	{
+		#region ================== Variables
+
+		private int value;
+		private int defaultValue; 
+		private bool randomValue; 
+		private int min;
+		private int max;
+
+		#endregion
+
+		#region ================== Properties
+
+		#endregion
+
+		#region ================== Methods
+
+		public override void SetupArgument(TypeHandlerAttribute attr, ArgumentInfo arginfo) 
+		{
+			defaultValue = (int)arginfo.DefaultValue;
+			base.SetupArgument(attr, arginfo);
+
+			//mxd. We don't want to store this type
+			index = (int)UniversalType.Integer;
+		}
+
+		public override void SetupField(TypeHandlerAttribute attr, UniversalFieldInfo fieldinfo) 
+		{
+			base.SetupField(attr, fieldinfo);
+
+			//mxd. We don't want to store this type
+			index = (int)UniversalType.Integer;
+		}
+
+		public override void SetValue(object value) 
+		{
+			// Null?
+			if(value == null) 
+			{
+				this.value = 0;
+			}
+			// Compatible type?
+			else if((value is int) || (value is float) || (value is bool)) 
+			{
+				// Set directly
+				this.value = Convert.ToInt32(value);
+			} 
+			else
+			{
+				// Try parsing as string
+				int result;
+				if(int.TryParse(value.ToString(), NumberStyles.Integer, CultureInfo.CurrentCulture, out result)) 
+				{
+					this.value = result;
+				} 
+				else 
+				{
+					//mxd. Try to parse value as random range
+					string[] parts = value.ToString().Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
+					if(parts.Length == 2) 
+					{
+						if(int.TryParse(parts[0], NumberStyles.Integer, CultureInfo.CurrentCulture, out min) &&
+						   int.TryParse(parts[1], NumberStyles.Integer, CultureInfo.CurrentCulture, out max)) 
+						{
+							randomValue = (min != max);
+							if(min == max) this.value = min;
+							else if(min > max) General.Swap(ref min, ref max);
+						}
+					}
+
+					this.value = 0;
+				}
+			}
+
+			if(forargument)
+				this.value = General.Clamp(this.value, General.Map.FormatInterface.MinArgument, General.Map.FormatInterface.MaxArgument);
+		}
+
+		//mxd
+		public override void SetDefaultValue() 
+		{
+			value = defaultValue;
+		}
+
+		public override object GetValue() 
+		{
+			if(randomValue)	return General.Random(min, max); //mxd
+			return this.value;
+		}
+
+		public override int GetIntValue() 
+		{
+			if(randomValue)	return General.Random(min, max); //mxd
+			return this.value;
+		}
+
+		public override string GetStringValue() 
+		{
+			if(randomValue)	return General.Random(min, max).ToString(CultureInfo.InvariantCulture); //mxd
+			return this.value.ToString(CultureInfo.InvariantCulture);
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Types/SectorEffectHandler.cs b/Source/Core/Types/SectorEffectHandler.cs
new file mode 100644
index 0000000..af18f9b
--- /dev/null
+++ b/Source/Core/Types/SectorEffectHandler.cs
@@ -0,0 +1,106 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Drawing;
+using System.Globalization;
+using CodeImp.DoomBuilder.Windows;
+using System.Windows.Forms;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Types
+{
+	[TypeHandler(UniversalType.SectorEffect, "Sector Effect", true)]
+	internal class SectorEffectHandler : TypeHandler
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		private int value;
+
+		#endregion
+
+		#region ================== Properties
+
+		public override bool IsBrowseable { get { return true; } }
+
+		public override Image BrowseImage { get { return Properties.Resources.List; } }
+		
+		#endregion
+
+		#region ================== Constructor
+
+		#endregion
+
+		#region ================== Methods
+
+		public override void Browse(IWin32Window parent)
+		{
+			this.value = EffectBrowserForm.BrowseEffect(parent, this.value);
+		}
+
+		public override void SetValue(object value)
+		{
+			// Null?
+			if(value == null)
+			{
+				this.value = 0;
+			}
+			// Compatible type?
+			else if((value is int) || (value is float) || (value is bool))
+			{
+				// Set directly
+				this.value = Convert.ToInt32(value);
+			}
+			else
+			{
+				// Try parsing as string
+				int result;
+				if(int.TryParse(value.ToString(), NumberStyles.Integer, CultureInfo.CurrentCulture, out result))
+				{
+					this.value = result;
+				}
+				else
+				{
+					this.value = 0;
+				}
+			}
+		}
+
+		public override object GetValue()
+		{
+			return this.value;
+		}
+
+		public override int GetIntValue()
+		{
+			return this.value;
+		}
+
+		public override string GetStringValue()
+		{
+			return this.value.ToString();
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Types/SectorTagHandler.cs b/Source/Core/Types/SectorTagHandler.cs
new file mode 100644
index 0000000..3f680fa
--- /dev/null
+++ b/Source/Core/Types/SectorTagHandler.cs
@@ -0,0 +1,215 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Map;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Types
+{
+	[TypeHandler(UniversalType.SectorTag, "Sector Tag", true)]
+	internal class SectorTagHandler : IntegerHandler
+	{
+		#region ================== Variables
+
+		private EnumList list;
+		private EnumItem value;
+		private EnumItem defaultvalue;
+
+		#endregion
+
+		#region ================== Properties
+
+		public override bool IsEnumerable { get { return true; } }
+
+		#endregion
+
+		#region ================== Setup
+
+		// When set up for an argument
+		public override void SetupArgument(TypeHandlerAttribute attr, ArgumentInfo arginfo) 
+		{
+			defaultvalue = new EnumItem("0", "0");
+			base.SetupArgument(attr, arginfo);
+
+			// Create enum list reference
+			list = CreateTagList();
+
+			// Add default value
+			list.Insert(0, defaultvalue);
+		}
+
+		// When set up for a universal field
+		public override void SetupField(TypeHandlerAttribute attr, UniversalFieldInfo fieldinfo) 
+		{
+			base.SetupField(attr, fieldinfo);
+
+			// Create enum list reference
+			list = CreateTagList();
+		}
+
+		//mxd
+		protected virtual EnumList CreateTagList() 
+		{
+			//collect tags
+			List<int> tags = new List<int>();
+			HashSet<int> tagshash = new HashSet<int>();
+			EnumList taglist = new EnumList();
+
+			foreach(Sector s in General.Map.Map.Sectors)
+			{
+				if(s.Tag == 0 || tagshash.IsSupersetOf(s.Tags)) continue;
+				tags.AddRange(s.Tags);
+				foreach(int i in s.Tags) tagshash.Add(i);
+			}
+
+			//now sort them in descending order
+			tags.Sort((a, b) => -1 * a.CompareTo(b));
+
+			//create enum items
+			foreach(int tag in tags) 
+			{
+				if(General.Map.Options.TagLabels.ContainsKey(tag)) //tag labels
+					taglist.Add(new EnumItem(tag.ToString(), tag + ": " + General.Map.Options.TagLabels[tag]));
+				else
+					taglist.Add(new EnumItem(tag.ToString(), tag.ToString()));
+			}
+
+			return taglist;
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		public override void SetValue(object value) 
+		{
+			this.value = null;
+
+			// Input null?
+			if(value == null) 
+			{
+				this.value = new EnumItem("0", "0");
+			} 
+			else 
+			{
+				// Compatible type?
+				if((value is int) || (value is float) || (value is bool)) 
+				{
+					int intvalue = Convert.ToInt32(value);
+
+					// First try to match the value against the enum values
+					foreach(EnumItem item in list) 
+					{
+						// Matching value?
+						if(item.GetIntValue() == intvalue) 
+						{
+							// Set this value
+							this.value = item;
+						}
+					}
+				}
+
+				// No match found yet?
+				if(this.value == null) 
+				{
+					// First try to match the value against the enum values
+					foreach(EnumItem item in list) 
+					{
+						// Matching value?
+						if(item.Value == value.ToString()) 
+						{
+							// Set this value
+							this.value = item;
+						}
+					}
+				}
+
+				// No match found yet?
+				if(this.value == null) 
+				{
+					// Try to match against the titles
+					foreach(EnumItem item in list) 
+					{
+						// Matching value?
+						if(item.Title.ToLowerInvariant() == value.ToString().ToLowerInvariant()) 
+						{
+							// Set this value
+							this.value = item;
+						}
+					}
+				}
+
+				// Still no match found?
+				if(this.value == null) 
+				{
+					// Make a dummy value
+					this.value = new EnumItem(value.ToString(), value.ToString());
+					this.value = new EnumItem(this.value.GetIntValue().ToString(CultureInfo.InvariantCulture), value.ToString());
+				}
+			}
+		}
+
+		//mxd
+		public override void SetDefaultValue() 
+		{
+			value = defaultvalue;
+		}
+
+		public override object GetValue() 
+		{
+			return GetIntValue();
+		}
+
+		public override int GetIntValue() 
+		{
+			if(this.value != null) 
+			{
+				// Parse the value to integer
+				int result;
+				return (int.TryParse(this.value.Value, NumberStyles.Integer, 
+					CultureInfo.InvariantCulture, out result) ? result : 0);
+			} 
+			return 0;
+		}
+
+		public override string GetStringValue() 
+		{
+			return (this.value != null ? this.value.Title : "0: No Tag");
+		}
+
+		// This returns an enum list
+		public override EnumList GetEnumList() 
+		{
+			return list;
+		}
+
+		// This returns the type to display for fixed fields
+		// Must be a custom usable type
+		public override TypeHandlerAttribute GetDisplayType() 
+		{
+			return General.Types.GetAttribute((int)UniversalType.Integer);
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Types/StringHandler.cs b/Source/Core/Types/StringHandler.cs
new file mode 100644
index 0000000..9f08dd3
--- /dev/null
+++ b/Source/Core/Types/StringHandler.cs
@@ -0,0 +1,82 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Drawing;
+using CodeImp.DoomBuilder.Windows;
+using System.Windows.Forms;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Types
+{
+	[TypeHandler(UniversalType.String, "Text", true)]
+	internal class StringHandler : TypeHandler
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		private string value = "";
+
+		#endregion
+
+		#region ================== Properties
+
+		public override bool IsBrowseable { get { return true; } }
+
+		public override Image BrowseImage { get { return Properties.Resources.Text; } }
+		
+		#endregion
+
+		#region ================== Methods
+
+		public override void Browse(IWin32Window parent)
+		{
+			value = TextEditForm.ShowDialog(parent, value);
+		}
+
+		public override void SetValue(object value)
+		{
+			if(value != null)
+				this.value = value.ToString().Replace("\"", ""); //mxd
+			else
+				this.value = "";
+		}
+
+		public override object GetValue()
+		{
+			return this.value;
+		}
+
+		public override int GetIntValue()
+		{
+			int result;
+			if(int.TryParse(this.value, out result)) return result;
+				else return 0;
+		}
+
+		public override string GetStringValue()
+		{
+			return this.value;
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Types/TextureHandler.cs b/Source/Core/Types/TextureHandler.cs
new file mode 100644
index 0000000..5f338fe
--- /dev/null
+++ b/Source/Core/Types/TextureHandler.cs
@@ -0,0 +1,75 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Drawing;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Windows;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Types
+{
+	[TypeHandler(UniversalType.Texture, "Texture", true)]
+	internal class TextureHandler : TypeHandler
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		private string value = "";
+
+		#endregion
+
+		#region ================== Properties
+
+		public override bool IsBrowseable { get { return true; } }
+
+		public override Image BrowseImage { get { return Properties.Resources.List_Images; } }
+		
+		#endregion
+
+		#region ================== Methods
+
+		public override void Browse(IWin32Window parent)
+		{
+			this.value = TextureBrowserForm.Browse(parent, this.value, false);
+		}
+
+		public override void SetValue(object value)
+		{
+			if(value != null)
+				this.value = value.ToString();
+			else
+				this.value = "";
+		}
+
+		public override object GetValue()
+		{
+			return this.value;
+		}
+
+		public override string GetStringValue()
+		{
+			return this.value;
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Types/ThingClassHandler.cs b/Source/Core/Types/ThingClassHandler.cs
new file mode 100644
index 0000000..34663f2
--- /dev/null
+++ b/Source/Core/Types/ThingClassHandler.cs
@@ -0,0 +1,96 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Drawing;
+using CodeImp.DoomBuilder.Config;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Windows;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Types
+{
+	[TypeHandler(UniversalType.ThingClass, "Thing Class", true)]
+	internal class ThingClassHandler : TypeHandler
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		private string value = "";
+
+		#endregion
+
+		#region ================== Properties
+
+		public override bool IsBrowseable { get { return true; } }
+
+		public override Image BrowseImage { get { return Properties.Resources.List; } }
+		
+		#endregion
+
+		#region ================== Methods
+
+		public override void Browse(IWin32Window parent)
+		{
+			int tid = 0;
+			
+			// Find the thing with this class name
+			foreach(ThingTypeInfo t in General.Map.Data.ThingTypes)
+			{
+				if((string.Compare(t.ClassName, value, true) == 0)) //mxd
+				{
+					tid = t.Index;
+					break;
+				}
+			}
+			
+			ThingBrowserForm f = new ThingBrowserForm(tid);
+			if(f.ShowDialog(Form.ActiveForm) == DialogResult.OK) 
+			{
+				// Find the class name for this thing
+				ThingTypeInfo t = General.Map.Data.GetThingInfo(f.SelectedType);
+				this.value = !string.IsNullOrEmpty(t.ClassName) ? t.ClassName : ""; //mxd
+			}
+			
+			f.Dispose();
+		}
+
+		public override void SetValue(object value)
+		{
+			if(value != null)
+				this.value = value.ToString();
+			else
+				this.value = "";
+		}
+
+		public override object GetValue()
+		{
+			return this.value;
+		}
+
+		public override string GetStringValue()
+		{
+			return this.value;
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Types/ThingHeightHandler.cs b/Source/Core/Types/ThingHeightHandler.cs
new file mode 100644
index 0000000..82b5989
--- /dev/null
+++ b/Source/Core/Types/ThingHeightHandler.cs
@@ -0,0 +1,5 @@
+namespace CodeImp.DoomBuilder.Types
+{
+	[TypeHandler(UniversalType.ThingHeight, "Thing Height", false)]
+	internal class ThingHeightHandler : IntegerHandler { }
+}
diff --git a/Source/Core/Types/ThingRadiusHandler.cs b/Source/Core/Types/ThingRadiusHandler.cs
new file mode 100644
index 0000000..46f930c
--- /dev/null
+++ b/Source/Core/Types/ThingRadiusHandler.cs
@@ -0,0 +1,5 @@
+namespace CodeImp.DoomBuilder.Types
+{
+	[TypeHandler(UniversalType.ThingRadius, "Thing Radius", false)]
+	internal class ThingRadiusHandler : IntegerHandler { }
+}
diff --git a/Source/Core/Types/ThingTagHandler.cs b/Source/Core/Types/ThingTagHandler.cs
new file mode 100644
index 0000000..80fd08c
--- /dev/null
+++ b/Source/Core/Types/ThingTagHandler.cs
@@ -0,0 +1,61 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Map;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Types
+{
+	[TypeHandler(UniversalType.ThingTag, "Thing Tag", true)]
+	internal class ThingTagHandler : SectorTagHandler
+	{
+		#region ================== Setup
+
+		protected override EnumList CreateTagList() 
+		{
+			//collect tags
+			List<int> tags = new List<int>();
+			EnumList taglist = new EnumList();
+
+			foreach(Thing t in General.Map.Map.Things) 
+			{
+				if(t.Tag == 0 || tags.Contains(t.Tag)) continue;
+				tags.Add(t.Tag);
+			}
+
+			//now sort them in descending order
+			tags.Sort((a, b) => -1 * a.CompareTo(b));
+
+			//create enum items
+			foreach(int tag in tags) 
+			{
+				if(General.Map.Options.TagLabels.ContainsKey(tag)) //tag labels
+					taglist.Add(new EnumItem(tag.ToString(), General.Map.Options.TagLabels[tag]));
+				else
+					taglist.Add(new EnumItem(tag.ToString(), tag.ToString()));
+			}
+
+			return taglist;
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Types/ThingTypeHandler.cs b/Source/Core/Types/ThingTypeHandler.cs
new file mode 100644
index 0000000..9751c5c
--- /dev/null
+++ b/Source/Core/Types/ThingTypeHandler.cs
@@ -0,0 +1,106 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Drawing;
+using System.Globalization;
+using CodeImp.DoomBuilder.Windows;
+using System.Windows.Forms;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Types
+{
+	[TypeHandler(UniversalType.ThingType, "Thing Type", true)]
+	internal class ThingTypeHandler : TypeHandler
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		private int value;
+
+		#endregion
+
+		#region ================== Properties
+
+		public override bool IsBrowseable { get { return true; } }
+
+		public override Image BrowseImage { get { return Properties.Resources.List; } }
+
+		#endregion
+
+		#region ================== Constructor
+
+		#endregion
+
+		#region ================== Methods
+
+		public override void Browse(IWin32Window parent)
+		{
+			this.value = ThingBrowserForm.BrowseThing(parent, this.value);
+		}
+
+		public override void SetValue(object value)
+		{
+			// Null?
+			if(value == null)
+			{
+				this.value = 0;
+			}
+			// Compatible type?
+			else if((value is int) || (value is float) || (value is bool))
+			{
+				// Set directly
+				this.value = Convert.ToInt32(value);
+			}
+			else
+			{
+				// Try parsing as string
+				int result;
+				if(int.TryParse(value.ToString(), NumberStyles.Integer, CultureInfo.CurrentCulture, out result))
+				{
+					this.value = result;
+				}
+				else
+				{
+					this.value = 0;
+				}
+			}
+		}
+
+		public override object GetValue()
+		{
+			return this.value;
+		}
+
+		public override int GetIntValue()
+		{
+			return this.value;
+		}
+
+		public override string GetStringValue()
+		{
+			return this.value.ToString();
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Types/TypeHandler.cs b/Source/Core/Types/TypeHandler.cs
new file mode 100644
index 0000000..db6ad47
--- /dev/null
+++ b/Source/Core/Types/TypeHandler.cs
@@ -0,0 +1,164 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Config;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Types
+{
+	/// <summary>
+	/// Type Handler base class. A Type Handler takes care of editing, validating and
+	/// displaying values of different types for UDMF fields and hexen arguments.
+	/// </summary>
+	internal abstract class TypeHandler
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		protected int index;
+		protected string typename;
+		protected bool customusable;
+		protected bool forargument;
+		protected ArgumentInfo arginfo;
+		protected TypeHandlerAttribute attribute;
+		
+		#endregion
+
+		#region ================== Properties
+
+		public int Index { get { return index; } }
+		public string TypeName { get { return typename; } }
+		public bool IsCustomUsable { get { return customusable; } }
+		public bool IsForArgument { get { return forargument; } }
+		public TypeHandlerAttribute Attribute { get { return attribute; } }
+
+		public virtual bool IsBrowseable { get { return false; } }
+		public virtual bool IsEnumerable { get { return false; } }
+		public virtual bool IsLimitedToEnums { get { return false; } }
+		
+		public virtual Image BrowseImage { get { return null; } }
+
+		#endregion
+
+		#region ================== Constructor
+
+		// This sets up the handler for arguments
+		public virtual void SetupArgument(TypeHandlerAttribute attr, ArgumentInfo arginfo)
+		{
+			// Setup
+			this.forargument = true;
+			this.arginfo = arginfo;
+			if(attr != null)
+			{
+				// Set attributes
+				this.attribute = attr;
+				this.index = attr.Index;
+				this.typename = attr.Name;
+				this.customusable = attr.IsCustomUsable;
+			}
+			else
+			{
+				// Indexless
+				this.attribute = null;
+				this.index = -1;
+				this.typename = "Unknown";
+				this.customusable = false;
+			}
+		}
+
+		// This sets up the handler for arguments
+		public virtual void SetupField(TypeHandlerAttribute attr, UniversalFieldInfo fieldinfo)
+		{
+			// Setup
+			this.forargument = false;
+			if(attr != null)
+			{
+				// Set attributes
+				this.attribute = attr;
+				this.index = attr.Index;
+				this.typename = attr.Name;
+				this.customusable = attr.IsCustomUsable;
+			}
+			else
+			{
+				// Indexless
+				this.attribute = null;
+				this.index = -1;
+				this.typename = "Unknown";
+				this.customusable = false;
+			}
+		}
+		
+		#endregion
+
+		#region ================== Methods
+
+		// This must set the value
+		// How the value is actually validated and stored is up to the implementation
+		public abstract void SetValue(object value);
+
+		//mxd. This should replace current value with the default one
+		public virtual void SetDefaultValue() { }
+
+		// This must return the value as one of the primitive data types
+		// supported by UDMF: int, string, float or bool
+		public abstract object GetValue();
+		
+		// This must return the value as integer (for arguments)
+		public virtual int GetIntValue()
+		{
+			throw new NotImplementedException("Override this method to support it as integer for arguments");
+		}
+
+		// This must return the value as a string for displaying
+		public abstract string GetStringValue();
+
+		// This is called when the user presses the browse button
+		public virtual void Browse(IWin32Window parent)
+		{
+		}
+		
+		// This must returns an enum list when IsEnumerable is true
+		public virtual EnumList GetEnumList()
+		{
+			return new EnumList(); //mxd
+		}
+		
+		// String representation
+		public override string ToString()
+		{
+			return this.GetStringValue();
+		}
+
+		// This returns the type to display for fixed fields
+		// Must be a custom usable type
+		public virtual TypeHandlerAttribute GetDisplayType()
+		{
+			return this.attribute;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Types/TypeHandlerAttribute.cs b/Source/Core/Types/TypeHandlerAttribute.cs
new file mode 100644
index 0000000..3e1243a
--- /dev/null
+++ b/Source/Core/Types/TypeHandlerAttribute.cs
@@ -0,0 +1,72 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Types
+{
+	public class TypeHandlerAttribute : Attribute
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		private readonly int index;
+		private readonly string name;
+		private Type type;
+		private readonly bool customusable;
+		
+		#endregion
+
+		#region ================== Properties
+
+		public int Index { get { return index; } }
+		public string Name { get { return name; } }
+		public bool IsCustomUsable { get { return customusable; } }
+		public Type Type { get { return type; } set { type = value; } }
+		
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		// Constructor
+		public TypeHandlerAttribute(UniversalType index, string name, bool customusable)
+		{
+			// Initialize
+			this.index = (int)index;
+			this.name = name;
+			this.customusable = customusable;
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// String representation
+		public override string ToString()
+		{
+			return name;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Types/TypesManager.cs b/Source/Core/Types/TypesManager.cs
new file mode 100644
index 0000000..46087fa
--- /dev/null
+++ b/Source/Core/Types/TypesManager.cs
@@ -0,0 +1,188 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Config;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Types
+{
+	internal class TypesManager : IDisposable
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		// List of handler types
+		private Dictionary<int, TypeHandlerAttribute> handlertypes;
+		
+		// Disposing
+		private bool isdisposed;
+
+		#endregion
+
+		#region ================== Properties
+
+		public bool IsDisposed { get { return isdisposed; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public TypesManager()
+		{
+			// Initialize
+			handlertypes = new Dictionary<int, TypeHandlerAttribute>();
+
+			// Go for all types in this assembly
+			Type[] types = General.ThisAssembly.GetTypes();
+			foreach(Type tp in types)
+			{
+				// Check if this type is a class
+				if(tp.IsClass && !tp.IsAbstract && !tp.IsArray)
+				{
+					// Check if class has an TypeHandler attribute
+					if(Attribute.IsDefined(tp, typeof(TypeHandlerAttribute), false))
+					{
+						// Add the type to the list
+						object[] attribs = tp.GetCustomAttributes(typeof(TypeHandlerAttribute), false);
+						TypeHandlerAttribute attr = (attribs[0] as TypeHandlerAttribute);
+						attr.Type = tp;
+						handlertypes.Add(attr.Index, attr);
+					}
+				}
+			}
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Disposer
+		public void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Clean up
+				handlertypes.Clear();
+				
+				// Done
+				isdisposed = true;
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This returns the type handler for the given argument
+		public TypeHandler GetArgumentHandler(ArgumentInfo arginfo)
+		{
+			Type t = typeof(NullHandler);
+			TypeHandlerAttribute ta = null;
+			
+			// Do we have a handler type for this?
+			if(handlertypes.ContainsKey(arginfo.Type))
+			{
+				ta = handlertypes[arginfo.Type];
+				t = ta.Type;
+			}
+
+			// Create instance
+			TypeHandler th = (TypeHandler)General.ThisAssembly.CreateInstance(t.FullName);
+			th.SetupArgument(ta, arginfo);
+			return th;
+		}
+
+		// This returns the type handler for a custom universal field
+		public TypeHandler GetFieldHandler(int type, object defaultsetting)
+		{
+			Type t = typeof(NullHandler);
+			TypeHandlerAttribute ta = null;
+
+			// Do we have a handler type for this?
+			if(handlertypes.ContainsKey(type))
+			{
+				ta = handlertypes[type];
+				t = ta.Type;
+			}
+
+			// Create instance
+			TypeHandler th = (TypeHandler)General.ThisAssembly.CreateInstance(t.FullName);
+			th.SetupField(ta, null);
+			th.SetValue(defaultsetting);
+			return th;
+		}
+
+		// This returns the type handler for a given universal field
+		public TypeHandler GetFieldHandler(UniversalFieldInfo fieldinfo)
+		{
+			Type t = typeof(NullHandler);
+			TypeHandlerAttribute ta = null;
+
+			// Do we have a handler type for this?
+			if(handlertypes.ContainsKey(fieldinfo.Type))
+			{
+				ta = handlertypes[fieldinfo.Type];
+				t = ta.Type;
+			}
+
+			// Create instance
+			TypeHandler th = (TypeHandler)General.ThisAssembly.CreateInstance(t.FullName);
+			th.SetupField(ta, fieldinfo);
+			th.SetValue(fieldinfo.Default);
+			return th;
+		}
+		
+		// This returns all custom attributes
+		public TypeHandlerAttribute[] GetCustomUseAttributes()
+		{
+			List<TypeHandlerAttribute> attribs = new List<TypeHandlerAttribute>();
+			foreach(KeyValuePair<int, TypeHandlerAttribute> ta in handlertypes)
+				if(ta.Value.IsCustomUsable) attribs.Add(ta.Value);
+			return attribs.ToArray();
+		}
+
+		// This returns the attribute with the give name
+		public TypeHandlerAttribute GetNamedAttribute(string name)
+		{
+			foreach(KeyValuePair<int, TypeHandlerAttribute> ta in handlertypes)
+			{
+				if(ta.Value.Name == name) return ta.Value;
+			}
+
+			// Nothing found
+			return null;
+		}
+
+		// This returns the attribute with the give type
+		public TypeHandlerAttribute GetAttribute(int type)
+		{
+			// Do we have a handler type for this?
+			if(handlertypes.ContainsKey(type)) return handlertypes[type];
+				else return null;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Types/UniversalType.cs b/Source/Core/Types/UniversalType.cs
new file mode 100644
index 0000000..b39dd35
--- /dev/null
+++ b/Source/Core/Types/UniversalType.cs
@@ -0,0 +1,51 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Types
+{
+	public enum UniversalType
+	{
+		Integer = 0,
+		Float = 1,
+		String = 2,
+		Boolean = 3,
+		LinedefType = 4,
+		SectorEffect = 5,
+		Texture = 6,
+		Flat = 7,
+		AngleDegrees = 8,
+		AngleRadians = 9,
+		Color = 10,
+		EnumOption = 11,
+		EnumBits = 12,
+		SectorTag = 13,
+		ThingTag = 14,
+		LinedefTag = 15,
+		EnumStrings = 16,
+		AngleDegreesFloat = 17,
+		ThingType = 18,
+		ThingClass = 19,
+		RandomInteger = 20, //mxd
+		RandomFloat = 21, //mxd
+		AngleByte = 22, //mxd
+		ThingRadius = 23, //mxd
+		ThingHeight = 24, //mxd
+	}
+}
diff --git a/Source/Core/VisualModes/IVisualPickable.cs b/Source/Core/VisualModes/IVisualPickable.cs
new file mode 100644
index 0000000..8d912db
--- /dev/null
+++ b/Source/Core/VisualModes/IVisualPickable.cs
@@ -0,0 +1,31 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using CodeImp.DoomBuilder.Geometry;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.VisualModes
+{
+	public interface IVisualPickable
+	{
+		bool Selected { get; set; }
+		bool PickFastReject(Vector3D from, Vector3D to, Vector3D dir);
+		bool PickAccurate(Vector3D from, Vector3D to, Vector3D dir, ref float u_ray);
+	}
+}
diff --git a/Source/Core/VisualModes/VisualBlockEntry.cs b/Source/Core/VisualModes/VisualBlockEntry.cs
new file mode 100644
index 0000000..fd42249
--- /dev/null
+++ b/Source/Core/VisualModes/VisualBlockEntry.cs
@@ -0,0 +1,57 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Map;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.VisualModes
+{
+	public sealed class VisualBlockEntry
+	{
+		#region ================== Variables
+		
+		// Members
+		private List<Linedef> lines;
+		private List<Thing> things;
+		private List<Sector> sectors;
+		
+		#endregion
+		
+		#region ================== Properties
+		
+		public List<Linedef> Lines { get { return lines; } }
+		public List<Thing> Things { get { return things; } }
+		public List<Sector> Sectors { get { return sectors; } }
+		
+		#endregion
+		
+		#region ================== Constructor
+		
+		// Constructor for empty block
+		internal VisualBlockEntry()
+		{
+			lines = new List<Linedef>(2);
+			things = new List<Thing>(2);
+			sectors = new List<Sector>(2);
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/VisualModes/VisualBlockMap.cs b/Source/Core/VisualModes/VisualBlockMap.cs
new file mode 100644
index 0000000..02ef0ae
--- /dev/null
+++ b/Source/Core/VisualModes/VisualBlockMap.cs
@@ -0,0 +1,422 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Geometry;
+using System.Drawing;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.VisualModes
+{
+	public sealed class VisualBlockMap
+	{
+		#region ================== Constants
+		
+		public const int BLOCK_SIZE_SHIFT = 7;
+		public const int BLOCK_SIZE = 1 << BLOCK_SIZE_SHIFT;
+		public const float BLOCK_RADIUS = BLOCK_SIZE * Angle2D.SQRT2;
+		
+		#endregion
+		
+		#region ================== Variables
+		
+		// Blocks
+		private Dictionary<ulong, VisualBlockEntry> blockmap;
+		
+		// State
+		private bool isdisposed;
+		
+		#endregion
+		
+		#region ================== Properties
+		
+		public bool IsDisposed { get { return isdisposed; } }
+		
+		#endregion
+		
+		#region ================== Constructor / Disposer
+		
+		// Constructor
+		internal VisualBlockMap()
+		{
+			// Initialize
+			blockmap = new Dictionary<ulong,VisualBlockEntry>();
+		}
+		
+		// Disposer
+		internal void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Clean up
+				blockmap = null;
+				
+				// Done
+				isdisposed = true;
+			}
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+		
+		// This returns the block coordinates
+		public Point GetBlockCoordinates(Vector2D v)
+		{
+			return new Point((int)v.x >> BLOCK_SIZE_SHIFT,
+							 (int)v.y >> BLOCK_SIZE_SHIFT);
+		}
+
+		// This returns the block center in world coordinates
+		public Vector2D GetBlockCenter(Point p)
+		{
+			return new Vector2D((p.X << BLOCK_SIZE_SHIFT) + (BLOCK_SIZE >> 1),
+								(p.Y << BLOCK_SIZE_SHIFT) + (BLOCK_SIZE >> 1));
+		}
+
+		// This returns the key for a block at the given coordinates
+		// TODO: Could we just use the Point struct as key?
+		private static ulong GetBlockKey(Point p)
+		{
+			return unchecked( ((ulong)(uint)p.X << 32) + (uint)p.Y );
+		}
+		
+		// This returns the block with the given coordinates
+		// Creates the block if it doesn't exist yet
+		public VisualBlockEntry GetBlock(Point p)
+		{
+			ulong k = GetBlockKey(p);
+			if(blockmap.ContainsKey(k))
+			{
+				return blockmap[k];
+			}
+			else
+			{
+				return (blockmap[k] = new VisualBlockEntry());
+			}
+		}
+		
+		// This clears the blockmap
+		public void Clear()
+		{
+			blockmap = new Dictionary<ulong,VisualBlockEntry>();
+		}
+		
+		// This returns a range of blocks in a square
+		public List<VisualBlockEntry> GetSquareRange(RectangleF rect)
+		{
+			// Calculate block coordinates
+			Point lt = GetBlockCoordinates(new Vector2D(rect.Left, rect.Top));
+			Point rb = GetBlockCoordinates(new Vector2D(rect.Right, rect.Bottom));
+			
+			// Go through the range to make a list
+			int entriescount = (rb.X - lt.X) * (rb.Y - lt.Y);
+			List<VisualBlockEntry> entries = new List<VisualBlockEntry>(entriescount);
+			for(int x = lt.X; x <= rb.X; x++)
+			{
+				for(int y = lt.Y; y <= rb.Y; y++)
+				{
+					entries.Add(GetBlock(new Point(x, y)));
+				}
+			}
+
+			// Return list
+			return entries;
+		}
+
+		// This returns a range of blocks in a frustum
+		public List<VisualBlockEntry> GetFrustumRange(ProjectedFrustum2D frustum)
+		{
+			// Make square range from frustum circle
+			// This will be the range in which we will test blocks
+			Point lt = GetBlockCoordinates(frustum.Center - frustum.Radius);
+			Point rb = GetBlockCoordinates(frustum.Center + frustum.Radius);
+
+			// Constants we need
+			float blockfrustumdistance2 = (frustum.Radius * frustum.Radius) + (BLOCK_RADIUS * BLOCK_RADIUS);
+			
+			// Go through the range to make a list
+			int entriescount = (rb.X - lt.X) * (rb.Y - lt.Y);
+			List<VisualBlockEntry> entries = new List<VisualBlockEntry>(entriescount);
+			for(int x = lt.X; x <= rb.X; x++)
+			{
+				for(int y = lt.Y; y <= rb.Y; y++)
+				{
+					// First check if the block circle is intersecting the frustum circle
+					Point block = new Point(x, y);
+					Vector2D blockcenter = GetBlockCenter(block);
+					if(Vector2D.DistanceSq(frustum.Center, blockcenter) < blockfrustumdistance2)
+					{
+						// Add the block if the block circle is inside the frustum
+						if(frustum.IntersectCircle(blockcenter, BLOCK_RADIUS)) entries.Add(GetBlock(block));
+					}
+				}
+			}
+			
+			// Return list
+			return entries;
+		}
+
+		// This returns all blocks along the given line
+		public List<VisualBlockEntry> GetLineBlocks(Vector2D v1, Vector2D v2)
+		{
+			// Estimate number of blocks we will go through and create list
+			int entriescount = (int)(Vector2D.ManhattanDistance(v1, v2) * 2.0f) / BLOCK_SIZE;
+			List<VisualBlockEntry> entries = new List<VisualBlockEntry>(entriescount);
+
+			// Find start and end block
+			Point pos = GetBlockCoordinates(v1);
+			Point end = GetBlockCoordinates(v2);
+
+			// Add this block
+			entries.Add(GetBlock(pos));
+
+			// Moving outside the block?
+			if(pos != end)
+			{
+				// Calculate current block edges
+				float cl = pos.X * BLOCK_SIZE;
+				float cr = (pos.X + 1) * BLOCK_SIZE;
+				float ct = pos.Y * BLOCK_SIZE;
+				float cb = (pos.Y + 1) * BLOCK_SIZE;
+
+				// Line directions
+				int dirx = Math.Sign(v2.x - v1.x);
+				int diry = Math.Sign(v2.y - v1.y);
+
+				// Calculate offset and delta movement over x
+				float posx, deltax;
+				if(dirx >= 0)
+				{
+					posx = (cr - v1.x) / (v2.x - v1.x);
+					deltax = BLOCK_SIZE / (v2.x - v1.x);
+				}
+				else
+				{
+					// Calculate offset and delta movement over x
+					posx = (v1.x - cl) / (v1.x - v2.x);
+					deltax = BLOCK_SIZE / (v1.x - v2.x);
+				}
+
+				// Calculate offset and delta movement over y
+				float posy, deltay;
+				if(diry >= 0)
+				{
+					posy = (cb - v1.y) / (v2.y - v1.y);
+					deltay = BLOCK_SIZE / (v2.y - v1.y);
+				}
+				else
+				{
+					posy = (v1.y - ct) / (v1.y - v2.y);
+					deltay = BLOCK_SIZE / (v1.y - v2.y);
+				}
+
+				// Continue while not reached the end
+				while(pos != end)
+				{
+					// Check in which direction to move
+					if(posx < posy)
+					{
+						// Move horizontally
+						posx += deltax;
+						if(pos.X != end.X) pos.X += dirx;
+					}
+					else
+					{
+						// Move vertically
+						posy += deltay;
+						if(pos.Y != end.Y) pos.Y += diry;
+					}
+
+					// Add lines to this block
+					entries.Add(GetBlock(pos));
+				}
+			}
+
+			// Return list
+			return entries;
+		}
+
+		// This puts a thing in the blockmap
+		public void AddThingsSet(ICollection<Thing> things)
+		{
+			foreach(Thing t in things) AddThing(t);
+		}
+		
+		// This puts a thing in the blockmap
+		public void AddThing(Thing t)
+		{
+			//mxd
+			Point p1 = GetBlockCoordinates(new Vector2D(t.Position.x - t.Size, t.Position.y - t.Size));
+			Point p2 = GetBlockCoordinates(new Vector2D(t.Position.x + t.Size, t.Position.y + t.Size));
+			for(int x = p1.X; x <= p2.X; x++)
+			{
+				for(int y = p1.Y; y <= p2.Y; y++)
+				{
+					VisualBlockEntry block = GetBlock(new Point(x, y));
+					block.Things.Add(t);
+				}
+			}
+		}
+
+		// This puts a secotr in the blockmap
+		public void AddSectorsSet(ICollection<Sector> sectors)
+		{
+			foreach(Sector s in sectors) AddSector(s);
+		}
+
+		// This puts a sector in the blockmap
+		public void AddSector(Sector s)
+		{
+			Point p1 = GetBlockCoordinates(new Vector2D(s.BBox.Left, s.BBox.Top));
+			Point p2 = GetBlockCoordinates(new Vector2D(s.BBox.Right, s.BBox.Bottom));
+			for(int x = p1.X; x <= p2.X; x++)
+			{
+				for(int y = p1.Y; y <= p2.Y; y++)
+				{
+					VisualBlockEntry block = GetBlock(new Point(x, y));
+					block.Sectors.Add(s);
+				}
+			}
+		}
+		
+		// This puts a whole set of linedefs in the blocks they cross
+		public void AddLinedefsSet(ICollection<Linedef> lines)
+		{
+			foreach(Linedef l in lines) AddLinedef(l);
+		}
+		
+		// This puts a single linedef in all blocks it crosses
+		public void AddLinedef(Linedef line)
+		{
+			// Get coordinates
+			Vector2D v1 = line.Start.Position;
+			Vector2D v2 = line.End.Position;
+			
+			// Find start and end block
+			Point pos = GetBlockCoordinates(v1);
+			Point end = GetBlockCoordinates(v2);
+			
+			// Horizontal straight line?
+			if(pos.Y == end.Y)
+			{
+				// Simple loop
+				int dirx = Math.Sign(v2.x - v1.x);
+				for(int x = pos.X; x != end.X; x += dirx)
+				{
+					GetBlock(new Point(x, pos.Y)).Lines.Add(line);
+				}
+				GetBlock(end).Lines.Add(line);
+			}
+			// Vertical straight line?
+			else if(pos.X == end.X)
+			{
+				// Simple loop
+				int diry = Math.Sign(v2.y - v1.y);
+				for(int y = pos.Y; y != end.Y; y += diry)
+				{
+					GetBlock(new Point(pos.X, y)).Lines.Add(line);
+				}
+				GetBlock(end).Lines.Add(line);
+			}
+			else
+			{
+				// Add lines to this block
+				GetBlock(pos).Lines.Add(line);
+				
+				// Moving outside the block?
+				if(pos != end)
+				{
+					// Calculate current block edges
+					float cl = pos.X * BLOCK_SIZE;
+					float cr = (pos.X + 1) * BLOCK_SIZE;
+					float ct = pos.Y * BLOCK_SIZE;
+					float cb = (pos.Y + 1) * BLOCK_SIZE;
+					
+					// Line directions
+					int dirx = Math.Sign(v2.x - v1.x);
+					int diry = Math.Sign(v2.y - v1.y);
+					
+					// Calculate offset and delta movement over x
+					float posx, deltax;
+					if(dirx == 0)
+					{
+						posx = float.MaxValue;
+						deltax = float.MaxValue;
+					}
+					else if(dirx > 0)
+					{
+						posx = (cr - v1.x) / (v2.x - v1.x);
+						deltax = BLOCK_SIZE / (v2.x - v1.x);
+					}
+					else
+					{
+						// Calculate offset and delta movement over x
+						posx = (v1.x - cl) / (v1.x - v2.x);
+						deltax = BLOCK_SIZE / (v1.x - v2.x);
+					}
+					
+					// Calculate offset and delta movement over y
+					float posy, deltay;
+					if(diry == 0)
+					{
+						posy = float.MaxValue;
+						deltay = float.MaxValue;
+					}
+					else if(diry > 0)
+					{
+						posy = (cb - v1.y) / (v2.y - v1.y);
+						deltay = BLOCK_SIZE / (v2.y - v1.y);
+					}
+					else
+					{
+						posy = (v1.y - ct) / (v1.y - v2.y);
+						deltay = BLOCK_SIZE / (v1.y - v2.y);
+					}
+					
+					// Continue while not reached the end
+					while(pos != end)
+					{
+						// Check in which direction to move
+						if(posx < posy)
+						{
+							// Move horizontally
+							posx += deltax;
+							if(pos.X != end.X) pos.X += dirx;
+						}
+						else
+						{
+							// Move vertically
+							posy += deltay;
+							if(pos.Y != end.Y) pos.Y += diry;
+						}
+						
+						// Add lines to this block
+						GetBlock(pos).Lines.Add(line);
+					}
+				}
+			}
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/VisualModes/VisualCamera.cs b/Source/Core/VisualModes/VisualCamera.cs
new file mode 100644
index 0000000..1218292
--- /dev/null
+++ b/Source/Core/VisualModes/VisualCamera.cs
@@ -0,0 +1,181 @@
+#region ================== Namespaces
+
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Map;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.VisualModes
+{
+	/// <summary>
+	/// This class provides the camera in Visual Mode
+	/// </summary>
+	public class VisualCamera
+	{
+		#region ================== Constants
+
+		private const float ANGLE_FROM_MOUSE = 0.0001f;
+		public const float MAX_ANGLEZ_LOW = 91f / Angle2D.PIDEG;
+		public const float MAX_ANGLEZ_HIGH = (360f - 91f) / Angle2D.PIDEG;
+		public const float THING_Z_OFFSET = 41.0f;
+		
+		#endregion
+
+		#region ================== Variables
+
+		// Properties
+		private Vector3D position;
+		private Vector3D target;
+		private Vector3D movemultiplier;
+		private float anglexy, anglez;
+		private Sector sector;
+		private float gravity = 1.0f; //mxd
+		
+		#endregion
+
+		#region ================== Properties
+
+		public Vector3D Position { get { return position; } set { position = value; } }
+		public Vector3D Target { get { return target; } }
+		public float AngleXY { get { return anglexy; } set { anglexy = value; } }
+		public float AngleZ { get { return anglez; } set { anglez = value; } }
+		public Sector Sector { get { return sector; } internal set { sector = value; UpdateGravity(); } } //mxd
+		public Vector3D MoveMultiplier { get { return movemultiplier; } set { movemultiplier = value; } }
+		public float Gravity { get { return gravity; } } //mxd
+		
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		// Constructor
+		public VisualCamera()
+		{
+			// Initialize
+			movemultiplier = new Vector3D(1.0f, 1.0f, 1.0f);
+			anglexy = 0.0f;
+			anglez = Angle2D.PI;
+			sector = null;
+			
+			PositionAtThing();
+		}
+		
+		#endregion
+
+		#region ================== Methods
+
+		// Mouse input
+		internal void ProcessMouseInput(Vector2D delta)
+		{
+			// Change camera angles with the mouse changes
+			anglexy -= delta.x * ANGLE_FROM_MOUSE;
+			if(General.Settings.InvertYAxis)
+				anglez -= delta.y * ANGLE_FROM_MOUSE;
+			else
+				anglez += delta.y * ANGLE_FROM_MOUSE;
+
+			// Normalize angles
+			anglexy = Angle2D.Normalized(anglexy);
+			anglez = Angle2D.Normalized(anglez);
+
+			// Limit vertical angle
+			if(anglez < MAX_ANGLEZ_LOW) anglez = MAX_ANGLEZ_LOW;
+			if(anglez > MAX_ANGLEZ_HIGH) anglez = MAX_ANGLEZ_HIGH;
+		}
+
+		// Key input
+		internal void ProcessMovement(Vector3D deltavec)
+		{
+			// Calculate camera direction vectors
+			Vector3D camvec = Vector3D.FromAngleXYZ(anglexy, anglez);
+
+			// Position the camera
+			position += deltavec;
+			
+			// Target the camera
+			target = position + camvec;
+		}
+
+		// This applies the position and angle from the 3D Camera Thing
+		// Returns false when it couldn't find a 3D Camera Thing
+		public virtual bool PositionAtThing()
+		{
+			if(General.Settings.GZSynchCameras) return true; //mxd
+			Thing modething = null;
+
+			// Find a 3D Mode thing
+			foreach(Thing t in General.Map.Map.Things)
+			{
+				if(t.Type == General.Map.Config.Start3DModeThingType)
+				{
+					modething = t;
+					break; //mxd
+				}
+			}
+
+			// Found one?
+			if(modething != null)
+			{
+				modething.DetermineSector();
+				float z = modething.Position.z;
+				if(modething.Sector != null) z += modething.Sector.FloorHeight;
+				
+				// Position camera here
+				Vector3D wantedposition = new Vector3D(modething.Position.x, modething.Position.y, z + THING_Z_OFFSET);
+				Vector3D delta = position - wantedposition;
+				if(delta.GetLength() > 1.0f) position = wantedposition;
+				
+				// Change angle
+				float wantedanglexy = modething.Angle + Angle2D.PI;
+				if(anglexy != wantedanglexy)
+				{
+					anglexy = wantedanglexy;
+					anglez = Angle2D.PI;
+				}
+				return true;
+			}
+
+			return false;
+		}
+		
+		// This applies the camera position and angle to the 3D Camera Thing
+		// Returns false when it couldn't find a 3D Camera Thing
+		public virtual bool ApplyToThing()
+		{
+			if(General.Settings.GZSynchCameras) return true; //mxd
+			Thing modething = null;
+			
+			// Find a 3D Mode thing
+			foreach(Thing t in General.Map.Map.Things)
+			{
+				if(t.Type == General.Map.Config.Start3DModeThingType)
+				{
+					modething = t;
+					break; //mxd
+				}
+			}
+
+			// Found one?
+			if(modething != null)
+			{
+				int z = (int)position.z; //mxd
+				if(sector != null) z -= sector.FloorHeight;
+
+				// Position the thing to match camera
+				modething.Move((int)position.x, (int)position.y, z - THING_Z_OFFSET);
+				modething.Rotate(anglexy - Angle2D.PI);
+				return true;
+			}
+
+			return false;
+		}
+
+		//mxd
+		private void UpdateGravity() 
+		{
+			if(!General.Map.UDMF || sector == null) return;
+			gravity = sector.Fields.GetValue("gravity", 1.0f);
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/VisualModes/VisualGeometry.cs b/Source/Core/VisualModes/VisualGeometry.cs
new file mode 100644
index 0000000..9ef92b6
--- /dev/null
+++ b/Source/Core/VisualModes/VisualGeometry.cs
@@ -0,0 +1,283 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Data;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.GZBuilder.Data; //mxd
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using SlimDX;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.VisualModes
+{
+	public abstract class VisualGeometry : IVisualPickable
+	{
+		#region ================== Constants
+
+		public const float FOG_DENSITY_SCALER = -1.442692f / 256000f; //-1.442692f / 64000f; //mxd
+
+		#endregion
+
+		#region ================== Variables
+
+		// Texture
+		private ImageData texture;
+		
+		// Vertices
+		private WorldVertex[] vertices;
+		private int triangles;
+		
+		// Selected?
+		protected bool selected;
+		
+		// Elements that this geometry is bound to
+		// Only the sector is required, sidedef is only for walls
+		private VisualSector sector;
+		private Sidedef sidedef;
+
+		/// <summary>
+		/// Absolute intersecting coordinates are set during object picking. This is not set if the geometry is not bound to a sidedef.
+		/// </summary>
+		protected Vector3D pickintersect;
+
+		/// <summary>
+		/// Distance unit along the object picking ray is set during object picking. (0.0 is at camera, 1.0f is at far plane) This is not set if the geometry is not bound to a sidedef.
+		/// </summary>
+		protected float pickrayu;
+		
+		// Rendering
+		private RenderPass renderpass = RenderPass.Solid;
+		protected float fogfactor;
+		
+		// Sector buffer info
+		private int vertexoffset;
+
+		//mxd
+		private Vector3D[] boundingBox;
+		protected VisualGeometryType geometrytype;
+		protected string partname; //UDMF part name
+		
+		#endregion
+
+		#region ================== Properties
+		
+		// Internal properties
+		public WorldVertex[] Vertices { get { return vertices; } } //mxd
+		internal int VertexOffset { get { return vertexoffset; } set { vertexoffset = value; } }
+		internal int Triangles { get { return triangles; } }
+
+		//mxd
+		public Vector3D[] BoundingBox { get { return boundingBox; } }
+		public VisualGeometryType GeometryType { get { return geometrytype; } }
+		public float FogFactor { get { return fogfactor; } set { fogfactor = value; } }
+
+		/// <summary>
+		/// Render pass in which this geometry must be rendered. Default is Solid.
+		/// </summary>
+		public RenderPass RenderPass { get { return renderpass; } set { renderpass = value; } }
+
+		/// <summary>
+		/// Image to use as texture on this geometry.
+		/// </summary>
+		public ImageData Texture { get { return texture; } set { texture = value; } }
+
+		/// <summary>
+		/// Returns the VisualSector this geometry has been added to.
+		/// </summary>
+		public VisualSector Sector { get { return sector; } internal set { sector = value; } }
+		
+		/// <summary>
+		/// Returns the Sidedef that this geometry is created for. Null for geometry that is sector-wide.
+		/// </summary>
+		public Sidedef Sidedef { get { return sidedef; } }
+
+		/// <summary>
+		/// Selected or not? This is only used by the core to determine what color to draw it with.
+		/// </summary>
+		public bool Selected { get { return selected; } set { selected = value; } }
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+		
+		/// <summary>
+		/// This creates sector-global visual geometry. This geometry is always visible when any of the sector is visible.
+		/// </summary>
+		protected VisualGeometry(VisualSector vs)
+		{
+			this.sector = vs;
+			this.geometrytype = VisualGeometryType.UNKNOWN; //mxd
+		}
+
+		/// <summary>
+		/// This creates visual geometry that is bound to a sidedef. This geometry is only visible when the sidedef is visible. It is automatically back-face culled during rendering and automatically XY intersection tested as well as back-face culled during object picking.
+		/// </summary>
+		/// <param name="sd"></param>
+		protected VisualGeometry(VisualSector vs, Sidedef sd)
+		{
+			this.sector = vs;
+			this.sidedef = sd;
+			this.geometrytype = VisualGeometryType.UNKNOWN; //mxd
+		}
+
+		#endregion
+
+		#region ================== Methods
+		
+		// This sets the vertices for this geometry
+		protected void SetVertices(ICollection<WorldVertex> verts)
+		{
+			// Copy vertices
+			if(verts != null) //mxd
+			{ 
+				vertices = new WorldVertex[verts.Count];
+				verts.CopyTo(vertices, 0);
+				triangles = vertices.Length / 3;
+
+				CalculateNormals(); //mxd
+			} 
+			else 
+			{
+				vertices = null;
+				triangles = 0;
+			}
+
+			if(sector != null) sector.NeedsUpdateGeo = true;
+		}
+
+		//mxd. Normals calculation algorithm taken from OpenGl wiki 
+		private void CalculateNormals() 
+		{
+			if(triangles == 0) return;
+
+			BoundingBoxSizes bbs = new BoundingBoxSizes(vertices[0]);
+			for(int i = 0; i < triangles; i++) 
+			{
+				int startindex = i * 3;
+				WorldVertex p1 = vertices[startindex];
+				WorldVertex p2 = vertices[startindex + 1];
+				WorldVertex p3 = vertices[startindex + 2];
+
+				Vector3 U = new Vector3(p2.x - p1.x, p2.y - p1.y, p2.z - p1.z);
+				Vector3 V = new Vector3(p3.x - p1.x, p3.y - p1.y, p3.z - p1.z);
+
+				p1.nx = p2.nx = p3.nx = -(U.Y * V.Z - U.Z * V.Y);
+				p1.ny = p2.ny = p3.ny = -(U.Z * V.X - U.X * V.Z);
+				p1.nz = p2.nz = p3.nz = -(U.X * V.Y - U.Y * V.X);
+
+				vertices[startindex] = p1;
+				vertices[startindex + 1] = p2;
+				vertices[startindex + 2] = p3;
+
+				BoundingBoxTools.UpdateBoundingBoxSizes(ref bbs, p1);
+				BoundingBoxTools.UpdateBoundingBoxSizes(ref bbs, p2);
+				BoundingBoxTools.UpdateBoundingBoxSizes(ref bbs, p3);
+			}
+
+			boundingBox = BoundingBoxTools.CalculateBoundingPlane(bbs);
+		}
+
+		//mxd. Calculate fogdistance
+		//TODO: this doesn't match any GZDoom light mode...
+		//GZDoom: gl_renderstate.h, SetFog();
+		//GZDoom: gl_lightlevel.cpp gl_SetFog();
+		protected float CalculateFogDensity(int brightness)
+		{
+			float density;
+			if(Sector.Sector.UsesOutsideFog && General.Map.Data.MapInfo.OutsideFogDensity > 0)
+			{
+				density = General.Map.Data.MapInfo.OutsideFogDensity;
+			}
+			else if(!Sector.Sector.UsesOutsideFog && General.Map.Data.MapInfo.FogDensity > 0)
+			{
+				density = General.Map.Data.MapInfo.FogDensity;
+			}
+			else if(brightness < 248)
+			{
+				density = General.Clamp(255 - brightness, 30, 255);
+			}
+			else
+			{
+				density = 0f;
+			}
+
+			if(Sector.Sector.HasFogColor)
+			{
+				density *= 4;
+			}
+
+			return density * FOG_DENSITY_SCALER;
+		}
+
+		//mxd. Used to get proper sector from 3d-floors
+		public virtual Sector GetControlSector() 
+		{
+			return sector.Sector;
+		}
+
+		//mxd. Used to get proper linedef from 3d-floors
+		public virtual Linedef GetControlLinedef() 
+		{
+			return sidedef.Line;
+		}
+
+		// This keeps the results for a sidedef intersection
+		internal void SetPickResults(Vector3D intersect, float u)
+		{
+			this.pickintersect = intersect;
+			this.pickrayu = u;
+		}
+		
+		/// <summary>
+		/// This is called when the geometry must be tested for line intersection. This should reject
+		/// as fast as possible to rule out all geometry that certainly does not touch the line.
+		/// </summary>
+		public virtual bool PickFastReject(Vector3D from, Vector3D to, Vector3D dir)
+		{
+			return false;
+		}
+		
+		/// <summary>
+		/// This is called when the geometry must be tested for line intersection. This should perform
+		/// accurate hit detection and set u_ray to the position on the ray where this hits the geometry.
+		/// </summary>
+		public virtual bool PickAccurate(Vector3D from, Vector3D to, Vector3D dir, ref float u_ray)
+		{
+			return false;
+		}
+
+		#endregion
+	}
+
+	//mxd
+	public enum VisualGeometryType
+	{
+		FLOOR,
+		CEILING,
+		WALL_UPPER,
+		WALL_MIDDLE,
+		WALL_MIDDLE_3D,
+		WALL_LOWER,
+		FOG_BOUNDARY,
+		UNKNOWN,
+	}
+}
diff --git a/Source/Core/VisualModes/VisualMode.cs b/Source/Core/VisualModes/VisualMode.cs
new file mode 100644
index 0000000..4ba286b
--- /dev/null
+++ b/Source/Core/VisualModes/VisualMode.cs
@@ -0,0 +1,1172 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Windows;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Actions;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Editing;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.VisualModes
+{
+	/// <summary>
+	/// Provides specialized functionality for a visual (3D) Doom Builder editing mode.
+	/// </summary>
+	public abstract class VisualMode : EditMode
+	{
+		#region ================== Constants
+
+		private const float MOVE_SPEED_MULTIPLIER = 0.001f;
+		
+		#endregion
+
+		#region ================== Variables
+		
+		// Graphics
+		protected IRenderer3D renderer;
+		
+		// Options
+		private bool processgeometry;
+		private bool processthings;
+		
+		// Input
+		private bool keyforward;
+		private bool keybackward;
+		private bool keyleft;
+		private bool keyright;
+		private bool keyup;
+		private bool keydown;
+
+		//mxd
+		private List<VisualThing> selectedVisualThings;
+		private List<VisualSector> selectedVisualSectors;
+		protected Dictionary<Vertex, VisualVertexPair> vertices;
+		private static Vector2D initialcameraposition;
+		//used in "Play From Here" Action
+		private Thing playerStart;
+		private Vector3D playerStartPosition;
+		private float playerStartAngle;
+
+		// Map
+		protected VisualBlockMap blockmap;
+		protected Dictionary<Thing, VisualThing> allthings;
+		protected Dictionary<Sector, VisualSector> allsectors;
+		protected List<VisualBlockEntry> visibleblocks;
+		protected List<VisualThing> visiblethings;
+		protected Dictionary<Sector, VisualSector> visiblesectors;
+		protected List<VisualGeometry> visiblegeometry;
+		
+		#endregion
+
+		#region ================== Properties
+
+		public bool ProcessGeometry { get { return processgeometry; } set { processgeometry = value; } }
+		public bool ProcessThings { get { return processthings; } set { processthings = value; } }
+		public VisualBlockMap BlockMap { get { return blockmap; } }
+		public Dictionary<Vertex, VisualVertexPair> VisualVertices { get { return vertices; } } //mxd
+
+		// Rendering
+		public IRenderer3D Renderer { get { return renderer; } }
+		
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		/// <summary>
+		/// Provides specialized functionality for a visual (3D) Doom Builder editing mode.
+		/// </summary>
+		protected VisualMode()
+		{
+			// Initialize
+			this.renderer = General.Map.Renderer3D;
+			this.blockmap = new VisualBlockMap();
+			this.allsectors = new Dictionary<Sector, VisualSector>(General.Map.Map.Sectors.Count);
+			this.allthings = new Dictionary<Thing,VisualThing>(General.Map.Map.Things.Count);
+			this.visibleblocks = new List<VisualBlockEntry>();
+			this.visiblesectors = new Dictionary<Sector, VisualSector>(50);
+			this.visiblegeometry = new List<VisualGeometry>(200);
+			this.visiblethings = new List<VisualThing>(100);
+			this.processgeometry = true;
+			this.processthings = true;
+			this.vertices = new Dictionary<Vertex, VisualVertexPair>(); //mxd
+
+			//mxd. Synch camera position to cursor position or center of the screen in 2d-mode
+			if(General.Settings.GZSynchCameras && General.Editing.Mode is ClassicMode) 
+			{
+				ClassicMode oldmode = General.Editing.Mode as ClassicMode;
+
+				if(oldmode.IsMouseInside)
+					initialcameraposition = new Vector2D(oldmode.MouseMapPos.x, oldmode.MouseMapPos.y);
+				else
+					initialcameraposition = new Vector2D(General.Map.CRenderer2D.Viewport.Left + General.Map.CRenderer2D.Viewport.Width / 2.0f, General.Map.CRenderer2D.Viewport.Top + General.Map.CRenderer2D.Viewport.Height / 2.0f);
+			}
+		}
+		
+		// Disposer
+		public override void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Clean up
+				foreach(KeyValuePair<Sector, VisualSector> s in allsectors) s.Value.Dispose();
+				blockmap.Dispose();
+				visiblesectors = null;
+				visiblegeometry = null;
+				visibleblocks = null;
+				visiblethings = null;
+				allsectors = null;
+				allthings = null;
+				blockmap = null;
+
+				//mxd
+				selectedVisualSectors = null;
+				selectedVisualThings = null;
+				
+				// Done
+				base.Dispose();
+			}
+		}
+
+		#endregion
+
+		#region ================== Start / Stop
+
+		// Mode is engaged
+		public override void OnEngage()
+		{
+			base.OnEngage();
+
+			// Update projection (mxd)
+			General.Map.CRenderer3D.CreateProjection();
+			
+			// Update the used textures
+			General.Map.Data.UpdateUsedTextures();
+			
+			// Fill the blockmap
+			FillBlockMap();
+
+			//mxd. Synch camera position to cursor position or center of the screen in 2d-mode
+			if(General.Settings.GZSynchCameras) 
+			{
+				//If initial position is inside or nearby a sector - adjust camera.z accordingly
+				float posz = General.Map.VisualCamera.Position.z;
+				Sector nearestsector = General.Map.Map.GetSectorByCoordinates(initialcameraposition, blockmap);
+
+				if(nearestsector == null)
+				{
+					Linedef nearestline = MapSet.NearestLinedef(General.Map.Map.Linedefs, initialcameraposition);
+					if(nearestline != null) 
+					{
+						float side = nearestline.SideOfLine(initialcameraposition);
+						Sidedef nearestside = (side < 0.0f ? nearestline.Front : nearestline.Back) ?? (side < 0.0f ? nearestline.Back : nearestline.Front);
+						if(nearestside != null) nearestsector = nearestside.Sector;
+					}
+				}
+
+				if(nearestsector != null) 
+				{
+					int sectorheight = nearestsector.CeilHeight - nearestsector.FloorHeight;
+					if(General.Map.VisualCamera.Position.z < nearestsector.FloorHeight + 41) 
+					{
+						if(sectorheight < 41)
+							posz = nearestsector.FloorHeight + sectorheight / 2;
+						else
+							posz = nearestsector.FloorHeight + 41; // same as in doom
+					} 
+					else if(General.Map.VisualCamera.Position.z > nearestsector.CeilHeight) 
+					{
+						if(sectorheight < 41)
+							posz = nearestsector.FloorHeight + sectorheight / 2;
+						else
+							posz = nearestsector.CeilHeight - 4;
+					}
+				}
+
+				General.Map.VisualCamera.Position = new Vector3D(initialcameraposition.x, initialcameraposition.y, posz);
+			} 
+			else 
+			{
+				General.Map.VisualCamera.PositionAtThing();
+			}
+			
+			// Start special input mode
+			General.Interface.EnableProcessing();
+			General.Interface.StartExclusiveMouseInput();
+		}
+
+		// Mode is disengaged
+		public override void OnDisengage()
+		{
+			base.OnDisengage();
+			
+			// Dispose
+			foreach(KeyValuePair<Sector, VisualSector> vs in allsectors)
+				if(vs.Value != null) vs.Value.Dispose();
+
+			// Dispose
+			foreach(KeyValuePair<Thing, VisualThing> vt in allthings)
+				if(vt.Value != null) vt.Value.Dispose();	
+			
+			// Apply camera position to thing
+			General.Map.VisualCamera.ApplyToThing();
+			
+			// Do not leave the sector on the camera
+			General.Map.VisualCamera.Sector = null;
+
+			//mxd
+			selectedVisualSectors = null;
+			selectedVisualThings = null;
+			
+			// Stop special input mode
+			General.Interface.DisableProcessing();
+			General.Interface.StopExclusiveMouseInput();
+		}
+
+		#endregion
+
+		#region ================== Events
+
+		public override bool OnUndoBegin()
+		{
+			renderer.SetCrosshairBusy(true);
+			General.Interface.RedrawDisplay();
+			return base.OnUndoBegin();
+		}
+
+		public override void OnUndoEnd()
+		{
+			base.OnUndoEnd();
+			ResourcesReloadedPartial();
+			renderer.SetCrosshairBusy(false);
+		}
+
+		public override bool OnRedoBegin()
+		{
+			renderer.SetCrosshairBusy(true);
+			General.Interface.RedrawDisplay();
+			return base.OnRedoBegin();
+		}
+
+		public override void OnRedoEnd()
+		{
+			base.OnRedoEnd();
+			ResourcesReloadedPartial();
+			renderer.SetCrosshairBusy(false);
+		}
+
+		public override void OnReloadResources()
+		{
+			base.OnReloadResources();
+			ResourcesReloaded();
+		}
+
+		//mxd
+		public override bool OnMapTestBegin(bool testFromCurrentPosition) 
+		{
+			if(testFromCurrentPosition) 
+			{
+				//find Single Player Start. Should have Type 1 in all games
+				Thing start = null;
+				foreach(Thing t in General.Map.Map.Things) 
+				{
+					if(t.Type == 1) 
+					{
+						//store thing and position
+						start = t;
+						break;
+					}
+				}
+
+				if(start == null) 
+				{
+					General.MainWindow.DisplayStatus(StatusType.Warning, "Can't test from current position: no Player 1 start found!");
+					return false;
+				}
+
+				//now check if camera is located inside a sector
+				Vector3D camPos = General.Map.VisualCamera.Position;
+				Sector s = General.Map.Map.GetSectorByCoordinates(new Vector2D(camPos.x, camPos.y), blockmap);
+
+				if(s == null) 
+				{
+					General.MainWindow.DisplayStatus(StatusType.Warning, "Can't test from current position: cursor is not inside sector!");
+					return false;
+				}
+
+				//41 = player's height in Doom. Is that so in all other games as well?
+				if(s.CeilHeight - s.FloorHeight < 41) 
+				{
+					General.MainWindow.DisplayStatus(StatusType.Warning, "Can't test from current position: sector is too low!");
+					return false;
+				}
+
+				//check camera Z
+				float pz = camPos.z - s.FloorHeight;
+				int ceilRel = s.CeilHeight - s.FloorHeight - 41; //relative ceiling height
+				if(pz > ceilRel) pz = ceilRel; //above ceiling?
+				else if(pz < 0) pz = 0; //below floor?
+
+				//store initial position
+				playerStart = start;
+				playerStartPosition = start.Position;
+				playerStartAngle = start.Angle;
+
+				//everything should be valid, let's move player start here
+				start.Move(new Vector3D(camPos.x, camPos.y, pz));
+				start.Rotate(General.Map.VisualCamera.AngleXY - Angle2D.PI);// (float)Math.PI);
+			}
+			return true;
+		}
+
+		//mxd
+		public override void OnMapTestEnd(bool testFromCurrentPosition) 
+		{
+			if(testFromCurrentPosition) 
+			{
+				//restore position
+				playerStart.Move(playerStartPosition);
+				playerStart.Rotate(playerStartAngle);
+				playerStart = null;
+			}
+		}
+		
+		#endregion
+		
+		#region ================== Input
+
+		// Mouse input
+		public override void OnMouseInput(Vector2D delta)
+		{
+			base.OnMouseInput(delta);
+			General.Map.VisualCamera.ProcessMouseInput(delta);
+		}
+
+		[BeginAction("moveforward", BaseAction = true)]
+		public virtual void BeginMoveForward()
+		{
+			keyforward = true;
+		}
+
+		[EndAction("moveforward", BaseAction = true)]
+		public virtual void EndMoveForward()
+		{
+			keyforward = false;
+		}
+
+		[BeginAction("movebackward", BaseAction = true)]
+		public virtual void BeginMoveBackward()
+		{
+			keybackward = true;
+		}
+
+		[EndAction("movebackward", BaseAction = true)]
+		public virtual void EndMoveBackward()
+		{
+			keybackward = false;
+		}
+
+		[BeginAction("moveleft", BaseAction = true)]
+		public virtual void BeginMoveLeft()
+		{
+			keyleft = true;
+		}
+
+		[EndAction("moveleft", BaseAction = true)]
+		public virtual void EndMoveLeft()
+		{
+			keyleft = false;
+		}
+
+		[BeginAction("moveright", BaseAction = true)]
+		public virtual void BeginMoveRight()
+		{
+			keyright = true;
+		}
+
+		[EndAction("moveright", BaseAction = true)]
+		public virtual void EndMoveRight()
+		{
+			keyright = false;
+		}
+
+		[BeginAction("moveup", BaseAction = true)]
+		public virtual void BeginMoveUp()
+		{
+			keyup = true;
+		}
+
+		[EndAction("moveup", BaseAction = true)]
+		public virtual void EndMoveUp()
+		{
+			keyup = false;
+		}
+
+		[BeginAction("movedown", BaseAction = true)]
+		public virtual void BeginMoveDown()
+		{
+			keydown = true;
+		}
+
+		[EndAction("movedown", BaseAction = true)]
+		public virtual void EndMoveDown()
+		{
+			keydown = false;
+		}
+
+		//mxd
+		[BeginAction("movethingleft", BaseAction = true)]
+		protected void MoveSelectedThingsLeft() 
+		{
+			MoveSelectedThings(new Vector2D(0f, -General.Map.Grid.GridSize), false);
+		}
+		//mxd
+		[BeginAction("movethingright", BaseAction = true)]
+		protected void MoveSelectedThingsRight() 
+		{
+			MoveSelectedThings(new Vector2D(0f, General.Map.Grid.GridSize), false);
+		}
+		//mxd
+		[BeginAction("movethingfwd", BaseAction = true)]
+		protected void MoveSelectedThingsForward() 
+		{
+			MoveSelectedThings(new Vector2D(-General.Map.Grid.GridSize, 0f), false);
+		}
+		//mxd
+		[BeginAction("movethingback", BaseAction = true)]
+		protected void MoveSelectedThingsBackward() 
+		{
+			MoveSelectedThings(new Vector2D(General.Map.Grid.GridSize, 0f), false);
+		}
+
+		//mxd
+		[BeginAction("placethingatcursor", BaseAction = true)]
+		protected void PlaceThingAtCursor() 
+		{
+			Vector2D hitpos = GetHitPosition();
+			if(!hitpos.IsFinite()) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "Cannot place Thing here");
+				return;
+			}
+
+			MoveSelectedThings(new Vector2D((float)Math.Round(hitpos.x), (float)Math.Round(hitpos.y)), true);
+		}
+
+		//mxd. 
+		public Vector2D GetHitPosition() 
+		{
+			Vector3D start = General.Map.VisualCamera.Position;
+			Vector3D delta = General.Map.VisualCamera.Target - General.Map.VisualCamera.Position;
+			delta = delta.GetFixedLength(General.Settings.ViewDistance * 0.98f);
+			VisualPickResult target = PickObject(start, start + delta);
+
+			if(target.picked == null) return new Vector2D(float.NaN, float.NaN);
+
+			//now find where exactly did we hit
+			if(target.picked is VisualGeometry) 
+			{
+				VisualGeometry vg = target.picked as VisualGeometry;
+				return GetIntersection(start, start + delta, vg.BoundingBox[0], new Vector3D(vg.Vertices[0].nx, vg.Vertices[0].ny, vg.Vertices[0].nz));
+			} 
+			
+			if(target.picked is VisualThing) 
+			{
+				VisualThing vt = target.picked as VisualThing;
+				return GetIntersection(start, start + delta, vt.CenterV3D, D3DDevice.V3D(vt.Center - vt.PositionV3));
+			} 
+
+			return new Vector2D(float.NaN, float.NaN);
+		}
+
+		//mxd. This checks intersection between line and plane 
+		private static Vector2D GetIntersection(Vector3D start, Vector3D end, Vector3D planeCenter, Vector3D planeNormal) 
+		{
+			Vector3D delta = new Vector3D(planeCenter.x - start.x, planeCenter.y - start.y, planeCenter.z - start.z);
+			return start + Vector3D.DotProduct(planeNormal, delta) / Vector3D.DotProduct(planeNormal, end - start) * (end - start);
+		}
+
+		//mxd. Should move selected things in specified direction
+		protected virtual void MoveSelectedThings(Vector2D direction, bool absolutePosition) { }
+		
+		#endregion
+
+		#region ================== Visibility Culling
+		
+		// This preforms visibility culling
+		protected void DoCulling()
+		{
+			Dictionary<Linedef, Linedef> visiblelines = new Dictionary<Linedef, Linedef>(200);
+			Vector2D campos2d = General.Map.VisualCamera.Position;
+			
+			// Make collections
+			visiblesectors = new Dictionary<Sector, VisualSector>(visiblesectors.Count);
+			visiblegeometry = new List<VisualGeometry>(visiblegeometry.Capacity);
+			visiblethings = new List<VisualThing>(visiblethings.Capacity);
+
+			// Get the blocks within view range
+			visibleblocks = blockmap.GetFrustumRange(renderer.Frustum2D);
+			
+			// Fill collections with geometry and things
+			foreach(VisualBlockEntry block in visibleblocks)
+			{
+				if(processgeometry)
+				{
+					// Lines
+					foreach(Linedef ld in block.Lines)
+					{
+						// Line not already processed?
+						if(!visiblelines.ContainsKey(ld))
+						{
+							// Add line if not added yet
+							visiblelines.Add(ld, ld);
+
+							// Which side of the line is the camera on?
+							if(ld.SideOfLine(campos2d) < 0)
+							{
+								// Do front of line
+								if(ld.Front != null) ProcessSidedefCulling(ld.Front);
+							}
+							else
+							{
+								// Do back of line
+								if(ld.Back != null) ProcessSidedefCulling(ld.Back);
+							}
+						}
+					}
+				}
+
+				if(processthings)
+				{
+					// Things
+					foreach(Thing t in block.Things)
+					{
+						// Not filtered out?
+						if(!General.Map.ThingsFilter.IsThingVisible(t)) continue;
+
+						VisualThing vt;
+						if(allthings.ContainsKey(t))
+						{
+							vt = allthings[t];
+						}
+						else
+						{
+							// Create new visual thing
+							vt = CreateVisualThing(t);
+							allthings.Add(t, vt);
+						}
+
+						if(vt != null)
+						{
+							visiblethings.Add(vt);
+						}
+					}
+				}
+			}
+
+			if(processgeometry)
+			{
+				// Find camera sector
+				Linedef nld = MapSet.NearestLinedef(visiblelines.Values, campos2d);
+				if(nld != null)
+				{
+					General.Map.VisualCamera.Sector = GetCameraSectorFromLinedef(nld);
+				}
+				else
+				{
+					// Exceptional case: no lines found in any nearby blocks!
+					// This could happen in the middle of an extremely large sector and in this case
+					// the above code will not have found any sectors/sidedefs for rendering.
+					// Here we handle this special case with brute-force. Let's find the sector
+					// the camera is in by searching the entire map and render that sector only.
+					nld = General.Map.Map.NearestLinedef(campos2d);
+					if(nld != null)
+					{
+						General.Map.VisualCamera.Sector = GetCameraSectorFromLinedef(nld);
+						if(General.Map.VisualCamera.Sector != null)
+						{
+							foreach(Sidedef sd in General.Map.VisualCamera.Sector.Sidedefs)
+							{
+								float side = sd.Line.SideOfLine(campos2d);
+								if(((side < 0) && sd.IsFront) ||
+								   ((side > 0) && !sd.IsFront))
+									ProcessSidedefCulling(sd);
+							}
+						}
+						else
+						{
+							// Too far away from the map to see anything
+							General.Map.VisualCamera.Sector = null;
+						}
+					}
+					else
+					{
+						// Map is empty
+						General.Map.VisualCamera.Sector = null;
+					}
+				}
+			}
+		}
+
+		// This finds and adds visible sectors
+		private void ProcessSidedefCulling(Sidedef sd)
+		{
+			VisualSector vs;
+			
+			// Find the visualsector and make it if needed
+			if(allsectors.ContainsKey(sd.Sector))
+			{
+				// Take existing visualsector
+				vs = allsectors[sd.Sector];
+			}
+			else
+			{
+				// Make new visualsector
+				vs = CreateVisualSector(sd.Sector);
+				//if(vs != null) allsectors.Add(sd.Sector, vs); //mxd
+			}
+			
+			if(vs != null)
+			{
+				// Add to visible sectors if not added yet
+				if(!visiblesectors.ContainsKey(sd.Sector))
+				{
+					visiblesectors.Add(sd.Sector, vs);
+					visiblegeometry.AddRange(vs.FixedGeometry);
+				}
+				
+				// Add sidedef geometry
+				visiblegeometry.AddRange(vs.GetSidedefGeometry(sd));
+			}
+		}
+
+		// This returns the camera sector from linedef
+		private static Sector GetCameraSectorFromLinedef(Linedef ld)
+		{
+			if(ld.SideOfLine(General.Map.VisualCamera.Position) < 0)
+			{
+				return (ld.Front != null ? ld.Front.Sector : null);
+			}
+
+			return (ld.Back != null ? ld.Back.Sector : null);
+		}
+		
+		#endregion
+
+		#region ================== Object Picking
+
+		// This picks an object from the scene
+		public VisualPickResult PickObject(Vector3D from, Vector3D to)
+		{
+			VisualPickResult result = new VisualPickResult();
+			Line2D ray2d = new Line2D(from, to);
+			Vector3D delta = to - from;
+			
+			// Setup no result
+			result.picked = null;
+			result.hitpos = new Vector3D();
+			result.u_ray = 1.0f;
+			
+			// Find all blocks we are intersecting
+			List<VisualBlockEntry> blocks = blockmap.GetLineBlocks(from, to);
+			
+			// Make collections
+			Dictionary<Linedef, Linedef> lines = new Dictionary<Linedef, Linedef>(blocks.Count * 10);
+			Dictionary<Sector, VisualSector> sectors = new Dictionary<Sector, VisualSector>(blocks.Count * 10);
+			List<IVisualPickable> pickables = new List<IVisualPickable>(blocks.Count * 10);
+			
+			// Add geometry from the camera sector
+			if((General.Map.VisualCamera.Sector != null) && allsectors.ContainsKey(General.Map.VisualCamera.Sector))
+			{
+				VisualSector vs = allsectors[General.Map.VisualCamera.Sector];
+				sectors.Add(General.Map.VisualCamera.Sector, vs);
+				foreach(VisualGeometry g in vs.FixedGeometry) pickables.Add(g);
+			}
+			
+			// Go for all lines to see which ones we intersect
+			// We will collect geometry from the sectors and sidedefs
+			foreach(VisualBlockEntry b in blocks)
+			{
+				foreach(Linedef ld in b.Lines)
+				{
+					// Make sure we don't test a line twice
+					if(!lines.ContainsKey(ld))
+					{
+						lines.Add(ld, ld);
+						
+						// Intersecting?
+						float u;
+						if(ld.Line.GetIntersection(ray2d, out u))
+						{
+							// Check on which side we are
+							float side = ld.SideOfLine(ray2d.v1);
+							
+							// Calculate intersection point
+							Vector3D intersect = from + delta * u;
+							
+							// We must add the sectors of both sides of the line
+							// If we wouldn't, then aiming at a sector that is just within range
+							// could result in an incorrect hit (because the far line of the
+							// sector may not be included in this loop)
+							if(ld.Front != null)
+							{
+								// Find the visualsector
+								if(allsectors.ContainsKey(ld.Front.Sector))
+								{
+									VisualSector vs = allsectors[ld.Front.Sector];
+									
+									// Add sector if not already added
+									if(!sectors.ContainsKey(ld.Front.Sector))
+									{
+										sectors.Add(ld.Front.Sector, vs);
+										foreach(VisualGeometry g in vs.FixedGeometry)
+										{
+											// Must have content
+											if(g.Triangles > 0)
+												pickables.Add(g);
+										}
+									}
+									
+									// Add sidedef if on the front side
+									if(side < 0.0f)
+									{
+										List<VisualGeometry> sidedefgeo = vs.GetSidedefGeometry(ld.Front);
+										foreach(VisualGeometry g in sidedefgeo)
+										{
+											// Must have content
+											if(g.Triangles > 0)
+											{
+												g.SetPickResults(intersect, u);
+												pickables.Add(g);
+											}
+										}
+									}
+								}
+							}
+							
+							// Add back side also
+							if(ld.Back != null)
+							{
+								// Find the visualsector
+								if(allsectors.ContainsKey(ld.Back.Sector))
+								{
+									VisualSector vs = allsectors[ld.Back.Sector];
+
+									// Add sector if not already added
+									if(!sectors.ContainsKey(ld.Back.Sector))
+									{
+										sectors.Add(ld.Back.Sector, vs);
+										foreach(VisualGeometry g in vs.FixedGeometry)
+										{
+											// Must have content
+											if(g.Triangles > 0)
+												pickables.Add(g);
+										}
+									}
+
+									// Add sidedef if on the front side
+									if(side > 0.0f)
+									{
+										List<VisualGeometry> sidedefgeo = vs.GetSidedefGeometry(ld.Back);
+										foreach(VisualGeometry g in sidedefgeo)
+										{
+											// Must have content
+											if(g.Triangles > 0)
+											{
+												g.SetPickResults(intersect, u);
+												pickables.Add(g);
+											}
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+			
+			// Add all the visible things
+			foreach(VisualThing vt in visiblethings) pickables.Add(vt);
+
+			//mxd. And all visual vertices
+			if(General.Map.UDMF && General.Settings.GZShowVisualVertices) 
+			{
+				foreach(KeyValuePair<Vertex, VisualVertexPair> pair in vertices)
+					pickables.AddRange(pair.Value.Vertices);
+			}
+			
+			// Now we have a list of potential geometry that lies along the trace line.
+			// We still don't know what geometry actually hits, but we ruled out that which doesn't get even close.
+			// This is still too much for accurate intersection testing, so we do a fast reject pass first.
+			Vector3D direction = to - from;
+			direction = direction.GetNormal();
+			List<IVisualPickable> potentialpicks = new List<IVisualPickable>(pickables.Count);
+			foreach(IVisualPickable p in pickables)
+			{
+				if(p.PickFastReject(from, to, direction)) potentialpicks.Add(p);
+			}
+			
+			// Now we do an accurate intersection test for all resulting geometry
+			// We keep only the closest hit!
+			foreach(IVisualPickable p in potentialpicks)
+			{
+				float u = result.u_ray;
+				if(p.PickAccurate(from, to, direction, ref u))
+				{
+					// Closer than previous find?
+					if((u > 0.0f) && (u < result.u_ray))
+					{
+						result.u_ray = u;
+						result.picked = p;
+					}
+				}
+			}
+			
+			// Setup final result
+			result.hitpos = from + to * result.u_ray;
+
+			// Done
+			return result;
+		}
+		
+		#endregion
+
+		#region ================== Processing
+		
+		/// <summary>
+		/// This disposes all resources. Needed geometry will be rebuild automatically.
+		/// </summary>
+		protected virtual void ResourcesReloaded()
+		{
+			// Dispose
+			foreach(KeyValuePair<Sector, VisualSector> vs in allsectors)
+				if(vs.Value != null) vs.Value.Dispose();
+				
+			foreach(KeyValuePair<Thing, VisualThing> vt in allthings)
+				if(vt.Value != null) vt.Value.Dispose();
+				
+			// Clear collections
+			allsectors.Clear();
+			allthings.Clear();
+			visiblesectors.Clear();
+			visibleblocks.Clear();
+			visiblegeometry.Clear();
+			visiblethings.Clear();
+			vertices.Clear(); //mxd
+			
+			// Make new blockmap
+			FillBlockMap();
+
+			// Visibility culling (this re-creates the needed resources)
+			DoCulling();
+		}
+
+		/// <summary>
+		/// This disposes orphaned resources and resources on changed geometry.
+		/// This usually happens when geometry is changed by undo, redo, cut or paste actions
+		/// and uses the marks to check what needs to be reloaded.
+		/// </summary>
+		protected virtual void ResourcesReloadedPartial()
+		{
+			Dictionary<Sector, VisualSector> newsectors = new Dictionary<Sector,VisualSector>(allsectors.Count);
+			
+			// Neighbour sectors must be updated as well
+			foreach(Sector s in General.Map.Map.Sectors)
+			{
+				if(s.Marked)
+				{
+					foreach(Sidedef sd in s.Sidedefs)
+						if(sd.Other != null) sd.Other.Marked = true;
+				}
+			}
+			
+			// Go for all sidedefs to mark sectors that need updating
+			foreach(Sidedef sd in General.Map.Map.Sidedefs)
+				if(sd.Marked) sd.Sector.Marked = true;
+			
+			// Go for all vertices to mark linedefs that need updating
+			foreach(Vertex v in General.Map.Map.Vertices)
+			{
+				if(v.Marked)
+				{
+					foreach(Linedef ld in v.Linedefs)
+						ld.Marked = true;
+				}
+			}
+			
+			// Go for all linedefs to mark sectors that need updating
+			foreach(Linedef ld in General.Map.Map.Linedefs)
+			{
+				if(ld.Marked)
+				{
+					if(ld.Front != null) ld.Front.Sector.Marked = true;
+					if(ld.Back != null) ld.Back.Sector.Marked = true;
+				}
+			}
+			
+			// Dispose if source was disposed or marked
+			foreach(KeyValuePair<Sector, VisualSector> vs in allsectors)
+			{
+				if(vs.Value != null)
+				{
+					if(vs.Key.IsDisposed || vs.Key.Marked)
+						vs.Value.Dispose();
+					else
+						newsectors.Add(vs.Key, vs.Value);
+				}
+			}
+			
+			// Things depend on the sector they are in and because we can't
+			// easily determine which ones changed, we dispose all things
+			foreach(KeyValuePair<Thing, VisualThing> vt in allthings)
+				if(vt.Value != null) vt.Value.Dispose();
+			
+			// Apply new lists
+			allsectors = newsectors;
+			allthings = new Dictionary<Thing, VisualThing>(allthings.Count);
+			
+			// Clear visibility collections
+			visiblesectors.Clear();
+			visibleblocks.Clear();
+			visiblegeometry.Clear();
+			visiblethings.Clear();
+			
+			// Make new blockmap
+			FillBlockMap();
+			
+			// Visibility culling (this re-creates the needed resources)
+			DoCulling();
+		}
+		
+		/// <summary>
+		/// Implement this to create an instance of your VisualSector implementation.
+		/// </summary>
+		protected abstract VisualSector CreateVisualSector(Sector s);
+
+		/// <summary>
+		/// Implement this to create an instance of your VisualThing implementation.
+		/// </summary>
+		protected abstract VisualThing CreateVisualThing(Thing t);
+		
+		/// <summary>
+		/// This returns the VisualSector for the given Sector.
+		/// </summary>
+		public VisualSector GetVisualSector(Sector s) 
+		{
+			if(!allsectors.ContainsKey(s)) return CreateVisualSector(s); //mxd
+			return allsectors[s]; 
+		}
+		
+		/// <summary>
+		/// This returns the VisualThing for the given Thing.
+		/// </summary>
+		public VisualThing GetVisualThing(Thing t) { return allthings[t]; }
+
+		//mxd
+		public List<VisualThing> GetSelectedVisualThings(bool refreshSelection) 
+		{
+			if(refreshSelection || selectedVisualThings == null) 
+			{
+				selectedVisualThings = new List<VisualThing>();
+				foreach(KeyValuePair<Thing, VisualThing> group in allthings) 
+				{
+					if(group.Value != null && group.Value.Selected)
+						selectedVisualThings.Add(group.Value);
+				}
+
+				//if nothing is selected - try to get thing from hilighted object
+				if(selectedVisualThings.Count == 0) 
+				{
+					Vector3D start = General.Map.VisualCamera.Position;
+					Vector3D delta = General.Map.VisualCamera.Target - General.Map.VisualCamera.Position;
+					delta = delta.GetFixedLength(General.Settings.ViewDistance * 0.98f);
+					VisualPickResult target = PickObject(start, start + delta);
+
+					//not appropriate way to do this, but...
+					if(target.picked is VisualThing)
+						selectedVisualThings.Add((VisualThing)target.picked);
+				}
+			}
+
+			return selectedVisualThings;
+		}
+
+		/// <summary>
+		/// mxd. This returns list of selected sectors based on surfaces selected in visual mode
+		/// </summary>
+		public List<VisualSector> GetSelectedVisualSectors(bool refreshSelection) 
+		{
+			if(refreshSelection || selectedVisualSectors == null) 
+			{
+				selectedVisualSectors = new List<VisualSector>();
+				foreach(KeyValuePair<Sector, VisualSector> group in allsectors) 
+				{
+					foreach(VisualGeometry vg in group.Value.AllGeometry) 
+					{
+						if(vg.Selected) 
+						{
+							selectedVisualSectors.Add(group.Value);
+							break;
+						}
+					}
+				}
+
+				//if nothing is selected - try to get sector from hilighted object
+				if(selectedVisualSectors.Count == 0) 
+				{
+					VisualGeometry vg = GetHilightedSurface();
+					if(vg != null) selectedVisualSectors.Add(vg.Sector);
+				}
+			}
+			return selectedVisualSectors;
+		}
+
+		/// <summary>
+		/// mxd. This returns list of surfaces selected in visual mode
+		/// </summary>
+		public List<VisualGeometry> GetSelectedSurfaces() 
+		{
+			List<VisualGeometry> selectedSurfaces = new List<VisualGeometry>();
+			foreach(KeyValuePair<Sector, VisualSector> group in allsectors) 
+			{
+				foreach(VisualGeometry vg in group.Value.AllGeometry) 
+				{
+					if(vg.Selected) selectedSurfaces.Add(vg);
+				}
+			}
+
+			//if nothing is selected - try to get hilighted surface
+			if(selectedSurfaces.Count == 0) 
+			{
+				VisualGeometry vg = GetHilightedSurface();
+				if(vg != null) selectedSurfaces.Add(vg);
+			}
+			return selectedSurfaces;
+		}
+
+		//mxd
+		private VisualGeometry GetHilightedSurface() 
+		{
+			Vector3D start = General.Map.VisualCamera.Position;
+			Vector3D delta = General.Map.VisualCamera.Target - General.Map.VisualCamera.Position;
+			delta = delta.GetFixedLength(General.Settings.ViewDistance * 0.98f);
+			VisualPickResult target = PickObject(start, start + delta);
+
+			if(target.picked is VisualGeometry) 
+			{
+				VisualGeometry vg = (VisualGeometry)target.picked;
+				if(vg.Sector != null) return vg;
+			}
+			return null;
+		}
+
+		/// <summary>
+		/// Returns True when a VisualSector has been created for the specified Sector.
+		/// </summary>
+		public bool VisualSectorExists(Sector s) { return allsectors.ContainsKey(s) && (allsectors[s] != null); }
+
+		/// <summary>
+		/// Returns True when a VisualThing has been created for the specified Thing.
+		/// </summary>
+		public bool VisualThingExists(Thing t) { return allthings.ContainsKey(t) && (allthings[t] != null); }
+
+		/// <summary>
+		/// This is called when the blockmap needs to be refilled, because it was invalidated.
+		/// This usually happens when geometry is changed by undo, redo, cut or paste actions.
+		/// Lines and Things are added to the block map by the base implementation.
+		/// </summary>
+		protected virtual void FillBlockMap()
+		{
+			blockmap.Clear();//mxd
+			blockmap.AddLinedefsSet(General.Map.Map.Linedefs);
+			blockmap.AddThingsSet(General.Map.Map.Things);
+			blockmap.AddSectorsSet(General.Map.Map.Sectors);
+		}
+		
+		/// <summary>
+		/// While this mode is active, this is called continuously to process whatever needs processing.
+		/// </summary>
+		public override void OnProcess(float deltatime)
+		{
+			float multiplier;
+			
+			base.OnProcess(deltatime);
+			
+			// Camera vectors
+			Vector3D camvec = Vector3D.FromAngleXYZ(General.Map.VisualCamera.AngleXY, General.Map.VisualCamera.AngleZ);
+			Vector3D camvecstrafe = Vector3D.FromAngleXY(General.Map.VisualCamera.AngleXY + Angle2D.PIHALF);
+			Vector3D cammovemul = General.Map.VisualCamera.MoveMultiplier;
+			Vector3D camdeltapos = new Vector3D();
+			Vector3D upvec = new Vector3D(0.0f, 0.0f, 1.0f);
+
+			// Move the camera
+			if(General.Interface.ShiftState) multiplier = MOVE_SPEED_MULTIPLIER * 2.0f; else multiplier = MOVE_SPEED_MULTIPLIER;
+			if(keyforward) camdeltapos += camvec * cammovemul * General.Settings.MoveSpeed * multiplier * deltatime;
+			if(keybackward) camdeltapos -= camvec * cammovemul * General.Settings.MoveSpeed * multiplier * deltatime;
+			if(keyleft) camdeltapos -= camvecstrafe * cammovemul * General.Settings.MoveSpeed * multiplier * deltatime;
+			if(keyright) camdeltapos += camvecstrafe * cammovemul * General.Settings.MoveSpeed * multiplier * deltatime;
+			if(keyup) camdeltapos += upvec * cammovemul * General.Settings.MoveSpeed * multiplier * deltatime;
+			if(keydown) camdeltapos += -upvec * cammovemul * General.Settings.MoveSpeed * multiplier * deltatime;
+			
+			// Move the camera
+			General.Map.VisualCamera.ProcessMovement(camdeltapos);
+			
+			// Apply new camera matrices
+			renderer.PositionAndLookAt(General.Map.VisualCamera.Position, General.Map.VisualCamera.Target);
+			
+			// Visibility culling
+			DoCulling();
+			
+			// Update labels in main window
+			General.MainWindow.UpdateCoordinates(General.Map.VisualCamera.Position);
+			
+			// Now redraw
+			General.Interface.RedrawDisplay();
+		}
+		
+		#endregion
+
+		#region ================== Actions
+
+		//mxd
+		[BeginAction("centeroncoordinates", BaseAction = true)]
+		protected virtual void CenterOnCoordinates() 
+		{
+			//show form...
+			CenterOnCoordinatesForm form = new CenterOnCoordinatesForm();
+			if(form.ShowDialog() == DialogResult.OK) 
+			{
+				Sector s = General.Map.Map.GetSectorByCoordinates(form.Coordinates, blockmap);
+
+				if(s == null)
+					General.Map.VisualCamera.Position = form.Coordinates;
+				else
+					General.Map.VisualCamera.Position = new Vector3D(form.Coordinates.x, form.Coordinates.y, s.FloorHeight + 54);
+				General.Map.VisualCamera.Sector = s;
+			}
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/VisualModes/VisualPickResult.cs b/Source/Core/VisualModes/VisualPickResult.cs
new file mode 100644
index 0000000..48c8222
--- /dev/null
+++ b/Source/Core/VisualModes/VisualPickResult.cs
@@ -0,0 +1,32 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using CodeImp.DoomBuilder.Geometry;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.VisualModes
+{
+	public struct VisualPickResult
+	{
+		// Members
+		public IVisualPickable picked;
+		public float u_ray;
+		public Vector3D hitpos;
+	}
+}
diff --git a/Source/Core/VisualModes/VisualSector.cs b/Source/Core/VisualModes/VisualSector.cs
new file mode 100644
index 0000000..4f3c405
--- /dev/null
+++ b/Source/Core/VisualModes/VisualSector.cs
@@ -0,0 +1,205 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Map;
+using SlimDX.Direct3D9;
+using SlimDX;
+using CodeImp.DoomBuilder.Rendering;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.VisualModes
+{
+	public class VisualSector : ID3DResource
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		// Geometry
+		private List<VisualGeometry> fixedgeometry;
+		private List<VisualGeometry> allgeometry;
+		private Dictionary<Sidedef, List<VisualGeometry>> sidedefgeometry;
+		private VertexBuffer geobuffer;
+		private bool updategeo;
+		
+		// Original sector
+		private Sector sector;
+		
+		// Disposing
+		private bool isdisposed;
+
+		#endregion
+
+		#region ================== Properties
+
+		internal List<VisualGeometry> FixedGeometry { get { return fixedgeometry; } }
+		internal List<VisualGeometry> AllGeometry { get { return allgeometry; } }
+		internal VertexBuffer GeometryBuffer { get { return geobuffer; } }
+		internal bool NeedsUpdateGeo { get { return updategeo; } set { updategeo |= value; } }
+		
+		public bool IsDisposed { get { return isdisposed; } }
+		public Sector Sector { get { return sector; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public VisualSector(Sector s)
+		{
+			// Initialize
+			this.sector = s;
+			allgeometry = new List<VisualGeometry>();
+			fixedgeometry = new List<VisualGeometry>();
+			sidedefgeometry = new Dictionary<Sidedef, List<VisualGeometry>>();
+			this.sector.UpdateFogColor(); //mxd
+
+			// Register as resource
+			General.Map.Graphics.RegisterResource(this);
+		}
+
+		// Disposer
+		public virtual void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Clean up
+				if(geobuffer != null) geobuffer.Dispose();
+				geobuffer = null;
+
+				// Unregister resource
+				General.Map.Graphics.UnregisterResource(this);
+				
+				// Done
+				isdisposed = true;
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This is called before a device is reset
+		// (when resized or display adapter was changed)
+		public virtual void UnloadResource()
+		{
+			// Trash geometry buffer
+			if(geobuffer != null) geobuffer.Dispose();
+			geobuffer = null;
+			updategeo = true;
+		}
+
+		// This is called resets when the device is reset
+		// (when resized or display adapter was changed)
+		public virtual void ReloadResource()
+		{
+			// Make new geometry
+			//Update();
+		}
+
+		//mxd. Added to allow to properly update visual geometry from plugins
+		public virtual void UpdateSectorData() { }
+		public virtual void UpdateSectorGeometry(bool includeneighbours) { }
+		
+		// This updates the visual sector
+		public void Update()
+		{
+			int numverts = 0;
+			int v = 0;
+			
+			// Trash geometry buffer
+			if(geobuffer != null) geobuffer.Dispose();
+			geobuffer = null;
+			
+			// Count the number of vertices there are
+			foreach(VisualGeometry g in allgeometry) if(g.Vertices != null) numverts += g.Vertices.Length;
+			
+			// Any vertics?
+			if(numverts > 0)
+			{
+				// Make a new buffer
+				geobuffer = new VertexBuffer(General.Map.Graphics.Device, WorldVertex.Stride * numverts,
+											 Usage.WriteOnly | Usage.Dynamic, VertexFormat.None, Pool.Default);
+
+				// Fill the buffer
+				DataStream bufferstream = geobuffer.Lock(0, WorldVertex.Stride * numverts, LockFlags.Discard);
+				foreach(VisualGeometry g in allgeometry)
+				{
+					if((g.Vertices != null) && (g.Vertices.Length > 0))
+					{
+						bufferstream.WriteRange(g.Vertices);
+						g.VertexOffset = v;
+						v += g.Vertices.Length;
+					}
+				}
+				geobuffer.Unlock();
+				bufferstream.Dispose();
+			}
+
+			this.sector.UpdateFogColor(); //mxd
+			
+			// Done
+			updategeo = false;
+		}
+
+		/// <summary>
+		/// This adds geometry for this sector. If the geometry inherits from VisualSidedef then it
+		/// will be added to the SidedefGeometry, otherwise it will be added as FixedGeometry.
+		/// </summary>
+		public void AddGeometry(VisualGeometry geo)
+		{
+			updategeo = true;
+			allgeometry.Add(geo);
+			if(geo.Sidedef != null)
+			{
+				if(!sidedefgeometry.ContainsKey(geo.Sidedef))
+					sidedefgeometry[geo.Sidedef] = new List<VisualGeometry>(3);
+				sidedefgeometry[geo.Sidedef].Add(geo);
+			}
+			else
+			{
+				fixedgeometry.Add(geo);
+			}
+		}
+
+		/// <summary>
+		/// This removes all geometry.
+		/// </summary>
+		public void ClearGeometry()
+		{
+			allgeometry.Clear();
+			fixedgeometry.Clear();
+			sidedefgeometry.Clear();
+			updategeo = true;
+		}
+
+		// This gets the geometry list for the specified sidedef
+		public List<VisualGeometry> GetSidedefGeometry(Sidedef sd)
+		{
+			if(sidedefgeometry.ContainsKey(sd)) return sidedefgeometry[sd];
+			return new List<VisualGeometry>();
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/VisualModes/VisualThing.cs b/Source/Core/VisualModes/VisualThing.cs
new file mode 100644
index 0000000..eb84fb7
--- /dev/null
+++ b/Source/Core/VisualModes/VisualThing.cs
@@ -0,0 +1,732 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Data;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.GZBuilder.Data; //mxd
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using SlimDX;
+using SlimDX.Direct3D9;
+using Plane = CodeImp.DoomBuilder.Geometry.Plane;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.VisualModes
+{
+	public abstract class VisualThing : IVisualPickable, ID3DResource
+	{
+		#region ================== Constants
+
+		protected const int FIXED_RADIUS = 8; //mxd. Used to render things with zero width and radius
+		internal const float LIT_FOG_DENSITY_SCALER = 255 * VisualGeometry.FOG_DENSITY_SCALER; //mxd
+
+		#endregion
+		
+		#region ================== Variables
+		
+		// Thing
+		private readonly Thing thing;
+
+		//mxd. Info
+		protected ThingTypeInfo info;
+		
+		// Texture
+		private ImageData texture;
+		
+		// Geometry
+		private WorldVertex[] vertices;
+		private VertexBuffer geobuffer;
+		private VertexBuffer cagebuffer; //mxd
+		private int cagelength; //mxd
+		private bool updategeo;
+		private bool updatecage; //mxd
+		private int triangles;
+		
+		// Rendering
+		private RenderPass renderpass;
+		private Matrix position;
+		private int cameradistance;
+		private Color4 cagecolor;
+		protected bool sizeless; //mxd. Used to render visual things with 0 width and height
+		protected float fogfactor; //mxd
+
+		// Selected?
+		protected bool selected;
+
+		// Disposing
+		private bool isdisposed;
+
+		//mxd
+		protected float thingheight;
+
+		//mxd. light properties
+		private DynamicLightType lightType;
+		private DynamicLightRenderStyle lightRenderStyle;
+		private Color4 lightColor;
+		private float lightRadius; //current radius. used in light animation
+		private float lightPrimaryRadius;
+		private float lightSecondaryRadius;
+		private Vector3 position_v3;
+		private float lightDelta; //used in light animation
+		private Vector3D[] boundingBox;
+		
+		//gldefs light
+		private Vector3 lightOffset;
+		private int lightInterval;
+		private bool isGldefsLight;
+		
+		#endregion
+		
+		#region ================== Properties
+		
+		internal VertexBuffer GeometryBuffer { get { return geobuffer; } }
+		internal VertexBuffer CageBuffer { get { return cagebuffer; } } //mxd
+		internal int CageLength { get { return cagelength; } } //mxd
+		internal bool NeedsUpdateGeo { get { return updategeo; } }
+		internal int Triangles { get { return triangles; } }
+		internal Matrix Position { get { return position; } }
+		internal Color4 CageColor { get { return cagecolor; } }
+		public ThingTypeInfo Info { get { return info; } } //mxd
+		
+		//mxd
+		internal int VertexColor { get { return vertices.Length > 0 ? vertices[0].c : 0;} }
+		public int CameraDistance { get { return cameradistance; } }
+		public float FogFactor { get { return fogfactor; } }
+		public Vector3 Center
+		{ 
+			get
+			{
+				if(isGldefsLight) return position_v3 + lightOffset;
+				return new Vector3(position_v3.X, position_v3.Y, position_v3.Z + thingheight / 2f); 
+			} 
+		}
+		public Vector3D CenterV3D { get { return D3DDevice.V3D(Center); } }
+		public float LocalCenterZ { get { return thingheight / 2f; } } //mxd
+		public Vector3 PositionV3 { get { return position_v3; } }
+		public Vector3D[] BoundingBox { get { return boundingBox; } }
+		
+		//mxd. light properties
+		public DynamicLightType LightType { get { return lightType; } }
+		public float LightRadius { get { return lightRadius; } }
+		public DynamicLightRenderStyle LightRenderStyle { get { return lightRenderStyle; } }
+		public Color4 LightColor { get { return lightColor; } }
+
+		/// <summary>
+		/// Returns the Thing that this VisualThing is created for.
+		/// </summary>
+		public Thing Thing { get { return thing; } }
+
+		/// <summary>
+		/// Render pass in which this geometry must be rendered. Default is Mask.
+		/// </summary>
+		public RenderPass RenderPass { get { return renderpass; } set { renderpass = value; } }
+		
+		/// <summary>
+		/// Image to use as texture on the geometry.
+		/// </summary>
+		public ImageData Texture { get { return texture; } set { texture = value; } }
+
+		/// <summary>
+		/// Disposed or not?
+		/// </summary>
+		public bool IsDisposed { get { return isdisposed; } }
+
+		/// <summary>
+		/// Selected or not? This is only used by the core to determine what color to draw it with.
+		/// </summary>
+		public bool Selected { get { return selected; } set { selected = value; } }
+		
+		#endregion
+		
+		#region ================== Constructor / Destructor
+		
+		// Constructor
+		protected VisualThing(Thing t)
+		{
+			// Initialize
+			this.thing = t;
+			this.renderpass = RenderPass.Mask;
+			this.position = Matrix.Identity;
+
+			//mxd
+			lightType = DynamicLightType.NONE;
+			lightRenderStyle = DynamicLightRenderStyle.NONE;
+			lightPrimaryRadius = -1;
+			lightSecondaryRadius = -1;
+			lightInterval = -1;
+			lightColor = new Color4();
+			boundingBox = new Vector3D[9];
+			
+			// Register as resource
+			General.Map.Graphics.RegisterResource(this);
+		}
+
+		// Disposer
+		public virtual void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Clean up
+				if(geobuffer != null) geobuffer.Dispose();
+				geobuffer = null;
+				if(cagebuffer != null) cagebuffer.Dispose(); //mxd
+				cagebuffer = null; //mxd
+
+				// Unregister resource
+				General.Map.Graphics.UnregisterResource(this);
+
+				// Done
+				isdisposed = true;
+			}
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+
+		//mxd
+		internal void CalculateCameraDistance(Vector3D campos) 
+		{
+			cameradistance = (int)((CenterV3D - campos).GetLengthSq());
+		}
+		
+		// This is called before a device is reset (when resized or display adapter was changed)
+		public void UnloadResource()
+		{
+			// Trash geometry buffers
+			if(geobuffer != null) geobuffer.Dispose();
+			geobuffer = null;
+			if(cagebuffer != null) cagebuffer.Dispose(); //mxd
+			cagebuffer = null; //mxd
+			updategeo = true;
+			updatecage = true; //mxd
+		}
+		
+		// This is called resets when the device is reset
+		// (when resized or display adapter was changed)
+		public void ReloadResource()
+		{
+			// Make new geometry
+			//Update();
+		}
+
+		/// <summary>
+		/// Sets the color of the cage around the thing geometry and rebuilds the thing cage.
+		/// </summary>
+		protected void SetCageColor(PixelColor color)
+		{
+			cagecolor = color.ToColorValue();
+			updatecage = true;
+		}
+
+		/// <summary>
+		/// This sets the position to use for the thing geometry.
+		/// </summary>
+		public void SetPosition(Vector3D pos)
+		{
+			position_v3 = D3DDevice.V3(pos); //mxd
+			position = Matrix.Translation(position_v3);
+			updategeo = true;
+			updatecage = true; //mxd
+
+			//mxd. update bounding box?
+			if(lightType != DynamicLightType.NONE && lightRadius > thing.Size) 
+			{
+				UpdateBoundingBox(lightRadius, lightRadius * 2);
+			} 
+		}
+
+		// This sets the vertices for the thing sprite
+		protected void SetVertices(ICollection<WorldVertex> verts, Plane floor, Plane ceiling)
+		{
+			// Copy vertices
+			vertices = new WorldVertex[verts.Count];
+			verts.CopyTo(vertices, 0);
+			triangles = vertices.Length / 3;
+			updategeo = true;
+			
+			//mxd. Do some GLOOME shenanigans...
+			if(triangles < 2) return;
+			float localcenterz = vertices[1].z * 0.5f;
+			Matrix m;
+
+			switch(info.RenderMode)
+			{
+				// TODO: Currently broken in GLOOME...
+				case Thing.SpriteRenderMode.WALL_SPRITE:
+					m = Matrix.Translation(0f, 0f, -localcenterz) * Matrix.RotationY(Thing.RollRad) * Matrix.RotationZ(thing.Angle) * Matrix.Translation(0f, 0f, localcenterz);
+					for(int i = 0; i < vertices.Length; i++)
+					{
+						Vector4 transformed = Vector3.Transform(new Vector3(vertices[i].x, vertices[i].y, vertices[i].z), m);
+						vertices[i].x = transformed.X;
+						vertices[i].y = transformed.Y;
+						vertices[i].z = transformed.Z;
+					}
+					break;
+
+				case Thing.SpriteRenderMode.FLOOR_SPRITE:
+					Matrix floorrotation = Matrix.RotationZ(info.RollSprite ? Thing.RollRad : 0f)
+										 * Matrix.RotationY(Thing.Angle) 
+										 * Matrix.RotationX(Angle2D.PIHALF);
+
+					m = Matrix.Translation(0f, 0f, -localcenterz) * floorrotation * Matrix.Translation(0f, 0f, localcenterz);
+					
+					for(int i = 0; i < vertices.Length; i++)
+					{
+						Vector4 transformed = Vector3.Transform(new Vector3(vertices[i].x, vertices[i].y, vertices[i].z), m);
+						vertices[i].x = transformed.X;
+						vertices[i].y = transformed.Y;
+						vertices[i].z = transformed.Z;
+					}
+
+					// TODO: this won't work on things with AbsoluteZ flag
+					// TODO: +ROLLSPRITE implies +STICKTOPLANE?
+					if(info.StickToPlane || info.RollSprite)
+					{
+						// Calculate vertical offset
+						float floorz = floor.GetZ(Thing.Position);
+						float ceilz = ceiling.GetZ(Thing.Position);
+
+						if(!float.IsNaN(floorz) && !float.IsNaN(ceilz))
+						{
+							float voffset;
+							if(info.Hangs)
+							{
+								float thingz = ceilz - Thing.Position.z + Thing.Height;
+								voffset = 0.01f - floorz - General.Clamp(thingz, 0, ceilz - floorz);
+							}
+							else
+							{
+								voffset = 0.01f - floorz - General.Clamp(Thing.Position.z, 0, ceilz - floorz);
+							}
+
+							// Apply it
+							for(int i = 0; i < vertices.Length; i++)
+								vertices[i].z = floor.GetZ(vertices[i].x + Thing.Position.x, vertices[i].y + Thing.Position.y) + voffset;
+						}
+					}
+					break;
+
+				case Thing.SpriteRenderMode.CEILING_SPRITE:
+					Matrix ceilrotation = Matrix.RotationZ(info.RollSprite ? Thing.RollRad : 0f)
+										* Matrix.RotationY(Thing.Angle)
+										* Matrix.RotationX(Angle2D.PIHALF);
+
+					m = Matrix.Translation(0f, 0f, -localcenterz) * ceilrotation * Matrix.Translation(0f, 0f, localcenterz);
+					
+					for(int i = 0; i < vertices.Length; i++)
+					{
+						Vector4 transformed = Vector3.Transform(new Vector3(vertices[i].x, vertices[i].y, vertices[i].z), m);
+						vertices[i].x = transformed.X;
+						vertices[i].y = transformed.Y;
+						vertices[i].z = transformed.Z;
+					}
+
+					// TODO: this won't work on things with AbsoluteZ flag
+					// TODO: +ROLLSPRITE implies +STICKTOPLANE?
+					if(info.StickToPlane || info.RollSprite)
+					{
+						// Calculate vertical offset
+						float floorz = floor.GetZ(Thing.Position);
+						float ceilz = ceiling.GetZ(Thing.Position);
+						
+						if(!float.IsNaN(floorz) && !float.IsNaN(ceilz))
+						{
+							float voffset;
+							if(info.Hangs)
+							{
+								float thingz = ceilz - Math.Max(0, Thing.Position.z) - Thing.Height;
+								voffset = -0.01f - General.Clamp(thingz, 0, ceilz - floorz);
+							}
+							else
+							{
+								voffset = -0.01f - floorz - General.Clamp(Thing.Position.z, 0, ceilz - floorz);
+							}
+
+							// Apply it
+							for(int i = 0; i < vertices.Length; i++)
+								vertices[i].z = ceiling.GetZ(vertices[i].x + Thing.Position.x, vertices[i].y + Thing.Position.y) + voffset;
+						}
+					}
+					break;
+
+				default:
+					if(info.RollSprite)
+					{
+						m = Matrix.Translation(0f, 0f, -localcenterz) * Matrix.RotationY(Thing.RollRad) * Matrix.Translation(0f, 0f, localcenterz);
+						for(int i = 0; i < vertices.Length; i++)
+						{
+							Vector4 transformed = Vector3.Transform(new Vector3(vertices[i].x, vertices[i].y, vertices[i].z), m);
+							vertices[i].x = transformed.X;
+							vertices[i].y = transformed.Y;
+							vertices[i].z = transformed.Z;
+						}
+					}
+					break;
+			}
+		}
+		
+		// This updates the visual thing
+		public virtual void Update()
+		{
+			// Do we need to update the geometry buffer?
+			if(updategeo)
+			{
+				// Trash geometry buffer
+				if(geobuffer != null) geobuffer.Dispose();
+				geobuffer = null;
+
+				// Any vertics?
+				if(vertices.Length > 0) 
+				{
+					// Make a new buffer
+					geobuffer = new VertexBuffer(General.Map.Graphics.Device, WorldVertex.Stride * vertices.Length,
+												 Usage.WriteOnly | Usage.Dynamic, VertexFormat.None, Pool.Default);
+
+					// Fill the buffer
+					DataStream bufferstream = geobuffer.Lock(0, WorldVertex.Stride * vertices.Length, LockFlags.Discard);
+					bufferstream.WriteRange(vertices);
+					geobuffer.Unlock();
+					bufferstream.Dispose();
+				}
+				
+				//mxd. Check if thing is light
+				CheckLightState();
+
+				// Done
+				updategeo = false;
+			}
+
+			//mxd. Need to update thing cage?
+			if(updatecage)
+			{
+				// Trash cage buffer
+				if(cagebuffer != null) cagebuffer.Dispose();
+				cagebuffer = null;
+
+				// Make a new cage
+				List<WorldVertex> cageverts;
+				if(sizeless)
+				{
+					WorldVertex v0 = new WorldVertex(-thing.Size + position_v3.X, -thing.Size + position_v3.Y, position_v3.Z);
+					WorldVertex v1 = new WorldVertex(thing.Size + position_v3.X, thing.Size + position_v3.Y, position_v3.Z);
+					WorldVertex v2 = new WorldVertex(thing.Size + position_v3.X, -thing.Size + position_v3.Y, position_v3.Z);
+					WorldVertex v3 = new WorldVertex(-thing.Size + position_v3.X, thing.Size + position_v3.Y, position_v3.Z);
+					WorldVertex v4 = new WorldVertex(position_v3.X, position_v3.Y, thing.Size + position_v3.Z);
+					WorldVertex v5 = new WorldVertex(position_v3.X, position_v3.Y, -thing.Size + position_v3.Z);
+
+					cageverts = new List<WorldVertex>(new[] { v0, v1, v2, v3, v4, v5 });
+				}
+				else
+				{
+					float top = position_v3.Z + thing.Height;
+					float bottom = position_v3.Z;
+
+					WorldVertex v0 = new WorldVertex(-thing.Size + position_v3.X, -thing.Size + position_v3.Y, bottom);
+					WorldVertex v1 = new WorldVertex(-thing.Size + position_v3.X, thing.Size + position_v3.Y, bottom);
+					WorldVertex v2 = new WorldVertex(thing.Size + position_v3.X, thing.Size + position_v3.Y, bottom);
+					WorldVertex v3 = new WorldVertex(thing.Size + position_v3.X, -thing.Size + position_v3.Y, bottom);
+
+					WorldVertex v4 = new WorldVertex(-thing.Size + position_v3.X, -thing.Size + position_v3.Y, top);
+					WorldVertex v5 = new WorldVertex(-thing.Size + position_v3.X, thing.Size + position_v3.Y, top);
+					WorldVertex v6 = new WorldVertex(thing.Size + position_v3.X, thing.Size + position_v3.Y, top);
+					WorldVertex v7 = new WorldVertex(thing.Size + position_v3.X, -thing.Size + position_v3.Y, top);
+
+					cageverts = new List<WorldVertex>(new[] { v0, v1,	
+															  v1, v2,
+															  v2, v3,
+															  v3, v0,
+															  v4, v5, 
+															  v5, v6,
+															  v6, v7,
+															  v7, v4,
+															  v0, v4,
+															  v1, v5,
+															  v2, v6,
+															  v3, v7 });
+				}
+
+				// Make new arrow
+				if(Thing.IsDirectional)
+				{
+					Matrix transform = Matrix.Scaling(thing.Size, thing.Size, thing.Size)
+						* (Matrix.RotationY(-Thing.RollRad) * Matrix.RotationX(-Thing.PitchRad) * Matrix.RotationZ(Thing.Angle))
+						* (sizeless ? position : position * Matrix.Translation(0.0f, 0.0f, thingheight / 2f));
+
+					WorldVertex a0 = new WorldVertex(Vector3D.Transform(0.0f, 0.0f, 0.0f, transform)); //start
+					WorldVertex a1 = new WorldVertex(Vector3D.Transform(0.0f, -1.5f, 0.0f, transform)); //end
+					WorldVertex a2 = new WorldVertex(Vector3D.Transform(0.2f, -1.1f, 0.2f, transform));
+					WorldVertex a3 = new WorldVertex(Vector3D.Transform(-0.2f, -1.1f, 0.2f, transform));
+					WorldVertex a4 = new WorldVertex(Vector3D.Transform(0.2f, -1.1f, -0.2f, transform));
+					WorldVertex a5 = new WorldVertex(Vector3D.Transform(-0.2f, -1.1f, -0.2f, transform));
+
+					cageverts.AddRange(new[] { a0, a1,
+											   a1, a2,
+											   a1, a3,
+											   a1, a4,
+											   a1, a5 });
+				}
+
+				// Create buffer
+				WorldVertex[] cv = cageverts.ToArray();
+				cagelength = cv.Length / 2;
+				cagebuffer = new VertexBuffer(General.Map.Graphics.Device, WorldVertex.Stride * cv.Length, Usage.WriteOnly | Usage.Dynamic, VertexFormat.None, Pool.Default);
+				cagebuffer.Lock(0, WorldVertex.Stride * cv.Length, LockFlags.None).WriteRange(cv);
+				cagebuffer.Unlock();
+
+				// Done
+				updatecage = false;
+			}
+		}
+
+		//mxd
+		protected void CheckLightState() 
+		{
+			//mxd. Check if thing is light
+			int light_id = Array.IndexOf(GZBuilder.GZGeneral.GZ_LIGHTS, thing.Type);
+			if(light_id != -1) 
+			{
+				isGldefsLight = false;
+				lightInterval = -1;
+				UpdateLight(light_id);
+				UpdateBoundingBox(lightRadius, lightRadius * 2);
+			}
+			//check if we have light from GLDEFS
+			else if(General.Map.Data.GldefsEntries.ContainsKey(thing.Type)) 
+			{
+				isGldefsLight = true;
+				UpdateGldefsLight();
+				UpdateBoundingBox(lightRadius, lightRadius * 2);
+			} 
+			else 
+			{
+				UpdateBoundingBox((int)thing.Size, thingheight);
+
+				lightType = DynamicLightType.NONE;
+				lightRadius = -1;
+				lightPrimaryRadius = -1;
+				lightSecondaryRadius = -1;
+				lightRenderStyle = DynamicLightRenderStyle.NONE;
+				lightInterval = -1;
+				isGldefsLight = false;
+			}
+		}
+
+		//mxd. Used in ColorPicker to update light 
+		public void UpdateLight() 
+		{
+			int light_id = Array.IndexOf(GZBuilder.GZGeneral.GZ_LIGHTS, thing.Type);
+			if(light_id != -1) 
+			{
+				UpdateLight(light_id);
+				UpdateBoundingBox(lightRadius, lightRadius * 2);
+			}
+		}
+
+		//mxd. Update light info
+		private void UpdateLight(int lightId) 
+		{
+			float scaled_intensity = 255.0f / General.Settings.GZDynamicLightIntensity;
+
+			if(lightId < GZBuilder.GZGeneral.GZ_LIGHT_TYPES[2]) //if it's gzdoom light
+			{ 
+				int n;
+				if(lightId < GZBuilder.GZGeneral.GZ_LIGHT_TYPES[0]) 
+				{
+					n = 0;
+					lightRenderStyle = DynamicLightRenderStyle.NORMAL;
+					//lightColor.Alpha used in shader to perform some calculations based on light type
+					lightColor = new Color4((float)lightRenderStyle / 100.0f, thing.Args[0] / scaled_intensity, thing.Args[1] / scaled_intensity, thing.Args[2] / scaled_intensity);
+				} 
+				else if(lightId < GZBuilder.GZGeneral.GZ_LIGHT_TYPES[1]) 
+				{
+					n = 10;
+					lightRenderStyle = DynamicLightRenderStyle.ADDITIVE;
+					lightColor = new Color4((float)lightRenderStyle / 100.0f, thing.Args[0] / scaled_intensity, thing.Args[1] / scaled_intensity, thing.Args[2] / scaled_intensity);
+				} 
+				else 
+				{
+					n = 20;
+					lightRenderStyle = DynamicLightRenderStyle.NEGATIVE;
+					lightColor = new Color4((float)lightRenderStyle / 100.0f, thing.Args[0] / scaled_intensity, thing.Args[1] / scaled_intensity, thing.Args[2] / scaled_intensity);
+				}
+				lightType = (DynamicLightType)(thing.Type - 9800 - n);
+
+				if(lightType == DynamicLightType.SECTOR) 
+				{
+					int scaler = 1;
+					if(thing.Sector != null) scaler = thing.Sector.Brightness / 4;
+					lightPrimaryRadius = (thing.Args[3] * scaler) * General.Settings.GZDynamicLightRadius;
+				} 
+				else 
+				{
+					lightPrimaryRadius = (thing.Args[3] * 2) * General.Settings.GZDynamicLightRadius; //works... that.. way in GZDoom
+					if(lightType > 0) lightSecondaryRadius = (thing.Args[4] * 2) * General.Settings.GZDynamicLightRadius;
+				}
+			}
+			else //it's one of vavoom lights
+			{ 
+				lightRenderStyle = DynamicLightRenderStyle.VAVOOM;
+				lightType = (DynamicLightType)thing.Type;
+				if(lightType == DynamicLightType.VAVOOM_COLORED)
+					lightColor = new Color4((float)lightRenderStyle / 100.0f, thing.Args[1] / scaled_intensity, thing.Args[2] / scaled_intensity, thing.Args[3] / scaled_intensity);
+				else
+					lightColor = new Color4((float)lightRenderStyle / 100.0f, General.Settings.GZDynamicLightIntensity, General.Settings.GZDynamicLightIntensity, General.Settings.GZDynamicLightIntensity);
+				lightPrimaryRadius = (thing.Args[0] * 8) * General.Settings.GZDynamicLightRadius;
+			}
+
+			UpdateLightRadius();
+		}
+
+		//mxd
+		private void UpdateGldefsLight() 
+		{
+			DynamicLightData light = General.Map.Data.GldefsEntries[thing.Type];
+			float intensity_mod = General.Settings.GZDynamicLightIntensity;
+			float scale_mod = General.Settings.GZDynamicLightRadius;
+
+			//apply settings
+			lightRenderStyle = light.Subtractive ? DynamicLightRenderStyle.NEGATIVE : DynamicLightRenderStyle.NORMAL;
+			lightColor = new Color4((float)lightRenderStyle / 100.0f, light.Color.Red * intensity_mod, light.Color.Green * intensity_mod, light.Color.Blue * intensity_mod);
+			Vector2D o = new Vector2D(light.Offset.X, light.Offset.Y).GetRotated(thing.Angle - Angle2D.PIHALF);
+			lightOffset = new Vector3(o.x, o.y, light.Offset.Z);
+			lightType = light.Type;
+
+			if(lightType == DynamicLightType.SECTOR) 
+			{
+				lightPrimaryRadius = light.Interval * thing.Sector.Brightness / 5.0f;
+			} 
+			else 
+			{
+				lightPrimaryRadius = light.PrimaryRadius * scale_mod;
+				lightSecondaryRadius = light.SecondaryRadius * scale_mod;
+			}
+
+			lightInterval = light.Interval;
+			UpdateLightRadius(lightInterval);
+		}
+
+		//mxd
+		public void UpdateLightRadius() 
+		{
+			UpdateLightRadius( (lightInterval != -1 ? lightInterval : thing.AngleDoom) );
+		}
+
+		//mxd
+		private void UpdateLightRadius(int interval) 
+		{
+			if(lightType == DynamicLightType.NONE) 
+			{
+				General.ErrorLogger.Add(ErrorType.Error, "Please check that thing is light before accessing it's PositionAndRadius! You can use lightType, which is -1 if thing isn't light");
+				return;
+			}
+
+			if(General.Settings.GZDrawLightsMode == LightRenderMode.ALL || Array.IndexOf(GZBuilder.GZGeneral.GZ_ANIMATED_LIGHT_TYPES, lightType) == -1) 
+			{
+				lightRadius = lightPrimaryRadius;
+				return;
+			}
+
+			if(interval == 0) 
+			{
+				lightRadius = 0;
+				return;
+			}
+
+			float time = Clock.CurrentTime;
+			float rMin = Math.Min(lightPrimaryRadius, lightSecondaryRadius);
+			float rMax = Math.Max(lightPrimaryRadius, lightSecondaryRadius);
+			float diff = rMax - rMin;
+
+			switch(lightType) 
+			{
+				case DynamicLightType.PULSE:
+					lightDelta = ((float)Math.Sin(time / (interval * 4.0f)) + 1.0f) / 2.0f; //just playing by the eye here... in [0.0 ... 1.0] interval
+					lightRadius = rMin + diff * lightDelta;
+					break;
+
+				case DynamicLightType.FLICKER: 
+					float fdelta = (float)Math.Sin(time / 0.1f); //just playing by the eye here...
+					if(Math.Sign(fdelta) != Math.Sign(lightDelta)) 
+					{
+						lightDelta = fdelta;
+						lightRadius = (General.Random(0, 359) < interval ? rMax : rMin);
+					}
+					break;
+
+				case DynamicLightType.RANDOM:
+					float rdelta = (float)Math.Sin(time / (interval * 9.0f)); //just playing by the eye here...
+					if(Math.Sign(rdelta) != Math.Sign(lightDelta)) 
+					{
+						lightRadius = rMin + (General.Random(0, (int) (diff * 10))) / 10.0f;
+					}
+					lightDelta = rdelta;
+					break;
+			}
+		}
+
+		//mxd. update bounding box
+		public void UpdateBoundingBox() 
+		{
+			if(lightType != DynamicLightType.NONE && lightRadius > thing.Size)
+				UpdateBoundingBox(lightRadius, lightRadius * 2);
+		}
+
+		private void UpdateBoundingBox(float width, float height) 
+		{
+			boundingBox = new Vector3D[9];
+			boundingBox[0] = CenterV3D;
+			float h2 = height / 2.0f;
+
+			boundingBox[1] = new Vector3D(position_v3.X - width, position_v3.Y - width, Center.Z - h2);
+			boundingBox[2] = new Vector3D(position_v3.X + width, position_v3.Y - width, Center.Z - h2);
+			boundingBox[3] = new Vector3D(position_v3.X - width, position_v3.Y + width, Center.Z - h2);
+			boundingBox[4] = new Vector3D(position_v3.X + width, position_v3.Y + width, Center.Z - h2);
+
+			boundingBox[5] = new Vector3D(position_v3.X - width, position_v3.Y - width, Center.Z + h2);
+			boundingBox[6] = new Vector3D(position_v3.X + width, position_v3.Y - width, Center.Z + h2);
+			boundingBox[7] = new Vector3D(position_v3.X - width, position_v3.Y + width, Center.Z + h2);
+			boundingBox[8] = new Vector3D(position_v3.X + width, position_v3.Y + width, Center.Z + h2);
+		}
+		
+		/// <summary>
+		/// This is called when the thing must be tested for line intersection. This should reject
+		/// as fast as possible to rule out all geometry that certainly does not touch the line.
+		/// </summary>
+		public virtual bool PickFastReject(Vector3D from, Vector3D to, Vector3D dir)
+		{
+			return false;
+		}
+		
+		/// <summary>
+		/// This is called when the thing must be tested for line intersection. This should perform
+		/// accurate hit detection and set u_ray to the position on the ray where this hits the geometry.
+		/// </summary>
+		public virtual bool PickAccurate(Vector3D from, Vector3D to, Vector3D dir, ref float u_ray)
+		{
+			return false;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/VisualModes/VisualVertex.cs b/Source/Core/VisualModes/VisualVertex.cs
new file mode 100644
index 0000000..d52995c
--- /dev/null
+++ b/Source/Core/VisualModes/VisualVertex.cs
@@ -0,0 +1,102 @@
+using System;
+using CodeImp.DoomBuilder.Map;
+using SlimDX;
+using CodeImp.DoomBuilder.Geometry;
+
+namespace CodeImp.DoomBuilder.VisualModes
+{
+	public class VisualVertexPair
+	{
+		private VisualVertex floorvert;
+		private VisualVertex ceilvert;
+
+		public VisualVertex[] Vertices { get { return new[] { floorvert, ceilvert }; } }
+		public VisualVertex FloorVertex { get { return floorvert; } }
+		public VisualVertex CeilingVertex { get { return ceilvert; } }
+		public bool Changed { set { floorvert.Changed = value; ceilvert.Changed = value; } }
+
+		public VisualVertexPair(VisualVertex floorvert, VisualVertex ceilvert) 
+		{
+			if(floorvert.CeilingVertex == ceilvert.CeilingVertex)
+				throw new Exception("VisualVertexPair: both verts have the same alignment! We cannot tolerate this!");
+
+			this.floorvert = floorvert;
+			this.ceilvert = ceilvert;
+		}
+
+		public void Update() 
+		{
+			if(floorvert.Changed) floorvert.Update();
+			if(ceilvert.Changed) ceilvert.Update();
+		}
+
+		public void Deselect() 
+		{
+			floorvert.Selected = false;
+			ceilvert.Selected = false;
+		}
+	}
+
+	public abstract class VisualVertex : IVisualPickable, IComparable<VisualVertex>
+	{
+		//Constants
+		public const float DEFAULT_SIZE = 6.0f;
+		
+		//Variables
+		protected Vertex vertex;
+		private Matrix position;
+		private float cameradistance;
+		protected bool selected;
+		protected bool changed;
+		protected bool ceilingVertex;
+		protected bool haveOffset;
+
+		//Properties
+		internal Matrix Position { get { return position; } }
+		public Vertex Vertex { get { return vertex; } }
+		public bool Selected { get { return selected; } set { selected = value; } }
+		public bool Changed { get { return changed; } set { changed |= value; } }
+		public bool CeilingVertex { get { return ceilingVertex; } }
+		public bool HaveHeightOffset { get { return haveOffset; } }
+
+		protected VisualVertex(Vertex v, bool ceilingVertex) 
+		{
+			vertex = v;
+			position = Matrix.Identity;
+			this.ceilingVertex = ceilingVertex;
+		}
+
+		public void SetPosition(Vector3D pos) 
+		{
+			position = Matrix.Translation(pos.x, pos.y, pos.z);
+		}
+
+		public virtual void Update() { }
+
+		/// <summary>
+		/// This is called when the thing must be tested for line intersection. This should reject
+		/// as fast as possible to rule out all geometry that certainly does not touch the line.
+		/// </summary>
+		public virtual bool PickFastReject(Vector3D from, Vector3D to, Vector3D dir) 
+		{
+			return false;
+		}
+
+		/// <summary>
+		/// This is called when the thing must be tested for line intersection. This should perform
+		/// accurate hit detection and set u_ray to the position on the ray where this hits the geometry.
+		/// </summary>
+		public virtual bool PickAccurate(Vector3D from, Vector3D to, Vector3D dir, ref float u_ray) 
+		{
+			return false;
+		}
+
+		/// <summary>
+		/// This sorts things by distance from the camera. Farthest first.
+		/// </summary>
+		public int CompareTo(VisualVertex other) 
+		{
+			return Math.Sign(other.cameradistance - this.cameradistance);
+		}
+	}
+}
diff --git a/Source/Core/Windows/AboutForm.Designer.cs b/Source/Core/Windows/AboutForm.Designer.cs
new file mode 100644
index 0000000..b2ed571
--- /dev/null
+++ b/Source/Core/Windows/AboutForm.Designer.cs
@@ -0,0 +1,269 @@
+namespace CodeImp.DoomBuilder.Windows
+{
+	partial class AboutForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			System.Windows.Forms.Label label1;
+			System.Windows.Forms.PictureBox pictureBox1;
+			System.Windows.Forms.PictureBox pictureBox3;
+			this.close = new System.Windows.Forms.Button();
+			this.builderlink = new System.Windows.Forms.LinkLabel();
+			this.pictureBox2 = new System.Windows.Forms.PictureBox();
+			this.codeimplink = new System.Windows.Forms.LinkLabel();
+			this.tabControl1 = new System.Windows.Forms.TabControl();
+			this.tabPage1 = new System.Windows.Forms.TabPage();
+			this.pictureBox4 = new System.Windows.Forms.PictureBox();
+			this.gzdbLink = new System.Windows.Forms.LinkLabel();
+			this.copyversion = new System.Windows.Forms.Button();
+			this.version = new System.Windows.Forms.Label();
+			this.tabPage2 = new System.Windows.Forms.TabPage();
+			label1 = new System.Windows.Forms.Label();
+			pictureBox1 = new System.Windows.Forms.PictureBox();
+			pictureBox3 = new System.Windows.Forms.PictureBox();
+			((System.ComponentModel.ISupportInitialize)(pictureBox1)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(pictureBox3)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
+			this.tabControl1.SuspendLayout();
+			this.tabPage1.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit();
+			this.tabPage2.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// label1
+			// 
+			label1.FlatStyle = System.Windows.Forms.FlatStyle.System;
+			label1.Location = new System.Drawing.Point(11, 98);
+			label1.Name = "label1";
+			label1.Size = new System.Drawing.Size(349, 50);
+			label1.TabIndex = 2;
+			label1.Text = "Doom Builder is designed and programmed by Pascal vd Heiden.\r\nSeveral game config" +
+				"urations were written by various members of the Doom community. See the website " +
+				"for a complete list of credits.";
+			// 
+			// pictureBox1
+			// 
+			pictureBox1.Image = global::CodeImp.DoomBuilder.Properties.Resources.Splash3_small;
+			pictureBox1.Location = new System.Drawing.Point(6, 6);
+			pictureBox1.Name = "pictureBox1";
+			pictureBox1.Size = new System.Drawing.Size(226, 80);
+			pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
+			pictureBox1.TabIndex = 0;
+			pictureBox1.TabStop = false;
+			// 
+			// pictureBox3
+			// 
+			pictureBox3.Image = global::CodeImp.DoomBuilder.Properties.Resources.GZDB_Logo_small;
+			pictureBox3.Location = new System.Drawing.Point(6, 6);
+			pictureBox3.Name = "pictureBox3";
+			pictureBox3.Size = new System.Drawing.Size(226, 80);
+			pictureBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
+			pictureBox3.TabIndex = 12;
+			pictureBox3.TabStop = false;
+			// 
+			// close
+			// 
+			this.close.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.close.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.close.Location = new System.Drawing.Point(285, 245);
+			this.close.Name = "close";
+			this.close.Size = new System.Drawing.Size(116, 25);
+			this.close.TabIndex = 5;
+			this.close.Text = "Close";
+			this.close.UseVisualStyleBackColor = true;
+			// 
+			// builderlink
+			// 
+			this.builderlink.ActiveLinkColor = System.Drawing.Color.Firebrick;
+			this.builderlink.AutoSize = true;
+			this.builderlink.LinkColor = System.Drawing.SystemColors.HotTrack;
+			this.builderlink.Location = new System.Drawing.Point(8, 156);
+			this.builderlink.Name = "builderlink";
+			this.builderlink.Size = new System.Drawing.Size(114, 13);
+			this.builderlink.TabIndex = 3;
+			this.builderlink.TabStop = true;
+			this.builderlink.Text = "www.doombuilder.com";
+			this.builderlink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.builderlink_LinkClicked);
+			// 
+			// pictureBox2
+			// 
+			this.pictureBox2.Image = global::CodeImp.DoomBuilder.Properties.Resources.CLogo;
+			this.pictureBox2.Location = new System.Drawing.Point(289, 6);
+			this.pictureBox2.Name = "pictureBox2";
+			this.pictureBox2.Size = new System.Drawing.Size(88, 80);
+			this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
+			this.pictureBox2.TabIndex = 10;
+			this.pictureBox2.TabStop = false;
+			// 
+			// codeimplink
+			// 
+			this.codeimplink.ActiveLinkColor = System.Drawing.Color.Firebrick;
+			this.codeimplink.AutoSize = true;
+			this.codeimplink.LinkColor = System.Drawing.SystemColors.HotTrack;
+			this.codeimplink.Location = new System.Drawing.Point(8, 176);
+			this.codeimplink.Name = "codeimplink";
+			this.codeimplink.Size = new System.Drawing.Size(97, 13);
+			this.codeimplink.TabIndex = 4;
+			this.codeimplink.TabStop = true;
+			this.codeimplink.Text = "www.codeimp.com";
+			this.codeimplink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.codeimplink_LinkClicked);
+			// 
+			// tabControl1
+			// 
+			this.tabControl1.Controls.Add(this.tabPage1);
+			this.tabControl1.Controls.Add(this.tabPage2);
+			this.tabControl1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.tabControl1.Location = new System.Drawing.Point(12, 12);
+			this.tabControl1.Name = "tabControl1";
+			this.tabControl1.Padding = new System.Drawing.Point(24, 3);
+			this.tabControl1.SelectedIndex = 0;
+			this.tabControl1.Size = new System.Drawing.Size(391, 227);
+			this.tabControl1.TabIndex = 11;
+			// 
+			// tabPage1
+			// 
+			this.tabPage1.Controls.Add(pictureBox3);
+			this.tabPage1.Controls.Add(this.pictureBox4);
+			this.tabPage1.Controls.Add(this.gzdbLink);
+			this.tabPage1.Controls.Add(this.copyversion);
+			this.tabPage1.Controls.Add(this.version);
+			this.tabPage1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.tabPage1.Location = new System.Drawing.Point(4, 22);
+			this.tabPage1.Name = "tabPage1";
+			this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
+			this.tabPage1.Size = new System.Drawing.Size(383, 201);
+			this.tabPage1.TabIndex = 0;
+			this.tabPage1.Text = "About GZDoom Builder";
+			this.tabPage1.UseVisualStyleBackColor = true;
+			// 
+			// pictureBox4
+			// 
+			this.pictureBox4.Image = global::CodeImp.DoomBuilder.Properties.Resources.MLogo;
+			this.pictureBox4.Location = new System.Drawing.Point(289, 6);
+			this.pictureBox4.Name = "pictureBox4";
+			this.pictureBox4.Size = new System.Drawing.Size(88, 80);
+			this.pictureBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
+			this.pictureBox4.TabIndex = 16;
+			this.pictureBox4.TabStop = false;
+			// 
+			// gzdbLink
+			// 
+			this.gzdbLink.AutoSize = true;
+			this.gzdbLink.LinkArea = new System.Windows.Forms.LinkArea(110, 152);
+			this.gzdbLink.LinkColor = System.Drawing.SystemColors.HotTrack;
+			this.gzdbLink.Location = new System.Drawing.Point(11, 136);
+			this.gzdbLink.Name = "gzdbLink";
+			this.gzdbLink.Size = new System.Drawing.Size(309, 42);
+			this.gzdbLink.TabIndex = 15;
+			this.gzdbLink.TabStop = true;
+			this.gzdbLink.Text = "GZDoom Builder is designed and programmed by MaxED.\r\nGZDoom Builder uses game con" +
+				"figurations created by Gez.\r\nOfficial thread at ZDoom.org";
+			this.gzdbLink.UseCompatibleTextRendering = true;
+			this.gzdbLink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.gzdbLink_LinkClicked);
+			// 
+			// copyversion
+			// 
+			this.copyversion.Location = new System.Drawing.Point(269, 97);
+			this.copyversion.Name = "copyversion";
+			this.copyversion.Size = new System.Drawing.Size(108, 25);
+			this.copyversion.TabIndex = 13;
+			this.copyversion.Text = "Copy Version";
+			this.copyversion.UseVisualStyleBackColor = true;
+			this.copyversion.Click += new System.EventHandler(this.copyversion_Click);
+			// 
+			// version
+			// 
+			this.version.AutoSize = true;
+			this.version.FlatStyle = System.Windows.Forms.FlatStyle.System;
+			this.version.Location = new System.Drawing.Point(11, 102);
+			this.version.Name = "version";
+			this.version.Size = new System.Drawing.Size(150, 13);
+			this.version.TabIndex = 11;
+			this.version.Text = "GZDoom Builder some version";
+			// 
+			// tabPage2
+			// 
+			this.tabPage2.Controls.Add(pictureBox1);
+			this.tabPage2.Controls.Add(this.codeimplink);
+			this.tabPage2.Controls.Add(label1);
+			this.tabPage2.Controls.Add(this.pictureBox2);
+			this.tabPage2.Controls.Add(this.builderlink);
+			this.tabPage2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.tabPage2.Location = new System.Drawing.Point(4, 22);
+			this.tabPage2.Name = "tabPage2";
+			this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
+			this.tabPage2.Size = new System.Drawing.Size(383, 201);
+			this.tabPage2.TabIndex = 1;
+			this.tabPage2.Text = "About Doom Builder";
+			this.tabPage2.UseVisualStyleBackColor = true;
+			// 
+			// AboutForm
+			// 
+			this.AcceptButton = this.close;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.CancelButton = this.close;
+			this.ClientSize = new System.Drawing.Size(413, 277);
+			this.Controls.Add(this.tabControl1);
+			this.Controls.Add(this.close);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "AboutForm";
+			this.Opacity = 1;
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "About";
+			((System.ComponentModel.ISupportInitialize)(pictureBox1)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(pictureBox3)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
+			this.tabControl1.ResumeLayout(false);
+			this.tabPage1.ResumeLayout(false);
+			this.tabPage1.PerformLayout();
+			((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).EndInit();
+			this.tabPage2.ResumeLayout(false);
+			this.tabPage2.PerformLayout();
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Button close;
+		private System.Windows.Forms.LinkLabel builderlink;
+		private System.Windows.Forms.PictureBox pictureBox2;
+		private System.Windows.Forms.LinkLabel codeimplink;
+		private System.Windows.Forms.TabControl tabControl1;
+		private System.Windows.Forms.TabPage tabPage1;
+		private System.Windows.Forms.PictureBox pictureBox4;
+		private System.Windows.Forms.LinkLabel gzdbLink;
+		private System.Windows.Forms.Button copyversion;
+		private System.Windows.Forms.Label version;
+		private System.Windows.Forms.TabPage tabPage2;
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/AboutForm.cs b/Source/Core/Windows/AboutForm.cs
new file mode 100644
index 0000000..279c75e
--- /dev/null
+++ b/Source/Core/Windows/AboutForm.cs
@@ -0,0 +1,67 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Windows.Forms;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Windows
+{
+	internal partial class AboutForm : DelayedForm
+	{
+		// Constructor
+		public AboutForm()
+		{
+			// Initialize
+			InitializeComponent();
+
+			// Show version
+#if DEBUG
+			version.Text = Application.ProductName + " [DEVBUILD]";
+#else
+			version.Text = Application.ProductName + " v" + Application.ProductVersion;
+#endif
+		}
+
+		// Launch Doom Builder website
+		private void builderlink_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+		{
+			General.OpenWebsite("http://" + builderlink.Text);
+		}
+
+		// Launch CodeImp website
+		private void codeimplink_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+		{
+			General.OpenWebsite("http://" + codeimplink.Text);
+		}
+
+		//mxd
+		private void gzdbLink_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) 
+		{
+			General.OpenWebsite("http://forum.zdoom.org/viewtopic.php?f=3&t=32392");
+		}
+
+		// This copies the version number to clipboard
+		private void copyversion_Click(object sender, EventArgs e)
+		{
+			Clipboard.Clear();
+			Clipboard.SetText(Application.ProductVersion);
+		}
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/AboutForm.resx b/Source/Core/Windows/AboutForm.resx
new file mode 100644
index 0000000..3149608
--- /dev/null
+++ b/Source/Core/Windows/AboutForm.resx
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="label1.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="pictureBox1.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="pictureBox3.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Windows/ActionBrowserForm.Designer.cs b/Source/Core/Windows/ActionBrowserForm.Designer.cs
new file mode 100644
index 0000000..2e12e1b
--- /dev/null
+++ b/Source/Core/Windows/ActionBrowserForm.Designer.cs
@@ -0,0 +1,555 @@
+namespace CodeImp.DoomBuilder.Windows
+{
+	partial class ActionBrowserForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			System.Windows.Forms.Label label1;
+			System.Windows.Forms.Label label2;
+			System.Windows.Forms.Label label3;
+			System.Windows.Forms.Label label4;
+			System.Windows.Forms.Label label5;
+			System.Windows.Forms.Label label6;
+			System.Windows.Forms.GroupBox groupBox1;
+			System.Windows.Forms.Label label7;
+			System.Windows.Forms.GroupBox groupBox2;
+			this.category = new System.Windows.Forms.ComboBox();
+			this.option7 = new System.Windows.Forms.ComboBox();
+			this.option7label = new System.Windows.Forms.Label();
+			this.option6 = new System.Windows.Forms.ComboBox();
+			this.option6label = new System.Windows.Forms.Label();
+			this.option5 = new System.Windows.Forms.ComboBox();
+			this.option5label = new System.Windows.Forms.Label();
+			this.option4 = new System.Windows.Forms.ComboBox();
+			this.option4label = new System.Windows.Forms.Label();
+			this.option3 = new System.Windows.Forms.ComboBox();
+			this.option3label = new System.Windows.Forms.Label();
+			this.option2 = new System.Windows.Forms.ComboBox();
+			this.option2label = new System.Windows.Forms.Label();
+			this.option1 = new System.Windows.Forms.ComboBox();
+			this.option1label = new System.Windows.Forms.Label();
+			this.option0 = new System.Windows.Forms.ComboBox();
+			this.option0label = new System.Windows.Forms.Label();
+			this.cancel = new System.Windows.Forms.Button();
+			this.apply = new System.Windows.Forms.Button();
+			this.actions = new System.Windows.Forms.TreeView();
+			this.tabs = new System.Windows.Forms.TabControl();
+			this.tabactions = new System.Windows.Forms.TabPage();
+			this.filterPanel = new System.Windows.Forms.Panel();
+			this.tbFilter = new System.Windows.Forms.TextBox();
+			this.btnClearFilter = new System.Windows.Forms.Button();
+			this.labelFilter = new System.Windows.Forms.Label();
+			this.prefixespanel = new System.Windows.Forms.Panel();
+			this.tabgeneralized = new System.Windows.Forms.TabPage();
+			label1 = new System.Windows.Forms.Label();
+			label2 = new System.Windows.Forms.Label();
+			label3 = new System.Windows.Forms.Label();
+			label4 = new System.Windows.Forms.Label();
+			label5 = new System.Windows.Forms.Label();
+			label6 = new System.Windows.Forms.Label();
+			groupBox1 = new System.Windows.Forms.GroupBox();
+			label7 = new System.Windows.Forms.Label();
+			groupBox2 = new System.Windows.Forms.GroupBox();
+			groupBox1.SuspendLayout();
+			groupBox2.SuspendLayout();
+			this.tabs.SuspendLayout();
+			this.tabactions.SuspendLayout();
+			this.filterPanel.SuspendLayout();
+			this.prefixespanel.SuspendLayout();
+			this.tabgeneralized.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// label1
+			// 
+			label1.AutoSize = true;
+			label1.Location = new System.Drawing.Point(27, 4);
+			label1.Name = "label1";
+			label1.Size = new System.Drawing.Size(58, 13);
+			label1.TabIndex = 21;
+			label1.Text = "S = Switch";
+			// 
+			// label2
+			// 
+			label2.AutoSize = true;
+			label2.Location = new System.Drawing.Point(140, 4);
+			label2.Name = "label2";
+			label2.Size = new System.Drawing.Size(79, 13);
+			label2.TabIndex = 22;
+			label2.Text = "W = Walk over";
+			// 
+			// label3
+			// 
+			label3.AutoSize = true;
+			label3.Location = new System.Drawing.Point(269, 4);
+			label3.Name = "label3";
+			label3.Size = new System.Drawing.Size(61, 13);
+			label3.TabIndex = 23;
+			label3.Text = "G = Gunfire";
+			// 
+			// label4
+			// 
+			label4.AutoSize = true;
+			label4.Location = new System.Drawing.Point(27, 20);
+			label4.Name = "label4";
+			label4.Size = new System.Drawing.Size(50, 13);
+			label4.TabIndex = 24;
+			label4.Text = "D = Door";
+			// 
+			// label5
+			// 
+			label5.AutoSize = true;
+			label5.Location = new System.Drawing.Point(140, 20);
+			label5.Name = "label5";
+			label5.Size = new System.Drawing.Size(82, 13);
+			label5.TabIndex = 25;
+			label5.Text = "R = Repeatable";
+			// 
+			// label6
+			// 
+			label6.AutoSize = true;
+			label6.Location = new System.Drawing.Point(269, 20);
+			label6.Name = "label6";
+			label6.Size = new System.Drawing.Size(73, 13);
+			label6.TabIndex = 26;
+			label6.Text = "1 = Once only";
+			// 
+			// groupBox1
+			// 
+			groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			groupBox1.Controls.Add(this.category);
+			groupBox1.Controls.Add(label7);
+			groupBox1.Location = new System.Drawing.Point(6, 6);
+			groupBox1.Name = "groupBox1";
+			groupBox1.Size = new System.Drawing.Size(379, 65);
+			groupBox1.TabIndex = 0;
+			groupBox1.TabStop = false;
+			groupBox1.Text = " Category ";
+			// 
+			// category
+			// 
+			this.category.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.category.FormattingEnabled = true;
+			this.category.Location = new System.Drawing.Point(118, 25);
+			this.category.Name = "category";
+			this.category.Size = new System.Drawing.Size(199, 21);
+			this.category.TabIndex = 0;
+			this.category.SelectedIndexChanged += new System.EventHandler(this.category_SelectedIndexChanged);
+			// 
+			// label7
+			// 
+			label7.AutoSize = true;
+			label7.Location = new System.Drawing.Point(58, 28);
+			label7.Name = "label7";
+			label7.Size = new System.Drawing.Size(52, 13);
+			label7.TabIndex = 0;
+			label7.Text = "Category:";
+			// 
+			// groupBox2
+			// 
+			groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			groupBox2.Controls.Add(this.option7);
+			groupBox2.Controls.Add(this.option7label);
+			groupBox2.Controls.Add(this.option6);
+			groupBox2.Controls.Add(this.option6label);
+			groupBox2.Controls.Add(this.option5);
+			groupBox2.Controls.Add(this.option5label);
+			groupBox2.Controls.Add(this.option4);
+			groupBox2.Controls.Add(this.option4label);
+			groupBox2.Controls.Add(this.option3);
+			groupBox2.Controls.Add(this.option3label);
+			groupBox2.Controls.Add(this.option2);
+			groupBox2.Controls.Add(this.option2label);
+			groupBox2.Controls.Add(this.option1);
+			groupBox2.Controls.Add(this.option1label);
+			groupBox2.Controls.Add(this.option0);
+			groupBox2.Controls.Add(this.option0label);
+			groupBox2.Location = new System.Drawing.Point(6, 77);
+			groupBox2.Name = "groupBox2";
+			groupBox2.Size = new System.Drawing.Size(379, 326);
+			groupBox2.TabIndex = 1;
+			groupBox2.TabStop = false;
+			groupBox2.Text = " Options ";
+			// 
+			// option7
+			// 
+			this.option7.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.option7.FormattingEnabled = true;
+			this.option7.Location = new System.Drawing.Point(118, 280);
+			this.option7.Name = "option7";
+			this.option7.Size = new System.Drawing.Size(199, 21);
+			this.option7.TabIndex = 7;
+			this.option7.Visible = false;
+			// 
+			// option7label
+			// 
+			this.option7label.Location = new System.Drawing.Point(3, 283);
+			this.option7label.Name = "option7label";
+			this.option7label.Size = new System.Drawing.Size(109, 19);
+			this.option7label.TabIndex = 16;
+			this.option7label.Text = "Option:";
+			this.option7label.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			this.option7label.Visible = false;
+			// 
+			// option6
+			// 
+			this.option6.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.option6.FormattingEnabled = true;
+			this.option6.Location = new System.Drawing.Point(118, 244);
+			this.option6.Name = "option6";
+			this.option6.Size = new System.Drawing.Size(199, 21);
+			this.option6.TabIndex = 6;
+			this.option6.Visible = false;
+			// 
+			// option6label
+			// 
+			this.option6label.Location = new System.Drawing.Point(3, 247);
+			this.option6label.Name = "option6label";
+			this.option6label.Size = new System.Drawing.Size(109, 19);
+			this.option6label.TabIndex = 14;
+			this.option6label.Text = "Option:";
+			this.option6label.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			this.option6label.Visible = false;
+			// 
+			// option5
+			// 
+			this.option5.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.option5.FormattingEnabled = true;
+			this.option5.Location = new System.Drawing.Point(118, 208);
+			this.option5.Name = "option5";
+			this.option5.Size = new System.Drawing.Size(199, 21);
+			this.option5.TabIndex = 5;
+			this.option5.Visible = false;
+			// 
+			// option5label
+			// 
+			this.option5label.Location = new System.Drawing.Point(3, 211);
+			this.option5label.Name = "option5label";
+			this.option5label.Size = new System.Drawing.Size(109, 19);
+			this.option5label.TabIndex = 12;
+			this.option5label.Text = "Option:";
+			this.option5label.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			this.option5label.Visible = false;
+			// 
+			// option4
+			// 
+			this.option4.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.option4.FormattingEnabled = true;
+			this.option4.Location = new System.Drawing.Point(118, 172);
+			this.option4.Name = "option4";
+			this.option4.Size = new System.Drawing.Size(199, 21);
+			this.option4.TabIndex = 4;
+			this.option4.Visible = false;
+			// 
+			// option4label
+			// 
+			this.option4label.Location = new System.Drawing.Point(3, 175);
+			this.option4label.Name = "option4label";
+			this.option4label.Size = new System.Drawing.Size(109, 19);
+			this.option4label.TabIndex = 10;
+			this.option4label.Text = "Option:";
+			this.option4label.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			this.option4label.Visible = false;
+			// 
+			// option3
+			// 
+			this.option3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.option3.FormattingEnabled = true;
+			this.option3.Location = new System.Drawing.Point(118, 136);
+			this.option3.Name = "option3";
+			this.option3.Size = new System.Drawing.Size(199, 21);
+			this.option3.TabIndex = 3;
+			this.option3.Visible = false;
+			// 
+			// option3label
+			// 
+			this.option3label.Location = new System.Drawing.Point(3, 139);
+			this.option3label.Name = "option3label";
+			this.option3label.Size = new System.Drawing.Size(109, 19);
+			this.option3label.TabIndex = 8;
+			this.option3label.Text = "Option:";
+			this.option3label.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			this.option3label.Visible = false;
+			// 
+			// option2
+			// 
+			this.option2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.option2.FormattingEnabled = true;
+			this.option2.Location = new System.Drawing.Point(118, 100);
+			this.option2.Name = "option2";
+			this.option2.Size = new System.Drawing.Size(199, 21);
+			this.option2.TabIndex = 2;
+			this.option2.Visible = false;
+			// 
+			// option2label
+			// 
+			this.option2label.Location = new System.Drawing.Point(3, 103);
+			this.option2label.Name = "option2label";
+			this.option2label.Size = new System.Drawing.Size(109, 19);
+			this.option2label.TabIndex = 6;
+			this.option2label.Text = "Option:";
+			this.option2label.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			this.option2label.Visible = false;
+			// 
+			// option1
+			// 
+			this.option1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.option1.FormattingEnabled = true;
+			this.option1.Location = new System.Drawing.Point(118, 64);
+			this.option1.Name = "option1";
+			this.option1.Size = new System.Drawing.Size(199, 21);
+			this.option1.TabIndex = 1;
+			this.option1.Visible = false;
+			// 
+			// option1label
+			// 
+			this.option1label.Location = new System.Drawing.Point(3, 67);
+			this.option1label.Name = "option1label";
+			this.option1label.Size = new System.Drawing.Size(109, 19);
+			this.option1label.TabIndex = 4;
+			this.option1label.Text = "Option:";
+			this.option1label.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			this.option1label.Visible = false;
+			// 
+			// option0
+			// 
+			this.option0.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.option0.FormattingEnabled = true;
+			this.option0.Location = new System.Drawing.Point(118, 28);
+			this.option0.Name = "option0";
+			this.option0.Size = new System.Drawing.Size(199, 21);
+			this.option0.TabIndex = 0;
+			this.option0.Visible = false;
+			// 
+			// option0label
+			// 
+			this.option0label.Location = new System.Drawing.Point(3, 31);
+			this.option0label.Name = "option0label";
+			this.option0label.Size = new System.Drawing.Size(109, 19);
+			this.option0label.TabIndex = 2;
+			this.option0label.Text = "Option:";
+			this.option0label.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			this.option0label.Visible = false;
+			// 
+			// cancel
+			// 
+			this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.cancel.Location = new System.Drawing.Point(297, 450);
+			this.cancel.Name = "cancel";
+			this.cancel.Size = new System.Drawing.Size(112, 27);
+			this.cancel.TabIndex = 2;
+			this.cancel.Text = "Cancel";
+			this.cancel.UseVisualStyleBackColor = true;
+			this.cancel.Click += new System.EventHandler(this.cancel_Click);
+			// 
+			// apply
+			// 
+			this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.apply.Location = new System.Drawing.Point(177, 450);
+			this.apply.Name = "apply";
+			this.apply.Size = new System.Drawing.Size(112, 27);
+			this.apply.TabIndex = 1;
+			this.apply.Text = "OK";
+			this.apply.UseVisualStyleBackColor = true;
+			this.apply.Click += new System.EventHandler(this.apply_Click);
+			// 
+			// actions
+			// 
+			this.actions.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.actions.HideSelection = false;
+			this.actions.Location = new System.Drawing.Point(6, 34);
+			this.actions.Name = "actions";
+			this.actions.Size = new System.Drawing.Size(379, 335);
+			this.actions.TabIndex = 0;
+			this.actions.DoubleClick += new System.EventHandler(this.actions_DoubleClick);
+			this.actions.MouseEnter += new System.EventHandler(this.actions_MouseEnter);
+			this.actions.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.actions_KeyPress);
+			// 
+			// tabs
+			// 
+			this.tabs.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.tabs.Controls.Add(this.tabactions);
+			this.tabs.Controls.Add(this.tabgeneralized);
+			this.tabs.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.tabs.Location = new System.Drawing.Point(10, 10);
+			this.tabs.Margin = new System.Windows.Forms.Padding(1);
+			this.tabs.Name = "tabs";
+			this.tabs.Padding = new System.Drawing.Point(24, 3);
+			this.tabs.SelectedIndex = 0;
+			this.tabs.Size = new System.Drawing.Size(399, 436);
+			this.tabs.TabIndex = 0;
+			// 
+			// tabactions
+			// 
+			this.tabactions.Controls.Add(this.filterPanel);
+			this.tabactions.Controls.Add(this.actions);
+			this.tabactions.Controls.Add(this.prefixespanel);
+			this.tabactions.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.tabactions.Location = new System.Drawing.Point(4, 22);
+			this.tabactions.Name = "tabactions";
+			this.tabactions.Padding = new System.Windows.Forms.Padding(3);
+			this.tabactions.Size = new System.Drawing.Size(391, 410);
+			this.tabactions.TabIndex = 0;
+			this.tabactions.Text = "Predefined Actions";
+			this.tabactions.UseVisualStyleBackColor = true;
+			// 
+			// filterPanel
+			// 
+			this.filterPanel.Controls.Add(this.tbFilter);
+			this.filterPanel.Controls.Add(this.btnClearFilter);
+			this.filterPanel.Controls.Add(this.labelFilter);
+			this.filterPanel.Location = new System.Drawing.Point(6, 3);
+			this.filterPanel.Name = "filterPanel";
+			this.filterPanel.Size = new System.Drawing.Size(378, 30);
+			this.filterPanel.TabIndex = 31;
+			// 
+			// tbFilter
+			// 
+			this.tbFilter.Location = new System.Drawing.Point(47, 5);
+			this.tbFilter.Name = "tbFilter";
+			this.tbFilter.Size = new System.Drawing.Size(135, 20);
+			this.tbFilter.TabIndex = 28;
+			this.tbFilter.TextChanged += new System.EventHandler(this.tbFilter_TextChanged);
+			this.tbFilter.KeyUp += new System.Windows.Forms.KeyEventHandler(this.tbFilter_KeyUp);
+			// 
+			// btnClearFilter
+			// 
+			this.btnClearFilter.Image = global::CodeImp.DoomBuilder.Properties.Resources.SearchClear;
+			this.btnClearFilter.Location = new System.Drawing.Point(188, 3);
+			this.btnClearFilter.Name = "btnClearFilter";
+			this.btnClearFilter.Size = new System.Drawing.Size(32, 24);
+			this.btnClearFilter.TabIndex = 30;
+			this.btnClearFilter.UseVisualStyleBackColor = true;
+			this.btnClearFilter.Click += new System.EventHandler(this.btnClearFilter_Click);
+			// 
+			// labelFilter
+			// 
+			this.labelFilter.AutoSize = true;
+			this.labelFilter.Location = new System.Drawing.Point(8, 8);
+			this.labelFilter.Name = "labelFilter";
+			this.labelFilter.Size = new System.Drawing.Size(32, 13);
+			this.labelFilter.TabIndex = 29;
+			this.labelFilter.Text = "Filter:";
+			// 
+			// prefixespanel
+			// 
+			this.prefixespanel.Controls.Add(label6);
+			this.prefixespanel.Controls.Add(label5);
+			this.prefixespanel.Controls.Add(label4);
+			this.prefixespanel.Controls.Add(label3);
+			this.prefixespanel.Controls.Add(label2);
+			this.prefixespanel.Controls.Add(label1);
+			this.prefixespanel.Location = new System.Drawing.Point(6, 372);
+			this.prefixespanel.Name = "prefixespanel";
+			this.prefixespanel.Size = new System.Drawing.Size(378, 34);
+			this.prefixespanel.TabIndex = 27;
+			// 
+			// tabgeneralized
+			// 
+			this.tabgeneralized.Controls.Add(groupBox2);
+			this.tabgeneralized.Controls.Add(groupBox1);
+			this.tabgeneralized.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.tabgeneralized.Location = new System.Drawing.Point(4, 22);
+			this.tabgeneralized.Name = "tabgeneralized";
+			this.tabgeneralized.Padding = new System.Windows.Forms.Padding(3);
+			this.tabgeneralized.Size = new System.Drawing.Size(391, 410);
+			this.tabgeneralized.TabIndex = 1;
+			this.tabgeneralized.Text = "Generalized Actions";
+			this.tabgeneralized.UseVisualStyleBackColor = true;
+			// 
+			// ActionBrowserForm
+			// 
+			this.AcceptButton = this.apply;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.CancelButton = this.cancel;
+			this.ClientSize = new System.Drawing.Size(419, 482);
+			this.Controls.Add(this.tabs);
+			this.Controls.Add(this.cancel);
+			this.Controls.Add(this.apply);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "ActionBrowserForm";
+			this.Opacity = 1;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Edit Action";
+			this.Shown += new System.EventHandler(this.ActionBrowserForm_Shown);
+			groupBox1.ResumeLayout(false);
+			groupBox1.PerformLayout();
+			groupBox2.ResumeLayout(false);
+			this.tabs.ResumeLayout(false);
+			this.tabactions.ResumeLayout(false);
+			this.filterPanel.ResumeLayout(false);
+			this.filterPanel.PerformLayout();
+			this.prefixespanel.ResumeLayout(false);
+			this.prefixespanel.PerformLayout();
+			this.tabgeneralized.ResumeLayout(false);
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Button cancel;
+		private System.Windows.Forms.Button apply;
+		private System.Windows.Forms.TreeView actions;
+		private System.Windows.Forms.TabControl tabs;
+		private System.Windows.Forms.TabPage tabactions;
+		private System.Windows.Forms.TabPage tabgeneralized;
+		private System.Windows.Forms.ComboBox category;
+		private System.Windows.Forms.ComboBox option7;
+		private System.Windows.Forms.Label option7label;
+		private System.Windows.Forms.ComboBox option6;
+		private System.Windows.Forms.Label option6label;
+		private System.Windows.Forms.ComboBox option5;
+		private System.Windows.Forms.Label option5label;
+		private System.Windows.Forms.ComboBox option4;
+		private System.Windows.Forms.Label option4label;
+		private System.Windows.Forms.ComboBox option3;
+		private System.Windows.Forms.Label option3label;
+		private System.Windows.Forms.ComboBox option2;
+		private System.Windows.Forms.Label option2label;
+		private System.Windows.Forms.ComboBox option1;
+		private System.Windows.Forms.Label option1label;
+		private System.Windows.Forms.ComboBox option0;
+		private System.Windows.Forms.Label option0label;
+		private System.Windows.Forms.Panel prefixespanel;
+		private System.Windows.Forms.Button btnClearFilter;
+		private System.Windows.Forms.Label labelFilter;
+		private System.Windows.Forms.TextBox tbFilter;
+		private System.Windows.Forms.Panel filterPanel;
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/ActionBrowserForm.cs b/Source/Core/Windows/ActionBrowserForm.cs
new file mode 100644
index 0000000..8ec6458
--- /dev/null
+++ b/Source/Core/Windows/ActionBrowserForm.cs
@@ -0,0 +1,351 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Config;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Windows
+{
+	internal partial class ActionBrowserForm : DelayedForm
+	{
+		// Constants
+		private const int MAX_OPTIONS = 8;
+		
+		// Variables
+		private int selectedaction;
+		private readonly ComboBox[] options;
+		private readonly Label[] optionlbls;
+		private readonly TreeNode[] allNodes; //mxd
+		
+		// Properties
+		public int SelectedAction { get { return selectedaction; } }
+		
+		// Constructor
+		public ActionBrowserForm(int action)
+		{
+			// Initialize
+			InitializeComponent();
+
+			// Make array references for controls
+			options = new[] { option0, option1, option2, option3, option4, option5, option6, option7 };
+			optionlbls = new[] { option0label, option1label, option2label, option3label, option4label,
+									   option5label, option6label, option7label };
+			
+			// Show prefixes panel only for doom type maps
+			if(!General.Map.FormatInterface.HasBuiltInActivations)
+			{
+				prefixespanel.Visible = false;
+				actions.Height += prefixespanel.Height + 3; //mxd
+			}
+			
+			// Go for all predefined categories
+			CreateActionCategories(action);
+			allNodes = new TreeNode[actions.Nodes.Count];
+			actions.Nodes.CopyTo(allNodes, 0);
+
+			// Using generalized actions?
+			if(General.Map.Config.GeneralizedActions)
+			{
+				// Add for all generalized categories to the combobox
+				category.Items.AddRange(General.Map.Config.GenActionCategories.ToArray());
+
+				// Given action is generalized?
+				if(GameConfiguration.IsGeneralized(action, General.Map.Config.GenActionCategories))
+				{
+					// Open the generalized tab
+					tabs.SelectedTab = tabgeneralized;
+
+					// Select category
+					foreach(GeneralizedCategory ac in category.Items)
+						if((action >= ac.Offset) && (action < (ac.Offset + ac.Length))) category.SelectedItem = ac;
+
+					// Anything selected?
+					if(category.SelectedIndex > -1)
+					{
+						// Go for all options in selected category
+						GeneralizedCategory sc = category.SelectedItem as GeneralizedCategory;
+						int actionbits = action - sc.Offset;
+						for(int i = 0; i < MAX_OPTIONS; i++)
+						{
+							// Option used?
+							if(i < sc.Options.Count)
+							{
+								// Go for all bits
+								foreach(GeneralizedBit ab in sc.Options[i].Bits)
+								{
+									// Select this setting if matches
+									if((actionbits & ab.Index) == ab.Index) options[i].SelectedItem = ab;
+								}
+							}
+						}
+					}
+				}
+			}
+			else
+			{
+				// Remove generalized tab
+				tabs.TabPages.Remove(tabgeneralized);
+			}
+		}
+		
+		// This browses for an action
+		// Returns the new action or the same action when cancelled
+		public static int BrowseAction(IWin32Window owner, int action)
+		{
+			ActionBrowserForm f = new ActionBrowserForm(action);
+			if(f.ShowDialog(owner) == DialogResult.OK) action = f.SelectedAction;
+			f.Dispose();
+			return action;
+		}
+
+		//mxd
+		private void CreateActionCategories(int action) 
+		{
+			actions.BeginUpdate();
+			actions.ShowLines = true;
+			foreach(LinedefActionCategory ac in General.Map.Config.ActionCategories)
+			{
+				// Empty category names will not be created
+				// (those actions will go in the root of the tree)
+				if(ac.Title.Length > 0)
+				{
+					// Create category
+					TreeNode cn = actions.Nodes.Add(ac.Title);
+					foreach(LinedefActionInfo ai in ac.Actions) 
+					{
+						// Create action
+						TreeNode n = cn.Nodes.Add(ai.Title);
+						n.Tag = ai;
+
+						// This is the given action?
+						if(ai.Index == action) 
+						{
+							// Select this and expand the category
+							cn.Expand();
+							actions.SelectedNode = n;
+							n.EnsureVisible();
+						}
+					}
+				}
+				else 
+				{
+					// Put actions in the tree root
+					foreach(LinedefActionInfo ai in ac.Actions) 
+					{
+						// Create action
+						TreeNode n = actions.Nodes.Add(ai.Title);
+						n.Tag = ai;
+					}
+				}
+			}
+			actions.EndUpdate();
+		}
+
+		//mxd
+		private void FilterActions(string p) 
+		{
+			List<TreeNode> filteredNodes = new List<TreeNode>();
+
+			foreach(TreeNode n in allNodes) 
+			{
+				foreach(TreeNode cn in n.Nodes) 
+				{
+					LinedefActionInfo ai = cn.Tag as LinedefActionInfo;
+					if(ai.Title.ToLowerInvariant().IndexOf(p) != -1)
+						filteredNodes.Add(cn);
+				}
+			}
+
+			actions.BeginUpdate();
+			actions.Nodes.Clear();
+			actions.ShowLines = false;
+			actions.Nodes.AddRange(filteredNodes.ToArray());
+			actions.EndUpdate();
+		}
+		
+		// OK clicked
+		private void apply_Click(object sender, EventArgs e)
+		{
+			// Presume no result
+			selectedaction = 0;
+			
+			// Predefined action?
+			if(tabs.SelectedTab == tabactions)
+			{
+				// Action node selected?
+				if((actions.SelectedNode != null) && (actions.SelectedNode.Tag is LinedefActionInfo))
+				{
+					// Our result
+					selectedaction = (actions.SelectedNode.Tag as LinedefActionInfo).Index;
+				}
+			}
+			// Generalized action
+			else
+			{
+				// Category selected?
+				if(category.SelectedIndex > -1)
+				{
+					// Add category bits and go for all options
+					GeneralizedCategory sc = category.SelectedItem as GeneralizedCategory;
+					selectedaction = sc.Offset;
+					for(int i = 0; i < MAX_OPTIONS; i++)
+					{
+						// Option used?
+						if(i < sc.Options.Count)
+						{
+							// Add selected bits
+							if(options[i].SelectedIndex > -1)
+								selectedaction += (options[i].SelectedItem as GeneralizedBit).Index;
+						}
+					}
+				}
+			}
+			
+			// Done
+			this.DialogResult = DialogResult.OK;
+			this.Close();
+		}
+
+		// Cancel clicked
+		private void cancel_Click(object sender, EventArgs e)
+		{
+			// Leave
+			this.DialogResult = DialogResult.Cancel;
+			this.Close();
+		}
+
+		// Generalized category selected
+		private void category_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			// Category selected?
+			if(category.SelectedIndex > -1)
+			{
+				// Get the category
+				GeneralizedCategory ac = category.SelectedItem as GeneralizedCategory;
+
+				// Go for all options
+				for(int i = 0; i < MAX_OPTIONS; i++)
+				{
+					// Option used in selected category?
+					if(i < ac.Options.Count)
+					{
+						// Setup controls
+						optionlbls[i].Text = ac.Options[i].Name + ":";
+						options[i].Items.Clear();
+						options[i].Items.AddRange(ac.Options[i].Bits.ToArray());
+						
+						// Show option
+						options[i].Visible = true;
+						optionlbls[i].Visible = true;
+					}
+					else
+					{
+						// Hide option
+						options[i].Visible = false;
+						optionlbls[i].Visible = false;
+					}
+				}
+			}
+			else
+			{
+				// Hide all options
+				for(int i = 0; i < MAX_OPTIONS; i++)
+				{
+					options[i].Visible = false;
+					optionlbls[i].Visible = false;
+				}
+			}
+		}
+		
+		// Double clicking on item
+		private void actions_DoubleClick(object sender, EventArgs e)
+		{
+			// Action node selected?
+			if((actions.SelectedNode != null) && (actions.SelectedNode.Tag is LinedefActionInfo))
+			{
+				if(apply.Enabled) apply_Click(this, EventArgs.Empty);
+			}
+		}
+
+		//mxd
+		private void tbFilter_TextChanged(object sender, EventArgs e) 
+		{
+			if(!string.IsNullOrEmpty(tbFilter.Text.Trim()))
+			{
+				FilterActions(tbFilter.Text);
+			} 
+			else
+			{
+				actions.Nodes.Clear();
+				CreateActionCategories(actions.SelectedNode != null ? ((LinedefActionInfo)actions.SelectedNode.Tag).Index : 0);
+			}
+		}
+
+		//mxd. Switch focus to actions list?
+		private void tbFilter_KeyUp(object sender, KeyEventArgs e)
+		{
+			if(e.KeyCode == Keys.Down && actions.Nodes.Count > 0)
+			{
+				actions.SelectedNode = actions.Nodes[0];
+				actions.Focus();
+			}
+		}
+
+		//mxd
+		private void btnClearFilter_Click(object sender, EventArgs e) 
+		{
+			tbFilter.Clear();
+		}
+
+		//mxd
+		private void ActionBrowserForm_Shown(object sender, EventArgs e) 
+		{
+			if(tabs.SelectedTab == tabactions) tbFilter.Focus();
+		}
+
+		//mxd
+		private void actions_MouseEnter(object sender, EventArgs e)
+		{
+			actions.Focus();
+		}
+
+		//mxd. Transfer focus to Filter textbox
+		private void actions_KeyPress(object sender, KeyPressEventArgs e)
+		{
+			tbFilter.Focus();
+			if(e.KeyChar == '\b') // Any better way to check for Backspace?..
+			{
+				if(!string.IsNullOrEmpty(tbFilter.Text) && tbFilter.SelectionStart > 0 && tbFilter.SelectionLength == 0)
+				{
+					int s = tbFilter.SelectionStart - 1;
+					tbFilter.Text = tbFilter.Text.Remove(s, 1);
+					tbFilter.SelectionStart = s;
+				}
+			}
+			else
+			{
+				tbFilter.AppendText(e.KeyChar.ToString(CultureInfo.InvariantCulture));
+			}
+		}
+	}
+}
diff --git a/Source/Core/Windows/ActionBrowserForm.resx b/Source/Core/Windows/ActionBrowserForm.resx
new file mode 100644
index 0000000..15138f6
--- /dev/null
+++ b/Source/Core/Windows/ActionBrowserForm.resx
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="label1.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label2.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label3.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label4.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label5.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label6.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="groupBox1.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="groupBox1.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="category.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="label7.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="label7.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="groupBox2.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="groupBox2.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="option7.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="option7label.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="option6.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="option6label.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="option5.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="option5label.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="option4.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="option4label.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="option3.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="option3label.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="option2.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="option2label.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="option1.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="option1label.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="option0.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="option0label.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="tabactions.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="tabgeneralized.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Windows/AngleForm.Designer.cs b/Source/Core/Windows/AngleForm.Designer.cs
new file mode 100644
index 0000000..9c6900d
--- /dev/null
+++ b/Source/Core/Windows/AngleForm.Designer.cs
@@ -0,0 +1,95 @@
+namespace CodeImp.DoomBuilder.Windows
+{
+	partial class AngleForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.angle = new CodeImp.DoomBuilder.Controls.AngleControl();
+			this.cancel = new System.Windows.Forms.Button();
+			this.apply = new System.Windows.Forms.Button();
+			this.SuspendLayout();
+			// 
+			// angle
+			// 
+			this.angle.BackColor = System.Drawing.SystemColors.Control;
+			this.angle.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+			this.angle.Location = new System.Drawing.Point(12, 12);
+			this.angle.Name = "angle";
+			this.angle.Size = new System.Drawing.Size(84, 84);
+			this.angle.TabIndex = 0;
+			this.angle.Value = 0;
+			// 
+			// cancel
+			// 
+			this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.cancel.Location = new System.Drawing.Point(102, 69);
+			this.cancel.Name = "cancel";
+			this.cancel.Size = new System.Drawing.Size(60, 25);
+			this.cancel.TabIndex = 2;
+			this.cancel.Text = "Cancel";
+			this.cancel.UseVisualStyleBackColor = true;
+			this.cancel.Click += new System.EventHandler(this.cancel_Click);
+			// 
+			// apply
+			// 
+			this.apply.Location = new System.Drawing.Point(102, 12);
+			this.apply.Name = "apply";
+			this.apply.Size = new System.Drawing.Size(60, 51);
+			this.apply.TabIndex = 1;
+			this.apply.Text = "OK";
+			this.apply.UseVisualStyleBackColor = true;
+			this.apply.Click += new System.EventHandler(this.apply_Click);
+			// 
+			// AngleForm
+			// 
+			this.AcceptButton = this.apply;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.CancelButton = this.cancel;
+			this.ClientSize = new System.Drawing.Size(168, 106);
+			this.Controls.Add(this.cancel);
+			this.Controls.Add(this.apply);
+			this.Controls.Add(this.angle);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "AngleForm";
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Angle";
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private CodeImp.DoomBuilder.Controls.AngleControl angle;
+		private System.Windows.Forms.Button cancel;
+		private System.Windows.Forms.Button apply;
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/AngleForm.cs b/Source/Core/Windows/AngleForm.cs
new file mode 100644
index 0000000..221e843
--- /dev/null
+++ b/Source/Core/Windows/AngleForm.cs
@@ -0,0 +1,98 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Windows.Forms;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Windows
+{
+	public partial class AngleForm : DelayedForm
+	{
+		#region ================== Variables
+
+		//private bool setup;
+		private int value;
+
+		#endregion
+
+		#region ================== Properties
+
+		public int Value { get { return value; } }
+
+		#endregion
+
+		#region ================== Constructor
+
+		// Constructor
+		public AngleForm()
+		{
+			InitializeComponent();
+		}
+		
+		#endregion
+
+		#region ================== Events
+
+		// Cancel clicked
+		private void cancel_Click(object sender, EventArgs e)
+		{
+			// Close
+			DialogResult = DialogResult.Cancel;
+			this.Close();
+		}
+
+		// OK clicked
+		private void apply_Click(object sender, EventArgs e)
+		{
+			this.value = angle.Value;
+			
+			// Done
+			DialogResult = DialogResult.OK;
+			this.Close();
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// Setup from EnumList
+		public void Setup(int value)
+		{
+			//setup = true;
+			this.value = value;
+			angle.Value = value;
+			//setup = false;
+		}
+		
+		// This shows the dialog
+		// Returns the flags or the same flags when cancelled
+		public static int ShowDialog(IWin32Window owner, int value)
+		{
+			int result = value;
+			AngleForm f = new AngleForm();
+			f.Setup(value);
+			if(f.ShowDialog(owner) == DialogResult.OK) result = f.Value;
+			f.Dispose();
+			return result;
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/AngleForm.resx b/Source/Core/Windows/AngleForm.resx
new file mode 100644
index 0000000..19dc0dd
--- /dev/null
+++ b/Source/Core/Windows/AngleForm.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Windows/BitFlagsForm.Designer.cs b/Source/Core/Windows/BitFlagsForm.Designer.cs
new file mode 100644
index 0000000..64afcc6
--- /dev/null
+++ b/Source/Core/Windows/BitFlagsForm.Designer.cs
@@ -0,0 +1,101 @@
+namespace CodeImp.DoomBuilder.Windows
+{
+	partial class BitFlagsForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.options = new CodeImp.DoomBuilder.Controls.CheckboxArrayControl();
+			this.cancel = new System.Windows.Forms.Button();
+			this.apply = new System.Windows.Forms.Button();
+			this.SuspendLayout();
+			// 
+			// options
+			// 
+			this.options.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.options.AutoScroll = true;
+			this.options.Columns = 1;
+			this.options.Location = new System.Drawing.Point(12, 12);
+			this.options.Name = "options";
+			this.options.Size = new System.Drawing.Size(185, 170);
+			this.options.TabIndex = 0;
+			this.options.VerticalSpacing = 1;
+			// 
+			// cancel
+			// 
+			this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.cancel.Location = new System.Drawing.Point(106, 188);
+			this.cancel.Name = "cancel";
+			this.cancel.Size = new System.Drawing.Size(91, 25);
+			this.cancel.TabIndex = 2;
+			this.cancel.Text = "Cancel";
+			this.cancel.UseVisualStyleBackColor = true;
+			this.cancel.Click += new System.EventHandler(this.cancel_Click);
+			// 
+			// apply
+			// 
+			this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.apply.Location = new System.Drawing.Point(12, 188);
+			this.apply.Name = "apply";
+			this.apply.Size = new System.Drawing.Size(91, 25);
+			this.apply.TabIndex = 1;
+			this.apply.Text = "OK";
+			this.apply.UseVisualStyleBackColor = true;
+			this.apply.Click += new System.EventHandler(this.apply_Click);
+			// 
+			// BitFlagsForm
+			// 
+			this.AcceptButton = this.apply;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.CancelButton = this.cancel;
+			this.ClientSize = new System.Drawing.Size(206, 218);
+			this.Controls.Add(this.cancel);
+			this.Controls.Add(this.apply);
+			this.Controls.Add(this.options);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "BitFlagsForm";
+			this.Opacity = 1;
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Options";
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private CodeImp.DoomBuilder.Controls.CheckboxArrayControl options;
+		private System.Windows.Forms.Button cancel;
+		private System.Windows.Forms.Button apply;
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/BitFlagsForm.cs b/Source/Core/Windows/BitFlagsForm.cs
new file mode 100644
index 0000000..e55a623
--- /dev/null
+++ b/Source/Core/Windows/BitFlagsForm.cs
@@ -0,0 +1,177 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Config;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Windows
+{
+	public partial class BitFlagsForm : DelayedForm
+	{
+		#region ================== Variables
+
+		private bool setup;
+		private int value;
+		
+		#endregion
+
+		#region ================== Properties
+
+		public int Value { get { return value; } }
+
+		#endregion
+		
+		#region ================== Constructor
+
+		// Constructor
+		public BitFlagsForm()
+		{
+			// Initialize
+			InitializeComponent();
+		}
+
+		#endregion
+
+		#region ================== Events
+
+		// When a checkbox is clicked
+		private void box_CheckedChanged(object sender, EventArgs e)
+		{
+			if(!setup)
+			{
+				// Now setting up
+				setup = true;
+
+				// Get this checkbox
+				CheckBox thisbox = (sender as CheckBox);
+				
+				// Checking or unchecking?
+				if(thisbox.Checked)
+				{
+					// Go for all other options
+					foreach(CheckBox b in options.Checkboxes)
+					{
+						// Not the same box?
+						if(b != sender)
+						{
+							// Overlapping bit flags? mxd: box with flag 0 requires special handling...
+							if( (int)b.Tag == 0 || (int)thisbox.Tag == 0 || (((int)b.Tag & (int)thisbox.Tag) != 0) ) 
+							{
+								// Uncheck the other
+								b.Checked = false;
+							}
+						}
+					}
+				}
+
+				// Done
+				setup = false;
+			}
+		}
+		
+		// Cancel clicked
+		private void cancel_Click(object sender, EventArgs e)
+		{
+			// Close
+			DialogResult = DialogResult.Cancel;
+			this.Close();
+		}
+
+		// OK clicked
+		private void apply_Click(object sender, EventArgs e)
+		{
+			this.value = 0;
+			
+			// Go for all checkboxes to make the final value
+			foreach(CheckBox b in options.Checkboxes)
+				if(b.Checked) value |= (int)b.Tag;
+			
+			// Done
+			DialogResult = DialogResult.OK;
+			this.Close();
+		}
+
+		#endregion
+
+		#region ================== Methods
+		
+		// Setup from EnumList
+		public void Setup(EnumList flags, int value)
+		{
+			setup = true;
+			this.value = value;
+			int optionsheight = options.Height;
+			
+			// Make a checkbox for each item
+			foreach(EnumItem item in flags)
+			{
+				// Make the checkbox
+				int flag = item.GetIntValue(); //mxd
+				CheckBox box = options.Add(flag + ": " + item.Title, item.GetIntValue());
+				
+				// Bind checking event
+				box.CheckedChanged += box_CheckedChanged;
+
+				// Checking the box?
+				if((value & (int)box.Tag) == (int)box.Tag)
+				{
+					box.Checked = true;
+					
+					// Go for all other checkboxes
+					foreach(CheckBox b in options.Checkboxes)
+					{
+						// Not the same box?
+						if(b != box)
+						{
+							// Overlapping bit flags? mxd: box with flag 0 requires special handling...
+							if( ((int)b.Tag == 0 && value != 0) || ((int)b.Tag & (int)box.Tag) != 0 )
+							{
+								// Uncheck the other
+								b.Checked = false;
+							}
+						}
+					}
+				}
+			}
+
+			//mxd. Update window size
+			this.Height -= (optionsheight - options.GetHeight());
+			int targetwidth = options.GetWidth();
+			if(targetwidth > options.Width) this.Width += (targetwidth - options.Width);
+
+			setup = false;
+		}
+
+		// This shows the dialog
+		// Returns the flags or the same flags when cancelled
+		public static int ShowDialog(IWin32Window owner, EnumList flags, int value)
+		{
+			int result = value;
+			BitFlagsForm f = new BitFlagsForm();
+			f.Setup(flags, value);
+			if(f.ShowDialog(owner) == DialogResult.OK) result = f.Value;
+			f.Dispose();
+			return result;
+		}
+		
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/BitFlagsForm.resx b/Source/Core/Windows/BitFlagsForm.resx
new file mode 100644
index 0000000..19dc0dd
--- /dev/null
+++ b/Source/Core/Windows/BitFlagsForm.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Windows/CenterOnCoordinatesForm.Designer.cs b/Source/Core/Windows/CenterOnCoordinatesForm.Designer.cs
new file mode 100644
index 0000000..bcf2eeb
--- /dev/null
+++ b/Source/Core/Windows/CenterOnCoordinatesForm.Designer.cs
@@ -0,0 +1,141 @@
+namespace CodeImp.DoomBuilder.Windows
+{
+	partial class CenterOnCoordinatesForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing) 
+		{
+			if(disposing && (components != null)) 
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent() 
+		{
+			this.label1 = new System.Windows.Forms.Label();
+			this.label2 = new System.Windows.Forms.Label();
+			this.accept = new System.Windows.Forms.Button();
+			this.cancel = new System.Windows.Forms.Button();
+			this.gotoy = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.gotox = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.SuspendLayout();
+			// 
+			// label1
+			// 
+			this.label1.AutoSize = true;
+			this.label1.Location = new System.Drawing.Point(12, 17);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(17, 13);
+			this.label1.TabIndex = 0;
+			this.label1.Text = "X:";
+			// 
+			// label2
+			// 
+			this.label2.AutoSize = true;
+			this.label2.Location = new System.Drawing.Point(12, 47);
+			this.label2.Name = "label2";
+			this.label2.Size = new System.Drawing.Size(17, 13);
+			this.label2.TabIndex = 1;
+			this.label2.Text = "Y:";
+			// 
+			// accept
+			// 
+			this.accept.Location = new System.Drawing.Point(109, 12);
+			this.accept.Name = "accept";
+			this.accept.Size = new System.Drawing.Size(65, 24);
+			this.accept.TabIndex = 2;
+			this.accept.Text = "OK";
+			this.accept.UseVisualStyleBackColor = true;
+			this.accept.Click += new System.EventHandler(this.accept_Click);
+			// 
+			// cancel
+			// 
+			this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.cancel.Location = new System.Drawing.Point(109, 42);
+			this.cancel.Name = "cancel";
+			this.cancel.Size = new System.Drawing.Size(65, 24);
+			this.cancel.TabIndex = 3;
+			this.cancel.Text = "Cancel";
+			this.cancel.UseVisualStyleBackColor = true;
+			this.cancel.Click += new System.EventHandler(this.cancel_Click);
+			// 
+			// gotoy
+			// 
+			this.gotoy.AllowDecimal = false;
+			this.gotoy.AllowNegative = true;
+			this.gotoy.AllowRelative = false;
+			this.gotoy.ButtonStep = 1;
+			this.gotoy.ButtonStepFloat = 1F;
+			this.gotoy.ButtonStepsWrapAround = false;
+			this.gotoy.Location = new System.Drawing.Point(32, 42);
+			this.gotoy.Name = "gotoy";
+			this.gotoy.Size = new System.Drawing.Size(71, 24);
+			this.gotoy.StepValues = null;
+			this.gotoy.TabIndex = 1;
+			// 
+			// gotox
+			// 
+			this.gotox.AllowDecimal = false;
+			this.gotox.AllowNegative = true;
+			this.gotox.AllowRelative = false;
+			this.gotox.ButtonStep = 1;
+			this.gotox.ButtonStepFloat = 1F;
+			this.gotox.ButtonStepsWrapAround = false;
+			this.gotox.Location = new System.Drawing.Point(32, 12);
+			this.gotox.Name = "gotox";
+			this.gotox.Size = new System.Drawing.Size(71, 24);
+			this.gotox.StepValues = null;
+			this.gotox.TabIndex = 0;
+			// 
+			// CenterOnCoordinatesForm
+			// 
+			this.AcceptButton = this.accept;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.CancelButton = this.cancel;
+			this.ClientSize = new System.Drawing.Size(184, 74);
+			this.Controls.Add(this.cancel);
+			this.Controls.Add(this.accept);
+			this.Controls.Add(this.label2);
+			this.Controls.Add(this.label1);
+			this.Controls.Add(this.gotoy);
+			this.Controls.Add(this.gotox);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "CenterOnCoordinatesForm";
+			this.Opacity = 1;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Go To Coordinates:";
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox gotox;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox gotoy;
+		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.Label label2;
+		private System.Windows.Forms.Button accept;
+		private System.Windows.Forms.Button cancel;
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/CenterOnCoordinatesForm.cs b/Source/Core/Windows/CenterOnCoordinatesForm.cs
new file mode 100644
index 0000000..d1ab783
--- /dev/null
+++ b/Source/Core/Windows/CenterOnCoordinatesForm.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Geometry;
+
+namespace CodeImp.DoomBuilder.Windows
+{
+	public partial class CenterOnCoordinatesForm : DelayedForm
+	{
+		private static Vector2D coordinates;
+		public Vector2D Coordinates { get { return coordinates; } }
+
+		public CenterOnCoordinatesForm() 
+		{
+			InitializeComponent();
+			gotox.Text = coordinates.x.ToString();
+			gotoy.Text = coordinates.y.ToString();
+		}
+
+		private void accept_Click(object sender, EventArgs e) 
+		{
+			coordinates.x = (float)Math.Round(General.Clamp(gotox.GetResult((int)coordinates.x), General.Map.FormatInterface.MinCoordinate, General.Map.FormatInterface.MaxCoordinate));
+			coordinates.y = (float)Math.Round(General.Clamp(gotoy.GetResult((int)coordinates.y), General.Map.FormatInterface.MinCoordinate, General.Map.FormatInterface.MaxCoordinate));
+			
+			this.DialogResult = DialogResult.OK;
+			this.Close();
+		}
+
+		private void cancel_Click(object sender, EventArgs e) 
+		{
+			this.DialogResult = DialogResult.Cancel;
+			this.Close();
+		}
+	}
+}
diff --git a/Source/Core/Windows/CenterOnCoordinatesForm.resx b/Source/Core/Windows/CenterOnCoordinatesForm.resx
new file mode 100644
index 0000000..19dc0dd
--- /dev/null
+++ b/Source/Core/Windows/CenterOnCoordinatesForm.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Windows/ChangeMapForm.Designer.cs b/Source/Core/Windows/ChangeMapForm.Designer.cs
new file mode 100644
index 0000000..fa0db88
--- /dev/null
+++ b/Source/Core/Windows/ChangeMapForm.Designer.cs
@@ -0,0 +1,127 @@
+namespace CodeImp.DoomBuilder.Windows
+{
+	partial class ChangeMapForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing) 
+		{
+			if(disposing && (components != null)) 
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent() 
+		{
+			System.Windows.Forms.Label label2;
+			System.Windows.Forms.ColumnHeader columnHeader1;
+			this.mapslist = new System.Windows.Forms.ListView();
+			this.cancel = new System.Windows.Forms.Button();
+			this.apply = new System.Windows.Forms.Button();
+			label2 = new System.Windows.Forms.Label();
+			columnHeader1 = new System.Windows.Forms.ColumnHeader();
+			this.SuspendLayout();
+			// 
+			// label2
+			// 
+			label2.Location = new System.Drawing.Point(12, 9);
+			label2.Name = "label2";
+			label2.Size = new System.Drawing.Size(396, 17);
+			label2.TabIndex = 17;
+			label2.Text = "Please select the map to load for editing.";
+			// 
+			// columnHeader1
+			// 
+			columnHeader1.Text = "Map name";
+			// 
+			// mapslist
+			// 
+			this.mapslist.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.mapslist.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+            columnHeader1});
+			this.mapslist.FullRowSelect = true;
+			this.mapslist.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
+			this.mapslist.HideSelection = false;
+			this.mapslist.LabelWrap = false;
+			this.mapslist.Location = new System.Drawing.Point(12, 29);
+			this.mapslist.MultiSelect = false;
+			this.mapslist.Name = "mapslist";
+			this.mapslist.ShowGroups = false;
+			this.mapslist.Size = new System.Drawing.Size(396, 125);
+			this.mapslist.Sorting = System.Windows.Forms.SortOrder.Ascending;
+			this.mapslist.TabIndex = 1;
+			this.mapslist.UseCompatibleStateImageBehavior = false;
+			this.mapslist.View = System.Windows.Forms.View.List;
+			this.mapslist.DoubleClick += new System.EventHandler(this.mapslist_DoubleClick);
+			// 
+			// cancel
+			// 
+			this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.cancel.Location = new System.Drawing.Point(296, 161);
+			this.cancel.Name = "cancel";
+			this.cancel.Size = new System.Drawing.Size(112, 25);
+			this.cancel.TabIndex = 2;
+			this.cancel.Text = "Cancel";
+			this.cancel.UseVisualStyleBackColor = true;
+			this.cancel.Click += new System.EventHandler(this.cancel_Click);
+			// 
+			// apply
+			// 
+			this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.apply.Location = new System.Drawing.Point(178, 161);
+			this.apply.Name = "apply";
+			this.apply.Size = new System.Drawing.Size(112, 25);
+			this.apply.TabIndex = 3;
+			this.apply.Text = "OK";
+			this.apply.UseVisualStyleBackColor = true;
+			this.apply.Click += new System.EventHandler(this.apply_Click);
+			// 
+			// ChangeMapForm
+			// 
+			this.AcceptButton = this.apply;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.CancelButton = this.cancel;
+			this.ClientSize = new System.Drawing.Size(420, 192);
+			this.Controls.Add(this.cancel);
+			this.Controls.Add(this.apply);
+			this.Controls.Add(this.mapslist);
+			this.Controls.Add(label2);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "ChangeMapForm";
+			this.Opacity = 1;
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+			this.Text = "Change Map";
+			this.Shown += new System.EventHandler(this.ChangeMapForm_Shown);
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.ListView mapslist;
+		private System.Windows.Forms.Button cancel;
+		private System.Windows.Forms.Button apply;
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/ChangeMapForm.cs b/Source/Core/Windows/ChangeMapForm.cs
new file mode 100644
index 0000000..55d06e8
--- /dev/null
+++ b/Source/Core/Windows/ChangeMapForm.cs
@@ -0,0 +1,215 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.IO;
+using CodeImp.DoomBuilder.Map;
+
+namespace CodeImp.DoomBuilder.Windows
+{
+	public partial class ChangeMapForm : DelayedForm
+	{
+		private MapOptions options;
+		private Configuration mapsettings;
+		private readonly string filepathname;
+
+		public MapOptions Options { get { return options; } }
+
+		public ChangeMapForm(string filepathname, MapOptions options) 
+		{
+			InitializeComponent();
+			this.options = options;
+			this.filepathname = filepathname;
+		}
+
+		private void LoadSettings() 
+		{
+			// Check if the file exists
+			if(!File.Exists(filepathname))
+			{
+				// WAD file does not exist
+				MessageBox.Show(this, "Could not open the WAD file. The file does not exist.", Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Error);
+				this.DialogResult = DialogResult.Cancel;
+				this.Close();
+				return;
+			}
+
+			// Busy
+			Cursor.Current = Cursors.WaitCursor;
+
+			WAD wadfile;
+			try
+			{
+				// Open the WAD file
+				wadfile = new WAD(filepathname, true);
+			}
+			catch(Exception)
+			{
+				// Unable to open WAD file (or its config)
+				MessageBox.Show(this, "Could not open the WAD file for reading. Please make sure the file you selected is valid and is not in use by any other application.", Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Error);
+				this.DialogResult = DialogResult.Cancel;
+				this.Close();
+				return;
+			}
+
+			// Make an array for the map names
+			List<ListViewItem> mapnames = new List<ListViewItem>();
+
+			// Open the Map Settings configuration
+			string dbsfile = filepathname.Substring(0, filepathname.Length - 4) + ".dbs";
+			if(File.Exists(dbsfile))
+			{
+				try
+				{
+					mapsettings = new Configuration(dbsfile, true);
+				}
+				catch (Exception)
+				{
+					mapsettings = new Configuration(true);
+				}
+			}
+			else
+			{
+				mapsettings = new Configuration(true);
+			}
+
+			//mxd. Get Proper configuration
+			ConfigurationInfo ci = General.GetConfigurationInfo(options.ConfigFile);
+
+			// Get the map lump names
+			IDictionary maplumpnames = ci.Configuration.ReadSetting("maplumpnames", new Hashtable());
+
+			// Count how many required lumps we have to find
+			int lumpsrequired = 0;
+			foreach(DictionaryEntry ml in maplumpnames) 
+			{
+				// Ignore the map header (it will not be found because the name is different)
+				if(ml.Key.ToString() != MapManager.CONFIG_MAP_HEADER) 
+				{
+					// Read lump setting and count it
+					if(ci.Configuration.ReadSetting("maplumpnames." + ml.Key + ".required", false))
+						lumpsrequired++;
+				}
+			}
+
+			// Go for all the lumps in the wad
+			for(int scanindex = 0; scanindex < (wadfile.Lumps.Count - 1); scanindex++) 
+			{
+				// Make sure this lump is not part of the map
+				if(!maplumpnames.Contains(wadfile.Lumps[scanindex].Name)) 
+				{
+					// Reset check
+					int lumpsfound = 0;
+					int checkoffset = 1;
+
+					// Continue while still within bounds and lumps are still recognized
+					while(((scanindex + checkoffset) < wadfile.Lumps.Count) &&
+						  maplumpnames.Contains(wadfile.Lumps[scanindex + checkoffset].Name)) 
+					{
+						// Count the lump when it is marked as required
+						string lumpname = wadfile.Lumps[scanindex + checkoffset].Name;
+						if(ci.Configuration.ReadSetting("maplumpnames." + lumpname + ".required", false))
+							lumpsfound++;
+
+						// Check the next lump
+						checkoffset++;
+					}
+
+					// Map found? Then add it to the list
+					if(lumpsfound >= lumpsrequired)
+						mapnames.Add(new ListViewItem(wadfile.Lumps[scanindex].Name));
+				}
+			}
+
+			wadfile.Dispose();
+
+			// Clear the list and add the new map names
+			mapslist.BeginUpdate();
+			mapslist.Items.Clear();
+			mapslist.Items.AddRange(mapnames.ToArray());
+			mapslist.Sort();
+
+			//select current map
+			foreach(ListViewItem item in mapslist.Items) 
+			{
+				// Was this item previously selected?
+				if(item.Text == options.LevelName) 
+				{
+					// Select it again
+					item.Selected = true;
+					item.EnsureVisible();
+					break;
+				}
+			}
+
+			mapslist.EndUpdate();
+
+			// Do some focus managing
+			if(mapslist.SelectedItems.Count > 0)
+			{
+				mapslist.FocusedItem = mapslist.SelectedItems[0];
+			}
+			
+			// Done
+			Cursor.Current = Cursors.Default;
+		}
+
+		private void ChangeMapForm_Shown(object sender, EventArgs e)
+		{
+			LoadSettings();
+		}
+
+		private void mapslist_DoubleClick(object sender, EventArgs e) 
+		{
+			// Click OK
+			if(mapslist.SelectedItems.Count > 0) apply.PerformClick();
+		}
+
+		private void apply_Click(object sender, EventArgs e) 
+		{
+			// No map selected?
+			if(mapslist.SelectedItems.Count == 0)
+			{
+				MessageBox.Show(this, "Please select a map to load for editing.", Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+				mapslist.Focus();
+				return;
+			}
+
+			// Current map is already loaded
+			if(mapslist.SelectedItems[0].Text == options.LevelName)
+			{
+				MessageBox.Show(this, "Map '" + options.LevelName + "' is already loaded.", Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+				mapslist.Focus();
+				return;
+			}
+
+			// Just NO...
+			if(!General.Map.ConfigSettings.ValidateMapName(mapslist.SelectedItems[0].Text.ToUpperInvariant())) 
+			{
+				MessageBox.Show(this, "Selected map name conflicts with a lump name defined for current map format.\nPlease rename the map and try again.", Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+				mapslist.Focus();
+				return;
+			}
+
+			// Create new map options, pass settings which should stay unchanged
+			//TODO: are there other settings which should stay unchanged?..
+			MapOptions newoptions = new MapOptions(mapsettings, mapslist.SelectedItems[0].Text, options.UseLongTextureNames);
+			newoptions.ConfigFile = options.ConfigFile;
+			newoptions.ScriptCompiler = options.ScriptCompiler;
+			options = newoptions;
+			
+			// Hide window
+			this.DialogResult = DialogResult.OK;
+			this.Close();
+		}
+
+		private void cancel_Click(object sender, EventArgs e) 
+		{
+			// Just hide the window
+			this.DialogResult = DialogResult.Cancel;
+			this.Close();
+		}
+	}
+}
diff --git a/Source/Core/Windows/ChangeMapForm.resx b/Source/Core/Windows/ChangeMapForm.resx
new file mode 100644
index 0000000..b1631fe
--- /dev/null
+++ b/Source/Core/Windows/ChangeMapForm.resx
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="label2.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="columnHeader1.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Windows/ConfigForm.Designer.cs b/Source/Core/Windows/ConfigForm.Designer.cs
new file mode 100644
index 0000000..00c24a6
--- /dev/null
+++ b/Source/Core/Windows/ConfigForm.Designer.cs
@@ -0,0 +1,907 @@
+namespace CodeImp.DoomBuilder.Windows
+{
+	partial class ConfigForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.components = new System.ComponentModel.Container();
+			System.Windows.Forms.Label label5;
+			System.Windows.Forms.Label label6;
+			System.Windows.Forms.Label label3;
+			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ConfigForm));
+			System.Windows.Forms.Label label2;
+			System.Windows.Forms.Label label7;
+			System.Windows.Forms.Label label9;
+			System.Windows.Forms.Label label1;
+			System.Windows.Forms.Label label8;
+			System.Windows.Forms.Label label4;
+			System.Windows.Forms.Label label10;
+			this.labelparameters = new System.Windows.Forms.Label();
+			this.cancel = new System.Windows.Forms.Button();
+			this.apply = new System.Windows.Forms.Button();
+			this.tabs = new System.Windows.Forms.TabControl();
+			this.tabresources = new System.Windows.Forms.TabPage();
+			this.configdata = new CodeImp.DoomBuilder.Controls.ResourceListEditor();
+			this.tabnodebuilder = new System.Windows.Forms.TabPage();
+			this.nodebuildertest = new System.Windows.Forms.ComboBox();
+			this.nodebuildersave = new System.Windows.Forms.ComboBox();
+			this.tabtesting = new System.Windows.Forms.TabPage();
+			this.btnRemoveEngine = new System.Windows.Forms.Button();
+			this.btnNewEngine = new System.Windows.Forms.Button();
+			this.cbEngineSelector = new System.Windows.Forms.ComboBox();
+			this.label13 = new System.Windows.Forms.Label();
+			this.shortpaths = new System.Windows.Forms.CheckBox();
+			this.customparameters = new System.Windows.Forms.CheckBox();
+			this.skill = new CodeImp.DoomBuilder.Controls.ActionSelectorControl();
+			this.browsetestprogram = new System.Windows.Forms.Button();
+			this.noresultlabel = new System.Windows.Forms.Label();
+			this.testresult = new System.Windows.Forms.TextBox();
+			this.labelresult = new System.Windows.Forms.Label();
+			this.testparameters = new System.Windows.Forms.TextBox();
+			this.testapplication = new System.Windows.Forms.TextBox();
+			this.tabtextures = new System.Windows.Forms.TabPage();
+			this.listtextures = new System.Windows.Forms.ListView();
+			this.smallimages = new System.Windows.Forms.ImageList(this.components);
+			this.restoretexturesets = new System.Windows.Forms.Button();
+			this.edittextureset = new System.Windows.Forms.Button();
+			this.pastetexturesets = new System.Windows.Forms.Button();
+			this.copytexturesets = new System.Windows.Forms.Button();
+			this.removetextureset = new System.Windows.Forms.Button();
+			this.addtextureset = new System.Windows.Forms.Button();
+			this.tabmodes = new System.Windows.Forms.TabPage();
+			this.startmode = new System.Windows.Forms.ComboBox();
+			this.label11 = new System.Windows.Forms.Label();
+			this.listmodes = new System.Windows.Forms.ListView();
+			this.colmodename = new System.Windows.Forms.ColumnHeader();
+			this.colmodeplugin = new System.Windows.Forms.ColumnHeader();
+			this.listconfigs = new System.Windows.Forms.ListView();
+			this.columnname = new System.Windows.Forms.ColumnHeader();
+			this.copypastemenu = new System.Windows.Forms.ContextMenuStrip(this.components);
+			this.copyall = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+			this.pasteall = new System.Windows.Forms.ToolStripMenuItem();
+			this.pasteresources = new System.Windows.Forms.ToolStripMenuItem();
+			this.pasteengines = new System.Windows.Forms.ToolStripMenuItem();
+			this.pastecolorpresets = new System.Windows.Forms.ToolStripMenuItem();
+			this.testprogramdialog = new System.Windows.Forms.OpenFileDialog();
+			this.hintlabel = new System.Windows.Forms.Label();
+			this.hint = new System.Windows.Forms.PictureBox();
+			this.tooltip = new System.Windows.Forms.ToolTip(this.components);
+			label5 = new System.Windows.Forms.Label();
+			label6 = new System.Windows.Forms.Label();
+			label3 = new System.Windows.Forms.Label();
+			label2 = new System.Windows.Forms.Label();
+			label7 = new System.Windows.Forms.Label();
+			label9 = new System.Windows.Forms.Label();
+			label1 = new System.Windows.Forms.Label();
+			label8 = new System.Windows.Forms.Label();
+			label4 = new System.Windows.Forms.Label();
+			label10 = new System.Windows.Forms.Label();
+			this.tabs.SuspendLayout();
+			this.tabresources.SuspendLayout();
+			this.tabnodebuilder.SuspendLayout();
+			this.tabtesting.SuspendLayout();
+			this.tabtextures.SuspendLayout();
+			this.tabmodes.SuspendLayout();
+			this.copypastemenu.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.hint)).BeginInit();
+			this.SuspendLayout();
+			// 
+			// label5
+			// 
+			label5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			label5.AutoSize = true;
+			label5.Location = new System.Drawing.Point(12, 272);
+			label5.Name = "label5";
+			label5.Size = new System.Drawing.Size(299, 39);
+			label5.TabIndex = 19;
+			label5.Text = "Drag && drop resources to add them.\r\nDrag items to change order (lower items over" +
+				"ride higher items).\r\nUse the context menu to cut, copy, paste or remove items.";
+			// 
+			// label6
+			// 
+			label6.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			label6.AutoEllipsis = true;
+			label6.Location = new System.Drawing.Point(12, 15);
+			label6.Name = "label6";
+			label6.Size = new System.Drawing.Size(457, 37);
+			label6.TabIndex = 21;
+			label6.Text = "These are the resources that will be loaded when this configuration is chosen for" +
+				" editing. Usually you add your IWAD (like DOOM.WAD or DOOM2.WAD) here.";
+			// 
+			// label3
+			// 
+			label3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			label3.AutoEllipsis = true;
+			label3.Location = new System.Drawing.Point(12, 15);
+			label3.Name = "label3";
+			label3.Size = new System.Drawing.Size(468, 54);
+			label3.TabIndex = 22;
+			label3.Text = resources.GetString("label3.Text");
+			// 
+			// label2
+			// 
+			label2.AutoSize = true;
+			label2.Location = new System.Drawing.Point(12, 86);
+			label2.Name = "label2";
+			label2.Size = new System.Drawing.Size(144, 13);
+			label2.TabIndex = 24;
+			label2.Text = "Configuration for saving map:";
+			// 
+			// label7
+			// 
+			label7.AutoSize = true;
+			label7.Location = new System.Drawing.Point(35, 125);
+			label7.Name = "label7";
+			label7.Size = new System.Drawing.Size(121, 13);
+			label7.TabIndex = 26;
+			label7.Text = "Configuration for testing:";
+			// 
+			// label9
+			// 
+			label9.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			label9.AutoEllipsis = true;
+			label9.Location = new System.Drawing.Point(12, 15);
+			label9.Name = "label9";
+			label9.Size = new System.Drawing.Size(477, 54);
+			label9.TabIndex = 23;
+			label9.Text = "Here you can specify the program settings to use for launching a game engine when" +
+				" testing the map. Press F1 for help with custom parameters.";
+			// 
+			// label1
+			// 
+			label1.AutoSize = true;
+			label1.Location = new System.Drawing.Point(15, 89);
+			label1.Name = "label1";
+			label1.Size = new System.Drawing.Size(62, 13);
+			label1.TabIndex = 24;
+			label1.Text = "Application:";
+			// 
+			// label8
+			// 
+			label8.AutoSize = true;
+			label8.Location = new System.Drawing.Point(21, 119);
+			label8.Name = "label8";
+			label8.Size = new System.Drawing.Size(58, 13);
+			label8.TabIndex = 34;
+			label8.Text = "Skill Level:";
+			// 
+			// label4
+			// 
+			label4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			label4.AutoEllipsis = true;
+			label4.Location = new System.Drawing.Point(12, 15);
+			label4.Name = "label4";
+			label4.Size = new System.Drawing.Size(483, 46);
+			label4.TabIndex = 24;
+			label4.Text = "Texture Sets are a way to group textures and flats into categories, so that you c" +
+				"an easily find a texture for the specific style or purpose you need by selecting" +
+				" one of the categories.";
+			// 
+			// label10
+			// 
+			label10.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			label10.AutoEllipsis = true;
+			label10.Location = new System.Drawing.Point(12, 15);
+			label10.Name = "label10";
+			label10.Size = new System.Drawing.Size(470, 58);
+			label10.TabIndex = 25;
+			label10.Text = resources.GetString("label10.Text");
+			// 
+			// labelparameters
+			// 
+			this.labelparameters.AutoSize = true;
+			this.labelparameters.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.labelparameters.ForeColor = System.Drawing.SystemColors.HotTrack;
+			this.labelparameters.Location = new System.Drawing.Point(16, 169);
+			this.labelparameters.Name = "labelparameters";
+			this.labelparameters.Size = new System.Drawing.Size(63, 13);
+			this.labelparameters.TabIndex = 27;
+			this.labelparameters.Text = "Parameters:";
+			this.tooltip.SetToolTip(this.labelparameters, resources.GetString("labelparameters.ToolTip"));
+			this.labelparameters.Visible = false;
+			// 
+			// cancel
+			// 
+			this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.cancel.Location = new System.Drawing.Point(671, 379);
+			this.cancel.Name = "cancel";
+			this.cancel.Size = new System.Drawing.Size(112, 25);
+			this.cancel.TabIndex = 3;
+			this.cancel.Text = "Cancel";
+			this.cancel.UseVisualStyleBackColor = true;
+			this.cancel.Click += new System.EventHandler(this.cancel_Click);
+			// 
+			// apply
+			// 
+			this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.apply.Location = new System.Drawing.Point(553, 379);
+			this.apply.Name = "apply";
+			this.apply.Size = new System.Drawing.Size(112, 25);
+			this.apply.TabIndex = 2;
+			this.apply.Text = "OK";
+			this.apply.UseVisualStyleBackColor = true;
+			this.apply.Click += new System.EventHandler(this.apply_Click);
+			// 
+			// tabs
+			// 
+			this.tabs.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.tabs.Controls.Add(this.tabresources);
+			this.tabs.Controls.Add(this.tabnodebuilder);
+			this.tabs.Controls.Add(this.tabtesting);
+			this.tabs.Controls.Add(this.tabtextures);
+			this.tabs.Controls.Add(this.tabmodes);
+			this.tabs.Enabled = false;
+			this.tabs.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.tabs.Location = new System.Drawing.Point(277, 12);
+			this.tabs.Name = "tabs";
+			this.tabs.Padding = new System.Drawing.Point(24, 3);
+			this.tabs.SelectedIndex = 0;
+			this.tabs.Size = new System.Drawing.Size(506, 358);
+			this.tabs.TabIndex = 1;
+			// 
+			// tabresources
+			// 
+			this.tabresources.Controls.Add(label6);
+			this.tabresources.Controls.Add(this.configdata);
+			this.tabresources.Controls.Add(label5);
+			this.tabresources.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.tabresources.Location = new System.Drawing.Point(4, 22);
+			this.tabresources.Name = "tabresources";
+			this.tabresources.Padding = new System.Windows.Forms.Padding(6);
+			this.tabresources.Size = new System.Drawing.Size(498, 332);
+			this.tabresources.TabIndex = 0;
+			this.tabresources.Text = "Resources";
+			this.tabresources.UseVisualStyleBackColor = true;
+			// 
+			// configdata
+			// 
+			this.configdata.AllowDrop = true;
+			this.configdata.DialogOffset = new System.Drawing.Point(-120, 10);
+			this.configdata.Location = new System.Drawing.Point(15, 55);
+			this.configdata.Name = "configdata";
+			this.configdata.Size = new System.Drawing.Size(467, 204);
+			this.configdata.TabIndex = 0;
+			this.configdata.OnContentChanged += new CodeImp.DoomBuilder.Controls.ResourceListEditor.ContentChanged(this.resourcelocations_OnContentChanged);
+			// 
+			// tabnodebuilder
+			// 
+			this.tabnodebuilder.Controls.Add(label7);
+			this.tabnodebuilder.Controls.Add(this.nodebuildertest);
+			this.tabnodebuilder.Controls.Add(label2);
+			this.tabnodebuilder.Controls.Add(this.nodebuildersave);
+			this.tabnodebuilder.Controls.Add(label3);
+			this.tabnodebuilder.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.tabnodebuilder.Location = new System.Drawing.Point(4, 22);
+			this.tabnodebuilder.Name = "tabnodebuilder";
+			this.tabnodebuilder.Padding = new System.Windows.Forms.Padding(6);
+			this.tabnodebuilder.Size = new System.Drawing.Size(498, 332);
+			this.tabnodebuilder.TabIndex = 1;
+			this.tabnodebuilder.Text = "Nodebuilder";
+			this.tabnodebuilder.UseVisualStyleBackColor = true;
+			// 
+			// nodebuildertest
+			// 
+			this.nodebuildertest.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.nodebuildertest.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.nodebuildertest.FormattingEnabled = true;
+			this.nodebuildertest.Location = new System.Drawing.Point(167, 122);
+			this.nodebuildertest.Name = "nodebuildertest";
+			this.nodebuildertest.Size = new System.Drawing.Size(313, 21);
+			this.nodebuildertest.Sorted = true;
+			this.nodebuildertest.TabIndex = 1;
+			this.nodebuildertest.SelectedIndexChanged += new System.EventHandler(this.nodebuildertest_SelectedIndexChanged);
+			// 
+			// nodebuildersave
+			// 
+			this.nodebuildersave.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.nodebuildersave.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.nodebuildersave.FormattingEnabled = true;
+			this.nodebuildersave.Location = new System.Drawing.Point(167, 83);
+			this.nodebuildersave.Name = "nodebuildersave";
+			this.nodebuildersave.Size = new System.Drawing.Size(313, 21);
+			this.nodebuildersave.Sorted = true;
+			this.nodebuildersave.TabIndex = 0;
+			this.nodebuildersave.SelectedIndexChanged += new System.EventHandler(this.nodebuildersave_SelectedIndexChanged);
+			// 
+			// tabtesting
+			// 
+			this.tabtesting.Controls.Add(this.btnRemoveEngine);
+			this.tabtesting.Controls.Add(this.btnNewEngine);
+			this.tabtesting.Controls.Add(this.cbEngineSelector);
+			this.tabtesting.Controls.Add(this.label13);
+			this.tabtesting.Controls.Add(this.shortpaths);
+			this.tabtesting.Controls.Add(this.customparameters);
+			this.tabtesting.Controls.Add(this.skill);
+			this.tabtesting.Controls.Add(label8);
+			this.tabtesting.Controls.Add(this.browsetestprogram);
+			this.tabtesting.Controls.Add(this.noresultlabel);
+			this.tabtesting.Controls.Add(this.testresult);
+			this.tabtesting.Controls.Add(this.labelresult);
+			this.tabtesting.Controls.Add(this.testparameters);
+			this.tabtesting.Controls.Add(this.labelparameters);
+			this.tabtesting.Controls.Add(this.testapplication);
+			this.tabtesting.Controls.Add(label1);
+			this.tabtesting.Controls.Add(label9);
+			this.tabtesting.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.tabtesting.Location = new System.Drawing.Point(4, 22);
+			this.tabtesting.Name = "tabtesting";
+			this.tabtesting.Padding = new System.Windows.Forms.Padding(6);
+			this.tabtesting.Size = new System.Drawing.Size(498, 332);
+			this.tabtesting.TabIndex = 2;
+			this.tabtesting.Text = "Testing";
+			this.tabtesting.UseVisualStyleBackColor = true;
+			// 
+			// btnRemoveEngine
+			// 
+			this.btnRemoveEngine.Image = global::CodeImp.DoomBuilder.Properties.Resources.SearchClear;
+			this.btnRemoveEngine.Location = new System.Drawing.Point(463, 51);
+			this.btnRemoveEngine.Name = "btnRemoveEngine";
+			this.btnRemoveEngine.Size = new System.Drawing.Size(26, 24);
+			this.btnRemoveEngine.TabIndex = 40;
+			this.tooltip.SetToolTip(this.btnRemoveEngine, "Remove currently selected game engine");
+			this.btnRemoveEngine.UseVisualStyleBackColor = true;
+			this.btnRemoveEngine.Click += new System.EventHandler(this.btnRemoveEngine_Click);
+			// 
+			// btnNewEngine
+			// 
+			this.btnNewEngine.Image = global::CodeImp.DoomBuilder.Properties.Resources.Add;
+			this.btnNewEngine.Location = new System.Drawing.Point(433, 51);
+			this.btnNewEngine.Name = "btnNewEngine";
+			this.btnNewEngine.Size = new System.Drawing.Size(26, 24);
+			this.btnNewEngine.TabIndex = 39;
+			this.tooltip.SetToolTip(this.btnNewEngine, "Add new game engine");
+			this.btnNewEngine.UseVisualStyleBackColor = true;
+			this.btnNewEngine.Click += new System.EventHandler(this.btnNewEngine_Click);
+			// 
+			// cbEngineSelector
+			// 
+			this.cbEngineSelector.FormattingEnabled = true;
+			this.cbEngineSelector.Location = new System.Drawing.Point(87, 53);
+			this.cbEngineSelector.Name = "cbEngineSelector";
+			this.cbEngineSelector.Size = new System.Drawing.Size(340, 21);
+			this.cbEngineSelector.TabIndex = 38;
+			this.cbEngineSelector.SelectedIndexChanged += new System.EventHandler(this.cbEngineSelector_SelectedIndexChanged);
+			this.cbEngineSelector.DropDown += new System.EventHandler(this.cbEngineSelector_DropDown);
+			// 
+			// label13
+			// 
+			this.label13.AutoSize = true;
+			this.label13.Location = new System.Drawing.Point(36, 56);
+			this.label13.Name = "label13";
+			this.label13.Size = new System.Drawing.Size(43, 13);
+			this.label13.TabIndex = 37;
+			this.label13.Text = "Engine:";
+			// 
+			// shortpaths
+			// 
+			this.shortpaths.AutoSize = true;
+			this.shortpaths.Location = new System.Drawing.Point(87, 217);
+			this.shortpaths.Name = "shortpaths";
+			this.shortpaths.Size = new System.Drawing.Size(269, 17);
+			this.shortpaths.TabIndex = 5;
+			this.shortpaths.Text = "Use short paths and file names (MSDOS 8.3 format)";
+			this.shortpaths.UseVisualStyleBackColor = true;
+			this.shortpaths.Visible = false;
+			this.shortpaths.CheckedChanged += new System.EventHandler(this.shortpaths_CheckedChanged);
+			// 
+			// customparameters
+			// 
+			this.customparameters.AutoSize = true;
+			this.customparameters.Location = new System.Drawing.Point(87, 146);
+			this.customparameters.Name = "customparameters";
+			this.customparameters.Size = new System.Drawing.Size(129, 17);
+			this.customparameters.TabIndex = 3;
+			this.customparameters.Text = "Customize parameters";
+			this.customparameters.UseVisualStyleBackColor = true;
+			this.customparameters.CheckedChanged += new System.EventHandler(this.customparameters_CheckedChanged);
+			// 
+			// skill
+			// 
+			this.skill.BackColor = System.Drawing.Color.Transparent;
+			this.skill.Cursor = System.Windows.Forms.Cursors.Default;
+			this.skill.Empty = false;
+			this.skill.GeneralizedCategories = null;
+			this.skill.GeneralizedOptions = null;
+			this.skill.Location = new System.Drawing.Point(87, 116);
+			this.skill.Name = "skill";
+			this.skill.Size = new System.Drawing.Size(402, 21);
+			this.skill.TabIndex = 2;
+			this.skill.Value = 402;
+			this.skill.ValueChanges += new System.EventHandler(this.skill_ValueChanges);
+			// 
+			// browsetestprogram
+			// 
+			this.browsetestprogram.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.browsetestprogram.Image = global::CodeImp.DoomBuilder.Properties.Resources.Folder;
+			this.browsetestprogram.Location = new System.Drawing.Point(459, 84);
+			this.browsetestprogram.Name = "browsetestprogram";
+			this.browsetestprogram.Size = new System.Drawing.Size(30, 24);
+			this.browsetestprogram.TabIndex = 1;
+			this.browsetestprogram.Text = " ";
+			this.tooltip.SetToolTip(this.browsetestprogram, "Browse game engine");
+			this.browsetestprogram.UseVisualStyleBackColor = true;
+			this.browsetestprogram.Click += new System.EventHandler(this.browsetestprogram_Click);
+			// 
+			// noresultlabel
+			// 
+			this.noresultlabel.Location = new System.Drawing.Point(84, 244);
+			this.noresultlabel.Name = "noresultlabel";
+			this.noresultlabel.Size = new System.Drawing.Size(272, 43);
+			this.noresultlabel.TabIndex = 32;
+			this.noresultlabel.Text = "An example result cannot be displayed, because it requires a map to be loaded.";
+			this.noresultlabel.Visible = false;
+			// 
+			// testresult
+			// 
+			this.testresult.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.testresult.BackColor = System.Drawing.SystemColors.Control;
+			this.testresult.Location = new System.Drawing.Point(86, 241);
+			this.testresult.Multiline = true;
+			this.testresult.Name = "testresult";
+			this.testresult.ReadOnly = true;
+			this.testresult.Size = new System.Drawing.Size(403, 79);
+			this.testresult.TabIndex = 6;
+			this.testresult.Visible = false;
+			// 
+			// labelresult
+			// 
+			this.labelresult.AutoSize = true;
+			this.labelresult.Location = new System.Drawing.Point(38, 244);
+			this.labelresult.Name = "labelresult";
+			this.labelresult.Size = new System.Drawing.Size(40, 13);
+			this.labelresult.TabIndex = 30;
+			this.labelresult.Text = "Result:";
+			this.labelresult.Visible = false;
+			// 
+			// testparameters
+			// 
+			this.testparameters.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.testparameters.Location = new System.Drawing.Point(87, 166);
+			this.testparameters.Multiline = true;
+			this.testparameters.Name = "testparameters";
+			this.testparameters.Size = new System.Drawing.Size(402, 41);
+			this.testparameters.TabIndex = 4;
+			this.testparameters.Visible = false;
+			this.testparameters.TextChanged += new System.EventHandler(this.testparameters_TextChanged);
+			// 
+			// testapplication
+			// 
+			this.testapplication.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.testapplication.Location = new System.Drawing.Point(87, 86);
+			this.testapplication.Name = "testapplication";
+			this.testapplication.ReadOnly = true;
+			this.testapplication.Size = new System.Drawing.Size(366, 20);
+			this.testapplication.TabIndex = 0;
+			this.testapplication.TextChanged += new System.EventHandler(this.testapplication_TextChanged);
+			// 
+			// tabtextures
+			// 
+			this.tabtextures.Controls.Add(this.listtextures);
+			this.tabtextures.Controls.Add(this.restoretexturesets);
+			this.tabtextures.Controls.Add(this.edittextureset);
+			this.tabtextures.Controls.Add(this.pastetexturesets);
+			this.tabtextures.Controls.Add(this.copytexturesets);
+			this.tabtextures.Controls.Add(this.removetextureset);
+			this.tabtextures.Controls.Add(this.addtextureset);
+			this.tabtextures.Controls.Add(label4);
+			this.tabtextures.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.tabtextures.Location = new System.Drawing.Point(4, 22);
+			this.tabtextures.Name = "tabtextures";
+			this.tabtextures.Size = new System.Drawing.Size(498, 332);
+			this.tabtextures.TabIndex = 3;
+			this.tabtextures.Text = "Textures";
+			this.tabtextures.UseVisualStyleBackColor = true;
+			// 
+			// listtextures
+			// 
+			this.listtextures.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.listtextures.FullRowSelect = true;
+			this.listtextures.HideSelection = false;
+			this.listtextures.Location = new System.Drawing.Point(15, 64);
+			this.listtextures.Name = "listtextures";
+			this.listtextures.ShowGroups = false;
+			this.listtextures.Size = new System.Drawing.Size(467, 174);
+			this.listtextures.SmallImageList = this.smallimages;
+			this.listtextures.Sorting = System.Windows.Forms.SortOrder.Ascending;
+			this.listtextures.TabIndex = 0;
+			this.listtextures.UseCompatibleStateImageBehavior = false;
+			this.listtextures.View = System.Windows.Forms.View.List;
+			this.listtextures.SelectedIndexChanged += new System.EventHandler(this.listtextures_SelectedIndexChanged);
+			this.listtextures.DoubleClick += new System.EventHandler(this.listtextures_DoubleClick);
+			// 
+			// smallimages
+			// 
+			this.smallimages.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("smallimages.ImageStream")));
+			this.smallimages.TransparentColor = System.Drawing.Color.Transparent;
+			this.smallimages.Images.SetKeyName(0, "KnownTextureSet.ico");
+			// 
+			// restoretexturesets
+			// 
+			this.restoretexturesets.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.restoretexturesets.Location = new System.Drawing.Point(15, 282);
+			this.restoretexturesets.Name = "restoretexturesets";
+			this.restoretexturesets.Size = new System.Drawing.Size(140, 24);
+			this.restoretexturesets.TabIndex = 6;
+			this.restoretexturesets.Text = "Add Default Sets";
+			this.restoretexturesets.UseVisualStyleBackColor = true;
+			this.restoretexturesets.Click += new System.EventHandler(this.restoretexturesets_Click);
+			// 
+			// edittextureset
+			// 
+			this.edittextureset.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.edittextureset.Enabled = false;
+			this.edittextureset.Location = new System.Drawing.Point(88, 244);
+			this.edittextureset.Name = "edittextureset";
+			this.edittextureset.Size = new System.Drawing.Size(67, 24);
+			this.edittextureset.TabIndex = 2;
+			this.edittextureset.Text = "Edit...";
+			this.edittextureset.UseVisualStyleBackColor = true;
+			this.edittextureset.Click += new System.EventHandler(this.edittextureset_Click);
+			// 
+			// pastetexturesets
+			// 
+			this.pastetexturesets.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.pastetexturesets.Enabled = false;
+			this.pastetexturesets.Location = new System.Drawing.Point(424, 244);
+			this.pastetexturesets.Name = "pastetexturesets";
+			this.pastetexturesets.Size = new System.Drawing.Size(58, 24);
+			this.pastetexturesets.TabIndex = 5;
+			this.pastetexturesets.Text = "Paste";
+			this.pastetexturesets.UseVisualStyleBackColor = true;
+			this.pastetexturesets.Click += new System.EventHandler(this.pastetexturesets_Click);
+			// 
+			// copytexturesets
+			// 
+			this.copytexturesets.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.copytexturesets.Enabled = false;
+			this.copytexturesets.Location = new System.Drawing.Point(360, 244);
+			this.copytexturesets.Name = "copytexturesets";
+			this.copytexturesets.Size = new System.Drawing.Size(58, 24);
+			this.copytexturesets.TabIndex = 4;
+			this.copytexturesets.Text = "Copy";
+			this.copytexturesets.UseVisualStyleBackColor = true;
+			this.copytexturesets.Click += new System.EventHandler(this.copytexturesets_Click);
+			// 
+			// removetextureset
+			// 
+			this.removetextureset.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.removetextureset.Enabled = false;
+			this.removetextureset.Location = new System.Drawing.Point(161, 244);
+			this.removetextureset.Name = "removetextureset";
+			this.removetextureset.Size = new System.Drawing.Size(68, 24);
+			this.removetextureset.TabIndex = 3;
+			this.removetextureset.Text = "Remove";
+			this.removetextureset.UseVisualStyleBackColor = true;
+			this.removetextureset.Click += new System.EventHandler(this.removetextureset_Click);
+			// 
+			// addtextureset
+			// 
+			this.addtextureset.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.addtextureset.Location = new System.Drawing.Point(15, 244);
+			this.addtextureset.Name = "addtextureset";
+			this.addtextureset.Size = new System.Drawing.Size(67, 24);
+			this.addtextureset.TabIndex = 1;
+			this.addtextureset.Text = "Add...";
+			this.addtextureset.UseVisualStyleBackColor = true;
+			this.addtextureset.Click += new System.EventHandler(this.addtextureset_Click);
+			// 
+			// tabmodes
+			// 
+			this.tabmodes.Controls.Add(this.startmode);
+			this.tabmodes.Controls.Add(this.label11);
+			this.tabmodes.Controls.Add(this.listmodes);
+			this.tabmodes.Controls.Add(label10);
+			this.tabmodes.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.tabmodes.Location = new System.Drawing.Point(4, 22);
+			this.tabmodes.Name = "tabmodes";
+			this.tabmodes.Size = new System.Drawing.Size(498, 332);
+			this.tabmodes.TabIndex = 4;
+			this.tabmodes.Text = "Modes";
+			this.tabmodes.UseVisualStyleBackColor = true;
+			// 
+			// startmode
+			// 
+			this.startmode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.startmode.FormattingEnabled = true;
+			this.startmode.Location = new System.Drawing.Point(215, 288);
+			this.startmode.Name = "startmode";
+			this.startmode.Size = new System.Drawing.Size(267, 21);
+			this.startmode.TabIndex = 27;
+			this.startmode.SelectedIndexChanged += new System.EventHandler(this.startmode_SelectedIndexChanged);
+			// 
+			// label11
+			// 
+			this.label11.AutoSize = true;
+			this.label11.Location = new System.Drawing.Point(12, 291);
+			this.label11.Name = "label11";
+			this.label11.Size = new System.Drawing.Size(197, 13);
+			this.label11.TabIndex = 26;
+			this.label11.Text = "When opening a map, start in this mode:";
+			// 
+			// listmodes
+			// 
+			this.listmodes.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.listmodes.CheckBoxes = true;
+			this.listmodes.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+            this.colmodename,
+            this.colmodeplugin});
+			this.listmodes.FullRowSelect = true;
+			this.listmodes.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
+			this.listmodes.Location = new System.Drawing.Point(15, 70);
+			this.listmodes.MultiSelect = false;
+			this.listmodes.Name = "listmodes";
+			this.listmodes.ShowGroups = false;
+			this.listmodes.Size = new System.Drawing.Size(467, 201);
+			this.listmodes.Sorting = System.Windows.Forms.SortOrder.Ascending;
+			this.listmodes.TabIndex = 0;
+			this.listmodes.UseCompatibleStateImageBehavior = false;
+			this.listmodes.View = System.Windows.Forms.View.Details;
+			this.listmodes.ItemChecked += new System.Windows.Forms.ItemCheckedEventHandler(this.listmodes_ItemChecked);
+			// 
+			// colmodename
+			// 
+			this.colmodename.Text = "Editing Mode";
+			this.colmodename.Width = 179;
+			// 
+			// colmodeplugin
+			// 
+			this.colmodeplugin.Text = "Plugin";
+			this.colmodeplugin.Width = 221;
+			// 
+			// listconfigs
+			// 
+			this.listconfigs.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)));
+			this.listconfigs.CheckBoxes = true;
+			this.listconfigs.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+            this.columnname});
+			this.listconfigs.ContextMenuStrip = this.copypastemenu;
+			this.listconfigs.FullRowSelect = true;
+			this.listconfigs.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
+			this.listconfigs.HideSelection = false;
+			this.listconfigs.Location = new System.Drawing.Point(12, 12);
+			this.listconfigs.MultiSelect = false;
+			this.listconfigs.Name = "listconfigs";
+			this.listconfigs.ShowGroups = false;
+			this.listconfigs.Size = new System.Drawing.Size(259, 358);
+			this.listconfigs.TabIndex = 0;
+			this.listconfigs.UseCompatibleStateImageBehavior = false;
+			this.listconfigs.View = System.Windows.Forms.View.Details;
+			this.listconfigs.MouseUp += new System.Windows.Forms.MouseEventHandler(this.listconfigs_MouseUp);
+			this.listconfigs.KeyUp += new System.Windows.Forms.KeyEventHandler(this.listconfigs_KeyUp);
+			// 
+			// columnname
+			// 
+			this.columnname.Text = "Configuration";
+			this.columnname.Width = 200;
+			// 
+			// copypastemenu
+			// 
+			this.copypastemenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.copyall,
+            this.toolStripSeparator1,
+            this.pasteall,
+            this.pasteresources,
+            this.pasteengines,
+            this.pastecolorpresets});
+			this.copypastemenu.Name = "copypastemenu";
+			this.copypastemenu.Size = new System.Drawing.Size(175, 120);
+			this.copypastemenu.Opening += new System.ComponentModel.CancelEventHandler(this.copypastemenu_Opening);
+			// 
+			// copyall
+			// 
+			this.copyall.Image = global::CodeImp.DoomBuilder.Properties.Resources.Copy;
+			this.copyall.Name = "copyall";
+			this.copyall.Size = new System.Drawing.Size(174, 22);
+			this.copyall.Text = "Copy";
+			this.copyall.Click += new System.EventHandler(this.copyall_Click);
+			// 
+			// toolStripSeparator1
+			// 
+			this.toolStripSeparator1.Name = "toolStripSeparator1";
+			this.toolStripSeparator1.Size = new System.Drawing.Size(171, 6);
+			// 
+			// pasteall
+			// 
+			this.pasteall.Image = global::CodeImp.DoomBuilder.Properties.Resources.Paste;
+			this.pasteall.Name = "pasteall";
+			this.pasteall.Size = new System.Drawing.Size(174, 22);
+			this.pasteall.Text = "Paste";
+			this.pasteall.Click += new System.EventHandler(this.pasteall_Click);
+			// 
+			// pasteresources
+			// 
+			this.pasteresources.Image = global::CodeImp.DoomBuilder.Properties.Resources.PasteSpecial;
+			this.pasteresources.Name = "pasteresources";
+			this.pasteresources.Size = new System.Drawing.Size(174, 22);
+			this.pasteresources.Text = "Paste Resources";
+			this.pasteresources.Click += new System.EventHandler(this.pasteresources_Click);
+			// 
+			// pasteengines
+			// 
+			this.pasteengines.Image = global::CodeImp.DoomBuilder.Properties.Resources.PasteSpecial;
+			this.pasteengines.Name = "pasteengines";
+			this.pasteengines.Size = new System.Drawing.Size(174, 22);
+			this.pasteengines.Text = "Paste Test Engines";
+			this.pasteengines.Click += new System.EventHandler(this.pasteengines_Click);
+			// 
+			// pastecolorpresets
+			// 
+			this.pastecolorpresets.Image = global::CodeImp.DoomBuilder.Properties.Resources.PasteSpecial;
+			this.pastecolorpresets.Name = "pastecolorpresets";
+			this.pastecolorpresets.Size = new System.Drawing.Size(174, 22);
+			this.pastecolorpresets.Text = "Paste Color Presets";
+			this.pastecolorpresets.Click += new System.EventHandler(this.pastecolorpresets_Click);
+			// 
+			// testprogramdialog
+			// 
+			this.testprogramdialog.Filter = "Executable Files (*.exe)|*.exe|Batch Files (*.bat)|*.bat";
+			this.testprogramdialog.Title = "Browse Test Program";
+			// 
+			// hintlabel
+			// 
+			this.hintlabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.hintlabel.AutoSize = true;
+			this.hintlabel.Location = new System.Drawing.Point(30, 384);
+			this.hintlabel.Name = "hintlabel";
+			this.hintlabel.Size = new System.Drawing.Size(276, 13);
+			this.hintlabel.TabIndex = 6;
+			this.hintlabel.Text = "Use the context menu to copy-paste game configurations";
+			// 
+			// hint
+			// 
+			this.hint.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.hint.Image = global::CodeImp.DoomBuilder.Properties.Resources.Lightbulb;
+			this.hint.Location = new System.Drawing.Point(12, 383);
+			this.hint.Name = "hint";
+			this.hint.Size = new System.Drawing.Size(16, 16);
+			this.hint.TabIndex = 5;
+			this.hint.TabStop = false;
+			// 
+			// tooltip
+			// 
+			this.tooltip.AutomaticDelay = 0;
+			this.tooltip.AutoPopDelay = 30000;
+			this.tooltip.InitialDelay = 10;
+			this.tooltip.ReshowDelay = 100;
+			this.tooltip.ToolTipTitle = "Supported Placeholders:";
+			this.tooltip.UseAnimation = false;
+			this.tooltip.UseFading = false;
+			// 
+			// ConfigForm
+			// 
+			this.AcceptButton = this.apply;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.CancelButton = this.cancel;
+			this.ClientSize = new System.Drawing.Size(794, 416);
+			this.Controls.Add(this.hintlabel);
+			this.Controls.Add(this.hint);
+			this.Controls.Add(this.listconfigs);
+			this.Controls.Add(this.tabs);
+			this.Controls.Add(this.cancel);
+			this.Controls.Add(this.apply);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "ConfigForm";
+			this.Opacity = 1;
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Game Configurations";
+			this.Shown += new System.EventHandler(this.ConfigForm_Shown);
+			this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.ConfigForm_HelpRequested);
+			this.tabs.ResumeLayout(false);
+			this.tabresources.ResumeLayout(false);
+			this.tabresources.PerformLayout();
+			this.tabnodebuilder.ResumeLayout(false);
+			this.tabnodebuilder.PerformLayout();
+			this.tabtesting.ResumeLayout(false);
+			this.tabtesting.PerformLayout();
+			this.tabtextures.ResumeLayout(false);
+			this.tabmodes.ResumeLayout(false);
+			this.tabmodes.PerformLayout();
+			this.copypastemenu.ResumeLayout(false);
+			((System.ComponentModel.ISupportInitialize)(this.hint)).EndInit();
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Button cancel;
+		private System.Windows.Forms.Button apply;
+		private System.Windows.Forms.TabControl tabs;
+		private System.Windows.Forms.TabPage tabresources;
+		private System.Windows.Forms.TabPage tabnodebuilder;
+		private System.Windows.Forms.TabPage tabtesting;
+		private CodeImp.DoomBuilder.Controls.ResourceListEditor configdata;
+		private System.Windows.Forms.ComboBox nodebuildertest;
+		private System.Windows.Forms.ComboBox nodebuildersave;
+		private System.Windows.Forms.TextBox testparameters;
+		private System.Windows.Forms.TextBox testapplication;
+		private System.Windows.Forms.TextBox testresult;
+		private System.Windows.Forms.Label labelresult;
+		private System.Windows.Forms.ListView listconfigs;
+		private System.Windows.Forms.ColumnHeader columnname;
+		private System.Windows.Forms.Label noresultlabel;
+		private System.Windows.Forms.Button browsetestprogram;
+		private System.Windows.Forms.OpenFileDialog testprogramdialog;
+		private System.Windows.Forms.CheckBox customparameters;
+		private CodeImp.DoomBuilder.Controls.ActionSelectorControl skill;
+		private System.Windows.Forms.Label labelparameters;
+		private System.Windows.Forms.TabPage tabtextures;
+		private System.Windows.Forms.Button addtextureset;
+		private System.Windows.Forms.Button restoretexturesets;
+		private System.Windows.Forms.Button edittextureset;
+		private System.Windows.Forms.Button pastetexturesets;
+		private System.Windows.Forms.Button copytexturesets;
+		private System.Windows.Forms.Button removetextureset;
+		private System.Windows.Forms.ListView listtextures;
+		private System.Windows.Forms.ImageList smallimages;
+		private System.Windows.Forms.TabPage tabmodes;
+		private System.Windows.Forms.ListView listmodes;
+		private System.Windows.Forms.ColumnHeader colmodename;
+		private System.Windows.Forms.ColumnHeader colmodeplugin;
+		private System.Windows.Forms.CheckBox shortpaths;
+		private System.Windows.Forms.ComboBox startmode;
+		private System.Windows.Forms.Label label11;
+		private System.Windows.Forms.Button btnRemoveEngine;
+		private System.Windows.Forms.Button btnNewEngine;
+		private System.Windows.Forms.ComboBox cbEngineSelector;
+		private System.Windows.Forms.Label label13;
+		private System.Windows.Forms.ContextMenuStrip copypastemenu;
+		private System.Windows.Forms.ToolStripMenuItem copyall;
+		private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
+		private System.Windows.Forms.ToolStripMenuItem pasteall;
+		private System.Windows.Forms.ToolStripMenuItem pasteresources;
+		private System.Windows.Forms.ToolStripMenuItem pasteengines;
+		private System.Windows.Forms.ToolStripMenuItem pastecolorpresets;
+		private System.Windows.Forms.Label hintlabel;
+		private System.Windows.Forms.PictureBox hint;
+		private System.Windows.Forms.ToolTip tooltip;
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/ConfigForm.cs b/Source/Core/Windows/ConfigForm.cs
new file mode 100644
index 0000000..5ee7533
--- /dev/null
+++ b/Source/Core/Windows/ConfigForm.cs
@@ -0,0 +1,879 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.IO;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Data;
+using CodeImp.DoomBuilder.Editing;
+using CodeImp.DoomBuilder.GZBuilder.Data;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Windows
+{
+	internal partial class ConfigForm : DelayedForm
+	{
+		// Variables
+		private GameConfiguration gameconfig;
+		private ConfigurationInfo configinfo;
+		private List<DefinedTextureSet> copiedsets;
+		private bool preventchanges;
+		private bool reloadresources;
+
+		//mxd. "Copy/Paste" stuff
+		private ConfigurationInfo configinfocopy;
+
+		// Properties
+		public bool ReloadResources { get { return reloadresources; } }
+
+		// Constructor
+		public ConfigForm()
+		{
+			ListViewItem lvi;
+			
+			// Initialize
+			InitializeComponent();
+			
+			// Make list column header full width
+			columnname.Width = listconfigs.ClientRectangle.Width - SystemInformation.VerticalScrollBarWidth - 2;
+			
+			// Fill list of configurations
+			foreach(ConfigurationInfo ci in General.Configs)
+			{
+				// Add a copy
+				lvi = listconfigs.Items.Add(ci.Name);
+				lvi.Tag = ci.Clone();
+				lvi.Checked = ci.Enabled; //mxd
+				lvi.ForeColor = (ci.Enabled ? SystemColors.WindowText : SystemColors.InactiveCaptionText); //mxd
+
+				// This is the current configuration?
+				if((General.Map != null) && (General.Map.ConfigSettings.Filename == ci.Filename))
+					lvi.Selected = true;
+			}
+			
+			// No skill
+			skill.Value = 0;
+			
+			// Nodebuilders are allowed to be empty
+			nodebuildersave.Items.Add(new NodebuilderInfo());
+			nodebuildertest.Items.Add(new NodebuilderInfo());
+			
+			// Fill comboboxes with nodebuilders
+			nodebuildersave.Items.AddRange(General.Nodebuilders.ToArray());
+			nodebuildertest.Items.AddRange(General.Nodebuilders.ToArray());
+			
+			// Fill list of editing modes
+			foreach(EditModeInfo emi in General.Editing.ModesInfo)
+			{
+				// Is this mode selectable by the user?
+				if(emi.IsOptional)
+				{
+					lvi = listmodes.Items.Add(emi.Attributes.DisplayName);
+					lvi.Tag = emi;
+					lvi.SubItems.Add(emi.Plugin.Plug.Name);
+					lvi.UseItemStyleForSubItems = true; //mxd
+				}
+			}
+
+			//mxd
+			listconfigs.ItemChecked += listconfigs_ItemChecked;
+			listconfigs.SelectedIndexChanged += listconfigs_SelectedIndexChanged;
+
+			//mxd. Trigger change to update the right panel...
+			listconfigs_MouseUp(this, new MouseEventArgs(MouseButtons.None, 0, 0, 0, 0));
+		}
+		
+		// This shows a specific page
+		public void ShowTab(int index)
+		{
+			tabs.SelectedIndex = index;
+		}
+
+		// Configuration item selected
+		private void listconfigs_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			// Item selected?
+			if(listconfigs.SelectedItems.Count > 0)
+			{
+				// Enable panels
+				tabs.Enabled = true;
+
+				preventchanges = true;
+
+				//mxd. Store current engine name
+				if(configinfo != null && !String.IsNullOrEmpty(cbEngineSelector.Text))
+					configinfo.TestProgramName = cbEngineSelector.Text;
+				
+				// Get config info of selected item
+				configinfo = listconfigs.SelectedItems[0].Tag as ConfigurationInfo;
+				
+				//mxd. Load the game configuration
+				gameconfig = new GameConfiguration(configinfo.Configuration);
+
+				// Set defaults
+				configinfo.ApplyDefaults(gameconfig);
+				
+				// Fill resources list
+				configdata.EditResourceLocationList(configinfo.Resources);
+				
+				// Go for all nodebuilder save items
+				nodebuildersave.SelectedIndex = -1;
+				for(int i = 0; i < nodebuildersave.Items.Count; i++)
+				{
+					// Get item
+					NodebuilderInfo ni = nodebuildersave.Items[i] as NodebuilderInfo;
+					
+					// Item matches configuration setting?
+					if(String.CompareOrdinal(ni.Name, configinfo.NodebuilderSave) == 0)
+					{
+						// Select this item
+						nodebuildersave.SelectedIndex = i;
+						break;
+					}
+				}
+				
+				// Go for all nodebuilder test items
+				nodebuildertest.SelectedIndex = -1;
+				for(int i = 0; i < nodebuildertest.Items.Count; i++)
+				{
+					// Get item
+					NodebuilderInfo ni = nodebuildertest.Items[i] as NodebuilderInfo;
+					
+					// Item matches configuration setting?
+					if(String.CompareOrdinal(ni.Name, configinfo.NodebuilderTest) == 0)
+					{
+						// Select this item
+						nodebuildertest.SelectedIndex = i;
+						break;
+					}
+				}
+				
+				// Fill skills list
+				skill.ClearInfo();
+				skill.AddInfo(gameconfig.Skills.ToArray());
+
+				//mxd. Fill engines list
+				cbEngineSelector.Items.Clear();
+				foreach(EngineInfo info in configinfo.TestEngines)
+					cbEngineSelector.Items.Add(info.TestProgramName);
+
+				cbEngineSelector.SelectedIndex = configinfo.CurrentEngineIndex;
+				btnRemoveEngine.Enabled = configinfo.TestEngines.Count > 1;
+				
+				// Fill texture sets list
+				listtextures.Items.Clear();
+				foreach(DefinedTextureSet ts in configinfo.TextureSets)
+				{
+					ListViewItem item = listtextures.Items.Add(ts.Name);
+					item.Tag = ts;
+					item.ImageIndex = 0;
+				}
+				listtextures.Sort();
+				
+				// Go for all the editing modes in the list
+				foreach(ListViewItem lvi in listmodes.Items)
+				{
+					EditModeInfo emi = (lvi.Tag as EditModeInfo);
+
+					//mxd. Disable item if the mode does not support current map format
+					if(emi.Attributes.SupportedMapFormats != null &&
+					    Array.IndexOf(emi.Attributes.SupportedMapFormats, gameconfig.FormatInterface) == -1) 
+					{
+						lvi.Text = emi.Attributes.DisplayName + " (map format not supported)";
+						lvi.ForeColor = SystemColors.GrayText;
+						lvi.BackColor = SystemColors.InactiveBorder;
+						lvi.Checked = false;
+					} 
+					else 
+					{
+						lvi.Text = emi.Attributes.DisplayName;
+						lvi.ForeColor = SystemColors.WindowText;
+						lvi.BackColor = SystemColors.Window;
+						lvi.Checked = (configinfo.EditModes.ContainsKey(emi.Type.FullName) && configinfo.EditModes[emi.Type.FullName]);
+					}
+				}
+
+				// Update listmodes columns width (mxd)
+				listmodes.AutoResizeColumns(ColumnHeaderAutoResizeStyle.ColumnContent);
+				
+				// Fill start modes
+				RefillStartModes();
+
+				// Done
+				preventchanges = false;
+			}
+		}
+		
+		// Key released
+		private void listconfigs_KeyUp(object sender, KeyEventArgs e)
+		{
+			// Nothing selected?
+			if(listconfigs.SelectedItems.Count == 0)
+			{
+				// Disable panels
+				gameconfig = null;
+				configinfo = null;
+				configdata.FixedResourceLocationList(new DataLocationList());
+				configdata.EditResourceLocationList(new DataLocationList());
+				nodebuildersave.SelectedIndex = -1;
+				nodebuildertest.SelectedIndex = -1;
+				testapplication.Text = "";
+				testparameters.Text = "";
+				shortpaths.Checked = false;
+				skill.Value = 0;
+				skill.ClearInfo();
+				customparameters.Checked = false;
+				tabs.Enabled = false;
+				listtextures.Items.Clear();
+			}
+		}
+		
+		// Mouse released
+		private void listconfigs_MouseUp(object sender, MouseEventArgs e)
+		{
+			listconfigs_KeyUp(sender, new KeyEventArgs(Keys.None));
+		}
+
+		//mxd
+		private void listconfigs_ItemChecked(object sender, ItemCheckedEventArgs e) 
+		{
+			e.Item.ForeColor = (e.Item.Checked ? SystemColors.WindowText : SystemColors.InactiveCaptionText);
+		}
+		
+		// Resource locations changed
+		private void resourcelocations_OnContentChanged()
+		{
+			// Leave when no configuration selected
+			if(configinfo == null) return;
+			
+			// Apply to selected configuration
+			configinfo.Resources.Clear();
+			configinfo.Resources.AddRange(configdata.GetResources());
+			if(!preventchanges) reloadresources = true;
+		}
+
+		// Nodebuilder selection changed
+		private void nodebuildersave_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			// Leave during setup or when no configuration selected
+			if(preventchanges || configinfo == null || nodebuildersave.SelectedItem == null) return;
+			
+			// Apply to selected configuration
+			configinfo.NodebuilderSave = (nodebuildersave.SelectedItem as NodebuilderInfo).Name;
+			configinfo.Changed = true; //mxd
+		}
+
+		// Nodebuilder selection changed
+		private void nodebuildertest_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			// Leave during setup or when no configuration selected
+			if(preventchanges || configinfo == null || nodebuildertest.SelectedItem == null) return;
+
+			// Apply to selected configuration
+			configinfo.NodebuilderTest = (nodebuildertest.SelectedItem as NodebuilderInfo).Name;
+			configinfo.Changed = true; //mxd
+		}
+		
+		// Test application changed
+		private void testapplication_TextChanged(object sender, EventArgs e)
+		{
+			// Leave during setup or when no configuration is selected
+			if(preventchanges || configinfo == null) return;
+
+			// Apply to selected configuration
+			configinfo.TestProgram = testapplication.Text;
+			
+			//mxd. User entered engine name before picking the engine?
+			if(cbEngineSelector.SelectedIndex == -1)
+			{
+				ApplyTestEngineNameChange();
+			}
+			// Update engine name
+			else
+			{
+				// Use engine directory name?
+				string enginename = Path.GetDirectoryName(configinfo.TestProgram);
+				if(!string.IsNullOrEmpty(enginename))
+				{
+					int pos = enginename.LastIndexOf(Path.DirectorySeparatorChar);
+					if(pos != -1) enginename = enginename.Substring(pos + 1);
+				}
+				// Use engine filename
+				else
+				{
+					enginename = Path.GetFileNameWithoutExtension(configinfo.TestProgram);
+				}
+				
+				configinfo.TestProgramName = enginename;
+				cbEngineSelector.Items[cbEngineSelector.SelectedIndex] = enginename;
+			}
+
+			configinfo.Changed = true; //mxd
+		}
+
+		// Test parameters changed
+		private void testparameters_TextChanged(object sender, EventArgs e)
+		{
+			// Leave when no configuration selected
+			if(preventchanges || configinfo == null) return;
+
+			// Apply to selected configuration
+			configinfo = listconfigs.SelectedItems[0].Tag as ConfigurationInfo;
+			configinfo.TestParameters = testparameters.Text;
+			configinfo.Changed = true; //mxd
+
+			// Show example result
+			CreateParametersExample();
+		}
+		
+		// This creates a new parameters example
+		private void CreateParametersExample()
+		{
+			// Map loaded?
+			if(General.Map != null)
+			{
+				// Make converted parameters
+				testresult.Text = General.Map.Launcher.ConvertParameters(testparameters.Text, skill.Value, shortpaths.Checked);
+			}
+		}
+
+		//mxd
+		private void ApplyTestEngineNameChange() 
+		{
+			int index = (int)cbEngineSelector.Tag;
+			if(index != -1 && cbEngineSelector.Text != cbEngineSelector.Items[index].ToString()) 
+			{
+				cbEngineSelector.Items[index] = cbEngineSelector.Text;
+				configinfo.TestProgramName = cbEngineSelector.Text;
+				configinfo.Changed = true; //mxd
+			}
+		}
+		
+		// OK clicked
+		private void apply_Click(object sender, EventArgs e)
+		{
+			ConfigurationInfo ci;
+
+			//mxd. Check resources
+			for(int i = 0; i < listconfigs.Items.Count; i++)
+			{
+				// Get configuration item
+				ci = listconfigs.Items[i].Tag as ConfigurationInfo;
+				if(!ci.Resources.IsValid())
+				{
+					MessageBox.Show(this, "At least one resource doesn't exist in '" + ci.Name + "' game configuration!", Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+					tabs.SelectedTab = tabresources;
+					listconfigs.Focus();
+					listconfigs.Items[i].Selected = true;
+					return;
+				}
+			}
+
+			//mxd. Apply changes of current test engine name, if there are any
+			//TODO: move engine selector stuff into separate component!
+			if(configinfo != null) ApplyTestEngineNameChange();
+
+			//mxd. Apply configuration items. They should be in the same order, riiiight?
+			for(int i = 0; i < listconfigs.Items.Count; i++) 
+			{
+				// Get configuration item
+				ci = listconfigs.Items[i].Tag as ConfigurationInfo;
+				ci.Enabled = listconfigs.Items[i].Checked;
+
+				// Apply settings
+				General.Configs[i].Enabled = ci.Enabled;
+				if(ci.Changed) General.Configs[i].Apply(ci);
+			}
+			
+			// Close
+			this.DialogResult = DialogResult.OK;
+			this.Close();
+		}
+
+		// Cancel clicked
+		private void cancel_Click(object sender, EventArgs e)
+		{
+			// Close
+			this.DialogResult = DialogResult.Cancel;
+			this.Close();
+		}
+
+		// Browse test program
+		private void browsetestprogram_Click(object sender, EventArgs e)
+		{
+			// Set initial directory
+			if(testapplication.Text.Length > 0)
+			{
+				try { testprogramdialog.InitialDirectory = Path.GetDirectoryName(testapplication.Text); }
+				catch(Exception) { }
+			}
+			
+			// Browse for test program
+			if(testprogramdialog.ShowDialog() == DialogResult.OK)
+			{
+				// Apply
+				testapplication.Text = testprogramdialog.FileName;
+			}
+		}
+
+		// Customize parameters (un)checked
+		private void customparameters_CheckedChanged(object sender, EventArgs e)
+		{
+			// Leave when no configuration selected
+			if(configinfo == null) return;
+
+			// Apply to selected configuration
+			configinfo.CustomParameters = customparameters.Checked;
+			configinfo.Changed = true; //mxd
+
+			// Update interface
+			labelparameters.Visible = customparameters.Checked;
+			testparameters.Visible = customparameters.Checked;
+			shortpaths.Visible = customparameters.Checked;
+
+			// Check if a map is loaded
+			if(General.Map != null)
+			{
+				// Show parameters example result
+				labelresult.Visible = customparameters.Checked;
+				testresult.Visible = customparameters.Checked;
+				noresultlabel.Visible = false;
+			}
+			else
+			{
+				// Cannot show parameters example result
+				labelresult.Visible = false;
+				testresult.Visible = false;
+				noresultlabel.Visible = customparameters.Checked;
+			}
+		}
+		
+		// Use short paths changed
+		private void shortpaths_CheckedChanged(object sender, EventArgs e)
+		{
+			// Leave when no configuration selected
+			if(configinfo == null) return;
+			
+			// Apply to selected configuration
+			configinfo.TestShortPaths = shortpaths.Checked;
+			configinfo.Changed = true; //mxd
+			
+			CreateParametersExample();
+		}
+		
+		// Skill changes
+		private void skill_ValueChanges(object sender, EventArgs e)
+		{
+			// Leave when no configuration selected
+			if(configinfo == null) return;
+			
+			// Apply to selected configuration
+			configinfo.TestSkill = skill.Value;
+			configinfo.Changed = true; //mxd
+			
+			CreateParametersExample();
+		}
+
+		// Make new texture set
+		private void addtextureset_Click(object sender, EventArgs e)
+		{
+			DefinedTextureSet s = new DefinedTextureSet("New Texture Set");
+			TextureSetForm form = new TextureSetForm();
+			form.Setup(s);
+			if(form.ShowDialog(this) == DialogResult.OK)
+			{
+				// Add to texture sets
+				configinfo.TextureSets.Add(s);
+				configinfo.Changed = true; //mxd
+				ListViewItem item = listtextures.Items.Add(s.Name);
+				item.Tag = s;
+				item.ImageIndex = 0;
+				listtextures.Sort();
+				reloadresources = true;
+			}
+		}
+
+		// Edit texture set
+		private void edittextureset_Click(object sender, EventArgs e)
+		{
+			// Texture Set selected?
+			if(listtextures.SelectedItems.Count > 0)
+			{
+				DefinedTextureSet s = (listtextures.SelectedItems[0].Tag as DefinedTextureSet);
+				TextureSetForm form = new TextureSetForm();
+				form.Setup(s);
+				form.ShowDialog(this);
+				listtextures.SelectedItems[0].Text = s.Name;
+				listtextures.Sort();
+				reloadresources = true;
+			}
+		}
+		
+		// Remove texture set
+		private void removetextureset_Click(object sender, EventArgs e)
+		{
+			// Texture Set selected?
+			while(listtextures.SelectedItems.Count > 0)
+			{
+				// Remove from config info and list
+				DefinedTextureSet s = (listtextures.SelectedItems[0].Tag as DefinedTextureSet);
+				configinfo.TextureSets.Remove(s);
+				configinfo.Changed = true; //mxd
+				listtextures.SelectedItems[0].Remove();
+				reloadresources = true;
+			}
+		}
+		
+		// Texture Set selected/deselected
+		private void listtextures_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			edittextureset.Enabled = (listtextures.SelectedItems.Count > 0);
+			removetextureset.Enabled = (listtextures.SelectedItems.Count > 0);
+			copytexturesets.Enabled = (listtextures.SelectedItems.Count > 0);
+		}
+		
+		// Doubleclicking a texture set
+		private void listtextures_DoubleClick(object sender, EventArgs e)
+		{
+			edittextureset_Click(sender, e);
+		}
+		
+		// Copy selected texture sets
+		private void copytexturesets_Click(object sender, EventArgs e)
+		{
+			// Make copies
+			copiedsets = new List<DefinedTextureSet>();
+			foreach(ListViewItem item in listtextures.SelectedItems)
+			{
+				DefinedTextureSet s = (item.Tag as DefinedTextureSet);
+				copiedsets.Add(s.Copy());
+			}
+			
+			// Enable button
+			pastetexturesets.Enabled = true;
+		}
+		
+		// Paste copied texture sets
+		private void pastetexturesets_Click(object sender, EventArgs e)
+		{
+			if(copiedsets != null)
+			{
+				// Add copies
+				foreach(DefinedTextureSet ts in copiedsets)
+				{
+					DefinedTextureSet s = ts.Copy();
+					ListViewItem item = listtextures.Items.Add(s.Name);
+					item.Tag = s;
+					item.ImageIndex = 0;
+					configinfo.TextureSets.Add(s);
+				}
+				listtextures.Sort();
+				reloadresources = true;
+				configinfo.Changed = true; //mxd
+			}
+		}
+		
+		// This will add the default sets from game configuration
+		private void restoretexturesets_Click(object sender, EventArgs e)
+		{
+			// Ask nicely first
+			if(MessageBox.Show(this, "This will add the default Texture Sets from the Game Configuration. Do you want to continue?",
+				"Add Default Sets", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+			{
+				// Add copies
+				foreach(DefinedTextureSet ts in gameconfig.TextureSets)
+				{
+					DefinedTextureSet s = ts.Copy();
+					ListViewItem item = listtextures.Items.Add(s.Name);
+					item.Tag = s;
+					item.ImageIndex = 0;
+					configinfo.TextureSets.Add(s);
+				}
+				listtextures.Sort();
+				reloadresources = true;
+				configinfo.Changed = true; //mxd
+			}
+		}
+		
+		// This is called when an editing mode item is checked or unchecked
+		private void listmodes_ItemChecked(object sender, ItemCheckedEventArgs e)
+		{
+			if(preventchanges) return; //mxd
+
+			// Leave when no configuration selected
+			if(configinfo == null) return;
+
+			// mxd. Not the best way to detect a disabled item, but we will go with that...
+			if(e.Item.ForeColor == SystemColors.GrayText) e.Item.Checked = false;
+			
+			// Apply changes
+			EditModeInfo emi = (e.Item.Tag as EditModeInfo);
+			bool currentstate = (configinfo.EditModes.ContainsKey(emi.Type.FullName) && configinfo.EditModes[emi.Type.FullName]);
+			if(e.Item.Checked && !currentstate)
+			{
+				// Add
+				configinfo.EditModes[emi.Type.FullName] = true;
+				configinfo.Changed = true; //mxd
+			}
+			else if(!e.Item.Checked && currentstate)
+			{
+				// Remove
+				configinfo.EditModes[emi.Type.FullName] = false;
+				configinfo.Changed = true; //mxd
+			}
+			
+			preventchanges = true;
+			RefillStartModes();
+			preventchanges = false;
+		}
+
+		// Help requested
+		private void ConfigForm_HelpRequested(object sender, HelpEventArgs hlpevent)
+		{
+			General.ShowHelp("w_gameconfigurations.html");
+			hlpevent.Handled = true;
+		}
+		
+		// This refills the start mode cobobox
+		private void RefillStartModes()
+		{
+			// Refill the startmode combobox
+			startmode.Items.Clear();
+			foreach(ListViewItem item in listmodes.Items)
+			{
+				if(item.Checked)
+				{
+					EditModeInfo emi = (item.Tag as EditModeInfo);
+					if(emi.Attributes.SafeStartMode)
+					{
+						int newindex = startmode.Items.Add(emi);
+						if(emi.Type.Name == configinfo.StartMode) startmode.SelectedIndex = newindex;
+					}
+				}
+			}
+			
+			// Select the first in the combobox if none are selected
+			if((startmode.SelectedItem == null) && (startmode.Items.Count > 0))
+			{
+				startmode.SelectedIndex = 0;
+				EditModeInfo emi = (startmode.SelectedItem as EditModeInfo);
+				configinfo.StartMode = emi.Type.Name;
+				configinfo.Changed = true; //mxd
+			}
+		}
+		
+		// Start mode combobox changed
+		private void startmode_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if(preventchanges || (configinfo == null)) return;
+			
+			// Apply start mode
+			if(startmode.SelectedItem != null)
+			{
+				EditModeInfo emi = (startmode.SelectedItem as EditModeInfo);
+				configinfo.StartMode = emi.Type.Name;
+				configinfo.Changed = true; //mxd
+			}
+		}
+
+		//mxd
+		private void btnNewEngine_Click(object sender, EventArgs e) 
+		{
+			preventchanges = true;
+			
+			EngineInfo newInfo = new EngineInfo();
+			newInfo.TestSkill = (int)Math.Ceiling(gameconfig.Skills.Count / 2f); //set Medium skill level
+			configinfo.TestEngines.Add(newInfo);
+			configinfo.Changed = true;
+			
+			//store current engine name
+			if(!String.IsNullOrEmpty(cbEngineSelector.Text))
+				configinfo.TestProgramName = cbEngineSelector.Text;
+
+			//refresh engines list
+			cbEngineSelector.Items.Clear();
+			foreach(EngineInfo info in configinfo.TestEngines)
+				cbEngineSelector.Items.Add(info.TestProgramName);
+
+			cbEngineSelector.SelectedIndex = configinfo.TestEngines.Count - 1;
+			btnRemoveEngine.Enabled = true;
+
+			preventchanges = false;
+
+			// Open engine browser
+			browsetestprogram_Click(this, EventArgs.Empty);
+		}
+
+		//mxd
+		private void btnRemoveEngine_Click(object sender, EventArgs e) 
+		{
+			preventchanges = true;
+			
+			//remove params
+			int index = cbEngineSelector.SelectedIndex;
+			cbEngineSelector.SelectedIndex = -1;
+			configinfo.TestEngines.RemoveAt(index);
+			configinfo.Changed = true; //mxd
+			
+			//refresh engines list
+			cbEngineSelector.Items.Clear();
+			foreach(EngineInfo info in configinfo.TestEngines)
+				cbEngineSelector.Items.Add(info.TestProgramName);
+
+			if(index >= configinfo.TestEngines.Count)
+				index = configinfo.TestEngines.Count - 1;
+
+			cbEngineSelector.SelectedIndex = index;
+
+			if(configinfo.TestEngines.Count < 2)
+				btnRemoveEngine.Enabled = false;
+
+			preventchanges = false;
+		}
+
+		//mxd
+		private void cbEngineSelector_SelectedIndexChanged(object sender, EventArgs e) 
+		{
+			if(cbEngineSelector.SelectedIndex == -1) return;
+			
+			//set new values
+			configinfo.CurrentEngineIndex = cbEngineSelector.SelectedIndex;
+			configinfo.Changed = true; //mxd
+			cbEngineSelector.Tag = cbEngineSelector.SelectedIndex; //store for later use
+
+			// Set test application and parameters
+			if(!configinfo.CustomParameters)
+			{
+				configinfo.TestParameters = gameconfig.TestParameters;
+				configinfo.TestShortPaths = gameconfig.TestShortPaths;
+			}
+
+			configinfo.TestProgramName = cbEngineSelector.Text;
+			testapplication.Text = configinfo.TestProgram;
+			testparameters.Text = configinfo.TestParameters;
+			shortpaths.Checked = configinfo.TestShortPaths;
+			
+			int skilllevel = configinfo.TestSkill;
+			skill.Value = skilllevel - 1; //mxd. WHY???
+			skill.Value = skilllevel;
+			customparameters.Checked = configinfo.CustomParameters;
+		}
+
+		//mxd
+		private void cbEngineSelector_DropDown(object sender, EventArgs e) 
+		{
+			ApplyTestEngineNameChange();
+		}
+
+		//mxd
+		private void ConfigForm_Shown(object sender, EventArgs e) 
+		{
+			if(listconfigs.SelectedItems.Count > 0) listconfigs.SelectedItems[0].EnsureVisible();
+		}
+
+		#region ============= Copy/Paste context menu (mxd)
+
+		private void copypastemenu_Opening(object sender, System.ComponentModel.CancelEventArgs e) 
+		{
+			if(listconfigs.SelectedIndices.Count < 1) 
+			{
+				e.Cancel = true;
+				return;
+			}
+
+			ConfigurationInfo current = listconfigs.SelectedItems[0].Tag as ConfigurationInfo;
+			bool havecopiedconfig = configinfocopy != null;
+			bool formatinterfacesmatch = havecopiedconfig && current.FormatInterface == configinfocopy.FormatInterface;
+
+			pasteall.Enabled = formatinterfacesmatch;
+			pasteengines.Enabled = (havecopiedconfig && configinfocopy.TestEngines.Count > 0);
+			pasteresources.Enabled = (havecopiedconfig && configinfocopy.Resources.Count > 0);
+			pastecolorpresets.Enabled = (formatinterfacesmatch && configinfocopy.LinedefColorPresets.Length > 0);
+		}
+
+		private void copyall_Click(object sender, EventArgs e) 
+		{
+			if(listconfigs.SelectedIndices.Count < 1) return;
+			ConfigurationInfo current = listconfigs.SelectedItems[0].Tag as ConfigurationInfo;
+			configinfocopy = current.Clone();
+
+			//display info
+			General.Interface.DisplayStatus(StatusType.Info, "Copied '" + configinfocopy.Name + "' game configuration");
+		}
+
+		private void pasteall_Click(object sender, EventArgs e) 
+		{
+			if(listconfigs.SelectedIndices.Count < 1) return;
+
+			//get current configinfo
+			ConfigurationInfo current = listconfigs.SelectedItems[0].Tag as ConfigurationInfo;
+			current.PasteFrom(configinfocopy);
+
+			//update display
+			cbEngineSelector.Text = string.Empty; // Otherwise current text from cbEngineSelector will override the pasted one
+			listconfigs_SelectedIndexChanged(listconfigs, EventArgs.Empty);
+			General.Interface.DisplayStatus(StatusType.Info, "Pasted game configuration from '" + configinfocopy.Name + "'");
+		}
+
+		private void pasteresources_Click(object sender, EventArgs e) 
+		{
+			if(listconfigs.SelectedIndices.Count < 1) return;
+
+			//get current configinfo
+			ConfigurationInfo current = listconfigs.SelectedItems[0].Tag as ConfigurationInfo;
+			current.PasteResourcesFrom(configinfocopy);
+
+			//update display
+			listconfigs_SelectedIndexChanged(listconfigs, EventArgs.Empty);
+			General.Interface.DisplayStatus(StatusType.Info, "Pasted resources from '" + configinfocopy.Name + "'");
+		}
+
+		private void pasteengines_Click(object sender, EventArgs e) 
+		{
+			if(listconfigs.SelectedIndices.Count < 1) return;
+
+			//get current configinfo
+			ConfigurationInfo current = listconfigs.SelectedItems[0].Tag as ConfigurationInfo;
+			current.PasteTestEnginesFrom(configinfocopy);
+
+			//update display
+			cbEngineSelector.Text = string.Empty; // Otherwise current text from cbEngineSelector will override the pasted one
+			listconfigs_SelectedIndexChanged(listconfigs, EventArgs.Empty);
+			General.Interface.DisplayStatus(StatusType.Info, "Pasted engines list from '" + configinfocopy.Name + "'");
+		}
+
+		private void pastecolorpresets_Click(object sender, EventArgs e) 
+		{
+			if(listconfigs.SelectedIndices.Count < 1) return;
+
+			//get current configinfo
+			ConfigurationInfo current = listconfigs.SelectedItems[0].Tag as ConfigurationInfo;
+			current.PasteColorPresetsFrom(configinfocopy);
+
+			//update display
+			listconfigs_SelectedIndexChanged(listconfigs, EventArgs.Empty);
+			General.Interface.DisplayStatus(StatusType.Info, "Pasted color presets from '" + configinfocopy.Name + "'");
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Windows/ConfigForm.resx b/Source/Core/Windows/ConfigForm.resx
new file mode 100644
index 0000000..6e46372
--- /dev/null
+++ b/Source/Core/Windows/ConfigForm.resx
@@ -0,0 +1,321 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="label5.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="label5.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label6.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="label6.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label3.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="label3.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <data name="label3.Text" xml:space="preserve">
+    <value>The nodebuilder is a compiler which builds geometry structures for your map. You need these structures to be able to play the map in the game. For each purpose you can choose the desired nodebuilder configuration here.</value>
+  </data>
+  <metadata name="label2.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="label2.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label7.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="label7.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label9.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label1.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label8.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label4.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="label4.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label10.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="label10.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <data name="label10.Text" xml:space="preserve">
+    <value>Here you can select the editing modes that you wish to use in this configuration. This is useful in case there are plugins with additional editing modes that can be used as a replacement for the original editing modes.</value>
+  </data>
+  <metadata name="tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>416, 17</value>
+  </metadata>
+  <data name="labelparameters.ToolTip" xml:space="preserve">
+    <value>%F     - WAD file with the map that is to be tested. NOTE: this is a temporary file and not the file you opened or saved. 
+%WP - IWAD resource file with full path included. This is the first (highest) IWAD file that is found in the resources list. 
+%WF - IWAD resource filename only, without path. This is the first (highest) IWAD file that is found in the resources list. 
+%L     - Map lump name as is set in the map options window.
+%L1   - The first number found in the map lump name (as is set in the map options window).
+%L2   - The second number found in the map lump name (as is set in the map options window).
+%AP  - All resource files, except the first IWAD, with full paths included.
+%S     - Skill number at which to test.
+%NM - Either -nomonsters when testing without monsters, or nothing at all.</value>
+  </data>
+  <metadata name="tabresources.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="tabnodebuilder.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="nodebuildertest.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="nodebuildersave.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="tabtesting.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="tabtextures.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="listtextures.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="restoretexturesets.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="edittextureset.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="pastetexturesets.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="copytexturesets.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="removetextureset.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="addtextureset.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="tabmodes.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="listmodes.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="nodebuildertest.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="nodebuildersave.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="listtextures.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="smallimages.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>159, 17</value>
+  </metadata>
+  <data name="smallimages.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
+        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
+        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAA4
+        CAAAAk1TRnQBSQFMAwEBAAHUAQEB1AEBARMBAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA
+        AUwDAAEQAwABAQEAAQgFAAHAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
+        AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
+        AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
+        AWYDAAGZAwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFm
+        AZkCAAFmAcwCAAFmAf8CAAGZAwABmQEzAgABmQFmAgACmQIAAZkBzAIAAZkB/wIAAcwDAAHMATMCAAHM
+        AWYCAAHMAZkCAALMAgABzAH/AgAB/wFmAgAB/wGZAgAB/wHMAQABMwH/AgAB/wEAATMBAAEzAQABZgEA
+        ATMBAAGZAQABMwEAAcwBAAEzAQAB/wEAAf8BMwIAAzMBAAIzAWYBAAIzAZkBAAIzAcwBAAIzAf8BAAEz
+        AWYCAAEzAWYBMwEAATMCZgEAATMBZgGZAQABMwFmAcwBAAEzAWYB/wEAATMBmQIAATMBmQEzAQABMwGZ
+        AWYBAAEzApkBAAEzAZkBzAEAATMBmQH/AQABMwHMAgABMwHMATMBAAEzAcwBZgEAATMBzAGZAQABMwLM
+        AQABMwHMAf8BAAEzAf8BMwEAATMB/wFmAQABMwH/AZkBAAEzAf8BzAEAATMC/wEAAWYDAAFmAQABMwEA
+        AWYBAAFmAQABZgEAAZkBAAFmAQABzAEAAWYBAAH/AQABZgEzAgABZgIzAQABZgEzAWYBAAFmATMBmQEA
+        AWYBMwHMAQABZgEzAf8BAAJmAgACZgEzAQADZgEAAmYBmQEAAmYBzAEAAWYBmQIAAWYBmQEzAQABZgGZ
+        AWYBAAFmApkBAAFmAZkBzAEAAWYBmQH/AQABZgHMAgABZgHMATMBAAFmAcwBmQEAAWYCzAEAAWYBzAH/
+        AQABZgH/AgABZgH/ATMBAAFmAf8BmQEAAWYB/wHMAQABzAEAAf8BAAH/AQABzAEAApkCAAGZATMBmQEA
+        AZkBAAGZAQABmQEAAcwBAAGZAwABmQIzAQABmQEAAWYBAAGZATMBzAEAAZkBAAH/AQABmQFmAgABmQFm
+        ATMBAAGZATMBZgEAAZkBZgGZAQABmQFmAcwBAAGZATMB/wEAApkBMwEAApkBZgEAA5kBAAKZAcwBAAKZ
+        Af8BAAGZAcwCAAGZAcwBMwEAAWYBzAFmAQABmQHMAZkBAAGZAswBAAGZAcwB/wEAAZkB/wIAAZkB/wEz
+        AQABmQHMAWYBAAGZAf8BmQEAAZkB/wHMAQABmQL/AQABzAMAAZkBAAEzAQABzAEAAWYBAAHMAQABmQEA
+        AcwBAAHMAQABmQEzAgABzAIzAQABzAEzAWYBAAHMATMBmQEAAcwBMwHMAQABzAEzAf8BAAHMAWYCAAHM
+        AWYBMwEAAZkCZgEAAcwBZgGZAQABzAFmAcwBAAGZAWYB/wEAAcwBmQIAAcwBmQEzAQABzAGZAWYBAAHM
+        ApkBAAHMAZkBzAEAAcwBmQH/AQACzAIAAswBMwEAAswBZgEAAswBmQEAA8wBAALMAf8BAAHMAf8CAAHM
+        Af8BMwEAAZkB/wFmAQABzAH/AZkBAAHMAf8BzAEAAcwC/wEAAcwBAAEzAQAB/wEAAWYBAAH/AQABmQEA
+        AcwBMwIAAf8CMwEAAf8BMwFmAQAB/wEzAZkBAAH/ATMBzAEAAf8BMwH/AQAB/wFmAgAB/wFmATMBAAHM
+        AmYBAAH/AWYBmQEAAf8BZgHMAQABzAFmAf8BAAH/AZkCAAH/AZkBMwEAAf8BmQFmAQAB/wKZAQAB/wGZ
+        AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz
+        AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm
+        AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw
+        AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/5sAAfcCrgFtAWwB6gJs
+        BGZAAAH3Bf8C9AMZAWZAAAG1Av8CkwGZAQcBuwG0AhkDZj4AAbUC/wGTAZoBegGfAZ4BuwH0AfMBZgEZ
+        AWY+AAG1Av8BuwEIAp8BfgF5AvQBbAEZA2Y8AAG1Av8C2wEJAQgBfgF5Af8B9AFsAfMBZgEZAWY8AAEH
+        Cv8BbAH0AWwBGQFmPAACBwS1AfcBtQLtApEB9AFsAfMBZj4AAQcK/wFsAfQBbD4AAgcEtQH3AbUC7QKR
+        AfQBbEAAAQcK/wFsQAACBwS1AfcBtQLtApHSAAFCAU0BPgcAAT4DAAEoAwABTAMAARADAAEBAQABAQUA
+        AcAXAAP/AQAC/wHgCQAC/wHgCQABwAEDAeAJAAHAAQMB4AkAAcABAAHgCQABwAEAAeAJAAHAAQABIAkA
+        AcABAAEgCQABwAEAASAJAAHAAQABIAkAAfABAAEgCQAB8AEAASAJAAH8AQABIAkAAfwBAAEgCQAC/wHg
+        CQAC/wHgCQAL
+</value>
+  </data>
+  <metadata name="restoretexturesets.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="edittextureset.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="pastetexturesets.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="copytexturesets.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="removetextureset.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="addtextureset.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="listmodes.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="copypastemenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>278, 17</value>
+  </metadata>
+  <metadata name="testprogramdialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>416, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Windows/CustomFieldsForm.Designer.cs b/Source/Core/Windows/CustomFieldsForm.Designer.cs
new file mode 100644
index 0000000..b594918
--- /dev/null
+++ b/Source/Core/Windows/CustomFieldsForm.Designer.cs
@@ -0,0 +1,110 @@
+namespace CodeImp.DoomBuilder.Windows
+{
+	partial class CustomFieldsForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.fieldslist = new CodeImp.DoomBuilder.Controls.FieldsEditorControl();
+			this.cancel = new System.Windows.Forms.Button();
+			this.apply = new System.Windows.Forms.Button();
+			this.SuspendLayout();
+			// 
+			// fieldslist
+			// 
+			this.fieldslist.AllowInsert = true;
+			this.fieldslist.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.fieldslist.AutoInsertUserPrefix = true;
+			this.fieldslist.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+			this.fieldslist.Location = new System.Drawing.Point(10, 10);
+			this.fieldslist.Margin = new System.Windows.Forms.Padding(1);
+			this.fieldslist.Name = "fieldslist";
+			this.fieldslist.PropertyColumnVisible = true;
+			this.fieldslist.PropertyColumnWidth = 150;
+			this.fieldslist.Size = new System.Drawing.Size(506, 310);
+			this.fieldslist.TabIndex = 0;
+			this.fieldslist.TypeColumnVisible = true;
+			this.fieldslist.TypeColumnWidth = 100;
+			this.fieldslist.ValueColumnVisible = true;
+			// 
+			// cancel
+			// 
+			this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.cancel.Location = new System.Drawing.Point(404, 332);
+			this.cancel.Margin = new System.Windows.Forms.Padding(1);
+			this.cancel.Name = "cancel";
+			this.cancel.Size = new System.Drawing.Size(112, 25);
+			this.cancel.TabIndex = 2;
+			this.cancel.Text = "Cancel";
+			this.cancel.UseVisualStyleBackColor = true;
+			this.cancel.Click += new System.EventHandler(this.cancel_Click);
+			// 
+			// apply
+			// 
+			this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.apply.Location = new System.Drawing.Point(287, 332);
+			this.apply.Margin = new System.Windows.Forms.Padding(1);
+			this.apply.Name = "apply";
+			this.apply.Size = new System.Drawing.Size(112, 25);
+			this.apply.TabIndex = 1;
+			this.apply.Text = "OK";
+			this.apply.UseVisualStyleBackColor = true;
+			this.apply.Click += new System.EventHandler(this.apply_Click);
+			// 
+			// CustomFieldsForm
+			// 
+			this.AcceptButton = this.apply;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.CancelButton = this.cancel;
+			this.ClientSize = new System.Drawing.Size(526, 367);
+			this.Controls.Add(this.cancel);
+			this.Controls.Add(this.apply);
+			this.Controls.Add(this.fieldslist);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "CustomFieldsForm";
+			this.Opacity = 1;
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Custom Fields";
+			this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.CustomFieldsForm_HelpRequested);
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private CodeImp.DoomBuilder.Controls.FieldsEditorControl fieldslist;
+		private System.Windows.Forms.Button cancel;
+		private System.Windows.Forms.Button apply;
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/CustomFieldsForm.cs b/Source/Core/Windows/CustomFieldsForm.cs
new file mode 100644
index 0000000..e7fd10a
--- /dev/null
+++ b/Source/Core/Windows/CustomFieldsForm.cs
@@ -0,0 +1,103 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Map;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Windows
+{
+	/// <summary>
+	/// Dialog window that allows you to view and/or change custom UDMF fields.
+	/// </summary>
+	public partial class CustomFieldsForm : DelayedForm
+	{
+		// Keep a list of elements
+		private ICollection<MapElement> elements;
+		
+		// Constructor
+		public CustomFieldsForm()
+		{
+			// Initialize
+			InitializeComponent();
+		}
+
+		// This shows the dialog, returns false when cancelled
+		public static bool ShowDialog(IWin32Window owner, string title, string elementname, ICollection<MapElement> elements, List<UniversalFieldInfo> fixedfields)
+		{
+			CustomFieldsForm f = new CustomFieldsForm();
+			f.Setup(title, elementname, elements, fixedfields);
+			bool result = (f.ShowDialog(owner) == DialogResult.OK);
+			f.Dispose();
+			return result;
+		}
+		
+		// This sets up the dialog
+		public void Setup(string title, string elementname, ICollection<MapElement> elements, List<UniversalFieldInfo> fixedfields)
+		{
+			// Initialize
+			this.elements = elements;
+			this.Text = title;
+
+			// Initialize custom fields editor
+			fieldslist.Setup(elementname);
+
+			// Fill universal fields list
+			fieldslist.ListFixedFields(fixedfields);
+
+			// Setup from first element
+			MapElement fe = General.GetByIndex(elements, 0);
+			fieldslist.SetValues(fe.Fields, true);
+			
+			// Setup from all elements
+			foreach(MapElement e in elements)
+				fieldslist.SetValues(e.Fields, false);
+		}
+		
+		// OK clicked
+		private void apply_Click(object sender, EventArgs e)
+		{
+			// Apply fields to all elements
+			foreach(MapElement el in elements) fieldslist.Apply(el.Fields);
+			
+			// Done
+			General.Map.IsChanged = true;
+			this.DialogResult = DialogResult.OK;
+			this.Close();
+		}
+
+		// Cancel clicked
+		private void cancel_Click(object sender, EventArgs e)
+		{
+			// Be gone
+			this.DialogResult = DialogResult.Cancel;
+			this.Close();
+		}
+
+		// Help requested
+		private void CustomFieldsForm_HelpRequested(object sender, HelpEventArgs hlpevent)
+		{
+			General.ShowHelp("w_customfields.html");
+			hlpevent.Handled = true;
+		}
+	}
+}
diff --git a/Source/Core/Windows/CustomFieldsForm.resx b/Source/Core/Windows/CustomFieldsForm.resx
new file mode 100644
index 0000000..60b7309
--- /dev/null
+++ b/Source/Core/Windows/CustomFieldsForm.resx
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="fieldslist.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Windows/DelayedForm.cs b/Source/Core/Windows/DelayedForm.cs
new file mode 100644
index 0000000..d8b88d2
--- /dev/null
+++ b/Source/Core/Windows/DelayedForm.cs
@@ -0,0 +1,121 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Actions;
+using Action = CodeImp.DoomBuilder.Actions.Action;
+
+#endregion
+
+// This Form is a workaround for the slow drawing of the .NET Forms.
+// By showing the Form at 0% Opacity it allows the .NET framework to complete
+// drawing the Form first, then we set it to 100% Opacity to actually show it.
+// To use this class properly, set the initial Opacity of your Form to 0.
+
+namespace CodeImp.DoomBuilder.Windows
+{
+	public class DelayedForm : Form
+	{
+		// Variables
+		private Timer formshowtimer;
+		
+		// Constructor
+		public DelayedForm()
+		{
+			this.Opacity = 0; //mxd
+			
+			//mxd. And now, let's hope this doesn't horribly break anything...
+			if(!(this is MainForm))
+			{
+				this.KeyPreview = true;
+				this.KeyUp += OnKeyUp;
+			}
+			
+			// Create a timer that we need to show the form
+			formshowtimer = new Timer();
+			formshowtimer.Interval = 1;
+			formshowtimer.Tick += formshowtimer_Tick;
+		}
+		
+		// When form is shown
+		protected override void OnShown(EventArgs e)
+		{
+			// Let the base class know
+			base.OnShown(e);
+
+			// Start the timer to show the form
+			formshowtimer.Enabled = true;
+
+			// Bind any methods (mxd)
+			if(!DesignMode) General.Actions.BindMethods(this);
+		}
+
+		// When the form is to be shown
+		private void formshowtimer_Tick(object sender, EventArgs e)
+		{
+			// Get rid of the timer
+			formshowtimer.Dispose();
+			formshowtimer = null;
+			
+			if(!this.IsDisposed)
+			{
+				// Make the form visible
+				this.Opacity = 1.0;
+			}
+		}
+
+		//mxd. Special handling to call "save screenshot" actions from any form, 
+		//which inherits form DelayedForm and either doesn't override OnKeyUp, or calls base.OnKeyUp
+		private void OnKeyUp(object sender, KeyEventArgs e)
+		{
+			e.Handled = (Form.ActiveForm == this && ProcessSaveScreenshotAction((int)e.KeyData));
+			if(e.Handled) e.SuppressKeyPress = true;
+		}
+
+		// mxd. Handle screenshot saving from any form
+		internal static bool ProcessSaveScreenshotAction(int key)
+		{
+			Action[] actions = General.Actions.GetActionsByKey(key);
+			foreach(Action action in actions) 
+			{
+				if(action.ShortName == "savescreenshot" || action.ShortName == "saveeditareascreenshot")
+				{
+					General.Actions.InvokeAction(action.Name);
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		//mxd
+		[EndAction("savescreenshot", BaseAction = true)]
+		internal void SaveScreenshot() 
+		{
+			if(Form.ActiveForm == this) General.MainWindow.SaveScreenshot(false);
+		}
+
+		//mxd
+		[EndAction("saveeditareascreenshot", BaseAction = true)]
+		internal void SaveEditAreaScreenshot() 
+		{
+			if(Form.ActiveForm == this) General.MainWindow.SaveScreenshot(true);
+		}
+	}
+}
diff --git a/Source/Core/Windows/DelayedForm.resx b/Source/Core/Windows/DelayedForm.resx
new file mode 100644
index 0000000..e1596fb
--- /dev/null
+++ b/Source/Core/Windows/DelayedForm.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+	Microsoft ResX Schema 
+	
+	Version 2.0
+	
+	The primary goals of this format is to allow a simple XML format 
+	that is mostly human readable. The generation and parsing of the 
+	various data types are done through the TypeConverter classes 
+	associated with the data types.
+	
+	Example:
+	
+	... ado.net/XML headers & schema ...
+	<resheader name="resmimetype">text/microsoft-resx</resheader>
+	<resheader name="version">2.0</resheader>
+	<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+	<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+	<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+	<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+	<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+		<value>[base64 mime encoded serialized .NET Framework object]</value>
+	</data>
+	<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+		<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+		<comment>This is a comment</comment>
+	</data>
+				
+	There are any number of "resheader" rows that contain simple 
+	name/value pairs.
+	
+	Each data row contains a name, and value. The row also contains a 
+	type or mimetype. Type corresponds to a .NET class that support 
+	text/value conversion through the TypeConverter architecture. 
+	Classes that don't support this are serialized and stored with the 
+	mimetype set.
+	
+	The mimetype is used for serialized objects, and tells the 
+	ResXResourceReader how to depersist the object. This is currently not 
+	extensible. For a given mimetype the value must be set accordingly:
+	
+	Note - application/x-microsoft.net.object.binary.base64 is the format 
+	that the ResXResourceWriter will generate, however the reader can 
+	read any of the formats listed below.
+	
+	mimetype: application/x-microsoft.net.object.binary.base64
+	value   : The object must be serialized with 
+			: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+			: and then encoded with base64 encoding.
+	
+	mimetype: application/x-microsoft.net.object.soap.base64
+	value   : The object must be serialized with 
+			: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+			: and then encoded with base64 encoding.
+
+	mimetype: application/x-microsoft.net.object.bytearray.base64
+	value   : The object must be serialized into a byte array 
+			: using a System.ComponentModel.TypeConverter
+			: and then encoded with base64 encoding.
+	-->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+	<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+	<xsd:element name="root" msdata:IsDataSet="true">
+	  <xsd:complexType>
+		<xsd:choice maxOccurs="unbounded">
+		  <xsd:element name="metadata">
+			<xsd:complexType>
+			  <xsd:sequence>
+				<xsd:element name="value" type="xsd:string" minOccurs="0" />
+			  </xsd:sequence>
+			  <xsd:attribute name="name" use="required" type="xsd:string" />
+			  <xsd:attribute name="type" type="xsd:string" />
+			  <xsd:attribute name="mimetype" type="xsd:string" />
+			  <xsd:attribute ref="xml:space" />
+			</xsd:complexType>
+		  </xsd:element>
+		  <xsd:element name="assembly">
+			<xsd:complexType>
+			  <xsd:attribute name="alias" type="xsd:string" />
+			  <xsd:attribute name="name" type="xsd:string" />
+			</xsd:complexType>
+		  </xsd:element>
+		  <xsd:element name="data">
+			<xsd:complexType>
+			  <xsd:sequence>
+				<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+				<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+			  </xsd:sequence>
+			  <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+			  <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+			  <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+			  <xsd:attribute ref="xml:space" />
+			</xsd:complexType>
+		  </xsd:element>
+		  <xsd:element name="resheader">
+			<xsd:complexType>
+			  <xsd:sequence>
+				<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+			  </xsd:sequence>
+			  <xsd:attribute name="name" type="xsd:string" use="required" />
+			</xsd:complexType>
+		  </xsd:element>
+		</xsd:choice>
+	  </xsd:complexType>
+	</xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+	<value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+	<value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+	<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+	<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Windows/EffectBrowserForm.Designer.cs b/Source/Core/Windows/EffectBrowserForm.Designer.cs
new file mode 100644
index 0000000..8060da2
--- /dev/null
+++ b/Source/Core/Windows/EffectBrowserForm.Designer.cs
@@ -0,0 +1,448 @@
+namespace CodeImp.DoomBuilder.Windows
+{
+	partial class EffectBrowserForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			System.Windows.Forms.GroupBox groupBox2;
+			this.option7 = new System.Windows.Forms.ComboBox();
+			this.option7label = new System.Windows.Forms.Label();
+			this.option6 = new System.Windows.Forms.ComboBox();
+			this.option6label = new System.Windows.Forms.Label();
+			this.option5 = new System.Windows.Forms.ComboBox();
+			this.option5label = new System.Windows.Forms.Label();
+			this.option4 = new System.Windows.Forms.ComboBox();
+			this.option4label = new System.Windows.Forms.Label();
+			this.option3 = new System.Windows.Forms.ComboBox();
+			this.option3label = new System.Windows.Forms.Label();
+			this.option2 = new System.Windows.Forms.ComboBox();
+			this.option2label = new System.Windows.Forms.Label();
+			this.option1 = new System.Windows.Forms.ComboBox();
+			this.option1label = new System.Windows.Forms.Label();
+			this.option0 = new System.Windows.Forms.ComboBox();
+			this.option0label = new System.Windows.Forms.Label();
+			this.cancel = new System.Windows.Forms.Button();
+			this.apply = new System.Windows.Forms.Button();
+			this.tabs = new System.Windows.Forms.TabControl();
+			this.tabeffects = new System.Windows.Forms.TabPage();
+			this.filterPanel = new System.Windows.Forms.Panel();
+			this.tbFilter = new System.Windows.Forms.TextBox();
+			this.btnClearFilter = new System.Windows.Forms.Button();
+			this.labelFilter = new System.Windows.Forms.Label();
+			this.effects = new System.Windows.Forms.ListView();
+			this.colnumber = new System.Windows.Forms.ColumnHeader();
+			this.colname = new System.Windows.Forms.ColumnHeader();
+			this.tabgeneralized = new System.Windows.Forms.TabPage();
+			groupBox2 = new System.Windows.Forms.GroupBox();
+			groupBox2.SuspendLayout();
+			this.tabs.SuspendLayout();
+			this.tabeffects.SuspendLayout();
+			this.filterPanel.SuspendLayout();
+			this.tabgeneralized.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// groupBox2
+			// 
+			groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			groupBox2.Controls.Add(this.option7);
+			groupBox2.Controls.Add(this.option7label);
+			groupBox2.Controls.Add(this.option6);
+			groupBox2.Controls.Add(this.option6label);
+			groupBox2.Controls.Add(this.option5);
+			groupBox2.Controls.Add(this.option5label);
+			groupBox2.Controls.Add(this.option4);
+			groupBox2.Controls.Add(this.option4label);
+			groupBox2.Controls.Add(this.option3);
+			groupBox2.Controls.Add(this.option3label);
+			groupBox2.Controls.Add(this.option2);
+			groupBox2.Controls.Add(this.option2label);
+			groupBox2.Controls.Add(this.option1);
+			groupBox2.Controls.Add(this.option1label);
+			groupBox2.Controls.Add(this.option0);
+			groupBox2.Controls.Add(this.option0label);
+			groupBox2.Location = new System.Drawing.Point(6, 6);
+			groupBox2.Name = "groupBox2";
+			groupBox2.Size = new System.Drawing.Size(379, 398);
+			groupBox2.TabIndex = 1;
+			groupBox2.TabStop = false;
+			groupBox2.Text = " Options ";
+			// 
+			// option7
+			// 
+			this.option7.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.option7.FormattingEnabled = true;
+			this.option7.Location = new System.Drawing.Point(118, 280);
+			this.option7.Name = "option7";
+			this.option7.Size = new System.Drawing.Size(199, 21);
+			this.option7.TabIndex = 7;
+			this.option7.Visible = false;
+			// 
+			// option7label
+			// 
+			this.option7label.Location = new System.Drawing.Point(3, 283);
+			this.option7label.Name = "option7label";
+			this.option7label.Size = new System.Drawing.Size(109, 19);
+			this.option7label.TabIndex = 16;
+			this.option7label.Text = "Option:";
+			this.option7label.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			this.option7label.Visible = false;
+			// 
+			// option6
+			// 
+			this.option6.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.option6.FormattingEnabled = true;
+			this.option6.Location = new System.Drawing.Point(118, 244);
+			this.option6.Name = "option6";
+			this.option6.Size = new System.Drawing.Size(199, 21);
+			this.option6.TabIndex = 6;
+			this.option6.Visible = false;
+			// 
+			// option6label
+			// 
+			this.option6label.Location = new System.Drawing.Point(3, 247);
+			this.option6label.Name = "option6label";
+			this.option6label.Size = new System.Drawing.Size(109, 19);
+			this.option6label.TabIndex = 14;
+			this.option6label.Text = "Option:";
+			this.option6label.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			this.option6label.Visible = false;
+			// 
+			// option5
+			// 
+			this.option5.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.option5.FormattingEnabled = true;
+			this.option5.Location = new System.Drawing.Point(118, 208);
+			this.option5.Name = "option5";
+			this.option5.Size = new System.Drawing.Size(199, 21);
+			this.option5.TabIndex = 5;
+			this.option5.Visible = false;
+			// 
+			// option5label
+			// 
+			this.option5label.Location = new System.Drawing.Point(3, 211);
+			this.option5label.Name = "option5label";
+			this.option5label.Size = new System.Drawing.Size(109, 19);
+			this.option5label.TabIndex = 12;
+			this.option5label.Text = "Option:";
+			this.option5label.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			this.option5label.Visible = false;
+			// 
+			// option4
+			// 
+			this.option4.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.option4.FormattingEnabled = true;
+			this.option4.Location = new System.Drawing.Point(118, 172);
+			this.option4.Name = "option4";
+			this.option4.Size = new System.Drawing.Size(199, 21);
+			this.option4.TabIndex = 4;
+			this.option4.Visible = false;
+			// 
+			// option4label
+			// 
+			this.option4label.Location = new System.Drawing.Point(3, 175);
+			this.option4label.Name = "option4label";
+			this.option4label.Size = new System.Drawing.Size(109, 19);
+			this.option4label.TabIndex = 10;
+			this.option4label.Text = "Option:";
+			this.option4label.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			this.option4label.Visible = false;
+			// 
+			// option3
+			// 
+			this.option3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.option3.FormattingEnabled = true;
+			this.option3.Location = new System.Drawing.Point(118, 136);
+			this.option3.Name = "option3";
+			this.option3.Size = new System.Drawing.Size(199, 21);
+			this.option3.TabIndex = 3;
+			this.option3.Visible = false;
+			// 
+			// option3label
+			// 
+			this.option3label.Location = new System.Drawing.Point(3, 139);
+			this.option3label.Name = "option3label";
+			this.option3label.Size = new System.Drawing.Size(109, 19);
+			this.option3label.TabIndex = 8;
+			this.option3label.Text = "Option:";
+			this.option3label.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			this.option3label.Visible = false;
+			// 
+			// option2
+			// 
+			this.option2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.option2.FormattingEnabled = true;
+			this.option2.Location = new System.Drawing.Point(118, 100);
+			this.option2.Name = "option2";
+			this.option2.Size = new System.Drawing.Size(199, 21);
+			this.option2.TabIndex = 2;
+			this.option2.Visible = false;
+			// 
+			// option2label
+			// 
+			this.option2label.Location = new System.Drawing.Point(3, 103);
+			this.option2label.Name = "option2label";
+			this.option2label.Size = new System.Drawing.Size(109, 19);
+			this.option2label.TabIndex = 6;
+			this.option2label.Text = "Option:";
+			this.option2label.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			this.option2label.Visible = false;
+			// 
+			// option1
+			// 
+			this.option1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.option1.FormattingEnabled = true;
+			this.option1.Location = new System.Drawing.Point(118, 64);
+			this.option1.Name = "option1";
+			this.option1.Size = new System.Drawing.Size(199, 21);
+			this.option1.TabIndex = 1;
+			this.option1.Visible = false;
+			// 
+			// option1label
+			// 
+			this.option1label.Location = new System.Drawing.Point(3, 67);
+			this.option1label.Name = "option1label";
+			this.option1label.Size = new System.Drawing.Size(109, 19);
+			this.option1label.TabIndex = 4;
+			this.option1label.Text = "Option:";
+			this.option1label.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			this.option1label.Visible = false;
+			// 
+			// option0
+			// 
+			this.option0.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.option0.FormattingEnabled = true;
+			this.option0.Location = new System.Drawing.Point(118, 28);
+			this.option0.Name = "option0";
+			this.option0.Size = new System.Drawing.Size(199, 21);
+			this.option0.TabIndex = 0;
+			this.option0.Visible = false;
+			// 
+			// option0label
+			// 
+			this.option0label.Location = new System.Drawing.Point(3, 31);
+			this.option0label.Name = "option0label";
+			this.option0label.Size = new System.Drawing.Size(109, 19);
+			this.option0label.TabIndex = 2;
+			this.option0label.Text = "Option:";
+			this.option0label.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			this.option0label.Visible = false;
+			// 
+			// cancel
+			// 
+			this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.cancel.Location = new System.Drawing.Point(293, 457);
+			this.cancel.Name = "cancel";
+			this.cancel.Size = new System.Drawing.Size(112, 27);
+			this.cancel.TabIndex = 2;
+			this.cancel.Text = "Cancel";
+			this.cancel.UseVisualStyleBackColor = true;
+			this.cancel.Click += new System.EventHandler(this.cancel_Click);
+			// 
+			// apply
+			// 
+			this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.apply.Location = new System.Drawing.Point(175, 457);
+			this.apply.Name = "apply";
+			this.apply.Size = new System.Drawing.Size(112, 27);
+			this.apply.TabIndex = 1;
+			this.apply.Text = "OK";
+			this.apply.UseVisualStyleBackColor = true;
+			this.apply.Click += new System.EventHandler(this.apply_Click);
+			// 
+			// tabs
+			// 
+			this.tabs.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.tabs.Controls.Add(this.tabeffects);
+			this.tabs.Controls.Add(this.tabgeneralized);
+			this.tabs.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.tabs.Location = new System.Drawing.Point(10, 10);
+			this.tabs.Margin = new System.Windows.Forms.Padding(1);
+			this.tabs.Name = "tabs";
+			this.tabs.Padding = new System.Drawing.Point(24, 3);
+			this.tabs.SelectedIndex = 0;
+			this.tabs.Size = new System.Drawing.Size(399, 436);
+			this.tabs.TabIndex = 0;
+			// 
+			// tabeffects
+			// 
+			this.tabeffects.Controls.Add(this.filterPanel);
+			this.tabeffects.Controls.Add(this.effects);
+			this.tabeffects.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.tabeffects.Location = new System.Drawing.Point(4, 22);
+			this.tabeffects.Name = "tabeffects";
+			this.tabeffects.Padding = new System.Windows.Forms.Padding(3);
+			this.tabeffects.Size = new System.Drawing.Size(391, 410);
+			this.tabeffects.TabIndex = 0;
+			this.tabeffects.Text = "Predefined Effects";
+			this.tabeffects.UseVisualStyleBackColor = true;
+			// 
+			// filterPanel
+			// 
+			this.filterPanel.Controls.Add(this.tbFilter);
+			this.filterPanel.Controls.Add(this.btnClearFilter);
+			this.filterPanel.Controls.Add(this.labelFilter);
+			this.filterPanel.Location = new System.Drawing.Point(6, 3);
+			this.filterPanel.Name = "filterPanel";
+			this.filterPanel.Size = new System.Drawing.Size(379, 30);
+			this.filterPanel.TabIndex = 32;
+			// 
+			// tbFilter
+			// 
+			this.tbFilter.Location = new System.Drawing.Point(47, 5);
+			this.tbFilter.Name = "tbFilter";
+			this.tbFilter.Size = new System.Drawing.Size(135, 20);
+			this.tbFilter.TabIndex = 28;
+			this.tbFilter.TextChanged += new System.EventHandler(this.tbFilter_TextChanged);
+			this.tbFilter.KeyUp += new System.Windows.Forms.KeyEventHandler(this.tbFilter_KeyUp);
+			// 
+			// btnClearFilter
+			// 
+			this.btnClearFilter.Image = global::CodeImp.DoomBuilder.Properties.Resources.SearchClear;
+			this.btnClearFilter.Location = new System.Drawing.Point(188, 3);
+			this.btnClearFilter.Name = "btnClearFilter";
+			this.btnClearFilter.Size = new System.Drawing.Size(32, 24);
+			this.btnClearFilter.TabIndex = 30;
+			this.btnClearFilter.UseVisualStyleBackColor = true;
+			this.btnClearFilter.Click += new System.EventHandler(this.btnClearFilter_Click);
+			// 
+			// labelFilter
+			// 
+			this.labelFilter.AutoSize = true;
+			this.labelFilter.Location = new System.Drawing.Point(8, 8);
+			this.labelFilter.Name = "labelFilter";
+			this.labelFilter.Size = new System.Drawing.Size(32, 13);
+			this.labelFilter.TabIndex = 29;
+			this.labelFilter.Text = "Filter:";
+			// 
+			// effects
+			// 
+			this.effects.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+            this.colnumber,
+            this.colname});
+			this.effects.FullRowSelect = true;
+			this.effects.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
+			this.effects.HideSelection = false;
+			this.effects.Location = new System.Drawing.Point(6, 34);
+			this.effects.MultiSelect = false;
+			this.effects.Name = "effects";
+			this.effects.Size = new System.Drawing.Size(379, 369);
+			this.effects.TabIndex = 0;
+			this.effects.UseCompatibleStateImageBehavior = false;
+			this.effects.View = System.Windows.Forms.View.Details;
+			this.effects.DoubleClick += new System.EventHandler(this.effects_DoubleClick);
+			this.effects.MouseEnter += new System.EventHandler(this.effects_MouseEnter);
+			this.effects.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.effects_KeyPress);
+			// 
+			// colnumber
+			// 
+			this.colnumber.Text = "Effect";
+			this.colnumber.Width = 70;
+			// 
+			// colname
+			// 
+			this.colname.Text = "Description";
+			this.colname.Width = 280;
+			// 
+			// tabgeneralized
+			// 
+			this.tabgeneralized.Controls.Add(groupBox2);
+			this.tabgeneralized.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.tabgeneralized.Location = new System.Drawing.Point(4, 22);
+			this.tabgeneralized.Name = "tabgeneralized";
+			this.tabgeneralized.Padding = new System.Windows.Forms.Padding(3);
+			this.tabgeneralized.Size = new System.Drawing.Size(391, 410);
+			this.tabgeneralized.TabIndex = 1;
+			this.tabgeneralized.Text = "Generalized Effects";
+			this.tabgeneralized.UseVisualStyleBackColor = true;
+			// 
+			// EffectBrowserForm
+			// 
+			this.AcceptButton = this.apply;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.CancelButton = this.cancel;
+			this.ClientSize = new System.Drawing.Size(419, 496);
+			this.Controls.Add(this.tabs);
+			this.Controls.Add(this.cancel);
+			this.Controls.Add(this.apply);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "EffectBrowserForm";
+			this.Opacity = 1;
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Edit Effect";
+			this.Shown += new System.EventHandler(this.EffectBrowserForm_Shown);
+			groupBox2.ResumeLayout(false);
+			this.tabs.ResumeLayout(false);
+			this.tabeffects.ResumeLayout(false);
+			this.filterPanel.ResumeLayout(false);
+			this.filterPanel.PerformLayout();
+			this.tabgeneralized.ResumeLayout(false);
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Button cancel;
+		private System.Windows.Forms.Button apply;
+		private System.Windows.Forms.TabControl tabs;
+		private System.Windows.Forms.TabPage tabeffects;
+		private System.Windows.Forms.TabPage tabgeneralized;
+		private System.Windows.Forms.ComboBox option7;
+		private System.Windows.Forms.Label option7label;
+		private System.Windows.Forms.ComboBox option6;
+		private System.Windows.Forms.Label option6label;
+		private System.Windows.Forms.ComboBox option5;
+		private System.Windows.Forms.Label option5label;
+		private System.Windows.Forms.ComboBox option4;
+		private System.Windows.Forms.Label option4label;
+		private System.Windows.Forms.ComboBox option3;
+		private System.Windows.Forms.Label option3label;
+		private System.Windows.Forms.ComboBox option2;
+		private System.Windows.Forms.Label option2label;
+		private System.Windows.Forms.ComboBox option1;
+		private System.Windows.Forms.Label option1label;
+		private System.Windows.Forms.ComboBox option0;
+		private System.Windows.Forms.Label option0label;
+		private System.Windows.Forms.ListView effects;
+		private System.Windows.Forms.ColumnHeader colnumber;
+		private System.Windows.Forms.ColumnHeader colname;
+		private System.Windows.Forms.Panel filterPanel;
+		private System.Windows.Forms.TextBox tbFilter;
+		private System.Windows.Forms.Button btnClearFilter;
+		private System.Windows.Forms.Label labelFilter;
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/EffectBrowserForm.cs b/Source/Core/Windows/EffectBrowserForm.cs
new file mode 100644
index 0000000..0c8d166
--- /dev/null
+++ b/Source/Core/Windows/EffectBrowserForm.cs
@@ -0,0 +1,272 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Config;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Windows
+{
+	internal partial class EffectBrowserForm : DelayedForm
+	{
+		// Constants
+		private const int MAX_OPTIONS = 8;
+		
+		// Variables
+		private int selectedeffect;
+		private ComboBox[] options;
+		private Label[] optionlbls;
+		private ListViewItem[] allItems; //mxd
+		
+		// Properties
+		public int SelectedEffect { get { return selectedeffect; } }
+		
+		// Constructor
+		public EffectBrowserForm(int effect)
+		{
+			// Initialize
+			InitializeComponent();
+
+			// Make array references for controls
+			options = new[] { option0, option1, option2, option3, option4, option5, option6, option7 };
+			optionlbls = new[] { option0label, option1label, option2label, option3label, option4label,
+									   option5label, option6label, option7label };
+			
+			// Go for all predefined effects
+			bool selected = CreateEffects(effect); //mxd
+			allItems = new ListViewItem[effects.Items.Count]; //mxd
+			effects.Items.CopyTo(allItems, 0); //mxd
+			
+			// Using generalized effects?
+			if(General.Map.Config.GeneralizedEffects)
+			{
+				// Go for all options
+				for(int i = 0; i < MAX_OPTIONS; i++)
+				{
+					// Option used in selected category?
+					if(i < General.Map.Config.GenEffectOptions.Count)
+					{
+						GeneralizedOption o = General.Map.Config.GenEffectOptions[i];
+						
+						// Setup controls
+						optionlbls[i].Text = o.Name + ":";
+						options[i].Items.Clear();
+						options[i].Items.AddRange(o.Bits.ToArray());
+						
+						// Show option
+						options[i].Visible = true;
+						optionlbls[i].Visible = true;
+
+						if(effects.SelectedItems.Count == 0)
+						{
+							// Go for all bits
+							foreach(GeneralizedBit ab in o.Bits)
+							{
+								// Select this setting if matches
+								if((effect & ab.Index) == ab.Index) options[i].SelectedItem = ab;
+							}
+						}
+					}
+					else
+					{
+						// Hide option
+						options[i].Visible = false;
+						optionlbls[i].Visible = false;
+					}
+				}
+				
+				// Open the generalized tab when given effect is generalized
+				if(!selected) tabs.SelectedTab = tabgeneralized;
+			}
+			else
+			{
+				// Remove generalized tab
+				tabs.TabPages.Remove(tabgeneralized);
+			}
+		}
+		
+		// This browses for an effect
+		// Returns the new effect or the same effect when cancelled
+		public static int BrowseEffect(IWin32Window owner, int effect)
+		{
+			EffectBrowserForm f = new EffectBrowserForm(effect);
+			if(f.ShowDialog(owner) == DialogResult.OK) effect = f.SelectedEffect;
+			f.Dispose();
+			return effect;
+		}
+
+		//mxd
+		private bool CreateEffects(int effect) 
+		{
+			bool selected = false;
+
+			foreach(SectorEffectInfo si in General.Map.Config.SortedSectorEffects) 
+			{
+				// Create effect
+				ListViewItem n = effects.Items.Add(si.Index.ToString());
+				n.SubItems.Add(si.Title);
+				n.Tag = si;
+				if(si.Index == effect) 
+				{
+					selected = true;
+					n.Selected = true;
+				}
+			}
+			return selected;
+		}
+
+		//mxd
+		private void FilterEffects(string p) 
+		{
+			List<ListViewItem> filteredItems = new List<ListViewItem>();
+
+			foreach(ListViewItem i in allItems) 
+			{
+				SectorEffectInfo si = i.Tag as SectorEffectInfo;
+				if(si.Title.ToLowerInvariant().IndexOf(p) != -1)
+					filteredItems.Add(i);
+			}
+
+			effects.BeginUpdate();
+			effects.Items.Clear();
+			effects.Items.AddRange(filteredItems.ToArray());
+			effects.EndUpdate();
+		}
+		
+		// OK clicked
+		private void apply_Click(object sender, EventArgs e)
+		{
+			// Presume no result
+			selectedeffect = 0;
+			
+			// Predefined action?
+			if(tabs.SelectedTab == tabeffects)
+			{
+				// Effect selected?
+				if((effects.SelectedItems.Count > 0) && (effects.SelectedItems[0].Tag is SectorEffectInfo))
+				{
+					// Our result
+					selectedeffect = (effects.SelectedItems[0].Tag as SectorEffectInfo).Index;
+				}
+			}
+			// Generalized action
+			else
+			{
+				// Go for all options
+				for(int i = 0; i < MAX_OPTIONS; i++)
+				{
+					// Option used?
+					if(i < General.Map.Config.GenEffectOptions.Count)
+					{
+						// Add selected bits
+						if(options[i].SelectedIndex > -1)
+							selectedeffect += (options[i].SelectedItem as GeneralizedBit).Index;
+					}
+				}
+			}
+			
+			// Done
+			this.DialogResult = DialogResult.OK;
+			this.Close();
+		}
+
+		// Cancel clicked
+		private void cancel_Click(object sender, EventArgs e)
+		{
+			// Leave
+			this.DialogResult = DialogResult.Cancel;
+			this.Close();
+		}
+		
+		// Double-clicked on item
+		private void effects_DoubleClick(object sender, EventArgs e)
+		{
+			// Effect selected?
+			if((effects.SelectedItems.Count > 0) && (effects.SelectedItems[0].Tag is SectorEffectInfo))
+			{
+				if(apply.Enabled) apply_Click(this, EventArgs.Empty);
+			}
+		}
+
+		//mxd
+		private void tbFilter_TextChanged(object sender, EventArgs e) 
+		{
+			if(!string.IsNullOrEmpty(tbFilter.Text.Trim()))
+			{
+				FilterEffects(tbFilter.Text);
+			} 
+			else
+			{
+				effects.Items.Clear();
+				CreateEffects(effects.SelectedItems.Count > 0 ? ((SectorEffectInfo)effects.SelectedItems[0].Tag).Index : 0);
+			}
+		}
+
+		//mxd. Switch focus to effects list?
+		private void tbFilter_KeyUp(object sender, KeyEventArgs e)
+		{
+			if(e.KeyCode == Keys.Down && effects.Items.Count > 0)
+			{
+				effects.Items[0].Selected = true;
+				effects.Focus();
+			}
+		}
+
+		//mxd
+		private void btnClearFilter_Click(object sender, EventArgs e) 
+		{
+			tbFilter.Clear();
+		}
+
+		//mxd
+		private void EffectBrowserForm_Shown(object sender, EventArgs e)
+		{
+			if(tabs.SelectedTab == tabeffects) tbFilter.Focus();
+		}
+
+		//mxd
+		private void effects_MouseEnter(object sender, EventArgs e)
+		{
+			effects.Focus();
+		}
+
+		//mxd. Transfer focus to Filter textbox
+		private void effects_KeyPress(object sender, KeyPressEventArgs e)
+		{
+			tbFilter.Focus();
+			if(e.KeyChar == '\b') // Any better way to check for Backspace?..
+			{
+				if(!string.IsNullOrEmpty(tbFilter.Text) && tbFilter.SelectionStart > 0 && tbFilter.SelectionLength == 0)
+				{
+					int s = tbFilter.SelectionStart - 1;
+					tbFilter.Text = tbFilter.Text.Remove(s, 1);
+					tbFilter.SelectionStart = s;
+				}
+			}
+			else
+			{
+				tbFilter.AppendText(e.KeyChar.ToString(CultureInfo.InvariantCulture));
+			}
+		}
+
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/EffectBrowserForm.resx b/Source/Core/Windows/EffectBrowserForm.resx
new file mode 100644
index 0000000..ec8c193
--- /dev/null
+++ b/Source/Core/Windows/EffectBrowserForm.resx
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="groupBox2.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="groupBox2.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="option7.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="option7label.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="option6.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="option6label.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="option5.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="option5label.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="option4.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="option4label.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="option3.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="option3label.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="option2.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="option2label.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="option1.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="option1label.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="option0.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="option0label.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="tabs.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="tabeffects.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="tabgeneralized.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Windows/ErrorsForm.Designer.cs b/Source/Core/Windows/ErrorsForm.Designer.cs
new file mode 100644
index 0000000..90bc2c9
--- /dev/null
+++ b/Source/Core/Windows/ErrorsForm.Designer.cs
@@ -0,0 +1,189 @@
+namespace CodeImp.DoomBuilder.Windows
+{
+	partial class ErrorsForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.components = new System.ComponentModel.Container();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+			this.copyselected = new System.Windows.Forms.Button();
+			this.clearlist = new System.Windows.Forms.Button();
+			this.close = new System.Windows.Forms.Button();
+			this.checkerrors = new System.Windows.Forms.Timer(this.components);
+			this.checkshow = new System.Windows.Forms.CheckBox();
+			this.grid = new System.Windows.Forms.DataGridView();
+			this.iconcolumn = new System.Windows.Forms.DataGridViewImageColumn();
+			this.textcolumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			((System.ComponentModel.ISupportInitialize)(this.grid)).BeginInit();
+			this.SuspendLayout();
+			// 
+			// copyselected
+			// 
+			this.copyselected.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.copyselected.Enabled = false;
+			this.copyselected.Location = new System.Drawing.Point(12, 416);
+			this.copyselected.Name = "copyselected";
+			this.copyselected.Size = new System.Drawing.Size(122, 25);
+			this.copyselected.TabIndex = 1;
+			this.copyselected.Text = "Copy Selection";
+			this.copyselected.UseVisualStyleBackColor = true;
+			this.copyselected.Click += new System.EventHandler(this.copyselected_Click);
+			// 
+			// clearlist
+			// 
+			this.clearlist.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.clearlist.Location = new System.Drawing.Point(150, 416);
+			this.clearlist.Name = "clearlist";
+			this.clearlist.Size = new System.Drawing.Size(122, 25);
+			this.clearlist.TabIndex = 2;
+			this.clearlist.Text = "Clear";
+			this.clearlist.UseVisualStyleBackColor = true;
+			this.clearlist.Click += new System.EventHandler(this.clearlist_Click);
+			// 
+			// close
+			// 
+			this.close.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.close.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.close.Location = new System.Drawing.Point(622, 416);
+			this.close.Name = "close";
+			this.close.Size = new System.Drawing.Size(122, 25);
+			this.close.TabIndex = 4;
+			this.close.Text = "Close";
+			this.close.UseVisualStyleBackColor = true;
+			this.close.Click += new System.EventHandler(this.close_Click);
+			// 
+			// checkerrors
+			// 
+			this.checkerrors.Interval = 1000;
+			this.checkerrors.Tick += new System.EventHandler(this.checkerrors_Tick);
+			// 
+			// checkshow
+			// 
+			this.checkshow.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.checkshow.AutoSize = true;
+			this.checkshow.Location = new System.Drawing.Point(301, 421);
+			this.checkshow.Name = "checkshow";
+			this.checkshow.Size = new System.Drawing.Size(199, 17);
+			this.checkshow.TabIndex = 3;
+			this.checkshow.Text = "Show this window when errors occur";
+			this.checkshow.UseVisualStyleBackColor = true;
+			// 
+			// grid
+			// 
+			this.grid.AllowUserToAddRows = false;
+			this.grid.AllowUserToDeleteRows = false;
+			this.grid.AllowUserToResizeColumns = false;
+			this.grid.AllowUserToResizeRows = false;
+			this.grid.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.grid.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
+			this.grid.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllCells;
+			this.grid.BackgroundColor = System.Drawing.SystemColors.Window;
+			this.grid.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+			this.grid.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None;
+			this.grid.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.EnableWithoutHeaderText;
+			this.grid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+			this.grid.ColumnHeadersVisible = false;
+			this.grid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.iconcolumn,
+            this.textcolumn});
+			this.grid.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;
+			this.grid.Location = new System.Drawing.Point(12, 12);
+			this.grid.Name = "grid";
+			this.grid.ReadOnly = true;
+			this.grid.RowHeadersVisible = false;
+			dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopLeft;
+			dataGridViewCellStyle1.Padding = new System.Windows.Forms.Padding(2, 4, 2, 5);
+			this.grid.RowsDefaultCellStyle = dataGridViewCellStyle1;
+			this.grid.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
+			this.grid.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+			this.grid.ShowCellErrors = false;
+			this.grid.ShowCellToolTips = false;
+			this.grid.ShowEditingIcon = false;
+			this.grid.ShowRowErrors = false;
+			this.grid.Size = new System.Drawing.Size(732, 395);
+			this.grid.StandardTab = true;
+			this.grid.TabIndex = 5;
+			this.grid.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.grid_CellContentClick);
+			// 
+			// iconcolumn
+			// 
+			this.iconcolumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+			this.iconcolumn.HeaderText = "Icon";
+			this.iconcolumn.MinimumWidth = 20;
+			this.iconcolumn.Name = "iconcolumn";
+			this.iconcolumn.ReadOnly = true;
+			this.iconcolumn.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+			this.iconcolumn.Width = 24;
+			// 
+			// textcolumn
+			// 
+			this.textcolumn.HeaderText = "Text";
+			this.textcolumn.Name = "textcolumn";
+			this.textcolumn.ReadOnly = true;
+			// 
+			// ErrorsForm
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.CancelButton = this.close;
+			this.ClientSize = new System.Drawing.Size(756, 453);
+			this.Controls.Add(this.checkshow);
+			this.Controls.Add(this.close);
+			this.Controls.Add(this.clearlist);
+			this.Controls.Add(this.copyselected);
+			this.Controls.Add(this.grid);
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.MinimumSize = new System.Drawing.Size(680, 300);
+			this.Name = "ErrorsForm";
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+			this.Text = "Errors and Warnings";
+			this.Shown += new System.EventHandler(this.ErrorsForm_Shown);
+			this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.ErrorsForm_FormClosing);
+			this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.ErrorsForm_HelpRequested);
+			((System.ComponentModel.ISupportInitialize)(this.grid)).EndInit();
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Button copyselected;
+		private System.Windows.Forms.Button clearlist;
+		private System.Windows.Forms.Button close;
+		private System.Windows.Forms.Timer checkerrors;
+		private System.Windows.Forms.CheckBox checkshow;
+		private System.Windows.Forms.DataGridView grid;
+		private System.Windows.Forms.DataGridViewImageColumn iconcolumn;
+		private System.Windows.Forms.DataGridViewTextBoxColumn textcolumn;
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/ErrorsForm.cs b/Source/Core/Windows/ErrorsForm.cs
new file mode 100644
index 0000000..aa2bc45
--- /dev/null
+++ b/Source/Core/Windows/ErrorsForm.cs
@@ -0,0 +1,156 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Windows.Forms;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Windows
+{
+	public partial class ErrorsForm : DelayedForm
+	{
+		#region ================== Variables
+
+		#endregion
+		
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public ErrorsForm()
+		{
+			InitializeComponent();
+			FillList();
+			checkerrors.Start();
+			checkshow.Checked = General.Settings.ShowErrorsWindow;
+			//mxd
+			grid.Focus();
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This sets up the list
+		private void FillList()
+		{
+			// Fill the list with the items we don't have yet
+			General.ErrorLogger.HasChanged = false;
+			List<ErrorItem> errors = General.ErrorLogger.GetErrors();
+			int startindex = grid.Rows.Count;
+			for(int i = startindex; i < errors.Count; i++)
+			{
+				ErrorItem e = errors[i];
+				Image icon = (e.type == ErrorType.Error) ? Properties.Resources.ErrorLarge : Properties.Resources.WarningLarge;
+				int index = grid.Rows.Add();
+				DataGridViewRow row = grid.Rows[index];
+				row.Cells[0].Value = icon;
+				row.Cells[0].Style.Alignment = DataGridViewContentAlignment.TopCenter;
+				row.Cells[0].Style.Padding = new Padding(0, 5, 0, 0);
+				row.Cells[1].Value = e.message;
+				row.Cells[1].Style.WrapMode = DataGridViewTriState.True;
+			}
+		}
+
+		#endregion
+		
+		#region ================== Events
+
+		// Close clicked
+		private void close_Click(object sender, EventArgs e)
+		{
+			this.Close();
+		}
+
+		// Closing
+		private void ErrorsForm_FormClosing(object sender, FormClosingEventArgs e)
+		{
+			checkerrors.Stop();
+			General.Settings.ShowErrorsWindow = checkshow.Checked;
+		}
+
+		// Checking for more errors
+		private void checkerrors_Tick(object sender, EventArgs e)
+		{
+			// If errors have been added, update the list
+			if(General.ErrorLogger.HasChanged)
+			{
+				FillList();
+			}
+		}
+
+		// This clears all errors
+		private void clearlist_Click(object sender, EventArgs e)
+		{
+			General.ErrorLogger.Clear();
+			grid.Rows.Clear();
+		}
+		
+		// Copy selection
+		private void copyselected_Click(object sender, EventArgs e)
+		{
+			StringBuilder str = new StringBuilder("");
+			if(grid.SelectedCells.Count > 0)
+			{
+				Clipboard.Clear();
+				foreach(DataGridViewCell c in grid.SelectedCells)
+				{
+					if(c.ValueType != typeof(Image))
+					{
+						if(str.Length > 0) str.Append("\r\n");
+						str.Append(c.Value);
+					}
+				}
+
+				//mxd
+				try 
+				{
+					Clipboard.SetDataObject(str.ToString(), true);
+				} 
+				catch(ExternalException) 
+				{
+					General.Interface.DisplayStatus(StatusType.Warning, "Failed to perform a Clipboard operation...");
+				}
+			}
+		}
+
+		// Help requested
+		private void ErrorsForm_HelpRequested(object sender, HelpEventArgs hlpevent)
+		{
+			General.ShowHelp("w_errorsandwarnings.html");
+			hlpevent.Handled = true;
+		}
+		
+		#endregion
+
+		private void ErrorsForm_Shown(object sender, EventArgs e)
+		{
+			if(grid.Rows.Count > 0) grid.Rows[0].Selected = false;
+
+		}
+
+		private void grid_CellContentClick(object sender, DataGridViewCellEventArgs e) 
+		{
+			copyselected.Enabled = true;
+		}
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/ErrorsForm.resx b/Source/Core/Windows/ErrorsForm.resx
new file mode 100644
index 0000000..d5f11ae
--- /dev/null
+++ b/Source/Core/Windows/ErrorsForm.resx
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="copyselected.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="clearlist.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="close.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="checkerrors.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>103, 17</value>
+  </metadata>
+  <metadata name="checkshow.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="grid.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="iconcolumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="textcolumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Windows/FindReplaceOptions.cs b/Source/Core/Windows/FindReplaceOptions.cs
new file mode 100644
index 0000000..ceb92eb
--- /dev/null
+++ b/Source/Core/Windows/FindReplaceOptions.cs
@@ -0,0 +1,31 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Windows
+{
+	internal struct FindReplaceOptions
+	{
+		public string FindText;
+		public bool CaseSensitive;
+		public bool WholeWord;
+		public string ReplaceWith;
+	}
+}
+
diff --git a/Source/Core/Windows/FlagsForm.Designer.cs b/Source/Core/Windows/FlagsForm.Designer.cs
new file mode 100644
index 0000000..ea22907
--- /dev/null
+++ b/Source/Core/Windows/FlagsForm.Designer.cs
@@ -0,0 +1,114 @@
+namespace CodeImp.DoomBuilder.Windows
+{
+	partial class FlagsForm
+	{
+		/// <summary>
+		/// Erforderliche Designervariable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Verwendete Ressourcen bereinigen.
+		/// </summary>
+		/// <param name="disposing">True, wenn verwaltete Ressourcen gelöscht werden sollen; andernfalls False.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Vom Windows Form-Designer generierter Code
+
+		/// <summary>
+		/// Erforderliche Methode für die Designerunterstützung.
+		/// Der Inhalt der Methode darf nicht mit dem Code-Editor geändert werden.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.flags = new CodeImp.DoomBuilder.Controls.CheckboxArrayControl();
+			this.cancel = new System.Windows.Forms.Button();
+			this.apply = new System.Windows.Forms.Button();
+			this.groupBox1 = new System.Windows.Forms.GroupBox();
+			this.groupBox1.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// flags
+			// 
+			this.flags.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.flags.AutoScroll = true;
+			this.flags.Columns = 3;
+			this.flags.Location = new System.Drawing.Point(6, 19);
+			this.flags.Name = "flags";
+			this.flags.Size = new System.Drawing.Size(418, 195);
+			this.flags.TabIndex = 0;
+			this.flags.VerticalSpacing = 1;
+			// 
+			// cancel
+			// 
+			this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.cancel.Location = new System.Drawing.Point(351, 238);
+			this.cancel.Name = "cancel";
+			this.cancel.Size = new System.Drawing.Size(91, 25);
+			this.cancel.TabIndex = 4;
+			this.cancel.Text = "Cancel";
+			this.cancel.UseVisualStyleBackColor = true;
+			this.cancel.Click += new System.EventHandler(this.cancel_Click);
+			// 
+			// apply
+			// 
+			this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.apply.Location = new System.Drawing.Point(254, 238);
+			this.apply.Name = "apply";
+			this.apply.Size = new System.Drawing.Size(91, 25);
+			this.apply.TabIndex = 3;
+			this.apply.Text = "OK";
+			this.apply.UseVisualStyleBackColor = true;
+			this.apply.Click += new System.EventHandler(this.apply_Click);
+			// 
+			// groupBox1
+			// 
+			this.groupBox1.Controls.Add(this.flags);
+			this.groupBox1.Location = new System.Drawing.Point(12, 7);
+			this.groupBox1.Name = "groupBox1";
+			this.groupBox1.Size = new System.Drawing.Size(430, 225);
+			this.groupBox1.TabIndex = 5;
+			this.groupBox1.TabStop = false;
+			// 
+			// FlagsForm
+			// 
+			this.AcceptButton = this.apply;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.CancelButton = this.cancel;
+			this.ClientSize = new System.Drawing.Size(454, 267);
+			this.Controls.Add(this.groupBox1);
+			this.Controls.Add(this.cancel);
+			this.Controls.Add(this.apply);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "FlagsForm";
+			this.Opacity = 1;
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Flags";
+			this.groupBox1.ResumeLayout(false);
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private CodeImp.DoomBuilder.Controls.CheckboxArrayControl flags;
+		private System.Windows.Forms.Button cancel;
+		private System.Windows.Forms.Button apply;
+		private System.Windows.Forms.GroupBox groupBox1;
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/FlagsForm.cs b/Source/Core/Windows/FlagsForm.cs
new file mode 100644
index 0000000..bf72aa7
--- /dev/null
+++ b/Source/Core/Windows/FlagsForm.cs
@@ -0,0 +1,104 @@
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
+
+namespace CodeImp.DoomBuilder.Windows
+{
+	public partial class FlagsForm : DelayedForm
+	{
+		#region ================== Variables
+
+		private string value;
+		private IDictionary<string, string> flagdefs;
+
+		#endregion
+
+		#region ================== Properties
+
+		public string Value { get { return value; } }
+
+		#endregion
+
+		#region ================== Methods
+
+		public FlagsForm()
+		{
+			InitializeComponent();
+		}
+
+		// Setup from EnumList
+		public void Setup(string value, IDictionary<string, string> inflags)
+		{
+			//setup = true;
+			this.value = value;
+			flagdefs = inflags;
+
+			// Fill flags list
+			foreach(KeyValuePair<string, string> tf in flagdefs)
+				flags.Add(tf.Value, tf.Key);
+
+			// Parse the value string and check the boxes if necessary
+			if(value.Trim() != "")
+			{
+				foreach(string s in value.Split(','))
+				{
+					string str = s.Trim();
+
+					// Make sure the given flag actually exists
+					if(!flagdefs.ContainsKey(str))
+						continue;
+
+					foreach(CheckBox c in flags.Checkboxes)
+					{
+						if(c.Text == flagdefs[str])
+							c.Checked = true;
+					}
+				}
+			}
+		}
+
+		// This shows the dialog
+		// Returns the flags or the same flags when cancelled
+		public static string ShowDialog(IWin32Window owner, string value, IDictionary<string, string> inflags)
+		{
+			string result = value;
+			FlagsForm f = new FlagsForm();
+			f.Setup(value, inflags);
+			if(f.ShowDialog(owner) == DialogResult.OK) result = f.Value;
+			f.Dispose();
+			return result;
+		}
+
+		#endregion
+
+
+		private void apply_Click(object sender, EventArgs e)
+		{
+			value = "";
+
+			foreach(CheckBox c in flags.Checkboxes)
+			{
+				if(c.Checked == false) continue;
+
+				foreach(KeyValuePair<string, string> lf in flagdefs)
+				{
+					if(lf.Value == c.Text)
+					{
+						if(value != "") value += ",";
+						value += lf.Key;
+					}
+				}
+			}
+
+			DialogResult = DialogResult.OK;
+			this.Close();
+		}
+
+		private void cancel_Click(object sender, EventArgs e)
+		{
+			// Close
+			DialogResult = DialogResult.Cancel;
+			this.Close();
+		}
+	}
+}
diff --git a/Source/Core/Windows/FlagsForm.resx b/Source/Core/Windows/FlagsForm.resx
new file mode 100644
index 0000000..19dc0dd
--- /dev/null
+++ b/Source/Core/Windows/FlagsForm.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Windows/FlatBrowserForm.Designer.cs b/Source/Core/Windows/FlatBrowserForm.Designer.cs
new file mode 100644
index 0000000..406ba53
--- /dev/null
+++ b/Source/Core/Windows/FlatBrowserForm.Designer.cs
@@ -0,0 +1,166 @@
+namespace CodeImp.DoomBuilder.Windows
+{
+	partial class FlatBrowserForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.components = new System.ComponentModel.Container();
+			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FlatBrowserForm));
+			this.cancel = new System.Windows.Forms.Button();
+			this.apply = new System.Windows.Forms.Button();
+			this.texturesets = new System.Windows.Forms.ListView();
+			this.namecolumn = new System.Windows.Forms.ColumnHeader();
+			this.countcolumn = new System.Windows.Forms.ColumnHeader();
+			this.smallimages = new System.Windows.Forms.ImageList(this.components);
+			this.browser = new CodeImp.DoomBuilder.Controls.ImageBrowserControl();
+			this.SuspendLayout();
+			// 
+			// cancel
+			// 
+			this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.cancel.Location = new System.Drawing.Point(781, 596);
+			this.cancel.Name = "cancel";
+			this.cancel.Size = new System.Drawing.Size(100, 25);
+			this.cancel.TabIndex = 3;
+			this.cancel.TabStop = false;
+			this.cancel.Text = "Cancel";
+			this.cancel.UseVisualStyleBackColor = true;
+			this.cancel.Click += new System.EventHandler(this.cancel_Click);
+			// 
+			// apply
+			// 
+			this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.apply.Location = new System.Drawing.Point(675, 596);
+			this.apply.Name = "apply";
+			this.apply.Size = new System.Drawing.Size(100, 25);
+			this.apply.TabIndex = 2;
+			this.apply.TabStop = false;
+			this.apply.Text = "OK";
+			this.apply.UseVisualStyleBackColor = true;
+			this.apply.Click += new System.EventHandler(this.apply_Click);
+			// 
+			// texturesets
+			// 
+			this.texturesets.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)));
+			this.texturesets.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+            this.namecolumn,
+            this.countcolumn});
+			this.texturesets.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.texturesets.FullRowSelect = true;
+			this.texturesets.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
+			this.texturesets.HideSelection = false;
+			this.texturesets.Location = new System.Drawing.Point(12, 9);
+			this.texturesets.MultiSelect = false;
+			this.texturesets.Name = "texturesets";
+			this.texturesets.Size = new System.Drawing.Size(200, 576);
+			this.texturesets.SmallImageList = this.smallimages;
+			this.texturesets.TabIndex = 0;
+			this.texturesets.TabStop = false;
+			this.texturesets.UseCompatibleStateImageBehavior = false;
+			this.texturesets.View = System.Windows.Forms.View.Details;
+			this.texturesets.SelectedIndexChanged += new System.EventHandler(this.texturesets_SelectedIndexChanged);
+			// 
+			// namecolumn
+			// 
+			this.namecolumn.Text = "Name";
+			this.namecolumn.Width = 152;
+			// 
+			// countcolumn
+			// 
+			this.countcolumn.Text = "Count";
+			this.countcolumn.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
+			this.countcolumn.Width = 42;
+			// 
+			// smallimages
+			// 
+			this.smallimages.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("smallimages.ImageStream")));
+			this.smallimages.TransparentColor = System.Drawing.Color.Transparent;
+			this.smallimages.Images.SetKeyName(0, "KnownTextureSet2.ico");
+			this.smallimages.Images.SetKeyName(1, "AllTextureSet2.ico");
+			this.smallimages.Images.SetKeyName(2, "FileTextureSet.ico");
+			this.smallimages.Images.SetKeyName(3, "FolderTextureSet.ico");
+			this.smallimages.Images.SetKeyName(4, "PK3TextureSet.ico");
+			// 
+			// browser
+			// 
+			this.browser.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.browser.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.browser.HideInputBox = false;
+			this.browser.LabelText = "Select or enter a flat name:";
+			this.browser.Location = new System.Drawing.Point(218, 9);
+			this.browser.Name = "browser";
+			this.browser.PreventSelection = false;
+			this.browser.Size = new System.Drawing.Size(663, 610);
+			this.browser.TabIndex = 1;
+			this.browser.TabStop = false;
+			this.browser.SelectedItemDoubleClicked += new CodeImp.DoomBuilder.Controls.ImageBrowserControl.SelectedItemDoubleClickDelegate(this.browser_SelectedItemDoubleClicked);
+			this.browser.SelectedItemChanged += new CodeImp.DoomBuilder.Controls.ImageBrowserControl.SelectedItemChangedDelegate(this.browser_SelectedItemChanged);
+			// 
+			// FlatBrowserForm
+			// 
+			this.AcceptButton = this.apply;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.CancelButton = this.cancel;
+			this.ClientSize = new System.Drawing.Size(893, 631);
+			this.Controls.Add(this.texturesets);
+			this.Controls.Add(this.cancel);
+			this.Controls.Add(this.apply);
+			this.Controls.Add(this.browser);
+			this.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.MinimizeBox = false;
+			this.Name = "FlatBrowserForm";
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
+			this.Text = "Browse Flats";
+			this.Load += new System.EventHandler(this.FlatBrowserForm_Load);
+			this.Shown += new System.EventHandler(this.FlatBrowserForm_Shown);
+			this.Activated += new System.EventHandler(this.FlatBrowserForm_Activated);
+			this.Move += new System.EventHandler(this.FlatBrowserForm_Move);
+			this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FlatBrowserForm_FormClosing);
+			this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.FlatBrowserForm_HelpRequested);
+			this.ResizeEnd += new System.EventHandler(this.FlatBrowserForm_ResizeEnd);
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private CodeImp.DoomBuilder.Controls.ImageBrowserControl browser;
+		private System.Windows.Forms.Button cancel;
+		private System.Windows.Forms.Button apply;
+		private System.Windows.Forms.ListView texturesets;
+		private System.Windows.Forms.ColumnHeader namecolumn;
+		private System.Windows.Forms.ImageList smallimages;
+		private System.Windows.Forms.ColumnHeader countcolumn;
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/FlatBrowserForm.cs b/Source/Core/Windows/FlatBrowserForm.cs
new file mode 100644
index 0000000..9caca21
--- /dev/null
+++ b/Source/Core/Windows/FlatBrowserForm.cs
@@ -0,0 +1,359 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.IO;
+using Microsoft.Win32;
+using System.Diagnostics;
+using CodeImp.DoomBuilder.Actions;
+using CodeImp.DoomBuilder.Data;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Controls;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Windows
+{
+	internal partial class FlatBrowserForm : Form
+	{
+		// Constants
+		private const int COLUMN_WIDTH_COUNT = 52;
+		
+		// Variables
+		private string selectedname;
+		private Point lastposition;
+		private Size lastsize;
+		private ListViewGroup usedgroup;
+		private ListViewGroup availgroup;
+		private ListViewItem selectedset;
+		private string selecttextureonfill;
+		
+		// Properties
+		public string SelectedName { get { return selectedname; } }
+		
+		// Constructor
+		public FlatBrowserForm(string selecttexture)
+		{
+			Cursor.Current = Cursors.WaitCursor;
+			ListViewItem item;
+			bool foundselecttexture = false;
+			long longname = Lump.MakeLongName(selecttexture ?? "");
+			
+			// Initialize
+			InitializeComponent();
+			browser.ApplySettings();
+			
+			// Update the used textures
+			General.Map.Data.UpdateUsedTextures();
+
+			// Resize columns to maximize available width
+			countcolumn.Width = COLUMN_WIDTH_COUNT;
+			namecolumn.Width = texturesets.ClientRectangle.Width - SystemInformation.VerticalScrollBarWidth - countcolumn.Width - 2;
+
+			// Fill texture sets list with normal texture sets
+			foreach(IFilledTextureSet ts in General.Map.Data.TextureSets)
+			{
+				item = texturesets.Items.Add(ts.Name);
+				item.Tag = ts;
+				item.ImageIndex = 0;
+				item.UseItemStyleForSubItems = false;
+				item.SubItems.Add(ts.Textures.Count.ToString(), item.ForeColor,
+						item.BackColor, new Font(item.Font, FontStyle.Regular));
+			}
+			
+			// Add container-specific texture sets
+			foreach(ResourceTextureSet ts in General.Map.Data.ResourceTextureSets)
+			{
+				item = texturesets.Items.Add(ts.Name);
+				item.Tag = ts;
+				item.ImageIndex = 2 + ts.Location.type;
+				item.UseItemStyleForSubItems = false;
+				item.SubItems.Add(ts.Textures.Count.ToString(), item.ForeColor,
+						item.BackColor, new Font(item.Font, FontStyle.Regular));
+			}
+
+			// Add All textures set
+			item = texturesets.Items.Add(General.Map.Data.AllTextureSet.Name);
+			item.Tag = General.Map.Data.AllTextureSet;
+			item.ImageIndex = 1;
+			item.UseItemStyleForSubItems = false;
+			item.SubItems.Add(General.Map.Data.AllTextureSet.Textures.Count.ToString(),
+				item.ForeColor, item.BackColor, new Font(item.Font, FontStyle.Regular));
+
+			// Select the last one that was selected
+			string selectname = General.Settings.ReadSetting("browserwindow.textureset", "");
+			foreach(ListViewItem i in texturesets.Items)
+			{
+				if(i.Text == selectname)
+				{
+					IFilledTextureSet set = (i.Tag as IFilledTextureSet);
+					foreach(ImageData img in set.Textures)
+					{
+						if(img.LongName == longname)
+						{
+							i.Selected = true;
+							foundselecttexture = true;
+							break;
+						}
+					}
+					break;
+				}
+			}
+
+			// If the selected texture was not found in the last-selected set, try finding it in the other sets
+			if(!foundselecttexture)
+			{
+				foreach(ListViewItem i in texturesets.Items)
+				{
+					IFilledTextureSet set = (i.Tag as IFilledTextureSet);
+					foreach(ImageData img in set.Textures)
+					{
+						if(img.LongName == longname)
+						{
+							i.Selected = true;
+							foundselecttexture = true;
+							break;
+						}
+					}
+				}
+			}
+
+			// Texture still now found? Then just select the last used set
+			if(!foundselecttexture)
+			{
+				foreach(ListViewItem i in texturesets.Items)
+				{
+					if(i.Text == selectname)
+					{
+						i.Selected = true;
+						foundselecttexture = true;
+						break;
+					}
+				}
+			}
+
+			// WARNING: Some strange behavior of the listview here!
+			// When you leave this line out, the list becomes very slow.
+			// Also, this does not change the item selected previously.
+			texturesets.Items[0].Selected = true;
+
+			// Texture to select when list is filled
+			selecttextureonfill = selecttexture;
+
+			// Make groups
+			usedgroup = browser.AddGroup("Used Textures");
+			availgroup = browser.AddGroup("Available Textures");
+			
+			// Keep last position and size
+			lastposition = this.Location;
+			lastsize = this.Size;
+			
+			// Position window from configuration settings
+			this.SuspendLayout();
+			/*
+			this.Location = new Point(General.Settings.ReadSetting("browserwindow.positionx", this.Location.X),
+									  General.Settings.ReadSetting("browserwindow.positiony", this.Location.Y));
+			*/
+			this.Size = new Size(General.Settings.ReadSetting("browserwindow.sizewidth", this.Size.Width),
+								 General.Settings.ReadSetting("browserwindow.sizeheight", this.Size.Height));
+			this.WindowState = (FormWindowState)General.Settings.ReadSetting("browserwindow.windowstate", (int)FormWindowState.Normal);
+			if(this.WindowState == FormWindowState.Normal) this.StartPosition = FormStartPosition.CenterParent;
+			this.ResumeLayout(true);
+		}
+		
+		// Selection changed
+		private void browser_SelectedItemChanged()
+		{
+			apply.Enabled = (browser.SelectedItem != null);
+		}
+
+		// OK clicked
+		private void apply_Click(object sender, EventArgs e)
+		{
+			// Set selected name and close
+			if(browser.SelectedItem != null)
+			{
+				selectedname = browser.SelectedItem.Text;
+				DialogResult = DialogResult.OK;
+			}
+			else
+			{
+				selectedname = "";
+				DialogResult = DialogResult.Cancel;
+			}
+			this.Close();
+		}
+
+		// Cancel clicked
+		private void cancel_Click(object sender, EventArgs e)
+		{
+			// No selection, close
+			selectedname = "";
+			DialogResult = DialogResult.Cancel;
+			this.Close();
+		}
+
+		// Activated
+		private void FlatBrowserForm_Activated(object sender, EventArgs e)
+		{
+			// Focus the textbox
+			browser.FocusTextbox();
+			Cursor.Current = Cursors.Default;
+		}
+
+		// Loading
+		private void FlatBrowserForm_Load(object sender, EventArgs e)
+		{
+			// Normal windowstate?
+			if(this.WindowState == FormWindowState.Normal)
+			{
+				// Keep last position and size
+				lastposition = this.Location;
+				lastsize = this.Size;
+			}
+		}
+
+		// Resized
+		private void FlatBrowserForm_ResizeEnd(object sender, EventArgs e)
+		{
+			// Normal windowstate?
+			if(this.WindowState == FormWindowState.Normal)
+			{
+				// Keep last position and size
+				lastposition = this.Location;
+				lastsize = this.Size;
+			}
+		}
+
+		// Moved
+		private void FlatBrowserForm_Move(object sender, EventArgs e)
+		{
+			// Normal windowstate?
+			if(this.WindowState == FormWindowState.Normal)
+			{
+				// Keep last position and size
+				lastposition = this.Location;
+				lastsize = this.Size;
+			}
+		}
+
+		// Closing
+		private void FlatBrowserForm_FormClosing(object sender, FormClosingEventArgs e)
+		{
+			int windowstate;
+
+			// Determine window state to save
+			if(this.WindowState != FormWindowState.Minimized)
+				windowstate = (int)this.WindowState;
+			else
+				windowstate = (int)FormWindowState.Normal;
+
+			// Save window settings
+			General.Settings.WriteSetting("browserwindow.positionx", lastposition.X);
+			General.Settings.WriteSetting("browserwindow.positiony", lastposition.Y);
+			General.Settings.WriteSetting("browserwindow.sizewidth", lastsize.Width);
+			General.Settings.WriteSetting("browserwindow.sizeheight", lastsize.Height);
+			General.Settings.WriteSetting("browserwindow.windowstate", windowstate);
+			
+			// Save last selected texture set
+			if(texturesets.SelectedItems.Count > 0)
+				General.Settings.WriteSetting("browserwindow.textureset", texturesets.SelectedItems[0].Text);
+			
+			// Clean up
+			browser.CleanUp();
+		}
+
+		// Static method to browse for flats
+		// Returns null when cancelled.
+		public static string Browse(IWin32Window parent, string select)
+		{
+			FlatBrowserForm browser = new FlatBrowserForm(select);
+			if(browser.ShowDialog(parent) == DialogResult.OK)
+			{
+				// Return result
+				return browser.SelectedName;
+			}
+			else
+			{
+				// Cancelled
+				return select;
+			}
+		}
+		
+		// Texture set selected
+		private void texturesets_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			// Anything slected?
+			if(texturesets.SelectedItems.Count > 0)
+			{
+				selectedset = texturesets.SelectedItems[0];
+				FillImagesList(null);
+			}
+		}
+
+		// Item double clicked
+		private void browser_SelectedItemDoubleClicked()
+		{
+			if(apply.Enabled) apply_Click(this, EventArgs.Empty);
+		}
+
+		// This fills the list of textures, depending on the selected texture set
+		private void FillImagesList(string selectflat)
+		{
+			// Get the selected texture set
+			IFilledTextureSet set = (selectedset.Tag as IFilledTextureSet);
+
+			// Start adding
+			browser.BeginAdding(false);
+
+			// Add all used flats
+			foreach(ImageData img in set.Flats)
+				if(img.UsedInMap) browser.Add(img.Name, img, img, usedgroup);
+
+			// Add all available flats
+			foreach(ImageData img in set.Flats)
+				browser.Add(img.Name, img, img, availgroup);
+
+			// Done adding
+			browser.EndAdding();
+		}
+
+		// Help requested
+		private void FlatBrowserForm_HelpRequested(object sender, HelpEventArgs hlpevent)
+		{
+			General.ShowHelp("w_imagesbrowser.html");
+			hlpevent.Handled = true;
+		}
+
+		private void FlatBrowserForm_Shown(object sender, EventArgs e)
+		{
+			// Select texture
+			if(!string.IsNullOrEmpty(selecttextureonfill))
+			{
+				browser.SelectItem(selecttextureonfill, usedgroup);
+				selecttextureonfill = null;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/FlatBrowserForm.resx b/Source/Core/Windows/FlatBrowserForm.resx
new file mode 100644
index 0000000..5a00251
--- /dev/null
+++ b/Source/Core/Windows/FlatBrowserForm.resx
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="cancel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="apply.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="texturesets.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="smallimages.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <data name="smallimages.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
+        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
+        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAB+
+        DAAAAk1TRnQBSQFMAgEBBQEAAQkBAAEEAQABEAEAARYBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        AwABQAMAASwDAAEBAQABCAYAAQsYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
+        AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
+        AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
+        AWYDAAGZAwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFm
+        AZkCAAFmAcwCAAFmAf8CAAGZAwABmQEzAgABmQFmAgACmQIAAZkBzAIAAZkB/wIAAcwDAAHMATMCAAHM
+        AWYCAAHMAZkCAALMAgABzAH/AgAB/wFmAgAB/wGZAgAB/wHMAQABMwH/AgAB/wEAATMBAAEzAQABZgEA
+        ATMBAAGZAQABMwEAAcwBAAEzAQAB/wEAAf8BMwIAAzMBAAIzAWYBAAIzAZkBAAIzAcwBAAIzAf8BAAEz
+        AWYCAAEzAWYBMwEAATMCZgEAATMBZgGZAQABMwFmAcwBAAEzAWYB/wEAATMBmQIAATMBmQEzAQABMwGZ
+        AWYBAAEzApkBAAEzAZkBzAEAATMBmQH/AQABMwHMAgABMwHMATMBAAEzAcwBZgEAATMBzAGZAQABMwLM
+        AQABMwHMAf8BAAEzAf8BMwEAATMB/wFmAQABMwH/AZkBAAEzAf8BzAEAATMC/wEAAWYDAAFmAQABMwEA
+        AWYBAAFmAQABZgEAAZkBAAFmAQABzAEAAWYBAAH/AQABZgEzAgABZgIzAQABZgEzAWYBAAFmATMBmQEA
+        AWYBMwHMAQABZgEzAf8BAAJmAgACZgEzAQADZgEAAmYBmQEAAmYBzAEAAWYBmQIAAWYBmQEzAQABZgGZ
+        AWYBAAFmApkBAAFmAZkBzAEAAWYBmQH/AQABZgHMAgABZgHMATMBAAFmAcwBmQEAAWYCzAEAAWYBzAH/
+        AQABZgH/AgABZgH/ATMBAAFmAf8BmQEAAWYB/wHMAQABzAEAAf8BAAH/AQABzAEAApkCAAGZATMBmQEA
+        AZkBAAGZAQABmQEAAcwBAAGZAwABmQIzAQABmQEAAWYBAAGZATMBzAEAAZkBAAH/AQABmQFmAgABmQFm
+        ATMBAAGZATMBZgEAAZkBZgGZAQABmQFmAcwBAAGZATMB/wEAApkBMwEAApkBZgEAA5kBAAKZAcwBAAKZ
+        Af8BAAGZAcwCAAGZAcwBMwEAAWYBzAFmAQABmQHMAZkBAAGZAswBAAGZAcwB/wEAAZkB/wIAAZkB/wEz
+        AQABmQHMAWYBAAGZAf8BmQEAAZkB/wHMAQABmQL/AQABzAMAAZkBAAEzAQABzAEAAWYBAAHMAQABmQEA
+        AcwBAAHMAQABmQEzAgABzAIzAQABzAEzAWYBAAHMATMBmQEAAcwBMwHMAQABzAEzAf8BAAHMAWYCAAHM
+        AWYBMwEAAZkCZgEAAcwBZgGZAQABzAFmAcwBAAGZAWYB/wEAAcwBmQIAAcwBmQEzAQABzAGZAWYBAAHM
+        ApkBAAHMAZkBzAEAAcwBmQH/AQACzAIAAswBMwEAAswBZgEAAswBmQEAA8wBAALMAf8BAAHMAf8CAAHM
+        Af8BMwEAAZkB/wFmAQABzAH/AZkBAAHMAf8BzAEAAcwC/wEAAcwBAAEzAQAB/wEAAWYBAAH/AQABmQEA
+        AcwBMwIAAf8CMwEAAf8BMwFmAQAB/wEzAZkBAAH/ATMBzAEAAf8BMwH/AQAB/wFmAgAB/wFmATMBAAHM
+        AmYBAAH/AWYBmQEAAf8BZgHMAQABzAFmAf8BAAH/AZkCAAH/AZkBMwEAAf8BmQFmAQAB/wKZAQAB/wGZ
+        AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz
+        AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm
+        AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw
+        AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD//8ABQAHDgEQAW0BbAIO
+        MwABDgENAWwBkAG7AgkB9wJsAWYCDjsAAQ4B6gFsAQ8BDjQAAW0HAAFDAW0BDjQAAW0B8QFtAQcBvAHw
+        AfECAAERAQcB7DQAA20BBwK8AfACAAJtAQ40AAFtAfADBwK8AgABEQEHAew0AAFtAfAB7wMHAbwCAAJt
+        AQ40AAFtAfAC7wMHAgABEQEHAew0AAFtAfAD7wIHAgACbQEONAABbQG8BO8BBwIAAREBBwHsNAAIbQEA
+        AQ8B7AEPNAAJDgHrAZEBDTQAAQ4BZQGQAbsFCQH3AWwCDj4AAQ7/AMMAAfcCrgFtAWwB6gJsBGY0AAH3
+        Bf8C9AMZAWYJAAgOEwAB9wKuAW0BbAHqAmwEZgQAAbUC/wKTAZkBBwG7AbQCGQNmBgABDgEABe8B9wEO
+        AwACcwHrAW4BbQFKARMBFQFDAREBDwEOAQ8DAAH3Bf8C9AMZAWYEAAG1Av8BkwGaAXoBnwGeAbsB9AHz
+        AWYBGQFmBQABDgHvAQAB8ALxAvIBvAEOAwABcwIcBzECSwFEAe0CAAG1Av8CkwGZAQcBuwG0AhkDZgIA
+        AbUC/wG7AQgCnwF+AXkC9AFsARkDZgIAAQ4B7wEHAQAB8ALxAvIB8AEOAwAB7AF6ARwBmgN6AlkBUwFS
+        ATEBSwHqAgABtQL/AZMBmgF6AZ8BngG7AfQB8wFmARkBZgIAAbUC/wLbAQkBCAF+AXkB/wH0AWwB8wFm
+        ARkBZgIAAQ4CAAHvAbwB8ALxAfIB8AEOAwAB7QF6ARwBmQV6AlkBUwExAUQB7QEAAbUC/wG7AQgCnwF+
+        AXkC9AFsARkDZgEHCv8BbAH0AWwBGQFmAgABDgHwAgcCvALwAfEBvAEOAwAB7QGaAXoBHAGaBXoDWQFL
+        AW0BAAG1Av8C2wEJAQgBfgF5Af8B9AFsAfMBZgEZAWYCBwS1AfcBtQLtApEB9AFsAfMBZgIAAQ4B8AMH
+        ArwC8AG8AQ4DAAEcAZoBegEcAZkHegFZAVIBSgHtAQcK/wFsAfQBbAEZAWYBtQH/AQcK/wFsAfQBbAIA
+        AQ4B8AQHArwB8AG8AQ4DAAEcAZoBoAF6ARwHmgJ6AXQBbQIHBLUB9wG1Au0CkQH0AWwB8wFmAbUB/wIH
+        BLUB9wG1Au0CkQH0AWwCAAEOAfAC7wQHAbwBBwEOAwABHAOgCBwC7QHsAXMCAAEHCv8BbAH0AWwBBwP/
+        AQcK/wFsAgABDgHwA+8FBwEOAwABHASgAZoGegFzBQACBwS1AfcBtQLtApEB9AFsAgcCtQIHBLUB9wG1
+        Au0CkQIAAQ4BvATvBAcBDgMAARwBoAHDA6ABegMcAu0BcwcAAQcK/wFsAgABBwr/AWwB9AFsAgABDgG8
+        Be8DBwEOAwABHAGZAsMCoAEcAe0MAAIHBLUB9wG1Au0CkQIAAgcEtQH3AbUC7QKRAfQBbAIAAQ4B9APw
+        A7wCBwEOBAAFHAHtHQABBwr/AWwCAAsOJwACBwS1AfcBtQLtApHgAAFCAU0BPgcAAT4DAAEoAwABQAMA
+        ASwDAAEBAQABAQUAAWABARYAA/8BAAL/BgAC/wYAAv8GAAH/AcMGAAHgAQEGAAHAAQEGAAGAAQEGAAHg
+        ASMGAAHAASMGAAHAASMGAAHAASMGAAHAASMGAAHAASMGAAHAASMGAAHAASMGAAHAASMGAAGAAQEGAAHA
+        AQEGAAHgAQMGAAL/BgAC/wYAAv8GABr/AQABDwb/AQABDwH4AQcC/wEAAQ8BAAEDAfABBwEAAQcBAAEP
+        AQABAwHgAQcBAAEDAQABAwIAAcABBwEAAQMBAAEDAgABwAEHAQABAQQAAcABBwEAAQEEAAHAAQcGAAHA
+        AQcGAAHAAQcCAAHAAwABwAEHAQABBwHAAwABwAEHAQABBwHwAQABwAEAAcABBwEAAf8B8AEAAcABAAHA
+        AQcBgQP/AfABAAHAAQcE/wHwAQAc/ws=
+</value>
+  </data>
+  <metadata name="browser.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Windows/GridSetupForm.Designer.cs b/Source/Core/Windows/GridSetupForm.Designer.cs
new file mode 100644
index 0000000..3066882
--- /dev/null
+++ b/Source/Core/Windows/GridSetupForm.Designer.cs
@@ -0,0 +1,324 @@
+namespace CodeImp.DoomBuilder.Windows
+{
+	partial class GridSetupForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			System.Windows.Forms.GroupBox groupBox1;
+			System.Windows.Forms.Label label1;
+			System.Windows.Forms.GroupBox groupBox2;
+			this.gridsize = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.backscaley = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.backscalex = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.backoffsety = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.backoffsetx = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.backscale = new System.Windows.Forms.Label();
+			this.selectfile = new System.Windows.Forms.Button();
+			this.showbackground = new System.Windows.Forms.CheckBox();
+			this.backoffset = new System.Windows.Forms.Label();
+			this.selectflat = new System.Windows.Forms.Button();
+			this.selecttexture = new System.Windows.Forms.Button();
+			this.backgroundimage = new System.Windows.Forms.Panel();
+			this.cancel = new System.Windows.Forms.Button();
+			this.apply = new System.Windows.Forms.Button();
+			this.browsefile = new System.Windows.Forms.OpenFileDialog();
+			groupBox1 = new System.Windows.Forms.GroupBox();
+			label1 = new System.Windows.Forms.Label();
+			groupBox2 = new System.Windows.Forms.GroupBox();
+			groupBox1.SuspendLayout();
+			groupBox2.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// groupBox1
+			// 
+			groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			groupBox1.Controls.Add(this.gridsize);
+			groupBox1.Controls.Add(label1);
+			groupBox1.Location = new System.Drawing.Point(12, 12);
+			groupBox1.Name = "groupBox1";
+			groupBox1.Size = new System.Drawing.Size(293, 71);
+			groupBox1.TabIndex = 0;
+			groupBox1.TabStop = false;
+			groupBox1.Text = " Grid ";
+			// 
+			// gridsize
+			// 
+			this.gridsize.AllowDecimal = false;
+			this.gridsize.AllowNegative = false;
+			this.gridsize.AllowRelative = true;
+			this.gridsize.ButtonStep = 8;
+			this.gridsize.ButtonStepFloat = 1F;
+			this.gridsize.ButtonStepsWrapAround = false;
+			this.gridsize.Location = new System.Drawing.Point(146, 26);
+			this.gridsize.Name = "gridsize";
+			this.gridsize.Size = new System.Drawing.Size(75, 24);
+			this.gridsize.StepValues = null;
+			this.gridsize.TabIndex = 1;
+			// 
+			// label1
+			// 
+			label1.AutoSize = true;
+			label1.Location = new System.Drawing.Point(25, 31);
+			label1.Name = "label1";
+			label1.Size = new System.Drawing.Size(110, 13);
+			label1.TabIndex = 0;
+			label1.Text = "Grid size in mappixels:";
+			// 
+			// groupBox2
+			// 
+			groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			groupBox2.Controls.Add(this.backscaley);
+			groupBox2.Controls.Add(this.backscalex);
+			groupBox2.Controls.Add(this.backoffsety);
+			groupBox2.Controls.Add(this.backoffsetx);
+			groupBox2.Controls.Add(this.backscale);
+			groupBox2.Controls.Add(this.selectfile);
+			groupBox2.Controls.Add(this.showbackground);
+			groupBox2.Controls.Add(this.backoffset);
+			groupBox2.Controls.Add(this.selectflat);
+			groupBox2.Controls.Add(this.selecttexture);
+			groupBox2.Controls.Add(this.backgroundimage);
+			groupBox2.Location = new System.Drawing.Point(12, 89);
+			groupBox2.Name = "groupBox2";
+			groupBox2.Size = new System.Drawing.Size(293, 261);
+			groupBox2.TabIndex = 1;
+			groupBox2.TabStop = false;
+			groupBox2.Text = " Background ";
+			// 
+			// backscaley
+			// 
+			this.backscaley.AllowDecimal = false;
+			this.backscaley.AllowNegative = false;
+			this.backscaley.AllowRelative = true;
+			this.backscaley.ButtonStep = 1;
+			this.backscaley.ButtonStepFloat = 1F;
+			this.backscaley.ButtonStepsWrapAround = false;
+			this.backscaley.Enabled = false;
+			this.backscaley.Location = new System.Drawing.Point(197, 212);
+			this.backscaley.Name = "backscaley";
+			this.backscaley.Size = new System.Drawing.Size(67, 24);
+			this.backscaley.StepValues = null;
+			this.backscaley.TabIndex = 13;
+			// 
+			// backscalex
+			// 
+			this.backscalex.AllowDecimal = false;
+			this.backscalex.AllowNegative = false;
+			this.backscalex.AllowRelative = true;
+			this.backscalex.ButtonStep = 1;
+			this.backscalex.ButtonStepFloat = 1F;
+			this.backscalex.ButtonStepsWrapAround = false;
+			this.backscalex.Enabled = false;
+			this.backscalex.Location = new System.Drawing.Point(124, 212);
+			this.backscalex.Name = "backscalex";
+			this.backscalex.Size = new System.Drawing.Size(67, 24);
+			this.backscalex.StepValues = null;
+			this.backscalex.TabIndex = 12;
+			// 
+			// backoffsety
+			// 
+			this.backoffsety.AllowDecimal = false;
+			this.backoffsety.AllowNegative = true;
+			this.backoffsety.AllowRelative = true;
+			this.backoffsety.ButtonStep = 1;
+			this.backoffsety.ButtonStepFloat = 1F;
+			this.backoffsety.ButtonStepsWrapAround = false;
+			this.backoffsety.Enabled = false;
+			this.backoffsety.Location = new System.Drawing.Point(197, 173);
+			this.backoffsety.Name = "backoffsety";
+			this.backoffsety.Size = new System.Drawing.Size(67, 24);
+			this.backoffsety.StepValues = null;
+			this.backoffsety.TabIndex = 11;
+			// 
+			// backoffsetx
+			// 
+			this.backoffsetx.AllowDecimal = false;
+			this.backoffsetx.AllowNegative = true;
+			this.backoffsetx.AllowRelative = true;
+			this.backoffsetx.ButtonStep = 1;
+			this.backoffsetx.ButtonStepFloat = 1F;
+			this.backoffsetx.ButtonStepsWrapAround = false;
+			this.backoffsetx.Enabled = false;
+			this.backoffsetx.Location = new System.Drawing.Point(124, 173);
+			this.backoffsetx.Name = "backoffsetx";
+			this.backoffsetx.Size = new System.Drawing.Size(67, 24);
+			this.backoffsetx.StepValues = null;
+			this.backoffsetx.TabIndex = 10;
+			// 
+			// backscale
+			// 
+			this.backscale.AutoSize = true;
+			this.backscale.Enabled = false;
+			this.backscale.Location = new System.Drawing.Point(30, 217);
+			this.backscale.Name = "backscale";
+			this.backscale.Size = new System.Drawing.Size(87, 13);
+			this.backscale.TabIndex = 9;
+			this.backscale.Text = "Scale in percent:";
+			// 
+			// selectfile
+			// 
+			this.selectfile.Enabled = false;
+			this.selectfile.Location = new System.Drawing.Point(147, 122);
+			this.selectfile.Name = "selectfile";
+			this.selectfile.Size = new System.Drawing.Size(117, 25);
+			this.selectfile.TabIndex = 3;
+			this.selectfile.Text = "Select File...";
+			this.selectfile.UseVisualStyleBackColor = true;
+			this.selectfile.Click += new System.EventHandler(this.selectfile_Click);
+			// 
+			// showbackground
+			// 
+			this.showbackground.AutoSize = true;
+			this.showbackground.Location = new System.Drawing.Point(28, 29);
+			this.showbackground.Name = "showbackground";
+			this.showbackground.Size = new System.Drawing.Size(144, 17);
+			this.showbackground.TabIndex = 0;
+			this.showbackground.Text = "Show background image";
+			this.showbackground.UseVisualStyleBackColor = true;
+			this.showbackground.CheckedChanged += new System.EventHandler(this.showbackground_CheckedChanged);
+			// 
+			// backoffset
+			// 
+			this.backoffset.AutoSize = true;
+			this.backoffset.Enabled = false;
+			this.backoffset.Location = new System.Drawing.Point(15, 178);
+			this.backoffset.Name = "backoffset";
+			this.backoffset.Size = new System.Drawing.Size(98, 13);
+			this.backoffset.TabIndex = 4;
+			this.backoffset.Text = "Offset in mappixels:";
+			// 
+			// selectflat
+			// 
+			this.selectflat.Enabled = false;
+			this.selectflat.Location = new System.Drawing.Point(147, 91);
+			this.selectflat.Name = "selectflat";
+			this.selectflat.Size = new System.Drawing.Size(117, 25);
+			this.selectflat.TabIndex = 2;
+			this.selectflat.Text = "Select Flat...";
+			this.selectflat.UseVisualStyleBackColor = true;
+			this.selectflat.Click += new System.EventHandler(this.selectflat_Click);
+			// 
+			// selecttexture
+			// 
+			this.selecttexture.Enabled = false;
+			this.selecttexture.Location = new System.Drawing.Point(147, 60);
+			this.selecttexture.Name = "selecttexture";
+			this.selecttexture.Size = new System.Drawing.Size(117, 25);
+			this.selecttexture.TabIndex = 1;
+			this.selecttexture.Text = "Select Texture...";
+			this.selecttexture.UseVisualStyleBackColor = true;
+			this.selecttexture.Click += new System.EventHandler(this.selecttexture_Click);
+			// 
+			// backgroundimage
+			// 
+			this.backgroundimage.BackColor = System.Drawing.SystemColors.AppWorkspace;
+			this.backgroundimage.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
+			this.backgroundimage.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+			this.backgroundimage.Location = new System.Drawing.Point(28, 60);
+			this.backgroundimage.Name = "backgroundimage";
+			this.backgroundimage.Size = new System.Drawing.Size(91, 87);
+			this.backgroundimage.TabIndex = 1;
+			// 
+			// cancel
+			// 
+			this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.cancel.Location = new System.Drawing.Point(193, 359);
+			this.cancel.Name = "cancel";
+			this.cancel.Size = new System.Drawing.Size(112, 25);
+			this.cancel.TabIndex = 3;
+			this.cancel.Text = "Cancel";
+			this.cancel.UseVisualStyleBackColor = true;
+			this.cancel.Click += new System.EventHandler(this.cancel_Click);
+			// 
+			// apply
+			// 
+			this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.apply.Location = new System.Drawing.Point(75, 359);
+			this.apply.Name = "apply";
+			this.apply.Size = new System.Drawing.Size(112, 25);
+			this.apply.TabIndex = 2;
+			this.apply.Text = "OK";
+			this.apply.UseVisualStyleBackColor = true;
+			this.apply.Click += new System.EventHandler(this.apply_Click);
+			// 
+			// browsefile
+			// 
+			this.browsefile.Filter = "All supported images|*.bmp;*.gif;*.png|All Files|*.*";
+			this.browsefile.RestoreDirectory = true;
+			this.browsefile.Title = "Select Background Image File";
+			// 
+			// GridSetupForm
+			// 
+			this.AcceptButton = this.apply;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.CancelButton = this.cancel;
+			this.ClientSize = new System.Drawing.Size(317, 392);
+			this.Controls.Add(this.cancel);
+			this.Controls.Add(this.apply);
+			this.Controls.Add(groupBox2);
+			this.Controls.Add(groupBox1);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "GridSetupForm";
+			this.Opacity = 1;
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Custom Grid Setup";
+			this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.GridSetupForm_HelpRequested);
+			groupBox1.ResumeLayout(false);
+			groupBox1.PerformLayout();
+			groupBox2.ResumeLayout(false);
+			groupBox2.PerformLayout();
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Panel backgroundimage;
+		private System.Windows.Forms.Button selecttexture;
+		private System.Windows.Forms.Button selectflat;
+		private System.Windows.Forms.CheckBox showbackground;
+		private System.Windows.Forms.Button cancel;
+		private System.Windows.Forms.Button apply;
+		private System.Windows.Forms.Label backoffset;
+		private System.Windows.Forms.Button selectfile;
+		private System.Windows.Forms.Label backscale;
+		private System.Windows.Forms.OpenFileDialog browsefile;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox gridsize;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox backscaley;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox backscalex;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox backoffsety;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox backoffsetx;
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/GridSetupForm.cs b/Source/Core/Windows/GridSetupForm.cs
new file mode 100644
index 0000000..a86778c
--- /dev/null
+++ b/Source/Core/Windows/GridSetupForm.cs
@@ -0,0 +1,174 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Drawing;
+using System.IO;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Data;
+using CodeImp.DoomBuilder.Editing;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Windows
+{
+	internal partial class GridSetupForm : DelayedForm
+	{
+		// Variables
+		private string backgroundname;
+		private int backgroundsource;
+		
+		// Constructor
+		public GridSetupForm()
+		{
+			// Initialize
+			InitializeComponent();
+
+			// Show grid size
+			gridsize.Text = General.Map.Grid.GridSize.ToString();
+			
+			// Background image?
+			if((General.Map.Grid.Background != null) &&
+			   !(General.Map.Grid.Background is UnknownImage))
+			{
+				// Show background image
+				showbackground.Checked = true;
+				backgroundname = General.Map.Grid.BackgroundName;
+				backgroundsource = General.Map.Grid.BackgroundSource;
+				General.DisplayZoomedImage(backgroundimage, General.Map.Grid.Background.GetBitmap());
+			}
+			else
+			{
+				// No background image
+				showbackground.Checked = false;
+			}
+
+			// Show background offset
+			backoffsetx.Text = General.Map.Grid.BackgroundX.ToString();
+			backoffsety.Text = General.Map.Grid.BackgroundY.ToString();
+			int scalex = (int)(General.Map.Grid.BackgroundScaleX * 100.0f);
+			int scaley = (int)(General.Map.Grid.BackgroundScaleY * 100.0f);
+			backscalex.Text = General.Clamp(scalex, 1, 10000).ToString();
+			backscaley.Text = General.Clamp(scaley, 1, 10000).ToString();
+		}
+
+		// Show Background changed
+		private void showbackground_CheckedChanged(object sender, EventArgs e)
+		{
+			// Enable/disable controls
+			selecttexture.Enabled = showbackground.Checked;
+			selectflat.Enabled = showbackground.Checked;
+			selectfile.Enabled = showbackground.Checked;
+			backoffset.Enabled = showbackground.Checked;
+			backscale.Enabled = showbackground.Checked;
+			backoffsetx.Enabled = showbackground.Checked;
+			backoffsety.Enabled = showbackground.Checked;
+			backscalex.Enabled = showbackground.Checked;
+			backscaley.Enabled = showbackground.Checked;
+		}
+
+		// Browse texture
+		private void selecttexture_Click(object sender, EventArgs e)
+		{
+			// Browse for texture
+			string result = TextureBrowserForm.Browse(this, backgroundname, false);
+			if(result != null)
+			{
+				// Set this texture as background
+				backgroundname = result;
+				backgroundsource = GridSetup.SOURCE_TEXTURES;
+				ImageData img = General.Map.Data.GetTextureImage(result);
+				img.LoadImage();
+				General.DisplayZoomedImage(backgroundimage, img.GetBitmap());
+			}
+		}
+
+		// Browse flat
+		private void selectflat_Click(object sender, EventArgs e)
+		{
+			// Browse for flat
+			string result = TextureBrowserForm.Browse(this, backgroundname, true);
+			if(result != null)
+			{
+				// Set this flat as background
+				backgroundname = result;
+				backgroundsource = GridSetup.SOURCE_FLATS;
+				ImageData img = General.Map.Data.GetFlatImage(result);
+				img.LoadImage();
+				General.DisplayZoomedImage(backgroundimage, img.GetBitmap());
+			}
+		}
+
+		// Browse file
+		private void selectfile_Click(object sender, EventArgs e)
+		{
+			// Browse for file
+			if(browsefile.ShowDialog(this) == DialogResult.OK)
+			{
+				// Set this file as background
+				backgroundname = browsefile.FileName;
+				backgroundsource = GridSetup.SOURCE_FILE;
+				ImageData img = new FileImage(Path.GetFileNameWithoutExtension(backgroundname), backgroundname, false, 1.0f, 1.0f);
+				img.LoadImage();
+				General.DisplayZoomedImage(backgroundimage, new Bitmap(img.GetBitmap()));
+				img.Dispose();
+			}
+		}
+		
+		// Cancelled
+		private void cancel_Click(object sender, EventArgs e)
+		{
+			DialogResult = DialogResult.Cancel;
+			this.Close();
+		}
+
+		// Apply
+		private void apply_Click(object sender, EventArgs e)
+		{
+			// Apply
+			General.Map.Grid.SetGridSize(gridsize.GetResult(General.Map.Grid.GridSize));
+			General.Map.Grid.SetBackgroundView(backoffsetx.GetResult(General.Map.Grid.BackgroundX),
+											   backoffsety.GetResult(General.Map.Grid.BackgroundY),
+											   backscalex.GetResult((int)(General.Map.Grid.BackgroundScaleX * 100.0f)) / 100.0f,
+											   backscaley.GetResult((int)(General.Map.Grid.BackgroundScaleY * 100.0f)) / 100.0f);
+			
+			// Background image?
+			if(showbackground.Checked)
+			{
+				// Set background image
+				General.Map.Grid.SetBackground(backgroundname, backgroundsource);
+			}
+			else
+			{
+				// No background image
+				General.Map.Grid.SetBackground(null, 0);
+			}
+
+			// Done
+			DialogResult = DialogResult.OK;
+			this.Close();
+		}
+
+		// Help
+		private void GridSetupForm_HelpRequested(object sender, HelpEventArgs hlpevent)
+		{
+			General.ShowHelp("w_gridsetup.html");
+			hlpevent.Handled = true;
+		}
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/GridSetupForm.resx b/Source/Core/Windows/GridSetupForm.resx
new file mode 100644
index 0000000..4278a68
--- /dev/null
+++ b/Source/Core/Windows/GridSetupForm.resx
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="groupBox1.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="groupBox1.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="gridsize.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="label1.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="label1.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="groupBox2.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="groupBox2.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="backscaley.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="backscalex.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="backoffsety.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="backoffsetx.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="backscale.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="selectfile.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="showbackground.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="backoffset.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="selectflat.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="selecttexture.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="backgroundimage.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="browsefile.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Windows/IMainForm.cs b/Source/Core/Windows/IMainForm.cs
new file mode 100644
index 0000000..2b6c7a0
--- /dev/null
+++ b/Source/Core/Windows/IMainForm.cs
@@ -0,0 +1,201 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Controls;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Windows
+{
+	public interface IMainForm : IWin32Window
+	{
+		// Properties
+		bool AltState { get; }
+		bool CtrlState { get; }
+		bool ShiftState { get; }
+		bool MouseInDisplay { get; }
+		bool AutoMerge { get; }
+		bool SnapToGrid { get; }
+		bool MouseExclusive { get; }
+		MouseButtons MouseButtons { get; }
+		bool IsActiveWindow { get; }
+		string ActiveDockerTabName { get; } //mxd
+		RenderTargetControl Display { get; }
+
+		//mxd. Events
+		event EventHandler OnEditFormValuesChanged;
+		
+		// Methods
+		void DisplayReady();
+		void DisplayStatus(StatusType type, string message);
+		void DisplayStatus(StatusInfo newstatus);
+		void RedrawDisplay();
+		DialogResult ShowEditVertices(ICollection<Vertex> vertices);
+		DialogResult ShowEditVertices(ICollection<Vertex> vertices, bool allowPositionChange); //mxd
+		DialogResult ShowEditLinedefs(ICollection<Linedef> lines);
+		DialogResult ShowEditLinedefs(ICollection<Linedef> lines, bool selectfront, bool selectback); //mxd
+		DialogResult ShowEditSectors(ICollection<Sector> sectors);
+		DialogResult ShowEditThings(ICollection<Thing> things);
+		void ShowLinedefInfo(Linedef l);
+		void ShowLinedefInfo(Linedef l, Sidedef highlightside); //mxd
+		void ShowSectorInfo(Sector s);
+		void ShowSectorInfo(Sector s, bool highlightceiling, bool highlightfloor); //mxd
+		void ShowThingInfo(Thing t);
+		void ShowVertexInfo(Vertex v);
+		void HideInfo();
+		void ShowHints(string hints); //mxd
+		void ClearHints(); //mxd
+		void RefreshInfo();
+		void UpdateCoordinates(Vector2D coords);
+		bool Focus();
+		void EnableProcessing();
+		void DisableProcessing();
+		void StartExclusiveMouseInput();
+		void StopExclusiveMouseInput();
+		void BreakExclusiveMouseInput();
+		void ResumeExclusiveMouseInput();
+		void SetCursor(Cursor cursor);
+		void MessageBeep(MessageBeepType type);
+
+		/// <summary>
+		/// This moves the focus to the editing display.
+		/// </summary>
+		bool FocusDisplay();
+
+		/// <summary>
+		/// This browses the lindef types
+		/// </summary>
+		/// <returns>Returns the new action or the same action when cancelled</returns>
+		int BrowseLinedefActions(IWin32Window owner, int initialvalue);
+		
+		/// <summary>
+		/// This browses sector effects
+		/// </summary>
+		/// <returns>Returns the new effect or the same effect when cancelled</returns>
+		int BrowseSectorEffect(IWin32Window owner, int initialvalue);
+
+		/// <summary>
+		/// This browses for a texture
+		/// </summary>
+		/// <returns>Returns the new texture name or the same texture name when cancelled</returns>
+		string BrowseTexture(IWin32Window owner, string initialvalue);
+
+		/// <summary>
+		/// This browses for a flat
+		/// </summary>
+		/// <returns>Returns the new flat name or the same flat name when cancelled</returns>
+		string BrowseFlat(IWin32Window owner, string initialvalue);
+
+		/// <summary>
+		/// THis browses for a thing type
+		/// </summary>
+		/// <returns>Returns the new thing type or the same thing type when cancelled</returns>
+		int BrowseThingType(IWin32Window owner, int initialvalue);
+		
+		/// <summary>
+		/// This adds a menu to the Doom Builder menu strip.
+		/// <para>
+		/// NOTE: When the Tag property of menu items is set with a string, this changes the
+		/// tag to a fully qualified action name by prefixing it with the assembly name.
+		/// </para>
+		/// </summary>
+		/// <param name="menu">The menu to add to Doom Builder.</param>
+		void AddMenu(ToolStripItem menu);
+		
+		/// <summary>
+		/// This adds a menu or menu item to the Doom Builder menu strip in a specific location.
+		/// <para>
+		/// NOTE: When the Tag property of menu items is set with a string, this changes the
+		/// tag to a fully qualified action name by prefixing it with the assembly name.
+		/// </para>
+		/// </summary>
+		/// <param name="menu">The menu to add to Doom Builder.</param>
+		/// <param name="section">The location where to insert the menu or item.</param>
+		void AddMenu(ToolStripItem menu, MenuSection section);
+
+		/// <summary>
+		/// This adds a menu or menu item to the speicfied group inside of "Modes" menu strip.
+		/// <para>
+		/// NOTE: When the Tag property of menu items is set with a string, this changes the
+		/// tag to a fully qualified action name by prefixing it with the assembly name.
+		/// </para>
+		/// </summary>
+		/// <param name="menu">The menu to add to Doom Builder.</param>
+		/// <param name="group">The group in the "Modes" menu in which to insert the menu.</param>
+		void AddModesMenu(ToolStripItem menu, string group);
+		
+		/// <summary>
+		/// This removes a menu from the Doom Builder menu strip.
+		/// </summary>
+		/// <param name="menu">The menu to remove.</param>
+		void RemoveMenu(ToolStripItem menu);
+		
+		/// <summary>
+		/// This method invokes the action specified on the Tag property of the given menu item.
+		/// </summary>
+		/// <param name="sender">Menu item with Tag property set to the name of an action
+		/// that you want to invoke.</param>
+		/// <param name="e">Unused.</param>
+		void InvokeTaggedAction(object sender, EventArgs e);
+		
+		/// <summary>
+		/// This adds a custom button to the toolbar.
+		/// </summary>
+		void AddButton(ToolStripItem button);
+
+		/// <summary>
+		/// This adds a custom button to a specific section in the toolbar. Note that the visibility of the button will be controlled by the user's preferences of that section!
+		/// </summary>
+		void AddButton(ToolStripItem button, ToolbarSection section);
+
+		/// <summary>
+		/// This adds a custom button to the Modes section in the toolbar. Note that the visibility of the button will be controlled by the user's preferences of that section!
+		/// </summary>
+		void AddModesButton(ToolStripItem toolbarButton, string group);
+
+		/// <summary>
+		/// This removes a custom button from the toolbar.
+		/// </summary>
+		void RemoveButton(ToolStripItem button);
+		
+		/// <summary>
+		/// This adds a docker to the side panel.
+		/// </summary>
+		void AddDocker(Docker d);
+		
+		/// <summary>
+		/// This removes a docker from the side panel.
+		/// </summary>
+		bool RemoveDocker(Docker d);
+		
+		/// <summary>
+		/// Selects a docker in the side panel.
+		/// </summary>
+		bool SelectDocker(Docker d);
+		
+		/// <summary>
+		/// This selected the previously selected docker in the side panel.
+		/// </summary>
+		void SelectPreviousDocker();
+	}
+}
diff --git a/Source/Core/Windows/LinedefColorPresetsForm.Designer.cs b/Source/Core/Windows/LinedefColorPresetsForm.Designer.cs
new file mode 100644
index 0000000..c7a5592
--- /dev/null
+++ b/Source/Core/Windows/LinedefColorPresetsForm.Designer.cs
@@ -0,0 +1,406 @@
+namespace CodeImp.DoomBuilder.Windows
+{
+	partial class LinedefColorPresetsForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing) {
+			if(disposing && (components != null)) {
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent() {
+			this.cancel = new System.Windows.Forms.Button();
+			this.apply = new System.Windows.Forms.Button();
+			this.moveup = new System.Windows.Forms.Button();
+			this.movedown = new System.Windows.Forms.Button();
+			this.deletepreset = new System.Windows.Forms.Button();
+			this.addpreset = new System.Windows.Forms.Button();
+			this.curpresetgroup = new System.Windows.Forms.GroupBox();
+			this.errordescription = new System.Windows.Forms.Label();
+			this.erroricon = new System.Windows.Forms.PictureBox();
+			this.presetsettings = new System.Windows.Forms.TabControl();
+			this.tabFlags = new System.Windows.Forms.TabPage();
+			this.useflags = new System.Windows.Forms.CheckBox();
+			this.tabAction = new System.Windows.Forms.TabPage();
+			this.useaction = new System.Windows.Forms.CheckBox();
+			this.tabActivation = new System.Windows.Forms.TabPage();
+			this.activation = new System.Windows.Forms.ComboBox();
+			this.useactivation = new System.Windows.Forms.CheckBox();
+			this.presetname = new System.Windows.Forms.TextBox();
+			this.label1 = new System.Windows.Forms.Label();
+			this.flags = new CodeImp.DoomBuilder.Controls.CheckboxArrayControl();
+			this.action = new CodeImp.DoomBuilder.Controls.ActionSelectorControl();
+			this.udmfactivates = new CodeImp.DoomBuilder.Controls.CheckboxArrayControl();
+			this.presetcolor = new CodeImp.DoomBuilder.Controls.ColorControl();
+			this.colorpresets = new CodeImp.DoomBuilder.Controls.CheckedColoredListBox();
+			this.curpresetgroup.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.erroricon)).BeginInit();
+			this.presetsettings.SuspendLayout();
+			this.tabFlags.SuspendLayout();
+			this.tabAction.SuspendLayout();
+			this.tabActivation.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// cancel
+			// 
+			this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.cancel.Location = new System.Drawing.Point(573, 428);
+			this.cancel.Name = "cancel";
+			this.cancel.Size = new System.Drawing.Size(112, 25);
+			this.cancel.TabIndex = 7;
+			this.cancel.Text = "Cancel";
+			this.cancel.UseVisualStyleBackColor = true;
+			this.cancel.Click += new System.EventHandler(this.cancel_Click);
+			// 
+			// apply
+			// 
+			this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.apply.Location = new System.Drawing.Point(455, 428);
+			this.apply.Name = "apply";
+			this.apply.Size = new System.Drawing.Size(112, 25);
+			this.apply.TabIndex = 6;
+			this.apply.Text = "OK";
+			this.apply.UseVisualStyleBackColor = true;
+			this.apply.Click += new System.EventHandler(this.apply_Click);
+			// 
+			// moveup
+			// 
+			this.moveup.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.moveup.Image = global::CodeImp.DoomBuilder.Properties.Resources.ArrowUp;
+			this.moveup.Location = new System.Drawing.Point(162, 424);
+			this.moveup.Name = "moveup";
+			this.moveup.Size = new System.Drawing.Size(25, 25);
+			this.moveup.TabIndex = 12;
+			this.moveup.UseVisualStyleBackColor = true;
+			this.moveup.Click += new System.EventHandler(this.moveup_Click);
+			// 
+			// movedown
+			// 
+			this.movedown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.movedown.Image = global::CodeImp.DoomBuilder.Properties.Resources.ArrowDown;
+			this.movedown.Location = new System.Drawing.Point(189, 424);
+			this.movedown.Name = "movedown";
+			this.movedown.Size = new System.Drawing.Size(25, 25);
+			this.movedown.TabIndex = 11;
+			this.movedown.UseVisualStyleBackColor = true;
+			this.movedown.Click += new System.EventHandler(this.movedown_Click);
+			// 
+			// deletepreset
+			// 
+			this.deletepreset.Image = global::CodeImp.DoomBuilder.Properties.Resources.SearchClear;
+			this.deletepreset.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+			this.deletepreset.Location = new System.Drawing.Point(87, 424);
+			this.deletepreset.Name = "deletepreset";
+			this.deletepreset.Size = new System.Drawing.Size(70, 25);
+			this.deletepreset.TabIndex = 10;
+			this.deletepreset.Text = "Delele";
+			this.deletepreset.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+			this.deletepreset.UseVisualStyleBackColor = true;
+			this.deletepreset.Click += new System.EventHandler(this.deletepreset_Click);
+			// 
+			// addpreset
+			// 
+			this.addpreset.Image = global::CodeImp.DoomBuilder.Properties.Resources.Add;
+			this.addpreset.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+			this.addpreset.Location = new System.Drawing.Point(12, 424);
+			this.addpreset.Name = "addpreset";
+			this.addpreset.Size = new System.Drawing.Size(70, 25);
+			this.addpreset.TabIndex = 8;
+			this.addpreset.Text = "Add";
+			this.addpreset.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+			this.addpreset.UseVisualStyleBackColor = true;
+			this.addpreset.Click += new System.EventHandler(this.addpreset_Click);
+			// 
+			// curpresetgroup
+			// 
+			this.curpresetgroup.Controls.Add(this.errordescription);
+			this.curpresetgroup.Controls.Add(this.erroricon);
+			this.curpresetgroup.Controls.Add(this.presetsettings);
+			this.curpresetgroup.Controls.Add(this.presetname);
+			this.curpresetgroup.Controls.Add(this.presetcolor);
+			this.curpresetgroup.Controls.Add(this.label1);
+			this.curpresetgroup.Location = new System.Drawing.Point(220, 6);
+			this.curpresetgroup.Name = "curpresetgroup";
+			this.curpresetgroup.Size = new System.Drawing.Size(465, 417);
+			this.curpresetgroup.TabIndex = 13;
+			this.curpresetgroup.TabStop = false;
+			this.curpresetgroup.Text = " Selected Preset ";
+			// 
+			// errordescription
+			// 
+			this.errordescription.AutoSize = true;
+			this.errordescription.ForeColor = System.Drawing.Color.DarkRed;
+			this.errordescription.Location = new System.Drawing.Point(31, 396);
+			this.errordescription.Name = "errordescription";
+			this.errordescription.Size = new System.Drawing.Size(96, 13);
+			this.errordescription.TabIndex = 20;
+			this.errordescription.Text = "Teh Error occured!";
+			this.errordescription.Visible = false;
+			// 
+			// erroricon
+			// 
+			this.erroricon.BackColor = System.Drawing.SystemColors.Window;
+			this.erroricon.Image = global::CodeImp.DoomBuilder.Properties.Resources.Warning;
+			this.erroricon.Location = new System.Drawing.Point(11, 394);
+			this.erroricon.Name = "erroricon";
+			this.erroricon.Size = new System.Drawing.Size(16, 16);
+			this.erroricon.TabIndex = 19;
+			this.erroricon.TabStop = false;
+			this.erroricon.Visible = false;
+			// 
+			// presetsettings
+			// 
+			this.presetsettings.Controls.Add(this.tabFlags);
+			this.presetsettings.Controls.Add(this.tabAction);
+			this.presetsettings.Controls.Add(this.tabActivation);
+			this.presetsettings.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.presetsettings.Location = new System.Drawing.Point(6, 54);
+			this.presetsettings.Name = "presetsettings";
+			this.presetsettings.Padding = new System.Drawing.Point(24, 3);
+			this.presetsettings.SelectedIndex = 0;
+			this.presetsettings.Size = new System.Drawing.Size(453, 334);
+			this.presetsettings.TabIndex = 18;
+			// 
+			// tabFlags
+			// 
+			this.tabFlags.Controls.Add(this.flags);
+			this.tabFlags.Controls.Add(this.useflags);
+			this.tabFlags.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.tabFlags.Location = new System.Drawing.Point(4, 22);
+			this.tabFlags.Name = "tabFlags";
+			this.tabFlags.Padding = new System.Windows.Forms.Padding(3);
+			this.tabFlags.Size = new System.Drawing.Size(445, 308);
+			this.tabFlags.TabIndex = 0;
+			this.tabFlags.Text = "Flags";
+			this.tabFlags.UseVisualStyleBackColor = true;
+			// 
+			// useflags
+			// 
+			this.useflags.AutoSize = true;
+			this.useflags.Location = new System.Drawing.Point(6, 6);
+			this.useflags.Name = "useflags";
+			this.useflags.Size = new System.Drawing.Size(70, 17);
+			this.useflags.TabIndex = 4;
+			this.useflags.Text = "Use flags";
+			this.useflags.UseVisualStyleBackColor = true;
+			this.useflags.CheckedChanged += new System.EventHandler(this.useflags_CheckedChanged);
+			// 
+			// tabAction
+			// 
+			this.tabAction.Controls.Add(this.action);
+			this.tabAction.Controls.Add(this.useaction);
+			this.tabAction.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.tabAction.Location = new System.Drawing.Point(4, 22);
+			this.tabAction.Name = "tabAction";
+			this.tabAction.Padding = new System.Windows.Forms.Padding(3);
+			this.tabAction.Size = new System.Drawing.Size(445, 308);
+			this.tabAction.TabIndex = 1;
+			this.tabAction.Text = "Action";
+			this.tabAction.UseVisualStyleBackColor = true;
+			// 
+			// useaction
+			// 
+			this.useaction.AutoSize = true;
+			this.useaction.Location = new System.Drawing.Point(6, 6);
+			this.useaction.Name = "useaction";
+			this.useaction.Size = new System.Drawing.Size(78, 17);
+			this.useaction.TabIndex = 4;
+			this.useaction.Text = "Use Action";
+			this.useaction.UseVisualStyleBackColor = true;
+			this.useaction.CheckedChanged += new System.EventHandler(this.useaction_CheckedChanged);
+			// 
+			// tabActivation
+			// 
+			this.tabActivation.Controls.Add(this.activation);
+			this.tabActivation.Controls.Add(this.useactivation);
+			this.tabActivation.Controls.Add(this.udmfactivates);
+			this.tabActivation.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.tabActivation.Location = new System.Drawing.Point(4, 22);
+			this.tabActivation.Name = "tabActivation";
+			this.tabActivation.Size = new System.Drawing.Size(445, 308);
+			this.tabActivation.TabIndex = 2;
+			this.tabActivation.Text = "Activation type";
+			this.tabActivation.UseVisualStyleBackColor = true;
+			// 
+			// activation
+			// 
+			this.activation.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.activation.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.activation.FormattingEnabled = true;
+			this.activation.Location = new System.Drawing.Point(3, 30);
+			this.activation.Name = "activation";
+			this.activation.Size = new System.Drawing.Size(439, 21);
+			this.activation.TabIndex = 0;
+			this.activation.SelectedIndexChanged += new System.EventHandler(this.activation_SelectedIndexChanged);
+			// 
+			// useactivation
+			// 
+			this.useactivation.AutoSize = true;
+			this.useactivation.Location = new System.Drawing.Point(6, 6);
+			this.useactivation.Name = "useactivation";
+			this.useactivation.Size = new System.Drawing.Size(94, 17);
+			this.useactivation.TabIndex = 4;
+			this.useactivation.Text = "Use activation";
+			this.useactivation.UseVisualStyleBackColor = true;
+			this.useactivation.CheckedChanged += new System.EventHandler(this.useactivation_CheckedChanged);
+			// 
+			// presetname
+			// 
+			this.presetname.Location = new System.Drawing.Point(92, 24);
+			this.presetname.MaxLength = 50;
+			this.presetname.Name = "presetname";
+			this.presetname.Size = new System.Drawing.Size(208, 20);
+			this.presetname.TabIndex = 17;
+			this.presetname.Enter += new System.EventHandler(this.presetname_Enter);
+			this.presetname.Validating += new System.ComponentModel.CancelEventHandler(this.presetname_Validating);
+			// 
+			// label1
+			// 
+			this.label1.AutoSize = true;
+			this.label1.Location = new System.Drawing.Point(48, 27);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(38, 13);
+			this.label1.TabIndex = 16;
+			this.label1.Text = "Name:";
+			// 
+			// flags
+			// 
+			this.flags.AutoScroll = true;
+			this.flags.Columns = 2;
+			this.flags.Location = new System.Drawing.Point(6, 29);
+			this.flags.Name = "flags";
+			this.flags.Size = new System.Drawing.Size(433, 273);
+			this.flags.TabIndex = 5;
+			this.flags.VerticalSpacing = 1;
+			// 
+			// action
+			// 
+			this.action.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.action.BackColor = System.Drawing.Color.Transparent;
+			this.action.Cursor = System.Windows.Forms.Cursors.Default;
+			this.action.Empty = false;
+			this.action.GeneralizedCategories = null;
+			this.action.GeneralizedOptions = null;
+			this.action.Location = new System.Drawing.Point(6, 30);
+			this.action.Name = "action";
+			this.action.Size = new System.Drawing.Size(433, 21);
+			this.action.TabIndex = 6;
+			this.action.Value = 0;
+			this.action.ValueChanges += new System.EventHandler(this.action_ValueChanges);
+			// 
+			// udmfactivates
+			// 
+			this.udmfactivates.AutoScroll = true;
+			this.udmfactivates.Columns = 2;
+			this.udmfactivates.Location = new System.Drawing.Point(6, 29);
+			this.udmfactivates.Name = "udmfactivates";
+			this.udmfactivates.Size = new System.Drawing.Size(435, 276);
+			this.udmfactivates.TabIndex = 5;
+			this.udmfactivates.VerticalSpacing = 1;
+			// 
+			// presetcolor
+			// 
+			this.presetcolor.BackColor = System.Drawing.Color.Transparent;
+			this.presetcolor.Label = "Linedef color:";
+			this.presetcolor.Location = new System.Drawing.Point(319, 23);
+			this.presetcolor.MaximumSize = new System.Drawing.Size(10000, 23);
+			this.presetcolor.MinimumSize = new System.Drawing.Size(100, 23);
+			this.presetcolor.Name = "presetcolor";
+			this.presetcolor.Size = new System.Drawing.Size(132, 23);
+			this.presetcolor.TabIndex = 0;
+			this.presetcolor.ColorChanged += new System.EventHandler(this.presetcolor_ColorChanged);
+			// 
+			// colorpresets
+			// 
+			this.colorpresets.Location = new System.Drawing.Point(12, 12);
+			this.colorpresets.Name = "colorpresets";
+			this.colorpresets.Size = new System.Drawing.Size(202, 409);
+			this.colorpresets.TabIndex = 9;
+			this.colorpresets.WarningIcon = global::CodeImp.DoomBuilder.Properties.Resources.Warning;
+			this.colorpresets.SelectedIndexChanged += new System.EventHandler(this.colorpresets_SelectedIndexChanged);
+			this.colorpresets.ItemCheck += new System.Windows.Forms.ItemCheckEventHandler(this.colorpresets_ItemCheck);
+			// 
+			// LinedefColorPresetsForm
+			// 
+			this.AcceptButton = this.apply;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.CancelButton = this.cancel;
+			this.ClientSize = new System.Drawing.Size(696, 459);
+			this.Controls.Add(this.curpresetgroup);
+			this.Controls.Add(this.moveup);
+			this.Controls.Add(this.movedown);
+			this.Controls.Add(this.deletepreset);
+			this.Controls.Add(this.addpreset);
+			this.Controls.Add(this.colorpresets);
+			this.Controls.Add(this.cancel);
+			this.Controls.Add(this.apply);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "LinedefColorPresetsForm";
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Linedef Color Presets";
+			this.curpresetgroup.ResumeLayout(false);
+			this.curpresetgroup.PerformLayout();
+			((System.ComponentModel.ISupportInitialize)(this.erroricon)).EndInit();
+			this.presetsettings.ResumeLayout(false);
+			this.tabFlags.ResumeLayout(false);
+			this.tabFlags.PerformLayout();
+			this.tabAction.ResumeLayout(false);
+			this.tabAction.PerformLayout();
+			this.tabActivation.ResumeLayout(false);
+			this.tabActivation.PerformLayout();
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Button cancel;
+		private System.Windows.Forms.Button apply;
+		private System.Windows.Forms.Button moveup;
+		private System.Windows.Forms.Button movedown;
+		private System.Windows.Forms.Button deletepreset;
+		private CodeImp.DoomBuilder.Controls.CheckedColoredListBox colorpresets;
+		private System.Windows.Forms.Button addpreset;
+		private System.Windows.Forms.GroupBox curpresetgroup;
+		private CodeImp.DoomBuilder.Controls.ColorControl presetcolor;
+		private System.Windows.Forms.TextBox presetname;
+		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.TabControl presetsettings;
+		private System.Windows.Forms.TabPage tabFlags;
+		private System.Windows.Forms.CheckBox useflags;
+		private System.Windows.Forms.TabPage tabAction;
+		private CodeImp.DoomBuilder.Controls.ActionSelectorControl action;
+		private System.Windows.Forms.CheckBox useaction;
+		private System.Windows.Forms.TabPage tabActivation;
+		private System.Windows.Forms.ComboBox activation;
+		private System.Windows.Forms.CheckBox useactivation;
+		private System.Windows.Forms.PictureBox erroricon;
+		private System.Windows.Forms.Label errordescription;
+		private CodeImp.DoomBuilder.Controls.CheckboxArrayControl flags;
+		private CodeImp.DoomBuilder.Controls.CheckboxArrayControl udmfactivates;
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/LinedefColorPresetsForm.cs b/Source/Core/Windows/LinedefColorPresetsForm.cs
new file mode 100644
index 0000000..dd746db
--- /dev/null
+++ b/Source/Core/Windows/LinedefColorPresetsForm.cs
@@ -0,0 +1,527 @@
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Controls;
+using CodeImp.DoomBuilder.GZBuilder.Data;
+using CodeImp.DoomBuilder.Rendering;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Windows
+{
+	public partial class LinedefColorPresetsForm : Form
+	{
+		#region ================== Structs
+
+		private class PresetItem : IColoredListBoxItem
+		{
+			private Color color;
+			
+			public bool ShowWarning { get; set; }
+			public Color Color { get { return color; } set { color = value; Preset.Color = PixelColor.FromColor(value); } }
+			public readonly LinedefColorPreset Preset;
+			public const string DEFAULT_NAME = "Unnamed preset";
+
+			// Constructor for a new preset
+			public PresetItem()
+			{
+				Preset = new LinedefColorPreset(DEFAULT_NAME, General.Colors.BrightColors[General.Random(0, General.Colors.BrightColors.Length - 1)]);
+				color = Preset.Color.ToColor();
+			}
+
+			// Constructor for existing preset
+			public PresetItem(LinedefColorPreset preset)
+			{
+				Preset = new LinedefColorPreset(preset);
+				color = Preset.Color.ToColor();
+			}
+
+			public override string ToString()
+			{
+				return Preset.Name;
+			}
+		}
+
+		#endregion
+
+		#region ================== Variables
+
+		private bool preventchanges;
+
+		#endregion
+
+		#region ================== Constructor / Setup
+
+		public LinedefColorPresetsForm()
+		{
+			preventchanges = true;
+			
+			InitializeComponent();
+
+			// Fill filters list
+			foreach(LinedefColorPreset preset in General.Map.ConfigSettings.LinedefColorPresets)
+			{
+				PresetItem pi = new PresetItem(preset);
+				ValidatePreset(pi);
+				int index = colorpresets.Items.Add(pi);
+				if(preset.Enabled) colorpresets.SetItemChecked(index, true);
+			}
+
+			// Setup preset controls
+			// Add flags
+			foreach(KeyValuePair<string, string> lf in General.Map.Config.LinedefFlags)
+			{
+				CheckBox box = flags.Add(lf.Value, lf.Key);
+				box.ThreeState = true;
+				box.CheckStateChanged += flags_OnCheckStateChanged;
+			}
+
+			// Fill actions list
+			action.GeneralizedCategories = General.Map.Config.GenActionCategories;
+
+			List<LinedefActionInfo> infos = new List<LinedefActionInfo> { new LinedefActionInfo(-1, "Any action", true, false) };
+			infos.AddRange(General.Map.Config.SortedLinedefActions);
+
+			action.AddInfo(infos.ToArray());
+			action.Value = -1;
+
+			//activations
+			udmfactivates.Visible = General.Map.UDMF;
+			activation.Visible = !General.Map.UDMF;
+
+			//get activates
+			List<LinedefActivateInfo> activations = new List<LinedefActivateInfo>(General.Map.Config.LinedefActivates);
+
+			if(activations.Count > 0)
+			{
+				activations.Insert(0, new LinedefActivateInfo("-1", "Any activation"));
+
+				if(General.Map.UDMF)
+				{
+					foreach(LinedefActivateInfo ai in General.Map.Config.LinedefActivates)
+					{
+						CheckBox box = udmfactivates.Add(ai.Title, ai.Key);
+						box.ThreeState = true;
+						box.CheckStateChanged += flags_OnCheckStateChanged;
+					}
+				}
+				else
+				{
+					activation.Items.AddRange(activations.ToArray());
+				}
+			}
+			else
+			{
+				presetsettings.TabPages.Remove(tabActivation);
+			}
+
+			UpdatePresetsListControls();
+			preventchanges = false;
+
+			// Select first preset or disable controls
+			if(colorpresets.Items.Count > 0)
+				colorpresets.SelectedIndex = 0;
+			else
+				curpresetgroup.Enabled = false;
+		}
+
+		private void ValidatePreset(PresetItem item)
+		{
+			bool warningstate = item.ShowWarning;
+			string warning = string.Empty;
+
+			// Validate
+			if(!item.Preset.IsValid())
+			{
+				item.ShowWarning = true;
+				if(General.Map.UDMF)
+					warning = "Invalid preset: no flags, action or activation type selected!";
+				else
+					warning = "Invalid preset: no flags or action selected!";
+			}
+			else
+			{
+				item.ShowWarning = false;
+				
+				// Check for duplicates
+				foreach(var otheritem in colorpresets.Items)
+				{
+					PresetItem other = (PresetItem)otheritem;
+					if(other == item) continue;
+					if(other.Preset.Action != item.Preset.Action) continue;
+					if(other.Preset.Activation != item.Preset.Activation) continue;
+					if(other.Preset.Flags.Count != item.Preset.Flags.Count) continue;
+					if(other.Preset.RestrictedFlags.Count != item.Preset.RestrictedFlags.Count) continue;
+
+					bool gotmismatch = false;
+					foreach(string flag in other.Preset.Flags) 
+					{
+						if(!item.Preset.Flags.Contains(flag)) 
+						{
+							gotmismatch = true;
+							break;
+						}
+					}
+
+					foreach(string flag in other.Preset.RestrictedFlags) 
+					{
+						if(!item.Preset.RestrictedFlags.Contains(flag)) 
+						{
+							gotmismatch = true;
+							break;
+						}
+					}
+
+					if(gotmismatch) continue;
+
+					//we have a match
+					warning = "Preset matches '" + other.Preset.Name + "'!";
+					item.ShowWarning = true;
+					break;
+				}
+			}
+
+			if(!preventchanges)
+			{
+				// Redraw presets list?
+				if(warningstate != item.ShowWarning) colorpresets.Invalidate();
+
+				// Update error description
+				errordescription.Visible = item.ShowWarning;
+				erroricon.Visible = item.ShowWarning;
+				errordescription.Text = warning;
+			}
+		}
+
+		private void UpdatePresetsListControls()
+		{
+			int c = colorpresets.Items.Count;
+			curpresetgroup.Enabled = (c > 0);
+
+			if(c < 2)
+			{
+				movedown.Enabled = false;
+				moveup.Enabled = false;
+			}
+			else
+			{
+				movedown.Enabled = (colorpresets.SelectedIndex < c - 1);
+				moveup.Enabled = (colorpresets.SelectedIndex > 0);
+			}
+		}
+
+		private static void ApplyFlagsToPreset(CheckboxArrayControl source, LinedefColorPreset preset)
+		{
+			if(source.Enabled)
+			{
+				foreach(CheckBox box in source.Checkboxes)
+					ApplyFlagToPreset(box.Tag.ToString(), preset, box.CheckState);
+			}
+			else
+			{
+				foreach(CheckBox box in source.Checkboxes)
+				{
+					string flag = box.Tag.ToString();
+					if(preset.Flags.Contains(flag)) preset.Flags.Remove(flag);
+					if(preset.RestrictedFlags.Contains(flag)) preset.RestrictedFlags.Remove(flag);
+				}
+			}
+		}
+
+		private static void ApplyFlagToPreset(string flag, LinedefColorPreset preset, CheckState state)
+		{
+			switch(state)
+			{
+				case CheckState.Checked:
+					if(!preset.Flags.Contains(flag)) preset.Flags.Add(flag);
+					if(preset.RestrictedFlags.Contains(flag)) preset.RestrictedFlags.Remove(flag);
+					break;
+
+				case CheckState.Unchecked:
+					if(preset.Flags.Contains(flag)) preset.Flags.Remove(flag);
+					if(!preset.RestrictedFlags.Contains(flag)) preset.RestrictedFlags.Add(flag);
+					break;
+
+				default:
+					if(preset.Flags.Contains(flag)) preset.Flags.Remove(flag);
+					if(preset.RestrictedFlags.Contains(flag)) preset.RestrictedFlags.Remove(flag);
+					break;
+			}
+		}
+
+		private static void ApplyFlagsToControl(LinedefColorPreset preset, CheckboxArrayControl target, CheckBox useflags)
+		{
+			if(preset.Flags.Count == 0 && preset.RestrictedFlags.Count == 0)
+			{
+				useflags.Checked = false;
+				target.Enabled = false;
+
+				foreach(CheckBox box in target.Checkboxes)
+					box.CheckState = CheckState.Indeterminate;
+			}
+			else
+			{
+				useflags.Checked = true;
+				target.Enabled = true;
+
+				foreach(CheckBox box in target.Checkboxes)
+				{
+					string flag = box.Tag.ToString();
+					if(preset.Flags.Contains(flag))
+						box.CheckState = CheckState.Checked;
+					else if(preset.RestrictedFlags.Contains(flag))
+						box.CheckState = CheckState.Unchecked;
+					else
+						box.CheckState = CheckState.Indeterminate;
+				}
+			}
+		}
+
+		#endregion
+
+		#region ================== Apply / Cancel
+
+		private void apply_Click(object sender, EventArgs e)
+		{
+			// Replace all presets
+			LinedefColorPreset[] newpresets = new LinedefColorPreset[colorpresets.Items.Count];
+			for(int i = 0; i < colorpresets.Items.Count; i++)
+				newpresets[i] = ((PresetItem)colorpresets.Items[i]).Preset;
+			General.Map.ConfigSettings.LinedefColorPresets = newpresets;
+			
+			// Update stuff
+			General.Map.Map.UpdateCustomLinedefColors();
+			General.MainWindow.UpdateLinedefColorPresets();
+			General.Map.ConfigSettings.Changed = true;
+			
+			// Close
+			this.DialogResult = DialogResult.OK;
+			this.Close();
+		}
+
+		private void cancel_Click(object sender, EventArgs e)
+		{
+			// Close
+			this.DialogResult = DialogResult.Cancel;
+			this.Close();
+		}
+
+		private void colorpresets_ItemCheck(object sender, ItemCheckEventArgs e)
+		{
+			if(preventchanges || colorpresets.SelectedItem == null) return;
+			((PresetItem)colorpresets.SelectedItem).Preset.Enabled = (e.NewValue == CheckState.Checked);
+		}
+
+		#endregion
+
+		#region ================== Presets list events
+
+		private void colorpresets_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if(preventchanges) return;
+			
+			// Disable controls
+			if(colorpresets.SelectedIndex == -1)
+			{
+				curpresetgroup.Enabled = false;
+				return;
+			}
+
+			preventchanges = true;
+			curpresetgroup.Enabled = true;
+
+			PresetItem item = (PresetItem) colorpresets.SelectedItem;
+
+			// Update name
+			presetname.Text = item.ToString();
+
+			// Update color
+			presetcolor.Color = item.Preset.Color;
+
+			// Update flags
+			ApplyFlagsToControl(item.Preset, flags, useflags);
+
+			// Update action
+			action.Value = item.Preset.Action;
+			useaction.Checked = (item.Preset.Action != 0);
+			action.Enabled = (item.Preset.Action != 0);
+
+			// Update activation
+			if(General.Map.UDMF)
+			{
+				ApplyFlagsToControl(item.Preset, udmfactivates, useactivation);
+			} 
+			else if(presetsettings.TabPages.Contains(tabActivation))
+			{
+				if(item.Preset.Activation == 0)
+				{
+					activation.SelectedIndex = 1;
+					useactivation.Checked = false;
+					activation.Enabled = false;
+				}
+				else
+				{
+					for(int i = 0; i < activation.Items.Count; i++)
+					{
+						if(((LinedefActivateInfo)activation.Items[i]).Index == item.Preset.Activation)
+						{
+							activation.SelectedIndex = i;
+							useactivation.Checked = true;
+							activation.Enabled = true;
+							break;
+						}
+					}
+				}
+			}
+
+			preventchanges = false;
+
+			// Update warning description
+			ValidatePreset(item);
+
+			// Update controls
+			UpdatePresetsListControls();
+		}
+
+		private void addpreset_Click(object sender, EventArgs e)
+		{
+			// Add new item
+			PresetItem item = new PresetItem();
+			int index = Math.Max(0, colorpresets.SelectedIndex);
+			colorpresets.Items.Insert(index, item);
+			colorpresets.SetItemChecked(index, true);
+			
+			// Select it
+			colorpresets.SelectedItem = item;
+
+			// Update controls
+			UpdatePresetsListControls();
+		}
+
+		private void deletepreset_Click(object sender, EventArgs e)
+		{
+			if(colorpresets.SelectedItem == null) return; //sanity check
+
+			// Remove item
+			int index = colorpresets.SelectedIndex;
+			colorpresets.Items.RemoveAt(index);
+			
+			// Select previous item, if possible
+			if(colorpresets.Items.Count > 0)
+				colorpresets.SelectedIndex = (index >= colorpresets.Items.Count ? colorpresets.Items.Count - 1 : index);
+
+			// Update controls
+			UpdatePresetsListControls();
+		}
+
+		private void moveup_Click(object sender, EventArgs e)
+		{
+			if(colorpresets.SelectedItem == null) return;
+
+			PresetItem item = (PresetItem)colorpresets.SelectedItem;
+			colorpresets.Items[colorpresets.SelectedIndex] = colorpresets.Items[colorpresets.SelectedIndex - 1];
+			colorpresets.Items[colorpresets.SelectedIndex - 1] = item;
+
+			colorpresets.SelectedIndex--;
+		}
+
+		private void movedown_Click(object sender, EventArgs e)
+		{
+			if(colorpresets.SelectedItem == null) return;
+
+			PresetItem item = (PresetItem)colorpresets.SelectedItem;
+			colorpresets.Items[colorpresets.SelectedIndex] = colorpresets.Items[colorpresets.SelectedIndex + 1];
+			colorpresets.Items[colorpresets.SelectedIndex + 1] = item;
+
+			colorpresets.SelectedIndex++;
+		}
+
+		#endregion
+
+		#region ================== Current preset events
+
+		private void presetname_Validating(object sender, CancelEventArgs e)
+		{
+			if(preventchanges || colorpresets.SelectedItem == null) return;
+			if(string.IsNullOrEmpty(presetname.Text)) presetname.Text = PresetItem.DEFAULT_NAME;
+			((PresetItem)colorpresets.SelectedItem).Preset.Name = presetname.Text;
+			colorpresets.Invalidate();
+		}
+
+		private void presetname_Enter(object sender, EventArgs e)
+		{
+			if(presetname.Text == PresetItem.DEFAULT_NAME) presetname.Text = string.Empty;
+		}
+
+		private void presetcolor_ColorChanged(object sender, EventArgs e)
+		{
+			if(preventchanges || colorpresets.SelectedItem == null) return;
+			((PresetItem)colorpresets.SelectedItem).Color = presetcolor.Color.ToColor();
+			colorpresets.Invalidate();
+		}
+
+		private void flags_OnCheckStateChanged(object sender, EventArgs eventArgs)
+		{
+			if(preventchanges || colorpresets.SelectedItem == null) return;
+			CheckBox cb = (CheckBox)sender;
+			PresetItem item = (PresetItem)colorpresets.SelectedItem;
+			ApplyFlagToPreset(cb.Tag.ToString(), item.Preset, cb.CheckState);
+			ValidatePreset(item);
+		}
+
+		private void useflags_CheckedChanged(object sender, EventArgs e)
+		{
+			if(preventchanges || colorpresets.SelectedItem == null) return;
+			flags.Enabled = useflags.Checked;
+			PresetItem item = (PresetItem)colorpresets.SelectedItem;
+			ApplyFlagsToPreset(flags, item.Preset);
+			ValidatePreset(item);
+		}
+
+		private void useaction_CheckedChanged(object sender, EventArgs e)
+		{
+			if(preventchanges) return;
+			action.Enabled = useaction.Checked;
+			action_ValueChanges(action, EventArgs.Empty);
+		}
+
+		private void action_ValueChanges(object sender, EventArgs e)
+		{
+			if(preventchanges || colorpresets.SelectedItem == null) return;
+			PresetItem item = (PresetItem)colorpresets.SelectedItem;
+			item.Preset.Action = (action.Enabled ? action.Value : 0);
+			ValidatePreset(item);
+		}
+
+		private void useactivation_CheckedChanged(object sender, EventArgs e)
+		{
+			if(preventchanges || colorpresets.SelectedItem == null) return;
+			activation.Enabled = useactivation.Checked;
+			udmfactivates.Enabled = useactivation.Checked;
+			PresetItem item = (PresetItem)colorpresets.SelectedItem;
+
+			if(General.Map.UDMF)
+				ApplyFlagsToPreset(udmfactivates, item.Preset);
+			else
+				item.Preset.Activation = (activation.Enabled ? ((LinedefActivateInfo)activation.SelectedItem).Index : 0);
+
+			ValidatePreset(item);
+		}
+
+		private void activation_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if(preventchanges || colorpresets.SelectedItem == null || activation.SelectedItem == null) return;
+			PresetItem item = (PresetItem)colorpresets.SelectedItem;
+			item.Preset.Activation = ((LinedefActivateInfo)activation.SelectedItem).Index;
+			ValidatePreset(item);
+		}
+
+		#endregion
+
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/LinedefColorPresetsForm.resx b/Source/Core/Windows/LinedefColorPresetsForm.resx
new file mode 100644
index 0000000..19dc0dd
--- /dev/null
+++ b/Source/Core/Windows/LinedefColorPresetsForm.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Windows/LinedefEditForm.Designer.cs b/Source/Core/Windows/LinedefEditForm.Designer.cs
new file mode 100644
index 0000000..a2772db
--- /dev/null
+++ b/Source/Core/Windows/LinedefEditForm.Designer.cs
@@ -0,0 +1,629 @@
+namespace CodeImp.DoomBuilder.Windows
+{
+	partial class LinedefEditForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.components = new System.ComponentModel.Container();
+			System.Windows.Forms.Label label2;
+			System.Windows.Forms.Label label3;
+			System.Windows.Forms.Label label4;
+			System.Windows.Forms.Label label5;
+			System.Windows.Forms.Label label8;
+			System.Windows.Forms.Label label9;
+			System.Windows.Forms.Label label10;
+			System.Windows.Forms.Label label11;
+			System.Windows.Forms.Label label12;
+			System.Windows.Forms.Label activationlabel;
+			this.labelFrontTextureOffset = new System.Windows.Forms.Label();
+			this.labelBackTextureOffset = new System.Windows.Forms.Label();
+			this.cancel = new System.Windows.Forms.Button();
+			this.apply = new System.Windows.Forms.Button();
+			this.actiongroup = new System.Windows.Forms.GroupBox();
+			this.argscontrol = new CodeImp.DoomBuilder.Controls.ArgumentsControl();
+			this.actionhelp = new CodeImp.DoomBuilder.Controls.ActionSpecialHelpButton();
+			this.hexenpanel = new System.Windows.Forms.Panel();
+			this.activation = new System.Windows.Forms.ComboBox();
+			this.action = new CodeImp.DoomBuilder.Controls.ActionSelectorControl();
+			this.browseaction = new System.Windows.Forms.Button();
+			this.flagsgroup = new System.Windows.Forms.GroupBox();
+			this.flags = new CodeImp.DoomBuilder.Controls.CheckboxArrayControl();
+			this.idgroup = new System.Windows.Forms.GroupBox();
+			this.tagSelector = new CodeImp.DoomBuilder.GZBuilder.Controls.TagSelector();
+			this.frontside = new System.Windows.Forms.CheckBox();
+			this.frontgroup = new System.Windows.Forms.GroupBox();
+			this.frontsector = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.frontlow = new CodeImp.DoomBuilder.Controls.TextureSelectorControl();
+			this.frontmid = new CodeImp.DoomBuilder.Controls.TextureSelectorControl();
+			this.fronthigh = new CodeImp.DoomBuilder.Controls.TextureSelectorControl();
+			this.frontTextureOffset = new CodeImp.DoomBuilder.GZBuilder.Controls.PairedIntControl();
+			this.backside = new System.Windows.Forms.CheckBox();
+			this.backgroup = new System.Windows.Forms.GroupBox();
+			this.backsector = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.backlow = new CodeImp.DoomBuilder.Controls.TextureSelectorControl();
+			this.backmid = new CodeImp.DoomBuilder.Controls.TextureSelectorControl();
+			this.backhigh = new CodeImp.DoomBuilder.Controls.TextureSelectorControl();
+			this.backTextureOffset = new CodeImp.DoomBuilder.GZBuilder.Controls.PairedIntControl();
+			this.panel = new System.Windows.Forms.Panel();
+			this.tooltip = new System.Windows.Forms.ToolTip(this.components);
+			label2 = new System.Windows.Forms.Label();
+			label3 = new System.Windows.Forms.Label();
+			label4 = new System.Windows.Forms.Label();
+			label5 = new System.Windows.Forms.Label();
+			label8 = new System.Windows.Forms.Label();
+			label9 = new System.Windows.Forms.Label();
+			label10 = new System.Windows.Forms.Label();
+			label11 = new System.Windows.Forms.Label();
+			label12 = new System.Windows.Forms.Label();
+			activationlabel = new System.Windows.Forms.Label();
+			this.actiongroup.SuspendLayout();
+			this.hexenpanel.SuspendLayout();
+			this.flagsgroup.SuspendLayout();
+			this.idgroup.SuspendLayout();
+			this.frontgroup.SuspendLayout();
+			this.backgroup.SuspendLayout();
+			this.panel.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// label2
+			// 
+			label2.AutoSize = true;
+			label2.Location = new System.Drawing.Point(15, 26);
+			label2.Name = "label2";
+			label2.Size = new System.Drawing.Size(40, 13);
+			label2.TabIndex = 9;
+			label2.Text = "Action:";
+			// 
+			// label3
+			// 
+			label3.Location = new System.Drawing.Point(255, 13);
+			label3.Name = "label3";
+			label3.Size = new System.Drawing.Size(83, 16);
+			label3.TabIndex = 3;
+			label3.Text = "Upper";
+			label3.TextAlign = System.Drawing.ContentAlignment.TopCenter;
+			// 
+			// label4
+			// 
+			label4.Location = new System.Drawing.Point(346, 13);
+			label4.Name = "label4";
+			label4.Size = new System.Drawing.Size(83, 16);
+			label4.TabIndex = 4;
+			label4.Text = "Middle";
+			label4.TextAlign = System.Drawing.ContentAlignment.TopCenter;
+			// 
+			// label5
+			// 
+			label5.Location = new System.Drawing.Point(437, 13);
+			label5.Name = "label5";
+			label5.Size = new System.Drawing.Size(83, 16);
+			label5.TabIndex = 5;
+			label5.Text = "Lower";
+			label5.TextAlign = System.Drawing.ContentAlignment.TopCenter;
+			// 
+			// label8
+			// 
+			label8.Location = new System.Drawing.Point(437, 13);
+			label8.Name = "label8";
+			label8.Size = new System.Drawing.Size(83, 16);
+			label8.TabIndex = 5;
+			label8.Text = "Lower";
+			label8.TextAlign = System.Drawing.ContentAlignment.TopCenter;
+			// 
+			// label9
+			// 
+			label9.Location = new System.Drawing.Point(346, 13);
+			label9.Name = "label9";
+			label9.Size = new System.Drawing.Size(83, 16);
+			label9.TabIndex = 4;
+			label9.Text = "Middle";
+			label9.TextAlign = System.Drawing.ContentAlignment.TopCenter;
+			// 
+			// label10
+			// 
+			label10.Location = new System.Drawing.Point(255, 13);
+			label10.Name = "label10";
+			label10.Size = new System.Drawing.Size(83, 16);
+			label10.TabIndex = 3;
+			label10.Text = "Upper";
+			label10.TextAlign = System.Drawing.ContentAlignment.TopCenter;
+			// 
+			// label11
+			// 
+			label11.Location = new System.Drawing.Point(6, 40);
+			label11.Name = "label11";
+			label11.Size = new System.Drawing.Size(80, 14);
+			label11.TabIndex = 13;
+			label11.Text = "Sector Index:";
+			label11.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// label12
+			// 
+			label12.Location = new System.Drawing.Point(6, 40);
+			label12.Name = "label12";
+			label12.Size = new System.Drawing.Size(80, 14);
+			label12.TabIndex = 16;
+			label12.Text = "Sector Index:";
+			label12.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// activationlabel
+			// 
+			activationlabel.AutoSize = true;
+			activationlabel.Location = new System.Drawing.Point(6, 11);
+			activationlabel.Name = "activationlabel";
+			activationlabel.Size = new System.Drawing.Size(43, 13);
+			activationlabel.TabIndex = 10;
+			activationlabel.Text = "Trigger:";
+			// 
+			// labelFrontTextureOffset
+			// 
+			this.labelFrontTextureOffset.Location = new System.Drawing.Point(6, 70);
+			this.labelFrontTextureOffset.Name = "labelFrontTextureOffset";
+			this.labelFrontTextureOffset.Size = new System.Drawing.Size(80, 14);
+			this.labelFrontTextureOffset.TabIndex = 42;
+			this.labelFrontTextureOffset.Text = "Texture Offset:";
+			this.labelFrontTextureOffset.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// labelBackTextureOffset
+			// 
+			this.labelBackTextureOffset.Location = new System.Drawing.Point(6, 70);
+			this.labelBackTextureOffset.Name = "labelBackTextureOffset";
+			this.labelBackTextureOffset.Size = new System.Drawing.Size(80, 14);
+			this.labelBackTextureOffset.TabIndex = 43;
+			this.labelBackTextureOffset.Text = "Texture Offset:";
+			this.labelBackTextureOffset.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// cancel
+			// 
+			this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.cancel.Location = new System.Drawing.Point(453, 708);
+			this.cancel.Name = "cancel";
+			this.cancel.Size = new System.Drawing.Size(112, 25);
+			this.cancel.TabIndex = 2;
+			this.cancel.Text = "Cancel";
+			this.cancel.UseVisualStyleBackColor = true;
+			this.cancel.Click += new System.EventHandler(this.cancel_Click);
+			// 
+			// apply
+			// 
+			this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.apply.Location = new System.Drawing.Point(335, 708);
+			this.apply.Name = "apply";
+			this.apply.Size = new System.Drawing.Size(112, 25);
+			this.apply.TabIndex = 1;
+			this.apply.Text = "OK";
+			this.apply.UseVisualStyleBackColor = true;
+			this.apply.Click += new System.EventHandler(this.apply_Click);
+			// 
+			// actiongroup
+			// 
+			this.actiongroup.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.actiongroup.Controls.Add(this.argscontrol);
+			this.actiongroup.Controls.Add(this.actionhelp);
+			this.actiongroup.Controls.Add(this.hexenpanel);
+			this.actiongroup.Controls.Add(label2);
+			this.actiongroup.Controls.Add(this.action);
+			this.actiongroup.Controls.Add(this.browseaction);
+			this.actiongroup.Location = new System.Drawing.Point(6, 438);
+			this.actiongroup.Name = "actiongroup";
+			this.actiongroup.Size = new System.Drawing.Size(541, 176);
+			this.actiongroup.TabIndex = 1;
+			this.actiongroup.TabStop = false;
+			this.actiongroup.Text = " Action ";
+			// 
+			// argscontrol
+			// 
+			this.argscontrol.Location = new System.Drawing.Point(9, 52);
+			this.argscontrol.Name = "argscontrol";
+			this.argscontrol.Size = new System.Drawing.Size(526, 76);
+			this.argscontrol.TabIndex = 12;
+			this.argscontrol.Visible = false;
+			// 
+			// actionhelp
+			// 
+			this.actionhelp.Location = new System.Drawing.Point(505, 21);
+			this.actionhelp.Name = "actionhelp";
+			this.actionhelp.Size = new System.Drawing.Size(28, 25);
+			this.actionhelp.TabIndex = 11;
+			// 
+			// hexenpanel
+			// 
+			this.hexenpanel.Controls.Add(this.activation);
+			this.hexenpanel.Controls.Add(activationlabel);
+			this.hexenpanel.Location = new System.Drawing.Point(6, 134);
+			this.hexenpanel.Name = "hexenpanel";
+			this.hexenpanel.Size = new System.Drawing.Size(529, 36);
+			this.hexenpanel.TabIndex = 3;
+			this.hexenpanel.Visible = false;
+			// 
+			// activation
+			// 
+			this.activation.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.activation.FormattingEnabled = true;
+			this.activation.Location = new System.Drawing.Point(56, 7);
+			this.activation.Name = "activation";
+			this.activation.Size = new System.Drawing.Size(470, 21);
+			this.activation.TabIndex = 0;
+			// 
+			// action
+			// 
+			this.action.BackColor = System.Drawing.Color.Transparent;
+			this.action.Cursor = System.Windows.Forms.Cursors.Default;
+			this.action.Empty = false;
+			this.action.GeneralizedCategories = null;
+			this.action.GeneralizedOptions = null;
+			this.action.Location = new System.Drawing.Point(62, 23);
+			this.action.Name = "action";
+			this.action.Size = new System.Drawing.Size(412, 21);
+			this.action.TabIndex = 0;
+			this.action.Value = 402;
+			this.action.ValueChanges += new System.EventHandler(this.action_ValueChanges);
+			// 
+			// browseaction
+			// 
+			this.browseaction.Image = global::CodeImp.DoomBuilder.Properties.Resources.List;
+			this.browseaction.Location = new System.Drawing.Point(476, 21);
+			this.browseaction.Name = "browseaction";
+			this.browseaction.Size = new System.Drawing.Size(28, 25);
+			this.browseaction.TabIndex = 1;
+			this.browseaction.Text = " ";
+			this.tooltip.SetToolTip(this.browseaction, "Browse Action");
+			this.browseaction.UseVisualStyleBackColor = true;
+			this.browseaction.Click += new System.EventHandler(this.browseaction_Click);
+			// 
+			// flagsgroup
+			// 
+			this.flagsgroup.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.flagsgroup.Controls.Add(this.flags);
+			this.flagsgroup.Location = new System.Drawing.Point(6, 314);
+			this.flagsgroup.Name = "flagsgroup";
+			this.flagsgroup.Size = new System.Drawing.Size(541, 118);
+			this.flagsgroup.TabIndex = 0;
+			this.flagsgroup.TabStop = false;
+			this.flagsgroup.Text = " Flags";
+			// 
+			// flags
+			// 
+			this.flags.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.flags.AutoScroll = true;
+			this.flags.Columns = 3;
+			this.flags.Location = new System.Drawing.Point(8, 17);
+			this.flags.Name = "flags";
+			this.flags.Size = new System.Drawing.Size(532, 96);
+			this.flags.TabIndex = 0;
+			this.flags.VerticalSpacing = 1;
+			this.flags.OnValueChanged += new System.EventHandler(this.flags_OnValueChanged);
+			// 
+			// idgroup
+			// 
+			this.idgroup.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.idgroup.Controls.Add(this.tagSelector);
+			this.idgroup.Location = new System.Drawing.Point(6, 620);
+			this.idgroup.Name = "idgroup";
+			this.idgroup.Size = new System.Drawing.Size(541, 58);
+			this.idgroup.TabIndex = 2;
+			this.idgroup.TabStop = false;
+			this.idgroup.Text = " Identification ";
+			// 
+			// tagSelector
+			// 
+			this.tagSelector.Location = new System.Drawing.Point(19, 19);
+			this.tagSelector.Name = "tagSelector";
+			this.tagSelector.Size = new System.Drawing.Size(518, 34);
+			this.tagSelector.TabIndex = 0;
+			// 
+			// frontside
+			// 
+			this.frontside.AutoSize = true;
+			this.frontside.Location = new System.Drawing.Point(17, 4);
+			this.frontside.Name = "frontside";
+			this.frontside.Size = new System.Drawing.Size(74, 17);
+			this.frontside.TabIndex = 0;
+			this.frontside.Text = "Front Side";
+			this.frontside.UseVisualStyleBackColor = true;
+			this.frontside.CheckStateChanged += new System.EventHandler(this.frontside_CheckStateChanged);
+			// 
+			// frontgroup
+			// 
+			this.frontgroup.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.frontgroup.Controls.Add(this.labelFrontTextureOffset);
+			this.frontgroup.Controls.Add(this.frontsector);
+			this.frontgroup.Controls.Add(label11);
+			this.frontgroup.Controls.Add(this.frontlow);
+			this.frontgroup.Controls.Add(this.frontmid);
+			this.frontgroup.Controls.Add(this.fronthigh);
+			this.frontgroup.Controls.Add(this.frontTextureOffset);
+			this.frontgroup.Controls.Add(label5);
+			this.frontgroup.Controls.Add(label4);
+			this.frontgroup.Controls.Add(label3);
+			this.frontgroup.Enabled = false;
+			this.frontgroup.Location = new System.Drawing.Point(6, 6);
+			this.frontgroup.Name = "frontgroup";
+			this.frontgroup.Size = new System.Drawing.Size(541, 148);
+			this.frontgroup.TabIndex = 1;
+			this.frontgroup.TabStop = false;
+			this.frontgroup.Text = "     ";
+			// 
+			// frontsector
+			// 
+			this.frontsector.AllowDecimal = false;
+			this.frontsector.AllowNegative = false;
+			this.frontsector.AllowRelative = false;
+			this.frontsector.ButtonStep = 1;
+			this.frontsector.ButtonStepBig = 10F;
+			this.frontsector.ButtonStepFloat = 1F;
+			this.frontsector.ButtonStepSmall = 0.1F;
+			this.frontsector.ButtonStepsUseModifierKeys = false;
+			this.frontsector.ButtonStepsWrapAround = false;
+			this.frontsector.Location = new System.Drawing.Point(90, 35);
+			this.frontsector.Name = "frontsector";
+			this.frontsector.Size = new System.Drawing.Size(130, 24);
+			this.frontsector.StepValues = null;
+			this.frontsector.TabIndex = 14;
+			// 
+			// frontlow
+			// 
+			this.frontlow.Location = new System.Drawing.Point(437, 32);
+			this.frontlow.MultipleTextures = false;
+			this.frontlow.Name = "frontlow";
+			this.frontlow.Required = false;
+			this.frontlow.Size = new System.Drawing.Size(83, 107);
+			this.frontlow.TabIndex = 6;
+			this.frontlow.TextureName = "";
+			this.frontlow.UsePreviews = true;
+			this.frontlow.OnValueChanged += new System.EventHandler(this.frontlow_OnValueChanged);
+			// 
+			// frontmid
+			// 
+			this.frontmid.Location = new System.Drawing.Point(346, 32);
+			this.frontmid.MultipleTextures = false;
+			this.frontmid.Name = "frontmid";
+			this.frontmid.Required = false;
+			this.frontmid.Size = new System.Drawing.Size(83, 107);
+			this.frontmid.TabIndex = 5;
+			this.frontmid.TextureName = "";
+			this.frontmid.UsePreviews = true;
+			this.frontmid.OnValueChanged += new System.EventHandler(this.frontmid_OnValueChanged);
+			// 
+			// fronthigh
+			// 
+			this.fronthigh.Location = new System.Drawing.Point(255, 32);
+			this.fronthigh.MultipleTextures = false;
+			this.fronthigh.Name = "fronthigh";
+			this.fronthigh.Required = false;
+			this.fronthigh.Size = new System.Drawing.Size(83, 107);
+			this.fronthigh.TabIndex = 4;
+			this.fronthigh.TextureName = "";
+			this.fronthigh.UsePreviews = true;
+			this.fronthigh.OnValueChanged += new System.EventHandler(this.fronthigh_OnValueChanged);
+			// 
+			// frontTextureOffset
+			// 
+			this.frontTextureOffset.ButtonStep = 16;
+			this.frontTextureOffset.ButtonStepBig = 32F;
+			this.frontTextureOffset.ButtonStepSmall = 1F;
+			this.frontTextureOffset.ButtonStepsUseModifierKeys = true;
+			this.frontTextureOffset.DefaultValue = 0;
+			this.frontTextureOffset.Location = new System.Drawing.Point(87, 65);
+			this.frontTextureOffset.Name = "frontTextureOffset";
+			this.frontTextureOffset.Size = new System.Drawing.Size(186, 26);
+			this.frontTextureOffset.TabIndex = 41;
+			this.frontTextureOffset.OnValuesChanged += new System.EventHandler(this.frontTextureOffset_OnValuesChanged);
+			// 
+			// backside
+			// 
+			this.backside.AutoSize = true;
+			this.backside.Location = new System.Drawing.Point(17, 158);
+			this.backside.Name = "backside";
+			this.backside.Size = new System.Drawing.Size(75, 17);
+			this.backside.TabIndex = 0;
+			this.backside.Text = "Back Side";
+			this.backside.UseVisualStyleBackColor = true;
+			this.backside.CheckStateChanged += new System.EventHandler(this.backside_CheckStateChanged);
+			// 
+			// backgroup
+			// 
+			this.backgroup.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.backgroup.Controls.Add(this.labelBackTextureOffset);
+			this.backgroup.Controls.Add(this.backsector);
+			this.backgroup.Controls.Add(label12);
+			this.backgroup.Controls.Add(this.backlow);
+			this.backgroup.Controls.Add(this.backmid);
+			this.backgroup.Controls.Add(this.backhigh);
+			this.backgroup.Controls.Add(this.backTextureOffset);
+			this.backgroup.Controls.Add(label8);
+			this.backgroup.Controls.Add(label9);
+			this.backgroup.Controls.Add(label10);
+			this.backgroup.Enabled = false;
+			this.backgroup.Location = new System.Drawing.Point(6, 160);
+			this.backgroup.Name = "backgroup";
+			this.backgroup.Size = new System.Drawing.Size(541, 148);
+			this.backgroup.TabIndex = 1;
+			this.backgroup.TabStop = false;
+			this.backgroup.Text = "     ";
+			// 
+			// backsector
+			// 
+			this.backsector.AllowDecimal = false;
+			this.backsector.AllowNegative = false;
+			this.backsector.AllowRelative = false;
+			this.backsector.ButtonStep = 1;
+			this.backsector.ButtonStepBig = 10F;
+			this.backsector.ButtonStepFloat = 1F;
+			this.backsector.ButtonStepSmall = 0.1F;
+			this.backsector.ButtonStepsUseModifierKeys = false;
+			this.backsector.ButtonStepsWrapAround = false;
+			this.backsector.Location = new System.Drawing.Point(90, 35);
+			this.backsector.Name = "backsector";
+			this.backsector.Size = new System.Drawing.Size(130, 24);
+			this.backsector.StepValues = null;
+			this.backsector.TabIndex = 17;
+			// 
+			// backlow
+			// 
+			this.backlow.Location = new System.Drawing.Point(437, 32);
+			this.backlow.MultipleTextures = false;
+			this.backlow.Name = "backlow";
+			this.backlow.Required = false;
+			this.backlow.Size = new System.Drawing.Size(83, 107);
+			this.backlow.TabIndex = 6;
+			this.backlow.TextureName = "";
+			this.backlow.UsePreviews = true;
+			this.backlow.OnValueChanged += new System.EventHandler(this.backlow_OnValueChanged);
+			// 
+			// backmid
+			// 
+			this.backmid.Location = new System.Drawing.Point(346, 32);
+			this.backmid.MultipleTextures = false;
+			this.backmid.Name = "backmid";
+			this.backmid.Required = false;
+			this.backmid.Size = new System.Drawing.Size(83, 107);
+			this.backmid.TabIndex = 5;
+			this.backmid.TextureName = "";
+			this.backmid.UsePreviews = true;
+			this.backmid.OnValueChanged += new System.EventHandler(this.backmid_OnValueChanged);
+			// 
+			// backhigh
+			// 
+			this.backhigh.Location = new System.Drawing.Point(255, 32);
+			this.backhigh.MultipleTextures = false;
+			this.backhigh.Name = "backhigh";
+			this.backhigh.Required = false;
+			this.backhigh.Size = new System.Drawing.Size(83, 107);
+			this.backhigh.TabIndex = 4;
+			this.backhigh.TextureName = "";
+			this.backhigh.UsePreviews = true;
+			this.backhigh.OnValueChanged += new System.EventHandler(this.backhigh_OnValueChanged);
+			// 
+			// backTextureOffset
+			// 
+			this.backTextureOffset.ButtonStep = 16;
+			this.backTextureOffset.ButtonStepBig = 32F;
+			this.backTextureOffset.ButtonStepSmall = 1F;
+			this.backTextureOffset.ButtonStepsUseModifierKeys = true;
+			this.backTextureOffset.DefaultValue = 0;
+			this.backTextureOffset.Location = new System.Drawing.Point(87, 65);
+			this.backTextureOffset.Name = "backTextureOffset";
+			this.backTextureOffset.Size = new System.Drawing.Size(186, 26);
+			this.backTextureOffset.TabIndex = 42;
+			this.backTextureOffset.OnValuesChanged += new System.EventHandler(this.backTextureOffset_OnValuesChanged);
+			// 
+			// panel
+			// 
+			this.panel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.panel.BackColor = System.Drawing.SystemColors.Window;
+			this.panel.Controls.Add(this.backside);
+			this.panel.Controls.Add(this.frontside);
+			this.panel.Controls.Add(this.frontgroup);
+			this.panel.Controls.Add(this.backgroup);
+			this.panel.Controls.Add(this.flagsgroup);
+			this.panel.Controls.Add(this.actiongroup);
+			this.panel.Controls.Add(this.idgroup);
+			this.panel.Location = new System.Drawing.Point(12, 12);
+			this.panel.Name = "panel";
+			this.panel.Size = new System.Drawing.Size(553, 686);
+			this.panel.TabIndex = 5;
+			// 
+			// LinedefEditForm
+			// 
+			this.AcceptButton = this.apply;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.CancelButton = this.cancel;
+			this.ClientSize = new System.Drawing.Size(577, 740);
+			this.Controls.Add(this.cancel);
+			this.Controls.Add(this.apply);
+			this.Controls.Add(this.panel);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "LinedefEditForm";
+			this.Opacity = 1;
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Edit Linedef";
+			this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.LinedefEditForm_FormClosing);
+			this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.LinedefEditForm_HelpRequested);
+			this.actiongroup.ResumeLayout(false);
+			this.actiongroup.PerformLayout();
+			this.hexenpanel.ResumeLayout(false);
+			this.hexenpanel.PerformLayout();
+			this.flagsgroup.ResumeLayout(false);
+			this.idgroup.ResumeLayout(false);
+			this.frontgroup.ResumeLayout(false);
+			this.backgroup.ResumeLayout(false);
+			this.panel.ResumeLayout(false);
+			this.panel.PerformLayout();
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Button cancel;
+		private System.Windows.Forms.Button apply;
+		private System.Windows.Forms.GroupBox actiongroup;
+		private System.Windows.Forms.GroupBox flagsgroup;
+		private CodeImp.DoomBuilder.Controls.CheckboxArrayControl flags;
+		private System.Windows.Forms.Button browseaction;
+		private CodeImp.DoomBuilder.Controls.ActionSelectorControl action;
+		private System.Windows.Forms.GroupBox frontgroup;
+		private System.Windows.Forms.CheckBox frontside;
+		private System.Windows.Forms.CheckBox backside;
+		private System.Windows.Forms.GroupBox backgroup;
+		private CodeImp.DoomBuilder.Controls.TextureSelectorControl frontlow;
+		private CodeImp.DoomBuilder.Controls.TextureSelectorControl frontmid;
+		private CodeImp.DoomBuilder.Controls.TextureSelectorControl fronthigh;
+		private CodeImp.DoomBuilder.Controls.TextureSelectorControl backlow;
+		private CodeImp.DoomBuilder.Controls.TextureSelectorControl backmid;
+		private CodeImp.DoomBuilder.Controls.TextureSelectorControl backhigh;
+		private System.Windows.Forms.ComboBox activation;
+		private System.Windows.Forms.Panel hexenpanel;
+		private System.Windows.Forms.GroupBox idgroup;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox frontsector;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox backsector;
+		private CodeImp.DoomBuilder.GZBuilder.Controls.TagSelector tagSelector;
+		private CodeImp.DoomBuilder.GZBuilder.Controls.PairedIntControl frontTextureOffset;
+		private CodeImp.DoomBuilder.GZBuilder.Controls.PairedIntControl backTextureOffset;
+		private System.Windows.Forms.Panel panel;
+		private CodeImp.DoomBuilder.Controls.ActionSpecialHelpButton actionhelp;
+		private System.Windows.Forms.ToolTip tooltip;
+		private System.Windows.Forms.Label labelFrontTextureOffset;
+		private System.Windows.Forms.Label labelBackTextureOffset;
+		private CodeImp.DoomBuilder.Controls.ArgumentsControl argscontrol;
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/LinedefEditForm.cs b/Source/Core/Windows/LinedefEditForm.cs
new file mode 100644
index 0000000..43d4c6e
--- /dev/null
+++ b/Source/Core/Windows/LinedefEditForm.cs
@@ -0,0 +1,818 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Types;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Windows
+{
+	internal partial class LinedefEditForm : DelayedForm
+	{
+		#region ================== Events
+
+		public event EventHandler OnValuesChanged; //mxd
+
+		#endregion
+
+		#region ================== Variables
+
+		private ICollection<Linedef> lines;
+		private List<LinedefProperties> linedefprops; //mxd
+		private bool preventchanges;
+		private bool undocreated; //mxd
+
+		//mxd. Window setup stuff
+		private static Point location = Point.Empty;
+
+		private struct LinedefProperties //mxd
+		{
+			public readonly Dictionary<string, bool> Flags;
+			public readonly SidedefProperties Front;
+			public readonly SidedefProperties Back;
+
+			public LinedefProperties(Linedef line) 
+			{
+				Front = (line.Front != null ? new SidedefProperties(line.Front) : null);
+				Back = (line.Back != null ? new SidedefProperties(line.Back) : null);
+				Flags = line.GetFlags();
+			}
+		}
+
+		private class SidedefProperties //mxd
+		{
+			public readonly int OffsetX;
+			public readonly int OffsetY;
+
+			public readonly string TextureTop;
+			public readonly string TextureMid;
+			public readonly string TextureLow;
+
+			public SidedefProperties(Sidedef side) 
+			{
+				//offset
+				OffsetX = side.OffsetX;
+				OffsetY = side.OffsetY;
+
+				//textures
+				TextureTop = side.HighTexture;
+				TextureMid = side.MiddleTexture;
+				TextureLow = side.LowTexture;
+			}
+		}
+
+		#endregion
+
+		#region ================== Constructor
+
+		public LinedefEditForm()
+		{
+			// Initialize
+			InitializeComponent();
+
+			//mxd. Widow setup
+			if(location != Point.Empty) 
+			{
+				this.StartPosition = FormStartPosition.Manual;
+				this.Location = location;
+			}
+			
+			// Fill flags lists
+			foreach(KeyValuePair<string, string> lf in General.Map.Config.LinedefFlags)
+				flags.Add(lf.Value, lf.Key);
+
+			// Fill actions list
+			action.GeneralizedCategories = General.Map.Config.GenActionCategories;
+			action.AddInfo(General.Map.Config.SortedLinedefActions.ToArray());
+
+			// Fill activations list
+			activation.Items.AddRange(General.Map.Config.LinedefActivates.ToArray());
+			
+			// Initialize image selectors
+			fronthigh.Initialize();
+			frontmid.Initialize();
+			frontlow.Initialize();
+			backhigh.Initialize();
+			backmid.Initialize();
+			backlow.Initialize();
+			
+			// Mixed activations?
+			if(General.Map.FormatInterface.HasPresetActivations)
+				hexenpanel.Visible = true;
+			
+			// Action arguments?
+			if(General.Map.FormatInterface.HasActionArgs) argscontrol.Visible = true;
+			
+			// Arrange panels
+			if(!General.Map.FormatInterface.HasMixedActivations &&
+					!General.Map.FormatInterface.HasActionArgs &&
+					!General.Map.FormatInterface.HasPresetActivations)
+			{
+				actiongroup.Height = argscontrol.Top + argscontrol.Margin.Top; //mxd
+			}
+			
+			// Arrange or hide Identification panel
+			if(General.Map.FormatInterface.HasLinedefTag)
+			{
+				// Match position after the action group
+				idgroup.Top = actiongroup.Bottom + actiongroup.Margin.Bottom + idgroup.Margin.Top;
+				panel.Height = idgroup.Bottom + idgroup.Margin.Bottom * 2;
+			}
+			else
+			{
+				idgroup.Visible = false;
+				panel.Height = actiongroup.Bottom + actiongroup.Margin.Bottom * 2;
+			}
+
+			// Arrange Apply/Cancel buttons
+			apply.Top = panel.Bottom + panel.Margin.Bottom + apply.Margin.Top;
+			cancel.Top = apply.Top;
+
+			// Update window height
+			this.Height = apply.Bottom + apply.Margin.Bottom * 2 + (this.Height - this.ClientRectangle.Height) + 1;
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This sets up the form to edit the given lines
+		public void Setup(ICollection<Linedef> lines)
+		{
+			preventchanges = true;
+			
+			// Keep this list
+			this.lines = lines;
+			if(lines.Count > 1) this.Text = "Edit Linedefs (" + lines.Count + ")";
+			linedefprops = new List<LinedefProperties>();
+			
+			////////////////////////////////////////////////////////////////////////
+			// Set all options to the first linedef properties
+			////////////////////////////////////////////////////////////////////////
+
+			// Get first line
+			Linedef fl = General.GetByIndex(lines, 0);
+			
+			// Flags
+			foreach(CheckBox c in flags.Checkboxes)
+				if(fl.Flags.ContainsKey(c.Tag.ToString())) c.Checked = fl.Flags[c.Tag.ToString()];
+			
+			// Activations
+			foreach(LinedefActivateInfo ai in activation.Items)
+				if((fl.Activate & ai.Index) == ai.Index) activation.SelectedItem = ai;
+
+			// Action/tags
+			action.Value = fl.Action;
+
+			if(General.Map.FormatInterface.HasLinedefTag) //mxd
+			{
+				tagSelector.Setup(UniversalType.LinedefTag);
+				tagSelector.SetTag(fl.Tag);
+			}
+
+			//mxd. Args
+			argscontrol.SetValue(fl, true);
+			
+			// Front side and back side checkboxes
+			frontside.Checked = (fl.Front != null);
+			backside.Checked = (fl.Back != null);
+
+			// Front settings
+			if(fl.Front != null)
+			{
+				fronthigh.TextureName = fl.Front.HighTexture;
+				frontmid.TextureName = fl.Front.MiddleTexture;
+				frontlow.TextureName = fl.Front.LowTexture;
+				fronthigh.Required = fl.Front.HighRequired();
+				frontmid.Required = fl.Front.MiddleRequired();
+				frontlow.Required = fl.Front.LowRequired();
+				frontsector.Text = fl.Front.Sector.Index.ToString();
+				frontTextureOffset.SetValues(fl.Front.OffsetX, fl.Front.OffsetY, true); //mxd
+			}
+
+			// Back settings
+			if(fl.Back != null)
+			{
+				backhigh.TextureName = fl.Back.HighTexture;
+				backmid.TextureName = fl.Back.MiddleTexture;
+				backlow.TextureName = fl.Back.LowTexture;
+				backhigh.Required = fl.Back.HighRequired();
+				backmid.Required = fl.Back.MiddleRequired();
+				backlow.Required = fl.Back.LowRequired();
+				backsector.Text = fl.Back.Sector.Index.ToString();
+				backTextureOffset.SetValues(fl.Back.OffsetX, fl.Back.OffsetY, true); //mxd
+			}
+
+			////////////////////////////////////////////////////////////////////////
+			// Now go for all lines and change the options when a setting is different
+			////////////////////////////////////////////////////////////////////////
+
+			// Go for all lines
+			foreach(Linedef l in lines)
+			{
+				// Flags
+				foreach(CheckBox c in flags.Checkboxes)
+				{
+					if(c.CheckState == CheckState.Indeterminate) continue; //mxd
+					if(l.IsFlagSet(c.Tag.ToString()) != c.Checked) 
+					{
+						c.ThreeState = true;
+						c.CheckState = CheckState.Indeterminate;
+					}
+				}
+
+				// Activations
+				if(activation.Items.Count > 0)
+				{
+					LinedefActivateInfo sai = (activation.Items[0] as LinedefActivateInfo);
+					foreach(LinedefActivateInfo ai in activation.Items)
+						if((l.Activate & ai.Index) == ai.Index) sai = ai;
+					if(sai != activation.SelectedItem) activation.SelectedIndex = -1;
+				}
+
+				// Action/tags
+				if(l.Action != action.Value) action.Empty = true;
+				if(General.Map.FormatInterface.HasLinedefTag && l.Tag != fl.Tag) tagSelector.ClearTag(); //mxd
+
+				//mxd. Arguments
+				argscontrol.SetValue(l, false);
+				
+				// Front side checkbox
+				if((l.Front != null) != frontside.Checked)
+				{
+					frontside.ThreeState = true;
+					frontside.CheckState = CheckState.Indeterminate;
+					frontside.AutoCheck = false;
+				}
+
+				// Back side checkbox
+				if((l.Back != null) != backside.Checked)
+				{
+					backside.ThreeState = true;
+					backside.CheckState = CheckState.Indeterminate;
+					backside.AutoCheck = false;
+				}
+
+				// Front settings
+				if(l.Front != null)
+				{
+					//mxd
+					if(fronthigh.TextureName != l.Front.HighTexture) 
+					{
+						if(!fronthigh.Required && l.Front.HighRequired()) fronthigh.Required = true;
+						fronthigh.MultipleTextures = true; //mxd
+						fronthigh.TextureName = string.Empty;
+					}
+					if(frontmid.TextureName != l.Front.MiddleTexture) 
+					{
+						if(!frontmid.Required && l.Front.MiddleRequired()) frontmid.Required = true;
+						frontmid.MultipleTextures = true; //mxd
+						frontmid.TextureName = string.Empty;
+					}
+					if(frontlow.TextureName != l.Front.LowTexture) 
+					{
+						if(!frontlow.Required && l.Front.LowRequired()) frontlow.Required = true;
+						frontlow.MultipleTextures = true; //mxd
+						frontlow.TextureName = string.Empty;
+					}
+					if(frontsector.Text != l.Front.Sector.Index.ToString()) frontsector.Text = string.Empty;
+
+					frontTextureOffset.SetValues(l.Front.OffsetX, l.Front.OffsetY, false); //mxd
+				}
+
+				// Back settings
+				if(l.Back != null)
+				{
+					//mxd
+					if(backhigh.TextureName != l.Back.HighTexture) 
+					{
+						if(!backhigh.Required && l.Back.HighRequired()) backhigh.Required = true;
+						backhigh.MultipleTextures = true; //mxd
+						backhigh.TextureName = string.Empty;
+					}
+					if(backmid.TextureName != l.Back.MiddleTexture) 
+					{
+						if(!backmid.Required && l.Back.MiddleRequired()) backmid.Required = true;
+						backmid.MultipleTextures = true; //mxd
+						backmid.TextureName = string.Empty;
+					}
+					if(backlow.TextureName != l.Back.LowTexture) 
+					{
+						if(!backlow.Required && l.Back.LowRequired()) backlow.Required = true;
+						backlow.MultipleTextures = true; //mxd
+						backlow.TextureName = string.Empty;
+					}
+					if(backsector.Text != l.Back.Sector.Index.ToString()) backsector.Text = string.Empty;
+
+					backTextureOffset.SetValues(l.Back.OffsetX, l.Back.OffsetY, false); //mxd
+				}
+
+				//mxd
+				linedefprops.Add(new LinedefProperties(l));
+			}
+			
+			// Refresh controls so that they show their image
+			backhigh.Refresh();
+			backmid.Refresh();
+			backlow.Refresh();
+			fronthigh.Refresh();
+			frontmid.Refresh();
+			frontlow.Refresh();
+
+			preventchanges = false;
+
+			argscontrol.UpdateScriptControls(); //mxd
+			actionhelp.UpdateAction(action.GetValue()); //mxd
+
+			//mxd. Update some labels
+			if(frontside.CheckState != CheckState.Unchecked) 
+			{
+				labelFrontTextureOffset.Enabled = frontTextureOffset.NonDefaultValue;
+			}
+			if(backside.CheckState != CheckState.Unchecked) 
+			{
+				labelBackTextureOffset.Enabled = backTextureOffset.NonDefaultValue;
+			}
+		}
+
+		//mxd
+		private void MakeUndo() 
+		{
+			if(undocreated) return;
+			undocreated = true;
+
+			//mxd. Make undo
+			General.Map.UndoRedo.CreateUndo("Edit " + (lines.Count > 1 ? lines.Count + " linedefs" : "linedef"));
+		}
+
+		#endregion
+
+		#region ================== Events
+
+		// Apply clicked
+		private void apply_Click(object sender, EventArgs e)
+		{
+			// Verify the tag
+			if(General.Map.FormatInterface.HasLinedefTag)
+			{
+				tagSelector.ValidateTag(); //mxd
+				if(((tagSelector.GetTag(0) < General.Map.FormatInterface.MinTag) || (tagSelector.GetTag(0) > General.Map.FormatInterface.MaxTag))) 
+				{
+					General.ShowWarningMessage("Linedef tag must be between " + General.Map.FormatInterface.MinTag + " and " + General.Map.FormatInterface.MaxTag + ".", MessageBoxButtons.OK);
+					return;
+				}
+			}
+			
+			// Verify the action
+			if((action.Value < General.Map.FormatInterface.MinAction) || (action.Value > General.Map.FormatInterface.MaxAction))
+			{
+				General.ShowWarningMessage("Linedef action must be between " + General.Map.FormatInterface.MinAction + " and " + General.Map.FormatInterface.MaxAction + ".", MessageBoxButtons.OK);
+				return;
+			}
+
+			MakeUndo(); //mxd
+			
+			// Go for all the lines
+			int tagoffset = 0; //mxd
+			foreach(Linedef l in lines)
+			{
+				// Apply chosen activation flag
+				if(activation.SelectedIndex > -1)
+					l.Activate = (activation.SelectedItem as LinedefActivateInfo).Index;
+				
+				// Action/tags
+				l.Tag = General.Clamp(tagSelector.GetSmartTag(l.Tag, tagoffset++), General.Map.FormatInterface.MinTag, General.Map.FormatInterface.MaxTag); //mxd
+				if(!action.Empty) l.Action = action.Value;
+
+				//mxd. Apply args
+				argscontrol.Apply(l);
+				
+				// Remove front side?
+				if((l.Front != null) && (frontside.CheckState == CheckState.Unchecked))
+				{
+					l.Front.Dispose();
+				}
+				// Create or modify front side?
+				else if(frontside.CheckState == CheckState.Checked)
+				{
+					// Make sure we have a valid sector (make a new one if needed)
+					int index = (l.Front != null ? l.Front.Sector.Index : -1);
+					index = frontsector.GetResult(index);
+					if((index > -1) && (index < General.Map.Map.Sectors.Count))
+					{
+						Sector s = (General.Map.Map.GetSectorByIndex(index) ?? General.Map.Map.CreateSector());
+						if(s != null)
+						{
+							// Create new sidedef?
+							if(l.Front == null) General.Map.Map.CreateSidedef(l, true, s);
+
+							// Change sector?
+							if(l.Front != null && l.Front.Sector != s) l.Front.SetSector(s);
+						}
+					}
+				}
+
+				// Remove back side?
+				if((l.Back != null) && (backside.CheckState == CheckState.Unchecked))
+				{
+					l.Back.Dispose();
+				}
+				// Create or modify back side?
+				else if(backside.CheckState == CheckState.Checked)
+				{
+					// Make sure we have a valid sector (make a new one if needed)
+					int index = (l.Back != null ? l.Back.Sector.Index : -1);
+					index = backsector.GetResult(index);
+					if((index > -1) && (index < General.Map.Map.Sectors.Count))
+					{
+						Sector s = (General.Map.Map.GetSectorByIndex(index) ?? General.Map.Map.CreateSector());
+						if(s != null)
+						{
+							// Create new sidedef?
+							if(l.Back == null) General.Map.Map.CreateSidedef(l, false, s);
+							
+							// Change sector?
+							if(l.Back != null && l.Back.Sector != s) l.Back.SetSector(s);
+						}
+					}
+				}
+			}
+
+			// Update the used textures
+			General.Map.Data.UpdateUsedTextures();
+			
+			// Done
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null)	OnValuesChanged(this, EventArgs.Empty); //mxd
+			this.DialogResult = DialogResult.OK;
+			this.Close();
+		}
+
+		// Cancel clicked
+		private void cancel_Click(object sender, EventArgs e)
+		{
+			//mxd. Let's pretend nothing of this really happened...
+			if(undocreated) General.Map.UndoRedo.WithdrawUndo();
+			
+			// Be gone
+			this.DialogResult = DialogResult.Cancel;
+			this.Close();
+		}
+
+		// Front side (un)checked
+		private void frontside_CheckStateChanged(object sender, EventArgs e) 
+		{
+			// Enable/disable panel
+			// NOTE: Also enabled when checkbox is grayed!
+			frontgroup.Enabled = (frontside.CheckState != CheckState.Unchecked);
+		}
+
+		// Back side (un)checked
+		private void backside_CheckStateChanged(object sender, EventArgs e) 
+		{
+			// Enable/disable panel
+			// NOTE: Also enabled when checkbox is grayed!
+			backgroup.Enabled = (backside.CheckState != CheckState.Unchecked);
+		}
+
+		// Action changes
+		private void action_ValueChanges(object sender, EventArgs e)
+		{
+			int showaction = 0;
+			
+			// Only when line type is known
+			if(General.Map.Config.LinedefActions.ContainsKey(action.Value)) showaction = action.Value;
+			
+			//mxd. Change the argument descriptions
+			argscontrol.UpdateAction(showaction, preventchanges);
+
+			if(!preventchanges) 
+			{
+				MakeUndo(); //mxd
+
+				//mxd. Update what must be updated
+				argscontrol.UpdateScriptControls();
+				actionhelp.UpdateAction(showaction);
+			} 
+		}
+
+		// Browse Action clicked
+		private void browseaction_Click(object sender, EventArgs e)
+		{
+			action.Value = ActionBrowserForm.BrowseAction(this, action.Value);
+		}
+
+		//mxd. Store window location
+		private void LinedefEditForm_FormClosing(object sender, FormClosingEventArgs e) 
+		{
+			location = this.Location;
+		}
+
+		// Help!
+		private void LinedefEditForm_HelpRequested(object sender, HelpEventArgs hlpevent)
+		{
+			General.ShowHelp("w_linedefedit.html");
+			hlpevent.Handled = true;
+		}
+
+		#endregion
+
+		#region ================== Linedef realtime events (mxd)
+
+		private void flags_OnValueChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+			int i = 0;
+
+			foreach(Linedef l in lines) 
+			{
+				// Apply all flags
+				foreach(CheckBox c in flags.Checkboxes) 
+				{
+					if(c.CheckState == CheckState.Checked)
+						l.SetFlag(c.Tag.ToString(), true);
+					else if(c.CheckState == CheckState.Unchecked)
+						l.SetFlag(c.Tag.ToString(), false);
+					else if(linedefprops[i].Flags.ContainsKey(c.Tag.ToString()))
+						l.SetFlag(c.Tag.ToString(), linedefprops[i].Flags[c.Tag.ToString()]);
+					else //linedefs created in the editor have empty Flags by default
+						l.SetFlag(c.Tag.ToString(), false);
+				}
+
+				i++;
+			}
+			
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null)	OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		#endregion
+
+		#region ================== Sidedef reltime events (mxd)
+
+		private void fronthigh_OnValueChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+
+			//restore values
+			if(string.IsNullOrEmpty(fronthigh.TextureName)) 
+			{
+				int i = 0;
+
+				foreach(Linedef l in lines) 
+				{
+					if(l.Front != null) l.Front.SetTextureHigh(linedefprops[i].Front != null ? linedefprops[i].Front.TextureTop : "-");
+					i++;
+				}
+			
+			} 
+			else //update values
+			{
+				foreach(Linedef l in lines) 
+					if(l.Front != null)	l.Front.SetTextureHigh(fronthigh.GetResult(l.Front.HighTexture));
+			}
+
+			// Update the used textures
+			General.Map.Data.UpdateUsedTextures();
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void frontmid_OnValueChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+
+			//restore values
+			if(string.IsNullOrEmpty(frontmid.TextureName)) 
+			{
+				int i = 0;
+
+				foreach(Linedef l in lines) 
+				{
+					if(l.Front != null) l.Front.SetTextureMid(linedefprops[i].Front != null ? linedefprops[i].Front.TextureMid : "-");
+					i++;
+				}
+			
+			} 
+			else //update values
+			{
+				foreach(Linedef l in lines) 
+					if(l.Front != null)	l.Front.SetTextureMid(frontmid.GetResult(l.Front.MiddleTexture));
+			}
+
+			// Update the used textures
+			General.Map.Data.UpdateUsedTextures();
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void frontlow_OnValueChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+
+			//restore values
+			if(string.IsNullOrEmpty(frontlow.TextureName)) 
+			{
+				int i = 0;
+
+				foreach(Linedef l in lines) 
+				{
+					if(l.Front != null) l.Front.SetTextureLow(linedefprops[i].Front != null ? linedefprops[i].Front.TextureLow : "-");
+					i++;
+				}
+			
+			} 
+			else //update values
+			{
+				foreach(Linedef l in lines)
+					if(l.Front != null) l.Front.SetTextureLow(frontlow.GetResult(l.Front.LowTexture));
+			}
+
+			// Update the used textures
+			General.Map.Data.UpdateUsedTextures();
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void backhigh_OnValueChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+
+			//restore values
+			if(string.IsNullOrEmpty(backhigh.TextureName)) 
+			{
+				int i = 0;
+
+				foreach(Linedef l in lines) 
+				{
+					if(l.Back != null) l.Back.SetTextureHigh(linedefprops[i].Back != null ? linedefprops[i].Back.TextureTop : "-");
+					i++;
+				}
+			
+			} 
+			else //update values
+			{
+				foreach(Linedef l in lines)
+					if(l.Back != null) l.Back.SetTextureHigh(backhigh.GetResult(l.Back.HighTexture));
+			}
+
+			// Update the used textures
+			General.Map.Data.UpdateUsedTextures();
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void backmid_OnValueChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+
+			//restore values
+			if(string.IsNullOrEmpty(backmid.TextureName)) 
+			{
+				int i = 0;
+
+				foreach(Linedef l in lines) 
+				{
+					if(l.Back != null) l.Back.SetTextureMid(linedefprops[i].Back != null ? linedefprops[i].Back.TextureMid : "-");
+					i++;
+				}
+			
+			} 
+			else //update values
+			{
+				foreach(Linedef l in lines)
+					if(l.Back != null) l.Back.SetTextureMid(backmid.GetResult(l.Back.MiddleTexture));
+			}
+
+			// Update the used textures
+			General.Map.Data.UpdateUsedTextures();
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void backlow_OnValueChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+
+			//restore values
+			if(string.IsNullOrEmpty(backlow.TextureName)) 
+			{
+				int i = 0;
+
+				foreach(Linedef l in lines) 
+				{
+					if(l.Back != null) l.Back.SetTextureLow(linedefprops[i].Back != null ? linedefprops[i].Back.TextureLow : "-");
+					i++;
+				}
+			
+			} 
+			else //update values 
+			{
+				foreach(Linedef l in lines)
+					if(l.Back != null) l.Back.SetTextureLow(backlow.GetResult(l.Back.LowTexture));
+			}
+
+			// Update the used textures
+			General.Map.Data.UpdateUsedTextures();
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void frontTextureOffset_OnValuesChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+			int i = 0;
+
+			foreach(Linedef l in lines) 
+			{
+				if(l.Front != null) 
+				{
+					if(linedefprops[i].Front != null) 
+					{
+						l.Front.OffsetX = frontTextureOffset.GetValue1(linedefprops[i].Front.OffsetX);
+						l.Front.OffsetY = frontTextureOffset.GetValue2(linedefprops[i].Front.OffsetY);
+					} 
+					else 
+					{
+						l.Front.OffsetX = frontTextureOffset.GetValue1(0);
+						l.Front.OffsetY = frontTextureOffset.GetValue2(0);
+					}
+				}
+
+				i++;
+			}
+
+			General.Map.IsChanged = true;
+			labelFrontTextureOffset.Enabled = frontTextureOffset.NonDefaultValue;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void backTextureOffset_OnValuesChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+			int i = 0;
+
+			foreach(Linedef l in lines) 
+			{
+				if(l.Back != null) 
+				{
+					if(linedefprops[i].Back != null) 
+					{
+						l.Back.OffsetX = backTextureOffset.GetValue1(linedefprops[i].Back.OffsetX);
+						l.Back.OffsetY = backTextureOffset.GetValue2(linedefprops[i].Back.OffsetY);
+					} 
+					else
+					{
+						l.Back.OffsetX = backTextureOffset.GetValue1(0);
+						l.Back.OffsetY = backTextureOffset.GetValue2(0);
+					}
+				}
+
+				i++;
+			}
+			
+			General.Map.IsChanged = true;
+			labelBackTextureOffset.Enabled = backTextureOffset.NonDefaultValue;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		#endregion
+
+	}
+}
diff --git a/Source/Core/Windows/LinedefEditForm.resx b/Source/Core/Windows/LinedefEditForm.resx
new file mode 100644
index 0000000..302cc54
--- /dev/null
+++ b/Source/Core/Windows/LinedefEditForm.resx
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="label2.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label3.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label4.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label5.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label8.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label9.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label10.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label11.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label12.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="activationlabel.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Windows/LinedefEditFormUDMF.Designer.cs b/Source/Core/Windows/LinedefEditFormUDMF.Designer.cs
new file mode 100644
index 0000000..1492761
--- /dev/null
+++ b/Source/Core/Windows/LinedefEditFormUDMF.Designer.cs
@@ -0,0 +1,1521 @@
+namespace CodeImp.DoomBuilder.Windows
+{
+	partial class LinedefEditFormUDMF
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.components = new System.ComponentModel.Container();
+			System.Windows.Forms.Label label2;
+			System.Windows.Forms.Label label11;
+			System.Windows.Forms.Label label12;
+			System.Windows.Forms.Label label6;
+			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LinedefEditFormUDMF));
+			this.labelrenderstyle = new System.Windows.Forms.Label();
+			this.labellockpick = new System.Windows.Forms.Label();
+			this.labelLightFront = new System.Windows.Forms.Label();
+			this.cancel = new System.Windows.Forms.Button();
+			this.apply = new System.Windows.Forms.Button();
+			this.actiongroup = new System.Windows.Forms.GroupBox();
+			this.argscontrol = new CodeImp.DoomBuilder.Controls.ArgumentsControl();
+			this.actionhelp = new CodeImp.DoomBuilder.Controls.ActionSpecialHelpButton();
+			this.action = new CodeImp.DoomBuilder.Controls.ActionSelectorControl();
+			this.browseaction = new System.Windows.Forms.Button();
+			this.udmfactivates = new CodeImp.DoomBuilder.Controls.CheckboxArrayControl();
+			this.flagsgroup = new System.Windows.Forms.GroupBox();
+			this.flags = new CodeImp.DoomBuilder.Controls.CheckboxArrayControl();
+			this.tabs = new System.Windows.Forms.TabControl();
+			this.tabproperties = new System.Windows.Forms.TabPage();
+			this.groupsettings = new System.Windows.Forms.GroupBox();
+			this.lockpick = new System.Windows.Forms.ComboBox();
+			this.alpha = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.renderStyle = new System.Windows.Forms.ComboBox();
+			this.activationGroup = new System.Windows.Forms.GroupBox();
+			this.missingactivation = new System.Windows.Forms.PictureBox();
+			this.idgroup = new System.Windows.Forms.GroupBox();
+			this.tagsselector = new CodeImp.DoomBuilder.GZBuilder.Controls.TagsSelector();
+			this.tabfront = new System.Windows.Forms.TabPage();
+			this.frontside = new System.Windows.Forms.CheckBox();
+			this.frontgroup = new System.Windows.Forms.GroupBox();
+			this.frontflagsgroup = new System.Windows.Forms.GroupBox();
+			this.flagsFront = new CodeImp.DoomBuilder.Controls.CheckboxArrayControl();
+			this.frontscalegroup = new System.Windows.Forms.GroupBox();
+			this.labelFrontScaleBottom = new System.Windows.Forms.Label();
+			this.labelFrontScaleMid = new System.Windows.Forms.Label();
+			this.labelFrontScaleTop = new System.Windows.Forms.Label();
+			this.pfcFrontScaleTop = new CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl();
+			this.pfcFrontScaleBottom = new CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl();
+			this.pfcFrontScaleMid = new CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl();
+			this.groupBox6 = new System.Windows.Forms.GroupBox();
+			this.labelFrontTextureOffset = new System.Windows.Forms.Label();
+			this.labelFrontOffsetBottom = new System.Windows.Forms.Label();
+			this.frontTextureOffset = new CodeImp.DoomBuilder.GZBuilder.Controls.PairedIntControl();
+			this.labelFrontOffsetMid = new System.Windows.Forms.Label();
+			this.pfcFrontOffsetTop = new CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl();
+			this.labelFrontOffsetTop = new System.Windows.Forms.Label();
+			this.pfcFrontOffsetMid = new CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl();
+			this.pfcFrontOffsetBottom = new CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl();
+			this.groupBox5 = new System.Windows.Forms.GroupBox();
+			this.resetfrontlight = new System.Windows.Forms.Button();
+			this.frontsector = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.customfrontbutton = new System.Windows.Forms.Button();
+			this.lightFront = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.cbLightAbsoluteFront = new System.Windows.Forms.CheckBox();
+			this.frontlow = new CodeImp.DoomBuilder.Controls.TextureSelectorControl();
+			this.frontmid = new CodeImp.DoomBuilder.Controls.TextureSelectorControl();
+			this.fronthigh = new CodeImp.DoomBuilder.Controls.TextureSelectorControl();
+			this.tabback = new System.Windows.Forms.TabPage();
+			this.backside = new System.Windows.Forms.CheckBox();
+			this.backgroup = new System.Windows.Forms.GroupBox();
+			this.groupBox4 = new System.Windows.Forms.GroupBox();
+			this.resetbacklight = new System.Windows.Forms.Button();
+			this.backsector = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.custombackbutton = new System.Windows.Forms.Button();
+			this.lightBack = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.labelLightBack = new System.Windows.Forms.Label();
+			this.cbLightAbsoluteBack = new System.Windows.Forms.CheckBox();
+			this.backflagsgroup = new System.Windows.Forms.GroupBox();
+			this.flagsBack = new CodeImp.DoomBuilder.Controls.CheckboxArrayControl();
+			this.backscalegroup = new System.Windows.Forms.GroupBox();
+			this.labelBackScaleBottom = new System.Windows.Forms.Label();
+			this.labelBackScaleMid = new System.Windows.Forms.Label();
+			this.labelBackScaleTop = new System.Windows.Forms.Label();
+			this.pfcBackScaleTop = new CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl();
+			this.pfcBackScaleBottom = new CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl();
+			this.pfcBackScaleMid = new CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl();
+			this.groupBox1 = new System.Windows.Forms.GroupBox();
+			this.labelBackTextureOffset = new System.Windows.Forms.Label();
+			this.labelBackOffsetBottom = new System.Windows.Forms.Label();
+			this.labelBackOffsetMid = new System.Windows.Forms.Label();
+			this.labelBackOffsetTop = new System.Windows.Forms.Label();
+			this.pfcBackOffsetTop = new CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl();
+			this.pfcBackOffsetMid = new CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl();
+			this.pfcBackOffsetBottom = new CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl();
+			this.backTextureOffset = new CodeImp.DoomBuilder.GZBuilder.Controls.PairedIntControl();
+			this.backlow = new CodeImp.DoomBuilder.Controls.TextureSelectorControl();
+			this.backmid = new CodeImp.DoomBuilder.Controls.TextureSelectorControl();
+			this.backhigh = new CodeImp.DoomBuilder.Controls.TextureSelectorControl();
+			this.tabcomment = new System.Windows.Forms.TabPage();
+			this.commenteditor = new CodeImp.DoomBuilder.Controls.CommentEditor();
+			this.tabcustom = new System.Windows.Forms.TabPage();
+			this.fieldslist = new CodeImp.DoomBuilder.Controls.FieldsEditorControl();
+			this.imagelist = new System.Windows.Forms.ImageList(this.components);
+			this.tooltip = new System.Windows.Forms.ToolTip(this.components);
+			label2 = new System.Windows.Forms.Label();
+			label11 = new System.Windows.Forms.Label();
+			label12 = new System.Windows.Forms.Label();
+			label6 = new System.Windows.Forms.Label();
+			this.actiongroup.SuspendLayout();
+			this.flagsgroup.SuspendLayout();
+			this.tabs.SuspendLayout();
+			this.tabproperties.SuspendLayout();
+			this.groupsettings.SuspendLayout();
+			this.activationGroup.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.missingactivation)).BeginInit();
+			this.idgroup.SuspendLayout();
+			this.tabfront.SuspendLayout();
+			this.frontgroup.SuspendLayout();
+			this.frontflagsgroup.SuspendLayout();
+			this.frontscalegroup.SuspendLayout();
+			this.groupBox6.SuspendLayout();
+			this.groupBox5.SuspendLayout();
+			this.tabback.SuspendLayout();
+			this.backgroup.SuspendLayout();
+			this.groupBox4.SuspendLayout();
+			this.backflagsgroup.SuspendLayout();
+			this.backscalegroup.SuspendLayout();
+			this.groupBox1.SuspendLayout();
+			this.tabcomment.SuspendLayout();
+			this.tabcustom.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// label2
+			// 
+			label2.AutoSize = true;
+			label2.Location = new System.Drawing.Point(15, 22);
+			label2.Name = "label2";
+			label2.Size = new System.Drawing.Size(40, 13);
+			label2.TabIndex = 9;
+			label2.Text = "Action:";
+			// 
+			// label11
+			// 
+			label11.Location = new System.Drawing.Point(12, 23);
+			label11.Name = "label11";
+			label11.Size = new System.Drawing.Size(80, 14);
+			label11.TabIndex = 13;
+			label11.Text = "Sector Index:";
+			label11.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// label12
+			// 
+			label12.Location = new System.Drawing.Point(12, 23);
+			label12.Name = "label12";
+			label12.Size = new System.Drawing.Size(80, 14);
+			label12.TabIndex = 16;
+			label12.Text = "Sector Index:";
+			label12.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// label6
+			// 
+			label6.AutoSize = true;
+			label6.Location = new System.Drawing.Point(199, 21);
+			label6.Name = "label6";
+			label6.Size = new System.Drawing.Size(37, 13);
+			label6.TabIndex = 17;
+			label6.Text = "Alpha:";
+			// 
+			// labelrenderstyle
+			// 
+			this.labelrenderstyle.AutoSize = true;
+			this.labelrenderstyle.Location = new System.Drawing.Point(15, 21);
+			this.labelrenderstyle.Name = "labelrenderstyle";
+			this.labelrenderstyle.Size = new System.Drawing.Size(69, 13);
+			this.labelrenderstyle.TabIndex = 11;
+			this.labelrenderstyle.Text = "Render style:";
+			// 
+			// labellockpick
+			// 
+			this.labellockpick.AutoSize = true;
+			this.labellockpick.Location = new System.Drawing.Point(330, 21);
+			this.labellockpick.Name = "labellockpick";
+			this.labellockpick.Size = new System.Drawing.Size(72, 13);
+			this.labellockpick.TabIndex = 15;
+			this.labellockpick.Text = "Lock number:";
+			// 
+			// labelLightFront
+			// 
+			this.labelLightFront.Location = new System.Drawing.Point(12, 53);
+			this.labelLightFront.Name = "labelLightFront";
+			this.labelLightFront.Size = new System.Drawing.Size(80, 14);
+			this.labelLightFront.TabIndex = 25;
+			this.labelLightFront.Tag = "";
+			this.labelLightFront.Text = "Brightness:";
+			this.labelLightFront.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// cancel
+			// 
+			this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.cancel.Location = new System.Drawing.Point(453, 665);
+			this.cancel.Name = "cancel";
+			this.cancel.Size = new System.Drawing.Size(112, 25);
+			this.cancel.TabIndex = 2;
+			this.cancel.Text = "Cancel";
+			this.cancel.UseVisualStyleBackColor = true;
+			this.cancel.Click += new System.EventHandler(this.cancel_Click);
+			// 
+			// apply
+			// 
+			this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.apply.Location = new System.Drawing.Point(335, 665);
+			this.apply.Name = "apply";
+			this.apply.Size = new System.Drawing.Size(112, 25);
+			this.apply.TabIndex = 1;
+			this.apply.Text = "OK";
+			this.apply.UseVisualStyleBackColor = true;
+			this.apply.Click += new System.EventHandler(this.apply_Click);
+			// 
+			// actiongroup
+			// 
+			this.actiongroup.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.actiongroup.Controls.Add(this.argscontrol);
+			this.actiongroup.Controls.Add(this.actionhelp);
+			this.actiongroup.Controls.Add(label2);
+			this.actiongroup.Controls.Add(this.action);
+			this.actiongroup.Controls.Add(this.browseaction);
+			this.actiongroup.Location = new System.Drawing.Point(8, 245);
+			this.actiongroup.Name = "actiongroup";
+			this.actiongroup.Size = new System.Drawing.Size(533, 126);
+			this.actiongroup.TabIndex = 1;
+			this.actiongroup.TabStop = false;
+			this.actiongroup.Text = " Action ";
+			// 
+			// argscontrol
+			// 
+			this.argscontrol.Location = new System.Drawing.Point(6, 44);
+			this.argscontrol.Name = "argscontrol";
+			this.argscontrol.Size = new System.Drawing.Size(521, 80);
+			this.argscontrol.TabIndex = 11;
+			// 
+			// actionhelp
+			// 
+			this.actionhelp.Location = new System.Drawing.Point(497, 17);
+			this.actionhelp.Name = "actionhelp";
+			this.actionhelp.Size = new System.Drawing.Size(28, 25);
+			this.actionhelp.TabIndex = 10;
+			// 
+			// action
+			// 
+			this.action.BackColor = System.Drawing.Color.Transparent;
+			this.action.Cursor = System.Windows.Forms.Cursors.Default;
+			this.action.Empty = false;
+			this.action.GeneralizedCategories = null;
+			this.action.GeneralizedOptions = null;
+			this.action.Location = new System.Drawing.Point(62, 19);
+			this.action.Name = "action";
+			this.action.Size = new System.Drawing.Size(402, 21);
+			this.action.TabIndex = 0;
+			this.action.Value = 402;
+			this.action.ValueChanges += new System.EventHandler(this.action_ValueChanges);
+			// 
+			// browseaction
+			// 
+			this.browseaction.Image = global::CodeImp.DoomBuilder.Properties.Resources.List;
+			this.browseaction.Location = new System.Drawing.Point(467, 17);
+			this.browseaction.Name = "browseaction";
+			this.browseaction.Size = new System.Drawing.Size(28, 25);
+			this.browseaction.TabIndex = 1;
+			this.tooltip.SetToolTip(this.browseaction, "Browse Action");
+			this.browseaction.UseVisualStyleBackColor = true;
+			this.browseaction.Click += new System.EventHandler(this.browseaction_Click);
+			// 
+			// udmfactivates
+			// 
+			this.udmfactivates.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.udmfactivates.AutoScroll = true;
+			this.udmfactivates.Columns = 2;
+			this.udmfactivates.Location = new System.Drawing.Point(18, 17);
+			this.udmfactivates.Name = "udmfactivates";
+			this.udmfactivates.Size = new System.Drawing.Size(509, 130);
+			this.udmfactivates.TabIndex = 0;
+			this.udmfactivates.VerticalSpacing = 0;
+			this.udmfactivates.OnValueChanged += new System.EventHandler(this.udmfactivates_OnValueChanged);
+			// 
+			// flagsgroup
+			// 
+			this.flagsgroup.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.flagsgroup.Controls.Add(this.flags);
+			this.flagsgroup.Location = new System.Drawing.Point(8, 3);
+			this.flagsgroup.Name = "flagsgroup";
+			this.flagsgroup.Size = new System.Drawing.Size(533, 184);
+			this.flagsgroup.TabIndex = 0;
+			this.flagsgroup.TabStop = false;
+			this.flagsgroup.Text = " Flags";
+			// 
+			// flags
+			// 
+			this.flags.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.flags.AutoScroll = true;
+			this.flags.Columns = 3;
+			this.flags.Location = new System.Drawing.Point(18, 15);
+			this.flags.Name = "flags";
+			this.flags.Size = new System.Drawing.Size(509, 162);
+			this.flags.TabIndex = 0;
+			this.flags.VerticalSpacing = 0;
+			this.flags.OnValueChanged += new System.EventHandler(this.flags_OnValueChanged);
+			// 
+			// tabs
+			// 
+			this.tabs.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.tabs.Controls.Add(this.tabproperties);
+			this.tabs.Controls.Add(this.tabfront);
+			this.tabs.Controls.Add(this.tabback);
+			this.tabs.Controls.Add(this.tabcomment);
+			this.tabs.Controls.Add(this.tabcustom);
+			this.tabs.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.tabs.ImageList = this.imagelist;
+			this.tabs.Location = new System.Drawing.Point(10, 10);
+			this.tabs.Margin = new System.Windows.Forms.Padding(1);
+			this.tabs.Name = "tabs";
+			this.tabs.Padding = new System.Drawing.Point(12, 3);
+			this.tabs.SelectedIndex = 0;
+			this.tabs.Size = new System.Drawing.Size(557, 648);
+			this.tabs.TabIndex = 0;
+			// 
+			// tabproperties
+			// 
+			this.tabproperties.Controls.Add(this.flagsgroup);
+			this.tabproperties.Controls.Add(this.groupsettings);
+			this.tabproperties.Controls.Add(this.actiongroup);
+			this.tabproperties.Controls.Add(this.activationGroup);
+			this.tabproperties.Controls.Add(this.idgroup);
+			this.tabproperties.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.tabproperties.Location = new System.Drawing.Point(4, 23);
+			this.tabproperties.Name = "tabproperties";
+			this.tabproperties.Padding = new System.Windows.Forms.Padding(5);
+			this.tabproperties.Size = new System.Drawing.Size(549, 621);
+			this.tabproperties.TabIndex = 0;
+			this.tabproperties.Text = " Properties ";
+			this.tabproperties.UseVisualStyleBackColor = true;
+			// 
+			// groupsettings
+			// 
+			this.groupsettings.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.groupsettings.Controls.Add(this.lockpick);
+			this.groupsettings.Controls.Add(this.alpha);
+			this.groupsettings.Controls.Add(label6);
+			this.groupsettings.Controls.Add(this.labellockpick);
+			this.groupsettings.Controls.Add(this.renderStyle);
+			this.groupsettings.Controls.Add(this.labelrenderstyle);
+			this.groupsettings.Location = new System.Drawing.Point(8, 193);
+			this.groupsettings.Name = "groupsettings";
+			this.groupsettings.Size = new System.Drawing.Size(533, 46);
+			this.groupsettings.TabIndex = 3;
+			this.groupsettings.TabStop = false;
+			this.groupsettings.Text = " Settings";
+			// 
+			// lockpick
+			// 
+			this.lockpick.FormattingEnabled = true;
+			this.lockpick.Location = new System.Drawing.Point(408, 17);
+			this.lockpick.Name = "lockpick";
+			this.lockpick.Size = new System.Drawing.Size(115, 21);
+			this.lockpick.TabIndex = 19;
+			// 
+			// alpha
+			// 
+			this.alpha.AllowDecimal = true;
+			this.alpha.AllowNegative = false;
+			this.alpha.AllowRelative = false;
+			this.alpha.ButtonStep = 1;
+			this.alpha.ButtonStepBig = 0.25F;
+			this.alpha.ButtonStepFloat = 0.1F;
+			this.alpha.ButtonStepSmall = 0.01F;
+			this.alpha.ButtonStepsUseModifierKeys = true;
+			this.alpha.ButtonStepsWrapAround = false;
+			this.alpha.Location = new System.Drawing.Point(243, 16);
+			this.alpha.Name = "alpha";
+			this.alpha.Size = new System.Drawing.Size(65, 24);
+			this.alpha.StepValues = null;
+			this.alpha.TabIndex = 18;
+			this.alpha.WhenTextChanged += new System.EventHandler(this.alpha_WhenTextChanged);
+			// 
+			// renderStyle
+			// 
+			this.renderStyle.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.renderStyle.FormattingEnabled = true;
+			this.renderStyle.Location = new System.Drawing.Point(92, 17);
+			this.renderStyle.Name = "renderStyle";
+			this.renderStyle.Size = new System.Drawing.Size(86, 21);
+			this.renderStyle.TabIndex = 12;
+			this.renderStyle.SelectedIndexChanged += new System.EventHandler(this.cbRenderStyle_SelectedIndexChanged);
+			// 
+			// activationGroup
+			// 
+			this.activationGroup.Controls.Add(this.missingactivation);
+			this.activationGroup.Controls.Add(this.udmfactivates);
+			this.activationGroup.Location = new System.Drawing.Point(8, 375);
+			this.activationGroup.Name = "activationGroup";
+			this.activationGroup.Size = new System.Drawing.Size(533, 152);
+			this.activationGroup.TabIndex = 1;
+			this.activationGroup.TabStop = false;
+			this.activationGroup.Text = " Activation ";
+			// 
+			// missingactivation
+			// 
+			this.missingactivation.BackColor = System.Drawing.SystemColors.Window;
+			this.missingactivation.Image = global::CodeImp.DoomBuilder.Properties.Resources.Warning;
+			this.missingactivation.Location = new System.Drawing.Point(64, -1);
+			this.missingactivation.Name = "missingactivation";
+			this.missingactivation.Size = new System.Drawing.Size(16, 16);
+			this.missingactivation.TabIndex = 4;
+			this.missingactivation.TabStop = false;
+			this.tooltip.SetToolTip(this.missingactivation, "Selected action requires activation!");
+			this.missingactivation.Visible = false;
+			// 
+			// idgroup
+			// 
+			this.idgroup.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.idgroup.Controls.Add(this.tagsselector);
+			this.idgroup.Location = new System.Drawing.Point(8, 533);
+			this.idgroup.Name = "idgroup";
+			this.idgroup.Size = new System.Drawing.Size(533, 85);
+			this.idgroup.TabIndex = 2;
+			this.idgroup.TabStop = false;
+			this.idgroup.Text = " Identification ";
+			// 
+			// tagsselector
+			// 
+			this.tagsselector.Location = new System.Drawing.Point(6, 21);
+			this.tagsselector.Name = "tagsselector";
+			this.tagsselector.Size = new System.Drawing.Size(524, 60);
+			this.tagsselector.TabIndex = 0;
+			// 
+			// tabfront
+			// 
+			this.tabfront.Controls.Add(this.frontside);
+			this.tabfront.Controls.Add(this.frontgroup);
+			this.tabfront.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.tabfront.ForeColor = System.Drawing.SystemColors.ControlText;
+			this.tabfront.ImageIndex = 0;
+			this.tabfront.Location = new System.Drawing.Point(4, 23);
+			this.tabfront.Name = "tabfront";
+			this.tabfront.Padding = new System.Windows.Forms.Padding(5);
+			this.tabfront.Size = new System.Drawing.Size(549, 621);
+			this.tabfront.TabIndex = 1;
+			this.tabfront.Text = " Front ";
+			this.tabfront.UseVisualStyleBackColor = true;
+			// 
+			// frontside
+			// 
+			this.frontside.AutoSize = true;
+			this.frontside.Location = new System.Drawing.Point(20, 6);
+			this.frontside.Name = "frontside";
+			this.frontside.Size = new System.Drawing.Size(74, 17);
+			this.frontside.TabIndex = 0;
+			this.frontside.Text = "Front Side";
+			this.frontside.UseVisualStyleBackColor = true;
+			this.frontside.CheckStateChanged += new System.EventHandler(this.frontside_CheckStateChanged);
+			// 
+			// frontgroup
+			// 
+			this.frontgroup.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.frontgroup.Controls.Add(this.frontflagsgroup);
+			this.frontgroup.Controls.Add(this.frontscalegroup);
+			this.frontgroup.Controls.Add(this.groupBox6);
+			this.frontgroup.Controls.Add(this.groupBox5);
+			this.frontgroup.Controls.Add(this.frontlow);
+			this.frontgroup.Controls.Add(this.frontmid);
+			this.frontgroup.Controls.Add(this.fronthigh);
+			this.frontgroup.Enabled = false;
+			this.frontgroup.Location = new System.Drawing.Point(8, 8);
+			this.frontgroup.Name = "frontgroup";
+			this.frontgroup.Size = new System.Drawing.Size(535, 605);
+			this.frontgroup.TabIndex = 1;
+			this.frontgroup.TabStop = false;
+			this.frontgroup.Text = "     ";
+			// 
+			// frontflagsgroup
+			// 
+			this.frontflagsgroup.Controls.Add(this.flagsFront);
+			this.frontflagsgroup.Location = new System.Drawing.Point(12, 409);
+			this.frontflagsgroup.Name = "frontflagsgroup";
+			this.frontflagsgroup.Size = new System.Drawing.Size(290, 190);
+			this.frontflagsgroup.TabIndex = 45;
+			this.frontflagsgroup.TabStop = false;
+			this.frontflagsgroup.Text = " Flags ";
+			// 
+			// flagsFront
+			// 
+			this.flagsFront.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.flagsFront.AutoScroll = true;
+			this.flagsFront.Columns = 2;
+			this.flagsFront.Location = new System.Drawing.Point(16, 16);
+			this.flagsFront.Name = "flagsFront";
+			this.flagsFront.Size = new System.Drawing.Size(269, 168);
+			this.flagsFront.TabIndex = 0;
+			this.flagsFront.VerticalSpacing = 3;
+			this.flagsFront.OnValueChanged += new System.EventHandler(this.flagsFront_OnValueChanged);
+			// 
+			// frontscalegroup
+			// 
+			this.frontscalegroup.Controls.Add(this.labelFrontScaleBottom);
+			this.frontscalegroup.Controls.Add(this.labelFrontScaleMid);
+			this.frontscalegroup.Controls.Add(this.labelFrontScaleTop);
+			this.frontscalegroup.Controls.Add(this.pfcFrontScaleTop);
+			this.frontscalegroup.Controls.Add(this.pfcFrontScaleBottom);
+			this.frontscalegroup.Controls.Add(this.pfcFrontScaleMid);
+			this.frontscalegroup.Location = new System.Drawing.Point(12, 291);
+			this.frontscalegroup.Name = "frontscalegroup";
+			this.frontscalegroup.Size = new System.Drawing.Size(290, 112);
+			this.frontscalegroup.TabIndex = 44;
+			this.frontscalegroup.TabStop = false;
+			this.frontscalegroup.Text = " Texture Scale ";
+			// 
+			// labelFrontScaleBottom
+			// 
+			this.labelFrontScaleBottom.Location = new System.Drawing.Point(14, 86);
+			this.labelFrontScaleBottom.Name = "labelFrontScaleBottom";
+			this.labelFrontScaleBottom.Size = new System.Drawing.Size(80, 14);
+			this.labelFrontScaleBottom.TabIndex = 42;
+			this.labelFrontScaleBottom.Tag = "";
+			this.labelFrontScaleBottom.Text = "Lower Scale:";
+			this.labelFrontScaleBottom.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// labelFrontScaleMid
+			// 
+			this.labelFrontScaleMid.Location = new System.Drawing.Point(14, 54);
+			this.labelFrontScaleMid.Name = "labelFrontScaleMid";
+			this.labelFrontScaleMid.Size = new System.Drawing.Size(80, 14);
+			this.labelFrontScaleMid.TabIndex = 41;
+			this.labelFrontScaleMid.Tag = "";
+			this.labelFrontScaleMid.Text = "Middle Scale:";
+			this.labelFrontScaleMid.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// labelFrontScaleTop
+			// 
+			this.labelFrontScaleTop.Location = new System.Drawing.Point(14, 22);
+			this.labelFrontScaleTop.Name = "labelFrontScaleTop";
+			this.labelFrontScaleTop.Size = new System.Drawing.Size(80, 14);
+			this.labelFrontScaleTop.TabIndex = 28;
+			this.labelFrontScaleTop.Tag = "";
+			this.labelFrontScaleTop.Text = "Upper Scale:";
+			this.labelFrontScaleTop.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// pfcFrontScaleTop
+			// 
+			this.pfcFrontScaleTop.AllowDecimal = true;
+			this.pfcFrontScaleTop.AllowValueLinking = true;
+			this.pfcFrontScaleTop.ButtonStep = 1;
+			this.pfcFrontScaleTop.ButtonStepBig = 1F;
+			this.pfcFrontScaleTop.ButtonStepFloat = 0.1F;
+			this.pfcFrontScaleTop.ButtonStepSmall = 0.01F;
+			this.pfcFrontScaleTop.ButtonStepsUseModifierKeys = true;
+			this.pfcFrontScaleTop.DefaultValue = 1F;
+			this.pfcFrontScaleTop.Field1 = "scalex_top";
+			this.pfcFrontScaleTop.Field2 = "scaley_top";
+			this.pfcFrontScaleTop.LinkValues = false;
+			this.pfcFrontScaleTop.Location = new System.Drawing.Point(96, 17);
+			this.pfcFrontScaleTop.Name = "pfcFrontScaleTop";
+			this.pfcFrontScaleTop.Size = new System.Drawing.Size(186, 26);
+			this.pfcFrontScaleTop.TabIndex = 38;
+			this.pfcFrontScaleTop.OnValuesChanged += new System.EventHandler(this.pfcFrontScaleTop_OnValuesChanged);
+			// 
+			// pfcFrontScaleBottom
+			// 
+			this.pfcFrontScaleBottom.AllowDecimal = true;
+			this.pfcFrontScaleBottom.AllowValueLinking = true;
+			this.pfcFrontScaleBottom.ButtonStep = 1;
+			this.pfcFrontScaleBottom.ButtonStepBig = 1F;
+			this.pfcFrontScaleBottom.ButtonStepFloat = 0.1F;
+			this.pfcFrontScaleBottom.ButtonStepSmall = 0.01F;
+			this.pfcFrontScaleBottom.ButtonStepsUseModifierKeys = true;
+			this.pfcFrontScaleBottom.DefaultValue = 1F;
+			this.pfcFrontScaleBottom.Field1 = "scalex_bottom";
+			this.pfcFrontScaleBottom.Field2 = "scaley_bottom";
+			this.pfcFrontScaleBottom.LinkValues = false;
+			this.pfcFrontScaleBottom.Location = new System.Drawing.Point(96, 81);
+			this.pfcFrontScaleBottom.Name = "pfcFrontScaleBottom";
+			this.pfcFrontScaleBottom.Size = new System.Drawing.Size(186, 26);
+			this.pfcFrontScaleBottom.TabIndex = 40;
+			this.pfcFrontScaleBottom.OnValuesChanged += new System.EventHandler(this.pfcFrontScaleBottom_OnValuesChanged);
+			// 
+			// pfcFrontScaleMid
+			// 
+			this.pfcFrontScaleMid.AllowDecimal = true;
+			this.pfcFrontScaleMid.AllowValueLinking = true;
+			this.pfcFrontScaleMid.ButtonStep = 1;
+			this.pfcFrontScaleMid.ButtonStepBig = 1F;
+			this.pfcFrontScaleMid.ButtonStepFloat = 0.1F;
+			this.pfcFrontScaleMid.ButtonStepSmall = 0.01F;
+			this.pfcFrontScaleMid.ButtonStepsUseModifierKeys = true;
+			this.pfcFrontScaleMid.DefaultValue = 1F;
+			this.pfcFrontScaleMid.Field1 = "scalex_mid";
+			this.pfcFrontScaleMid.Field2 = "scaley_mid";
+			this.pfcFrontScaleMid.LinkValues = false;
+			this.pfcFrontScaleMid.Location = new System.Drawing.Point(96, 49);
+			this.pfcFrontScaleMid.Name = "pfcFrontScaleMid";
+			this.pfcFrontScaleMid.Size = new System.Drawing.Size(186, 26);
+			this.pfcFrontScaleMid.TabIndex = 39;
+			this.pfcFrontScaleMid.OnValuesChanged += new System.EventHandler(this.pfcFrontScaleMid_OnValuesChanged);
+			// 
+			// groupBox6
+			// 
+			this.groupBox6.Controls.Add(this.labelFrontTextureOffset);
+			this.groupBox6.Controls.Add(this.labelFrontOffsetBottom);
+			this.groupBox6.Controls.Add(this.frontTextureOffset);
+			this.groupBox6.Controls.Add(this.labelFrontOffsetMid);
+			this.groupBox6.Controls.Add(this.pfcFrontOffsetTop);
+			this.groupBox6.Controls.Add(this.labelFrontOffsetTop);
+			this.groupBox6.Controls.Add(this.pfcFrontOffsetMid);
+			this.groupBox6.Controls.Add(this.pfcFrontOffsetBottom);
+			this.groupBox6.Location = new System.Drawing.Point(12, 142);
+			this.groupBox6.Name = "groupBox6";
+			this.groupBox6.Size = new System.Drawing.Size(290, 143);
+			this.groupBox6.TabIndex = 43;
+			this.groupBox6.TabStop = false;
+			this.groupBox6.Text = " Texture Offsets ";
+			// 
+			// labelFrontTextureOffset
+			// 
+			this.labelFrontTextureOffset.Location = new System.Drawing.Point(14, 23);
+			this.labelFrontTextureOffset.Name = "labelFrontTextureOffset";
+			this.labelFrontTextureOffset.Size = new System.Drawing.Size(80, 14);
+			this.labelFrontTextureOffset.TabIndex = 46;
+			this.labelFrontTextureOffset.Tag = "";
+			this.labelFrontTextureOffset.Text = "Sidedef Offset:";
+			this.labelFrontTextureOffset.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// labelFrontOffsetBottom
+			// 
+			this.labelFrontOffsetBottom.Location = new System.Drawing.Point(14, 118);
+			this.labelFrontOffsetBottom.Name = "labelFrontOffsetBottom";
+			this.labelFrontOffsetBottom.Size = new System.Drawing.Size(80, 14);
+			this.labelFrontOffsetBottom.TabIndex = 45;
+			this.labelFrontOffsetBottom.Tag = "";
+			this.labelFrontOffsetBottom.Text = "Lower Offset:";
+			this.labelFrontOffsetBottom.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// frontTextureOffset
+			// 
+			this.frontTextureOffset.ButtonStep = 1;
+			this.frontTextureOffset.ButtonStepBig = 16F;
+			this.frontTextureOffset.ButtonStepSmall = 0.1F;
+			this.frontTextureOffset.ButtonStepsUseModifierKeys = true;
+			this.frontTextureOffset.DefaultValue = 0;
+			this.frontTextureOffset.Location = new System.Drawing.Point(96, 17);
+			this.frontTextureOffset.Name = "frontTextureOffset";
+			this.frontTextureOffset.Size = new System.Drawing.Size(186, 26);
+			this.frontTextureOffset.TabIndex = 41;
+			this.frontTextureOffset.OnValuesChanged += new System.EventHandler(this.frontTextureOffset_OnValuesChanged);
+			// 
+			// labelFrontOffsetMid
+			// 
+			this.labelFrontOffsetMid.Location = new System.Drawing.Point(14, 86);
+			this.labelFrontOffsetMid.Name = "labelFrontOffsetMid";
+			this.labelFrontOffsetMid.Size = new System.Drawing.Size(80, 14);
+			this.labelFrontOffsetMid.TabIndex = 44;
+			this.labelFrontOffsetMid.Tag = "";
+			this.labelFrontOffsetMid.Text = "Middle Offset:";
+			this.labelFrontOffsetMid.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// pfcFrontOffsetTop
+			// 
+			this.pfcFrontOffsetTop.AllowDecimal = true;
+			this.pfcFrontOffsetTop.AllowValueLinking = false;
+			this.pfcFrontOffsetTop.ButtonStep = 1;
+			this.pfcFrontOffsetTop.ButtonStepBig = 16F;
+			this.pfcFrontOffsetTop.ButtonStepFloat = 1F;
+			this.pfcFrontOffsetTop.ButtonStepSmall = 0.1F;
+			this.pfcFrontOffsetTop.ButtonStepsUseModifierKeys = true;
+			this.pfcFrontOffsetTop.DefaultValue = 0F;
+			this.pfcFrontOffsetTop.Field1 = "offsetx_top";
+			this.pfcFrontOffsetTop.Field2 = "offsety_top";
+			this.pfcFrontOffsetTop.LinkValues = false;
+			this.pfcFrontOffsetTop.Location = new System.Drawing.Point(96, 49);
+			this.pfcFrontOffsetTop.Name = "pfcFrontOffsetTop";
+			this.pfcFrontOffsetTop.Size = new System.Drawing.Size(186, 26);
+			this.pfcFrontOffsetTop.TabIndex = 35;
+			this.pfcFrontOffsetTop.OnValuesChanged += new System.EventHandler(this.pfcFrontOffsetTop_OnValuesChanged);
+			// 
+			// labelFrontOffsetTop
+			// 
+			this.labelFrontOffsetTop.Location = new System.Drawing.Point(14, 54);
+			this.labelFrontOffsetTop.Name = "labelFrontOffsetTop";
+			this.labelFrontOffsetTop.Size = new System.Drawing.Size(80, 14);
+			this.labelFrontOffsetTop.TabIndex = 43;
+			this.labelFrontOffsetTop.Tag = "";
+			this.labelFrontOffsetTop.Text = "Upper Offset:";
+			this.labelFrontOffsetTop.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// pfcFrontOffsetMid
+			// 
+			this.pfcFrontOffsetMid.AllowDecimal = true;
+			this.pfcFrontOffsetMid.AllowValueLinking = false;
+			this.pfcFrontOffsetMid.ButtonStep = 1;
+			this.pfcFrontOffsetMid.ButtonStepBig = 16F;
+			this.pfcFrontOffsetMid.ButtonStepFloat = 1F;
+			this.pfcFrontOffsetMid.ButtonStepSmall = 0.1F;
+			this.pfcFrontOffsetMid.ButtonStepsUseModifierKeys = true;
+			this.pfcFrontOffsetMid.DefaultValue = 0F;
+			this.pfcFrontOffsetMid.Field1 = "offsetx_mid";
+			this.pfcFrontOffsetMid.Field2 = "offsety_mid";
+			this.pfcFrontOffsetMid.LinkValues = false;
+			this.pfcFrontOffsetMid.Location = new System.Drawing.Point(96, 81);
+			this.pfcFrontOffsetMid.Name = "pfcFrontOffsetMid";
+			this.pfcFrontOffsetMid.Size = new System.Drawing.Size(186, 26);
+			this.pfcFrontOffsetMid.TabIndex = 36;
+			this.pfcFrontOffsetMid.OnValuesChanged += new System.EventHandler(this.pfcFrontOffsetMid_OnValuesChanged);
+			// 
+			// pfcFrontOffsetBottom
+			// 
+			this.pfcFrontOffsetBottom.AllowDecimal = true;
+			this.pfcFrontOffsetBottom.AllowValueLinking = false;
+			this.pfcFrontOffsetBottom.ButtonStep = 1;
+			this.pfcFrontOffsetBottom.ButtonStepBig = 16F;
+			this.pfcFrontOffsetBottom.ButtonStepFloat = 1F;
+			this.pfcFrontOffsetBottom.ButtonStepSmall = 0.1F;
+			this.pfcFrontOffsetBottom.ButtonStepsUseModifierKeys = true;
+			this.pfcFrontOffsetBottom.DefaultValue = 0F;
+			this.pfcFrontOffsetBottom.Field1 = "offsetx_bottom";
+			this.pfcFrontOffsetBottom.Field2 = "offsety_bottom";
+			this.pfcFrontOffsetBottom.LinkValues = false;
+			this.pfcFrontOffsetBottom.Location = new System.Drawing.Point(96, 113);
+			this.pfcFrontOffsetBottom.Name = "pfcFrontOffsetBottom";
+			this.pfcFrontOffsetBottom.Size = new System.Drawing.Size(186, 26);
+			this.pfcFrontOffsetBottom.TabIndex = 37;
+			this.pfcFrontOffsetBottom.OnValuesChanged += new System.EventHandler(this.pfcFrontOffsetBottom_OnValuesChanged);
+			// 
+			// groupBox5
+			// 
+			this.groupBox5.Controls.Add(this.resetfrontlight);
+			this.groupBox5.Controls.Add(this.frontsector);
+			this.groupBox5.Controls.Add(label11);
+			this.groupBox5.Controls.Add(this.customfrontbutton);
+			this.groupBox5.Controls.Add(this.lightFront);
+			this.groupBox5.Controls.Add(this.labelLightFront);
+			this.groupBox5.Controls.Add(this.cbLightAbsoluteFront);
+			this.groupBox5.Location = new System.Drawing.Point(12, 19);
+			this.groupBox5.Name = "groupBox5";
+			this.groupBox5.Size = new System.Drawing.Size(290, 117);
+			this.groupBox5.TabIndex = 42;
+			this.groupBox5.TabStop = false;
+			// 
+			// resetfrontlight
+			// 
+			this.resetfrontlight.Image = global::CodeImp.DoomBuilder.Properties.Resources.Reset;
+			this.resetfrontlight.Location = new System.Drawing.Point(233, 50);
+			this.resetfrontlight.Name = "resetfrontlight";
+			this.resetfrontlight.Size = new System.Drawing.Size(23, 23);
+			this.resetfrontlight.TabIndex = 28;
+			this.tooltip.SetToolTip(this.resetfrontlight, "Reset Front Brightness");
+			this.resetfrontlight.UseVisualStyleBackColor = true;
+			this.resetfrontlight.Click += new System.EventHandler(this.resetfrontlight_Click);
+			// 
+			// frontsector
+			// 
+			this.frontsector.AllowDecimal = false;
+			this.frontsector.AllowNegative = false;
+			this.frontsector.AllowRelative = false;
+			this.frontsector.ButtonStep = 1;
+			this.frontsector.ButtonStepBig = 10F;
+			this.frontsector.ButtonStepFloat = 1F;
+			this.frontsector.ButtonStepSmall = 0.1F;
+			this.frontsector.ButtonStepsUseModifierKeys = false;
+			this.frontsector.ButtonStepsWrapAround = false;
+			this.frontsector.Location = new System.Drawing.Point(96, 19);
+			this.frontsector.Name = "frontsector";
+			this.frontsector.Size = new System.Drawing.Size(130, 24);
+			this.frontsector.StepValues = null;
+			this.frontsector.TabIndex = 14;
+			// 
+			// customfrontbutton
+			// 
+			this.customfrontbutton.Location = new System.Drawing.Point(96, 79);
+			this.customfrontbutton.Name = "customfrontbutton";
+			this.customfrontbutton.Size = new System.Drawing.Size(130, 25);
+			this.customfrontbutton.TabIndex = 3;
+			this.customfrontbutton.Text = "Custom fields...";
+			this.customfrontbutton.UseVisualStyleBackColor = true;
+			this.customfrontbutton.Click += new System.EventHandler(this.customfrontbutton_Click);
+			// 
+			// lightFront
+			// 
+			this.lightFront.AllowDecimal = false;
+			this.lightFront.AllowNegative = true;
+			this.lightFront.AllowRelative = true;
+			this.lightFront.ButtonStep = 16;
+			this.lightFront.ButtonStepBig = 32F;
+			this.lightFront.ButtonStepFloat = 1F;
+			this.lightFront.ButtonStepSmall = 1F;
+			this.lightFront.ButtonStepsUseModifierKeys = true;
+			this.lightFront.ButtonStepsWrapAround = false;
+			this.lightFront.Location = new System.Drawing.Point(96, 49);
+			this.lightFront.Name = "lightFront";
+			this.lightFront.Size = new System.Drawing.Size(62, 24);
+			this.lightFront.StepValues = null;
+			this.lightFront.TabIndex = 26;
+			this.lightFront.Tag = "";
+			this.lightFront.WhenTextChanged += new System.EventHandler(this.lightFront_WhenTextChanged);
+			// 
+			// cbLightAbsoluteFront
+			// 
+			this.cbLightAbsoluteFront.AutoSize = true;
+			this.cbLightAbsoluteFront.Location = new System.Drawing.Point(164, 54);
+			this.cbLightAbsoluteFront.Name = "cbLightAbsoluteFront";
+			this.cbLightAbsoluteFront.Size = new System.Drawing.Size(67, 17);
+			this.cbLightAbsoluteFront.TabIndex = 27;
+			this.cbLightAbsoluteFront.Tag = "lightabsolute";
+			this.cbLightAbsoluteFront.Text = "Absolute";
+			this.cbLightAbsoluteFront.UseVisualStyleBackColor = true;
+			this.cbLightAbsoluteFront.CheckedChanged += new System.EventHandler(this.cbLightAbsoluteFront_CheckedChanged);
+			// 
+			// frontlow
+			// 
+			this.frontlow.Location = new System.Drawing.Point(309, 415);
+			this.frontlow.MultipleTextures = false;
+			this.frontlow.Name = "frontlow";
+			this.frontlow.Required = false;
+			this.frontlow.Size = new System.Drawing.Size(220, 184);
+			this.frontlow.TabIndex = 6;
+			this.frontlow.TextureName = "";
+			this.frontlow.UsePreviews = false;
+			this.frontlow.OnValueChanged += new System.EventHandler(this.frontlow_OnValueChanged);
+			// 
+			// frontmid
+			// 
+			this.frontmid.Location = new System.Drawing.Point(309, 217);
+			this.frontmid.MultipleTextures = false;
+			this.frontmid.Name = "frontmid";
+			this.frontmid.Required = false;
+			this.frontmid.Size = new System.Drawing.Size(220, 184);
+			this.frontmid.TabIndex = 5;
+			this.frontmid.TextureName = "";
+			this.frontmid.UsePreviews = false;
+			this.frontmid.OnValueChanged += new System.EventHandler(this.frontmid_OnValueChanged);
+			// 
+			// fronthigh
+			// 
+			this.fronthigh.Location = new System.Drawing.Point(309, 19);
+			this.fronthigh.MultipleTextures = false;
+			this.fronthigh.Name = "fronthigh";
+			this.fronthigh.Required = false;
+			this.fronthigh.Size = new System.Drawing.Size(220, 184);
+			this.fronthigh.TabIndex = 4;
+			this.fronthigh.TextureName = "";
+			this.fronthigh.UsePreviews = false;
+			this.fronthigh.OnValueChanged += new System.EventHandler(this.fronthigh_OnValueChanged);
+			// 
+			// tabback
+			// 
+			this.tabback.Controls.Add(this.backside);
+			this.tabback.Controls.Add(this.backgroup);
+			this.tabback.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.tabback.ImageIndex = 1;
+			this.tabback.Location = new System.Drawing.Point(4, 23);
+			this.tabback.Name = "tabback";
+			this.tabback.Padding = new System.Windows.Forms.Padding(5);
+			this.tabback.Size = new System.Drawing.Size(549, 621);
+			this.tabback.TabIndex = 3;
+			this.tabback.Text = " Back ";
+			this.tabback.UseVisualStyleBackColor = true;
+			// 
+			// backside
+			// 
+			this.backside.AutoSize = true;
+			this.backside.Location = new System.Drawing.Point(20, 6);
+			this.backside.Name = "backside";
+			this.backside.Size = new System.Drawing.Size(75, 17);
+			this.backside.TabIndex = 0;
+			this.backside.Text = "Back Side";
+			this.backside.UseVisualStyleBackColor = true;
+			this.backside.CheckStateChanged += new System.EventHandler(this.backside_CheckStateChanged);
+			// 
+			// backgroup
+			// 
+			this.backgroup.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.backgroup.Controls.Add(this.groupBox4);
+			this.backgroup.Controls.Add(this.backflagsgroup);
+			this.backgroup.Controls.Add(this.backscalegroup);
+			this.backgroup.Controls.Add(this.groupBox1);
+			this.backgroup.Controls.Add(this.backlow);
+			this.backgroup.Controls.Add(this.backmid);
+			this.backgroup.Controls.Add(this.backhigh);
+			this.backgroup.Enabled = false;
+			this.backgroup.Location = new System.Drawing.Point(8, 8);
+			this.backgroup.Name = "backgroup";
+			this.backgroup.Size = new System.Drawing.Size(535, 605);
+			this.backgroup.TabIndex = 1;
+			this.backgroup.TabStop = false;
+			this.backgroup.Text = "     ";
+			// 
+			// groupBox4
+			// 
+			this.groupBox4.Controls.Add(this.resetbacklight);
+			this.groupBox4.Controls.Add(this.backsector);
+			this.groupBox4.Controls.Add(label12);
+			this.groupBox4.Controls.Add(this.custombackbutton);
+			this.groupBox4.Controls.Add(this.lightBack);
+			this.groupBox4.Controls.Add(this.labelLightBack);
+			this.groupBox4.Controls.Add(this.cbLightAbsoluteBack);
+			this.groupBox4.Location = new System.Drawing.Point(12, 19);
+			this.groupBox4.Name = "groupBox4";
+			this.groupBox4.Size = new System.Drawing.Size(290, 117);
+			this.groupBox4.TabIndex = 46;
+			this.groupBox4.TabStop = false;
+			// 
+			// resetbacklight
+			// 
+			this.resetbacklight.Image = global::CodeImp.DoomBuilder.Properties.Resources.Reset;
+			this.resetbacklight.Location = new System.Drawing.Point(233, 50);
+			this.resetbacklight.Name = "resetbacklight";
+			this.resetbacklight.Size = new System.Drawing.Size(23, 23);
+			this.resetbacklight.TabIndex = 31;
+			this.tooltip.SetToolTip(this.resetbacklight, "Reset Back Brightness");
+			this.resetbacklight.UseVisualStyleBackColor = true;
+			this.resetbacklight.Click += new System.EventHandler(this.resetbacklight_Click);
+			// 
+			// backsector
+			// 
+			this.backsector.AllowDecimal = false;
+			this.backsector.AllowNegative = false;
+			this.backsector.AllowRelative = false;
+			this.backsector.ButtonStep = 1;
+			this.backsector.ButtonStepBig = 10F;
+			this.backsector.ButtonStepFloat = 1F;
+			this.backsector.ButtonStepSmall = 0.1F;
+			this.backsector.ButtonStepsUseModifierKeys = false;
+			this.backsector.ButtonStepsWrapAround = false;
+			this.backsector.Location = new System.Drawing.Point(96, 19);
+			this.backsector.Name = "backsector";
+			this.backsector.Size = new System.Drawing.Size(130, 24);
+			this.backsector.StepValues = null;
+			this.backsector.TabIndex = 17;
+			// 
+			// custombackbutton
+			// 
+			this.custombackbutton.Location = new System.Drawing.Point(96, 79);
+			this.custombackbutton.Name = "custombackbutton";
+			this.custombackbutton.Size = new System.Drawing.Size(130, 25);
+			this.custombackbutton.TabIndex = 3;
+			this.custombackbutton.Text = "Custom fields...";
+			this.custombackbutton.UseVisualStyleBackColor = true;
+			this.custombackbutton.Click += new System.EventHandler(this.custombackbutton_Click);
+			// 
+			// lightBack
+			// 
+			this.lightBack.AllowDecimal = false;
+			this.lightBack.AllowNegative = true;
+			this.lightBack.AllowRelative = true;
+			this.lightBack.ButtonStep = 1;
+			this.lightBack.ButtonStepBig = 16F;
+			this.lightBack.ButtonStepFloat = 1F;
+			this.lightBack.ButtonStepSmall = 1F;
+			this.lightBack.ButtonStepsUseModifierKeys = true;
+			this.lightBack.ButtonStepsWrapAround = false;
+			this.lightBack.Location = new System.Drawing.Point(96, 49);
+			this.lightBack.Name = "lightBack";
+			this.lightBack.Size = new System.Drawing.Size(62, 24);
+			this.lightBack.StepValues = null;
+			this.lightBack.TabIndex = 29;
+			this.lightBack.Tag = "light";
+			this.lightBack.WhenTextChanged += new System.EventHandler(this.lightBack_WhenTextChanged);
+			// 
+			// labelLightBack
+			// 
+			this.labelLightBack.Location = new System.Drawing.Point(12, 53);
+			this.labelLightBack.Name = "labelLightBack";
+			this.labelLightBack.Size = new System.Drawing.Size(80, 14);
+			this.labelLightBack.TabIndex = 28;
+			this.labelLightBack.Tag = "";
+			this.labelLightBack.Text = "Brightness:";
+			this.labelLightBack.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// cbLightAbsoluteBack
+			// 
+			this.cbLightAbsoluteBack.AutoSize = true;
+			this.cbLightAbsoluteBack.Location = new System.Drawing.Point(164, 54);
+			this.cbLightAbsoluteBack.Name = "cbLightAbsoluteBack";
+			this.cbLightAbsoluteBack.Size = new System.Drawing.Size(67, 17);
+			this.cbLightAbsoluteBack.TabIndex = 30;
+			this.cbLightAbsoluteBack.Tag = "lightabsolute";
+			this.cbLightAbsoluteBack.Text = "Absolute";
+			this.cbLightAbsoluteBack.UseVisualStyleBackColor = true;
+			this.cbLightAbsoluteBack.CheckedChanged += new System.EventHandler(this.cbLightAbsoluteBack_CheckedChanged);
+			// 
+			// backflagsgroup
+			// 
+			this.backflagsgroup.Controls.Add(this.flagsBack);
+			this.backflagsgroup.Location = new System.Drawing.Point(12, 409);
+			this.backflagsgroup.Name = "backflagsgroup";
+			this.backflagsgroup.Size = new System.Drawing.Size(290, 190);
+			this.backflagsgroup.TabIndex = 45;
+			this.backflagsgroup.TabStop = false;
+			this.backflagsgroup.Text = " Flags ";
+			// 
+			// flagsBack
+			// 
+			this.flagsBack.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.flagsBack.AutoScroll = true;
+			this.flagsBack.Columns = 2;
+			this.flagsBack.Location = new System.Drawing.Point(16, 16);
+			this.flagsBack.Name = "flagsBack";
+			this.flagsBack.Size = new System.Drawing.Size(269, 168);
+			this.flagsBack.TabIndex = 1;
+			this.flagsBack.VerticalSpacing = 3;
+			this.flagsBack.OnValueChanged += new System.EventHandler(this.flagsBack_OnValueChanged);
+			// 
+			// backscalegroup
+			// 
+			this.backscalegroup.Controls.Add(this.labelBackScaleBottom);
+			this.backscalegroup.Controls.Add(this.labelBackScaleMid);
+			this.backscalegroup.Controls.Add(this.labelBackScaleTop);
+			this.backscalegroup.Controls.Add(this.pfcBackScaleTop);
+			this.backscalegroup.Controls.Add(this.pfcBackScaleBottom);
+			this.backscalegroup.Controls.Add(this.pfcBackScaleMid);
+			this.backscalegroup.Location = new System.Drawing.Point(12, 291);
+			this.backscalegroup.Name = "backscalegroup";
+			this.backscalegroup.Size = new System.Drawing.Size(290, 112);
+			this.backscalegroup.TabIndex = 44;
+			this.backscalegroup.TabStop = false;
+			this.backscalegroup.Text = " Texture Scale";
+			// 
+			// labelBackScaleBottom
+			// 
+			this.labelBackScaleBottom.Location = new System.Drawing.Point(14, 86);
+			this.labelBackScaleBottom.Name = "labelBackScaleBottom";
+			this.labelBackScaleBottom.Size = new System.Drawing.Size(80, 14);
+			this.labelBackScaleBottom.TabIndex = 45;
+			this.labelBackScaleBottom.Tag = "";
+			this.labelBackScaleBottom.Text = "Lower Scale:";
+			this.labelBackScaleBottom.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// labelBackScaleMid
+			// 
+			this.labelBackScaleMid.Location = new System.Drawing.Point(14, 54);
+			this.labelBackScaleMid.Name = "labelBackScaleMid";
+			this.labelBackScaleMid.Size = new System.Drawing.Size(80, 14);
+			this.labelBackScaleMid.TabIndex = 44;
+			this.labelBackScaleMid.Tag = "";
+			this.labelBackScaleMid.Text = "Middle Scale:";
+			this.labelBackScaleMid.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// labelBackScaleTop
+			// 
+			this.labelBackScaleTop.Location = new System.Drawing.Point(14, 22);
+			this.labelBackScaleTop.Name = "labelBackScaleTop";
+			this.labelBackScaleTop.Size = new System.Drawing.Size(80, 14);
+			this.labelBackScaleTop.TabIndex = 43;
+			this.labelBackScaleTop.Tag = "";
+			this.labelBackScaleTop.Text = "Upper Scale:";
+			this.labelBackScaleTop.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// pfcBackScaleTop
+			// 
+			this.pfcBackScaleTop.AllowDecimal = true;
+			this.pfcBackScaleTop.AllowValueLinking = true;
+			this.pfcBackScaleTop.ButtonStep = 1;
+			this.pfcBackScaleTop.ButtonStepBig = 1F;
+			this.pfcBackScaleTop.ButtonStepFloat = 0.1F;
+			this.pfcBackScaleTop.ButtonStepSmall = 0.01F;
+			this.pfcBackScaleTop.ButtonStepsUseModifierKeys = true;
+			this.pfcBackScaleTop.DefaultValue = 1F;
+			this.pfcBackScaleTop.Field1 = "scalex_top";
+			this.pfcBackScaleTop.Field2 = "scaley_top";
+			this.pfcBackScaleTop.LinkValues = false;
+			this.pfcBackScaleTop.Location = new System.Drawing.Point(96, 17);
+			this.pfcBackScaleTop.Name = "pfcBackScaleTop";
+			this.pfcBackScaleTop.Size = new System.Drawing.Size(186, 26);
+			this.pfcBackScaleTop.TabIndex = 38;
+			this.pfcBackScaleTop.OnValuesChanged += new System.EventHandler(this.pfcBackScaleTop_OnValuesChanged);
+			// 
+			// pfcBackScaleBottom
+			// 
+			this.pfcBackScaleBottom.AllowDecimal = true;
+			this.pfcBackScaleBottom.AllowValueLinking = true;
+			this.pfcBackScaleBottom.ButtonStep = 1;
+			this.pfcBackScaleBottom.ButtonStepBig = 1F;
+			this.pfcBackScaleBottom.ButtonStepFloat = 0.1F;
+			this.pfcBackScaleBottom.ButtonStepSmall = 0.01F;
+			this.pfcBackScaleBottom.ButtonStepsUseModifierKeys = true;
+			this.pfcBackScaleBottom.DefaultValue = 1F;
+			this.pfcBackScaleBottom.Field1 = "scalex_bottom";
+			this.pfcBackScaleBottom.Field2 = "scaley_bottom";
+			this.pfcBackScaleBottom.LinkValues = false;
+			this.pfcBackScaleBottom.Location = new System.Drawing.Point(96, 81);
+			this.pfcBackScaleBottom.Name = "pfcBackScaleBottom";
+			this.pfcBackScaleBottom.Size = new System.Drawing.Size(186, 26);
+			this.pfcBackScaleBottom.TabIndex = 40;
+			this.pfcBackScaleBottom.OnValuesChanged += new System.EventHandler(this.pfcBackScaleBottom_OnValuesChanged);
+			// 
+			// pfcBackScaleMid
+			// 
+			this.pfcBackScaleMid.AllowDecimal = true;
+			this.pfcBackScaleMid.AllowValueLinking = true;
+			this.pfcBackScaleMid.ButtonStep = 1;
+			this.pfcBackScaleMid.ButtonStepBig = 1F;
+			this.pfcBackScaleMid.ButtonStepFloat = 0.1F;
+			this.pfcBackScaleMid.ButtonStepSmall = 0.01F;
+			this.pfcBackScaleMid.ButtonStepsUseModifierKeys = true;
+			this.pfcBackScaleMid.DefaultValue = 1F;
+			this.pfcBackScaleMid.Field1 = "scalex_mid";
+			this.pfcBackScaleMid.Field2 = "scaley_mid";
+			this.pfcBackScaleMid.LinkValues = false;
+			this.pfcBackScaleMid.Location = new System.Drawing.Point(96, 49);
+			this.pfcBackScaleMid.Name = "pfcBackScaleMid";
+			this.pfcBackScaleMid.Size = new System.Drawing.Size(186, 26);
+			this.pfcBackScaleMid.TabIndex = 39;
+			this.pfcBackScaleMid.OnValuesChanged += new System.EventHandler(this.pfcBackScaleMid_OnValuesChanged);
+			// 
+			// groupBox1
+			// 
+			this.groupBox1.Controls.Add(this.labelBackTextureOffset);
+			this.groupBox1.Controls.Add(this.labelBackOffsetBottom);
+			this.groupBox1.Controls.Add(this.labelBackOffsetMid);
+			this.groupBox1.Controls.Add(this.labelBackOffsetTop);
+			this.groupBox1.Controls.Add(this.pfcBackOffsetTop);
+			this.groupBox1.Controls.Add(this.pfcBackOffsetMid);
+			this.groupBox1.Controls.Add(this.pfcBackOffsetBottom);
+			this.groupBox1.Controls.Add(this.backTextureOffset);
+			this.groupBox1.Location = new System.Drawing.Point(12, 142);
+			this.groupBox1.Name = "groupBox1";
+			this.groupBox1.Size = new System.Drawing.Size(290, 143);
+			this.groupBox1.TabIndex = 43;
+			this.groupBox1.TabStop = false;
+			this.groupBox1.Text = " Texture Offsets ";
+			// 
+			// labelBackTextureOffset
+			// 
+			this.labelBackTextureOffset.Location = new System.Drawing.Point(14, 23);
+			this.labelBackTextureOffset.Name = "labelBackTextureOffset";
+			this.labelBackTextureOffset.Size = new System.Drawing.Size(80, 14);
+			this.labelBackTextureOffset.TabIndex = 50;
+			this.labelBackTextureOffset.Tag = "";
+			this.labelBackTextureOffset.Text = "Sidedef Offset:";
+			this.labelBackTextureOffset.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// labelBackOffsetBottom
+			// 
+			this.labelBackOffsetBottom.Location = new System.Drawing.Point(14, 118);
+			this.labelBackOffsetBottom.Name = "labelBackOffsetBottom";
+			this.labelBackOffsetBottom.Size = new System.Drawing.Size(80, 14);
+			this.labelBackOffsetBottom.TabIndex = 49;
+			this.labelBackOffsetBottom.Tag = "";
+			this.labelBackOffsetBottom.Text = "Lower Offset:";
+			this.labelBackOffsetBottom.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// labelBackOffsetMid
+			// 
+			this.labelBackOffsetMid.Location = new System.Drawing.Point(14, 86);
+			this.labelBackOffsetMid.Name = "labelBackOffsetMid";
+			this.labelBackOffsetMid.Size = new System.Drawing.Size(80, 14);
+			this.labelBackOffsetMid.TabIndex = 48;
+			this.labelBackOffsetMid.Tag = "";
+			this.labelBackOffsetMid.Text = "Middle Offset:";
+			this.labelBackOffsetMid.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// labelBackOffsetTop
+			// 
+			this.labelBackOffsetTop.Location = new System.Drawing.Point(14, 54);
+			this.labelBackOffsetTop.Name = "labelBackOffsetTop";
+			this.labelBackOffsetTop.Size = new System.Drawing.Size(80, 14);
+			this.labelBackOffsetTop.TabIndex = 47;
+			this.labelBackOffsetTop.Tag = "";
+			this.labelBackOffsetTop.Text = "Upper Offset:";
+			this.labelBackOffsetTop.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// pfcBackOffsetTop
+			// 
+			this.pfcBackOffsetTop.AllowDecimal = true;
+			this.pfcBackOffsetTop.AllowValueLinking = false;
+			this.pfcBackOffsetTop.ButtonStep = 1;
+			this.pfcBackOffsetTop.ButtonStepBig = 16F;
+			this.pfcBackOffsetTop.ButtonStepFloat = 1F;
+			this.pfcBackOffsetTop.ButtonStepSmall = 0.1F;
+			this.pfcBackOffsetTop.ButtonStepsUseModifierKeys = true;
+			this.pfcBackOffsetTop.DefaultValue = 0F;
+			this.pfcBackOffsetTop.Field1 = "offsetx_top";
+			this.pfcBackOffsetTop.Field2 = "offsety_top";
+			this.pfcBackOffsetTop.LinkValues = false;
+			this.pfcBackOffsetTop.Location = new System.Drawing.Point(96, 49);
+			this.pfcBackOffsetTop.Name = "pfcBackOffsetTop";
+			this.pfcBackOffsetTop.Size = new System.Drawing.Size(186, 26);
+			this.pfcBackOffsetTop.TabIndex = 35;
+			this.pfcBackOffsetTop.OnValuesChanged += new System.EventHandler(this.pfcBackOffsetTop_OnValuesChanged);
+			// 
+			// pfcBackOffsetMid
+			// 
+			this.pfcBackOffsetMid.AllowDecimal = true;
+			this.pfcBackOffsetMid.AllowValueLinking = false;
+			this.pfcBackOffsetMid.ButtonStep = 1;
+			this.pfcBackOffsetMid.ButtonStepBig = 16F;
+			this.pfcBackOffsetMid.ButtonStepFloat = 1F;
+			this.pfcBackOffsetMid.ButtonStepSmall = 0.1F;
+			this.pfcBackOffsetMid.ButtonStepsUseModifierKeys = true;
+			this.pfcBackOffsetMid.DefaultValue = 0F;
+			this.pfcBackOffsetMid.Field1 = "offsetx_mid";
+			this.pfcBackOffsetMid.Field2 = "offsety_mid";
+			this.pfcBackOffsetMid.LinkValues = false;
+			this.pfcBackOffsetMid.Location = new System.Drawing.Point(96, 81);
+			this.pfcBackOffsetMid.Name = "pfcBackOffsetMid";
+			this.pfcBackOffsetMid.Size = new System.Drawing.Size(186, 26);
+			this.pfcBackOffsetMid.TabIndex = 36;
+			this.pfcBackOffsetMid.OnValuesChanged += new System.EventHandler(this.pfcBackOffsetMid_OnValuesChanged);
+			// 
+			// pfcBackOffsetBottom
+			// 
+			this.pfcBackOffsetBottom.AllowDecimal = true;
+			this.pfcBackOffsetBottom.AllowValueLinking = false;
+			this.pfcBackOffsetBottom.ButtonStep = 1;
+			this.pfcBackOffsetBottom.ButtonStepBig = 16F;
+			this.pfcBackOffsetBottom.ButtonStepFloat = 1F;
+			this.pfcBackOffsetBottom.ButtonStepSmall = 0.1F;
+			this.pfcBackOffsetBottom.ButtonStepsUseModifierKeys = true;
+			this.pfcBackOffsetBottom.DefaultValue = 0F;
+			this.pfcBackOffsetBottom.Field1 = "offsetx_bottom";
+			this.pfcBackOffsetBottom.Field2 = "offsety_bottom";
+			this.pfcBackOffsetBottom.LinkValues = false;
+			this.pfcBackOffsetBottom.Location = new System.Drawing.Point(96, 113);
+			this.pfcBackOffsetBottom.Name = "pfcBackOffsetBottom";
+			this.pfcBackOffsetBottom.Size = new System.Drawing.Size(186, 26);
+			this.pfcBackOffsetBottom.TabIndex = 37;
+			this.pfcBackOffsetBottom.OnValuesChanged += new System.EventHandler(this.pfcBackOffsetBottom_OnValuesChanged);
+			// 
+			// backTextureOffset
+			// 
+			this.backTextureOffset.ButtonStep = 1;
+			this.backTextureOffset.ButtonStepBig = 16F;
+			this.backTextureOffset.ButtonStepSmall = 0.1F;
+			this.backTextureOffset.ButtonStepsUseModifierKeys = true;
+			this.backTextureOffset.DefaultValue = 0;
+			this.backTextureOffset.Location = new System.Drawing.Point(96, 17);
+			this.backTextureOffset.Name = "backTextureOffset";
+			this.backTextureOffset.Size = new System.Drawing.Size(186, 26);
+			this.backTextureOffset.TabIndex = 42;
+			this.backTextureOffset.OnValuesChanged += new System.EventHandler(this.backTextureOffset_OnValuesChanged);
+			// 
+			// backlow
+			// 
+			this.backlow.Location = new System.Drawing.Point(309, 415);
+			this.backlow.MultipleTextures = false;
+			this.backlow.Name = "backlow";
+			this.backlow.Required = false;
+			this.backlow.Size = new System.Drawing.Size(220, 184);
+			this.backlow.TabIndex = 6;
+			this.backlow.TextureName = "";
+			this.backlow.UsePreviews = false;
+			this.backlow.OnValueChanged += new System.EventHandler(this.backlow_OnValueChanged);
+			// 
+			// backmid
+			// 
+			this.backmid.Location = new System.Drawing.Point(309, 217);
+			this.backmid.MultipleTextures = false;
+			this.backmid.Name = "backmid";
+			this.backmid.Required = false;
+			this.backmid.Size = new System.Drawing.Size(220, 184);
+			this.backmid.TabIndex = 5;
+			this.backmid.TextureName = "";
+			this.backmid.UsePreviews = false;
+			this.backmid.OnValueChanged += new System.EventHandler(this.backmid_OnValueChanged);
+			// 
+			// backhigh
+			// 
+			this.backhigh.Location = new System.Drawing.Point(309, 19);
+			this.backhigh.MultipleTextures = false;
+			this.backhigh.Name = "backhigh";
+			this.backhigh.Required = false;
+			this.backhigh.Size = new System.Drawing.Size(220, 184);
+			this.backhigh.TabIndex = 4;
+			this.backhigh.TextureName = "";
+			this.backhigh.UsePreviews = false;
+			this.backhigh.OnValueChanged += new System.EventHandler(this.backhigh_OnValueChanged);
+			// 
+			// tabcomment
+			// 
+			this.tabcomment.Controls.Add(this.commenteditor);
+			this.tabcomment.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.tabcomment.Location = new System.Drawing.Point(4, 23);
+			this.tabcomment.Name = "tabcomment";
+			this.tabcomment.Size = new System.Drawing.Size(549, 621);
+			this.tabcomment.TabIndex = 4;
+			this.tabcomment.Text = "Comment";
+			this.tabcomment.UseVisualStyleBackColor = true;
+			// 
+			// commenteditor
+			// 
+			this.commenteditor.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.commenteditor.Location = new System.Drawing.Point(3, 3);
+			this.commenteditor.Name = "commenteditor";
+			this.commenteditor.Size = new System.Drawing.Size(543, 615);
+			this.commenteditor.TabIndex = 0;
+			// 
+			// tabcustom
+			// 
+			this.tabcustom.Controls.Add(this.fieldslist);
+			this.tabcustom.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.tabcustom.Location = new System.Drawing.Point(4, 23);
+			this.tabcustom.Name = "tabcustom";
+			this.tabcustom.Padding = new System.Windows.Forms.Padding(3);
+			this.tabcustom.Size = new System.Drawing.Size(549, 621);
+			this.tabcustom.TabIndex = 2;
+			this.tabcustom.Text = "Custom";
+			this.tabcustom.UseVisualStyleBackColor = true;
+			this.tabcustom.MouseEnter += new System.EventHandler(this.tabcustom_MouseEnter);
+			// 
+			// fieldslist
+			// 
+			this.fieldslist.AllowInsert = true;
+			this.fieldslist.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.fieldslist.AutoInsertUserPrefix = true;
+			this.fieldslist.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+			this.fieldslist.Location = new System.Drawing.Point(11, 11);
+			this.fieldslist.Margin = new System.Windows.Forms.Padding(8);
+			this.fieldslist.Name = "fieldslist";
+			this.fieldslist.PropertyColumnVisible = true;
+			this.fieldslist.PropertyColumnWidth = 150;
+			this.fieldslist.Size = new System.Drawing.Size(527, 602);
+			this.fieldslist.TabIndex = 0;
+			this.fieldslist.TypeColumnVisible = true;
+			this.fieldslist.TypeColumnWidth = 100;
+			this.fieldslist.ValueColumnVisible = true;
+			// 
+			// imagelist
+			// 
+			this.imagelist.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imagelist.ImageStream")));
+			this.imagelist.TransparentColor = System.Drawing.Color.Transparent;
+			this.imagelist.Images.SetKeyName(0, "Check.png");
+			this.imagelist.Images.SetKeyName(1, "SearchClear.png");
+			// 
+			// LinedefEditFormUDMF
+			// 
+			this.AcceptButton = this.apply;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.CancelButton = this.cancel;
+			this.ClientSize = new System.Drawing.Size(577, 697);
+			this.Controls.Add(this.tabs);
+			this.Controls.Add(this.cancel);
+			this.Controls.Add(this.apply);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "LinedefEditFormUDMF";
+			this.Opacity = 1;
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Edit Linedef";
+			this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.LinedefEditForm_FormClosing);
+			this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.LinedefEditForm_HelpRequested);
+			this.actiongroup.ResumeLayout(false);
+			this.actiongroup.PerformLayout();
+			this.flagsgroup.ResumeLayout(false);
+			this.tabs.ResumeLayout(false);
+			this.tabproperties.ResumeLayout(false);
+			this.groupsettings.ResumeLayout(false);
+			this.groupsettings.PerformLayout();
+			this.activationGroup.ResumeLayout(false);
+			((System.ComponentModel.ISupportInitialize)(this.missingactivation)).EndInit();
+			this.idgroup.ResumeLayout(false);
+			this.tabfront.ResumeLayout(false);
+			this.tabfront.PerformLayout();
+			this.frontgroup.ResumeLayout(false);
+			this.frontflagsgroup.ResumeLayout(false);
+			this.frontscalegroup.ResumeLayout(false);
+			this.groupBox6.ResumeLayout(false);
+			this.groupBox5.ResumeLayout(false);
+			this.groupBox5.PerformLayout();
+			this.tabback.ResumeLayout(false);
+			this.tabback.PerformLayout();
+			this.backgroup.ResumeLayout(false);
+			this.groupBox4.ResumeLayout(false);
+			this.groupBox4.PerformLayout();
+			this.backflagsgroup.ResumeLayout(false);
+			this.backscalegroup.ResumeLayout(false);
+			this.groupBox1.ResumeLayout(false);
+			this.tabcomment.ResumeLayout(false);
+			this.tabcustom.ResumeLayout(false);
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Button cancel;
+		private System.Windows.Forms.Button apply;
+		private System.Windows.Forms.GroupBox actiongroup;
+		private System.Windows.Forms.GroupBox flagsgroup;
+		private CodeImp.DoomBuilder.Controls.CheckboxArrayControl flags;
+		private System.Windows.Forms.Button browseaction;
+		private CodeImp.DoomBuilder.Controls.ActionSelectorControl action;
+		private System.Windows.Forms.TabControl tabs;
+		private System.Windows.Forms.TabPage tabproperties;
+		private System.Windows.Forms.TabPage tabfront;
+		private System.Windows.Forms.GroupBox frontgroup;
+		private System.Windows.Forms.CheckBox frontside;
+		private System.Windows.Forms.CheckBox backside;
+		private System.Windows.Forms.GroupBox backgroup;
+		private CodeImp.DoomBuilder.Controls.TextureSelectorControl frontlow;
+		private CodeImp.DoomBuilder.Controls.TextureSelectorControl frontmid;
+		private CodeImp.DoomBuilder.Controls.TextureSelectorControl fronthigh;
+		private CodeImp.DoomBuilder.Controls.TextureSelectorControl backlow;
+		private CodeImp.DoomBuilder.Controls.TextureSelectorControl backmid;
+		private CodeImp.DoomBuilder.Controls.TextureSelectorControl backhigh;
+		private System.Windows.Forms.TabPage tabcustom;
+		private CodeImp.DoomBuilder.Controls.FieldsEditorControl fieldslist;
+		private System.Windows.Forms.GroupBox idgroup;
+		private CodeImp.DoomBuilder.Controls.CheckboxArrayControl udmfactivates;
+		private System.Windows.Forms.Button customfrontbutton;
+		private System.Windows.Forms.Button custombackbutton;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox frontsector;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox backsector;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox lightFront;
+		private System.Windows.Forms.CheckBox cbLightAbsoluteFront;
+		private CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl pfcFrontOffsetTop;
+		private CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl pfcFrontOffsetBottom;
+		private CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl pfcFrontOffsetMid;
+		private CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl pfcFrontScaleBottom;
+		private CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl pfcFrontScaleMid;
+		private CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl pfcFrontScaleTop;
+		private CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl pfcBackScaleBottom;
+		private CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl pfcBackScaleMid;
+		private CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl pfcBackScaleTop;
+		private CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl pfcBackOffsetBottom;
+		private CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl pfcBackOffsetMid;
+		private CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl pfcBackOffsetTop;
+		private System.Windows.Forms.GroupBox groupsettings;
+		private System.Windows.Forms.ComboBox renderStyle;
+		private System.Windows.Forms.Label labelLightFront;
+		private System.Windows.Forms.CheckBox cbLightAbsoluteBack;
+		private System.Windows.Forms.Label labelLightBack;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox lightBack;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox alpha;
+		private CodeImp.DoomBuilder.GZBuilder.Controls.PairedIntControl frontTextureOffset;
+		private CodeImp.DoomBuilder.GZBuilder.Controls.PairedIntControl backTextureOffset;
+		private CodeImp.DoomBuilder.Controls.CheckboxArrayControl flagsFront;
+		private CodeImp.DoomBuilder.Controls.CheckboxArrayControl flagsBack;
+		private System.Windows.Forms.GroupBox activationGroup;
+		private System.Windows.Forms.PictureBox missingactivation;
+		private System.Windows.Forms.ToolTip tooltip;
+		private System.Windows.Forms.ComboBox lockpick;
+		private System.Windows.Forms.TabPage tabback;
+		private System.Windows.Forms.GroupBox backflagsgroup;
+		private System.Windows.Forms.GroupBox backscalegroup;
+		private System.Windows.Forms.GroupBox groupBox1;
+		private System.Windows.Forms.GroupBox groupBox4;
+		private System.Windows.Forms.GroupBox groupBox5;
+		private System.Windows.Forms.GroupBox frontflagsgroup;
+		private System.Windows.Forms.GroupBox frontscalegroup;
+		private System.Windows.Forms.GroupBox groupBox6;
+		private System.Windows.Forms.ImageList imagelist;
+		private System.Windows.Forms.Label labelrenderstyle;
+		private System.Windows.Forms.Label labellockpick;
+		private CodeImp.DoomBuilder.Controls.ActionSpecialHelpButton actionhelp;
+		private System.Windows.Forms.Label labelFrontScaleMid;
+		private System.Windows.Forms.Label labelFrontScaleTop;
+		private System.Windows.Forms.Label labelFrontScaleBottom;
+		private System.Windows.Forms.Label labelFrontOffsetBottom;
+		private System.Windows.Forms.Label labelFrontOffsetMid;
+		private System.Windows.Forms.Label labelFrontOffsetTop;
+		private System.Windows.Forms.Label labelFrontTextureOffset;
+		private System.Windows.Forms.Label labelBackScaleBottom;
+		private System.Windows.Forms.Label labelBackScaleMid;
+		private System.Windows.Forms.Label labelBackScaleTop;
+		private System.Windows.Forms.Label labelBackTextureOffset;
+		private System.Windows.Forms.Label labelBackOffsetBottom;
+		private System.Windows.Forms.Label labelBackOffsetMid;
+		private System.Windows.Forms.Label labelBackOffsetTop;
+		private System.Windows.Forms.TabPage tabcomment;
+		private CodeImp.DoomBuilder.Controls.CommentEditor commenteditor;
+		private CodeImp.DoomBuilder.Controls.ArgumentsControl argscontrol;
+		private CodeImp.DoomBuilder.GZBuilder.Controls.TagsSelector tagsselector;
+		private System.Windows.Forms.Button resetfrontlight;
+		private System.Windows.Forms.Button resetbacklight;
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/LinedefEditFormUDMF.cs b/Source/Core/Windows/LinedefEditFormUDMF.cs
new file mode 100644
index 0000000..8098c5d
--- /dev/null
+++ b/Source/Core/Windows/LinedefEditFormUDMF.cs
@@ -0,0 +1,1881 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.GZBuilder.Controls;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Types;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Windows
+{
+	internal partial class LinedefEditFormUDMF : DelayedForm
+	{
+		#region ================== Events
+
+		public event EventHandler OnValuesChanged; //mxd
+
+		#endregion
+
+		#region ================== Variables
+
+		private ICollection<Linedef> lines;
+		private List<LinedefProperties> linedefprops; //mxd
+		private bool preventchanges;
+		private bool undocreated; //mxd
+		private readonly string[] renderstyles; //mxd
+		private readonly List<int> keynumbers; //mxd 
+
+		//mxd. Persistent settings
+		private static bool linkFrontTopScale;
+		private static bool linkFrontMidScale;
+		private static bool linkFrontBottomScale;
+		private static bool linkBackTopScale;
+		private static bool linkBackMidScale;
+		private static bool linkBackBottomScale;
+
+		private readonly List<PairedFieldsControl> frontUdmfControls; //mxd
+		private readonly List<PairedFieldsControl> backUdmfControls; //mxd
+
+		//mxd. Window setup stuff
+		private static Point location = Point.Empty;
+		private static int activetab;
+
+		private struct LinedefProperties //mxd
+		{
+			public readonly Dictionary<string, bool> Flags;
+			public readonly float Alpha;
+
+			public readonly SidedefProperties Front;
+			public readonly SidedefProperties Back;
+
+			public LinedefProperties(Linedef line) 
+			{
+				Front = (line.Front != null ? new SidedefProperties(line.Front) : null);
+				Back = (line.Back != null ? new SidedefProperties(line.Back) : null);
+				Alpha = UniFields.GetFloat(line.Fields, "alpha", 1.0f);
+				Flags = line.GetFlags();
+			}
+		}
+
+		private class SidedefProperties //mxd
+		{
+			public readonly Dictionary<string, bool> Flags;
+
+			public readonly float ScaleTopX;
+			public readonly float ScaleTopY;
+			public readonly float ScaleMidX;
+			public readonly float ScaleMidY;
+			public readonly float ScaleBottomX;
+			public readonly float ScaleBottomY;
+
+			public readonly int OffsetX;
+			public readonly int OffsetY;
+
+			public readonly float OffsetTopX;
+			public readonly float OffsetTopY;
+			public readonly float OffsetMidX;
+			public readonly float OffsetMidY;
+			public readonly float OffsetBottomX;
+			public readonly float OffsetBottomY;
+
+			public readonly int Brightness;
+			public readonly bool AbsoluteBrightness;
+
+			public readonly string TextureTop;
+			public readonly string TextureMid;
+			public readonly string TextureLow;
+
+			public SidedefProperties(Sidedef side) 
+			{
+				Flags = side.GetFlags();
+
+				//offset
+				OffsetX = side.OffsetX;
+				OffsetY = side.OffsetY;
+
+				Brightness = UniFields.GetInteger(side.Fields, "light", 0);
+				AbsoluteBrightness = side.Fields.GetValue("lightabsolute", false);
+
+				//scales
+				ScaleTopX = UniFields.GetFloat(side.Fields, "scalex_top", 1.0f);
+				ScaleTopY = UniFields.GetFloat(side.Fields, "scaley_top", 1.0f);
+				ScaleMidX = UniFields.GetFloat(side.Fields, "scalex_mid", 1.0f);
+				ScaleMidY = UniFields.GetFloat(side.Fields, "scaley_mid", 1.0f);
+				ScaleBottomX = UniFields.GetFloat(side.Fields, "scalex_bottom", 1.0f);
+				ScaleBottomY = UniFields.GetFloat(side.Fields, "scaley_bottom", 1.0f);
+
+				//offsets
+				OffsetTopX = UniFields.GetFloat(side.Fields, "offsetx_top", 0f);
+				OffsetTopY = UniFields.GetFloat(side.Fields, "offsety_top", 0f);
+				OffsetMidX = UniFields.GetFloat(side.Fields, "offsetx_mid", 0f);
+				OffsetMidY = UniFields.GetFloat(side.Fields, "offsety_mid", 0f);
+				OffsetBottomX = UniFields.GetFloat(side.Fields, "offsetx_bottom", 0f);
+				OffsetBottomY = UniFields.GetFloat(side.Fields, "offsety_bottom", 0f);
+
+				//textures
+				TextureTop = side.HighTexture;
+				TextureMid = side.MiddleTexture;
+				TextureLow = side.LowTexture;
+			}
+		}
+
+		#endregion
+
+		#region ================== Constructor
+
+		public LinedefEditFormUDMF(bool selectfront, bool selectback)
+		{
+			// Initialize
+			InitializeComponent();
+
+			//mxd. Widow setup
+			if(location != Point.Empty) 
+			{
+				this.StartPosition = FormStartPosition.Manual;
+				this.Location = location;
+				if(General.Settings.StoreSelectedEditTab && activetab > 0)
+				{
+					// When front or back tab was previously selected, switch to appropriate side (selectfront/selectback are set in BaseVisualGeometrySidedef.OnEditEnd)
+					if((selectfront || selectback) && (activetab == 1 || activetab == 2))
+						tabs.SelectTab(selectfront ? 1 : 2);
+					else
+						tabs.SelectTab(activetab);
+				}
+			}
+			
+			// Fill flags lists
+			foreach(KeyValuePair<string, string> lf in General.Map.Config.LinedefFlags)
+				flags.Add(lf.Value, lf.Key);
+			flags.Enabled = General.Map.Config.LinedefFlags.Count > 0;
+
+			//mxd
+			foreach(KeyValuePair<string, string> lf in General.Map.Config.SidedefFlags) 
+			{
+				flagsFront.Add(lf.Value, lf.Key);
+				flagsBack.Add(lf.Value, lf.Key);
+			}
+			flagsFront.Enabled = General.Map.Config.SidedefFlags.Count > 0;
+			flagsBack.Enabled = General.Map.Config.SidedefFlags.Count > 0;
+
+			// Fill actions list
+			action.AddInfo(General.Map.Config.SortedLinedefActions.ToArray());
+
+			// Fill activations list
+			foreach(LinedefActivateInfo ai in General.Map.Config.LinedefActivates) udmfactivates.Add(ai.Title, ai);
+
+			//mxd. Fill keys list
+			keynumbers = new List<int>();
+			if(General.Map.Config.Enums.ContainsKey("keys"))
+			{
+				foreach(EnumItem item in General.Map.Config.Enums["keys"])
+				{
+					keynumbers.Add(item.GetIntValue());
+					lockpick.Items.Add(item);
+				}
+			}
+			lockpick.Enabled = (keynumbers.Count > 0);
+			labellockpick.Enabled = (keynumbers.Count > 0);
+			
+			// Initialize image selectors
+			fronthigh.Initialize();
+			frontmid.Initialize();
+			frontlow.Initialize();
+			backhigh.Initialize();
+			backmid.Initialize();
+			backlow.Initialize();
+
+			// Initialize custom fields editor
+			fieldslist.Setup("linedef");
+
+			// Fill universal fields list
+			fieldslist.ListFixedFields(General.Map.Config.LinedefFields);
+
+			//initialize controls
+			frontUdmfControls = new List<PairedFieldsControl> { pfcFrontOffsetTop, pfcFrontOffsetMid, pfcFrontOffsetBottom, pfcFrontScaleTop, pfcFrontScaleMid, pfcFrontScaleBottom };
+			backUdmfControls = new List<PairedFieldsControl> { pfcBackOffsetTop, pfcBackOffsetMid, pfcBackOffsetBottom, pfcBackScaleTop, pfcBackScaleMid, pfcBackScaleBottom };
+
+			// Setup renderstyles
+			renderstyles = new string[General.Map.Config.LinedefRenderStyles.Count];
+			General.Map.Config.LinedefRenderStyles.Keys.CopyTo(renderstyles, 0);
+			renderStyle.Enabled = (General.Map.Config.LinedefRenderStyles.Count > 0);
+			labelrenderstyle.Enabled = (General.Map.Config.LinedefRenderStyles.Count > 0);
+
+			// Fill renderstyles
+			foreach(KeyValuePair<string, string> lf in General.Map.Config.LinedefRenderStyles)
+				renderStyle.Items.Add(lf.Value);
+
+			//Restore value linking
+			pfcFrontScaleTop.LinkValues = linkFrontTopScale;
+			pfcFrontScaleMid.LinkValues = linkFrontMidScale;
+			pfcFrontScaleBottom.LinkValues = linkFrontBottomScale;
+			pfcBackScaleTop.LinkValues = linkBackTopScale;
+			pfcBackScaleMid.LinkValues = linkBackMidScale;
+			pfcBackScaleBottom.LinkValues = linkBackBottomScale;
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This sets up the form to edit the given lines
+		public void Setup(ICollection<Linedef> lines)
+		{
+			preventchanges = true;
+			
+			// Keep this list
+			this.lines = lines;
+			if(lines.Count > 1) this.Text = "Edit Linedefs (" + lines.Count + ")";
+			linedefprops = new List<LinedefProperties>();
+			
+			////////////////////////////////////////////////////////////////////////
+			// Set all options to the first linedef properties
+			////////////////////////////////////////////////////////////////////////
+
+			// Get first line
+			Linedef fl = General.GetByIndex(lines, 0);
+			
+			// Flags
+			foreach(CheckBox c in flags.Checkboxes)
+				if(fl.Flags.ContainsKey(c.Tag.ToString())) c.Checked = fl.Flags[c.Tag.ToString()];
+
+			// UDMF Activations
+			foreach(CheckBox c in udmfactivates.Checkboxes)
+			{
+				LinedefActivateInfo ai = (c.Tag as LinedefActivateInfo);
+				if(fl.Flags.ContainsKey(ai.Key)) c.Checked = fl.Flags[ai.Key];
+			}
+
+			fieldslist.SetValues(fl.Fields, true); // Custom fields
+			commenteditor.SetValues(fl.Fields, true); //mxd. Comments
+			renderStyle.SelectedIndex = Array.IndexOf(renderstyles, fl.Fields.GetValue("renderstyle", "translucent"));
+			alpha.Text = General.Clamp(fl.Fields.GetValue("alpha", 1.0f), 0f, 1f).ToString();
+
+			// Locknumber
+			int locknumber = fl.Fields.GetValue("locknumber", 0);
+			lockpick.SelectedIndex = keynumbers.IndexOf(locknumber);
+			if(lockpick.SelectedIndex == -1) lockpick.Text = locknumber.ToString();
+
+			// Action
+			action.Value = fl.Action;
+
+			//mxd. Tags
+			tagsselector.Setup(UniversalType.LinedefTag);
+			tagsselector.SetValue(fl.Tags, true);
+
+			//mxd. Args
+			argscontrol.SetValue(fl, true);
+			
+			// Front side and back side checkboxes
+			frontside.Checked = (fl.Front != null);
+			backside.Checked = (fl.Back != null);
+
+			// Front settings
+			if(fl.Front != null)
+			{
+				fronthigh.TextureName = fl.Front.HighTexture;
+				frontmid.TextureName = fl.Front.MiddleTexture;
+				frontlow.TextureName = fl.Front.LowTexture;
+				fronthigh.Required = fl.Front.HighRequired();
+				frontmid.Required = fl.Front.MiddleRequired();
+				frontlow.Required = fl.Front.LowRequired();
+				frontsector.Text = fl.Front.Sector.Index.ToString();
+
+				//flags
+				foreach(CheckBox c in flagsFront.Checkboxes)
+					if(fl.Front.Flags.ContainsKey(c.Tag.ToString())) c.Checked = fl.Front.Flags[c.Tag.ToString()];
+
+				//front settings
+				foreach(PairedFieldsControl pfc in frontUdmfControls)
+					pfc.SetValuesFrom(fl.Front.Fields, true);
+
+				lightFront.Text = UniFields.GetInteger(fl.Front.Fields, "light", 0).ToString();
+				cbLightAbsoluteFront.Checked = fl.Front.Fields.GetValue("lightabsolute", false);
+
+				frontTextureOffset.SetValues(fl.Front.OffsetX, fl.Front.OffsetY, true); //mxd
+			}
+
+			// Back settings
+			if(fl.Back != null)
+			{
+				backhigh.TextureName = fl.Back.HighTexture;
+				backmid.TextureName = fl.Back.MiddleTexture;
+				backlow.TextureName = fl.Back.LowTexture;
+				backhigh.Required = fl.Back.HighRequired();
+				backmid.Required = fl.Back.MiddleRequired();
+				backlow.Required = fl.Back.LowRequired();
+				backsector.Text = fl.Back.Sector.Index.ToString();
+
+				//flags
+				foreach(CheckBox c in flagsBack.Checkboxes)
+					if(fl.Back.Flags.ContainsKey(c.Tag.ToString())) c.Checked = fl.Back.Flags[c.Tag.ToString()];
+
+				//back settings
+				foreach(PairedFieldsControl pfc in backUdmfControls)
+					pfc.SetValuesFrom(fl.Back.Fields, true);
+
+				lightBack.Text = UniFields.GetInteger(fl.Back.Fields, "light", 0).ToString();
+				cbLightAbsoluteBack.Checked = fl.Back.Fields.GetValue("lightabsolute", false);
+ 
+				backTextureOffset.SetValues(fl.Back.OffsetX, fl.Back.OffsetY, true); //mxd
+			}
+
+			////////////////////////////////////////////////////////////////////////
+			// Now go for all lines and change the options when a setting is different
+			////////////////////////////////////////////////////////////////////////
+
+			// Go for all lines
+			foreach(Linedef l in lines)
+			{
+				// Flags
+				foreach(CheckBox c in flags.Checkboxes)
+				{
+					if(c.CheckState == CheckState.Indeterminate) continue; //mxd
+					if(l.IsFlagSet(c.Tag.ToString()) != c.Checked) 
+					{
+						c.ThreeState = true;
+						c.CheckState = CheckState.Indeterminate;
+					}
+				}
+
+				// UDMF Activations
+				foreach(CheckBox c in udmfactivates.Checkboxes)
+				{
+					if(c.CheckState == CheckState.Indeterminate) continue; //mxd
+
+					LinedefActivateInfo ai = (c.Tag as LinedefActivateInfo);
+					if(l.IsFlagSet(ai.Key) != c.Checked) 
+					{
+						c.ThreeState = true;
+						c.CheckState = CheckState.Indeterminate;
+					}
+				}
+
+				//mxd. UDMF Settings
+
+				// Render style
+				if(renderStyle.SelectedIndex > -1 && renderStyle.SelectedIndex != Array.IndexOf(renderstyles, l.Fields.GetValue("renderstyle", "translucent")))
+					renderStyle.SelectedIndex = -1;
+
+				// Alpha
+				if(!string.IsNullOrEmpty(alpha.Text) && General.Clamp(alpha.GetResultFloat(1.0f), 0f, 1f) != l.Fields.GetValue("alpha", 1.0f))
+					alpha.Text = string.Empty;
+
+				// Locknumber
+				if(!string.IsNullOrEmpty(lockpick.Text)) 
+				{
+					if(lockpick.SelectedIndex == -1) 
+					{
+						if(int.TryParse(lockpick.Text, out locknumber) && locknumber != l.Fields.GetValue("locknumber", 0)) 
+						{
+							lockpick.SelectedIndex = -1;
+							lockpick.Text = string.Empty;
+						}
+					} 
+					else if(keynumbers[lockpick.SelectedIndex] != l.Fields.GetValue("locknumber", 0)) 
+					{
+						lockpick.SelectedIndex = -1;
+						lockpick.Text = string.Empty;
+					}
+				}
+
+				// Custom fields
+				fieldslist.SetValues(l.Fields, false);
+
+				//mxd. Comments
+				commenteditor.SetValues(l.Fields, false);
+
+				// Action/tags
+				if(l.Action != action.Value) action.Empty = true;
+				tagsselector.SetValue(l.Tags, false);
+
+				//mxd. Arguments
+				argscontrol.SetValue(l, false);
+				
+				// Front side checkbox
+				if((l.Front != null) != frontside.Checked)
+				{
+					frontside.ThreeState = true;
+					frontside.CheckState = CheckState.Indeterminate;
+					frontside.AutoCheck = false;
+				}
+
+				// Back side checkbox
+				if((l.Back != null) != backside.Checked)
+				{
+					backside.ThreeState = true;
+					backside.CheckState = CheckState.Indeterminate;
+					backside.AutoCheck = false;
+				}
+
+				// Front settings
+				if(l.Front != null)
+				{
+					//mxd
+					if(fronthigh.TextureName != l.Front.HighTexture) 
+					{
+						if(!fronthigh.Required && l.Front.HighRequired()) fronthigh.Required = true;
+						fronthigh.MultipleTextures = true; //mxd
+						fronthigh.TextureName = string.Empty;
+					}
+					if(frontmid.TextureName != l.Front.MiddleTexture) 
+					{
+						if(!frontmid.Required && l.Front.MiddleRequired()) frontmid.Required = true;
+						frontmid.MultipleTextures = true; //mxd
+						frontmid.TextureName = string.Empty;
+					}
+					if(frontlow.TextureName != l.Front.LowTexture) 
+					{
+						if(!frontlow.Required && l.Front.LowRequired()) frontlow.Required = true;
+						frontlow.MultipleTextures = true; //mxd
+						frontlow.TextureName = string.Empty;
+					}
+					if(frontsector.Text != l.Front.Sector.Index.ToString()) frontsector.Text = string.Empty;
+
+					//flags
+					foreach(CheckBox c in flagsFront.Checkboxes) 
+					{
+						if(c.CheckState == CheckState.Indeterminate) continue;
+						if(l.Front.IsFlagSet(c.Tag.ToString()) != c.Checked) 
+						{
+							c.ThreeState = true;
+							c.CheckState = CheckState.Indeterminate;
+						}
+					}
+
+					//mxd
+					foreach(PairedFieldsControl pfc in frontUdmfControls)
+						pfc.SetValuesFrom(l.Front.Fields, false);
+
+					if(!string.IsNullOrEmpty(lightFront.Text)) 
+					{
+						int light = UniFields.GetInteger(l.Front.Fields, "light", 0);
+						if(light != lightFront.GetResult(light)) lightFront.Text = string.Empty;
+					}
+
+					if(l.Front.Fields.GetValue("lightabsolute", false) != cbLightAbsoluteFront.Checked) 
+					{
+						cbLightAbsoluteFront.ThreeState = true;
+						cbLightAbsoluteFront.CheckState = CheckState.Indeterminate;
+					}
+
+					frontTextureOffset.SetValues(l.Front.OffsetX, l.Front.OffsetY, false); //mxd
+				}
+
+				// Back settings
+				if(l.Back != null)
+				{
+					//mxd
+					if(backhigh.TextureName != l.Back.HighTexture) 
+					{
+						if(!backhigh.Required && l.Back.HighRequired()) backhigh.Required = true;
+						backhigh.MultipleTextures = true; //mxd
+						backhigh.TextureName = string.Empty;
+					}
+					if(backmid.TextureName != l.Back.MiddleTexture) 
+					{
+						if(!backmid.Required && l.Back.MiddleRequired()) backmid.Required = true;
+						backmid.MultipleTextures = true; //mxd
+						backmid.TextureName = string.Empty;
+					}
+					if(backlow.TextureName != l.Back.LowTexture) 
+					{
+						if(!backlow.Required && l.Back.LowRequired()) backlow.Required = true;
+						backlow.MultipleTextures = true; //mxd
+						backlow.TextureName = string.Empty;
+					}
+					if(backsector.Text != l.Back.Sector.Index.ToString()) backsector.Text = string.Empty;
+
+					//flags
+					foreach(CheckBox c in flagsBack.Checkboxes) 
+					{
+						if(c.CheckState == CheckState.Indeterminate) continue;
+						if(l.Back.IsFlagSet(c.Tag.ToString()) != c.Checked) 
+						{
+							c.ThreeState = true;
+							c.CheckState = CheckState.Indeterminate;
+						}
+					}
+
+					//mxd
+					foreach(PairedFieldsControl pfc in backUdmfControls)
+						pfc.SetValuesFrom(l.Back.Fields, false);
+
+					if(!string.IsNullOrEmpty(lightBack.Text)) 
+					{
+						int light = UniFields.GetInteger(l.Back.Fields, "light", 0);
+						if(light != lightBack.GetResult(light))
+							lightBack.Text = string.Empty;
+					}
+
+					if(l.Back.Fields.GetValue("lightabsolute", false) != cbLightAbsoluteBack.Checked) 
+					{
+						cbLightAbsoluteBack.ThreeState = true;
+						cbLightAbsoluteBack.CheckState = CheckState.Indeterminate;
+					}
+
+					backTextureOffset.SetValues(l.Back.OffsetX, l.Back.OffsetY, false); //mxd
+				}
+
+				//mxd
+				linedefprops.Add(new LinedefProperties(l));
+			}
+			
+			// Refresh controls so that they show their image
+			backhigh.Refresh();
+			backmid.Refresh();
+			backlow.Refresh();
+			fronthigh.Refresh();
+			frontmid.Refresh();
+			frontlow.Refresh();
+
+			preventchanges = false;
+
+			CheckActivationFlagsRequired(); //mxd
+			argscontrol.UpdateScriptControls(); //mxd
+			actionhelp.UpdateAction(action.GetValue()); //mxd
+			tagsselector.FinishSetup(); //mxd
+			commenteditor.FinishSetup(); //mxd
+
+			//mxd. Update brightness reset buttons
+			resetfrontlight.Visible = (cbLightAbsoluteFront.CheckState != CheckState.Unchecked || lightFront.GetResult(0) != 0);
+			resetbacklight.Visible = (cbLightAbsoluteBack.CheckState != CheckState.Unchecked || lightBack.GetResult(0) != 0);
+
+			//mxd. Update some labels
+			if(frontside.CheckState != CheckState.Unchecked)
+			{
+				// Update Offset labels
+				labelFrontTextureOffset.Enabled = frontTextureOffset.NonDefaultValue;
+				labelFrontOffsetTop.Enabled = pfcFrontOffsetTop.NonDefaultValue;
+				labelFrontOffsetMid.Enabled = pfcFrontOffsetMid.NonDefaultValue;
+				labelFrontOffsetBottom.Enabled = pfcFrontOffsetBottom.NonDefaultValue;
+
+				// Update Scale labels
+				labelFrontScaleTop.Enabled = pfcFrontScaleTop.NonDefaultValue;
+				labelFrontScaleMid.Enabled = pfcFrontScaleMid.NonDefaultValue;
+				labelFrontScaleBottom.Enabled = pfcFrontScaleBottom.NonDefaultValue;
+			}
+			if(backside.CheckState != CheckState.Unchecked)
+			{
+				// Update Offset labels
+				labelBackTextureOffset.Enabled = backTextureOffset.NonDefaultValue;
+				labelBackOffsetTop.Enabled = pfcBackOffsetTop.NonDefaultValue;
+				labelBackOffsetMid.Enabled = pfcBackOffsetMid.NonDefaultValue;
+				labelBackOffsetBottom.Enabled = pfcBackOffsetBottom.NonDefaultValue;
+
+				// Update Scale labels
+				labelBackScaleTop.Enabled = pfcBackScaleTop.NonDefaultValue;
+				labelBackScaleMid.Enabled = pfcBackScaleMid.NonDefaultValue;
+				labelBackScaleBottom.Enabled = pfcBackScaleBottom.NonDefaultValue;
+			}
+		}
+
+		//mxd
+		private void MakeUndo() 
+		{
+			if(undocreated) return;
+			undocreated = true;
+
+			//mxd. Make undo
+			General.Map.UndoRedo.CreateUndo("Edit " + (lines.Count > 1 ? lines.Count + " linedefs" : "linedef"));
+
+			if(General.Map.FormatInterface.HasCustomFields) 
+			{
+				foreach(Linedef l in lines)
+				{
+					l.Fields.BeforeFieldsChange();
+					if(l.Front != null) l.Front.Fields.BeforeFieldsChange();
+					if(l.Back != null) l.Back.Fields.BeforeFieldsChange();
+				}
+			}
+		}
+
+		//mxd
+		private void CheckActivationFlagsRequired()
+		{
+			// Display a warning if we have an action and no activation flags
+			if(action.Value != 0 
+				&& General.Map.Config.LinedefActions.ContainsKey(action.Value) 
+				&& General.Map.Config.LinedefActions[action.Value].RequiresActivation) 
+			{
+				bool haveactivationflag = false;
+				foreach(CheckBox c in udmfactivates.Checkboxes) 
+				{
+					if(c.CheckState != CheckState.Unchecked) 
+					{
+						haveactivationflag = true;
+						break;
+					}
+				}
+
+				missingactivation.Visible = !haveactivationflag;
+				activationGroup.ForeColor = (!haveactivationflag ? Color.DarkRed : SystemColors.ControlText);
+			} 
+			else 
+			{
+				missingactivation.Visible = false;
+				activationGroup.ForeColor = SystemColors.ControlText;
+			}
+		}
+
+		#endregion
+
+		#region ================== Events
+
+		// Apply clicked
+		private void apply_Click(object sender, EventArgs e)
+		{
+			// Verify the action
+			if((action.Value < General.Map.FormatInterface.MinAction) || (action.Value > General.Map.FormatInterface.MaxAction))
+			{
+				General.ShowWarningMessage("Linedef action must be between " + General.Map.FormatInterface.MinAction + " and " + General.Map.FormatInterface.MaxAction + ".", MessageBoxButtons.OK);
+				return;
+			}
+
+			MakeUndo();
+
+			//mxd
+			int locknumber = 0;
+			bool setlocknumber = false;
+			if(!string.IsNullOrEmpty(lockpick.Text)) 
+			{
+				if(lockpick.SelectedIndex == -1) 
+				{
+					setlocknumber = int.TryParse(lockpick.Text, out locknumber);
+				} 
+				else 
+				{
+					locknumber = keynumbers[lockpick.SelectedIndex];
+					setlocknumber = true;
+				}
+			}
+			
+			// Go for all the lines
+			int tagoffset = 0; //mxd
+			foreach(Linedef l in lines)
+			{
+				// UDMF activations
+				foreach(CheckBox c in udmfactivates.Checkboxes)
+				{
+					LinedefActivateInfo ai = (c.Tag as LinedefActivateInfo);
+					switch(c.CheckState)
+					{
+						case CheckState.Checked: l.SetFlag(ai.Key, true); break;
+						case CheckState.Unchecked: l.SetFlag(ai.Key, false); break;
+					}
+				}
+				
+				// Action/tags
+				if(!action.Empty) l.Action = action.Value;
+				tagsselector.ApplyTo(l, tagoffset++); //mxd
+
+				//mxd. Apply args
+				argscontrol.Apply(l);
+				
+				// Remove front side?
+				if((l.Front != null) && (frontside.CheckState == CheckState.Unchecked))
+				{
+					l.Front.Dispose();
+				}
+				// Create or modify front side?
+				else if(frontside.CheckState == CheckState.Checked)
+				{
+					// Make sure we have a valid sector (make a new one if needed)
+					int index = (l.Front != null ? l.Front.Sector.Index : -1);
+					index = frontsector.GetResult(index);
+					if((index > -1) && (index < General.Map.Map.Sectors.Count))
+					{
+						Sector s = (General.Map.Map.GetSectorByIndex(index) ?? General.Map.Map.CreateSector());
+						if(s != null)
+						{
+							// Create new sidedef?
+							if(l.Front == null) General.Map.Map.CreateSidedef(l, true, s);
+
+							// Change sector?
+							if(l.Front != null && l.Front.Sector != s) l.Front.SetSector(s);
+						}
+					}
+				}
+
+				// Remove back side?
+				if((l.Back != null) && (backside.CheckState == CheckState.Unchecked))
+				{
+					l.Back.Dispose();
+				}
+				// Create or modify back side?
+				else if(backside.CheckState == CheckState.Checked)
+				{
+					// Make sure we have a valid sector (make a new one if needed)
+					int index = (l.Back != null ? l.Back.Sector.Index : -1);
+					index = backsector.GetResult(index);
+					if((index > -1) && (index < General.Map.Map.Sectors.Count))
+					{
+						Sector s = (General.Map.Map.GetSectorByIndex(index) ?? General.Map.Map.CreateSector());
+						if(s != null)
+						{
+							// Create new sidedef?
+							if(l.Back == null) General.Map.Map.CreateSidedef(l, false, s);
+							
+							// Change sector?
+							if(l.Back != null && l.Back.Sector != s) l.Back.SetSector(s);
+						}
+					}
+				}
+
+				//mxd. UDMF Settings
+				fieldslist.Apply(l.Fields);
+				if(setlocknumber) UniFields.SetInteger(l.Fields, "locknumber", locknumber, 0);
+				commenteditor.Apply(l.Fields);
+			}
+
+			//mxd. Store value linking
+			linkFrontTopScale = pfcFrontScaleTop.LinkValues;
+			linkFrontMidScale = pfcFrontScaleMid.LinkValues;
+			linkFrontBottomScale = pfcFrontScaleBottom.LinkValues;
+			linkBackTopScale = pfcBackScaleTop.LinkValues;
+			linkBackMidScale = pfcBackScaleMid.LinkValues;
+			linkBackBottomScale = pfcBackScaleBottom.LinkValues;
+
+			// Update the used textures
+			General.Map.Data.UpdateUsedTextures();
+			
+			// Done
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null)	OnValuesChanged(this, EventArgs.Empty); //mxd
+			this.DialogResult = DialogResult.OK;
+			this.Close();
+		}
+
+		// Cancel clicked
+		private void cancel_Click(object sender, EventArgs e)
+		{
+			//mxd. Let's pretend nothing of this really happened...
+			if(undocreated) General.Map.UndoRedo.WithdrawUndo();
+			
+			// Be gone
+			this.DialogResult = DialogResult.Cancel;
+			this.Close();
+		}
+
+		// Front side (un)checked
+		private void frontside_CheckStateChanged(object sender, EventArgs e) 
+		{
+			// Enable/disable panel
+			// NOTE: Also enabled when checkbox is grayed!
+			frontgroup.Enabled = (frontside.CheckState != CheckState.Unchecked);
+			tabfront.ImageIndex = (frontside.CheckState == CheckState.Unchecked ? 1 : 0);
+		}
+
+		// Back side (un)checked
+		private void backside_CheckStateChanged(object sender, EventArgs e) 
+		{
+			// Enable/disable panel
+			// NOTE: Also enabled when checkbox is grayed!
+			backgroup.Enabled = (backside.CheckState != CheckState.Unchecked);
+			tabback.ImageIndex = (backside.CheckState == CheckState.Unchecked ? 1 : 0);
+		}
+
+		// Action changes
+		private void action_ValueChanges(object sender, EventArgs e)
+		{
+			int showaction = 0;
+			
+			// Only when line type is known
+			if(General.Map.Config.LinedefActions.ContainsKey(action.Value)) showaction = action.Value;
+
+			//mxd. Change the argument descriptions
+			argscontrol.UpdateAction(showaction, preventchanges);
+
+			if(!preventchanges) 
+			{
+				MakeUndo(); //mxd
+
+				//mxd. Update what must be updated
+				CheckActivationFlagsRequired();
+				argscontrol.UpdateScriptControls();
+				actionhelp.UpdateAction(showaction);
+			}
+		}
+
+		// Browse Action clicked
+		private void browseaction_Click(object sender, EventArgs e)
+		{
+			action.Value = ActionBrowserForm.BrowseAction(this, action.Value);
+		}
+
+		//mxd
+		private void tabcustom_MouseEnter(object sender, EventArgs e) 
+		{
+			fieldslist.Focus();
+		}
+
+		//mxd. Store window location
+		private void LinedefEditForm_FormClosing(object sender, FormClosingEventArgs e) 
+		{
+			location = this.Location;
+			activetab = tabs.SelectedIndex;
+		}
+
+		// Help!
+		private void LinedefEditForm_HelpRequested(object sender, HelpEventArgs hlpevent)
+		{
+			General.ShowHelp("w_linedefedit.html");
+			hlpevent.Handled = true;
+		}
+
+		#endregion
+
+		#region ================== mxd. Realtime events (linedef)
+
+		private void cbRenderStyle_SelectedIndexChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+
+			//update values
+			foreach(Linedef l in lines)
+				UniFields.SetString(l.Fields, "renderstyle", renderstyles[renderStyle.SelectedIndex], "translucent");
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+		
+		private void alpha_WhenTextChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+			int i = 0;
+
+			//restore values
+			if(string.IsNullOrEmpty(alpha.Text)) 
+			{
+				foreach(Linedef l in lines) 
+					UniFields.SetFloat(l.Fields, "alpha", linedefprops[i++].Alpha, 1.0f);
+			} 
+			else //update values
+			{
+				foreach(Linedef l in lines) 
+				{
+					float value = General.Clamp(alpha.GetResultFloat(l.Fields.GetValue("alpha", 1.0f)), 0f, 1.0f);
+					UniFields.SetFloat(l.Fields, "alpha", value, 1.0f);
+				}
+			}
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null)	OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void flags_OnValueChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+			int i = 0;
+
+			foreach(Linedef l in lines) 
+			{
+				// Apply all flags
+				foreach(CheckBox c in flags.Checkboxes) 
+				{
+					if(c.CheckState == CheckState.Checked)
+						l.SetFlag(c.Tag.ToString(), true);
+					else if(c.CheckState == CheckState.Unchecked)
+						l.SetFlag(c.Tag.ToString(), false);
+					else if(linedefprops[i].Flags.ContainsKey(c.Tag.ToString()))
+						l.SetFlag(c.Tag.ToString(), linedefprops[i].Flags[c.Tag.ToString()]);
+					else //linedefs created in the editor have empty Flags by default
+						l.SetFlag(c.Tag.ToString(), false);
+				}
+
+				i++;
+			}
+			
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null)	OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		//mxd
+		private void udmfactivates_OnValueChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			CheckActivationFlagsRequired();
+		}
+
+		#endregion
+
+		#region ================== mxd. Realtime events (sides)
+
+		#region Custom fields changed
+
+		// Custom fields on front sides
+		private void customfrontbutton_Click(object sender, EventArgs e) 
+		{
+			// Make collection of front sides
+			List<MapElement> sides = new List<MapElement>(lines.Count);
+			foreach(Linedef l in lines) if(l.Front != null) sides.Add(l.Front);
+
+			if(!CustomFieldsForm.ShowDialog(this, "Front side custom fields", "sidedef", sides, General.Map.Config.SidedefFields)) return;
+
+			//Apply values
+			Sidedef fs = General.GetByIndex(sides, 0) as Sidedef;
+
+			//..to the first side
+			foreach(PairedFieldsControl pfc in frontUdmfControls)
+				pfc.SetValuesFrom(fs.Fields, true);
+
+			lightFront.Text = UniFields.GetInteger(fs.Fields, "light", 0).ToString();
+			cbLightAbsoluteFront.ThreeState = false;
+			cbLightAbsoluteFront.Checked = fs.Fields.GetValue("lightabsolute", false);
+					
+			//flags
+			foreach(CheckBox c in flagsFront.Checkboxes)
+				if(fs.Flags.ContainsKey(c.Tag.ToString())) c.Checked = fs.Flags[c.Tag.ToString()];
+
+			//..then to all of them
+			foreach(Sidedef s in sides)
+			{
+				foreach(PairedFieldsControl pfc in frontUdmfControls)
+					pfc.SetValuesFrom(s.Fields, false);
+
+				if(!string.IsNullOrEmpty(lightFront.Text)) 
+				{
+					int light = UniFields.GetInteger(s.Fields, "light", 0);
+					if(light != lightFront.GetResult(light)) lightFront.Text = string.Empty;
+				}
+
+				if(s.Fields.GetValue("lightabsolute", false) != cbLightAbsoluteFront.Checked) 
+				{
+					cbLightAbsoluteFront.ThreeState = true;
+					cbLightAbsoluteFront.CheckState = CheckState.Indeterminate;
+				}
+
+				//flags
+				foreach(CheckBox c in flagsFront.Checkboxes) 
+				{
+					if(c.CheckState == CheckState.Indeterminate) continue;
+
+					if(s.Flags.ContainsKey(c.Tag.ToString())) 
+					{
+						if(s.Flags[c.Tag.ToString()] != c.Checked) 
+						{
+							c.ThreeState = true;
+							c.CheckState = CheckState.Indeterminate;
+						}
+					}
+				}
+			}
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		// Custom fields on back sides
+		private void custombackbutton_Click(object sender, EventArgs e) 
+		{
+			// Make collection of back sides
+			List<MapElement> sides = new List<MapElement>(lines.Count);
+			foreach(Linedef l in lines) if(l.Back != null) sides.Add(l.Back);
+
+			// Edit these
+			if(!CustomFieldsForm.ShowDialog(this, "Back side custom fields", "sidedef", sides, General.Map.Config.SidedefFields)) return;
+
+			//Apply values
+			Sidedef fs = General.GetByIndex(sides, 0) as Sidedef;
+
+			//..to the first side
+			foreach(PairedFieldsControl pfc in backUdmfControls)
+				pfc.SetValuesFrom(fs.Fields, true);
+
+			lightBack.Text = UniFields.GetInteger(fs.Fields, "light", 0).ToString();
+			cbLightAbsoluteBack.ThreeState = false;
+			cbLightAbsoluteBack.Checked = fs.Fields.GetValue("lightabsolute", false);
+
+			//flags
+			foreach(CheckBox c in flagsBack.Checkboxes)
+				if(fs.Flags.ContainsKey(c.Tag.ToString())) c.Checked = fs.Flags[c.Tag.ToString()];
+
+			//..then to all of them
+			foreach(Sidedef s in sides) 
+			{
+				foreach(PairedFieldsControl pfc in backUdmfControls)
+					pfc.SetValuesFrom(s.Fields, false);
+
+				if(!string.IsNullOrEmpty(lightBack.Text)) 
+				{
+					int light = UniFields.GetInteger(s.Fields, "light", 0);
+					if(light != lightBack.GetResult(light)) lightBack.Text = string.Empty;
+				}
+
+				if(s.Fields.GetValue("lightabsolute", false) != cbLightAbsoluteBack.Checked) 
+				{
+					cbLightAbsoluteBack.ThreeState = true;
+					cbLightAbsoluteBack.CheckState = CheckState.Indeterminate;
+				}
+
+				//flags
+				foreach(CheckBox c in flagsBack.Checkboxes) 
+				{
+					if(c.CheckState == CheckState.Indeterminate) continue;
+
+					if(s.Flags.ContainsKey(c.Tag.ToString()) && s.Flags[c.Tag.ToString()] != c.Checked) 
+					{
+						c.ThreeState = true;
+						c.CheckState = CheckState.Indeterminate;
+					}
+				}
+			}
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+			#endregion
+
+			#region Texture changed
+
+		private void fronthigh_OnValueChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+
+			//restore values
+			if(string.IsNullOrEmpty(fronthigh.TextureName)) 
+			{
+				int i = 0;
+
+				foreach(Linedef l in lines) 
+				{
+					if(l.Front != null) l.Front.SetTextureHigh(linedefprops[i].Front != null ? linedefprops[i].Front.TextureTop : "-");
+					i++;
+				}
+			} 
+			else //update values
+			{
+				foreach(Linedef l in lines) 
+					if(l.Front != null)	l.Front.SetTextureHigh(fronthigh.GetResult(l.Front.HighTexture));
+			}
+
+			// Update the used textures
+			General.Map.Data.UpdateUsedTextures();
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void frontmid_OnValueChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+
+			//restore values
+			if(string.IsNullOrEmpty(frontmid.TextureName)) 
+			{
+				int i = 0;
+
+				foreach(Linedef l in lines) 
+				{
+					if(l.Front != null) l.Front.SetTextureMid(linedefprops[i].Front != null ? linedefprops[i].Front.TextureMid : "-");
+					i++;
+				}
+			} 
+			else //update values
+			{
+				foreach(Linedef l in lines) 
+					if(l.Front != null)	l.Front.SetTextureMid(frontmid.GetResult(l.Front.MiddleTexture));
+			}
+
+			// Update the used textures
+			General.Map.Data.UpdateUsedTextures();
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void frontlow_OnValueChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+
+			//restore values
+			if(string.IsNullOrEmpty(frontlow.TextureName)) 
+			{
+				int i = 0;
+
+				foreach(Linedef l in lines) 
+				{
+					if(l.Front != null) l.Front.SetTextureLow(linedefprops[i].Front != null ? linedefprops[i].Front.TextureLow : "-");
+					i++;
+				}
+			} 
+			else //update values
+			{
+				foreach(Linedef l in lines)
+					if(l.Front != null) l.Front.SetTextureLow(frontlow.GetResult(l.Front.LowTexture));
+			}
+
+			// Update the used textures
+			General.Map.Data.UpdateUsedTextures();
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void backhigh_OnValueChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+
+			//restore values
+			if(string.IsNullOrEmpty(backhigh.TextureName)) 
+			{
+				int i = 0;
+
+				foreach(Linedef l in lines) 
+				{
+					if(l.Back != null) l.Back.SetTextureHigh(linedefprops[i].Back != null ? linedefprops[i].Back.TextureTop : "-");
+					i++;
+				}
+			} 
+			else //update values
+			{
+				foreach(Linedef l in lines)
+					if(l.Back != null) l.Back.SetTextureHigh(backhigh.GetResult(l.Back.HighTexture));
+			}
+
+			// Update the used textures
+			General.Map.Data.UpdateUsedTextures();
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void backmid_OnValueChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+
+			//restore values
+			if(string.IsNullOrEmpty(backmid.TextureName)) 
+			{
+				int i = 0;
+
+				foreach(Linedef l in lines) 
+				{
+					if(l.Back != null) l.Back.SetTextureMid(linedefprops[i].Back != null ? linedefprops[i].Back.TextureMid : "-");
+					i++;
+				}
+			} 
+			else //update values
+			{
+				foreach(Linedef l in lines)
+					if(l.Back != null) l.Back.SetTextureMid(backmid.GetResult(l.Back.MiddleTexture));
+			}
+
+			// Update the used textures
+			General.Map.Data.UpdateUsedTextures();
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void backlow_OnValueChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+
+			//restore values
+			if(string.IsNullOrEmpty(backlow.TextureName)) 
+			{
+				int i = 0;
+
+				foreach(Linedef l in lines) 
+				{
+					if(l.Back != null) l.Back.SetTextureLow(linedefprops[i].Back != null ? linedefprops[i].Back.TextureLow : "-");
+					i++;
+				}
+			} 
+			else //update values
+			{
+				foreach(Linedef l in lines)
+					if(l.Back != null) l.Back.SetTextureLow(backlow.GetResult(l.Back.LowTexture));
+			}
+
+			// Update the used textures
+			General.Map.Data.UpdateUsedTextures();
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+			#endregion
+
+			#region Brightness changed
+
+		private void lightFront_WhenTextChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+			int i = 0;
+
+			//restore values
+			if(string.IsNullOrEmpty(lightFront.Text)) 
+			{
+				foreach(Linedef l in lines) 
+				{
+					if(l.Front != null)
+						UniFields.SetInteger(l.Front.Fields, "light", (linedefprops[i].Front != null ? linedefprops[i].Front.Brightness : 0), 0);
+					i++;
+				}
+			} 
+			else //update values
+			{
+				foreach(Linedef l in lines) 
+				{
+					if(l.Front != null) 
+					{
+						bool absolute = false;
+						switch(cbLightAbsoluteFront.CheckState)
+						{
+							case CheckState.Indeterminate:
+								absolute = l.Front.Fields.GetValue("lightabsolute", false);
+								break;
+							case CheckState.Checked:
+								absolute = true;
+								break;
+						}
+
+						int value = General.Clamp(lightFront.GetResult((linedefprops[i].Front != null ? linedefprops[i].Front.Brightness : 0)), (absolute ? 0 : -255), 255);
+						UniFields.SetInteger(l.Front.Fields, "light", value, 0);
+					}
+					i++;
+				}
+			}
+
+			resetfrontlight.Visible = (cbLightAbsoluteFront.CheckState != CheckState.Unchecked || lightFront.Text != "0");
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void lightBack_WhenTextChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+			int i = 0;
+
+			//restore values
+			if(string.IsNullOrEmpty(lightBack.Text)) 
+			{
+				foreach(Linedef l in lines) 
+				{
+					if(l.Back != null)
+						UniFields.SetInteger(l.Back.Fields, "light", (linedefprops[i].Back != null ? linedefprops[i].Back.Brightness : 0), 0);
+					i++;
+				}
+			} 
+			else //update values
+			{
+				foreach(Linedef l in lines) 
+				{
+					if(l.Back != null) 
+					{
+						bool absolute = false;
+						switch(cbLightAbsoluteBack.CheckState)
+						{
+							case CheckState.Indeterminate:
+								absolute = l.Back.Fields.GetValue("lightabsolute", false);
+								break;
+							case CheckState.Checked:
+								absolute = true;
+								break;
+						}
+
+						int value = General.Clamp(lightBack.GetResult((linedefprops[i].Back != null ? linedefprops[i].Back.Brightness : 0)), (absolute ? 0 : -255), 255);
+						UniFields.SetInteger(l.Back.Fields, "light", value, 0);
+					}
+					i++;
+				}
+			}
+
+			resetbacklight.Visible = (cbLightAbsoluteBack.CheckState != CheckState.Unchecked || lightBack.Text != "0");
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void cbLightAbsoluteFront_CheckedChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+
+			if(cbLightAbsoluteFront.Checked) 
+			{
+				foreach(Linedef l in lines) 
+				{
+					if(l.Front == null) continue;
+					l.Front.Fields["lightabsolute"] = new UniValue(UniversalType.Boolean, true);
+				}
+			} 
+			else if(cbLightAbsoluteFront.CheckState == CheckState.Indeterminate) 
+			{
+				int i = 0;
+
+				foreach(Linedef l in lines) 
+				{
+					if(l.Front != null) 
+					{
+						if(linedefprops[i].Front != null && linedefprops[i].Front.AbsoluteBrightness) 
+						{
+							l.Front.Fields["lightabsolute"] = new UniValue(UniversalType.Boolean, true);
+						} 
+						else if(l.Front.Fields.ContainsKey("lightabsolute")) 
+						{
+							l.Front.Fields.Remove("lightabsolute");
+						}
+					}
+					i++;
+				}
+			} 
+			else 
+			{
+				foreach(Linedef l in lines) 
+				{
+					if(l.Front == null) continue;
+					if(l.Front.Fields.ContainsKey("lightabsolute")) l.Front.Fields.Remove("lightabsolute");
+				}
+			}
+
+			resetfrontlight.Visible = (cbLightAbsoluteFront.CheckState != CheckState.Unchecked || lightFront.Text != "0");
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void cbLightAbsoluteBack_CheckedChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+
+			if(cbLightAbsoluteBack.Checked) 
+			{
+				foreach(Linedef l in lines) 
+				{
+					if(l.Back == null) continue;
+					l.Back.Fields["lightabsolute"] = new UniValue(UniversalType.Boolean, true);
+				}
+			} 
+			else if(cbLightAbsoluteBack.CheckState == CheckState.Indeterminate) 
+			{
+				int i = 0;
+				
+				foreach(Linedef l in lines) 
+				{
+					if(l.Back != null) 
+					{
+						if(linedefprops[i].Back != null && linedefprops[i].Back.AbsoluteBrightness) 
+						{
+							l.Back.Fields["lightabsolute"] = new UniValue(UniversalType.Boolean, true);
+						} 
+						else if(l.Back.Fields.ContainsKey("lightabsolute")) 
+						{
+							l.Back.Fields.Remove("lightabsolute");
+						}
+					}
+					i++;
+				}
+			} 
+			else 
+			{
+				foreach(Linedef l in lines) 
+				{
+					if(l.Back == null) continue;
+					if(l.Back.Fields.ContainsKey("lightabsolute")) l.Back.Fields.Remove("lightabsolute");
+				}
+			}
+
+			resetbacklight.Visible = (cbLightAbsoluteBack.CheckState != CheckState.Unchecked || lightBack.Text != "0");
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void resetfrontlight_Click(object sender, EventArgs e)
+		{
+			MakeUndo(); //mxd
+
+			preventchanges = true;
+
+			cbLightAbsoluteFront.Checked = false;
+			lightFront.Text = "0";
+
+			foreach(Linedef l in lines)
+			{
+				if(l.Front == null) continue;
+				if(l.Front.Fields.ContainsKey("lightabsolute")) l.Front.Fields.Remove("lightabsolute");
+				if(l.Front.Fields.ContainsKey("light")) l.Front.Fields.Remove("light");
+			}
+
+			preventchanges = false;
+
+			resetfrontlight.Visible = false;
+			lightFront.Focus();
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void resetbacklight_Click(object sender, EventArgs e)
+		{
+			MakeUndo(); //mxd
+
+			preventchanges = true;
+
+			cbLightAbsoluteBack.Checked = false;
+			lightBack.Text = "0";
+
+			foreach(Linedef l in lines)
+			{
+				if(l.Back == null) continue;
+				if(l.Back.Fields.ContainsKey("lightabsolute")) l.Back.Fields.Remove("lightabsolute");
+				if(l.Back.Fields.ContainsKey("light")) l.Back.Fields.Remove("light");
+			}
+
+			preventchanges = false;
+
+			resetbacklight.Visible = false;
+			lightBack.Focus();
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+			#endregion
+
+			#region Global texture offsets changed
+
+		private void frontTextureOffset_OnValuesChanged(object sender, EventArgs e)
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+			int i = 0;
+
+			foreach(Linedef l in lines) 
+			{
+				if(l.Front != null) 
+				{
+					if(linedefprops[i].Front != null) 
+					{
+						l.Front.OffsetX = frontTextureOffset.GetValue1(linedefprops[i].Front.OffsetX);
+						l.Front.OffsetY = frontTextureOffset.GetValue2(linedefprops[i].Front.OffsetY);
+					} 
+					else 
+					{
+						l.Front.OffsetX = frontTextureOffset.GetValue1(0);
+						l.Front.OffsetY = frontTextureOffset.GetValue2(0);
+					}
+				}
+
+				i++;
+			}
+
+			General.Map.IsChanged = true;
+			labelFrontTextureOffset.Enabled = frontTextureOffset.NonDefaultValue;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void backTextureOffset_OnValuesChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+			int i = 0;
+
+			foreach(Linedef l in lines) 
+			{
+				if(l.Back != null) 
+				{
+					if(linedefprops[i].Back != null) 
+					{
+						l.Back.OffsetX = backTextureOffset.GetValue1(linedefprops[i].Back.OffsetX);
+						l.Back.OffsetY = backTextureOffset.GetValue2(linedefprops[i].Back.OffsetY);
+					} 
+					else 
+					{
+						l.Back.OffsetX = backTextureOffset.GetValue1(0);
+						l.Back.OffsetY = backTextureOffset.GetValue2(0);
+					}
+				}
+
+				i++;
+			}
+			
+			General.Map.IsChanged = true;
+			labelBackTextureOffset.Enabled = backTextureOffset.NonDefaultValue;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+			#endregion
+
+			#region Texture offsets changed
+
+		private void pfcFrontOffsetTop_OnValuesChanged(object sender, EventArgs e)
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+			int i = 0;
+
+			foreach(Linedef l in lines) 
+			{
+				if(l.Front != null) 
+				{
+					float oldX = linedefprops[i].Front != null ? linedefprops[i].Front.OffsetTopX : 0f;
+					float oldY = linedefprops[i].Front != null ? linedefprops[i].Front.OffsetTopY : 0f;
+					pfcFrontOffsetTop.ApplyTo(l.Front.Fields, General.Map.FormatInterface.MinTextureOffset, General.Map.FormatInterface.MaxTextureOffset, oldX, oldY);
+				}
+				i++;
+			}
+
+			General.Map.IsChanged = true;
+			labelFrontOffsetTop.Enabled = pfcFrontOffsetTop.NonDefaultValue;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void pfcFrontOffsetMid_OnValuesChanged(object sender, EventArgs e)
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+			int i = 0;
+
+			foreach(Linedef l in lines) 
+			{
+				if(l.Front != null) 
+				{
+					float oldX = linedefprops[i].Front != null ? linedefprops[i].Front.OffsetMidX : 0f;
+					float oldY = linedefprops[i].Front != null ? linedefprops[i].Front.OffsetMidY : 0f;
+					pfcFrontOffsetMid.ApplyTo(l.Front.Fields, General.Map.FormatInterface.MinTextureOffset, General.Map.FormatInterface.MaxTextureOffset, oldX, oldY);
+				}
+
+				i++;
+			}
+
+			General.Map.IsChanged = true;
+			labelFrontOffsetMid.Enabled = pfcFrontOffsetMid.NonDefaultValue;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void pfcFrontOffsetBottom_OnValuesChanged(object sender, EventArgs e)
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+			int i = 0;
+
+			foreach(Linedef l in lines) 
+			{
+				if(l.Front != null) 
+				{
+					float oldX = linedefprops[i].Front != null ? linedefprops[i].Front.OffsetBottomX : 0f;
+					float oldY = linedefprops[i].Front != null ? linedefprops[i].Front.OffsetBottomY : 0f;
+					pfcFrontOffsetBottom.ApplyTo(l.Front.Fields, General.Map.FormatInterface.MinTextureOffset, General.Map.FormatInterface.MaxTextureOffset, oldX, oldY);
+				}
+
+				i++;
+			}
+
+			General.Map.IsChanged = true;
+			labelFrontOffsetBottom.Enabled = pfcFrontOffsetBottom.NonDefaultValue;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void pfcBackOffsetTop_OnValuesChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+			int i = 0;
+
+			foreach(Linedef l in lines) 
+			{
+				if(l.Back != null) 
+				{
+					float oldX = linedefprops[i].Back != null ? linedefprops[i].Back.OffsetTopX : 0f;
+					float oldY = linedefprops[i].Back != null ? linedefprops[i].Back.OffsetTopY : 0f;
+					pfcBackOffsetTop.ApplyTo(l.Back.Fields, General.Map.FormatInterface.MinTextureOffset, General.Map.FormatInterface.MaxTextureOffset, oldX, oldY);
+				}
+
+				i++;
+			}
+
+			General.Map.IsChanged = true;
+			labelBackOffsetTop.Enabled = pfcBackOffsetTop.NonDefaultValue;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void pfcBackOffsetMid_OnValuesChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+			int i = 0;
+
+			foreach(Linedef l in lines) 
+			{
+				if(l.Back != null) 
+				{
+					float oldX = linedefprops[i].Back != null ? linedefprops[i].Back.OffsetMidX : 0f;
+					float oldY = linedefprops[i].Back != null ? linedefprops[i].Back.OffsetMidY : 0f;
+					pfcBackOffsetMid.ApplyTo(l.Back.Fields, General.Map.FormatInterface.MinTextureOffset, General.Map.FormatInterface.MaxTextureOffset, oldX, oldY);
+				}
+
+				i++;
+			}
+
+			General.Map.IsChanged = true;
+			labelBackOffsetMid.Enabled = pfcBackOffsetMid.NonDefaultValue;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void pfcBackOffsetBottom_OnValuesChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+			int i = 0;
+
+			foreach(Linedef l in lines) 
+			{
+				if(l.Back != null) 
+				{
+					float oldX = linedefprops[i].Back != null ? linedefprops[i].Back.OffsetBottomX : 0f;
+					float oldY = linedefprops[i].Back != null ? linedefprops[i].Back.OffsetBottomY : 0f;
+					pfcBackOffsetBottom.ApplyTo(l.Back.Fields, General.Map.FormatInterface.MinTextureOffset, General.Map.FormatInterface.MaxTextureOffset, oldX, oldY);
+				}
+
+				i++;
+			}
+
+			General.Map.IsChanged = true;
+			labelBackOffsetBottom.Enabled = pfcBackOffsetBottom.NonDefaultValue;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+			#endregion
+
+			#region Scale changed
+
+		private void pfcFrontScaleTop_OnValuesChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+			int i = 0;
+
+			foreach(Linedef l in lines) 
+			{
+				if(l.Front != null) 
+				{
+					float oldX = linedefprops[i].Front != null ? linedefprops[i].Front.ScaleTopX : 1.0f;
+					float oldY = linedefprops[i].Front != null ? linedefprops[i].Front.ScaleTopY : 1.0f;
+					pfcFrontScaleTop.ApplyTo(l.Front.Fields, General.Map.FormatInterface.MinTextureOffset, General.Map.FormatInterface.MaxTextureOffset, oldX, oldY);
+				}
+
+				i++;
+			}
+
+			General.Map.IsChanged = true;
+			labelFrontScaleTop.Enabled = pfcFrontScaleTop.NonDefaultValue;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void pfcFrontScaleMid_OnValuesChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+			int i = 0;
+
+			foreach(Linedef l in lines) 
+			{
+				if(l.Front != null) 
+				{
+					float oldX = linedefprops[i].Front != null ? linedefprops[i].Front.ScaleMidX : 1.0f;
+					float oldY = linedefprops[i].Front != null ? linedefprops[i].Front.ScaleMidY : 1.0f;
+					pfcFrontScaleMid.ApplyTo(l.Front.Fields, General.Map.FormatInterface.MinTextureOffset, General.Map.FormatInterface.MaxTextureOffset, oldX, oldY);
+				}
+
+				i++;
+			}
+
+			General.Map.IsChanged = true;
+			labelFrontScaleMid.Enabled = pfcFrontScaleMid.NonDefaultValue;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void pfcFrontScaleBottom_OnValuesChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+			int i = 0;
+
+			foreach(Linedef l in lines) 
+			{
+				if(l.Front != null) 
+				{
+					float oldX = linedefprops[i].Front != null ? linedefprops[i].Front.ScaleBottomX : 1.0f;
+					float oldY = linedefprops[i].Front != null ? linedefprops[i].Front.ScaleBottomY : 1.0f;
+					pfcFrontScaleBottom.ApplyTo(l.Front.Fields, General.Map.FormatInterface.MinTextureOffset, General.Map.FormatInterface.MaxTextureOffset, oldX, oldY);
+				}
+
+				i++;
+			}
+
+			General.Map.IsChanged = true;
+			labelFrontScaleBottom.Enabled = pfcFrontScaleBottom.NonDefaultValue;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void pfcBackScaleTop_OnValuesChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+			int i = 0;
+
+			foreach(Linedef l in lines) 
+			{
+				if(l.Back != null) 
+				{
+					float oldX = linedefprops[i].Back != null ? linedefprops[i].Back.ScaleTopX : 1.0f;
+					float oldY = linedefprops[i].Back != null ? linedefprops[i].Back.ScaleTopY : 1.0f;
+					pfcBackScaleTop.ApplyTo(l.Back.Fields, General.Map.FormatInterface.MinTextureOffset, General.Map.FormatInterface.MaxTextureOffset, oldX, oldY);
+				}
+
+				i++;
+			}
+
+			General.Map.IsChanged = true;
+			labelBackScaleTop.Enabled = pfcBackScaleTop.NonDefaultValue;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void pfcBackScaleMid_OnValuesChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+			int i = 0;
+
+			foreach(Linedef l in lines) 
+			{
+				if(l.Back != null) 
+				{
+					float oldX = linedefprops[i].Back != null ? linedefprops[i].Back.ScaleMidX : 1.0f;
+					float oldY = linedefprops[i].Back != null ? linedefprops[i].Back.ScaleMidY : 1.0f;
+					pfcBackScaleMid.ApplyTo(l.Back.Fields, General.Map.FormatInterface.MinTextureOffset, General.Map.FormatInterface.MaxTextureOffset, oldX, oldY);
+				}
+
+				i++;
+			}
+
+			General.Map.IsChanged = true;
+			labelBackScaleMid.Enabled = pfcBackScaleMid.NonDefaultValue;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void pfcBackScaleBottom_OnValuesChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+			int i = 0;
+
+			foreach(Linedef l in lines) 
+			{
+				if(l.Back != null) 
+				{
+					float oldX = linedefprops[i].Back != null ? linedefprops[i].Back.ScaleBottomX : 1.0f;
+					float oldY = linedefprops[i].Back != null ? linedefprops[i].Back.ScaleBottomY : 1.0f;
+					pfcBackScaleBottom.ApplyTo(l.Back.Fields, General.Map.FormatInterface.MinTextureOffset, General.Map.FormatInterface.MaxTextureOffset, oldX, oldY);
+				}
+
+				i++;
+			}
+
+			General.Map.IsChanged = true;
+			labelBackScaleBottom.Enabled = pfcBackScaleBottom.NonDefaultValue;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+			#endregion
+
+			#region Flags cahnged
+
+		private void flagsFront_OnValueChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+			int i = 0;
+
+			foreach(Linedef l in lines) 
+			{
+				if(l.Front == null) continue;
+				
+				// Apply all flags
+				foreach(CheckBox c in flagsFront.Checkboxes) 
+				{
+					if(c.CheckState == CheckState.Checked)
+						l.Front.SetFlag(c.Tag.ToString(), true);
+					else if(c.CheckState == CheckState.Unchecked)
+						l.Front.SetFlag(c.Tag.ToString(), false);
+					else if(linedefprops[i].Front.Flags.ContainsKey(c.Tag.ToString()))
+						l.Front.SetFlag(c.Tag.ToString(), linedefprops[i].Front.Flags[c.Tag.ToString()]);
+					else //linedefs created in the editor have empty Flags by default
+						l.Front.SetFlag(c.Tag.ToString(), false);
+				}
+
+				i++;
+			}
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void flagsBack_OnValueChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+			int i = 0;
+
+			foreach(Linedef l in lines) 
+			{
+				if(l.Back == null) continue;
+
+				// Apply all flags
+				foreach(CheckBox c in flagsBack.Checkboxes) 
+				{
+					if(c.CheckState == CheckState.Checked)
+						l.Back.SetFlag(c.Tag.ToString(), true);
+					else if(c.CheckState == CheckState.Unchecked)
+						l.Back.SetFlag(c.Tag.ToString(), false);
+					else if(linedefprops[i].Back.Flags.ContainsKey(c.Tag.ToString()))
+						l.Back.SetFlag(c.Tag.ToString(), linedefprops[i].Back.Flags[c.Tag.ToString()]);
+					else //linedefs created in the editor have empty Flags by default
+						l.Back.SetFlag(c.Tag.ToString(), false);
+				}
+
+				i++;
+			}
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+			#endregion
+
+		#endregion
+
+	}
+}
diff --git a/Source/Core/Windows/LinedefEditFormUDMF.resx b/Source/Core/Windows/LinedefEditFormUDMF.resx
new file mode 100644
index 0000000..d572a5b
--- /dev/null
+++ b/Source/Core/Windows/LinedefEditFormUDMF.resx
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="label2.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label11.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label12.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label6.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="tabproperties.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="tabcustom.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="imagelist.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>105, 17</value>
+  </metadata>
+  <data name="imagelist.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
+        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
+        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADM
+        CAAAAk1TRnQBSQFMAgEBAgEAAcABAAHAAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
+        AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
+        AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
+        AWYDAAGZAwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFm
+        AZkCAAFmAcwCAAFmAf8CAAGZAwABmQEzAgABmQFmAgACmQIAAZkBzAIAAZkB/wIAAcwDAAHMATMCAAHM
+        AWYCAAHMAZkCAALMAgABzAH/AgAB/wFmAgAB/wGZAgAB/wHMAQABMwH/AgAB/wEAATMBAAEzAQABZgEA
+        ATMBAAGZAQABMwEAAcwBAAEzAQAB/wEAAf8BMwIAAzMBAAIzAWYBAAIzAZkBAAIzAcwBAAIzAf8BAAEz
+        AWYCAAEzAWYBMwEAATMCZgEAATMBZgGZAQABMwFmAcwBAAEzAWYB/wEAATMBmQIAATMBmQEzAQABMwGZ
+        AWYBAAEzApkBAAEzAZkBzAEAATMBmQH/AQABMwHMAgABMwHMATMBAAEzAcwBZgEAATMBzAGZAQABMwLM
+        AQABMwHMAf8BAAEzAf8BMwEAATMB/wFmAQABMwH/AZkBAAEzAf8BzAEAATMC/wEAAWYDAAFmAQABMwEA
+        AWYBAAFmAQABZgEAAZkBAAFmAQABzAEAAWYBAAH/AQABZgEzAgABZgIzAQABZgEzAWYBAAFmATMBmQEA
+        AWYBMwHMAQABZgEzAf8BAAJmAgACZgEzAQADZgEAAmYBmQEAAmYBzAEAAWYBmQIAAWYBmQEzAQABZgGZ
+        AWYBAAFmApkBAAFmAZkBzAEAAWYBmQH/AQABZgHMAgABZgHMATMBAAFmAcwBmQEAAWYCzAEAAWYBzAH/
+        AQABZgH/AgABZgH/ATMBAAFmAf8BmQEAAWYB/wHMAQABzAEAAf8BAAH/AQABzAEAApkCAAGZATMBmQEA
+        AZkBAAGZAQABmQEAAcwBAAGZAwABmQIzAQABmQEAAWYBAAGZATMBzAEAAZkBAAH/AQABmQFmAgABmQFm
+        ATMBAAGZATMBZgEAAZkBZgGZAQABmQFmAcwBAAGZATMB/wEAApkBMwEAApkBZgEAA5kBAAKZAcwBAAKZ
+        Af8BAAGZAcwCAAGZAcwBMwEAAWYBzAFmAQABmQHMAZkBAAGZAswBAAGZAcwB/wEAAZkB/wIAAZkB/wEz
+        AQABmQHMAWYBAAGZAf8BmQEAAZkB/wHMAQABmQL/AQABzAMAAZkBAAEzAQABzAEAAWYBAAHMAQABmQEA
+        AcwBAAHMAQABmQEzAgABzAIzAQABzAEzAWYBAAHMATMBmQEAAcwBMwHMAQABzAEzAf8BAAHMAWYCAAHM
+        AWYBMwEAAZkCZgEAAcwBZgGZAQABzAFmAcwBAAGZAWYB/wEAAcwBmQIAAcwBmQEzAQABzAGZAWYBAAHM
+        ApkBAAHMAZkBzAEAAcwBmQH/AQACzAIAAswBMwEAAswBZgEAAswBmQEAA8wBAALMAf8BAAHMAf8CAAHM
+        Af8BMwEAAZkB/wFmAQABzAH/AZkBAAHMAf8BzAEAAcwC/wEAAcwBAAEzAQAB/wEAAWYBAAH/AQABmQEA
+        AcwBMwIAAf8CMwEAAf8BMwFmAQAB/wEzAZkBAAH/ATMBzAEAAf8BMwH/AQAB/wFmAgAB/wFmATMBAAHM
+        AmYBAAH/AWYBmQEAAf8BZgHMAQABzAFmAf8BAAH/AZkCAAH/AZkBMwEAAf8BmQFmAQAB/wKZAQAB/wGZ
+        AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz
+        AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm
+        AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw
+        AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/1QAAh8GAAIfKAAB/wHx
+        Af8KAAEfAiYBHwQAAR8CJgEfJgAB/wG7AYsBswH/CAABHwQmAR8CAAEfBCYBHyQAAf8BuwOLAbMB/wcA
+        ASUB3gQmAh8EJgHeASUjAAH/AbsBigOLAa0BswH/BwABJQHeCCYB3gElIwAB/wG7AooDiwKtAbMB/wcA
+        ASUB3gYmAd4BJSMAAf8BtQOKAYsBswGLA60BswH/BwABJQYmASUkAAHzA4oBiwHyAf8BtAKtA7MB/wYA
+        AR8GJgEfJAAB/wG1AYoBtAH/AgAB/wG0Aa0EswH/BAABHwgsAR8kAAH/AfEB/wQAAf8BtAWzAf8CAAEf
+        Ak0CLALeAiwCTQEfKwAB/wG0BLMB8wEAAR8CUwJNAd4CJQHeAk0CUwEfKwAB/wG0ArMBGQIAASUB3gJT
+        Ad4BJQIAASUB3gJTAd4BJSwAAf8BugEZBAABJQLeASUEAAElAt4BJTUAAiUGAAIlYwABQgFNAT4HAAE+
+        AwABKAMAAUADAAEQAwABAQEAAQEFAAGAFwAD/wEABP8EAAL/AucEAAH4Af8CwwQAAfABfwKBBAAB4AE/
+        AYABAQQAAcABHwHAAQMEAAGAAQ8B4AEHBQABBwHwAQ8FAAEDAfABDwQAAQYBAQHgAQcEAAGPAQABwAED
+        BAAB/wKAAQEEAAH/AcECgQQAAf8B4wLDBAAC/wLnBAAE/wQACw==
+</value>
+  </data>
+  <metadata name="tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Windows/MainForm.Designer.cs b/Source/Core/Windows/MainForm.Designer.cs
new file mode 100644
index 0000000..1e257a4
--- /dev/null
+++ b/Source/Core/Windows/MainForm.Designer.cs
@@ -0,0 +1,2693 @@
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Controls;
+
+namespace CodeImp.DoomBuilder.Windows
+{
+	partial class MainForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.components = new System.ComponentModel.Container();
+			System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
+			System.Windows.Forms.ToolStripSeparator toolStripSeparator9;
+			System.Windows.Forms.ToolStripSeparator toolStripSeparator12;
+			System.Windows.Forms.ToolStripSeparator toolStripMenuItem4;
+			System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
+			System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
+			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));
+			this.seperatorfileopen = new System.Windows.Forms.ToolStripSeparator();
+			this.seperatorfilerecent = new System.Windows.Forms.ToolStripSeparator();
+			this.seperatoreditgrid = new System.Windows.Forms.ToolStripSeparator();
+			this.seperatoreditcopypaste = new System.Windows.Forms.ToolStripSeparator();
+			this.seperatorfile = new System.Windows.Forms.ToolStripSeparator();
+			this.seperatorscript = new System.Windows.Forms.ToolStripSeparator();
+			this.seperatorprefabs = new System.Windows.Forms.ToolStripSeparator();
+			this.seperatorundo = new System.Windows.Forms.ToolStripSeparator();
+			this.seperatorcopypaste = new System.Windows.Forms.ToolStripSeparator();
+			this.poscommalabel = new System.Windows.Forms.ToolStripStatusLabel();
+			this.menumain = new System.Windows.Forms.MenuStrip();
+			this.menufile = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemnewmap = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemopenmap = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemopenmapincurwad = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemclosemap = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemsavemap = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemsavemapas = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemsavemapinto = new System.Windows.Forms.ToolStripMenuItem();
+			this.seperatorfilesave = new System.Windows.Forms.ToolStripSeparator();
+			this.itemimport = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemexport = new System.Windows.Forms.ToolStripMenuItem();
+			this.separatorio = new System.Windows.Forms.ToolStripSeparator();
+			this.itemnorecent = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemexit = new System.Windows.Forms.ToolStripMenuItem();
+			this.menuedit = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemundo = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemredo = new System.Windows.Forms.ToolStripMenuItem();
+			this.seperatoreditundo = new System.Windows.Forms.ToolStripSeparator();
+			this.itemcut = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemcopy = new System.Windows.Forms.ToolStripMenuItem();
+			this.itempaste = new System.Windows.Forms.ToolStripMenuItem();
+			this.itempastespecial = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemsnaptogrid = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemautomerge = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemautoclearsidetextures = new System.Windows.Forms.ToolStripMenuItem();
+			this.seperatoreditgeometry = new System.Windows.Forms.ToolStripSeparator();
+			this.itemgridinc = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemgriddec = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemdosnaptogrid = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemgridsetup = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
+			this.addToGroup = new System.Windows.Forms.ToolStripMenuItem();
+			this.selectGroup = new System.Windows.Forms.ToolStripMenuItem();
+			this.clearGroup = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemmapoptions = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemviewusedtags = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemviewthingtypes = new System.Windows.Forms.ToolStripMenuItem();
+			this.menuview = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemthingsfilter = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemlinedefcolors = new System.Windows.Forms.ToolStripMenuItem();
+			this.seperatorviewthings = new System.Windows.Forms.ToolStripSeparator();
+			this.itemviewnormal = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemviewbrightness = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemviewfloors = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemviewceilings = new System.Windows.Forms.ToolStripMenuItem();
+			this.seperatorviewviews = new System.Windows.Forms.ToolStripSeparator();
+			this.itemfullbrightness = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemtogglegrid = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
+			this.menuzoom = new System.Windows.Forms.ToolStripMenuItem();
+			this.item2zoom800 = new System.Windows.Forms.ToolStripMenuItem();
+			this.item2zoom400 = new System.Windows.Forms.ToolStripMenuItem();
+			this.item2zoom200 = new System.Windows.Forms.ToolStripMenuItem();
+			this.item2zoom100 = new System.Windows.Forms.ToolStripMenuItem();
+			this.item2zoom50 = new System.Windows.Forms.ToolStripMenuItem();
+			this.item2zoom25 = new System.Windows.Forms.ToolStripMenuItem();
+			this.item2zoom10 = new System.Windows.Forms.ToolStripMenuItem();
+			this.item2zoom5 = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemgotocoords = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemfittoscreen = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemtoggleinfo = new System.Windows.Forms.ToolStripMenuItem();
+			this.seperatorviewzoom = new System.Windows.Forms.ToolStripSeparator();
+			this.itemscripteditor = new System.Windows.Forms.ToolStripMenuItem();
+			this.menumode = new System.Windows.Forms.ToolStripMenuItem();
+			this.separatorDrawModes = new System.Windows.Forms.ToolStripSeparator();
+			this.separatorTransformModes = new System.Windows.Forms.ToolStripSeparator();
+			this.menuprefabs = new System.Windows.Forms.ToolStripMenuItem();
+			this.iteminsertprefabfile = new System.Windows.Forms.ToolStripMenuItem();
+			this.iteminsertpreviousprefab = new System.Windows.Forms.ToolStripMenuItem();
+			this.seperatorprefabsinsert = new System.Windows.Forms.ToolStripSeparator();
+			this.itemcreateprefab = new System.Windows.Forms.ToolStripMenuItem();
+			this.menutools = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemreloadresources = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemReloadModedef = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemReloadGldefs = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemshowerrors = new System.Windows.Forms.ToolStripMenuItem();
+			this.seperatortoolsresources = new System.Windows.Forms.ToolStripSeparator();
+			this.configurationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.preferencesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.seperatortoolsconfig = new System.Windows.Forms.ToolStripSeparator();
+			this.itemsavescreenshot = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemsaveeditareascreenshot = new System.Windows.Forms.ToolStripMenuItem();
+			this.separatortoolsscreenshots = new System.Windows.Forms.ToolStripSeparator();
+			this.itemtestmap = new System.Windows.Forms.ToolStripMenuItem();
+			this.menuhelp = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemhelprefmanual = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemShortcutReference = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemopenconfigfolder = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemhelpeditmode = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemhelpcheckupdates = new System.Windows.Forms.ToolStripMenuItem();
+			this.seperatorhelpmanual = new System.Windows.Forms.ToolStripSeparator();
+			this.itemhelpabout = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolbar = new System.Windows.Forms.ToolStrip();
+			this.toolbarContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
+			this.toggleFile = new System.Windows.Forms.ToolStripMenuItem();
+			this.toggleScript = new System.Windows.Forms.ToolStripMenuItem();
+			this.toggleUndo = new System.Windows.Forms.ToolStripMenuItem();
+			this.toggleCopy = new System.Windows.Forms.ToolStripMenuItem();
+			this.togglePrefabs = new System.Windows.Forms.ToolStripMenuItem();
+			this.toggleFilter = new System.Windows.Forms.ToolStripMenuItem();
+			this.toggleViewModes = new System.Windows.Forms.ToolStripMenuItem();
+			this.toggleGeometry = new System.Windows.Forms.ToolStripMenuItem();
+			this.toggleTesting = new System.Windows.Forms.ToolStripMenuItem();
+			this.toggleRendering = new System.Windows.Forms.ToolStripMenuItem();
+			this.buttonnewmap = new System.Windows.Forms.ToolStripButton();
+			this.buttonopenmap = new System.Windows.Forms.ToolStripButton();
+			this.buttonsavemap = new System.Windows.Forms.ToolStripButton();
+			this.buttonscripteditor = new System.Windows.Forms.ToolStripButton();
+			this.buttonundo = new System.Windows.Forms.ToolStripButton();
+			this.buttonredo = new System.Windows.Forms.ToolStripButton();
+			this.buttoncut = new System.Windows.Forms.ToolStripButton();
+			this.buttoncopy = new System.Windows.Forms.ToolStripButton();
+			this.buttonpaste = new System.Windows.Forms.ToolStripButton();
+			this.buttoninsertprefabfile = new System.Windows.Forms.ToolStripButton();
+			this.buttoninsertpreviousprefab = new System.Windows.Forms.ToolStripButton();
+			this.buttonthingsfilter = new System.Windows.Forms.ToolStripButton();
+			this.thingfilters = new System.Windows.Forms.ToolStripDropDownButton();
+			this.separatorlinecolors = new System.Windows.Forms.ToolStripSeparator();
+			this.buttonlinededfcolors = new System.Windows.Forms.ToolStripButton();
+			this.linedefcolorpresets = new System.Windows.Forms.ToolStripDropDownButton();
+			this.separatorfilters = new System.Windows.Forms.ToolStripSeparator();
+			this.buttonfullbrightness = new System.Windows.Forms.ToolStripButton();
+			this.buttontogglegrid = new System.Windows.Forms.ToolStripButton();
+			this.buttontoggledynamicgrid = new System.Windows.Forms.ToolStripButton();
+			this.separatorfullbrightness = new System.Windows.Forms.ToolStripSeparator();
+			this.buttonviewnormal = new System.Windows.Forms.ToolStripButton();
+			this.buttonviewbrightness = new System.Windows.Forms.ToolStripButton();
+			this.buttonviewfloors = new System.Windows.Forms.ToolStripButton();
+			this.buttonviewceilings = new System.Windows.Forms.ToolStripButton();
+			this.seperatorviews = new System.Windows.Forms.ToolStripSeparator();
+			this.buttontogglecomments = new System.Windows.Forms.ToolStripButton();
+			this.buttonsnaptogrid = new System.Windows.Forms.ToolStripButton();
+			this.buttonautomerge = new System.Windows.Forms.ToolStripButton();
+			this.buttonautoclearsidetextures = new System.Windows.Forms.ToolStripButton();
+			this.seperatorgeometry = new System.Windows.Forms.ToolStripSeparator();
+			this.buttontogglefx = new System.Windows.Forms.ToolStripButton();
+			this.dynamiclightmode = new System.Windows.Forms.ToolStripSplitButton();
+			this.sightsdontshow = new System.Windows.Forms.ToolStripMenuItem();
+			this.lightsshow = new System.Windows.Forms.ToolStripMenuItem();
+			this.lightsshowanimated = new System.Windows.Forms.ToolStripMenuItem();
+			this.modelrendermode = new System.Windows.Forms.ToolStripSplitButton();
+			this.modelsdontshow = new System.Windows.Forms.ToolStripMenuItem();
+			this.modelsshowselection = new System.Windows.Forms.ToolStripMenuItem();
+			this.modelsshowfiltered = new System.Windows.Forms.ToolStripMenuItem();
+			this.modelsshowall = new System.Windows.Forms.ToolStripMenuItem();
+			this.buttontogglefog = new System.Windows.Forms.ToolStripButton();
+			this.buttontoggleeventlines = new System.Windows.Forms.ToolStripButton();
+			this.buttontogglevisualvertices = new System.Windows.Forms.ToolStripButton();
+			this.separatorgzmodes = new System.Windows.Forms.ToolStripSeparator();
+			this.buttontest = new System.Windows.Forms.ToolStripSplitButton();
+			this.seperatortesting = new System.Windows.Forms.ToolStripSeparator();
+			this.statusbar = new System.Windows.Forms.StatusStrip();
+			this.statuslabel = new System.Windows.Forms.ToolStripStatusLabel();
+			this.configlabel = new System.Windows.Forms.ToolStripStatusLabel();
+			this.gridlabel = new System.Windows.Forms.ToolStripStatusLabel();
+			this.buttongrid = new System.Windows.Forms.ToolStripDropDownButton();
+			this.itemgrid1024 = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemgrid512 = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemgrid256 = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemgrid128 = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemgrid64 = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemgrid32 = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemgrid16 = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemgrid8 = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemgrid4 = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemgrid1 = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemgridcustom = new System.Windows.Forms.ToolStripMenuItem();
+			this.zoomlabel = new System.Windows.Forms.ToolStripStatusLabel();
+			this.buttonzoom = new System.Windows.Forms.ToolStripDropDownButton();
+			this.itemzoom800 = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemzoom400 = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemzoom200 = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemzoom100 = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemzoom50 = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemzoom25 = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemzoom10 = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemzoom5 = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemzoomfittoscreen = new System.Windows.Forms.ToolStripMenuItem();
+			this.xposlabel = new System.Windows.Forms.ToolStripStatusLabel();
+			this.yposlabel = new System.Windows.Forms.ToolStripStatusLabel();
+			this.warnsLabel = new System.Windows.Forms.ToolStripStatusLabel();
+			this.panelinfo = new System.Windows.Forms.Panel();
+			this.statistics = new CodeImp.DoomBuilder.Controls.StatisticsControl();
+			this.heightpanel1 = new System.Windows.Forms.Panel();
+			this.labelcollapsedinfo = new System.Windows.Forms.Label();
+			this.modename = new System.Windows.Forms.Label();
+			this.buttontoggleinfo = new System.Windows.Forms.Button();
+			this.console = new CodeImp.DoomBuilder.DebugConsole();
+			this.vertexinfo = new CodeImp.DoomBuilder.Controls.VertexInfoPanel();
+			this.linedefinfo = new CodeImp.DoomBuilder.Controls.LinedefInfoPanel();
+			this.thinginfo = new CodeImp.DoomBuilder.Controls.ThingInfoPanel();
+			this.sectorinfo = new CodeImp.DoomBuilder.Controls.SectorInfoPanel();
+			this.redrawtimer = new System.Windows.Forms.Timer(this.components);
+			this.display = new RenderTargetControl();
+			this.processor = new System.Windows.Forms.Timer(this.components);
+			this.statusflasher = new System.Windows.Forms.Timer(this.components);
+			this.statusresetter = new System.Windows.Forms.Timer(this.components);
+			this.dockersspace = new System.Windows.Forms.Panel();
+			this.modestoolbar = new System.Windows.Forms.ToolStrip();
+			this.dockerspanel = new CodeImp.DoomBuilder.Controls.DockersControl();
+			this.dockerscollapser = new System.Windows.Forms.Timer(this.components);
+			this.flowLayoutPanel = new System.Windows.Forms.FlowLayoutPanel();
+			this.modecontrolsloolbar = new System.Windows.Forms.ToolStrip();
+			this.itemtogglecomments = new System.Windows.Forms.ToolStripMenuItem();
+			this.itemdynamicgridsize = new System.Windows.Forms.ToolStripMenuItem();
+			toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+			toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
+			toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator();
+			toolStripMenuItem4 = new System.Windows.Forms.ToolStripSeparator();
+			toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
+			toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
+			this.menumain.SuspendLayout();
+			this.toolbar.SuspendLayout();
+			this.toolbarContextMenu.SuspendLayout();
+			this.statusbar.SuspendLayout();
+			this.panelinfo.SuspendLayout();
+			this.flowLayoutPanel.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// toolStripSeparator1
+			// 
+			toolStripSeparator1.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0);
+			toolStripSeparator1.Name = "toolStripSeparator1";
+			toolStripSeparator1.Size = new System.Drawing.Size(6, 23);
+			// 
+			// toolStripSeparator9
+			// 
+			toolStripSeparator9.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0);
+			toolStripSeparator9.Name = "toolStripSeparator9";
+			toolStripSeparator9.Size = new System.Drawing.Size(6, 23);
+			// 
+			// toolStripSeparator12
+			// 
+			toolStripSeparator12.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0);
+			toolStripSeparator12.Name = "toolStripSeparator12";
+			toolStripSeparator12.Size = new System.Drawing.Size(6, 23);
+			// 
+			// toolStripMenuItem4
+			// 
+			toolStripMenuItem4.Name = "toolStripMenuItem4";
+			toolStripMenuItem4.Size = new System.Drawing.Size(150, 6);
+			// 
+			// toolStripSeparator2
+			// 
+			toolStripSeparator2.Name = "toolStripSeparator2";
+			toolStripSeparator2.Size = new System.Drawing.Size(153, 6);
+			// 
+			// toolStripSeparator3
+			// 
+			toolStripSeparator3.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0);
+			toolStripSeparator3.Name = "toolStripSeparator3";
+			toolStripSeparator3.Size = new System.Drawing.Size(6, 23);
+			// 
+			// seperatorfileopen
+			// 
+			this.seperatorfileopen.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
+			this.seperatorfileopen.Name = "seperatorfileopen";
+			this.seperatorfileopen.Size = new System.Drawing.Size(222, 6);
+			// 
+			// seperatorfilerecent
+			// 
+			this.seperatorfilerecent.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
+			this.seperatorfilerecent.Name = "seperatorfilerecent";
+			this.seperatorfilerecent.Size = new System.Drawing.Size(222, 6);
+			// 
+			// seperatoreditgrid
+			// 
+			this.seperatoreditgrid.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
+			this.seperatoreditgrid.Name = "seperatoreditgrid";
+			this.seperatoreditgrid.Size = new System.Drawing.Size(216, 6);
+			// 
+			// seperatoreditcopypaste
+			// 
+			this.seperatoreditcopypaste.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
+			this.seperatoreditcopypaste.Name = "seperatoreditcopypaste";
+			this.seperatoreditcopypaste.Size = new System.Drawing.Size(216, 6);
+			// 
+			// seperatorfile
+			// 
+			this.seperatorfile.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+			this.seperatorfile.Name = "seperatorfile";
+			this.seperatorfile.Size = new System.Drawing.Size(6, 25);
+			// 
+			// seperatorscript
+			// 
+			this.seperatorscript.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+			this.seperatorscript.Name = "seperatorscript";
+			this.seperatorscript.Size = new System.Drawing.Size(6, 25);
+			// 
+			// seperatorprefabs
+			// 
+			this.seperatorprefabs.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+			this.seperatorprefabs.Name = "seperatorprefabs";
+			this.seperatorprefabs.Size = new System.Drawing.Size(6, 25);
+			// 
+			// seperatorundo
+			// 
+			this.seperatorundo.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+			this.seperatorundo.Name = "seperatorundo";
+			this.seperatorundo.Size = new System.Drawing.Size(6, 25);
+			// 
+			// seperatorcopypaste
+			// 
+			this.seperatorcopypaste.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+			this.seperatorcopypaste.Name = "seperatorcopypaste";
+			this.seperatorcopypaste.Size = new System.Drawing.Size(6, 25);
+			// 
+			// poscommalabel
+			// 
+			this.poscommalabel.Name = "poscommalabel";
+			this.poscommalabel.Size = new System.Drawing.Size(11, 18);
+			this.poscommalabel.Tag = "builder_centeroncoordinates";
+			this.poscommalabel.Text = ",";
+			this.poscommalabel.ToolTipText = "Current X, Y coordinates on map.\r\nClick to set specific coordinates.";
+			this.poscommalabel.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// menumain
+			// 
+			this.menumain.Dock = System.Windows.Forms.DockStyle.None;
+			this.menumain.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.menufile,
+            this.menuedit,
+            this.menuview,
+            this.menumode,
+            this.menuprefabs,
+            this.menutools,
+            this.menuhelp});
+			this.menumain.Location = new System.Drawing.Point(0, 0);
+			this.menumain.Name = "menumain";
+			this.menumain.Size = new System.Drawing.Size(328, 24);
+			this.menumain.ImageScalingSize = MainForm.ScaledIconSize;
+			this.menumain.TabIndex = 0;
+			// 
+			// menufile
+			// 
+			this.menufile.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.itemnewmap,
+            this.itemopenmap,
+            this.itemopenmapincurwad,
+            this.itemclosemap,
+            this.seperatorfileopen,
+            this.itemsavemap,
+            this.itemsavemapas,
+            this.itemsavemapinto,
+            this.seperatorfilesave,
+            this.itemimport,
+            this.itemexport,
+            this.separatorio,
+            this.itemnorecent,
+            this.seperatorfilerecent,
+            this.itemexit});
+			this.menufile.Name = "menufile";
+			this.menufile.Size = new System.Drawing.Size(37, 20);
+			this.menufile.Text = "&File";
+			// 
+			// itemnewmap
+			// 
+			this.itemnewmap.Image = global::CodeImp.DoomBuilder.Properties.Resources.File;
+			this.itemnewmap.Name = "itemnewmap";
+			this.itemnewmap.ShortcutKeyDisplayString = "";
+			this.itemnewmap.Size = new System.Drawing.Size(225, 22);
+			this.itemnewmap.Tag = "builder_newmap";
+			this.itemnewmap.Text = "&New Map";
+			this.itemnewmap.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// itemopenmap
+			// 
+			this.itemopenmap.Image = global::CodeImp.DoomBuilder.Properties.Resources.OpenMap;
+			this.itemopenmap.Name = "itemopenmap";
+			this.itemopenmap.Size = new System.Drawing.Size(225, 22);
+			this.itemopenmap.Tag = "builder_openmap";
+			this.itemopenmap.Text = "&Open Map...";
+			this.itemopenmap.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// itemopenmapincurwad
+			// 
+			this.itemopenmapincurwad.Name = "itemopenmapincurwad";
+			this.itemopenmapincurwad.Size = new System.Drawing.Size(225, 22);
+			this.itemopenmapincurwad.Tag = "builder_openmapincurrentwad";
+			this.itemopenmapincurwad.Text = "Open Map in Current &WAD...";
+			this.itemopenmapincurwad.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// itemclosemap
+			// 
+			this.itemclosemap.Name = "itemclosemap";
+			this.itemclosemap.Size = new System.Drawing.Size(225, 22);
+			this.itemclosemap.Tag = "builder_closemap";
+			this.itemclosemap.Text = "&Close Map";
+			this.itemclosemap.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// itemsavemap
+			// 
+			this.itemsavemap.Image = global::CodeImp.DoomBuilder.Properties.Resources.SaveMap;
+			this.itemsavemap.Name = "itemsavemap";
+			this.itemsavemap.Size = new System.Drawing.Size(225, 22);
+			this.itemsavemap.Tag = "builder_savemap";
+			this.itemsavemap.Text = "&Save Map";
+			this.itemsavemap.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// itemsavemapas
+			// 
+			this.itemsavemapas.Name = "itemsavemapas";
+			this.itemsavemapas.Size = new System.Drawing.Size(225, 22);
+			this.itemsavemapas.Tag = "builder_savemapas";
+			this.itemsavemapas.Text = "Save Map &As...";
+			this.itemsavemapas.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// itemsavemapinto
+			// 
+			this.itemsavemapinto.Name = "itemsavemapinto";
+			this.itemsavemapinto.Size = new System.Drawing.Size(225, 22);
+			this.itemsavemapinto.Tag = "builder_savemapinto";
+			this.itemsavemapinto.Text = "Save Map &Into...";
+			this.itemsavemapinto.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// seperatorfilesave
+			// 
+			this.seperatorfilesave.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
+			this.seperatorfilesave.Name = "seperatorfilesave";
+			this.seperatorfilesave.Size = new System.Drawing.Size(222, 6);
+			// 
+			// itemimport
+			// 
+			this.itemimport.Name = "itemimport";
+			this.itemimport.Size = new System.Drawing.Size(225, 22);
+			this.itemimport.Text = "Import";
+			// 
+			// itemexport
+			// 
+			this.itemexport.Name = "itemexport";
+			this.itemexport.Size = new System.Drawing.Size(225, 22);
+			this.itemexport.Text = "Export";
+			// 
+			// separatorio
+			// 
+			this.separatorio.Name = "separatorio";
+			this.separatorio.Size = new System.Drawing.Size(222, 6);
+			// 
+			// itemnorecent
+			// 
+			this.itemnorecent.Enabled = false;
+			this.itemnorecent.Name = "itemnorecent";
+			this.itemnorecent.Size = new System.Drawing.Size(225, 22);
+			this.itemnorecent.Text = "No recently opened files";
+			// 
+			// itemexit
+			// 
+			this.itemexit.Name = "itemexit";
+			this.itemexit.Size = new System.Drawing.Size(225, 22);
+			this.itemexit.Text = "E&xit";
+			this.itemexit.Click += new System.EventHandler(this.itemexit_Click);
+			// 
+			// menuedit
+			// 
+			this.menuedit.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.itemundo,
+            this.itemredo,
+            this.seperatoreditundo,
+            this.itemcut,
+            this.itemcopy,
+            this.itempaste,
+            this.itempastespecial,
+            this.seperatoreditcopypaste,
+            this.itemsnaptogrid,
+            this.itemdynamicgridsize,
+            this.itemautomerge,
+            this.itemautoclearsidetextures,
+            this.seperatoreditgeometry,
+            this.itemgridinc,
+            this.itemgriddec,
+            this.itemdosnaptogrid,
+            this.itemgridsetup,
+            this.toolStripSeparator5,
+            this.addToGroup,
+            this.selectGroup,
+            this.clearGroup,
+            this.seperatoreditgrid,
+            this.itemmapoptions,
+            this.itemviewusedtags,
+            this.itemviewthingtypes});
+			this.menuedit.Name = "menuedit";
+			this.menuedit.Size = new System.Drawing.Size(39, 20);
+			this.menuedit.Text = "&Edit";
+			this.menuedit.DropDownOpening += new System.EventHandler(this.menuedit_DropDownOpening);
+			// 
+			// itemundo
+			// 
+			this.itemundo.Image = global::CodeImp.DoomBuilder.Properties.Resources.Undo;
+			this.itemundo.Name = "itemundo";
+			this.itemundo.Size = new System.Drawing.Size(219, 22);
+			this.itemundo.Tag = "builder_undo";
+			this.itemundo.Text = "&Undo";
+			this.itemundo.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// itemredo
+			// 
+			this.itemredo.Image = global::CodeImp.DoomBuilder.Properties.Resources.Redo;
+			this.itemredo.Name = "itemredo";
+			this.itemredo.Size = new System.Drawing.Size(219, 22);
+			this.itemredo.Tag = "builder_redo";
+			this.itemredo.Text = "&Redo";
+			this.itemredo.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// seperatoreditundo
+			// 
+			this.seperatoreditundo.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
+			this.seperatoreditundo.Name = "seperatoreditundo";
+			this.seperatoreditundo.Size = new System.Drawing.Size(216, 6);
+			// 
+			// itemcut
+			// 
+			this.itemcut.Image = global::CodeImp.DoomBuilder.Properties.Resources.Cut;
+			this.itemcut.Name = "itemcut";
+			this.itemcut.Size = new System.Drawing.Size(219, 22);
+			this.itemcut.Tag = "builder_cutselection";
+			this.itemcut.Text = "Cu&t";
+			this.itemcut.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// itemcopy
+			// 
+			this.itemcopy.Image = global::CodeImp.DoomBuilder.Properties.Resources.Copy;
+			this.itemcopy.Name = "itemcopy";
+			this.itemcopy.Size = new System.Drawing.Size(219, 22);
+			this.itemcopy.Tag = "builder_copyselection";
+			this.itemcopy.Text = "&Copy";
+			this.itemcopy.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// itempaste
+			// 
+			this.itempaste.Image = global::CodeImp.DoomBuilder.Properties.Resources.Paste;
+			this.itempaste.Name = "itempaste";
+			this.itempaste.Size = new System.Drawing.Size(219, 22);
+			this.itempaste.Tag = "builder_pasteselection";
+			this.itempaste.Text = "&Paste";
+			this.itempaste.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// itempastespecial
+			// 
+			this.itempastespecial.Image = global::CodeImp.DoomBuilder.Properties.Resources.PasteSpecial;
+			this.itempastespecial.Name = "itempastespecial";
+			this.itempastespecial.Size = new System.Drawing.Size(219, 22);
+			this.itempastespecial.Tag = "builder_pasteselectionspecial";
+			this.itempastespecial.Text = "Paste Special...";
+			this.itempastespecial.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// itemsnaptogrid
+			// 
+			this.itemsnaptogrid.Checked = true;
+			this.itemsnaptogrid.CheckState = System.Windows.Forms.CheckState.Checked;
+			this.itemsnaptogrid.Image = global::CodeImp.DoomBuilder.Properties.Resources.Grid4;
+			this.itemsnaptogrid.Name = "itemsnaptogrid";
+			this.itemsnaptogrid.Size = new System.Drawing.Size(219, 22);
+			this.itemsnaptogrid.Tag = "builder_togglesnap";
+			this.itemsnaptogrid.Text = "&Snap to Grid";
+			this.itemsnaptogrid.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// itemautomerge
+			// 
+			this.itemautomerge.Checked = true;
+			this.itemautomerge.CheckState = System.Windows.Forms.CheckState.Checked;
+			this.itemautomerge.Image = global::CodeImp.DoomBuilder.Properties.Resources.mergegeometry2;
+			this.itemautomerge.Name = "itemautomerge";
+			this.itemautomerge.Size = new System.Drawing.Size(219, 22);
+			this.itemautomerge.Tag = "builder_toggleautomerge";
+			this.itemautomerge.Text = "&Merge Geometry";
+			this.itemautomerge.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// itemautoclearsidetextures
+			// 
+			this.itemautoclearsidetextures.Checked = true;
+			this.itemautoclearsidetextures.CheckState = System.Windows.Forms.CheckState.Checked;
+			this.itemautoclearsidetextures.Image = global::CodeImp.DoomBuilder.Properties.Resources.ClearTextures;
+			this.itemautoclearsidetextures.Name = "itemautoclearsidetextures";
+			this.itemautoclearsidetextures.Size = new System.Drawing.Size(219, 22);
+			this.itemautoclearsidetextures.Tag = "builder_toggleautoclearsidetextures";
+			this.itemautoclearsidetextures.Text = "&Auto Clear Sidedef Textures";
+			this.itemautoclearsidetextures.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// seperatoreditgeometry
+			// 
+			this.seperatoreditgeometry.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
+			this.seperatoreditgeometry.Name = "seperatoreditgeometry";
+			this.seperatoreditgeometry.Size = new System.Drawing.Size(216, 6);
+			// 
+			// itemgridinc
+			// 
+			this.itemgridinc.Image = global::CodeImp.DoomBuilder.Properties.Resources.GridIncrease;
+			this.itemgridinc.Name = "itemgridinc";
+			this.itemgridinc.Size = new System.Drawing.Size(219, 22);
+			this.itemgridinc.Tag = "builder_griddec";
+			this.itemgridinc.Text = "&Increase Grid Size";
+			this.itemgridinc.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// itemgriddec
+			// 
+			this.itemgriddec.Image = global::CodeImp.DoomBuilder.Properties.Resources.GridDecrease;
+			this.itemgriddec.Name = "itemgriddec";
+			this.itemgriddec.Size = new System.Drawing.Size(219, 22);
+			this.itemgriddec.Tag = "builder_gridinc";
+			this.itemgriddec.Text = "&Decrease Grid Size";
+			this.itemgriddec.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// itemdosnaptogrid
+			// 
+			this.itemdosnaptogrid.Image = global::CodeImp.DoomBuilder.Properties.Resources.SnapVerts;
+			this.itemdosnaptogrid.Name = "itemdosnaptogrid";
+			this.itemdosnaptogrid.Size = new System.Drawing.Size(219, 22);
+			this.itemdosnaptogrid.Tag = "builder_snapvertstogrid";
+			this.itemdosnaptogrid.Text = "Snap Selection to Grid";
+			this.itemdosnaptogrid.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// itemgridsetup
+			// 
+			this.itemgridsetup.Image = global::CodeImp.DoomBuilder.Properties.Resources.Grid2;
+			this.itemgridsetup.Name = "itemgridsetup";
+			this.itemgridsetup.Size = new System.Drawing.Size(219, 22);
+			this.itemgridsetup.Tag = "builder_gridsetup";
+			this.itemgridsetup.Text = "&Grid and Backdrop Setup...";
+			this.itemgridsetup.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// toolStripSeparator5
+			// 
+			this.toolStripSeparator5.Name = "toolStripSeparator5";
+			this.toolStripSeparator5.Size = new System.Drawing.Size(216, 6);
+			// 
+			// addToGroup
+			// 
+			this.addToGroup.Image = global::CodeImp.DoomBuilder.Properties.Resources.GroupAdd;
+			this.addToGroup.Name = "addToGroup";
+			this.addToGroup.Size = new System.Drawing.Size(219, 22);
+			this.addToGroup.Text = "Add Selection to Group";
+			// 
+			// selectGroup
+			// 
+			this.selectGroup.Image = global::CodeImp.DoomBuilder.Properties.Resources.Group;
+			this.selectGroup.Name = "selectGroup";
+			this.selectGroup.Size = new System.Drawing.Size(219, 22);
+			this.selectGroup.Text = "Select Group";
+			// 
+			// clearGroup
+			// 
+			this.clearGroup.Image = global::CodeImp.DoomBuilder.Properties.Resources.GroupRemove;
+			this.clearGroup.Name = "clearGroup";
+			this.clearGroup.Size = new System.Drawing.Size(219, 22);
+			this.clearGroup.Text = "Clear Group";
+			// 
+			// itemmapoptions
+			// 
+			this.itemmapoptions.Image = global::CodeImp.DoomBuilder.Properties.Resources.Properties;
+			this.itemmapoptions.Name = "itemmapoptions";
+			this.itemmapoptions.Size = new System.Drawing.Size(219, 22);
+			this.itemmapoptions.Tag = "builder_mapoptions";
+			this.itemmapoptions.Text = "Map &Options...";
+			this.itemmapoptions.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// itemviewusedtags
+			// 
+			this.itemviewusedtags.Image = global::CodeImp.DoomBuilder.Properties.Resources.TagStatistics;
+			this.itemviewusedtags.Name = "itemviewusedtags";
+			this.itemviewusedtags.Size = new System.Drawing.Size(219, 22);
+			this.itemviewusedtags.Tag = "builder_viewusedtags";
+			this.itemviewusedtags.Text = "View Used Tags...";
+			this.itemviewusedtags.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// itemviewthingtypes
+			// 
+			this.itemviewthingtypes.Image = global::CodeImp.DoomBuilder.Properties.Resources.ThingStatistics;
+			this.itemviewthingtypes.Name = "itemviewthingtypes";
+			this.itemviewthingtypes.Size = new System.Drawing.Size(219, 22);
+			this.itemviewthingtypes.Tag = "builder_viewthingtypes";
+			this.itemviewthingtypes.Text = "View Thing Types...";
+			this.itemviewthingtypes.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// menuview
+			// 
+			this.menuview.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.itemthingsfilter,
+            this.itemlinedefcolors,
+            this.seperatorviewthings,
+            this.itemviewnormal,
+            this.itemviewbrightness,
+            this.itemviewfloors,
+            this.itemviewceilings,
+            this.seperatorviewviews,
+            this.itemfullbrightness,
+            this.itemtogglegrid,
+            this.itemtogglecomments,
+            this.toolStripSeparator4,
+            this.menuzoom,
+            this.itemgotocoords,
+            this.itemfittoscreen,
+            this.itemtoggleinfo,
+            this.seperatorviewzoom,
+            this.itemscripteditor});
+			this.menuview.Name = "menuview";
+			this.menuview.Size = new System.Drawing.Size(44, 20);
+			this.menuview.Text = "&View";
+			// 
+			// itemthingsfilter
+			// 
+			this.itemthingsfilter.Image = global::CodeImp.DoomBuilder.Properties.Resources.Filter;
+			this.itemthingsfilter.Name = "itemthingsfilter";
+			this.itemthingsfilter.Size = new System.Drawing.Size(215, 22);
+			this.itemthingsfilter.Tag = "builder_thingsfilterssetup";
+			this.itemthingsfilter.Text = "Configure &Things Filters...";
+			this.itemthingsfilter.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// itemlinedefcolors
+			// 
+			this.itemlinedefcolors.Image = global::CodeImp.DoomBuilder.Properties.Resources.LinedefColorPresets;
+			this.itemlinedefcolors.Name = "itemlinedefcolors";
+			this.itemlinedefcolors.Size = new System.Drawing.Size(215, 22);
+			this.itemlinedefcolors.Tag = "builder_linedefcolorssetup";
+			this.itemlinedefcolors.Text = "Configure &Linedef Colors...";
+			this.itemlinedefcolors.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// seperatorviewthings
+			// 
+			this.seperatorviewthings.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
+			this.seperatorviewthings.Name = "seperatorviewthings";
+			this.seperatorviewthings.Size = new System.Drawing.Size(212, 6);
+			// 
+			// itemviewnormal
+			// 
+			this.itemviewnormal.Image = global::CodeImp.DoomBuilder.Properties.Resources.ViewNormal;
+			this.itemviewnormal.Name = "itemviewnormal";
+			this.itemviewnormal.Size = new System.Drawing.Size(215, 22);
+			this.itemviewnormal.Tag = "builder_viewmodenormal";
+			this.itemviewnormal.Text = "&Wireframe";
+			this.itemviewnormal.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// itemviewbrightness
+			// 
+			this.itemviewbrightness.Image = global::CodeImp.DoomBuilder.Properties.Resources.ViewBrightness;
+			this.itemviewbrightness.Name = "itemviewbrightness";
+			this.itemviewbrightness.Size = new System.Drawing.Size(215, 22);
+			this.itemviewbrightness.Tag = "builder_viewmodebrightness";
+			this.itemviewbrightness.Text = "&Brightness Levels";
+			this.itemviewbrightness.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// itemviewfloors
+			// 
+			this.itemviewfloors.Image = global::CodeImp.DoomBuilder.Properties.Resources.ViewTextureFloor;
+			this.itemviewfloors.Name = "itemviewfloors";
+			this.itemviewfloors.Size = new System.Drawing.Size(215, 22);
+			this.itemviewfloors.Tag = "builder_viewmodefloors";
+			this.itemviewfloors.Text = "&Floor Textures";
+			this.itemviewfloors.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// itemviewceilings
+			// 
+			this.itemviewceilings.Image = global::CodeImp.DoomBuilder.Properties.Resources.ViewTextureCeiling;
+			this.itemviewceilings.Name = "itemviewceilings";
+			this.itemviewceilings.Size = new System.Drawing.Size(215, 22);
+			this.itemviewceilings.Tag = "builder_viewmodeceilings";
+			this.itemviewceilings.Text = "&Ceiling Textures";
+			this.itemviewceilings.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// seperatorviewviews
+			// 
+			this.seperatorviewviews.Name = "seperatorviewviews";
+			this.seperatorviewviews.Size = new System.Drawing.Size(212, 6);
+			// 
+			// itemfullbrightness
+			// 
+			this.itemfullbrightness.Checked = true;
+			this.itemfullbrightness.CheckOnClick = true;
+			this.itemfullbrightness.CheckState = System.Windows.Forms.CheckState.Checked;
+			this.itemfullbrightness.Image = global::CodeImp.DoomBuilder.Properties.Resources.Brightness;
+			this.itemfullbrightness.Name = "itemfullbrightness";
+			this.itemfullbrightness.Size = new System.Drawing.Size(215, 22);
+			this.itemfullbrightness.Tag = "builder_togglebrightness";
+			this.itemfullbrightness.Text = "Full Brightness";
+			this.itemfullbrightness.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// itemtogglegrid
+			// 
+			this.itemtogglegrid.Checked = true;
+			this.itemtogglegrid.CheckOnClick = true;
+			this.itemtogglegrid.CheckState = System.Windows.Forms.CheckState.Checked;
+			this.itemtogglegrid.Image = global::CodeImp.DoomBuilder.Properties.Resources.Grid2;
+			this.itemtogglegrid.Name = "itemtogglegrid";
+			this.itemtogglegrid.Size = new System.Drawing.Size(215, 22);
+			this.itemtogglegrid.Tag = "builder_togglegrid";
+			this.itemtogglegrid.Text = "&Render Grid";
+			this.itemtogglegrid.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// toolStripSeparator4
+			// 
+			this.toolStripSeparator4.Name = "toolStripSeparator4";
+			this.toolStripSeparator4.Size = new System.Drawing.Size(212, 6);
+			// 
+			// menuzoom
+			// 
+			this.menuzoom.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.item2zoom800,
+            this.item2zoom400,
+            this.item2zoom200,
+            this.item2zoom100,
+            this.item2zoom50,
+            this.item2zoom25,
+            this.item2zoom10,
+            this.item2zoom5});
+			this.menuzoom.Image = global::CodeImp.DoomBuilder.Properties.Resources.Zoom;
+			this.menuzoom.Name = "menuzoom";
+			this.menuzoom.Size = new System.Drawing.Size(215, 22);
+			this.menuzoom.Text = "&Zoom";
+			// 
+			// item2zoom800
+			// 
+			this.item2zoom800.Name = "item2zoom800";
+			this.item2zoom800.Size = new System.Drawing.Size(102, 22);
+			this.item2zoom800.Tag = "800";
+			this.item2zoom800.Text = "800%";
+			this.item2zoom800.Click += new System.EventHandler(this.itemzoomto_Click);
+			// 
+			// item2zoom400
+			// 
+			this.item2zoom400.Name = "item2zoom400";
+			this.item2zoom400.Size = new System.Drawing.Size(102, 22);
+			this.item2zoom400.Tag = "400";
+			this.item2zoom400.Text = "400%";
+			this.item2zoom400.Click += new System.EventHandler(this.itemzoomto_Click);
+			// 
+			// item2zoom200
+			// 
+			this.item2zoom200.Name = "item2zoom200";
+			this.item2zoom200.Size = new System.Drawing.Size(102, 22);
+			this.item2zoom200.Tag = "200";
+			this.item2zoom200.Text = "200%";
+			this.item2zoom200.Click += new System.EventHandler(this.itemzoomto_Click);
+			// 
+			// item2zoom100
+			// 
+			this.item2zoom100.Name = "item2zoom100";
+			this.item2zoom100.Size = new System.Drawing.Size(102, 22);
+			this.item2zoom100.Tag = "100";
+			this.item2zoom100.Text = "100%";
+			this.item2zoom100.Click += new System.EventHandler(this.itemzoomto_Click);
+			// 
+			// item2zoom50
+			// 
+			this.item2zoom50.Name = "item2zoom50";
+			this.item2zoom50.Size = new System.Drawing.Size(102, 22);
+			this.item2zoom50.Tag = "50";
+			this.item2zoom50.Text = "50%";
+			this.item2zoom50.Click += new System.EventHandler(this.itemzoomto_Click);
+			// 
+			// item2zoom25
+			// 
+			this.item2zoom25.Name = "item2zoom25";
+			this.item2zoom25.Size = new System.Drawing.Size(102, 22);
+			this.item2zoom25.Tag = "25";
+			this.item2zoom25.Text = "25%";
+			this.item2zoom25.Click += new System.EventHandler(this.itemzoomto_Click);
+			// 
+			// item2zoom10
+			// 
+			this.item2zoom10.Name = "item2zoom10";
+			this.item2zoom10.Size = new System.Drawing.Size(102, 22);
+			this.item2zoom10.Tag = "10";
+			this.item2zoom10.Text = "10%";
+			this.item2zoom10.Click += new System.EventHandler(this.itemzoomto_Click);
+			// 
+			// item2zoom5
+			// 
+			this.item2zoom5.Name = "item2zoom5";
+			this.item2zoom5.Size = new System.Drawing.Size(102, 22);
+			this.item2zoom5.Tag = "5";
+			this.item2zoom5.Text = "5%";
+			this.item2zoom5.Click += new System.EventHandler(this.itemzoomto_Click);
+			// 
+			// itemgotocoords
+			// 
+			this.itemgotocoords.Name = "itemgotocoords";
+			this.itemgotocoords.Size = new System.Drawing.Size(215, 22);
+			this.itemgotocoords.Tag = "builder_centeroncoordinates";
+			this.itemgotocoords.Text = "Go To Coordinates...";
+			this.itemgotocoords.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// itemfittoscreen
+			// 
+			this.itemfittoscreen.Name = "itemfittoscreen";
+			this.itemfittoscreen.Size = new System.Drawing.Size(215, 22);
+			this.itemfittoscreen.Tag = "builder_centerinscreen";
+			this.itemfittoscreen.Text = "Fit to Screen";
+			this.itemfittoscreen.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// itemtoggleinfo
+			// 
+			this.itemtoggleinfo.Name = "itemtoggleinfo";
+			this.itemtoggleinfo.Size = new System.Drawing.Size(215, 22);
+			this.itemtoggleinfo.Tag = "builder_toggleinfopanel";
+			this.itemtoggleinfo.Text = "&Expanded Info Panel";
+			this.itemtoggleinfo.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// seperatorviewzoom
+			// 
+			this.seperatorviewzoom.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
+			this.seperatorviewzoom.Name = "seperatorviewzoom";
+			this.seperatorviewzoom.Size = new System.Drawing.Size(212, 6);
+			// 
+			// itemscripteditor
+			// 
+			this.itemscripteditor.Image = global::CodeImp.DoomBuilder.Properties.Resources.Script2;
+			this.itemscripteditor.Name = "itemscripteditor";
+			this.itemscripteditor.Size = new System.Drawing.Size(215, 22);
+			this.itemscripteditor.Tag = "builder_openscripteditor";
+			this.itemscripteditor.Text = "&Script Editor...";
+			this.itemscripteditor.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// menumode
+			// 
+			this.menumode.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.separatorDrawModes,
+            this.separatorTransformModes});
+			this.menumode.Name = "menumode";
+			this.menumode.Size = new System.Drawing.Size(50, 20);
+			this.menumode.Text = "&Mode";
+			// 
+			// separatorDrawModes
+			// 
+			this.separatorDrawModes.Name = "separatorDrawModes";
+			this.separatorDrawModes.Size = new System.Drawing.Size(57, 6);
+			// 
+			// separatorTransformModes
+			// 
+			this.separatorTransformModes.Name = "separatorTransformModes";
+			this.separatorTransformModes.Size = new System.Drawing.Size(57, 6);
+			// 
+			// menuprefabs
+			// 
+			this.menuprefabs.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.iteminsertprefabfile,
+            this.iteminsertpreviousprefab,
+            this.seperatorprefabsinsert,
+            this.itemcreateprefab});
+			this.menuprefabs.Name = "menuprefabs";
+			this.menuprefabs.Size = new System.Drawing.Size(58, 20);
+			this.menuprefabs.Text = "&Prefabs";
+			// 
+			// iteminsertprefabfile
+			// 
+			this.iteminsertprefabfile.Image = global::CodeImp.DoomBuilder.Properties.Resources.Prefab;
+			this.iteminsertprefabfile.Name = "iteminsertprefabfile";
+			this.iteminsertprefabfile.Size = new System.Drawing.Size(199, 22);
+			this.iteminsertprefabfile.Tag = "builder_insertprefabfile";
+			this.iteminsertprefabfile.Text = "&Insert Prefab from File...";
+			this.iteminsertprefabfile.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// iteminsertpreviousprefab
+			// 
+			this.iteminsertpreviousprefab.Image = global::CodeImp.DoomBuilder.Properties.Resources.Prefab2;
+			this.iteminsertpreviousprefab.Name = "iteminsertpreviousprefab";
+			this.iteminsertpreviousprefab.Size = new System.Drawing.Size(199, 22);
+			this.iteminsertpreviousprefab.Tag = "builder_insertpreviousprefab";
+			this.iteminsertpreviousprefab.Text = "Insert &Previous Prefab";
+			this.iteminsertpreviousprefab.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// seperatorprefabsinsert
+			// 
+			this.seperatorprefabsinsert.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
+			this.seperatorprefabsinsert.Name = "seperatorprefabsinsert";
+			this.seperatorprefabsinsert.Size = new System.Drawing.Size(196, 6);
+			// 
+			// itemcreateprefab
+			// 
+			this.itemcreateprefab.Name = "itemcreateprefab";
+			this.itemcreateprefab.Size = new System.Drawing.Size(199, 22);
+			this.itemcreateprefab.Tag = "builder_createprefab";
+			this.itemcreateprefab.Text = "&Create From Selection...";
+			this.itemcreateprefab.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// menutools
+			// 
+			this.menutools.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.itemreloadresources,
+            this.itemReloadModedef,
+            this.itemReloadGldefs,
+            this.itemshowerrors,
+            this.seperatortoolsresources,
+            this.configurationToolStripMenuItem,
+            this.preferencesToolStripMenuItem,
+            this.seperatortoolsconfig,
+            this.itemsavescreenshot,
+            this.itemsaveeditareascreenshot,
+            this.separatortoolsscreenshots,
+            this.itemtestmap});
+			this.menutools.Name = "menutools";
+			this.menutools.Size = new System.Drawing.Size(48, 20);
+			this.menutools.Text = "&Tools";
+			// 
+			// itemreloadresources
+			// 
+			this.itemreloadresources.Image = global::CodeImp.DoomBuilder.Properties.Resources.Reload;
+			this.itemreloadresources.Name = "itemreloadresources";
+			this.itemreloadresources.Size = new System.Drawing.Size(246, 22);
+			this.itemreloadresources.Tag = "builder_reloadresources";
+			this.itemreloadresources.Text = "&Reload Resources";
+			this.itemreloadresources.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// itemReloadModedef
+			// 
+			this.itemReloadModedef.Image = global::CodeImp.DoomBuilder.Properties.Resources.Reload;
+			this.itemReloadModedef.Name = "itemReloadModedef";
+			this.itemReloadModedef.Size = new System.Drawing.Size(246, 22);
+			this.itemReloadModedef.Tag = "builder_gzreloadmodeldef";
+			this.itemReloadModedef.Text = "Reload MODELDEF/VOXELDEF";
+			this.itemReloadModedef.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// itemReloadGldefs
+			// 
+			this.itemReloadGldefs.Image = global::CodeImp.DoomBuilder.Properties.Resources.Reload;
+			this.itemReloadGldefs.Name = "itemReloadGldefs";
+			this.itemReloadGldefs.Size = new System.Drawing.Size(246, 22);
+			this.itemReloadGldefs.Tag = "builder_gzreloadgldefs";
+			this.itemReloadGldefs.Text = "Reload GLDEFS";
+			this.itemReloadGldefs.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// itemshowerrors
+			// 
+			this.itemshowerrors.Image = global::CodeImp.DoomBuilder.Properties.Resources.Warning;
+			this.itemshowerrors.Name = "itemshowerrors";
+			this.itemshowerrors.Size = new System.Drawing.Size(246, 22);
+			this.itemshowerrors.Tag = "builder_showerrors";
+			this.itemshowerrors.Text = "&Errors and Warnings...";
+			this.itemshowerrors.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// seperatortoolsresources
+			// 
+			this.seperatortoolsresources.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
+			this.seperatortoolsresources.Name = "seperatortoolsresources";
+			this.seperatortoolsresources.Size = new System.Drawing.Size(243, 6);
+			// 
+			// configurationToolStripMenuItem
+			// 
+			this.configurationToolStripMenuItem.Image = global::CodeImp.DoomBuilder.Properties.Resources.Configuration;
+			this.configurationToolStripMenuItem.Name = "configurationToolStripMenuItem";
+			this.configurationToolStripMenuItem.Size = new System.Drawing.Size(246, 22);
+			this.configurationToolStripMenuItem.Tag = "builder_configuration";
+			this.configurationToolStripMenuItem.Text = "&Game Configurations...";
+			this.configurationToolStripMenuItem.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// preferencesToolStripMenuItem
+			// 
+			this.preferencesToolStripMenuItem.Image = global::CodeImp.DoomBuilder.Properties.Resources.Preferences;
+			this.preferencesToolStripMenuItem.Name = "preferencesToolStripMenuItem";
+			this.preferencesToolStripMenuItem.Size = new System.Drawing.Size(246, 22);
+			this.preferencesToolStripMenuItem.Tag = "builder_preferences";
+			this.preferencesToolStripMenuItem.Text = "Preferences...";
+			this.preferencesToolStripMenuItem.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// seperatortoolsconfig
+			// 
+			this.seperatortoolsconfig.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
+			this.seperatortoolsconfig.Name = "seperatortoolsconfig";
+			this.seperatortoolsconfig.Size = new System.Drawing.Size(243, 6);
+			// 
+			// itemsavescreenshot
+			// 
+			this.itemsavescreenshot.Image = global::CodeImp.DoomBuilder.Properties.Resources.Screenshot;
+			this.itemsavescreenshot.Name = "itemsavescreenshot";
+			this.itemsavescreenshot.Size = new System.Drawing.Size(246, 22);
+			this.itemsavescreenshot.Tag = "builder_savescreenshot";
+			this.itemsavescreenshot.Text = "Save Screenshot";
+			this.itemsavescreenshot.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// itemsaveeditareascreenshot
+			// 
+			this.itemsaveeditareascreenshot.Image = global::CodeImp.DoomBuilder.Properties.Resources.ScreenshotActiveWindow;
+			this.itemsaveeditareascreenshot.Name = "itemsaveeditareascreenshot";
+			this.itemsaveeditareascreenshot.Size = new System.Drawing.Size(246, 22);
+			this.itemsaveeditareascreenshot.Tag = "builder_saveeditareascreenshot";
+			this.itemsaveeditareascreenshot.Text = "Save Screenshot (active window)";
+			this.itemsaveeditareascreenshot.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// separatortoolsscreenshots
+			// 
+			this.separatortoolsscreenshots.Name = "separatortoolsscreenshots";
+			this.separatortoolsscreenshots.Size = new System.Drawing.Size(243, 6);
+			// 
+			// itemtestmap
+			// 
+			this.itemtestmap.Image = global::CodeImp.DoomBuilder.Properties.Resources.Test;
+			this.itemtestmap.Name = "itemtestmap";
+			this.itemtestmap.Size = new System.Drawing.Size(246, 22);
+			this.itemtestmap.Tag = "builder_testmap";
+			this.itemtestmap.Text = "&Test Map";
+			this.itemtestmap.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// menuhelp
+			// 
+			this.menuhelp.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.itemhelprefmanual,
+            this.itemShortcutReference,
+			this.itemopenconfigfolder,
+            this.itemhelpeditmode,
+            this.itemhelpcheckupdates,
+            this.seperatorhelpmanual,
+            this.itemhelpabout});
+			this.menuhelp.Name = "menuhelp";
+			this.menuhelp.Size = new System.Drawing.Size(44, 20);
+			this.menuhelp.Text = "&Help";
+			// 
+			// itemhelprefmanual
+			// 
+			this.itemhelprefmanual.Image = global::CodeImp.DoomBuilder.Properties.Resources.Help;
+			this.itemhelprefmanual.Name = "itemhelprefmanual";
+			this.itemhelprefmanual.Size = new System.Drawing.Size(232, 22);
+			this.itemhelprefmanual.Text = "Reference &Manual";
+			this.itemhelprefmanual.Click += new System.EventHandler(this.itemhelprefmanual_Click);
+			// 
+			// itemShortcutReference
+			// 
+			this.itemShortcutReference.Image = global::CodeImp.DoomBuilder.Properties.Resources.Keyboard;
+			this.itemShortcutReference.Name = "itemShortcutReference";
+			this.itemShortcutReference.Size = new System.Drawing.Size(232, 22);
+			this.itemShortcutReference.Tag = "";
+			this.itemShortcutReference.Text = "Keyboard Shortcuts Reference";
+			this.itemShortcutReference.Click += new System.EventHandler(this.itemShortcutReference_Click);
+			// 
+			// itemopenconfigfolder
+			//
+			this.itemopenconfigfolder.Image = global::CodeImp.DoomBuilder.Properties.Resources.FolderExplore;
+			this.itemopenconfigfolder.Name = "itemopenconfigfolder";
+			this.itemopenconfigfolder.Size = new System.Drawing.Size(232, 22);
+			this.itemopenconfigfolder.Tag = "";
+			this.itemopenconfigfolder.Text = "Program Configuration Folder";
+			this.itemopenconfigfolder.Click += new System.EventHandler(this.itemopenconfigfolder_Click);
+			// 
+			// itemhelpeditmode
+			// 
+			this.itemhelpeditmode.Image = global::CodeImp.DoomBuilder.Properties.Resources.Question;
+			this.itemhelpeditmode.Name = "itemhelpeditmode";
+			this.itemhelpeditmode.Size = new System.Drawing.Size(232, 22);
+			this.itemhelpeditmode.Text = "About this &Editing Mode";
+			this.itemhelpeditmode.Click += new System.EventHandler(this.itemhelpeditmode_Click);
+			// 
+			// itemhelpcheckupdates
+			// 
+			this.itemhelpcheckupdates.Image = global::CodeImp.DoomBuilder.Properties.Resources.Update;
+			this.itemhelpcheckupdates.Name = "itemhelpcheckupdates";
+			this.itemhelpcheckupdates.Size = new System.Drawing.Size(232, 22);
+			this.itemhelpcheckupdates.Text = "&Check for updates...";
+			this.itemhelpcheckupdates.Click += new System.EventHandler(this.itemhelpcheckupdates_Click);
+			// 
+			// seperatorhelpmanual
+			// 
+			this.seperatorhelpmanual.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
+			this.seperatorhelpmanual.Name = "seperatorhelpmanual";
+			this.seperatorhelpmanual.Size = new System.Drawing.Size(229, 6);
+			// 
+			// itemhelpabout
+			// 
+			this.itemhelpabout.Image = global::CodeImp.DoomBuilder.Properties.Resources.About;
+			this.itemhelpabout.Name = "itemhelpabout";
+			this.itemhelpabout.Size = new System.Drawing.Size(232, 22);
+			this.itemhelpabout.Text = "&About GZDoom Builder...";
+			this.itemhelpabout.Click += new System.EventHandler(this.itemhelpabout_Click);
+			// 
+			// toolbar
+			// 
+			this.toolbar.AutoSize = false;
+			this.toolbar.ImageScalingSize = MainForm.ScaledIconSize;
+			this.toolbar.ContextMenuStrip = this.toolbarContextMenu;
+			this.toolbar.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;
+			this.toolbar.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.buttonnewmap,
+            this.buttonopenmap,
+            this.buttonsavemap,
+            this.seperatorfile,
+            this.buttonscripteditor,
+            this.seperatorscript,
+            this.buttonundo,
+            this.buttonredo,
+            this.seperatorundo,
+            this.buttoncut,
+            this.buttoncopy,
+            this.buttonpaste,
+            this.seperatorcopypaste,
+            this.buttoninsertprefabfile,
+            this.buttoninsertpreviousprefab,
+            this.seperatorprefabs,
+            this.buttonthingsfilter,
+            this.thingfilters,
+            this.separatorlinecolors,
+            this.buttonlinededfcolors,
+            this.linedefcolorpresets,
+            this.separatorfilters,
+            this.buttonfullbrightness,
+            this.buttontogglegrid,
+            this.buttontogglecomments,
+            this.separatorfullbrightness,
+            this.buttonviewnormal,
+            this.buttonviewbrightness,
+            this.buttonviewfloors,
+            this.buttonviewceilings,
+            this.seperatorviews,
+            this.buttonsnaptogrid,
+            this.buttontoggledynamicgrid,
+            this.buttonautomerge,
+            this.buttonautoclearsidetextures,
+            this.seperatorgeometry,
+            this.buttontogglefx,
+            this.dynamiclightmode,
+            this.modelrendermode,
+            this.buttontogglefog,
+            this.buttontoggleeventlines,
+            this.buttontogglevisualvertices,
+            this.separatorgzmodes,
+            this.buttontest,
+            this.seperatortesting});
+			this.toolbar.Location = new System.Drawing.Point(0, 24);
+			this.toolbar.Name = "toolbar";
+			this.toolbar.Size = new System.Drawing.Size(1012, 25);
+			this.toolbar.TabIndex = 1;
+			// 
+			// toolbarContextMenu
+			// 
+			this.toolbarContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.toggleFile,
+            this.toggleScript,
+            this.toggleUndo,
+            this.toggleCopy,
+            this.togglePrefabs,
+            this.toggleFilter,
+            this.toggleViewModes,
+            this.toggleGeometry,
+            this.toggleTesting,
+            this.toggleRendering});
+			this.toolbarContextMenu.Name = "toolbarContextMenu";
+			this.toolbarContextMenu.Size = new System.Drawing.Size(227, 224);
+			this.toolbarContextMenu.ImageScalingSize = MainForm.ScaledIconSize;
+			this.toolbarContextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.toolbarContextMenu_Opening);
+			this.toolbarContextMenu.Closing += new System.Windows.Forms.ToolStripDropDownClosingEventHandler(this.toolbarContextMenu_Closing);
+			// 
+			// toggleFile
+			// 
+			this.toggleFile.Name = "toggleFile";
+			this.toggleFile.Size = new System.Drawing.Size(226, 22);
+			this.toggleFile.Text = "New / Open / Save";
+			this.toggleFile.Click += new System.EventHandler(this.toggleFile_Click);
+			// 
+			// toggleScript
+			// 
+			this.toggleScript.Name = "toggleScript";
+			this.toggleScript.Size = new System.Drawing.Size(226, 22);
+			this.toggleScript.Text = "Script Editor";
+			this.toggleScript.Click += new System.EventHandler(this.toggleScript_Click);
+			// 
+			// toggleUndo
+			// 
+			this.toggleUndo.Name = "toggleUndo";
+			this.toggleUndo.Size = new System.Drawing.Size(226, 22);
+			this.toggleUndo.Text = "Undo / Redo";
+			this.toggleUndo.Click += new System.EventHandler(this.toggleUndo_Click);
+			// 
+			// toggleCopy
+			// 
+			this.toggleCopy.Name = "toggleCopy";
+			this.toggleCopy.Size = new System.Drawing.Size(226, 22);
+			this.toggleCopy.Text = "Cut / Copy / Paste";
+			this.toggleCopy.Click += new System.EventHandler(this.toggleCopy_Click);
+			// 
+			// togglePrefabs
+			// 
+			this.togglePrefabs.Name = "togglePrefabs";
+			this.togglePrefabs.Size = new System.Drawing.Size(226, 22);
+			this.togglePrefabs.Text = "Prefabs";
+			this.togglePrefabs.Click += new System.EventHandler(this.togglePrefabs_Click);
+			// 
+			// toggleFilter
+			// 
+			this.toggleFilter.Name = "toggleFilter";
+			this.toggleFilter.Size = new System.Drawing.Size(226, 22);
+			this.toggleFilter.Text = "Things Filter / Linedef Colors";
+			this.toggleFilter.Click += new System.EventHandler(this.toggleFilter_Click);
+			// 
+			// toggleViewModes
+			// 
+			this.toggleViewModes.Name = "toggleViewModes";
+			this.toggleViewModes.Size = new System.Drawing.Size(226, 22);
+			this.toggleViewModes.Text = "View Modes";
+			this.toggleViewModes.Click += new System.EventHandler(this.toggleViewModes_Click);
+			// 
+			// toggleGeometry
+			// 
+			this.toggleGeometry.Name = "toggleGeometry";
+			this.toggleGeometry.Size = new System.Drawing.Size(226, 22);
+			this.toggleGeometry.Text = "Snap / Merge";
+			this.toggleGeometry.Click += new System.EventHandler(this.toggleGeometry_Click);
+			// 
+			// toggleTesting
+			// 
+			this.toggleTesting.Name = "toggleTesting";
+			this.toggleTesting.Size = new System.Drawing.Size(226, 22);
+			this.toggleTesting.Text = "Testing";
+			this.toggleTesting.Click += new System.EventHandler(this.toggleTesting_Click);
+			// 
+			// toggleRendering
+			// 
+			this.toggleRendering.Name = "toggleRendering";
+			this.toggleRendering.Size = new System.Drawing.Size(226, 22);
+			this.toggleRendering.Text = "Rendering";
+			this.toggleRendering.Click += new System.EventHandler(this.toggleRendering_Click);
+			// 
+			// buttonnewmap
+			// 
+			this.buttonnewmap.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttonnewmap.Image = global::CodeImp.DoomBuilder.Properties.Resources.NewMap;
+			this.buttonnewmap.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttonnewmap.Margin = new System.Windows.Forms.Padding(6, 1, 0, 2);
+			this.buttonnewmap.Name = "buttonnewmap";
+			this.buttonnewmap.Size = new System.Drawing.Size(23, 22);
+			this.buttonnewmap.Tag = "builder_newmap";
+			this.buttonnewmap.Text = "New Map";
+			this.buttonnewmap.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// buttonopenmap
+			// 
+			this.buttonopenmap.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttonopenmap.Image = global::CodeImp.DoomBuilder.Properties.Resources.OpenMap;
+			this.buttonopenmap.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttonopenmap.Name = "buttonopenmap";
+			this.buttonopenmap.Size = new System.Drawing.Size(23, 22);
+			this.buttonopenmap.Tag = "builder_openmap";
+			this.buttonopenmap.Text = "Open Map";
+			this.buttonopenmap.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// buttonsavemap
+			// 
+			this.buttonsavemap.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttonsavemap.Image = global::CodeImp.DoomBuilder.Properties.Resources.SaveMap;
+			this.buttonsavemap.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttonsavemap.Name = "buttonsavemap";
+			this.buttonsavemap.Size = new System.Drawing.Size(23, 22);
+			this.buttonsavemap.Tag = "builder_savemap";
+			this.buttonsavemap.Text = "Save Map";
+			this.buttonsavemap.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// buttonscripteditor
+			// 
+			this.buttonscripteditor.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttonscripteditor.Image = global::CodeImp.DoomBuilder.Properties.Resources.Script2;
+			this.buttonscripteditor.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttonscripteditor.Name = "buttonscripteditor";
+			this.buttonscripteditor.Size = new System.Drawing.Size(23, 22);
+			this.buttonscripteditor.Tag = "builder_openscripteditor";
+			this.buttonscripteditor.Text = "Open Script Editor";
+			this.buttonscripteditor.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// buttonundo
+			// 
+			this.buttonundo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttonundo.Image = global::CodeImp.DoomBuilder.Properties.Resources.Undo;
+			this.buttonundo.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttonundo.Name = "buttonundo";
+			this.buttonundo.Size = new System.Drawing.Size(23, 22);
+			this.buttonundo.Tag = "builder_undo";
+			this.buttonundo.Text = "Undo";
+			this.buttonundo.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// buttonredo
+			// 
+			this.buttonredo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttonredo.Image = global::CodeImp.DoomBuilder.Properties.Resources.Redo;
+			this.buttonredo.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttonredo.Name = "buttonredo";
+			this.buttonredo.Size = new System.Drawing.Size(23, 22);
+			this.buttonredo.Tag = "builder_redo";
+			this.buttonredo.Text = "Redo";
+			this.buttonredo.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// buttoncut
+			// 
+			this.buttoncut.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttoncut.Image = global::CodeImp.DoomBuilder.Properties.Resources.Cut;
+			this.buttoncut.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttoncut.Name = "buttoncut";
+			this.buttoncut.Size = new System.Drawing.Size(23, 22);
+			this.buttoncut.Tag = "builder_cutselection";
+			this.buttoncut.Text = "Cut Selection";
+			this.buttoncut.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// buttoncopy
+			// 
+			this.buttoncopy.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttoncopy.Image = global::CodeImp.DoomBuilder.Properties.Resources.Copy;
+			this.buttoncopy.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttoncopy.Name = "buttoncopy";
+			this.buttoncopy.Size = new System.Drawing.Size(23, 22);
+			this.buttoncopy.Tag = "builder_copyselection";
+			this.buttoncopy.Text = "Copy Selection";
+			this.buttoncopy.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// buttonpaste
+			// 
+			this.buttonpaste.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttonpaste.Image = global::CodeImp.DoomBuilder.Properties.Resources.Paste;
+			this.buttonpaste.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttonpaste.Name = "buttonpaste";
+			this.buttonpaste.Size = new System.Drawing.Size(23, 22);
+			this.buttonpaste.Tag = "builder_pasteselection";
+			this.buttonpaste.Text = "Paste Selection";
+			this.buttonpaste.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// buttoninsertprefabfile
+			// 
+			this.buttoninsertprefabfile.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttoninsertprefabfile.Image = global::CodeImp.DoomBuilder.Properties.Resources.Prefab;
+			this.buttoninsertprefabfile.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttoninsertprefabfile.Name = "buttoninsertprefabfile";
+			this.buttoninsertprefabfile.Size = new System.Drawing.Size(23, 22);
+			this.buttoninsertprefabfile.Tag = "builder_insertprefabfile";
+			this.buttoninsertprefabfile.Text = "Insert Prefab from File";
+			this.buttoninsertprefabfile.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// buttoninsertpreviousprefab
+			// 
+			this.buttoninsertpreviousprefab.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttoninsertpreviousprefab.Image = global::CodeImp.DoomBuilder.Properties.Resources.Prefab2;
+			this.buttoninsertpreviousprefab.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttoninsertpreviousprefab.Name = "buttoninsertpreviousprefab";
+			this.buttoninsertpreviousprefab.Size = new System.Drawing.Size(23, 22);
+			this.buttoninsertpreviousprefab.Tag = "builder_insertpreviousprefab";
+			this.buttoninsertpreviousprefab.Text = "Insert Previous Prefab";
+			this.buttoninsertpreviousprefab.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// buttonthingsfilter
+			// 
+			this.buttonthingsfilter.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttonthingsfilter.Image = global::CodeImp.DoomBuilder.Properties.Resources.Filter;
+			this.buttonthingsfilter.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttonthingsfilter.Name = "buttonthingsfilter";
+			this.buttonthingsfilter.Size = new System.Drawing.Size(23, 22);
+			this.buttonthingsfilter.Tag = "builder_thingsfilterssetup";
+			this.buttonthingsfilter.Text = "Configure Things Filters";
+			this.buttonthingsfilter.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// thingfilters
+			// 
+			this.thingfilters.AutoSize = false;
+			this.thingfilters.AutoToolTip = false;
+			this.thingfilters.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+			this.thingfilters.Image = ((System.Drawing.Image)(resources.GetObject("thingfilters.Image")));
+			this.thingfilters.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.thingfilters.Margin = new System.Windows.Forms.Padding(1, 1, 0, 2);
+			this.thingfilters.Name = "thingfilters";
+			this.thingfilters.Size = new System.Drawing.Size((int)(120 * MainForm.DPIScaler.Width), (int)(22 * MainForm.DPIScaler.Height));
+			this.thingfilters.Text = "(show all)";
+			this.thingfilters.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+			this.thingfilters.DropDownClosed += new System.EventHandler(this.LoseFocus);
+			// 
+			// separatorlinecolors
+			// 
+			this.separatorlinecolors.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+			this.separatorlinecolors.Name = "separatorlinecolors";
+			this.separatorlinecolors.Size = new System.Drawing.Size(6, 25);
+			// 
+			// buttonlinededfcolors
+			// 
+			this.buttonlinededfcolors.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttonlinededfcolors.Image = global::CodeImp.DoomBuilder.Properties.Resources.LinedefColorPresets;
+			this.buttonlinededfcolors.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttonlinededfcolors.Name = "buttonlinededfcolors";
+			this.buttonlinededfcolors.Size = new System.Drawing.Size(23, 22);
+			this.buttonlinededfcolors.Tag = "builder_linedefcolorssetup";
+			this.buttonlinededfcolors.Text = "Configure Linedef Colors";
+			this.buttonlinededfcolors.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// linedefcolorpresets
+			// 
+			this.linedefcolorpresets.AutoSize = false;
+			this.linedefcolorpresets.AutoToolTip = false;
+			this.linedefcolorpresets.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+			this.linedefcolorpresets.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.linedefcolorpresets.Margin = new System.Windows.Forms.Padding(1, 1, 0, 2);
+			this.linedefcolorpresets.Name = "linedefcolorpresets";
+			this.linedefcolorpresets.Size = new System.Drawing.Size((int)(120 * MainForm.DPIScaler.Width), (int)(22 * MainForm.DPIScaler.Height));
+			this.linedefcolorpresets.Text = "No presets";
+			this.linedefcolorpresets.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+			this.linedefcolorpresets.DropDownItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.linedefcolorpresets_DropDownItemClicked);
+			this.linedefcolorpresets.DropDownClosed += new System.EventHandler(this.LoseFocus);
+			this.linedefcolorpresets.Click += new System.EventHandler(this.linedefcolorpresets_MouseLeave);
+			// 
+			// separatorfilters
+			// 
+			this.separatorfilters.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+			this.separatorfilters.Name = "separatorfilters";
+			this.separatorfilters.Size = new System.Drawing.Size(6, 25);
+			// 
+			// buttonfullbrightness
+			// 
+			this.buttonfullbrightness.Checked = true;
+			this.buttonfullbrightness.CheckOnClick = true;
+			this.buttonfullbrightness.CheckState = System.Windows.Forms.CheckState.Checked;
+			this.buttonfullbrightness.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttonfullbrightness.Image = global::CodeImp.DoomBuilder.Properties.Resources.Brightness;
+			this.buttonfullbrightness.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttonfullbrightness.Name = "buttonfullbrightness";
+			this.buttonfullbrightness.Size = new System.Drawing.Size(23, 22);
+			this.buttonfullbrightness.Tag = "builder_togglebrightness";
+			this.buttonfullbrightness.Text = "Full Brightness";
+			this.buttonfullbrightness.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// buttontogglegrid
+			// 
+			this.buttontogglegrid.Checked = true;
+			this.buttontogglegrid.CheckOnClick = true;
+			this.buttontogglegrid.CheckState = System.Windows.Forms.CheckState.Checked;
+			this.buttontogglegrid.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttontogglegrid.Image = global::CodeImp.DoomBuilder.Properties.Resources.Grid2;
+			this.buttontogglegrid.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttontogglegrid.Name = "buttontogglegrid";
+			this.buttontogglegrid.Size = new System.Drawing.Size(23, 22);
+			this.buttontogglegrid.Tag = "builder_togglegrid";
+			this.buttontogglegrid.Text = "Render Grid";
+			this.buttontogglegrid.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// buttontoggledynamicgrid
+			// 
+			this.buttontoggledynamicgrid.Checked = true;
+			this.buttontoggledynamicgrid.CheckOnClick = true;
+			this.buttontoggledynamicgrid.CheckState = System.Windows.Forms.CheckState.Checked;
+			this.buttontoggledynamicgrid.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttontoggledynamicgrid.Image = global::CodeImp.DoomBuilder.Properties.Resources.GridDynamic;
+			this.buttontoggledynamicgrid.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttontoggledynamicgrid.Name = "buttontoggledynamicgrid";
+			this.buttontoggledynamicgrid.Size = new System.Drawing.Size(23, 22);
+			this.buttontoggledynamicgrid.Tag = "builder_toggledynamicgrid";
+			this.buttontoggledynamicgrid.Text = "Dynamic Grid Size";
+			this.buttontoggledynamicgrid.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// separatorfullbrightness
+			// 
+			this.separatorfullbrightness.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+			this.separatorfullbrightness.Name = "separatorfullbrightness";
+			this.separatorfullbrightness.Size = new System.Drawing.Size(6, 25);
+			// 
+			// buttonviewnormal
+			// 
+			this.buttonviewnormal.CheckOnClick = true;
+			this.buttonviewnormal.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttonviewnormal.Image = global::CodeImp.DoomBuilder.Properties.Resources.ViewNormal;
+			this.buttonviewnormal.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttonviewnormal.Name = "buttonviewnormal";
+			this.buttonviewnormal.Size = new System.Drawing.Size(23, 22);
+			this.buttonviewnormal.Tag = "builder_viewmodenormal";
+			this.buttonviewnormal.Text = "View Wireframe";
+			this.buttonviewnormal.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// buttonviewbrightness
+			// 
+			this.buttonviewbrightness.CheckOnClick = true;
+			this.buttonviewbrightness.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttonviewbrightness.Image = global::CodeImp.DoomBuilder.Properties.Resources.ViewBrightness;
+			this.buttonviewbrightness.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttonviewbrightness.Name = "buttonviewbrightness";
+			this.buttonviewbrightness.Size = new System.Drawing.Size(23, 22);
+			this.buttonviewbrightness.Tag = "builder_viewmodebrightness";
+			this.buttonviewbrightness.Text = "View Brightness Levels";
+			this.buttonviewbrightness.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// buttonviewfloors
+			// 
+			this.buttonviewfloors.CheckOnClick = true;
+			this.buttonviewfloors.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttonviewfloors.Image = global::CodeImp.DoomBuilder.Properties.Resources.ViewTextureFloor;
+			this.buttonviewfloors.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttonviewfloors.Name = "buttonviewfloors";
+			this.buttonviewfloors.Size = new System.Drawing.Size(23, 22);
+			this.buttonviewfloors.Tag = "builder_viewmodefloors";
+			this.buttonviewfloors.Text = "View Floor Textures";
+			this.buttonviewfloors.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// buttonviewceilings
+			// 
+			this.buttonviewceilings.CheckOnClick = true;
+			this.buttonviewceilings.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttonviewceilings.Image = global::CodeImp.DoomBuilder.Properties.Resources.ViewTextureCeiling;
+			this.buttonviewceilings.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttonviewceilings.Name = "buttonviewceilings";
+			this.buttonviewceilings.Size = new System.Drawing.Size(23, 22);
+			this.buttonviewceilings.Tag = "builder_viewmodeceilings";
+			this.buttonviewceilings.Text = "View Ceiling Textures";
+			this.buttonviewceilings.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// seperatorviews
+			// 
+			this.seperatorviews.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+			this.seperatorviews.Name = "seperatorviews";
+			this.seperatorviews.Size = new System.Drawing.Size(6, 25);
+			// 
+			// buttontogglecomments
+			// 
+			this.buttontogglecomments.Checked = true;
+			this.buttontogglecomments.CheckState = System.Windows.Forms.CheckState.Checked;
+			this.buttontogglecomments.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttontogglecomments.Image = global::CodeImp.DoomBuilder.Properties.Resources.Comment;
+			this.buttontogglecomments.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttontogglecomments.Name = "buttontogglecomments";
+			this.buttontogglecomments.Size = new System.Drawing.Size(23, 22);
+			this.buttontogglecomments.Tag = "builder_togglecomments";
+			this.buttontogglecomments.Text = "Show Comments";
+			this.buttontogglecomments.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// buttonsnaptogrid
+			// 
+			this.buttonsnaptogrid.Checked = true;
+			this.buttonsnaptogrid.CheckState = System.Windows.Forms.CheckState.Checked;
+			this.buttonsnaptogrid.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttonsnaptogrid.Image = global::CodeImp.DoomBuilder.Properties.Resources.Grid4;
+			this.buttonsnaptogrid.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttonsnaptogrid.Name = "buttonsnaptogrid";
+			this.buttonsnaptogrid.Size = new System.Drawing.Size(23, 22);
+			this.buttonsnaptogrid.Tag = "builder_togglesnap";
+			this.buttonsnaptogrid.Text = "Snap to Grid";
+			this.buttonsnaptogrid.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// buttonautomerge
+			// 
+			this.buttonautomerge.Checked = true;
+			this.buttonautomerge.CheckState = System.Windows.Forms.CheckState.Checked;
+			this.buttonautomerge.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttonautomerge.Image = global::CodeImp.DoomBuilder.Properties.Resources.mergegeometry2;
+			this.buttonautomerge.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttonautomerge.Name = "buttonautomerge";
+			this.buttonautomerge.Size = new System.Drawing.Size(23, 22);
+			this.buttonautomerge.Tag = "builder_toggleautomerge";
+			this.buttonautomerge.Text = "Merge Geometry";
+			this.buttonautomerge.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// buttonautoclearsidetextures
+			// 
+			this.buttonautoclearsidetextures.Checked = true;
+			this.buttonautoclearsidetextures.CheckState = System.Windows.Forms.CheckState.Checked;
+			this.buttonautoclearsidetextures.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttonautoclearsidetextures.Image = global::CodeImp.DoomBuilder.Properties.Resources.ClearTextures;
+			this.buttonautoclearsidetextures.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttonautoclearsidetextures.Name = "buttonautoclearsidetextures";
+			this.buttonautoclearsidetextures.Size = new System.Drawing.Size(23, 22);
+			this.buttonautoclearsidetextures.Tag = "builder_toggleautoclearsidetextures";
+			this.buttonautoclearsidetextures.Text = "Auto Clear Sidedef Textures";
+			this.buttonautoclearsidetextures.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// seperatorgeometry
+			// 
+			this.seperatorgeometry.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+			this.seperatorgeometry.Name = "seperatorgeometry";
+			this.seperatorgeometry.Size = new System.Drawing.Size(6, 25);
+			// 
+			// buttontogglefx
+			// 
+			this.buttontogglefx.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttontogglefx.Image = global::CodeImp.DoomBuilder.Properties.Resources.fx;
+			this.buttontogglefx.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttontogglefx.Name = "buttontogglefx";
+			this.buttontogglefx.Size = new System.Drawing.Size(23, 22);
+			this.buttontogglefx.Tag = "builder_gztogglefx";
+			this.buttontogglefx.Text = "Toggle GZDoom Effects";
+			this.buttontogglefx.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// dynamiclightmode
+			// 
+			this.dynamiclightmode.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.dynamiclightmode.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.sightsdontshow,
+            this.lightsshow,
+            this.lightsshowanimated});
+			this.dynamiclightmode.Image = global::CodeImp.DoomBuilder.Properties.Resources.Light;
+			this.dynamiclightmode.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.dynamiclightmode.Name = "dynamiclightmode";
+			this.dynamiclightmode.Size = new System.Drawing.Size(32, 20);
+			this.dynamiclightmode.Tag = "builder_gztogglelights";
+			this.dynamiclightmode.Text = "Dynamic light mode";
+			this.dynamiclightmode.ButtonClick += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// sightsdontshow
+			// 
+			this.sightsdontshow.CheckOnClick = true;
+			this.sightsdontshow.Image = global::CodeImp.DoomBuilder.Properties.Resources.LightDisabled;
+			this.sightsdontshow.Name = "sightsdontshow";
+			this.sightsdontshow.Size = new System.Drawing.Size(237, 22);
+			this.sightsdontshow.Tag = 0;
+			this.sightsdontshow.Text = "Don\'t show dynamic lights";
+			this.sightsdontshow.Click += new System.EventHandler(this.ChangeLightRenderingMode);
+			// 
+			// lightsshow
+			// 
+			this.lightsshow.CheckOnClick = true;
+			this.lightsshow.Image = global::CodeImp.DoomBuilder.Properties.Resources.Light;
+			this.lightsshow.Name = "lightsshow";
+			this.lightsshow.Size = new System.Drawing.Size(237, 22);
+			this.lightsshow.Tag = 1;
+			this.lightsshow.Text = "Show dynamic lights";
+			this.lightsshow.Click += new System.EventHandler(this.ChangeLightRenderingMode);
+			// 
+			// lightsshowanimated
+			// 
+			this.lightsshowanimated.CheckOnClick = true;
+			this.lightsshowanimated.Image = global::CodeImp.DoomBuilder.Properties.Resources.Light_animate;
+			this.lightsshowanimated.Name = "lightsshowanimated";
+			this.lightsshowanimated.Size = new System.Drawing.Size(237, 22);
+			this.lightsshowanimated.Tag = 2;
+			this.lightsshowanimated.Text = "Show animated dynamic lights";
+			this.lightsshowanimated.Click += new System.EventHandler(this.ChangeLightRenderingMode);
+			// 
+			// modelrendermode
+			// 
+			this.modelrendermode.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.modelrendermode.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.modelsdontshow,
+            this.modelsshowselection,
+            this.modelsshowfiltered,
+            this.modelsshowall});
+			this.modelrendermode.Image = global::CodeImp.DoomBuilder.Properties.Resources.Model;
+			this.modelrendermode.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.modelrendermode.Name = "modelrendermode";
+			this.modelrendermode.Size = new System.Drawing.Size(32, 20);
+			this.modelrendermode.Tag = "builder_gztogglemodels";
+			this.modelrendermode.Text = "Model rendering mode";
+			this.modelrendermode.ButtonClick += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// modelsdontshow
+			// 
+			this.modelsdontshow.CheckOnClick = true;
+			this.modelsdontshow.Image = global::CodeImp.DoomBuilder.Properties.Resources.ModelDisabled;
+			this.modelsdontshow.Name = "modelsdontshow";
+			this.modelsdontshow.Size = new System.Drawing.Size(293, 22);
+			this.modelsdontshow.Tag = 0;
+			this.modelsdontshow.Text = "Don\'t show models";
+			this.modelsdontshow.Click += new System.EventHandler(this.ChangeModelRenderingMode);
+			// 
+			// modelsshowselection
+			// 
+			this.modelsshowselection.CheckOnClick = true;
+			this.modelsshowselection.Image = global::CodeImp.DoomBuilder.Properties.Resources.Model_selected;
+			this.modelsshowselection.Name = "modelsshowselection";
+			this.modelsshowselection.Size = new System.Drawing.Size(293, 22);
+			this.modelsshowselection.Tag = 1;
+			this.modelsshowselection.Text = "Show models for selected things only";
+			this.modelsshowselection.Click += new System.EventHandler(this.ChangeModelRenderingMode);
+			// 
+			// modelsshowfiltered
+			// 
+			this.modelsshowfiltered.CheckOnClick = true;
+			this.modelsshowfiltered.Image = global::CodeImp.DoomBuilder.Properties.Resources.ModelFiltered;
+			this.modelsshowfiltered.Name = "modelsshowfiltered";
+			this.modelsshowfiltered.Size = new System.Drawing.Size(293, 22);
+			this.modelsshowfiltered.Tag = 2;
+			this.modelsshowfiltered.Text = "Show models for current things filter only";
+			this.modelsshowfiltered.Click += new System.EventHandler(this.ChangeModelRenderingMode);
+			// 
+			// modelsshowall
+			// 
+			this.modelsshowall.CheckOnClick = true;
+			this.modelsshowall.Image = global::CodeImp.DoomBuilder.Properties.Resources.Model;
+			this.modelsshowall.Name = "modelsshowall";
+			this.modelsshowall.Size = new System.Drawing.Size(293, 22);
+			this.modelsshowall.Tag = 3;
+			this.modelsshowall.Text = "Always show models";
+			this.modelsshowall.Click += new System.EventHandler(this.ChangeModelRenderingMode);
+			// 
+			// buttontogglefog
+			// 
+			this.buttontogglefog.CheckOnClick = true;
+			this.buttontogglefog.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttontogglefog.Image = global::CodeImp.DoomBuilder.Properties.Resources.fog;
+			this.buttontogglefog.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttontogglefog.Name = "buttontogglefog";
+			this.buttontogglefog.Size = new System.Drawing.Size(23, 20);
+			this.buttontogglefog.Tag = "builder_gztogglefog";
+			this.buttontogglefog.Text = "Toggle Fog Rendering";
+			this.buttontogglefog.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// buttontoggleeventlines
+			// 
+			this.buttontoggleeventlines.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttontoggleeventlines.Image = global::CodeImp.DoomBuilder.Properties.Resources.InfoLine;
+			this.buttontoggleeventlines.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttontoggleeventlines.Name = "buttontoggleeventlines";
+			this.buttontoggleeventlines.Size = new System.Drawing.Size(23, 20);
+			this.buttontoggleeventlines.Tag = "builder_gztoggleeventlines";
+			this.buttontoggleeventlines.Text = "Toggle Event Lines";
+			this.buttontoggleeventlines.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// buttontogglevisualvertices
+			// 
+			this.buttontogglevisualvertices.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttontogglevisualvertices.Image = global::CodeImp.DoomBuilder.Properties.Resources.VisualVertices;
+			this.buttontogglevisualvertices.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttontogglevisualvertices.Name = "buttontogglevisualvertices";
+			this.buttontogglevisualvertices.Size = new System.Drawing.Size(23, 20);
+			this.buttontogglevisualvertices.Tag = "builder_gztogglevisualvertices";
+			this.buttontogglevisualvertices.Text = "Show Editable Vertices in Visual Mode";
+			this.buttontogglevisualvertices.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// separatorgzmodes
+			// 
+			this.separatorgzmodes.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+			this.separatorgzmodes.Name = "separatorgzmodes";
+			this.separatorgzmodes.Size = new System.Drawing.Size(6, 25);
+			// 
+			// buttontest
+			// 
+			this.buttontest.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttontest.Image = global::CodeImp.DoomBuilder.Properties.Resources.Test;
+			this.buttontest.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttontest.Name = "buttontest";
+			this.buttontest.Size = new System.Drawing.Size(32, 20);
+			this.buttontest.Tag = "builder_testmap";
+			this.buttontest.Text = "Test Map";
+			this.buttontest.ButtonClick += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// seperatortesting
+			// 
+			this.seperatortesting.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+			this.seperatortesting.Name = "seperatortesting";
+			this.seperatortesting.Size = new System.Drawing.Size(6, 25);
+			// 
+			// statusbar
+			// 
+			this.statusbar.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.statusbar.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.statuslabel,
+            this.configlabel,
+            toolStripSeparator12,
+            this.gridlabel,
+            this.buttongrid,
+            toolStripSeparator1,
+            this.zoomlabel,
+            this.buttonzoom,
+            toolStripSeparator3,
+            this.xposlabel,
+            this.poscommalabel,
+            this.yposlabel,
+            toolStripSeparator9,
+            this.warnsLabel});
+			this.statusbar.Location = new System.Drawing.Point(0, 670);
+			this.statusbar.Name = "statusbar";
+			this.statusbar.ShowItemToolTips = true;
+			this.statusbar.Size = new System.Drawing.Size(1012, 23);
+			this.statusbar.ImageScalingSize = MainForm.ScaledIconSize;
+			this.statusbar.TabIndex = 2;
+			// 
+			// statuslabel
+			// 
+			this.statuslabel.Image = global::CodeImp.DoomBuilder.Properties.Resources.Status2;
+			this.statuslabel.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+			this.statuslabel.Margin = new System.Windows.Forms.Padding(2, 3, 0, 2);
+			this.statuslabel.Name = "statuslabel";
+			this.statuslabel.Size = new System.Drawing.Size(340, 18);
+			this.statuslabel.Spring = true;
+			this.statuslabel.Text = "Initializing user interface...";
+			this.statuslabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+			// 
+			// configlabel
+			// 
+			this.configlabel.AutoSize = false;
+			this.configlabel.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.configlabel.Name = "configlabel";
+			this.configlabel.Size = new System.Drawing.Size((int)(280 * MainForm.DPIScaler.Width), (int)(18 * MainForm.DPIScaler.Height));
+			this.configlabel.Text = "ZDoom (Doom in Hexen Format)";
+			this.configlabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+			this.configlabel.ToolTipText = "Current Game Configuration";
+			// 
+			// gridlabel
+			// 
+			this.gridlabel.AutoSize = false;
+			this.gridlabel.AutoToolTip = true;
+			this.gridlabel.Name = "gridlabel";
+			this.gridlabel.Size = new System.Drawing.Size(62, 18);
+			this.gridlabel.Text = "32 mp";
+			this.gridlabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+			this.gridlabel.TextImageRelation = System.Windows.Forms.TextImageRelation.Overlay;
+			this.gridlabel.ToolTipText = "Grid size";
+			// 
+			// buttongrid
+			// 
+			this.buttongrid.AutoToolTip = false;
+			this.buttongrid.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttongrid.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.itemgrid1024,
+            this.itemgrid512,
+            this.itemgrid256,
+            this.itemgrid128,
+            this.itemgrid64,
+            this.itemgrid32,
+            this.itemgrid16,
+            this.itemgrid8,
+            this.itemgrid4,
+            this.itemgrid1,
+            toolStripMenuItem4,
+            this.itemgridcustom});
+			this.buttongrid.Image = global::CodeImp.DoomBuilder.Properties.Resources.Grid2_arrowup;
+			this.buttongrid.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+			this.buttongrid.ImageTransparentColor = System.Drawing.Color.Transparent;
+			this.buttongrid.Name = "buttongrid";
+			this.buttongrid.ShowDropDownArrow = false;
+			this.buttongrid.Size = new System.Drawing.Size(29, 21);
+			this.buttongrid.Text = "Grid";
+			// 
+			// itemgrid1024
+			// 
+			this.itemgrid1024.Name = "itemgrid1024";
+			this.itemgrid1024.Size = new System.Drawing.Size(153, 22);
+			this.itemgrid1024.Tag = "1024";
+			this.itemgrid1024.Text = "1024 mp";
+			this.itemgrid1024.Click += new System.EventHandler(this.itemgridsize_Click);
+			// 
+			// itemgrid512
+			// 
+			this.itemgrid512.Name = "itemgrid512";
+			this.itemgrid512.Size = new System.Drawing.Size(153, 22);
+			this.itemgrid512.Tag = "512";
+			this.itemgrid512.Text = "512 mp";
+			this.itemgrid512.Click += new System.EventHandler(this.itemgridsize_Click);
+			// 
+			// itemgrid256
+			// 
+			this.itemgrid256.Name = "itemgrid256";
+			this.itemgrid256.Size = new System.Drawing.Size(153, 22);
+			this.itemgrid256.Tag = "256";
+			this.itemgrid256.Text = "256 mp";
+			this.itemgrid256.Click += new System.EventHandler(this.itemgridsize_Click);
+			// 
+			// itemgrid128
+			// 
+			this.itemgrid128.Name = "itemgrid128";
+			this.itemgrid128.Size = new System.Drawing.Size(153, 22);
+			this.itemgrid128.Tag = "128";
+			this.itemgrid128.Text = "128 mp";
+			this.itemgrid128.Click += new System.EventHandler(this.itemgridsize_Click);
+			// 
+			// itemgrid64
+			// 
+			this.itemgrid64.Name = "itemgrid64";
+			this.itemgrid64.Size = new System.Drawing.Size(153, 22);
+			this.itemgrid64.Tag = "64";
+			this.itemgrid64.Text = "64 mp";
+			this.itemgrid64.Click += new System.EventHandler(this.itemgridsize_Click);
+			// 
+			// itemgrid32
+			// 
+			this.itemgrid32.Name = "itemgrid32";
+			this.itemgrid32.Size = new System.Drawing.Size(153, 22);
+			this.itemgrid32.Tag = "32";
+			this.itemgrid32.Text = "32 mp";
+			this.itemgrid32.Click += new System.EventHandler(this.itemgridsize_Click);
+			// 
+			// itemgrid16
+			// 
+			this.itemgrid16.Name = "itemgrid16";
+			this.itemgrid16.Size = new System.Drawing.Size(153, 22);
+			this.itemgrid16.Tag = "16";
+			this.itemgrid16.Text = "16 mp";
+			this.itemgrid16.Click += new System.EventHandler(this.itemgridsize_Click);
+			// 
+			// itemgrid8
+			// 
+			this.itemgrid8.Name = "itemgrid8";
+			this.itemgrid8.Size = new System.Drawing.Size(153, 22);
+			this.itemgrid8.Tag = "8";
+			this.itemgrid8.Text = "8 mp";
+			this.itemgrid8.Click += new System.EventHandler(this.itemgridsize_Click);
+			// 
+			// itemgrid4
+			// 
+			this.itemgrid4.Name = "itemgrid4";
+			this.itemgrid4.Size = new System.Drawing.Size(153, 22);
+			this.itemgrid4.Tag = "4";
+			this.itemgrid4.Text = "4 mp";
+			this.itemgrid4.Click += new System.EventHandler(this.itemgridsize_Click);
+			// 
+			// itemgrid1
+			// 
+			this.itemgrid1.Name = "itemgrid1";
+			this.itemgrid1.Size = new System.Drawing.Size(153, 22);
+			this.itemgrid1.Tag = "1";
+			this.itemgrid1.Text = "1 mp";
+			this.itemgrid1.Click += new System.EventHandler(this.itemgridsize_Click);
+			// 
+			// itemgridcustom
+			// 
+			this.itemgridcustom.Name = "itemgridcustom";
+			this.itemgridcustom.Size = new System.Drawing.Size(153, 22);
+			this.itemgridcustom.Text = "Customize...";
+			this.itemgridcustom.Click += new System.EventHandler(this.itemgridcustom_Click);
+			// 
+			// zoomlabel
+			// 
+			this.zoomlabel.AutoSize = false;
+			this.zoomlabel.AutoToolTip = true;
+			this.zoomlabel.Name = "zoomlabel";
+			this.zoomlabel.Size = new System.Drawing.Size(54, 18);
+			this.zoomlabel.Text = "50%";
+			this.zoomlabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+			this.zoomlabel.TextImageRelation = System.Windows.Forms.TextImageRelation.Overlay;
+			this.zoomlabel.ToolTipText = "Zoom level";
+			// 
+			// buttonzoom
+			// 
+			this.buttonzoom.AutoToolTip = false;
+			this.buttonzoom.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttonzoom.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.itemzoom800,
+            this.itemzoom400,
+            this.itemzoom200,
+            this.itemzoom100,
+            this.itemzoom50,
+            this.itemzoom25,
+            this.itemzoom10,
+            this.itemzoom5,
+            toolStripSeparator2,
+            this.itemzoomfittoscreen});
+			this.buttonzoom.Image = global::CodeImp.DoomBuilder.Properties.Resources.Zoom_arrowup;
+			this.buttonzoom.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+			this.buttonzoom.ImageTransparentColor = System.Drawing.Color.Transparent;
+			this.buttonzoom.Name = "buttonzoom";
+			this.buttonzoom.ShowDropDownArrow = false;
+			this.buttonzoom.Size = new System.Drawing.Size(29, 21);
+			this.buttonzoom.Text = "Zoom";
+			// 
+			// itemzoom800
+			// 
+			this.itemzoom800.Name = "itemzoom800";
+			this.itemzoom800.Size = new System.Drawing.Size(156, 22);
+			this.itemzoom800.Tag = "800";
+			this.itemzoom800.Text = "800%";
+			this.itemzoom800.Click += new System.EventHandler(this.itemzoomto_Click);
+			// 
+			// itemzoom400
+			// 
+			this.itemzoom400.Name = "itemzoom400";
+			this.itemzoom400.Size = new System.Drawing.Size(156, 22);
+			this.itemzoom400.Tag = "400";
+			this.itemzoom400.Text = "400%";
+			this.itemzoom400.Click += new System.EventHandler(this.itemzoomto_Click);
+			// 
+			// itemzoom200
+			// 
+			this.itemzoom200.Name = "itemzoom200";
+			this.itemzoom200.Size = new System.Drawing.Size(156, 22);
+			this.itemzoom200.Tag = "200";
+			this.itemzoom200.Text = "200%";
+			this.itemzoom200.Click += new System.EventHandler(this.itemzoomto_Click);
+			// 
+			// itemzoom100
+			// 
+			this.itemzoom100.Name = "itemzoom100";
+			this.itemzoom100.Size = new System.Drawing.Size(156, 22);
+			this.itemzoom100.Tag = "100";
+			this.itemzoom100.Text = "100%";
+			this.itemzoom100.Click += new System.EventHandler(this.itemzoomto_Click);
+			// 
+			// itemzoom50
+			// 
+			this.itemzoom50.Name = "itemzoom50";
+			this.itemzoom50.Size = new System.Drawing.Size(156, 22);
+			this.itemzoom50.Tag = "50";
+			this.itemzoom50.Text = "50%";
+			this.itemzoom50.Click += new System.EventHandler(this.itemzoomto_Click);
+			// 
+			// itemzoom25
+			// 
+			this.itemzoom25.Name = "itemzoom25";
+			this.itemzoom25.Size = new System.Drawing.Size(156, 22);
+			this.itemzoom25.Tag = "25";
+			this.itemzoom25.Text = "25%";
+			this.itemzoom25.Click += new System.EventHandler(this.itemzoomto_Click);
+			// 
+			// itemzoom10
+			// 
+			this.itemzoom10.Name = "itemzoom10";
+			this.itemzoom10.Size = new System.Drawing.Size(156, 22);
+			this.itemzoom10.Tag = "10";
+			this.itemzoom10.Text = "10%";
+			this.itemzoom10.Click += new System.EventHandler(this.itemzoomto_Click);
+			// 
+			// itemzoom5
+			// 
+			this.itemzoom5.Name = "itemzoom5";
+			this.itemzoom5.Size = new System.Drawing.Size(156, 22);
+			this.itemzoom5.Tag = "5";
+			this.itemzoom5.Text = "5%";
+			this.itemzoom5.Click += new System.EventHandler(this.itemzoomto_Click);
+			// 
+			// itemzoomfittoscreen
+			// 
+			this.itemzoomfittoscreen.Name = "itemzoomfittoscreen";
+			this.itemzoomfittoscreen.Size = new System.Drawing.Size(156, 22);
+			this.itemzoomfittoscreen.Text = "Fit to screen";
+			this.itemzoomfittoscreen.Click += new System.EventHandler(this.itemzoomfittoscreen_Click);
+			// 
+			// xposlabel
+			// 
+			this.xposlabel.AutoSize = false;
+			this.xposlabel.Name = "xposlabel";
+			this.xposlabel.Size = new System.Drawing.Size(50, 18);
+			this.xposlabel.Tag = "builder_centeroncoordinates";
+			this.xposlabel.Text = "0";
+			this.xposlabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+			this.xposlabel.ToolTipText = "Current X, Y coordinates on map.\r\nClick to set specific coordinates.";
+			this.xposlabel.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// yposlabel
+			// 
+			this.yposlabel.AutoSize = false;
+			this.yposlabel.Name = "yposlabel";
+			this.yposlabel.Size = new System.Drawing.Size(50, 18);
+			this.yposlabel.Tag = "builder_centeroncoordinates";
+			this.yposlabel.Text = "0";
+			this.yposlabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+			this.yposlabel.ToolTipText = "Current X, Y coordinates on map.\r\nClick to set specific coordinates.";
+			this.yposlabel.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// warnsLabel
+			// 
+			this.warnsLabel.AutoSize = false;
+			this.warnsLabel.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.warnsLabel.Image = global::CodeImp.DoomBuilder.Properties.Resources.WarningOff;
+			this.warnsLabel.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
+			this.warnsLabel.Name = "warnsLabel";
+			this.warnsLabel.Size = new System.Drawing.Size(44, 18);
+			this.warnsLabel.Text = "0";
+			this.warnsLabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+			this.warnsLabel.TextImageRelation = System.Windows.Forms.TextImageRelation.TextBeforeImage;
+			this.warnsLabel.Click += new System.EventHandler(this.warnsLabel_Click);
+			// 
+			// panelinfo
+			// 
+			this.panelinfo.Controls.Add(this.statistics);
+			this.panelinfo.Controls.Add(this.heightpanel1);
+			this.panelinfo.Controls.Add(this.labelcollapsedinfo);
+			this.panelinfo.Controls.Add(this.modename);
+			this.panelinfo.Controls.Add(this.buttontoggleinfo);
+			this.panelinfo.Controls.Add(this.console);
+			this.panelinfo.Controls.Add(this.vertexinfo);
+			this.panelinfo.Controls.Add(this.linedefinfo);
+			this.panelinfo.Controls.Add(this.thinginfo);
+			this.panelinfo.Controls.Add(this.sectorinfo);
+			this.panelinfo.Dock = System.Windows.Forms.DockStyle.Bottom;
+			this.panelinfo.Location = new System.Drawing.Point(0, 564);
+			this.panelinfo.Name = "panelinfo";
+			this.panelinfo.Size = new System.Drawing.Size(1012, 106);
+			this.panelinfo.TabIndex = 4;
+			// 
+			// statistics
+			// 
+			this.statistics.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.statistics.ForeColor = System.Drawing.SystemColors.GrayText;
+			this.statistics.Location = new System.Drawing.Point(869, 2);
+			this.statistics.Name = "statistics";
+			this.statistics.Size = new System.Drawing.Size(118, 102);
+			this.statistics.TabIndex = 9;
+			this.statistics.Visible = false;
+			// 
+			// heightpanel1
+			// 
+			this.heightpanel1.BackColor = System.Drawing.Color.Navy;
+			this.heightpanel1.ForeColor = System.Drawing.SystemColors.ControlText;
+			this.heightpanel1.Location = new System.Drawing.Point(0, 0);
+			this.heightpanel1.Name = "heightpanel1";
+			this.heightpanel1.Size = new System.Drawing.Size(29, 106);
+			this.heightpanel1.TabIndex = 7;
+			this.heightpanel1.Visible = false;
+			// 
+			// labelcollapsedinfo
+			// 
+			this.labelcollapsedinfo.AutoSize = true;
+			this.labelcollapsedinfo.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.labelcollapsedinfo.Location = new System.Drawing.Point(2, 2);
+			this.labelcollapsedinfo.Name = "labelcollapsedinfo";
+			this.labelcollapsedinfo.Size = new System.Drawing.Size(155, 13);
+			this.labelcollapsedinfo.TabIndex = 6;
+			this.labelcollapsedinfo.Text = "Collapsed Descriptions";
+			this.labelcollapsedinfo.Visible = false;
+			// 
+			// modename
+			// 
+			this.modename.AutoSize = true;
+			this.modename.Font = new System.Drawing.Font("Verdana", 36F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.modename.ForeColor = System.Drawing.SystemColors.GrayText;
+			this.modename.Location = new System.Drawing.Point(12, 20);
+			this.modename.Name = "modename";
+			this.modename.Size = new System.Drawing.Size(476, 59);
+			this.modename.TabIndex = 8;
+			this.modename.Text = "Hi. I missed you.";
+			this.modename.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+			this.modename.UseMnemonic = false;
+			this.modename.Visible = false;
+			// 
+			// buttontoggleinfo
+			// 
+			this.buttontoggleinfo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.buttontoggleinfo.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+			this.buttontoggleinfo.Image = global::CodeImp.DoomBuilder.Properties.Resources.InfoPanelCollapse;
+			this.buttontoggleinfo.Location = new System.Drawing.Point(988, 1);
+			this.buttontoggleinfo.Name = "buttontoggleinfo";
+			this.buttontoggleinfo.Size = new System.Drawing.Size(22, 19);
+			this.buttontoggleinfo.TabIndex = 5;
+			this.buttontoggleinfo.TabStop = false;
+			this.buttontoggleinfo.Tag = "builder_toggleinfopanel";
+			this.buttontoggleinfo.UseVisualStyleBackColor = true;
+			this.buttontoggleinfo.Click += new System.EventHandler(this.InvokeTaggedAction);
+			this.buttontoggleinfo.MouseUp += new System.Windows.Forms.MouseEventHandler(this.buttontoggleinfo_MouseUp);
+			// 
+			// console
+			// 
+			this.console.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.console.Location = new System.Drawing.Point(3, 3);
+			this.console.Name = "console";
+			this.console.Size = new System.Drawing.Size(851, 98);
+			this.console.TabIndex = 10;
+			// 
+			// vertexinfo
+			// 
+			this.vertexinfo.Location = new System.Drawing.Point(0, 0);
+			this.vertexinfo.MaximumSize = new System.Drawing.Size(10000, 100);
+			this.vertexinfo.MinimumSize = new System.Drawing.Size(100, 100);
+			this.vertexinfo.Name = "vertexinfo";
+			this.vertexinfo.Size = new System.Drawing.Size(310, 100);
+			this.vertexinfo.TabIndex = 1;
+			this.vertexinfo.Visible = false;
+			// 
+			// linedefinfo
+			// 
+			this.linedefinfo.Location = new System.Drawing.Point(3, 3);
+			this.linedefinfo.MaximumSize = new System.Drawing.Size(10000, 100);
+			this.linedefinfo.MinimumSize = new System.Drawing.Size(100, 100);
+			this.linedefinfo.Name = "linedefinfo";
+			this.linedefinfo.Size = new System.Drawing.Size(1560, 100);
+			this.linedefinfo.TabIndex = 0;
+			this.linedefinfo.Visible = false;
+			// 
+			// thinginfo
+			// 
+			this.thinginfo.Location = new System.Drawing.Point(3, 3);
+			this.thinginfo.MaximumSize = new System.Drawing.Size(10000, 100);
+			this.thinginfo.MinimumSize = new System.Drawing.Size(100, 100);
+			this.thinginfo.Name = "thinginfo";
+			this.thinginfo.Size = new System.Drawing.Size(1190, 100);
+			this.thinginfo.TabIndex = 3;
+			this.thinginfo.Visible = false;
+			// 
+			// sectorinfo
+			// 
+			this.sectorinfo.Location = new System.Drawing.Point(3, 3);
+			this.sectorinfo.MaximumSize = new System.Drawing.Size(10000, 100);
+			this.sectorinfo.MinimumSize = new System.Drawing.Size(100, 100);
+			this.sectorinfo.Name = "sectorinfo";
+			this.sectorinfo.Size = new System.Drawing.Size(1090, 100);
+			this.sectorinfo.TabIndex = 2;
+			this.sectorinfo.Visible = false;
+			// 
+			// redrawtimer
+			// 
+			this.redrawtimer.Interval = 1;
+			this.redrawtimer.Tick += new System.EventHandler(this.redrawtimer_Tick);
+			// 
+			// display
+			// 
+			this.display.BackColor = System.Drawing.SystemColors.ControlDarkDark;
+			this.display.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
+			this.display.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+			this.display.CausesValidation = false;
+			this.display.Location = new System.Drawing.Point(373, 141);
+			this.display.Name = "display";
+			this.display.Size = new System.Drawing.Size(542, 307);
+			this.display.TabIndex = 5;
+			this.display.MouseUp += new System.Windows.Forms.MouseEventHandler(this.display_MouseUp);
+			this.display.MouseLeave += new System.EventHandler(this.display_MouseLeave);
+			this.display.Paint += new System.Windows.Forms.PaintEventHandler(this.display_Paint);
+			this.display.PreviewKeyDown += new System.Windows.Forms.PreviewKeyDownEventHandler(this.display_PreviewKeyDown);
+			this.display.MouseMove += new System.Windows.Forms.MouseEventHandler(this.display_MouseMove);
+			this.display.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.display_MouseDoubleClick);
+			this.display.MouseClick += new System.Windows.Forms.MouseEventHandler(this.display_MouseClick);
+			this.display.MouseDown += new System.Windows.Forms.MouseEventHandler(this.display_MouseDown);
+			this.display.Resize += new System.EventHandler(this.display_Resize);
+			this.display.MouseEnter += new System.EventHandler(this.display_MouseEnter);
+			// 
+			// processor
+			// 
+			this.processor.Interval = 10;
+			this.processor.Tick += new System.EventHandler(this.processor_Tick);
+			// 
+			// statusflasher
+			// 
+			this.statusflasher.Tick += new System.EventHandler(this.statusflasher_Tick);
+			// 
+			// statusresetter
+			// 
+			this.statusresetter.Tick += new System.EventHandler(this.statusresetter_Tick);
+			// 
+			// dockersspace
+			// 
+			this.dockersspace.Dock = System.Windows.Forms.DockStyle.Left;
+			this.dockersspace.Location = new System.Drawing.Point(0, 49);
+			this.dockersspace.Name = "dockersspace";
+			this.dockersspace.Size = new System.Drawing.Size(26, 515);
+			this.dockersspace.TabIndex = 6;
+			// 
+			// modestoolbar
+			// 
+			this.modestoolbar.AutoSize = false;
+			this.modestoolbar.ImageScalingSize = MainForm.ScaledIconSize;
+			this.modestoolbar.Dock = System.Windows.Forms.DockStyle.Left;
+			this.modestoolbar.Location = new System.Drawing.Point(0, 49);
+			this.modestoolbar.Name = "modestoolbar";
+			this.modestoolbar.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
+			this.modestoolbar.Size = new System.Drawing.Size(30, 515);
+			this.modestoolbar.TabIndex = 8;
+			this.modestoolbar.Text = "Editing Modes";
+			// 
+			// dockerspanel
+			// 
+			this.dockerspanel.Location = new System.Drawing.Point(62, 67);
+			this.dockerspanel.Name = "dockerspanel";
+			this.dockerspanel.Size = new System.Drawing.Size(236, 467);
+			this.dockerspanel.TabIndex = 7;
+			this.dockerspanel.TabStop = false;
+			this.dockerspanel.UserResize += new System.EventHandler(this.dockerspanel_UserResize);
+			this.dockerspanel.Collapsed += new System.EventHandler(this.LoseFocus);
+			this.dockerspanel.MouseContainerEnter += new System.EventHandler(this.dockerspanel_MouseContainerEnter);
+			// 
+			// dockerscollapser
+			// 
+			this.dockerscollapser.Interval = 200;
+			this.dockerscollapser.Tick += new System.EventHandler(this.dockerscollapser_Tick);
+			// 
+			// flowLayoutPanel
+			// 
+			this.flowLayoutPanel.Controls.Add(this.menumain);
+			this.flowLayoutPanel.Controls.Add(this.modecontrolsloolbar);
+			this.flowLayoutPanel.Dock = System.Windows.Forms.DockStyle.Top;
+			this.flowLayoutPanel.Location = new System.Drawing.Point(0, 0);
+			this.flowLayoutPanel.Name = "flowLayoutPanel";
+			this.flowLayoutPanel.Size = new System.Drawing.Size(1012, 24);
+			this.flowLayoutPanel.TabIndex = 9;
+			// 
+			// modecontrolsloolbar
+			// 
+			this.modecontrolsloolbar.Dock = System.Windows.Forms.DockStyle.None;
+			this.modecontrolsloolbar.Location = new System.Drawing.Point(328, 0);
+			this.modecontrolsloolbar.Name = "modecontrolsloolbar";
+			this.modecontrolsloolbar.Size = new System.Drawing.Size(43, 24);
+			this.modecontrolsloolbar.ImageScalingSize = MainForm.ScaledIconSize;
+			this.modecontrolsloolbar.TabIndex = 1;
+			this.modecontrolsloolbar.Text = "toolStrip1";
+			this.modecontrolsloolbar.Visible = false;
+			// 
+			// itemtogglecomments
+			// 
+			this.itemtogglecomments.Checked = true;
+			this.itemtogglecomments.CheckOnClick = true;
+			this.itemtogglecomments.CheckState = System.Windows.Forms.CheckState.Checked;
+			this.itemtogglecomments.Image = global::CodeImp.DoomBuilder.Properties.Resources.Comment;
+			this.itemtogglecomments.Name = "itemtogglecomments";
+			this.itemtogglecomments.Size = new System.Drawing.Size(215, 22);
+			this.itemtogglecomments.Tag = "builder_togglecomments";
+			this.itemtogglecomments.Text = "Show Comments";
+			this.itemtogglecomments.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// itemdynamicgridsize
+			// 
+			this.itemdynamicgridsize.Checked = true;
+			this.itemdynamicgridsize.CheckOnClick = true;
+			this.itemdynamicgridsize.CheckState = System.Windows.Forms.CheckState.Checked;
+			this.itemdynamicgridsize.Image = global::CodeImp.DoomBuilder.Properties.Resources.GridDynamic;
+			this.itemdynamicgridsize.Name = "itemdynamicgridsize";
+			this.itemdynamicgridsize.Size = new System.Drawing.Size(219, 22);
+			this.itemdynamicgridsize.Tag = "builder_toggledynamicgrid";
+			this.itemdynamicgridsize.Text = "Dynamic Grid Size";
+			this.itemdynamicgridsize.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// MainForm
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.ClientSize = new System.Drawing.Size(1012, 693);
+			this.Controls.Add(this.dockerspanel);
+			this.Controls.Add(this.display);
+			this.Controls.Add(this.dockersspace);
+			this.Controls.Add(this.modestoolbar);
+			this.Controls.Add(this.toolbar);
+			this.Controls.Add(this.flowLayoutPanel);
+			this.Controls.Add(this.panelinfo);
+			this.Controls.Add(this.statusbar);
+			this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+			this.MainMenuStrip = this.menumain;
+			this.Name = "MainForm";
+			this.Opacity = 1;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
+			this.Text = "GZDoom Builder";
+			this.Deactivate += new System.EventHandler(this.MainForm_Deactivate);
+			this.Load += new System.EventHandler(this.MainForm_Load);
+			this.Shown += new System.EventHandler(this.MainForm_Shown);
+			this.Activated += new System.EventHandler(this.MainForm_Activated);
+			this.KeyUp += new System.Windows.Forms.KeyEventHandler(this.MainForm_KeyUp);
+			this.Move += new System.EventHandler(this.MainForm_Move);
+			this.Resize += new System.EventHandler(this.MainForm_Resize);
+			this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.MainForm_KeyDown);
+			this.ResizeEnd += new System.EventHandler(this.MainForm_ResizeEnd);
+			this.menumain.ResumeLayout(false);
+			this.menumain.PerformLayout();
+			this.toolbar.ResumeLayout(false);
+			this.toolbar.PerformLayout();
+			this.toolbarContextMenu.ResumeLayout(false);
+			this.statusbar.ResumeLayout(false);
+			this.statusbar.PerformLayout();
+			this.panelinfo.ResumeLayout(false);
+			this.panelinfo.PerformLayout();
+			this.flowLayoutPanel.ResumeLayout(false);
+			this.flowLayoutPanel.PerformLayout();
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.MenuStrip menumain;
+		private System.Windows.Forms.ToolStrip toolbar;
+		private System.Windows.Forms.StatusStrip statusbar;
+		private System.Windows.Forms.Panel panelinfo;
+		private System.Windows.Forms.ToolStripMenuItem menufile;
+		private System.Windows.Forms.ToolStripMenuItem itemnewmap;
+		private System.Windows.Forms.ToolStripMenuItem itemopenmap;
+		private System.Windows.Forms.ToolStripMenuItem itemsavemap;
+		private System.Windows.Forms.ToolStripMenuItem itemsavemapas;
+		private System.Windows.Forms.ToolStripMenuItem itemsavemapinto;
+		private System.Windows.Forms.ToolStripMenuItem itemexit;
+		private System.Windows.Forms.ToolStripStatusLabel statuslabel;
+		private System.Windows.Forms.ToolStripMenuItem itemclosemap;
+		private System.Windows.Forms.Timer redrawtimer;
+		private System.Windows.Forms.ToolStripMenuItem menuhelp;
+		private System.Windows.Forms.ToolStripMenuItem itemhelpabout;
+		private System.Windows.Forms.ToolStripMenuItem itemhelpcheckupdates;
+		private CodeImp.DoomBuilder.Controls.RenderTargetControl display;
+		private System.Windows.Forms.ToolStripMenuItem itemnorecent;
+		private System.Windows.Forms.ToolStripStatusLabel xposlabel;
+		private System.Windows.Forms.ToolStripStatusLabel yposlabel;
+		private System.Windows.Forms.ToolStripButton buttonnewmap;
+		private System.Windows.Forms.ToolStripButton buttonopenmap;
+		private System.Windows.Forms.ToolStripButton buttonsavemap;
+		private System.Windows.Forms.ToolStripStatusLabel zoomlabel;
+		private System.Windows.Forms.ToolStripDropDownButton buttonzoom;
+		private System.Windows.Forms.ToolStripMenuItem itemzoomfittoscreen;
+		private System.Windows.Forms.ToolStripMenuItem itemzoom100;
+		private System.Windows.Forms.ToolStripMenuItem itemzoom200;
+		private System.Windows.Forms.ToolStripMenuItem itemzoom50;
+		private System.Windows.Forms.ToolStripMenuItem itemzoom25;
+		private System.Windows.Forms.ToolStripMenuItem itemzoom10;
+		private System.Windows.Forms.ToolStripMenuItem itemzoom5;
+		private System.Windows.Forms.ToolStripMenuItem menutools;
+		private System.Windows.Forms.ToolStripMenuItem configurationToolStripMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem preferencesToolStripMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem menuedit;
+		private System.Windows.Forms.ToolStripMenuItem itemmapoptions;
+		private System.Windows.Forms.ToolStripMenuItem itemreloadresources;
+		private CodeImp.DoomBuilder.Controls.LinedefInfoPanel linedefinfo;
+		private CodeImp.DoomBuilder.Controls.VertexInfoPanel vertexinfo;
+		private CodeImp.DoomBuilder.Controls.SectorInfoPanel sectorinfo;
+		private CodeImp.DoomBuilder.Controls.ThingInfoPanel thinginfo;
+		private System.Windows.Forms.ToolStripButton buttonthingsfilter;
+		private System.Windows.Forms.ToolStripSeparator seperatorviews;
+		private System.Windows.Forms.ToolStripStatusLabel gridlabel;
+		private System.Windows.Forms.ToolStripDropDownButton buttongrid;
+		private System.Windows.Forms.ToolStripMenuItem itemgrid1024;
+		private System.Windows.Forms.ToolStripMenuItem itemgrid256;
+		private System.Windows.Forms.ToolStripMenuItem itemgrid128;
+		private System.Windows.Forms.ToolStripMenuItem itemgrid64;
+		private System.Windows.Forms.ToolStripMenuItem itemgrid32;
+		private System.Windows.Forms.ToolStripMenuItem itemgrid16;
+		private System.Windows.Forms.ToolStripMenuItem itemgrid4;
+		private System.Windows.Forms.ToolStripMenuItem itemgrid8;
+		private System.Windows.Forms.ToolStripMenuItem itemgridcustom;
+		private System.Windows.Forms.ToolStripMenuItem itemgrid512;
+		private System.Windows.Forms.ToolStripStatusLabel poscommalabel;
+		private System.Windows.Forms.ToolStripMenuItem itemundo;
+		private System.Windows.Forms.ToolStripMenuItem itemredo;
+		private System.Windows.Forms.ToolStripButton buttonundo;
+		private System.Windows.Forms.ToolStripButton buttonredo;
+		private System.Windows.Forms.ToolStripButton buttonsnaptogrid;
+		private System.Windows.Forms.ToolStripMenuItem itemsnaptogrid;
+		private System.Windows.Forms.ToolStripButton buttonautomerge;
+		private System.Windows.Forms.ToolStripMenuItem itemautomerge;
+		private System.Windows.Forms.Timer processor;
+		private System.Windows.Forms.ToolStripSeparator separatorgzmodes;
+		private System.Windows.Forms.ToolStripSeparator seperatorfilesave;
+		private System.Windows.Forms.ToolStripSeparator seperatortesting;
+		private System.Windows.Forms.ToolStripSeparator seperatoreditgeometry;
+		private System.Windows.Forms.ToolStripMenuItem itemgridinc;
+		private System.Windows.Forms.ToolStripMenuItem itemgriddec;
+		private System.Windows.Forms.ToolStripMenuItem itemgridsetup;
+		private System.Windows.Forms.Timer statusflasher;
+		private System.Windows.Forms.ToolStripSplitButton buttontest;
+		private System.Windows.Forms.ToolStripButton buttoncut;
+		private System.Windows.Forms.ToolStripButton buttoncopy;
+		private System.Windows.Forms.ToolStripButton buttonpaste;
+		private System.Windows.Forms.ToolStripSeparator seperatoreditundo;
+		private System.Windows.Forms.ToolStripMenuItem itemcut;
+		private System.Windows.Forms.ToolStripMenuItem itemcopy;
+		private System.Windows.Forms.ToolStripMenuItem itempaste;
+		private System.Windows.Forms.ToolStripStatusLabel configlabel;
+		private System.Windows.Forms.ToolStripMenuItem menumode;
+		private System.Windows.Forms.ToolStripButton buttonviewnormal;
+		private System.Windows.Forms.ToolStripButton buttonviewbrightness;
+		private System.Windows.Forms.ToolStripButton buttonviewfloors;
+		private System.Windows.Forms.ToolStripButton buttonviewceilings;
+		private System.Windows.Forms.ToolStripSeparator seperatortoolsresources;
+		private System.Windows.Forms.ToolStripButton buttonscripteditor;
+		private System.Windows.Forms.ToolStripMenuItem menuview;
+		private System.Windows.Forms.ToolStripMenuItem itemthingsfilter;
+		private System.Windows.Forms.ToolStripSeparator seperatorviewthings;
+		private System.Windows.Forms.ToolStripMenuItem itemviewnormal;
+		private System.Windows.Forms.ToolStripMenuItem itemviewbrightness;
+		private System.Windows.Forms.ToolStripMenuItem itemviewfloors;
+		private System.Windows.Forms.ToolStripMenuItem itemviewceilings;
+		private System.Windows.Forms.ToolStripSeparator seperatorviewzoom;
+		private System.Windows.Forms.ToolStripMenuItem itemscripteditor;
+		private System.Windows.Forms.ToolStripSeparator seperatortoolsconfig;
+		private System.Windows.Forms.ToolStripMenuItem itemtestmap;
+		private System.Windows.Forms.ToolStripMenuItem menuprefabs;
+		private System.Windows.Forms.ToolStripMenuItem itemcreateprefab;
+		private System.Windows.Forms.ToolStripSeparator seperatorprefabsinsert;
+		private System.Windows.Forms.ToolStripMenuItem iteminsertprefabfile;
+		private System.Windows.Forms.ToolStripMenuItem iteminsertpreviousprefab;
+		private System.Windows.Forms.ToolStripButton buttoninsertprefabfile;
+		private System.Windows.Forms.ToolStripButton buttoninsertpreviousprefab;
+		private System.Windows.Forms.Button buttontoggleinfo;
+		private System.Windows.Forms.Label labelcollapsedinfo;
+		private System.Windows.Forms.Timer statusresetter;
+		private System.Windows.Forms.ToolStripMenuItem itemshowerrors;
+		private System.Windows.Forms.ToolStripSeparator seperatorviewviews;
+		private System.Windows.Forms.ToolStripMenuItem menuzoom;
+		private System.Windows.Forms.ToolStripMenuItem item2zoom5;
+		private System.Windows.Forms.ToolStripMenuItem item2zoom10;
+		private System.Windows.Forms.ToolStripMenuItem itemfittoscreen;
+		private System.Windows.Forms.ToolStripMenuItem item2zoom200;
+		private System.Windows.Forms.ToolStripMenuItem item2zoom100;
+		private System.Windows.Forms.ToolStripMenuItem item2zoom50;
+		private System.Windows.Forms.ToolStripMenuItem item2zoom25;
+		private System.Windows.Forms.ToolStripMenuItem itemhelprefmanual;
+		private System.Windows.Forms.ToolStripSeparator seperatorhelpmanual;
+		private System.Windows.Forms.ToolStripMenuItem itemhelpeditmode;
+		private System.Windows.Forms.ToolStripMenuItem itemtoggleinfo;
+		private System.Windows.Forms.ToolStripMenuItem itempastespecial;
+		private System.Windows.Forms.Panel heightpanel1;
+		private System.Windows.Forms.Panel dockersspace;
+		private CodeImp.DoomBuilder.Controls.DockersControl dockerspanel;
+		private System.Windows.Forms.Timer dockerscollapser;
+		private System.Windows.Forms.ToolStripSeparator seperatorfile;
+		private System.Windows.Forms.ToolStripSeparator seperatorscript;
+		private System.Windows.Forms.ToolStripSeparator seperatorprefabs;
+		private System.Windows.Forms.ToolStripSeparator seperatorundo;
+		private System.Windows.Forms.ToolStripSeparator seperatorcopypaste;
+		private System.Windows.Forms.ToolStripSeparator seperatorfileopen;
+		private System.Windows.Forms.ToolStripSeparator seperatorfilerecent;
+		private System.Windows.Forms.ToolStripSeparator seperatoreditgrid;
+		private System.Windows.Forms.ToolStripSeparator seperatoreditcopypaste;
+		private System.Windows.Forms.ToolStripSeparator seperatorgeometry;
+		private System.Windows.Forms.ToolStripButton buttontogglefx;
+		private System.Windows.Forms.ToolStripButton buttontogglefog;
+		private System.Windows.Forms.ToolStripStatusLabel warnsLabel;
+		private System.Windows.Forms.ToolStripMenuItem itemReloadModedef;
+		private System.Windows.Forms.ToolStripMenuItem itemReloadGldefs;
+		private System.Windows.Forms.ToolStripSeparator separatorDrawModes;
+		private System.Windows.Forms.ToolStripButton buttontoggleeventlines;
+		private System.Windows.Forms.ToolStripButton buttontogglevisualvertices;
+		private System.Windows.Forms.ToolStripMenuItem itemviewusedtags;
+		private System.Windows.Forms.ToolStripSeparator toolStripSeparator5;
+		private System.Windows.Forms.ToolStripMenuItem addToGroup;
+		private System.Windows.Forms.ToolStripMenuItem selectGroup;
+		private System.Windows.Forms.ToolStripMenuItem clearGroup;
+		private System.Windows.Forms.ContextMenuStrip toolbarContextMenu;
+		private System.Windows.Forms.ToolStripMenuItem toggleFile;
+		private System.Windows.Forms.ToolStripMenuItem toggleScript;
+		private System.Windows.Forms.ToolStripMenuItem toggleUndo;
+		private System.Windows.Forms.ToolStripMenuItem toggleCopy;
+		private System.Windows.Forms.ToolStripMenuItem togglePrefabs;
+		private System.Windows.Forms.ToolStripMenuItem toggleFilter;
+		private System.Windows.Forms.ToolStripMenuItem toggleViewModes;
+		private System.Windows.Forms.ToolStripMenuItem toggleGeometry;
+		private System.Windows.Forms.ToolStripMenuItem toggleTesting;
+		private System.Windows.Forms.ToolStripMenuItem toggleRendering;
+		private System.Windows.Forms.ToolStripSeparator separatortoolsscreenshots;
+		private System.Windows.Forms.ToolStripMenuItem itemsavescreenshot;
+		private System.Windows.Forms.ToolStripMenuItem itemsaveeditareascreenshot;
+		private System.Windows.Forms.ToolStripMenuItem itemShortcutReference;
+		private System.Windows.Forms.ToolStripMenuItem itemopenconfigfolder;
+		private System.Windows.Forms.ToolStripMenuItem itemopenmapincurwad;
+		private System.Windows.Forms.ToolStripMenuItem itemgrid1;
+		private System.Windows.Forms.ToolStripMenuItem itemzoom400;
+		private System.Windows.Forms.Label modename;
+		private System.Windows.Forms.ToolStripMenuItem itemautoclearsidetextures;
+		private System.Windows.Forms.ToolStripButton buttonautoclearsidetextures;
+		private System.Windows.Forms.ToolStripMenuItem itemgotocoords;
+		private System.Windows.Forms.ToolStripSeparator separatorTransformModes;
+		private System.Windows.Forms.ToolStripMenuItem itemdosnaptogrid;
+		private System.Windows.Forms.ToolStrip modestoolbar;
+		private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel;
+		private System.Windows.Forms.ToolStrip modecontrolsloolbar;
+		private System.Windows.Forms.ToolStripMenuItem itemfullbrightness;
+		private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
+		private System.Windows.Forms.ToolStripButton buttonfullbrightness;
+		private System.Windows.Forms.ToolStripSeparator separatorfullbrightness;
+		private System.Windows.Forms.ToolStripSeparator separatorfilters;
+		private ToolStripMenuItem itemimport;
+		private ToolStripMenuItem itemexport;
+		private ToolStripSeparator separatorio;
+		private ToolStripMenuItem itemviewthingtypes;
+		private StatisticsControl statistics;
+		private ToolStripSplitButton dynamiclightmode;
+		private ToolStripMenuItem sightsdontshow;
+		private ToolStripMenuItem lightsshow;
+		private ToolStripMenuItem lightsshowanimated;
+		private ToolStripSplitButton modelrendermode;
+		private ToolStripMenuItem modelsdontshow;
+		private ToolStripMenuItem modelsshowselection;
+		private ToolStripMenuItem modelsshowfiltered;
+		private ToolStripMenuItem modelsshowall;
+		private DebugConsole console;
+		private ToolStripMenuItem item2zoom400;
+		private ToolStripMenuItem item2zoom800;
+		private ToolStripMenuItem itemzoom800;
+		private ToolStripButton buttontogglecomments;
+		private ToolStripMenuItem itemlinedefcolors;
+		private ToolStripSeparator separatorlinecolors;
+		private ToolStripButton buttonlinededfcolors;
+		private ToolStripDropDownButton linedefcolorpresets;
+		private ToolStripDropDownButton thingfilters;
+		private ToolStripMenuItem itemtogglegrid;
+		private ToolStripButton buttontogglegrid;
+		private ToolStripButton buttontoggledynamicgrid;
+		private ToolStripMenuItem itemdynamicgridsize;
+		private ToolStripMenuItem itemtogglecomments;
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/MainForm.cs b/Source/Core/Windows/MainForm.cs
new file mode 100644
index 0000000..5ea783c
--- /dev/null
+++ b/Source/Core/Windows/MainForm.cs
@@ -0,0 +1,4149 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.Globalization;
+using System.IO;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Windows.Forms;
+
+using CodeImp.DoomBuilder.Actions;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Controls;
+using CodeImp.DoomBuilder.Data;
+using CodeImp.DoomBuilder.Editing;
+using CodeImp.DoomBuilder.GZBuilder.Data;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.GZBuilder.Windows;
+using CodeImp.DoomBuilder.IO;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Plugins;
+using CodeImp.DoomBuilder.Properties;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.VisualModes;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Windows
+{
+	public partial class MainForm : DelayedForm, IMainForm
+	{
+		#region ================== Constants
+		
+		// Recent files
+		private const int MAX_RECENT_FILES_PIXELS = 250;
+		
+		// Status bar
+		internal const int WARNING_FLASH_COUNT = 10;
+		internal const int WARNING_FLASH_INTERVAL = 100;
+		internal const int WARNING_RESET_DELAY = 5000;
+		internal const int INFO_RESET_DELAY = 5000;
+		internal const int ACTION_FLASH_COUNT = 3;
+		internal const int ACTION_FLASH_INTERVAL = 50;
+		internal const int ACTION_RESET_DELAY = 5000;
+		
+		internal readonly Image[,] STATUS_IMAGES = new Image[,]
+		{
+			// Normal versions
+			{
+			  Resources.Status0, Resources.Status1,
+			  Resources.Status2, Resources.Warning
+			},
+			
+			// Flashing versions
+			{
+			  Resources.Status10, Resources.Status11,
+			  Resources.Status12, Resources.WarningOff
+			}
+		};
+		
+		// Message pump
+		public enum ThreadMessages
+		{
+			// Sent by the background threat to update the status
+			UpdateStatus = General.WM_USER + 1,
+			
+			// This is sent by the background thread when images are loaded
+			// but only when first loaded or when dimensions were changed
+			ImageDataLoaded = General.WM_USER + 2,
+			
+			//mxd. This is sent by the background thread when sprites are loaded
+			SpriteDataLoaded = General.WM_USER + 3,
+		}
+		
+		#endregion
+
+		#region ================== Delegates
+
+		//private delegate void CallUpdateStatusIcon();
+		//private delegate void CallImageDataLoaded(ImageData img);
+		private delegate void CallBlink(); //mxd
+
+		#endregion
+
+		#region ================== mxd. Events
+
+		public event EventHandler OnEditFormValuesChanged; //mxd
+
+		#endregion
+
+		#region ================== Variables
+
+		// Position/size
+		private Point lastposition;
+		private Size lastsize;
+		private bool displayresized = true;
+		private bool windowactive;
+		
+		// Mouse in display
+		private bool mouseinside;
+		
+		// Input
+		private bool shift, ctrl, alt;
+		private MouseButtons mousebuttons;
+		private MouseInput mouseinput;
+		private Rectangle originalclip;
+		private bool mouseexclusive;
+		private int mouseexclusivebreaklevel;
+		
+		// Last info on panels
+		private object lastinfoobject;
+		
+		// Recent files
+		private ToolStripMenuItem[] recentitems;
+		
+		// View modes
+		private ToolStripButton[] viewmodesbuttons;
+		private ToolStripMenuItem[] viewmodesitems;
+		
+		// Edit modes
+		private List<ToolStripItem> editmodeitems;
+		
+		// Toolbar
+		private List<PluginToolbarButton> pluginbuttons;
+		private EventHandler buttonvisiblechangedhandler;
+		private bool preventupdateseperators;
+		private bool updatingfilters;
+		private bool toolbarContextMenuShiftPressed; //mxd
+		
+		// Statusbar
+		private StatusInfo status;
+		private int statusflashcount;
+		private bool statusflashicon;
+		
+		// Properties
+		private IntPtr windowptr;
+		
+		// Processing
+		private int processingcount;
+		private float lastupdatetime;
+
+		// Updating
+		private int lockupdatecount;
+		private bool mapchanged; //mxd
+
+		//mxd. Hints
+		private Docker hintsDocker;
+		private HintsPanel hintsPanel;
+
+		//mxd
+		private System.Timers.Timer blinkTimer; 
+		private bool editformopen;
+		
+		#endregion
+
+		#region ================== Properties
+
+		public bool ShiftState { get { return shift; } }
+		public bool CtrlState { get { return ctrl; } }
+		public bool AltState { get { return alt; } }
+		new public MouseButtons MouseButtons { get { return mousebuttons; } }
+		public bool MouseInDisplay { get { return mouseinside; } }
+		public RenderTargetControl Display { get { return display; } }
+		public bool SnapToGrid { get { return buttonsnaptogrid.Checked; } }
+		public bool AutoMerge { get { return buttonautomerge.Checked; } }
+		public bool MouseExclusive { get { return mouseexclusive; } }
+		new public IntPtr Handle { get { return windowptr; } }
+		public bool IsInfoPanelExpanded { get { return (panelinfo.Height == heightpanel1.Height); } }
+		public string ActiveDockerTabName { get { return dockerspanel.IsCollpased ? "None" : dockerspanel.SelectedTabName; } }
+		public bool IsActiveWindow { get { return windowactive; } }
+		public StatusInfo Status { get { return status; } }
+		public static Size ScaledIconSize = new Size(16, 16); //mxd
+		public static SizeF DPIScaler = new SizeF(1.0f, 1.0f); //mxd
+		
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		internal MainForm()
+		{
+			//mxd. Set DPI-aware icon size
+			using(Graphics g = this.CreateGraphics()) 
+			{
+				DPIScaler = new SizeF(g.DpiX / 96, g.DpiY / 96);
+
+				if(DPIScaler.Width != 1.0f || DPIScaler.Height != 1.0f)
+				{
+					ScaledIconSize.Width = (int)Math.Round(ScaledIconSize.Width * DPIScaler.Width);
+					ScaledIconSize.Height = (int)Math.Round(ScaledIconSize.Height * DPIScaler.Height);
+				}
+			}
+			
+			// Setup controls
+			InitializeComponent();
+
+			//mxd. Resize status labels
+			if(DPIScaler.Width != 1.0f)
+			{
+				gridlabel.Width = (int)Math.Round(gridlabel.Width * DPIScaler.Width);
+				zoomlabel.Width = (int)Math.Round(zoomlabel.Width * DPIScaler.Width);
+				xposlabel.Width = (int)Math.Round(xposlabel.Width * DPIScaler.Width);
+				yposlabel.Width = (int)Math.Round(yposlabel.Width * DPIScaler.Width);
+				warnsLabel.Width = (int)Math.Round(warnsLabel.Width * DPIScaler.Width);
+			}
+
+			pluginbuttons = new List<PluginToolbarButton>();
+			editmodeitems = new List<ToolStripItem>();
+			labelcollapsedinfo.Text = "";
+			display.Dock = DockStyle.Fill;
+			
+			// Fetch pointer
+			windowptr = base.Handle;
+			
+			// Make array for view modes
+			viewmodesbuttons = new ToolStripButton[Renderer2D.NUM_VIEW_MODES];
+			viewmodesbuttons[(int)ViewMode.Normal] = buttonviewnormal;
+			viewmodesbuttons[(int)ViewMode.Brightness] = buttonviewbrightness;
+			viewmodesbuttons[(int)ViewMode.FloorTextures] = buttonviewfloors;
+			viewmodesbuttons[(int)ViewMode.CeilingTextures] = buttonviewceilings;
+			viewmodesitems = new ToolStripMenuItem[Renderer2D.NUM_VIEW_MODES];
+			viewmodesitems[(int)ViewMode.Normal] = itemviewnormal;
+			viewmodesitems[(int)ViewMode.Brightness] = itemviewbrightness;
+			viewmodesitems[(int)ViewMode.FloorTextures] = itemviewfloors;
+			viewmodesitems[(int)ViewMode.CeilingTextures] = itemviewceilings;
+			
+			// Visual Studio IDE doesn't let me set these in the designer :(
+			buttonzoom.Font = menufile.Font;
+			buttonzoom.DropDownDirection = ToolStripDropDownDirection.AboveLeft;
+			buttongrid.Font = menufile.Font;
+			buttongrid.DropDownDirection = ToolStripDropDownDirection.AboveLeft;
+
+			// Event handlers
+			buttonvisiblechangedhandler = ToolbarButtonVisibleChanged;
+			//mxd
+			display.OnKeyReleased += display_OnKeyReleased;
+			toolbarContextMenu.KeyDown += toolbarContextMenu_KeyDown;
+			toolbarContextMenu.KeyUp += toolbarContextMenu_KeyUp;
+			linedefcolorpresets.DropDown.MouseLeave += linedefcolorpresets_MouseLeave;
+			
+			// Apply shortcut keys
+			ApplyShortcutKeys();
+			
+			// Make recent items list
+			CreateRecentFiles();
+			
+			// Show splash
+			ShowSplashDisplay();
+			
+			// Keep last position and size
+			lastposition = this.Location;
+			lastsize = this.Size;
+
+			//mxd
+			blinkTimer = new System.Timers.Timer {Interval = 500};
+			blinkTimer.Elapsed += blinkTimer_Elapsed;
+
+			//mxd. Debug Console
+#if DEBUG
+			modename.Visible = false;
+#else
+			console.Visible = false;
+#endif
+
+			//mxd. Hints
+			hintsPanel = new HintsPanel();
+			hintsDocker = new Docker("hints", "Help", hintsPanel);
+		}
+		
+		#endregion
+		
+		#region ================== General
+
+		// Editing mode changed!
+		internal void EditModeChanged()
+		{
+			// Check appropriate button on interface
+			// And show the mode name
+			if(General.Editing.Mode != null)
+			{
+				General.MainWindow.CheckEditModeButton(General.Editing.Mode.EditModeButtonName);
+				General.MainWindow.DisplayModeName(General.Editing.Mode.Attributes.DisplayName);
+			}
+			else
+			{
+				General.MainWindow.CheckEditModeButton("");
+				General.MainWindow.DisplayModeName("");
+			}
+
+			// View mode only matters in classic editing modes
+			for(int i = 0; i < Renderer2D.NUM_VIEW_MODES; i++)
+			{
+				viewmodesitems[i].Enabled = (General.Editing.Mode is ClassicMode);
+				viewmodesbuttons[i].Enabled = (General.Editing.Mode is ClassicMode);
+			}
+
+			UpdateEditMenu();
+			UpdatePrefabsMenu();
+		}
+
+		// This makes a beep sound
+		public void MessageBeep(MessageBeepType type)
+		{
+			General.MessageBeep(type);
+		}
+
+		// This sets up the interface
+		internal void SetupInterface()
+		{
+			// Setup docker
+			if(General.Settings.DockersPosition != 2 && General.Map != null)
+			{
+				LockUpdate();
+				dockerspanel.Visible = true;
+				dockersspace.Visible = true;
+
+				// We can't place the docker easily when collapsed
+				dockerspanel.Expand();
+
+				// Setup docker width
+				if(General.Settings.DockersWidth < dockerspanel.GetCollapsedWidth())
+					General.Settings.DockersWidth = dockerspanel.GetCollapsedWidth();
+
+				// Determine fixed space required
+				if(General.Settings.CollapseDockers)
+					dockersspace.Width = dockerspanel.GetCollapsedWidth();
+				else
+					dockersspace.Width = General.Settings.DockersWidth;
+
+				// Setup docker
+				int targetindex = this.Controls.IndexOf(display) + 1; //mxd
+				if(General.Settings.DockersPosition == 0)
+				{
+					modestoolbar.Dock = DockStyle.Right; //mxd
+					dockersspace.Dock = DockStyle.Left;
+					AdjustDockersSpace(targetindex); //mxd
+					dockerspanel.Setup(false);
+					dockerspanel.Location = dockersspace.Location;
+					dockerspanel.Anchor = AnchorStyles.Left | AnchorStyles.Top | AnchorStyles.Bottom;
+				}
+				else
+				{
+					modestoolbar.Dock = DockStyle.Left; //mxd
+					dockersspace.Dock = DockStyle.Right;
+					AdjustDockersSpace(targetindex); //mxd
+					dockerspanel.Setup(true);
+					dockerspanel.Location = new Point(dockersspace.Right - General.Settings.DockersWidth, dockersspace.Top);
+					dockerspanel.Anchor = AnchorStyles.Right | AnchorStyles.Top | AnchorStyles.Bottom;
+				}
+
+				dockerspanel.Width = General.Settings.DockersWidth;
+				dockerspanel.Height = dockersspace.Height;
+				dockerspanel.BringToFront();
+
+				if(General.Settings.CollapseDockers) dockerspanel.Collapse();
+
+				UnlockUpdate();
+			}
+			else
+			{
+				dockerspanel.Visible = false;
+				dockersspace.Visible = false;
+				modestoolbar.Dock = DockStyle.Left; //mxd
+			}
+		}
+
+		//mxd. dockersspace display index gets messed up while re-docking. This fixes it...
+		private void AdjustDockersSpace(int targetindex)
+		{
+			while(this.Controls.IndexOf(dockersspace) != targetindex)
+			{
+				this.Controls.SetChildIndex(dockersspace, targetindex);
+			}
+		}
+		
+		// This updates all menus for the current status
+		internal void UpdateInterface()
+		{
+			//mxd. Update title
+			UpdateTitle();
+
+			// Update the status bar
+			UpdateStatusbar();
+			
+			// Update menus and toolbar icons
+			UpdateFileMenu();
+			UpdateEditMenu();
+			UpdateViewMenu();
+			UpdateModeMenu();
+			UpdatePrefabsMenu();
+			UpdateToolsMenu();
+			UpdateToolbar();
+			UpdateSkills();
+			UpdateHelpMenu();
+		}
+
+		//mxd
+		private void UpdateTitle()
+		{
+			// Map opened?
+			if(General.Map != null)
+			{
+				// Show map name and filename in caption
+				this.Text = (mapchanged ? "\u25CF " : "") + General.Map.FileTitle + " (" + General.Map.Options.CurrentName + ") - " + Application.ProductName;
+			}
+			else
+			{
+				// Show normal caption
+#if DEBUG
+				this.Text = Application.ProductName + " - DEVBUILD";
+#else
+				this.Text = Application.ProductName + " R" + General.ThisAssembly.GetName().Version.Revision;
+#endif
+			}
+		}
+		
+		// Generic event that invokes the tagged action
+		public void InvokeTaggedAction(object sender, EventArgs e)
+		{
+			this.Update();
+			
+			if(sender is ToolStripItem)
+				General.Actions.InvokeAction((sender as ToolStripItem).Tag.ToString());
+			else if(sender is Control)
+				General.Actions.InvokeAction((sender as Control).Tag.ToString());
+			else
+				General.Fail("InvokeTaggedAction used on an unexpected control.");
+			
+			this.Update();
+		}
+		
+		#endregion
+		
+		#region ================== Window
+		
+		// This locks the window for updating
+		internal void LockUpdate()
+		{
+			lockupdatecount++;
+			if(lockupdatecount == 1) General.LockWindowUpdate(this.Handle);
+		}
+
+		// This unlocks for updating
+		internal void UnlockUpdate()
+		{
+			lockupdatecount--;
+			if(lockupdatecount == 0) General.LockWindowUpdate(IntPtr.Zero);
+			if(lockupdatecount < 0) lockupdatecount = 0;
+		}
+
+		// This unlocks for updating
+		/*internal void ForceUnlockUpdate()
+		{
+			if(lockupdatecount > 0) General.LockWindowUpdate(IntPtr.Zero);
+			lockupdatecount = 0;
+		}*/
+
+		//mxd
+		internal void UpdateMapChangedStatus()
+		{
+			if(General.Map == null || General.Map.IsChanged == mapchanged) return;
+			mapchanged = General.Map.IsChanged;
+			UpdateTitle();
+		}
+		
+		// This sets the focus on the display for correct key input
+		public bool FocusDisplay()
+		{
+			return display.Focus();
+		}
+
+		// Window is first shown
+		private void MainForm_Shown(object sender, EventArgs e)
+		{
+			// Perform auto mapo loading action when the window is not delayed
+			if(!General.DelayMainWindow) PerformAutoMapLoading();
+		}
+
+		// Auto map loading that must be done when the window is first shown after loading
+		// but also before the window is shown when the -delaywindow parameter is given
+		internal void PerformAutoMapLoading()
+		{
+			// Check if the command line arguments tell us to load something
+			if(General.AutoLoadFile != null)
+			{
+				bool showdialog = false;
+				MapOptions options = new MapOptions();
+				
+				// Any of the options already given?
+				if(General.AutoLoadMap != null)
+				{
+					Configuration mapsettings;
+					
+					// Try to find existing options in the settings file
+					string dbsfile = General.AutoLoadFile.Substring(0, General.AutoLoadFile.Length - 4) + ".dbs";
+					if(File.Exists(dbsfile))
+						try { mapsettings = new Configuration(dbsfile, true); }
+						catch(Exception) { mapsettings = new Configuration(true); }
+					else
+						mapsettings = new Configuration(true);
+
+					//mxd. Get proper configuration file
+					bool longtexturenamessupported = false;
+					string configfile = General.AutoLoadConfig;
+					if(string.IsNullOrEmpty(configfile)) configfile = mapsettings.ReadSetting("gameconfig", "");
+					if(configfile.Trim().Length == 0)
+					{
+						showdialog = true;
+					}
+					else
+					{
+						//TODO: test this!
+						Configuration gamecfg = new Configuration(configfile);
+						longtexturenamessupported = gamecfg.ReadSetting("longtexturenames", false);
+					}
+
+					// Set map name and other options
+					options = new MapOptions(mapsettings, General.AutoLoadMap, longtexturenamessupported);
+
+					// Set resource data locations
+					options.CopyResources(General.AutoLoadResources);
+
+					// Set strict patches
+					options.StrictPatches = General.AutoLoadStrictPatches;
+					
+					// Set configuration file (constructor already does this, but we want this info from the cmd args if possible)
+					options.ConfigFile = configfile;
+				}
+				else
+				{
+					// No options given
+					showdialog = true;
+				}
+
+				// Show open map dialog?
+				if(showdialog)
+				{
+					// Show open dialog
+					General.OpenMapFile(General.AutoLoadFile, null);
+				}
+				else
+				{
+					// Open with options
+					General.OpenMapFileWithOptions(General.AutoLoadFile, options);
+				}
+			}
+		}
+
+		// Window is loaded
+		private void MainForm_Load(object sender, EventArgs e)
+		{
+			// Position window from configuration settings
+			this.SuspendLayout();
+			this.Size = new Size(General.Settings.ReadSetting("mainwindow.sizewidth", this.Size.Width),
+								 General.Settings.ReadSetting("mainwindow.sizeheight", this.Size.Height));
+			this.Location = new Point(General.Clamp(General.Settings.ReadSetting("mainwindow.positionx", this.Location.X), 
+													SystemInformation.VirtualScreen.Left - this.Size.Width + 128,
+													SystemInformation.VirtualScreen.Right - 128),
+									  General.Clamp(General.Settings.ReadSetting("mainwindow.positiony", this.Location.Y),
+													SystemInformation.VirtualScreen.Top,
+													SystemInformation.VirtualScreen.Bottom - 128));
+			this.WindowState = (FormWindowState)General.Settings.ReadSetting("mainwindow.windowstate", (int)FormWindowState.Maximized);
+			this.ResumeLayout(true);
+			
+			// Normal windowstate?
+			if(this.WindowState == FormWindowState.Normal)
+			{
+				// Keep last position and size
+				lastposition = this.Location;
+				lastsize = this.Size;
+			}
+
+			//mxd. Enable drag and drop
+			this.AllowDrop = true;
+			this.DragEnter += OnDragEnter;
+			this.DragDrop += OnDragDrop;
+
+			// Info panel state?
+			bool expandedpanel = General.Settings.ReadSetting("mainwindow.expandedinfopanel", true);
+			if(expandedpanel != IsInfoPanelExpanded) ToggleInfoPanel();
+		}
+
+		// Window receives focus
+		private void MainForm_Activated(object sender, EventArgs e)
+		{
+			windowactive = true;
+
+			//UpdateInterface();
+			ResumeExclusiveMouseInput();
+			ReleaseAllKeys();
+			FocusDisplay();
+		}
+		
+		// Window loses focus
+		private void MainForm_Deactivate(object sender, EventArgs e)
+		{
+			windowactive = false;
+			
+			BreakExclusiveMouseInput();
+			ReleaseAllKeys();
+		}
+		
+		// Window is moved
+		private void MainForm_Move(object sender, EventArgs e)
+		{
+			// Normal windowstate?
+			if(this.WindowState == FormWindowState.Normal)
+			{
+				// Keep last position and size
+				lastposition = this.Location;
+				lastsize = this.Size;
+			}
+		}
+
+		// Window resizes
+		private void MainForm_Resize(object sender, EventArgs e)
+		{
+			// Resizing
+			//this.SuspendLayout();
+			//resized = true;
+		}
+
+		// Window was resized
+		private void MainForm_ResizeEnd(object sender, EventArgs e)
+		{
+			// Normal windowstate?
+			if(this.WindowState == FormWindowState.Normal)
+			{
+				// Keep last position and size
+				lastposition = this.Location;
+				lastsize = this.Size;
+			}
+		}
+
+		// Window is being closed
+		protected override void OnFormClosing(FormClosingEventArgs e) 
+		{
+			base.OnFormClosing(e);
+			if(e.CloseReason == CloseReason.ApplicationExitCall) return;
+
+			// Close the map
+			if(General.CloseMap()) 
+			{
+				General.WriteLogLine("Closing main interface window...");
+
+				// Stop timers
+				statusflasher.Stop();
+				statusresetter.Stop();
+				blinkTimer.Stop(); //mxd
+
+				// Stop exclusive mode, if any is active
+				StopExclusiveMouseInput();
+				StopProcessing();
+
+				// Unbind methods
+				General.Actions.UnbindMethods(this);
+
+				// Determine window state to save
+				int windowstate;
+				if(this.WindowState != FormWindowState.Minimized)
+					windowstate = (int)this.WindowState;
+				else
+					windowstate = (int)FormWindowState.Normal;
+
+				// Save window settings
+				General.Settings.WriteSetting("mainwindow.positionx", lastposition.X);
+				General.Settings.WriteSetting("mainwindow.positiony", lastposition.Y);
+				General.Settings.WriteSetting("mainwindow.sizewidth", lastsize.Width);
+				General.Settings.WriteSetting("mainwindow.sizeheight", lastsize.Height);
+				General.Settings.WriteSetting("mainwindow.windowstate", windowstate);
+				General.Settings.WriteSetting("mainwindow.expandedinfopanel", IsInfoPanelExpanded);
+
+				// Save recent files
+				SaveRecentFiles();
+
+				// Terminate the program
+				General.Terminate(true);
+			} 
+			else 
+			{
+				// Cancel the close
+				e.Cancel = true;
+			}
+		}
+
+		//mxd
+		private void OnDragEnter(object sender, DragEventArgs e) 
+		{
+			if(e.Data.GetDataPresent(DataFormats.FileDrop))
+			{
+				e.Effect = DragDropEffects.Copy;
+			} 
+			else 
+			{
+				e.Effect = DragDropEffects.None;
+			}
+		}
+
+		//mxd
+		private void OnDragDrop(object sender, DragEventArgs e) 
+		{
+			if(e.Data.GetDataPresent(DataFormats.FileDrop)) 
+			{
+				string[] filePaths = (string[])e.Data.GetData(DataFormats.FileDrop);
+				if(filePaths.Length != 1) 
+				{
+					General.Interface.DisplayStatus(StatusType.Warning, "Cannot open multiple files at once!");
+					return;
+				}
+
+				if(!File.Exists(filePaths[0])) 
+				{
+					General.Interface.DisplayStatus(StatusType.Warning, "Cannot open '" + filePaths[0] + "': file does not exist!");
+					return;
+				}
+
+				string ext = Path.GetExtension(filePaths[0]);
+				if(string.IsNullOrEmpty(ext) || ext.ToLower() != ".wad") 
+				{
+					General.Interface.DisplayStatus(StatusType.Warning, "Cannot open '" + filePaths[0] + "': only WAD files can be loaded this way!");
+					return;
+				}
+
+				this.Update(); // Update main window
+				General.OpenMapFile(filePaths[0], null);
+				UpdateGZDoomPanel();
+			}
+		}
+
+		#endregion
+		
+		#region ================== Statusbar
+		
+		// This updates the status bar
+		private void UpdateStatusbar()
+		{
+			// Map open?
+			if(General.Map != null)
+			{
+				// Enable items
+				xposlabel.Enabled = true;
+				yposlabel.Enabled = true;
+				poscommalabel.Enabled = true;
+				zoomlabel.Enabled = true;
+				buttonzoom.Enabled = true;
+				gridlabel.Enabled = true;
+				buttongrid.Enabled = true;
+				configlabel.Text = General.Map.Config.Name;
+			}
+			else
+			{
+				// Disable items
+				xposlabel.Text = "--";
+				yposlabel.Text = "--";
+				xposlabel.Enabled = false;
+				yposlabel.Enabled = false;
+				poscommalabel.Enabled = false;
+				zoomlabel.Enabled = false;
+				buttonzoom.Enabled = false;
+				gridlabel.Enabled = false;
+				buttongrid.Enabled = false;
+				configlabel.Text = "";
+			}
+			
+			UpdateStatusIcon();
+		}
+		
+		// This flashes the status icon
+		private void statusflasher_Tick(object sender, EventArgs e)
+		{
+			statusflashicon = !statusflashicon;
+			UpdateStatusIcon();
+			statusflashcount--;
+			if(statusflashcount == 0) statusflasher.Stop();
+		}
+		
+		// This resets the status to ready
+		private void statusresetter_Tick(object sender, EventArgs e)
+		{
+			DisplayReady();
+		}
+		
+		// This changes status text
+		public void DisplayStatus(StatusType type, string message) { DisplayStatus(new StatusInfo(type, message)); }
+		public void DisplayStatus(StatusInfo newstatus)
+		{
+			// Stop timers
+			if(!newstatus.displayed)
+			{
+				statusresetter.Stop();
+				statusflasher.Stop();
+				statusflashicon = false;
+			}
+			
+			// Determine what to do specifically for this status type
+			switch(newstatus.type)
+			{
+				// Shows information without flashing the icon.
+				case StatusType.Ready: //mxd
+				case StatusType.Selection: //mxd
+				case StatusType.Info:
+					if(!newstatus.displayed)
+					{
+						statusresetter.Interval = INFO_RESET_DELAY;
+						statusresetter.Start();
+					}
+					break;
+					
+				// Shows action information and flashes up the status icon once.	
+				case StatusType.Action:
+					if(!newstatus.displayed)
+					{
+						statusflashicon = true;
+						statusflasher.Interval = ACTION_FLASH_INTERVAL;
+						statusflashcount = ACTION_FLASH_COUNT;
+						statusflasher.Start();
+						statusresetter.Interval = ACTION_RESET_DELAY;
+						statusresetter.Start();
+					}
+					break;
+					
+				// Shows a warning, makes a warning sound and flashes a warning icon.
+				case StatusType.Warning:
+					if(!newstatus.displayed)
+					{
+						MessageBeep(MessageBeepType.Warning);
+						statusflasher.Interval = WARNING_FLASH_INTERVAL;
+						statusflashcount = WARNING_FLASH_COUNT;
+						statusflasher.Start();
+						statusresetter.Interval = WARNING_RESET_DELAY;
+						statusresetter.Start();
+					}
+					break;
+			}
+			
+			// Update status description
+			status = newstatus;
+			status.displayed = true;
+			statuslabel.Text = status.ToString(); //mxd. message -> ToString()
+			
+			// Update icon as well
+			UpdateStatusIcon();
+			
+			// Refresh
+			statusbar.Invalidate();
+			this.Update();
+		}
+		
+		// This changes status text to Ready
+		public void DisplayReady()
+		{
+			DisplayStatus(StatusType.Ready, null);
+		}
+		
+		// This updates the status icon
+		private void UpdateStatusIcon()
+		{
+			int statusicon = 0;
+			int statusflashindex = statusflashicon ? 1 : 0;
+			
+			// Loading icon?
+			if((General.Map != null) && (General.Map.Data != null) && General.Map.Data.IsLoading)
+				statusicon = 1;
+			
+			// Status type
+			switch(status.type)
+			{
+				case StatusType.Ready:
+				case StatusType.Info:
+				case StatusType.Action:
+				case StatusType.Selection: //mxd
+					statuslabel.Image = STATUS_IMAGES[statusflashindex, statusicon];
+					break;
+				
+				case StatusType.Busy:
+					statuslabel.Image = STATUS_IMAGES[statusflashindex, 2];
+					break;
+					
+				case StatusType.Warning:
+					statuslabel.Image = STATUS_IMAGES[statusflashindex, 3];
+					break;
+			}
+		}
+		
+		// This changes coordinates display
+		public void UpdateCoordinates(Vector2D coords)
+		{
+			// X position
+			xposlabel.Text = (float.IsNaN(coords.x) ? "--" : coords.x.ToString("####0"));
+
+			// Y position
+			yposlabel.Text = (float.IsNaN(coords.y) ? "--" : coords.y.ToString("####0"));
+		}
+
+		// This changes zoom display
+		internal void UpdateZoom(float scale)
+		{
+			// Update scale label
+			zoomlabel.Text = (float.IsNaN(scale) ? "--" : (scale * 100).ToString("##0") + "%");
+		}
+
+		// Zoom to a specified level
+		private void itemzoomto_Click(object sender, EventArgs e)
+		{
+			// In classic mode?
+			if(General.Map != null && General.Editing.Mode is ClassicMode)
+			{
+				// Requested from menu?
+				if(sender is ToolStripMenuItem)
+				{
+					// Get integral zoom level
+					int zoom = int.Parse((sender as ToolStripMenuItem).Tag.ToString(), CultureInfo.InvariantCulture);
+
+					// Zoom now
+					(General.Editing.Mode as ClassicMode).SetZoom(zoom / 100f);
+				}
+			}
+		}
+
+		// Zoom to fit in screen
+		private void itemzoomfittoscreen_Click(object sender, EventArgs e)
+		{
+			// In classic mode?
+			if(General.Map != null && General.Editing.Mode is ClassicMode)
+				(General.Editing.Mode as ClassicMode).CenterInScreen();
+		}
+
+		// This changes grid display
+		internal void UpdateGrid(int gridsize)
+		{
+			// Update grid label
+			gridlabel.Text = (gridsize == 0 ? "--" : gridsize.ToString("###0") + " mp");
+		}
+
+		// Set grid to a specified size
+		private void itemgridsize_Click(object sender, EventArgs e)
+		{
+			if(General.Map == null) return;
+
+			// In classic mode?
+			if(General.Editing.Mode is ClassicMode)
+			{
+				// Requested from menu?
+				if(sender is ToolStripMenuItem)
+				{
+					// Get integral zoom level
+					int size = int.Parse((sender as ToolStripMenuItem).Tag.ToString(), CultureInfo.InvariantCulture);
+
+					// Change grid size
+					General.Map.Grid.SetGridSize(size);
+					
+					// Redraw display
+					RedrawDisplay();
+				}
+			}
+		}
+
+		// Show grid setup
+		private void itemgridcustom_Click(object sender, EventArgs e)
+		{
+			if(General.Map != null) GridSetup.ShowGridSetup();
+		}
+		
+		#endregion
+
+		#region ================== Display
+
+		// This shows the splash screen on display
+		internal void ShowSplashDisplay()
+		{
+			// Change display to show splash logo
+			display.SetSplashLogoDisplay();
+			display.Cursor = Cursors.Default;
+			this.Update();
+		}
+		
+		// This clears the display
+		internal void ClearDisplay()
+		{
+			// Clear the display
+			display.SetManualRendering();
+			this.Update();
+		}
+
+		// This sets the display cursor
+		public void SetCursor(Cursor cursor)
+		{
+			// Only when a map is open
+			if(General.Map != null) display.Cursor = cursor;
+		}
+
+		// This redraws the display on the next paint event
+		public void RedrawDisplay()
+		{
+			if((General.Map != null) && (General.Editing.Mode != null))
+			{
+				General.Plugins.OnEditRedrawDisplayBegin();
+				General.Editing.Mode.OnRedrawDisplay();
+				General.Plugins.OnEditRedrawDisplayEnd();
+				statistics.UpdateStatistics(); //mxd
+			}
+			else
+			{
+				display.Invalidate();
+			}
+		}
+
+		// This event is called when a repaint is needed
+		private void display_Paint(object sender, PaintEventArgs e)
+		{
+			if(General.Map != null)
+			{
+				if(General.Editing.Mode != null)
+				{
+					if(!displayresized) General.Editing.Mode.OnPresentDisplay();
+				}
+				else
+				{
+					if(General.Colors != null)
+						e.Graphics.Clear(Color.FromArgb(General.Colors.Background.ToInt()));
+					else
+						e.Graphics.Clear(SystemColors.AppWorkspace);
+				}
+			}
+		}
+		
+		// Redraw requested
+		private void redrawtimer_Tick(object sender, EventArgs e)
+		{
+			// Disable timer (only redraw once)
+			redrawtimer.Enabled = false;
+
+			// Don't do anything when minimized (mxd)
+			if(this.WindowState == FormWindowState.Minimized) return;
+
+			// Resume control layouts
+			//if(displayresized) General.LockWindowUpdate(IntPtr.Zero);
+
+			// Map opened?
+			if(General.Map != null)
+			{
+				// Display was resized?
+				if(displayresized)
+				{
+					// Reset graphics to match changes
+					General.Map.Graphics.Reset();
+				}
+
+				// This is a dirty trick to give the display a new mousemove event with correct arguments
+				if(mouseinside)
+				{
+					Point mousepos = Cursor.Position;
+					Cursor.Position = new Point(mousepos.X + 1, mousepos.Y + 1);
+					Cursor.Position = mousepos;
+				}
+				
+				// Redraw now
+				RedrawDisplay();
+			}
+
+			// Display resize is done
+			displayresized = false;
+		}
+
+		// Display size changes
+		private void display_Resize(object sender, EventArgs e)
+		{
+			// Resizing
+			//if(!displayresized) General.LockWindowUpdate(display.Handle);
+			displayresized = true;
+
+			//mxd. Separators may need updating
+			UpdateSeparators();
+			
+			// Request redraw
+			if(!redrawtimer.Enabled) redrawtimer.Enabled = true;
+		}
+		
+		// This requests a delayed redraw
+		public void DelayedRedraw()
+		{
+			// Request redraw
+			if(!redrawtimer.Enabled) redrawtimer.Enabled = true;
+		}
+		
+		// Mouse click
+		private void display_MouseClick(object sender, MouseEventArgs e)
+		{
+			if((General.Map != null) && (General.Editing.Mode != null))
+			{
+				General.Plugins.OnEditMouseClick(e);
+				General.Editing.Mode.OnMouseClick(e);
+			}
+		}
+
+		// Mouse doubleclick
+		private void display_MouseDoubleClick(object sender, MouseEventArgs e)
+		{
+			if((General.Map != null) && (General.Editing.Mode != null))
+			{
+				General.Plugins.OnEditMouseDoubleClick(e);
+				General.Editing.Mode.OnMouseDoubleClick(e);
+			}
+		}
+
+		// Mouse down
+		private void display_MouseDown(object sender, MouseEventArgs e)
+		{
+			int key = 0;
+			
+			LoseFocus(this, EventArgs.Empty);
+			
+			int mod = 0;
+			if(alt) mod |= (int)Keys.Alt;
+			if(shift) mod |= (int)Keys.Shift;
+			if(ctrl) mod |= (int)Keys.Control;
+			
+			// Apply button
+			mousebuttons |= e.Button;
+			
+			// Create key
+			switch(e.Button)
+			{
+				case MouseButtons.Left: key = (int)Keys.LButton; break;
+				case MouseButtons.Middle: key = (int)Keys.MButton; break;
+				case MouseButtons.Right: key = (int)Keys.RButton; break;
+				case MouseButtons.XButton1: key = (int)Keys.XButton1; break;
+				case MouseButtons.XButton2: key = (int)Keys.XButton2; break;
+			}
+			
+			// Invoke any actions associated with this key
+			General.Actions.KeyPressed(key | mod);
+			
+			// Invoke on editing mode
+			if((General.Map != null) && (General.Editing.Mode != null))
+			{
+				General.Plugins.OnEditMouseDown(e);
+				General.Editing.Mode.OnMouseDown(e);
+			}
+		}
+
+		// Mouse enters
+		private void display_MouseEnter(object sender, EventArgs e)
+		{
+			mouseinside = true;
+			if((General.Map != null) && (mouseinput == null) && (General.Editing.Mode != null))
+			{
+				General.Plugins.OnEditMouseEnter(e);
+				General.Editing.Mode.OnMouseEnter(e);
+				if(Application.OpenForms.Count == 1 || editformopen) display.Focus(); //mxd
+			}
+		}
+
+		// Mouse leaves
+		private void display_MouseLeave(object sender, EventArgs e)
+		{
+			mouseinside = false;
+			if((General.Map != null) && (mouseinput == null) && (General.Editing.Mode != null))
+			{
+				General.Plugins.OnEditMouseLeave(e);
+				General.Editing.Mode.OnMouseLeave(e);
+			}
+		}
+
+		// Mouse moves
+		private void display_MouseMove(object sender, MouseEventArgs e)
+		{
+			if((General.Map != null) && (mouseinput == null) && (General.Editing.Mode != null))
+			{
+				General.Plugins.OnEditMouseMove(e);
+				General.Editing.Mode.OnMouseMove(e);
+			}
+		}
+
+		// Mouse up
+		private void display_MouseUp(object sender, MouseEventArgs e)
+		{
+			int key = 0;
+			
+			int mod = 0;
+			if(alt) mod |= (int)Keys.Alt;
+			if(shift) mod |= (int)Keys.Shift;
+			if(ctrl) mod |= (int)Keys.Control;
+			
+			// Apply button
+			mousebuttons &= ~e.Button;
+			
+			// Create key
+			switch(e.Button)
+			{
+				case MouseButtons.Left: key = (int)Keys.LButton; break;
+				case MouseButtons.Middle: key = (int)Keys.MButton; break;
+				case MouseButtons.Right: key = (int)Keys.RButton; break;
+				case MouseButtons.XButton1: key = (int)Keys.XButton1; break;
+				case MouseButtons.XButton2: key = (int)Keys.XButton2; break;
+			}
+			
+			// Invoke any actions associated with this key
+			General.Actions.KeyReleased(key | mod);
+
+			// Invoke on editing mode
+			if((General.Map != null) && (General.Editing.Mode != null))
+			{
+				General.Plugins.OnEditMouseUp(e);
+				General.Editing.Mode.OnMouseUp(e);
+			}
+		}
+		
+		#endregion
+
+		#region ================== Input
+		
+		// This is a tool to lock the mouse in exclusive mode
+		private void StartMouseExclusive()
+		{
+			// Not already locked?
+			if(mouseinput == null)
+			{
+				// Start special input device
+				mouseinput = new MouseInput(this);
+
+				// Lock and hide the mouse in window
+				originalclip = Cursor.Clip;
+				Cursor.Clip = display.RectangleToScreen(display.ClientRectangle);
+				Cursor.Hide();
+			}
+		}
+
+		// This is a tool to unlock the mouse
+		private void StopMouseExclusive()
+		{
+			// Locked?
+			if(mouseinput != null)
+			{
+				// Stop special input device
+				mouseinput.Dispose();
+				mouseinput = null;
+
+				// Release and show the mouse
+				Cursor.Clip = originalclip;
+				Cursor.Position = display.PointToScreen(new Point(display.ClientSize.Width / 2, display.ClientSize.Height / 2));
+				Cursor.Show();
+			}
+		}
+		
+		// This requests exclusive mouse input
+		public void StartExclusiveMouseInput()
+		{
+			// Only when not already in exclusive mode
+			if(!mouseexclusive)
+			{
+				General.WriteLogLine("Starting exclusive mouse input mode...");
+				
+				// Start special input device
+				StartMouseExclusive();
+				mouseexclusive = true;
+				mouseexclusivebreaklevel = 0;
+			}
+		}
+		
+		// This stops exclusive mouse input
+		public void StopExclusiveMouseInput()
+		{
+			// Only when in exclusive mode
+			if(mouseexclusive)
+			{
+				General.WriteLogLine("Stopping exclusive mouse input mode...");
+
+				// Stop special input device
+				StopMouseExclusive();
+				mouseexclusive = false;
+				mouseexclusivebreaklevel = 0;
+			}
+		}
+
+		// This temporarely breaks exclusive mode and counts the break level
+		public void BreakExclusiveMouseInput()
+		{
+			// Only when in exclusive mode
+			if(mouseexclusive)
+			{
+				// Stop special input device
+				StopMouseExclusive();
+				
+				// Count the break level
+				mouseexclusivebreaklevel++;
+			}
+		}
+
+		// This resumes exclusive mode from a break when all breaks have been called to resume
+		public void ResumeExclusiveMouseInput()
+		{
+			// Only when in exclusive mode
+			if(mouseexclusive && (mouseexclusivebreaklevel > 0))
+			{
+				// Decrease break level
+				mouseexclusivebreaklevel--;
+
+				// All break levels resumed? Then lock the mouse again.
+				if(mouseexclusivebreaklevel == 0)
+					StartMouseExclusive();
+			}
+		}
+
+		// This releases all keys
+		internal void ReleaseAllKeys()
+		{
+			General.Actions.ReleaseAllKeys();
+			mousebuttons = MouseButtons.None;
+			shift = false;
+			ctrl = false;
+			alt = false;
+		}
+		
+		// When the mouse wheel is changed
+		protected override void OnMouseWheel(MouseEventArgs e)
+		{
+			int mod = 0;
+			if(alt) mod |= (int)Keys.Alt;
+			if(shift) mod |= (int)Keys.Shift;
+			if(ctrl) mod |= (int)Keys.Control;
+			
+			// Scrollwheel up?
+			if(e.Delta > 0)
+			{
+				// Invoke actions for scrollwheel
+				//for(int i = 0; i < e.Delta; i += 120)
+				General.Actions.KeyPressed((int)SpecialKeys.MScrollUp | mod);
+				General.Actions.KeyReleased((int)SpecialKeys.MScrollUp | mod);
+			}
+			// Scrollwheel down?
+			else if(e.Delta < 0)
+			{
+				// Invoke actions for scrollwheel
+				//for(int i = 0; i > e.Delta; i -= 120)
+				General.Actions.KeyPressed((int)SpecialKeys.MScrollDown | mod);
+				General.Actions.KeyReleased((int)SpecialKeys.MScrollDown | mod);
+			}
+			
+			// Let the base know
+			base.OnMouseWheel(e);
+		}
+		
+		// When a key is pressed
+		private void MainForm_KeyDown(object sender, KeyEventArgs e)
+		{
+			int mod = 0;
+			
+			// Keep key modifiers
+			alt = e.Alt;
+			shift = e.Shift;
+			ctrl = e.Control;
+			if(alt) mod |= (int)Keys.Alt;
+			if(shift) mod |= (int)Keys.Shift;
+			if(ctrl) mod |= (int)Keys.Control;
+			
+			// Don't process any keys when they are meant for other input controls
+			if((ActiveControl == null) || (ActiveControl == display))
+			{
+				// Invoke any actions associated with this key
+				General.Actions.UpdateModifiers(mod);
+				e.Handled = General.Actions.KeyPressed((int)e.KeyData);
+				
+				// Invoke on editing mode
+				if((General.Map != null) && (General.Editing.Mode != null))
+				{
+					General.Plugins.OnEditKeyDown(e);
+					General.Editing.Mode.OnKeyDown(e);
+				}
+
+				// Handled
+				if(e.Handled)
+					e.SuppressKeyPress = true;
+			}
+			
+			// F1 pressed?
+			if((e.KeyCode == Keys.F1) && (e.Modifiers == Keys.None))
+			{
+				// No action bound to F1?
+				Actions.Action[] f1actions = General.Actions.GetActionsByKey((int)e.KeyData);
+				if(f1actions.Length == 0)
+				{
+					// If we don't have any map open, show the Main Window help
+					// otherwise, give the help request to the editing mode so it
+					// can open the appropriate help file.
+					if((General.Map == null) || (General.Editing.Mode == null))
+					{
+						General.ShowHelp("introduction.html");
+					}
+					else
+					{
+						General.Editing.Mode.OnHelp();
+					}
+				}
+			}
+		}
+
+		// When a key is released
+		private void MainForm_KeyUp(object sender, KeyEventArgs e)
+		{
+			int mod = 0;
+			
+			// Keep key modifiers
+			alt = e.Alt;
+			shift = e.Shift;
+			ctrl = e.Control;
+			if(alt) mod |= (int)Keys.Alt;
+			if(shift) mod |= (int)Keys.Shift;
+			if(ctrl) mod |= (int)Keys.Control;
+			
+			// Don't process any keys when they are meant for other input controls
+			if((ActiveControl == null) || (ActiveControl == display))
+			{
+				// Invoke any actions associated with this key
+				General.Actions.UpdateModifiers(mod);
+				e.Handled = General.Actions.KeyReleased((int)e.KeyData);
+				
+				// Invoke on editing mode
+				if((General.Map != null) && (General.Editing.Mode != null))
+				{
+					General.Plugins.OnEditKeyUp(e);
+					General.Editing.Mode.OnKeyUp(e);
+				}
+				
+				// Handled
+				if(e.Handled)
+					e.SuppressKeyPress = true;
+			}
+		}
+
+		//mxd. Sometimes it's handeled by RenderTargetControl, not by MainForm leading to keys being "stuck"
+		private void display_OnKeyReleased(object sender, KeyEventArgs e)
+		{
+			MainForm_KeyUp(sender, e);
+		}
+		
+		// These prevent focus changes by way of TAB or Arrow keys
+		protected override bool IsInputChar(char charCode) { return false; }
+		protected override bool IsInputKey(Keys keyData) { return false; }
+		protected override bool ProcessKeyPreview(ref Message m) { return false; }
+		protected override bool ProcessDialogKey(Keys keyData) { return false; }
+		protected override bool ProcessCmdKey(ref Message msg, Keys keyData) { return false; }
+		
+		// This fixes some odd input behaviour
+		private void display_PreviewKeyDown(object sender, PreviewKeyDownEventArgs e)
+		{
+			if((ActiveControl == null) || (ActiveControl == display))
+			{
+				LoseFocus(this, EventArgs.Empty);
+				KeyEventArgs ea = new KeyEventArgs(e.KeyData);
+				MainForm_KeyDown(sender, ea);
+			}
+		}
+		
+		#endregion
+
+		#region ================== Toolbar
+		
+		// This updates the skills list
+		private void UpdateSkills()
+		{
+			// Clear list
+			buttontest.DropDownItems.Clear();
+			
+			// Map loaded?
+			if(General.Map != null)
+			{
+				// Make the new items list
+				ToolStripItem[] items = new ToolStripItem[(General.Map.Config.Skills.Count * 2) + General.Map.ConfigSettings.TestEngines.Count + 2]; //mxd
+				int addindex = 0;
+				
+				// Positive skills are with monsters
+				foreach(SkillInfo si in General.Map.Config.Skills)
+				{
+					ToolStripMenuItem menuitem = new ToolStripMenuItem(si.ToString());
+					menuitem.Image = Resources.Monster2;
+					menuitem.Click += TestSkill_Click;
+					menuitem.Tag = si.Index;
+					menuitem.Checked = (General.Settings.TestMonsters && (General.Map.ConfigSettings.TestSkill == si.Index));
+					items[addindex++] = menuitem;
+				}
+
+				// Add seperator
+				items[addindex] = new ToolStripSeparator { Padding = new Padding(0, 3, 0, 3) };
+				addindex++;
+
+				// Negative skills are without monsters
+				foreach(SkillInfo si in General.Map.Config.Skills)
+				{
+					ToolStripMenuItem menuitem = new ToolStripMenuItem(si.ToString());
+					menuitem.Image = Resources.Monster3;
+					menuitem.Click += TestSkill_Click;
+					menuitem.Tag = -si.Index;
+					menuitem.Checked = (!General.Settings.TestMonsters && (General.Map.ConfigSettings.TestSkill == si.Index));
+					items[addindex++] = menuitem;
+				}
+
+				//mxd. Add seperator
+				items[addindex] = new ToolStripSeparator { Padding = new Padding(0, 3, 0, 3) };
+				addindex++;
+
+				//mxd. Add test engines
+				for(int i = 0; i < General.Map.ConfigSettings.TestEngines.Count; i++)
+				{
+					ToolStripMenuItem menuitem = new ToolStripMenuItem(General.Map.ConfigSettings.TestEngines[i].TestProgramName);
+					menuitem.Image = General.Map.ConfigSettings.TestEngines[i].TestProgramIcon;
+					menuitem.Click += TestEngine_Click;
+					menuitem.Tag = i;
+					menuitem.Checked = (i == General.Map.ConfigSettings.CurrentEngineIndex);
+					items[addindex++] = menuitem;
+				}
+				
+				// Add to list
+				buttontest.DropDownItems.AddRange(items);
+			}
+		}
+
+		//mxd
+		private void TestEngine_Click(object sender, EventArgs e)
+		{
+			General.Map.ConfigSettings.CurrentEngineIndex = (int)(((ToolStripMenuItem)sender).Tag);
+			General.Map.ConfigSettings.Changed = true;
+			General.Map.Launcher.TestAtSkill(General.Map.ConfigSettings.TestSkill);
+			UpdateSkills();
+		}
+		
+		// Event handler for testing at a specific skill
+		private void TestSkill_Click(object sender, EventArgs e)
+		{
+			int skill = (int)((sender as ToolStripMenuItem).Tag);
+			General.Settings.TestMonsters = (skill > 0);
+			General.Map.ConfigSettings.TestSkill = Math.Abs(skill);
+			General.Map.Launcher.TestAtSkill(Math.Abs(skill));
+			UpdateSkills();
+		}
+		
+		// This loses focus
+		private void LoseFocus(object sender, EventArgs e)
+		{
+			// Lose focus!
+			try { display.Focus(); } catch(Exception) { }
+			this.ActiveControl = null;
+		}
+
+		//mxd. Things filter selected
+		private void thingfilters_DropDownItemClicked(object sender, EventArgs e)
+		{
+			// Only possible when a map is open
+			if((General.Map != null) && !updatingfilters)
+			{
+				updatingfilters = true;
+				ToolStripMenuItem clickeditem = sender as ToolStripMenuItem;
+
+				// Keep already selected items selected
+				if(!clickeditem.Checked)
+				{
+					clickeditem.Checked = true;
+					updatingfilters = false;
+					return;
+				}
+
+				// Change filter
+				ThingsFilter f = clickeditem.Tag as ThingsFilter;
+				General.Map.ChangeThingFilter(f);
+
+				// Deselect other items...
+				foreach(var item in thingfilters.DropDown.Items)
+				{
+					if(item != clickeditem) ((ToolStripMenuItem)item).Checked = false;
+				}
+
+				// Update button text
+				thingfilters.Text = f.Name;
+
+				updatingfilters = false;
+			}
+			
+			// Lose focus
+			LoseFocus(sender, e);
+		}
+		
+		//mxd. This updates the things filter on the toolbar
+		internal void UpdateThingsFilters()
+		{
+			// Only possible to list filters when a map is open
+			if(General.Map != null)
+			{
+				ThingsFilter oldfilter = null;
+
+				// Anything selected?
+				foreach(var item in thingfilters.DropDown.Items)
+				{
+					if(((ToolStripMenuItem)item).Checked)
+					{
+						oldfilter = ((ToolStripMenuItem)item).Tag as ThingsFilter;
+						break;
+					}
+				}
+				
+				updatingfilters = true;
+
+				// Clear the list
+				thingfilters.DropDown.Items.Clear();
+
+				// Add null filter
+				if(General.Map.ThingsFilter is NullThingsFilter)
+					thingfilters.DropDown.Items.Add(CreateThingsFilterMenuItem(General.Map.ThingsFilter));
+				else
+					thingfilters.DropDown.Items.Add(CreateThingsFilterMenuItem(new NullThingsFilter()));
+
+				// Add all filters, select current one
+				foreach(ThingsFilter f in General.Map.ConfigSettings.ThingsFilters)
+					thingfilters.DropDown.Items.Add(CreateThingsFilterMenuItem(f));
+
+				updatingfilters = false;
+				
+				// No filter selected?
+				ToolStripMenuItem selecteditem = null;
+				foreach(var i in thingfilters.DropDown.Items)
+				{
+					ToolStripMenuItem item = i as ToolStripMenuItem;
+					if(item.Checked)
+					{
+						selecteditem = item;
+						break;
+					}
+				}
+
+				if(selecteditem == null)
+				{
+					ToolStripMenuItem first = thingfilters.DropDown.Items[0] as ToolStripMenuItem;
+					first.Checked = true;
+				}
+				// Another filter got selected?
+				else if(selecteditem.Tag != oldfilter)
+				{
+					selecteditem.Checked = true;
+				}
+
+				// Update button text
+				if(selecteditem != null)
+					thingfilters.Text = ((ThingsFilter)selecteditem.Tag).Name;
+			}
+			else
+			{
+				// Clear the list
+				thingfilters.DropDown.Items.Clear();
+				thingfilters.Text = "(show all)";
+			}
+		}
+
+		// This selects the things filter based on the filter set on the map manager
+		internal void ReflectThingsFilter()
+		{
+			if(!updatingfilters)
+			{
+				updatingfilters = true;
+				
+				// Select current filter
+				bool selecteditemfound = false;
+				foreach(var i in thingfilters.DropDown.Items)
+				{
+					ToolStripMenuItem item = i as ToolStripMenuItem;
+					ThingsFilter f = item.Tag as ThingsFilter;
+
+					if(f == General.Map.ThingsFilter)
+					{
+						item.Checked = true;
+						thingfilters.Text = f.Name;
+						selecteditemfound = true;
+					}
+					else
+					{
+						item.Checked = false;
+					}
+				}
+
+				// Not in the list?
+				if(!selecteditemfound)
+				{
+					// Select nothing
+					thingfilters.Text = "(show all)"; //mxd
+				}
+
+				updatingfilters = false;
+			}
+		}
+
+		//mxd
+		private ToolStripMenuItem CreateThingsFilterMenuItem(ThingsFilter f)
+		{
+			// Make decorated name
+			string name = f.Name;
+			if(f.Invert) name = "!" + name;
+			switch(f.DisplayMode)
+			{
+				case ThingsFilterDisplayMode.CLASSIC_MODES_ONLY: name += " [2D]"; break;
+				case ThingsFilterDisplayMode.VISUAL_MODES_ONLY: name += " [3D]"; break;
+			}
+
+			// Create and select the item
+			ToolStripMenuItem item = new ToolStripMenuItem(name) { CheckOnClick = true, Tag = f };
+			item.CheckedChanged += thingfilters_DropDownItemClicked;
+			item.Checked = (f == General.Map.ThingsFilter);
+			
+			// Update icon
+			if(!(f is NullThingsFilter) && !f.IsValid())
+			{
+				item.Image = Resources.Warning;
+				//item.ImageScaling = ToolStripItemImageScaling.None;
+			}
+
+			return item;
+		}
+
+		//mxd. Linedef color preset (de)selected
+		private void linedefcolorpresets_ItemClicked(object sender, EventArgs e)
+		{
+			ToolStripMenuItem item = sender as ToolStripMenuItem;
+			((LinedefColorPreset)item.Tag).Enabled = item.Checked;
+
+			List<string> enablednames = new List<string>();
+			foreach(LinedefColorPreset p in General.Map.ConfigSettings.LinedefColorPresets)
+			{
+				if(p.Enabled) enablednames.Add(p.Name);
+			}
+
+			// Update button text
+			UpdateColorPresetsButtonText(linedefcolorpresets, enablednames);
+			
+			General.Map.Map.UpdateCustomLinedefColors();
+			General.Map.ConfigSettings.Changed = true;
+
+			// Update display
+			if(General.Editing.Mode is ClassicMode) General.Interface.RedrawDisplay();
+		}
+
+		//mxd. Handle Shift key...
+		private void linedefcolorpresets_DropDownItemClicked(object sender, ToolStripItemClickedEventArgs e)
+		{
+			linedefcolorpresets.DropDown.AutoClose = (ModifierKeys != Keys.Shift);
+		}
+
+		//mxd. Handles the mouse leaving linedefcolorpresets.DropDown and clicking on linedefcolorpresets button
+		private void linedefcolorpresets_MouseLeave(object sender, EventArgs e)
+		{
+			linedefcolorpresets.DropDown.AutoClose = true;
+		}
+
+		//mxd. This updates linedef color presets selector on the toolbar
+		internal void UpdateLinedefColorPresets()
+		{
+			// Refill the list
+			List<string> enablednames = new List<string>();
+			linedefcolorpresets.DropDown.Items.Clear();
+
+			if(General.Map != null)
+			{
+				foreach(LinedefColorPreset p in General.Map.ConfigSettings.LinedefColorPresets)
+				{
+					// Create menu item
+					ToolStripMenuItem item = new ToolStripMenuItem(p.Name)
+					{
+						CheckOnClick = true,
+						Tag = p,
+						//ImageScaling = ToolStripItemImageScaling.None,
+						Checked = p.Enabled,
+						ToolTipText = "Hold Shift to toggle several items at once"
+					};
+
+					// Create icon
+					if(p.IsValid())
+					{
+						Bitmap icon = new Bitmap(16, 16);
+						using(Graphics g = Graphics.FromImage(icon))
+						{
+							g.FillRectangle(new SolidBrush(p.Color.ToColor()), 2, 3, 12, 10);
+							g.DrawRectangle(Pens.Black, 2, 3, 11, 9);
+						}
+
+						item.Image = icon;
+					}
+					// Or use the warning icon
+					else
+					{
+						item.Image = Resources.Warning;
+					}
+
+					item.CheckedChanged += linedefcolorpresets_ItemClicked;
+					linedefcolorpresets.DropDown.Items.Add(item);
+					if(p.Enabled) enablednames.Add(p.Name);
+				}
+			}
+
+			// Update button text
+			UpdateColorPresetsButtonText(linedefcolorpresets, enablednames);
+		}
+
+		//mxd
+		private static void UpdateColorPresetsButtonText(ToolStripItem button, List<string> names)
+		{
+			if(names.Count == 0)
+			{
+				button.Text = "No active presets";
+			}
+			else
+			{
+				string text = string.Join(", ", names.ToArray());
+				if(TextRenderer.MeasureText(text, button.Font).Width > button.Width)
+					button.Text = names.Count + (names.Count.ToString(CultureInfo.InvariantCulture).EndsWith("1") ? " preset" : " presets") + " active";
+				else
+					button.Text = text;
+			}
+		}
+
+		// This adds a button to the toolbar
+		public void AddButton(ToolStripItem button) { AddButton(button, ToolbarSection.Custom, General.Plugins.FindPluginByAssembly(Assembly.GetCallingAssembly())); }
+		public void AddButton(ToolStripItem button, ToolbarSection section) { AddButton(button, section, General.Plugins.FindPluginByAssembly(Assembly.GetCallingAssembly())); }
+		private void AddButton(ToolStripItem button, ToolbarSection section, Plugin plugin)
+		{
+			// Fix tags to full action names
+			ToolStripItemCollection items = new ToolStripItemCollection(toolbar, new ToolStripItem[0]);
+			items.Add(button);
+			RenameTagsToFullActions(items, plugin);
+
+			// Add to the list so we can update it as needed
+			PluginToolbarButton buttoninfo = new PluginToolbarButton();
+			buttoninfo.button = button;
+			buttoninfo.section = section;
+			pluginbuttons.Add(buttoninfo);
+			
+			// Bind visible changed event
+			if(!(button is ToolStripSeparator)) button.VisibleChanged += buttonvisiblechangedhandler;
+			
+			// Insert the button in the right section
+			switch(section)
+			{
+				case ToolbarSection.File: toolbar.Items.Insert(toolbar.Items.IndexOf(seperatorfile), button); break;
+				case ToolbarSection.Script: toolbar.Items.Insert(toolbar.Items.IndexOf(seperatorscript), button); break;
+				case ToolbarSection.UndoRedo: toolbar.Items.Insert(toolbar.Items.IndexOf(seperatorundo), button); break;
+				case ToolbarSection.CopyPaste: toolbar.Items.Insert(toolbar.Items.IndexOf(seperatorcopypaste), button); break;
+				case ToolbarSection.Prefabs: toolbar.Items.Insert(toolbar.Items.IndexOf(seperatorprefabs), button); break;
+				case ToolbarSection.Things: toolbar.Items.Insert(toolbar.Items.IndexOf(buttonviewnormal), button); break;
+				case ToolbarSection.Views: toolbar.Items.Insert(toolbar.Items.IndexOf(seperatorviews), button); break;
+				case ToolbarSection.Geometry: toolbar.Items.Insert(toolbar.Items.IndexOf(seperatorgeometry), button); break;
+				case ToolbarSection.Testing: toolbar.Items.Insert(toolbar.Items.IndexOf(seperatortesting), button); break;
+				case ToolbarSection.Modes: modestoolbar.Items.Add(button); break; //mxd
+				case ToolbarSection.Custom: modecontrolsloolbar.Items.Add(button); modecontrolsloolbar.Visible = true; break; //mxd
+			}
+			
+			UpdateToolbar();
+		}
+
+		//mxd
+		public void AddModesButton(ToolStripItem button, string group) 
+		{
+			// Set proper styling
+			button.Padding = new Padding(0, 1, 0, 1);
+			button.Margin = new Padding();
+			
+			// Fix tags to full action names
+			ToolStripItemCollection items = new ToolStripItemCollection(toolbar, new ToolStripItem[0]);
+			items.Add(button);
+			RenameTagsToFullActions(items, General.Plugins.FindPluginByAssembly(Assembly.GetCallingAssembly()));
+
+			// Add to the list so we can update it as needed
+			PluginToolbarButton buttoninfo = new PluginToolbarButton();
+			buttoninfo.button = button;
+			buttoninfo.section = ToolbarSection.Modes;
+			pluginbuttons.Add(buttoninfo);
+
+			button.VisibleChanged += buttonvisiblechangedhandler;
+
+			//find the separator we need
+			for(int i = 0; i < modestoolbar.Items.Count; i++) 
+			{
+				if(modestoolbar.Items[i] is ToolStripSeparator && modestoolbar.Items[i].Text == group) 
+				{
+					modestoolbar.Items.Insert(i + 1, button);
+					break;
+				}
+			}
+
+			UpdateToolbar();
+		}
+
+		// Removes a button
+		public void RemoveButton(ToolStripItem button)
+		{
+			// Find in the list and remove it
+			PluginToolbarButton buttoninfo = new PluginToolbarButton();
+			for(int i = 0; i < pluginbuttons.Count; i++)
+			{
+				if(pluginbuttons[i].button == button)
+				{
+					buttoninfo = pluginbuttons[i];
+					pluginbuttons.RemoveAt(i);
+					break;
+				}
+			}
+
+			if(buttoninfo.button != null)
+			{
+				// Unbind visible changed event
+				if(!(button is ToolStripSeparator)) button.VisibleChanged -= buttonvisiblechangedhandler;
+
+				//mxd. Remove button from toolbars
+				switch(buttoninfo.section) 
+				{
+					case ToolbarSection.Modes:
+						modestoolbar.Items.Remove(button);
+						break;
+					case ToolbarSection.Custom:
+						modecontrolsloolbar.Items.Remove(button);
+						modecontrolsloolbar.Visible = (modecontrolsloolbar.Items.Count > 0);
+						break;
+					default:
+						toolbar.Items.Remove(button);
+						break;
+				}
+				
+				UpdateSeparators();
+			}
+		}
+
+		// This handle visibility changes in the toolbar buttons
+		private void ToolbarButtonVisibleChanged(object sender, EventArgs e)
+		{
+			if(!preventupdateseperators)
+			{
+				// Update the seeprators
+				UpdateSeparators();
+			}
+		}
+
+		// This hides redundant separators
+		internal void UpdateSeparators()
+		{
+			UpdateToolStripSeparators(toolbar.Items, false);
+			UpdateToolStripSeparators(menumode.DropDownItems, true);
+
+			//mxd
+			UpdateToolStripSeparators(modestoolbar.Items, true);
+			UpdateToolStripSeparators(modecontrolsloolbar.Items, true);
+		}
+		
+		// This hides redundant separators
+		private static void UpdateToolStripSeparators(ToolStripItemCollection items, bool defaultvisible)
+		{
+			ToolStripItem pvi = null;
+			foreach(ToolStripItem i in items) 
+			{
+				bool separatorvisible = false;
+
+				// This is a seperator?
+				if(i is ToolStripSeparator) 
+				{
+					// Make visible when previous item was not a seperator
+					separatorvisible = !(pvi is ToolStripSeparator) && (pvi != null);
+					i.Visible = separatorvisible;
+				}
+
+				// Keep as previous visible item
+				if(i.Visible || separatorvisible || (defaultvisible && !(i is ToolStripSeparator))) pvi = i;
+			}
+
+			// Hide last item if it is a seperator
+			if(pvi is ToolStripSeparator) pvi.Visible = false;
+		}
+		
+		// This enables or disables all editing mode items and toolbar buttons
+		private void UpdateToolbar()
+		{
+			preventupdateseperators = true;
+			
+			// Show/hide items based on preferences
+			bool maploaded = (General.Map != null); //mxd
+			buttonnewmap.Visible = General.Settings.ToolbarFile;
+			buttonopenmap.Visible = General.Settings.ToolbarFile;
+			buttonsavemap.Visible = General.Settings.ToolbarFile;
+			buttonscripteditor.Visible = General.Settings.ToolbarScript && maploaded;
+			buttonundo.Visible = General.Settings.ToolbarUndo && maploaded;
+			buttonredo.Visible = General.Settings.ToolbarUndo && maploaded;
+			buttoncut.Visible = General.Settings.ToolbarCopy && maploaded;
+			buttoncopy.Visible = General.Settings.ToolbarCopy && maploaded;
+			buttonpaste.Visible = General.Settings.ToolbarCopy && maploaded;
+			buttoninsertprefabfile.Visible = General.Settings.ToolbarPrefabs && maploaded;
+			buttoninsertpreviousprefab.Visible = General.Settings.ToolbarPrefabs && maploaded;
+			buttonthingsfilter.Visible = General.Settings.ToolbarFilter && maploaded;
+			thingfilters.Visible = General.Settings.ToolbarFilter && maploaded;
+			separatorlinecolors.Visible = General.Settings.ToolbarFilter && maploaded; //mxd
+			buttonlinededfcolors.Visible = General.Settings.ToolbarFilter && maploaded; //mxd
+			linedefcolorpresets.Visible = General.Settings.ToolbarFilter && maploaded; //mxd
+			separatorfilters.Visible = General.Settings.ToolbarViewModes && maploaded; //mxd
+			buttonfullbrightness.Visible = General.Settings.ToolbarViewModes && maploaded; //mxd
+			buttonfullbrightness.Checked = Renderer.FullBrightness; //mxd
+			buttontogglegrid.Visible = General.Settings.ToolbarViewModes && maploaded; //mxd
+			buttontogglegrid.Checked = General.Settings.RenderGrid; //mxd
+			buttontogglecomments.Visible = General.Settings.ToolbarViewModes && maploaded && General.Map.UDMF; //mxd
+			buttontogglecomments.Checked = General.Settings.RenderComments; //mxd
+			separatorfullbrightness.Visible = General.Settings.ToolbarViewModes && maploaded; //mxd
+			buttonviewbrightness.Visible = General.Settings.ToolbarViewModes && maploaded;
+			buttonviewceilings.Visible = General.Settings.ToolbarViewModes && maploaded;
+			buttonviewfloors.Visible = General.Settings.ToolbarViewModes && maploaded;
+			buttonviewnormal.Visible = General.Settings.ToolbarViewModes && maploaded;
+			buttonsnaptogrid.Visible = General.Settings.ToolbarGeometry && maploaded;
+			buttontoggledynamicgrid.Visible = General.Settings.ToolbarGeometry && maploaded; //mxd
+			buttontoggledynamicgrid.Checked = General.Settings.DynamicGridSize; //mxd
+			buttonautomerge.Visible = General.Settings.ToolbarGeometry && maploaded;
+			buttonautoclearsidetextures.Visible = General.Settings.ToolbarGeometry && maploaded; //mxd
+			buttontest.Visible = General.Settings.ToolbarTesting && maploaded;
+
+			//mxd
+			modelrendermode.Visible = General.Settings.GZToolbarGZDoom && maploaded;
+			dynamiclightmode.Visible = General.Settings.GZToolbarGZDoom && maploaded;
+			buttontogglefx.Visible = General.Settings.GZToolbarGZDoom && maploaded;
+			buttontogglefog.Visible = General.Settings.GZToolbarGZDoom && maploaded;
+			buttontoggleeventlines.Visible = General.Settings.GZToolbarGZDoom && maploaded;
+			buttontogglevisualvertices.Visible = General.Settings.GZToolbarGZDoom && maploaded;
+			separatorgzmodes.Visible = General.Settings.GZToolbarGZDoom && maploaded;
+
+			//mxd. Show/hide additional panels
+			modestoolbar.Visible = maploaded;
+			panelinfo.Visible = maploaded;
+			modecontrolsloolbar.Visible = (maploaded && modecontrolsloolbar.Items.Count > 0);
+			
+			//mxd. modestoolbar index in Controls gets messed up when it's invisible. This fixes it.
+			//TODO: find out why this happens in the first place
+			if(modestoolbar.Visible) 
+			{
+				int toolbarpos = this.Controls.IndexOf(toolbar);
+				if(this.Controls.IndexOf(modestoolbar) > toolbarpos) 
+				{
+					this.Controls.SetChildIndex(modestoolbar, toolbarpos);
+				}
+			}
+
+			// Update plugin buttons
+			foreach(PluginToolbarButton p in pluginbuttons)
+			{
+				switch(p.section)
+				{
+					case ToolbarSection.File: p.button.Visible = General.Settings.ToolbarFile; break;
+					case ToolbarSection.Script: p.button.Visible = General.Settings.ToolbarScript; break;
+					case ToolbarSection.UndoRedo: p.button.Visible = General.Settings.ToolbarUndo; break;
+					case ToolbarSection.CopyPaste: p.button.Visible = General.Settings.ToolbarCopy; break;
+					case ToolbarSection.Prefabs: p.button.Visible = General.Settings.ToolbarPrefabs; break;
+					case ToolbarSection.Things: p.button.Visible = General.Settings.ToolbarFilter; break;
+					case ToolbarSection.Views: p.button.Visible = General.Settings.ToolbarViewModes; break;
+					case ToolbarSection.Geometry: p.button.Visible = General.Settings.ToolbarGeometry; break;
+					case ToolbarSection.Testing: p.button.Visible = General.Settings.ToolbarTesting; break;
+				}
+			}
+
+			preventupdateseperators = false;
+
+			UpdateSeparators();
+		}
+
+		// This checks one of the edit mode items (and unchecks all others)
+		internal void CheckEditModeButton(string modeclassname)
+		{
+			// Go for all items
+			foreach(ToolStripItem i in editmodeitems)
+			{
+				// Check what type it is
+				if(i is ToolStripMenuItem)
+				{
+					// Check if mode type matches with given name
+					(i as ToolStripMenuItem).Checked = ((i.Tag as EditModeInfo).Type.Name == modeclassname);
+				}
+				else if(i is ToolStripButton)
+				{
+					// Check if mode type matches with given name
+					(i as ToolStripButton).Checked = ((i.Tag as EditModeInfo).Type.Name == modeclassname);
+				}
+			}
+		}
+		
+		// This removes the config-specific editing mode buttons
+		internal void RemoveEditModeButtons()
+		{
+			// Go for all items
+			foreach(ToolStripItem i in editmodeitems)
+			{
+				// Remove it and restart
+				menumode.DropDownItems.Remove(i);
+				i.Dispose();
+			}
+			
+			// Done
+			modestoolbar.Items.Clear(); //mxd
+			editmodeitems.Clear();
+			UpdateSeparators();
+		}
+		
+		// This adds an editing mode seperator on the toolbar and menu
+		internal void AddEditModeSeperator(string group)
+		{
+			// Create a button
+			ToolStripSeparator item = new ToolStripSeparator();
+			item.Text = group; //mxd
+			item.Margin = new Padding(0, 3, 0, 3); //mxd
+			modestoolbar.Items.Add(item); //mxd
+			editmodeitems.Add(item);
+			
+			// Create menu item
+			int index = menumode.DropDownItems.Count;
+			item = new ToolStripSeparator();
+			item.Text = group; //mxd
+			item.Margin = new Padding(0, 3, 0, 3);
+			menumode.DropDownItems.Insert(index, item);
+			editmodeitems.Add(item);
+			
+			UpdateSeparators();
+		}
+		
+		// This adds an editing mode button to the toolbar and edit menu
+		internal void AddEditModeButton(EditModeInfo modeinfo)
+		{
+			string controlname = modeinfo.ButtonDesc.Replace("&", "&&");
+			
+			// Create a button
+			ToolStripItem item = new ToolStripButton(modeinfo.ButtonDesc, modeinfo.ButtonImage, EditModeButtonHandler);
+			item.DisplayStyle = ToolStripItemDisplayStyle.Image;
+			item.Padding = new Padding(0, 2, 0, 2);
+			item.Margin = new Padding();
+			item.Tag = modeinfo;
+			modestoolbar.Items.Add(item); //mxd
+			editmodeitems.Add(item);
+			
+			// Create menu item
+			int index = menumode.DropDownItems.Count;
+			item = new ToolStripMenuItem(controlname, modeinfo.ButtonImage, EditModeButtonHandler);
+			item.Tag = modeinfo;
+			menumode.DropDownItems.Insert(index, item);
+			editmodeitems.Add(item);
+			item.Visible = true;
+			
+			ApplyShortcutKeys(menumode.DropDownItems);
+			UpdateSeparators();
+		}
+
+		// This handles edit mode button clicks
+		private void EditModeButtonHandler(object sender, EventArgs e)
+		{
+			this.Update();
+			EditModeInfo modeinfo = (EditModeInfo)((sender as ToolStripItem).Tag);
+			General.Actions.InvokeAction(modeinfo.SwitchAction.GetFullActionName(modeinfo.Plugin.Assembly));
+			this.Update();
+		}
+
+		//mxd
+		public void UpdateGZDoomPanel() 
+		{
+			if(General.Map != null && General.Settings.GZToolbarGZDoom) 
+			{
+				foreach(ToolStripMenuItem item in modelrendermode.DropDownItems)
+				{
+					item.Checked = ((ModelRenderMode)item.Tag == General.Settings.GZDrawModelsMode);
+					if(item.Checked) modelrendermode.Image = item.Image;
+				}
+
+				foreach(ToolStripMenuItem item in dynamiclightmode.DropDownItems)
+				{
+					item.Checked = ((LightRenderMode)item.Tag == General.Settings.GZDrawLightsMode);
+					if(item.Checked) dynamiclightmode.Image = item.Image;
+				}
+				
+				buttontogglefog.Checked = General.Settings.GZDrawFog;
+				buttontoggleeventlines.Checked = General.Settings.GZShowEventLines;
+				buttontogglevisualvertices.Visible = General.Map.UDMF;
+				buttontogglevisualvertices.Checked = General.Settings.GZShowVisualVertices;
+			} 
+		}
+
+		#endregion
+
+		#region ================== Toolbar context menu (mxd)
+
+		private void toolbarContextMenu_Opening(object sender, CancelEventArgs e)
+		{
+			if(General.Map == null)
+			{
+				e.Cancel = true;
+				return;
+			}
+
+			toggleFile.Image = General.Settings.ToolbarFile ? Resources.Check : null;
+			toggleScript.Image = General.Settings.ToolbarScript ? Resources.Check : null;
+			toggleUndo.Image = General.Settings.ToolbarUndo ? Resources.Check : null;
+			toggleCopy.Image = General.Settings.ToolbarCopy ? Resources.Check : null;
+			togglePrefabs.Image = General.Settings.ToolbarPrefabs ? Resources.Check : null;
+			toggleFilter.Image = General.Settings.ToolbarFilter ? Resources.Check : null;
+			toggleViewModes.Image = General.Settings.ToolbarViewModes ? Resources.Check : null;
+			toggleGeometry.Image = General.Settings.ToolbarGeometry ? Resources.Check : null;
+			toggleTesting.Image = General.Settings.ToolbarTesting ? Resources.Check : null;
+			toggleRendering.Image = General.Settings.GZToolbarGZDoom ? Resources.Check : null;
+		}
+
+		private void toolbarContextMenu_Closing(object sender, ToolStripDropDownClosingEventArgs e) 
+		{
+			e.Cancel = (e.CloseReason == ToolStripDropDownCloseReason.ItemClicked && toolbarContextMenuShiftPressed);
+		}
+
+		private void toolbarContextMenu_KeyDown(object sender, KeyEventArgs e) 
+		{
+			toolbarContextMenuShiftPressed = (e.KeyCode == Keys.ShiftKey);
+		}
+
+		private void toolbarContextMenu_KeyUp(object sender, KeyEventArgs e) 
+		{
+			toolbarContextMenuShiftPressed = (e.KeyCode != Keys.ShiftKey);
+		}
+
+		private void toggleFile_Click(object sender, EventArgs e) 
+		{
+			General.Settings.ToolbarFile = !General.Settings.ToolbarFile;
+			UpdateToolbar();
+
+			if(toolbarContextMenuShiftPressed) 
+				toggleFile.Image = General.Settings.ToolbarFile ? Resources.Check : null;
+		}
+
+		private void toggleScript_Click(object sender, EventArgs e) 
+		{
+			General.Settings.ToolbarScript = !General.Settings.ToolbarScript;
+			UpdateToolbar();
+
+			if(toolbarContextMenuShiftPressed) 
+				toggleScript.Image = General.Settings.ToolbarScript ? Resources.Check : null;
+		}
+
+		private void toggleUndo_Click(object sender, EventArgs e) 
+		{
+			General.Settings.ToolbarUndo = !General.Settings.ToolbarUndo;
+			UpdateToolbar();
+
+			if(toolbarContextMenuShiftPressed) 
+				toggleUndo.Image = General.Settings.ToolbarUndo ? Resources.Check : null;
+		}
+
+		private void toggleCopy_Click(object sender, EventArgs e) 
+		{
+			General.Settings.ToolbarCopy = !General.Settings.ToolbarCopy;
+			UpdateToolbar();
+
+			if(toolbarContextMenuShiftPressed) 
+				toggleCopy.Image = General.Settings.ToolbarCopy ? Resources.Check : null;
+		}
+
+		private void togglePrefabs_Click(object sender, EventArgs e) 
+		{
+			General.Settings.ToolbarPrefabs = !General.Settings.ToolbarPrefabs;
+			UpdateToolbar();
+
+			if(toolbarContextMenuShiftPressed) 
+				togglePrefabs.Image = General.Settings.ToolbarPrefabs ? Resources.Check : null;
+		}
+
+		private void toggleFilter_Click(object sender, EventArgs e) 
+		{
+			General.Settings.ToolbarFilter = !General.Settings.ToolbarFilter;
+			UpdateToolbar();
+
+			if(toolbarContextMenuShiftPressed) 
+				toggleFilter.Image = General.Settings.ToolbarFilter ? Resources.Check : null;
+		}
+
+		private void toggleViewModes_Click(object sender, EventArgs e) 
+		{
+			General.Settings.ToolbarViewModes = !General.Settings.ToolbarViewModes;
+			UpdateToolbar();
+
+			if(toolbarContextMenuShiftPressed) 
+				toggleViewModes.Image = General.Settings.ToolbarViewModes ? Resources.Check : null;
+		}
+
+		private void toggleGeometry_Click(object sender, EventArgs e) 
+		{
+			General.Settings.ToolbarGeometry = !General.Settings.ToolbarGeometry;
+			UpdateToolbar();
+
+			if(toolbarContextMenuShiftPressed) 
+				toggleGeometry.Image = General.Settings.ToolbarGeometry ? Resources.Check : null;
+		}
+
+		private void toggleTesting_Click(object sender, EventArgs e) 
+		{
+			General.Settings.ToolbarTesting = !General.Settings.ToolbarTesting;
+			UpdateToolbar();
+
+			if(toolbarContextMenuShiftPressed) 
+				toggleTesting.Image = General.Settings.ToolbarTesting ? Resources.Check : null;
+		}
+
+		private void toggleRendering_Click(object sender, EventArgs e) 
+		{
+			General.Settings.GZToolbarGZDoom = !General.Settings.GZToolbarGZDoom;
+			UpdateToolbar();
+
+			if(toolbarContextMenuShiftPressed) 
+				toggleRendering.Image = General.Settings.GZToolbarGZDoom ? Resources.Check : null;
+		}
+
+		#endregion
+
+		#region ================== Menus
+
+		// This adds a menu to the menus bar
+		public void AddMenu(ToolStripItem menu) { AddMenu(menu, MenuSection.Top, General.Plugins.FindPluginByAssembly(Assembly.GetCallingAssembly())); }
+		public void AddMenu(ToolStripItem menu, MenuSection section) { AddMenu(menu, section, General.Plugins.FindPluginByAssembly(Assembly.GetCallingAssembly())); }
+		private void AddMenu(ToolStripItem menu, MenuSection section, Plugin plugin)
+		{
+			// Fix tags to full action names
+			ToolStripItemCollection items = new ToolStripItemCollection(this.menumain, new ToolStripItem[0]);
+			items.Add(menu);
+			RenameTagsToFullActions(items, plugin);
+			
+			// Insert the menu in the right location
+			switch(section)
+			{
+				case MenuSection.FileNewOpenClose: menufile.DropDownItems.Insert(menufile.DropDownItems.IndexOf(seperatorfileopen), menu); break;
+				case MenuSection.FileSave: menufile.DropDownItems.Insert(menufile.DropDownItems.IndexOf(seperatorfilesave), menu); break;
+				case MenuSection.FileImport: itemimport.DropDownItems.Add(menu); break; //mxd
+				case MenuSection.FileExport: itemexport.DropDownItems.Add(menu); break; //mxd
+				case MenuSection.FileRecent: menufile.DropDownItems.Insert(menufile.DropDownItems.IndexOf(seperatorfilerecent), menu); break;
+				case MenuSection.FileExit: menufile.DropDownItems.Insert(menufile.DropDownItems.IndexOf(itemexit), menu); break;
+				case MenuSection.EditUndoRedo: menuedit.DropDownItems.Insert(menuedit.DropDownItems.IndexOf(seperatoreditundo), menu); break;
+				case MenuSection.EditCopyPaste: menuedit.DropDownItems.Insert(menuedit.DropDownItems.IndexOf(seperatoreditcopypaste), menu); break;
+				case MenuSection.EditGeometry: menuedit.DropDownItems.Insert(menuedit.DropDownItems.IndexOf(seperatoreditgeometry), menu); break;
+				case MenuSection.EditGrid: menuedit.DropDownItems.Insert(menuedit.DropDownItems.IndexOf(seperatoreditgrid), menu); break;
+				case MenuSection.EditMapOptions: menuedit.DropDownItems.Add(menu); break;
+				case MenuSection.ViewThings: menuview.DropDownItems.Insert(menuview.DropDownItems.IndexOf(seperatorviewthings), menu); break;
+				case MenuSection.ViewViews: menuview.DropDownItems.Insert(menuview.DropDownItems.IndexOf(seperatorviewviews), menu); break;
+				case MenuSection.ViewZoom: menuview.DropDownItems.Insert(menuview.DropDownItems.IndexOf(seperatorviewzoom), menu); break;
+				case MenuSection.ViewScriptEdit: menuview.DropDownItems.Add(menu); break;
+				case MenuSection.PrefabsInsert: menuprefabs.DropDownItems.Insert(menuprefabs.DropDownItems.IndexOf(seperatorprefabsinsert), menu); break;
+				case MenuSection.PrefabsCreate: menuprefabs.DropDownItems.Add(menu); break;
+				case MenuSection.ToolsResources: menutools.DropDownItems.Insert(menutools.DropDownItems.IndexOf(seperatortoolsresources), menu); break;
+				case MenuSection.ToolsConfiguration: menutools.DropDownItems.Insert(menutools.DropDownItems.IndexOf(seperatortoolsconfig), menu); break;
+				case MenuSection.ToolsTesting: menutools.DropDownItems.Add(menu); break;
+				case MenuSection.HelpManual: menuhelp.DropDownItems.Insert(menuhelp.DropDownItems.IndexOf(seperatorhelpmanual), menu); break;
+				case MenuSection.HelpAbout: menuhelp.DropDownItems.Add(menu); break;
+				case MenuSection.Top: menumain.Items.Insert(menumain.Items.IndexOf(menutools), menu); break;
+			}
+			
+			ApplyShortcutKeys(items);
+		}
+
+		//mxd
+		public void AddModesMenu(ToolStripItem menu, string group) 
+		{
+			// Fix tags to full action names
+			ToolStripItemCollection items = new ToolStripItemCollection(this.menumain, new ToolStripItem[0]);
+			items.Add(menu);
+			RenameTagsToFullActions(items, General.Plugins.FindPluginByAssembly(Assembly.GetCallingAssembly()));
+			
+			//find the separator we need
+			for(int i = 0; i < menumode.DropDownItems.Count; i++) 
+			{
+				if(menumode.DropDownItems[i] is ToolStripSeparator && menumode.DropDownItems[i].Text == group) 
+				{
+					menumode.DropDownItems.Insert(i + 1, menu);
+					break;
+				}
+			}
+
+			ApplyShortcutKeys(items);
+		}
+		
+		// Removes a menu
+		public void RemoveMenu(ToolStripItem menu)
+		{
+			// We actually have no idea in which menu this item is,
+			// so try removing from all menus and the top strip
+			menufile.DropDownItems.Remove(menu);
+			menuedit.DropDownItems.Remove(menu);
+			menumode.DropDownItems.Remove(menu); //mxd
+			menuview.DropDownItems.Remove(menu);
+			menuprefabs.DropDownItems.Remove(menu);
+			menutools.DropDownItems.Remove(menu);
+			menuhelp.DropDownItems.Remove(menu);
+			menumain.Items.Remove(menu);
+		}
+		
+		// Public method to apply shortcut keys
+		internal void ApplyShortcutKeys()
+		{
+			// Apply shortcut keys to menus
+			ApplyShortcutKeys(menumain.Items);
+		}
+		
+		// This sets the shortcut keys on menu items
+		private static void ApplyShortcutKeys(ToolStripItemCollection items)
+		{
+			// Go for all controls to find menu items
+			foreach(ToolStripItem item in items)
+			{
+				// This is a menu item?
+				if(item is ToolStripMenuItem)
+				{
+					// Get the item in proper type
+					ToolStripMenuItem menuitem = (item as ToolStripMenuItem);
+
+					// Tag set for this item?
+					if(menuitem.Tag is string)
+					{
+						// Action with this name available?
+						string actionname = menuitem.Tag.ToString();
+						if(General.Actions.Exists(actionname))
+						{
+							// Put the action shortcut key on the menu item
+							menuitem.ShortcutKeyDisplayString = Actions.Action.GetShortcutKeyDesc(General.Actions[actionname].ShortcutKey);
+						}
+					}
+					// Edit mode info set for this item?
+					else if(menuitem.Tag is EditModeInfo)
+					{
+						// Action with this name available?
+						EditModeInfo modeinfo = (menuitem.Tag as EditModeInfo);
+						string actionname = modeinfo.SwitchAction.GetFullActionName(modeinfo.Plugin.Assembly);
+						if(General.Actions.Exists(actionname))
+						{
+							// Put the action shortcut key on the menu item
+							menuitem.ShortcutKeyDisplayString = Actions.Action.GetShortcutKeyDesc(General.Actions[actionname].ShortcutKey);
+						}
+					}
+
+					// Recursively apply shortcut keys to child menu items as well
+					ApplyShortcutKeys(menuitem.DropDownItems);
+				}
+			}
+		}
+
+		// This fixes short action names to fully qualified
+		// action names on menu item tags
+		private static void RenameTagsToFullActions(ToolStripItemCollection items, Plugin plugin)
+		{
+			// Go for all controls to find menu items
+			foreach(ToolStripItem item in items)
+			{
+				// Tag set for this item?
+				if(item.Tag is string)
+				{
+					// Check if the tag doe not already begin with the assembly name
+					if(!(item.Tag as string).StartsWith(plugin.Name + "_", StringComparison.InvariantCultureIgnoreCase))
+					{
+						// Change the tag to a fully qualified action name
+						item.Tag = plugin.Name.ToLowerInvariant() + "_" + (item.Tag as string);
+					}
+				}
+
+				// This is a menu item?
+				if(item is ToolStripMenuItem)
+				{
+					// Get the item in proper type
+					ToolStripMenuItem menuitem = (item as ToolStripMenuItem);
+					
+					// Recursively perform operation on child menu items
+					RenameTagsToFullActions(menuitem.DropDownItems, plugin);
+				}
+			}
+		}
+		
+		#endregion
+
+		#region ================== File Menu
+
+		// This sets up the file menu
+		private void UpdateFileMenu()
+		{
+			//mxd. Show/hide items
+			bool show = (General.Map != null); //mxd
+			itemclosemap.Visible = show;
+			itemsavemap.Visible = show;
+			itemsavemapas.Visible = show;
+			itemsavemapinto.Visible = show;
+			itemopenmapincurwad.Visible = show; //mxd
+			itemimport.Visible = show; //mxd
+			itemexport.Visible = show; //mxd
+			seperatorfileopen.Visible = show; //mxd
+			seperatorfilesave.Visible = show; //mxd
+
+			// Toolbar icons
+			buttonsavemap.Enabled = show;
+		}
+
+		// This sets the recent files from configuration
+		private void CreateRecentFiles()
+		{
+			bool anyitems = false;
+
+			// Where to insert
+			int insertindex = menufile.DropDownItems.IndexOf(itemnorecent);
+			
+			// Create all items
+			recentitems = new ToolStripMenuItem[General.Settings.MaxRecentFiles];
+			for(int i = 0; i < General.Settings.MaxRecentFiles; i++)
+			{
+				// Create item
+				recentitems[i] = new ToolStripMenuItem("");
+				recentitems[i].Tag = "";
+				recentitems[i].Click += recentitem_Click;
+				menufile.DropDownItems.Insert(insertindex + i, recentitems[i]);
+
+				// Get configuration setting
+				string filename = General.Settings.ReadSetting("recentfiles.file" + i, "");
+				if(filename != "" && File.Exists(filename))
+				{
+					// Set up item
+					int number = i + 1;
+					recentitems[i].Text = "&" + number + "  " + GetDisplayFilename(filename);
+					recentitems[i].Tag = filename;
+					recentitems[i].Visible = true;
+					anyitems = true;
+				}
+				else
+				{
+					// Hide item
+					recentitems[i].Visible = false;
+				}
+			}
+
+			// Hide the no recent item when there are items
+			itemnorecent.Visible = !anyitems;
+		}
+		
+		// This saves the recent files list
+		private void SaveRecentFiles()
+		{
+			// Go for all items
+			for(int i = 0; i < recentitems.Length; i++)
+			{
+				// Recent file set?
+				if(recentitems[i].Text != "")
+				{
+					// Save to configuration
+					General.Settings.WriteSetting("recentfiles.file" + i, recentitems[i].Tag.ToString());
+				}
+			}
+		}
+		
+		// This adds a recent file to the list
+		internal void AddRecentFile(string filename)
+		{
+			//mxd. Recreate recent files list
+			if(recentitems.Length != General.Settings.MaxRecentFiles) 
+			{
+				foreach(ToolStripMenuItem item in recentitems)
+					menufile.DropDownItems.Remove(item);
+
+				SaveRecentFiles();
+				CreateRecentFiles();
+			}
+
+			int movedownto = General.Settings.MaxRecentFiles - 1;
+			
+			// Check if this file is already in the list
+			for(int i = 0; i < General.Settings.MaxRecentFiles; i++)
+			{
+				// File same as this item?
+				if(string.Compare(filename, recentitems[i].Tag.ToString(), true) == 0)
+				{
+					// Move down to here so that this item will disappear
+					movedownto = i;
+					break;
+				}
+			}
+			
+			// Go for all items, except the last one, backwards
+			for(int i = movedownto - 1; i >= 0; i--)
+			{
+				// Move recent file down the list
+				int number = i + 2;
+				recentitems[i + 1].Text = "&" + number + "  " + GetDisplayFilename(recentitems[i].Tag.ToString());
+				recentitems[i + 1].Tag = recentitems[i].Tag.ToString();
+				recentitems[i + 1].Visible = (recentitems[i].Tag.ToString() != "");
+			}
+
+			// Add new file at the top
+			recentitems[0].Text = "&1  " + GetDisplayFilename(filename);
+			recentitems[0].Tag = filename;
+			recentitems[0].Visible = true;
+
+			// Hide the no recent item
+			itemnorecent.Visible = false;
+		}
+
+		// This returns the trimmed file/path string
+		private string GetDisplayFilename(string filename)
+		{
+			// String doesnt fit?
+			if(GetStringWidth(filename) > MAX_RECENT_FILES_PIXELS)
+			{
+				// Start chopping off characters
+				for(int i = filename.Length - 6; i >= 0; i--)
+				{
+					// Does it fit now?
+					string newname = filename.Substring(0, 3) + "..." + filename.Substring(filename.Length - i, i);
+					if(GetStringWidth(newname) <= MAX_RECENT_FILES_PIXELS) return newname;
+				}
+
+				// Cant find anything that fits (most unlikely!)
+				return "wtf?!";
+			}
+			else
+			{
+				// The whole string fits
+				return filename;
+			}
+		}
+		
+		// This returns the width of a string
+		private float GetStringWidth(string str)
+		{
+			Graphics g = Graphics.FromHwndInternal(this.Handle);
+			SizeF strsize = g.MeasureString(str, this.Font);
+			return strsize.Width;
+		}
+		
+		// Exit clicked
+		private void itemexit_Click(object sender, EventArgs e) { this.Close(); }
+
+		// Recent item clicked
+		private void recentitem_Click(object sender, EventArgs e)
+		{
+			// Get the item that was clicked
+			ToolStripItem item = (sender as ToolStripItem);
+
+			// Open this file
+			General.OpenMapFile(item.Tag.ToString(), null);
+		}
+		
+		#endregion
+
+		#region ================== Edit Menu
+
+		// This sets up the edit menu
+		private void UpdateEditMenu()
+		{
+			// No edit menu when no map open
+			menuedit.Visible = (General.Map != null);
+			
+			// Enable/disable items
+			itemundo.Enabled = (General.Map != null) && (General.Map.UndoRedo.NextUndo != null);
+			itemredo.Enabled = (General.Map != null) && (General.Map.UndoRedo.NextRedo != null);
+			itemcut.Enabled = (General.Map != null) && (General.Editing.Mode != null) && General.Editing.Mode.Attributes.AllowCopyPaste;
+			itemcopy.Enabled = (General.Map != null) && (General.Editing.Mode != null) && General.Editing.Mode.Attributes.AllowCopyPaste;
+			itempaste.Enabled = (General.Map != null) && (General.Editing.Mode != null) && General.Editing.Mode.Attributes.AllowCopyPaste;
+			itempastespecial.Enabled = (General.Map != null) && (General.Editing.Mode != null) && General.Editing.Mode.Attributes.AllowCopyPaste;
+			itemautoclearsidetextures.Checked = General.Settings.AutoClearSidedefTextures; //mxd
+			itemdynamicgridsize.Enabled = (General.Map != null); //mxd
+			itemdynamicgridsize.Checked = General.Settings.DynamicGridSize; //mxd
+
+			// Determine undo description
+			if(itemundo.Enabled)
+				itemundo.Text = "Undo " + General.Map.UndoRedo.NextUndo.Description;
+			else
+				itemundo.Text = "Undo";
+
+			// Determine redo description
+			if(itemredo.Enabled)
+				itemredo.Text = "Redo " + General.Map.UndoRedo.NextRedo.Description;
+			else
+				itemredo.Text = "Redo";
+			
+			// Toolbar icons
+			buttonundo.Enabled = itemundo.Enabled;
+			buttonredo.Enabled = itemredo.Enabled;
+			buttonundo.ToolTipText = itemundo.Text;
+			buttonredo.ToolTipText = itemredo.Text;
+			buttonautoclearsidetextures.Checked = itemautoclearsidetextures.Checked; //mxd
+			buttoncut.Enabled = itemcut.Enabled;
+			buttoncopy.Enabled = itemcopy.Enabled;
+			buttonpaste.Enabled = itempaste.Enabled;
+		}
+
+		//mxd
+		private void menuedit_DropDownOpening(object sender, EventArgs e) 
+		{
+			if(General.Map == null) 
+			{
+				selectGroup.Enabled = false;
+				clearGroup.Enabled = false;
+				addToGroup.Enabled = false;
+				return;
+			}
+
+			//get data
+			ToolStripItem item;
+			GroupInfo[] infos = new GroupInfo[10];
+			for(int i = 0; i < infos.Length; i++) infos[i] = General.Map.Map.GetGroupInfo(i);
+
+			//update "Add to group" menu
+			addToGroup.Enabled = true;
+			addToGroup.DropDownItems.Clear();
+			foreach(GroupInfo gi in infos) 
+			{
+				item = addToGroup.DropDownItems.Add(gi.ToString());
+				item.Tag = "builder_assigngroup" + gi.Index;
+				item.Click += InvokeTaggedAction;
+			}
+
+			//update "Select group" menu
+			selectGroup.DropDownItems.Clear();
+			foreach(GroupInfo gi in infos) 
+			{
+				if(gi.Empty) continue;
+				item = selectGroup.DropDownItems.Add(gi.ToString());
+				item.Tag = "builder_selectgroup" + gi.Index;
+				item.Click += InvokeTaggedAction;
+			}
+
+			//update "Clear group" menu
+			clearGroup.DropDownItems.Clear();
+			foreach(GroupInfo gi in infos) 
+			{
+				if(gi.Empty) continue;
+				item = clearGroup.DropDownItems.Add(gi.ToString());
+				item.Tag = "builder_cleargroup" + gi.Index;
+				item.Click += InvokeTaggedAction;
+			}
+
+			selectGroup.Enabled = selectGroup.DropDownItems.Count > 0;
+			clearGroup.Enabled = clearGroup.DropDownItems.Count > 0;
+		}
+
+		//mxd. Action to toggle comments rendering
+		[BeginAction("togglecomments")]
+		internal void ToggleComments()
+		{
+			buttontogglecomments.Checked = !buttontogglecomments.Checked;
+			itemtogglecomments.Checked = buttontogglecomments.Checked;
+			General.Settings.RenderComments = buttontogglecomments.Checked;
+			DisplayStatus(StatusType.Action, "Comment icons are " + (buttontogglecomments.Checked ? "SHOWN" : "HIDDEN"));
+
+			// Redraw display to show changes
+			RedrawDisplay();
+		}
+
+		// Action to toggle snap to grid
+		[BeginAction("togglesnap")]
+		internal void ToggleSnapToGrid()
+		{
+			buttonsnaptogrid.Checked = !buttonsnaptogrid.Checked;
+			itemsnaptogrid.Checked = buttonsnaptogrid.Checked;
+			DisplayStatus(StatusType.Action, "Snap to grid is " + (buttonsnaptogrid.Checked ? "ENABLED" : "DISABLED"));
+		}
+
+		// Action to toggle auto merge
+		[BeginAction("toggleautomerge")]
+		internal void ToggleAutoMerge()
+		{
+			buttonautomerge.Checked = !buttonautomerge.Checked;
+			itemautomerge.Checked = buttonautomerge.Checked;
+			DisplayStatus(StatusType.Action, "Snap to geometry is " + (buttonautomerge.Checked ? "ENABLED" : "DISABLED"));
+		}
+
+		//mxd
+		[BeginAction("togglebrightness")]
+		internal void ToggleBrightness() 
+		{
+			Renderer.FullBrightness = !Renderer.FullBrightness;
+			buttonfullbrightness.Checked = Renderer.FullBrightness;
+			itemfullbrightness.Checked = Renderer.FullBrightness;
+			General.Interface.DisplayStatus(StatusType.Action, "Full Brightness is now " + (Renderer.FullBrightness ? "ON" : "OFF"));
+
+			// Redraw display to show changes
+			General.Interface.RedrawDisplay();
+		}
+
+		//mxd
+		[BeginAction("togglegrid")]
+		protected void ToggleGrid()
+		{
+			General.Settings.RenderGrid = !General.Settings.RenderGrid;
+			itemtogglegrid.Checked = General.Settings.RenderGrid;
+			buttontogglegrid.Checked = General.Settings.RenderGrid;
+			General.Interface.DisplayStatus(StatusType.Action, "Grid rendering is " + (General.Settings.RenderGrid ? "ENABLED" : "DISABLED"));
+
+			// Redraw display to show changes
+			General.Map.CRenderer2D.GridVisibilityChanged();
+			General.Interface.RedrawDisplay();
+		}
+
+		//mxd
+		[BeginAction("toggledynamicgrid")]
+		protected void ToggleDynamicGrid()
+		{
+			General.Settings.DynamicGridSize = !General.Settings.DynamicGridSize;
+			itemdynamicgridsize.Checked = General.Settings.DynamicGridSize;
+			buttontoggledynamicgrid.Checked = General.Settings.DynamicGridSize;
+			General.Interface.DisplayStatus(StatusType.Action, "Dynamic grid size is " + (General.Settings.DynamicGridSize ? "ENABLED" : "DISABLED"));
+
+			// Redraw display to show changes
+			if(General.Editing.Mode is ClassicMode) ((ClassicMode)General.Editing.Mode).MatchGridSizeToDisplayScale();
+			General.Interface.RedrawDisplay();
+		}
+
+		//mxd
+		[BeginAction("toggleautoclearsidetextures")]
+		internal void ToggleAutoClearSideTextures() 
+		{
+			buttonautoclearsidetextures.Checked = !buttonautoclearsidetextures.Checked;
+			itemautoclearsidetextures.Checked = buttonautoclearsidetextures.Checked;
+			General.Settings.AutoClearSidedefTextures = buttonautoclearsidetextures.Checked;
+			DisplayStatus(StatusType.Action, "Auto removal of unused sidedef textures is " + (buttonautoclearsidetextures.Checked ? "ENABLED" : "DISABLED"));
+		}
+
+		//mxd
+		[BeginAction("viewusedtags")]
+		internal void ViewUsedTags() 
+		{
+			TagStatisticsForm f = new TagStatisticsForm();
+			f.ShowDialog(this);
+		}
+
+		//mxd
+		[BeginAction("viewthingtypes")]
+		internal void ViewThingTypes()
+		{
+			ThingStatisticsForm f = new ThingStatisticsForm();
+			f.ShowDialog(this);
+		}
+		
+		#endregion
+
+		#region ================== View Menu
+
+		// This sets up the modes menu
+		private void UpdateViewMenu()
+		{
+			menuview.Visible = (General.Map != null); //mxd
+			
+			// Menu items
+			itemfullbrightness.Checked = Renderer.FullBrightness; //mxd
+			itemtogglegrid.Checked = General.Settings.RenderGrid; //mxd
+			itemtoggleinfo.Checked = IsInfoPanelExpanded;
+			itemtogglecomments.Visible = (General.Map != null && General.Map.UDMF); //mxd
+			itemtogglecomments.Checked = General.Settings.RenderComments; //mxd
+			
+			// View mode items
+			if(General.Map != null)
+			{
+				for(int i = 0; i < Renderer2D.NUM_VIEW_MODES; i++)
+				{
+					// Check the correct item
+					viewmodesbuttons[i].Checked = (i == (int)General.Map.CRenderer2D.ViewMode);
+					viewmodesitems[i].Checked = (i == (int)General.Map.CRenderer2D.ViewMode);
+				}
+			}
+		}
+
+		#endregion
+
+		#region ================== Mode Menu
+
+		// This sets up the modes menu
+		private void UpdateModeMenu()
+		{
+			menumode.Visible = (General.Map != null);
+		}
+		
+		#endregion
+
+		#region ================== Help Menu
+		
+		// This sets up the help menu
+		private void UpdateHelpMenu()
+		{
+			itemhelpeditmode.Visible = (General.Map != null); //mxd
+			itemhelpeditmode.Enabled = (General.Map != null && General.Editing.Mode != null);
+		}
+
+		//mxd. Check updates clicked
+		private void itemhelpcheckupdates_Click(object sender, EventArgs e)
+		{
+			UpdateChecker.PerformCheck(true);
+		}
+		
+		// About clicked
+		private void itemhelpabout_Click(object sender, EventArgs e)
+		{
+			// Show about dialog
+			AboutForm aboutform = new AboutForm();
+			aboutform.ShowDialog(this);
+		}
+
+		// Reference Manual clicked
+		private void itemhelprefmanual_Click(object sender, EventArgs e)
+		{
+			General.ShowHelp("introduction.html");
+		}
+
+		// About this Editing Mode
+		private void itemhelpeditmode_Click(object sender, EventArgs e)
+		{
+			if((General.Map != null) && (General.Editing.Mode != null))
+				General.Editing.Mode.OnHelp();
+		}
+
+		//mxd
+		private void itemShortcutReference_Click(object sender, EventArgs e) 
+		{
+			const string columnLabels = "<tr><td width=\"240px;\"><strong>Action</strong></td><td width=\"120px;\"><div align=\"center\"><strong>Shortcut</strong></div></td><td width=\"120px;\"><div align=\"center\"><strong>Modifiers</strong></div></td><td><strong>Description</strong></td></tr>";
+			const string categoryPadding = "<tr><td colspan=\"4\"></td></tr>";
+			const string categoryStart = "<tr><td colspan=\"4\" bgcolor=\"#333333\"><strong style=\"color:#FFFFFF\">";
+			const string categoryEnd = "</strong><div style=\"text-align:right; float:right\"><a style=\"color:#FFFFFF\" href=\"#top\">[to top]</a></div></td></tr>";
+			const string fileName = "GZDB Actions Reference.html";
+
+			Actions.Action[] actions = General.Actions.GetAllActions();
+			Dictionary<string, List<Actions.Action>> sortedActions = new Dictionary<string, List<Actions.Action>>(StringComparer.Ordinal);
+
+			foreach(Actions.Action action in actions) 
+			{
+				if(!sortedActions.ContainsKey(action.Category))
+					sortedActions.Add(action.Category, new List<Actions.Action>());
+				sortedActions[action.Category].Add(action);
+			}
+
+			System.Text.StringBuilder html = new System.Text.StringBuilder();
+
+			//head
+			html.AppendLine("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">" + Environment.NewLine +
+								"<html xmlns=\"http://www.w3.org/1999/xhtml\">" + Environment.NewLine +
+								"<head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" /><title>GZDoom Builder Actions Reference</title></head>" + Environment.NewLine +
+								"<body bgcolor=\"#666666\">" + Environment.NewLine +
+									"<div style=\"padding-left:60px; padding-right:60px; padding-top:20px; padding-bottom:20px;\">" + Environment.NewLine);
+
+			//table header
+			html.AppendLine("<table bgcolor=\"#FFFFFF\" width=\"100%\" border=\"0\" cellspacing=\"6\" cellpadding=\"6\" style=\"font-family: 'Trebuchet MS',georgia,Verdana,Sans-serif;\">" + Environment.NewLine +
+							"<tr><td colspan=\"4\" bgcolor=\"#333333\"><span style=\"font-size: 24px\"><a name=\"top\" id=\"top\"></a><strong style=\"color:#FFFFFF\">GZDoom Builder Actions Reference</strong></span></td></tr>");
+
+			//categories navigator
+			List<string> catnames = new List<string>(sortedActions.Count);
+			int counter = 0;
+			int numActions = 0;
+			foreach(KeyValuePair<string, List<Actions.Action>> category in sortedActions) 
+			{
+				catnames.Add("<a href=\"#cat" + (counter++) + "\">" + General.Actions.Categories[category.Key] + "</a>");
+				numActions += category.Value.Count;
+			}
+
+			html.AppendLine("<tr><td colspan=\"4\"><strong>Total number of actions:</strong> " + numActions + "<br/><strong>Jump to:</strong> ");
+			html.AppendLine(string.Join(" | ", catnames.ToArray()));
+			html.AppendLine("</td></tr>" + Environment.NewLine);
+
+			//add descriptions
+			counter = 0;
+			foreach(KeyValuePair<string, List<Actions.Action>> category in sortedActions) 
+			{
+				//add category title
+				html.AppendLine(categoryPadding);
+				html.AppendLine(categoryStart + "<a name=\"cat" + counter + "\" id=\"cat" + counter + "\"></a>" + General.Actions.Categories[category.Key] + categoryEnd);
+				html.AppendLine(columnLabels);
+				counter++;
+
+				Dictionary<string, Actions.Action> actionsByTitle = new Dictionary<string, Actions.Action>(StringComparer.Ordinal);
+				List<string> actionTitles = new List<string>();
+
+				foreach(Actions.Action action in category.Value) 
+				{
+					actionsByTitle.Add(action.Title, action);
+					actionTitles.Add(action.Title);
+				}
+
+				actionTitles.Sort();
+
+				foreach(string title in actionTitles) 
+				{
+					Actions.Action a = actionsByTitle[title];
+					List<string> modifiers = new List<string>();
+
+					html.AppendLine("<tr>");
+					html.AppendLine("<td>" + title + "</td>");
+					html.AppendLine("<td><div align=\"center\">" + Actions.Action.GetShortcutKeyDesc(a.ShortcutKey) + "</div></td>");
+
+					if(a.DisregardControl) modifiers.Add("Ctrl");
+					if(a.DisregardAlt) modifiers.Add("Alt");
+					if(a.DisregardShift) modifiers.Add("Shift");
+
+					html.AppendLine("<td><div align=\"center\">" + string.Join(", ", modifiers.ToArray()) + "</div></td>");
+					html.AppendLine("<td>" + a.Description + "</td>");
+					html.AppendLine("</tr>");
+				}
+			}
+
+			//add bottom
+			html.AppendLine("</table></div></body></html>");
+
+			//write
+			string path;
+			try 
+			{
+				path = Path.Combine(General.AppPath, fileName);
+				using(StreamWriter writer = File.CreateText(path)) 
+				{
+					writer.Write(html.ToString());
+				}
+			} 
+			catch (Exception) 
+			{
+				//Configurtions path SHOULD be accessible and not read-only, right?
+				path = Path.Combine(General.SettingsPath, fileName);
+				using(StreamWriter writer = File.CreateText(path)) 
+				{
+					writer.Write(html.ToString());
+				}
+			}
+
+			//open file
+			DisplayStatus(StatusType.Info, "Shortcut reference saved to '" + path + "'");
+			Process.Start(path);
+		}
+
+		//mxd
+		private void itemopenconfigfolder_Click(object sender, EventArgs e)
+		{
+			if(Directory.Exists(General.SettingsPath)) Process.Start(General.SettingsPath);
+			else General.ShowErrorMessage("Huh? Where did Settings folder go?.." + Environment.NewLine 
+				+ "I swear it was here: '" + General.SettingsPath + "'!", MessageBoxButtons.OK); // I don't think this will ever happen
+		}
+		
+		#endregion
+
+		#region ================== Prefabs Menu
+
+		// This sets up the prefabs menu
+		private void UpdatePrefabsMenu()
+		{
+			menuprefabs.Visible = (General.Map != null); //mxd
+			
+			// Enable/disable items
+			itemcreateprefab.Enabled = (General.Map != null) && (General.Editing.Mode != null) && General.Editing.Mode.Attributes.AllowCopyPaste;
+			iteminsertprefabfile.Enabled = (General.Map != null) && (General.Editing.Mode != null) && General.Editing.Mode.Attributes.AllowCopyPaste;
+			iteminsertpreviousprefab.Enabled = (General.Map != null) && (General.Editing.Mode != null) && General.Map.CopyPaste.IsPreviousPrefabAvailable && General.Editing.Mode.Attributes.AllowCopyPaste;
+			
+			// Toolbar icons
+			buttoninsertprefabfile.Enabled = iteminsertprefabfile.Enabled;
+			buttoninsertpreviousprefab.Enabled = iteminsertpreviousprefab.Enabled;
+		}
+		
+		#endregion
+		
+		#region ================== Tools Menu
+
+		// This sets up the tools menu
+		private void UpdateToolsMenu()
+		{
+			//mxd. Enable/disable items
+			bool enabled = (General.Map != null);
+			itemreloadresources.Visible = enabled;
+			seperatortoolsconfig.Visible = enabled;
+			itemsavescreenshot.Visible = enabled;
+			itemsaveeditareascreenshot.Visible = enabled;
+			separatortoolsscreenshots.Visible = enabled;
+			itemtestmap.Visible = enabled;
+
+			bool supported = (enabled && !string.IsNullOrEmpty(General.Map.Config.DecorateGames));
+			itemReloadGldefs.Visible = supported;
+			itemReloadModedef.Visible = supported;
+		}
+		
+		// Errors and Warnings
+		[BeginAction("showerrors")]
+		internal void ShowErrors()
+		{
+			ErrorsForm errform = new ErrorsForm();
+			errform.ShowDialog(this);
+			errform.Dispose();
+			//mxd
+			SetWarningsCount(General.ErrorLogger.ErrorsCount, false);
+		}
+		
+		// Game Configuration action
+		[BeginAction("configuration")]
+		internal void ShowConfiguration()
+		{
+			// Show configuration dialog
+			ShowConfigurationPage(-1);
+		}
+
+		// This shows the configuration on a specific page
+		internal void ShowConfigurationPage(int pageindex)
+		{
+			// Show configuration dialog
+			ConfigForm cfgform = new ConfigForm();
+			if(pageindex > -1) cfgform.ShowTab(pageindex);
+			if(cfgform.ShowDialog(this) == DialogResult.OK)
+			{
+				// Update stuff
+				SetupInterface();
+				UpdateInterface();
+				General.Editing.UpdateCurrentEditModes();
+				General.Plugins.ProgramReconfigure();
+				
+				// Reload resources if a map is open
+				if((General.Map != null) && cfgform.ReloadResources) General.Actions.InvokeAction("builder_reloadresources");
+				
+				// Redraw display
+				RedrawDisplay();
+			}
+
+			// Done
+			cfgform.Dispose();
+		}
+
+		// Preferences action
+		[BeginAction("preferences")]
+		internal void ShowPreferences()
+		{
+			// Show preferences dialog
+			PreferencesForm prefform = new PreferencesForm();
+			if(prefform.ShowDialog(this) == DialogResult.OK)
+			{
+				// Update stuff
+				SetupInterface();
+				UpdateInterface();
+				ApplyShortcutKeys();
+				General.Colors.CreateCorrectionTable();
+				General.Plugins.ProgramReconfigure();
+				
+				// Map opened?
+				if(General.Map != null)
+				{
+					// Reload resources!
+					if(General.Map.ScriptEditor != null) General.Map.ScriptEditor.Editor.RefreshSettings();
+					General.Map.Graphics.SetupSettings();
+					General.Map.UpdateConfiguration();
+					if(prefform.ReloadResources) General.Actions.InvokeAction("builder_reloadresources");
+				}
+				
+				// Redraw display
+				RedrawDisplay();
+			}
+
+			// Done
+			prefform.Dispose();
+		}
+
+		//mxd
+		internal void SaveScreenshot(bool activeControlOnly) 
+		{
+			//pick a valid folder
+			string folder = General.Settings.ScreenshotsPath;
+			if(!Directory.Exists(folder)) 
+			{
+				if(folder != General.DefaultScreenshotsPath 
+					&& General.ShowErrorMessage("Screenshots save path '" + folder 
+					+ "' does not exist!\nPress OK to save to the default folder ('" 
+					+ General.DefaultScreenshotsPath 
+					+ "').\nPress Cancel to abort.", MessageBoxButtons.OKCancel) == DialogResult.Cancel) return;
+
+
+				folder = General.DefaultScreenshotsPath;
+				if(!Directory.Exists(folder)) Directory.CreateDirectory(folder);
+			}
+
+			// Create name and bounds
+			string name;
+			Rectangle bounds;
+			bool displayextrainfo = false;
+			string mapname = (General.Map != null ? Path.GetFileNameWithoutExtension(General.Map.FileTitle) : General.ThisAssembly.GetName().Name);
+
+			if(activeControlOnly)
+			{
+				if(Form.ActiveForm != null && Form.ActiveForm != this)
+				{
+					name = mapname + " (" + Form.ActiveForm.Text + ") at ";
+					bounds = (Form.ActiveForm.WindowState == FormWindowState.Maximized ? 
+						Screen.GetWorkingArea(Form.ActiveForm) : 
+						Form.ActiveForm.Bounds);
+				}
+				else
+				{
+					name = mapname + " (edit area) at ";
+					bounds = this.display.Bounds;
+					bounds.Offset(this.PointToScreen(new Point()));
+					displayextrainfo = true;
+				}
+			} 
+			else
+			{
+				name = mapname + " at ";
+				bounds = (this.WindowState == FormWindowState.Maximized ? Screen.GetWorkingArea(this) : this.Bounds);
+			}
+
+			Point cursorLocation = Point.Empty;
+			//dont want to render the cursor in VisualMode
+			if(General.Editing.Mode == null || !(General.Editing.Mode is VisualMode))
+				cursorLocation = Cursor.Position - new Size(bounds.Location);
+
+			//create path
+			string date = DateTime.Now.ToString("yyyy.MM.dd HH-mm-ss.fff");
+			string revision = (General.DebugBuild ? "DEVBUILD" : "R" + General.ThisAssembly.GetName().Version.MinorRevision);
+			string path = Path.Combine(folder, name + date + " [" + revision + "].jpg");
+
+			//save image
+			using(Bitmap bitmap = new Bitmap(bounds.Width, bounds.Height)) 
+			{
+				using(Graphics g = Graphics.FromImage(bitmap)) 
+				{
+					g.CopyFromScreen(new Point(bounds.Left, bounds.Top), Point.Empty, bounds.Size);
+
+					//draw the cursor
+					if(!cursorLocation.IsEmpty) g.DrawImage(Resources.Cursor, cursorLocation);
+
+					//gather some info
+					string info;
+					if(displayextrainfo && General.Editing.Mode != null) 
+					{
+						info = General.Map.FileTitle + " | " + General.Map.Options.CurrentName + " | ";
+
+						//get map coordinates
+						if(General.Editing.Mode is ClassicMode) 
+						{
+							Vector2D pos = ((ClassicMode) General.Editing.Mode).MouseMapPos;
+
+							//mouse inside the view?
+							if(pos.IsFinite()) 
+							{
+								info += "X:" + Math.Round(pos.x) + " Y:" + Math.Round(pos.y);
+							} 
+							else 
+							{
+								info += "X:" + Math.Round(General.Map.Renderer2D.TranslateX) + " Y:" + Math.Round(General.Map.Renderer2D.TranslateY);
+							}
+						} 
+						else 
+						{ //should be visual mode
+							info += "X:" + Math.Round(General.Map.VisualCamera.Position.x) + " Y:" + Math.Round(General.Map.VisualCamera.Position.y) + " Z:" + Math.Round(General.Map.VisualCamera.Position.z);
+						}
+
+						//add the revision number
+						info += " | " + revision;
+					} 
+					else 
+					{
+						//just use the revision number
+						info = revision;
+					}
+
+					//draw info
+					Font font = new Font("Tahoma", 10);
+					SizeF rect = g.MeasureString(info, font);
+					float px = bounds.Width - rect.Width - 4;
+					float py = 4;
+
+					g.FillRectangle(Brushes.Black, px, py, rect.Width, rect.Height + 3);
+					using(SolidBrush brush = new SolidBrush(Color.White))
+					{
+						g.DrawString(info, font, brush, px + 2, py + 2);
+					}
+				}
+
+				try 
+				{
+					ImageCodecInfo jpegCodec = null;
+					ImageCodecInfo[] codecs = ImageCodecInfo.GetImageDecoders();
+					foreach(ImageCodecInfo codec in codecs) 
+					{
+						if(codec.FormatID == ImageFormat.Jpeg.Guid) 
+						{
+							jpegCodec = codec;
+							break;
+						}
+					}
+
+					EncoderParameter qualityParam = new EncoderParameter(Encoder.Quality, 90L);
+					EncoderParameters encoderParams = new EncoderParameters(1);
+					encoderParams.Param[0] = qualityParam;
+
+					bitmap.Save(path, jpegCodec, encoderParams);
+					DisplayStatus(StatusType.Info, "Screenshot saved to '" + path + "'");
+				} 
+				catch(ExternalException e) 
+				{
+					DisplayStatus(StatusType.Warning, "Failed to save screenshot...");
+					General.ErrorLogger.Add(ErrorType.Error, "Failed to save screenshot: " + e.Message);
+				}
+			}
+		}
+		
+		#endregion
+
+		#region ================== Models and Lights mode (mxd)
+
+		private void ChangeModelRenderingMode(object sender, EventArgs e)
+		{
+			General.Settings.GZDrawModelsMode = (ModelRenderMode)((ToolStripMenuItem)sender).Tag;
+
+			switch(General.Settings.GZDrawModelsMode) 
+			{
+				case ModelRenderMode.NONE:
+					General.MainWindow.DisplayStatus(StatusType.Action, "Models rendering mode: NONE");
+					break;
+
+				case ModelRenderMode.SELECTION:
+					General.MainWindow.DisplayStatus(StatusType.Action, "Models rendering mode: SELECTION ONLY");
+					break;
+
+				case ModelRenderMode.ACTIVE_THINGS_FILTER:
+					General.MainWindow.DisplayStatus(StatusType.Action, "Models rendering mode: ACTIVE THINGS FILTER ONLY");
+					break;
+
+				case ModelRenderMode.ALL:
+					General.MainWindow.DisplayStatus(StatusType.Action, "Models rendering mode: ALL");
+					break;
+			}
+			
+			UpdateGZDoomPanel();
+			RedrawDisplay();
+		}
+
+		private void ChangeLightRenderingMode(object sender, EventArgs e) 
+		{
+			General.Settings.GZDrawLightsMode = (LightRenderMode)((ToolStripMenuItem)sender).Tag;
+
+			switch(General.Settings.GZDrawLightsMode) 
+			{
+				case LightRenderMode.NONE:
+					General.MainWindow.DisplayStatus(StatusType.Action, "Dynamic lights rendering mode: NONE");
+					break;
+
+				case LightRenderMode.ALL:
+					General.MainWindow.DisplayStatus(StatusType.Action, "Models rendering mode: ALL");
+					break;
+
+				case LightRenderMode.ALL_ANIMATED:
+					General.MainWindow.DisplayStatus(StatusType.Action, "Models rendering mode: ANIMATED");
+					break;
+			}
+			
+			UpdateGZDoomPanel();
+			RedrawDisplay();
+		}
+
+
+		#endregion
+
+		#region ================== Info Panels
+
+		// This toggles the panel expanded / collapsed
+		[BeginAction("toggleinfopanel")]
+		internal void ToggleInfoPanel()
+		{
+			if(IsInfoPanelExpanded)
+			{
+				panelinfo.Height = buttontoggleinfo.Height + buttontoggleinfo.Top;
+				buttontoggleinfo.Image = Resources.InfoPanelExpand; //mxd
+				if(linedefinfo.Visible) linedefinfo.Hide();
+				if(vertexinfo.Visible) vertexinfo.Hide();
+				if(sectorinfo.Visible) sectorinfo.Hide();
+				if(thinginfo.Visible) thinginfo.Hide();
+				modename.Visible = false;
+#if DEBUG
+				console.Visible = false; //mxd
+#endif
+				statistics.Visible = false; //mxd
+				labelcollapsedinfo.Visible = true;
+				itemtoggleinfo.Checked = false;
+			}
+			else
+			{
+				panelinfo.Height = heightpanel1.Height;
+				buttontoggleinfo.Image = Resources.InfoPanelCollapse; //mxd
+				labelcollapsedinfo.Visible = false;
+				itemtoggleinfo.Checked = true;
+				if(lastinfoobject is Vertex) ShowVertexInfo(lastinfoobject as Vertex);
+				else if(lastinfoobject is Linedef) ShowLinedefInfo(lastinfoobject as Linedef);
+				else if(lastinfoobject is Sector) ShowSectorInfo(lastinfoobject as Sector);
+				else if(lastinfoobject is Thing) ShowThingInfo(lastinfoobject as Thing);
+				else HideInfo();
+			}
+
+			dockerspanel.Height = dockersspace.Height; //mxd
+			FocusDisplay();
+		}
+
+		// Mouse released on info panel toggle button
+		private void buttontoggleinfo_MouseUp(object sender, MouseEventArgs e)
+		{
+			dockerspanel.Height = dockersspace.Height; //mxd
+			FocusDisplay();
+		}
+		
+		// This displays the current mode name
+		internal void DisplayModeName(string name)
+		{
+			if(lastinfoobject == null) 
+			{
+				labelcollapsedinfo.Text = name;
+				labelcollapsedinfo.Refresh();
+			}
+			modename.Text = name;
+			modename.Refresh();
+		}
+		
+		// This hides all info panels
+		public void HideInfo()
+		{
+			// Hide them all
+			bool showModeName = ((General.Map != null) && IsInfoPanelExpanded); //mxd
+			lastinfoobject = null;
+			if(linedefinfo.Visible) linedefinfo.Hide();
+			if(vertexinfo.Visible) vertexinfo.Hide();
+			if(sectorinfo.Visible) sectorinfo.Hide();
+			if(thinginfo.Visible) thinginfo.Hide();
+			labelcollapsedinfo.Text = modename.Text;
+			labelcollapsedinfo.Refresh();
+#if DEBUG
+			console.Visible = true;
+#else
+			modename.Visible = showModeName;
+#endif
+			modename.Refresh();
+			statistics.Visible = showModeName; //mxd
+
+			//mxd. let the plugins know
+			General.Plugins.OnHighlightLost();
+		}
+		
+		// This refreshes info
+		public void RefreshInfo()
+		{
+			if(lastinfoobject is Vertex) ShowVertexInfo(lastinfoobject as Vertex);
+			else if(lastinfoobject is Linedef) ShowLinedefInfo(lastinfoobject as Linedef);
+			else if(lastinfoobject is Sector) ShowSectorInfo(lastinfoobject as Sector);
+			else if(lastinfoobject is Thing) ShowThingInfo(lastinfoobject as Thing);
+
+			//mxd. let the plugins know
+			General.Plugins.OnHighlightRefreshed(lastinfoobject);
+		}
+
+		//mxd
+		public void ShowHints(string hintsText) 
+		{
+			if(!string.IsNullOrEmpty(hintsText)) 
+			{
+				hintsPanel.SetHints(hintsText);
+			} 
+			else 
+			{
+				ClearHints();
+			}
+		}
+
+		//mxd
+		public void ClearHints() 
+		{
+			hintsPanel.ClearHints();
+		}
+
+		//mxd
+		internal void AddHintsDocker() 
+		{
+			if(!dockerspanel.Contains(hintsDocker)) dockerspanel.Add(hintsDocker);
+		}
+
+		//mxd
+		internal void RemoveHintsDocker() 
+		{
+			dockerspanel.Remove(hintsDocker);
+		}
+
+		//mxd. Show linedef info
+		public void ShowLinedefInfo(Linedef l) 
+		{
+			ShowLinedefInfo(l, null);
+		}
+		
+		//mxd. Show linedef info and highlight given sidedef
+		public void ShowLinedefInfo(Linedef l, Sidedef highlightside)
+		{
+			if(l.IsDisposed)
+			{
+				HideInfo();
+				return;
+			}
+			
+			lastinfoobject = l;
+			modename.Visible = false;
+#if DEBUG
+			console.Visible = console.AlwaysOnTop; //mxd
+#endif
+			statistics.Visible = false; //mxd
+			if(vertexinfo.Visible) vertexinfo.Hide();
+			if(sectorinfo.Visible) sectorinfo.Hide();
+			if(thinginfo.Visible) thinginfo.Hide();
+			if(IsInfoPanelExpanded) linedefinfo.ShowInfo(l, highlightside);
+
+			// Show info on collapsed label
+			if(General.Map.Config.LinedefActions.ContainsKey(l.Action)) 
+			{
+				LinedefActionInfo act = General.Map.Config.LinedefActions[l.Action];
+				labelcollapsedinfo.Text = act.ToString();
+			} 
+			else if(l.Action == 0)
+			{
+				labelcollapsedinfo.Text = l.Action + " - None";
+			}
+			else
+			{
+				labelcollapsedinfo.Text = l.Action + " - Unknown";
+			}
+
+			labelcollapsedinfo.Refresh();
+
+			//mxd. let the plugins know
+			General.Plugins.OnHighlightLinedef(l);
+		}
+
+		// Show vertex info
+		public void ShowVertexInfo(Vertex v) 
+		{
+			if(v.IsDisposed) 
+			{
+				HideInfo();
+				return;
+			}
+
+			lastinfoobject = v;
+			modename.Visible = false;
+#if DEBUG
+			console.Visible = console.AlwaysOnTop; //mxd
+#endif
+			statistics.Visible = false; //mxd
+			if(linedefinfo.Visible) linedefinfo.Hide();
+			if(sectorinfo.Visible) sectorinfo.Hide();
+			if(thinginfo.Visible) thinginfo.Hide();
+			if(IsInfoPanelExpanded) vertexinfo.ShowInfo(v);
+
+			// Show info on collapsed label
+			labelcollapsedinfo.Text = v.Position.x.ToString("0.##") + ", " + v.Position.y.ToString("0.##");
+			labelcollapsedinfo.Refresh();
+
+			//mxd. let the plugins know
+			General.Plugins.OnHighlightVertex(v);
+		}
+
+		//mxd. Show sector info
+		public void ShowSectorInfo(Sector s) 
+		{
+			ShowSectorInfo(s, false, false);
+		}
+
+		// Show sector info
+		public void ShowSectorInfo(Sector s, bool highlightceiling, bool highlightfloor) 
+		{
+			if(s.IsDisposed) 
+			{
+				HideInfo();
+				return;
+			}
+
+			lastinfoobject = s;
+			modename.Visible = false;
+#if DEBUG
+			console.Visible = console.AlwaysOnTop; //mxd
+#endif
+			statistics.Visible = false; //mxd
+			if(linedefinfo.Visible) linedefinfo.Hide();
+			if(vertexinfo.Visible) vertexinfo.Hide();
+			if(thinginfo.Visible) thinginfo.Hide();
+			if(IsInfoPanelExpanded) sectorinfo.ShowInfo(s, highlightceiling, highlightfloor); //mxd
+
+			// Show info on collapsed label
+			if(General.Map.Config.SectorEffects.ContainsKey(s.Effect))
+				labelcollapsedinfo.Text = General.Map.Config.SectorEffects[s.Effect].ToString();
+			else if(s.Effect == 0)
+				labelcollapsedinfo.Text = s.Effect + " - Normal";
+			else
+				labelcollapsedinfo.Text = s.Effect + " - Unknown";
+
+			labelcollapsedinfo.Refresh();
+
+			//mxd. let the plugins know
+			General.Plugins.OnHighlightSector(s);
+		}
+
+		// Show thing info
+		public void ShowThingInfo(Thing t)
+		{
+			if(t.IsDisposed)
+			{
+				HideInfo();
+				return;
+			}
+
+			lastinfoobject = t;
+			modename.Visible = false;
+#if DEBUG
+			console.Visible = console.AlwaysOnTop; //mxd
+#endif
+			statistics.Visible = false; //mxd
+			if(linedefinfo.Visible) linedefinfo.Hide();
+			if(vertexinfo.Visible) vertexinfo.Hide();
+			if(sectorinfo.Visible) sectorinfo.Hide();
+			if(IsInfoPanelExpanded) thinginfo.ShowInfo(t);
+
+			// Show info on collapsed label
+			ThingTypeInfo ti = General.Map.Data.GetThingInfo(t.Type);
+			labelcollapsedinfo.Text = t.Type + " - " + ti.Title;
+			labelcollapsedinfo.Refresh();
+
+			//mxd. let the plugins know
+			General.Plugins.OnHighlightThing(t);
+		}
+
+		#endregion
+
+		#region ================== Dialogs
+
+		// This browses for a texture
+		// Returns the new texture name or the same texture name when cancelled
+		public string BrowseTexture(IWin32Window owner, string initialvalue)
+		{
+			return TextureBrowserForm.Browse(owner, initialvalue, false);//mxd
+		}
+
+		// This browses for a flat
+		// Returns the new flat name or the same flat name when cancelled
+		public string BrowseFlat(IWin32Window owner, string initialvalue)
+		{
+			return TextureBrowserForm.Browse(owner, initialvalue, true); //mxd. was FlatBrowserForm
+		}
+		
+		// This browses the lindef types
+		// Returns the new action or the same action when cancelled
+		public int BrowseLinedefActions(IWin32Window owner, int initialvalue)
+		{
+			return ActionBrowserForm.BrowseAction(owner, initialvalue);
+		}
+
+		// This browses sector effects
+		// Returns the new effect or the same effect when cancelled
+		public int BrowseSectorEffect(IWin32Window owner, int initialvalue)
+		{
+			return EffectBrowserForm.BrowseEffect(owner, initialvalue);
+		}
+
+		// This browses thing types
+		// Returns the new thing type or the same thing type when cancelled
+		public int BrowseThingType(IWin32Window owner, int initialvalue)
+		{
+			return ThingBrowserForm.BrowseThing(owner, initialvalue);
+		}
+
+		//mxd
+		public DialogResult ShowEditVertices(ICollection<Vertex> vertices) 
+		{
+			return ShowEditVertices(vertices, true);
+		}
+
+		//mxd. This shows the dialog to edit vertices
+		public DialogResult ShowEditVertices(ICollection<Vertex> vertices, bool allowPositionChange)
+		{
+			// Show sector edit dialog
+			VertexEditForm f = new VertexEditForm();
+			DisableProcessing(); //mxd
+			f.Setup(vertices, allowPositionChange);
+			EnableProcessing(); //mxd
+			f.OnValuesChanged += EditForm_OnValuesChanged;
+			editformopen = true; //mxd
+			DialogResult result = f.ShowDialog(this);
+			editformopen = false; //mxd
+			f.Dispose();
+
+			return result;
+		}
+		
+		// This shows the dialog to edit lines
+		public DialogResult ShowEditLinedefs(ICollection<Linedef> lines)
+		{
+			return ShowEditLinedefs(lines, false, false);
+		}
+		
+		// This shows the dialog to edit lines
+		public DialogResult ShowEditLinedefs(ICollection<Linedef> lines, bool selectfront, bool selectback)
+		{
+			DialogResult result;
+			
+			// Show line edit dialog
+			if(General.Map.UDMF) //mxd
+			{
+				LinedefEditFormUDMF f = new LinedefEditFormUDMF(selectfront, selectback);
+				DisableProcessing(); //mxd
+				f.Setup(lines);
+				EnableProcessing(); //mxd
+				f.OnValuesChanged += EditForm_OnValuesChanged;
+				editformopen = true; //mxd
+				result = f.ShowDialog(this);
+				editformopen = false; //mxd
+				f.Dispose();
+			}
+			else
+			{
+				LinedefEditForm f = new LinedefEditForm();
+				DisableProcessing(); //mxd
+				f.Setup(lines);
+				EnableProcessing(); //mxd
+				f.OnValuesChanged += EditForm_OnValuesChanged;
+				editformopen = true; //mxd
+				result = f.ShowDialog(this);
+				editformopen = false; //mxd
+				f.Dispose();
+			}
+
+			return result;
+		}
+
+		// This shows the dialog to edit sectors
+		public DialogResult ShowEditSectors(ICollection<Sector> sectors)
+		{
+			DialogResult result;
+
+			// Show sector edit dialog
+			if(General.Map.UDMF) //mxd
+			{ 
+				SectorEditFormUDMF f = new SectorEditFormUDMF();
+				DisableProcessing(); //mxd
+				f.Setup(sectors);
+				EnableProcessing(); //mxd
+				f.OnValuesChanged += EditForm_OnValuesChanged;
+				editformopen = true; //mxd
+				result = f.ShowDialog(this);
+				editformopen = false; //mxd
+				f.Dispose();
+			}
+			else
+			{
+				SectorEditForm f = new SectorEditForm();
+				DisableProcessing(); //mxd
+				f.Setup(sectors);
+				EnableProcessing(); //mxd
+				f.OnValuesChanged += EditForm_OnValuesChanged;
+				editformopen = true; //mxd
+				result = f.ShowDialog(this);
+				editformopen = false; //mxd
+				f.Dispose();
+			}
+
+			return result;
+		}
+
+		// This shows the dialog to edit things
+		public DialogResult ShowEditThings(ICollection<Thing> things) 
+		{
+			DialogResult result;
+
+			// Show thing edit dialog
+			if(General.Map.UDMF) 
+			{
+				ThingEditFormUDMF f = new ThingEditFormUDMF();
+				DisableProcessing(); //mxd
+				f.Setup(things);
+				EnableProcessing(); //mxd
+				f.OnValuesChanged += EditForm_OnValuesChanged;
+				editformopen = true; //mxd
+				result = f.ShowDialog(this);
+				editformopen = false; //mxd
+				f.Dispose();
+			} 
+			else 
+			{
+				ThingEditForm f = new ThingEditForm();
+				DisableProcessing(); //mxd
+				f.Setup(things);
+				EnableProcessing(); //mxd
+				f.OnValuesChanged += EditForm_OnValuesChanged;
+				editformopen = true; //mxd
+				result = f.ShowDialog(this);
+				editformopen = false; //mxd
+				f.Dispose();
+			}
+
+			return result;
+		}
+
+		//mxd
+		private void EditForm_OnValuesChanged(object sender, EventArgs e) 
+		{
+			if(OnEditFormValuesChanged != null) 
+			{
+				OnEditFormValuesChanged(sender, e);
+			} 
+			else 
+			{
+				//If current mode doesn't handle this event, let's at least update the map and redraw display.
+				General.Map.Map.Update();
+				RedrawDisplay();
+			}
+		}
+
+		#endregion
+
+		#region ================== Message Pump
+		
+		// This handles messages
+		protected override void WndProc(ref Message m)
+		{
+			// Notify message?
+			switch(m.Msg)
+			{
+				case (int)ThreadMessages.UpdateStatus:
+					DisplayStatus(status);
+					break;
+					
+				case (int)ThreadMessages.ImageDataLoaded:
+					string imagename = Marshal.PtrToStringAuto(m.WParam);
+					Marshal.FreeCoTaskMem(m.WParam);
+					if((General.Map != null) && (General.Map.Data != null))
+					{
+						ImageData img = General.Map.Data.GetFlatImage(imagename);
+						ImageDataLoaded(img);
+					}
+					break;
+
+				case (int)ThreadMessages.SpriteDataLoaded: //mxd
+					string spritename = Marshal.PtrToStringAuto(m.WParam);
+					Marshal.FreeCoTaskMem(m.WParam);
+					if((General.Map != null) && (General.Map.Data != null))
+					{
+						ImageData img = General.Map.Data.GetSpriteImage(spritename);
+						if(img != null && img.UsedInMap && !img.IsDisposed)
+						{
+							DelayedRedraw();
+						}
+					}
+					break;
+
+				case General.WM_SYSCOMMAND:
+					// We don't want to open a menu when ALT is pressed
+					if(m.WParam.ToInt32() != General.SC_KEYMENU)
+					{
+						base.WndProc(ref m);
+					}
+					break;
+					
+				default:
+					// Let the base handle the message
+					base.WndProc(ref m);
+					break;
+			}
+		}
+
+		//mxd. Warnings panel
+		private delegate void SetWarningsCountCallback(int count, bool blink);
+		internal void SetWarningsCount(int count, bool blink) 
+		{
+			if(this.InvokeRequired)
+			{
+				SetWarningsCountCallback d = SetWarningsCount;
+				this.Invoke(d, new object[] { count, blink });
+				return;
+			}
+
+			// Start annoying blinking!
+			if(blink)
+			{
+				if(!blinkTimer.Enabled) blinkTimer.Start();
+			}
+			else
+			{
+				blinkTimer.Stop();
+				warnsLabel.BackColor = SystemColors.Control;
+			}
+			
+			// Update icon
+			if(count > 0) 
+			{
+				warnsLabel.Image = Resources.Warning;
+			} 
+			else 
+			{
+				warnsLabel.Image = Resources.WarningOff;
+				warnsLabel.BackColor = SystemColors.Control;
+			}
+
+			// Update errors count
+			warnsLabel.Text = count.ToString();
+		}
+
+		//mxd. Bliks warnings indicator
+		private void Blink() 
+		{
+			warnsLabel.BackColor = (warnsLabel.BackColor == Color.Red ? SystemColors.Control : Color.Red);
+		}
+
+		//mxd
+		private void warnsLabel_Click(object sender, EventArgs e) 
+		{
+			ShowErrors();
+		}
+
+		//mxd
+		private void blinkTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e) 
+		{
+			try 
+			{
+				this.Invoke(new CallBlink(Blink));
+			} catch(ObjectDisposedException) { } //la-la-la. We don't care.
+		}
+		
+		#endregion
+		
+		#region ================== Processing
+		
+		// This is called from the background thread when images are loaded
+		// but only when first loaded or when dimensions were changed
+		internal void ImageDataLoaded(ImageData img)
+		{
+			// Image is used in the map?
+			if((img != null) && img.UsedInMap && !img.IsDisposed)
+			{
+				// Go for all setors
+				bool updated = false;
+				foreach(Sector s in General.Map.Map.Sectors)
+				{
+					// Update floor buffer if needed
+					if(s.LongFloorTexture == img.LongName)
+					{
+						s.UpdateFloorSurface();
+						updated = true;
+					}
+					
+					// Update ceiling buffer if needed
+					if(s.LongCeilTexture == img.LongName)
+					{
+						s.UpdateCeilingSurface();
+						updated = true;
+					}
+				}
+				
+				// If we made updates, redraw the screen
+				if(updated) DelayedRedraw();
+			}
+		}
+
+		public void EnableProcessing()
+		{
+			// Increase count
+			processingcount++;
+
+			// If not already enabled, enable processing now
+			if(!processor.Enabled)
+			{
+				processor.Enabled = true;
+				lastupdatetime = Clock.CurrentTime;
+			}
+		}
+
+		public void DisableProcessing()
+		{
+			// Increase count
+			processingcount--;
+			if(processingcount < 0) processingcount = 0;
+			
+			// Turn off
+			if(processor.Enabled && (processingcount == 0))
+				processor.Enabled = false;
+		}
+
+		internal void StopProcessing()
+		{
+			// Turn off
+			processingcount = 0;
+			processor.Enabled = false;
+		}
+		
+		// Processor event
+		private void processor_Tick(object sender, EventArgs e)
+		{
+			float curtime = Clock.CurrentTime;
+			float deltatime = curtime - lastupdatetime;
+			lastupdatetime = curtime;
+			
+			// In exclusive mouse mode?
+			if(mouseinput != null)
+			{
+				// Process mouse input
+				Vector2D deltamouse = mouseinput.Process();
+				if((General.Map != null) && (General.Editing.Mode != null))
+				{
+					General.Plugins.OnEditMouseInput(deltamouse);
+					General.Editing.Mode.OnMouseInput(deltamouse);
+				}
+			}
+			
+			// Process signal
+			if((General.Map != null) && (General.Editing.Mode != null))
+				General.Editing.Mode.OnProcess(deltatime);
+		}
+
+		#endregion
+
+		#region ================== Dockers
+		
+		// This adds a docker
+		public void AddDocker(Docker d)
+		{
+			if(dockerspanel.Contains(d)) return; //mxd
+			
+			// Make sure the full name is set with the plugin name as prefix
+			Plugin plugin = General.Plugins.FindPluginByAssembly(Assembly.GetCallingAssembly());
+			d.MakeFullName(plugin.Name.ToLowerInvariant());
+			
+			dockerspanel.Add(d);
+		}
+		
+		// This removes a docker
+		public bool RemoveDocker(Docker d)
+		{
+			if(!dockerspanel.Contains(d)) return true; //mxd. Already removed/never added
+			
+			// Make sure the full name is set with the plugin name as prefix
+			//Plugin plugin = General.Plugins.FindPluginByAssembly(Assembly.GetCallingAssembly());
+			//d.MakeFullName(plugin.Name.ToLowerInvariant());
+			
+			// We must release all keys because the focus may be stolen when
+			// this was the selected docker (the previous docker is automatically selected)
+			ReleaseAllKeys();
+			
+			return dockerspanel.Remove(d);
+		}
+		
+		// This selects a docker
+		public bool SelectDocker(Docker d)
+		{
+			if(!dockerspanel.Contains(d)) return false; //mxd
+			
+			// Make sure the full name is set with the plugin name as prefix
+			Plugin plugin = General.Plugins.FindPluginByAssembly(Assembly.GetCallingAssembly());
+			d.MakeFullName(plugin.Name.ToLowerInvariant());
+			
+			// We must release all keys because the focus will be stolen
+			ReleaseAllKeys();
+			
+			return dockerspanel.SelectDocker(d);
+		}
+		
+		// This selects the previous selected docker
+		public void SelectPreviousDocker()
+		{
+			// We must release all keys because the focus will be stolen
+			ReleaseAllKeys();
+			
+			dockerspanel.SelectPrevious();
+		}
+		
+		// Mouse enters dockers window
+		private void dockerspanel_MouseContainerEnter(object sender, EventArgs e)
+		{
+			if(General.Settings.CollapseDockers)
+				dockerscollapser.Start();
+			
+			dockerspanel.Expand();
+		}
+		
+		// Automatic collapsing
+		private void dockerscollapser_Tick(object sender, EventArgs e)
+		{
+			if(General.Settings.CollapseDockers)
+			{
+				if(!dockerspanel.IsFocused)
+				{
+					Point p = this.PointToClient(Cursor.Position);
+					Rectangle r = new Rectangle(dockerspanel.Location, dockerspanel.Size);
+					if(!r.IntersectsWith(new Rectangle(p, Size.Empty)))
+					{
+						dockerspanel.Collapse();
+						dockerscollapser.Stop();
+					}
+				}
+			}
+			else
+			{
+				dockerscollapser.Stop();
+			}
+		}
+		
+		// User resizes the docker
+		private void dockerspanel_UserResize(object sender, EventArgs e)
+		{
+			General.Settings.DockersWidth = dockerspanel.Width;
+
+			if(!General.Settings.CollapseDockers)
+			{
+				dockersspace.Width = dockerspanel.Width;
+				dockerspanel.Left = dockersspace.Left;
+			}
+		}
+		
+		#endregion
+
+		#region ================== Updater (mxd)
+
+		private delegate void UpdateAvailableCallback(int remoterev, string changelog);
+		internal void UpdateAvailable(int remoterev, string changelog)
+		{
+			if(this.InvokeRequired)
+			{
+				UpdateAvailableCallback d = UpdateAvailable;
+				this.Invoke(d, new object[] { remoterev, changelog });
+			} 
+			else 
+			{
+				// Show the window
+				UpdateForm form = new UpdateForm(remoterev, changelog);
+				DialogResult result = form.ShowDialog(this);
+
+				// Update ignored revision number
+				General.Settings.IgnoredRemoteRevision = (form.IgnoreThisUpdate ? remoterev : 0);
+
+				if(result == DialogResult.OK && General.AskSaveMap())
+				{
+					// Launch the updater
+					Process.Start(Path.Combine(General.AppPath, "Updater.exe"), "-rev " + remoterev);
+
+					// Close
+					General.Exit(true);
+				}
+			}
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/MainForm.resx b/Source/Core/Windows/MainForm.resx
new file mode 100644
index 0000000..1318dae
--- /dev/null
+++ b/Source/Core/Windows/MainForm.resx
@@ -0,0 +1,633 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="toolStripSeparator1.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="toolStripSeparator9.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="toolStripSeparator12.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="toolStripMenuItem4.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="toolStripSeparator2.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="toolStripSeparator3.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="menumain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>131, 17</value>
+  </metadata>
+  <metadata name="toolbar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>241, 17</value>
+  </metadata>
+  <metadata name="toolbarContextMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>159, 56</value>
+  </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="thingfilters.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
+        YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
+        0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
+        bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
+        VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
+        c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
+        Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
+        mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
+        kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
+        TgDQASA1MVpwzwAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <metadata name="statusbar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>332, 17</value>
+  </metadata>
+  <metadata name="heightpanel1.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="labelcollapsedinfo.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="modename.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="buttontoggleinfo.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="linedefinfo.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="thinginfo.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="sectorinfo.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="redrawtimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>433, 17</value>
+  </metadata>
+  <metadata name="processor.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>551, 17</value>
+  </metadata>
+  <metadata name="statusflasher.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>655, 17</value>
+  </metadata>
+  <metadata name="statusresetter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>775, 17</value>
+  </metadata>
+  <metadata name="dockersspace.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="modestoolbar.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="modestoolbar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>324, 56</value>
+  </metadata>
+  <metadata name="dockerspanel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dockerscollapser.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 56</value>
+  </metadata>
+  <metadata name="modecontrolsloolbar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>452, 56</value>
+  </metadata>
+  <metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>116</value>
+  </metadata>
+  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAABAAQAEBAAAAEAGABoAwAARgAAACAgAAABABgAqAwAAK4DAAAwMAAAAQAYAKgcAABWEAAAQEAAAAEA
+        GAAoMgAA/iwAACgAAAAQAAAAIAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AABQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFAAAAAAAAAAAAAAAAAAAAAYGBgYGBgYGBgYGBgY
+        GBgYGBgYGBgYGBgYGBgYGBhQUFBQUFAAAAAAAAAAAAAdHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0d
+        HR0dHR0dHR1QUFBQUFAAAAAiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiJQ
+        UFAAAAAoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKChQUFAAAAAvLy8vLy8v
+        Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy9QUFAAAAA2NjY2NjaGhob///////////+G
+        hob///////////////////82NjY2NjZQUFAAAAA9PT09PT3///9KSko9PT2Li4v///89PT3///9kZGQ9
+        PT09PT09PT09PT1QUFAAAABERERERET///9ERET///////////9ERERdXV3///9RUVFERERERERERERQ
+        UFAAAABLS0tLS0v///9XV1dLS0tvb2+Tk5NLS0tLS0uHh4f///9LS0tLS0tLS0tQUFAAAABSUlJSUlKX
+        l5f///////////90dHT///////////////+jo6NSUlJSUlJQUFAAAABYWFhYWFhYWFhYWFhYWFhYWFhY
+        WFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhQUFAAAABdXV1dXV1dXV1dXV1dXV1dXV1dXV1dXV1dXV1dXV1d
+        XV1dXV1dXV1dXV0AAAAAAAAAAABiYmJiYmJiYmJiYmJiYmJiYmJiYmJiYmJiYmJiYmJiYmJiYmIAAAAA
+        AAAAAAAAAAAAAABlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWUAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAwAA4AEAAMAAAACAAAAAgAAAAIAA
+        AACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAQAAwAMAAOAHAAD//wAAKAAAACAAAABAAAAAAQAYAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH19fVBPTy0sLB8dHR4cHB4cHB4cHB4cHB4cHB8cGx8c
+        HB8dHCAdHCAeHSEeHSEfHiEfHiEgHyIgHyEfHSEeHSEeHCEeHCEeHCEeHCMgHygmJT4+PmBgYHl5eQAA
+        AHp6emlpaRQSERQSERQSERQSERMSERQSERQSEhQSEhQSEhUTEhUTExYTExYUFBYUFBUTEhUTEhcVFRYU
+        FBgVFBcVExYTEhYTEhYTEhYTEhYTEhYTEicnJ0BAQF9fXwAAAG5ubi0sLBQSEhQSEhQSEv//////////
+        /yUjIzUzM////////////////4OCgv///////////////0A/PxYUFEZERP///////////3RycRcTEhcT
+        EhoXFicnJjw8PH9/fxsaGRgXFiMiIikoJ////////////////////0hHR////8HBwaChoqCio4KDhf//
+        /9HQ0KOiotjY2P///yclJHZ1df///6+urqKhofDv7////xgVFBcTEhYTEicjInl5eRgVFBgVFRgVGDY0
+        Nf///zc0MhkVExkVE////xgUEoSCgf///yYkNxkYKhgUEv///4SCgRgUEhkUEv///4SCgXVycv///xkV
+        ExkUFf///////xoVEhoVEhAQFSQgH3Z2dhgUExgVFRgVGFZUVP///xgUE////////////xgUEickIv//
+        /4SFjhgUEhgUEv///4SCgRkVFBkUEoWCgf///3Vycv///6OhoaOhovDw8YWCghkUEhkVEhkUESIfH3Z2
+        dhgUExgVFRgWGFZUVf///xgUExgUExgUEhgUEhgUEjMxRGxse////zczMhgUEv///5STmTMxPSwpNIB+
+        hP///3h2e/////////////Dv8BkVFBkVEhkVEhkUESIfHnZ2dhgUExgVFRgWGFZUVf///xgUExgUEhgU
+        EpORkRgUEisqPxgYKf///////xYTE////5iXnjw5RDw5Rf///////39+hP///xUTHlJRV////////xoU
+        ERkUERkUESIfHnZ2dhgUExgVFBgWGCcmJv///4SCgRgUEoSCgfDv7xgUEisqPRoaLzAwOvDw8GRkb///
+        /4SEjCsrQmNicv///1lZaHJyev///xsZJDEvOO/v8P///xkUERoUERkTESIfHnZ2dhgUExgVFRgVGBgW
+        FlVTUvDv7/////Dv71VSUTYzMv///////////////8XFyf///////////////4qKlQgRJnV1ff//////
+        /////5+epBAOGBEOEhkTEhkTESIfHnZ2dhgUExgVFBgWGBgWFxgVFBgUExgUEhgUEhgUEhgUEhgUEiMj
+        OR0fMiQkODo4SCQjOAkMGhgeMxEdOxAaNQsUKwoMGQcJExoXHxIPGw8OGw8OGA4NExUSFhkTESIfHnZ2
+        dhgUExgVFBgWGBgWFhgUExgUEhgUEhgUEhgUEhgUEhgUEhgUEh4eLxwdMTo3SiMjNggKFCkuOR0gKiEl
+        LRgdJhISHAgJDhwZJBMQGw8NGxAOGA4OFBgUExkTESIfHnp6ekI2ND84NUI7QkE8PkE4NUE2MkI3M0E1
+        M0I2NkA1N0I2NkI2NEE1M0I2NHBvr1pZhYGMp3V+qStGoV5ogGp3jTE1UhMbOVNLaTIpSi8oSy8pQDAq
+        PUI2Mi0sNjQvLXp6ekQ3NUM6N0M8Q0I9P0Q4NkI3M0I2NEE3N0I3QUE3Q0I2QkE3PUA5PoSAu0RGhiEg
+        XnNs5XdsyBEWNx8pXyEqTBUXKRIWKWxjhDIrTjEpSDUoQCkmNS4sOCgeLjQuLHp6ekM3NUA5NkI9P0E8
+        PkE4NUI3M0I2NEE3PYyT/43L/0Q8m3+A8oR/vUNBfBwpXXmHsTE9Z3R/nxsYListOBoeKRAQIBQWIX11
+        migtTDAoRi4nPDMwOSogMSUiMTQuLHp6ekI2NEA5NkI9P0E8PkE4NUI3M0I2NEE5OkVFXW+o5kM3S1tW
+        gzAvViAePCw8fh0iX5+y04SRqRUTKYGNpWp3hx0cLBYPHFxUcw08VyklQigiMxkTJB4WJyQbLzMuLHp6
+        ekE1Mz84NTs9PkA7PUA3NEI2NEI3M0M3NUA3OkE3PUE3PWNgjScpSCQzZC1MmzNRqChBhyY9gSU7fGpx
+        imx0hSMiNiUnMkQ0S06UsjIpQyMhLR8XKBoUJx8ZLDMuLHp6ekA0Mj43ND87QUA7PUA3NEE2MkE2MkE1
+        M0E1M0E1M0I2NGNlppCHwC4vUSk3ayI1cihGjSxMlTFLkSdDgBojSRcVM2tolkU3T4fJ+TcwRSMlMBkU
+        KRgUJxsXKjMuLHp6ekA0Mj83Nz87QT86PEA3NEE2MkE1M0E1M0E2MkI2MkI2NGtsqI2L15qT3ImBwHt2
+        o19aeU9QdjI1VENBXkE9VkpFbDo1UDUtTJG+/zAqQxkaKBwfLh8WKhgUJzIuLHp6ej00MD82Mz84Pz45
+        Oz41MkEyMM/Iz8C5vo+KjGdkhD4+UH6Cw3mFzWlzwGJkqnZ3wW5xtWBjp0BIhE5RiE9Pfz03YDMtTDAr
+        UoCc+zQrRhgaLBcXKRgUJxwcLDMuLHp6ej8zMT01NT43Pj84Oz41MkAzMc28wNzR1JyUyXRzn2FgiP//
+        /v3//3d+vWJor29xt8vr/4KJzllfjF9koz9Cb1FPfUtJdy4rUnmL5jgvSRoaLBsaKhcXJxgYKDMuLHp6
+        ej8zMT82Mz84Oz43Oj41Mj80MEE0Ms6+v5uX0mRklGBkjebk8Kei33h8w21ts3V5wP///////////4qR
+        yk5UgSsuVCoqUigrUWx1vjcuQhgbKhgZJxkZKRYYIzMuLXp6ej00MUA3ND83Pj43Oj41Mj4yMD8zM15W
+        dWBgpnJyrpKLyIaAuXVyqoN/xnVysH99v9vd5f///////////53H9md3nCMhPiMjRzg5dTAvPxcXJxsa
+        KhodKxwbJTMuLXp6ej4yMD40ND42PT02OT00MT4zLz8zMzk1SJeV7rWw/7Su/Xp4xFRXm2Ror4qEvVZU
+        glhceWlqhv////L+/4q25XiXxBkbOR4cQCQjVSIhNRYZKBwcLh4WJyQjMzQuLXp6ej4yMD40ND02PT02
+        OT00MT4zLz4zLz01NZ2b4ayp/6yo/4OC2HZ4zKmi97Cq62llmVFPeUJEZkROZkhTczM6WyIgPiIgPkE7
+        ZFVXgFFLajoyQzgxPh0XKComOTMuLHp6ejwzMD40ND43PDw1OD0zMz4zLz4zLz4yMD0zOWton7ux/np6
+        yGZptKul/I6O3IyKzH57uV9agTMwSjc2VignRz05Yj46Y1RQgX59r0E7Wo6DhZ2Znn96fEE5QDQtLHt6
+        ej4yMD0zMz00Pjw1Oj00MT4zLz4zLz4zLz8zMTwzNj8/V2lmmG9tqK6o9YmI0o2IxoqEv313smBbgjcy
+        USIiQDc0W0tIenNxs3h0pUA7W7uytauipa+nrpSQljQtLH19fT0xLz0zMzwzPT0zOT4yMj0xLz0yLj0y
+        Lj0xLz4yMEAzMT03Qm1rn1tYj5SOvYqDrm5qpYB8t3dwm2BVezIxUz45Zjw7bWxqpW9rnE5Ia6CTlaOX
+        nYd+gXRcVjo0NAAAAD0yMD0zMz4zPT0zOT00MT4zLz8zMT0zMz4zNT4zNj8zOUQ3R3Fun3dxolRUgl9d
+        h11chm1olWlihVhRdjo3Xk0/YTI0XVxbn2dlj0o/X2pbX2pVV0U5PyUiO05JSAAAAAAAAEU9PT4yPj4z
+        Oz4zNT4zNTwzNj0zOU9dqVFIYj8zOT8xNT8zMYiCpWRhk315olxZimRgiklCXUE8V0xPa09DX0E2VkI9
+        XEFBX1NDW1NGVicnRSYmQVFPUnd3dwAAAAAAAAAAAD0zPz00QTYxRo2m8D80PD80Nz4zNT0zMz8zMT8y
+        MD8zL0E1MV9bjFRSgIN9pmRej1BIcUM5XTgzUz40Ujw6XkQ6ZCkqUC40YysuVC0uVFBOVHFxcX9/fwAA
+        AAAAAAAAAGFeXldTUlZRUFZRUFZSUFZSUFdTUlhUU1dUUldTUlZSUVZSUVZSUVZSUVZSUVdSUVdSUVdS
+        UVdSUVdSUVdSUVdSUVlSUVlSUVlSUVpUU3V1dXx8fAAAAMAAAACAAAAAgAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAwAAAAOAAAADgAAABKAAAADAAAABgAAAAAQAYAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH19fWpqakhISDQ0NC4uLisrKyoqKioqKioqKioq
+        KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
+        KioqKioqKioqKioqKioqKioqKioqKioqKioqKi0tLTY2NkxMTGdnZ3l5eX9/fwAAAAAAAH9/f3JyclBP
+        TykoJx4cHBwaGRwaGRwaGRwaGRwaGRwZGRwaGRwaGRwZGRwZGRwaGR0aGR0aGh0aGh0aGh4bGh4bGh4c
+        Gx8cGx8cHB8dHB8eHR8eHR8dHR8dGx8cGx8cGx4bGh8bGh8bGh8bGh8bGh8bGh8bGiAcGyEfHiMjIy0t
+        LUVFRWZmZnt7ewAAAAAAAHh4eFtbWxcVFRQSERQSERQSERQSERQSERQSERMSERQSERQSERQSEhQSEhQS
+        EhQSEhUTEhUTExUTExYTExYUFBYUFBYUFBUTExUTEhUTEhYUFBcVFRYUFBgWFRgVFBcVExYUExYTEhYT
+        EhYTEhYTEhYTEhYTEhYTEhYTEh8cGiIhISwsLEpKSm1tbQAAAAAAAG1tbSwqKRQSEhQSEhQSEhQSEhQS
+        EhQTEhUTEhUTExUTExUTExUUExUUExYUExYUExYUExUTExUTEhUTEhYUExcVFRwaGiYlJC0sLDU0NEJB
+        QUlISEA/PxcWFRYUFBgVFRgVFBcVFBcUExYUEhcUEhcTEhcTEhcTEhcTEhYTEhoXFiIhITQ0NFpaWgAA
+        AH9/f1FRUBUTEhUTExUTExUTExYUE0FAQOLi4vDw8MXExP///8TExDEvLxUTE7e3t///////////////
+        /////////9DQ0EhHR////////////////+jo6KGhoUREQy8tLR8dHf///////////////////7e2tTQx
+        MBcUExcUEhcTEhcTEh4aGi0tLVFRUQAAAH5+fhsaGRgXFiAfHyMiIikoJ01MTPPz87e3t0lJSElISFJS
+        Us7NzczMzCwrKkhHRv///318fBEUFhEVFxIWGBMWGRQWGRkYGP///1JQUBgWFhcVFYaGhfLy8qmoqBcV
+        FRsZGP///3d3djc2NRoXFzQxMdTT08XFxBgVFBgVFBcUExcTEhYTEiYjIk9PTwAAAHd3dxkUFBgVFBgV
+        FRQWGBgVFqinp+Li4hgUExkVExkVFBkVFIyKicXExBgUExgUEoyJifHx8kZDUiclOB4dLxgXJhkUExkU
+        E////1JPTRgUEhgUEhkUEmFeXP///0RAPxkVFP///1NPTxoUExkUFBkUFnR+kP///xkVFBoVEhoVEhsV
+        EhAQFSQgH09PTwAAAHNychgVFBgVFBgVFhQWGRgVF8XFxYuKiRgUExkVExkVExkVE4yKicXExBgUExgU
+        EhgUEtXV2MrKzxkaLRgUEhkUEhgUEhgUEv///1JPTRgUEhgUEhkUEhkUEvHw8H57ehkVFf///1NPThkV
+        ExkUFBkUF5qfr/Hw8RkUFBkUEhkVEhkVEhkVEyMfH09PTwAAAHNychgVFBgVFBgVFhMWGRgVF8XExYyJ
+        iRgUExgUE////////////8XExBgUEhgUEhgTFVBQYvHx83t7hBgUEhgUEhgUEhgUEv///1ZUWBkXHRcV
+        GRYUFBkUEsbExIyKiRkUFP///6mnp4yJiYyKiZqYmf///3BsbhkUFBkUEhkVEhkVEhkVEiIfH09PTwAA
+        AHNychgUExgVFBgVFhQWGRgWGMXFxYyJiRgUExgUExgUExgUExgUEhgUEhgUEhgUEjEwRCQlO3t8hf//
+        /0JAPhgTEhgTEhgUEv///2hmbzY0PzYzPickLy4rNMnIypKQlB0aIP///6inp4yKiYyKieLi4tjZ4Cgj
+        JRkUFBkUEhkVEhkVEhkVEiIfHk9PTwAAAHNychgUExgVFBgVFhQXGBgWGMXFxZqYmBgUEhgUExgUEhgU
+        EjUxMENAPxgUEhgUES4rQR8gNQsLFcLCxNLS0hgTEhgUEi8tPP///21rdEE+RT46RDg1PzczOv///3x5
+        fiknLv///1JQVhEPFhkVFCcjJvLy9HBsbhkUFBkVEhkUERoUERkUESIfHk9PTwAAAHNychgUExgVFBgV
+        FhQXGBgWGJqZmeLi4iYjIRgUExgUEhgUEqinpsXExBgUEhgUEicnPBgYKw8PGysqMfHx8oqLkxYTFDQx
+        Rv///21qdT47R0E9SD46R5ybov///0lIViwqOf///1ZTWxgVIhEOGREPG+Xl6IyJixkUExoUERkUERkU
+        ERkUESIfHk9PTwAAAHNychgUExgVFBgVFhQXGBgWGCYkJPHw8MXExDUxMCYjIX17ev///2BdXBgUEjUx
+        MGFgcFdXZk5PWkxMU6enrP///0hHUjAuQv///4GAiWZkcmVjcrGwuP///3V1ghwcMRcYKv///4B+hFZU
+        XFBOV7S0t////y0sNRkUExoUERkUERkUERkUESIfHk9PTwAAAHNychgUExgUExgVFhQXGBgWGBcVFTUy
+        MainpsXExMXExMXExGBdXBgUEhcTEm5sa8vKz8fHzcXFycbGysXFycbGyn59hyYmPMXFysbGysXFycnJ
+        z66ttlhYaBscMBkaLB8eLcbFycrJzMjHycXEx6alqkFBUxAOGQ4NFRMSFRoUERkTERkTESIfHk9PTwAA
+        AHNychgUExgUExgVFhQXGBgWGBcVFRgUExgUEhgUEhgTEhgUEhgUEhgUEhgUEhgUEiopOh0eMxwcLxkZ
+        KBYXKyAgMzg1SC0rPiAfMA8PHg8UIA8bNhAbNRIcNQ4XLwkRJRUUJBAQHSkoOiMfKBQRHRIPHBAPIg8O
+        Gg8OGA8OFBAOFBkTERkTESIfHk9PTwAAAHNychgUExgVFBgVFhQXGBgVFxcVFRgUExgUExgUExgUEhgU
+        EhgUEhgUEhgUEhgUEhwYGyMjORobLx8eMx8eMx8fMzw5SS0sPiAgLwgLFwgKExIdOw8bNwsVLQ8YMwoT
+        KQkNGwcLFy0rOx8dKBUSHA8PHA4OHw8OGQ8OGA8OFRAPFRgTEhkTESIfHk9PTwAAAHNychgVFBgVFBgW
+        FhQXGRgWGBcVFRgUExgUExgUEhgUEhgUEhgUEhgUEhgUEhgUEhgUEiIiMyAgNx0dMR8eMx0eMTYzRicm
+        PBsbKggKEx8hKBMbMA4XMA8YMhEZNAoTJwgLGAgKFCAdLSMgLBgTHA4PHA8NHBAOGg8NGA8OFQ4OFBkT
+        ERkTESIfHk9PTwAAAHd2dkA3NEA3NEA5PDU+QkE7QEA7OkA3NEE2MkE2MkE2MkE2MkE2MkE3MEE1M0A1
+        MUA1MUA1MUA1MUxKYFBQhl9cjYN+u0tMiDw+ZltidnmGpn+Lpzg+a3mFnTxDXHJ9kTc2UBoaKiQkPGtj
+        gj8xTR4xUigkSC4oRysmQSckNCknM0Q0LUQ0LTQvLU9PTwAAAHd2dkA3NEA3NEA5PDU+QkE7QD45OEI2
+        NEE2MkE2MkE2MkE2MkE2MkE1M0E1M0E1M0E1M0E1M0E2MkE1M0E2MqigyXd1sW1rmSorUY2dumhzpTI1
+        YiZAlIGMpyY5coucsTU5VhMYLRseOnFqjTUrSRtJaDEnSzMrSjIpQy4oOScmMEU2LS8uODQvLU9PTwAA
+        AHd2dkI2NEE4NUA5PDY/Q0E7QD86OUI2NEI3M0I3M0I3M0I3M0E3N0E5OkI3OkI3OUI3OUM3N0E3N0M3
+        N09GWo6IuVlZmVhWhBkgS3eGtBUaQRUZPDBGtjRFiClHlIKPqS0wTBQWLhYaM312oTgsSEiFpSslSC8n
+        RTEpQCkmNiknLS4tNzg3OzQuLU9PTwAAAHd2dkM3NUI5NkE7PDg+Q0I9P0I6OkM4NEI2NEI3M0I2NEE3
+        N0E2QEI0UEI2SEI3Rz0xTUI3P0I3P0I2Qn55tlpcolhTomlg2H9+7ElMlhgcRRcZNxUXLxwhSBYbPGBp
+        fRUXKRASKhQWKJePuEEyTnS23y0nRi4nQi8oPSonNysqNCgoNiYhMDQuLE9PTwAAAHd2dkE4NEE4NUA5
+        PDg+Q0E7QD86OUE4NUI3M0I3M0A3NEI2PEE2RnyX7Tw0XIzG/0A1VTQrampl2IOA7m9xxVZVgTA4YICM
+        rlBVhk5Yh254mjA1ThYZLigsNxscKhUWJBcYJhYXJRYXJZqRvDsxT47J/y0pRjEoQi0mOy0sNiUaLisq
+        NCglNDQuLE9PTwAAAHd2dkI2NEE4NUA6Ozc9QkE7QD86OUI2NEI3M0I3M0E4NUA3OkM5SnzL9nF75zMw
+        Z0I0UEE3RIR+rW5oozk2XRonVY+ds4STuhkYOJGjyIWQrmNsgBgVKxUSIigpNyAhKxodJSUoLSUoLZWO
+        uTovT5W8/y4qRzAnQScjNi0uOCAYKSUbLCUjLzMuLE9PTwAAAHd2dkE1M0E4NUE6PTc9QkE8Pj46OT85
+        NEI2NkI3M0M4NEI3OUI4RS87XV+lzXhwtkI3R05Jdjs2XS0sTiIgPjM7WTZJjSEnaIWUtJ+x0I2dtEtV
+        ZxUSK4SRqXuHmWFofDY4UBUPGhYPHGFfiT8yUo6n/ysqRC4mPSokNTIwNh4XJhwWJyMaLjMuLE9PTwAA
+        AHd2dkE2MkA3NEA5PDU+QkE8Pj86OUI2NEI3M0I3M0I3M0E4NUI4OEI3P0A2QkA3QUM4QFpYgjEyTiIh
+        QyMsUi9PmzZSpi9LnytGlis+d32Kqh0mUh0mUZaluISOn2NqfTI2UhkSJyMlMFJKaT8wUH6T9jY0SC0o
+        PSMgLx4XJhwWJxsVKB8ZLDMuLE9PTwAAAHd2dT82MkA3ND85OjY8QUA6Pz45OEE1M0E2MkE2MkE2MkE1
+        M0I2NEI2NkE2OEE2OEE2OIKBv2dkkS8vUxsdQCE2bSVAiidInjdcuDFNmixGki9LkjBOlS9DfR8pUVxk
+        dScrPSYrOmZgiUM3S0IzUnyL5zIuQSglNSEgKhkUIxsYKBkVKB8ZLDMvLE9PTwAAAHd2dUA0Mj82Mz84
+        OzQ9QUA6Pz45OEE1M0E2MkE2MkE2MkE2MkE2MkE1M0E1M0E1M0I2NFVbkKKc44+HvDU2WBofRh0waRgu
+        YiE/hidEjiZFkChDhi1GjCRBfhwtYBUaOxYUMRoYNVpXhEEzSz0wUHuF0zQrRiMgLx4gKxoUJRgUJxkV
+        KBoWKTMuLE9PTwAAAHd2dUA0Mj82Mz84OzQ9QUA6Pz45OEA3NEE2MkE1M0E2MkE1M0E2MkE2MkE2MkE1
+        M0I2NGFinmxytZWS4ZqT3IJ+wF5YkVxXhEpEZzs0WTMyWSw0WSkrSSgmQyonQDw2VVJOckQ9Xj0yTDgu
+        TC4mS2RmrDEpSB0dLRkaKBkZKRoUJRoWKRcTJjIuLE9PTwAAAHd2dT8zMT41Mj02OTQ6Pz85Pjw2Nz41
+        Mj8zMU1FRlpXWVhRVkAyMz8zMUA1MUE1M0Q7OHJvnW53wVRenoeJ0JCN3I6K1oODz4SCyIJ/xHJvrXt2
+        rVJXlGNilFtYik5JcERAZDw0UzkwSzIsSy8oTVFLhjEpRyUiMhcZKx0dLxwaLRkVKBkZKTIuLE9PTwAA
+        AHZ2dT00MT00MT02OTQ6Pz84PTw3Nj41Mj8zMayhqdnP1c7HzMO2uJmMlHhym2NehUJDWGdqlszX/+Hn
+        /2R0t2BnrExSjVddoG91vG91tmNopVlgn0dQj1FVj1BRi01Mfj89ZzYwUzEvTDczVjwyVkA0aDouTCkm
+        NhcXKRkZKRoaLBgWKRoaKjMuLE9PTwAAAHZ1dT00MT41Mj03ODY6P0A5Pj42Nj00MT8zMUE0Mubb3uLW
+        3NPGyJiQxX58qltZh2Jhif///v///////5Wj2G5zuF9lsG91wm1yqZeszHeDyV5ll1Zdj19ko1ZalUFB
+        b0BDb0lJeVFOey0tUTEsWTswYjcuSSMiMhoaLBYWJhsaKhcXJxgYKDMuLE9PTwAAAHZ2dT8zMT40ND83
+        ODU5Pj84PT42Nj8zMT8zMUM0Msm7vd/NzpiSx56Y0Xx7uWFgjFVWcP///////3qDvJWU2G91vnJyvnt+
+        wldtkP///////v///4WIv11jjlNajFBSiDM7ai4xXjQzWzEuVTQuVzsxWzwwThkYLBYYKhcXJxsaKhcX
+        JxgYJjMuLE9PTwAAAHZ1dT8zMT41Mjw2NzU4QD44PTs1Nj8zMT4zLz8zMUA0Msm7vY+KwZSQ0WVhklNV
+        hWJmm3N3uIyOzoWBwnh1vXZ1vW1usoiHx3mEn/////////////////3+/2Nvn0FJbjM0ViYnSSooTCwr
+        VSssWDAqUzUqRBcXKRYWKBcXJxwZKBoaKBgaJTMuLU9PTwAAAHZ1dT00MT0zMz03ODU4QD03PDs1Nj00
+        MT4yMD4yMD0zMz01NpGOxXBvuUJGdk9VfmtsnoB9r29spHl0sYB/w3h3u2Zlo318vmVqkf//////////
+        /v///////+j//42r2jg6XSAiQSAgPicmRignUysnUCwnRBgYKhgYKBgYKBcXJxQUIhkYITMuLU9PTwAA
+        AHZ1dT4yMD00MTw1ODQ3Pz43PD01Nj0zMz4zLz4zLz0zMz0zObiz+Kqm+Kym/ci+/8a7+Y2JymhprV5d
+        nXl6xG9vq2tnok9OgFlZd29zpP/+/////////////+j//42x4X6fzJi14R0eOh0fPh0fTx8eRh8gOhcX
+        KRkZKRsbLRsWJSIaKyYlNTMuLU9PTwAAAHZ1dT4yMD00MTw1ODQ3Pz02Oz01Nj8zMT4zLz4zLz0zMz00
+        N3l2rqaf9LKs/p6d/aah/H9+zkpUoXFwwGNntqSc4oiBumZjlEhIbFZbfFJSZGdtgPr+/+n+/7Lt/GOD
+        riEqSw4YNhsdOyIdPSoqWiMhRSIfOBkZKRYaLBsbLRoUJR4eLCAgMDQuLU9PTwAAAHZ1dT4yMD00MTw1
+        ODQ3Pz02Oz01Nj00MT4zLz4zLzwzMD0yND0yQpSP3qul/qWh/6qm/4OC2GFls4uK4KOg9sO796Sb3m1p
+        nVRSfEREaEVJbEhNYkRRZ0JQbEFPczY/YCUmQh8dOx0bOTErTkNJdjUyS1ZUcUY/WjgyQzkxPCUhLSAa
+        KyIeMTMuLE9PTwAAAHZ1dTkyLzwzMD41ODQ3Pz02Ozw0NT4yMD4zLz4zLz4zLz4yMD4zNlJJXpyV2Lqy
+        /7ex/omK4lthtICAzKSf9JSV8Kmj8JePznVvpG1pnUVEbjQ2VDM6Wy83VS8yUSgoUC8uVTQzWjAsTzIx
+        WXaVyoF9rkxHZzs1Tk1HYG1oal9ZXiwjLSIeMTQuLE9PTwAAAHd2djwzMD0zMzw1ODU2QD02Ozw0NT4y
+        MD4zLz4zLz4zLz4zLz8zMT8yOl1Zdqae37Ss8nx7w2dqtYmGzrGr+pyZ7o6L042LzYWDxXt5u3BmkEtG
+        ZjQvSjEyTjAuTB8ePjk3W0Q/ZkM/aUhFc5S97nl2pEtGZkI8W52SlKeipJWRl4aFh0dCRDQtLE9PTwAA
+        AHd2dj4yMD0zMz00NzY1Pj01PDw0NT00MT4zLz4zLz4zLz4zLz4yMD8zMT0zOT0yQpWMt25ro2trp2dp
+        qqul9KWg742J0YuHyIiGwoOAvn17t3lxmlJNbTMsTSsnRCQhQTQvTkdCb0tIeVtZjaDQ+nd0ojw3V4F7
+        jrSrrq6nqqqiqaWhppiZnTQtLFFRUQAAAHd2djwzMDwyMjwyODU0Pjw0Ozw0NT4yMD0xLz0yLj0yLj0y
+        Lj0yLj0xLz4yMD00MT8zM2VmjGZkkmRhmF9fjZ2a0oyHxZWNwoB8t3l3s357sntxn29mjkxFaDgxVCYl
+        Rzs6YktIeUpIfGFhoYjK82Jdij84WZuPla+jqbGnra6gpKGWmWpfYTUuLVZWVgAAAHt6ejo0LzwzMDwy
+        ODUzPz0yOjw0NT4yMD0xLz0xLz0xLz0xLz0yLj4yMD4yMD8zMT0zMz0zM2FhkV9clE1OiFZYgZePuIyD
+        q3t3qHFtqH97toB6r3hunGdfhEQ9YC0rTz44YUE6ZTk6bFRWlnu5719bhUE7WoJ2fJqPkpuQmJmOlm5g
+        ZHddVjw2NWNjYwAAAAAAAD0yMD0zMzwyODUzPz4zOzw0NT4yMD40LT40LT4yMD8zMT00MT0zMz4zNT4z
+        NT4zNj4zNjsyRn54qW1pnV5ckFRXhGhmil1chGNfkGtomoiBrmZeh1hQdU5EaDYxWDk0Wzg0WDE1ZktO
+        knCk515XgktDYoZ5e4h8fGlaXmdTWFxLTiclO09KSXZ2dgAAAAAAAEA3NT0zMzwyODcyQT4zPTwzNj0y
+        ND0zMz0zMz0yNDwzNjwzNj8zOTowQF9txYiKykI0Pz8yNH96mXRwoV5bjVZXinJwmlxbjVlXi1ZUglpZ
+        eVpYdUhJZTo3V0hAaVJFZTAsUCwqVDo4YnWV6FRNck1AWk8/V1hFVlhFVFBEViYlPyUkPmtpaH9/fwAA
+        AAAAAAAAAEU+PjwzNjMzQTwyPj0zOTwzNjwzNjwzNj0zOTYvRHeN5Xt2qT81Oz4zNj80N0AzNT8zMz8y
+        MIV+qYF7pG5pnGpnmHl2pGFdjmNei2JbgEQ/Xzk0Uzw1Vj1BWU9JXEk9WUxBW0ZCW3N/3zw4VURBV0VC
+        WEA9UyAiQCQjQyknRWdlaX9/fwAAAAAAAAAAAAAAAAAAAD0zOTYzQj00QT0zPzwzPXyEqXWX4zItSDwy
+        OD4yOD4zNj4zNT0zMz8zMz8zMT8yMD8zLz0zM1tahmJdkFtZh3RvlnRvomNekVZTgUlBaUE6Wzw1Vjk0
+        VDs2UTw2T0JAXkg9XV5cvCQlSyQnTSYtVCgqTCosSzIwTWppbgAAAAAAAAAAAAAAAAAAAAAAAAAAAHNx
+        ckxLUnqHnWJ4okVBTUtCR0lBRUlCQ0lCQklCQkxCQktDQUtCQEtCQEtCP0tCP0pCP0tDP0pDP1xZalpY
+        cFRSamtkfHVvg2pkeGJYck5HXUdBVUVAU0Q/UElDVExEWExFWkVBdTo6UUdJaElJZklJZk5LZwAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAA
+        AAAAAAAAgAAAAAAAAACAAAAAAAAAAIAAAAAAAAAAgAAAAAAAAACAAAAAAAAAAIAAAAAAAAAAgAAAAAAA
+        AACAAAAAAAAAAIAAAAAAAAAAgAAAAAAAAACAAAAAAAAAAIAAAAAAAAAAgAAAAAAAAACAAAAAAAAAAIAA
+        AAAAAAAAgAAAAAAAAACAAAAAAAAAAIAAAAAAAAAAgAAAAAAAAACAAAAAAAAAAIAAAAAAAAAAgAAAAAAA
+        AACAAAAAAAAAAIAAAAAAAAAAgAAAAAAAAACAAAAAAAAAAIAAAAAAAAAAgAAAAAAAAACAAAAAAAAAAIAA
+        AAAAAAAAgAAAAAAAAACAAAAAAAAAAIAAAAAAAAAAgAAAAAAAAACAAAAAAAAAAIAAAAAAAAAAgAAAAAAA
+        AACAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADgAAAAAAEAAPAAAAAABwAA8AAAAAAfAAD///////8AACgA
+        AABAAAAAgAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+fn53d3dr
+        a2teXl5UVFRNTU1LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tL
+        S0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tL
+        S0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tMTExRUVFZWVlkZGRxcXF8fHx/f38AAAAAAAAAAAAAAAAAAAAA
+        AAB9fX1xcXFaWlpCQkI0NDQuLi4rKysqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
+        KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
+        KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiotLS0xMTE6OjpOTk5nZ2d5eXl/f38A
+        AAAAAAAAAAAAAAB/f39ycnJUVFQ1NTUjIiIeHBwcGhocGhkcGhkcGhkcGhkcGhkcGhkcGRkcGhkcGhkc
+        GhkcGRkcGRkcGRkcGhkdGhkdGhkdGhodGhodGhoeGxoeGxoeGxoeHBsfHBsfHBsfHBwfHRwfHR0fHh0f
+        Hh0fHR0fHRwfHRsfHBsfHBseGxoeGxofGxofGxofGxofGxofGxofGxofGxofGxogHBshHx4hICAjIyMt
+        LS1FRUVmZmZ7e3sAAAAAAAAAAAAAAAB6enpfX18uLCwWFBQUEhEUEhEUEhEUEhEUEhEUEhEUEhEUEhET
+        EhEUEhEUEhEUEhEUEhIUEhIUEhIUEhIUEhIVExIVExMVExMVExMWExMWFBMWFBQWFBQWFBQWFBMVExMV
+        ExIVExIVExMWFBQXFRUWFBQXFRQYFhUYFRQXFRMXFBMWFBMWExIWExIWExIWExIWExIWExIWExIWExIW
+        ExIWExIWExIfHBoiISEsLCxLS0twcHB/f38AAAAAAAAAAABxcXEvLS0UEhIUEhIUEhIUEhIUEhIUEhIU
+        EhIUExIVExIVExIVExMVExMVExMVExMVFBMVFBMWFBMWFBMWFBMWFBMVExMVExMVExIVExIVExIWFBMX
+        FRUcGhohIB8mJSQtLCw1NDQ9PTxCQUFJSEhAPz8nJSUXFhUWFBQYFRUYFhUYFRQXFRQXFBMWFBMWFBIX
+        FBIXExIXExIXExIXExIXExIXExIWExIaFxYiISE4ODhiYmJ8fHwAAAAAAAAAAABUVFMVExIVExMVExMV
+        ExMVExMVFBMWFBMWFBQWFBRFQ0NUU1JUUlJTUlIkIiIUEhEUEhEVExM2NDRXVVVYV1dbWlpdXFxhYF9k
+        Y2NqaWlvbm5zcnJRUFBIR0dgYGB2dnZzcnJvbm5paGhjYmFJSEhEQ0NHRkZEREMvLS0fHR02NTRUU1JW
+        VFNWVFNWVFNVU1JGQ0IXFBMXFBMXFBMXFBMXFBIXExIXExIXExIeGhowMDBXV1d3d3cAAAAAAAB/f38s
+        KioWFRQXFRUXFRUXFRQWFBQVExMUExJEQkLg4OD////R0dHEw8P///////+hoaFJSUhDQ0KdnJz/////
+        //////////////////////////////9dXFwfHR2FhIT///////////////////////+dnZ0pJyYnJSU1
+        NDRFREScm5v////////////////////////g4OBlY2IYFRMYFBMXFBMXFBMXFBIXExIXExIrKilRUVF0
+        dHQAAAAAAAB+fn4bGhkYFxYdGxsgHx8jIiIpKCcvLi5OTk7y8vLZ2dlra2tJSUhJSEhHRkaampn///+t
+        ra0sKyo0MjLh4eHh4OAoJiUWFhYRFBYRFRcSFhgTFhkTFhkUFhkZGBiEgoL///8YFhUYFhYZFxcmJSSY
+        l5f////R0NAZFxYXFRUbGRiPjo7///9JSUk3NjUlIyIaFxc2MzPR0ND///83NTQYFRQYFRQXFBMXFBMX
+        ExIWExImIyJPT09zc3MAAAAAAAB3d3cZFRQcGRgcGRkaFhYgKC0dICUZFhWysbH///9HREMZFRQZFRQZ
+        FRQZFRQYFRPBwMDBwMAYFBMYFBNVUlH///+Xl54iIjQoJzckIzQfHi8bGigYFiAYFBUYFBKEgoH///8Z
+        FBIZFBIYFBIYFBIbFxV2c3L///+EgoEZFRMYFBKHhIv///8ZFBIbFhUcFxYcGBgaFRVAQ0////+EgYEa
+        FRQaFRMaFRIaFRIZFRMRERUeHCBPT09zc3MAAAAAAABzcnIYFBQYFRQYFRUXExQeJywcHiQXFBT///+j
+        oaEYFBMZFRMZFRMZFRMZFRMZFRPCwMDBwMAYFBMYFBIYFBKTkpL///9jYnAqKT4eHjIWFSAXExQYFBIY
+        FBIYFBKEgoH///8YFBEYFBEYFBEZFBIZFBIZFBLCwMDw7+8ZFBMYFBGHhY3///8YExEZFBMZFBMZFBQX
+        EhMkKTj///+EgYEZFBQaFBIaFRIaFRIaFRIWFBQeHCFPT09zc3MAAAAAAABzcnIYFRQYFRQYFRUXExQe
+        Jy0cHyVVU1P///+EgoEYFBMZFBMZFRMZFRMZFRMZFRPCwMDBwMAYFBMYFBIYExEnJCXi4uTj4+UzM0cW
+        FykVEhQZFBEYFBIYFBIYFBKEgYD///8XExIXExIXExIXExEYFBEYFBGEgoD///9HQ0IYExGIhY////8Y
+        ExEZFBMZFBMZFBQXExRfY3D///+EgYEaFBQaFBIZFBIZFRIaFRIaFRIkISFPT09zc3MAAAAAAABzcnIY
+        FBMYFBMYFRUXExQeKC0bHyVVUlP///9WU1IYFBMYFBNGQ0LBwMDBwMDBwMDw7+/BwMAYFBIYFBIXExEi
+        ICliYnH///+VlZ4RER0WEhIYFBIYFBIYFBIYExGFg4P///8nJCsmJCokIikeGyEXFBcZFhdYVVb///9W
+        U1MXExGIhY7///8YFBAZFBMZFBMoJCR0cnPx8fLw8PAoIyMZFBMZFBIZFRIZFRIZFRIZFBEpIx9PT09z
+        c3MAAAAAAABzcnIYFBMYFBMYFRUXExQeKC0cHyVVUlP///9WU1IYFBMYFBMoJCJWU1JWU1JWU1JWU1JG
+        Q0IYFBIXExEdGRwvLUEoJz6WlqD///9OTVITEBIYFBIYExIXExEaFhWQj5T///82Mz82Mz80MT0yLzon
+        JC8rKDFiYGf///9cWl8cGR+Fg4j////////////////////////U1dpKR04ZFBQZFBMZFBIZFRIZFRIZ
+        FRIZFBIpIh5PT09zc3MAAAAAAABzcnIYFBMYFRQYFRUXExQeKC0cHyVVU1P///9WU1IYFBMYFBMYFBMY
+        FBMYFBIYFBIYFBIYFBIYFBIWEg8hHicvLkQkJTokJDPf39/f3t8eHCIVEhMYExIWEg8mIyqVlJv///87
+        OEQ7OEM6N0I6N0I2Mz00MDl4dnv///9iYGYmJCyJh4z///9UUlhRUFRVUlJ1cnLR0NHx8fNJRk0ZFBQZ
+        FBMZFBIZFREZFBEaFBEaFBEpIR5PT09zc3MAAAAAAABzcnIYFBMYFRQYFRUXExQeKC0cHyVVU1P///+E
+        goEYFBMYFBMYFBMYFBIYFBIYFBIYFBIYFBIYFBIXEhAfHSQqKT8eHzMTEyFNTVH///+SkZcXFyYSDxMc
+        GBcsKjuOjZj///8/O0c/O0Y+O0U+O0U6N0I5NkGYlpv///9LSFIsKTSMio////8cGSEVEx0SEBgVEhYo
+        JSnx8fOzsbQZFBQZFBMaFBIaFBEaFBEZFBEZFBEpIR5PT09zc3MAAAAAAABzcnIYFBMYFRQYFRUXFBQe
+        KC0cHyUXFBX///+ysbAYFBMYFBMYFBMYFBMYFBMYFBLg4N/BwMAYFBIXExAdGx8nJzwdHjIUFCMODRWO
+        jZH///9ZWWgQEB4eHCI4NkiJiZb///87OEY+O0c+O0c+Okc6N0U2M0Tk5Obj4+YqKTsrKTmNjJX///8e
+        GyMZFyMXFSERDxkSEh3Fx87CwMIaFBQaFBMaFBEZFBEZFBEZFBEZFBEpIR5PT09zc3MAAAAAAABzcnIY
+        FBMYFRQYFRUXFBQeKCwcHyUXFBSjoaH///9WUlIYFBMYFBIYFBIYFBJVUlH///+EgYEYFBIXExAcGR4p
+        KT4gITYWFygPDxohICrg4OLh4eMnKDkiIjA1M0aHh5T///8iITIyMUQ1M0YyMEQtLECpqbH///9ra3kc
+        HDEaGiuFhY////8eGyYdGiQaGCQSEBshIi3i4+a/v8MTERYZFBMaFBEaFBEZFBEZFBEZExEpIR5PT09z
+        c3MAAAAAAABzcnIYFBMYFBMYFRUXExQeKCwcHyUXFBQnJCTR0NDw7+90cnEnIyInIyJ0cnHw7+/g4N8n
+        IyIXExImIiBXVVdjYnBdXW1WVmRSUltVVWCEg4v///+UlZ0nJjkqKj+Hh5L///9XV2JXWGVgYHFxcYDF
+        xcv///+lpq4aGi0WFykZGiqGhY3///9hX2hcWmFYV19hYGfAwMT///9fXmcPDRgRDxUUEhQXExIaFBEZ
+        ExEZExEpIR5PT09zc3MAAAAAAABzcnIYFBMYFBMXFRUXExQeKCwcHyUXFBQYFRQnJCOjoaD/////////
+        //////+ioaAnIyIYFBIXExJVUlH///////////////////////////////////8wLkAtLEGIiJP/////
+        //////////////+2tr5tbXsiIjYXGS0KECQXGCmFhYz////////////////////BwcRrb4EPDRoQDhkP
+        DhcPDhQSDxQWEhMZExAZExEoIR5PT09zc3MAAAAAAABzcnIYFBMYFBMXFRUXExQeKCwcHyUXFBQYFRQY
+        FBMYFBMYFBIYFBIYFBIYFBIYFBIYFBIYFBIYFBIXExIXExInJTQkJDoaGy8aGiwaGisYGSwaGy8gIDM1
+        M0QwLkEhITQdHSwODxwJDRsPGjQQGjURGjMUHDQUGjIMFSsIECUNECEPEB4LDhshITEmIy4ZFiATDxoW
+        FyUgJEAODBkQDhkPDRgPDRURDhQREBQZExEZExAoIR5PT09zc3MAAAAAAABzcnIYFBMYFRMYFRUXExQe
+        KCwcHyUXFBQYFRQYFBMYFBMYFBMYFBMYFBIYFBIYFBIYFBIYFBIYFBIYFBIXEhAiICooKD4cHTEdHTEd
+        HjIeHjMgIDUkIzc6N0gvLUAiITUXGCYIChYJCxcRGzcQHDoOGTUMFi8OGDINFy8KEycIDh4ICxgGCRQf
+        Hy0lIi4XFBwTDxoWGCceIj0OCxkPDhkPDRcPDRUQDhQREBUYExIZExApIR5PT09zc3MAAAAAAABzcnIY
+        FBMYFRQYFRUXFBQeKCwcICUXFBQYFRQYFBMYFBMYFBMYFBMYFBIYFBIYFBIYFBIYFBIYFBIYFBIXExEa
+        FhckIzQiIjkfHzQeHzMgIDQeHjIoJzk6N0kqKT4gIDMUFSQFBxIMDhUWHTEUHDMSGzUPGTQSHDYPGDEK
+        EicIDRwHChYFBxAfHyoqJzMZFB0UEBoXGikdIDkNCxgQDhkPDRgPDRYODhQREBUYFBIZExAoIR5PT09z
+        c3MAAAAAAAB3dnZBNzRBODVAOTg+NTZRbXhLVmQ+NjdAODZBNjNBNjJBNjJBNjJBNjJBNjJBNjJBNjJB
+        NjJANTFANTFANTE/NC5DOj1LSGZQUYRVV41RU4pISn58d6eVjsVjYp9aWYguMVYbIDhkb4Rxfplve5FG
+        U3dDU4FFTmwpOm03R3EwNVAdITkNECJTUWx9dJVBNlE2KURDT3dLU5AjHD4rJkQrJkEqJDsmJTUvLDdE
+        NTBENCw9MS1PT09zc3MAAAAAAAB3dnZANzRANzRAODg9NDZQbXhLVmQ+Njc/ODY/NjNBNjJBNjJBNjJB
+        NjJBNjJBNjJBNjJBNjJANTJANTFANTFANTE/NC4+My1BODxFQFBHSGxOT4CQiryEf7thYJpbWYQhJEZT
+        XXSKmrh/japXYIEoNGhhb5ZRWGs/Rl52gZNFSWEoK0ESEyBMS2eEfKA+NVEzJkJKVoBIT4gnIEAuKEUu
+        J0ArJTopJzczLTNGNSxFNS03MC9PT09zc3MAAAAAAAB3dnZANzRANzRAODg+NDZRbXhLVmQ+NjdAODZB
+        NjNBNjJBNjJBNjJBNjJBNjJBNjJCNjNBNTRBNTRBNTRBNTNBNTNBNTJBNTJANS9ANC06LytpYn2ak8lv
+        baxfX5ROTHYiJkiDkq59i7hpc50nNGofOIxca5ZIVHMwQG+Cj6RJT2oiJj8NESVCRGaHgKk+NlIvJD9M
+        XotIS4IsJEMwKUYyKUEuJzsqJzY3MDBDNzE0MDQvLC9PT09zc3MAAAAAAAB3dnZBNjRBODVBOTg+NTdR
+        bnhLVmQ/NzdBOTdCNjRCNzNCNzNCNzNCNzNCNzNBNjRBNzZANjU/NTRBNzhBNjdBNjZCNjZCNjVCNjVB
+        NTRBNTaNg6WPicJfYKBgXo84OGAnMFJ5ia01PG4lK1MbJFkvRK0+T444T5AqRIp0gZpGTWUXGjIMEio5
+        PmGIga1COlYtIj5RaJdER3otJEMvKEQyKUAtJjknJTIzMDM1NDoxMTgxLjBPT09zc3MAAAAAAAB3dnZC
+        NzRBODVBOTk+NTdSbnhMV2Q/NzdCOTdCNzRCNzNCNzNCNzNCNzNCNzRCNzdANThFP05OSGVANTtBNDo+
+        MDVBNjpCNzpCNzo8MTFhWG6Nib5qaKVbWpFNSnonKV09Q4JgZK45Noc9OIRIQZRGSKUgMoIfMnMhNG1j
+        b4s4PE8OESYPEyoyNVGJg7JLQl8xJD9WcKFBQ3UvJkMyKkUwJz8qJDcoJzEuLTYtLTcsKTQsJS5PT09z
+        c3MAAAAAAAB3dnZCNzVBODVBOjk+NTdSbnhMV2NANzdCOThDNzRCNzNCNzNCNzNCNjRCNzZCNzs9MjlZ
+        X5FRSXs7LTpJSV5aaoxEPk8+MTU8MDhLQlh+d7Z0csdkY7pkYbRcW65UVKlLTKE6PI0wL3MdHUsSEzQZ
+        HjQnLlIZHDwVGTU3PlIdHzEQEiUOESMtLkaRibVVTGkyJUBbdqg+P28vJkIyKEMvJjwqJjgrKjMsKTMo
+        JzQnJTMsJS5PT09zc3MAAAAAAAB3dnZBODRBODVAOTg+NTZRbXdLVmQ/NzdBOTdCNzRCNzNCNzNCNzNC
+        NzRBNzhANTxHQ1tmbLZKTnJdcqBphsNjbrJZUItYT4thWZh9d8t4ddZiX7VJSpJRWIuBjbFjbJUUG0Y6
+        RnVlb5pJUGsmKUIWFSgjJDMiJDQZGScREyEQEiITFCMQEh4oKT6Nh7JcUnIvJkJffa87PGYuJkEyKUEu
+        JzstKjcoJDAnIi8qKDMoKDMtKS9PT09zc3MAAAAAAAB3dnZCNjRBODVBOTg+NTZRbXZLVmM/NzdBOTdC
+        NzRCNzNCNzNCNzNBNzVBNzk9MDldcZh4neh1kd9mcMheVqRhV55ZUotZUoGDfbh6d7ZNTYEtL1YfKlF+
+        jaKSo8NcZY4sMVaNnMWMmLp+i6VSWW4bGS8PCx0gIC0iIy4ZGyYWGCIaHCUbHSQoKzqAe6hYT3AsJ0Rk
+        g7Y3OGAtJUAvJz4qJTctKjYkHy0gFyklHy8oJjMuKi9PT09zc3MAAAAAAAB3dnZCNzRBODVBOTg+NTdR
+        bXdLV2M/NzdAOTdBNzRCNjRCNzRCNjNCNzVCNzk+MTpWcISBtvZmdsVNSn1BNFE6LTk+ND1pYYZnY5NF
+        RXUuLVEaHD01PVx/j65vfKU0OV5rdpOfsdOMmbZ+i6FKUmUUESkyNElsdIdgaHlDR1gmJzEcGR8aGB8k
+        JDNsaZdUSWctK0hlhLs2NFsrJD4sJTsnIjQsKzUgHCkdFicfGCojHS4tKC9PT09zc3MAAAAAAAB3dnZC
+        NjRBODVAOTg+NTZRbXZLV2M/NzdBOTdBNzRCNjRCNzNCNjNBNzRBNzdBOD0/Mj9JTWpUYYdgfKFnfLNY
+        XIVIRGQ6OFouLE0qKEolJDsuOV8/Upk2TJoiM3kxP3ugsNKrvNmXpr5we44wM0QdGzJ/jKOJl6p6hpZg
+        Z3o9QFkcGSwRCRchHTBhX4lHOlcxMlBohsM3M1YrJT0sJTonIjEpKDEbFSUdFicdFykgGSwqIy1PT09z
+        c3MAAAAAAAB3dnZBNjNANzRAODg9NDZQbXZJVmM+NjdAODZCNjRCNjNCNjNCNjNCNjNCNzVBNzhBNz0/
+        NDw9MTs9MjxEQEtUY3peYZIyMlMuLkwlJEIlKkQrRIU0U6Y1UqgyTaIwS5tEV5hjc6BzgqQ+SW4gKE0t
+        NVV5hp2JlaZ/iJhiaXs6PlgbFi4VEiMyNUpZUnc+L0k7PFtpiMg8NFQuKD4pJDYjIS0jHyocFCYbFScb
+        FSgfGCwpIyxPT09zc3MAAAAAAAB3dnVANjNANzRBODc9NDVQbXZJVmM+Njc/ODZANjRBNjJBNjJBNjJB
+        NjJCNjNCNjVBNzZBNzhBNjpBNjpANDY+MTR0caZiXo0yMVMkKEcbIUUhNGokQIIqSZgvT6M1WLIxUKgm
+        QIooQIYtRo8tR44tRowmN247RGZlboJZX3IvNEseHzEcHytDQltORF5FMklCRGNphsg3LU8sKTwjITEk
+        IywgGiYcFicaFCcaFSgeGCsoIyxPT09zc3MAAAAAAAB3dnU/NTI/NjNAODc9MzVQbHZKVmM+NjZAODZB
+        NTNBNjJBNjJBNjJBNjJBNjJBNTJBNTNBNjRBNjRBNjVBNjU+My9bWYOgmt99d7JAPmYiI0gZH0YeMGUh
+        OnskPoQvS5k2WK8tTp4rS5gtTJkvSpQ0UJwyTZUkN3IcKFQeIkAaGjQeITQwMkVUUHVDNU1INUxCR2ln
+        gMM0JkkvLj0jIS8lJS8cGCcbFCcaFSgaFSgeGCsnIitPT09zc3MAAAAAAAB3dnVANDI/NjM+NzY8MzVP
+        bHZKVWM+NTZANzZBNTNBNjJBNjJBNjJBNjJBNjJBNjJBNjJBNjJBNjJBNTNBNTNANC9MSmh6fMOwqO2g
+        l9VgW5I8OmMmJ1AcI1AVIk4TJFUZL2keOXggPH4hOnkiOHMkO3UhOXAaLlwXHkUSFTMVFS8sK0tXU3tN
+        Rmk9MEhAL0pBSW5jergxJEYxLj4gIC0bHSoZFiYaEycZFCcaFikbFiklISpPT09zc3MAAAAAAAB3dnVA
+        NTI/NjM/Nzc8MzVPbHZJVmM9NTZAODZANjNBNjNANTE+Mi8+Mi8+Mi9ANDFBNjJBNjJBNjJBNTJBNTNA
+        NC9MR1xkaKmHhtGknemdl+GIgsV0b6tcV4lPTHRJR2lCQmI4OmA2PmswOmcqM1wnLlEoLU0oKkYnJ0Et
+        K0ZAPVxXUXhEPV49M00+MUwxJkZASnFecbAuIkQuKj4eHSwYGCcYGSgbGCoaFScaFSkYFCckIClPT09z
+        c3MAAAAAAAB2dnU/NTI/NjM+Nzc7MzRQa3VJVWI9NDU/NzU/NTI/MzFEODZMQkJNRENLQUE+NDI8MS48
+        MC0+Mi0+My9BNTFCNzBQS1xpbrRmbLF1ecCLi9aUkt6ZleGVkNiZkteclNOVjsiDfbh7dq6AeatzbZ9V
+        VIRdWoZgW4ZZVIFPSW5GQWNBO147M088MUs4LkosI0NFT3hdaqkvJEQuKD8cHCwXGSgbHCwdHS8cGCsb
+        FioZFSglIytPT09zc3MAAAAAAAB2dnU9NDE+NTI+NjU7MTRPanVJVGE8MzU+NjQ+NDE4LCpvYmTJwMjB
+        u8K3sbeZkpd7c3RaU1hOSVpQTGNDPk9DPT5XU2FxeMNvecJqd7xncbhla69zdrl9fsh7fMd9fcZ1dr5u
+        cLVmaaxmaKlYXJxHTYtVV5FTVIpRUIROSnhHQ2s7Nlo3ME4yK0guKEcuJkhNV4RZYaIzJkQxKkEdHC4Y
+        GSscGywaGiwbGSwZFCgbGSsmJCxPT09zc3MAAAAAAAB2dnU9NDE+NDE+NjU7MTRPanVJVGE8MzQ9NjQ+
+        NDE9MS5IOzrJu8Ln3uTZz9TUycvAtrl/e5d6d6Nyb5pdWoJGRV5bW27N0Ovs7vnn6fXQ2uuAkMdYX6lT
+        W6FRWZpWX5xgaalia7FjbKxeZqNYX5xUW5VVWZBOUYdMToJKSnxCQW03Nlw0MVU5NVs7OF43LVFOWYxX
+        Wpw3KUY0K0McHC0ZGSoYGSkZGSgaGywZGisYGSsjIitPT09zc3MAAAAAAAB2dXU+MzE+NDI9NTU7MTNP
+        aHNIU2E8MzQ+NTQ+NDE/MzE4KymTg4Xs3ePk2t/bz86qobmNiL2IhLZta5hcWodZWH66usX/////////
+        ///a6vSAi8djaLBeZbJlbLhkaKdod6+QotWDjc9pc7NXXpNZX5RcYpxXW5VLToJBQnFCQ3BJSHZJSHZI
+        RnQ1MlgtJkxNWpBSU5M2KUc3LUQcHC0YGSkWFycZGCgZGSkYGCgXGCkjIipPT09zc3MAAAAAAAB2dnU9
+        NDE9NDI+NTU7MTNPZ3NIUmA9MzM/NTQ/MzE/MzE9MC5NPz7Etbjr293LvsWclsmcl9CFg7pwbKNaWIJt
+        bYb5+vr////////CzOOMkc19fsRucrlqbbpydb5rb6awwdT////19v3h4/OprM1pb51VXJBYXpZQVIlG
+        Sn5ARXs+Qnc6PGs0MlsuK1EsJk1OXpFMToo5LEoyKz8XGCoXGCkXFycZGSgZGCgXFycZGCcjIihPT09z
+        c3MAAAAAAAB2dXU/MzE+NTI+NTU8MTJPZ3NIUmA9MzM/NTU/MzI/MzBAMzE4Kyl1Z2fbysm6rcCcmNOZ
+        lNGBfrxpZ5dNTXOAgpn+///U1uysrdiPj8yCgsh2ecF4eMBtbrd1d75ocanY4er////////////////m
+        5/WZncZVXo9LUX5RVIU3O2kmKlMqLFQyMVgvLVQnJEtNY5RIR381KkUuKDsVGCkXGSkXFycaGikZGSgZ
+        GSgXGCYjISZPT09zc3MAAAAAAAB2dXU+NDE9NDI9NTU6MTNPZ3NIUmA7MjQ8NTQ+MzE+MjA+MjA+MjA7
+        Ly+Qg4Oso8GMicSGhMhoZ55VV4RPU4Nla6F+g7Zxc6yAfbiHhMN6eL98esF1dLltbbB5ebxscqrQ1N3/
+        ///////////////////////F0ONqfadDSXExMVInJ0cnJkYoKEkrK1EnJ1FPapw/P3IxJ0MpJDcVFigY
+        GCkXFycaGSkYGCcXGCUXFyMjISRPT09zc3MAAAAAAAB2dXU9NDE9NDI9NTU7MTNPZ3NIUmA8MjQ9NTQ+
+        NDE+MjA+MjA/MzE7Ly9FOz6TjbmOjM9mZqdbW5JVV45nZ6Fycax1c6hyb6Rua6F4dLB8eb1/fMN5d7px
+        b6x6eLhwcq2PkrD////////////////////////////C6f92lcRQYYcrMFIfHj0jIT4mJUYkJEpQbp43
+        N2gsJUIhIDMWFygXGSgYGSgaGSkYGSkXFyUWFSApJitPT09zc3MAAAAAAAB2dXU+MzA9NDI9NTU7MDNO
+        ZnNIUmA8MjM9NDQ9MzE+MjA+MjA+MzA9MjI8MjmVkMino+mQjNmbluq3rfLCt/i+s+2eltBzcbFkYpxh
+        X5tzcrlxb7Nwb61ua6RbWIxcXIljZZWgosb4+P3////////////////////J8/+LteWBpNKEos4zOVsb
+        GzceHj0YGkBOcaMtLl4kIDweHjAWFygYGSkbHCwaGiodGSkgHSwkJS8sKS9PT09zc3MAAAAAAAB2dXU+
+        MjA9NDE9NDU6MDJOZnNHUWA7MjM9NDQ9MjE+Mi8+Mi89MjA9MjI6MTaDf6+loeykoPuvqv/Buf+9tf+5
+        sPaSjdNmZ7BUVppiY6tvcLxnaK17d7Z4c6pdW4xJSXBPUnNSVXqAgZvR0tz////////////0//+47P+F
+        q9x5mceTs94/SmkVFjMdHDsaG0FTeKwmJ1QcHTceHTAVFiYZGikbGywaGCkfFygiHSwkJDIqKC9PT09z
+        c3MAAAAAAAB2dXU+MjA9NDE9NDU6MDJOZXNHUWA7MjM9NDQ9MzA+Mi8+My8+MjA+MzE7MTNFPk55dKqk
+        oPStqf+sqP+jof+infmBgNVXXKxTWKN4ecdtb8CemeK2rOaUjcVvap5SUHtISGtMTm5KTWdUV26Hi5um
+        sbq0z9SbxtZqirJNX4Y6RGUvNFMcHjwZGDccGDknJktZfbMnI0wfGzUlIjUgHy8gIC8gHi0bFiYaFCYf
+        GioiHi8tKTJPT09zc3MAAAAAAAB2dXU+MjA9NDI9NDU6MDJOZXNHUWA7MTM9NDQ9MzE+Mi8+My8+Mi8+
+        MzA9MzM1Ky1hWHqfnO2nofiqpv+opP6opP+OjOVnartjZ7Z1d8Z9ftbEu//DuvmjnNx1calcWYdRTnhF
+        RWpESGpESmdBSGE/S2NAUGs/TnE6Q2gvNVYjJUEfHTsdGjkgHT0qJkg3Nl1ihbxAPGRGQmBHQl1AO043
+        MEE0LTwuJzMdFyYeGCkjHjAuKzVPT09zc3MAAAAAAAB2dXU9Mi88MzE8NDU6LzFOZXNIUWA8MTM9NDQ+
+        MjA+Mi89Mi89Mi8+Mi8+MzE7MTFGO0qDfrebluWuqP67tP+0rv+Wle1vcsVrb8F0d8iRj+ioo/ygnfSs
+        pe2UjcZybaBpZJVaWIZGRW04O102Pl46Q2M6Q2E4PlwvNFMpLU8nKEsqKU4sKUwuKUwzLlVGSXV1ltJ8
+        eKxnYYdGQV07Nk1CO09NR1VJREw7NTwiGyogGy8vKzdPT09zc3MAAAAAAAB2dXU8MzA9MzE9NDU6LzJO
+        ZXNHUWA8MTM9NDQ+MjE+My8+My8+My8+My8+Mi8/MzI6LzFHPU50cKOinOO8s/+wqvyKi99pbsBna7p4
+        esqhnfGin/iSkeqYleKXktaIhMJ8eLN1capgXItEQGE2NFExNFE0OVc0NVMuLk4oKUw0Mlo9OmI9Ol46
+        Nls+OGNcYpWCn96Beq9bVXs9OFRBO1N+dn2TjY6Df4JybnJVUFYzLTgtKTNPT09zc3MAAAAAAAB2dXU8
+        MzA9MzI9NDU6LzJOZHJHUGA7MTI9NDM+MzA+My8+My8+My8+My8+My8+MjA+MzM7MDM9NUVeWoCim9ap
+        oud+fMJub7Ztb7Z0dL2inu60rf6ZleWLiNGMic2LiMmFg8V7ebt9d6l0bJFUTW84M08uK0gyMEwtKUci
+        IEAyL1FAPGJFQGhDQGpPSntveLSEmt52cKBTT3M7N1ZpY3almpuupqioo6iinqOdm59/fH5BPD5PT09z
+        c3MAAAAAAAB3dnY+MjA9MzI9NDU6LzJNYnFHT187MTI9MzQ9MzE+My8+My8+My8+My8+My8+My8+MjA+
+        MzI9MjU5LjZQSF2FgKh5dqxtaqRzca9xca6PjNK3r/+aluOKh86NicqJhsSHg8CAfbt/e7aAeaxwaJJO
+        R2o3ME8vKUgqJkQkIUAuKUk/O2JJRXNIRXZXU4l/isiEltxybJtIRGhGQmGfl5+3rrGwqKytpaquqK+s
+        qK6np6xjXVxPT09zc3MAAAAAAAB3dnY9MjA9MzI9MzQ6LjJNYHFHTl87MDI9MzM9MzA+Mi8+My8+My8+
+        Mi8+My8+My8+My8+MjA+MzI+MzQ6Li9COkFnZYhoZphjYploZp1saqCknt+cltuJhseQiseKhcGDf7uC
+        frmCfbV+eKt1bZljWoFIQWQ4MlQqJ0gnJUQzMVNFRHBLSXlLSn1bWZSAjciBktdpY49CPGBcVnavo6e6
+        r7OwpKqsoKSupKmqo6iKh45XTEtRUVF0dHQAAAAAAAB3dnY8Mi88MzE7MzQ5LTJNX3FHTF86LzM9MjM+
+        MjA9MS89MS49Mi49Mi49Mi49Mi49MS8+MS8+MS8+MjA/NDE8MCxDPEVoZ5Jtap1WV4xSUoVubJmTjb+X
+        kMaWj8GJg7h4da91c7B8eLR8d618dKN2bJVhWH1IQWQ1MVQvLVA7OF9GQ3JHQ3RERHdYVpJ9i8Z+jdFh
+        WYVAOVtdVnGcj5OvoqauoaWsn6Sjl5yPhYp1ZmdMPT1WVlZ3d3cAAAAAAAB7eno8My88MzA7MzQ6LjJN
+        XnFHS187LzI8MzM+MjA9Mi89Mi89Mi89Mi8+Mi8+Mi8+MjA+MjA+MjE+MzE+MzM+MzM7MCxMRlpta5tj
+        YpdHSYNSU4lnZo+HgaeHf6V/eKBwbJ5saaJ9eLOIgruDfLB1bJlsY4pTS24+OFw0MVY4NFw/OWI9OGI1
+        OGxPT457icZ6h8peVoBDPF5jWm+Shomfk5ehlZuWjJR+cXduXF1lT081LTZgYGB7e3sAAAAAAAAAAAA9
+        MjA9MzE8MzQ6LTJNXXFHS187LzM9MzM+MzA+My8+My8+My8+MzA+MzE9MzE9MzI+MzM+MzM9MjI8MC88
+        LzA9MztIQ1hoZ5Z6dqdva5tgXZNXV4dcXIRuao9mYodeXIZiYI5taZuFfq2DfKlmXodbU3pUS29EPGI3
+        Mlk6NFtCOl4zMVc0NmhKS412hsZ5hcRdVX5IQGFiWG2Mf4CJe31+bnJwX2NoVVZRQkksJjs1MTttbW1/
+        f38AAAAAAAAAAABANzU9MzI9MzQ6LTNNXHJHS2A7LzM9MzQ9MzI+MzE9MzE9MzI9MzM9MzM9MjM9MTI7
+        Ly87MDRFPEtLRmZQUHxgZJtaXI5OSWB3cpx/eKhuaZhkYZFbW4loZ5NdXIxZV4ZaWIZcWoVlY4lvaotk
+        XoBaVHlRS28/O2E8OF9MQmZCOV0tK1AzMl0/PXRmebh9hsNbVHpIPlxKPlhfTFdnUVVoUVVpUlVFOkgh
+        IDkhHzlPTVJ6enoAAAAAAAAAAAAAAABcV1c9MzI9MzQ6LTNNXHJHS2A7LzQ8MzU9MzM9MzM9MzQ8MjM7
+        MDE5Li89NDtCPVFOTHFgY5xiZqFSUHpFPlZANT88Li85LChfV2eKg65zbptiYJBfXZFraZV3c6FgXY9a
+        V4hdWodeW4NYVHNJRV5CQFg9PlZCQ2RNSnJVSmhDOl40L1M4MlY7M1ZRZpRgaJ5OR2hPQVxRQlpTQlVZ
+        RVNXRVM/NUojI0AkI0EtKj93d3d/f38AAAAAAAAAAAAAAAAAAABFPj09MzQ6LTNNXHJHS2E7Lzc9Mjc8
+        MTM5LjA6MDVBOkVHRV5YXotjaqBUVYVKSGtHP1M8MTc7Li8+MTI/MjM/MzM+MjA9MS1oYX98eKh0b59r
+        Z5tmZJVyb5lzb6FgXI5gW4tgW4dTTnRBO1w5NFM7NlQ7N1Q9PFhEQFZIQ1hMQ1lLQ1pDOlNUaZhPUIE1
+        MU4uK0kyME8vLUgtK0QoKEIhI0ElJkUrKkhnZWp/f38AAAAAAAAAAAAAAAAAAAAAAAAAAABLQ0U6LTNN
+        XHNFR144KzM+NkJCQFVQVndhbqBbZJZQT3NLRl5AN0U7LzI8MC88MTE+MzQ/MzM/MzM/MzE/MjA/MjA+
+        MixCNzdaV3hjYZJjYJNeXI1eXYd8d6F1b6BjXpBcV4lQTXtGP2ZBOVs+N1k5M1Q4M1M4NFE7Nk4/PFVC
+        P1tCOFVbb6JFRnsjI0YgIkonLVkkKU8jJkolKEopKkwzMk5ram8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAABzcXFYYGpVX3RYXnVgZ4NVWXNSUWNOSVRIQERIP0BJP0BJQUFKQkJLQkJLQ0JLQ0FMQkBL
+        QkBLQj9LQj9KQj9LQj9KQT5MREFUT1hcWW5eW3dZV3FgXnVybYN0boRtZXxlXnZcVGxQSV5KRFlHQFVF
+        P1RFP1JHQVNJQ1VMRVlMQ1hbZodDQ2M4Nk1DQl5GR2VGRmJGRmFKSGJgXWoAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD4AAAAAAAAA/AAAAAAAAAB4AAAAAAAAAHgAAAAAAAAAOAA
+        AAAAAAAA4AAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAA
+        AADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAA
+        AAAAAAAAwAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAA
+        AADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAA
+        AAAAAAAAwAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAA
+        AADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAA
+        AAAAAAAAwAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAAAAAAAAAA4AAAAAAA
+        AADgAAAAAAAAAeAAAAAAAAAB8AAAAAAAAAP4AAAAAAAAD/wAAAAAAAA//////////////////////w==
+</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Windows/MapOptionsForm.Designer.cs b/Source/Core/Windows/MapOptionsForm.Designer.cs
new file mode 100644
index 0000000..31d2494
--- /dev/null
+++ b/Source/Core/Windows/MapOptionsForm.Designer.cs
@@ -0,0 +1,275 @@
+namespace CodeImp.DoomBuilder.Windows
+{
+	partial class MapOptionsForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			System.Windows.Forms.Label label3;
+			System.Windows.Forms.Label label2;
+			System.Windows.Forms.Label label1;
+			System.Windows.Forms.GroupBox panelsettings;
+			System.Windows.Forms.Label label4;
+			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MapOptionsForm));
+			this.examplelabel = new System.Windows.Forms.Label();
+			this.scriptcompiler = new System.Windows.Forms.ComboBox();
+			this.scriptcompilerlabel = new System.Windows.Forms.Label();
+			this.levelname = new System.Windows.Forms.TextBox();
+			this.config = new System.Windows.Forms.ComboBox();
+			this.apply = new System.Windows.Forms.Button();
+			this.cancel = new System.Windows.Forms.Button();
+			this.panelres = new System.Windows.Forms.GroupBox();
+			this.longtexturenames = new System.Windows.Forms.CheckBox();
+			this.strictpatches = new System.Windows.Forms.CheckBox();
+			this.datalocations = new CodeImp.DoomBuilder.Controls.ResourceListEditor();
+			label3 = new System.Windows.Forms.Label();
+			label2 = new System.Windows.Forms.Label();
+			label1 = new System.Windows.Forms.Label();
+			panelsettings = new System.Windows.Forms.GroupBox();
+			label4 = new System.Windows.Forms.Label();
+			panelsettings.SuspendLayout();
+			this.panelres.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// label3
+			// 
+			label3.AutoSize = true;
+			label3.Location = new System.Drawing.Point(239, 83);
+			label3.Name = "label3";
+			label3.Size = new System.Drawing.Size(52, 13);
+			label3.TabIndex = 9;
+			label3.Text = "example: ";
+			// 
+			// label2
+			// 
+			label2.AutoSize = true;
+			label2.Location = new System.Drawing.Point(58, 83);
+			label2.Name = "label2";
+			label2.Size = new System.Drawing.Size(65, 13);
+			label2.TabIndex = 7;
+			label2.Text = "Level name:";
+			// 
+			// label1
+			// 
+			label1.Location = new System.Drawing.Point(13, 27);
+			label1.Name = "label1";
+			label1.Size = new System.Drawing.Size(110, 14);
+			label1.TabIndex = 5;
+			label1.Text = "Game Configuration:";
+			label1.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// panelsettings
+			// 
+			panelsettings.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			panelsettings.Controls.Add(this.examplelabel);
+			panelsettings.Controls.Add(this.scriptcompiler);
+			panelsettings.Controls.Add(this.scriptcompilerlabel);
+			panelsettings.Controls.Add(label3);
+			panelsettings.Controls.Add(this.levelname);
+			panelsettings.Controls.Add(label2);
+			panelsettings.Controls.Add(this.config);
+			panelsettings.Controls.Add(label1);
+			panelsettings.Location = new System.Drawing.Point(12, 12);
+			panelsettings.Name = "panelsettings";
+			panelsettings.Size = new System.Drawing.Size(397, 112);
+			panelsettings.TabIndex = 0;
+			panelsettings.TabStop = false;
+			panelsettings.Text = " Settings ";
+			// 
+			// examplelabel
+			// 
+			this.examplelabel.AutoSize = true;
+			this.examplelabel.Location = new System.Drawing.Point(288, 83);
+			this.examplelabel.Name = "examplelabel";
+			this.examplelabel.Size = new System.Drawing.Size(42, 13);
+			this.examplelabel.TabIndex = 12;
+			this.examplelabel.Text = "MAP01";
+			// 
+			// scriptcompiler
+			// 
+			this.scriptcompiler.DropDownHeight = 206;
+			this.scriptcompiler.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.scriptcompiler.FormattingEnabled = true;
+			this.scriptcompiler.IntegralHeight = false;
+			this.scriptcompiler.Location = new System.Drawing.Point(129, 52);
+			this.scriptcompiler.Name = "scriptcompiler";
+			this.scriptcompiler.Size = new System.Drawing.Size(254, 21);
+			this.scriptcompiler.TabIndex = 10;
+			// 
+			// scriptcompilerlabel
+			// 
+			this.scriptcompilerlabel.Location = new System.Drawing.Point(13, 55);
+			this.scriptcompilerlabel.Name = "scriptcompilerlabel";
+			this.scriptcompilerlabel.Size = new System.Drawing.Size(110, 14);
+			this.scriptcompilerlabel.TabIndex = 11;
+			this.scriptcompilerlabel.Text = "Script Type:";
+			this.scriptcompilerlabel.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// levelname
+			// 
+			this.levelname.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
+			this.levelname.Location = new System.Drawing.Point(129, 80);
+			this.levelname.MaxLength = 8;
+			this.levelname.Name = "levelname";
+			this.levelname.Size = new System.Drawing.Size(94, 20);
+			this.levelname.TabIndex = 1;
+			this.levelname.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.levelname_KeyPress);
+			// 
+			// config
+			// 
+			this.config.DropDownHeight = 206;
+			this.config.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.config.FormattingEnabled = true;
+			this.config.IntegralHeight = false;
+			this.config.Location = new System.Drawing.Point(129, 24);
+			this.config.Name = "config";
+			this.config.Size = new System.Drawing.Size(254, 21);
+			this.config.TabIndex = 0;
+			this.config.SelectedIndexChanged += new System.EventHandler(this.config_SelectedIndexChanged);
+			// 
+			// label4
+			// 
+			label4.AutoSize = true;
+			label4.Location = new System.Drawing.Point(14, 207);
+			label4.Name = "label4";
+			label4.Size = new System.Drawing.Size(299, 52);
+			label4.TabIndex = 17;
+			label4.Text = resources.GetString("label4.Text");
+			// 
+			// apply
+			// 
+			this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.apply.Location = new System.Drawing.Point(179, 405);
+			this.apply.Name = "apply";
+			this.apply.Size = new System.Drawing.Size(112, 25);
+			this.apply.TabIndex = 2;
+			this.apply.Text = "OK";
+			this.apply.UseVisualStyleBackColor = true;
+			this.apply.Click += new System.EventHandler(this.apply_Click);
+			// 
+			// cancel
+			// 
+			this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.cancel.Location = new System.Drawing.Point(297, 405);
+			this.cancel.Name = "cancel";
+			this.cancel.Size = new System.Drawing.Size(112, 25);
+			this.cancel.TabIndex = 3;
+			this.cancel.Text = "Cancel";
+			this.cancel.UseVisualStyleBackColor = true;
+			this.cancel.Click += new System.EventHandler(this.cancel_Click);
+			// 
+			// panelres
+			// 
+			this.panelres.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.panelres.Controls.Add(this.longtexturenames);
+			this.panelres.Controls.Add(this.strictpatches);
+			this.panelres.Controls.Add(this.datalocations);
+			this.panelres.Controls.Add(label4);
+			this.panelres.Location = new System.Drawing.Point(12, 130);
+			this.panelres.Name = "panelres";
+			this.panelres.Size = new System.Drawing.Size(397, 269);
+			this.panelres.TabIndex = 1;
+			this.panelres.TabStop = false;
+			this.panelres.Text = " Resources ";
+			// 
+			// longtexturenames
+			// 
+			this.longtexturenames.AutoSize = true;
+			this.longtexturenames.Location = new System.Drawing.Point(14, 45);
+			this.longtexturenames.Name = "longtexturenames";
+			this.longtexturenames.Size = new System.Drawing.Size(137, 17);
+			this.longtexturenames.TabIndex = 21;
+			this.longtexturenames.Text = "Use long texture names";
+			this.longtexturenames.UseVisualStyleBackColor = true;
+			// 
+			// strictpatches
+			// 
+			this.strictpatches.AutoSize = true;
+			this.strictpatches.Location = new System.Drawing.Point(14, 21);
+			this.strictpatches.Name = "strictpatches";
+			this.strictpatches.Size = new System.Drawing.Size(349, 17);
+			this.strictpatches.TabIndex = 20;
+			this.strictpatches.Text = "Strictly load patches between P_START and P_END only for this file";
+			this.strictpatches.UseVisualStyleBackColor = true;
+			// 
+			// datalocations
+			// 
+			this.datalocations.AllowDrop = true;
+			this.datalocations.DialogOffset = new System.Drawing.Point(40, 20);
+			this.datalocations.Location = new System.Drawing.Point(14, 71);
+			this.datalocations.Name = "datalocations";
+			this.datalocations.Size = new System.Drawing.Size(368, 127);
+			this.datalocations.TabIndex = 0;
+			// 
+			// MapOptionsForm
+			// 
+			this.AcceptButton = this.apply;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.CancelButton = this.cancel;
+			this.ClientSize = new System.Drawing.Size(421, 438);
+			this.Controls.Add(this.panelres);
+			this.Controls.Add(this.cancel);
+			this.Controls.Add(this.apply);
+			this.Controls.Add(panelsettings);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "MapOptionsForm";
+			this.Opacity = 1;
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Map Options";
+			this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.MapOptionsForm_HelpRequested);
+			panelsettings.ResumeLayout(false);
+			panelsettings.PerformLayout();
+			this.panelres.ResumeLayout(false);
+			this.panelres.PerformLayout();
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.TextBox levelname;
+		private System.Windows.Forms.ComboBox config;
+		private System.Windows.Forms.Button apply;
+		private System.Windows.Forms.Button cancel;
+		private System.Windows.Forms.GroupBox panelres;
+		private CodeImp.DoomBuilder.Controls.ResourceListEditor datalocations;
+		private System.Windows.Forms.CheckBox strictpatches;
+		private System.Windows.Forms.ComboBox scriptcompiler;
+		private System.Windows.Forms.Label scriptcompilerlabel;
+		private System.Windows.Forms.Label examplelabel;
+		private System.Windows.Forms.CheckBox longtexturenames;
+
+
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/MapOptionsForm.cs b/Source/Core/Windows/MapOptionsForm.cs
new file mode 100644
index 0000000..aa54982
--- /dev/null
+++ b/Source/Core/Windows/MapOptionsForm.cs
@@ -0,0 +1,351 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Data;
+using CodeImp.DoomBuilder.IO;
+using System.IO;
+using CodeImp.DoomBuilder.Config;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Windows
+{
+	internal partial class MapOptionsForm : DelayedForm
+	{
+		// Variables
+		private readonly MapOptions options;
+		private readonly bool newmap;
+		
+		// Properties
+		public MapOptions Options { get { return options; } }
+		
+		// Constructor
+		public MapOptionsForm(MapOptions options, bool newmap)
+		{
+			this.newmap = newmap;
+
+			// Initialize
+			InitializeComponent();
+
+			// Keep settings
+			this.options = options;
+
+			//mxd. Add script compilers
+			foreach(KeyValuePair<string, ScriptConfiguration> group in General.CompiledScriptConfigs)
+			{
+				scriptcompiler.Items.Add(group.Value);
+			}
+
+			//mxd. Go for all enabled configurations
+			for(int i = 0; i < General.Configs.Count; i++)
+			{
+				//mxd. No disabled configs here
+				if(!General.Configs[i].Enabled) continue;
+				
+				// Add config name to list
+				int index = config.Items.Add(General.Configs[i]);
+
+				//mxd 
+				if(newmap && !string.IsNullOrEmpty(General.Settings.LastUsedConfigName) && General.Configs[i].Name == General.Settings.LastUsedConfigName) 
+				{
+					// Select this item
+					config.SelectedIndex = index;
+				}
+				// Is this configuration currently selected?
+				else if(string.Compare(General.Configs[i].Filename, options.ConfigFile, true) == 0) // Is this configuration currently selected?
+				{
+					// Select this item
+					config.SelectedIndex = index;
+				}
+			}
+
+			//mxd. No dice? Check disabled ones
+			if(config.SelectedIndex == -1) 
+			{
+				for(int i = 0; i < General.Configs.Count; i++) 
+				{
+					//No enabled configs here
+					if(General.Configs[i].Enabled) continue;
+
+					if((newmap && !string.IsNullOrEmpty(General.Settings.LastUsedConfigName) && General.Configs[i].Name == General.Settings.LastUsedConfigName) ||
+						string.Compare(General.Configs[i].Filename, options.ConfigFile, true) == 0) 
+					{
+						//Add and select this item
+						config.SelectedIndex = config.Items.Add(General.Configs[i]);
+						break;
+					}
+				}
+			}
+
+			//mxd. Still better than nothing :)
+			if(config.SelectedIndex == -1 && config.Items.Count > 0) config.SelectedIndex = 0;
+
+			//mxd
+			if(General.Map != null) datalocations.StartPath = General.Map.FilePathName;
+
+			// Set the level name
+			if(!string.IsNullOrEmpty(options.CurrentName)) levelname.Text = options.CurrentName;  //mxd
+
+			// Set strict patches loading
+			strictpatches.Checked = options.StrictPatches;
+
+			// Fill the resources list
+			datalocations.EditResourceLocationList(options.Resources);
+		}
+
+		// OK clicked
+		private void apply_Click(object sender, EventArgs e)
+		{
+			// Configuration selected?
+			if(config.SelectedIndex == -1)
+			{
+				// Select a configuration!
+				MessageBox.Show(this, "Please select a game configuration to use for editing your map.", Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+				config.Focus();
+				return;
+			}
+
+			//mxd. Script configuration selected?
+			if(scriptcompiler.Enabled && scriptcompiler.SelectedIndex == -1)
+			{
+				// Select a configuration!
+				MessageBox.Show(this, "Please select a script type to use for editing your map.", Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+				scriptcompiler.Focus();
+				return;
+			}
+			
+			// Level name empty?
+			if(levelname.Text.Length == 0)
+			{
+				// Enter a level name!
+				MessageBox.Show(this, "Please enter a level name for your map.", Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+				levelname.Focus();
+				return;
+			}
+
+			// Collect information
+			ConfigurationInfo configinfo = config.SelectedItem as ConfigurationInfo; //mxd
+			DataLocationList locations = datalocations.GetResources();
+
+			//mxd. Level name will fuck things up horribly?
+			if(!configinfo.ValidateMapName(levelname.Text.ToUpperInvariant())) 
+			{
+				// Enter a different level name!
+				MessageBox.Show(this, "Chosen map name conflicts with a lump name defined for current map format.\n", Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+				levelname.Focus();
+				return;
+			}
+
+			// Resources are valid? (mxd)
+			if(!datalocations.ResourcesAreValid()) 
+			{
+				MessageBox.Show(this, "Cannot " + (newmap ? "create map" : "change map settings") + ": at least one resource doesn't exist!", Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+				datalocations.Focus();
+				return;
+			}
+			
+			// When making a new map, check if we should warn the user for missing resources
+			if(newmap)
+			{
+				General.Settings.LastUsedConfigName = configinfo.Name; //mxd
+				
+				if((locations.Count == 0) && (configinfo.Resources.Count == 0) && 
+					MessageBox.Show(this, "You are about to make a map without selecting any resources. Textures, flats and " +
+										 "sprites may not be shown correctly or may not show up at all. Do you want to continue?", Application.ProductName,
+										 MessageBoxButtons.YesNo, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button2) == DialogResult.No)
+				{
+					return;
+				}
+			}
+
+			// Next checks are only for maps that are already opened
+			if(!newmap)
+			{
+				// Now we check if the map name the user has given does already exist in the source WAD file
+				// We have to warn the user about that, because it would create a level name conflict in the WAD
+
+				// Level name changed and the map exists in a source wad?
+				if((levelname.Text != options.CurrentName) && (General.Map != null) &&
+				   (General.Map.FilePathName != "") && File.Exists(General.Map.FilePathName))
+				{
+					// Open the source wad file to check for conflicting name
+					WAD sourcewad = new WAD(General.Map.FilePathName, true);
+					bool conflictingname = (sourcewad.FindLumpIndex(levelname.Text) > -1);
+					sourcewad.Dispose();
+
+					// Names conflict?
+					if(conflictingname)
+					{
+						// Show warning!
+						if(General.ShowWarningMessage("The map name \"" + levelname.Text + "\" is already in use by another map or data lump in the source WAD file. Saving your map with this name will cause conflicting data lumps in the WAD file. Do you want to continue?", MessageBoxButtons.YesNo, MessageBoxDefaultButton.Button2) == DialogResult.No)
+						{
+							return;
+						}
+					}
+				}
+
+				//mxd. If the map was never saved and it's name was changed, update filename
+				if((levelname.Text != options.CurrentName) && (General.Map != null) && (string.IsNullOrEmpty(General.Map.FilePathName)))
+				{
+					General.Map.FileTitle = levelname.Text + ".wad";
+				}
+
+				// When the user changed the configuration to one that has a different read/write interface,
+				// we have to warn the user that the map may not be compatible.
+				
+				// Configuration changed?
+				if((options.ConfigFile != "") && (configinfo.Filename != options.ConfigFile))
+				{
+					// Check if the config uses a different IO interface
+					if(configinfo.Configuration.ReadSetting("formatinterface", "") != General.Map.Config.FormatInterface)
+					{
+						// Warn the user about IO interface change
+						if(General.ShowWarningMessage("The game configuration you selected uses a different file format than your current map. Because your map was not designed for this format it may cause the map to work incorrectly in the game. Do you want to continue?", MessageBoxButtons.YesNo, MessageBoxDefaultButton.Button2) == DialogResult.No)
+						{
+							// Reset to old configuration
+							for(int i = 0; i < config.Items.Count; i++)
+							{
+								// Is this configuration the old config?
+								if(string.Compare((config.Items[i] as ConfigurationInfo).Filename, options.ConfigFile, true) == 0)
+								{
+									// Select this item
+									config.SelectedIndex = i;
+								}
+							}
+							return;
+						} 
+
+						//mxd. Otherwise map data won't be saved if a user decides to save the map right after converting to new map format
+						General.Map.IsChanged = true;
+					}
+				}
+			}
+			
+			// Apply changes
+			options.ClearResources();
+			options.ConfigFile = (config.SelectedItem as ConfigurationInfo).Filename; //mxd
+			options.CurrentName = levelname.Text.Trim().ToUpper();
+			options.StrictPatches = strictpatches.Checked;
+			options.CopyResources(datalocations.GetResources());
+
+			//mxd. Store script compiler
+			if(scriptcompiler.Enabled) 
+			{
+				ScriptConfiguration scriptcfg = scriptcompiler.SelectedItem as ScriptConfiguration;
+				foreach(KeyValuePair<string, ScriptConfiguration> group in General.CompiledScriptConfigs) 
+				{
+					if(group.Value == scriptcfg)
+					{
+						options.ScriptCompiler = group.Key;
+						break;
+					}
+				}
+			}
+
+			//mxd. Use long texture names?
+			if(longtexturenames.Enabled) options.UseLongTextureNames = longtexturenames.Checked;
+			
+			// Hide window
+			this.DialogResult = DialogResult.OK;
+			this.Close();
+		}
+
+		// Cancel clicked
+		private void cancel_Click(object sender, EventArgs e)
+		{
+			// Just hide window
+			this.DialogResult = DialogResult.Cancel;
+			this.Close();
+		}
+
+		// Game configuration chosen
+		private void config_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			// Anything selected?
+			if(config.SelectedIndex < 0) return;
+				
+			// Get the info
+			ConfigurationInfo info = config.SelectedItem as ConfigurationInfo;
+			if(info == null) return; //mxd. Some boilerplate
+
+			// No lump name in the name field?
+			if(newmap || levelname.Text.Trim().Length == 0) 
+			{
+				// Get default lump name from configuration
+				levelname.Text = info.DefaultLumpName;
+			}
+			examplelabel.Text = info.DefaultLumpName; //mxd
+
+			//mxd. Select script compiler
+			string scriptconfig = string.Empty;
+			if(!string.IsNullOrEmpty(options.ScriptCompiler) && General.CompiledScriptConfigs.ContainsKey(options.ScriptCompiler))
+			{
+				scriptconfig = options.ScriptCompiler;
+			}
+			else if(!string.IsNullOrEmpty(info.DefaultScriptCompiler) && General.CompiledScriptConfigs.ContainsKey(info.DefaultScriptCompiler))
+			{
+				scriptconfig = info.DefaultScriptCompiler;
+			}
+
+			//mxd. Select proper script compiler
+			if(!string.IsNullOrEmpty(scriptconfig))
+			{
+				scriptcompiler.Enabled = true;
+				scriptcompiler.SelectedItem = General.CompiledScriptConfigs[scriptconfig];
+				scriptcompilerlabel.Enabled = true;
+			}
+			else
+			{
+				scriptcompiler.Enabled = false;
+				scriptcompiler.SelectedIndex = -1;
+				scriptcompilerlabel.Enabled = false;
+			}
+
+			// Show resources
+			datalocations.FixedResourceLocationList(info.Resources);
+
+			// Update long texture names checkbox (mxd)
+			longtexturenames.Enabled = info.Configuration.ReadSetting("longtexturenames", false);
+			longtexturenames.Checked = longtexturenames.Enabled && options.UseLongTextureNames;
+		}
+
+		// When keys are pressed in the level name field
+		private void levelname_KeyPress(object sender, KeyPressEventArgs e)
+		{
+			string allowedchars = Lump.MAP_LUMP_NAME_CHARS + Lump.MAP_LUMP_NAME_CHARS.ToLowerInvariant() + "\b";
+
+			// Check if key is not allowed
+			if(allowedchars.IndexOf(e.KeyChar) == -1)
+			{
+				// Cancel this
+				e.Handled = true;
+			}
+		}
+
+		// Help
+		private void MapOptionsForm_HelpRequested(object sender, HelpEventArgs hlpevent)
+		{
+			General.ShowHelp("w_mapoptions.html");
+			hlpevent.Handled = true;
+		}
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/MapOptionsForm.resx b/Source/Core/Windows/MapOptionsForm.resx
new file mode 100644
index 0000000..69f9f86
--- /dev/null
+++ b/Source/Core/Windows/MapOptionsForm.resx
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="label3.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label2.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label1.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="panelsettings.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label4.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <data name="label4.Text" xml:space="preserve">
+    <value>Drag &amp;&amp; drop resources to add them.
+Drag items to change order (lower items override higher items).
+Use the context menu to cut, copy, paste or remove items.
+Grayed items are loaded according to the game configuration.</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Windows/MenuSection.cs b/Source/Core/Windows/MenuSection.cs
new file mode 100644
index 0000000..bd35bf6
--- /dev/null
+++ b/Source/Core/Windows/MenuSection.cs
@@ -0,0 +1,49 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Windows
+{
+	public enum MenuSection
+	{
+		FileNewOpenClose,
+		FileSave,
+		FileImport, //mxd
+		FileExport, //mxd
+		FileRecent,
+		FileExit,
+		EditUndoRedo,
+		EditCopyPaste,
+		EditGeometry,
+		EditGrid,
+		EditMapOptions,
+		ViewThings,
+		ViewViews,
+		ViewZoom,
+		ViewScriptEdit,
+		PrefabsInsert,
+		PrefabsCreate,
+		ToolsResources,
+		ToolsConfiguration,
+		ToolsTesting,
+		HelpManual,
+		HelpAbout,
+		Top
+	}
+}
diff --git a/Source/Core/Windows/MessageBeepType.cs b/Source/Core/Windows/MessageBeepType.cs
new file mode 100644
index 0000000..519bec5
--- /dev/null
+++ b/Source/Core/Windows/MessageBeepType.cs
@@ -0,0 +1,32 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Windows
+{
+	public enum MessageBeepType : int
+	{
+		Default = -1,
+		Ok = 0x00000000,
+		Error = 0x00000010,
+		Question = 0x00000020,
+		Warning = 0x00000030,
+		Information = 0x00000040,
+	}
+}
diff --git a/Source/Core/Windows/OpenMapOptionsForm.Designer.cs b/Source/Core/Windows/OpenMapOptionsForm.Designer.cs
new file mode 100644
index 0000000..e6db655
--- /dev/null
+++ b/Source/Core/Windows/OpenMapOptionsForm.Designer.cs
@@ -0,0 +1,257 @@
+namespace CodeImp.DoomBuilder.Windows
+{
+	partial class OpenMapOptionsForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			System.Windows.Forms.ColumnHeader columnHeader1;
+			System.Windows.Forms.Label label1;
+			System.Windows.Forms.Label label2;
+			System.Windows.Forms.Label label3;
+			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(OpenMapOptionsForm));
+			this.panelres = new System.Windows.Forms.GroupBox();
+			this.longtexturenames = new System.Windows.Forms.CheckBox();
+			this.strictpatches = new System.Windows.Forms.CheckBox();
+			this.datalocations = new CodeImp.DoomBuilder.Controls.ResourceListEditor();
+			this.apply = new System.Windows.Forms.Button();
+			this.cancel = new System.Windows.Forms.Button();
+			this.config = new System.Windows.Forms.ComboBox();
+			this.mapslist = new System.Windows.Forms.ListView();
+			this.scriptcompiler = new System.Windows.Forms.ComboBox();
+			this.scriptcompilerlabel = new System.Windows.Forms.Label();
+			columnHeader1 = new System.Windows.Forms.ColumnHeader();
+			label1 = new System.Windows.Forms.Label();
+			label2 = new System.Windows.Forms.Label();
+			label3 = new System.Windows.Forms.Label();
+			this.panelres.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// columnHeader1
+			// 
+			columnHeader1.Text = "Map name";
+			// 
+			// label1
+			// 
+			label1.Location = new System.Drawing.Point(15, 24);
+			label1.Name = "label1";
+			label1.Size = new System.Drawing.Size(120, 14);
+			label1.TabIndex = 14;
+			label1.Text = "Game Configuration:";
+			label1.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// label2
+			// 
+			label2.AutoSize = true;
+			label2.Location = new System.Drawing.Point(12, 89);
+			label2.Name = "label2";
+			label2.Size = new System.Drawing.Size(360, 26);
+			label2.TabIndex = 16;
+			label2.Text = "With the above selected configuration, the maps shown below were found \r\nin the c" +
+				"hosen WAD file. Please select the map to load for editing.";
+			// 
+			// label3
+			// 
+			label3.AutoSize = true;
+			label3.Location = new System.Drawing.Point(14, 207);
+			label3.Name = "label3";
+			label3.Size = new System.Drawing.Size(299, 52);
+			label3.TabIndex = 17;
+			label3.Text = resources.GetString("label3.Text");
+			// 
+			// panelres
+			// 
+			this.panelres.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.panelres.Controls.Add(this.longtexturenames);
+			this.panelres.Controls.Add(this.strictpatches);
+			this.panelres.Controls.Add(this.datalocations);
+			this.panelres.Controls.Add(label3);
+			this.panelres.Location = new System.Drawing.Point(12, 246);
+			this.panelres.Name = "panelres";
+			this.panelres.Size = new System.Drawing.Size(396, 270);
+			this.panelres.TabIndex = 2;
+			this.panelres.TabStop = false;
+			this.panelres.Text = " Resources ";
+			// 
+			// longtexturenames
+			// 
+			this.longtexturenames.AutoSize = true;
+			this.longtexturenames.Location = new System.Drawing.Point(14, 45);
+			this.longtexturenames.Name = "longtexturenames";
+			this.longtexturenames.Size = new System.Drawing.Size(137, 17);
+			this.longtexturenames.TabIndex = 20;
+			this.longtexturenames.Text = "Use long texture names";
+			this.longtexturenames.UseVisualStyleBackColor = true;
+			// 
+			// strictpatches
+			// 
+			this.strictpatches.AutoSize = true;
+			this.strictpatches.Location = new System.Drawing.Point(14, 21);
+			this.strictpatches.Name = "strictpatches";
+			this.strictpatches.Size = new System.Drawing.Size(349, 17);
+			this.strictpatches.TabIndex = 19;
+			this.strictpatches.Text = "Strictly load patches between P_START and P_END only for this file";
+			this.strictpatches.UseVisualStyleBackColor = true;
+			// 
+			// datalocations
+			// 
+			this.datalocations.AllowDrop = true;
+			this.datalocations.DialogOffset = new System.Drawing.Point(40, 20);
+			this.datalocations.Location = new System.Drawing.Point(14, 71);
+			this.datalocations.Name = "datalocations";
+			this.datalocations.Size = new System.Drawing.Size(368, 127);
+			this.datalocations.TabIndex = 0;
+			// 
+			// apply
+			// 
+			this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.apply.Location = new System.Drawing.Point(178, 524);
+			this.apply.Name = "apply";
+			this.apply.Size = new System.Drawing.Size(112, 25);
+			this.apply.TabIndex = 3;
+			this.apply.Text = "OK";
+			this.apply.UseVisualStyleBackColor = true;
+			this.apply.Click += new System.EventHandler(this.apply_Click);
+			// 
+			// cancel
+			// 
+			this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.cancel.Location = new System.Drawing.Point(296, 524);
+			this.cancel.Name = "cancel";
+			this.cancel.Size = new System.Drawing.Size(112, 25);
+			this.cancel.TabIndex = 4;
+			this.cancel.Text = "Cancel";
+			this.cancel.UseVisualStyleBackColor = true;
+			this.cancel.Click += new System.EventHandler(this.cancel_Click);
+			// 
+			// config
+			// 
+			this.config.DropDownHeight = 206;
+			this.config.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.config.FormattingEnabled = true;
+			this.config.IntegralHeight = false;
+			this.config.Location = new System.Drawing.Point(141, 21);
+			this.config.Name = "config";
+			this.config.Size = new System.Drawing.Size(267, 21);
+			this.config.TabIndex = 0;
+			this.config.SelectedIndexChanged += new System.EventHandler(this.config_SelectedIndexChanged);
+			// 
+			// mapslist
+			// 
+			this.mapslist.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.mapslist.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+            columnHeader1});
+			this.mapslist.FullRowSelect = true;
+			this.mapslist.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
+			this.mapslist.HideSelection = false;
+			this.mapslist.LabelWrap = false;
+			this.mapslist.Location = new System.Drawing.Point(12, 122);
+			this.mapslist.MultiSelect = false;
+			this.mapslist.Name = "mapslist";
+			this.mapslist.ShowGroups = false;
+			this.mapslist.Size = new System.Drawing.Size(396, 118);
+			this.mapslist.Sorting = System.Windows.Forms.SortOrder.Ascending;
+			this.mapslist.TabIndex = 1;
+			this.mapslist.UseCompatibleStateImageBehavior = false;
+			this.mapslist.View = System.Windows.Forms.View.List;
+			this.mapslist.DoubleClick += new System.EventHandler(this.mapslist_DoubleClick);
+			this.mapslist.ItemSelectionChanged += new System.Windows.Forms.ListViewItemSelectionChangedEventHandler(this.mapslist_ItemSelectionChanged);
+			// 
+			// scriptcompiler
+			// 
+			this.scriptcompiler.DropDownHeight = 206;
+			this.scriptcompiler.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.scriptcompiler.Enabled = false;
+			this.scriptcompiler.FormattingEnabled = true;
+			this.scriptcompiler.IntegralHeight = false;
+			this.scriptcompiler.Location = new System.Drawing.Point(141, 49);
+			this.scriptcompiler.Name = "scriptcompiler";
+			this.scriptcompiler.Size = new System.Drawing.Size(267, 21);
+			this.scriptcompiler.TabIndex = 17;
+			// 
+			// scriptcompilerlabel
+			// 
+			this.scriptcompilerlabel.Enabled = false;
+			this.scriptcompilerlabel.Location = new System.Drawing.Point(15, 52);
+			this.scriptcompilerlabel.Name = "scriptcompilerlabel";
+			this.scriptcompilerlabel.Size = new System.Drawing.Size(120, 14);
+			this.scriptcompilerlabel.TabIndex = 18;
+			this.scriptcompilerlabel.Text = "Script Type:";
+			this.scriptcompilerlabel.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// OpenMapOptionsForm
+			// 
+			this.AcceptButton = this.apply;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.CancelButton = this.cancel;
+			this.ClientSize = new System.Drawing.Size(420, 559);
+			this.Controls.Add(this.scriptcompiler);
+			this.Controls.Add(this.scriptcompilerlabel);
+			this.Controls.Add(this.mapslist);
+			this.Controls.Add(label2);
+			this.Controls.Add(this.config);
+			this.Controls.Add(label1);
+			this.Controls.Add(this.cancel);
+			this.Controls.Add(this.apply);
+			this.Controls.Add(this.panelres);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "OpenMapOptionsForm";
+			this.Opacity = 1;
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Open Map Options";
+			this.Shown += new System.EventHandler(this.OpenMapOptionsForm_Shown);
+			this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.OpenMapOptionsForm_HelpRequested);
+			this.panelres.ResumeLayout(false);
+			this.panelres.PerformLayout();
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Button apply;
+		private System.Windows.Forms.Button cancel;
+		private System.Windows.Forms.ComboBox config;
+		private System.Windows.Forms.GroupBox panelres;
+		private System.Windows.Forms.ListView mapslist;
+		private CodeImp.DoomBuilder.Controls.ResourceListEditor datalocations;
+		private System.Windows.Forms.CheckBox strictpatches;
+		private System.Windows.Forms.ComboBox scriptcompiler;
+		private System.Windows.Forms.Label scriptcompilerlabel;
+		private System.Windows.Forms.CheckBox longtexturenames;
+
+
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/OpenMapOptionsForm.cs b/Source/Core/Windows/OpenMapOptionsForm.cs
new file mode 100644
index 0000000..7960737
--- /dev/null
+++ b/Source/Core/Windows/OpenMapOptionsForm.cs
@@ -0,0 +1,566 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.IO;
+using CodeImp.DoomBuilder.Map;
+using System.IO;
+using System.Collections;
+using CodeImp.DoomBuilder.Data;
+using CodeImp.DoomBuilder.Config;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Windows
+{
+	internal partial class OpenMapOptionsForm : DelayedForm
+	{
+		// Variables
+		private Configuration mapsettings;
+		private MapOptions options;
+		private WAD wadfile;
+		private readonly string filepathname;
+		private string selectedmapname;
+		
+		// Properties
+		public string FilePathName { get { return filepathname; } }
+		public MapOptions Options { get { return options; } }
+		
+		// Constructor
+		public OpenMapOptionsForm(string filepathname)
+		{
+			// Initialize
+			InitializeComponent();
+			this.Text = "Open Map from " + Path.GetFileName(filepathname);
+			this.filepathname = filepathname;
+			datalocations.StartPath = filepathname; //mxd
+			this.options = null;
+		}
+
+		// Constructor
+		public OpenMapOptionsForm(string filepathname, MapOptions options)
+		{
+			// Initialize
+			InitializeComponent();
+			this.Text = "Open Map from " + Path.GetFileName(filepathname);
+			this.filepathname = filepathname;
+			this.options = options;
+			datalocations.StartPath = filepathname; //mxd
+			datalocations.EditResourceLocationList(options.Resources);
+		}
+
+		// This loads the settings and attempt to find a suitable config
+		private void LoadSettings()
+		{
+			string gameconfig;
+			int index;
+			
+			// Busy
+			Cursor.Current = Cursors.WaitCursor;
+
+			// Check if the file exists
+			if(!File.Exists(filepathname))
+			{
+				// WAD file does not exist
+				MessageBox.Show(this, "Could not open the WAD file: The file does not exist.", Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Error);
+				this.DialogResult = DialogResult.Cancel;
+				this.Close();
+				return;
+			}
+			
+			try
+			{
+				// Open the WAD file
+				wadfile = new WAD(filepathname, true);
+			}
+			catch(Exception)
+			{
+				// Unable to open WAD file (or its config)
+				MessageBox.Show(this, "Could not open the WAD file for reading. Please make sure the file you selected is valid and is not in use by any other application.", Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Error);
+				if(wadfile != null) wadfile.Dispose();
+				this.DialogResult = DialogResult.Cancel;
+				this.Close();
+				return;
+			}
+
+			// Open the Map Settings configuration
+			string dbsfile = filepathname.Substring(0, filepathname.Length - 4) + ".dbs";
+			if(File.Exists(dbsfile))
+				try { mapsettings = new Configuration(dbsfile, true); }
+				catch(Exception) { mapsettings = new Configuration(true); }
+			else
+				mapsettings = new Configuration(true);
+			
+			// Check strict patches box, check what game configuration is preferred
+			if(options != null) 
+			{
+				strictpatches.Checked = options.StrictPatches;
+				gameconfig = options.ConfigFile;
+			} 
+			else 
+			{
+				strictpatches.Checked = mapsettings.ReadSetting("strictpatches", false);
+				gameconfig = mapsettings.ReadSetting("gameconfig", "");
+			}
+
+			//mxd. Fill script compilers list
+			foreach(KeyValuePair<string, ScriptConfiguration> group in General.CompiledScriptConfigs) 
+			{
+				scriptcompiler.Items.Add(group.Value);
+			}
+
+			//mxd. Go for all enabled configurations
+			for(int i = 0; i < General.Configs.Count; i++) 
+			{
+				if(!General.Configs[i].Enabled) continue;
+				
+				// Add config name to list
+				index = config.Items.Add(General.Configs[i]);
+
+				// Select this item
+				if(General.Configs[i].Filename == gameconfig) config.SelectedIndex = index;
+			}
+
+			//mxd. No dice? Try disabled ones
+			if(config.SelectedIndex == -1) 
+			{
+				for(int i = 0; i < General.Configs.Count; i++) 
+				{
+					if(General.Configs[i].Enabled) continue;
+					if(General.Configs[i].Filename == gameconfig) 
+					{
+						//add and Select this item
+						config.SelectedIndex = config.Items.Add(General.Configs[i]);
+						break;
+					}
+				}
+			}
+
+			// Still no configuration selected?
+			if(config.SelectedIndex == -1) 
+			{
+				// Then go for all configurations with resources to find a suitable one
+				for(int i = 0; i < General.Configs.Count; i++)
+				{
+					// Check if a resource location is set for this configuration, if so, match the wad against this configuration
+					if(General.Configs[i].Resources.Count > 0 && MatchConfiguration(General.Configs[i].Configuration, wadfile))
+					{
+						index = config.Items.IndexOf(General.Configs[i]); //mxd. Already added?
+						config.SelectedIndex = (index != -1 ? index : config.Items.Add(General.Configs[i])); // Select or add and select this item
+						break;
+					}
+				}
+			}
+
+			//mxd. Still no configuration selected?
+			if(config.SelectedIndex == -1) 
+			{
+				// Then go for all configurations without resources to find a suitable one
+				for(int i = 0; i < General.Configs.Count; i++) 
+				{
+					// Check if a resource location is not set for this configuration, if so, match the wad against this configuration
+					if(General.Configs[i].Resources.Count == 0 && MatchConfiguration(General.Configs[i].Configuration, wadfile)) 
+					{
+						index = config.Items.IndexOf(General.Configs[i]); //mxd. Already added?
+						config.SelectedIndex = (index != -1 ? index : config.Items.Add(General.Configs[i])); // Select or add and select this item
+						break;
+					}
+				}
+			}
+			
+			//mxd. Bail out if still no dice...
+			if(config.SelectedIndex == -1)
+			{
+				this.Visible = false;
+				General.ShowWarningMessage("Unable to find maps using any game configuration.\nDoes this wad contain any maps at all?..", MessageBoxButtons.OK);
+				cancel_Click(this, EventArgs.Empty);
+			}
+
+			// Done
+			Cursor.Current = Cursors.Default;
+		}
+		
+		// mxd. This matches a WAD file with the specified game configuration
+		// by checking if the specific lumps are detected
+		private static bool MatchConfiguration(Configuration cfg, WAD wadfile) 
+		{
+			int lumpsrequired = 0;
+
+			// Get the map lump names
+			IDictionary maplumpnames = cfg.ReadSetting("maplumpnames", new Hashtable());
+
+			// Count how many required lumps we have to find
+			foreach(DictionaryEntry ml in maplumpnames) 
+			{
+				// Ignore the map header (it will not be found because the name is different)
+				if(ml.Key.ToString() != MapManager.CONFIG_MAP_HEADER) 
+				{
+					// Read lump setting and count it
+					if(cfg.ReadSetting("maplumpnames." + ml.Key + ".required", false))
+						lumpsrequired++;
+				}
+			}
+
+			// Go for all the lumps in the wad
+			for(int scanindex = 0; scanindex < (wadfile.Lumps.Count - 1); scanindex++) 
+			{
+				// Make sure this lump is not part of the map.
+				if(!maplumpnames.Contains(wadfile.Lumps[scanindex].Name)) 
+				{
+					// Reset check
+					int lumpsfound = 0;
+					int checkoffset = 1;
+
+					// Continue while still within bounds and lumps are still recognized
+					while(((scanindex + checkoffset) < wadfile.Lumps.Count) &&
+						  maplumpnames.Contains(wadfile.Lumps[scanindex + checkoffset].Name)) 
+					{
+						string lumpname = wadfile.Lumps[scanindex + checkoffset].Name;
+						//mxd. Lump cannot present in current map format, fail this check
+						if(cfg.ReadSetting("maplumpnames." + lumpname + ".forbidden", false)) 
+						{
+							lumpsfound = -1;
+							break;
+						}
+
+						// Count the lump when it is marked as required
+						if(cfg.ReadSetting("maplumpnames." + lumpname + ".required", false))
+							lumpsfound++;
+
+						// Check the next lump
+						checkoffset++;
+					}
+
+					// Map found? Let's call it a day :)
+					if(lumpsfound >= lumpsrequired) return true;
+				}
+			}
+
+			return false;
+		}
+
+		// Configuration is selected
+		private void config_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			// Anything selected?
+			if(config.SelectedIndex < 0) return;
+
+			// Keep selected name, if any
+			string selectedname = (mapslist.SelectedItems.Count > 0 ? mapslist.SelectedItems[0].Text : "");
+
+			// Make an array for the map names
+			List<ListViewItem> mapnames = new List<ListViewItem>();
+
+			// Get selected configuration info
+			ConfigurationInfo ci = (config.SelectedItem as ConfigurationInfo);
+
+			//mxd. Get configuration
+			Configuration cfg = ci.Configuration;
+
+			// Get the map lump names
+			IDictionary maplumpnames = cfg.ReadSetting("maplumpnames", new Hashtable());
+
+			// Count how many required lumps we have to find
+			int lumpsrequired = 0;
+			foreach(DictionaryEntry ml in maplumpnames) 
+			{
+				// Ignore the map header (it will not be found because the name is different)
+				if(ml.Key.ToString() != MapManager.CONFIG_MAP_HEADER) 
+				{
+					// Read lump setting and count it
+					if(cfg.ReadSetting("maplumpnames." + ml.Key + ".required", false))
+						lumpsrequired++;
+				}
+			}
+
+			// Go for all the lumps in the wad
+			for(int scanindex = 0; scanindex < (wadfile.Lumps.Count - 1); scanindex++) 
+			{
+				// Make sure this lump is not part of the map.
+				if(!maplumpnames.Contains(wadfile.Lumps[scanindex].Name)) 
+				{
+					// Reset check
+					int lumpsfound = 0;
+					int checkoffset = 1;
+
+					// Continue while still within bounds and lumps are still recognized
+					while(((scanindex + checkoffset) < wadfile.Lumps.Count) &&
+						  maplumpnames.Contains(wadfile.Lumps[scanindex + checkoffset].Name)) 
+					{
+						string lumpname = wadfile.Lumps[scanindex + checkoffset].Name;
+						//mxd. Lump cannot present in current map format, fail this check
+						if(cfg.ReadSetting("maplumpnames." + lumpname + ".forbidden", false)) 
+						{
+							lumpsfound = -1;
+							break;
+						}
+
+						// Count the lump when it is marked as required
+						if(cfg.ReadSetting("maplumpnames." + lumpname + ".required", false))
+							lumpsfound++;
+
+						// Check the next lump
+						checkoffset++;
+					}
+
+					// Map found? Then add it to the list
+					if(lumpsfound >= lumpsrequired)
+						mapnames.Add(new ListViewItem(wadfile.Lumps[scanindex].Name));
+				}
+			}
+
+			// Clear the list and add the new map names
+			mapslist.BeginUpdate();
+			mapslist.Items.Clear();
+			mapslist.Items.AddRange(mapnames.ToArray());
+			mapslist.Sort();
+
+			// Go for all items in the list
+			foreach(ListViewItem item in mapslist.Items) 
+			{
+				// Was this item previously selected?
+				if(item.Text == selectedname) 
+				{
+					// Select it again
+					item.Selected = true;
+					break;
+				}
+			}
+			if((mapslist.SelectedItems.Count == 0) && (mapslist.Items.Count > 0))
+				mapslist.Items[0].Selected = true;
+			mapslist.EndUpdate();
+
+			//mxd. Disable script compiler selector when there are no maps detected using current configuration
+			if(mapslist.Items.Count == 0) 
+			{
+				scriptcompiler.Enabled = false;
+				scriptcompiler.SelectedIndex = -1;
+				scriptcompilerlabel.Enabled = false;
+			}
+
+			// Show configuration resources
+			datalocations.FixedResourceLocationList(ci.Resources);
+
+			// Update long texture names checkbox (mxd)
+			longtexturenames.Enabled = cfg.ReadSetting("longtexturenames", false);
+			longtexturenames.Checked = (longtexturenames.Enabled && options != null && options.UseLongTextureNames);
+		}
+		
+		// OK clicked
+		private void apply_Click(object sender, EventArgs e)
+		{
+			// Configuration selected?
+			if(config.SelectedIndex == -1)
+			{
+				// Select a configuration!
+				MessageBox.Show(this, "Please select a game configuration to use for editing your map.", Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+				config.Focus();
+				return;
+			}
+
+			//mxd. Script configuration selected?
+			if(scriptcompiler.Enabled && scriptcompiler.SelectedIndex == -1)
+			{
+				// Select a configuration!
+				MessageBox.Show(this, "Please select a script type to use for editing your map.", Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+				scriptcompiler.Focus();
+				return;
+			}
+			
+			// Collect information
+			ConfigurationInfo configinfo = (config.SelectedItem as ConfigurationInfo); //mxd
+			DataLocationList locations = datalocations.GetResources();
+
+			// Resources are valid? (mxd)
+			if(!datalocations.ResourcesAreValid())
+			{
+				MessageBox.Show(this, "Cannot open map: at least one resource doesn't exist!", Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+				datalocations.Focus();
+				return;
+			}
+			
+			// No map selected?
+			if(mapslist.SelectedItems.Count == 0)
+			{
+				// Choose a map!
+				MessageBox.Show(this, "Please select a map to load for editing.", Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+				mapslist.Focus();
+				return;
+			}
+
+			//mxd. We cant't deal with this... We just can't... 
+			if(!configinfo.ValidateMapName(mapslist.SelectedItems[0].Text.ToUpperInvariant()))
+			{
+				// Choose a different map!
+				MessageBox.Show(this, "Selected map name conflicts with a lump name defined for current map format.\nPlease rename the map and try again.", Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+				mapslist.Focus();
+				return;
+			}
+			
+			// Check if we should warn the user for missing resources
+			if((wadfile.Type != WAD.TYPE_IWAD) && (locations.Count == 0) && (configinfo.Resources.Count == 0))
+			{
+				if(MessageBox.Show(this, "You are about to load a map without selecting any resources. Textures, flats and " +
+										 "sprites may not be shown correctly or may not show up at all. Do you want to continue?", Application.ProductName,
+										 MessageBoxButtons.YesNo, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button2) == DialogResult.No)
+				{
+					return;
+				}
+			}
+			
+			// Apply changes
+			options.ClearResources();
+			options.ConfigFile = configinfo.Filename;
+			options.CurrentName = mapslist.SelectedItems[0].Text;
+			options.StrictPatches = strictpatches.Checked;
+			options.CopyResources(locations);
+
+			//mxd. Store script compiler
+			if(scriptcompiler.Enabled) 
+			{
+				ScriptConfiguration scriptcfg = scriptcompiler.SelectedItem as ScriptConfiguration;
+				foreach(KeyValuePair<string, ScriptConfiguration> group in General.CompiledScriptConfigs) 
+				{
+					if(group.Value == scriptcfg) 
+					{
+						options.ScriptCompiler = group.Key;
+						break;
+					}
+				}
+			}
+
+			//mxd. Use long texture names?
+			if(longtexturenames.Enabled) options.UseLongTextureNames = longtexturenames.Checked;
+
+			// Hide window
+			wadfile.Dispose();
+			this.DialogResult = DialogResult.OK;
+			this.Close();
+		}
+		
+		// Cancel clicked
+		private void cancel_Click(object sender, EventArgs e)
+		{
+			// Just hide window
+			wadfile.Dispose();
+			this.DialogResult = DialogResult.Cancel;
+			this.Close();
+		}
+
+		// Window is shown
+		private void OpenMapOptionsForm_Shown(object sender, EventArgs e)
+		{
+			// Update window
+			this.Update();
+			
+			// Load settings
+			LoadSettings();
+		}
+
+		// Map name doubleclicked
+		private void mapslist_DoubleClick(object sender, EventArgs e)
+		{
+			// Click OK
+			if(mapslist.SelectedItems.Count > 0) apply.PerformClick();
+		}
+
+		// Map name selected
+		private void mapslist_ItemSelectionChanged(object sender, ListViewItemSelectionChangedEventArgs e)
+		{
+			if(!e.IsSelected) return; //mxd. Don't want to trigger this twice
+			
+			DataLocationList locations;
+			DataLocationList listedlocations;
+			string scriptconfig = string.Empty; //mxd
+			
+			// Map previously selected?
+			if(!string.IsNullOrEmpty(selectedmapname))
+			{
+				// Get locations from previous selected map settings
+				locations = new DataLocationList(mapsettings, "maps." + selectedmapname + ".resources");
+				listedlocations = datalocations.GetResources();
+				
+				// Remove data locations that this map has in its config
+				foreach(DataLocation dl in locations)
+					listedlocations.Remove(dl);
+
+				// Set new data locations
+				datalocations.EditResourceLocationList(listedlocations);
+
+				// Done
+				selectedmapname = null;
+			}
+			
+			// Anything selected?
+			if(mapslist.SelectedItems.Count > 0)
+			{
+				// Get the map name
+				selectedmapname = mapslist.SelectedItems[0].Text;
+				options = new MapOptions(mapsettings, selectedmapname, longtexturenames.Enabled);
+				
+				// Get locations from previous selected map settings
+				locations = new DataLocationList(mapsettings, "maps." + selectedmapname + ".resources");
+				listedlocations = datalocations.GetResources();
+
+				// Add data locations that this map has in its config
+				foreach(DataLocation dl in locations)
+					if(!listedlocations.Contains(dl)) listedlocations.Add(dl);
+
+				// Set new data locations
+				datalocations.EditResourceLocationList(listedlocations);
+
+				//mxd. Select script compiler
+				ConfigurationInfo info = config.SelectedItem as ConfigurationInfo;
+				if(info != null)
+				{
+					if(!string.IsNullOrEmpty(options.ScriptCompiler) && General.CompiledScriptConfigs.ContainsKey(options.ScriptCompiler))
+					{
+						scriptconfig = options.ScriptCompiler;
+					}
+					else if(!string.IsNullOrEmpty(info.DefaultScriptCompiler) && General.CompiledScriptConfigs.ContainsKey(info.DefaultScriptCompiler))
+					{
+						scriptconfig = info.DefaultScriptCompiler;
+					}
+				}
+			}
+
+			//mxd. Select proper script compiler
+			if(!string.IsNullOrEmpty(scriptconfig))
+			{
+				scriptcompiler.Enabled = true;
+				scriptcompiler.SelectedItem = General.CompiledScriptConfigs[scriptconfig];
+				scriptcompilerlabel.Enabled = true;
+			}
+			else
+			{
+				scriptcompiler.Enabled = false;
+				scriptcompiler.SelectedIndex = -1;
+				scriptcompilerlabel.Enabled = false;
+			}
+		}
+
+		// Help
+		private void OpenMapOptionsForm_HelpRequested(object sender, HelpEventArgs hlpevent)
+		{
+			General.ShowHelp("w_openmapoptions.html");
+			hlpevent.Handled = true;
+		}
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/OpenMapOptionsForm.resx b/Source/Core/Windows/OpenMapOptionsForm.resx
new file mode 100644
index 0000000..d388920
--- /dev/null
+++ b/Source/Core/Windows/OpenMapOptionsForm.resx
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="columnHeader1.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label1.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label2.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label3.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <data name="label3.Text" xml:space="preserve">
+    <value>Drag &amp;&amp; drop resources to add them.
+Drag items to change order (lower items override higher items).
+Use the context menu to cut, copy, paste or remove items.
+Grayed items are loaded according to the game configuration.</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Windows/PasteOptionsForm.Designer.cs b/Source/Core/Windows/PasteOptionsForm.Designer.cs
new file mode 100644
index 0000000..ba1c9fc
--- /dev/null
+++ b/Source/Core/Windows/PasteOptionsForm.Designer.cs
@@ -0,0 +1,98 @@
+namespace CodeImp.DoomBuilder.Windows
+{
+	partial class PasteOptionsForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.paste = new System.Windows.Forms.Button();
+			this.cancel = new System.Windows.Forms.Button();
+			this.pasteoptions = new CodeImp.DoomBuilder.Controls.PasteOptionsControl();
+			this.SuspendLayout();
+			// 
+			// paste
+			// 
+			this.paste.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.paste.Location = new System.Drawing.Point(142, 214);
+			this.paste.Name = "paste";
+			this.paste.Size = new System.Drawing.Size(112, 25);
+			this.paste.TabIndex = 3;
+			this.paste.Text = "Paste";
+			this.paste.UseVisualStyleBackColor = true;
+			this.paste.Click += new System.EventHandler(this.paste_Click);
+			// 
+			// cancel
+			// 
+			this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.cancel.Location = new System.Drawing.Point(260, 214);
+			this.cancel.Name = "cancel";
+			this.cancel.Size = new System.Drawing.Size(112, 25);
+			this.cancel.TabIndex = 4;
+			this.cancel.Text = "Cancel";
+			this.cancel.UseVisualStyleBackColor = true;
+			this.cancel.Click += new System.EventHandler(this.cancel_Click);
+			// 
+			// pasteoptions
+			// 
+			this.pasteoptions.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.pasteoptions.Location = new System.Drawing.Point(12, 12);
+			this.pasteoptions.Name = "pasteoptions";
+			this.pasteoptions.Size = new System.Drawing.Size(360, 188);
+			this.pasteoptions.TabIndex = 5;
+			// 
+			// PasteOptionsForm
+			// 
+			this.AcceptButton = this.paste;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.CancelButton = this.cancel;
+			this.ClientSize = new System.Drawing.Size(384, 246);
+			this.Controls.Add(this.pasteoptions);
+			this.Controls.Add(this.cancel);
+			this.Controls.Add(this.paste);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "PasteOptionsForm";
+			this.Opacity = 1;
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Paste Special";
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Button paste;
+		private System.Windows.Forms.Button cancel;
+		private CodeImp.DoomBuilder.Controls.PasteOptionsControl pasteoptions;
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/PasteOptionsForm.cs b/Source/Core/Windows/PasteOptionsForm.cs
new file mode 100644
index 0000000..9f0b4c6
--- /dev/null
+++ b/Source/Core/Windows/PasteOptionsForm.cs
@@ -0,0 +1,74 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Config;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Windows
+{
+	internal partial class PasteOptionsForm : DelayedForm
+	{
+		#region ================== Variables
+		
+		private PasteOptions options;
+		
+		#endregion
+		
+		#region ================== Properties
+		
+		public PasteOptions Options { get { return options; } }
+		
+		#endregion
+		
+		#region ================== Constructor
+		
+		// Constructor
+		public PasteOptionsForm()
+		{
+			InitializeComponent();
+			
+			// Get defaults
+			options = General.Settings.PasteOptions.Copy();
+			pasteoptions.Setup(options);
+		}
+		
+		#endregion
+		
+		#region ================== Events
+		
+		// Paste clicked
+		private void paste_Click(object sender, EventArgs e)
+		{
+			options = pasteoptions.GetOptions();
+			this.DialogResult = DialogResult.OK;
+			this.Close();
+		}
+		
+		// Cancel clicked
+		private void cancel_Click(object sender, EventArgs e)
+		{
+			this.DialogResult = DialogResult.Cancel;
+			this.Close();
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/Windows/PasteOptionsForm.resx b/Source/Core/Windows/PasteOptionsForm.resx
new file mode 100644
index 0000000..19dc0dd
--- /dev/null
+++ b/Source/Core/Windows/PasteOptionsForm.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Windows/PluginToolbarButton.cs b/Source/Core/Windows/PluginToolbarButton.cs
new file mode 100644
index 0000000..b0d34ad
--- /dev/null
+++ b/Source/Core/Windows/PluginToolbarButton.cs
@@ -0,0 +1,30 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Windows.Forms;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Windows
+{
+	public struct PluginToolbarButton
+	{
+		public ToolbarSection section;
+		public ToolStripItem button;
+	}
+}
diff --git a/Source/Core/Windows/PreferencesController.cs b/Source/Core/Windows/PreferencesController.cs
new file mode 100644
index 0000000..f56cebc
--- /dev/null
+++ b/Source/Core/Windows/PreferencesController.cs
@@ -0,0 +1,94 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Windows.Forms;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Windows
+{
+	public class PreferencesController
+	{
+		#region ================== Delegates
+
+		public delegate void AcceptDelegate(PreferencesController controller);
+		public delegate void CancelDelegate(PreferencesController controller);
+
+		public event AcceptDelegate OnAccept;
+		public event CancelDelegate OnCancel;
+
+		#endregion
+
+		#region ================== Variables
+
+		private PreferencesForm form;
+		private bool allowaddtab;
+
+		#endregion
+
+		#region ================== Properties
+
+		internal bool AllowAddTab { get { return allowaddtab; } set { allowaddtab = value; } }
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		// Constructor
+		internal PreferencesController(PreferencesForm form)
+		{
+			// Initialize
+			this.form = form;
+		}
+
+		// Destructor
+		~PreferencesController()
+		{
+			form = null;
+			OnAccept = null;
+			OnCancel = null;
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This adds a preferences tab
+		public void AddTab(TabPage tab)
+		{
+			if(!allowaddtab) throw new InvalidOperationException("Tab pages can only be added when the dialog is being initialized");
+
+			form.AddTabPage(tab);
+		}
+		
+		// This raises the OnAccept event
+		public void RaiseAccept()
+		{
+			if(OnAccept != null) OnAccept(this);
+		}
+
+		// This raises the OnCancel event
+		public void RaiseCancel()
+		{
+			if(OnCancel != null) OnCancel(this);
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/Windows/PreferencesForm.Designer.cs b/Source/Core/Windows/PreferencesForm.Designer.cs
new file mode 100644
index 0000000..1195769
--- /dev/null
+++ b/Source/Core/Windows/PreferencesForm.Designer.cs
@@ -0,0 +1,2105 @@
+namespace CodeImp.DoomBuilder.Windows
+{
+	partial class PreferencesForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				controller = null;
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.components = new System.ComponentModel.Container();
+			System.Windows.Forms.Label label7;
+			System.Windows.Forms.Label label6;
+			System.Windows.Forms.Label label5;
+			System.Windows.Forms.GroupBox groupBox1;
+			System.Windows.Forms.Label label1;
+			System.Windows.Forms.Label label18;
+			System.Windows.Forms.Label label20;
+			System.Windows.Forms.Label label21;
+			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PreferencesForm));
+			this.checkforupdates = new System.Windows.Forms.CheckBox();
+			this.cbStoreEditTab = new System.Windows.Forms.CheckBox();
+			this.locatetexturegroup = new System.Windows.Forms.CheckBox();
+			this.recentFiles = new System.Windows.Forms.TrackBar();
+			this.labelRecentFiles = new System.Windows.Forms.Label();
+			this.label25 = new System.Windows.Forms.Label();
+			this.vertexScaleLabel = new System.Windows.Forms.Label();
+			this.label22 = new System.Windows.Forms.Label();
+			this.vertexScale = new System.Windows.Forms.TrackBar();
+			this.cbSynchCameras = new System.Windows.Forms.CheckBox();
+			this.showtexturesizes = new System.Windows.Forms.CheckBox();
+			this.scriptontop = new System.Windows.Forms.CheckBox();
+			this.zoomfactor = new System.Windows.Forms.TrackBar();
+			this.zoomfactorlabel = new System.Windows.Forms.Label();
+			this.label19 = new System.Windows.Forms.Label();
+			this.autoscrollspeed = new System.Windows.Forms.TrackBar();
+			this.autoscrollspeedlabel = new System.Windows.Forms.Label();
+			this.label15 = new System.Windows.Forms.Label();
+			this.previewsize = new System.Windows.Forms.TrackBar();
+			this.previewsizelabel = new System.Windows.Forms.Label();
+			this.label12 = new System.Windows.Forms.Label();
+			this.label14 = new System.Windows.Forms.Label();
+			this.defaultviewmode = new System.Windows.Forms.ComboBox();
+			this.keyusedlabel = new System.Windows.Forms.Label();
+			this.colorsgroup1 = new System.Windows.Forms.GroupBox();
+			this.color3dFloors = new CodeImp.DoomBuilder.Controls.ColorControl();
+			this.colorInfo = new CodeImp.DoomBuilder.Controls.ColorControl();
+			this.colorMD3 = new CodeImp.DoomBuilder.Controls.ColorControl();
+			this.doublesidedalpha = new System.Windows.Forms.TrackBar();
+			this.colorgrid64 = new CodeImp.DoomBuilder.Controls.ColorControl();
+			this.colorgrid = new CodeImp.DoomBuilder.Controls.ColorControl();
+			this.colorindication = new CodeImp.DoomBuilder.Controls.ColorControl();
+			this.colorbackcolor = new CodeImp.DoomBuilder.Controls.ColorControl();
+			this.label2 = new System.Windows.Forms.Label();
+			this.doublesidedalphalabel = new System.Windows.Forms.Label();
+			this.colorselection = new CodeImp.DoomBuilder.Controls.ColorControl();
+			this.colorvertices = new CodeImp.DoomBuilder.Controls.ColorControl();
+			this.colorhighlight = new CodeImp.DoomBuilder.Controls.ColorControl();
+			this.colorlinedefs = new CodeImp.DoomBuilder.Controls.ColorControl();
+			this.cbStretchView = new System.Windows.Forms.CheckBox();
+			this.qualitydisplay = new System.Windows.Forms.CheckBox();
+			this.cancel = new System.Windows.Forms.Button();
+			this.apply = new System.Windows.Forms.Button();
+			this.tabs = new System.Windows.Forms.TabControl();
+			this.tabinterface = new System.Windows.Forms.TabPage();
+			this.groupBox3 = new System.Windows.Forms.GroupBox();
+			this.resetscreenshotsdir = new System.Windows.Forms.Button();
+			this.browsescreenshotsdir = new System.Windows.Forms.Button();
+			this.screenshotsfolderpath = new System.Windows.Forms.TextBox();
+			this.groupBox5 = new System.Windows.Forms.GroupBox();
+			this.toolbar_gzdoom = new System.Windows.Forms.CheckBox();
+			this.toolbar_file = new System.Windows.Forms.CheckBox();
+			this.toolbar_testing = new System.Windows.Forms.CheckBox();
+			this.toolbar_geometry = new System.Windows.Forms.CheckBox();
+			this.toolbar_viewmodes = new System.Windows.Forms.CheckBox();
+			this.toolbar_filter = new System.Windows.Forms.CheckBox();
+			this.toolbar_prefabs = new System.Windows.Forms.CheckBox();
+			this.toolbar_copy = new System.Windows.Forms.CheckBox();
+			this.toolbar_undo = new System.Windows.Forms.CheckBox();
+			this.toolbar_script = new System.Windows.Forms.CheckBox();
+			this.groupBox4 = new System.Windows.Forms.GroupBox();
+			this.collapsedockers = new System.Windows.Forms.CheckBox();
+			this.dockersposition = new System.Windows.Forms.ComboBox();
+			this.label17 = new System.Windows.Forms.Label();
+			this.groupBox2 = new System.Windows.Forms.GroupBox();
+			this.vertexScale3D = new System.Windows.Forms.TrackBar();
+			this.vertexScale3DLabel = new System.Windows.Forms.Label();
+			this.label26 = new System.Windows.Forms.Label();
+			this.viewdistance = new System.Windows.Forms.TrackBar();
+			this.movespeed = new System.Windows.Forms.TrackBar();
+			this.mousespeed = new System.Windows.Forms.TrackBar();
+			this.fieldofview = new System.Windows.Forms.TrackBar();
+			this.viewdistancelabel = new System.Windows.Forms.Label();
+			this.label13 = new System.Windows.Forms.Label();
+			this.invertyaxis = new System.Windows.Forms.CheckBox();
+			this.movespeedlabel = new System.Windows.Forms.Label();
+			this.label11 = new System.Windows.Forms.Label();
+			this.mousespeedlabel = new System.Windows.Forms.Label();
+			this.label9 = new System.Windows.Forms.Label();
+			this.fieldofviewlabel = new System.Windows.Forms.Label();
+			this.label4 = new System.Windows.Forms.Label();
+			this.tabkeys = new System.Windows.Forms.TabPage();
+			this.bClearActionFilter = new System.Windows.Forms.Button();
+			this.tbFilterActions = new System.Windows.Forms.TextBox();
+			this.label24 = new System.Windows.Forms.Label();
+			this.listactions = new System.Windows.Forms.ListView();
+			this.columncontrolaction = new System.Windows.Forms.ColumnHeader();
+			this.columncontrolkey = new System.Windows.Forms.ColumnHeader();
+			this.actioncontrolpanel = new System.Windows.Forms.GroupBox();
+			this.actiondescription = new System.Windows.Forms.TextBox();
+			this.keyusedlist = new System.Windows.Forms.ListBox();
+			this.disregardshiftlabel = new System.Windows.Forms.Label();
+			this.actioncontrol = new System.Windows.Forms.ComboBox();
+			this.actiontitle = new System.Windows.Forms.Label();
+			this.actioncontrolclear = new System.Windows.Forms.Button();
+			this.actionkey = new System.Windows.Forms.TextBox();
+			this.tabcolors = new System.Windows.Forms.TabPage();
+			this.appearancegroup1 = new System.Windows.Forms.GroupBox();
+			this.capitalizetexturenames = new System.Windows.Forms.CheckBox();
+			this.cbMarkExtraFloors = new System.Windows.Forms.CheckBox();
+			this.cbOldHighlightMode = new System.Windows.Forms.CheckBox();
+			this.labelDynLightIntensity = new System.Windows.Forms.Label();
+			this.tbDynLightIntensity = new System.Windows.Forms.TrackBar();
+			this.labelDynLightSize = new System.Windows.Forms.Label();
+			this.tbDynLightSize = new System.Windows.Forms.TrackBar();
+			this.labelDynLightCount = new System.Windows.Forms.Label();
+			this.tbDynLightCount = new System.Windows.Forms.TrackBar();
+			this.animatevisualselection = new System.Windows.Forms.CheckBox();
+			this.blackbrowsers = new System.Windows.Forms.CheckBox();
+			this.visualbilinear = new System.Windows.Forms.CheckBox();
+			this.classicbilinear = new System.Windows.Forms.CheckBox();
+			this.imagebrightnesslabel = new System.Windows.Forms.Label();
+			this.imagebrightness = new System.Windows.Forms.TrackBar();
+			this.colorsgroup3 = new System.Windows.Forms.GroupBox();
+			this.snippetsallmanstyle = new System.Windows.Forms.CheckBox();
+			this.scripttabwidth = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.scriptautoindent = new System.Windows.Forms.CheckBox();
+			this.label10 = new System.Windows.Forms.Label();
+			this.fontpreview = new System.Windows.Forms.RichTextBox();
+			this.scriptfontsize = new System.Windows.Forms.ComboBox();
+			this.label8 = new System.Windows.Forms.Label();
+			this.scriptfontbold = new System.Windows.Forms.CheckBox();
+			this.scriptfontname = new System.Windows.Forms.ComboBox();
+			this.label3 = new System.Windows.Forms.Label();
+			this.colorconstants = new CodeImp.DoomBuilder.Controls.ColorControl();
+			this.colorliterals = new CodeImp.DoomBuilder.Controls.ColorControl();
+			this.colorscriptbackground = new CodeImp.DoomBuilder.Controls.ColorControl();
+			this.colorkeywords = new CodeImp.DoomBuilder.Controls.ColorControl();
+			this.colorlinenumbers = new CodeImp.DoomBuilder.Controls.ColorControl();
+			this.colorcomments = new CodeImp.DoomBuilder.Controls.ColorControl();
+			this.colorplaintext = new CodeImp.DoomBuilder.Controls.ColorControl();
+			this.tabpasting = new System.Windows.Forms.TabPage();
+			this.label16 = new System.Windows.Forms.Label();
+			this.pasteoptions = new CodeImp.DoomBuilder.Controls.PasteOptionsControl();
+			this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
+			this.browseScreenshotsFolderDialog = new System.Windows.Forms.FolderBrowserDialog();
+			label7 = new System.Windows.Forms.Label();
+			label6 = new System.Windows.Forms.Label();
+			label5 = new System.Windows.Forms.Label();
+			groupBox1 = new System.Windows.Forms.GroupBox();
+			label1 = new System.Windows.Forms.Label();
+			label18 = new System.Windows.Forms.Label();
+			label20 = new System.Windows.Forms.Label();
+			label21 = new System.Windows.Forms.Label();
+			groupBox1.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.recentFiles)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.vertexScale)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.zoomfactor)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.autoscrollspeed)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.previewsize)).BeginInit();
+			this.colorsgroup1.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.doublesidedalpha)).BeginInit();
+			this.tabs.SuspendLayout();
+			this.tabinterface.SuspendLayout();
+			this.groupBox3.SuspendLayout();
+			this.groupBox5.SuspendLayout();
+			this.groupBox4.SuspendLayout();
+			this.groupBox2.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.vertexScale3D)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.viewdistance)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.movespeed)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.mousespeed)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.fieldofview)).BeginInit();
+			this.tabkeys.SuspendLayout();
+			this.actioncontrolpanel.SuspendLayout();
+			this.tabcolors.SuspendLayout();
+			this.appearancegroup1.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.tbDynLightIntensity)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.tbDynLightSize)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.tbDynLightCount)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.imagebrightness)).BeginInit();
+			this.colorsgroup3.SuspendLayout();
+			this.tabpasting.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// label7
+			// 
+			label7.AutoSize = true;
+			label7.Location = new System.Drawing.Point(20, 172);
+			label7.Name = "label7";
+			label7.Size = new System.Drawing.Size(182, 13);
+			label7.TabIndex = 7;
+			label7.Text = "Or select a special input control here:";
+			// 
+			// label6
+			// 
+			label6.AutoSize = true;
+			label6.Location = new System.Drawing.Point(20, 30);
+			label6.Name = "label6";
+			label6.Size = new System.Drawing.Size(40, 13);
+			label6.TabIndex = 2;
+			label6.Text = "Action:";
+			// 
+			// label5
+			// 
+			label5.AutoSize = true;
+			label5.Location = new System.Drawing.Point(20, 122);
+			label5.Name = "label5";
+			label5.Size = new System.Drawing.Size(195, 13);
+			label5.TabIndex = 4;
+			label5.Text = "Press the desired key combination here:";
+			// 
+			// groupBox1
+			// 
+			groupBox1.Controls.Add(this.checkforupdates);
+			groupBox1.Controls.Add(this.cbStoreEditTab);
+			groupBox1.Controls.Add(this.locatetexturegroup);
+			groupBox1.Controls.Add(this.recentFiles);
+			groupBox1.Controls.Add(this.labelRecentFiles);
+			groupBox1.Controls.Add(this.label25);
+			groupBox1.Controls.Add(this.vertexScaleLabel);
+			groupBox1.Controls.Add(this.label22);
+			groupBox1.Controls.Add(this.vertexScale);
+			groupBox1.Controls.Add(this.cbSynchCameras);
+			groupBox1.Controls.Add(this.showtexturesizes);
+			groupBox1.Controls.Add(this.scriptontop);
+			groupBox1.Controls.Add(this.zoomfactor);
+			groupBox1.Controls.Add(this.zoomfactorlabel);
+			groupBox1.Controls.Add(this.label19);
+			groupBox1.Controls.Add(this.autoscrollspeed);
+			groupBox1.Controls.Add(this.autoscrollspeedlabel);
+			groupBox1.Controls.Add(this.label15);
+			groupBox1.Controls.Add(this.previewsize);
+			groupBox1.Controls.Add(this.previewsizelabel);
+			groupBox1.Controls.Add(this.label12);
+			groupBox1.Controls.Add(this.label14);
+			groupBox1.Controls.Add(this.defaultviewmode);
+			groupBox1.Location = new System.Drawing.Point(8, 8);
+			groupBox1.Name = "groupBox1";
+			groupBox1.Size = new System.Drawing.Size(331, 438);
+			groupBox1.TabIndex = 0;
+			groupBox1.TabStop = false;
+			groupBox1.Text = " Options ";
+			// 
+			// checkforupdates
+			// 
+			this.checkforupdates.AutoSize = true;
+			this.checkforupdates.Location = new System.Drawing.Point(32, 392);
+			this.checkforupdates.Name = "checkforupdates";
+			this.checkforupdates.Size = new System.Drawing.Size(160, 17);
+			this.checkforupdates.TabIndex = 51;
+			this.checkforupdates.Text = "Check for updates at startup";
+			this.checkforupdates.UseVisualStyleBackColor = true;
+			// 
+			// cbStoreEditTab
+			// 
+			this.cbStoreEditTab.AutoSize = true;
+			this.cbStoreEditTab.Location = new System.Drawing.Point(32, 371);
+			this.cbStoreEditTab.Name = "cbStoreEditTab";
+			this.cbStoreEditTab.Size = new System.Drawing.Size(203, 17);
+			this.cbStoreEditTab.TabIndex = 50;
+			this.cbStoreEditTab.Text = "Edit windows remember selected tabs";
+			this.cbStoreEditTab.UseVisualStyleBackColor = true;
+			// 
+			// locatetexturegroup
+			// 
+			this.locatetexturegroup.AutoSize = true;
+			this.locatetexturegroup.Location = new System.Drawing.Point(32, 329);
+			this.locatetexturegroup.Name = "locatetexturegroup";
+			this.locatetexturegroup.Size = new System.Drawing.Size(267, 17);
+			this.locatetexturegroup.TabIndex = 49;
+			this.locatetexturegroup.Text = "Select texture group when opening image browsers";
+			this.toolTip1.SetToolTip(this.locatetexturegroup, "When enabled, the group current texture belongs to\r\nwill be selected when opening" +
+					" image browsers.\r\nWhen disabled, \"All\" texture group will be selected.");
+			this.locatetexturegroup.UseVisualStyleBackColor = true;
+			// 
+			// recentFiles
+			// 
+			this.recentFiles.BackColor = System.Drawing.SystemColors.Window;
+			this.recentFiles.LargeChange = 1;
+			this.recentFiles.Location = new System.Drawing.Point(127, 233);
+			this.recentFiles.Maximum = 25;
+			this.recentFiles.Minimum = 8;
+			this.recentFiles.Name = "recentFiles";
+			this.recentFiles.Size = new System.Drawing.Size(116, 45);
+			this.recentFiles.TabIndex = 46;
+			this.recentFiles.TickStyle = System.Windows.Forms.TickStyle.Both;
+			this.recentFiles.Value = 8;
+			this.recentFiles.ValueChanged += new System.EventHandler(this.recentFiles_ValueChanged);
+			// 
+			// labelRecentFiles
+			// 
+			this.labelRecentFiles.AutoSize = true;
+			this.labelRecentFiles.Location = new System.Drawing.Point(249, 245);
+			this.labelRecentFiles.Name = "labelRecentFiles";
+			this.labelRecentFiles.Size = new System.Drawing.Size(13, 13);
+			this.labelRecentFiles.TabIndex = 48;
+			this.labelRecentFiles.Text = "8";
+			// 
+			// label25
+			// 
+			this.label25.AutoSize = true;
+			this.label25.Location = new System.Drawing.Point(31, 246);
+			this.label25.Name = "label25";
+			this.label25.Size = new System.Drawing.Size(87, 13);
+			this.label25.TabIndex = 47;
+			this.label25.Text = "Max. recent files:";
+			this.toolTip1.SetToolTip(this.label25, "Controls how many recent files \r\nare shown in the \"File\" menu.");
+			// 
+			// vertexScaleLabel
+			// 
+			this.vertexScaleLabel.AutoSize = true;
+			this.vertexScaleLabel.Location = new System.Drawing.Point(249, 198);
+			this.vertexScaleLabel.Name = "vertexScaleLabel";
+			this.vertexScaleLabel.Size = new System.Drawing.Size(74, 13);
+			this.vertexScaleLabel.TabIndex = 45;
+			this.vertexScaleLabel.Text = "100% (default)";
+			// 
+			// label22
+			// 
+			this.label22.AutoSize = true;
+			this.label22.Location = new System.Drawing.Point(26, 198);
+			this.label22.Name = "label22";
+			this.label22.Size = new System.Drawing.Size(91, 13);
+			this.label22.TabIndex = 44;
+			this.label22.Text = "Vertex scale (2D):";
+			this.toolTip1.SetToolTip(this.label22, "Sets the size of vertex handles\r\nin 2D modes");
+			// 
+			// vertexScale
+			// 
+			this.vertexScale.BackColor = System.Drawing.SystemColors.Window;
+			this.vertexScale.LargeChange = 1;
+			this.vertexScale.Location = new System.Drawing.Point(127, 186);
+			this.vertexScale.Minimum = 1;
+			this.vertexScale.Name = "vertexScale";
+			this.vertexScale.Size = new System.Drawing.Size(116, 45);
+			this.vertexScale.TabIndex = 43;
+			this.vertexScale.TickStyle = System.Windows.Forms.TickStyle.Both;
+			this.vertexScale.Value = 1;
+			this.vertexScale.ValueChanged += new System.EventHandler(this.vertexScale_ValueChanged);
+			// 
+			// cbSynchCameras
+			// 
+			this.cbSynchCameras.AutoSize = true;
+			this.cbSynchCameras.Location = new System.Drawing.Point(32, 350);
+			this.cbSynchCameras.Name = "cbSynchCameras";
+			this.cbSynchCameras.Size = new System.Drawing.Size(260, 17);
+			this.cbSynchCameras.TabIndex = 42;
+			this.cbSynchCameras.Text = "Sync camera position between 2D and 3D modes";
+			this.cbSynchCameras.UseVisualStyleBackColor = true;
+			// 
+			// showtexturesizes
+			// 
+			this.showtexturesizes.AutoSize = true;
+			this.showtexturesizes.Location = new System.Drawing.Point(32, 308);
+			this.showtexturesizes.Name = "showtexturesizes";
+			this.showtexturesizes.Size = new System.Drawing.Size(208, 17);
+			this.showtexturesizes.TabIndex = 41;
+			this.showtexturesizes.Text = "Show texture and flat sizes in browsers";
+			this.showtexturesizes.UseVisualStyleBackColor = true;
+			// 
+			// scriptontop
+			// 
+			this.scriptontop.AutoSize = true;
+			this.scriptontop.Location = new System.Drawing.Point(32, 287);
+			this.scriptontop.Name = "scriptontop";
+			this.scriptontop.Size = new System.Drawing.Size(227, 17);
+			this.scriptontop.TabIndex = 40;
+			this.scriptontop.Text = "Script Editor always on top of main window";
+			this.scriptontop.UseVisualStyleBackColor = true;
+			// 
+			// zoomfactor
+			// 
+			this.zoomfactor.BackColor = System.Drawing.SystemColors.Window;
+			this.zoomfactor.LargeChange = 1;
+			this.zoomfactor.Location = new System.Drawing.Point(127, 139);
+			this.zoomfactor.Minimum = 1;
+			this.zoomfactor.Name = "zoomfactor";
+			this.zoomfactor.Size = new System.Drawing.Size(116, 45);
+			this.zoomfactor.TabIndex = 37;
+			this.zoomfactor.TickStyle = System.Windows.Forms.TickStyle.Both;
+			this.zoomfactor.Value = 3;
+			this.zoomfactor.ValueChanged += new System.EventHandler(this.zoomfactor_ValueChanged);
+			// 
+			// zoomfactorlabel
+			// 
+			this.zoomfactorlabel.AutoSize = true;
+			this.zoomfactorlabel.Location = new System.Drawing.Point(249, 151);
+			this.zoomfactorlabel.Name = "zoomfactorlabel";
+			this.zoomfactorlabel.Size = new System.Drawing.Size(27, 13);
+			this.zoomfactorlabel.TabIndex = 39;
+			this.zoomfactorlabel.Text = "30%";
+			// 
+			// label19
+			// 
+			this.label19.AutoSize = true;
+			this.label19.Location = new System.Drawing.Point(52, 151);
+			this.label19.Name = "label19";
+			this.label19.Size = new System.Drawing.Size(67, 13);
+			this.label19.TabIndex = 38;
+			this.label19.Text = "Zoom factor:";
+			// 
+			// autoscrollspeed
+			// 
+			this.autoscrollspeed.BackColor = System.Drawing.SystemColors.Window;
+			this.autoscrollspeed.LargeChange = 1;
+			this.autoscrollspeed.Location = new System.Drawing.Point(127, 92);
+			this.autoscrollspeed.Maximum = 5;
+			this.autoscrollspeed.Name = "autoscrollspeed";
+			this.autoscrollspeed.Size = new System.Drawing.Size(116, 45);
+			this.autoscrollspeed.TabIndex = 2;
+			this.autoscrollspeed.TickStyle = System.Windows.Forms.TickStyle.Both;
+			this.autoscrollspeed.ValueChanged += new System.EventHandler(this.autoscrollspeed_ValueChanged);
+			// 
+			// autoscrollspeedlabel
+			// 
+			this.autoscrollspeedlabel.AutoSize = true;
+			this.autoscrollspeedlabel.Location = new System.Drawing.Point(249, 104);
+			this.autoscrollspeedlabel.Name = "autoscrollspeedlabel";
+			this.autoscrollspeedlabel.Size = new System.Drawing.Size(21, 13);
+			this.autoscrollspeedlabel.TabIndex = 36;
+			this.autoscrollspeedlabel.Text = "Off";
+			// 
+			// label15
+			// 
+			this.label15.AutoSize = true;
+			this.label15.Location = new System.Drawing.Point(29, 104);
+			this.label15.Name = "label15";
+			this.label15.Size = new System.Drawing.Size(88, 13);
+			this.label15.TabIndex = 35;
+			this.label15.Text = "Autoscroll speed:";
+			// 
+			// previewsize
+			// 
+			this.previewsize.BackColor = System.Drawing.SystemColors.Window;
+			this.previewsize.LargeChange = 1;
+			this.previewsize.Location = new System.Drawing.Point(127, 45);
+			this.previewsize.Maximum = 5;
+			this.previewsize.Name = "previewsize";
+			this.previewsize.Size = new System.Drawing.Size(116, 45);
+			this.previewsize.TabIndex = 1;
+			this.previewsize.TickStyle = System.Windows.Forms.TickStyle.Both;
+			this.previewsize.Value = 5;
+			this.previewsize.ValueChanged += new System.EventHandler(this.previewsize_ValueChanged);
+			// 
+			// previewsizelabel
+			// 
+			this.previewsizelabel.AutoSize = true;
+			this.previewsizelabel.Location = new System.Drawing.Point(249, 57);
+			this.previewsizelabel.Name = "previewsizelabel";
+			this.previewsizelabel.Size = new System.Drawing.Size(54, 13);
+			this.previewsizelabel.TabIndex = 33;
+			this.previewsizelabel.Text = "128 x 128";
+			// 
+			// label12
+			// 
+			this.label12.AutoSize = true;
+			this.label12.Location = new System.Drawing.Point(17, 57);
+			this.label12.Name = "label12";
+			this.label12.Size = new System.Drawing.Size(100, 13);
+			this.label12.TabIndex = 32;
+			this.label12.Text = "Preview image size:";
+			// 
+			// label14
+			// 
+			this.label14.AutoSize = true;
+			this.label14.Location = new System.Drawing.Point(50, 20);
+			this.label14.Name = "label14";
+			this.label14.Size = new System.Drawing.Size(69, 13);
+			this.label14.TabIndex = 14;
+			this.label14.Text = "Default view:";
+			// 
+			// defaultviewmode
+			// 
+			this.defaultviewmode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.defaultviewmode.FormattingEnabled = true;
+			this.defaultviewmode.Items.AddRange(new object[] {
+            "Wireframe",
+            "Brightness Levels",
+            "Floor Textures",
+            "Ceiling Textures"});
+			this.defaultviewmode.Location = new System.Drawing.Point(135, 17);
+			this.defaultviewmode.Name = "defaultviewmode";
+			this.defaultviewmode.Size = new System.Drawing.Size(145, 21);
+			this.defaultviewmode.TabIndex = 0;
+			// 
+			// label1
+			// 
+			label1.AutoSize = true;
+			label1.Location = new System.Drawing.Point(28, 29);
+			label1.Name = "label1";
+			label1.Size = new System.Drawing.Size(143, 13);
+			label1.TabIndex = 20;
+			label1.Text = "Texture and Flats brightness:";
+			label1.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// label18
+			// 
+			label18.AutoSize = true;
+			label18.Location = new System.Drawing.Point(22, 63);
+			label18.Name = "label18";
+			label18.Size = new System.Drawing.Size(147, 13);
+			label18.TabIndex = 25;
+			label18.Text = "Max. dynamic lights to render:";
+			label18.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			this.toolTip1.SetToolTip(label18, "Controlls how many dynamic lights could be \r\nrendered simultaneously in Visual mo" +
+					"de ");
+			// 
+			// label20
+			// 
+			label20.AutoSize = true;
+			label20.Location = new System.Drawing.Point(76, 97);
+			label20.Name = "label20";
+			label20.Size = new System.Drawing.Size(94, 13);
+			label20.TabIndex = 28;
+			label20.Text = "Dynamic light size:";
+			label20.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// label21
+			// 
+			label21.AutoSize = true;
+			label21.Location = new System.Drawing.Point(55, 131);
+			label21.Name = "label21";
+			label21.Size = new System.Drawing.Size(114, 13);
+			label21.TabIndex = 31;
+			label21.Text = "Dynamic light intensity:";
+			label21.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// keyusedlabel
+			// 
+			this.keyusedlabel.AutoSize = true;
+			this.keyusedlabel.Location = new System.Drawing.Point(20, 287);
+			this.keyusedlabel.Name = "keyusedlabel";
+			this.keyusedlabel.Size = new System.Drawing.Size(216, 13);
+			this.keyusedlabel.TabIndex = 10;
+			this.keyusedlabel.Text = "Key combination also used by these actions:";
+			this.keyusedlabel.Visible = false;
+			// 
+			// colorsgroup1
+			// 
+			this.colorsgroup1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)));
+			this.colorsgroup1.Controls.Add(this.color3dFloors);
+			this.colorsgroup1.Controls.Add(this.colorInfo);
+			this.colorsgroup1.Controls.Add(this.colorMD3);
+			this.colorsgroup1.Controls.Add(this.doublesidedalpha);
+			this.colorsgroup1.Controls.Add(this.colorgrid64);
+			this.colorsgroup1.Controls.Add(this.colorgrid);
+			this.colorsgroup1.Controls.Add(this.colorindication);
+			this.colorsgroup1.Controls.Add(this.colorbackcolor);
+			this.colorsgroup1.Controls.Add(this.label2);
+			this.colorsgroup1.Controls.Add(this.doublesidedalphalabel);
+			this.colorsgroup1.Controls.Add(this.colorselection);
+			this.colorsgroup1.Controls.Add(this.colorvertices);
+			this.colorsgroup1.Controls.Add(this.colorhighlight);
+			this.colorsgroup1.Controls.Add(this.colorlinedefs);
+			this.colorsgroup1.Location = new System.Drawing.Point(8, 8);
+			this.colorsgroup1.Name = "colorsgroup1";
+			this.colorsgroup1.Size = new System.Drawing.Size(203, 493);
+			this.colorsgroup1.TabIndex = 0;
+			this.colorsgroup1.TabStop = false;
+			this.colorsgroup1.Text = " Display ";
+			this.colorsgroup1.Visible = false;
+			// 
+			// color3dFloors
+			// 
+			this.color3dFloors.BackColor = System.Drawing.Color.Transparent;
+			this.color3dFloors.Label = "3D Floors:";
+			this.color3dFloors.Location = new System.Drawing.Point(15, 286);
+			this.color3dFloors.MaximumSize = new System.Drawing.Size(10000, 23);
+			this.color3dFloors.MinimumSize = new System.Drawing.Size(100, 23);
+			this.color3dFloors.Name = "color3dFloors";
+			this.color3dFloors.Size = new System.Drawing.Size(168, 23);
+			this.color3dFloors.TabIndex = 24;
+			// 
+			// colorInfo
+			// 
+			this.colorInfo.BackColor = System.Drawing.Color.Transparent;
+			this.colorInfo.Label = "Event lines:";
+			this.colorInfo.Location = new System.Drawing.Point(15, 260);
+			this.colorInfo.MaximumSize = new System.Drawing.Size(10000, 23);
+			this.colorInfo.MinimumSize = new System.Drawing.Size(100, 23);
+			this.colorInfo.Name = "colorInfo";
+			this.colorInfo.Size = new System.Drawing.Size(168, 23);
+			this.colorInfo.TabIndex = 19;
+			// 
+			// colorMD3
+			// 
+			this.colorMD3.BackColor = System.Drawing.Color.Transparent;
+			this.colorMD3.Label = "Model wireframe:";
+			this.colorMD3.Location = new System.Drawing.Point(15, 233);
+			this.colorMD3.MaximumSize = new System.Drawing.Size(10000, 23);
+			this.colorMD3.MinimumSize = new System.Drawing.Size(100, 23);
+			this.colorMD3.Name = "colorMD3";
+			this.colorMD3.Size = new System.Drawing.Size(168, 23);
+			this.colorMD3.TabIndex = 17;
+			// 
+			// doublesidedalpha
+			// 
+			this.doublesidedalpha.BackColor = System.Drawing.SystemColors.Window;
+			this.doublesidedalpha.LargeChange = 3;
+			this.doublesidedalpha.Location = new System.Drawing.Point(11, 349);
+			this.doublesidedalpha.Name = "doublesidedalpha";
+			this.doublesidedalpha.Size = new System.Drawing.Size(130, 45);
+			this.doublesidedalpha.TabIndex = 2;
+			this.doublesidedalpha.TickStyle = System.Windows.Forms.TickStyle.TopLeft;
+			this.doublesidedalpha.ValueChanged += new System.EventHandler(this.doublesidedalpha_ValueChanged);
+			// 
+			// colorgrid64
+			// 
+			this.colorgrid64.BackColor = System.Drawing.Color.Transparent;
+			this.colorgrid64.Label = "64 Block grid:";
+			this.colorgrid64.Location = new System.Drawing.Point(15, 206);
+			this.colorgrid64.MaximumSize = new System.Drawing.Size(10000, 23);
+			this.colorgrid64.MinimumSize = new System.Drawing.Size(100, 23);
+			this.colorgrid64.Name = "colorgrid64";
+			this.colorgrid64.Size = new System.Drawing.Size(168, 23);
+			this.colorgrid64.TabIndex = 9;
+			// 
+			// colorgrid
+			// 
+			this.colorgrid.BackColor = System.Drawing.Color.Transparent;
+			this.colorgrid.Label = "Custom grid:";
+			this.colorgrid.Location = new System.Drawing.Point(15, 179);
+			this.colorgrid.MaximumSize = new System.Drawing.Size(10000, 23);
+			this.colorgrid.MinimumSize = new System.Drawing.Size(100, 23);
+			this.colorgrid.Name = "colorgrid";
+			this.colorgrid.Size = new System.Drawing.Size(168, 23);
+			this.colorgrid.TabIndex = 8;
+			// 
+			// colorindication
+			// 
+			this.colorindication.BackColor = System.Drawing.Color.Transparent;
+			this.colorindication.Label = "Indications:";
+			this.colorindication.Location = new System.Drawing.Point(15, 152);
+			this.colorindication.MaximumSize = new System.Drawing.Size(10000, 23);
+			this.colorindication.MinimumSize = new System.Drawing.Size(100, 23);
+			this.colorindication.Name = "colorindication";
+			this.colorindication.Size = new System.Drawing.Size(168, 23);
+			this.colorindication.TabIndex = 7;
+			// 
+			// colorbackcolor
+			// 
+			this.colorbackcolor.BackColor = System.Drawing.Color.Transparent;
+			this.colorbackcolor.Label = "Background:";
+			this.colorbackcolor.Location = new System.Drawing.Point(15, 17);
+			this.colorbackcolor.MaximumSize = new System.Drawing.Size(10000, 23);
+			this.colorbackcolor.MinimumSize = new System.Drawing.Size(100, 23);
+			this.colorbackcolor.Name = "colorbackcolor";
+			this.colorbackcolor.Size = new System.Drawing.Size(168, 23);
+			this.colorbackcolor.TabIndex = 0;
+			// 
+			// label2
+			// 
+			this.label2.AutoSize = true;
+			this.label2.Location = new System.Drawing.Point(14, 328);
+			this.label2.Name = "label2";
+			this.label2.Size = new System.Drawing.Size(141, 13);
+			this.label2.TabIndex = 14;
+			this.label2.Text = "Passable lines transparency:";
+			this.label2.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// doublesidedalphalabel
+			// 
+			this.doublesidedalphalabel.AutoSize = true;
+			this.doublesidedalphalabel.Location = new System.Drawing.Point(147, 361);
+			this.doublesidedalphalabel.Name = "doublesidedalphalabel";
+			this.doublesidedalphalabel.Size = new System.Drawing.Size(21, 13);
+			this.doublesidedalphalabel.TabIndex = 16;
+			this.doublesidedalphalabel.Text = "0%";
+			// 
+			// colorselection
+			// 
+			this.colorselection.BackColor = System.Drawing.Color.Transparent;
+			this.colorselection.Label = "Selection:";
+			this.colorselection.Location = new System.Drawing.Point(15, 125);
+			this.colorselection.MaximumSize = new System.Drawing.Size(10000, 23);
+			this.colorselection.MinimumSize = new System.Drawing.Size(100, 23);
+			this.colorselection.Name = "colorselection";
+			this.colorselection.Size = new System.Drawing.Size(168, 23);
+			this.colorselection.TabIndex = 6;
+			// 
+			// colorvertices
+			// 
+			this.colorvertices.BackColor = System.Drawing.Color.Transparent;
+			this.colorvertices.Label = "Vertices:";
+			this.colorvertices.Location = new System.Drawing.Point(15, 44);
+			this.colorvertices.MaximumSize = new System.Drawing.Size(10000, 23);
+			this.colorvertices.MinimumSize = new System.Drawing.Size(100, 23);
+			this.colorvertices.Name = "colorvertices";
+			this.colorvertices.Size = new System.Drawing.Size(168, 23);
+			this.colorvertices.TabIndex = 1;
+			// 
+			// colorhighlight
+			// 
+			this.colorhighlight.BackColor = System.Drawing.Color.Transparent;
+			this.colorhighlight.Label = "Highlight:";
+			this.colorhighlight.Location = new System.Drawing.Point(15, 98);
+			this.colorhighlight.MaximumSize = new System.Drawing.Size(10000, 23);
+			this.colorhighlight.MinimumSize = new System.Drawing.Size(100, 23);
+			this.colorhighlight.Name = "colorhighlight";
+			this.colorhighlight.Size = new System.Drawing.Size(168, 23);
+			this.colorhighlight.TabIndex = 5;
+			// 
+			// colorlinedefs
+			// 
+			this.colorlinedefs.BackColor = System.Drawing.Color.Transparent;
+			this.colorlinedefs.Label = "Common lines:";
+			this.colorlinedefs.Location = new System.Drawing.Point(15, 71);
+			this.colorlinedefs.MaximumSize = new System.Drawing.Size(10000, 23);
+			this.colorlinedefs.MinimumSize = new System.Drawing.Size(100, 23);
+			this.colorlinedefs.Name = "colorlinedefs";
+			this.colorlinedefs.Size = new System.Drawing.Size(168, 23);
+			this.colorlinedefs.TabIndex = 2;
+			// 
+			// cbStretchView
+			// 
+			this.cbStretchView.AutoSize = true;
+			this.cbStretchView.Location = new System.Drawing.Point(236, 170);
+			this.cbStretchView.Name = "cbStretchView";
+			this.cbStretchView.Size = new System.Drawing.Size(172, 17);
+			this.cbStretchView.TabIndex = 18;
+			this.cbStretchView.Text = "Stretched view in visual modes";
+			this.toolTip1.SetToolTip(this.cbStretchView, "When enabled, visual mode will emulate \r\n(G)ZDoom\'s way of rendering by increasin" +
+					"g\r\nvertical scale of the world geometry and \r\nsprites by 15%.\r\n");
+			this.cbStretchView.UseVisualStyleBackColor = true;
+			// 
+			// qualitydisplay
+			// 
+			this.qualitydisplay.AutoSize = true;
+			this.qualitydisplay.Location = new System.Drawing.Point(25, 191);
+			this.qualitydisplay.Name = "qualitydisplay";
+			this.qualitydisplay.Size = new System.Drawing.Size(128, 17);
+			this.qualitydisplay.TabIndex = 7;
+			this.qualitydisplay.Text = "High quality rendering";
+			this.qualitydisplay.UseVisualStyleBackColor = true;
+			// 
+			// cancel
+			// 
+			this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.cancel.Location = new System.Drawing.Point(587, 557);
+			this.cancel.Name = "cancel";
+			this.cancel.Size = new System.Drawing.Size(112, 25);
+			this.cancel.TabIndex = 2;
+			this.cancel.Text = "Cancel";
+			this.cancel.UseVisualStyleBackColor = true;
+			this.cancel.Click += new System.EventHandler(this.cancel_Click);
+			// 
+			// apply
+			// 
+			this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.apply.Location = new System.Drawing.Point(469, 557);
+			this.apply.Name = "apply";
+			this.apply.Size = new System.Drawing.Size(112, 25);
+			this.apply.TabIndex = 1;
+			this.apply.Text = "OK";
+			this.apply.UseVisualStyleBackColor = true;
+			this.apply.Click += new System.EventHandler(this.apply_Click);
+			// 
+			// tabs
+			// 
+			this.tabs.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.tabs.Controls.Add(this.tabinterface);
+			this.tabs.Controls.Add(this.tabkeys);
+			this.tabs.Controls.Add(this.tabcolors);
+			this.tabs.Controls.Add(this.tabpasting);
+			this.tabs.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.tabs.Location = new System.Drawing.Point(11, 13);
+			this.tabs.Name = "tabs";
+			this.tabs.Padding = new System.Drawing.Point(24, 3);
+			this.tabs.SelectedIndex = 0;
+			this.tabs.Size = new System.Drawing.Size(690, 536);
+			this.tabs.TabIndex = 0;
+			this.tabs.SelectedIndexChanged += new System.EventHandler(this.tabs_SelectedIndexChanged);
+			// 
+			// tabinterface
+			// 
+			this.tabinterface.Controls.Add(this.groupBox3);
+			this.tabinterface.Controls.Add(this.groupBox5);
+			this.tabinterface.Controls.Add(this.groupBox4);
+			this.tabinterface.Controls.Add(this.groupBox2);
+			this.tabinterface.Controls.Add(groupBox1);
+			this.tabinterface.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.tabinterface.Location = new System.Drawing.Point(4, 23);
+			this.tabinterface.Name = "tabinterface";
+			this.tabinterface.Padding = new System.Windows.Forms.Padding(5);
+			this.tabinterface.Size = new System.Drawing.Size(682, 509);
+			this.tabinterface.TabIndex = 0;
+			this.tabinterface.Text = "Interface";
+			this.tabinterface.UseVisualStyleBackColor = true;
+			// 
+			// groupBox3
+			// 
+			this.groupBox3.Controls.Add(this.resetscreenshotsdir);
+			this.groupBox3.Controls.Add(this.browsescreenshotsdir);
+			this.groupBox3.Controls.Add(this.screenshotsfolderpath);
+			this.groupBox3.Location = new System.Drawing.Point(345, 449);
+			this.groupBox3.Name = "groupBox3";
+			this.groupBox3.Size = new System.Drawing.Size(331, 48);
+			this.groupBox3.TabIndex = 5;
+			this.groupBox3.TabStop = false;
+			this.groupBox3.Text = " Screenshots Folder ";
+			// 
+			// resetscreenshotsdir
+			// 
+			this.resetscreenshotsdir.Image = global::CodeImp.DoomBuilder.Properties.Resources.Reset;
+			this.resetscreenshotsdir.Location = new System.Drawing.Point(301, 17);
+			this.resetscreenshotsdir.Name = "resetscreenshotsdir";
+			this.resetscreenshotsdir.Size = new System.Drawing.Size(24, 24);
+			this.resetscreenshotsdir.TabIndex = 2;
+			this.toolTip1.SetToolTip(this.resetscreenshotsdir, "Use Default Screenshots Folder");
+			this.resetscreenshotsdir.UseVisualStyleBackColor = true;
+			this.resetscreenshotsdir.Click += new System.EventHandler(this.resetscreenshotsdir_Click);
+			// 
+			// browsescreenshotsdir
+			// 
+			this.browsescreenshotsdir.Image = global::CodeImp.DoomBuilder.Properties.Resources.FolderExplore;
+			this.browsescreenshotsdir.Location = new System.Drawing.Point(275, 17);
+			this.browsescreenshotsdir.Name = "browsescreenshotsdir";
+			this.browsescreenshotsdir.Size = new System.Drawing.Size(24, 24);
+			this.browsescreenshotsdir.TabIndex = 1;
+			this.toolTip1.SetToolTip(this.browsescreenshotsdir, "Browse Screenshots Folder");
+			this.browsescreenshotsdir.UseVisualStyleBackColor = true;
+			this.browsescreenshotsdir.Click += new System.EventHandler(this.browsescreenshotsdir_Click);
+			// 
+			// screenshotsfolderpath
+			// 
+			this.screenshotsfolderpath.Location = new System.Drawing.Point(6, 19);
+			this.screenshotsfolderpath.Name = "screenshotsfolderpath";
+			this.screenshotsfolderpath.Size = new System.Drawing.Size(264, 20);
+			this.screenshotsfolderpath.TabIndex = 0;
+			// 
+			// groupBox5
+			// 
+			this.groupBox5.Controls.Add(this.toolbar_gzdoom);
+			this.groupBox5.Controls.Add(this.toolbar_file);
+			this.groupBox5.Controls.Add(this.toolbar_testing);
+			this.groupBox5.Controls.Add(this.toolbar_geometry);
+			this.groupBox5.Controls.Add(this.toolbar_viewmodes);
+			this.groupBox5.Controls.Add(this.toolbar_filter);
+			this.groupBox5.Controls.Add(this.toolbar_prefabs);
+			this.groupBox5.Controls.Add(this.toolbar_copy);
+			this.groupBox5.Controls.Add(this.toolbar_undo);
+			this.groupBox5.Controls.Add(this.toolbar_script);
+			this.groupBox5.Location = new System.Drawing.Point(345, 321);
+			this.groupBox5.Name = "groupBox5";
+			this.groupBox5.Size = new System.Drawing.Size(331, 125);
+			this.groupBox5.TabIndex = 4;
+			this.groupBox5.TabStop = false;
+			this.groupBox5.Text = " Toolbar Buttons ";
+			// 
+			// toolbar_gzdoom
+			// 
+			this.toolbar_gzdoom.AutoSize = true;
+			this.toolbar_gzdoom.Location = new System.Drawing.Point(160, 102);
+			this.toolbar_gzdoom.Name = "toolbar_gzdoom";
+			this.toolbar_gzdoom.Size = new System.Drawing.Size(75, 17);
+			this.toolbar_gzdoom.TabIndex = 50;
+			this.toolbar_gzdoom.Text = "Rendering";
+			this.toolbar_gzdoom.UseVisualStyleBackColor = true;
+			// 
+			// toolbar_file
+			// 
+			this.toolbar_file.AutoSize = true;
+			this.toolbar_file.Location = new System.Drawing.Point(14, 22);
+			this.toolbar_file.Name = "toolbar_file";
+			this.toolbar_file.Size = new System.Drawing.Size(121, 17);
+			this.toolbar_file.TabIndex = 49;
+			this.toolbar_file.Text = "New / Open / Save";
+			this.toolbar_file.UseVisualStyleBackColor = true;
+			// 
+			// toolbar_testing
+			// 
+			this.toolbar_testing.AutoSize = true;
+			this.toolbar_testing.Location = new System.Drawing.Point(160, 82);
+			this.toolbar_testing.Name = "toolbar_testing";
+			this.toolbar_testing.Size = new System.Drawing.Size(61, 17);
+			this.toolbar_testing.TabIndex = 48;
+			this.toolbar_testing.Text = "Testing";
+			this.toolbar_testing.UseVisualStyleBackColor = true;
+			// 
+			// toolbar_geometry
+			// 
+			this.toolbar_geometry.AutoSize = true;
+			this.toolbar_geometry.Location = new System.Drawing.Point(160, 62);
+			this.toolbar_geometry.Name = "toolbar_geometry";
+			this.toolbar_geometry.Size = new System.Drawing.Size(92, 17);
+			this.toolbar_geometry.TabIndex = 47;
+			this.toolbar_geometry.Text = "Snap / Merge";
+			this.toolbar_geometry.UseVisualStyleBackColor = true;
+			// 
+			// toolbar_viewmodes
+			// 
+			this.toolbar_viewmodes.AutoSize = true;
+			this.toolbar_viewmodes.Location = new System.Drawing.Point(160, 42);
+			this.toolbar_viewmodes.Name = "toolbar_viewmodes";
+			this.toolbar_viewmodes.Size = new System.Drawing.Size(84, 17);
+			this.toolbar_viewmodes.TabIndex = 46;
+			this.toolbar_viewmodes.Text = "View Modes";
+			this.toolbar_viewmodes.UseVisualStyleBackColor = true;
+			// 
+			// toolbar_filter
+			// 
+			this.toolbar_filter.AutoSize = true;
+			this.toolbar_filter.Location = new System.Drawing.Point(160, 22);
+			this.toolbar_filter.Name = "toolbar_filter";
+			this.toolbar_filter.Size = new System.Drawing.Size(161, 17);
+			this.toolbar_filter.TabIndex = 45;
+			this.toolbar_filter.Text = "Things Filter / Linedef Colors";
+			this.toolbar_filter.UseVisualStyleBackColor = true;
+			// 
+			// toolbar_prefabs
+			// 
+			this.toolbar_prefabs.AutoSize = true;
+			this.toolbar_prefabs.Location = new System.Drawing.Point(14, 102);
+			this.toolbar_prefabs.Name = "toolbar_prefabs";
+			this.toolbar_prefabs.Size = new System.Drawing.Size(62, 17);
+			this.toolbar_prefabs.TabIndex = 44;
+			this.toolbar_prefabs.Text = "Prefabs";
+			this.toolbar_prefabs.UseVisualStyleBackColor = true;
+			// 
+			// toolbar_copy
+			// 
+			this.toolbar_copy.AutoSize = true;
+			this.toolbar_copy.Location = new System.Drawing.Point(14, 82);
+			this.toolbar_copy.Name = "toolbar_copy";
+			this.toolbar_copy.Size = new System.Drawing.Size(115, 17);
+			this.toolbar_copy.TabIndex = 43;
+			this.toolbar_copy.Text = "Cut / Copy / Paste";
+			this.toolbar_copy.UseVisualStyleBackColor = true;
+			// 
+			// toolbar_undo
+			// 
+			this.toolbar_undo.AutoSize = true;
+			this.toolbar_undo.Location = new System.Drawing.Point(14, 62);
+			this.toolbar_undo.Name = "toolbar_undo";
+			this.toolbar_undo.Size = new System.Drawing.Size(89, 17);
+			this.toolbar_undo.TabIndex = 42;
+			this.toolbar_undo.Text = "Undo / Redo";
+			this.toolbar_undo.UseVisualStyleBackColor = true;
+			// 
+			// toolbar_script
+			// 
+			this.toolbar_script.AutoSize = true;
+			this.toolbar_script.Location = new System.Drawing.Point(14, 42);
+			this.toolbar_script.Name = "toolbar_script";
+			this.toolbar_script.Size = new System.Drawing.Size(83, 17);
+			this.toolbar_script.TabIndex = 41;
+			this.toolbar_script.Text = "Script Editor";
+			this.toolbar_script.UseVisualStyleBackColor = true;
+			// 
+			// groupBox4
+			// 
+			this.groupBox4.Controls.Add(this.collapsedockers);
+			this.groupBox4.Controls.Add(this.dockersposition);
+			this.groupBox4.Controls.Add(this.label17);
+			this.groupBox4.Location = new System.Drawing.Point(8, 449);
+			this.groupBox4.Name = "groupBox4";
+			this.groupBox4.Size = new System.Drawing.Size(331, 48);
+			this.groupBox4.TabIndex = 3;
+			this.groupBox4.TabStop = false;
+			this.groupBox4.Text = " Side Panels ";
+			// 
+			// collapsedockers
+			// 
+			this.collapsedockers.AutoSize = true;
+			this.collapsedockers.Location = new System.Drawing.Point(188, 20);
+			this.collapsedockers.Name = "collapsedockers";
+			this.collapsedockers.Size = new System.Drawing.Size(71, 17);
+			this.collapsedockers.TabIndex = 2;
+			this.collapsedockers.Text = "Auto hide";
+			this.collapsedockers.UseVisualStyleBackColor = true;
+			// 
+			// dockersposition
+			// 
+			this.dockersposition.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.dockersposition.FormattingEnabled = true;
+			this.dockersposition.Items.AddRange(new object[] {
+            "Left",
+            "Right",
+            "None"});
+			this.dockersposition.Location = new System.Drawing.Point(91, 18);
+			this.dockersposition.Name = "dockersposition";
+			this.dockersposition.Size = new System.Drawing.Size(85, 21);
+			this.dockersposition.TabIndex = 1;
+			// 
+			// label17
+			// 
+			this.label17.AutoSize = true;
+			this.label17.Location = new System.Drawing.Point(29, 21);
+			this.label17.Name = "label17";
+			this.label17.Size = new System.Drawing.Size(47, 13);
+			this.label17.TabIndex = 0;
+			this.label17.Text = "Position:";
+			// 
+			// groupBox2
+			// 
+			this.groupBox2.Controls.Add(this.vertexScale3D);
+			this.groupBox2.Controls.Add(this.vertexScale3DLabel);
+			this.groupBox2.Controls.Add(this.label26);
+			this.groupBox2.Controls.Add(this.viewdistance);
+			this.groupBox2.Controls.Add(this.movespeed);
+			this.groupBox2.Controls.Add(this.mousespeed);
+			this.groupBox2.Controls.Add(this.fieldofview);
+			this.groupBox2.Controls.Add(this.viewdistancelabel);
+			this.groupBox2.Controls.Add(this.label13);
+			this.groupBox2.Controls.Add(this.invertyaxis);
+			this.groupBox2.Controls.Add(this.movespeedlabel);
+			this.groupBox2.Controls.Add(this.label11);
+			this.groupBox2.Controls.Add(this.mousespeedlabel);
+			this.groupBox2.Controls.Add(this.label9);
+			this.groupBox2.Controls.Add(this.fieldofviewlabel);
+			this.groupBox2.Controls.Add(this.label4);
+			this.groupBox2.Location = new System.Drawing.Point(345, 8);
+			this.groupBox2.Name = "groupBox2";
+			this.groupBox2.Size = new System.Drawing.Size(331, 307);
+			this.groupBox2.TabIndex = 2;
+			this.groupBox2.TabStop = false;
+			this.groupBox2.Text = " Visual Modes ";
+			// 
+			// vertexScale3D
+			// 
+			this.vertexScale3D.BackColor = System.Drawing.SystemColors.Window;
+			this.vertexScale3D.LargeChange = 1;
+			this.vertexScale3D.Location = new System.Drawing.Point(116, 181);
+			this.vertexScale3D.Maximum = 15;
+			this.vertexScale3D.Minimum = 2;
+			this.vertexScale3D.Name = "vertexScale3D";
+			this.vertexScale3D.Size = new System.Drawing.Size(150, 45);
+			this.vertexScale3D.TabIndex = 31;
+			this.vertexScale3D.TickStyle = System.Windows.Forms.TickStyle.Both;
+			this.vertexScale3D.Value = 10;
+			this.vertexScale3D.ValueChanged += new System.EventHandler(this.vertexScale3D_ValueChanged);
+			// 
+			// vertexScale3DLabel
+			// 
+			this.vertexScale3DLabel.AutoSize = true;
+			this.vertexScale3DLabel.Location = new System.Drawing.Point(272, 193);
+			this.vertexScale3DLabel.Name = "vertexScale3DLabel";
+			this.vertexScale3DLabel.Size = new System.Drawing.Size(33, 13);
+			this.vertexScale3DLabel.TabIndex = 33;
+			this.vertexScale3DLabel.Text = "100%";
+			// 
+			// label26
+			// 
+			this.label26.AutoSize = true;
+			this.label26.Location = new System.Drawing.Point(16, 193);
+			this.label26.Name = "label26";
+			this.label26.Size = new System.Drawing.Size(91, 13);
+			this.label26.TabIndex = 32;
+			this.label26.Text = "Vertex scale (3D):";
+			this.toolTip1.SetToolTip(this.label26, "Sets the size of vertex handles\r\nin 3D mode");
+			// 
+			// viewdistance
+			// 
+			this.viewdistance.BackColor = System.Drawing.SystemColors.Window;
+			this.viewdistance.LargeChange = 2;
+			this.viewdistance.Location = new System.Drawing.Point(116, 230);
+			this.viewdistance.Maximum = 45;
+			this.viewdistance.Minimum = 1;
+			this.viewdistance.Name = "viewdistance";
+			this.viewdistance.Size = new System.Drawing.Size(150, 45);
+			this.viewdistance.TabIndex = 3;
+			this.viewdistance.TickFrequency = 2;
+			this.viewdistance.TickStyle = System.Windows.Forms.TickStyle.Both;
+			this.viewdistance.Value = 1;
+			this.viewdistance.ValueChanged += new System.EventHandler(this.viewdistance_ValueChanged);
+			// 
+			// movespeed
+			// 
+			this.movespeed.BackColor = System.Drawing.SystemColors.Window;
+			this.movespeed.Location = new System.Drawing.Point(116, 131);
+			this.movespeed.Maximum = 20;
+			this.movespeed.Minimum = 1;
+			this.movespeed.Name = "movespeed";
+			this.movespeed.Size = new System.Drawing.Size(150, 45);
+			this.movespeed.TabIndex = 2;
+			this.movespeed.TickStyle = System.Windows.Forms.TickStyle.Both;
+			this.movespeed.Value = 1;
+			this.movespeed.ValueChanged += new System.EventHandler(this.movespeed_ValueChanged);
+			// 
+			// mousespeed
+			// 
+			this.mousespeed.BackColor = System.Drawing.SystemColors.Window;
+			this.mousespeed.Location = new System.Drawing.Point(116, 79);
+			this.mousespeed.Maximum = 20;
+			this.mousespeed.Minimum = 1;
+			this.mousespeed.Name = "mousespeed";
+			this.mousespeed.Size = new System.Drawing.Size(150, 45);
+			this.mousespeed.TabIndex = 1;
+			this.mousespeed.TickStyle = System.Windows.Forms.TickStyle.Both;
+			this.mousespeed.Value = 1;
+			this.mousespeed.ValueChanged += new System.EventHandler(this.mousespeed_ValueChanged);
+			// 
+			// fieldofview
+			// 
+			this.fieldofview.BackColor = System.Drawing.SystemColors.Window;
+			this.fieldofview.LargeChange = 1;
+			this.fieldofview.Location = new System.Drawing.Point(116, 29);
+			this.fieldofview.Maximum = 17;
+			this.fieldofview.Minimum = 5;
+			this.fieldofview.Name = "fieldofview";
+			this.fieldofview.Size = new System.Drawing.Size(150, 45);
+			this.fieldofview.TabIndex = 0;
+			this.fieldofview.TickStyle = System.Windows.Forms.TickStyle.Both;
+			this.fieldofview.Value = 5;
+			this.fieldofview.ValueChanged += new System.EventHandler(this.fieldofview_ValueChanged);
+			// 
+			// viewdistancelabel
+			// 
+			this.viewdistancelabel.AutoSize = true;
+			this.viewdistancelabel.Location = new System.Drawing.Point(272, 242);
+			this.viewdistancelabel.Name = "viewdistancelabel";
+			this.viewdistancelabel.Size = new System.Drawing.Size(42, 13);
+			this.viewdistancelabel.TabIndex = 30;
+			this.viewdistancelabel.Text = "200 mp";
+			// 
+			// label13
+			// 
+			this.label13.AutoSize = true;
+			this.label13.Location = new System.Drawing.Point(30, 243);
+			this.label13.Name = "label13";
+			this.label13.Size = new System.Drawing.Size(76, 13);
+			this.label13.TabIndex = 28;
+			this.label13.Text = "View distance:";
+			// 
+			// invertyaxis
+			// 
+			this.invertyaxis.AutoSize = true;
+			this.invertyaxis.Location = new System.Drawing.Point(32, 282);
+			this.invertyaxis.Name = "invertyaxis";
+			this.invertyaxis.Size = new System.Drawing.Size(118, 17);
+			this.invertyaxis.TabIndex = 4;
+			this.invertyaxis.Text = "Invert mouse Y axis";
+			this.invertyaxis.UseVisualStyleBackColor = true;
+			// 
+			// movespeedlabel
+			// 
+			this.movespeedlabel.AutoSize = true;
+			this.movespeedlabel.Location = new System.Drawing.Point(272, 143);
+			this.movespeedlabel.Name = "movespeedlabel";
+			this.movespeedlabel.Size = new System.Drawing.Size(25, 13);
+			this.movespeedlabel.TabIndex = 25;
+			this.movespeedlabel.Text = "100";
+			// 
+			// label11
+			// 
+			this.label11.AutoSize = true;
+			this.label11.Location = new System.Drawing.Point(41, 143);
+			this.label11.Name = "label11";
+			this.label11.Size = new System.Drawing.Size(69, 13);
+			this.label11.TabIndex = 23;
+			this.label11.Text = "Move speed:";
+			// 
+			// mousespeedlabel
+			// 
+			this.mousespeedlabel.AutoSize = true;
+			this.mousespeedlabel.Location = new System.Drawing.Point(272, 91);
+			this.mousespeedlabel.Name = "mousespeedlabel";
+			this.mousespeedlabel.Size = new System.Drawing.Size(25, 13);
+			this.mousespeedlabel.TabIndex = 22;
+			this.mousespeedlabel.Text = "100";
+			// 
+			// label9
+			// 
+			this.label9.AutoSize = true;
+			this.label9.Location = new System.Drawing.Point(35, 91);
+			this.label9.Name = "label9";
+			this.label9.Size = new System.Drawing.Size(74, 13);
+			this.label9.TabIndex = 20;
+			this.label9.Text = "Mouse speed:";
+			// 
+			// fieldofviewlabel
+			// 
+			this.fieldofviewlabel.AutoSize = true;
+			this.fieldofviewlabel.Location = new System.Drawing.Point(272, 41);
+			this.fieldofviewlabel.Name = "fieldofviewlabel";
+			this.fieldofviewlabel.Size = new System.Drawing.Size(23, 13);
+			this.fieldofviewlabel.TabIndex = 19;
+			this.fieldofviewlabel.Text = "50°";
+			// 
+			// label4
+			// 
+			this.label4.AutoSize = true;
+			this.label4.Location = new System.Drawing.Point(38, 41);
+			this.label4.Name = "label4";
+			this.label4.Size = new System.Drawing.Size(69, 13);
+			this.label4.TabIndex = 17;
+			this.label4.Text = "Field of view:";
+			// 
+			// tabkeys
+			// 
+			this.tabkeys.Controls.Add(this.bClearActionFilter);
+			this.tabkeys.Controls.Add(this.tbFilterActions);
+			this.tabkeys.Controls.Add(this.label24);
+			this.tabkeys.Controls.Add(this.listactions);
+			this.tabkeys.Controls.Add(this.actioncontrolpanel);
+			this.tabkeys.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.tabkeys.Location = new System.Drawing.Point(4, 23);
+			this.tabkeys.Name = "tabkeys";
+			this.tabkeys.Padding = new System.Windows.Forms.Padding(3);
+			this.tabkeys.Size = new System.Drawing.Size(682, 509);
+			this.tabkeys.TabIndex = 1;
+			this.tabkeys.Text = "Controls";
+			this.tabkeys.UseVisualStyleBackColor = true;
+			// 
+			// bClearActionFilter
+			// 
+			this.bClearActionFilter.Image = global::CodeImp.DoomBuilder.Properties.Resources.SearchClear;
+			this.bClearActionFilter.Location = new System.Drawing.Point(227, 10);
+			this.bClearActionFilter.Name = "bClearActionFilter";
+			this.bClearActionFilter.Size = new System.Drawing.Size(26, 25);
+			this.bClearActionFilter.TabIndex = 12;
+			this.bClearActionFilter.TabStop = false;
+			this.bClearActionFilter.UseVisualStyleBackColor = true;
+			this.bClearActionFilter.Click += new System.EventHandler(this.bClearActionFilter_Click);
+			// 
+			// tbFilterActions
+			// 
+			this.tbFilterActions.Location = new System.Drawing.Point(55, 13);
+			this.tbFilterActions.Name = "tbFilterActions";
+			this.tbFilterActions.Size = new System.Drawing.Size(166, 20);
+			this.tbFilterActions.TabIndex = 11;
+			this.tbFilterActions.TabStop = false;
+			this.tbFilterActions.TextChanged += new System.EventHandler(this.tbFilterActions_TextChanged);
+			// 
+			// label24
+			// 
+			this.label24.AutoSize = true;
+			this.label24.Location = new System.Drawing.Point(17, 16);
+			this.label24.Name = "label24";
+			this.label24.Size = new System.Drawing.Size(32, 13);
+			this.label24.TabIndex = 10;
+			this.label24.Text = "Filter:";
+			// 
+			// listactions
+			// 
+			this.listactions.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.listactions.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+            this.columncontrolaction,
+            this.columncontrolkey});
+			this.listactions.FullRowSelect = true;
+			this.listactions.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
+			this.listactions.HideSelection = false;
+			this.listactions.Location = new System.Drawing.Point(11, 42);
+			this.listactions.Margin = new System.Windows.Forms.Padding(8, 9, 8, 9);
+			this.listactions.MultiSelect = false;
+			this.listactions.Name = "listactions";
+			this.listactions.Size = new System.Drawing.Size(352, 458);
+			this.listactions.Sorting = System.Windows.Forms.SortOrder.Ascending;
+			this.listactions.TabIndex = 0;
+			this.listactions.TabStop = false;
+			this.listactions.UseCompatibleStateImageBehavior = false;
+			this.listactions.View = System.Windows.Forms.View.Details;
+			this.listactions.MouseUp += new System.Windows.Forms.MouseEventHandler(this.listactions_MouseUp);
+			this.listactions.ItemSelectionChanged += new System.Windows.Forms.ListViewItemSelectionChangedEventHandler(this.listactions_ItemSelectionChanged);
+			this.listactions.KeyUp += new System.Windows.Forms.KeyEventHandler(this.listactions_KeyUp);
+			// 
+			// columncontrolaction
+			// 
+			this.columncontrolaction.Text = "Action";
+			this.columncontrolaction.Width = 200;
+			// 
+			// columncontrolkey
+			// 
+			this.columncontrolkey.Text = "Key";
+			this.columncontrolkey.Width = 130;
+			// 
+			// actioncontrolpanel
+			// 
+			this.actioncontrolpanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.actioncontrolpanel.Controls.Add(this.actiondescription);
+			this.actioncontrolpanel.Controls.Add(this.keyusedlist);
+			this.actioncontrolpanel.Controls.Add(this.keyusedlabel);
+			this.actioncontrolpanel.Controls.Add(this.disregardshiftlabel);
+			this.actioncontrolpanel.Controls.Add(this.actioncontrol);
+			this.actioncontrolpanel.Controls.Add(label7);
+			this.actioncontrolpanel.Controls.Add(this.actiontitle);
+			this.actioncontrolpanel.Controls.Add(this.actioncontrolclear);
+			this.actioncontrolpanel.Controls.Add(label6);
+			this.actioncontrolpanel.Controls.Add(this.actionkey);
+			this.actioncontrolpanel.Controls.Add(label5);
+			this.actioncontrolpanel.Enabled = false;
+			this.actioncontrolpanel.Location = new System.Drawing.Point(377, 12);
+			this.actioncontrolpanel.Margin = new System.Windows.Forms.Padding(6);
+			this.actioncontrolpanel.Name = "actioncontrolpanel";
+			this.actioncontrolpanel.Size = new System.Drawing.Size(282, 488);
+			this.actioncontrolpanel.TabIndex = 9;
+			this.actioncontrolpanel.TabStop = false;
+			this.actioncontrolpanel.Text = " Action control ";
+			// 
+			// actiondescription
+			// 
+			this.actiondescription.BorderStyle = System.Windows.Forms.BorderStyle.None;
+			this.actiondescription.Location = new System.Drawing.Point(20, 47);
+			this.actiondescription.Multiline = true;
+			this.actiondescription.Name = "actiondescription";
+			this.actiondescription.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
+			this.actiondescription.Size = new System.Drawing.Size(256, 72);
+			this.actiondescription.TabIndex = 12;
+			// 
+			// keyusedlist
+			// 
+			this.keyusedlist.BackColor = System.Drawing.SystemColors.Control;
+			this.keyusedlist.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+			this.keyusedlist.FormattingEnabled = true;
+			this.keyusedlist.IntegralHeight = false;
+			this.keyusedlist.Location = new System.Drawing.Point(23, 307);
+			this.keyusedlist.Name = "keyusedlist";
+			this.keyusedlist.SelectionMode = System.Windows.Forms.SelectionMode.None;
+			this.keyusedlist.Size = new System.Drawing.Size(238, 115);
+			this.keyusedlist.Sorted = true;
+			this.keyusedlist.TabIndex = 11;
+			this.keyusedlist.Visible = false;
+			// 
+			// disregardshiftlabel
+			// 
+			this.disregardshiftlabel.Location = new System.Drawing.Point(20, 224);
+			this.disregardshiftlabel.Name = "disregardshiftlabel";
+			this.disregardshiftlabel.Size = new System.Drawing.Size(245, 47);
+			this.disregardshiftlabel.TabIndex = 9;
+			this.disregardshiftlabel.Tag = "The selected actions uses %s to modify its behavior. These modifiers can not be u" +
+				"sed in a key combination for this action.";
+			this.disregardshiftlabel.Text = "The selected actions uses Shift, Alt and Control to modify its behavior. These mo" +
+				"difiers can not be used in a key combination for this action.";
+			this.disregardshiftlabel.Visible = false;
+			// 
+			// actioncontrol
+			// 
+			this.actioncontrol.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.actioncontrol.FormattingEnabled = true;
+			this.actioncontrol.ImeMode = System.Windows.Forms.ImeMode.Off;
+			this.actioncontrol.Location = new System.Drawing.Point(23, 190);
+			this.actioncontrol.Name = "actioncontrol";
+			this.actioncontrol.Size = new System.Drawing.Size(238, 21);
+			this.actioncontrol.TabIndex = 8;
+			this.actioncontrol.TabStop = false;
+			this.actioncontrol.SelectedIndexChanged += new System.EventHandler(this.actioncontrol_SelectedIndexChanged);
+			// 
+			// actiontitle
+			// 
+			this.actiontitle.AutoSize = true;
+			this.actiontitle.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.actiontitle.Location = new System.Drawing.Point(67, 30);
+			this.actiontitle.Name = "actiontitle";
+			this.actiontitle.Size = new System.Drawing.Size(176, 13);
+			this.actiontitle.TabIndex = 1;
+			this.actiontitle.Text = "(select an action from the list)";
+			this.actiontitle.UseMnemonic = false;
+			// 
+			// actioncontrolclear
+			// 
+			this.actioncontrolclear.Image = global::CodeImp.DoomBuilder.Properties.Resources.SearchClear;
+			this.actioncontrolclear.Location = new System.Drawing.Point(193, 137);
+			this.actioncontrolclear.Name = "actioncontrolclear";
+			this.actioncontrolclear.Size = new System.Drawing.Size(26, 25);
+			this.actioncontrolclear.TabIndex = 6;
+			this.actioncontrolclear.TabStop = false;
+			this.actioncontrolclear.UseVisualStyleBackColor = true;
+			this.actioncontrolclear.Click += new System.EventHandler(this.actioncontrolclear_Click);
+			// 
+			// actionkey
+			// 
+			this.actionkey.ImeMode = System.Windows.Forms.ImeMode.Off;
+			this.actionkey.Location = new System.Drawing.Point(23, 140);
+			this.actionkey.Name = "actionkey";
+			this.actionkey.Size = new System.Drawing.Size(163, 20);
+			this.actionkey.TabIndex = 5;
+			this.actionkey.TabStop = false;
+			this.actionkey.KeyDown += new System.Windows.Forms.KeyEventHandler(this.actionkey_KeyDown);
+			// 
+			// tabcolors
+			// 
+			this.tabcolors.Controls.Add(this.appearancegroup1);
+			this.tabcolors.Controls.Add(this.colorsgroup3);
+			this.tabcolors.Controls.Add(this.colorsgroup1);
+			this.tabcolors.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.tabcolors.Location = new System.Drawing.Point(4, 23);
+			this.tabcolors.Name = "tabcolors";
+			this.tabcolors.Padding = new System.Windows.Forms.Padding(5);
+			this.tabcolors.Size = new System.Drawing.Size(682, 509);
+			this.tabcolors.TabIndex = 2;
+			this.tabcolors.Text = "Appearance";
+			this.tabcolors.UseVisualStyleBackColor = true;
+			// 
+			// appearancegroup1
+			// 
+			this.appearancegroup1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.appearancegroup1.Controls.Add(this.capitalizetexturenames);
+			this.appearancegroup1.Controls.Add(this.cbMarkExtraFloors);
+			this.appearancegroup1.Controls.Add(this.cbOldHighlightMode);
+			this.appearancegroup1.Controls.Add(label21);
+			this.appearancegroup1.Controls.Add(this.labelDynLightIntensity);
+			this.appearancegroup1.Controls.Add(this.cbStretchView);
+			this.appearancegroup1.Controls.Add(this.tbDynLightIntensity);
+			this.appearancegroup1.Controls.Add(label20);
+			this.appearancegroup1.Controls.Add(this.qualitydisplay);
+			this.appearancegroup1.Controls.Add(this.labelDynLightSize);
+			this.appearancegroup1.Controls.Add(this.tbDynLightSize);
+			this.appearancegroup1.Controls.Add(label18);
+			this.appearancegroup1.Controls.Add(this.labelDynLightCount);
+			this.appearancegroup1.Controls.Add(this.tbDynLightCount);
+			this.appearancegroup1.Controls.Add(this.animatevisualselection);
+			this.appearancegroup1.Controls.Add(this.blackbrowsers);
+			this.appearancegroup1.Controls.Add(this.visualbilinear);
+			this.appearancegroup1.Controls.Add(label1);
+			this.appearancegroup1.Controls.Add(this.classicbilinear);
+			this.appearancegroup1.Controls.Add(this.imagebrightnesslabel);
+			this.appearancegroup1.Controls.Add(this.imagebrightness);
+			this.appearancegroup1.Location = new System.Drawing.Point(217, 224);
+			this.appearancegroup1.Name = "appearancegroup1";
+			this.appearancegroup1.Size = new System.Drawing.Size(457, 277);
+			this.appearancegroup1.TabIndex = 24;
+			this.appearancegroup1.TabStop = false;
+			this.appearancegroup1.Text = " Additional Options ";
+			// 
+			// capitalizetexturenames
+			// 
+			this.capitalizetexturenames.AutoSize = true;
+			this.capitalizetexturenames.Location = new System.Drawing.Point(236, 191);
+			this.capitalizetexturenames.Name = "capitalizetexturenames";
+			this.capitalizetexturenames.Size = new System.Drawing.Size(140, 17);
+			this.capitalizetexturenames.TabIndex = 36;
+			this.capitalizetexturenames.Text = "Capitalize texture names";
+			this.toolTip1.SetToolTip(this.capitalizetexturenames, "When enabled, texture names will be shown \r\nand saved as all caps\r\n(Doom Builder " +
+					"2 behaviour)");
+			this.capitalizetexturenames.UseVisualStyleBackColor = true;
+			// 
+			// cbMarkExtraFloors
+			// 
+			this.cbMarkExtraFloors.AutoSize = true;
+			this.cbMarkExtraFloors.Location = new System.Drawing.Point(25, 254);
+			this.cbMarkExtraFloors.Name = "cbMarkExtraFloors";
+			this.cbMarkExtraFloors.Size = new System.Drawing.Size(175, 17);
+			this.cbMarkExtraFloors.TabIndex = 35;
+			this.cbMarkExtraFloors.Text = "Mark 3D floors in classic modes";
+			this.toolTip1.SetToolTip(this.cbMarkExtraFloors, "When enabled, linedefs of sectors with 3d floors will be marked using \"3D Floors\"" +
+					" color.");
+			this.cbMarkExtraFloors.UseVisualStyleBackColor = true;
+			// 
+			// cbOldHighlightMode
+			// 
+			this.cbOldHighlightMode.AutoSize = true;
+			this.cbOldHighlightMode.Location = new System.Drawing.Point(236, 233);
+			this.cbOldHighlightMode.Name = "cbOldHighlightMode";
+			this.cbOldHighlightMode.Size = new System.Drawing.Size(207, 17);
+			this.cbOldHighlightMode.TabIndex = 33;
+			this.cbOldHighlightMode.Text = "Always show selection in visual modes";
+			this.toolTip1.SetToolTip(this.cbOldHighlightMode, "If enabled, selected surfaces will be highlighted in Visual mode\r\neven if \"Show h" +
+					"ighlight\" mode is disabled \r\n(Doom Builder 2 behaviour).");
+			this.cbOldHighlightMode.UseVisualStyleBackColor = true;
+			// 
+			// labelDynLightIntensity
+			// 
+			this.labelDynLightIntensity.AutoSize = true;
+			this.labelDynLightIntensity.Location = new System.Drawing.Point(337, 129);
+			this.labelDynLightIntensity.Name = "labelDynLightIntensity";
+			this.labelDynLightIntensity.Size = new System.Drawing.Size(22, 13);
+			this.labelDynLightIntensity.TabIndex = 32;
+			this.labelDynLightIntensity.Text = "1.0";
+			// 
+			// tbDynLightIntensity
+			// 
+			this.tbDynLightIntensity.BackColor = System.Drawing.SystemColors.Window;
+			this.tbDynLightIntensity.LargeChange = 1;
+			this.tbDynLightIntensity.Location = new System.Drawing.Point(176, 119);
+			this.tbDynLightIntensity.Minimum = 1;
+			this.tbDynLightIntensity.Name = "tbDynLightIntensity";
+			this.tbDynLightIntensity.Size = new System.Drawing.Size(154, 45);
+			this.tbDynLightIntensity.TabIndex = 30;
+			this.tbDynLightIntensity.TickStyle = System.Windows.Forms.TickStyle.TopLeft;
+			this.tbDynLightIntensity.Value = 10;
+			this.tbDynLightIntensity.ValueChanged += new System.EventHandler(this.tbDynLightIntensity_ValueChanged);
+			// 
+			// labelDynLightSize
+			// 
+			this.labelDynLightSize.AutoSize = true;
+			this.labelDynLightSize.Location = new System.Drawing.Point(337, 96);
+			this.labelDynLightSize.Name = "labelDynLightSize";
+			this.labelDynLightSize.Size = new System.Drawing.Size(22, 13);
+			this.labelDynLightSize.TabIndex = 29;
+			this.labelDynLightSize.Text = "1.0";
+			// 
+			// tbDynLightSize
+			// 
+			this.tbDynLightSize.BackColor = System.Drawing.SystemColors.Window;
+			this.tbDynLightSize.LargeChange = 1;
+			this.tbDynLightSize.Location = new System.Drawing.Point(176, 85);
+			this.tbDynLightSize.Maximum = 20;
+			this.tbDynLightSize.Minimum = 1;
+			this.tbDynLightSize.Name = "tbDynLightSize";
+			this.tbDynLightSize.Size = new System.Drawing.Size(154, 45);
+			this.tbDynLightSize.TabIndex = 27;
+			this.tbDynLightSize.TickStyle = System.Windows.Forms.TickStyle.TopLeft;
+			this.tbDynLightSize.Value = 10;
+			this.tbDynLightSize.ValueChanged += new System.EventHandler(this.tbDynLightSize_ValueChanged);
+			// 
+			// labelDynLightCount
+			// 
+			this.labelDynLightCount.AutoSize = true;
+			this.labelDynLightCount.Location = new System.Drawing.Point(337, 62);
+			this.labelDynLightCount.Name = "labelDynLightCount";
+			this.labelDynLightCount.Size = new System.Drawing.Size(19, 13);
+			this.labelDynLightCount.TabIndex = 26;
+			this.labelDynLightCount.Text = "16";
+			// 
+			// tbDynLightCount
+			// 
+			this.tbDynLightCount.BackColor = System.Drawing.SystemColors.Window;
+			this.tbDynLightCount.LargeChange = 3;
+			this.tbDynLightCount.Location = new System.Drawing.Point(176, 51);
+			this.tbDynLightCount.Maximum = 32;
+			this.tbDynLightCount.Minimum = 1;
+			this.tbDynLightCount.Name = "tbDynLightCount";
+			this.tbDynLightCount.Size = new System.Drawing.Size(154, 45);
+			this.tbDynLightCount.TabIndex = 24;
+			this.tbDynLightCount.TickFrequency = 4;
+			this.tbDynLightCount.TickStyle = System.Windows.Forms.TickStyle.TopLeft;
+			this.tbDynLightCount.Value = 1;
+			this.tbDynLightCount.ValueChanged += new System.EventHandler(this.tbDynLightCount_ValueChanged);
+			// 
+			// animatevisualselection
+			// 
+			this.animatevisualselection.AutoSize = true;
+			this.animatevisualselection.Location = new System.Drawing.Point(236, 212);
+			this.animatevisualselection.Name = "animatevisualselection";
+			this.animatevisualselection.Size = new System.Drawing.Size(184, 17);
+			this.animatevisualselection.TabIndex = 23;
+			this.animatevisualselection.Text = "Animate selection in visual modes";
+			this.animatevisualselection.UseVisualStyleBackColor = true;
+			// 
+			// blackbrowsers
+			// 
+			this.blackbrowsers.AutoSize = true;
+			this.blackbrowsers.Location = new System.Drawing.Point(25, 170);
+			this.blackbrowsers.Name = "blackbrowsers";
+			this.blackbrowsers.Size = new System.Drawing.Size(195, 17);
+			this.blackbrowsers.TabIndex = 4;
+			this.blackbrowsers.Text = "Black background in image browser";
+			this.blackbrowsers.UseVisualStyleBackColor = true;
+			// 
+			// visualbilinear
+			// 
+			this.visualbilinear.AutoSize = true;
+			this.visualbilinear.Location = new System.Drawing.Point(25, 233);
+			this.visualbilinear.Name = "visualbilinear";
+			this.visualbilinear.Size = new System.Drawing.Size(171, 17);
+			this.visualbilinear.TabIndex = 6;
+			this.visualbilinear.Text = "Bilinear filtering in visual modes";
+			this.visualbilinear.UseVisualStyleBackColor = true;
+			// 
+			// classicbilinear
+			// 
+			this.classicbilinear.AutoSize = true;
+			this.classicbilinear.Location = new System.Drawing.Point(25, 212);
+			this.classicbilinear.Name = "classicbilinear";
+			this.classicbilinear.Size = new System.Drawing.Size(176, 17);
+			this.classicbilinear.TabIndex = 5;
+			this.classicbilinear.Text = "Bilinear filtering in classic modes";
+			this.classicbilinear.UseVisualStyleBackColor = true;
+			// 
+			// imagebrightnesslabel
+			// 
+			this.imagebrightnesslabel.AutoSize = true;
+			this.imagebrightnesslabel.Location = new System.Drawing.Point(337, 29);
+			this.imagebrightnesslabel.Name = "imagebrightnesslabel";
+			this.imagebrightnesslabel.Size = new System.Drawing.Size(30, 13);
+			this.imagebrightnesslabel.TabIndex = 22;
+			this.imagebrightnesslabel.Text = "+ 0 y";
+			// 
+			// imagebrightness
+			// 
+			this.imagebrightness.BackColor = System.Drawing.SystemColors.Window;
+			this.imagebrightness.LargeChange = 3;
+			this.imagebrightness.Location = new System.Drawing.Point(176, 18);
+			this.imagebrightness.Name = "imagebrightness";
+			this.imagebrightness.Size = new System.Drawing.Size(154, 45);
+			this.imagebrightness.TabIndex = 3;
+			this.imagebrightness.TickStyle = System.Windows.Forms.TickStyle.TopLeft;
+			this.imagebrightness.ValueChanged += new System.EventHandler(this.imagebrightness_ValueChanged);
+			// 
+			// colorsgroup3
+			// 
+			this.colorsgroup3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.colorsgroup3.Controls.Add(this.snippetsallmanstyle);
+			this.colorsgroup3.Controls.Add(this.scripttabwidth);
+			this.colorsgroup3.Controls.Add(this.scriptautoindent);
+			this.colorsgroup3.Controls.Add(this.label10);
+			this.colorsgroup3.Controls.Add(this.fontpreview);
+			this.colorsgroup3.Controls.Add(this.scriptfontsize);
+			this.colorsgroup3.Controls.Add(this.label8);
+			this.colorsgroup3.Controls.Add(this.scriptfontbold);
+			this.colorsgroup3.Controls.Add(this.scriptfontname);
+			this.colorsgroup3.Controls.Add(this.label3);
+			this.colorsgroup3.Controls.Add(this.colorconstants);
+			this.colorsgroup3.Controls.Add(this.colorliterals);
+			this.colorsgroup3.Controls.Add(this.colorscriptbackground);
+			this.colorsgroup3.Controls.Add(this.colorkeywords);
+			this.colorsgroup3.Controls.Add(this.colorlinenumbers);
+			this.colorsgroup3.Controls.Add(this.colorcomments);
+			this.colorsgroup3.Controls.Add(this.colorplaintext);
+			this.colorsgroup3.Location = new System.Drawing.Point(217, 8);
+			this.colorsgroup3.Name = "colorsgroup3";
+			this.colorsgroup3.Size = new System.Drawing.Size(457, 212);
+			this.colorsgroup3.TabIndex = 1;
+			this.colorsgroup3.TabStop = false;
+			this.colorsgroup3.Text = " Script editor ";
+			this.colorsgroup3.Visible = false;
+			// 
+			// snippetsallmanstyle
+			// 
+			this.snippetsallmanstyle.AutoSize = true;
+			this.snippetsallmanstyle.Location = new System.Drawing.Point(202, 187);
+			this.snippetsallmanstyle.Name = "snippetsallmanstyle";
+			this.snippetsallmanstyle.Size = new System.Drawing.Size(172, 17);
+			this.snippetsallmanstyle.TabIndex = 34;
+			this.snippetsallmanstyle.Text = "Allman-style bracing in snippets";
+			this.toolTip1.SetToolTip(this.snippetsallmanstyle, resources.GetString("snippetsallmanstyle.ToolTip"));
+			this.snippetsallmanstyle.UseVisualStyleBackColor = true;
+			// 
+			// scripttabwidth
+			// 
+			this.scripttabwidth.AllowDecimal = false;
+			this.scripttabwidth.AllowNegative = false;
+			this.scripttabwidth.AllowRelative = false;
+			this.scripttabwidth.ButtonStep = 2;
+			this.scripttabwidth.ButtonStepBig = 10F;
+			this.scripttabwidth.ButtonStepFloat = 1F;
+			this.scripttabwidth.ButtonStepSmall = 0.1F;
+			this.scripttabwidth.ButtonStepsUseModifierKeys = false;
+			this.scripttabwidth.ButtonStepsWrapAround = false;
+			this.scripttabwidth.Location = new System.Drawing.Point(364, 157);
+			this.scripttabwidth.Name = "scripttabwidth";
+			this.scripttabwidth.Size = new System.Drawing.Size(71, 24);
+			this.scripttabwidth.StepValues = null;
+			this.scripttabwidth.TabIndex = 32;
+			// 
+			// scriptautoindent
+			// 
+			this.scriptautoindent.AutoSize = true;
+			this.scriptautoindent.Location = new System.Drawing.Point(202, 161);
+			this.scriptautoindent.Name = "scriptautoindent";
+			this.scriptautoindent.Size = new System.Drawing.Size(80, 17);
+			this.scriptautoindent.TabIndex = 31;
+			this.scriptautoindent.Text = "Auto indent";
+			this.scriptautoindent.UseVisualStyleBackColor = true;
+			// 
+			// label10
+			// 
+			this.label10.AutoSize = true;
+			this.label10.Location = new System.Drawing.Point(304, 162);
+			this.label10.Name = "label10";
+			this.label10.Size = new System.Drawing.Size(57, 13);
+			this.label10.TabIndex = 30;
+			this.label10.Text = "Tab width:";
+			// 
+			// fontpreview
+			// 
+			this.fontpreview.Cursor = System.Windows.Forms.Cursors.Arrow;
+			this.fontpreview.DetectUrls = false;
+			this.fontpreview.Location = new System.Drawing.Point(202, 70);
+			this.fontpreview.Name = "fontpreview";
+			this.fontpreview.ReadOnly = true;
+			this.fontpreview.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.None;
+			this.fontpreview.Size = new System.Drawing.Size(233, 80);
+			this.fontpreview.TabIndex = 33;
+			this.fontpreview.Text = "1 #include \"zcommon.acs\"\n2 script 0 (void) { //a comment\n3       CONSTANT_VALUE;\n" +
+				"4 }";
+			this.fontpreview.WordWrap = false;
+			// 
+			// scriptfontsize
+			// 
+			this.scriptfontsize.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.scriptfontsize.FormattingEnabled = true;
+			this.scriptfontsize.Items.AddRange(new object[] {
+            "7",
+            "8",
+            "9",
+            "10",
+            "11",
+            "12",
+            "14",
+            "16",
+            "18",
+            "20",
+            "22",
+            "24",
+            "26",
+            "28",
+            "36",
+            "48",
+            "72"});
+			this.scriptfontsize.Location = new System.Drawing.Point(236, 43);
+			this.scriptfontsize.Name = "scriptfontsize";
+			this.scriptfontsize.Size = new System.Drawing.Size(94, 21);
+			this.scriptfontsize.TabIndex = 25;
+			this.scriptfontsize.SelectedIndexChanged += new System.EventHandler(this.scriptfontsize_SelectedIndexChanged);
+			// 
+			// label8
+			// 
+			this.label8.AutoSize = true;
+			this.label8.Location = new System.Drawing.Point(199, 46);
+			this.label8.Name = "label8";
+			this.label8.Size = new System.Drawing.Size(30, 13);
+			this.label8.TabIndex = 28;
+			this.label8.Text = "Size:";
+			// 
+			// scriptfontbold
+			// 
+			this.scriptfontbold.AutoSize = true;
+			this.scriptfontbold.Location = new System.Drawing.Point(354, 45);
+			this.scriptfontbold.Name = "scriptfontbold";
+			this.scriptfontbold.Size = new System.Drawing.Size(47, 17);
+			this.scriptfontbold.TabIndex = 26;
+			this.scriptfontbold.Text = "Bold";
+			this.scriptfontbold.UseVisualStyleBackColor = true;
+			this.scriptfontbold.CheckedChanged += new System.EventHandler(this.scriptfontbold_CheckedChanged);
+			// 
+			// scriptfontname
+			// 
+			this.scriptfontname.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.scriptfontname.FormattingEnabled = true;
+			this.scriptfontname.Location = new System.Drawing.Point(236, 17);
+			this.scriptfontname.Name = "scriptfontname";
+			this.scriptfontname.Size = new System.Drawing.Size(199, 21);
+			this.scriptfontname.Sorted = true;
+			this.scriptfontname.TabIndex = 23;
+			this.scriptfontname.SelectedIndexChanged += new System.EventHandler(this.scriptfontname_SelectedIndexChanged);
+			// 
+			// label3
+			// 
+			this.label3.AutoSize = true;
+			this.label3.Location = new System.Drawing.Point(199, 20);
+			this.label3.Name = "label3";
+			this.label3.Size = new System.Drawing.Size(31, 13);
+			this.label3.TabIndex = 24;
+			this.label3.Text = "Font:";
+			// 
+			// colorconstants
+			// 
+			this.colorconstants.BackColor = System.Drawing.Color.Transparent;
+			this.colorconstants.Label = "Constants:";
+			this.colorconstants.Location = new System.Drawing.Point(15, 179);
+			this.colorconstants.MaximumSize = new System.Drawing.Size(10000, 23);
+			this.colorconstants.MinimumSize = new System.Drawing.Size(100, 23);
+			this.colorconstants.Name = "colorconstants";
+			this.colorconstants.Size = new System.Drawing.Size(150, 23);
+			this.colorconstants.TabIndex = 6;
+			this.colorconstants.ColorChanged += new System.EventHandler(this.scriptcolor_ColorChanged);
+			// 
+			// colorliterals
+			// 
+			this.colorliterals.BackColor = System.Drawing.Color.Transparent;
+			this.colorliterals.Label = "Literals:";
+			this.colorliterals.Location = new System.Drawing.Point(15, 152);
+			this.colorliterals.MaximumSize = new System.Drawing.Size(10000, 23);
+			this.colorliterals.MinimumSize = new System.Drawing.Size(100, 23);
+			this.colorliterals.Name = "colorliterals";
+			this.colorliterals.Size = new System.Drawing.Size(150, 23);
+			this.colorliterals.TabIndex = 5;
+			this.colorliterals.ColorChanged += new System.EventHandler(this.scriptcolor_ColorChanged);
+			// 
+			// colorscriptbackground
+			// 
+			this.colorscriptbackground.BackColor = System.Drawing.Color.Transparent;
+			this.colorscriptbackground.Label = "Background:";
+			this.colorscriptbackground.Location = new System.Drawing.Point(15, 17);
+			this.colorscriptbackground.MaximumSize = new System.Drawing.Size(10000, 23);
+			this.colorscriptbackground.MinimumSize = new System.Drawing.Size(100, 23);
+			this.colorscriptbackground.Name = "colorscriptbackground";
+			this.colorscriptbackground.Size = new System.Drawing.Size(150, 23);
+			this.colorscriptbackground.TabIndex = 0;
+			this.colorscriptbackground.ColorChanged += new System.EventHandler(this.scriptcolor_ColorChanged);
+			// 
+			// colorkeywords
+			// 
+			this.colorkeywords.BackColor = System.Drawing.Color.Transparent;
+			this.colorkeywords.Label = "Keywords:";
+			this.colorkeywords.Location = new System.Drawing.Point(15, 125);
+			this.colorkeywords.MaximumSize = new System.Drawing.Size(10000, 23);
+			this.colorkeywords.MinimumSize = new System.Drawing.Size(100, 23);
+			this.colorkeywords.Name = "colorkeywords";
+			this.colorkeywords.Size = new System.Drawing.Size(150, 23);
+			this.colorkeywords.TabIndex = 4;
+			this.colorkeywords.ColorChanged += new System.EventHandler(this.scriptcolor_ColorChanged);
+			// 
+			// colorlinenumbers
+			// 
+			this.colorlinenumbers.BackColor = System.Drawing.Color.Transparent;
+			this.colorlinenumbers.Label = "Line numbers:";
+			this.colorlinenumbers.Location = new System.Drawing.Point(15, 44);
+			this.colorlinenumbers.MaximumSize = new System.Drawing.Size(10000, 23);
+			this.colorlinenumbers.MinimumSize = new System.Drawing.Size(100, 23);
+			this.colorlinenumbers.Name = "colorlinenumbers";
+			this.colorlinenumbers.Size = new System.Drawing.Size(150, 23);
+			this.colorlinenumbers.TabIndex = 1;
+			this.colorlinenumbers.ColorChanged += new System.EventHandler(this.scriptcolor_ColorChanged);
+			// 
+			// colorcomments
+			// 
+			this.colorcomments.BackColor = System.Drawing.Color.Transparent;
+			this.colorcomments.Label = "Comments:";
+			this.colorcomments.Location = new System.Drawing.Point(15, 98);
+			this.colorcomments.MaximumSize = new System.Drawing.Size(10000, 23);
+			this.colorcomments.MinimumSize = new System.Drawing.Size(100, 23);
+			this.colorcomments.Name = "colorcomments";
+			this.colorcomments.Size = new System.Drawing.Size(150, 23);
+			this.colorcomments.TabIndex = 3;
+			this.colorcomments.ColorChanged += new System.EventHandler(this.scriptcolor_ColorChanged);
+			// 
+			// colorplaintext
+			// 
+			this.colorplaintext.BackColor = System.Drawing.Color.Transparent;
+			this.colorplaintext.Label = "Plain text:";
+			this.colorplaintext.Location = new System.Drawing.Point(15, 71);
+			this.colorplaintext.MaximumSize = new System.Drawing.Size(10000, 23);
+			this.colorplaintext.MinimumSize = new System.Drawing.Size(100, 23);
+			this.colorplaintext.Name = "colorplaintext";
+			this.colorplaintext.Size = new System.Drawing.Size(150, 23);
+			this.colorplaintext.TabIndex = 2;
+			this.colorplaintext.ColorChanged += new System.EventHandler(this.scriptcolor_ColorChanged);
+			// 
+			// tabpasting
+			// 
+			this.tabpasting.Controls.Add(this.label16);
+			this.tabpasting.Controls.Add(this.pasteoptions);
+			this.tabpasting.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.tabpasting.Location = new System.Drawing.Point(4, 23);
+			this.tabpasting.Name = "tabpasting";
+			this.tabpasting.Padding = new System.Windows.Forms.Padding(5);
+			this.tabpasting.Size = new System.Drawing.Size(682, 509);
+			this.tabpasting.TabIndex = 3;
+			this.tabpasting.Text = "Pasting ";
+			this.tabpasting.UseVisualStyleBackColor = true;
+			// 
+			// label16
+			// 
+			this.label16.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.label16.Location = new System.Drawing.Point(11, 15);
+			this.label16.Name = "label16";
+			this.label16.Size = new System.Drawing.Size(649, 35);
+			this.label16.TabIndex = 1;
+			this.label16.Text = "These are the default options for pasting geometry. You can also choose these opt" +
+				"ions when you use the Paste Special function. These options also apply when inse" +
+				"rting prefabs.";
+			// 
+			// pasteoptions
+			// 
+			this.pasteoptions.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.pasteoptions.Location = new System.Drawing.Point(8, 53);
+			this.pasteoptions.Name = "pasteoptions";
+			this.pasteoptions.Size = new System.Drawing.Size(666, 427);
+			this.pasteoptions.TabIndex = 0;
+			// 
+			// browseScreenshotsFolderDialog
+			// 
+			this.browseScreenshotsFolderDialog.Description = "Select a Folder to Save Screenshots Into";
+			// 
+			// PreferencesForm
+			// 
+			this.AcceptButton = this.apply;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.CancelButton = this.cancel;
+			this.ClientSize = new System.Drawing.Size(711, 594);
+			this.Controls.Add(this.cancel);
+			this.Controls.Add(this.apply);
+			this.Controls.Add(this.tabs);
+			this.DoubleBuffered = true;
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "PreferencesForm";
+			this.Opacity = 1;
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Preferences";
+			this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.PreferencesForm_HelpRequested);
+			groupBox1.ResumeLayout(false);
+			groupBox1.PerformLayout();
+			((System.ComponentModel.ISupportInitialize)(this.recentFiles)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.vertexScale)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.zoomfactor)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.autoscrollspeed)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.previewsize)).EndInit();
+			this.colorsgroup1.ResumeLayout(false);
+			this.colorsgroup1.PerformLayout();
+			((System.ComponentModel.ISupportInitialize)(this.doublesidedalpha)).EndInit();
+			this.tabs.ResumeLayout(false);
+			this.tabinterface.ResumeLayout(false);
+			this.groupBox3.ResumeLayout(false);
+			this.groupBox3.PerformLayout();
+			this.groupBox5.ResumeLayout(false);
+			this.groupBox5.PerformLayout();
+			this.groupBox4.ResumeLayout(false);
+			this.groupBox4.PerformLayout();
+			this.groupBox2.ResumeLayout(false);
+			this.groupBox2.PerformLayout();
+			((System.ComponentModel.ISupportInitialize)(this.vertexScale3D)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.viewdistance)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.movespeed)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.mousespeed)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.fieldofview)).EndInit();
+			this.tabkeys.ResumeLayout(false);
+			this.tabkeys.PerformLayout();
+			this.actioncontrolpanel.ResumeLayout(false);
+			this.actioncontrolpanel.PerformLayout();
+			this.tabcolors.ResumeLayout(false);
+			this.appearancegroup1.ResumeLayout(false);
+			this.appearancegroup1.PerformLayout();
+			((System.ComponentModel.ISupportInitialize)(this.tbDynLightIntensity)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.tbDynLightSize)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.tbDynLightCount)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.imagebrightness)).EndInit();
+			this.colorsgroup3.ResumeLayout(false);
+			this.colorsgroup3.PerformLayout();
+			this.tabpasting.ResumeLayout(false);
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Button cancel;
+		private System.Windows.Forms.Button apply;
+		private System.Windows.Forms.TabControl tabs;
+		private System.Windows.Forms.TabPage tabinterface;
+		private System.Windows.Forms.TabPage tabkeys;
+		private System.Windows.Forms.ListView listactions;
+		private System.Windows.Forms.ColumnHeader columncontrolaction;
+		private System.Windows.Forms.ColumnHeader columncontrolkey;
+		private System.Windows.Forms.GroupBox actioncontrolpanel;
+		private System.Windows.Forms.ComboBox actioncontrol;
+		private System.Windows.Forms.Label actiontitle;
+		private System.Windows.Forms.Button actioncontrolclear;
+		private System.Windows.Forms.TextBox actionkey;
+		private System.Windows.Forms.TabPage tabcolors;
+		private CodeImp.DoomBuilder.Controls.ColorControl colorselection;
+		private CodeImp.DoomBuilder.Controls.ColorControl colorhighlight;
+		private CodeImp.DoomBuilder.Controls.ColorControl colorlinedefs;
+		private CodeImp.DoomBuilder.Controls.ColorControl colorvertices;
+		private CodeImp.DoomBuilder.Controls.ColorControl colorbackcolor;
+		private System.Windows.Forms.GroupBox colorsgroup3;
+		private CodeImp.DoomBuilder.Controls.ColorControl colorscriptbackground;
+		private CodeImp.DoomBuilder.Controls.ColorControl colorkeywords;
+		private CodeImp.DoomBuilder.Controls.ColorControl colorlinenumbers;
+		private CodeImp.DoomBuilder.Controls.ColorControl colorcomments;
+		private CodeImp.DoomBuilder.Controls.ColorControl colorplaintext;
+		private CodeImp.DoomBuilder.Controls.ColorControl colorliterals;
+		private CodeImp.DoomBuilder.Controls.ColorControl colorconstants;
+		private CodeImp.DoomBuilder.Controls.ColorControl colorindication;
+		private CodeImp.DoomBuilder.Controls.ColorControl colorgrid64;
+		private CodeImp.DoomBuilder.Controls.ColorControl colorgrid;
+		private System.Windows.Forms.GroupBox colorsgroup1;
+		private System.Windows.Forms.CheckBox blackbrowsers;
+		private System.Windows.Forms.Label label2;
+		private System.Windows.Forms.Label doublesidedalphalabel;
+		private System.Windows.Forms.Label imagebrightnesslabel;
+		private System.Windows.Forms.GroupBox groupBox2;
+		private System.Windows.Forms.Label fieldofviewlabel;
+		private System.Windows.Forms.Label label4;
+		private System.Windows.Forms.Label movespeedlabel;
+		private System.Windows.Forms.Label label11;
+		private System.Windows.Forms.Label mousespeedlabel;
+		private System.Windows.Forms.Label label9;
+		private System.Windows.Forms.Label viewdistancelabel;
+		private System.Windows.Forms.Label label13;
+		private System.Windows.Forms.CheckBox invertyaxis;
+		private System.Windows.Forms.ComboBox defaultviewmode;
+		private System.Windows.Forms.Label label14;
+		private System.Windows.Forms.TrackBar fieldofview;
+		private System.Windows.Forms.TrackBar movespeed;
+		private System.Windows.Forms.TrackBar mousespeed;
+		private System.Windows.Forms.TrackBar viewdistance;
+		private System.Windows.Forms.TrackBar doublesidedalpha;
+		private System.Windows.Forms.TrackBar imagebrightness;
+		private System.Windows.Forms.Label disregardshiftlabel;
+		private System.Windows.Forms.ListBox keyusedlist;
+		private System.Windows.Forms.Label keyusedlabel;
+		private System.Windows.Forms.CheckBox qualitydisplay;
+		private System.Windows.Forms.CheckBox visualbilinear;
+		private System.Windows.Forms.CheckBox classicbilinear;
+		private System.Windows.Forms.TrackBar previewsize;
+		private System.Windows.Forms.Label previewsizelabel;
+		private System.Windows.Forms.Label label12;
+		private System.Windows.Forms.TrackBar autoscrollspeed;
+		private System.Windows.Forms.Label autoscrollspeedlabel;
+		private System.Windows.Forms.Label label15;
+		private System.Windows.Forms.CheckBox animatevisualselection;
+		private System.Windows.Forms.TabPage tabpasting;
+		private CodeImp.DoomBuilder.Controls.PasteOptionsControl pasteoptions;
+		private System.Windows.Forms.Label label16;
+		private System.Windows.Forms.GroupBox appearancegroup1;
+		private System.Windows.Forms.GroupBox groupBox4;
+		private System.Windows.Forms.ComboBox dockersposition;
+		private System.Windows.Forms.Label label17;
+		private System.Windows.Forms.CheckBox collapsedockers;
+		private System.Windows.Forms.TrackBar zoomfactor;
+		private System.Windows.Forms.Label zoomfactorlabel;
+		private System.Windows.Forms.Label label19;
+		private System.Windows.Forms.GroupBox groupBox5;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox scripttabwidth;
+		private System.Windows.Forms.CheckBox scriptautoindent;
+		private System.Windows.Forms.Label label10;
+		private System.Windows.Forms.ComboBox scriptfontsize;
+		private System.Windows.Forms.Label label8;
+		private System.Windows.Forms.CheckBox scriptfontbold;
+		private System.Windows.Forms.ComboBox scriptfontname;
+		private System.Windows.Forms.Label label3;
+		private System.Windows.Forms.CheckBox scriptontop;
+		private System.Windows.Forms.CheckBox toolbar_script;
+		private System.Windows.Forms.CheckBox toolbar_copy;
+		private System.Windows.Forms.CheckBox toolbar_undo;
+		private System.Windows.Forms.CheckBox toolbar_viewmodes;
+		private System.Windows.Forms.CheckBox toolbar_filter;
+		private System.Windows.Forms.CheckBox toolbar_prefabs;
+		private System.Windows.Forms.CheckBox toolbar_geometry;
+		private System.Windows.Forms.CheckBox toolbar_testing;
+		private System.Windows.Forms.CheckBox toolbar_file;
+		private System.Windows.Forms.CheckBox showtexturesizes;
+		private CodeImp.DoomBuilder.Controls.ColorControl colorMD3;
+		private System.Windows.Forms.CheckBox toolbar_gzdoom;
+		private System.Windows.Forms.Label labelDynLightCount;
+		private System.Windows.Forms.TrackBar tbDynLightCount;
+		private System.Windows.Forms.Label labelDynLightSize;
+		private System.Windows.Forms.TrackBar tbDynLightSize;
+		private System.Windows.Forms.Label labelDynLightIntensity;
+		private System.Windows.Forms.TrackBar tbDynLightIntensity;
+		private System.Windows.Forms.CheckBox cbSynchCameras;
+		private System.Windows.Forms.CheckBox cbStretchView;
+		private System.Windows.Forms.ToolTip toolTip1;
+		private System.Windows.Forms.TrackBar vertexScale;
+		private System.Windows.Forms.Label vertexScaleLabel;
+		private System.Windows.Forms.Label label22;
+		private CodeImp.DoomBuilder.Controls.ColorControl colorInfo;
+		private System.Windows.Forms.CheckBox cbOldHighlightMode;
+		private System.Windows.Forms.Button bClearActionFilter;
+		private System.Windows.Forms.TextBox tbFilterActions;
+		private System.Windows.Forms.Label label24;
+		private CodeImp.DoomBuilder.Controls.ColorControl color3dFloors;
+		private System.Windows.Forms.TextBox actiondescription;
+		private System.Windows.Forms.RichTextBox fontpreview;
+		private System.Windows.Forms.CheckBox cbMarkExtraFloors;
+		private System.Windows.Forms.TrackBar recentFiles;
+		private System.Windows.Forms.Label labelRecentFiles;
+		private System.Windows.Forms.Label label25;
+		private System.Windows.Forms.CheckBox snippetsallmanstyle;
+		private System.Windows.Forms.CheckBox capitalizetexturenames;
+		private System.Windows.Forms.GroupBox groupBox3;
+		private System.Windows.Forms.Button browsescreenshotsdir;
+		private System.Windows.Forms.TextBox screenshotsfolderpath;
+		private System.Windows.Forms.Button resetscreenshotsdir;
+		private System.Windows.Forms.FolderBrowserDialog browseScreenshotsFolderDialog;
+		private System.Windows.Forms.TrackBar vertexScale3D;
+		private System.Windows.Forms.Label vertexScale3DLabel;
+		private System.Windows.Forms.Label label26;
+		private System.Windows.Forms.CheckBox locatetexturegroup;
+		private System.Windows.Forms.CheckBox cbStoreEditTab;
+		private System.Windows.Forms.CheckBox checkforupdates;
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/PreferencesForm.cs b/Source/Core/Windows/PreferencesForm.cs
new file mode 100644
index 0000000..3c204f1
--- /dev/null
+++ b/Source/Core/Windows/PreferencesForm.cs
@@ -0,0 +1,1054 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Actions;
+using System.Globalization;
+using CodeImp.DoomBuilder.Data;
+using System.IO;
+using Action = CodeImp.DoomBuilder.Actions.Action;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Windows
+{
+	internal partial class PreferencesForm : DelayedForm
+	{
+		#region ================== Variables
+
+		private PreferencesController controller;
+		private bool allowapplycontrol;
+		private bool disregardshift;
+		private bool disregardcontrol;
+		private List<ListViewItem> actionListItems; //mxd
+		private List<int> actionListItemsGroupIndices; //mxd
+
+		private bool reloadresources;
+		
+		#endregion
+
+		#region ================== Properties
+
+		public bool ReloadResources { get { return reloadresources; } }
+
+		#endregion
+
+		#region ================== Constructor
+
+		// Constructor
+		public PreferencesForm()
+		{
+			// Initialize
+			InitializeComponent();
+			
+			// Interface
+			imagebrightness.Value = General.Settings.ImageBrightness;
+			doublesidedalpha.Value = General.Clamp((int)((1.0f - General.Settings.DoubleSidedAlpha) * 10.0f), doublesidedalpha.Minimum, doublesidedalpha.Maximum);
+			defaultviewmode.SelectedIndex = General.Settings.DefaultViewMode;
+			fieldofview.Value = General.Clamp(General.Settings.VisualFOV / 10, fieldofview.Minimum, fieldofview.Maximum);
+			mousespeed.Value = General.Clamp(General.Settings.MouseSpeed / 100, mousespeed.Minimum, mousespeed.Maximum);
+			movespeed.Value = General.Clamp(General.Settings.MoveSpeed / 100, movespeed.Minimum, movespeed.Maximum);
+			vertexScale3D.Value = General.Clamp((int)(General.Settings.GZVertexScale3D * 10), vertexScale3D.Minimum, vertexScale3D.Maximum); //mxd
+			viewdistance.Value = General.Clamp((int)(General.Settings.ViewDistance / 200.0f), viewdistance.Minimum, viewdistance.Maximum);
+			invertyaxis.Checked = General.Settings.InvertYAxis;
+			scriptfontbold.Checked = General.Settings.ScriptFontBold;
+			scriptontop.Checked = General.Settings.ScriptOnTop;
+			scripttabwidth.Text = General.Settings.ScriptTabWidth.ToString();
+			scriptautoindent.Checked = General.Settings.ScriptAutoIndent;
+			snippetsallmanstyle.Checked = General.Settings.SnippetsAllmanStyle; //mxd
+			previewsize.Value = General.Clamp(General.Settings.PreviewImageSize, previewsize.Minimum, previewsize.Maximum);
+			autoscrollspeed.Value = General.Clamp(General.Settings.AutoScrollSpeed, autoscrollspeed.Minimum, autoscrollspeed.Maximum);
+			zoomfactor.Value = General.Clamp(General.Settings.ZoomFactor, zoomfactor.Minimum, zoomfactor.Maximum);
+			animatevisualselection.Checked = General.Settings.AnimateVisualSelection;
+			dockersposition.SelectedIndex = General.Settings.DockersPosition;
+			collapsedockers.Checked = General.Settings.CollapseDockers;
+			toolbar_file.Checked = General.Settings.ToolbarFile;
+			toolbar_script.Checked = General.Settings.ToolbarScript;
+			toolbar_undo.Checked = General.Settings.ToolbarUndo;
+			toolbar_copy.Checked = General.Settings.ToolbarCopy;
+			toolbar_prefabs.Checked = General.Settings.ToolbarPrefabs;
+			toolbar_filter.Checked = General.Settings.ToolbarFilter;
+			toolbar_viewmodes.Checked = General.Settings.ToolbarViewModes;
+			toolbar_geometry.Checked = General.Settings.ToolbarGeometry;
+			toolbar_testing.Checked = General.Settings.ToolbarTesting;
+			showtexturesizes.Checked = General.Settings.ShowTextureSizes;
+			//mxd
+			locatetexturegroup.Checked = General.Settings.LocateTextureGroup;
+			cbStoreEditTab.Checked = General.Settings.StoreSelectedEditTab;
+			checkforupdates.Checked = General.Settings.CheckForUpdates;
+			toolbar_gzdoom.Checked = General.Settings.GZToolbarGZDoom;
+			cbSynchCameras.Checked = General.Settings.GZSynchCameras;
+			tbDynLightCount.Value = General.Clamp(General.Settings.GZMaxDynamicLights, tbDynLightCount.Minimum, tbDynLightCount.Maximum);
+			labelDynLightCount.Text = General.Settings.GZMaxDynamicLights.ToString();
+			tbDynLightSize.Value = General.Clamp((int)(General.Settings.GZDynamicLightRadius * 10), tbDynLightSize.Minimum, tbDynLightSize.Maximum);
+			labelDynLightSize.Text = General.Settings.GZDynamicLightRadius.ToString();
+			tbDynLightIntensity.Value = General.Clamp((int)(General.Settings.GZDynamicLightIntensity * 10), tbDynLightIntensity.Minimum, tbDynLightIntensity.Maximum);
+			labelDynLightIntensity.Text = General.Settings.GZDynamicLightIntensity.ToString();
+			cbStretchView.Checked = General.Settings.GZStretchView;
+			cbOldHighlightMode.Checked = General.Settings.GZOldHighlightMode;
+			vertexScale.Value = General.Clamp((int)(General.Settings.GZVertexScale2D), vertexScale.Minimum, vertexScale.Maximum);
+			vertexScaleLabel.Text = vertexScale.Value * 100 + "%" + (vertexScale.Value == 1 ? " (default)" : "");
+			cbMarkExtraFloors.Checked = General.Settings.GZMarkExtraFloors;
+			recentFiles.Value = General.Settings.MaxRecentFiles;
+			screenshotsfolderpath.Text = General.Settings.ScreenshotsPath;
+			if(Directory.Exists(General.Settings.ScreenshotsPath))
+				browseScreenshotsFolderDialog.SelectedPath = General.Settings.ScreenshotsPath;
+			
+			// Fill fonts list
+			scriptfontname.BeginUpdate();
+			foreach(FontFamily ff in FontFamily.Families)
+				scriptfontname.Items.Add(ff.Name);
+			scriptfontname.EndUpdate();
+			
+			// Select script font name
+			for(int i = 0; i < scriptfontname.Items.Count; i++)
+			{
+				if(string.Compare(scriptfontname.Items[i].ToString(), General.Settings.ScriptFontName, true) == 0)
+					scriptfontname.SelectedIndex = i;
+			}
+
+			// Select script font size
+			for(int i = 0; i < scriptfontsize.Items.Count; i++)
+			{
+				if(string.Compare(scriptfontsize.Items[i].ToString(), General.Settings.ScriptFontSize.ToString(CultureInfo.InvariantCulture), true) == 0)
+					scriptfontsize.SelectedIndex = i;
+			}
+			
+			// Fill actions list with categories
+			foreach(KeyValuePair<string, string> c in General.Actions.Categories)
+				listactions.Groups.Add(c.Key, c.Value);
+			
+			// Fill list of actions
+			Action[] actions = General.Actions.GetAllActions();
+			actionListItems = new List<ListViewItem>(); //mxd
+			actionListItemsGroupIndices = new List<int>(); //mxd
+			foreach(Action a in actions)
+			{
+				// Create item
+				ListViewItem item = listactions.Items.Add(a.Name, a.Title, 0);
+				item.SubItems.Add(Action.GetShortcutKeyDesc(a.ShortcutKey));
+				item.SubItems[1].Tag = a.ShortcutKey;
+
+				// Put in category, if the category exists
+				if(General.Actions.Categories.ContainsKey(a.Category)) 
+				{
+					item.Group = listactions.Groups[a.Category];
+					actionListItemsGroupIndices.Add(listactions.Groups.IndexOf(item.Group));
+				}
+				else //mxd
+				{ 
+					actionListItemsGroupIndices.Add(-1);
+				}
+
+				actionListItems.Add(item); //mxd
+			}
+
+			// Set the colors
+			// TODO: Make this automated by using the collection
+			colorbackcolor.Color = General.Colors.Background;
+			colorvertices.Color = General.Colors.Vertices;
+			colorlinedefs.Color = General.Colors.Linedefs;
+			colorhighlight.Color = General.Colors.Highlight;
+			colorselection.Color = General.Colors.Selection;
+			colorindication.Color = General.Colors.Indication;
+			colorgrid.Color = General.Colors.Grid;
+			colorgrid64.Color = General.Colors.Grid64;
+
+			//mxd
+			colorMD3.Color = General.Colors.ModelWireframe;
+			colorInfo.Color = General.Colors.InfoLine;
+			color3dFloors.Color = General.Colors.ThreeDFloor;
+
+			colorscriptbackground.Color = General.Colors.ScriptBackground;
+			colorlinenumbers.Color = General.Colors.LineNumbers;
+			colorplaintext.Color = General.Colors.PlainText;
+			colorcomments.Color = General.Colors.Comments;
+			colorkeywords.Color = General.Colors.Keywords;
+			colorliterals.Color = General.Colors.Literals;
+			colorconstants.Color = General.Colors.Constants;
+			blackbrowsers.Checked = General.Settings.BlackBrowsers;
+			capitalizetexturenames.Checked = General.Settings.CapitalizeTextureNames; //mxd
+			classicbilinear.Checked = General.Settings.ClassicBilinear;
+			visualbilinear.Checked = General.Settings.VisualBilinear;
+			qualitydisplay.Checked = General.Settings.QualityDisplay;
+			
+			// Paste options
+			pasteoptions.Setup(General.Settings.PasteOptions.Copy());
+			UpdateScriptFontPreview(); //mxd
+
+			// Allow plugins to add tabs
+			this.SuspendLayout();
+			controller = new PreferencesController(this);
+			controller.AllowAddTab = true;
+			General.Plugins.OnShowPreferences(controller);
+			controller.AllowAddTab = false;
+			this.ResumeLayout(true);
+			
+			// Done
+			allowapplycontrol = true;
+		}
+
+		#endregion
+
+		#region ================== OK / Cancel
+
+		// OK clicked
+		private void apply_Click(object sender, EventArgs e)
+		{
+			//mxd. Check if Screenshots folder is valid
+			if(screenshotsfolderpath.Text != General.Settings.ScreenshotsPath && !Directory.Exists(screenshotsfolderpath.Text.Trim())) 
+			{
+				General.ShowErrorMessage("Screenshots folder does not exist!\nPlease enter a correct path.", MessageBoxButtons.OK);
+				return;
+			}
+			
+			// Let the plugins know
+			controller.RaiseAccept();
+			
+			// Check if we need to reload the resources
+			reloadresources |= (General.Settings.ImageBrightness != imagebrightness.Value);
+			reloadresources |= (General.Settings.PreviewImageSize != previewsize.Value);
+
+			// Apply interface
+			General.Settings.ImageBrightness = imagebrightness.Value;
+			General.Settings.DoubleSidedAlpha = 1.0f - (doublesidedalpha.Value * 0.1f);
+			General.Settings.DefaultViewMode = defaultviewmode.SelectedIndex;
+			General.Settings.VisualFOV = fieldofview.Value * 10;
+			General.Settings.MouseSpeed = mousespeed.Value * 100;
+			General.Settings.MoveSpeed = movespeed.Value * 100;
+			General.Settings.GZVertexScale3D = vertexScale3D.Value * 0.1f; //mxd
+			General.Settings.ViewDistance = viewdistance.Value * 200.0f;
+			General.Settings.InvertYAxis = invertyaxis.Checked;
+			General.Settings.ScriptFontBold = scriptfontbold.Checked;
+			General.Settings.ScriptFontName = scriptfontname.Text;
+			General.Settings.ScriptOnTop = scriptontop.Checked;
+			General.Settings.ScriptTabWidth = scripttabwidth.GetResult(General.Settings.ScriptTabWidth);
+			General.Settings.ScriptAutoIndent = scriptautoindent.Checked;
+			General.Settings.SnippetsAllmanStyle = snippetsallmanstyle.Checked; //mxd
+			General.Settings.PreviewImageSize = previewsize.Value;
+			General.Settings.AutoScrollSpeed = autoscrollspeed.Value;
+			General.Settings.ZoomFactor = zoomfactor.Value;
+			General.Settings.AnimateVisualSelection = animatevisualselection.Checked;
+			General.Settings.DockersPosition = dockersposition.SelectedIndex;
+			General.Settings.CollapseDockers = collapsedockers.Checked;
+			General.Settings.ToolbarFile = toolbar_file.Checked;
+			General.Settings.ToolbarScript = toolbar_script.Checked;
+			General.Settings.ToolbarUndo = toolbar_undo.Checked;
+			General.Settings.ToolbarCopy = toolbar_copy.Checked;
+			General.Settings.ToolbarPrefabs = toolbar_prefabs.Checked;
+			General.Settings.ToolbarFilter = toolbar_filter.Checked;
+			General.Settings.ToolbarViewModes = toolbar_viewmodes.Checked;
+			General.Settings.ToolbarGeometry = toolbar_geometry.Checked;
+			General.Settings.ToolbarTesting = toolbar_testing.Checked;
+			General.Settings.GZToolbarGZDoom = toolbar_gzdoom.Checked; //mxd
+			General.Settings.ShowTextureSizes = showtexturesizes.Checked;
+			General.Settings.StoreSelectedEditTab = cbStoreEditTab.Checked; //mxd
+			General.Settings.CheckForUpdates = checkforupdates.Checked; //mxd
+			General.Settings.LocateTextureGroup = locatetexturegroup.Checked; //mxd
+			General.Settings.MaxRecentFiles = recentFiles.Value; //mxd
+			General.Settings.ScreenshotsPath = screenshotsfolderpath.Text.Trim(); //mxd
+			
+			// Script font size
+			int fontsize;
+			if(!int.TryParse(scriptfontsize.Text, out fontsize)) fontsize = 10;
+			General.Settings.ScriptFontSize = fontsize;
+			
+			// Apply control keys to actions
+			foreach(ListViewItem item in actionListItems) //mxd
+				General.Actions[item.Name].SetShortcutKey((int)item.SubItems[1].Tag);
+
+			// Apply the colors
+			// TODO: Make this automated by using the collection
+			General.Colors.Background = colorbackcolor.Color;
+			General.Colors.Vertices = colorvertices.Color;
+			General.Colors.Linedefs = colorlinedefs.Color;
+
+			General.Colors.Highlight = colorhighlight.Color;
+			General.Colors.Selection = colorselection.Color;
+			General.Colors.Indication = colorindication.Color;
+			General.Colors.Grid = colorgrid.Color;
+			General.Colors.Grid64 = colorgrid64.Color;
+			General.Colors.ScriptBackground = colorscriptbackground.Color;
+			General.Colors.LineNumbers = colorlinenumbers.Color;
+			General.Colors.PlainText = colorplaintext.Color;
+			General.Colors.Comments = colorcomments.Color;
+			General.Colors.Keywords = colorkeywords.Color;
+			General.Colors.Literals = colorliterals.Color;
+			General.Colors.Constants = colorconstants.Color;
+			//mxd
+			General.Colors.ModelWireframe = colorMD3.Color;
+			General.Colors.InfoLine = colorInfo.Color;
+			General.Colors.ThreeDFloor = color3dFloors.Color;
+
+			General.Colors.CreateAssistColors();
+			General.Settings.BlackBrowsers = blackbrowsers.Checked;
+			General.Settings.CapitalizeTextureNames = capitalizetexturenames.Checked; //mxd
+			General.Settings.ClassicBilinear = classicbilinear.Checked;
+			General.Settings.VisualBilinear = visualbilinear.Checked;
+			General.Settings.QualityDisplay = qualitydisplay.Checked;
+
+			//mxd
+			General.Settings.GZSynchCameras = cbSynchCameras.Checked;
+			General.Settings.GZMaxDynamicLights = tbDynLightCount.Value;
+			General.Settings.GZDynamicLightRadius = (tbDynLightSize.Value / 10.0f);
+			General.Settings.GZDynamicLightIntensity = (tbDynLightIntensity.Value / 10.0f);
+			General.Settings.GZStretchView = cbStretchView.Checked;
+			General.Settings.GZVertexScale2D = vertexScale.Value;
+			General.Settings.GZOldHighlightMode = cbOldHighlightMode.Checked;
+			General.Settings.GZMarkExtraFloors = cbMarkExtraFloors.Checked;
+
+			// Paste options
+			General.Settings.PasteOptions = pasteoptions.GetOptions();
+			
+			// Let the plugins know we're closing
+			General.Plugins.OnClosePreferences(controller);
+			
+			// Close
+			this.DialogResult = DialogResult.OK;
+			this.Close();
+		}
+
+		// Cancel clicked
+		private void cancel_Click(object sender, EventArgs e)
+		{
+			// Let the plugins know
+			controller.RaiseCancel();
+
+			// Let the plugins know we're closing
+			General.Plugins.OnClosePreferences(controller);
+
+			// Close
+			this.DialogResult = DialogResult.Cancel;
+			this.Close();
+		}
+
+		#endregion
+
+		#region ================== Tabs
+
+		// This adds a tab page
+		public void AddTabPage(TabPage tab)
+		{
+			tabs.TabPages.Add(tab);
+		}
+
+		// Tab changes
+		private void tabs_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			// Enable/disable stuff with tabs
+			if(tabs.SelectedTab != tabkeys)
+			{
+				this.AcceptButton = apply;
+				this.CancelButton = cancel;
+				apply.TabStop = true;
+				cancel.TabStop = true;
+				tabs.TabStop = true;
+			}
+			else
+			{
+				this.AcceptButton = null;
+				this.CancelButton = null;
+				apply.TabStop = false;
+				cancel.TabStop = false;
+				tabs.TabStop = false;
+			}
+			
+			colorsgroup1.Visible = (tabs.SelectedTab == tabcolors);
+			colorsgroup3.Visible = (tabs.SelectedTab == tabcolors);
+		}
+
+		#endregion
+
+		#region ================== Interface Panel
+
+		private void previewsize_ValueChanged(object sender, EventArgs e)
+		{
+			int size = PreviewManager.PREVIEW_SIZES[previewsize.Value];
+			previewsizelabel.Text = size + " x " + size;
+		}
+		
+		private void fieldofview_ValueChanged(object sender, EventArgs e)
+		{
+			int value = fieldofview.Value * 10;
+			fieldofviewlabel.Text = value.ToString() + (char)176;
+		}
+
+		private void mousespeed_ValueChanged(object sender, EventArgs e)
+		{
+			int value = mousespeed.Value * 100;
+			mousespeedlabel.Text = value.ToString();
+		}
+
+		private void movespeed_ValueChanged(object sender, EventArgs e)
+		{
+			int value = movespeed.Value * 100;
+			movespeedlabel.Text = value.ToString();
+		}
+
+		//mxd
+		private void vertexScale3D_ValueChanged(object sender, EventArgs e) 
+		{
+			vertexScale3DLabel.Text = (vertexScale3D.Value * 10) + "%";
+		}
+
+		private void viewdistance_ValueChanged(object sender, EventArgs e)
+		{
+			int value = viewdistance.Value * 200;
+			viewdistancelabel.Text = value + " mp";
+		}
+
+		private void autoscrollspeed_ValueChanged(object sender, EventArgs e)
+		{
+			if(autoscrollspeed.Value == 0)
+				autoscrollspeedlabel.Text = "Off";
+			else
+				autoscrollspeedlabel.Text = autoscrollspeed.Value + "x";
+		}
+
+		private void zoomfactor_ValueChanged(object sender, EventArgs e)
+		{
+			zoomfactorlabel.Text = (zoomfactor.Value * 10) + "%";
+		}
+
+		//mxd
+		private void vertexScale_ValueChanged(object sender, EventArgs e) 
+		{
+			vertexScaleLabel.Text = (vertexScale.Value * 100) + "%";
+		}
+
+		//mxd
+		private void recentFiles_ValueChanged(object sender, EventArgs e) 
+		{
+			labelRecentFiles.Text = recentFiles.Value.ToString();
+		}
+
+		// This updates the script font preview label
+		private void UpdateScriptFontPreview()
+		{
+			if((scriptfontname.SelectedIndex > -1) &&
+			   (scriptfontsize.SelectedIndex > -1))
+			{
+				FontFamily ff = new FontFamily(scriptfontname.Text);
+				FontStyle style = FontStyle.Regular;
+				if(scriptfontbold.Checked)
+				{
+					// Prefer bold over regular
+					if(ff.IsStyleAvailable(FontStyle.Bold))
+						style = FontStyle.Bold;
+					else if(ff.IsStyleAvailable(FontStyle.Regular))
+						style = FontStyle.Regular;
+					else if(ff.IsStyleAvailable(FontStyle.Italic))
+						style = FontStyle.Italic;
+					else if(ff.IsStyleAvailable(FontStyle.Underline))
+						style = FontStyle.Underline;
+					else if(ff.IsStyleAvailable(FontStyle.Strikeout))
+						style = FontStyle.Strikeout;
+				}
+				else
+				{
+					// Prefer regular over bold
+					if(ff.IsStyleAvailable(FontStyle.Regular))
+						style = FontStyle.Regular;
+					else if(ff.IsStyleAvailable(FontStyle.Bold))
+						style = FontStyle.Bold;
+					else if(ff.IsStyleAvailable(FontStyle.Italic))
+						style = FontStyle.Italic;
+					else if(ff.IsStyleAvailable(FontStyle.Underline))
+						style = FontStyle.Underline;
+					else if(ff.IsStyleAvailable(FontStyle.Strikeout))
+						style = FontStyle.Strikeout;
+				}
+				int fontsize;
+				if(!int.TryParse(scriptfontsize.Text, out fontsize)) fontsize = 8;
+				if(ff.IsStyleAvailable(style))
+					fontpreview.Font = new Font(scriptfontname.Text, fontsize, style); //mxd
+
+				//mxd. Update preview colors
+				fontpreview.BackColor = colorscriptbackground.Color.ToColor();
+				fontpreview.ForeColor = colorplaintext.Color.ToColor();
+
+				//1
+				fontpreview.Select(0, 1);
+				fontpreview.SelectionColor = colorlinenumbers.Color.ToColor();
+
+				//2
+				fontpreview.Select(25, 1);
+				fontpreview.SelectionColor = colorlinenumbers.Color.ToColor();
+
+				//script
+				fontpreview.Select(27, 6);
+				fontpreview.SelectionColor = colorkeywords.Color.ToColor();
+
+				//0
+				fontpreview.Select(34, 1);
+				fontpreview.SelectionColor = colorliterals.Color.ToColor();
+
+				//void
+				fontpreview.Select(37, 4);
+				fontpreview.SelectionColor = colorkeywords.Color.ToColor();
+
+				//a comment
+				fontpreview.Select(45, 11);
+				fontpreview.SelectionColor = colorcomments.Color.ToColor();
+
+				//3
+				fontpreview.Select(57, 1);
+				fontpreview.SelectionColor = colorlinenumbers.Color.ToColor();
+
+				//CONSTANT_VALUE
+				fontpreview.Select(65, 14);
+				fontpreview.SelectionColor = colorconstants.Color.ToColor();
+
+				//4
+				fontpreview.Select(81, 1);
+				fontpreview.SelectionColor = colorlinenumbers.Color.ToColor();
+			}
+		}
+
+		#endregion
+		
+		#region ================== Controls Panel
+		
+		// This updates the used keys info
+		private void UpdateKeyUsedActions()
+		{
+			List<string> usedactions = new List<string>();
+			
+			// Anything selected?
+			if(listactions.SelectedItems.Count > 0)
+			{
+				// Get info
+				int thiskey = (int)listactions.SelectedItems[0].SubItems[1].Tag;
+				if(thiskey != 0)
+				{
+					// Find actions with same key
+					foreach(ListViewItem item in actionListItems)
+					{
+						// Don't count the selected action
+						if(item != listactions.SelectedItems[0])
+						{
+							Actions.Action a = General.Actions[item.Name];
+							int akey = (int)item.SubItems[1].Tag;
+
+							// Check if the key combination matches
+							if((thiskey & a.ShortcutMask) == (akey & a.ShortcutMask))
+								usedactions.Add(a.Title + "  (" + General.Actions.Categories[a.Category] + ")");
+						}
+					}
+				}
+			}
+			
+			// Update info
+			if(usedactions.Count == 0)
+			{
+				keyusedlabel.Visible = false;
+				keyusedlist.Visible = false;
+				keyusedlist.Items.Clear();
+			}
+			else
+			{
+				keyusedlist.Items.Clear();
+				foreach(string a in usedactions) keyusedlist.Items.Add(a);
+				keyusedlabel.Visible = true;
+				keyusedlist.Visible = true;
+			}
+		}
+		
+		// This fills the list of available controls for the specified action
+		private void FillControlsList(Actions.Action a)
+		{
+			actioncontrol.Items.Clear();
+			
+			// Fill combobox with special controls
+			if(a.AllowMouse)
+			{
+				actioncontrol.Items.Add(new KeyControl(Keys.LButton, "LButton"));
+				actioncontrol.Items.Add(new KeyControl(Keys.MButton, "MButton"));
+				actioncontrol.Items.Add(new KeyControl(Keys.RButton, "RButton"));
+				actioncontrol.Items.Add(new KeyControl(Keys.XButton1, "XButton1"));
+				actioncontrol.Items.Add(new KeyControl(Keys.XButton2, "XButton2"));
+			}
+			if(a.AllowScroll)
+			{
+				actioncontrol.Items.Add(new KeyControl(SpecialKeys.MScrollUp, "ScrollUp"));
+				actioncontrol.Items.Add(new KeyControl(SpecialKeys.MScrollDown, "ScrollDown"));
+			}
+
+			//mxd. Alt
+			if(a.AllowMouse && !a.DisregardAlt) 
+			{
+				actioncontrol.Items.Add(new KeyControl(Keys.LButton | Keys.Alt, "Alt+LButton"));
+				actioncontrol.Items.Add(new KeyControl(Keys.MButton | Keys.Alt, "Alt+MButton"));
+				actioncontrol.Items.Add(new KeyControl(Keys.RButton | Keys.Alt, "Alt+RButton"));
+				actioncontrol.Items.Add(new KeyControl(Keys.XButton1 | Keys.Alt, "Alt+XButton1"));
+				actioncontrol.Items.Add(new KeyControl(Keys.XButton2 | Keys.Alt, "Alt+XButton2"));
+			}
+			if(a.AllowScroll && !a.DisregardAlt) 
+			{
+				actioncontrol.Items.Add(new KeyControl((int)SpecialKeys.MScrollUp | (int)Keys.Alt, "Alt+ScrollUp"));
+				actioncontrol.Items.Add(new KeyControl((int)SpecialKeys.MScrollDown | (int)Keys.Alt, "Alt+ScrollDown"));
+			}
+
+			//Ctrl
+			if(a.AllowMouse && !a.DisregardControl) 
+			{
+				actioncontrol.Items.Add(new KeyControl(Keys.LButton | Keys.Control, "Ctrl+LButton"));
+				actioncontrol.Items.Add(new KeyControl(Keys.MButton | Keys.Control, "Ctrl+MButton"));
+				actioncontrol.Items.Add(new KeyControl(Keys.RButton | Keys.Control, "Ctrl+RButton"));
+				actioncontrol.Items.Add(new KeyControl(Keys.XButton1 | Keys.Control, "Ctrl+XButton1"));
+				actioncontrol.Items.Add(new KeyControl(Keys.XButton2 | Keys.Control, "Ctrl+XButton2"));
+			}
+
+			if(a.AllowScroll && !a.DisregardControl) 
+			{
+				actioncontrol.Items.Add(new KeyControl((int)SpecialKeys.MScrollUp | (int)Keys.Control, "Ctrl+ScrollUp"));
+				actioncontrol.Items.Add(new KeyControl((int)SpecialKeys.MScrollDown | (int)Keys.Control, "Ctrl+ScrollDown"));
+			}
+
+			//Shift
+			if(a.AllowMouse && !a.DisregardShift)
+			{
+				actioncontrol.Items.Add(new KeyControl(Keys.LButton | Keys.Shift, "Shift+LButton"));
+				actioncontrol.Items.Add(new KeyControl(Keys.MButton | Keys.Shift, "Shift+MButton"));
+				actioncontrol.Items.Add(new KeyControl(Keys.RButton | Keys.Shift, "Shift+RButton"));
+				actioncontrol.Items.Add(new KeyControl(Keys.XButton1 | Keys.Shift, "Shift+XButton1"));
+				actioncontrol.Items.Add(new KeyControl(Keys.XButton2 | Keys.Shift, "Shift+XButton2"));
+			}
+			if(a.AllowScroll && !a.DisregardShift)
+			{
+				actioncontrol.Items.Add(new KeyControl((int)SpecialKeys.MScrollUp | (int)Keys.Shift, "Shift+ScrollUp"));
+				actioncontrol.Items.Add(new KeyControl((int)SpecialKeys.MScrollDown | (int)Keys.Shift, "Shift+ScrollDown"));
+			}
+
+			//mxd. Alt-Shift
+			if(a.AllowMouse && !a.DisregardShift && !a.DisregardAlt) 
+			{
+				actioncontrol.Items.Add(new KeyControl(Keys.LButton | Keys.Shift | Keys.Alt, "Alt+Shift+LButton"));
+				actioncontrol.Items.Add(new KeyControl(Keys.MButton | Keys.Shift | Keys.Alt, "Alt+Shift+MButton"));
+				actioncontrol.Items.Add(new KeyControl(Keys.RButton | Keys.Shift | Keys.Alt, "Alt+Shift+RButton"));
+				actioncontrol.Items.Add(new KeyControl(Keys.XButton1 | Keys.Shift | Keys.Alt, "Alt+Shift+XButton1"));
+				actioncontrol.Items.Add(new KeyControl(Keys.XButton2 | Keys.Shift | Keys.Alt, "Alt+Shift+XButton2"));
+			}
+			if(a.AllowScroll && !a.DisregardShift && !a.DisregardAlt) 
+			{
+				actioncontrol.Items.Add(new KeyControl((int)SpecialKeys.MScrollUp | (int)Keys.Shift | (int)Keys.Alt, "Alt+Shift+ScrollUp"));
+				actioncontrol.Items.Add(new KeyControl((int)SpecialKeys.MScrollDown | (int)Keys.Shift | (int)Keys.Alt, "Alt+Shift+ScrollDown"));
+			}
+
+			//mxd. Ctrl-Alt
+			if(a.AllowMouse && !a.DisregardAlt && !a.DisregardControl) 
+			{
+				actioncontrol.Items.Add(new KeyControl(Keys.LButton | Keys.Alt | Keys.Control, "Ctrl+Alt+LButton"));
+				actioncontrol.Items.Add(new KeyControl(Keys.MButton | Keys.Alt | Keys.Control, "Ctrl+Alt+MButton"));
+				actioncontrol.Items.Add(new KeyControl(Keys.RButton | Keys.Alt | Keys.Control, "Ctrl+Alt+RButton"));
+				actioncontrol.Items.Add(new KeyControl(Keys.XButton1 | Keys.Alt | Keys.Control, "Ctrl+Alt+XButton1"));
+				actioncontrol.Items.Add(new KeyControl(Keys.XButton2 | Keys.Alt | Keys.Control, "Ctrl+Alt+XButton2"));
+			}
+			if(a.AllowScroll && !a.DisregardAlt && !a.DisregardControl) 
+			{
+				actioncontrol.Items.Add(new KeyControl((int)SpecialKeys.MScrollUp | (int)Keys.Control | (int)Keys.Alt, "Ctrl+Alt+ScrollUp"));
+				actioncontrol.Items.Add(new KeyControl((int)SpecialKeys.MScrollDown | (int)Keys.Control | (int)Keys.Alt, "Ctrl+Alt+ScrollDown"));
+			}
+			
+			//Ctrl-Shift
+			if(a.AllowMouse && !a.DisregardShift && !a.DisregardControl)
+			{
+				actioncontrol.Items.Add(new KeyControl(Keys.LButton | Keys.Shift | Keys.Control, "Ctrl+Shift+LButton"));
+				actioncontrol.Items.Add(new KeyControl(Keys.MButton | Keys.Shift | Keys.Control, "Ctrl+Shift+MButton"));
+				actioncontrol.Items.Add(new KeyControl(Keys.RButton | Keys.Shift | Keys.Control, "Ctrl+Shift+RButton"));
+				actioncontrol.Items.Add(new KeyControl(Keys.XButton1 | Keys.Shift | Keys.Control, "Ctrl+Shift+XButton1"));
+				actioncontrol.Items.Add(new KeyControl(Keys.XButton2 | Keys.Shift | Keys.Control, "Ctrl+Shift+XButton2"));
+			}
+			if(a.AllowScroll && !a.DisregardShift && !a.DisregardControl)
+			{
+				actioncontrol.Items.Add(new KeyControl((int)SpecialKeys.MScrollUp | (int)Keys.Shift | (int)Keys.Control, "Ctrl+Shift+ScrollUp"));
+				actioncontrol.Items.Add(new KeyControl((int)SpecialKeys.MScrollDown | (int)Keys.Shift | (int)Keys.Control, "Ctrl+Shift+ScrollDown"));
+			}
+
+			//mxd. Ctrl-Alt-Shift
+			if(a.AllowMouse && !a.DisregardShift && !a.DisregardControl && !a.DisregardAlt) 
+			{
+				actioncontrol.Items.Add(new KeyControl(Keys.LButton | Keys.Shift | Keys.Control | Keys.Alt, "Ctrl+Alt+Shift+LButton"));
+				actioncontrol.Items.Add(new KeyControl(Keys.MButton | Keys.Shift | Keys.Control | Keys.Alt, "Ctrl+Alt+Shift+MButton"));
+				actioncontrol.Items.Add(new KeyControl(Keys.RButton | Keys.Shift | Keys.Control | Keys.Alt, "Ctrl+Alt+Shift+RButton"));
+				actioncontrol.Items.Add(new KeyControl(Keys.XButton1 | Keys.Shift | Keys.Control | Keys.Alt, "Ctrl+Alt+Shift+XButton1"));
+				actioncontrol.Items.Add(new KeyControl(Keys.XButton2 | Keys.Shift | Keys.Control | Keys.Alt, "Ctrl+Alt+Shift+XButton2"));
+			}
+			if(a.AllowScroll && !a.DisregardShift && !a.DisregardControl && !a.DisregardAlt) 
+			{
+				actioncontrol.Items.Add(new KeyControl((int)SpecialKeys.MScrollUp | (int)Keys.Shift | (int)Keys.Control | (int)Keys.Alt, "Ctrl+Alt+Shift+ScrollUp"));
+				actioncontrol.Items.Add(new KeyControl((int)SpecialKeys.MScrollDown | (int)Keys.Shift | (int)Keys.Control | (int)Keys.Alt, "Ctrl+Alt+Shift+ScrollDown"));
+			}
+		}
+		
+		// Item selected
+		private void listactions_ItemSelectionChanged(object sender, ListViewItemSelectionChangedEventArgs e)
+		{
+			string disregardkeys = "";
+
+			// Anything selected?
+			if(listactions.SelectedItems.Count > 0)
+			{
+				// Begin updating
+				allowapplycontrol = false;
+
+				// Get the selected action
+				Action action = General.Actions[listactions.SelectedItems[0].Name];
+				int key = (int)listactions.SelectedItems[0].SubItems[1].Tag;
+				disregardshift = action.DisregardShift;
+				disregardcontrol = action.DisregardControl;
+				
+				// Enable panel
+				actioncontrolpanel.Enabled = true;
+				actiontitle.Text = action.Title;
+				actiondescription.Text = action.Description;
+				actioncontrol.SelectedIndex = -1;
+				actionkey.Text = "";
+				
+				if(disregardshift && disregardcontrol)
+					disregardkeys = "Shift and Control";
+				else if(disregardshift)
+					disregardkeys = "Shift";
+				else if(disregardcontrol)
+					disregardkeys = "Control";
+
+				disregardshiftlabel.Text = disregardshiftlabel.Tag.ToString().Replace("%s", disregardkeys);
+				disregardshiftlabel.Visible = disregardshift | disregardcontrol;
+				
+				// Fill special controls list
+				FillControlsList(action);
+				
+				// See if the key is in the combobox
+				for(int i = 0; i < actioncontrol.Items.Count; i++)
+				{
+					// Select it when the key is found here
+					KeyControl keycontrol = (KeyControl)actioncontrol.Items[i];
+					if(keycontrol.key == key) actioncontrol.SelectedIndex = i;
+				}
+
+				// Otherwise display the key in the textbox
+				if(actioncontrol.SelectedIndex == -1)
+					actionkey.Text = Action.GetShortcutKeyDesc(key);
+				
+				// Show actions with same key
+				UpdateKeyUsedActions();
+				
+				// Focus to the input box
+				actionkey.Focus();
+
+				// Done
+				allowapplycontrol = true;
+			}
+		}
+
+		// Key released
+		private void listactions_KeyUp(object sender, KeyEventArgs e)
+		{
+			// Nothing selected?
+			if(listactions.SelectedItems.Count == 0)
+			{
+				// Disable panel
+				actioncontrolpanel.Enabled = false;
+				actiontitle.Text = "(select an action from the list)";
+				actiondescription.Text = "";
+				actionkey.Text = "";
+				actioncontrol.SelectedIndex = -1;
+				disregardshiftlabel.Visible = false;
+			}
+			
+			// Show actions with same key
+			UpdateKeyUsedActions();
+		}
+
+		// Mouse released
+		private void listactions_MouseUp(object sender, MouseEventArgs e)
+		{
+			listactions_KeyUp(sender, new KeyEventArgs(Keys.None));
+
+			// Focus to the input box
+			actionkey.Focus();
+		}
+
+		// Key combination pressed
+		private void actionkey_KeyDown(object sender, KeyEventArgs e)
+		{
+			int key = (int)e.KeyData;
+			e.SuppressKeyPress = true;
+
+			// Leave when not allowed to update
+			if(!allowapplycontrol) return;
+
+			// Anything selected?
+			if(listactions.SelectedItems.Count > 0)
+			{
+				// Begin updating
+				allowapplycontrol = false;
+				
+				// Remove modifier keys from the key if needed
+				if(disregardshift) key &= ~(int)Keys.Shift;
+				if(disregardcontrol) key &= ~(int)Keys.Control;
+				
+				// Deselect anything from the combobox
+				actioncontrol.SelectedIndex = -1;
+				
+				// Apply the key combination
+				listactions.SelectedItems[0].SubItems[1].Text = Actions.Action.GetShortcutKeyDesc(key);
+				listactions.SelectedItems[0].SubItems[1].Tag = key;
+				actionkey.Text = Actions.Action.GetShortcutKeyDesc(key);
+				
+				// Show actions with same key
+				UpdateKeyUsedActions();
+				
+				// Done
+				allowapplycontrol = true;
+			}
+		}
+
+		// Special key selected
+		private void actioncontrol_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			// Leave when not allowed to update
+			if(!allowapplycontrol) return;
+
+			// Anything selected?
+			if((actioncontrol.SelectedIndex > -1) && (listactions.SelectedItems.Count > 0))
+			{
+				// Begin updating
+				allowapplycontrol = false;
+
+				// Remove text from textbox
+				actionkey.Text = "";
+
+				// Get the key control
+				KeyControl key = (KeyControl)actioncontrol.SelectedItem;
+
+				// Apply the key combination
+				listactions.SelectedItems[0].SubItems[1].Text = Actions.Action.GetShortcutKeyDesc(key.key);
+				listactions.SelectedItems[0].SubItems[1].Tag = key.key;
+				
+				// Show actions with same key
+				UpdateKeyUsedActions();
+				
+				// Focus to the input box
+				actionkey.Focus();
+
+				// Done
+				allowapplycontrol = true;
+			}
+		}
+
+		// Clear clicked
+		private void actioncontrolclear_Click(object sender, EventArgs e)
+		{
+			// Begin updating
+			allowapplycontrol = false;
+
+			// Clear textbox and combobox
+			actionkey.Text = "";
+			actioncontrol.SelectedIndex = -1;
+
+			// Apply the key combination
+			listactions.SelectedItems[0].SubItems[1].Text = "";
+			listactions.SelectedItems[0].SubItems[1].Tag = 0;
+			
+			// Show actions with same key
+			UpdateKeyUsedActions();
+			
+			// Focus to the input box
+			actionkey.Focus();
+
+			// Done
+			allowapplycontrol = true;
+		}
+
+		//mxd
+		private void bClearActionFilter_Click(object sender, EventArgs e) 
+		{
+			tbFilterActions.Clear();
+		}
+
+		//mxd
+		private void tbFilterActions_TextChanged(object sender, EventArgs e) 
+		{
+			listactions.BeginUpdate();
+			
+			//restore everything
+			if(string.IsNullOrEmpty(tbFilterActions.Text)) 
+			{
+				//restore items
+				listactions.Items.Clear();
+				listactions.Items.AddRange(actionListItems.ToArray());
+
+				//restore groups
+				for(int i = 0; i < actionListItems.Count; i++) 
+				{
+					if(actionListItemsGroupIndices[i] != -1)
+						actionListItems[i].Group = listactions.Groups[actionListItemsGroupIndices[i]];
+				}
+			} 
+			else //apply filtering
+			{ 
+				string match = tbFilterActions.Text.ToUpperInvariant();
+				for(int i = 0; i < actionListItems.Count; i++) 
+				{
+					if(actionListItems[i].Text.ToUpperInvariant().Contains(match)) 
+					{
+						//ensure visible
+						if(!listactions.Items.Contains(actionListItems[i])) 
+						{
+							listactions.Items.Add(actionListItems[i]);
+
+							//restore group
+							if(actionListItemsGroupIndices[i] != -1)
+								actionListItems[i].Group = listactions.Groups[actionListItemsGroupIndices[i]];
+						}
+					} 
+					else if(listactions.Items.Contains(actionListItems[i])) 
+					{
+						//ensure invisible
+						listactions.Items.Remove(actionListItems[i]);
+					}
+				}
+			}
+
+			listactions.Sort();
+			listactions.EndUpdate();
+		}
+
+		#endregion
+
+		#region ================== Colors Panel
+
+		private void imagebrightness_ValueChanged(object sender, EventArgs e)
+		{
+			imagebrightnesslabel.Text = "+ " + imagebrightness.Value + " y";
+		}
+
+		private void doublesidedalpha_ValueChanged(object sender, EventArgs e)
+		{
+			int percent = doublesidedalpha.Value * 10;
+			doublesidedalphalabel.Text = percent + "%";
+		}
+
+		//mxd
+		private void tbDynLightCount_ValueChanged(object sender, EventArgs e) 
+		{
+			labelDynLightCount.Text = tbDynLightCount.Value.ToString();
+		}
+
+		//mxd
+		private void tbDynLightSize_ValueChanged(object sender, EventArgs e) 
+		{
+			labelDynLightSize.Text = ((float)tbDynLightSize.Value / 10).ToString();
+		}
+
+		//mxd
+		private void tbDynLightIntensity_ValueChanged(object sender, EventArgs e) 
+		{
+			labelDynLightIntensity.Text = ((float)tbDynLightIntensity.Value / 10).ToString();
+		}
+
+		//mxd
+		private void scriptfontbold_CheckedChanged(object sender, EventArgs e) 
+		{
+			UpdateScriptFontPreview();
+		}
+
+		//mxd
+		private void scriptfontsize_SelectedIndexChanged(object sender, EventArgs e) 
+		{
+			UpdateScriptFontPreview();
+		}
+
+		//mxd
+		private void scriptfontname_SelectedIndexChanged(object sender, EventArgs e) 
+		{
+			UpdateScriptFontPreview();
+		}
+
+		//mxd
+		private void scriptcolor_ColorChanged(object sender, EventArgs e) 
+		{
+			UpdateScriptFontPreview();
+		}
+
+		#endregion
+
+		#region ================== Screenshots Stuff (mxd)
+
+		private void resetscreenshotsdir_Click(object sender, EventArgs e) 
+		{
+			screenshotsfolderpath.Text = General.DefaultScreenshotsPath;
+			browseScreenshotsFolderDialog.SelectedPath = General.DefaultScreenshotsPath;
+		}
+
+		private void browsescreenshotsdir_Click(object sender, EventArgs e) 
+		{
+			if(browseScreenshotsFolderDialog.ShowDialog(General.MainWindow) == DialogResult.OK) 
+				screenshotsfolderpath.Text = browseScreenshotsFolderDialog.SelectedPath;
+		}
+
+		#endregion
+
+		// Help
+		private void PreferencesForm_HelpRequested(object sender, HelpEventArgs hlpevent)
+		{
+			if(!actionkey.Focused)
+			{
+				General.ShowHelp("w_preferences.html");
+				hlpevent.Handled = true;
+			}
+		}
+		
+		/*
+		// This writes all action help files using a template and some basic info from the actions.
+		// Also writes actioncontents.txt with all files to be inserted into Contents.hhc.
+		// Only used during development. Actual button to call this has been removed.
+		private void gobutton_Click(object sender, EventArgs e)
+		{
+			string template = File.ReadAllText(Path.Combine(General.AppPath, "..\\Help\\a_template.html"));
+			StringBuilder contents = new StringBuilder("\t<UL>\r\n");
+			string filename;
+			
+			// Go for all actions
+			Action[] actions = General.Actions.GetAllActions();
+			foreach(Action a in actions)
+			{
+				StringBuilder actionhtml = new StringBuilder(template);
+				actionhtml.Replace("ACTIONTITLE", a.Title);
+				actionhtml.Replace("ACTIONDESCRIPTION", a.Description);
+				actionhtml.Replace("ACTIONCATEGORY", General.Actions.Categories[a.Category]);
+				filename = Path.Combine(General.AppPath, "..\\Help\\a_" + a.Name + ".html");
+				File.WriteAllText(filename, actionhtml.ToString());
+				
+				contents.Append("\t\t<LI> <OBJECT type=\"text/sitemap\">\r\n");
+				contents.Append("\t\t\t<param name=\"Name\" value=\"" + a.Title + "\">\r\n");
+				contents.Append("\t\t\t<param name=\"Local\" value=\"a_" + a.Name + ".html\">\r\n");
+				contents.Append("\t\t\t</OBJECT>\r\n");
+			}
+			
+			contents.Append("\t</UL>\r\n");
+			filename = Path.Combine(General.AppPath, "..\\Help\\actioncontents.txt");
+			File.WriteAllText(filename, contents.ToString());
+		}
+		*/
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/PreferencesForm.resx b/Source/Core/Windows/PreferencesForm.resx
new file mode 100644
index 0000000..117f9d0
--- /dev/null
+++ b/Source/Core/Windows/PreferencesForm.resx
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="label7.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label6.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label5.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="groupBox1.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="label1.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label18.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label20.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label21.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <data name="snippetsallmanstyle.ToolTip" xml:space="preserve">
+    <value>When enabled, the opening brace 
+will be placed on a new line.
+
+Technical side: when enabled, $LB
+markers in snippets will be replaced 
+with newline characters, otherwise 
+they will be replaced with spaces
+</value>
+  </data>
+  <metadata name="browseScreenshotsFolderDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>114, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Windows/ResourceOptionsForm.Designer.cs b/Source/Core/Windows/ResourceOptionsForm.Designer.cs
new file mode 100644
index 0000000..6402121
--- /dev/null
+++ b/Source/Core/Windows/ResourceOptionsForm.Designer.cs
@@ -0,0 +1,386 @@
+namespace CodeImp.DoomBuilder.Windows
+{
+	partial class ResourceOptionsForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			System.Windows.Forms.Label label1;
+			System.Windows.Forms.Label label2;
+			System.Windows.Forms.Label label3;
+			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ResourceOptionsForm));
+			this.tabs = new System.Windows.Forms.TabControl();
+			this.wadfiletab = new System.Windows.Forms.TabPage();
+			this.label6 = new System.Windows.Forms.Label();
+			this.strictpatches = new System.Windows.Forms.CheckBox();
+			this.browsewad = new System.Windows.Forms.Button();
+			this.wadlocation = new System.Windows.Forms.TextBox();
+			this.directorytab = new System.Windows.Forms.TabPage();
+			this.directorylink = new System.Windows.Forms.LinkLabel();
+			this.dir_flats = new System.Windows.Forms.CheckBox();
+			this.dir_textures = new System.Windows.Forms.CheckBox();
+			this.browsedir = new System.Windows.Forms.Button();
+			this.dirlocation = new System.Windows.Forms.TextBox();
+			this.pk3filetab = new System.Windows.Forms.TabPage();
+			this.pk3link = new System.Windows.Forms.LinkLabel();
+			this.browsepk3 = new System.Windows.Forms.Button();
+			this.pk3location = new System.Windows.Forms.TextBox();
+			this.cancel = new System.Windows.Forms.Button();
+			this.apply = new System.Windows.Forms.Button();
+			this.wadfiledialog = new System.Windows.Forms.OpenFileDialog();
+			this.dirdialog = new System.Windows.Forms.FolderBrowserDialog();
+			this.pk3filedialog = new System.Windows.Forms.OpenFileDialog();
+			this.notfortesting = new System.Windows.Forms.CheckBox();
+			label1 = new System.Windows.Forms.Label();
+			label2 = new System.Windows.Forms.Label();
+			label3 = new System.Windows.Forms.Label();
+			this.tabs.SuspendLayout();
+			this.wadfiletab.SuspendLayout();
+			this.directorytab.SuspendLayout();
+			this.pk3filetab.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// label1
+			// 
+			label1.AutoSize = true;
+			label1.Location = new System.Drawing.Point(15, 20);
+			label1.Name = "label1";
+			label1.Size = new System.Drawing.Size(104, 13);
+			label1.TabIndex = 0;
+			label1.Text = "WAD File Resource:";
+			// 
+			// label2
+			// 
+			label2.AutoSize = true;
+			label2.Location = new System.Drawing.Point(15, 20);
+			label2.Name = "label2";
+			label2.Size = new System.Drawing.Size(101, 13);
+			label2.TabIndex = 3;
+			label2.Text = "Directory Resource:";
+			// 
+			// label3
+			// 
+			label3.AutoSize = true;
+			label3.Location = new System.Drawing.Point(15, 20);
+			label3.Name = "label3";
+			label3.Size = new System.Drawing.Size(133, 13);
+			label3.TabIndex = 3;
+			label3.Text = "PK3 or PK7 File Resource:";
+			// 
+			// tabs
+			// 
+			this.tabs.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.tabs.Controls.Add(this.wadfiletab);
+			this.tabs.Controls.Add(this.directorytab);
+			this.tabs.Controls.Add(this.pk3filetab);
+			this.tabs.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.tabs.Location = new System.Drawing.Point(9, 11);
+			this.tabs.Name = "tabs";
+			this.tabs.Padding = new System.Drawing.Point(16, 3);
+			this.tabs.SelectedIndex = 0;
+			this.tabs.Size = new System.Drawing.Size(369, 211);
+			this.tabs.TabIndex = 0;
+			// 
+			// wadfiletab
+			// 
+			this.wadfiletab.Controls.Add(this.label6);
+			this.wadfiletab.Controls.Add(this.strictpatches);
+			this.wadfiletab.Controls.Add(this.browsewad);
+			this.wadfiletab.Controls.Add(this.wadlocation);
+			this.wadfiletab.Controls.Add(label1);
+			this.wadfiletab.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.wadfiletab.Location = new System.Drawing.Point(4, 23);
+			this.wadfiletab.Name = "wadfiletab";
+			this.wadfiletab.Padding = new System.Windows.Forms.Padding(3);
+			this.wadfiletab.Size = new System.Drawing.Size(361, 184);
+			this.wadfiletab.TabIndex = 0;
+			this.wadfiletab.Text = "From WAD File";
+			this.wadfiletab.UseVisualStyleBackColor = true;
+			// 
+			// label6
+			// 
+			this.label6.Location = new System.Drawing.Point(14, 102);
+			this.label6.Name = "label6";
+			this.label6.Size = new System.Drawing.Size(329, 58);
+			this.label6.TabIndex = 8;
+			this.label6.Text = resources.GetString("label6.Text");
+			// 
+			// strictpatches
+			// 
+			this.strictpatches.AutoSize = true;
+			this.strictpatches.Location = new System.Drawing.Point(17, 72);
+			this.strictpatches.Name = "strictpatches";
+			this.strictpatches.Size = new System.Drawing.Size(299, 17);
+			this.strictpatches.TabIndex = 2;
+			this.strictpatches.Text = "Strictly load patches between P_START and P_END only";
+			this.strictpatches.UseVisualStyleBackColor = true;
+			// 
+			// browsewad
+			// 
+			this.browsewad.Image = global::CodeImp.DoomBuilder.Properties.Resources.Folder;
+			this.browsewad.Location = new System.Drawing.Point(315, 35);
+			this.browsewad.Name = "browsewad";
+			this.browsewad.Padding = new System.Windows.Forms.Padding(0, 0, 1, 3);
+			this.browsewad.Size = new System.Drawing.Size(28, 24);
+			this.browsewad.TabIndex = 1;
+			this.browsewad.Text = " ";
+			this.browsewad.UseVisualStyleBackColor = true;
+			this.browsewad.Click += new System.EventHandler(this.browsewad_Click);
+			// 
+			// wadlocation
+			// 
+			this.wadlocation.Location = new System.Drawing.Point(17, 37);
+			this.wadlocation.Name = "wadlocation";
+			this.wadlocation.ReadOnly = true;
+			this.wadlocation.Size = new System.Drawing.Size(292, 20);
+			this.wadlocation.TabIndex = 0;
+			// 
+			// directorytab
+			// 
+			this.directorytab.Controls.Add(this.directorylink);
+			this.directorytab.Controls.Add(this.dir_flats);
+			this.directorytab.Controls.Add(this.dir_textures);
+			this.directorytab.Controls.Add(this.browsedir);
+			this.directorytab.Controls.Add(this.dirlocation);
+			this.directorytab.Controls.Add(label2);
+			this.directorytab.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.directorytab.Location = new System.Drawing.Point(4, 23);
+			this.directorytab.Name = "directorytab";
+			this.directorytab.Padding = new System.Windows.Forms.Padding(3);
+			this.directorytab.Size = new System.Drawing.Size(361, 184);
+			this.directorytab.TabIndex = 1;
+			this.directorytab.Text = "From Directory";
+			this.directorytab.UseVisualStyleBackColor = true;
+			// 
+			// directorylink
+			// 
+			this.directorylink.LinkArea = new System.Windows.Forms.LinkArea(26, 29);
+			this.directorylink.LinkColor = System.Drawing.SystemColors.HotTrack;
+			this.directorylink.Location = new System.Drawing.Point(14, 127);
+			this.directorylink.Name = "directorylink";
+			this.directorylink.Size = new System.Drawing.Size(329, 54);
+			this.directorylink.TabIndex = 9;
+			this.directorylink.TabStop = true;
+			this.directorylink.Text = "The directory may use the ZDoom PK3 directory structure, or you can choose to use" +
+				" the options above to load texture or flat images from the directory root.";
+			this.directorylink.UseCompatibleTextRendering = true;
+			this.directorylink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.link_Click);
+			// 
+			// dir_flats
+			// 
+			this.dir_flats.AutoSize = true;
+			this.dir_flats.Location = new System.Drawing.Point(17, 98);
+			this.dir_flats.Name = "dir_flats";
+			this.dir_flats.Size = new System.Drawing.Size(197, 17);
+			this.dir_flats.TabIndex = 3;
+			this.dir_flats.Text = "Load images in directory root as flats";
+			this.dir_flats.UseVisualStyleBackColor = true;
+			// 
+			// dir_textures
+			// 
+			this.dir_textures.AutoSize = true;
+			this.dir_textures.Location = new System.Drawing.Point(17, 72);
+			this.dir_textures.Name = "dir_textures";
+			this.dir_textures.Size = new System.Drawing.Size(215, 17);
+			this.dir_textures.TabIndex = 2;
+			this.dir_textures.Text = "Load images in directory root as textures";
+			this.dir_textures.UseVisualStyleBackColor = true;
+			// 
+			// browsedir
+			// 
+			this.browsedir.Image = global::CodeImp.DoomBuilder.Properties.Resources.Folder;
+			this.browsedir.Location = new System.Drawing.Point(315, 35);
+			this.browsedir.Name = "browsedir";
+			this.browsedir.Padding = new System.Windows.Forms.Padding(0, 0, 1, 3);
+			this.browsedir.Size = new System.Drawing.Size(28, 24);
+			this.browsedir.TabIndex = 1;
+			this.browsedir.UseVisualStyleBackColor = true;
+			this.browsedir.Click += new System.EventHandler(this.browsedir_Click);
+			// 
+			// dirlocation
+			// 
+			this.dirlocation.BackColor = System.Drawing.SystemColors.Control;
+			this.dirlocation.Location = new System.Drawing.Point(17, 37);
+			this.dirlocation.Name = "dirlocation";
+			this.dirlocation.ReadOnly = true;
+			this.dirlocation.Size = new System.Drawing.Size(292, 20);
+			this.dirlocation.TabIndex = 0;
+			// 
+			// pk3filetab
+			// 
+			this.pk3filetab.Controls.Add(this.pk3link);
+			this.pk3filetab.Controls.Add(this.browsepk3);
+			this.pk3filetab.Controls.Add(this.pk3location);
+			this.pk3filetab.Controls.Add(label3);
+			this.pk3filetab.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.pk3filetab.Location = new System.Drawing.Point(4, 23);
+			this.pk3filetab.Name = "pk3filetab";
+			this.pk3filetab.Size = new System.Drawing.Size(361, 184);
+			this.pk3filetab.TabIndex = 2;
+			this.pk3filetab.Text = "From PK3/PK7";
+			this.pk3filetab.UseVisualStyleBackColor = true;
+			// 
+			// pk3link
+			// 
+			this.pk3link.LinkArea = new System.Windows.Forms.LinkArea(40, 33);
+			this.pk3link.LinkColor = System.Drawing.SystemColors.HotTrack;
+			this.pk3link.Location = new System.Drawing.Point(15, 72);
+			this.pk3link.Name = "pk3link";
+			this.pk3link.Size = new System.Drawing.Size(328, 47);
+			this.pk3link.TabIndex = 7;
+			this.pk3link.TabStop = true;
+			this.pk3link.Text = "The archive file is expected to use the ZDoom archive directory structure.";
+			this.pk3link.UseCompatibleTextRendering = true;
+			this.pk3link.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.link_Click);
+			// 
+			// browsepk3
+			// 
+			this.browsepk3.Image = global::CodeImp.DoomBuilder.Properties.Resources.Folder;
+			this.browsepk3.Location = new System.Drawing.Point(315, 35);
+			this.browsepk3.Name = "browsepk3";
+			this.browsepk3.Padding = new System.Windows.Forms.Padding(0, 0, 1, 3);
+			this.browsepk3.Size = new System.Drawing.Size(28, 24);
+			this.browsepk3.TabIndex = 1;
+			this.browsepk3.UseVisualStyleBackColor = true;
+			this.browsepk3.Click += new System.EventHandler(this.browsepk3_Click);
+			// 
+			// pk3location
+			// 
+			this.pk3location.Location = new System.Drawing.Point(17, 37);
+			this.pk3location.Name = "pk3location";
+			this.pk3location.ReadOnly = true;
+			this.pk3location.Size = new System.Drawing.Size(292, 20);
+			this.pk3location.TabIndex = 0;
+			// 
+			// cancel
+			// 
+			this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.cancel.Location = new System.Drawing.Point(262, 260);
+			this.cancel.Name = "cancel";
+			this.cancel.Size = new System.Drawing.Size(112, 25);
+			this.cancel.TabIndex = 2;
+			this.cancel.Text = "Cancel";
+			this.cancel.UseVisualStyleBackColor = true;
+			this.cancel.Click += new System.EventHandler(this.cancel_Click);
+			// 
+			// apply
+			// 
+			this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.apply.Location = new System.Drawing.Point(144, 260);
+			this.apply.Name = "apply";
+			this.apply.Size = new System.Drawing.Size(112, 25);
+			this.apply.TabIndex = 1;
+			this.apply.Text = "OK";
+			this.apply.UseVisualStyleBackColor = true;
+			this.apply.Click += new System.EventHandler(this.apply_Click);
+			// 
+			// wadfiledialog
+			// 
+			this.wadfiledialog.Filter = "Doom WAD Files (*.wad)|*.wad";
+			this.wadfiledialog.Title = "Browse WAD File";
+			// 
+			// dirdialog
+			// 
+			this.dirdialog.Description = "Please select a directory from which to load images when editing your map...";
+			// 
+			// pk3filedialog
+			// 
+			this.pk3filedialog.Filter = "Doom PK3/PK7 Files (*.pk3;*.pk7)|*.pk3;*.pk7";
+			this.pk3filedialog.Title = "Browse PK3 or PK7 File";
+			// 
+			// notfortesting
+			// 
+			this.notfortesting.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.notfortesting.AutoSize = true;
+			this.notfortesting.Location = new System.Drawing.Point(12, 232);
+			this.notfortesting.Name = "notfortesting";
+			this.notfortesting.Size = new System.Drawing.Size(239, 17);
+			this.notfortesting.TabIndex = 3;
+			this.notfortesting.Text = "Exclude this resource from testing parameters";
+			this.notfortesting.UseVisualStyleBackColor = true;
+			// 
+			// ResourceOptionsForm
+			// 
+			this.AcceptButton = this.apply;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.CancelButton = this.cancel;
+			this.ClientSize = new System.Drawing.Size(386, 293);
+			this.Controls.Add(this.notfortesting);
+			this.Controls.Add(this.cancel);
+			this.Controls.Add(this.apply);
+			this.Controls.Add(this.tabs);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "ResourceOptionsForm";
+			this.Opacity = 1;
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Resource Options";
+			this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.ResourceOptionsForm_HelpRequested);
+			this.tabs.ResumeLayout(false);
+			this.wadfiletab.ResumeLayout(false);
+			this.wadfiletab.PerformLayout();
+			this.directorytab.ResumeLayout(false);
+			this.directorytab.PerformLayout();
+			this.pk3filetab.ResumeLayout(false);
+			this.pk3filetab.PerformLayout();
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.TabControl tabs;
+		private System.Windows.Forms.TabPage wadfiletab;
+		private System.Windows.Forms.TabPage directorytab;
+		private System.Windows.Forms.Button cancel;
+		private System.Windows.Forms.Button apply;
+		private System.Windows.Forms.TextBox wadlocation;
+		private System.Windows.Forms.Button browsewad;
+		private System.Windows.Forms.Button browsedir;
+		private System.Windows.Forms.TextBox dirlocation;
+		private System.Windows.Forms.CheckBox dir_flats;
+		private System.Windows.Forms.CheckBox dir_textures;
+		private System.Windows.Forms.OpenFileDialog wadfiledialog;
+		private System.Windows.Forms.FolderBrowserDialog dirdialog;
+		private System.Windows.Forms.TabPage pk3filetab;
+		private System.Windows.Forms.Button browsepk3;
+		private System.Windows.Forms.TextBox pk3location;
+		private System.Windows.Forms.OpenFileDialog pk3filedialog;
+		private System.Windows.Forms.LinkLabel pk3link;
+		private System.Windows.Forms.LinkLabel directorylink;
+		private System.Windows.Forms.CheckBox strictpatches;
+		private System.Windows.Forms.Label label6;
+		private System.Windows.Forms.CheckBox notfortesting;
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/ResourceOptionsForm.cs b/Source/Core/Windows/ResourceOptionsForm.cs
new file mode 100644
index 0000000..20f579e
--- /dev/null
+++ b/Source/Core/Windows/ResourceOptionsForm.cs
@@ -0,0 +1,219 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Windows.Forms;
+using System.IO;
+using CodeImp.DoomBuilder.Data;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Windows
+{
+	internal partial class ResourceOptionsForm : DelayedForm
+	{
+		// Variables
+		private DataLocation res;
+		
+		// Properties
+		public DataLocation ResourceLocation { get { return res; } }
+		
+		// Constructor
+		public ResourceOptionsForm(DataLocation settings, string caption, string startPath) //mxd. added startPath
+		{
+			// Initialize
+			InitializeComponent();
+
+			// Set caption
+			this.Text = caption;
+			
+			// Apply settings from ResourceLocation
+			this.res = settings;
+			switch(res.type)
+			{
+				// Setup for WAD File
+				case DataLocation.RESOURCE_WAD:
+					wadlocation.Text = res.location;
+					strictpatches.Checked = res.option1;
+					break;
+
+				// Setup for Directory
+				case DataLocation.RESOURCE_DIRECTORY:
+					dirlocation.Text = res.location;
+					dir_textures.Checked = res.option1;
+					dir_flats.Checked = res.option2;
+					break;
+					
+				// Setup for PK3 File
+				case DataLocation.RESOURCE_PK3:
+					pk3location.Text = res.location;
+					break;
+			}
+			
+			// Select appropriate tab
+			tabs.SelectedIndex = res.type;
+			
+			// Checkbox
+			notfortesting.Checked = res.notfortesting;
+
+			//mxd
+			if(!string.IsNullOrEmpty(startPath)) 
+			{
+				string startDir = Path.GetDirectoryName(startPath);
+				if(Directory.Exists(startDir)) dirdialog.SelectedPath = startDir;
+			}
+		}
+		
+		// OK clicked
+		private void apply_Click(object sender, EventArgs e)
+		{
+			// Apply settings to ResourceLocation
+			switch(tabs.SelectedIndex)
+			{
+				// Setup WAD File
+				case DataLocation.RESOURCE_WAD:
+
+					// Check if file is specified
+					if((wadlocation.Text.Length == 0) ||
+					   (!File.Exists(wadlocation.Text)))
+					{
+						// No valid wad file specified
+						MessageBox.Show(this, "Please select a valid WAD File resource.", Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+					}
+					else
+					{
+						// Apply settings
+						res.type = DataLocation.RESOURCE_WAD;
+						res.location = wadlocation.Text;
+						res.option1 = strictpatches.Checked;
+						res.option2 = false;
+						res.notfortesting = notfortesting.Checked;
+
+						// Done
+						this.DialogResult = DialogResult.OK;
+						this.Close();
+					}
+					break;
+
+				// Setup Directory
+				case DataLocation.RESOURCE_DIRECTORY:
+
+					// Check if directory is specified
+					if((dirlocation.Text.Length == 0) ||
+					   (!Directory.Exists(dirlocation.Text)))
+					{
+						// No valid directory specified
+						MessageBox.Show(this, "Please select a valid directory resource.", Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+					}
+					else
+					{
+						// Apply settings
+						res.type = DataLocation.RESOURCE_DIRECTORY;
+						res.location = dirlocation.Text;
+						res.option1 = dir_textures.Checked;
+						res.option2 = dir_flats.Checked;
+						res.notfortesting = notfortesting.Checked;
+
+						// Done
+						this.DialogResult = DialogResult.OK;
+						this.Close();
+					}
+					break;
+					
+				// Setup PK3 File
+				case DataLocation.RESOURCE_PK3:
+
+					// Check if file is specified
+					if((pk3location.Text.Length == 0) ||
+					   (!File.Exists(pk3location.Text)))
+					{
+						// No valid pk3 file specified
+						MessageBox.Show(this, "Please select a valid PK3 or PK7 File resource.", Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+					}
+					else
+					{
+						// Apply settings
+						res.type = DataLocation.RESOURCE_PK3;
+						res.location = pk3location.Text;
+						res.option1 = false;
+						res.option2 = false;
+						res.notfortesting = notfortesting.Checked;
+
+						// Done
+						this.DialogResult = DialogResult.OK;
+						this.Close();
+					}
+					break;
+			}
+		}
+		
+		// Cancel clicked
+		private void cancel_Click(object sender, EventArgs e)
+		{
+			// Just hide
+			this.DialogResult = DialogResult.Cancel;
+			this.Close();
+		}
+
+		// Browse WAD File clicked
+		private void browsewad_Click(object sender, EventArgs e)
+		{
+			// Browse for WAD File
+			if(wadfiledialog.ShowDialog(this) == DialogResult.OK)
+			{
+				// Use this file
+				wadlocation.Text = wadfiledialog.FileName;
+			}
+		}
+
+		// Browse Directory clicked
+		private void browsedir_Click(object sender, EventArgs e)
+		{
+			// Browse for Directory
+			if(dirdialog.ShowDialog(this) == DialogResult.OK)
+			{
+				// Use this directory
+				dirlocation.Text = dirdialog.SelectedPath;
+			}
+		}
+
+		// Browse PK3 File clicked
+		private void browsepk3_Click(object sender, EventArgs e)
+		{
+			// Browse for PK3 File
+			if(pk3filedialog.ShowDialog(this) == DialogResult.OK)
+			{
+				// Use this file
+				pk3location.Text = pk3filedialog.FileName;
+			}
+		}
+
+		// Link clicked
+		private void link_Click(object sender, LinkLabelLinkClickedEventArgs e)
+		{
+			General.OpenWebsite("http://www.zdoom.org/wiki/Using_ZIPs_as_WAD_replacement");
+		}
+
+		// Help
+		private void ResourceOptionsForm_HelpRequested(object sender, HelpEventArgs hlpevent)
+		{
+			General.ShowHelp("w_resourceoptions.html");
+			hlpevent.Handled = true;
+		}
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/ResourceOptionsForm.resx b/Source/Core/Windows/ResourceOptionsForm.resx
new file mode 100644
index 0000000..b8f2b3d
--- /dev/null
+++ b/Source/Core/Windows/ResourceOptionsForm.resx
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="label1.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="label1.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label2.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="label2.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label3.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="label3.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="tabs.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="wadfiletab.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="strictpatches.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="wadlocation.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="directorytab.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dir_flats.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dir_textures.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dirlocation.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="pk3filetab.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="pk3location.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <data name="label6.Text" xml:space="preserve">
+    <value>Use the option above to enforce strictly loading texture patches from between P_START and P_END marker lumps only. This can solve lump name conflicts, but old WAD files do not always adhere to this rule.</value>
+  </data>
+  <metadata name="strictpatches.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="wadlocation.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dir_flats.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dir_textures.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dirlocation.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="wadfiledialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="dirdialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>133, 17</value>
+  </metadata>
+  <metadata name="pk3filedialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>227, 17</value>
+  </metadata>
+  <metadata name="notfortesting.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Windows/ScriptEditorForm.Designer.cs b/Source/Core/Windows/ScriptEditorForm.Designer.cs
new file mode 100644
index 0000000..3b4e427
--- /dev/null
+++ b/Source/Core/Windows/ScriptEditorForm.Designer.cs
@@ -0,0 +1,71 @@
+namespace CodeImp.DoomBuilder.Windows
+{
+	partial class ScriptEditorForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ScriptEditorForm));
+			this.editor = new CodeImp.DoomBuilder.Controls.ScriptEditorPanel();
+			this.SuspendLayout();
+			// 
+			// editor
+			// 
+			this.editor.BackColor = System.Drawing.SystemColors.Control;
+			this.editor.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.editor.Location = new System.Drawing.Point(0, 0);
+			this.editor.Name = "editor";
+			this.editor.Size = new System.Drawing.Size(729, 578);
+			this.editor.TabIndex = 0;
+			this.editor.TabStop = false;
+			// 
+			// ScriptEditorForm
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.ClientSize = new System.Drawing.Size(729, 578);
+			this.Controls.Add(this.editor);
+			this.DoubleBuffered = true;
+			this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+			this.KeyPreview = true;
+			this.Name = "ScriptEditorForm";
+			this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
+			this.Text = "Script Editor";
+			this.Load += new System.EventHandler(this.ScriptEditorForm_Load);
+			this.Shown += new System.EventHandler(this.ScriptEditorForm_Shown);
+			this.Move += new System.EventHandler(this.ScriptEditorForm_Move);
+			this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.ScriptEditorForm_FormClosing);
+			this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.ScriptEditorForm_HelpRequested);
+			this.ResizeEnd += new System.EventHandler(this.ScriptEditorForm_ResizeEnd);
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private CodeImp.DoomBuilder.Controls.ScriptEditorPanel editor;
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/ScriptEditorForm.cs b/Source/Core/Windows/ScriptEditorForm.cs
new file mode 100644
index 0000000..49ae448
--- /dev/null
+++ b/Source/Core/Windows/ScriptEditorForm.cs
@@ -0,0 +1,188 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Controls;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Windows
+{
+	internal partial class ScriptEditorForm : DelayedForm
+	{
+		#region ================== Variables
+
+		// Position/size
+		private Point lastposition;
+		private Size lastsize;
+
+		// Closing?
+		private bool appclose;
+		
+		#endregion
+		
+		#region ================== Properties
+		
+		public ScriptEditorPanel Editor { get { return editor; } }
+		
+		#endregion
+		
+		#region ================== Constructor
+		
+		// Constructor
+		public ScriptEditorForm()
+		{
+			InitializeComponent();
+			editor.Initialize();
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+		
+		// This asks to save files and returns the result
+		// Also does implicit saves
+		// Returns false when cancelled by the user
+		public bool AskSaveAll()
+		{
+			// Implicit-save the script lumps
+			editor.ImplicitSave();
+			
+			// Save other scripts
+			return editor.AskSaveAll();
+		}
+		
+		// Close the window
+		new public void Close()
+		{
+			appclose = true;
+			base.Close();
+		}
+
+		#endregion
+		
+		#region ================== Events
+
+		// Window is loaded
+		private void ScriptEditorForm_Load(object sender, EventArgs e)
+		{
+			this.SuspendLayout();
+			this.Location = new Point(General.Settings.ReadSetting("scriptswindow.positionx", this.Location.X),
+									  General.Settings.ReadSetting("scriptswindow.positiony", this.Location.Y));
+			this.Size = new Size(General.Settings.ReadSetting("scriptswindow.sizewidth", this.Size.Width),
+								 General.Settings.ReadSetting("scriptswindow.sizeheight", this.Size.Height));
+			this.WindowState = (FormWindowState)General.Settings.ReadSetting("scriptswindow.windowstate", (int)FormWindowState.Normal);
+			this.ResumeLayout(true);
+
+			// Normal windowstate?
+			if(this.WindowState == FormWindowState.Normal)
+			{
+				// Keep last position and size
+				lastposition = this.Location;
+				lastsize = this.Size;
+			}
+
+			// Apply panel settings
+			editor.ApplySettings();
+		}
+		
+		// Window is shown
+		private void ScriptEditorForm_Shown(object sender, EventArgs e)
+		{
+			// Focus to script editor
+			editor.ForceFocus();
+		}
+		
+		// Window is closing
+		private void ScriptEditorForm_FormClosing(object sender, FormClosingEventArgs e)
+		{
+			int windowstate;
+
+			// Determine window state to save
+			if(this.WindowState != FormWindowState.Minimized)
+				windowstate = (int)this.WindowState;
+			else
+				windowstate = (int)FormWindowState.Normal;
+
+			// Save window settings
+			General.Settings.WriteSetting("scriptswindow.positionx", lastposition.X);
+			General.Settings.WriteSetting("scriptswindow.positiony", lastposition.Y);
+			General.Settings.WriteSetting("scriptswindow.sizewidth", lastsize.Width);
+			General.Settings.WriteSetting("scriptswindow.sizeheight", lastsize.Height);
+			General.Settings.WriteSetting("scriptswindow.windowstate", windowstate);
+			editor.SaveSettings();
+			
+			// Only when closed by the user
+			if(!appclose)
+			{
+				// Remember if scipts are changed
+				General.Map.ApplyScriptChanged();
+				
+				// Ask to save scripts
+				if(AskSaveAll())
+				{
+					// Let the general call close the editor
+					General.Map.CloseScriptEditor(true);
+				}
+				else
+				{
+					// Cancel
+					e.Cancel = true;
+				}
+			}
+
+			// Not cancelling?
+			if(!e.Cancel) editor.OnClose();
+		}
+
+		// Window resized
+		private void ScriptEditorForm_ResizeEnd(object sender, EventArgs e)
+		{
+			// Normal windowstate?
+			if(this.WindowState == FormWindowState.Normal)
+			{
+				// Keep last position and size
+				lastposition = this.Location;
+				lastsize = this.Size;
+			}
+		}
+
+		// Window moved
+		private void ScriptEditorForm_Move(object sender, EventArgs e)
+		{
+			// Normal windowstate?
+			if(this.WindowState == FormWindowState.Normal)
+			{
+				// Keep last position and size
+				lastposition = this.Location;
+				lastsize = this.Size;
+			}
+		}
+
+		// Help
+		private void ScriptEditorForm_HelpRequested(object sender, HelpEventArgs hlpevent)
+		{
+			if(!editor.LaunchKeywordHelp())	General.ShowHelp("w_scripteditor.html"); //mxd
+			hlpevent.Handled = true;
+		}
+		
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/ScriptEditorForm.resx b/Source/Core/Windows/ScriptEditorForm.resx
new file mode 100644
index 0000000..81d185b
--- /dev/null
+++ b/Source/Core/Windows/ScriptEditorForm.resx
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AACQWzEBkFsxRJBbMWiQWzGBkFsxnpBbMbqQWzHYkFsx9ZVhOf+aaUH/o3RP/62CX/+QWzG4kFsxCgAA
+        AAAAAAAAlF8zKriQbf/WuqP/38az/+fUw//u39P/9eri//v07//9+vb///79//vr3//77+b/wZ2A/5Rf
+        MzAAAAAAAAAAAJlkNknHpIX////////////////////////+/P/++/f//vfx//728f/krob/+ujb/86v
+        lf+ZZDZLAAAAAAAAAACeaTkdnmk57bSFWf/ZpXv/2J5v/9ebav/YlmP/1pJd/9SPWf/Tjlf/4p1p//rj
+        0f/Yu6L/nmk5YQAAAAAAAAAApG88AaRvPHLVroz//fDl//bGof/2zqz/+NS0//bYu//127//997D//rk
+        zP/99ez/4s66/6RvPH0AAAAAAAAAAAAAAACqdUAGt4ZW//7+/f/ozrT/z7ae/861n//OtZ//zreg/9a7
+        pP/63MP//eve/+zczf+qdUCgAAAAAAAAAAAAAAAAsXtDA7mGUv/+/Pn/99q9/+3Rtf/u0rf/8tS8//LV
+        u//z173/+dzC//vn1P/17eL/sXtDywAAAAAAAAAAAAAAAAAAAAC5hUv//vv3/+/Tuf/QuaD/z7ig/8+3
+        of/PuKD/z7ig//HWvP/74sv//Pn1/7eCR/cAAAAAAAAAAAAAAAAAAAAAvYhL8/z28P/538f/8dW3//LV
+        uP/y1Lr/8ta8//LWu//43MP/++DJ///8+v/BjVP/AAAAAAAAAAAAAAAAAAAAAMSOTrr159j/+eTR/9K4
+        n//SuZ//07mh/9O7o//Tu6P/8ta+//vhyP///fv/yJRX/8SOTgEAAAAAAAAAAAAAAADKlFKJ8NnB//vt
+        4f/42b//+NvB//fcw//43sX/99/H//ffyv/65dD///79/8uPWv/KlFLjypRSEgAAAAAAAAAA0JpVae3Q
+        sv//9vD/6NG7/8+7qP/Pu6v/z76u/8/AsP/Xx7j//Orb/////f/SnXH/7tnB/9CaVc0AAAAAAAAAANWf
+        WFPryqX///37//vn0//66NX/+ufY//vr3f/77uD//PDj//zw5P//////4KBw///7+f/fuIf/AAAAAAAA
+        AADapFtE68aa///////87+L//fDn//3x6//99e7//fjx//369////Pr///////779//02sD/2qRb1gAA
+        AAAAAAAA3qhdLurAjP///////////////////////fn0//vz6v/469n/+ObT//Xfxv/py6b/3qhd3N6o
+        XSEAAAAAAAAAAOKsXwvirF+Z6ryB/+i3d//msm3/5LBo/+KsX+HirF/K4qxfqOKsX6PirF+J4qxfbuKs
+        XxYAAAAAAAOsQQADrEEAA6xBAAOsQQADrEGAA6xBgAOsQcADrEHAA6xBwAGsQcAArEHAAKxBwACsQcAA
+        rEHAAKxBwAGsQQ==
+</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Windows/ScriptFindReplaceForm.Designer.cs b/Source/Core/Windows/ScriptFindReplaceForm.Designer.cs
new file mode 100644
index 0000000..80a60db
--- /dev/null
+++ b/Source/Core/Windows/ScriptFindReplaceForm.Designer.cs
@@ -0,0 +1,194 @@
+namespace CodeImp.DoomBuilder.Windows
+{
+	partial class ScriptFindReplaceForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.label1 = new System.Windows.Forms.Label();
+			this.findtext = new System.Windows.Forms.TextBox();
+			this.casesensitive = new System.Windows.Forms.CheckBox();
+			this.wordonly = new System.Windows.Forms.CheckBox();
+			this.replacetext = new System.Windows.Forms.TextBox();
+			this.label2 = new System.Windows.Forms.Label();
+			this.findnextbutton = new System.Windows.Forms.Button();
+			this.replaceallbutton = new System.Windows.Forms.Button();
+			this.closebutton = new System.Windows.Forms.Button();
+			this.replacebutton = new System.Windows.Forms.Button();
+			this.findpreviousbutton = new System.Windows.Forms.Button();
+			this.SuspendLayout();
+			// 
+			// label1
+			// 
+			this.label1.AutoSize = true;
+			this.label1.Location = new System.Drawing.Point(29, 23);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(56, 13);
+			this.label1.TabIndex = 0;
+			this.label1.Text = "Find what:";
+			// 
+			// findtext
+			// 
+			this.findtext.Location = new System.Drawing.Point(93, 20);
+			this.findtext.Name = "findtext";
+			this.findtext.Size = new System.Drawing.Size(152, 20);
+			this.findtext.TabIndex = 0;
+			// 
+			// casesensitive
+			// 
+			this.casesensitive.AutoSize = true;
+			this.casesensitive.Location = new System.Drawing.Point(93, 81);
+			this.casesensitive.Name = "casesensitive";
+			this.casesensitive.Size = new System.Drawing.Size(94, 17);
+			this.casesensitive.TabIndex = 2;
+			this.casesensitive.Text = "Case sensitive";
+			this.casesensitive.UseVisualStyleBackColor = true;
+			// 
+			// wordonly
+			// 
+			this.wordonly.AutoSize = true;
+			this.wordonly.Location = new System.Drawing.Point(93, 105);
+			this.wordonly.Name = "wordonly";
+			this.wordonly.Size = new System.Drawing.Size(105, 17);
+			this.wordonly.TabIndex = 3;
+			this.wordonly.Text = "Whole word only";
+			this.wordonly.UseVisualStyleBackColor = true;
+			// 
+			// replacetext
+			// 
+			this.replacetext.Location = new System.Drawing.Point(93, 51);
+			this.replacetext.Name = "replacetext";
+			this.replacetext.Size = new System.Drawing.Size(152, 20);
+			this.replacetext.TabIndex = 1;
+			// 
+			// label2
+			// 
+			this.label2.AutoSize = true;
+			this.label2.Location = new System.Drawing.Point(14, 54);
+			this.label2.Name = "label2";
+			this.label2.Size = new System.Drawing.Size(72, 13);
+			this.label2.TabIndex = 6;
+			this.label2.Text = "Replace with:";
+			// 
+			// findnextbutton
+			// 
+			this.findnextbutton.Location = new System.Drawing.Point(251, 17);
+			this.findnextbutton.Name = "findnextbutton";
+			this.findnextbutton.Size = new System.Drawing.Size(80, 25);
+			this.findnextbutton.TabIndex = 4;
+			this.findnextbutton.Text = "Find Next";
+			this.findnextbutton.UseVisualStyleBackColor = true;
+			this.findnextbutton.Click += new System.EventHandler(this.findnextbutton_Click);
+			// 
+			// replaceallbutton
+			// 
+			this.replaceallbutton.Location = new System.Drawing.Point(337, 48);
+			this.replaceallbutton.Name = "replaceallbutton";
+			this.replaceallbutton.Size = new System.Drawing.Size(86, 25);
+			this.replaceallbutton.TabIndex = 7;
+			this.replaceallbutton.Text = "Replace All";
+			this.replaceallbutton.UseVisualStyleBackColor = true;
+			this.replaceallbutton.Click += new System.EventHandler(this.replaceallbutton_Click);
+			// 
+			// closebutton
+			// 
+			this.closebutton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.closebutton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.closebutton.Location = new System.Drawing.Point(325, 96);
+			this.closebutton.Name = "closebutton";
+			this.closebutton.Size = new System.Drawing.Size(98, 25);
+			this.closebutton.TabIndex = 8;
+			this.closebutton.Text = "Close";
+			this.closebutton.UseVisualStyleBackColor = true;
+			this.closebutton.Click += new System.EventHandler(this.closebutton_Click);
+			// 
+			// replacebutton
+			// 
+			this.replacebutton.Location = new System.Drawing.Point(251, 48);
+			this.replacebutton.Name = "replacebutton";
+			this.replacebutton.Size = new System.Drawing.Size(80, 25);
+			this.replacebutton.TabIndex = 6;
+			this.replacebutton.Text = "Replace";
+			this.replacebutton.UseVisualStyleBackColor = true;
+			this.replacebutton.Click += new System.EventHandler(this.replacebutton_Click);
+			// 
+			// findpreviousbutton
+			// 
+			this.findpreviousbutton.Location = new System.Drawing.Point(337, 17);
+			this.findpreviousbutton.Name = "findpreviousbutton";
+			this.findpreviousbutton.Size = new System.Drawing.Size(86, 25);
+			this.findpreviousbutton.TabIndex = 5;
+			this.findpreviousbutton.Text = "Find Previous";
+			this.findpreviousbutton.UseVisualStyleBackColor = true;
+			this.findpreviousbutton.Click += new System.EventHandler(this.findpreviousbutton_Click);
+			// 
+			// ScriptFindReplaceForm
+			// 
+			this.AcceptButton = this.findnextbutton;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.CancelButton = this.closebutton;
+			this.ClientSize = new System.Drawing.Size(436, 127);
+			this.Controls.Add(this.findpreviousbutton);
+			this.Controls.Add(this.replacebutton);
+			this.Controls.Add(this.closebutton);
+			this.Controls.Add(this.replaceallbutton);
+			this.Controls.Add(this.findnextbutton);
+			this.Controls.Add(this.label2);
+			this.Controls.Add(this.replacetext);
+			this.Controls.Add(this.wordonly);
+			this.Controls.Add(this.casesensitive);
+			this.Controls.Add(this.findtext);
+			this.Controls.Add(this.label1);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "ScriptFindReplaceForm";
+			this.Opacity = 1;
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.Text = "Find and Replace";
+			this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.ScriptFindReplaceForm_FormClosing);
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.TextBox findtext;
+		private System.Windows.Forms.CheckBox casesensitive;
+		private System.Windows.Forms.CheckBox wordonly;
+		private System.Windows.Forms.TextBox replacetext;
+		private System.Windows.Forms.Label label2;
+		private System.Windows.Forms.Button findnextbutton;
+		private System.Windows.Forms.Button replaceallbutton;
+		private System.Windows.Forms.Button closebutton;
+		private System.Windows.Forms.Button replacebutton;
+		private System.Windows.Forms.Button findpreviousbutton;
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/ScriptFindReplaceForm.cs b/Source/Core/Windows/ScriptFindReplaceForm.cs
new file mode 100644
index 0000000..e3b6ddd
--- /dev/null
+++ b/Source/Core/Windows/ScriptFindReplaceForm.cs
@@ -0,0 +1,123 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Windows.Forms;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Windows
+{
+	public partial class ScriptFindReplaceForm : DelayedForm
+	{
+		#region ================== Variables
+
+		private bool appclose;
+
+		#endregion
+
+		#region ================== Properties
+		
+		#endregion
+
+		#region ================== Constructor
+
+		// Constructor
+		public ScriptFindReplaceForm()
+		{
+			InitializeComponent();
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This makes the Find & Replace options
+		private FindReplaceOptions MakeOptions()
+		{
+			FindReplaceOptions options = new FindReplaceOptions();
+			options.FindText = findtext.Text;
+			options.CaseSensitive = casesensitive.Checked;
+			options.WholeWord = wordonly.Checked;
+			options.ReplaceWith = replacetext.Text;
+			return options;
+		}
+
+		// Close the window
+		new public void Close()
+		{
+			appclose = true;
+			base.Close();
+		}
+
+		// This sets the text to find
+		public void SetFindText(string text)
+		{
+			findtext.Text = text;
+			findtext.SelectAll();
+		}
+
+		#endregion
+
+		#region ================== Events
+
+		// Form is closing
+		private void ScriptFindReplaceForm_FormClosing(object sender, FormClosingEventArgs e)
+		{
+			if(!appclose)
+			{
+				General.Map.ScriptEditor.Editor.CloseFindReplace(true);
+			}
+		}
+
+		// Find Next
+		private void findnextbutton_Click(object sender, EventArgs e)
+		{
+			General.Map.ScriptEditor.Editor.FindNext(MakeOptions());
+		}
+
+		// Find Previous (mxd)
+		private void findpreviousbutton_Click(object sender, EventArgs e) 
+		{
+			General.Map.ScriptEditor.Editor.FindPrevious(MakeOptions());
+		}
+		
+		// Replace
+		private void replacebutton_Click(object sender, EventArgs e)
+		{
+			FindReplaceOptions options = MakeOptions();
+			
+			General.Map.ScriptEditor.Editor.Replace(options);
+			General.Map.ScriptEditor.Editor.FindNext(options);
+		}
+		
+		// Replace All
+		private void replaceallbutton_Click(object sender, EventArgs e)
+		{
+			General.Map.ScriptEditor.Editor.ReplaceAll(MakeOptions());
+		}
+		
+		// Close
+		private void closebutton_Click(object sender, EventArgs e)
+		{
+			General.Map.ScriptEditor.Editor.CloseFindReplace(false);
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/ScriptFindReplaceForm.resx b/Source/Core/Windows/ScriptFindReplaceForm.resx
new file mode 100644
index 0000000..4beae8f
--- /dev/null
+++ b/Source/Core/Windows/ScriptFindReplaceForm.resx
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="label1.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="findtext.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="replacetext.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="label2.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Windows/SectorEditForm.Designer.cs b/Source/Core/Windows/SectorEditForm.Designer.cs
new file mode 100644
index 0000000..dc8df19
--- /dev/null
+++ b/Source/Core/Windows/SectorEditForm.Designer.cs
@@ -0,0 +1,452 @@
+namespace CodeImp.DoomBuilder.Windows
+{
+	partial class SectorEditForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.components = new System.ComponentModel.Container();
+			System.Windows.Forms.Label label1;
+			System.Windows.Forms.Label label3;
+			System.Windows.Forms.GroupBox groupeffect;
+			System.Windows.Forms.Label label8;
+			System.Windows.Forms.Label label9;
+			System.Windows.Forms.GroupBox groupfloorceiling;
+			System.Windows.Forms.Label label7;
+			System.Windows.Forms.Label label5;
+			System.Windows.Forms.Label label6;
+			System.Windows.Forms.Label label2;
+			System.Windows.Forms.Label label4;
+			this.browseeffect = new System.Windows.Forms.Button();
+			this.effect = new CodeImp.DoomBuilder.Controls.ActionSelectorControl();
+			this.tagSelector = new CodeImp.DoomBuilder.GZBuilder.Controls.TagSelector();
+			this.heightoffset = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.brightness = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.ceilingheight = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.sectorheightlabel = new System.Windows.Forms.Label();
+			this.sectorheight = new System.Windows.Forms.Label();
+			this.floortex = new CodeImp.DoomBuilder.Controls.FlatSelectorControl();
+			this.floorheight = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.ceilingtex = new CodeImp.DoomBuilder.Controls.FlatSelectorControl();
+			this.cancel = new System.Windows.Forms.Button();
+			this.apply = new System.Windows.Forms.Button();
+			this.flatSelectorControl2 = new CodeImp.DoomBuilder.Controls.FlatSelectorControl();
+			this.flatSelectorControl1 = new CodeImp.DoomBuilder.Controls.FlatSelectorControl();
+			this.panel1 = new System.Windows.Forms.Panel();
+			this.tooltip = new System.Windows.Forms.ToolTip(this.components);
+			label1 = new System.Windows.Forms.Label();
+			label3 = new System.Windows.Forms.Label();
+			groupeffect = new System.Windows.Forms.GroupBox();
+			label8 = new System.Windows.Forms.Label();
+			label9 = new System.Windows.Forms.Label();
+			groupfloorceiling = new System.Windows.Forms.GroupBox();
+			label7 = new System.Windows.Forms.Label();
+			label5 = new System.Windows.Forms.Label();
+			label6 = new System.Windows.Forms.Label();
+			label2 = new System.Windows.Forms.Label();
+			label4 = new System.Windows.Forms.Label();
+			groupeffect.SuspendLayout();
+			groupfloorceiling.SuspendLayout();
+			this.panel1.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// label1
+			// 
+			label1.Location = new System.Drawing.Point(271, 18);
+			label1.Name = "label1";
+			label1.Size = new System.Drawing.Size(83, 16);
+			label1.TabIndex = 15;
+			label1.Text = "Floor";
+			label1.TextAlign = System.Drawing.ContentAlignment.TopCenter;
+			// 
+			// label3
+			// 
+			label3.Location = new System.Drawing.Point(363, 18);
+			label3.Name = "label3";
+			label3.Size = new System.Drawing.Size(83, 16);
+			label3.TabIndex = 14;
+			label3.Text = "Ceiling";
+			label3.TextAlign = System.Drawing.ContentAlignment.TopCenter;
+			// 
+			// groupeffect
+			// 
+			groupeffect.BackColor = System.Drawing.Color.Transparent;
+			groupeffect.Controls.Add(this.browseeffect);
+			groupeffect.Controls.Add(this.effect);
+			groupeffect.Controls.Add(label8);
+			groupeffect.Controls.Add(this.tagSelector);
+			groupeffect.Location = new System.Drawing.Point(3, 195);
+			groupeffect.Name = "groupeffect";
+			groupeffect.Size = new System.Drawing.Size(436, 92);
+			groupeffect.TabIndex = 1;
+			groupeffect.TabStop = false;
+			groupeffect.Text = "Effect and Identification";
+			// 
+			// browseeffect
+			// 
+			this.browseeffect.Image = global::CodeImp.DoomBuilder.Properties.Resources.List;
+			this.browseeffect.Location = new System.Drawing.Point(402, 26);
+			this.browseeffect.Name = "browseeffect";
+			this.browseeffect.Size = new System.Drawing.Size(28, 25);
+			this.browseeffect.TabIndex = 1;
+			this.browseeffect.Text = " ";
+			this.browseeffect.UseVisualStyleBackColor = true;
+			this.browseeffect.Click += new System.EventHandler(this.browseeffect_Click);
+			// 
+			// effect
+			// 
+			this.effect.BackColor = System.Drawing.Color.Transparent;
+			this.effect.Cursor = System.Windows.Forms.Cursors.Default;
+			this.effect.Empty = false;
+			this.effect.GeneralizedCategories = null;
+			this.effect.GeneralizedOptions = null;
+			this.effect.Location = new System.Drawing.Point(61, 28);
+			this.effect.Name = "effect";
+			this.effect.Size = new System.Drawing.Size(335, 21);
+			this.effect.TabIndex = 0;
+			this.effect.Value = 402;
+			// 
+			// label8
+			// 
+			label8.AutoSize = true;
+			label8.Location = new System.Drawing.Point(12, 31);
+			label8.Name = "label8";
+			label8.Size = new System.Drawing.Size(45, 13);
+			label8.TabIndex = 0;
+			label8.Text = "Special:";
+			// 
+			// tagSelector
+			// 
+			this.tagSelector.Location = new System.Drawing.Point(19, 52);
+			this.tagSelector.Name = "tagSelector";
+			this.tagSelector.Size = new System.Drawing.Size(414, 34);
+			this.tagSelector.TabIndex = 0;
+			// 
+			// label9
+			// 
+			label9.Location = new System.Drawing.Point(16, 159);
+			label9.Name = "label9";
+			label9.Size = new System.Drawing.Size(78, 14);
+			label9.TabIndex = 2;
+			label9.Text = "Brightness:";
+			label9.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// groupfloorceiling
+			// 
+			groupfloorceiling.BackColor = System.Drawing.Color.Transparent;
+			groupfloorceiling.Controls.Add(label7);
+			groupfloorceiling.Controls.Add(label5);
+			groupfloorceiling.Controls.Add(label6);
+			groupfloorceiling.Controls.Add(this.heightoffset);
+			groupfloorceiling.Controls.Add(this.brightness);
+			groupfloorceiling.Controls.Add(this.ceilingheight);
+			groupfloorceiling.Controls.Add(label9);
+			groupfloorceiling.Controls.Add(label2);
+			groupfloorceiling.Controls.Add(this.sectorheightlabel);
+			groupfloorceiling.Controls.Add(label4);
+			groupfloorceiling.Controls.Add(this.sectorheight);
+			groupfloorceiling.Controls.Add(this.floortex);
+			groupfloorceiling.Controls.Add(this.floorheight);
+			groupfloorceiling.Controls.Add(this.ceilingtex);
+			groupfloorceiling.Location = new System.Drawing.Point(3, 3);
+			groupfloorceiling.Name = "groupfloorceiling";
+			groupfloorceiling.Size = new System.Drawing.Size(436, 186);
+			groupfloorceiling.TabIndex = 0;
+			groupfloorceiling.TabStop = false;
+			groupfloorceiling.Text = "Floor and Ceiling ";
+			// 
+			// label7
+			// 
+			label7.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			label7.ForeColor = System.Drawing.SystemColors.HotTrack;
+			label7.Location = new System.Drawing.Point(16, 100);
+			label7.Name = "label7";
+			label7.Size = new System.Drawing.Size(78, 14);
+			label7.TabIndex = 25;
+			label7.Text = "Height offset:";
+			label7.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			this.tooltip.SetToolTip(label7, "Changes floor and ceiling height by given value.\r\nUse \"++\" to raise by sector hei" +
+					"ght.\r\nUse \"--\" to lower by sector height.");
+			// 
+			// label5
+			// 
+			label5.Location = new System.Drawing.Point(16, 70);
+			label5.Name = "label5";
+			label5.Size = new System.Drawing.Size(78, 14);
+			label5.TabIndex = 17;
+			label5.Text = "Floor height:";
+			label5.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// label6
+			// 
+			label6.Location = new System.Drawing.Point(16, 40);
+			label6.Name = "label6";
+			label6.Size = new System.Drawing.Size(78, 14);
+			label6.TabIndex = 19;
+			label6.Text = "Ceiling height:";
+			label6.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// heightoffset
+			// 
+			this.heightoffset.AllowDecimal = false;
+			this.heightoffset.AllowNegative = true;
+			this.heightoffset.AllowRelative = true;
+			this.heightoffset.ButtonStep = 8;
+			this.heightoffset.ButtonStepBig = 16F;
+			this.heightoffset.ButtonStepFloat = 1F;
+			this.heightoffset.ButtonStepSmall = 1F;
+			this.heightoffset.ButtonStepsUseModifierKeys = true;
+			this.heightoffset.ButtonStepsWrapAround = false;
+			this.heightoffset.Location = new System.Drawing.Point(99, 95);
+			this.heightoffset.Name = "heightoffset";
+			this.heightoffset.Size = new System.Drawing.Size(88, 24);
+			this.heightoffset.StepValues = null;
+			this.heightoffset.TabIndex = 26;
+			this.heightoffset.WhenTextChanged += new System.EventHandler(this.heightoffset_WhenTextChanged);
+			// 
+			// brightness
+			// 
+			this.brightness.AllowDecimal = false;
+			this.brightness.AllowNegative = true;
+			this.brightness.AllowRelative = true;
+			this.brightness.ButtonStep = 8;
+			this.brightness.ButtonStepBig = 16F;
+			this.brightness.ButtonStepFloat = 1F;
+			this.brightness.ButtonStepSmall = 1F;
+			this.brightness.ButtonStepsUseModifierKeys = true;
+			this.brightness.ButtonStepsWrapAround = false;
+			this.brightness.Location = new System.Drawing.Point(99, 154);
+			this.brightness.Name = "brightness";
+			this.brightness.Size = new System.Drawing.Size(73, 24);
+			this.brightness.StepValues = null;
+			this.brightness.TabIndex = 24;
+			this.brightness.WhenTextChanged += new System.EventHandler(this.brightness_WhenTextChanged);
+			// 
+			// ceilingheight
+			// 
+			this.ceilingheight.AllowDecimal = false;
+			this.ceilingheight.AllowNegative = true;
+			this.ceilingheight.AllowRelative = true;
+			this.ceilingheight.ButtonStep = 8;
+			this.ceilingheight.ButtonStepBig = 16F;
+			this.ceilingheight.ButtonStepFloat = 1F;
+			this.ceilingheight.ButtonStepSmall = 1F;
+			this.ceilingheight.ButtonStepsUseModifierKeys = true;
+			this.ceilingheight.ButtonStepsWrapAround = false;
+			this.ceilingheight.Location = new System.Drawing.Point(99, 35);
+			this.ceilingheight.Name = "ceilingheight";
+			this.ceilingheight.Size = new System.Drawing.Size(88, 24);
+			this.ceilingheight.StepValues = null;
+			this.ceilingheight.TabIndex = 22;
+			this.ceilingheight.WhenTextChanged += new System.EventHandler(this.ceilingheight_TextChanged);
+			// 
+			// label2
+			// 
+			label2.Location = new System.Drawing.Point(193, 16);
+			label2.Name = "label2";
+			label2.Size = new System.Drawing.Size(114, 16);
+			label2.TabIndex = 15;
+			label2.Text = "Floor";
+			label2.TextAlign = System.Drawing.ContentAlignment.TopCenter;
+			// 
+			// sectorheightlabel
+			// 
+			this.sectorheightlabel.Location = new System.Drawing.Point(16, 130);
+			this.sectorheightlabel.Name = "sectorheightlabel";
+			this.sectorheightlabel.Size = new System.Drawing.Size(78, 14);
+			this.sectorheightlabel.TabIndex = 20;
+			this.sectorheightlabel.Text = "Sector height:";
+			this.sectorheightlabel.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// label4
+			// 
+			label4.Location = new System.Drawing.Point(313, 16);
+			label4.Name = "label4";
+			label4.Size = new System.Drawing.Size(114, 16);
+			label4.TabIndex = 14;
+			label4.Text = "Ceiling";
+			label4.TextAlign = System.Drawing.ContentAlignment.TopCenter;
+			// 
+			// sectorheight
+			// 
+			this.sectorheight.AutoSize = true;
+			this.sectorheight.Location = new System.Drawing.Point(100, 130);
+			this.sectorheight.Name = "sectorheight";
+			this.sectorheight.Size = new System.Drawing.Size(13, 13);
+			this.sectorheight.TabIndex = 21;
+			this.sectorheight.Text = "0";
+			// 
+			// floortex
+			// 
+			this.floortex.Location = new System.Drawing.Point(196, 35);
+			this.floortex.MultipleTextures = false;
+			this.floortex.Name = "floortex";
+			this.floortex.Size = new System.Drawing.Size(114, 138);
+			this.floortex.TabIndex = 2;
+			this.floortex.TextureName = "";
+			this.floortex.UsePreviews = true;
+			this.floortex.OnValueChanged += new System.EventHandler(this.floortex_OnValueChanged);
+			// 
+			// floorheight
+			// 
+			this.floorheight.AllowDecimal = false;
+			this.floorheight.AllowNegative = true;
+			this.floorheight.AllowRelative = true;
+			this.floorheight.ButtonStep = 8;
+			this.floorheight.ButtonStepBig = 16F;
+			this.floorheight.ButtonStepFloat = 1F;
+			this.floorheight.ButtonStepSmall = 1F;
+			this.floorheight.ButtonStepsUseModifierKeys = true;
+			this.floorheight.ButtonStepsWrapAround = false;
+			this.floorheight.Location = new System.Drawing.Point(99, 65);
+			this.floorheight.Name = "floorheight";
+			this.floorheight.Size = new System.Drawing.Size(88, 24);
+			this.floorheight.StepValues = null;
+			this.floorheight.TabIndex = 23;
+			this.floorheight.WhenTextChanged += new System.EventHandler(this.floorheight_TextChanged);
+			// 
+			// ceilingtex
+			// 
+			this.ceilingtex.Location = new System.Drawing.Point(316, 35);
+			this.ceilingtex.MultipleTextures = false;
+			this.ceilingtex.Name = "ceilingtex";
+			this.ceilingtex.Size = new System.Drawing.Size(114, 138);
+			this.ceilingtex.TabIndex = 3;
+			this.ceilingtex.TextureName = "";
+			this.ceilingtex.UsePreviews = true;
+			this.ceilingtex.OnValueChanged += new System.EventHandler(this.ceilingtex_OnValueChanged);
+			// 
+			// cancel
+			// 
+			this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.cancel.Location = new System.Drawing.Point(344, 306);
+			this.cancel.Name = "cancel";
+			this.cancel.Size = new System.Drawing.Size(112, 25);
+			this.cancel.TabIndex = 2;
+			this.cancel.Text = "Cancel";
+			this.cancel.UseVisualStyleBackColor = true;
+			this.cancel.Click += new System.EventHandler(this.cancel_Click);
+			// 
+			// apply
+			// 
+			this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.apply.Location = new System.Drawing.Point(226, 306);
+			this.apply.Name = "apply";
+			this.apply.Size = new System.Drawing.Size(112, 25);
+			this.apply.TabIndex = 1;
+			this.apply.Text = "OK";
+			this.apply.UseVisualStyleBackColor = true;
+			this.apply.Click += new System.EventHandler(this.apply_Click);
+			// 
+			// flatSelectorControl2
+			// 
+			this.flatSelectorControl2.Location = new System.Drawing.Point(271, 37);
+			this.flatSelectorControl2.MultipleTextures = false;
+			this.flatSelectorControl2.Name = "flatSelectorControl2";
+			this.flatSelectorControl2.Size = new System.Drawing.Size(83, 105);
+			this.flatSelectorControl2.TabIndex = 13;
+			this.flatSelectorControl2.TextureName = "";
+			this.flatSelectorControl2.UsePreviews = true;
+			// 
+			// flatSelectorControl1
+			// 
+			this.flatSelectorControl1.Location = new System.Drawing.Point(363, 37);
+			this.flatSelectorControl1.MultipleTextures = false;
+			this.flatSelectorControl1.Name = "flatSelectorControl1";
+			this.flatSelectorControl1.Size = new System.Drawing.Size(83, 105);
+			this.flatSelectorControl1.TabIndex = 12;
+			this.flatSelectorControl1.TextureName = "";
+			this.flatSelectorControl1.UsePreviews = true;
+			// 
+			// panel1
+			// 
+			this.panel1.BackColor = System.Drawing.SystemColors.Window;
+			this.panel1.Controls.Add(groupfloorceiling);
+			this.panel1.Controls.Add(groupeffect);
+			this.panel1.Location = new System.Drawing.Point(12, 10);
+			this.panel1.Name = "panel1";
+			this.panel1.Size = new System.Drawing.Size(443, 290);
+			this.panel1.TabIndex = 3;
+			// 
+			// tooltip
+			// 
+			this.tooltip.AutomaticDelay = 10;
+			this.tooltip.AutoPopDelay = 10000;
+			this.tooltip.InitialDelay = 10;
+			this.tooltip.ReshowDelay = 100;
+			// 
+			// SectorEditForm
+			// 
+			this.AcceptButton = this.apply;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.CancelButton = this.cancel;
+			this.ClientSize = new System.Drawing.Size(468, 337);
+			this.Controls.Add(this.panel1);
+			this.Controls.Add(this.cancel);
+			this.Controls.Add(this.apply);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "SectorEditForm";
+			this.Opacity = 1;
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Edit Sector";
+			this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.SectorEditForm_FormClosing);
+			this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.SectorEditForm_HelpRequested);
+			groupeffect.ResumeLayout(false);
+			groupeffect.PerformLayout();
+			groupfloorceiling.ResumeLayout(false);
+			groupfloorceiling.PerformLayout();
+			this.panel1.ResumeLayout(false);
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Button cancel;
+		private System.Windows.Forms.Button apply;
+		private CodeImp.DoomBuilder.Controls.FlatSelectorControl floortex;
+		private CodeImp.DoomBuilder.Controls.FlatSelectorControl ceilingtex;
+		private CodeImp.DoomBuilder.Controls.FlatSelectorControl flatSelectorControl2;
+		private CodeImp.DoomBuilder.Controls.FlatSelectorControl flatSelectorControl1;
+		private System.Windows.Forms.Label sectorheight;
+		private CodeImp.DoomBuilder.Controls.ActionSelectorControl effect;
+		private System.Windows.Forms.Button browseeffect;
+		private System.Windows.Forms.Label sectorheightlabel;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox ceilingheight;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox floorheight;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox brightness;
+		private CodeImp.DoomBuilder.GZBuilder.Controls.TagSelector tagSelector;
+		private System.Windows.Forms.Panel panel1;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox heightoffset;
+		private System.Windows.Forms.ToolTip tooltip;
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/SectorEditForm.cs b/Source/Core/Windows/SectorEditForm.cs
new file mode 100644
index 0000000..c7049e0
--- /dev/null
+++ b/Source/Core/Windows/SectorEditForm.cs
@@ -0,0 +1,484 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Types;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Windows
+{
+	internal partial class SectorEditForm : DelayedForm
+	{
+		#region ================== Events
+
+		public event EventHandler OnValuesChanged; //mxd
+
+		#endregion
+
+		#region ================== Variables
+
+		private ICollection<Sector> sectors;
+		private List<SectorProperties> sectorprops; //mxd
+		private bool preventchanges; //mxd
+		private bool undocreated; //mxd
+
+		//mxd. Window setup stuff
+		private static Point location = Point.Empty;
+
+		private struct SectorProperties //mxd
+		{
+			public readonly int Brightness;
+			public readonly int FloorHeight;
+			public readonly int CeilHeight;
+			public readonly string FloorTexture;
+			public readonly string CeilTexture;
+
+			public SectorProperties(Sector s) 
+			{
+				Brightness = s.Brightness;
+				FloorHeight = s.FloorHeight;
+				CeilHeight = s.CeilHeight;
+				FloorTexture = s.FloorTexture;
+				CeilTexture = s.CeilTexture;
+			}
+		}
+
+		#endregion
+
+		#region ================== Constructor
+
+		// Constructor
+		public SectorEditForm()
+		{
+			// Initialize
+			InitializeComponent();
+
+			//mxd. Widow setup
+			if(location != Point.Empty) 
+			{
+				this.StartPosition = FormStartPosition.Manual;
+				this.Location = location;
+			}
+
+			// Fill effects list
+			effect.GeneralizedOptions = General.Map.Config.GenEffectOptions; //mxd
+			effect.AddInfo(General.Map.Config.SortedSectorEffects.ToArray());
+
+			// Initialize image selectors
+			floortex.Initialize();
+			ceilingtex.Initialize();
+
+			// Set steps for brightness field
+			brightness.StepValues = General.Map.Config.BrightnessLevels;
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This sets up the form to edit the given sectors
+		public void Setup(ICollection<Sector> sectors)
+		{
+			preventchanges = true; //mxd
+
+			// Keep this list
+			this.sectors = sectors;
+			if(sectors.Count > 1) this.Text = "Edit Sectors (" + sectors.Count + ")";
+			sectorprops = new List<SectorProperties>(); //mxd
+
+			//mxd. Set default height offset
+			heightoffset.Text = "0";
+
+			////////////////////////////////////////////////////////////////////////
+			// Set all options to the first sector properties
+			////////////////////////////////////////////////////////////////////////
+
+			// Get first sector
+			Sector sc = General.GetByIndex(sectors, 0);
+
+			// Effects
+			effect.Value = sc.Effect;
+			brightness.Text = sc.Brightness.ToString();
+
+			// Floor/ceiling
+			floorheight.Text = sc.FloorHeight.ToString();
+			ceilingheight.Text = sc.CeilHeight.ToString();
+			floortex.TextureName = sc.FloorTexture;
+			ceilingtex.TextureName = sc.CeilTexture;
+
+			// Action
+			tagSelector.Setup(UniversalType.SectorTag); //mxd
+			tagSelector.SetTag(sc.Tag);//mxd
+			
+			////////////////////////////////////////////////////////////////////////
+			// Now go for all sectors and change the options when a setting is different
+			////////////////////////////////////////////////////////////////////////
+
+			// Go for all sectors
+			foreach(Sector s in sectors)
+			{
+				// Effects
+				if(s.Effect != effect.Value) effect.Empty = true;
+				if(s.Brightness.ToString() != brightness.Text) brightness.Text = "";
+
+				// Floor/Ceiling
+				if(s.FloorHeight.ToString() != floorheight.Text) floorheight.Text = "";
+				if(s.CeilHeight.ToString() != ceilingheight.Text) ceilingheight.Text = "";
+				if(s.FloorTexture != floortex.TextureName) 
+				{
+					floortex.MultipleTextures = true; //mxd
+					floortex.TextureName = "";
+				}
+				if(s.CeilTexture != ceilingtex.TextureName) 
+				{
+					ceilingtex.MultipleTextures = true; //mxd
+					ceilingtex.TextureName = "";
+				}
+
+				// Action
+				if(s.Tag != sc.Tag)	tagSelector.ClearTag(); //mxd
+
+				//mxd. Store initial properties
+				sectorprops.Add(new SectorProperties(s));
+			}
+
+			// Show sector height
+			UpdateSectorHeight();
+
+			preventchanges = false; //mxd
+		}
+
+		//mxd
+		private void MakeUndo() 
+		{
+			if(undocreated) return;
+			undocreated = true;
+
+			//mxd. Make undo
+			General.Map.UndoRedo.CreateUndo("Edit " + (sectors.Count > 1 ? sectors.Count + " sectors" : "sector"));
+		}
+
+		// This updates the sector height field
+		private void UpdateSectorHeight()
+		{
+			int delta = 0;
+			int index = -1; //mxd
+			int i = 0; //mxd
+			
+			// Check all selected sectors
+			foreach(Sector s in sectors) 
+			{
+				if(index == -1) 
+				{
+					// First sector in list
+					delta = s.CeilHeight - s.FloorHeight;
+					index = i; //mxd
+				} 
+				else if(delta != (s.CeilHeight - s.FloorHeight)) 
+				{
+					// We can't show heights because the delta
+					// heights for the sectors is different
+					index = -1;
+					break;
+				}
+
+				i++;
+			}
+
+			if(index > -1) 
+			{
+				int fh = floorheight.GetResult(sectorprops[index].FloorHeight); //mxd
+				int ch = ceilingheight.GetResult(sectorprops[index].CeilHeight); //mxd
+				int height = ch - fh;
+				sectorheight.Text = height.ToString();
+				sectorheight.Visible = true;
+				sectorheightlabel.Visible = true;
+			} 
+			else 
+			{
+				sectorheight.Visible = false;
+				sectorheightlabel.Visible = false;
+			}
+		}
+
+		//mxd
+		private void UpdateCeilingHeight() 
+		{
+			int i = 0;
+			int offset;
+
+			if(heightoffset.Text == "++" || heightoffset.Text == "--") // Raise or lower by sector height
+			{
+				int sign = (heightoffset.Text == "++" ? 1 : -1);
+				foreach(Sector s in sectors)
+				{
+					offset = sectorprops[i].CeilHeight - sectorprops[i].FloorHeight;
+					s.CeilHeight += offset * sign;
+					i++;
+				}
+			} 
+			else
+			{
+				offset = heightoffset.GetResult(0);
+
+				//restore values
+				if(string.IsNullOrEmpty(ceilingheight.Text)) 
+				{
+					foreach(Sector s in sectors)
+						s.CeilHeight = sectorprops[i++].CeilHeight + offset;
+				} 
+				else //update values
+				{
+					foreach(Sector s in sectors)
+						s.CeilHeight = ceilingheight.GetResult(sectorprops[i++].CeilHeight) + offset;
+				}
+			}
+		}
+
+		//mxd
+		private void UpdateFloorHeight() 
+		{
+			int i = 0;
+			int offset;
+
+			if(heightoffset.Text == "++" || heightoffset.Text == "--")
+			{
+				// Raise or lower by sector height
+				int sign = (heightoffset.Text == "++" ? 1 : -1);
+				foreach(Sector s in sectors)
+				{
+					offset = sectorprops[i].CeilHeight - sectorprops[i].FloorHeight;
+					s.FloorHeight += offset * sign;
+					i++;
+				}
+			}
+			else
+			{
+				offset = heightoffset.GetResult(0);
+				
+				//restore values
+				if(string.IsNullOrEmpty(floorheight.Text))
+				{
+					foreach(Sector s in sectors)
+						s.FloorHeight = sectorprops[i++].FloorHeight + offset;
+				}
+				else //update values
+				{
+					foreach(Sector s in sectors)
+						s.FloorHeight = floorheight.GetResult(sectorprops[i++].FloorHeight) + offset;
+				}
+			}
+		}
+
+		#endregion
+
+		#region ================== Events
+
+		// OK clicked
+		private void apply_Click(object sender, EventArgs e)
+		{
+			//mxd. Apply "Static" properties
+			// Verify the tag
+			tagSelector.ValidateTag(); //mxd
+			if((tagSelector.GetTag(0) < General.Map.FormatInterface.MinTag) || (tagSelector.GetTag(0) > General.Map.FormatInterface.MaxTag)) 
+			{
+				General.ShowWarningMessage("Sector tag must be between " + General.Map.FormatInterface.MinTag + " and " + General.Map.FormatInterface.MaxTag + ".", MessageBoxButtons.OK);
+				return;
+			}
+
+			// Verify the effect
+			if((effect.Value < General.Map.FormatInterface.MinEffect) || (effect.Value > General.Map.FormatInterface.MaxEffect)) 
+			{
+				General.ShowWarningMessage("Sector effect must be between " + General.Map.FormatInterface.MinEffect + " and " + General.Map.FormatInterface.MaxEffect + ".", MessageBoxButtons.OK);
+				return;
+			}
+
+			MakeUndo(); //mxd
+
+			// Go for all sectors
+			int tagoffset = 0; //mxd
+			foreach(Sector s in sectors) 
+			{
+				// Effects
+				if(!effect.Empty) s.Effect = effect.Value;
+
+				// Action
+				s.Tag = General.Clamp(tagSelector.GetSmartTag(s.Tag, tagoffset++), General.Map.FormatInterface.MinTag, General.Map.FormatInterface.MaxTag); //mxd
+			}
+
+			// Done
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null)	OnValuesChanged(this, EventArgs.Empty); //mxd
+			this.DialogResult = DialogResult.OK;
+			this.Close();
+		}
+
+		// Cancel clicked
+		private void cancel_Click(object sender, EventArgs e)
+		{
+			//mxd. perform undo
+			if(undocreated) General.Map.UndoRedo.WithdrawUndo();
+			
+			// And be gone
+			this.DialogResult = DialogResult.Cancel;
+			this.Close();
+		}
+
+
+		// Browse Effect clicked
+		private void browseeffect_Click(object sender, EventArgs e)
+		{
+			effect.Value = EffectBrowserForm.BrowseEffect(this, effect.Value);
+		}
+
+		//mxd
+		private void SectorEditForm_FormClosing(object sender, FormClosingEventArgs e) 
+		{
+			location = this.Location;
+		}
+
+		// Help
+		private void SectorEditForm_HelpRequested(object sender, HelpEventArgs hlpevent) 
+		{
+			General.ShowHelp("w_sectoredit.html");
+			hlpevent.Handled = true;
+		}
+
+		#endregion
+
+		#region ================== mxd. Realtime Events
+
+		// Ceiling height changes
+		private void ceilingheight_TextChanged(object sender, EventArgs e)
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+
+			UpdateCeilingHeight();
+			UpdateSectorHeight();
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		// Floor height changes
+		private void floorheight_TextChanged(object sender, EventArgs e)
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+
+			UpdateFloorHeight();
+			UpdateSectorHeight();
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		// Height offset changes
+		private void heightoffset_WhenTextChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+
+			UpdateFloorHeight();
+			UpdateCeilingHeight();
+			UpdateSectorHeight();
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void floortex_OnValueChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+
+			//restore values
+			if(string.IsNullOrEmpty(floortex.TextureName)) 
+			{
+				int i = 0;
+				foreach(Sector s in sectors) s.SetFloorTexture(sectorprops[i++].FloorTexture);
+			
+			} 
+			else //update values
+			{
+				foreach(Sector s in sectors) s.SetFloorTexture(floortex.GetResult(s.FloorTexture));
+			}
+
+			// Update the used textures
+			General.Map.Data.UpdateUsedTextures();
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void ceilingtex_OnValueChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+
+			//restore values
+			if(string.IsNullOrEmpty(ceilingtex.TextureName)) 
+			{
+				int i = 0;
+				foreach(Sector s in sectors) s.SetCeilTexture(sectorprops[i++].CeilTexture);
+			
+			} 
+			else //update values
+			{
+				foreach(Sector s in sectors) s.SetCeilTexture(ceilingtex.GetResult(s.CeilTexture));
+			}
+
+			// Update the used textures
+			General.Map.Data.UpdateUsedTextures();
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void brightness_WhenTextChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+			int i = 0;
+
+			//restore values
+			if(string.IsNullOrEmpty(brightness.Text)) 
+			{
+				foreach(Sector s in sectors) s.Brightness = sectorprops[i++].Brightness;
+			
+			} 
+			else //update values
+			{
+				foreach(Sector s in sectors)
+					s.Brightness = General.Clamp(brightness.GetResult(sectorprops[i++].Brightness), General.Map.FormatInterface.MinBrightness, General.Map.FormatInterface.MaxBrightness);
+			}
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		#endregion
+
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/SectorEditForm.resx b/Source/Core/Windows/SectorEditForm.resx
new file mode 100644
index 0000000..774e676
--- /dev/null
+++ b/Source/Core/Windows/SectorEditForm.resx
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="label1.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="label1.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label3.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="label3.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="groupeffect.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label8.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label9.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="groupfloorceiling.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label7.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="label5.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label6.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label2.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label4.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="flatSelectorControl2.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="flatSelectorControl1.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Windows/SectorEditFormUDMF.Designer.cs b/Source/Core/Windows/SectorEditFormUDMF.Designer.cs
new file mode 100644
index 0000000..a89c525
--- /dev/null
+++ b/Source/Core/Windows/SectorEditFormUDMF.Designer.cs
@@ -0,0 +1,1277 @@
+namespace CodeImp.DoomBuilder.Windows
+{
+	partial class SectorEditFormUDMF
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing) 
+		{
+			if(disposing && (components != null)) 
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent() 
+		{
+			this.components = new System.ComponentModel.Container();
+			System.Windows.Forms.GroupBox groupaction;
+			System.Windows.Forms.GroupBox groupeffect;
+			System.Windows.Forms.Label label14;
+			System.Windows.Forms.Label label9;
+			System.Windows.Forms.Label label13;
+			System.Windows.Forms.Label label2;
+			System.Windows.Forms.Label label8;
+			System.Windows.Forms.GroupBox groupfloorceiling;
+			System.Windows.Forms.Label label15;
+			System.Windows.Forms.Label label6;
+			System.Windows.Forms.Label label5;
+			this.tagsselector = new CodeImp.DoomBuilder.GZBuilder.Controls.TagsSelector();
+			this.soundsequence = new System.Windows.Forms.ComboBox();
+			this.resetsoundsequence = new System.Windows.Forms.Button();
+			this.fadeColor = new CodeImp.DoomBuilder.GZBuilder.Controls.ColorFieldsControl();
+			this.lightColor = new CodeImp.DoomBuilder.GZBuilder.Controls.ColorFieldsControl();
+			this.brightness = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.desaturation = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.gravity = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.browseeffect = new System.Windows.Forms.Button();
+			this.effect = new CodeImp.DoomBuilder.Controls.ActionSelectorControl();
+			this.heightoffset = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.ceilingheight = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.sectorheightlabel = new System.Windows.Forms.Label();
+			this.sectorheight = new System.Windows.Forms.Label();
+			this.floorheight = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.tabs = new System.Windows.Forms.TabControl();
+			this.tabproperties = new System.Windows.Forms.TabPage();
+			this.groupBox3 = new System.Windows.Forms.GroupBox();
+			this.flags = new CodeImp.DoomBuilder.Controls.CheckboxArrayControl();
+			this.tabSurfaces = new System.Windows.Forms.TabPage();
+			this.groupBox2 = new System.Windows.Forms.GroupBox();
+			this.resetfloorlight = new System.Windows.Forms.Button();
+			this.labelFloorOffsets = new System.Windows.Forms.Label();
+			this.labelFloorScale = new System.Windows.Forms.Label();
+			this.cbUseFloorLineAngles = new System.Windows.Forms.CheckBox();
+			this.floorAngleControl = new CodeImp.DoomBuilder.GZBuilder.Controls.AngleControl();
+			this.labelfloorrenderstyle = new System.Windows.Forms.Label();
+			this.label10 = new System.Windows.Forms.Label();
+			this.floorAlpha = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.label11 = new System.Windows.Forms.Label();
+			this.floorRotation = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.floorLightAbsolute = new System.Windows.Forms.CheckBox();
+			this.label12 = new System.Windows.Forms.Label();
+			this.floorBrightness = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.floorRenderStyle = new System.Windows.Forms.ComboBox();
+			this.floorScale = new CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl();
+			this.floorOffsets = new CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl();
+			this.floortex = new CodeImp.DoomBuilder.Controls.FlatSelectorControl();
+			this.groupBox1 = new System.Windows.Forms.GroupBox();
+			this.resetceillight = new System.Windows.Forms.Button();
+			this.labelCeilOffsets = new System.Windows.Forms.Label();
+			this.labelCeilScale = new System.Windows.Forms.Label();
+			this.cbUseCeilLineAngles = new System.Windows.Forms.CheckBox();
+			this.ceilAngleControl = new CodeImp.DoomBuilder.GZBuilder.Controls.AngleControl();
+			this.labelceilrenderstyle = new System.Windows.Forms.Label();
+			this.label4 = new System.Windows.Forms.Label();
+			this.ceilAlpha = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.label1 = new System.Windows.Forms.Label();
+			this.ceilRotation = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.ceilLightAbsolute = new System.Windows.Forms.CheckBox();
+			this.labelLightFront = new System.Windows.Forms.Label();
+			this.ceilBrightness = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.ceilRenderStyle = new System.Windows.Forms.ComboBox();
+			this.ceilScale = new CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl();
+			this.ceilOffsets = new CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl();
+			this.ceilingtex = new CodeImp.DoomBuilder.Controls.FlatSelectorControl();
+			this.tabslopes = new System.Windows.Forms.TabPage();
+			this.groupBox5 = new System.Windows.Forms.GroupBox();
+			this.floorslopecontrol = new CodeImp.DoomBuilder.Controls.SectorSlopeControl();
+			this.groupBox4 = new System.Windows.Forms.GroupBox();
+			this.ceilingslopecontrol = new CodeImp.DoomBuilder.Controls.SectorSlopeControl();
+			this.tabcomment = new System.Windows.Forms.TabPage();
+			this.commenteditor = new CodeImp.DoomBuilder.Controls.CommentEditor();
+			this.tabcustom = new System.Windows.Forms.TabPage();
+			this.fieldslist = new CodeImp.DoomBuilder.Controls.FieldsEditorControl();
+			this.cancel = new System.Windows.Forms.Button();
+			this.apply = new System.Windows.Forms.Button();
+			this.tooltip = new System.Windows.Forms.ToolTip(this.components);
+			groupaction = new System.Windows.Forms.GroupBox();
+			groupeffect = new System.Windows.Forms.GroupBox();
+			label14 = new System.Windows.Forms.Label();
+			label9 = new System.Windows.Forms.Label();
+			label13 = new System.Windows.Forms.Label();
+			label2 = new System.Windows.Forms.Label();
+			label8 = new System.Windows.Forms.Label();
+			groupfloorceiling = new System.Windows.Forms.GroupBox();
+			label15 = new System.Windows.Forms.Label();
+			label6 = new System.Windows.Forms.Label();
+			label5 = new System.Windows.Forms.Label();
+			groupaction.SuspendLayout();
+			groupeffect.SuspendLayout();
+			groupfloorceiling.SuspendLayout();
+			this.tabs.SuspendLayout();
+			this.tabproperties.SuspendLayout();
+			this.groupBox3.SuspendLayout();
+			this.tabSurfaces.SuspendLayout();
+			this.groupBox2.SuspendLayout();
+			this.groupBox1.SuspendLayout();
+			this.tabslopes.SuspendLayout();
+			this.groupBox5.SuspendLayout();
+			this.groupBox4.SuspendLayout();
+			this.tabcomment.SuspendLayout();
+			this.tabcustom.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// groupaction
+			// 
+			groupaction.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			groupaction.Controls.Add(this.tagsselector);
+			groupaction.Location = new System.Drawing.Point(7, 327);
+			groupaction.Name = "groupaction";
+			groupaction.Size = new System.Drawing.Size(490, 85);
+			groupaction.TabIndex = 2;
+			groupaction.TabStop = false;
+			groupaction.Text = " Identification ";
+			// 
+			// tagsselector
+			// 
+			this.tagsselector.Location = new System.Drawing.Point(6, 21);
+			this.tagsselector.Name = "tagsselector";
+			this.tagsselector.Size = new System.Drawing.Size(478, 60);
+			this.tagsselector.TabIndex = 0;
+			// 
+			// groupeffect
+			// 
+			groupeffect.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			groupeffect.Controls.Add(this.soundsequence);
+			groupeffect.Controls.Add(this.resetsoundsequence);
+			groupeffect.Controls.Add(this.fadeColor);
+			groupeffect.Controls.Add(this.lightColor);
+			groupeffect.Controls.Add(this.brightness);
+			groupeffect.Controls.Add(this.desaturation);
+			groupeffect.Controls.Add(label14);
+			groupeffect.Controls.Add(label9);
+			groupeffect.Controls.Add(label13);
+			groupeffect.Controls.Add(this.gravity);
+			groupeffect.Controls.Add(label2);
+			groupeffect.Controls.Add(this.browseeffect);
+			groupeffect.Controls.Add(this.effect);
+			groupeffect.Controls.Add(label8);
+			groupeffect.Location = new System.Drawing.Point(7, 160);
+			groupeffect.Name = "groupeffect";
+			groupeffect.Size = new System.Drawing.Size(490, 161);
+			groupeffect.TabIndex = 1;
+			groupeffect.TabStop = false;
+			groupeffect.Text = " Effects ";
+			// 
+			// soundsequence
+			// 
+			this.soundsequence.FormattingEnabled = true;
+			this.soundsequence.Location = new System.Drawing.Point(125, 54);
+			this.soundsequence.Name = "soundsequence";
+			this.soundsequence.Size = new System.Drawing.Size(325, 21);
+			this.soundsequence.TabIndex = 32;
+			this.soundsequence.MouseDown += new System.Windows.Forms.MouseEventHandler(this.soundsequence_MouseDown);
+			this.soundsequence.TextChanged += new System.EventHandler(this.soundsequence_TextChanged);
+			// 
+			// resetsoundsequence
+			// 
+			this.resetsoundsequence.Image = global::CodeImp.DoomBuilder.Properties.Resources.Reset;
+			this.resetsoundsequence.Location = new System.Drawing.Point(456, 52);
+			this.resetsoundsequence.Name = "resetsoundsequence";
+			this.resetsoundsequence.Size = new System.Drawing.Size(28, 25);
+			this.resetsoundsequence.TabIndex = 31;
+			this.resetsoundsequence.Text = " ";
+			this.resetsoundsequence.UseVisualStyleBackColor = true;
+			this.resetsoundsequence.Click += new System.EventHandler(this.resetsoundsequence_Click);
+			// 
+			// fadeColor
+			// 
+			this.fadeColor.DefaultValue = 0;
+			this.fadeColor.Field = "fadecolor";
+			this.fadeColor.Label = "Fade:";
+			this.fadeColor.Location = new System.Drawing.Point(241, 104);
+			this.fadeColor.Name = "fadeColor";
+			this.fadeColor.Size = new System.Drawing.Size(207, 31);
+			this.fadeColor.TabIndex = 30;
+			this.fadeColor.OnValueChanged += new System.EventHandler(this.fadeColor_OnValueChanged);
+			// 
+			// lightColor
+			// 
+			this.lightColor.DefaultValue = 16777215;
+			this.lightColor.Field = "lightcolor";
+			this.lightColor.Label = "Light:";
+			this.lightColor.Location = new System.Drawing.Point(241, 77);
+			this.lightColor.Name = "lightColor";
+			this.lightColor.Size = new System.Drawing.Size(207, 29);
+			this.lightColor.TabIndex = 29;
+			this.lightColor.OnValueChanged += new System.EventHandler(this.lightColor_OnValueChanged);
+			// 
+			// brightness
+			// 
+			this.brightness.AllowDecimal = false;
+			this.brightness.AllowNegative = false;
+			this.brightness.AllowRelative = true;
+			this.brightness.ButtonStep = 8;
+			this.brightness.ButtonStepBig = 16F;
+			this.brightness.ButtonStepFloat = 1F;
+			this.brightness.ButtonStepSmall = 1F;
+			this.brightness.ButtonStepsUseModifierKeys = true;
+			this.brightness.ButtonStepsWrapAround = false;
+			this.brightness.Location = new System.Drawing.Point(125, 79);
+			this.brightness.Name = "brightness";
+			this.brightness.Size = new System.Drawing.Size(81, 24);
+			this.brightness.StepValues = null;
+			this.brightness.TabIndex = 24;
+			this.brightness.WhenTextChanged += new System.EventHandler(this.brightness_WhenTextChanged);
+			// 
+			// desaturation
+			// 
+			this.desaturation.AllowDecimal = true;
+			this.desaturation.AllowNegative = false;
+			this.desaturation.AllowRelative = false;
+			this.desaturation.ButtonStep = 1;
+			this.desaturation.ButtonStepBig = 0.25F;
+			this.desaturation.ButtonStepFloat = 0.1F;
+			this.desaturation.ButtonStepSmall = 0.01F;
+			this.desaturation.ButtonStepsUseModifierKeys = true;
+			this.desaturation.ButtonStepsWrapAround = false;
+			this.desaturation.Location = new System.Drawing.Point(125, 131);
+			this.desaturation.Name = "desaturation";
+			this.desaturation.Size = new System.Drawing.Size(81, 24);
+			this.desaturation.StepValues = null;
+			this.desaturation.TabIndex = 28;
+			// 
+			// label14
+			// 
+			label14.AutoSize = true;
+			label14.Location = new System.Drawing.Point(27, 58);
+			label14.Name = "label14";
+			label14.Size = new System.Drawing.Size(91, 13);
+			label14.TabIndex = 3;
+			label14.Text = "Sound sequence:";
+			// 
+			// label9
+			// 
+			label9.AutoSize = true;
+			label9.Location = new System.Drawing.Point(57, 84);
+			label9.Name = "label9";
+			label9.Size = new System.Drawing.Size(59, 13);
+			label9.TabIndex = 2;
+			label9.Text = "Brightness:";
+			// 
+			// label13
+			// 
+			label13.Location = new System.Drawing.Point(45, 136);
+			label13.Name = "label13";
+			label13.Size = new System.Drawing.Size(74, 14);
+			label13.TabIndex = 27;
+			label13.Text = "Desaturation:";
+			label13.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// gravity
+			// 
+			this.gravity.AllowDecimal = true;
+			this.gravity.AllowNegative = true;
+			this.gravity.AllowRelative = true;
+			this.gravity.ButtonStep = 1;
+			this.gravity.ButtonStepBig = 1F;
+			this.gravity.ButtonStepFloat = 0.1F;
+			this.gravity.ButtonStepSmall = 0.01F;
+			this.gravity.ButtonStepsUseModifierKeys = true;
+			this.gravity.ButtonStepsWrapAround = false;
+			this.gravity.Location = new System.Drawing.Point(125, 105);
+			this.gravity.Name = "gravity";
+			this.gravity.Size = new System.Drawing.Size(81, 24);
+			this.gravity.StepValues = null;
+			this.gravity.TabIndex = 24;
+			// 
+			// label2
+			// 
+			label2.Location = new System.Drawing.Point(45, 110);
+			label2.Name = "label2";
+			label2.Size = new System.Drawing.Size(74, 14);
+			label2.TabIndex = 23;
+			label2.Text = "Gravity:";
+			label2.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// browseeffect
+			// 
+			this.browseeffect.Image = global::CodeImp.DoomBuilder.Properties.Resources.List;
+			this.browseeffect.Location = new System.Drawing.Point(456, 26);
+			this.browseeffect.Name = "browseeffect";
+			this.browseeffect.Size = new System.Drawing.Size(28, 25);
+			this.browseeffect.TabIndex = 1;
+			this.browseeffect.Text = " ";
+			this.browseeffect.UseVisualStyleBackColor = true;
+			this.browseeffect.Click += new System.EventHandler(this.browseeffect_Click);
+			// 
+			// effect
+			// 
+			this.effect.BackColor = System.Drawing.Color.Transparent;
+			this.effect.Cursor = System.Windows.Forms.Cursors.Default;
+			this.effect.Empty = false;
+			this.effect.GeneralizedCategories = null;
+			this.effect.GeneralizedOptions = null;
+			this.effect.Location = new System.Drawing.Point(68, 28);
+			this.effect.Name = "effect";
+			this.effect.Size = new System.Drawing.Size(382, 21);
+			this.effect.TabIndex = 0;
+			this.effect.Value = 402;
+			// 
+			// label8
+			// 
+			label8.AutoSize = true;
+			label8.Location = new System.Drawing.Point(17, 31);
+			label8.Name = "label8";
+			label8.Size = new System.Drawing.Size(45, 13);
+			label8.TabIndex = 0;
+			label8.Text = "Special:";
+			// 
+			// groupfloorceiling
+			// 
+			groupfloorceiling.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			groupfloorceiling.Controls.Add(label15);
+			groupfloorceiling.Controls.Add(label6);
+			groupfloorceiling.Controls.Add(label5);
+			groupfloorceiling.Controls.Add(this.heightoffset);
+			groupfloorceiling.Controls.Add(this.ceilingheight);
+			groupfloorceiling.Controls.Add(this.sectorheightlabel);
+			groupfloorceiling.Controls.Add(this.sectorheight);
+			groupfloorceiling.Controls.Add(this.floorheight);
+			groupfloorceiling.Location = new System.Drawing.Point(7, 6);
+			groupfloorceiling.Name = "groupfloorceiling";
+			groupfloorceiling.Size = new System.Drawing.Size(188, 148);
+			groupfloorceiling.TabIndex = 0;
+			groupfloorceiling.TabStop = false;
+			groupfloorceiling.Text = " Heights ";
+			// 
+			// label15
+			// 
+			label15.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			label15.ForeColor = System.Drawing.SystemColors.HotTrack;
+			label15.Location = new System.Drawing.Point(9, 84);
+			label15.Name = "label15";
+			label15.Size = new System.Drawing.Size(74, 14);
+			label15.TabIndex = 27;
+			label15.Text = "Height offset:";
+			label15.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			this.tooltip.SetToolTip(label15, "Changes floor and ceiling height by given value.\r\nUse \"++\" to raise by sector hei" +
+					"ght.\r\nUse \"--\" to lower by sector height.");
+			// 
+			// label6
+			// 
+			label6.Location = new System.Drawing.Point(9, 24);
+			label6.Name = "label6";
+			label6.Size = new System.Drawing.Size(74, 14);
+			label6.TabIndex = 19;
+			label6.Text = "Ceiling height:";
+			label6.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// label5
+			// 
+			label5.Location = new System.Drawing.Point(9, 54);
+			label5.Name = "label5";
+			label5.Size = new System.Drawing.Size(74, 14);
+			label5.TabIndex = 17;
+			label5.Text = "Floor height:";
+			label5.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// heightoffset
+			// 
+			this.heightoffset.AllowDecimal = false;
+			this.heightoffset.AllowNegative = true;
+			this.heightoffset.AllowRelative = true;
+			this.heightoffset.ButtonStep = 8;
+			this.heightoffset.ButtonStepBig = 16F;
+			this.heightoffset.ButtonStepFloat = 1F;
+			this.heightoffset.ButtonStepSmall = 1F;
+			this.heightoffset.ButtonStepsUseModifierKeys = true;
+			this.heightoffset.ButtonStepsWrapAround = false;
+			this.heightoffset.Location = new System.Drawing.Point(89, 79);
+			this.heightoffset.Name = "heightoffset";
+			this.heightoffset.Size = new System.Drawing.Size(88, 24);
+			this.heightoffset.StepValues = null;
+			this.heightoffset.TabIndex = 28;
+			this.heightoffset.WhenTextChanged += new System.EventHandler(this.heightoffset_WhenTextChanged);
+			// 
+			// ceilingheight
+			// 
+			this.ceilingheight.AllowDecimal = false;
+			this.ceilingheight.AllowNegative = true;
+			this.ceilingheight.AllowRelative = true;
+			this.ceilingheight.ButtonStep = 8;
+			this.ceilingheight.ButtonStepBig = 16F;
+			this.ceilingheight.ButtonStepFloat = 1F;
+			this.ceilingheight.ButtonStepSmall = 1F;
+			this.ceilingheight.ButtonStepsUseModifierKeys = true;
+			this.ceilingheight.ButtonStepsWrapAround = false;
+			this.ceilingheight.Location = new System.Drawing.Point(89, 19);
+			this.ceilingheight.Name = "ceilingheight";
+			this.ceilingheight.Size = new System.Drawing.Size(88, 24);
+			this.ceilingheight.StepValues = null;
+			this.ceilingheight.TabIndex = 22;
+			this.ceilingheight.WhenTextChanged += new System.EventHandler(this.ceilingheight_WhenTextChanged);
+			// 
+			// sectorheightlabel
+			// 
+			this.sectorheightlabel.Location = new System.Drawing.Point(9, 114);
+			this.sectorheightlabel.Name = "sectorheightlabel";
+			this.sectorheightlabel.Size = new System.Drawing.Size(74, 14);
+			this.sectorheightlabel.TabIndex = 20;
+			this.sectorheightlabel.Text = "Sector height:";
+			this.sectorheightlabel.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// sectorheight
+			// 
+			this.sectorheight.AutoSize = true;
+			this.sectorheight.Location = new System.Drawing.Point(90, 114);
+			this.sectorheight.Name = "sectorheight";
+			this.sectorheight.Size = new System.Drawing.Size(13, 13);
+			this.sectorheight.TabIndex = 21;
+			this.sectorheight.Text = "0";
+			// 
+			// floorheight
+			// 
+			this.floorheight.AllowDecimal = false;
+			this.floorheight.AllowNegative = true;
+			this.floorheight.AllowRelative = true;
+			this.floorheight.ButtonStep = 8;
+			this.floorheight.ButtonStepBig = 16F;
+			this.floorheight.ButtonStepFloat = 1F;
+			this.floorheight.ButtonStepSmall = 1F;
+			this.floorheight.ButtonStepsUseModifierKeys = true;
+			this.floorheight.ButtonStepsWrapAround = false;
+			this.floorheight.Location = new System.Drawing.Point(89, 49);
+			this.floorheight.Name = "floorheight";
+			this.floorheight.Size = new System.Drawing.Size(88, 24);
+			this.floorheight.StepValues = null;
+			this.floorheight.TabIndex = 23;
+			this.floorheight.WhenTextChanged += new System.EventHandler(this.floorheight_WhenTextChanged);
+			// 
+			// tabs
+			// 
+			this.tabs.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.tabs.Controls.Add(this.tabproperties);
+			this.tabs.Controls.Add(this.tabSurfaces);
+			this.tabs.Controls.Add(this.tabslopes);
+			this.tabs.Controls.Add(this.tabcomment);
+			this.tabs.Controls.Add(this.tabcustom);
+			this.tabs.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.tabs.Location = new System.Drawing.Point(10, 10);
+			this.tabs.Margin = new System.Windows.Forms.Padding(1);
+			this.tabs.Name = "tabs";
+			this.tabs.Padding = new System.Drawing.Point(24, 3);
+			this.tabs.SelectedIndex = 0;
+			this.tabs.Size = new System.Drawing.Size(511, 445);
+			this.tabs.TabIndex = 1;
+			// 
+			// tabproperties
+			// 
+			this.tabproperties.Controls.Add(this.groupBox3);
+			this.tabproperties.Controls.Add(groupaction);
+			this.tabproperties.Controls.Add(groupeffect);
+			this.tabproperties.Controls.Add(groupfloorceiling);
+			this.tabproperties.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.tabproperties.Location = new System.Drawing.Point(4, 22);
+			this.tabproperties.Name = "tabproperties";
+			this.tabproperties.Padding = new System.Windows.Forms.Padding(3);
+			this.tabproperties.Size = new System.Drawing.Size(503, 419);
+			this.tabproperties.TabIndex = 0;
+			this.tabproperties.Text = "Properties";
+			this.tabproperties.UseVisualStyleBackColor = true;
+			// 
+			// groupBox3
+			// 
+			this.groupBox3.Controls.Add(this.flags);
+			this.groupBox3.Location = new System.Drawing.Point(201, 6);
+			this.groupBox3.Name = "groupBox3";
+			this.groupBox3.Size = new System.Drawing.Size(296, 148);
+			this.groupBox3.TabIndex = 3;
+			this.groupBox3.TabStop = false;
+			this.groupBox3.Text = " Flags ";
+			// 
+			// flags
+			// 
+			this.flags.AutoScroll = true;
+			this.flags.Columns = 1;
+			this.flags.Location = new System.Drawing.Point(15, 21);
+			this.flags.Name = "flags";
+			this.flags.Size = new System.Drawing.Size(275, 121);
+			this.flags.TabIndex = 5;
+			this.flags.VerticalSpacing = 2;
+			// 
+			// tabSurfaces
+			// 
+			this.tabSurfaces.Controls.Add(this.groupBox2);
+			this.tabSurfaces.Controls.Add(this.groupBox1);
+			this.tabSurfaces.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.tabSurfaces.Location = new System.Drawing.Point(4, 22);
+			this.tabSurfaces.Name = "tabSurfaces";
+			this.tabSurfaces.Size = new System.Drawing.Size(503, 419);
+			this.tabSurfaces.TabIndex = 2;
+			this.tabSurfaces.Text = "Surfaces";
+			this.tabSurfaces.UseVisualStyleBackColor = true;
+			// 
+			// groupBox2
+			// 
+			this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.groupBox2.Controls.Add(this.resetfloorlight);
+			this.groupBox2.Controls.Add(this.labelFloorOffsets);
+			this.groupBox2.Controls.Add(this.labelFloorScale);
+			this.groupBox2.Controls.Add(this.cbUseFloorLineAngles);
+			this.groupBox2.Controls.Add(this.floorAngleControl);
+			this.groupBox2.Controls.Add(this.labelfloorrenderstyle);
+			this.groupBox2.Controls.Add(this.label10);
+			this.groupBox2.Controls.Add(this.floorAlpha);
+			this.groupBox2.Controls.Add(this.label11);
+			this.groupBox2.Controls.Add(this.floorRotation);
+			this.groupBox2.Controls.Add(this.floorLightAbsolute);
+			this.groupBox2.Controls.Add(this.label12);
+			this.groupBox2.Controls.Add(this.floorBrightness);
+			this.groupBox2.Controls.Add(this.floorRenderStyle);
+			this.groupBox2.Controls.Add(this.floorScale);
+			this.groupBox2.Controls.Add(this.floorOffsets);
+			this.groupBox2.Controls.Add(this.floortex);
+			this.groupBox2.Location = new System.Drawing.Point(3, 212);
+			this.groupBox2.Name = "groupBox2";
+			this.groupBox2.Size = new System.Drawing.Size(497, 203);
+			this.groupBox2.TabIndex = 55;
+			this.groupBox2.TabStop = false;
+			this.groupBox2.Text = " Floor ";
+			// 
+			// resetfloorlight
+			// 
+			this.resetfloorlight.Image = global::CodeImp.DoomBuilder.Properties.Resources.Reset;
+			this.resetfloorlight.Location = new System.Drawing.Point(246, 114);
+			this.resetfloorlight.Name = "resetfloorlight";
+			this.resetfloorlight.Size = new System.Drawing.Size(23, 23);
+			this.resetfloorlight.TabIndex = 60;
+			this.tooltip.SetToolTip(this.resetfloorlight, "Reset Floor Brightness");
+			this.resetfloorlight.UseVisualStyleBackColor = true;
+			this.resetfloorlight.Click += new System.EventHandler(this.resetfloorlight_Click);
+			// 
+			// labelFloorOffsets
+			// 
+			this.labelFloorOffsets.Location = new System.Drawing.Point(6, 27);
+			this.labelFloorOffsets.Name = "labelFloorOffsets";
+			this.labelFloorOffsets.Size = new System.Drawing.Size(98, 14);
+			this.labelFloorOffsets.TabIndex = 59;
+			this.labelFloorOffsets.Tag = "";
+			this.labelFloorOffsets.Text = "Texture Offsets:";
+			this.labelFloorOffsets.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// labelFloorScale
+			// 
+			this.labelFloorScale.Location = new System.Drawing.Point(9, 59);
+			this.labelFloorScale.Name = "labelFloorScale";
+			this.labelFloorScale.Size = new System.Drawing.Size(95, 14);
+			this.labelFloorScale.TabIndex = 58;
+			this.labelFloorScale.Tag = "";
+			this.labelFloorScale.Text = "Texture Scale:";
+			this.labelFloorScale.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// cbUseFloorLineAngles
+			// 
+			this.cbUseFloorLineAngles.AutoSize = true;
+			this.cbUseFloorLineAngles.Location = new System.Drawing.Point(181, 148);
+			this.cbUseFloorLineAngles.Name = "cbUseFloorLineAngles";
+			this.cbUseFloorLineAngles.Size = new System.Drawing.Size(113, 17);
+			this.cbUseFloorLineAngles.TabIndex = 57;
+			this.cbUseFloorLineAngles.Tag = "";
+			this.cbUseFloorLineAngles.Text = "Use linedef angles";
+			this.cbUseFloorLineAngles.UseVisualStyleBackColor = true;
+			this.cbUseFloorLineAngles.CheckedChanged += new System.EventHandler(this.cbUseFloorLineAngles_CheckedChanged);
+			// 
+			// floorAngleControl
+			// 
+			this.floorAngleControl.Angle = -450;
+			this.floorAngleControl.AngleOffset = 90;
+			this.floorAngleControl.Location = new System.Drawing.Point(6, 132);
+			this.floorAngleControl.Name = "floorAngleControl";
+			this.floorAngleControl.Size = new System.Drawing.Size(44, 44);
+			this.floorAngleControl.TabIndex = 56;
+			this.floorAngleControl.AngleChanged += new System.EventHandler(this.floorAngleControl_AngleChanged);
+			// 
+			// labelfloorrenderstyle
+			// 
+			this.labelfloorrenderstyle.Location = new System.Drawing.Point(24, 88);
+			this.labelfloorrenderstyle.Name = "labelfloorrenderstyle";
+			this.labelfloorrenderstyle.Size = new System.Drawing.Size(80, 14);
+			this.labelfloorrenderstyle.TabIndex = 54;
+			this.labelfloorrenderstyle.Tag = "";
+			this.labelfloorrenderstyle.Text = "Render style:";
+			this.labelfloorrenderstyle.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// label10
+			// 
+			this.label10.Location = new System.Drawing.Point(24, 178);
+			this.label10.Name = "label10";
+			this.label10.Size = new System.Drawing.Size(80, 14);
+			this.label10.TabIndex = 52;
+			this.label10.Tag = "";
+			this.label10.Text = "Alpha:";
+			this.label10.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// floorAlpha
+			// 
+			this.floorAlpha.AllowDecimal = true;
+			this.floorAlpha.AllowNegative = false;
+			this.floorAlpha.AllowRelative = false;
+			this.floorAlpha.ButtonStep = 1;
+			this.floorAlpha.ButtonStepBig = 0.25F;
+			this.floorAlpha.ButtonStepFloat = 0.1F;
+			this.floorAlpha.ButtonStepSmall = 0.01F;
+			this.floorAlpha.ButtonStepsUseModifierKeys = true;
+			this.floorAlpha.ButtonStepsWrapAround = false;
+			this.floorAlpha.Location = new System.Drawing.Point(113, 173);
+			this.floorAlpha.Name = "floorAlpha";
+			this.floorAlpha.Size = new System.Drawing.Size(62, 24);
+			this.floorAlpha.StepValues = null;
+			this.floorAlpha.TabIndex = 53;
+			this.floorAlpha.Tag = "";
+			// 
+			// label11
+			// 
+			this.label11.Location = new System.Drawing.Point(24, 148);
+			this.label11.Name = "label11";
+			this.label11.Size = new System.Drawing.Size(80, 14);
+			this.label11.TabIndex = 50;
+			this.label11.Tag = "";
+			this.label11.Text = "Rotation:";
+			this.label11.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// floorRotation
+			// 
+			this.floorRotation.AllowDecimal = true;
+			this.floorRotation.AllowNegative = true;
+			this.floorRotation.AllowRelative = true;
+			this.floorRotation.ButtonStep = 5;
+			this.floorRotation.ButtonStepBig = 15F;
+			this.floorRotation.ButtonStepFloat = 1F;
+			this.floorRotation.ButtonStepSmall = 0.1F;
+			this.floorRotation.ButtonStepsUseModifierKeys = true;
+			this.floorRotation.ButtonStepsWrapAround = false;
+			this.floorRotation.Location = new System.Drawing.Point(113, 143);
+			this.floorRotation.Name = "floorRotation";
+			this.floorRotation.Size = new System.Drawing.Size(62, 24);
+			this.floorRotation.StepValues = null;
+			this.floorRotation.TabIndex = 51;
+			this.floorRotation.Tag = "";
+			this.floorRotation.WhenTextChanged += new System.EventHandler(this.floorRotation_WhenTextChanged);
+			// 
+			// floorLightAbsolute
+			// 
+			this.floorLightAbsolute.AutoSize = true;
+			this.floorLightAbsolute.Location = new System.Drawing.Point(181, 118);
+			this.floorLightAbsolute.Name = "floorLightAbsolute";
+			this.floorLightAbsolute.Size = new System.Drawing.Size(67, 17);
+			this.floorLightAbsolute.TabIndex = 49;
+			this.floorLightAbsolute.Text = "Absolute";
+			this.floorLightAbsolute.UseVisualStyleBackColor = true;
+			this.floorLightAbsolute.CheckedChanged += new System.EventHandler(this.floorLightAbsolute_CheckedChanged);
+			// 
+			// label12
+			// 
+			this.label12.Location = new System.Drawing.Point(24, 118);
+			this.label12.Name = "label12";
+			this.label12.Size = new System.Drawing.Size(80, 14);
+			this.label12.TabIndex = 47;
+			this.label12.Tag = "";
+			this.label12.Text = "Brightness:";
+			this.label12.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// floorBrightness
+			// 
+			this.floorBrightness.AllowDecimal = false;
+			this.floorBrightness.AllowNegative = true;
+			this.floorBrightness.AllowRelative = true;
+			this.floorBrightness.ButtonStep = 16;
+			this.floorBrightness.ButtonStepBig = 32F;
+			this.floorBrightness.ButtonStepFloat = 1F;
+			this.floorBrightness.ButtonStepSmall = 1F;
+			this.floorBrightness.ButtonStepsUseModifierKeys = true;
+			this.floorBrightness.ButtonStepsWrapAround = false;
+			this.floorBrightness.Location = new System.Drawing.Point(113, 113);
+			this.floorBrightness.Name = "floorBrightness";
+			this.floorBrightness.Size = new System.Drawing.Size(62, 24);
+			this.floorBrightness.StepValues = null;
+			this.floorBrightness.TabIndex = 48;
+			this.floorBrightness.Tag = "lightfloor";
+			this.floorBrightness.WhenTextChanged += new System.EventHandler(this.floorBrightness_WhenTextChanged);
+			// 
+			// floorRenderStyle
+			// 
+			this.floorRenderStyle.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.floorRenderStyle.FormattingEnabled = true;
+			this.floorRenderStyle.Location = new System.Drawing.Point(113, 85);
+			this.floorRenderStyle.Name = "floorRenderStyle";
+			this.floorRenderStyle.Size = new System.Drawing.Size(130, 21);
+			this.floorRenderStyle.TabIndex = 46;
+			// 
+			// floorScale
+			// 
+			this.floorScale.AllowDecimal = true;
+			this.floorScale.AllowValueLinking = true;
+			this.floorScale.ButtonStep = 1;
+			this.floorScale.ButtonStepBig = 1F;
+			this.floorScale.ButtonStepFloat = 0.1F;
+			this.floorScale.ButtonStepSmall = 0.01F;
+			this.floorScale.ButtonStepsUseModifierKeys = true;
+			this.floorScale.DefaultValue = 1F;
+			this.floorScale.Field1 = "xscalefloor";
+			this.floorScale.Field2 = "yscalefloor";
+			this.floorScale.LinkValues = false;
+			this.floorScale.Location = new System.Drawing.Point(110, 53);
+			this.floorScale.Name = "floorScale";
+			this.floorScale.Size = new System.Drawing.Size(186, 26);
+			this.floorScale.TabIndex = 17;
+			this.floorScale.OnValuesChanged += new System.EventHandler(this.floorScale_OnValuesChanged);
+			// 
+			// floorOffsets
+			// 
+			this.floorOffsets.AllowDecimal = true;
+			this.floorOffsets.AllowValueLinking = false;
+			this.floorOffsets.ButtonStep = 1;
+			this.floorOffsets.ButtonStepBig = 32F;
+			this.floorOffsets.ButtonStepFloat = 16F;
+			this.floorOffsets.ButtonStepSmall = 1F;
+			this.floorOffsets.ButtonStepsUseModifierKeys = true;
+			this.floorOffsets.DefaultValue = 0F;
+			this.floorOffsets.Field1 = "xpanningfloor";
+			this.floorOffsets.Field2 = "ypanningfloor";
+			this.floorOffsets.LinkValues = false;
+			this.floorOffsets.Location = new System.Drawing.Point(110, 21);
+			this.floorOffsets.Name = "floorOffsets";
+			this.floorOffsets.Size = new System.Drawing.Size(186, 26);
+			this.floorOffsets.TabIndex = 16;
+			this.floorOffsets.OnValuesChanged += new System.EventHandler(this.floorOffsets_OnValuesChanged);
+			// 
+			// floortex
+			// 
+			this.floortex.Location = new System.Drawing.Point(300, 13);
+			this.floortex.MultipleTextures = false;
+			this.floortex.Name = "floortex";
+			this.floortex.Size = new System.Drawing.Size(190, 184);
+			this.floortex.TabIndex = 15;
+			this.floortex.TextureName = "";
+			this.floortex.UsePreviews = false;
+			this.floortex.OnValueChanged += new System.EventHandler(this.floortex_OnValueChanged);
+			// 
+			// groupBox1
+			// 
+			this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.groupBox1.Controls.Add(this.resetceillight);
+			this.groupBox1.Controls.Add(this.labelCeilOffsets);
+			this.groupBox1.Controls.Add(this.labelCeilScale);
+			this.groupBox1.Controls.Add(this.cbUseCeilLineAngles);
+			this.groupBox1.Controls.Add(this.ceilAngleControl);
+			this.groupBox1.Controls.Add(this.labelceilrenderstyle);
+			this.groupBox1.Controls.Add(this.label4);
+			this.groupBox1.Controls.Add(this.ceilAlpha);
+			this.groupBox1.Controls.Add(this.label1);
+			this.groupBox1.Controls.Add(this.ceilRotation);
+			this.groupBox1.Controls.Add(this.ceilLightAbsolute);
+			this.groupBox1.Controls.Add(this.labelLightFront);
+			this.groupBox1.Controls.Add(this.ceilBrightness);
+			this.groupBox1.Controls.Add(this.ceilRenderStyle);
+			this.groupBox1.Controls.Add(this.ceilScale);
+			this.groupBox1.Controls.Add(this.ceilOffsets);
+			this.groupBox1.Controls.Add(this.ceilingtex);
+			this.groupBox1.Location = new System.Drawing.Point(3, 3);
+			this.groupBox1.Name = "groupBox1";
+			this.groupBox1.Size = new System.Drawing.Size(497, 203);
+			this.groupBox1.TabIndex = 0;
+			this.groupBox1.TabStop = false;
+			this.groupBox1.Text = " Ceiling ";
+			// 
+			// resetceillight
+			// 
+			this.resetceillight.Image = global::CodeImp.DoomBuilder.Properties.Resources.Reset;
+			this.resetceillight.Location = new System.Drawing.Point(246, 114);
+			this.resetceillight.Name = "resetceillight";
+			this.resetceillight.Size = new System.Drawing.Size(23, 23);
+			this.resetceillight.TabIndex = 62;
+			this.tooltip.SetToolTip(this.resetceillight, "Reset Ceiling Brightness");
+			this.resetceillight.UseVisualStyleBackColor = true;
+			this.resetceillight.Click += new System.EventHandler(this.resetceillight_Click);
+			// 
+			// labelCeilOffsets
+			// 
+			this.labelCeilOffsets.Location = new System.Drawing.Point(6, 27);
+			this.labelCeilOffsets.Name = "labelCeilOffsets";
+			this.labelCeilOffsets.Size = new System.Drawing.Size(98, 14);
+			this.labelCeilOffsets.TabIndex = 61;
+			this.labelCeilOffsets.Tag = "";
+			this.labelCeilOffsets.Text = "Texture Offsets:";
+			this.labelCeilOffsets.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// labelCeilScale
+			// 
+			this.labelCeilScale.Location = new System.Drawing.Point(9, 59);
+			this.labelCeilScale.Name = "labelCeilScale";
+			this.labelCeilScale.Size = new System.Drawing.Size(95, 14);
+			this.labelCeilScale.TabIndex = 60;
+			this.labelCeilScale.Tag = "";
+			this.labelCeilScale.Text = "Texture Scale:";
+			this.labelCeilScale.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// cbUseCeilLineAngles
+			// 
+			this.cbUseCeilLineAngles.AutoSize = true;
+			this.cbUseCeilLineAngles.Location = new System.Drawing.Point(181, 148);
+			this.cbUseCeilLineAngles.Name = "cbUseCeilLineAngles";
+			this.cbUseCeilLineAngles.Size = new System.Drawing.Size(113, 17);
+			this.cbUseCeilLineAngles.TabIndex = 56;
+			this.cbUseCeilLineAngles.Tag = "";
+			this.cbUseCeilLineAngles.Text = "Use linedef angles";
+			this.cbUseCeilLineAngles.UseVisualStyleBackColor = true;
+			this.cbUseCeilLineAngles.CheckedChanged += new System.EventHandler(this.cbUseCeilLineAngles_CheckedChanged);
+			// 
+			// ceilAngleControl
+			// 
+			this.ceilAngleControl.Angle = -450;
+			this.ceilAngleControl.AngleOffset = 90;
+			this.ceilAngleControl.Location = new System.Drawing.Point(6, 132);
+			this.ceilAngleControl.Name = "ceilAngleControl";
+			this.ceilAngleControl.Size = new System.Drawing.Size(44, 44);
+			this.ceilAngleControl.TabIndex = 55;
+			this.ceilAngleControl.AngleChanged += new System.EventHandler(this.ceilAngleControl_AngleChanged);
+			// 
+			// labelceilrenderstyle
+			// 
+			this.labelceilrenderstyle.Location = new System.Drawing.Point(24, 88);
+			this.labelceilrenderstyle.Name = "labelceilrenderstyle";
+			this.labelceilrenderstyle.Size = new System.Drawing.Size(80, 14);
+			this.labelceilrenderstyle.TabIndex = 54;
+			this.labelceilrenderstyle.Tag = "";
+			this.labelceilrenderstyle.Text = "Render style:";
+			this.labelceilrenderstyle.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// label4
+			// 
+			this.label4.Location = new System.Drawing.Point(24, 178);
+			this.label4.Name = "label4";
+			this.label4.Size = new System.Drawing.Size(80, 14);
+			this.label4.TabIndex = 52;
+			this.label4.Tag = "";
+			this.label4.Text = "Alpha:";
+			this.label4.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// ceilAlpha
+			// 
+			this.ceilAlpha.AllowDecimal = true;
+			this.ceilAlpha.AllowNegative = false;
+			this.ceilAlpha.AllowRelative = false;
+			this.ceilAlpha.ButtonStep = 1;
+			this.ceilAlpha.ButtonStepBig = 0.25F;
+			this.ceilAlpha.ButtonStepFloat = 0.1F;
+			this.ceilAlpha.ButtonStepSmall = 0.01F;
+			this.ceilAlpha.ButtonStepsUseModifierKeys = true;
+			this.ceilAlpha.ButtonStepsWrapAround = false;
+			this.ceilAlpha.Location = new System.Drawing.Point(113, 173);
+			this.ceilAlpha.Name = "ceilAlpha";
+			this.ceilAlpha.Size = new System.Drawing.Size(62, 24);
+			this.ceilAlpha.StepValues = null;
+			this.ceilAlpha.TabIndex = 53;
+			this.ceilAlpha.Tag = "";
+			// 
+			// label1
+			// 
+			this.label1.Location = new System.Drawing.Point(24, 148);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(80, 14);
+			this.label1.TabIndex = 50;
+			this.label1.Tag = "";
+			this.label1.Text = "Rotation:";
+			this.label1.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// ceilRotation
+			// 
+			this.ceilRotation.AllowDecimal = true;
+			this.ceilRotation.AllowNegative = true;
+			this.ceilRotation.AllowRelative = true;
+			this.ceilRotation.ButtonStep = 5;
+			this.ceilRotation.ButtonStepBig = 15F;
+			this.ceilRotation.ButtonStepFloat = 1F;
+			this.ceilRotation.ButtonStepSmall = 0.1F;
+			this.ceilRotation.ButtonStepsUseModifierKeys = true;
+			this.ceilRotation.ButtonStepsWrapAround = true;
+			this.ceilRotation.Location = new System.Drawing.Point(113, 143);
+			this.ceilRotation.Name = "ceilRotation";
+			this.ceilRotation.Size = new System.Drawing.Size(62, 24);
+			this.ceilRotation.StepValues = null;
+			this.ceilRotation.TabIndex = 51;
+			this.ceilRotation.Tag = "";
+			this.ceilRotation.WhenTextChanged += new System.EventHandler(this.ceilRotation_WhenTextChanged);
+			// 
+			// ceilLightAbsolute
+			// 
+			this.ceilLightAbsolute.AutoSize = true;
+			this.ceilLightAbsolute.Location = new System.Drawing.Point(181, 118);
+			this.ceilLightAbsolute.Name = "ceilLightAbsolute";
+			this.ceilLightAbsolute.Size = new System.Drawing.Size(67, 17);
+			this.ceilLightAbsolute.TabIndex = 49;
+			this.ceilLightAbsolute.Tag = "";
+			this.ceilLightAbsolute.Text = "Absolute";
+			this.ceilLightAbsolute.UseVisualStyleBackColor = true;
+			this.ceilLightAbsolute.CheckedChanged += new System.EventHandler(this.ceilLightAbsolute_CheckedChanged);
+			// 
+			// labelLightFront
+			// 
+			this.labelLightFront.Location = new System.Drawing.Point(24, 118);
+			this.labelLightFront.Name = "labelLightFront";
+			this.labelLightFront.Size = new System.Drawing.Size(80, 14);
+			this.labelLightFront.TabIndex = 47;
+			this.labelLightFront.Tag = "";
+			this.labelLightFront.Text = "Brightness:";
+			this.labelLightFront.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// ceilBrightness
+			// 
+			this.ceilBrightness.AllowDecimal = false;
+			this.ceilBrightness.AllowNegative = true;
+			this.ceilBrightness.AllowRelative = true;
+			this.ceilBrightness.ButtonStep = 16;
+			this.ceilBrightness.ButtonStepBig = 32F;
+			this.ceilBrightness.ButtonStepFloat = 1F;
+			this.ceilBrightness.ButtonStepSmall = 1F;
+			this.ceilBrightness.ButtonStepsUseModifierKeys = true;
+			this.ceilBrightness.ButtonStepsWrapAround = false;
+			this.ceilBrightness.Location = new System.Drawing.Point(113, 113);
+			this.ceilBrightness.Name = "ceilBrightness";
+			this.ceilBrightness.Size = new System.Drawing.Size(62, 24);
+			this.ceilBrightness.StepValues = null;
+			this.ceilBrightness.TabIndex = 48;
+			this.ceilBrightness.Tag = "lightceiling";
+			this.ceilBrightness.WhenTextChanged += new System.EventHandler(this.ceilBrightness_WhenTextChanged);
+			// 
+			// ceilRenderStyle
+			// 
+			this.ceilRenderStyle.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.ceilRenderStyle.FormattingEnabled = true;
+			this.ceilRenderStyle.Location = new System.Drawing.Point(113, 85);
+			this.ceilRenderStyle.Name = "ceilRenderStyle";
+			this.ceilRenderStyle.Size = new System.Drawing.Size(130, 21);
+			this.ceilRenderStyle.TabIndex = 46;
+			// 
+			// ceilScale
+			// 
+			this.ceilScale.AllowDecimal = true;
+			this.ceilScale.AllowValueLinking = true;
+			this.ceilScale.ButtonStep = 1;
+			this.ceilScale.ButtonStepBig = 1F;
+			this.ceilScale.ButtonStepFloat = 0.1F;
+			this.ceilScale.ButtonStepSmall = 0.01F;
+			this.ceilScale.ButtonStepsUseModifierKeys = true;
+			this.ceilScale.DefaultValue = 1F;
+			this.ceilScale.Field1 = "xscaleceiling";
+			this.ceilScale.Field2 = "yscaleceiling";
+			this.ceilScale.LinkValues = false;
+			this.ceilScale.Location = new System.Drawing.Point(110, 53);
+			this.ceilScale.Name = "ceilScale";
+			this.ceilScale.Size = new System.Drawing.Size(186, 26);
+			this.ceilScale.TabIndex = 17;
+			this.ceilScale.OnValuesChanged += new System.EventHandler(this.ceilScale_OnValuesChanged);
+			// 
+			// ceilOffsets
+			// 
+			this.ceilOffsets.AllowDecimal = true;
+			this.ceilOffsets.AllowValueLinking = false;
+			this.ceilOffsets.ButtonStep = 1;
+			this.ceilOffsets.ButtonStepBig = 32F;
+			this.ceilOffsets.ButtonStepFloat = 16F;
+			this.ceilOffsets.ButtonStepSmall = 1F;
+			this.ceilOffsets.ButtonStepsUseModifierKeys = true;
+			this.ceilOffsets.DefaultValue = 0F;
+			this.ceilOffsets.Field1 = "xpanningceiling";
+			this.ceilOffsets.Field2 = "ypanningceiling";
+			this.ceilOffsets.LinkValues = false;
+			this.ceilOffsets.Location = new System.Drawing.Point(110, 21);
+			this.ceilOffsets.Name = "ceilOffsets";
+			this.ceilOffsets.Size = new System.Drawing.Size(186, 26);
+			this.ceilOffsets.TabIndex = 16;
+			this.ceilOffsets.OnValuesChanged += new System.EventHandler(this.ceilOffsets_OnValuesChanged);
+			// 
+			// ceilingtex
+			// 
+			this.ceilingtex.Location = new System.Drawing.Point(300, 13);
+			this.ceilingtex.MultipleTextures = false;
+			this.ceilingtex.Name = "ceilingtex";
+			this.ceilingtex.Size = new System.Drawing.Size(190, 184);
+			this.ceilingtex.TabIndex = 15;
+			this.ceilingtex.TextureName = "";
+			this.ceilingtex.UsePreviews = false;
+			this.ceilingtex.OnValueChanged += new System.EventHandler(this.ceilingtex_OnValueChanged);
+			// 
+			// tabslopes
+			// 
+			this.tabslopes.Controls.Add(this.groupBox5);
+			this.tabslopes.Controls.Add(this.groupBox4);
+			this.tabslopes.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.tabslopes.Location = new System.Drawing.Point(4, 22);
+			this.tabslopes.Name = "tabslopes";
+			this.tabslopes.Size = new System.Drawing.Size(503, 419);
+			this.tabslopes.TabIndex = 3;
+			this.tabslopes.Text = "Slopes";
+			this.tabslopes.UseVisualStyleBackColor = true;
+			// 
+			// groupBox5
+			// 
+			this.groupBox5.Controls.Add(this.floorslopecontrol);
+			this.groupBox5.Location = new System.Drawing.Point(3, 212);
+			this.groupBox5.Name = "groupBox5";
+			this.groupBox5.Size = new System.Drawing.Size(497, 203);
+			this.groupBox5.TabIndex = 1;
+			this.groupBox5.TabStop = false;
+			this.groupBox5.Text = " Floor ";
+			// 
+			// floorslopecontrol
+			// 
+			this.floorslopecontrol.Location = new System.Drawing.Point(6, 19);
+			this.floorslopecontrol.Name = "floorslopecontrol";
+			this.floorslopecontrol.Size = new System.Drawing.Size(431, 178);
+			this.floorslopecontrol.TabIndex = 0;
+			this.floorslopecontrol.UseLineAngles = false;
+			this.floorslopecontrol.OnUseLineAnglesChanged += new System.EventHandler(this.floorslopecontrol_OnUseLineAnglesChanged);
+			this.floorslopecontrol.OnResetClicked += new System.EventHandler(this.floorslopecontrol_OnResetClicked);
+			this.floorslopecontrol.OnAnglesChanged += new System.EventHandler(this.floorslopecontrol_OnAnglesChanged);
+			this.floorslopecontrol.OnPivotModeChanged += new System.EventHandler(this.floorslopecontrol_OnPivotModeChanged);
+			// 
+			// groupBox4
+			// 
+			this.groupBox4.Controls.Add(this.ceilingslopecontrol);
+			this.groupBox4.Location = new System.Drawing.Point(3, 3);
+			this.groupBox4.Name = "groupBox4";
+			this.groupBox4.Size = new System.Drawing.Size(497, 203);
+			this.groupBox4.TabIndex = 0;
+			this.groupBox4.TabStop = false;
+			this.groupBox4.Text = " Ceiling ";
+			// 
+			// ceilingslopecontrol
+			// 
+			this.ceilingslopecontrol.Location = new System.Drawing.Point(6, 19);
+			this.ceilingslopecontrol.Name = "ceilingslopecontrol";
+			this.ceilingslopecontrol.Size = new System.Drawing.Size(431, 178);
+			this.ceilingslopecontrol.TabIndex = 1;
+			this.ceilingslopecontrol.UseLineAngles = false;
+			this.ceilingslopecontrol.OnUseLineAnglesChanged += new System.EventHandler(this.ceilingslopecontrol_OnUseLineAnglesChanged);
+			this.ceilingslopecontrol.OnResetClicked += new System.EventHandler(this.ceilingslopecontrol_OnResetClicked);
+			this.ceilingslopecontrol.OnAnglesChanged += new System.EventHandler(this.ceilingslopecontrol_OnAnglesChanged);
+			this.ceilingslopecontrol.OnPivotModeChanged += new System.EventHandler(this.ceilingslopecontrol_OnPivotModeChanged);
+			// 
+			// tabcomment
+			// 
+			this.tabcomment.Controls.Add(this.commenteditor);
+			this.tabcomment.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.tabcomment.Location = new System.Drawing.Point(4, 22);
+			this.tabcomment.Name = "tabcomment";
+			this.tabcomment.Size = new System.Drawing.Size(503, 419);
+			this.tabcomment.TabIndex = 4;
+			this.tabcomment.Text = "Comment";
+			this.tabcomment.UseVisualStyleBackColor = true;
+			// 
+			// commenteditor
+			// 
+			this.commenteditor.Location = new System.Drawing.Point(3, 3);
+			this.commenteditor.Name = "commenteditor";
+			this.commenteditor.Size = new System.Drawing.Size(497, 413);
+			this.commenteditor.TabIndex = 0;
+			// 
+			// tabcustom
+			// 
+			this.tabcustom.Controls.Add(this.fieldslist);
+			this.tabcustom.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.tabcustom.Location = new System.Drawing.Point(4, 22);
+			this.tabcustom.Name = "tabcustom";
+			this.tabcustom.Padding = new System.Windows.Forms.Padding(3);
+			this.tabcustom.Size = new System.Drawing.Size(503, 419);
+			this.tabcustom.TabIndex = 1;
+			this.tabcustom.Text = "Custom";
+			this.tabcustom.UseVisualStyleBackColor = true;
+			this.tabcustom.MouseEnter += new System.EventHandler(this.tabcustom_MouseEnter);
+			// 
+			// fieldslist
+			// 
+			this.fieldslist.AllowInsert = true;
+			this.fieldslist.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.fieldslist.AutoInsertUserPrefix = true;
+			this.fieldslist.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+			this.fieldslist.Location = new System.Drawing.Point(11, 11);
+			this.fieldslist.Margin = new System.Windows.Forms.Padding(8);
+			this.fieldslist.Name = "fieldslist";
+			this.fieldslist.PropertyColumnVisible = true;
+			this.fieldslist.PropertyColumnWidth = 150;
+			this.fieldslist.Size = new System.Drawing.Size(481, 398);
+			this.fieldslist.TabIndex = 1;
+			this.fieldslist.TypeColumnVisible = true;
+			this.fieldslist.TypeColumnWidth = 100;
+			this.fieldslist.ValueColumnVisible = true;
+			// 
+			// cancel
+			// 
+			this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.cancel.Location = new System.Drawing.Point(407, 459);
+			this.cancel.Name = "cancel";
+			this.cancel.Size = new System.Drawing.Size(112, 25);
+			this.cancel.TabIndex = 4;
+			this.cancel.Text = "Cancel";
+			this.cancel.UseVisualStyleBackColor = true;
+			this.cancel.Click += new System.EventHandler(this.cancel_Click);
+			// 
+			// apply
+			// 
+			this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.apply.Location = new System.Drawing.Point(289, 459);
+			this.apply.Name = "apply";
+			this.apply.Size = new System.Drawing.Size(112, 25);
+			this.apply.TabIndex = 3;
+			this.apply.Text = "OK";
+			this.apply.UseVisualStyleBackColor = true;
+			this.apply.Click += new System.EventHandler(this.apply_Click);
+			// 
+			// tooltip
+			// 
+			this.tooltip.AutomaticDelay = 10;
+			this.tooltip.AutoPopDelay = 10000;
+			this.tooltip.InitialDelay = 10;
+			this.tooltip.ReshowDelay = 100;
+			// 
+			// SectorEditFormUDMF
+			// 
+			this.AcceptButton = this.apply;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.CancelButton = this.cancel;
+			this.ClientSize = new System.Drawing.Size(531, 489);
+			this.Controls.Add(this.cancel);
+			this.Controls.Add(this.apply);
+			this.Controls.Add(this.tabs);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "SectorEditFormUDMF";
+			this.Opacity = 1;
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Edit Sector";
+			this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.SectorEditFormUDMF_FormClosing);
+			this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.SectorEditFormUDMF_HelpRequested);
+			groupaction.ResumeLayout(false);
+			groupeffect.ResumeLayout(false);
+			groupeffect.PerformLayout();
+			groupfloorceiling.ResumeLayout(false);
+			groupfloorceiling.PerformLayout();
+			this.tabs.ResumeLayout(false);
+			this.tabproperties.ResumeLayout(false);
+			this.groupBox3.ResumeLayout(false);
+			this.tabSurfaces.ResumeLayout(false);
+			this.groupBox2.ResumeLayout(false);
+			this.groupBox2.PerformLayout();
+			this.groupBox1.ResumeLayout(false);
+			this.groupBox1.PerformLayout();
+			this.tabslopes.ResumeLayout(false);
+			this.groupBox5.ResumeLayout(false);
+			this.groupBox4.ResumeLayout(false);
+			this.tabcomment.ResumeLayout(false);
+			this.tabcustom.ResumeLayout(false);
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.TabControl tabs;
+		private System.Windows.Forms.TabPage tabproperties;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox brightness;
+		private System.Windows.Forms.Button browseeffect;
+		private CodeImp.DoomBuilder.Controls.ActionSelectorControl effect;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox ceilingheight;
+		private System.Windows.Forms.Label sectorheightlabel;
+		private System.Windows.Forms.Label sectorheight;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox floorheight;
+		private System.Windows.Forms.TabPage tabcustom;
+		private CodeImp.DoomBuilder.Controls.FieldsEditorControl fieldslist;
+		private System.Windows.Forms.Button cancel;
+		private System.Windows.Forms.Button apply;
+		private System.Windows.Forms.TabPage tabSurfaces;
+		private System.Windows.Forms.GroupBox groupBox1;
+		private CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl ceilOffsets;
+		private CodeImp.DoomBuilder.Controls.FlatSelectorControl ceilingtex;
+		private CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl ceilScale;
+		private System.Windows.Forms.ComboBox ceilRenderStyle;
+		private System.Windows.Forms.Label label4;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox ceilAlpha;
+		private System.Windows.Forms.Label label1;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox ceilRotation;
+		private System.Windows.Forms.CheckBox ceilLightAbsolute;
+		private System.Windows.Forms.Label labelLightFront;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox ceilBrightness;
+		private System.Windows.Forms.Label labelceilrenderstyle;
+		private System.Windows.Forms.GroupBox groupBox2;
+		private System.Windows.Forms.Label labelfloorrenderstyle;
+		private System.Windows.Forms.Label label10;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox floorAlpha;
+		private System.Windows.Forms.Label label11;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox floorRotation;
+		private System.Windows.Forms.CheckBox floorLightAbsolute;
+		private System.Windows.Forms.Label label12;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox floorBrightness;
+		private System.Windows.Forms.ComboBox floorRenderStyle;
+		private CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl floorScale;
+		private CodeImp.DoomBuilder.GZBuilder.Controls.PairedFieldsControl floorOffsets;
+		private CodeImp.DoomBuilder.Controls.FlatSelectorControl floortex;
+		private CodeImp.DoomBuilder.GZBuilder.Controls.AngleControl floorAngleControl;
+		private CodeImp.DoomBuilder.GZBuilder.Controls.AngleControl ceilAngleControl;
+		private System.Windows.Forms.GroupBox groupBox3;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox gravity;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox desaturation;
+		private CodeImp.DoomBuilder.GZBuilder.Controls.ColorFieldsControl fadeColor;
+		private CodeImp.DoomBuilder.GZBuilder.Controls.ColorFieldsControl lightColor;
+		private CodeImp.DoomBuilder.Controls.CheckboxArrayControl flags;
+		private System.Windows.Forms.CheckBox cbUseFloorLineAngles;
+		private System.Windows.Forms.CheckBox cbUseCeilLineAngles;
+		private System.Windows.Forms.TabPage tabslopes;
+		private System.Windows.Forms.GroupBox groupBox5;
+		private System.Windows.Forms.GroupBox groupBox4;
+		private CodeImp.DoomBuilder.Controls.SectorSlopeControl floorslopecontrol;
+		private CodeImp.DoomBuilder.Controls.SectorSlopeControl ceilingslopecontrol;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox heightoffset;
+		private System.Windows.Forms.ToolTip tooltip;
+		private System.Windows.Forms.Label labelFloorOffsets;
+		private System.Windows.Forms.Label labelFloorScale;
+		private System.Windows.Forms.Label labelCeilOffsets;
+		private System.Windows.Forms.Label labelCeilScale;
+		private System.Windows.Forms.Button resetsoundsequence;
+		private System.Windows.Forms.ComboBox soundsequence;
+		private System.Windows.Forms.TabPage tabcomment;
+		private CodeImp.DoomBuilder.Controls.CommentEditor commenteditor;
+		private CodeImp.DoomBuilder.GZBuilder.Controls.TagsSelector tagsselector;
+		private System.Windows.Forms.Button resetfloorlight;
+		private System.Windows.Forms.Button resetceillight;
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/SectorEditFormUDMF.cs b/Source/Core/Windows/SectorEditFormUDMF.cs
new file mode 100644
index 0000000..a6084a8
--- /dev/null
+++ b/Source/Core/Windows/SectorEditFormUDMF.cs
@@ -0,0 +1,1558 @@
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Controls;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Types;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Windows
+{
+	internal partial class SectorEditFormUDMF : DelayedForm
+	{
+		#region ================== Events
+
+		public event EventHandler OnValuesChanged; //mxd
+
+		#endregion
+
+		#region ================== Constants
+
+		private const string NO_SOUND_SEQUENCE = "None"; //mxd
+
+		#endregion
+
+		#region ================== Variables
+
+		private ICollection<Sector> sectors;
+		private Dictionary<Sector, SectorProperties> sectorprops; //mxd
+		private bool preventchanges; //mxd
+		private bool undocreated; //mxd
+		private StepsList anglesteps; //mxd
+		private readonly string[] renderstyles; //mxd
+
+		//mxd. Persistent settings
+		private static bool linkCeilingScale;
+		private static bool linkFloorScale;
+		private static bool useFloorLineAngles;
+		private static bool useCeilLineAngles;
+		private static bool useFloorSlopeLineAngles;
+		private static bool useCeilSlopeLineAngles;
+		private static SlopePivotMode ceilpivotmode = SlopePivotMode.LOCAL;
+		private static SlopePivotMode floorpivotmode = SlopePivotMode.LOCAL;
+
+		//mxd. Window setup stuff
+		private static Point location = Point.Empty;
+		private static int activetab;
+	
+		//mxd. Slope pivots
+		private Vector2D globalslopepivot;
+		private Dictionary<Sector, Vector2D> slopepivots;
+
+		#endregion
+
+		#region ================== Structs
+
+		private struct SectorProperties //mxd
+		{
+			public readonly int Brightness;
+			public readonly int FloorHeight;
+			public readonly int CeilHeight;
+			public readonly string FloorTexture;
+			public readonly string CeilTexture;
+
+			//UDMF stuff
+			public readonly int LightColor;
+			public readonly int FadeColor;
+			//public float Desaturation;
+
+			//UDMF Ceiling
+			public readonly float CeilOffsetX;
+			public readonly float CeilOffsetY;
+			public readonly float CeilScaleX;
+			public readonly float CeilScaleY;
+			//public float CeilAlpha;
+			public readonly float CeilRotation;
+			public readonly int CeilBrightness;
+			public readonly bool CeilLightAbsoulte;
+
+			//UDMF Floor
+			public readonly float FloorOffsetX;
+			public readonly float FloorOffsetY;
+			public readonly float FloorScaleX;
+			public readonly float FloorScaleY;
+			//public float FloorAlpha;
+			public readonly float FloorRotation;
+			public readonly int FloorBrightness;
+			public readonly bool FloorLightAbsoulte;
+
+			//UDMF slopes. Angles are in degrees
+			public readonly Vector3D FloorSlope;
+			public readonly Vector3D CeilSlope;
+			public readonly float FloorSlopeAngleXY;
+			public readonly float FloorSlopeAngleZ;
+			public readonly float FloorSlopeOffset;
+			public readonly float CeilSlopeAngleXY;
+			public readonly float CeilSlopeAngleZ;
+			public readonly float CeilSlopeOffset;
+
+			public SectorProperties(Sector s) 
+			{
+				Brightness = s.Brightness;
+				FloorHeight = s.FloorHeight;
+				CeilHeight = s.CeilHeight;
+				FloorTexture = s.FloorTexture;
+				CeilTexture = s.CeilTexture;
+
+				//UDMF stuff
+				LightColor = UniFields.GetInteger(s.Fields, "lightcolor", 16777215);
+				FadeColor = UniFields.GetInteger(s.Fields, "fadecolor", 0);
+
+				//UDMF Ceiling
+				CeilOffsetX = UniFields.GetFloat(s.Fields, "xpanningceiling", 0f);
+				CeilOffsetY = UniFields.GetFloat(s.Fields, "ypanningceiling", 0f);
+				CeilScaleX = UniFields.GetFloat(s.Fields, "xscaleceiling", 1.0f);
+				CeilScaleY = UniFields.GetFloat(s.Fields, "yscaleceiling", 1.0f);
+				//CeilAlpha = UniFields.GetFloat(s.Fields, "alphaceiling", 1.0f);
+				CeilRotation = s.Fields.GetValue("rotationceiling", 0.0f);
+				CeilBrightness = s.Fields.GetValue("lightceiling", 0);
+				CeilLightAbsoulte = s.Fields.GetValue("lightceilingabsolute", false);
+
+				//UDMF Floor
+				FloorOffsetX = UniFields.GetFloat(s.Fields, "xpanningfloor", 0f);
+				FloorOffsetY = UniFields.GetFloat(s.Fields, "ypanningfloor", 0f);
+				FloorScaleX = UniFields.GetFloat(s.Fields, "xscalefloor", 1.0f);
+				FloorScaleY = UniFields.GetFloat(s.Fields, "yscalefloor", 1.0f);
+				//FloorAlpha = UniFields.GetFloat(s.Fields, "alphafloor", 1.0f);
+				FloorRotation = s.Fields.GetValue("rotationfloor", 0.0f);
+				FloorBrightness = s.Fields.GetValue("lightfloor", 0);
+				FloorLightAbsoulte = s.Fields.GetValue("lightfloorabsolute", false);
+
+				//UDMF slopes
+				if(s.FloorSlope.GetLengthSq() > 0)
+				{
+					FloorSlopeAngleXY = General.ClampAngle((float)Math.Round(Angle2D.RadToDeg(s.FloorSlope.GetAngleXY()) - 180, 1));
+					FloorSlopeAngleZ = -(float)Math.Round(Angle2D.RadToDeg(s.FloorSlope.GetAngleZ()) - 90, 1);
+					FloorSlopeOffset = (float.IsNaN(s.FloorSlopeOffset) ? s.FloorHeight : s.FloorSlopeOffset);
+				} 
+				else 
+				{
+					FloorSlopeAngleXY = 0;
+					FloorSlopeAngleZ = 0;
+					FloorSlopeOffset = -s.FloorHeight;
+				}
+				FloorSlope = s.FloorSlope;
+
+				if(s.CeilSlope.GetLengthSq() > 0)
+				{
+					CeilSlopeAngleXY = General.ClampAngle((float)Math.Round(Angle2D.RadToDeg(s.CeilSlope.GetAngleXY()) - 180, 1));
+					CeilSlopeAngleZ = -(float)Math.Round(270 - Angle2D.RadToDeg(s.CeilSlope.GetAngleZ()), 1);
+					CeilSlopeOffset = (float.IsNaN(s.CeilSlopeOffset) ? s.CeilHeight : s.CeilSlopeOffset);
+				} 
+				else 
+				{
+					CeilSlopeAngleXY = 0;
+					CeilSlopeAngleZ = 0;
+					CeilSlopeOffset = s.CeilHeight;
+				}
+				CeilSlope = s.CeilSlope;
+			}
+		}
+
+		#endregion
+
+		#region ================== Constructor
+
+		public SectorEditFormUDMF() 
+		{
+			InitializeComponent();
+
+			//mxd. Widow setup
+			if(location != Point.Empty) 
+			{
+				this.StartPosition = FormStartPosition.Manual;
+				this.Location = location;
+				if(General.Settings.StoreSelectedEditTab && activetab > 0) tabs.SelectTab(activetab);
+			}
+
+			// Fill flags list
+			foreach(KeyValuePair<string, string> lf in General.Map.Config.SectorFlags)
+				flags.Add(lf.Value, lf.Key);
+			flags.Enabled = General.Map.Config.SectorFlags.Count > 0;
+
+			// Setup renderstyles
+			renderstyles = new string[General.Map.Config.SectorRenderStyles.Count];
+			General.Map.Config.SectorRenderStyles.Keys.CopyTo(renderstyles, 0);
+			floorRenderStyle.Enabled = (General.Map.Config.SectorRenderStyles.Count > 0);
+			labelfloorrenderstyle.Enabled = (General.Map.Config.SectorRenderStyles.Count > 0);
+			ceilRenderStyle.Enabled = (General.Map.Config.SectorRenderStyles.Count > 0);
+			labelceilrenderstyle.Enabled = (General.Map.Config.SectorRenderStyles.Count > 0);
+
+			// Fill renderstyles
+			foreach(KeyValuePair<string, string> lf in General.Map.Config.SectorRenderStyles) 
+			{
+				floorRenderStyle.Items.Add(lf.Value);
+				ceilRenderStyle.Items.Add(lf.Value);
+			}
+
+			// Fill effects list
+			effect.GeneralizedOptions = General.Map.Config.GenEffectOptions; //mxd
+			effect.AddInfo(General.Map.Config.SortedSectorEffects.ToArray());
+
+			// Fill sound sequences list
+			soundsequence.Items.Add(NO_SOUND_SEQUENCE);
+			soundsequence.Items.AddRange(General.Map.Data.SoundSequences.ToArray());
+
+			// Initialize custom fields editor
+			fieldslist.Setup("sector");
+
+			// Fill universal fields list
+			fieldslist.ListFixedFields(General.Map.Config.SectorFields);
+
+			// Initialize image selectors
+			floortex.Initialize();
+			ceilingtex.Initialize();
+
+			// Set steps for brightness field
+			brightness.StepValues = General.Map.Config.BrightnessLevels;
+
+			// Value linking
+			ceilScale.LinkValues = linkCeilingScale;
+			floorScale.LinkValues = linkFloorScale;
+
+			cbUseCeilLineAngles.Checked = useCeilLineAngles;
+			cbUseFloorLineAngles.Checked = useFloorLineAngles;
+
+			floorslopecontrol.UseLineAngles = useFloorSlopeLineAngles;
+			ceilingslopecontrol.UseLineAngles = useCeilSlopeLineAngles;
+
+			floorslopecontrol.PivotMode = floorpivotmode;
+			ceilingslopecontrol.PivotMode = ceilpivotmode;
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This sets up the form to edit the given sectors
+		public void Setup(ICollection<Sector> sectors) 
+		{
+			preventchanges = true; //mxd
+
+			// Keep this list
+			this.sectors = sectors;
+			if(sectors.Count > 1) this.Text = "Edit Sectors (" + sectors.Count + ")";
+			sectorprops = new Dictionary<Sector, SectorProperties>(sectors.Count); //mxd
+
+			//mxd. Set default height offset
+			heightoffset.Text = "0";
+
+			CreateHelperProps(sectors); //mxd
+
+			////////////////////////////////////////////////////////////////////////
+			// Set all options to the first sector properties
+			////////////////////////////////////////////////////////////////////////
+
+			// Get first sector
+			Sector sc = General.GetByIndex(sectors, 0);
+
+			// Flags
+			foreach(CheckBox c in flags.Checkboxes)
+				if(sc.Flags.ContainsKey(c.Tag.ToString())) c.Checked = sc.Flags[c.Tag.ToString()];
+
+			// Effects
+			effect.Value = sc.Effect;
+			brightness.Text = sc.Brightness.ToString();
+
+			// Floor/ceiling
+			floorheight.Text = sc.FloorHeight.ToString();
+			ceilingheight.Text = sc.CeilHeight.ToString();
+			floortex.TextureName = sc.FloorTexture;
+			ceilingtex.TextureName = sc.CeilTexture;
+
+			//UDMF stuff
+			//Texture offsets
+			ceilOffsets.SetValuesFrom(sc.Fields, true);
+			floorOffsets.SetValuesFrom(sc.Fields, true);
+
+			//Texture scale
+			ceilScale.SetValuesFrom(sc.Fields, true);
+			floorScale.SetValuesFrom(sc.Fields, true);
+
+			//Texture rotation
+			float ceilAngle = sc.Fields.GetValue("rotationceiling", 0.0f);
+			float floorAngle = sc.Fields.GetValue("rotationfloor", 0.0f);
+
+			ceilRotation.Text = ceilAngle.ToString();
+			floorRotation.Text = floorAngle.ToString();
+
+			ceilAngleControl.Angle = General.ClampAngle(360 - (int)ceilAngle);
+			floorAngleControl.Angle = General.ClampAngle(360 - (int)floorAngle);
+
+			//Texture brightness
+			ceilBrightness.Text = sc.Fields.GetValue("lightceiling", 0).ToString();
+			floorBrightness.Text = sc.Fields.GetValue("lightfloor", 0).ToString();
+			ceilLightAbsolute.Checked = sc.Fields.GetValue("lightceilingabsolute", false);
+			floorLightAbsolute.Checked = sc.Fields.GetValue("lightfloorabsolute", false);
+
+			//Alpha
+			ceilAlpha.Text = General.Clamp(sc.Fields.GetValue("alphaceiling", 1.0f), 0f, 1f).ToString();
+			floorAlpha.Text = General.Clamp(sc.Fields.GetValue("alphafloor", 1.0f), 0f, 1f).ToString();
+
+			//Render style
+			ceilRenderStyle.SelectedIndex = Array.IndexOf(renderstyles, sc.Fields.GetValue("renderstyleceiling", "translucent"));
+			floorRenderStyle.SelectedIndex = Array.IndexOf(renderstyles, sc.Fields.GetValue("renderstylefloor", "translucent"));
+
+			//Misc
+			soundsequence.Text = sc.Fields.GetValue("soundsequence", NO_SOUND_SEQUENCE);
+			gravity.Text = sc.Fields.GetValue("gravity", 1.0f).ToString();
+			desaturation.Text = General.Clamp(sc.Fields.GetValue("desaturation", 0.0f), 0f, 1f).ToString();
+
+			//Sector colors
+			fadeColor.SetValueFrom(sc.Fields);
+			lightColor.SetValueFrom(sc.Fields);
+
+			//Slopes
+			SetupFloorSlope(sc, true);
+			SetupCeilingSlope(sc, true);
+
+			// Action
+			tagsselector.Setup(UniversalType.SectorTag); //mxd
+			tagsselector.SetValue(sc.Tags, true);//mxd
+
+			// Custom fields
+			fieldslist.SetValues(sc.Fields, true);
+
+			//mxd. Comments
+			commenteditor.SetValues(sc.Fields, true);
+
+			anglesteps = new StepsList();
+
+			////////////////////////////////////////////////////////////////////////
+			// Now go for all sectors and change the options when a setting is different
+			////////////////////////////////////////////////////////////////////////
+
+			// Go for all sectors
+			foreach(Sector s in sectors) 
+			{
+				// Flags
+				foreach(CheckBox c in flags.Checkboxes) 
+				{
+					if(c.CheckState == CheckState.Indeterminate) continue; //mxd
+					if(s.IsFlagSet(c.Tag.ToString()) != c.Checked) 
+					{
+						c.ThreeState = true;
+						c.CheckState = CheckState.Indeterminate;
+					}
+				}
+
+				// Effects
+				if(s.Effect != effect.Value) effect.Empty = true;
+				if(s.Brightness.ToString() != brightness.Text) brightness.Text = "";
+
+				// Floor/Ceiling
+				if(s.FloorHeight.ToString() != floorheight.Text) floorheight.Text = "";
+				if(s.CeilHeight.ToString() != ceilingheight.Text) ceilingheight.Text = "";
+				if(s.FloorTexture != floortex.TextureName) 
+				{
+					floortex.MultipleTextures = true; //mxd
+					floortex.TextureName = "";
+				}
+				if(s.CeilTexture != ceilingtex.TextureName) 
+				{
+					ceilingtex.MultipleTextures = true; //mxd
+					ceilingtex.TextureName = "";
+				}
+
+				//mxd. UDMF stuff
+				//Texture offsets
+				ceilOffsets.SetValuesFrom(s.Fields, false);
+				floorOffsets.SetValuesFrom(s.Fields, false);
+
+				//Texture scale
+				ceilScale.SetValuesFrom(s.Fields, false);
+				floorScale.SetValuesFrom(s.Fields, false);
+
+				//Texture rotation
+				if(s.Fields.GetValue("rotationceiling", 0.0f).ToString() != ceilRotation.Text) 
+				{
+					ceilRotation.Text = "";
+					ceilAngleControl.Angle = GZBuilder.Controls.AngleControl.NO_ANGLE;
+				}
+				if(s.Fields.GetValue("rotationfloor", 0.0f).ToString() != floorRotation.Text)
+				{
+					floorRotation.Text = "";
+					floorAngleControl.Angle = GZBuilder.Controls.AngleControl.NO_ANGLE;
+				}
+
+				//Texture brightness
+				if(s.Fields.GetValue("lightceiling", 0).ToString() != ceilBrightness.Text) ceilBrightness.Text = "";
+				if(s.Fields.GetValue("lightfloor", 0).ToString() != floorBrightness.Text) floorBrightness.Text = "";
+
+				if(s.Fields.GetValue("lightceilingabsolute", false) != ceilLightAbsolute.Checked) 
+				{
+					ceilLightAbsolute.ThreeState = true;
+					ceilLightAbsolute.CheckState = CheckState.Indeterminate;
+				}
+				if(s.Fields.GetValue("lightfloorabsolute", false) != floorLightAbsolute.Checked) 
+				{
+					floorLightAbsolute.ThreeState = true;
+					floorLightAbsolute.CheckState = CheckState.Indeterminate;
+				}
+
+				//Alpha
+				if(s.Fields.GetValue("alphaceiling", 1.0f).ToString() != ceilAlpha.Text) ceilAlpha.Text = "";
+				if(s.Fields.GetValue("alphafloor", 1.0f).ToString() != floorAlpha.Text) floorAlpha.Text = "";
+
+				//Render style
+				if(ceilRenderStyle.SelectedIndex > -1 && ceilRenderStyle.SelectedIndex != Array.IndexOf(renderstyles, s.Fields.GetValue("renderstyleceiling", "translucent")))
+					ceilRenderStyle.SelectedIndex = -1;
+				if(floorRenderStyle.SelectedIndex > -1 && floorRenderStyle.SelectedIndex != Array.IndexOf(renderstyles, s.Fields.GetValue("renderstylefloor", "translucent")))
+					floorRenderStyle.SelectedIndex = -1;
+
+				//Misc
+				if(s.Fields.GetValue("soundsequence", NO_SOUND_SEQUENCE) != soundsequence.Text) soundsequence.Text = "";
+				if(s.Fields.GetValue("gravity", 1.0f).ToString() != gravity.Text) gravity.Text = "";
+				if(s.Fields.GetValue("desaturation", 0.0f).ToString() != desaturation.Text) desaturation.Text = "";
+
+				//Sector colors
+				fadeColor.SetValueFrom(s.Fields);
+				lightColor.SetValueFrom(s.Fields);
+
+				//Slopes
+				SetupFloorSlope(s, false);
+				SetupCeilingSlope(s, false);
+
+				// Action
+				tagsselector.SetValue(s.Tags, false); //mxd
+
+				// Custom fields
+				fieldslist.SetValues(s.Fields, false);
+
+				//mxd. Comments
+				commenteditor.SetValues(s.Fields, false);
+
+				//mxd. Angle steps
+				foreach(Sidedef side in s.Sidedefs)
+				{
+					int angle;
+					if(side.Line.Front != null && side.Index == side.Line.Front.Index)
+						angle = General.ClampAngle(270 - side.Line.AngleDeg);
+					else
+						angle = General.ClampAngle(90 - side.Line.AngleDeg);
+
+					if(!anglesteps.Contains(angle)) anglesteps.Add(angle);
+				}
+			}
+
+			//mxd. Update slope controls
+			ceilingslopecontrol.UpdateControls();
+			floorslopecontrol.UpdateControls();
+
+			// Show sector height
+			UpdateSectorHeight();
+
+			//mxd. Update some labels
+			labelCeilOffsets.Enabled = ceilOffsets.NonDefaultValue;
+			labelCeilScale.Enabled = ceilScale.NonDefaultValue;
+			labelFloorOffsets.Enabled = floorOffsets.NonDefaultValue;
+			labelFloorScale.Enabled = floorScale.NonDefaultValue;
+
+			//mxd. Update brightness reset buttons
+			resetceillight.Visible = (ceilLightAbsolute.CheckState != CheckState.Unchecked || ceilBrightness.GetResult(0) != 0);
+			resetfloorlight.Visible = (floorLightAbsolute.CheckState != CheckState.Unchecked || floorBrightness.GetResult(0) != 0);
+
+			//mxd. Angle steps
+			anglesteps.Sort();
+			if(useCeilLineAngles) ceilRotation.StepValues = anglesteps;
+			if(useFloorLineAngles) floorRotation.StepValues = anglesteps;
+			if(useCeilSlopeLineAngles) ceilingslopecontrol.StepValues = anglesteps;
+			if(useFloorSlopeLineAngles) floorslopecontrol.StepValues = anglesteps;
+
+			//mxd. Comments and Tags
+			commenteditor.FinishSetup();
+			tagsselector.FinishSetup();
+
+			preventchanges = false; //mxd
+		}
+
+		//mxd
+		private void MakeUndo() 
+		{
+			if(undocreated) return;
+			undocreated = true;
+
+			//mxd. Make undo
+			General.Map.UndoRedo.CreateUndo("Edit " + (sectors.Count > 1 ? sectors.Count + " sectors" : "sector"));
+			foreach(Sector s in sectors) s.Fields.BeforeFieldsChange();
+		}
+
+		// mxd
+		private void CreateHelperProps(ICollection<Sector> sectors) 
+		{
+			slopepivots = new Dictionary<Sector, Vector2D>(sectors.Count);
+			
+			foreach(Sector s in sectors)
+			{
+				if(slopepivots.ContainsKey(s)) continue;
+				Vector2D pivot = new Vector2D(s.BBox.X + s.BBox.Width / 2, s.BBox.Y + s.BBox.Height / 2);
+				globalslopepivot += pivot;
+				slopepivots.Add(s, pivot);
+
+				// Store initial properties
+				sectorprops.Add(s, new SectorProperties(s));
+			}
+
+			globalslopepivot /= sectors.Count;
+		}
+
+		// This updates the sector height field
+		private void UpdateSectorHeight() 
+		{
+			int delta = int.MinValue;
+
+			// Check all selected sectors
+			foreach(Sector s in sectors) 
+			{
+				if(delta == int.MinValue) 
+				{
+					// First sector in list
+					delta = s.CeilHeight - s.FloorHeight;
+				} 
+				else if(delta != (s.CeilHeight - s.FloorHeight)) 
+				{
+					// We can't show heights because the delta
+					// heights for the sectors is different
+					delta = int.MinValue;
+					break;
+				}
+			}
+
+			if(delta != int.MinValue) 
+			{
+				sectorheight.Text = delta.ToString();
+				sectorheight.Visible = true;
+				sectorheightlabel.Visible = true;
+			} 
+			else 
+			{
+				sectorheight.Visible = false;
+				sectorheightlabel.Visible = false;
+			}
+		}
+
+		//mxd
+		private void UpdateCeilingHeight() 
+		{
+			int offset;
+
+			if(heightoffset.Text == "++" || heightoffset.Text == "--") // Raise or lower by sector height
+			{
+				int sign = (heightoffset.Text == "++" ? 1 : -1);
+				foreach(Sector s in sectors)
+				{
+					offset = sectorprops[s].CeilHeight - sectorprops[s].FloorHeight;
+					s.CeilHeight += offset * sign;
+					SynchCeilSlopeOffsetToHeight(s);
+				}
+			}
+			else
+			{
+				offset = heightoffset.GetResult(0);
+				
+				//restore values
+				if(string.IsNullOrEmpty(ceilingheight.Text))
+				{
+					foreach(Sector s in sectors)
+					{
+						s.CeilHeight = sectorprops[s].CeilHeight + offset;
+						SynchCeilSlopeOffsetToHeight(s);
+					}
+				}
+				else //update values
+				{
+					foreach(Sector s in sectors)
+					{
+						s.CeilHeight = ceilingheight.GetResult(sectorprops[s].CeilHeight) + offset;
+						SynchCeilSlopeOffsetToHeight(s);
+					}
+				}
+			}
+		}
+
+		//mxd
+		private void UpdateFloorHeight() 
+		{
+			int offset;
+
+			if(heightoffset.Text == "++" || heightoffset.Text == "--")
+			{
+				// Raise or lower by sector height
+				int sign = (heightoffset.Text == "++" ? 1 : -1);
+				foreach(Sector s in sectors)
+				{
+					offset = sectorprops[s].CeilHeight - sectorprops[s].FloorHeight;
+					s.FloorHeight += offset * sign;
+				}
+			}
+			else
+			{
+				offset = heightoffset.GetResult(0);
+				
+				//restore values
+				if(string.IsNullOrEmpty(floorheight.Text))
+				{
+					foreach(Sector s in sectors)
+					{
+						s.FloorHeight = sectorprops[s].FloorHeight + offset;
+						SynchFloorSlopeOffsetToHeight(s);
+					}
+				}
+				else //update values
+				{
+					foreach(Sector s in sectors)
+					{
+						s.FloorHeight = floorheight.GetResult(sectorprops[s].FloorHeight) + offset;
+						SynchFloorSlopeOffsetToHeight(s);
+					}
+				}
+			}
+		}
+
+		//mxd
+		private void SynchCeilSlopeOffsetToHeight(Sector s) 
+		{
+			Vector3D center = GetSectorCenter(s, s.CeilHeight, SlopePivotMode.LOCAL);
+			Plane p = new Plane(center, s.CeilSlope.GetAngleXY() - Angle2D.PIHALF, s.CeilSlope.GetAngleZ(), false);
+			s.CeilSlopeOffset = p.Offset;
+		}
+
+		//mxd
+		private void SynchFloorSlopeOffsetToHeight(Sector s)
+		{
+			Vector3D center = GetSectorCenter(s, s.FloorHeight, SlopePivotMode.LOCAL);
+			Plane p = new Plane(center, s.FloorSlope.GetAngleXY() + Angle2D.PIHALF, -s.FloorSlope.GetAngleZ(), true);
+			s.FloorSlopeOffset = p.Offset;
+		}
+
+		#endregion
+
+		#region ================== Events
+
+		private void apply_Click(object sender, EventArgs e) 
+		{
+			// Verify the effect
+			if((effect.Value < General.Map.FormatInterface.MinEffect) || (effect.Value > General.Map.FormatInterface.MaxEffect)) 
+			{
+				General.ShowWarningMessage("Sector effect must be between " + General.Map.FormatInterface.MinEffect + " and " + General.Map.FormatInterface.MaxEffect + ".", MessageBoxButtons.OK);
+				return;
+			}
+
+			//mxd
+			string[] rskeys = null;
+			if(General.Map.Config.SectorRenderStyles.Count > 0) 
+			{
+				rskeys = new string[General.Map.Config.SectorRenderStyles.Count];
+				General.Map.Config.SectorRenderStyles.Keys.CopyTo(rskeys, 0);
+			}
+
+			MakeUndo(); //mxd
+
+			// Go for all sectors
+			int tagoffset = 0; //mxd
+			foreach(Sector s in sectors) 
+			{
+				// Apply all flags
+				foreach(CheckBox c in flags.Checkboxes) 
+				{
+					switch(c.CheckState)
+					{
+						case CheckState.Checked: s.SetFlag(c.Tag.ToString(), true); break;
+						case CheckState.Unchecked: s.SetFlag(c.Tag.ToString(), false); break;
+					}
+				}
+
+				// Effects
+				if(!effect.Empty) s.Effect = effect.Value;
+				s.Brightness = General.Clamp(brightness.GetResult(s.Brightness), General.Map.FormatInterface.MinBrightness, General.Map.FormatInterface.MaxBrightness);
+
+				//mxd. Tag
+				tagsselector.ApplyTo(s, tagoffset++);
+
+				// Fields
+				fieldslist.Apply(s.Fields);
+
+				//mxd. Comments
+				commenteditor.Apply(s.Fields);
+
+				// Alpha
+				if(!string.IsNullOrEmpty(ceilAlpha.Text)) 
+				{
+					float ceilAlphaVal = General.Clamp(ceilAlpha.GetResultFloat(s.Fields.GetValue("alphaceiling", 1.0f)), 0f, 1f);
+					UniFields.SetFloat(s.Fields, "alphaceiling", ceilAlphaVal, 1.0f);
+				}
+				
+				if(!string.IsNullOrEmpty(floorAlpha.Text))
+				{
+					float floorAlphaVal = General.Clamp(floorAlpha.GetResultFloat(s.Fields.GetValue("alphafloor", 1.0f)), 0f, 1f);
+					UniFields.SetFloat(s.Fields, "alphafloor", floorAlphaVal, 1.0f);
+				}
+
+				//renderstyle
+				if(rskeys != null) 
+				{
+					if(ceilRenderStyle.SelectedIndex > -1) 
+					{
+						UniFields.SetString(s.Fields, "renderstyleceiling", rskeys[ceilRenderStyle.SelectedIndex], "translucent");
+					}
+					if(floorRenderStyle.SelectedIndex > -1) 
+					{
+						UniFields.SetString(s.Fields, "renderstylefloor", rskeys[floorRenderStyle.SelectedIndex], "translucent");
+					}
+				}
+
+				// Misc
+				if(!string.IsNullOrEmpty(soundsequence.Text))
+					UniFields.SetString(s.Fields, "soundsequence", soundsequence.Text, NO_SOUND_SEQUENCE);
+				if(!string.IsNullOrEmpty(gravity.Text)) 
+					UniFields.SetFloat(s.Fields, "gravity", gravity.GetResultFloat(s.Fields.GetValue("gravity", 1.0f)), 1.0f);
+				if(!string.IsNullOrEmpty(desaturation.Text)) 
+				{
+					float val = General.Clamp(desaturation.GetResultFloat(s.Fields.GetValue("desaturation", 0f)), 0f, 1f);
+					UniFields.SetFloat(s.Fields, "desaturation", val, 0f);
+				}
+
+				// Clear horizontal slopes
+				if((float)Math.Round(Angle2D.RadToDeg(s.FloorSlope.GetAngleZ()), 3) == 90f)
+				{
+					s.FloorSlope = new Vector3D();
+					s.FloorSlopeOffset = float.NaN;
+				}
+				if((float)Math.Round(Angle2D.RadToDeg(s.CeilSlope.GetAngleZ()), 3) == 270f)
+				{
+					s.CeilSlope = new Vector3D();
+					s.CeilSlopeOffset = float.NaN;
+				}
+			}
+
+			// Update the used textures
+			General.Map.Data.UpdateUsedTextures();
+
+			// Store value linking
+			linkCeilingScale = ceilScale.LinkValues;
+			linkFloorScale = floorScale.LinkValues;
+			useCeilLineAngles = cbUseCeilLineAngles.Checked;
+			useFloorLineAngles = cbUseFloorLineAngles.Checked;
+			useCeilSlopeLineAngles = ceilingslopecontrol.UseLineAngles;
+			useFloorSlopeLineAngles = floorslopecontrol.UseLineAngles;
+			floorpivotmode = floorslopecontrol.PivotMode;
+			ceilpivotmode = ceilingslopecontrol.PivotMode;
+
+			// Done
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty); //mxd
+			this.DialogResult = DialogResult.OK;
+			this.Close();
+		}
+
+		private void cancel_Click(object sender, EventArgs e) 
+		{
+			//mxd. Let's pretend nothing of this really happened...
+			if(undocreated) General.Map.UndoRedo.WithdrawUndo();
+			
+			// Be gone
+			this.DialogResult = DialogResult.Cancel;
+			this.Close();
+		}
+
+		private void browseeffect_Click(object sender, EventArgs e) 
+		{
+			effect.Value = EffectBrowserForm.BrowseEffect(this, effect.Value);
+		}
+
+		//mxd
+		private void SectorEditFormUDMF_FormClosing(object sender, FormClosingEventArgs e) 
+		{
+			location = this.Location;
+			activetab = tabs.SelectedIndex;
+		}
+
+		private void SectorEditFormUDMF_HelpRequested(object sender, HelpEventArgs hlpevent) 
+		{
+			General.ShowHelp("w_sectoredit.html");
+			hlpevent.Handled = true;
+		}
+
+		private void tabcustom_MouseEnter(object sender, EventArgs e) 
+		{
+			fieldslist.Focus();
+		}
+
+		private void ceilAngleControl_AngleChanged(object sender, EventArgs e) 
+		{
+			ceilRotation.Text = (General.ClampAngle(360 - ceilAngleControl.Angle)).ToString();
+		}
+
+		private void floorAngleControl_AngleChanged(object sender, EventArgs e) 
+		{
+			floorRotation.Text = (General.ClampAngle(360 - floorAngleControl.Angle)).ToString();
+		}
+
+		private void cbUseCeilLineAngles_CheckedChanged(object sender, EventArgs e) 
+		{
+			ceilRotation.ButtonStepsWrapAround = cbUseCeilLineAngles.Checked;
+			ceilRotation.StepValues = (cbUseCeilLineAngles.Checked ? anglesteps : null);
+		}
+
+		private void cbUseFloorLineAngles_CheckedChanged(object sender, EventArgs e) 
+		{
+			floorRotation.ButtonStepsWrapAround = cbUseFloorLineAngles.Checked;
+			floorRotation.StepValues = (cbUseFloorLineAngles.Checked ? anglesteps : null);
+		}
+
+		private void resetsoundsequence_Click(object sender, EventArgs e) 
+		{
+			soundsequence.Text = NO_SOUND_SEQUENCE;
+		}
+
+		private void soundsequence_TextChanged(object sender, EventArgs e) 
+		{
+			resetsoundsequence.Enabled = (soundsequence.Text != NO_SOUND_SEQUENCE);
+		}
+
+		private void soundsequence_MouseDown(object sender, MouseEventArgs e) 
+		{
+			if(soundsequence.Text == NO_SOUND_SEQUENCE) soundsequence.SelectAll();
+		}
+
+		#endregion
+
+		#region ================== Sector Realtime events (mxd)
+
+		private void ceilingheight_WhenTextChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges)	return;
+			MakeUndo(); //mxd
+
+			UpdateCeilingHeight();
+			UpdateSectorHeight();
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null)	OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void floorheight_WhenTextChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges)	return;
+			MakeUndo(); //mxd
+
+			UpdateFloorHeight();
+			UpdateSectorHeight();
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null)	OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void heightoffset_WhenTextChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+
+			UpdateFloorHeight();
+			UpdateCeilingHeight();
+			UpdateSectorHeight();
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void brightness_WhenTextChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges)	return;
+			MakeUndo(); //mxd
+
+			//restore values
+			if(string.IsNullOrEmpty(brightness.Text)) 
+			{
+				foreach(Sector s in sectors)
+					s.Brightness = sectorprops[s].Brightness;
+			
+			} 
+			else //update values
+			{
+				foreach(Sector s in sectors)
+					s.Brightness = General.Clamp(brightness.GetResult(sectorprops[s].Brightness), General.Map.FormatInterface.MinBrightness, General.Map.FormatInterface.MaxBrightness);
+			}
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null)	OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void ceilingtex_OnValueChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges)	return;
+			MakeUndo(); //mxd
+
+			//restore values
+			if(string.IsNullOrEmpty(ceilingtex.TextureName)) 
+			{
+				foreach(Sector s in sectors)
+					s.SetCeilTexture(sectorprops[s].CeilTexture);
+			
+			} 
+			else //update values
+			{
+				foreach(Sector s in sectors)
+					s.SetCeilTexture(ceilingtex.GetResult(s.CeilTexture));
+			}
+
+			// Update the used textures
+			General.Map.Data.UpdateUsedTextures();
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null)	OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void floortex_OnValueChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges)	return;
+			MakeUndo(); //mxd
+
+			//restore values
+			if(string.IsNullOrEmpty(floortex.TextureName)) 
+			{
+				foreach(Sector s in sectors)
+					s.SetFloorTexture(sectorprops[s].FloorTexture);
+
+			} 
+			else //update values
+			{
+				foreach(Sector s in sectors)
+					s.SetFloorTexture(floortex.GetResult(s.FloorTexture));
+			}
+
+			// Update the used textures
+			General.Map.Data.UpdateUsedTextures();
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null)	OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void floorRotation_WhenTextChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges)	return;
+			MakeUndo(); //mxd
+
+			//restore values
+			if(string.IsNullOrEmpty(floorRotation.Text))
+			{
+				floorAngleControl.Angle = GZBuilder.Controls.AngleControl.NO_ANGLE;
+				
+				foreach(Sector s in sectors) 
+				{
+					UniFields.SetFloat(s.Fields, "rotationfloor", sectorprops[s].FloorRotation, 0f);
+					s.UpdateNeeded = true;
+				}
+			} 
+			else //update values
+			{
+				floorAngleControl.Angle = (int)General.ClampAngle(360 - floorRotation.GetResultFloat(0));
+				
+				foreach(Sector s in sectors) 
+				{
+					UniFields.SetFloat(s.Fields, "rotationfloor", floorRotation.GetResultFloat(sectorprops[s].FloorRotation), 0f);
+					s.UpdateNeeded = true;
+				}
+			}
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null)	OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void ceilRotation_WhenTextChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+
+			//restore values
+			if(string.IsNullOrEmpty(ceilRotation.Text))
+			{
+				ceilAngleControl.Angle = GZBuilder.Controls.AngleControl.NO_ANGLE;
+				
+				foreach(Sector s in sectors) 
+				{
+					UniFields.SetFloat(s.Fields, "rotationceiling", sectorprops[s].CeilRotation, 0f);
+					s.UpdateNeeded = true;
+				}
+			} 
+			else //update values
+			{
+				ceilAngleControl.Angle = (int)General.ClampAngle(360 - ceilRotation.GetResultFloat(0));
+				
+				foreach(Sector s in sectors) 
+				{
+					UniFields.SetFloat(s.Fields, "rotationceiling", ceilRotation.GetResultFloat(sectorprops[s].CeilRotation), 0f);
+					s.UpdateNeeded = true;
+				}
+			}
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null)	OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void lightColor_OnValueChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+
+			foreach(Sector s in sectors) 
+			{
+				lightColor.ApplyTo(s.Fields, sectorprops[s].LightColor);
+				s.UpdateNeeded = true;
+			}
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null)	OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void fadeColor_OnValueChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+
+			foreach(Sector s in sectors) 
+			{
+				fadeColor.ApplyTo(s.Fields, sectorprops[s].FadeColor);
+				s.UpdateNeeded = true;
+			}
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null)	OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		#endregion
+
+		#region ================== Ceiling/Floor realtime events (mxd)
+
+		private void ceilOffsets_OnValuesChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+
+			foreach(Sector s in sectors) 
+			{
+				ceilOffsets.ApplyTo(s.Fields, General.Map.FormatInterface.MinTextureOffset, General.Map.FormatInterface.MaxTextureOffset, sectorprops[s].CeilOffsetX, sectorprops[s].CeilOffsetY);
+				s.UpdateNeeded = true;
+			}
+
+			General.Map.IsChanged = true;
+			labelCeilOffsets.Enabled = ceilOffsets.NonDefaultValue;
+			if(OnValuesChanged != null)	OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void floorOffsets_OnValuesChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+
+			foreach(Sector s in sectors) 
+			{
+				floorOffsets.ApplyTo(s.Fields, General.Map.FormatInterface.MinTextureOffset, General.Map.FormatInterface.MaxTextureOffset, sectorprops[s].FloorOffsetX, sectorprops[s].FloorOffsetY);
+				s.UpdateNeeded = true;
+			}
+
+			General.Map.IsChanged = true;
+			labelFloorOffsets.Enabled = floorOffsets.NonDefaultValue;
+			if(OnValuesChanged != null)	OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void ceilScale_OnValuesChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+
+			foreach(Sector s in sectors) 
+			{
+				ceilScale.ApplyTo(s.Fields, General.Map.FormatInterface.MinTextureOffset, General.Map.FormatInterface.MaxTextureOffset, sectorprops[s].CeilScaleX, sectorprops[s].CeilScaleY);
+				s.UpdateNeeded = true;
+			}
+
+			General.Map.IsChanged = true;
+			labelCeilScale.Enabled = ceilScale.NonDefaultValue;
+			if(OnValuesChanged != null)	OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void floorScale_OnValuesChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+
+			foreach(Sector s in sectors) 
+			{
+				floorScale.ApplyTo(s.Fields, General.Map.FormatInterface.MinTextureOffset, General.Map.FormatInterface.MaxTextureOffset, sectorprops[s].FloorScaleX, sectorprops[s].FloorScaleY);
+				s.UpdateNeeded = true;
+			}
+
+			General.Map.IsChanged = true;
+			labelFloorScale.Enabled = floorScale.NonDefaultValue;
+			if(OnValuesChanged != null)	OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void ceilBrightness_WhenTextChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+
+			//restore values
+			if(string.IsNullOrEmpty(ceilBrightness.Text)) 
+			{
+				foreach(Sector s in sectors) 
+				{
+					UniFields.SetInteger(s.Fields, "lightceiling", sectorprops[s].CeilBrightness, 0);
+					s.UpdateNeeded = true;
+				}
+			} 
+			else //update values
+			{
+				foreach(Sector s in sectors) 
+				{
+					bool absolute = false;
+					switch(ceilLightAbsolute.CheckState)
+					{
+						case CheckState.Indeterminate:
+							absolute = s.Fields.GetValue("lightceilingabsolute", false);
+							break;
+						case CheckState.Checked:
+							absolute = true;
+							break;
+					}
+
+					int value = General.Clamp(ceilBrightness.GetResult(sectorprops[s].CeilBrightness), (absolute ? 0 : -255), 255);
+					UniFields.SetInteger(s.Fields, "lightceiling", value, 0);
+					s.UpdateNeeded = true;
+				}
+			}
+
+			resetceillight.Visible = (ceilLightAbsolute.CheckState != CheckState.Unchecked || ceilBrightness.Text != "0");
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null)	OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void floorBrightness_WhenTextChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+
+			//restore values
+			if(string.IsNullOrEmpty(floorBrightness.Text)) 
+			{
+				foreach(Sector s in sectors) 
+				{
+					UniFields.SetInteger(s.Fields, "lightfloor", sectorprops[s].FloorBrightness, 0);
+					s.UpdateNeeded = true;
+				}
+			} 
+			else //update values
+			{
+				foreach(Sector s in sectors) 
+				{
+					bool absolute = false;
+					switch(floorLightAbsolute.CheckState)
+					{
+						case CheckState.Indeterminate:
+							absolute = s.Fields.GetValue("lightfloorabsolute", false);
+							break;
+						case CheckState.Checked:
+							absolute = true;
+							break;
+					}
+
+					int value = General.Clamp(floorBrightness.GetResult(sectorprops[s].FloorBrightness), (absolute ? 0 : -255), 255);
+					UniFields.SetInteger(s.Fields, "lightfloor", value, 0);
+					s.UpdateNeeded = true;
+				}
+			}
+
+			resetfloorlight.Visible = (floorLightAbsolute.CheckState != CheckState.Unchecked || floorBrightness.Text != "0");
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null)	OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void ceilLightAbsolute_CheckedChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+
+			if(ceilLightAbsolute.Checked) 
+			{
+				foreach(Sector s in sectors) 
+				{
+					s.Fields["lightceilingabsolute"] = new UniValue(UniversalType.Boolean, true);
+					s.UpdateNeeded = true;
+				}
+			} 
+			else if(ceilLightAbsolute.CheckState == CheckState.Indeterminate) 
+			{
+				foreach(Sector s in sectors) 
+				{
+					if(sectorprops[s].CeilLightAbsoulte) 
+					{
+						s.Fields["lightceilingabsolute"] = new UniValue(UniversalType.Boolean, true);
+						s.UpdateNeeded = true;
+					}
+					else if(s.Fields.ContainsKey("lightceilingabsolute")) 
+					{
+						s.Fields.Remove("lightceilingabsolute");
+						s.UpdateNeeded = true;
+					}
+				}
+			} 
+			else 
+			{
+				foreach(Sector s in sectors) 
+				{
+					if(s.Fields.ContainsKey("lightceilingabsolute")) 
+					{
+						s.Fields.Remove("lightceilingabsolute");
+						s.UpdateNeeded = true;
+					}
+				}
+			}
+
+			resetceillight.Visible = (ceilLightAbsolute.CheckState != CheckState.Unchecked || ceilBrightness.Text != "0");
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null)	OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void floorLightAbsolute_CheckedChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+
+			if(floorLightAbsolute.Checked)
+			{
+				foreach(Sector s in sectors) 
+				{
+					s.Fields["lightfloorabsolute"] = new UniValue(UniversalType.Boolean, true);
+					s.UpdateNeeded = true;
+				}
+			} 
+			else if(floorLightAbsolute.CheckState == CheckState.Indeterminate) 
+			{
+				foreach(Sector s in sectors) 
+				{
+					if(sectorprops[s].FloorLightAbsoulte) 
+					{
+						s.Fields["lightfloorabsolute"] = new UniValue(UniversalType.Boolean, true);
+						s.UpdateNeeded = true;
+					} 
+					else if(s.Fields.ContainsKey("lightfloorabsolute")) 
+					{
+						s.Fields.Remove("lightfloorabsolute");
+						s.UpdateNeeded = true;
+					}
+				}
+			} 
+			else 
+			{
+				foreach(Sector s in sectors) 
+				{
+					if(s.Fields.ContainsKey("lightfloorabsolute")) 
+					{
+						s.Fields.Remove("lightfloorabsolute");
+						s.UpdateNeeded = true;
+					}
+				}
+			}
+
+			resetfloorlight.Visible = (floorLightAbsolute.CheckState != CheckState.Unchecked || floorBrightness.Text != "0");
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null)	OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void resetceillight_Click(object sender, EventArgs e)
+		{
+			MakeUndo(); //mxd
+
+			preventchanges = true;
+
+			ceilLightAbsolute.Checked = false;
+			ceilBrightness.Text = "0";
+
+			foreach(Sector s in sectors)
+			{
+				if(s.Fields.ContainsKey("lightceilingabsolute")) s.Fields.Remove("lightceilingabsolute");
+				if(s.Fields.ContainsKey("lightceiling")) s.Fields.Remove("lightceiling");
+			}
+
+			preventchanges = false;
+
+			resetceillight.Visible = false;
+			ceilBrightness.Focus();
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void resetfloorlight_Click(object sender, EventArgs e)
+		{
+			MakeUndo(); //mxd
+
+			preventchanges = true;
+
+			floorLightAbsolute.Checked = false;
+			floorBrightness.Text = "0";
+
+			foreach(Sector s in sectors)
+			{
+				if(s.Fields.ContainsKey("lightfloorabsolute")) s.Fields.Remove("lightfloorabsolute");
+				if(s.Fields.ContainsKey("lightfloor")) s.Fields.Remove("lightfloor");
+			}
+
+			preventchanges = false;
+
+			resetfloorlight.Visible = false;
+			floorBrightness.Focus();
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		#endregion
+
+		#region ================== Slope Utility (mxd)
+
+		private void SetupFloorSlope(Sector s, bool first) 
+		{
+			if(s.FloorSlope.GetLengthSq() > 0) 
+			{
+				float anglexy = General.ClampAngle((float)Math.Round(Angle2D.RadToDeg(s.FloorSlope.GetAngleXY()) - 180, 1));
+				float anglez = -(float)Math.Round(Angle2D.RadToDeg(s.FloorSlope.GetAngleZ()) - 90, 1);
+				float offset = (float)Math.Round(GetVirtualSlopeOffset(s, floorslopecontrol.PivotMode, true), 1);
+
+				if(anglexy >= 180 && anglez < 0) 
+				{
+					anglexy -= 180;
+					anglez = -anglez;
+				}
+
+				floorslopecontrol.SetValues(anglexy, anglez, offset, first);
+			} 
+			else 
+			{
+				floorslopecontrol.SetValues(0f, 0f, s.FloorHeight, first);
+			}
+		}
+
+		private void SetupCeilingSlope(Sector s, bool first) 
+		{
+			if(s.CeilSlope.GetLengthSq() > 0) 
+			{
+				float anglexy = General.ClampAngle((float)Math.Round(Angle2D.RadToDeg(s.CeilSlope.GetAngleXY()) - 180, 1));
+				float anglez = -(float)(270 - Math.Round(Angle2D.RadToDeg(s.CeilSlope.GetAngleZ()), 1));
+				float offset = (float)Math.Round(GetVirtualSlopeOffset(s, ceilingslopecontrol.PivotMode, false), 1);
+
+				if(anglexy >= 180 && anglez < 0) 
+				{
+					anglexy -= 180;
+					anglez = -anglez;
+				}
+
+				ceilingslopecontrol.SetValues(anglexy, anglez, offset, first);
+			} 
+			else 
+			{
+				ceilingslopecontrol.SetValues(0f, 0f, s.CeilHeight, first);
+			}
+		}
+
+		// Gets the offset to be displayed in a SectorSlopeControl
+		private float GetVirtualSlopeOffset(Sector s, SlopePivotMode mode, bool floor) 
+		{
+			float offset = (floor ? s.FloorSlopeOffset : s.CeilSlopeOffset);
+			if(float.IsNaN(offset))
+			{
+				offset = (floor ? s.FloorHeight : s.CeilHeight);
+			}
+
+			Vector3D normal = (floor ? s.FloorSlope : s.CeilSlope);
+			
+			if(normal.GetLengthSq() > 0)
+			{
+				Vector3D center = GetSectorCenter(s, 0, mode);
+				Plane p = new Plane(normal, offset);
+				return p.GetZ(center);
+			}
+
+			return offset;
+		}
+
+		// Gets the offset to be displayed in a SectorSlopeControl
+		private float GetInitialVirtualSlopeOffset(Sector s, SlopePivotMode mode, bool floor) 
+		{
+			float offset = (floor ? sectorprops[s].FloorSlopeOffset : sectorprops[s].CeilSlopeOffset);
+			Vector3D normal = (floor ? sectorprops[s].FloorSlope : sectorprops[s].CeilSlope);
+
+			if(normal.GetLengthSq() > 0) 
+			{
+				Vector3D center = GetSectorCenter(s, 0, mode);
+				Plane p = new Plane(normal, offset);
+				return p.GetZ(center);
+			}
+
+			return offset;
+		}
+
+		private Vector3D GetSectorCenter(Sector s, float offset, SlopePivotMode mode)
+		{
+			switch(mode) 
+			{
+				case SlopePivotMode.GLOBAL: //translate from the center of selection 
+					return new Vector3D(globalslopepivot, offset);
+
+				case SlopePivotMode.LOCAL: //translate from sector's bounding box center
+					return new Vector3D(slopepivots[s], offset);
+
+				case SlopePivotMode.ORIGIN: //don't translate
+					return new Vector3D(0, 0, offset);
+
+				default:
+					throw new NotImplementedException("SectorEditFormUDMF.GetSectorCenter: Got unknown SlopePivotMode (" + (int)mode + ")");
+			}
+		}
+
+		#endregion
+
+		#region ================== Slopes realtime events (mxd)
+
+		private void ceilingslopecontrol_OnAnglesChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+
+			//Set or restore values
+			foreach(Sector s in sectors) 
+			{
+				float anglexy = General.ClampAngle(ceilingslopecontrol.GetAngleXY(sectorprops[s].CeilSlopeAngleXY) + 270);
+				float anglez = -(ceilingslopecontrol.GetAngleZ(sectorprops[s].CeilSlopeAngleZ) + 90);
+
+				float virtualoffset = GetInitialVirtualSlopeOffset(s, ceilingslopecontrol.PivotMode, false);
+				Vector3D center = GetSectorCenter(s, ceilingslopecontrol.GetOffset(virtualoffset), ceilingslopecontrol.PivotMode);
+				Plane p = new Plane(center, Angle2D.DegToRad(anglexy), Angle2D.DegToRad(anglez), false);
+				s.CeilSlope = p.Normal;
+				s.CeilSlopeOffset = p.Offset;
+				s.CeilHeight = (int)Math.Round(p.GetZ(center.x, center.y));
+
+				s.UpdateNeeded = true;
+			}
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void floorslopecontrol_OnAnglesChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+
+			//Set or restore values
+			foreach(Sector s in sectors)
+			{
+				float anglexy = General.ClampAngle(floorslopecontrol.GetAngleXY(sectorprops[s].FloorSlopeAngleXY) + 90);
+				float anglez = -(floorslopecontrol.GetAngleZ(sectorprops[s].FloorSlopeAngleZ) + 90);
+
+				float virtualoffset = GetInitialVirtualSlopeOffset(s, floorslopecontrol.PivotMode, true);
+				Vector3D center = GetSectorCenter(s, floorslopecontrol.GetOffset(virtualoffset), floorslopecontrol.PivotMode);
+				Plane p = new Plane(center, Angle2D.DegToRad(anglexy), Angle2D.DegToRad(anglez), true);
+				s.FloorSlope = p.Normal;
+				s.FloorSlopeOffset = p.Offset;
+				s.FloorHeight = (int)Math.Round(p.GetZ(center.x, center.y));
+
+				s.UpdateNeeded = true;
+			}
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		// Update displayed ceiling offset value
+		private void ceilingslopecontrol_OnPivotModeChanged(object sender, EventArgs e) 
+		{
+			MakeUndo(); //mxd
+			bool first = true;
+			foreach(Sector s in sectors)
+			{
+				SetupCeilingSlope(s, first);
+				first = false;
+			}
+		}
+
+		// Update displayed floor offset value
+		private void floorslopecontrol_OnPivotModeChanged(object sender, EventArgs e) 
+		{
+			MakeUndo(); //mxd
+			bool first = true;
+			foreach(Sector s in sectors)
+			{
+				SetupFloorSlope(s, first);
+				first = false;
+			}
+		}
+
+		private void ceilingslopecontrol_OnResetClicked(object sender, EventArgs e) 
+		{
+			MakeUndo(); //mxd
+			ceilingslopecontrol.SetOffset(General.GetByIndex(sectors, 0).CeilHeight, true);
+			
+			foreach(Sector s in sectors) 
+			{
+				s.CeilSlope = new Vector3D();
+				s.CeilSlopeOffset = float.NaN;
+				s.CeilHeight = ceilingheight.GetResult(sectorprops[s].CeilHeight);
+				s.UpdateNeeded = true;
+				ceilingslopecontrol.SetOffset(s.CeilHeight, false);
+			}
+
+			ceilingslopecontrol.UpdateOffset();
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void floorslopecontrol_OnResetClicked(object sender, EventArgs e) 
+		{
+			MakeUndo(); //mxd
+			floorslopecontrol.SetOffset(General.GetByIndex(sectors, 0).FloorHeight, true);
+			
+			foreach(Sector s in sectors) 
+			{
+				s.FloorSlope = new Vector3D();
+				s.FloorSlopeOffset = float.NaN;
+				s.FloorHeight = floorheight.GetResult(sectorprops[s].FloorHeight);
+				s.UpdateNeeded = true;
+				floorslopecontrol.SetOffset(s.FloorHeight, false);
+			}
+
+			floorslopecontrol.UpdateOffset();
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void ceilingslopecontrol_OnUseLineAnglesChanged(object sender, EventArgs e) 
+		{
+			ceilingslopecontrol.StepValues = (ceilingslopecontrol.UseLineAngles ? anglesteps : null);
+		}
+
+		private void floorslopecontrol_OnUseLineAnglesChanged(object sender, EventArgs e) 
+		{
+			floorslopecontrol.StepValues = (floorslopecontrol.UseLineAngles ? anglesteps : null);
+		}
+
+		#endregion
+
+	}
+}
diff --git a/Source/Core/Windows/SectorEditFormUDMF.resx b/Source/Core/Windows/SectorEditFormUDMF.resx
new file mode 100644
index 0000000..f7ad989
--- /dev/null
+++ b/Source/Core/Windows/SectorEditFormUDMF.resx
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="groupaction.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="groupeffect.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label14.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label9.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label13.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label2.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label8.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="groupfloorceiling.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label15.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="label6.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label5.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="tabproperties.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="tabcustom.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="fieldslist.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Windows/StatusInfo.cs b/Source/Core/Windows/StatusInfo.cs
new file mode 100644
index 0000000..0d68403
--- /dev/null
+++ b/Source/Core/Windows/StatusInfo.cs
@@ -0,0 +1,161 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Windows
+{
+	public struct StatusInfo
+	{
+		public const string NO_SELECTION = "Nothing selected."; //mxd
+		public const string LOADING_TEXT = "Loading resources...";
+		public const string READY_TEXT = "Ready.";
+		
+		public readonly StatusType type;
+		public readonly string message;
+		public readonly string selectioninfo; //mxd
+		internal bool displayed;
+		
+		internal StatusInfo(StatusType type, string message)
+		{
+			this.type = type;
+
+			switch(type)
+			{
+				case StatusType.Selection:
+					this.selectioninfo = (string.IsNullOrEmpty(message) ? NO_SELECTION : message);
+					this.message = General.MainWindow.Status.message;
+					break;
+
+				case StatusType.Ready:
+					bool mapopened = (General.Map != null) && (General.Map.Data != null);
+					bool mapisloading = mapopened && General.Map.Data.IsLoading;
+					this.selectioninfo = ((string.IsNullOrEmpty(message) && mapopened) ? (string.IsNullOrEmpty(General.MainWindow.Status.selectioninfo) ? NO_SELECTION : General.MainWindow.Status.selectioninfo) : message);
+					this.message = (mapisloading ? LOADING_TEXT : (mapopened ? string.Empty : READY_TEXT));
+					break;
+
+				default:
+					this.selectioninfo = (string.IsNullOrEmpty(message) ? NO_SELECTION : General.MainWindow.Status.selectioninfo);
+					this.message = message;
+					break;
+			}
+
+			this.displayed = false;
+		}
+
+		//mxd
+		public override string ToString()
+		{
+			if(string.IsNullOrEmpty(selectioninfo)) return message;
+			if(string.IsNullOrEmpty(message)) return selectioninfo;
+			return selectioninfo + " " + message;
+		}
+	}
+	
+	public enum StatusType
+	{
+		/// <summary>
+		/// When no particular information is to be displayed. The messages displayed depends on running background processes.
+		/// </summary>
+		Ready,
+
+		/// <summary>
+		/// mxd. Displays information about current selection.
+		/// </summary>
+		Selection,
+		
+		/// <summary>
+		/// Shows action information and flashes up the status icon once.
+		/// </summary>
+		Action,
+		
+		/// <summary>
+		/// Shows information without flashing the icon.
+		/// </summary>
+		Info,
+		
+		/// <summary>
+		/// Shows information with the busy icon.
+		/// </summary>
+		Busy,
+		
+		/// <summary>
+		/// Shows a warning, makes a warning sound and flashes a warning icon.
+		/// </summary>
+		Warning
+	}
+
+	//mxd. StatusInfo used by Script Editor
+	public struct ScriptStatusInfo
+	{
+		public const string READY_TEXT = "Ready.";
+
+		public readonly ScriptStatusType type;
+		public readonly string message;
+		internal bool displayed;
+
+		internal ScriptStatusInfo(ScriptStatusType type, string message)
+		{
+			this.type = type;
+
+			switch(type)
+			{
+				case ScriptStatusType.Ready:
+					this.message = READY_TEXT;
+					break;
+
+				case ScriptStatusType.Info:
+				case ScriptStatusType.Warning:
+				case ScriptStatusType.Busy:
+					this.message = message;
+					break;
+
+				default:
+					throw new NotImplementedException("Unsupported Script Status Type!");
+			}
+
+			this.displayed = false;
+		}
+	}
+
+	//mxd. StatusType used by Script Editor
+	public enum ScriptStatusType
+	{
+		/// <summary>
+		/// When no particular information is to be displayed.
+		/// </summary>
+		Ready,
+
+		/// <summary>
+		/// Shows information without flashing the icon.
+		/// </summary>
+		Info,
+
+		/// <summary>
+		/// Shows information with the busy icon.
+		/// </summary>
+		Busy,
+
+		/// <summary>
+		/// Shows a warning, makes a warning sound and flashes a warning icon.
+		/// </summary>
+		Warning
+	}
+}
diff --git a/Source/Core/Windows/TanColorTable.cs b/Source/Core/Windows/TanColorTable.cs
new file mode 100644
index 0000000..c750200
--- /dev/null
+++ b/Source/Core/Windows/TanColorTable.cs
@@ -0,0 +1,775 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Windows.Forms;
+using System.IO;
+using System.Drawing;
+using System.Windows.Forms.VisualStyles;
+using Microsoft.Win32;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Windows
+{
+	// Taken from http://blogs.msdn.com/jfoscoding/archive/2005/11/06/489641.aspx
+	
+	internal class TanColorTable : ProfessionalColorTable
+	{
+		// Methods
+		public TanColorTable()
+		{
+		}
+
+		internal Color FromKnownColor(KnownColors color)
+		{
+			return this.ColorTable[color];
+		}
+
+		internal static void InitTanLunaColors(ref Dictionary<KnownColors, Color> rgbTable)
+		{
+			rgbTable[KnownColors.GripDark] = Color.FromArgb(0xc1, 190, 0xb3);
+			rgbTable[KnownColors.SeparatorDark] = Color.FromArgb(0xc5, 0xc2, 0xb8);
+			rgbTable[KnownColors.MenuItemSelected] = Color.FromArgb(0xc1, 210, 0xee);
+			rgbTable[KnownColors.ButtonPressedBorder] = Color.FromArgb(0x31, 0x6a, 0xc5);
+			rgbTable[KnownColors.CheckBackground] = Color.FromArgb(0xe1, 230, 0xe8);
+			rgbTable[KnownColors.MenuItemBorder] = Color.FromArgb(0x31, 0x6a, 0xc5);
+			rgbTable[KnownColors.CheckBackgroundMouseOver] = Color.FromArgb(0x31, 0x6a, 0xc5);
+			rgbTable[KnownColors.MenuItemBorderMouseOver] = Color.FromArgb(0x4b, 0x4b, 0x6f);
+			rgbTable[KnownColors.ToolStripDropDownBackground] = Color.FromArgb(0xfc, 0xfc, 0xf9);
+			rgbTable[KnownColors.MenuBorder] = Color.FromArgb(0x8a, 0x86, 0x7a);
+			rgbTable[KnownColors.SeparatorLight] = Color.FromArgb(0xff, 0xff, 0xff);
+			rgbTable[KnownColors.ToolStripBorder] = Color.FromArgb(0xa3, 0xa3, 0x7c);
+			rgbTable[KnownColors.MenuStripGradientBegin] = Color.FromArgb(0xe5, 0xe5, 0xd7);
+			rgbTable[KnownColors.MenuStripGradientEnd] = Color.FromArgb(0xf4, 0xf2, 0xe8);
+			rgbTable[KnownColors.ImageMarginGradientBegin] = Color.FromArgb(0xfe, 0xfe, 0xfb);
+			rgbTable[KnownColors.ImageMarginGradientMiddle] = Color.FromArgb(0xec, 0xe7, 0xe0);
+			rgbTable[KnownColors.ImageMarginGradientEnd] = Color.FromArgb(0xbd, 0xbd, 0xa3);
+			rgbTable[KnownColors.OverflowButtonGradientBegin] = Color.FromArgb(0xf3, 0xf2, 240);
+			rgbTable[KnownColors.OverflowButtonGradientMiddle] = Color.FromArgb(0xe2, 0xe1, 0xdb);
+			rgbTable[KnownColors.OverflowButtonGradientEnd] = Color.FromArgb(0x92, 0x92, 0x76);
+			rgbTable[KnownColors.MenuItemPressedGradientBegin] = Color.FromArgb(0xfc, 0xfc, 0xf9);
+			rgbTable[KnownColors.MenuItemPressedGradientEnd] = Color.FromArgb(0xf6, 0xf4, 0xec);
+			rgbTable[KnownColors.ImageMarginRevealedGradientBegin] = Color.FromArgb(0xf7, 0xf6, 0xef);
+			rgbTable[KnownColors.ImageMarginRevealedGradientMiddle] = Color.FromArgb(0xf2, 240, 0xe4);
+			rgbTable[KnownColors.ImageMarginRevealedGradientEnd] = Color.FromArgb(230, 0xe3, 210);
+			rgbTable[KnownColors.ButtonCheckedGradientBegin] = Color.FromArgb(0xe1, 230, 0xe8);
+			rgbTable[KnownColors.ButtonCheckedGradientMiddle] = Color.FromArgb(0xe1, 230, 0xe8);
+			rgbTable[KnownColors.ButtonCheckedGradientEnd] = Color.FromArgb(0xe1, 230, 0xe8);
+			rgbTable[KnownColors.ButtonSelectedGradientBegin] = Color.FromArgb(0xc1, 210, 0xee);
+			rgbTable[KnownColors.ButtonSelectedGradientMiddle] = Color.FromArgb(0xc1, 210, 0xee);
+			rgbTable[KnownColors.ButtonSelectedGradientEnd] = Color.FromArgb(0xc1, 210, 0xee);
+			rgbTable[KnownColors.ButtonPressedGradientBegin] = Color.FromArgb(0x98, 0xb5, 0xe2);
+			rgbTable[KnownColors.ButtonPressedGradientMiddle] = Color.FromArgb(0x98, 0xb5, 0xe2);
+			rgbTable[KnownColors.ButtonPressedGradientEnd] = Color.FromArgb(0x98, 0xb5, 0xe2);
+			rgbTable[KnownColors.GripLight] = Color.FromArgb(0xff, 0xff, 0xff);
+		}
+
+		public override Color ButtonCheckedGradientBegin
+		{
+			get
+			{
+				if(!this.UseBaseColorTable)
+				{
+					return this.FromKnownColor(KnownColors.ButtonCheckedGradientBegin);
+				}
+				return base.ButtonCheckedGradientBegin;
+			}
+		}
+
+		public override Color ButtonCheckedGradientEnd
+		{
+			get
+			{
+				if(!this.UseBaseColorTable)
+				{
+					return this.FromKnownColor(KnownColors.ButtonCheckedGradientEnd);
+				}
+				return base.ButtonCheckedGradientEnd;
+			}
+		}
+
+		public override Color ButtonCheckedGradientMiddle
+		{
+			get
+			{
+				if(!this.UseBaseColorTable)
+				{
+					return this.FromKnownColor(KnownColors.ButtonCheckedGradientMiddle);
+				}
+				return base.ButtonCheckedGradientMiddle;
+			}
+		}
+
+
+		public override Color ButtonPressedBorder
+		{
+			get
+			{
+				if(!this.UseBaseColorTable)
+				{
+					return this.FromKnownColor(KnownColors.ButtonPressedBorder);
+				}
+				return base.ButtonPressedBorder;
+			}
+		}
+
+		public override Color ButtonPressedGradientBegin
+		{
+			get
+			{
+				if(!this.UseBaseColorTable)
+				{
+					return this.FromKnownColor(KnownColors.ButtonPressedGradientBegin);
+				}
+				return base.ButtonPressedGradientBegin;
+			}
+		}
+
+		public override Color ButtonPressedGradientEnd
+		{
+			get
+			{
+				if(!this.UseBaseColorTable)
+				{
+					return this.FromKnownColor(KnownColors.ButtonPressedGradientEnd);
+				}
+				return base.ButtonPressedGradientEnd;
+			}
+		}
+
+
+		public override Color ButtonPressedGradientMiddle
+		{
+			get
+			{
+				if(!this.UseBaseColorTable)
+				{
+					return this.FromKnownColor(KnownColors.ButtonPressedGradientMiddle);
+				}
+				return base.ButtonPressedGradientMiddle;
+			}
+		}
+
+		public override Color ButtonSelectedBorder
+		{
+			get
+			{
+				if(!this.UseBaseColorTable)
+				{
+					return this.FromKnownColor(KnownColors.ButtonPressedBorder);
+				}
+				return base.ButtonSelectedBorder;
+			}
+		}
+
+
+		public override Color ButtonSelectedGradientBegin
+		{
+			get
+			{
+				if(!this.UseBaseColorTable)
+				{
+					return this.FromKnownColor(KnownColors.ButtonSelectedGradientBegin);
+				}
+				return base.ButtonSelectedGradientBegin;
+			}
+		}
+		public override Color ButtonSelectedGradientEnd
+		{
+			get
+			{
+				if(!this.UseBaseColorTable)
+				{
+					return this.FromKnownColor(KnownColors.ButtonSelectedGradientEnd);
+				}
+				return base.ButtonSelectedGradientEnd;
+			}
+		}
+		public override Color ButtonSelectedGradientMiddle
+		{
+			get
+			{
+				if(!this.UseBaseColorTable)
+				{
+					return this.FromKnownColor(KnownColors.ButtonSelectedGradientMiddle);
+				}
+				return base.ButtonSelectedGradientMiddle;
+			}
+		}
+
+		public override Color CheckBackground
+		{
+			get
+			{
+				if(!this.UseBaseColorTable)
+				{
+					return this.FromKnownColor(KnownColors.CheckBackground);
+				}
+				return base.CheckBackground;
+			}
+		}
+
+		public override Color CheckPressedBackground
+		{
+			get
+			{
+				if(!this.UseBaseColorTable)
+				{
+					return this.FromKnownColor(KnownColors.CheckBackgroundMouseOver);
+				}
+				return base.CheckPressedBackground;
+			}
+		}
+
+		public override Color CheckSelectedBackground
+		{
+			get
+			{
+				if(!this.UseBaseColorTable)
+				{
+					return this.FromKnownColor(KnownColors.CheckBackgroundMouseOver);
+				}
+				return base.CheckSelectedBackground;
+			}
+		}
+
+
+		internal static string ColorScheme
+		{
+			get
+			{
+				return DisplayInformation.ColorScheme;
+			}
+		}
+
+		private Dictionary<KnownColors, Color> ColorTable
+		{
+			get
+			{
+				if(this.tanRGB == null)
+				{
+					this.tanRGB = new Dictionary<KnownColors, Color>((int)KnownColors.LastKnownColor);
+					InitTanLunaColors(ref this.tanRGB);
+				}
+				return this.tanRGB;
+			}
+		}
+
+		public override Color GripDark
+		{
+			get
+			{
+				if(!this.UseBaseColorTable)
+				{
+					return this.FromKnownColor(KnownColors.GripDark);
+				}
+				return base.GripDark;
+			}
+		}
+
+		public override Color GripLight
+		{
+			get
+			{
+				if(!this.UseBaseColorTable)
+				{
+					return this.FromKnownColor(KnownColors.GripLight);
+				}
+				return base.GripLight;
+			}
+		}
+		public override Color ImageMarginGradientBegin
+		{
+			get
+			{
+				if(!this.UseBaseColorTable)
+				{
+					return this.FromKnownColor(KnownColors.ImageMarginGradientBegin);
+				}
+				return base.ImageMarginGradientBegin;
+			}
+		}
+
+		public override Color ImageMarginGradientEnd
+		{
+			get
+			{
+				if(!this.UseBaseColorTable)
+				{
+					return this.FromKnownColor(KnownColors.ImageMarginGradientEnd);
+				}
+				return base.ImageMarginGradientEnd;
+			}
+		}
+
+		public override Color ImageMarginGradientMiddle
+		{
+			get
+			{
+				if(!this.UseBaseColorTable)
+				{
+					return this.FromKnownColor(KnownColors.ImageMarginGradientMiddle);
+				}
+				return base.ImageMarginGradientMiddle;
+			}
+		}
+
+		public override Color ImageMarginRevealedGradientBegin
+		{
+			get
+			{
+				if(!this.UseBaseColorTable)
+				{
+					return this.FromKnownColor(KnownColors.ImageMarginRevealedGradientBegin);
+				}
+				return base.ImageMarginRevealedGradientBegin;
+			}
+		}
+
+		public override Color ImageMarginRevealedGradientEnd
+		{
+			get
+			{
+				if(!this.UseBaseColorTable)
+				{
+					return this.FromKnownColor(KnownColors.ImageMarginRevealedGradientEnd);
+				}
+				return base.ImageMarginRevealedGradientEnd;
+			}
+		}
+
+		public override Color ImageMarginRevealedGradientMiddle
+		{
+			get
+			{
+				if(!this.UseBaseColorTable)
+				{
+					return this.FromKnownColor(KnownColors.ImageMarginRevealedGradientMiddle);
+				}
+				return base.ImageMarginRevealedGradientMiddle;
+			}
+		}
+
+		public override Color MenuBorder
+		{
+			get
+			{
+				if(!this.UseBaseColorTable)
+				{
+					return this.FromKnownColor(KnownColors.MenuBorder);
+				}
+				return base.MenuItemBorder;
+			}
+		}
+
+
+		public override Color MenuItemBorder
+		{
+			get
+			{
+				if(!this.UseBaseColorTable)
+				{
+					return this.FromKnownColor(KnownColors.MenuItemBorder);
+				}
+				return base.MenuItemBorder;
+			}
+		}
+
+		public override Color MenuItemPressedGradientBegin
+		{
+			get
+			{
+				if(!this.UseBaseColorTable)
+				{
+					return this.FromKnownColor(KnownColors.MenuItemPressedGradientBegin);
+				}
+				return base.MenuItemPressedGradientBegin;
+			}
+		}
+
+		public override Color MenuItemPressedGradientEnd
+		{
+			get
+			{
+				if(!this.UseBaseColorTable)
+				{
+					return this.FromKnownColor(KnownColors.MenuItemPressedGradientEnd);
+				}
+				return base.MenuItemPressedGradientEnd;
+			}
+		}
+
+		public override Color MenuItemPressedGradientMiddle
+		{
+			get
+			{
+				if(!this.UseBaseColorTable)
+				{
+					return this.FromKnownColor(KnownColors.ImageMarginRevealedGradientMiddle);
+				}
+				return base.MenuItemPressedGradientMiddle;
+			}
+		}
+
+		public override Color MenuItemSelected
+		{
+			get
+			{
+				if(!this.UseBaseColorTable)
+				{
+					return this.FromKnownColor(KnownColors.MenuItemSelected);
+				}
+				return base.MenuItemSelected;
+			}
+		}
+
+		public override Color MenuItemSelectedGradientBegin
+		{
+			get
+			{
+				if(!this.UseBaseColorTable)
+				{
+					return this.FromKnownColor(KnownColors.ButtonSelectedGradientBegin);
+				}
+				return base.MenuItemSelectedGradientBegin;
+			}
+		}
+
+		public override Color MenuItemSelectedGradientEnd
+		{
+			get
+			{
+				if(!this.UseBaseColorTable)
+				{
+					return this.FromKnownColor(KnownColors.ButtonSelectedGradientEnd);
+				}
+				return base.MenuItemSelectedGradientEnd;
+			}
+		}
+
+
+		public override Color MenuStripGradientBegin
+		{
+			get
+			{
+				if(!this.UseBaseColorTable)
+				{
+					return this.FromKnownColor(KnownColors.MenuStripGradientBegin);
+				}
+				return base.MenuStripGradientBegin;
+			}
+		}
+
+		public override Color MenuStripGradientEnd
+		{
+			get
+			{
+				if(!this.UseBaseColorTable)
+				{
+					return this.FromKnownColor(KnownColors.MenuStripGradientEnd);
+				}
+				return base.MenuStripGradientEnd;
+			}
+		}
+
+		public override Color OverflowButtonGradientBegin
+		{
+			get
+			{
+				if(!this.UseBaseColorTable)
+				{
+					return this.FromKnownColor(KnownColors.OverflowButtonGradientBegin);
+				}
+				return base.OverflowButtonGradientBegin;
+			}
+		}
+
+		public override Color OverflowButtonGradientEnd
+		{
+			get
+			{
+				if(!this.UseBaseColorTable)
+				{
+					return this.FromKnownColor(KnownColors.OverflowButtonGradientEnd);
+				}
+				return base.OverflowButtonGradientEnd;
+			}
+		}
+
+		public override Color OverflowButtonGradientMiddle
+		{
+			get
+			{
+				if(!this.UseBaseColorTable)
+				{
+					return this.FromKnownColor(KnownColors.OverflowButtonGradientMiddle);
+				}
+				return base.OverflowButtonGradientMiddle;
+			}
+		}
+
+
+		public override Color RaftingContainerGradientBegin
+		{
+			get
+			{
+				if(!this.UseBaseColorTable)
+				{
+					return this.FromKnownColor(KnownColors.MenuStripGradientBegin);
+				}
+				return base.RaftingContainerGradientBegin;
+			}
+		}
+
+		public override Color RaftingContainerGradientEnd
+		{
+			get
+			{
+				if(!this.UseBaseColorTable)
+				{
+					return this.FromKnownColor(KnownColors.MenuStripGradientEnd);
+				}
+				return base.RaftingContainerGradientEnd;
+			}
+		}
+
+
+		public override Color SeparatorDark
+		{
+			get
+			{
+				if(!this.UseBaseColorTable)
+				{
+					return this.FromKnownColor(KnownColors.SeparatorDark);
+				}
+				return base.SeparatorDark;
+			}
+		}
+
+		public override Color SeparatorLight
+		{
+			get
+			{
+				if(!this.UseBaseColorTable)
+				{
+					return this.FromKnownColor(KnownColors.SeparatorLight);
+				}
+				return base.SeparatorLight;
+			}
+		}
+
+		public override Color ToolStripBorder
+		{
+			get
+			{
+				if(!this.UseBaseColorTable)
+				{
+					return this.FromKnownColor(KnownColors.ToolStripBorder);
+				}
+				return base.ToolStripBorder;
+			}
+		}
+
+
+		public override Color ToolStripDropDownBackground
+		{
+			get
+			{
+				if(!this.UseBaseColorTable)
+				{
+					return this.FromKnownColor(KnownColors.ToolStripDropDownBackground);
+				}
+				return base.ToolStripDropDownBackground;
+			}
+		}
+
+		public override Color ToolStripGradientBegin
+		{
+			get
+			{
+				if(!this.UseBaseColorTable)
+				{
+					return this.FromKnownColor(KnownColors.ImageMarginGradientBegin);
+				}
+				return base.ToolStripGradientBegin;
+			}
+		}
+
+		public override Color ToolStripGradientEnd
+		{
+			get
+			{
+				if(!this.UseBaseColorTable)
+				{
+					return this.FromKnownColor(KnownColors.ImageMarginGradientEnd);
+				}
+				return base.ToolStripGradientEnd;
+			}
+		}
+
+		public override Color ToolStripGradientMiddle
+		{
+			get
+			{
+				if(!this.UseBaseColorTable)
+				{
+					return this.FromKnownColor(KnownColors.ImageMarginGradientMiddle);
+				}
+				return base.ToolStripGradientMiddle;
+			}
+		}
+
+		private bool UseBaseColorTable
+		{
+			get
+			{
+				bool flag1 = !DisplayInformation.IsLunaTheme ||
+								((ColorScheme != oliveColorScheme) &&
+								 (ColorScheme != blueColorScheme));
+				if(flag1 && (this.tanRGB != null))
+				{
+					this.tanRGB.Clear();
+					this.tanRGB = null;
+				}
+				return flag1;
+			}
+		}
+
+
+
+		// Fields
+		private const string blueColorScheme = "NormalColor";
+		private const string oliveColorScheme = "HomeStead";
+		//private const string silverColorScheme = "Metallic";
+		private Dictionary<KnownColors, Color> tanRGB;
+
+		// Nested Types
+		private static class DisplayInformation
+		{
+			// Methods
+			static DisplayInformation()
+			{
+				SystemEvents.UserPreferenceChanged += OnUserPreferenceChanged;
+				SetScheme();
+			}
+
+			private static void OnUserPreferenceChanged(object sender, UserPreferenceChangedEventArgs e)
+			{
+				SetScheme();
+			}
+
+			private static void SetScheme()
+			{
+				isLunaTheme = false;
+				if(VisualStyleRenderer.IsSupported)
+				{
+					colorScheme = VisualStyleInformation.ColorScheme;
+
+					if(!VisualStyleInformation.IsEnabledByUser)
+					{
+						return;
+					}
+					StringBuilder builder1 = new StringBuilder(0x200);
+					GetCurrentThemeName(builder1, builder1.Capacity, null, 0, null, 0);
+					string text1 = builder1.ToString();
+					isLunaTheme = string.Equals(lunaFileName, Path.GetFileName(text1), StringComparison.InvariantCultureIgnoreCase);
+				}
+				else
+				{
+					colorScheme = null;
+				}
+			}
+
+
+			// Properties
+
+			public static string ColorScheme
+			{
+				get
+				{
+					return colorScheme;
+				}
+			}
+
+			internal static bool IsLunaTheme
+			{
+				get
+				{
+					return isLunaTheme;
+				}
+			}
+
+			// Fields
+			[ThreadStatic]
+			private static string colorScheme;
+			[ThreadStatic]
+			private static bool isLunaTheme;
+			private const string lunaFileName = "luna.msstyles";
+
+			[DllImport("uxtheme.dll", CharSet = CharSet.Auto)]
+			public static extern int GetCurrentThemeName(StringBuilder pszThemeFileName, int dwMaxNameChars, StringBuilder pszColorBuff, int dwMaxColorChars, StringBuilder pszSizeBuff, int cchMaxSizeChars);
+
+		}
+
+		internal enum KnownColors
+		{
+			ButtonPressedBorder,
+			MenuItemBorder,
+			MenuItemBorderMouseOver,
+			MenuItemSelected,
+			CheckBackground,
+			CheckBackgroundMouseOver,
+			GripDark,
+			GripLight,
+			MenuStripGradientBegin,
+			MenuStripGradientEnd,
+			ImageMarginRevealedGradientBegin,
+			ImageMarginRevealedGradientEnd,
+			ImageMarginRevealedGradientMiddle,
+			MenuItemPressedGradientBegin,
+			MenuItemPressedGradientEnd,
+			ButtonPressedGradientBegin,
+			ButtonPressedGradientEnd,
+			ButtonPressedGradientMiddle,
+			ButtonSelectedGradientBegin,
+			ButtonSelectedGradientEnd,
+			ButtonSelectedGradientMiddle,
+			OverflowButtonGradientBegin,
+			OverflowButtonGradientEnd,
+			OverflowButtonGradientMiddle,
+			ButtonCheckedGradientBegin,
+			ButtonCheckedGradientEnd,
+			ButtonCheckedGradientMiddle,
+			ImageMarginGradientBegin,
+			ImageMarginGradientEnd,
+			ImageMarginGradientMiddle,
+			MenuBorder,
+			ToolStripDropDownBackground,
+			ToolStripBorder,
+			SeparatorDark,
+			SeparatorLight,
+			LastKnownColor = SeparatorLight,
+
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/TextEditForm.Designer.cs b/Source/Core/Windows/TextEditForm.Designer.cs
new file mode 100644
index 0000000..309f20c
--- /dev/null
+++ b/Source/Core/Windows/TextEditForm.Designer.cs
@@ -0,0 +1,110 @@
+namespace CodeImp.DoomBuilder.Windows
+{
+	/// <summary>
+	/// Dialog window that allows entering a multiline text string.
+	/// </summary>
+	partial class TextEditForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.cancel = new System.Windows.Forms.Button();
+			this.apply = new System.Windows.Forms.Button();
+			this.textbox = new System.Windows.Forms.TextBox();
+			this.SuspendLayout();
+			// 
+			// cancel
+			// 
+			this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.cancel.Location = new System.Drawing.Point(354, 224);
+			this.cancel.Margin = new System.Windows.Forms.Padding(1);
+			this.cancel.Name = "cancel";
+			this.cancel.Size = new System.Drawing.Size(112, 25);
+			this.cancel.TabIndex = 2;
+			this.cancel.TabStop = false;
+			this.cancel.Text = "Cancel";
+			this.cancel.UseVisualStyleBackColor = true;
+			this.cancel.Click += new System.EventHandler(this.cancel_Click);
+			// 
+			// apply
+			// 
+			this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.apply.Location = new System.Drawing.Point(235, 224);
+			this.apply.Margin = new System.Windows.Forms.Padding(1);
+			this.apply.Name = "apply";
+			this.apply.Size = new System.Drawing.Size(112, 25);
+			this.apply.TabIndex = 1;
+			this.apply.TabStop = false;
+			this.apply.Text = "OK";
+			this.apply.UseVisualStyleBackColor = true;
+			this.apply.Click += new System.EventHandler(this.apply_Click);
+			// 
+			// textbox
+			// 
+			this.textbox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.textbox.Location = new System.Drawing.Point(10, 10);
+			this.textbox.Margin = new System.Windows.Forms.Padding(1);
+			this.textbox.Multiline = true;
+			this.textbox.Name = "textbox";
+			this.textbox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
+			this.textbox.Size = new System.Drawing.Size(456, 204);
+			this.textbox.TabIndex = 0;
+			this.textbox.TabStop = false;
+			// 
+			// TextEditForm
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.CancelButton = this.cancel;
+			this.ClientSize = new System.Drawing.Size(476, 255);
+			this.Controls.Add(this.textbox);
+			this.Controls.Add(this.cancel);
+			this.Controls.Add(this.apply);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "TextEditForm";
+			this.Opacity = 1;
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Edit Text";
+			this.Activated += new System.EventHandler(this.TextEditForm_Activated);
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Button cancel;
+		private System.Windows.Forms.Button apply;
+		private System.Windows.Forms.TextBox textbox;
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/TextEditForm.cs b/Source/Core/Windows/TextEditForm.cs
new file mode 100644
index 0000000..5c798c7
--- /dev/null
+++ b/Source/Core/Windows/TextEditForm.cs
@@ -0,0 +1,71 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Windows.Forms;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Windows
+{
+	public partial class TextEditForm : DelayedForm
+	{
+		// Properties
+		public string Value { get { return textbox.Text; } set { textbox.Text = value; } }
+
+		// Constructor
+		public TextEditForm()
+		{
+			// Initialize
+			InitializeComponent();
+		}
+
+		// This shows the dialog, returns the same value when cancelled
+		public static string ShowDialog(IWin32Window owner, string value)
+		{
+			TextEditForm f = new TextEditForm();
+			f.Value = value;
+			if(f.ShowDialog(owner) == DialogResult.OK) value = f.Value;
+			f.Dispose();
+			return value;
+		}
+
+		// OK clicked
+		private void apply_Click(object sender, EventArgs e)
+		{
+			// Done
+			this.DialogResult = DialogResult.OK;
+			this.Close();
+		}
+
+		// Cancel clciked
+		private void cancel_Click(object sender, EventArgs e)
+		{
+			// Be gone
+			this.DialogResult = DialogResult.Cancel;
+			this.Close();
+		}
+
+		// Window activated
+		private void TextEditForm_Activated(object sender, EventArgs e)
+		{
+			// Focus to textbox
+			textbox.Focus();
+		}
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/TextEditForm.resx b/Source/Core/Windows/TextEditForm.resx
new file mode 100644
index 0000000..19dc0dd
--- /dev/null
+++ b/Source/Core/Windows/TextEditForm.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Windows/TextureBrowserForm.Designer.cs b/Source/Core/Windows/TextureBrowserForm.Designer.cs
new file mode 100644
index 0000000..5875140
--- /dev/null
+++ b/Source/Core/Windows/TextureBrowserForm.Designer.cs
@@ -0,0 +1,195 @@
+namespace CodeImp.DoomBuilder.Windows
+{
+	partial class TextureBrowserForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.components = new System.ComponentModel.Container();
+			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TextureBrowserForm));
+			this.cancel = new System.Windows.Forms.Button();
+			this.apply = new System.Windows.Forms.Button();
+			this.smallimages = new System.Windows.Forms.ImageList(this.components);
+			this.tvTextureSets = new CodeImp.DoomBuilder.GZBuilder.Controls.MultiSelectTreeview();
+			this.browser = new CodeImp.DoomBuilder.Controls.ImageBrowserControl();
+			this.panel = new System.Windows.Forms.Panel();
+			this.splitter = new CodeImp.DoomBuilder.Controls.CollapsibleSplitContainer();
+			this.panel.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.splitter)).BeginInit();
+			this.splitter.Panel1.SuspendLayout();
+			this.splitter.Panel2.SuspendLayout();
+			this.splitter.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// cancel
+			// 
+			this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.cancel.Location = new System.Drawing.Point(683, 411);
+			this.cancel.Name = "cancel";
+			this.cancel.Size = new System.Drawing.Size(98, 25);
+			this.cancel.TabIndex = 3;
+			this.cancel.TabStop = false;
+			this.cancel.Text = "Cancel";
+			this.cancel.UseVisualStyleBackColor = true;
+			this.cancel.Click += new System.EventHandler(this.cancel_Click);
+			// 
+			// apply
+			// 
+			this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.apply.Location = new System.Drawing.Point(581, 411);
+			this.apply.Name = "apply";
+			this.apply.Size = new System.Drawing.Size(98, 25);
+			this.apply.TabIndex = 2;
+			this.apply.TabStop = false;
+			this.apply.Text = "OK";
+			this.apply.UseVisualStyleBackColor = true;
+			this.apply.Click += new System.EventHandler(this.apply_Click);
+			// 
+			// smallimages
+			// 
+			this.smallimages.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("smallimages.ImageStream")));
+			this.smallimages.TransparentColor = System.Drawing.Color.Transparent;
+			this.smallimages.Images.SetKeyName(0, "KnownTextureSet2.ico");
+			this.smallimages.Images.SetKeyName(1, "AllTextureSet2.ico");
+			this.smallimages.Images.SetKeyName(2, "FileTextureSet.ico");
+			this.smallimages.Images.SetKeyName(3, "FolderTextureSet.ico");
+			this.smallimages.Images.SetKeyName(4, "PK3TextureSet.ico");
+			this.smallimages.Images.SetKeyName(5, "WadTextureSet.png");
+			this.smallimages.Images.SetKeyName(6, "FolderImage.png");
+			this.smallimages.Images.SetKeyName(7, "ArchiveImage.png");
+			this.smallimages.Images.SetKeyName(8, "TextLump.png");
+			// 
+			// tvTextureSets
+			// 
+			this.tvTextureSets.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.tvTextureSets.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.tvTextureSets.HideSelection = false;
+			this.tvTextureSets.ImageIndex = 0;
+			this.tvTextureSets.ImageList = this.smallimages;
+			this.tvTextureSets.Location = new System.Drawing.Point(0, 3);
+			this.tvTextureSets.Name = "tvTextureSets";
+			this.tvTextureSets.SelectedImageIndex = 0;
+			this.tvTextureSets.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+			this.tvTextureSets.SelectionMode = CodeImp.DoomBuilder.GZBuilder.Controls.TreeViewSelectionMode.SingleSelect;
+			this.tvTextureSets.Size = new System.Drawing.Size(198, 402);
+			this.tvTextureSets.TabIndex = 4;
+			this.tvTextureSets.TabStop = false;
+			this.tvTextureSets.KeyUp += new System.Windows.Forms.KeyEventHandler(this.tvTextureSets_KeyUp);
+			this.tvTextureSets.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.tvTextureSets_NodeMouseClick);
+			// 
+			// browser
+			// 
+			this.browser.BrowseFlats = false;
+			this.browser.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.browser.HideInputBox = false;
+			this.browser.Location = new System.Drawing.Point(0, 0);
+			this.browser.Margin = new System.Windows.Forms.Padding(3, 3, 0, 3);
+			this.browser.Name = "browser";
+			this.browser.Padding = new System.Windows.Forms.Padding(3, 3, 0, 3);
+			this.browser.PreventSelection = false;
+			this.browser.Size = new System.Drawing.Size(573, 442);
+			this.browser.TabIndex = 1;
+			this.browser.TabStop = false;
+			this.browser.SelectedItemDoubleClicked += new CodeImp.DoomBuilder.Controls.ImageBrowserControl.SelectedItemDoubleClickDelegate(this.browser_SelectedItemDoubleClicked);
+			this.browser.SelectedItemChanged += new CodeImp.DoomBuilder.Controls.ImageBrowserControl.SelectedItemChangedDelegate(this.browser_SelectedItemChanged);
+			// 
+			// panel
+			// 
+			this.panel.Controls.Add(this.tvTextureSets);
+			this.panel.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.panel.Location = new System.Drawing.Point(0, 0);
+			this.panel.Name = "panel";
+			this.panel.Size = new System.Drawing.Size(203, 442);
+			this.panel.TabIndex = 6;
+			// 
+			// splitter
+			// 
+			this.splitter.Cursor = System.Windows.Forms.Cursors.Hand;
+			this.splitter.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.splitter.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
+			this.splitter.Location = new System.Drawing.Point(0, 0);
+			this.splitter.Name = "splitter";
+			// 
+			// splitter.Panel1
+			// 
+			this.splitter.Panel1.Controls.Add(this.browser);
+			// 
+			// splitter.Panel2
+			// 
+			this.splitter.Panel2.Controls.Add(this.panel);
+			this.splitter.Panel2MinSize = 100;
+			this.splitter.Size = new System.Drawing.Size(784, 442);
+			this.splitter.SplitterDistance = 573;
+			this.splitter.TabIndex = 0;
+			this.splitter.TabStop = false;
+			// 
+			// TextureBrowserForm
+			// 
+			this.AcceptButton = this.apply;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.CancelButton = this.cancel;
+			this.ClientSize = new System.Drawing.Size(784, 442);
+			this.Controls.Add(this.apply);
+			this.Controls.Add(this.cancel);
+			this.Controls.Add(this.splitter);
+			this.MinimizeBox = false;
+			this.Name = "TextureBrowserForm";
+			this.Opacity = 1;
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
+			this.Text = "Browse Textures";
+			this.Load += new System.EventHandler(this.TextureBrowserForm_Load);
+			this.Shown += new System.EventHandler(this.TextureBrowserForm_Shown);
+			this.Activated += new System.EventHandler(this.TextureBrowserForm_Activated);
+			this.Move += new System.EventHandler(this.TextureBrowserForm_Move);
+			this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.TextureBrowserForm_FormClosing);
+			this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.TextureBrowserForm_HelpRequested);
+			this.ResizeEnd += new System.EventHandler(this.TextureBrowserForm_ResizeEnd);
+			this.panel.ResumeLayout(false);
+			this.splitter.Panel1.ResumeLayout(false);
+			this.splitter.Panel2.ResumeLayout(false);
+			((System.ComponentModel.ISupportInitialize)(this.splitter)).EndInit();
+			this.splitter.ResumeLayout(false);
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private CodeImp.DoomBuilder.Controls.ImageBrowserControl browser;
+		private System.Windows.Forms.Button cancel;
+		private System.Windows.Forms.Button apply;
+		private System.Windows.Forms.ImageList smallimages;
+		private CodeImp.DoomBuilder.GZBuilder.Controls.MultiSelectTreeview tvTextureSets;
+		private System.Windows.Forms.Panel panel;
+		private CodeImp.DoomBuilder.Controls.CollapsibleSplitContainer splitter;
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/TextureBrowserForm.cs b/Source/Core/Windows/TextureBrowserForm.cs
new file mode 100644
index 0000000..5b4cd18
--- /dev/null
+++ b/Source/Core/Windows/TextureBrowserForm.cs
@@ -0,0 +1,572 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Controls;
+using CodeImp.DoomBuilder.IO;
+using CodeImp.DoomBuilder.Data;
+using CodeImp.DoomBuilder.Config;
+using System.IO;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Windows
+{
+	internal partial class TextureBrowserForm : DelayedForm
+	{
+		// Variables
+		private string selectedname;
+		private Point lastposition;
+		private Size lastsize;
+		private readonly ListViewGroup usedgroup;
+		private readonly ListViewGroup availgroup;
+		private TreeNode selectedset; //mxd
+		private long selecttextureonfill; //mxd. Was string, which wasn't reliable whem dealing with long texture names
+		private readonly bool usedgroupcollapsed; //mxd
+		private readonly bool browseflats; //mxd
+		
+		// Properties
+		public string SelectedName { get { return selectedname; } }
+		
+		// Constructor
+		public TextureBrowserForm(string selecttexture, bool browseflats)
+		{
+			Cursor.Current = Cursors.WaitCursor;
+			General.Interface.DisableProcessing(); //mxd
+
+			TreeNode item; //mxd
+			long longname = Lump.MakeLongName(selecttexture ?? "");
+			longname = (browseflats ? General.Map.Data.GetFullLongFlatName(longname) : General.Map.Data.GetFullLongTextureName(longname)); //mxd
+			int count; //mxd
+			selectedset = null; //mxd
+			this.browseflats = browseflats; //mxd
+			
+			// Initialize
+			InitializeComponent();
+
+			//mxd. Set title
+			string imagetype = (browseflats ? "flats" : "textures");
+			this.Text = "Browse " + imagetype;
+
+			// Setup texture browser
+			ImageBrowserControl.ShowTexturesFromSubDirectories = General.Settings.ReadSetting("browserwindow.showtexturesfromsubdirs", true);
+			ImageBrowserControl.UseLongTextureNames = General.Map.Options.UseLongTextureNames;
+			browser.BrowseFlats = browseflats;
+			browser.ApplySettings();
+			
+			// Update the used textures
+			General.Map.Data.UpdateUsedTextures();
+
+			tvTextureSets.BeginUpdate(); //mxd
+
+			//mxd. Texture longname to select when list is filled
+			selecttextureonfill = longname;
+
+			// Make groups
+			usedgroup = browser.AddGroup("Used " + imagetype + ":");
+			availgroup = browser.AddGroup("Available " + imagetype + ":");
+
+			//mxd. Make "Used" group collapsible
+			usedgroupcollapsed = General.Settings.ReadSetting("browserwindow.usedgroupcollapsed", false);
+			browser.SetGroupCollapsed(usedgroup, usedgroupcollapsed);
+
+			//mxd. Fill texture sets list with normal texture sets
+			foreach(IFilledTextureSet ts in General.Map.Data.TextureSets) 
+			{
+				count = (browseflats ? ts.Flats.Count : ts.Textures.Count);
+				if((count == 0 && !General.Map.Config.MixTexturesFlats) || (ts.Flats.Count == 0 && ts.Textures.Count == 0)) 
+					continue;
+
+				item = tvTextureSets.Nodes.Add(ts.Name + " [" + count + "]");
+				item.Name = ts.Name;
+				item.Tag = ts;
+				item.ImageIndex = 0;
+			}
+
+			//mxd. Add container-specific texture sets
+			foreach(ResourceTextureSet ts in General.Map.Data.ResourceTextureSets)
+			{
+				count = (browseflats ? ts.Flats.Count : ts.Textures.Count);
+				if((count == 0 && !General.Map.Config.MixTexturesFlats) || (ts.Flats.Count == 0 && ts.Textures.Count == 0))
+					continue;
+
+				item = tvTextureSets.Nodes.Add(ts.Name + " [" + count + "]");
+				item.Name = ts.Name;
+				item.Tag = ts;
+				item.ImageIndex = 2 + ts.Location.type;
+				item.SelectedImageIndex = item.ImageIndex;
+
+				CreateNodes(item);
+				item.Expand();
+			}
+
+			//mxd. Add "All" texture set
+			count = (browseflats ? General.Map.Data.AllTextureSet.Flats.Count : General.Map.Data.AllTextureSet.Textures.Count);
+			item = tvTextureSets.Nodes.Add(General.Map.Data.AllTextureSet.Name + " [" + count + "]");
+			item.Name = General.Map.Data.AllTextureSet.Name;
+			item.Tag = General.Map.Data.AllTextureSet;
+			item.ImageIndex = 1;
+			item.SelectedImageIndex = item.ImageIndex;
+
+			//mxd. Should we bother finding the correct texture set?
+			if(General.Settings.LocateTextureGroup)
+			{
+				//mxd. Get the previously selected texture set
+				string selectname = General.Settings.ReadSetting("browserwindow.textureset", "");
+				TreeNode match;
+
+				// When texture name is empty, select "All" texture set
+				if(string.IsNullOrEmpty(selectname) || selectname == "-")
+				{
+					match = tvTextureSets.Nodes[tvTextureSets.Nodes.Count - 1];
+				}
+				else
+				{
+					match = FindNodeByName(tvTextureSets.Nodes, selectname);
+				}
+
+				if(match != null)
+				{
+					IFilledTextureSet set = (match.Tag as IFilledTextureSet);
+					foreach(ImageData img in (browseflats ? set.Flats : set.Textures))
+					{
+						if(img.LongName == longname)
+						{
+							selectedset = match;
+							break;
+						}
+					}
+				}
+
+				//mxd. If the selected texture was not found in the last-selected set, try finding it in the other sets
+				if(selectedset == null && selecttexture != "-")
+				{
+					foreach(TreeNode n in tvTextureSets.Nodes)
+					{
+						selectedset = FindTextureByLongName(n, longname);
+						if(selectedset != null) break;
+					}
+				}
+
+				//mxd. Texture still not found? Then just select the last used set
+				if(selectedset == null && match != null) selectedset = match;
+			}
+
+			//mxd. Select the found set or "All", if none were found
+			if(tvTextureSets.Nodes.Count > 0)
+			{
+				if(selectedset == null) selectedset = tvTextureSets.Nodes[tvTextureSets.Nodes.Count - 1];
+				tvTextureSets.SelectedNodes.Clear();
+				tvTextureSets.SelectedNodes.Add(selectedset);
+				selectedset.EnsureVisible();
+			}
+
+			tvTextureSets.EndUpdate();//mxd
+
+			// Keep last position and size
+			lastposition = this.Location;
+			lastsize = this.Size;
+
+			this.SuspendLayout();
+
+			// Position window from configuration settings
+			this.Size = new Size(General.Settings.ReadSetting("browserwindow.sizewidth", this.Size.Width),
+								 General.Settings.ReadSetting("browserwindow.sizeheight", this.Size.Height));
+			this.WindowState = (FormWindowState)General.Settings.ReadSetting("browserwindow.windowstate", (int)FormWindowState.Normal);
+			
+			//mxd
+			if(this.WindowState == FormWindowState.Normal) 
+			{
+				Point location = new Point(General.Settings.ReadSetting("browserwindow.positionx", int.MaxValue), General.Settings.ReadSetting("browserwindow.positiony", int.MaxValue));
+				if(location.X < int.MaxValue && location.Y < int.MaxValue) 
+				{
+					this.Location = location;
+				} 
+				else 
+				{
+					this.StartPosition = FormStartPosition.CenterParent;
+				}
+			}
+
+			this.ResumeLayout(true);
+
+			//mxd. Set splitter position and state (doesn't work when layout is suspended)
+			if(General.Settings.ReadSetting("browserwindow.splittercollapsed", false)) splitter.IsCollapsed = true;
+
+			//mxd. Looks like SplitterDistance is unaffected by DPI scaling. Let's fix that...
+			int splitterdistance = General.Settings.ReadSetting("browserwindow.splitterdistance", int.MinValue);
+			if(splitterdistance == int.MinValue)
+			{
+				splitterdistance = 210;
+				if(MainForm.DPIScaler.Width != 1.0f)
+				{
+					splitterdistance = (int)Math.Round(splitterdistance * MainForm.DPIScaler.Width);
+				}
+			}
+
+			splitter.SplitPosition = splitterdistance;
+		}
+
+		//mxd
+		private static int SortImageData(ImageData img1, ImageData img2) 
+		{
+			return String.Compare(img1.FilePathName, img2.FilePathName, StringComparison.Ordinal);
+		}
+
+		//mxd
+		private TreeNode FindTextureByLongName(TreeNode node, long longname) 
+		{
+			//first search in child nodes
+
+			foreach(TreeNode n in node.Nodes)
+			{
+				TreeNode match = FindTextureByLongName(n, longname);
+				if(match != null) return match;
+			}
+
+			//then - in current node
+			IFilledTextureSet set = (node.Tag as IFilledTextureSet);
+
+			foreach(ImageData img in (browseflats ? set.Flats : set.Textures))
+				if(img.LongName == longname) return node;
+
+			return null;
+		}
+
+		//mxd
+		private static TreeNode FindNodeByName(TreeNodeCollection nodes, string selectname) 
+		{
+			foreach(TreeNode n in nodes) 
+			{
+				if(n.Name == selectname) return n;
+
+				TreeNode match = FindNodeByName(n.Nodes, selectname);
+				if(match != null) return match;
+			}
+			return null;
+		}
+
+		//mxd
+		private void CreateNodes(TreeNode root) 
+		{
+			ResourceTextureSet set = root.Tag as ResourceTextureSet;
+			if(set == null) 
+			{
+				General.ErrorLogger.Add(ErrorType.Error, "Resource " + root.Name + " doesn't have TextureSet!");
+				return;
+			}
+
+			int imageIndex = set.Location.type + 5;
+			char[] separator = new[] { Path.AltDirectorySeparatorChar };
+			
+			ImageData[] images;
+			if(browseflats)
+			{
+				images = new ImageData[set.Flats.Count];
+				set.Flats.CopyTo(images, 0);
+			}
+			else
+			{
+				images = new ImageData[set.Textures.Count];
+				set.Textures.CopyTo(images, 0);
+			}
+			Array.Sort(images, SortImageData);
+
+			foreach(ImageData image in images) 
+			{
+				string[] parts = image.VirtualName.Split(separator, StringSplitOptions.RemoveEmptyEntries);
+				TreeNode curNode = root;
+
+				if(parts.Length == 1) continue;
+				int localindex = (parts[0] == "[TEXTURES]" ? 8 : imageIndex);
+
+				string category = set.Name;
+				for(int i = 0; i < parts.Length - 1; i++) 
+				{
+					//string category = parts[i];
+					category += (Path.DirectorySeparatorChar + parts[i]);
+					
+					//already got such category?
+					if(curNode.Nodes.Count > 0 && curNode.Nodes.ContainsKey(category)) 
+					{
+						curNode = curNode.Nodes[category];
+					} 
+					else //create a new one
+					{
+						TreeNode n = new TreeNode(parts[i]) { Name = category, ImageIndex = localindex, SelectedImageIndex = localindex };
+
+						curNode.Nodes.Add(n);
+						curNode = n;
+
+						ResourceTextureSet ts = new ResourceTextureSet(category, set.Location);
+						ts.Level = i + 1;
+						curNode.Tag = ts;
+					}
+
+					//add to current and parent nodes
+					if(i == parts.Length - 2) 
+					{
+						TreeNode cn = curNode;
+						while(cn != root) 
+						{
+							ResourceTextureSet curTs = cn.Tag as ResourceTextureSet;
+							if(image.IsFlat)
+								curTs.AddFlat(image);
+							else
+								curTs.AddTexture(image);
+							cn = cn.Parent;
+						}
+					}
+				}
+			}
+
+			if(root.Nodes.Count == 1 && root.Nodes[0].Nodes.Count > 0) 
+			{
+				TreeNode[] children = new TreeNode[root.Nodes[0].Nodes.Count];
+				root.Nodes[0].Nodes.CopyTo(children, 0);
+				root.Nodes.Clear();
+				root.Nodes.AddRange(children);
+				((ResourceTextureSet)root.Tag).Level++;
+			}
+
+			foreach(TreeNode n in root.Nodes) SetItemsCount(n);
+		}
+
+		//mxd
+		private void SetItemsCount(TreeNode node) 
+		{
+			ResourceTextureSet ts = node.Tag as ResourceTextureSet;
+			if(ts == null) throw new Exception("Expected IFilledTextureSet, but got null...");
+			
+
+			if(node.Parent != null && General.Map.Config.MixTexturesFlats)
+			{
+				ts.MixTexturesAndFlats();
+				node.Text += " [" + ts.Textures.Count + "]";
+			} 
+			else
+			{
+				node.Text += " [" + (browseflats ? ts.Flats.Count : ts.Textures.Count) + "]";
+			}
+
+			foreach(TreeNode child in node.Nodes) SetItemsCount(child);
+		}
+
+		// Selection changed
+		private void browser_SelectedItemChanged()
+		{
+			apply.Enabled = (browser.SelectedItem != null);
+		}
+
+		// OK clicked
+		private void apply_Click(object sender, EventArgs e)
+		{
+			// Set selected name and close
+			if(browser.SelectedItem != null)
+			{
+				ImageBrowserItem item = browser.SelectedItem as ImageBrowserItem;
+				selectedname = item.TextureName;
+				DialogResult = DialogResult.OK;
+			}
+			else
+			{
+				selectedname = "";
+				DialogResult = DialogResult.Cancel;
+			}
+			this.Close();
+		}
+
+		// Cancel clicked
+		private void cancel_Click(object sender, EventArgs e)
+		{
+			// No selection, close
+			selectedname = "";
+			DialogResult = DialogResult.Cancel;
+			this.Close();
+		}
+
+		// Activated
+		private void TextureBrowserForm_Activated(object sender, EventArgs e)
+		{
+			Cursor.Current = Cursors.Default;
+			General.Interface.EnableProcessing(); //mxd
+		}
+
+		// Loading
+		private void TextureBrowserForm_Load(object sender, EventArgs e)
+		{
+			// Normal windowstate?
+			if(this.WindowState == FormWindowState.Normal)
+			{
+				// Keep last position and size
+				lastposition = this.Location;
+				lastsize = this.Size;
+			}
+		}
+
+		// Resized
+		private void TextureBrowserForm_ResizeEnd(object sender, EventArgs e)
+		{
+			// Normal windowstate?
+			if(this.WindowState == FormWindowState.Normal)
+			{
+				// Keep last position and size
+				lastposition = this.Location;
+				lastsize = this.Size;
+			}
+		}
+
+		// Moved
+		private void TextureBrowserForm_Move(object sender, EventArgs e)
+		{
+			// Normal windowstate?
+			if(this.WindowState == FormWindowState.Normal)
+			{
+				// Keep last position and size
+				lastposition = this.Location;
+				lastsize = this.Size;
+			}
+		}
+
+		// Closing
+		private void TextureBrowserForm_FormClosing(object sender, FormClosingEventArgs e)
+		{
+			int windowstate;
+
+			// Determine window state to save
+			if(this.WindowState != FormWindowState.Minimized)
+				windowstate = (int)this.WindowState;
+			else
+				windowstate = (int)FormWindowState.Normal;
+
+			// Save window settings
+			General.Settings.WriteSetting("browserwindow.positionx", lastposition.X);
+			General.Settings.WriteSetting("browserwindow.positiony", lastposition.Y);
+			General.Settings.WriteSetting("browserwindow.sizewidth", lastsize.Width);
+			General.Settings.WriteSetting("browserwindow.sizeheight", lastsize.Height);
+			General.Settings.WriteSetting("browserwindow.windowstate", windowstate);
+			General.Settings.WriteSetting("browserwindow.splitterdistance", splitter.SplitPosition); //mxd
+			General.Settings.WriteSetting("browserwindow.splittercollapsed", splitter.IsCollapsed); //mxd
+			General.Settings.WriteSetting("browserwindow.usedgroupcollapsed", browser.IsGroupCollapsed(usedgroup)); //mxd
+
+			//mxd. Save last selected texture set, if it's not "All" (it will be selected anyway if search for initial texture set fails)
+			if(this.DialogResult == DialogResult.OK && tvTextureSets.SelectedNodes.Count > 0 && !(tvTextureSets.SelectedNodes[0].Tag is AllTextureSet))
+				General.Settings.WriteSetting("browserwindow.textureset", tvTextureSets.SelectedNodes[0].Name);
+
+			//mxd. Save ImageBrowserControl settings
+			General.Settings.WriteSetting("browserwindow.showtexturesfromsubdirs", ImageBrowserControl.ShowTexturesFromSubDirectories);
+			if(General.Map.Config.UseLongTextureNames) General.Map.Options.UseLongTextureNames = ImageBrowserControl.UseLongTextureNames;
+			
+			// Clean up
+			browser.CleanUp();
+		}
+
+		// Static method to browse for texture or flat
+		// Returns null when cancelled.
+		public static string Browse(IWin32Window parent, string select, bool browseFlats)
+		{
+			TextureBrowserForm browser = new TextureBrowserForm(select, browseFlats);
+			if(browser.ShowDialog(parent) == DialogResult.OK) return browser.SelectedName; // Return result
+			
+			// Cancelled
+			return select;
+		}
+
+		// Item double clicked
+		private void browser_SelectedItemDoubleClicked()
+		{
+			if(apply.Enabled) apply_Click(this, EventArgs.Empty);
+		}
+
+		// This fills the list of textures, depending on the selected texture set
+		private void FillImagesList()
+		{
+			// Get the selected texture set
+			IFilledTextureSet set = (selectedset.Tag as IFilledTextureSet);
+
+			// Start adding
+			browser.BeginAdding(set.Level, false); //mxd. Pass current folder level
+
+			if(browseflats) 
+			{
+				// Add all available flats
+				foreach(ImageData img in set.Flats)
+					browser.Add(img, img, availgroup);
+
+				// Add all used flats
+				foreach(ImageData img in set.Flats)
+					if(img.UsedInMap) browser.Add(img, img, usedgroup);
+			}
+			else
+			{
+				// Add all available textures and mark the images for temporary loading
+				foreach(ImageData img in set.Textures)
+					browser.Add(img, img, availgroup);
+
+				// Add all used textures and mark the images for permanent loading
+				foreach(ImageData img in set.Textures)
+					if(img.UsedInMap) browser.Add(img, img, usedgroup);
+			}
+			
+			// Done adding
+			browser.EndAdding();
+		}
+
+		// Help
+		private void TextureBrowserForm_HelpRequested(object sender, HelpEventArgs hlpevent)
+		{
+			General.ShowHelp("w_imagesbrowser.html");
+			hlpevent.Handled = true;
+		}
+
+		private void TextureBrowserForm_Shown(object sender, EventArgs e)
+		{
+			if(selectedset != null) //mxd. Calling FillImagesList() from constructor leads to TERRIBLE load times. Why? I have no sodding idea...
+				FillImagesList();
+			
+			// Select texture
+			if(selecttextureonfill != 0)
+			{
+				browser.SelectItem(selecttextureonfill, (usedgroupcollapsed ? availgroup : usedgroup)); //mxd. availgroup/usedgroup switch.
+				selecttextureonfill = 0;
+			}
+
+			//mxd. Focus the textbox. Calling this from TextureBrowserForm_Activated (like it's done in DB2) fails when the form is maximized. Again, I've no idea why...
+			browser.FocusTextbox();
+		}
+
+		//mxd
+		private void tvTextureSets_NodeMouseClick(object sender, TreeNodeMouseClickEventArgs e) 
+		{
+			selectedset = e.Node;
+			FillImagesList();
+		}
+
+		//mxd
+		private void tvTextureSets_KeyUp(object sender, KeyEventArgs e) 
+		{
+			if(tvTextureSets.SelectedNodes.Count > 0 && tvTextureSets.SelectedNodes[0] != selectedset) 
+			{
+				selectedset = tvTextureSets.SelectedNodes[0];
+				FillImagesList();
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/TextureBrowserForm.resx b/Source/Core/Windows/TextureBrowserForm.resx
new file mode 100644
index 0000000..6b7d659
--- /dev/null
+++ b/Source/Core/Windows/TextureBrowserForm.resx
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="smallimages.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <data name="smallimages.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
+        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
+        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACS
+        EQAAAk1TRnQBSQFMAgEBCQEAAaQBAQGkAQEBEAEAARYBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        AwABQAMAAUIDAAEBAQABCAUAAYABEBgAAYACAAGAAwACgAEAAYADAAGAAQABgAEAAoACAAPAAQABwAHc
+        AcABAAHwAcoBpgEAATMFAAEzAQABMwEAATMBAAIzAgADFgEAAxwBAAMiAQADKQEAA1UBAANNAQADQgEA
+        AzkBAAGAAXwB/wEAAlAB/wEAAZMBAAHWAQAB/wHsAcwBAAHGAdYB7wEAAdYC5wEAAZABqQGtAgAB/wEz
+        AwABZgMAAZkDAAHMAgABMwMAAjMCAAEzAWYCAAEzAZkCAAEzAcwCAAEzAf8CAAFmAwABZgEzAgACZgIA
+        AWYBmQIAAWYBzAIAAWYB/wIAAZkDAAGZATMCAAGZAWYCAAKZAgABmQHMAgABmQH/AgABzAMAAcwBMwIA
+        AcwBZgIAAcwBmQIAAswCAAHMAf8CAAH/AWYCAAH/AZkCAAH/AcwBAAEzAf8CAAH/AQABMwEAATMBAAFm
+        AQABMwEAAZkBAAEzAQABzAEAATMBAAH/AQAB/wEzAgADMwEAAjMBZgEAAjMBmQEAAjMBzAEAAjMB/wEA
+        ATMBZgIAATMBZgEzAQABMwJmAQABMwFmAZkBAAEzAWYBzAEAATMBZgH/AQABMwGZAgABMwGZATMBAAEz
+        AZkBZgEAATMCmQEAATMBmQHMAQABMwGZAf8BAAEzAcwCAAEzAcwBMwEAATMBzAFmAQABMwHMAZkBAAEz
+        AswBAAEzAcwB/wEAATMB/wEzAQABMwH/AWYBAAEzAf8BmQEAATMB/wHMAQABMwL/AQABZgMAAWYBAAEz
+        AQABZgEAAWYBAAFmAQABmQEAAWYBAAHMAQABZgEAAf8BAAFmATMCAAFmAjMBAAFmATMBZgEAAWYBMwGZ
+        AQABZgEzAcwBAAFmATMB/wEAAmYCAAJmATMBAANmAQACZgGZAQACZgHMAQABZgGZAgABZgGZATMBAAFm
+        AZkBZgEAAWYCmQEAAWYBmQHMAQABZgGZAf8BAAFmAcwCAAFmAcwBMwEAAWYBzAGZAQABZgLMAQABZgHM
+        Af8BAAFmAf8CAAFmAf8BMwEAAWYB/wGZAQABZgH/AcwBAAHMAQAB/wEAAf8BAAHMAQACmQIAAZkBMwGZ
+        AQABmQEAAZkBAAGZAQABzAEAAZkDAAGZAjMBAAGZAQABZgEAAZkBMwHMAQABmQEAAf8BAAGZAWYCAAGZ
+        AWYBMwEAAZkBMwFmAQABmQFmAZkBAAGZAWYBzAEAAZkBMwH/AQACmQEzAQACmQFmAQADmQEAApkBzAEA
+        ApkB/wEAAZkBzAIAAZkBzAEzAQABZgHMAWYBAAGZAcwBmQEAAZkCzAEAAZkBzAH/AQABmQH/AgABmQH/
+        ATMBAAGZAcwBZgEAAZkB/wGZAQABmQH/AcwBAAGZAv8BAAHMAwABmQEAATMBAAHMAQABZgEAAcwBAAGZ
+        AQABzAEAAcwBAAGZATMCAAHMAjMBAAHMATMBZgEAAcwBMwGZAQABzAEzAcwBAAHMATMB/wEAAcwBZgIA
+        AcwBZgEzAQABmQJmAQABzAFmAZkBAAHMAWYBzAEAAZkBZgH/AQABzAGZAgABzAGZATMBAAHMAZkBZgEA
+        AcwCmQEAAcwBmQHMAQABzAGZAf8BAALMAgACzAEzAQACzAFmAQACzAGZAQADzAEAAswB/wEAAcwB/wIA
+        AcwB/wEzAQABmQH/AWYBAAHMAf8BmQEAAcwB/wHMAQABzAL/AQABzAEAATMBAAH/AQABZgEAAf8BAAGZ
+        AQABzAEzAgAB/wIzAQAB/wEzAWYBAAH/ATMBmQEAAf8BMwHMAQAB/wEzAf8BAAH/AWYCAAH/AWYBMwEA
+        AcwCZgEAAf8BZgGZAQAB/wFmAcwBAAHMAWYB/wEAAf8BmQIAAf8BmQEzAQAB/wGZAWYBAAH/ApkBAAH/
+        AZkBzAEAAf8BmQH/AQAB/wHMAgAB/wHMATMBAAH/AcwBZgEAAf8BzAGZAQAB/wLMAQAB/wHMAf8BAAL/
+        ATMBAAHMAf8BZgEAAv8BmQEAAv8BzAEAAmYB/wEAAWYB/wFmAQABZgL/AQAB/wJmAQAB/wFmAf8BAAL/
+        AWYBAAEhAQABpQEAA18BAAN3AQADhgEAA5YBAAPLAQADsgEAA9cBAAPdAQAD4wEAA+oBAAPxAQAD+AEA
+        AfAB+wH/AQABpAKgAQADgAMAAf8CAAH/AwAC/wEAAf8DAAH/AQAB/wEAAv8CAAP/wgABBwwSAQcyAAES
+        DP8BEjIAAeoB/wn0AfMB/wHqMgAB6gH/AfQI7AHzAf8B6jIAAW0B/wX0BfMB/wFtMgABbQH/AfQI7QHz
+        Af8BbTIAAesB/wH0CfMB/wHrMgAB6wH/AfMB9weSAfMB/wHrMgAB7AH/CvMB/wHsMgAB7AH/AfMI7wHy
+        Af8B7DIAAewB/wbzBf8B7DIAAe0B/wHzBe8B/wLyAfMB7QG8MgAB7QH/A/MD8gH/AfIB8wHtAfAzAAGS
+        Af8B8wXyAf8B8wGSAfA0AAGSCP8BkgHwNQAB8Aj3AfD/ANgADUsIAAKZCgAHDgEQAW0BbAIOBgAIDgQA
+        AVENUgFLBQAB7wFzARwBbgFKAQcHAAEOAQ0BbAGQAbsCCQH3AmwBZgIOBQABDgEABe8B9wEOAwABUgF6
+        AVIBoAh6AVIBoAFSAUsDAAGZAW4DdAFSAUsBRAFKAZkNAAEOAeoBbAEPAQ4EAAEOAe8BAAHwAvEC8gG8
+        AQ4DAAFSAXoBUgGgAXoBWAZ5AVgBoAFSAUsCAAFzAW4BdAGZAnQBUgJLAW4BRAFuARoEAAFtBwABQwFt
+        AQ4EAAEOAe8BBwEAAfAC8QLyAfABDgMAAVIBegFSAaAKcwFSAUsBAAEcAXQBmgJSAXQBegFMBUsBcwMA
+        AW0B8QFtAQcBvAHwAfECAAERAQcB7AQAAQ4CAAHvAbwB8ALxAfIB8AEOAwABUgF6AVIBoAFzAv8B8wP0
+        AvMBcwFSAUsBAAGZAXMBUQF0AXoCdAFMA0sBSgFLAZMDAANtAQcCvAHwAgACbQEOBAABDgHwAgcCvALw
+        AfEBvAEOAwABUgF6AVIBoAFzAf8B3AXbAfQBcwFSAUsBAAHsARwBeQJ0ChICAAFtAfADBwK8AgABEQEH
+        AewEAAEOAfADBwK8AvABvAEOAwABUgGaAVIB/wG8Af8GGQHzAbwBUgFLAQACHAJ0AgcD7wH3ARwD7QES
+        AgABbQHwAe8DBwG8AgACbQEOBAABDgHwAgcKEgFSAaANUgIAAe0BHAF0AUsBHAj/Ae0BEgIAAW0B8ALv
+        AwcCAAERAQcB7AQAAQ4B8AHvAgcD7wH3ARwD7QESAVIDoAEcAf8BrgGaAb0BdQHjAa4B/wHtAesCAAHs
+        AXMBdAFLAfcB/wauAf8B7QESAgABbQHwA+8CBwIAAm0BDgQAAQ4B8AHvARwI9QHtARIBUgH/AqAB9wH/
+        Aa4C/wJ1Aa4B/wHtAesCAAGTA3QB7wH/Aa4BlAH/AZoBlAGuAf8B7QESAgABbQG8BO8BBwIAAREBBwHs
+        BAABDgG8Ae8B9wH1Bq4B9QHtARIBAAFSAv8B7wH/Aa4BlAH/AZoBlAGuAf8B7QHrAgABHAGZAcMBegHv
+        Af8C0wH/AZoC0wH/Ae0BEgIACG0BAAEPAewBDwQAAQ4BvALvAfUBrgGUAfUBmgGUAa4B9QHtARICAAJS
+        Ae8B/wHTBK4B0wH/Ae0B6wMAAhwBmgHvAf8G0wH/Ae0BEgIACQ4B6wGRAQ0EAAEOAfQB8AHvAfUC0wH1
+        AZoC0wH1Ae0BEgQAAe8B/wbTAf8B7QHrBAABmQF0AQcI/wHtARICAAEOAWUBkAG7BQkB9wFsAg4DAAMO
+        Ae8B9QbTAfUB7QESBAABBwj/Ae0B6wYAAgcD7wH3ARwD7Q4AAQ4HAAEHCPUB7QESBAACBwPvAfcBHAPt
+        CQACmRwAAgcD7wH3ARwD7f8AcgAB9wKuAW0BbAHqAmwEZjQAAfcF/wL0AxkBZgkACA4TAAH3Aq4BbQFs
+        AeoCbARmBAABtQL/ApMBmQEHAbsBtAIZA2YGAAEOAQAF7wH3AQ4DAAJzAesBbgFtAUoBEwEVAUMBEQEP
+        AQ4BDwMAAfcF/wL0AxkBZgQAAbUC/wGTAZoBegGfAZ4BuwH0AfMBZgEZAWYFAAEOAe8BAAHwAvEC8gG8
+        AQ4DAAFzAhwHMQJLAUQB7QIAAbUC/wKTAZkBBwG7AbQCGQNmAgABtQL/AbsBCAKfAX4BeQL0AWwBGQNm
+        AgABDgHvAQcBAAHwAvEC8gHwAQ4DAAHsAXoBHAGaA3oCWQFTAVIBMQFLAeoCAAG1Av8BkwGaAXoBnwGe
+        AbsB9AHzAWYBGQFmAgABtQL/AtsBCQEIAX4BeQH/AfQBbAHzAWYBGQFmAgABDgIAAe8BvAHwAvEB8gHw
+        AQ4DAAHtAXoBHAGZBXoCWQFTATEBRAHtAQABtQL/AbsBCAKfAX4BeQL0AWwBGQNmAQcK/wFsAfQBbAEZ
+        AWYCAAEOAfACBwK8AvAB8QG8AQ4DAAHtAZoBegEcAZoFegNZAUsBbQEAAbUC/wLbAQkBCAF+AXkB/wH0
+        AWwB8wFmARkBZgIHBLUB9wG1Au0CkQH0AWwB8wFmAgABDgHwAwcCvALwAbwBDgMAARwBmgF6ARwBmQd6
+        AVkBUgFKAe0BBwr/AWwB9AFsARkBZgG1Af8BBwr/AWwB9AFsAgABDgHwBAcCvAHwAbwBDgMAARwBmgGg
+        AXoBHAeaAnoBdAFtAgcEtQH3AbUC7QKRAfQBbAHzAWYBtQH/AgcEtQH3AbUC7QKRAfQBbAIAAQ4B8ALv
+        BAcBvAEHAQ4DAAEcA6AIHALtAewBcwIAAQcK/wFsAfQBbAEHA/8BBwr/AWwCAAEOAfAD7wUHAQ4DAAEc
+        BKABmgZ6AXMFAAIHBLUB9wG1Au0CkQH0AWwCBwK1AgcEtQH3AbUC7QKRAgABDgG8BO8EBwEOAwABHAGg
+        AcMDoAF6AxwC7QFzBwABBwr/AWwCAAEHCv8BbAH0AWwCAAEOAbwF7wMHAQ4DAAEcAZkCwwKgARwB7QwA
+        AgcEtQH3AbUC7QKRAgACBwS1AfcBtQLtApEB9AFsAgABDgH0A/ADvAIHAQ4EAAUcAe0dAAEHCv8BbAIA
+        Cw4nAAIHBLUB9wG1Au0CkeAAAUIBTQE+BwABPgMAASgDAAFAAwABQgMAAQEBAAEBBQABEAECFgAD/wEA
+        Av8GAAL/BgAC/wYAAYABAQYAAYABAQYAAYABAQYAAYABAQYAAYABAQYAAYABAQYAAYABAQYAAYABAQYA
+        AYABAQYAAYABAQYAAYABAQYAAYABAQYAAYABAwYAAYABBwYAAYABDwYAAYABHwYAAv8GAAL/BgAC/wYA
+        Gf8BwwL/AcABAQH+AX8B4AEBAfgBBwGAAQAB+AEfAcABAQHwAQcCAAHgAQcBgAEBAeABBwIAAcABAQHg
+        ASMBwAEHAgABgAEBAcABIwHAAQcCAAGAAQEBwAEjAcABBwIAAYABAAHAASMBwAEHAgABgAEAAcABIwHA
+        AgABAQGAAQABwAEjAcACAAEBAYABAAHAASMBwAIAAQEBgAEAAcABIwHAAQABgAEBAYABAAHAASMBwAEA
+        AcABAQHAAQABgAEBAcABAAHwAQEB4AEAAcABAQHAAQAB8AEBAfgBAQHgAQMB+AEAAfABAwH+AX8C/wH4
+        AQEu/wEAAQ8G/wEAAQ8B+AEHAv8BAAEPAQABAwHwAQcBAAEHAQABDwEAAQMB4AEHAQABAwEAAQMCAAHA
+        AQcBAAEDAQABAwIAAcABBwEAAQEEAAHAAQcBAAEBBAABwAEHBgABwAEHBgABwAEHAgABwAMAAcABBwEA
+        AQcBwAMAAcABBwEAAQcB8AEAAcABAAHAAQcBAAH/AfABAAHAAQABwAEHAYED/wHwAQABwAEHBP8B8AEA
+        HP8L
+</value>
+  </data>
+  <metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Windows/TextureSetForm.Designer.cs b/Source/Core/Windows/TextureSetForm.Designer.cs
new file mode 100644
index 0000000..b8f7329
--- /dev/null
+++ b/Source/Core/Windows/TextureSetForm.Designer.cs
@@ -0,0 +1,326 @@
+namespace CodeImp.DoomBuilder.Windows
+{
+	partial class TextureSetForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.components = new System.ComponentModel.Container();
+			this.name = new System.Windows.Forms.TextBox();
+			this.filters = new System.Windows.Forms.ListView();
+			this.filtercolumn = new System.Windows.Forms.ColumnHeader();
+			this.label2 = new System.Windows.Forms.Label();
+			this.label3 = new System.Windows.Forms.Label();
+			this.label4 = new System.Windows.Forms.Label();
+			this.apply = new System.Windows.Forms.Button();
+			this.cancel = new System.Windows.Forms.Button();
+			this.addfilter = new System.Windows.Forms.Button();
+			this.removefilter = new System.Windows.Forms.Button();
+			this.groupBox1 = new System.Windows.Forms.GroupBox();
+			this.filterstimer = new System.Windows.Forms.Timer(this.components);
+			this.groupBox2 = new System.Windows.Forms.GroupBox();
+			this.nomatchesbutton = new System.Windows.Forms.RadioButton();
+			this.matchesbutton = new System.Windows.Forms.RadioButton();
+			this.matcheslist = new CodeImp.DoomBuilder.Controls.ImageBrowserControl();
+			this.noresultlabel = new System.Windows.Forms.Label();
+			this.pictureBox1 = new System.Windows.Forms.PictureBox();
+			this.groupBox3 = new System.Windows.Forms.GroupBox();
+			this.groupBox1.SuspendLayout();
+			this.groupBox2.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+			this.groupBox3.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// name
+			// 
+			this.name.Location = new System.Drawing.Point(36, 19);
+			this.name.Name = "name";
+			this.name.Size = new System.Drawing.Size(212, 20);
+			this.name.TabIndex = 0;
+			// 
+			// filters
+			// 
+			this.filters.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.filters.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+            this.filtercolumn});
+			this.filters.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
+			this.filters.HideSelection = false;
+			this.filters.LabelEdit = true;
+			this.filters.Location = new System.Drawing.Point(21, 110);
+			this.filters.Name = "filters";
+			this.filters.ShowGroups = false;
+			this.filters.Size = new System.Drawing.Size(227, 283);
+			this.filters.TabIndex = 0;
+			this.filters.UseCompatibleStateImageBehavior = false;
+			this.filters.View = System.Windows.Forms.View.Details;
+			this.filters.AfterLabelEdit += new System.Windows.Forms.LabelEditEventHandler(this.filters_AfterLabelEdit);
+			this.filters.SelectedIndexChanged += new System.EventHandler(this.filters_SelectedIndexChanged);
+			this.filters.DoubleClick += new System.EventHandler(this.filters_DoubleClick);
+			// 
+			// filtercolumn
+			// 
+			this.filtercolumn.Text = "Filter";
+			this.filtercolumn.Width = 192;
+			// 
+			// label2
+			// 
+			this.label2.Location = new System.Drawing.Point(18, 28);
+			this.label2.Name = "label2";
+			this.label2.Size = new System.Drawing.Size(248, 42);
+			this.label2.TabIndex = 3;
+			this.label2.Text = "Add the names of the textures in this set below. You can use the following wildca" +
+				"rds:";
+			// 
+			// label3
+			// 
+			this.label3.AutoSize = true;
+			this.label3.Location = new System.Drawing.Point(28, 65);
+			this.label3.Name = "label3";
+			this.label3.Size = new System.Drawing.Size(170, 13);
+			this.label3.TabIndex = 4;
+			this.label3.Text = "? = matches exactly one character";
+			// 
+			// label4
+			// 
+			this.label4.AutoSize = true;
+			this.label4.Location = new System.Drawing.Point(28, 83);
+			this.label4.Name = "label4";
+			this.label4.Size = new System.Drawing.Size(177, 13);
+			this.label4.TabIndex = 5;
+			this.label4.Text = "* = matches zero or more characters";
+			// 
+			// apply
+			// 
+			this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.apply.Location = new System.Drawing.Point(493, 511);
+			this.apply.Name = "apply";
+			this.apply.Size = new System.Drawing.Size(105, 25);
+			this.apply.TabIndex = 3;
+			this.apply.Text = "OK";
+			this.apply.UseVisualStyleBackColor = true;
+			this.apply.Click += new System.EventHandler(this.apply_Click);
+			// 
+			// cancel
+			// 
+			this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.cancel.Location = new System.Drawing.Point(604, 511);
+			this.cancel.Name = "cancel";
+			this.cancel.Size = new System.Drawing.Size(105, 25);
+			this.cancel.TabIndex = 4;
+			this.cancel.Text = "Cancel";
+			this.cancel.UseVisualStyleBackColor = true;
+			this.cancel.Click += new System.EventHandler(this.cancel_Click);
+			// 
+			// addfilter
+			// 
+			this.addfilter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.addfilter.Location = new System.Drawing.Point(21, 399);
+			this.addfilter.Name = "addfilter";
+			this.addfilter.Size = new System.Drawing.Size(110, 24);
+			this.addfilter.TabIndex = 1;
+			this.addfilter.Text = "Add Texture";
+			this.addfilter.UseVisualStyleBackColor = true;
+			this.addfilter.Click += new System.EventHandler(this.addfilter_Click);
+			// 
+			// removefilter
+			// 
+			this.removefilter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.removefilter.Enabled = false;
+			this.removefilter.Location = new System.Drawing.Point(138, 399);
+			this.removefilter.Name = "removefilter";
+			this.removefilter.Size = new System.Drawing.Size(110, 24);
+			this.removefilter.TabIndex = 2;
+			this.removefilter.Text = "Remove Selection";
+			this.removefilter.UseVisualStyleBackColor = true;
+			this.removefilter.Click += new System.EventHandler(this.removefilter_Click);
+			// 
+			// groupBox1
+			// 
+			this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)));
+			this.groupBox1.Controls.Add(this.removefilter);
+			this.groupBox1.Controls.Add(this.label4);
+			this.groupBox1.Controls.Add(this.addfilter);
+			this.groupBox1.Controls.Add(this.label3);
+			this.groupBox1.Controls.Add(this.label2);
+			this.groupBox1.Controls.Add(this.filters);
+			this.groupBox1.Location = new System.Drawing.Point(12, 66);
+			this.groupBox1.Name = "groupBox1";
+			this.groupBox1.Size = new System.Drawing.Size(270, 434);
+			this.groupBox1.TabIndex = 1;
+			this.groupBox1.TabStop = false;
+			this.groupBox1.Text = " Filters ";
+			// 
+			// filterstimer
+			// 
+			this.filterstimer.Interval = 1;
+			this.filterstimer.Tick += new System.EventHandler(this.filterstimer_Tick);
+			// 
+			// groupBox2
+			// 
+			this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.groupBox2.Controls.Add(this.nomatchesbutton);
+			this.groupBox2.Controls.Add(this.matchesbutton);
+			this.groupBox2.Controls.Add(this.matcheslist);
+			this.groupBox2.Controls.Add(this.noresultlabel);
+			this.groupBox2.Location = new System.Drawing.Point(288, 12);
+			this.groupBox2.Name = "groupBox2";
+			this.groupBox2.Size = new System.Drawing.Size(421, 488);
+			this.groupBox2.TabIndex = 2;
+			this.groupBox2.TabStop = false;
+			this.groupBox2.Text = " Results ";
+			// 
+			// nomatchesbutton
+			// 
+			this.nomatchesbutton.Appearance = System.Windows.Forms.Appearance.Button;
+			this.nomatchesbutton.Location = new System.Drawing.Point(141, 25);
+			this.nomatchesbutton.Name = "nomatchesbutton";
+			this.nomatchesbutton.Size = new System.Drawing.Size(117, 24);
+			this.nomatchesbutton.TabIndex = 1;
+			this.nomatchesbutton.Text = "Show Not Matching";
+			this.nomatchesbutton.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			this.nomatchesbutton.UseVisualStyleBackColor = true;
+			this.nomatchesbutton.Click += new System.EventHandler(this.matchesbutton_Click);
+			// 
+			// matchesbutton
+			// 
+			this.matchesbutton.Appearance = System.Windows.Forms.Appearance.Button;
+			this.matchesbutton.Checked = true;
+			this.matchesbutton.Location = new System.Drawing.Point(18, 25);
+			this.matchesbutton.Name = "matchesbutton";
+			this.matchesbutton.Size = new System.Drawing.Size(117, 24);
+			this.matchesbutton.TabIndex = 0;
+			this.matchesbutton.TabStop = true;
+			this.matchesbutton.Text = "Show Matches";
+			this.matchesbutton.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			this.matchesbutton.UseVisualStyleBackColor = true;
+			this.matchesbutton.Click += new System.EventHandler(this.matchesbutton_Click);
+			// 
+			// matcheslist
+			// 
+			this.matcheslist.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.matcheslist.BrowseFlats = false;
+			this.matcheslist.HideInputBox = true;
+			this.matcheslist.Location = new System.Drawing.Point(18, 55);
+			this.matcheslist.Name = "matcheslist";
+			this.matcheslist.PreventSelection = true;
+			this.matcheslist.Size = new System.Drawing.Size(387, 422);
+			this.matcheslist.TabIndex = 2;
+			this.matcheslist.SelectedItemDoubleClicked += new CodeImp.DoomBuilder.Controls.ImageBrowserControl.SelectedItemDoubleClickDelegate(this.matcheslist_SelectedItemDoubleClicked);
+			// 
+			// noresultlabel
+			// 
+			this.noresultlabel.Location = new System.Drawing.Point(15, 28);
+			this.noresultlabel.Name = "noresultlabel";
+			this.noresultlabel.Size = new System.Drawing.Size(272, 43);
+			this.noresultlabel.TabIndex = 33;
+			this.noresultlabel.Text = "An example result cannot be displayed, because it requires a map to be loaded.";
+			this.noresultlabel.Visible = false;
+			// 
+			// pictureBox1
+			// 
+			this.pictureBox1.Image = global::CodeImp.DoomBuilder.Properties.Resources.KnownTextureSet;
+			this.pictureBox1.Location = new System.Drawing.Point(11, 21);
+			this.pictureBox1.Name = "pictureBox1";
+			this.pictureBox1.Size = new System.Drawing.Size(19, 16);
+			this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
+			this.pictureBox1.TabIndex = 12;
+			this.pictureBox1.TabStop = false;
+			// 
+			// groupBox3
+			// 
+			this.groupBox3.Controls.Add(this.name);
+			this.groupBox3.Controls.Add(this.pictureBox1);
+			this.groupBox3.Location = new System.Drawing.Point(12, 12);
+			this.groupBox3.Name = "groupBox3";
+			this.groupBox3.Size = new System.Drawing.Size(270, 48);
+			this.groupBox3.TabIndex = 13;
+			this.groupBox3.TabStop = false;
+			this.groupBox3.Text = " Texture Set Name ";
+			// 
+			// TextureSetForm
+			// 
+			this.AcceptButton = this.apply;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.CancelButton = this.cancel;
+			this.ClientSize = new System.Drawing.Size(721, 544);
+			this.Controls.Add(this.groupBox3);
+			this.Controls.Add(this.groupBox2);
+			this.Controls.Add(this.cancel);
+			this.Controls.Add(this.apply);
+			this.Controls.Add(this.groupBox1);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "TextureSetForm";
+			this.Opacity = 1;
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Edit Texture Set";
+			this.Shown += new System.EventHandler(this.TextureSetForm_Shown);
+			this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.TextureSetForm_HelpRequested);
+			this.groupBox1.ResumeLayout(false);
+			this.groupBox1.PerformLayout();
+			this.groupBox2.ResumeLayout(false);
+			((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+			this.groupBox3.ResumeLayout(false);
+			this.groupBox3.PerformLayout();
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.TextBox name;
+		private System.Windows.Forms.ListView filters;
+		private System.Windows.Forms.Label label2;
+		private System.Windows.Forms.Label label3;
+		private System.Windows.Forms.Label label4;
+		private System.Windows.Forms.Button apply;
+		private System.Windows.Forms.Button cancel;
+		private System.Windows.Forms.ColumnHeader filtercolumn;
+		private System.Windows.Forms.Button addfilter;
+		private System.Windows.Forms.Button removefilter;
+		private System.Windows.Forms.GroupBox groupBox1;
+		private System.Windows.Forms.Timer filterstimer;
+		private System.Windows.Forms.GroupBox groupBox2;
+		private CodeImp.DoomBuilder.Controls.ImageBrowserControl matcheslist;
+		private System.Windows.Forms.Label noresultlabel;
+		private System.Windows.Forms.RadioButton nomatchesbutton;
+		private System.Windows.Forms.RadioButton matchesbutton;
+		private System.Windows.Forms.PictureBox pictureBox1;
+		private System.Windows.Forms.GroupBox groupBox3;
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/TextureSetForm.cs b/Source/Core/Windows/TextureSetForm.cs
new file mode 100644
index 0000000..92f84bb
--- /dev/null
+++ b/Source/Core/Windows/TextureSetForm.cs
@@ -0,0 +1,234 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Data;
+using CodeImp.DoomBuilder.Config;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Windows
+{
+	internal partial class TextureSetForm : DelayedForm
+	{
+		// Variables
+		private DefinedTextureSet textureset;
+		
+		// Constructor
+		public TextureSetForm()
+		{
+			InitializeComponent();
+			matcheslist.ApplySettings();
+			
+			// Show/hide components
+			matchesbutton.Visible = (General.Map != null);
+			nomatchesbutton.Visible = (General.Map != null);
+			matcheslist.Visible = (General.Map != null);
+			noresultlabel.Visible = (General.Map == null);
+		}
+		
+		// This initializes the set
+		public void Setup(DefinedTextureSet set)
+		{
+			// Keep reference
+			textureset = set;
+			
+			// Set name
+			name.Text = set.Name;
+			
+			// Fill filters list
+			foreach(string s in set.Filters)
+				filters.Items.Add(s);
+		}
+
+		// OK clicked
+		private void apply_Click(object sender, EventArgs e)
+		{
+			// Apply name
+			textureset.Name = name.Text;
+			
+			// Apply filters
+			textureset.Filters.Clear();
+			foreach(ListViewItem i in filters.Items) textureset.Filters.Add(i.Text);
+			
+			// Done
+			matcheslist.CleanUp();
+			this.DialogResult = DialogResult.OK;
+			this.Close();
+		}
+
+		// Cancel clicked
+		private void cancel_Click(object sender, EventArgs e)
+		{
+			// Be gone.
+			matcheslist.CleanUp();
+			this.DialogResult = DialogResult.Cancel;
+			this.Close();
+		}
+		
+		// Add texture
+		private void addfilter_Click(object sender, EventArgs e)
+		{
+			ListViewItem i = new ListViewItem("");
+			filters.Items.Add(i);
+			i.BeginEdit();
+		}
+		
+		// Remove selected items
+		private void removefilter_Click(object sender, EventArgs e)
+		{
+			int index = filters.SelectedIndices[0]; //mxd
+			foreach(ListViewItem i in filters.SelectedItems) i.Remove();
+
+			//mxd
+			if(filters.Items.Count > 0)
+			{
+				if(index >= filters.Items.Count) index = filters.Items.Count - 1;
+				filters.Items[index].Selected = true;
+			}
+
+			filters.Focus(); //mxd
+			
+			// Run the timer
+			filterstimer.Start();
+		}
+		
+		// Items selected/deselected
+		private void filters_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			removefilter.Enabled = (filters.SelectedItems.Count > 0);
+		}
+		
+		// Double clicking an item
+		private void filters_DoubleClick(object sender, EventArgs e)
+		{
+			// Edit item
+			if(filters.SelectedItems.Count == 1)
+				filters.SelectedItems[0].BeginEdit();
+		}
+		
+		// This removes empty items and makes others uppercase
+		private void filterstimer_Tick(object sender, EventArgs e)
+		{
+			// Stop timer
+			filterstimer.Stop();
+			
+			// Update labels
+			for(int i = filters.Items.Count - 1; i >= 0; i--)
+			{
+				// Empty label?
+				if((filters.Items[i].Text == null) ||
+				   (filters.Items[i].Text.Trim().Length == 0))
+				{
+					// Remove it
+					filters.Items.RemoveAt(i);
+				}
+				else
+				{
+					// Make uppercase
+					filters.Items[i].Text = filters.Items[i].Text.ToUpperInvariant();
+				}
+			}
+			
+			// Show example results if when we can
+			if(General.Map != null)
+			{
+				Cursor.Current = Cursors.AppStarting;
+				
+				// Make a set for comparing
+				List<string> filterslist = new List<string>(filters.Items.Count);
+				foreach(ListViewItem i in filters.Items) filterslist.Add(i.Text);
+				MatchingTextureSet set = new MatchingTextureSet(filterslist);
+				
+				// Determine tooltip text
+				string tooltiptext = null;
+				if(nomatchesbutton.Checked) tooltiptext = "Doubleclick to include this texture";
+				
+				// Start adding
+				matcheslist.PreventSelection = matchesbutton.Checked;
+				matcheslist.BeginAdding(true);
+				
+				// Go for all textures
+				foreach(ImageData img in General.Map.Data.Textures)
+				{
+					bool ismatch = set.IsMatch(img);
+					if((ismatch && matchesbutton.Checked) || (!ismatch && nomatchesbutton.Checked))
+						matcheslist.Add(img, img, null, tooltiptext);
+				}
+				
+				// If not already mixed, add flats as well
+				if(!General.Map.Config.MixTexturesFlats)
+				{
+					// Go for all flats
+					foreach(ImageData img in General.Map.Data.Flats)
+					{
+						bool ismatch = set.IsMatch(img);
+						if((ismatch && matchesbutton.Checked) || (!ismatch && nomatchesbutton.Checked))
+							matcheslist.Add(img, img, null, tooltiptext);
+					}
+				}
+				
+				// Done adding
+				matcheslist.EndAdding();
+				Cursor.Current = Cursors.Default;
+			}
+		}
+		
+		// Done editing a filter
+		private void filters_AfterLabelEdit(object sender, LabelEditEventArgs e)
+		{
+			// Run the timer
+			filterstimer.Start();
+		}
+		
+		// When first shown
+		private void TextureSetForm_Shown(object sender, EventArgs e)
+		{
+			// Run the timer
+			filterstimer.Start();
+		}
+		
+		// Show (not) matches clicked
+		private void matchesbutton_Click(object sender, EventArgs e)
+		{
+			// Run the timer
+			filterstimer.Start();
+		}
+		
+		// Texture doubleclicked
+		private void matcheslist_SelectedItemDoubleClicked()
+		{
+			// Add texture name to the list
+			if(matcheslist.SelectedItem != null)
+				filters.Items.Add(matcheslist.SelectedItem.Text);
+			
+			// Run the timer
+			filterstimer.Start();
+		}
+
+		// Help
+		private void TextureSetForm_HelpRequested(object sender, HelpEventArgs hlpevent)
+		{
+			General.ShowHelp("w_textureset.html");
+			hlpevent.Handled = true;
+		}
+	}
+}
+
diff --git a/Source/Core/Windows/TextureSetForm.resx b/Source/Core/Windows/TextureSetForm.resx
new file mode 100644
index 0000000..9d1a686
--- /dev/null
+++ b/Source/Core/Windows/TextureSetForm.resx
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="label2.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="label3.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="label4.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="filterstimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="nomatchesbutton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="matchesbutton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="noresultlabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Windows/ThingBrowserForm.Designer.cs b/Source/Core/Windows/ThingBrowserForm.Designer.cs
new file mode 100644
index 0000000..07454f6
--- /dev/null
+++ b/Source/Core/Windows/ThingBrowserForm.Designer.cs
@@ -0,0 +1,101 @@
+namespace CodeImp.DoomBuilder.Windows
+{
+	partial class ThingBrowserForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.thingslist = new CodeImp.DoomBuilder.Controls.ThingBrowserControl();
+			this.cancel = new System.Windows.Forms.Button();
+			this.apply = new System.Windows.Forms.Button();
+			this.SuspendLayout();
+			// 
+			// thingslist
+			// 
+			this.thingslist.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.thingslist.Location = new System.Drawing.Point(9, 12);
+			this.thingslist.Name = "thingslist";
+			this.thingslist.Size = new System.Drawing.Size(394, 383);
+			this.thingslist.TabIndex = 0;
+			this.thingslist.UseMultiSelection = false;
+			this.thingslist.OnTypeDoubleClicked += new CodeImp.DoomBuilder.Controls.ThingBrowserControl.TypeDoubleClickDeletegate(this.thingslist_OnTypeDoubleClicked);
+			// 
+			// cancel
+			// 
+			this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.cancel.Location = new System.Drawing.Point(291, 403);
+			this.cancel.Name = "cancel";
+			this.cancel.Size = new System.Drawing.Size(112, 27);
+			this.cancel.TabIndex = 2;
+			this.cancel.Text = "Cancel";
+			this.cancel.UseVisualStyleBackColor = true;
+			this.cancel.Click += new System.EventHandler(this.cancel_Click);
+			// 
+			// apply
+			// 
+			this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.apply.Location = new System.Drawing.Point(173, 403);
+			this.apply.Name = "apply";
+			this.apply.Size = new System.Drawing.Size(112, 27);
+			this.apply.TabIndex = 1;
+			this.apply.Text = "OK";
+			this.apply.UseVisualStyleBackColor = true;
+			this.apply.Click += new System.EventHandler(this.apply_Click);
+			// 
+			// ThingBrowserForm
+			// 
+			this.AcceptButton = this.apply;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.CancelButton = this.cancel;
+			this.ClientSize = new System.Drawing.Size(412, 437);
+			this.Controls.Add(this.cancel);
+			this.Controls.Add(this.apply);
+			this.Controls.Add(this.thingslist);
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.MinimumSize = new System.Drawing.Size(264, 300);
+			this.Name = "ThingBrowserForm";
+			this.Opacity = 1;
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Choose Thing Type";
+			this.Shown += new System.EventHandler(this.ThingBrowserForm_Shown);
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private CodeImp.DoomBuilder.Controls.ThingBrowserControl thingslist;
+		private System.Windows.Forms.Button cancel;
+		private System.Windows.Forms.Button apply;
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/ThingBrowserForm.cs b/Source/Core/Windows/ThingBrowserForm.cs
new file mode 100644
index 0000000..b5218a5
--- /dev/null
+++ b/Source/Core/Windows/ThingBrowserForm.cs
@@ -0,0 +1,88 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Windows.Forms;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Windows
+{
+	public partial class ThingBrowserForm : DelayedForm
+	{
+		// Variables
+		private int selectedtype;
+		
+		// Properties
+		public int SelectedType { get { return selectedtype; } }
+		
+		// Constructor
+		public ThingBrowserForm(int type)
+		{
+			InitializeComponent();
+
+			// Setup list
+			thingslist.Setup();
+
+			// Select given type
+			thingslist.SelectType(type);
+		}
+
+		// This browses for a thing type
+		// Returns the new thing type or the same thing type when cancelled
+		public static int BrowseThing(IWin32Window owner, int type)
+		{
+			ThingBrowserForm f = new ThingBrowserForm(type);
+			if(f.ShowDialog(owner) == DialogResult.OK) type = f.SelectedType;
+			f.Dispose();
+			return type;
+		}
+		
+		// OK clicked
+		private void apply_Click(object sender, EventArgs e)
+		{
+			// Get the result
+			selectedtype = thingslist.GetResult(selectedtype);
+
+			// Done
+			this.DialogResult = DialogResult.OK;
+			this.Close();
+		}
+
+		// Cancel clicked
+		private void cancel_Click(object sender, EventArgs e)
+		{
+			// Leave
+			this.DialogResult = DialogResult.Cancel;
+			this.Close();
+		}
+
+		// Double-clicked an item
+		private void thingslist_OnTypeDoubleClicked()
+		{
+			// OK
+			apply_Click(this, EventArgs.Empty);
+		}
+
+		//mxd
+		private void ThingBrowserForm_Shown(object sender, EventArgs e)
+		{
+			thingslist.FocusTextbox();
+		}
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/ThingBrowserForm.resx b/Source/Core/Windows/ThingBrowserForm.resx
new file mode 100644
index 0000000..8174536
--- /dev/null
+++ b/Source/Core/Windows/ThingBrowserForm.resx
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="thingslist.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Windows/ThingEditForm.Designer.cs b/Source/Core/Windows/ThingEditForm.Designer.cs
new file mode 100644
index 0000000..9c1d943
--- /dev/null
+++ b/Source/Core/Windows/ThingEditForm.Designer.cs
@@ -0,0 +1,514 @@
+namespace CodeImp.DoomBuilder.Windows
+{
+	partial class ThingEditForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.components = new System.ComponentModel.Container();
+			System.Windows.Forms.GroupBox groupBox2;
+			System.Windows.Forms.Label label7;
+			this.cbAbsoluteHeight = new System.Windows.Forms.CheckBox();
+			this.label2 = new System.Windows.Forms.Label();
+			this.label1 = new System.Windows.Forms.Label();
+			this.posX = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.posY = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.posZ = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.zlabel = new System.Windows.Forms.Label();
+			this.typegroup = new System.Windows.Forms.GroupBox();
+			this.thingtype = new CodeImp.DoomBuilder.Controls.ThingBrowserControl();
+			this.anglecontrol = new CodeImp.DoomBuilder.GZBuilder.Controls.AngleControl();
+			this.cbRandomAngle = new System.Windows.Forms.CheckBox();
+			this.angle = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.groupBox4 = new System.Windows.Forms.GroupBox();
+			this.settingsgroup = new System.Windows.Forms.GroupBox();
+			this.missingflags = new System.Windows.Forms.PictureBox();
+			this.flags = new CodeImp.DoomBuilder.Controls.CheckboxArrayControl();
+			this.actiongroup = new System.Windows.Forms.GroupBox();
+			this.argscontrol = new CodeImp.DoomBuilder.Controls.ArgumentsControl();
+			this.actionhelp = new CodeImp.DoomBuilder.Controls.ActionSpecialHelpButton();
+			this.action = new CodeImp.DoomBuilder.Controls.ActionSelectorControl();
+			this.browseaction = new System.Windows.Forms.Button();
+			this.idgroup = new System.Windows.Forms.GroupBox();
+			this.tagSelector = new CodeImp.DoomBuilder.GZBuilder.Controls.TagSelector();
+			this.cancel = new System.Windows.Forms.Button();
+			this.apply = new System.Windows.Forms.Button();
+			this.hint = new System.Windows.Forms.PictureBox();
+			this.hintlabel = new System.Windows.Forms.Label();
+			this.tooltip = new System.Windows.Forms.ToolTip(this.components);
+			this.panel = new System.Windows.Forms.Panel();
+			this.applypanel = new System.Windows.Forms.Panel();
+			groupBox2 = new System.Windows.Forms.GroupBox();
+			label7 = new System.Windows.Forms.Label();
+			groupBox2.SuspendLayout();
+			this.typegroup.SuspendLayout();
+			this.groupBox4.SuspendLayout();
+			this.settingsgroup.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.missingflags)).BeginInit();
+			this.actiongroup.SuspendLayout();
+			this.idgroup.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.hint)).BeginInit();
+			this.panel.SuspendLayout();
+			this.applypanel.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// groupBox2
+			// 
+			groupBox2.Controls.Add(this.cbAbsoluteHeight);
+			groupBox2.Controls.Add(this.label2);
+			groupBox2.Controls.Add(this.label1);
+			groupBox2.Controls.Add(this.posX);
+			groupBox2.Controls.Add(this.posY);
+			groupBox2.Controls.Add(this.posZ);
+			groupBox2.Controls.Add(this.zlabel);
+			groupBox2.Location = new System.Drawing.Point(260, 242);
+			groupBox2.Name = "groupBox2";
+			groupBox2.Size = new System.Drawing.Size(177, 134);
+			groupBox2.TabIndex = 2;
+			groupBox2.TabStop = false;
+			groupBox2.Text = " Position ";
+			// 
+			// cbAbsoluteHeight
+			// 
+			this.cbAbsoluteHeight.AutoSize = true;
+			this.cbAbsoluteHeight.Location = new System.Drawing.Point(12, 111);
+			this.cbAbsoluteHeight.Name = "cbAbsoluteHeight";
+			this.cbAbsoluteHeight.Size = new System.Drawing.Size(101, 17);
+			this.cbAbsoluteHeight.TabIndex = 16;
+			this.cbAbsoluteHeight.Text = "Absolute Height";
+			this.cbAbsoluteHeight.UseVisualStyleBackColor = true;
+			this.cbAbsoluteHeight.CheckedChanged += new System.EventHandler(this.cbAbsoluteHeight_CheckedChanged);
+			// 
+			// label2
+			// 
+			this.label2.Location = new System.Drawing.Point(5, 21);
+			this.label2.Name = "label2";
+			this.label2.Size = new System.Drawing.Size(50, 14);
+			this.label2.TabIndex = 15;
+			this.label2.Text = "X:";
+			this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+			// 
+			// label1
+			// 
+			this.label1.Location = new System.Drawing.Point(5, 51);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(50, 14);
+			this.label1.TabIndex = 14;
+			this.label1.Text = "Y:";
+			this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+			// 
+			// posX
+			// 
+			this.posX.AllowDecimal = false;
+			this.posX.AllowNegative = true;
+			this.posX.AllowRelative = true;
+			this.posX.ButtonStep = 8;
+			this.posX.ButtonStepBig = 16F;
+			this.posX.ButtonStepFloat = 1F;
+			this.posX.ButtonStepSmall = 1F;
+			this.posX.ButtonStepsUseModifierKeys = true;
+			this.posX.ButtonStepsWrapAround = false;
+			this.posX.Location = new System.Drawing.Point(61, 16);
+			this.posX.Name = "posX";
+			this.posX.Size = new System.Drawing.Size(72, 24);
+			this.posX.StepValues = null;
+			this.posX.TabIndex = 13;
+			this.posX.WhenTextChanged += new System.EventHandler(this.posX_WhenTextChanged);
+			// 
+			// posY
+			// 
+			this.posY.AllowDecimal = false;
+			this.posY.AllowNegative = true;
+			this.posY.AllowRelative = true;
+			this.posY.ButtonStep = 8;
+			this.posY.ButtonStepBig = 16F;
+			this.posY.ButtonStepFloat = 1F;
+			this.posY.ButtonStepSmall = 1F;
+			this.posY.ButtonStepsUseModifierKeys = true;
+			this.posY.ButtonStepsWrapAround = false;
+			this.posY.Location = new System.Drawing.Point(61, 46);
+			this.posY.Name = "posY";
+			this.posY.Size = new System.Drawing.Size(72, 24);
+			this.posY.StepValues = null;
+			this.posY.TabIndex = 12;
+			this.posY.WhenTextChanged += new System.EventHandler(this.posY_WhenTextChanged);
+			// 
+			// posZ
+			// 
+			this.posZ.AllowDecimal = false;
+			this.posZ.AllowNegative = true;
+			this.posZ.AllowRelative = true;
+			this.posZ.ButtonStep = 8;
+			this.posZ.ButtonStepBig = 16F;
+			this.posZ.ButtonStepFloat = 1F;
+			this.posZ.ButtonStepSmall = 1F;
+			this.posZ.ButtonStepsUseModifierKeys = true;
+			this.posZ.ButtonStepsWrapAround = false;
+			this.posZ.Location = new System.Drawing.Point(61, 76);
+			this.posZ.Name = "posZ";
+			this.posZ.Size = new System.Drawing.Size(72, 24);
+			this.posZ.StepValues = null;
+			this.posZ.TabIndex = 11;
+			this.posZ.WhenTextChanged += new System.EventHandler(this.posZ_WhenTextChanged);
+			// 
+			// zlabel
+			// 
+			this.zlabel.Location = new System.Drawing.Point(5, 81);
+			this.zlabel.Name = "zlabel";
+			this.zlabel.Size = new System.Drawing.Size(50, 14);
+			this.zlabel.TabIndex = 9;
+			this.zlabel.Text = "Height:";
+			this.zlabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+			// 
+			// label7
+			// 
+			label7.AutoSize = true;
+			label7.Location = new System.Drawing.Point(15, 30);
+			label7.Name = "label7";
+			label7.Size = new System.Drawing.Size(40, 13);
+			label7.TabIndex = 9;
+			label7.Text = "Action:";
+			// 
+			// typegroup
+			// 
+			this.typegroup.Controls.Add(this.thingtype);
+			this.typegroup.Location = new System.Drawing.Point(4, 3);
+			this.typegroup.Name = "typegroup";
+			this.typegroup.Size = new System.Drawing.Size(250, 373);
+			this.typegroup.TabIndex = 0;
+			this.typegroup.TabStop = false;
+			this.typegroup.Text = " Thing ";
+			// 
+			// thingtype
+			// 
+			this.thingtype.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)));
+			this.thingtype.Location = new System.Drawing.Point(9, 13);
+			this.thingtype.Margin = new System.Windows.Forms.Padding(6);
+			this.thingtype.Name = "thingtype";
+			this.thingtype.Size = new System.Drawing.Size(232, 357);
+			this.thingtype.TabIndex = 0;
+			this.thingtype.UseMultiSelection = true;
+			this.thingtype.OnTypeDoubleClicked += new CodeImp.DoomBuilder.Controls.ThingBrowserControl.TypeDoubleClickDeletegate(this.thingtype_OnTypeDoubleClicked);
+			this.thingtype.OnTypeChanged += new CodeImp.DoomBuilder.Controls.ThingBrowserControl.TypeChangedDeletegate(this.thingtype_OnTypeChanged);
+			// 
+			// anglecontrol
+			// 
+			this.anglecontrol.Angle = 0;
+			this.anglecontrol.AngleOffset = 0;
+			this.anglecontrol.Location = new System.Drawing.Point(20, 40);
+			this.anglecontrol.Name = "anglecontrol";
+			this.anglecontrol.Size = new System.Drawing.Size(69, 69);
+			this.anglecontrol.TabIndex = 20;
+			this.anglecontrol.AngleChanged += new System.EventHandler(this.anglecontrol_AngleChanged);
+			// 
+			// cbRandomAngle
+			// 
+			this.cbRandomAngle.AutoSize = true;
+			this.cbRandomAngle.Location = new System.Drawing.Point(6, 111);
+			this.cbRandomAngle.Name = "cbRandomAngle";
+			this.cbRandomAngle.Size = new System.Drawing.Size(95, 17);
+			this.cbRandomAngle.TabIndex = 17;
+			this.cbRandomAngle.Text = "Random angle";
+			this.cbRandomAngle.UseVisualStyleBackColor = true;
+			this.cbRandomAngle.CheckedChanged += new System.EventHandler(this.cbRandomAngle_CheckedChanged);
+			// 
+			// angle
+			// 
+			this.angle.AllowDecimal = false;
+			this.angle.AllowNegative = true;
+			this.angle.AllowRelative = true;
+			this.angle.ButtonStep = 5;
+			this.angle.ButtonStepBig = 15F;
+			this.angle.ButtonStepFloat = 1F;
+			this.angle.ButtonStepSmall = 1F;
+			this.angle.ButtonStepsUseModifierKeys = true;
+			this.angle.ButtonStepsWrapAround = false;
+			this.angle.Location = new System.Drawing.Point(13, 16);
+			this.angle.Name = "angle";
+			this.angle.Size = new System.Drawing.Size(82, 24);
+			this.angle.StepValues = null;
+			this.angle.TabIndex = 10;
+			this.angle.WhenTextChanged += new System.EventHandler(this.angle_WhenTextChanged);
+			// 
+			// groupBox4
+			// 
+			this.groupBox4.Controls.Add(this.cbRandomAngle);
+			this.groupBox4.Controls.Add(this.anglecontrol);
+			this.groupBox4.Controls.Add(this.angle);
+			this.groupBox4.Location = new System.Drawing.Point(443, 242);
+			this.groupBox4.Name = "groupBox4";
+			this.groupBox4.Size = new System.Drawing.Size(107, 134);
+			this.groupBox4.TabIndex = 3;
+			this.groupBox4.TabStop = false;
+			this.groupBox4.Text = " Angle";
+			// 
+			// settingsgroup
+			// 
+			this.settingsgroup.Controls.Add(this.missingflags);
+			this.settingsgroup.Controls.Add(this.flags);
+			this.settingsgroup.Location = new System.Drawing.Point(260, 3);
+			this.settingsgroup.Name = "settingsgroup";
+			this.settingsgroup.Size = new System.Drawing.Size(290, 233);
+			this.settingsgroup.TabIndex = 1;
+			this.settingsgroup.TabStop = false;
+			this.settingsgroup.Text = " Settings ";
+			// 
+			// missingflags
+			// 
+			this.missingflags.BackColor = System.Drawing.SystemColors.Window;
+			this.missingflags.Image = global::CodeImp.DoomBuilder.Properties.Resources.Warning;
+			this.missingflags.Location = new System.Drawing.Point(55, -2);
+			this.missingflags.Name = "missingflags";
+			this.missingflags.Size = new System.Drawing.Size(16, 16);
+			this.missingflags.TabIndex = 5;
+			this.missingflags.TabStop = false;
+			this.missingflags.Visible = false;
+			// 
+			// flags
+			// 
+			this.flags.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.flags.AutoScroll = true;
+			this.flags.Columns = 2;
+			this.flags.Location = new System.Drawing.Point(14, 19);
+			this.flags.Name = "flags";
+			this.flags.Size = new System.Drawing.Size(270, 211);
+			this.flags.TabIndex = 0;
+			this.flags.VerticalSpacing = 1;
+			this.flags.OnValueChanged += new System.EventHandler(this.flags_OnValueChanged);
+			// 
+			// actiongroup
+			// 
+			this.actiongroup.Controls.Add(this.argscontrol);
+			this.actiongroup.Controls.Add(this.actionhelp);
+			this.actiongroup.Controls.Add(label7);
+			this.actiongroup.Controls.Add(this.action);
+			this.actiongroup.Controls.Add(this.browseaction);
+			this.actiongroup.Location = new System.Drawing.Point(4, 382);
+			this.actiongroup.Name = "actiongroup";
+			this.actiongroup.Size = new System.Drawing.Size(546, 145);
+			this.actiongroup.TabIndex = 22;
+			this.actiongroup.TabStop = false;
+			this.actiongroup.Text = " Action ";
+			// 
+			// argscontrol
+			// 
+			this.argscontrol.Location = new System.Drawing.Point(6, 57);
+			this.argscontrol.Name = "argscontrol";
+			this.argscontrol.Size = new System.Drawing.Size(534, 80);
+			this.argscontrol.TabIndex = 15;
+			// 
+			// actionhelp
+			// 
+			this.actionhelp.Location = new System.Drawing.Point(512, 25);
+			this.actionhelp.Name = "actionhelp";
+			this.actionhelp.Size = new System.Drawing.Size(28, 25);
+			this.actionhelp.TabIndex = 14;
+			// 
+			// action
+			// 
+			this.action.BackColor = System.Drawing.SystemColors.Control;
+			this.action.Cursor = System.Windows.Forms.Cursors.Default;
+			this.action.Empty = false;
+			this.action.GeneralizedCategories = null;
+			this.action.GeneralizedOptions = null;
+			this.action.Location = new System.Drawing.Point(62, 27);
+			this.action.Name = "action";
+			this.action.Size = new System.Drawing.Size(414, 21);
+			this.action.TabIndex = 0;
+			this.action.Value = 402;
+			this.action.ValueChanges += new System.EventHandler(this.action_ValueChanges);
+			// 
+			// browseaction
+			// 
+			this.browseaction.Image = global::CodeImp.DoomBuilder.Properties.Resources.List;
+			this.browseaction.Location = new System.Drawing.Point(482, 25);
+			this.browseaction.Name = "browseaction";
+			this.browseaction.Size = new System.Drawing.Size(28, 25);
+			this.browseaction.TabIndex = 1;
+			this.browseaction.Text = " ";
+			this.tooltip.SetToolTip(this.browseaction, "Browse Action");
+			this.browseaction.UseVisualStyleBackColor = true;
+			this.browseaction.Click += new System.EventHandler(this.browseaction_Click);
+			// 
+			// idgroup
+			// 
+			this.idgroup.Controls.Add(this.tagSelector);
+			this.idgroup.Location = new System.Drawing.Point(4, 533);
+			this.idgroup.Name = "idgroup";
+			this.idgroup.Size = new System.Drawing.Size(546, 66);
+			this.idgroup.TabIndex = 0;
+			this.idgroup.TabStop = false;
+			this.idgroup.Text = " Identification ";
+			// 
+			// tagSelector
+			// 
+			this.tagSelector.Location = new System.Drawing.Point(6, 19);
+			this.tagSelector.Name = "tagSelector";
+			this.tagSelector.Size = new System.Drawing.Size(534, 35);
+			this.tagSelector.TabIndex = 8;
+			// 
+			// cancel
+			// 
+			this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.cancel.Location = new System.Drawing.Point(438, 4);
+			this.cancel.Name = "cancel";
+			this.cancel.Size = new System.Drawing.Size(112, 25);
+			this.cancel.TabIndex = 2;
+			this.cancel.Text = "Cancel";
+			this.cancel.UseVisualStyleBackColor = true;
+			this.cancel.Click += new System.EventHandler(this.cancel_Click);
+			// 
+			// apply
+			// 
+			this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.apply.Location = new System.Drawing.Point(320, 4);
+			this.apply.Name = "apply";
+			this.apply.Size = new System.Drawing.Size(112, 25);
+			this.apply.TabIndex = 1;
+			this.apply.Text = "OK";
+			this.apply.UseVisualStyleBackColor = true;
+			this.apply.Click += new System.EventHandler(this.apply_Click);
+			// 
+			// hint
+			// 
+			this.hint.Image = global::CodeImp.DoomBuilder.Properties.Resources.Lightbulb;
+			this.hint.Location = new System.Drawing.Point(0, 8);
+			this.hint.Name = "hint";
+			this.hint.Size = new System.Drawing.Size(16, 16);
+			this.hint.TabIndex = 3;
+			this.hint.TabStop = false;
+			// 
+			// hintlabel
+			// 
+			this.hintlabel.AutoSize = true;
+			this.hintlabel.Location = new System.Drawing.Point(18, 3);
+			this.hintlabel.Name = "hintlabel";
+			this.hintlabel.Size = new System.Drawing.Size(195, 26);
+			this.hintlabel.TabIndex = 4;
+			this.hintlabel.Text = "Select categories or several thing types \r\nto randomly assign them to selection";
+			// 
+			// panel
+			// 
+			this.panel.BackColor = System.Drawing.SystemColors.Window;
+			this.panel.Controls.Add(this.actiongroup);
+			this.panel.Controls.Add(this.groupBox4);
+			this.panel.Controls.Add(this.idgroup);
+			this.panel.Controls.Add(this.typegroup);
+			this.panel.Controls.Add(groupBox2);
+			this.panel.Controls.Add(this.settingsgroup);
+			this.panel.Location = new System.Drawing.Point(12, 12);
+			this.panel.Name = "panel";
+			this.panel.Size = new System.Drawing.Size(553, 606);
+			this.panel.TabIndex = 5;
+			// 
+			// applypanel
+			// 
+			this.applypanel.Controls.Add(this.cancel);
+			this.applypanel.Controls.Add(this.apply);
+			this.applypanel.Controls.Add(this.hintlabel);
+			this.applypanel.Controls.Add(this.hint);
+			this.applypanel.Location = new System.Drawing.Point(12, 624);
+			this.applypanel.Name = "applypanel";
+			this.applypanel.Size = new System.Drawing.Size(553, 32);
+			this.applypanel.TabIndex = 6;
+			// 
+			// ThingEditForm
+			// 
+			this.AcceptButton = this.apply;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.CancelButton = this.cancel;
+			this.ClientSize = new System.Drawing.Size(577, 670);
+			this.Controls.Add(this.applypanel);
+			this.Controls.Add(this.panel);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "ThingEditForm";
+			this.Opacity = 1;
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Edit Thing";
+			this.Shown += new System.EventHandler(this.ThingEditForm_Shown);
+			this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.ThingEditForm_FormClosing);
+			this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.ThingEditForm_HelpRequested);
+			groupBox2.ResumeLayout(false);
+			groupBox2.PerformLayout();
+			this.typegroup.ResumeLayout(false);
+			this.groupBox4.ResumeLayout(false);
+			this.groupBox4.PerformLayout();
+			this.settingsgroup.ResumeLayout(false);
+			((System.ComponentModel.ISupportInitialize)(this.missingflags)).EndInit();
+			this.actiongroup.ResumeLayout(false);
+			this.actiongroup.PerformLayout();
+			this.idgroup.ResumeLayout(false);
+			((System.ComponentModel.ISupportInitialize)(this.hint)).EndInit();
+			this.panel.ResumeLayout(false);
+			this.applypanel.ResumeLayout(false);
+			this.applypanel.PerformLayout();
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Button cancel;
+		private System.Windows.Forms.Button apply;
+		private System.Windows.Forms.GroupBox settingsgroup;
+		private CodeImp.DoomBuilder.Controls.CheckboxArrayControl flags;
+		private System.Windows.Forms.GroupBox idgroup;
+		private System.Windows.Forms.GroupBox actiongroup;
+		private CodeImp.DoomBuilder.Controls.ActionSelectorControl action;
+		private System.Windows.Forms.Button browseaction;
+		private System.Windows.Forms.Label zlabel;
+		private CodeImp.DoomBuilder.Controls.ThingBrowserControl thingtype;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox angle;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox posZ;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox posY;
+		private System.Windows.Forms.Label label2;
+		private System.Windows.Forms.Label label1;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox posX;
+		private System.Windows.Forms.CheckBox cbAbsoluteHeight;
+		private System.Windows.Forms.CheckBox cbRandomAngle;
+		private CodeImp.DoomBuilder.GZBuilder.Controls.TagSelector tagSelector;
+		private CodeImp.DoomBuilder.GZBuilder.Controls.AngleControl anglecontrol;
+		private System.Windows.Forms.PictureBox hint;
+		private System.Windows.Forms.Label hintlabel;
+		private System.Windows.Forms.PictureBox missingflags;
+		private System.Windows.Forms.ToolTip tooltip;
+		private System.Windows.Forms.GroupBox groupBox4;
+		private CodeImp.DoomBuilder.Controls.ActionSpecialHelpButton actionhelp;
+		private System.Windows.Forms.Panel panel;
+		private System.Windows.Forms.GroupBox typegroup;
+		private System.Windows.Forms.Panel applypanel;
+		private CodeImp.DoomBuilder.Controls.ArgumentsControl argscontrol;
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/ThingEditForm.cs b/Source/Core/Windows/ThingEditForm.cs
new file mode 100644
index 0000000..d17b6c0
--- /dev/null
+++ b/Source/Core/Windows/ThingEditForm.cs
@@ -0,0 +1,621 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Types;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Windows
+{
+	/// <summary>
+	/// Dialog window that allows viewing and editing of Thing properties.
+	/// </summary>
+	internal partial class ThingEditForm : DelayedForm
+	{
+		#region ================== Events
+
+		public event EventHandler OnValuesChanged; //mxd
+
+		#endregion
+		
+		#region ================== Variables
+
+		private ICollection<Thing> things;
+		private ThingTypeInfo thinginfo;
+		private bool preventchanges;
+		private bool preventmapchange; //mxd
+		private bool undocreated; //mxd
+		private static bool useabsoluteheight; //mxd
+		private List<ThingProperties> thingprops; //mxd
+
+		//mxd. Window setup stuff
+		private static Point location = Point.Empty;
+
+		private struct ThingProperties //mxd
+		{
+			//public readonly int Type;
+			public readonly int AngleDoom;
+			public readonly float X;
+			public readonly float Y;
+			public readonly float Z;
+
+			public ThingProperties(Thing t) 
+			{
+				X = t.Position.x;
+				Y = t.Position.y;
+				Z = t.Position.z;
+				//Type = t.Type;
+				AngleDoom = t.AngleDoom;
+			}
+		}
+
+		#endregion
+
+		#region ================== Constructor
+
+		// Constructor
+		public ThingEditForm()
+		{
+			// Initialize
+			InitializeComponent();
+
+			//mxd. Widow setup
+			if(location != Point.Empty) 
+			{
+				this.StartPosition = FormStartPosition.Manual;
+				this.Location = location;
+			}
+			
+			// Fill flags list
+			foreach(KeyValuePair<string, string> tf in General.Map.Config.ThingFlags)
+				flags.Add(tf.Value, tf.Key);
+
+			// Fill actions list
+			action.GeneralizedCategories = General.Map.Config.GenActionCategories;
+			action.AddInfo(General.Map.Config.SortedLinedefActions.ToArray());
+
+			// Tag/Effects?
+			actiongroup.Visible = General.Map.FormatInterface.HasThingAction;
+			idgroup.Visible = General.Map.FormatInterface.HasThingTag;
+			
+			// Thing height?
+			posZ.Visible = General.Map.FormatInterface.HasThingHeight;
+			zlabel.Visible = General.Map.FormatInterface.HasThingHeight;
+			cbAbsoluteHeight.Visible = General.Map.FormatInterface.HasThingHeight; //mxd
+
+			//mxd. Decimals allowed?
+			if(General.Map.FormatInterface.VertexDecimals > 0) 
+			{
+				posX.AllowDecimal = true;
+				posY.AllowDecimal = true;
+				posZ.AllowDecimal = true;
+			}
+
+			//mxd. Arrange inteface
+			int targetheight;
+			if(General.Map.FormatInterface.HasThingAction)
+				targetheight = actiongroup.Bottom + actiongroup.Margin.Bottom;
+			else
+				targetheight = typegroup.Bottom + typegroup.Margin.Bottom * 2;
+
+			if(General.Map.FormatInterface.HasThingTag)
+			{
+				idgroup.Top = targetheight;
+				targetheight = idgroup.Bottom + idgroup.Margin.Bottom * 2;
+			}
+
+			panel.Height = targetheight;
+
+			//mxd. Arrange Apply/Cancel buttons
+			applypanel.Top = panel.Bottom + panel.Margin.Bottom * 2;
+
+			//mxd. Update window height
+			this.Height = applypanel.Bottom + applypanel.Margin.Bottom + (this.Height - this.ClientRectangle.Height) + 1;
+			
+			// Setup types list
+			thingtype.Setup();
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This sets up the form to edit the given things
+		public void Setup(ICollection<Thing> things)
+		{
+			preventchanges = true;
+
+			// Keep this list
+			this.things = things;
+			if(things.Count > 1) this.Text = "Edit Things (" + things.Count + ")";
+			hint.Visible = things.Count > 1; //mxd
+			hintlabel.Visible = things.Count > 1; //mxd
+			thingtype.UseMultiSelection = things.Count > 1; //mxd
+			
+			////////////////////////////////////////////////////////////////////////
+			// Set all options to the first thing properties
+			////////////////////////////////////////////////////////////////////////
+
+			Thing ft = General.GetByIndex(things, 0);
+			
+			// Set type
+			thingtype.SelectType(ft.Type);
+			
+			// Flags
+			foreach(CheckBox c in flags.Checkboxes)
+				if(ft.Flags.ContainsKey(c.Tag.ToString())) c.Checked = ft.Flags[c.Tag.ToString()];
+			
+			// Coordination
+			angle.Text = ft.AngleDoom.ToString();
+			zlabel.Text = useabsoluteheight ? "Z:" : "Height:"; //mxd
+			cbAbsoluteHeight.Checked = useabsoluteheight; //mxd
+
+			//mxd
+			ft.DetermineSector();
+			float floorheight = (ft.Sector != null ? Sector.GetFloorPlane(ft.Sector).GetZ(ft.Position) : 0);
+			posX.Text = ((int)ft.Position.x).ToString();
+			posY.Text = ((int)ft.Position.y).ToString();
+			posZ.Text = (useabsoluteheight ? ((int)Math.Round(ft.Position.z + floorheight)).ToString() : ((int)ft.Position.z).ToString());
+			posX.ButtonStep = General.Map.Grid.GridSize;
+			posY.ButtonStep = General.Map.Grid.GridSize;
+			posZ.ButtonStep = General.Map.Grid.GridSize;
+
+			// Action/tags
+			action.Value = ft.Action;
+			if(General.Map.FormatInterface.HasThingTag) //mxd
+			{
+				tagSelector.Setup(UniversalType.ThingTag); 
+				tagSelector.SetTag(ft.Tag);
+			}
+
+			//mxd. Args
+			argscontrol.SetValue(ft, true);
+
+			////////////////////////////////////////////////////////////////////////
+			// Now go for all lines and change the options when a setting is different
+			////////////////////////////////////////////////////////////////////////
+
+			thingprops = new List<ThingProperties>();
+
+			// Go for all things
+			foreach(Thing t in things)
+			{
+				//mxd. Update sector info
+				t.DetermineSector();
+				
+				// Type does not match?
+				ThingTypeInfo info = thingtype.GetSelectedInfo(); //mxd
+
+				if(info != null && info.Index != t.Type)
+					thingtype.ClearSelectedType();
+				
+				// Flags
+				foreach(CheckBox c in flags.Checkboxes)
+				{
+					if(c.CheckState == CheckState.Indeterminate) continue; //mxd
+					if(t.IsFlagSet(c.Tag.ToString()) != c.Checked) 
+					{
+						c.ThreeState = true;
+						c.CheckState = CheckState.Indeterminate;
+					}
+				}
+				
+				// Coordination
+				if(t.AngleDoom.ToString() != angle.Text) angle.Text = "";
+				
+				//mxd. Position
+				if(((int)t.Position.x).ToString() != posX.Text) posX.Text = "";
+				if(((int)t.Position.y).ToString() != posY.Text) posY.Text = "";
+				if(useabsoluteheight && t.Sector != null) 
+				{
+					if(((int)Math.Round(Sector.GetFloorPlane(t.Sector).GetZ(t.Position) + t.Position.z)).ToString() != posZ.Text)
+						posZ.Text = "";
+				} 
+				else if(((int)t.Position.z).ToString() != posZ.Text)
+				{
+					posZ.Text = "";
+				}
+
+				// Action/tags
+				if(t.Action != action.Value) action.Empty = true;
+				if(General.Map.FormatInterface.HasThingTag && t.Tag != ft.Tag) tagSelector.ClearTag(); //mxd
+
+				//mxd. Arguments
+				argscontrol.SetValue(t, false);
+
+				//mxd. Store initial properties
+				thingprops.Add(new ThingProperties(t));
+			}
+
+			preventchanges = false;
+
+			//mxd. Trigger updates manually...
+			preventmapchange = true;
+			angle_WhenTextChanged(angle, EventArgs.Empty);
+			flags_OnValueChanged(flags, EventArgs.Empty);
+			preventmapchange = false;
+
+			argscontrol.UpdateScriptControls(); //mxd
+			actionhelp.UpdateAction(action.GetValue()); //mxd
+		}
+
+		//mxd
+		private void MakeUndo() 
+		{
+			if(undocreated) return;
+			undocreated = true;
+
+			//mxd. Make undo
+			General.Map.UndoRedo.CreateUndo("Edit " + (things.Count > 1 ? things.Count + " things" : "thing"));
+		}
+		
+		#endregion
+
+		#region ================== Events
+
+		//mxd
+		private void thingtype_OnTypeDoubleClicked() 
+		{
+			apply_Click(this, EventArgs.Empty);
+		}
+		
+		// Action changes
+		private void action_ValueChanges(object sender, EventArgs e)
+		{
+			int showaction = 0;
+
+			// Only when line type is known, otherwise use the thing arguments
+			if(General.Map.Config.LinedefActions.ContainsKey(action.Value)) showaction = action.Value;
+			
+			//mxd. Change the argument descriptions
+			argscontrol.UpdateAction(showaction, preventchanges, (action.Empty ? null : thinginfo));
+
+			if(!preventchanges)
+			{
+				MakeUndo();
+
+				//mxd. Update what must be updated
+				argscontrol.UpdateScriptControls();
+				actionhelp.UpdateAction(showaction);
+			}
+		}
+
+		// Browse Action clicked
+		private void browseaction_Click(object sender, EventArgs e)
+		{
+			action.Value = ActionBrowserForm.BrowseAction(this, action.Value);
+		}
+
+		// Angle text changes
+		private void angle_WhenTextChanged(object sender, EventArgs e)
+		{
+			if(preventchanges) return;
+			preventchanges = true;
+			anglecontrol.Angle = angle.GetResult(GZBuilder.Controls.AngleControl.NO_ANGLE);
+			preventchanges = false;
+			if(!preventmapchange) ApplyAngleChange(); //mxd
+		}
+
+		//mxd. Angle control clicked
+		private void anglecontrol_AngleChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			angle.Text = anglecontrol.Angle.ToString();
+			if(!preventmapchange) ApplyAngleChange();
+		}
+
+		// Apply clicked
+		private void apply_Click(object sender, EventArgs e)
+		{
+			MakeUndo();
+			
+			List<string> defaultflags = new List<string>();
+
+			// Verify the tag
+			if(General.Map.FormatInterface.HasThingTag) //mxd
+			{
+				tagSelector.ValidateTag();//mxd
+				if(((tagSelector.GetTag(0) < General.Map.FormatInterface.MinTag) || (tagSelector.GetTag(0) > General.Map.FormatInterface.MaxTag))) 
+				{
+					General.ShowWarningMessage("Thing tag must be between " + General.Map.FormatInterface.MinTag + " and " + General.Map.FormatInterface.MaxTag + ".", MessageBoxButtons.OK);
+					return;
+				}
+			}
+
+			// Verify the type
+			if(((thingtype.GetResult(0) < General.Map.FormatInterface.MinThingType) || (thingtype.GetResult(0) > General.Map.FormatInterface.MaxThingType)))
+			{
+				General.ShowWarningMessage("Thing type must be between " + General.Map.FormatInterface.MinThingType + " and " + General.Map.FormatInterface.MaxThingType + ".", MessageBoxButtons.OK);
+				return;
+			}
+
+			// Verify the action
+			if(General.Map.FormatInterface.HasThingAction && ((action.Value < General.Map.FormatInterface.MinAction) || (action.Value > General.Map.FormatInterface.MaxAction)))
+			{
+				General.ShowWarningMessage("Thing action must be between " + General.Map.FormatInterface.MinAction + " and " + General.Map.FormatInterface.MaxAction + ".", MessageBoxButtons.OK);
+				return;
+			}
+
+			// Go for all the things
+			int tagoffset = 0; //mxd
+			foreach(Thing t in things)
+			{
+				// Coordination
+				if(cbRandomAngle.Checked) t.Rotate(General.Random(0, 359)); //mxd
+
+				//mxd. Check position
+				float px = General.Clamp(t.Position.x, General.Map.Config.LeftBoundary, General.Map.Config.RightBoundary);
+				float py = General.Clamp(t.Position.y, General.Map.Config.BottomBoundary, General.Map.Config.TopBoundary);
+				if(t.Position.x != px || t.Position.y != py) t.Move(new Vector2D(px, py));
+				
+				// Apply all flags
+				foreach(CheckBox c in flags.Checkboxes)
+				{
+					switch(c.CheckState)
+					{
+						case CheckState.Checked: t.SetFlag(c.Tag.ToString(), true); break;
+						case CheckState.Unchecked: t.SetFlag(c.Tag.ToString(), false); break;
+					}
+				}
+
+				// Action/tags
+				t.Tag = General.Clamp(tagSelector.GetSmartTag(t.Tag, tagoffset++), General.Map.FormatInterface.MinTag, General.Map.FormatInterface.MaxTag); //mxd
+				if(!action.Empty) t.Action = action.Value;
+
+				//mxd. Apply args
+				argscontrol.Apply(t);
+				
+				// Update settings
+				t.UpdateConfiguration();
+			}
+
+			// Set as defaults
+			foreach(CheckBox c in flags.Checkboxes)
+				if(c.CheckState == CheckState.Checked) defaultflags.Add(c.Tag.ToString());
+			General.Settings.DefaultThingType = thingtype.GetResult(General.Settings.DefaultThingType);
+			General.Settings.DefaultThingAngle = Angle2D.DegToRad((float)angle.GetResult((int)Angle2D.RadToDeg(General.Settings.DefaultThingAngle) - 90) + 90);
+			General.Settings.SetDefaultThingFlags(defaultflags);
+			
+			// Done
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null)	OnValuesChanged(this, EventArgs.Empty); //mxd
+			this.DialogResult = DialogResult.OK;
+			this.Close();
+		}
+
+		// Cancel clicked
+		private void cancel_Click(object sender, EventArgs e)
+		{
+			//mxd. Perform undo?
+			if(undocreated) General.Map.UndoRedo.WithdrawUndo();
+			
+			// Be gone
+			this.DialogResult = DialogResult.Cancel;
+			this.Close();
+		}
+
+		//mxd
+		private void cbAbsoluteHeight_CheckedChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo();
+
+			useabsoluteheight = cbAbsoluteHeight.Checked;
+			zlabel.Text = (useabsoluteheight ? "Z:" : "Height:");
+			
+			preventchanges = true;
+			
+			//update label text
+			Thing ft = General.GetByIndex(things, 0);
+			float z = ft.Position.z;
+			if(useabsoluteheight && ft.Sector != null) z += Sector.GetFloorPlane(ft.Sector).GetZ(ft.Position);
+			posZ.Text = ((float)Math.Round(z, General.Map.FormatInterface.VertexDecimals)).ToString();
+
+			foreach(Thing t in things) 
+			{
+				z = t.Position.z;
+				if(useabsoluteheight && t.Sector != null) z += Sector.GetFloorPlane(t.Sector).GetZ(t.Position);
+				string ztext = ((float)Math.Round(z, General.Map.FormatInterface.VertexDecimals)).ToString();
+				if(posZ.Text != ztext) 
+				{
+					posZ.Text = "";
+					break;
+				}
+			}
+
+			preventchanges = false;
+		}
+
+		//mxd
+		private void cbRandomAngle_CheckedChanged(object sender, EventArgs e) 
+		{
+			angle.Enabled = !cbRandomAngle.Checked;
+			anglecontrol.Enabled = !cbRandomAngle.Checked;
+		}
+
+		//mxd
+		private void ThingEditForm_Shown(object sender, EventArgs e)
+		{
+			thingtype.FocusTextbox();
+		}
+
+		//mxd
+		private void ThingEditForm_FormClosing(object sender, FormClosingEventArgs e) 
+		{
+			location = this.Location;
+		}
+
+		// Help
+		private void ThingEditForm_HelpRequested(object sender, HelpEventArgs hlpevent)
+		{
+			General.ShowHelp("w_thingedit.html");
+			hlpevent.Handled = true;
+		}
+
+		#endregion
+
+		#region ================== mxd. Realtime events
+
+		private void posX_WhenTextChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+			int i = 0;
+
+			// Update values
+			foreach(Thing t in things)
+				t.Move(new Vector2D(posX.GetResultFloat(thingprops[i++].X), t.Position.y));
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null)	OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void posY_WhenTextChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+			int i = 0;
+
+			// Update values
+			foreach(Thing t in things)
+				t.Move(new Vector2D(t.Position.x, posY.GetResultFloat(thingprops[i++].Y)));
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void posZ_WhenTextChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+			int i = 0;
+
+			if(string.IsNullOrEmpty(posZ.Text)) 
+			{
+				// Restore values
+				foreach(Thing t in things)
+					t.Move(new Vector3D(t.Position.x, t.Position.y, thingprops[i++].Z));
+			} 
+			else 
+			{ 
+				// Update values
+				foreach(Thing t in things) 
+				{
+					float z = posZ.GetResultFloat(thingprops[i++].Z);
+					if(useabsoluteheight && !posZ.CheckIsRelative() && t.Sector != null)
+						z -= (float)Math.Round(Sector.GetFloorPlane(t.Sector).GetZ(t.Position.x, t.Position.y), General.Map.FormatInterface.VertexDecimals);
+					t.Move(new Vector3D(t.Position.x, t.Position.y, z));
+				}
+			}
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		// Selected type changes
+		private void thingtype_OnTypeChanged(ThingTypeInfo value) 
+		{
+			thinginfo = value;
+
+			// Update arguments
+			action_ValueChanges(this, EventArgs.Empty);
+
+			//mxd. Update things
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+
+			if(((thingtype.GetResult(0) < General.Map.FormatInterface.MinThingType) || (thingtype.GetResult(0) > General.Map.FormatInterface.MaxThingType)))
+				return;
+
+			foreach(Thing t in things) 
+			{
+				//Set type
+				t.Type = thingtype.GetResult(t.Type);
+
+				// Update settings
+				t.UpdateConfiguration();
+			}
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		//mxd
+		private void ApplyAngleChange() 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+			int i = 0;
+
+			//restore values
+			if(string.IsNullOrEmpty(angle.Text)) 
+			{
+				// Apply rotation
+				foreach(Thing t in things)
+					t.Rotate(thingprops[i++].AngleDoom);
+			}
+			else //update values
+			{ 
+				// Apply rotation
+				foreach(Thing t in things)
+					t.Rotate(angle.GetResult(thingprops[i++].AngleDoom));
+			}
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null)	OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		//mxd
+		private void flags_OnValueChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+
+			// Gather enabled flags
+			HashSet<string> activeflags = new HashSet<string>();
+			foreach(CheckBox cb in flags.Checkboxes)
+			{
+				if(cb.CheckState != CheckState.Unchecked) activeflags.Add(cb.Tag.ToString());
+			}
+
+			// Check em
+			List<string> warnings = ThingFlagsCompare.CheckFlags(activeflags);
+			if(warnings.Count > 0) 
+			{
+				//got missing flags
+				tooltip.SetToolTip(missingflags, string.Join(Environment.NewLine, warnings.ToArray()));
+				missingflags.Visible = true;
+				settingsgroup.ForeColor = Color.DarkRed;
+				return;
+			}
+
+			//everything is OK
+			missingflags.Visible = false;
+			settingsgroup.ForeColor = SystemColors.ControlText;
+		}
+
+		#endregion
+
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/ThingEditForm.resx b/Source/Core/Windows/ThingEditForm.resx
new file mode 100644
index 0000000..f578280
--- /dev/null
+++ b/Source/Core/Windows/ThingEditForm.resx
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="groupBox2.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label7.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="label7.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Windows/ThingEditFormUDMF.Designer.cs b/Source/Core/Windows/ThingEditFormUDMF.Designer.cs
new file mode 100644
index 0000000..2b40f8c
--- /dev/null
+++ b/Source/Core/Windows/ThingEditFormUDMF.Designer.cs
@@ -0,0 +1,1086 @@
+namespace CodeImp.DoomBuilder.Windows
+{
+	partial class ThingEditFormUDMF
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing) 
+		{
+			if(disposing && (components != null)) 
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent() 
+		{
+			this.components = new System.ComponentModel.Container();
+			this.groupBox1 = new System.Windows.Forms.GroupBox();
+			this.thingtype = new CodeImp.DoomBuilder.Controls.ThingBrowserControl();
+			this.groupBox2 = new System.Windows.Forms.GroupBox();
+			this.cbrandomroll = new System.Windows.Forms.CheckBox();
+			this.cbrandompitch = new System.Windows.Forms.CheckBox();
+			this.cbrandomangle = new System.Windows.Forms.CheckBox();
+			this.roll = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.labelroll = new System.Windows.Forms.Label();
+			this.pitch = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.labelpitch = new System.Windows.Forms.Label();
+			this.angle = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.labelAngle = new System.Windows.Forms.Label();
+			this.anglecontrol = new CodeImp.DoomBuilder.GZBuilder.Controls.AngleControl();
+			this.labelGravity = new System.Windows.Forms.Label();
+			this.label7 = new System.Windows.Forms.Label();
+			this.tabs = new System.Windows.Forms.TabControl();
+			this.tabproperties = new System.Windows.Forms.TabPage();
+			this.settingsgroup = new System.Windows.Forms.GroupBox();
+			this.missingflags = new System.Windows.Forms.PictureBox();
+			this.flags = new CodeImp.DoomBuilder.Controls.CheckboxArrayControl();
+			this.grouproll = new System.Windows.Forms.GroupBox();
+			this.rollControl = new CodeImp.DoomBuilder.GZBuilder.Controls.AngleControl();
+			this.grouppitch = new System.Windows.Forms.GroupBox();
+			this.pitchControl = new CodeImp.DoomBuilder.GZBuilder.Controls.AngleControl();
+			this.groupangle = new System.Windows.Forms.GroupBox();
+			this.groupBox4 = new System.Windows.Forms.GroupBox();
+			this.cbAbsoluteHeight = new System.Windows.Forms.CheckBox();
+			this.label4 = new System.Windows.Forms.Label();
+			this.label5 = new System.Windows.Forms.Label();
+			this.posX = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.posY = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.posZ = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.zlabel = new System.Windows.Forms.Label();
+			this.tabeffects = new System.Windows.Forms.TabPage();
+			this.groupbehaviour = new System.Windows.Forms.GroupBox();
+			this.floatbobphase = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.label1 = new System.Windows.Forms.Label();
+			this.conversationID = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.labelID = new System.Windows.Forms.Label();
+			this.health = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.label10 = new System.Windows.Forms.Label();
+			this.score = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.label9 = new System.Windows.Forms.Label();
+			this.gravity = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.grouprendering = new System.Windows.Forms.GroupBox();
+			this.labelScale = new System.Windows.Forms.Label();
+			this.scale = new CodeImp.DoomBuilder.GZBuilder.Controls.PairedFloatControl();
+			this.color = new CodeImp.DoomBuilder.GZBuilder.Controls.ColorFieldsControl();
+			this.alpha = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.label8 = new System.Windows.Forms.Label();
+			this.renderStyle = new System.Windows.Forms.ComboBox();
+			this.labelrenderstyle = new System.Windows.Forms.Label();
+			this.actiongroup = new System.Windows.Forms.GroupBox();
+			this.argscontrol = new CodeImp.DoomBuilder.Controls.ArgumentsControl();
+			this.actionhelp = new CodeImp.DoomBuilder.Controls.ActionSpecialHelpButton();
+			this.action = new CodeImp.DoomBuilder.Controls.ActionSelectorControl();
+			this.browseaction = new System.Windows.Forms.Button();
+			this.grouptag = new System.Windows.Forms.GroupBox();
+			this.tagSelector = new CodeImp.DoomBuilder.GZBuilder.Controls.TagSelector();
+			this.tabcomment = new System.Windows.Forms.TabPage();
+			this.commenteditor = new CodeImp.DoomBuilder.Controls.CommentEditor();
+			this.tabcustom = new System.Windows.Forms.TabPage();
+			this.fieldslist = new CodeImp.DoomBuilder.Controls.FieldsEditorControl();
+			this.cancel = new System.Windows.Forms.Button();
+			this.apply = new System.Windows.Forms.Button();
+			this.hint = new System.Windows.Forms.PictureBox();
+			this.hintlabel = new System.Windows.Forms.Label();
+			this.tooltip = new System.Windows.Forms.ToolTip(this.components);
+			this.groupBox1.SuspendLayout();
+			this.groupBox2.SuspendLayout();
+			this.tabs.SuspendLayout();
+			this.tabproperties.SuspendLayout();
+			this.settingsgroup.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.missingflags)).BeginInit();
+			this.grouproll.SuspendLayout();
+			this.grouppitch.SuspendLayout();
+			this.groupangle.SuspendLayout();
+			this.groupBox4.SuspendLayout();
+			this.tabeffects.SuspendLayout();
+			this.groupbehaviour.SuspendLayout();
+			this.grouprendering.SuspendLayout();
+			this.actiongroup.SuspendLayout();
+			this.grouptag.SuspendLayout();
+			this.tabcomment.SuspendLayout();
+			this.tabcustom.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.hint)).BeginInit();
+			this.SuspendLayout();
+			// 
+			// groupBox1
+			// 
+			this.groupBox1.Controls.Add(this.thingtype);
+			this.groupBox1.Location = new System.Drawing.Point(6, 6);
+			this.groupBox1.Name = "groupBox1";
+			this.groupBox1.Size = new System.Drawing.Size(230, 390);
+			this.groupBox1.TabIndex = 0;
+			this.groupBox1.TabStop = false;
+			this.groupBox1.Text = " Thing ";
+			// 
+			// thingtype
+			// 
+			this.thingtype.Location = new System.Drawing.Point(9, 13);
+			this.thingtype.Margin = new System.Windows.Forms.Padding(6);
+			this.thingtype.Name = "thingtype";
+			this.thingtype.Size = new System.Drawing.Size(212, 374);
+			this.thingtype.TabIndex = 0;
+			this.thingtype.UseMultiSelection = true;
+			this.thingtype.OnTypeDoubleClicked += new CodeImp.DoomBuilder.Controls.ThingBrowserControl.TypeDoubleClickDeletegate(this.thingtype_OnTypeDoubleClicked);
+			this.thingtype.OnTypeChanged += new CodeImp.DoomBuilder.Controls.ThingBrowserControl.TypeChangedDeletegate(this.thingtype_OnTypeChanged);
+			// 
+			// groupBox2
+			// 
+			this.groupBox2.Controls.Add(this.cbrandomroll);
+			this.groupBox2.Controls.Add(this.cbrandompitch);
+			this.groupBox2.Controls.Add(this.cbrandomangle);
+			this.groupBox2.Controls.Add(this.roll);
+			this.groupBox2.Controls.Add(this.labelroll);
+			this.groupBox2.Controls.Add(this.pitch);
+			this.groupBox2.Controls.Add(this.labelpitch);
+			this.groupBox2.Controls.Add(this.angle);
+			this.groupBox2.Controls.Add(this.labelAngle);
+			this.groupBox2.Location = new System.Drawing.Point(428, 298);
+			this.groupBox2.Name = "groupBox2";
+			this.groupBox2.Size = new System.Drawing.Size(193, 98);
+			this.groupBox2.TabIndex = 2;
+			this.groupBox2.TabStop = false;
+			this.groupBox2.Text = " Rotation ";
+			// 
+			// cbrandomroll
+			// 
+			this.cbrandomroll.AutoSize = true;
+			this.cbrandomroll.Location = new System.Drawing.Point(120, 71);
+			this.cbrandomroll.Name = "cbrandomroll";
+			this.cbrandomroll.Size = new System.Drawing.Size(66, 17);
+			this.cbrandomroll.TabIndex = 26;
+			this.cbrandomroll.Text = "Random";
+			this.cbrandomroll.UseVisualStyleBackColor = true;
+			this.cbrandomroll.CheckedChanged += new System.EventHandler(this.cbrandomroll_CheckedChanged);
+			// 
+			// cbrandompitch
+			// 
+			this.cbrandompitch.AutoSize = true;
+			this.cbrandompitch.Location = new System.Drawing.Point(120, 46);
+			this.cbrandompitch.Name = "cbrandompitch";
+			this.cbrandompitch.Size = new System.Drawing.Size(66, 17);
+			this.cbrandompitch.TabIndex = 25;
+			this.cbrandompitch.Text = "Random";
+			this.cbrandompitch.UseVisualStyleBackColor = true;
+			this.cbrandompitch.CheckedChanged += new System.EventHandler(this.cbrandompitch_CheckedChanged);
+			// 
+			// cbrandomangle
+			// 
+			this.cbrandomangle.AutoSize = true;
+			this.cbrandomangle.Location = new System.Drawing.Point(120, 21);
+			this.cbrandomangle.Name = "cbrandomangle";
+			this.cbrandomangle.Size = new System.Drawing.Size(66, 17);
+			this.cbrandomangle.TabIndex = 17;
+			this.cbrandomangle.Text = "Random";
+			this.cbrandomangle.UseVisualStyleBackColor = true;
+			this.cbrandomangle.CheckedChanged += new System.EventHandler(this.cbrandomangle_CheckedChanged);
+			// 
+			// roll
+			// 
+			this.roll.AllowDecimal = false;
+			this.roll.AllowNegative = true;
+			this.roll.AllowRelative = true;
+			this.roll.ButtonStep = 5;
+			this.roll.ButtonStepBig = 15F;
+			this.roll.ButtonStepFloat = 1F;
+			this.roll.ButtonStepSmall = 1F;
+			this.roll.ButtonStepsUseModifierKeys = true;
+			this.roll.ButtonStepsWrapAround = false;
+			this.roll.Location = new System.Drawing.Point(55, 66);
+			this.roll.Name = "roll";
+			this.roll.Size = new System.Drawing.Size(60, 24);
+			this.roll.StepValues = null;
+			this.roll.TabIndex = 24;
+			this.roll.WhenTextChanged += new System.EventHandler(this.roll_WhenTextChanged);
+			// 
+			// labelroll
+			// 
+			this.labelroll.Location = new System.Drawing.Point(5, 71);
+			this.labelroll.Name = "labelroll";
+			this.labelroll.Size = new System.Drawing.Size(44, 14);
+			this.labelroll.TabIndex = 23;
+			this.labelroll.Text = "Roll:";
+			this.labelroll.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// pitch
+			// 
+			this.pitch.AllowDecimal = false;
+			this.pitch.AllowNegative = true;
+			this.pitch.AllowRelative = true;
+			this.pitch.ButtonStep = 5;
+			this.pitch.ButtonStepBig = 15F;
+			this.pitch.ButtonStepFloat = 1F;
+			this.pitch.ButtonStepSmall = 1F;
+			this.pitch.ButtonStepsUseModifierKeys = true;
+			this.pitch.ButtonStepsWrapAround = false;
+			this.pitch.Location = new System.Drawing.Point(55, 41);
+			this.pitch.Name = "pitch";
+			this.pitch.Size = new System.Drawing.Size(60, 24);
+			this.pitch.StepValues = null;
+			this.pitch.TabIndex = 22;
+			this.pitch.WhenTextChanged += new System.EventHandler(this.pitch_WhenTextChanged);
+			// 
+			// labelpitch
+			// 
+			this.labelpitch.Location = new System.Drawing.Point(5, 46);
+			this.labelpitch.Name = "labelpitch";
+			this.labelpitch.Size = new System.Drawing.Size(44, 14);
+			this.labelpitch.TabIndex = 21;
+			this.labelpitch.Text = "Pitch:";
+			this.labelpitch.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// angle
+			// 
+			this.angle.AllowDecimal = false;
+			this.angle.AllowNegative = true;
+			this.angle.AllowRelative = true;
+			this.angle.ButtonStep = 5;
+			this.angle.ButtonStepBig = 15F;
+			this.angle.ButtonStepFloat = 1F;
+			this.angle.ButtonStepSmall = 1F;
+			this.angle.ButtonStepsUseModifierKeys = true;
+			this.angle.ButtonStepsWrapAround = false;
+			this.angle.Location = new System.Drawing.Point(55, 16);
+			this.angle.Name = "angle";
+			this.angle.Size = new System.Drawing.Size(60, 24);
+			this.angle.StepValues = null;
+			this.angle.TabIndex = 10;
+			this.angle.WhenTextChanged += new System.EventHandler(this.angle_WhenTextChanged);
+			// 
+			// labelAngle
+			// 
+			this.labelAngle.Location = new System.Drawing.Point(5, 21);
+			this.labelAngle.Name = "labelAngle";
+			this.labelAngle.Size = new System.Drawing.Size(44, 14);
+			this.labelAngle.TabIndex = 8;
+			this.labelAngle.Text = "Angle:";
+			this.labelAngle.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// anglecontrol
+			// 
+			this.anglecontrol.Angle = 0;
+			this.anglecontrol.AngleOffset = 0;
+			this.anglecontrol.Location = new System.Drawing.Point(7, 17);
+			this.anglecontrol.Name = "anglecontrol";
+			this.anglecontrol.Size = new System.Drawing.Size(64, 64);
+			this.anglecontrol.TabIndex = 20;
+			this.anglecontrol.AngleChanged += new System.EventHandler(this.anglecontrol_AngleChanged);
+			// 
+			// labelGravity
+			// 
+			this.labelGravity.AutoSize = true;
+			this.labelGravity.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.labelGravity.ForeColor = System.Drawing.SystemColors.HotTrack;
+			this.labelGravity.Location = new System.Drawing.Point(19, 27);
+			this.labelGravity.Name = "labelGravity";
+			this.labelGravity.Size = new System.Drawing.Size(43, 13);
+			this.labelGravity.TabIndex = 18;
+			this.labelGravity.Text = "Gravity:";
+			this.tooltip.SetToolTip(this.labelGravity, "Positive values are multiplied with the class\'s property.\r\nNegative values are us" +
+					"ed as their absolute.\r\nDefault is 1.0.");
+			// 
+			// label7
+			// 
+			this.label7.AutoSize = true;
+			this.label7.Location = new System.Drawing.Point(15, 30);
+			this.label7.Name = "label7";
+			this.label7.Size = new System.Drawing.Size(40, 13);
+			this.label7.TabIndex = 9;
+			this.label7.Text = "Action:";
+			// 
+			// tabs
+			// 
+			this.tabs.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.tabs.Controls.Add(this.tabproperties);
+			this.tabs.Controls.Add(this.tabeffects);
+			this.tabs.Controls.Add(this.tabcomment);
+			this.tabs.Controls.Add(this.tabcustom);
+			this.tabs.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.tabs.Location = new System.Drawing.Point(10, 10);
+			this.tabs.Margin = new System.Windows.Forms.Padding(1);
+			this.tabs.Name = "tabs";
+			this.tabs.Padding = new System.Drawing.Point(24, 3);
+			this.tabs.SelectedIndex = 0;
+			this.tabs.Size = new System.Drawing.Size(635, 429);
+			this.tabs.TabIndex = 0;
+			// 
+			// tabproperties
+			// 
+			this.tabproperties.Controls.Add(this.settingsgroup);
+			this.tabproperties.Controls.Add(this.grouproll);
+			this.tabproperties.Controls.Add(this.grouppitch);
+			this.tabproperties.Controls.Add(this.groupangle);
+			this.tabproperties.Controls.Add(this.groupBox4);
+			this.tabproperties.Controls.Add(this.groupBox2);
+			this.tabproperties.Controls.Add(this.groupBox1);
+			this.tabproperties.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.tabproperties.Location = new System.Drawing.Point(4, 22);
+			this.tabproperties.Name = "tabproperties";
+			this.tabproperties.Padding = new System.Windows.Forms.Padding(3);
+			this.tabproperties.Size = new System.Drawing.Size(627, 403);
+			this.tabproperties.TabIndex = 0;
+			this.tabproperties.Text = "Properties";
+			this.tabproperties.UseVisualStyleBackColor = true;
+			// 
+			// settingsgroup
+			// 
+			this.settingsgroup.Controls.Add(this.missingflags);
+			this.settingsgroup.Controls.Add(this.flags);
+			this.settingsgroup.Location = new System.Drawing.Point(242, 6);
+			this.settingsgroup.Name = "settingsgroup";
+			this.settingsgroup.Size = new System.Drawing.Size(295, 286);
+			this.settingsgroup.TabIndex = 23;
+			this.settingsgroup.TabStop = false;
+			this.settingsgroup.Text = " Flags ";
+			// 
+			// missingflags
+			// 
+			this.missingflags.BackColor = System.Drawing.SystemColors.Window;
+			this.missingflags.Image = global::CodeImp.DoomBuilder.Properties.Resources.Warning;
+			this.missingflags.Location = new System.Drawing.Point(42, -2);
+			this.missingflags.Name = "missingflags";
+			this.missingflags.Size = new System.Drawing.Size(16, 16);
+			this.missingflags.TabIndex = 5;
+			this.missingflags.TabStop = false;
+			this.missingflags.Visible = false;
+			// 
+			// flags
+			// 
+			this.flags.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.flags.AutoScroll = true;
+			this.flags.Columns = 2;
+			this.flags.Location = new System.Drawing.Point(6, 19);
+			this.flags.Name = "flags";
+			this.flags.Size = new System.Drawing.Size(283, 260);
+			this.flags.TabIndex = 0;
+			this.flags.VerticalSpacing = 1;
+			this.flags.OnValueChanged += new System.EventHandler(this.flags_OnValueChanged);
+			// 
+			// grouproll
+			// 
+			this.grouproll.Controls.Add(this.rollControl);
+			this.grouproll.Location = new System.Drawing.Point(543, 16);
+			this.grouproll.Name = "grouproll";
+			this.grouproll.Size = new System.Drawing.Size(78, 88);
+			this.grouproll.TabIndex = 26;
+			this.grouproll.TabStop = false;
+			this.grouproll.Text = " Roll ";
+			// 
+			// rollControl
+			// 
+			this.rollControl.Angle = -90;
+			this.rollControl.AngleOffset = 0;
+			this.rollControl.Location = new System.Drawing.Point(7, 17);
+			this.rollControl.Name = "rollControl";
+			this.rollControl.Size = new System.Drawing.Size(64, 64);
+			this.rollControl.TabIndex = 20;
+			this.rollControl.AngleChanged += new System.EventHandler(this.rollControl_AngleChanged);
+			// 
+			// grouppitch
+			// 
+			this.grouppitch.Controls.Add(this.pitchControl);
+			this.grouppitch.Location = new System.Drawing.Point(543, 110);
+			this.grouppitch.Name = "grouppitch";
+			this.grouppitch.Size = new System.Drawing.Size(78, 88);
+			this.grouppitch.TabIndex = 25;
+			this.grouppitch.TabStop = false;
+			this.grouppitch.Text = " Pitch ";
+			// 
+			// pitchControl
+			// 
+			this.pitchControl.Angle = -90;
+			this.pitchControl.AngleOffset = 0;
+			this.pitchControl.Location = new System.Drawing.Point(7, 17);
+			this.pitchControl.Name = "pitchControl";
+			this.pitchControl.Size = new System.Drawing.Size(64, 64);
+			this.pitchControl.TabIndex = 20;
+			this.pitchControl.AngleChanged += new System.EventHandler(this.pitchControl_AngleChanged);
+			// 
+			// groupangle
+			// 
+			this.groupangle.Controls.Add(this.anglecontrol);
+			this.groupangle.Location = new System.Drawing.Point(543, 204);
+			this.groupangle.Name = "groupangle";
+			this.groupangle.Size = new System.Drawing.Size(78, 88);
+			this.groupangle.TabIndex = 24;
+			this.groupangle.TabStop = false;
+			this.groupangle.Text = " Angle";
+			// 
+			// groupBox4
+			// 
+			this.groupBox4.Controls.Add(this.cbAbsoluteHeight);
+			this.groupBox4.Controls.Add(this.label4);
+			this.groupBox4.Controls.Add(this.label5);
+			this.groupBox4.Controls.Add(this.posX);
+			this.groupBox4.Controls.Add(this.posY);
+			this.groupBox4.Controls.Add(this.posZ);
+			this.groupBox4.Controls.Add(this.zlabel);
+			this.groupBox4.Location = new System.Drawing.Point(242, 298);
+			this.groupBox4.Name = "groupBox4";
+			this.groupBox4.Size = new System.Drawing.Size(180, 98);
+			this.groupBox4.TabIndex = 21;
+			this.groupBox4.TabStop = false;
+			this.groupBox4.Text = " Position";
+			// 
+			// cbAbsoluteHeight
+			// 
+			this.cbAbsoluteHeight.AutoSize = true;
+			this.cbAbsoluteHeight.Location = new System.Drawing.Point(109, 71);
+			this.cbAbsoluteHeight.Name = "cbAbsoluteHeight";
+			this.cbAbsoluteHeight.Size = new System.Drawing.Size(67, 17);
+			this.cbAbsoluteHeight.TabIndex = 16;
+			this.cbAbsoluteHeight.Text = "Absolute";
+			this.cbAbsoluteHeight.UseVisualStyleBackColor = true;
+			this.cbAbsoluteHeight.CheckedChanged += new System.EventHandler(this.cbAbsoluteHeight_CheckedChanged);
+			// 
+			// label4
+			// 
+			this.label4.Location = new System.Drawing.Point(4, 21);
+			this.label4.Name = "label4";
+			this.label4.Size = new System.Drawing.Size(22, 14);
+			this.label4.TabIndex = 15;
+			this.label4.Text = "X:";
+			this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+			// 
+			// label5
+			// 
+			this.label5.Location = new System.Drawing.Point(4, 46);
+			this.label5.Name = "label5";
+			this.label5.Size = new System.Drawing.Size(22, 14);
+			this.label5.TabIndex = 14;
+			this.label5.Text = "Y:";
+			this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+			// 
+			// posX
+			// 
+			this.posX.AllowDecimal = true;
+			this.posX.AllowNegative = true;
+			this.posX.AllowRelative = true;
+			this.posX.ButtonStep = 8;
+			this.posX.ButtonStepBig = 8F;
+			this.posX.ButtonStepFloat = 1F;
+			this.posX.ButtonStepSmall = 0.1F;
+			this.posX.ButtonStepsUseModifierKeys = true;
+			this.posX.ButtonStepsWrapAround = false;
+			this.posX.Location = new System.Drawing.Point(32, 16);
+			this.posX.Name = "posX";
+			this.posX.Size = new System.Drawing.Size(72, 24);
+			this.posX.StepValues = null;
+			this.posX.TabIndex = 13;
+			this.posX.WhenTextChanged += new System.EventHandler(this.posX_WhenTextChanged);
+			// 
+			// posY
+			// 
+			this.posY.AllowDecimal = true;
+			this.posY.AllowNegative = true;
+			this.posY.AllowRelative = true;
+			this.posY.ButtonStep = 8;
+			this.posY.ButtonStepBig = 8F;
+			this.posY.ButtonStepFloat = 1F;
+			this.posY.ButtonStepSmall = 0.1F;
+			this.posY.ButtonStepsUseModifierKeys = true;
+			this.posY.ButtonStepsWrapAround = false;
+			this.posY.Location = new System.Drawing.Point(32, 41);
+			this.posY.Name = "posY";
+			this.posY.Size = new System.Drawing.Size(72, 24);
+			this.posY.StepValues = null;
+			this.posY.TabIndex = 12;
+			this.posY.WhenTextChanged += new System.EventHandler(this.posY_WhenTextChanged);
+			// 
+			// posZ
+			// 
+			this.posZ.AllowDecimal = true;
+			this.posZ.AllowNegative = true;
+			this.posZ.AllowRelative = true;
+			this.posZ.ButtonStep = 8;
+			this.posZ.ButtonStepBig = 8F;
+			this.posZ.ButtonStepFloat = 1F;
+			this.posZ.ButtonStepSmall = 0.1F;
+			this.posZ.ButtonStepsUseModifierKeys = true;
+			this.posZ.ButtonStepsWrapAround = false;
+			this.posZ.Location = new System.Drawing.Point(32, 66);
+			this.posZ.Name = "posZ";
+			this.posZ.Size = new System.Drawing.Size(72, 24);
+			this.posZ.StepValues = null;
+			this.posZ.TabIndex = 11;
+			this.posZ.WhenTextChanged += new System.EventHandler(this.posZ_WhenTextChanged);
+			// 
+			// zlabel
+			// 
+			this.zlabel.Location = new System.Drawing.Point(4, 71);
+			this.zlabel.Name = "zlabel";
+			this.zlabel.Size = new System.Drawing.Size(22, 14);
+			this.zlabel.TabIndex = 9;
+			this.zlabel.Text = "Z:";
+			this.zlabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+			// 
+			// tabeffects
+			// 
+			this.tabeffects.Controls.Add(this.groupbehaviour);
+			this.tabeffects.Controls.Add(this.grouprendering);
+			this.tabeffects.Controls.Add(this.actiongroup);
+			this.tabeffects.Controls.Add(this.grouptag);
+			this.tabeffects.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.tabeffects.Location = new System.Drawing.Point(4, 22);
+			this.tabeffects.Name = "tabeffects";
+			this.tabeffects.Padding = new System.Windows.Forms.Padding(3);
+			this.tabeffects.Size = new System.Drawing.Size(627, 403);
+			this.tabeffects.TabIndex = 1;
+			this.tabeffects.Text = "Action / Tag / Misc.";
+			this.tabeffects.UseVisualStyleBackColor = true;
+			// 
+			// groupbehaviour
+			// 
+			this.groupbehaviour.Controls.Add(this.floatbobphase);
+			this.groupbehaviour.Controls.Add(this.label1);
+			this.groupbehaviour.Controls.Add(this.conversationID);
+			this.groupbehaviour.Controls.Add(this.labelID);
+			this.groupbehaviour.Controls.Add(this.health);
+			this.groupbehaviour.Controls.Add(this.label10);
+			this.groupbehaviour.Controls.Add(this.score);
+			this.groupbehaviour.Controls.Add(this.label9);
+			this.groupbehaviour.Controls.Add(this.gravity);
+			this.groupbehaviour.Controls.Add(this.labelGravity);
+			this.groupbehaviour.Location = new System.Drawing.Point(285, 6);
+			this.groupbehaviour.Name = "groupbehaviour";
+			this.groupbehaviour.Size = new System.Drawing.Size(333, 158);
+			this.groupbehaviour.TabIndex = 23;
+			this.groupbehaviour.TabStop = false;
+			this.groupbehaviour.Text = " Behaviour ";
+			// 
+			// floatbobphase
+			// 
+			this.floatbobphase.AllowDecimal = false;
+			this.floatbobphase.AllowNegative = true;
+			this.floatbobphase.AllowRelative = false;
+			this.floatbobphase.ButtonStep = 1;
+			this.floatbobphase.ButtonStepBig = 8F;
+			this.floatbobphase.ButtonStepFloat = 1F;
+			this.floatbobphase.ButtonStepSmall = 1F;
+			this.floatbobphase.ButtonStepsUseModifierKeys = false;
+			this.floatbobphase.ButtonStepsWrapAround = false;
+			this.floatbobphase.Location = new System.Drawing.Point(251, 52);
+			this.floatbobphase.Name = "floatbobphase";
+			this.floatbobphase.Size = new System.Drawing.Size(72, 24);
+			this.floatbobphase.StepValues = null;
+			this.floatbobphase.TabIndex = 28;
+			// 
+			// label1
+			// 
+			this.label1.AutoSize = true;
+			this.label1.Location = new System.Drawing.Point(159, 57);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(86, 13);
+			this.label1.TabIndex = 27;
+			this.label1.Text = "Float bob phase:";
+			// 
+			// conversationID
+			// 
+			this.conversationID.AllowDecimal = false;
+			this.conversationID.AllowNegative = false;
+			this.conversationID.AllowRelative = false;
+			this.conversationID.ButtonStep = 1;
+			this.conversationID.ButtonStepBig = 8F;
+			this.conversationID.ButtonStepFloat = 1F;
+			this.conversationID.ButtonStepSmall = 1F;
+			this.conversationID.ButtonStepsUseModifierKeys = false;
+			this.conversationID.ButtonStepsWrapAround = false;
+			this.conversationID.Location = new System.Drawing.Point(251, 22);
+			this.conversationID.Name = "conversationID";
+			this.conversationID.Size = new System.Drawing.Size(72, 24);
+			this.conversationID.StepValues = null;
+			this.conversationID.TabIndex = 26;
+			// 
+			// labelID
+			// 
+			this.labelID.AutoSize = true;
+			this.labelID.Location = new System.Drawing.Point(159, 27);
+			this.labelID.Name = "labelID";
+			this.labelID.Size = new System.Drawing.Size(86, 13);
+			this.labelID.TabIndex = 25;
+			this.labelID.Text = "Conversation ID:";
+			// 
+			// health
+			// 
+			this.health.AllowDecimal = false;
+			this.health.AllowNegative = true;
+			this.health.AllowRelative = false;
+			this.health.ButtonStep = 8;
+			this.health.ButtonStepBig = 16F;
+			this.health.ButtonStepFloat = 0.1F;
+			this.health.ButtonStepSmall = 1F;
+			this.health.ButtonStepsUseModifierKeys = true;
+			this.health.ButtonStepsWrapAround = false;
+			this.health.Location = new System.Drawing.Point(68, 82);
+			this.health.Name = "health";
+			this.health.Size = new System.Drawing.Size(72, 24);
+			this.health.StepValues = null;
+			this.health.TabIndex = 23;
+			// 
+			// label10
+			// 
+			this.label10.AutoSize = true;
+			this.label10.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.label10.ForeColor = System.Drawing.SystemColors.HotTrack;
+			this.label10.Location = new System.Drawing.Point(21, 87);
+			this.label10.Name = "label10";
+			this.label10.Size = new System.Drawing.Size(41, 13);
+			this.label10.TabIndex = 22;
+			this.label10.Text = "Health:";
+			this.tooltip.SetToolTip(this.label10, "Positive values are multiplied with the class\'s property.\r\nNegative values are us" +
+					"ed as their absolute.\r\nDefault is 1.");
+			// 
+			// score
+			// 
+			this.score.AllowDecimal = false;
+			this.score.AllowNegative = false;
+			this.score.AllowRelative = false;
+			this.score.ButtonStep = 8;
+			this.score.ButtonStepBig = 16F;
+			this.score.ButtonStepFloat = 0.1F;
+			this.score.ButtonStepSmall = 1F;
+			this.score.ButtonStepsUseModifierKeys = true;
+			this.score.ButtonStepsWrapAround = false;
+			this.score.Location = new System.Drawing.Point(68, 52);
+			this.score.Name = "score";
+			this.score.Size = new System.Drawing.Size(72, 24);
+			this.score.StepValues = null;
+			this.score.TabIndex = 21;
+			// 
+			// label9
+			// 
+			this.label9.AutoSize = true;
+			this.label9.Location = new System.Drawing.Point(24, 57);
+			this.label9.Name = "label9";
+			this.label9.Size = new System.Drawing.Size(38, 13);
+			this.label9.TabIndex = 20;
+			this.label9.Text = "Score:";
+			// 
+			// gravity
+			// 
+			this.gravity.AllowDecimal = true;
+			this.gravity.AllowNegative = true;
+			this.gravity.AllowRelative = false;
+			this.gravity.ButtonStep = 8;
+			this.gravity.ButtonStepBig = 0.25F;
+			this.gravity.ButtonStepFloat = 0.1F;
+			this.gravity.ButtonStepSmall = 0.01F;
+			this.gravity.ButtonStepsUseModifierKeys = true;
+			this.gravity.ButtonStepsWrapAround = false;
+			this.gravity.Location = new System.Drawing.Point(68, 22);
+			this.gravity.Name = "gravity";
+			this.gravity.Size = new System.Drawing.Size(72, 24);
+			this.gravity.StepValues = null;
+			this.gravity.TabIndex = 19;
+			// 
+			// grouprendering
+			// 
+			this.grouprendering.Controls.Add(this.labelScale);
+			this.grouprendering.Controls.Add(this.scale);
+			this.grouprendering.Controls.Add(this.color);
+			this.grouprendering.Controls.Add(this.alpha);
+			this.grouprendering.Controls.Add(this.label8);
+			this.grouprendering.Controls.Add(this.renderStyle);
+			this.grouprendering.Controls.Add(this.labelrenderstyle);
+			this.grouprendering.Location = new System.Drawing.Point(3, 6);
+			this.grouprendering.Name = "grouprendering";
+			this.grouprendering.Size = new System.Drawing.Size(276, 158);
+			this.grouprendering.TabIndex = 22;
+			this.grouprendering.TabStop = false;
+			this.grouprendering.Text = " Rendering ";
+			// 
+			// labelScale
+			// 
+			this.labelScale.Location = new System.Drawing.Point(5, 27);
+			this.labelScale.Name = "labelScale";
+			this.labelScale.Size = new System.Drawing.Size(80, 14);
+			this.labelScale.TabIndex = 32;
+			this.labelScale.Text = "Scale:";
+			this.labelScale.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+			// 
+			// scale
+			// 
+			this.scale.ButtonStep = 0.1F;
+			this.scale.ButtonStepBig = 0.25F;
+			this.scale.ButtonStepSmall = 0.01F;
+			this.scale.ButtonStepsUseModifierKeys = true;
+			this.scale.DefaultValue = 1F;
+			this.scale.LinkValues = false;
+			this.scale.Location = new System.Drawing.Point(89, 22);
+			this.scale.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
+			this.scale.Name = "scale";
+			this.scale.Size = new System.Drawing.Size(186, 26);
+			this.scale.TabIndex = 31;
+			this.scale.OnValuesChanged += new System.EventHandler(this.scale_OnValuesChanged);
+			// 
+			// color
+			// 
+			this.color.DefaultValue = 0;
+			this.color.Field = "fillcolor";
+			this.color.Label = "Color:";
+			this.color.Location = new System.Drawing.Point(44, 115);
+			this.color.Name = "color";
+			this.color.Size = new System.Drawing.Size(207, 31);
+			this.color.TabIndex = 30;
+			// 
+			// alpha
+			// 
+			this.alpha.AllowDecimal = true;
+			this.alpha.AllowNegative = true;
+			this.alpha.AllowRelative = false;
+			this.alpha.ButtonStep = 8;
+			this.alpha.ButtonStepBig = 0.25F;
+			this.alpha.ButtonStepFloat = 0.1F;
+			this.alpha.ButtonStepSmall = 0.01F;
+			this.alpha.ButtonStepsUseModifierKeys = true;
+			this.alpha.ButtonStepsWrapAround = false;
+			this.alpha.Location = new System.Drawing.Point(91, 85);
+			this.alpha.Name = "alpha";
+			this.alpha.Size = new System.Drawing.Size(72, 24);
+			this.alpha.StepValues = null;
+			this.alpha.TabIndex = 23;
+			this.alpha.WhenTextChanged += new System.EventHandler(this.alpha_WhenTextChanged);
+			// 
+			// label8
+			// 
+			this.label8.AutoSize = true;
+			this.label8.Location = new System.Drawing.Point(48, 89);
+			this.label8.Name = "label8";
+			this.label8.Size = new System.Drawing.Size(37, 13);
+			this.label8.TabIndex = 25;
+			this.label8.Text = "Alpha:";
+			// 
+			// renderStyle
+			// 
+			this.renderStyle.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.renderStyle.FormattingEnabled = true;
+			this.renderStyle.Location = new System.Drawing.Point(91, 57);
+			this.renderStyle.Name = "renderStyle";
+			this.renderStyle.Size = new System.Drawing.Size(156, 21);
+			this.renderStyle.TabIndex = 24;
+			this.renderStyle.SelectedIndexChanged += new System.EventHandler(this.renderStyle_SelectedIndexChanged);
+			// 
+			// labelrenderstyle
+			// 
+			this.labelrenderstyle.AutoSize = true;
+			this.labelrenderstyle.Location = new System.Drawing.Point(16, 60);
+			this.labelrenderstyle.Name = "labelrenderstyle";
+			this.labelrenderstyle.Size = new System.Drawing.Size(69, 13);
+			this.labelrenderstyle.TabIndex = 23;
+			this.labelrenderstyle.Text = "Render style:";
+			// 
+			// actiongroup
+			// 
+			this.actiongroup.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.actiongroup.Controls.Add(this.argscontrol);
+			this.actiongroup.Controls.Add(this.actionhelp);
+			this.actiongroup.Controls.Add(this.label7);
+			this.actiongroup.Controls.Add(this.action);
+			this.actiongroup.Controls.Add(this.browseaction);
+			this.actiongroup.Location = new System.Drawing.Point(3, 170);
+			this.actiongroup.Name = "actiongroup";
+			this.actiongroup.Size = new System.Drawing.Size(615, 154);
+			this.actiongroup.TabIndex = 22;
+			this.actiongroup.TabStop = false;
+			this.actiongroup.Text = " Action ";
+			// 
+			// argscontrol
+			// 
+			this.argscontrol.Location = new System.Drawing.Point(6, 56);
+			this.argscontrol.Name = "argscontrol";
+			this.argscontrol.Size = new System.Drawing.Size(603, 80);
+			this.argscontrol.TabIndex = 15;
+			// 
+			// actionhelp
+			// 
+			this.actionhelp.Location = new System.Drawing.Point(581, 24);
+			this.actionhelp.Name = "actionhelp";
+			this.actionhelp.Size = new System.Drawing.Size(28, 26);
+			this.actionhelp.TabIndex = 14;
+			// 
+			// action
+			// 
+			this.action.BackColor = System.Drawing.SystemColors.Control;
+			this.action.Cursor = System.Windows.Forms.Cursors.Default;
+			this.action.Empty = false;
+			this.action.GeneralizedCategories = null;
+			this.action.GeneralizedOptions = null;
+			this.action.Location = new System.Drawing.Point(62, 27);
+			this.action.Name = "action";
+			this.action.Size = new System.Drawing.Size(485, 21);
+			this.action.TabIndex = 0;
+			this.action.Value = 402;
+			this.action.ValueChanges += new System.EventHandler(this.action_ValueChanges);
+			// 
+			// browseaction
+			// 
+			this.browseaction.Image = global::CodeImp.DoomBuilder.Properties.Resources.List;
+			this.browseaction.Location = new System.Drawing.Point(551, 24);
+			this.browseaction.Name = "browseaction";
+			this.browseaction.Size = new System.Drawing.Size(28, 26);
+			this.browseaction.TabIndex = 1;
+			this.browseaction.Text = " ";
+			this.tooltip.SetToolTip(this.browseaction, "Browse Action");
+			this.browseaction.UseVisualStyleBackColor = true;
+			this.browseaction.Click += new System.EventHandler(this.browseaction_Click);
+			// 
+			// grouptag
+			// 
+			this.grouptag.Controls.Add(this.tagSelector);
+			this.grouptag.Location = new System.Drawing.Point(3, 330);
+			this.grouptag.Name = "grouptag";
+			this.grouptag.Size = new System.Drawing.Size(615, 66);
+			this.grouptag.TabIndex = 0;
+			this.grouptag.TabStop = false;
+			this.grouptag.Text = " Identification ";
+			// 
+			// tagSelector
+			// 
+			this.tagSelector.Location = new System.Drawing.Point(6, 21);
+			this.tagSelector.Name = "tagSelector";
+			this.tagSelector.Size = new System.Drawing.Size(603, 35);
+			this.tagSelector.TabIndex = 8;
+			// 
+			// tabcomment
+			// 
+			this.tabcomment.Controls.Add(this.commenteditor);
+			this.tabcomment.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.tabcomment.Location = new System.Drawing.Point(4, 22);
+			this.tabcomment.Name = "tabcomment";
+			this.tabcomment.Size = new System.Drawing.Size(627, 403);
+			this.tabcomment.TabIndex = 3;
+			this.tabcomment.Text = "Comment";
+			this.tabcomment.UseVisualStyleBackColor = true;
+			// 
+			// commenteditor
+			// 
+			this.commenteditor.Location = new System.Drawing.Point(3, 3);
+			this.commenteditor.Name = "commenteditor";
+			this.commenteditor.Size = new System.Drawing.Size(621, 396);
+			this.commenteditor.TabIndex = 0;
+			// 
+			// tabcustom
+			// 
+			this.tabcustom.Controls.Add(this.fieldslist);
+			this.tabcustom.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.tabcustom.Location = new System.Drawing.Point(4, 22);
+			this.tabcustom.Name = "tabcustom";
+			this.tabcustom.Size = new System.Drawing.Size(627, 403);
+			this.tabcustom.TabIndex = 2;
+			this.tabcustom.Text = "Custom";
+			this.tabcustom.UseVisualStyleBackColor = true;
+			this.tabcustom.MouseEnter += new System.EventHandler(this.tabcustom_MouseEnter);
+			// 
+			// fieldslist
+			// 
+			this.fieldslist.AllowInsert = true;
+			this.fieldslist.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.fieldslist.AutoInsertUserPrefix = true;
+			this.fieldslist.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+			this.fieldslist.Location = new System.Drawing.Point(8, 9);
+			this.fieldslist.Margin = new System.Windows.Forms.Padding(8, 9, 8, 9);
+			this.fieldslist.Name = "fieldslist";
+			this.fieldslist.PropertyColumnVisible = true;
+			this.fieldslist.PropertyColumnWidth = 150;
+			this.fieldslist.Size = new System.Drawing.Size(611, 389);
+			this.fieldslist.TabIndex = 1;
+			this.fieldslist.TypeColumnVisible = true;
+			this.fieldslist.TypeColumnWidth = 100;
+			this.fieldslist.ValueColumnVisible = true;
+			// 
+			// cancel
+			// 
+			this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.cancel.Location = new System.Drawing.Point(533, 446);
+			this.cancel.Name = "cancel";
+			this.cancel.Size = new System.Drawing.Size(112, 25);
+			this.cancel.TabIndex = 2;
+			this.cancel.Text = "Cancel";
+			this.cancel.UseVisualStyleBackColor = true;
+			this.cancel.Click += new System.EventHandler(this.cancel_Click);
+			// 
+			// apply
+			// 
+			this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.apply.Location = new System.Drawing.Point(415, 446);
+			this.apply.Name = "apply";
+			this.apply.Size = new System.Drawing.Size(112, 25);
+			this.apply.TabIndex = 1;
+			this.apply.Text = "OK";
+			this.apply.UseVisualStyleBackColor = true;
+			this.apply.Click += new System.EventHandler(this.apply_Click);
+			// 
+			// hint
+			// 
+			this.hint.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.hint.Image = global::CodeImp.DoomBuilder.Properties.Resources.Lightbulb;
+			this.hint.Location = new System.Drawing.Point(10, 450);
+			this.hint.Name = "hint";
+			this.hint.Size = new System.Drawing.Size(16, 16);
+			this.hint.TabIndex = 3;
+			this.hint.TabStop = false;
+			// 
+			// hintlabel
+			// 
+			this.hintlabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.hintlabel.AutoSize = true;
+			this.hintlabel.Location = new System.Drawing.Point(24, 451);
+			this.hintlabel.Name = "hintlabel";
+			this.hintlabel.Size = new System.Drawing.Size(365, 13);
+			this.hintlabel.TabIndex = 4;
+			this.hintlabel.Text = "Select categories or several thing types to randomly assign them to selection";
+			// 
+			// tooltip
+			// 
+			this.tooltip.AutomaticDelay = 10;
+			this.tooltip.AutoPopDelay = 10000;
+			this.tooltip.InitialDelay = 10;
+			this.tooltip.ReshowDelay = 100;
+			// 
+			// ThingEditFormUDMF
+			// 
+			this.AcceptButton = this.apply;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.CancelButton = this.cancel;
+			this.ClientSize = new System.Drawing.Size(655, 478);
+			this.Controls.Add(this.hint);
+			this.Controls.Add(this.cancel);
+			this.Controls.Add(this.apply);
+			this.Controls.Add(this.hintlabel);
+			this.Controls.Add(this.tabs);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "ThingEditFormUDMF";
+			this.Opacity = 1;
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Edit Thing";
+			this.Shown += new System.EventHandler(this.ThingEditFormUDMF_Shown);
+			this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.ThingEditForm_FormClosing);
+			this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.ThingEditForm_HelpRequested);
+			this.groupBox1.ResumeLayout(false);
+			this.groupBox2.ResumeLayout(false);
+			this.groupBox2.PerformLayout();
+			this.tabs.ResumeLayout(false);
+			this.tabproperties.ResumeLayout(false);
+			this.settingsgroup.ResumeLayout(false);
+			((System.ComponentModel.ISupportInitialize)(this.missingflags)).EndInit();
+			this.grouproll.ResumeLayout(false);
+			this.grouppitch.ResumeLayout(false);
+			this.groupangle.ResumeLayout(false);
+			this.groupBox4.ResumeLayout(false);
+			this.groupBox4.PerformLayout();
+			this.tabeffects.ResumeLayout(false);
+			this.groupbehaviour.ResumeLayout(false);
+			this.groupbehaviour.PerformLayout();
+			this.grouprendering.ResumeLayout(false);
+			this.grouprendering.PerformLayout();
+			this.actiongroup.ResumeLayout(false);
+			this.actiongroup.PerformLayout();
+			this.grouptag.ResumeLayout(false);
+			this.tabcomment.ResumeLayout(false);
+			this.tabcustom.ResumeLayout(false);
+			((System.ComponentModel.ISupportInitialize)(this.hint)).EndInit();
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.TabControl tabs;
+		private System.Windows.Forms.TabPage tabproperties;
+		private System.Windows.Forms.TabPage tabeffects;
+		private System.Windows.Forms.Button cancel;
+		private System.Windows.Forms.Button apply;
+        private System.Windows.Forms.TabPage tabcustom;
+		private System.Windows.Forms.GroupBox grouptag;
+		private System.Windows.Forms.GroupBox actiongroup;
+		private CodeImp.DoomBuilder.Controls.ActionSelectorControl action;
+		private System.Windows.Forms.Button browseaction;
+		private CodeImp.DoomBuilder.Controls.FieldsEditorControl fieldslist;
+		private CodeImp.DoomBuilder.Controls.ThingBrowserControl thingtype;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox angle;
+		private System.Windows.Forms.Label labelAngle;
+		private CodeImp.DoomBuilder.GZBuilder.Controls.TagSelector tagSelector;
+		private System.Windows.Forms.Label labelGravity;
+		private CodeImp.DoomBuilder.GZBuilder.Controls.AngleControl anglecontrol;
+		private System.Windows.Forms.PictureBox hint;
+		private System.Windows.Forms.Label hintlabel;
+        private System.Windows.Forms.GroupBox groupBox1;
+        private System.Windows.Forms.GroupBox groupBox2;
+        private System.Windows.Forms.Label label7;
+        private System.Windows.Forms.GroupBox groupBox4;
+        private System.Windows.Forms.CheckBox cbAbsoluteHeight;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.Label label5;
+        private Controls.ButtonsNumericTextbox posX;
+        private Controls.ButtonsNumericTextbox posY;
+        private Controls.ButtonsNumericTextbox posZ;
+        private System.Windows.Forms.Label zlabel;
+        private Controls.ButtonsNumericTextbox gravity;
+        private Controls.ButtonsNumericTextbox roll;
+        private System.Windows.Forms.Label labelroll;
+        private Controls.ButtonsNumericTextbox pitch;
+        private System.Windows.Forms.Label labelpitch;
+        private System.Windows.Forms.GroupBox grouprendering;
+        private Controls.ButtonsNumericTextbox alpha;
+        private System.Windows.Forms.Label label8;
+        private System.Windows.Forms.ComboBox renderStyle;
+        private System.Windows.Forms.Label labelrenderstyle;
+        private System.Windows.Forms.GroupBox groupbehaviour;
+        private Controls.ButtonsNumericTextbox health;
+        private System.Windows.Forms.Label label10;
+        private Controls.ButtonsNumericTextbox score;
+        private System.Windows.Forms.Label label9;
+		private GZBuilder.Controls.ColorFieldsControl color;
+        private System.Windows.Forms.GroupBox settingsgroup;
+        private Controls.CheckboxArrayControl flags;
+        private Controls.ButtonsNumericTextbox conversationID;
+        private System.Windows.Forms.Label labelID;
+        private System.Windows.Forms.GroupBox grouproll;
+        private GZBuilder.Controls.AngleControl rollControl;
+        private System.Windows.Forms.GroupBox grouppitch;
+        private GZBuilder.Controls.AngleControl pitchControl;
+        private System.Windows.Forms.GroupBox groupangle;
+        private GZBuilder.Controls.PairedFloatControl scale;
+		private System.Windows.Forms.PictureBox missingflags;
+		private System.Windows.Forms.ToolTip tooltip;
+		private CodeImp.DoomBuilder.Controls.ActionSpecialHelpButton actionhelp;
+		private System.Windows.Forms.Label labelScale;
+		private System.Windows.Forms.CheckBox cbrandomangle;
+		private System.Windows.Forms.CheckBox cbrandomroll;
+		private System.Windows.Forms.CheckBox cbrandompitch;
+		private System.Windows.Forms.TabPage tabcomment;
+		private CodeImp.DoomBuilder.Controls.CommentEditor commenteditor;
+		private CodeImp.DoomBuilder.Controls.ArgumentsControl argscontrol;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox floatbobphase;
+		private System.Windows.Forms.Label label1;
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/ThingEditFormUDMF.cs b/Source/Core/Windows/ThingEditFormUDMF.cs
new file mode 100644
index 0000000..0870ba8
--- /dev/null
+++ b/Source/Core/Windows/ThingEditFormUDMF.cs
@@ -0,0 +1,873 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Types;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Windows
+{
+	/// <summary>
+	/// Dialog window that allows viewing and editing of Thing properties.
+	/// </summary>
+	internal partial class ThingEditFormUDMF : DelayedForm
+	{
+		#region ================== Events
+
+		public event EventHandler OnValuesChanged; //mxd
+
+		#endregion
+
+		#region ================== Variables
+
+		private ICollection<Thing> things;
+		private ThingTypeInfo thinginfo;
+		private bool preventchanges;
+		private bool preventmapchange; //mxd
+		private bool undocreated; //mxd
+		private static bool useabsoluteheight; //mxd
+		private List<ThingProperties> thingprops; //mxd
+		private readonly string[] renderstyles; //mxd
+
+		//mxd. Window setup stuff
+		private static Point location = Point.Empty;
+		private static int activetab;
+
+		//mxd. Persistent settings
+		private static bool linkscale;
+
+		private struct ThingProperties //mxd
+		{
+			//public readonly int Type;
+			public readonly int AngleDoom;
+			public readonly int Pitch;
+			public readonly int Roll;
+			public readonly float ScaleX;
+			public readonly float ScaleY;
+			public readonly float Alpha;
+			public readonly float X;
+			public readonly float Y;
+			public readonly float Z;
+			public readonly Dictionary<string, bool> Flags;
+
+			public ThingProperties(Thing t) 
+			{
+				X = t.Position.x;
+				Y = t.Position.y;
+				Z = t.Position.z;
+				//Type = t.Type;
+				AngleDoom = t.AngleDoom;
+				Pitch = t.Pitch;
+				Roll = t.Roll;
+				ScaleX = t.ScaleX;
+				ScaleY = t.ScaleY;
+				Alpha = UniFields.GetFloat(t.Fields, "alpha", 1.0f);
+				Flags = t.GetFlags();
+			}
+		}
+
+		#endregion
+
+		#region ================== Constructor
+
+		// Constructor
+		public ThingEditFormUDMF() 
+		{
+			// Initialize
+			InitializeComponent();
+
+			//mxd. Widow setup
+			if(location != Point.Empty) 
+			{
+				this.StartPosition = FormStartPosition.Manual;
+				this.Location = location;
+				if(General.Settings.StoreSelectedEditTab && activetab > 0) tabs.SelectTab(activetab);
+			}
+
+			// Fill flags list
+			foreach(KeyValuePair<string, string> tf in General.Map.Config.ThingFlags)
+				flags.Add(tf.Value, tf.Key);
+			flags.Enabled = (General.Map.Config.ThingFlags.Count > 0);
+
+			// Fill actions list
+			action.GeneralizedCategories = General.Map.Config.GenActionCategories;
+			action.AddInfo(General.Map.Config.SortedLinedefActions.ToArray());
+
+			// Setup renderstyles
+			renderstyles = new string[General.Map.Config.ThingRenderStyles.Count];
+			General.Map.Config.ThingRenderStyles.Keys.CopyTo(renderstyles, 0);
+
+			// Fill renderstyles
+			foreach(KeyValuePair<string, string> lf in General.Map.Config.ThingRenderStyles)
+				renderStyle.Items.Add(lf.Value);
+			renderStyle.Enabled = (General.Map.Config.ThingRenderStyles.Count > 0);
+			labelrenderstyle.Enabled = (General.Map.Config.ThingRenderStyles.Count > 0);
+
+			// Initialize custom fields editor
+			fieldslist.Setup("thing");
+
+			// Fill universal fields list
+			fieldslist.ListFixedFields(General.Map.Config.ThingFields);
+
+			// Thing height?
+			posZ.Visible = General.Map.FormatInterface.HasThingHeight;
+			zlabel.Visible = General.Map.FormatInterface.HasThingHeight;
+			cbAbsoluteHeight.Visible = General.Map.FormatInterface.HasThingHeight; //mxd
+
+			//mxd. Decimals allowed?
+			if(General.Map.FormatInterface.VertexDecimals > 0) 
+			{
+				posX.AllowDecimal = true;
+				posY.AllowDecimal = true;
+				posZ.AllowDecimal = true;
+			}
+
+			// Value linking
+			scale.LinkValues = linkscale;
+
+			// Setup types list
+			thingtype.Setup();
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This sets up the form to edit the given things
+		public void Setup(ICollection<Thing> things) 
+		{
+			preventchanges = true;
+
+			// Keep this list
+			this.things = things;
+			if(things.Count > 1) this.Text = "Edit Things (" + things.Count + ")";
+			hint.Visible = things.Count > 1; //mxd
+			hintlabel.Visible = things.Count > 1; //mxd
+			thingtype.UseMultiSelection = things.Count > 1; //mxd
+
+			////////////////////////////////////////////////////////////////////////
+			// Set all options to the first thing properties
+			////////////////////////////////////////////////////////////////////////
+
+			Thing ft = General.GetByIndex(things, 0);
+
+			// Set type
+			thingtype.SelectType(ft.Type);
+
+			// Flags
+			foreach(CheckBox c in flags.Checkboxes) 
+			{
+				if(ft.Flags.ContainsKey(c.Tag.ToString())) c.Checked = ft.Flags[c.Tag.ToString()];
+			}
+
+			// Coordination
+			angle.Text = ft.AngleDoom.ToString();
+			cbAbsoluteHeight.Checked = useabsoluteheight; //mxd
+
+			//mxd
+			ft.DetermineSector();
+			float floorheight = (ft.Sector != null ? Sector.GetFloorPlane(ft.Sector).GetZ(ft.Position) : 0);
+			posX.Text = (ft.Position.x).ToString();
+			posY.Text = (ft.Position.y).ToString();
+			posZ.Text = (useabsoluteheight ? ((float)Math.Round(ft.Position.z + floorheight, General.Map.FormatInterface.VertexDecimals)).ToString() : (ft.Position.z).ToString());
+			posX.ButtonStep = General.Map.Grid.GridSize;
+			posY.ButtonStep = General.Map.Grid.GridSize;
+			posZ.ButtonStep = General.Map.Grid.GridSize;
+
+			// Custom fields
+			fieldslist.SetValues(ft.Fields, true);
+			commenteditor.SetValues(ft.Fields, true);
+			conversationID.Text = ft.Fields.GetValue("conversation", 0).ToString();
+			floatbobphase.Text = ft.Fields.GetValue("floatbobphase", -1).ToString();
+			gravity.Text = ft.Fields.GetValue("gravity", 1.0f).ToString();
+			score.Text = ft.Fields.GetValue("score", 0).ToString();
+			health.Text = ft.Fields.GetValue("health", 1).ToString();
+			alpha.Text = ft.Fields.GetValue("alpha", 1.0f).ToString();
+			color.SetValueFrom(ft.Fields);
+			scale.SetValues(ft.ScaleX, ft.ScaleY, true);
+			pitch.Text = ft.Pitch.ToString();
+			roll.Text = ft.Roll.ToString();
+			renderStyle.SelectedIndex = Array.IndexOf(renderstyles, ft.Fields.GetValue("renderstyle", "normal"));
+
+			// Action/tags
+			action.Value = ft.Action;
+			tagSelector.Setup(UniversalType.ThingTag);
+			tagSelector.SetTag(ft.Tag);
+
+			//mxd. Args
+			argscontrol.SetValue(ft, true);
+
+			////////////////////////////////////////////////////////////////////////
+			// Now go for all lines and change the options when a setting is different
+			////////////////////////////////////////////////////////////////////////
+
+			thingprops = new List<ThingProperties>();
+
+			// Go for all things
+			foreach(Thing t in things) 
+			{
+				//mxd. Update sector info
+				t.DetermineSector();
+
+				// Type does not match?
+				ThingTypeInfo info = thingtype.GetSelectedInfo(); //mxd
+				if(info != null && info.Index != t.Type) thingtype.ClearSelectedType();
+
+				// Flags
+				foreach(CheckBox c in flags.Checkboxes) 
+				{
+					if(c.CheckState == CheckState.Indeterminate) continue; //mxd
+					if(t.IsFlagSet(c.Tag.ToString()) != c.Checked) 
+					{
+						c.ThreeState = true;
+						c.CheckState = CheckState.Indeterminate;
+					}
+				}
+
+				// Coordination
+				if(t.AngleDoom.ToString() != angle.Text) angle.Text = "";
+
+				//mxd. Position
+				if((t.Position.x).ToString() != posX.Text) posX.Text = "";
+				if((t.Position.y).ToString() != posY.Text) posY.Text = "";
+				if(useabsoluteheight && t.Sector != null) 
+				{
+					if(((float)Math.Round(Sector.GetFloorPlane(t.Sector).GetZ(t.Position) + t.Position.z, General.Map.FormatInterface.VertexDecimals)).ToString() != posZ.Text)
+						posZ.Text = "";
+				} 
+				else if((t.Position.z).ToString() != posZ.Text) 
+				{
+					posZ.Text = "";
+				}
+
+				// Action/tags
+				if(t.Action != action.Value) action.Empty = true;
+				if(t.Tag != ft.Tag) tagSelector.ClearTag(); //mxd
+
+				//mxd. Arguments
+				argscontrol.SetValue(t, false);
+
+				//mxd. Custom fields
+				fieldslist.SetValues(t.Fields, false);
+				commenteditor.SetValues(t.Fields, false); //mxd. Comments
+				if(t.Fields.GetValue("conversation", 0).ToString() != conversationID.Text) conversationID.Text = "";
+				if(t.Fields.GetValue("floatbobphase", -1).ToString() != floatbobphase.Text) floatbobphase.Text = "";
+				if(t.Fields.GetValue("gravity", 1.0f).ToString() != gravity.Text) gravity.Text = "";
+				if(t.Fields.GetValue("score", 0).ToString() != score.Text) score.Text = "";
+				if(t.Fields.GetValue("health", 1).ToString() != health.Text) health.Text = "";
+				if(t.Fields.GetValue("alpha", 1.0f).ToString() != alpha.Text) alpha.Text = "";
+
+				scale.SetValues(t.ScaleX, t.ScaleY, false);
+				color.SetValueFrom(t.Fields);
+
+				if(t.Pitch.ToString() != pitch.Text) pitch.Text = "";
+				if(t.Roll.ToString() != roll.Text) roll.Text = "";
+
+				//Render style
+				if(renderStyle.SelectedIndex > -1 && renderStyle.SelectedIndex != Array.IndexOf(renderstyles, t.Fields.GetValue("renderstyle", "normal")))
+					renderStyle.SelectedIndex = -1;
+
+				//mxd. Store initial properties
+				thingprops.Add(new ThingProperties(t));
+
+				//mxd. add user vars
+				/*if(info != null && info.Actor != null && info.Actor.UserVars.Count > 0) 
+				 {
+					foreach(string s in info.Actor.UserVars) 
+					{
+						if(!t.Fields.ContainsKey(s))
+							fieldslist.SetValue(s, 0, CodeImp.DoomBuilder.Types.UniversalType.Integer);
+					}
+				}*/
+			}
+
+			preventchanges = false;
+
+			//mxd. Trigger updates manually...
+			preventmapchange = true;
+			angle_WhenTextChanged(angle, EventArgs.Empty);
+			pitch_WhenTextChanged(pitch, EventArgs.Empty);
+			roll_WhenTextChanged(roll, EventArgs.Empty);
+			flags_OnValueChanged(flags, EventArgs.Empty);
+			preventmapchange = false;
+
+			argscontrol.UpdateScriptControls(); //mxd
+			actionhelp.UpdateAction(action.GetValue()); //mxd
+			labelScale.Enabled = scale.NonDefaultValue; //mxd
+			commenteditor.FinishSetup(); //mxd
+		}
+
+		//mxd
+		private void MakeUndo() 
+		{
+			if(undocreated) return;
+			undocreated = true;
+
+			//mxd. Make undo
+			General.Map.UndoRedo.CreateUndo("Edit " + (things.Count > 1 ? things.Count + " things" : "thing"));
+			foreach(Thing t in things) t.Fields.BeforeFieldsChange();
+		}
+
+		#endregion
+
+		#region ================== Events
+
+		//mxd
+		private void thingtype_OnTypeDoubleClicked() 
+		{
+			apply_Click(this, EventArgs.Empty);
+		}
+
+		// Action changes
+		private void action_ValueChanges(object sender, EventArgs e) 
+		{
+			int showaction = 0;
+
+			// Only when line type is known, otherwise use the thing arguments
+			if(General.Map.Config.LinedefActions.ContainsKey(action.Value)) showaction = action.Value;
+
+			//mxd. Change the argument descriptions
+			argscontrol.UpdateAction(showaction, preventchanges, (action.Empty ? null : thinginfo));
+
+			if(!preventchanges) 
+			{
+				MakeUndo(); //mxd
+
+				//mxd. Update what must be updated
+				argscontrol.UpdateScriptControls();
+				actionhelp.UpdateAction(showaction);
+			}
+		}
+
+		// Browse Action clicked
+		private void browseaction_Click(object sender, EventArgs e) 
+		{
+			action.Value = ActionBrowserForm.BrowseAction(this, action.Value);
+		}
+
+		// Angle text changes
+		private void angle_WhenTextChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			preventchanges = true;
+			anglecontrol.Angle = angle.GetResult(GZBuilder.Controls.AngleControl.NO_ANGLE);
+			preventchanges = false;
+			if(!preventmapchange) ApplyAngleChange(); //mxd
+		}
+
+		//mxd. Angle control clicked
+		private void anglecontrol_AngleChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			angle.Text = anglecontrol.Angle.ToString();
+			if(!preventmapchange) ApplyAngleChange();
+		}
+
+		private void pitch_WhenTextChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			int p = pitch.GetResult(GZBuilder.Controls.AngleControl.NO_ANGLE);
+			preventchanges = true;
+			pitchControl.Angle = (p == GZBuilder.Controls.AngleControl.NO_ANGLE ? p : p + 90);
+			preventchanges = false;
+			if(!preventmapchange) ApplyPitchChange();
+		}
+
+		private void pitchControl_AngleChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			pitch.Text = (General.ClampAngle(pitchControl.Angle - 90)).ToString();
+			if(!preventmapchange) ApplyPitchChange();
+		}
+
+		private void roll_WhenTextChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			int r = roll.GetResult(GZBuilder.Controls.AngleControl.NO_ANGLE);
+			preventchanges = true;
+			rollControl.Angle = (r == GZBuilder.Controls.AngleControl.NO_ANGLE ? r : r + 90);
+			preventchanges = false;
+			if(!preventmapchange) ApplyRollChange();
+		}
+
+		private void rollControl_AngleChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			roll.Text = (General.ClampAngle(rollControl.Angle - 90)).ToString();
+			if(!preventmapchange) ApplyRollChange();
+		}
+
+		// Apply clicked
+		private void apply_Click(object sender, EventArgs e) 
+		{
+			//mxd. Make Undo
+			MakeUndo();
+			
+			List<string> defaultflags = new List<string>();
+
+			// Verify the tag
+			if(General.Map.FormatInterface.HasThingTag) //mxd
+			{
+				tagSelector.ValidateTag();//mxd
+				if(((tagSelector.GetTag(0) < General.Map.FormatInterface.MinTag) || (tagSelector.GetTag(0) > General.Map.FormatInterface.MaxTag))) 
+				{
+					General.ShowWarningMessage("Thing tag must be between " + General.Map.FormatInterface.MinTag + " and " + General.Map.FormatInterface.MaxTag + ".", MessageBoxButtons.OK);
+					return;
+				}
+			}
+
+			// Verify the type
+			if(((thingtype.GetResult(0) < General.Map.FormatInterface.MinThingType) || (thingtype.GetResult(0) > General.Map.FormatInterface.MaxThingType))) 
+			{
+				General.ShowWarningMessage("Thing type must be between " + General.Map.FormatInterface.MinThingType + " and " + General.Map.FormatInterface.MaxThingType + ".", MessageBoxButtons.OK);
+				return;
+			}
+
+			// Verify the action
+			if(General.Map.FormatInterface.HasThingAction && ((action.Value < General.Map.FormatInterface.MinAction) || (action.Value > General.Map.FormatInterface.MaxAction))) 
+			{
+				General.ShowWarningMessage("Thing action must be between " + General.Map.FormatInterface.MinAction + " and " + General.Map.FormatInterface.MaxAction + ".", MessageBoxButtons.OK);
+				return;
+			}
+
+			// Go for all the things
+			int tagoffset = 0; //mxd
+			foreach(Thing t in things) 
+			{
+				// Coordination
+				//mxd. Randomize rotations?
+				if(cbrandomangle.Checked) t.Rotate(General.Random(0, 359));
+				if(cbrandompitch.Checked) t.SetPitch(General.Random(0, 359));
+				if(cbrandomroll.Checked) t.SetRoll(General.Random(0, 359));
+
+				//mxd. Check position
+				float px = General.Clamp(t.Position.x, General.Map.Config.LeftBoundary, General.Map.Config.RightBoundary);
+				float py = General.Clamp(t.Position.y, General.Map.Config.BottomBoundary, General.Map.Config.TopBoundary);
+				if(t.Position.x != px || t.Position.y != py) t.Move(new Vector2D(px, py));
+
+				// Action/tags
+				t.Tag = General.Clamp(tagSelector.GetSmartTag(t.Tag, tagoffset++), General.Map.FormatInterface.MinTag, General.Map.FormatInterface.MaxTag); //mxd
+				if(!action.Empty) t.Action = action.Value;
+
+				//mxd. Apply args
+				argscontrol.Apply(t);
+
+				//mxd. Custom fields
+				fieldslist.Apply(t.Fields);
+				if(!string.IsNullOrEmpty(conversationID.Text))
+					UniFields.SetInteger(t.Fields, "conversation", conversationID.GetResult(t.Fields.GetValue("conversation", 0)), 0);
+				if(!string.IsNullOrEmpty(floatbobphase.Text))
+					UniFields.SetInteger(t.Fields, "floatbobphase", General.Clamp(floatbobphase.GetResult(t.Fields.GetValue("floatbobphase", -1)), -1, 63), -1);
+				if(!string.IsNullOrEmpty(gravity.Text))
+					UniFields.SetFloat(t.Fields, "gravity", gravity.GetResultFloat(t.Fields.GetValue("gravity", 1.0f)), 1.0f);
+				if(!string.IsNullOrEmpty(health.Text))
+					UniFields.SetInteger(t.Fields, "health", health.GetResult(t.Fields.GetValue("health", 1)), 1);
+				if(!string.IsNullOrEmpty(score.Text))
+					UniFields.SetInteger(t.Fields, "score", score.GetResult(t.Fields.GetValue("score", 0)), 0);
+
+				color.ApplyTo(t.Fields, t.Fields.GetValue("fillcolor", 0));
+
+				//mxd. Comments
+				commenteditor.Apply(t.Fields);
+
+				// Update settings
+				t.UpdateConfiguration();
+			}
+
+			// Set as defaults
+			foreach(CheckBox c in flags.Checkboxes) 
+			{
+				if(c.CheckState == CheckState.Checked) defaultflags.Add(c.Tag.ToString());
+			}
+			General.Settings.DefaultThingType = thingtype.GetResult(General.Settings.DefaultThingType);
+			General.Settings.DefaultThingAngle = Angle2D.DegToRad((float)angle.GetResult((int)Angle2D.RadToDeg(General.Settings.DefaultThingAngle) - 90) + 90);
+			General.Settings.SetDefaultThingFlags(defaultflags);
+
+			// Store value linking
+			linkscale = scale.LinkValues;
+
+			// Done
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty); //mxd
+			this.DialogResult = DialogResult.OK;
+			this.Close();
+		}
+
+		// Cancel clicked
+		private void cancel_Click(object sender, EventArgs e) 
+		{
+			//mxd. Perform undo?
+			if(undocreated) General.Map.UndoRedo.WithdrawUndo();
+
+			// Be gone
+			this.DialogResult = DialogResult.Cancel;
+			this.Close();
+		}
+
+		//mxd
+		private void cbAbsoluteHeight_CheckedChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo();
+
+			useabsoluteheight = cbAbsoluteHeight.Checked;
+
+			preventchanges = true;
+
+			//update label text
+			Thing ft = General.GetByIndex(things, 0);
+			float z = ft.Position.z;
+			if(useabsoluteheight && ft.Sector != null) z += Sector.GetFloorPlane(ft.Sector).GetZ(ft.Position);
+			posZ.Text = ((float)Math.Round(z, General.Map.FormatInterface.VertexDecimals)).ToString();
+
+			foreach(Thing t in things) 
+			{
+				z = t.Position.z;
+				if(useabsoluteheight && t.Sector != null) z += Sector.GetFloorPlane(t.Sector).GetZ(t.Position);
+				string ztext = ((float)Math.Round(z, General.Map.FormatInterface.VertexDecimals)).ToString();
+				if(posZ.Text != ztext) 
+				{
+					posZ.Text = "";
+					break;
+				}
+			}
+
+			preventchanges = false;
+		}
+
+		//mxd
+		private void tabcustom_MouseEnter(object sender, EventArgs e) 
+		{
+			fieldslist.Focus();
+		}
+
+		//mxd
+		private void ThingEditFormUDMF_Shown(object sender, EventArgs e)
+		{
+			if(activetab == 0)
+			{
+				thingtype.Focus();
+				thingtype.FocusTextbox();
+			}
+		}
+
+		//mxd
+		private void ThingEditForm_FormClosing(object sender, FormClosingEventArgs e) 
+		{
+			location = this.Location;
+			activetab = tabs.SelectedIndex;
+		}
+
+		// Help
+		private void ThingEditForm_HelpRequested(object sender, HelpEventArgs hlpevent) 
+		{
+			General.ShowHelp("w_thingedit.html");
+			hlpevent.Handled = true;
+		}
+
+		#endregion
+
+		#region ================== mxd. Realtime events
+
+		private void posX_WhenTextChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+			int i = 0;
+
+			// Update values
+			foreach(Thing t in things)
+				t.Move(new Vector2D(posX.GetResultFloat(thingprops[i++].X), t.Position.y));
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void posY_WhenTextChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+			int i = 0;
+
+			// Update values
+			foreach(Thing t in things)
+				t.Move(new Vector2D(t.Position.x, posY.GetResultFloat(thingprops[i++].Y)));
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void posZ_WhenTextChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+			int i = 0;
+
+			if(string.IsNullOrEmpty(posZ.Text)) 
+			{
+				// Restore values
+				foreach(Thing t in things)
+					t.Move(new Vector3D(t.Position.x, t.Position.y, thingprops[i++].Z));
+			} 
+			else 
+			{
+				// Update values
+				foreach(Thing t in things) 
+				{
+					float z = posZ.GetResultFloat(thingprops[i++].Z);
+					if(useabsoluteheight && !posZ.CheckIsRelative() && t.Sector != null)
+						z -= (float)Math.Round(Sector.GetFloorPlane(t.Sector).GetZ(t.Position.x, t.Position.y), General.Map.FormatInterface.VertexDecimals);
+					t.Move(new Vector3D(t.Position.x, t.Position.y, z));
+				}
+			}
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void scale_OnValuesChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+			int i = 0;
+
+			foreach(Thing t in things)
+			{
+				float sx = scale.GetValue1(thingprops[i].ScaleX);
+				float sy = scale.GetValue2(thingprops[i].ScaleY);
+				t.SetScale((sx == 0 ? 1.0f : sx), (sy == 0 ? 1.0f : sy));
+				i++;
+			}
+
+			General.Map.IsChanged = true;
+			labelScale.Enabled = scale.NonDefaultValue;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		// Selected type changes
+		private void thingtype_OnTypeChanged(ThingTypeInfo value) 
+		{
+			thinginfo = value;
+
+			// Update arguments
+			action_ValueChanges(this, EventArgs.Empty);
+
+			//mxd. Update things
+			if(preventchanges 
+					|| (thingtype.GetResult(0) < General.Map.FormatInterface.MinThingType) 
+					|| (thingtype.GetResult(0) > General.Map.FormatInterface.MaxThingType))
+				return;
+
+			MakeUndo(); //mxd
+
+			foreach(Thing t in things) 
+			{
+				//Set type
+				t.Type = thingtype.GetResult(t.Type);
+
+				// Update settings
+				t.UpdateConfiguration();
+			}
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		//mxd
+		private void ApplyAngleChange() 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+			int i = 0;
+
+			//restore values
+			if(string.IsNullOrEmpty(angle.Text)) 
+			{
+				foreach(Thing t in things) t.Rotate(thingprops[i++].AngleDoom);
+			} 
+			else //update values
+			{
+				foreach(Thing t in things)
+					t.Rotate(angle.GetResult(thingprops[i++].AngleDoom));
+			}
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void ApplyPitchChange() 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+			int i = 0;
+
+			//restore values
+			if(string.IsNullOrEmpty(pitch.Text)) 
+			{
+				foreach(Thing t in things) t.SetPitch(thingprops[i++].Pitch);
+			} 
+			else //update values
+			{ 
+				foreach(Thing t in things)
+					t.SetPitch(pitch.GetResult(thingprops[i++].Pitch));
+			}
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		//mxd
+		private void ApplyRollChange() 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+			int i = 0;
+
+			//restore values
+			if(string.IsNullOrEmpty(roll.Text)) 
+			{
+				foreach(Thing t in things) t.SetRoll(thingprops[i++].Roll);
+			} 
+			else //update values
+			{ 
+				foreach(Thing t in things)
+					t.SetRoll(roll.GetResult(thingprops[i++].Roll));
+			}
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void flags_OnValueChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+			int i = 0;
+
+			// Apply flags
+			foreach(Thing t in things)
+			{
+				// Apply all flags
+				foreach(CheckBox c in flags.Checkboxes)
+				{
+					if(c.CheckState == CheckState.Checked)
+						t.SetFlag(c.Tag.ToString(), true);
+					else if(c.CheckState == CheckState.Unchecked)
+						t.SetFlag(c.Tag.ToString(), false);
+					else if(thingprops[i].Flags.ContainsKey(c.Tag.ToString()))
+						t.SetFlag(c.Tag.ToString(), thingprops[i].Flags[c.Tag.ToString()]);
+					else //things created in the editor have empty Flags by default
+						t.SetFlag(c.Tag.ToString(), false);
+				}
+
+				i++;
+			}
+
+			// Dispatch event
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+
+			// Gather enabled flags
+			HashSet<string> activeflags = new HashSet<string>();
+			foreach(CheckBox cb in flags.Checkboxes)
+			{
+				if(cb.CheckState != CheckState.Unchecked) activeflags.Add(cb.Tag.ToString());
+			}
+
+			// Check em
+			List<string> warnings = ThingFlagsCompare.CheckFlags(activeflags);
+			if(warnings.Count > 0) 
+			{
+				// Got missing flags
+				tooltip.SetToolTip(missingflags, string.Join(Environment.NewLine, warnings.ToArray()));
+				missingflags.Visible = true;
+				settingsgroup.ForeColor = Color.DarkRed;
+				return;
+			}
+
+			// Everything is OK
+			missingflags.Visible = false;
+			settingsgroup.ForeColor = SystemColors.ControlText;
+		}
+
+		private void cbrandomangle_CheckedChanged(object sender, EventArgs e)
+		{
+			angle.Enabled = !cbrandomangle.Checked;
+			groupangle.Enabled = !cbrandomangle.Checked;
+		}
+
+		private void cbrandompitch_CheckedChanged(object sender, EventArgs e)
+		{
+			pitch.Enabled = !cbrandompitch.Checked;
+			grouppitch.Enabled = !cbrandompitch.Checked;
+		}
+
+		private void cbrandomroll_CheckedChanged(object sender, EventArgs e)
+		{
+			roll.Enabled = !cbrandomroll.Checked;
+			grouproll.Enabled = !cbrandomroll.Checked;
+		}
+
+		private void renderStyle_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+
+			//update values
+			foreach(Thing t in things)
+				UniFields.SetString(t.Fields, "renderstyle", renderstyles[renderStyle.SelectedIndex], "normal");
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void alpha_WhenTextChanged(object sender, EventArgs e)
+		{
+			if(preventchanges) return;
+			MakeUndo(); //mxd
+			int i = 0;
+
+			//restore values
+			if(string.IsNullOrEmpty(alpha.Text))
+			{
+				foreach(Thing t in things) UniFields.SetFloat(t.Fields, "alpha", thingprops[i++].Alpha, 1.0f);
+			}
+			else //update values
+			{
+				foreach(Thing t in things)
+				{
+					float value = General.Clamp(alpha.GetResultFloat(t.Fields.GetValue("alpha", 1.0f)), 0f, 1.0f);
+					UniFields.SetFloat(t.Fields, "alpha", value, 1.0f);
+				}
+			}
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		#endregion
+
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/ThingEditFormUDMF.resx b/Source/Core/Windows/ThingEditFormUDMF.resx
new file mode 100644
index 0000000..d6b8d96
--- /dev/null
+++ b/Source/Core/Windows/ThingEditFormUDMF.resx
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Windows/ThingsFiltersForm.Designer.cs b/Source/Core/Windows/ThingsFiltersForm.Designer.cs
new file mode 100644
index 0000000..4f70253
--- /dev/null
+++ b/Source/Core/Windows/ThingsFiltersForm.Designer.cs
@@ -0,0 +1,772 @@
+namespace CodeImp.DoomBuilder.Windows
+{
+	partial class ThingsFiltersForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.components = new System.ComponentModel.Container();
+			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ThingsFiltersForm));
+			this.listfilters = new System.Windows.Forms.ListView();
+			this.columnname = new System.Windows.Forms.ColumnHeader();
+			this.imagelist = new System.Windows.Forms.ImageList(this.components);
+			this.addfilter = new System.Windows.Forms.Button();
+			this.deletefilter = new System.Windows.Forms.Button();
+			this.filtergroup = new System.Windows.Forms.GroupBox();
+			this.filtermode = new System.Windows.Forms.ComboBox();
+			this.label9 = new System.Windows.Forms.Label();
+			this.invert = new System.Windows.Forms.CheckBox();
+			this.tabs = new System.Windows.Forms.TabControl();
+			this.tabbasic = new System.Windows.Forms.TabPage();
+			this.label6 = new System.Windows.Forms.Label();
+			this.labelzheight = new System.Windows.Forms.Label();
+			this.filterzheight = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.browseangle = new System.Windows.Forms.Button();
+			this.filterangle = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.filtertype = new CodeImp.DoomBuilder.Controls.ActionSelectorControl();
+			this.label5 = new System.Windows.Forms.Label();
+			this.browsetype = new System.Windows.Forms.Button();
+			this.label4 = new System.Windows.Forms.Label();
+			this.filtercategory = new System.Windows.Forms.ComboBox();
+			this.label2 = new System.Windows.Forms.Label();
+			this.tabflags = new System.Windows.Forms.TabPage();
+			this.filterfields = new CodeImp.DoomBuilder.Controls.CheckboxArrayControl();
+			this.label3 = new System.Windows.Forms.Label();
+			this.tabaction = new System.Windows.Forms.TabPage();
+			this.argumentspanel = new System.Windows.Forms.Panel();
+			this.label8 = new System.Windows.Forms.Label();
+			this.arg2 = new CodeImp.DoomBuilder.Controls.ArgumentBox();
+			this.arg1 = new CodeImp.DoomBuilder.Controls.ArgumentBox();
+			this.arg0 = new CodeImp.DoomBuilder.Controls.ArgumentBox();
+			this.arg3 = new CodeImp.DoomBuilder.Controls.ArgumentBox();
+			this.arg4 = new CodeImp.DoomBuilder.Controls.ArgumentBox();
+			this.arg1label = new System.Windows.Forms.Label();
+			this.arg0label = new System.Windows.Forms.Label();
+			this.arg3label = new System.Windows.Forms.Label();
+			this.arg2label = new System.Windows.Forms.Label();
+			this.arg4label = new System.Windows.Forms.Label();
+			this.filteraction = new CodeImp.DoomBuilder.Controls.ActionSelectorControl();
+			this.browseaction = new System.Windows.Forms.Button();
+			this.label7 = new System.Windows.Forms.Label();
+			this.filtertag = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.labeltag = new System.Windows.Forms.Label();
+			this.tabcustom = new System.Windows.Forms.TabPage();
+			this.fieldslist = new CodeImp.DoomBuilder.Controls.FieldsEditorControl();
+			this.filtername = new System.Windows.Forms.TextBox();
+			this.label1 = new System.Windows.Forms.Label();
+			this.cancel = new System.Windows.Forms.Button();
+			this.apply = new System.Windows.Forms.Button();
+			this.filtergroup.SuspendLayout();
+			this.tabs.SuspendLayout();
+			this.tabbasic.SuspendLayout();
+			this.tabflags.SuspendLayout();
+			this.tabaction.SuspendLayout();
+			this.argumentspanel.SuspendLayout();
+			this.tabcustom.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// listfilters
+			// 
+			this.listfilters.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)));
+			this.listfilters.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+            this.columnname});
+			this.listfilters.FullRowSelect = true;
+			this.listfilters.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
+			this.listfilters.HideSelection = false;
+			this.listfilters.Location = new System.Drawing.Point(12, 12);
+			this.listfilters.MultiSelect = false;
+			this.listfilters.Name = "listfilters";
+			this.listfilters.ShowGroups = false;
+			this.listfilters.Size = new System.Drawing.Size(202, 410);
+			this.listfilters.SmallImageList = this.imagelist;
+			this.listfilters.Sorting = System.Windows.Forms.SortOrder.Ascending;
+			this.listfilters.TabIndex = 0;
+			this.listfilters.UseCompatibleStateImageBehavior = false;
+			this.listfilters.View = System.Windows.Forms.View.Details;
+			this.listfilters.SelectedIndexChanged += new System.EventHandler(this.listfilters_SelectedIndexChanged);
+			// 
+			// columnname
+			// 
+			this.columnname.Text = "Configuration";
+			this.columnname.Width = 177;
+			// 
+			// imagelist
+			// 
+			this.imagelist.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imagelist.ImageStream")));
+			this.imagelist.TransparentColor = System.Drawing.Color.Transparent;
+			this.imagelist.Images.SetKeyName(0, "Warning.png");
+			// 
+			// addfilter
+			// 
+			this.addfilter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.addfilter.Location = new System.Drawing.Point(12, 428);
+			this.addfilter.Name = "addfilter";
+			this.addfilter.Size = new System.Drawing.Size(98, 25);
+			this.addfilter.TabIndex = 1;
+			this.addfilter.Text = "New Filter";
+			this.addfilter.UseVisualStyleBackColor = true;
+			this.addfilter.Click += new System.EventHandler(this.addfilter_Click);
+			// 
+			// deletefilter
+			// 
+			this.deletefilter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.deletefilter.Enabled = false;
+			this.deletefilter.Location = new System.Drawing.Point(116, 428);
+			this.deletefilter.Name = "deletefilter";
+			this.deletefilter.Size = new System.Drawing.Size(98, 25);
+			this.deletefilter.TabIndex = 2;
+			this.deletefilter.Text = "Delete Selected";
+			this.deletefilter.UseVisualStyleBackColor = true;
+			this.deletefilter.Click += new System.EventHandler(this.deletefilter_Click);
+			// 
+			// filtergroup
+			// 
+			this.filtergroup.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.filtergroup.Controls.Add(this.filtermode);
+			this.filtergroup.Controls.Add(this.label9);
+			this.filtergroup.Controls.Add(this.invert);
+			this.filtergroup.Controls.Add(this.tabs);
+			this.filtergroup.Controls.Add(this.filtername);
+			this.filtergroup.Controls.Add(this.label1);
+			this.filtergroup.Enabled = false;
+			this.filtergroup.Location = new System.Drawing.Point(220, 6);
+			this.filtergroup.Name = "filtergroup";
+			this.filtergroup.Size = new System.Drawing.Size(465, 417);
+			this.filtergroup.TabIndex = 3;
+			this.filtergroup.TabStop = false;
+			this.filtergroup.Text = " Selected Filter ";
+			// 
+			// filtermode
+			// 
+			this.filtermode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.filtermode.FormattingEnabled = true;
+			this.filtermode.Items.AddRange(new object[] {
+            "Apply always",
+            "Apply in Classic modes only",
+            "Apply in Visual modes only"});
+			this.filtermode.Location = new System.Drawing.Point(92, 50);
+			this.filtermode.Name = "filtermode";
+			this.filtermode.Size = new System.Drawing.Size(232, 21);
+			this.filtermode.TabIndex = 8;
+			this.filtermode.SelectedIndexChanged += new System.EventHandler(this.filtermode_SelectedIndexChanged);
+			// 
+			// label9
+			// 
+			this.label9.AutoSize = true;
+			this.label9.Location = new System.Drawing.Point(49, 53);
+			this.label9.Name = "label9";
+			this.label9.Size = new System.Drawing.Size(37, 13);
+			this.label9.TabIndex = 7;
+			this.label9.Text = "Mode:";
+			// 
+			// invert
+			// 
+			this.invert.AutoSize = true;
+			this.invert.Location = new System.Drawing.Point(352, 26);
+			this.invert.Name = "invert";
+			this.invert.Size = new System.Drawing.Size(75, 17);
+			this.invert.TabIndex = 6;
+			this.invert.Text = "Invert filter";
+			this.invert.UseVisualStyleBackColor = true;
+			this.invert.CheckedChanged += new System.EventHandler(this.invert_CheckedChanged);
+			// 
+			// tabs
+			// 
+			this.tabs.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.tabs.Controls.Add(this.tabbasic);
+			this.tabs.Controls.Add(this.tabflags);
+			this.tabs.Controls.Add(this.tabaction);
+			this.tabs.Controls.Add(this.tabcustom);
+			this.tabs.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.tabs.Location = new System.Drawing.Point(6, 82);
+			this.tabs.Name = "tabs";
+			this.tabs.Padding = new System.Drawing.Point(24, 3);
+			this.tabs.SelectedIndex = 0;
+			this.tabs.Size = new System.Drawing.Size(453, 329);
+			this.tabs.TabIndex = 5;
+			// 
+			// tabbasic
+			// 
+			this.tabbasic.Controls.Add(this.label6);
+			this.tabbasic.Controls.Add(this.labelzheight);
+			this.tabbasic.Controls.Add(this.filterzheight);
+			this.tabbasic.Controls.Add(this.browseangle);
+			this.tabbasic.Controls.Add(this.filterangle);
+			this.tabbasic.Controls.Add(this.filtertype);
+			this.tabbasic.Controls.Add(this.label5);
+			this.tabbasic.Controls.Add(this.browsetype);
+			this.tabbasic.Controls.Add(this.label4);
+			this.tabbasic.Controls.Add(this.filtercategory);
+			this.tabbasic.Controls.Add(this.label2);
+			this.tabbasic.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.tabbasic.Location = new System.Drawing.Point(4, 22);
+			this.tabbasic.Name = "tabbasic";
+			this.tabbasic.Padding = new System.Windows.Forms.Padding(3);
+			this.tabbasic.Size = new System.Drawing.Size(445, 303);
+			this.tabbasic.TabIndex = 0;
+			this.tabbasic.Text = "Properties";
+			this.tabbasic.UseVisualStyleBackColor = true;
+			// 
+			// label6
+			// 
+			this.label6.AutoSize = true;
+			this.label6.Location = new System.Drawing.Point(34, 235);
+			this.label6.Name = "label6";
+			this.label6.Size = new System.Drawing.Size(331, 13);
+			this.label6.TabIndex = 15;
+			this.label6.Text = "Note:  Clear the input fields which you do not want to use in this filter.";
+			// 
+			// labelzheight
+			// 
+			this.labelzheight.AutoSize = true;
+			this.labelzheight.Location = new System.Drawing.Point(19, 167);
+			this.labelzheight.Name = "labelzheight";
+			this.labelzheight.Size = new System.Drawing.Size(88, 13);
+			this.labelzheight.TabIndex = 14;
+			this.labelzheight.Text = "Filter by Z height:";
+			// 
+			// filterzheight
+			// 
+			this.filterzheight.AllowDecimal = false;
+			this.filterzheight.AllowNegative = true;
+			this.filterzheight.AllowRelative = false;
+			this.filterzheight.ButtonStep = 1;
+			this.filterzheight.ButtonStepBig = 10F;
+			this.filterzheight.ButtonStepFloat = 1F;
+			this.filterzheight.ButtonStepSmall = 0.1F;
+			this.filterzheight.ButtonStepsUseModifierKeys = false;
+			this.filterzheight.ButtonStepsWrapAround = false;
+			this.filterzheight.Location = new System.Drawing.Point(111, 162);
+			this.filterzheight.Name = "filterzheight";
+			this.filterzheight.Size = new System.Drawing.Size(72, 24);
+			this.filterzheight.StepValues = null;
+			this.filterzheight.TabIndex = 13;
+			this.filterzheight.WhenTextChanged += new System.EventHandler(this.filterzheight_WhenTextChanged);
+			// 
+			// browseangle
+			// 
+			this.browseangle.Image = global::CodeImp.DoomBuilder.Properties.Resources.Angle;
+			this.browseangle.Location = new System.Drawing.Point(189, 119);
+			this.browseangle.Name = "browseangle";
+			this.browseangle.Size = new System.Drawing.Size(28, 25);
+			this.browseangle.TabIndex = 12;
+			this.browseangle.Text = " ";
+			this.browseangle.UseVisualStyleBackColor = true;
+			this.browseangle.Click += new System.EventHandler(this.browseangle_Click);
+			// 
+			// filterangle
+			// 
+			this.filterangle.AllowDecimal = false;
+			this.filterangle.AllowNegative = true;
+			this.filterangle.AllowRelative = false;
+			this.filterangle.ButtonStep = 45;
+			this.filterangle.ButtonStepBig = 10F;
+			this.filterangle.ButtonStepFloat = 1F;
+			this.filterangle.ButtonStepSmall = 0.1F;
+			this.filterangle.ButtonStepsUseModifierKeys = false;
+			this.filterangle.ButtonStepsWrapAround = false;
+			this.filterangle.Location = new System.Drawing.Point(111, 119);
+			this.filterangle.Name = "filterangle";
+			this.filterangle.Size = new System.Drawing.Size(72, 24);
+			this.filterangle.StepValues = null;
+			this.filterangle.TabIndex = 11;
+			this.filterangle.WhenTextChanged += new System.EventHandler(this.filterangle_WhenTextChanged);
+			// 
+			// filtertype
+			// 
+			this.filtertype.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.filtertype.BackColor = System.Drawing.Color.Transparent;
+			this.filtertype.Cursor = System.Windows.Forms.Cursors.Default;
+			this.filtertype.Empty = false;
+			this.filtertype.GeneralizedCategories = null;
+			this.filtertype.GeneralizedOptions = null;
+			this.filtertype.Location = new System.Drawing.Point(111, 76);
+			this.filtertype.Name = "filtertype";
+			this.filtertype.Size = new System.Drawing.Size(294, 21);
+			this.filtertype.TabIndex = 7;
+			this.filtertype.Value = 402;
+			this.filtertype.ValueChanges += new System.EventHandler(this.filtertype_ValueChanges);
+			// 
+			// label5
+			// 
+			this.label5.AutoSize = true;
+			this.label5.Location = new System.Drawing.Point(32, 124);
+			this.label5.Name = "label5";
+			this.label5.Size = new System.Drawing.Size(75, 13);
+			this.label5.TabIndex = 6;
+			this.label5.Text = "Filter by angle:";
+			// 
+			// browsetype
+			// 
+			this.browsetype.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.browsetype.Image = global::CodeImp.DoomBuilder.Properties.Resources.List;
+			this.browsetype.Location = new System.Drawing.Point(411, 73);
+			this.browsetype.Name = "browsetype";
+			this.browsetype.Size = new System.Drawing.Size(28, 25);
+			this.browsetype.TabIndex = 5;
+			this.browsetype.UseVisualStyleBackColor = true;
+			this.browsetype.Click += new System.EventHandler(this.browsetype_Click);
+			// 
+			// label4
+			// 
+			this.label4.AutoSize = true;
+			this.label4.Location = new System.Drawing.Point(37, 79);
+			this.label4.Name = "label4";
+			this.label4.Size = new System.Drawing.Size(69, 13);
+			this.label4.TabIndex = 3;
+			this.label4.Text = "Filter by type:";
+			// 
+			// filtercategory
+			// 
+			this.filtercategory.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.filtercategory.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.filtercategory.FormattingEnabled = true;
+			this.filtercategory.Location = new System.Drawing.Point(111, 30);
+			this.filtercategory.Name = "filtercategory";
+			this.filtercategory.Size = new System.Drawing.Size(328, 21);
+			this.filtercategory.TabIndex = 1;
+			this.filtercategory.SelectedIndexChanged += new System.EventHandler(this.filtercategory_SelectedIndexChanged);
+			// 
+			// label2
+			// 
+			this.label2.AutoSize = true;
+			this.label2.Location = new System.Drawing.Point(15, 33);
+			this.label2.Name = "label2";
+			this.label2.Size = new System.Drawing.Size(90, 13);
+			this.label2.TabIndex = 2;
+			this.label2.Text = "Filter by category:";
+			// 
+			// tabflags
+			// 
+			this.tabflags.Controls.Add(this.filterfields);
+			this.tabflags.Controls.Add(this.label3);
+			this.tabflags.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.tabflags.Location = new System.Drawing.Point(4, 22);
+			this.tabflags.Name = "tabflags";
+			this.tabflags.Padding = new System.Windows.Forms.Padding(3);
+			this.tabflags.Size = new System.Drawing.Size(445, 303);
+			this.tabflags.TabIndex = 1;
+			this.tabflags.Text = "Flags";
+			this.tabflags.UseVisualStyleBackColor = true;
+			// 
+			// filterfields
+			// 
+			this.filterfields.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.filterfields.AutoScroll = true;
+			this.filterfields.Columns = 2;
+			this.filterfields.Location = new System.Drawing.Point(20, 39);
+			this.filterfields.Name = "filterfields";
+			this.filterfields.Size = new System.Drawing.Size(402, 233);
+			this.filterfields.TabIndex = 5;
+			this.filterfields.VerticalSpacing = 1;
+			// 
+			// label3
+			// 
+			this.label3.AutoSize = true;
+			this.label3.Location = new System.Drawing.Point(17, 20);
+			this.label3.Name = "label3";
+			this.label3.Size = new System.Drawing.Size(85, 13);
+			this.label3.TabIndex = 6;
+			this.label3.Text = "Filter by settings:";
+			// 
+			// tabaction
+			// 
+			this.tabaction.Controls.Add(this.argumentspanel);
+			this.tabaction.Controls.Add(this.filteraction);
+			this.tabaction.Controls.Add(this.browseaction);
+			this.tabaction.Controls.Add(this.label7);
+			this.tabaction.Controls.Add(this.filtertag);
+			this.tabaction.Controls.Add(this.labeltag);
+			this.tabaction.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.tabaction.Location = new System.Drawing.Point(4, 22);
+			this.tabaction.Name = "tabaction";
+			this.tabaction.Padding = new System.Windows.Forms.Padding(3);
+			this.tabaction.Size = new System.Drawing.Size(445, 303);
+			this.tabaction.TabIndex = 2;
+			this.tabaction.Text = "Action";
+			this.tabaction.UseVisualStyleBackColor = true;
+			// 
+			// argumentspanel
+			// 
+			this.argumentspanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.argumentspanel.Controls.Add(this.label8);
+			this.argumentspanel.Controls.Add(this.arg2);
+			this.argumentspanel.Controls.Add(this.arg1);
+			this.argumentspanel.Controls.Add(this.arg0);
+			this.argumentspanel.Controls.Add(this.arg3);
+			this.argumentspanel.Controls.Add(this.arg4);
+			this.argumentspanel.Controls.Add(this.arg1label);
+			this.argumentspanel.Controls.Add(this.arg0label);
+			this.argumentspanel.Controls.Add(this.arg3label);
+			this.argumentspanel.Controls.Add(this.arg2label);
+			this.argumentspanel.Controls.Add(this.arg4label);
+			this.argumentspanel.Location = new System.Drawing.Point(6, 70);
+			this.argumentspanel.Name = "argumentspanel";
+			this.argumentspanel.Size = new System.Drawing.Size(418, 157);
+			this.argumentspanel.TabIndex = 17;
+			// 
+			// label8
+			// 
+			this.label8.AutoSize = true;
+			this.label8.Location = new System.Drawing.Point(0, 0);
+			this.label8.Name = "label8";
+			this.label8.Size = new System.Drawing.Size(98, 13);
+			this.label8.TabIndex = 21;
+			this.label8.Text = "Filter by arguments:";
+			// 
+			// arg2
+			// 
+			this.arg2.Location = new System.Drawing.Point(236, 75);
+			this.arg2.Name = "arg2";
+			this.arg2.Size = new System.Drawing.Size(128, 24);
+			this.arg2.TabIndex = 2;
+			this.arg2.Tag = "2";
+			this.arg2.Validated += new System.EventHandler(this.arg_Validated);
+			// 
+			// arg1
+			// 
+			this.arg1.Location = new System.Drawing.Point(236, 49);
+			this.arg1.Name = "arg1";
+			this.arg1.Size = new System.Drawing.Size(128, 24);
+			this.arg1.TabIndex = 1;
+			this.arg1.Tag = "1";
+			this.arg1.Validated += new System.EventHandler(this.arg_Validated);
+			// 
+			// arg0
+			// 
+			this.arg0.Location = new System.Drawing.Point(236, 23);
+			this.arg0.Name = "arg0";
+			this.arg0.Size = new System.Drawing.Size(128, 24);
+			this.arg0.TabIndex = 0;
+			this.arg0.Tag = "0";
+			this.arg0.Validated += new System.EventHandler(this.arg_Validated);
+			// 
+			// arg3
+			// 
+			this.arg3.Location = new System.Drawing.Point(236, 102);
+			this.arg3.Name = "arg3";
+			this.arg3.Size = new System.Drawing.Size(128, 24);
+			this.arg3.TabIndex = 3;
+			this.arg3.Tag = "3";
+			this.arg3.Validated += new System.EventHandler(this.arg_Validated);
+			// 
+			// arg4
+			// 
+			this.arg4.Location = new System.Drawing.Point(236, 128);
+			this.arg4.Name = "arg4";
+			this.arg4.Size = new System.Drawing.Size(128, 24);
+			this.arg4.TabIndex = 4;
+			this.arg4.Tag = "4";
+			this.arg4.Validated += new System.EventHandler(this.arg_Validated);
+			// 
+			// arg1label
+			// 
+			this.arg1label.Location = new System.Drawing.Point(33, 54);
+			this.arg1label.Name = "arg1label";
+			this.arg1label.Size = new System.Drawing.Size(197, 14);
+			this.arg1label.TabIndex = 14;
+			this.arg1label.Text = "Argument 2:";
+			this.arg1label.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			this.arg1label.UseMnemonic = false;
+			// 
+			// arg0label
+			// 
+			this.arg0label.Location = new System.Drawing.Point(33, 28);
+			this.arg0label.Name = "arg0label";
+			this.arg0label.Size = new System.Drawing.Size(197, 14);
+			this.arg0label.TabIndex = 12;
+			this.arg0label.Text = "Argument 1:";
+			this.arg0label.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			this.arg0label.UseMnemonic = false;
+			// 
+			// arg3label
+			// 
+			this.arg3label.Location = new System.Drawing.Point(33, 107);
+			this.arg3label.Name = "arg3label";
+			this.arg3label.Size = new System.Drawing.Size(197, 14);
+			this.arg3label.TabIndex = 20;
+			this.arg3label.Text = "Argument 4:";
+			this.arg3label.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			this.arg3label.UseMnemonic = false;
+			// 
+			// arg2label
+			// 
+			this.arg2label.Location = new System.Drawing.Point(33, 80);
+			this.arg2label.Name = "arg2label";
+			this.arg2label.Size = new System.Drawing.Size(197, 14);
+			this.arg2label.TabIndex = 18;
+			this.arg2label.Text = "Argument 3:";
+			this.arg2label.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			this.arg2label.UseMnemonic = false;
+			// 
+			// arg4label
+			// 
+			this.arg4label.Location = new System.Drawing.Point(33, 133);
+			this.arg4label.Name = "arg4label";
+			this.arg4label.Size = new System.Drawing.Size(197, 14);
+			this.arg4label.TabIndex = 16;
+			this.arg4label.Text = "Argument 5:";
+			this.arg4label.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			this.arg4label.UseMnemonic = false;
+			// 
+			// filteraction
+			// 
+			this.filteraction.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.filteraction.BackColor = System.Drawing.Color.Transparent;
+			this.filteraction.Cursor = System.Windows.Forms.Cursors.Default;
+			this.filteraction.Empty = false;
+			this.filteraction.GeneralizedCategories = null;
+			this.filteraction.GeneralizedOptions = null;
+			this.filteraction.Location = new System.Drawing.Point(90, 30);
+			this.filteraction.Name = "filteraction";
+			this.filteraction.Size = new System.Drawing.Size(315, 21);
+			this.filteraction.TabIndex = 16;
+			this.filteraction.Value = 402;
+			this.filteraction.ValueChanges += new System.EventHandler(this.filteraction_ValueChanges);
+			// 
+			// browseaction
+			// 
+			this.browseaction.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.browseaction.Image = global::CodeImp.DoomBuilder.Properties.Resources.List;
+			this.browseaction.Location = new System.Drawing.Point(411, 28);
+			this.browseaction.Name = "browseaction";
+			this.browseaction.Size = new System.Drawing.Size(28, 25);
+			this.browseaction.TabIndex = 15;
+			this.browseaction.UseVisualStyleBackColor = true;
+			this.browseaction.Click += new System.EventHandler(this.browseaction_Click);
+			// 
+			// label7
+			// 
+			this.label7.AutoSize = true;
+			this.label7.Location = new System.Drawing.Point(6, 34);
+			this.label7.Name = "label7";
+			this.label7.Size = new System.Drawing.Size(78, 13);
+			this.label7.TabIndex = 14;
+			this.label7.Text = "Filter by action:";
+			// 
+			// filtertag
+			// 
+			this.filtertag.AllowDecimal = false;
+			this.filtertag.AllowNegative = true;
+			this.filtertag.AllowRelative = false;
+			this.filtertag.ButtonStep = 1;
+			this.filtertag.ButtonStepBig = 10F;
+			this.filtertag.ButtonStepFloat = 1F;
+			this.filtertag.ButtonStepSmall = 0.1F;
+			this.filtertag.ButtonStepsUseModifierKeys = false;
+			this.filtertag.ButtonStepsWrapAround = false;
+			this.filtertag.Location = new System.Drawing.Point(90, 244);
+			this.filtertag.Name = "filtertag";
+			this.filtertag.Size = new System.Drawing.Size(72, 24);
+			this.filtertag.StepValues = null;
+			this.filtertag.TabIndex = 13;
+			this.filtertag.WhenTextChanged += new System.EventHandler(this.filtertag_WhenTextChanged);
+			// 
+			// labeltag
+			// 
+			this.labeltag.AutoSize = true;
+			this.labeltag.Location = new System.Drawing.Point(20, 249);
+			this.labeltag.Name = "labeltag";
+			this.labeltag.Size = new System.Drawing.Size(64, 13);
+			this.labeltag.TabIndex = 12;
+			this.labeltag.Text = "Filter by tag:";
+			// 
+			// tabcustom
+			// 
+			this.tabcustom.Controls.Add(this.fieldslist);
+			this.tabcustom.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.tabcustom.Location = new System.Drawing.Point(4, 22);
+			this.tabcustom.Name = "tabcustom";
+			this.tabcustom.Padding = new System.Windows.Forms.Padding(3);
+			this.tabcustom.Size = new System.Drawing.Size(445, 303);
+			this.tabcustom.TabIndex = 3;
+			this.tabcustom.Text = "Custom";
+			this.tabcustom.UseVisualStyleBackColor = true;
+			// 
+			// fieldslist
+			// 
+			this.fieldslist.AllowInsert = true;
+			this.fieldslist.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.fieldslist.AutoInsertUserPrefix = false;
+			this.fieldslist.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+			this.fieldslist.Location = new System.Drawing.Point(8, 9);
+			this.fieldslist.Margin = new System.Windows.Forms.Padding(8, 9, 8, 9);
+			this.fieldslist.Name = "fieldslist";
+			this.fieldslist.PropertyColumnVisible = true;
+			this.fieldslist.PropertyColumnWidth = 150;
+			this.fieldslist.Size = new System.Drawing.Size(426, 251);
+			this.fieldslist.TabIndex = 2;
+			this.fieldslist.TypeColumnVisible = true;
+			this.fieldslist.TypeColumnWidth = 100;
+			this.fieldslist.ValueColumnVisible = true;
+			this.fieldslist.Validated += new System.EventHandler(this.fieldslist_Validated);
+			// 
+			// filtername
+			// 
+			this.filtername.Location = new System.Drawing.Point(92, 24);
+			this.filtername.MaxLength = 50;
+			this.filtername.Name = "filtername";
+			this.filtername.Size = new System.Drawing.Size(232, 20);
+			this.filtername.TabIndex = 0;
+			this.filtername.Enter += new System.EventHandler(this.filtername_Enter);
+			this.filtername.Validating += new System.ComponentModel.CancelEventHandler(this.filtername_Validating);
+			// 
+			// label1
+			// 
+			this.label1.AutoSize = true;
+			this.label1.Location = new System.Drawing.Point(48, 27);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(38, 13);
+			this.label1.TabIndex = 0;
+			this.label1.Text = "Name:";
+			// 
+			// cancel
+			// 
+			this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.cancel.Location = new System.Drawing.Point(573, 428);
+			this.cancel.Name = "cancel";
+			this.cancel.Size = new System.Drawing.Size(112, 25);
+			this.cancel.TabIndex = 5;
+			this.cancel.Text = "Cancel";
+			this.cancel.UseVisualStyleBackColor = true;
+			this.cancel.Click += new System.EventHandler(this.cancel_Click);
+			// 
+			// apply
+			// 
+			this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.apply.Location = new System.Drawing.Point(455, 428);
+			this.apply.Name = "apply";
+			this.apply.Size = new System.Drawing.Size(112, 25);
+			this.apply.TabIndex = 4;
+			this.apply.Text = "OK";
+			this.apply.UseVisualStyleBackColor = true;
+			this.apply.Click += new System.EventHandler(this.apply_Click);
+			// 
+			// ThingsFiltersForm
+			// 
+			this.AcceptButton = this.apply;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.CancelButton = this.cancel;
+			this.ClientSize = new System.Drawing.Size(696, 459);
+			this.Controls.Add(this.cancel);
+			this.Controls.Add(this.apply);
+			this.Controls.Add(this.filtergroup);
+			this.Controls.Add(this.deletefilter);
+			this.Controls.Add(this.addfilter);
+			this.Controls.Add(this.listfilters);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "ThingsFiltersForm";
+			this.Opacity = 1;
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Things Filters";
+			this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.ThingsFiltersForm_HelpRequested);
+			this.filtergroup.ResumeLayout(false);
+			this.filtergroup.PerformLayout();
+			this.tabs.ResumeLayout(false);
+			this.tabbasic.ResumeLayout(false);
+			this.tabbasic.PerformLayout();
+			this.tabflags.ResumeLayout(false);
+			this.tabflags.PerformLayout();
+			this.tabaction.ResumeLayout(false);
+			this.tabaction.PerformLayout();
+			this.argumentspanel.ResumeLayout(false);
+			this.argumentspanel.PerformLayout();
+			this.tabcustom.ResumeLayout(false);
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.ListView listfilters;
+		private System.Windows.Forms.ColumnHeader columnname;
+		private System.Windows.Forms.Button addfilter;
+		private System.Windows.Forms.Button deletefilter;
+		private System.Windows.Forms.GroupBox filtergroup;
+		private System.Windows.Forms.Button cancel;
+		private System.Windows.Forms.Button apply;
+		private System.Windows.Forms.TextBox filtername;
+		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.Label label2;
+		private System.Windows.Forms.ComboBox filtercategory;
+		private System.Windows.Forms.TabControl tabs;
+		private System.Windows.Forms.TabPage tabbasic;
+		private System.Windows.Forms.TabPage tabflags;
+		private System.Windows.Forms.Label label4;
+		private CodeImp.DoomBuilder.Controls.CheckboxArrayControl filterfields;
+		private System.Windows.Forms.Label label3;
+		private System.Windows.Forms.Button browsetype;
+		private System.Windows.Forms.TabPage tabaction;
+		private System.Windows.Forms.TabPage tabcustom;
+		private System.Windows.Forms.Label label5;
+		private CodeImp.DoomBuilder.Controls.ActionSelectorControl filtertype;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox filterangle;
+		private System.Windows.Forms.Button browseangle;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox filterzheight;
+		private System.Windows.Forms.Label labelzheight;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox filtertag;
+		private System.Windows.Forms.Label labeltag;
+		private CodeImp.DoomBuilder.Controls.ActionSelectorControl filteraction;
+		private System.Windows.Forms.Button browseaction;
+		private System.Windows.Forms.Label label7;
+		private System.Windows.Forms.Panel argumentspanel;
+		private System.Windows.Forms.Label label8;
+		private CodeImp.DoomBuilder.Controls.ArgumentBox arg2;
+		private CodeImp.DoomBuilder.Controls.ArgumentBox arg1;
+		private CodeImp.DoomBuilder.Controls.ArgumentBox arg0;
+		private CodeImp.DoomBuilder.Controls.ArgumentBox arg3;
+		private CodeImp.DoomBuilder.Controls.ArgumentBox arg4;
+		private System.Windows.Forms.Label arg1label;
+		private System.Windows.Forms.Label arg0label;
+		private System.Windows.Forms.Label arg3label;
+		private System.Windows.Forms.Label arg2label;
+		private System.Windows.Forms.Label arg4label;
+		private CodeImp.DoomBuilder.Controls.FieldsEditorControl fieldslist;
+		private System.Windows.Forms.Label label6;
+		private System.Windows.Forms.CheckBox invert;
+		private System.Windows.Forms.ComboBox filtermode;
+		private System.Windows.Forms.Label label9;
+		private System.Windows.Forms.ImageList imagelist;
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/ThingsFiltersForm.cs b/Source/Core/Windows/ThingsFiltersForm.cs
new file mode 100644
index 0000000..a138456
--- /dev/null
+++ b/Source/Core/Windows/ThingsFiltersForm.cs
@@ -0,0 +1,605 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Editing;
+using CodeImp.DoomBuilder.Controls;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Windows
+{
+	internal partial class ThingsFiltersForm : DelayedForm
+	{
+		#region ================== Structs
+
+		private class ThingCategoryData //mxd
+		{
+			public ThingCategory Category;
+			public string FullName;
+
+			public ThingCategoryData(ThingCategory category, string fullname)
+			{
+				Category = category;
+				FullName = fullname;
+			}
+
+			public override string ToString() 
+			{
+				return FullName;
+			}
+		}
+
+		#endregion
+
+		#region ================== Variables
+
+		private bool settingup;
+
+		#endregion
+		
+		#region ================== Constructor
+
+		// Constructor
+		public ThingsFiltersForm()
+		{
+			settingup = true;
+			
+			// Initialize
+			InitializeComponent();
+			
+			// Fill types list
+			List<ThingTypeInfo> thingtypes = new List<ThingTypeInfo>(General.Map.Data.ThingTypes);
+			INumberedTitle[] typeitems = new INumberedTitle[thingtypes.Count];
+			for(int i = 0; i < thingtypes.Count; i++) typeitems[i] = thingtypes[i];
+			filtertype.AddInfo(typeitems);
+			
+			// Fill the categories combobox
+			filtercategory.Items.Add("(any category)");
+
+			//mxd. Add ThingCategories with subcategories
+			AddThingFilterCategories(General.Map.Data.ThingCategories, string.Empty);
+			
+			// Fill actions list
+			filteraction.GeneralizedCategories = General.Map.Config.GenActionCategories;
+			filteraction.AddInfo(General.Map.Config.SortedLinedefActions.ToArray());
+			
+			// Initialize custom fields editor
+			if(General.Map.FormatInterface.HasCustomFields) //mxd
+			{
+				fieldslist.ListNoFixedFields();
+				fieldslist.Setup("thing");
+			}
+
+			// Fill checkboxes list
+			foreach(KeyValuePair<string, string> flag in General.Map.Config.ThingFlags)
+			{
+				CheckBox box = filterfields.Add(flag.Value, flag.Key);
+				box.ThreeState = true;
+				box.CheckStateChanged += filterfield_Check;
+			}
+			
+			// Fill list of filters
+			foreach(ThingsFilter f in General.Map.ConfigSettings.ThingsFilters)
+			{
+				// Make a copy (we don't want to modify the filters until OK is clicked)
+				ThingsFilter nf = new ThingsFilter(f);
+				
+				// Make item in list
+				ListViewItem item = new ListViewItem(nf.Name);
+				item.Tag = nf;
+				item.ImageIndex = (nf.IsValid() ? -1 : 0); //mxd
+				listfilters.Items.Add(item);
+				
+				// Select item if this is the current filter
+				if(General.Map.ThingsFilter == f) item.Selected = true;
+			}
+			
+			// Sort the list
+			listfilters.Sort();
+			
+			// Map format specific fields
+			filterzheight.Visible = General.Map.FormatInterface.HasThingHeight;
+			labelzheight.Visible = General.Map.FormatInterface.HasThingHeight;
+			argumentspanel.Visible = General.Map.FormatInterface.HasActionArgs;
+			labeltag.Visible = General.Map.FormatInterface.HasThingTag;
+			filtertag.Visible = General.Map.FormatInterface.HasThingTag;
+			if(!General.Map.FormatInterface.HasCustomFields)
+				tabs.TabPages.Remove(tabcustom);
+			if(!General.Map.FormatInterface.HasThingAction && !General.Map.FormatInterface.HasThingTag)
+				tabs.TabPages.Remove(tabaction);
+			
+			// Done
+			settingup = false;
+		}
+
+		//mxd. This recursively adds ThingCategories
+		private void AddThingFilterCategories(List<ThingCategory> list, string fullname) 
+		{
+			foreach(ThingCategory cat in list)
+			{
+				string catname = (string.IsNullOrEmpty(fullname) ? cat.Title : fullname + " / " + cat.Title);
+				filtercategory.Items.Add(new ThingCategoryData(cat, catname));
+				AddThingFilterCategories(cat.Children, catname);
+			}
+		}
+
+		//mxd
+		private void ValidateFilter(ListViewItem item, ThingsFilter f)
+		{
+			int imageindex = (f.IsValid() ? -1 : 0);
+			if(item.ImageIndex != imageindex)
+			{
+				item.ImageIndex = imageindex;
+				listfilters.Invalidate();
+			}
+		}
+
+		#endregion
+
+		#region ================== Management
+
+		// OK clicked
+		private void apply_Click(object sender, EventArgs e)
+		{
+			//mxd. Store current filter name
+			string currentfiltername = string.Empty;
+			if(!(General.Map.ThingsFilter is NullThingsFilter)) currentfiltername = General.Map.ThingsFilter.Name;
+			
+			// Clear all filters and add the new ones
+			General.Map.ConfigSettings.ThingsFilters.Clear();
+			ThingsFilter currentfilter = new NullThingsFilter(); //mxd
+			foreach(ListViewItem item in listfilters.Items)
+			{
+				ThingsFilter f = item.Tag as ThingsFilter; //mxd
+				if(!string.IsNullOrEmpty(currentfiltername) && f.Name == currentfiltername) //mxd
+					currentfilter = f; 
+				General.Map.ConfigSettings.ThingsFilters.Add(f);
+			}
+				
+			
+			// Update stuff
+			General.Map.ChangeThingFilter(currentfilter);
+			General.MainWindow.UpdateThingsFilters();
+			General.Map.ConfigSettings.Changed = true;
+			
+			// Close
+			this.DialogResult = DialogResult.OK;
+			this.Close();
+		}
+
+		// Cancel clicked
+		private void cancel_Click(object sender, EventArgs e)
+		{
+			// Close
+			this.DialogResult = DialogResult.Cancel;
+			this.Close();
+		}
+
+		// New Filter clicked
+		private void addfilter_Click(object sender, EventArgs e)
+		{
+			ThingsFilter newf = new ThingsFilter();
+
+			// Make item in list and select it
+			ListViewItem item = new ListViewItem(newf.Name);
+			item.Tag = newf;
+			listfilters.Items.Add(item);
+			item.Selected = true;
+
+			// Focus on the name field
+			//filtername.Focus();
+			//filtername.SelectAll();
+		}
+
+		// Delete Selected clicked
+		private void deletefilter_Click(object sender, EventArgs e)
+		{
+			// Anything selected?
+			if(listfilters.SelectedItems.Count > 0)
+			{
+				// Remove item
+				listfilters.Items.Remove(listfilters.SelectedItems[0]);
+			}
+		}
+		
+		// Item selected
+		private void listfilters_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			// Anything selected?
+			if(listfilters.SelectedItems.Count > 0)
+			{
+				// Get selected filter
+				ThingsFilter f = listfilters.SelectedItems[0].Tag as ThingsFilter;
+
+				// Enable settings
+				settingup = true;
+				deletefilter.Enabled = true;
+				filtergroup.Enabled = true;
+				
+				// Show name
+				filtername.Text = f.Name;
+
+				//mxd. Set display mode
+				filtermode.SelectedIndex = (int)f.DisplayMode;
+
+				//mxd. Invert?
+				invert.Checked = f.Invert;
+				
+				// Properties
+				foreach(object c in filtercategory.Items)
+				{
+					ThingCategoryData tc = (c as ThingCategoryData); //mxd
+					if((tc != null) && (tc.Category.Name == f.CategoryName)) filtercategory.SelectedItem = tc;
+				}
+				if(filtercategory.SelectedIndex == -1) filtercategory.SelectedIndex = 0;
+				
+				if(f.ThingType > -1)
+					filtertype.Value = f.ThingType;
+				else
+					filtertype.Empty = true;
+				
+				if(f.ThingAngle > -1)
+					filterangle.Text = f.ThingAngle.ToString();
+				else
+					filterangle.Text = "";
+					
+				if(f.ThingZHeight > int.MinValue)
+					filterzheight.Text = f.ThingZHeight.ToString();
+				else
+					filterzheight.Text = "";
+				
+				// Action
+				if(f.ThingAction > -1)
+					filteraction.Value = f.ThingAction;
+				else
+					filteraction.Empty = true;
+				
+				if(f.ThingArgs[0] > -1) arg0.SetValue(f.ThingArgs[0]); else arg0.ClearValue();
+				if(f.ThingArgs[1] > -1) arg1.SetValue(f.ThingArgs[1]); else arg1.ClearValue();
+				if(f.ThingArgs[2] > -1) arg2.SetValue(f.ThingArgs[2]); else arg2.ClearValue();
+				if(f.ThingArgs[3] > -1) arg3.SetValue(f.ThingArgs[3]); else arg3.ClearValue();
+				if(f.ThingArgs[4] > -1) arg4.SetValue(f.ThingArgs[4]); else arg4.ClearValue();
+				
+				if(f.ThingTag > -1)
+					filtertag.Text = f.ThingTag.ToString();
+				else
+					filtertag.Text = "";
+				
+				// Flags
+				foreach(CheckBox b in filterfields.Checkboxes)
+				{
+					// Field name forbidden?
+					if(f.ForbiddenFields.Contains(b.Tag.ToString()))
+					{
+						b.CheckState = CheckState.Unchecked;
+					}
+					// Field name required?
+					else if(f.RequiredFields.Contains(b.Tag.ToString()))
+					{
+						b.CheckState = CheckState.Checked;
+					}
+					else
+					{
+						b.CheckState = CheckState.Indeterminate;
+					}
+				}
+				
+				// Custom fields
+				if(General.Map.FormatInterface.HasCustomFields) //mxd 
+				{ 
+					fieldslist.ClearFields();
+					fieldslist.Setup("thing");
+					fieldslist.SetValues(f.ThingCustomFields, true);
+				}
+
+				// Done
+				settingup = false;
+			}
+			else
+			{
+				// Disable filter settings
+				deletefilter.Enabled = false;
+				filtergroup.Enabled = false;
+				filtername.Text = "";
+				filtercategory.SelectedIndex = -1;
+				foreach(CheckBox c in filterfields.Checkboxes) c.CheckState = CheckState.Indeterminate;
+			}
+		}
+
+		// Help
+		private void ThingsFiltersForm_HelpRequested(object sender, HelpEventArgs hlpevent)
+		{
+			General.ShowHelp("w_thingsfilter.html");
+			hlpevent.Handled = true;
+		}
+
+		#endregion	
+
+		#region ================== Filter Settings
+
+		// Category changed
+		private void filtercategory_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			// Anything selected?
+			if(!settingup && listfilters.SelectedItems.Count > 0)
+			{
+				// Get selected filter
+				ThingsFilter f = listfilters.SelectedItems[0].Tag as ThingsFilter;
+				
+				// Category selected
+				if((filtercategory.SelectedIndex > -1) && (filtercategory.SelectedItem is ThingCategoryData))
+				{
+					// Set new category name
+					f.CategoryName = (filtercategory.SelectedItem as ThingCategoryData).Category.Name; //mxd
+				}
+				else
+				{
+					// Unset category name
+					f.CategoryName = "";
+				}
+
+				ValidateFilter(listfilters.SelectedItems[0], f); //mxd
+			}
+		}
+		
+		// Rename filter
+		private void filtername_Validating(object sender, CancelEventArgs e)
+		{
+			// Anything selected?
+			if(listfilters.SelectedItems.Count > 0)
+			{
+				// Get selected filter
+				ThingsFilter f = listfilters.SelectedItems[0].Tag as ThingsFilter;
+
+				// Name changed?
+				if(string.IsNullOrEmpty(filtername.Text)) filtername.Text = ThingsFilter.DEFAULT_NAME; //mxd
+				if(f.Name != filtername.Text)
+				{
+					// Update name
+					f.Name = filtername.Text;
+					listfilters.SelectedItems[0].Text = f.Name;
+					listfilters.Sort();
+				}
+			}
+		}
+
+		//mxd
+		private void filtername_Enter(object sender, EventArgs e)
+		{
+			if(filtername.Text == ThingsFilter.DEFAULT_NAME) filtername.Text = string.Empty;
+		}
+
+		// Field clicked
+		private void filterfield_Check(object sender, EventArgs e)
+		{
+			// Get the checkbox
+			CheckBox box = (sender as CheckBox);
+			
+			// Not setting up?
+			if(!settingup)
+			{
+				// Anything selected?
+				if(listfilters.SelectedItems.Count > 0)
+				{
+					// Get selected filter
+					ThingsFilter f = listfilters.SelectedItems[0].Tag as ThingsFilter;
+					
+					switch(box.CheckState)
+					{
+						// New state is required?
+						case CheckState.Checked:
+							f.ForbiddenFields.Remove(box.Tag.ToString());
+							if(!f.RequiredFields.Contains(box.Tag.ToString())) f.RequiredFields.Add(box.Tag.ToString());
+							break;
+						// New state is forbidden?
+						case CheckState.Unchecked:
+							f.RequiredFields.Remove(box.Tag.ToString());
+							if(!f.ForbiddenFields.Contains(box.Tag.ToString())) f.ForbiddenFields.Add(box.Tag.ToString());
+							break;
+						default:
+							f.ForbiddenFields.Remove(box.Tag.ToString());
+							f.RequiredFields.Remove(box.Tag.ToString());
+							break;
+					}
+
+					ValidateFilter(listfilters.SelectedItems[0], f); //mxd
+				}
+			}
+		}
+		
+		private void filtertype_ValueChanges(object sender, EventArgs e)
+		{
+			// Anything selected?
+			if(listfilters.SelectedItems.Count > 0)
+			{
+				// Get selected filter
+				ThingsFilter f = listfilters.SelectedItems[0].Tag as ThingsFilter;
+				if(filtertype.Empty)
+					f.ThingType = -1;
+				else
+					f.ThingType = filtertype.GetValue();
+
+				ValidateFilter(listfilters.SelectedItems[0], f); //mxd
+			}
+		}
+		
+		private void browsetype_Click(object sender, EventArgs e)
+		{
+			filtertype.Value = ThingBrowserForm.BrowseThing(this, filtertype.Value);
+		}
+		
+		private void filterangle_WhenTextChanged(object sender, EventArgs e)
+		{
+			// Anything selected?
+			if(listfilters.SelectedItems.Count > 0)
+			{
+				// Get selected filter
+				ThingsFilter f = listfilters.SelectedItems[0].Tag as ThingsFilter;
+				f.ThingAngle = filterangle.GetResult(-1);
+
+				ValidateFilter(listfilters.SelectedItems[0], f); //mxd
+			}
+		}
+		
+		private void browseangle_Click(object sender, EventArgs e)
+		{
+			AngleForm af = new AngleForm();
+			af.Setup(filterangle.GetResult(-1));
+			if(af.ShowDialog() == DialogResult.OK)
+				filterangle.Text = af.Value.ToString();
+		}
+		
+		private void filterzheight_WhenTextChanged(object sender, EventArgs e)
+		{
+			// Anything selected?
+			if(listfilters.SelectedItems.Count > 0)
+			{
+				// Get selected filter
+				ThingsFilter f = listfilters.SelectedItems[0].Tag as ThingsFilter;
+				f.ThingZHeight = filterzheight.GetResult(int.MinValue);
+
+				ValidateFilter(listfilters.SelectedItems[0], f); //mxd
+			}
+		}
+
+		private void filteraction_ValueChanges(object sender, EventArgs e)
+		{
+			int showaction = 0;
+
+			// Anything selected?
+			if(listfilters.SelectedItems.Count > 0)
+			{
+				// Get selected filter
+				ThingsFilter f = listfilters.SelectedItems[0].Tag as ThingsFilter;
+				if(filteraction.Empty)
+					f.ThingAction = -1;
+				else
+					f.ThingAction = filteraction.GetValue();
+
+				ValidateFilter(listfilters.SelectedItems[0], f); //mxd
+			}
+			
+			// Only when line type is known, otherwise use the thing arguments
+			if(General.Map.Config.LinedefActions.ContainsKey(filteraction.Value)) showaction = filteraction.Value;
+			ArgumentInfo[] arginfo = General.Map.Config.LinedefActions[showaction].Args;
+			
+			// Change the argument descriptions
+			arg0label.Text = arginfo[0].Title + ":";
+			arg1label.Text = arginfo[1].Title + ":";
+			arg2label.Text = arginfo[2].Title + ":";
+			arg3label.Text = arginfo[3].Title + ":";
+			arg4label.Text = arginfo[4].Title + ":";
+			arg0label.Enabled = arginfo[0].Used;
+			arg1label.Enabled = arginfo[1].Used;
+			arg2label.Enabled = arginfo[2].Used;
+			arg3label.Enabled = arginfo[3].Used;
+			arg4label.Enabled = arginfo[4].Used;
+			arg0.ForeColor = (arg0label.Enabled ? SystemColors.WindowText : SystemColors.GrayText);
+			arg1.ForeColor = (arg1label.Enabled ? SystemColors.WindowText : SystemColors.GrayText);
+			arg2.ForeColor = (arg2label.Enabled ? SystemColors.WindowText : SystemColors.GrayText);
+			arg3.ForeColor = (arg3label.Enabled ? SystemColors.WindowText : SystemColors.GrayText);
+			arg4.ForeColor = (arg4label.Enabled ? SystemColors.WindowText : SystemColors.GrayText);
+			arg0.Setup(arginfo[0]);
+			arg1.Setup(arginfo[1]);
+			arg2.Setup(arginfo[2]);
+			arg3.Setup(arginfo[3]);
+			arg4.Setup(arginfo[4]);
+		}
+		
+		private void browseaction_Click(object sender, EventArgs e)
+		{
+			filteraction.Value = ActionBrowserForm.BrowseAction(this, filteraction.Value);
+		}
+		
+		private void filtertag_WhenTextChanged(object sender, EventArgs e)
+		{
+			// Anything selected?
+			if(listfilters.SelectedItems.Count > 0)
+			{
+				// Get selected filter
+				ThingsFilter f = listfilters.SelectedItems[0].Tag as ThingsFilter;
+				f.ThingTag = filtertag.GetResult(-1);
+
+				ValidateFilter(listfilters.SelectedItems[0], f); //mxd
+			}
+		}
+
+		private void arg_Validated(object sender, EventArgs e)
+		{
+			// Anything selected?
+			if(listfilters.SelectedItems.Count > 0)
+			{
+				// Get selected filter
+				ThingsFilter f = listfilters.SelectedItems[0].Tag as ThingsFilter;
+				
+				int index;
+				int.TryParse((sender as Control).Tag.ToString(), out index);
+				ArgumentBox filterarg = (sender as ArgumentBox);
+				f.ThingArgs[index] = filterarg.GetResult(-1);
+
+				ValidateFilter(listfilters.SelectedItems[0], f); //mxd
+			}
+		}
+		
+		private void fieldslist_Validated(object sender, EventArgs e)
+		{
+			// Anything selected?
+			if(listfilters.SelectedItems.Count > 0)
+			{
+				// Get selected filter
+				ThingsFilter f = listfilters.SelectedItems[0].Tag as ThingsFilter;
+				fieldslist.Apply(f.ThingCustomFields);
+
+				//mxd. Validate filter
+				ValidateFilter(listfilters.SelectedItems[0], f); //mxd
+			}
+		}
+
+		//mxd
+		private void invert_CheckedChanged(object sender, EventArgs e) 
+		{
+			// Anything selected?
+			if(!settingup && listfilters.SelectedItems.Count > 0) 
+			{
+				// Get selected filter
+				ThingsFilter f = listfilters.SelectedItems[0].Tag as ThingsFilter;
+				f.Invert = invert.Checked;
+			}
+		}
+
+		//mxd
+		private void filtermode_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			// Anything selected?
+			if(!settingup && listfilters.SelectedItems.Count > 0 && filtermode.SelectedIndex != -1) 
+			{
+				// Get selected filter
+				ThingsFilter f = listfilters.SelectedItems[0].Tag as ThingsFilter;
+				f.DisplayMode = (ThingsFilterDisplayMode)filtermode.SelectedIndex;
+			}
+		}
+		
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/ThingsFiltersForm.resx b/Source/Core/Windows/ThingsFiltersForm.resx
new file mode 100644
index 0000000..cc2d45f
--- /dev/null
+++ b/Source/Core/Windows/ThingsFiltersForm.resx
@@ -0,0 +1,234 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="imagelist.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <data name="imagelist.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
+        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
+        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAg
+        CAAAAk1TRnQBSQFMAwEBAAEYAQABGAEAARABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA
+        AUADAAEQAwABAQEAAQgGAAEEGAABgAIAAYADAAKAAQABgAMAAYABAAGAAQACgAIAA8ABAAHAAdwBwAEA
+        AfABygGmAQABMwUAATMBAAEzAQABMwEAAjMCAAMWAQADHAEAAyIBAAMpAQADVQEAA00BAANCAQADOQEA
+        AYABfAH/AQACUAH/AQABkwEAAdYBAAH/AewBzAEAAcYB1gHvAQAB1gLnAQABkAGpAa0CAAH/ATMDAAFm
+        AwABmQMAAcwCAAEzAwACMwIAATMBZgIAATMBmQIAATMBzAIAATMB/wIAAWYDAAFmATMCAAJmAgABZgGZ
+        AgABZgHMAgABZgH/AgABmQMAAZkBMwIAAZkBZgIAApkCAAGZAcwCAAGZAf8CAAHMAwABzAEzAgABzAFm
+        AgABzAGZAgACzAIAAcwB/wIAAf8BZgIAAf8BmQIAAf8BzAEAATMB/wIAAf8BAAEzAQABMwEAAWYBAAEz
+        AQABmQEAATMBAAHMAQABMwEAAf8BAAH/ATMCAAMzAQACMwFmAQACMwGZAQACMwHMAQACMwH/AQABMwFm
+        AgABMwFmATMBAAEzAmYBAAEzAWYBmQEAATMBZgHMAQABMwFmAf8BAAEzAZkCAAEzAZkBMwEAATMBmQFm
+        AQABMwKZAQABMwGZAcwBAAEzAZkB/wEAATMBzAIAATMBzAEzAQABMwHMAWYBAAEzAcwBmQEAATMCzAEA
+        ATMBzAH/AQABMwH/ATMBAAEzAf8BZgEAATMB/wGZAQABMwH/AcwBAAEzAv8BAAFmAwABZgEAATMBAAFm
+        AQABZgEAAWYBAAGZAQABZgEAAcwBAAFmAQAB/wEAAWYBMwIAAWYCMwEAAWYBMwFmAQABZgEzAZkBAAFm
+        ATMBzAEAAWYBMwH/AQACZgIAAmYBMwEAA2YBAAJmAZkBAAJmAcwBAAFmAZkCAAFmAZkBMwEAAWYBmQFm
+        AQABZgKZAQABZgGZAcwBAAFmAZkB/wEAAWYBzAIAAWYBzAEzAQABZgHMAZkBAAFmAswBAAFmAcwB/wEA
+        AWYB/wIAAWYB/wEzAQABZgH/AZkBAAFmAf8BzAEAAcwBAAH/AQAB/wEAAcwBAAKZAgABmQEzAZkBAAGZ
+        AQABmQEAAZkBAAHMAQABmQMAAZkCMwEAAZkBAAFmAQABmQEzAcwBAAGZAQAB/wEAAZkBZgIAAZkBZgEz
+        AQABmQEzAWYBAAGZAWYBmQEAAZkBZgHMAQABmQEzAf8BAAKZATMBAAKZAWYBAAOZAQACmQHMAQACmQH/
+        AQABmQHMAgABmQHMATMBAAFmAcwBZgEAAZkBzAGZAQABmQLMAQABmQHMAf8BAAGZAf8CAAGZAf8BMwEA
+        AZkBzAFmAQABmQH/AZkBAAGZAf8BzAEAAZkC/wEAAcwDAAGZAQABMwEAAcwBAAFmAQABzAEAAZkBAAHM
+        AQABzAEAAZkBMwIAAcwCMwEAAcwBMwFmAQABzAEzAZkBAAHMATMBzAEAAcwBMwH/AQABzAFmAgABzAFm
+        ATMBAAGZAmYBAAHMAWYBmQEAAcwBZgHMAQABmQFmAf8BAAHMAZkCAAHMAZkBMwEAAcwBmQFmAQABzAKZ
+        AQABzAGZAcwBAAHMAZkB/wEAAswCAALMATMBAALMAWYBAALMAZkBAAPMAQACzAH/AQABzAH/AgABzAH/
+        ATMBAAGZAf8BZgEAAcwB/wGZAQABzAH/AcwBAAHMAv8BAAHMAQABMwEAAf8BAAFmAQAB/wEAAZkBAAHM
+        ATMCAAH/AjMBAAH/ATMBZgEAAf8BMwGZAQAB/wEzAcwBAAH/ATMB/wEAAf8BZgIAAf8BZgEzAQABzAJm
+        AQAB/wFmAZkBAAH/AWYBzAEAAcwBZgH/AQAB/wGZAgAB/wGZATMBAAH/AZkBZgEAAf8CmQEAAf8BmQHM
+        AQAB/wGZAf8BAAH/AcwCAAH/AcwBMwEAAf8BzAFmAQAB/wHMAZkBAAH/AswBAAH/AcwB/wEAAv8BMwEA
+        AcwB/wFmAQAC/wGZAQAC/wHMAQACZgH/AQABZgH/AWYBAAFmAv8BAAH/AmYBAAH/AWYB/wEAAv8BZgEA
+        ASEBAAGlAQADXwEAA3cBAAOGAQADlgEAA8sBAAOyAQAD1wEAA90BAAPjAQAD6gEAA/EBAAP4AQAB8AH7
+        Af8BAAGkAqABAAOAAwAB/wIAAf8DAAL/AQAB/wMAAf8BAAH/AQAC/wIAA/9BAAH0DvMB9DAAArwDGgIb
+        AsMCGwQaAQcwAAHzARoF5QFSAXMEegFZAaAB8DEAAfABoAE4AlkBOAEiAUMFWQHwAf8xAAH/AfABXgE4
+        AVkBOAFZAVgEOAGaAfIzAAHyAcMB+wFZAV4BSgETAVgCOAFZAfAB/zMAAf8B8AHlAl4BFQERAVgCOAHD
+        AfM1AAH0AfYCXgESAUMBWAFeAeUB8DcAAfABoAFeAeoBFAFYAV4B9gH/NwAB/wH0AV4B6gETAVgBoAHx
+        OQAB8QGgAVgBeQHlARsB/zkAAf8B8AFeAfsBoAHyOwAB8wHDAV4BvAH/PAABvAEbAfR2AAFCAU0BPgcA
+        AT4DAAEoAwABQAMAARADAAEBAQABAQUAAYAXAAP/AQAC/x4AAYAHAAGAAQEGAAHAAQEGAAHAAQMGAAHg
+        AQcGAAHwAQcGAAHwAQ8GAAH4AQ8GAAH4AR8GAAH8AR8GAAH+AT8GAAL/BgAL
+</value>
+  </data>
+  <metadata name="tabbasic.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="label6.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="labelzheight.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="label5.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="label4.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="label2.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="tabflags.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="filterfields.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="label3.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="tabaction.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="argumentspanel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="arg2.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="arg1.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="arg0.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="arg3.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="arg4.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="arg1label.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="arg0label.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="arg3label.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="arg2label.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="arg4label.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="tabcustom.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="fieldslist.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Windows/ToolbarSection.cs b/Source/Core/Windows/ToolbarSection.cs
new file mode 100644
index 0000000..0d1ba7f
--- /dev/null
+++ b/Source/Core/Windows/ToolbarSection.cs
@@ -0,0 +1,37 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Windows
+{
+	public enum ToolbarSection
+	{
+		File,
+		Script,
+		UndoRedo,
+		CopyPaste,
+		Prefabs,
+		Things,
+		Views,
+		Geometry,
+		Testing,
+		Custom,
+		Modes //mxd
+	}
+}
diff --git a/Source/Core/Windows/UpdateForm.Designer.cs b/Source/Core/Windows/UpdateForm.Designer.cs
new file mode 100644
index 0000000..275bd39
--- /dev/null
+++ b/Source/Core/Windows/UpdateForm.Designer.cs
@@ -0,0 +1,156 @@
+namespace CodeImp.DoomBuilder.Windows
+{
+	partial class UpdateForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing) {
+			if(disposing && (components != null)) {
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent() {
+			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(UpdateForm));
+			this.cancel = new System.Windows.Forms.Button();
+			this.downloadupdate = new System.Windows.Forms.Button();
+			this.label = new System.Windows.Forms.Label();
+			this.label2 = new System.Windows.Forms.Label();
+			this.changelog = new System.Windows.Forms.RichTextBox();
+			this.hint = new System.Windows.Forms.PictureBox();
+			this.ignorethisupdate = new System.Windows.Forms.CheckBox();
+			((System.ComponentModel.ISupportInitialize)(this.hint)).BeginInit();
+			this.SuspendLayout();
+			// 
+			// cancel
+			// 
+			this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.cancel.Location = new System.Drawing.Point(549, 227);
+			this.cancel.Name = "cancel";
+			this.cancel.Size = new System.Drawing.Size(90, 28);
+			this.cancel.TabIndex = 0;
+			this.cancel.Text = "Cancel";
+			this.cancel.UseVisualStyleBackColor = true;
+			this.cancel.Click += new System.EventHandler(this.cancel_Click);
+			// 
+			// downloadupdate
+			// 
+			this.downloadupdate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.downloadupdate.Location = new System.Drawing.Point(423, 227);
+			this.downloadupdate.Name = "downloadupdate";
+			this.downloadupdate.Size = new System.Drawing.Size(120, 28);
+			this.downloadupdate.TabIndex = 1;
+			this.downloadupdate.Text = "Update";
+			this.downloadupdate.UseVisualStyleBackColor = true;
+			this.downloadupdate.Click += new System.EventHandler(this.downloadupdate_Click);
+			// 
+			// label
+			// 
+			this.label.AutoSize = true;
+			this.label.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.label.Location = new System.Drawing.Point(15, 18);
+			this.label.Name = "label";
+			this.label.Size = new System.Drawing.Size(393, 13);
+			this.label.TabIndex = 4;
+			this.label.Text = "GZDoom Builder R[rev] is available. Changes since current revision:";
+			// 
+			// label2
+			// 
+			this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.label2.AutoSize = true;
+			this.label2.Location = new System.Drawing.Point(33, 226);
+			this.label2.Name = "label2";
+			this.label2.Size = new System.Drawing.Size(219, 26);
+			this.label2.TabIndex = 6;
+			this.label2.Text = "Notice: the editor will be closed and restarted\r\nduring the update process.";
+			// 
+			// changelog
+			// 
+			this.changelog.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.changelog.BackColor = System.Drawing.SystemColors.Window;
+			this.changelog.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+			this.changelog.Location = new System.Drawing.Point(12, 41);
+			this.changelog.Name = "changelog";
+			this.changelog.ReadOnly = true;
+			this.changelog.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.Vertical;
+			this.changelog.Size = new System.Drawing.Size(627, 175);
+			this.changelog.TabIndex = 7;
+			this.changelog.Text = "";
+			// 
+			// hint
+			// 
+			this.hint.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.hint.Image = global::CodeImp.DoomBuilder.Properties.Resources.Lightbulb;
+			this.hint.Location = new System.Drawing.Point(13, 231);
+			this.hint.Name = "hint";
+			this.hint.Size = new System.Drawing.Size(16, 16);
+			this.hint.TabIndex = 8;
+			this.hint.TabStop = false;
+			// 
+			// ignorethisupdate
+			// 
+			this.ignorethisupdate.AutoSize = true;
+			this.ignorethisupdate.Location = new System.Drawing.Point(306, 233);
+			this.ignorethisupdate.Name = "ignorethisupdate";
+			this.ignorethisupdate.Size = new System.Drawing.Size(111, 17);
+			this.ignorethisupdate.TabIndex = 9;
+			this.ignorethisupdate.Text = "Ignore this update";
+			this.ignorethisupdate.UseVisualStyleBackColor = true;
+			// 
+			// UpdateForm
+			// 
+			this.AcceptButton = this.downloadupdate;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.CancelButton = this.cancel;
+			this.ClientSize = new System.Drawing.Size(651, 262);
+			this.Controls.Add(this.ignorethisupdate);
+			this.Controls.Add(this.hint);
+			this.Controls.Add(this.changelog);
+			this.Controls.Add(this.label2);
+			this.Controls.Add(this.label);
+			this.Controls.Add(this.downloadupdate);
+			this.Controls.Add(this.cancel);
+			this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.MinimumSize = new System.Drawing.Size(625, 250);
+			this.Name = "UpdateForm";
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Newsflash (R[rev])!";
+			this.Shown += new System.EventHandler(this.UpdateForm_Shown);
+			((System.ComponentModel.ISupportInitialize)(this.hint)).EndInit();
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Button cancel;
+		private System.Windows.Forms.Button downloadupdate;
+		private System.Windows.Forms.Label label;
+		private System.Windows.Forms.Label label2;
+		private System.Windows.Forms.RichTextBox changelog;
+		private System.Windows.Forms.PictureBox hint;
+		private System.Windows.Forms.CheckBox ignorethisupdate;
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/UpdateForm.cs b/Source/Core/Windows/UpdateForm.cs
new file mode 100644
index 0000000..d2f80cd
--- /dev/null
+++ b/Source/Core/Windows/UpdateForm.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Windows.Forms;
+
+namespace CodeImp.DoomBuilder.Windows
+{
+	public partial class UpdateForm : Form
+	{
+		public bool IgnoreThisUpdate { get { return ignorethisupdate.Checked; } }
+
+		public UpdateForm(int remoterev, string changelog)
+		{
+			InitializeComponent();
+			Setup(remoterev, changelog);
+		}
+
+		private void Setup(int remoterev, string changelog)
+		{
+			this.Text = this.Text.Replace("[rev]", remoterev.ToString());
+			this.label.Text = label.Text.Replace("[rev]", remoterev.ToString());
+			this.changelog.SelectedRtf = changelog;
+		}
+
+		private void UpdateForm_Shown(object sender, EventArgs e)
+		{
+			this.changelog.Focus();
+		}
+
+		private void downloadupdate_Click(object sender, EventArgs e)
+		{
+			this.DialogResult = DialogResult.OK;
+			this.Close();
+		}
+
+		private void cancel_Click(object sender, EventArgs e)
+		{
+			this.DialogResult = DialogResult.Cancel;
+			this.Close();
+		}
+	}
+}
diff --git a/Source/Core/Windows/UpdateForm.resx b/Source/Core/Windows/UpdateForm.resx
new file mode 100644
index 0000000..6c47e39
--- /dev/null
+++ b/Source/Core/Windows/UpdateForm.resx
@@ -0,0 +1,659 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAABAAQAEBAAAAEAIABoBAAARgAAACAgAAABACAAqBAAAK4EAAAwMAAAAQAgAKglAABWFQAAQEAAAAEA
+        IAAoQgAA/joAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAQAABILAAASCwAAAAAAAAAAAAD///8A////AP//
+        /wD///8AGxsbeBsbG3gbGxt4GxsbeBsbG3gbGxt4GxsbeBsbG3gbGxt4GxsbeP///wD///8A////AP//
+        /wD///8AGBgY/xgYGP8YGBj/GBgY/xgYGP8YGBj/GBgY/xgYGP8YGBj/GBgY/xsbG3gbGxt4////AP//
+        /wD///8AHR0d/x0dHf8dHR3/HR0d/x0dHf8dHR3/HR0d/x0dHf8AZjP/AGYz/x0dHf8dHR3/GxsbeBsb
+        G3j///8AIiIi/yIiIv8iIiL/IiIi/yIiIv8iIiL/IiIi/yIiIv8AZjP/heu4/4XruP8AZjP/IiIi/yIi
+        Iv8bGxt4////ACgoKP8oKCj/KCgo/ygoKP8oKCj/KCgo/ygoKP8AZjP/U7iF/wBmM/8AZjP/heu4/wBm
+        M/8oKCj/GxsbeP///wAvLy//Ly8v/y8vL/8vLy//Ly8v/y8vL/8vLy//Ly8v/wBmM/+F67j/heu4/wBm
+        M/8vLy//Ly8v/xsbG3j///8ANjY2/zY2Nv+Ghob/////////////////hoaG/wBmM/9TuIX/heu4/4Xr
+        uP+F67j/AGYz/zY2Nv8bGxt4////AD09Pf89PT3//////0pKSv89PT3/i4uL//////8AZjP/AGYz/wBm
+        M/8AZjP/AGYz/wBmM/89PT3/GxsbeP///wBERET/RERE//////9ERET/////////////////RERE/11d
+        Xf//////UVFR/0RERP9ERET/RERE/xsbG3j///8AS0tL/0tLS///////V1dX/0tLS/9vb2//k5OT/0tL
+        S/9LS0v/h4eH//////9LS0v/S0tL/0tLS/8bGxt4////AFJSUv9SUlL/l5eX/////////////////3R0
+        dP//////////////////////o6Oj/1JSUv9SUlL/GxsbeP///wBYWFj/WFhY/1hYWP9YWFj/WFhY/1hY
+        WP9YWFj/WFhY/1hYWP9YWFj/WFhY/1hYWP9YWFj/WFhY/xsbG3j///8AXV1d/11dXf9dXV3/XV1d/11d
+        Xf9dXV3/XV1d/11dXf9dXV3/XV1d/11dXf9dXV3/XV1d/11dXf////8A////AP///wBiYmL/YmJi/2Ji
+        Yv9iYmL/YmJi/2JiYv9iYmL/YmJi/2JiYv9iYmL/YmJi/2JiYv////8A////AP///wD///8A////AGVl
+        Zf9lZWX/ZWVl/2VlZf9lZWX/ZWVl/2VlZf9lZWX/ZWVl/2VlZf////8A////AP///wD///8A////AP//
+        /wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A8AMAAOAB
+        AADAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAEAAMADAADgBwAA//8AACgA
+        AAAgAAAAQAAAAAEAIAAAAAAAABAAABILAAASCwAAAAAAAAAAAAAAAAAAAAAAAAAAAAUWFBNzFRMTxRUT
+        E+gVExPqFRMT6hUTE+oVExPqFRMT6hYTEuoWExPqFhQT6hcUE+oXFRTqGBUU6hkWFeoZFhXqGRcW6hoX
+        FuoYFhTqGBUU6hgVE+oYFRPqGBUT6hgVE+oXFBPjEhAPzQAAAIQAAAA/AAAADQAAAAAAAAALAAAALRQS
+        Ef8UEhH/FBIR/xQSEf8TEhH/FBIR/xQSEv8UEhL/FBIS/xUTEv8VExP/FhMT/xYUFP8WFBT/FRMS/xUT
+        Ev8XFRX/FhQU/xgVFP8XFRP/FhMS/xYTEv8WExL/FhMS/xYTEv8WExL/BAMDtgAAAH8AAABBAAAAAAAA
+        ACMWFBTHFBIS/xQSEv8UEhL/////////////////JSMj/zUzM///////////////////////g4KC////
+        //////////////////9APz//FhQU/0ZERP////////////////90cnH/FxMS/xcTEv8YFRT6BwYFuwAA
+        AIcAAAACGBcW+BgXFv8jIiL/KSgn////////////////////////////SEdH///////BwcH/oKGi/6Ci
+        o/+Cg4X//////9HQ0P+joqL/2NjY//////8nJST/dnV1//////+vrq7/oqGh//Dv7///////GBUU/xcT
+        Ev8WExL/FhIR1x4bGxEYFRT/GBUV/xgVGP82NDX//////zc0Mv8ZFRP/GRUT//////8YFBL/hIKB////
+        //8mJDf/GRgq/xgUEv//////hIKB/xgUEv8ZFBL//////4SCgf91cnL//////xkVE/8ZFBX/////////
+        //8aFRL/GhUS/xAQFf8YFBPiIR4dGhgUE/8YFRX/GBUY/1ZUVP//////GBQT/////////////////xgU
+        Ev8nJCL//////4SFjv8YFBL/GBQS//////+EgoH/GRUU/xkUEv+FgoH//////3Vycv//////o6Gh/6Oh
+        ov/w8PH/hYKC/xkUEv8ZFRL/GRQR/xcUE+QgHR0aGBQT/xgVFf8YFhj/VlRV//////8YFBP/GBQT/xgU
+        Ev8YFBL/GBQS/zMxRP9sbHv//////zczMv8YFBL//////5STmf8zMT3/LCk0/4B+hP//////eHZ7////
+        //////////////Dv8P8ZFRT/GRUS/xkVEv8ZFBH/FxQS5B8cHBoYFBP/GBUV/xgWGP9WVFX//////xgU
+        E/8YFBL/GBQS/5ORkf8YFBL/Kyo//xgYKf///////////xYTE///////mJee/zw5RP88OUX/////////
+        //9/foT//////xUTHv9SUVf///////////8aFBH/GRQR/xkUEf8XExLkHx0cGhgUE/8YFRT/GBYY/ycm
+        Jv//////hIKB/xgUEv+EgoH/8O/v/xgUEv8rKj3/Ghov/zAwOv/w8PD/ZGRv//////+EhIz/KytC/2Ni
+        cv//////WVlo/3Jyev//////Gxkk/zEvOP/v7/D//////xkUEf8aFBH/GRMR/xcUEuQfHBwaGBQT/xgV
+        Ff8YFRj/GBYW/1VTUv/w7+////////Dv7/9VUlH/NjMy///////////////////////Fxcn/////////
+        /////////////4qKlf8IESb/dXV9/////////////////5+epP8QDhj/EQ4S/xkTEv8ZExH/FxMS5B8c
+        GxoYFBP/GBUU/xgWGP8YFhf/GBUU/xgUE/8YFBL/GBQS/xgUEv8YFBL/GBQS/yMjOf8dHzL/JCQ4/zo4
+        SP8kIzj/CQwa/xgeM/8RHTv/EBo1/wsUK/8KDBn/BwkT/xoXH/8SDxv/Dw4b/w8OGP8ODRP/FRIW/xkT
+        Ef8XExLkHhsbGhgUE/8YFRT/GBYY/xgWFv8YFBP/GBQS/xgUEv8YFBL/GBQS/xgUEv8YFBL/GBQS/x4e
+        L/8cHTH/OjdK/yMjNv8IChT/KS45/x0gKv8hJS3/GB0m/xISHP8ICQ7/HBkk/xMQG/8PDRv/EA4Y/w4O
+        FP8YFBP/GRMR/xcTEuQuKikSQjY0/z84Nf9CO0L/QTw+/0E4Nf9BNjL/Qjcz/0E1M/9CNjb/QDU3/0I2
+        Nv9CNjT/QTUz/0I2NP9wb6//WlmF/4GMp/91fqn/K0ah/15ogP9qd43/MTVS/xMbOf9TS2n/MilK/y8o
+        S/8vKUD/MCo9/0I2Mv8tLDb/JR8d1jAsKxJENzX/Qzo3/0M8Q/9CPT//RDg2/0I3M/9CNjT/QTc3/0I3
+        Qf9BN0P/QjZC/0E3Pf9AOT7/hIC7/0RGhv8hIF7/c2zl/3dsyP8RFjf/Hylf/yEqTP8VFyn/EhYp/2xj
+        hP8yK07/MSlI/zUoQP8pJjX/Liw4/ygeLv8lHhzWMS0sEkM3Nf9AOTb/Qj0//0E8Pv9BODX/Qjcz/0I2
+        NP9BNz3/jJP//43L//9EPJv/f4Dy/4R/vf9DQXz/HCld/3mHsf8xPWf/dH+f/xsYLv8rLTj/Gh4p/xAQ
+        IP8UFiH/fXWa/ygtTP8wKEb/Lic8/zMwOf8qIDH/JSIx/yUeHNYuKSgSQjY0/0A5Nv9CPT//QTw+/0E4
+        Nf9CNzP/QjY0/0E5Ov9FRV3/b6jm/0M3S/9bVoP/MC9W/yAePP8sPH7/HSJf/5+y0/+Ekan/FRMp/4GN
+        pf9qd4f/HRws/xYPHP9cVHP/DTxX/yklQv8oIjP/GRMk/x4WJ/8kGy//JB4c1iwoJxJBNTP/Pzg1/zs9
+        Pv9AOz3/QDc0/0I2NP9CNzP/Qzc1/0A3Ov9BNz3/QTc9/2Ngjf8nKUj/JDNk/y1Mm/8zUaj/KEGH/yY9
+        gf8lO3z/anGK/2x0hf8jIjb/JScy/0Q0S/9OlLL/MilD/yMhLf8fFyj/GhQn/x8ZLP8kHhzWKycmEkA0
+        Mv8+NzT/PztB/0A7Pf9ANzT/QTYy/0E2Mv9BNTP/QTUz/0E1M/9CNjT/Y2Wm/5CHwP8uL1H/KTdr/yI1
+        cv8oRo3/LEyV/zFLkf8nQ4D/GiNJ/xcVM/9raJb/RTdP/4fJ+f83MEX/IyUw/xkUKf8YFCf/Gxcq/yQe
+        HNYrJyYSQDQy/z83N/8/O0H/Pzo8/0A3NP9BNjL/QTUz/0E1M/9BNjL/QjYy/0I2NP9rbKj/jYvX/5qT
+        3P+JgcD/e3aj/19aef9PUHb/MjVU/0NBXv9BPVb/SkVs/zo1UP81LUz/kb7//zAqQ/8ZGij/HB8u/x8W
+        Kv8YFCf/Ix4c1iomJRI9NDD/PzYz/z84P/8+OTv/PjUy/0EyMP/PyM//wLm+/4+KjP9nZIT/Pj5Q/36C
+        w/95hc3/aXPA/2Jkqv92d8H/bnG1/2Bjp/9ASIT/TlGI/09Pf/89N2D/My1M/zArUv+AnPv/NCtG/xga
+        LP8XFyn/GBQn/xwcLP8kHhzWKiYlEj8zMf89NTX/Pjc+/z84O/8+NTL/QDMx/828wP/c0dT/nJTJ/3Rz
+        n/9hYIj////+//3///93fr3/Ymiv/29xt//L6///gonO/1lfjP9fZKP/P0Jv/1FPff9LSXf/LitS/3mL
+        5v84L0n/Ghos/xsaKv8XFyf/GBgo/yQeHNYqJSQSPzMx/z82M/8/ODv/Pjc6/z41Mv8/NDD/QTQy/86+
+        v/+bl9L/ZGSU/2Bkjf/m5PD/p6Lf/3h8w/9tbbP/dXnA/////////////////4qRyv9OVIH/Ky5U/yoq
+        Uv8oK1H/AGYz/wBmM/8YGyr/GBkn/xkZKf8WGCP/JB4d1iolJBI9NDH/QDc0/z83Pv8+Nzr/PjUy/z4y
+        MP8/MzP/XlZ1/2Bgpv9ycq7/kovI/4aAuf91cqr/g3/G/3VysP9/fb//293l/////////////////53H
+        9v9nd5z/IyE+/wBmM/9TuIX/U7iF/wBmM/8bGir/Gh0r/xwbJf8kHh3WKiQkEj4yMP8+NDT/PjY9/z02
+        Of89NDH/PjMv/z8zM/85NUj/l5Xu/7Ww//+0rv3/enjE/1RXm/9kaK//ioS9/1ZUgv9YXHn/aWqG////
+        ///y/v//irbl/3iXxP8AZjP/U7iF/4XruP+F67j/heu4/wBmM/8eFif/JCMz/yUeHdYrJCQSPjIw/z40
+        NP89Nj3/PTY5/z00Mf8+My//PjMv/z01Nf+dm+H/rKn//6yo//+Dgtj/dnjM/6mi9/+wquv/aWWZ/1FP
+        ef9CRGb/RE5m/0hTc/8zOlv/AGYz/1O4hf+F67j/VVeA/1FLav+F67j/heu4/wBmM/8qJjn/JB4c1iom
+        JRE8MzD/PjQ0/z43PP88NTj/PTMz/z4zL/8+My//PjIw/z0zOf9raJ//u7H+/3p6yP9mabT/q6X8/46O
+        3P+Misz/fnu5/19agf8zMEr/NzZW/ygnR/8AZjP/U7iF/1RQgf8AZjP/AGYz/46Dhf+F67j/AGYz/0E5
+        QP8lHRzWLSgnED4yMP89MzP/PTQ+/zw1Ov89NDH/PjMv/z4zL/8+My//PzMx/zwzNv8/P1f/aWaY/29t
+        qP+uqPX/iYjS/42Ixv+KhL//fXey/2Bbgv83MlH/IiJA/zc0W/9LSHr/AGYz/1O4hf9TuIX/AGYz/6ui
+        pf+vp67/lJCW/yUdHNUvKikJPTEv/z0zM/88Mz3/PTM5/z4yMv89MS//PTIu/z0yLv89MS//PjIw/0Az
+        Mf89N0L/bWuf/1tYj/+Ujr3/ioOu/25qpf+AfLf/d3Cb/2BVe/8yMVP/Pjlm/wBmM/9TuIX/heu4/4Xr
+        uP+F67j/AGYz/4d+gf90XFb/Jh4dxQAAAAA9MjD+PTMz/z4zPf89Mzn/PTQx/z4zL/8/MzH/PTMz/z4z
+        Nf8+Mzb/PzM5/0Q3R/9xbp//d3Gi/1RUgv9fXYf/XVyG/21olf9pYoX/WFF2/zo3Xv8AZjP/U7iF/4Xr
+        uP+F67j/heu4/4XruP+F67j/AGYz/yUiO/8pIR+TAAAAADwzLwA6MDDXPjI+/z4zO/8+MzX/PjM1/zwz
+        Nv89Mzn/T12p/1FIYv8/Mzn/PzE1/z8zMf+IgqX/ZGGT/315ov9cWYr/ZGCK/0lCXf9BPFf/TE9r/wBm
+        M/8AZjP/AGYz/wBmM/8AZjP/AGYz/wBmM/8AZjP/HBggeQAAABIAAAAAPjIwAD0zMwA9Mz//PTRB/zYx
+        Rv+NpvD/PzQ8/z80N/8+MzX/PTMz/z8zMf8/MjD/PzMv/0E1Mf9fW4z/VFKA/4N9pv9kXo//UEhx/0M5
+        Xf84M1P/PjRS/zw6Xv9EOmT/KSpQ/y40Y/8rLlT/LS5U/x4bJn0AAAAdAAAAAgAAAAAAAAAAAAAAAD86
+        OXs+OTegPjc2pD43NqQ+ODakPjg2pEE6OaRCOzqkQTs5pEE6OKQ/OTekPzk3pD85N6Q/OTekPzk3pEA5
+        N6RBOTekQTk3pEE5N6RBOTekQTk3pEE5N6RDODekQzg3pEM4N6RCODacAAAAFQAAAAcAAAAAwAAAAIAA
+        AACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAADAAAAA4AAAAOAA
+        AAEoAAAAMAAAAGAAAAABACAAAAAAAAAkAAASCwAAEgsAAAAAAAAAAAAA////AAAAAAAAAAAAAAAABQAA
+        ACwAAABvAAAAlwAAAKMAAACqAAAArAAAAKwAAACsAAAArAAAAKwAAACsAAAArAAAAKwAAACsAAAArAAA
+        AKwAAACsAAAArAAAAKwAAACsAAAArAAAAKwAAACsAAAArAAAAKwAAACsAAAArAAAAKwAAACsAAAArAAA
+        AKwAAACsAAAArAAAAKwAAACsAAAArAAAAKwAAACrAAAApgAAAJMAAABnAAAAMQAAAA0AAAAB////AAAA
+        AAAAAAACAAAAHAIBAWINDAvBEhAQ4xUTEu8VExLvFRMS7xUTEu8VExLvFRIS7xUTEu8VExLvFRIS7xUS
+        Eu8VExLvFhMS7xYTE+8WExPvFhMT7xcUE+8XFBPvFxUU7xgVFO8YFRXvGBYV7xkXFu8ZFxbvGRYW7xgW
+        FO8YFRTvGBUU7xcUE+8YFBPvGBQT7xgUE+8YFBPvGBQT7xgUE+8XExLpEQ8O2wAAALoAAACmAAAAdgAA
+        ADQAAAAK////AAAAAAAAAAAQAAAASRUTE/oUEhH/FBIR/xQSEf8UEhH/FBIR/xQSEf8TEhH/FBIR/xQS
+        Ef8UEhL/FBIS/xQSEv8UEhL/FRMS/xUTE/8VExP/FhMT/xYUFP8WFBT/FhQU/xUTE/8VExL/FRMS/xYU
+        FP8XFRX/FhQU/xgWFf8YFRT/FxUT/xYUE/8WExL/FhMS/xYTEv8WExL/FhMS/xYTEv8WExL/FhMS/xgV
+        E+4EAwPCAAAAqAAAAGwAAAAm////AAAAAAAAAAAlFhQTyxQSEv8UEhL/FBIS/xQSEv8UEhL/FBMS/xUT
+        Ev8VExP/FRMT/xUTE/8VFBP/FRQT/xYUE/8WFBP/FhQT/xUTE/8VExL/FRMS/xYUE/8XFRX/HBoa/yYl
+        JP8tLCz/NTQ0/0JBQf9JSEj/QD8//xcWFf8WFBT/GBUV/xgVFP8XFRT/FxQT/xYUEv8XFBL/FxMS/xcT
+        Ev8XExL/FxMS/xYTEv8YFRT6BgUFxAAAAJcAAABL////AAAAAAIWFBNwFRMS/xUTE/8VExP/FRMT/xYU
+        E/9BQED/4uLi//Dw8P/FxMT//////8TExP8xLy//FRMT/7e3t///////////////////////////////
+        ///Q0ND/SEdH///////////////////////o6Oj/oaGh/0REQ/8vLS3/Hx0d////////////////////
+        ////////t7a1/zQxMP8XFBP/FxQS/xcTEv8XExL/GRUU8gAAAKYAAABe////AAAAAAMYFxb4GBcW/yAf
+        H/8jIiL/KSgn/01MTP/z8/P/t7e3/0lJSP9JSEj/UlJS/87Nzf/MzMz/LCsq/0hHRv//////fXx8/xEU
+        Fv8RFRf/EhYY/xMWGf8UFhn/GRgY//////9SUFD/GBYW/xcVFf+GhoX/8vLy/6moqP8XFRX/GxkY////
+        //93d3b/NzY1/xoXF/80MTH/1NPT/8XFxP8YFRT/GBUU/xcUE/8XExL/FhMS/xYSEdgAAABi////ACol
+        JBoZFBT/GBUU/xgVFf8UFhj/GBUW/6inp//i4uL/GBQT/xkVE/8ZFRT/GRUU/4yKif/FxMT/GBQT/xgU
+        Ev+MiYn/8fHy/0ZDUv8nJTj/Hh0v/xgXJv8ZFBP/GRQT//////9ST03/GBQS/xgUEv8ZFBL/YV5c////
+        //9EQD//GRUU//////9TT0//GhQT/xkUFP8ZFBb/dH6Q//////8ZFRT/GhUS/xoVEv8bFRL/EBAV/xgU
+        E+IAAABi////ACwmJSgYFRT/GBUU/xgVFv8UFhn/GBUX/8XFxf+Lion/GBQT/xkVE/8ZFRP/GRUT/4yK
+        if/FxMT/GBQT/xgUEv8YFBL/1dXY/8rKz/8ZGi3/GBQS/xkUEv8YFBL/GBQS//////9ST03/GBQS/xgU
+        Ev8ZFBL/GRQS//Hw8P9+e3r/GRUV//////9TT07/GRUT/xkUFP8ZFBf/mp+v//Hw8f8ZFBT/GRQS/xkV
+        Ev8ZFRL/GRUT/xgUE+QAAABi////AC0mJSgYFRT/GBUU/xgVFv8TFhn/GBUX/8XExf+MiYn/GBQT/xgU
+        E//////////////////FxMT/GBQS/xgUEv8YExX/UFBi//Hx8/97e4T/GBQS/xgUEv8YFBL/GBQS////
+        //9WVFj/GRcd/xcVGf8WFBT/GRQS/8bExP+Mion/GRQU//////+pp6f/jImJ/4yKif+amJn//////3Bs
+        bv8ZFBT/GRQS/xkVEv8ZFRL/GRUS/xcUE+QAAABi////ACsmJSgYFBP/GBUU/xgVFv8UFhn/GBYY/8XF
+        xf+MiYn/GBQT/xgUE/8YFBP/GBQT/xgUEv8YFBL/GBQS/xgUEv8xMET/JCU7/3t8hf//////QkA+/xgT
+        Ev8YExL/GBQS//////9oZm//NjQ//zYzPv8nJC//Lis0/8nIyv+SkJT/HRog//////+op6f/jIqJ/4yK
+        if/i4uL/2Nng/ygjJf8ZFBT/GRQS/xkVEv8ZFRL/GRUS/xcUEuQAAABi////ACsmJSgYFBP/GBUU/xgV
+        Fv8UFxj/GBYY/8XFxf+amJj/GBQS/xgUE/8YFBL/GBQS/zUxMP9DQD//GBQS/xgUEf8uK0H/HyA1/wsL
+        Ff/CwsT/0tLS/xgTEv8YFBL/Ly08//////9ta3T/QT5F/z46RP84NT//NzM6//////98eX7/KScu////
+        //9SUFb/EQ8W/xkVFP8nIyb/8vL0/3Bsbv8ZFBT/GRUS/xkUEf8aFBH/GRQR/xcTEuQAAABi////ACsm
+        JCgYFBP/GBUU/xgVFv8UFxj/GBYY/5qZmf/i4uL/JiMh/xgUE/8YFBL/GBQS/6inpv/FxMT/GBQS/xgU
+        Ev8nJzz/GBgr/w8PG/8rKjH/8fHy/4qLk/8WExT/NDFG//////9tanX/PjtH/0E9SP8+Okf/nJui////
+        //9JSFb/LCo5//////9WU1v/GBUi/xEOGf8RDxv/5eXo/4yJi/8ZFBP/GhQR/xkUEf8ZFBH/GRQR/xcT
+        EuQAAABi////ACsmJCgYFBP/GBUU/xgVFv8UFxj/GBYY/yYkJP/x8PD/xcTE/zUxMP8mIyH/fXt6////
+        //9gXVz/GBQS/zUxMP9hYHD/V1dm/05PWv9MTFP/p6es//////9IR1L/MC5C//////+BgIn/ZmRy/2Vj
+        cv+xsLj//////3V1gv8cHDH/Fxgq//////+AfoT/VlRc/1BOV/+0tLf//////y0sNf8ZFBP/GhQR/xkU
+        Ef8ZFBH/GRQR/xcUEuQAAABi////ACslJCgYFBP/GBQT/xgVFv8UFxj/GBYY/xcVFf81MjH/qKem/8XE
+        xP/FxMT/xcTE/2BdXP8YFBL/FxMS/25sa//Lys//x8fN/8XFyf/Gxsr/xcXJ/8bGyv9+fYf/JiY8/8XF
+        yv/Gxsr/xcXJ/8nJz/+urbb/WFho/xscMP8ZGiz/Hx4t/8bFyf/Kycz/yMfJ/8XEx/+mpar/QUFT/xAO
+        Gf8ODRX/ExIV/xoUEf8ZExH/GRMR/xcTEuQAAABi////ACslJCgYFBP/GBQT/xgVFv8UFxj/GBYY/xcV
+        Ff8YFBP/GBQS/xgUEv8YExL/GBQS/xgUEv8YFBL/GBQS/xgUEv8qKTr/HR4z/xwcL/8ZGSj/Fhcr/yAg
+        M/84NUj/LSs+/yAfMP8PDx7/DxQg/w8bNv8QGzX/Ehw1/w4XL/8JESX/FRQk/xAQHf8pKDr/Ix8o/xQR
+        Hf8SDxz/EA8i/w8OGv8PDhj/Dw4U/xAOFP8ZExH/GRMR/xcTEuQAAABi////AColJCgYFBP/GBUU/xgV
+        Fv8UFxj/GBUX/xcVFf8YFBP/GBQT/xgUE/8YFBL/GBQS/xgUEv8YFBL/GBQS/xgUEv8cGBv/IyM5/xob
+        L/8fHjP/Hx4z/x8fM/88OUn/LSw+/yAgL/8ICxf/CAoT/xIdO/8PGzf/CxUt/w8YM/8KEyn/CQ0b/wcL
+        F/8tKzv/Hx0o/xUSHP8PDxz/Dg4f/w8OGf8PDhj/Dw4V/xAPFf8YExL/GRMR/xcTEuQAAABi////ACsm
+        JCgYFRT/GBUU/xgWFv8UFxn/GBYY/xcVFf8YFBP/GBQT/xgUEv8YFBL/GBQS/xgUEv8YFBL/GBQS/xgU
+        Ev8YFBL/IiIz/yAgN/8dHTH/Hx4z/x0eMf82M0b/JyY8/xsbKv8IChP/HyEo/xMbMP8OFzD/Dxgy/xEZ
+        NP8KEyf/CAsY/wgKFP8gHS3/IyAs/xgTHP8ODxz/Dw0c/xAOGv8PDRj/Dw4V/w4OFP8ZExH/GRMR/xcT
+        EuQAAABi////ADcwLiBANzT/QDc0/0A5PP81PkL/QTtA/0A7Ov9ANzT/QTYy/0E2Mv9BNjL/QTYy/0E2
+        Mv9BNzD/QTUz/0A1Mf9ANTH/QDUx/0A1Mf9MSmD/UFCG/19cjf+Dfrv/S0yI/zw+Zv9bYnb/eYam/3+L
+        p/84Pmv/eYWd/zxDXP9yfZH/NzZQ/xoaKv8kJDz/a2OC/z8xTf8eMVL/KCRI/y4oR/8rJkH/JyQ0/ykn
+        M/9ENC3/RDQt/yUfHdYAAABi////ADYwLiBANzT/QDc0/0A5PP81PkL/QTtA/z45OP9CNjT/QTYy/0E2
+        Mv9BNjL/QTYy/0E2Mv9BNTP/QTUz/0E1M/9BNTP/QTUz/0E2Mv9BNTP/QTYy/6igyf93dbH/bWuZ/yor
+        Uf+Nnbr/aHOl/zI1Yv8mQJT/gYyn/yY5cv+LnLH/NTlW/xMYLf8bHjr/cWqN/zUrSf8bSWj/MSdL/zMr
+        Sv8yKUP/Lig5/ycmMP9FNi3/Ly44/yUfHdYAAABi////ADgwLiBCNjT/QTg1/0A5PP82P0P/QTtA/z86
+        Of9CNjT/Qjcz/0I3M/9CNzP/Qjcz/0E3N/9BOTr/Qjc6/0I3Of9CNzn/Qzc3/0E3N/9DNzf/T0Za/46I
+        uf9ZWZn/WFaE/xkgS/93hrT/FRpB/xUZPP8wRrb/NEWI/ylHlP+Cj6n/LTBM/xQWLv8WGjP/fXah/zgs
+        SP9IhaX/KyVI/y8nRf8xKUD/KSY2/yknLf8uLTf/ODc7/yUeHdYAAABi////ADkxMCBDNzX/Qjk2/0E7
+        PP84PkP/Qj0//0I6Ov9DODT/QjY0/0I3M/9CNjT/QTc3/0E2QP9CNFD/QjZI/0I3R/89MU3/Qjc//0I3
+        P/9CNkL/fnm2/1pcov9YU6L/aWDY/39+7P9JTJb/GBxF/xcZN/8VFy//HCFI/xYbPP9gaX3/FRcp/xAS
+        Kv8UFij/l4+4/0EyTv90tt//LSdG/y4nQv8vKD3/Kic3/ysqNP8oKDb/JiEw/yUeHNYAAABi////ADky
+        MCBBODT/QTg1/0A5PP84PkP/QTtA/z86Of9BODX/Qjcz/0I3M/9ANzT/QjY8/0E2Rv98l+3/PDRc/4zG
+        //9ANVX/NCtq/2pl2P+DgO7/b3HF/1ZVgf8wOGD/gIyu/1BVhv9OWIf/bnia/zA1Tv8WGS7/KCw3/xsc
+        Kv8VFiT/Fxgm/xYXJf8WFyX/mpG8/zsxT/+Oyf//LSlG/zEoQv8tJjv/LSw2/yUaLv8rKjT/KCU0/yUe
+        HNYAAABi////ADkxMCBCNjT/QTg1/0A6O/83PUL/QTtA/z86Of9CNjT/Qjcz/0I3M/9BODX/QDc6/0M5
+        Sv98y/b/cXvn/zMwZ/9CNFD/QTdE/4R+rf9uaKP/OTZd/xonVf+PnbP/hJO6/xkYOP+Ro8j/hZCu/2Ns
+        gP8YFSv/FRIi/ygpN/8gISv/Gh0l/yUoLf8lKC3/lY65/zovT/+VvP//LipH/zAnQf8nIzb/LS44/yAY
+        Kf8lGyz/JSMv/yQeHNYAAABi////ADcvLiBBNTP/QTg1/0E6Pf83PUL/QTw+/z46Of8/OTT/QjY2/0I3
+        M/9DODT/Qjc5/0I4Rf8vO13/X6XN/3hwtv9CN0f/Tkl2/zs2Xf8tLE7/IiA+/zM7Wf82SY3/ISdo/4WU
+        tP+fsdD/jZ20/0tVZ/8VEiv/hJGp/3uHmf9haHz/NjhQ/xUPGv8WDxz/YV+J/z8yUv+Op///KypE/y4m
+        Pf8qJDX/MjA2/x4XJv8cFif/Ixou/yQeHNYAAABi////ADYuLSBBNjL/QDc0/0A5PP81PkL/QTw+/z86
+        Of9CNjT/Qjcz/0I3M/9CNzP/QTg1/0I4OP9CNz//QDZC/0A3Qf9DOED/WliC/zEyTv8iIUP/IyxS/y9P
+        m/82Uqb/L0uf/ytGlv8rPnf/fYqq/x0mUv8dJlH/lqW4/4SOn/9jan3/MjZS/xkSJ/8jJTD/Ukpp/z8w
+        UP9+k/b/NjRI/y0oPf8jIC//Hhcm/xwWJ/8bFSj/Hxks/yQeHNYAAABi////ADUtLCA/NjL/QDc0/z85
+        Ov82PEH/QDo//z45OP9BNTP/QTYy/0E2Mv9BNjL/QTUz/0I2NP9CNjb/QTY4/0E2OP9BNjj/goG//2dk
+        kf8vL1P/Gx1A/yE2bf8lQIr/J0ie/zdcuP8xTZr/LEaS/y9Lkv8wTpX/L0N9/x8pUf9cZHX/Jys9/yYr
+        Ov9mYIn/QzdL/0IzUv98i+f/Mi5B/yglNf8hICr/GRQj/xsYKP8ZFSj/Hxks/yQfHNYAAABi////ADUt
+        LCBANDL/PzYz/z84O/80PUH/QDo//z45OP9BNTP/QTYy/0E2Mv9BNjL/QTYy/0E2Mv9BNTP/QTUz/0E1
+        M/9CNjT/VVuQ/6Kc4/+Ph7z/NTZY/xofRv8dMGn/GC5i/yE/hv8nRI7/JkWQ/yhDhv8tRoz/JEF+/xwt
+        YP8VGjv/FhQx/xoYNf9aV4T/QTNL/z0wUP97hdP/NCtG/yMgL/8eICv/GhQl/xgUJ/8ZFSj/GhYp/yQe
+        HNYAAABi////ADUtLCBANDL/PzYz/z84O/80PUH/QDo//z45OP9ANzT/QTYy/0E1M/9BNjL/QTUz/0E2
+        Mv9BNjL/QTYy/0E1M/9CNjT/YWKe/2xytf+VkuH/mpPc/4J+wP9eWJH/XFeE/0pEZ/87NFn/MzJZ/yw0
+        Wf8pK0n/KCZD/yonQP88NlX/Uk5y/0Q9Xv89Mkz/OC5M/y4mS/9kZqz/MSlI/x0dLf8ZGij/GRkp/xoU
+        Jf8aFin/FxMm/yMeHNYAAABi////ADUtKyA/MzH/PjUy/z02Of80Oj//Pzk+/zw2N/8+NTL/PzMx/01F
+        Rv9aV1n/WFFW/0AyM/8/MzH/QDUx/0E1M/9EOzj/cm+d/253wf9UXp7/h4nQ/5CN3P+Oitb/g4PP/4SC
+        yP+Cf8T/cm+t/3t2rf9SV5T/Y2KU/1tYiv9OSXD/REBk/zw0U/85MEv/MixL/y8oTf9RS4b/MSlH/yUi
+        Mv8XGSv/HR0v/xwaLf8ZFSj/GRkp/yMeHNYAAABi////ADMtKiA9NDH/PTQx/z02Of80Oj//Pzg9/zw3
+        Nv8+NTL/PzMx/6yhqf/Zz9X/zsfM/8O2uP+ZjJT/eHKb/2Nehf9CQ1j/Z2qW/8zX///h5///ZHS3/2Bn
+        rP9MUo3/V12g/291vP9vdbb/Y2il/1lgn/9HUI//UVWP/1BRi/9NTH7/Pz1n/zYwU/8xL0z/NzNW/zwy
+        Vv9ANGj/Oi5M/ykmNv8XFyn/GRkp/xoaLP8YFin/Ghoq/yQeHNYAAABi////ADQsKyA9NDH/PjUy/z03
+        OP82Oj//QDk+/z42Nv89NDH/PzMx/0E0Mv/m297/4tbc/9PGyP+YkMX/fnyq/1tZh/9iYYn////+////
+        ////////laPY/25zuP9fZbD/b3XC/21yqf+XrMz/d4PJ/15ll/9WXY//X2Sj/1Zalf9BQW//QENv/0lJ
+        ef9RTnv/LS1R/zEsWf87MGL/Ny5J/yMiMv8aGiz/FhYm/xsaKv8XFyf/GBgo/yQeHNYAAABi////ADQt
+        KiA/MzH/PjQ0/z83OP81OT7/Pzg9/z42Nv8/MzH/PzMx/0M0Mv/Ju73/383O/5iSx/+emNH/fHu5/2Fg
+        jP9VVnD///////////96g7z/lZTY/291vv9ycr7/e37C/1dtkP/////////+//////+FiL//XWOO/1Na
+        jP9QUoj/Mztq/y4xXv80M1v/MS5V/zQuV/87MVv/PDBO/xkYLP8WGCr/Fxcn/xsaKv8XFyf/GBgm/yQe
+        HNYAAABi////ADQsKiA/MzH/PjUy/zw2N/81OED/Pjg9/zs1Nv8/MzH/PjMv/z8zMf9ANDL/ybu9/4+K
+        wf+UkNH/ZWGS/1NVhf9iZpv/c3e4/4yOzv+FgcL/eHW9/3Z1vf9tbrL/iIfH/3mEn///////////////
+        /////////f7//2Nvn/9BSW7/MzRW/yYnSf8qKEz/LCtV/yssWP8wKlP/NSpE/xcXKf8WFij/Fxcn/xwZ
+        KP8aGij/GBol/yQeHdYAAABi////ADMsKiA9NDH/PTMz/z03OP81OED/PTc8/zs1Nv89NDH/PjIw/z4y
+        MP89MzP/PTU2/5GOxf9wb7n/QkZ2/09Vfv9rbJ7/gH2v/29spP95dLH/gH/D/3h3u/9mZaP/fXy+/2Vq
+        kf///////////////v///////////+j///+Nq9r/ODpd/yAiQf8gID7/JyZG/ygnU/8rJ1D/LCdE/xgY
+        Kv8YGCj/GBgo/xcXJ/8UFCL/GRgh/yQeHdYAAABi////ADMrKiA+MjD/PTQx/zw1OP80Nz//Pjc8/z01
+        Nv89MzP/PjMv/z4zL/89MzP/PTM5/7iz+P+qpvj/rKb9/8i+///Gu/n/jYnK/2hprf9eXZ3/eXrE/29v
+        q/9rZ6L/T06A/1lZd/9vc6T///7//////////////////+j///+NseH/fp/M/5i14f8dHjr/HR8+/x0f
+        T/8fHkb/HyA6/xcXKf8ZGSn/Gxst/xsWJf8iGiv/JiU1/yQeHdYAAABi////ADQrKSA+MjD/PTQx/zw1
+        OP80Nz//PTY7/z01Nv8/MzH/PjMv/z4zL/89MzP/PTQ3/3l2rv+mn/T/sqz+/56d/f+mofz/f37O/0pU
+        of9xcMD/Y2e2/6Sc4v+Igbr/ZmOU/0hIbP9WW3z/UlJk/2dtgP/6/v//6f7//7Lt/P9jg67/ISpL/w4Y
+        Nv8bHTv/Ih09/yoqWv8jIUX/AGYz/wBmM/8WGiz/Gxst/xoUJf8eHiz/ICAw/yUeHdYAAABi////ADQq
+        KiA+MjD/PTQx/zw1OP80Nz//PTY7/z01Nv89NDH/PjMv/z4zL/88MzD/PTI0/z0yQv+Uj97/q6X+/6Wh
+        //+qpv//g4LY/2Fls/+LiuD/o6D2/8O79/+km97/bWmd/1RSfP9ERGj/RUls/0hNYv9EUWf/QlBs/0FP
+        c/82P2D/JSZC/x8dO/8dGzn/MStO/0NJdv8AZjP/U7iF/1O4hf8AZjP/OTE8/yUhLf8gGiv/Ih4x/yQe
+        HNYAAABi////ADMqKSA5Mi//PDMw/z41OP80Nz//PTY7/zw0Nf8+MjD/PjMv/z4zL/8+My//PjIw/z4z
+        Nv9SSV7/nJXY/7qy//+3sf7/iYri/1thtP+AgMz/pJ/0/5SV8P+po/D/l4/O/3VvpP9taZ3/RURu/zQ2
+        VP8zOlv/LzdV/y8yUf8oKFD/Ly5V/zQzWv8wLE//MjFZ/wBmM/9TuIX/heu4/4XruP+F67j/AGYz/19Z
+        Xv8sIy3/Ih4x/yUeHNYAAABi////ADMsKh88MzD/PTMz/zw1OP81NkD/PTY7/zw0Nf8+MjD/PjMv/z4z
+        L/8+My//PjMv/z8zMf8/Mjr/XVl2/6ae3/+0rPL/fHvD/2dqtf+Jhs7/sav6/5yZ7v+Oi9P/jYvN/4WD
+        xf97ebv/cGaQ/0tGZv80L0r/MTJO/zAuTP8fHj7/OTdb/0Q/Zv9DP2n/AGYz/1O4hf+F67j/S0Zm/0I8
+        W/+F67j/heu4/wBmM/+GhYf/R0JE/yUdHNYAAABi////ADUtLB4+MjD/PTMz/z00N/82NT7/PTU8/zw0
+        Nf89NDH/PjMv/z4zL/8+My//PjMv/z4yMP8/MzH/PTM5/z0yQv+VjLf/bmuj/2trp/9naar/q6X0/6Wg
+        7/+NidH/i4fI/4iGwv+DgL7/fXu3/3lxmv9STW3/MyxN/ysnRP8kIUH/NC9O/0dCb/9LSHn/AGYz/1O4
+        hf93dKL/AGYz/wBmM/+0q67/heu4/wBmM/+loab/mJmd/yUdHNUAAABe////ADYvLR48MzD/PDIy/zwy
+        OP81ND7/PDQ7/zw0Nf8+MjD/PTEv/z0yLv89Mi7/PTIu/z0yLv89MS//PjIw/z00Mf8/MzP/ZWaM/2Zk
+        kv9kYZj/X1+N/52a0v+Mh8X/lY3C/4B8t/95d7P/fnuy/3txn/9vZo7/TEVo/zgxVP8mJUf/Ozpi/0tI
+        ef9KSHz/YWGh/4jK8/8AZjP/U7iF/1O4hf8AZjP/saet/66gpP+hlpn/al9h/yUdHNMAAABU////ADcw
+        LRI6NC//PDMw/zwyOP81Mz//PTI6/zw0Nf8+MjD/PTEv/z0xL/89MS//PTEv/z0yLv8+MjD/PjIw/z8z
+        Mf89MzP/PTMz/2Fhkf9fXJT/TU6I/1ZYgf+Xj7j/jIOr/3t3qP9xbaj/f3u2/4B6r/94bpz/Z1+E/0Q9
+        YP8tK0//Pjhh/0E6Zf85Omz/VFaW/wBmM/9TuIX/heu4/4XruP+F67j/AGYz/5mOlv9uYGT/d11W/ycf
+        HcIAAAA5////ADwzMAA9MjD+PTMz/zwyOP81Mz//PjM7/zw0Nf8+MjD/PjQt/z40Lf8+MjD/PzMx/z00
+        Mf89MzP/PjM1/z4zNf8+Mzb/PjM2/zsyRv9+eKn/bWmd/15ckP9UV4T/aGaK/11chP9jX5D/a2ia/4iB
+        rv9mXof/WFB1/05EaP82MVj/OTRb/zg0WP8xNWb/AGYz/1O4hf+F67j/heu4/4XruP+F67j/heu4/wBm
+        M/9cS07/JyU7/yohIJEAAAAU////AD4yMAA7MS/rPTMz/zwyOP83MkH/PjM9/zwzNv89MjT/PTMz/z0z
+        M/89MjT/PDM2/zwzNv8/Mzn/OjBA/19txf+Iisr/QjQ//z8yNP9/epn/dHCh/15bjf9WV4r/cnCa/1xb
+        jf9ZV4v/VlSC/1pZef9aWHX/SEll/zo3V/9IQGn/UkVl/zAsUP8sKlT/AGYz/wBmM/8AZjP/AGYz/wBm
+        M/8AZjP/AGYz/wBmM/8mJT//JSQ+/y0kIkEAAAAC////ADwzLwA+MjAAOjEx1jwzNv8zM0H/PDI+/z0z
+        Of88Mzb/PDM2/zwzNv89Mzn/Ni9E/3eN5f97dqn/PzU7/z4zNv8/NDf/QDM1/z8zM/8/MjD/hX6p/4F7
+        pP9uaZz/ameY/3l2pP9hXY7/Y16L/2JbgP9EP1//OTRT/zw1Vv89QVn/T0lc/0k9Wf9MQVv/RkJb/3N/
+        3/88OFX/REFX/0VCWP9APVP/ICJA/yQjQ/8pJ0X+LCY0TQAAAAIAAAAA////AD4yMAA+MjAAPTMzAD0z
+        Of82M0L/PTRB/z0zP/88Mz3/fISp/3WX4/8yLUj/PDI4/z4yOP8+Mzb/PjM1/z0zM/8/MzP/PzMx/z8y
+        MP8/My//PTMz/1tahv9iXZD/W1mH/3Rvlv90b6L/Y16R/1ZTgf9JQWn/QTpb/zw1Vv85NFT/OzZR/zw2
+        T/9CQF7/SD1d/15cvP8kJUv/JCdN/yYtVP8oKkz/KixL/y8tS/czMEFIOjpiAAAAAAAAAAAA////AD4y
+        MAA+MjAAPTQxAD42OTM4NkC4eYii1lx3qNY6NUPWQTY81j41OtY/NjfWPzY21j82NtZCNjbWQTc11kE2
+        NNZBNjTWQTYz1kE2MtZANjLWQTcz1kA3MtZVUmbWU1Bt1ktJZtZnX3vWc2yD1mZfd9ZcUG/WRTxW1jw1
+        TdY6NErWODJH1j83TNZCOVDWQjpT1jo1c9YtLEjWPD5j1j4+YdY/PmHWQj9hz0FAbABFRHAAQUBsAAAA
+        AAAAAAAA////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP//
+        /wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP//
+        /wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP//
+        /wD///8A////AP///wD///8A4AAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAACAAAAAAAAAAIAA
+        AAAAAAAAgAAAAAAAAACAAAAAAAAAAIAAAAAAAAAAgAAAAAAAAACAAAAAAAAAAIAAAAAAAAAAgAAAAAAA
+        AACAAAAAAAAAAIAAAAAAAAAAgAAAAAAAAACAAAAAAAAAAIAAAAAAAAAAgAAAAAAAAACAAAAAAAAAAIAA
+        AAAAAAAAgAAAAAAAAACAAAAAAAAAAIAAAAAAAAAAgAAAAAAAAACAAAAAAAAAAIAAAAAAAAAAgAAAAAAA
+        AACAAAAAAAAAAIAAAAAAAAAAgAAAAAAAAACAAAAAAAAAAIAAAAAAAAAAgAAAAAAAAACAAAAAAAAAAIAA
+        AAAAAAAAgAAAAAAAAACAAAAAAAAAAIAAAAAAAAAAgAAAAAAAAACAAAAAAAAAAIAAAAAAAAAAwAAAAAAA
+        AADAAAAAAAAAAOAAAAAAAQAA8AAAAAAHAADwAAAAAB8AAP///////wAAKAAAAEAAAACAAAAAAQAgAAAA
+        AAAAQAAAEgsAABILAAAAAAAAAAAAAP///wD///8AAAAAAAAAAAAAAAAAAAAAAwAAABIAAAAqAAAAQwAA
+        AFcAAABlAAAAaQAAAGkAAABpAAAAaQAAAGkAAABpAAAAaQAAAGkAAABpAAAAaQAAAGkAAABpAAAAaQAA
+        AGkAAABpAAAAaQAAAGkAAABpAAAAaQAAAGkAAABpAAAAaQAAAGkAAABpAAAAaQAAAGkAAABpAAAAaQAA
+        AGkAAABpAAAAaQAAAGkAAABpAAAAaQAAAGkAAABpAAAAaQAAAGkAAABpAAAAaQAAAGkAAABpAAAAaQAA
+        AGkAAABnAAAAXgAAAE0AAAA3AAAAHQAAAAgAAAABAAAAAAAAAAD///8A////AAAAAAAAAAAAAAAABQAA
+        AB4AAABMAAAAfAAAAJcAAACjAAAAqgAAAKwAAACsAAAArAAAAKwAAACsAAAArAAAAKwAAACsAAAArAAA
+        AKwAAACsAAAArAAAAKwAAACsAAAArAAAAKwAAACsAAAArAAAAKwAAACsAAAArAAAAKwAAACsAAAArAAA
+        AKwAAACsAAAArAAAAKwAAACsAAAArAAAAKwAAACsAAAArAAAAKwAAACsAAAArAAAAKwAAACsAAAArAAA
+        AKwAAACsAAAArAAAAKwAAACsAAAAqwAAAKYAAACeAAAAiwAAAGQAAAAxAAAADQAAAAEAAAAA////AP//
+        /wAAAAAAAAAAAgAAABwAAABXAQEBlgwLC8wSEBDjFRMT7xUTEu8VExLvFRMS7xUTEu8VExLvFRMS7xUS
+        Eu8VExLvFRMS7xUTEu8VEhLvFRIS7xUSEu8VExLvFhMS7xYTEu8WExPvFhMT7xYTE+8XFBPvFxQT7xcU
+        E+8XFRTvGBUU7xgVFO8YFRXvGBYV7xkWFu8ZFxbvGRcW7xkWFu8ZFhXvGBYU7xgVFO8YFRTvFxQT7xcU
+        E+8YFBPvGBQT7xgUE+8YFBPvGBQT7xgUE+8YFBPvGBQT7xcTEukRDw7bBwYFyAAAALoAAACmAAAAdgAA
+        ADQAAAAKAAAAAP///wD///8AAAAAAAAAAAwAAABCEQ8PvRUTE/wUEhH/FBIR/xQSEf8UEhH/FBIR/xQS
+        Ef8UEhH/FBIR/xMSEf8UEhH/FBIR/xQSEf8UEhL/FBIS/xQSEv8UEhL/FBIS/xUTEv8VExP/FRMT/xUT
+        E/8WExP/FhQT/xYUFP8WFBT/FhQU/xYUE/8VExP/FRMS/xUTEv8VExP/FhQU/xcVFf8WFBT/FxUU/xgW
+        Ff8YFRT/FxUT/xcUE/8WFBP/FhMS/xYTEv8WExL/FhMS/xYTEv8WExL/FhMS/xYTEv8WExL/FhMS/xYT
+        Ev8YFRPuBAMDwgAAAKgAAABpAAAAHwAAAAH///8A////AAAAAAAAAAAdFxQUxRQSEv8UEhL/FBIS/xQS
+        Ev8UEhL/FBIS/xQSEv8UExL/FRMS/xUTEv8VExP/FRMT/xUTE/8VExP/FRQT/xUUE/8WFBP/FhQT/xYU
+        E/8WFBP/FRMT/xUTE/8VExL/FRMS/xUTEv8WFBP/FxUV/xwaGv8hIB//JiUk/y0sLP81NDT/PT08/0JB
+        Qf9JSEj/QD8//yclJf8XFhX/FhQU/xgVFf8YFhX/GBUU/xcVFP8XFBP/FhQT/xYUEv8XFBL/FxMS/xcT
+        Ev8XExL/FxMS/xcTEv8XExL/FhMS/xgVFPoGBQXEAAAAjwAAADsAAAAI////AP///wAAAAAAFxUUahUT
+        Ev8VExP/FRMT/xUTE/8VExP/FRQT/xYUE/8WFBT/FhQU/0VDQ/9UU1L/VFJS/1NSUv8kIiL/FBIR/xQS
+        Ef8VExP/NjQ0/1dVVf9YV1f/W1pa/11cXP9hYF//ZGNj/2ppaf9vbm7/c3Jy/1FQUP9IR0f/YGBg/3Z2
+        dv9zcnL/b25u/2loaP9jYmH/SUhI/0RDQ/9HRkb/RERD/y8tLf8fHR3/NjU0/1RTUv9WVFP/VlRT/1ZU
+        U/9VU1L/RkNC/xcUE/8XFBP/FxQT/xcUE/8XFBL/FxMS/xcTEv8XExL/GRUU8gAAAKAAAABSAAAAEf//
+        /wD///8AAAAAAhsZGNQWFRT/FxUV/xcVFf8XFRT/FhQU/xUTE/8UExL/REJC/+Dg4P//////0dHR/8TD
+        w////////////6Ghof9JSUj/Q0NC/52cnP//////////////////////////////////////////////
+        //9dXFz/Hx0d/4WEhP////////////////////////////////+dnZ3/KScm/yclJf81NDT/RURE/5yb
+        m//////////////////////////////////g4OD/ZWNi/xgVE/8YFBP/FxQT/xcUE/8XFBL/FxMS/xcT
+        Ev8JCAe3AAAAXgAAABf///8A////AAAAAAMYFxb4GBcW/x0bG/8gHx//IyIi/ykoJ/8vLi7/Tk5O//Ly
+        8v/Z2dn/a2tr/0lJSP9JSEj/R0ZG/5qamf//////ra2t/ywrKv80MjL/4eHh/+Hg4P8oJiX/FhYW/xEU
+        Fv8RFRf/EhYY/xMWGf8TFhn/FBYZ/xkYGP+EgoL//////xgWFf8YFhb/GRcX/yYlJP+Yl5f//////9HQ
+        0P8ZFxb/FxUV/xsZGP+Pjo7//////0lJSf83NjX/JSMi/xoXF/82MzP/0dDQ//////83NTT/GBUU/xgV
+        FP8XFBP/FxQT/xcTEv8WExL/FhIR2AAAAGIAAAAZ////AP///wApJSMZGRUU/xwZGP8cGRn/GhYW/yAo
+        Lf8dICX/GRYV/7Kxsf//////R0RD/xkVFP8ZFRT/GRUU/xkVFP8YFRP/wcDA/8HAwP8YFBP/GBQT/1VS
+        Uf//////l5ee/yIiNP8oJzf/JCM0/x8eL/8bGij/GBYg/xgUFf8YFBL/hIKB//////8ZFBL/GRQS/xgU
+        Ev8YFBL/GxcV/3Zzcv//////hIKB/xkVE/8YFBL/h4SL//////8ZFBL/GxYV/xwXFv8cGBj/GhUV/0BD
+        T///////hIGB/xoVFP8aFRP/GhUS/xoVEv8ZFRP/EREV/xgWGvAAAABiAAAAGf///wD///8ALCYlKBgU
+        FP8YFRT/GBUV/xcTFP8eJyz/HB4k/xcUFP//////o6Gh/xgUE/8ZFRP/GRUT/xkVE/8ZFRP/GRUT/8LA
+        wP/BwMD/GBQT/xgUEv8YFBL/k5KS//////9jYnD/Kik+/x4eMv8WFSD/FxMU/xgUEv8YFBL/GBQS/4SC
+        gf//////GBQR/xgUEf8YFBH/GRQS/xkUEv8ZFBL/wsDA//Dv7/8ZFBP/GBQR/4eFjf//////GBMR/xkU
+        E/8ZFBP/GRQU/xcSE/8kKTj//////4SBgf8ZFBT/GhQS/xoVEv8aFRL/GhUS/xYUFP8ZFxzyAAAAYgAA
+        ABn///8A////ACwmJSgYFRT/GBUU/xgVFf8XExT/Hict/xwfJf9VU1P//////4SCgf8YFBP/GRQT/xkV
+        E/8ZFRP/GRUT/xkVE//CwMD/wcDA/xgUE/8YFBL/GBMR/yckJf/i4uT/4+Pl/zMzR/8WFyn/FRIU/xkU
+        Ef8YFBL/GBQS/xgUEv+EgYD//////xcTEv8XExL/FxMS/xcTEf8YFBH/GBQR/4SCgP//////R0NC/xgT
+        Ef+IhY///////xgTEf8ZFBP/GRQT/xkUFP8XExT/X2Nw//////+EgYH/GhQU/xoUEv8ZFBL/GRUS/xoV
+        Ev8aFRL/Hxwc8gAAAGIAAAAZ////AP///wAsJiUoGBQT/xgUE/8YFRX/FxMU/x4oLf8bHyX/VVJT////
+        //9WU1L/GBQT/xgUE/9GQ0L/wcDA/8HAwP/BwMD/8O/v/8HAwP8YFBL/GBQS/xcTEf8iICn/YmJx////
+        //+VlZ7/EREd/xYSEv8YFBL/GBQS/xgUEv8YExH/hYOD//////8nJCv/JiQq/yQiKf8eGyH/FxQX/xkW
+        F/9YVVb//////1ZTU/8XExH/iIWO//////8YFBD/GRQT/xkUE/8oJCT/dHJz//Hx8v/w8PD/KCMj/xkU
+        E/8ZFBL/GRUS/xkVEv8ZFRL/GRQR/yQeGvIAAABiAAAAGf///wD///8AKyYlKBgUE/8YFBP/GBUV/xcT
+        FP8eKC3/HB8l/1VSU///////VlNS/xgUE/8YFBP/KCQi/1ZTUv9WU1L/VlNS/1ZTUv9GQ0L/GBQS/xcT
+        Ef8dGRz/Ly1B/ygnPv+WlqD//////05NUv8TEBL/GBQS/xgTEv8XExH/GhYV/5CPlP//////NjM//zYz
+        P/80MT3/Mi86/yckL/8rKDH/YmBn//////9cWl//HBkf/4WDiP//////////////////////////////
+        ///U1dr/SkdO/xkUFP8ZFBP/GRQS/xkVEv8ZFRL/GRUS/xkUEv8kHRnyAAAAYgAAABn///8A////ACsm
+        JSgYFBP/GBUU/xgVFf8XExT/Higt/xwfJf9VU1P//////1ZTUv8YFBP/GBQT/xgUE/8YFBP/GBQS/xgU
+        Ev8YFBL/GBQS/xgUEv8WEg//IR4n/y8uRP8kJTr/JCQz/9/f3//f3t//Hhwi/xUSE/8YExL/FhIP/yYj
+        Kv+VlJv//////zs4RP87OEP/OjdC/zo3Qv82Mz3/NDA5/3h2e///////YmBm/yYkLP+Jh4z//////1RS
+        WP9RUFT/VVJS/3Vycv/R0NH/8fHz/0lGTf8ZFBT/GRQT/xkUEv8ZFRH/GRQR/xoUEf8aFBH/JBwZ8gAA
+        AGIAAAAZ////AP///wArJiUoGBQT/xgVFP8YFRX/FxMU/x4oLf8cHyX/VVNT//////+EgoH/GBQT/xgU
+        E/8YFBP/GBQS/xgUEv8YFBL/GBQS/xgUEv8YFBL/FxIQ/x8dJP8qKT//Hh8z/xMTIf9NTVH//////5KR
+        l/8XFyb/Eg8T/xwYF/8sKjv/jo2Y//////8/O0f/PztG/z47Rf8+O0X/OjdC/zk2Qf+Ylpv//////0tI
+        Uv8sKTT/jIqP//////8cGSH/FRMd/xIQGP8VEhb/KCUp//Hx8/+zsbT/GRQU/xkUE/8aFBL/GhQR/xoU
+        Ef8ZFBH/GRQR/yQcGfIAAABiAAAAGf///wD///8AKyYkKBgUE/8YFRT/GBUV/xcUFP8eKC3/HB8l/xcU
+        Ff//////srGw/xgUE/8YFBP/GBQT/xgUE/8YFBP/GBQS/+Dg3//BwMD/GBQS/xcTEP8dGx//Jyc8/x0e
+        Mv8UFCP/Dg0V/46Nkf//////WVlo/xAQHv8eHCL/ODZI/4mJlv//////OzhG/z47R/8+O0f/PjpH/zo3
+        Rf82M0T/5OTm/+Pj5v8qKTv/Kyk5/42Mlf//////Hhsj/xkXI/8XFSH/EQ8Z/xISHf/Fx87/wsDC/xoU
+        FP8aFBP/GhQR/xkUEf8ZFBH/GRQR/xkUEf8kHBnyAAAAYgAAABn///8A////ACsmJCgYFBP/GBUU/xgV
+        Ff8XFBT/Higs/xwfJf8XFBT/o6Gh//////9WUlL/GBQT/xgUEv8YFBL/GBQS/1VSUf//////hIGB/xgU
+        Ev8XExD/HBke/ykpPv8gITb/Fhco/w8PGv8hICr/4ODi/+Hh4/8nKDn/IiIw/zUzRv+Hh5T//////yIh
+        Mv8yMUT/NTNG/zIwRP8tLED/qamx//////9ra3n/HBwx/xoaK/+FhY///////x4bJv8dGiT/Ghgk/xIQ
+        G/8hIi3/4uPm/7+/w/8TERb/GRQT/xoUEf8aFBH/GRQR/xkUEf8ZExH/JBwZ8gAAAGIAAAAZ////AP//
+        /wArJSQoGBQT/xgUE/8YFRX/FxMU/x4oLP8cHyX/FxQU/yckJP/R0ND/8O/v/3Rycf8nIyL/JyMi/3Ry
+        cf/w7+//4ODf/ycjIv8XExL/JiIg/1dVV/9jYnD/XV1t/1ZWZP9SUlv/VVVg/4SDi///////lJWd/ycm
+        Of8qKj//h4eS//////9XV2L/V1hl/2Bgcf9xcYD/xcXL//////+lpq7/Ghot/xYXKf8ZGir/hoWN////
+        //9hX2j/XFph/1hXX/9hYGf/wMDE//////9fXmf/Dw0Y/xEPFf8UEhT/FxMS/xoUEf8ZExH/GRMR/yQc
+        GfIAAABiAAAAGf///wD///8AKyUkKBgUE/8YFBP/FxUV/xcTFP8eKCz/HB8l/xcUFP8YFRT/JyQj/6Oh
+        oP//////////////////////oqGg/ycjIv8YFBL/FxMS/1VSUf//////////////////////////////
+        //////////////////8wLkD/LSxB/4iIk////////////////////////////7a2vv9tbXv/IiI2/xcZ
+        Lf8KECT/Fxgp/4WFjP///////////////////////////8HBxP9rb4H/Dw0a/xAOGf8PDhf/Dw4U/xIP
+        FP8WEhP/GRMQ/xkTEf8jHBnyAAAAYgAAABn///8A////AColJCgYFBP/GBQT/xcVFf8XExT/Higs/xwf
+        Jf8XFBT/GBUU/xgUE/8YFBP/GBQS/xgUEv8YFBL/GBQS/xgUEv8YFBL/GBQS/xgUEv8XExL/FxMS/ycl
+        NP8kJDr/Ghsv/xoaLP8aGiv/GBks/xobL/8gIDP/NTNE/zAuQf8hITT/HR0s/w4PHP8JDRv/Dxo0/xAa
+        Nf8RGjP/FBw0/xQaMv8MFSv/CBAl/w0QIf8PEB7/Cw4b/yEhMf8mIy7/GRYg/xMPGv8WFyX/ICRA/w4M
+        Gf8QDhn/Dw0Y/w8NFf8RDhT/ERAU/xkTEf8ZExD/IxwZ8gAAAGIAAAAZ////AP///wArJSQoGBQT/xgV
+        E/8YFRX/FxMU/x4oLP8cHyX/FxQU/xgVFP8YFBP/GBQT/xgUE/8YFBP/GBQS/xgUEv8YFBL/GBQS/xgU
+        Ev8YFBL/GBQS/xcSEP8iICr/KCg+/xwdMf8dHTH/HR4y/x4eM/8gIDX/JCM3/zo3SP8vLUD/IiE1/xcY
+        Jv8IChb/CQsX/xEbN/8QHDr/Dhk1/wwWL/8OGDL/DRcv/woTJ/8IDh7/CAsY/wYJFP8fHy3/JSIu/xcU
+        HP8TDxr/Fhgn/x4iPf8OCxn/Dw4Z/w8NF/8PDRX/EA4U/xEQFf8YExL/GRMQ/yQcGfIAAABiAAAAGf//
+        /wD///8AKyUkKBgUE/8YFRT/GBUV/xcUFP8eKCz/HCAl/xcUFP8YFRT/GBQT/xgUE/8YFBP/GBQT/xgU
+        Ev8YFBL/GBQS/xgUEv8YFBL/GBQS/xgUEv8XExH/GhYX/yQjNP8iIjn/Hx80/x4fM/8gIDT/Hh4y/ygn
+        Of86N0n/Kik+/yAgM/8UFST/BQcS/wwOFf8WHTH/FBwz/xIbNf8PGTT/Ehw2/w8YMf8KEif/CA0c/wcK
+        Fv8FBxD/Hx8q/yonM/8ZFB3/FBAa/xcaKf8dIDn/DQsY/xAOGf8PDRj/Dw0W/w4OFP8REBX/GBQS/xkT
+        EP8jHBnyAAAAYgAAABn///8A////ADgwLyBBNzT/QTg1/0A5OP8+NTb/UW14/0tWZP8+Njf/QDg2/0E2
+        M/9BNjL/QTYy/0E2Mv9BNjL/QTYy/0E2Mv9BNjL/QTYy/0A1Mf9ANTH/QDUx/z80Lv9DOj3/S0hm/1BR
+        hP9VV43/UVOK/0hKfv98d6f/lY7F/2Nin/9aWYj/LjFW/xsgOP9kb4T/cX6Z/297kf9GU3f/Q1OB/0VO
+        bP8pOm3/N0dx/zA1UP8dITn/DRAi/1NRbP99dJX/QTZR/zYpRP9DT3f/S1OQ/yMcPv8rJkT/KyZB/yok
+        O/8mJTX/Lyw3/0Q1MP9ENCz/OCsm7AAAAGIAAAAZ////AP///wA3MC4gQDc0/0A3NP9AODj/PTQ2/1Bt
+        eP9LVmT/PjY3/z84Nv8/NjP/QTYy/0E2Mv9BNjL/QTYy/0E2Mv9BNjL/QTYy/0E2Mv9ANTL/QDUx/0A1
+        Mf9ANTH/PzQu/z4zLf9BODz/RUBQ/0dIbP9OT4D/kIq8/4R/u/9hYJr/W1mE/yEkRv9TXXT/ipq4/3+N
+        qv9XYIH/KDRo/2Fvlv9RWGv/P0Ze/3aBk/9FSWH/KCtB/xITIP9MS2f/hHyg/z41Uf8zJkL/SlaA/0hP
+        iP8nIED/LihF/y4nQP8rJTr/KSc3/zMtM/9GNSz/RTUt/zEqKOwAAABiAAAAGf///wD///8ANzAuIEA3
+        NP9ANzT/QDg4/z40Nv9RbXj/S1Zk/z42N/9AODb/QTYz/0E2Mv9BNjL/QTYy/0E2Mv9BNjL/QTYy/0I2
+        M/9BNTT/QTU0/0E1NP9BNTP/QTUz/0E1Mv9BNTL/QDUv/0A0Lf86Lyv/aWJ9/5qTyf9vbaz/X1+U/05M
+        dv8iJkj/g5Ku/32LuP9pc53/JzRq/x84jP9ca5b/SFRz/zBAb/+Cj6T/SU9q/yImP/8NESX/QkRm/4eA
+        qf8+NlL/LyQ//0xei/9IS4L/LCRD/zApRv8yKUH/Lic7/yonNv83MDD/Qzcx/zQwNP8oJSnsAAAAYgAA
+        ABn///8A////ADcwLiBBNjT/QTg1/0E5OP8+NTf/UW54/0tWZP8/Nzf/QTk3/0I2NP9CNzP/Qjcz/0I3
+        M/9CNzP/Qjcz/0E2NP9BNzb/QDY1/z81NP9BNzj/QTY3/0E2Nv9CNjb/QjY1/0I2Nf9BNTT/QTU2/42D
+        pf+PicL/X2Cg/2Bej/84OGD/JzBS/3mJrf81PG7/JStT/xskWf8vRK3/Pk+O/zhPkP8qRIr/dIGa/0ZN
+        Zf8XGjL/DBIq/zk+Yf+Iga3/QjpW/y0iPv9RaJf/REd6/y0kQ/8vKET/MilA/y0mOf8nJTL/MzAz/zU0
+        Ov8xMTj/Kycq7AAAAGIAAAAZ////AP///wA4MC8gQjc0/0E4Nf9BOTn/PjU3/1JueP9MV2T/Pzc3/0I5
+        N/9CNzT/Qjcz/0I3M/9CNzP/Qjcz/0I3NP9CNzf/QDU4/0U/Tv9OSGX/QDU7/0E0Ov8+MDX/QTY6/0I3
+        Ov9CNzr/PDEx/2FYbv+Nib7/amil/1takf9NSnr/Jyld/z1Dgv9gZK7/OTaH/z04hP9IQZT/Rkil/yAy
+        gv8fMnP/ITRt/2Nvi/84PE//DhEm/w8TKv8yNVH/iYOy/0tCX/8xJD//VnCh/0FDdf8vJkP/MipF/zAn
+        P/8qJDf/KCcx/y4tNv8tLTf/LCk0/yUeJ+wAAABiAAAAGf///wD///8AOTEwIEI3Nf9BODX/QTo5/z41
+        N/9Sbnj/TFdj/0A3N/9COTj/Qzc0/0I3M/9CNzP/Qjcz/0I2NP9CNzb/Qjc7/z0yOf9ZX5H/UUl7/zst
+        Ov9JSV7/WmqM/0Q+T/8+MTX/PDA4/0tCWP9+d7b/dHLH/2Rjuv9kYbT/XFuu/1RUqf9LTKH/OjyN/zAv
+        c/8dHUv/EhM0/xkeNP8nLlL/GRw8/xUZNf83PlL/HR8x/xASJf8OESP/LS5G/5GJtf9VTGn/MiVA/1t2
+        qP8+P2//LyZC/zIoQ/8vJjz/KiY4/ysqM/8sKTP/KCc0/yclM/8lHifsAAAAYgAAABn///8A////ADky
+        MCBBODT/QTg1/0A5OP8+NTb/UW13/0tWZP8/Nzf/QTk3/0I3NP9CNzP/Qjcz/0I3M/9CNzT/QTc4/0A1
+        PP9HQ1v/Zmy2/0pOcv9dcqD/aYbD/2Nusv9ZUIv/WE+L/2FZmP99d8v/eHXW/2Jftf9JSpL/UViL/4GN
+        sf9jbJX/FBtG/zpGdf9lb5r/SVBr/yYpQv8WFSj/IyQz/yIkNP8ZGSf/ERMh/xASIv8TFCP/EBIe/ygp
+        Pv+Nh7L/XFJy/y8mQv9ffa//Ozxm/y4mQf8yKUH/Lic7/y0qN/8oJDD/JyIv/yooM/8oKDP/JiIp7AAA
+        AGIAAAAZ////AP///wA5MTAgQjY0/0E4Nf9BOTj/PjU2/1Ftdv9LVmP/Pzc3/0E5N/9CNzT/Qjcz/0I3
+        M/9CNzP/QTc1/0E3Of89MDn/XXGY/3id6P91kd//ZnDI/15WpP9hV57/WVKL/1lSgf+Dfbj/ene2/01N
+        gf8tL1b/HypR/36Nov+So8P/XGWO/ywxVv+NnMX/jJi6/36Lpf9SWW7/Gxkv/w8LHf8gIC3/IiMu/xkb
+        Jv8WGCL/Ghwl/xsdJP8oKzr/gHuo/1hPcP8sJ0T/ZIO2/zc4YP8tJUD/Lyc+/yolN/8tKjb/JB8t/yAX
+        Kf8lHy//KCYz/ycjKewAAABiAAAAGf///wD///8AODAvIEI3NP9BODX/QTk4/z41N/9RbXf/S1dj/z83
+        N/9AOTf/QTc0/0I2NP9CNzT/QjYz/0I3Nf9CNzn/PjE6/1ZwhP+Btvb/ZnbF/01Kff9BNFH/Oi05/z40
+        Pf9pYYb/Z2OT/0VFdf8uLVH/Ghw9/zU9XP9/j67/b3yl/zQ5Xv9rdpP/n7HT/4yZtv9+i6H/SlJl/xQR
+        Kf8yNEn/bHSH/2Boef9DR1j/Jicx/xwZH/8aGB//JCQz/2xpl/9USWf/LStI/2WEu/82NFv/KyQ+/ywl
+        O/8nIjT/LCs1/yAcKf8dFif/Hxgq/yMdLv8mISnsAAAAYgAAABn///8A////ADcvLiBCNjT/QTg1/0A5
+        OP8+NTb/UW12/0tXY/8/Nzf/QTk3/0E3NP9CNjT/Qjcz/0I2M/9BNzT/QTc3/0E4Pf8/Mj//SU1q/1Rh
+        h/9gfKH/Z3yz/1hchf9IRGT/Ojha/y4sTf8qKEr/JSQ7/y45X/8/Upn/Nkya/yIzef8xP3v/oLDS/6u8
+        2f+Xpr7/cHuO/zAzRP8dGzL/f4yj/4mXqv96hpb/YGd6/z1AWf8cGSz/EQkX/yEdMP9hX4n/RzpX/zEy
+        UP9ohsP/NzNW/yslPf8sJTr/JyIx/ykoMf8bFSX/HRYn/x0XKf8gGSz/Ixwm7AAAAGIAAAAZ////AP//
+        /wA2Li0gQTYz/0A3NP9AODj/PTQ2/1Btdv9JVmP/PjY3/0A4Nv9CNjT/QjYz/0I2M/9CNjP/QjYz/0I3
+        Nf9BNzj/QTc9/z80PP89MTv/PTI8/0RAS/9UY3r/XmGS/zIyU/8uLkz/JSRC/yUqRP8rRIX/NFOm/zVS
+        qP8yTaL/MEub/0RXmP9jc6D/c4Kk/z5Jbv8gKE3/LTVV/3mGnf+Jlab/f4iY/2Jpe/86Plj/GxYu/xUS
+        I/8yNUr/WVJ3/z4vSf87PFv/aYjI/zw0VP8uKD7/KSQ2/yMhLf8jHyr/HBQm/xsVJ/8bFSj/Hxgs/yIb
+        JewAAABiAAAAGf///wD///8ANS4sIEA2M/9ANzT/QTg3/z00Nf9QbXb/SVZj/z42N/8/ODb/QDY0/0E2
+        Mv9BNjL/QTYy/0E2Mv9CNjP/QjY1/0E3Nv9BNzj/QTY6/0E2Ov9ANDb/PjE0/3Rxpv9iXo3/MjFT/yQo
+        R/8bIUX/ITRq/yRAgv8qSZj/L0+j/zVYsv8xUKj/JkCK/yhAhv8tRo//LUeO/y1GjP8mN27/O0Rm/2Vu
+        gv9ZX3L/LzRL/x4fMf8cHyv/Q0Jb/05EXv9FMkn/QkRj/2mGyP83LU//LCk8/yMhMf8kIyz/IBom/xwW
+        J/8aFCf/GhUo/x4YK/8hGyXsAAAAYgAAABn///8A////ADUtLCA/NTL/PzYz/0A4N/89MzX/UGx2/0pW
+        Y/8+Njb/QDg2/0E1M/9BNjL/QTYy/0E2Mv9BNjL/QTYy/0E1Mv9BNTP/QTY0/0E2NP9BNjX/QTY1/z4z
+        L/9bWYP/oJrf/313sv9APmb/IiNI/xkfRv8eMGX/ITp7/yQ+hP8vS5n/Nliv/y1Onv8rS5j/LUyZ/y9K
+        lP80UJz/Mk2V/yQ3cv8cKFT/HiJA/xoaNP8eITT/MDJF/1RQdf9DNU3/SDVM/0JHaf9ngMP/NCZJ/y8u
+        Pf8jIS//JSUv/xwYJ/8bFCf/GhUo/xoVKP8eGCv/IBok7AAAAGIAAAAZ////AP///wA1LSwgQDQy/z82
+        M/8+Nzb/PDM1/09sdv9KVWP/PjU2/0A3Nv9BNTP/QTYy/0E2Mv9BNjL/QTYy/0E2Mv9BNjL/QTYy/0E2
+        Mv9BNjL/QTUz/0E1M/9ANC//TEpo/3p8w/+wqO3/oJfV/2Bbkv88OmP/JidQ/xwjUP8VIk7/EyRV/xkv
+        af8eOXj/IDx+/yE6ef8iOHP/JDt1/yE5cP8aLlz/Fx5F/xIVM/8VFS//LCtL/1dTe/9NRmn/PTBI/0Av
+        Sv9BSW7/Y3q4/zEkRv8xLj7/ICAt/xsdKv8ZFib/GhMn/xkUJ/8aFin/GxYp/x4ZI+wAAABiAAAAGf//
+        /wD///8ANS0sIEA1Mv8/NjP/Pzc3/zwzNf9PbHb/SVZj/z01Nv9AODb/QDYz/0E2M/9ANTH/PjIv/z4y
+        L/8+Mi//QDQx/0E2Mv9BNjL/QTYy/0E1Mv9BNTP/QDQv/0xHXP9kaKn/h4bR/6Sd6f+dl+H/iILF/3Rv
+        q/9cV4n/T0x0/0lHaf9CQmL/ODpg/zY+a/8wOmf/KjNc/ycuUf8oLU3/KCpG/ycnQf8tK0b/QD1c/1dR
+        eP9EPV7/PTNN/z4xTP8xJkb/QEpx/15xsP8uIkT/Lio+/x4dLP8YGCf/GBko/xsYKv8aFSf/GhUp/xgU
+        J/8dGCLsAAAAYgAAABn///8A////ADQtLCA/NTL/PzYz/z43N/87MzT/UGt1/0lVYv89NDX/Pzc1/z81
+        Mv8/MzH/RDg2/0xCQv9NREP/S0FB/z40Mv88MS7/PDAt/z4yLf8+My//QTUx/0I3MP9QS1z/aW60/2Zs
+        sf91ecD/i4vW/5SS3v+ZleH/lZDY/5mS1/+clNP/lY7I/4N9uP97dq7/gHmr/3Ntn/9VVIT/XVqG/2Bb
+        hv9ZVIH/T0lu/0ZBY/9BO17/OzNP/zwxS/83LUn/KiJA/0FKcP9XY57/LSNB/y0oPv8cHCz/Fxko/xsc
+        LP8dHS//HBgr/xsWKv8ZFSj/Hhsk7AAAAGIAAAAZ////AP///wA0LSsgPTQx/z41Mv8+NjX/OzE0/09q
+        df9JVGH/PDM1/z42NP8+NDH/OCwq/29iZP/JwMj/wbvC/7ext/+Zkpf/e3N0/1pTWP9OSVr/UExj/0M+
+        T/9DPT7/V1Nh/3F4w/9vecL/ane8/2dxuP9la6//c3a5/31+yP97fMf/fX3G/3V2vv9ucLX/Zmms/2Zo
+        qf9YXJz/R02L/1VXkf9TVIr/UVCE/05KeP9HQ2v/OzZa/zcwTv8xKkf/KyVD/ycgPf87Q2X/REt9/ysg
+        Ov8uJz3/HRwt/xgZK/8cGyz/Ghos/xsZLP8ZFCj/Gxkr/x8dJewAAABiAAAAGf///wD///8AMy0qID00
+        Mf8+NDH/PjY1/zsxNP9PanX/SVRh/zwzNP89NjT/PjQx/z0xLv9IOzr/ybvC/+fe5P/Zz9T/1MnL/8C2
+        uf9/e5f/enej/3Jvmv9dWoL/RkVe/1tbbv/N0Ov/7O75/+fp9f/Q2uv/gJDH/1hfqf9TW6H/UVma/1Zf
+        nP9gaan/Ymux/2NsrP9eZqP/WF+c/1Rblf9VWZD/TlGH/0xOgv9KSnz/QkFt/zc2XP8zMFT/NTJV/zAt
+        TP8jHDP/AGYz/wBmM/8jGiz/KiM2/xoaKv8ZGSr/GBkp/xkZKP8aGyz/GRor/xgZK/8cGiTsAAAAYgAA
+        ABn///8A////ADQsKyA+MzH/PjQy/z01Nf87MTP/T2hz/0hTYf88MzT/PjU0/z40Mf8/MzH/OCsp/5OD
+        hf/s3eP/5Nrf/9vPzv+qobn/jYi9/4iEtv9ta5j/XFqH/1lYfv+6usX/////////////////2ur0/4CL
+        x/9jaLD/XmWy/2VsuP9kaKf/aHev/5Ci1f+Djc//aXOz/1dek/9ZX5T/XGKc/1dblf9LToL/QUJx/0JD
+        cP9IR3X/RENv/zo5Xv8gHjX/AGYz/wBmM/8AZjP/AGYz/yEbKf8XFyT/Fhcm/xYXJ/8ZGCj/GRkp/xgY
+        KP8XGCn/HBoj7AAAAGIAAAAZ////AP///wA0LSogPTQx/z00Mv8+NTX/OzEz/09nc/9IUmD/PTMz/z81
+        NP8/MzH/PzMx/z0wLv9NPz7/xLW4/+vb3f/LvsX/nJbJ/5yX0P+Fg7r/cGyj/1pYgv9tbYb/+fr6////
+        ////////wszj/4yRzf99fsT/bnK5/2ptuv9ydb7/a2+m/7DB1P//////9fb9/+Hj8/+prM3/aW+d/1Vc
+        kP9YXpb/UFSJ/0ZKfv8/RHr/Oj5w/y8wVv8fHjf/AGYz/wBmM/8AZjP/AGYz/wBmM/8AZjP/Dg4Z/xMT
+        If8WFiX/GRko/xkYKP8XFyf/GRgn/xwaIewAAABiAAAAGf///wD///8ANCwrID8zMf8+NTL/PjU1/zwx
+        Mv9PZ3P/SFJg/z0zM/8/NTX/PzMy/z8zMP9AMzH/OCsp/3VnZ//bysn/uq3A/5yY0/+ZlNH/gX68/2ln
+        l/9NTXP/gIKZ//7////U1uz/rK3Y/4+PzP+Cgsj/dnnB/3h4wP9tbrf/dXe+/2hxqf/Y4er/////////
+        /////////////+bn9f+Zncb/VV6P/0tRfv9QU4P/NDdi/x8iQ/8ZGzP/AGYz/wBmM/8AZjP/U7iF/1O4
+        hf8AZjP/AGYz/wBmM/8ODxn/ExMg/xgYJv8ZGSj/GRko/xcYJv8bGR/sAAAAYgAAABn///8A////ADMs
+        KiA+NDH/PTQy/z01Nf86MTP/T2dz/0hSYP87MjT/PDU0/z4zMf8+MjD/PjIw/z4yMP87Ly//kIOD/6yj
+        wf+MicT/hoTI/2hnnv9VV4T/T1OD/2Vrof9+g7b/cXOs/4B9uP+HhMP/eni//3x6wf91dLn/bW2w/3l5
+        vP9scqr/0NTd/////////////////////////////////8XQ4/9pfKX/P0Rq/ygoQv8YGCv/AGYz/wBm
+        M/8AZjP/U7iF/1O4hf9TuIX/U7iF/wBmM/8AZjP/AGYz/w4OGP8VFCH/FhYl/xcYJf8XFyP/Gxkd7AAA
+        AGIAAAAZ////AP///wAzLCogPTQx/z00Mv89NTX/OzEz/09nc/9IUmD/PDI0/z01NP8+NDH/PjIw/z4y
+        MP8/MzH/Oy8v/0U7Pv+Tjbn/jozP/2Zmp/9bW5L/VVeO/2dnof9ycaz/dXOo/3JvpP9ua6H/eHSw/3x5
+        vf9/fMP/eXe6/3FvrP96eLj/cHKt/4+SsP/////////////////////////////////8/Pz/ttrv/194
+        nv8wO1L/AGYz/wBmM/8AZjP/U7iF/1O4hf+F67j/heu4/4XruP+F67j/AGYz/wBmM/8AZjP/EA8Z/xMU
+        If8WFiP/FhUg/yIfJOwAAABiAAAAGf///wD///8AMysqID4zMP89NDL/PTU1/zswM/9OZnP/SFJg/zwy
+        M/89NDT/PTMx/z4yMP8+MjD/PjMw/z0yMv88Mjn/lZDI/6ej6f+QjNn/m5bq/7et8v/Ct/j/vrPt/56W
+        0P9zcbH/ZGKc/2Ffm/9zcrn/cW+z/3Bvrf9ua6T/W1iM/1xcif9jZZX/oKLG//j4/f//////////////
+        ////////9fX1/6rO2P9XcpD/AGYz/wBmM/8AZjP/U7iF/1O4hf+F67j/heu4/4XruP+F67j/heu4/4Xr
+        uP8AZjP/AGYz/wBmM/8SEBr/Gxkl/yMkLf8lIinsAAAAYgAAABn///8A////ADMrKSA+MjD/PTQx/z00
+        Nf86MDL/TmZz/0dRYP87MjP/PTQ0/z0yMf8+Mi//PjIv/z0yMP89MjL/OjE2/4N/r/+loez/pKD7/6+q
+        ///Buf//vbX//7mw9v+SjdP/Zmew/1RWmv9iY6v/b3C8/2dorf97d7b/eHOq/11bjP9JSXD/T1Jz/1JV
+        ev+AgZv/0dLc/////////////////+Hr6/+JsL7/AGYz/wBmM/8AZjP/U7iF/1O4hf+F67j/heu4/wBm
+        M/8AZjP/heu4/4XruP+F67j/heu4/wBmM/8AZjP/AGYz/xkWIf8hIS7/IyEp7AAAAGIAAAAZ////AP//
+        /wA0KykgPjIw/z00Mf89NDX/OjAy/05lc/9HUWD/OzIz/z00NP89MzD/PjIv/z4zL/8+MjD/PjMx/zsx
+        M/9FPk7/eXSq/6Sg9P+tqf//rKj//6Oh//+infn/gYDV/1dcrP9TWKP/eHnH/21vwP+emeL/tqzm/5SN
+        xf9vap7/UlB7/0hIa/9MTm7/Sk1n/1RXbv+Hi5v/prG6/7TP1P+LssD/SF55/wBmM/8AZjP/U7iF/1O4
+        hf+F67j/heu4/wBmM/8AZjP/AGYz/wBmM/+F67j/heu4/4XruP+F67j/AGYz/wBmM/8VEhz/Hxsq/yYi
+        LOwAAABiAAAAGf///wD///8ANCoqID4yMP89NDL/PTQ1/zowMv9OZXP/R1Fg/zsxM/89NDT/PTMx/z4y
+        L/8+My//PjIv/z4zMP89MzP/NSst/2FYev+fnO3/p6H4/6qm//+opP7/qKT//46M5f9narv/Y2e2/3V3
+        xv99ftb/xLv//8O6+f+jnNz/dXGp/1xZh/9RTnj/RUVq/0RIav9ESmf/QUhh/z9LY/9AUGv/OUZl/ygu
+        SP8AZjP/AGYz/1O4hf9TuIX/heu4/wBmM/8AZjP/AGYz/wBmM/8AZjP/AGYz/4XruP+F67j/heu4/wBm
+        M/8AZjP/FREc/x8bK/8nJC/sAAAAYgAAABn///8A////ADMqKSA9Mi//PDMx/zw0Nf86LzH/TmVz/0hR
+        YP88MTP/PTQ0/z4yMP8+Mi//PTIv/z0yL/8+Mi//PjMx/zsxMf9GO0r/g363/5uW5f+uqP7/u7T//7Su
+        //+Wle3/b3LF/2tvwf90d8j/kY/o/6ij/P+gnfT/rKXt/5SNxv9ybaD/aWSV/1pYhv9GRW3/ODtd/zY+
+        Xv86Q2P/OkNh/zQ5Vf8kKED/AGYz/wBmM/9TuIX/U7iF/wBmM/8AZjP/AGYz/1O4hf9TuIX/AGYz/wBm
+        M/8AZjP/heu4/4XruP8AZjP/AGYz/xoVIP8dGSv/KSQx7AAAAGIAAAAZ////AP///wAzKyogPDMw/z0z
+        Mf89NDX/Oi8y/05lc/9HUWD/PDEz/z00NP8+MjH/PjMv/z4zL/8+My//PjMv/z4yL/8/MzL/Oi8x/0c9
+        Tv90cKP/opzj/7yz//+wqvz/iovf/2luwP9na7r/eHrK/6Gd8f+in/j/kpHq/5iV4v+Xktb/iITC/3x4
+        s/91car/YFyL/0RAYf82NFH/MTRR/zQ5V/8yM1D/KChE/xwdNv8aGS3/HRwv/wBmM/8AZjP/AGYz/1O4
+        hf9TuIX/U7iF/1O4hf8AZjP/AGYz/wBmM/9GQ0T/QT9B/1BOUP9KRkv/MSs2/yYiLewAAABiAAAAGf//
+        /wD///8AMiwqIDwzMP89MzL/PTQ1/zovMv9OZHL/R1Bg/zsxMv89NDP/PjMw/z4zL/8+My//PjMv/z4z
+        L/8+My//PjIw/z4zM/87MDP/PTVF/15agP+im9b/qaLn/358wv9ub7b/bW+2/3R0vf+inu7/tK3+/5mV
+        5f+LiNH/jInN/4uIyf+Fg8X/e3m7/313qf90bJH/VE1v/zgzT/8uK0j/MS9K/yglQP8ZFy//GRco/wBm
+        M/8AZjP/AGYz/1O4hf9TuIX/heu4/4XruP+F67j/heu4/wBmM/8AZjP/AGYz/1RRVP92c3f/jYuP/3x5
+        e/88NjnsAAAAYgAAABn///8A////ADMsKh8+MjD/PTMy/z00Nf86LzL/TWJx/0dPX/87MTL/PTM0/z0z
+        Mf8+My//PjMv/z4zL/8+My//PjMv/z4zL/8+MjD/PjMy/z0yNf85Ljb/UEhd/4WAqP95dqz/bWqk/3Nx
+        r/9xca7/j4zS/7ev//+aluP/iofO/42Jyv+JhsT/h4PA/4B9u/9/e7b/gHms/3Bokv9OR2r/NzBP/y0n
+        Rf8kIDr/FxUo/wBmM/8AZjP/AGYz/1O4hf9TuIX/heu4/4XruP+F67j/heu4/4XruP+F67j/AGYz/wBm
+        M/8AZjP/bWlu/5KOk/+goKX/YVpZ7AAAAGIAAAAZ////AP///wA1LSsePTIw/z0zMv89MzT/Oi4y/01g
+        cf9HTl//OzAy/z0zM/89MzD/PjIv/z4zL/8+My//PjIv/z4zL/8+My//PjMv/z4yMP8+MzL/PjM0/zou
+        L/9COkH/Z2WI/2hmmP9jYpn/aGad/2xqoP+knt//nJbb/4mGx/+Qisf/ioXB/4N/u/+Cfrn/gn21/354
+        q/91bZn/Y1qB/0hBZP80Lk3/Hx02/wBmM/8AZjP/AGYz/1O4hf9TuIX/heu4/4XruP+F67j/heu4/4Xr
+        uP+F67j/heu4/4XruP8AZjP/AGYz/wBmM/9/eX3/f3yD/1RIRusAAABeAAAAF////wD///8ANi4tHjwy
+        L/88MzH/OzM0/zktMv9NX3H/R0xf/zovM/89MjP/PjIw/z0xL/89MS7/PTIu/z0yLv89Mi7/PTIu/z0x
+        L/8+MS//PjEv/z4yMP8/NDH/PDAs/0M8Rf9oZ5L/bWqd/1ZXjP9SUoX/bmyZ/5ONv/+XkMb/lo/B/4mD
+        uP94da//dXOw/3x4tP98d63/fHSj/3Zslf9hWH3/QTpa/yQhOf8AZjP/AGYz/1O4hf9TuIX/heu4/4Xr
+        uP+F67j/heu4/4XruP+F67j/heu4/4XruP+F67j/heu4/wBmM/8AZjP/YVpe/2lcXP9HNzfqAAAAVAAA
+        ABL///8A////ADcvLRI8My//PDMw/zszNP86LjL/TV5x/0dLX/87LzL/PDMz/z4yMP89Mi//PTIv/z0y
+        L/89Mi//PjIv/z4yL/8+MjD/PjIw/z4yMf8+MzH/PjMz/z4zM/87MCz/TEZa/21rm/9jYpf/R0mD/1JT
+        if9nZo//h4Gn/4d/pf9/eKD/cGye/2xpov99eLP/iIK7/4N8sP91bJn/bGOK/0pCYf8pJTz/AGYz/wBm
+        M/9TuIX/U7iF/4XruP+F67j/heu4/4XruP+F67j/heu4/4XruP+F67j/heu4/4XruP8AZjP/AGYz/0g8
+        Pf9aRkb/LSQu5QAAAEAAAAAK////AP///wA9My8APTIw/j0zMf88MzT/Oi0y/01dcf9HS1//Oy8z/z0z
+        M/8+MzD/PjMv/z4zL/8+My//PjMw/z4zMf89MzH/PTMy/z4zM/8+MzP/PTIy/zwwL/88LzD/PTM7/0hD
+        WP9oZ5b/enan/29rm/9gXZP/V1eH/1xchP9uao//ZmKH/15chv9iYI7/bWmb/4V+rf+DfKn/Zl6H/1tT
+        ev9LQ2T/LylE/wBmM/8AZjP/AGYz/wBmM/8AZjP/AGYz/wBmM/8AZjP/AGYz/wBmM/8AZjP/AGYz/wBm
+        M/8AZjP/AGYz/wBmM/84LjL/KCI1/yMeK84AAAAlAAAAAv///wD///8APjIwADsxL+s9MzL/PTM0/zot
+        M/9NXHL/R0tg/zsvM/89MzT/PTMy/z4zMf89MzH/PTMy/z0zM/89MzP/PTIz/z0xMv87Ly//OzA0/0U8
+        S/9LRmb/UFB8/2Bkm/9aXI7/Tklg/3dynP9/eKj/bmmY/2Rhkf9bW4n/aGeT/11cjP9ZV4b/WliG/1xa
+        hf9lY4n/b2qL/2RegP9aVHn/S0Vm/zAtS/8AZjP/AGYz/wBmM/8AZjP/AGYz/wBmM/8AZjP/AGYz/wBm
+        M/8AZjP/AGYz/wBmM/8AZjP/AGYz/wBmM/8AZjP/GRks/x4dNf8hHCaDAAAADAAAAAD///8A////AD0y
+        MAA5Ly6APTMy/z0zNP86LTP/TVxy/0dLYP87LzT/PDM1/z0zM/89MzP/PTM0/zwyM/87MDH/OS4v/z00
+        O/9CPVH/Tkxx/2BjnP9iZqH/UlB6/0U+Vv9ANT//PC4v/zksKP9fV2f/ioOu/3Num/9iYJD/X12R/2tp
+        lf93c6H/YF2P/1pXiP9dWof/XluD/1hUc/9JRV7/QkBY/zs8U/86O1n/OzlY/zszSP8sJj7/Ih82/yUh
+        OP8nITj/NUNh/z9EZ/8zLkT/NCs8/zUrO/82Kzj/Oi02/zktNv8rJTP/Gxsx/yAfOv8nJTr0AAAAEgAA
+        AAIAAAAA////AP///wA9My8APjIwADoxMNY9MzT/Oi0z/01ccv9HS2H/Oy83/z0yN/88MTP/OS4w/zow
+        Nf9BOkX/R0Ve/1hei/9jaqD/VFWF/0pIa/9HP1P/PDE3/zsuL/8+MTL/PzIz/z8zM/8+MjD/PTEt/2hh
+        f/98eKj/dG+f/2tnm/9mZJX/cm+Z/3Nvof9gXI7/YFuL/2Bbh/9TTnT/QTtc/zk0U/86NVP/OTVR/zg3
+        Uf89OU3/QDtO/0M7T/9CO1D/OzNK/0pdh/9GR3L/LytF/ykmQf8sK0b/KihA/ygmPP8jIzr/Hh86/yIj
+        QP8pKEX+Kyc0TwAAAAIAAAAAAAAAAP///wD///8APjIwAD4yMAA9MzIAOjAywTotM/9NXHP/RUde/zgr
+        M/8+NkL/QkBV/1BWd/9hbqD/W2SW/1BPc/9LRl7/QDdF/zsvMv88MC//PDEx/z4zNP8/MzP/PzMz/z8z
+        Mf8/MjD/PzIw/z4yLP9CNzf/Wld4/2Nhkv9jYJP/XlyN/15dh/98d6H/dW+g/2NekP9cV4n/UE17/0Y/
+        Zv9BOVv/PjdZ/zkzVP84M1P/ODRR/zs2Tv8/PFX/Qj9b/0I4Vf9bb6L/RUZ7/yMjRv8gIkr/Jy1Z/yQp
+        T/8jJkr/JShK/ykqTP8wL0z2NDBCRgAAAAAAAAAAAAAAAAAAAAD///8A////AD4yMAA+MjAAPTMxAD0z
+        NAA9NDYzSVNhuE1ZctZQWHPWWmKE1k1ScdZJSF7WRT5M1j00OdY9MjTWPjM01j81NdZANjbWQTY21kE3
+        NtZBNzXWQjY01kE2NNZBNjPWQTYz1kA2MtZBNjPWQDUx1kI4NdZMRlDWVVJr1lhUddZST27WWldz1m9p
+        hNZya4XWaWB71mBYdNZVTGjWRz9Y1kA4UdY8NE3WOjNL1jozSdY8NUrWPzdN1kI6UdZCN1DWVGGI1jc3
+        XtYqKEPWNzZY1js8YNY7O1zWOztb1j07W89AO1SAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////AP//
+        /wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP//
+        /wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP//
+        /wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP//
+        /wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP//
+        /wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP//
+        /wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP//
+        /wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP//
+        /wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP//
+        /wD///8A////AP///wD///8A////AP///wD4AAAAAAAAA/AAAAAAAAAB4AAAAAAAAAHgAAAAAAAAAOAA
+        AAAAAAAA4AAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAA
+        AADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAA
+        AAAAAAAAwAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAA
+        AADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAA
+        AAAAAAAAwAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAA
+        AADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAA
+        AAAAAAAAwAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAAAAAAAAAA4AAAAAAA
+        AADgAAAAAAAAAeAAAAAAAAAB8AAAAAAAAAP4AAAAAAAAD/wAAAAAAAA//////////////////////w==
+</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Source/Core/Windows/VertexEditForm.Designer.cs b/Source/Core/Windows/VertexEditForm.Designer.cs
new file mode 100644
index 0000000..feaec42
--- /dev/null
+++ b/Source/Core/Windows/VertexEditForm.Designer.cs
@@ -0,0 +1,350 @@
+namespace CodeImp.DoomBuilder.Windows
+{
+	partial class VertexEditForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			System.Windows.Forms.TabPage tabproperties;
+			System.Windows.Forms.Label label2;
+			System.Windows.Forms.Label label3;
+			System.Windows.Forms.Label label1;
+			System.Windows.Forms.Label label6;
+			this.groupposition = new System.Windows.Forms.GroupBox();
+			this.panelHeightControls = new System.Windows.Forms.Panel();
+			this.clearZFloor = new System.Windows.Forms.Button();
+			this.clearZCeiling = new System.Windows.Forms.Button();
+			this.zceiling = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.zfloor = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.positiony = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.positionx = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.tabs = new System.Windows.Forms.TabControl();
+			this.tabcustom = new System.Windows.Forms.TabPage();
+			this.fieldslist = new CodeImp.DoomBuilder.Controls.FieldsEditorControl();
+			this.cancel = new System.Windows.Forms.Button();
+			this.apply = new System.Windows.Forms.Button();
+			tabproperties = new System.Windows.Forms.TabPage();
+			label2 = new System.Windows.Forms.Label();
+			label3 = new System.Windows.Forms.Label();
+			label1 = new System.Windows.Forms.Label();
+			label6 = new System.Windows.Forms.Label();
+			tabproperties.SuspendLayout();
+			this.groupposition.SuspendLayout();
+			this.panelHeightControls.SuspendLayout();
+			this.tabs.SuspendLayout();
+			this.tabcustom.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// tabproperties
+			// 
+			tabproperties.Controls.Add(this.groupposition);
+			tabproperties.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			tabproperties.Location = new System.Drawing.Point(4, 22);
+			tabproperties.Name = "tabproperties";
+			tabproperties.Padding = new System.Windows.Forms.Padding(3);
+			tabproperties.Size = new System.Drawing.Size(428, 207);
+			tabproperties.TabIndex = 0;
+			tabproperties.Text = "Properties";
+			tabproperties.UseVisualStyleBackColor = true;
+			// 
+			// groupposition
+			// 
+			this.groupposition.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.groupposition.Controls.Add(this.panelHeightControls);
+			this.groupposition.Controls.Add(this.positiony);
+			this.groupposition.Controls.Add(this.positionx);
+			this.groupposition.Controls.Add(label1);
+			this.groupposition.Controls.Add(label6);
+			this.groupposition.Location = new System.Drawing.Point(7, 6);
+			this.groupposition.Name = "groupposition";
+			this.groupposition.Size = new System.Drawing.Size(415, 195);
+			this.groupposition.TabIndex = 0;
+			this.groupposition.TabStop = false;
+			this.groupposition.Text = " Position ";
+			// 
+			// panelHeightControls
+			// 
+			this.panelHeightControls.Controls.Add(this.clearZFloor);
+			this.panelHeightControls.Controls.Add(this.clearZCeiling);
+			this.panelHeightControls.Controls.Add(this.zceiling);
+			this.panelHeightControls.Controls.Add(this.zfloor);
+			this.panelHeightControls.Controls.Add(label2);
+			this.panelHeightControls.Controls.Add(label3);
+			this.panelHeightControls.Location = new System.Drawing.Point(48, 73);
+			this.panelHeightControls.Name = "panelHeightControls";
+			this.panelHeightControls.Size = new System.Drawing.Size(361, 116);
+			this.panelHeightControls.TabIndex = 30;
+			// 
+			// clearZFloor
+			// 
+			this.clearZFloor.Image = global::CodeImp.DoomBuilder.Properties.Resources.SearchClear;
+			this.clearZFloor.Location = new System.Drawing.Point(314, 32);
+			this.clearZFloor.Name = "clearZFloor";
+			this.clearZFloor.Size = new System.Drawing.Size(26, 24);
+			this.clearZFloor.TabIndex = 31;
+			this.clearZFloor.UseVisualStyleBackColor = true;
+			this.clearZFloor.Click += new System.EventHandler(this.clearZFloor_Click);
+			// 
+			// clearZCeiling
+			// 
+			this.clearZCeiling.Image = global::CodeImp.DoomBuilder.Properties.Resources.SearchClear;
+			this.clearZCeiling.Location = new System.Drawing.Point(314, 0);
+			this.clearZCeiling.Name = "clearZCeiling";
+			this.clearZCeiling.Size = new System.Drawing.Size(26, 24);
+			this.clearZCeiling.TabIndex = 30;
+			this.clearZCeiling.UseVisualStyleBackColor = true;
+			this.clearZCeiling.Click += new System.EventHandler(this.clearZCeiling_Click);
+			// 
+			// zceiling
+			// 
+			this.zceiling.AllowDecimal = false;
+			this.zceiling.AllowNegative = true;
+			this.zceiling.AllowRelative = true;
+			this.zceiling.ButtonStep = 8;
+			this.zceiling.ButtonStepBig = 16F;
+			this.zceiling.ButtonStepFloat = 1F;
+			this.zceiling.ButtonStepSmall = 1F;
+			this.zceiling.ButtonStepsUseModifierKeys = true;
+			this.zceiling.ButtonStepsWrapAround = false;
+			this.zceiling.Location = new System.Drawing.Point(188, 0);
+			this.zceiling.Name = "zceiling";
+			this.zceiling.Size = new System.Drawing.Size(120, 24);
+			this.zceiling.StepValues = null;
+			this.zceiling.TabIndex = 28;
+			this.zceiling.WhenTextChanged += new System.EventHandler(this.zceiling_WhenTextChanged);
+			// 
+			// zfloor
+			// 
+			this.zfloor.AllowDecimal = false;
+			this.zfloor.AllowNegative = true;
+			this.zfloor.AllowRelative = true;
+			this.zfloor.ButtonStep = 8;
+			this.zfloor.ButtonStepBig = 16F;
+			this.zfloor.ButtonStepFloat = 1F;
+			this.zfloor.ButtonStepSmall = 1F;
+			this.zfloor.ButtonStepsUseModifierKeys = true;
+			this.zfloor.ButtonStepsWrapAround = false;
+			this.zfloor.Location = new System.Drawing.Point(188, 32);
+			this.zfloor.Name = "zfloor";
+			this.zfloor.Size = new System.Drawing.Size(120, 24);
+			this.zfloor.StepValues = null;
+			this.zfloor.TabIndex = 29;
+			this.zfloor.WhenTextChanged += new System.EventHandler(this.zfloor_WhenTextChanged);
+			// 
+			// label2
+			// 
+			label2.AutoSize = true;
+			label2.Location = new System.Drawing.Point(68, 37);
+			label2.Name = "label2";
+			label2.Size = new System.Drawing.Size(111, 13);
+			label2.TabIndex = 26;
+			label2.Text = "Absolute Floor Height:";
+			// 
+			// label3
+			// 
+			label3.AutoSize = true;
+			label3.Location = new System.Drawing.Point(60, 5);
+			label3.Name = "label3";
+			label3.Size = new System.Drawing.Size(119, 13);
+			label3.TabIndex = 27;
+			label3.Text = "Absolute Ceiling Height:";
+			// 
+			// positiony
+			// 
+			this.positiony.AllowDecimal = false;
+			this.positiony.AllowNegative = true;
+			this.positiony.AllowRelative = true;
+			this.positiony.ButtonStep = 1;
+			this.positiony.ButtonStepBig = 8F;
+			this.positiony.ButtonStepFloat = 1F;
+			this.positiony.ButtonStepSmall = 1F;
+			this.positiony.ButtonStepsUseModifierKeys = true;
+			this.positiony.ButtonStepsWrapAround = false;
+			this.positiony.Location = new System.Drawing.Point(236, 34);
+			this.positiony.Name = "positiony";
+			this.positiony.Size = new System.Drawing.Size(120, 24);
+			this.positiony.StepValues = null;
+			this.positiony.TabIndex = 25;
+			this.positiony.WhenTextChanged += new System.EventHandler(this.positiony_WhenTextChanged);
+			// 
+			// positionx
+			// 
+			this.positionx.AllowDecimal = false;
+			this.positionx.AllowNegative = true;
+			this.positionx.AllowRelative = true;
+			this.positionx.ButtonStep = 1;
+			this.positionx.ButtonStepBig = 8F;
+			this.positionx.ButtonStepFloat = 1F;
+			this.positionx.ButtonStepSmall = 1F;
+			this.positionx.ButtonStepsUseModifierKeys = true;
+			this.positionx.ButtonStepsWrapAround = false;
+			this.positionx.Location = new System.Drawing.Point(68, 34);
+			this.positionx.Name = "positionx";
+			this.positionx.Size = new System.Drawing.Size(120, 24);
+			this.positionx.StepValues = null;
+			this.positionx.TabIndex = 24;
+			this.positionx.WhenTextChanged += new System.EventHandler(this.positionx_WhenTextChanged);
+			// 
+			// label1
+			// 
+			label1.AutoSize = true;
+			label1.Location = new System.Drawing.Point(212, 39);
+			label1.Name = "label1";
+			label1.Size = new System.Drawing.Size(17, 13);
+			label1.TabIndex = 23;
+			label1.Text = "Y:";
+			// 
+			// label6
+			// 
+			label6.AutoSize = true;
+			label6.Location = new System.Drawing.Point(45, 39);
+			label6.Name = "label6";
+			label6.Size = new System.Drawing.Size(17, 13);
+			label6.TabIndex = 21;
+			label6.Text = "X:";
+			// 
+			// tabs
+			// 
+			this.tabs.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.tabs.Controls.Add(tabproperties);
+			this.tabs.Controls.Add(this.tabcustom);
+			this.tabs.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.tabs.Location = new System.Drawing.Point(10, 10);
+			this.tabs.Margin = new System.Windows.Forms.Padding(1);
+			this.tabs.Name = "tabs";
+			this.tabs.Padding = new System.Drawing.Point(24, 3);
+			this.tabs.SelectedIndex = 0;
+			this.tabs.Size = new System.Drawing.Size(436, 233);
+			this.tabs.TabIndex = 0;
+			// 
+			// tabcustom
+			// 
+			this.tabcustom.Controls.Add(this.fieldslist);
+			this.tabcustom.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.tabcustom.Location = new System.Drawing.Point(4, 22);
+			this.tabcustom.Name = "tabcustom";
+			this.tabcustom.Padding = new System.Windows.Forms.Padding(3);
+			this.tabcustom.Size = new System.Drawing.Size(428, 207);
+			this.tabcustom.TabIndex = 1;
+			this.tabcustom.Text = "Custom";
+			this.tabcustom.UseVisualStyleBackColor = true;
+			this.tabcustom.MouseEnter += new System.EventHandler(this.tabcustom_MouseEnter);
+			// 
+			// fieldslist
+			// 
+			this.fieldslist.AllowInsert = true;
+			this.fieldslist.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.fieldslist.AutoInsertUserPrefix = true;
+			this.fieldslist.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+			this.fieldslist.Location = new System.Drawing.Point(11, 11);
+			this.fieldslist.Margin = new System.Windows.Forms.Padding(8);
+			this.fieldslist.Name = "fieldslist";
+			this.fieldslist.PropertyColumnVisible = true;
+			this.fieldslist.PropertyColumnWidth = 150;
+			this.fieldslist.Size = new System.Drawing.Size(406, 188);
+			this.fieldslist.TabIndex = 2;
+			this.fieldslist.TypeColumnVisible = true;
+			this.fieldslist.TypeColumnWidth = 100;
+			this.fieldslist.ValueColumnVisible = true;
+			// 
+			// cancel
+			// 
+			this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.cancel.Location = new System.Drawing.Point(332, 247);
+			this.cancel.Name = "cancel";
+			this.cancel.Size = new System.Drawing.Size(112, 25);
+			this.cancel.TabIndex = 2;
+			this.cancel.Text = "Cancel";
+			this.cancel.UseVisualStyleBackColor = true;
+			this.cancel.Click += new System.EventHandler(this.cancel_Click);
+			// 
+			// apply
+			// 
+			this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.apply.Location = new System.Drawing.Point(214, 247);
+			this.apply.Name = "apply";
+			this.apply.Size = new System.Drawing.Size(112, 25);
+			this.apply.TabIndex = 1;
+			this.apply.Text = "OK";
+			this.apply.UseVisualStyleBackColor = true;
+			this.apply.Click += new System.EventHandler(this.apply_Click);
+			// 
+			// VertexEditForm
+			// 
+			this.AcceptButton = this.apply;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.CancelButton = this.cancel;
+			this.ClientSize = new System.Drawing.Size(456, 278);
+			this.Controls.Add(this.cancel);
+			this.Controls.Add(this.apply);
+			this.Controls.Add(this.tabs);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "VertexEditForm";
+			this.Opacity = 1;
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Edit Vertex";
+			this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.VertexEditForm_FormClosing);
+			this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.VertexEditForm_HelpRequested);
+			tabproperties.ResumeLayout(false);
+			this.groupposition.ResumeLayout(false);
+			this.groupposition.PerformLayout();
+			this.panelHeightControls.ResumeLayout(false);
+			this.panelHeightControls.PerformLayout();
+			this.tabs.ResumeLayout(false);
+			this.tabcustom.ResumeLayout(false);
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.TabControl tabs;
+		private System.Windows.Forms.TabPage tabcustom;
+		private System.Windows.Forms.Button cancel;
+		private System.Windows.Forms.Button apply;
+		private CodeImp.DoomBuilder.Controls.FieldsEditorControl fieldslist;
+		private System.Windows.Forms.GroupBox groupposition;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox positiony;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox positionx;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox zfloor;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox zceiling;
+		private System.Windows.Forms.Panel panelHeightControls;
+		private System.Windows.Forms.Button clearZFloor;
+		private System.Windows.Forms.Button clearZCeiling;
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/VertexEditForm.cs b/Source/Core/Windows/VertexEditForm.cs
new file mode 100644
index 0000000..7a3e3bb
--- /dev/null
+++ b/Source/Core/Windows/VertexEditForm.cs
@@ -0,0 +1,405 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Map;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Windows
+{
+	internal partial class VertexEditForm : DelayedForm
+	{
+		#region ================== Constants
+
+		private const string CLEAR_VALUE = "Unused"; //mxd
+
+		#endregion
+
+		#region ================== Events
+
+		public event EventHandler OnValuesChanged; //mxd
+
+		#endregion
+		
+		#region ================== Variables
+
+		private ICollection<Vertex> vertices;
+		private bool preventchanges; //mxd
+		private bool undocreated; //mxd
+		private List<VertexProperties> vertexprops; //mxd
+
+		//mxd. Window setup stuff
+		private static Point location = Point.Empty;
+		private static int activetab;
+
+		private struct VertexProperties //mxd
+		{
+			public readonly float X;
+			public readonly float Y;
+			public readonly float ZCeiling;
+			public readonly float ZFloor;
+
+			public VertexProperties(Vertex v) 
+			{
+				X = v.Position.x;
+				Y = v.Position.y;
+				ZCeiling = v.ZCeiling;
+				ZFloor = v.ZFloor;
+			}
+		}
+
+		#endregion
+
+		#region ================== Constructor
+
+		// Constructor
+		public VertexEditForm()
+		{
+			InitializeComponent();
+
+			//mxd. Widow setup
+			if(location != Point.Empty) 
+			{
+				this.StartPosition = FormStartPosition.Manual;
+				this.Location = location;
+				if(General.Settings.StoreSelectedEditTab && activetab > 0 && activetab < tabs.TabCount) tabs.SelectTab(activetab);
+			}
+
+			if(General.Map.FormatInterface.HasCustomFields) //mxd
+			{ 
+				// Initialize custom fields editor
+				fieldslist.Setup("vertex");
+
+				// Fill universal fields list
+				fieldslist.ListFixedFields(General.Map.Config.VertexFields);
+			} 
+			else 
+			{
+				tabs.TabPages.Remove(tabcustom);
+				panelHeightControls.Visible = false;
+			}
+			
+			// Decimals allowed?
+			if(General.Map.FormatInterface.VertexDecimals > 0)
+			{
+				positionx.AllowDecimal = true;
+				positiony.AllowDecimal = true;
+				positionx.ButtonStepSmall = 0.1f;
+				positiony.ButtonStepSmall = 0.1f;
+				positionx.UpdateButtonsTooltip();
+				positiony.UpdateButtonsTooltip();
+
+				//mxd
+				zceiling.AllowDecimal = true;
+				zfloor.AllowDecimal = true;
+			}
+		}
+
+		#endregion
+		
+		#region ================== Methods
+
+		// This sets up the form to edit the given vertices
+		public void Setup(ICollection<Vertex> vertices, bool allowPositionChange)
+		{
+			preventchanges = true; //mxd
+			
+			// Keep this list
+			this.vertices = vertices;
+			if(vertices.Count > 1) this.Text = "Edit Vertices (" + vertices.Count + ")";
+			vertexprops = new List<VertexProperties>(); //mxd
+
+			////////////////////////////////////////////////////////////////////////
+			// Set all options to the first vertex properties
+			////////////////////////////////////////////////////////////////////////
+
+			// Get first vertex
+			Vertex vc = General.GetByIndex(vertices, 0);
+
+			// Position
+			positionx.Text = vc.Position.x.ToString();
+			positiony.Text = vc.Position.y.ToString();
+
+			//mxd
+			positionx.Enabled = allowPositionChange;
+			positiony.Enabled = allowPositionChange;
+			
+			// Custom fields
+			if(General.Map.FormatInterface.HasCustomFields) //mxd
+				fieldslist.SetValues(vc.Fields, true);
+			
+			////////////////////////////////////////////////////////////////////////
+			// Now go for all sectors and change the options when a setting is different
+			////////////////////////////////////////////////////////////////////////
+
+			// Go for all vertices
+			foreach(Vertex v in vertices)
+			{
+				// Position
+				if(positionx.Text != v.Position.x.ToString()) positionx.Text = "";
+				if(positiony.Text != v.Position.y.ToString()) positiony.Text = "";
+
+				// Custom fields
+				if(General.Map.FormatInterface.HasCustomFields) 
+				{
+					fieldslist.SetValues(v.Fields, false);
+				}
+
+				//mxd. Store initial properties
+				vertexprops.Add(new VertexProperties(v));
+			}
+
+			//mxd. Height offsets
+			if(General.Map.UDMF) 
+			{
+				zceiling.Text = (float.IsNaN(vc.ZCeiling) ? CLEAR_VALUE : vc.ZCeiling.ToString());
+				zfloor.Text = (float.IsNaN(vc.ZFloor) ? CLEAR_VALUE : vc.ZFloor.ToString());
+
+				foreach(Vertex v in vertices) 
+				{
+					string zc = (float.IsNaN(v.ZCeiling) ? CLEAR_VALUE : v.ZCeiling.ToString());
+					string zf = (float.IsNaN(v.ZFloor) ? CLEAR_VALUE : v.ZFloor.ToString());
+
+					if(zceiling.Text != zc)	zceiling.Text = "";
+					if(zfloor.Text != zf) zfloor.Text = "";
+				}
+			}
+
+			preventchanges = false; //mxd
+		}
+
+		//mxd
+		private void MakeUndo()
+		{
+			if(undocreated) return;
+			undocreated = true;
+
+			//mxd. Make undo
+			General.Map.UndoRedo.CreateUndo("Edit " + (vertices.Count > 1 ? vertices.Count + " vertices" : "vertex"));
+
+			if(General.Map.FormatInterface.HasCustomFields)
+			{
+				foreach(Vertex v in vertices) v.Fields.BeforeFieldsChange();
+			}
+		}
+		
+		#endregion
+
+		#region ================== mxd. Realtime Events
+
+		private void positionx_WhenTextChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo();
+			int i = 0;
+
+			//restore values
+			if(string.IsNullOrEmpty(positionx.Text)) 
+			{
+				// Apply position
+				foreach(Vertex v in vertices) v.Move(new Vector2D(vertexprops[i++].X, v.Position.y));
+			} 
+			else //update values
+			{ 
+				// Verify the coordinates
+				float px = positionx.GetResultFloat(vertexprops[i].X);
+				if(px < General.Map.FormatInterface.MinCoordinate) 
+				{
+					positionx.Text = General.Map.FormatInterface.MinCoordinate.ToString();
+					return;
+				} 
+				
+				if(px > General.Map.FormatInterface.MaxCoordinate) 
+				{
+					positionx.Text = General.Map.FormatInterface.MaxCoordinate.ToString();
+					return;
+				}
+
+				// Apply position
+				foreach(Vertex v in vertices) v.Move(new Vector2D(px, v.Position.y));
+			}
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void positiony_WhenTextChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo();
+			int i = 0;
+
+			//restore values
+			if(string.IsNullOrEmpty(positiony.Text)) 
+			{
+				// Apply position
+				foreach(Vertex v in vertices) v.Move(new Vector2D(v.Position.x, vertexprops[i++].Y));
+			} 
+			else //update values
+			{ 
+				// Verify the coordinates
+				float py = positiony.GetResultFloat(vertexprops[i].Y);
+				if(py < General.Map.FormatInterface.MinCoordinate) 
+				{
+					positiony.Text = General.Map.FormatInterface.MinCoordinate.ToString();
+					return;
+				} 
+				
+				if(py > General.Map.FormatInterface.MaxCoordinate) 
+				{
+					positiony.Text = General.Map.FormatInterface.MaxCoordinate.ToString();
+					return;
+				}
+
+				// Apply position
+				foreach(Vertex v in vertices) v.Move(new Vector2D(v.Position.x, py));
+			}
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void zceiling_WhenTextChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo();
+			int i = 0;
+
+			//restore values
+			if(string.IsNullOrEmpty(zceiling.Text)) 
+			{
+				foreach(Vertex v in vertices) v.ZCeiling = vertexprops[i++].ZCeiling;
+
+			} 
+			else if(zceiling.Text == CLEAR_VALUE) //clear values
+			{ 
+				foreach(Vertex v in vertices) v.ZCeiling = float.NaN;
+
+			} 
+			else //update values
+			{ 
+				foreach(Vertex v in vertices)
+					v.ZCeiling = zceiling.GetResultFloat(vertexprops[i++].ZCeiling);
+			}
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		private void zfloor_WhenTextChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			MakeUndo();
+			int i = 0;
+
+			//restore values
+			if(string.IsNullOrEmpty(zfloor.Text)) 
+			{
+				foreach(Vertex v in vertices)
+					v.ZFloor = vertexprops[i++].ZFloor;
+			
+			} 
+			else if(zfloor.Text == CLEAR_VALUE) //clear values
+			{
+				foreach(Vertex v in vertices) v.ZFloor = float.NaN;
+			} 
+			else //update values
+			{ 
+				foreach(Vertex v in vertices)
+					v.ZFloor = zfloor.GetResultFloat(vertexprops[i++].ZFloor);
+			}
+
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
+		}
+
+		//mxd
+		private void clearZFloor_Click(object sender, EventArgs e) 
+		{
+			zfloor.Text = CLEAR_VALUE;
+		}
+
+		//mxd
+		private void clearZCeiling_Click(object sender, EventArgs e) 
+		{
+			zceiling.Text = CLEAR_VALUE;
+		}
+
+		#endregion
+
+		#region ================== Events
+
+		// OK clicked
+		private void apply_Click(object sender, EventArgs e)
+		{
+			//mxd. Make undo if required
+			MakeUndo();
+			
+			// Apply custom fields
+			if(General.Map.FormatInterface.HasCustomFields) 
+			{
+				foreach(Vertex v in vertices) fieldslist.Apply(v.Fields); //mxd
+			}
+			
+			General.Map.IsChanged = true;
+			if(OnValuesChanged != null)	OnValuesChanged(this, EventArgs.Empty);
+			
+			// Done
+			this.DialogResult = DialogResult.OK;
+			this.Close();
+		}
+
+		// Cancel clicked
+		private void cancel_Click(object sender, EventArgs e)
+		{
+			//mxd. Perform undo if required
+			if(undocreated) General.Map.UndoRedo.WithdrawUndo();
+			
+			// And close
+			this.DialogResult = DialogResult.Cancel;
+			this.Close();
+		}
+
+		//mxd
+		private void tabcustom_MouseEnter(object sender, EventArgs e) 
+		{
+			fieldslist.Focus();
+		}
+
+		//mxd
+		private void VertexEditForm_FormClosing(object sender, FormClosingEventArgs e) 
+		{
+			location = this.Location;
+			activetab = tabs.SelectedIndex;
+		}
+
+		// Help requested
+		private void VertexEditForm_HelpRequested(object sender, HelpEventArgs hlpevent)
+		{
+			General.ShowHelp("w_vertexedit.html");
+			hlpevent.Handled = true;
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/Windows/VertexEditForm.resx b/Source/Core/Windows/VertexEditForm.resx
new file mode 100644
index 0000000..0c0ea08
--- /dev/null
+++ b/Source/Core/Windows/VertexEditForm.resx
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="tabproperties.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="tabproperties.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="groupposition.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="label2.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label3.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label1.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="label1.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label6.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label2.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label3.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="tabs.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="tabcustom.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="fieldslist.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="fieldslist.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Core/ZDoom/ActorStructure.cs b/Source/Core/ZDoom/ActorStructure.cs
new file mode 100644
index 0000000..a9063fb
--- /dev/null
+++ b/Source/Core/ZDoom/ActorStructure.cs
@@ -0,0 +1,732 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using CodeImp.DoomBuilder.Config;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.ZDoom
+{
+	public sealed class ActorStructure
+	{
+		#region ================== Constants
+		
+		private readonly string[] SPRITE_POSTFIXES = new[] {"2C8", "2D8", "2A8", "2B8", "1C1", "1D1", "1A1", "1B1", "A2", "A1", "A0", "2", "1", "0" };
+		internal const string ACTOR_CLASS_SPECIAL_TOKENS = ":{}\n;,"; //mxd
+
+		#endregion
+		
+		#region ================== Variables
+		
+		// Declaration
+		private readonly string classname;
+		private readonly string inheritclass;
+		private readonly string replaceclass;
+		private int doomednum = -1;
+		
+		// Inheriting
+		private ActorStructure baseclass;
+		private readonly bool skipsuper;
+		
+		// Flags
+		private Dictionary<string, bool> flags;
+		
+		// Properties
+		private Dictionary<string, List<string>> props;
+		private readonly List<string> userVars; //mxd
+		
+		// States
+		private Dictionary<string, StateStructure> states;
+		
+		#endregion
+		
+		#region ================== Properties
+		
+		public Dictionary<string, bool> Flags { get { return flags; } }
+		public Dictionary<string, List<string>> Properties { get { return props; } }
+		public string ClassName { get { return classname; } }
+		public string InheritsClass { get { return inheritclass; } }
+		public string ReplacesClass { get { return replaceclass; } }
+		public ActorStructure BaseClass { get { return baseclass; } }
+		internal int DoomEdNum { get { return doomednum; } set { doomednum = value; } }
+		public List<string> UserVars { get { return userVars; } } //mxd
+		
+		#endregion
+		
+		#region ================== Constructor / Disposer
+		
+		// Constructor
+		internal ActorStructure(DecorateParser parser)
+		{
+			// Initialize
+			flags = new Dictionary<string, bool>(StringComparer.Ordinal);
+			props = new Dictionary<string, List<string>>(StringComparer.Ordinal);
+			states = new Dictionary<string, StateStructure>(StringComparer.Ordinal);
+			userVars = new List<string>();//mxd
+			bool done = false; //mxd
+			
+			// Always define a game property, but default to 0 values
+			props["game"] = new List<string>();
+			
+			inheritclass = "actor";
+			replaceclass = null;
+			baseclass = null;
+			skipsuper = false;
+			
+			// First next token is the class name
+			parser.SkipWhitespace(true);
+			classname = parser.StripTokenQuotes(parser.ReadToken(ACTOR_CLASS_SPECIAL_TOKENS));
+
+			if(string.IsNullOrEmpty(classname))
+			{
+				parser.ReportError("Expected actor class name");
+				return;
+			}
+
+			// Parse tokens before entering the actor scope
+			while(parser.SkipWhitespace(true))
+			{
+				string token = parser.ReadToken();
+				if(!string.IsNullOrEmpty(token))
+				{
+					token = token.ToLowerInvariant();
+
+					switch(token) 
+					{
+						case ":":
+							// The next token must be the class to inherit from
+							parser.SkipWhitespace(true);
+							inheritclass = parser.StripTokenQuotes(parser.ReadToken());
+							if(string.IsNullOrEmpty(inheritclass) || parser.IsSpecialToken(inheritclass)) 
+							{
+								parser.ReportError("Expected class name to inherit from");
+								return;
+							}
+
+							// Find the actor to inherit from
+							baseclass = parser.GetArchivedActorByName(inheritclass);
+							break;
+
+						case "replaces":
+							// The next token must be the class to replace
+							parser.SkipWhitespace(true);
+							replaceclass = parser.StripTokenQuotes(parser.ReadToken());
+							if(string.IsNullOrEmpty(replaceclass) || parser.IsSpecialToken(replaceclass)) 
+							{
+								parser.ReportError("Expected class name to replace");
+								return;
+							}
+							break;
+
+						case "native":
+							// Igore this token
+							break;
+
+						case "{":
+							// Actor scope begins here,
+							// break out of this parse loop
+							done = true;
+							break;
+
+						case "-":
+							// This could be a negative doomednum (but our parser sees the - as separate token)
+							// So read whatever is after this token and ignore it (negative doomednum indicates no doomednum)
+							parser.ReadToken();
+							break;
+
+						default:
+							//mxd. Property begins with $? Then the whole line is a single value
+							if(token.StartsWith("$")) 
+							{
+								// This is for editor-only properties such as $sprite and $category
+								props[token] = new List<string> { (parser.SkipWhitespace(false) ? parser.ReadLine() : "") };
+							} 
+							else if(!int.TryParse(token, NumberStyles.Integer, CultureInfo.InvariantCulture, out doomednum)) // Check if numeric
+							{
+								// Not numeric!
+								parser.ReportError("Expected editor thing number or start of actor scope while parsing '" + classname + "'");
+								return;
+							}
+							break;
+					}
+
+					if(done) break; //mxd
+				}
+				else
+				{
+					parser.ReportError("Unexpected end of structure");
+					return;
+				}
+			}
+			
+			// Now parse the contents of actor structure
+			string previoustoken = "";
+			done = false; //mxd
+			while(parser.SkipWhitespace(true))
+			{
+				string token = parser.ReadToken();
+				token = token.ToLowerInvariant();
+
+				switch(token) 
+				{
+					case "+":
+					case "-":
+						// Next token is a flag (option) to set or remove
+						bool flagvalue = (token == "+");
+						parser.SkipWhitespace(true);
+						string flagname = parser.ReadToken();
+						if(!string.IsNullOrEmpty(flagname)) 
+						{
+							// Add the flag with its value
+							flagname = flagname.ToLowerInvariant();
+							flags[flagname] = flagvalue;
+						} 
+						else 
+						{
+							parser.ReportError("Expected flag name");
+							return;
+						}
+						break;
+
+					case "action":
+					case "native":
+						// We don't need this, ignore up to the first next ;
+						while(parser.SkipWhitespace(true)) 
+						{
+							string t = parser.ReadToken();
+							if(string.IsNullOrEmpty(t) || t == ";") break;
+						}
+						break;
+
+					case "skip_super":
+						skipsuper = true;
+						break;
+
+					case "states":
+						// Now parse actor states until we reach the end of the states structure
+						while(parser.SkipWhitespace(true)) 
+						{
+							string statetoken = parser.ReadToken();
+							if(!string.IsNullOrEmpty(statetoken)) 
+							{
+								// Start of scope?
+								if(statetoken == "{") 
+								{
+									// This is fine
+								}
+								// End of scope?
+								else if(statetoken == "}") 
+								{
+									// Done with the states,
+									// break out of this parse loop
+									break;
+								}
+								// State label?
+								else if(statetoken == ":") 
+								{
+									if(!string.IsNullOrEmpty(previoustoken)) 
+									{
+										// Parse actor state
+										StateStructure st = new StateStructure(this, parser);
+										if(parser.HasError) return;
+										states[previoustoken.ToLowerInvariant()] = st;
+									} 
+									else 
+									{
+										parser.ReportError("Unexpected end of structure");
+										return;
+									}
+								} 
+								else 
+								{
+									// Keep token
+									previoustoken = statetoken;
+								}
+							}
+							else 
+							{
+								parser.ReportError("Unexpected end of structure");
+								return;
+							}
+						}
+						break;
+
+					case "var": //mxd
+						while(parser.SkipWhitespace(true)) 
+						{
+							string t = parser.ReadToken();
+							if(string.IsNullOrEmpty(t) || t == ";") break;
+							if(t.StartsWith("user_") && !userVars.Contains(t))
+								userVars.Add(t);
+						}
+						break;
+
+					case "}":
+						// Actor scope ends here,
+						// break out of this parse loop
+						done = true;
+						break;
+
+					// Monster property?
+					case "monster":
+						// This sets certain flags we are interested in
+						flags["shootable"] = true;
+						flags["countkill"] = true;
+						flags["solid"] = true;
+						flags["canpushwalls"] = true;
+						flags["canusewalls"] = true;
+						flags["activatemcross"] = true;
+						flags["canpass"] = true;
+						flags["ismonster"] = true;
+						break;
+
+					// Projectile property?
+					case "projectile":
+						// This sets certain flags we are interested in
+						flags["noblockmap"] = true;
+						flags["nogravity"] = true;
+						flags["dropoff"] = true;
+						flags["missile"] = true;
+						flags["activateimpact"] = true;
+						flags["activatepcross"] = true;
+						flags["noteleport"] = true;
+						break;
+
+					// Clearflags property?
+					case "clearflags":
+						// Clear all flags
+						flags.Clear();
+						break;
+
+					// Game property?
+					case "game":
+						// Include all tokens on the same line
+						List<string> games = new List<string>();
+						while(parser.SkipWhitespace(false)) 
+						{
+							string v = parser.ReadToken();
+							if(string.IsNullOrEmpty(v)) 
+							{
+								parser.ReportError("Unexpected end of structure");
+								return;
+							}
+							if(v == "\n") break;
+							if(v == "}") return; //mxd
+							if(v != ",") games.Add(v.ToLowerInvariant());
+						}
+						props[token] = games;
+						break;
+
+					// Property
+					default:
+						// Property begins with $? Then the whole line is a single value
+						if(token.StartsWith("$")) 
+						{
+							// This is for editor-only properties such as $sprite and $category
+							props[token] = new List<string> { (parser.SkipWhitespace(false) ? parser.ReadLine() : "") };
+						} 
+						else 
+						{
+							// Next tokens up until the next newline are values
+							List<string> values = new List<string>();
+							while(parser.SkipWhitespace(false)) 
+							{
+								string v = parser.ReadToken();
+								if(string.IsNullOrEmpty(v)) 
+								{
+									parser.ReportError("Unexpected end of structure");
+									return;
+								}
+								if(v == "\n") break;
+								if(v == "}") return; //mxd
+								if(v != ",") values.Add(v);
+							}
+
+							//mxd. Translate scale to xscale and yscale
+							if(token == "scale")
+							{
+								props["xscale"] = values;
+								props["yscale"] = values;
+							}
+							else
+							{
+								props[token] = values;
+							}
+						}
+						break;
+				}
+
+				if(done) break; //mxd
+
+				// Keep token
+				previoustoken = token;
+			}
+
+			//mxd. Check if baseclass is valid
+			if(inheritclass.ToLowerInvariant() != "actor" && doomednum > -1 && baseclass == null) 
+			{
+				//check if this class inherits from a class defined in game configuration
+				Dictionary<int, ThingTypeInfo> things = General.Map.Config.GetThingTypes();
+				string inheritclasscheck = inheritclass.ToLowerInvariant();
+
+				foreach(KeyValuePair<int, ThingTypeInfo> ti in things) 
+				{
+					if(!string.IsNullOrEmpty(ti.Value.ClassName) && ti.Value.ClassName.ToLowerInvariant() == inheritclasscheck) 
+					{
+						//states
+						if(states.Count == 0 && !string.IsNullOrEmpty(ti.Value.Sprite))
+							states.Add("spawn", new StateStructure(ti.Value.Sprite.Substring(0, 4)));
+
+						//flags
+						if(ti.Value.Hangs && !flags.ContainsKey("spawnceiling"))
+							flags["spawnceiling"] = true;
+
+						if(ti.Value.Blocking > 0 && !flags.ContainsKey("solid"))
+							flags["solid"] = true;
+						
+						//properties
+						if(!props.ContainsKey("height"))
+							props["height"] = new List<string> { ti.Value.Height.ToString() };
+
+						if(!props.ContainsKey("radius"))
+							props["radius"] = new List<string> { ti.Value.Radius.ToString() };
+
+						return;
+					}
+				}
+
+				parser.LogWarning("Unable to find '" + inheritclass + "' class to inherit from, while parsing '" + classname + ":" + doomednum + "'");
+			}
+		}
+		
+		// Disposer
+		public void Dispose()
+		{
+			baseclass = null;
+			flags = null;
+			props = null;
+			states = null;
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+		
+		/// <summary>
+		/// This checks if the actor has a specific property.
+		/// </summary>
+		public bool HasProperty(string propname)
+		{
+			if(props.ContainsKey(propname)) return true;
+			if(!skipsuper && (baseclass != null)) return baseclass.HasProperty(propname);
+			return false;
+		}
+		
+		/// <summary>
+		/// This checks if the actor has a specific property with at least one value.
+		/// </summary>
+		public bool HasPropertyWithValue(string propname)
+		{
+			if(props.ContainsKey(propname) && (props[propname].Count > 0)) return true;
+			if(!skipsuper && (baseclass != null)) return baseclass.HasPropertyWithValue(propname);
+			return false;
+		}
+		
+		/// <summary>
+		/// This returns values of a specific property as a complete string. Returns an empty string when the propery has no values.
+		/// </summary>
+		public string GetPropertyAllValues(string propname)
+		{
+			if(props.ContainsKey(propname) && (props[propname].Count > 0))
+				return string.Join(" ", props[propname].ToArray());
+			if(!skipsuper && (baseclass != null))
+				return baseclass.GetPropertyAllValues(propname);
+			return "";
+		}
+		
+		/// <summary>
+		/// This returns a specific value of a specific property as a string. Returns an empty string when the propery does not have the specified value.
+		/// </summary>
+		public string GetPropertyValueString(string propname, int valueindex)
+		{
+			if(props.ContainsKey(propname) && (props[propname].Count > valueindex))
+				return props[propname][valueindex];
+			if(!skipsuper && (baseclass != null))
+				return baseclass.GetPropertyValueString(propname, valueindex);
+			return "";
+		}
+		
+		/// <summary>
+		/// This returns a specific value of a specific property as an integer. Returns 0 when the propery does not have the specified value.
+		/// </summary>
+		public int GetPropertyValueInt(string propname, int valueindex)
+		{
+			string str = GetPropertyValueString(propname, valueindex);
+
+			//mxd. It can be negative...
+			if(str == "-" && props.Count > valueindex + 1) 
+				str += GetPropertyValueString(propname, valueindex + 1);
+			
+			int intvalue;
+			if(int.TryParse(str, NumberStyles.Integer, CultureInfo.InvariantCulture, out intvalue))
+				return intvalue;
+			return 0;
+		}
+		
+		/// <summary>
+		/// This returns a specific value of a specific property as a float. Returns 0.0f when the propery does not have the specified value.
+		/// </summary>
+		public float GetPropertyValueFloat(string propname, int valueindex)
+		{
+			string str = GetPropertyValueString(propname, valueindex);
+
+			//mxd. It can be negative...
+			if(str == "-" && props.Count > valueindex + 1)
+				str += GetPropertyValueString(propname, valueindex + 1);
+
+			float fvalue;
+			if(float.TryParse(str, NumberStyles.Float, CultureInfo.InvariantCulture, out fvalue))
+				return fvalue;
+			return 0.0f;
+		}
+		
+		/// <summary>
+		/// This returns the status of a flag.
+		/// </summary>
+		public bool HasFlagValue(string flag)
+		{
+			if(flags.ContainsKey(flag)) return true;
+			if(!skipsuper && (baseclass != null)) return baseclass.HasFlagValue(flag);
+			return false;
+		}
+		
+		/// <summary>
+		/// This returns the status of a flag.
+		/// </summary>
+		public bool GetFlagValue(string flag, bool defaultvalue)
+		{
+			if(flags.ContainsKey(flag)) return flags[flag];
+			if(!skipsuper && (baseclass != null)) return baseclass.GetFlagValue(flag, defaultvalue);
+			return defaultvalue;
+		}
+		
+		/// <summary>
+		/// This checks if a state has been defined.
+		/// </summary>
+		public bool HasState(string statename)
+		{
+			if(states.ContainsKey(statename)) return true;
+			if(!skipsuper && (baseclass != null)) return baseclass.HasState(statename);
+			return false;
+		}
+		
+		/// <summary>
+		/// This returns a specific state, or null when the state can't be found.
+		/// </summary>
+		public StateStructure GetState(string statename)
+		{
+			if(states.ContainsKey(statename)) return states[statename];
+			if(!skipsuper && (baseclass != null)) return baseclass.GetState(statename);
+			return null;
+		}
+		
+		/// <summary>
+		/// This creates a list of all states, also those inherited from the base class.
+		/// </summary>
+		public Dictionary<string, StateStructure> GetAllStates()
+		{
+			Dictionary<string, StateStructure> list = new Dictionary<string, StateStructure>(states);
+			
+			if(!skipsuper && (baseclass != null))
+			{
+				Dictionary<string, StateStructure> baselist = baseclass.GetAllStates();
+				foreach(KeyValuePair<string, StateStructure> s in baselist)
+					if(!list.ContainsKey(s.Key)) list.Add(s.Key, s.Value);
+			}
+			
+			return list;
+		}
+		
+		/// <summary>
+		/// This checks if this actor is meant for the current decorate game support
+		/// </summary>
+		public bool CheckActorSupported()
+		{
+			// Check if we want to include this actor
+			string includegames = General.Map.Config.DecorateGames.ToLowerInvariant();
+			bool includeactor = (props["game"].Count == 0);
+			foreach(string g in props["game"])
+				includeactor |= includegames.Contains(g);
+			
+			return includeactor;
+		}
+		
+		/// <summary>
+		/// This finds the best suitable sprite to use when presenting this actor to the user.
+		/// </summary>
+		public string FindSuitableSprite()
+		{
+			string result = string.Empty;
+			
+			// Sprite forced?
+			if(HasPropertyWithValue("$sprite"))
+			{
+				return GetPropertyValueString("$sprite", 0);
+			}
+			else
+			{
+				// Try the idle state
+				if(HasState("idle"))
+				{
+					StateStructure s = GetState("idle");
+					string spritename = s.GetSprite(0);
+					if(!string.IsNullOrEmpty(spritename))
+						result = spritename;
+				}
+				
+				// Try the see state
+				if(string.IsNullOrEmpty(result) && HasState("see"))
+				{
+					StateStructure s = GetState("see");
+					string spritename = s.GetSprite(0);
+					if(!string.IsNullOrEmpty(spritename))
+						result = spritename;
+				}
+				
+				// Try the inactive state
+				if(string.IsNullOrEmpty(result) && HasState("inactive"))
+				{
+					StateStructure s = GetState("inactive");
+					string spritename = s.GetSprite(0);
+					if(!string.IsNullOrEmpty(spritename))
+						result = spritename;
+				}
+				
+				// Try the spawn state
+				if(string.IsNullOrEmpty(result) && HasState("spawn"))
+				{
+					StateStructure s = GetState("spawn");
+					string spritename = s.GetSprite(0);
+					if(!string.IsNullOrEmpty(spritename))
+						result = spritename;
+				}
+				
+				// Still no sprite found? then just pick the first we can find
+				if(string.IsNullOrEmpty(result))
+				{
+					Dictionary<string, StateStructure> list = GetAllStates();
+					foreach(StateStructure s in list.Values)
+					{
+						string spritename = s.GetSprite(0);
+						if(!string.IsNullOrEmpty(spritename))
+						{
+							result = spritename;
+							break;
+						}
+					}
+				}
+				
+				if(!string.IsNullOrEmpty(result))
+				{
+					// The sprite name is not actually complete, we still have to append
+					// the direction characters to it. Find an existing sprite with direction.
+					foreach(string postfix in SPRITE_POSTFIXES)
+					{
+						if(General.Map.Data.GetSpriteExists(result + postfix))
+							return result + postfix;
+					}
+				}
+			}
+			
+			// No sprite found
+			return string.Empty;
+		}
+
+		//mxd. 
+		///TODO: rewrite this
+		public string FindSuitableVoxel(Dictionary<string, bool> voxels) 
+		{
+			string result = string.Empty;
+			
+			// Try the idle state
+			if(HasState("idle")) 
+			{
+				StateStructure s = GetState("idle");
+				string spritename = s.GetSprite(0);
+				if(!string.IsNullOrEmpty(spritename)) result = spritename;
+			}
+
+			// Try the see state
+			if(string.IsNullOrEmpty(result) && HasState("see")) 
+			{
+				StateStructure s = GetState("see");
+				string spritename = s.GetSprite(0);
+				if(!string.IsNullOrEmpty(spritename)) result = spritename;
+			}
+
+			// Try the inactive state
+			if(string.IsNullOrEmpty(result) && HasState("inactive")) 
+			{
+				StateStructure s = GetState("inactive");
+				string spritename = s.GetSprite(0);
+				if(!string.IsNullOrEmpty(spritename)) result = spritename;
+			}
+
+			// Try the spawn state
+			if(string.IsNullOrEmpty(result) && HasState("spawn")) 
+			{
+				StateStructure s = GetState("spawn");
+				string spritename = s.GetSprite(0);
+				if(!string.IsNullOrEmpty(spritename)) result = spritename;
+			}
+
+			// Still no sprite found? then just pick the first we can find
+			if(string.IsNullOrEmpty(result)) 
+			{
+				Dictionary<string, StateStructure> list = GetAllStates();
+				foreach(StateStructure s in list.Values) 
+				{
+					string spritename = s.GetSprite(0);
+					if(!string.IsNullOrEmpty(spritename)) 
+					{
+						result = spritename;
+						break;
+					}
+				}
+			}
+
+			if(!string.IsNullOrEmpty(result)) 
+			{
+				if(voxels.ContainsKey(result)) return result;
+
+				// The sprite name may be incomplete. Find an existing sprite with direction.
+				foreach(string postfix in SPRITE_POSTFIXES)
+					if(voxels.ContainsKey(result + postfix)) return result + postfix;
+			}
+
+
+			// No voxel found
+			return "";
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/ZDoom/AnimdefsParser.cs b/Source/Core/ZDoom/AnimdefsParser.cs
new file mode 100644
index 0000000..d48cc9b
--- /dev/null
+++ b/Source/Core/ZDoom/AnimdefsParser.cs
@@ -0,0 +1,156 @@
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using System.IO;
+using CodeImp.DoomBuilder.Data;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.ZDoom
+{
+	public struct CameraTextureData
+	{
+		public string Name;
+		public int Width;
+		public int Height;
+		public float ScaleX;
+		public float ScaleY;
+		public bool WorldPanning;
+		public bool FitTexture;
+	}
+	
+	//mxd. Currently this only parses cameratextures
+	internal sealed class AnimdefsParser : ZDTextParser
+	{
+		#region ================== Variables
+
+		private readonly Dictionary<string, CameraTextureData> cameratextures;
+
+		#endregion
+
+		#region ================== Properties
+
+		public Dictionary<string, CameraTextureData> CameraTextures { get { return cameratextures; } }
+
+		#endregion
+
+		#region ================== Constructor
+
+		internal AnimdefsParser()
+		{
+			cameratextures = new Dictionary<string, CameraTextureData>();
+		}
+
+		#endregion
+
+		#region ================== Parsing
+
+		public override bool Parse(Stream stream, string sourcefilename, bool clearerrors)
+		{
+			if(!base.Parse(stream, sourcefilename, clearerrors)) return false;
+
+			// Continue until at the end of the stream
+			while(SkipWhitespace(true))
+			{
+				string token = ReadToken();
+				if(string.IsNullOrEmpty(token) || string.Compare(token, "CAMERATEXTURE", true) != 0) continue;
+
+				// Texture name
+				SkipWhitespace(true);
+				string texturename = StripTokenQuotes(ReadToken(false));
+				if(string.IsNullOrEmpty(texturename))
+				{
+					ReportError("Expected camera texture name");
+					return false;
+				}
+
+				// Camera texture names are limited to 8 chars
+				if(texturename.Length > DataManager.CLASIC_IMAGE_NAME_LENGTH)
+				{
+					ReportError("Camera texture names must be no longer than " + DataManager.CLASIC_IMAGE_NAME_LENGTH + " chars");
+					return false;
+				}
+
+				// Width
+				int width = -1;
+				SkipWhitespace(true);
+				if(!ReadSignedInt(ref width) || width < 1)
+				{
+					ReportError("Expected camera texture width");
+					return false;
+				}
+
+				// Height
+				int height = -1;
+				SkipWhitespace(true);
+				if(!ReadSignedInt(ref height) || height < 1)
+				{
+					ReportError("Expected camera texture height");
+					return false;
+				}
+
+				// "Fit" keyword?
+				bool worldpanning = false;
+				bool fit = false;
+				float scalex = 1.0f;
+				float scaley = 1.0f;
+
+				if(NextTokenIs("fit", false))
+				{
+					fit = true;
+					int fitwidth = width;
+					int fitheight = height;
+					
+					// Fit width
+					SkipWhitespace(true);
+					if(!ReadSignedInt(ref fitwidth) || fitwidth < 1)
+					{
+						ReportError("Expected camera texture fit width");
+						return false;
+					}
+
+					// Fit height
+					SkipWhitespace(true);
+					if(!ReadSignedInt(ref fitheight) || fitheight < 1)
+					{
+						ReportError("Expected camera texture fit height");
+						return false;
+					}
+
+					// Update scale
+					scalex = (float)fitwidth / width;
+					scaley = (float)fitheight / height;
+
+					// WorldPanning
+					worldpanning = NextTokenIs("worldpanning", false);
+				}
+				else if(NextTokenIs("worldpanning", false))
+				{
+					worldpanning = true;
+				}
+
+				// Check results
+				if(cameratextures.ContainsKey(texturename.ToUpperInvariant()))
+				{
+					ReportError("Camera texture '" + texturename + "' is defined more than once");
+					return false;
+				}
+
+				// Store results
+				texturename = texturename.ToUpperInvariant();
+				cameratextures[texturename] = new CameraTextureData { Name = texturename, Width = width, Height = height, 
+																	  ScaleX = scalex, ScaleY = scaley, 
+																	  WorldPanning = worldpanning, FitTexture = fit };
+			}
+
+			return true;
+		}
+
+		protected override string GetLanguageType()
+		{
+			return "ANIMDEFS";
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/ZDoom/DecorateParser.cs b/Source/Core/ZDoom/DecorateParser.cs
new file mode 100644
index 0000000..040fb4e
--- /dev/null
+++ b/Source/Core/ZDoom/DecorateParser.cs
@@ -0,0 +1,301 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.ZDoom
+{
+	public sealed class DecorateParser : ZDTextParser
+	{
+		#region ================== Delegates
+
+		public delegate void IncludeDelegate(DecorateParser parser, string includefile);
+		
+		public IncludeDelegate OnInclude;
+		
+		#endregion
+		
+		#region ================== Constants
+		
+		#endregion
+		
+		#region ================== Variables
+		
+		// These are actors we want to keep
+		private Dictionary<string, ActorStructure> actors;
+		
+		// These are all parsed actors, also those from other games
+		private Dictionary<string, ActorStructure> archivedactors;
+
+		//mxd. Includes tracking
+		private readonly HashSet<string> parsedlumps; 
+		
+		#endregion
+		
+		#region ================== Properties
+		
+		/// <summary>
+		/// All actors that are supported by the current game.
+		/// </summary>
+		public ICollection<ActorStructure> Actors { get { return actors.Values; } }
+
+		/// <summary>
+		/// All actors defined in the loaded DECORATE structures. This includes actors not supported in the current game.
+		/// </summary>
+		public ICollection<ActorStructure> AllActors { get { return archivedactors.Values; } }
+
+		/// <summary>
+		/// mxd. All actors that are supported by the current game.
+		/// </summary>
+		internal Dictionary<string, ActorStructure> ActorsByClass { get { return actors; } }
+
+		/// <summary>
+		/// mxd. All actors defined in the loaded DECORATE structures. This includes actors not supported in the current game.
+		/// </summary>
+		internal Dictionary<string, ActorStructure> AllActorsByClass { get { return archivedactors; } }
+
+		#endregion
+		
+		#region ================== Constructor / Disposer
+		
+		// Constructor
+		public DecorateParser()
+		{
+			// Syntax
+			whitespace = "\n \t\r\u00A0"; //mxd. non-breaking space is also space :)
+			specialtokens = ":{}+-\n;,";
+			
+			// Initialize
+			actors = new Dictionary<string, ActorStructure>(StringComparer.Ordinal);
+			archivedactors = new Dictionary<string, ActorStructure>(StringComparer.Ordinal);
+			parsedlumps = new HashSet<string>(StringComparer.OrdinalIgnoreCase); //mxd
+		}
+		
+		// Disposer
+		public void Dispose()
+		{
+			foreach(KeyValuePair<string, ActorStructure> a in archivedactors)
+				a.Value.Dispose();
+			
+			actors = null;
+			archivedactors = null;
+		}
+		
+		#endregion
+
+		#region ================== Parsing
+
+		// This parses the given decorate stream
+		// Returns false on errors
+		public override bool Parse(Stream stream, string sourcefilename, bool clearerrors)
+		{
+			if(!base.Parse(stream, sourcefilename, clearerrors)) return false;
+			
+			// Keep local data
+			Stream localstream = datastream;
+			string localsourcename = sourcename;
+			BinaryReader localreader = datareader;
+			
+			// Continue until at the end of the stream
+			while(SkipWhitespace(true))
+			{
+				// Read a token
+				string objdeclaration = ReadToken();
+				if(!string.IsNullOrEmpty(objdeclaration))
+				{
+					objdeclaration = objdeclaration.ToLowerInvariant();
+					switch(objdeclaration)
+					{
+						case "actor":
+						{
+							// Read actor structure
+							ActorStructure actor = new ActorStructure(this);
+							if(this.HasError) return false;
+						
+							// Add the actor
+							archivedactors[actor.ClassName.ToLowerInvariant()] = actor;
+							if(actor.CheckActorSupported())
+								actors[actor.ClassName.ToLowerInvariant()] = actor;
+						
+							// Replace an actor?
+							if(actor.ReplacesClass != null)
+							{
+								if(GetArchivedActorByName(actor.ReplacesClass) != null)
+									archivedactors[actor.ReplacesClass.ToLowerInvariant()] = actor;
+								else
+									LogWarning("Unable to find '" + actor.ReplacesClass + "' class to replace, while parsing '" + actor.ClassName + "'");
+							
+								if(actor.CheckActorSupported() && GetActorByName(actor.ReplacesClass) != null)
+									actors[actor.ReplacesClass.ToLowerInvariant()] = actor;
+							}
+						}
+						break;
+
+						case "#include":
+						{
+							//INFO: ZDoom DECORATE include paths can't be relative ("../actor.txt") 
+							//or absolute ("d:/project/actor.txt") 
+							//or have backward slashes ("info\actor.txt")
+							//include paths are relative to the first parsed entry, not the current one 
+							//also include paths may or may not be quoted
+							SkipWhitespace(true);
+							string filename = StripTokenQuotes(ReadToken(false)); //mxd. Don't skip newline
+
+							//mxd. Sanity checks
+							if(string.IsNullOrEmpty(filename))
+							{
+								ReportError("Expected file name to include");
+								return false;
+							}
+
+							//mxd. Absolute paths are not supported...
+							if(Path.IsPathRooted(filename))
+							{
+								ReportError("Absolute include paths are not supported by ZDoom");
+								return false;
+							}
+
+							//mxd. Relative paths are not supported
+							if(filename.StartsWith(RELATIVE_PATH_MARKER) || filename.StartsWith(CURRENT_FOLDER_PATH_MARKER) ||
+							   filename.StartsWith(ALT_RELATIVE_PATH_MARKER) || filename.StartsWith(ALT_CURRENT_FOLDER_PATH_MARKER))
+							{
+								ReportError("Relative include paths are not supported by ZDoom");
+								return false;
+							}
+
+							//mxd. Backward slashes are not supported
+							if(filename.Contains(Path.DirectorySeparatorChar.ToString(CultureInfo.InvariantCulture)))
+							{
+								ReportError("Only forward slashes are supported by ZDoom");
+								return false;
+							}
+
+							//mxd. Already parsed?
+							if(parsedlumps.Contains(filename))
+							{
+								ReportError("Already parsed '" + filename + "'. Check your include directives");
+								return false;
+							}
+
+							//mxd. Add to collection
+							parsedlumps.Add(filename);
+
+							// Callback to parse this file now
+							if(OnInclude != null) OnInclude(this, filename);
+
+							//mxd. Bail out on error
+							if(this.HasError) return false;
+
+							// Set our buffers back to continue parsing
+							datastream = localstream;
+							datareader = localreader;
+							sourcename = localsourcename;
+						}
+						break;
+
+						case "enum":
+						case "native":
+						case "const":
+							while(SkipWhitespace(true))
+							{
+								string t = ReadToken();
+								if(string.IsNullOrEmpty(t) || t == ";") break;
+							}
+							break;
+
+						case "$gzdb_skip": break;
+
+						default:
+						{
+							// Unknown structure!
+							// Best we can do now is just find the first { and then
+							// follow the scopes until the matching } is found
+							string token2;
+							do
+							{
+								if(!SkipWhitespace(true)) break;
+								token2 = ReadToken();
+								if(string.IsNullOrEmpty(token2)) break;
+							}
+							while(token2 != "{");
+
+							int scopelevel = 1;
+							do
+							{
+								if(!SkipWhitespace(true)) break;
+								token2 = ReadToken();
+								if(string.IsNullOrEmpty(token2)) break;
+								if(token2 == "{") scopelevel++;
+								if(token2 == "}") scopelevel--;
+							}
+							while(scopelevel > 0);
+						}
+						break;
+					}
+				}
+			}
+			
+			// Return true when no errors occurred
+			return (ErrorDescription == null);
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+		
+		/// <summary>
+		/// This returns a supported actor by name. Returns null when no supported actor with the specified name can be found. This operation is of O(1) complexity.
+		/// </summary>
+		public ActorStructure GetActorByName(string name)
+		{
+			name = name.ToLowerInvariant();
+			return actors.ContainsKey(name) ? actors[name] : null;
+		}
+
+		/// <summary>
+		/// This returns a supported actor by DoomEdNum. Returns null when no supported actor with the specified name can be found. Please note that this operation is of O(n) complexity!
+		/// </summary>
+		public ActorStructure GetActorByDoomEdNum(int doomednum)
+		{
+			foreach(ActorStructure a in actors.Values)
+				if(a.DoomEdNum == doomednum) return a;
+			return null;
+		}
+
+		// This returns an actor by name
+		// Returns null when actor cannot be found
+		internal ActorStructure GetArchivedActorByName(string name)
+		{
+			name = name.ToLowerInvariant();
+			return (archivedactors.ContainsKey(name) ? archivedactors[name] : null);
+		}
+
+		//mxd
+		protected override string GetLanguageType()
+		{
+			return "DECORATE";
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/ZDoom/PatchStructure.cs b/Source/Core/ZDoom/PatchStructure.cs
new file mode 100644
index 0000000..17fb609
--- /dev/null
+++ b/Source/Core/ZDoom/PatchStructure.cs
@@ -0,0 +1,295 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Globalization;
+using CodeImp.DoomBuilder.Data;
+using System.IO;
+using CodeImp.DoomBuilder.Rendering;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.ZDoom
+{
+	public sealed class PatchStructure
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		// Declaration
+		private string name;
+		private int offsetx;
+		private int offsety;
+		private bool flipx;
+		private bool flipy;
+		private float alpha;
+		private int rotation; //mxd
+		private TexturePathRenderStyle renderStyle; //mxd
+		private PixelColor blendColor; //mxd
+		private TexturePathBlendStyle blendStyle; //mxd
+		private float tintAmmount; //mxd
+		private static string[] renderStyles = { "copy", "translucent", "add", "subtract", "reversesubtract", "modulate", "copyalpha", "copynewalpha", "overlay" }; //mxd
+
+		#endregion
+
+		#region ================== Properties
+
+		public string Name { get { return name; } }
+		public int OffsetX { get { return offsetx; } }
+		public int OffsetY { get { return offsety; } }
+		public bool FlipX { get { return flipx; } }
+		public bool FlipY { get { return flipy; } }
+		public float Alpha { get { return alpha; } }
+		public int Rotation { get { return rotation; } } //mxd
+		public TexturePathRenderStyle RenderStyle { get { return renderStyle; } } //mxd
+		public TexturePathBlendStyle BlendStyle { get { return blendStyle; } }
+		public float TintAmmount { get { return tintAmmount; } }
+		public PixelColor BlendColor { get { return blendColor; } }//mxd
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		internal PatchStructure(TexturesParser parser)
+		{
+			// Initialize
+			alpha = 1.0f;
+			renderStyle = TexturePathRenderStyle.Copy;//mxd
+			blendStyle = TexturePathBlendStyle.None; //mxd
+			
+			// There should be 3 tokens separated by 2 commas now:
+			// Name, Width, Height
+
+			// First token is the class name
+			parser.SkipWhitespace(true);
+			name = parser.StripTokenQuotes(parser.ReadToken(false)); //mxd. Don't skip newline
+			if(string.IsNullOrEmpty(name))
+			{
+				parser.ReportError("Expected patch name");
+				return;
+			}
+
+			//mxd
+			name = name.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
+
+			// Now we should find a comma
+			if(!parser.NextTokenIs(",")) return; //mxd
+
+			// Next is the patch width
+			parser.SkipWhitespace(true);
+			string tokenstr = parser.ReadToken();
+			if(string.IsNullOrEmpty(tokenstr) || !int.TryParse(tokenstr, NumberStyles.Integer, CultureInfo.InvariantCulture, out offsetx))
+			{
+				parser.ReportError("Expected offset in pixels");
+				return;
+			}
+
+			// Now we should find a comma again
+			if(!parser.NextTokenIs(",")) return; //mxd
+
+			// Next is the patch height
+			parser.SkipWhitespace(true);
+			tokenstr = parser.ReadToken();
+			if(string.IsNullOrEmpty(tokenstr) || !int.TryParse(tokenstr, NumberStyles.Integer, CultureInfo.InvariantCulture, out offsety))
+			{
+				parser.ReportError("Expected offset in pixels");
+				return;
+			}
+
+			// Next token is the beginning of the texture scope. If not, then the patch info ends here.
+			if(!parser.NextTokenIs("{", false)) return; //mxd
+
+			// Now parse the contents of texture structure
+			bool done = false; //mxd
+			while(!done && parser.SkipWhitespace(true))
+			{
+				string token = parser.ReadToken();
+				token = token.ToLowerInvariant();
+
+				switch(token) 
+				{
+					case "flipx":
+						flipx = true;
+						break;
+
+					case "flipy":
+						flipy = true;
+						break;
+
+					case "alpha":
+						if(!ReadTokenFloat(parser, token, out alpha)) return;
+						alpha = General.Clamp(alpha, 0.0f, 1.0f);
+						break;
+
+					case "rotate":
+						if(!ReadTokenInt(parser, token, out rotation)) return;
+						rotation = rotation % 360; //Coalesce multiples
+						if(rotation < 0) rotation += 360; //Force positive
+
+						if(rotation != 0 && rotation != 90 && rotation != 180 && rotation != 270) 
+						{
+							parser.LogWarning("Unsupported rotation (" + rotation + ") in patch '" + name + "'");
+							rotation = 0;
+						}
+						break;
+
+					case "style": //mxd
+						string s;
+						if(!ReadTokenString(parser, token, out s)) return;
+						int index = Array.IndexOf(renderStyles, s.ToLowerInvariant());
+						renderStyle = index == -1 ? TexturePathRenderStyle.Copy : (TexturePathRenderStyle) index;
+						break;
+
+					case "blend": //mxd
+						int val;
+						if(!ReadTokenColor(parser, token, out val)) return;
+						blendColor = PixelColor.FromInt(val);
+
+						parser.SkipWhitespace(false);
+						token = parser.ReadToken();
+
+						if(token == ",") //read tint ammount
+						{ 
+							parser.SkipWhitespace(false);
+							if(!ReadTokenFloat(parser, token, out tintAmmount)) return;
+							tintAmmount = General.Clamp(tintAmmount, 0.0f, 1.0f);
+							blendStyle = TexturePathBlendStyle.Tint;
+						} 
+						else 
+						{
+							blendStyle = TexturePathBlendStyle.Blend;
+							// Rewind so this structure can be read again
+							parser.DataStream.Seek(-token.Length, SeekOrigin.Current);
+						}
+						break;
+
+					case "}":
+						// Patch scope ends here,
+						// break out of this parse loop
+						done = true;
+						break;
+				}
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This reads the next token and sets a floating point value, returns false when failed
+		private static bool ReadTokenFloat(TexturesParser parser, string propertyname, out float value)
+		{
+			// Next token is the property value to set
+			parser.SkipWhitespace(true);
+			string strvalue = parser.ReadToken();
+			if(!string.IsNullOrEmpty(strvalue))
+			{
+				// Try parsing as value
+				if(!float.TryParse(strvalue, NumberStyles.Float, CultureInfo.InvariantCulture, out value))
+				{
+					parser.ReportError("Expected numeric value for property '" + propertyname + "'");
+					return false;
+				}
+				// Success
+				return true;
+			}
+
+			// Can't find the property value!
+			parser.ReportError("Expected a value for property '" + propertyname + "'");
+			value = 0.0f;
+			return false;
+		}
+
+		// This reads the next token and sets an integral value, returns false when failed
+		private static bool ReadTokenInt(TexturesParser parser, string propertyname, out int value)
+		{
+			// Next token is the property value to set
+			parser.SkipWhitespace(true);
+			string strvalue = parser.ReadToken();
+			if(!string.IsNullOrEmpty(strvalue))
+			{
+				// Try parsing as value
+				if(!int.TryParse(strvalue, NumberStyles.Integer, CultureInfo.InvariantCulture, out value))
+				{
+					parser.ReportError("Expected integral value for property '" + propertyname + "'");
+					return false;
+				}
+
+				// Success
+				return true;
+			}
+
+			// Can't find the property value!
+			parser.ReportError("Expected a value for property '" + propertyname + "'");
+			value = 0;
+			return false;
+		}
+
+		//mxd. This reads the next token and sets a string value, returns false when failed
+		private static bool ReadTokenString(TexturesParser parser, string propertyname, out string value) 
+		{
+			parser.SkipWhitespace(true);
+			value = parser.StripTokenQuotes(parser.ReadToken());
+			
+			if(string.IsNullOrEmpty(value)) 
+			{
+				// Can't find the property value!
+				parser.ReportError("Expected a value for property '" + propertyname + "'");
+				return false;
+			}
+
+			return true;
+		}
+
+		//mxd. This reads the next token and sets a PixelColor value, returns false when failed
+		private static bool ReadTokenColor(TexturesParser parser, string propertyname, out int value) 
+		{
+			parser.SkipWhitespace(true);
+			string strvalue = parser.StripTokenQuotes(parser.ReadToken());
+			value = 0;
+
+			if(string.IsNullOrEmpty(strvalue)) 
+			{
+				// Can't find the property value!
+				parser.ReportError("Expected a value for property '" + propertyname + "'");
+				return false;
+			}
+
+			if(strvalue[0] != '#') 
+			{
+				parser.ReportError("Expected color value for property '" + propertyname + "'");
+				return false;
+			}
+
+			// Try parsing as value
+			if(!int.TryParse(strvalue.Remove(0, 1), NumberStyles.HexNumber, CultureInfo.InvariantCulture, out value)) 
+			{
+				parser.ReportError("Expected color value for property '" + propertyname + "'");
+				return false;
+			}
+
+			return true;
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Core/ZDoom/ReverbsParser.cs b/Source/Core/ZDoom/ReverbsParser.cs
new file mode 100644
index 0000000..c029194
--- /dev/null
+++ b/Source/Core/ZDoom/ReverbsParser.cs
@@ -0,0 +1,128 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+
+namespace CodeImp.DoomBuilder.ZDoom
+{
+	internal sealed class ReverbsParser : ZDTextParser
+	{
+		private readonly List<string> names;
+		private readonly List<int> firstargs;
+		private readonly List<int> secondargs;
+		private readonly List<int> combinedargs;
+
+		public ReverbsParser() 
+		{
+			names = new List<string>();
+			firstargs = new List<int>();
+			secondargs = new List<int>();
+			combinedargs = new List<int>();
+		}
+		
+		public override bool Parse(Stream stream, string sourcefilename, bool clearerrors)
+		{
+			if(!base.Parse(stream, sourcefilename, clearerrors)) return false;
+
+			// Continue until at the end of the stream
+			while(SkipWhitespace(true)) 
+			{
+				string token = ReadToken();
+
+				if(!string.IsNullOrEmpty(token)) 
+				{
+					if(token == "{") 
+					{
+						// Skip inner properties
+						do 
+						{
+							SkipWhitespace(true);
+							token = ReadToken();
+						} while(!string.IsNullOrEmpty(token) && token != "}");
+					}
+					else 
+					{
+						//this should be reverb name and args
+						string name = StripTokenQuotes(token);
+
+						if(string.IsNullOrEmpty(name))
+						{
+							ReportError("Expected sound environment name");
+							break;
+						}
+
+						// Read first part of the ID
+						SkipWhitespace(true);
+						token = StripTokenQuotes(ReadToken());
+						int arg1;
+						if(!int.TryParse(token, NumberStyles.Integer, CultureInfo.InvariantCulture, out arg1))
+						{
+							ReportError("Expected first part of '" + name + "' sound environment ID, but got '" + token + "'");
+							break;
+						}
+
+						// Read second part of the ID
+						SkipWhitespace(true);
+						token = StripTokenQuotes(ReadToken());
+						int arg2;
+						if(!int.TryParse(token, NumberStyles.Integer, CultureInfo.InvariantCulture, out arg2)) 
+						{
+							ReportError("Expected second part of '" + name + "' sound environment ID, but got '" + token + "'");
+							break;
+						}
+
+						int combined = arg1 * 1000000 + arg2 * 1000;
+						int combinedindex = combinedargs.IndexOf(combined);
+						if(combinedindex != -1)
+						{
+							LogWarning("'" + names[combinedindex] + "' and '" + name + "' sound environments share the same ID (" + arg1 + " " + arg2 + ")");
+						}
+						else
+						{
+							combinedargs.Add(combined);
+							
+							// Add to collections
+							if(names.Contains(name)) 
+							{
+								LogWarning("'" + name + "' sound environment is double-defined in '" + sourcefilename + "'");
+								int index = names.IndexOf(name);
+								firstargs[index] = arg1;
+								secondargs[index] = arg2;
+							} 
+							else 
+							{
+								names.Add(name);
+								firstargs.Add(arg1);
+								secondargs.Add(arg2);
+							}
+						}
+					}
+				}
+			}
+
+			return true;
+		}
+
+		internal Dictionary<string, KeyValuePair<int, int>> GetReverbs() 
+		{
+			string[] sortednames = new string[names.Count];
+			names.CopyTo(sortednames);
+			Array.Sort(sortednames);
+
+			Dictionary<string, KeyValuePair<int, int>> result = new Dictionary<string, KeyValuePair<int, int>>(names.Count);
+
+			foreach(string name in sortednames) 
+			{
+				int index = names.IndexOf(name);
+				result.Add(name, new KeyValuePair<int, int>(firstargs[index], secondargs[index]));
+			}
+
+			return result;
+		}
+
+		protected override string GetLanguageType()
+		{
+			return "REVERBS";
+		}
+	}
+}
diff --git a/Source/Core/ZDoom/SndSeqParser.cs b/Source/Core/ZDoom/SndSeqParser.cs
new file mode 100644
index 0000000..1a38075
--- /dev/null
+++ b/Source/Core/ZDoom/SndSeqParser.cs
@@ -0,0 +1,96 @@
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using System.IO;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.ZDoom
+{
+	internal sealed class SndSeqParser : ZDTextParser
+	{
+		#region ================== Variables
+
+		private readonly List<string> sequences;
+		private readonly List<string> sequencegroups;
+		private readonly HashSet<string> seqencenames;
+
+		#endregion
+
+		#region ================== Constructor
+
+		public SndSeqParser()
+		{
+			specialtokens = "";
+			sequences = new List<string>();
+			sequencegroups = new List<string>();
+			seqencenames = new HashSet<string>();
+		}
+
+		#endregion
+
+		#region ================== Parsing
+
+		public override bool Parse(Stream stream, string sourcefilename, bool clearerrors)
+		{
+			if(!base.Parse(stream, sourcefilename, clearerrors)) return false;
+			
+			char[] dots = new[] { ':' };
+			char[] brace = new[] { '[' };
+
+			// Continue until at the end of the stream
+			while(SkipWhitespace(true))
+			{
+				string token = ReadToken();
+
+				if(!string.IsNullOrEmpty(token))
+				{
+					// Sound sequence definition
+					if(token.StartsWith(":"))
+					{
+						string val = token.TrimStart(dots);
+						if(!string.IsNullOrEmpty(val) && !seqencenames.Contains(val.ToUpper()))
+						{
+							sequences.Add(val);
+							seqencenames.Add(val.ToUpper());
+						}
+					}
+					// Group definition
+					else if(token.StartsWith("["))
+					{
+						string val = token.TrimStart(brace);
+						if(!string.IsNullOrEmpty(val) && !seqencenames.Contains(val.ToUpper()))
+						{
+							sequencegroups.Add(val);
+							seqencenames.Add(val.ToUpper());
+						}
+					} 
+				}
+			}
+
+			return true;
+		}
+
+		internal List<string> GetSoundSequences() 
+		{
+			List<string> result = new List<string>(sequencegroups.Count + sequences.Count);
+			
+			// Add to the collection
+			sequencegroups.Sort();
+			result.AddRange(sequencegroups);
+
+			sequences.Sort();
+			result.AddRange(sequences);
+
+			// Return the collection
+			return result;
+		}
+
+		protected override string GetLanguageType()
+		{
+			return "SNDSEQ";
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/Source/Core/ZDoom/StateGoto.cs b/Source/Core/ZDoom/StateGoto.cs
new file mode 100644
index 0000000..6e71129
--- /dev/null
+++ b/Source/Core/ZDoom/StateGoto.cs
@@ -0,0 +1,207 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+#endregion
+
+namespace CodeImp.DoomBuilder.ZDoom
+{
+	internal sealed class StateGoto
+	{
+		#region ================== Constants
+		
+		#endregion
+		
+		#region ================== Variables
+		
+		private string classname;
+		private string statename;
+		private int spriteoffset;
+		
+		#endregion
+		
+		#region ================== Properties
+		
+		public string ClassName { get { return classname; } }
+		public string StateName { get { return statename; } }
+		public int SpriteOffset { get { return spriteoffset; } }
+		
+		#endregion
+		
+		#region ================== Constructor / Disposer
+		
+		// Constructor
+		internal StateGoto(ActorStructure actor, DecorateParser parser)
+		{
+			string firsttarget = "";
+			string secondtarget = "";
+			bool commentreached = false;
+			bool offsetreached = false;
+			string offsetstr = "";
+			int cindex = 0;
+			
+			// This is a bitch to parse because for some bizarre reason someone thought it
+			// was funny to allow quotes here. Read the whole line and start parsing this manually.
+			string line = parser.ReadLine();
+			
+			// Skip whitespace
+			while((cindex < line.Length) && ((line[cindex] == ' ') || (line[cindex] == '\t')))
+				cindex++;
+			
+			// Parse first target
+			while((cindex < line.Length) && (line[cindex] != ':'))
+			{
+				// When a comment is reached, we're done here
+				if(line[cindex] == '/')
+				{
+					if((cindex + 1 < line.Length) && ((line[cindex + 1] == '/') || (line[cindex + 1] == '*')))
+					{
+						commentreached = true;
+						break;
+					}
+				}
+				
+				// Whitespace ends the string
+				if((line[cindex] == ' ') || (line[cindex] == '\t'))
+					break;
+				
+				// + sign indicates offset start
+				if(line[cindex] == '+')
+				{
+					cindex++;
+					offsetreached = true;
+					break;
+				}
+				
+				// Ignore quotes
+				if(line[cindex] != '"')
+					firsttarget += line[cindex];
+				
+				cindex++;
+			}
+			
+			if(!commentreached && !offsetreached)
+			{
+				// Skip whitespace
+				while((cindex < line.Length) && ((line[cindex] == ' ') || (line[cindex] == '\t')))
+					cindex++;
+				
+				// Parse second target
+				while(cindex < line.Length)
+				{
+					// When a comment is reached, we're done here
+					if(line[cindex] == '/')
+					{
+						if((cindex + 1 < line.Length) && ((line[cindex + 1] == '/') || (line[cindex + 1] == '*')))
+						{
+							commentreached = true;
+							break;
+						}
+					}
+					
+					// Whitespace ends the string
+					if((line[cindex] == ' ') || (line[cindex] == '\t'))
+						break;
+					
+					// + sign indicates offset start
+					if(line[cindex] == '+')
+					{
+						cindex++;
+						offsetreached = true;
+						break;
+					}
+
+					// Ignore quotes and semicolons
+					if((line[cindex] != '"') && (line[cindex] != ':'))
+						secondtarget += line[cindex];
+						
+					cindex++;
+				}
+			}
+			
+			// Try to find the offset if we still haven't found it yet
+			if(!offsetreached)
+			{
+				// Skip whitespace
+				while((cindex < line.Length) && ((line[cindex] == ' ') || (line[cindex] == '\t')))
+					cindex++;
+				
+				if((cindex < line.Length) && (line[cindex] == '+'))
+				{
+					cindex++;
+					offsetreached = true;
+				}
+			}
+			
+			if(offsetreached)
+			{
+				// Parse offset
+				while(cindex < line.Length)
+				{
+					// When a comment is reached, we're done here
+					if(line[cindex] == '/')
+					{
+						if((cindex + 1 < line.Length) && ((line[cindex + 1] == '/') || (line[cindex + 1] == '*')))
+						{
+							commentreached = true;
+							break;
+						}
+					}
+					
+					// Whitespace ends the string
+					if((line[cindex] == ' ') || (line[cindex] == '\t'))
+						break;
+					
+					// Ignore quotes and semicolons
+					if((line[cindex] != '"') && (line[cindex] != ':'))
+						offsetstr += line[cindex];
+					
+					cindex++;
+				}
+			}
+			
+			// We should now have a first target, optionally a second target and optionally a sprite offset
+			
+			// Check if we don't have the class specified
+			if(string.IsNullOrEmpty(secondtarget))
+			{
+				// First target is the state to go to
+				classname = actor.ClassName;
+				statename = firsttarget.ToLowerInvariant().Trim();
+			}
+			else
+			{
+				// First target is the base class to use
+				// Second target is the state to go to
+				classname = firsttarget.ToLowerInvariant().Trim();
+				statename = secondtarget.ToLowerInvariant().Trim();
+			}
+			
+			if(offsetstr.Length > 0)
+				int.TryParse(offsetstr, out spriteoffset);
+				
+			if((classname == "super") && (actor.BaseClass != null))
+				classname = actor.BaseClass.ClassName;
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+
+		#endregion
+	}
+}
diff --git a/Source/Core/ZDoom/StateStructure.cs b/Source/Core/ZDoom/StateStructure.cs
new file mode 100644
index 0000000..7fe6f3e
--- /dev/null
+++ b/Source/Core/ZDoom/StateStructure.cs
@@ -0,0 +1,236 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using System.IO;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.ZDoom
+{
+	public sealed class StateStructure
+	{
+		#region ================== Constants
+		
+		#endregion
+
+		#region ================== Variables
+		
+		// All we care about is the first sprite in the sequence
+		private readonly List<string> sprites;
+		private readonly StateGoto gotostate;
+		private readonly DecorateParser parser;
+		
+		#endregion
+
+		#region ================== Properties
+
+		public int SpritesCount { get { return sprites.Count; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		internal StateStructure(ActorStructure actor, DecorateParser parser)
+		{
+			string lasttoken = "";
+			
+			this.gotostate = null;
+			this.parser = parser;
+			this.sprites = new List<string>();
+			
+			// Skip whitespace
+			while(parser.SkipWhitespace(true))
+			{
+				// Read first token
+				string token = parser.ReadToken();
+				token = token.ToLowerInvariant();
+				
+				// One of the flow control statements?
+				if((token == "loop") || (token == "stop") || (token == "wait") || (token == "fail"))
+				{
+					// Ignore flow control
+				}
+				// Goto?
+				else if(token == "goto")
+				{
+					gotostate = new StateGoto(actor, parser);
+					if(parser.HasError) return;
+				}
+				// Label?
+				else if(token == ":")
+				{
+					// Rewind so that this label can be read again
+					if(!string.IsNullOrEmpty(lasttoken)) 
+						parser.DataStream.Seek(-(lasttoken.Length + 1), SeekOrigin.Current);
+					
+					// Done here
+					return;
+				}
+				//mxd. Start of inner scope?
+				else if(token == "{")
+				{
+					int bracelevel = 1;
+					while(!string.IsNullOrEmpty(token) && bracelevel > 0)
+					{
+						parser.SkipWhitespace(false);
+						token = parser.ReadToken();
+						switch(token)
+						{
+							case "{": bracelevel++; break;
+							case "}": bracelevel--; break;
+						}
+					}
+				}
+				// End of scope?
+				else if(token == "}")
+				{
+					// Rewind so that this scope end can be read again
+					parser.DataStream.Seek(-1, SeekOrigin.Current);
+
+					// Done here
+					return;
+				}
+				else
+				{
+					// First part of the sprite name
+					token = parser.StripTokenQuotes(token); //mxd. First part of the sprite name can be quoted
+					if(string.IsNullOrEmpty(token)) 
+					{
+						parser.ReportError("Unexpected end of structure");
+						return;
+					}
+					
+					// Frames of the sprite name
+					parser.SkipWhitespace(true);
+					string spriteframes = parser.StripTokenQuotes(parser.ReadToken()); //mxd. Frames can be quoted
+					if(string.IsNullOrEmpty(spriteframes))
+					{
+						parser.ReportError("Unexpected end of structure");
+						return;
+					}
+					
+					// Label?
+					if(spriteframes == ":")
+					{
+						// Rewind so that this label can be read again
+						parser.DataStream.Seek(-(token.Length + 1), SeekOrigin.Current);
+
+						// Done here
+						return;
+					}
+					
+					// No first sprite yet?
+					if(spriteframes.Length > 0)
+					{
+						// Make the sprite name
+						string spritename = token + spriteframes[0];
+						spritename = spritename.ToUpperInvariant();
+						
+						// Ignore some odd ZDoom things
+						if(!spritename.StartsWith("TNT1") && !spritename.StartsWith("----") && !spritename.Contains("#")) 
+							sprites.Add(spritename);
+					}
+					
+					// Continue until the end of the line
+					string t = parser.ReadToken();
+					while(!string.IsNullOrEmpty(t) && t != "\n")
+					{
+						parser.SkipWhitespace(false);
+						t = parser.ReadToken();
+
+						//mxd. Inner scope start. Step back and reparse using parent loop
+						if(t == "{")
+						{
+							// Rewind so that this scope end can be read again
+							parser.DataStream.Seek(-1, SeekOrigin.Current);
+
+							// Break out of this loop
+							break;
+						}
+						
+						//mxd. Because stuff like this is also valid: "Actor Oneliner { States { Spawn: WOOT A 1 A_FadeOut(0.1) Loop }}"
+						if(t == "}")
+						{
+							// Rewind so that this scope end can be read again
+							parser.DataStream.Seek(-1, SeekOrigin.Current);
+
+							// Done here
+							return;
+						}
+					}
+				}
+				
+				lasttoken = token;
+			}
+		}
+
+		//mxd
+		internal StateStructure(string spritename) 
+		{
+			this.gotostate = null;
+			this.sprites = new List<string> { spritename };
+		}
+
+		#endregion
+
+		#region ================== Methods
+		
+		// This finds the first valid sprite and returns it
+		public string GetSprite(int index)
+		{
+			List<StateStructure> callstack = new List<StateStructure>();
+			return GetSprite(index, callstack);
+		}
+		
+		// This version of GetSprite uses a callstack to check if it isn't going into an endless loop
+		private string GetSprite(int index, List<StateStructure> prevstates)
+		{
+			// If we have sprite of our own, see if we can return this index
+			if(index < sprites.Count) return sprites[index];
+			
+			// Otherwise, continue searching where goto tells us to go
+			if(gotostate != null)
+			{
+				// Find the class
+				ActorStructure a = parser.GetArchivedActorByName(gotostate.ClassName);
+				if(a != null)
+				{
+					StateStructure s = a.GetState(gotostate.StateName);
+					if((s != null) && !prevstates.Contains(s))
+					{
+						prevstates.Add(this);
+						return s.GetSprite(gotostate.SpriteOffset, prevstates);
+					}
+				}
+			}
+			
+			// If there is no goto keyword used, just give us one of our sprites if we can
+			if(sprites.Count > 0)
+			{
+				// The following behavior should really depend on the flow control keyword (loop or stop) but who cares.
+				return sprites[0];
+			}
+			
+			return "";
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/ZDoom/TextureStructure.cs b/Source/Core/ZDoom/TextureStructure.cs
new file mode 100644
index 0000000..0650c93
--- /dev/null
+++ b/Source/Core/ZDoom/TextureStructure.cs
@@ -0,0 +1,260 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using System.Globalization;
+using CodeImp.DoomBuilder.Data;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.ZDoom
+{
+	public sealed class TextureStructure
+	{
+		#region ================== Constants
+
+		// Some odd thing in ZDoom
+		private const string IGNORE_SPRITE = "TNT1A0";
+
+		#endregion
+
+		#region ================== Variables
+
+		// Declaration
+		private readonly string typename;
+		private readonly string name;
+		private readonly string virtualpath; //mxd
+		private readonly int width;
+		private readonly int height;
+		
+		// Properties
+		private readonly float xscale;
+		private readonly float yscale;
+		private readonly int xoffset;
+		private readonly int yoffset;
+		private readonly bool worldpanning;
+		
+		// Patches
+		private readonly List<PatchStructure> patches;
+		
+		#endregion
+
+		#region ================== Properties
+
+		public string TypeName { get { return typename; } }
+		public string Name { get { return name; } }
+		public int Width { get { return width; } }
+		public int Height { get { return height; } }
+		public float XScale { get { return xscale; } }
+		public float YScale { get { return yscale; } }
+		public int XOffset { get { return xoffset; } }
+		public int YOffset { get { return yoffset; } }
+		public bool WorldPanning { get { return worldpanning; } }
+		public ICollection<PatchStructure> Patches { get { return patches; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		internal TextureStructure(TexturesParser parser, string typename, string virtualpath)
+		{
+			// Initialize
+			this.typename = typename;
+			this.virtualpath = virtualpath;
+			patches = new List<PatchStructure>(4);
+			xscale = 0.0f;
+			yscale = 0.0f;
+			
+			// There should be 3 tokens separated by 2 commas now:
+			// Name, Width, Height
+
+			// First token is the texture name
+			parser.SkipWhitespace(true);
+			name = parser.StripTokenQuotes(parser.ReadToken(false)); //mxd. Don't skip newline
+
+			//mxd. It can also be "optional" keyword.
+			if(name.ToLowerInvariant() == "optional")
+			{
+				parser.SkipWhitespace(true);
+				name = parser.StripTokenQuotes(parser.ReadToken(false)); //mxd. Don't skip newline
+			}
+
+			if(string.IsNullOrEmpty(name))
+			{
+				parser.ReportError("Expected " + typename + " name");
+				return;
+			}
+
+			// Now we should find a comma
+			if(!parser.NextTokenIs(",")) return; //mxd
+
+			// Next is the texture width
+			parser.SkipWhitespace(true);
+			string tokenstr = parser.ReadToken();
+			if(string.IsNullOrEmpty(tokenstr) || !int.TryParse(tokenstr, NumberStyles.Integer, CultureInfo.InvariantCulture, out width))
+			{
+				parser.ReportError("Expected width in pixels");
+				return;
+			}
+
+			// Now we should find a comma again
+			if(!parser.NextTokenIs(",")) return; //mxd
+
+			// Next is the texture height
+			parser.SkipWhitespace(true);
+			tokenstr = parser.ReadToken();
+			if(string.IsNullOrEmpty(tokenstr) || !int.TryParse(tokenstr, NumberStyles.Integer, CultureInfo.InvariantCulture, out height))
+			{
+				parser.ReportError("Expected height in pixels");
+				return;
+			}
+
+			// Next token should be the beginning of the texture scope
+			if(!parser.NextTokenIs("{", false)) //mxd
+			{
+				parser.ReportError("Expected begin of structure");
+				return;
+			}
+
+			// Now parse the contents of texture structure
+			bool done = false; //mxd
+			while(!done && parser.SkipWhitespace(true))
+			{
+				string token = parser.ReadToken();
+				token = token.ToLowerInvariant();
+
+				switch(token) 
+				{
+					case "xscale":
+						if(!ReadTokenFloat(parser, token, out xscale)) return;
+						break;
+
+					case "yscale":
+						if(!ReadTokenFloat(parser, token, out yscale)) return;
+						break;
+
+					case "worldpanning":
+						worldpanning = true;
+						break;
+
+					case "offset":
+						// Read x offset
+						if(!ReadTokenInt(parser, token, out xoffset)) return;
+
+						// Now we should find a comma
+						if(!parser.NextTokenIs(",")) return; //mxd
+
+						// Read y offset
+						if(!ReadTokenInt(parser, token, out yoffset)) return;
+						break;
+
+					case "patch":
+						// Read patch structure
+						PatchStructure pt = new PatchStructure(parser);
+						if(parser.HasError) break;
+
+						//mxd. Let's ignore TNT1A0
+						if(pt.Name == IGNORE_SPRITE) break;
+
+						// Add the patch
+						patches.Add(pt);
+						break;
+
+					case "}":
+						// Actor scope ends here,
+						// break out of this parse loop
+						done = true;
+						break;
+				}
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This reads the next token and sets a floating point value, returns false when failed
+		private static bool ReadTokenFloat(TexturesParser parser, string propertyname, out float value)
+		{
+			// Next token is the property value to set
+			parser.SkipWhitespace(true);
+			string strvalue = parser.ReadToken();
+			if(!string.IsNullOrEmpty(strvalue))
+			{
+				// Try parsing as value
+				if(!float.TryParse(strvalue, NumberStyles.Float, CultureInfo.InvariantCulture, out value))
+				{
+					parser.ReportError("Expected numeric value for property '" + propertyname + "'");
+					return false;
+				}
+
+				// Success
+				return true;
+			}
+
+			// Can't find the property value!
+			parser.ReportError("Expected a value for property '" + propertyname + "'");
+			value = 0.0f;
+			return false;
+		}
+
+		// This reads the next token and sets an integral value, returns false when failed
+		private static bool ReadTokenInt(TexturesParser parser, string propertyname, out int value)
+		{
+			// Next token is the property value to set
+			parser.SkipWhitespace(true);
+			string strvalue = parser.ReadToken();
+			if(!string.IsNullOrEmpty(strvalue))
+			{
+				// Try parsing as value
+				if(!int.TryParse(strvalue, NumberStyles.Integer, CultureInfo.InvariantCulture, out value))
+				{
+					parser.ReportError("Expected integral value for property '" + propertyname + "'");
+					return false;
+				}
+
+				// Success
+				return true;
+			}
+
+			// Can't find the property value!
+			parser.ReportError("Expected a value for property '" + propertyname + "'");
+			value = 0;
+			return false;
+		}
+
+		// This makes a HighResImage texture for this texture
+		internal HighResImage MakeImage()
+		{
+			// Determine scale for texture
+			float scalex = ((xscale == 0.0f) ? General.Map.Config.DefaultTextureScale : 1f / xscale);
+			float scaley = ((yscale == 0.0f) ? General.Map.Config.DefaultTextureScale : 1f / yscale);
+
+			// Make texture
+			HighResImage tex = new HighResImage(name, virtualpath, width, height, scalex, scaley, worldpanning, typename == "flat");
+
+			// Add patches
+			foreach(PatchStructure p in patches) tex.AddPatch(new TexturePatch(p));//mxd
+			
+			return tex;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/ZDoom/TexturesParser.cs b/Source/Core/ZDoom/TexturesParser.cs
new file mode 100644
index 0000000..ae213f0
--- /dev/null
+++ b/Source/Core/ZDoom/TexturesParser.cs
@@ -0,0 +1,241 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using CodeImp.DoomBuilder.Data;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.ZDoom
+{
+	public sealed class TexturesParser : ZDTextParser
+	{
+		#region ================== Delegates
+
+		#endregion
+		
+		#region ================== Constants
+		
+		#endregion
+		
+		#region ================== Variables
+
+		private readonly Dictionary<string, TextureStructure> textures;
+		private readonly Dictionary<string, TextureStructure> flats;
+		private readonly Dictionary<string, TextureStructure> sprites;
+		private readonly char[] pathtrimchars = new[] {'_', '.', ' ', '-'}; //mxd
+
+		#endregion
+		
+		#region ================== Properties
+
+		public IEnumerable<TextureStructure> Textures { get { return textures.Values; } }
+		public IEnumerable<TextureStructure> Flats { get { return flats.Values; } }
+		public IEnumerable<TextureStructure> Sprites { get { return sprites.Values; } }
+		
+		#endregion
+		
+		#region ================== Constructor / Disposer
+		
+		// Constructor
+		public TexturesParser()
+		{
+			// Syntax
+			whitespace = "\n \t\r\u00A0"; //mxd. non-breaking space is also space :)
+			specialtokens = ",{}\n";
+
+			// Initialize
+			textures = new Dictionary<string, TextureStructure>(StringComparer.Ordinal);
+			flats = new Dictionary<string, TextureStructure>(StringComparer.Ordinal);
+			sprites = new Dictionary<string, TextureStructure>(StringComparer.Ordinal);
+		}
+		
+		#endregion
+
+		#region ================== Parsing
+
+		// This parses the given stream
+		// Returns false on errors
+		public override bool Parse(Stream stream, string sourcefilename, bool clearerrors)
+		{
+			if(!base.Parse(stream, sourcefilename, clearerrors)) return false;
+
+			//mxd. Make vitrual path from filename
+			string virtualpath = sourcefilename.Substring(8).TrimStart(pathtrimchars);
+			if(virtualpath.ToLowerInvariant() == "txt") virtualpath = string.Empty;
+			
+			// Continue until at the end of the stream
+			while(SkipWhitespace(true))
+			{
+				// Read a token
+				string objdeclaration = ReadToken();
+				if(!string.IsNullOrEmpty(objdeclaration))
+				{
+					objdeclaration = objdeclaration.ToLowerInvariant();
+					switch(objdeclaration)
+					{
+						case "texture":
+						{
+							// Read texture structure
+							TextureStructure tx = new TextureStructure(this, "texture", virtualpath);
+							if(this.HasError) return false;
+
+							// if a limit for the texture name length is set make sure that it's not exceeded
+							if(tx.Name.Length > General.Map.Config.MaxTextureNameLength)
+							{
+								ReportError("Texture name \"" + tx.Name + "\" too long. Texture names must have a length of " + General.Map.Config.MaxTextureNameLength + " characters or less");
+								return false;
+							}
+
+							//mxd. Can't load image without name
+							if(string.IsNullOrEmpty(tx.Name))
+							{
+								ReportError("Can't load an unnamed texture. Please consider giving names to your resources");
+								return false;
+							}
+
+							// Add the texture
+							textures[tx.Name] = tx;
+							if(!General.Map.Config.MixTexturesFlats) flats[tx.Name] = tx; //mxd. If MixTexturesFlats is set, textures and flats will be mixed in DataManager anyway
+						}
+						break;
+
+						case "sprite":
+						{
+							// Read sprite structure
+							TextureStructure tx = new TextureStructure(this, "sprite", virtualpath);
+							if(this.HasError) return false;
+
+							// if a limit for the sprite name length is set make sure that it's not exceeded
+							if(tx.Name.Length > DataManager.CLASIC_IMAGE_NAME_LENGTH)
+							{
+								ReportError("Sprite name \"" + tx.Name + "\" too long. Sprite names must have a length of " + DataManager.CLASIC_IMAGE_NAME_LENGTH + " characters or less");
+								return false;
+							}
+
+							//mxd. Can't load image without name
+							if(string.IsNullOrEmpty(tx.Name))
+							{
+								ReportError("Can't load an unnamed sprite. Please consider giving names to your resources");
+								return false;
+							}
+
+							// Add the sprite
+							sprites[tx.Name] = tx;
+						}
+						break;
+
+						case "walltexture":
+						{
+							// Read walltexture structure
+							TextureStructure tx = new TextureStructure(this, "walltexture", virtualpath);
+							if(this.HasError) return false;
+
+							// if a limit for the walltexture name length is set make sure that it's not exceeded
+							if(tx.Name.Length > General.Map.Config.MaxTextureNameLength)
+							{
+								ReportError("WallTexture name \"" + tx.Name + "\" too long. WallTexture names must have a length of " + General.Map.Config.MaxTextureNameLength + " characters or less");
+								return false;
+							}
+
+							//mxd. Can't load image without name
+							if(string.IsNullOrEmpty(tx.Name))
+							{
+								ReportError("Can't load an unnamed WallTexture. Please consider giving names to your resources");
+								return false;
+							}
+
+							// Add the walltexture
+							if(!textures.ContainsKey(tx.Name) || (textures[tx.Name].TypeName != "texture"))
+								textures[tx.Name] = tx;
+						}
+						break;
+
+						case "flat":
+						{
+							// Read flat structure
+							TextureStructure tx = new TextureStructure(this, "flat", virtualpath);
+							if(this.HasError) return false;
+
+							// if a limit for the flat name length is set make sure that it's not exceeded
+							if(tx.Name.Length > General.Map.Config.MaxTextureNameLength)
+							{
+								ReportError("Flat name \"" + tx.Name + "\" too long. Flat names must have a length of " + General.Map.Config.MaxTextureNameLength + " characters or less");
+								return false;
+							}
+
+							//mxd. Can't load image without name
+							if(string.IsNullOrEmpty(tx.Name))
+							{
+								ReportError("Can't load an unnamed flat. Please consider giving names to your resources");
+								return false;
+							}
+
+							// Add the flat
+							if(!flats.ContainsKey(tx.Name) || (flats[tx.Name].TypeName != "texture"))
+								flats[tx.Name] = tx;
+						}
+						break;
+
+						case "$gzdb_skip": break;
+						
+						default:
+						{
+							// Unknown structure!
+							// Best we can do now is just find the first { and then
+							// follow the scopes until the matching } is found
+							string token2;
+							do
+							{
+								if(!SkipWhitespace(true)) break;
+								token2 = ReadToken();
+								if(string.IsNullOrEmpty(token2)) break;
+							}
+							while(token2 != "{");
+
+							int scopelevel = 1;
+							do
+							{
+								if(!SkipWhitespace(true)) break;
+								token2 = ReadToken();
+								if(string.IsNullOrEmpty(token2)) break;
+								if(token2 == "{") scopelevel++;
+								if(token2 == "}") scopelevel--;
+							}
+							while(scopelevel > 0);
+						}
+						break;
+					}
+				}
+			}
+			
+			// Return true when no errors occurred
+			return (ErrorDescription == null);
+		}
+
+		//mxd
+		protected override string GetLanguageType()
+		{
+			return "TEXTURES";
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Core/ZDoom/VoxeldefParser.cs b/Source/Core/ZDoom/VoxeldefParser.cs
new file mode 100644
index 0000000..ebad4ef
--- /dev/null
+++ b/Source/Core/ZDoom/VoxeldefParser.cs
@@ -0,0 +1,140 @@
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.GZBuilder.Data;
+using SlimDX;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.ZDoom
+{
+	public sealed class VoxeldefParser : ZDTextParser
+	{
+		private Dictionary<string, ModelData> entries; //sprite name, entry
+		internal Dictionary<string, ModelData> Entries { get { return entries; } }
+
+		public override bool Parse(Stream stream, string sourcefilename, bool clearerrors) 
+		{
+			entries = new Dictionary<string, ModelData>(StringComparer.Ordinal);
+			if(!base.Parse(stream, sourcefilename, clearerrors)) return false;
+			string prevToken = string.Empty;
+
+			List<string> spriteNames = new List<string>();
+			string modelName = string.Empty;
+
+			// Continue until at the end of the stream
+			while(SkipWhitespace(true)) 
+			{
+				string token = ReadToken();
+
+				if(!string.IsNullOrEmpty(token)) 
+				{
+					token = StripTokenQuotes(token).ToLowerInvariant();
+
+					if(token == ",") //previous token was a sprite name
+					{ 
+						if(!string.IsNullOrEmpty(prevToken) && !spriteNames.Contains(prevToken)) spriteNames.Add(prevToken);
+						prevToken = token.ToUpperInvariant();
+					} 
+					else if(token == "=") //next token should be a voxel model name
+					{ 
+						if(!string.IsNullOrEmpty(prevToken) && !spriteNames.Contains(prevToken)) spriteNames.Add(prevToken);
+
+						SkipWhitespace(true);
+						token = ReadToken();
+
+						if(string.IsNullOrEmpty(token)) 
+						{
+							ReportError("Expected voxel name");
+							return false;
+						}
+
+						modelName = StripTokenQuotes(token).ToLowerInvariant();
+					} 
+					else if(token == "{") //read the settings
+					{
+						ModelData mde = new ModelData { IsVoxel = true };
+						float scale = 1.0f;
+						float angleoffset = 0;
+
+						while(SkipWhitespace(true)) 
+						{
+							token = ReadToken();
+
+							if(!string.IsNullOrEmpty(token)) 
+							{
+								token = StripTokenQuotes(token).ToLowerInvariant();
+
+								if(token == "}") //store data
+								{ 
+									if(!string.IsNullOrEmpty(modelName) && spriteNames.Count > 0) 
+									{
+										mde.ModelNames.Add(modelName);
+										mde.SetTransform(Matrix.RotationZ(Angle2D.DegToRad(angleoffset)), Matrix.Identity, new Vector3(scale));
+
+										foreach(string s in spriteNames)
+										{
+											//TODO: is this the proper behaviour?
+											entries[s] = mde;
+										}
+
+										//reset local data
+										modelName = string.Empty;
+										prevToken = string.Empty;
+										spriteNames.Clear();
+									}
+
+									break;
+								} 
+								else if(token == "overridepalette")
+								{
+									mde.OverridePalette = true;
+								} 
+								else if(token == "angleoffset")
+								{
+									if(!NextTokenIs("=")) return false;
+
+									token = StripTokenQuotes(ReadToken());
+									if(!ReadSignedFloat(token, ref angleoffset))
+									{
+										// Not numeric!
+										ReportError("Expected AngleOffset value, but got '" + token + "'");
+										return false;
+									}
+								} 
+								else if(token == "scale") 
+								{
+									if(!NextTokenIs("=")) return false;
+
+									token = StripTokenQuotes(ReadToken());
+									if(!ReadSignedFloat(token, ref scale)) 
+									{
+										// Not numeric!
+										ReportError("Expected Scale value, but got '" + token + "'");
+										return false;
+									}
+								}
+
+								prevToken = token.ToUpperInvariant();
+							}
+						}
+					} 
+					else 
+					{
+						prevToken = token.ToUpperInvariant();
+					}
+				}
+			}
+
+			return entries.Count > 0;
+		}
+
+		protected override string GetLanguageType()
+		{
+			return "VOXELDEF";
+		}
+	}
+}
diff --git a/Source/Core/ZDoom/ZDTextParser.cs b/Source/Core/ZDoom/ZDTextParser.cs
new file mode 100644
index 0000000..fa8e7fc
--- /dev/null
+++ b/Source/Core/ZDoom/ZDTextParser.cs
@@ -0,0 +1,602 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Globalization;
+using System.Text;
+using System.IO;
+using CodeImp.DoomBuilder.Compilers;
+using CodeImp.DoomBuilder.Data;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.ZDoom
+{
+	public abstract class ZDTextParser
+	{
+		#region ================== Constants
+
+		protected static readonly string RELATIVE_PATH_MARKER = ".." + Path.DirectorySeparatorChar;
+		protected static readonly string CURRENT_FOLDER_PATH_MARKER = "." + Path.DirectorySeparatorChar;
+		protected static readonly string ALT_RELATIVE_PATH_MARKER = ".." + Path.AltDirectorySeparatorChar;
+		protected static readonly string ALT_CURRENT_FOLDER_PATH_MARKER = "." + Path.AltDirectorySeparatorChar;
+		
+		#endregion
+		
+		#region ================== Variables
+		
+		// Parsing
+		protected string whitespace = "\n \t\r\u00A0\0"; //mxd. non-breaking space is also space :)
+		protected string specialtokens = ":{}+-\n;";
+		
+		// Input data stream
+		protected Stream datastream;
+		protected BinaryReader datareader;
+		protected string sourcename;
+		
+		// Error report
+		private int errorline;
+		private string errordesc;
+		private string errorsource;
+		private long prevstreamposition; //mxd. Text stream position storted before performing ReadToken.
+		
+		#endregion
+		
+		#region ================== Properties
+		
+		internal Stream DataStream { get { return datastream; } }
+		internal BinaryReader DataReader { get { return datareader; } }
+		public int ErrorLine { get { return errorline; } }
+		public string ErrorDescription { get { return errordesc; } }
+		public string ErrorSource { get { return errorsource; } }
+		public bool HasError { get { return (errordesc != null); } }
+		
+		#endregion
+		
+		#region ================== Constructor / Disposer
+		
+		// Constructor
+		protected ZDTextParser()
+		{
+			// Initialize
+			errordesc = null;
+		}
+		
+		#endregion
+
+		#region ================== Parsing
+
+		//mxd. This parses the given decorate stream. Returns false on errors
+		public virtual bool Parse(Stream stream, string sourcefilename, bool clearerrors)
+		{
+			//mxd. Clear error status?
+			if(clearerrors) ClearError();
+
+			//mxd. Integrity check
+			if(stream == null || stream.Length == 0)
+			{
+				ReportError("Unable to load '" + sourcefilename + "'");
+				return false;
+			}
+			
+			datastream = stream;
+			datareader = new BinaryReader(stream, Encoding.ASCII);
+			sourcename = sourcefilename;
+			datastream.Seek(0, SeekOrigin.Begin);
+			return true;
+		}
+		
+		// This returns true if the given character is whitespace
+		private bool IsWhitespace(char c)
+		{
+			return (whitespace.IndexOf(c) > -1);
+		}
+
+		// This returns true if the given character is a special token
+		private bool IsSpecialToken(char c)
+		{
+			return (specialtokens.IndexOf(c) > -1);
+		}
+
+		// This returns true if the given character is a special token
+		protected internal bool IsSpecialToken(string s)
+		{
+			if(s.Length > 0) return (specialtokens.IndexOf(s[0]) > -1);
+			return false;
+		}
+
+		//mxd. This removes beginning and ending quotes from a token
+		protected internal string StripTokenQuotes(string token) 
+		{
+			return StripQuotes(token);
+		}
+		
+		// This removes beginning and ending quotes from a token
+		internal static string StripQuotes(string token)
+		{
+			// Remove first character, if it is a quote
+			if(!string.IsNullOrEmpty(token) && (token[0] == '"'))
+				token = token.Substring(1);
+			
+			// Remove last character, if it is a quote
+			if(!string.IsNullOrEmpty(token) && (token[token.Length - 1] == '"'))
+				token = token.Substring(0, token.Length - 1);
+			
+			return token;
+		}
+		
+		// This skips whitespace on the stream, placing the read
+		// position right before the first non-whitespace character
+		// Returns false when the end of the stream is reached
+		protected internal bool SkipWhitespace(bool skipnewline)
+		{
+			int offset = skipnewline ? 0 : 1;
+			char c;
+			prevstreamposition = datastream.Position; //mxd
+			
+			do
+			{
+				if(datastream.Position == datastream.Length) return false;
+				c = (char)datareader.ReadByte();
+
+				// Check if this is comment
+				if(c == '/')
+				{
+					if(datastream.Position == datastream.Length) return false;
+					char c2 = (char)datareader.ReadByte();
+					if(c2 == '/')
+					{
+						// Check if not a special comment with a token
+						if(datastream.Position == datastream.Length) return false;
+						char c3 = (char)datareader.ReadByte();
+						if(c3 != '$')
+						{
+							// Skip entire line
+							char c4 = ' ';
+							while((c4 != '\n') && (datastream.Position < datastream.Length)) { c4 = (char)datareader.ReadByte(); }
+							c = c4;
+						}
+						else
+						{
+							// Not a comment
+							c = c3;
+						}
+					}
+					else if(c2 == '*')
+					{
+						// Skip until */
+						char c4, c3 = '\0';
+						prevstreamposition = datastream.Position; //mxd
+						do
+						{
+							if(datastream.Position == datastream.Length) //mxd
+							{
+								// ZDoom doesn't give even a warning message about this, so we shouldn't report error or fail parsing.
+								General.ErrorLogger.Add(ErrorType.Warning, "DECORATE warning in '" + sourcename + "', line " + GetCurrentLineNumber() + ". Block comment is not closed.");
+								return false;
+							}
+
+							c4 = c3;
+							c3 = (char)datareader.ReadByte();
+						}
+						while((c4 != '*') || (c3 != '/'));
+						c = ' ';
+					}
+					else
+					{
+						// Not a comment, rewind from reading c2
+						datastream.Seek(-1, SeekOrigin.Current);
+					}
+				}
+			}
+			while(whitespace.IndexOf(c, offset) > -1);
+			
+			// Go one character back so we can read this non-whitespace character again
+			datastream.Seek(-1, SeekOrigin.Current);
+			return true;
+		}
+		
+		// This reads a token (all sequential non-whitespace characters or a single character)
+		// Returns null when the end of the stream has been reached
+		protected internal string ReadToken() { return ReadToken(true); } //mxd. Added "multiline" param
+		protected internal string ReadToken(bool multiline)
+		{
+			//mxd. Return empty string when the end of the stream has been reached
+			if(datastream.Position == datastream.Length) return string.Empty;
+			
+			//mxd. Store starting position 
+			prevstreamposition = datastream.Position;
+			
+			string token = "";
+			bool quotedstring = false;
+			
+			// Start reading
+			char c = (char)datareader.ReadByte();
+			while(!IsWhitespace(c) || quotedstring || IsSpecialToken(c))
+			{
+				//mxd. Break at newline?
+				if(!multiline && c == '\r')
+				{
+					// Go one character back so line number is correct
+					datastream.Seek(-1, SeekOrigin.Current);
+					return token;
+				}
+				
+				// Special token?
+				if(!quotedstring && IsSpecialToken(c))
+				{
+					// Not reading a token yet?
+					if(token.Length == 0)
+					{
+						// This is our whole token
+						token += c;
+						break;
+					}
+					else
+					{
+						// This is a new token and shouldn't be read now
+						// Go one character back so we can read this token again
+						datastream.Seek(-1, SeekOrigin.Current);
+						break;
+					}
+				}
+				else
+				{
+					// Quote?
+					if(c == '"')
+					{
+						// Quote to end the string?
+						if(quotedstring) quotedstring = false;
+						
+						// First character is a quote?
+						if(token.Length == 0) quotedstring = true;
+						
+						token += c;
+					}
+					// Potential comment?
+					else if((c == '/') && !quotedstring)
+					{
+						// Check the next byte
+						if(datastream.Position == datastream.Length) return token;
+						char c2 = (char)datareader.ReadByte();
+						if((c2 == '/') || (c2 == '*'))
+						{
+							// This is a comment start, so the token ends here
+							// Go two characters back so we can read this comment again
+							datastream.Seek(-2, SeekOrigin.Current);
+							break;
+						}
+						else
+						{
+							// Not a comment
+							// Go one character back so we can read this char again
+							datastream.Seek(-1, SeekOrigin.Current);
+							token += c;
+						}
+					}
+					else
+					{
+						token += c;
+					}
+				}
+				
+				// Next character
+				if(datastream.Position < datastream.Length)
+					c = (char)datareader.Read();
+				else
+					break;
+			}
+			
+			return token;
+		}
+
+		// This reads a token (all sequential non-whitespace characters or a single character) using custom set of special tokens
+		// Returns null when the end of the stream has been reached (mxd)
+		protected internal string ReadToken(string specialTokens) 
+		{
+			// Return null when the end of the stream has been reached
+			if(datastream.Position == datastream.Length) return null;
+
+			//mxd. Store starting position 
+			prevstreamposition = datastream.Position;
+			
+			string token = "";
+			bool quotedstring = false;
+
+			// Start reading
+			char c = (char)datareader.ReadByte();
+			while(!IsWhitespace(c) || quotedstring || specialTokens.IndexOf(c) != -1) 
+			{
+				// Special token?
+				if(!quotedstring && specialTokens.IndexOf(c) != -1) 
+				{
+					// Not reading a token yet?
+					if(token.Length == 0) 
+					{
+						// This is our whole token
+						token += c;
+						break;
+					} 
+
+					// This is a new token and shouldn't be read now
+					// Go one character back so we can read this token again
+					datastream.Seek(-1, SeekOrigin.Current);
+					break;
+				} 
+				else 
+				{
+					// Quote?
+					if(c == '"') 
+					{
+						// Quote to end the string?
+						if(quotedstring) quotedstring = false;
+
+						// First character is a quote?
+						if(token.Length == 0) quotedstring = true;
+
+						token += c;
+					}
+					// Potential comment?
+					else if((c == '/') && !quotedstring) 
+					{
+						// Check the next byte
+						if(datastream.Position == datastream.Length) return token;
+						char c2 = (char)datareader.ReadByte();
+						if((c2 == '/') || (c2 == '*')) 
+						{
+							// This is a comment start, so the token ends here
+							// Go two characters back so we can read this comment again
+							datastream.Seek(-2, SeekOrigin.Current);
+							break;
+						} 
+						else 
+						{
+							// Not a comment
+							// Go one character back so we can read this char again
+							datastream.Seek(-1, SeekOrigin.Current);
+							token += c;
+						}
+					} 
+					else 
+					{
+						token += c;
+					}
+				}
+
+				// Next character
+				if(datastream.Position < datastream.Length)
+					c = (char)datareader.Read();
+				else
+					break;
+			}
+
+			return token;
+		}
+
+		// This reads the rest of the line
+		// Returns null when the end of the stream has been reached
+		protected internal string ReadLine()
+		{
+			string token = "";
+
+			// Return null when the end of the stream has been reached
+			if(datastream.Position == datastream.Length) return null;
+
+			// Start reading
+			char c = (char)datareader.ReadByte();
+			while(c != '\n')
+			{
+				token += c;
+				
+				// Next character
+				if(datastream.Position < datastream.Length)
+					c = (char)datareader.Read();
+				else
+					break;
+			}
+
+			return token.Trim();
+		}
+
+		//mxd
+		internal bool NextTokenIs(string expectedtoken) 
+		{
+			return NextTokenIs(expectedtoken, true);
+		}
+
+		//mxd
+		internal bool NextTokenIs(string expectedtoken, bool reporterror) 
+		{
+			if(!SkipWhitespace(true)) return false;
+			string token = ReadToken();
+
+			if(string.Compare(token, expectedtoken, true) != 0)
+			{
+				if(reporterror) ReportError("Expected '" + expectedtoken + "', but got '" + token + "'");
+
+				// Rewind so this structure can be read again
+				DataStream.Seek(-token.Length - 1, SeekOrigin.Current);
+				return false;
+			}
+
+			return true;
+		}
+
+		//mxd
+		protected internal bool ReadSignedFloat(ref float value) { return ReadSignedFloat(StripTokenQuotes(ReadToken(false)), ref value); }
+		protected internal bool ReadSignedFloat(string token, ref float value) 
+		{
+			int sign = 1;
+			if(token == "-") 
+			{
+				sign = -1;
+				token = StripTokenQuotes(ReadToken(false));
+			}
+
+			float val;
+			bool success = float.TryParse(token, NumberStyles.Float, CultureInfo.InvariantCulture, out val);
+			if(success) value = val * sign;
+			return success;
+		}
+
+		//mxd
+		protected internal bool ReadSignedInt(ref int value) { return ReadSignedInt(StripTokenQuotes(ReadToken(false)), ref value); }
+		protected internal bool ReadSignedInt(string token, ref int value) 
+		{
+			int sign = 1;
+			if(token == "-") 
+			{
+				sign = -1;
+				token = StripTokenQuotes(ReadToken(false));
+			}
+
+			int val;
+			bool success = int.TryParse(token, NumberStyles.Integer, CultureInfo.InvariantCulture, out val);
+			if(success) value = val * sign;
+			return success;
+		}
+		
+		// This reports an error
+		protected internal void ReportError(string message)
+		{
+			// Set error information
+			errordesc = message;
+			errorline = (datastream != null ? GetCurrentLineNumber() : CompilerError.NO_LINE_NUMBER); //mxd
+			errorsource = sourcename;
+		}
+
+		//mxd. This adds a warning to the ErrorLogger
+		protected internal void LogWarning(string message)
+		{
+			// Add a warning
+			int errline = GetCurrentLineNumber();
+			General.ErrorLogger.Add(ErrorType.Warning, GetLanguageType() + " warning in '" + sourcename
+								+ (errline != CompilerError.NO_LINE_NUMBER ? "', line " + (errline + 1) : "'") + ". " 
+								+ message + ".");
+		}
+
+		//mxd. This adds an error to the ErrorLogger
+		public void LogError()
+		{
+			General.ErrorLogger.Add(ErrorType.Error, GetLanguageType() + " error in '" + errorsource
+								+ (errorline != CompilerError.NO_LINE_NUMBER ? "', line " + (errorline + 1) : "'") + ". "
+								+ errordesc + ".");
+		}
+
+		//mxd
+		protected void ClearError()
+		{
+			errordesc = null;
+			errorsource = null;
+			errorline = CompilerError.NO_LINE_NUMBER;
+		}
+
+		//mxd 
+		protected int GetCurrentLineNumber()
+		{
+			long pos = datastream.Position;
+			long finishpos = Math.Min(prevstreamposition, pos);
+			long readpos = 0;
+			int linenumber = -1;
+
+			// Find the line on which we found this error
+			datastream.Seek(0, SeekOrigin.Begin);
+			StreamReader textreader = new StreamReader(datastream, Encoding.ASCII);
+			while(readpos < finishpos) 
+			{
+				string line = textreader.ReadLine();
+				if(line == null) break;
+				readpos += line.Length + 2;
+				linenumber++;
+			}
+
+			// Return to original position
+			datastream.Seek(pos, SeekOrigin.Begin);
+
+			return Math.Max(linenumber, 0);
+		}
+
+		//mxd. This converts given path to be relative to "filename"
+		protected string GetRootedPath(string filename, string includefilename)
+		{
+			// Construct root-relative path...
+			filename = filename.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
+
+			// Filename absolute? Try to convert it to resource-rooted
+			if(Path.IsPathRooted(filename))
+			{
+				foreach(DataReader reader in General.Map.Data.Containers)
+				{
+					if(reader is DirectoryReader && filename.StartsWith(reader.Location.location, true, CultureInfo.InvariantCulture))
+					{
+						filename = filename.Substring(reader.Location.location.Length + 1, filename.Length - reader.Location.location.Length - 1);
+						break;
+					}
+				}
+			}
+			
+			string filepath = Path.GetDirectoryName(filename);
+			string result = includefilename.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
+
+			if(result.StartsWith(RELATIVE_PATH_MARKER) && !string.IsNullOrEmpty(filepath))
+			{
+				string[] parts = filepath.Split(Path.DirectorySeparatorChar);
+				int index = parts.Length - 1;
+				int pos;
+
+				// Count & trim relative path markers
+				while((pos = result.LastIndexOf(RELATIVE_PATH_MARKER, StringComparison.Ordinal)) != -1)
+				{
+					// includefilename references something above the root?
+					if(index-- < 0)
+					{
+						ReportError("Unable to construct rooted path from '" + includefilename + "'");
+						return string.Empty;
+					}
+
+					string start = result.Substring(0, pos);
+					string end = result.Substring(pos + RELATIVE_PATH_MARKER.Length, result.Length - pos - RELATIVE_PATH_MARKER.Length);
+					result = start + end;
+				}
+
+				// Construct absolute path relative to current filename
+				while(index > -1)
+				{
+					result = parts[index--] + Path.DirectorySeparatorChar + result;
+				}
+			}
+			else
+			{
+				// Trim "this folder" marker
+				if(result.StartsWith(CURRENT_FOLDER_PATH_MARKER))
+					result = result.TrimStart(CURRENT_FOLDER_PATH_MARKER.ToCharArray());
+
+				// Treat as relative path
+				if(!string.IsNullOrEmpty(filepath))
+					result = Path.Combine(filepath, result);
+			}
+
+			return result;
+		}
+
+		//mxd. Language type
+		protected abstract string GetLanguageType();
+
+		#endregion
+	}
+}
diff --git a/Source/Core/app.manifest b/Source/Core/app.manifest
new file mode 100644
index 0000000..fc56c43
--- /dev/null
+++ b/Source/Core/app.manifest
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<asmv1:assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <!-- UAC Manifest Options
+            If you want to change the Windows User Account Control level replace the 
+            requestedExecutionLevel node with one of the following.
+
+        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
+        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
+        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
+
+            If you want to utilize File and Registry Virtualization for backward 
+            compatibility then delete the requestedExecutionLevel node.
+        -->
+        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+  <asmv3:application xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+    <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
+      <dpiAware>true</dpiAware>
+    </asmv3:windowsSettings>
+  </asmv3:application>
+</asmv1:assembly>
diff --git a/Source/Plugins/BuilderEffects/BuilderEffects.csproj b/Source/Plugins/BuilderEffects/BuilderEffects.csproj
new file mode 100644
index 0000000..0282e48
--- /dev/null
+++ b/Source/Plugins/BuilderEffects/BuilderEffects.csproj
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{B859BE0F-A992-476D-A642-FA8EFE94AAA5}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>CodeImp.DoomBuilder.BuilderEffects</RootNamespace>
+    <AssemblyName>BuilderEffects</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\Build\Plugins\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\Build\Plugins\</OutputPath>
+    <DefineConstants>
+    </DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug + Profiler|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\..\..\Build\Plugins\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;PROFILE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release + Profiler|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\..\..\Build\Plugins\</OutputPath>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="BuilderPlug.cs" />
+    <Compile Include="Controls\NumericUpDownEx.cs" />
+    <Compile Include="Controls\IntControl.cs" />
+    <Compile Include="Controls\IntControl.designer.cs">
+      <DependentUpon>IntControl.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Interface\JitterSectorsForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Interface\JitterSectorsForm.Designer.cs">
+      <DependentUpon>JitterSectorsForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Interface\JitterThingsForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Interface\JitterThingsForm.Designer.cs">
+      <DependentUpon>JitterThingsForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Interface\JitterVerticesForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Interface\JitterVerticesForm.Designer.cs">
+      <DependentUpon>JitterVerticesForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Interface\MenusForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Interface\MenusForm.Designer.cs">
+      <DependentUpon>MenusForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Interface\ObjImportSettingsForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Interface\ObjImportSettingsForm.Designer.cs">
+      <DependentUpon>ObjImportSettingsForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Modes\ImportObjAsTerrainMode.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Interface\MenusForm.resx">
+      <DependentUpon>MenusForm.cs</DependentUpon>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Controls\IntControl.resx">
+      <DependentUpon>IntControl.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Interface\JitterSectorsForm.resx">
+      <DependentUpon>JitterSectorsForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Interface\JitterThingsForm.resx">
+      <DependentUpon>JitterThingsForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Interface\JitterVerticesForm.resx">
+      <DependentUpon>JitterVerticesForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Interface\ObjImportSettingsForm.resx">
+      <DependentUpon>ObjImportSettingsForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Resources\Actions.cfg" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Update.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Jitter.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Terrain.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Core\Builder.csproj">
+      <Project>{818B3D10-F791-4C3F-9AF5-BB2D0079B63C}</Project>
+      <Name>Builder</Name>
+      <Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Folder.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/Source/Plugins/BuilderEffects/BuilderPlug.cs b/Source/Plugins/BuilderEffects/BuilderPlug.cs
new file mode 100644
index 0000000..5fa8274
--- /dev/null
+++ b/Source/Plugins/BuilderEffects/BuilderPlug.cs
@@ -0,0 +1,185 @@
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using System.Drawing;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Actions;
+using CodeImp.DoomBuilder.Plugins;
+using CodeImp.DoomBuilder.VisualModes;
+using CodeImp.DoomBuilder.Windows;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderEffects
+{
+	public class BuilderPlug : Plug
+	{
+		// Static instance
+		private static BuilderPlug me;
+
+		// Main objects
+		private MenusForm menusForm;
+		private Form form;
+
+		private Point formLocation; //used to keep form's location constant
+
+		public override string Name { get { return "Builder Effects"; } }
+		public static BuilderPlug Me { get { return me; } }
+
+		// When plugin is initialized
+		public override void OnInitialize() 
+		{
+			// Setup
+			base.OnInitialize();
+			me = this;
+
+			// Load menus form
+			menusForm = new MenusForm();
+
+			General.Actions.BindMethods(this);
+		}
+
+		// Disposer
+		public override void Dispose() 
+		{
+			// Not already disposed?
+			if(!IsDisposed) 
+			{
+				menusForm.Unregister();
+				menusForm.Dispose();
+				menusForm = null;
+
+				// Done
+				me = null;
+				base.Dispose();
+			}
+		}
+
+		public override void OnMapNewEnd() 
+		{
+			base.OnMapNewEnd();
+			menusForm.Register();
+		}
+
+		public override void OnMapOpenEnd() 
+		{
+			base.OnMapOpenEnd();
+			menusForm.Register();
+		}
+
+		public override void OnMapCloseEnd() 
+		{
+			base.OnMapCloseEnd();
+			menusForm.Unregister();
+		}
+
+		public override void OnReloadResources() 
+		{
+			base.OnReloadResources();
+			menusForm.Register();
+		}
+
+		//actions
+		[BeginAction("applyjitter")]
+		private void ApplyJitterTransform() 
+		{
+			if(General.Editing.Mode == null) return;
+			string currentModeName = General.Editing.Mode.GetType().Name;
+
+			//display one of colorPickers or tell the user why we can't do that
+			if(currentModeName == "ThingsMode") 
+			{
+				if(General.Map.Map.SelectedThingsCount == 0) 
+				{
+					General.Interface.DisplayStatus(StatusType.Warning, "Select some things first!");
+					return;
+				}
+				form = new JitterThingsForm(currentModeName);
+			} 
+			else if(currentModeName == "SectorsMode") 
+			{
+				if(General.Map.Map.SelectedSectorsCount == 0) 
+				{
+					General.Interface.DisplayStatus(StatusType.Warning, "Select some sectors first!");
+					return;
+				}
+				form = new JitterSectorsForm(currentModeName);
+			} 
+			else if(currentModeName == "LinedefsMode")
+			{
+				if(General.Map.Map.SelectedLinedefsCount == 0) 
+				{
+					General.Interface.DisplayStatus(StatusType.Warning, "Select some linedefs first!");
+					return;
+				}
+				form = new JitterVerticesForm(currentModeName);
+			} 
+			else if(currentModeName == "VerticesMode")
+			{
+				if(General.Map.Map.SelectedVerticessCount == 0) 
+				{
+					General.Interface.DisplayStatus(StatusType.Warning, "Select some vertices first!");
+					return;
+				}
+				form = new JitterVerticesForm(currentModeName);
+			} 
+			else if(currentModeName == "BaseVisualMode") 
+			{
+				//no visual things selected in visual mode?
+				if(((VisualMode)General.Editing.Mode).GetSelectedVisualThings(true).Count == 0) 
+				{
+					//check selected geometry
+					List<VisualGeometry> list = ((VisualMode)General.Editing.Mode).GetSelectedSurfaces();
+					if(list.Count > 0) 
+					{
+						foreach(VisualGeometry vg in list) 
+						{
+							if(vg.GeometryType == VisualGeometryType.CEILING 
+								|| vg.GeometryType == VisualGeometryType.FLOOR) 
+							{
+								form = new JitterSectorsForm(currentModeName);
+								break;
+							}
+						}
+
+						if(form == null) form = new JitterVerticesForm(currentModeName);
+					} 
+					else 
+					{
+						General.Interface.DisplayStatus(StatusType.Warning, "Select some things, sectors or surfaces first!");
+						return;
+					}
+				} 
+				else 
+				{
+					form = new JitterThingsForm(currentModeName);
+				}
+			} 
+			else //wrong mode
+			{ 
+				General.Interface.DisplayStatus(StatusType.Warning, "Switch to Sectors, Things, Vertices, Linedefs or Visual mode first!");
+				return;
+			}
+
+			//position and show form
+			if(formLocation.X == 0 && formLocation.Y == 0)
+			{
+				Size displaySize = General.Interface.Display.Size;
+				Point displayLocation = General.Interface.Display.LocationAbs;
+				formLocation = new Point(displayLocation.X + displaySize.Width - form.Width - 16, displayLocation.Y + 16);
+			}
+
+			form.Location = formLocation;
+			form.FormClosed += form_FormClosed;
+			form.ShowDialog(General.Interface);
+		}
+
+//events
+		private void form_FormClosed(object sender, FormClosedEventArgs e) 
+		{
+			formLocation = form.Location;
+			form.Dispose();
+			form = null;
+		}
+	}
+}
diff --git a/Source/Plugins/BuilderEffects/Controls/BoolControl.cs b/Source/Plugins/BuilderEffects/Controls/BoolControl.cs
new file mode 100644
index 0000000..3e3f16e
--- /dev/null
+++ b/Source/Plugins/BuilderEffects/Controls/BoolControl.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+
+namespace CodeImp.DoomBuilder.BuilderEffects
+{
+	public partial class BoolControl : UserControl
+	{
+        public event EventHandler OnValueChanged;
+        
+        public bool Value { get { return checkBox1.Checked; } set { checkBox1.Checked = value; } }
+        public string Label { get { return label1.Text; } set { label1.Text = value; } }
+		
+		public BoolControl() {
+			InitializeComponent();
+		}
+
+		private void checkBox1_CheckedChanged(object sender, EventArgs e) {
+			if(OnValueChanged != null) OnValueChanged(this, EventArgs.Empty);
+		}
+	}
+}
diff --git a/Source/Plugins/BuilderEffects/Controls/BoolControl.designer.cs b/Source/Plugins/BuilderEffects/Controls/BoolControl.designer.cs
new file mode 100644
index 0000000..71d9f11
--- /dev/null
+++ b/Source/Plugins/BuilderEffects/Controls/BoolControl.designer.cs
@@ -0,0 +1,69 @@
+namespace CodeImp.DoomBuilder.BuilderEffects
+{
+	partial class BoolControl
+	{
+		/// <summary> 
+		/// Требует�� переменна� кон�труктора.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary> 
+		/// О�вободить в�е и�пользуемые ре�ур�ы.
+		/// </summary>
+		/// <param name="disposing">и�тинно, е�ли управл�емый ре�ур� должен быть удален; иначе ложно.</param>
+		protected override void Dispose(bool disposing) {
+			if(disposing && (components != null)) {
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Код, автоматиче�ки �озданный кон�труктором компонентов
+
+		/// <summary> 
+		/// Об�зательный метод дл� поддержки кон�труктора - не измен�йте 
+		/// �одержимое данного метода при помощи редактора кода.
+		/// </summary>
+		private void InitializeComponent() {
+			this.label1 = new System.Windows.Forms.Label();
+			this.checkBox1 = new System.Windows.Forms.CheckBox();
+			this.SuspendLayout();
+			// 
+			// label1
+			// 
+			this.label1.Location = new System.Drawing.Point(0, 0);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(90, 22);
+			this.label1.TabIndex = 8;
+			this.label1.Text = "Some bool value:";
+			this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+			// 
+			// checkBox1
+			// 
+			this.checkBox1.AutoSize = true;
+			this.checkBox1.Location = new System.Drawing.Point(96, 5);
+			this.checkBox1.Name = "checkBox1";
+			this.checkBox1.Size = new System.Drawing.Size(15, 14);
+			this.checkBox1.TabIndex = 9;
+			this.checkBox1.UseVisualStyleBackColor = true;
+			this.checkBox1.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged);
+			// 
+			// BoolControl
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.Controls.Add(this.checkBox1);
+			this.Controls.Add(this.label1);
+			this.Name = "BoolControl";
+			this.Size = new System.Drawing.Size(266, 22);
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.CheckBox checkBox1;
+	}
+}
diff --git a/Source/Plugins/BuilderEffects/Controls/BoolControl.resx b/Source/Plugins/BuilderEffects/Controls/BoolControl.resx
new file mode 100644
index 0000000..19dc0dd
--- /dev/null
+++ b/Source/Plugins/BuilderEffects/Controls/BoolControl.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/BuilderEffects/Controls/IntControl.cs b/Source/Plugins/BuilderEffects/Controls/IntControl.cs
new file mode 100644
index 0000000..24c48a0
--- /dev/null
+++ b/Source/Plugins/BuilderEffects/Controls/IntControl.cs
@@ -0,0 +1,171 @@
+#region ================== Namespaces
+
+using System;
+using System.ComponentModel;
+using System.Windows.Forms;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderEffects
+{
+	[DesignerCategory("code")]
+	internal partial class IntControl : UserControl
+	{
+		public event EventHandler OnValueChanging;
+		public event EventHandler OnValueChanged;
+
+		private int previousValue;
+		public int Value 
+		{
+			get { return (int)numericUpDown1.Value; }
+			set 
+			{
+				blockEvents = true;
+				previousValue = General.Clamp(value, (int)numericUpDown1.Minimum, (int)numericUpDown1.Maximum);
+				numericUpDown1.Value = previousValue;
+				valueChanged = false;
+				blockEvents = false;
+			}
+		}
+
+		internal int Delta { get { return delta; } }
+		private int delta;
+
+		public string Label { get { return label1.Text; } set { label1.Text = value; } }
+
+		public bool ExtendedLimits 
+		{
+			get { return extendedLimits; }
+			set {
+				extendedLimits = value;
+				UpdateLimits();
+			}
+		}
+		private bool extendedLimits;
+
+		public bool AllowNegative 
+		{
+			get { return allowNegative; }
+			set {
+				allowNegative = value;
+
+				if(!allowNegative)
+				{
+					if(minimum < 0 && maximum < 0) 
+					{
+						int diff = Math.Abs(maximum - minimum);
+						minimum = 0;
+						maximum = diff;
+					} 
+					else 
+					{
+						if(minimum < 0) minimum = 0;
+						if(maximum < 0) maximum = 0;
+					}
+				}
+
+				UpdateLimits();
+			}
+		}
+
+		private bool allowNegative;
+
+		public int Minimum 
+		{
+			get { return minimum; }
+			set 
+			{
+				minimum = value;
+				UpdateLimits();
+			}
+		}
+		private int minimum;
+		
+		public int Maximum 
+		{
+			get { return maximum; }
+			set 
+			{
+				maximum = value;
+				UpdateLimits();
+			}
+		}
+		private int maximum;
+
+		private bool blockEvents;
+		private bool valueChanged;
+
+		internal IntControl() 
+		{
+			InitializeComponent();
+			numericUpDown1.MouseLeave += numericUpDown1_MouseLeave;
+		}
+
+		private void UpdateLimits() 
+		{
+			blockEvents = true;
+
+			trackBar1.Value = General.Clamp(trackBar1.Value, minimum, maximum);
+			trackBar1.Minimum = minimum;
+			trackBar1.Maximum = maximum;
+			labelMaximum.Text = maximum.ToString();
+
+			numericUpDown1.Value = General.Clamp((int)numericUpDown1.Value, minimum, maximum);
+
+			if(extendedLimits) 
+			{
+				numericUpDown1.Minimum = minimum * 32;
+				numericUpDown1.Maximum = maximum * 32;
+			} 
+			else 
+			{
+				numericUpDown1.Minimum = minimum;
+				numericUpDown1.Maximum = maximum;
+			}
+
+			blockEvents = false;
+		}
+
+		//events
+		private void trackBar1_ValueChanged(object sender, EventArgs e) 
+		{
+			if(!blockEvents) numericUpDown1.Value = ((TrackBar)sender).Value;
+		}
+
+		private void numericUpDown1_ValueChanged(object sender, EventArgs e) 
+		{
+			int value = (int)((NumericUpDown)sender).Value;
+			if(value == previousValue) return;
+
+			valueChanged = true;
+			delta = value - previousValue;
+			previousValue = value;
+
+			if(!blockEvents && OnValueChanging != null)
+				OnValueChanging(this, EventArgs.Empty);
+
+			blockEvents = true;
+			trackBar1.Value = General.Clamp(value, trackBar1.Minimum, trackBar1.Maximum);
+			blockEvents = false;
+		}
+
+		private void trackBar1_MouseLeave(object sender, EventArgs e) 
+		{
+			if(valueChanged && OnValueChanged != null) 
+			{
+				OnValueChanged(this, EventArgs.Empty);
+				valueChanged = false;
+			}
+		}
+
+		private void numericUpDown1_MouseLeave(object sender, EventArgs e) 
+		{
+			if(valueChanged && OnValueChanged != null) 
+			{
+				OnValueChanged(this, EventArgs.Empty);
+				valueChanged = false;
+			}
+		}
+
+	}
+}
diff --git a/Source/Plugins/BuilderEffects/Controls/IntControl.designer.cs b/Source/Plugins/BuilderEffects/Controls/IntControl.designer.cs
new file mode 100644
index 0000000..bdfc465
--- /dev/null
+++ b/Source/Plugins/BuilderEffects/Controls/IntControl.designer.cs
@@ -0,0 +1,105 @@
+namespace CodeImp.DoomBuilder.BuilderEffects
+{
+	partial class IntControl {
+		/// <summary> 
+		/// Требует�� переменна� кон�труктора.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary> 
+		/// О�вободить в�е и�пользуемые ре�ур�ы.
+		/// </summary>
+		/// <param name="disposing">и�тинно, е�ли управл�емый ре�ур� должен быть удален; иначе ложно.</param>
+		protected override void Dispose(bool disposing) 
+		{
+			if(disposing && (components != null)) 
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Код, автоматиче�ки �озданный кон�труктором компонентов
+
+		/// <summary> 
+		/// Об�зательный метод дл� поддержки кон�труктора - не измен�йте 
+		/// �одержимое данного метода при помощи редактора кода.
+		/// </summary>
+		private void InitializeComponent() 
+		{
+			this.trackBar1 = new System.Windows.Forms.TrackBar();
+			this.label1 = new System.Windows.Forms.Label();
+			this.numericUpDown1 = new CodeImp.DoomBuilder.BuilderEffects.NumericUpDownEx();
+			this.labelMaximum = new System.Windows.Forms.Label();
+			((System.ComponentModel.ISupportInitialize)(this.trackBar1)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit();
+			this.SuspendLayout();
+			// 
+			// trackBar1
+			// 
+			this.trackBar1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.trackBar1.LargeChange = 32;
+			this.trackBar1.Location = new System.Drawing.Point(152, 1);
+			this.trackBar1.Maximum = 512;
+			this.trackBar1.Name = "trackBar1";
+			this.trackBar1.Size = new System.Drawing.Size(86, 45);
+			this.trackBar1.SmallChange = 4;
+			this.trackBar1.TabIndex = 4;
+			this.trackBar1.TickFrequency = 16;
+			this.trackBar1.TickStyle = System.Windows.Forms.TickStyle.None;
+			this.trackBar1.MouseLeave += new System.EventHandler(this.trackBar1_MouseLeave);
+			this.trackBar1.ValueChanged += new System.EventHandler(this.trackBar1_ValueChanged);
+			// 
+			// label1
+			// 
+			this.label1.Location = new System.Drawing.Point(0, 0);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(90, 24);
+			this.label1.TabIndex = 7;
+			this.label1.Text = "Some cool value:";
+			this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+			// 
+			// numericUpDown1
+			// 
+			this.numericUpDown1.Location = new System.Drawing.Point(96, 2);
+			this.numericUpDown1.Name = "numericUpDown1";
+			this.numericUpDown1.Size = new System.Drawing.Size(52, 20);
+			this.numericUpDown1.TabIndex = 8;
+			this.numericUpDown1.ValueChanged += new System.EventHandler(this.numericUpDown1_ValueChanged);
+			// 
+			// labelMaximum
+			// 
+			this.labelMaximum.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.labelMaximum.AutoSize = true;
+			this.labelMaximum.Location = new System.Drawing.Point(237, 5);
+			this.labelMaximum.Name = "labelMaximum";
+			this.labelMaximum.Size = new System.Drawing.Size(25, 13);
+			this.labelMaximum.TabIndex = 9;
+			this.labelMaximum.Text = "512";
+			// 
+			// IntControl
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.Controls.Add(this.labelMaximum);
+			this.Controls.Add(this.numericUpDown1);
+			this.Controls.Add(this.label1);
+			this.Controls.Add(this.trackBar1);
+			this.Name = "IntControl";
+			this.Size = new System.Drawing.Size(266, 24);
+			((System.ComponentModel.ISupportInitialize)(this.trackBar1)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit();
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.TrackBar trackBar1;
+		private System.Windows.Forms.Label label1;
+		private NumericUpDownEx numericUpDown1;
+		private System.Windows.Forms.Label labelMaximum;
+	}
+}
diff --git a/Source/Plugins/BuilderEffects/Controls/IntControl.resx b/Source/Plugins/BuilderEffects/Controls/IntControl.resx
new file mode 100644
index 0000000..19dc0dd
--- /dev/null
+++ b/Source/Plugins/BuilderEffects/Controls/IntControl.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/BuilderEffects/Controls/NumericUpDownEx.cs b/Source/Plugins/BuilderEffects/Controls/NumericUpDownEx.cs
new file mode 100644
index 0000000..4360549
--- /dev/null
+++ b/Source/Plugins/BuilderEffects/Controls/NumericUpDownEx.cs
@@ -0,0 +1,425 @@
+// ============================================================================ '
+// NumericUpDownEx - v.1.3                                                      '
+// ============================================================================ '
+// Author:   Claudio Nicora                                                     '
+// WebSite:  http://coolsoft.altervista.org                                     '
+// CodeProject: http://www.codeproject.com/KB/edit/NumericUpDownEx.aspx         '
+// License:  CodeProject Open License                                           '
+//           http://www.codeproject.com/info/cpol10.aspx                        '
+// Feel free to contribute here: http://coolsoft.altervista.org                 '
+// ============================================================================ '
+
+using System;
+using System.Reflection;
+using System.Drawing;
+using System.ComponentModel;
+using System.Windows.Forms;
+
+namespace CodeImp.DoomBuilder.BuilderEffects
+{
+	[DesignerCategory("code")]
+	public class NumericUpDownEx : NumericUpDown
+	{
+		// reference to the underlying TextBox control
+		private TextBox _textbox;
+
+		// reference to the underlying UpDownButtons control
+		private Control _upDownButtons;
+
+		/// <summary>
+		/// object creator
+		/// </summary>
+		public NumericUpDownEx()
+		{
+			// extract a reference to the underlying TextBox field
+			_textbox = GetPrivateField<TextBox>(this, "upDownEdit");
+			if(_textbox == null)
+			{
+				throw new ArgumentNullException(this.GetType().FullName + ": Can't find internal TextBox field.");
+			}
+			// extract a reference to the underlying UpDownButtons field
+			_upDownButtons = GetPrivateField<Control>(this, "upDownButtons");
+			if(_upDownButtons == null)
+			{
+				throw new ArgumentNullException(this.GetType().FullName + ": Can't find internal UpDown buttons field.");
+			}
+			// add handlers (MouseEnter and MouseLeave events of NumericUpDown
+			// are not working properly)
+			_textbox.MouseEnter += _mouseEnterLeave;
+			_textbox.MouseLeave += _mouseEnterLeave;
+			_upDownButtons.MouseEnter += _mouseEnterLeave;
+			_upDownButtons.MouseLeave += _mouseEnterLeave;
+			base.MouseEnter += _mouseEnterLeave;
+			base.MouseLeave += _mouseEnterLeave;
+		}
+
+
+		/// <summary>
+		/// Extracts a reference to a private underlying field
+		/// </summary>
+		protected static internal T GetPrivateField<T>(NumericUpDownEx ctrl, string fieldName) where T : Control
+		{
+			// find internal TextBox
+			FieldInfo fi = typeof(NumericUpDown).GetField(fieldName, BindingFlags.FlattenHierarchy | BindingFlags.NonPublic | BindingFlags.Instance);
+			// take some caution... they could change field name in the future!
+			if(fi == null)
+			{
+				return null;
+			}
+			else
+			{
+				return fi.GetValue(ctrl) as T;
+			}
+		}
+
+
+		protected override void OnPaint(PaintEventArgs e)
+		{
+			if(_upDownButtons.Visible == false)
+			{
+				e.Graphics.Clear(this.BackColor);
+			}
+			base.OnPaint(e);
+		}
+
+
+		/// <summary>
+		/// WndProc override to kill WN_MOUSEWHEEL message
+		/// </summary>
+		protected override void WndProc(ref Message m)
+		{
+			const int WM_MOUSEWHEEL = 0x20a;
+
+			if(m.Msg == WM_MOUSEWHEEL)
+			{
+				switch(_interceptMouseWheel)
+				{
+					case InterceptMouseWheelMode.Always:
+						// standard message
+						base.WndProc(ref m);
+						break;
+					case InterceptMouseWheelMode.WhenMouseOver:
+						if(_mouseOver)
+						{
+							// standard message
+							base.WndProc(ref m);
+						}
+						break;
+					case InterceptMouseWheelMode.Never:
+						// kill the message
+						return;
+				}
+			}
+			else
+			{
+				base.WndProc(ref m);
+			}
+
+		}
+
+
+#region New properties
+
+		[DefaultValue(false)]
+		[Category("Behavior")]
+		[Description("Automatically select control text when it receives focus.")]
+		public bool AutoSelect
+		{
+			get { return _autoSelect; }
+			set { _autoSelect = value; }
+		}
+
+		private bool _autoSelect;
+
+		[Browsable(false)]
+		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public int SelectionStart
+		{
+			get { return _textbox.SelectionStart; }
+			set { _textbox.SelectionStart = value; }
+		}
+
+
+		[Browsable(false)]
+		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public int SelectionLength
+		{
+			get { return _textbox.SelectionLength; }
+			set { _textbox.SelectionLength = value; }
+		}
+
+
+		[Browsable(false)]
+		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public string SelectedText
+		{
+			get { return _textbox.SelectedText; }
+			set { _textbox.SelectedText = value; }
+		}
+
+
+		[DefaultValue(typeof(InterceptMouseWheelMode), "Always")]
+		[Category("Behavior")]
+		[Description("Enables MouseWheel only under certain conditions.")]
+		public InterceptMouseWheelMode InterceptMouseWheel
+		{
+			get { return _interceptMouseWheel; }
+			set { _interceptMouseWheel = value; }
+		}
+
+		private InterceptMouseWheelMode _interceptMouseWheel = InterceptMouseWheelMode.Always;
+
+		public enum InterceptMouseWheelMode
+		{
+			/// <summary>MouseWheel always works (defauld behavior)</summary>
+			Always,
+			/// <summary>MouseWheel works only when mouse is over the (focused) control</summary>
+			WhenMouseOver,
+			/// <summary>MouseWheel never works</summary>
+			Never
+		}
+
+
+		[DefaultValue(typeof(ShowUpDownButtonsMode), "Always")]
+		[Category("Behavior")]
+		[Description("Set UpDownButtons visibility mode.")]
+		public ShowUpDownButtonsMode ShowUpDownButtons
+		{
+			get { return _showUpDownButtons; }
+			set
+			{
+				_showUpDownButtons = value;
+				// update UpDownButtons visibility
+				UpdateUpDownButtonsVisibility();
+			}
+		}
+
+		private ShowUpDownButtonsMode _showUpDownButtons = ShowUpDownButtonsMode.Always;
+
+		public enum ShowUpDownButtonsMode
+		{
+			/// <summary>UpDownButtons are always visible (defauld behavior)</summary>
+			Always,
+			/// <summary>UpDownButtons are visible only when mouse is over the control</summary>
+			WhenMouseOver
+		}
+
+		/// <summary>
+		/// If set, incrementing value will cause it to restart from Minimum 
+		/// when Maximum is reached (and viceversa).
+		/// </summary>
+		[DefaultValue(false)]
+		[Category("Behavior")]
+		[Description("If set, incrementing value will cause it to restart from Minimum when Maximum is reached (and viceversa).")]
+		public bool WrapValue
+		{
+			get { return _wrapValue; }
+			set { _wrapValue = value; }
+		}
+		private bool _wrapValue;
+	
+#endregion
+
+
+#region Text selection
+
+		// select all the text on focus enter
+		protected override void OnGotFocus(EventArgs e)
+		{
+			if(_autoSelect)
+			{
+				_textbox.SelectAll();
+			}
+			base.OnGotFocus(e);
+		}
+
+
+		// MouseUp will kill the SelectAll made on GotFocus.
+		// Will restore it, but only if user have not made a partial text selection.
+		protected override void OnMouseUp(MouseEventArgs mevent)
+		{
+			if(_autoSelect && _textbox.SelectionLength == 0)
+			{
+				_textbox.SelectAll();
+			}
+			base.OnMouseUp(mevent);
+		}
+
+#endregion
+
+
+#region Additional events
+
+		// these events will be raised correctly, when mouse enters on the textbox
+		public new event EventHandler<EventArgs> MouseEnter;
+		public new event EventHandler<EventArgs> MouseLeave;
+
+		// Events raised BEFORE value decrement(increment
+		public event CancelEventHandler BeforeValueDecrement;
+		public event CancelEventHandler BeforeValueIncrement;
+
+		// flag to track mouse position
+		private bool _mouseOver;
+
+		// this handler is called at each mouse Enter/Leave movement
+		private void _mouseEnterLeave(object sender, EventArgs e)
+		{
+			Rectangle cr = RectangleToScreen(ClientRectangle);
+			Point mp = MousePosition;
+
+			// actual state
+			bool isOver = cr.Contains(mp);
+
+			// test if status changed
+			if(_mouseOver ^ isOver)
+			{
+				// update state
+				_mouseOver = isOver;
+				if(_mouseOver)
+				{
+					if(MouseEnter != null)
+					{
+						MouseEnter(this, EventArgs.Empty);
+					}
+				}
+				else
+				{
+					if(MouseLeave != null)
+					{
+						MouseLeave(this, EventArgs.Empty);
+					}
+				}
+			}
+
+			// update UpDownButtons visibility
+			if(_showUpDownButtons != ShowUpDownButtonsMode.Always)
+			{
+				UpdateUpDownButtonsVisibility();
+			}
+
+		}
+
+#endregion
+
+
+#region Value increment/decrement management
+
+		// raises the two new events
+		public override void DownButton()
+		{
+			CancelEventArgs e = new CancelEventArgs();
+			if(BeforeValueDecrement != null) 
+			{
+				BeforeValueDecrement(this, e);
+			}
+			if(e.Cancel) return;
+
+			if(_wrapValue && Value - Increment < Minimum) 
+			{
+				Value = Maximum;
+			} 
+			else 
+			{
+				base.DownButton();
+			}
+		}
+		public override void UpButton()
+		{
+			CancelEventArgs e = new CancelEventArgs();
+			if(BeforeValueIncrement != null) 
+			{
+				BeforeValueIncrement(this, e);
+			}
+			if(e.Cancel) return;
+
+			if(_wrapValue && Value + Increment > Maximum) 
+			{
+				Value = Minimum;
+			} 
+			else 
+			{
+				base.UpButton();
+			}
+		}
+
+#endregion
+
+
+#region UpDownButtons visibility management
+
+		/// <summary>
+		/// Show or hide the UpDownButtons, according to ShowUpDownButtons property value
+		/// </summary>
+		public void UpdateUpDownButtonsVisibility()
+		{
+			// test new state
+			bool newVisible;
+			switch(_showUpDownButtons)
+			{
+				case ShowUpDownButtonsMode.WhenMouseOver:
+					newVisible = _mouseOver;
+					break;
+				default:
+					newVisible = true;
+					break;
+			}
+
+			// assign only if needed
+			if(_upDownButtons.Visible != newVisible)
+			{
+				if(newVisible)
+				{
+					_textbox.Width = this.ClientRectangle.Width - _upDownButtons.Width;
+				}
+				else
+				{
+					_textbox.Width = this.ClientRectangle.Width;
+				}
+				_upDownButtons.Visible = newVisible;
+				OnTextBoxResize(_textbox, EventArgs.Empty);
+				this.Invalidate();
+			}
+
+		}
+
+
+		/// <summary>
+		/// Custom textbox size management
+		/// </summary>
+		protected override void OnTextBoxResize(object source, EventArgs e)
+		{
+			if(_textbox == null)
+				return;
+			if(_showUpDownButtons == ShowUpDownButtonsMode.Always)
+			{
+				// standard management
+				base.OnTextBoxResize(source, e);
+			}
+			else
+			{
+				// custom management
+
+				// change position if RTL
+				bool fixPos = this.RightToLeft == RightToLeft.Yes ^ this.UpDownAlign == LeftRightAlignment.Left;
+
+				if(_mouseOver)
+				{
+					_textbox.Width = this.ClientSize.Width - _textbox.Left - _upDownButtons.Width - 2;
+					if(fixPos)
+						_textbox.Location = new Point(16, _textbox.Location.Y);
+				}
+				else
+				{
+					if(fixPos)
+						_textbox.Location = new Point(2, _textbox.Location.Y);
+					_textbox.Width = this.ClientSize.Width - _textbox.Left - 2;
+				}
+
+			}
+
+		}
+
+#endregion
+
+	}
+}
diff --git a/Source/Plugins/BuilderEffects/Interface/JitterSectorsForm.Designer.cs b/Source/Plugins/BuilderEffects/Interface/JitterSectorsForm.Designer.cs
new file mode 100644
index 0000000..9abf7d6
--- /dev/null
+++ b/Source/Plugins/BuilderEffects/Interface/JitterSectorsForm.Designer.cs
@@ -0,0 +1,454 @@
+namespace CodeImp.DoomBuilder.BuilderEffects
+{
+	partial class JitterSectorsForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing) {
+			if(disposing && (components != null)) {
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent() {
+			this.bCancel = new System.Windows.Forms.Button();
+			this.bApply = new System.Windows.Forms.Button();
+			this.bUpdateTranslation = new System.Windows.Forms.Button();
+			this.bUpdateCeilingHeight = new System.Windows.Forms.Button();
+			this.bUpdateFloorHeight = new System.Windows.Forms.Button();
+			this.gbUpperTexture = new System.Windows.Forms.GroupBox();
+			this.textureUpper = new CodeImp.DoomBuilder.Controls.TextureSelectorControl();
+			this.cbPegTop = new System.Windows.Forms.CheckBox();
+			this.textureLower = new CodeImp.DoomBuilder.Controls.TextureSelectorControl();
+			this.cbPegBottom = new System.Windows.Forms.CheckBox();
+			this.cbUpperTexStyle = new System.Windows.Forms.ComboBox();
+			this.cbLowerTexStyle = new System.Windows.Forms.ComboBox();
+			this.gbLowerTexture = new System.Windows.Forms.GroupBox();
+			this.cbKeepExistingTextures = new System.Windows.Forms.CheckBox();
+			this.positionJitterAmmount = new IntControl();
+			this.floorHeightAmmount = new IntControl();
+			this.ceilingHeightAmmount = new IntControl();
+			this.cbUseFloorVertexHeights = new System.Windows.Forms.CheckBox();
+			this.cbUseCeilingVertexHeights = new System.Windows.Forms.CheckBox();
+			this.label1 = new System.Windows.Forms.Label();
+			this.ceiloffsetmode = new System.Windows.Forms.ComboBox();
+			this.flooroffsetmode = new System.Windows.Forms.ComboBox();
+			this.label2 = new System.Windows.Forms.Label();
+			this.groupBox1 = new System.Windows.Forms.GroupBox();
+			this.groupBox2 = new System.Windows.Forms.GroupBox();
+			this.groupBox3 = new System.Windows.Forms.GroupBox();
+			this.groupBox4 = new System.Windows.Forms.GroupBox();
+			this.gbUpperTexture.SuspendLayout();
+			this.gbLowerTexture.SuspendLayout();
+			this.groupBox1.SuspendLayout();
+			this.groupBox2.SuspendLayout();
+			this.groupBox3.SuspendLayout();
+			this.groupBox4.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// bCancel
+			// 
+			this.bCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.bCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.bCancel.Location = new System.Drawing.Point(296, 525);
+			this.bCancel.Name = "bCancel";
+			this.bCancel.Size = new System.Drawing.Size(75, 25);
+			this.bCancel.TabIndex = 10;
+			this.bCancel.Text = "Cancel";
+			this.bCancel.UseVisualStyleBackColor = true;
+			this.bCancel.Click += new System.EventHandler(this.bCancel_Click);
+			// 
+			// bApply
+			// 
+			this.bApply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.bApply.Location = new System.Drawing.Point(195, 525);
+			this.bApply.Name = "bApply";
+			this.bApply.Size = new System.Drawing.Size(95, 25);
+			this.bApply.TabIndex = 9;
+			this.bApply.Text = "Apply";
+			this.bApply.UseVisualStyleBackColor = true;
+			this.bApply.Click += new System.EventHandler(this.bApply_Click);
+			// 
+			// bUpdateTranslation
+			// 
+			this.bUpdateTranslation.Image = global::CodeImp.DoomBuilder.BuilderEffects.Properties.Resources.Update;
+			this.bUpdateTranslation.Location = new System.Drawing.Point(327, 19);
+			this.bUpdateTranslation.Name = "bUpdateTranslation";
+			this.bUpdateTranslation.Size = new System.Drawing.Size(23, 25);
+			this.bUpdateTranslation.TabIndex = 11;
+			this.bUpdateTranslation.UseVisualStyleBackColor = true;
+			this.bUpdateTranslation.Click += new System.EventHandler(this.bUpdateTranslation_Click);
+			// 
+			// bUpdateCeilingHeight
+			// 
+			this.bUpdateCeilingHeight.Image = global::CodeImp.DoomBuilder.BuilderEffects.Properties.Resources.Update;
+			this.bUpdateCeilingHeight.Location = new System.Drawing.Point(327, 19);
+			this.bUpdateCeilingHeight.Name = "bUpdateCeilingHeight";
+			this.bUpdateCeilingHeight.Size = new System.Drawing.Size(23, 25);
+			this.bUpdateCeilingHeight.TabIndex = 15;
+			this.bUpdateCeilingHeight.UseVisualStyleBackColor = true;
+			this.bUpdateCeilingHeight.Click += new System.EventHandler(this.bUpdateCeilingHeight_Click);
+			// 
+			// bUpdateFloorHeight
+			// 
+			this.bUpdateFloorHeight.Image = global::CodeImp.DoomBuilder.BuilderEffects.Properties.Resources.Update;
+			this.bUpdateFloorHeight.Location = new System.Drawing.Point(327, 19);
+			this.bUpdateFloorHeight.Name = "bUpdateFloorHeight";
+			this.bUpdateFloorHeight.Size = new System.Drawing.Size(23, 25);
+			this.bUpdateFloorHeight.TabIndex = 16;
+			this.bUpdateFloorHeight.UseVisualStyleBackColor = true;
+			this.bUpdateFloorHeight.Click += new System.EventHandler(this.bUpdateFloorHeight_Click);
+			// 
+			// gbUpperTexture
+			// 
+			this.gbUpperTexture.Controls.Add(this.textureUpper);
+			this.gbUpperTexture.Controls.Add(this.cbPegTop);
+			this.gbUpperTexture.Location = new System.Drawing.Point(6, 71);
+			this.gbUpperTexture.Name = "gbUpperTexture";
+			this.gbUpperTexture.Size = new System.Drawing.Size(171, 159);
+			this.gbUpperTexture.TabIndex = 24;
+			this.gbUpperTexture.TabStop = false;
+			this.gbUpperTexture.Text = "Upper Texture:";
+			// 
+			// textureUpper
+			// 
+			this.textureUpper.Location = new System.Drawing.Point(47, 41);
+			this.textureUpper.MultipleTextures = false;
+			this.textureUpper.Name = "textureUpper";
+			this.textureUpper.Required = false;
+			this.textureUpper.Size = new System.Drawing.Size(83, 112);
+			this.textureUpper.TabIndex = 2;
+			this.textureUpper.TextureName = "";
+			this.textureUpper.UsePreviews = true;
+			this.textureUpper.OnValueChanged += new System.EventHandler(this.textureUpper_OnValueChanged);
+			// 
+			// cbPegTop
+			// 
+			this.cbPegTop.AutoSize = true;
+			this.cbPegTop.Location = new System.Drawing.Point(6, 19);
+			this.cbPegTop.Name = "cbPegTop";
+			this.cbPegTop.Size = new System.Drawing.Size(108, 17);
+			this.cbPegTop.TabIndex = 26;
+			this.cbPegTop.Text = "Upper Unpegged";
+			this.cbPegTop.UseVisualStyleBackColor = true;
+			this.cbPegTop.CheckedChanged += new System.EventHandler(this.cbPegTop_CheckedChanged);
+			// 
+			// textureLower
+			// 
+			this.textureLower.Location = new System.Drawing.Point(47, 41);
+			this.textureLower.MultipleTextures = false;
+			this.textureLower.Name = "textureLower";
+			this.textureLower.Required = false;
+			this.textureLower.Size = new System.Drawing.Size(83, 112);
+			this.textureLower.TabIndex = 4;
+			this.textureLower.TextureName = "";
+			this.textureLower.UsePreviews = true;
+			this.textureLower.OnValueChanged += new System.EventHandler(this.textureLower_OnValueChanged);
+			// 
+			// cbPegBottom
+			// 
+			this.cbPegBottom.AutoSize = true;
+			this.cbPegBottom.Location = new System.Drawing.Point(6, 19);
+			this.cbPegBottom.Name = "cbPegBottom";
+			this.cbPegBottom.Size = new System.Drawing.Size(108, 17);
+			this.cbPegBottom.TabIndex = 28;
+			this.cbPegBottom.Text = "Lower Unpegged";
+			this.cbPegBottom.UseVisualStyleBackColor = true;
+			this.cbPegBottom.CheckedChanged += new System.EventHandler(this.cbPegBottom_CheckedChanged);
+			// 
+			// cbUpperTexStyle
+			// 
+			this.cbUpperTexStyle.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.cbUpperTexStyle.FormattingEnabled = true;
+			this.cbUpperTexStyle.Items.AddRange(new object[] {
+            "Don\'t change upper texture",
+            "Use ceiling texture",
+            "Pick upper texture"});
+			this.cbUpperTexStyle.Location = new System.Drawing.Point(6, 43);
+			this.cbUpperTexStyle.Name = "cbUpperTexStyle";
+			this.cbUpperTexStyle.Size = new System.Drawing.Size(171, 21);
+			this.cbUpperTexStyle.TabIndex = 26;
+			this.cbUpperTexStyle.SelectedIndexChanged += new System.EventHandler(this.cbUpperTexStyle_SelectedIndexChanged);
+			// 
+			// cbLowerTexStyle
+			// 
+			this.cbLowerTexStyle.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.cbLowerTexStyle.FormattingEnabled = true;
+			this.cbLowerTexStyle.Items.AddRange(new object[] {
+            "Don\'t change lower texture",
+            "Use floor texture",
+            "Pick lower texture"});
+			this.cbLowerTexStyle.Location = new System.Drawing.Point(181, 43);
+			this.cbLowerTexStyle.Name = "cbLowerTexStyle";
+			this.cbLowerTexStyle.Size = new System.Drawing.Size(171, 21);
+			this.cbLowerTexStyle.TabIndex = 27;
+			this.cbLowerTexStyle.SelectedIndexChanged += new System.EventHandler(this.cbLowerTexStyle_SelectedIndexChanged);
+			// 
+			// gbLowerTexture
+			// 
+			this.gbLowerTexture.Controls.Add(this.textureLower);
+			this.gbLowerTexture.Controls.Add(this.cbPegBottom);
+			this.gbLowerTexture.Location = new System.Drawing.Point(181, 71);
+			this.gbLowerTexture.Name = "gbLowerTexture";
+			this.gbLowerTexture.Size = new System.Drawing.Size(171, 159);
+			this.gbLowerTexture.TabIndex = 29;
+			this.gbLowerTexture.TabStop = false;
+			this.gbLowerTexture.Text = "Lower texture:";
+			// 
+			// cbKeepExistingTextures
+			// 
+			this.cbKeepExistingTextures.AutoSize = true;
+			this.cbKeepExistingTextures.Location = new System.Drawing.Point(8, 19);
+			this.cbKeepExistingTextures.Name = "cbKeepExistingTextures";
+			this.cbKeepExistingTextures.Size = new System.Drawing.Size(205, 17);
+			this.cbKeepExistingTextures.TabIndex = 30;
+			this.cbKeepExistingTextures.Text = "Don\'t change existing sidedef textures";
+			this.cbKeepExistingTextures.UseVisualStyleBackColor = true;
+			this.cbKeepExistingTextures.CheckedChanged += new System.EventHandler(this.cbKeepExistingTextures_CheckedChanged);
+			// 
+			// positionJitterAmmount
+			// 
+			this.positionJitterAmmount.AllowNegative = false;
+			this.positionJitterAmmount.ExtendedLimits = true;
+			this.positionJitterAmmount.Label = "Position:";
+			this.positionJitterAmmount.Location = new System.Drawing.Point(6, 19);
+			this.positionJitterAmmount.Maximum = 100;
+			this.positionJitterAmmount.Minimum = 0;
+			this.positionJitterAmmount.Name = "positionJitterAmmount";
+			this.positionJitterAmmount.Size = new System.Drawing.Size(315, 22);
+			this.positionJitterAmmount.TabIndex = 18;
+			this.positionJitterAmmount.Value = 0;
+			this.positionJitterAmmount.OnValueChanging += new System.EventHandler(this.positionJitterAmmount_OnValueChanging);
+			// 
+			// floorHeightAmmount
+			// 
+			this.floorHeightAmmount.AllowNegative = false;
+			this.floorHeightAmmount.ExtendedLimits = false;
+			this.floorHeightAmmount.Label = "Floor height:";
+			this.floorHeightAmmount.Location = new System.Drawing.Point(6, 19);
+			this.floorHeightAmmount.Maximum = 100;
+			this.floorHeightAmmount.Minimum = 0;
+			this.floorHeightAmmount.Name = "floorHeightAmmount";
+			this.floorHeightAmmount.Size = new System.Drawing.Size(315, 22);
+			this.floorHeightAmmount.TabIndex = 20;
+			this.floorHeightAmmount.Value = 0;
+			this.floorHeightAmmount.OnValueChanging += new System.EventHandler(this.floorHeightAmmount_OnValueChanging);
+			// 
+			// ceilingHeightAmmount
+			// 
+			this.ceilingHeightAmmount.AllowNegative = false;
+			this.ceilingHeightAmmount.ExtendedLimits = false;
+			this.ceilingHeightAmmount.Label = "Height:";
+			this.ceilingHeightAmmount.Location = new System.Drawing.Point(6, 19);
+			this.ceilingHeightAmmount.Maximum = 100;
+			this.ceilingHeightAmmount.Minimum = 0;
+			this.ceilingHeightAmmount.Name = "ceilingHeightAmmount";
+			this.ceilingHeightAmmount.Size = new System.Drawing.Size(315, 22);
+			this.ceilingHeightAmmount.TabIndex = 19;
+			this.ceilingHeightAmmount.Value = 0;
+			this.ceilingHeightAmmount.OnValueChanging += new System.EventHandler(this.ceilingHeightAmmount_OnValueChanging);
+			// 
+			// cbUseFloorVertexHeights
+			// 
+			this.cbUseFloorVertexHeights.AutoSize = true;
+			this.cbUseFloorVertexHeights.Location = new System.Drawing.Point(102, 75);
+			this.cbUseFloorVertexHeights.Name = "cbUseFloorVertexHeights";
+			this.cbUseFloorVertexHeights.Size = new System.Drawing.Size(114, 17);
+			this.cbUseFloorVertexHeights.TabIndex = 31;
+			this.cbUseFloorVertexHeights.Text = "Use vertex heights";
+			this.cbUseFloorVertexHeights.UseVisualStyleBackColor = true;
+			this.cbUseFloorVertexHeights.CheckedChanged += new System.EventHandler(this.cbUseFloorVertexHeights_CheckedChanged);
+			// 
+			// cbUseCeilingVertexHeights
+			// 
+			this.cbUseCeilingVertexHeights.AutoSize = true;
+			this.cbUseCeilingVertexHeights.Location = new System.Drawing.Point(102, 75);
+			this.cbUseCeilingVertexHeights.Name = "cbUseCeilingVertexHeights";
+			this.cbUseCeilingVertexHeights.Size = new System.Drawing.Size(114, 17);
+			this.cbUseCeilingVertexHeights.TabIndex = 32;
+			this.cbUseCeilingVertexHeights.Text = "Use vertex heights";
+			this.cbUseCeilingVertexHeights.UseVisualStyleBackColor = true;
+			this.cbUseCeilingVertexHeights.CheckedChanged += new System.EventHandler(this.cbUseCeilingVertexHeights_CheckedChanged);
+			// 
+			// label1
+			// 
+			this.label1.AutoSize = true;
+			this.label1.Location = new System.Drawing.Point(26, 51);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(67, 13);
+			this.label1.TabIndex = 33;
+			this.label1.Text = "Offset mode:";
+			// 
+			// ceiloffsetmode
+			// 
+			this.ceiloffsetmode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.ceiloffsetmode.FormattingEnabled = true;
+			this.ceiloffsetmode.Items.AddRange(new object[] {
+            "Raise and lower",
+            "Lower only",
+            "Raise only"});
+			this.ceiloffsetmode.Location = new System.Drawing.Point(102, 47);
+			this.ceiloffsetmode.Name = "ceiloffsetmode";
+			this.ceiloffsetmode.Size = new System.Drawing.Size(112, 21);
+			this.ceiloffsetmode.TabIndex = 34;
+			this.ceiloffsetmode.SelectedIndexChanged += new System.EventHandler(this.ceiloffsetmode_SelectedIndexChanged);
+			// 
+			// flooroffsetmode
+			// 
+			this.flooroffsetmode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.flooroffsetmode.FormattingEnabled = true;
+			this.flooroffsetmode.Items.AddRange(new object[] {
+            "Raise and lower",
+            "Raise only",
+            "Lower only"});
+			this.flooroffsetmode.Location = new System.Drawing.Point(102, 47);
+			this.flooroffsetmode.Name = "flooroffsetmode";
+			this.flooroffsetmode.Size = new System.Drawing.Size(112, 21);
+			this.flooroffsetmode.TabIndex = 36;
+			this.flooroffsetmode.SelectedIndexChanged += new System.EventHandler(this.flooroffsetmode_SelectedIndexChanged);
+			// 
+			// label2
+			// 
+			this.label2.AutoSize = true;
+			this.label2.Location = new System.Drawing.Point(26, 51);
+			this.label2.Name = "label2";
+			this.label2.Size = new System.Drawing.Size(67, 13);
+			this.label2.TabIndex = 35;
+			this.label2.Text = "Offset mode:";
+			// 
+			// groupBox1
+			// 
+			this.groupBox1.Controls.Add(this.positionJitterAmmount);
+			this.groupBox1.Controls.Add(this.bUpdateTranslation);
+			this.groupBox1.Location = new System.Drawing.Point(12, 12);
+			this.groupBox1.Name = "groupBox1";
+			this.groupBox1.Size = new System.Drawing.Size(358, 54);
+			this.groupBox1.TabIndex = 37;
+			this.groupBox1.TabStop = false;
+			this.groupBox1.Text = "Position:";
+			// 
+			// groupBox2
+			// 
+			this.groupBox2.Controls.Add(this.ceilingHeightAmmount);
+			this.groupBox2.Controls.Add(this.bUpdateCeilingHeight);
+			this.groupBox2.Controls.Add(this.ceiloffsetmode);
+			this.groupBox2.Controls.Add(this.label1);
+			this.groupBox2.Controls.Add(this.cbUseCeilingVertexHeights);
+			this.groupBox2.Location = new System.Drawing.Point(12, 72);
+			this.groupBox2.Name = "groupBox2";
+			this.groupBox2.Size = new System.Drawing.Size(358, 100);
+			this.groupBox2.TabIndex = 38;
+			this.groupBox2.TabStop = false;
+			this.groupBox2.Text = "Ceiling:";
+			// 
+			// groupBox3
+			// 
+			this.groupBox3.Controls.Add(this.floorHeightAmmount);
+			this.groupBox3.Controls.Add(this.bUpdateFloorHeight);
+			this.groupBox3.Controls.Add(this.flooroffsetmode);
+			this.groupBox3.Controls.Add(this.cbUseFloorVertexHeights);
+			this.groupBox3.Controls.Add(this.label2);
+			this.groupBox3.Location = new System.Drawing.Point(12, 178);
+			this.groupBox3.Name = "groupBox3";
+			this.groupBox3.Size = new System.Drawing.Size(358, 100);
+			this.groupBox3.TabIndex = 35;
+			this.groupBox3.TabStop = false;
+			this.groupBox3.Text = "Floor:";
+			// 
+			// groupBox4
+			// 
+			this.groupBox4.Controls.Add(this.cbKeepExistingTextures);
+			this.groupBox4.Controls.Add(this.cbUpperTexStyle);
+			this.groupBox4.Controls.Add(this.cbLowerTexStyle);
+			this.groupBox4.Controls.Add(this.gbUpperTexture);
+			this.groupBox4.Controls.Add(this.gbLowerTexture);
+			this.groupBox4.Location = new System.Drawing.Point(12, 284);
+			this.groupBox4.Name = "groupBox4";
+			this.groupBox4.Size = new System.Drawing.Size(358, 236);
+			this.groupBox4.TabIndex = 39;
+			this.groupBox4.TabStop = false;
+			this.groupBox4.Text = "Textures:";
+			// 
+			// JitterSectorsForm
+			// 
+			this.AcceptButton = this.bApply;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.CancelButton = this.bCancel;
+			this.ClientSize = new System.Drawing.Size(382, 553);
+			this.Controls.Add(this.groupBox4);
+			this.Controls.Add(this.groupBox3);
+			this.Controls.Add(this.groupBox2);
+			this.Controls.Add(this.groupBox1);
+			this.Controls.Add(this.bCancel);
+			this.Controls.Add(this.bApply);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "JitterSectorsForm";
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
+			this.Text = "Jitter Settings";
+			this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.JitterSectorsForm_FormClosing);
+			this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.JitterSectorsForm_HelpRequested);
+			this.gbUpperTexture.ResumeLayout(false);
+			this.gbUpperTexture.PerformLayout();
+			this.gbLowerTexture.ResumeLayout(false);
+			this.gbLowerTexture.PerformLayout();
+			this.groupBox1.ResumeLayout(false);
+			this.groupBox2.ResumeLayout(false);
+			this.groupBox2.PerformLayout();
+			this.groupBox3.ResumeLayout(false);
+			this.groupBox3.PerformLayout();
+			this.groupBox4.ResumeLayout(false);
+			this.groupBox4.PerformLayout();
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Button bUpdateTranslation;
+		private System.Windows.Forms.Button bCancel;
+		private System.Windows.Forms.Button bApply;
+		private System.Windows.Forms.Button bUpdateCeilingHeight;
+		private System.Windows.Forms.Button bUpdateFloorHeight;
+		private IntControl positionJitterAmmount;
+		private IntControl ceilingHeightAmmount;
+		private IntControl floorHeightAmmount;
+		private System.Windows.Forms.GroupBox gbUpperTexture;
+		private CodeImp.DoomBuilder.Controls.TextureSelectorControl textureLower;
+		private CodeImp.DoomBuilder.Controls.TextureSelectorControl textureUpper;
+		private System.Windows.Forms.CheckBox cbPegBottom;
+		private System.Windows.Forms.CheckBox cbPegTop;
+		private System.Windows.Forms.ComboBox cbUpperTexStyle;
+		private System.Windows.Forms.ComboBox cbLowerTexStyle;
+		private System.Windows.Forms.GroupBox gbLowerTexture;
+		private System.Windows.Forms.CheckBox cbKeepExistingTextures;
+		private System.Windows.Forms.CheckBox cbUseFloorVertexHeights;
+		private System.Windows.Forms.CheckBox cbUseCeilingVertexHeights;
+		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.ComboBox ceiloffsetmode;
+		private System.Windows.Forms.ComboBox flooroffsetmode;
+		private System.Windows.Forms.Label label2;
+		private System.Windows.Forms.GroupBox groupBox1;
+		private System.Windows.Forms.GroupBox groupBox2;
+		private System.Windows.Forms.GroupBox groupBox3;
+		private System.Windows.Forms.GroupBox groupBox4;
+	}
+}
\ No newline at end of file
diff --git a/Source/Plugins/BuilderEffects/Interface/JitterSectorsForm.cs b/Source/Plugins/BuilderEffects/Interface/JitterSectorsForm.cs
new file mode 100644
index 0000000..5d965b6
--- /dev/null
+++ b/Source/Plugins/BuilderEffects/Interface/JitterSectorsForm.cs
@@ -0,0 +1,974 @@
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.VisualModes;
+using CodeImp.DoomBuilder.Windows;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderEffects
+{
+	public partial class JitterSectorsForm : DelayedForm
+	{
+		#region ================== Variables
+
+		private readonly string editingModeName;
+		private readonly List<VisualSector> visualSectors;
+		private readonly List<VisualVertexPair> visualVerts;
+		private readonly TranslationOffsetVertexData[] vertexData;
+		private readonly List<SectorData> sectorData;
+		private readonly List<SidedefData> sidedefData;
+		private readonly int MaxSafeDistance;
+		private readonly int MaxSafeHeightDistance;
+
+		//settings
+		private static bool keepExistingSideTextures = true;
+		private static bool useFloorVertexHeights;
+		private static bool useCeilingVertexHeights;
+		private static int storedceiloffsetmode;
+		private static int storedflooroffsetmode;
+
+		#endregion
+
+		#region ================== Structs
+
+		private struct TranslationOffsetVertexData
+		{
+			public Vertex Vertex;
+			public Vector2D InitialPosition;
+			public int SafeDistance;
+			public float JitterAngle;
+		}
+
+		private struct HeightOffsetVertexData
+		{
+			public Vertex Vertex;
+			public float InitialFloorHeight;
+			public float InitialCeilingHeight;
+			public float ZFloor;
+			public float ZCeiling;
+			public float JitterFloorHeight;
+			public float JitterCeilingHeight;
+		}
+
+		private struct SectorData
+		{
+			public Sector Sector;
+			public HeightOffsetVertexData[] Verts;
+			public int InitialCeilingHeight;
+			public int InitialFloorHeight;
+			public int SafeDistance;
+			public float JitterFloorHeight;
+			public float JitterCeilingHeight;
+			public bool Triangular;
+		}
+
+		private struct SidedefData
+		{
+			public Sidedef Side;
+			public string HighTexture;
+			public string OtherLowTexture;
+			public string OtherHighTexture;
+			public string LowTexture;
+			public bool PegTop;
+			public bool PegBottom;
+			public bool UpdateTextureOnOtherSide;
+		}
+
+		#endregion
+
+		#region ================== Constructor / Setup
+
+		public JitterSectorsForm(string editingModeName) 
+		{
+			this.editingModeName = editingModeName;
+
+			InitializeComponent();
+
+			//get selection
+			List<Vertex> verts = new List<Vertex>();
+			List<Sector> sectors = new List<Sector>();
+
+			if(editingModeName == "BaseVisualMode") 
+			{
+				VisualMode vm = (VisualMode)General.Editing.Mode;
+				List<VisualGeometry> visualGeometry = vm.GetSelectedSurfaces();
+				visualSectors = new List<VisualSector>();
+
+				//get selected visual and regular sectors
+				foreach(VisualGeometry vg in visualGeometry) 
+				{
+					if(vg.GeometryType != VisualGeometryType.CEILING && vg.GeometryType != VisualGeometryType.FLOOR)
+						continue;
+
+					if(vg.Sector != null && vg.Sector.Sector != null) 
+					{
+						foreach(Sidedef sd in vg.Sector.Sector.Sidedefs) 
+						{
+							if(!verts.Contains(sd.Line.Start))
+								verts.Add(sd.Line.Start);
+							if(!verts.Contains(sd.Line.End))
+								verts.Add(sd.Line.End);
+						}
+
+						sectors.Add(vg.Sector.Sector);
+						visualSectors.Add(vg.Sector);
+					}
+				}
+
+				//also get visual sectors around selected ones (because they also may be affected)
+				List<Vertex> affectedVerts = new List<Vertex>();
+
+				foreach(Sector s in sectors) 
+				{
+					foreach(Sidedef sd in s.Sidedefs) 
+					{
+						if(!affectedVerts.Contains(sd.Line.Start))
+							affectedVerts.Add(sd.Line.Start);
+						if(!affectedVerts.Contains(sd.Line.End))
+							affectedVerts.Add(sd.Line.End);
+					}
+				}
+
+				List<Sector> affectedSectors = new List<Sector>();
+				foreach(Vertex v in affectedVerts) 
+				{
+					foreach(Linedef l in v.Linedefs) 
+					{
+						if(l.Front != null && !sectors.Contains(l.Front.Sector) 
+							&& !affectedSectors.Contains(l.Front.Sector) 
+							&& vm.VisualSectorExists(l.Front.Sector)) 
+						{
+							visualSectors.Add(vm.GetVisualSector(l.Front.Sector));
+							affectedSectors.Add(l.Front.Sector);
+						}
+						if(l.Back != null && !sectors.Contains(l.Back.Sector) 
+							&& !affectedSectors.Contains(l.Back.Sector) 
+							&& vm.VisualSectorExists(l.Back.Sector)) 
+						{
+							visualSectors.Add(vm.GetVisualSector(l.Back.Sector));
+							affectedSectors.Add(l.Back.Sector);
+						}
+					}
+				}
+
+				visualVerts = new List<VisualVertexPair>();
+				foreach(Vertex vert in affectedVerts)
+				{
+					if(vm.VisualVertices.ContainsKey(vert)) visualVerts.Add(vm.VisualVertices[vert]);
+				}
+			} 
+			else if(editingModeName == "SectorsMode") 
+			{
+				ICollection<Sector> list = General.Map.Map.GetSelectedSectors(true);
+
+				foreach(Sector s in list) 
+				{
+					foreach(Sidedef sd in s.Sidedefs) 
+					{
+						if(!verts.Contains(sd.Line.Start))
+							verts.Add(sd.Line.Start);
+						if(!verts.Contains(sd.Line.End))
+							verts.Add(sd.Line.End);
+					}
+					sectors.Add(s);
+				}
+			}
+
+			if(verts.Count == 0 || sectors.Count == 0) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "Unable to get sectors from selection!");
+				return;
+			}
+
+			//create undo
+			General.Map.UndoRedo.ClearAllRedos();
+			General.Map.UndoRedo.CreateUndo("Randomize " + sectors.Count + (sectors.Count > 1 ? " sectors" : " sector"));
+
+			//update window header
+			this.Text = "Randomize " + sectors.Count + (sectors.Count > 1 ? " sectors" : " sector");
+
+			//store intial properties
+//process verts...
+			Dictionary<Vertex, TranslationOffsetVertexData> data = new Dictionary<Vertex, TranslationOffsetVertexData>();
+
+			foreach(Vertex v in verts) 
+			{
+				TranslationOffsetVertexData vd = new TranslationOffsetVertexData();
+				vd.Vertex = v;
+				vd.InitialPosition = v.Position;
+				data.Add(v, vd);
+			}
+
+			foreach(Vertex v in verts) 
+			{
+				if(v.Linedefs == null) continue;
+
+				//get nearest linedef
+				Linedef closestLine = null;
+				float distance = float.MaxValue;
+
+				// Go for all linedefs in selection
+				foreach(Linedef l in General.Map.Map.Linedefs) 
+				{
+					if(v.Linedefs.Contains(l)) continue;
+
+					// Calculate distance and check if closer than previous find
+					float d = l.SafeDistanceToSq(v.Position, true);
+					if(d < distance) 
+					{
+						// This one is closer
+						closestLine = l;
+						distance = d;
+					}
+				}
+
+				if(closestLine == null) continue;
+
+				float closestLineDistance = Vector2D.Distance(v.Position, closestLine.NearestOnLine(v.Position));
+
+				//check SafeDistance of closest line
+				if(data.ContainsKey(closestLine.Start) 
+					&& data[closestLine.Start].SafeDistance > closestLineDistance) 
+				{
+					TranslationOffsetVertexData vd = data[closestLine.Start];
+					vd.SafeDistance = (int)Math.Floor(closestLineDistance);
+					data[closestLine.Start] = vd;
+				}
+				if(data.ContainsKey(closestLine.End) 
+					&& data[closestLine.End].SafeDistance > closestLineDistance) 
+				{
+					TranslationOffsetVertexData vd = data[closestLine.End];
+					vd.SafeDistance = (int)Math.Floor(closestLineDistance);
+					data[closestLine.End] = vd;
+				}
+
+				//save SafeDistance
+				int dist = (int)Math.Floor(closestLineDistance);
+				if(data[v].SafeDistance == 0 || data[v].SafeDistance > dist) 
+				{
+					TranslationOffsetVertexData vd = data[v];
+					vd.SafeDistance = dist;
+					data[v] = vd;
+				}
+			}
+
+			//store properties
+			vertexData = new TranslationOffsetVertexData[data.Values.Count];
+			data.Values.CopyTo(vertexData, 0);
+
+			for(int i = 0; i < data.Count; i++) 
+			{
+				if(vertexData[i].SafeDistance > 0)
+					vertexData[i].SafeDistance /= 2;
+				if(MaxSafeDistance < vertexData[i].SafeDistance)
+					MaxSafeDistance = vertexData[i].SafeDistance;
+			}
+
+//process sectors and linedes
+			sectorData = new List<SectorData>();
+			sidedefData = new List<SidedefData>();
+
+			foreach(Sector s in sectors)
+			{
+				SectorData sd = new SectorData();
+
+				sd.Sector = s;
+				sd.InitialCeilingHeight = s.CeilHeight;
+				sd.InitialFloorHeight = s.FloorHeight;
+				sd.Triangular = General.Map.UDMF && s.Sidedefs.Count == 3;
+				if(sd.Triangular)
+				{
+					Vertex[] sectorverts = GetSectorVerts(s);
+					sd.Verts = new HeightOffsetVertexData[sectorverts.Length];
+					for(int i = 0; i < sectorverts.Length; i++)
+					{
+						HeightOffsetVertexData vd = new HeightOffsetVertexData();
+						vd.Vertex = sectorverts[i];
+						vd.ZFloor = sectorverts[i].ZFloor;
+						vd.ZCeiling = sectorverts[i].ZCeiling;
+						vd.InitialFloorHeight = float.IsNaN(vd.ZFloor) ? GetHighestFloor(sectorverts[i]) : sectorverts[i].ZFloor;
+						vd.InitialCeilingHeight = float.IsNaN(vd.ZCeiling) ? GetLowestCeiling(sectorverts[i]) : sectorverts[i].ZCeiling;
+
+						sd.Verts[i] = vd;
+					}
+				}
+				sd.SafeDistance = (s.CeilHeight - s.FloorHeight) / 2;
+				if(sd.SafeDistance > MaxSafeHeightDistance)	MaxSafeHeightDistance = sd.SafeDistance;
+				sectorData.Add(sd);
+
+				foreach(Sidedef side in s.Sidedefs) 
+				{
+					//store initial sidedef properties
+					SidedefData sdd = new SidedefData();
+
+					sdd.Side = side;
+					sdd.LowTexture = side.LowTexture;
+					sdd.HighTexture = side.HighTexture;
+					sdd.PegBottom = side.Line.IsFlagSet(General.Map.Config.LowerUnpeggedFlag);
+					sdd.PegTop = side.Line.IsFlagSet(General.Map.Config.UpperUnpeggedFlag);
+
+					if(side.Other != null && !sectors.Contains(side.Other.Sector)) 
+					{
+						sdd.UpdateTextureOnOtherSide = true;
+						sdd.OtherHighTexture = side.Other.HighTexture;
+						sdd.OtherLowTexture = side.Other.LowTexture;
+					}
+
+					sidedefData.Add(sdd);
+				}
+			}
+
+			positionJitterAmmount.Maximum = MaxSafeDistance;
+			floorHeightAmmount.Maximum = MaxSafeHeightDistance;
+			ceilingHeightAmmount.Maximum = MaxSafeHeightDistance;
+
+			//set editing settings
+			cbKeepExistingTextures.Checked = keepExistingSideTextures;
+			ceiloffsetmode.SelectedIndex = storedceiloffsetmode;
+			flooroffsetmode.SelectedIndex = storedflooroffsetmode;
+
+			//vertex heights can not be set in non-UDMF maps
+			if(General.Map.UDMF) 
+			{
+				cbUseFloorVertexHeights.Checked = useFloorVertexHeights;
+				cbUseCeilingVertexHeights.Checked = useCeilingVertexHeights;
+			} 
+			else 
+			{
+				useFloorVertexHeights = false;
+				cbUseFloorVertexHeights.Checked = false;
+				cbUseFloorVertexHeights.Enabled = false;
+
+				useCeilingVertexHeights = false;
+				cbUseCeilingVertexHeights.Checked = false;
+				cbUseCeilingVertexHeights.Enabled = false;
+			}
+
+			//texture pickers
+			textureLower.Initialize();
+			textureUpper.Initialize();
+
+			//We can't use floor/ceiling textures when MixTexturesFlats is disabled
+			if(General.Map.Config.MixTexturesFlats)
+			{
+				textureLower.TextureName = General.Settings.DefaultFloorTexture;
+				textureUpper.TextureName = General.Settings.DefaultCeilingTexture;
+			}
+			else
+			{
+				textureLower.TextureName = General.Settings.DefaultTexture;
+				textureUpper.TextureName = General.Settings.DefaultTexture;
+				cbUpperTexStyle.Items[1] = "Use default texture";
+				cbLowerTexStyle.Items[1] = "Use default texture";
+			}
+
+			cbUpperTexStyle.SelectedIndex = 0;
+			cbLowerTexStyle.SelectedIndex = 0;
+			UpdateTextureSelectors(); //update interface
+
+			//create random values
+			UpdateAngles(); 
+			UpdateFloorHeights();
+			UpdateCeilingHeights();
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		private static float GetLowestCeiling(Vertex v) 
+		{
+			if(v.Linedefs.Count == 0) return float.NaN;
+			List<Sector> sectors = GetSectors(v);
+			if(sectors.Count == 0) return float.NaN;
+
+			float target = sectors[0].CeilHeight;
+			for(int i = 1; i < sectors.Count; i++) 
+			{
+				if(target > sectors[i].CeilHeight && sectors[i].Sidedefs.Count == 3)
+					target = sectors[i].CeilHeight;
+			}
+
+			return target;
+		}
+
+		private static float GetHighestFloor(Vertex v) 
+		{
+			if(v.Linedefs.Count == 0) return float.NaN;
+			List<Sector> sectors = GetSectors(v);
+			if(sectors.Count == 0) return float.NaN;
+
+			float target = sectors[0].FloorHeight;
+			for(int i = 1; i < sectors.Count; i++) 
+			{
+				if(target < sectors[i].FloorHeight && sectors[i].Sidedefs.Count == 3)
+					target = sectors[i].FloorHeight;
+			}
+
+			return target;
+		}
+
+		private static List<Sector> GetSectors(Vertex v) 
+		{
+			List<Sector> result = new List<Sector>();
+			foreach(Linedef l in v.Linedefs) 
+			{
+				if(l.Front != null && l.Front.Sector != null && !result.Contains(l.Front.Sector))
+					result.Add(l.Front.Sector);
+				if(l.Back != null && l.Back.Sector != null && !result.Contains(l.Back.Sector))
+					result.Add(l.Back.Sector);
+			}
+			return result;
+		}
+
+		private static Vertex[] GetSectorVerts(Sector s) 
+		{
+			List<Vertex> result = new List<Vertex>();
+			foreach(Sidedef side in s.Sidedefs) 
+			{
+				if(side.Line == null) continue;
+				if(!result.Contains(side.Line.Start)) result.Add(side.Line.Start);
+				if(!result.Contains(side.Line.End)) result.Add(side.Line.End);
+			}
+
+			return result.ToArray();
+		}
+
+		#endregion
+
+		#region ================== Utility
+
+		private void ApplyTranslationJitter(int ammount) 
+		{
+			for(int i = 0; i < vertexData.Length; i++)
+			{
+				int curAmmount = ammount > vertexData[i].SafeDistance ? vertexData[i].SafeDistance : ammount;
+				vertexData[i].Vertex.Move(new Vector2D(vertexData[i].InitialPosition.x + (int)(Math.Sin(vertexData[i].JitterAngle) * curAmmount), vertexData[i].InitialPosition.y + (int)(Math.Cos(vertexData[i].JitterAngle) * curAmmount)));
+			}
+
+			//update view
+			if(editingModeName == "BaseVisualMode") 
+			{
+				General.Map.Map.Update();
+				General.Map.IsChanged = true;
+				UpdateVisualGeometry();
+			} 
+			else 
+			{
+				General.Interface.RedrawDisplay();
+			}
+		}
+
+		private void ApplyCeilingHeightJitter(int ammount) 
+		{
+			for(int i = 0; i < sectorData.Count; i++)
+			{
+				int curAmmount = ammount > sectorData[i].SafeDistance ? sectorData[i].SafeDistance : ammount;
+
+				if(sectorData[i].Triangular && cbUseCeilingVertexHeights.Checked) 
+				{
+					foreach(HeightOffsetVertexData vd in sectorData[i].Verts) 
+					{
+						vd.Vertex.ZCeiling = vd.InitialCeilingHeight - (float)Math.Floor(curAmmount
+							* ModifyByOffsetMode(vd.JitterCeilingHeight, ceiloffsetmode.SelectedIndex));
+					}
+				} 
+				else 
+				{
+					sectorData[i].Sector.CeilHeight = sectorData[i].InitialCeilingHeight - (int)Math.Floor(curAmmount
+						* ModifyByOffsetMode(sectorData[i].JitterCeilingHeight, ceiloffsetmode.SelectedIndex));
+				}
+			}
+
+			//update view
+			if(editingModeName == "BaseVisualMode") 
+			{
+				General.Map.Map.Update();
+				General.Map.IsChanged = true;
+				UpdateVisualGeometry();
+			}
+
+			UpdateUpperTextures(cbUpperTexStyle.SelectedIndex, false);
+		}
+
+		private void ApplyFloorHeightJitter(int ammount) 
+		{
+			for(int i = 0; i < sectorData.Count; i++)
+			{
+				int curAmmount = ammount > sectorData[i].SafeDistance ? sectorData[i].SafeDistance : ammount;
+
+				if(sectorData[i].Triangular && cbUseFloorVertexHeights.Checked) 
+				{
+					foreach(HeightOffsetVertexData vd in sectorData[i].Verts) 
+					{
+						vd.Vertex.ZFloor = vd.InitialFloorHeight + (float)Math.Floor(curAmmount
+							* ModifyByOffsetMode(vd.JitterFloorHeight, flooroffsetmode.SelectedIndex));
+					}
+				} 
+				else 
+				{
+					sectorData[i].Sector.FloorHeight = sectorData[i].InitialFloorHeight + (int)Math.Floor(curAmmount
+						* ModifyByOffsetMode(sectorData[i].JitterFloorHeight, flooroffsetmode.SelectedIndex));
+				}
+			}
+
+			//update view
+			if(editingModeName == "BaseVisualMode") 
+			{
+				General.Map.Map.Update();
+				General.Map.IsChanged = true;
+				UpdateVisualGeometry();
+			}
+
+			UpdateLowerTextures(cbLowerTexStyle.SelectedIndex, false);
+		}
+
+		private static float ModifyByOffsetMode(float value, int mode)
+		{
+			switch(mode)
+			{
+				case 0: //Raise and lower
+					return value;
+
+				case 1: //Raise only
+					return Math.Abs(value);
+
+				case 2: //Lower only
+					return -Math.Abs(value);
+
+				default:
+					throw new NotImplementedException("JitterSectorsForm.ModifyByOffsetMode: got unknown mode (" + mode + ")");
+			}
+		}
+
+		private void UpdateVisualGeometry() 
+		{
+			foreach(VisualSector vs in visualSectors) vs.UpdateSectorGeometry(true);
+			foreach(VisualSector vs in visualSectors) vs.UpdateSectorData();
+			foreach(VisualSector vs in visualSectors) vs.UpdateSectorData();
+			foreach(VisualVertexPair pair in visualVerts)
+			{
+				pair.Changed = true;
+				pair.Update();
+			}
+		}
+
+		private void UpdateTextureSelectors() 
+		{
+			cbLowerTexStyle.Enabled = floorHeightAmmount.Value > 0;
+			cbUpperTexStyle.Enabled = ceilingHeightAmmount.Value > 0;
+			gbLowerTexture.Enabled = floorHeightAmmount.Value > 0 && cbLowerTexStyle.SelectedIndex > 0;
+			gbUpperTexture.Enabled = ceilingHeightAmmount.Value > 0 && cbUpperTexStyle.SelectedIndex > 0;
+			textureLower.Enabled = floorHeightAmmount.Value > 0 && cbLowerTexStyle.SelectedIndex == 2;
+			textureUpper.Enabled = ceilingHeightAmmount.Value > 0 && cbUpperTexStyle.SelectedIndex == 2;
+		}
+
+		private void UpdateUpperTextures(int index, bool updateGeometry) 
+		{
+			if(index == -1) return;
+
+			if(index == 0) //revert
+			{ 
+				foreach(SidedefData sd in sidedefData)
+					SetUpperTexture(sd, sd.HighTexture);
+			}
+			else if(index == 1) //use ceiling or default texture
+			{
+				if(General.Map.Config.MixTexturesFlats)
+				{
+
+					foreach(SidedefData sd in sidedefData)
+					{
+						if(sd.Side.Sector != null)
+						{
+							if(sd.UpdateTextureOnOtherSide && sd.Side.Other.Sector != null) SetUpperTexture(sd, sd.Side.Sector.CeilTexture, sd.Side.Other.Sector.CeilTexture);
+							else SetUpperTexture(sd, sd.Side.Sector.CeilTexture);
+						}
+					}
+				}
+				else
+				{
+					foreach(SidedefData sd in sidedefData) SetUpperTexture(sd, General.Settings.DefaultTexture);
+				}
+			}
+			else if(index == 2) //use given texture
+			{
+				foreach(SidedefData sd in sidedefData)
+					SetUpperTexture(sd, textureUpper.TextureName);
+			}
+
+			General.Map.Data.UpdateUsedTextures();
+			if(updateGeometry && editingModeName == "BaseVisualMode") UpdateVisualGeometry();
+		}
+
+		private void UpdateLowerTextures(int index, bool updateGeometry) 
+		{
+			if(index == -1) return;
+
+			if(index == 0) //revert
+			{ 
+				foreach(SidedefData sd in sidedefData)
+					SetLowerTexture(sd, sd.LowTexture);
+			}
+			else if(index == 1) //use floor or default texture
+			{
+				if(General.Map.Config.MixTexturesFlats)
+				{
+					foreach(SidedefData sd in sidedefData)
+					{
+						if(sd.Side.Sector != null)
+						{
+							if(sd.UpdateTextureOnOtherSide && sd.Side.Other.Sector != null) SetLowerTexture(sd, sd.Side.Sector.FloorTexture, sd.Side.Other.Sector.FloorTexture);
+							else SetLowerTexture(sd, sd.Side.Sector.FloorTexture);
+						}
+					}
+				}
+				else
+				{
+					foreach(SidedefData sd in sidedefData) SetLowerTexture(sd, General.Settings.DefaultTexture);
+				}
+			}
+			else if(index == 2) //use given texture
+			{
+				foreach(SidedefData sd in sidedefData)
+					SetLowerTexture(sd, textureLower.TextureName);
+			}
+
+			General.Map.Data.UpdateUsedTextures();
+			if(updateGeometry && editingModeName == "BaseVisualMode") UpdateVisualGeometry();
+		}
+
+		#endregion
+
+		#region ================== Set Textures
+
+		private void SetUpperTexture(SidedefData sd, string textureName) 
+		{
+			SetUpperTexture(sd, textureName, textureName);
+		}
+
+		private void SetUpperTexture(SidedefData sd, string textureName, string otherTextureName) 
+		{
+			if(!cbKeepExistingTextures.Checked || string.IsNullOrEmpty(sd.HighTexture) || sd.HighTexture == "-")
+				sd.Side.SetTextureHigh(textureName);
+
+			if(sd.UpdateTextureOnOtherSide && sd.Side.Other != null && (!cbKeepExistingTextures.Checked || string.IsNullOrEmpty(sd.OtherHighTexture) || sd.OtherHighTexture == "-"))
+				sd.Side.Other.SetTextureHigh(otherTextureName);
+		}
+
+		private void SetLowerTexture(SidedefData sd, string textureName) 
+		{
+			SetLowerTexture(sd, textureName, textureName);
+		}
+
+		private void SetLowerTexture(SidedefData sd, string textureName, string otherTextureName) 
+		{
+			if(!cbKeepExistingTextures.Checked || string.IsNullOrEmpty(sd.LowTexture) || sd.LowTexture == "-")
+				sd.Side.SetTextureLow(textureName);
+
+			if(sd.UpdateTextureOnOtherSide && sd.Side.Other != null && (!cbKeepExistingTextures.Checked || string.IsNullOrEmpty(sd.OtherLowTexture) || sd.OtherLowTexture == "-")) 
+				sd.Side.Other.SetTextureLow(otherTextureName);
+		}
+
+		#endregion
+
+		#region ================== Jitter generation
+
+		private void UpdateAngles() 
+		{
+			for(int i = 0; i < vertexData.Length; i++) 
+			{
+				TranslationOffsetVertexData vd = vertexData[i];
+				vd.JitterAngle = (float)(General.Random(0, 359) * Math.PI / 180f);
+				vertexData[i] = vd;
+			}
+		}
+
+		private void UpdateFloorHeights() 
+		{
+			for(int i = 0; i < sectorData.Count; i++) 
+			{
+				SectorData sd = sectorData[i];
+
+				if(sd.Triangular) 
+				{
+					for(int c = 0; c < 3; c++) 
+					{
+						HeightOffsetVertexData vd = sd.Verts[c];
+						vd.JitterFloorHeight = General.Random(-100, 100) / 100f;
+						sd.Verts[c] = vd;
+					}
+				} 
+
+				sd.JitterFloorHeight = General.Random(-100, 100) / 100f;
+				sectorData[i] = sd;
+			}
+		}
+
+		private void UpdateCeilingHeights() 
+		{
+			for(int i = 0; i < sectorData.Count; i++) 
+			{
+				SectorData sd = sectorData[i];
+
+				if(sd.Triangular) 
+				{
+					for(int c = 0; c < 3; c++)
+					{
+						HeightOffsetVertexData vd = sd.Verts[c];
+						vd.JitterCeilingHeight = General.Random(-100, 100) / 100f;
+						sd.Verts[c] = vd;
+					}
+				} 
+
+				sd.JitterCeilingHeight = General.Random(-100, 100) / 100f;
+				sectorData[i] = sd;
+			}
+		}
+
+		#endregion
+
+		#region ================== Events
+
+		private void bApply_Click(object sender, EventArgs e) 
+		{
+			//store settings
+			keepExistingSideTextures = cbKeepExistingTextures.Checked;
+			useFloorVertexHeights = cbUseFloorVertexHeights.Checked;
+			useCeilingVertexHeights = cbUseCeilingVertexHeights.Checked;
+			storedceiloffsetmode = ceiloffsetmode.SelectedIndex;
+			storedflooroffsetmode = flooroffsetmode.SelectedIndex;
+			
+			// Clean unused sidedef textures
+			foreach(SidedefData sd in sidedefData) 
+			{
+				sd.Side.RemoveUnneededTextures(false);
+
+				if(sd.UpdateTextureOnOtherSide)
+					sd.Side.Other.RemoveUnneededTextures(false);
+			}
+
+			// Update cached values
+			General.Map.Map.Update();
+			General.Map.IsChanged = true;
+
+			// Clear selection
+			General.Actions.InvokeAction("builder_clearselection");
+
+			this.DialogResult = DialogResult.OK;
+			Close();
+		}
+
+		private void bCancel_Click(object sender, EventArgs e) 
+		{
+			this.DialogResult = DialogResult.Cancel;
+			Close();
+		}
+
+		private void JitterSectorsForm_FormClosing(object sender, FormClosingEventArgs e) 
+		{
+			if(this.DialogResult == DialogResult.Cancel)
+				General.Map.UndoRedo.WithdrawUndo(); //undo changes
+		}
+
+		private void positionJitterAmmount_OnValueChanging(object sender, EventArgs e) 
+		{
+			ApplyTranslationJitter(positionJitterAmmount.Value);
+		}
+
+		private void ceilingHeightAmmount_OnValueChanging(object sender, EventArgs e) 
+		{
+			ApplyCeilingHeightJitter(ceilingHeightAmmount.Value);
+			UpdateTextureSelectors();
+		}
+
+		private void floorHeightAmmount_OnValueChanging(object sender, EventArgs e) 
+		{
+			ApplyFloorHeightJitter(floorHeightAmmount.Value);
+			UpdateTextureSelectors();
+		}
+
+		private void cbKeepExistingTextures_CheckedChanged(object sender, EventArgs e) 
+		{
+			//revert possible changes
+			if(cbKeepExistingTextures.Checked) 
+			{
+				foreach(SidedefData sd in sidedefData) 
+				{
+					if(!string.IsNullOrEmpty(sd.HighTexture))
+						sd.Side.SetTextureHigh(sd.HighTexture);
+
+					if(sd.UpdateTextureOnOtherSide && !string.IsNullOrEmpty(sd.OtherHighTexture))
+						sd.Side.Other.SetTextureHigh(sd.OtherHighTexture);
+				}
+
+				if(editingModeName == "BaseVisualMode")	UpdateVisualGeometry();
+			} 
+			else 
+			{
+				UpdateLowerTextures(cbLowerTexStyle.SelectedIndex, false);
+				UpdateUpperTextures(cbUpperTexStyle.SelectedIndex, true);
+			}
+		}
+
+		private void cbUseFloorVertexHeights_CheckedChanged(object sender, EventArgs e) 
+		{
+			//Reset values?
+			if(!cbUseFloorVertexHeights.Checked || floorHeightAmmount.Value == 0)
+			{
+				foreach(SectorData data in sectorData)
+				{
+					if(!data.Triangular) continue;
+					foreach(HeightOffsetVertexData vd in data.Verts) vd.Vertex.ZFloor = vd.ZFloor;
+				}
+			}
+
+			//update changes
+			ApplyFloorHeightJitter(floorHeightAmmount.Value);
+			UpdateTextureSelectors();
+		}
+
+		private void cbUseCeilingVertexHeights_CheckedChanged(object sender, EventArgs e) 
+		{
+			//Reset values?
+			if(!cbUseCeilingVertexHeights.Checked || ceilingHeightAmmount.Value == 0) 
+			{
+				foreach(SectorData data in sectorData) 
+				{
+					if(!data.Triangular) continue;
+					foreach(HeightOffsetVertexData vd in data.Verts) vd.Vertex.ZCeiling = vd.ZCeiling;
+				}
+			}
+
+			//update changes
+			ApplyCeilingHeightJitter(ceilingHeightAmmount.Value);
+			UpdateTextureSelectors();
+		}
+
+		#region ================== Update Events
+
+		private void bUpdateTranslation_Click(object sender, EventArgs e) 
+		{
+			UpdateAngles();
+			ApplyTranslationJitter(positionJitterAmmount.Value);
+		}
+
+		private void bUpdateCeilingHeight_Click(object sender, EventArgs e) 
+		{
+			UpdateCeilingHeights();
+			ApplyCeilingHeightJitter(ceilingHeightAmmount.Value);
+		}
+
+		private void bUpdateFloorHeight_Click(object sender, EventArgs e) 
+		{
+			UpdateFloorHeights();
+			ApplyFloorHeightJitter(floorHeightAmmount.Value);
+		}
+
+		#endregion
+
+		#region ================== Height Offset Mode Events
+
+		private void ceiloffsetmode_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			ApplyCeilingHeightJitter(ceilingHeightAmmount.Value);
+		}
+
+		private void flooroffsetmode_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			ApplyFloorHeightJitter(floorHeightAmmount.Value);
+		}
+
+		#endregion
+
+		#region ================== Texture Pegging Events
+
+		private void cbPegTop_CheckedChanged(object sender, EventArgs e) 
+		{
+			if(cbPegTop.Checked) //apply flag
+			{ 
+				foreach(SidedefData sd in sidedefData)
+					sd.Side.Line.SetFlag(General.Map.Config.UpperUnpeggedFlag, true);
+			} 
+			else //revert to initial setting
+			{ 
+				foreach(SidedefData sd in sidedefData)
+					sd.Side.Line.SetFlag(General.Map.Config.UpperUnpeggedFlag, sd.PegTop);
+			}
+
+			if(editingModeName == "BaseVisualMode") 
+			{
+				General.Map.Data.UpdateUsedTextures();
+				UpdateVisualGeometry();
+			}
+		}
+
+		private void cbPegBottom_CheckedChanged(object sender, EventArgs e) 
+		{
+			if(cbPegBottom.Checked) //apply flag
+			{ 
+				foreach(SidedefData sd in sidedefData)
+					sd.Side.Line.SetFlag(General.Map.Config.LowerUnpeggedFlag, true);
+			} 
+			else //revert to initial setting
+			{ 
+				foreach(SidedefData sd in sidedefData)
+					sd.Side.Line.SetFlag(General.Map.Config.LowerUnpeggedFlag, sd.PegBottom);
+			}
+
+			if(editingModeName == "BaseVisualMode") 
+			{
+				General.Map.Data.UpdateUsedTextures();
+				UpdateVisualGeometry();
+			}
+		}
+
+		#endregion
+
+		#region ================== Texture Picker Events
+
+		//texture pickers
+		private void textureLower_OnValueChanged(object sender, EventArgs e) 
+		{
+			UpdateLowerTextures(cbLowerTexStyle.SelectedIndex, true);
+		}
+
+		private void textureUpper_OnValueChanged(object sender, EventArgs e) 
+		{
+			UpdateUpperTextures(cbUpperTexStyle.SelectedIndex, true);
+		}
+
+		#endregion
+
+		#region ================== Texture Style Selector Events
+
+		//texture style selectors
+		private void cbUpperTexStyle_SelectedIndexChanged(object sender, EventArgs e) 
+		{
+			UpdateUpperTextures(cbUpperTexStyle.SelectedIndex, true);
+			UpdateTextureSelectors();
+		}
+
+		private void cbLowerTexStyle_SelectedIndexChanged(object sender, EventArgs e) 
+		{
+			UpdateLowerTextures(cbLowerTexStyle.SelectedIndex, true);
+			UpdateTextureSelectors();
+		}
+
+		#endregion
+
+		//HALP!
+		private void JitterSectorsForm_HelpRequested(object sender, HelpEventArgs hlpevent) 
+		{
+			General.ShowHelp("gzdb/features/all_modes/jitter.html");
+			hlpevent.Handled = true;
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderEffects/Interface/JitterSectorsForm.resx b/Source/Plugins/BuilderEffects/Interface/JitterSectorsForm.resx
new file mode 100644
index 0000000..19dc0dd
--- /dev/null
+++ b/Source/Plugins/BuilderEffects/Interface/JitterSectorsForm.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/BuilderEffects/Interface/JitterThingsForm.Designer.cs b/Source/Plugins/BuilderEffects/Interface/JitterThingsForm.Designer.cs
new file mode 100644
index 0000000..1739a38
--- /dev/null
+++ b/Source/Plugins/BuilderEffects/Interface/JitterThingsForm.Designer.cs
@@ -0,0 +1,603 @@
+namespace CodeImp.DoomBuilder.BuilderEffects
+{
+	partial class JitterThingsForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing) {
+			if(disposing && (components != null)) {
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent() {
+			this.components = new System.ComponentModel.Container();
+			this.bApply = new System.Windows.Forms.Button();
+			this.bCancel = new System.Windows.Forms.Button();
+			this.bUpdateTranslation = new System.Windows.Forms.Button();
+			this.positionJitterAmmount = new IntControl();
+			this.bUpdateAngle = new System.Windows.Forms.Button();
+			this.rotationJitterAmmount = new IntControl();
+			this.heightJitterAmmount = new IntControl();
+			this.bUpdateHeight = new System.Windows.Forms.Button();
+			this.pitchAmmount = new IntControl();
+			this.rollAmmount = new IntControl();
+			this.bUpdatePitch = new System.Windows.Forms.Button();
+			this.bUpdateRoll = new System.Windows.Forms.Button();
+			this.groupBox1 = new System.Windows.Forms.GroupBox();
+			this.groupBox2 = new System.Windows.Forms.GroupBox();
+			this.cbNegativeRoll = new System.Windows.Forms.CheckBox();
+			this.cbNegativePitch = new System.Windows.Forms.CheckBox();
+			this.cbRelativeRoll = new System.Windows.Forms.CheckBox();
+			this.cbRelativePitch = new System.Windows.Forms.CheckBox();
+			this.scalegroup = new System.Windows.Forms.GroupBox();
+			this.cbNegativeScaleY = new System.Windows.Forms.CheckBox();
+			this.cbNegativeScaleX = new System.Windows.Forms.CheckBox();
+			this.cbUniformScale = new System.Windows.Forms.CheckBox();
+			this.cbRelativeScale = new System.Windows.Forms.CheckBox();
+			this.bUpdateScaleY = new System.Windows.Forms.Button();
+			this.maxScaleYLabel = new System.Windows.Forms.Label();
+			this.maxScaleY = new System.Windows.Forms.NumericUpDown();
+			this.minScaleYLabel = new System.Windows.Forms.Label();
+			this.minScaleY = new System.Windows.Forms.NumericUpDown();
+			this.bUpdateScaleX = new System.Windows.Forms.Button();
+			this.label3 = new System.Windows.Forms.Label();
+			this.maxScaleX = new System.Windows.Forms.NumericUpDown();
+			this.label2 = new System.Windows.Forms.Label();
+			this.minScaleX = new System.Windows.Forms.NumericUpDown();
+			this.toolTip = new System.Windows.Forms.ToolTip(this.components);
+			this.groupBox1.SuspendLayout();
+			this.groupBox2.SuspendLayout();
+			this.scalegroup.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.maxScaleY)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.minScaleY)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.maxScaleX)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.minScaleX)).BeginInit();
+			this.SuspendLayout();
+			// 
+			// bApply
+			// 
+			this.bApply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.bApply.Location = new System.Drawing.Point(115, 399);
+			this.bApply.Name = "bApply";
+			this.bApply.Size = new System.Drawing.Size(95, 23);
+			this.bApply.TabIndex = 0;
+			this.bApply.Text = "Apply";
+			this.bApply.UseVisualStyleBackColor = true;
+			this.bApply.Click += new System.EventHandler(this.bApply_Click);
+			// 
+			// bCancel
+			// 
+			this.bCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.bCancel.Location = new System.Drawing.Point(216, 399);
+			this.bCancel.Name = "bCancel";
+			this.bCancel.Size = new System.Drawing.Size(75, 23);
+			this.bCancel.TabIndex = 1;
+			this.bCancel.Text = "Cancel";
+			this.bCancel.UseVisualStyleBackColor = true;
+			this.bCancel.Click += new System.EventHandler(this.bCancel_Click);
+			// 
+			// bUpdateTranslation
+			// 
+			this.bUpdateTranslation.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.bUpdateTranslation.Image = global::CodeImp.DoomBuilder.BuilderEffects.Properties.Resources.Update;
+			this.bUpdateTranslation.Location = new System.Drawing.Point(247, 18);
+			this.bUpdateTranslation.Name = "bUpdateTranslation";
+			this.bUpdateTranslation.Size = new System.Drawing.Size(23, 23);
+			this.bUpdateTranslation.TabIndex = 5;
+			this.bUpdateTranslation.UseVisualStyleBackColor = true;
+			this.bUpdateTranslation.Click += new System.EventHandler(this.bUpdateTranslation_Click);
+			// 
+			// positionJitterAmmount
+			// 
+			this.positionJitterAmmount.AllowNegative = false;
+			this.positionJitterAmmount.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.positionJitterAmmount.ExtendedLimits = true;
+			this.positionJitterAmmount.Label = "Position:";
+			this.positionJitterAmmount.Location = new System.Drawing.Point(-25, 19);
+			this.positionJitterAmmount.Maximum = 100;
+			this.positionJitterAmmount.Minimum = 0;
+			this.positionJitterAmmount.Name = "positionJitterAmmount";
+			this.positionJitterAmmount.Size = new System.Drawing.Size(266, 22);
+			this.positionJitterAmmount.TabIndex = 6;
+			this.positionJitterAmmount.Value = 0;
+			this.positionJitterAmmount.OnValueChanging += new System.EventHandler(this.positionJitterAmmount_OnValueChanged);
+			// 
+			// bUpdateAngle
+			// 
+			this.bUpdateAngle.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.bUpdateAngle.Image = global::CodeImp.DoomBuilder.BuilderEffects.Properties.Resources.Update;
+			this.bUpdateAngle.Location = new System.Drawing.Point(247, 18);
+			this.bUpdateAngle.Name = "bUpdateAngle";
+			this.bUpdateAngle.Size = new System.Drawing.Size(23, 23);
+			this.bUpdateAngle.TabIndex = 5;
+			this.bUpdateAngle.UseVisualStyleBackColor = true;
+			this.bUpdateAngle.Click += new System.EventHandler(this.bUpdateAngle_Click);
+			// 
+			// rotationJitterAmmount
+			// 
+			this.rotationJitterAmmount.AllowNegative = false;
+			this.rotationJitterAmmount.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.rotationJitterAmmount.ExtendedLimits = false;
+			this.rotationJitterAmmount.Label = "Angle:";
+			this.rotationJitterAmmount.Location = new System.Drawing.Point(-25, 19);
+			this.rotationJitterAmmount.Maximum = 359;
+			this.rotationJitterAmmount.Minimum = 0;
+			this.rotationJitterAmmount.Name = "rotationJitterAmmount";
+			this.rotationJitterAmmount.Size = new System.Drawing.Size(266, 22);
+			this.rotationJitterAmmount.TabIndex = 8;
+			this.rotationJitterAmmount.Value = 0;
+			this.rotationJitterAmmount.OnValueChanging += new System.EventHandler(this.rotationJitterAmmount_OnValueChanged);
+			// 
+			// heightJitterAmmount
+			// 
+			this.heightJitterAmmount.AllowNegative = false;
+			this.heightJitterAmmount.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.heightJitterAmmount.ExtendedLimits = false;
+			this.heightJitterAmmount.Label = "Height:";
+			this.heightJitterAmmount.Location = new System.Drawing.Point(-25, 47);
+			this.heightJitterAmmount.Maximum = 100;
+			this.heightJitterAmmount.Minimum = 0;
+			this.heightJitterAmmount.Name = "heightJitterAmmount";
+			this.heightJitterAmmount.Size = new System.Drawing.Size(266, 22);
+			this.heightJitterAmmount.TabIndex = 6;
+			this.heightJitterAmmount.Value = 0;
+			this.heightJitterAmmount.OnValueChanging += new System.EventHandler(this.heightJitterAmmount_OnValueChanging);
+			// 
+			// bUpdateHeight
+			// 
+			this.bUpdateHeight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.bUpdateHeight.Image = global::CodeImp.DoomBuilder.BuilderEffects.Properties.Resources.Update;
+			this.bUpdateHeight.Location = new System.Drawing.Point(247, 46);
+			this.bUpdateHeight.Name = "bUpdateHeight";
+			this.bUpdateHeight.Size = new System.Drawing.Size(23, 23);
+			this.bUpdateHeight.TabIndex = 5;
+			this.bUpdateHeight.UseVisualStyleBackColor = true;
+			this.bUpdateHeight.Click += new System.EventHandler(this.bUpdateHeight_Click);
+			// 
+			// pitchAmmount
+			// 
+			this.pitchAmmount.AllowNegative = false;
+			this.pitchAmmount.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.pitchAmmount.ExtendedLimits = false;
+			this.pitchAmmount.Label = "Pitch:";
+			this.pitchAmmount.Location = new System.Drawing.Point(-25, 47);
+			this.pitchAmmount.Maximum = 359;
+			this.pitchAmmount.Minimum = 0;
+			this.pitchAmmount.Name = "pitchAmmount";
+			this.pitchAmmount.Size = new System.Drawing.Size(266, 24);
+			this.pitchAmmount.TabIndex = 13;
+			this.pitchAmmount.Value = 0;
+			this.pitchAmmount.OnValueChanging += new System.EventHandler(this.pitchAmmount_OnValueChanging);
+			// 
+			// rollAmmount
+			// 
+			this.rollAmmount.AllowNegative = false;
+			this.rollAmmount.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.rollAmmount.ExtendedLimits = false;
+			this.rollAmmount.Label = "Roll:";
+			this.rollAmmount.Location = new System.Drawing.Point(-25, 77);
+			this.rollAmmount.Maximum = 359;
+			this.rollAmmount.Minimum = 0;
+			this.rollAmmount.Name = "rollAmmount";
+			this.rollAmmount.Size = new System.Drawing.Size(266, 24);
+			this.rollAmmount.TabIndex = 14;
+			this.rollAmmount.Value = 0;
+			this.rollAmmount.OnValueChanging += new System.EventHandler(this.rollAmmount_OnValueChanging);
+			// 
+			// bUpdatePitch
+			// 
+			this.bUpdatePitch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.bUpdatePitch.Image = global::CodeImp.DoomBuilder.BuilderEffects.Properties.Resources.Update;
+			this.bUpdatePitch.Location = new System.Drawing.Point(247, 47);
+			this.bUpdatePitch.Name = "bUpdatePitch";
+			this.bUpdatePitch.Size = new System.Drawing.Size(23, 23);
+			this.bUpdatePitch.TabIndex = 15;
+			this.bUpdatePitch.UseVisualStyleBackColor = true;
+			this.bUpdatePitch.Click += new System.EventHandler(this.bUpdatePitch_Click);
+			// 
+			// bUpdateRoll
+			// 
+			this.bUpdateRoll.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.bUpdateRoll.Image = global::CodeImp.DoomBuilder.BuilderEffects.Properties.Resources.Update;
+			this.bUpdateRoll.Location = new System.Drawing.Point(247, 76);
+			this.bUpdateRoll.Name = "bUpdateRoll";
+			this.bUpdateRoll.Size = new System.Drawing.Size(23, 23);
+			this.bUpdateRoll.TabIndex = 16;
+			this.bUpdateRoll.UseVisualStyleBackColor = true;
+			this.bUpdateRoll.Click += new System.EventHandler(this.bUpdateRoll_Click);
+			// 
+			// groupBox1
+			// 
+			this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.groupBox1.Controls.Add(this.positionJitterAmmount);
+			this.groupBox1.Controls.Add(this.bUpdateTranslation);
+			this.groupBox1.Controls.Add(this.bUpdateHeight);
+			this.groupBox1.Controls.Add(this.heightJitterAmmount);
+			this.groupBox1.Location = new System.Drawing.Point(12, 12);
+			this.groupBox1.Name = "groupBox1";
+			this.groupBox1.Size = new System.Drawing.Size(279, 82);
+			this.groupBox1.TabIndex = 17;
+			this.groupBox1.TabStop = false;
+			this.groupBox1.Text = " Position: ";
+			// 
+			// groupBox2
+			// 
+			this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.groupBox2.Controls.Add(this.cbNegativeRoll);
+			this.groupBox2.Controls.Add(this.cbNegativePitch);
+			this.groupBox2.Controls.Add(this.cbRelativeRoll);
+			this.groupBox2.Controls.Add(this.cbRelativePitch);
+			this.groupBox2.Controls.Add(this.rotationJitterAmmount);
+			this.groupBox2.Controls.Add(this.bUpdateAngle);
+			this.groupBox2.Controls.Add(this.bUpdateRoll);
+			this.groupBox2.Controls.Add(this.pitchAmmount);
+			this.groupBox2.Controls.Add(this.rollAmmount);
+			this.groupBox2.Controls.Add(this.bUpdatePitch);
+			this.groupBox2.Location = new System.Drawing.Point(12, 100);
+			this.groupBox2.Name = "groupBox2";
+			this.groupBox2.Size = new System.Drawing.Size(279, 159);
+			this.groupBox2.TabIndex = 18;
+			this.groupBox2.TabStop = false;
+			this.groupBox2.Text = " Rotation: ";
+			// 
+			// cbNegativeRoll
+			// 
+			this.cbNegativeRoll.AutoSize = true;
+			this.cbNegativeRoll.Location = new System.Drawing.Point(150, 134);
+			this.cbNegativeRoll.Name = "cbNegativeRoll";
+			this.cbNegativeRoll.Size = new System.Drawing.Size(105, 17);
+			this.cbNegativeRoll.TabIndex = 20;
+			this.cbNegativeRoll.Text = "Use negative roll";
+			this.toolTip.SetToolTip(this.cbNegativeRoll, "When checked, 50% of the time \r\nnegative roll will be used");
+			this.cbNegativeRoll.UseVisualStyleBackColor = true;
+			// 
+			// cbNegativePitch
+			// 
+			this.cbNegativePitch.AutoSize = true;
+			this.cbNegativePitch.Location = new System.Drawing.Point(150, 110);
+			this.cbNegativePitch.Name = "cbNegativePitch";
+			this.cbNegativePitch.Size = new System.Drawing.Size(115, 17);
+			this.cbNegativePitch.TabIndex = 19;
+			this.cbNegativePitch.Text = "Use negative pitch";
+			this.toolTip.SetToolTip(this.cbNegativePitch, "When checked, 50% of the time \r\nnegative pitch will be used.");
+			this.cbNegativePitch.UseVisualStyleBackColor = true;
+			// 
+			// cbRelativeRoll
+			// 
+			this.cbRelativeRoll.AutoSize = true;
+			this.cbRelativeRoll.Location = new System.Drawing.Point(9, 134);
+			this.cbRelativeRoll.Name = "cbRelativeRoll";
+			this.cbRelativeRoll.Size = new System.Drawing.Size(119, 17);
+			this.cbRelativeRoll.TabIndex = 18;
+			this.cbRelativeRoll.Text = "Relative to initial roll";
+			this.cbRelativeRoll.UseVisualStyleBackColor = true;
+			// 
+			// cbRelativePitch
+			// 
+			this.cbRelativePitch.AutoSize = true;
+			this.cbRelativePitch.Location = new System.Drawing.Point(9, 110);
+			this.cbRelativePitch.Name = "cbRelativePitch";
+			this.cbRelativePitch.Size = new System.Drawing.Size(129, 17);
+			this.cbRelativePitch.TabIndex = 17;
+			this.cbRelativePitch.Text = "Relative to initial pitch";
+			this.cbRelativePitch.UseVisualStyleBackColor = true;
+			// 
+			// scalegroup
+			// 
+			this.scalegroup.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.scalegroup.Controls.Add(this.cbNegativeScaleY);
+			this.scalegroup.Controls.Add(this.cbNegativeScaleX);
+			this.scalegroup.Controls.Add(this.cbUniformScale);
+			this.scalegroup.Controls.Add(this.cbRelativeScale);
+			this.scalegroup.Controls.Add(this.bUpdateScaleY);
+			this.scalegroup.Controls.Add(this.maxScaleYLabel);
+			this.scalegroup.Controls.Add(this.maxScaleY);
+			this.scalegroup.Controls.Add(this.minScaleYLabel);
+			this.scalegroup.Controls.Add(this.minScaleY);
+			this.scalegroup.Controls.Add(this.bUpdateScaleX);
+			this.scalegroup.Controls.Add(this.label3);
+			this.scalegroup.Controls.Add(this.maxScaleX);
+			this.scalegroup.Controls.Add(this.label2);
+			this.scalegroup.Controls.Add(this.minScaleX);
+			this.scalegroup.Location = new System.Drawing.Point(12, 265);
+			this.scalegroup.Name = "scalegroup";
+			this.scalegroup.Size = new System.Drawing.Size(279, 127);
+			this.scalegroup.TabIndex = 19;
+			this.scalegroup.TabStop = false;
+			this.scalegroup.Text = " Scale: ";
+			// 
+			// cbNegativeScaleY
+			// 
+			this.cbNegativeScaleY.AutoSize = true;
+			this.cbNegativeScaleY.Location = new System.Drawing.Point(150, 102);
+			this.cbNegativeScaleY.Name = "cbNegativeScaleY";
+			this.cbNegativeScaleY.Size = new System.Drawing.Size(121, 17);
+			this.cbNegativeScaleY.TabIndex = 25;
+			this.cbNegativeScaleY.Text = "Use negative height";
+			this.toolTip.SetToolTip(this.cbNegativeScaleY, "When checked, height scale will be picked from\r\n[-max .. -min] - [min .. max] ran" +
+					"ge");
+			this.cbNegativeScaleY.UseVisualStyleBackColor = true;
+			// 
+			// cbNegativeScaleX
+			// 
+			this.cbNegativeScaleX.AutoSize = true;
+			this.cbNegativeScaleX.Location = new System.Drawing.Point(150, 78);
+			this.cbNegativeScaleX.Name = "cbNegativeScaleX";
+			this.cbNegativeScaleX.Size = new System.Drawing.Size(117, 17);
+			this.cbNegativeScaleX.TabIndex = 24;
+			this.cbNegativeScaleX.Text = "Use negative width";
+			this.toolTip.SetToolTip(this.cbNegativeScaleX, "When checked, width scale will be picked from\r\n[-max .. -min] - [min .. max] rang" +
+					"e");
+			this.cbNegativeScaleX.UseVisualStyleBackColor = true;
+			// 
+			// cbUniformScale
+			// 
+			this.cbUniformScale.AutoSize = true;
+			this.cbUniformScale.Location = new System.Drawing.Point(9, 102);
+			this.cbUniformScale.Name = "cbUniformScale";
+			this.cbUniformScale.Size = new System.Drawing.Size(134, 17);
+			this.cbUniformScale.TabIndex = 23;
+			this.cbUniformScale.Text = "Same width and height";
+			this.cbUniformScale.UseVisualStyleBackColor = true;
+			// 
+			// cbRelativeScale
+			// 
+			this.cbRelativeScale.AutoSize = true;
+			this.cbRelativeScale.Location = new System.Drawing.Point(9, 78);
+			this.cbRelativeScale.Name = "cbRelativeScale";
+			this.cbRelativeScale.Size = new System.Drawing.Size(131, 17);
+			this.cbRelativeScale.TabIndex = 13;
+			this.cbRelativeScale.Text = "Relative to initial scale";
+			this.cbRelativeScale.UseVisualStyleBackColor = true;
+			// 
+			// bUpdateScaleY
+			// 
+			this.bUpdateScaleY.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.bUpdateScaleY.Image = global::CodeImp.DoomBuilder.BuilderEffects.Properties.Resources.Update;
+			this.bUpdateScaleY.Location = new System.Drawing.Point(247, 45);
+			this.bUpdateScaleY.Name = "bUpdateScaleY";
+			this.bUpdateScaleY.Size = new System.Drawing.Size(23, 23);
+			this.bUpdateScaleY.TabIndex = 22;
+			this.bUpdateScaleY.UseVisualStyleBackColor = true;
+			this.bUpdateScaleY.Click += new System.EventHandler(this.bUpdateScaleY_Click);
+			// 
+			// maxScaleYLabel
+			// 
+			this.maxScaleYLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.maxScaleYLabel.AutoSize = true;
+			this.maxScaleYLabel.Location = new System.Drawing.Point(147, 51);
+			this.maxScaleYLabel.Name = "maxScaleYLabel";
+			this.maxScaleYLabel.Size = new System.Drawing.Size(32, 13);
+			this.maxScaleYLabel.TabIndex = 21;
+			this.maxScaleYLabel.Text = "max.:";
+			// 
+			// maxScaleY
+			// 
+			this.maxScaleY.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.maxScaleY.DecimalPlaces = 2;
+			this.maxScaleY.Increment = new decimal(new int[] {
+            1,
+            0,
+            0,
+            65536});
+			this.maxScaleY.Location = new System.Drawing.Point(186, 48);
+			this.maxScaleY.Minimum = new decimal(new int[] {
+            100,
+            0,
+            0,
+            -2147483648});
+			this.maxScaleY.Name = "maxScaleY";
+			this.maxScaleY.Size = new System.Drawing.Size(55, 20);
+			this.maxScaleY.TabIndex = 20;
+			this.maxScaleY.Value = new decimal(new int[] {
+            1,
+            0,
+            0,
+            0});
+			this.maxScaleY.ValueChanged += new System.EventHandler(this.minScaleY_ValueChanged);
+			// 
+			// minScaleYLabel
+			// 
+			this.minScaleYLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.minScaleYLabel.AutoSize = true;
+			this.minScaleYLabel.Location = new System.Drawing.Point(16, 51);
+			this.minScaleYLabel.Name = "minScaleYLabel";
+			this.minScaleYLabel.Size = new System.Drawing.Size(63, 13);
+			this.minScaleYLabel.TabIndex = 19;
+			this.minScaleYLabel.Text = "Height min.:";
+			// 
+			// minScaleY
+			// 
+			this.minScaleY.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.minScaleY.DecimalPlaces = 2;
+			this.minScaleY.Increment = new decimal(new int[] {
+            1,
+            0,
+            0,
+            65536});
+			this.minScaleY.Location = new System.Drawing.Point(84, 48);
+			this.minScaleY.Minimum = new decimal(new int[] {
+            100,
+            0,
+            0,
+            -2147483648});
+			this.minScaleY.Name = "minScaleY";
+			this.minScaleY.Size = new System.Drawing.Size(55, 20);
+			this.minScaleY.TabIndex = 18;
+			this.minScaleY.Value = new decimal(new int[] {
+            1,
+            0,
+            0,
+            0});
+			this.minScaleY.ValueChanged += new System.EventHandler(this.minScaleY_ValueChanged);
+			// 
+			// bUpdateScaleX
+			// 
+			this.bUpdateScaleX.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.bUpdateScaleX.Image = global::CodeImp.DoomBuilder.BuilderEffects.Properties.Resources.Update;
+			this.bUpdateScaleX.Location = new System.Drawing.Point(247, 19);
+			this.bUpdateScaleX.Name = "bUpdateScaleX";
+			this.bUpdateScaleX.Size = new System.Drawing.Size(23, 23);
+			this.bUpdateScaleX.TabIndex = 17;
+			this.bUpdateScaleX.UseVisualStyleBackColor = true;
+			this.bUpdateScaleX.Click += new System.EventHandler(this.bUpdateScaleX_Click);
+			// 
+			// label3
+			// 
+			this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.label3.AutoSize = true;
+			this.label3.Location = new System.Drawing.Point(147, 25);
+			this.label3.Name = "label3";
+			this.label3.Size = new System.Drawing.Size(32, 13);
+			this.label3.TabIndex = 4;
+			this.label3.Text = "max.:";
+			// 
+			// maxScaleX
+			// 
+			this.maxScaleX.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.maxScaleX.DecimalPlaces = 2;
+			this.maxScaleX.Increment = new decimal(new int[] {
+            1,
+            0,
+            0,
+            65536});
+			this.maxScaleX.Location = new System.Drawing.Point(186, 22);
+			this.maxScaleX.Minimum = new decimal(new int[] {
+            100,
+            0,
+            0,
+            -2147483648});
+			this.maxScaleX.Name = "maxScaleX";
+			this.maxScaleX.Size = new System.Drawing.Size(55, 20);
+			this.maxScaleX.TabIndex = 3;
+			this.maxScaleX.Value = new decimal(new int[] {
+            1,
+            0,
+            0,
+            0});
+			this.maxScaleX.ValueChanged += new System.EventHandler(this.minScaleX_ValueChanged);
+			// 
+			// label2
+			// 
+			this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.label2.AutoSize = true;
+			this.label2.Location = new System.Drawing.Point(19, 25);
+			this.label2.Name = "label2";
+			this.label2.Size = new System.Drawing.Size(60, 13);
+			this.label2.TabIndex = 2;
+			this.label2.Text = "Width min.:";
+			// 
+			// minScaleX
+			// 
+			this.minScaleX.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.minScaleX.DecimalPlaces = 2;
+			this.minScaleX.Increment = new decimal(new int[] {
+            1,
+            0,
+            0,
+            65536});
+			this.minScaleX.Location = new System.Drawing.Point(84, 22);
+			this.minScaleX.Minimum = new decimal(new int[] {
+            100,
+            0,
+            0,
+            -2147483648});
+			this.minScaleX.Name = "minScaleX";
+			this.minScaleX.Size = new System.Drawing.Size(55, 20);
+			this.minScaleX.TabIndex = 1;
+			this.minScaleX.Value = new decimal(new int[] {
+            1,
+            0,
+            0,
+            0});
+			this.minScaleX.ValueChanged += new System.EventHandler(this.minScaleX_ValueChanged);
+			// 
+			// JitterThingsForm
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.ClientSize = new System.Drawing.Size(303, 428);
+			this.Controls.Add(this.scalegroup);
+			this.Controls.Add(this.groupBox2);
+			this.Controls.Add(this.groupBox1);
+			this.Controls.Add(this.bCancel);
+			this.Controls.Add(this.bApply);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "JitterThingsForm";
+			this.Opacity = 1;
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
+			this.Text = "Randomize Things!";
+			this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.JitterThingsForm_FormClosing);
+			this.groupBox1.ResumeLayout(false);
+			this.groupBox2.ResumeLayout(false);
+			this.groupBox2.PerformLayout();
+			this.scalegroup.ResumeLayout(false);
+			this.scalegroup.PerformLayout();
+			((System.ComponentModel.ISupportInitialize)(this.maxScaleY)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.minScaleY)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.maxScaleX)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.minScaleX)).EndInit();
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Button bApply;
+		private System.Windows.Forms.Button bCancel;
+		private System.Windows.Forms.Button bUpdateTranslation;
+		private CodeImp.DoomBuilder.BuilderEffects.IntControl positionJitterAmmount;
+		private System.Windows.Forms.Button bUpdateAngle;
+		private CodeImp.DoomBuilder.BuilderEffects.IntControl rotationJitterAmmount;
+		private CodeImp.DoomBuilder.BuilderEffects.IntControl heightJitterAmmount;
+		private System.Windows.Forms.Button bUpdateHeight;
+		private CodeImp.DoomBuilder.BuilderEffects.IntControl pitchAmmount;
+		private CodeImp.DoomBuilder.BuilderEffects.IntControl rollAmmount;
+		private System.Windows.Forms.Button bUpdatePitch;
+		private System.Windows.Forms.Button bUpdateRoll;
+		private System.Windows.Forms.GroupBox groupBox1;
+		private System.Windows.Forms.GroupBox groupBox2;
+		private System.Windows.Forms.GroupBox scalegroup;
+		private System.Windows.Forms.NumericUpDown minScaleX;
+		private System.Windows.Forms.CheckBox cbUniformScale;
+		private System.Windows.Forms.CheckBox cbRelativeScale;
+		private System.Windows.Forms.Button bUpdateScaleY;
+		private System.Windows.Forms.Label maxScaleYLabel;
+		private System.Windows.Forms.NumericUpDown maxScaleY;
+		private System.Windows.Forms.Label minScaleYLabel;
+		private System.Windows.Forms.NumericUpDown minScaleY;
+		private System.Windows.Forms.Button bUpdateScaleX;
+		private System.Windows.Forms.Label label3;
+		private System.Windows.Forms.NumericUpDown maxScaleX;
+		private System.Windows.Forms.Label label2;
+		private System.Windows.Forms.CheckBox cbNegativeScaleX;
+		private System.Windows.Forms.CheckBox cbRelativeRoll;
+		private System.Windows.Forms.CheckBox cbRelativePitch;
+		private System.Windows.Forms.CheckBox cbNegativeScaleY;
+		private System.Windows.Forms.ToolTip toolTip;
+		private System.Windows.Forms.CheckBox cbNegativeRoll;
+		private System.Windows.Forms.CheckBox cbNegativePitch;
+	}
+}
\ No newline at end of file
diff --git a/Source/Plugins/BuilderEffects/Interface/JitterThingsForm.cs b/Source/Plugins/BuilderEffects/Interface/JitterThingsForm.cs
new file mode 100644
index 0000000..cc3c2b8
--- /dev/null
+++ b/Source/Plugins/BuilderEffects/Interface/JitterThingsForm.cs
@@ -0,0 +1,586 @@
+#region Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.VisualModes;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Windows;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderEffects
+{
+	public partial class JitterThingsForm : DelayedForm
+	{
+		#region Variables
+
+		private readonly string editingModeName;
+		private readonly List<Thing> selection;
+		private readonly List<VisualThing> visualSelection;
+		private readonly List<ThingData> thingData;
+		private readonly int MaxSafeDistance;
+		private readonly int MaxSafeHeightDistance;
+
+		private static bool relativePitch;
+		private static bool relativeRoll;
+		private static bool allowNegativePitch;
+		private static bool allowNegativeRoll;
+		private static bool relativeScale;
+		private static bool allowNegativeScaleX;
+		private static bool allowNegativeScaleY;
+		private static bool uniformScale;
+
+		private struct ThingData 
+		{
+			public Vector3D Position;
+			public int Angle;
+			public int Pitch;
+			public int Roll;
+			public float ScaleX;
+			public float ScaleY;
+			public int SectorHeight;
+			public int ZOffset;
+			public int SafeDistance;
+			public int OffsetAngle; //position jitter angle, not Thing angle!
+			public float JitterRotation;
+			public float JitterPitch;
+			public float JitterRoll;
+			public float JitterScaleX;
+			public float JitterScaleY;
+			public float JitterHeight;
+		}
+
+		#endregion
+
+		#region Constructor
+
+		public JitterThingsForm(string editingModeName) 
+		{
+			this.editingModeName = editingModeName;
+			this.HelpRequested += JitterThingsForm_HelpRequested;
+
+			InitializeComponent();
+
+			//have thing height?
+			heightJitterAmmount.Enabled = General.Map.FormatInterface.HasThingHeight;
+			bUpdateHeight.Enabled = General.Map.FormatInterface.HasThingHeight;
+
+			//disable pitch/roll/scale?
+			if(!General.Map.UDMF) 
+			{
+				pitchAmmount.Enabled = false;
+				rollAmmount.Enabled = false;
+				bUpdatePitch.Enabled = false;
+				bUpdateRoll.Enabled = false;
+				scalegroup.Enabled = false;
+				cbRelativePitch.Enabled = false;
+				cbRelativeRoll.Enabled = false;
+				cbNegativePitch.Enabled = false;
+				cbNegativeRoll.Enabled = false;
+			}
+
+			//get selection
+			selection = new List<Thing>();
+
+			if(editingModeName == "BaseVisualMode") 
+			{
+				visualSelection = ((VisualMode)General.Editing.Mode).GetSelectedVisualThings(false);
+				foreach(VisualThing t in visualSelection) selection.Add(t.Thing);
+			} 
+			else 
+			{
+				ICollection<Thing> list = General.Map.Map.GetSelectedThings(true);
+				foreach(Thing t in list) selection.Add(t);
+			}
+
+			//update window header
+			this.Text = "Randomize " + selection.Count + (selection.Count > 1 ? " things" : " thing");
+
+			//store intial properties
+			thingData = new List<ThingData>();
+
+			foreach(Thing t in selection)
+			{
+				ThingData d = new ThingData();
+
+				Thing closest = MapSet.NearestThing(General.Map.Map.Things, t);
+
+				if(closest != null)
+				{
+					d.SafeDistance = (int)Math.Round(Vector2D.Distance(t.Position, closest.Position));
+				}
+				else
+				{
+					d.SafeDistance = 512;
+				}
+
+				if(d.SafeDistance > 0) d.SafeDistance /= 2;
+				if(MaxSafeDistance < d.SafeDistance) MaxSafeDistance = d.SafeDistance;
+				d.Position = t.Position;
+				d.Angle = t.AngleDoom;
+				d.Pitch = t.Pitch;
+				d.Roll = t.Roll;
+				d.ScaleX = t.ScaleX;
+				d.ScaleY = t.ScaleY;
+
+				if(General.Map.FormatInterface.HasThingHeight) 
+				{
+					if(t.Sector == null) t.DetermineSector();
+					if(t.Sector == null) continue;
+
+					d.SectorHeight = Math.Max(0, t.Sector.CeilHeight - (int)t.Height - t.Sector.FloorHeight);
+					if(MaxSafeHeightDistance < d.SectorHeight) MaxSafeHeightDistance = d.SectorHeight;
+					d.ZOffset = (int)t.Position.z;
+				}
+
+				thingData.Add(d);
+			}
+
+			positionJitterAmmount.Maximum = MaxSafeDistance;
+			heightJitterAmmount.Maximum = MaxSafeHeightDistance;
+
+			//create undo
+			General.Map.UndoRedo.ClearAllRedos();
+			General.Map.UndoRedo.CreateUndo("Randomize " + selection.Count + (selection.Count > 1 ? " things" : " thing"));
+
+			//update controls
+			UpdateOffsetAngles();
+			UpdateHeights();
+			UpdateRotationAngles();
+			UpdatePitchAngles();
+			UpdateRollAngles();
+			UpdateScaleX();
+			UpdateScaleY();
+
+			//apply settings
+			cbRelativeScale.Checked = relativeScale;
+			cbUniformScale.Checked = uniformScale;
+			cbNegativeScaleX.Checked = allowNegativeScaleX;
+			cbNegativeScaleY.Checked = allowNegativeScaleY;
+			cbRelativePitch.Checked = relativePitch;
+			cbRelativeRoll.Checked = relativeRoll;
+			cbNegativePitch.Checked = allowNegativePitch;
+			cbNegativeRoll.Checked = allowNegativeRoll;
+			
+
+			//add event listeners
+			cbRelativeScale.CheckedChanged += cbRelativeScale_CheckedChanged;
+			cbUniformScale.CheckedChanged += cbUniformScale_CheckedChanged;
+			cbNegativeScaleX.CheckedChanged += cbNegativeScaleX_CheckedChanged;
+			cbNegativeScaleY.CheckedChanged += cbNegativeScaleY_CheckedChanged;
+			cbRelativePitch.CheckedChanged += cbRelativePitch_CheckedChanged;
+			cbRelativeRoll.CheckedChanged += cbRelativeRoll_CheckedChanged;
+			cbNegativePitch.CheckedChanged += cbNegativePitch_CheckedChanged;
+			cbNegativeRoll.CheckedChanged += cbNegativeRoll_CheckedChanged;
+
+			//disable controls if necessary
+			if(uniformScale) cbUniformScale_CheckedChanged(cbUniformScale, EventArgs.Empty);
+
+			//tricky way to actually store undo information...
+			foreach(Thing t in selection) t.Move(t.Position);
+		}
+
+		#endregion
+
+		#region Apply logic
+
+		private void ApplyTranslation(int ammount) 
+		{
+			for(int i = 0; i < selection.Count; i++) 
+			{
+				int curAmmount = ammount > thingData[i].SafeDistance ? thingData[i].SafeDistance : ammount;
+				selection[i].Move(new Vector2D(thingData[i].Position.x + (int)(Math.Sin(thingData[i].OffsetAngle) * curAmmount), thingData[i].Position.y + (int)(Math.Cos(thingData[i].OffsetAngle) * curAmmount)));
+				selection[i].DetermineSector();
+			}
+
+			UpdateGeometry();
+		}
+
+		private void ApplyRotation(int ammount) 
+		{
+			for(int i = 0; i < selection.Count; i++)
+				selection[i].Rotate((int)((thingData[i].Angle + ammount * thingData[i].JitterRotation) % 360));
+
+			//update view
+			if(editingModeName == "ThingsMode") General.Interface.RedrawDisplay();
+		}
+
+		private void ApplyPitch(int ammount) 
+		{
+			for(int i = 0; i < selection.Count; i++) 
+			{
+				int p;
+				if(cbRelativePitch.Checked) 
+				{
+					p = (int)((thingData[i].Pitch + ammount * thingData[i].JitterPitch) % 360);
+				} 
+				else 
+				{
+					p = (int)((ammount * thingData[i].JitterPitch) % 360);
+				}
+				
+				selection[i].SetPitch(p);
+			}
+
+			//update view
+			if(editingModeName == "ThingsMode") General.Interface.RedrawDisplay();
+		}
+
+		private void ApplyRoll(int ammount) 
+		{
+			for(int i = 0; i < selection.Count; i++) 
+			{
+				int r;
+				if(cbRelativeRoll.Checked) 
+				{
+					r = (int)((thingData[i].Roll + ammount * thingData[i].JitterRoll) % 360);
+				} 
+				else 
+				{
+					r = (int)((ammount * thingData[i].JitterRoll) % 360);
+				}
+
+				selection[i].SetRoll(r);
+			}
+
+			//update view
+			if(editingModeName == "ThingsMode") General.Interface.RedrawDisplay();
+		}
+
+		private void ApplyHeight(int ammount) 
+		{
+			for(int i = 0; i < selection.Count; i++) 
+			{
+				int curAmmount = Math.Min(thingData[i].SectorHeight, Math.Max(0, thingData[i].ZOffset + ammount));
+				selection[i].Move(selection[i].Position.x, selection[i].Position.y, curAmmount * thingData[i].JitterHeight);
+			}
+
+			UpdateGeometry();
+		}
+
+		private void ApplyScale() 
+		{
+			ApplyScale((float)minScaleX.Value, (float)maxScaleX.Value, (float)minScaleY.Value, (float)maxScaleY.Value);
+
+			//update view
+			if(editingModeName == "ThingsMode") General.Interface.RedrawDisplay();
+		}
+
+		private void ApplyScale(float minX, float maxX, float minY, float maxY) 
+		{
+			if(cbUniformScale.Checked)
+			{
+				minY = minX;
+				maxY = maxX;
+			}
+			
+			if(minX > maxX) General.Swap(ref minX, ref maxX);
+			if(minY > maxY) General.Swap(ref minY, ref maxY);
+
+			float diffX = maxX - minX;
+			float diffY = maxY - minY;
+
+			for(int i = 0; i < selection.Count; i++) 
+			{
+				float jitterX = thingData[i].JitterScaleX;
+				float jitterY = (cbUniformScale.Checked ? jitterX : thingData[i].JitterScaleY);
+				float sx, sy;
+
+				if(cbRelativeScale.Checked) 
+				{
+					sx = thingData[i].ScaleX + minX + diffX * jitterX;
+					sy = thingData[i].ScaleY + minY + diffY * jitterY;
+				} 
+				else 
+				{
+					sx = minX + diffX * jitterX;
+					sy = minY + diffY * jitterY;
+				}
+
+				selection[i].SetScale(sx, sy);
+			}
+		}
+
+		#endregion
+
+		#region Update logic
+
+		private void UpdateGeometry() 
+		{
+			// Update what must be updated
+			if(editingModeName == "BaseVisualMode") 
+			{
+				VisualMode vm = ((VisualMode)General.Editing.Mode);
+
+				for(int i = 0; i < selection.Count; i++)
+				{
+					visualSelection[i].SetPosition(new Vector3D(selection[i].Position.x, selection[i].Position.y, selection[i].Sector.FloorHeight + selection[i].Position.z));
+					visualSelection[i].Update();
+
+					if(vm.VisualSectorExists(visualSelection[i].Thing.Sector))
+						vm.GetVisualSector(visualSelection[i].Thing.Sector).UpdateSectorGeometry(true);
+				}
+			} 
+			else 
+			{
+				//update view
+				General.Interface.RedrawDisplay();
+			}
+		}
+
+		private void UpdateOffsetAngles() 
+		{
+			for(int i = 0; i < thingData.Count; i++) 
+			{
+				ThingData td = thingData[i];
+				td.OffsetAngle = General.Random(0, 359);
+				thingData[i] = td;
+			}
+		}
+
+		private void UpdateHeights() 
+		{
+			for(int i = 0; i < thingData.Count; i++) 
+			{
+				ThingData td = thingData[i];
+				td.JitterHeight = (General.Random(0, 100) / 100f);
+				thingData[i] = td;
+			}
+		}
+
+		private void UpdateRotationAngles() 
+		{
+			for(int i = 0; i < thingData.Count; i++) 
+			{
+				ThingData td = thingData[i];
+				td.JitterRotation = (General.Random(-100, 100) / 100f);
+				thingData[i] = td;
+			}
+		}
+
+		private void UpdatePitchAngles() 
+		{
+			int min = (cbNegativePitch.Checked ? -100 : 0);
+			for(int i = 0; i < thingData.Count; i++) 
+			{
+				ThingData td = thingData[i];
+				td.JitterPitch = (General.Random(min, 100) / 100f);
+				thingData[i] = td;
+			}
+		}
+
+		private void UpdateRollAngles() 
+		{
+			int min = (cbNegativeRoll.Checked ? -100 : 0);
+			for(int i = 0; i < thingData.Count; i++) 
+			{
+				ThingData td = thingData[i];
+				td.JitterRoll = (General.Random(min, 100) / 100f);
+				thingData[i] = td;
+			}
+		}
+
+		private void UpdateScaleX() 
+		{
+			int min = (cbNegativeScaleX.Checked ? -100 : 0);
+			for(int i = 0; i < thingData.Count; i++) 
+			{
+				ThingData td = thingData[i];
+				td.JitterScaleX = (General.Random(min, 100) / 100f);
+				thingData[i] = td;
+			}
+		}
+
+		private void UpdateScaleY() 
+		{
+			int min = (cbNegativeScaleY.Checked ? -100 : 0);
+			for(int i = 0; i < thingData.Count; i++) 
+			{
+				ThingData td = thingData[i];
+				td.JitterScaleY = (General.Random(min, 100) / 100f);
+				thingData[i] = td;
+			}
+		}
+
+		#endregion
+
+		#region Events
+
+		private void bApply_Click(object sender, EventArgs e) 
+		{
+			// Store settings
+			relativePitch = cbRelativePitch.Checked;
+			relativeRoll = cbRelativeRoll.Checked;
+			relativeScale = cbRelativeScale.Checked;
+			allowNegativeScaleX = cbNegativeScaleX.Checked;
+			allowNegativeScaleY = cbNegativeScaleY.Checked;
+			uniformScale = cbUniformScale.Checked;
+			allowNegativePitch = cbNegativePitch.Checked;
+			allowNegativeRoll = cbNegativeRoll.Checked;
+
+			// Update
+			foreach(Thing t in selection) t.DetermineSector();
+
+			// Clear selection
+			General.Actions.InvokeAction("builder_clearselection");
+
+			this.DialogResult = DialogResult.OK;
+			Close();
+		}
+
+		private void bCancel_Click(object sender, EventArgs e) 
+		{
+			this.DialogResult = DialogResult.Cancel;
+			Close();
+		}
+
+		private void JitterThingsForm_FormClosing(object sender, FormClosingEventArgs e) 
+		{
+			if(this.DialogResult == DialogResult.Cancel)
+				General.Map.UndoRedo.WithdrawUndo(); //undo changes
+		}
+
+		private void positionJitterAmmount_OnValueChanged(object sender, EventArgs e) 
+		{
+			ApplyTranslation(positionJitterAmmount.Value);
+		}
+
+		private void rotationJitterAmmount_OnValueChanged(object sender, EventArgs e) 
+		{
+			ApplyRotation(rotationJitterAmmount.Value);
+		}
+
+		private void heightJitterAmmount_OnValueChanging(object sender, EventArgs e) 
+		{
+			ApplyHeight(heightJitterAmmount.Value);
+		}
+
+		private void pitchAmmount_OnValueChanging(object sender, EventArgs e) 
+		{
+			ApplyPitch(pitchAmmount.Value);
+		}
+
+		private void rollAmmount_OnValueChanging(object sender, EventArgs e) 
+		{
+			ApplyRoll(rollAmmount.Value);
+		}
+
+		private void minScaleX_ValueChanged(object sender, EventArgs e) 
+		{
+			ApplyScale();
+		}
+
+		private void minScaleY_ValueChanged(object sender, EventArgs e) 
+		{
+			ApplyScale();
+		}
+
+		#endregion
+
+		#region Buttons & checkboxes events
+
+		private void bUpdateTranslation_Click(object sender, EventArgs e) 
+		{
+			UpdateOffsetAngles();
+			ApplyTranslation(positionJitterAmmount.Value);
+		}
+
+		private void bUpdateHeight_Click(object sender, EventArgs e) 
+		{
+			UpdateHeights();
+			ApplyHeight(heightJitterAmmount.Value);
+		}
+
+		private void bUpdateAngle_Click(object sender, EventArgs e) 
+		{
+			UpdateRotationAngles();
+			ApplyRotation(rotationJitterAmmount.Value);
+		}
+
+		private void bUpdatePitch_Click(object sender, EventArgs e) 
+		{
+			UpdatePitchAngles();
+			ApplyPitch(pitchAmmount.Value);
+		}
+
+		private void bUpdateRoll_Click(object sender, EventArgs e) 
+		{
+			UpdateRollAngles();
+			ApplyRoll(rollAmmount.Value);
+		}
+
+		private void bUpdateScaleX_Click(object sender, EventArgs e) 
+		{
+			UpdateScaleX();
+			ApplyScale();
+		}
+
+		private void bUpdateScaleY_Click(object sender, EventArgs e) 
+		{
+			UpdateScaleY();
+			ApplyScale();
+		}
+
+		private void cbRelativePitch_CheckedChanged(object sender, EventArgs e) 
+		{
+			UpdatePitchAngles();
+			ApplyPitch(pitchAmmount.Value);
+		}
+
+		private void cbRelativeRoll_CheckedChanged(object sender, EventArgs e) 
+		{
+			UpdateRollAngles();
+			ApplyRoll(rollAmmount.Value);
+		}
+
+		private void cbNegativePitch_CheckedChanged(object sender, EventArgs e) 
+		{
+			UpdatePitchAngles();
+			ApplyPitch(pitchAmmount.Value);
+		}
+
+		private void cbNegativeRoll_CheckedChanged(object sender, EventArgs e) 
+		{
+			UpdateRollAngles();
+			ApplyRoll(rollAmmount.Value);
+		}
+
+		private void cbRelativeScale_CheckedChanged(object sender, EventArgs e) 
+		{
+			ApplyScale();
+		}
+
+		private void cbUniformScale_CheckedChanged(object sender, EventArgs e) 
+		{
+			bUpdateScaleY.Enabled = !cbUniformScale.Checked;
+			minScaleY.Enabled = !cbUniformScale.Checked;
+			maxScaleY.Enabled = !cbUniformScale.Checked;
+			minScaleYLabel.Enabled = !cbUniformScale.Checked;
+			maxScaleYLabel.Enabled = !cbUniformScale.Checked;
+			ApplyScale();
+		}
+
+		private void cbNegativeScaleX_CheckedChanged(object sender, EventArgs e) 
+		{
+			UpdateScaleX();
+			ApplyScale();
+		}
+
+		private void cbNegativeScaleY_CheckedChanged(object sender, EventArgs e) 
+		{
+			UpdateScaleY();
+			ApplyScale();
+		}
+
+		#endregion
+
+		//HALP!
+		private void JitterThingsForm_HelpRequested(object sender, HelpEventArgs hlpevent) 
+		{
+			General.ShowHelp("gzdb/features/all_modes/jitter.html");
+			hlpevent.Handled = true;
+		}
+	}
+}
diff --git a/Source/Plugins/BuilderEffects/Interface/JitterThingsForm.resx b/Source/Plugins/BuilderEffects/Interface/JitterThingsForm.resx
new file mode 100644
index 0000000..5deed0a
--- /dev/null
+++ b/Source/Plugins/BuilderEffects/Interface/JitterThingsForm.resx
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/BuilderEffects/Interface/JitterVerticesForm.Designer.cs b/Source/Plugins/BuilderEffects/Interface/JitterVerticesForm.Designer.cs
new file mode 100644
index 0000000..38011fc
--- /dev/null
+++ b/Source/Plugins/BuilderEffects/Interface/JitterVerticesForm.Designer.cs
@@ -0,0 +1,115 @@
+namespace CodeImp.DoomBuilder.BuilderEffects
+{
+	partial class JitterVerticesForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing) {
+			if(disposing && (components != null)) {
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent() {
+			this.bCancel = new System.Windows.Forms.Button();
+			this.bApply = new System.Windows.Forms.Button();
+			this.bUpdateTranslation = new System.Windows.Forms.Button();
+			this.positionJitterAmmount = new IntControl();
+			this.SuspendLayout();
+			// 
+			// bCancel
+			// 
+			this.bCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.bCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.bCancel.Location = new System.Drawing.Point(222, 45);
+			this.bCancel.Name = "bCancel";
+			this.bCancel.Size = new System.Drawing.Size(75, 23);
+			this.bCancel.TabIndex = 7;
+			this.bCancel.Text = "Cancel";
+			this.bCancel.UseVisualStyleBackColor = true;
+			this.bCancel.Click += new System.EventHandler(this.bCancel_Click);
+			// 
+			// bApply
+			// 
+			this.bApply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.bApply.Location = new System.Drawing.Point(121, 45);
+			this.bApply.Name = "bApply";
+			this.bApply.Size = new System.Drawing.Size(95, 23);
+			this.bApply.TabIndex = 6;
+			this.bApply.Text = "Apply";
+			this.bApply.UseVisualStyleBackColor = true;
+			this.bApply.Click += new System.EventHandler(this.bApply_Click);
+			// 
+			// bUpdateTranslation
+			// 
+			this.bUpdateTranslation.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.bUpdateTranslation.Image = global::CodeImp.DoomBuilder.BuilderEffects.Properties.Resources.Update;
+			this.bUpdateTranslation.Location = new System.Drawing.Point(274, 11);
+			this.bUpdateTranslation.Name = "bUpdateTranslation";
+			this.bUpdateTranslation.Size = new System.Drawing.Size(23, 23);
+			this.bUpdateTranslation.TabIndex = 8;
+			this.bUpdateTranslation.UseVisualStyleBackColor = true;
+			this.bUpdateTranslation.Click += new System.EventHandler(this.bUpdateTranslation_Click);
+			// 
+			// positionJitterAmmount
+			// 
+			this.positionJitterAmmount.AllowNegative = false;
+			this.positionJitterAmmount.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.positionJitterAmmount.ExtendedLimits = true;
+			this.positionJitterAmmount.Label = "Position:";
+			this.positionJitterAmmount.Location = new System.Drawing.Point(2, 12);
+			this.positionJitterAmmount.Maximum = 100;
+			this.positionJitterAmmount.Minimum = 0;
+			this.positionJitterAmmount.Name = "positionJitterAmmount";
+			this.positionJitterAmmount.Size = new System.Drawing.Size(266, 22);
+			this.positionJitterAmmount.TabIndex = 9;
+			this.positionJitterAmmount.Value = 0;
+			this.positionJitterAmmount.OnValueChanging += new System.EventHandler(this.positionJitterAmmount_OnValueChanging);
+			// 
+			// JitterVerticesForm
+			// 
+			this.AcceptButton = this.bApply;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.CancelButton = this.bCancel;
+			this.ClientSize = new System.Drawing.Size(306, 72);
+			this.Controls.Add(this.positionJitterAmmount);
+			this.Controls.Add(this.bUpdateTranslation);
+			this.Controls.Add(this.bCancel);
+			this.Controls.Add(this.bApply);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "JitterVerticesForm";
+			this.Opacity = 1;
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
+			this.Text = "Jitter Settings";
+			this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.JitterVerticesForm_FormClosing);
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Button bUpdateTranslation;
+		private System.Windows.Forms.Button bCancel;
+		private System.Windows.Forms.Button bApply;
+		private IntControl positionJitterAmmount;
+	}
+}
\ No newline at end of file
diff --git a/Source/Plugins/BuilderEffects/Interface/JitterVerticesForm.cs b/Source/Plugins/BuilderEffects/Interface/JitterVerticesForm.cs
new file mode 100644
index 0000000..94b845b
--- /dev/null
+++ b/Source/Plugins/BuilderEffects/Interface/JitterVerticesForm.cs
@@ -0,0 +1,287 @@
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.VisualModes;
+using CodeImp.DoomBuilder.Windows;
+using CodeImp.DoomBuilder.Geometry;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderEffects
+{
+	public partial class JitterVerticesForm : DelayedForm
+	{
+		#region ================== Variables
+
+		private readonly string editingModeName;
+		private readonly List<Vertex> selection;
+		private readonly List<VisualSector> visualSectors;
+		private readonly List<VisualVertexPair> visualVerts;
+		private readonly VertexData[] vertexData;
+		private readonly int MaxSafeDistance;
+
+		#endregion
+
+		#region ================== Structs
+
+		private struct VertexData
+		{
+			public Vector2D Position;
+			public int SafeDistance;
+			public float JitterAngle;
+		}
+
+		#endregion
+
+		#region ================== Constructor / Setup
+
+		public JitterVerticesForm(string editingModeName) 
+		{
+			this.editingModeName = editingModeName;
+			this.HelpRequested += JitterVerticesForm_HelpRequested;
+
+			InitializeComponent();
+
+			//get selection
+			selection = new List<Vertex>();
+
+			if(editingModeName == "BaseVisualMode") 
+			{
+				VisualMode vm = (VisualMode)General.Editing.Mode;
+				List<VisualGeometry> visualSelection = vm.GetSelectedSurfaces();
+				visualSectors = new List<VisualSector>();
+				int linesCount = 0;
+
+				foreach(VisualGeometry vg in visualSelection) 
+				{
+					if(vg.Sidedef != null && vm.VisualSectorExists(vg.Sidedef.Sector)) 
+					{
+						if(!selection.Contains(vg.Sidedef.Line.Start))
+							selection.Add(vg.Sidedef.Line.Start);
+						if(!selection.Contains(vg.Sidedef.Line.End))
+							selection.Add(vg.Sidedef.Line.End);
+						linesCount++;
+
+						visualSectors.Add(vm.GetVisualSector(vg.Sidedef.Sector));
+
+						if(vg.Sidedef.Other != null && vg.Sidedef.Other.Sector != null && vm.VisualSectorExists(vg.Sidedef.Other.Sector))
+							visualSectors.Add(vm.GetVisualSector(vg.Sidedef.Other.Sector));
+					}
+				}
+
+				visualVerts = new List<VisualVertexPair>();
+				foreach(Vertex vert in selection) 
+				{
+					if(vm.VisualVertices.ContainsKey(vert)) visualVerts.Add(vm.VisualVertices[vert]);
+				}
+
+				//update window header
+				this.Text = "Randomize " + linesCount + (linesCount > 1 ? " linedefs" : " linedef");
+
+			} 
+			else if(editingModeName == "LinedefsMode") 
+			{
+				ICollection<Linedef> list = General.Map.Map.GetSelectedLinedefs(true);
+				int linesCount = 0;
+
+				foreach(Linedef l in list) 
+				{
+					if(!selection.Contains(l.Start)) selection.Add(l.Start);
+					if(!selection.Contains(l.End)) selection.Add(l.End);
+					linesCount++;
+				}
+
+				//update window header
+				this.Text = "Randomize " + linesCount + (linesCount > 1 ? " linedefs" : " linedef");
+			} 
+			else 
+			{ 
+				ICollection<Vertex> list = General.Map.Map.GetSelectedVertices(true);
+				foreach(Vertex v in list) selection.Add(v);
+
+				//update window header
+				this.Text = "Randomize " + selection.Count + (selection.Count > 1 ? " vertices" : " vertex");
+			}
+
+			if(selection.Count == 0) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "Unable to get vertices from selection!");
+				return;
+			}
+
+			//create undo
+			General.Map.UndoRedo.ClearAllRedos();
+			General.Map.UndoRedo.CreateUndo("Randomize " + selection.Count + (selection.Count > 1 ? " vertices" : " vertex"));
+
+			Dictionary<Vertex, VertexData> data = new Dictionary<Vertex, VertexData>();
+
+			foreach(Vertex v in selection) 
+			{
+				VertexData vd = new VertexData {Position = v.Position};
+				data.Add(v, vd);
+			}
+
+			foreach(Vertex v in selection)
+			{
+				if(v.Linedefs == null) continue;
+
+				//get nearest linedef
+				Linedef closestLine = null;
+				float distance = float.MaxValue;
+
+				// Go for all linedefs in selection
+				foreach(Linedef l in General.Map.Map.Linedefs) 
+				{
+					if(v.Linedefs.Contains(l)) continue;
+
+					// Calculate distance and check if closer than previous find
+					float d = l.SafeDistanceToSq(v.Position, true);
+					if(d < distance) 
+					{
+						// This one is closer
+						closestLine = l;
+						distance = d;
+					}
+				}
+
+				if(closestLine == null) continue;
+
+				float closestLineDistance = Vector2D.Distance(v.Position, closestLine.NearestOnLine(v.Position));
+
+				//check SafeDistance of closest line
+				if(data.ContainsKey(closestLine.Start) 
+					&& data[closestLine.Start].SafeDistance > closestLineDistance) 
+				{
+					VertexData vd = data[closestLine.Start];
+					vd.SafeDistance = (int)Math.Floor(closestLineDistance);
+					data[closestLine.Start] = vd;
+				}
+				if(data.ContainsKey(closestLine.End) 
+					&& data[closestLine.End].SafeDistance > closestLineDistance) 
+				{
+					VertexData vd = data[closestLine.End];
+					vd.SafeDistance = (int)Math.Floor(closestLineDistance);
+					data[closestLine.End] = vd;
+				}
+
+				//save SafeDistance
+				int dist = (int)Math.Floor(closestLineDistance);
+				if(data[v].SafeDistance == 0 || data[v].SafeDistance > dist) 
+				{
+					VertexData vd = data[v];
+					vd.SafeDistance = dist;
+					data[v] = vd;
+				}
+			}
+
+			//store properties
+			vertexData = new VertexData[data.Values.Count];
+			data.Values.CopyTo(vertexData, 0);
+
+			for(int i = 0; i < vertexData.Length; i++) 
+			{
+				if(vertexData[i].SafeDistance > 0) 
+					vertexData[i].SafeDistance /= 2;
+				if(MaxSafeDistance < vertexData[i].SafeDistance) 
+					MaxSafeDistance = vertexData[i].SafeDistance;
+			}
+
+			positionJitterAmmount.Maximum = MaxSafeDistance;
+
+			UpdateAngles();
+		}
+
+		#endregion
+
+		#region ================== Utility
+
+		private void ApplyTranslationJitter(int ammount) 
+		{
+			for(int i = 0; i < selection.Count; i++)
+			{
+				int curAmmount = ammount > vertexData[i].SafeDistance ? vertexData[i].SafeDistance : ammount;
+				selection[i].Move(new Vector2D(vertexData[i].Position.x + (int)(Math.Sin(vertexData[i].JitterAngle) * curAmmount), vertexData[i].Position.y + (int)(Math.Cos(vertexData[i].JitterAngle) * curAmmount)));
+			}
+
+			//update view
+			if(editingModeName == "BaseVisualMode") 
+			{
+				General.Map.Map.Update();
+				General.Map.IsChanged = true;
+
+				foreach(VisualSector vs in visualSectors) vs.UpdateSectorGeometry(true);
+				foreach(VisualSector vs in visualSectors) vs.UpdateSectorData();
+				foreach(VisualVertexPair pair in visualVerts)
+				{
+					pair.Changed = true;
+					pair.Update();
+				}
+			} 
+			else 
+			{
+				General.Interface.RedrawDisplay();
+			}
+		}
+
+		private void UpdateAngles() 
+		{
+			for(int i = 0; i < vertexData.Length; i++) 
+			{
+				VertexData vd = vertexData[i];
+				vd.JitterAngle = (float)(General.Random(0, 359) * Math.PI / 180f);
+				vertexData[i] = vd;
+			}
+		}
+
+#endregion
+
+		#region ================== Events
+
+		private void bApply_Click(object sender, EventArgs e) 
+		{
+			// Update cached values
+			General.Map.Map.Update();
+			General.Map.IsChanged = true;
+
+			// Clear selection
+			General.Actions.InvokeAction("builder_clearselection");
+
+			this.DialogResult = DialogResult.OK;
+			Close();
+		}
+
+		private void bCancel_Click(object sender, EventArgs e) 
+		{
+			this.DialogResult = DialogResult.Cancel;
+			Close();
+		}
+
+		private void JitterVerticesForm_FormClosing(object sender, FormClosingEventArgs e) 
+		{
+			if(this.DialogResult == DialogResult.Cancel)
+				General.Map.UndoRedo.WithdrawUndo(); //undo changes
+		}
+
+		private void positionJitterAmmount_OnValueChanging(object sender, EventArgs e) 
+		{
+			ApplyTranslationJitter(positionJitterAmmount.Value);
+		}
+
+		private void bUpdateTranslation_Click(object sender, EventArgs e) 
+		{
+			UpdateAngles();
+			ApplyTranslationJitter(positionJitterAmmount.Value);
+		}
+
+		private void JitterVerticesForm_HelpRequested(object sender, HelpEventArgs hlpevent) 
+		{
+			General.ShowHelp("gzdb/features/all_modes/jitter.html");
+			hlpevent.Handled = true;
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderEffects/Interface/JitterVerticesForm.resx b/Source/Plugins/BuilderEffects/Interface/JitterVerticesForm.resx
new file mode 100644
index 0000000..19dc0dd
--- /dev/null
+++ b/Source/Plugins/BuilderEffects/Interface/JitterVerticesForm.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/BuilderEffects/Interface/MenusForm.Designer.cs b/Source/Plugins/BuilderEffects/Interface/MenusForm.Designer.cs
new file mode 100644
index 0000000..7946d50
--- /dev/null
+++ b/Source/Plugins/BuilderEffects/Interface/MenusForm.Designer.cs
@@ -0,0 +1,134 @@
+namespace CodeImp.DoomBuilder.BuilderEffects
+{
+	partial class MenusForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing) {
+			if(disposing && (components != null)) {
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent() {
+			this.menuStrip = new System.Windows.Forms.MenuStrip();
+			this.importStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripMenuItem();
+			this.jitterItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStrip = new System.Windows.Forms.ToolStrip();
+			this.jitterButton = new System.Windows.Forms.ToolStripButton();
+			this.menuStrip.SuspendLayout();
+			this.toolStrip.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// menuStrip
+			// 
+			this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.importStripMenuItem,
+            this.toolStripMenuItem3});
+			this.menuStrip.Location = new System.Drawing.Point(0, 0);
+			this.menuStrip.Name = "menuStrip";
+			this.menuStrip.Size = new System.Drawing.Size(452, 24);
+			this.menuStrip.TabIndex = 0;
+			this.menuStrip.Text = "menuStrip1";
+			// 
+			// importStripMenuItem
+			// 
+			this.importStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.toolStripMenuItem1});
+			this.importStripMenuItem.Name = "importStripMenuItem";
+			this.importStripMenuItem.Size = new System.Drawing.Size(55, 20);
+			this.importStripMenuItem.Text = "Import";
+			// 
+			// toolStripMenuItem1
+			// 
+			this.toolStripMenuItem1.Image = global::CodeImp.DoomBuilder.BuilderEffects.Properties.Resources.Terrain;
+			this.toolStripMenuItem1.Name = "toolStripMenuItem1";
+			this.toolStripMenuItem1.Size = new System.Drawing.Size(215, 22);
+			this.toolStripMenuItem1.Tag = "importobjasterrain";
+			this.toolStripMenuItem1.Text = "Wavefront .obj as Terrain...";
+			this.toolStripMenuItem1.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// toolStripMenuItem3
+			// 
+			this.toolStripMenuItem3.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.jitterItem});
+			this.toolStripMenuItem3.Name = "toolStripMenuItem3";
+			this.toolStripMenuItem3.Size = new System.Drawing.Size(55, 20);
+			this.toolStripMenuItem3.Text = "Modes";
+			// 
+			// jitterItem
+			// 
+			this.jitterItem.Image = global::CodeImp.DoomBuilder.BuilderEffects.Properties.Resources.Jitter;
+			this.jitterItem.Name = "jitterItem";
+			this.jitterItem.Size = new System.Drawing.Size(133, 22);
+			this.jitterItem.Tag = "applyjitter";
+			this.jitterItem.Text = "Randomize";
+			this.jitterItem.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// toolStrip
+			// 
+			this.toolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.jitterButton});
+			this.toolStrip.Location = new System.Drawing.Point(0, 24);
+			this.toolStrip.Name = "toolStrip";
+			this.toolStrip.Size = new System.Drawing.Size(452, 25);
+			this.toolStrip.TabIndex = 1;
+			this.toolStrip.Text = "toolStrip1";
+			// 
+			// jitterButton
+			// 
+			this.jitterButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.jitterButton.Image = global::CodeImp.DoomBuilder.BuilderEffects.Properties.Resources.Jitter;
+			this.jitterButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.jitterButton.Name = "jitterButton";
+			this.jitterButton.Size = new System.Drawing.Size(23, 22);
+			this.jitterButton.Tag = "applyjitter";
+			this.jitterButton.Text = "Randomize";
+			this.jitterButton.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// MenusForm
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.ClientSize = new System.Drawing.Size(452, 129);
+			this.Controls.Add(this.toolStrip);
+			this.Controls.Add(this.menuStrip);
+			this.MainMenuStrip = this.menuStrip;
+			this.Name = "MenusForm";
+			this.Text = "MenusForm";
+			this.menuStrip.ResumeLayout(false);
+			this.menuStrip.PerformLayout();
+			this.toolStrip.ResumeLayout(false);
+			this.toolStrip.PerformLayout();
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.MenuStrip menuStrip;
+		private System.Windows.Forms.ToolStripMenuItem importStripMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem1;
+		private System.Windows.Forms.ToolStrip toolStrip;
+		private System.Windows.Forms.ToolStripButton jitterButton;
+		private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem3;
+		private System.Windows.Forms.ToolStripMenuItem jitterItem;
+	}
+}
\ No newline at end of file
diff --git a/Source/Plugins/BuilderEffects/Interface/MenusForm.cs b/Source/Plugins/BuilderEffects/Interface/MenusForm.cs
new file mode 100644
index 0000000..9f5c75a
--- /dev/null
+++ b/Source/Plugins/BuilderEffects/Interface/MenusForm.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Windows;
+
+namespace CodeImp.DoomBuilder.BuilderEffects
+{
+	public partial class MenusForm : Form
+	{
+		public MenusForm() 
+		{
+			InitializeComponent();
+		}
+
+		// This invokes an action from control event
+		private void InvokeTaggedAction(object sender, EventArgs e) 
+		{
+			General.Interface.InvokeTaggedAction(sender, e);
+		}
+
+		// This registers with the core
+		public void Register() 
+		{
+			// Add the menus to the core
+			General.Interface.AddModesMenu(jitterItem, "002_modify");
+			General.Interface.AddModesButton(jitterButton, "002_modify");
+
+			for(int i = 0; i < importStripMenuItem.DropDownItems.Count; i++)
+				General.Interface.AddMenu(importStripMenuItem.DropDownItems[i] as ToolStripMenuItem, MenuSection.FileImport);
+		}
+
+		// This unregisters from the core
+		public void Unregister() 
+		{
+			// Remove the menus from the core
+			General.Interface.RemoveMenu(jitterItem);
+			General.Interface.RemoveButton(jitterButton);
+
+			for(int i = 0; i < importStripMenuItem.DropDownItems.Count; i++)
+				General.Interface.RemoveMenu(importStripMenuItem.DropDownItems[i] as ToolStripMenuItem);
+		}
+	}
+}
diff --git a/Source/Plugins/BuilderEffects/Interface/MenusForm.resx b/Source/Plugins/BuilderEffects/Interface/MenusForm.resx
new file mode 100644
index 0000000..eef2f01
--- /dev/null
+++ b/Source/Plugins/BuilderEffects/Interface/MenusForm.resx
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="toolStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>125, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/BuilderEffects/Interface/ObjImportSettingsForm.Designer.cs b/Source/Plugins/BuilderEffects/Interface/ObjImportSettingsForm.Designer.cs
new file mode 100644
index 0000000..14997c1
--- /dev/null
+++ b/Source/Plugins/BuilderEffects/Interface/ObjImportSettingsForm.Designer.cs
@@ -0,0 +1,246 @@
+namespace CodeImp.DoomBuilder.BuilderEffects
+{
+	partial class ObjImportSettingsForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing) {
+			if(disposing && (components != null)) {
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent() {
+			this.label2 = new System.Windows.Forms.Label();
+			this.nudScale = new System.Windows.Forms.NumericUpDown();
+			this.cancel = new System.Windows.Forms.Button();
+			this.import = new System.Windows.Forms.Button();
+			this.label1 = new System.Windows.Forms.Label();
+			this.tbImportPath = new System.Windows.Forms.TextBox();
+			this.label3 = new System.Windows.Forms.Label();
+			this.axisx = new System.Windows.Forms.RadioButton();
+			this.axisy = new System.Windows.Forms.RadioButton();
+			this.axisz = new System.Windows.Forms.RadioButton();
+			this.panel1 = new System.Windows.Forms.Panel();
+			this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
+			this.cbusevertexheight = new System.Windows.Forms.CheckBox();
+			this.browse = new System.Windows.Forms.Button();
+			((System.ComponentModel.ISupportInitialize)(this.nudScale)).BeginInit();
+			this.panel1.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// label2
+			// 
+			this.label2.AutoSize = true;
+			this.label2.Location = new System.Drawing.Point(12, 40);
+			this.label2.Name = "label2";
+			this.label2.Size = new System.Drawing.Size(37, 13);
+			this.label2.TabIndex = 16;
+			this.label2.Text = "Scale:";
+			// 
+			// nudScale
+			// 
+			this.nudScale.DecimalPlaces = 4;
+			this.nudScale.Location = new System.Drawing.Point(55, 38);
+			this.nudScale.Maximum = new decimal(new int[] {
+            2048,
+            0,
+            0,
+            0});
+			this.nudScale.Minimum = new decimal(new int[] {
+            2048,
+            0,
+            0,
+            -2147483648});
+			this.nudScale.Name = "nudScale";
+			this.nudScale.Size = new System.Drawing.Size(94, 20);
+			this.nudScale.TabIndex = 15;
+			this.nudScale.Value = new decimal(new int[] {
+            1,
+            0,
+            0,
+            0});
+			// 
+			// cancel
+			// 
+			this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.cancel.Location = new System.Drawing.Point(307, 82);
+			this.cancel.Name = "cancel";
+			this.cancel.Size = new System.Drawing.Size(75, 23);
+			this.cancel.TabIndex = 14;
+			this.cancel.Text = "Cancel";
+			this.cancel.UseVisualStyleBackColor = true;
+			this.cancel.Click += new System.EventHandler(this.cancel_Click);
+			// 
+			// import
+			// 
+			this.import.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.import.Location = new System.Drawing.Point(226, 82);
+			this.import.Name = "import";
+			this.import.Size = new System.Drawing.Size(75, 23);
+			this.import.TabIndex = 13;
+			this.import.Text = "Import";
+			this.import.UseVisualStyleBackColor = true;
+			this.import.Click += new System.EventHandler(this.import_Click);
+			// 
+			// label1
+			// 
+			this.label1.AutoSize = true;
+			this.label1.Location = new System.Drawing.Point(18, 14);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(32, 13);
+			this.label1.TabIndex = 12;
+			this.label1.Text = "Path:";
+			// 
+			// tbImportPath
+			// 
+			this.tbImportPath.Location = new System.Drawing.Point(55, 12);
+			this.tbImportPath.Name = "tbImportPath";
+			this.tbImportPath.Size = new System.Drawing.Size(299, 20);
+			this.tbImportPath.TabIndex = 10;
+			// 
+			// label3
+			// 
+			this.label3.AutoSize = true;
+			this.label3.Location = new System.Drawing.Point(183, 40);
+			this.label3.Name = "label3";
+			this.label3.Size = new System.Drawing.Size(45, 13);
+			this.label3.TabIndex = 17;
+			this.label3.Text = "Up axis:";
+			// 
+			// axisx
+			// 
+			this.axisx.AutoSize = true;
+			this.axisx.Location = new System.Drawing.Point(3, 3);
+			this.axisx.Name = "axisx";
+			this.axisx.Size = new System.Drawing.Size(32, 17);
+			this.axisx.TabIndex = 18;
+			this.axisx.TabStop = true;
+			this.axisx.Text = "X";
+			this.axisx.UseVisualStyleBackColor = true;
+			// 
+			// axisy
+			// 
+			this.axisy.AutoSize = true;
+			this.axisy.Location = new System.Drawing.Point(41, 3);
+			this.axisy.Name = "axisy";
+			this.axisy.Size = new System.Drawing.Size(32, 17);
+			this.axisy.TabIndex = 19;
+			this.axisy.TabStop = true;
+			this.axisy.Text = "Y";
+			this.axisy.UseVisualStyleBackColor = true;
+			// 
+			// axisz
+			// 
+			this.axisz.AutoSize = true;
+			this.axisz.Location = new System.Drawing.Point(79, 3);
+			this.axisz.Name = "axisz";
+			this.axisz.Size = new System.Drawing.Size(32, 17);
+			this.axisz.TabIndex = 20;
+			this.axisz.TabStop = true;
+			this.axisz.Text = "Z";
+			this.axisz.UseVisualStyleBackColor = true;
+			// 
+			// panel1
+			// 
+			this.panel1.Controls.Add(this.axisx);
+			this.panel1.Controls.Add(this.axisz);
+			this.panel1.Controls.Add(this.axisy);
+			this.panel1.Location = new System.Drawing.Point(234, 36);
+			this.panel1.Name = "panel1";
+			this.panel1.Size = new System.Drawing.Size(133, 24);
+			this.panel1.TabIndex = 21;
+			// 
+			// openFileDialog
+			// 
+			this.openFileDialog.DefaultExt = "obj";
+			this.openFileDialog.FileName = "openFileDialog1";
+			this.openFileDialog.Filter = "Wavefront obj files|*.obj";
+			this.openFileDialog.Title = "Choose .obj file to import:";
+			// 
+			// cbusevertexheight
+			// 
+			this.cbusevertexheight.AutoSize = true;
+			this.cbusevertexheight.Location = new System.Drawing.Point(55, 64);
+			this.cbusevertexheight.Name = "cbusevertexheight";
+			this.cbusevertexheight.Size = new System.Drawing.Size(95, 17);
+			this.cbusevertexheight.TabIndex = 22;
+			this.cbusevertexheight.Text = "Sloped Terrian";
+			this.cbusevertexheight.UseVisualStyleBackColor = true;
+			// 
+			// browse
+			// 
+			this.browse.Image = global::CodeImp.DoomBuilder.BuilderEffects.Properties.Resources.Folder;
+			this.browse.Location = new System.Drawing.Point(360, 10);
+			this.browse.Name = "browse";
+			this.browse.Size = new System.Drawing.Size(28, 23);
+			this.browse.TabIndex = 11;
+			this.browse.UseVisualStyleBackColor = true;
+			this.browse.Click += new System.EventHandler(this.browse_Click);
+			// 
+			// ObjImportSettingsForm
+			// 
+			this.AcceptButton = this.import;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.CancelButton = this.cancel;
+			this.ClientSize = new System.Drawing.Size(394, 109);
+			this.Controls.Add(this.cbusevertexheight);
+			this.Controls.Add(this.panel1);
+			this.Controls.Add(this.label3);
+			this.Controls.Add(this.label2);
+			this.Controls.Add(this.nudScale);
+			this.Controls.Add(this.cancel);
+			this.Controls.Add(this.import);
+			this.Controls.Add(this.label1);
+			this.Controls.Add(this.browse);
+			this.Controls.Add(this.tbImportPath);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "ObjImportSettingsForm";
+			this.Opacity = 1;
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.Text = "Import Wavefront .obj";
+			((System.ComponentModel.ISupportInitialize)(this.nudScale)).EndInit();
+			this.panel1.ResumeLayout(false);
+			this.panel1.PerformLayout();
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Label label2;
+		private System.Windows.Forms.NumericUpDown nudScale;
+		private System.Windows.Forms.Button cancel;
+		private System.Windows.Forms.Button import;
+		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.Button browse;
+		private System.Windows.Forms.TextBox tbImportPath;
+		private System.Windows.Forms.Label label3;
+		private System.Windows.Forms.RadioButton axisx;
+		private System.Windows.Forms.RadioButton axisy;
+		private System.Windows.Forms.RadioButton axisz;
+		private System.Windows.Forms.Panel panel1;
+		private System.Windows.Forms.OpenFileDialog openFileDialog;
+		private System.Windows.Forms.CheckBox cbusevertexheight;
+	}
+}
\ No newline at end of file
diff --git a/Source/Plugins/BuilderEffects/Interface/ObjImportSettingsForm.cs b/Source/Plugins/BuilderEffects/Interface/ObjImportSettingsForm.cs
new file mode 100644
index 0000000..15b4a57
--- /dev/null
+++ b/Source/Plugins/BuilderEffects/Interface/ObjImportSettingsForm.cs
@@ -0,0 +1,92 @@
+#region ================== Namespaces
+
+using System;
+using System.IO;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Windows;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderEffects
+{
+	public partial class ObjImportSettingsForm : DelayedForm
+	{
+		#region ================== Variables
+
+		private ImportObjAsTerrainMode.UpAxis axis;
+		private bool slopessupported;
+
+		#endregion
+
+		#region ================== Properties
+
+		internal string FilePath { get { return tbImportPath.Text.Trim(); } }
+		internal ImportObjAsTerrainMode.UpAxis UpAxis { get { return axis; } }
+		internal float ObjScale { get { return (float)nudScale.Value; } }
+		internal bool UseVertexHeights { get { return slopessupported && cbusevertexheight.Checked; } }
+
+		//todo: floor/ceiling textures? height offsets? ceiling extra height?
+
+		#endregion
+
+		public ObjImportSettingsForm() 
+		{
+			InitializeComponent();
+
+			//restore settings
+			axis = (ImportObjAsTerrainMode.UpAxis)General.Settings.ReadPluginSetting("objexportupaxis", 0);
+			nudScale.Value = (decimal)General.Settings.ReadPluginSetting("objexportscale", 1.0f);
+			slopessupported = (General.Map.UDMF || General.Map.Data.GetThingInfoEx(ImportObjAsTerrainMode.VERTEX_HEIGHT_THING_TYPE) != null);
+			if(slopessupported) 
+				cbusevertexheight.Checked = General.Settings.ReadPluginSetting("objusevertexheights", true);
+			else 
+				cbusevertexheight.Enabled = false;
+
+			switch(axis) 
+			{
+				case ImportObjAsTerrainMode.UpAxis.X: axisx.Checked = true; break;
+				case ImportObjAsTerrainMode.UpAxis.Y: axisy.Checked = true; break;
+				case ImportObjAsTerrainMode.UpAxis.Z: axisz.Checked = true; break;
+				default: axisy.Checked = true; break;
+			}
+		}
+
+		#region ================== Events
+
+		private void browse_Click(object sender, EventArgs e) 
+		{
+			if(openFileDialog.ShowDialog() == DialogResult.OK) tbImportPath.Text = openFileDialog.FileName;
+		}
+
+		private void import_Click(object sender, EventArgs e) 
+		{
+			if(nudScale.Value == 0) 
+			{
+				MessageBox.Show("Scale should not be zero!");
+				return;
+			}
+			if(!File.Exists(tbImportPath.Text)) 
+			{
+				MessageBox.Show("Selected path does not exist!");
+				return;
+			}
+
+			axis = (axisy.Checked ? ImportObjAsTerrainMode.UpAxis.Y : (axisz.Checked ? ImportObjAsTerrainMode.UpAxis.Z : ImportObjAsTerrainMode.UpAxis.X));
+
+			//save settings
+			General.Settings.WritePluginSetting("objexportupaxis", (int)axis);
+			General.Settings.WritePluginSetting("objexportscale", (float)nudScale.Value);
+			if(slopessupported) General.Settings.WritePluginSetting("objusevertexheights", cbusevertexheight.Checked);
+
+			this.DialogResult = DialogResult.OK;
+			this.Close();
+		}
+
+		private void cancel_Click(object sender, EventArgs e) 
+		{
+			this.Close();
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderEffects/Interface/ObjImportSettingsForm.resx b/Source/Plugins/BuilderEffects/Interface/ObjImportSettingsForm.resx
new file mode 100644
index 0000000..f901ebb
--- /dev/null
+++ b/Source/Plugins/BuilderEffects/Interface/ObjImportSettingsForm.resx
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/BuilderEffects/Modes/ImportObjAsTerrainMode.cs b/Source/Plugins/BuilderEffects/Modes/ImportObjAsTerrainMode.cs
new file mode 100644
index 0000000..aff0c41
--- /dev/null
+++ b/Source/Plugins/BuilderEffects/Modes/ImportObjAsTerrainMode.cs
@@ -0,0 +1,406 @@
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Editing;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Geometry;
+using System.IO;
+using System.Globalization;
+using CodeImp.DoomBuilder.Windows;
+using CodeImp.DoomBuilder.Map;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderEffects
+{
+	[EditMode(DisplayName = "Terrain Importer",
+			  SwitchAction = "importobjasterrain",
+			  Volatile = true,
+			  UseByDefault = true,
+			  AllowCopyPaste = false)]
+	public class ImportObjAsTerrainMode : ClassicMode
+	{
+		#region ================== Constants
+
+		private readonly static char[] space = { ' ' };
+		private const string slash = "/";
+		internal const int VERTEX_HEIGHT_THING_TYPE = 1504;
+
+		#endregion
+
+		#region ================== Variables
+
+		private struct Face
+		{
+			public readonly Vector3D V1;
+			public readonly Vector3D V2;
+			public readonly Vector3D V3;
+
+			public Face(Vector3D v1, Vector3D v2, Vector3D v3) 
+			{
+				V1 = v1;
+				V2 = v2;
+				V3 = v3;
+			}
+		}
+
+		private readonly ObjImportSettingsForm form;
+
+		#endregion
+
+		#region ================== Properties
+
+		internal enum UpAxis
+		{
+			Y,
+			Z,
+			X
+		}
+
+		#endregion
+
+		#region ================== Constructor
+
+		public ImportObjAsTerrainMode() 
+		{
+			form = new ObjImportSettingsForm();
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		public override void OnEngage() 
+		{
+			base.OnEngage();
+			General.Map.Map.ClearAllSelected();
+
+			//show interface
+			if(form.ShowDialog() == DialogResult.OK && File.Exists(form.FilePath)) 
+			{
+				OnAccept();
+			} 
+			else 
+			{
+				OnCancel();
+			}
+		}
+
+		public override void OnAccept() 
+		{
+			Cursor.Current = Cursors.AppStarting;
+			General.Interface.DisplayStatus(StatusType.Busy, "Creating geometry...");
+
+			// Collections! Everyone loves them!
+			List<Vector3D> verts = new List<Vector3D>(12);
+			List<Face> faces = new List<Face>(4);
+			int minZ = int.MaxValue;
+			int maxZ = int.MinValue;
+
+			// Read .obj, create and select sectors 
+			if(!ReadGeometry(form.FilePath, form.ObjScale, form.UpAxis, verts, faces, ref minZ, ref maxZ) || !CreateGeometry(verts, faces, maxZ + (maxZ - minZ)/2)) 
+			{
+				// Fial!
+				Cursor.Current = Cursors.Default;
+
+				// Return to base mode
+				General.Editing.ChangeMode(General.Editing.PreviousStableMode.Name);
+				return;
+			}
+			
+			// Update caches
+			General.Map.Map.SnapAllToAccuracy();
+			General.Map.Map.UpdateConfiguration();
+			General.Map.Map.Update();
+			General.Map.IsChanged = true;
+
+			// Update things filter so that it includes added things
+			if(form.UseVertexHeights && !General.Map.UDMF) General.Map.ThingsFilter.Update();
+
+			// Done
+			Cursor.Current = Cursors.Default;
+
+			// Switch to Edit Selection mode
+			General.Editing.ChangeMode("EditSelectionMode", true);
+		}
+
+		public override void OnCancel() 
+		{
+			// Cancel base class
+			base.OnCancel();
+
+			// Return to base mode
+			General.Editing.ChangeMode(General.Editing.PreviousStableMode.Name);
+		}
+
+		#endregion
+
+		#region ================== Geometry creation
+
+		private bool CreateGeometry(List<Vector3D> verts, List<Face> faces, int maxZ) 
+		{
+			if(verts.Count < 3 || faces.Count == 0)
+			{
+				MessageBox.Show("Cannot import the model: failed to find any suitable polygons!",
+					"Terrain Importer", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				return false;
+			}
+			
+			MapSet map = General.Map.Map;
+			
+			// Capacity checks
+			int totalverts = map.Vertices.Count + verts.Count;
+			int totalsides = map.Sidedefs.Count + faces.Count * 6;
+			int totallines = map.Linedefs.Count + faces.Count * 3;
+			int totalsectors = map.Sectors.Count + faces.Count;
+			int totalthings = 0;
+			if(form.UseVertexHeights && !General.Map.UDMF) 
+			{
+				// We'll use vertex height things in non-udmf maps, if such things are defined in Game Configuration
+				totalthings = map.Things.Count + verts.Count;
+			}
+
+			if(totalverts > General.Map.FormatInterface.MaxVertices) 
+			{
+				MessageBox.Show("Cannot import the model: resulting vertex count (" + totalverts 
+					+ ") is larger than map format's maximum (" + General.Map.FormatInterface.MaxVertices + ")!", 
+					"Terrain Importer", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				return false;
+			}
+			if(totalsides > General.Map.FormatInterface.MaxSidedefs) 
+			{
+				MessageBox.Show("Cannot import the model: resulting sidedefs count (" + totalsides 
+					+ ") is larger than map format's maximum (" + General.Map.FormatInterface.MaxSidedefs + ")!", 
+					"Terrain Importer", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				return false;
+			}
+			if(totallines > General.Map.FormatInterface.MaxLinedefs) 
+			{
+				MessageBox.Show("Cannot import the model: resulting sidedefs count (" + totallines 
+					+ ") is larger than map format's maximum (" + General.Map.FormatInterface.MaxLinedefs + ")!", 
+					"Terrain Importer", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				return false;
+			}
+			if(totalsectors > General.Map.FormatInterface.MaxSectors) 
+			{
+				MessageBox.Show("Cannot import the model: resulting sidedefs count (" + totalsectors 
+					+ ") is larger than map format's maximum (" + General.Map.FormatInterface.MaxSectors + ")!", 
+					"Terrain Importer", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				return false;
+			}
+			if(totalthings > General.Map.FormatInterface.MaxThings) 
+			{
+				MessageBox.Show("Cannot import the model: resulting things count (" + totalthings
+					+ ") is larger than map format's maximum (" + General.Map.FormatInterface.MaxThings + ")!",
+					"Terrain Importer", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				return false;
+			}
+			
+			//make undo
+			General.Map.UndoRedo.CreateUndo("Import Terrain");
+
+			//prepare mapset
+			List<Linedef> newlines = new List<Linedef>();
+			map.BeginAddRemove();
+			map.SetCapacity(totalverts, totallines, totalsides, totalsectors, totalthings);
+
+			//terrain has many faces... let's create them
+			Dictionary<Vector3D, Vertex> newverts = new Dictionary<Vector3D, Vertex>();
+			foreach(Face face in faces)
+			{
+				// Create sector
+				Sector s = map.CreateSector();
+				s.Selected = true;
+				s.FloorHeight = (int)Math.Round((face.V1.z + face.V2.z + face.V3.z) / 3);
+				s.CeilHeight = maxZ;
+				s.Brightness = General.Settings.DefaultBrightness; //todo: allow user to change this
+				s.SetCeilTexture(General.Map.Config.SkyFlatName);
+				s.SetFloorTexture(General.Map.Options.DefaultFloorTexture); //todo: allow user to change this
+
+				// And linedefs
+				Linedef newline = GetLine(newverts, s, face.V1, face.V2);
+				if(newline != null) newlines.Add(newline);
+
+				newline = GetLine(newverts, s, face.V2, face.V3);
+				if(newline != null) newlines.Add(newline);
+
+				newline = GetLine(newverts, s, face.V3, face.V1);
+				if(newline != null) newlines.Add(newline);
+
+				s.UpdateCache();
+			}
+
+			// Add slope things
+			if(form.UseVertexHeights && !General.Map.UDMF) 
+			{
+				foreach(Vector3D pos in newverts.Keys) 
+				{
+					Thing t = map.CreateThing();
+					General.Settings.ApplyDefaultThingSettings(t);
+					t.Type = VERTEX_HEIGHT_THING_TYPE;
+					t.Move(pos);
+					t.Selected = true;
+				}
+			}
+
+			//update new lines
+			foreach(Linedef l in newlines) l.ApplySidedFlags();
+
+			map.EndAddRemove();
+			return true;
+		}
+
+		private Linedef GetLine(Dictionary<Vector3D, Vertex> verts, Sector sector, Vector3D v1, Vector3D v2) 
+		{
+			Linedef line = null;
+
+			//get start and end verts
+			Vertex start = GetVertex(verts, v1);
+			Vertex end = GetVertex(verts, v2);
+
+			//check if the line is already created
+			foreach(Linedef l in start.Linedefs)
+			{
+				if(l.End == end || l.Start == end) 
+				{
+					line = l;
+					break;
+				}
+			}
+
+			//create a new line?
+			Sidedef side;
+			if(line == null) 
+			{
+				line = General.Map.Map.CreateLinedef(start, end);
+
+				//create front sidedef and attach sector to it
+				side = General.Map.Map.CreateSidedef(line, true, sector);
+			} 
+			else 
+			{
+				//create back sidedef and attach sector to it
+				side = General.Map.Map.CreateSidedef(line, false, sector);
+			}
+
+			if(!form.UseVertexHeights) side.SetTextureLow(General.Map.Options.DefaultWallTexture);
+			line.Selected = true;
+			return line;
+		}
+
+		private Vertex GetVertex(Dictionary<Vector3D, Vertex> verts, Vector3D pos) 
+		{
+			//already there?
+			if(verts.ContainsKey(pos)) return verts[pos];
+			
+			//make a new one
+			Vertex v = General.Map.Map.CreateVertex(pos);
+			if(form.UseVertexHeights) v.ZFloor = pos.z;
+			verts.Add(pos, v);
+			return v;
+		}
+
+		#endregion
+
+		#region ================== .obj import
+
+		private static bool ReadGeometry(string path, float scale, UpAxis axis, List<Vector3D> verts, List<Face> faces, ref int minZ, ref int maxZ) 
+		{
+			using(StreamReader reader = File.OpenText(path)) 
+			{
+				string line;
+				int counter = 0;
+				float picoarse = (float)Math.Round(Angle2D.PI, 3);
+
+				while((line = reader.ReadLine()) != null) 
+				{
+					counter++;
+
+					if(line.StartsWith("v ")) 
+					{
+						string[] parts = line.Split(space, StringSplitOptions.RemoveEmptyEntries);
+
+						float x, y, z;
+						if(parts.Length != 4 || !float.TryParse(parts[1], NumberStyles.Float, CultureInfo.InvariantCulture, out x) ||
+							!float.TryParse(parts[2], NumberStyles.Float, CultureInfo.InvariantCulture, out y) ||
+							!float.TryParse(parts[3], NumberStyles.Float, CultureInfo.InvariantCulture, out z)) 
+						{
+							MessageBox.Show("Failed to parse vertex definition at line " + counter + "!", "Terrain Importer", MessageBoxButtons.OK, MessageBoxIcon.Error);
+							return false;
+						}
+
+						//apply up axis
+						int px, py, pz;
+						switch(axis) 
+						{
+							case UpAxis.Y:
+								px = (int)Math.Round(x * scale);
+								py = (int)Math.Round(-z * scale);
+								pz = (int)Math.Round(y * scale);
+								break;
+
+							case UpAxis.Z:
+								px = (int)Math.Round(-x * scale);
+								py = (int)Math.Round(-y * scale);
+								pz = (int)Math.Round(z * scale);
+								break;
+
+							case UpAxis.X:
+								px = (int)Math.Round(-y * scale);
+								py = (int)Math.Round(-z * scale);
+								pz = (int)Math.Round(x * scale);
+								break;
+
+							default: //same as UpAxis.Y
+								px = (int)Math.Round(x * scale);
+								py = (int)Math.Round(-z * scale);
+								pz = (int)Math.Round(y * scale);
+								break;
+						}
+
+						if(maxZ < pz) maxZ = pz;
+						if(minZ > pz) minZ = pz;
+
+						verts.Add(new Vector3D(px, py, pz));
+					} 
+					else if(line.StartsWith("f ")) 
+					{
+						string[] parts = line.Split(space, StringSplitOptions.RemoveEmptyEntries);
+
+						if(parts.Length != 4) 
+						{
+							MessageBox.Show("Failed to parse face definition at line " + counter + ": only triangular faces are supported!", "Terrain Importer", MessageBoxButtons.OK, MessageBoxIcon.Error);
+							return false;
+						}
+
+						//.obj vertex indices are 1-based
+						int v1 = ReadVertexIndex(parts[1]) - 1;
+						int v2 = ReadVertexIndex(parts[2]) - 1;
+						int v3 = ReadVertexIndex(parts[3]) - 1;
+
+						// Skip face if vertex indexes match
+						if(verts[v1] == verts[v2] || verts[v1] == verts[v3] || verts[v2] == verts[v3]) continue;
+
+						// Skip face if it's vertical
+						Plane p = new Plane(verts[v1], verts[v2], verts[v3], true);
+						if((float)Math.Round(p.Normal.GetAngleZ(), 3) == picoarse) continue;
+
+						faces.Add(new Face(verts[v3], verts[v2], verts[v1]));
+					}
+				}
+			}
+
+			return true;
+		}
+
+		private static int ReadVertexIndex(string def) 
+		{
+			int slashpos = def.IndexOf(slash);
+			if(slashpos != -1) def = def.Substring(0, slashpos);
+			return int.Parse(def);
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderEffects/Properties/AssemblyInfo.cs b/Source/Plugins/BuilderEffects/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..09e15fa
--- /dev/null
+++ b/Source/Plugins/BuilderEffects/Properties/AssemblyInfo.cs
@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("BuilderEffects")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("BuilderEffects")]
+[assembly: AssemblyCopyright("Copyright ©  2013")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("1f2aa6a6-12ff-40fc-8a83-9aaa637f35f3")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Source/Plugins/BuilderEffects/Properties/Resources.Designer.cs b/Source/Plugins/BuilderEffects/Properties/Resources.Designer.cs
new file mode 100644
index 0000000..a0e6a69
--- /dev/null
+++ b/Source/Plugins/BuilderEffects/Properties/Resources.Designer.cs
@@ -0,0 +1,103 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:4.0.30319.42000
+//
+//     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace CodeImp.DoomBuilder.BuilderEffects.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
+    /// </summary>
+    // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
+    // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
+    // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
+    // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("CodeImp.DoomBuilder.BuilderEffects.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
+        ///   Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Folder {
+            get {
+                object obj = ResourceManager.GetObject("Folder", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Jitter {
+            get {
+                object obj = ResourceManager.GetObject("Jitter", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Terrain {
+            get {
+                object obj = ResourceManager.GetObject("Terrain", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Update {
+            get {
+                object obj = ResourceManager.GetObject("Update", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+    }
+}
diff --git a/Source/Plugins/BuilderEffects/Properties/Resources.resx b/Source/Plugins/BuilderEffects/Properties/Resources.resx
new file mode 100644
index 0000000..d2eb41f
--- /dev/null
+++ b/Source/Plugins/BuilderEffects/Properties/Resources.resx
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="Terrain" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Terrain.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Jitter" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Jitter.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Update" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Update.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Folder" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Folder.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/BuilderEffects/Resources/Actions.cfg b/Source/Plugins/BuilderEffects/Resources/Actions.cfg
new file mode 100644
index 0000000..ec754c8
--- /dev/null
+++ b/Source/Plugins/BuilderEffects/Resources/Actions.cfg
@@ -0,0 +1,26 @@
+// Categories for the Controls preferences
+categories
+{
+	transform = "Transform";
+}
+
+applyjitter
+{
+	title = "Randomize";
+	category = "transform";
+	description = "Allows to apply a variety of randomized transformations to the selection.";
+	allowkeys = true;
+	allowmouse = false;
+	allowscroll = false;
+	default = 131146; //Ctrl-J
+}
+
+importobjasterrain
+{
+	title = "Import Wavefront .obj as terrain";
+	category = "tools";
+	description = "Creates sectors from given model (UDMF only).";
+	allowkeys = true;
+	allowmouse = false;
+	allowscroll = false;
+}
\ No newline at end of file
diff --git a/Source/Plugins/BuilderEffects/Resources/Folder.png b/Source/Plugins/BuilderEffects/Resources/Folder.png
new file mode 100644
index 0000000..1d415fd
Binary files /dev/null and b/Source/Plugins/BuilderEffects/Resources/Folder.png differ
diff --git a/Source/Plugins/BuilderEffects/Resources/Jitter.png b/Source/Plugins/BuilderEffects/Resources/Jitter.png
new file mode 100644
index 0000000..abe44c9
Binary files /dev/null and b/Source/Plugins/BuilderEffects/Resources/Jitter.png differ
diff --git a/Source/Plugins/BuilderEffects/Resources/Terrain.png b/Source/Plugins/BuilderEffects/Resources/Terrain.png
new file mode 100644
index 0000000..f4fdc5e
Binary files /dev/null and b/Source/Plugins/BuilderEffects/Resources/Terrain.png differ
diff --git a/Source/Plugins/BuilderEffects/Resources/Update.png b/Source/Plugins/BuilderEffects/Resources/Update.png
new file mode 100644
index 0000000..a9bf4c8
Binary files /dev/null and b/Source/Plugins/BuilderEffects/Resources/Update.png differ
diff --git a/Source/Plugins/BuilderModes/BuilderModes.csproj b/Source/Plugins/BuilderModes/BuilderModes.csproj
new file mode 100644
index 0000000..54c44af
--- /dev/null
+++ b/Source/Plugins/BuilderModes/BuilderModes.csproj
@@ -0,0 +1,632 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{B42D5AA0-F9A6-4234-9C4B-A05B11A64851}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>CodeImp.DoomBuilder.BuilderModes</RootNamespace>
+    <AssemblyName>BuilderModes</AssemblyName>
+    <RunPostBuildEvent>Always</RunPostBuildEvent>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\..\..\Build\Plugins\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <OutputPath>..\..\..\Build\Plugins\</OutputPath>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <DebugSymbols>true</DebugSymbols>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug + Profiler|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\..\..\Build\Plugins\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;PROFILE</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release + Profiler|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\..\..\Build\Plugins\</OutputPath>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ClassicModes\BaseClassicMode.cs" />
+    <Compile Include="ClassicModes\ErrorCheckMode.cs" />
+    <Compile Include="ClassicModes\EditSelectionMode.cs" />
+    <Compile Include="ClassicModes\CurveLinedefsMode.cs" />
+    <Compile Include="ClassicModes\DragLinedefsMode.cs" />
+    <Compile Include="ClassicModes\DragSectorsMode.cs" />
+    <Compile Include="ClassicModes\DragGeometryMode.cs" />
+    <Compile Include="ClassicModes\DrawGeometryMode.cs" />
+    <Compile Include="ClassicModes\FindReplaceMode.cs" />
+    <Compile Include="ClassicModes\MakeSectorMode.cs" />
+    <Compile Include="ErrorChecks\CheckClosedSectors.cs" />
+    <Compile Include="ErrorChecks\CheckStuckThings.cs" />
+    <Compile Include="ErrorChecks\CheckLineReferences.cs" />
+    <Compile Include="ErrorChecks\CheckOverlappingLines.cs" />
+    <Compile Include="ErrorChecks\ResultLineOverlapping.cs" />
+    <Compile Include="ErrorChecks\ResultLineNotSingleSided.cs" />
+    <Compile Include="ErrorChecks\ResultLineNotDoubleSided.cs" />
+    <Compile Include="ErrorChecks\ResultLineMissingFront.cs" />
+    <Compile Include="ErrorChecks\ResultLineMissingSides.cs" />
+    <Compile Include="ErrorChecks\ResultSectorUnclosed.cs" />
+    <Compile Include="ErrorChecks\ResultStuckThingInLine.cs" />
+    <Compile Include="ErrorChecks\ErrorResult.cs" />
+    <Compile Include="ErrorChecks\ErrorCheckerAttribute.cs" />
+    <Compile Include="ErrorChecks\ErrorChecker.cs" />
+    <Compile Include="ErrorChecks\ResultThingOutside.cs" />
+    <Compile Include="FindReplace\FindLinedefTypes.cs" />
+    <Compile Include="FindReplace\FindReplaceAttribute.cs" />
+    <Compile Include="FindReplace\FindReplaceObject.cs" />
+    <Compile Include="FindReplace\FindReplaceType.cs" />
+    <Compile Include="FindReplace\FindSectorTags.cs" />
+    <Compile Include="General\Association.cs" />
+    <Compile Include="General\BuilderPlug.cs" />
+    <Compile Include="General\CopyStructures.cs" />
+    <Compile Include="Interface\CurveLinedefsForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Interface\CurveLinedefsForm.Designer.cs">
+      <DependentUpon>CurveLinedefsForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Interface\ErrorCheckForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Interface\ErrorCheckForm.Designer.cs">
+      <DependentUpon>ErrorCheckForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Interface\FindReplaceForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Interface\FindReplaceForm.Designer.cs">
+      <DependentUpon>FindReplaceForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Interface\MakeDoorForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Interface\MakeDoorForm.Designer.cs">
+      <DependentUpon>MakeDoorForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Interface\MenusForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Interface\MenusForm.Designer.cs">
+      <DependentUpon>MenusForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Interface\PreferencesForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Interface\PreferencesForm.Designer.cs">
+      <DependentUpon>PreferencesForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="ClassicModes\DragThingsMode.cs" />
+    <Compile Include="General\LineLengthLabel.cs" />
+    <Compile Include="ClassicModes\DragVerticesMode.cs" />
+    <Compile Include="ClassicModes\LinedefsMode.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ClassicModes\SectorsMode.cs" />
+    <Compile Include="ClassicModes\ThingsMode.cs" />
+    <Compile Include="ClassicModes\VerticesMode.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\Actions.cfg" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\ThingsMode.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\VerticesMode.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\LinesMode.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\SectorsMode.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Interface\CurveLinedefsForm.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>CurveLinedefsForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Interface\MenusForm.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>MenusForm.cs</DependentUpon>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Core\Builder.csproj">
+      <Project>{818B3D10-F791-4C3F-9AF5-BB2D0079B63C}</Project>
+      <Name>Builder</Name>
+      <Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Interface\ErrorCheckForm.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>ErrorCheckForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Interface\FindReplaceForm.resx">
+      <DependentUpon>FindReplaceForm.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Interface\MakeDoorForm.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>MakeDoorForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <SubType>Designer</SubType>
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Resources\NewSector2.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\treeview.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\BrightnessGradient.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\TriangulatorMode.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\FindMode.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Interface\PreferencesForm.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>PreferencesForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Resources\MapAnalysisMode.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\FlipSelectionH.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\FlipSelectionV.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Interface\EditSelectionPanel.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>EditSelectionPanel.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Interface\UndoRedoPanel.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>UndoRedoPanel.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Resources\HeightsMode.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ClassicModes\BridgeMode.cs" />
+    <Compile Include="ClassicModes\CeilingAlignMode.cs" />
+    <Compile Include="ClassicModes\DrawCurveMode.cs" />
+    <Compile Include="ClassicModes\DrawEllipseMode.cs" />
+    <Compile Include="ClassicModes\DrawGridMode.cs" />
+    <Compile Include="ClassicModes\DrawRectangleMode.cs" />
+    <Compile Include="ClassicModes\FlatAlignMode.cs" />
+    <Compile Include="ClassicModes\FloorAlignMode.cs" />
+    <Compile Include="ErrorChecks\CheckMapSize.cs" />
+    <Compile Include="ErrorChecks\CheckMissingFlats.cs" />
+    <Compile Include="ErrorChecks\CheckMissingTextures.cs" />
+    <Compile Include="ErrorChecks\CheckObsoleteThings.cs" />
+    <Compile Include="ErrorChecks\CheckOverlappingVertices.cs" />
+    <Compile Include="ErrorChecks\CheckShortLinedefs.cs" />
+    <Compile Include="ErrorChecks\CheckStrayVertices.cs" />
+    <Compile Include="ErrorChecks\CheckTextureAlignment.cs" />
+    <Compile Include="ErrorChecks\CheckUnknownFlats.cs" />
+    <Compile Include="ErrorChecks\CheckUnknownTextures.cs" />
+    <Compile Include="ErrorChecks\CheckUnknownThings.cs" />
+    <Compile Include="ErrorChecks\CheckUnusedTextures.cs" />
+    <Compile Include="ErrorChecks\CheckUnusedThings.cs" />
+    <Compile Include="ErrorChecks\ResultMapTooBig.cs" />
+    <Compile Include="ErrorChecks\ResultMissingFlat.cs" />
+    <Compile Include="ErrorChecks\ResultNoErrors.cs" />
+    <Compile Include="ErrorChecks\ResultObsoleteThing.cs" />
+    <Compile Include="ErrorChecks\ResultSectorInvalid.cs" />
+    <Compile Include="ErrorChecks\ResultShortLinedef.cs" />
+    <Compile Include="ErrorChecks\ResultStrayVertex.cs" />
+    <Compile Include="ErrorChecks\ResultStuckThingInThing.cs" />
+    <Compile Include="ErrorChecks\ResultMissingTexture.cs" />
+    <Compile Include="ErrorChecks\ResultTexturesMisaligned.cs" />
+    <Compile Include="ErrorChecks\ResultUnknownFlat.cs" />
+    <Compile Include="ErrorChecks\ResultUnknownTexture.cs" />
+    <Compile Include="ErrorChecks\ResultUnknownThing.cs" />
+    <Compile Include="ErrorChecks\ResultUnusedTexture.cs" />
+    <Compile Include="ErrorChecks\ResultUnusedThing.cs" />
+    <Compile Include="ErrorChecks\ResultVertexOverlappingLine.cs" />
+    <Compile Include="ErrorChecks\ResultVertexOverlappingVertex.cs" />
+    <Compile Include="FindReplace\BaseFindLinedef.cs" />
+    <Compile Include="FindReplace\BaseFindSector.cs" />
+    <Compile Include="FindReplace\BaseFindSidedef.cs" />
+    <Compile Include="FindReplace\BaseFindThing.cs" />
+    <Compile Include="FindReplace\FindLinedefFlags.cs" />
+    <Compile Include="FindReplace\FindSectorBrightness.cs" />
+    <Compile Include="FindReplace\FindSectorCeilingHeight.cs" />
+    <Compile Include="FindReplace\FindSectorFlags.cs" />
+    <Compile Include="FindReplace\FindSectorFloorHeight.cs" />
+    <Compile Include="FindReplace\FindSidedefFlags.cs" />
+    <Compile Include="FindReplace\FindThingAngle.cs" />
+    <Compile Include="FindReplace\FindAnyTextureFlat.cs" />
+    <Compile Include="FindReplace\FindThingFlags.cs" />
+    <Compile Include="FindReplace\FindThingSectorRef.cs" />
+    <Compile Include="FindReplace\FindThingTag.cs" />
+    <Compile Include="FindReplace\FindLinedefNumber.cs" />
+    <Compile Include="FindReplace\FindLinedefSectorRef.cs" />
+    <Compile Include="FindReplace\FindLinedefTags.cs" />
+    <Compile Include="FindReplace\FindSectorEffect.cs" />
+    <Compile Include="FindReplace\FindSectorFlat.cs" />
+    <Compile Include="FindReplace\FindSidedefTexture.cs" />
+    <Compile Include="FindReplace\FindLinedefThingRef.cs" />
+    <Compile Include="FindReplace\FindSectorNumber.cs" />
+    <Compile Include="FindReplace\FindSidedefNumber.cs" />
+    <Compile Include="FindReplace\FindThingAction.cs" />
+    <Compile Include="FindReplace\FindThingNumber.cs" />
+    <Compile Include="FindReplace\FindThingThingRef.cs" />
+    <Compile Include="FindReplace\FindThingType.cs" />
+    <Compile Include="FindReplace\FindVertexNumber.cs" />
+    <Compile Include="General\HintLabel.cs" />
+    <Compile Include="General\BuilderModesTools.cs" />
+    <Compile Include="General\UndoGroup.cs" />
+    <Compile Include="Interface\BridgeModeForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Interface\BridgeModeForm.Designer.cs">
+      <DependentUpon>BridgeModeForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Interface\DrawCurveOptionsPanel.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Interface\DrawCurveOptionsPanel.Designer.cs">
+      <DependentUpon>DrawCurveOptionsPanel.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Interface\DrawEllipseOptionsPanel.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Interface\DrawEllipseOptionsPanel.Designer.cs">
+      <DependentUpon>DrawEllipseOptionsPanel.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Interface\DrawGridOptionsPanel.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Interface\DrawGridOptionsPanel.Designer.cs">
+      <DependentUpon>DrawGridOptionsPanel.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Interface\DrawRectangleOptionsPanel.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Interface\DrawRectangleOptionsPanel.Designer.cs">
+      <DependentUpon>DrawRectangleOptionsPanel.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Interface\EditSelectionPanel.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Interface\EditSelectionPanel.Designer.cs">
+      <DependentUpon>EditSelectionPanel.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Interface\FilterSelectedThingsForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Interface\FilterSelectedThingsForm.Designer.cs">
+      <DependentUpon>FilterSelectedThingsForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Interface\FitTexturesForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Interface\FitTexturesForm.Designer.cs">
+      <DependentUpon>FitTexturesForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Interface\PastePropertiesOptionsForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Interface\PastePropertiesOptionsForm.Designer.cs">
+      <DependentUpon>PastePropertiesOptionsForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Interface\SectorDrawingOptionsPanel.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Interface\SectorDrawingOptionsPanel.Designer.cs">
+      <DependentUpon>SectorDrawingOptionsPanel.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Interface\SelectSimilarElementOptionsPanel.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Interface\SelectSimilarElementOptionsPanel.Designer.cs">
+      <DependentUpon>SelectSimilarElementOptionsPanel.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Interface\WavefrontSettingsForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Interface\WavefrontSettingsForm.Designer.cs">
+      <DependentUpon>WavefrontSettingsForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Interface\UndoRedoPanel.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Interface\UndoRedoPanel.Designer.cs">
+      <DependentUpon>UndoRedoPanel.cs</DependentUpon>
+    </Compile>
+    <Compile Include="IO\WavefrontExporter.cs" />
+    <Compile Include="VisualModes\BaseVisualGeometrySector.cs" />
+    <Compile Include="VisualModes\BaseVisualGeometrySidedef.cs" />
+    <Compile Include="VisualModes\BaseVisualMode.cs" />
+    <Compile Include="VisualModes\BaseVisualSector.cs" />
+    <Compile Include="VisualModes\BaseVisualThing.cs" />
+    <Compile Include="VisualModes\BaseVisualVertex.cs" />
+    <Compile Include="VisualModes\Effect3DFloor.cs" />
+    <Compile Include="VisualModes\EffectBrightnessLevel.cs" />
+    <Compile Include="VisualModes\EffectCopySlope.cs" />
+    <Compile Include="VisualModes\EffectGlowingFlat.cs" />
+    <Compile Include="VisualModes\EffectLineSlope.cs" />
+    <Compile Include="VisualModes\EffectPlaneCopySlope.cs" />
+    <Compile Include="VisualModes\EffectThingLineSlope.cs" />
+    <Compile Include="VisualModes\EffectThingSlope.cs" />
+    <Compile Include="VisualModes\EffectThingVertexSlope.cs" />
+    <Compile Include="VisualModes\EffectTransferCeilingBrightness.cs" />
+    <Compile Include="VisualModes\EffectTransferFloorBrightness.cs" />
+    <Compile Include="VisualModes\EffectUDMFVertexOffset.cs" />
+    <Compile Include="VisualModes\IVisualEventReceiver.cs" />
+    <Compile Include="VisualModes\NullVisualEventReceiver.cs" />
+    <Compile Include="VisualModes\SectorData.cs" />
+    <Compile Include="VisualModes\SectorEffect.cs" />
+    <Compile Include="VisualModes\SectorLevel.cs" />
+    <Compile Include="VisualModes\SectorLevelComparer.cs" />
+    <Compile Include="VisualModes\SectorLevelType.cs" />
+    <Compile Include="VisualModes\TexturePlane.cs" />
+    <Compile Include="VisualModes\ThingData.cs" />
+    <Compile Include="VisualModes\VertexData.cs" />
+    <Compile Include="VisualModes\VisualActionResult.cs" />
+    <Compile Include="VisualModes\VisualCeiling.cs" />
+    <Compile Include="VisualModes\VisualFloor.cs" />
+    <Compile Include="VisualModes\VisualFogBoundary.cs" />
+    <Compile Include="VisualModes\VisualLower.cs" />
+    <Compile Include="VisualModes\VisualMiddle3D.cs" />
+    <Compile Include="VisualModes\VisualMiddleBack.cs" />
+    <Compile Include="VisualModes\VisualMiddleDouble.cs" />
+    <Compile Include="VisualModes\VisualMiddleSingle.cs" />
+    <Compile Include="VisualModes\VisualSidedefParts.cs" />
+    <Compile Include="VisualModes\VisualUpper.cs" />
+    <Compile Include="VisualModes\WallPolygon.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\ViewSelectionIndex.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\FloorsGradient.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\CeilsGradient.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\CurveLines.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\CopyProperties.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\PasteProperties.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Angle.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\ColorPick.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\List.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\List_Images.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Text.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Interface\BridgeModeForm.resx">
+      <DependentUpon>BridgeModeForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Resources\Selection3.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\BridgeMode.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\DrawEllipseMode.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\CeilingAlign.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\FloorAlign.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Interface\DrawEllipseOptionsPanel.resx">
+      <DependentUpon>DrawEllipseOptionsPanel.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Interface\DrawGridOptionsPanel.resx">
+      <DependentUpon>DrawGridOptionsPanel.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Interface\DrawRectangleOptionsPanel.resx">
+      <DependentUpon>DrawRectangleOptionsPanel.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Interface\SectorDrawingOptionsPanel.resx">
+      <DependentUpon>SectorDrawingOptionsPanel.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Interface\WavefrontSettingsForm.resx">
+      <DependentUpon>WavefrontSettingsForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Resources\VisualModeGZ.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\SelectTouching.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\AlignThings.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\DrawCurveMode.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\ThingPointAtCursor.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\TextureLock.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Reset.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Interface\DrawCurveOptionsPanel.resx">
+      <DependentUpon>DrawCurveOptionsPanel.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Resources\DrawGridMode.png" />
+    <EmbeddedResource Include="Resources\Hints.cfg" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Door.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Gear.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\DrawGeometryMode.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Interface\FilterSelectedThingsForm.resx">
+      <DependentUpon>FilterSelectedThingsForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Interface\FitTexturesForm.resx">
+      <DependentUpon>FitTexturesForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Interface\PastePropertiesOptionsForm.resx">
+      <DependentUpon>PastePropertiesOptionsForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Interface\SelectSimilarElementOptionsPanel.resx">
+      <DependentUpon>SelectSimilarElementOptionsPanel.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Resources\DrawRectangleMode.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\PastePropertiesOptions.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\FilterThings.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Similar.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Save.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Copy.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Show.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Hide.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Show2.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\HideAll.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Folder.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Show3.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Join.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Merge.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Flip.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\SelectThingsInSectors.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\PlaceThings.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/Plugins/BuilderModes/ClassicModes/BaseClassicMode.cs b/Source/Plugins/BuilderModes/ClassicModes/BaseClassicMode.cs
new file mode 100644
index 0000000..34bb0ba
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ClassicModes/BaseClassicMode.cs
@@ -0,0 +1,396 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Windows;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Editing;
+using CodeImp.DoomBuilder.Actions;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Geometry;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	public abstract class BaseClassicMode : ClassicMode
+	{
+		#region ================== Constants
+
+		protected const int MULTISELECT_START_MOVE_PIXELS = 2; //mxd
+
+		#endregion
+
+		#region ================== Variables
+
+		protected bool paintselectpressed; //mxd
+		protected bool marqueSelectionIncludesThings; //mxd
+		
+		#endregion
+
+		#region ================== Properties
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		protected BaseClassicMode()
+		{
+			// Initialize
+
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Disposer
+		public override void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Clean up
+
+				// Done
+				base.Dispose();
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This occurs when the user presses Copy. All selected geometry must be marked for copying!
+		public override bool OnCopyBegin()
+		{
+			General.Map.Map.MarkAllSelectedGeometry(true, false, true, true, false);
+
+			// Return true when anything is selected so that the copy continues
+			// We only have to check vertices for the geometry, because without selected
+			// vertices, no complete structure can exist.
+			return (General.Map.Map.GetMarkedVertices(true).Count > 0) ||
+				   (General.Map.Map.GetMarkedThings(true).Count > 0);
+		}
+		
+		// This is called when pasting begins
+		public override bool OnPasteBegin(PasteOptions options)
+		{
+			// These modes support pasting
+			return true;
+		}
+		
+		// This is called when something was pasted.
+		public override void OnPasteEnd(PasteOptions options)
+		{
+			General.Map.Map.ClearAllSelected();
+			General.Map.Map.SelectMarkedGeometry(true, true);
+			General.Map.Renderer2D.UpdateExtraFloorFlag(); //mxd
+			
+			// Switch to EditSelectionMode
+			EditSelectionMode editmode = new EditSelectionMode();
+			editmode.Pasting = true;
+			editmode.PasteOptions = options;
+			General.Editing.ChangeMode(editmode);
+		}
+
+		// Double-clicking
+		public override void OnMouseDoubleClick(MouseEventArgs e)
+		{
+			base.OnMouseDoubleClick(e);
+
+			int k = 0;
+			if(e.Button == MouseButtons.Left) k = (int)Keys.LButton;
+			if(e.Button == MouseButtons.Middle) k = (int)Keys.MButton;
+			if(e.Button == MouseButtons.Right) k = (int)Keys.RButton;
+			if(e.Button == MouseButtons.XButton1) k = (int)Keys.XButton1;
+			if(e.Button == MouseButtons.XButton2) k = (int)Keys.XButton2;
+			
+			// Double select-click? Make that the same as single edit-click
+			if(General.Actions.GetActionByName("builder_classicselect").KeyMatches(k))
+			{
+				Actions.Action a = General.Actions.GetActionByName("builder_classicedit");
+				if(a != null) a.Invoke();
+			}
+		}
+
+		//mxd
+		protected override void OnUpdateMultiSelection() 
+		{
+			base.OnUpdateMultiSelection();
+
+			if(General.Interface.CtrlState && General.Interface.ShiftState)
+				marqueSelectionMode = MarqueSelectionMode.INTERSECT;
+			else if(General.Interface.CtrlState)
+				marqueSelectionMode = MarqueSelectionMode.SUBTRACT;
+			else if(General.Interface.ShiftState ^ BuilderPlug.Me.AdditiveSelect)
+				marqueSelectionMode = MarqueSelectionMode.ADD;
+			else
+				marqueSelectionMode = MarqueSelectionMode.SELECT;
+
+			marqueSelectionIncludesThings = General.Interface.AltState;
+		}
+
+		//mxd
+		public override void OnMapTestEnd(bool testFromCurrentPosition) 
+		{
+			base.OnMapTestEnd(testFromCurrentPosition);
+			General.Interface.RedrawDisplay(); // Redraw display to hide changes :)
+		}
+
+		//mxd
+		protected void PlaceThingsAtPositions(List<Vector2D> positions) 
+		{
+			if(positions.Count < 1) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "This action requires selection of some description!");
+				return;
+			}
+
+			General.Map.UndoRedo.CreateUndo("Place " + (positions.Count > 1 ? "things" : "thing"));
+			List<Thing> things = new List<Thing>();
+
+			// Create things
+			foreach(Vector2D pos in positions) 
+			{
+				Thing t = General.Map.Map.CreateThing();
+				if(t != null) 
+				{
+					General.Settings.ApplyDefaultThingSettings(t);
+					t.Move(pos);
+					t.UpdateConfiguration();
+					t.Selected = true;
+					t.SnapToAccuracy(); // Snap to map format accuracy
+					things.Add(t);
+				}
+			}
+
+			//Operation failed?..
+			if(things.Count < 1) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "This action requires selection of some description!");
+				General.Map.UndoRedo.WithdrawUndo();
+				return;
+			}
+
+			//Show realtime thing edit dialog
+			General.Interface.OnEditFormValuesChanged += thingEditForm_OnValuesChanged;
+			if(General.Interface.ShowEditThings(things) == DialogResult.Cancel) 
+			{
+				General.Map.UndoRedo.WithdrawUndo();
+			} 
+			else 
+			{
+				General.Interface.DisplayStatus(StatusType.Info, "Placed " + things.Count + " things.");
+			}
+			General.Interface.OnEditFormValuesChanged -= thingEditForm_OnValuesChanged;
+		}
+
+		//mxd
+		protected static void DeleteThings(ICollection<Thing> things)
+		{
+			if(things.Count == 0) return;
+
+			General.Map.Map.BeginAddRemove(); //mxd
+
+			// Dispose selected things
+			foreach(Thing t in things)
+			{
+				//mxd. Do some path reconnecting shenanigans...
+				ThingTypeInfo info = General.Map.Data.GetThingInfo(t.Type);
+				string targetclass = string.Empty;
+				int targetarg = -1;
+
+				// Thing type can be changed in MAPINFO DoomEdNums block...
+				switch(info.ClassName.ToLowerInvariant())
+				{
+					case "interpolationpoint":
+						if(t.Tag != 0 && t.Args[3] != 0)
+						{
+							targetclass = "interpolationpoint";
+							targetarg = 3;
+						}
+						break;
+
+					case "patrolpoint":
+						if(t.Tag != 0 && t.Args[0] != 0)
+						{
+							targetclass = "patrolpoint";
+							targetarg = 0;
+						}
+						break;
+				}
+
+				// Try to reconnect path...
+				if(!string.IsNullOrEmpty(targetclass) && targetarg > -1)
+				{
+					General.Map.Map.EndAddRemove(); // We'll need to unlock the things array...
+
+					foreach(Thing other in General.Map.Map.Things)
+					{
+						if(other.Index == t.Index)
+							continue;
+						info = General.Map.Data.GetThingInfo(other.Type);
+						if(info.ClassName.ToLowerInvariant() == targetclass && other.Args[targetarg] == t.Tag)
+						{
+							other.Move(other.Position); //hacky way to call BeforePropsChange()...
+							other.Args[targetarg] = t.Args[targetarg];
+							break;
+						}
+					}
+
+					General.Map.Map.BeginAddRemove(); // We'll need to lock it again...
+				}
+
+				// Get rid of the thing
+				t.Dispose();
+			}
+
+			General.Map.Map.EndAddRemove(); //mxd
+		}
+		
+		#endregion
+
+		#region ================== Events (mxd)
+
+		//mxd
+		private void thingEditForm_OnValuesChanged(object sender, EventArgs e) 
+		{
+			// Update things filter
+			General.Map.ThingsFilter.Update();
+
+			// Update entire display
+			General.Interface.RedrawDisplay();
+		}
+
+		#endregion
+
+		#region ================== Actions
+
+		[BeginAction("placevisualstart")]
+		public void PlaceVisualStartThing()
+		{
+			Thing thingfound = null;
+			
+			// Not during volatile mode
+			if(this.Attributes.Volatile) return;
+			
+			// Mouse must be inside window
+			if(!mouseinside) return;
+			
+			General.Interface.DisplayStatus(StatusType.Action, "Placed Visual Mode camera start thing.");
+			
+			// Go for all things
+			List<Thing> things = new List<Thing>(General.Map.Map.Things);
+			foreach(Thing t in things)
+			{
+				if(t.Type == General.Map.Config.Start3DModeThingType)
+				{
+					if(thingfound == null)
+					{
+						// Move this thing
+						t.Move(mousemappos);
+						thingfound = t;
+					}
+					else
+					{
+						// One was already found and moved, delete this one
+						t.Dispose();
+					}
+				}
+			}
+			
+			// No thing found?
+			if(thingfound == null)
+			{
+				// Make a new one
+				Thing t = General.Map.Map.CreateThing();
+				if(t != null)
+				{
+					t.Type = General.Map.Config.Start3DModeThingType;
+					t.Move(mousemappos);
+					t.UpdateConfiguration();
+					General.Map.ThingsFilter.Update();
+					thingfound = t;
+				}
+			}
+
+			if(thingfound != null)
+			{
+				// Make sure that the found thing is between ceiling and floor
+				thingfound.DetermineSector();
+				if(thingfound.Position.z < 0.0f) thingfound.Move(thingfound.Position.x, thingfound.Position.y, 0.0f);
+				if(thingfound.Sector != null)
+				{
+					if((thingfound.Position.z + 50.0f) > (thingfound.Sector.CeilHeight - thingfound.Sector.FloorHeight))
+						thingfound.Move(thingfound.Position.x, thingfound.Position.y,
+							thingfound.Sector.CeilHeight - thingfound.Sector.FloorHeight - 50.0f);
+				}
+			}
+			
+			// Update Visual Mode camera
+			General.Map.VisualCamera.PositionAtThing();
+			
+			// Redraw display to show changes
+			General.Interface.RedrawDisplay();
+		}
+
+		//mxd
+		[BeginAction("classicpaintselect")]
+		protected virtual void OnPaintSelectBegin() 
+		{
+			paintselectpressed = true;
+		}
+
+		//mxd
+		[EndAction("classicpaintselect")]
+		protected virtual void OnPaintSelectEnd() 
+		{
+			paintselectpressed = false;
+		}
+
+		//mxd
+		[BeginAction("togglehighlight")]
+		public void ToggleHighlight() 
+		{
+			BuilderPlug.Me.UseHighlight = !BuilderPlug.Me.UseHighlight;
+			General.Interface.DisplayStatus(StatusType.Action, "Highlight is now " + (BuilderPlug.Me.UseHighlight ? "ON" : "OFF") + ".");
+
+			// Redraw display to show changes
+			General.Interface.RedrawDisplay();
+		}
+
+		//mxd
+		[BeginAction("syncedthingedit")]
+		public void ToggleSyncronizedThingsEdit()
+		{
+			BuilderPlug.Me.SyncronizeThingEdit = !BuilderPlug.Me.SyncronizeThingEdit;
+			General.Interface.DisplayStatus(StatusType.Info, (BuilderPlug.Me.SyncronizeThingEdit ?
+				"Things editing is SYNCRONIZED" :
+				"Things editing is not syncronized"));
+
+			// Update interface
+			BuilderPlug.Me.MenusForm.SyncronizeThingEditButton.Checked = BuilderPlug.Me.SyncronizeThingEdit;
+			BuilderPlug.Me.MenusForm.SyncronizeThingEditLinedefsItem.Checked = BuilderPlug.Me.SyncronizeThingEdit;
+			BuilderPlug.Me.MenusForm.SyncronizeThingEditSectorsItem.Checked = BuilderPlug.Me.SyncronizeThingEdit;
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ClassicModes/BlockMapMode.cs b/Source/Plugins/BuilderModes/ClassicModes/BlockMapMode.cs
new file mode 100644
index 0000000..b16586d
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ClassicModes/BlockMapMode.cs
@@ -0,0 +1,229 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Text;
+using System.Windows.Forms;
+using System.IO;
+using System.Reflection;
+using CodeImp.DoomBuilder.Windows;
+using CodeImp.DoomBuilder.IO;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Editing;
+using System.Drawing;
+using CodeImp.DoomBuilder.Actions;
+using CodeImp.DoomBuilder.Data;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[EditMode(DisplayName = "BlockMap Mode",
+			  SwitchAction = "blockmapmode",
+			  ButtonImage = "Blockmap.png",
+			  ButtonOrder = 400,
+			  ButtonGroup = "002_tools",
+			  AllowCopyPaste = false,
+			  UseByDefault = true,
+			  SafeStartMode = true)]
+
+	public sealed class BlockMapMode : BaseClassicMode
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		private BlockMap<BlockEntry> blockmap;
+		private BlockEntry highlighted;
+		private int hx, hy;
+
+		#endregion
+
+		#region ================== Properties
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public BlockMapMode()
+		{
+		}
+
+		// Disposer
+		public override void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Dispose base
+				base.Dispose();
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+		
+		#endregion
+
+		#region ================== Events
+
+		// Mode engages
+		public override void OnEngage()
+		{
+			base.OnEngage();
+
+			// Nothing highlighted
+			highlighted = null;
+			hx = -1;
+			hy = -1;
+			
+			// Custom presentation to hide the grid
+			CustomPresentation p = new CustomPresentation();
+			p.AddLayer(new PresentLayer(RendererLayer.Background, BlendingMode.Mask, General.Settings.BackgroundAlpha));
+			p.AddLayer(new PresentLayer(RendererLayer.Surface, BlendingMode.Mask));
+			p.AddLayer(new PresentLayer(RendererLayer.Overlay, BlendingMode.Alpha, 1f, true));
+			p.AddLayer(new PresentLayer(RendererLayer.Things, BlendingMode.Alpha, 1.0f));
+			p.AddLayer(new PresentLayer(RendererLayer.Geometry, BlendingMode.Alpha, 1f, true));
+			renderer.SetPresentation(p);
+			
+			// Make the blockmap
+			RectangleF area = MapSet.CreateArea(General.Map.Map.Vertices);
+			area = MapSet.IncreaseArea(area, General.Map.Map.Things);
+			blockmap = new BlockMap<BlockEntry>(area);
+			blockmap.AddLinedefsSet(General.Map.Map.Linedefs);
+			blockmap.AddSectorsSet(General.Map.Map.Sectors);
+			blockmap.AddThingsSet(General.Map.Map.Things);
+		}
+
+		// When disengaged
+		public override void OnDisengage()
+		{
+			base.OnDisengage();
+
+		}
+
+		// This redraws the display
+		public override void OnRedrawDisplay()
+		{
+			renderer.RedrawSurface();
+			
+			// Render lines and vertices
+			if(renderer.StartPlotter(true))
+			{
+				renderer.PlotLinedefSet(General.Map.Map.Linedefs);
+				
+				if(highlighted != null)
+				{
+					foreach(Linedef l in highlighted.Lines)
+					{
+						renderer.PlotLinedef(l, General.Colors.Highlight);
+					}
+				}
+
+				renderer.PlotVerticesSet(General.Map.Map.Vertices);
+				renderer.Finish();
+			}
+
+			// Render things
+			if(renderer.StartThings(true))
+			{
+				renderer.RenderThingSet(General.Map.ThingsFilter.HiddenThings, Presentation.THINGS_HIDDEN_ALPHA);
+				renderer.RenderThingSet(General.Map.ThingsFilter.VisibleThings, 1.0f);
+
+				if(highlighted != null)
+				{
+					foreach(Thing t in highlighted.Things)
+					{
+						renderer.RenderThing(t, General.Colors.Highlight, 1.0f);
+					}
+				}
+
+				renderer.Finish();
+			}
+
+			// Render blocks
+			if(renderer.StartOverlay(true))
+			{
+				for(int x = 0; x <= blockmap.Size.Width; x++)
+				{
+					Vector2D v1 = new Vector2D(blockmap.Range.X + (float)x * blockmap.BlockSize, blockmap.Range.Y);
+					Vector2D v2 = new Vector2D(v1.x, blockmap.Range.Y + blockmap.Size.Height * blockmap.BlockSize);
+					renderer.RenderLine(v1, v2, 2.0f, General.Colors.Selection, true);
+				}
+				
+				for(int y = 0; y <= blockmap.Size.Height; y++)
+				{
+					Vector2D v1 = new Vector2D(blockmap.Range.X, blockmap.Range.Y + (float)y * blockmap.BlockSize);
+					Vector2D v2 = new Vector2D(blockmap.Range.X + blockmap.Size.Width * blockmap.BlockSize, v1.y);
+					renderer.RenderLine(v1, v2, 2.0f, General.Colors.Selection, true);
+				}
+
+				if((hx > -1) && (hy > -1))
+				{
+					Vector2D v1 = new Vector2D(blockmap.Range.X + (float)hx * blockmap.BlockSize, blockmap.Range.Y + (float)hy * blockmap.BlockSize);
+					Vector2D v2 = new Vector2D(blockmap.Range.X + (float)(hx + 1) * blockmap.BlockSize, blockmap.Range.Y + (float)(hy + 1) * blockmap.BlockSize);
+					renderer.RenderRectangle(new RectangleF(v1.x, v1.y, v2.x - v1.x, v2.y - v1.y), 2.0f, General.Colors.Highlight, true);
+				}
+
+				renderer.Finish();
+			}
+			
+			renderer.Present();
+		}
+
+		// Mouse moves over display
+		public override void OnMouseMove(MouseEventArgs e)
+		{
+			base.OnMouseMove(e);
+
+			BlockEntry newhighlight = null;
+			hx = -1;
+			hy = -1;
+			
+			// Determine highlighted block
+			float nhx = (mousemappos.x - blockmap.Range.Left) / (float)blockmap.BlockSize;
+			float nhy = (mousemappos.y - blockmap.Range.Top) / (float)blockmap.BlockSize;
+			if((nhx < (float)blockmap.Size.Width) && (nhy < (float)blockmap.Size.Height) && (nhx >= 0.0f) && (nhy >= 0.0f))
+			{
+				newhighlight = blockmap.GetBlockAt(mousemappos);
+				if(newhighlight != null)
+				{
+					hx = (int)nhx;
+					hy = (int)nhy;
+				}
+			}
+			
+			if(newhighlight != highlighted)
+			{
+				highlighted = newhighlight;
+				General.Interface.RedrawDisplay();
+			}
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ClassicModes/BridgeMode.cs b/Source/Plugins/BuilderModes/ClassicModes/BridgeMode.cs
new file mode 100644
index 0000000..5778929
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ClassicModes/BridgeMode.cs
@@ -0,0 +1,891 @@
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Editing;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Actions;
+using CodeImp.DoomBuilder.Windows;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.BuilderModes.Interface;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes.ClassicModes 
+{
+	[EditMode(DisplayName = "Bridge Mode",
+			  SwitchAction = "bridgemode",
+			  ButtonImage = "BridgeMode.png",
+			  ButtonOrder = 2,
+			  ButtonGroup = "002_modify",
+			  AllowCopyPaste = false,
+			  Volatile = true,
+			  Optional = false)]
+
+	public class BridgeMode : BaseClassicMode
+	{
+		#region ================== Constants
+
+		private const float GRIP_SIZE = 9.0f;
+		private const float LINE_THICKNESS = 0.8f;
+
+		internal const int MAX_SUBDIVISIONS = 32;
+		internal const int MIN_SUBDIVISIONS = 0;
+
+		#endregion
+
+		#region ================== Variables
+
+		private Vector2D[] pointGroup1;
+		private Vector2D[] pointGroup2;
+
+		private SectorProperties[] sectorProps1;
+		private SectorProperties[] sectorProps2;
+
+		private float[] relLenGroup1;
+		private float[] relLenGroup2;
+
+		private ControlHandle[] controlHandles;
+		private int curControlHandle = -1;
+
+		private PixelColor handleColor;
+
+		private List<Vector2D[]> curves;
+		private int segmentsCount;
+
+		// Options
+		private bool snaptogrid; // SHIFT to toggle
+
+		//tools form
+		private BridgeModeForm form;
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		public BridgeMode() 
+		{
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// Engaging
+		public override void OnEngage() 
+		{
+			base.OnEngage();
+
+			renderer.SetPresentation(Presentation.Standard);
+			
+			//check selection
+			ICollection<Linedef> selection = General.Map.Map.GetSelectedLinedefs(true);
+
+			List<Line> lines = new List<Line>();
+			foreach(Linedef ld in selection) 
+			{
+				Line l = new Line(ld);
+				lines.Add(l);
+			}
+
+			//do we have valid selection?
+			if(!Setup(lines)) 
+			{
+				FinishDraw();
+				return;
+			}
+
+			//show form
+			form = new BridgeModeForm();
+			form.OnCancelClick += form_OnCancelClick;
+			form.OnOkClick += form_OnOkClick;
+			form.OnFlipClick += form_OnFlipClick;
+			form.OnSubdivisionChanged += form_OnSubdivisionChanged;
+			form.Show(General.Interface);
+			General.Interface.FocusDisplay();
+
+			handleColor = General.Colors.BrightColors[new Random().Next(General.Colors.BrightColors.Length - 1)];
+			Update();
+		}
+
+		// When select button is pressed
+		protected override void OnSelectBegin() 
+		{
+			base.OnSelectBegin();
+
+			//check if control handle is selected
+			for(int i = 0; i < 4; i++) 
+			{
+				if(mousemappos.x <= controlHandles[i].Position.x + GRIP_SIZE 
+					&& mousemappos.x >= controlHandles[i].Position.x - GRIP_SIZE 
+					&& mousemappos.y <= controlHandles[i].Position.y + GRIP_SIZE 
+					&& mousemappos.y >= controlHandles[i].Position.y - GRIP_SIZE) 
+				{
+					curControlHandle = i;
+					General.Interface.SetCursor(Cursors.Cross);
+					return;
+				}
+			}
+			curControlHandle = -1;
+		}
+
+		// When select button is released
+		protected override void OnSelectEnd() 
+		{
+			base.OnSelectEnd();
+			General.Interface.SetCursor(Cursors.Default);
+			curControlHandle = -1;
+		}
+
+		// Mouse moves
+		public override void OnMouseMove(MouseEventArgs e) 
+		{
+			base.OnMouseMove(e);
+			if(panning) return; //mxd. Skip all this jass while panning
+
+			if(curControlHandle != -1) 
+			{
+				ControlHandle handle = controlHandles[curControlHandle];
+				
+				handle.Position = (snaptogrid ? General.Map.Grid.SnappedToGrid(mousemappos) : mousemappos);
+
+				if(form.MirrorMode) 
+				{
+					Vector2D pos = handle.RelativePosition;
+					//handle angle
+					float angle = (float)Math.Atan2(-pos.y, -pos.x) + Angle2D.PIHALF;
+					//angle of line, connecting handles ControlledPoints
+					float dirAngle = -(float)Math.Atan2(handle.Pair.ControlledPoint.y - handle.ControlledPoint.y, handle.Pair.ControlledPoint.x - handle.ControlledPoint.x); 
+					float length = (float)Math.Sqrt(Math.Pow(Math.Abs(pos.x), 2.0) + Math.Pow(Math.Abs(pos.y), 2.0));
+					float mirroredAngle = angle + dirAngle * 2.0f;
+
+					handle.Pair.RelativePosition = new Vector2D((float)Math.Sin(mirroredAngle) * length, (float)Math.Cos(mirroredAngle) * length);
+				} 
+				else if(form.CopyMode) 
+				{
+					handle.Pair.RelativePosition = handle.RelativePosition;
+				}    
+				Update();
+			}
+		}
+
+		// Accepted
+		public override void OnAccept() 
+		{
+			Cursor.Current = Cursors.AppStarting;
+			General.Settings.FindDefaultDrawSettings();
+
+			//get vertices
+			List<List<Vector2D[]>> shapes = GetShapes();
+			List<List<List<DrawnVertex>>> drawShapes = new List<List<List<DrawnVertex>>>();
+
+			//set stitch range
+			float stitchrange = BuilderPlug.Me.StitchRange;
+			BuilderPlug.Me.StitchRange = 0.1f;
+
+			for(int i = 0; i < shapes.Count; i++) 
+			{
+				List<List<DrawnVertex>> shapesRow = new List<List<DrawnVertex>>();
+				for(int c = 0; c < shapes[i].Count; c++) 
+				{
+					List<DrawnVertex> points = new List<DrawnVertex>();
+					for(int p = 0; p < shapes[i][c].Length; p++)
+						points.Add(DrawGeometryMode.GetCurrentPosition(shapes[i][c][p], true, false, false, renderer, points));
+					shapesRow.Add(points);
+				}
+				drawShapes.Add(shapesRow);
+			}
+
+			//restore stitch range
+			BuilderPlug.Me.StitchRange = stitchrange;
+
+			//draw lines
+			if(drawShapes.Count > 0) 
+			{
+				// Make undo for the draw
+				General.Map.UndoRedo.CreateUndo("Bridge ("+form.Subdivisions+" subdivisions)");
+
+				List<List<SectorProperties>> sectorProps = new List<List<SectorProperties>>();
+				List<List<List<Sector>>> newSectors = new List<List<List<Sector>>>();
+				
+				//create sector properties collection
+				//sector row
+				for(int i = 0; i < drawShapes.Count; i++) 
+				{
+					sectorProps.Add(new List<SectorProperties>());
+					
+					//sector in row
+					for(int c = 0; c < drawShapes[i].Count; c++)
+						sectorProps[i].Add(GetSectorProperties(i, c));
+				}
+
+				// Make the drawing
+				//sector row
+				for(int i = 0; i < drawShapes.Count; i++) 
+				{
+					newSectors.Add(new List<List<Sector>>());
+
+					//sector in row
+					for(int c = 0; c < drawShapes[i].Count; c++) 
+					{
+						if(!Tools.DrawLines(drawShapes[i][c], false, true)) 
+						{
+							// Drawing failed
+							// NOTE: I have to call this twice, because the first time only cancels this volatile mode
+							General.Interface.DisplayStatus(StatusType.Warning, "Failed to create a Bezier Path...");
+							General.Map.UndoRedo.WithdrawUndo();
+							General.Map.UndoRedo.WithdrawUndo();
+							return;
+						}
+
+						List<Sector> newsectors = General.Map.Map.GetMarkedSectors(true);
+						newSectors[i].Add(newsectors);
+
+						//set floor/ceiling heights and brightness
+						foreach(Sector s in newsectors) 
+						{
+							SectorProperties sp = sectorProps[i][c];
+							s.Brightness = sp.Brightness;
+							s.FloorHeight = sp.FloorHeight;
+							s.CeilHeight = (sp.CeilingHeight < sp.FloorHeight ? sp.FloorHeight + 8 : sp.CeilingHeight);
+						}
+					}
+				}
+
+				//apply textures
+				//sector row
+				for(int i = 0; i < newSectors.Count; i++) 
+				{
+					//sector in row
+					for(int c = 0; c < newSectors[i].Count; c++) 
+					{
+						foreach(Sector s in newSectors[i][c]) 
+						{
+							foreach(Sidedef sd in s.Sidedefs)
+							{
+								if(sd.LowRequired())
+									sd.SetTextureLow(sectorProps[i][c].LowTexture);
+								if(sd.HighRequired())
+									sd.SetTextureHigh(sectorProps[i][c].HighTexture);    
+							}
+						}
+					}
+				}
+
+				//apply textures to front/back sides of shape
+				//sector row
+				for(int i = 0; i < newSectors.Count; i++) 
+				{
+					//first/last sector in row
+					for(int c = 0; c < newSectors[i].Count; c += newSectors[i].Count-1) 
+					{
+						foreach(Sector s in newSectors[i][c]) 
+						{
+							foreach(Sidedef sd in s.Sidedefs) 
+							{
+								if(sd.Other != null) 
+								{
+									if(sd.Other.LowRequired() && sd.Other.LowTexture == "-")
+										sd.Other.SetTextureLow(sectorProps[i][c].LowTexture);
+									if(sd.Other.HighRequired() && sd.Other.HighTexture == "-")
+										sd.Other.SetTextureHigh(sectorProps[i][c].HighTexture);
+								}
+							}
+						}
+					}
+				}
+
+				General.Interface.DisplayStatus(StatusType.Action, "Created a Bridge with " + form.Subdivisions + " subdivisions.");
+
+				// Snap to map format accuracy
+				General.Map.Map.SnapAllToAccuracy();
+
+				// Clear selection
+				General.Map.Map.ClearAllSelected();
+
+				// Update cached values
+				General.Map.Map.Update();
+
+				// Update the used textures
+				General.Map.Data.UpdateUsedTextures();
+
+				// Map is changed
+				General.Map.IsChanged = true;
+			}
+
+			//close form
+			if(form != null) form.Close();
+
+			// Done
+			Cursor.Current = Cursors.Default;
+
+			// Return to original mode
+			General.Editing.ChangeMode(General.Editing.PreviousStableMode.Name);
+		}
+
+		// Cancelled
+		public override void OnCancel() 
+		{
+			// Cancel base class
+			base.OnCancel();
+
+			//close form
+			if(form != null) form.Dispose();
+
+			// Return to original mode
+			General.Editing.ChangeMode(General.Editing.PreviousStableMode.Name);
+		}
+
+		// When a key is released
+		public override void OnKeyUp(KeyEventArgs e) 
+		{
+			base.OnKeyUp(e);
+			if(snaptogrid != (General.Interface.ShiftState ^ General.Interface.SnapToGrid)) Update();
+		}
+
+		// When a key is pressed
+		public override void OnKeyDown(KeyEventArgs e) 
+		{
+			base.OnKeyDown(e);
+			if(snaptogrid != (General.Interface.ShiftState ^ General.Interface.SnapToGrid)) Update();
+		}
+
+		// This redraws the display
+		public override void OnRedrawDisplay() 
+		{
+			renderer.RedrawSurface();
+
+			// Render lines
+			if(renderer.StartPlotter(true)) 
+			{
+				renderer.PlotLinedefSet(General.Map.Map.Linedefs);
+				renderer.PlotVerticesSet(General.Map.Map.Vertices);
+				renderer.Finish();
+			}
+
+			// Render things
+			if(renderer.StartThings(true)) 
+			{
+				renderer.RenderThingSet(General.Map.Map.Things, Presentation.THINGS_ALPHA);
+				renderer.Finish();
+			}
+
+			// Normal update
+			Update();
+		}
+
+		public override void OnHelp() 
+		{
+			General.ShowHelp("/gzdb/features/classic_modes/mode_drawbridge.html");
+		}
+
+		#endregion
+
+		#region ================== Setup/Update/Utility
+
+		//this checks if initial data is valid
+		private bool Setup(List<Line> lines) 
+		{
+			if(!SetupPointGroups(lines)) return false;
+
+			//setup control handles
+			Vector2D center1 = CurveTools.GetPointOnLine(pointGroup1[0], pointGroup1[segmentsCount - 1], 0.5f);
+			Vector2D center2 = CurveTools.GetPointOnLine(pointGroup2[0], pointGroup2[segmentsCount - 1], 0.5f);
+
+			Vector2D loc1 = GetHandleLocation(pointGroup1[0], pointGroup1[segmentsCount - 1], center2);
+			Vector2D loc2 = GetHandleLocation(pointGroup2[0], pointGroup2[segmentsCount - 1], center1);
+
+			ControlHandle ch1 = new ControlHandle {ControlledPoint = pointGroup1[0], RelativePosition = loc1};
+			ControlHandle ch2 = new ControlHandle {ControlledPoint = pointGroup2[0], RelativePosition = loc2};
+			ControlHandle ch3 = new ControlHandle {ControlledPoint = pointGroup1[segmentsCount - 1], RelativePosition = loc1};
+			ControlHandle ch4 = new ControlHandle {ControlledPoint = pointGroup2[segmentsCount - 1], RelativePosition = loc2};
+
+			ch1.Pair = ch3;
+			ch2.Pair = ch4;
+			ch3.Pair = ch1;
+			ch4.Pair = ch2;
+
+			controlHandles = new[] {ch1, ch2, ch3, ch4};
+
+			//setup relative segments lengths
+			relLenGroup1 = GetRelativeLengths(pointGroup1);
+			relLenGroup2 = GetRelativeLengths(pointGroup2);
+
+			return true;
+		}
+
+		private void Update() 
+		{
+			if(renderer.StartOverlay(true)) 
+			{
+				snaptogrid = General.Interface.ShiftState ^ General.Interface.SnapToGrid;
+				
+				PixelColor linesColor = snaptogrid ? General.Colors.Selection : General.Colors.Highlight;
+				
+				//draw curves
+				curves = new List<Vector2D[]>();
+
+				for(int i = 0; i < segmentsCount; i++) 
+				{
+					Vector2D cp1 = CurveTools.GetPointOnLine(controlHandles[0].Position, controlHandles[2].Position, relLenGroup1[i]);
+					Vector2D cp2 = CurveTools.GetPointOnLine(controlHandles[1].Position, controlHandles[3].Position, relLenGroup2[i]);
+					curves.Add(CurveTools.GetCubicCurve(pointGroup1[i], pointGroup2[i], cp1, cp2, form.Subdivisions));
+
+					for(int c = 1; c < curves[i].Length; c++)
+						renderer.RenderLine(curves[i][c - 1], curves[i][c], LINE_THICKNESS, linesColor, true);
+				}
+
+				//draw connecting lines
+				if(form.Subdivisions > 1) 
+				{
+					for(int i = 1; i < segmentsCount; i++) 
+					{
+						for(int c = 1; c < form.Subdivisions; c++) 
+						{
+							renderer.RenderLine(curves[i-1][c], curves[i][c], LINE_THICKNESS, linesColor, true);
+						}
+					}
+				}
+
+				//draw vertices
+				float vsize = (renderer.VertexSize + 1.0f) / renderer.Scale;
+
+				foreach(Vector2D[] points in curves)
+				{
+					for(int i = 1; i < points.Length - 1; i++ ) 
+					{
+						renderer.RenderRectangleFilled(new RectangleF(points[i].x - vsize, points[i].y - vsize, vsize * 2.0f, vsize * 2.0f), linesColor, true);
+					}
+				}
+
+				//draw handle lines
+				renderer.RenderLine(pointGroup1[0], controlHandles[0].Position, LINE_THICKNESS, handleColor, true);
+				renderer.RenderLine(pointGroup2[0], controlHandles[1].Position, LINE_THICKNESS, handleColor, true);
+				renderer.RenderLine(pointGroup1[segmentsCount - 1], controlHandles[2].Position, LINE_THICKNESS, handleColor, true);
+				renderer.RenderLine(pointGroup2[segmentsCount - 1], controlHandles[3].Position, LINE_THICKNESS, handleColor, true);
+
+				//draw handles
+				float gripsize = GRIP_SIZE / renderer.Scale;
+
+				for(int i = 0; i < 4; i++) 
+				{
+					RectangleF handleRect = new RectangleF(controlHandles[i].Position.x - gripsize * 0.5f, controlHandles[i].Position.y - gripsize * 0.5f, gripsize, gripsize);
+					renderer.RenderRectangleFilled(handleRect, General.Colors.Background, true);
+					renderer.RenderRectangle(handleRect, 2, General.Colors.Highlight, true);
+				}
+				renderer.Finish();
+			}
+			renderer.Present();
+		}
+
+		private SectorProperties GetSectorProperties(int lineIndex, int sectorIndex) 
+		{
+			float delta = sectorIndex / (float)form.Subdivisions;
+			delta += (1.0f - delta) / form.Subdivisions;
+			SectorProperties sp = new SectorProperties();
+
+			sp.Brightness = IntepolateValue(sectorProps1[lineIndex].Brightness, sectorProps2[lineIndex].Brightness, delta, form.BrightnessMode);
+			sp.FloorHeight = IntepolateValue(sectorProps1[lineIndex].FloorHeight, sectorProps2[lineIndex].FloorHeight, delta, form.FloorAlignMode);
+			sp.CeilingHeight = IntepolateValue(sectorProps1[lineIndex].CeilingHeight, sectorProps2[lineIndex].CeilingHeight, delta, form.CeilingAlignMode);
+
+			//textures
+			sp.LowTexture = sectorProps1[lineIndex].LowTexture != "-" ? sectorProps1[lineIndex].LowTexture : sectorProps2[lineIndex].LowTexture;
+			sp.HighTexture = sectorProps1[lineIndex].HighTexture != "-" ? sectorProps1[lineIndex].HighTexture : sectorProps2[lineIndex].HighTexture;
+
+			return sp;
+		}
+
+		//this returns a list of shapes to draw
+		private List<List<Vector2D[]>> GetShapes() 
+		{
+			List<List<Vector2D[]>> shapes = new List<List<Vector2D[]>>();
+
+			for(int i = 1; i < segmentsCount; i++) 
+			{
+				List<Vector2D[]> segShapes = new List<Vector2D[]>();
+
+				for(int c = 1; c <= form.Subdivisions; c++) 
+				{
+					Vector2D p0 = curves[i - 1][c - 1];
+					Vector2D p1 = curves[i - 1][c];
+					Vector2D p2 = curves[i][c];
+					Vector2D p3 = curves[i][c - 1];
+					segShapes.Add(new[] { p0, p1, p2, p3, p0 });
+				}
+				shapes.Add(segShapes);
+			}
+
+			return shapes;
+		}
+
+		#endregion
+
+		#region ================== Point ops
+
+		//this returns an array of linedef lengths relative to total segment length
+		private float[] GetRelativeLengths(Vector2D[] pointGroup) 
+		{
+			float[] relLenGroup = new float[pointGroup.Length];
+			relLenGroup[0] = 0.0f;
+
+			//get length and angle of line, which defines the shape
+			float length = Vector2D.Distance(pointGroup[0], pointGroup[segmentsCount - 1]);
+			float angle = (float)Math.Atan2(pointGroup[0].y - pointGroup[segmentsCount - 1].y, pointGroup[0].x - pointGroup[segmentsCount - 1].x);
+
+			//get relative length of every line
+			for(int i = 1; i < pointGroup.Length - 1; i++) 
+			{
+				Vector2D p0 = pointGroup[i - 1];
+				Vector2D p1 = pointGroup[i];
+				float curAngle = (float)Math.Atan2(p0.y - p1.y, p0.x - p1.x);
+				float diff = (angle + Angle2D.PI) - (curAngle + Angle2D.PI);
+				float segLen = (int)(Vector2D.Distance(p0, p1) * Math.Cos(diff));
+				relLenGroup[i] = relLenGroup[i - 1] + segLen / length;
+			}
+
+			relLenGroup[pointGroup.Length - 1] = 1.0f;
+
+			return relLenGroup;
+		}
+
+		//this returns relative handle location
+		private static Vector2D GetHandleLocation(Vector2D start, Vector2D end, Vector2D direction) 
+		{
+			float angle = -(float)Math.Atan2(start.y - end.y, start.x - end.x);
+			float dirAngle = -(float)Math.Atan2(direction.y - start.y, direction.x - start.x);
+			float length = (float)Math.Sqrt(Math.Pow(Math.Abs(start.x - end.x), 2.0) + Math.Pow(Math.Abs(start.y - end.y), 2.0)) * 0.3f;
+			float diff = (angle + Angle2D.PI) - (dirAngle + Angle2D.PI);
+
+			if(diff > Angle2D.PI || (diff < 0 && diff > -Angle2D.PI)) angle += Angle2D.PI;
+
+			return new Vector2D((float)(Math.Sin(angle) * length), (float)(Math.Cos(angle) * length));
+		}
+
+//LINE DRAWING
+		//returns true if 2 lines intersect
+		private static bool LinesIntersect(Line line1, Line line2) 
+		{
+			float zn = (line2.End.y - line2.Start.y) * (line1.End.x - line1.Start.x) - (line2.End.x - line2.Start.x) * (line1.End.y - line1.Start.y);
+			float ch1 = (line2.End.x - line2.Start.x) * (line1.Start.y - line2.Start.y) - (line2.End.y - line2.Start.y) * (line1.Start.x - line2.Start.x);
+			float ch2 = (line1.End.x - line1.Start.x) * (line1.Start.y - line2.Start.y) - (line1.End.y - line1.Start.y) * (line1.Start.x - line2.Start.x);
+
+			if(zn == 0) return false;
+			return (ch1 / zn <= 1 && ch1 / zn >= 0) && (ch2 / zn <= 1 && ch2 / zn >= 0);
+		}
+
+		#endregion
+
+		#region ================== Line sorting
+
+		//this gets two arrays of connected points from given lines. Returns true if all went well.
+		private bool SetupPointGroups(List<Line> linesList) 
+		{
+			//find prev/next lines for each line
+			for(int i = 0; i < linesList.Count; i++) 
+			{
+				Line curLine = linesList[i];
+
+				for(int c = 0; c < linesList.Count; c++) 
+				{
+					if(c != i) //don't wanna play with ourselves :)
+					{
+						Line line = linesList[c];
+
+						//check start and end points
+						if(curLine.Start == line.Start) 
+						{
+							line.Invert();
+							curLine.Previous = line;
+						} 
+						else if(curLine.Start == line.End) 
+						{
+							curLine.Previous = line;
+						} 
+						else if(curLine.End == line.End) 
+						{
+							line.Invert();
+							curLine.Next = line;
+						} 
+						else if(curLine.End == line.Start) 
+						{
+							curLine.Next = line;
+						}
+					}
+				}
+			}
+
+			List<List<Vector2D>> pointGroups = new List<List<Vector2D>>();
+			List<List<Line>> sortedLines = new List<List<Line>>();
+
+			//now find start lines
+			for(int i = 0; i < linesList.Count; i++) 
+			{
+				Line curLine = linesList[i];
+
+				if(curLine.Previous == null) //found start
+				{ 
+					//collect points
+					Line l = curLine;
+					List<Vector2D> points = new List<Vector2D>();
+					List<Line> lines = new List<Line>();
+					points.Add(l.Start);
+
+					do 
+					{
+						points.Add(l.End);
+						lines.Add(l);
+					} while((l = l.Next) != null);
+
+					pointGroups.Add(points);
+					sortedLines.Add(lines);
+				}
+			}
+
+			if(pointGroups.Count != 2) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "Incorrect number of linedef groups! Expected 2, but got " + pointGroups.Count);
+				return false;
+			}
+
+			if(pointGroups[0].Count != pointGroups[1].Count) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "Linedefs groups must have equal length! Got " + pointGroups[0].Count + " in first group and " + pointGroups[1].Count + " in second.");
+				return false;
+			}
+
+			//check if lines from first group intersect with lines from second group
+			foreach(Line l1 in sortedLines[0]) 
+			{
+				foreach(Line l2 in sortedLines[1]) 
+				{
+					if(LinesIntersect(l1, l2)) 
+					{
+						General.Interface.DisplayStatus(StatusType.Warning, "One or more lines from first group intersect with one or more lines from second group!");
+						return false;
+					}
+				}
+			}
+
+			//both groups count should match at this point
+			segmentsCount = pointGroups[0].Count;
+
+			//collect sector properties
+			sectorProps1 = new SectorProperties[sortedLines[0].Count];
+			for(int i = 0; i < sortedLines[0].Count; i++ ) 
+			{
+				sectorProps1[i] = sortedLines[0][i].SectorProperties;
+			}
+			sectorProps2 = new SectorProperties[sortedLines[1].Count];
+			for(int i = 0; i < sortedLines[1].Count; i++) 
+			{
+				sectorProps2[i] = sortedLines[1][i].SectorProperties;
+			}
+
+			//check if we need to reverse one of point groups
+			Line line1 = new Line(pointGroups[0][0], pointGroups[1][0]);
+			Line line2 = new Line(pointGroups[0][segmentsCount - 1], pointGroups[1][segmentsCount - 1]);
+
+			if(LinesIntersect(line1, line2)) 
+			{
+				pointGroups[0].Reverse();
+				Array.Reverse(sectorProps1);
+			}
+
+			//fill point groups
+			pointGroup1 = new Vector2D[segmentsCount];
+			pointGroup2 = new Vector2D[segmentsCount];
+
+			pointGroups[0].CopyTo(pointGroup1);
+			pointGroups[1].CopyTo(pointGroup2);
+
+			return true;
+		}
+
+		#endregion
+
+		#region ================== Easing functions
+
+		private static int IntepolateValue(int val1, int val2, float delta, string mode) 
+		{
+			switch(mode) 
+			{
+				case BridgeInterpolationMode.HIGHEST:
+				case BridgeInterpolationMode.BRIGHTNESS_HIGHEST:
+					return Math.Max(val1, val2);
+
+				case BridgeInterpolationMode.LOWEST:
+				case BridgeInterpolationMode.BRIGHTNESS_LOWEST:
+					return Math.Min(val1, val2);
+				
+				case BridgeInterpolationMode.LINEAR:
+					return InterpolationTools.Linear(val1, val2, delta);
+
+				case BridgeInterpolationMode.IN_SINE:
+					return InterpolationTools.EaseInSine(val1, val2, delta);
+
+				case BridgeInterpolationMode.OUT_SINE:
+					return InterpolationTools.EaseOutSine(val1, val2, delta);
+
+				case BridgeInterpolationMode.IN_OUT_SINE:
+					return InterpolationTools.EaseInOutSine(val1, val2, delta);
+
+				default:
+					throw new Exception("DrawBezierPathMode.IntepolateValue: '" + mode + "' mode is not supported!");
+			}
+		}
+
+		#endregion
+
+		#region ================== Events
+
+		private void form_OnSubdivisionChanged(object sender, EventArgs e) 
+		{
+			Update();
+		}
+
+		private void form_OnOkClick(object sender, EventArgs e) 
+		{
+			FinishDraw();
+		}
+
+		private void form_OnCancelClick(object sender, EventArgs e) 
+		{
+			OnCancel();
+		}
+
+		private void form_OnFlipClick(object sender, EventArgs e) 
+		{
+			Array.Reverse(pointGroup1);
+			Array.Reverse(sectorProps1);
+			
+			//swap handles position
+			Vector2D p = controlHandles[0].Position;
+			controlHandles[0].Position = controlHandles[2].Position;
+			controlHandles[2].Position = p;
+
+			Update();
+		}
+
+		#endregion
+
+		#region ================== Actions
+
+		// Finish drawing
+		[BeginAction("finishdraw")]
+		private void FinishDraw() 
+		{
+			// Accept the changes
+			General.Editing.AcceptMode();
+		}
+
+		[BeginAction("increasesubdivlevel")]
+		private void IncreaseSubdivLevel() 
+		{
+			if(form != null && form.Subdivisions < MAX_SUBDIVISIONS) form.Subdivisions++;
+		}
+
+		[BeginAction("decreasesubdivlevel")]
+		private void DecreaseSubdivLevel() 
+		{
+			if(form != null && form.Subdivisions > MIN_SUBDIVISIONS) form.Subdivisions--;
+		}
+
+		#endregion
+	}
+
+	#region ================== Helper classes
+
+	internal struct SectorProperties 
+	{
+		public int FloorHeight;
+		public int CeilingHeight;
+		public int Brightness;
+		public string HighTexture;
+		public string LowTexture;
+	}
+
+	internal class ControlHandle
+	{
+		public Vector2D Position;
+		public Vector2D ControlledPoint; //point, to which this handle is assigned
+		public Vector2D RelativePosition 
+		{
+			get 
+			{
+				return new Vector2D(Position.x - ControlledPoint.x, Position.y - ControlledPoint.y);
+			}
+			set 
+			{
+				Position = new Vector2D(ControlledPoint.x + value.x, ControlledPoint.y + value.y);
+			}
+		}
+		public ControlHandle Pair; //second handle, to which this handle is paired
+	}
+
+	internal class Line 
+	{
+		public Vector2D Start { get { return start; } }
+		private Vector2D start;
+
+		public Vector2D End { get { return end; } }
+		private Vector2D end;
+		
+		public SectorProperties SectorProperties;
+
+		public Line Previous;
+		public Line Next;
+
+		public Line(Linedef ld) 
+		{
+			start = new Vector2D((int)ld.Start.Position.x, (int)ld.Start.Position.y);
+			end = new Vector2D((int)ld.End.Position.x, (int)ld.End.Position.y);
+			SectorProperties = new SectorProperties();
+
+			if(ld.Back != null) 
+			{
+				SectorProperties.CeilingHeight = ld.Back.Sector.CeilHeight;
+				SectorProperties.FloorHeight = ld.Back.Sector.FloorHeight;
+				SectorProperties.Brightness = ld.Back.Sector.Brightness;
+				SectorProperties.HighTexture = ld.Back.HighTexture != "-" ? ld.Back.HighTexture : ld.Back.MiddleTexture;
+				SectorProperties.LowTexture = ld.Back.LowTexture != "-" ? ld.Back.LowTexture : ld.Back.MiddleTexture;
+			}
+			else if(ld.Front != null)
+			{
+				SectorProperties.CeilingHeight = ld.Front.Sector.CeilHeight;
+				SectorProperties.FloorHeight = ld.Front.Sector.FloorHeight;
+				SectorProperties.Brightness = ld.Front.Sector.Brightness;
+				SectorProperties.HighTexture = ld.Front.HighTexture != "-" ? ld.Front.HighTexture : ld.Front.MiddleTexture;
+				SectorProperties.LowTexture = ld.Front.LowTexture != "-" ? ld.Front.LowTexture : ld.Front.MiddleTexture;
+			}
+			else
+			{
+				SectorProperties.CeilingHeight = 128;
+				SectorProperties.FloorHeight = 0;
+				SectorProperties.Brightness = 192;
+				SectorProperties.HighTexture = "-";
+				SectorProperties.LowTexture = "-";
+			}
+		}
+
+		public Line(Vector2D start, Vector2D end) 
+		{
+			this.start = start;
+			this.end = end;
+		}
+
+		public void Invert() 
+		{
+			Vector2D s = start;
+			start = end;
+			end = s;
+		}
+	}
+
+	#endregion
+}
diff --git a/Source/Plugins/BuilderModes/ClassicModes/CeilingAlignMode.cs b/Source/Plugins/BuilderModes/ClassicModes/CeilingAlignMode.cs
new file mode 100644
index 0000000..50fb3ab
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ClassicModes/CeilingAlignMode.cs
@@ -0,0 +1,71 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using CodeImp.DoomBuilder.Data;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Editing;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[EditMode(DisplayName = "Ceiling Align Mode",
+			  SwitchAction = "ceilingalignmode",
+			  ButtonImage = "CeilingAlign.png",
+			  ButtonOrder = int.MinValue + 311,
+			  ButtonGroup = "000_editing",
+			  UseByDefault = true, //mxd
+			  SupportedMapFormats = new[] { "UniversalMapSetIO" }, //mxd
+			  Volatile = true)]
+
+	public class CeilingAlignMode : FlatAlignMode
+	{
+		#region ================== Properties
+
+		protected override string XScaleName { get { return "xscaleceiling"; } }
+		protected override string YScaleName { get { return "yscaleceiling"; } }
+		protected override string XOffsetName { get { return "xpanningceiling"; } }
+		protected override string YOffsetName { get { return "ypanningceiling"; } }
+		protected override string RotationName { get { return "rotationceiling"; } }
+		protected override string UndoDescription { get { return "Ceiling Alignment"; } }
+		
+		#endregion
+
+		#region ================== Methods
+
+		// Get the texture data to align
+		protected override ImageData GetTexture(Sector editsector)
+		{
+			return General.Map.Data.GetFlatImage(editsector.LongCeilTexture);
+		}
+
+		#endregion
+
+		#region ================== Events
+
+		// Mode engages
+		public override void OnEngage()
+		{
+			base.OnEngage();
+			General.Actions.InvokeAction("builder_viewmodeceilings");
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ClassicModes/CurveLinedefsMode.cs b/Source/Plugins/BuilderModes/ClassicModes/CurveLinedefsMode.cs
new file mode 100644
index 0000000..94f5ebd
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ClassicModes/CurveLinedefsMode.cs
@@ -0,0 +1,285 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Editing;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[EditMode(DisplayName = "Curve Linedefs",
+			  AllowCopyPaste = false,
+			  Volatile = true)]
+	public sealed class CurveLinedefsMode : BaseClassicMode
+	{
+		#region ================== Constants
+
+		private const float LINE_THICKNESS = 0.6f;
+
+		#endregion
+
+		#region ================== Variables
+
+		// Collections
+		private ICollection<Linedef> selectedlines;
+		private ICollection<Linedef> unselectedlines;
+		
+		#endregion
+
+		#region ================== Properties
+
+		// Just keep the base mode button checked
+		public override string EditModeButtonName { get { return General.Editing.PreviousStableMode.Name; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public CurveLinedefsMode(EditMode basemode)
+		{
+			// Make collections by selection
+			selectedlines = General.Map.Map.GetSelectedLinedefs(true);
+			unselectedlines = General.Map.Map.GetSelectedLinedefs(false);
+		}
+		
+		// Disposer
+		public override void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Clean up
+
+				// Done
+				base.Dispose();
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This generates the vertices to split the line with, from start to end
+		private static List<Vector2D> GenerateCurve(Linedef line)
+		{
+			// Fetch settings from window
+			int vertices = BuilderPlug.Me.CurveLinedefsForm.Vertices;
+			float distance = BuilderPlug.Me.CurveLinedefsForm.Distance;
+			float angle = BuilderPlug.Me.CurveLinedefsForm.Angle;
+			bool fixedcurve = BuilderPlug.Me.CurveLinedefsForm.FixedCurve;
+			bool backwards = BuilderPlug.Me.CurveLinedefsForm.Backwards;
+
+			// Make list
+			List<Vector2D> points = new List<Vector2D>(vertices);
+
+			//Added by Anders Åstrand 2008-05-18
+			//The formulas used are taken from http://mathworld.wolfram.com/CircularSegment.html
+			//c and theta are known (length of line and angle parameter). d, R and h are
+			//calculated from those two
+			//If the curve is not supposed to be a circular segment it's simply deformed to fit
+			//the value set for distance.
+
+			//The vertices are generated to be evenly distributed (by angle) along the curve
+			//and lastly they are rotated and moved to fit with the original line
+
+			//calculate some identities of a circle segment (refer to the graph in the url above)
+			float c = line.Length;
+			float theta = angle;
+
+			float d = (c / (float)Math.Tan(theta / 2)) / 2;
+			float R = d / (float)Math.Cos(theta / 2);
+			float h = R - d;
+
+			float yDeform = fixedcurve ? 1 : distance / h;
+			if(backwards) yDeform = -yDeform;
+
+			for(int v = 1; v <= vertices; v++)
+			{
+				//calculate the angle for this vertex
+				//the curve starts at PI/2 - theta/2 and is segmented into vertices+1 segments
+				//this assumes the line is horisontal and on y = 0, the point is rotated and moved later
+
+				float a = (Angle2D.PI - theta) / 2 + v * (theta / (vertices + 1));
+
+				//calculate the coordinates of the point, and distort the y coordinate
+				//using the deform factor calculated above
+				float x = (float)Math.Cos(a) * R;
+				float y = ((float)Math.Sin(a) * R - d) * yDeform;
+
+				//rotate and transform to fit original line
+				Vector2D vertex = new Vector2D(x, y).GetRotated(line.Angle + Angle2D.PIHALF);
+				vertex = vertex.GetTransformed(line.GetCenterPoint().x, line.GetCenterPoint().y, 1, 1);
+
+				points.Add(vertex);
+			}
+
+
+			// Done
+			return points;
+		}
+		
+		#endregion
+		
+		#region ================== Events
+
+		public override void OnHelp()
+		{
+			General.ShowHelp("e_curvelinedefs.html");
+		}
+
+		// Cancelled
+		public override void OnCancel()
+		{
+			// Cancel base class
+			base.OnCancel();
+
+			// Return to base mode
+			General.Editing.ChangeMode(General.Editing.PreviousStableMode.Name);
+		}
+
+		// Mode engages
+		public override void OnEngage()
+		{
+			base.OnEngage();
+			renderer.SetPresentation(Presentation.Standard);
+			
+			// Show toolbox window
+			BuilderPlug.Me.CurveLinedefsForm.Show((Form)General.Interface);
+		}
+
+		// Disenagaging
+		public override void OnDisengage()
+		{
+			base.OnDisengage();
+
+			// Hide toolbox window
+			BuilderPlug.Me.CurveLinedefsForm.Hide();
+		}
+
+		// This applies the curves and returns to the base mode
+		public override void OnAccept()
+		{
+			// Create undo
+			General.Map.UndoRedo.CreateUndo("Curve linedefs");
+			
+			// Go for all selected lines
+			foreach(Linedef ld in selectedlines)
+			{
+				// Make curve for line
+				List<Vector2D> points = GenerateCurve(ld);
+				if(points.Count > 0)
+				{
+					// TODO: We may want some sector create/join code in here
+					// to allow curves that overlap lines and some geometry merging
+
+					// Go for all points to split the line
+					Linedef splitline = ld;
+					for(int i = 0; i < points.Count; i++)
+					{
+						// Make vertex
+						Vertex v = General.Map.Map.CreateVertex(points[i]);
+						if(v == null)
+						{
+							General.Map.UndoRedo.WithdrawUndo();
+							return;
+						}
+						
+						// Split the line and move on with this line
+						splitline = splitline.Split(v);
+						if(splitline == null)
+						{
+							General.Map.UndoRedo.WithdrawUndo();
+							return;
+						}
+					}
+				}
+			}
+
+			// Snap to map format accuracy
+			General.Map.Map.SnapAllToAccuracy();
+			
+			// Update caches
+			General.Map.Map.Update();
+			General.Map.IsChanged = true;
+			
+			// Return to base mode
+			General.Editing.ChangeMode(General.Editing.PreviousStableMode.Name);
+		}
+
+		// Redrawing display
+		public override void OnRedrawDisplay()
+		{
+			renderer.RedrawSurface();
+
+			// Render lines
+			if(renderer.StartPlotter(true))
+			{
+				renderer.PlotLinedefSet(unselectedlines);
+				renderer.PlotVerticesSet(General.Map.Map.Vertices);
+				renderer.Finish();
+			}
+
+			// Render things
+			if(renderer.StartThings(true))
+			{
+				renderer.RenderThingSet(General.Map.Map.Things, Presentation.THINGS_ALPHA);
+				renderer.Finish();
+			}
+
+			// Render overlay
+			if(renderer.StartOverlay(true))
+			{
+				// Go for all selected lines
+				foreach(Linedef ld in selectedlines)
+				{
+					// Make curve for line
+					List<Vector2D> points = GenerateCurve(ld);
+					if(points.Count > 0)
+					{
+						Vector2D p1 = ld.Start.Position;
+						Vector2D p2 = points[0];
+						for(int i = 1; i <= points.Count; i++)
+						{
+							// Draw the line
+							renderer.RenderLine(p1, p2, LINE_THICKNESS, General.Colors.Highlight, true);
+
+							// Next points
+							p1 = p2;
+							if(i < points.Count) p2 = points[i];
+						}
+
+						// Draw last line
+						renderer.RenderLine(p2, ld.End.Position, LINE_THICKNESS, General.Colors.Highlight, true);
+					}
+				}
+				renderer.Finish();
+			}
+
+			renderer.Present();
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ClassicModes/DragGeometryMode.cs b/Source/Plugins/BuilderModes/ClassicModes/DragGeometryMode.cs
new file mode 100644
index 0000000..0e37ec2
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ClassicModes/DragGeometryMode.cs
@@ -0,0 +1,617 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Data;
+using CodeImp.DoomBuilder.Types;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	public abstract class DragGeometryMode : BaseClassicMode
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+		
+		// Mouse position on map where dragging started
+		private Vector2D dragstartmappos;
+
+		//mxd. Offset from nearest grid intersection to dragstartmappos
+		private Vector2D dragstartoffset;
+
+		// Item used as reference for snapping to the grid
+		protected Vertex dragitem;
+		private Vector2D dragitemposition;
+
+		// List of old vertex positions
+		private List<Vector2D> oldpositions;
+		private List<Vector2D> oldthingpositions; //mxd
+
+		// List of selected items
+		protected ICollection<Vertex> selectedverts;
+		protected ICollection<Thing> selectedthings; //mxd
+
+		// List of non-selected items
+		protected ICollection<Vertex> unselectedverts;
+		protected ICollection<Thing> unselectedthings; //mxd
+
+		// List of things, which should be moved
+		private ICollection<Thing> thingstodrag; //mxd
+
+		//mxd. List of sectors
+		private List<Sector> selectedsectors;
+
+		// List of unstable lines
+		protected ICollection<Linedef> unstablelines;
+		
+		// List of unselected lines
+		protected ICollection<Linedef> snaptolines;
+		
+		// Text labels for all unstable lines
+		protected LineLengthLabel[] labels;
+
+		//mxd. Undo description
+		protected string undodescription = "Drag geometry";
+		
+		// Keep track of view changes
+		private float lastoffsetx;
+		private float lastoffsety;
+		private float lastscale;
+		
+		// Options
+		private bool snaptogrid;		// SHIFT to toggle
+		private bool snaptonearest;		// CTRL to enable
+		private bool snaptogridincrement; //mxd. ALT to toggle 
+		private bool snaptocardinaldirection; //mxd. ALT-SHIFT to enable
+
+		#endregion
+
+		#region ================== Properties
+
+		// Just keep the base mode button checked
+		public override string EditModeButtonName { get { return General.Editing.PreviousStableMode.Name; } }
+		
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Disposer
+		public override void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Clean up
+				if(labels != null)
+					foreach(LineLengthLabel l in labels) l.Dispose();
+				
+				// Done
+				base.Dispose();
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// Constructor to start dragging immediately
+		protected void StartDrag(Vector2D dragstartmappos)
+		{
+			// Initialize
+			this.dragstartmappos = dragstartmappos;
+			
+			Cursor.Current = Cursors.AppStarting;
+			
+			// We don't want to record this for undoing while we move the geometry around.
+			// This will be set back to normal when we're done.
+			General.Map.UndoRedo.IgnorePropChanges = true;
+
+			// Make list of selected vertices and things
+			selectedverts = General.Map.Map.GetMarkedVertices(true);
+			selectedthings = General.Map.Map.GetSelectedThings(true); //mxd
+			thingstodrag = (BuilderPlug.Me.SyncronizeThingEdit ? selectedthings : new List<Thing>()); //mxd
+
+			// Make list of non-selected vertices and things
+			// Non-selected vertices will be used for snapping to nearest items
+			unselectedverts = General.Map.Map.GetMarkedVertices(false);
+			unselectedthings = new List<Thing>(); //mxd
+			foreach(Thing t in General.Map.ThingsFilter.VisibleThings) if(!t.Selected) unselectedthings.Add(t);
+
+			// Get the nearest vertex for snapping
+			dragitem = MapSet.NearestVertex(selectedverts, dragstartmappos);
+
+			//mxd. Get drag offset
+			dragstartoffset = General.Map.Grid.SnappedToGrid(dragitem.Position) - dragitem.Position;
+			
+			// Lines to snap to
+			snaptolines = General.Map.Map.LinedefsFromMarkedVertices(true, false, false);
+			
+			// Make old positions list
+			// We will use this as reference to move the vertices, or to move them back on cancel
+			oldpositions = new List<Vector2D>(selectedverts.Count);
+			foreach(Vertex v in selectedverts) oldpositions.Add(v.Position);
+
+			//mxd
+			oldthingpositions = new List<Vector2D>(thingstodrag.Count);
+			foreach(Thing t in thingstodrag) oldthingpositions.Add(t.Position);
+
+			// Also keep old position of the dragged item
+			dragitemposition = dragitem.Position;
+
+			// Keep view information
+			lastoffsetx = renderer.OffsetX;
+			lastoffsety = renderer.OffsetY;
+			lastscale = renderer.Scale;
+
+			// Make list of unstable lines only
+			// These will have their length displayed during the drag
+			unstablelines = MapSet.UnstableLinedefsFromVertices(selectedverts);
+
+			//mxd. Collect selected sectors
+			if(General.Map.UDMF) 
+			{
+				ICollection<Linedef> selectedLines = General.Map.Map.LinedefsFromMarkedVertices(false, true, false);
+				List<Sector> affectedSectors = new List<Sector>();
+				foreach(Linedef l in selectedLines) 
+				{
+					if(l.Front != null && l.Front.Sector != null && !affectedSectors.Contains(l.Front.Sector))
+						affectedSectors.Add(l.Front.Sector);
+					if(l.Back != null && l.Back.Sector != null && !affectedSectors.Contains(l.Back.Sector))
+						affectedSectors.Add(l.Back.Sector);
+				}
+
+				selectedsectors = new List<Sector>();
+				foreach(Sector s in affectedSectors) 
+				{
+					bool selected = true;
+					foreach(Sidedef side in s.Sidedefs) 
+					{
+						if(!selectedLines.Contains(side.Line)) 
+						{
+							selected = false;
+							break;
+						}
+					}
+
+					if(selected) selectedsectors.Add(s);
+				}
+			}
+
+			// Make text labels
+			labels = new LineLengthLabel[unstablelines.Count];
+			int index = 0;
+			foreach(Linedef l in unstablelines)
+				labels[index++] = new LineLengthLabel(l.Start.Position, l.End.Position);
+			
+			Cursor.Current = Cursors.Default;
+		}
+
+		// This moves the selected geometry relatively
+		// Returns true when geometry has actually moved
+		private bool MoveGeometryRelative(Vector2D offset, bool snapgrid, bool snapgridincrement, bool snapnearest, bool snapcardinal)
+		{
+			//mxd. If snap to cardinal directions is enabled, modify the offset
+			if(snapcardinal)
+			{
+				float angle = Angle2D.DegToRad((General.ClampAngle((int)Angle2D.RadToDeg(offset.GetAngle()) + 44)) / 90 * 90);
+				offset = new Vector2D(0, -offset.GetLength()).GetRotated(angle);
+				snapgridincrement = true; // We don't want to move the geometry away from the cardinal directions
+			}
+			
+			Vector2D oldpos = dragitem.Position;
+			Vector2D anchorpos = dragitemposition + offset;
+			Vector2D tl, br;
+
+			// don't move if the offset contains invalid data
+			if(!offset.IsFinite()) return false;
+
+			// Find the outmost vertices
+			tl = br = oldpositions[0];
+			for(int i = 0; i < oldpositions.Count; i++)
+			{
+				if(oldpositions[i].x < tl.x) tl.x = (int)oldpositions[i].x;
+				if(oldpositions[i].x > br.x) br.x = (int)oldpositions[i].x;
+				if(oldpositions[i].y > tl.y) tl.y = (int)oldpositions[i].y;
+				if(oldpositions[i].y < br.y) br.y = (int)oldpositions[i].y;
+			}
+			
+			// Snap to nearest?
+			if(snapnearest)
+			{
+				// Find nearest unselected vertex within range
+				Vertex nv = MapSet.NearestVertexSquareRange(unselectedverts, anchorpos, BuilderPlug.Me.StitchRange / renderer.Scale);
+				if(nv != null)
+				{
+					// Move the dragged item
+					dragitem.Move(nv.Position);
+
+					// Adjust the offset
+					offset = nv.Position - dragitemposition;
+
+					// Do not snap to grid!
+					snapgrid = false;
+					snaptogridincrement = false; //mxd
+				}
+				else
+				{
+					// Find the nearest unselected line within range
+					Linedef nl = MapSet.NearestLinedefRange(snaptolines, anchorpos, BuilderPlug.Me.StitchRange / renderer.Scale);
+					if(nl != null)
+					{
+						// Snap to grid?
+						if(snapgrid || snapgridincrement)
+						{
+							// Get grid intersection coordinates
+							List<Vector2D> coords = nl.GetGridIntersections(snapgridincrement ? dragstartoffset : new Vector2D());
+
+							// mxd. Do the rest only if we actually have some coordinates
+							if(coords.Count > 0) 
+							{
+								// Find nearest grid intersection
+								float found_distance = float.MaxValue;
+								Vector2D found_coord = new Vector2D();
+
+								foreach(Vector2D v in coords) 
+								{
+									Vector2D delta = anchorpos - v;
+									if(delta.GetLengthSq() < found_distance) 
+									{
+										found_distance = delta.GetLengthSq();
+										found_coord = v;
+									}
+								}
+
+								// Move the dragged item
+								dragitem.Move(found_coord);
+
+								// Align to line here
+								offset = found_coord - dragitemposition;
+
+								// Do not snap to grid anymore
+								snapgrid = false;
+								snapgridincrement = false; //mxd
+							}
+						}
+						else
+						{
+							// Move the dragged item
+							dragitem.Move(nl.NearestOnLine(anchorpos));
+
+							// Align to line here
+							offset = nl.NearestOnLine(anchorpos) - dragitemposition;
+						}
+					}
+				}
+			}
+
+			// Snap to grid or grid increment?
+			if(snapgrid || snapgridincrement)
+			{
+				// Move the dragged item
+				dragitem.Move(anchorpos);
+
+				// Snap item to grid increment
+				if(snapgridincrement) //mxd
+				{
+					dragitem.Move(General.Map.Grid.SnappedToGrid(dragitem.Position) - dragstartoffset);
+				}
+				else // Or to the grid itself
+				{
+					dragitem.SnapToGrid();
+				}
+
+				// Adjust the offset
+				offset += dragitem.Position - anchorpos;
+			}
+
+			// Make sure the offset is inside the map boundaries
+			if(offset.x + tl.x < General.Map.Config.LeftBoundary) offset.x = General.Map.Config.LeftBoundary - tl.x;
+			if(offset.x + br.x > General.Map.Config.RightBoundary) offset.x = General.Map.Config.RightBoundary - br.x;
+			if(offset.y + tl.y > General.Map.Config.TopBoundary) offset.y = General.Map.Config.TopBoundary - tl.y;
+			if(offset.y + br.y < General.Map.Config.BottomBoundary) offset.y = General.Map.Config.BottomBoundary - br.y;
+
+			// Drag item moved?
+			if((!snapgrid && !snapgridincrement) || (dragitem.Position != oldpos))
+			{
+				int i = 0;
+
+				// Move selected geometry
+				foreach(Vertex v in selectedverts)
+				{
+					// Move vertex from old position relative to the mouse position change since drag start
+					v.Move(oldpositions[i++] + offset);
+				}
+
+				//mxd. Move selected things
+				i = 0;
+				foreach(Thing t in thingstodrag) 
+				{
+					t.Move(oldthingpositions[i++] + offset);
+				}
+
+				// Update labels
+				int index = 0;
+				foreach(Linedef l in unstablelines)
+					labels[index++].Move(l.Start.Position, l.End.Position);
+
+				// Moved
+				return true;
+			}
+
+			// No changes
+			return false;
+		}
+
+		// Cancelled
+		public override void OnCancel()
+		{
+			// Move geometry back to original position
+			MoveGeometryRelative(new Vector2D(0f, 0f), false, false, false, false);
+			
+			// Resume normal undo/redo recording
+			General.Map.UndoRedo.IgnorePropChanges = false;
+
+			// If only a single vertex was selected, deselect it now
+			if(selectedverts.Count == 1) General.Map.Map.ClearSelectedVertices();
+			
+			// Update cached values
+			General.Map.Map.Update();
+			
+			// Cancel base class
+			base.OnCancel();
+			
+			// Return to vertices mode
+			General.Editing.ChangeMode(General.Editing.PreviousStableMode.Name);
+		}
+
+		// Mode engages
+		public override void OnEngage()
+		{
+			base.OnEngage();
+			EnableAutoPanning();
+			renderer.SetPresentation(Presentation.Standard);
+		}
+		
+		// Disenagaging
+		public override void OnDisengage()
+		{
+			base.OnDisengage();
+			DisableAutoPanning();
+			
+			// When not cancelled
+			if(!cancelled)
+			{
+				Cursor.Current = Cursors.AppStarting;
+				
+				// Move geometry back to original position
+				MoveGeometryRelative(new Vector2D(0f, 0f), false, false, false, false);
+
+				// Resume normal undo/redo recording
+				General.Map.UndoRedo.IgnorePropChanges = false;
+
+				// Make undo for the dragging
+				General.Map.UndoRedo.CreateUndo(undodescription);
+
+				// Move selected geometry to final position
+				MoveGeometryRelative(mousemappos - dragstartmappos, snaptogrid, snaptogridincrement, snaptonearest, snaptocardinaldirection);
+
+				// Stitch geometry
+				if(snaptonearest) General.Map.Map.StitchGeometry();
+
+				// Make corrections for backward linedefs
+				MapSet.FlipBackwardLinedefs(General.Map.Map.Linedefs);
+				
+				// Snap to map format accuracy
+				General.Map.Map.SnapAllToAccuracy();
+
+				//mxd. Update floor/ceiling texture offsets and slopes?
+				if(General.Map.UDMF) 
+				{
+					Vector2D offset = dragitem.Position - dragitemposition;
+					
+					// Update floor/ceiling texture offsets?
+					if(BuilderPlug.Me.LockSectorTextureOffsetsWhileDragging)
+					{
+						foreach(Sector s in selectedsectors) 
+						{
+							s.Fields.BeforeFieldsChange();
+
+							// Update ceiling offset
+							if(s.LongCeilTexture != MapSet.EmptyLongName) 
+							{
+								ImageData texture = General.Map.Data.GetFlatImage(s.CeilTexture);
+
+								if(texture != null) 
+								{
+									float scalex = s.Fields.GetValue("xscaleceiling", 1.0f);
+									float scaley = s.Fields.GetValue("yscaleceiling", 1.0f);
+
+									if(scalex != 0 && scaley != 0) 
+									{
+										Vector2D ceiloffset = new Vector2D(-offset.x, offset.y).GetRotated(-Angle2D.DegToRad((int)s.Fields.GetValue("rotationceiling", 0f)));
+										ceiloffset.x += s.Fields.GetValue("xpanningceiling", 0f);
+										ceiloffset.y += s.Fields.GetValue("ypanningceiling", 0f);
+
+										int texturewidth = (int)Math.Round(texture.Width / scalex);
+										int textureheight = (int)Math.Round(texture.Height / scaley);
+
+										if(!s.Fields.ContainsKey("xpanningceiling")) s.Fields.Add("xpanningceiling", new UniValue(UniversalType.Float, (float)Math.Round(ceiloffset.x % texturewidth)));
+										else s.Fields["xpanningceiling"].Value = (float)Math.Round(ceiloffset.x % texturewidth);
+
+										if(!s.Fields.ContainsKey("ypanningceiling")) s.Fields.Add("ypanningceiling", new UniValue(UniversalType.Float, (float)Math.Round(ceiloffset.y % textureheight)));
+										else s.Fields["ypanningceiling"].Value = (float)Math.Round(ceiloffset.y % textureheight);
+									}
+								}
+							}
+
+							// Update floor offset
+							if(s.LongFloorTexture != MapSet.EmptyLongName) 
+							{
+								ImageData texture = General.Map.Data.GetFlatImage(s.FloorTexture);
+								if(texture != null) 
+								{
+									float scalex = s.Fields.GetValue("xscalefloor", 1.0f);
+									float scaley = s.Fields.GetValue("yscalefloor", 1.0f);
+
+									if(scalex != 0 && scaley != 0) 
+									{
+										Vector2D flooroffset = new Vector2D(-offset.x, offset.y).GetRotated(-Angle2D.DegToRad((int)s.Fields.GetValue("rotationfloor", 0f)));
+										flooroffset.x += s.Fields.GetValue("xpanningfloor", 0f);
+										flooroffset.y += s.Fields.GetValue("ypanningfloor", 0f);
+
+										int texturewidth = (int)Math.Round(texture.Width / scalex);
+										int textureheight = (int)Math.Round(texture.Height / scaley);
+
+										if(!s.Fields.ContainsKey("xpanningfloor")) s.Fields.Add("xpanningfloor", new UniValue(UniversalType.Float, (float)Math.Round(flooroffset.x % texturewidth)));
+										else s.Fields["xpanningfloor"].Value = (float)Math.Round(flooroffset.x % texturewidth);
+
+										if(!s.Fields.ContainsKey("ypanningfloor")) s.Fields.Add("ypanningfloor", new UniValue(UniversalType.Float, (float)Math.Round(flooroffset.y % textureheight)));
+										else s.Fields["ypanningfloor"].Value = (float)Math.Round(flooroffset.y % textureheight);
+									}
+								}
+							}
+						}
+					}
+
+					// Update slopes
+					foreach(Sector s in selectedsectors) 
+					{
+						// Update floor slope?
+						if(s.FloorSlope.GetLengthSq() > 0 && !float.IsNaN(s.FloorSlopeOffset / s.FloorSlope.z)) 
+						{
+							Plane floor = new Plane(s.FloorSlope, s.FloorSlopeOffset);
+							Vector2D center = new Vector2D(s.BBox.X + s.BBox.Width / 2, s.BBox.Y + s.BBox.Height / 2);
+							s.FloorSlopeOffset = -Vector3D.DotProduct(s.FloorSlope, new Vector3D(center + offset, floor.GetZ(center)));
+						}
+
+						// Update ceiling slope?
+						if(s.CeilSlope.GetLengthSq() > 0 && !float.IsNaN(s.CeilSlopeOffset / s.CeilSlope.z)) 
+						{
+							Plane ceiling = new Plane(s.CeilSlope, s.CeilSlopeOffset);
+							Vector2D center = new Vector2D(s.BBox.X + s.BBox.Width / 2, s.BBox.Y + s.BBox.Height / 2);
+							s.CeilSlopeOffset = -Vector3D.DotProduct(s.CeilSlope, new Vector3D(center + offset, ceiling.GetZ(center)));
+						}
+					}
+				}
+				
+				// Update cached values
+				General.Map.Map.Update();
+
+				// Done
+				Cursor.Current = Cursors.Default;
+				General.Map.IsChanged = true;
+			}
+		}
+
+		// This checks if the view offset/zoom changed and updates the check
+		protected bool CheckViewChanged()
+		{
+			// View changed?
+			bool viewchanged = (renderer.OffsetX != lastoffsetx || renderer.OffsetY != lastoffsety || renderer.Scale != lastscale);
+
+			// Keep view information
+			lastoffsetx = renderer.OffsetX;
+			lastoffsety = renderer.OffsetY;
+			lastscale = renderer.Scale;
+
+			// Return result
+			return viewchanged;
+		}
+
+		// This updates the dragging
+		private void Update()
+		{
+			snaptocardinaldirection = (General.Interface.ShiftState && General.Interface.AltState); //mxd
+			snaptogrid = (snaptocardinaldirection || General.Interface.ShiftState ^ General.Interface.SnapToGrid);
+			snaptonearest = General.Interface.CtrlState ^ General.Interface.AutoMerge;
+			snaptogridincrement = (!snaptocardinaldirection && General.Interface.AltState); //mxd
+			
+			// Move selected geometry
+			if(MoveGeometryRelative(mousemappos - dragstartmappos, snaptogrid, snaptogridincrement, snaptonearest, snaptocardinaldirection))
+			{
+				// Update cached values
+				General.Map.Map.Update(true, false);
+
+				// Redraw
+				UpdateRedraw();
+				renderer.Present();
+			}
+		}
+
+		// This redraws only the required things
+		protected virtual void UpdateRedraw() { }
+
+		// When edit button is released
+		protected override void OnEditEnd()
+		{
+			// Just return to base mode, Disengage will be called automatically.
+			General.Editing.ChangeMode(General.Editing.PreviousStableMode.Name);
+
+			base.OnEditEnd();
+		}
+		
+		// Mouse moving
+		public override void OnMouseMove(MouseEventArgs e)
+		{
+			base.OnMouseMove(e);
+
+			//mxd. Skip most of update jazz while panning
+			if(panning)
+			{
+				// Update labels
+				int index = 0;
+				foreach(Linedef l in unstablelines)
+					labels[index++].Move(l.Start.Position, l.End.Position);
+			}
+			else
+			{
+				Update();
+			}
+		}
+		// When a key is released
+		public override void OnKeyUp(KeyEventArgs e)
+		{
+			base.OnKeyUp(e);
+			if((snaptogrid != (General.Interface.ShiftState ^ General.Interface.SnapToGrid)) ||
+			   (snaptonearest != (General.Interface.CtrlState ^ General.Interface.AutoMerge)) ||
+			   (snaptogridincrement != General.Interface.AltState) ||
+			   (snaptocardinaldirection != (General.Interface.AltState && General.Interface.ShiftState))) Update();
+		}
+
+		// When a key is pressed
+		public override void OnKeyDown(KeyEventArgs e)
+		{
+			base.OnKeyDown(e);
+			if((snaptogrid != (General.Interface.ShiftState ^ General.Interface.SnapToGrid)) ||
+			   (snaptonearest != (General.Interface.CtrlState ^ General.Interface.AutoMerge)) ||
+			   (snaptogridincrement != General.Interface.AltState) ||
+			   (snaptocardinaldirection != (General.Interface.AltState && General.Interface.ShiftState))) Update();
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ClassicModes/DragLinedefsMode.cs b/Source/Plugins/BuilderModes/ClassicModes/DragLinedefsMode.cs
new file mode 100644
index 0000000..fc0406d
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ClassicModes/DragLinedefsMode.cs
@@ -0,0 +1,181 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Editing;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	// No action or button for this mode, it is automatic.
+	// The EditMode attribute does not have to be specified unless the
+	// mode must be activated by class name rather than direct instance.
+	// In that case, just specifying the attribute like this is enough:
+	// [EditMode]
+
+	[EditMode(DisplayName = "Linedefs",
+			  AllowCopyPaste = false,
+			  Volatile = true)]
+	
+	public sealed class DragLinedefsMode : DragGeometryMode
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		private ICollection<Linedef> selectedlines;
+		private ICollection<Linedef> unselectedlines;
+
+		#endregion
+
+		#region ================== Properties
+		
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor to start dragging immediately
+		public DragLinedefsMode(Vector2D dragstartmappos)
+		{
+			// Mark what we are dragging
+			General.Map.Map.ClearAllMarks(false);
+			General.Map.Map.MarkSelectedLinedefs(true, true);
+			ICollection<Vertex> verts = General.Map.Map.GetVerticesFromLinesMarks(true);
+			foreach(Vertex v in verts) v.Marked = true;
+			
+			// Get line collections
+			selectedlines = General.Map.Map.GetSelectedLinedefs(true);
+			unselectedlines = General.Map.Map.GetSelectedLinedefs(false);
+
+			// Initialize
+			base.StartDrag(dragstartmappos);
+			undodescription = (selectedlines.Count == 1 ? "Drag linedef" : "Drag " + selectedlines.Count + " linedefs"); //mxd
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Disposer
+		public override void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Clean up
+
+				// Done
+				base.Dispose();
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+		
+		// Disenagaging
+		public override void OnDisengage()
+		{
+			// Select vertices from lines selection
+			General.Map.Map.ClearSelectedVertices();
+			ICollection<Vertex> verts = General.Map.Map.GetVerticesFromLinesMarks(true);
+			foreach(Vertex v in verts) v.Selected = true;
+
+			// Perform normal disengage
+			base.OnDisengage();
+
+			// Clear vertex selection
+			General.Map.Map.ClearSelectedVertices();
+			
+			// When not cancelled
+			if(!cancelled)
+			{
+				// If only a single linedef was selected, deselect it now
+				if(selectedlines.Count == 1) General.Map.Map.ClearSelectedLinedefs();
+			}
+		}
+
+		// This redraws the display
+		public override void OnRedrawDisplay()
+		{
+			renderer.RedrawSurface();
+
+			UpdateRedraw();
+
+			if(CheckViewChanged())
+			{
+				// Start rendering things
+				if(renderer.StartThings(true))
+				{
+					renderer.RenderThingSet(General.Map.Map.Things, Presentation.THINGS_ALPHA);
+					renderer.Finish();
+				}
+			}
+
+			renderer.Present();
+		}
+
+		// This redraws only the required things
+		protected override void UpdateRedraw()
+		{
+			// Start rendering structure
+			if(renderer.StartPlotter(true))
+			{
+				// Render lines and vertices
+				renderer.PlotLinedefSet(unselectedlines);
+				renderer.PlotLinedefSet(selectedlines);
+				renderer.PlotVerticesSet(General.Map.Map.Vertices);
+
+				// Draw the dragged item highlighted
+				// This is important to know, because this item is used
+				// for snapping to the grid and snapping to nearest items
+				renderer.PlotVertex(dragitem, ColorCollection.HIGHLIGHT);
+
+				// Done
+				renderer.Finish();
+			}
+
+			//mxd. Render things
+			if(renderer.StartThings(true)) 
+			{
+				renderer.RenderThingSet(General.Map.ThingsFilter.HiddenThings, Presentation.THINGS_HIDDEN_ALPHA);
+				renderer.RenderThingSet(unselectedthings, Presentation.THINGS_ALPHA);
+				renderer.RenderThingSet(selectedthings, Presentation.THINGS_ALPHA);
+				renderer.Finish();
+			}
+
+			// Redraw overlay
+			if(renderer.StartOverlay(true))
+			{
+				foreach(LineLengthLabel l in labels)
+				{
+					renderer.RenderText(l.TextLabel);
+				}
+				renderer.Finish();
+			}
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ClassicModes/DragSectorsMode.cs b/Source/Plugins/BuilderModes/ClassicModes/DragSectorsMode.cs
new file mode 100644
index 0000000..d0f035c
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ClassicModes/DragSectorsMode.cs
@@ -0,0 +1,201 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Editing;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	// No action or button for this mode, it is automatic.
+	// The EditMode attribute does not have to be specified unless the
+	// mode must be activated by class name rather than direct instance.
+	// In that case, just specifying the attribute like this is enough:
+	// [EditMode]
+
+	[EditMode(DisplayName = "Sectors",
+			  AllowCopyPaste = false,
+			  Volatile = true)]
+
+	public sealed class DragSectorsMode : DragGeometryMode
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		private ICollection<Linedef> selectedlines;
+		private ICollection<Sector> selectedsectors;
+
+		#endregion
+
+		#region ================== Properties
+		
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor to start dragging immediately
+		public DragSectorsMode(Vector2D dragstartmappos)
+		{
+			// Mark what we are dragging
+			General.Map.Map.ClearAllMarks(false);
+			General.Map.Map.MarkSelectedLinedefs(true, true);
+			ICollection<Vertex> verts = General.Map.Map.GetVerticesFromLinesMarks(true);
+			foreach(Vertex v in verts) v.Marked = true;
+			
+			// Get selected lines
+			selectedlines = General.Map.Map.GetSelectedLinedefs(true);
+			selectedsectors = General.Map.Map.GetSelectedSectors(true);
+			
+			// Initialize
+			base.StartDrag(dragstartmappos);
+			undodescription = (selectedsectors.Count == 1 ? "Drag sector" : "Drag " + selectedsectors.Count + " sectors"); //mxd
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Disposer
+		public override void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Clean up
+
+				// Done
+				base.Dispose();
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// Mode engages
+		public override void OnEngage()
+		{
+			base.OnEngage();
+			renderer.SetPresentation(Presentation.Standard);
+		}
+		
+		// Disenagaging
+		public override void OnDisengage()
+		{
+			// Select vertices from lines selection
+			General.Map.Map.ClearSelectedVertices();
+			ICollection<Vertex> verts = General.Map.Map.GetVerticesFromLinesMarks(true);
+			foreach(Vertex v in verts) v.Selected = true;
+
+			// Perform normal disengage
+			base.OnDisengage();
+
+			// Clear vertex selection
+			General.Map.Map.ClearSelectedVertices();
+			
+			// When not cancelled
+			if(!cancelled)
+			{
+				// If only a single sector was selected, deselect it now
+				if(selectedsectors.Count == 1)
+				{
+					General.Map.Map.ClearSelectedSectors();
+					General.Map.Map.ClearSelectedLinedefs();
+
+					//mxd. Also (de)select things?
+					if(BuilderPlug.Me.SyncronizeThingEdit)
+					{
+						Sector s = General.GetByIndex(selectedsectors, 0);
+						foreach(Thing t in General.Map.Map.Things)
+							if(t.Sector == s && t.Selected) t.Selected = false;
+					}
+				}
+			}
+		}
+
+		// This redraws the display
+		public override void OnRedrawDisplay()
+		{
+			renderer.RedrawSurface();
+
+			UpdateRedraw();
+			
+			// Redraw things when view changed
+			if(CheckViewChanged())
+			{
+				if(renderer.StartThings(true))
+				{
+					renderer.RenderThingSet(General.Map.Map.Things, Presentation.THINGS_ALPHA);
+					renderer.Finish();
+				}
+			}
+
+			renderer.Present();
+		}
+		
+		// This redraws only the required things
+		protected override void UpdateRedraw()
+		{
+			// Start rendering
+			if(renderer.StartPlotter(true))
+			{
+				// Render lines and vertices
+				renderer.PlotLinedefSet(snaptolines);
+				renderer.PlotLinedefSet(unstablelines);
+				renderer.PlotLinedefSet(selectedlines);
+				renderer.PlotVerticesSet(General.Map.Map.Vertices);
+
+				// Draw the dragged item highlighted
+				// This is important to know, because this item is used
+				// for snapping to the grid and snapping to nearest items
+				renderer.PlotVertex(dragitem, ColorCollection.HIGHLIGHT);
+				
+				// Done
+				renderer.Finish();
+			}
+
+			//mxd. Render things
+			if(renderer.StartThings(true)) 
+			{
+				renderer.RenderThingSet(General.Map.ThingsFilter.HiddenThings, Presentation.THINGS_HIDDEN_ALPHA);
+				renderer.RenderThingSet(unselectedthings, Presentation.THINGS_ALPHA);
+				renderer.RenderThingSet(selectedthings, Presentation.THINGS_ALPHA);
+				renderer.Finish();
+			}
+
+			// Redraw overlay
+			if(renderer.StartOverlay(true))
+			{
+				foreach(LineLengthLabel l in labels)
+				{
+					renderer.RenderText(l.TextLabel);
+				}
+				renderer.Finish();
+			}
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ClassicModes/DragThingsMode.cs b/Source/Plugins/BuilderModes/ClassicModes/DragThingsMode.cs
new file mode 100644
index 0000000..f0a5048
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ClassicModes/DragThingsMode.cs
@@ -0,0 +1,512 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Geometry;
+using System.Drawing;
+using CodeImp.DoomBuilder.Editing;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	// No action or button for this mode, it is automatic.
+	// The EditMode attribute does not have to be specified unless the
+	// mode must be activated by class name rather than direct instance.
+	// In that case, just specifying the attribute like this is enough:
+	// [EditMode]
+
+	[EditMode(DisplayName = "Drag Things",
+			  AllowCopyPaste = false,
+			  Volatile = true)]
+
+	public sealed class DragThingsMode : BaseClassicMode
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		// Mode to return to
+		private readonly EditMode basemode;
+		
+		// Mouse position on map where dragging started
+		private readonly Vector2D dragstartmappos;
+
+		//mxd. Offset from nearest grid intersection to dragstartmappos
+		private Vector2D dragstartoffset;
+
+		// Item used as reference for snapping to the grid
+		private readonly Thing dragitem;
+		private readonly Vector2D dragitemposition;
+
+		// List of old thing positions
+		private readonly List<Vector2D> oldpositions;
+
+		//mxd
+		private class AlignData
+		{
+			public readonly int InitialAngle;
+			public int CurrentAngle;
+			public readonly float InitialHeight;
+			public float CurrentHeight;
+			public PointF Position = PointF.Empty;
+			public bool Active;
+
+			public AlignData(Thing t)
+			{
+				InitialAngle = t.AngleDoom;
+				InitialHeight = t.Position.z;
+			}
+		}
+
+		private AlignData aligndata;
+
+		// List of selected items
+		private readonly ICollection<Thing> selectedthings;
+
+		// List of non-selected items
+		private readonly ICollection<Thing> unselectedthings;
+		
+		// Keep track of view changes
+		private float lastoffsetx;
+		private float lastoffsety;
+		private float lastscale;
+		
+		// Options
+		private bool snaptogrid;		// SHIFT to toggle
+		private bool snaptonearest;		// CTRL to enable
+		private bool snaptogridincrement; //mxd. ALT to toggle
+		private bool snaptocardinaldirection; //mxd. ALT-SHIFT to enable
+
+		#endregion
+
+		#region ================== Properties
+
+		// Just keep the base mode button checked
+		public override string EditModeButtonName { get { return basemode.GetType().Name; } }
+		
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor to start dragging immediately
+		public DragThingsMode(EditMode basemode, Vector2D dragstartmappos)
+		{
+			// Initialize
+			this.dragstartmappos = dragstartmappos;
+			this.basemode = basemode;
+
+			Cursor.Current = Cursors.AppStarting;
+
+			// Mark what we are dragging
+			General.Map.Map.ClearAllMarks(false);
+			General.Map.Map.MarkSelectedThings(true, true);
+			
+			// Get selected things
+			selectedthings = General.Map.Map.GetMarkedThings(true);
+			unselectedthings = new List<Thing>();
+			foreach(Thing t in General.Map.ThingsFilter.VisibleThings) if(!t.Marked) unselectedthings.Add(t);
+			
+			// Get the nearest thing for snapping
+			dragitem = MapSet.NearestThing(selectedthings, dragstartmappos);
+
+			// Make old positions list
+			// We will use this as reference to move the vertices, or to move them back on cancel
+			oldpositions = new List<Vector2D>(selectedthings.Count);
+			foreach(Thing t in selectedthings) oldpositions.Add(t.Position);
+
+			// Also keep old position of the dragged item
+			dragitemposition = dragitem.Position;
+
+			//mxd. Get drag offset
+			dragstartoffset = General.Map.Grid.SnappedToGrid(dragitem.Position) - dragitemposition;
+
+			// Keep view information
+			lastoffsetx = renderer.OffsetX;
+			lastoffsety = renderer.OffsetY;
+			lastscale = renderer.Scale;
+			
+			Cursor.Current = Cursors.Default;
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Disposer
+		public override void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Clean up
+
+				// Done
+				base.Dispose();
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+		
+		// This moves the selected things relatively
+		// Returns true when things has actually moved
+		private bool MoveThingsRelative(Vector2D offset, bool snapgrid, bool snapgridincrement, bool snapnearest, bool snapcardinal)
+		{
+			//mxd. If snap to cardinal directions is enabled, modify the offset
+			if(snapcardinal)
+			{
+				float angle = Angle2D.DegToRad((General.ClampAngle((int)Angle2D.RadToDeg(offset.GetAngle()) + 44)) / 90 * 90);
+				offset = new Vector2D(0, -offset.GetLength()).GetRotated(angle);
+				snapgridincrement = true; // We don't want to move Things away from the cardinal directions
+			}
+			
+			Vector2D oldpos = dragitem.Position;
+			Vector2D tl, br;
+
+			// don't move if the offset contains invalid data
+			if(!offset.IsFinite())	return false;
+
+			// Find the outmost things
+			tl = br = oldpositions[0];
+			for(int i = 0; i < oldpositions.Count; i++)
+			{
+				if(oldpositions[i].x < tl.x) tl.x = (int)oldpositions[i].x;
+				if(oldpositions[i].x > br.x) br.x = (int)oldpositions[i].x;
+				if(oldpositions[i].y > tl.y) tl.y = (int)oldpositions[i].y;
+				if(oldpositions[i].y < br.y) br.y = (int)oldpositions[i].y;
+			}
+
+			// Snap to nearest?
+			if(snapnearest)
+			{
+				// Find nearest unselected item within selection range
+				Thing nearest = MapSet.NearestThingSquareRange(unselectedthings, mousemappos, BuilderPlug.Me.StitchRange / renderer.Scale);
+				if(nearest != null)
+				{
+					// Move the dragged item
+					dragitem.Move((Vector2D)nearest.Position);
+
+					// Adjust the offset
+					offset = (Vector2D)nearest.Position - dragitemposition;
+
+					// Do not snap to grid!
+					snapgrid = false;
+					snapgridincrement = false; //mxd
+				}
+			}
+
+			// Snap to grid?
+			if(snapgrid || snapgridincrement)
+			{
+				// Move the dragged item
+				dragitem.Move(dragitemposition + offset);
+
+				// Snap item to grid increment (mxd)
+				if(snapgridincrement)
+				{
+					dragitem.Move(General.Map.Grid.SnappedToGrid(dragitemposition + offset) - dragstartoffset);
+				} 
+				else // Or to the grid itself
+				{
+					dragitem.SnapToGrid();
+				}
+
+				// Adjust the offset
+				offset += (Vector2D)dragitem.Position - (dragitemposition + offset);
+			}
+
+			// Make sure the offset is inside the map boundaries
+			if(offset.x + tl.x < General.Map.Config.LeftBoundary) offset.x = General.Map.Config.LeftBoundary - tl.x;
+			if(offset.x + br.x > General.Map.Config.RightBoundary) offset.x = General.Map.Config.RightBoundary - br.x;
+			if(offset.y + tl.y > General.Map.Config.TopBoundary) offset.y = General.Map.Config.TopBoundary - tl.y;
+			if(offset.y + br.y < General.Map.Config.BottomBoundary) offset.y = General.Map.Config.BottomBoundary - br.y;
+
+			// Drag item moved?
+			if((!snapgrid && !snapgridincrement) || ((Vector2D)dragitem.Position != oldpos))
+			{
+				int i = 0;
+
+				// Move selected geometry
+				foreach(Thing t in selectedthings)
+				{
+					// Move vertex from old position relative to the
+					// mouse position change since drag start
+					t.Move(oldpositions[i] + offset);
+
+					// Next
+					i++;
+				}
+
+				// Moved
+				return true;
+			}
+			else
+			{
+				// No changes
+				return false;
+			}
+		}
+
+		// This redraws the display
+		public override void OnRedrawDisplay()
+		{
+			if(CheckViewChanged())
+			{
+				renderer.RedrawSurface();
+
+				// Render lines and vertices
+				if(renderer.StartPlotter(true))
+				{
+					renderer.PlotLinedefSet(General.Map.Map.Linedefs);
+					renderer.PlotVerticesSet(General.Map.Map.Vertices);
+					renderer.Finish();
+				}
+			}
+			
+			// Render things
+			UpdateRedraw();
+
+			renderer.Present();
+		}
+
+		// This redraws only changed things
+		private void UpdateRedraw()
+		{
+			//mxd. Added, so grid can be rendered properly if the user changes grid size while dragging (very useful and important, I know)
+			if(renderer.StartPlotter(true)) 
+			{
+				// Render lines and vertices
+				renderer.PlotLinedefSet(General.Map.Map.Linedefs);
+				renderer.PlotVerticesSet(General.Map.Map.Vertices);
+				
+				// Done
+				renderer.Finish();
+			}
+
+			// Render things
+			if(renderer.StartThings(true))
+			{
+				// Render things
+				renderer.RenderThingSet(General.Map.ThingsFilter.HiddenThings, Presentation.THINGS_HIDDEN_ALPHA);
+				renderer.RenderThingSet(unselectedthings, Presentation.THINGS_ALPHA);
+				renderer.RenderThingSet(selectedthings, Presentation.THINGS_ALPHA);
+
+				// Draw the dragged item highlighted
+				// This is important to know, because this item is used
+				// for snapping to the grid and snapping to nearest items
+				renderer.RenderThing(dragitem, General.Colors.Highlight, Presentation.THINGS_ALPHA);
+
+				// Done
+				renderer.Finish();
+			}
+		}
+		
+		// Cancelled
+		public override void OnCancel()
+		{
+			// Move geometry back to original position
+			MoveThingsRelative(new Vector2D(0f, 0f), false, false, false, false);
+
+			// If only a single vertex was selected, deselect it now
+			if(selectedthings.Count == 1) General.Map.Map.ClearSelectedThings();
+			
+			// Update cached values
+			General.Map.Map.Update();
+			
+			// Cancel base class
+			base.OnCancel();
+			
+			// Return to vertices mode
+			General.Editing.ChangeMode(basemode);
+		}
+
+		// Mode engages
+		public override void OnEngage()
+		{
+			base.OnEngage();
+			renderer.SetPresentation(Presentation.Things);
+		}
+		
+		// Disenagaging
+		public override void OnDisengage()
+		{
+			base.OnDisengage();
+			Cursor.Current = Cursors.AppStarting;
+			
+			// When not cancelled
+			if(!cancelled)
+			{
+				// Move geometry back to original position
+				MoveThingsRelative(new Vector2D(0f, 0f), false, false, false, false);
+
+				//mxd. Revert aligning
+				if(aligndata != null && aligndata.Active)
+				{
+					aligndata.CurrentAngle = dragitem.AngleDoom; //mxd
+					dragitem.Rotate(aligndata.InitialAngle);
+					aligndata.CurrentHeight = dragitem.Position.z; //mxd
+					dragitem.Move(dragitem.Position.x, dragitem.Position.y, aligndata.InitialHeight);
+				}
+
+				// Make undo for the dragging
+				General.Map.UndoRedo.CreateUndo((selectedthings.Count == 1 ? "Drag thing" : "Drag " + selectedthings.Count + " things"));
+
+				// Move selected geometry to final position
+				if(aligndata != null && aligndata.Active) //mxd. Apply aligning
+				{
+					if(!aligndata.Position.IsEmpty) 
+						dragitem.Move(aligndata.Position.X, aligndata.Position.Y, aligndata.CurrentHeight);
+					else
+						dragitem.Move(dragitem.Position.x, dragitem.Position.y, aligndata.CurrentHeight);
+					dragitem.Rotate(aligndata.CurrentAngle);
+				} 
+				else 
+				{
+					MoveThingsRelative(mousemappos - dragstartmappos, snaptogrid, snaptogridincrement, snaptonearest, snaptocardinaldirection);
+				}
+
+				//mxd. Snap selected things to map format accuracy
+				foreach(Thing thing in selectedthings) thing.SnapToAccuracy(false);
+
+				// Map is changed
+				General.Map.IsChanged = true;
+			}
+
+			// Hide highlight info
+			General.Interface.HideInfo();
+
+			// Done
+			Cursor.Current = Cursors.Default;
+		}
+
+		// This checks if the view offset/zoom changed and updates the check
+		private bool CheckViewChanged()
+		{
+			// View changed?
+			bool viewchanged = (renderer.OffsetX != lastoffsetx || renderer.OffsetY != lastoffsety || renderer.Scale != lastscale);
+
+			// Keep view information
+			lastoffsetx = renderer.OffsetX;
+			lastoffsety = renderer.OffsetY;
+			lastscale = renderer.Scale;
+
+			// Return result
+			return viewchanged;
+		}
+
+		// This updates the dragging
+		private void Update()
+		{
+			snaptocardinaldirection = (General.Interface.ShiftState && General.Interface.AltState); //mxd
+			snaptogrid = (snaptocardinaldirection || General.Interface.ShiftState ^ General.Interface.SnapToGrid);
+			snaptonearest = General.Interface.CtrlState;
+			snaptogridincrement = (!snaptocardinaldirection && General.Interface.AltState); //mxd
+
+			//mxd. Snap to nearest linedef
+			if(selectedthings.Count == 1 && dragitem.IsModel && snaptonearest && !snaptocardinaldirection && MoveThingsRelative(mousemappos - dragstartmappos, snaptogrid, snaptogridincrement, false, false)) 
+			{
+				Linedef l = General.Map.Map.NearestLinedefRange(oldpositions[0] + mousemappos - dragstartmappos, BuilderPlug.Me.StitchRange / renderer.Scale);
+				bool restoresettings = false;
+				if(aligndata == null) aligndata = new AlignData(dragitem);
+
+				if(l != null) 
+				{
+					if(Tools.TryAlignThingToLine(dragitem, l)) 
+					{
+						aligndata.Position = new PointF(dragitem.Position.x, dragitem.Position.y);
+						aligndata.Active = true;
+					} 
+					else if(dragitem.AngleDoom != aligndata.InitialAngle) //restore initial angle?
+					{ 
+						restoresettings = true;
+					}
+
+				} 
+				else if(dragitem.AngleDoom != aligndata.InitialAngle) //restore initial angle?
+				{ 
+					restoresettings = true;
+				}
+
+				if(restoresettings) 
+				{
+					aligndata.Position = PointF.Empty;
+					aligndata.Active = false;
+					dragitem.Rotate(aligndata.InitialAngle);
+				}
+
+				UpdateRedraw();// Redraw
+				renderer.Present();
+
+				return;
+			}
+			
+			// Move selected geometry
+			if(MoveThingsRelative(mousemappos - dragstartmappos, snaptogrid, snaptogridincrement, snaptonearest, snaptocardinaldirection))
+			{
+				// Redraw
+				UpdateRedraw();
+				renderer.Present();
+			}
+		}
+
+		// When edit button is released
+		protected override void OnEditEnd()
+		{
+			// Just return to vertices mode, geometry will be merged on disengage.
+			General.Editing.ChangeMode(basemode);
+
+			base.OnEditEnd();
+		}
+
+		// Mouse moving
+		public override void OnMouseMove(MouseEventArgs e)
+		{
+			base.OnMouseMove(e);
+			Update();
+		}
+
+		// When a key is released
+		public override void OnKeyUp(KeyEventArgs e)
+		{
+			base.OnKeyUp(e);
+			if(snaptogrid != General.Interface.ShiftState ^ General.Interface.SnapToGrid ||
+				snaptonearest != General.Interface.CtrlState || 
+				snaptogridincrement != General.Interface.AltState ||
+				snaptocardinaldirection != (General.Interface.AltState && General.Interface.ShiftState)) Update();
+		}
+
+		// When a key is pressed
+		public override void OnKeyDown(KeyEventArgs e)
+		{
+			base.OnKeyDown(e);
+			if(snaptogrid != General.Interface.ShiftState ^ General.Interface.SnapToGrid ||
+				snaptonearest != General.Interface.CtrlState ||
+				snaptogridincrement != General.Interface.AltState ||
+				snaptocardinaldirection != (General.Interface.AltState && General.Interface.ShiftState)) Update();
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ClassicModes/DragVerticesMode.cs b/Source/Plugins/BuilderModes/ClassicModes/DragVerticesMode.cs
new file mode 100644
index 0000000..6fd2e40
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ClassicModes/DragVerticesMode.cs
@@ -0,0 +1,169 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Editing;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	// No action or button for this mode, it is automatic.
+	// The EditMode attribute does not have to be specified unless the
+	// mode must be activated by class name rather than direct instance.
+	// In that case, just specifying the attribute like this is enough:
+	// [EditMode]
+
+	[EditMode(DisplayName = "Vertices",
+			  AllowCopyPaste = false,
+			  Volatile = true)]
+
+	public sealed class DragVerticesMode : DragGeometryMode
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		#endregion
+
+		#region ================== Properties
+		
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor to start dragging immediately
+		public DragVerticesMode(Vertex dragitem, Vector2D dragstartmappos)
+		{
+			// Mark what we are dragging
+			General.Map.Map.ClearAllMarks(false);
+			General.Map.Map.MarkSelectedVertices(true, true);
+
+			// Initialize
+			base.StartDrag(dragstartmappos);
+			undodescription = (selectedverts.Count == 1 ? "Drag vertex" : "Drag " + selectedverts.Count + " vertices"); //mxd
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Disposer
+		public override void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Clean up
+
+				// Done
+				base.Dispose();
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+		
+		// Disenagaging
+		public override void OnDisengage()
+		{
+			// Select vertices from marks
+			General.Map.Map.ClearSelectedVertices();
+			General.Map.Map.SelectMarkedVertices(true, true);
+			
+			// Perform normal disengage
+			base.OnDisengage();
+			
+			// When not cancelled
+			if(!cancelled)
+			{
+				// If only a single vertex was selected, deselect it now
+				if(selectedverts.Count == 1) General.Map.Map.ClearSelectedVertices();
+			}
+		}
+
+		// This redraws the display
+		public override void OnRedrawDisplay()
+		{
+			bool viewchanged = CheckViewChanged();
+
+			renderer.RedrawSurface();
+
+			UpdateRedraw();
+			
+			// Redraw things when view changed
+			if(viewchanged)
+			{
+				if(renderer.StartThings(true))
+				{
+					renderer.RenderThingSet(General.Map.Map.Things, Presentation.THINGS_ALPHA);
+					renderer.Finish();
+				}
+			}
+
+			renderer.Present();
+		}
+		
+		// This redraws only the required things
+		protected override void UpdateRedraw()
+		{
+			// Start rendering
+			if(renderer.StartPlotter(true))
+			{
+				// Render lines and vertices
+				renderer.PlotLinedefSet(General.Map.Map.Linedefs);
+				renderer.PlotVerticesSet(unselectedverts);
+				renderer.PlotVerticesSet(selectedverts);
+
+				// Draw the dragged item highlighted
+				// This is important to know, because this item is used
+				// for snapping to the grid and snapping to nearest items
+				renderer.PlotVertex(dragitem, ColorCollection.HIGHLIGHT);
+				
+				// Done
+				renderer.Finish();
+			}
+
+			//mxd. Render things
+			if(renderer.StartThings(true)) 
+			{
+				renderer.RenderThingSet(General.Map.ThingsFilter.HiddenThings, Presentation.THINGS_HIDDEN_ALPHA);
+				renderer.RenderThingSet(unselectedthings, Presentation.THINGS_ALPHA);
+				renderer.RenderThingSet(selectedthings, Presentation.THINGS_ALPHA);
+				renderer.Finish();
+			}
+
+			// Redraw overlay
+			if(renderer.StartOverlay(true))
+			{
+				foreach(LineLengthLabel l in labels)
+				{
+					renderer.RenderText(l.TextLabel);
+				}
+				renderer.Finish();
+			}
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ClassicModes/DrawCurveMode.cs b/Source/Plugins/BuilderModes/ClassicModes/DrawCurveMode.cs
new file mode 100644
index 0000000..ba085d0
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ClassicModes/DrawCurveMode.cs
@@ -0,0 +1,340 @@
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Actions;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Editing;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Windows;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[EditMode(DisplayName = "Draw Curve Mode",
+			  SwitchAction = "drawcurvemode",
+			  ButtonImage = "DrawCurveMode.png", //mxd	
+			  ButtonOrder = int.MinValue + 2, //mxd
+			  ButtonGroup = "000_drawing", //mxd
+			  AllowCopyPaste = false,
+			  Volatile = true,
+			  Optional = false)]
+
+	public class DrawCurveMode : DrawGeometryMode
+	{
+		#region ================== Variables
+
+		private readonly HintLabel hintlabel;
+		private Curve curve;
+		private static int segmentLength = 32;
+		private const int MIN_SEGMENT_LENGTH = 16;
+		private const int MAX_SEGMENT_LENGTH = 4096; //just some arbitrary number
+
+		//interface
+		private readonly DrawCurveOptionsPanel panel;
+
+		#endregion
+
+		#region ================== Constructor/Disposer
+
+		public DrawCurveMode() 
+		{
+			hintlabel = new HintLabel(General.Colors.InfoLine);
+			labeluseoffset = false;
+
+			//Options docker
+			panel = new DrawCurveOptionsPanel(MIN_SEGMENT_LENGTH, MAX_SEGMENT_LENGTH);
+			panel.OnValueChanged += OptionsPanelOnValueChanged;
+		}
+
+		public override void Dispose() 
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Clean up
+				if(hintlabel != null) hintlabel.Dispose();
+
+				// Done
+				base.Dispose();
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		protected override void Update() 
+		{
+			PixelColor stitchcolor = General.Colors.Highlight;
+			PixelColor losecolor = General.Colors.Selection;
+
+			snaptocardinaldirection = General.Interface.ShiftState && General.Interface.AltState;
+			snaptogrid = snaptocardinaldirection || General.Interface.ShiftState ^ General.Interface.SnapToGrid;
+			snaptonearest = General.Interface.CtrlState ^ General.Interface.AutoMerge;
+
+			DrawnVertex curp = GetCurrentPosition();
+			float vsize = (renderer.VertexSize + 1.0f) / renderer.Scale;
+
+			// Update label positions (mxd)
+			if(labels.Count > 0)
+			{
+				// Update labels for already drawn lines
+				for(int i = 0; i < labels.Count - 1; i++)
+					labels[i].Move(points[i].pos, points[i + 1].pos);
+
+				// Update label for active line
+				labels[labels.Count - 1].Move(points[points.Count - 1].pos, curp.pos);
+			}
+
+			// Render drawing lines
+			if(renderer.StartOverlay(true)) 
+			{
+				// Go for all points to draw lines
+				if(points.Count > 0) 
+				{
+					//update curve
+					List<Vector2D> verts = new List<Vector2D>();
+					for(int i = 0; i < points.Count; i++) verts.Add(points[i].pos);
+					if(curp.pos != verts[verts.Count-1]) verts.Add(curp.pos);
+					curve = CurveTools.CurveThroughPoints(verts, 0.5f, 0.75f, segmentLength);
+
+					// Render lines
+					for(int i = 1; i < curve.Shape.Count; i++) 
+					{
+						// Determine line color
+						PixelColor c = snaptonearest ? stitchcolor : losecolor;
+
+						// Render line
+						renderer.RenderLine(curve.Shape[i - 1], curve.Shape[i], LINE_THICKNESS, c, true);
+					}
+
+					//render "inactive" vertices
+					for(int i = 1; i < curve.Shape.Count - 1; i++) 
+					{
+						// Determine vertex color
+						PixelColor c = !snaptonearest ? stitchcolor : losecolor;
+
+						// Render vertex
+						renderer.RenderRectangleFilled(new RectangleF(curve.Shape[i].x - vsize, curve.Shape[i].y - vsize, vsize * 2.0f, vsize * 2.0f), c, true);
+					}
+				}
+
+				if(points.Count > 0) 
+				{
+					// Render vertices
+					for(int i = 0; i < points.Count; i++) 
+					{
+						// Determine vertex color
+						PixelColor c = points[i].stitch ? stitchcolor : losecolor;
+
+						// Render vertex
+						renderer.RenderRectangleFilled(new RectangleF(points[i].pos.x - vsize, points[i].pos.y - vsize, vsize * 2.0f, vsize * 2.0f), c, true);
+					}
+				}
+
+				// Determine point color
+				PixelColor color = snaptonearest ? stitchcolor : losecolor;
+
+				// Render vertex at cursor
+				renderer.RenderRectangleFilled(new RectangleF(curp.pos.x - vsize, curp.pos.y - vsize, vsize * 2.0f, vsize * 2.0f), color, true);
+
+				// Go for all labels
+				foreach(LineLengthLabel l in labels) renderer.RenderText(l.TextLabel);
+
+				//Render info label
+				Vector2D start = new Vector2D(mousemappos.x + (32 / renderer.Scale), mousemappos.y - (16 / renderer.Scale));
+				Vector2D end = new Vector2D(mousemappos.x + (96 / renderer.Scale), mousemappos.y);
+				hintlabel.Move(start, end);
+				hintlabel.Text = "SEG LEN: " + segmentLength;
+				renderer.RenderText(hintlabel.TextLabel);
+
+				// Done
+				renderer.Finish();
+			}
+
+			// Done
+			renderer.Present();
+		}
+
+		#endregion
+
+		#region ================== Events
+
+		public override void OnEngage() 
+		{
+			base.OnEngage();
+
+			//setup settings panel
+			panel.SegmentLength = segmentLength;
+			panel.Register();
+		}
+
+		public override void OnAccept() 
+		{
+			Cursor.Current = Cursors.AppStarting;
+			General.Settings.FindDefaultDrawSettings();
+
+			// When points have been drawn
+			if(points.Count > 0) 
+			{
+				// Make undo for the draw
+				General.Map.UndoRedo.CreateUndo("Curve draw");
+
+				// Make an analysis and show info
+				string[] adjectives = new[] 
+				{
+				  "beautiful", "lovely", "romantic", "stylish", "cheerful", "comical",
+				  "awesome", "accurate", "adorable", "adventurous", "attractive", "cute",
+				  "elegant", "glamorous", "gorgeous", "handsome", "magnificent", "unusual",
+				  "outstanding", "mysterious", "amusing", "charming", "fantastic", "jolly" 
+				};
+				string word = adjectives[points.Count % adjectives.Length];
+				word = (points.Count > adjectives.Length) ? "very " + word : word;
+				string a = ((word[0] == 'a') || (word[0] == 'e') || (word[0] == 'o') || (word[0] == 'u')) ? "an " : "a ";
+				General.Interface.DisplayStatus(StatusType.Action, "Created " + a + word + " curve.");
+
+				List<DrawnVertex> verts = new List<DrawnVertex>();
+				
+				//if we have a curve...
+				if(points.Count > 2)
+				{
+					//is it a closed curve?
+					int lastPoint;
+					if(points[0].pos == points[points.Count - 1].pos) 
+					{
+						lastPoint = curve.Segments.Count;
+					}
+					else 
+					{
+						lastPoint = curve.Segments.Count - 1;
+					}
+
+					for(int i = 0; i < lastPoint; i++) 
+					{
+						int next = (i == curve.Segments.Count - 1 ? 0 : i + 1);
+						bool stitch = points[i].stitch && points[next].stitch;
+						bool stitchline = points[i].stitchline && points[next].stitchline;
+
+						//add segment points except the last one
+						for(int c = 0; c < curve.Segments[i].Points.Length - 1; c++) 
+						{
+							DrawnVertex dv = new DrawnVertex();
+							dv.pos = curve.Segments[i].Points[c];
+							dv.stitch = stitch;
+							dv.stitchline = stitchline;
+							verts.Add(dv);
+						}
+					}
+
+					//add last point
+					DrawnVertex end = new DrawnVertex();
+					end.pos = curve.Segments[lastPoint - 1].End;
+					end.stitch = verts[verts.Count - 1].stitch;
+					end.stitchline = verts[verts.Count - 1].stitchline;
+					verts.Add(end);
+				}
+				else
+				{
+					verts = points;
+				}
+
+				// Make the drawing
+				if(!Tools.DrawLines(verts, true, BuilderPlug.Me.AutoAlignTextureOffsetsOnCreate)) //mxd
+				{
+					// Drawing failed
+					// NOTE: I have to call this twice, because the first time only cancels this volatile mode
+					General.Map.UndoRedo.WithdrawUndo();
+					General.Map.UndoRedo.WithdrawUndo();
+					return;
+				}
+
+				// Snap to map format accuracy
+				General.Map.Map.SnapAllToAccuracy();
+
+				// Clear selection
+				General.Map.Map.ClearAllSelected();
+
+				// Update cached values
+				General.Map.Map.Update();
+
+				// Edit new sectors?
+				List<Sector> newsectors = General.Map.Map.GetMarkedSectors(true);
+				if(BuilderPlug.Me.EditNewSector && (newsectors.Count > 0))
+					General.Interface.ShowEditSectors(newsectors);
+
+				// Update the used textures
+				General.Map.Data.UpdateUsedTextures();
+
+				//mxd
+				General.Map.Renderer2D.UpdateExtraFloorFlag();
+
+				// Map is changed
+				General.Map.IsChanged = true;
+			}
+
+			// Done
+			Cursor.Current = Cursors.Default;
+
+			// Return to original mode
+			General.Editing.ChangeMode(General.Editing.PreviousStableMode.Name);
+		}
+
+		public override void OnDisengage() 
+		{
+			base.OnDisengage();
+			panel.Unregister();
+		}
+
+		private void OptionsPanelOnValueChanged(object sender, EventArgs eventArgs) 
+		{
+			segmentLength = panel.SegmentLength;
+			Update();
+		}
+
+		public override void OnHelp() 
+		{
+			General.ShowHelp("/gzdb/features/classic_modes/mode_drawcurve.html");
+		}
+
+		#endregion
+
+		#region ================== Actions
+
+		[BeginAction("increasesubdivlevel")]
+		protected virtual void IncreaseSubdivLevel() 
+		{
+			if(segmentLength < MAX_SEGMENT_LENGTH) 
+			{
+				int increment = Math.Max(MIN_SEGMENT_LENGTH, segmentLength / 32 * 16);
+				segmentLength += increment;
+
+				if(segmentLength > MAX_SEGMENT_LENGTH) segmentLength = MAX_SEGMENT_LENGTH;
+				panel.SegmentLength = segmentLength;
+				Update();
+			}
+		}
+
+		[BeginAction("decreasesubdivlevel")]
+		protected virtual void DecreaseSubdivLevel() 
+		{
+			if(segmentLength > MIN_SEGMENT_LENGTH) 
+			{
+				int increment = Math.Max(MIN_SEGMENT_LENGTH, segmentLength / 32 * 16);
+				segmentLength -= increment;
+
+				if(segmentLength < MIN_SEGMENT_LENGTH) segmentLength = MIN_SEGMENT_LENGTH;
+				panel.SegmentLength = segmentLength;
+				Update();
+			}
+		}
+
+		#endregion
+
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ClassicModes/DrawEllipseMode.cs b/Source/Plugins/BuilderModes/ClassicModes/DrawEllipseMode.cs
new file mode 100644
index 0000000..acbba49
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ClassicModes/DrawEllipseMode.cs
@@ -0,0 +1,189 @@
+#region ================== Namespaces
+
+using System;
+using CodeImp.DoomBuilder.Editing;
+using CodeImp.DoomBuilder.Geometry;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[EditMode(DisplayName = "Draw Ellipse Mode",
+			  SwitchAction = "drawellipsemode",
+			  ButtonImage = "DrawEllipseMode.png", //mxd	
+			  ButtonOrder = int.MinValue + 4, //mxd
+			  ButtonGroup = "000_drawing", //mxd
+			  AllowCopyPaste = false,
+			  Volatile = true,
+			  Optional = false)]
+	
+	public class DrawEllipseMode : DrawRectangleMode
+	{
+		#region ================== Variables
+
+		//interface
+		private DrawEllipseOptionsPanel panel;
+
+		#endregion
+
+		#region ================== Constructor
+
+		public DrawEllipseMode() 
+		{
+			undoName = "Ellipse draw";
+			shapeName = "ellipse";
+			usefourcardinaldirections = true;
+		}
+
+		#endregion
+
+		#region ================== Settings panel
+
+		override protected void SetupInterface() 
+		{
+			maxSubdivisions = 512;
+			minSubdivisions = 6;
+
+			//Add options docker
+			panel = new DrawEllipseOptionsPanel();
+			panel.MaxSubdivisions = maxSubdivisions;
+			panel.MinSubdivisions = minSubdivisions;
+			panel.MinSpikiness = (int)General.Map.FormatInterface.MinCoordinate;
+			panel.MaxSpikiness = (int)General.Map.FormatInterface.MaxCoordinate;
+			panel.OnValueChanged += OptionsPanelOnValueChanged;
+		}
+
+		override protected void AddInterface() 
+		{
+			panel.Register();
+			bevelWidth = panel.Spikiness;
+			subdivisions = panel.Subdivisions;
+		}
+
+		override protected void RemoveInterface() 
+		{
+			panel.Unregister();
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		override protected Vector2D[] GetShape(Vector2D pStart, Vector2D pEnd) 
+		{
+			//no shape
+			if(pEnd.x == pStart.x && pEnd.y == pStart.y) return new Vector2D[0];
+
+			//line
+			if(pEnd.x == pStart.x || pEnd.y == pStart.y) return new[] { pStart, pEnd };
+
+			//got shape
+			if(bevelWidth < 0) 
+			{
+				currentBevelWidth = -Math.Min(Math.Abs(bevelWidth), Math.Min(width, height) / 2) + 1;
+			} 
+			else 
+			{
+				currentBevelWidth = bevelWidth;
+			}
+
+			Vector2D[] shape = new Vector2D[subdivisions + 1];
+
+			bool doBevel = false;
+			int hw = width / 2;
+			int hh = height / 2;
+
+			Vector2D center = new Vector2D(pStart.x + hw, pStart.y + hh);
+			float curAngle = 0;
+			float angleStep = -Angle2D.PI / subdivisions * 2;
+
+			for(int i = 0; i < subdivisions; i++) 
+			{
+				int px, py;
+				if(doBevel) 
+				{
+					px = (int)(center.x - (float)Math.Sin(curAngle) * (hw + currentBevelWidth));
+					py = (int)(center.y - (float)Math.Cos(curAngle) * (hh + currentBevelWidth));
+				} 
+				else 
+				{
+					px = (int)(center.x - (float)Math.Sin(curAngle) * hw);
+					py = (int)(center.y - (float)Math.Cos(curAngle) * hh);
+				}
+				doBevel = !doBevel;
+				shape[i] = new Vector2D(px, py);
+				curAngle += angleStep;
+			}
+			//add final point
+			shape[subdivisions] = shape[0];
+			return shape;
+		}
+
+		protected override string GetHintText() 
+		{
+			return "BVL: " + bevelWidth + "; VERTS: " + subdivisions;
+		}
+
+		#endregion
+
+		#region ================== Events
+
+		private void OptionsPanelOnValueChanged(object sender, EventArgs eventArgs) 
+		{
+			bevelWidth = panel.Spikiness;
+			subdivisions = Math.Min(maxSubdivisions, panel.Subdivisions);
+			Update();
+		}
+
+		public override void OnHelp() 
+		{
+			General.ShowHelp("/gzdb/features/classic_modes/mode_drawellipse.html");
+		}
+
+		#endregion
+
+		#region ================== Actions
+
+		override protected void IncreaseSubdivLevel() 
+		{
+			if(maxSubdivisions - subdivisions > 1) 
+			{
+				subdivisions += 2;
+				panel.Subdivisions = subdivisions;
+				Update();
+			}
+		}
+
+		override protected void DecreaseSubdivLevel() 
+		{
+			if(subdivisions - minSubdivisions > 1) 
+			{
+				subdivisions -= 2;
+				panel.Subdivisions = subdivisions;
+				Update();
+			}
+		}
+
+		protected override void IncreaseBevel() 
+		{
+			if(points.Count < 2 || currentBevelWidth == bevelWidth || bevelWidth < 0) 
+			{
+				bevelWidth = Math.Min(bevelWidth + General.Map.Grid.GridSize, panel.MaxSpikiness);
+				panel.Spikiness = bevelWidth;
+				Update();
+			}
+		}
+
+		protected override void DecreaseBevel() 
+		{
+			if(bevelWidth > 0 || currentBevelWidth <= bevelWidth + 1) 
+			{
+				bevelWidth = Math.Max(bevelWidth - General.Map.Grid.GridSize, panel.MinSpikiness);
+				panel.Spikiness = bevelWidth;
+				Update();
+			}
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ClassicModes/DrawGeometryMode.cs b/Source/Plugins/BuilderModes/ClassicModes/DrawGeometryMode.cs
new file mode 100644
index 0000000..1784a20
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ClassicModes/DrawGeometryMode.cs
@@ -0,0 +1,638 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Windows;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Geometry;
+using System.Drawing;
+using CodeImp.DoomBuilder.Editing;
+using CodeImp.DoomBuilder.Actions;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[EditMode(DisplayName = "Draw Lines Mode",
+			  SwitchAction = "drawlinesmode",
+			  ButtonImage = "DrawGeometryMode.png", //mxd	
+			  ButtonOrder = int.MinValue + 1, //mxd
+			  ButtonGroup = "000_drawing", //mxd
+			  AllowCopyPaste = false,
+			  Volatile = true,
+			  UseByDefault = true,
+			  Optional = false)]
+
+	public class DrawGeometryMode : BaseClassicMode
+	{
+		#region ================== Constants
+
+		protected const float LINE_THICKNESS = 0.8f;
+
+		#endregion
+
+		#region ================== Variables
+
+		// Drawing points
+		protected List<DrawnVertex> points;
+		protected List<LineLengthLabel> labels;
+
+		// Keep track of view changes (never used. mxd)
+		//protected float lastoffsetx;
+		//protected float lastoffsety;
+		//protected float lastscale;
+
+		// Options
+		protected bool snaptogrid;		// SHIFT to toggle
+		protected bool snaptonearest;	// CTRL to enable
+		protected bool snaptocardinaldirection; //mxd. ALT-SHIFT to enable
+		protected static bool usefourcardinaldirections;
+
+		//mxd. Labels display style
+		protected bool labelshowangle = true;
+		protected bool labeluseoffset = true;
+		
+		#endregion
+
+		#region ================== Properties
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public DrawGeometryMode()
+		{
+			// Initialize
+			points = new List<DrawnVertex>();
+			labels = new List<LineLengthLabel>();
+			
+			// No selection in this mode
+			General.Map.Map.ClearAllSelected();
+			General.Map.Map.ClearAllMarks(false);
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Disposer
+		public override void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Clean up
+				if(labels != null)
+					foreach(LineLengthLabel l in labels) l.Dispose();
+				
+				// Done
+				base.Dispose();
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This checks if the view offset/zoom changed and updates the check (never used. mxd)
+		/*protected bool CheckViewChanged()
+		{
+			// View changed?
+			bool viewchanged = (renderer.OffsetX != lastoffsetx || renderer.OffsetY != lastoffsety || renderer.Scale != lastscale);
+
+			// Keep view information
+			lastoffsetx = renderer.OffsetX;
+			lastoffsety = renderer.OffsetY;
+			lastscale = renderer.Scale;
+
+			// Return result
+			return viewchanged;
+		}*/
+		
+		// This updates the dragging
+		protected virtual void Update()
+		{
+			PixelColor stitchcolor = General.Colors.Highlight;
+			PixelColor losecolor = General.Colors.Selection;
+
+			snaptocardinaldirection = General.Interface.ShiftState && General.Interface.AltState; //mxd
+			snaptogrid = (snaptocardinaldirection || General.Interface.ShiftState ^ General.Interface.SnapToGrid);
+			snaptonearest = General.Interface.CtrlState ^ General.Interface.AutoMerge;
+
+			DrawnVertex curp = GetCurrentPosition();
+			float vsize = (renderer.VertexSize + 1.0f) / renderer.Scale;
+
+			// Update label positions (mxd)
+			if(labels.Count > 0)
+			{
+				// Update labels for already drawn lines
+				for(int i = 0; i < labels.Count - 1; i++)
+					labels[i].Move(points[i].pos, points[i + 1].pos);
+
+				// Update label for active line
+				labels[labels.Count - 1].Move(points[points.Count - 1].pos, curp.pos);
+			}
+
+			// Render drawing lines
+			if(renderer.StartOverlay(true))
+			{
+				// Go for all points to draw lines
+				PixelColor color;
+				if(points.Count > 0)
+				{
+					// Render lines
+					DrawnVertex lastp = points[0];
+					for(int i = 1; i < points.Count; i++)
+					{
+						// Determine line color
+						if(lastp.stitchline && points[i].stitchline) color = stitchcolor;
+						else color = losecolor;
+
+						// Render line
+						renderer.RenderLine(lastp.pos, points[i].pos, LINE_THICKNESS, color, true);
+						RenderLinedefDirectionIndicator(lastp.pos, points[i].pos, color); //mxd
+						lastp = points[i];
+					}
+
+					// Determine line color
+					color = (lastp.stitchline && snaptonearest ? stitchcolor : losecolor);
+
+					// Render line to cursor
+					renderer.RenderLine(lastp.pos, curp.pos, LINE_THICKNESS, color, true);
+					RenderLinedefDirectionIndicator(lastp.pos, curp.pos, color); //mxd
+
+					// Render vertices
+					for(int i = 0; i < points.Count; i++)
+					{
+						// Determine vertex color
+						color = points[i].stitch ? stitchcolor : losecolor;
+
+						// Render vertex
+						renderer.RenderRectangleFilled(new RectangleF(points[i].pos.x - vsize, points[i].pos.y - vsize, vsize * 2.0f, vsize * 2.0f), color, true);
+					}
+				}
+
+				// Determine point color
+				color = snaptonearest ? stitchcolor : losecolor;
+
+				// Render vertex at cursor
+				renderer.RenderRectangleFilled(new RectangleF(curp.pos.x - vsize, curp.pos.y - vsize, vsize * 2.0f, vsize * 2.0f), color, true);
+
+				// Go for all labels
+				foreach(LineLengthLabel l in labels) renderer.RenderText(l.TextLabel);
+
+				// Done
+				renderer.Finish();
+			}
+
+			// Done
+			renderer.Present();
+		}
+
+		//mxd
+		private void RenderLinedefDirectionIndicator(Vector2D start, Vector2D end, PixelColor color) 
+		{
+			Vector2D delta = end - start;
+			Vector2D middlePoint = new Vector2D(start.x + delta.x / 2, start.y + delta.y / 2);
+			Vector2D scaledPerpendicular = delta.GetPerpendicular().GetNormal().GetScaled(18f / renderer.Scale);
+			renderer.RenderLine(middlePoint, new Vector2D(middlePoint.x - scaledPerpendicular.x, middlePoint.y - scaledPerpendicular.y), LINE_THICKNESS, color, true);
+		}
+		
+		// This returns the aligned and snapped draw position
+		public static DrawnVertex GetCurrentPosition(Vector2D mousemappos, bool snaptonearest, bool snaptogrid, bool snaptocardinal, IRenderer2D renderer, List<DrawnVertex> points)
+		{
+			DrawnVertex p = new DrawnVertex();
+			p.stitch = true; //mxd. Setting these to false seems to be a good way to create invalid geometry...
+			p.stitchline = true; //mxd
+
+			//mxd. If snap to cardinal directions is enabled and we have points, modify mouse position
+			Vector2D vm;
+			if(snaptocardinal && points.Count > 0)
+			{
+				Vector2D offset = mousemappos - points[points.Count - 1].pos;
+				
+				float angle;
+				if(usefourcardinaldirections)
+					angle = Angle2D.DegToRad((General.ClampAngle((int)Angle2D.RadToDeg(offset.GetAngle()))) / 90 * 90 + 45);
+				else
+					angle = Angle2D.DegToRad((General.ClampAngle((int)Angle2D.RadToDeg(offset.GetAngle()) + 22)) / 45 * 45);
+
+				offset = new Vector2D(0, -offset.GetLength()).GetRotated(angle);
+				vm = points[points.Count - 1].pos + offset;
+			}
+			else
+			{
+				vm = mousemappos;
+			}
+			
+			float vrange = BuilderPlug.Me.StitchRange / renderer.Scale;
+
+			// Snap to nearest?
+			if(snaptonearest)
+			{
+				// Go for all drawn points
+				foreach(DrawnVertex v in points)
+				{
+					if(Vector2D.DistanceSq(mousemappos, v.pos) < (vrange * vrange))
+					{
+						p.pos = v.pos;
+						//p.stitch = true;
+						//p.stitchline = true;
+						return p;
+					}
+				}
+
+				// Try the nearest vertex
+				Vertex nv = General.Map.Map.NearestVertexSquareRange(mousemappos, vrange);
+				if(nv != null)
+				{
+					p.pos = nv.Position;
+					//p.stitch = true;
+					//p.stitchline = true;
+					return p;
+				}
+
+				// Try the nearest linedef
+				Linedef nl = General.Map.Map.NearestLinedefRange(mousemappos, BuilderPlug.Me.StitchRange / renderer.Scale);
+				if(nl != null)
+				{
+					// Snap to grid?
+					if(snaptogrid)
+					{
+						// Get grid intersection coordinates
+						List<Vector2D> coords = nl.GetGridIntersections();
+
+						// Find nearest grid intersection
+						bool found = false;
+						float found_distance = float.MaxValue;
+						Vector2D found_coord = new Vector2D();
+						foreach(Vector2D v in coords)
+						{
+							Vector2D delta = mousemappos - v;
+							if(delta.GetLengthSq() < found_distance)
+							{
+								found_distance = delta.GetLengthSq();
+								found_coord = v;
+								found = true;
+							}
+						}
+
+						if(found)
+						{
+							// Align to the closest grid intersection
+							p.pos = found_coord;
+							//p.stitch = true;
+							//p.stitchline = true;
+							return p;
+						}
+					}
+					else
+					{
+						// Aligned to line
+						p.pos = nl.NearestOnLine(mousemappos);
+						//p.stitch = true;
+						//p.stitchline = true;
+						return p;
+					}
+				}
+			}
+			else
+			{
+				// Always snap to the first drawn vertex so that the user can finish a complete sector without stitching
+				if(points.Count > 0)
+				{
+					if(Vector2D.DistanceSq(mousemappos, points[0].pos) < (vrange * vrange))
+					{
+						p.pos = points[0].pos;
+						//p.stitch = true;
+						//p.stitchline = false;
+						return p;
+					}
+				}
+			}
+
+			// if the mouse cursor is outside the map bondaries check if the line between the last set point and the
+			// mouse cursor intersect any of the boundary lines. If it does, set the position to this intersection
+			if(points.Count > 0 &&
+				(mousemappos.x < General.Map.Config.LeftBoundary || mousemappos.x > General.Map.Config.RightBoundary ||
+				mousemappos.y > General.Map.Config.TopBoundary || mousemappos.y < General.Map.Config.BottomBoundary))
+			{
+				Line2D dline = new Line2D(mousemappos, points[points.Count - 1].pos);
+				bool foundintersection = false;
+				float u = 0.0f;
+				List<Line2D> blines = new List<Line2D>();
+
+				// lines for left, top, right and bottom boundaries
+				blines.Add(new Line2D(General.Map.Config.LeftBoundary, General.Map.Config.BottomBoundary, General.Map.Config.LeftBoundary, General.Map.Config.TopBoundary));
+				blines.Add(new Line2D(General.Map.Config.LeftBoundary, General.Map.Config.TopBoundary, General.Map.Config.RightBoundary, General.Map.Config.TopBoundary));
+				blines.Add(new Line2D(General.Map.Config.RightBoundary, General.Map.Config.TopBoundary, General.Map.Config.RightBoundary, General.Map.Config.BottomBoundary));
+				blines.Add(new Line2D(General.Map.Config.RightBoundary, General.Map.Config.BottomBoundary, General.Map.Config.LeftBoundary, General.Map.Config.BottomBoundary));
+
+				// check for intersections with boundaries
+				for(int i = 0; i < blines.Count; i++)
+				{
+					if(!foundintersection)
+					{
+						// only check for intersection if the last set point is not on the
+						// line we are checking against
+						if(blines[i].GetSideOfLine(points[points.Count - 1].pos) != 0.0f)
+						{
+							foundintersection = blines[i].GetIntersection(dline, out u);
+						}
+					}
+				}
+
+				// if there was no intersection set the position to the last set point
+				if(!foundintersection)
+					vm = points[points.Count - 1].pos;
+				else
+					vm = dline.GetCoordinatesAt(u);
+
+			}
+
+
+			// Snap to grid?
+			if(snaptogrid)
+			{
+				// Aligned to grid
+				p.pos = General.Map.Grid.SnappedToGrid(vm);
+
+				// special handling 
+				if(p.pos.x > General.Map.Config.RightBoundary) p.pos.x = General.Map.Config.RightBoundary;
+				if(p.pos.y < General.Map.Config.BottomBoundary) p.pos.y = General.Map.Config.BottomBoundary;
+				//p.stitch = snaptonearest;
+				//p.stitchline = snaptonearest;
+				return p;
+			}
+			else
+			{
+				// Normal position
+				vm.x = (float)Math.Round(vm.x); //mxd
+				vm.y = (float)Math.Round(vm.y); //mxd
+				p.pos = vm;
+				//p.stitch = snaptonearest;
+				//p.stitchline = snaptonearest;
+				return p;
+			}
+		}
+		
+		// This gets the aligned and snapped draw position
+		protected DrawnVertex GetCurrentPosition()
+		{
+			return GetCurrentPosition(mousemappos, snaptonearest, snaptogrid, snaptocardinaldirection, renderer, points);
+		}
+		
+		// This draws a point at a specific location
+		public bool DrawPointAt(DrawnVertex p)
+		{
+			return DrawPointAt(p.pos, p.stitch, p.stitchline);
+		}
+		
+		// This draws a point at a specific location
+		public virtual bool DrawPointAt(Vector2D pos, bool stitch, bool stitchline)
+		{
+			if(pos.x < General.Map.Config.LeftBoundary || pos.x > General.Map.Config.RightBoundary ||
+				pos.y > General.Map.Config.TopBoundary || pos.y < General.Map.Config.BottomBoundary)
+				return false;
+
+			DrawnVertex newpoint = new DrawnVertex();
+			newpoint.pos = pos;
+			newpoint.stitch = stitch;
+			newpoint.stitchline = stitchline;
+			points.Add(newpoint);
+			labels.Add(new LineLengthLabel(labelshowangle, labeluseoffset));
+			Update();
+
+			// Check if point stitches with the first
+			if((points.Count > 1) && points[points.Count - 1].stitch)
+			{
+				Vector2D p1 = points[0].pos;
+				Vector2D p2 = points[points.Count - 1].pos;
+				Vector2D delta = p1 - p2;
+				if((Math.Abs(delta.x) <= 0.001f) && (Math.Abs(delta.y) <= 0.001f))
+				{
+					//mxd. Seems... logical?
+					if(points.Count == 2) 
+					{
+						OnCancel();
+						return true;
+					}
+					
+					// Finish drawing
+					FinishDraw();
+				}
+			}
+
+			return true;
+		}
+		
+		#endregion
+
+		#region ================== Events
+
+		public override void OnHelp()
+		{
+			General.ShowHelp("e_drawgeometry.html");
+		}
+
+		// Engaging
+		public override void OnEngage()
+		{
+			base.OnEngage();
+			EnableAutoPanning();
+			renderer.SetPresentation(Presentation.Standard);
+			
+			// Set cursor
+			General.Interface.SetCursor(Cursors.Cross);
+		}
+
+		// Disengaging
+		public override void OnDisengage()
+		{
+			base.OnDisengage();
+			DisableAutoPanning();
+		}
+		
+		// Cancelled
+		public override void OnCancel()
+		{
+			// Cancel base class
+			base.OnCancel();
+			
+			// Return to original mode
+			General.Editing.ChangeMode(General.Editing.PreviousStableMode.Name);
+		}
+
+		// Accepted
+		public override void OnAccept()
+		{
+			Cursor.Current = Cursors.AppStarting;
+			General.Settings.FindDefaultDrawSettings();
+
+			// When points have been drawn
+			if(points.Count > 0)
+			{
+				// Make undo for the draw
+				General.Map.UndoRedo.CreateUndo("Line draw");
+				
+				// Make an analysis and show info
+				string[] adjectives = new[]
+				{ "beautiful", "lovely", "romantic", "stylish", "cheerful", "comical",
+				  "awesome", "accurate", "adorable", "adventurous", "attractive", "cute",
+				  "elegant", "glamorous", "gorgeous", "handsome", "magnificent", "unusual",
+				  "outstanding", "mysterious", "amusing", "charming", "fantastic", "jolly" };
+				string word = adjectives[points.Count % adjectives.Length];
+				word = (points.Count > adjectives.Length) ? "very " + word : word;
+				string a = ((word[0] == 'a') || (word[0] == 'e') || (word[0] == 'o') || (word[0] == 'u')) ? "an " : "a ";
+				General.Interface.DisplayStatus(StatusType.Action, "Created " + a + word + " drawing.");
+				
+				// Make the drawing
+				if(!Tools.DrawLines(points, true, BuilderPlug.Me.AutoAlignTextureOffsetsOnCreate)) //mxd
+				{
+					// Drawing failed
+					// NOTE: I have to call this twice, because the first time only cancels this volatile mode
+					General.Map.UndoRedo.WithdrawUndo();
+					General.Map.UndoRedo.WithdrawUndo();
+					return;
+				}
+
+				// Snap to map format accuracy
+				General.Map.Map.SnapAllToAccuracy();
+				
+				// Clear selection
+				General.Map.Map.ClearAllSelected();
+				
+				// Update cached values
+				General.Map.Map.Update();
+
+				// Edit new sectors?
+				List<Sector> newsectors = General.Map.Map.GetMarkedSectors(true);
+				if(BuilderPlug.Me.EditNewSector && (newsectors.Count > 0))
+					General.Interface.ShowEditSectors(newsectors);
+				
+				// Update the used textures
+				General.Map.Data.UpdateUsedTextures();
+
+				//mxd
+				General.Map.Renderer2D.UpdateExtraFloorFlag();
+				
+				// Map is changed
+				General.Map.IsChanged = true;
+			}
+
+			// Done
+			Cursor.Current = Cursors.Default;
+			
+			// Return to original mode
+			General.Editing.ChangeMode(General.Editing.PreviousStableMode.Name);
+		}
+
+		// This redraws the display
+		public override void OnRedrawDisplay()
+		{
+			renderer.RedrawSurface();
+
+			// Render lines
+			if(renderer.StartPlotter(true))
+			{
+				renderer.PlotLinedefSet(General.Map.Map.Linedefs);
+				renderer.PlotVerticesSet(General.Map.Map.Vertices);
+				renderer.Finish();
+			}
+
+			// Render things
+			if(renderer.StartThings(true))
+			{
+				renderer.RenderThingSet(General.Map.Map.Things, Presentation.THINGS_ALPHA);
+				renderer.Finish();
+			}
+
+			// Normal update
+			Update();
+		}
+		
+		// Mouse moving
+		public override void OnMouseMove(MouseEventArgs e)
+		{
+			base.OnMouseMove(e);
+			if(panning) return; //mxd. Skip all this jazz while panning
+			Update();
+		}
+
+		// When a key is released
+		public override void OnKeyUp(KeyEventArgs e)
+		{
+			base.OnKeyUp(e);
+			if((snaptogrid != (General.Interface.ShiftState ^ General.Interface.SnapToGrid)) ||
+			   (snaptonearest != (General.Interface.CtrlState ^ General.Interface.AutoMerge)) ||
+			   (snaptocardinaldirection != (General.Interface.AltState && General.Interface.ShiftState))) Update();
+		}
+
+		// When a key is pressed
+		public override void OnKeyDown(KeyEventArgs e)
+		{
+			base.OnKeyDown(e);
+			if((snaptogrid != (General.Interface.ShiftState ^ General.Interface.SnapToGrid)) ||
+			   (snaptonearest != (General.Interface.CtrlState ^ General.Interface.AutoMerge)) ||
+			   (snaptocardinaldirection != (General.Interface.AltState && General.Interface.ShiftState))) Update();
+		}
+		
+		#endregion
+		
+		#region ================== Actions
+		
+		// Drawing a point
+		[BeginAction("drawpoint")]
+		public void DrawPoint()
+		{
+			// Mouse inside window?
+			if(General.Interface.MouseInDisplay)
+			{
+				DrawnVertex newpoint = GetCurrentPosition();
+				if(!DrawPointAt(newpoint)) General.Interface.DisplayStatus(StatusType.Warning, "Failed to draw point: outside of map boundaries.");
+			}
+		}
+		
+		// Remove a point
+		[BeginAction("removepoint")]
+		public virtual void RemovePoint()
+		{
+			if(points.Count > 0) points.RemoveAt(points.Count - 1);
+			if(labels.Count > 0)
+			{
+				labels[labels.Count - 1].Dispose();
+				labels.RemoveAt(labels.Count - 1);
+			}
+			
+			Update();
+		}
+		
+		// Finish drawing
+		[BeginAction("finishdraw")]
+		public void FinishDraw()
+		{
+			// Accept the changes
+			General.Editing.AcceptMode();
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ClassicModes/DrawGridMode.cs b/Source/Plugins/BuilderModes/ClassicModes/DrawGridMode.cs
new file mode 100644
index 0000000..1261e04
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ClassicModes/DrawGridMode.cs
@@ -0,0 +1,525 @@
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Actions;
+using CodeImp.DoomBuilder.Controls;
+using CodeImp.DoomBuilder.Editing;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Windows;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[EditMode(DisplayName = "Draw Grid Mode",
+			  SwitchAction = "drawgridmode",
+			  ButtonImage = "DrawGridMode.png", //mxd
+			  ButtonOrder = int.MinValue + 5, //mxd
+			  ButtonGroup = "000_drawing", //mxd
+			  AllowCopyPaste = false,
+			  Volatile = true,
+			  Optional = false)]
+
+	public class DrawGridMode : DrawGeometryMode
+	{
+		#region ================== Variables
+
+		private static int horizontalSlices = 3;
+		private static int verticalSlices = 3;
+		private static bool triangulate;
+		private static bool gridlock;
+		private static InterpolationTools.Mode horizontalinterpolation = InterpolationTools.Mode.LINEAR;
+		private static InterpolationTools.Mode verticalinterpolation = InterpolationTools.Mode.LINEAR;
+
+		private readonly List<DrawnVertex[]> gridpoints;
+		private HintLabel hintlabel;
+		
+		private int width;
+		private int height;
+		private int slicesH;
+		private int slicesV;
+		private Vector2D start;
+		private Vector2D end;
+
+		//interface
+		private DrawGridOptionsPanel panel;
+		private Docker docker;
+
+		#endregion
+
+		#region ================== Constructor
+
+		public DrawGridMode() 
+		{
+			snaptogrid = true;
+			usefourcardinaldirections = true;
+			gridpoints = new List<DrawnVertex[]>();
+		}
+
+		#endregion
+
+		#region ================== Events
+
+		public override void OnEngage() 
+		{
+			base.OnEngage();
+
+			// Create and setup settings panel
+			panel = new DrawGridOptionsPanel();
+			panel.MaxHorizontalSlices = (int)General.Map.FormatInterface.MaxCoordinate;
+			panel.MaxVerticalSlices = (int) General.Map.FormatInterface.MaxCoordinate;
+			panel.Triangulate = triangulate;
+			panel.LockToGrid = gridlock;
+			panel.HorizontalSlices = horizontalSlices - 1;
+			panel.VerticalSlices = verticalSlices - 1;
+			panel.HorizontalInterpolationMode = horizontalinterpolation;
+			panel.VerticalInterpolationMode = verticalinterpolation;
+
+			panel.OnValueChanged += OptionsPanelOnValueChanged;
+			panel.OnGridLockChanged += OptionsPanelOnOnGridLockChanged;
+
+			// Add docker
+			docker = new Docker("drawgrid", "Draw Grid", panel);
+			General.Interface.AddDocker(docker);
+			General.Interface.SelectDocker(docker);
+		}
+
+		public override void OnDisengage() 
+		{
+			base.OnDisengage();
+
+			// Remove docker
+			General.Interface.RemoveDocker(docker);
+			panel.Dispose();
+			panel = null;
+		}
+
+		override public void OnAccept() 
+		{
+			Cursor.Current = Cursors.AppStarting;
+			General.Settings.FindDefaultDrawSettings();
+
+			// When we have a shape...
+			if(gridpoints.Count > 0) 
+			{
+				// Make undo for the draw
+				General.Map.UndoRedo.CreateUndo("Grid draw");
+
+				// Make an analysis and show info
+				string[] adjectives = new[] { "gloomy", "sad", "unhappy", "lonely", "troubled", "depressed", "heartsick", "glum", "pessimistic", "bitter", "downcast" }; // aaand my english vocabulary ends here :)
+				string word = adjectives[new Random().Next(adjectives.Length - 1)];
+				string a = (word[0] == 'u' ? "an " : "a ");
+
+				General.Interface.DisplayStatus(StatusType.Action, "Created " + a + word + " grid.");
+
+				List<Sector> newsectors = new List<Sector>();
+				foreach(DrawnVertex[] shape in gridpoints) 
+				{
+					if(!Tools.DrawLines(shape, true, BuilderPlug.Me.AutoAlignTextureOffsetsOnCreate)) 
+					{
+						// Drawing failed
+						// NOTE: I have to call this twice, because the first time only cancels this volatile mode
+						General.Map.UndoRedo.WithdrawUndo();
+						General.Map.UndoRedo.WithdrawUndo();
+						return;
+					}
+
+					// Update cached values after each step...
+					General.Map.Map.Update();
+
+					newsectors.AddRange(General.Map.Map.GetMarkedSectors(true));
+				}
+
+				// Snap to map format accuracy
+				General.Map.Map.SnapAllToAccuracy();
+
+				// Clear selection
+				General.Map.Map.ClearAllSelected();
+
+				// Edit new sectors?
+				if(BuilderPlug.Me.EditNewSector && (newsectors.Count > 0))
+					General.Interface.ShowEditSectors(newsectors);
+
+				// Update the used textures
+				General.Map.Data.UpdateUsedTextures();
+
+				//mxd
+				General.Map.Renderer2D.UpdateExtraFloorFlag();
+
+				// Map is changed
+				General.Map.IsChanged = true;
+			}
+
+			// Done
+			Cursor.Current = Cursors.Default;
+
+			// Return to original mode
+			General.Editing.ChangeMode(General.Editing.PreviousStableMode.Name);
+		}
+
+		private void OptionsPanelOnValueChanged(object sender, EventArgs eventArgs) 
+		{
+			triangulate = panel.Triangulate;
+			horizontalSlices = panel.HorizontalSlices + 1;
+			verticalSlices = panel.VerticalSlices + 1;
+			horizontalinterpolation = panel.HorizontalInterpolationMode;
+			verticalinterpolation = panel.VerticalInterpolationMode;
+			Update();
+		}
+
+		private void OptionsPanelOnOnGridLockChanged(object sender, EventArgs eventArgs) 
+		{
+			gridlock = panel.LockToGrid;
+			General.Hints.ShowHints(this.GetType(), (gridlock ? "gridlockhelp" : "general"));
+			Update();
+		}
+
+		public override void OnHelp() 
+		{
+			General.ShowHelp("/gzdb/features/classic_modes/mode_drawgrid.html");
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		override protected void Update() 
+		{
+			PixelColor stitchcolor = General.Colors.Highlight;
+			PixelColor losecolor = General.Colors.Selection;
+
+			// We WANT snaptogrid and DON'T WANT snaptonearest when lock to grid is enabled
+			snaptocardinaldirection = General.Interface.ShiftState && General.Interface.AltState; //mxd
+			snaptogrid = (snaptocardinaldirection || gridlock || (General.Interface.ShiftState ^ General.Interface.SnapToGrid));
+			snaptonearest = (!gridlock && (General.Interface.CtrlState ^ General.Interface.AutoMerge));
+
+			DrawnVertex curp;
+			if(points.Count == 1)
+			{
+				// Handle the case when start point is not on current grid.
+				Vector2D gridoffset = General.Map.Grid.SnappedToGrid(points[0].pos) - points[0].pos;
+				curp = GetCurrentPosition(mousemappos + gridoffset, snaptonearest, snaptogrid, snaptocardinaldirection, renderer, points);
+				curp.pos -= gridoffset;
+			}
+			else
+			{
+				curp = GetCurrentPosition();
+			}
+			
+			float vsize = (renderer.VertexSize + 1.0f) / renderer.Scale;
+
+			// Render drawing lines
+			if(renderer.StartOverlay(true)) 
+			{
+				PixelColor color = snaptonearest ? stitchcolor : losecolor;
+
+				if(points.Count == 1) 
+				{
+					UpdateReferencePoints(points[0], curp);
+					List<Vector2D[]> shapes = GetShapes(start, end);
+
+					//render shape
+					foreach(Vector2D[] shape in shapes) 
+					{
+						for(int i = 1; i < shape.Length; i++)
+						renderer.RenderLine(shape[i - 1], shape[i], LINE_THICKNESS, color, true);
+					}
+
+					//vertices
+					foreach(Vector2D[] shape in shapes) 
+					{
+						for(int i = 0; i < shape.Length; i++)
+							renderer.RenderRectangleFilled(new RectangleF(shape[i].x - vsize, shape[i].y - vsize, vsize * 2.0f, vsize * 2.0f), color, true);
+					}
+
+					//and labels
+					Vector2D[] labelCoords = new[] { start, new Vector2D(end.x, start.y), end, new Vector2D(start.x, end.y), start };
+					for(int i = 1; i < 5; i++) 
+					{
+						labels[i - 1].Move(labelCoords[i], labelCoords[i - 1]);
+						renderer.RenderText(labels[i - 1].TextLabel);
+					}
+
+					//render hint
+					if(horizontalSlices > 1 || verticalSlices > 1) 
+					{
+						hintlabel.Text = "H: " + (slicesH - 1) + "; V: " + (slicesV - 1);
+						if(width > hintlabel.Text.Length * vsize && height > 16 * vsize) 
+						{
+							hintlabel.Move(start, end);
+							renderer.RenderText(hintlabel.TextLabel);
+						}
+					}
+				} 
+				else 
+				{
+					// Render vertex at cursor
+					renderer.RenderRectangleFilled(new RectangleF(curp.pos.x - vsize, curp.pos.y - vsize, vsize * 2.0f, vsize * 2.0f), color, true);
+				}
+
+				// Done
+				renderer.Finish();
+			}
+
+			// Done
+			renderer.Present();
+		}
+
+		// This draws a point at a specific location
+		override public bool DrawPointAt(Vector2D pos, bool stitch, bool stitchline) 
+		{
+			if(pos.x < General.Map.Config.LeftBoundary || pos.x > General.Map.Config.RightBoundary ||
+				pos.y > General.Map.Config.TopBoundary || pos.y < General.Map.Config.BottomBoundary)
+				return false;
+
+			DrawnVertex newpoint = new DrawnVertex();
+			newpoint.pos = pos;
+			newpoint.stitch = true;
+			newpoint.stitchline = stitchline;
+			points.Add(newpoint);
+
+			if(points.Count == 1) 
+			{ 
+				// Add labels
+				labels.AddRange(new[] { new LineLengthLabel(false, true), new LineLengthLabel(false, true), new LineLengthLabel(false, true), new LineLengthLabel(false, true) });
+				hintlabel = new HintLabel(General.Colors.InfoLine);
+				Update();
+			} 
+			else if(points[0].pos == points[1].pos) 
+			{
+				// Nothing is drawn
+				FinishDraw();
+			} 
+			else 
+			{
+				// Handle the case when start point is not on current grid.
+				Vector2D gridoffset = General.Map.Grid.SnappedToGrid(points[0].pos) - points[0].pos;
+				newpoint = GetCurrentPosition(mousemappos + gridoffset, snaptonearest, snaptogrid, snaptocardinaldirection, renderer, new List<DrawnVertex> { points[0] });
+				newpoint.pos -= gridoffset;
+				
+				// Create vertices for final shape.
+				UpdateReferencePoints(points[0], newpoint);
+				List<Vector2D[]> shapes = GetShapes(start, end);
+
+				foreach(Vector2D[] shape in shapes) 
+				{
+					DrawnVertex[] verts = new DrawnVertex[shape.Length];
+					for(int i = 0; i < shape.Length; i++) 
+					{
+						newpoint = new DrawnVertex();
+						newpoint.pos = shape[i];
+						newpoint.stitch = true;
+						newpoint.stitchline = stitchline;
+						verts[i] = newpoint;
+					}
+
+					gridpoints.Add(verts);
+				}
+
+				FinishDraw();
+			}
+			return true;
+		}
+
+		private List<Vector2D[]> GetShapes(Vector2D s, Vector2D e) 
+		{
+			//no shape
+			if(s == e) return new List<Vector2D[]>();
+
+			//setup slices
+			if(gridlock) 
+			{
+				slicesH = width / General.Map.Grid.GridSize;
+				slicesV = height / General.Map.Grid.GridSize;
+			} 
+			else 
+			{
+				slicesH = horizontalSlices;
+				slicesV = verticalSlices;
+			}
+
+			//create a segmented line
+			List<Vector2D[]> shapes;
+			if(width == 0 || height == 0)
+			{
+				if(slicesH > 0 && width > 0)
+				{
+					shapes = new List<Vector2D[]>();
+					int step = width / slicesH;
+					for(int w = 0; w < slicesH; w++)
+					{
+						shapes.Add(new[] { new Vector2D((int)s.x + step * w, (int)s.y), new Vector2D((int)s.x + step * w + step, (int)s.y) });
+					}
+					return shapes;
+				}
+
+				if(slicesV > 0 && height > 0)
+				{
+					shapes = new List<Vector2D[]>();
+					int step = height / slicesV;
+					for(int h = 0; h < slicesV; h++)
+					{
+						shapes.Add(new[] {new Vector2D((int) s.x, (int) s.y + step * h), new Vector2D((int) s.x, (int) s.y + step * h + step)});
+					}
+					return shapes;
+				}
+
+				//create a line
+				return new List<Vector2D[]> {new[] {s, e}};
+			}
+
+			//create shape
+			List<Vector2D> rect = new List<Vector2D> { s, new Vector2D((int)s.x, (int)e.y), e, new Vector2D((int)e.x, (int)s.y), s };
+			if(!gridlock && slicesH == 1 && slicesV == 1) 
+			{
+				if(triangulate) rect.AddRange(new[] { s, e });
+				return new List<Vector2D[]> { rect.ToArray() };
+			}
+
+			//create blocks
+			shapes = new List<Vector2D[]> { rect.ToArray() };
+			RectangleF[,] blocks = new RectangleF[slicesH, slicesV];
+			for(int w = 0; w < slicesH; w++) 
+			{
+				for(int h = 0; h < slicesV; h++) 
+				{
+					float left = InterpolationTools.Interpolate(s.x, e.x, (float)w / slicesH, horizontalinterpolation);
+					float top = InterpolationTools.Interpolate(s.y, e.y, (float)h / slicesV, verticalinterpolation);
+					float right = InterpolationTools.Interpolate(s.x, e.x, (w + 1.0f) / slicesH, horizontalinterpolation);
+					float bottom = InterpolationTools.Interpolate(s.y, e.y, (h + 1.0f)/ slicesV, verticalinterpolation);
+					blocks[w, h] = RectangleF.FromLTRB(left, top, right, bottom);
+				}
+			}
+
+			//add subdivisions
+			if(slicesH > 1) 
+			{
+				for(int w = 1; w < slicesH; w++) 
+				{
+					int px = (int) Math.Round(blocks[w, 0].X);
+					shapes.Add(new[] {new Vector2D(px, s.y), new Vector2D(px, e.y)});
+				}
+			}
+			if(slicesV > 1) 
+			{
+				for(int h = 1; h < slicesV; h++) 
+				{
+					int py = (int) Math.Round(blocks[0, h].Y);
+					shapes.Add(new[] { new Vector2D(s.x, py), new Vector2D(e.x, py) });
+				}
+			}
+
+			//triangulate?
+			if(triangulate) 
+			{
+				bool startflip = ((int)Math.Round(((s.x + e.y) / General.Map.Grid.GridSize) % 2) == 0);
+				bool flip = startflip;
+
+				for(int w = 0; w < slicesH; w++) 
+				{
+					for(int h = slicesV - 1; h > -1; h--) 
+					{
+						if(flip)
+							shapes.Add(new[] { new Vector2D(blocks[w, h].X, blocks[w, h].Y), new Vector2D(blocks[w, h].Right, blocks[w, h].Bottom) });
+						else
+							shapes.Add(new[] { new Vector2D(blocks[w, h].Right, blocks[w, h].Y), new Vector2D(blocks[w, h].X, blocks[w, h].Bottom) });
+
+						flip = !flip;
+					}
+
+					startflip = !startflip;
+					flip = startflip;
+				}
+			}
+
+			return shapes;
+		}
+
+		//update bottom-left and top-right points, which define drawing shape
+		private void UpdateReferencePoints(DrawnVertex p1, DrawnVertex p2) 
+		{
+			if(!p1.pos.IsFinite() || !p2.pos.IsFinite()) return;
+			
+			if(p1.pos.x < p2.pos.x) 
+			{
+				start.x = p1.pos.x;
+				end.x = p2.pos.x;
+			} 
+			else 
+			{
+				start.x = p2.pos.x;
+				end.x = p1.pos.x;
+			}
+
+			if(p1.pos.y < p2.pos.y) 
+			{
+				start.y = p1.pos.y;
+				end.y = p2.pos.y;
+			} 
+			else 
+			{
+				start.y = p2.pos.y;
+				end.y = p1.pos.y;
+			}
+
+			width = (int)(end.x - start.x);
+			height = (int)(end.y - start.y);
+		}
+
+		#endregion
+
+		#region ================== Actions
+
+		[BeginAction("increasebevel")]
+		protected void IncreaseBevel()
+		{
+			if(!gridlock && (points.Count < 2 || horizontalSlices < width - 2) && horizontalSlices - 1 < panel.MaxHorizontalSlices) 
+			{
+				horizontalSlices++;
+				panel.HorizontalSlices = horizontalSlices - 1;
+				Update();
+			}
+		}
+
+		[BeginAction("decreasebevel")]
+		protected void DecreaseBevel()
+		{
+			if(!gridlock && horizontalSlices > 1) 
+			{
+				horizontalSlices--;
+				panel.HorizontalSlices = horizontalSlices - 1;
+				Update();
+			}
+		}
+
+		[BeginAction("increasesubdivlevel")]
+		protected void IncreaseSubdivLevel()
+		{
+			if(!gridlock && (points.Count < 2 || verticalSlices < height - 2) && verticalSlices - 1 < panel.MaxVerticalSlices) 
+			{
+				verticalSlices++;
+				panel.VerticalSlices = verticalSlices - 1;
+				Update();
+			}
+		}
+
+		[BeginAction("decreasesubdivlevel")]
+		protected void DecreaseSubdivLevel()
+		{
+			if(!gridlock && verticalSlices > 1) 
+			{
+				verticalSlices--;
+				panel.VerticalSlices = verticalSlices - 1;
+				Update();
+			}
+		}
+
+		#endregion
+
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ClassicModes/DrawRectangleMode.cs b/Source/Plugins/BuilderModes/ClassicModes/DrawRectangleMode.cs
new file mode 100644
index 0000000..5269ad9
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ClassicModes/DrawRectangleMode.cs
@@ -0,0 +1,468 @@
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Editing;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Actions;
+using CodeImp.DoomBuilder.Windows;
+using CodeImp.DoomBuilder.Map;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[EditMode(DisplayName = "Draw Rectangle Mode",
+			  SwitchAction = "drawrectanglemode",
+			  ButtonImage = "DrawRectangleMode.png", //mxd	
+			  ButtonOrder = int.MinValue + 3, //mxd
+			  ButtonGroup = "000_drawing", //mxd
+			  AllowCopyPaste = false,
+			  Volatile = true,
+			  Optional = false)]
+
+	public class DrawRectangleMode : DrawGeometryMode
+	{
+		#region ================== Variables
+
+		protected HintLabel hintlabel;
+		protected int bevelWidth;
+		protected int currentBevelWidth;
+		protected int subdivisions;
+
+		protected int maxSubdivisions;
+		protected int minSubdivisions;
+
+		protected string undoName = "Rectangle draw";
+		protected string shapeName = "rectangle";
+
+		protected Vector2D start;
+		protected Vector2D end;
+		protected int width;
+		protected int height;
+
+		//interface
+		private DrawRectangleOptionsPanel panel;
+
+		#endregion
+
+		#region ================== Constructor/Disposer
+
+		public DrawRectangleMode() 
+		{
+			snaptogrid = true;
+			usefourcardinaldirections = true;
+			SetupInterface();
+		}
+
+		public override void Dispose() 
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Clean up
+				if(hintlabel != null) hintlabel.Dispose();
+
+				// Done
+				base.Dispose();
+			}
+		}
+
+		#endregion
+
+		#region ================== Settings panel
+
+		protected virtual void SetupInterface() 
+		{
+			maxSubdivisions = 16;
+
+			//Add options docker
+			panel = new DrawRectangleOptionsPanel();
+			panel.MaxSubdivisions = maxSubdivisions;
+			panel.MinSubdivisions = minSubdivisions;
+			panel.MaxBevelWidth = (int)General.Map.FormatInterface.MaxCoordinate;
+			panel.MinBevelWidth = (int)General.Map.FormatInterface.MinCoordinate;
+			panel.OnValueChanged += OptionsPanelOnValueChanged;
+		}
+
+		protected virtual void AddInterface() 
+		{
+			panel.Register();
+			bevelWidth = panel.BevelWidth;
+			subdivisions = panel.Subdivisions;
+		}
+
+		protected virtual void RemoveInterface() 
+		{
+			panel.Unregister();
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		override protected void Update() 
+		{
+			PixelColor stitchcolor = General.Colors.Highlight;
+			PixelColor losecolor = General.Colors.Selection;
+
+			snaptocardinaldirection = General.Interface.ShiftState && General.Interface.AltState; //mxd
+			snaptogrid = (snaptocardinaldirection || General.Interface.ShiftState ^ General.Interface.SnapToGrid);
+			snaptonearest = General.Interface.CtrlState ^ General.Interface.AutoMerge;
+
+			DrawnVertex curp = GetCurrentPosition();
+			float vsize = (renderer.VertexSize + 1.0f) / renderer.Scale;
+
+			// Render drawing lines
+			if(renderer.StartOverlay(true)) 
+			{
+				PixelColor color = snaptonearest ? stitchcolor : losecolor;
+				
+				if(points.Count == 1) 
+				{
+					UpdateReferencePoints(points[0], curp);
+					Vector2D[] shape = GetShape(start, end);
+
+					//render shape
+					for(int i = 1; i < shape.Length; i++)
+						renderer.RenderLine(shape[i - 1], shape[i], LINE_THICKNESS, color, true);
+
+					//vertices
+					for(int i = 0; i < shape.Length; i++)
+						renderer.RenderRectangleFilled(new RectangleF(shape[i].x - vsize, shape[i].y - vsize, vsize * 2.0f, vsize * 2.0f), color, true);
+
+					//and labels
+					Vector2D[] labelCoords = new[] { start, new Vector2D(end.x, start.y), end, new Vector2D(start.x, end.y), start };
+					for(int i = 1; i < 5; i++) 
+					{
+						labels[i - 1].Move(labelCoords[i], labelCoords[i - 1]);
+						renderer.RenderText(labels[i - 1].TextLabel);
+					}
+
+					//got beveled corners? 
+					if(shape.Length > 5) 
+					{
+						//render hint
+						if(width > 64 * vsize && height > 16 * vsize) 
+						{
+							hintlabel.Move(start, end);
+							hintlabel.Text = GetHintText();
+							renderer.RenderText(hintlabel.TextLabel);
+						}
+						
+						//and shape corners
+						for(int i = 0; i < 4; i++)
+							renderer.RenderRectangleFilled(new RectangleF(labelCoords[i].x - vsize, labelCoords[i].y - vsize, vsize * 2.0f, vsize * 2.0f), General.Colors.InfoLine, true);
+					}
+				} 
+				else 
+				{
+					// Render vertex at cursor
+					renderer.RenderRectangleFilled(new RectangleF(curp.pos.x - vsize, curp.pos.y - vsize, vsize * 2.0f, vsize * 2.0f), color, true);
+				}
+
+				// Done
+				renderer.Finish();
+			}
+
+			// Done
+			renderer.Present();
+		}
+
+		protected virtual Vector2D[] GetShape(Vector2D pStart, Vector2D pEnd) 
+		{
+			//no shape
+			if(pStart == pEnd) 
+			{
+				currentBevelWidth = 0;
+				return new Vector2D[0];
+			}
+
+			//line
+			if(pEnd.x == pStart.x || pEnd.y == pStart.y) 
+			{
+				currentBevelWidth = 0;
+				return new[] { pStart, pEnd };
+			}
+
+			//no corners
+			if(bevelWidth == 0) 
+			{
+				currentBevelWidth = 0;
+				return new[] { pStart, new Vector2D((int)pStart.x, (int)pEnd.y), pEnd, new Vector2D((int)pEnd.x, (int)pStart.y), pStart };
+			}
+
+			//got corners. TODO: check point order
+			bool reverse = false;
+			currentBevelWidth = Math.Min(Math.Abs(bevelWidth), Math.Min(width, height) / 2);
+			
+			if(bevelWidth < 0) 
+			{
+				currentBevelWidth *= -1;
+				reverse = true;
+			}
+
+			List<Vector2D> shape = new List<Vector2D>();
+
+			//top-left corner
+			shape.AddRange(GetCornerPoints(pStart, currentBevelWidth, currentBevelWidth, !reverse));
+
+			//top-right corner
+			shape.AddRange(GetCornerPoints(new Vector2D(pEnd.x, pStart.y), -currentBevelWidth, currentBevelWidth, reverse));
+
+			//bottom-right corner
+			shape.AddRange(GetCornerPoints(pEnd, -currentBevelWidth, -currentBevelWidth, !reverse));
+
+			//bottom-left corner
+			shape.AddRange(GetCornerPoints(new Vector2D(pStart.x, pEnd.y), currentBevelWidth, -currentBevelWidth, reverse));
+
+			//closing point
+			shape.Add(shape[0]);
+
+			return shape.ToArray();
+		}
+
+		private Vector2D[] GetCornerPoints(Vector2D startPoint, int bevel_width, int bevel_height, bool reverse) 
+		{
+			Vector2D[] points;
+			Vector2D center = (bevelWidth > 0 ? new Vector2D(startPoint.x + bevel_width, startPoint.y + bevel_height) : startPoint);
+			float curAngle = Angle2D.PI;
+
+			int steps = subdivisions + 2;
+			points = new Vector2D[steps];
+			float stepAngle = Angle2D.PIHALF / (subdivisions + 1);
+
+			for(int i = 0; i < steps; i++) 
+			{
+				points[i] = new Vector2D(center.x + (float)Math.Sin(curAngle) * bevel_width, center.y + (float)Math.Cos(curAngle) * bevel_height);
+				curAngle += stepAngle;
+			}
+
+			if(reverse) Array.Reverse(points);
+			return points;
+		}
+
+		protected virtual string GetHintText() 
+		{
+			return "BVL: " + bevelWidth + "; SUB: " + subdivisions;
+		}
+
+		//update top-left and bottom-right points, which define drawing shape
+		private void UpdateReferencePoints(DrawnVertex p1, DrawnVertex p2) 
+		{
+			if(!p1.pos.IsFinite() || !p2.pos.IsFinite()) return;
+
+			if(p1.pos.x < p2.pos.x) 
+			{
+				start.x = p1.pos.x;
+				end.x = p2.pos.x;
+			} 
+			else 
+			{
+				start.x = p2.pos.x;
+				end.x = p1.pos.x;
+			}
+
+			if(p1.pos.y < p2.pos.y) 
+			{
+				start.y = p1.pos.y;
+				end.y = p2.pos.y;
+			} 
+			else 
+			{
+				start.y = p2.pos.y;
+				end.y = p1.pos.y;
+			}
+
+			width = (int)(end.x - start.x);
+			height = (int)(end.y - start.y);
+		}
+
+		// This draws a point at a specific location
+		override public bool DrawPointAt(Vector2D pos, bool stitch, bool stitchline) 
+		{
+			if(pos.x < General.Map.Config.LeftBoundary || pos.x > General.Map.Config.RightBoundary ||
+				pos.y > General.Map.Config.TopBoundary || pos.y < General.Map.Config.BottomBoundary)
+				return false;
+
+			DrawnVertex newpoint = new DrawnVertex();
+			newpoint.pos = pos;
+			newpoint.stitch = true; //stitch
+			newpoint.stitchline = stitchline;
+			points.Add(newpoint);
+
+			if(points.Count == 1) //add point and labels
+			{ 
+				labels.AddRange(new[] { new LineLengthLabel(false, true), new LineLengthLabel(false, true), new LineLengthLabel(false, true), new LineLengthLabel(false, true) });
+				hintlabel = new HintLabel(General.Colors.InfoLine);
+				Update();
+			} 
+			else if(points[0].pos == points[1].pos) //nothing is drawn
+			{ 
+				points = new List<DrawnVertex>();
+				FinishDraw();
+			} 
+			else 
+			{
+				//create vertices for final shape. 
+				UpdateReferencePoints(points[0], newpoint);
+				points = new List<DrawnVertex>(); //clear points
+				Vector2D[] shape = GetShape(start, end);
+
+				foreach(Vector2D t in shape) base.DrawPointAt(t, true, true);
+
+				FinishDraw();
+			}
+			return true;
+		}
+
+		override public void RemovePoint() 
+		{
+			if(points.Count > 0) points.RemoveAt(points.Count - 1);
+			if(labels.Count > 0) labels = new List<LineLengthLabel>();
+			Update();
+		}
+
+		#endregion
+
+		#region ================== Events
+
+		public override void OnEngage() 
+		{
+			base.OnEngage();
+			AddInterface();
+		}
+
+		public override void OnDisengage() 
+		{
+			RemoveInterface();
+			base.OnDisengage();
+		}
+		
+		override public void OnAccept() 
+		{
+			Cursor.Current = Cursors.AppStarting;
+			General.Settings.FindDefaultDrawSettings();
+
+			// When we have a rectangle or a line
+			if(points.Count > 4 || points.Count == 2) 
+			{
+				// Make undo for the draw
+				General.Map.UndoRedo.CreateUndo(undoName);
+
+				// Make an analysis and show info
+				string[] adjectives = new[] { "gloomy", "sad", "unhappy", "lonely", "troubled", "depressed", "heartsick", "glum", "pessimistic", "bitter", "downcast" }; // aaand my english vocabulary ends here :)
+				string word = adjectives[new Random().Next(adjectives.Length - 1)];
+				string a = (word[0] == 'u' ? "an " : "a ");
+
+				General.Interface.DisplayStatus(StatusType.Action, "Created " + a + word + " " + shapeName + ".");
+
+				// Make the drawing
+				if(!Tools.DrawLines(points, true, BuilderPlug.Me.AutoAlignTextureOffsetsOnCreate)) 
+				{
+					// Drawing failed
+					// NOTE: I have to call this twice, because the first time only cancels this volatile mode
+					General.Map.UndoRedo.WithdrawUndo();
+					General.Map.UndoRedo.WithdrawUndo();
+					return;
+				}
+
+				// Snap to map format accuracy
+				General.Map.Map.SnapAllToAccuracy();
+
+				// Clear selection
+				General.Map.Map.ClearAllSelected();
+
+				// Update cached values
+				General.Map.Map.Update();
+
+				// Edit new sectors?
+				List<Sector> newsectors = General.Map.Map.GetMarkedSectors(true);
+				if(BuilderPlug.Me.EditNewSector && (newsectors.Count > 0))
+					General.Interface.ShowEditSectors(newsectors);
+
+				// Update the used textures
+				General.Map.Data.UpdateUsedTextures();
+
+				//mxd
+				General.Map.Renderer2D.UpdateExtraFloorFlag();
+
+				// Map is changed
+				General.Map.IsChanged = true;
+			}
+
+			// Done
+			Cursor.Current = Cursors.Default;
+
+			// Return to original mode
+			General.Editing.ChangeMode(General.Editing.PreviousStableMode.Name);
+		}
+
+		public override void OnHelp() 
+		{
+			General.ShowHelp("/gzdb/features/classic_modes/mode_drawrect.html");
+		}
+
+		private void OptionsPanelOnValueChanged(object sender, EventArgs eventArgs) 
+		{
+			bevelWidth = panel.BevelWidth;
+			subdivisions = panel.Subdivisions;
+			Update();
+		}
+
+		#endregion
+
+		#region ================== Actions
+
+		[BeginAction("increasesubdivlevel")]
+		protected virtual void IncreaseSubdivLevel() 
+		{
+			if(subdivisions < maxSubdivisions) 
+			{
+				subdivisions++;
+				panel.Subdivisions = subdivisions;
+				Update();
+			}
+		}
+
+		[BeginAction("decreasesubdivlevel")]
+		protected virtual void DecreaseSubdivLevel() 
+		{
+			if(subdivisions > minSubdivisions) 
+			{
+				subdivisions--;
+				panel.Subdivisions = subdivisions;
+				Update();
+			}
+		}
+
+		[BeginAction("increasebevel")]
+		protected virtual void IncreaseBevel() 
+		{
+			if(points.Count < 2 || currentBevelWidth == bevelWidth || bevelWidth < 0) 
+			{
+				bevelWidth = Math.Min(bevelWidth + General.Map.Grid.GridSize, panel.MaxBevelWidth);
+				panel.BevelWidth = bevelWidth;
+				Update();
+			}
+		}
+
+		[BeginAction("decreasebevel")]
+		protected virtual void DecreaseBevel() 
+		{
+			if(currentBevelWidth == bevelWidth || bevelWidth > 0) 
+			{
+				bevelWidth = Math.Max(bevelWidth - General.Map.Grid.GridSize, panel.MinBevelWidth);
+				panel.BevelWidth = bevelWidth;
+				Update();
+			}
+		}
+
+		#endregion
+
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ClassicModes/EditSelectionMode.cs b/Source/Plugins/BuilderModes/ClassicModes/EditSelectionMode.cs
new file mode 100644
index 0000000..1e22017
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ClassicModes/EditSelectionMode.cs
@@ -0,0 +1,1897 @@
+	
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Actions;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Controls;
+using CodeImp.DoomBuilder.Data;
+using CodeImp.DoomBuilder.Editing;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Types;
+using CodeImp.DoomBuilder.Windows;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[EditMode(DisplayName = "Edit Selection Mode",
+			  SwitchAction = "editselectionmode",
+			  ButtonImage = "Selection3.png",
+			  ButtonOrder = 1,
+			  ButtonGroup = "002_modify",
+			  Volatile = true,
+			  UseByDefault = true,
+			  Optional = false)]
+
+	public class EditSelectionMode : BaseClassicMode
+	{
+		#region ================== Enums
+
+		private enum ModifyMode
+		{
+			None,
+			Dragging,
+			Resizing,
+			Rotating
+		}
+
+		private enum Grip
+		{
+			None,
+			Main,
+			SizeN,
+			SizeS,
+			SizeE,
+			SizeW,
+			RotateLT,
+			RotateRT,
+			RotateRB,
+			RotateLB
+		}
+
+		#endregion
+
+		#region ================== Structs (mxd)
+
+		private struct SectorTextureInfo
+		{
+			public readonly SurfaceTextureInfo Floor;
+			public readonly SurfaceTextureInfo Ceiling;
+
+			public SectorTextureInfo(Sector s)
+			{
+				// Get transform properties
+				Floor.Offset = new Vector2D(UniFields.GetFloat(s.Fields, "xpanningfloor", 0f), UniFields.GetFloat(s.Fields, "ypanningfloor", 0f));
+				Ceiling.Offset = new Vector2D(UniFields.GetFloat(s.Fields, "xpanningceiling", 0f), UniFields.GetFloat(s.Fields, "ypanningceiling", 0f));
+				Floor.Scale = new Vector2D(UniFields.GetFloat(s.Fields, "xscalefloor", 1.0f), -UniFields.GetFloat(s.Fields, "yscalefloor", 1.0f));
+				Ceiling.Scale = new Vector2D(UniFields.GetFloat(s.Fields, "xscaleceiling", 1.0f), -UniFields.GetFloat(s.Fields, "yscaleceiling", 1.0f));
+				Floor.Rotation = Angle2D.DegToRad(UniFields.GetFloat(s.Fields, "rotationfloor", 0f));
+				Ceiling.Rotation = Angle2D.DegToRad(UniFields.GetFloat(s.Fields, "rotationceiling", 0f));
+
+				// Get texture sizes
+				Floor.TextureSize = GetTextureSize(s.LongFloorTexture);
+				Ceiling.TextureSize = GetTextureSize(s.LongCeilTexture);
+
+				// Surface name
+				Floor.Part = "floor";
+				Ceiling.Part = "ceiling";
+			}
+
+			private static Size GetTextureSize(long hash)
+			{
+				ImageData texture = General.Map.Data.GetFlatImage(hash);
+				if((texture == null) || (texture == General.Map.Data.WhiteTexture) ||
+				   (texture.Width <= 0) || (texture.Height <= 0) || !texture.IsImageLoaded) 
+				{
+					return new Size();
+				}
+
+				return new Size((int)Math.Round(texture.ScaledWidth), (int)Math.Round(texture.ScaledHeight));
+			}
+		}
+
+		private struct SurfaceTextureInfo
+		{
+			public Vector2D Offset;
+			public Vector2D Scale;
+			public Size TextureSize;
+			public float Rotation;
+			public string Part;
+		}
+
+		#endregion
+
+		#region ================== Constants
+
+		private const float GRIP_SIZE = 9.0f;
+		private const float ZERO_SIZE_ADDITION = 20.0f;
+		private const byte RECTANGLE_ALPHA = 60;
+		private const byte EXTENSION_LINE_ALPHA = 150;
+		private readonly Cursor[] RESIZE_CURSORS = { Cursors.SizeNS, Cursors.SizeNWSE, Cursors.SizeWE, Cursors.SizeNESW };
+		
+		#endregion
+
+		#region ================== Variables
+
+		// Modes
+		private bool modealreadyswitching;
+		private bool clearselection; //mxd
+		private bool pasting;
+		private PasteOptions pasteoptions;
+		
+		// Docker
+		private EditSelectionPanel panel;
+		private Docker docker;
+		
+		// Highlighted vertex
+		private MapElement highlighted;
+		private Vector2D highlightedpos;
+
+		// Selection
+		private ICollection<Vertex> selectedvertices;
+		private ICollection<Thing> selectedthings;
+		private Dictionary<Sector, SectorTextureInfo> selectedsectors; //mxd
+		private List<int> fixedrotationthingtypes; //mxd 
+		private ICollection<Linedef> selectedlines;
+		private List<Vector2D> vertexpos;
+		private List<Vector2D> thingpos;
+		private List<float> thingangle;
+		private ICollection<Vertex> unselectedvertices;
+		private ICollection<Linedef> unselectedlines;
+
+		// Modification
+		private float rotation;
+		private Vector2D offset;
+		private Vector2D size;
+		private Vector2D scale = new Vector2D(1.0f, 1.0f); //mxd
+		private Vector2D baseoffset;
+		private Vector2D basesize;
+		private bool linesflipped;
+		private bool usepreciseposition; //mxd
+
+		//mxd. Texture modification
+		private static bool transformflooroffsets;
+		private static bool transformceiloffsets;
+		private static bool rotateflooroffsets;
+		private static bool rotateceiloffsets;
+		private static bool scaleflooroffsets;
+		private static bool scaleceiloffsets;
+		private Vector2D selectioncenter;
+		private Vector2D selectionbasecenter;
+		
+		// Modifying Modes
+		private ModifyMode mode;
+		private Vector2D dragoffset;
+		private Vector2D resizefilter;
+		private Vector2D resizevector;
+		private Vector2D edgevector;
+		private Line2D resizeaxis;
+		private int stickcorner;
+		private float rotategripangle;
+		private bool autopanning;
+		
+		// Rectangle components
+		private Vector2D[] originalcorners; // lefttop, righttop, rightbottom, leftbottom
+		private Vector2D[] corners;
+		private FlatVertex[] cornerverts;
+		private RectangleF[] resizegrips;	// top, right, bottom, left
+		private RectangleF[] rotategrips;   // lefttop, righttop, rightbottom, leftbottom
+		private Line2D extensionline;
+
+		// Options
+		private bool snaptogrid;		// SHIFT to toggle
+		private bool snaptonearest;		// CTRL to enable
+		
+		#endregion
+
+		#region ================== Properties
+
+		public override object HighlightedObject { get { return highlighted; } }
+		
+		public bool Pasting { get { return pasting; } set { pasting = value; } }
+		public PasteOptions PasteOptions { get { return pasteoptions; } set { pasteoptions = value.Copy(); } }
+
+		//mxd. Modification
+		internal bool UsePrecisePosition { get { return usepreciseposition; } set { usepreciseposition = value; } }
+
+		//mxd. Texture offset properties
+		internal bool TransformFloorOffsets { get { return transformflooroffsets; } set { transformflooroffsets = value; UpdateAllChanges(); } }
+		internal bool TransformCeilingOffsets { get { return transformceiloffsets; } set { transformceiloffsets = value; UpdateAllChanges(); } }
+		internal bool RotateFloorOffsets { get { return rotateflooroffsets; } set { rotateflooroffsets = value; UpdateAllChanges(); } }
+		internal bool RotateCeilingOffsets { get { return rotateceiloffsets; } set { rotateceiloffsets = value; UpdateAllChanges(); } }
+		internal bool ScaleFloorOffsets { get { return scaleflooroffsets; } set { scaleflooroffsets = value; UpdateAllChanges(); } }
+		internal bool ScaleCeilingOffsets { get { return scaleceiloffsets; } set { scaleceiloffsets = value; UpdateAllChanges(); } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public EditSelectionMode()
+		{
+			// Initialize
+			mode = ModifyMode.None;
+		}
+
+		//mxd. Another constructor. Used indirectly from ImportObjAsTerrainMode.OnAccept.
+		public EditSelectionMode(bool pasting)
+		{
+			// Initialize
+			this.pasting = pasting;
+			this.mode = ModifyMode.None;
+		}
+
+		// Disposer
+		public override void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Clean up
+
+				// Dispose base
+				base.Dispose();
+			}
+		}
+
+		#endregion
+		
+		#region ================== Methods
+		
+		// The following functions set different properties and update
+		
+		public void SetAbsPosX(float posx)
+		{
+			offset.x = posx;
+			UpdateAllChanges();
+		}
+		
+		public void SetAbsPosY(float posy)
+		{
+			offset.y = posy;
+			UpdateAllChanges();
+		}
+		
+		public void SetRelPosX(float posx)
+		{
+			offset.x = posx + baseoffset.x;
+			UpdateAllChanges();
+		}
+		
+		public void SetRelPosY(float posy)
+		{
+			offset.y = posy + baseoffset.y;
+			UpdateAllChanges();
+		}
+		
+		public void SetAbsSizeX(float sizex)
+		{
+			size.x = sizex;
+			UpdateAllChanges();
+		}
+		
+		public void SetAbsSizeY(float sizey)
+		{
+			size.y = sizey;
+			UpdateAllChanges();
+		}
+		
+		public void SetRelSizeX(float sizex)
+		{
+			size.x = basesize.x * (sizex / 100.0f);
+			UpdateAllChanges();
+		}
+		
+		public void SetRelSizeY(float sizey)
+		{
+			size.y = basesize.y * (sizey / 100.0f);
+			UpdateAllChanges();
+		}
+
+		public void SetAbsRotation(float absrot)
+		{
+			rotation = absrot;
+			UpdateAllChanges();
+		}
+		
+		// This updates all after changes were made
+		private void UpdateAllChanges()
+		{
+			UpdateGeometry();
+			UpdateRectangleComponents();
+			if(General.Map.UDMF) UpdateTextureTransform(); //mxd
+			General.Map.Map.Update();
+			General.Interface.RedrawDisplay();
+		}
+		
+		// This highlights a new vertex
+		private void Highlight(MapElement h)
+		{
+			// Undraw previous highlight
+			if((highlighted != null) && !highlighted.IsDisposed)
+			{
+				if(highlighted is Vertex)
+				{
+					if(renderer.StartPlotter(false))
+					{
+						renderer.PlotVertex((highlighted as Vertex), renderer.DetermineVertexColor((highlighted as Vertex)));
+						renderer.Finish();
+					}
+				}
+				else
+				{
+					if(renderer.StartThings(false))
+					{
+						renderer.RenderThing((highlighted as Thing), renderer.DetermineThingColor((highlighted as Thing)), Presentation.THINGS_ALPHA);
+						renderer.Finish();
+					}
+				}
+			}
+			
+			// Set new highlight
+			highlighted = h;
+
+			// Render highlighted item
+			if((highlighted != null) && !highlighted.IsDisposed)
+			{
+				if(highlighted is Vertex)
+				{
+					if(renderer.StartPlotter(false))
+					{
+						renderer.PlotVertex((highlighted as Vertex), ColorCollection.HIGHLIGHT);
+						renderer.Finish();
+					}
+				}
+				else
+				{
+					if(renderer.StartThings(false))
+					{
+						renderer.RenderThing((highlighted as Thing), General.Colors.Highlight, Presentation.THINGS_ALPHA);
+						renderer.Finish();
+					}
+				}
+			}
+
+			// Done
+			renderer.Present();
+		}
+		
+		// This updates the selection
+		private void Update()
+		{
+			// Not in any modifying mode?
+			if(mode == ModifyMode.None)
+			{
+				// Check what grip the mouse is over
+				// and change cursor accordingly
+				Grip mousegrip = CheckMouseGrip();
+				switch(mousegrip)
+				{
+					case Grip.Main:
+						
+						// Find the nearest vertex within highlight range
+						Vertex v = MapSet.NearestVertex(selectedvertices, mousemappos);
+						
+						// Find the nearest thing within range
+						Thing t = MapSet.NearestThing(selectedthings, mousemappos);
+						
+						// Highlight the one that is closer
+						if((v != null) && (t != null))
+						{
+							if(v.DistanceToSq(mousemappos) < t.DistanceToSq(mousemappos))
+							{
+								if(v != highlighted) Highlight(v);
+							}
+							else
+							{
+								if(t != highlighted) Highlight(t);
+							}
+						}
+						else if(v != null)
+						{
+							if(v != highlighted) Highlight(v);
+						}
+						else
+						{
+							if(t != highlighted) Highlight(t);
+						}
+						
+						General.Interface.SetCursor(Cursors.Hand);
+						break;
+
+					case Grip.RotateLB:
+					case Grip.RotateLT:
+					case Grip.RotateRB:
+					case Grip.RotateRT:
+						Highlight(null);
+						General.Interface.SetCursor(Cursors.Cross);
+						break;
+
+					case Grip.SizeE:
+					case Grip.SizeS:
+					case Grip.SizeW:
+					case Grip.SizeN:
+						// Pick the best matching cursor depending on rotation and side
+						float resizeangle = rotation;
+						if((mousegrip == Grip.SizeE) || (mousegrip == Grip.SizeW)) resizeangle += Angle2D.PIHALF;
+						resizeangle = Angle2D.Normalized(resizeangle);
+						if(resizeangle > Angle2D.PI) resizeangle -= Angle2D.PI;
+						resizeangle = Math.Abs(resizeangle + Angle2D.PI / 8.000001f);
+						int cursorindex = (int)Math.Floor((resizeangle / Angle2D.PI) * 4.0f) % 4;
+						General.Interface.SetCursor(RESIZE_CURSORS[cursorindex]);
+						Highlight(null);
+						break;
+
+					default:
+						Highlight(null);
+						General.Interface.SetCursor(Cursors.Default);
+						break;
+				}
+			}
+			else
+			{
+				Vector2D snappedmappos = mousemappos;
+				bool dosnaptogrid = snaptogrid;
+
+				// Options
+				snaptogrid = General.Interface.ShiftState ^ General.Interface.SnapToGrid;
+				snaptonearest = General.Interface.CtrlState ^ General.Interface.AutoMerge;
+
+				// Change to crosshair cursor so we can clearly see around the mouse cursor
+				General.Interface.SetCursor(Cursors.Cross);
+				
+				// Check what modifying mode we are in
+				switch(mode)
+				{
+					// Dragging
+					case ModifyMode.Dragging:
+						// Change offset without snapping
+						offset = mousemappos - dragoffset;
+						
+						// Calculate transformed position of highlighted vertex
+						Vector2D transformedpos = TransformedPoint(highlightedpos);
+						
+						// Snap to nearest vertex?
+						if(snaptonearest && (highlighted != null))
+						{
+							float vrange = BuilderPlug.Me.StitchRange / renderer.Scale;
+
+							// Try the nearest vertex
+							Vertex nv = MapSet.NearestVertexSquareRange(unselectedvertices, transformedpos, vrange);
+							if(nv != null)
+							{
+								// Change offset to snap to target
+								offset += nv.Position - transformedpos;
+								dosnaptogrid = false;
+							}
+							else
+							{
+								// Find the nearest unselected line within range
+								Linedef nl = MapSet.NearestLinedefRange(unselectedlines, transformedpos, BuilderPlug.Me.StitchRange / renderer.Scale);
+								if(nl != null)
+								{
+									// Snap to grid?
+									if(dosnaptogrid)
+									{
+										// Get grid intersection coordinates
+										List<Vector2D> coords = nl.GetGridIntersections();
+										
+										// Find nearest grid intersection
+										float found_distance = float.MaxValue;
+										Vector2D found_pos = new Vector2D(float.NaN, float.NaN);
+										foreach(Vector2D v in coords)
+										{
+											Vector2D dist = transformedpos - v;
+											if(dist.GetLengthSq() < found_distance)
+											{
+												// Found a better match
+												found_distance = dist.GetLengthSq();
+												found_pos = v;
+												
+												// Do not snap to grid anymore
+												dosnaptogrid = false;
+											}
+										}
+
+										// Found something?
+										if(!float.IsNaN(found_pos.x))
+										{
+											// Change offset to snap to target
+											offset += found_pos - transformedpos;
+										}
+									}
+									else
+									{
+										// Change offset to snap onto the line
+										offset += nl.NearestOnLine(transformedpos) - transformedpos;
+									}
+								}
+							}
+						}
+
+						// Snap to grid?
+						if(dosnaptogrid && (highlighted != null))
+						{
+							// Change offset to align to grid
+							offset += General.Map.Grid.SnappedToGrid(transformedpos) - transformedpos;
+						}
+
+						// Update
+						UpdateGeometry();
+						UpdateRectangleComponents();
+						General.Interface.RedrawDisplay();
+						break;
+
+					// Resizing
+					case ModifyMode.Resizing:
+						// Snap to nearest vertex?
+						if(snaptonearest)
+						{
+							float vrange = BuilderPlug.Me.StitchRange / renderer.Scale;
+							
+							// Try the nearest vertex
+							Vertex nv = MapSet.NearestVertexSquareRange(unselectedvertices, snappedmappos, vrange);
+							if(nv != null)
+							{
+								snappedmappos = nv.Position;
+								dosnaptogrid = false;
+							}
+						}
+						
+						// Snap to grid?
+						if(dosnaptogrid)
+						{
+							// Aligned to grid
+							snappedmappos = General.Map.Grid.SnappedToGrid(snappedmappos);
+						}
+						
+						// Keep corner position
+						Vector2D oldcorner = corners[stickcorner];
+						
+						// Change size with the scale from the ruler
+						float newscale = resizeaxis.GetNearestOnLine(snappedmappos);
+						size = (basesize * resizefilter) * newscale + size * (1.0f - resizefilter);
+
+						//mxd. Update scale
+						newscale = 1f / newscale;
+						if(float.IsInfinity(newscale) || float.IsNaN(newscale)) newscale = 99999f;
+						scale = (newscale * resizefilter) + scale * (1.0f - resizefilter);
+						if(float.IsInfinity(scale.x) || float.IsNaN(scale.x)) scale.x = 99999f;
+						if(float.IsInfinity(scale.y) || float.IsNaN(scale.y)) scale.y = 99999f;
+						
+						// Adjust corner position
+						Vector2D newcorner = TransformedPoint(originalcorners[stickcorner]);
+						offset -= newcorner - oldcorner;
+						
+						// Show the extension line so that the user knows what it is aligning to
+						Vector2D sizefiltered = (size * resizefilter);
+						float sizelength = sizefiltered.x + sizefiltered.y;
+						Line2D edgeline = new Line2D(resizeaxis.v1 + resizevector * sizelength, resizeaxis.v1 + resizevector * sizelength - edgevector);
+						float nearestonedge = edgeline.GetNearestOnLine(snappedmappos);
+						if(nearestonedge > 0.5f)
+							extensionline = new Line2D(edgeline.v1, snappedmappos);
+						else
+							extensionline = new Line2D(edgeline.v2, snappedmappos);
+						
+						// Update
+						UpdateGeometry();
+						UpdateRectangleComponents();
+						General.Interface.RedrawDisplay();
+						break;
+
+					// Rotating
+					case ModifyMode.Rotating:
+						// Get angle from mouse to center
+						Vector2D center = offset + size * 0.5f;
+						Vector2D delta = snappedmappos - center;
+						rotation = delta.GetAngle() - rotategripangle;
+						
+						// Snap rotation to grip?
+						if(dosnaptogrid)
+						{
+							// We make 24 vectors that the rotation can snap to
+							float founddistance = float.MaxValue;
+							float foundrotation = rotation;
+							Vector3D rotvec = Vector2D.FromAngle(rotation);
+							
+							for(int i = 0; i < 24; i++)
+							{
+								// Make the vectors
+								float angle = i * Angle2D.PI * 0.08333333333f; //mxd. 15-degree increments
+								Vector2D gridvec = Vector2D.FromAngle(angle);
+								
+								// Check distance
+								float dist = 2.0f - Vector2D.DotProduct(gridvec, rotvec);
+								if(dist < founddistance)
+								{
+									foundrotation = angle;
+									founddistance = dist;
+								}
+							}
+							
+							// Keep rotation
+							rotation = foundrotation;
+						}
+						
+						// Update
+						UpdateGeometry();
+						UpdateRectangleComponents();
+						General.Interface.RedrawDisplay();
+						break;
+				}
+			}
+		}
+		
+		// This checks and returns the grip the mouse pointer is in
+		private Grip CheckMouseGrip()
+		{
+			if(PointInRectF(resizegrips[0], mousemappos)) return Grip.SizeN;
+			if(PointInRectF(resizegrips[2], mousemappos)) return Grip.SizeS;
+			if(PointInRectF(resizegrips[1], mousemappos)) return Grip.SizeE;
+			if(PointInRectF(resizegrips[3], mousemappos)) return Grip.SizeW;
+			if(PointInRectF(rotategrips[0], mousemappos)) return Grip.RotateLT;
+			if(PointInRectF(rotategrips[1], mousemappos)) return Grip.RotateRT;
+			if(PointInRectF(rotategrips[2], mousemappos)) return Grip.RotateRB;
+			if(PointInRectF(rotategrips[3], mousemappos)) return Grip.RotateLB;
+			if(Tools.PointInPolygon(corners, mousemappos)) return Grip.Main;
+			return Grip.None;
+		}
+		
+		// This applies the current rotation and resize to a point
+		private Vector2D TransformedPoint(Vector2D p)
+		{
+			// Resize
+			p = (p - baseoffset) * (size / basesize) + baseoffset;
+			
+			// Rotate
+			Vector2D center = baseoffset + size * 0.5f;
+			Vector2D po = p - center;
+			p = po.GetRotated(rotation);
+			p += center;
+			
+			// Translate
+			p += offset - baseoffset;
+			
+			return p;
+		}
+
+		// This applies the current rotation and resize to a point
+		private Vector2D TransformedPointNoScale(Vector2D p)
+		{
+			// Rotate
+			Vector2D center = baseoffset + size * 0.5f;
+			Vector2D po = p - center;
+			p = po.GetRotated(rotation);
+			p += center;
+
+			// Translate
+			p += offset - baseoffset;
+
+			return p;
+		}
+		
+		// This applies the current rotation and resize to a point
+		private Vector2D TransformedPointNoRotate(Vector2D p)
+		{
+			// Resize
+			p = (p - baseoffset) * (size / basesize) + baseoffset;
+			
+			// Translate
+			p += offset - baseoffset;
+			
+			return p;
+		}
+
+		// This applies the current rotation and resize to a point
+		private Vector2D TransformedPointNoRotateNoScale(Vector2D p)
+		{
+			// Translate
+			p += offset - baseoffset;
+
+			return p;
+		}
+		
+		// This checks if a point is in a rect
+		private static bool PointInRectF(RectangleF rect, Vector2D point)
+		{
+			return !(point.x < rect.Left || point.x > rect.Right || point.y < rect.Top || point.y > rect.Bottom); //mxd
+		}
+		
+		// This updates the values in the panel
+		private void UpdatePanel()
+		{
+			Vector2D relsize = (size / basesize) * 100.0f;
+			if(panel != null)
+				panel.ShowCurrentValues(offset, offset - baseoffset, size, relsize, rotation);
+		}
+
+		// This moves all things and vertices to match the current transformation
+		private void UpdateGeometry()
+		{
+			float[] newthingangle = thingangle.ToArray();
+			int index;
+
+			// Flip things horizontally
+			if(size.x < 0.0f)
+			{
+				for(index = 0; index < newthingangle.Length; index++)
+				{
+					// Check quadrant
+					if((newthingangle[index] >= 0f) && (newthingangle[index] < Angle2D.PIHALF))
+						newthingangle[index] = newthingangle[index] - (newthingangle[index] * 2);
+					else if((newthingangle[index] >= Angle2D.PIHALF) && (newthingangle[index] <= Angle2D.PI))
+						newthingangle[index] = newthingangle[index] + (Angle2D.PI - newthingangle[index]) * 2;
+					else if((newthingangle[index] >= Angle2D.PI) && (newthingangle[index] <= Angle2D.PI + Angle2D.PIHALF))
+						newthingangle[index] = newthingangle[index] - (newthingangle[index] - Angle2D.PI) * 2;
+					else
+						newthingangle[index] = newthingangle[index] + (Angle2D.PI2 - newthingangle[index]) * 2;
+				}
+			}
+
+			// Flip things vertically
+			if(size.y < 0.0f)
+			{
+				for(index = 0; index < newthingangle.Length; index++)
+				{
+					// Check quadrant
+					if((newthingangle[index] >= 0f) && (newthingangle[index] < Angle2D.PIHALF))
+						newthingangle[index] = newthingangle[index] + (Angle2D.PI - newthingangle[index] * 2);
+					else if((newthingangle[index] >= Angle2D.PIHALF) && (newthingangle[index] <= Angle2D.PI))
+						newthingangle[index] = newthingangle[index] - (newthingangle[index] - Angle2D.PIHALF) * 2;
+					else if((newthingangle[index] >= Angle2D.PI) && (newthingangle[index] <= Angle2D.PI + Angle2D.PIHALF))
+						newthingangle[index] = newthingangle[index] + (Angle2D.PI - (newthingangle[index] - Angle2D.PI) * 2);
+					else
+						newthingangle[index] = newthingangle[index] - (newthingangle[index] - (Angle2D.PI + Angle2D.PIHALF)) * 2;
+				}
+			}
+
+			// We use optimized versions of the TransformedPoint depending on what needs to be done.
+			// This is mainly done because 0.0 rotation and 1.0 scale may still give slight inaccuracies.
+			bool norotate = Math.Abs(rotation) < 0.0001f;
+			bool noscale = Math.Abs(size.x - basesize.x) + Math.Abs(size.y - basesize.y) < 0.0001f;
+			if(norotate && noscale)
+			{
+				index = 0;
+				foreach(Vertex v in selectedvertices)
+				{
+					v.Move(TransformedPointNoRotateNoScale(vertexpos[index++]));
+				}
+				index = 0;
+				foreach(Thing t in selectedthings)
+				{
+					t.Move(TransformedPointNoRotateNoScale(thingpos[index++]));
+				}
+			}
+			else if(norotate)
+			{
+				index = 0;
+				foreach(Vertex v in selectedvertices)
+				{
+					v.Move(TransformedPointNoRotate(vertexpos[index++]));
+				}
+				index = 0;
+				foreach(Thing t in selectedthings)
+				{
+					t.Move(TransformedPointNoRotate(thingpos[index++]));
+				}
+			}
+			else if(noscale)
+			{
+				index = 0;
+				foreach(Vertex v in selectedvertices)
+				{
+					v.Move(TransformedPointNoScale(vertexpos[index++]));
+				}
+				index = 0;
+				foreach(Thing t in selectedthings)
+				{
+					newthingangle[index] = Angle2D.Normalized(newthingangle[index] + rotation);
+					t.Move(TransformedPointNoScale(thingpos[index++]));
+				}
+			}
+			else
+			{
+				index = 0;
+				foreach(Vertex v in selectedvertices)
+				{
+					v.Move(TransformedPoint(vertexpos[index++]));
+				}
+				index = 0;
+				foreach(Thing t in selectedthings)
+				{
+					newthingangle[index] = Angle2D.Normalized(newthingangle[index] + rotation);
+					t.Move(TransformedPoint(thingpos[index++]));
+				}
+			}
+
+			// This checks if the lines should be flipped
+			bool shouldbeflipped = (size.x < 0.0f) ^ (size.y < 0.0f);
+			if(shouldbeflipped != linesflipped) FlipLinedefs();
+
+			// Apply new thing rotations
+			index = 0;
+			foreach(Thing t in selectedthings)
+			{
+				if(!fixedrotationthingtypes.Contains(t.Type)) //mxd. Polyobject Anchors, I hate you!
+					t.Rotate(Angle2D.Normalized(newthingangle[index]));
+				index++;
+			}
+			
+			UpdatePanel();
+			General.Map.Map.Update(true, false);
+		}
+
+		//mxd. This updates texture transforms for all sectors
+		private void UpdateTextureTransform() 
+		{
+			foreach(KeyValuePair<Sector, SectorTextureInfo> group in selectedsectors) 
+			{
+				group.Key.Fields.BeforeFieldsChange();
+
+				// Apply transforms
+				UpdateTextureTransform(group.Key.Fields, group.Value.Ceiling, transformceiloffsets, rotateceiloffsets, scaleceiloffsets);
+				UpdateTextureTransform(group.Key.Fields, group.Value.Floor, transformflooroffsets, rotateflooroffsets, scaleflooroffsets);
+
+				// Update cache
+				group.Key.UpdateNeeded = true;
+				group.Key.UpdateCache();
+			}
+
+			// Map was changed
+			General.Map.IsChanged = true;
+		}
+
+		//mxd. This updates texture transforms in given UniFields
+		private void UpdateTextureTransform(UniFields fields, SurfaceTextureInfo si, bool transformoffsets, bool rotateoffsets, bool scaleoffsets)
+		{
+			// Get offset-ready values
+			float texrotation = Angle2D.PI2 - rotation;
+
+			// Update texture offsets
+			if(transformoffsets)
+			{
+				Vector2D toffset = (selectionbasecenter - selectioncenter).GetRotated((texrotation + si.Rotation));
+				Vector2D soffset = si.Offset.GetRotated(texrotation + si.Rotation);
+
+				fields["xpanning" + si.Part] = new UniValue(UniversalType.Float, (float)Math.Round(soffset.x + toffset.x, General.Map.FormatInterface.VertexDecimals) % si.TextureSize.Width);
+				fields["ypanning" + si.Part] = new UniValue(UniversalType.Float, (float)Math.Round(-(soffset.y + toffset.y), General.Map.FormatInterface.VertexDecimals) % si.TextureSize.Height);
+			}
+			// Restore texture offsets
+			else 
+			{
+				fields["xpanning" + si.Part] = new UniValue(UniversalType.Float, si.Offset.x);
+				fields["ypanning" + si.Part] = new UniValue(UniversalType.Float, si.Offset.y);
+			}
+
+			// Update rotation
+			if(rotateoffsets)
+				fields["rotation" + si.Part] = new UniValue(UniversalType.AngleDegreesFloat, General.ClampAngle((float)Math.Round(Angle2D.RadToDeg(si.Rotation + texrotation), General.Map.FormatInterface.VertexDecimals)));
+			// Restore rotation
+			else 
+				fields["rotation" + si.Part] = new UniValue(UniversalType.AngleDegreesFloat, Angle2D.RadToDeg(si.Rotation));
+
+			// Update scale
+			if(scaleoffsets)
+			{
+				fields["xscale" + si.Part] = new UniValue(UniversalType.Float, (float) Math.Round(si.Scale.x * scale.x, General.Map.FormatInterface.VertexDecimals));
+				fields["yscale" + si.Part] = new UniValue(UniversalType.Float, (float) Math.Round(si.Scale.y * scale.y, General.Map.FormatInterface.VertexDecimals));
+			}
+			// Restore scale
+			else 
+			{
+				fields["xscale" + si.Part] = new UniValue(UniversalType.Float, si.Scale.x);
+				fields["yscale" + si.Part] = new UniValue(UniversalType.Float, -si.Scale.y);
+			}
+		}
+
+		//mxd. This restores texture transforms for all sectors
+		private void RestoreTextureTransform() 
+		{
+			foreach(KeyValuePair<Sector, SectorTextureInfo> group in selectedsectors)
+			{
+				group.Key.Fields.BeforeFieldsChange();
+
+				// Revert transforms
+				RestoreTextureTransform(group.Key.Fields, group.Value.Ceiling);
+				RestoreTextureTransform(group.Key.Fields, group.Value.Floor);
+
+				// Update cache
+				group.Key.UpdateNeeded = true;
+				group.Key.UpdateCache();
+			}
+		}
+
+		//mxd. This restores texture transforms in given UniFields
+		private static void RestoreTextureTransform(UniFields fields, SurfaceTextureInfo si)
+		{
+			fields["rotation" + si.Part] = new UniValue(UniversalType.AngleDegreesFloat, Angle2D.RadToDeg(si.Rotation));
+			fields["xscale" + si.Part]   = new UniValue(UniversalType.Float, si.Scale.x);
+			fields["yscale" + si.Part]   = new UniValue(UniversalType.Float, -si.Scale.y);
+			fields["xpanning" + si.Part] = new UniValue(UniversalType.Float, si.Offset.x);
+			fields["ypanning" + si.Part] = new UniValue(UniversalType.Float, si.Offset.y);
+		}
+		
+		// This updates the selection rectangle components
+		private void UpdateRectangleComponents()
+		{
+			float gripsize = GRIP_SIZE / renderer.Scale;
+			PixelColor rectcolor = General.Colors.Highlight.WithAlpha(RECTANGLE_ALPHA);
+
+			// Original (untransformed) corners
+			originalcorners = new Vector2D[4];
+			originalcorners[0] = new Vector2D(baseoffset.x, baseoffset.y);
+			originalcorners[1] = new Vector2D(baseoffset.x + basesize.x, baseoffset.y);
+			originalcorners[2] = new Vector2D(baseoffset.x + basesize.x, baseoffset.y + basesize.y);
+			originalcorners[3] = new Vector2D(baseoffset.x, baseoffset.y + basesize.y);
+
+			// Corners
+			corners = new Vector2D[4];
+			for(int i = 0; i < 4; i++)
+				corners[i] = TransformedPoint(originalcorners[i]);
+
+			// Vertices
+			cornerverts = new FlatVertex[6];
+			for(int i = 0; i < 6; i++)
+			{
+				cornerverts[i] = new FlatVertex();
+				cornerverts[i].z = 1.0f;
+				cornerverts[i].c = rectcolor.ToInt();
+			}
+			cornerverts[0].x = corners[0].x;
+			cornerverts[0].y = corners[0].y;
+			cornerverts[1].x = corners[1].x;
+			cornerverts[1].y = corners[1].y;
+			cornerverts[2].x = corners[2].x;
+			cornerverts[2].y = corners[2].y;
+			cornerverts[3].x = corners[0].x;
+			cornerverts[3].y = corners[0].y;
+			cornerverts[4].x = corners[2].x;
+			cornerverts[4].y = corners[2].y;
+			cornerverts[5].x = corners[3].x;
+			cornerverts[5].y = corners[3].y;
+			
+			// Middle points between corners
+			Vector2D middle01 = corners[0] + (corners[1] - corners[0]) * 0.5f;
+			Vector2D middle12 = corners[1] + (corners[2] - corners[1]) * 0.5f;
+			Vector2D middle23 = corners[2] + (corners[3] - corners[2]) * 0.5f;
+			Vector2D middle30 = corners[3] + (corners[0] - corners[3]) * 0.5f;
+			
+			// Resize grips
+			resizegrips = new RectangleF[4];
+			resizegrips[0] = new RectangleF(middle01.x - gripsize * 0.5f,
+											middle01.y - gripsize * 0.5f,
+											gripsize, gripsize);
+			resizegrips[1] = new RectangleF(middle12.x - gripsize * 0.5f,
+											middle12.y - gripsize * 0.5f,
+											gripsize, gripsize);
+			resizegrips[2] = new RectangleF(middle23.x - gripsize * 0.5f,
+											middle23.y - gripsize * 0.5f,
+											gripsize, gripsize);
+			resizegrips[3] = new RectangleF(middle30.x - gripsize * 0.5f,
+											middle30.y - gripsize * 0.5f,
+											gripsize, gripsize);
+
+			// Rotate grips
+			rotategrips = new RectangleF[4];
+			rotategrips[0] = new RectangleF(corners[0].x - gripsize * 0.5f,
+											corners[0].y - gripsize * 0.5f,
+											gripsize, gripsize);
+			rotategrips[1] = new RectangleF(corners[1].x - gripsize * 0.5f,
+											corners[1].y - gripsize * 0.5f,
+											gripsize, gripsize);
+			rotategrips[2] = new RectangleF(corners[2].x - gripsize * 0.5f,
+											corners[2].y - gripsize * 0.5f,
+											gripsize, gripsize);
+			rotategrips[3] = new RectangleF(corners[3].x - gripsize * 0.5f,
+											corners[3].y - gripsize * 0.5f,
+											gripsize, gripsize);
+
+			//mxd. Update selection center
+			selectioncenter = new Vector2D(offset.x + size.x * 0.5f, offset.y + size.y * 0.5f);
+		}
+		
+		// This flips all linedefs in the selection (used for mirroring)
+		private void FlipLinedefs()
+		{
+			// Flip linedefs
+			foreach(Linedef ld in selectedlines)
+				ld.FlipVertices();
+			
+			// Done
+			linesflipped = !linesflipped;
+		}
+		
+		#endregion
+
+		#region ================== Events
+
+		public override void OnHelp()
+		{
+			General.ShowHelp("e_editselection.html");
+		}
+
+		// Mode engages
+		public override void OnEngage()
+		{
+			base.OnEngage();
+			
+			bool autodrag = (pasting && mouseinside && BuilderPlug.Me.AutoDragOnPaste);
+			snaptonearest = General.Interface.AutoMerge; //mxd
+			
+			// Add toolbar buttons
+			General.Interface.AddButton(BuilderPlug.Me.MenusForm.FlipSelectionH);
+			General.Interface.AddButton(BuilderPlug.Me.MenusForm.FlipSelectionV);
+
+			//mxd. Get EditPanel-related settings
+			usepreciseposition = General.Settings.ReadPluginSetting("editselectionusespreciseposition", true);
+			
+			// Add docker
+			panel = new EditSelectionPanel(this);
+			docker = new Docker("editselection", "Edit Selection", panel);
+			General.Interface.AddDocker(docker);
+			General.Interface.SelectDocker(docker);
+			
+			// We don't want to record this for undoing while we move the geometry around.
+			// This will be set back to normal when we're done.
+			General.Map.UndoRedo.IgnorePropChanges = true;
+			
+			// Convert geometry selection
+			General.Map.Map.ClearAllMarks(false);
+			General.Map.Map.MarkSelectedVertices(true, true);
+			General.Map.Map.MarkSelectedThings(true, true);
+			General.Map.Map.MarkSelectedLinedefs(true, true);
+			General.Map.Map.MarkSelectedSectors(true, true);
+			ICollection<Vertex> verts = General.Map.Map.GetVerticesFromLinesMarks(true);
+			foreach(Vertex v in verts) v.Marked = true;
+			ICollection<Sector> sectors = General.Map.Map.GetSelectedSectors(true); //mxd
+			selectedsectors = new Dictionary<Sector, SectorTextureInfo>(); //mxd
+			foreach(Sector s in sectors)
+			{
+				foreach(Sidedef sd in s.Sidedefs)
+				{
+					sd.Line.Marked = true;
+					sd.Line.Start.Marked = true;
+					sd.Line.End.Marked = true;
+				}
+
+				if(General.Map.UDMF) selectedsectors.Add(s, new SectorTextureInfo(s));
+			}
+			selectedvertices = General.Map.Map.GetMarkedVertices(true);
+			selectedthings = General.Map.Map.GetMarkedThings(true);
+			unselectedvertices = General.Map.Map.GetMarkedVertices(false);
+			
+			// Make sure everything is selected so that it turns up red
+			foreach(Vertex v in selectedvertices) v.Selected = true;
+			ICollection<Linedef> markedlines = General.Map.Map.LinedefsFromMarkedVertices(false, true, false);
+			foreach(Linedef l in markedlines) l.Selected = true;
+			selectedlines = General.Map.Map.LinedefsFromMarkedVertices(false, true, false);
+			unselectedlines = General.Map.Map.LinedefsFromMarkedVertices(true, false, false);
+			
+			// Array to keep original coordinates
+			vertexpos = new List<Vector2D>(selectedvertices.Count);
+			thingpos = new List<Vector2D>(selectedthings.Count);
+			thingangle = new List<float>(selectedthings.Count);
+			fixedrotationthingtypes = new List<int>(); //mxd
+
+			// A selection must be made!
+			if((selectedvertices.Count > 0) || (selectedthings.Count > 0))
+			{
+				// Initialize offset and size
+				offset.x = float.MaxValue;
+				offset.y = float.MaxValue;
+				Vector2D right;
+				right.x = float.MinValue;
+				right.y = float.MinValue;
+				
+				foreach(Vertex v in selectedvertices)
+				{
+					// Find left-top and right-bottom
+					if(v.Position.x < offset.x) offset.x = v.Position.x;
+					if(v.Position.y < offset.y) offset.y = v.Position.y;
+					if(v.Position.x > right.x) right.x = v.Position.x;
+					if(v.Position.y > right.y) right.y = v.Position.y;
+					
+					// Keep original coordinates
+					vertexpos.Add(v.Position);
+				}
+
+				foreach(Thing t in selectedthings)
+				{
+					// Find left-top and right-bottom
+					if((t.Position.x - t.Size) < offset.x) offset.x = t.Position.x - t.Size;
+					if((t.Position.y - t.Size) < offset.y) offset.y = t.Position.y - t.Size;
+					if((t.Position.x + t.Size) > right.x) right.x = t.Position.x + t.Size;
+					if((t.Position.y + t.Size) > right.y) right.y = t.Position.y + t.Size;
+
+					
+					if(!fixedrotationthingtypes.Contains(t.Type)) //mxd
+					{
+						ThingTypeInfo tti = General.Map.Data.GetThingInfoEx(t.Type);
+						if(tti != null && tti.FixedRotation) fixedrotationthingtypes.Add(t.Type);
+					}
+
+					// Keep original coordinates
+					thingpos.Add(t.Position);
+					thingangle.Add(t.Angle);
+				}
+				
+				// Calculate size
+				size = right - offset;
+				
+				// If the width of a dimension is zero, add a little
+				if(Math.Abs(size.x) < 1.0f)
+				{
+					size.x += ZERO_SIZE_ADDITION;
+					offset.x -= ZERO_SIZE_ADDITION / 2;
+				}
+				
+				if(Math.Abs(size.y) < 1.0f)
+				{
+					size.y += ZERO_SIZE_ADDITION;
+					offset.y -= ZERO_SIZE_ADDITION / 2;
+				}
+				
+				basesize = size;
+				baseoffset = offset;
+				selectionbasecenter = new Vector2D(offset.x + size.x * 0.5f, offset.y + size.y * 0.5f); //mxd 
+				
+				// When pasting, we want to move the geometry so it is visible
+				if(pasting)
+				{
+					// Mouse in screen?
+					if(mouseinside)
+					{
+						offset = mousemappos - size / 2;
+					}
+					else
+					{
+						Vector2D viewmappos = new Vector2D(renderer.OffsetX, renderer.OffsetY);
+						offset = viewmappos - size / 2;
+					}
+
+					if(General.Interface.SnapToGrid) //mxd
+						offset = General.Map.Grid.SnappedToGrid(offset); 
+
+					UpdateGeometry();
+					General.Map.Data.UpdateUsedTextures();
+
+					if(!autodrag) General.Map.Map.Update();
+				}
+				
+				// Set presentation
+				if(selectedthings.Count > 0)
+					renderer.SetPresentation(Presentation.Things);
+				else
+					renderer.SetPresentation(Presentation.Standard);
+				
+				// Update
+				panel.ShowOriginalValues(baseoffset, basesize);
+				panel.SetTextureTransformSettings(General.Map.UDMF); //mxd
+				UpdateRectangleComponents();
+				UpdatePanel();
+				Update();
+				
+				// When pasting and mouse is in screen, drag selection immediately
+				if(autodrag) OnSelectBegin();
+			}
+			else
+			{
+				General.Interface.MessageBeep(MessageBeepType.Default);
+				General.Interface.DisplayStatus(StatusType.Info, "A selection is required for this action.");
+				
+				// Cancel now
+				General.Editing.CancelMode();
+			}
+		}
+
+		// Cancel mode
+		public override void OnCancel()
+		{
+			base.OnCancel();
+
+			// Paste operation?
+			if(pasting)
+			{
+				// Resume normal undo/redo recording
+				General.Map.UndoRedo.IgnorePropChanges = false;
+				
+				General.Map.Map.BeginAddRemove(); //mxd
+
+				// Remove the geometry
+				foreach(Vertex v in selectedvertices) v.Dispose();
+				foreach(Thing t in selectedthings) t.Dispose();
+
+				General.Map.Map.EndAddRemove(); //mxd
+				
+				// Withdraw the undo
+				if(General.Map.UndoRedo.NextUndo != null)
+					General.Map.UndoRedo.WithdrawUndo();
+			}
+			else
+			{
+				// Reset geometry in original position
+				int index = 0;
+				foreach(Vertex v in selectedvertices)
+					v.Move(vertexpos[index++]);
+
+				index = 0;
+				foreach(Thing t in selectedthings)
+				{
+					t.Rotate(thingangle[index]);
+					t.Move(thingpos[index++]);
+				}
+
+				//mxd. Reset texture offsets to original values
+				if(General.Map.UDMF) RestoreTextureTransform();
+				
+				// Resume normal undo/redo recording
+				General.Map.UndoRedo.IgnorePropChanges = false;
+			}
+			
+			General.Map.Map.Update(true, true);
+			
+			// Return to previous stable mode
+			General.Editing.ChangeMode(General.Editing.PreviousStableMode.Name);
+		}
+
+		// When accepted
+		public override void OnAccept()
+		{
+			base.OnAccept();
+
+			// Anything to do?
+			if((selectedthings.Count > 0) || (selectedvertices.Count > 0))
+			{
+				Vector2D tl = new Vector2D(General.Map.Config.RightBoundary, General.Map.Config.BottomBoundary);
+				Vector2D br = new Vector2D(General.Map.Config.LeftBoundary, General.Map.Config.RightBoundary);
+
+				foreach(Vertex v in selectedvertices)
+				{
+					if(v.Position.x < tl.x) tl.x = (int)v.Position.x;
+					if(v.Position.x > br.x) br.x = (int)v.Position.x;
+					if(v.Position.y > tl.y) tl.y = (int)v.Position.y;
+					if(v.Position.y < br.y) br.y = (int)v.Position.y;
+				}
+
+				foreach(Thing t in selectedthings)
+				{
+					if(t.Position.x < tl.x) tl.x = (int)t.Position.x;
+					if(t.Position.x > br.x) br.x = (int)t.Position.x;
+					if(t.Position.y > tl.y) tl.y = (int)t.Position.y;
+					if(t.Position.y < br.y) br.y = (int)t.Position.y;
+				}
+
+				// Check if the selection is outside the map boundaries
+				if(tl.x < General.Map.Config.LeftBoundary || br.x > General.Map.Config.RightBoundary ||
+					tl.y > General.Map.Config.TopBoundary || br.y < General.Map.Config.BottomBoundary)
+				{
+					General.Interface.DisplayStatus(StatusType.Warning, "Error: selection out of map boundaries.");
+
+					// If we're in the process of switching to another mode, reset to selection
+					// to its old position
+					if(modealreadyswitching)
+					{
+						// Reset geometry in original position
+						int index = 0;
+						foreach(Vertex v in selectedvertices)
+							v.Move(vertexpos[index++]);
+
+						index = 0;
+						foreach(Thing t in selectedthings)
+						{
+							t.Rotate(thingangle[index]);
+							t.Move(thingpos[index++]);
+						}
+
+						//mxd. Reset texture offsets to their original position
+						if(General.Map.UDMF) RestoreTextureTransform();
+
+						// Resume normal undo/redo recording
+						General.Map.UndoRedo.IgnorePropChanges = false;
+						General.Map.Map.Update(true, true);
+					}
+
+					return;
+				}
+
+				Cursor.Current = Cursors.AppStarting;
+
+				if(!pasting)
+				{
+					// Reset geometry in original position to create an undo
+					if(linesflipped) FlipLinedefs();		// Flip linedefs back if they were flipped
+					int index = 0;
+					foreach(Vertex v in selectedvertices)
+						v.Move(vertexpos[index++]);
+
+					index = 0;
+					foreach(Thing t in selectedthings)
+					{
+						t.Rotate(thingangle[index]);
+						t.Move(thingpos[index++]);
+					}
+
+					//mxd. Reset texture offsets to their original position
+					if(General.Map.UDMF) RestoreTextureTransform();
+
+					General.Map.Map.Update(true, true);
+					
+					// Make undo
+					General.Map.UndoRedo.CreateUndo("Edit selection");
+				}
+
+				// Resume normal undo/redo recording
+				General.Map.UndoRedo.IgnorePropChanges = false;
+
+				//mxd. Update sector slopes?
+				if(General.Map.UDMF)
+				{
+					// We need a different kind of offset...
+					Vector2D relativeoffset = offset - baseoffset;
+					
+					foreach(Sector s in selectedsectors.Keys)
+					{
+						// Update floor slope?
+						if(s.FloorSlope.GetLengthSq() > 0 && !float.IsNaN(s.FloorSlopeOffset / s.FloorSlope.z)) 
+						{
+							Plane floor = new Plane(s.FloorSlope, s.FloorSlopeOffset);
+							Vector2D center = new Vector2D(s.BBox.X + s.BBox.Width / 2, s.BBox.Y + s.BBox.Height / 2);
+							s.FloorSlope = new Vector3D(new Vector2D(s.FloorSlope.x, s.FloorSlope.y).GetRotated(rotation), s.FloorSlope.z);
+							s.FloorSlopeOffset = -Vector3D.DotProduct(s.FloorSlope, new Vector3D(center + relativeoffset, floor.GetZ(center)));
+						}
+
+						// Update ceiling slope?
+						if(s.CeilSlope.GetLengthSq() > 0 && !float.IsNaN(s.CeilSlopeOffset / s.CeilSlope.z)) 
+						{
+							Plane ceiling = new Plane(s.CeilSlope, s.CeilSlopeOffset);
+							Vector2D center = new Vector2D(s.BBox.X + s.BBox.Width / 2, s.BBox.Y + s.BBox.Height / 2);
+							s.CeilSlope = new Vector3D(new Vector2D(s.CeilSlope.x, s.CeilSlope.y).GetRotated(rotation), s.CeilSlope.z);
+							s.CeilSlopeOffset = -Vector3D.DotProduct(s.CeilSlope, new Vector3D(center + relativeoffset, ceiling.GetZ(center)));
+						}
+					}
+				}
+
+				// Mark selected geometry
+				General.Map.Map.ClearAllMarks(false);
+				General.Map.Map.MarkAllSelectedGeometry(true, true, true, true, false);
+				
+				// Move geometry to new position
+				UpdateGeometry();
+
+				//mxd. Update floor/ceiling texture settings
+				if(General.Map.UDMF) UpdateTextureTransform();
+				
+				General.Map.Map.Update(true, true);
+				
+				// When pasting, we want to join with the parent sector
+				// where the sidedefs are referencing a virtual sector
+				if(pasting)
+				{
+					Sector parent = null;
+					Sector vsector = null;
+					General.Settings.FindDefaultDrawSettings();
+
+					// Go for all sidedes in the new geometry
+					List<Sidedef> newsides = General.Map.Map.GetMarkedSidedefs(true);
+					foreach(Sidedef s in newsides) 
+					{
+						// Connected to a virtual sector?
+						if(s.Marked && s.Sector.Fields.ContainsKey(MapSet.VirtualSectorField))
+						{
+							bool joined = false;
+							
+							// Keep reference to virtual sector
+							vsector = s.Sector;
+							
+							// Not virtual on both sides?
+							// Pascal 3-1-08: I can't remember why I have this check here, but it causes problems when
+							// pasting a single linedef that refers to the same sector on both sides (the line then
+							// loses both its sidedefs because it doesn't join any sector)
+							//if((s.Other != null) && !s.Other.Sector.Fields.ContainsKey(MapSet.VirtualSectorField))
+							{
+								// Find out in which sector this was pasted
+								Vector2D testpoint = s.Line.GetSidePoint(!s.IsFront);
+								Linedef nl = MapSet.NearestLinedef(General.Map.Map.GetMarkedLinedefs(false), testpoint);
+								if(nl != null) 
+								{
+									Sidedef joinsidedef = (nl.SideOfLine(testpoint) <= 0 ? nl.Front : nl.Back);
+
+									// Join?
+									if(joinsidedef != null)
+									{
+										// Join!
+										s.SetSector(joinsidedef.Sector);
+										s.Marked = false;
+										joined = true;
+
+										// If we have no parent sector yet, then this is it!
+										if(parent == null) parent = joinsidedef.Sector;
+									}
+								}
+							}
+							
+							// Not joined any sector?
+							if(!joined)
+							{
+								Linedef l = s.Line;
+
+								// Remove the sidedef
+								s.Dispose();
+
+								// Correct the linedef
+								if((l.Front == null) && (l.Back != null))
+								{
+									l.FlipVertices();
+									l.FlipSidedefs();
+								}
+
+								// Correct the sided flags
+								l.ApplySidedFlags();
+							}
+						}
+					}
+					
+					// Do we have a virtual and parent sector?
+					if((vsector != null) && (parent != null))
+					{
+						// Adjust the floor and ceiling heights of all new sectors
+						if(pasteoptions.AdjustHeights)
+						{
+							ICollection<Sector> newsectors = General.Map.Map.GetMarkedSectors(true);
+							foreach(Sector s in newsectors)
+							{
+								s.CeilHeight += parent.CeilHeight - vsector.CeilHeight;
+								s.FloorHeight += parent.FloorHeight - vsector.FloorHeight;
+							}
+						}
+					}
+					
+					// Remove any virtual sectors
+					General.Map.Map.RemoveVirtualSectors();
+				}
+				
+				// Stitch geometry
+				if(snaptonearest) General.Map.Map.StitchGeometry();
+
+				// Make corrections for backward linedefs
+				MapSet.FlipBackwardLinedefs(General.Map.Map.Linedefs);
+				
+				// Snap to map format accuracy
+				General.Map.Map.SnapAllToAccuracy(General.Map.UDMF && usepreciseposition);
+				
+				// Update cached values
+				General.Map.Data.UpdateUsedTextures();
+				General.Map.Map.Update();
+				General.Map.ThingsFilter.Update();
+				
+				// Make normal selection?
+				General.Map.Map.ClearAllSelected();
+				if(!clearselection) //mxd
+				{
+					foreach(Vertex v in selectedvertices) if(!v.IsDisposed) v.Selected = true;
+					foreach(Linedef l in selectedlines) { if(!l.IsDisposed) { l.Start.Selected = true; l.End.Selected = true; } }
+					foreach(Thing t in selectedthings) if(!t.IsDisposed) t.Selected = true;
+				}
+				General.Map.Map.SelectionType = SelectionType.Vertices | SelectionType.Things;
+				
+				// Done
+				selectedvertices = new List<Vertex>();
+				selectedthings = new List<Thing>();
+				selectedlines = new List<Linedef>();
+				Cursor.Current = Cursors.Default;
+				General.Map.IsChanged = true;
+			}
+			
+			if(!modealreadyswitching)
+			{
+				// Return to previous stable mode
+				General.Editing.ChangeMode(General.Editing.PreviousStableMode.Name);
+			}
+		}
+		
+		// Mode disengages
+		public override void OnDisengage()
+		{
+			base.OnDisengage();
+
+			// Remove toolbar buttons
+			General.Interface.RemoveButton(BuilderPlug.Me.MenusForm.FlipSelectionH);
+			General.Interface.RemoveButton(BuilderPlug.Me.MenusForm.FlipSelectionV);
+
+			//mxd. Save EditPanel-related settings 
+			General.Settings.WritePluginSetting("editselectionusespreciseposition", usepreciseposition);
+			
+			// Remove docker
+			General.Interface.RemoveDocker(docker);
+			panel.Dispose();
+			panel = null;
+			
+			// When not cancelled manually, we assume it is accepted
+			if(!cancelled)
+			{
+				modealreadyswitching = true;
+				//this.OnAccept();	// BAD! Any other plugins won't know this mode was accepted
+				General.Editing.AcceptMode();
+			}
+
+			// Update
+			General.Map.ThingsFilter.Update();
+			General.Interface.RedrawDisplay();
+			
+			// Hide highlight info
+			General.Interface.HideInfo();
+			General.Interface.SetCursor(Cursors.Default);
+		}
+
+		// This redraws the display
+		public override void OnRedrawDisplay()
+		{
+			UpdateRectangleComponents();
+
+			renderer.RedrawSurface();
+
+			// Render lines
+			if(renderer.StartPlotter(true))
+			{
+				renderer.PlotLinedefSet(General.Map.Map.Linedefs);
+				renderer.PlotVerticesSet(General.Map.Map.Vertices);
+				if(highlighted is Vertex) renderer.PlotVertex((highlighted as Vertex), ColorCollection.HIGHLIGHT);
+				renderer.Finish();
+			}
+
+			// Render things
+			if(renderer.StartThings(true))
+			{
+				renderer.RenderThingSet(General.Map.ThingsFilter.HiddenThings, Presentation.THINGS_HIDDEN_ALPHA);
+				renderer.RenderThingSet(General.Map.ThingsFilter.VisibleThings, Presentation.THINGS_ALPHA);
+				if(highlighted is Thing) renderer.RenderThing((highlighted as Thing), General.Colors.Highlight, Presentation.THINGS_ALPHA);
+				renderer.Finish();
+			}
+
+			// Render selection
+			if(renderer.StartOverlay(true))
+			{
+				// Rectangle
+				PixelColor rectcolor = General.Colors.Highlight.WithAlpha(RECTANGLE_ALPHA);
+				renderer.RenderGeometry(cornerverts, null, true);
+				renderer.RenderLine(corners[0], corners[1], 4, rectcolor, true);
+				renderer.RenderLine(corners[1], corners[2], 4, rectcolor, true);
+				renderer.RenderLine(corners[2], corners[3], 4, rectcolor, true);
+				renderer.RenderLine(corners[3], corners[0], 4, rectcolor, true);
+				
+				// Extension line
+				if(extensionline.GetLengthSq() > 0.0f)
+					renderer.RenderLine(extensionline.v1, extensionline.v2, 1, General.Colors.Indication.WithAlpha(EXTENSION_LINE_ALPHA), true);
+				
+				// Grips
+				for(int i = 0; i < 4; i++)
+				{
+					renderer.RenderRectangleFilled(resizegrips[i], General.Colors.Background, true);
+					renderer.RenderRectangle(resizegrips[i], 2, General.Colors.Highlight, true);
+					renderer.RenderRectangleFilled(rotategrips[i], General.Colors.Background, true);
+					renderer.RenderRectangle(rotategrips[i], 2, General.Colors.Indication, true);
+				}
+				
+				renderer.Finish();
+			}
+
+			renderer.Present();
+		}
+		
+		// Mouse moves
+		public override void OnMouseMove(MouseEventArgs e)
+		{
+			base.OnMouseMove(e);
+			if(panning) return; //mxd. Skip all this jazz while panning
+			Update();
+		}
+
+		// Mouse leaves the display
+		public override void OnMouseLeave(EventArgs e)
+		{
+			base.OnMouseLeave(e);
+			
+			// Reset cursor
+			General.Interface.SetCursor(Cursors.Default);
+		}
+
+		// When edit button is pressed
+		protected override void OnEditBegin()
+		{
+			base.OnEditBegin();
+			OnSelectBegin();
+		}
+
+		// When edit button is released
+		protected override void OnEditEnd()
+		{
+			base.OnEditEnd();
+			OnSelectEnd();
+		}
+
+		// When select button is pressed
+		protected override void OnSelectBegin()
+		{
+			base.OnSelectBegin();
+
+			if(mode != ModifyMode.None) return;
+
+			// Used in many cases:
+			Vector2D center = offset + size * 0.5f;
+			Vector2D delta;
+
+			// Check what grip the mouse is over
+			switch(CheckMouseGrip())
+			{
+				// Drag main rectangle
+				case Grip.Main:
+					
+					// Find the original position of the highlighted element
+					if(highlighted is Vertex)
+					{
+						int index = 0;
+						foreach(Vertex v in selectedvertices)
+						{
+							if(v == highlighted) highlightedpos = vertexpos[index];
+							index++;
+						}
+					}
+					else if(highlighted is Thing)
+					{
+						int index = 0;
+						foreach(Thing t in selectedthings)
+						{
+							if(t == highlighted) highlightedpos = thingpos[index];
+							index++;
+						}
+					}
+					
+					dragoffset = mousemappos - offset;
+					mode = ModifyMode.Dragging;
+
+					EnableAutoPanning();
+					autopanning = true;
+					break;
+
+				// Resize
+				case Grip.SizeN:
+
+					// The resize vector is a unit vector in the direction of the resize.
+					// We multiply this with the sign of the current size, because the
+					// corners may be reversed when the selection is flipped.
+					resizevector = corners[1] - corners[2];
+					resizevector = resizevector.GetNormal() * Math.Sign(size.y);
+					
+					// The edgevector is a vector with length and direction of the edge perpendicular to the resizevector
+					edgevector = corners[1] - corners[0];
+					
+					// Make the resize axis. This is a line with the length and direction
+					// of basesize used to calculate the resize percentage.
+					resizeaxis = new Line2D(corners[2], corners[2] + resizevector * basesize.y);
+
+					// Original axis filter
+					resizefilter = new Vector2D(0.0f, 1.0f);
+
+					// This is the corner that must stay in the same position
+					stickcorner = 2;
+
+					Highlight(null);
+					mode = ModifyMode.Resizing;
+
+					EnableAutoPanning();
+					autopanning = true;
+					break;
+
+				// Resize
+				case Grip.SizeE:
+					// See description above
+					resizevector = corners[1] - corners[0];
+					resizevector = resizevector.GetNormal() * Math.Sign(size.x);
+					edgevector = corners[1] - corners[2];
+					resizeaxis = new Line2D(corners[0], corners[0] + resizevector * basesize.x);
+					resizefilter = new Vector2D(1.0f, 0.0f);
+					stickcorner = 0;
+					Highlight(null);
+					mode = ModifyMode.Resizing;
+
+					EnableAutoPanning();
+					autopanning = true;
+					break;
+
+				// Resize
+				case Grip.SizeS:
+					// See description above
+					resizevector = corners[2] - corners[1];
+					resizevector = resizevector.GetNormal() * Math.Sign(size.y);
+					edgevector = corners[2] - corners[3];
+					resizeaxis = new Line2D(corners[1], corners[1] + resizevector * basesize.y);
+					resizefilter = new Vector2D(0.0f, 1.0f);
+					stickcorner = 0;
+					Highlight(null);
+					mode = ModifyMode.Resizing;
+
+					EnableAutoPanning();
+					autopanning = true;
+					break;
+
+				// Resize
+				case Grip.SizeW:
+					// See description above
+					resizevector = corners[0] - corners[1];
+					resizevector = resizevector.GetNormal() * Math.Sign(size.x);
+					edgevector = corners[0] - corners[3];
+					resizeaxis = new Line2D(corners[1], corners[1] + resizevector * basesize.x);
+					resizefilter = new Vector2D(1.0f, 0.0f);
+					stickcorner = 1;
+					Highlight(null);
+					mode = ModifyMode.Resizing;
+
+					EnableAutoPanning();
+					autopanning = true;
+					break;
+
+				// Rotate
+				case Grip.RotateLB:
+					delta = corners[3] - center;
+					rotategripangle = delta.GetAngle() - rotation;
+					Highlight(null);
+					mode = ModifyMode.Rotating;
+
+					EnableAutoPanning();
+					autopanning = true;
+					break;
+
+				// Rotate
+				case Grip.RotateLT:
+					delta = corners[0] - center;
+					rotategripangle = delta.GetAngle() - rotation;
+					Highlight(null);
+					mode = ModifyMode.Rotating;
+
+					EnableAutoPanning();
+					autopanning = true;
+					break;
+
+				// Rotate
+				case Grip.RotateRB:
+					delta = corners[2] - center;
+					rotategripangle = delta.GetAngle() - rotation;
+					Highlight(null);
+					mode = ModifyMode.Rotating;
+
+					EnableAutoPanning();
+					autopanning = true;
+					break;
+
+				// Rotate
+				case Grip.RotateRT:
+					delta = corners[1] - center;
+					rotategripangle = delta.GetAngle() - rotation;
+					Highlight(null);
+					mode = ModifyMode.Rotating;
+
+					EnableAutoPanning();
+					autopanning = true;
+					break;
+
+				// Outside the selection?
+				default:
+					// Accept and be done with it
+					General.Editing.AcceptMode();
+					break;
+			}
+		}
+
+		// When selected button is released
+		protected override void OnSelectEnd()
+		{
+			base.OnSelectEnd();
+			
+			// Remove extension line
+			extensionline = new Line2D();
+
+			if(autopanning)
+			{
+				DisableAutoPanning();
+				autopanning = false;
+			}
+			
+			// No modifying mode
+			mode = ModifyMode.None;
+
+			//mxd. Update floor/ceiling texture settings
+			if(General.Map.UDMF) UpdateTextureTransform();
+			
+			// Redraw
+			General.Map.Map.Update();
+			General.Interface.RedrawDisplay();
+		}
+
+		// When a key is released
+		public override void OnKeyUp(KeyEventArgs e)
+		{
+			base.OnKeyUp(e);
+			if((snaptogrid != (General.Interface.ShiftState ^ General.Interface.SnapToGrid)) ||
+			   (snaptonearest != (General.Interface.CtrlState ^ General.Interface.AutoMerge))) Update();
+		}
+
+		// When a key is pressed
+		public override void OnKeyDown(KeyEventArgs e)
+		{
+			base.OnKeyDown(e);
+			if((snaptogrid != (General.Interface.ShiftState ^ General.Interface.SnapToGrid)) ||
+			   (snaptonearest != (General.Interface.CtrlState ^ General.Interface.AutoMerge))) Update();
+		}
+
+		
+		
+		#endregion
+
+		#region ================== Actions
+
+		// This clears the selection
+		[BeginAction("clearselection", BaseAction = true)]
+		public void ClearSelection()
+		{
+			//mxd. Accept changes
+			clearselection = true;
+			General.Editing.AcceptMode();
+
+			//mxd. Clear selection info
+			General.Interface.DisplayStatus(StatusType.Selection, string.Empty);
+		}
+
+		// Flip vertically
+		[BeginAction("flipselectionv")]
+		public void FlipVertically()
+		{
+			// Flip the selection
+			offset.y += size.y;
+			size.y = -size.y;
+			
+			// Update
+			UpdateGeometry();
+			UpdateRectangleComponents();
+			General.Map.Map.Update();
+			General.Interface.RedrawDisplay();
+		}
+
+		// Flip horizontally
+		[BeginAction("flipselectionh")]
+		public void FlipHorizontally()
+		{
+			// Flip the selection
+			offset.x += size.x;
+			size.x = -size.x;
+
+			// Update
+			UpdateGeometry();
+			UpdateRectangleComponents();
+			General.Map.Map.Update();
+			General.Interface.RedrawDisplay();
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ClassicModes/ErrorCheckMode.cs b/Source/Plugins/BuilderModes/ClassicModes/ErrorCheckMode.cs
new file mode 100644
index 0000000..4f0e6c1
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ClassicModes/ErrorCheckMode.cs
@@ -0,0 +1,156 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Editing;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[EditMode(DisplayName = "Map Analysis Mode",
+			  SwitchAction = "errorcheckmode",
+			  ButtonImage = "MapAnalysisMode.png",
+			  ButtonOrder = 200,
+			  ButtonGroup = "002_tools",
+			  AllowCopyPaste = false,
+			  Volatile = true,
+			  UseByDefault = true)]
+
+	public sealed class ErrorCheckMode : BaseClassicMode
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		#endregion
+
+		#region ================== Properties
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		#endregion
+
+		#region ================== Events
+
+		public override void OnHelp()
+		{
+			General.ShowHelp("e_mapanalysis.html");
+		}
+
+		// Cancelled
+		public override void OnCancel()
+		{
+			// Cancel base class
+			base.OnCancel();
+
+			// Return to base mode
+			General.Editing.ChangeMode(General.Editing.PreviousStableMode.Name);
+		}
+
+		// Mode engages
+		public override void OnEngage()
+		{
+			base.OnEngage();
+			renderer.SetPresentation(Presentation.Standard);
+
+			// Save selection as marks
+			General.Map.Map.ClearAllMarks(false);
+			General.Map.Map.MarkAllSelectedGeometry(true, false, false, false, false);
+			General.Map.Map.ClearAllSelected();
+			General.Map.Map.SelectionType = SelectionType.All;
+			
+			// Show toolbox window
+			BuilderPlug.Me.ErrorCheckForm.Show((Form)General.Interface);
+		}
+
+		// Disenagaging
+		public override void OnDisengage()
+		{
+			base.OnDisengage();
+
+			// Hide object info
+			General.Interface.HideInfo();
+			
+			// Restore selection
+			General.Map.Map.SelectMarkedGeometry(true, true);
+			General.Map.Map.ClearAllMarks(false);
+			
+			// Hide toolbox window
+			BuilderPlug.Me.ErrorCheckForm.CloseWindow();
+		}
+
+		// This applies the curves and returns to the base mode
+		public override void OnAccept()
+		{
+			// Snap to map format accuracy
+			General.Map.Map.SnapAllToAccuracy();
+
+			// Update caches
+			General.Map.Map.Update();
+			General.Map.IsChanged = true;
+
+			// Return to base mode
+			General.Editing.ChangeMode(General.Editing.PreviousStableMode.Name);
+		}
+
+		// Redrawing display
+		public override void OnRedrawDisplay()
+		{
+			// Get the selection
+			List<ErrorResult> selection = BuilderPlug.Me.ErrorCheckForm.SelectedResults; //mxd
+			
+			renderer.RedrawSurface();
+			
+			// Render lines
+			if(renderer.StartPlotter(true))
+			{
+				renderer.PlotLinedefSet(General.Map.Map.Linedefs);
+				renderer.PlotVerticesSet(General.Map.Map.Vertices);
+				foreach(ErrorResult result in selection) result.PlotSelection(renderer); //mxd
+				renderer.Finish();
+			}
+			
+			// Render things
+			if(renderer.StartThings(true))
+			{
+				renderer.RenderThingSet(General.Map.Map.Things, Presentation.THINGS_ALPHA);
+				//foreach(ErrorResult result in selection) result.RenderThingsSelection(renderer); //mxd
+				renderer.Finish();
+			}
+			
+			// Render overlay
+			if(renderer.StartOverlay(true))
+			{
+				foreach(ErrorResult result in selection) result.RenderOverlaySelection(renderer); //mxd
+				renderer.Finish();
+			}
+			
+			renderer.Present();
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ClassicModes/FindReplaceMode.cs b/Source/Plugins/BuilderModes/ClassicModes/FindReplaceMode.cs
new file mode 100644
index 0000000..bf3c2aa
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ClassicModes/FindReplaceMode.cs
@@ -0,0 +1,161 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Editing;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[EditMode(DisplayName = "Find and Replace Mode",
+			  SwitchAction = "findmode",
+			  ButtonImage = "FindMode.png",
+			  ButtonOrder = 100,
+			  ButtonGroup = "002_tools",
+			  AllowCopyPaste = false,
+			  Volatile = true,
+			  UseByDefault = true)]
+
+	public sealed class FindReplaceMode : BaseClassicMode
+	{
+		#region ================== Constants
+		
+		#endregion
+
+		#region ================== Variables
+
+		#endregion
+
+		#region ================== Properties
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		#endregion
+
+		#region ================== Events
+
+		public override void OnHelp()
+		{
+			General.ShowHelp("e_findreplace.html");
+		}
+
+		// Cancelled
+		public override void OnCancel()
+		{
+			// Cancel base class
+			base.OnCancel();
+
+			// Return to base mode
+			General.Editing.ChangeMode(General.Editing.PreviousStableMode.Name);
+		}
+
+		// Mode engages
+		public override void OnEngage()
+		{
+			base.OnEngage();
+			renderer.SetPresentation(Presentation.Standard);
+			General.Map.Map.SelectionType = SelectionType.All;
+			
+			// Select linedefs by sectors
+			foreach(Linedef ld in General.Map.Map.Linedefs)
+			{
+				if(ld.Selected == false)
+				{
+					bool front, back;
+					if(ld.Front != null) front = ld.Front.Sector.Selected; else front = false;
+					if(ld.Back != null) back = ld.Back.Sector.Selected; else back = false;
+					ld.Selected = front | back;
+				}
+			}
+			
+			// Show toolbox window
+			BuilderPlug.Me.FindReplaceForm.Show((Form)General.Interface);
+		}
+
+		// Disenagaging
+		public override void OnDisengage()
+		{
+			base.OnDisengage();
+
+			// Hide object info
+			General.Interface.HideInfo();
+			
+			// Hide toolbox window
+			BuilderPlug.Me.FindReplaceForm.Hide();
+		}
+
+		// This applies the curves and returns to the base mode
+		public override void OnAccept()
+		{
+			// Snap to map format accuracy
+			General.Map.Map.SnapAllToAccuracy();
+
+			// Update caches
+			General.Map.Map.Update();
+			General.Map.IsChanged = true;
+
+			// Return to base mode
+			General.Editing.ChangeMode(General.Editing.PreviousStableMode.Name);
+		}
+
+		// Redrawing display
+		public override void OnRedrawDisplay()
+		{
+			// Get the selection
+			FindReplaceObject[] selection = BuilderPlug.Me.FindReplaceForm.GetSelection();
+
+			renderer.RedrawSurface();
+
+			// Render lines
+			if(renderer.StartPlotter(true))
+			{
+				renderer.PlotLinedefSet(General.Map.Map.Linedefs);
+				if(BuilderPlug.Me.FindReplaceForm.Finder != null)
+					BuilderPlug.Me.FindReplaceForm.Finder.PlotSelection(renderer, selection);
+				renderer.PlotVerticesSet(General.Map.Map.Vertices);
+				renderer.Finish();
+			}
+
+			// Render things
+			if(renderer.StartThings(true))
+			{
+				renderer.RenderThingSet(General.Map.Map.Things, Presentation.THINGS_ALPHA);
+				if(BuilderPlug.Me.FindReplaceForm.Finder != null)
+					BuilderPlug.Me.FindReplaceForm.Finder.RenderThingsSelection(renderer, selection);
+				renderer.Finish();
+			}
+			
+			// Render overlay
+			if(renderer.StartOverlay(true))
+			{
+				if(BuilderPlug.Me.FindReplaceForm.Finder != null)
+					BuilderPlug.Me.FindReplaceForm.Finder.RenderOverlaySelection(renderer, selection);
+				renderer.Finish();
+			}
+
+			renderer.Present();
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ClassicModes/FlatAlignMode.cs b/Source/Plugins/BuilderModes/ClassicModes/FlatAlignMode.cs
new file mode 100644
index 0000000..4a74bd1
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ClassicModes/FlatAlignMode.cs
@@ -0,0 +1,941 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Actions;
+using CodeImp.DoomBuilder.Data;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Types;
+using CodeImp.DoomBuilder.Windows;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	public abstract class FlatAlignMode : BaseClassicMode
+	{
+		#region ================== Enums and Structs
+
+		private enum ModifyMode
+		{
+			None,
+			Dragging,
+			Resizing,
+			Rotating
+		}
+
+		private enum Grip
+		{
+			None,
+			Main,
+			SizeV,
+			SizeH,
+			RotateRT,
+			RotateLB
+		}
+
+		protected struct SectorInfo
+		{
+			public float rotation;
+			public Vector2D scale;
+			public Vector2D offset;
+		}
+
+		#endregion
+
+		#region ================== Constants
+
+		private const float GRIP_SIZE = 9.0f;
+		private readonly Cursor[] RESIZE_CURSORS = { Cursors.SizeNS, Cursors.SizeNWSE, Cursors.SizeWE, Cursors.SizeNESW };
+		private const byte RECTANGLE_ALPHA = 60;
+		private const byte EXTENSION_LINE_ALPHA = 150;
+		
+		#endregion
+
+		#region ================== Variables
+
+		private ICollection<Sector> selection;
+		private Sector editsector;
+		protected IList<SectorInfo> sectorinfo;
+		private ImageData texture;
+		//private Vector2D selectionoffset;
+		private ModifyMode mode;
+		private bool autopanning;
+		private bool modealreadyswitching;
+		
+		// Modification
+		// NOTE: This offset is in world space. ZDoom's offset is done before
+		// rotation (not my idea) so we will transform this when applying
+		// changes to sectors.
+		private float rotation;
+		private Vector2D scale = new Vector2D(1.0f, 1.0f);
+		private Vector2D offset;
+
+		// Rectangle components
+		private readonly Vector2D[] corners = new Vector2D[4]; // lefttop, righttop, rightbottom, leftbottom
+		private FlatVertex[] cornerverts = new FlatVertex[6];
+		private readonly Vector2D[] extends = new Vector2D[2]; // right, bottom
+		private readonly RectangleF[] resizegrips = new RectangleF[2];	// right, bottom
+		private readonly RectangleF[] rotategrips = new RectangleF[2];   // righttop, leftbottom
+		private Line2D extensionline;
+		
+		// Aligning
+		private RectangleF alignrect;
+		private Vector2D alignoffset;
+		private bool showalignoffset;
+		private Vector2D dragoffset;
+		private Vector2D resizevector;
+		private Vector2D resizefilter;
+		private Line2D resizeaxis;
+		private float rotationoffset;
+		private Vector2D rotationcenter;
+
+		//mxd. View mode
+		private ViewMode prevviewmode;
+
+		// Options
+		private bool snaptogrid;		// SHIFT to toggle
+		private bool snaptonearest;		// CTRL to enable
+		
+		#endregion
+
+		#region ================== Properties
+
+		protected abstract string XScaleName { get; }
+		protected abstract string YScaleName { get; }
+		protected abstract string XOffsetName { get; }
+		protected abstract string YOffsetName { get; }
+		protected abstract string RotationName { get; }
+		protected abstract string UndoDescription { get; }
+
+		#endregion
+
+		#region ================== Methods
+
+		protected abstract ImageData GetTexture(Sector editsector);
+
+		// This checks if a point is in a rect
+		private static bool PointInRectF(RectangleF rect, Vector2D point)
+		{
+			return (point.x >= rect.Left) && (point.x <= rect.Right) && (point.y >= rect.Top) && (point.y <= rect.Bottom);
+		}
+
+		// Transforms p from Texture space into World space
+		private Vector2D TexToWorld(Vector2D p)
+		{
+			return TexToWorld(p, sectorinfo[0]);
+		}
+		
+		// Transforms p from Texture space into World space
+		protected Vector2D TexToWorld(Vector2D p, SectorInfo s)
+		{
+			p /= scale * s.scale;
+			Vector2D soffset = s.offset.GetRotated(rotation);
+			p -= soffset;
+			p = p.GetRotated(-(rotation + s.rotation));
+			p -= offset;
+			return p;
+		}
+
+		// Transforms p from World space into Texture space
+		private Vector2D WorldToTex(Vector2D p)
+		{
+			return WorldToTex(p, sectorinfo[0]);
+		}
+		
+		// Transforms p from World space into Texture space
+		protected Vector2D WorldToTex(Vector2D p, SectorInfo s)
+		{
+			p += offset;
+			p = p.GetRotated(rotation + s.rotation);
+			p += s.offset;
+			p *= scale * s.scale;
+			return p;
+		}
+
+		// This updates all sectors
+		private void UpdateSectors()
+		{
+			int index = 0;
+			foreach(Sector s in selection)
+			{
+				SectorInfo si = sectorinfo[index];
+				s.Fields.BeforeFieldsChange();
+				Vector2D toffset = offset.GetRotated((rotation + si.rotation));
+				Vector2D soffset = si.offset.GetRotated(rotation);
+				s.Fields[RotationName] = new UniValue(UniversalType.AngleDegreesFloat, Angle2D.RadToDeg(si.rotation + rotation));
+				s.Fields[XScaleName] = new UniValue(UniversalType.Float, si.scale.x * scale.x);
+				s.Fields[YScaleName] = new UniValue(UniversalType.Float, si.scale.y * scale.y);
+				s.Fields[XOffsetName] = new UniValue(UniversalType.Float, soffset.x + toffset.x);
+				s.Fields[YOffsetName] = new UniValue(UniversalType.Float, -(soffset.y + toffset.y));
+				s.UpdateNeeded = true;
+				s.UpdateCache();
+				index++;
+			}
+		}
+
+		// This restores all sectors to original values
+		private void RestoreSectors()
+		{
+			int index = 0;
+			foreach(Sector s in selection)
+			{
+				SectorInfo si = sectorinfo[index];
+				s.Fields.BeforeFieldsChange();
+				s.Fields[RotationName] = new UniValue(UniversalType.AngleDegreesFloat, Angle2D.RadToDeg(si.rotation));
+				s.Fields[XScaleName] = new UniValue(UniversalType.Float, si.scale.x);
+				s.Fields[YScaleName] = new UniValue(UniversalType.Float, si.scale.y);
+				s.Fields[XOffsetName] = new UniValue(UniversalType.Float, si.offset.x);
+				s.Fields[YOffsetName] = new UniValue(UniversalType.Float, -si.offset.y);
+				s.UpdateNeeded = true;
+				s.UpdateCache();
+				index++;
+			}
+		}
+		
+		// This updates the selection
+		private void Update()
+		{
+			// Not in any modifying mode?
+			if(mode == ModifyMode.None)
+			{
+				Vector2D prevdragoffset = alignoffset;
+				alignoffset = new Vector2D(float.MinValue, float.MinValue);
+				showalignoffset = false;
+				
+				// Check what grip the mouse is over
+				// and change cursor accordingly
+				Grip mousegrip = CheckMouseGrip();
+				switch(mousegrip)
+				{
+					case Grip.Main:
+						int closestcorner = -1;
+						float cornerdist = float.MaxValue;
+						for(int i = 0; i < 4; i++)
+						{
+							Vector2D delta = corners[i] - mousemappos;
+							float d = delta.GetLengthSq();
+							if(d < cornerdist)
+							{
+								closestcorner = i;
+								cornerdist = d;
+							}
+						}
+						switch(closestcorner)
+						{
+							// TODO:
+							case 0: alignoffset = new Vector2D(0f, 0f); break;
+							case 1: alignoffset = new Vector2D(texture.ScaledWidth, 0f); break;
+							case 2: alignoffset = new Vector2D(texture.ScaledWidth, -texture.ScaledHeight); break;
+							case 3: alignoffset = new Vector2D(0f, -texture.ScaledHeight); break;
+						}
+						showalignoffset = true;
+						General.Interface.SetCursor(Cursors.Hand);
+						break;
+
+					case Grip.RotateLB:
+					case Grip.RotateRT:
+						alignoffset = new Vector2D(0f, 0f);
+						showalignoffset = true;
+						General.Interface.SetCursor(Cursors.Cross);
+						break;
+
+					case Grip.SizeH:
+					case Grip.SizeV:
+						alignoffset = new Vector2D(0f, 0f);
+						showalignoffset = true;
+						// Pick the best matching cursor depending on rotation and side
+						float resizeangle = -(rotation + sectorinfo[0].rotation);
+						if(mousegrip == Grip.SizeH) resizeangle += Angle2D.PIHALF;
+						resizeangle = Angle2D.Normalized(resizeangle);
+						if(resizeangle > Angle2D.PI) resizeangle -= Angle2D.PI;
+						resizeangle = Math.Abs(resizeangle + Angle2D.PI / 8.000001f);
+						int cursorindex = (int)Math.Floor((resizeangle / Angle2D.PI) * 4.0f) % 4;
+						General.Interface.SetCursor(RESIZE_CURSORS[cursorindex]);
+						break;
+
+					default:
+						General.Interface.SetCursor(Cursors.Default);
+						break;
+				}
+
+				if(prevdragoffset != alignoffset)
+					General.Interface.RedrawDisplay();
+			}
+			else
+			{
+				Vector2D snappedmappos = mousemappos;
+				bool dosnaptogrid = snaptogrid;
+				
+				// Options
+				snaptogrid = General.Interface.ShiftState ^ General.Interface.SnapToGrid;
+				snaptonearest = General.Interface.CtrlState ^ General.Interface.AutoMerge;
+
+				// Change to crosshair cursor so we can clearly see around the mouse cursor
+				General.Interface.SetCursor(Cursors.Cross);
+				
+				// Check what modifying mode we are in
+				switch(mode)
+				{
+					case ModifyMode.Dragging:
+						
+						offset = -mousemappos - dragoffset;
+						Vector2D transformedpos = TexToWorld(alignoffset);
+
+						// Snap to nearest vertex?
+						if(snaptonearest)
+						{
+							float vrange = BuilderPlug.Me.StitchRange / renderer.Scale;
+
+							// Try the nearest vertex
+							Vertex nv = MapSet.NearestVertexSquareRange(General.Map.Map.Vertices, transformedpos, vrange);
+							if(nv != null)
+							{
+								// Change offset to snap to target
+								offset -= nv.Position - transformedpos;
+								dosnaptogrid = false;
+							}
+							else
+							{
+								// Find the nearest line within range
+								Linedef nl = MapSet.NearestLinedefRange(General.Map.Map.Linedefs, transformedpos, vrange);
+								if(nl != null)
+								{
+									// Snap to grid?
+									if(dosnaptogrid)
+									{
+										// Get grid intersection coordinates
+										List<Vector2D> coords = nl.GetGridIntersections();
+
+										// Find nearest grid intersection
+										float found_distance = float.MaxValue;
+										Vector2D found_pos = new Vector2D(float.NaN, float.NaN);
+										foreach(Vector2D v in coords)
+										{
+											Vector2D dist = transformedpos - v;
+											if(dist.GetLengthSq() < found_distance)
+											{
+												// Found a better match
+												found_distance = dist.GetLengthSq();
+												found_pos = v;
+
+												// Do not snap to grid anymore
+												dosnaptogrid = false;
+											}
+										}
+
+										// Found something?
+										if(!float.IsNaN(found_pos.x))
+										{
+											// Change offset to snap to target
+											offset -= found_pos - transformedpos;
+										}
+									}
+									else
+									{
+										// Change offset to snap onto the line
+										offset -= nl.NearestOnLine(transformedpos) - transformedpos;
+									}
+								}
+							}
+						}
+
+						// Snap to grid?
+						if(dosnaptogrid)
+						{
+							// Change offset to align to grid
+							offset -= General.Map.Grid.SnappedToGrid(transformedpos) - transformedpos;
+						}
+						
+						break;
+
+					case ModifyMode.Resizing:
+						
+						// Snap to nearest vertex?
+						if(snaptonearest)
+						{
+							float vrange = BuilderPlug.Me.StitchRange / renderer.Scale;
+
+							// Try the nearest vertex
+							Vertex nv = MapSet.NearestVertexSquareRange(General.Map.Map.Vertices, snappedmappos, vrange);
+							if(nv != null)
+							{
+								snappedmappos = nv.Position;
+								dosnaptogrid = false;
+							}
+						}
+
+						// Snap to grid?
+						if(dosnaptogrid)
+						{
+							// Aligned to grid
+							snappedmappos = General.Map.Grid.SnappedToGrid(snappedmappos);
+						}
+
+						float newscale = 1f / resizeaxis.GetNearestOnLine(snappedmappos);
+						if(float.IsInfinity(newscale) || float.IsNaN(newscale)) newscale = 99999f;
+						scale = (newscale * resizefilter) + scale * (1.0f - resizefilter);
+						if(float.IsInfinity(scale.x) || float.IsNaN(scale.x)) scale.x = 99999f;
+						if(float.IsInfinity(scale.y) || float.IsNaN(scale.y)) scale.y = 99999f;
+
+						// Show the extension line so that the user knows what it is aligning to
+						UpdateRectangleComponents();
+						Line2D edgeline;
+						if(resizefilter.x > resizefilter.y)
+							edgeline = new Line2D(corners[1], corners[2]);
+						else
+							edgeline = new Line2D(corners[3], corners[2]);
+						float nearestonedge = edgeline.GetNearestOnLine(snappedmappos);
+						if(nearestonedge > 0.5f)
+							extensionline = new Line2D(edgeline.v1, snappedmappos);
+						else
+							extensionline = new Line2D(edgeline.v2, snappedmappos);
+
+						break;
+
+					case ModifyMode.Rotating:
+
+						// Snap to nearest vertex?
+						extensionline = new Line2D();
+						if(snaptonearest)
+						{
+							float vrange = BuilderPlug.Me.StitchRange / renderer.Scale;
+
+							// Try the nearest vertex
+							Vertex nv = MapSet.NearestVertexSquareRange(General.Map.Map.Vertices, snappedmappos, vrange);
+							if(nv != null)
+							{
+								snappedmappos = nv.Position;
+								dosnaptogrid = false;
+
+								// Show the extension line so that the user knows what it is aligning to
+								extensionline = new Line2D(corners[0], snappedmappos);
+							}
+						}
+
+						Vector2D delta = snappedmappos - rotationcenter;
+						float deltaangle = -delta.GetAngle();
+						
+						// Snap to grid?
+						if(dosnaptogrid)
+						{
+							// We make 24 vectors that the rotation can snap to
+							float founddistance = float.MaxValue;
+							float foundrotation = rotation;
+							Vector3D rotvec = Vector2D.FromAngle(deltaangle + rotationoffset);
+
+							for(int i = 0; i < 24; i++)
+							{
+								// Make the vectors
+								float angle = i * Angle2D.PI * 0.08333333333f; //mxd. 15-degree increments
+								Vector2D gridvec = Vector2D.FromAngle(angle);
+
+								// Check distance
+								float dist = 2.0f - Vector2D.DotProduct(gridvec, rotvec);
+								if(dist < founddistance)
+								{
+									foundrotation = angle;
+									founddistance = dist;
+								}
+							}
+
+							// Keep rotation
+							rotation = foundrotation - sectorinfo[0].rotation;
+						}
+						else
+						{
+							rotation = deltaangle + rotationoffset - sectorinfo[0].rotation;
+						}
+						break;
+				}
+				
+				UpdateSectors();
+				General.Interface.RedrawDisplay();
+			}
+		}
+		
+		// This updates the selection rectangle components
+		private void UpdateRectangleComponents()
+		{
+			float gripsize = GRIP_SIZE / renderer.Scale;
+			PixelColor rectcolor = General.Colors.Highlight.WithAlpha(RECTANGLE_ALPHA);
+
+			// Corners in world space
+			corners[0] = TexToWorld(new Vector2D(0f, 0f));
+			corners[1] = TexToWorld(new Vector2D(texture.ScaledWidth, 0f));
+			corners[2] = TexToWorld(new Vector2D(texture.ScaledWidth, -texture.ScaledHeight));
+			corners[3] = TexToWorld(new Vector2D(0f, -texture.ScaledHeight));
+
+			// Vertices
+			cornerverts = new FlatVertex[6];
+			for(int i = 0; i < 6; i++)
+			{
+				cornerverts[i] = new FlatVertex();
+				cornerverts[i].z = 1.0f;
+				cornerverts[i].c = rectcolor.ToInt();
+			}
+			cornerverts[0].x = corners[0].x;
+			cornerverts[0].y = corners[0].y;
+			cornerverts[1].x = corners[1].x;
+			cornerverts[1].y = corners[1].y;
+			cornerverts[2].x = corners[2].x;
+			cornerverts[2].y = corners[2].y;
+			cornerverts[3].x = corners[0].x;
+			cornerverts[3].y = corners[0].y;
+			cornerverts[4].x = corners[2].x;
+			cornerverts[4].y = corners[2].y;
+			cornerverts[5].x = corners[3].x;
+			cornerverts[5].y = corners[3].y;
+
+			// Extended points for rotation corners
+			extends[0] = TexToWorld(new Vector2D(texture.ScaledWidth + (20f * Math.Sign(scale.x * sectorinfo[0].scale.x)) / renderer.Scale * (scale.x * sectorinfo[0].scale.x), 0f));
+			extends[1] = TexToWorld(new Vector2D(0f, -texture.ScaledHeight + (-20f * Math.Sign(scale.y * sectorinfo[0].scale.y))  / renderer.Scale * (scale.y * sectorinfo[0].scale.y)));
+
+			// Middle points between corners
+			Vector2D middle12 = corners[1] + (corners[2] - corners[1]) * 0.5f;
+			Vector2D middle23 = corners[2] + (corners[3] - corners[2]) * 0.5f;
+			
+			// Resize grips
+			resizegrips[0] = new RectangleF(middle12.x - gripsize * 0.5f,
+											middle12.y - gripsize * 0.5f,
+											gripsize, gripsize);
+			resizegrips[1] = new RectangleF(middle23.x - gripsize * 0.5f,
+											middle23.y - gripsize * 0.5f,
+											gripsize, gripsize);
+
+			// Rotate grips
+			rotategrips[0] = new RectangleF(extends[0].x - gripsize * 0.5f,
+											extends[0].y - gripsize * 0.5f,
+											gripsize, gripsize);
+			rotategrips[1] = new RectangleF(extends[1].x - gripsize * 0.5f,
+											extends[1].y - gripsize * 0.5f,
+											gripsize, gripsize);
+
+			if(showalignoffset)
+			{
+				Vector2D worldalignoffset = TexToWorld(alignoffset);
+				alignrect = new RectangleF(worldalignoffset.x - gripsize * 0.5f,
+										   worldalignoffset.y - gripsize * 0.5f,
+										   gripsize, gripsize);
+			}
+		}
+
+		// This checks and returns the grip the mouse pointer is in
+		private Grip CheckMouseGrip()
+		{
+			if(PointInRectF(resizegrips[0], mousemappos)) return Grip.SizeH;
+			if(PointInRectF(resizegrips[1], mousemappos)) return Grip.SizeV;
+			if(PointInRectF(rotategrips[0], mousemappos)) return Grip.RotateRT;
+			if(PointInRectF(rotategrips[1], mousemappos)) return Grip.RotateLB;
+			if(Tools.PointInPolygon(corners, mousemappos)) return Grip.Main;
+			return Grip.None;
+		}
+		
+		#endregion
+
+		#region ================== Events
+
+		// Mode engages
+		public override void OnEngage()
+		{
+			prevviewmode = General.Map.Renderer2D.ViewMode; //mxd
+			base.OnEngage();
+
+			// We don't want to record this for undoing while we move the geometry around.
+			// This will be set back to normal when we're done.
+			General.Map.UndoRedo.IgnorePropChanges = true;
+
+			// Presentation
+			renderer.SetPresentation(Presentation.Standard);
+
+			// Selection
+			General.Map.Map.ConvertSelection(SelectionType.Sectors);
+			General.Map.Map.SelectionType = SelectionType.Sectors;
+			if(General.Map.Map.SelectedSectorsCount == 0)
+			{
+				// Find the nearest linedef within highlight range
+				Linedef l = General.Map.Map.NearestLinedef(mousemappos);
+				if(l != null)
+				{
+					Sector selectsector = null;
+					
+					// Check on which side of the linedef the mouse is and which sector there is
+					float side = l.SideOfLine(mousemappos);
+					if((side > 0) && (l.Back != null))
+						selectsector = l.Back.Sector;
+					else if((side <= 0) && (l.Front != null))
+						selectsector = l.Front.Sector;
+
+					// Select the sector!
+					if(selectsector != null)
+					{
+						selectsector.Selected = true;
+						foreach(Sidedef sd in selectsector.Sidedefs)
+							sd.Line.Selected = true;
+					}
+				}
+			}
+			
+			// Get sector selection
+			selection = General.Map.Map.GetSelectedSectors(true);
+			if(selection.Count == 0)
+			{
+				General.Interface.MessageBeep(MessageBeepType.Default);
+				General.Interface.DisplayStatus(StatusType.Action, "A selected sector is required for this action.");
+				General.Editing.CancelMode();
+				return;
+			}
+			editsector = General.GetByIndex(selection, 0);
+
+			// Get the texture
+			texture = GetTexture(editsector);
+			if((texture == null) || (texture == General.Map.Data.WhiteTexture) ||
+			   (texture.Width <= 0) || (texture.Height <= 0) || !texture.IsImageLoaded)
+			{
+				General.Interface.MessageBeep(MessageBeepType.Default);
+				General.Interface.DisplayStatus(StatusType.Action, "The selected sector must have a loaded texture to align.");
+				General.Editing.CancelMode();
+				return;
+			}
+			
+			// Cache the transformation values
+			sectorinfo = new List<SectorInfo>(selection.Count);
+			foreach(Sector s in selection)
+			{
+				SectorInfo si;
+				si.rotation = Angle2D.DegToRad(s.Fields.GetValue(RotationName, 0.0f));
+				si.scale.x = s.Fields.GetValue(XScaleName, 1.0f);
+				si.scale.y = s.Fields.GetValue(YScaleName, 1.0f);
+				si.offset.x = s.Fields.GetValue(XOffsetName, 0.0f);
+				si.offset.y = -s.Fields.GetValue(YOffsetName, 0.0f);
+				sectorinfo.Add(si);
+			}
+
+			// We want the texture corner nearest to the center of the sector
+			Vector2D fp;
+			fp.x = (editsector.BBox.Left + editsector.BBox.Right) / 2;
+			fp.y = (editsector.BBox.Top + editsector.BBox.Bottom) / 2;
+
+			// Transform the point into texture space
+			fp = WorldToTex(fp);
+			
+			// Snap to the nearest left-top corner
+			fp.x = (float)Math.Floor(fp.x / texture.ScaledWidth) * texture.ScaledWidth;
+			fp.y = (float)Math.Ceiling(fp.y / texture.ScaledHeight) * texture.ScaledHeight;
+
+			// Now move the offset so that the 0,0 point is at this location
+			// We want to work with the 0,0 location because it makes things easier.
+			SectorInfo si0 = sectorinfo[0];
+			si0.offset -= fp / si0.scale;
+			sectorinfo[0] = si0;
+
+			UpdateRectangleComponents();
+			UpdateSectors();
+		}
+
+		// Mode disengages
+		public override void OnDisengage()
+		{
+			switch(prevviewmode) 
+			{
+				case ViewMode.Normal: General.Actions.InvokeAction("builder_viewmodenormal"); break;
+				case ViewMode.FloorTextures: General.Actions.InvokeAction("builder_viewmodefloors"); break;
+				case ViewMode.CeilingTextures: General.Actions.InvokeAction("builder_viewmodeceilings"); break;
+				case ViewMode.Brightness: General.Actions.InvokeAction("builder_viewmodebrightness"); break;
+			}
+			
+			base.OnDisengage();
+
+			// When not cancelled manually, we assume it is accepted
+			if(!cancelled)
+			{
+				modealreadyswitching = true;
+				General.Editing.AcceptMode();
+			}
+			
+			// Hide highlight info
+			General.Interface.SetCursor(Cursors.Default);
+			General.Interface.HideInfo();
+			General.Interface.RedrawDisplay();
+		}
+
+		// When accepted
+		public override void OnAccept()
+		{
+			base.OnAccept();
+
+			if(!modealreadyswitching)
+			{
+				modealreadyswitching = true;
+				
+				// Restore original values
+				RestoreSectors();
+				General.Map.Map.Update();
+
+				// Make undo
+				General.Map.UndoRedo.CreateUndo(UndoDescription);
+
+				// Resume normal undo/redo recording
+				General.Map.UndoRedo.IgnorePropChanges = false;
+
+				// Apply changes
+				UpdateSectors();
+				General.Map.Map.Update();
+
+				// Clear selection
+				if(selection.Count == 1)
+					General.Map.Map.ClearAllSelected();
+
+				// Done
+				General.Map.IsChanged = true;
+				selection = null;
+				sectorinfo = null;
+				
+				// Return to previous stable mode
+				General.Editing.ChangeMode(General.Editing.PreviousStableMode.Name);
+			}
+		}
+
+		// Cancel mode
+		public override void OnCancel()
+		{
+			base.OnCancel();
+			modealreadyswitching = true;
+			
+			// Restore original values
+			RestoreSectors();
+			General.Map.Map.Update();
+
+			// Resume normal undo/redo recording
+			General.Map.UndoRedo.IgnorePropChanges = false;
+
+			// Return to previous stable mode
+			General.Editing.ChangeMode(General.Editing.PreviousStableMode.Name);
+		}
+
+		// Mouse moves
+		public override void OnMouseMove(MouseEventArgs e)
+		{
+			base.OnMouseMove(e);
+			if(panning) return; //mxd. Skip all this jazz while panning
+			Update();
+		}
+
+		// Mouse leaves the display
+		public override void OnMouseLeave(EventArgs e)
+		{
+			base.OnMouseLeave(e);
+
+			// Reset cursor
+			General.Interface.SetCursor(Cursors.Default);
+		}
+
+
+		// When edit button is pressed
+		protected override void OnEditBegin()
+		{
+			base.OnEditBegin();
+			OnSelectBegin();
+		}
+
+		// When edit button is released
+		protected override void OnEditEnd()
+		{
+			base.OnEditEnd();
+			OnSelectEnd();
+		}
+
+		// When select button is pressed
+		protected override void OnSelectBegin()
+		{
+			base.OnSelectBegin();
+			if(mode != ModifyMode.None) return;
+
+			// Check what grip the mouse is over
+			switch(CheckMouseGrip())
+			{
+				// Drag main rectangle
+				case Grip.Main:
+					dragoffset = -mousemappos - offset;
+					mode = ModifyMode.Dragging;
+					EnableAutoPanning();
+					autopanning = true;
+					break;
+
+				// Scale
+				case Grip.SizeH:
+					// The resize vector is a unit vector in the direction of the resize.
+					// We multiply this with the sign of the current size, because the
+					// corners may be reversed when the selection is flipped.
+					resizevector = corners[1] - corners[0];
+					resizevector = resizevector.GetNormal() * Math.Sign(scale.x);
+
+					// Make the resize axis. This is a line with the length and direction
+					// of basesize used to calculate the resize percentage.
+					resizeaxis = new Line2D(corners[0], corners[0] + resizevector * texture.ScaledWidth / Math.Abs(sectorinfo[0].scale.x));
+
+					// Original axis filter
+					resizefilter = new Vector2D(1.0f, 0.0f);
+					
+					mode = ModifyMode.Resizing;
+					break;
+
+				// Scale
+				case Grip.SizeV:
+					// See description above
+					resizevector = corners[2] - corners[1];
+					resizevector = resizevector.GetNormal() * Math.Sign(scale.y);
+					resizeaxis = new Line2D(corners[1], corners[1] + resizevector * texture.ScaledHeight / Math.Abs(sectorinfo[0].scale.y));
+					resizefilter = new Vector2D(0.0f, 1.0f);
+					mode = ModifyMode.Resizing;
+					break;
+
+				// Rotate
+				case Grip.RotateRT:
+					rotationoffset = Angle2D.PIHALF;
+					if(Math.Sign(scale.x * sectorinfo[0].scale.x) < 0)
+						rotationoffset += Angle2D.PI;
+					rotationcenter = corners[0];
+					mode = ModifyMode.Rotating;
+					break;
+
+				// Rotate
+				case Grip.RotateLB:
+					rotationoffset = 0f;
+					if(Math.Sign(scale.y * sectorinfo[0].scale.y) < 0)
+						rotationoffset += Angle2D.PI;
+					rotationcenter = corners[0];
+					mode = ModifyMode.Rotating;
+					break;
+					
+				// Outside the selection?
+				default:
+					// Accept and be done with it
+					General.Editing.AcceptMode();
+					break;
+			}
+		}
+
+		// When selected button is released
+		protected override void OnSelectEnd()
+		{
+			base.OnSelectEnd();
+
+			// Remove extension line
+			extensionline = new Line2D();
+
+			if(autopanning)
+			{
+				DisableAutoPanning();
+				autopanning = false;
+			}
+
+			// No modifying mode
+			mode = ModifyMode.None;
+
+			// Redraw
+			General.Map.Map.Update();
+			General.Interface.RedrawDisplay();
+		}
+
+		// This redraws the display
+		public override void OnRedrawDisplay()
+		{
+			if(sectorinfo != null) UpdateRectangleComponents();
+			renderer.RedrawSurface();
+
+			// Render lines
+			if(renderer.StartPlotter(true))
+			{
+				renderer.PlotLinedefSet(General.Map.Map.Linedefs);
+				renderer.PlotVerticesSet(General.Map.Map.Vertices);
+				renderer.Finish();
+			}
+
+			// Render things
+			if(renderer.StartThings(true))
+			{
+				renderer.RenderThingSet(General.Map.ThingsFilter.HiddenThings, Presentation.THINGS_HIDDEN_ALPHA);
+				renderer.RenderThingSet(General.Map.ThingsFilter.VisibleThings, Presentation.THINGS_ALPHA);
+				renderer.Finish();
+			}
+
+			// Render overlay
+			if(sectorinfo != null)
+			{
+				if(renderer.StartOverlay(true))
+				{
+					// Rectangle
+					PixelColor rectcolor = General.Colors.Highlight.WithAlpha(RECTANGLE_ALPHA);
+					renderer.RenderGeometry(cornerverts, null, true);
+					if(extensionline.GetLengthSq() > 0.0f)
+						renderer.RenderLine(extensionline.v1, extensionline.v2, 1, General.Colors.Indication.WithAlpha(EXTENSION_LINE_ALPHA), true);
+					renderer.RenderLine(corners[0], corners[1], 4, rectcolor, true);
+					renderer.RenderLine(corners[1], corners[2], 4, rectcolor, true);
+					renderer.RenderLine(corners[2], corners[3], 4, rectcolor, true);
+					renderer.RenderLine(corners[3], corners[0], 4, rectcolor, true);
+
+					// Lines
+					renderer.RenderLine(corners[0], extends[0], 1f, General.Colors.Highlight, true);
+					renderer.RenderLine(corners[0], extends[1], 1f, General.Colors.Highlight, true);
+					renderer.RenderLine(corners[1], corners[2], 0.5f, General.Colors.Highlight, true);
+					renderer.RenderLine(corners[2], corners[3], 0.5f, General.Colors.Highlight, true);
+
+					// Handles
+					renderer.RenderRectangleFilled(rotategrips[0], General.Colors.Background, true);
+					renderer.RenderRectangleFilled(rotategrips[1], General.Colors.Background, true);
+					renderer.RenderRectangle(rotategrips[0], 2f, General.Colors.Indication, true);
+					renderer.RenderRectangle(rotategrips[1], 2f, General.Colors.Indication, true);
+					renderer.RenderRectangleFilled(resizegrips[0], General.Colors.Background, true);
+					renderer.RenderRectangleFilled(resizegrips[1], General.Colors.Background, true);
+					renderer.RenderRectangle(resizegrips[0], 2f, General.Colors.Highlight, true);
+					renderer.RenderRectangle(resizegrips[1], 2f, General.Colors.Highlight, true);
+
+					// Rotate/align point
+					if(showalignoffset)
+						renderer.RenderRectangleFilled(alignrect, General.Colors.Selection, true);
+
+					renderer.Finish();
+				}
+			}
+			
+			renderer.Present();
+		}
+
+		#endregion
+
+		#region ================== Actions
+
+		// This clears the selection
+		[BeginAction("clearselection", BaseAction = true)]
+		public void ClearSelection()
+		{
+			// Accept changes
+			General.Editing.AcceptMode();
+			General.Map.Map.ClearAllSelected();
+			General.Interface.RedrawDisplay();
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ClassicModes/FloorAlignMode.cs b/Source/Plugins/BuilderModes/ClassicModes/FloorAlignMode.cs
new file mode 100644
index 0000000..c46b7f8
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ClassicModes/FloorAlignMode.cs
@@ -0,0 +1,71 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using CodeImp.DoomBuilder.Data;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Editing;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[EditMode(DisplayName = "Floor Align Mode",
+			  SwitchAction = "flooralignmode",
+			  ButtonImage = "FloorAlign.png",
+			  ButtonOrder = int.MinValue + 310,
+			  ButtonGroup = "000_editing",
+			  UseByDefault = true, //mxd
+			  SupportedMapFormats = new[] { "UniversalMapSetIO" }, //mxd
+			  Volatile = true)]
+
+	public class FloorAlignMode : FlatAlignMode
+	{
+		#region ================== Properties
+
+		protected override string XScaleName { get { return "xscalefloor"; } }
+		protected override string YScaleName { get { return "yscalefloor"; } }
+		protected override string XOffsetName { get { return "xpanningfloor"; } }
+		protected override string YOffsetName { get { return "ypanningfloor"; } }
+		protected override string RotationName { get { return "rotationfloor"; } }
+		protected override string UndoDescription { get { return "Floor Alignment"; } }
+
+		#endregion
+
+		#region ================== Methods
+
+		// Get the texture data to align
+		protected override ImageData GetTexture(Sector editsector)
+		{
+			return General.Map.Data.GetFlatImage(editsector.LongFloorTexture);
+		}
+
+		#endregion
+
+		#region ================== Events
+
+		// Mode engages
+		public override void OnEngage()
+		{
+			base.OnEngage();
+			General.Actions.InvokeAction("builder_viewmodefloors");
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ClassicModes/LinedefsMode.cs b/Source/Plugins/BuilderModes/ClassicModes/LinedefsMode.cs
new file mode 100644
index 0000000..2ca8e49
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ClassicModes/LinedefsMode.cs
@@ -0,0 +1,1649 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Actions;
+using CodeImp.DoomBuilder.BuilderModes.Interface;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Data;
+using CodeImp.DoomBuilder.Editing;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.GZBuilder.Geometry;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Types;
+using CodeImp.DoomBuilder.Windows;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[EditMode(DisplayName = "Linedefs Mode",
+			  SwitchAction = "linedefsmode",	// Action name used to switch to this mode
+			  ButtonImage = "LinesMode.png",	// Image resource name for the button
+			  ButtonOrder = int.MinValue + 100,	// Position of the button (lower is more to the left)
+			  ButtonGroup = "000_editing",
+			  UseByDefault = true,
+			  SafeStartMode = true)]
+
+	public class LinedefsMode : BaseClassicMode
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		// Highlighted item
+		private Linedef highlighted;
+		private readonly Association[] association = new Association[Linedef.NUM_ARGS];
+		private readonly Association highlightasso = new Association();
+		private Vector2D insertpreview = new Vector2D(float.NaN, float.NaN); //mxd
+		
+		// Interface
+		private bool editpressed;
+		
+		#endregion
+
+		#region ================== Properties
+
+		public override object HighlightedObject { get { return highlighted; } }
+		
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		public LinedefsMode()
+		{
+			//mxd. Associations now requre initializing...
+			for(int i = 0; i < association.Length; i++) association[i] = new Association();
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This highlights a new item
+		private void Highlight(Linedef l)
+		{
+			bool completeredraw = false;
+			LinedefActionInfo action = null;
+
+			// Often we can get away by simply undrawing the previous
+			// highlight and drawing the new highlight. But if associations
+			// are or were drawn we need to redraw the entire display.
+			
+			// Previous association highlights something?
+			if((highlighted != null) && (highlighted.Tag != 0)) completeredraw = true;
+			
+			// Set highlight association
+			if(l != null && l.Tag != 0)
+				highlightasso.Set(new Vector2D((l.Start.Position  + l.End.Position)/2), l.Tags, UniversalType.LinedefTag);
+			else
+				highlightasso.Set(new Vector2D(), 0, 0);
+
+			// New association highlights something?
+			if((l != null) && (l.Tag != 0)) completeredraw = true;
+
+			// Use the line tag to highlight sectors (Doom style)
+			if(General.Map.Config.LineTagIndicatesSectors)
+			{
+				if(l != null)
+					association[0].Set(new Vector2D((l.Start.Position  + l.End.Position)/2), l.Tags, UniversalType.SectorTag);
+				else
+					association[0].Set(new Vector2D(), 0, 0);
+			}
+			else
+			{
+				if(l != null)
+				{
+					// Check if we can find the linedefs action
+					if((l.Action > 0) && General.Map.Config.LinedefActions.ContainsKey(l.Action))
+						action = General.Map.Config.LinedefActions[l.Action];
+				}
+				
+				// Determine linedef associations
+				for(int i = 0; i < Linedef.NUM_ARGS; i++)
+				{
+					// Previous association highlights something?
+					if((association[i].Type == UniversalType.SectorTag) ||
+					   (association[i].Type == UniversalType.LinedefTag) ||
+					   (association[i].Type == UniversalType.ThingTag)) completeredraw = true;
+
+					// Make new association
+					if(action != null)
+						association[i].Set(new Vector2D((l.Start.Position  + l.End.Position)/2), l.Args[i], action.Args[i].Type);
+					else
+						association[i].Set(new Vector2D(), 0, 0);
+
+					// New association highlights something?
+					if((association[i].Type == UniversalType.SectorTag) ||
+					   (association[i].Type == UniversalType.LinedefTag) ||
+					   (association[i].Type == UniversalType.ThingTag)) completeredraw = true;
+				}
+			}
+			
+			// If we're changing associations, then we
+			// need to redraw the entire display
+			if(completeredraw)
+			{
+				// Set new highlight and redraw completely
+				highlighted = l;
+				General.Interface.RedrawDisplay();
+			}
+			else
+			{
+				// Update display
+				if(renderer.StartPlotter(false))
+				{
+					// Undraw previous highlight
+					Linedef possiblecommentline = l ?? highlighted; //mxd
+					if((highlighted != null) && !highlighted.IsDisposed)
+					{
+						renderer.PlotLinedef(highlighted, renderer.DetermineLinedefColor(highlighted));
+						renderer.PlotVertex(highlighted.Start, renderer.DetermineVertexColor(highlighted.Start));
+						renderer.PlotVertex(highlighted.End, renderer.DetermineVertexColor(highlighted.End));
+					}
+
+					// Set new highlight
+					highlighted = l;
+
+					// Render highlighted item
+					if((highlighted != null) && !highlighted.IsDisposed)
+					{
+						renderer.PlotLinedef(highlighted, General.Colors.Highlight);
+						renderer.PlotVertex(highlighted.Start, renderer.DetermineVertexColor(highlighted.Start));
+						renderer.PlotVertex(highlighted.End, renderer.DetermineVertexColor(highlighted.End));
+					}
+
+					// Done with highlight
+					renderer.Finish();
+
+					//mxd. Update comment highlight?
+					if(General.Map.UDMF && General.Settings.RenderComments
+						&& possiblecommentline != null && !possiblecommentline.IsDisposed
+						&& renderer.StartOverlay(false))
+					{
+						RenderComment(possiblecommentline);
+						renderer.Finish();
+					}
+
+					renderer.Present();
+				}
+			}
+
+			// Show highlight info
+			if((highlighted != null) && !highlighted.IsDisposed)
+			{
+				General.Interface.ShowLinedefInfo(highlighted);
+			}
+			else
+			{
+				General.Interface.Display.HideToolTip(); //mxd
+				General.Interface.HideInfo();
+			}
+		}
+
+		//mxd
+		private void AlignTextureToLine(bool alignFloors, bool alignToFrontSide) 
+		{
+			ICollection<Linedef> lines = General.Map.Map.GetSelectedLinedefs(true);
+
+			if(lines.Count == 0 && highlighted != null && !highlighted.IsDisposed)
+				lines.Add(highlighted);
+
+			if(lines.Count == 0) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "This action requires a selection");
+				return;
+			}
+
+			//Create Undo
+			string rest = (alignFloors ? "Floors" : "Ceilings") + " to " + (alignToFrontSide ? "Front" : "Back")+ " Side";
+			General.Map.UndoRedo.CreateUndo("Align " + rest);
+			int counter = 0;
+
+			foreach(Linedef l in lines)
+			{
+				Sector s = null;
+
+				if(alignToFrontSide) 
+				{
+					if(l.Front != null && l.Front.Sector != null) s = l.Front.Sector;
+				} 
+				else 
+				{
+					if(l.Back != null && l.Back.Sector != null)	s = l.Back.Sector;
+				}
+
+				if(s == null) continue;
+				counter++;
+
+				s.Fields.BeforeFieldsChange();
+
+				float sourceAngle = (float)Math.Round(General.ClampAngle(alignToFrontSide ? -Angle2D.RadToDeg(l.Angle) + 90 : -Angle2D.RadToDeg(l.Angle) - 90), 1);
+				if(!alignToFrontSide) sourceAngle = General.ClampAngle(sourceAngle + 180);
+
+				//update angle
+				UniFields.SetFloat(s.Fields, (alignFloors ? "rotationfloor" : "rotationceiling"), sourceAngle, 0f);
+
+				//update offset
+				Vector2D offset = (alignToFrontSide ? l.Start.Position : l.End.Position).GetRotated(Angle2D.DegToRad(sourceAngle));
+				ImageData texture = General.Map.Data.GetFlatImage(s.LongFloorTexture);
+
+				if((texture == null) || (texture == General.Map.Data.WhiteTexture) ||
+				   (texture.Width <= 0) || (texture.Height <= 0) || !texture.IsImageLoaded) 
+				{
+					//meh...
+				}
+				else
+				{
+					offset.x %= texture.Width / s.Fields.GetValue((alignFloors ? "xscalefloor" : "xscaleceiling"), 1.0f);
+					offset.y %= texture.Height / s.Fields.GetValue((alignFloors ? "yscalefloor" : "yscaleceiling"), 1.0f);
+				}
+
+				UniFields.SetFloat(s.Fields, (alignFloors ? "xpanningfloor" : "xpanningceiling"), (float)Math.Round(-offset.x), 0f);
+				UniFields.SetFloat(s.Fields, (alignFloors ? "ypanningfloor" : "ypanningceiling"), (float)Math.Round(offset.y), 0f);
+
+				//update
+				s.UpdateNeeded = true;
+				s.UpdateCache();
+			}
+
+			General.Interface.DisplayStatus(StatusType.Info, "Aligned " +counter + " " + rest);
+
+			//update
+			General.Map.Map.Update();
+			General.Interface.RedrawDisplay();
+			General.Interface.RefreshInfo();
+			General.Map.IsChanged = true;
+		}
+
+		//mxd
+		private bool IsInSelectionRect(Linedef l, List<Line2D> selectionOutline) 
+		{
+			if(BuilderPlug.Me.MarqueSelectTouching) 
+			{
+				bool selected = selectionrect.Contains(l.Start.Position.x, l.Start.Position.y) || selectionrect.Contains(l.End.Position.x, l.End.Position.y);
+
+				//check intersections with outline
+				if(!selected) 
+				{
+					foreach(Line2D line in selectionOutline) 
+					{
+						if(Line2D.GetIntersection(l.Line, line)) return true;
+					}
+				}
+				return selected;
+			}
+
+			return selectionrect.Contains(l.Start.Position.x, l.Start.Position.y) && selectionrect.Contains(l.End.Position.x, l.End.Position.y);
+		}
+		
+		#endregion
+		
+		#region ================== Events
+
+		public override void OnHelp()
+		{
+			General.ShowHelp("e_linedefs.html");
+		}
+
+		// Cancel mode
+		public override void OnCancel()
+		{
+			base.OnCancel();
+
+			// Return to this mode
+			General.Editing.ChangeMode(new LinedefsMode());
+		}
+
+		// Mode engages
+		public override void OnEngage()
+		{
+			base.OnEngage();
+			renderer.SetPresentation(Presentation.Standard);
+			
+			// Add toolbar buttons
+			General.Interface.AddButton(BuilderPlug.Me.MenusForm.CopyProperties);
+			General.Interface.AddButton(BuilderPlug.Me.MenusForm.PasteProperties);
+			General.Interface.AddButton(BuilderPlug.Me.MenusForm.PastePropertiesOptions); //mxd
+			General.Interface.AddButton(BuilderPlug.Me.MenusForm.SeparatorCopyPaste);
+			if(General.Map.UDMF) //mxd
+			{
+				General.Interface.AddButton(BuilderPlug.Me.MenusForm.MakeGradientBrightness);
+				General.Interface.AddButton(BuilderPlug.Me.MenusForm.GradientInterpolationMenu);
+			}
+			General.Interface.AddButton(BuilderPlug.Me.MenusForm.CurveLinedefs);
+			General.Interface.AddButton(BuilderPlug.Me.MenusForm.MarqueSelectTouching); //mxd
+			General.Interface.AddButton(BuilderPlug.Me.MenusForm.SyncronizeThingEditButton); //mxd
+			if(General.Map.UDMF) General.Interface.AddButton(BuilderPlug.Me.MenusForm.TextureOffsetLock, ToolbarSection.Geometry); //mxd
+			
+			//mxd. Update the tooltip
+			BuilderPlug.Me.MenusForm.SyncronizeThingEditButton.ToolTipText = "Synchronized Things Editing" + Environment.NewLine + BuilderPlug.Me.MenusForm.SyncronizeThingEditLinedefsItem.ToolTipText;
+
+			// Convert geometry selection to linedefs selection
+			General.Map.Map.ConvertSelection(SelectionType.Linedefs);
+			UpdateSelectionInfo(); //mxd
+		}
+		
+		// Mode disengages
+		public override void OnDisengage()
+		{
+			base.OnDisengage();
+
+			// Remove toolbar buttons
+			General.Interface.RemoveButton(BuilderPlug.Me.MenusForm.CopyProperties);
+			General.Interface.RemoveButton(BuilderPlug.Me.MenusForm.PasteProperties);
+			General.Interface.RemoveButton(BuilderPlug.Me.MenusForm.PastePropertiesOptions); //mxd
+			General.Interface.RemoveButton(BuilderPlug.Me.MenusForm.SeparatorCopyPaste);
+			if(General.Map.UDMF) //mxd
+			{
+				General.Interface.RemoveButton(BuilderPlug.Me.MenusForm.MakeGradientBrightness);
+				General.Interface.RemoveButton(BuilderPlug.Me.MenusForm.GradientInterpolationMenu);
+			}
+			General.Interface.RemoveButton(BuilderPlug.Me.MenusForm.CurveLinedefs);
+			General.Interface.RemoveButton(BuilderPlug.Me.MenusForm.MarqueSelectTouching); //mxd
+			General.Interface.RemoveButton(BuilderPlug.Me.MenusForm.SyncronizeThingEditButton); //mxd
+			if(General.Map.UDMF) General.Interface.RemoveButton(BuilderPlug.Me.MenusForm.TextureOffsetLock); //mxd
+
+			// Going to EditSelectionMode?
+			if(General.Editing.NewMode is EditSelectionMode)
+			{
+				// Not pasting anything?
+				EditSelectionMode editmode = (General.Editing.NewMode as EditSelectionMode);
+				if(!editmode.Pasting)
+				{
+					// No selection made? But we have a highlight!
+					if((General.Map.Map.GetSelectedLinedefs(true).Count == 0) && (highlighted != null))
+					{
+						// Make the highlight the selection
+						highlighted.Selected = true;
+					}
+				}
+			}
+
+			// Hide highlight info and tooltip
+			General.Interface.HideInfo();
+			General.Interface.Display.HideToolTip(); //mxd
+		}
+
+		// This redraws the display
+		public override void OnRedrawDisplay()
+		{
+			renderer.RedrawSurface();
+			List<Line3D> eventlines = new List<Line3D>(); //mxd
+
+			// Render lines
+			if(renderer.StartPlotter(true))
+			{
+				renderer.PlotLinedefSet(General.Map.Map.Linedefs);
+				for(int i = 0; i < Linedef.NUM_ARGS; i++) BuilderPlug.PlotAssociations(renderer, association[i], eventlines);
+				
+				if((highlighted != null) && !highlighted.IsDisposed)
+				{
+					BuilderPlug.PlotReverseAssociations(renderer, highlightasso, eventlines);
+					renderer.PlotLinedef(highlighted, General.Colors.Highlight);
+				}
+				renderer.PlotVerticesSet(General.Map.Map.Vertices);
+				renderer.Finish();
+			}
+
+			// Render things
+			if(renderer.StartThings(true))
+			{
+				renderer.RenderThingSet(General.Map.ThingsFilter.HiddenThings, Presentation.THINGS_HIDDEN_ALPHA);
+				renderer.RenderThingSet(General.Map.ThingsFilter.VisibleThings, Presentation.THINGS_ALPHA);
+				renderer.Finish();
+			}
+
+			// Render selection
+			if(renderer.StartOverlay(true))
+			{
+				if(!selecting) //mxd
+				{ 
+					for(int i = 0; i < Linedef.NUM_ARGS; i++) BuilderPlug.RenderAssociations(renderer, association[i], eventlines);
+					if((highlighted != null) && !highlighted.IsDisposed) BuilderPlug.RenderReverseAssociations(renderer, highlightasso, eventlines); //mxd
+				}
+				else
+				{
+					RenderMultiSelection();
+				}
+
+				//mxd. Render vertex insert preview
+				if(insertpreview.IsFinite())
+				{
+					float dist = Math.Min(Vector2D.Distance(mousemappos, insertpreview), BuilderPlug.Me.HighlightRange);
+					byte alpha = (byte)(255 - (dist / BuilderPlug.Me.HighlightRange) * 128);
+					float vsize = (renderer.VertexSize + 1.0f) / renderer.Scale;
+					renderer.RenderRectangleFilled(new RectangleF(insertpreview.x - vsize, insertpreview.y - vsize, vsize * 2.0f, vsize * 2.0f), General.Colors.InfoLine.WithAlpha(alpha), true);
+				}
+
+				renderer.RenderArrows(eventlines); //mxd
+
+				//mxd. Render comments
+				if(General.Map.UDMF && General.Settings.RenderComments) foreach(Linedef l in General.Map.Map.Linedefs) RenderComment(l);
+
+				renderer.Finish();
+			}
+
+			renderer.Present();
+		}
+
+		// Selection
+		protected override void OnSelectBegin()
+		{
+			// Item highlighted?
+			if((highlighted != null) && !highlighted.IsDisposed)
+			{
+				// Update display
+				if(renderer.StartPlotter(false))
+				{
+					// Redraw highlight to show selection
+					renderer.PlotLinedef(highlighted, renderer.DetermineLinedefColor(highlighted));
+					renderer.PlotVertex(highlighted.Start, renderer.DetermineVertexColor(highlighted.Start));
+					renderer.PlotVertex(highlighted.End, renderer.DetermineVertexColor(highlighted.End));
+					renderer.Finish();
+					renderer.Present();
+				}
+			}
+
+			base.OnSelectBegin();
+		}
+
+		// End selection
+		protected override void OnSelectEnd()
+		{
+			// Not stopping from multiselection?
+			if(!selecting)
+			{
+				// Item highlighted?
+				if((highlighted != null) && !highlighted.IsDisposed)
+				{
+					//mxd. Flip selection
+					highlighted.Selected = !highlighted.Selected;
+					
+					// Update display
+					if(renderer.StartPlotter(false))
+					{
+						// Render highlighted item
+						renderer.PlotLinedef(highlighted, General.Colors.Highlight);
+						renderer.PlotVertex(highlighted.Start, renderer.DetermineVertexColor(highlighted.Start));
+						renderer.PlotVertex(highlighted.End, renderer.DetermineVertexColor(highlighted.End));
+						renderer.Finish();
+						renderer.Present();
+					}
+				
+				} 
+				else if(BuilderPlug.Me.AutoClearSelection && General.Map.Map.SelectedLinedefsCount > 0) //mxd
+				{
+					General.Map.Map.ClearSelectedLinedefs();
+					General.Interface.RedrawDisplay();
+				}
+
+				//mxd
+				UpdateSelectionInfo();
+			}
+
+			base.OnSelectEnd();
+		}
+		
+		// Start editing
+		protected override void OnEditBegin()
+		{
+			// Item highlighted?
+			if((highlighted != null) && !highlighted.IsDisposed)
+			{
+				// Edit pressed in this mode
+				editpressed = true;
+
+				// Highlighted item not selected?
+				if(!highlighted.Selected && (BuilderPlug.Me.AutoClearSelection || (General.Map.Map.SelectedLinedefsCount == 0)))
+				{
+					// Make this the only selection
+					General.Map.Map.ClearSelectedLinedefs();
+					highlighted.Selected = true;
+					General.Interface.RedrawDisplay();
+				}
+
+				// Update display
+				if(renderer.StartPlotter(false))
+				{
+					// Redraw highlight to show selection
+					renderer.PlotLinedef(highlighted, renderer.DetermineLinedefColor(highlighted));
+					renderer.PlotVertex(highlighted.Start, renderer.DetermineVertexColor(highlighted.Start));
+					renderer.PlotVertex(highlighted.End, renderer.DetermineVertexColor(highlighted.End));
+					renderer.Finish();
+					renderer.Present();
+				}
+			}
+			else if(!selecting && BuilderPlug.Me.AutoDrawOnEdit) //mxd. We don't want to draw while multiselecting
+			{
+				// Start drawing mode
+				DrawGeometryMode drawmode = new DrawGeometryMode();
+				bool snaptogrid = General.Interface.ShiftState ^ General.Interface.SnapToGrid;
+				bool snaptonearest = General.Interface.CtrlState ^ General.Interface.AutoMerge;
+				DrawnVertex v = DrawGeometryMode.GetCurrentPosition(mousemappos, snaptonearest, snaptogrid, false, renderer, new List<DrawnVertex>());
+
+				if(drawmode.DrawPointAt(v))
+					General.Editing.ChangeMode(drawmode);
+				else
+					General.Interface.DisplayStatus(StatusType.Warning, "Failed to draw point: outside of map boundaries.");
+			}
+			
+			base.OnEditBegin();
+		}
+		
+		// Done editing
+		protected override void OnEditEnd()
+		{
+			// Edit pressed in this mode?
+			if(editpressed)
+			{
+				// Anything selected?
+				ICollection<Linedef> selected = General.Map.Map.GetSelectedLinedefs(true);
+				if(selected.Count > 0)
+				{
+					if(General.Interface.IsActiveWindow)
+					{
+						// Show line edit dialog
+						DialogResult result = General.Interface.ShowEditLinedefs(selected);
+						General.Map.Map.Update();
+						
+						// When a single line was selected, deselect it now
+						if(selected.Count == 1) 
+						{
+							General.Map.Map.ClearSelectedLinedefs();
+						} 
+						else if(result == DialogResult.Cancel) //mxd. Restore selection...
+						{ 
+							foreach(Linedef l in selected) l.Selected = true;
+						}
+
+						// Update entire display
+						General.Map.Renderer2D.UpdateExtraFloorFlag(); //mxd
+						General.Interface.RedrawDisplay();
+					}
+				}
+
+				UpdateSelectionInfo(); //mxd
+			}
+
+			editpressed = false;
+			base.OnEditEnd();
+		}
+		
+		// Mouse moves
+		public override void OnMouseMove(MouseEventArgs e)
+		{
+			base.OnMouseMove(e);
+			if(panning) return; //mxd. Skip all this jazz while panning
+
+			//mxd
+			if(selectpressed && !editpressed && !selecting) 
+			{
+				// Check if moved enough pixels for multiselect
+				Vector2D delta = mousedownpos - mousepos;
+				if((Math.Abs(delta.x) > MULTISELECT_START_MOVE_PIXELS) ||
+				   (Math.Abs(delta.y) > MULTISELECT_START_MOVE_PIXELS)) 
+				{
+					// Start multiselecting
+					StartMultiSelection();
+				}
+			}
+			else if(paintselectpressed && !editpressed && !selecting)  //mxd. Drag-select
+			{
+				// Find the nearest thing within highlight range
+				Linedef l = General.Map.Map.NearestLinedefRange(mousemappos, BuilderPlug.Me.HighlightRange / renderer.Scale);
+
+				if(l != null) 
+				{
+					if(l != highlighted) 
+					{
+						//toggle selected state
+						if(General.Interface.ShiftState ^ BuilderPlug.Me.AdditiveSelect)
+							l.Selected = true;
+						else if(General.Interface.CtrlState)
+							l.Selected = false;
+						else
+							l.Selected = !l.Selected;
+						highlighted = l;
+
+						UpdateSelectionInfo(); //mxd
+
+						// Update entire display
+						General.Interface.RedrawDisplay();
+					}
+				} 
+				else if(highlighted != null) 
+				{
+					Highlight(null);
+
+					// Update entire display
+					General.Interface.RedrawDisplay();
+				}
+			}
+			else if(e.Button == MouseButtons.None) // Not holding any buttons?
+			{
+				// Find the nearest linedef within highlight range
+				Linedef l = General.Map.Map.NearestLinedefRange(mousemappos, BuilderPlug.Me.StitchRange / renderer.Scale);
+
+				//mxd. Render insert vertex preview
+				if(l != null) 
+				{
+					bool snaptogrid = General.Interface.ShiftState ^ General.Interface.SnapToGrid;
+					bool snaptonearest = General.Interface.CtrlState ^ General.Interface.AutoMerge;
+					Vector2D v = DrawGeometryMode.GetCurrentPosition(mousemappos, snaptonearest, snaptogrid, false, renderer, new List<DrawnVertex>()).pos;
+
+					if(v != insertpreview)
+					{
+						insertpreview = v;
+						General.Interface.RedrawDisplay();
+					}
+				} 
+				else if(insertpreview.IsFinite()) 
+				{
+					insertpreview.x = float.NaN;
+					General.Interface.RedrawDisplay();
+				}
+
+				// Highlight if not the same
+				if(l != highlighted) Highlight(l);
+
+				//mxd. Show tooltip?
+				if(General.Map.UDMF && General.Settings.RenderComments && mouselastpos != mousepos && highlighted != null && !highlighted.IsDisposed && highlighted.Fields.ContainsKey("comment"))
+				{
+					string comment = highlighted.Fields.GetValue("comment", string.Empty);
+					if(comment.Length > 2)
+					{
+						string type = comment.Substring(0, 3);
+						int index = Array.IndexOf(CommentType.Types, type);
+						if(index > 0) comment = comment.TrimStart(type.ToCharArray());
+					}
+					General.Interface.Display.ShowToolTip("Comment:", comment, (int)(mousepos.x + 32 * MainForm.DPIScaler.Width), (int)(mousepos.y + 8 * MainForm.DPIScaler.Height));
+				}
+			} 
+		}
+
+		// Mouse leaves
+		public override void OnMouseLeave(EventArgs e)
+		{
+			base.OnMouseLeave(e);
+
+			// Highlight nothing
+			Highlight(null);
+		}
+
+		//mxd
+		protected override void BeginViewPan() 
+		{
+			// We don't want vertex preview while panning
+			insertpreview.x = float.NaN;
+			base.BeginViewPan();
+		}
+
+		//mxd
+		protected override void OnPaintSelectBegin() 
+		{
+			// Highlight nothing
+			Highlight(null);
+
+			base.OnPaintSelectBegin();
+		}
+
+		// Mouse wants to drag
+		protected override void OnDragStart(MouseEventArgs e)
+		{
+			base.OnDragStart(e);
+
+			// Edit button used?
+			if(General.Actions.CheckActionActive(null, "classicedit"))
+			{
+				// Anything highlighted?
+				if((highlighted != null) && !highlighted.IsDisposed)
+				{
+					// Highlighted item not selected?
+					if(!highlighted.Selected)
+					{
+						// Select only this linedef for dragging
+						General.Map.Map.ClearSelectedLinedefs();
+						highlighted.Selected = true;
+					}
+
+					// Start dragging the selection
+					if(!BuilderPlug.Me.DontMoveGeometryOutsideMapBoundary || CanDrag()) //mxd
+						General.Editing.ChangeMode(new DragLinedefsMode(mousedownmappos));
+				}
+			}
+		}
+
+		//mxd. Check if any selected linedef is outside of map boundary
+		private static bool CanDrag() 
+		{
+			ICollection<Linedef> selectedlines = General.Map.Map.GetSelectedLinedefs(true);
+			int unaffectedCount = 0;
+
+			foreach(Linedef l in selectedlines) 
+			{
+				// Make sure the linedef is inside the map boundary
+				if(l.Start.Position.x < General.Map.Config.LeftBoundary || l.Start.Position.x > General.Map.Config.RightBoundary
+					|| l.Start.Position.y > General.Map.Config.TopBoundary || l.Start.Position.y < General.Map.Config.BottomBoundary
+					|| l.End.Position.x < General.Map.Config.LeftBoundary || l.End.Position.x > General.Map.Config.RightBoundary
+					|| l.End.Position.y > General.Map.Config.TopBoundary || l.End.Position.y < General.Map.Config.BottomBoundary) 
+				{
+
+					l.Selected = false;
+					unaffectedCount++;
+				}
+			}
+
+			if(unaffectedCount == selectedlines.Count) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "Unable to drag selection: " + (selectedlines.Count == 1 ? "selected linedef is" : "all of selected linedefs are") + " outside of map boundary!");
+				General.Interface.RedrawDisplay();
+				return false;
+			}
+
+			if(unaffectedCount > 0)
+				General.Interface.DisplayStatus(StatusType.Warning, unaffectedCount + " of selected linedefs " + (unaffectedCount == 1 ? "is" : "are") + " outside of map boundary!");
+
+			return true;
+		}
+
+		// This is called wheh selection ends
+		protected override void OnEndMultiSelection()
+		{
+			bool selectionvolume = ((Math.Abs(selectionrect.Width) > 0.1f) && (Math.Abs(selectionrect.Height) > 0.1f));
+			   
+			if(selectionvolume)
+			{
+				List<Line2D> selectionOutline = new List<Line2D> 
+				{
+					new Line2D(selectionrect.Left, selectionrect.Top, selectionrect.Right, selectionrect.Top),
+					new Line2D(selectionrect.Right, selectionrect.Top, selectionrect.Right, selectionrect.Bottom),
+					new Line2D(selectionrect.Left, selectionrect.Bottom, selectionrect.Right, selectionrect.Bottom),
+					new Line2D(selectionrect.Left, selectionrect.Bottom, selectionrect.Left, selectionrect.Top)
+				};
+				
+				//mxd
+				bool selectthings = (marqueSelectionIncludesThings ^ BuilderPlug.Me.SyncronizeThingEdit);
+				switch(marqueSelectionMode) 
+				{
+					case MarqueSelectionMode.SELECT:
+						foreach(Linedef l in General.Map.Map.Linedefs)
+							l.Selected = IsInSelectionRect(l, selectionOutline);
+						if(selectthings)
+						{
+							foreach(Thing t in General.Map.ThingsFilter.VisibleThings)
+								t.Selected = selectionrect.Contains(t.Position.x, t.Position.y);
+						}
+						break;
+
+					case MarqueSelectionMode.ADD:
+						foreach(Linedef l in General.Map.Map.Linedefs)
+							l.Selected |= IsInSelectionRect(l, selectionOutline);
+						if(selectthings)
+						{
+							foreach(Thing t in General.Map.ThingsFilter.VisibleThings)
+								t.Selected |= selectionrect.Contains(t.Position.x, t.Position.y);
+						}
+						break;
+
+					case MarqueSelectionMode.SUBTRACT:
+						foreach(Linedef l in General.Map.Map.Linedefs)
+							if(IsInSelectionRect(l, selectionOutline)) l.Selected = false;
+						if(selectthings)
+						{
+							foreach(Thing t in General.Map.ThingsFilter.VisibleThings)
+								if(selectionrect.Contains(t.Position.x, t.Position.y)) t.Selected = false;
+						}
+						break;
+
+					default:
+						foreach(Linedef l in General.Map.Map.Linedefs)
+							if(!IsInSelectionRect(l, selectionOutline)) l.Selected = false;
+						if(selectthings)
+						{
+							foreach(Thing t in General.Map.ThingsFilter.VisibleThings)
+								if(!selectionrect.Contains(t.Position.x, t.Position.y)) t.Selected = false;
+						}
+						break;
+				}
+
+				//mxd
+				UpdateSelectionInfo();
+			}
+			
+			base.OnEndMultiSelection();
+
+			// Clear overlay
+			if(renderer.StartOverlay(true)) renderer.Finish();
+
+			// Redraw
+			General.Interface.RedrawDisplay();
+		}
+
+		// This is called when the selection is updated
+		protected override void OnUpdateMultiSelection()
+		{
+			base.OnUpdateMultiSelection();
+
+			// Render selection
+			if(renderer.StartOverlay(true))
+			{
+				RenderMultiSelection();
+				renderer.Finish();
+				renderer.Present();
+			}
+		}
+
+		// When copying
+		public override bool OnCopyBegin()
+		{
+			// No selection made? But we have a highlight!
+			if((General.Map.Map.GetSelectedLinedefs(true).Count == 0) && (highlighted != null))
+			{
+				// Make the highlight the selection
+				highlighted.Selected = true;
+
+				//mxd. Actually, we want it marked, not selected
+				bool result = base.OnCopyBegin();
+				highlighted.Selected = false;
+				return result;
+			}
+
+			return base.OnCopyBegin();
+		}
+
+		//mxd
+		private void RenderComment(Linedef l)
+		{
+			if(l.Fields.ContainsKey("comment"))
+			{
+				int iconindex = 0;
+				string comment = l.Fields.GetValue("comment", string.Empty);
+				if(comment.Length > 2)
+				{
+					string type = comment.Substring(0, 3);
+					int index = Array.IndexOf(CommentType.Types, type);
+					if(index != -1) iconindex = index;
+				}
+
+				Vector2D center = l.GetCenterPoint();
+				RectangleF rect = new RectangleF(center.x - 8 / renderer.Scale, center.y + 18 / renderer.Scale, 16 / renderer.Scale, -16 / renderer.Scale);
+				PixelColor c = (l == highlighted ? General.Colors.Highlight : (l.Selected ? General.Colors.Selection : PixelColor.FromColor(Color.White)));
+				renderer.RenderRectangleFilled(rect, c, true, General.Map.Data.CommentTextures[iconindex]);
+			}
+		}
+
+		#endregion
+
+		#region ================== Actions
+
+		// This copies the properties
+		[BeginAction("classiccopyproperties")]
+		public void CopyProperties()
+		{
+			// Determine source linedefs
+			ICollection<Linedef> sel = null;
+			if(General.Map.Map.SelectedLinedefsCount > 0) sel = General.Map.Map.GetSelectedLinedefs(true);
+			else if(highlighted != null) sel = new List<Linedef> { highlighted };
+			
+			if(sel != null)
+			{
+				// Copy properties from first source linedef
+				BuilderPlug.Me.CopiedLinedefProps = new LinedefProperties(General.GetByIndex(sel, 0));
+				General.Interface.DisplayStatus(StatusType.Action, "Copied linedef properties.");
+			}
+			else
+			{
+				//mxd
+				General.Interface.DisplayStatus(StatusType.Warning, "This action requires highlight or selection!");
+			}
+		}
+
+		// This pastes the properties
+		[BeginAction("classicpasteproperties")]
+		public void PasteProperties()
+		{
+			if(BuilderPlug.Me.CopiedLinedefProps != null)
+			{
+				// Determine target linedefs
+				ICollection<Linedef> sel = null;
+				if(General.Map.Map.SelectedLinedefsCount > 0) sel = General.Map.Map.GetSelectedLinedefs(true);
+				else if(highlighted != null) sel = new List<Linedef> { highlighted };
+				
+				if(sel != null)
+				{
+					// Apply properties to selection
+					string rest = (sel.Count == 1 ? "a single linedef" : sel.Count + " linedefs"); //mxd
+					General.Map.UndoRedo.CreateUndo("Paste properties to " + rest);
+					foreach(Linedef l in sel)
+					{
+						BuilderPlug.Me.CopiedLinedefProps.Apply(l, false);
+						l.UpdateCache();
+					}
+					General.Interface.DisplayStatus(StatusType.Action, "Pasted properties to " + rest + ".");
+					
+					// Update and redraw
+					General.Map.IsChanged = true;
+					General.Interface.RefreshInfo();
+					General.Map.Renderer2D.UpdateExtraFloorFlag(); //mxd
+					General.Interface.RedrawDisplay();
+				}
+				else
+				{
+					//mxd
+					General.Interface.DisplayStatus(StatusType.Warning, "This action requires highlight or selection!");
+				}
+			}
+			else
+			{
+				//mxd
+				General.Interface.DisplayStatus(StatusType.Warning, "Copy linedef properties first!");
+			}
+		}
+
+		//mxd. This pastes the properties with options
+		[BeginAction("classicpastepropertieswithoptions")]
+		public void PastePropertiesWithOptions()
+		{
+			if(BuilderPlug.Me.CopiedLinedefProps != null)
+			{
+				// Determine target linedefs
+				ICollection<Linedef> sel = null;
+				if(General.Map.Map.SelectedLinedefsCount > 0) sel = General.Map.Map.GetSelectedLinedefs(true);
+				else if(highlighted != null) sel = new List<Linedef> { highlighted };
+
+				if(sel != null)
+				{
+					PastePropertiesOptionsForm form = new PastePropertiesOptionsForm();
+					if(form.Setup(MapElementType.LINEDEF) && form.ShowDialog(General.Interface) == DialogResult.OK)
+					{
+						// Apply properties to selection
+						string rest = (sel.Count == 1 ? "a single linedef" : sel.Count + " linedefs");
+						General.Map.UndoRedo.CreateUndo("Paste properties with options to " + rest);
+						foreach(Linedef l in sel)
+						{
+							BuilderPlug.Me.CopiedLinedefProps.Apply(l, true);
+							l.UpdateCache();
+						}
+						General.Interface.DisplayStatus(StatusType.Action, "Pasted properties with options to " + rest + ".");
+
+						// Update and redraw
+						General.Map.IsChanged = true;
+						General.Interface.RefreshInfo();
+						General.Map.Renderer2D.UpdateExtraFloorFlag(); //mxd
+						General.Interface.RedrawDisplay();
+					}
+				}
+				else
+				{
+					General.Interface.DisplayStatus(StatusType.Warning, "This action requires highlight or selection!");
+				}
+			}
+			else
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "Copy linedef properties first!");
+			}
+		}
+
+		// This keeps only the single-sided lines selected
+		[BeginAction("selectsinglesided")]
+		public void SelectSingleSided()
+		{
+			int counter = 0;
+			ICollection<Linedef> selected = General.Map.Map.GetSelectedLinedefs(true);
+			foreach(Linedef ld in selected)
+			{
+				if((ld.Front != null) && (ld.Back != null))
+					ld.Selected = false;
+				else
+					counter++;
+			}
+			
+			General.Interface.DisplayStatus(StatusType.Action, "Selected only single-sided linedefs (" + counter + ")");
+			General.Interface.RedrawDisplay();
+		}
+
+		// This keeps only the double-sided lines selected
+		[BeginAction("selectdoublesided")]
+		public void SelectDoubleSided()
+		{
+			int counter = 0;
+			ICollection<Linedef> selected = General.Map.Map.GetSelectedLinedefs(true);
+			foreach(Linedef ld in selected)
+			{
+				if((ld.Front == null) || (ld.Back == null))
+					ld.Selected = false;
+				else
+					counter++;
+			}
+
+			General.Interface.DisplayStatus(StatusType.Action, "Selected only double-sided linedefs (" + counter + ")");
+			General.Interface.RedrawDisplay();
+		}
+
+		// This clears the selection
+		[BeginAction("clearselection", BaseAction = true)]
+		public void ClearSelection()
+		{
+			// Clear selection
+			General.Map.Map.ClearAllSelected();
+
+			//mxd. Clear selection info
+			General.Interface.DisplayStatus(StatusType.Selection, string.Empty);
+
+			// Redraw
+			General.Interface.RedrawDisplay();
+		}
+		
+		// This creates a new vertex at the mouse position
+		[BeginAction("insertitem", BaseAction = true)]
+		public void InsertVertexAction()
+		{
+			// Start drawing mode
+			DrawGeometryMode drawmode = new DrawGeometryMode();
+			if(mouseinside)
+			{
+				bool snaptogrid = General.Interface.ShiftState ^ General.Interface.SnapToGrid;
+				bool snaptonearest = General.Interface.CtrlState ^ General.Interface.AutoMerge;
+				DrawnVertex v = DrawGeometryMode.GetCurrentPosition(mousemappos, snaptonearest, snaptogrid, false, renderer, new List<DrawnVertex>());
+				drawmode.DrawPointAt(v);
+			}
+			General.Editing.ChangeMode(drawmode);
+		}
+
+		[BeginAction("deleteitem", BaseAction = true)]
+		public void DeleteItem() 
+		{
+			// Make list of selected linedefs
+			ICollection<Linedef> selected = General.Map.Map.GetSelectedLinedefs(true);
+			if((selected.Count == 0) && (highlighted != null) && !highlighted.IsDisposed) selected.Add(highlighted);
+			if(selected.Count == 0) return;
+
+			// Make undo
+			if(selected.Count > 1) 
+			{
+				General.Map.UndoRedo.CreateUndo("Delete " + selected.Count + " linedefs");
+				General.Interface.DisplayStatus(StatusType.Action, "Deleted " + selected.Count + " linedefs.");
+			} 
+			else 
+			{
+				General.Map.UndoRedo.CreateUndo("Delete linedef");
+				General.Interface.DisplayStatus(StatusType.Action, "Deleted a linedef.");
+			}
+
+			// Dispose selected linedefs
+			foreach(Linedef ld in selected) ld.Dispose();
+
+			// Update cache values
+			General.Map.IsChanged = true;
+			General.Map.Map.Update();
+
+			// Invoke a new mousemove so that the highlighted item updates
+			MouseEventArgs e = new MouseEventArgs(MouseButtons.None, 0, (int)mousepos.x, (int)mousepos.y, 0);
+			OnMouseMove(e);
+
+			// Redraw screen
+			UpdateSelectionInfo(); //mxd
+			General.Map.Renderer2D.UpdateExtraFloorFlag(); //mxd
+			General.Interface.RedrawDisplay();
+		}
+
+		[BeginAction("dissolveitem", BaseAction = true)] //mxd
+		public void DissolveItem()
+		{
+			// Make list of selected linedefs
+			ICollection<Linedef> selected = General.Map.Map.GetSelectedLinedefs(true);
+			if((selected.Count == 0) && (highlighted != null) && !highlighted.IsDisposed) selected.Add(highlighted);
+
+			// Anything to do?
+			if(selected.Count > 0)
+			{
+				// Make undo
+				if(selected.Count > 1)
+				{
+					General.Map.UndoRedo.CreateUndo("Dissolve " + selected.Count + " linedefs");
+					General.Interface.DisplayStatus(StatusType.Action, "Dissolved " + selected.Count + " linedefs.");
+				}
+				else
+				{
+					General.Map.UndoRedo.CreateUndo("Dissolve linedef");
+					General.Interface.DisplayStatus(StatusType.Action, "Dissolved a linedef.");
+				}
+
+				//mxd. Find sectors, which will become invalid after linedefs removal.
+				Dictionary<Sector, Vector2D> toMerge = new Dictionary<Sector, Vector2D>();
+
+				foreach(Linedef l in selected) 
+				{
+					if(l.Front != null && l.Front.Sector.Sidedefs.Count < 4 && !toMerge.ContainsKey(l.Front.Sector))
+						toMerge.Add(l.Front.Sector, new Vector2D(l.Front.Sector.BBox.Location.X + l.Front.Sector.BBox.Width / 2, l.Front.Sector.BBox.Location.Y + l.Front.Sector.BBox.Height / 2));
+
+					if(l.Back != null && l.Back.Sector.Sidedefs.Count < 4 && !toMerge.ContainsKey(l.Back.Sector))
+						toMerge.Add(l.Back.Sector, new Vector2D(l.Back.Sector.BBox.Location.X + l.Back.Sector.BBox.Width / 2, l.Back.Sector.BBox.Location.Y + l.Back.Sector.BBox.Height / 2));
+				}
+
+				General.Map.Map.BeginAddRemove(); //mxd
+				
+				// Dispose selected linedefs
+				foreach(Linedef ld in selected) 
+				{
+					//mxd. If there are different sectors on both sides, join them
+					if(ld.Front != null && ld.Front.Sector != null && ld.Back != null 
+						&& ld.Back.Sector != null && ld.Front.Sector.Index != ld.Back.Sector.Index) 
+					{
+						if(ld.Front.Sector.BBox.Width * ld.Front.Sector.BBox.Height > ld.Back.Sector.BBox.Width * ld.Back.Sector.BBox.Height)
+							ld.Back.Sector.Join(ld.Front.Sector);
+						else
+							ld.Front.Sector.Join(ld.Back.Sector);
+					}
+
+					ld.Dispose();
+				}
+
+				//mxd
+				General.Map.Map.EndAddRemove();
+				Tools.MergeInvalidSectors(toMerge);
+				
+				// Update cache values
+				General.Map.IsChanged = true;
+				General.Map.Map.Update();
+
+				// Invoke a new mousemove so that the highlighted item updates
+				MouseEventArgs e = new MouseEventArgs(MouseButtons.None, 0, (int)mousepos.x, (int)mousepos.y, 0);
+				OnMouseMove(e);
+				
+				// Redraw screen
+				UpdateSelectionInfo(); //mxd
+				General.Map.Renderer2D.UpdateExtraFloorFlag(); //mxd
+				General.Interface.RedrawDisplay();
+			}
+		}
+		
+		[BeginAction("splitlinedefs")]
+		public void SplitLinedefs()
+		{
+			// Make list of selected linedefs
+			ICollection<Linedef> selected = General.Map.Map.GetSelectedLinedefs(true);
+			if((selected.Count == 0) && (highlighted != null) && !highlighted.IsDisposed) selected.Add(highlighted);
+
+			// Anything to do?
+			if(selected.Count > 0)
+			{
+				// Make undo
+				if(selected.Count > 1)
+				{
+					General.Map.UndoRedo.CreateUndo("Split " + selected.Count + " linedefs");
+					General.Interface.DisplayStatus(StatusType.Action, "Split " + selected.Count + " linedefs.");
+				}
+				else
+				{
+					General.Map.UndoRedo.CreateUndo("Split linedef");
+					General.Interface.DisplayStatus(StatusType.Action, "Split a linedef.");
+				}
+				
+				// Go for all linedefs to split
+				foreach(Linedef ld in selected)
+				{
+					Vertex splitvertex;
+
+					// Linedef highlighted?
+					if(ld == highlighted)
+					{
+						// Split at nearest position on the line
+						Vector2D nearestpos = ld.NearestOnLine(mousemappos);
+						splitvertex = General.Map.Map.CreateVertex(nearestpos);
+					}
+					else
+					{
+						// Split in middle of line
+						splitvertex = General.Map.Map.CreateVertex(ld.GetCenterPoint());
+					}
+
+					if(splitvertex == null)
+					{
+						General.Map.UndoRedo.WithdrawUndo();
+						break;
+					}
+					
+					// Snap to map format accuracy
+					splitvertex.SnapToAccuracy();
+
+					// Split the line
+					Linedef sld = ld.Split(splitvertex);
+					if(sld == null)
+					{
+						General.Map.UndoRedo.WithdrawUndo();
+						break;
+					}
+					//BuilderPlug.Me.AdjustSplitCoordinates(ld, sld);
+				}
+
+				// Update cache values
+				General.Map.IsChanged = true;
+				General.Map.Map.Update();
+				
+				// Redraw screen
+				General.Interface.RedrawDisplay();
+			}
+		}
+		
+		[BeginAction("curvelinesmode")]
+		public void CurveLinedefs()
+		{
+			// No selected lines?
+			ICollection<Linedef> selected = General.Map.Map.GetSelectedLinedefs(true);
+			if(selected.Count == 0)
+			{
+				// Anything highlighted?
+				if(highlighted != null)
+				{
+					// Select the highlighted item
+					highlighted.Selected = true;
+					selected.Add(highlighted);
+				}
+			}
+
+			// Any selected lines?
+			if(selected.Count > 0)
+			{
+				// Go into curve linedefs mode
+				General.Editing.ChangeMode(new CurveLinedefsMode(new LinedefsMode()));
+			}
+		}
+		
+		[BeginAction("fliplinedefs")]
+		public void FlipLinedefs()
+		{
+			// No selected lines?
+			ICollection<Linedef> selected = General.Map.Map.GetSelectedLinedefs(true);
+			if(selected.Count == 0)
+			{
+				// Anything highlighted?
+				if(highlighted != null)
+				{
+					// Select the highlighted item
+					highlighted.Selected = true;
+					selected.Add(highlighted);
+				}
+			}
+
+			// Any selected lines?
+			if(selected.Count > 0)
+			{
+				// Make undo
+				if(selected.Count > 1)
+				{
+					General.Map.UndoRedo.CreateUndo("Flip " + selected.Count + " linedefs");
+					General.Interface.DisplayStatus(StatusType.Action, "Flipped " + selected.Count + " linedefs.");
+				}
+				else
+				{
+					General.Map.UndoRedo.CreateUndo("Flip linedef");
+					General.Interface.DisplayStatus(StatusType.Action, "Flipped a linedef.");
+				}
+
+				//mxd. Do it sector-wise
+				Dictionary<Sector, int> sectors = new Dictionary<Sector, int>();
+
+				foreach(Linedef l in selected) 
+				{
+					if(l.Front != null && l.Front.Sector != null)
+					{
+						if(!sectors.ContainsKey(l.Front.Sector)) sectors.Add(l.Front.Sector, 0);
+						sectors[l.Front.Sector]++;
+					}
+						
+					if(l.Back != null && l.Back.Sector != null)
+					{
+						if(!sectors.ContainsKey(l.Back.Sector)) sectors.Add(l.Back.Sector, 0);
+						sectors[l.Back.Sector]++;
+					}
+				}
+
+				//mxd. Sort the collection so sectors with the most selected linedefs go first
+				List<KeyValuePair<Sector, int>> sortedlist = sectors.ToList();
+				sortedlist.Sort((firstPair, nextPair) => firstPair.Value.CompareTo(nextPair.Value));
+				sortedlist.Reverse();
+
+				//mxd. Gather our ordered sectors
+				List<Sector> sectorslist = new List<Sector>(sortedlist.Count());
+				sectorslist.AddRange(sortedlist.Select(pair => pair.Key));
+
+				//mxd. Flip the lines
+				Tools.FlipSectorLinedefs(sectorslist, true);
+
+				// Remove selection if only one linedef was selected
+				if(selected.Count == 1)
+				{
+					foreach(Linedef ld in selected) ld.Selected = false;
+					selected.Clear();
+				}
+
+				// Redraw
+				General.Map.Map.Update();
+				General.Map.IsChanged = true;
+				General.Interface.RefreshInfo();
+				General.Interface.RedrawDisplay();
+			}
+		}
+
+		[BeginAction("flipsidedefs")]
+		public void FlipSidedefs()
+		{
+			// No selected lines?
+			ICollection<Linedef> selected = General.Map.Map.GetSelectedLinedefs(true);
+			if(selected.Count == 0)
+			{
+				// Anything highlighted?
+				if(highlighted != null)
+				{
+					selected.Add(highlighted);
+				}
+			}
+
+			//mxd. Do this only with double-sided linedefs
+			List<Linedef> validlines = new List<Linedef>();
+			foreach(Linedef l in selected) 
+			{
+				if(l.Front != null && l.Back != null) validlines.Add(l);
+			}
+
+			// Any selected lines?
+			if(validlines.Count > 0) 
+			{
+				// Make undo
+				if(validlines.Count > 1) 
+				{
+					General.Map.UndoRedo.CreateUndo("Flip " + validlines.Count + " sidedefs");
+					General.Interface.DisplayStatus(StatusType.Action, "Flipped " + validlines.Count + " sidedefs.");
+				}
+				else
+				{
+					General.Map.UndoRedo.CreateUndo("Flip sidedef");
+					General.Interface.DisplayStatus(StatusType.Action, "Flipped a sidedef.");
+				}
+
+				// Flip sidedefs in all selected linedefs
+				foreach(Linedef l in validlines) 
+				{
+					l.FlipSidedefs();
+					l.Front.Sector.UpdateNeeded = true;
+					l.Back.Sector.UpdateNeeded = true;
+				}
+
+				// Redraw
+				General.Map.Map.Update();
+				General.Map.IsChanged = true;
+				General.Interface.RefreshInfo();
+				General.Interface.RedrawDisplay();
+			} 
+			else 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "No sidedefs to flip (only 2-sided linedefs can be flipped)!");
+			}
+		}
+
+		//mxd. Make gradient brightness
+		[BeginAction("gradientbrightness")]
+		public void MakeGradientBrightness() 
+		{
+			if(!General.Map.UDMF) return;
+
+			// Need at least 3 selected linedefs
+			// The first and last are not modified
+			ICollection<Linedef> orderedselection = General.Map.Map.GetSelectedLinedefs(true);
+			if(orderedselection.Count > 2) 
+			{
+				// Gather values
+				Linedef start = General.GetByIndex(orderedselection, 0);
+				Linedef end = General.GetByIndex(orderedselection, orderedselection.Count - 1);
+
+				float startbrightness = GetLinedefBrighness(start);
+				float endbrightness = GetLinedefBrighness(end);
+
+				if(float.IsNaN(startbrightness))
+				{
+					General.Interface.DisplayStatus(StatusType.Warning, "Start linedef doesn't have visible parts!");
+					return;
+				}
+
+				if(float.IsNaN(endbrightness)) 
+				{
+					General.Interface.DisplayStatus(StatusType.Warning, "End linedef doesn't have visible parts!");
+					return;
+				}
+
+				//Make undo
+				General.Interface.DisplayStatus(StatusType.Action, "Created gradient brightness over selected linedefs.");
+				General.Map.UndoRedo.CreateUndo("Linedefs gradient brightness");
+
+				// Apply changes
+				InterpolationTools.Mode interpolationmode = (InterpolationTools.Mode)BuilderPlug.Me.MenusForm.GradientInterpolationMenu.SelectedIndex;
+				int index = 0;
+
+				// Go for all lines in between first and last
+				foreach(Linedef l in orderedselection) 
+				{
+					float u = index / (float)(orderedselection.Count - 1);
+					int b = InterpolationTools.Interpolate(startbrightness, endbrightness, u, interpolationmode);
+					if(SidedefHasVisibleParts(l.Front)) ApplySidedefBrighness(l.Front, b);
+					if(SidedefHasVisibleParts(l.Back)) ApplySidedefBrighness(l.Back, b);
+					index++;
+				}
+
+				// Update
+				General.Map.Map.Update();
+				General.Interface.RedrawDisplay();
+				General.Interface.RefreshInfo();
+				General.Map.IsChanged = true;
+			} 
+			else 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "Select at least 3 linedefs first!");
+			}
+		}
+
+		//mxd. gradientbrightness utility
+		private static bool SidedefHasVisibleParts(Sidedef side) 
+		{
+			if(side == null || side.Sector == null) return false;
+			return side.HighRequired() || side.LowRequired() || (side.MiddleRequired() || (side.Other != null && side.MiddleTexture != "-"));
+		}
+
+		//mxd. gradientbrightness utility
+		private static float GetLinedefBrighness(Linedef line) 
+		{
+			float frontbrightness = (SidedefHasVisibleParts(line.Front) ? GetSidedefBrighness(line.Front) : float.NaN);
+			float backbrightness = (SidedefHasVisibleParts(line.Back) ? GetSidedefBrighness(line.Back) : float.NaN);
+
+			if(float.IsNaN(frontbrightness) && float.IsNaN(backbrightness)) return float.NaN;
+			if(float.IsNaN(frontbrightness)) return backbrightness;
+			if(float.IsNaN(backbrightness)) return frontbrightness;
+			return (frontbrightness + backbrightness) / 2;
+		}
+
+		//mxd. gradientbrightness utility
+		private static float GetSidedefBrighness(Sidedef side) 
+		{
+			if(side.Fields.GetValue("lightabsolute", false)) return side.Fields.GetValue("light", 0);
+			return Math.Min(255, Math.Max(0, (float)side.Sector.Brightness + side.Fields.GetValue("light", 0)));
+		}
+
+		//mxd. gradientbrightness utility
+		private static void ApplySidedefBrighness(Sidedef side, int brightness) 
+		{
+			side.Fields.BeforeFieldsChange();
+
+			//absolute flag set?
+			if(side.Fields.GetValue("lightabsolute", false))
+				side.Fields["light"].Value = brightness;
+			else
+				UniFields.SetInteger(side.Fields, "light", brightness - side.Sector.Brightness, 0);
+
+			//apply lightfog flag?
+			if(General.Map.UDMF) Tools.UpdateLightFogFlag(side);
+		}
+
+		[BeginAction("placethings")] //mxd
+		public void PlaceThings() 
+		{
+			// Make list of selected linedefs
+			ICollection<Linedef> lines = General.Map.Map.GetSelectedLinedefs(true);
+			List<Vector2D> positions = new List<Vector2D>();
+
+			if(lines.Count == 0) 
+			{
+				if(highlighted != null && !highlighted.IsDisposed) 
+				{
+					lines.Add(highlighted);
+				} 
+				else 
+				{
+					General.Interface.DisplayStatus(StatusType.Warning, "This action requires selection of some description!");
+					return;
+				}
+			}
+
+			// Make list of vertex positions
+			foreach(Linedef l in lines) 
+			{
+				if(!positions.Contains(l.Start.Position)) positions.Add(l.Start.Position);
+				if(!positions.Contains(l.End.Position)) positions.Add(l.End.Position);
+			}
+
+			if(positions.Count < 1) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "Unable to get vertex positions from selection!");
+				return;
+			}
+
+			PlaceThingsAtPositions(positions);
+		}
+
+		//mxd
+		[BeginAction("alignfloortofront")]
+		public void AlignFloorToFront() 
+		{
+			if(!General.Map.UDMF) return;
+			AlignTextureToLine(true, true);
+		}
+
+		//mxd
+		[BeginAction("alignfloortoback")]
+		public void AlignFloorToBack() 
+		{
+			if(!General.Map.UDMF) return;
+			AlignTextureToLine(true, false);
+		}
+
+		//mxd
+		[BeginAction("alignceilingtofront")]
+		public void AlignCeilingToFront() 
+		{
+			if(!General.Map.UDMF) return;
+			AlignTextureToLine(false, true);
+		}
+
+		//mxd
+		[BeginAction("alignceilingtoback")]
+		public void AlignCeilingToBack() 
+		{
+			if(!General.Map.UDMF) return;
+			AlignTextureToLine(false, false);
+		}
+
+		//mxd
+		[BeginAction("selectsimilar")]
+		public void SelectSimilar() 
+		{
+			ICollection<Linedef> selection = General.Map.Map.GetSelectedLinedefs(true);
+
+			if(selection.Count == 0) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "This action requires a selection!");
+				return;
+			}
+
+			var form = new SelectSimilarElementOptionsPanel();
+			if(form.Setup(this)) form.ShowDialog();
+		}
+
+		//mxd
+		[BeginAction("applylightfogflag")]
+		private void ApplyLightFogFlag() 
+		{
+			if(!General.Map.UDMF)return;
+
+			// Make list of selected linedefs
+			ICollection<Linedef> lines = General.Map.Map.GetSelectedLinedefs(true);
+
+			if(lines.Count == 0) 
+			{
+				if(highlighted != null && !highlighted.IsDisposed) 
+				{
+					lines.Add(highlighted);
+				} 
+				else 
+				{
+					General.Interface.DisplayStatus(StatusType.Warning, "This action requires selection of some description!");
+					return;
+				}
+			}
+
+			// Make undo
+			General.Map.UndoRedo.CreateUndo("Apply 'lightfog' flag");
+
+			// Apply the flag
+			int addedcout = 0;
+			int removedcount = 0;
+			foreach(Linedef l in lines)
+			{
+				if(l.Front != null)
+				{
+					int result = Tools.UpdateLightFogFlag(l.Front);
+					switch(result)
+					{
+						case 1: addedcout++; break;
+						case -1: removedcount++; break;
+					}
+				}
+				if(l.Back != null)
+				{
+					int result = Tools.UpdateLightFogFlag(l.Back);
+					switch(result) 
+					{
+						case 1: addedcout++; break;
+						case -1: removedcount++; break;
+					}
+				}
+			}
+
+			// Display info
+			General.Interface.DisplayStatus(StatusType.Action, "Added 'lightfog' flag to " + addedcout + " sidedefs, removed it from " + removedcount + " sidedefs.");
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ClassicModes/MakeSectorMode.cs b/Source/Plugins/BuilderModes/ClassicModes/MakeSectorMode.cs
new file mode 100644
index 0000000..97b5471
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ClassicModes/MakeSectorMode.cs
@@ -0,0 +1,535 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Editing;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[EditMode(DisplayName = "Make Sectors Mode",
+			  SwitchAction = "makesectormode",
+			  ButtonImage = "NewSector2.png",	// Image resource name for the button
+			  ButtonOrder = int.MinValue + 302,	// Position of the button (lower is more to the left)
+			  ButtonGroup = "000_editing",
+			  UseByDefault = true)]
+
+	public class MakeSectorMode : BaseClassicMode
+	{
+		#region ================== Constants
+
+		private const float FLASH_DURATION = 300.0f;
+
+		#endregion
+
+		#region ================== Variables
+
+		// Nearest sidedef
+		private LinedefSide editside;
+		private LinedefSide nearestside;
+		private List<LinedefSide> allsides;
+		private List<Linedef> alllines;
+		
+		// Flash polygon
+		private FlatVertex[] flashpolygon;
+		private float flashintensity;
+		private float flashstarttime;
+		
+		// Interface
+		protected bool editpressed;
+
+		//mxd. Used in overlay rendering
+		private Dictionary<Sector, Sector> associates;
+
+		#endregion
+
+		#region ================== Properties
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public MakeSectorMode()
+		{
+		}
+
+		// Disposer
+		public override void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Clean up
+				nearestside = null;
+				allsides = null;
+				
+				// Dispose base
+				base.Dispose();
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This draws the geometry
+		private void DrawGeometry()
+		{
+			associates = new Dictionary<Sector, Sector>();
+			
+			// Render lines and vertices
+			if(renderer.StartPlotter(true))
+			{
+				renderer.PlotLinedefSet(General.Map.Map.Linedefs);
+				
+				// Render sector indication
+				if(allsides != null)
+				{
+					foreach(LinedefSide sd in allsides)
+					{
+						if(sd.Front)
+						{
+							if(sd.Line.Front != null)
+							{
+								if(!associates.ContainsKey(sd.Line.Front.Sector))
+								{
+									renderer.PlotSector(sd.Line.Front.Sector, General.Colors.Indication);
+									associates[sd.Line.Front.Sector] = sd.Line.Front.Sector;
+								}
+							}
+						}
+						else
+						{
+							if(sd.Line.Back != null)
+							{
+								if(!associates.ContainsKey(sd.Line.Back.Sector))
+								{
+									renderer.PlotSector(sd.Line.Back.Sector, General.Colors.Indication);
+									associates[sd.Line.Back.Sector] = sd.Line.Back.Sector;
+								}
+							}
+						}
+					}
+				}
+				
+				// Render highlight
+				if(alllines != null)
+				{
+					foreach(Linedef l in alllines) renderer.PlotLinedef(l, General.Colors.Highlight);
+				}
+
+				renderer.PlotVerticesSet(General.Map.Map.Vertices);
+				renderer.Finish();
+			}
+		}
+
+		// This draws the overlay
+		private void DrawOverlay()
+		{
+			// Redraw overlay
+			if(renderer.StartOverlay(true))
+			{
+				if((flashpolygon != null) && (flashintensity > 0.0f))
+				{
+					renderer.RenderGeometry(flashpolygon, null, true);
+				} 
+				else if(BuilderPlug.Me.UseHighlight) //mxd
+				{
+					int color = General.Colors.Indication.WithAlpha(64).ToInt();
+					foreach(Sector s in associates.Keys)
+					{
+						renderer.RenderHighlight(s.FlatVertices, color);
+					}
+				}
+
+				renderer.Finish();
+			}
+		}
+
+		// This highlights a new region
+		private void Highlight(bool buttonspressed)
+		{
+			// Mouse inside?
+			if(mouseinside)
+			{
+				// Highlighting from a new sidedef?
+				Linedef nl = General.Map.Map.NearestLinedef(mousemappos);
+				if(nl != null)
+				{
+					float side = nl.SideOfLine(mousemappos);
+					LinedefSide newnearest = new LinedefSide(nl, (side <= 0.0f));
+					if(newnearest != nearestside)
+					{
+						// Only change when buttons are not pressed
+						if(!buttonspressed || (editside == newnearest))
+						{
+							// Find new sector
+							General.Interface.SetCursor(Cursors.AppStarting);
+							nearestside = newnearest;
+							allsides = Tools.FindPotentialSectorAt(mousemappos);
+							if(allsides != null)
+							{
+								alllines = new List<Linedef>(allsides.Count);
+								foreach(LinedefSide sd in allsides) alllines.Add(sd.Line);
+							}
+							else
+							{
+								alllines = null;
+							}
+							General.Interface.SetCursor(Cursors.Default);
+						}
+						else
+						{
+							// Don't highlight this one
+							nearestside = null;
+							allsides = null;
+							alllines = null;
+						}
+
+						// Redraw overlay
+						DrawGeometry();
+						DrawOverlay(); //mxd
+						renderer.Present();
+					}
+				}
+			}
+			else
+			{
+				// No valid region
+				nearestside = null;
+				allsides = null;
+				alllines = null;
+
+				// Redraw overlay
+				DrawGeometry();
+				renderer.Present();
+			}
+		}
+
+		// This makes this highlighted potential sector
+		private Sector MakeSector()
+		{
+			General.Interface.SetCursor(Cursors.WaitCursor);
+			General.Settings.FindDefaultDrawSettings();
+			General.Map.UndoRedo.CreateUndo("Make Sector");
+			
+			// Mark the lines we are going to use for this sector
+			General.Map.Map.ClearAllMarks(true);
+			foreach(LinedefSide ls in allsides) ls.Line.Marked = false;
+			List<Linedef> oldlines = General.Map.Map.GetMarkedLinedefs(true);
+			
+			// Make the sector
+			Sector s = Tools.MakeSector(allsides, oldlines, false);
+			if(s != null)
+			{
+				// Now we go for all the lines along the sector to
+				// see if they only have a back side. In that case we want
+				// to flip the linedef to that it only has a front side.
+				foreach(Sidedef sd in s.Sidedefs)
+				{
+					if((sd.Line.Front == null) && (sd.Line.Back != null))
+					{
+						// Flip linedef
+						sd.Line.FlipVertices();
+						sd.Line.FlipSidedefs();
+					}
+				}
+
+				General.Map.Data.UpdateUsedTextures();
+				General.Interface.SetCursor(Cursors.Default);
+				return s;
+			}
+			else
+			{
+				General.Map.UndoRedo.WithdrawUndo();
+				return null;
+			}
+		}
+		
+		#endregion
+		
+		#region ================== Events
+
+		public override void OnHelp()
+		{
+			General.ShowHelp("e_makesectors.html");
+		}
+
+		// When the mapset changes (undo/redo)
+		public override void OnMapSetChangeBegin()
+		{
+			// No valid region
+			nearestside = null;
+			allsides = null;
+			alllines = null;
+			
+			base.OnMapSetChangeBegin();
+		}
+
+		// Cancel mode
+		public override void OnCancel()
+		{
+			base.OnCancel();
+			
+			// Return to base mode
+			General.Editing.ChangeMode(new SectorsMode());
+		}
+
+		// Mode engages
+		public override void OnEngage()
+		{
+			base.OnEngage();
+
+			// Make customized presentation
+			CustomPresentation p = new CustomPresentation();
+			p.AddLayer(new PresentLayer(RendererLayer.Background, BlendingMode.Mask, General.Settings.BackgroundAlpha));
+			p.AddLayer(new PresentLayer(RendererLayer.Surface, BlendingMode.Mask));
+			p.AddLayer(new PresentLayer(RendererLayer.Grid, BlendingMode.Mask));
+			p.AddLayer(new PresentLayer(RendererLayer.Overlay, BlendingMode.Alpha, 1f, true));
+			p.AddLayer(new PresentLayer(RendererLayer.Things, BlendingMode.Alpha, Presentation.THINGS_BACK_ALPHA, false));
+			p.AddLayer(new PresentLayer(RendererLayer.Geometry, BlendingMode.Alpha, 1f, true));
+			renderer.SetPresentation(p);
+			General.Map.Map.SelectionType = SelectionType.All;
+		}
+
+		// Mode disengages
+		public override void OnDisengage()
+		{
+			base.OnDisengage();
+
+			// Check which mode we are switching to
+			if(General.Editing.NewMode is VerticesMode || General.Editing.NewMode is LinedefsMode)
+			{
+				// Clear selected sectors
+				General.Map.Map.ClearSelectedSectors();
+			}
+
+			// Hide highlight info
+			General.Interface.HideInfo();
+
+			// Stop processing
+			General.Interface.DisableProcessing();
+		}
+
+		// This redraws the display
+		public override void OnRedrawDisplay()
+		{
+			renderer.RedrawSurface();
+			
+			// Render lines and vertices
+			DrawGeometry();
+
+			// Render things
+			if(renderer.StartThings(true))
+			{
+				renderer.RenderThingSet(General.Map.ThingsFilter.HiddenThings, Presentation.THINGS_HIDDEN_ALPHA);
+				renderer.RenderThingSet(General.Map.ThingsFilter.VisibleThings, Presentation.THINGS_ALPHA);
+				renderer.Finish();
+			}
+
+			// Render overlay
+			DrawOverlay();
+			renderer.Present();
+		}
+
+		// Start select
+		protected override void OnSelectBegin()
+		{
+			// Select pressed in this mode
+			selectpressed = true;
+			editside = nearestside;
+			base.OnEditBegin();
+		}
+		
+		// Done selecting
+		protected override void OnSelectEnd()
+		{
+			// Select was pressed in this mode?
+			if(selectpressed && (editside == nearestside) && (nearestside != null))
+			{
+				// Possible to make a sector?
+				if(allsides != null)
+				{
+					// Make the sector
+					Sector s = MakeSector();
+					if(s != null)
+					{
+						// Quickly flash this sector to indicate it was created
+						General.Map.IsChanged = true;
+						General.Map.Map.Update();
+						General.Interface.RedrawDisplay();
+						flashpolygon = new FlatVertex[s.FlatVertices.Length];
+						s.FlatVertices.CopyTo(flashpolygon, 0);
+						flashintensity = 1.0f;
+						flashstarttime = Clock.CurrentTime;
+						General.Interface.EnableProcessing();
+					}
+					
+					// Redraw overlay
+					DrawGeometry();
+					DrawOverlay();
+					renderer.Present();
+				}
+			}
+
+			base.OnSelectEnd();
+		}
+		
+		// Start editing
+		protected override void OnEditBegin()
+		{
+			// Edit pressed in this mode
+			editpressed = true;
+			editside = nearestside;
+			base.OnEditBegin();
+		}
+
+		// Done editing
+		protected override void OnEditEnd()
+		{
+			// Edit was pressed in this mode?
+			if(editpressed && (editside == nearestside) && (nearestside != null))
+			{
+				// Possible to make a sector?
+				if(allsides != null)
+				{
+					// Make the sector
+					Sector s = MakeSector();
+					if(s != null)
+					{
+						General.Map.Map.Update();
+
+						// Edit the sector
+						List<Sector> secs = new List<Sector>(); secs.Add(s);
+						if(General.Interface.ShowEditSectors(secs) == DialogResult.OK)
+						{
+							// Quickly flash this sector to indicate it was created
+							General.Map.IsChanged = true;
+							General.Map.Map.Update();
+							flashpolygon = new FlatVertex[s.FlatVertices.Length];
+							s.FlatVertices.CopyTo(flashpolygon, 0);
+							flashintensity = 1.0f;
+							flashstarttime = Clock.CurrentTime;
+							General.Interface.EnableProcessing();
+						}
+						else
+						{
+							// Undo
+							General.Map.UndoRedo.WithdrawUndo();
+						}
+					}
+					
+					// Redraw overlay
+					DrawGeometry();
+					DrawOverlay();
+					renderer.Present();
+				}
+			}
+			
+			editpressed = false;
+			base.OnEditEnd();
+		}
+
+		// Mouse moves
+		public override void OnMouseMove(MouseEventArgs e)
+		{
+			base.OnMouseMove(e);
+			if(panning) return; //mxd. Skip all this jass while panning
+
+			// Highlight the region
+			Highlight((e.Button != MouseButtons.None));
+		}
+
+		// Mouse leaves
+		public override void OnMouseLeave(EventArgs e)
+		{
+			base.OnMouseLeave(e);
+
+			// Highlight nothing
+			Highlight(false);
+		}
+		
+		// Something is undone
+		public override void OnUndoEnd()
+		{
+			base.OnUndoEnd();
+
+			editside = null;
+			nearestside = null;
+			if(alllines != null)
+				alllines.Clear();
+			if(allsides != null)
+				allsides.Clear();
+		}
+
+		// Something is redone
+		public override void OnRedoEnd()
+		{
+			base.OnRedoEnd();
+
+			editside = null;
+			nearestside = null;
+			if(alllines != null)
+				alllines.Clear();
+			if(allsides != null)
+				allsides.Clear();
+		}
+
+		// Processing
+		public override void OnProcess(float deltatime)
+		{
+			base.OnProcess(deltatime);
+
+			// Process flash
+			if(flashpolygon != null)
+			{
+				// Determine the intensity of the flash by time elapsed
+				float curtime = Clock.CurrentTime;
+				flashintensity = 1f - ((curtime - flashstarttime) / FLASH_DURATION);
+				if(flashintensity > 0.0f)
+				{
+					// Update vertices in polygon
+					PixelColor pc = new PixelColor((byte)(flashintensity * 255.0f), 255, 255, 255);
+					int intcolor = pc.ToInt();
+					for(int i = 0; i < flashpolygon.Length; i++) flashpolygon[i].c = intcolor;
+				}
+				else
+				{
+					// End of flash, trash the polygon
+					flashpolygon = null;
+					flashintensity = 0.0f;
+					General.Interface.DisableProcessing();
+				}
+
+				// Redraw overlay
+				DrawOverlay();
+				renderer.Present();
+			}
+		}
+		
+		#endregion
+	}
+}
+
diff --git a/Source/Plugins/BuilderModes/ClassicModes/SectorsMode.cs b/Source/Plugins/BuilderModes/ClassicModes/SectorsMode.cs
new file mode 100644
index 0000000..0d94e9a
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ClassicModes/SectorsMode.cs
@@ -0,0 +1,2451 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Actions;
+using CodeImp.DoomBuilder.BuilderModes.Interface;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Editing;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.GZBuilder.Geometry;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Types;
+using CodeImp.DoomBuilder.Windows;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[EditMode(DisplayName = "Sectors Mode",
+			  SwitchAction = "sectorsmode",		// Action name used to switch to this mode
+			  ButtonImage = "SectorsMode.png",	// Image resource name for the button
+			  ButtonOrder = int.MinValue + 200,	// Position of the button (lower is more to the left)
+			  ButtonGroup = "000_editing",
+			  UseByDefault = true,
+			  SafeStartMode = true)]
+
+	public class SectorsMode : BaseClassicMode
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		// Highlighted item
+		private Sector highlighted;
+		private readonly Association highlightasso = new Association();
+
+		// Interface
+		private bool editpressed;
+
+		// Labels
+		private Dictionary<Sector, TextLabel[]> labels;
+
+		//mxd. Effects
+		private readonly Dictionary<int, string[]> effects;
+		
+		//mxd. Cached overlays stuff
+		private FlatVertex[] overlayGeometry;
+		private Dictionary<Sector, string[]> selectedEffectLabels;
+		private Dictionary<Sector, string[]> unselectedEffectLabels; 
+		
+		#endregion
+
+		#region ================== Properties
+
+		public override object HighlightedObject { get { return highlighted; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public SectorsMode()
+		{
+			//mxd
+			effects = new Dictionary<int, string[]>();
+			foreach(SectorEffectInfo info in General.Map.Config.SortedSectorEffects) 
+			{
+				string name = info.Index + ": " + info.Title;
+				effects.Add(info.Index, new[] { name, "E" + info.Index });
+			}
+		}
+
+		// Disposer
+		public override void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Dispose old labels
+				foreach(KeyValuePair<Sector, TextLabel[]> lbl in labels)
+					foreach(TextLabel l in lbl.Value) l.Dispose();
+
+				// Dispose base
+				base.Dispose();
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This makes a CRC for the selection
+		public int CreateSelectionCRC()
+		{
+			CRC crc = new CRC();
+			ICollection<Sector> orderedselection = General.Map.Map.GetSelectedSectors(true);
+			crc.Add(orderedselection.Count);
+			foreach(Sector s in orderedselection)
+			{
+				crc.Add(s.FixedIndex);
+			}
+			return (int)(crc.Value & 0xFFFFFFFF);
+		}
+
+		//mxd. This makes a CRC for given selection
+		private static int CreateSelectionCRC(ICollection<Sector> selection) 
+		{
+			CRC crc = new CRC();
+			crc.Add(selection.Count);
+			foreach(Sector s in selection) crc.Add(s.FixedIndex);
+			return (int)(crc.Value & 0xFFFFFFFF);
+		}
+
+		// This sets up new labels
+		private void SetupLabels()
+		{
+			if(labels != null)
+			{
+				// Dispose old labels
+				foreach(KeyValuePair<Sector, TextLabel[]> lbl in labels)
+					foreach(TextLabel l in lbl.Value) l.Dispose();
+			}
+
+			// Make text labels for sectors
+			labels = new Dictionary<Sector, TextLabel[]>(General.Map.Map.Sectors.Count);
+			foreach(Sector s in General.Map.Map.Sectors)
+			{
+				// Setup labels
+				TextLabel[] labelarray = new TextLabel[s.Labels.Count];
+				for(int i = 0; i < s.Labels.Count; i++)
+				{
+					Vector2D v = s.Labels[i].position;
+					labelarray[i] = new TextLabel(20);
+					labelarray[i].TransformCoords = true;
+					labelarray[i].Rectangle = new RectangleF(v.x, v.y, 0.0f, 0.0f);
+					labelarray[i].AlignX = TextAlignmentX.Center;
+					labelarray[i].AlignY = TextAlignmentY.Middle;
+					labelarray[i].Scale = 14f;
+					labelarray[i].Color = General.Colors.Highlight.WithAlpha(255);
+					labelarray[i].Backcolor = General.Colors.Background.WithAlpha(255);
+				}
+				labels.Add(s, labelarray);
+			}
+		}
+
+		// This updates the overlay
+		private void UpdateOverlay()
+		{
+			if(renderer.StartOverlay(true))
+			{
+				// Go for all selected sectors
+				ICollection<Sector> orderedselection = General.Map.Map.GetSelectedSectors(true);
+				
+				//mxd. Render selected sectors
+				if(BuilderPlug.Me.UseHighlight) 
+				{
+					renderer.RenderHighlight(overlayGeometry, General.Colors.Selection.WithAlpha(64).ToInt());
+				}
+
+				//mxd. Render highlighted sector
+				if(BuilderPlug.Me.UseHighlight && highlighted != null) 
+				{
+					renderer.RenderHighlight(highlighted.FlatVertices, General.Colors.Highlight.WithAlpha(64).ToInt());
+				}
+
+				//mxd. Render comments
+				if(General.Map.UDMF && General.Settings.RenderComments)
+				{
+					foreach(Sector s in General.Map.Map.Sectors) RenderComment(s);
+				}
+
+				if(BuilderPlug.Me.ViewSelectionNumbers) 
+				{
+					foreach(Sector s in orderedselection) 
+					{
+						// Render labels
+						TextLabel[] labelarray = labels[s];
+						for(int i = 0; i < s.Labels.Count; i++) 
+						{
+							TextLabel l = labelarray[i];
+
+							// Render only when enough space for the label to see
+							float requiredsize = (l.TextSize.Height / 2) / renderer.Scale;
+							if(requiredsize < s.Labels[i].radius) renderer.RenderText(l);
+						}
+					}
+				}
+
+				//mxd. Render effect labels
+				if(BuilderPlug.Me.ViewSelectionEffects) 
+				{
+					if(!BuilderPlug.Me.ViewSelectionNumbers) RenderEffectLabels(selectedEffectLabels);
+					RenderEffectLabels(unselectedEffectLabels);
+				}
+				
+				renderer.Finish();
+			}
+		}
+
+		//mxd
+		private void RenderEffectLabels(Dictionary<Sector, string[]> labelsGroup) 
+		{
+			foreach(KeyValuePair<Sector, string[]> group in labelsGroup) 
+			{
+				// Render labels
+				TextLabel[] labelarray = labels[group.Key];
+				for(int i = 0; i < group.Key.Labels.Count; i++) 
+				{
+					TextLabel l = labelarray[i];
+					l.Color = General.Colors.InfoLine;
+
+					// Render only when enough space for the label to see
+					float requiredsize = (General.Map.GetTextSize(group.Value[0], l.Scale).Width) / renderer.Scale;
+					if(requiredsize > group.Key.Labels[i].radius) 
+					{
+						requiredsize = (General.Map.GetTextSize(group.Value[1], l.Scale).Width) / renderer.Scale;
+						l.Text = (requiredsize > group.Key.Labels[i].radius ? "+" : group.Value[1]);
+					} 
+					else 
+					{
+						l.Text = group.Value[0];
+					}
+
+					renderer.RenderText(l);
+				}
+			}
+		}
+
+		//mxd
+		private string[] GetEffectText(Sector s) 
+		{
+			string tagstr = string.Empty;
+			string tagstrshort = string.Empty;
+			string effectstr = string.Empty;
+			string effectstrshort = string.Empty;
+
+			// Make effect text
+			if(s.Effect != 0)
+			{
+				if(effects.ContainsKey(s.Effect))
+					effectstr = effects[s.Effect][0];
+				else
+					effectstr = s.Effect + " - " + General.Map.Config.GetGeneralizedSectorEffectName(s.Effect);
+				effectstrshort = "E" + s.Effect;
+			}
+
+			// Make tag text
+			if(s.Tag != 0)
+			{
+				if(s.Tags.Count > 1)
+				{
+					string[] stags = new string[s.Tags.Count];
+					for(int i = 0; i < s.Tags.Count; i++) stags[i] = s.Tags[i].ToString();
+					tagstr = "Tags " + string.Join(", ", stags);
+					tagstrshort = "T" + string.Join(",", stags);
+				}
+				else
+				{
+					tagstr = "Tag " + s.Tag;
+					tagstrshort = "T" + s.Tag;
+				}
+			}
+
+			// Combine them
+			string[] result = new[] { string.Empty, string.Empty };
+			if(s.Effect != 0 && s.Tag != 0)
+			{
+				result[0] = tagstr + "; " + effectstr;
+				result[1] = tagstrshort + " " + effectstrshort;
+			}
+			else if(s.Effect != 0)
+			{
+				result[0] = effectstr;
+				result[1] = effectstrshort;
+			} 
+			else if(s.Tag != 0)
+			{
+				result[0] = tagstr;
+				result[1] = tagstrshort;
+			}
+
+			return result;
+		}
+
+		//mxd
+		private void UpdateOverlaySurfaces() 
+		{
+			ICollection<Sector> orderedselection = General.Map.Map.GetSelectedSectors(true);
+			List<FlatVertex> vertsList = new List<FlatVertex>();
+			
+			// Go for all selected sectors
+			foreach(Sector s in orderedselection) vertsList.AddRange(s.FlatVertices);
+			overlayGeometry = vertsList.ToArray();
+		}
+
+		//mxd
+		private void UpdateEffectLabels() 
+		{
+			selectedEffectLabels = new Dictionary<Sector, string[]>();
+			unselectedEffectLabels = new Dictionary<Sector, string[]>();
+
+			//update effect labels for selected sectors
+			ICollection<Sector> orderedselection = General.Map.Map.GetSelectedSectors(true);
+			foreach(Sector s in orderedselection) 
+			{
+				string[] labelText = GetEffectText(s);
+				if(!string.IsNullOrEmpty(labelText[0])) 
+					selectedEffectLabels.Add(s, labelText);
+			}
+
+			//update effect labels for unselected sectors
+			orderedselection = General.Map.Map.GetSelectedSectors(false);
+			foreach(Sector s in orderedselection) 
+			{
+				string[] labelText = GetEffectText(s);
+				if(!string.IsNullOrEmpty(labelText[0]))
+					unselectedEffectLabels.Add(s, labelText);
+			}
+		}
+		
+		// Support function for joining and merging sectors
+		private void JoinMergeSectors(bool removelines)
+		{
+			// Remove lines in betwen joining sectors?
+			if(removelines)
+			{
+				// Go for all selected linedefs
+				List<Linedef> selectedlines = new List<Linedef>(General.Map.Map.GetSelectedLinedefs(true));
+				foreach(Linedef ld in selectedlines)
+				{
+					// Front and back side?
+					if((ld.Front != null) && (ld.Back != null))
+					{
+						// Both a selected sector, but not the same?
+						if(ld.Front.Sector.Selected && ld.Back.Sector.Selected &&
+						   (ld.Front.Sector != ld.Back.Sector))
+						{
+							// Remove this line
+							ld.Dispose();
+						}
+					}
+				}
+			}
+
+			// Find the first sector that is not disposed
+			List<Sector> orderedselection = new List<Sector>(General.Map.Map.GetSelectedSectors(true));
+			Sector first = null;
+			foreach(Sector s in orderedselection)
+				if(!s.IsDisposed) { first = s; break; }
+			
+			// Join all selected sectors with the first
+			for(int i = 0; i < orderedselection.Count; i++)
+				if((orderedselection[i] != first) && !orderedselection[i].IsDisposed)
+					orderedselection[i].Join(first);
+
+			// Clear selection
+			General.Map.Map.ClearAllSelected();
+			
+			// Update
+			General.Map.Map.Update();
+			
+			// Make text labels for sectors
+			SetupLabels();
+			UpdateSelectedLabels();
+		}
+
+		// This highlights a new item
+		private void Highlight(Sector s)
+		{
+			// Often we can get away by simply undrawing the previous
+			// highlight and drawing the new highlight. But if associations
+			// are or were drawn we need to redraw the entire display.
+
+			// Previous association highlights something?
+			bool completeredraw = (highlighted != null) && (highlighted.Tag != 0);
+
+			// Set highlight association
+			if(s != null && s.Tag != 0) 
+			{
+				Vector2D center = (s.Labels.Count > 0 ? s.Labels[0].position : new Vector2D(s.BBox.X + s.BBox.Width / 2, s.BBox.Y + s.BBox.Height / 2));
+				highlightasso.Set(center, s.Tags, UniversalType.SectorTag);
+			} 
+			else 
+			{
+				highlightasso.Set(new Vector2D(), 0, 0);
+			}
+
+			// New association highlights something?
+			if((s != null) && (s.Tag != 0)) completeredraw = true;
+
+			// Change label color
+			if((highlighted != null) && !highlighted.IsDisposed)
+			{
+				TextLabel[] labelarray = labels[highlighted];
+				foreach(TextLabel l in labelarray) l.Color = General.Colors.Selection;
+			}
+			
+			// Change label color
+			if((s != null) && !s.IsDisposed)
+			{
+				TextLabel[] labelarray = labels[s];
+				foreach(TextLabel l in labelarray) l.Color = General.Colors.Highlight;
+			}
+			
+			// If we're changing associations, then we
+			// need to redraw the entire display
+			if(completeredraw)
+			{
+				// Set new highlight and redraw completely
+				highlighted = s;
+				General.Interface.RedrawDisplay();
+			}
+			else
+			{
+				// Update display
+				if(renderer.StartPlotter(false))
+				{
+					// Undraw previous highlight
+					if((highlighted != null) && !highlighted.IsDisposed)
+						renderer.PlotSector(highlighted);
+
+					// Set new highlight
+					highlighted = s;
+
+					// Render highlighted item
+					if((highlighted != null) && !highlighted.IsDisposed)
+						renderer.PlotSector(highlighted, General.Colors.Highlight);
+	
+					// Done
+					renderer.Finish();
+				}
+				
+				UpdateOverlay();
+				renderer.Present();
+			}
+
+			// Show highlight info
+			if((highlighted != null) && !highlighted.IsDisposed)
+			{
+				General.Interface.ShowSectorInfo(highlighted);
+			}
+			else
+			{
+				General.Interface.Display.HideToolTip(); //mxd
+				General.Interface.HideInfo();
+			}
+		}
+
+		// This selectes or deselects a sector
+		private void SelectSector(Sector s, bool selectstate, bool update)
+		{
+			bool selectionchanged = false;
+
+			if(!s.IsDisposed)
+			{
+				// Select the sector?
+				if(selectstate && !s.Selected)
+				{
+					s.Selected = true;
+					selectionchanged = true;
+					
+					// Setup labels
+					if(update) 
+					{ 
+						//mxd
+						string selectedCount = General.Map.Map.SelectedSectorsCount.ToString();
+						TextLabel[] labelarray = labels[s];
+						foreach(TextLabel l in labelarray) 
+						{
+							l.Text = selectedCount;
+							l.Color = General.Colors.Selection;
+						}
+
+						UpdateEffectLabels();
+					}
+				}
+				// Deselect the sector?
+				else if(!selectstate && s.Selected)
+				{
+					s.Selected = false;
+					selectionchanged = true;
+
+					// Clear labels
+					if(update) 
+					{
+						TextLabel[] labelarray = labels[s];
+						foreach(TextLabel l in labelarray) l.Text = "";
+
+						// Update all other labels
+						UpdateSelectedLabels();
+					}
+				}
+
+				// Selection changed?
+				if(selectionchanged)
+				{
+					// Make update lines selection
+					foreach(Sidedef sd in s.Sidedefs)
+					{
+						bool front, back;
+						if(sd.Line.Front != null) front = sd.Line.Front.Sector.Selected; else front = false;
+						if(sd.Line.Back != null) back = sd.Line.Back.Sector.Selected; else back = false;
+						sd.Line.Selected = front | back;
+					}
+
+					//mxd. Also (de)select things?
+					if(General.Interface.AltState ^ BuilderPlug.Me.SyncronizeThingEdit)
+					{
+						foreach(Thing t in General.Map.Map.Things) 
+							if(t.Sector == s && t.Selected != s.Selected) t.Selected = s.Selected;
+					}
+
+					if(update) 
+					{
+						UpdateOverlay();
+						renderer.Present();
+					}
+				}
+			}
+		}
+
+		// This updates labels from the selected sectors
+		private void UpdateSelectedLabels()
+		{
+			// Go for all labels in all selected sectors
+			ICollection<Sector> orderedselection = General.Map.Map.GetSelectedSectors(true);
+			int index = 0;
+			foreach(Sector s in orderedselection)
+			{
+				TextLabel[] labelarray = labels[s];
+				foreach(TextLabel l in labelarray)
+				{
+					// Make sure the text and color are right
+					int labelnum = index + 1;
+					l.Text = labelnum.ToString();
+					l.Color = General.Colors.Selection;
+				}
+				index++;
+			}
+
+			//mxd
+			UpdateEffectLabels();
+		}
+
+		//mxd
+		private bool IsInSelectionRect(Sector s, List<Line2D> selectionOutline) 
+		{
+			if(selectionrect.Contains(s.BBox)) return true;
+
+			if(BuilderPlug.Me.MarqueSelectTouching && s.BBox.IntersectsWith(selectionrect)) 
+			{
+				//check endpoints
+				foreach(Sidedef side in s.Sidedefs) 
+				{
+					if((selectionrect.Contains(side.Line.Start.Position.x, side.Line.Start.Position.y)
+						|| selectionrect.Contains(side.Line.End.Position.x, side.Line.End.Position.y))) 
+						return true;
+				}
+
+				//check line intersections
+				foreach(Sidedef side in s.Sidedefs) 
+				{
+					foreach(Line2D line in selectionOutline) 
+					{
+						if(Line2D.GetIntersection(side.Line.Line, line)) return true;
+					}
+				}
+			}
+
+			return false;
+		}
+
+		//mxd
+		public override void SelectMapElement(SelectableElement element) 
+		{
+			if(element is Sector) 
+			{
+				SelectSector(element as Sector, true, true);
+
+				// Update overlay
+				UpdateOverlaySurfaces();
+				UpdateSelectionInfo();
+			}
+		}
+
+		#endregion
+		
+		#region ================== Events
+
+		public override void OnHelp()
+		{
+			General.ShowHelp("e_sectors.html");
+		}
+
+		// Cancel mode
+		public override void OnCancel()
+		{
+			base.OnCancel();
+
+			// Return to this mode
+			General.Editing.ChangeMode(new SectorsMode());
+		}
+
+		// Mode engages
+		public override void OnEngage()
+		{
+			base.OnEngage();
+			renderer.SetPresentation(Presentation.Standard);
+
+			// Add toolbar buttons
+			General.Interface.AddButton(BuilderPlug.Me.MenusForm.CopyProperties);
+			General.Interface.AddButton(BuilderPlug.Me.MenusForm.PasteProperties);
+			General.Interface.AddButton(BuilderPlug.Me.MenusForm.PastePropertiesOptions); //mxd
+			General.Interface.AddButton(BuilderPlug.Me.MenusForm.SeparatorCopyPaste);
+			General.Interface.AddButton(BuilderPlug.Me.MenusForm.ViewSelectionNumbers);
+			General.Interface.AddButton(BuilderPlug.Me.MenusForm.ViewSelectionEffects);
+			General.Interface.AddButton(BuilderPlug.Me.MenusForm.SeparatorSectors1);
+			General.Interface.AddButton(BuilderPlug.Me.MenusForm.MakeDoor); //mxd
+			General.Interface.AddButton(BuilderPlug.Me.MenusForm.SeparatorSectors2); //mxd
+			General.Interface.AddButton(BuilderPlug.Me.MenusForm.MakeGradientBrightness);
+			if(General.Map.UDMF) General.Interface.AddButton(BuilderPlug.Me.MenusForm.GradientModeMenu); //mxd
+			General.Interface.AddButton(BuilderPlug.Me.MenusForm.GradientInterpolationMenu); //mxd
+			General.Interface.AddButton(BuilderPlug.Me.MenusForm.MakeGradientFloors);
+			General.Interface.AddButton(BuilderPlug.Me.MenusForm.MakeGradientCeilings);
+			General.Interface.AddButton(BuilderPlug.Me.MenusForm.SeparatorSectors3); //mxd
+			General.Interface.AddButton(BuilderPlug.Me.MenusForm.MarqueSelectTouching); //mxd
+			General.Interface.AddButton(BuilderPlug.Me.MenusForm.SyncronizeThingEditButton); //mxd
+			if(General.Map.UDMF) General.Interface.AddButton(BuilderPlug.Me.MenusForm.TextureOffsetLock, ToolbarSection.Geometry); //mxd
+			
+			// Convert geometry selection to sectors only
+			General.Map.Map.ConvertSelection(SelectionType.Sectors);
+
+			//mxd. Update the tooltip
+			BuilderPlug.Me.MenusForm.SyncronizeThingEditButton.ToolTipText = "Synchronized Things Editing" + Environment.NewLine + BuilderPlug.Me.MenusForm.SyncronizeThingEditSectorsItem.ToolTipText;
+
+			//mxd. Determine thing sectors. Cause SyncronizeThingEdit requires that
+			foreach(Thing t in General.Map.Map.Things) t.DetermineSector();
+
+			//mxd. Select things as well?
+			if(BuilderPlug.Me.SyncronizeThingEdit)
+			{
+				ICollection<Sector> sectors = General.Map.Map.GetSelectedSectors(true);
+				if(sectors.Count > 0)
+				{
+					foreach(Thing t in General.Map.Map.Things)
+					{
+						if(!t.Selected && t.Sector != null && sectors.Contains(t.Sector))
+							t.Selected = true;
+					}
+				}
+			}
+
+			// Make text labels for sectors
+			SetupLabels();
+			
+			// Update
+			UpdateSelectedLabels();
+			UpdateOverlaySurfaces();//mxd
+			UpdateSelectionInfo(); //mxd
+		}
+		
+		// Mode disengages
+		public override void OnDisengage()
+		{
+			base.OnDisengage();
+
+			// Remove toolbar buttons
+			General.Interface.RemoveButton(BuilderPlug.Me.MenusForm.CopyProperties);
+			General.Interface.RemoveButton(BuilderPlug.Me.MenusForm.PasteProperties);
+			General.Interface.RemoveButton(BuilderPlug.Me.MenusForm.PastePropertiesOptions); //mxd
+			General.Interface.RemoveButton(BuilderPlug.Me.MenusForm.SeparatorCopyPaste);
+			General.Interface.RemoveButton(BuilderPlug.Me.MenusForm.ViewSelectionNumbers);
+			General.Interface.RemoveButton(BuilderPlug.Me.MenusForm.ViewSelectionEffects);
+			General.Interface.RemoveButton(BuilderPlug.Me.MenusForm.SeparatorSectors1);
+			General.Interface.RemoveButton(BuilderPlug.Me.MenusForm.MakeDoor); //mxd
+			General.Interface.RemoveButton(BuilderPlug.Me.MenusForm.SeparatorSectors2); //mxd
+			General.Interface.RemoveButton(BuilderPlug.Me.MenusForm.MakeGradientBrightness);
+			if(General.Map.UDMF) General.Interface.RemoveButton(BuilderPlug.Me.MenusForm.GradientModeMenu); //mxd
+			General.Interface.RemoveButton(BuilderPlug.Me.MenusForm.GradientInterpolationMenu); //mxd
+			General.Interface.RemoveButton(BuilderPlug.Me.MenusForm.MakeGradientFloors);
+			General.Interface.RemoveButton(BuilderPlug.Me.MenusForm.MakeGradientCeilings);
+			General.Interface.RemoveButton(BuilderPlug.Me.MenusForm.SeparatorSectors3); //mxd
+			General.Interface.RemoveButton(BuilderPlug.Me.MenusForm.MarqueSelectTouching); //mxd
+			General.Interface.RemoveButton(BuilderPlug.Me.MenusForm.SyncronizeThingEditButton); //mxd
+			if(General.Map.UDMF) General.Interface.RemoveButton(BuilderPlug.Me.MenusForm.TextureOffsetLock); //mxd
+			
+			// Keep only sectors selected
+			General.Map.Map.ClearSelectedLinedefs();
+			
+			// Going to EditSelectionMode?
+			if(General.Editing.NewMode is EditSelectionMode)
+			{
+				// Not pasting anything?
+				EditSelectionMode editmode = (General.Editing.NewMode as EditSelectionMode);
+				if(!editmode.Pasting)
+				{
+					// No selection made? But we have a highlight!
+					if((General.Map.Map.GetSelectedSectors(true).Count == 0) && (highlighted != null))
+					{
+						// Make the highlight the selection
+						SelectSector(highlighted, true, false);
+						UpdateSelectedLabels(); //mxd
+					}
+				}
+			}
+			
+			// Hide highlight info and tooltip
+			General.Interface.HideInfo();
+			General.Interface.Display.HideToolTip(); //mxd
+		}
+
+		// This redraws the display
+		public override void OnRedrawDisplay()
+		{
+			renderer.RedrawSurface();
+			List<Line3D> eventlines = new List<Line3D>(); //mxd
+			
+			// Render lines and vertices
+			if(renderer.StartPlotter(true))
+			{
+				renderer.PlotLinedefSet(General.Map.Map.Linedefs);
+				renderer.PlotVerticesSet(General.Map.Map.Vertices);
+				if((highlighted != null) && !highlighted.IsDisposed)
+				{
+					renderer.PlotSector(highlighted, General.Colors.Highlight);
+					BuilderPlug.PlotReverseAssociations(renderer, highlightasso, eventlines);
+				}
+				renderer.Finish();
+			}
+
+			// Render things
+			if(renderer.StartThings(true))
+			{
+				renderer.RenderThingSet(General.Map.ThingsFilter.HiddenThings, Presentation.THINGS_HIDDEN_ALPHA);
+				renderer.RenderThingSet(General.Map.ThingsFilter.VisibleThings, Presentation.THINGS_ALPHA);
+				renderer.Finish();
+			}
+
+			// Render overlay
+			UpdateOverlay();
+
+			// Render selection
+			if(renderer.StartOverlay(false)) 
+			{
+				if(highlighted != null && !highlighted.IsDisposed) BuilderPlug.RenderReverseAssociations(renderer, highlightasso, eventlines); //mxd
+				if(selecting) RenderMultiSelection();
+				renderer.RenderArrows(eventlines); //mxd
+				renderer.Finish();
+			}
+			
+			renderer.Present();
+		}
+
+		// Selection
+		protected override void OnSelectBegin()
+		{
+			// Item highlighted?
+			if((highlighted != null) && !highlighted.IsDisposed)
+			{
+				// Update display
+				if(renderer.StartPlotter(false))
+				{
+					// Redraw highlight to show selection
+					renderer.PlotSector(highlighted);
+					renderer.Finish();
+					renderer.Present();
+				}
+			}
+
+			base.OnSelectBegin();
+		}
+
+		// End selection
+		protected override void OnSelectEnd()
+		{
+			// Not stopping from multiselection?
+			if(!selecting)
+			{
+				// Item highlighted?
+				if((highlighted != null) && !highlighted.IsDisposed)
+				{
+					//mxd. Flip selection
+					SelectSector(highlighted, !highlighted.Selected, true);
+					
+					// Update display
+					if(renderer.StartPlotter(false))
+					{
+						// Render highlighted item
+						renderer.PlotSector(highlighted, General.Colors.Highlight);
+						renderer.Finish();
+						renderer.Present();
+					}
+
+					// Update overlay
+					TextLabel[] labelarray = labels[highlighted];
+					foreach(TextLabel l in labelarray) l.Color = General.Colors.Highlight;
+					UpdateOverlaySurfaces(); //mxd
+					UpdateOverlay();
+					renderer.Present();
+
+					//mxd. Thing selection state may've changed
+					if(General.Interface.AltState ^ BuilderPlug.Me.SyncronizeThingEdit) General.Interface.RedrawDisplay();
+				}
+				else if(BuilderPlug.Me.AutoClearSelection) //mxd
+				{
+					if(General.Map.Map.SelectedSectorsCount > 0)
+					{
+						General.Map.Map.ClearSelectedLinedefs();
+						General.Map.Map.ClearSelectedSectors();
+						UpdateOverlaySurfaces(); //mxd
+					}
+
+					//mxd
+					if(BuilderPlug.Me.SyncronizeThingEdit && General.Map.Map.SelectedThingsCount > 0)
+					{
+						General.Map.Map.ClearSelectedThings();
+					}
+					
+					General.Interface.RedrawDisplay();
+				}
+
+				UpdateSelectionInfo(); //mxd
+			}
+
+			base.OnSelectEnd();
+		}
+
+		// Start editing
+		protected override void OnEditBegin()
+		{
+			// Item highlighted?
+			if((highlighted != null) && !highlighted.IsDisposed)
+			{
+				// Edit pressed in this mode
+				editpressed = true;
+
+				// Highlighted item not selected?
+				if(!highlighted.Selected && (BuilderPlug.Me.AutoClearSelection || (General.Map.Map.SelectedSectorsCount == 0)))
+				{
+					// Make this the only selection
+					General.Map.Map.ClearSelectedSectors();
+					General.Map.Map.ClearSelectedLinedefs();
+					SelectSector(highlighted, true, false);
+					UpdateSelectedLabels(); //mxd
+					UpdateOverlaySurfaces(); //mxd
+					General.Interface.RedrawDisplay();
+				}
+
+				// Update display
+				if(renderer.StartPlotter(false))
+				{
+					// Redraw highlight to show selection
+					renderer.PlotSector(highlighted);
+					renderer.Finish();
+					renderer.Present();
+				}
+			}
+			else if(!selecting && BuilderPlug.Me.AutoDrawOnEdit) //mxd. We don't want to draw while multiselecting
+			{
+				// Start drawing mode
+				DrawGeometryMode drawmode = new DrawGeometryMode();
+				bool snaptogrid = General.Interface.ShiftState ^ General.Interface.SnapToGrid;
+				bool snaptonearest = General.Interface.CtrlState ^ General.Interface.AutoMerge;
+				DrawnVertex v = DrawGeometryMode.GetCurrentPosition(mousemappos, snaptonearest, snaptogrid, false, renderer, new List<DrawnVertex>());
+				
+				if(drawmode.DrawPointAt(v))
+					General.Editing.ChangeMode(drawmode);
+				else
+					General.Interface.DisplayStatus(StatusType.Warning, "Failed to draw point: outside of map boundaries.");
+			}
+			
+			base.OnEditBegin();
+		}
+
+		// Done editing
+		protected override void OnEditEnd()
+		{
+			// Edit pressed in this mode?
+			if(editpressed)
+			{
+				// Anything selected?
+				ICollection<Sector> selected = General.Map.Map.GetSelectedSectors(true);
+				if(selected.Count > 0)
+				{
+					if(General.Interface.IsActiveWindow)
+					{
+						//mxd. Show realtime vertex edit dialog
+						General.Interface.OnEditFormValuesChanged += sectorEditForm_OnValuesChanged;
+						DialogResult result = General.Interface.ShowEditSectors(selected);
+						General.Interface.OnEditFormValuesChanged -= sectorEditForm_OnValuesChanged;
+
+						General.Map.Renderer2D.UpdateExtraFloorFlag(); //mxd
+
+						// When a single sector was selected, deselect it now
+						if(selected.Count == 1) 
+						{
+							General.Map.Map.ClearSelectedSectors();
+							General.Map.Map.ClearSelectedLinedefs();
+
+							//mxd. Also deselect things?
+							if(BuilderPlug.Me.SyncronizeThingEdit)
+							{
+								Sector s = General.GetByIndex(selected, 0);
+								foreach(Thing t in General.Map.Map.Things)
+									if(t.Sector == s && t.Selected) t.Selected = false;
+							}
+
+							UpdateEffectLabels(); //mxd
+						} 
+						else if(result == DialogResult.Cancel) //mxd. Restore selection...
+						{ 
+							foreach(Sector s in selected) SelectSector(s, true, false);
+							UpdateSelectedLabels(); //mxd
+						}
+
+						UpdateOverlaySurfaces(); //mxd
+						General.Interface.RedrawDisplay();
+					}
+				}
+
+				UpdateSelectionInfo(); //mxd
+			}
+
+			editpressed = false;
+			base.OnEditEnd();
+		}
+
+		//mxd
+		private void sectorEditForm_OnValuesChanged(object sender, EventArgs e) 
+		{
+			// Update entire display
+			General.Map.Map.Update();
+			General.Interface.RedrawDisplay();
+		}
+		
+		// Mouse moves
+		public override void OnMouseMove(MouseEventArgs e)
+		{
+			base.OnMouseMove(e);
+			if(panning) return; //mxd. Skip all this jazz while panning
+
+			//mxd
+			if(selectpressed && !editpressed && !selecting) 
+			{
+				// Check if moved enough pixels for multiselect
+				Vector2D delta = mousedownpos - mousepos;
+				if((Math.Abs(delta.x) > MULTISELECT_START_MOVE_PIXELS) ||
+				   (Math.Abs(delta.y) > MULTISELECT_START_MOVE_PIXELS)) 
+				{
+					// Start multiselecting
+					StartMultiSelection();
+				}
+			}
+			else if(paintselectpressed && !editpressed && !selecting) //mxd. Drag-select
+			{
+				// Find the nearest linedef within highlight range
+				Linedef l = General.Map.Map.NearestLinedefRange(mousemappos, BuilderPlug.Me.HighlightRange / renderer.Scale);
+				Sector s = null;
+
+				if(l != null) 
+				{
+					// Check on which side of the linedef the mouse is
+					float side = l.SideOfLine(mousemappos);
+					if(side > 0) 
+					{
+						// Is there a sidedef here?
+						if(l.Back != null) s = l.Back.Sector;
+					} 
+					else 
+					{
+						// Is there a sidedef here?
+						if(l.Front != null) s = l.Front.Sector;
+					}
+
+					if(s != null) 
+					{
+						if(s != highlighted) 
+						{
+							//toggle selected state
+							highlighted = s;
+							if(General.Interface.ShiftState ^ BuilderPlug.Me.AdditiveSelect)
+								SelectSector(highlighted, true, true);
+							else if(General.Interface.CtrlState)
+								SelectSector(highlighted, false, true);
+							else
+								SelectSector(highlighted, !highlighted.Selected, true);
+
+							// Update entire display
+							UpdateOverlaySurfaces();//mxd
+							General.Interface.RedrawDisplay();
+						}
+					} 
+					else if(highlighted != null) 
+					{
+						Highlight(null);
+
+						// Update entire display
+						General.Interface.RedrawDisplay();
+					}
+
+					UpdateSelectionInfo(); //mxd
+				}
+			} 
+			else if(e.Button == MouseButtons.None) // Not holding any buttons?
+			{
+				// Find the nearest linedef within highlight range
+				Linedef l = General.Map.Map.NearestLinedef(mousemappos);
+				if(l != null)
+				{
+					// Check on which side of the linedef the mouse is
+					float side = l.SideOfLine(mousemappos);
+					if(side > 0)
+					{
+						// Is there a sidedef here?
+						if(l.Back != null)
+						{
+							// Highlight if not the same
+							if(l.Back.Sector != highlighted) Highlight(l.Back.Sector);
+						}
+						else
+						{
+							// Highlight nothing
+							if(highlighted != null) Highlight(null);
+						}
+					}
+					else
+					{
+						// Is there a sidedef here?
+						if(l.Front != null)
+						{
+							// Highlight if not the same
+							if(l.Front.Sector != highlighted) Highlight(l.Front.Sector);
+						}
+						else
+						{
+							// Highlight nothing
+							if(highlighted != null) Highlight(null);
+						}
+					}
+				}
+				else
+				{
+					// Highlight nothing
+					if(highlighted != null) Highlight(null);
+				}
+
+				//mxd. Show tooltip?
+				if(General.Map.UDMF && General.Settings.RenderComments && mouselastpos != mousepos && highlighted != null && !highlighted.IsDisposed && highlighted.Fields.ContainsKey("comment"))
+				{
+					string comment = highlighted.Fields.GetValue("comment", string.Empty);
+					if(comment.Length > 2)
+					{
+						string type = comment.Substring(0, 3);
+						int index = Array.IndexOf(CommentType.Types, type);
+						if(index > 0) comment = comment.TrimStart(type.ToCharArray());
+					}
+					General.Interface.Display.ShowToolTip("Comment:", comment, (int)(mousepos.x + 32 * MainForm.DPIScaler.Width), (int)(mousepos.y + 8 * MainForm.DPIScaler.Height));
+				}
+			} 
+		}
+
+		// Mouse leaves
+		public override void OnMouseLeave(EventArgs e)
+		{
+			base.OnMouseLeave(e);
+
+			// Highlight nothing
+			Highlight(null);
+		}
+
+		//mxd
+		protected override void OnPaintSelectBegin() 
+		{
+			if(highlighted != null) 
+			{
+				if(General.Interface.ShiftState ^ BuilderPlug.Me.AdditiveSelect)
+					SelectSector(highlighted, true, true);
+				else if(General.Interface.CtrlState)
+					SelectSector(highlighted, false, true);
+				else
+					SelectSector(highlighted, !highlighted.Selected, true);
+
+				// Update entire display
+				UpdateOverlaySurfaces();//mxd
+				General.Interface.RedrawDisplay();
+			}
+
+			base.OnPaintSelectBegin();
+		}
+
+		// Mouse wants to drag
+		protected override void OnDragStart(MouseEventArgs e)
+		{
+			base.OnDragStart(e);
+
+			// Edit button used?
+			if(General.Actions.CheckActionActive(null, "classicedit"))
+			{
+				// Anything highlighted?
+				if((highlighted != null) && !highlighted.IsDisposed)
+				{
+					// Highlighted item not selected?
+					if(!highlighted.Selected)
+					{
+						// Select only this sector for dragging
+						General.Map.Map.ClearSelectedSectors();
+						SelectSector(highlighted, true, true);
+						UpdateOverlaySurfaces(); //mxd
+					}
+
+					// Start dragging the selection
+					if(!BuilderPlug.Me.DontMoveGeometryOutsideMapBoundary || CanDrag()) //mxd
+						General.Editing.ChangeMode(new DragSectorsMode(mousedownmappos));
+				}
+			}
+		}
+
+		//mxd. Check if any selected sector is outside of map boundary
+		private bool CanDrag() 
+		{
+			ICollection<Sector> selectedsectors = General.Map.Map.GetSelectedSectors(true);
+			int unaffectedCount = 0;
+
+			foreach(Sector s in selectedsectors) 
+			{
+				// Make sure the sector is inside the map boundary
+				foreach(Sidedef sd in s.Sidedefs) 
+				{
+					if(sd.Line.Start.Position.x < General.Map.Config.LeftBoundary || sd.Line.Start.Position.x > General.Map.Config.RightBoundary
+						|| sd.Line.Start.Position.y > General.Map.Config.TopBoundary || sd.Line.Start.Position.y < General.Map.Config.BottomBoundary
+						|| sd.Line.End.Position.x < General.Map.Config.LeftBoundary || sd.Line.End.Position.x > General.Map.Config.RightBoundary
+						|| sd.Line.End.Position.y > General.Map.Config.TopBoundary || sd.Line.End.Position.y < General.Map.Config.BottomBoundary) 
+					{
+						SelectSector(s, false, false);
+						unaffectedCount++;
+						break;
+					}
+				}
+			}
+
+			if(unaffectedCount == selectedsectors.Count) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "Unable to drag selection: " + (selectedsectors.Count == 1 ? "selected sector is" : "all of selected sectors are") + " outside of map boundary!");
+				General.Interface.RedrawDisplay();
+				return false;
+			}
+
+			if(unaffectedCount > 0)
+				General.Interface.DisplayStatus(StatusType.Warning, unaffectedCount + " of selected sectors " + (unaffectedCount == 1 ? "is" : "are") + " outside of map boundary!");
+
+			UpdateSelectedLabels(); //mxd
+			return true;
+		}
+
+		// This is called wheh selection ends
+		protected override void OnEndMultiSelection()
+		{
+			bool selectionvolume = ((Math.Abs(base.selectionrect.Width) > 0.1f) && (Math.Abs(base.selectionrect.Height) > 0.1f));
+
+			if(selectionvolume)
+			{
+				List<Line2D> selectionOutline = new List<Line2D> {
+					new Line2D(selectionrect.Left, selectionrect.Top, selectionrect.Right, selectionrect.Top),
+					new Line2D(selectionrect.Right, selectionrect.Top, selectionrect.Right, selectionrect.Bottom),
+					new Line2D(selectionrect.Left, selectionrect.Bottom, selectionrect.Right, selectionrect.Bottom),
+					new Line2D(selectionrect.Left, selectionrect.Bottom, selectionrect.Left, selectionrect.Top)
+				};
+				
+				//mxd. (de)select sectors
+				switch(marqueSelectionMode) 
+				{
+					case MarqueSelectionMode.SELECT:
+						foreach(Sector s in General.Map.Map.Sectors)
+						{
+							bool select = IsInSelectionRect(s, selectionOutline);
+							if(select && !s.Selected) SelectSector(s, true, false);
+							else if(!select && s.Selected) SelectSector(s, false, false);
+						}
+						break;
+
+					case MarqueSelectionMode.ADD:
+						foreach(Sector s in General.Map.Map.Sectors) 
+						{
+							if(!s.Selected && IsInSelectionRect(s, selectionOutline))
+								SelectSector(s, true, false);
+						}
+						break;
+
+					case MarqueSelectionMode.SUBTRACT:
+						foreach(Sector s in General.Map.Map.Sectors) 
+						{
+							if(!s.Selected) continue;
+							if(IsInSelectionRect(s, selectionOutline))
+								SelectSector(s, false, false);
+						}
+						break;
+
+					default: //should be Intersect
+						foreach(Sector s in General.Map.Map.Sectors) 
+						{
+							if(!s.Selected) continue;
+							if(!IsInSelectionRect(s, selectionOutline))
+								SelectSector(s, false, false);
+						}
+						break;
+				}
+
+				// Make sure all linedefs reflect selected sectors
+				foreach(Sidedef sd in General.Map.Map.Sidedefs)
+					sd.Line.Selected = sd.Sector.Selected || (sd.Other != null && sd.Other.Sector.Selected);
+
+				//mxd. Clear labels for unselected sectors
+				if(marqueSelectionMode != MarqueSelectionMode.ADD) 
+				{
+					ICollection<Sector> orderedselection = General.Map.Map.GetSelectedSectors(false);
+					foreach(Sector s in orderedselection)
+					{
+						TextLabel[] labelarray = labels[s];
+						foreach(TextLabel l in labelarray) l.Text = "";
+					}
+				}
+
+				UpdateSelectedLabels(); //mxd
+				UpdateSelectionInfo(); //mxd
+				UpdateOverlaySurfaces(); //mxd
+			}
+			
+			base.OnEndMultiSelection();
+			if(renderer.StartOverlay(true)) renderer.Finish();
+			General.Interface.RedrawDisplay();
+		}
+
+		// This is called when the selection is updated
+		protected override void OnUpdateMultiSelection()
+		{
+			base.OnUpdateMultiSelection();
+
+			// Render selection
+			if(renderer.StartOverlay(true))
+			{
+				RenderMultiSelection();
+				renderer.Finish();
+				renderer.Present();
+			}
+		}
+
+		// When copying
+		public override bool OnCopyBegin()
+		{
+			// No selection made? But we have a highlight!
+			if((General.Map.Map.GetSelectedSectors(true).Count == 0) && (highlighted != null))
+			{
+				// Make the highlight the selection
+				SelectSector(highlighted, true, false);
+
+				//mxd. Actually, we want it marked, not selected
+				bool result = base.OnCopyBegin();
+				SelectSector(highlighted, false, false);
+				return result;
+			}
+
+			return base.OnCopyBegin();
+		}
+
+		// When undo is used
+		public override bool OnUndoBegin()
+		{
+			// Clear ordered selection
+			General.Map.Map.ClearAllSelected();
+
+			return base.OnUndoBegin();
+		}
+
+		// When undo is performed
+		public override void OnUndoEnd()
+		{
+			// Clear labels
+			SetupLabels();
+			UpdateEffectLabels(); //mxd
+			UpdateOverlaySurfaces(); //mxd
+			base.OnUndoEnd(); //mxd
+		}
+		
+		// When redo is used
+		public override bool OnRedoBegin()
+		{
+			// Clear ordered selection
+			General.Map.Map.ClearAllSelected();
+
+			return base.OnRedoBegin();
+		}
+
+		// When redo is performed
+		public override void OnRedoEnd()
+		{
+			// Clear labels
+			SetupLabels();
+			UpdateEffectLabels(); //mxd
+			UpdateOverlaySurfaces(); //mxd
+			base.OnRedoEnd(); //mxd
+		}
+
+		//mxd
+		private void RenderComment(Sector s)
+		{
+			if(s.Selected || !s.Fields.ContainsKey("comment")) return;
+
+			int iconindex = 0;
+			string comment = s.Fields.GetValue("comment", string.Empty);
+			if(comment.Length > 2)
+			{
+				string type = comment.Substring(0, 3);
+				int index = Array.IndexOf(CommentType.Types, type);
+				if(index != -1) iconindex = index;
+			}
+
+			if(s.Labels.Count > 0)
+				foreach(LabelPositionInfo info in s.Labels) RenderComment(s, info.position, iconindex);
+			else
+				RenderComment(s, new Vector2D(s.BBox.Left + s.BBox.Width / 2, s.BBox.Top + s.BBox.Height / 2), iconindex);
+		}
+
+		//mxd
+		private void RenderComment(Sector s, Vector2D center, int iconindex)
+		{
+			RectangleF rect = new RectangleF(center.x - 8 / renderer.Scale, center.y + 8 / renderer.Scale, 16 / renderer.Scale, -16 / renderer.Scale);
+			PixelColor c = (s == highlighted ? General.Colors.Highlight : PixelColor.FromColor(Color.White));
+			renderer.RenderRectangleFilled(rect, c, true, General.Map.Data.CommentTextures[iconindex]);
+		}
+		
+		#endregion
+
+		#region ================== Actions
+
+		// This copies the properties
+		[BeginAction("classiccopyproperties")]
+		public void CopyProperties()
+		{
+			// Determine source sectors
+			ICollection<Sector> sel = null;
+			if(General.Map.Map.SelectedSectorsCount > 0) sel = General.Map.Map.GetSelectedSectors(true);
+			else if(highlighted != null) sel = new List<Sector> { highlighted };
+			
+			if(sel != null)
+			{
+				// Copy properties from the first source sector
+				BuilderPlug.Me.CopiedSectorProps = new SectorProperties(General.GetByIndex(sel, 0));
+				General.Interface.DisplayStatus(StatusType.Action, "Copied sector properties.");
+			}
+			else
+			{
+				//mxd
+				General.Interface.DisplayStatus(StatusType.Warning, "This action requires highlight or selection!");
+			}
+		}
+
+		// This pastes the properties
+		[BeginAction("classicpasteproperties")]
+		public void PasteProperties()
+		{
+			if(BuilderPlug.Me.CopiedSectorProps != null)
+			{
+				// Determine target sectors
+				ICollection<Sector> sel = null;
+				if(General.Map.Map.SelectedSectorsCount > 0) sel = General.Map.Map.GetSelectedSectors(true);
+				else if(highlighted != null) sel = new List<Sector> { highlighted };
+				
+				if(sel != null)
+				{
+					// Apply properties to selection
+					string rest = (sel.Count == 1 ? "a single sector" : sel.Count + " sectors"); //mxd
+					General.Map.UndoRedo.CreateUndo("Paste properties to " + rest);
+					foreach(Sector s in sel)
+					{
+						BuilderPlug.Me.CopiedSectorProps.Apply(s, false);
+						s.UpdateCeilingSurface();
+						s.UpdateFloorSurface();
+					}
+					General.Interface.DisplayStatus(StatusType.Action, "Pasted properties to " + rest + ".");
+					
+					// Update and redraw
+					General.Map.IsChanged = true;
+					General.Interface.RefreshInfo();
+					General.Map.Renderer2D.UpdateExtraFloorFlag(); //mxd
+					UpdateEffectLabels(); //mxd
+					General.Interface.RedrawDisplay();
+				}
+				else
+				{
+					//mxd
+					General.Interface.DisplayStatus(StatusType.Warning, "This action requires highlight or selection!");
+				}
+			}
+			else
+			{
+				//mxd
+				General.Interface.DisplayStatus(StatusType.Warning, "Copy sector properties first!");
+			}
+		}
+
+		//mxd. This pastes the properties with options
+		[BeginAction("classicpastepropertieswithoptions")]
+		public void PastePropertiesWithOptions()
+		{
+			if(BuilderPlug.Me.CopiedSectorProps != null)
+			{
+				// Determine target sectors
+				ICollection<Sector> sel = null;
+				if(General.Map.Map.SelectedSectorsCount > 0) sel = General.Map.Map.GetSelectedSectors(true);
+				else if(highlighted != null) sel = new List<Sector> { highlighted };
+
+				if(sel != null)
+				{
+					PastePropertiesOptionsForm form = new PastePropertiesOptionsForm();
+					if(form.Setup(MapElementType.SECTOR) && form.ShowDialog(General.Interface) == DialogResult.OK)
+					{
+						// Apply properties to selection
+						string rest = (sel.Count == 1 ? "a single sector" : sel.Count + " sectors");
+						General.Map.UndoRedo.CreateUndo("Paste properties with options to " + rest);
+						foreach(Sector s in sel)
+						{
+							BuilderPlug.Me.CopiedSectorProps.Apply(s, true);
+							s.UpdateCeilingSurface();
+							s.UpdateFloorSurface();
+						}
+						General.Interface.DisplayStatus(StatusType.Action, "Pasted properties with options to " + rest + ".");
+
+						// Update and redraw
+						General.Map.IsChanged = true;
+						General.Interface.RefreshInfo();
+						General.Map.Renderer2D.UpdateExtraFloorFlag(); //mxd
+						UpdateEffectLabels(); //mxd
+						General.Interface.RedrawDisplay();
+					}
+				}
+				else
+				{
+					General.Interface.DisplayStatus(StatusType.Warning, "This action requires highlight or selection!");
+				}
+			}
+			else
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "Copy sector properties first!");
+			}
+		}
+
+		// This creates a new vertex at the mouse position
+		[BeginAction("insertitem", BaseAction = true)]
+		public void InsertVertexAction()
+		{
+			// Start drawing mode
+			DrawGeometryMode drawmode = new DrawGeometryMode();
+			if(mouseinside)
+			{
+				bool snaptogrid = General.Interface.ShiftState ^ General.Interface.SnapToGrid;
+				bool snaptonearest = General.Interface.CtrlState ^ General.Interface.AutoMerge;
+				DrawnVertex v = DrawGeometryMode.GetCurrentPosition(mousemappos, snaptonearest, snaptogrid, false, renderer, new List<DrawnVertex>());
+				drawmode.DrawPointAt(v);
+			}
+			General.Editing.ChangeMode(drawmode);
+		}
+
+		[BeginAction("makedoor")]
+		public void MakeDoor()
+		{
+			// Anything selected?
+			ICollection<Sector> orderedselection = General.Map.Map.GetSelectedSectors(true);
+			
+			//mxd. Should we use highlighted item?
+			if(orderedselection.Count == 0 && highlighted != null)
+			{
+				orderedselection.Add(highlighted);
+			}
+			
+			if(orderedselection.Count > 0)
+			{
+				string doortex = BuilderPlug.Me.MakeDoor.DoorTexture;
+				string tracktex = BuilderPlug.Me.MakeDoor.TrackTexture;
+				string ceiltex = BuilderPlug.Me.MakeDoor.CeilingTexture;
+				string floortex = null;
+				bool resetoffsets = BuilderPlug.Me.MakeDoor.ResetOffsets;
+
+				// Find floor texture
+				foreach(Sector s in orderedselection)
+				{
+					if(floortex == null) floortex = s.FloorTexture; else if(floortex != s.FloorTexture) floortex = "";
+				}
+				
+				// Show the dialog
+				MakeDoorForm form = new MakeDoorForm();
+				if(form.Show(General.Interface, doortex, tracktex, ceiltex, floortex, resetoffsets) == DialogResult.OK)
+				{
+					doortex = form.DoorTexture;
+					tracktex = form.TrackTexture;
+					ceiltex = form.CeilingTexture;
+					floortex = form.FloorTexture;
+					resetoffsets = form.ResetOffsets;
+
+					//mxd. Store new settings
+					BuilderPlug.Me.MakeDoor = new BuilderPlug.MakeDoorSettings(doortex, tracktex, ceiltex, resetoffsets);
+					
+					// Create undo
+					General.Map.UndoRedo.CreateUndo("Make door (" + doortex + ")");
+					General.Interface.DisplayStatus(StatusType.Action, "Created a " + doortex + " door.");
+					
+					// Go for all selected sectors
+					foreach(Sector s in orderedselection)
+					{
+						// Lower the ceiling down to the floor
+						s.CeilHeight = s.FloorHeight;
+
+						// Make a unique tag (not sure if we need it yet, depends on the args)
+						int tag = General.Map.Map.GetNewTag();
+
+						// Go for all it's sidedefs
+						foreach(Sidedef sd in s.Sidedefs)
+						{
+							// Singlesided?
+							if(sd.Other == null)
+							{
+								// Make this a doortrak
+								sd.SetTextureHigh("-");
+								if(!string.IsNullOrEmpty(tracktex)) sd.SetTextureMid(tracktex);
+								sd.SetTextureLow("-");
+
+								// Set upper/lower unpegged flags
+								sd.Line.SetFlag(General.Map.Config.UpperUnpeggedFlag, false);
+								sd.Line.SetFlag(General.Map.Config.LowerUnpeggedFlag, true);
+							}
+							else
+							{
+								// Set textures
+								if(!string.IsNullOrEmpty(floortex)) s.SetFloorTexture(floortex);
+								if(!string.IsNullOrEmpty(ceiltex)) s.SetCeilTexture(ceiltex);
+								if(!string.IsNullOrEmpty(doortex)) sd.Other.SetTextureHigh(doortex);
+
+								// Set upper/lower unpegged flags
+								sd.Line.SetFlag(General.Map.Config.UpperUnpeggedFlag, false);
+								sd.Line.SetFlag(General.Map.Config.LowerUnpeggedFlag, false);
+								
+								// Get door linedef type from config
+								sd.Line.Action = General.Map.Config.MakeDoorAction;
+
+								// Set activation type
+								sd.Line.Activate = General.Map.Config.MakeDoorActivate;
+
+								// Set the flags
+								foreach(var flagpair in General.Map.Config.MakeDoorFlags)
+									sd.Line.SetFlag(flagpair.Key, flagpair.Value);
+
+								// Set the linedef args
+								for(int i = 0; i < Linedef.NUM_ARGS; i++)
+								{
+									// A -1 arg indicates that the arg must be set to the new sector tag
+									// and only in this case we set the tag on the sector, because only
+									// then we know for sure that we need a tag.
+									if(General.Map.Config.MakeDoorArgs[i] == -1)
+									{
+										sd.Line.Args[i] = tag;
+										s.Tag = tag;
+									}
+									else
+									{
+										sd.Line.Args[i] = General.Map.Config.MakeDoorArgs[i];
+									}
+								}
+
+								// Make sure the line is facing outwards
+								if(sd.IsFront)
+								{
+									sd.Line.FlipVertices();
+									sd.Line.FlipSidedefs();
+								}
+							}
+
+							// Reset the texture offsets if required
+							if(resetoffsets)
+							{
+								sd.OffsetX = 0;
+								sd.OffsetY = 0;
+
+								if(sd.Other != null)
+								{
+									sd.Other.OffsetX = 0;
+									sd.Other.OffsetY = 0;
+								}
+							}
+						}
+					}
+					
+					// When a single sector was selected, deselect it now
+					if(orderedselection.Count == 1) ClearSelection(); //mxd
+
+					General.Map.Data.UpdateUsedTextures(); //mxd
+				}
+				
+				// Done
+				form.Dispose();
+				General.Interface.RedrawDisplay();
+			}
+			else //mxd
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "This action requires a highlight or selection!");
+			}
+		}
+		
+		[BeginAction("deleteitem", BaseAction = true)]
+		public void DeleteItem()
+		{
+			//mxd. Make list of selected things
+			List<Thing> selectedthings = (BuilderPlug.Me.SyncronizeThingEdit ? new List<Thing>(General.Map.Map.GetSelectedThings(true)) : new List<Thing>());
+			
+			// Make list of selected sectors
+			List<Sector> selectedsectors = new List<Sector>(General.Map.Map.GetSelectedSectors(true));
+			if((selectedsectors.Count == 0) && (highlighted != null) && !highlighted.IsDisposed)
+			{
+				selectedsectors.Add(highlighted);
+
+				//mxd. Add things?
+				if(BuilderPlug.Me.SyncronizeThingEdit)
+				{
+					foreach(Thing t in General.Map.Map.Things)
+					{
+						if(t.Sector == null) t.DetermineSector();
+						if(t.Sector == highlighted) selectedthings.Add(t);
+					}
+				}
+			}
+			if(selectedsectors.Count == 0 && selectedthings.Count == 0) return; //mxd
+
+			//mxd. Create undo info text
+			List<string> info = new List<string>();
+
+			//mxd. Create sectors info text
+			if(selectedsectors.Count > 1)
+				info.Add(selectedsectors.Count + " sectors");
+			else
+				info.Add("a sector");
+
+			//mxd. Create things info text
+			if(selectedthings.Count > 1)
+				info.Add(selectedthings.Count + " things");
+			else if(selectedthings.Count == 1)
+				info.Add("a thing");
+
+			//mxd. Make undo
+			string rest = string.Join(" and ", info.ToArray());
+			General.Map.UndoRedo.CreateUndo("Delete " + rest);
+			General.Interface.DisplayStatus(StatusType.Action, "Deleted " + rest + ".");
+
+			//mxd. Delete things
+			if(selectedthings.Count > 0)
+			{
+				DeleteThings(selectedthings);
+				General.Map.ThingsFilter.Update();
+			}
+
+			// Anything to do?
+			if(selectedsectors.Count > 0)
+			{
+				General.Map.Map.BeginAddRemove(); //mxd
+
+				// Dispose selected sectors
+				foreach(Sector s in selectedsectors)
+				{
+					//mxd. Get all the linedefs
+					List<Linedef> lines = new List<Linedef>(s.Sidedefs.Count);
+					foreach(Sidedef side in s.Sidedefs) lines.Add(side.Line);
+					
+					// Dispose the sector
+					s.Dispose();
+
+					// Check all the lines
+					for(int i = lines.Count - 1; i >= 0; i--)
+					{
+						// If the line has become orphaned, remove it
+						if((lines[i].Front == null) && (lines[i].Back == null))
+						{
+							// Remove line
+							lines[i].Dispose();
+						}
+						else
+						{
+							// If the line only has a back side left, flip the line and sides
+							if((lines[i].Front == null) && (lines[i].Back != null))
+							{
+								lines[i].FlipVertices();
+								lines[i].FlipSidedefs();
+							}
+
+							//mxd. Check textures.
+							if(lines[i].Front.MiddleRequired() && lines[i].Front.LongMiddleTexture == MapSet.EmptyLongName) 
+							{
+								if(lines[i].Front.LongHighTexture != MapSet.EmptyLongName) 
+								{
+									lines[i].Front.SetTextureMid(lines[i].Front.HighTexture);
+								} 
+								else if(lines[i].Front.LongLowTexture != MapSet.EmptyLongName) 
+								{
+									lines[i].Front.SetTextureMid(lines[i].Front.LowTexture);
+								}
+							}
+
+							//mxd. Do we still need high/low textures?
+							lines[i].Front.RemoveUnneededTextures(false);
+							
+							// Update sided flags
+							lines[i].ApplySidedFlags();
+						}
+					}
+				}
+
+				General.Map.Map.EndAddRemove(); //mxd
+			}
+
+			if(selectedthings.Count > 0 || selectedsectors.Count > 0)
+			{
+				// Update cache values
+				General.Map.IsChanged = true;
+				General.Map.Map.Update();
+				UpdateOverlaySurfaces(); //mxd
+				
+				// Make text labels for sectors
+				SetupLabels();
+				UpdateSelectedLabels();
+				
+				// Redraw screen
+				UpdateSelectionInfo(); //mxd
+				General.Map.Renderer2D.UpdateExtraFloorFlag(); //mxd
+				General.Interface.RedrawDisplay();
+			}
+		}
+
+		[BeginAction("dissolveitem", BaseAction = true)] //mxd
+		public void DissolveItem() 
+		{
+			//TODO handle this differently?..
+			DeleteItem();
+		}
+		
+		// This joins sectors together and keeps all lines
+		[BeginAction("joinsectors")]
+		public void JoinSectors()
+		{
+			// Worth our money?
+			ICollection<Sector> selected = General.Map.Map.GetSelectedSectors(true); //mxd
+			if(selected.Count > 1)
+			{
+				// Make undo
+				General.Map.UndoRedo.CreateUndo("Join " + selected.Count + " sectors");
+				General.Interface.DisplayStatus(StatusType.Action, "Joined " + selected.Count + " sectors.");
+
+				//mxd. Things may require updating
+				List<Thing> affectedthings = new List<Thing>();
+				foreach(Thing t in General.Map.Map.Things)
+					if(t.Sector != null && selected.Contains(t.Sector)) affectedthings.Add(t);
+					
+				// Merge
+				JoinMergeSectors(false);
+
+				//mxd. Things may require updating
+				foreach(Thing t in affectedthings) t.DetermineSector();
+
+				// Map was changed
+				General.Map.IsChanged = true;
+
+				//mxd. Clear selection info
+				General.Interface.DisplayStatus(StatusType.Selection, string.Empty);
+
+				//mxd. Update
+				UpdateOverlaySurfaces();
+				UpdateEffectLabels();
+				General.Map.Renderer2D.UpdateExtraFloorFlag();
+
+				// Redraw display
+				General.Interface.RedrawDisplay();
+			}
+		}
+
+		// This joins sectors together and removes the lines in between
+		[BeginAction("mergesectors")]
+		public void MergeSectors()
+		{
+			// Worth our money?
+			ICollection<Sector> selected = General.Map.Map.GetSelectedSectors(true); //mxd
+			if(selected.Count > 1)
+			{
+				// Make undo
+				General.Map.UndoRedo.CreateUndo("Merge " + selected.Count + " sectors");
+				General.Interface.DisplayStatus(StatusType.Action, "Merged " + selected.Count + " sectors.");
+
+				//mxd. Things may require updating
+				List<Thing> affectedthings = new List<Thing>();
+				foreach(Thing t in General.Map.Map.Things)
+					if(t.Sector != null && selected.Contains(t.Sector)) affectedthings.Add(t);
+
+				// Merge
+				JoinMergeSectors(true);
+
+				//mxd. Things may require updating
+				foreach(Thing t in affectedthings) t.DetermineSector();
+
+				// Map was changed
+				General.Map.IsChanged = true;
+
+				//mxd. Clear selection info
+				General.Interface.DisplayStatus(StatusType.Selection, string.Empty);
+				
+				//mxd. Update
+				UpdateOverlaySurfaces();
+				UpdateEffectLabels();
+				General.Map.Renderer2D.UpdateExtraFloorFlag();
+
+				// Redraw display
+				General.Interface.RedrawDisplay();
+			}
+		}
+
+		// Make gradient brightness
+		[BeginAction("gradientbrightness")]
+		public void MakeGradientBrightness()
+		{
+			// Need at least 3 selected sectors
+			// The first and last are not modified
+			ICollection<Sector> orderedselection = General.Map.Map.GetSelectedSectors(true);
+			if(orderedselection.Count > 2) 
+			{
+				General.Interface.DisplayStatus(StatusType.Action, "Created gradient brightness over selected sectors.");
+				General.Map.UndoRedo.CreateUndo("Gradient brightness");
+
+				//mxd
+				Sector start = General.GetByIndex(orderedselection, 0);
+				Sector end = General.GetByIndex(orderedselection, orderedselection.Count - 1);
+
+				//mxd. Use UDMF light?
+				string mode = (string)BuilderPlug.Me.MenusForm.GradientModeMenu.SelectedItem;
+				InterpolationTools.Mode interpolationmode = (InterpolationTools.Mode) BuilderPlug.Me.MenusForm.GradientInterpolationMenu.SelectedIndex;
+				if(General.Map.UDMF && mode != MenusForm.BrightnessGradientModes.Sectors) 
+				{
+					if(mode == MenusForm.BrightnessGradientModes.Ceilings || mode == MenusForm.BrightnessGradientModes.Floors) 
+					{
+						string lightKey;
+						string lightAbsKey;
+						int startbrightness, endbrightness;
+
+						if(mode == MenusForm.BrightnessGradientModes.Ceilings) 
+						{
+							lightKey = "lightceiling";
+							lightAbsKey = "lightceilingabsolute";
+						}
+						else //should be floors...
+						{
+							lightKey = "lightfloor";
+							lightAbsKey = "lightfloorabsolute";
+						}
+
+						//get total brightness of start sector
+						if(start.Fields.GetValue(lightAbsKey, false))
+							startbrightness = start.Fields.GetValue(lightKey, 0);
+						else
+							startbrightness = Math.Min(255, Math.Max(0, start.Brightness + start.Fields.GetValue(lightKey, 0)));
+
+						//get total brightness of end sector
+						if(end.Fields.GetValue(lightAbsKey, false))
+							endbrightness = end.Fields.GetValue(lightKey, 0);
+						else
+							endbrightness = Math.Min(255, Math.Max(0, end.Brightness + end.Fields.GetValue(lightKey, 0)));
+
+						// Go for all sectors in between first and last
+						int index = 0;
+						foreach(Sector s in orderedselection) 
+						{
+							s.Fields.BeforeFieldsChange();
+							float u = index / (float) (orderedselection.Count - 1);
+							float b = InterpolationTools.Interpolate(startbrightness, endbrightness, u, interpolationmode);
+
+							//absolute flag set?
+							if(s.Fields.GetValue(lightAbsKey, false)) 
+							{
+								if(s.Fields.ContainsKey(lightKey))
+									s.Fields[lightKey].Value = (int) b;
+								else
+									s.Fields.Add(lightKey, new UniValue(UniversalType.Integer, (int) b));
+							}
+							else 
+							{
+								UniFields.SetInteger(s.Fields, lightKey, (int) b - s.Brightness, 0);
+							}
+
+							s.UpdateNeeded = true;
+							index++;
+						}
+					} 
+					else if(mode == MenusForm.BrightnessGradientModes.Fade) 
+					{
+						ApplyColorGradient(orderedselection, start, end, interpolationmode, "fadecolor", 0);
+					} 
+					else if(mode == MenusForm.BrightnessGradientModes.Light) 
+					{
+						ApplyColorGradient(orderedselection, start, end, interpolationmode, "lightcolor", 0xFFFFFF);
+					} 
+					else if(mode == MenusForm.BrightnessGradientModes.LightAndFade) 
+					{
+						ApplyColorGradient(orderedselection, start, end, interpolationmode, "fadecolor", 0);
+						ApplyColorGradient(orderedselection, start, end, interpolationmode, "lightcolor", 0xFFFFFF);
+					}
+				}
+				else 
+				{
+					// Go for all sectors in between first and last
+					int index = 0;
+					foreach(Sector s in orderedselection) 
+					{
+						float u = index / (float)(orderedselection.Count - 1);
+						s.Brightness = InterpolationTools.Interpolate(start.Brightness, end.Brightness, u, interpolationmode); //mxd
+						index++;
+					}
+				}
+
+				// Update
+				General.Map.Map.Update();
+				General.Interface.RedrawDisplay();
+				General.Interface.RefreshInfo();
+				General.Map.IsChanged = true;
+			} 
+			else 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "Select at least 3 sectors first!");
+			}
+		}
+
+		//mxd
+		private static void ApplyColorGradient(ICollection<Sector> orderedselection, Sector start, Sector end, InterpolationTools.Mode interpolationmode, string key, int defaultvalue) 
+		{
+			if(!start.Fields.ContainsKey(key) && !end.Fields.ContainsKey(key)) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "First or last selected sector must have the '" + key + "' property!");
+			} 
+			else 
+			{
+				Color startColor, endColor;
+				if(key == "fadecolor")
+				{
+					startColor = Tools.GetSectorFadeColor(start);
+					endColor = Tools.GetSectorFadeColor(end);
+				}
+				else
+				{
+					startColor = PixelColor.FromInt(start.Fields.GetValue(key, defaultvalue)).ToColor();
+					endColor = PixelColor.FromInt(end.Fields.GetValue(key, defaultvalue)).ToColor();
+				}
+
+				// Go for all sectors in between first and last
+				int index = 0;
+				foreach(Sector s in orderedselection) 
+				{
+					if(index > 0 && index < orderedselection.Count - 1)
+					{
+						s.Fields.BeforeFieldsChange();
+						float u = index / (float) (orderedselection.Count - 1);
+						Color c = Color.FromArgb(0, General.Clamp(InterpolationTools.Interpolate(startColor.R, endColor.R, u, interpolationmode), 0, 255),
+						                         General.Clamp(InterpolationTools.Interpolate(startColor.G, endColor.G, u, interpolationmode), 0, 255),
+						                         General.Clamp(InterpolationTools.Interpolate(startColor.B, endColor.B, u, interpolationmode), 0, 255));
+
+						UniFields.SetInteger(s.Fields, key, c.ToArgb(), defaultvalue);
+						s.UpdateNeeded = true;
+					}
+					index++;
+				}
+			}
+		}
+
+		// Make gradient floors
+		[BeginAction("gradientfloors")]
+		public void MakeGradientFloors()
+		{
+			// Need at least 3 selected sectors
+			// The first and last are not modified
+			ICollection<Sector> orderedselection = General.Map.Map.GetSelectedSectors(true);
+			if(orderedselection.Count > 2) 
+			{
+				General.Interface.DisplayStatus(StatusType.Action, "Created gradient floor heights over selected sectors.");
+				General.Map.UndoRedo.CreateUndo("Gradient floor heights");
+
+				int startlevel = General.GetByIndex(orderedselection, 0).FloorHeight;
+				int endlevel = General.GetByIndex(orderedselection, orderedselection.Count - 1).FloorHeight;
+				InterpolationTools.Mode interpolationmode = (InterpolationTools.Mode)BuilderPlug.Me.MenusForm.GradientInterpolationMenu.SelectedIndex; //mxd
+
+				// Go for all sectors in between first and last
+				int index = 0;
+				foreach(Sector s in orderedselection) 
+				{
+					float u = index / (float)(orderedselection.Count - 1);
+					s.FloorHeight = InterpolationTools.Interpolate(startlevel, endlevel, u, interpolationmode); //mxd
+					index++;
+				}
+
+				// Update
+				General.Interface.RefreshInfo();
+				General.Map.IsChanged = true;
+			} 
+			else 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "Select at least 3 sectors first!");
+			}
+		}
+
+		// Make gradient ceilings
+		[BeginAction("gradientceilings")]
+		public void MakeGradientCeilings()
+		{
+			// Need at least 3 selected sectors
+			// The first and last are not modified
+			ICollection<Sector> orderedselection = General.Map.Map.GetSelectedSectors(true);
+			if(orderedselection.Count > 2) 
+			{
+				General.Interface.DisplayStatus(StatusType.Action, "Created gradient ceiling heights over selected sectors.");
+				General.Map.UndoRedo.CreateUndo("Gradient ceiling heights");
+
+				int startlevel = General.GetByIndex(orderedselection, 0).CeilHeight;
+				int endlevel = General.GetByIndex(orderedselection, orderedselection.Count - 1).CeilHeight;
+				InterpolationTools.Mode interpolationmode = (InterpolationTools.Mode)BuilderPlug.Me.MenusForm.GradientInterpolationMenu.SelectedIndex; //mxd
+
+				// Go for all sectors in between first and last
+				int index = 0;
+				foreach(Sector s in orderedselection) 
+				{
+					float u = (float)index / (orderedselection.Count - 1);
+					s.CeilHeight = InterpolationTools.Interpolate(startlevel, endlevel, u, interpolationmode);
+					index++;
+				}
+
+				// Update
+				General.Interface.RefreshInfo();
+				General.Map.IsChanged = true;
+			} 
+			else 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "Select at least 3 sectors first!");
+			}
+		}
+
+		// Change heights
+		[BeginAction("lowerfloor8")]
+		public void LowerFloors8() 
+		{
+			// Get selection
+			ICollection<Sector> selected = General.Map.Map.GetSelectedSectors(true);
+			if(selected.Count == 0 && highlighted != null && !highlighted.IsDisposed)
+				selected.Add(highlighted);
+
+			if(selected.Count == 0) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "This action requires a selection!");
+				return;
+			}
+
+			// Make undo
+			General.Interface.DisplayStatus(StatusType.Action, "Lowered floor heights by 8mp.");
+			General.Map.UndoRedo.CreateUndo("Floor heights change", this, UndoGroup.FloorHeightChange, CreateSelectionCRC(selected));
+
+			// Change heights
+			foreach(Sector s in selected) s.FloorHeight -= 8;
+
+			// Update
+			General.Interface.RefreshInfo();
+			General.Map.IsChanged = true;
+		}
+
+		// Change heights
+		[BeginAction("raisefloor8")]
+		public void RaiseFloors8() 
+		{
+			// Get selection
+			ICollection<Sector> selected = General.Map.Map.GetSelectedSectors(true);
+			if(selected.Count == 0 && highlighted != null && !highlighted.IsDisposed)
+				selected.Add(highlighted);
+
+			if(selected.Count == 0) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "This action requires a selection!");
+				return;
+			}
+
+			// Make undo
+			General.Interface.DisplayStatus(StatusType.Action, "Raised floor heights by 8mp.");
+			General.Map.UndoRedo.CreateUndo("Floor heights change", this, UndoGroup.FloorHeightChange, CreateSelectionCRC(selected));
+
+			// Change heights
+			foreach(Sector s in selected) s.FloorHeight += 8;
+
+			// Update
+			General.Interface.RefreshInfo();
+			General.Map.IsChanged = true;
+		}
+
+		// Change heights
+		[BeginAction("lowerceiling8")]
+		public void LowerCeilings8() 
+		{
+			// Get selection
+			ICollection<Sector> selected = General.Map.Map.GetSelectedSectors(true);
+			if((selected.Count == 0) && (highlighted != null) && !highlighted.IsDisposed)
+				selected.Add(highlighted);
+
+			if(selected.Count == 0) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "This action requires a selection!");
+				return;
+			}
+
+			// Make undo
+			General.Interface.DisplayStatus(StatusType.Action, "Lowered ceiling heights by 8mp.");
+			General.Map.UndoRedo.CreateUndo("Ceiling heights change", this, UndoGroup.CeilingHeightChange, CreateSelectionCRC(selected));
+
+			// Change heights
+			foreach(Sector s in selected) s.CeilHeight -= 8;
+
+			// Update
+			General.Interface.RefreshInfo();
+			General.Map.IsChanged = true;
+		}
+
+		// Change heights
+		[BeginAction("raiseceiling8")]
+		public void RaiseCeilings8() 
+		{
+			// Get selection
+			ICollection<Sector> selected = General.Map.Map.GetSelectedSectors(true);
+			if(selected.Count == 0 && highlighted != null && !highlighted.IsDisposed)
+				selected.Add(highlighted);
+
+			if(selected.Count == 0) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "This action requires a selection!");
+				return;
+			}
+
+			// Make undo
+			General.Interface.DisplayStatus(StatusType.Action, "Raised ceiling heights by 8mp.");
+			General.Map.UndoRedo.CreateUndo("Ceiling heights change", this, UndoGroup.CeilingHeightChange, CreateSelectionCRC(selected));
+
+			// Change heights
+			foreach(Sector s in selected) s.CeilHeight += 8;
+
+			// Update
+			General.Interface.RefreshInfo();
+			General.Map.IsChanged = true;
+		}
+
+		//mxd. Raise brightness
+		[BeginAction("raisebrightness8")]
+		public void RaiseBrightness8() 
+		{
+			// Get selection
+			ICollection<Sector> selected = General.Map.Map.GetSelectedSectors(true);
+			if((selected.Count == 0) && (highlighted != null) && !highlighted.IsDisposed) 
+				selected.Add(highlighted);
+
+			if(selected.Count == 0) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "This action requires a selection!");
+				return;
+			}
+
+			// Make undo
+			Sector first = General.GetByIndex(selected, 0); //mxd
+			int diff = General.Map.Config.BrightnessLevels.GetNextHigher(first.Brightness) - first.Brightness; //mxd
+			General.Interface.DisplayStatus(StatusType.Action, "Raised sector brightness by " + diff + ".");
+			General.Map.UndoRedo.CreateUndo("Sector brightness change", this, UndoGroup.SectorBrightnessChange, CreateSelectionCRC(selected));
+
+			// Change heights
+			foreach(Sector s in selected) 
+			{
+				s.Brightness = General.Map.Config.BrightnessLevels.GetNextHigher(s.Brightness);
+				s.UpdateNeeded = true;
+				s.UpdateCache();
+			}
+
+			// Update
+			General.Interface.RefreshInfo();
+			General.Map.IsChanged = true;
+
+			// Redraw
+			General.Interface.RedrawDisplay();
+		}
+
+		//mxd. Lower brightness
+		[BeginAction("lowerbrightness8")]
+		public void LowerBrightness8() 
+		{
+			// Get selection
+			ICollection<Sector> selected = General.Map.Map.GetSelectedSectors(true);
+			if(selected.Count == 0 && highlighted != null && !highlighted.IsDisposed)
+				selected.Add(highlighted);
+
+			if(selected.Count == 0) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "This action requires a selection!");
+				return;
+			}
+
+			// Make undo
+			Sector first = General.GetByIndex(selected, 0); //mxd
+			int diff = first.Brightness - General.Map.Config.BrightnessLevels.GetNextLower(first.Brightness); //mxd
+			General.Interface.DisplayStatus(StatusType.Action, "Lowered sector brightness by " + diff + ".");
+			General.Map.UndoRedo.CreateUndo("Sector brightness change", this, UndoGroup.SectorBrightnessChange, CreateSelectionCRC(selected));
+
+			// Change heights
+			foreach(Sector s in selected) 
+			{
+				s.Brightness = General.Map.Config.BrightnessLevels.GetNextLower(s.Brightness);
+				s.UpdateNeeded = true;
+				s.UpdateCache();
+			}
+
+			// Update
+			General.Interface.RefreshInfo();
+			General.Map.IsChanged = true;
+
+			// Redraw
+			General.Interface.RedrawDisplay();
+		}
+
+		// This clears the selection
+		[BeginAction("clearselection", BaseAction = true)]
+		public void ClearSelection()
+		{
+			// Clear selection
+			General.Map.Map.ClearAllSelected();
+
+			//mxd. Clear selection info
+			General.Interface.DisplayStatus(StatusType.Selection, string.Empty); 
+
+			// Clear labels
+			foreach(TextLabel[] labelarray in labels.Values)
+				foreach(TextLabel l in labelarray) l.Text = "";
+			UpdateOverlaySurfaces(); //mxd
+			UpdateEffectLabels(); //mxd
+			
+			// Redraw
+			General.Interface.RedrawDisplay();
+		}
+
+		[BeginAction("placethings")] //mxd
+		public void PlaceThings() 
+		{
+			// Make list of selected sectors
+			ICollection<Sector> sectors = General.Map.Map.GetSelectedSectors(true);
+			List<Vector2D> positions = new List<Vector2D>();
+			
+			if(sectors.Count == 0) 
+			{
+				if(highlighted != null && !highlighted.IsDisposed) 
+				{
+					sectors.Add(highlighted);
+				} 
+				else 
+				{
+					General.Interface.DisplayStatus(StatusType.Warning, "This action requires selection of some description!");
+					return;
+				}
+			}
+
+			// Make list of suitable positions
+			foreach(Sector s in sectors) 
+			{
+				Vector2D pos = (s.Labels.Count > 0 ? s.Labels[0].position : new Vector2D(s.BBox.X + s.BBox.Width / 2, s.BBox.Y + s.BBox.Height / 2));
+				if(!positions.Contains(pos)) positions.Add(pos);
+			}
+
+			if(positions.Count < 1) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "Unable to get vertex positions from selection!");
+				return;
+			}
+
+			PlaceThingsAtPositions(positions);
+		}
+
+		//mxd. rotate clockwise
+		[BeginAction("rotateclockwise")]
+		public void RotateCW() 
+		{
+			RotateTextures(5);
+		}
+
+		//mxd. rotate counterclockwise
+		[BeginAction("rotatecounterclockwise")]
+		public void RotateCCW() 
+		{
+			RotateTextures(-5);
+		}
+
+		//mxd
+		private void RotateTextures(float increment) 
+		{
+			if(!General.Map.UDMF) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "This action works only in UDMF map format!");
+				return;
+			}
+
+			// Make list of selected sectors
+			ICollection<Sector> sectors = General.Map.Map.GetSelectedSectors(true);
+
+			if(sectors.Count == 0 && highlighted != null && !highlighted.IsDisposed)
+				sectors.Add(highlighted);
+
+			if(sectors.Count == 0) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "This action requires a selection!");
+				return;
+			}
+
+			string targets;
+			string target;
+			switch(General.Map.Renderer2D.ViewMode) 
+			{
+				case ViewMode.FloorTextures:
+					target = " a floor";
+					targets = " floors";
+					break;
+
+				case ViewMode.CeilingTextures:
+					target = " a ceiling";
+					targets = " ceilings";
+					break;
+
+				default:
+					target = " a floor and a ceiling";
+					targets = " floors and ceilings";
+					break;
+			}
+
+			// Make undo
+			if(sectors.Count > 1) 
+			{
+				General.Map.UndoRedo.CreateUndo("Rotate " + sectors.Count + targets, this, UndoGroup.TextureRotationChange, CreateSelectionCRC(sectors));
+				General.Interface.DisplayStatus(StatusType.Action, "Rotated " + sectors.Count + targets + ".");
+			} 
+			else 
+			{
+				General.Map.UndoRedo.CreateUndo("Rotate" + target, this, UndoGroup.TextureRotationChange, CreateSelectionCRC(sectors));
+				General.Interface.DisplayStatus(StatusType.Action, "Rotated" + target + ".");
+			}
+
+			//rotate stuff
+			foreach(Sector s in sectors) 
+			{
+				s.Fields.BeforeFieldsChange();
+
+				//floor
+				if(General.Map.Renderer2D.ViewMode == ViewMode.FloorTextures || General.Map.Renderer2D.ViewMode != ViewMode.CeilingTextures)
+				{
+					UniFields.SetFloat(s.Fields, "rotationfloor", General.ClampAngle(UniFields.GetFloat(s.Fields, "rotationfloor") + increment));
+					s.UpdateNeeded = true;
+				}
+
+				//ceiling
+				if(General.Map.Renderer2D.ViewMode == ViewMode.CeilingTextures || General.Map.Renderer2D.ViewMode != ViewMode.FloorTextures) 
+				{
+					UniFields.SetFloat(s.Fields, "rotationceiling", General.ClampAngle(UniFields.GetFloat(s.Fields, "rotationceiling") + increment));
+					s.UpdateNeeded = true;
+				}
+			}
+
+			// Redraw screen
+			General.Map.Map.Update();
+			General.Interface.RedrawDisplay();
+			General.Interface.RefreshInfo();
+		}
+
+		//mxd
+		[BeginAction("selectsimilar")]
+		public void SelectSimilar() 
+		{
+			ICollection<Sector> selection = General.Map.Map.GetSelectedSectors(true);
+
+			if(selection.Count == 0) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "This action requires a selection!");
+				return;
+			}
+
+			var form = new SelectSimilarElementOptionsPanel();
+			if(form.Setup(this)) form.ShowDialog();
+		}
+		
+		//mxd
+		[BeginAction("fliplinedefs")]
+		public void FlipLinedefs() 
+		{
+			// Get selection
+			ICollection<Sector> selection = General.Map.Map.GetSelectedSectors(true);
+
+			if(selection.Count == 0 && highlighted != null && !highlighted.IsDisposed)
+				selection.Add(highlighted);
+
+			if(selection.Count == 0) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "This action requires a selection!");
+				return;
+			}
+
+			// Make undo
+			if(selection.Count > 1) 
+			{
+				General.Map.UndoRedo.CreateUndo("Flip linedefs of " + selection.Count + " sectors");
+				General.Interface.DisplayStatus(StatusType.Action, "Flipped linedefs of " + selection.Count + "sectors.");
+			} 
+			else 
+			{
+				General.Map.UndoRedo.CreateUndo("Flip sector linedefs");
+				General.Interface.DisplayStatus(StatusType.Action, "Flipped sector linedefs.");
+			}
+
+			// Flip lines
+			Tools.FlipSectorLinedefs(selection, false);
+			
+			// Redraw
+			General.Map.Map.Update();
+			General.Map.IsChanged = true;
+			General.Interface.RefreshInfo();
+			General.Interface.RedrawDisplay();
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ClassicModes/ThingsMode.cs b/Source/Plugins/BuilderModes/ClassicModes/ThingsMode.cs
new file mode 100644
index 0000000..9f6010e
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ClassicModes/ThingsMode.cs
@@ -0,0 +1,1244 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Actions;
+using CodeImp.DoomBuilder.BuilderModes.Interface;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Editing;
+using CodeImp.DoomBuilder.GZBuilder.Data;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.GZBuilder.Geometry;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Types;
+using CodeImp.DoomBuilder.Windows;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[EditMode(DisplayName = "Things Mode",
+			  SwitchAction = "thingsmode",		// Action name used to switch to this mode
+			  ButtonImage = "ThingsMode.png",	// Image resource name for the button
+			  ButtonOrder = int.MinValue + 300,	// Position of the button (lower is more to the left)
+			  ButtonGroup = "000_editing",
+			  UseByDefault = true,
+			  SafeStartMode = true)]
+
+	public class ThingsMode : BaseClassicMode
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		// Highlighted item
+		private Thing highlighted;
+		private readonly Association[] association = new Association[Thing.NUM_ARGS];
+		private readonly Association highlightasso = new Association();
+
+		// Interface
+		private bool editpressed;
+		private bool thinginserted;
+		private bool awaitingMouseClick; //mxd
+
+		//mxd. Event lines
+		private List<Line3D> persistenteventlines;
+
+		//mxd. Dynamic light shapes
+		private List<Line3D> dynamiclightshapes;
+		
+		#endregion
+
+		#region ================== Properties
+
+		public override object HighlightedObject { get { return highlighted; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		public ThingsMode()
+		{
+			//mxd. Associations now requre initializing...
+			for(int i = 0; i < association.Length; i++) association[i] = new Association();
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		//mxd. This makes a CRC for given selection
+		private static int CreateSelectionCRC(ICollection<Thing> selection) 
+		{
+			CRC crc = new CRC();
+			crc.Add(selection.Count);
+			foreach(Thing t in selection) crc.Add(t.Index);
+			return (int)(crc.Value & 0xFFFFFFFF);
+		}
+
+		public override void OnHelp()
+		{
+			General.ShowHelp("e_things.html");
+		}
+
+		// Cancel mode
+		public override void OnCancel()
+		{
+			base.OnCancel();
+
+			// Return to this mode
+			General.Editing.ChangeMode(new ThingsMode());
+		}
+
+		// Mode engages
+		public override void OnEngage()
+		{
+			base.OnEngage();
+			renderer.SetPresentation(Presentation.Things);
+
+			// Add toolbar buttons
+			General.Interface.AddButton(BuilderPlug.Me.MenusForm.CopyProperties);
+			General.Interface.AddButton(BuilderPlug.Me.MenusForm.PasteProperties);
+			General.Interface.AddButton(BuilderPlug.Me.MenusForm.PastePropertiesOptions); //mxd
+			General.Interface.AddButton(BuilderPlug.Me.MenusForm.SeparatorCopyPaste); //mxd
+			General.Interface.AddButton(BuilderPlug.Me.MenusForm.AlignThingsToWall); //mxd
+			
+			// Convert geometry selection to linedefs selection
+			General.Map.Map.ConvertSelection(SelectionType.Linedefs);
+			General.Map.Map.SelectionType = SelectionType.Things;
+			UpdateSelectionInfo(); //mxd
+			UpdateHelperObjects(); //mxd
+		}
+
+		// Mode disengages
+		public override void OnDisengage()
+		{
+			base.OnDisengage();
+
+			// Remove toolbar buttons
+			General.Interface.RemoveButton(BuilderPlug.Me.MenusForm.CopyProperties);
+			General.Interface.RemoveButton(BuilderPlug.Me.MenusForm.PasteProperties);
+			General.Interface.RemoveButton(BuilderPlug.Me.MenusForm.PastePropertiesOptions); //mxd
+			General.Interface.RemoveButton(BuilderPlug.Me.MenusForm.SeparatorCopyPaste); //mxd
+			General.Interface.RemoveButton(BuilderPlug.Me.MenusForm.AlignThingsToWall); //mxd
+			
+			//mxd. Do some highlight management...
+			if(highlighted != null) highlighted.Highlighted = false;
+
+			// Going to EditSelectionMode?
+			if(General.Editing.NewMode is EditSelectionMode)
+			{
+				// Not pasting anything?
+				EditSelectionMode editmode = (General.Editing.NewMode as EditSelectionMode);
+				if(!editmode.Pasting)
+				{
+					// No selection made? But we have a highlight!
+					if((General.Map.Map.GetSelectedThings(true).Count == 0) && (highlighted != null))
+					{
+						// Make the highlight the selection
+						highlighted.Selected = true;
+					}
+				}
+			} 
+
+			// Hide highlight info and tooltip
+			General.Interface.HideInfo();
+			General.Interface.Display.HideToolTip(); //mxd
+		}
+
+		// This redraws the display
+		public override void OnRedrawDisplay()
+		{
+			renderer.RedrawSurface();
+			List<Line3D> eventlines = new List<Line3D>(); //mxd
+
+			// Render lines and vertices
+			if(renderer.StartPlotter(true)) 
+			{
+				renderer.PlotLinedefSet(General.Map.Map.Linedefs);
+				renderer.PlotVerticesSet(General.Map.Map.Vertices);
+
+				for(int i = 0; i < Thing.NUM_ARGS; i++) BuilderPlug.PlotAssociations(renderer, association[i], eventlines);
+				if((highlighted != null) && !highlighted.IsDisposed) BuilderPlug.PlotReverseAssociations(renderer, highlightasso, eventlines);
+				
+				renderer.Finish();
+			}
+
+			// Render things
+			if(renderer.StartThings(true))
+			{
+				renderer.RenderThingSet(General.Map.ThingsFilter.HiddenThings, Presentation.THINGS_HIDDEN_ALPHA);
+				renderer.RenderThingSet(General.Map.ThingsFilter.VisibleThings, Presentation.THINGS_ALPHA);
+				for(int i = 0; i < Thing.NUM_ARGS; i++) BuilderPlug.RenderAssociations(renderer, association[i], eventlines);
+				
+				if((highlighted != null) && !highlighted.IsDisposed)
+				{
+					renderer.RenderThing(highlighted, General.Colors.Highlight, Presentation.THINGS_ALPHA);
+					BuilderPlug.RenderReverseAssociations(renderer, highlightasso, eventlines); //mxd
+				}
+
+				//mxd. Event lines
+				if(General.Settings.GZShowEventLines) eventlines.AddRange(persistenteventlines);
+
+				//mxd. Dynamic light radii
+				if(!General.Map.DOOM && General.Settings.GZDrawLightsMode != LightRenderMode.NONE)
+					eventlines.AddRange(dynamiclightshapes);
+
+				//mxd
+				if(eventlines.Count > 0) renderer.RenderArrows(eventlines);
+
+				renderer.Finish();
+			}
+
+			// Selecting?
+			if(renderer.StartOverlay(true))
+			{
+				// Render selection
+				if(selecting) RenderMultiSelection();
+
+				//mxd. Render comments
+				if(General.Map.UDMF && General.Settings.RenderComments) foreach(Thing t in General.Map.Map.Things) RenderComment(t);
+
+				renderer.Finish();
+			}
+
+			renderer.Present();
+		}
+		
+		// This highlights a new item
+		private void Highlight(Thing t)
+		{
+			// Set highlight association
+			if(t != null && t.Tag != 0)
+				highlightasso.Set(t.Position, t.Tag, UniversalType.ThingTag);
+			else
+				highlightasso.Set(new Vector2D(), 0, 0);
+
+			if(highlighted != null) highlighted.Highlighted = false; //mxd
+
+			//mxd. Determine thing associations
+			bool clearassociations = true; //mxd
+			if(t != null)
+			{
+				t.Highlighted = true; //mxd
+				
+				// Check if we can find the linedefs action
+				if((t.Action > 0) && General.Map.Config.LinedefActions.ContainsKey(t.Action))
+				{
+					clearassociations = false;
+					LinedefActionInfo action = General.Map.Config.LinedefActions[t.Action];
+					for(int i = 0; i < Thing.NUM_ARGS; i++)
+						association[i].Set(t.Position, t.Args[i], action.Args[i].Type);
+				}
+				//mxd. Check if we can use thing arguments
+				else if(t.Action == 0)
+				{
+					ThingTypeInfo ti = General.Map.Data.GetThingInfoEx(t.Type);
+					if(ti != null)
+					{
+						clearassociations = false;
+						for(int i = 0; i < Thing.NUM_ARGS; i++)
+							association[i].Set(t.Position, t.Args[i], ti.Args[i].Type);
+					}
+				}
+			}
+
+			// mxd. Clear associations?
+			if(clearassociations)
+				for(int i = 0; i < Thing.NUM_ARGS; i++) association[i].Set(new Vector2D(), 0, 0);
+			
+			// Set new highlight and redraw display
+			highlighted = t;
+			General.Interface.RedrawDisplay();
+			
+			// Show highlight info
+			if((highlighted != null) && !highlighted.IsDisposed)
+			{
+				General.Interface.ShowThingInfo(highlighted);
+			}
+			else
+			{
+				General.Interface.Display.HideToolTip(); //mxd
+				General.Interface.HideInfo();
+			}
+		}
+
+		// Selection
+		protected override void OnSelectBegin()
+		{
+			//mxd. Yep, it's kinda hackish...
+			if(awaitingMouseClick) 
+			{
+				awaitingMouseClick = false;
+				ThingPointAtCursor();
+				return;
+			}
+			
+			// Item highlighted?
+			if((highlighted != null) && !highlighted.IsDisposed)
+			{
+				// Update display
+				if(renderer.StartThings(false))
+				{
+					// Redraw highlight to show selection
+					renderer.RenderThing(highlighted, renderer.DetermineThingColor(highlighted), Presentation.THINGS_ALPHA);
+					renderer.Finish();
+					renderer.Present();
+				}
+			}
+
+			base.OnSelectBegin();
+		}
+
+		// End selection
+		protected override void OnSelectEnd()
+		{
+			// Not ending from a multi-selection?
+			if(!selecting)
+			{
+				// Item highlighted?
+				if((highlighted != null) && !highlighted.IsDisposed)
+				{
+					//mxd. Flip selection
+					highlighted.Selected = !highlighted.Selected;
+					
+					// Update display
+					if(renderer.StartThings(false))
+					{
+						// Render highlighted item
+						renderer.RenderThing(highlighted, General.Colors.Highlight, Presentation.THINGS_ALPHA);
+						renderer.Finish();
+						renderer.Present();
+					}
+				
+				}
+				//mxd
+				else if(BuilderPlug.Me.AutoClearSelection && General.Map.Map.SelectedThingsCount > 0) 
+				{
+					General.Map.Map.ClearSelectedThings();
+					General.Interface.RedrawDisplay();
+				}
+
+				UpdateSelectionInfo(); //mxd
+			}
+
+			base.OnSelectEnd();
+		}
+
+		// Start editing
+		protected override void OnEditBegin()
+		{
+			thinginserted = false;
+			
+			// Item highlighted?
+			if((highlighted != null) && !highlighted.IsDisposed)
+			{
+				// Edit pressed in this mode
+				editpressed = true;
+				
+				// Highlighted item not selected?
+				if(!highlighted.Selected && (BuilderPlug.Me.AutoClearSelection || (General.Map.Map.SelectedThingsCount == 0)))
+				{
+					// Make this the only selection
+					General.Map.Map.ClearSelectedThings();
+					highlighted.Selected = true;
+					General.Interface.RedrawDisplay();
+				}
+
+				// Update display
+				if(renderer.StartThings(false))
+				{
+					// Redraw highlight to show selection
+					renderer.RenderThing(highlighted, renderer.DetermineThingColor(highlighted), Presentation.THINGS_ALPHA);
+					renderer.Finish();
+					renderer.Present();
+				}
+			}
+			else if(mouseinside && !selecting && BuilderPlug.Me.AutoDrawOnEdit) //mxd. We don't want to insert a thing when multiselecting
+			{
+				// Edit pressed in this mode
+				editpressed = true;
+				thinginserted = true;
+
+				// Insert a new item and select it for dragging
+				General.Map.UndoRedo.CreateUndo("Insert thing");
+				Thing t = InsertThing(mousemappos);
+
+				if(t == null) 
+				{
+					General.Map.UndoRedo.WithdrawUndo();
+				} 
+				else 
+				{
+					General.Map.Map.ClearSelectedThings();
+					t.Selected = true;
+					Highlight(t);
+					General.Interface.RedrawDisplay();
+				}
+			}
+
+			base.OnEditBegin();
+		}
+
+		// Done editing
+		protected override void OnEditEnd()
+		{
+			// Edit pressed in this mode?
+			if(editpressed)
+			{
+				// Anything selected?
+				ICollection<Thing> selected = General.Map.Map.GetSelectedThings(true);
+				if(selected.Count > 0)
+				{
+					if(General.Interface.IsActiveWindow)
+					{
+						// Edit only when preferred
+						if(!thinginserted || BuilderPlug.Me.EditNewThing)
+						{
+							//mxd. Show realtime thing edit dialog
+							General.Interface.OnEditFormValuesChanged += thingEditForm_OnValuesChanged;
+							DialogResult result = General.Interface.ShowEditThings(selected);
+							General.Interface.OnEditFormValuesChanged -= thingEditForm_OnValuesChanged;
+
+							// When a single thing was selected, deselect it now
+							if(selected.Count == 1) 
+							{
+								General.Map.Map.ClearSelectedThings();
+							} 
+							else if(result == DialogResult.Cancel) //mxd. Restore selection...
+							{ 
+								foreach(Thing t in selected) t.Selected = true;
+							}
+
+							//mxd. Update helper lines
+							UpdateHelperObjects();
+
+							// Update display
+							General.Interface.RedrawDisplay();
+						}
+					}
+				}
+
+				//mxd. Update selection info
+				UpdateSelectionInfo();
+			}
+
+			editpressed = false;
+			base.OnEditEnd();
+		}
+
+		//mxd
+		public override void OnUndoEnd()
+		{
+			base.OnUndoEnd();
+
+			//mxd. Update helper lines
+			UpdateHelperObjects();
+		}
+
+		//mxd
+		public override void OnRedoEnd()
+		{
+			base.OnRedoEnd();
+
+			//mxd. Update helper lines
+			UpdateHelperObjects();
+		}
+
+		//mxd. Otherwise event lines won't be drawn after panning finishes.
+		protected override void EndViewPan()
+		{
+			base.EndViewPan();
+			if(General.Settings.GZShowEventLines) General.Interface.RedrawDisplay(); 
+		}
+
+		//mxd
+		private void thingEditForm_OnValuesChanged(object sender, EventArgs e) 
+		{
+			// Update things filter
+			General.Map.ThingsFilter.Update();
+
+			// Update entire display
+			General.Interface.RedrawDisplay();
+		}
+
+		// Mouse moves
+		public override void OnMouseMove(MouseEventArgs e)
+		{
+			base.OnMouseMove(e);
+			if(panning) return; //mxd. Skip all this jazz while panning
+
+			//mxd
+			if(selectpressed && !editpressed && !selecting) 
+			{
+				// Check if moved enough pixels for multiselect
+				Vector2D delta = mousedownpos - mousepos;
+				if((Math.Abs(delta.x) > MULTISELECT_START_MOVE_PIXELS) ||
+				   (Math.Abs(delta.y) > MULTISELECT_START_MOVE_PIXELS)) 
+				{
+					// Start multiselecting
+					StartMultiSelection();
+				}
+			}
+			else if(paintselectpressed && !editpressed && !selecting) //mxd. Drag-select
+			{
+				// Find the nearest thing within highlight range
+				Thing t = MapSet.NearestThingSquareRange(General.Map.ThingsFilter.VisibleThings, mousemappos, BuilderPlug.Me.HighlightThingsRange / renderer.Scale);
+
+				if(t != null) 
+				{
+					if(t != highlighted) 
+					{
+						//toggle selected state
+						if(General.Interface.ShiftState ^ BuilderPlug.Me.AdditiveSelect)
+							t.Selected = true;
+						else if(General.Interface.CtrlState)
+							t.Selected = false;
+						else
+							t.Selected = !t.Selected;
+						highlighted = t;
+
+						UpdateSelectionInfo(); //mxd
+
+						// Update entire display
+						General.Interface.RedrawDisplay();
+					}
+				} 
+				else if(highlighted != null) 
+				{
+					Highlight(null);
+					
+					// Update entire display
+					General.Interface.RedrawDisplay();
+				}
+			}
+			else if(e.Button == MouseButtons.None) // Not holding any buttons?
+			{
+				// Find the nearest thing within highlight range
+				Thing t = MapSet.NearestThingSquareRange(General.Map.ThingsFilter.VisibleThings, mousemappos, BuilderPlug.Me.HighlightThingsRange / renderer.Scale);
+
+				//mxd. Show tooltip?
+				if(General.Map.UDMF && General.Settings.RenderComments && mouselastpos != mousepos && highlighted != null && !highlighted.IsDisposed && highlighted.Fields.ContainsKey("comment"))
+				{
+					string comment = highlighted.Fields.GetValue("comment", string.Empty);
+					if(comment.Length > 2)
+					{
+						string type = comment.Substring(0, 3);
+						int index = Array.IndexOf(CommentType.Types, type);
+						if(index > 0) comment = comment.TrimStart(type.ToCharArray());
+					}
+					General.Interface.Display.ShowToolTip("Comment:", comment, (int)(mousepos.x + 32 * MainForm.DPIScaler.Width), (int)(mousepos.y + 8 * MainForm.DPIScaler.Height));
+				}
+
+				// Highlight if not the same
+				if(t != highlighted) Highlight(t);
+			} 
+		}
+
+		// Mouse leaves
+		public override void OnMouseLeave(EventArgs e)
+		{
+			base.OnMouseLeave(e);
+
+			// Highlight nothing
+			Highlight(null);
+		}
+
+		//mxd
+		protected override void OnPaintSelectBegin() 
+		{
+			// Highlight nothing
+			Highlight(null);
+
+			base.OnPaintSelectBegin();
+		}
+
+		// Mouse wants to drag
+		protected override void OnDragStart(MouseEventArgs e)
+		{
+			base.OnDragStart(e);
+
+			// Edit button used?
+			if(General.Actions.CheckActionActive(null, "classicedit"))
+			{
+				// Anything highlighted?
+				if((highlighted != null) && !highlighted.IsDisposed)
+				{
+					// Highlighted item not selected?
+					if(!highlighted.Selected)
+					{
+						// Select only this thing for dragging
+						General.Map.Map.ClearSelectedThings();
+						highlighted.Selected = true;
+					}
+
+					// Start dragging the selection
+					if(!BuilderPlug.Me.DontMoveGeometryOutsideMapBoundary || CanDrag()) //mxd
+					{ 
+						// Shift pressed? Clone things!
+						if(General.Interface.ShiftState) 
+						{
+							ICollection<Thing> selection = General.Map.Map.GetSelectedThings(true);
+							foreach(Thing t in selection) 
+							{
+								Thing clone = InsertThing(t.Position);
+								t.CopyPropertiesTo(clone);
+
+								// If the cloned item is an interpolation point or patrol point, then insert the point in the path
+								ThingTypeInfo info = General.Map.Data.GetThingInfo(t.Type);
+								int nextpointtagargnum = -1;
+
+								// Thing type can be changed in MAPINFO DoomEdNums block...
+								switch(info.ClassName.ToLowerInvariant())
+								{
+									case "interpolationpoint":
+										nextpointtagargnum = 3;
+										break;
+
+									case "patrolpoint":
+										nextpointtagargnum = 0;
+										break;
+								}
+
+								// Apply changes?
+								if(nextpointtagargnum != -1)
+								{
+									if(t.Tag == 0) t.Tag = General.Map.Map.GetNewTag();
+									t.Args[nextpointtagargnum] = clone.Tag = General.Map.Map.GetNewTag();
+								}
+
+								t.Selected = false;
+								clone.Selected = true;
+							}
+						}
+
+						General.Editing.ChangeMode(new DragThingsMode(new ThingsMode(), mousedownmappos));
+					}
+				}
+			}
+		}
+
+		//mxd. Check if any selected thing is outside of map boundary
+		private static bool CanDrag() 
+		{
+			ICollection<Thing> selectedthings = General.Map.Map.GetSelectedThings(true);
+			int unaffectedCount = 0;
+
+			foreach(Thing t in selectedthings) 
+			{
+				// Make sure the vertex is inside the map boundary
+				if(t.Position.x < General.Map.Config.LeftBoundary || t.Position.x > General.Map.Config.RightBoundary
+					|| t.Position.y > General.Map.Config.TopBoundary || t.Position.y < General.Map.Config.BottomBoundary) 
+				{
+					t.Selected = false;
+					unaffectedCount++;
+				}
+			}
+
+			if(unaffectedCount == selectedthings.Count) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "Unable to drag selection: " + (selectedthings.Count == 1 ? "selected thing is" : "all of selected things are") + " outside of map boundary!");
+				General.Interface.RedrawDisplay();
+				return false;
+			}
+
+			if(unaffectedCount > 0)
+				General.Interface.DisplayStatus(StatusType.Warning, unaffectedCount + " of selected vertices " + (unaffectedCount == 1 ? "is" : "are") + " outside of map boundary!");
+
+			return true;
+		}
+
+		// This is called wheh selection ends
+		protected override void OnEndMultiSelection()
+		{
+			bool selectionvolume = ((Math.Abs(selectionrect.Width) > 0.1f) && (Math.Abs(selectionrect.Height) > 0.1f));
+
+			if(selectionvolume)
+			{
+				//mxd
+				switch(marqueSelectionMode) 
+				{
+					case MarqueSelectionMode.SELECT:
+						foreach(Thing t in General.Map.ThingsFilter.VisibleThings)
+							t.Selected = selectionrect.Contains(t.Position.x, t.Position.y);
+						break;
+
+					case MarqueSelectionMode.ADD:
+						foreach(Thing t in General.Map.ThingsFilter.VisibleThings)
+							t.Selected |= selectionrect.Contains(t.Position.x, t.Position.y);
+						break;
+
+					case MarqueSelectionMode.SUBTRACT:
+						foreach(Thing t in General.Map.ThingsFilter.VisibleThings)
+							if(selectionrect.Contains(t.Position.x, t.Position.y)) t.Selected = false;
+						break;
+
+					default: //should be Intersect
+						foreach(Thing t in General.Map.ThingsFilter.VisibleThings)
+							if(!selectionrect.Contains(t.Position.x, t.Position.y)) t.Selected = false;
+						break;
+				}
+
+				UpdateSelectionInfo(); //mxd
+			}
+			
+			base.OnEndMultiSelection();
+
+			// Clear overlay
+			if(renderer.StartOverlay(true)) renderer.Finish();
+
+			// Redraw
+			General.Interface.RedrawDisplay();
+		}
+
+		// This is called when the selection is updated
+		protected override void OnUpdateMultiSelection()
+		{
+			base.OnUpdateMultiSelection();
+
+			// Render selection
+			if(renderer.StartOverlay(true))
+			{
+				RenderMultiSelection();
+				renderer.Finish();
+				renderer.Present();
+			}
+		}
+
+		// When copying
+		public override bool OnCopyBegin()
+		{
+			// No selection made? But we have a highlight!
+			if((General.Map.Map.GetSelectedThings(true).Count == 0) && (highlighted != null))
+			{
+				// Make the highlight the selection
+				highlighted.Selected = true;
+
+				//mxd. Actually, we want it marked, not selected
+				bool result = base.OnCopyBegin();
+				highlighted.Selected = false;
+				return result;
+			}
+
+			return base.OnCopyBegin();
+		}
+
+		//mxd
+		private void RenderComment(Thing t)
+		{
+			if(t.Fields.ContainsKey("comment"))
+			{
+				float size = ((t.FixedSize && renderer.Scale > 1.0f) ? t.Size / renderer.Scale : t.Size);
+				if(size * renderer.Scale < 1.5f) return; // Thing is too small to render
+
+				int iconindex = 0;
+				string comment = t.Fields.GetValue("comment", string.Empty);
+				if(comment.Length > 2)
+				{
+					string type = comment.Substring(0, 3);
+					int index = Array.IndexOf(CommentType.Types, type);
+					if(index != -1) iconindex = index;
+				}
+
+				RectangleF rect = new RectangleF(t.Position.x + size - 10 / renderer.Scale, t.Position.y + size + 18 / renderer.Scale, 16 / renderer.Scale, -16 / renderer.Scale);
+				PixelColor c = (t == highlighted ? General.Colors.Highlight : (t.Selected ? General.Colors.Selection : PixelColor.FromColor(Color.White)));
+				renderer.RenderRectangleFilled(rect, c, true, General.Map.Data.CommentTextures[iconindex]);
+			}
+		}
+
+		//mxd
+		private void UpdateHelperObjects()
+		{
+			// Update event lines
+			persistenteventlines = LinksCollector.GetThingLinks(General.Map.ThingsFilter.VisibleThings);
+
+			// Update light radii
+			dynamiclightshapes = Tools.GetDynamicLightShapes();
+		}
+
+		#endregion
+
+		#region ================== Actions
+
+		// This copies the properties
+		[BeginAction("classiccopyproperties")]
+		public void CopyProperties()
+		{
+			// Determine source things
+			ICollection<Thing> sel = null;
+			if(General.Map.Map.SelectedThingsCount > 0) sel = General.Map.Map.GetSelectedThings(true);
+			else if(highlighted != null) sel = new List<Thing> { highlighted };
+
+			if(sel != null)
+			{
+				// Copy properties from the first source thing
+				BuilderPlug.Me.CopiedThingProps = new ThingProperties(General.GetByIndex(sel, 0));
+				General.Interface.DisplayStatus(StatusType.Action, "Copied thing properties.");
+			}
+			else
+			{
+				//mxd
+				General.Interface.DisplayStatus(StatusType.Warning, "This action requires highlight or selection!");
+			}
+		}
+
+		// This pastes the properties
+		[BeginAction("classicpasteproperties")]
+		public void PasteProperties()
+		{
+			if(BuilderPlug.Me.CopiedThingProps != null)
+			{
+				// Determine target things
+				ICollection<Thing> sel = null;
+				if(General.Map.Map.SelectedThingsCount > 0) sel = General.Map.Map.GetSelectedThings(true);
+				else if(highlighted != null) sel = new List<Thing> {highlighted};
+
+				if(sel != null)
+				{
+					// Apply properties to selection
+					string rest = (sel.Count == 1 ? "a single thing" : sel.Count + " things"); //mxd
+					General.Map.UndoRedo.CreateUndo("Paste properties to " + rest);
+					foreach(Thing t in sel)
+					{
+						BuilderPlug.Me.CopiedThingProps.Apply(t, false);
+						t.UpdateConfiguration();
+					}
+					General.Interface.DisplayStatus(StatusType.Action, "Pasted properties to" + rest + ".");
+					
+					// Update
+					General.Map.IsChanged = true;
+					General.Map.ThingsFilter.Update();
+					General.Interface.RefreshInfo();
+
+					//mxd. Update helper lines
+					UpdateHelperObjects();
+
+					// Redraw
+					General.Interface.RedrawDisplay();
+				}
+				else
+				{
+					//mxd
+					General.Interface.DisplayStatus(StatusType.Warning, "This action requires highlight or selection!");
+				}
+			}
+			else
+			{
+				//mxd
+				General.Interface.DisplayStatus(StatusType.Warning, "Copy thing properties first!");
+			}
+		}
+
+		//mxd. This pastes the properties with options
+		[BeginAction("classicpastepropertieswithoptions")]
+		public void PastePropertiesWithOptions()
+		{
+			if(BuilderPlug.Me.CopiedThingProps != null)
+			{
+				// Determine target things
+				ICollection<Thing> sel = null;
+				if(General.Map.Map.SelectedThingsCount > 0) sel = General.Map.Map.GetSelectedThings(true);
+				else if(highlighted != null) sel = new List<Thing> { highlighted };
+
+				if(sel != null)
+				{
+					PastePropertiesOptionsForm form = new PastePropertiesOptionsForm();
+					if(form.Setup(MapElementType.THING) && form.ShowDialog(General.Interface) == DialogResult.OK)
+					{
+						// Apply properties to selection
+						string rest = (sel.Count == 1 ? "a single thing" : sel.Count + " things");
+						General.Map.UndoRedo.CreateUndo("Paste properties with options to " + rest);
+						foreach(Thing t in sel)
+						{
+							BuilderPlug.Me.CopiedThingProps.Apply(t, true);
+							t.UpdateConfiguration();
+						}
+						General.Interface.DisplayStatus(StatusType.Action, "Pasted properties with options to " + rest + ".");
+
+						// Update
+						General.Map.IsChanged = true;
+						General.Map.ThingsFilter.Update();
+						General.Interface.RefreshInfo();
+
+						//mxd. Update helper lines
+						UpdateHelperObjects();
+
+						// Redraw
+						General.Interface.RedrawDisplay();
+					}
+				}
+				else
+				{
+					General.Interface.DisplayStatus(StatusType.Warning, "This action requires highlight or selection!");
+				}
+			}
+			else
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "Copy thing properties first!");
+			}
+		}
+
+		// This clears the selection
+		[BeginAction("clearselection", BaseAction = true)]
+		public void ClearSelection()
+		{
+			// Clear selection
+			General.Map.Map.ClearAllSelected();
+
+			//mxd. Clear selection info
+			General.Interface.DisplayStatus(StatusType.Selection, string.Empty);
+
+			// Redraw
+			General.Interface.RedrawDisplay();
+		}
+		
+		// This creates a new thing at the mouse position
+		[BeginAction("insertitem", BaseAction = true)]
+		public void InsertThing()
+		{
+			// Mouse in window?
+			if(mouseinside)
+			{
+				// Insert new thing
+				General.Map.UndoRedo.CreateUndo("Insert thing");
+				Thing t = InsertThing(mousemappos);
+
+				if(t == null)
+				{
+					General.Map.UndoRedo.WithdrawUndo();
+					return;
+				}
+				
+				// Edit the thing?
+				if(BuilderPlug.Me.EditNewThing)
+				{
+					// Redraw screen
+					General.Interface.RedrawDisplay();
+					General.Interface.ShowEditThings(new List<Thing> { t });
+				}
+
+				General.Interface.DisplayStatus(StatusType.Action, "Inserted a new thing.");
+
+				// Update things filter
+				General.Map.ThingsFilter.Update();
+
+				//mxd. Update helper lines
+				UpdateHelperObjects();
+
+				// Redraw screen
+				General.Interface.RedrawDisplay();
+			}
+		}
+
+		// This creates a new thing
+		private static Thing InsertThing(Vector2D pos)
+		{
+			if(pos.x < General.Map.Config.LeftBoundary || pos.x > General.Map.Config.RightBoundary ||
+			   pos.y > General.Map.Config.TopBoundary || pos.y < General.Map.Config.BottomBoundary)
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "Failed to insert thing: outside of map boundaries.");
+				return null;
+			}
+
+			// Create thing
+			Thing t = General.Map.Map.CreateThing();
+			if(t != null)
+			{
+				General.Settings.ApplyDefaultThingSettings(t);
+				t.Move(pos);
+				t.UpdateConfiguration();
+
+				// Update things filter so that it includes this thing
+				General.Map.ThingsFilter.Update();
+
+				// Snap to grid enabled?
+				if(General.Interface.SnapToGrid)
+				{
+					// Snap to grid
+					t.SnapToGrid();
+				}
+				else
+				{
+					// Snap to map format accuracy
+					t.SnapToAccuracy();
+				}
+			}
+			
+			return t;
+		}
+
+		[BeginAction("deleteitem", BaseAction = true)]
+		public void DeleteItem()
+		{
+			// Make list of selected things
+			List<Thing> selected = new List<Thing>(General.Map.Map.GetSelectedThings(true));
+			if((selected.Count == 0) && (highlighted != null) && !highlighted.IsDisposed) selected.Add(highlighted);
+			
+			// Anything to do?
+			if(selected.Count > 0)
+			{
+				// Make undo
+				if(selected.Count > 1)
+				{
+					General.Map.UndoRedo.CreateUndo("Delete " + selected.Count + " things");
+					General.Interface.DisplayStatus(StatusType.Action, "Deleted " + selected.Count + " things.");
+				}
+				else
+				{
+					General.Map.UndoRedo.CreateUndo("Delete thing");
+					General.Interface.DisplayStatus(StatusType.Action, "Deleted a thing.");
+				}
+
+				DeleteThings(selected); //mxd
+				
+				// Update cache values
+				General.Map.IsChanged = true;
+				General.Map.ThingsFilter.Update();
+
+				//mxd. Update helper lines
+				UpdateHelperObjects();
+
+				// Invoke a new mousemove so that the highlighted item updates
+				MouseEventArgs e = new MouseEventArgs(MouseButtons.None, 0, (int)mousepos.x, (int)mousepos.y, 0);
+				OnMouseMove(e);
+
+				// Redraw screen
+				UpdateSelectionInfo(); //mxd
+				General.Interface.RedrawDisplay();
+			}
+		}
+
+		//mxd
+		[BeginAction("thingaligntowall")]
+		public void AlignThingsToWall() 
+		{
+			// Make list of selected things
+			List<Thing> selected = new List<Thing>(General.Map.Map.GetSelectedThings(true));
+			if((selected.Count == 0) && (highlighted != null) && !highlighted.IsDisposed) selected.Add(highlighted);
+
+			if(selected.Count == 0) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "This action requires a selection!");
+				return;
+			}
+
+			List<Thing> toAlign = new List<Thing>();
+
+			foreach(Thing t in selected) if(t.IsModel) toAlign.Add(t);
+
+			if(toAlign.Count == 0) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "This action only works for things with models!");
+				return;
+			}
+ 
+			// Make undo
+			if(toAlign.Count > 1) 
+			{
+				General.Map.UndoRedo.CreateUndo("Align " + toAlign.Count + " things");
+				General.Interface.DisplayStatus(StatusType.Action, "Aligned " + toAlign.Count + " things.");
+			} 
+			else 
+			{
+				General.Map.UndoRedo.CreateUndo("Align thing");
+				General.Interface.DisplayStatus(StatusType.Action, "Aligned a thing.");
+			}
+
+			//align things
+			int thingsCount = General.Map.Map.Things.Count;
+
+			foreach(Thing t in toAlign) 
+			{
+				List<Linedef> excludedLines = new List<Linedef>();
+				bool aligned;
+
+				do
+				{
+					Linedef l = General.Map.Map.NearestLinedef(t.Position, excludedLines);
+					aligned = Tools.TryAlignThingToLine(t, l);
+					
+					if(!aligned) 
+					{
+						excludedLines.Add(l);
+						if(excludedLines.Count == thingsCount) 
+						{
+							ThingTypeInfo tti = General.Map.Data.GetThingInfo(t.Type);
+							General.ErrorLogger.Add(ErrorType.Warning, "Unable to align Thing ¹" + t.Index + " (" + tti.Title + ") to any linedef in a map!");
+							aligned = true;
+						}
+					}
+				} while(!aligned);
+			}
+
+			// Update cache values
+			General.Map.IsChanged = true;
+
+			// Redraw screen
+			General.Interface.RedrawDisplay();
+		}
+
+		[BeginAction("thinglookatcursor")]
+		public void ThingPointAtCursor() 
+		{
+			// Make list of selected things
+			List<Thing> selected = new List<Thing>(General.Map.Map.GetSelectedThings(true));
+			if((selected.Count == 0) && (highlighted != null) && !highlighted.IsDisposed)
+				selected.Add(highlighted);
+
+			if(selected.Count == 0) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "This action requires a selection!");
+				return;
+			}
+
+			//check mouse position
+			if(!mousemappos.IsFinite()) 
+			{
+				awaitingMouseClick = true;
+				General.Interface.DisplayStatus(StatusType.Warning, "Now click in the editing area!");
+				return;
+			}
+
+			awaitingMouseClick = false;
+
+			// Make undo
+			if(selected.Count > 1) 
+			{
+				General.Map.UndoRedo.CreateUndo("Rotate " + selected.Count + " things");
+				General.Interface.DisplayStatus(StatusType.Action, "Rotated " + selected.Count + " things.");
+			} 
+			else 
+			{
+				General.Map.UndoRedo.CreateUndo("Rotate thing");
+				General.Interface.DisplayStatus(StatusType.Action, "Rotated a thing.");
+			}
+
+			//change angle
+			if(General.Interface.CtrlState) //point away
+			{ 
+				foreach(Thing t in selected) 
+				{
+					ThingTypeInfo info = General.Map.Data.GetThingInfo(t.Type);
+					if(info == null || info.Category == null || info.Category.Arrow == 0)
+						continue;
+					t.Rotate(Vector2D.GetAngle(mousemappos, t.Position) + Angle2D.PI);
+				}
+			} 
+			else //point at
+			{ 
+				foreach(Thing t in selected) 
+				{
+					ThingTypeInfo info = General.Map.Data.GetThingInfo(t.Type);
+					if(info == null || info.Category == null || info.Category.Arrow == 0)
+						continue;
+					t.Rotate(Vector2D.GetAngle(mousemappos, t.Position));
+				}
+			}
+
+			// Redraw screen
+			General.Interface.RedrawDisplay();
+		}
+
+		//mxd. rotate clockwise
+		[BeginAction("rotateclockwise")]
+		public void RotateCW() 
+		{
+			RotateThings(-5);
+		}
+
+		//mxd. rotate counterclockwise
+		[BeginAction("rotatecounterclockwise")]
+		public void RotateCCW() 
+		{
+			RotateThings(5);
+		}
+
+		//mxd
+		private void RotateThings(int increment) 
+		{
+			// Make list of selected things
+			List<Thing> selected = new List<Thing>(General.Map.Map.GetSelectedThings(true));
+			if(selected.Count == 0 && highlighted != null && !highlighted.IsDisposed)
+				selected.Add(highlighted);
+
+			if(selected.Count == 0) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "This action requires a selection!");
+				return;
+			}
+
+			// Make undo
+			if(selected.Count > 1) 
+			{
+				General.Map.UndoRedo.CreateUndo("Rotate " + selected.Count + " things", this, UndoGroup.ThingAngleChange, CreateSelectionCRC(selected));
+				General.Interface.DisplayStatus(StatusType.Action, "Rotated " + selected.Count + " things.");
+			} 
+			else 
+			{
+				General.Map.UndoRedo.CreateUndo("Rotate thing", this, UndoGroup.ThingAngleChange, CreateSelectionCRC(selected));
+				General.Interface.DisplayStatus(StatusType.Action, "Rotated a thing.");
+			}
+
+			//change angle
+			foreach(Thing t in selected) t.Rotate(General.ClampAngle(t.AngleDoom + increment));
+
+			// Redraw screen
+			General.Interface.RedrawDisplay();
+			General.Interface.RefreshInfo();
+		}
+
+		//mxd
+		[BeginAction("filterselectedthings")]
+		public void ShowFilterDialog() 
+		{
+			ICollection<Thing> selection = General.Map.Map.GetSelectedThings(true);
+
+			if(selection.Count == 0) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "This action requires a selection!");
+				return;
+			}
+
+			new FilterSelectedThingsForm(selection, this).ShowDialog();
+		}
+
+		//mxd
+		[BeginAction("selectsimilar")]
+		public void SelectSimilar() 
+		{
+			ICollection<Thing> selection = General.Map.Map.GetSelectedThings(true);
+
+			if(selection.Count == 0) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "This action requires a selection!");
+				return;
+			}
+
+			var form = new SelectSimilarElementOptionsPanel();
+			if(form.Setup(this)) form.ShowDialog();
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ClassicModes/TriangulatorMode.cs b/Source/Plugins/BuilderModes/ClassicModes/TriangulatorMode.cs
new file mode 100644
index 0000000..f4627cc
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ClassicModes/TriangulatorMode.cs
@@ -0,0 +1,581 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Text;
+using System.Windows.Forms;
+using System.IO;
+using System.Reflection;
+using CodeImp.DoomBuilder.Windows;
+using CodeImp.DoomBuilder.IO;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Editing;
+using System.Threading;
+using System.Drawing;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes.Editing
+{
+	#if DEBUG
+	
+	[EditMode(DisplayName = "Triangulator Mode",
+			  SwitchAction = "triangulatormode",		// Action name used to switch to this mode
+			  ButtonImage = "TriangulatorMode.png",		// Image resource name for the button
+			  ButtonOrder = int.MaxValue)]				// Position of the button (lower is more to the left)
+
+	public class TriangulatorMode : ClassicMode
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		// Highlighted item
+		private Sector highlighted;
+		
+		// Labels
+		private ICollection<LabelPositionInfo> labelpos;
+
+		#endregion
+
+		#region ================== Properties
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public TriangulatorMode()
+		{
+		}
+
+		// Disposer
+		public override void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Clean up
+
+				// Dispose base
+				base.Dispose();
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// Cancel mode
+		public override void OnCancel()
+		{
+			base.OnCancel();
+
+			// Return to this mode
+			General.Editing.ChangeMode(new SectorsMode());
+		}
+
+		// Mode engages
+		public override void OnEngage()
+		{
+			base.OnEngage();
+		}
+
+		// Mode disengages
+		public override void OnDisengage()
+		{
+			base.OnDisengage();
+
+			// Check which mode we are switching to
+			if(General.Editing.NewMode is VerticesMode)
+			{
+				// Convert selection to vertices
+
+				// Clear selected sectors
+				General.Map.Map.ClearSelectedSectors();
+			}
+			else if(General.Editing.NewMode is LinedefsMode)
+			{
+				// Convert selection to linedefs
+
+				// Clear selected sectors
+				General.Map.Map.ClearSelectedSectors();
+			}
+
+			// Hide highlight info
+			General.Interface.HideInfo();
+		}
+
+		// This redraws the display
+		public unsafe override void OnRedrawDisplay()
+		{
+			// Render lines and vertices
+			if(renderer.StartPlotter(true))
+			{
+				renderer.PlotLinedefSet(General.Map.Map.Linedefs);
+				renderer.PlotVerticesSet(General.Map.Map.Vertices);
+				if((highlighted != null) && !highlighted.IsDisposed)
+					renderer.PlotSector(highlighted, General.Colors.Highlight);
+				renderer.Finish();
+			}
+			
+			// Render labels
+			/*
+			if(renderer.StartOverlay(true))
+			{
+				if(labelpos != null)
+				{
+					foreach(LabelPositionInfo lb in labelpos)
+						renderer.RenderRectangleFilled(new RectangleF(lb.position.x - lb.radius / 2, lb.position.y - lb.radius / 2, lb.radius, lb.radius), General.Colors.Indication, true);
+				}
+
+				renderer.Finish();
+			}
+			*/
+			
+			// Do not show things
+			if(renderer.StartThings(true))
+			{
+				renderer.Finish();
+			}
+
+			renderer.RedrawSurface();
+			
+			renderer.Present();
+		}
+
+		// This highlights a new item
+		protected void Highlight(Sector s)
+		{
+			// Redraw lines
+			if(renderer.StartPlotter(false))
+			{
+				// Undraw previous highlight
+				if((highlighted != null) && !highlighted.IsDisposed)
+					renderer.PlotSector(highlighted);
+
+				// Set new highlight
+				highlighted = s;
+				
+				// Render highlighted item
+				if((highlighted != null) && !highlighted.IsDisposed)
+					renderer.PlotSector(highlighted, General.Colors.Highlight);
+				
+				// Done
+				renderer.Finish();
+			}
+			
+			// Render labels
+			/*
+			if(renderer.StartOverlay(true))
+			{
+				if(labelpos != null)
+				{
+					foreach(LabelPositionInfo lb in labelpos)
+						renderer.RenderRectangleFilled(new RectangleF(lb.position.x - lb.radius / 2, lb.position.y - lb.radius / 2, lb.radius, lb.radius), General.Colors.Indication, true);
+				}
+				
+				renderer.Finish();
+			}
+			*/
+			
+			renderer.Present();
+			
+			// Show highlight info
+			if((highlighted != null) && !highlighted.IsDisposed)
+				General.Interface.ShowSectorInfo(highlighted);
+			else
+				General.Interface.HideInfo();
+		}
+
+		// Mouse moves
+		public override void OnMouseMove(MouseEventArgs e)
+		{
+			base.OnMouseMove(e);
+
+			// Find the nearest linedef within highlight range
+			Linedef l = General.Map.Map.NearestLinedef(mousemappos);
+
+			// Check on which side of the linedef the mouse is
+			float side = l.SideOfLine(mousemappos);
+			if(side > 0)
+			{
+				// Is there a sidedef here?
+				if(l.Back != null)
+				{
+					// Highlight if not the same
+					if(l.Back.Sector != highlighted) Highlight(l.Back.Sector);
+				}
+				else
+				{
+					// Highlight nothing
+					if(highlighted != null) Highlight(null);
+				}
+			}
+			else
+			{
+				// Is there a sidedef here?
+				if(l.Front != null)
+				{
+					// Highlight if not the same
+					if(l.Front.Sector != highlighted) Highlight(l.Front.Sector);
+				}
+				else
+				{
+					// Highlight nothing
+					if(highlighted != null) Highlight(null);
+				}
+			}
+		}
+
+		// Mouse leaves
+		public override void OnMouseLeave(EventArgs e)
+		{
+			base.OnMouseLeave(e);
+
+			// Highlight nothing
+			Highlight(null);
+		}
+
+		// Mouse button pressed
+		public override void OnMouseDown(MouseEventArgs e)
+		{
+			base.OnMouseDown(e);
+			bool front, back;
+
+			// Edit button is used?
+			if(General.Actions.CheckActionActive(null, "classicedit"))
+			{
+				// Item highlighted?
+				if((highlighted != null) && !highlighted.IsDisposed)
+				{
+					// Make update lines selection
+					foreach(Sidedef sd in highlighted.Sidedefs)
+					{
+						if(sd.Line.Front != null) front = sd.Line.Front.Sector.Selected; else front = false;
+						if(sd.Line.Back != null) back = sd.Line.Back.Sector.Selected; else back = false;
+						sd.Line.Selected = front | back;
+					}
+					
+					// Update display
+					if(renderer.StartPlotter(false))
+					{
+						// Redraw highlight to show selection
+						renderer.PlotSector(highlighted);
+						renderer.Finish();
+						renderer.Present();
+					}
+				}
+			}
+		}
+
+		// Mouse released
+		public override void OnMouseUp(MouseEventArgs e)
+		{
+			ICollection<Sector> selected;
+			PixelColor c;
+			
+			base.OnMouseUp(e);
+			
+			// Item highlighted?
+			if((highlighted != null) && !highlighted.IsDisposed)
+			{
+				Sector s = highlighted;
+				
+				// Remove highlight to avoid confusion
+				Highlight(null);
+				
+				// Get a triangulator and bind events
+				Triangulation t = new Triangulation();
+				t.OnShowPolygon = ShowPolygon;
+				t.OnShowEarClip = ShowEarClip;
+				//t.OnShowRemaining = ShowRemaining;
+				t.Triangulate(s);
+				
+				// Start with a clear display
+				if(renderer.StartPlotter(true))
+				{
+					// Render lines and vertices
+					renderer.PlotLinedefSet(General.Map.Map.Linedefs);
+					renderer.PlotVerticesSet(General.Map.Map.Vertices);
+					
+					// Go for all triangle vertices to render the inside lines only
+					for(int i = 0; i < t.Vertices.Count; i += 3)
+					{
+						if(t.Sidedefs[i + 0] == null) renderer.PlotLine(t.Vertices[i + 0], t.Vertices[i + 1], PixelColor.FromColor(Color.DeepSkyBlue));
+						if(t.Sidedefs[i + 1] == null) renderer.PlotLine(t.Vertices[i + 1], t.Vertices[i + 2], PixelColor.FromColor(Color.DeepSkyBlue));
+						if(t.Sidedefs[i + 2] == null) renderer.PlotLine(t.Vertices[i + 2], t.Vertices[i + 0], PixelColor.FromColor(Color.DeepSkyBlue));
+					}
+					
+					// Go for all triangle vertices to renderthe outside lines only
+					for(int i = 0; i < t.Vertices.Count; i += 3)
+					{
+						if(t.Sidedefs[i + 0] != null) renderer.PlotLine(t.Vertices[i + 0], t.Vertices[i + 1], PixelColor.FromColor(Color.Red));
+						if(t.Sidedefs[i + 1] != null) renderer.PlotLine(t.Vertices[i + 1], t.Vertices[i + 2], PixelColor.FromColor(Color.Red));
+						if(t.Sidedefs[i + 2] != null) renderer.PlotLine(t.Vertices[i + 2], t.Vertices[i + 0], PixelColor.FromColor(Color.Red));
+					}
+					
+					// Done
+					renderer.Finish();
+					renderer.Present();
+					Thread.Sleep(200);
+				}
+			}
+		}
+
+		// This shows a point
+		private void ShowPoint(Vector2D v, int c)
+		{
+			for(int a = 0; a < 6; a++)
+			{
+				OnRedrawDisplay();
+				Thread.Sleep(20);
+				Application.DoEvents();
+				
+				// Start with a clear display
+				if(renderer.StartPlotter(true))
+				{
+					// Render lines and vertices
+					renderer.PlotLinedefSet(General.Map.Map.Linedefs);
+					renderer.PlotVerticesSet(General.Map.Map.Vertices);
+
+					// Show the point
+					renderer.PlotVertexAt(v, c);
+
+					// Done
+					renderer.Finish();
+					renderer.Present();
+				}
+
+				// Wait a bit
+				Thread.Sleep(60);
+			}
+		}
+
+		// This shows a line
+		private void ShowLine(Vector2D v1, Vector2D v2, PixelColor c)
+		{
+			for(int a = 0; a < 3; a++)
+			{
+				OnRedrawDisplay();
+				Thread.Sleep(20);
+				Application.DoEvents();
+				
+				// Start with a clear display
+				if(renderer.StartPlotter(true))
+				{
+					// Render lines and vertices
+					renderer.PlotLinedefSet(General.Map.Map.Linedefs);
+					renderer.PlotVerticesSet(General.Map.Map.Vertices);
+
+					// Show the line
+					renderer.PlotLine(v1, v2, c);
+
+					// Done
+					renderer.Finish();
+					renderer.Present();
+				}
+
+				// Wait a bit
+				Thread.Sleep(50);
+				Application.DoEvents();
+			}
+		}
+
+		// This shows a polygon
+		private void ShowPolygon(LinkedList<EarClipVertex> p)
+		{
+			LinkedListNode<EarClipVertex> v = p.First;
+			LinkedListNode<EarClipVertex> v2 = p.Last;
+			
+			// Go for all vertices in the polygon
+			while(v != null)
+			{
+				for(int a = 0; a < 1; a++)
+				{
+
+					// Start with a clear display
+					if(renderer.StartPlotter(true))
+					{
+						// Render lines and vertices
+						renderer.PlotLinedefSet(General.Map.Map.Linedefs);
+						renderer.PlotVerticesSet(General.Map.Map.Vertices);
+
+						// Show line
+						renderer.PlotLine(v.Value.Position, v2.Value.Position, PixelColor.FromColor(Color.White));
+
+						// Done
+						renderer.Finish();
+						renderer.Present();
+					}
+					
+					//Thread.Sleep(10);
+					
+					// Start with a clear display
+					if(renderer.StartPlotter(true))
+					{
+						// Render lines and vertices
+						renderer.PlotLinedefSet(General.Map.Map.Linedefs);
+						renderer.PlotVerticesSet(General.Map.Map.Vertices);
+						
+						// Show line
+						renderer.PlotLine(v.Value.Position, v2.Value.Position, PixelColor.FromColor(Color.Red));
+						
+						// Done
+						renderer.Finish();
+						renderer.Present();
+					}
+
+					// Wait a bit
+					//Thread.Sleep(40);
+					Application.DoEvents();
+				}
+				
+				v2 = v;
+				v = v.Next;
+			}
+		}
+
+		// This shows a polygon
+		private void ShowRemaining(LinkedList<EarClipVertex> remains)
+		{
+			LinkedListNode<EarClipVertex> v;
+
+			for(int a = 0; a < 100; a++)
+			{
+				OnRedrawDisplay();
+				Thread.Sleep(10);
+				Application.DoEvents();
+				
+				// Start with a clear display
+				if(renderer.StartPlotter(true))
+				{
+					// Render lines and vertices
+					renderer.PlotLinedefSet(General.Map.Map.Linedefs);
+					renderer.PlotVerticesSet(General.Map.Map.Vertices);
+
+					// Go for all vertices in the polygon
+					v = remains.First;
+					while(v != null)
+					{
+						// Show the line
+						if(v.Next != null) renderer.PlotLine(v.Value.Position, v.Next.Value.Position, PixelColor.FromColor(Color.Yellow));
+						v = v.Next;
+					}
+
+					// Show last line as well
+					renderer.PlotLine(remains.Last.Value.Position, remains.First.Value.Position, PixelColor.FromColor(Color.Yellow));
+
+					// Done
+					renderer.Finish();
+					renderer.Present();
+				}
+
+				// Wait a bit
+				Thread.Sleep(60);
+			}
+		}
+
+		// This shows a polygon
+		private void ShowEarClip(EarClipVertex[] found, LinkedList<EarClipVertex> remains)
+		{
+			EarClipVertex prev, first;
+			
+			for(int a = 0; a < 2; a++)
+			{
+				// Start with a clear display
+				if(renderer.StartPlotter(true))
+				{
+					// Render lines and vertices
+					renderer.PlotLinedefSet(General.Map.Map.Linedefs);
+					renderer.PlotVerticesSet(General.Map.Map.Vertices);
+
+					// Go for all remaining vertices
+					prev = null; first = null;
+					foreach(EarClipVertex v in remains)
+					{
+						// Show the line
+						if(prev != null) renderer.PlotLine(v.Position, prev.Position, PixelColor.FromColor(Color.Yellow));
+						if(prev == null) first = v;
+						prev = v;
+						
+						if(v.IsReflex)
+							renderer.PlotVertexAt(v.Position, ColorCollection.SELECTION);
+						else
+							renderer.PlotVertexAt(v.Position, ColorCollection.VERTICES);
+					}
+					if(first != null) renderer.PlotLine(first.Position, prev.Position, PixelColor.FromColor(Color.Yellow));
+
+					if(found != null)
+					{
+						renderer.PlotLine(found[0].Position, found[1].Position, PixelColor.FromColor(Color.BlueViolet));
+						renderer.PlotLine(found[1].Position, found[2].Position, PixelColor.FromColor(Color.BlueViolet));
+						renderer.PlotLine(found[2].Position, found[0].Position, PixelColor.FromColor(Color.BlueViolet));
+						renderer.PlotVertexAt(found[1].Position, ColorCollection.INDICATION);
+					}
+					
+					// Done
+					renderer.Finish();
+					renderer.Present();
+				}
+				Thread.Sleep(10);
+				Application.DoEvents();
+
+				// Start with a clear display
+				if(renderer.StartPlotter(true))
+				{
+					// Render lines and vertices
+					renderer.PlotLinedefSet(General.Map.Map.Linedefs);
+					renderer.PlotVerticesSet(General.Map.Map.Vertices);
+
+					// Go for all remaining vertices
+					prev = null; first = null;
+					foreach(EarClipVertex v in remains)
+					{
+						// Show the line
+						if(prev != null) renderer.PlotLine(v.Position, prev.Position, PixelColor.FromColor(Color.Yellow));
+						if(prev == null) first = v;
+						prev = v;
+
+						if(v.IsReflex)
+							renderer.PlotVertexAt(v.Position, ColorCollection.SELECTION);
+						else
+							renderer.PlotVertexAt(v.Position, ColorCollection.VERTICES);
+					}
+					if(first != null) renderer.PlotLine(first.Position, prev.Position, PixelColor.FromColor(Color.Yellow));
+
+					// Done
+					renderer.Finish();
+					renderer.Present();
+				}
+				//Thread.Sleep(10);
+			}
+		}
+		
+		#endregion
+	}
+
+	#endif
+}
diff --git a/Source/Plugins/BuilderModes/ClassicModes/VerticesMode.cs b/Source/Plugins/BuilderModes/ClassicModes/VerticesMode.cs
new file mode 100644
index 0000000..ab2d161
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ClassicModes/VerticesMode.cs
@@ -0,0 +1,1191 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.BuilderModes.Interface;
+using CodeImp.DoomBuilder.Windows;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Editing;
+using CodeImp.DoomBuilder.Actions;
+using System.Drawing;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[EditMode(DisplayName = "Vertices Mode",
+			  SwitchAction = "verticesmode",	// Action name used to switch to this mode
+			  ButtonImage = "VerticesMode.png",	// Image resource name for the button
+			  ButtonOrder = int.MinValue,	// Position of the button (lower is more to the left)
+			  ButtonGroup = "000_editing",
+			  UseByDefault = true,
+			  SafeStartMode = true)]
+
+	public class VerticesMode : BaseClassicMode
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		// Highlighted item
+		private Vertex highlighted;
+		private Vector2D insertpreview = new Vector2D(float.NaN, float.NaN); //mxd
+
+		// Interface
+		private bool editpressed;
+
+		#endregion
+
+		#region ================== Properties
+
+		public override object HighlightedObject { get { return highlighted; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		#endregion
+
+		#region ================== Methods
+
+		public override void OnHelp()
+		{
+			General.ShowHelp("e_vertices.html");
+		}
+
+		// Cancel mode
+		public override void OnCancel()
+		{
+			base.OnCancel();
+			
+			// Return to this mode
+			General.Editing.ChangeMode(new VerticesMode());
+		}
+
+		// Mode engages
+		public override void OnEngage()
+		{
+			base.OnEngage();
+			renderer.SetPresentation(Presentation.Standard);
+
+			// Add toolbar buttons
+			if(General.Map.UDMF) 
+			{
+				General.Interface.AddButton(BuilderPlug.Me.MenusForm.CopyProperties);
+				General.Interface.AddButton(BuilderPlug.Me.MenusForm.PasteProperties);
+				General.Interface.AddButton(BuilderPlug.Me.MenusForm.PastePropertiesOptions); //mxd
+				General.Interface.AddButton(BuilderPlug.Me.MenusForm.TextureOffsetLock, ToolbarSection.Geometry); //mxd
+			}
+
+			// Convert geometry selection to vertices only
+			General.Map.Map.ConvertSelection(SelectionType.Vertices);
+			UpdateSelectionInfo(); //mxd
+		}
+
+		// Mode disengages
+		public override void OnDisengage()
+		{
+			base.OnDisengage();
+
+			// Remove toolbar buttons
+			if(General.Map.UDMF)
+			{
+				General.Interface.RemoveButton(BuilderPlug.Me.MenusForm.CopyProperties);
+				General.Interface.RemoveButton(BuilderPlug.Me.MenusForm.PasteProperties);
+				General.Interface.RemoveButton(BuilderPlug.Me.MenusForm.PastePropertiesOptions); //mxd
+				General.Interface.RemoveButton(BuilderPlug.Me.MenusForm.TextureOffsetLock); //mxd
+			}
+
+			// Going to EditSelectionMode?
+			if(General.Editing.NewMode is EditSelectionMode)
+			{
+				// Not pasting anything?
+				EditSelectionMode editmode = (General.Editing.NewMode as EditSelectionMode);
+				if(!editmode.Pasting)
+				{
+					// No selection made? But we have a highlight!
+					if((General.Map.Map.GetSelectedVertices(true).Count == 0) && (highlighted != null))
+					{
+						// Make the highlight the selection
+						highlighted.Selected = true;
+					}
+				}
+			}
+
+			// Hide highlight info
+			General.Interface.HideInfo();
+		}
+
+		// This redraws the display
+		public override void OnRedrawDisplay()
+		{
+			renderer.RedrawSurface();
+
+			// Render lines and vertices
+			if(renderer.StartPlotter(true))
+			{
+				renderer.PlotLinedefSet(General.Map.Map.Linedefs);
+				renderer.PlotVerticesSet(General.Map.Map.Vertices);
+				if((highlighted != null) && !highlighted.IsDisposed)
+					renderer.PlotVertex(highlighted, ColorCollection.HIGHLIGHT);
+				renderer.Finish();
+			}
+
+			// Render things
+			if(renderer.StartThings(true))
+			{
+				renderer.RenderThingSet(General.Map.ThingsFilter.HiddenThings, Presentation.THINGS_HIDDEN_ALPHA);
+				renderer.RenderThingSet(General.Map.ThingsFilter.VisibleThings, Presentation.THINGS_ALPHA);
+				renderer.Finish();
+			}
+
+			// Render selection
+			if(selecting && renderer.StartOverlay(true)) 
+			{
+				RenderMultiSelection();
+				renderer.Finish();
+			}
+
+			renderer.Present();
+		}
+		
+		// This highlights a new item
+		private void Highlight(Vertex v)
+		{
+			// Update display
+			if(renderer.StartPlotter(false))
+			{
+				// Undraw previous highlight
+				if(highlighted != null && !highlighted.IsDisposed)
+					renderer.PlotVertex(highlighted, renderer.DetermineVertexColor(highlighted));
+
+				// Set new highlight
+				highlighted = v;
+
+				// Render highlighted item
+				if(highlighted != null && !highlighted.IsDisposed)
+					renderer.PlotVertex(highlighted, ColorCollection.HIGHLIGHT);
+				
+				// Done
+				renderer.Finish();
+				renderer.Present();
+			}
+
+			// Show highlight info
+			if((highlighted != null) && !highlighted.IsDisposed)
+				General.Interface.ShowVertexInfo(highlighted);
+			else
+				General.Interface.HideInfo();
+		}
+		
+		// Selection
+		protected override void OnSelectBegin()
+		{
+			// Item highlighted?
+			if((highlighted != null) && !highlighted.IsDisposed)
+			{
+				// Redraw highlight to show selection
+				if(renderer.StartPlotter(false))
+				{
+					renderer.PlotVertex(highlighted, renderer.DetermineVertexColor(highlighted));
+					renderer.Finish();
+					renderer.Present();
+				}
+			}
+
+			base.OnSelectBegin();
+		}
+		
+		// End selection
+		protected override void OnSelectEnd()
+		{
+			// Not stopping from multiselection?
+			if(!selecting)
+			{
+				// Item highlighted?
+				if((highlighted != null) && !highlighted.IsDisposed)
+				{
+					//mxd. Flip selection
+					highlighted.Selected = !highlighted.Selected;
+					
+					// Render highlighted item
+					if(renderer.StartPlotter(false))
+					{
+						renderer.PlotVertex(highlighted, ColorCollection.HIGHLIGHT);
+						renderer.Finish();
+						renderer.Present();
+					}
+				} 
+				else if(BuilderPlug.Me.AutoClearSelection && General.Map.Map.SelectedVerticessCount > 0) 
+				{
+					//mxd
+					General.Map.Map.ClearSelectedVertices();
+					General.Interface.RedrawDisplay();
+				}
+
+				//mxd
+				UpdateSelectionInfo();
+			}
+
+			base.OnSelectEnd();
+		}
+		
+		// Start editing
+		protected override void OnEditBegin()
+		{
+			bool snaptogrid = General.Interface.ShiftState ^ General.Interface.SnapToGrid;
+			bool snaptonearest = General.Interface.CtrlState ^ General.Interface.AutoMerge;
+			
+			// Vertex highlighted?
+			if((highlighted != null) && !highlighted.IsDisposed)
+			{
+				// Edit pressed in this mode
+				editpressed = true;
+
+				// Highlighted item not selected?
+				if(!highlighted.Selected && (BuilderPlug.Me.AutoClearSelection || (General.Map.Map.SelectedVerticessCount == 0)))
+				{
+					// Make this the only selection
+					General.Map.Map.ClearSelectedVertices();
+					highlighted.Selected = true;
+					General.Interface.RedrawDisplay();
+
+					//mxd
+					General.Interface.DisplayStatus(StatusType.Selection, "1 vertex selected.");
+				}
+
+				// Update display
+				if(renderer.StartPlotter(false))
+				{
+					// Redraw highlight to show selection
+					renderer.PlotVertex(highlighted, renderer.DetermineVertexColor(highlighted));
+					renderer.Finish();
+					renderer.Present();
+				}
+			}
+			else if(!selecting) //mxd. We don't want to do this stuff while multiselecting
+			{
+				// Find the nearest linedef within highlight range
+				Linedef l = General.Map.Map.NearestLinedefRange(mousemappos, BuilderPlug.Me.SplitLinedefsRange / renderer.Scale);
+				if(l != null)
+				{
+					// Create undo
+					General.Map.UndoRedo.CreateUndo("Split linedef");
+
+					Vector2D insertpos;
+
+					// Snip to grid also?
+					if(snaptogrid)
+					{
+						// Find all points where the grid intersects the line
+						List<Vector2D> points = l.GetGridIntersections();
+						insertpos = mousemappos;
+						float distance = float.MaxValue;
+						foreach(Vector2D p in points)
+						{
+							float pdist = Vector2D.DistanceSq(p, mousemappos);
+							if(pdist < distance)
+							{
+								insertpos = p;
+								distance = pdist;
+							}
+						}
+					}
+					else
+					{
+						// Just use the nearest point on line
+						insertpos = l.NearestOnLine(mousemappos);
+					}
+
+					// Make the vertex
+					Vertex v = General.Map.Map.CreateVertex(insertpos);
+					if(v == null)
+					{
+						General.Map.UndoRedo.WithdrawUndo();
+						return;
+					}
+					
+					// Snap to map format accuracy
+					v.SnapToAccuracy();
+
+					// Split the line with this vertex
+					Linedef sld = l.Split(v);
+					if(sld == null)
+					{
+						General.Map.UndoRedo.WithdrawUndo();
+						return;
+					}
+					//BuilderPlug.Me.AdjustSplitCoordinates(l, sld);
+					
+					// Update
+					General.Map.Map.Update();
+
+					// Highlight it
+					Highlight(v);
+
+					// Redraw display
+					General.Interface.RedrawDisplay();
+				}
+				else if(BuilderPlug.Me.AutoDrawOnEdit)
+				{
+					// Start drawing mode
+					DrawGeometryMode drawmode = new DrawGeometryMode();
+					DrawnVertex v = DrawGeometryMode.GetCurrentPosition(mousemappos, snaptonearest, snaptogrid, false, renderer, new List<DrawnVertex>());
+
+					if(drawmode.DrawPointAt(v))
+						General.Editing.ChangeMode(drawmode);
+					else
+						General.Interface.DisplayStatus(StatusType.Warning, "Failed to draw point: outside of map boundaries.");
+				}
+			}
+			
+			base.OnEditBegin();
+		}
+		
+		// Done editing
+		protected override void OnEditEnd()
+		{
+			// Edit pressed in this mode?
+			if(editpressed)
+			{
+				// Anything selected?
+				ICollection<Vertex> selected = General.Map.Map.GetSelectedVertices(true);
+				if(selected.Count > 0)
+				{
+					if(General.Interface.IsActiveWindow)
+					{
+						//mxd. Show realtime vertex edit dialog
+						General.Interface.OnEditFormValuesChanged += vertexEditForm_OnValuesChanged;
+						DialogResult result = General.Interface.ShowEditVertices(selected);
+						General.Interface.OnEditFormValuesChanged -= vertexEditForm_OnValuesChanged;
+
+						// When a single vertex was selected, deselect it now
+						if(selected.Count == 1) 
+						{
+							General.Map.Map.ClearSelectedVertices();
+						} 
+						else if(result == DialogResult.Cancel) //mxd. Restore selection...
+						{ 
+							foreach(Vertex v in selected) v.Selected = true;
+						}
+						General.Interface.RedrawDisplay();
+					}
+				}
+
+				UpdateSelectionInfo(); //mxd
+			}
+
+			editpressed = false;
+			base.OnEditEnd();
+		}
+
+		//mxd
+		private void vertexEditForm_OnValuesChanged(object sender, EventArgs e) 
+		{
+			// Update entire display
+			General.Map.Map.Update();
+			General.Interface.RedrawDisplay();
+		}
+		
+		// Mouse moves
+		public override void OnMouseMove(MouseEventArgs e)
+		{
+			base.OnMouseMove(e);
+			if(panning) return; //mxd. Skip all this jazz while panning
+
+			//mxd
+			if(selectpressed && !editpressed && !selecting) 
+			{
+				// Check if moved enough pixels for multiselect
+				Vector2D delta = mousedownpos - mousepos;
+				if((Math.Abs(delta.x) > MULTISELECT_START_MOVE_PIXELS) ||
+				   (Math.Abs(delta.y) > MULTISELECT_START_MOVE_PIXELS)) 
+				{
+					// Start multiselecting
+					StartMultiSelection();
+				}
+			}
+			else if(paintselectpressed && !editpressed && !selecting)  //mxd. Drag-select
+			{
+				// Find the nearest thing within highlight range
+				Vertex v = General.Map.Map.NearestVertexSquareRange(mousemappos, BuilderPlug.Me.HighlightRange / renderer.Scale);
+
+				if(v != null) 
+				{
+					if(v != highlighted) 
+					{
+						//toggle selected state
+						if(General.Interface.ShiftState ^ BuilderPlug.Me.AdditiveSelect)
+							v.Selected = true;
+						else if(General.Interface.CtrlState)
+							v.Selected = false;
+						else
+							v.Selected = !v.Selected;
+						highlighted = v;
+
+						UpdateSelectionInfo(); //mxd
+
+						// Update entire display
+						General.Interface.RedrawDisplay();
+					}
+				} 
+				else if(highlighted != null) 
+				{
+					highlighted = null;
+					Highlight(null);
+
+					// Update entire display
+					General.Interface.RedrawDisplay();
+				}
+			}
+			else if(e.Button == MouseButtons.None) // Not holding any buttons?
+			{
+				//mxd. Render insert vertex preview
+				Linedef l = General.Map.Map.NearestLinedefRange(mousemappos, BuilderPlug.Me.SplitLinedefsRange / renderer.Scale);
+
+				if(l != null) 
+				{
+					// Snip to grid?
+					if(General.Interface.ShiftState ^ General.Interface.SnapToGrid) 
+					{
+						// Find all points where the grid intersects the line
+						List<Vector2D> points = l.GetGridIntersections();
+						if(points.Count == 0) 
+						{
+							insertpreview = l.NearestOnLine(mousemappos);
+						} 
+						else 
+						{
+							insertpreview = mousemappos;
+							float distance = float.MaxValue;
+							foreach(Vector2D p in points) 
+							{
+								float pdist = Vector2D.DistanceSq(p, mousemappos);
+								if(pdist < distance) 
+								{
+									insertpreview = p;
+									distance = pdist;
+								}
+							}
+						}
+					} 
+					else 
+					{
+						// Just use the nearest point on line
+						insertpreview = l.NearestOnLine(mousemappos);
+					}
+
+					//render preview
+					if(renderer.StartOverlay(true)) 
+					{
+						float dist = Math.Min(Vector2D.Distance(mousemappos, insertpreview), BuilderPlug.Me.SplitLinedefsRange);
+						byte alpha = (byte)(255 - (dist / BuilderPlug.Me.SplitLinedefsRange) * 128);
+						float vsize = (renderer.VertexSize + 1.0f) / renderer.Scale;
+						renderer.RenderRectangleFilled(new RectangleF(insertpreview.x - vsize, insertpreview.y - vsize, vsize * 2.0f, vsize * 2.0f), General.Colors.InfoLine.WithAlpha(alpha), true);
+						renderer.Finish();
+						renderer.Present();
+					}
+				} 
+				else if(insertpreview.IsFinite()) 
+				{
+					insertpreview.x = float.NaN;
+
+					//undraw preveiw
+					if(renderer.StartOverlay(true)) 
+					{
+						renderer.Finish();
+						renderer.Present();
+					}
+				}
+				
+				// Find the nearest vertex within highlight range
+				Vertex v = General.Map.Map.NearestVertexSquareRange(mousemappos, BuilderPlug.Me.HighlightRange / renderer.Scale);
+
+				// Highlight if not the same
+				if(v != highlighted) Highlight(v);
+			} 
+		}
+
+		// Mouse leaves
+		public override void OnMouseLeave(EventArgs e)
+		{
+			base.OnMouseLeave(e);
+			
+			// Highlight nothing
+			Highlight(null);
+		}
+
+		//mxd
+		protected override void BeginViewPan() 
+		{
+			if(insertpreview.IsFinite()) 
+			{
+				insertpreview.x = float.NaN;
+
+				//undraw preveiw
+				if(renderer.StartOverlay(true)) 
+				{
+					renderer.Finish();
+					renderer.Present();
+				}
+			}
+
+			base.BeginViewPan();
+		}
+
+		//mxd
+		protected override void OnPaintSelectBegin() 
+		{
+			highlighted = null;
+			base.OnPaintSelectBegin();
+		}
+
+		// Mouse wants to drag
+		protected override void OnDragStart(MouseEventArgs e)
+		{
+			base.OnDragStart(e);
+
+			// Edit button used?
+			if(General.Actions.CheckActionActive(null, "classicedit"))
+			{
+				// Anything highlighted?
+				if((highlighted != null) && !highlighted.IsDisposed)
+				{
+					// Highlighted item not selected?
+					if(!highlighted.Selected)
+					{
+						// Select only this vertex for dragging
+						General.Map.Map.ClearSelectedVertices();
+						highlighted.Selected = true;
+					}
+
+					// Start dragging the selection
+					if(!BuilderPlug.Me.DontMoveGeometryOutsideMapBoundary || CanDrag()) //mxd
+						General.Editing.ChangeMode(new DragVerticesMode(highlighted, mousedownmappos));
+				}
+			}
+		}
+
+		//mxd. Check if any selected vertex is outside of map boundary
+		private static bool CanDrag()
+		{
+			ICollection<Vertex> selectedverts = General.Map.Map.GetSelectedVertices(true);
+			int unaffectedCount = 0;
+
+			foreach(Vertex v in selectedverts) 
+			{
+				// Make sure the vertex is inside the map boundary
+				if(v.Position.x < General.Map.Config.LeftBoundary || v.Position.x > General.Map.Config.RightBoundary
+					|| v.Position.y > General.Map.Config.TopBoundary || v.Position.y < General.Map.Config.BottomBoundary) 
+				{
+
+					v.Selected = false;
+					unaffectedCount++;
+				}
+			}
+
+			if(unaffectedCount == selectedverts.Count) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "Unable to drag selection: " + (selectedverts.Count == 1 ? "selected vertex is" : "all of selected vertices are") + " outside of map boundary!");
+				General.Interface.RedrawDisplay();
+				return false;
+			}
+			
+			if(unaffectedCount > 0)
+				General.Interface.DisplayStatus(StatusType.Warning, unaffectedCount + " of selected vertices " + (unaffectedCount == 1 ? "is" : "are") + " outside of map boundary!");
+
+			return true;
+		}
+
+		// This is called wheh selection ends
+		protected override void OnEndMultiSelection()
+		{
+			bool selectionvolume = ((Math.Abs(selectionrect.Width) > 0.1f) && (Math.Abs(selectionrect.Height) > 0.1f));
+
+			if(selectionvolume)
+			{
+				//mxd
+				switch(marqueSelectionMode) 
+				{
+					case MarqueSelectionMode.SELECT:
+						foreach(Vertex v in General.Map.Map.Vertices)
+							v.Selected = selectionrect.Contains(v.Position.x, v.Position.y);
+						break;
+
+					case MarqueSelectionMode.ADD:
+						foreach(Vertex v in General.Map.Map.Vertices)
+							v.Selected |= selectionrect.Contains(v.Position.x, v.Position.y);
+						break;
+
+					case MarqueSelectionMode.SUBTRACT:
+						foreach(Vertex v in General.Map.Map.Vertices)
+							if(selectionrect.Contains(v.Position.x, v.Position.y)) v.Selected = false;
+						break;
+
+					default: //should be Intersect
+						foreach(Vertex v in General.Map.Map.Vertices)
+							if(!selectionrect.Contains(v.Position.x, v.Position.y)) v.Selected = false;
+						break;
+				}
+
+				//mxd
+				UpdateSelectionInfo();
+			}
+			
+			base.OnEndMultiSelection();
+
+			// Clear overlay
+			if(renderer.StartOverlay(true)) renderer.Finish();
+
+			// Redraw
+			General.Interface.RedrawDisplay();
+		}
+
+		// This is called when the selection is updated
+		protected override void OnUpdateMultiSelection()
+		{
+			base.OnUpdateMultiSelection();
+
+			// Render selection
+			if(renderer.StartOverlay(true))
+			{
+				RenderMultiSelection();
+				renderer.Finish();
+				renderer.Present();
+			}
+		}
+		
+		// When copying
+		public override bool OnCopyBegin()
+		{
+			// No selection made? But we have a highlight!
+			if((General.Map.Map.GetSelectedVertices(true).Count == 0) && (highlighted != null))
+			{
+				// Make the highlight the selection
+				highlighted.Selected = true;
+
+				//mxd. Actually, we want it marked, not selected
+				bool result = base.OnCopyBegin(); 
+				highlighted.Selected = false;
+				return result;
+			}
+			
+			return base.OnCopyBegin();
+		}
+		
+		#endregion
+
+		#region ================== Actions
+
+		// This copies the properties
+		[BeginAction("classiccopyproperties")]
+		public void CopyProperties()
+		{
+			// Determine source vertices
+			ICollection<Vertex> sel = null;
+			if(General.Map.Map.SelectedVerticessCount > 0) sel = General.Map.Map.GetSelectedVertices(true);
+			else if(highlighted != null) sel = new List<Vertex> { highlighted };
+
+			if(sel != null)
+			{
+				// Copy properties from first source vertex
+				BuilderPlug.Me.CopiedVertexProps = new VertexProperties(General.GetByIndex(sel, 0));
+				General.Interface.DisplayStatus(StatusType.Action, "Copied vertex properties.");
+			}
+			else
+			{
+				//mxd
+				General.Interface.DisplayStatus(StatusType.Warning, "This action requires highlight or selection!");
+			}
+		}
+
+		// This pastes the properties
+		[BeginAction("classicpasteproperties")]
+		public void PasteProperties()
+		{
+			if(BuilderPlug.Me.CopiedVertexProps != null)
+			{
+				// Determine target vertices
+				ICollection<Vertex> sel = null;
+				if(General.Map.Map.SelectedVerticessCount > 0) sel = General.Map.Map.GetSelectedVertices(true);
+				else if(highlighted != null) sel = new List<Vertex> { highlighted };
+
+				if(sel != null)
+				{
+					// Apply properties to selection
+					string rest = (sel.Count == 1 ? "a single vertex" : sel.Count + " vertices"); //mxd
+					General.Map.UndoRedo.CreateUndo("Paste properties to " + rest);
+					foreach(Vertex v in sel)
+					{
+						BuilderPlug.Me.CopiedVertexProps.Apply(v, false);
+					}
+					General.Interface.DisplayStatus(StatusType.Action, "Pasted properties to " + rest + ".");
+
+					// Update and redraw
+					General.Map.IsChanged = true;
+					General.Interface.RefreshInfo();
+					General.Interface.RedrawDisplay();
+				}
+				else
+				{
+					//mxd
+					General.Interface.DisplayStatus(StatusType.Warning, "This action requires highlight or selection!");
+				}
+			}
+			else
+			{
+				//mxd
+				General.Interface.DisplayStatus(StatusType.Warning, "Copy vertex properties first!");
+			}
+		}
+
+		//mxd. This pastes the properties with options
+		[BeginAction("classicpastepropertieswithoptions")]
+		public void PastePropertiesWithOptions()
+		{
+			if(BuilderPlug.Me.CopiedVertexProps != null)
+			{
+				// Determine target vertices
+				ICollection<Vertex> sel = null;
+				if(General.Map.Map.SelectedVerticessCount > 0) sel = General.Map.Map.GetSelectedVertices(true);
+				else if(highlighted != null) sel = new List<Vertex> { highlighted };
+
+				if(sel != null)
+				{
+					PastePropertiesOptionsForm form = new PastePropertiesOptionsForm();
+					if(form.Setup(MapElementType.VERTEX) && form.ShowDialog(General.Interface) == DialogResult.OK)
+					{
+						// Apply properties to selection
+						string rest = (sel.Count == 1 ? "a single vertex" : sel.Count + " vertices");
+						General.Map.UndoRedo.CreateUndo("Paste properties with options to " + rest);
+						foreach(Vertex v in sel)
+						{
+							BuilderPlug.Me.CopiedVertexProps.Apply(v, true);
+						}
+						General.Interface.DisplayStatus(StatusType.Action, "Pasted properties with options to " + rest + ".");
+
+						// Update and redraw
+						General.Map.IsChanged = true;
+						General.Interface.RefreshInfo();
+						General.Interface.RedrawDisplay();
+					}
+				}
+				else
+				{
+					General.Interface.DisplayStatus(StatusType.Warning, "This action requires highlight or selection!");
+				}
+			}
+			else
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "Copy vertex properties first!");
+			}
+		}
+
+		// This clears the selection
+		[BeginAction("clearselection", BaseAction = true)]
+		public void ClearSelection()
+		{
+			// Clear selection
+			General.Map.Map.ClearAllSelected();
+
+			//mxd. Clear selection info
+			General.Interface.DisplayStatus(StatusType.Selection, string.Empty);
+
+			// Redraw
+			General.Interface.RedrawDisplay();
+		}
+		
+		// This creates a new vertex at the mouse position
+		[BeginAction("insertitem", BaseAction = true)]
+		public void InsertVertexAction() { VerticesMode.InsertVertex(mousemappos, renderer.Scale); }
+		public static void InsertVertex(Vector2D mousemappos, float rendererscale)
+		{
+			bool snaptogrid = General.Interface.ShiftState ^ General.Interface.SnapToGrid;
+			bool snaptonearest = General.Interface.CtrlState ^ General.Interface.AutoMerge;
+
+			// Mouse in window?
+			if(General.Interface.MouseInDisplay)
+			{
+				Vector2D insertpos;
+
+				// Create undo
+				General.Map.UndoRedo.CreateUndo("Insert vertex");
+
+				// Snap to geometry?
+				Linedef l = General.Map.Map.NearestLinedefRange(mousemappos, BuilderPlug.Me.SplitLinedefsRange / rendererscale);
+				if(snaptonearest && (l != null))
+				{
+					// Snip to grid also?
+					if(snaptogrid)
+					{
+						// Find all points where the grid intersects the line
+						List<Vector2D> points = l.GetGridIntersections();
+						if(points.Count == 0) 
+						{
+							//mxd. Just use the nearest point on line
+							insertpos = l.NearestOnLine(mousemappos);
+						} 
+						else 
+						{
+							insertpos = mousemappos;
+							float distance = float.MaxValue;
+							foreach(Vector2D p in points) 
+							{
+								float pdist = Vector2D.DistanceSq(p, mousemappos);
+								if(pdist < distance) 
+								{
+									insertpos = p;
+									distance = pdist;
+								}
+							}
+						}
+					}
+					else
+					{
+						// Just use the nearest point on line
+						insertpos = l.NearestOnLine(mousemappos);
+					}
+				}
+				// Snap to grid?
+				else if(snaptogrid)
+				{
+					// Snap to grid
+					insertpos = General.Map.Grid.SnappedToGrid(mousemappos);
+				}
+				else
+				{
+					// Just insert here, don't snap to anything
+					insertpos = mousemappos;
+				}
+
+				// Make the vertex
+				Vertex v = General.Map.Map.CreateVertex(insertpos);
+				if(v == null)
+				{
+					General.Map.UndoRedo.WithdrawUndo();
+					return;
+				}
+
+				// Snap to map format accuracy
+				v.SnapToAccuracy();
+
+				// Split the line with this vertex
+				if(snaptonearest)
+				{
+					//mxd. Check if snapped vertex is still on top of a linedef
+					l = General.Map.Map.NearestLinedefRange(v.Position, BuilderPlug.Me.SplitLinedefsRange / rendererscale);
+					
+					if(l != null) 
+					{
+						//mxd
+						if(v.Position == l.Start.Position || v.Position == l.End.Position) 
+						{
+							General.Interface.DisplayStatus(StatusType.Info, "There's already a vertex here.");
+							General.Map.UndoRedo.WithdrawUndo();
+							return;
+						}
+						
+						General.Interface.DisplayStatus(StatusType.Action, "Split a linedef.");
+						Linedef sld = l.Split(v);
+						if(sld == null) 
+						{
+							General.Map.UndoRedo.WithdrawUndo(); 
+							return;
+						}
+						//BuilderPlug.Me.AdjustSplitCoordinates(l, sld);
+					}
+				}
+				else
+				{
+					General.Interface.DisplayStatus(StatusType.Action, "Inserted a vertex.");
+				}
+
+				// Update
+				General.Map.Map.Update();
+
+				// Redraw screen
+				General.Interface.RedrawDisplay();
+			}
+		}
+
+		[BeginAction("deleteitem", BaseAction = true)]
+		public void DeleteItem() 
+		{
+			// Make list of selected vertices
+			ICollection<Vertex> selected = General.Map.Map.GetSelectedVertices(true);
+			if((selected.Count == 0) && (highlighted != null) && !highlighted.IsDisposed) selected.Add(highlighted);
+			if(selected.Count == 0) return;
+
+			// Make undo
+			if(selected.Count > 1) 
+			{
+				General.Map.UndoRedo.CreateUndo("Delete " + selected.Count + " vertices");
+				General.Interface.DisplayStatus(StatusType.Action, "Deleted " + selected.Count + " vertices.");
+			} 
+			else 
+			{
+				General.Map.UndoRedo.CreateUndo("Delete vertex");
+				General.Interface.DisplayStatus(StatusType.Action, "Deleted a vertex.");
+			}
+
+			// Go for all vertices that need to be removed
+			foreach(Vertex v in selected) 
+			{
+				// Not already removed automatically?
+				if(!v.IsDisposed) 
+				{
+					// If the vertex only has 2 linedefs attached, then merge the linedefs
+					if(v.Linedefs.Count == 2) 
+					{
+						Linedef ld1 = General.GetByIndex(v.Linedefs, 0);
+						Linedef ld2 = General.GetByIndex(v.Linedefs, 1);
+						Vertex v2 = (ld2.Start == v) ? ld2.End : ld2.Start;
+						if(ld1.Start == v) ld1.SetStartVertex(v2); else ld1.SetEndVertex(v2);
+						ld2.Dispose();
+					}
+
+					// Trash vertex
+					v.Dispose();
+				}
+			}
+
+			// Update cache values
+			General.Map.IsChanged = true;
+			General.Map.Map.Update();
+
+			// Invoke a new mousemove so that the highlighted item updates
+			MouseEventArgs e = new MouseEventArgs(MouseButtons.None, 0, (int)mousepos.x, (int)mousepos.y, 0);
+			OnMouseMove(e);
+
+			// Redraw screen
+			UpdateSelectionInfo(); //mxd
+			General.Map.Renderer2D.UpdateExtraFloorFlag(); //mxd
+			General.Interface.RedrawDisplay();
+		}
+
+		[BeginAction("dissolveitem", BaseAction = true)] //mxd
+		public void DissolveItem() 
+		{
+			// Make list of selected vertices
+			ICollection<Vertex> selected = General.Map.Map.GetSelectedVertices(true);
+			if(selected.Count == 0) 
+			{
+				if(highlighted == null || highlighted.IsDisposed) return;
+				selected.Add(highlighted);
+			}
+
+			// Make undo
+			if(selected.Count > 1) 
+			{
+				General.Map.UndoRedo.CreateUndo("Dissolve " + selected.Count + " vertices");
+				General.Interface.DisplayStatus(StatusType.Action, "Dissolved " + selected.Count + " vertices.");
+			} 
+			else 
+			{
+				General.Map.UndoRedo.CreateUndo("Dissolve vertex");
+				General.Interface.DisplayStatus(StatusType.Action, "Dissolved a vertex.");
+			}
+
+			//collect linedefs count per vertex
+			Dictionary<Vertex, int> linesPerVertex = new Dictionary<Vertex, int>();
+			foreach(Vertex v in selected) 
+			{
+				linesPerVertex.Add(v, v.Linedefs.Count);
+			}
+
+			// Go for all vertices that need to be removed
+			foreach(Vertex v in selected) 
+			{
+				// Not already removed automatically?
+				if(!v.IsDisposed) 
+				{
+					// If the vertex only had 2 linedefs attached, then merge the linedefs
+					if(linesPerVertex[v] == 2) 
+					{
+						Linedef ld1 = General.GetByIndex(v.Linedefs, 0);
+						Linedef ld2 = General.GetByIndex(v.Linedefs, 1);
+						Vertex v1 = (ld1.Start == v) ? ld1.End : ld1.Start;
+						Vertex v2 = (ld2.Start == v) ? ld2.End : ld2.Start;
+
+						//don't merge if it will collapse 3-sided sector
+						bool dontMerge = false;
+						foreach(Linedef l in v1.Linedefs) 
+						{
+							if(l == ld2) continue;
+							if(l.Start == v2 || l.End == v2) 
+							{
+								TryJoinSectors(l);
+								dontMerge = true;
+								break;
+							}
+						}
+
+						if(!dontMerge) MergeLines(selected, ld1, ld2, v);
+					}
+
+					// Trash vertex
+					v.Dispose();
+				}
+			}
+
+			// Update cache values
+			General.Map.Map.Update();
+			General.Map.IsChanged = true;
+
+			// Invoke a new mousemove so that the highlighted item updates
+			MouseEventArgs e = new MouseEventArgs(MouseButtons.None, 0, (int)mousepos.x, (int)mousepos.y, 0);
+			OnMouseMove(e);
+
+			// Redraw screen
+			UpdateSelectionInfo(); //mxd
+			General.Map.Renderer2D.UpdateExtraFloorFlag(); //mxd
+			General.Interface.RedrawDisplay();
+		}
+
+		[BeginAction("placethings")] //mxd
+		public void PlaceThings() 
+		{
+			// Make list of selected vertices
+			ICollection<Vertex> selected = General.Map.Map.GetSelectedVertices(true);
+			if(selected.Count == 0) 
+			{
+				if(highlighted != null && !highlighted.IsDisposed)
+				{
+					selected.Add(highlighted);
+				} 
+				else 
+				{
+					General.Interface.DisplayStatus(StatusType.Warning, "This action requires selection of some description!");
+					return;
+				}
+			}
+
+			List<Vector2D> positions = new List<Vector2D>(selected.Count);
+			foreach(Vertex v in selected)
+				if(!positions.Contains(v.Position)) positions.Add(v.Position);
+			PlaceThingsAtPositions(positions);
+		}
+
+		//mxd
+		[BeginAction("selectsimilar")]
+		public void SelectSimilar() 
+		{
+			ICollection<Vertex> selection = General.Map.Map.GetSelectedVertices(true);
+
+			if(selection.Count == 0) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "This action requires a selection!");
+				return;
+			}
+
+			var form = new SelectSimilarElementOptionsPanel();
+			if(form.Setup(this)) form.ShowDialog();
+		}
+
+		#endregion
+
+		#region ================== Action assist (mxd)
+
+		//mxd
+		private static void MergeLines(ICollection<Vertex> selected, Linedef ld1, Linedef ld2, Vertex v) 
+		{
+			Vertex v1 = (ld1.Start == v) ? ld1.End : ld1.Start;
+			Vertex v2 = (ld2.Start == v) ? ld2.End : ld2.Start;
+
+			if(ld1.Start == v) ld1.SetStartVertex(v2);
+			else ld1.SetEndVertex(v2);
+			ld2.Dispose();
+			bool redraw = true;
+
+			if(!v2.IsDisposed && selected.Contains(v2) && v2.Linedefs.Count == 2) 
+			{
+				Linedef[] lines = new Linedef[2];
+				v2.Linedefs.CopyTo(lines, 0);
+				Linedef other = lines[0] == ld2 ? lines[1] :lines[0];
+
+				MergeLines(selected, ld1, other, v2);
+				v2.Dispose();
+				redraw = false;
+			}
+
+			if(!v1.IsDisposed && selected.Contains(v1) && v1.Linedefs.Count == 2) 
+			{
+				Linedef[] lines = new Linedef[2];
+				v1.Linedefs.CopyTo(lines, 0);
+				Linedef other = lines[0] == ld1 ? lines[1] : lines[0];
+
+				MergeLines(selected, other, ld1, v1);
+				v1.Dispose();
+				redraw = false;
+			}
+
+			if(redraw && ld1.Start != null && ld1.End != null) 
+			{
+				Vector2D start = ld1.Start.Position;
+				Vector2D end = ld1.End.Position;
+				ld1.Dispose();
+				DrawLine(start, end);
+			} 
+			else 
+			{
+				ld1.Dispose();
+			}
+		}
+
+		//mxd
+		private static void DrawLine(Vector2D start, Vector2D end) 
+		{
+			DrawnVertex dv1 = new DrawnVertex();
+			DrawnVertex dv2 = new DrawnVertex();
+			dv1.stitchline = true;
+			dv2.stitchline = true;
+			dv1.stitch = true;
+			dv2.stitch = true;
+			dv1.pos = start;
+			dv2.pos = end;
+			Tools.DrawLines(new List<DrawnVertex>() { dv1, dv2 }, false, false);
+
+			// Update cache values
+			General.Map.Map.Update();
+			General.Map.IsChanged = true;
+		}
+
+		//mxd. If there are different sectors on both sides of given linedef, join them
+		private static void TryJoinSectors(Linedef ld) 
+		{
+			if(ld.IsDisposed) return;
+
+			if(ld.Front != null && ld.Front.Sector != null && ld.Back != null 
+				&& ld.Back.Sector != null && ld.Front.Sector.Index != ld.Back.Sector.Index) 
+			{
+				if(ld.Front.Sector.BBox.Width * ld.Front.Sector.BBox.Height > ld.Back.Sector.BBox.Width * ld.Back.Sector.BBox.Height)
+					ld.Back.Sector.Join(ld.Front.Sector);
+				else
+					ld.Front.Sector.Join(ld.Back.Sector);
+			}
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ErrorChecks/CheckClosedSectors.cs b/Source/Plugins/BuilderModes/ErrorChecks/CheckClosedSectors.cs
new file mode 100644
index 0000000..7218be0
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ErrorChecks/CheckClosedSectors.cs
@@ -0,0 +1,185 @@
+
+#region ================== Copyright (c) 2009 Boris Iwanski
+
+/*
+ * Copyright (c) 2009 Boris Iwanski
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Map;
+using System.Threading;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[ErrorChecker("Check invalid sectors", true, 300)]
+	public class CheckClosedSectors : ErrorChecker
+	{
+		#region ================== Constants
+
+		private const int PROGRESS_STEP = 40;
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		// Constructor
+		public CheckClosedSectors()
+		{
+			// Total progress is done when all sectors are checked
+			SetTotalProgress(General.Map.Map.Sectors.Count / PROGRESS_STEP);
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+		
+		// This runs the check
+		public override void Run()
+		{
+			int progress = 0;
+			int stepprogress = 0;
+			
+			// This is a simple yet effective way to check if a sector is closed.
+			// Each sidedef that belongs to a sector is checked out. The lines vertices
+			// are used as the key in a Dictionary. While going through all the
+			// sidedefs the values associated to the keys are set with a bitwise OR.
+			//
+			// The idea for this method was taken from the way DEU checks for closed
+			// sectors
+			//
+			// The starting vertex of the side gets its 1 bit set, the ending  vertex
+			// of the side gets its 2 bit set.
+			// The resulting dictionary will have 1, 2 or 3 as values (unlike the DEU
+			// version 0 will not appear here, since we only look at sides that belong
+			// to the current sector).
+			// Values 1 and 2 mean that a line they belong to has no side belonging to
+			// the current sector, thereby making the sector unclosed.
+			// A value of 3 usually means all lines belonging to that vertex have at least
+			// one side referencing the current sector. There are (rare) cases where this
+			// is not true, so a second check is done for all "opposite" vertices of the
+			// vertices with values 1 and 2: if the opposite vertex has a value of 3, but
+			// the line between the two vertices has no side referencing the current sector,
+			// then this falsely good vertex is added to the holes, too
+
+			// Go for all the sectors
+			foreach(Sector s in General.Map.Map.Sectors)
+			{
+				List<Vertex> foundholes = new List<Vertex>();
+				Dictionary<Vertex, int> vertices = new Dictionary<Vertex, int>();
+
+				// look at each side that belongs to the current sector
+				foreach(Sidedef sd in s.Sidedefs)
+				{
+					// Add the lines starting vertex to the Dictionary if it's not yet present
+					if(!vertices.ContainsKey(sd.Line.Start))
+					{
+						vertices.Add(sd.Line.Start, 0);
+					}
+
+					// Add the lines ending vertex to the Dictionary if it's not yet present
+					if(!vertices.ContainsKey(sd.Line.End))
+					{
+						vertices.Add(sd.Line.End, 0);
+					}
+
+					// enable the 1 bit of the start vertex and the 2 bit of the end vertex of the side
+					// This is from the sides point of view, where the side is always the "right" of line,
+					// so start and end are flipped depending if the current side is the front of the
+					// line or not
+					if(sd.IsFront) 
+					{
+						vertices[sd.Line.Start] |= 1;
+						vertices[sd.Line.End] |= 2;
+					}
+					else
+					{
+						vertices[sd.Line.End] |= 1;
+						vertices[sd.Line.Start] |= 2;
+					}
+				}
+
+				// look at all the vertices
+				foreach(KeyValuePair<Vertex, int> kvp in vertices)
+				{
+					// only look at bad vertices
+					if(kvp.Value != 3)
+					{
+						// add the current vertex to the holes list
+						if(!foundholes.Contains(kvp.Key))
+						{
+							foundholes.Add(kvp.Key);
+						}
+
+						// this checks if any vertices slipped past the first test
+						// look at all lines that share the current vertex
+						foreach(Linedef cl in kvp.Key.Linedefs)
+						{
+							// the line does not has its front or back side referencing the current sector
+							if(!((cl.Front != null && cl.Front.Sector == s) || (cl.Back != null && cl.Back.Sector == s)))
+							{
+								// if the opposite vertex of our current vertex is marked good something must be wrong,
+								// since the above check tells us that the line bewtween the vertices has no side referencing
+								// the current sector. So add the falsely marked vertex to the holes list
+								if(vertices.ContainsKey(cl.Start) && vertices[cl.Start] == 3 && !foundholes.Contains(cl.Start))
+								{
+									foundholes.Add(cl.Start);
+								}
+
+								if(vertices.ContainsKey(cl.End) && vertices[cl.End] == 3 && !foundholes.Contains(cl.End))
+								{
+									foundholes.Add(cl.End);
+								}
+							}
+						}
+					}
+				}
+
+				// Add report when holes have been found
+				if(foundholes.Count > 0)
+				{
+					SubmitResult(new ResultSectorUnclosed(s, foundholes));
+				}
+				//mxd. Add report when sector has less than 3 sidedefs
+				else if(s.Sidedefs.Count < 3 || s.BBox.IsEmpty)
+				{
+					SubmitResult(new ResultSectorInvalid(s));
+				}
+				//mxd. Add report when sector has less than 3 linedefs
+				else
+				{
+					HashSet<Linedef> lines = new HashSet<Linedef>();
+					foreach(Sidedef side in s.Sidedefs)
+						if(side.Line != null && !lines.Contains(side.Line)) lines.Add(side.Line);
+
+					if(lines.Count < 3) SubmitResult(new ResultSectorInvalid(s));
+				}
+
+				// Handle thread interruption
+				try { Thread.Sleep(0); }
+				catch(ThreadInterruptedException) { return; }
+
+				// We are making progress!
+				if((++progress / PROGRESS_STEP) > stepprogress)
+				{
+					stepprogress = (progress / PROGRESS_STEP);
+					AddProgress(1);
+				}
+			}
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ErrorChecks/CheckLineReferences.cs b/Source/Plugins/BuilderModes/ErrorChecks/CheckLineReferences.cs
new file mode 100644
index 0000000..ea89682
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ErrorChecks/CheckLineReferences.cs
@@ -0,0 +1,93 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using CodeImp.DoomBuilder.Map;
+using System.Threading;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[ErrorChecker("Check line references", true, 50)]
+	public class CheckLineReferences : ErrorChecker
+	{
+		#region ================== Constants
+
+		private const int PROGRESS_STEP = 1000;
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		// Constructor
+		public CheckLineReferences()
+		{
+			// Total progress is done when all lines are checked
+			SetTotalProgress(General.Map.Map.Linedefs.Count / PROGRESS_STEP);
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+		
+		// This runs the check
+		public override void Run()
+		{
+			int progress = 0;
+			int stepprogress = 0;
+			
+			// Go for all the liendefs
+			foreach(Linedef l in General.Map.Map.Linedefs)
+			{
+				// Line has a back side but no front side?
+				if((l.Back != null) && (l.Front == null))
+				{
+					SubmitResult(new ResultLineMissingFront(l));
+				}
+				// Line has no sides at all?
+				else if((l.Back == null) && (l.Front == null))
+				{
+					SubmitResult(new ResultLineMissingSides(l));
+				}
+				// Line is marked double-sided, but has only one side?
+				else if(l.IsFlagSet(General.Map.Config.DoubleSidedFlag) && (l.Back == null))
+				{
+					SubmitResult(new ResultLineNotDoubleSided(l));
+				}
+				// Line is marked single-sided, and has two sides?
+				else if(!l.IsFlagSet(General.Map.Config.DoubleSidedFlag) && (l.Back != null))
+				{
+					SubmitResult(new ResultLineNotSingleSided(l));
+				}
+				
+				// Handle thread interruption
+				try { Thread.Sleep(0); }
+				catch(ThreadInterruptedException) { return; }
+
+				// We are making progress!
+				if((++progress / PROGRESS_STEP) > stepprogress)
+				{
+					stepprogress = (progress / PROGRESS_STEP);
+					AddProgress(1);
+				}
+			}
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ErrorChecks/CheckMapSize.cs b/Source/Plugins/BuilderModes/ErrorChecks/CheckMapSize.cs
new file mode 100644
index 0000000..c4670a2
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ErrorChecks/CheckMapSize.cs
@@ -0,0 +1,57 @@
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Map;
+using System.Threading;
+
+namespace CodeImp.DoomBuilder.BuilderModes.ErrorChecks
+{
+	[ErrorChecker("Check map size", true, 50)]
+	public class CheckMapSize : ErrorChecker
+	{
+		private const int PROGRESS_STEP = 1000;
+		internal const int MAXIMUM_DISTANCE = 32767;
+
+		// Constructor
+		public CheckMapSize() 
+		{
+			// Total progress is done when all vertices are checked
+			SetTotalProgress(General.Map.Map.Vertices.Count / PROGRESS_STEP);
+		}
+
+		// This runs the check
+		public override void Run() 
+		{
+			int progress = 0;
+			int stepprogress = 0;
+
+			float minx = int.MaxValue;
+			float maxx = int.MinValue;
+			float miny = int.MaxValue;
+			float maxy = int.MinValue;
+
+			// Go for all vertices
+			foreach(Vertex v in General.Map.Map.Vertices) 
+			{
+				if(v.Position.x < minx) minx = v.Position.x;
+				if(v.Position.x > maxx) maxx = v.Position.x;
+				if(v.Position.y < miny) miny = v.Position.y;
+				if(v.Position.y > maxy) maxy = v.Position.y;
+
+				// Handle thread interruption
+				try { Thread.Sleep(0); } catch(ThreadInterruptedException) { return; }
+
+				// We are making progress!
+				if((++progress / PROGRESS_STEP) > stepprogress) 
+				{
+					stepprogress = (progress / PROGRESS_STEP);
+					AddProgress(1);
+				}
+			}
+
+			// Map elements should not be more than 32767 mu apart
+			if(maxx - minx > MAXIMUM_DISTANCE || maxy - miny > MAXIMUM_DISTANCE)
+			{
+				SubmitResult(new ResultMapTooBig(new Vector2D(minx, miny), new Vector2D(maxx, maxy)));
+			}
+		}
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ErrorChecks/CheckMissingFlats.cs b/Source/Plugins/BuilderModes/ErrorChecks/CheckMissingFlats.cs
new file mode 100644
index 0000000..c8101fe
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ErrorChecks/CheckMissingFlats.cs
@@ -0,0 +1,61 @@
+#region ================== Namespaces
+
+using CodeImp.DoomBuilder.Map;
+using System.Threading;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[ErrorChecker("Check missing flats", true, 40)]
+	public class CheckMissingFlats : ErrorChecker
+	{
+		#region ================== Constants
+
+		private const int PROGRESS_STEP = 1000;
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		// Constructor
+		public CheckMissingFlats() 
+		{
+			// Total progress is done when all sectors are checked
+			SetTotalProgress(General.Map.Map.Sectors.Count / PROGRESS_STEP);
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This runs the check
+		public override void Run() 
+		{
+			int progress = 0;
+			int stepprogress = 0;
+
+			// Go for all the sectors
+			foreach(Sector s in General.Map.Map.Sectors) 
+			{
+				// Check floor texture
+				if(s.LongFloorTexture == MapSet.EmptyLongName) SubmitResult(new ResultMissingFlat(s, false));
+
+				// Check ceiling texture
+				if(s.LongCeilTexture == MapSet.EmptyLongName) SubmitResult(new ResultMissingFlat(s, true));
+
+				// Handle thread interruption
+				try { Thread.Sleep(0); } catch(ThreadInterruptedException) { return; }
+
+				// We are making progress!
+				if((++progress / PROGRESS_STEP) > stepprogress) 
+				{
+					stepprogress = (progress / PROGRESS_STEP);
+					AddProgress(1);
+				}
+			}
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ErrorChecks/CheckMissingTextures.cs b/Source/Plugins/BuilderModes/ErrorChecks/CheckMissingTextures.cs
new file mode 100644
index 0000000..8631186
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ErrorChecks/CheckMissingTextures.cs
@@ -0,0 +1,102 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using CodeImp.DoomBuilder.Map;
+using System.Threading;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[ErrorChecker("Check missing textures", true, 80)]
+	public class CheckMissingTextures : ErrorChecker
+	{
+		#region ================== Constants
+
+		private const int PROGRESS_STEP = 1000;
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		// Constructor
+		public CheckMissingTextures()
+		{
+			// Total progress is done when all lines are checked
+			SetTotalProgress(General.Map.Map.Sidedefs.Count / PROGRESS_STEP);
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This runs the check
+		public override void Run()
+		{
+			int progress = 0;
+			int stepprogress = 0;
+
+			// Go for all the sidedefs
+			foreach(Sidedef sd in General.Map.Map.Sidedefs)
+			{
+				// Check upper texture. Also make sure not to return a false
+				// positive if the sector on the other side has the ceiling
+				// set to be sky
+				if(sd.HighRequired() && sd.HighTexture == "-")
+				{
+					if(sd.Line.Action == 181 && sd.Line.Args[1] > 0) continue; //mxd. Ceiling slopes doesn't require upper texture
+					if(sd.Other != null && sd.Other.Sector.CeilTexture != General.Map.Config.SkyFlatName)
+					{
+						SubmitResult(new ResultMissingTexture(sd, SidedefPart.Upper));
+					}
+				}
+
+				// Check middle texture
+				if(sd.MiddleRequired() && sd.MiddleTexture == "-")
+				{
+					SubmitResult(new ResultMissingTexture(sd, SidedefPart.Middle));
+				}
+
+				// Check lower texture. Also make sure not to return a false
+				// positive if the sector on the other side has the floor
+				// set to be sky
+				if(sd.LowRequired() && sd.LowTexture == "-")
+				{
+					if(sd.Line.Action == 181 && sd.Line.Args[0] > 0) continue; //mxd. Floor slopes doesn't require lower texture
+					if(sd.Other != null && sd.Other.Sector.FloorTexture != General.Map.Config.SkyFlatName)
+					{
+						SubmitResult(new ResultMissingTexture(sd, SidedefPart.Lower));
+					}
+				}
+
+				// Handle thread interruption
+				try { Thread.Sleep(0); }
+				catch (ThreadInterruptedException) { return; }
+
+				// We are making progress!
+				if((++progress / PROGRESS_STEP) > stepprogress)
+				{
+					stepprogress = (progress / PROGRESS_STEP);
+					AddProgress(1);
+				}
+			}
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ErrorChecks/CheckObsoleteThings.cs b/Source/Plugins/BuilderModes/ErrorChecks/CheckObsoleteThings.cs
new file mode 100644
index 0000000..d62b6c8
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ErrorChecks/CheckObsoleteThings.cs
@@ -0,0 +1,61 @@
+#region ================== Namespaces
+
+using System.Threading;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Map;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[ErrorChecker("Check obsolete things", true, 50)]
+	public class CheckObsoleteThings : ErrorChecker
+	{
+		#region ================== Constants
+
+		private const int PROGRESS_STEP = 10;
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		public CheckObsoleteThings()	
+		{
+			// Total progress is done when all things are checked
+			SetTotalProgress(General.Map.Map.Things.Count / PROGRESS_STEP);
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This runs the check
+		public override void Run() 
+		{
+			int progress = 0;
+			int stepprogress = 0;
+
+			// Go for all things
+			foreach(Thing t in General.Map.Map.Things) 
+			{
+				ThingTypeInfo info = General.Map.Data.GetThingInfoEx(t.Type);
+				if(info != null && info.IsObsolete)
+				{
+					SubmitResult(new ResultObsoleteThing(t, info.ObsoleteMessage));
+				}
+
+				// Handle thread interruption
+				try { Thread.Sleep(0); } catch(ThreadInterruptedException) { return; }
+
+				// We are making progress!
+				if((++progress / PROGRESS_STEP) > stepprogress) 
+				{
+					stepprogress = (progress / PROGRESS_STEP);
+					AddProgress(1);
+				}
+			}	
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ErrorChecks/CheckOverlappingLines.cs b/Source/Plugins/BuilderModes/ErrorChecks/CheckOverlappingLines.cs
new file mode 100644
index 0000000..4b307ef
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ErrorChecks/CheckOverlappingLines.cs
@@ -0,0 +1,137 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Map;
+using System.Threading;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[ErrorChecker("Check overlapping lines", true, 500)]
+	public class CheckOverlappingLines : ErrorChecker
+	{
+		#region ================== Constants
+
+		private const int PROGRESS_STEP = 100;
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		// Constructor
+		public CheckOverlappingLines()
+		{
+			// Total progress is done when all lines are checked
+			SetTotalProgress(General.Map.Map.Linedefs.Count / PROGRESS_STEP);
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+		
+		// This runs the check
+		public override void Run()
+		{
+			Dictionary<Linedef, Linedef> donelines = new Dictionary<Linedef, Linedef>();
+			BlockMap<BlockEntry> blockmap = BuilderPlug.Me.ErrorCheckForm.BlockMap;
+			int progress = 0;
+			int stepprogress = 0;
+
+			// Go for all the liendefs
+			foreach(Linedef l in General.Map.Map.Linedefs)
+			{
+				// Check if not already done
+				if(!donelines.ContainsKey(l))
+				{
+					// And go for all the linedefs that could overlap
+					List<BlockEntry> blocks = blockmap.GetLineBlocks(l.Start.Position, l.End.Position);
+					Dictionary<Linedef, Linedef> doneblocklines = new Dictionary<Linedef, Linedef>(blocks.Count * 3);
+					foreach(BlockEntry b in blocks)
+					{
+						foreach(Linedef d in b.Lines)
+						{
+							// Not the same line and not already checked
+							if(!object.ReferenceEquals(l, d) && !doneblocklines.ContainsKey(d))
+							{
+								float lu, du;
+								
+								//mxd. This can also happen. I suppose. Some people manage to do this. I dunno how, but they do...
+								if((l.Start.Position == d.Start.Position && l.End.Position == d.End.Position)
+									|| (l.Start.Position == d.End.Position && l.End.Position == d.Start.Position)) 
+								{
+									SubmitResult(new ResultLineOverlapping(l, d));
+									donelines[d] = d;
+								} 
+								else if(l.Line.GetIntersection(d.Line, out du, out lu)) 
+								{
+									// Check if the lines touch. Note that I don't include 0.0 and 1.0 here because
+									// the lines may be touching at the ends when sharing the same vertex.
+									if(General.Map.FormatInterface.VertexDecimals > 0) //mxd
+									{
+										lu = (float)Math.Round(lu, General.Map.FormatInterface.VertexDecimals);
+										du = (float)Math.Round(du, General.Map.FormatInterface.VertexDecimals);
+									}
+									
+									if((lu > 0.0f) && (lu < 1.0f) && (du > 0.0f) && (du < 1.0f))
+									{
+										// Check if not the same sector on all sides
+										Sector samesector = null;
+										if(l.Front != null) samesector = l.Front.Sector;
+										else if(l.Back != null) samesector = l.Back.Sector;
+										else if(d.Front != null) samesector = d.Front.Sector;
+										else if(d.Back != null) samesector = d.Back.Sector;
+										
+										if((l.Front == null) || (l.Front.Sector != samesector)) samesector = null;
+										else if((l.Back == null) || (l.Back.Sector != samesector)) samesector = null;
+										else if((d.Front == null) || (d.Front.Sector != samesector)) samesector = null;
+										else if((d.Back == null) || (d.Back.Sector != samesector)) samesector = null;
+
+										if(samesector == null)
+										{
+											SubmitResult(new ResultLineOverlapping(l, d));
+											donelines[d] = d;
+										}
+									}
+								}
+								
+								// Checked
+								doneblocklines.Add(d, d);
+							}
+						}
+					}
+				}
+				
+				// Handle thread interruption
+				try { Thread.Sleep(0); }
+				catch(ThreadInterruptedException) { return; }
+
+				// We are making progress!
+				if((++progress / PROGRESS_STEP) > stepprogress)
+				{
+					stepprogress = (progress / PROGRESS_STEP);
+					AddProgress(1);
+				}
+			}
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ErrorChecks/CheckOverlappingVertices.cs b/Source/Plugins/BuilderModes/ErrorChecks/CheckOverlappingVertices.cs
new file mode 100644
index 0000000..c3c4b9a
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ErrorChecks/CheckOverlappingVertices.cs
@@ -0,0 +1,79 @@
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Map;
+using System.Threading;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[ErrorChecker("Check overlapping vertices", true, 500)]
+	public class CheckOverlappingVertices : ErrorChecker
+	{
+		#region ================== Constants
+
+		private const int PROGRESS_STEP = 100;
+
+		#endregion
+		
+		#region ================== Constructor / Destructor
+
+		// Constructor
+		public CheckOverlappingVertices() 
+		{
+			// Total progress is done when all lines are checked
+			SetTotalProgress(General.Map.Map.Vertices.Count / PROGRESS_STEP);
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+		
+		// This runs the check
+		public override void Run() 
+		{
+			BlockMap<BlockEntry> blockmap = BuilderPlug.Me.ErrorCheckForm.BlockMap;
+			Dictionary<Vertex, List<Vertex>> doneverts = new Dictionary<Vertex, List<Vertex>>();
+			int progress = 0;
+			int stepprogress = 0;
+
+			// Go for all the verts
+			foreach(Vertex v in General.Map.Map.Vertices) 
+			{
+				BlockEntry block = blockmap.GetBlockAt(v.Position);
+
+				// Go for all the linedefs that our vertex could overlap
+				foreach(Linedef l in block.Lines) 
+				{
+					if(v == l.Start || v == l.End) continue;
+					if((float)Math.Round(l.Line.GetDistanceToLine(v.Position, true), 3) == 0)
+						SubmitResult(new ResultVertexOverlappingLine(v, l));
+				}
+
+				// Go for all the verts that our vertex could overlap
+				foreach(Vertex bv in block.Vertices) 
+				{
+					if(bv == v || (doneverts.ContainsKey(v) && doneverts[v].Contains(bv)) || (doneverts.ContainsKey(bv) && doneverts[bv].Contains(v))) continue;
+					if(bv.Position == v.Position) SubmitResult(new ResultVertexOverlappingVertex(v, bv));
+					if(!doneverts.ContainsKey(v)) doneverts.Add(v, new List<Vertex>());
+					doneverts[v].Add(bv);
+				}
+				
+				// Handle thread interruption
+				try { Thread.Sleep(0); }
+				catch(ThreadInterruptedException) { return; }
+
+				// We are making progress!
+				if((++progress / PROGRESS_STEP) > stepprogress) 
+				{
+					stepprogress = (progress / PROGRESS_STEP);
+					AddProgress(1);
+				}
+			}
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ErrorChecks/CheckShortLinedefs.cs b/Source/Plugins/BuilderModes/ErrorChecks/CheckShortLinedefs.cs
new file mode 100644
index 0000000..faf77af
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ErrorChecks/CheckShortLinedefs.cs
@@ -0,0 +1,41 @@
+using CodeImp.DoomBuilder.Map;
+using System.Threading;
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[ErrorChecker("Check very short linedefs", false, 10)]
+	public class CheckShortLinedefs : ErrorChecker
+	{
+		private const int PROGRESS_STEP = 1000;
+		
+		// Constructor
+		public CheckShortLinedefs() 
+		{
+			// Total progress is done when all linedefs are checked
+			SetTotalProgress(General.Map.Map.Linedefs.Count / PROGRESS_STEP);
+		}
+
+		// This runs the check
+		public override void Run() 
+		{
+			int progress = 0;
+			int stepprogress = 0;
+
+			// Go for all linedefs
+			foreach(Linedef l in General.Map.Map.Linedefs) 
+			{
+				if(l.Length < 1.0f) SubmitResult(new ResultShortLinedef(l));
+
+				// Handle thread interruption
+				try { Thread.Sleep(0); } catch(ThreadInterruptedException) { return; }
+
+				// We are making progress!
+				if((++progress / PROGRESS_STEP) > stepprogress) 
+				{
+					stepprogress = (progress / PROGRESS_STEP);
+					AddProgress(1);
+				}
+			}
+		}
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ErrorChecks/CheckStrayVertices.cs b/Source/Plugins/BuilderModes/ErrorChecks/CheckStrayVertices.cs
new file mode 100644
index 0000000..a945953
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ErrorChecks/CheckStrayVertices.cs
@@ -0,0 +1,41 @@
+using CodeImp.DoomBuilder.Map;
+using System.Threading;
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[ErrorChecker("Check unconnected vertices", true, 50)]
+	public class CheckStrayVertices : ErrorChecker
+	{
+		private const int PROGRESS_STEP = 1000;
+
+		// Constructor
+		public CheckStrayVertices() 
+		{
+			// Total progress is done when all vertices are checked
+			SetTotalProgress(General.Map.Map.Vertices.Count / PROGRESS_STEP);
+		}
+
+		// This runs the check
+		public override void Run() 
+		{
+			int progress = 0;
+			int stepprogress = 0;
+
+			// Go for all vertices
+			foreach(Vertex v in General.Map.Map.Vertices) 
+			{
+				if(v.Linedefs == null || v.Linedefs.Count == 0) SubmitResult(new ResultStrayVertex(v));
+
+				// Handle thread interruption
+				try { Thread.Sleep(0); } catch(ThreadInterruptedException) { return; }
+
+				// We are making progress!
+				if((++progress / PROGRESS_STEP) > stepprogress) 
+				{
+					stepprogress = (progress / PROGRESS_STEP);
+					AddProgress(1);
+				}
+			}
+		}
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ErrorChecks/CheckStuckThings.cs b/Source/Plugins/BuilderModes/ErrorChecks/CheckStuckThings.cs
new file mode 100644
index 0000000..7c76ef8
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ErrorChecks/CheckStuckThings.cs
@@ -0,0 +1,275 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Config;
+using System.Threading;
+using System.Drawing;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[ErrorChecker("Check stuck things", true, 1000)]
+	public class CheckStuckThings : ErrorChecker
+	{
+		#region ================== Constants
+
+		private const int PROGRESS_STEP = 10;
+		private const float ALLOWED_STUCK_DISTANCE = 6.0f;
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		// Constructor
+		public CheckStuckThings()
+		{
+			// Total progress is done when all things are checked
+			SetTotalProgress(General.Map.Map.Things.Count / PROGRESS_STEP);
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+		
+		// This runs the check
+		public override void Run()
+		{
+			BlockMap<BlockEntry> blockmap = BuilderPlug.Me.ErrorCheckForm.BlockMap;
+			int progress = 0;
+			int stepprogress = 0;
+			float maxradius = 0;
+			Dictionary<int, HashSet<int>> processedthingpairs = new Dictionary<int, HashSet<int>>(); //mxd
+
+			foreach(ThingTypeInfo tti in General.Map.Data.ThingTypes)
+			{
+				if(tti.Radius > maxradius) maxradius = tti.Radius;
+			}
+
+			// Go for all the things
+			foreach(Thing t in General.Map.Map.Things)
+			{
+				ThingTypeInfo info = General.Map.Data.GetThingInfo(t.Type);
+				bool stuck = false;
+
+				// Check this thing for getting stuck?
+				if( (info.ErrorCheck == ThingTypeInfo.THING_ERROR_INSIDE_STUCK) &&
+					(info.Blocking > ThingTypeInfo.THING_BLOCKING_NONE))
+				{
+					// Make square coordinates from thing
+					float blockingsize = t.Size - ALLOWED_STUCK_DISTANCE;
+					Vector2D lt = new Vector2D(t.Position.x - blockingsize, t.Position.y - blockingsize);
+					Vector2D rb = new Vector2D(t.Position.x + blockingsize, t.Position.y + blockingsize);
+					Vector2D bmlt = new Vector2D(t.Position.x - maxradius, t.Position.y - maxradius);
+					Vector2D bmrb = new Vector2D(t.Position.x + maxradius, t.Position.y + maxradius);
+
+					// Go for all the lines to see if this thing is stuck
+					List<BlockEntry> blocks = blockmap.GetSquareRange(new RectangleF(bmlt.x, bmlt.y, (bmrb.x - bmlt.x), (bmrb.y - bmlt.y)));
+					Dictionary<Linedef, Linedef> doneblocklines = new Dictionary<Linedef, Linedef>(blocks.Count * 3);
+
+					foreach(BlockEntry b in blocks)
+					{
+						foreach(Linedef l in b.Lines)
+						{
+							// Only test when sinlge-sided, two-sided + impassable and not already checked
+							if(((l.Back == null) || l.IsFlagSet(General.Map.Config.ImpassableFlag)) && !doneblocklines.ContainsKey(l))
+							{
+								// Test if line ends are inside the thing
+								if(PointInRect(lt, rb, l.Start.Position) || PointInRect(lt, rb, l.End.Position))
+								{
+									// Thing stuck in line!
+									stuck = true;
+									SubmitResult(new ResultStuckThingInLine(t, l));
+								}
+								// Test if the line intersects the square
+								else if(Line2D.GetIntersection(l.Start.Position, l.End.Position, lt.x, lt.y, rb.x, lt.y) ||
+										Line2D.GetIntersection(l.Start.Position, l.End.Position, rb.x, lt.y, rb.x, rb.y) ||
+										Line2D.GetIntersection(l.Start.Position, l.End.Position, rb.x, rb.y, lt.x, rb.y) ||
+										Line2D.GetIntersection(l.Start.Position, l.End.Position, lt.x, rb.y, lt.x, lt.y))
+								{
+									// Thing stuck in line!
+									stuck = true;
+									SubmitResult(new ResultStuckThingInLine(t, l));
+								}
+								
+								// Checked
+								doneblocklines.Add(l, l);
+							}
+						}
+
+						// Check if thing is stuck in other things
+						if(info.Blocking != ThingTypeInfo.THING_BLOCKING_NONE) 
+						{
+							foreach(Thing ot in b.Things)
+							{
+								// Don't compare the thing with itself
+								if(t.Index == ot.Index) continue;
+
+								// mxd. Don't compare already processed stuff
+								if(processedthingpairs.ContainsKey(t.Index) && processedthingpairs[t.Index].Contains(ot.Index)) continue;
+
+								// Only check of items that can block
+								if(General.Map.Data.GetThingInfo(ot.Type).Blocking == ThingTypeInfo.THING_BLOCKING_NONE) continue;
+
+								// need to compare the flags
+								if(FlagsOverlap(t, ot) && ThingsOverlap(t, ot))
+								{
+									stuck = true;
+									SubmitResult(new ResultStuckThingInThing(t, ot));
+								}
+
+								//mxd. Prepare collections
+								if(!processedthingpairs.ContainsKey(t.Index)) processedthingpairs.Add(t.Index, new HashSet<int>());
+								if(!processedthingpairs.ContainsKey(ot.Index)) processedthingpairs.Add(ot.Index, new HashSet<int>());
+
+								//mxd. Add both ways
+								processedthingpairs[t.Index].Add(ot.Index);
+								processedthingpairs[ot.Index].Add(t.Index);
+							}
+						}
+					}
+				}
+
+				// Check this thing for being outside the map?
+				if(!stuck && info.ErrorCheck >= ThingTypeInfo.THING_ERROR_INSIDE) 
+				{
+					// Get the nearest line to see if the thing is outside the map
+					bool outside;
+					Linedef l = General.Map.Map.NearestLinedef(t.Position);
+					if(l.SideOfLine(t.Position) <= 0) 
+					{
+						outside = (l.Front == null);
+					} 
+					else 
+					{
+						outside = (l.Back == null);
+					}
+
+					// Outside the map?
+					if(outside) 
+					{
+						// Make result
+						SubmitResult(new ResultThingOutside(t));
+					}
+				}
+				
+				// Handle thread interruption
+				try { Thread.Sleep(0); }
+				catch(ThreadInterruptedException) { return; }
+
+				// We are making progress!
+				if((++progress / PROGRESS_STEP) > stepprogress)
+				{
+					stepprogress = (progress / PROGRESS_STEP);
+					AddProgress(1);
+				}
+			}
+		}
+		
+		// Point in rect?
+		private static bool PointInRect(Vector2D lt, Vector2D rb, Vector2D p)
+		{
+			return (p.x >= lt.x) && (p.x <= rb.x) && (p.y <= lt.y) && (p.y >= rb.y);
+		}
+
+		// Checks if two things overlap
+		private static bool ThingsOverlap(Thing t1, Thing t2)
+		{
+			Vector3D p1 = t1.Position;
+			Vector3D p2 = t2.Position;
+			ThingTypeInfo t1info = General.Map.Data.GetThingInfo(t1.Type);
+			ThingTypeInfo t2info = General.Map.Data.GetThingInfo(t2.Type);
+	
+			// simple bounding box collision detection
+			if(		p1.x + t1.Size - ALLOWED_STUCK_DISTANCE < p2.x - t2.Size + ALLOWED_STUCK_DISTANCE ||
+					p1.x - t1.Size + ALLOWED_STUCK_DISTANCE > p2.x + t2.Size - ALLOWED_STUCK_DISTANCE ||
+					p1.y - t1.Size + ALLOWED_STUCK_DISTANCE > p2.y + t2.Size - ALLOWED_STUCK_DISTANCE ||
+					p1.y + t1.Size - ALLOWED_STUCK_DISTANCE < p2.y - t2.Size + ALLOWED_STUCK_DISTANCE)
+				return false;
+
+			// if either thing blocks full height there's no need to check the z-axis
+			if(t1info.Blocking == ThingTypeInfo.THING_BLOCKING_FULL || t2info.Blocking == ThingTypeInfo.THING_BLOCKING_FULL)
+				return true;
+
+			// check z-axis
+			if(p1.z > p2.z + t2info.Height || p1.z + t1info.Height < p2.z)
+				return false;
+
+			return true;
+		}
+		
+		// Checks if the flags of two things overlap (i.e. if they show up at the same time)
+		private static bool FlagsOverlap(Thing t1, Thing t2) 
+		{
+			if(General.Map.Config.ThingFlagsCompare.Count < 1) return true; //mxd. Otherwise, no things will ever overlap when ThingFlagsCompare is empty
+			Dictionary<string, ThingFlagsCompareResult> results = new Dictionary<string, ThingFlagsCompareResult>(General.Map.Config.ThingFlagsCompare.Count);
+
+			// Go through all flags in all groups and check if they overlap
+			foreach(ThingFlagsCompareGroup group in General.Map.Config.ThingFlagsCompare.Values)
+				results[group.Name] = group.Compare(t1, t2);
+
+			// Process Required/IgnoredGroups
+			foreach(ThingFlagsCompareResult result in results.Values)
+			{
+				// Group matters only when it contains overlapping flags
+				if(result.Result == 1)
+				{
+					// Ignore this group when RequiredGroup flags don't overlap
+					foreach(string requiredgroup in result.RequiredGroups)
+					{
+						if(results[requiredgroup].Result != 1)
+						{
+							result.Result = 0;
+							break;
+						}
+					}
+
+					// Ignore other groups when this one's flags overlap
+					if(result.Result == 1)
+					{
+						foreach(string ignoredgroup in result.IgnoredGroups)
+							results[ignoredgroup].Result = 0;
+					}
+				}
+			}
+
+			// Count overlapping groups
+			int overlappinggroupscount = 0;
+			int totalgroupscount = results.Values.Count;
+			foreach(ThingFlagsCompareResult result in results.Values)
+			{
+				switch(result.Result)
+				{
+					case  1: overlappinggroupscount++; break; // Group flags overlap
+					case  0: totalgroupscount--; break; // Ignored group should be ignored
+					case -1: return false; // Group flags don't overlap
+					default: throw new NotImplementedException("Unknown thing flags comparison result");
+				}
+			}
+
+			// All groups have to overlap for the things to show up at the same time
+			return (totalgroupscount > 0 && overlappinggroupscount == totalgroupscount);
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ErrorChecks/CheckTextureAlignment.cs b/Source/Plugins/BuilderModes/ErrorChecks/CheckTextureAlignment.cs
new file mode 100644
index 0000000..60733ee
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ErrorChecks/CheckTextureAlignment.cs
@@ -0,0 +1,335 @@
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Threading;
+using CodeImp.DoomBuilder.Data;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.VisualModes;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[ErrorChecker("Check texture alignment", false, 1000)]
+	public class CheckTextureAlignment : ErrorChecker
+	{
+		#region ================== Constants
+
+		private const int PROGRESS_STEP = 100;
+
+		#endregion
+
+		#region ================== Variables
+
+		// Now THAT'S what I call a collection! :)
+		private Dictionary<VisualGeometryType, Dictionary<int, Dictionary<VisualGeometryType, Dictionary<int, bool>>>> donesides;
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		// Constructor
+		public CheckTextureAlignment()
+		{
+			// Total progress is done when all lines are checked
+			SetTotalProgress(General.Map.Map.Linedefs.Count / PROGRESS_STEP);
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+		
+		// This runs the check
+		public override void Run()
+		{
+			donesides = new Dictionary<VisualGeometryType, Dictionary<int, Dictionary<VisualGeometryType, Dictionary<int, bool>>>>(3);
+			donesides.Add(VisualGeometryType.WALL_UPPER, new Dictionary<int, Dictionary<VisualGeometryType, Dictionary<int, bool>>>());
+			donesides.Add(VisualGeometryType.WALL_MIDDLE, new Dictionary<int, Dictionary<VisualGeometryType, Dictionary<int, bool>>>());
+			donesides.Add(VisualGeometryType.WALL_LOWER, new Dictionary<int, Dictionary<VisualGeometryType, Dictionary<int, bool>>>());
+			
+			int progress = 0;
+			int stepprogress = 0;
+
+			// Go for all the liendefs
+			foreach(Linedef l in General.Map.Map.Linedefs) 
+			{
+				// Check if we need to align any part of the front sidedef
+				if(l.Front != null) 
+				{
+					if(!donesides[VisualGeometryType.WALL_UPPER].ContainsKey(l.Front.Index))
+						CheckTopAlignment(l.Front);
+					if(!donesides[VisualGeometryType.WALL_MIDDLE].ContainsKey(l.Front.Index))
+						CheckMiddleAlignment(l.Front);
+					if(!donesides[VisualGeometryType.WALL_LOWER].ContainsKey(l.Front.Index))
+						CheckBottomAlignment(l.Front);
+				}
+
+				// Check if we need to align any part of the back sidedef
+				if(l.Back != null) 
+				{
+					if(!donesides[VisualGeometryType.WALL_UPPER].ContainsKey(l.Back.Index))
+						CheckTopAlignment(l.Back);
+					if(!donesides[VisualGeometryType.WALL_MIDDLE].ContainsKey(l.Back.Index))
+						CheckMiddleAlignment(l.Back);
+					if(!donesides[VisualGeometryType.WALL_LOWER].ContainsKey(l.Back.Index))
+						CheckBottomAlignment(l.Back);
+				}
+
+				// Handle thread interruption
+				try
+				{
+					Thread.Sleep(0);
+				}
+				catch (ThreadInterruptedException)
+				{
+					// Clear collection
+					donesides.Clear();
+					return;
+				}
+
+				// We are making progress!
+				if((++progress / PROGRESS_STEP) > stepprogress) 
+				{
+					stepprogress = (progress / PROGRESS_STEP);
+					AddProgress(1);
+				}
+			}
+
+			// Clear collection
+			donesides.Clear();
+		}
+
+		#endregion
+
+		#region ================== Alignment checks
+
+		private void CheckTopAlignment(Sidedef sidedef) 
+		{
+			if(!sidedef.HighRequired() || sidedef.LongHighTexture == MapSet.EmptyLongName) return;
+			
+			float scaleX = sidedef.Fields.GetValue("scalex_top", 1.0f);
+			float scaleY = sidedef.Fields.GetValue("scaley_top", 1.0f);
+			int localY = (int)Math.Round(sidedef.Fields.GetValue("offsety_top", 0.0f));
+
+			int x = sidedef.OffsetX + (int)Math.Round(sidedef.Fields.GetValue("offsetx_top", 0.0f));
+			int y = (int)Tools.GetSidedefTopOffsetY(sidedef, sidedef.OffsetY + localY, scaleY, false);
+			CheckAlignment(sidedef, x, y, scaleX, scaleY, VisualGeometryType.WALL_UPPER, sidedef.HighTexture);
+		}
+
+		private void CheckMiddleAlignment(Sidedef sidedef) 
+		{
+			if(!sidedef.MiddleRequired() || sidedef.LongMiddleTexture == MapSet.EmptyLongName) return;
+			
+			float scaleX = sidedef.Fields.GetValue("scalex_mid", 1.0f);
+			float scaleY = sidedef.Fields.GetValue("scaley_mid", 1.0f);
+			int localY = (int)Math.Round(sidedef.Fields.GetValue("offsety_mid", 0.0f));
+
+			int x = sidedef.OffsetX + (int)Math.Round(sidedef.Fields.GetValue("offsetx_mid", 0.0f));
+			int y = (int)Tools.GetSidedefMiddleOffsetY(sidedef, sidedef.OffsetY + localY, scaleY, false);
+			CheckAlignment(sidedef, x, y, scaleX, scaleY, VisualGeometryType.WALL_MIDDLE, sidedef.MiddleTexture);
+		}
+
+		private void CheckBottomAlignment(Sidedef sidedef) 
+		{
+			if(!sidedef.LowRequired() || sidedef.LongLowTexture == MapSet.EmptyLongName) return;
+
+			float scaleX = sidedef.Fields.GetValue("scalex_bottom", 1.0f);
+			float scaleY = sidedef.Fields.GetValue("scaley_bottom", 1.0f);
+			int localY = (int)Math.Round(sidedef.Fields.GetValue("offsety_bottom", 0.0f));
+
+			int x = sidedef.OffsetX + (int)Math.Round(sidedef.Fields.GetValue("offsetx_bottom", 0.0f));
+			int y = (int)Tools.GetSidedefBottomOffsetY(sidedef, sidedef.OffsetY + localY, scaleY, false);
+			CheckAlignment(sidedef, x, y, scaleX, scaleY, VisualGeometryType.WALL_LOWER, sidedef.LowTexture);
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		private void CheckAlignment(Sidedef sidedef, int offsetx, int offsety, float linescalex, float linescaley, VisualGeometryType parttype, string texturename) 
+		{
+			ImageData texture = General.Map.Data.GetTextureImage(texturename);
+			if(!texture.IsImageLoaded) return;
+			Rectangle partsize = BuilderModesTools.GetSidedefPartSize(sidedef, parttype);
+
+			float scalex = ((General.Map.Config.ScaledTextureOffsets && !texture.WorldPanning) ? texture.Scale.x : 1.0f);
+			float scaley = ((General.Map.Config.ScaledTextureOffsets && !texture.WorldPanning) ? texture.Scale.y : 1.0f);
+
+			// Move offsets to proper range
+			offsetx %= texture.Width;
+			if(offsetx < 0) offsetx += texture.Width;
+			offsety %= texture.Height;
+			if(offsety < 0) offsety += texture.Height;
+
+			// Check if current line is aligned to other sides
+			ICollection<Linedef> lines = (sidedef.IsFront ? sidedef.Line.Start.Linedefs : sidedef.Line.End.Linedefs);
+			Vertex v = sidedef.IsFront ? sidedef.Line.Start : sidedef.Line.End;
+
+			foreach(Linedef line in lines) 
+			{
+				if(line.Index == sidedef.Line.Index) continue;
+
+				Sidedef target = null;
+				if(line.Front != null && line.End == v) target = line.Front;
+				else if(line.Back != null && line.Start == v) target = line.Back;
+
+				// No target?
+				if(target == null) continue;
+
+				// Get expected texture offsets
+				VisualGeometryType targetparttype;
+				int alignedY = GetExpectedOffsetY(sidedef, target, texturename, texture.Height, scaley, linescaley, partsize, out targetparttype);
+				if(targetparttype == VisualGeometryType.UNKNOWN) continue;
+
+				// Already added?
+				if(donesides[parttype].ContainsKey(sidedef.Index) && donesides[parttype][sidedef.Index][targetparttype].ContainsKey(target.Index))
+					continue;
+
+				// Not aligned if scaley is not equal
+				float targetscaley = GetSidedefValue(target, targetparttype, "scaley", 1.0f);
+				if(targetscaley != linescaley) 
+				{
+					SubmitResult(new ResultTexturesMisaligned(sidedef, target, texturename));
+				}
+
+				float targetscalex = GetSidedefValue(target, targetparttype, "scalex", 1.0f);
+
+				alignedY %= texture.Height;
+				if(alignedY < 0) alignedY += texture.Height;
+
+				int alignedX = (target.OffsetX + (int)GetSidedefValue(target, targetparttype, "offsetx", 0f) + (int)Math.Round(target.Line.Length / scalex * targetscalex)) % texture.Width;
+				if(alignedX < 0) alignedX += texture.Width;
+
+				// Submit result if target offsets don't match expected ones
+				if(offsetx != alignedX || offsety != alignedY) 
+				{
+					SubmitResult(new ResultTexturesMisaligned(sidedef, target, texturename));
+				}
+
+				// Add to collection
+				AddProcessedSides(sidedef, parttype, target, targetparttype);
+			}
+
+			// Check if other sides are aligned to current side
+			lines = (sidedef.IsFront ? sidedef.Line.End.Linedefs : sidedef.Line.Start.Linedefs);
+			v = (sidedef.IsFront ? sidedef.Line.End : sidedef.Line.Start);
+
+			foreach(Linedef line in lines) 
+			{
+				if(line.Index == sidedef.Line.Index) continue;
+
+				Sidedef target = null;
+				if(line.Front != null && line.Start == v) target = line.Front;
+				else if(line.Back != null && line.End == v) target = line.Back;
+
+				// No target or laready processed?
+				if(target == null) continue;
+
+				// Get expected texture offsets
+				VisualGeometryType targetparttype;
+				int alignedY = GetExpectedOffsetY(sidedef, target, texturename, texture.Height, scaley, linescaley, partsize, out targetparttype);
+				if(targetparttype == VisualGeometryType.UNKNOWN) continue;
+
+				// Already added?
+				if(donesides[parttype].ContainsKey(sidedef.Index) && donesides[parttype][sidedef.Index][targetparttype].ContainsKey(target.Index))
+					continue;
+
+				// Not aligned if scaley is not equal
+				float targetscaley = GetSidedefValue(target, targetparttype, "scaley", 1.0f);
+				if(targetscaley != linescaley)
+				{
+					SubmitResult(new ResultTexturesMisaligned(sidedef, target, texturename));
+				}
+
+				alignedY %= texture.Height;
+				if(alignedY < 0) alignedY += texture.Height;
+
+				int alignedX = (target.OffsetX + (int)GetSidedefValue(target, targetparttype, "offsetx", 0f) - (int)Math.Round(sidedef.Line.Length / scalex * linescalex)) % texture.Width;
+				if(alignedX < 0) alignedX += texture.Width;
+
+				// Submit result if target offsets don't match expected ones
+				if(offsetx != alignedX || offsety != alignedY) 
+				{
+					SubmitResult(new ResultTexturesMisaligned(sidedef, target, texturename));
+				}
+
+				// Add to collection
+				AddProcessedSides(sidedef, parttype, target, targetparttype);
+			}
+		}
+
+		private static float GetSidedefValue(Sidedef target, VisualGeometryType targetparttype, string key, float defaultvalue) 
+		{
+			switch(targetparttype)
+			{
+				case VisualGeometryType.WALL_UPPER:
+					return (float)Math.Round(UniFields.GetFloat(target.Fields, key + "_top", defaultvalue), 3);
+
+				case VisualGeometryType.WALL_MIDDLE:
+					return (float)Math.Round(UniFields.GetFloat(target.Fields, key + "_mid", defaultvalue), 3);
+
+				case VisualGeometryType.WALL_LOWER:
+					return (float)Math.Round(UniFields.GetFloat(target.Fields, key + "_bottom", defaultvalue), 3);
+			}
+
+			return 0;
+		}
+
+		private void AddProcessedSides(Sidedef s1, VisualGeometryType type1, Sidedef s2, VisualGeometryType type2)
+		{
+			// Add them both ways
+			if(!donesides[type1].ContainsKey(s1.Index)) 
+			{
+				donesides[type1].Add(s1.Index, new Dictionary<VisualGeometryType, Dictionary<int, bool>>());
+				donesides[type1][s1.Index].Add(VisualGeometryType.WALL_UPPER, new Dictionary<int, bool>());
+				donesides[type1][s1.Index].Add(VisualGeometryType.WALL_MIDDLE, new Dictionary<int, bool>());
+				donesides[type1][s1.Index].Add(VisualGeometryType.WALL_LOWER, new Dictionary<int, bool>());
+			}
+			donesides[type1][s1.Index][type2].Add(s2.Index, false);
+
+			if(!donesides[type2].ContainsKey(s2.Index)) 
+			{
+				donesides[type2].Add(s2.Index, new Dictionary<VisualGeometryType, Dictionary<int, bool>>());
+				donesides[type2][s2.Index].Add(VisualGeometryType.WALL_UPPER, new Dictionary<int, bool>());
+				donesides[type2][s2.Index].Add(VisualGeometryType.WALL_MIDDLE, new Dictionary<int, bool>());
+				donesides[type2][s2.Index].Add(VisualGeometryType.WALL_LOWER, new Dictionary<int, bool>());
+			}
+			donesides[type2][s2.Index][type1].Add(s1.Index, false);
+		}
+
+		private static int GetExpectedOffsetY(Sidedef source, Sidedef target, string texturename, int textureheight, float texturescaley, float linescaley, Rectangle partsize, out VisualGeometryType matchingparttype) 
+		{
+			if(target.MiddleTexture == texturename
+					&& partsize.IntersectsWith(BuilderModesTools.GetSidedefPartSize(target, VisualGeometryType.WALL_MIDDLE)))
+			{
+				matchingparttype = VisualGeometryType.WALL_MIDDLE;
+				int partheight = (int)Math.Round(((target.Sector.CeilHeight - source.Sector.CeilHeight) / texturescaley) * linescaley);
+				return ((int)Tools.GetSidedefMiddleOffsetY(target, target.OffsetY + GetSidedefValue(target, matchingparttype, "offsety", 0f), linescaley, false) + partheight) % textureheight;
+			}
+			
+			if(target.HighTexture == texturename
+					&& partsize.IntersectsWith(BuilderModesTools.GetSidedefPartSize(target, VisualGeometryType.WALL_UPPER))) 
+			{
+				matchingparttype = VisualGeometryType.WALL_UPPER;
+				int partheight = (int) Math.Round(((target.Sector.CeilHeight - source.Sector.CeilHeight) / texturescaley) * linescaley);
+				return ((int)Tools.GetSidedefTopOffsetY(target, target.OffsetY + GetSidedefValue(target, matchingparttype, "offsety", 0f), linescaley, false) + partheight) % textureheight;
+			}
+
+			if(target.LowTexture == texturename
+				  && partsize.IntersectsWith(BuilderModesTools.GetSidedefPartSize(target, VisualGeometryType.WALL_LOWER))) 
+			{
+				matchingparttype = VisualGeometryType.WALL_LOWER;
+				int partheight = (int)Math.Round(((target.Sector.CeilHeight - source.Sector.CeilHeight) / texturescaley) * linescaley);
+				return ((int)Tools.GetSidedefBottomOffsetY(target, target.OffsetY + GetSidedefValue(target, matchingparttype, "offsety", 0f), linescaley, false) + partheight) % textureheight;
+			}
+
+			matchingparttype = VisualGeometryType.UNKNOWN;
+			return int.MinValue;
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ErrorChecks/CheckUnknownFlats.cs b/Source/Plugins/BuilderModes/ErrorChecks/CheckUnknownFlats.cs
new file mode 100644
index 0000000..06140d1
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ErrorChecks/CheckUnknownFlats.cs
@@ -0,0 +1,80 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using CodeImp.DoomBuilder.Map;
+using System.Threading;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[ErrorChecker("Check unknown flats", true, 40)]
+	public class CheckUnknownFlats : ErrorChecker
+	{
+		#region ================== Constants
+		
+		private const int PROGRESS_STEP = 1000;
+		
+		#endregion
+		
+		#region ================== Constructor / Destructor
+		
+		// Constructor
+		public CheckUnknownFlats()
+		{
+			// Total progress is done when all sectors are checked
+			SetTotalProgress(General.Map.Map.Sectors.Count / PROGRESS_STEP);
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+		
+		// This runs the check
+		public override void Run()
+		{
+			int progress = 0;
+			int stepprogress = 0;
+			
+			// Go for all the sectors
+			foreach(Sector s in General.Map.Map.Sectors)
+			{
+				// Check floor texture
+				if(s.LongFloorTexture != MapSet.EmptyLongName && !General.Map.Data.GetFlatExists(s.FloorTexture))
+					SubmitResult(new ResultUnknownFlat(s, false));
+
+				// Check ceiling texture
+				if(s.LongCeilTexture != MapSet.EmptyLongName && !General.Map.Data.GetFlatExists(s.CeilTexture))
+					SubmitResult(new ResultUnknownFlat(s, true));
+				
+				// Handle thread interruption
+				try { Thread.Sleep(0); }
+				catch(ThreadInterruptedException) { return; }
+				
+				// We are making progress!
+				if((++progress / PROGRESS_STEP) > stepprogress)
+				{
+					stepprogress = (progress / PROGRESS_STEP);
+					AddProgress(1);
+				}
+			}
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ErrorChecks/CheckUnknownTextures.cs b/Source/Plugins/BuilderModes/ErrorChecks/CheckUnknownTextures.cs
new file mode 100644
index 0000000..26f29e9
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ErrorChecks/CheckUnknownTextures.cs
@@ -0,0 +1,90 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using CodeImp.DoomBuilder.Map;
+using System.Threading;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[ErrorChecker("Check unknown textures", true, 60)]
+	public class CheckUnknownTextures : ErrorChecker
+	{
+		#region ================== Constants
+
+		private const int PROGRESS_STEP = 1000;
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		// Constructor
+		public CheckUnknownTextures()
+		{
+			// Total progress is done when all lines are checked
+			SetTotalProgress(General.Map.Map.Sidedefs.Count / PROGRESS_STEP);
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This runs the check
+		public override void Run()
+		{
+			int progress = 0;
+			int stepprogress = 0;
+
+			// Go for all the sidedefs
+			foreach(Sidedef sd in General.Map.Map.Sidedefs)
+			{
+				// Check upper texture
+				if(sd.HighRequired() && sd.LongHighTexture != MapSet.EmptyLongName && !General.Map.Data.GetTextureExists(sd.LongHighTexture))
+				{
+					SubmitResult(new ResultUnknownTexture(sd, SidedefPart.Upper));
+				}
+
+				// Check middle texture
+				if(sd.LongMiddleTexture != MapSet.EmptyLongName && !General.Map.Data.GetTextureExists(sd.LongMiddleTexture))
+				{
+					SubmitResult(new ResultUnknownTexture(sd, SidedefPart.Middle));
+				}
+
+				// Check lower texture
+				if(sd.LowRequired() && sd.LongLowTexture != MapSet.EmptyLongName && !General.Map.Data.GetTextureExists(sd.LongLowTexture))
+				{
+					SubmitResult(new ResultUnknownTexture(sd, SidedefPart.Lower));
+				}
+				
+				// Handle thread interruption
+				try { Thread.Sleep(0); }
+				catch(ThreadInterruptedException) { return; }
+
+				// We are making progress!
+				if((++progress / PROGRESS_STEP) > stepprogress)
+				{
+					stepprogress = (progress / PROGRESS_STEP);
+					AddProgress(1);
+				}
+			}
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ErrorChecks/CheckUnknownThings.cs b/Source/Plugins/BuilderModes/ErrorChecks/CheckUnknownThings.cs
new file mode 100644
index 0000000..aaff5f2
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ErrorChecks/CheckUnknownThings.cs
@@ -0,0 +1,42 @@
+using System.Threading;
+using CodeImp.DoomBuilder.Map;
+
+namespace CodeImp.DoomBuilder.BuilderModes 
+{
+	[ErrorChecker("Check unknown things", true, 50)]
+	public class CheckUnknownThings : ErrorChecker 
+	{
+		
+		private const int PROGRESS_STEP = 1000;
+
+		// Constructor
+		public CheckUnknownThings()	
+		{
+			// Total progress is done when all things are checked
+			SetTotalProgress(General.Map.Map.Things.Count / PROGRESS_STEP);
+		}
+
+		// This runs the check
+		public override void Run() 
+		{
+			int progress = 0;
+			int stepprogress = 0;
+
+			// Go for all things
+			foreach(Thing t in General.Map.Map.Things) 
+			{
+				if(General.Map.Data.GetThingInfoEx(t.Type) == null) SubmitResult(new ResultUnknownThing(t));
+
+				// Handle thread interruption
+				try { Thread.Sleep(0); } catch (ThreadInterruptedException) { return; }
+
+				// We are making progress!
+				if((++progress / PROGRESS_STEP) > stepprogress) 
+				{
+					stepprogress = (progress / PROGRESS_STEP);
+					AddProgress(1);
+				}
+			}
+		}
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ErrorChecks/CheckUnusedTextures.cs b/Source/Plugins/BuilderModes/ErrorChecks/CheckUnusedTextures.cs
new file mode 100644
index 0000000..d3b412e
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ErrorChecks/CheckUnusedTextures.cs
@@ -0,0 +1,68 @@
+#region ================== Namespaces
+
+using CodeImp.DoomBuilder.Map;
+using System.Threading;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[ErrorChecker("Check unused textures", true, 60)]
+	public class CheckUnusedTextures : ErrorChecker
+	{
+		#region ================== Constants
+
+		private const int PROGRESS_STEP = 1000;
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		// Constructor
+		public CheckUnusedTextures()
+		{
+			// Total progress is done when all lines are checked
+			SetTotalProgress(General.Map.Map.Sidedefs.Count / PROGRESS_STEP);
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This runs the check
+		public override void Run()
+		{
+			int progress = 0;
+			int stepprogress = 0;
+
+			// Go for all the sidedefs
+			foreach(Sidedef sd in General.Map.Map.Sidedefs)
+			{
+				// Check upper texture
+				if(!sd.HighRequired() && sd.LongHighTexture != MapSet.EmptyLongName)
+				{
+					SubmitResult(new ResultUnusedTexture(sd, SidedefPart.Upper));
+				}
+
+				// Check lower texture
+				if(!sd.LowRequired() && sd.LongLowTexture != MapSet.EmptyLongName)
+				{
+					SubmitResult(new ResultUnusedTexture(sd, SidedefPart.Lower));
+				}
+				
+				// Handle thread interruption
+				try { Thread.Sleep(0); }
+				catch(ThreadInterruptedException) { return; }
+
+				// We are making progress!
+				if((++progress / PROGRESS_STEP) > stepprogress)
+				{
+					stepprogress = (progress / PROGRESS_STEP);
+					AddProgress(1);
+				}
+			}
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ErrorChecks/CheckUnusedThings.cs b/Source/Plugins/BuilderModes/ErrorChecks/CheckUnusedThings.cs
new file mode 100644
index 0000000..461eab1
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ErrorChecks/CheckUnusedThings.cs
@@ -0,0 +1,71 @@
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using System.Threading;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Map;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[ErrorChecker("Check unused things", true, 50)]
+	public class CheckUnusedThings : ErrorChecker
+	{
+		#region ================== Constants
+
+		private const int PROGRESS_STEP = 10;
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		public CheckUnusedThings()	
+		{
+			// Total progress is done when all things are checked
+			SetTotalProgress(General.Map.Map.Things.Count / PROGRESS_STEP);
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This runs the check
+		public override void Run() 
+		{
+			int progress = 0;
+			int stepprogress = 0;
+
+			// Go for all things
+			foreach(Thing t in General.Map.Map.Things) 
+			{
+				// Gather enabled flags
+				HashSet<string> activeflags = new HashSet<string>();
+				foreach(KeyValuePair<string, bool> group in t.GetFlags())
+				{
+					if(group.Value) activeflags.Add(group.Key);
+				}
+
+				// Check em
+				List<string> warnings = ThingFlagsCompare.CheckFlags(activeflags);
+				if(warnings.Count > 0)
+				{
+					// Got missing flags
+					SubmitResult(new ResultUnusedThing(t, string.Join(" ", warnings.ToArray())));
+				}
+
+				// Handle thread interruption
+				try { Thread.Sleep(0); } catch(ThreadInterruptedException) { return; }
+
+				// We are making progress!
+				if((++progress / PROGRESS_STEP) > stepprogress) 
+				{
+					stepprogress = (progress / PROGRESS_STEP);
+					AddProgress(1);
+				}
+			}	
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ErrorChecks/ErrorChecker.cs b/Source/Plugins/BuilderModes/ErrorChecks/ErrorChecker.cs
new file mode 100644
index 0000000..65cd81d
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ErrorChecks/ErrorChecker.cs
@@ -0,0 +1,97 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	// NOTE: An ErrorChecker may NEVER modify the map, because it runs multithreaded.
+	// Do not even change element properties such as 'marked' and 'selected'!
+	public class ErrorChecker : IComparable<ErrorChecker>
+	{
+		#region ================== Variables
+		
+		private int lastprogress;
+		private int totalprogress = -1;
+		protected ErrorCheckerAttribute attribs;
+		
+		#endregion
+		
+		#region ================== Properties
+		
+		public int TotalProgress { get { return totalprogress; } }
+		
+		#endregion
+		
+		#region ================== Constructor / Destructor
+		
+		// Constructor
+		// Override this to determine and set the total progress
+		public ErrorChecker()
+		{
+			// Initialize
+			object[] attrs = this.GetType().GetCustomAttributes(typeof(ErrorCheckerAttribute), true);
+			attribs = (ErrorCheckerAttribute)attrs[0];
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+		
+		// Override this to run your check
+		// Use a Sleep and Try/Catch to handle thread interruption
+		public virtual void Run()
+		{
+			if(totalprogress < 0) throw new InvalidOperationException("You must set the total progress through the SetTotalProgress method before this check can be performed!");
+			lastprogress = 0;
+		}
+		
+		// This submits a result to show in the results list
+		protected void SubmitResult(ErrorResult result)
+		{
+			BuilderPlug.Me.ErrorCheckForm.SubmitResult(result);
+		}
+		
+		// This reports a change in progress
+		protected void AddProgress(int amount)
+		{
+			// Make changes
+			if(amount < 0) amount = 0;
+			if((lastprogress + amount) > totalprogress) throw new InvalidOperationException("Cannot exceed total progress amount!");
+			lastprogress += amount;
+			BuilderPlug.Me.ErrorCheckForm.AddProgressValue(amount);
+		}
+		
+		// This sets the total progress
+		protected void SetTotalProgress(int totalprogress)
+		{
+			if(totalprogress < 0) throw new ArgumentOutOfRangeException("Total progress cannot be less than zero!");
+			this.totalprogress = totalprogress;
+		}
+		
+		// This is for sorting by cost
+		public int CompareTo(ErrorChecker other)
+		{
+			return (other.attribs.Cost - this.attribs.Cost);
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ErrorChecks/ErrorCheckerAttribute.cs b/Source/Plugins/BuilderModes/ErrorChecks/ErrorCheckerAttribute.cs
new file mode 100644
index 0000000..4632714
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ErrorChecks/ErrorCheckerAttribute.cs
@@ -0,0 +1,67 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[AttributeUsage(AttributeTargets.Class, Inherited = true, AllowMultiple = false)]
+	public class ErrorCheckerAttribute : Attribute
+	{
+		#region ================== Variables
+		
+		private string displayname;
+		private bool defaultchecked;
+		private int cost;
+		
+		#endregion
+		
+		#region ================== Properties
+		
+		public string DisplayName { get { return displayname; } set { displayname = value; } }
+		public bool DefaultChecked { get { return defaultchecked; } set { defaultchecked = value; } }
+		public int Cost { get { return cost; } set { cost = value; } }
+		
+		#endregion
+		
+		#region ================== Constructor / Destructor
+		
+		// Constructor
+		public ErrorCheckerAttribute(string displayname, bool defaultchecked, int cost)
+		{
+			// Initialize
+			this.displayname = displayname;
+			this.defaultchecked = defaultchecked;
+			this.cost = cost;
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+		
+		// String representation
+		public override string ToString()
+		{
+			return displayname;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ErrorChecks/ErrorResult.cs b/Source/Plugins/BuilderModes/ErrorChecks/ErrorResult.cs
new file mode 100644
index 0000000..e2f8222
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ErrorChecks/ErrorResult.cs
@@ -0,0 +1,180 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Editing;
+using System.Drawing;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	public abstract class ErrorResult
+	{
+		#region ================== Variables
+		
+		protected string description;
+		protected readonly List<MapElement> viewobjects;
+		protected bool hidden;
+		
+		#endregion
+		
+		#region ================== Properties
+		
+		public string Description { get { return description; } }
+		
+		// Override these properties to create buttons
+		public virtual int Buttons { get { return 0; } }
+		public virtual string Button1Text { get { return ""; } }
+		public virtual string Button2Text { get { return ""; } }
+		public virtual string Button3Text { get { return ""; } }
+		public bool IsHidden { get { return hidden; } }
+
+		#endregion
+		
+		#region ================== Constructor / Destructor
+		
+		// Constructor
+		protected ErrorResult()
+		{
+			// Initialize
+			viewobjects = new List<MapElement>(1);
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+		
+		// When the first button is clicked
+		// Return true when map geometry or things have been added/removed so that the checker can restart
+		public virtual bool Button1Click(bool batchMode)
+		{
+			return false;
+		}
+		
+		// When the second button is clicked
+		// Return true when map geometry or things have been added/removed so that the checker can restart
+		public virtual bool Button2Click(bool batchMode)
+		{
+			return false;
+		}
+		
+		// When the third button is clicked
+		// Return true when map geometry or things have been added/removed so that the checker can restart
+		public virtual bool Button3Click(bool batchMode)
+		{
+			return false;
+		}
+		
+		// This must return the string that is displayed in the listbox
+		public override string ToString()
+		{
+			return "Unknown result";
+		}
+
+		// This is called for rendering
+		public virtual void PlotSelection(IRenderer2D renderer) { }
+
+		// This is called for rendering (mxd. And never used!)
+		/*public virtual void RenderThingsSelection(IRenderer2D renderer)
+		{
+		}*/
+
+		// This is called for rendering
+		public virtual void RenderOverlaySelection(IRenderer2D renderer) { }
+		
+		// Call this to zoom in on the given selection
+		public virtual RectangleF GetZoomArea()
+		{
+			List<Vector2D> points = new List<Vector2D>();
+			RectangleF area = MapSet.CreateEmptyArea();
+			
+			// Add all points to a list
+			foreach(MapElement obj in viewobjects)
+			{
+				if(obj is Vertex)
+				{
+					points.Add((obj as Vertex).Position);
+				}
+				else if(obj is Linedef)
+				{
+					points.Add((obj as Linedef).Start.Position);
+					points.Add((obj as Linedef).End.Position);
+				}
+				else if(obj is Sidedef)
+				{
+					points.Add((obj as Sidedef).Line.Start.Position);
+					points.Add((obj as Sidedef).Line.End.Position);
+				}
+				else if(obj is Sector)
+				{
+					Sector s = (obj as Sector);
+					foreach(Sidedef sd in s.Sidedefs)
+					{
+						points.Add(sd.Line.Start.Position);
+						points.Add(sd.Line.End.Position);
+					}
+				}
+				else if(obj is Thing)
+				{
+					Thing t = (obj as Thing);
+					Vector2D p = t.Position;
+					points.Add(p);
+					points.Add(p + new Vector2D(t.Size * 2.0f, t.Size * 2.0f));
+					points.Add(p + new Vector2D(t.Size * 2.0f, -t.Size * 2.0f));
+					points.Add(p + new Vector2D(-t.Size * 2.0f, t.Size * 2.0f));
+					points.Add(p + new Vector2D(-t.Size * 2.0f, -t.Size * 2.0f));
+				}
+				else
+				{
+					General.Fail("Unknown object given to zoom in on.");
+				}
+			}
+			
+			// Make a view area from the points
+			foreach(Vector2D p in points) area = MapSet.IncreaseArea(area, p);
+			
+			// Make the area square, using the largest side
+			if(area.Width > area.Height)
+			{
+				float delta = area.Width - area.Height;
+				area.Y -= delta * 0.5f;
+				area.Height += delta;
+			}
+			else
+			{
+				float delta = area.Height - area.Width;
+				area.X -= delta * 0.5f;
+				area.Width += delta;
+			}
+			
+			// Add padding
+			area.Inflate(100f, 100f);
+			
+			// Return area
+			return area;
+		}
+
+		internal abstract void Hide(bool hide); //mxd. Marks map elements of this result as hidden in ErrorCheckForm
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ErrorChecks/ResultLineMissingFront.cs b/Source/Plugins/BuilderModes/ErrorChecks/ResultLineMissingFront.cs
new file mode 100644
index 0000000..da966d0
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ErrorChecks/ResultLineMissingFront.cs
@@ -0,0 +1,145 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Geometry;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	public class ResultLineMissingFront : ErrorResult
+	{
+		#region ================== Variables
+		
+		private readonly Linedef line;
+		private readonly int buttons;
+		private readonly Sidedef copysidedef;
+		
+		#endregion
+		
+		#region ================== Properties
+
+		public override int Buttons { get { return buttons; } }
+		public override string Button1Text { get { return "Flip Linedef"; } }
+		public override string Button2Text { get { return "Create Sidedef"; } }
+		
+		#endregion
+		
+		#region ================== Constructor / Destructor
+		
+		// Constructor
+		public ResultLineMissingFront(Linedef l)
+		{
+			// Initialize
+			line = l;
+			viewobjects.Add(l);
+			hidden = l.IgnoredErrorChecks.Contains(this.GetType()); //mxd
+			description = "This linedef has a back sidedef, but is missing a front sidedef. " +
+						  "A line must have at least a front side and optionally a back side! " +
+						  "Click 'Flip Linedef' button if the line is supposed to be single-sided.";
+			
+			// One solution is to flip the sidedefs
+			buttons = 1;
+			
+			// Check if the linedef can join a sector on the side where it is missing a sidedef
+			bool fixable = false;
+			List<LinedefSide> sides = Tools.FindPotentialSectorAt(l, true);
+			if(sides != null)
+			{
+				foreach(LinedefSide sd in sides)
+				{
+					// If any of the sides lies along a sidedef, then we can copy
+					// that sidedef to fix the missing sidedef on this line.
+					if(sd.Front && (sd.Line.Front != null))
+					{
+						copysidedef = sd.Line.Front;
+						fixable = true;
+						break;
+					}
+					
+					if(!sd.Front && (sd.Line.Back != null))
+					{
+						copysidedef = sd.Line.Back;
+						fixable = true;
+						break;
+					}
+				}
+			}
+			
+			// Fixable?
+			if(fixable)
+			{
+				buttons++;
+				this.description += " Or click Create Sidedef to rebuild the missing sidedef (making the line double-sided).";
+			}
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+
+		// This sets if this result is displayed in ErrorCheckForm (mxd)
+		internal override void Hide(bool hide) 
+		{
+			hidden = hide;
+			Type t = this.GetType();
+			if(hide) line.IgnoredErrorChecks.Add(t);
+			else if(line.IgnoredErrorChecks.Contains(t)) line.IgnoredErrorChecks.Remove(t);
+		}
+		
+		// This must return the string that is displayed in the listbox
+		public override string ToString()
+		{
+			return "Linedef " + line.Index + " is missing front side";
+		}
+		
+		// Rendering
+		public override void PlotSelection(IRenderer2D renderer)
+		{
+			renderer.PlotLinedef(line, General.Colors.Selection);
+			renderer.PlotVertex(line.Start, ColorCollection.VERTICES);
+			renderer.PlotVertex(line.End, ColorCollection.VERTICES);
+		}
+		
+		// Fix by flipping linedefs
+		public override bool Button1Click(bool batchMode)
+		{
+			line.FlipSidedefs();
+			General.Map.Map.Update();
+			return true;
+		}
+		
+		// Fix by creating a sidedef
+		public override bool Button2Click(bool batchMode)
+		{
+			if(!batchMode) General.Map.UndoRedo.CreateUndo("Create front sidedef");
+			Sidedef newside = General.Map.Map.CreateSidedef(line, true, copysidedef.Sector);
+			if(newside == null) return false;
+			copysidedef.CopyPropertiesTo(newside);
+			line.ApplySidedFlags();
+			General.Map.Map.Update();
+			return true;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ErrorChecks/ResultLineMissingSides.cs b/Source/Plugins/BuilderModes/ErrorChecks/ResultLineMissingSides.cs
new file mode 100644
index 0000000..07e3680
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ErrorChecks/ResultLineMissingSides.cs
@@ -0,0 +1,206 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Geometry;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	public class ResultLineMissingSides : ErrorResult
+	{
+		#region ================== Variables
+		
+		private readonly Linedef line;
+		private readonly int buttons;
+		private readonly Sidedef copysidedeffront;
+		private readonly Sidedef copysidedefback;
+		
+		#endregion
+		
+		#region ================== Properties
+
+		public override int Buttons { get { return buttons; } }
+		public override string Button1Text { get { return "Create One Side"; } }
+		public override string Button2Text { get { return "Create Both Sides"; } }
+		
+		#endregion
+		
+		#region ================== Constructor / Destructor
+		
+		// Constructor
+		public ResultLineMissingSides(Linedef l)
+		{
+			// Initialize
+			line = l;
+			viewobjects.Add(l);
+			hidden = l.IgnoredErrorChecks.Contains(this.GetType()); //mxd
+			description = "This linedef is missing front and back sidedefs." +
+						  "A line must have at least a front side and optionally a back side!";
+			
+			buttons = 0;
+			
+			// Check if we can join a sector on the front side
+			bool fixable = false;
+			List<LinedefSide> sides = Tools.FindPotentialSectorAt(l, true);
+			
+			if(sides != null)
+			{
+				foreach(LinedefSide sd in sides)
+				{
+					// If any of the sides lies along a sidedef, then we can copy
+					// that sidedef to fix the missing sidedef on this line.
+					if(sd.Front && (sd.Line.Front != null))
+					{
+						copysidedeffront = sd.Line.Front;
+						fixable = true;
+						break;
+					}
+					
+					if(!sd.Front && (sd.Line.Back != null))
+					{
+						copysidedeffront = sd.Line.Back;
+						fixable = true;
+						break;
+					}
+				}
+			}
+			
+			// Fixable?
+			if(fixable)	buttons++;
+			
+			// Check if we can join a sector on the back side
+			fixable = false;
+			sides = Tools.FindPotentialSectorAt(l, false);
+			if(sides != null)
+			{
+				foreach(LinedefSide sd in sides)
+				{
+					// If any of the sides lies along a sidedef, then we can copy
+					// that sidedef to fix the missing sidedef on this line.
+					if(sd.Front && (sd.Line.Front != null))
+					{
+						copysidedefback = sd.Line.Front;
+						fixable = true;
+						break;
+					}
+					
+					if(!sd.Front && (sd.Line.Back != null))
+					{
+						copysidedefback = sd.Line.Back;
+						fixable = true;
+						break;
+					}
+				}
+			}
+			
+			// Fixable?
+			if(fixable) buttons++;
+			
+			// Now make a fine description
+			switch(buttons)
+			{
+				case 0: description += " Doom Builder could not find a solution to fix this line."; break;
+				case 1: description += " Click Create One Side to rebuild a single sidedef, making this line single-sided."; break;
+				case 2: description += " Click Create Both Side to rebuild both sides of the line, making this line double-sided."; break;
+			}
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+
+		// This sets if this result is displayed in ErrorCheckForm (mxd)
+		internal override void Hide(bool hide) 
+		{
+			hidden = hide;
+			Type t = this.GetType();
+			if(hide) line.IgnoredErrorChecks.Add(t);
+			else if(line.IgnoredErrorChecks.Contains(t)) line.IgnoredErrorChecks.Remove(t);
+		}
+		
+		// This must return the string that is displayed in the listbox
+		public override string ToString()
+		{
+			return "Linedef " + line.Index + " is missing both sides";
+		}
+		
+		// Rendering
+		public override void PlotSelection(IRenderer2D renderer)
+		{
+			renderer.PlotLinedef(line, General.Colors.Selection);
+			renderer.PlotVertex(line.Start, ColorCollection.VERTICES);
+			renderer.PlotVertex(line.End, ColorCollection.VERTICES);
+		}
+		
+		// Fix a single side
+		public override bool Button1Click(bool batchMode)
+		{
+			// On which side can we fix?
+			if(copysidedeffront != null)
+			{
+				// Front
+				if(!batchMode) General.Map.UndoRedo.CreateUndo("Create front sidedef");
+				Sidedef newside = General.Map.Map.CreateSidedef(line, true, copysidedeffront.Sector);
+				if(newside == null) return false;
+				copysidedeffront.CopyPropertiesTo(newside);
+			}
+			else if(copysidedefback != null)
+			{
+				// Back
+				// Because the line is single-sided, we make the sidedef on the front.
+				// We will then flip it to make sure to ends up in the right position.
+				if(!batchMode) General.Map.UndoRedo.CreateUndo("Create front sidedef");
+				Sidedef newside = General.Map.Map.CreateSidedef(line, true, copysidedefback.Sector);
+				if(newside == null) return false;
+				copysidedefback.CopyPropertiesTo(newside);
+				line.FlipVertices();
+			}
+			
+			line.ApplySidedFlags();
+			General.Map.Map.Update();
+			return true;
+		}
+		
+		// Fix both sides
+		public override bool Button2Click(bool batchMode)
+		{
+			if(!batchMode) General.Map.UndoRedo.CreateUndo("Create sidedefs");
+
+			// Front
+			Sidedef newside = General.Map.Map.CreateSidedef(line, true, copysidedeffront.Sector);
+			if(newside == null) return false;
+			copysidedeffront.CopyPropertiesTo(newside);
+			
+			// Back
+			newside = General.Map.Map.CreateSidedef(line, false, copysidedefback.Sector);
+			if(newside == null) return false;
+			copysidedefback.CopyPropertiesTo(newside);
+			
+			line.ApplySidedFlags();
+			General.Map.Map.Update();
+			return true;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ErrorChecks/ResultLineNotDoubleSided.cs b/Source/Plugins/BuilderModes/ErrorChecks/ResultLineNotDoubleSided.cs
new file mode 100644
index 0000000..02a1247
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ErrorChecks/ResultLineNotDoubleSided.cs
@@ -0,0 +1,144 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Geometry;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	public class ResultLineNotDoubleSided : ErrorResult
+	{
+		#region ================== Variables
+		
+		private readonly Linedef line;
+		private readonly int buttons;
+		private readonly Sidedef copysidedef;
+		
+		#endregion
+		
+		#region ================== Properties
+
+		public override int Buttons { get { return buttons; } }
+		public override string Button1Text { get { return "Make Single-Sided"; } }
+		public override string Button2Text { get { return "Create Sidedef"; } }
+		
+		#endregion
+		
+		#region ================== Constructor / Destructor
+		
+		// Constructor
+		public ResultLineNotDoubleSided(Linedef l)
+		{
+			// Initialize
+			line = l;
+			viewobjects.Add(l);
+			hidden = l.IgnoredErrorChecks.Contains(this.GetType()); //mxd
+			description = "This linedef is marked as double-sided, but is missing the back sidedef. Click 'Make Single-Sided' button to remove the double-sided flag from the line.";
+			
+			// One solution is to remove the double-sided flag
+			buttons = 1;
+			
+			// Check if the linedef can join a sector on the side where it is missing a sidedef
+			bool fixable = false;
+			List<LinedefSide> sides = Tools.FindPotentialSectorAt(l, false);
+			if(sides != null)
+			{
+				foreach(LinedefSide sd in sides)
+				{
+					// If any of the sides lies along a sidedef, then we can copy
+					// that sidedef to fix the missing sidedef on this line.
+					if(sd.Front && (sd.Line.Front != null))
+					{
+						copysidedef = sd.Line.Front;
+						fixable = true;
+						break;
+					}
+					
+					if(!sd.Front && (sd.Line.Back != null))
+					{
+						copysidedef = sd.Line.Back;
+						fixable = true;
+						break;
+					}
+				}
+			}
+			
+			// Fixable?
+			if(fixable)
+			{
+				buttons++;
+				this.description += " Or click Create Sidedef to rebuild the missing sidedef (making the line really double-sided).";
+			}
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+
+		// This sets if this result is displayed in ErrorCheckForm (mxd)
+		internal override void Hide(bool hide) 
+		{
+			hidden = hide;
+			Type t = this.GetType();
+			if(hide) line.IgnoredErrorChecks.Add(t);
+			else if(line.IgnoredErrorChecks.Contains(t)) line.IgnoredErrorChecks.Remove(t);
+		}
+		
+		// This must return the string that is displayed in the listbox
+		public override string ToString()
+		{
+			return "Linedef " + line.Index + " is marked double-sided but has no back side";
+		}
+		
+		// Rendering
+		public override void PlotSelection(IRenderer2D renderer)
+		{
+			renderer.PlotLinedef(line, General.Colors.Selection);
+			renderer.PlotVertex(line.Start, ColorCollection.VERTICES);
+			renderer.PlotVertex(line.End, ColorCollection.VERTICES);
+		}
+		
+		// Fix by flipping linedefs
+		public override bool Button1Click(bool batchMode)
+		{
+			if(!batchMode) General.Map.UndoRedo.CreateUndo("Linedef flags change");
+			line.ApplySidedFlags();
+			General.Map.Map.Update();
+			return true;
+		}
+		
+		// Fix by creating a sidedef
+		public override bool Button2Click(bool batchMode)
+		{
+			if(!batchMode) General.Map.UndoRedo.CreateUndo("Create back sidedef");
+			Sidedef newside = General.Map.Map.CreateSidedef(line, false, copysidedef.Sector);
+			if(newside == null) return false;
+			copysidedef.CopyPropertiesTo(newside);
+			line.ApplySidedFlags();
+			General.Map.Map.Update();
+			return true;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ErrorChecks/ResultLineNotSingleSided.cs b/Source/Plugins/BuilderModes/ErrorChecks/ResultLineNotSingleSided.cs
new file mode 100644
index 0000000..aa934c8
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ErrorChecks/ResultLineNotSingleSided.cs
@@ -0,0 +1,104 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	public class ResultLineNotSingleSided : ErrorResult
+	{
+		#region ================== Variables
+		
+		private readonly Linedef line;
+		
+		#endregion
+		
+		#region ================== Properties
+
+		public override int Buttons { get { return 2; } }
+		public override string Button1Text { get { return "Make Double-Sided"; } }
+		public override string Button2Text { get { return "Remove Sidedef"; } }
+		
+		#endregion
+		
+		#region ================== Constructor / Destructor
+		
+		// Constructor
+		public ResultLineNotSingleSided(Linedef l)
+		{
+			// Initialize
+			line = l;
+			viewobjects.Add(l);
+			hidden = l.IgnoredErrorChecks.Contains(this.GetType()); //mxd
+			description = "This linedef is marked as single-sided, but has both a front and a back sidedef. Click 'Make Double-Sided' button to flag the line as double-sided." +
+							   " Or click 'Remove Sidedef' button to remove the sidedef on the back side (making the line really single-sided).";
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+
+		// This sets if this result is displayed in ErrorCheckForm (mxd)
+		internal override void Hide(bool hide) 
+		{
+			hidden = hide;
+			Type t = this.GetType();
+			if(hide) line.IgnoredErrorChecks.Add(t);
+			else if(line.IgnoredErrorChecks.Contains(t)) line.IgnoredErrorChecks.Remove(t);
+		}
+		
+		// This must return the string that is displayed in the listbox
+		public override string ToString()
+		{
+			return "Linedef " + line.Index + " is marked single-sided but has two sides";
+		}
+		
+		// Rendering
+		public override void PlotSelection(IRenderer2D renderer)
+		{
+			renderer.PlotLinedef(line, General.Colors.Selection);
+			renderer.PlotVertex(line.Start, ColorCollection.VERTICES);
+			renderer.PlotVertex(line.End, ColorCollection.VERTICES);
+		}
+		
+		// Fix by flipping linedefs
+		public override bool Button1Click(bool batchMode)
+		{
+			if(!batchMode) General.Map.UndoRedo.CreateUndo("Linedef flags change");
+			line.ApplySidedFlags();
+			General.Map.Map.Update();
+			return true;
+		}
+		
+		// Fix by creating a sidedef
+		public override bool Button2Click(bool batchMode)
+		{
+			if(!batchMode) General.Map.UndoRedo.CreateUndo("Remove back sidedef");
+			line.Back.Dispose();
+			line.ApplySidedFlags();
+			General.Map.Map.Update();
+			return true;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ErrorChecks/ResultLineOverlapping.cs b/Source/Plugins/BuilderModes/ErrorChecks/ResultLineOverlapping.cs
new file mode 100644
index 0000000..7dc2368
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ErrorChecks/ResultLineOverlapping.cs
@@ -0,0 +1,96 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	public class ResultLineOverlapping : ErrorResult
+	{
+		#region ================== Variables
+		
+		private readonly Linedef line1;
+		private readonly Linedef line2;
+		
+		#endregion
+		
+		#region ================== Properties
+
+		public override int Buttons { get { return 0; } }
+		
+		#endregion
+		
+		#region ================== Constructor / Destructor
+		
+		// Constructor
+		public ResultLineOverlapping(Linedef l1, Linedef l2)
+		{
+			// Initialize
+			line1 = l1;
+			line2 = l2;
+			viewobjects.Add(l1);
+			viewobjects.Add(l2);
+			hidden = (l1.IgnoredErrorChecks.Contains(this.GetType()) && l2.IgnoredErrorChecks.Contains(this.GetType())); //mxd
+			description = "These linedefs are overlapping and they do not reference the same sector on all sides. Overlapping lines is only allowed when they reference the same sector on all sides.";
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+
+		// This sets if this result is displayed in ErrorCheckForm (mxd)
+		internal override void Hide(bool hide) 
+		{
+			hidden = hide;
+			Type t = this.GetType();
+			if(hide) 
+			{
+				line1.IgnoredErrorChecks.Add(t);
+				line2.IgnoredErrorChecks.Add(t);
+			}
+			else 
+			{
+				if(line1.IgnoredErrorChecks.Contains(t)) line1.IgnoredErrorChecks.Remove(t);
+				if(line2.IgnoredErrorChecks.Contains(t)) line2.IgnoredErrorChecks.Remove(t);
+			}
+		}
+		
+		// This must return the string that is displayed in the listbox
+		public override string ToString()
+		{
+			return "Linedefs " + line1.Index + " and " + line2.Index + " are overlapping and reference different sectors";
+		}
+		
+		// Rendering
+		public override void PlotSelection(IRenderer2D renderer)
+		{
+			renderer.PlotLinedef(line1, General.Colors.Selection);
+			renderer.PlotLinedef(line2, General.Colors.Selection);
+			renderer.PlotVertex(line1.Start, ColorCollection.VERTICES);
+			renderer.PlotVertex(line1.End, ColorCollection.VERTICES);
+			renderer.PlotVertex(line2.Start, ColorCollection.VERTICES);
+			renderer.PlotVertex(line2.End, ColorCollection.VERTICES);
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ErrorChecks/ResultMapTooBig.cs b/Source/Plugins/BuilderModes/ErrorChecks/ResultMapTooBig.cs
new file mode 100644
index 0000000..eb7fdaa
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ErrorChecks/ResultMapTooBig.cs
@@ -0,0 +1,65 @@
+#region ================== Namespaces
+
+using System.Drawing;
+using CodeImp.DoomBuilder.Geometry;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes.ErrorChecks
+{
+	public class ResultMapTooBig : ErrorResult
+	{
+		#region ================== Variables
+
+		private readonly bool toowide;
+		private readonly bool toohigh;
+		private readonly Vector2D min;
+		private readonly Vector2D max;
+
+		#endregion
+		
+		#region ================== Properties
+
+		public override int Buttons { get { return 0; } }
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		public ResultMapTooBig(Vector2D min, Vector2D max) 
+		{
+			// Initialize
+			this.min = min;
+			this.max = max;
+			this.toowide = max.x - min.x > CheckMapSize.MAXIMUM_DISTANCE;
+			this.toohigh = max.y - min.y > CheckMapSize.MAXIMUM_DISTANCE;
+			description = "Map is too big.";
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		public override RectangleF GetZoomArea()
+		{
+			const float scaler = 0.5f;
+			return new RectangleF(min.x * scaler, min.y * scaler, (max.x - min.x) * scaler, (max.y - min.y) * scaler);
+		}
+
+		// This sets if this result is displayed in ErrorCheckForm (mxd)
+		internal override void Hide(bool hide)
+		{
+			hidden = hide;
+		}
+
+		// This must return the string that is displayed in the listbox
+		public override string ToString()
+		{
+			if(toowide && toohigh) return "Map's width and height is bigger than " + CheckMapSize.MAXIMUM_DISTANCE + " m.u. This can cause rendering and physics issues.";
+			if(toowide) return "Map is wider than than " + CheckMapSize.MAXIMUM_DISTANCE + " m.u. This can cause rendering and physics issues.";
+			return "Map is taller than " + CheckMapSize.MAXIMUM_DISTANCE + " m.u. This can cause rendering and physics issues.";
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ErrorChecks/ResultMissingFlat.cs b/Source/Plugins/BuilderModes/ErrorChecks/ResultMissingFlat.cs
new file mode 100644
index 0000000..0f1a70a
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ErrorChecks/ResultMissingFlat.cs
@@ -0,0 +1,111 @@
+#region ================== Namespaces
+
+using System;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	public class ResultMissingFlat : ErrorResult
+	{
+		#region ================== Variables
+		
+		private readonly Sector sector;
+		private readonly bool ceiling;
+		private static string imagename = "-"; //mxd
+		
+		#endregion
+		
+		#region ================== Properties
+
+		public override int Buttons { get { return 2; } }
+		public override string Button1Text { get { return "Add Default Flat"; } }
+		public override string Button2Text { get { return "Browse Flat..."; } } //mxd
+		
+		#endregion
+		
+		#region ================== Constructor / Destructor
+		
+		// Constructor
+		public ResultMissingFlat(Sector s, bool ceiling)
+		{
+			// Initialize
+			this.sector = s;
+			this.ceiling = ceiling;
+			this.viewobjects.Add(s);
+			this.hidden = s.IgnoredErrorChecks.Contains(this.GetType()); //mxd
+			imagename = "-"; //mxd
+			
+			string objname = ceiling ? "ceiling" : "floor";
+			this.description = "This sector's " + objname + " is missing a flat where it is required and could cause a 'Hall Of Mirrors' visual problem in the map.";
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+
+		// This sets if this result is displayed in ErrorCheckForm (mxd)
+		internal override void Hide(bool hide) 
+		{
+			hidden = hide;
+			Type t = this.GetType();
+			if(hide) sector.IgnoredErrorChecks.Add(t);
+			else if(sector.IgnoredErrorChecks.Contains(t)) sector.IgnoredErrorChecks.Remove(t);
+		}
+		
+		// This must return the string that is displayed in the listbox
+		public override string ToString()
+		{
+			return "Sector " + sector.Index + " has no " + (ceiling ? "ceiling" : "floor") + " flat.";
+		}
+		
+		// Rendering
+		public override void PlotSelection(IRenderer2D renderer)
+		{
+			renderer.PlotSector(sector, General.Colors.Selection);
+		}
+
+		//mxd. More rendering
+		public override void RenderOverlaySelection(IRenderer2D renderer) 
+		{
+			if(!BuilderPlug.Me.UseHighlight) return;
+			renderer.RenderHighlight(sector.FlatVertices, General.Colors.Selection.WithAlpha(64).ToInt());
+		}
+		
+		// Fix by setting default flat
+		public override bool Button1Click(bool batchMode)
+		{
+			if(!batchMode) General.Map.UndoRedo.CreateUndo("Missing flat correction");
+			General.Settings.FindDefaultDrawSettings();
+			
+			if(ceiling)
+				sector.SetCeilTexture(General.Map.Options.DefaultCeilingTexture);
+			else
+				sector.SetFloorTexture(General.Map.Options.DefaultFloorTexture);
+			
+			General.Map.Map.Update();
+			General.Map.Data.UpdateUsedTextures();
+			return true;
+		}
+
+		//mxd. Fix by picking a flat
+		public override bool Button2Click(bool batchMode) 
+		{
+			if(!batchMode) General.Map.UndoRedo.CreateUndo("Missing flat correction");
+			if(imagename == "-") imagename = General.Interface.BrowseFlat(General.Interface, imagename);
+			if(imagename == "-") return false;
+
+			if(ceiling) sector.SetCeilTexture(imagename);
+			else sector.SetFloorTexture(imagename);
+
+			General.Map.Map.Update();
+			General.Map.Data.UpdateUsedTextures();
+			return true;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ErrorChecks/ResultMissingTexture.cs b/Source/Plugins/BuilderModes/ErrorChecks/ResultMissingTexture.cs
new file mode 100644
index 0000000..8b0d0d2
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ErrorChecks/ResultMissingTexture.cs
@@ -0,0 +1,137 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	public class ResultMissingTexture : ErrorResult
+	{
+		#region ================== Variables
+
+		private readonly Sidedef side;
+		private readonly SidedefPart part;
+		private static string imagename = "-"; //mxd
+
+		#endregion
+
+		#region ================== Properties
+
+		public override int Buttons { get { return 2; } }
+		public override string Button1Text { get { return "Add Default Texture"; } }
+		public override string Button2Text { get { return "Browse Texture..."; } } //mxd
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		// Constructor
+		public ResultMissingTexture(Sidedef sd, SidedefPart part)
+		{
+			// Initialize
+			this.side = sd;
+			this.part = part;
+			this.viewobjects.Add(sd);
+			this.hidden = sd.IgnoredErrorChecks.Contains(this.GetType()); //mxd
+			imagename = "-"; //mxd
+			this.description = "This sidedef is missing a texture where it is required and could cause a 'Hall Of Mirrors' visual problem in the map.";
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This sets if this result is displayed in ErrorCheckForm (mxd)
+		internal override void Hide(bool hide) 
+		{
+			hidden = hide;
+			Type t = this.GetType();
+			if(hide) side.IgnoredErrorChecks.Add(t);
+			else if(side.IgnoredErrorChecks.Contains(t)) side.IgnoredErrorChecks.Remove(t);
+		}
+
+		// This must return the string that is displayed in the listbox
+		public override string ToString()
+		{
+			string sidestr = side.IsFront ? "front" : "back";
+
+			switch(part)
+			{
+				case SidedefPart.Upper:
+					return "Linedef " + side.Line.Index + " has missing upper texture (" + sidestr + " side)";
+
+				case SidedefPart.Middle:
+					return "Linedef " + side.Line.Index + " has missing middle texture (" + sidestr + " side)";
+
+				case SidedefPart.Lower:
+					return "Linedef " + side.Line.Index + " has missing lower texture (" + sidestr + " side)";
+
+				default:
+					return "ERROR";
+			}
+		}
+
+		// Rendering
+		public override void PlotSelection(IRenderer2D renderer)
+		{
+			renderer.PlotLinedef(side.Line, General.Colors.Selection);
+			renderer.PlotVertex(side.Line.Start, ColorCollection.VERTICES);
+			renderer.PlotVertex(side.Line.End, ColorCollection.VERTICES);
+		}
+
+		// Fix by setting default texture
+		public override bool Button1Click(bool batchMode)
+		{
+			if(!batchMode) General.Map.UndoRedo.CreateUndo("Missing texture correction");
+			General.Settings.FindDefaultDrawSettings();
+			switch(part)
+			{
+				case SidedefPart.Upper: side.SetTextureHigh(General.Map.Options.DefaultTopTexture); break;
+				case SidedefPart.Middle: side.SetTextureMid(General.Map.Options.DefaultWallTexture); break;
+				case SidedefPart.Lower: side.SetTextureLow(General.Map.Options.DefaultBottomTexture); break;
+			}
+
+			General.Map.Map.Update();
+			return true;
+		}
+
+		//mxd. Fix by picking a texture
+		public override bool Button2Click(bool batchMode) 
+		{
+			if(!batchMode) General.Map.UndoRedo.CreateUndo("Missing texture correction");
+			if(imagename == "-") imagename = General.Interface.BrowseTexture(General.Interface, imagename);
+			if(imagename == "-") return false;
+
+			switch(part) 
+			{
+				case SidedefPart.Upper: side.SetTextureHigh(imagename); break;
+				case SidedefPart.Middle: side.SetTextureMid(imagename); break;
+				case SidedefPart.Lower: side.SetTextureLow(imagename); break;
+			}
+
+			General.Map.Map.Update();
+			return true;
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ErrorChecks/ResultNoErrors.cs b/Source/Plugins/BuilderModes/ErrorChecks/ResultNoErrors.cs
new file mode 100644
index 0000000..1c47ff7
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ErrorChecks/ResultNoErrors.cs
@@ -0,0 +1,57 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	public class ResultNoErrors : ErrorResult
+	{
+		#region ================== Variables
+
+		#endregion
+
+		#region ================== Properties
+
+		public override int Buttons { get { return 0; } }
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		// Constructor
+		public ResultNoErrors()
+		{
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This sets if this result is displayed in ErrorCheckForm (mxd)
+		internal override void Hide(bool hide) { }
+
+		// This must return the string that is displayed in the listbox
+		public override string ToString()
+		{
+			return "No errors were found.";
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ErrorChecks/ResultObsoleteThing.cs b/Source/Plugins/BuilderModes/ErrorChecks/ResultObsoleteThing.cs
new file mode 100644
index 0000000..32efaae
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ErrorChecks/ResultObsoleteThing.cs
@@ -0,0 +1,78 @@
+#region ================== Namespaces
+
+using System;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	public class ResultObsoleteThing : ErrorResult
+	{
+		#region ================== Variables
+
+		private readonly Thing thing;
+
+		#endregion
+
+		#region ================== Properties
+
+		public override int Buttons { get { return 1; } }
+		public override string Button1Text { get { return "Delete Thing"; } }
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		public ResultObsoleteThing(Thing t, string message) 
+		{
+			// Initialize
+			this.thing = t;
+			this.viewobjects.Add(t);
+			this.hidden = t.IgnoredErrorChecks.Contains(this.GetType());
+
+			if(string.IsNullOrEmpty(message))
+				this.description = "This thing is marked as obsolete in DECORATE. You should probably replace or delete it.";
+			else
+				this.description = "This thing is marked as obsolete in DECORATE: " + message;
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This sets if this result is displayed in ErrorCheckForm (mxd)
+		internal override void Hide(bool hide) 
+		{
+			hidden = hide;
+			Type t = this.GetType();
+			if(hide) thing.IgnoredErrorChecks.Add(t);
+			else if(thing.IgnoredErrorChecks.Contains(t)) thing.IgnoredErrorChecks.Remove(t);
+		}
+
+		// This must return the string that is displayed in the listbox
+		public override string ToString() 
+		{
+			return "Thing " + thing.Index + " (" + General.Map.Data.GetThingInfo(thing.Type).Title + ") at " + thing.Position.x + ", " + thing.Position.y + " is obsolete.";
+		}
+
+		// Rendering
+		public override void  RenderOverlaySelection(IRenderer2D renderer) 
+		{
+			renderer.RenderThing(thing, General.Colors.Selection, Presentation.THINGS_ALPHA);
+		}
+		
+		// This removes the thing
+		public override bool Button1Click(bool batchMode) 
+		{
+			if(!batchMode) General.Map.UndoRedo.CreateUndo("Delete thing");
+			thing.Dispose();
+			General.Map.IsChanged = true;
+			General.Map.ThingsFilter.Update();
+			return true;
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ErrorChecks/ResultSectorInvalid.cs b/Source/Plugins/BuilderModes/ErrorChecks/ResultSectorInvalid.cs
new file mode 100644
index 0000000..02a745a
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ErrorChecks/ResultSectorInvalid.cs
@@ -0,0 +1,153 @@
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	public class ResultSectorInvalid : ErrorResult
+	{
+		#region ================== Variables
+
+		private readonly Sector sector;
+
+		#endregion
+
+		#region ================== Properties
+
+		public override int Buttons { get { return 1; } }
+		public override string Button1Text { get { return "Dissolve"; } }
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+		
+		// Constructor
+		public ResultSectorInvalid(Sector s)
+		{
+			// Initialize
+			sector = s;
+			viewobjects.Add(s);
+			hidden = s.IgnoredErrorChecks.Contains(this.GetType()); //mxd
+			description = "This sector has invalid geometry (it has less than 3 sidedefs or linedefs, or it's area is 0). This could cause problems with clipping and rendering in the game.";
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+
+		// This sets if this result is displayed in ErrorCheckForm (mxd)
+		internal override void Hide(bool hide) 
+		{
+			hidden = hide;
+			Type t = this.GetType();
+			if(hide) sector.IgnoredErrorChecks.Add(t);
+			else if(sector.IgnoredErrorChecks.Contains(t)) sector.IgnoredErrorChecks.Remove(t);
+		}
+		
+		// This must return the string that is displayed in the listbox
+		public override string ToString() 
+		{
+			if(sector.Sidedefs != null && sector.Sidedefs.Count > 2)
+				return "Area of sector " + sector.Index + " is 0";
+			return "Sector " + sector.Index + " has " + (sector.Sidedefs == null ? "no" : sector.Sidedefs.Count.ToString()) + " sidedefs";
+		}
+		
+		// Rendering
+		public override void PlotSelection(IRenderer2D renderer)
+		{
+			renderer.PlotSector(sector, General.Colors.Selection);
+		}
+
+		// Fix by merging with surrounding geometry/removing
+		public override bool Button1Click(bool batchMode) 
+		{
+			if(!batchMode) General.Map.UndoRedo.CreateUndo("Invalid sector correction");
+
+			//collect the lines
+			List<Linedef> lines = new List<Linedef>();
+			foreach(Sidedef side in sector.Sidedefs) 
+			{
+				if(!lines.Contains(side.Line) && !side.Line.IsDisposed) 
+					lines.Add(side.Line);
+			}
+
+			//get rid of lines with zero length
+			foreach(Linedef line in lines)
+				if(line.Length == 0) line.Dispose();
+
+			if(lines.Count == 0) 
+			{
+				sector.Dispose();
+			} 
+			else if(lines.Count < 3) //merge with surrounding geometry
+			{ 
+				bool merged = false;
+				foreach(Sidedef side in sector.Sidedefs) 
+				{
+					if(side.Other != null && side.Other.Sector != null && sector.Index != side.Other.Sector.Index) 
+					{
+						sector.Join(side.Other.Sector);
+						merged = true;
+						break;
+					}
+				}
+
+				if(!merged)
+				{
+					List<Linedef> sectorlines = new List<Linedef>(sector.Sidedefs.Count);
+					foreach(Sidedef side in sector.Sidedefs) sectorlines.Add(side.Line);
+
+					if(sectorlines.Count > 0)
+					{
+						List<LinedefSide> newlines = new List<LinedefSide>(sectorlines.Count);
+						foreach(Linedef line in sectorlines)
+						{
+							if(line.Front != null) newlines.Add(new LinedefSide(line, true));
+							if(line.Back != null) newlines.Add(new LinedefSide(line, false));
+						}
+						
+						if(newlines.Count > 0)
+						{
+							// If invalid sector is inside another one, join them
+							Vector2D center = new Vector2D(sector.BBox.X + sector.BBox.Width / 2, sector.BBox.Y + sector.BBox.Height / 2);
+							Linedef otherline = General.Map.Map.NearestLinedef(center, sectorlines);
+							Sidedef targetside = (otherline.Front ?? otherline.Back);
+
+							if(targetside != null &&
+								((otherline.Front != null && otherline.Front.Sector != null && otherline.Front.Sector.BBox.Contains(center.x, center.y)) ||
+								otherline.Back != null && otherline.Back.Sector != null && otherline.Back.Sector.BBox.Contains(center.x, center.y)))
+							{
+								Tools.JoinSector(newlines, targetside);
+								merged = true;
+							}
+						}
+					}
+					
+					//oh well, I don't know what else I can do here...
+					if(!merged) sector.Dispose();
+				}
+			} 
+			else //redraw the lines
+			{ 
+				foreach(Linedef line in lines)
+				{
+					if(line.IsDisposed) continue;
+					DrawnVertex start = new DrawnVertex { pos = line.Start.Position, stitch = true, stitchline = true };
+					DrawnVertex end = new DrawnVertex { pos = line.End.Position, stitch = true, stitchline = true };
+					Tools.DrawLines(new List<DrawnVertex> { start, end }, false, false);
+				}
+			}
+
+			General.Map.Map.Update();
+			return true;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ErrorChecks/ResultSectorUnclosed.cs b/Source/Plugins/BuilderModes/ErrorChecks/ResultSectorUnclosed.cs
new file mode 100644
index 0000000..9f3d05d
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ErrorChecks/ResultSectorUnclosed.cs
@@ -0,0 +1,86 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	public class ResultSectorUnclosed : ErrorResult
+	{
+		#region ================== Variables
+		
+		private readonly Sector sector;
+		private readonly List<Vertex> vertices;
+		private readonly int index;
+		
+		#endregion
+		
+		#region ================== Properties
+
+		#endregion
+		
+		#region ================== Constructor / Destructor
+		
+		// Constructor
+		public ResultSectorUnclosed(Sector s, List<Vertex> v)
+		{
+			// Initialize
+			sector = s;
+			vertices = new List<Vertex>(v);
+			viewobjects.Add(s);
+			hidden = s.IgnoredErrorChecks.Contains(this.GetType()); //mxd
+			foreach(Vertex vv in v) this.viewobjects.Add(vv);
+			description = "This sector is not a closed region and could cause problems with clipping and rendering in the game. The 'leaks' in the sector are indicated by the colored vertices.";
+			index = s.Index;
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+
+		// This sets if this result is displayed in ErrorCheckForm (mxd)
+		internal override void Hide(bool hide) 
+		{
+			hidden = hide;
+			Type t = this.GetType();
+			if(hide) sector.IgnoredErrorChecks.Add(t);
+			else if(sector.IgnoredErrorChecks.Contains(t)) sector.IgnoredErrorChecks.Remove(t);
+		}
+		
+		// This must return the string that is displayed in the listbox
+		public override string ToString()
+		{
+			return "Sector " + index + " is not closed";
+		}
+		
+		// Rendering
+		public override void PlotSelection(IRenderer2D renderer)
+		{
+			renderer.PlotSector(sector, General.Colors.Selection);
+			foreach(Vertex v in vertices)
+				renderer.PlotVertex(v, ColorCollection.SELECTION);
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ErrorChecks/ResultShortLinedef.cs b/Source/Plugins/BuilderModes/ErrorChecks/ResultShortLinedef.cs
new file mode 100644
index 0000000..944792c
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ErrorChecks/ResultShortLinedef.cs
@@ -0,0 +1,66 @@
+#region ================== Namespaces
+
+using System;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	public class ResultShortLinedef : ErrorResult
+	{
+		#region ================== Variables
+		
+		private readonly Linedef line;
+		
+		#endregion
+		
+		#region ================== Properties
+
+		public override int Buttons { get { return 0; } }
+		
+		#endregion
+		
+		#region ================== Constructor / Destructor
+		
+		// Constructor
+		public ResultShortLinedef(Linedef l)
+		{
+			// Initialize
+			line = l;
+			viewobjects.Add(l);
+			hidden = l.IgnoredErrorChecks.Contains(this.GetType()); //mxd
+			description = "This linedef is shorter than 1 map unit. This can porentially cause nodebuilding errors.";
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+
+		// This sets if this result is displayed in ErrorCheckForm (mxd)
+		internal override void Hide(bool hide)
+		{
+			hidden = hide;
+			Type t = this.GetType();
+			if(hide) line.IgnoredErrorChecks.Add(t);
+			else if(line.IgnoredErrorChecks.Contains(t)) line.IgnoredErrorChecks.Remove(t);
+		}
+		
+		// This must return the string that is displayed in the listbox
+		public override string ToString()
+		{
+			return "Linedef " + line.Index + " is shorter than 1 m.u.";
+		}
+		
+		// Rendering
+		public override void PlotSelection(IRenderer2D renderer)
+		{
+			renderer.PlotLinedef(line, General.Colors.Selection);
+			renderer.PlotVertex(line.Start, ColorCollection.VERTICES);
+			renderer.PlotVertex(line.End, ColorCollection.VERTICES);
+		}
+		
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/Source/Plugins/BuilderModes/ErrorChecks/ResultStrayVertex.cs b/Source/Plugins/BuilderModes/ErrorChecks/ResultStrayVertex.cs
new file mode 100644
index 0000000..8675037
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ErrorChecks/ResultStrayVertex.cs
@@ -0,0 +1,75 @@
+#region ================== Namespaces
+
+using System;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using System.Drawing;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	public class ResultStrayVertex : ErrorResult
+	{
+		#region ================== Variables
+
+		private readonly Vertex vertex;
+
+		#endregion
+
+		#region ================== Properties
+
+		public override int Buttons { get { return 1; } }
+		public override string Button1Text { get { return "Delete Vertex"; } }
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		public ResultStrayVertex(Vertex v) 
+		{
+			// Initialize
+			vertex = v;
+			viewobjects.Add(v);
+			hidden = v.IgnoredErrorChecks.Contains(this.GetType()); //mxd
+			description = "This vertex is not connected to any linedef.";
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This sets if this result is displayed in ErrorCheckForm (mxd)
+		internal override void Hide(bool hide) 
+		{
+			hidden = hide;
+			Type t = this.GetType();
+			if(hide) vertex.IgnoredErrorChecks.Add(t);
+			else if(vertex.IgnoredErrorChecks.Contains(t)) vertex.IgnoredErrorChecks.Remove(t);
+		}
+
+		// This must return the string that is displayed in the listbox
+		public override string ToString()
+		{
+			return "Vertex " + vertex.Index + " at " + vertex.Position.x + ", " + vertex.Position.y + " is not connected to any linedef.";
+		}
+
+		// Rendering
+		public override void RenderOverlaySelection(IRenderer2D renderer)
+		{
+			renderer.RenderRectangleFilled(new RectangleF(vertex.Position.x - 3, vertex.Position.y - 3, 6f, 6f), General.Colors.Selection, true);
+		}
+
+		// This removes the vertex
+		public override bool Button1Click(bool batchMode)
+		{
+			if(!batchMode) General.Map.UndoRedo.CreateUndo("Delete vertex");
+			vertex.Dispose();
+			General.Map.IsChanged = true;
+			General.Map.ThingsFilter.Update();
+			return true;
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ErrorChecks/ResultStuckThingInLine.cs b/Source/Plugins/BuilderModes/ErrorChecks/ResultStuckThingInLine.cs
new file mode 100644
index 0000000..63ae302
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ErrorChecks/ResultStuckThingInLine.cs
@@ -0,0 +1,101 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	public class ResultStuckThingInLine : ErrorResult
+	{
+		#region ================== Variables
+
+		private readonly Thing thing;
+		private readonly Linedef line; //mxd
+		
+		#endregion
+		
+		#region ================== Properties
+
+		public override int Buttons { get { return 1; } }
+		public override string Button1Text { get { return "Delete Thing"; } }
+
+		#endregion
+		
+		#region ================== Constructor / Destructor
+		
+		// Constructor
+		public ResultStuckThingInLine(Thing t, Linedef l)
+		{
+			// Initialize
+			thing = t;
+			line = l; //mxd
+			viewobjects.Add(t);
+			hidden = t.IgnoredErrorChecks.Contains(this.GetType()); //mxd
+			description = "This thing is stuck in a wall (single-sided line) and will likely not be able to move around.";
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+
+		// This sets if this result is displayed in ErrorCheckForm (mxd)
+		internal override void Hide(bool hide) 
+		{
+			hidden = hide;
+			Type t = this.GetType();
+			if(hide) thing.IgnoredErrorChecks.Add(t);
+			else if(thing.IgnoredErrorChecks.Contains(t)) thing.IgnoredErrorChecks.Remove(t);
+		}
+		
+		// This must return the string that is displayed in the listbox
+		public override string ToString()
+		{
+			return "Thing " + thing.Index + " (" + General.Map.Data.GetThingInfo(thing.Type).Title + ") is stuck in linedef " + line.Index + " at " + thing.Position.x + ", " + thing.Position.y;
+		}
+
+		// Rendering
+		public override void RenderOverlaySelection(IRenderer2D renderer)
+		{
+			renderer.RenderThing(thing, General.Colors.Selection, Presentation.THINGS_ALPHA);
+		}
+
+		// mxd. More rencering
+		public override void PlotSelection(IRenderer2D renderer) 
+		{
+			renderer.PlotLinedef(line, General.Colors.Selection);
+			renderer.PlotVertex(line.Start, ColorCollection.VERTICES);
+			renderer.PlotVertex(line.End, ColorCollection.VERTICES);
+		}
+
+		// This removes the thing
+		public override bool Button1Click(bool batchMode)
+		{
+			if(!batchMode) General.Map.UndoRedo.CreateUndo("Delete thing");
+			thing.Dispose();
+			General.Map.IsChanged = true;
+			General.Map.ThingsFilter.Update();
+			return true;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ErrorChecks/ResultStuckThingInThing.cs b/Source/Plugins/BuilderModes/ErrorChecks/ResultStuckThingInThing.cs
new file mode 100644
index 0000000..e48ea61
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ErrorChecks/ResultStuckThingInThing.cs
@@ -0,0 +1,113 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	public class ResultStuckThingInThing : ErrorResult
+	{
+		#region ================== Variables
+
+		private readonly Thing thing1;
+		private readonly Thing thing2; //mxd
+
+		#endregion
+
+		#region ================== Properties
+
+		public override int Buttons { get { return 2; } }
+		public override string Button1Text { get { return "Delete 1-st Thing"; } }
+		public override string Button2Text { get { return "Delete 2-nd Thing"; } } //mxd
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		// Constructor
+		public ResultStuckThingInThing(Thing t1, Thing t2)
+		{
+			// Initialize
+			this.thing1 = t1;
+			this.thing2 = t2; //mxd
+			this.viewobjects.Add(t1);
+			hidden = (t1.IgnoredErrorChecks.Contains(this.GetType()) && t2.IgnoredErrorChecks.Contains(this.GetType())); //mxd
+			this.description = "This thing is stuck in another thing. Both will likely not be able to move around.";
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This sets if this result is displayed in ErrorCheckForm (mxd)
+		internal override void Hide(bool hide) 
+		{
+			hidden = hide;
+			Type t = this.GetType();
+			if(hide) 
+			{
+				thing1.IgnoredErrorChecks.Add(t);
+				thing2.IgnoredErrorChecks.Add(t);
+			} 
+			else 
+			{
+				if(thing1.IgnoredErrorChecks.Contains(t)) thing1.IgnoredErrorChecks.Remove(t);
+				if(thing2.IgnoredErrorChecks.Contains(t)) thing2.IgnoredErrorChecks.Remove(t);
+			}
+		}
+
+		// This must return the string that is displayed in the listbox
+		public override string ToString()
+		{
+			return "Thing " + thing1.Index + " (" + General.Map.Data.GetThingInfo(thing1.Type).Title + ") is stuck in thing " + thing2.Index + " (" + General.Map.Data.GetThingInfo(thing2.Type).Title + ") at " + thing1.Position.x + ", " + thing1.Position.y;
+		}
+
+		// Rendering
+		public override void RenderOverlaySelection(IRenderer2D renderer)
+		{
+			renderer.RenderThing(thing1, General.Colors.Selection, Presentation.THINGS_ALPHA);
+			renderer.RenderThing(thing2, General.Colors.Selection, Presentation.THINGS_ALPHA);
+		}
+
+		// This removes the first thing
+		public override bool Button1Click(bool batchMode)
+		{
+			if(!batchMode) General.Map.UndoRedo.CreateUndo("Delete thing");
+			thing1.Dispose();
+			General.Map.IsChanged = true;
+			General.Map.ThingsFilter.Update();
+			return true;
+		}
+
+		// This removes the thing
+		public override bool Button2Click(bool batchMode) 
+		{
+			if(!batchMode) General.Map.UndoRedo.CreateUndo("Delete thing");
+			thing2.Dispose();
+			General.Map.IsChanged = true;
+			General.Map.ThingsFilter.Update();
+			return true;
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ErrorChecks/ResultTexturesMisaligned.cs b/Source/Plugins/BuilderModes/ErrorChecks/ResultTexturesMisaligned.cs
new file mode 100644
index 0000000..1a8e280
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ErrorChecks/ResultTexturesMisaligned.cs
@@ -0,0 +1,83 @@
+#region ================== Namespaces
+
+using System;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	public class ResultTexturesMisaligned : ErrorResult
+	{
+
+		#region ================== Variables
+		
+		private readonly Sidedef side1;
+		private readonly Sidedef side2;
+		private readonly string texturename;
+		
+		#endregion
+		
+		#region ================== Properties
+
+		public override int Buttons { get { return 0; } }
+		
+		#endregion
+		
+		#region ================== Constructor / Destructor
+
+		public ResultTexturesMisaligned(Sidedef side1, Sidedef side2, string texturename)
+		{
+			// Initialize
+			this.side1 = side1;
+			this.side2 = side2;
+			this.texturename = texturename;
+			viewobjects.Add(side1.Line);
+			viewobjects.Add(side2.Line);
+			hidden = (side1.IgnoredErrorChecks.Contains(this.GetType()) && side2.IgnoredErrorChecks.Contains(this.GetType()));
+			description = "Textures are not aligned on given sidedefs. Some players may not like that.";
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This sets if this result is displayed in ErrorCheckForm (mxd)
+		internal override void Hide(bool hide) 
+		{
+			hidden = hide;
+			Type t = this.GetType();
+			if(hide) 
+			{
+				side1.IgnoredErrorChecks.Add(t);
+				side2.IgnoredErrorChecks.Add(t);
+			}
+			else 
+			{
+				if(side1.IgnoredErrorChecks.Contains(t)) side1.IgnoredErrorChecks.Remove(t);
+				if(side2.IgnoredErrorChecks.Contains(t)) side2.IgnoredErrorChecks.Remove(t);
+			}
+		}
+		
+		// This must return the string that is displayed in the listbox
+		public override string ToString()
+		{
+			return "Texture '" + texturename + "' is not aligned on linedefs " + side1.Line.Index + " (" + (side1.IsFront ? "front" : "back") 
+				+ ") and " + side2.Line.Index + " (" + (side2.IsFront ? "front" : "back") + ")";
+		}
+		
+		// Rendering
+		public override void PlotSelection(IRenderer2D renderer)
+		{
+			renderer.PlotLinedef(side1.Line, General.Colors.Selection);
+			renderer.PlotLinedef(side2.Line, General.Colors.Selection);
+			renderer.PlotVertex(side1.Line.Start, ColorCollection.VERTICES);
+			renderer.PlotVertex(side1.Line.End, ColorCollection.VERTICES);
+			renderer.PlotVertex(side2.Line.Start, ColorCollection.VERTICES);
+			renderer.PlotVertex(side2.Line.End, ColorCollection.VERTICES);
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ErrorChecks/ResultThingOutside.cs b/Source/Plugins/BuilderModes/ErrorChecks/ResultThingOutside.cs
new file mode 100644
index 0000000..221e72d
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ErrorChecks/ResultThingOutside.cs
@@ -0,0 +1,91 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	public class ResultThingOutside : ErrorResult
+	{
+		#region ================== Variables
+
+		private readonly Thing thing;
+
+		#endregion
+
+		#region ================== Properties
+		
+		public override int Buttons { get { return 1; } }
+		public override string Button1Text { get { return "Delete Thing"; } }
+		
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		// Constructor
+		public ResultThingOutside(Thing t)
+		{
+			// Initialize
+			thing = t;
+			viewobjects.Add(t);
+			hidden = t.IgnoredErrorChecks.Contains(this.GetType()); //mxd
+			description = "This thing is completely outside the map.";
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This sets if this result is displayed in ErrorCheckForm (mxd)
+		internal override void Hide(bool hide) 
+		{
+			hidden = hide;
+			Type t = this.GetType();
+			if(hide) thing.IgnoredErrorChecks.Add(t);
+			else if(thing.IgnoredErrorChecks.Contains(t)) thing.IgnoredErrorChecks.Remove(t);
+		}
+
+		// This must return the string that is displayed in the listbox
+		public override string ToString()
+		{
+			return "Thing " + thing.Index + " (" + General.Map.Data.GetThingInfo(thing.Type).Title + ") is outside the map at " + thing.Position.x + ", " + thing.Position.y;
+		}
+
+		// Rendering
+		public override void  RenderOverlaySelection(IRenderer2D renderer)
+		{
+			renderer.RenderThing(thing, General.Colors.Selection, Presentation.THINGS_ALPHA);
+		}
+		
+		// This removes the thing
+		public override bool Button1Click(bool batchMode)
+		{
+			if(!batchMode) General.Map.UndoRedo.CreateUndo("Delete thing");
+			thing.Dispose();
+			General.Map.IsChanged = true;
+			General.Map.ThingsFilter.Update();
+			return true;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ErrorChecks/ResultUnknownFlat.cs b/Source/Plugins/BuilderModes/ErrorChecks/ResultUnknownFlat.cs
new file mode 100644
index 0000000..ad772c8
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ErrorChecks/ResultUnknownFlat.cs
@@ -0,0 +1,130 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	public class ResultUnknownFlat : ErrorResult
+	{
+		#region ================== Variables
+		
+		private readonly Sector sector;
+		private readonly bool ceiling;
+		private static string imagename = "-"; //mxd
+		
+		#endregion
+		
+		#region ================== Properties
+
+		public override int Buttons { get { return 2; } }
+		public override string Button1Text { get { return "Add Default Flat"; } }
+		public override string Button2Text { get { return "Browse Flat..."; } } //mxd
+		
+		#endregion
+		
+		#region ================== Constructor / Destructor
+		
+		// Constructor
+		public ResultUnknownFlat(Sector s, bool ceiling)
+		{
+			// Initialize
+			this.sector = s;
+			this.ceiling = ceiling;
+			this.viewobjects.Add(s);
+			this.hidden = s.IgnoredErrorChecks.Contains(this.GetType()); //mxd
+			imagename = "-"; //mxd
+
+			string objname = ceiling ? "ceiling" : "floor";
+			this.description = "This sector's " + objname + " uses an unknown flat. This could be the result of missing resources, or a mistyped flat name.";
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+
+		// This sets if this result is displayed in ErrorCheckForm (mxd)
+		internal override void Hide(bool hide) 
+		{
+			hidden = hide;
+			Type t = this.GetType();
+			if(hide) sector.IgnoredErrorChecks.Add(t);
+			else if(sector.IgnoredErrorChecks.Contains(t)) sector.IgnoredErrorChecks.Remove(t);
+		}
+		
+		// This must return the string that is displayed in the listbox
+		public override string ToString()
+		{
+			if(ceiling)
+				return "Sector " + sector.Index + " has unknown ceiling flat \"" + sector.CeilTexture + "\"";
+			else
+				return "Sector " + sector.Index + " has unknown floor flat \"" + sector.FloorTexture + "\"";
+		}
+		
+		// Rendering
+		public override void PlotSelection(IRenderer2D renderer)
+		{
+			renderer.PlotSector(sector, General.Colors.Selection);
+		}
+
+		//mxd. More rendering
+		public override void RenderOverlaySelection(IRenderer2D renderer) 
+		{
+			if(!BuilderPlug.Me.UseHighlight) return;
+			renderer.RenderHighlight(sector.FlatVertices, General.Colors.Selection.WithAlpha(64).ToInt());
+		}
+		
+		// Fix by setting default flat
+		public override bool Button1Click(bool batchMode)
+		{
+			if(!batchMode) General.Map.UndoRedo.CreateUndo("Unknown flat correction");
+			General.Settings.FindDefaultDrawSettings();
+			
+			if(ceiling)
+				sector.SetCeilTexture(General.Map.Options.DefaultCeilingTexture);
+			else
+				sector.SetFloorTexture(General.Map.Options.DefaultFloorTexture);
+			
+			General.Map.Map.Update();
+			General.Map.Data.UpdateUsedTextures();
+			return true;
+		}
+
+		//mxd. Fix by picking a flat
+		public override bool Button2Click(bool batchMode) 
+		{
+			if(!batchMode) General.Map.UndoRedo.CreateUndo("Unknown flat correction");
+			if(imagename == "-") imagename = General.Interface.BrowseFlat(General.Interface, imagename);
+			if(imagename == "-") return false;
+
+			if(ceiling) sector.SetCeilTexture(imagename);
+			else sector.SetFloorTexture(imagename);
+
+			General.Map.Map.Update();
+			General.Map.Data.UpdateUsedTextures();
+			return true;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ErrorChecks/ResultUnknownTexture.cs b/Source/Plugins/BuilderModes/ErrorChecks/ResultUnknownTexture.cs
new file mode 100644
index 0000000..bdcfd8f
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ErrorChecks/ResultUnknownTexture.cs
@@ -0,0 +1,152 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	public class ResultUnknownTexture : ErrorResult
+	{
+		#region ================== Variables
+		
+		private readonly Sidedef side;
+		private readonly SidedefPart part;
+		private static string imagename = "-"; //mxd
+		
+		#endregion
+		
+		#region ================== Properties
+
+		public override int Buttons { get { return 3; } }
+		public override string Button1Text { get { return "Remove Texture"; } }
+		public override string Button2Text { get { return "Add Default Texture"; } }
+		public override string Button3Text { get { return "Browse Texture..."; } } //mxd
+		
+		#endregion
+		
+		#region ================== Constructor / Destructor
+		
+		// Constructor
+		public ResultUnknownTexture(Sidedef sd, SidedefPart part)
+		{
+			// Initialize
+			this.side = sd;
+			this.part = part;
+			this.viewobjects.Add(sd);
+			this.hidden = sd.IgnoredErrorChecks.Contains(this.GetType()); //mxd
+			imagename = "-"; //mxd
+			this.description = "This sidedef uses an unknown texture. This could be the result of missing resources, or a mistyped texture name.";
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+
+		// This sets if this result is displayed in ErrorCheckForm (mxd)
+		internal override void Hide(bool hide) 
+		{
+			hidden = hide;
+			Type t = this.GetType();
+			if(hide) side.IgnoredErrorChecks.Add(t);
+			else if(side.IgnoredErrorChecks.Contains(t)) side.IgnoredErrorChecks.Remove(t);
+		}
+		
+		// This must return the string that is displayed in the listbox
+		public override string ToString()
+		{
+			switch(part)
+			{
+				case SidedefPart.Upper:
+					return "Linedef " + side.Line.Index + " has unknown upper texture \"" + side.HighTexture + "\" (" + (side.IsFront ? "front" : "back") + " side)";
+					
+				case SidedefPart.Middle:
+					return "Linedef " + side.Line.Index + " has unknown middle texture \"" + side.MiddleTexture + "\" (" + (side.IsFront ? "front" : "back") + " side)";
+					
+				case SidedefPart.Lower:
+					return "Linedef " + side.Line.Index + " has unknown lower texture \"" + side.LowTexture + "\" (" + (side.IsFront ? "front" : "back") + " side)";
+					
+				default:
+					return "ERROR";
+			}
+		}
+		
+		// Rendering
+		public override void PlotSelection(IRenderer2D renderer)
+		{
+			renderer.PlotLinedef(side.Line, General.Colors.Selection);
+			renderer.PlotVertex(side.Line.Start, ColorCollection.VERTICES);
+			renderer.PlotVertex(side.Line.End, ColorCollection.VERTICES);
+		}
+		
+		// Fix by removing texture
+		public override bool Button1Click(bool batchMode)
+		{
+			if(!batchMode) General.Map.UndoRedo.CreateUndo("Remove unknown texture");
+			switch(part)
+			{
+				case SidedefPart.Upper: side.SetTextureHigh("-"); break;
+				case SidedefPart.Middle: side.SetTextureMid("-"); break;
+				case SidedefPart.Lower: side.SetTextureLow("-"); break;
+			}
+			
+			General.Map.Map.Update();
+			return true;
+		}
+		
+		// Fix by setting default texture
+		public override bool Button2Click(bool batchMode)
+		{
+			if(!batchMode) General.Map.UndoRedo.CreateUndo("Unknown texture correction");
+			General.Settings.FindDefaultDrawSettings();
+			switch(part)
+			{
+				case SidedefPart.Upper: side.SetTextureHigh(General.Map.Options.DefaultTopTexture); break;
+				case SidedefPart.Middle: side.SetTextureMid(General.Map.Options.DefaultWallTexture); break;
+				case SidedefPart.Lower: side.SetTextureLow(General.Map.Options.DefaultBottomTexture); break;
+			}
+			
+			General.Map.Map.Update();
+			return true;
+		}
+
+		//mxd. Fix by picking a texture
+		public override bool Button3Click(bool batchMode) 
+		{
+			if(!batchMode) General.Map.UndoRedo.CreateUndo("Unknown texture correction");
+			if(imagename == "-") imagename = General.Interface.BrowseTexture(General.Interface, imagename);
+			if(imagename == "-") return false;
+
+			switch(part) 
+			{
+				case SidedefPart.Upper: side.SetTextureHigh(imagename); break;
+				case SidedefPart.Middle: side.SetTextureMid(imagename); break;
+				case SidedefPart.Lower: side.SetTextureLow(imagename); break;
+			}
+
+			General.Map.Map.Update();
+			return true;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ErrorChecks/ResultUnknownThing.cs b/Source/Plugins/BuilderModes/ErrorChecks/ResultUnknownThing.cs
new file mode 100644
index 0000000..dec86e9
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ErrorChecks/ResultUnknownThing.cs
@@ -0,0 +1,75 @@
+#region ================== Namespaces
+
+using System;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	public class ResultUnknownThing : ErrorResult
+	{
+
+		#region ================== Variables
+
+		private readonly Thing thing;
+
+		#endregion
+
+		#region ================== Properties
+
+		public override int Buttons { get { return 1; } }
+		public override string Button1Text { get { return "Delete Thing"; } }
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		public ResultUnknownThing(Thing t) 
+		{
+			// Initialize
+			thing = t;
+			viewobjects.Add(t);
+			hidden = t.IgnoredErrorChecks.Contains(this.GetType()); //mxd
+			description = "This thing has unknown type (eg. it's not defined in DECORATE or current game configuration).";
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This sets if this result is displayed in ErrorCheckForm (mxd)
+		internal override void Hide(bool hide) 
+		{
+			hidden = hide;
+			Type t = this.GetType();
+			if(hide) thing.IgnoredErrorChecks.Add(t);
+			else if(thing.IgnoredErrorChecks.Contains(t)) thing.IgnoredErrorChecks.Remove(t);
+		}
+
+		// This must return the string that is displayed in the listbox
+		public override string ToString() 
+		{
+			return "Thing " + thing.Index + " has unknown type (" + thing.Type + ").";
+		}
+
+		// Rendering
+		public override void  RenderOverlaySelection(IRenderer2D renderer) 
+		{
+			renderer.RenderThing(thing, General.Colors.Selection, Presentation.THINGS_ALPHA);
+		}
+		
+		// This removes the thing
+		public override bool Button1Click(bool batchMode) 
+		{
+			if(!batchMode) General.Map.UndoRedo.CreateUndo("Delete thing");
+			thing.Dispose();
+			General.Map.IsChanged = true;
+			General.Map.ThingsFilter.Update();
+			return true;
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ErrorChecks/ResultUnusedTexture.cs b/Source/Plugins/BuilderModes/ErrorChecks/ResultUnusedTexture.cs
new file mode 100644
index 0000000..7220e09
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ErrorChecks/ResultUnusedTexture.cs
@@ -0,0 +1,105 @@
+#region ================== Namespaces
+
+using System;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	public class ResultUnusedTexture : ErrorResult
+	{
+		#region ================== Variables
+		
+		private readonly Sidedef side;
+		private readonly SidedefPart part;
+		
+		#endregion
+		
+		#region ================== Properties
+
+		public override int Buttons { get { return 1; } }
+		public override string Button1Text { get { return "Remove Texture"; } }
+		
+		#endregion
+		
+		#region ================== Constructor / Destructor
+		
+		// Constructor
+		public ResultUnusedTexture(Sidedef sd, SidedefPart part)
+		{
+			// Initialize
+			this.side = sd;
+			this.part = part;
+			this.viewobjects.Add(sd);
+			this.hidden = sd.IgnoredErrorChecks.Contains(this.GetType()); //mxd
+			this.description = "This sidedef uses an upper or lower texture, which is not required (it will never be visible ingame). Click the Remove Texture button to remove the texture (this will also reset texture offsets and scale in UDMF map format).";
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+
+		// This sets if this result is displayed in ErrorCheckForm (mxd)
+		internal override void Hide(bool hide) 
+		{
+			hidden = hide;
+			Type t = this.GetType();
+			if(hide) side.IgnoredErrorChecks.Add(t);
+			else if(side.IgnoredErrorChecks.Contains(t)) side.IgnoredErrorChecks.Remove(t);
+		}
+		
+		// This must return the string that is displayed in the listbox
+		public override string ToString()
+		{
+			switch(part)
+			{
+				case SidedefPart.Upper:
+					return "Sidedef " + side.Index + " has unused upper texture \"" + side.HighTexture + "\"";
+					
+				case SidedefPart.Middle:
+					return "Sidedef " + side.Index + " has unused middle texture \"" + side.MiddleTexture + "\"";
+					
+				case SidedefPart.Lower:
+					return "Sidedef " + side.Index + " has unused lower texture \"" + side.LowTexture + "\"";
+					
+				default:
+					return "ERROR";
+			}
+		}
+		
+		// Rendering
+		public override void PlotSelection(IRenderer2D renderer)
+		{
+			renderer.PlotLinedef(side.Line, General.Colors.Selection);
+			renderer.PlotVertex(side.Line.Start, ColorCollection.VERTICES);
+			renderer.PlotVertex(side.Line.End, ColorCollection.VERTICES);
+		}
+		
+		// Fix by removing texture
+		public override bool Button1Click(bool batchMode)
+		{
+			if(!batchMode) General.Map.UndoRedo.CreateUndo("Remove unused texture");
+			if(General.Map.UDMF) side.Fields.BeforeFieldsChange();
+
+			switch(part)
+			{
+				case SidedefPart.Upper: 
+					side.SetTextureHigh("-");
+					if(General.Map.UDMF) UniFields.RemoveFields(side.Fields, new[] { "scalex_top", "scaley_top", "offsetx_top", "offsety_top" }); 
+					break;
+
+				case SidedefPart.Lower: 
+					side.SetTextureLow("-");
+					if(General.Map.UDMF) UniFields.RemoveFields(side.Fields, new[] { "scalex_bottom", "scaley_bottom", "offsetx_bottom", "offsety_bottom" }); 
+					break;
+			}
+			
+			General.Map.Map.Update();
+			return true;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ErrorChecks/ResultUnusedThing.cs b/Source/Plugins/BuilderModes/ErrorChecks/ResultUnusedThing.cs
new file mode 100644
index 0000000..2dae47b
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ErrorChecks/ResultUnusedThing.cs
@@ -0,0 +1,87 @@
+#region ================== Namespaces
+
+using System;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	public class ResultUnusedThing : ErrorResult
+	{
+		#region ================== Variables
+
+		private readonly Thing thing;
+		private readonly string details;
+
+		#endregion
+
+		#region ================== Properties
+
+		public override int Buttons { get { return 2; } }
+		public override string Button1Text { get { return "Delete Thing"; } }
+		public override string Button2Text { get { return "Apply default flags"; } }
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		public ResultUnusedThing(Thing t, string details) 
+		{
+			// Initialize
+			this.thing = t;
+			this.details = details;
+			this.viewobjects.Add(t);
+			this.hidden = t.IgnoredErrorChecks.Contains(this.GetType());
+			this.description = "This thing won't be shown in any game mode.";
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This sets if this result is displayed in ErrorCheckForm (mxd)
+		internal override void Hide(bool hide) 
+		{
+			hidden = hide;
+			Type t = this.GetType();
+			if(hide) thing.IgnoredErrorChecks.Add(t);
+			else if(thing.IgnoredErrorChecks.Contains(t)) thing.IgnoredErrorChecks.Remove(t);
+		}
+
+		// This must return the string that is displayed in the listbox
+		public override string ToString() 
+		{
+			return "Thing " + thing.Index + " (" + General.Map.Data.GetThingInfo(thing.Type).Title + ") is unused. " + details;
+		}
+
+		// Rendering
+		public override void  RenderOverlaySelection(IRenderer2D renderer) 
+		{
+			renderer.RenderThing(thing, General.Colors.Selection, Presentation.THINGS_ALPHA);
+		}
+		
+		// This removes the thing
+		public override bool Button1Click(bool batchMode) 
+		{
+			if(!batchMode) General.Map.UndoRedo.CreateUndo("Delete thing");
+			thing.Dispose();
+			General.Map.IsChanged = true;
+			General.Map.ThingsFilter.Update();
+			return true;
+		}
+
+		// This sets default flags
+		public override bool Button2Click(bool batchMode) 
+		{
+			if(!batchMode) General.Map.UndoRedo.CreateUndo("Set default thing flags");
+			foreach(string f in General.Map.Config.DefaultThingFlags) thing.SetFlag(f, true);
+			General.Map.IsChanged = true;
+			General.Map.ThingsFilter.Update();
+			return true;
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ErrorChecks/ResultVertexOverlappingLine.cs b/Source/Plugins/BuilderModes/ErrorChecks/ResultVertexOverlappingLine.cs
new file mode 100644
index 0000000..a4ded61
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ErrorChecks/ResultVertexOverlappingLine.cs
@@ -0,0 +1,106 @@
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	public class ResultVertexOverlappingLine : ErrorResult
+	{
+		#region ================== Variables
+
+		private readonly Linedef line;
+		private readonly Vertex vertex;
+
+		#endregion
+
+		#region ================== Properties
+
+		public override int Buttons { get { return 1; } }
+		public override string Button1Text { get { return "Split Linedef"; } }
+		
+		#endregion
+		
+		#region ================== Constructor / Destructor
+		
+		// Constructor
+		public ResultVertexOverlappingLine(Vertex v, Linedef l)
+		{
+			// Initialize
+			line = l;
+			vertex = v;
+			viewobjects.Add(l);
+			viewobjects.Add(v);
+			hidden = (l.IgnoredErrorChecks.Contains(this.GetType()) && v.IgnoredErrorChecks.Contains(this.GetType())); //mxd
+			description = "This vertex overlaps this linedef without splitting it.";
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This sets if this result is displayed in ErrorCheckForm (mxd)
+		internal override void Hide(bool hide) 
+		{
+			hidden = hide;
+			Type t = this.GetType();
+			if(hide) 
+			{
+				vertex.IgnoredErrorChecks.Add(t);
+				line.IgnoredErrorChecks.Add(t);
+			} 
+			else 
+			{
+				if(vertex.IgnoredErrorChecks.Contains(t)) vertex.IgnoredErrorChecks.Remove(t);
+				if(line.IgnoredErrorChecks.Contains(t)) line.IgnoredErrorChecks.Remove(t);
+			}
+		}
+
+		// This must return the string that is displayed in the listbox
+		public override string ToString() 
+		{
+			return "Vertex " + vertex.Index + " overlaps line " + line.Index + " without splitting it";
+		}
+
+		// Rendering
+		public override void PlotSelection(IRenderer2D renderer) 
+		{
+			renderer.PlotLinedef(line, General.Colors.Selection);
+			renderer.PlotVertex(line.Start, ColorCollection.VERTICES);
+			renderer.PlotVertex(line.End, ColorCollection.VERTICES);
+
+			renderer.PlotVertex(vertex, ColorCollection.SELECTION);
+		}
+
+		// Fix by splitting the line
+		public override bool Button1Click(bool batchMode) 
+		{
+			if(!batchMode) General.Map.UndoRedo.CreateUndo("Split Linedef");
+			line.Split(vertex);
+
+			//check that we don't have duplicate lines
+			List<Linedef> lines = new List<Linedef>(vertex.Linedefs);
+
+			for(int i = 0; i < lines.Count - 1; i++) 
+			{
+				for(int c = i + 1; c < lines.Count; c++) 
+				{
+					if( (lines[i].Start == lines[c].Start && lines[i].End == lines[c].End) || 
+						(lines[i].Start == lines[c].End && lines[i].End == lines[c].Start)) 
+					{
+						lines[c].Join(lines[i]);
+					}
+				}
+			}
+
+			General.Map.Map.Update();
+			return true;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/ErrorChecks/ResultVertexOverlappingVertex.cs b/Source/Plugins/BuilderModes/ErrorChecks/ResultVertexOverlappingVertex.cs
new file mode 100644
index 0000000..f360cd1
--- /dev/null
+++ b/Source/Plugins/BuilderModes/ErrorChecks/ResultVertexOverlappingVertex.cs
@@ -0,0 +1,85 @@
+#region ================== Namespaces
+
+using System;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	public class ResultVertexOverlappingVertex : ErrorResult
+	{
+		#region ================== Variables
+
+		private readonly Vertex vertex1;
+		private readonly Vertex vertex2;
+
+		#endregion
+
+		#region ================== Properties
+
+		public override int Buttons { get { return 1; } }
+		public override string Button1Text { get { return "Merge Vertices"; } }
+		
+		#endregion
+		
+		#region ================== Constructor / Destructor
+		
+		// Constructor
+		public ResultVertexOverlappingVertex(Vertex v1, Vertex v2)
+		{
+			// Initialize
+			vertex1 = v1;
+			vertex2 = v2;
+			viewobjects.Add(v1);
+			viewobjects.Add(v2);
+			hidden = (v1.IgnoredErrorChecks.Contains(this.GetType()) && v2.IgnoredErrorChecks.Contains(this.GetType())); //mxd
+			description = "These vertices have the same position.";
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This sets if this result is displayed in ErrorCheckForm (mxd)
+		internal override void Hide(bool hide) 
+		{
+			hidden = hide;
+			Type t = this.GetType();
+			if(hide) 
+			{
+				vertex1.IgnoredErrorChecks.Add(t);
+				vertex2.IgnoredErrorChecks.Add(t);
+			} 
+			else 
+			{
+				if(vertex1.IgnoredErrorChecks.Contains(t)) vertex1.IgnoredErrorChecks.Remove(t);
+				if(vertex2.IgnoredErrorChecks.Contains(t)) vertex2.IgnoredErrorChecks.Remove(t);
+			}
+		}
+
+		// This must return the string that is displayed in the listbox
+		public override string ToString() 
+		{
+			return "Vertices " + vertex1.Index + " and " + vertex2.Index + " have the same position";
+		}
+
+		// Rendering
+		public override void PlotSelection(IRenderer2D renderer) 
+		{
+			renderer.PlotVertex(vertex1, ColorCollection.SELECTION);
+		}
+
+		// Fix by splitting the line
+		public override bool Button1Click(bool batchMode) 
+		{
+			if(!batchMode) General.Map.UndoRedo.CreateUndo("Merge vertices");
+			vertex2.Join(vertex1);
+			General.Map.Map.Update();
+			return true;
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/FindReplace/BaseFindLinedef.cs b/Source/Plugins/BuilderModes/FindReplace/BaseFindLinedef.cs
new file mode 100644
index 0000000..de7b627
--- /dev/null
+++ b/Source/Plugins/BuilderModes/FindReplace/BaseFindLinedef.cs
@@ -0,0 +1,51 @@
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	//mxd. Encapsulates boring stuff
+	internal class BaseFindLinedef : FindReplaceType
+	{
+		#region ================== Methods
+
+		// This is called when a specific object is selected from the list
+		public override void ObjectSelected(FindReplaceObject[] selection) 
+		{
+			if(selection.Length == 1) 
+			{
+				ZoomToSelection(selection);
+				General.Interface.ShowLinedefInfo(selection[0].Linedef);
+			} 
+			else 
+			{
+				General.Interface.HideInfo();
+			}
+
+			General.Map.Map.ClearAllSelected();
+			foreach(FindReplaceObject obj in selection) obj.Linedef.Selected = true;
+		}
+
+		// Render selection
+		public override void PlotSelection(IRenderer2D renderer, FindReplaceObject[] selection) 
+		{
+			foreach(FindReplaceObject o in selection) 
+				renderer.PlotLinedef(o.Linedef, General.Colors.Selection);
+		}
+
+		// Edit objects
+		public override void EditObjects(FindReplaceObject[] selection) 
+		{
+			HashSet<Linedef> linedefs = new HashSet<Linedef>();
+			foreach(FindReplaceObject o in selection)
+				if(!linedefs.Contains(o.Linedef)) linedefs.Add(o.Linedef);
+			General.Interface.ShowEditLinedefs(linedefs);
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/FindReplace/BaseFindSector.cs b/Source/Plugins/BuilderModes/FindReplace/BaseFindSector.cs
new file mode 100644
index 0000000..429da4d
--- /dev/null
+++ b/Source/Plugins/BuilderModes/FindReplace/BaseFindSector.cs
@@ -0,0 +1,64 @@
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	//mxd. Encapsulates boring stuff
+	internal class BaseFindSector : FindReplaceType
+	{
+		#region ================== Methods
+
+		// This is called when a specific object is selected from the list
+		public override void ObjectSelected(FindReplaceObject[] selection) 
+		{
+			if(selection.Length == 1) 
+			{
+				ZoomToSelection(selection);
+				General.Interface.ShowSectorInfo(selection[0].Sector);
+			} 
+			else 
+			{
+				General.Interface.HideInfo();
+			}
+
+			General.Map.Map.ClearAllSelected();
+			foreach(FindReplaceObject obj in selection) obj.Sector.Selected = true;
+		}
+
+		// Render selection
+		public override void PlotSelection(IRenderer2D renderer, FindReplaceObject[] selection) 
+		{
+			foreach(FindReplaceObject o in selection) 
+			{
+				foreach(Sidedef sd in o.Sector.Sidedefs)
+					renderer.PlotLinedef(sd.Line, General.Colors.Selection);
+			}
+		}
+
+		//mxd. Render selection highlight
+		public override void RenderOverlaySelection(IRenderer2D renderer, FindReplaceObject[] selection) 
+		{
+			if(!BuilderPlug.Me.UseHighlight) return;
+
+			int color = General.Colors.Selection.WithAlpha(64).ToInt();
+			foreach(FindReplaceObject o in selection)
+				renderer.RenderHighlight(o.Sector.FlatVertices, color);
+		}
+
+		// Edit objects
+		public override void EditObjects(FindReplaceObject[] selection) 
+		{
+			HashSet<Sector> sectors = new HashSet<Sector>();
+			foreach(FindReplaceObject o in selection) 
+				if(!sectors.Contains(o.Sector)) sectors.Add(o.Sector);
+			General.Interface.ShowEditSectors(sectors);
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/FindReplace/BaseFindSidedef.cs b/Source/Plugins/BuilderModes/FindReplace/BaseFindSidedef.cs
new file mode 100644
index 0000000..bdcc6cf
--- /dev/null
+++ b/Source/Plugins/BuilderModes/FindReplace/BaseFindSidedef.cs
@@ -0,0 +1,51 @@
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	//mxd. Encapsulates boring stuff
+	internal class BaseFindSidedef : FindReplaceType
+	{
+		#region ================== Methods
+
+		// This is called when a specific object is selected from the list
+		public override void ObjectSelected(FindReplaceObject[] selection) 
+		{
+			if(selection.Length == 1)
+			{
+				ZoomToSelection(selection);
+				General.Interface.ShowLinedefInfo(selection[0].Sidedef.Line);
+			}
+			else
+			{
+				General.Interface.HideInfo();
+			}
+
+			General.Map.Map.ClearAllSelected();
+			foreach(FindReplaceObject obj in selection) obj.Sidedef.Line.Selected = true;
+		}
+
+		// Render selection
+		public override void PlotSelection(IRenderer2D renderer, FindReplaceObject[] selection) 
+		{
+			foreach(FindReplaceObject o in selection)
+				renderer.PlotLinedef(o.Sidedef.Line, General.Colors.Selection);
+		}
+
+		// Edit objects
+		public override void EditObjects(FindReplaceObject[] selection) 
+		{
+			HashSet<Linedef> linedefs = new HashSet<Linedef>();
+			foreach(FindReplaceObject o in selection)
+				if(!linedefs.Contains(o.Sidedef.Line)) linedefs.Add(o.Sidedef.Line);
+			General.Interface.ShowEditLinedefs(linedefs);
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/FindReplace/BaseFindThing.cs b/Source/Plugins/BuilderModes/FindReplace/BaseFindThing.cs
new file mode 100644
index 0000000..18eebf2
--- /dev/null
+++ b/Source/Plugins/BuilderModes/FindReplace/BaseFindThing.cs
@@ -0,0 +1,51 @@
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	//mxd. Encapsulates boring stuff
+	internal class BaseFindThing : FindReplaceType
+	{
+		#region ================== Methods
+
+		// This is called when a specific object is selected from the list
+		public override void ObjectSelected(FindReplaceObject[] selection) 
+		{
+			if(selection.Length == 1) 
+			{
+				ZoomToSelection(selection);
+				General.Interface.ShowThingInfo(selection[0].Thing);
+			} 
+			else 
+			{
+				General.Interface.HideInfo();
+			}
+
+			General.Map.Map.ClearAllSelected();
+			foreach(FindReplaceObject obj in selection) obj.Thing.Selected = true;
+		}
+
+		// Render selection
+		public override void RenderThingsSelection(IRenderer2D renderer, FindReplaceObject[] selection) 
+		{
+			foreach(FindReplaceObject o in selection)
+				renderer.RenderThing(o.Thing, General.Colors.Selection, Presentation.THINGS_ALPHA);
+		}
+
+		// Edit objects
+		public override void EditObjects(FindReplaceObject[] selection) 
+		{
+			HashSet<Thing> things = new HashSet<Thing>();
+			foreach(FindReplaceObject o in selection) 
+				if(!things.Contains(o.Thing)) things.Add(o.Thing);
+			General.Interface.ShowEditThings(things);
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/FindReplace/FindAnyTextureFlat.cs b/Source/Plugins/BuilderModes/FindReplace/FindAnyTextureFlat.cs
new file mode 100644
index 0000000..49c5201
--- /dev/null
+++ b/Source/Plugins/BuilderModes/FindReplace/FindAnyTextureFlat.cs
@@ -0,0 +1,219 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using System.Drawing;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[FindReplace("Any Texture or Flat", BrowseButton = true)]
+	internal class FindAnyTextureFlat : FindReplaceType
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		#endregion
+
+		#region ================== Properties
+		
+		public override Image BrowseImage { get { return Properties.Resources.List_Images; } }
+		
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		#endregion
+
+		#region ================== Methods
+
+		//mxd. 
+		public override bool CanReplace()
+		{
+			return General.Map.Config.MixTexturesFlats;
+		}
+
+		// This is called when the browse button is pressed
+		public override string Browse(string initialvalue)
+		{
+			return General.Interface.BrowseTexture(BuilderPlug.Me.FindReplaceForm, initialvalue);
+		}
+
+
+		// This is called to perform a search (and replace)
+		// Returns a list of items to show in the results list
+		// replacewith is null when not replacing
+		public override FindReplaceObject[] Find(string value, bool withinselection, bool replace, string replacewith, bool keepselection)
+		{
+			List<FindReplaceObject> objs = new List<FindReplaceObject>();
+
+			// Interpret the replacement
+			if(replace && (string.IsNullOrEmpty(replacewith) || replacewith.Length > General.Map.Config.MaxTextureNameLength))
+			{
+				MessageBox.Show("Invalid replace value for this search type!", "Find and Replace", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				return objs.ToArray();
+			}
+
+			// Interpret the find
+			bool isregex = (value.IndexOf('*') != -1 || value.IndexOf('?') != -1); //mxd
+			MatchingTextureSet set = new MatchingTextureSet(new Collection<string> { value.Trim() }); //mxd
+			
+			// Where to search?
+			ICollection<Sector> seclist = withinselection ? General.Map.Map.GetSelectedSectors(true) : General.Map.Map.Sectors;
+			ICollection<Sidedef> sidelist = withinselection ? General.Map.Map.GetSidedefsFromSelectedLinedefs(true) : General.Map.Map.Sidedefs;
+			
+			// Go for all sectors
+			foreach(Sector s in seclist)
+			{
+				// Flat matches?
+				if(set.IsMatch(s.CeilTexture))
+				{
+					// Replace and add to list
+					if(replace) s.SetCeilTexture(replacewith);
+					objs.Add(new FindReplaceObject(s, "Sector " + s.Index + " (ceiling)" + (isregex ? " - " + s.CeilTexture : null)));
+				}
+
+				if(set.IsMatch(s.FloorTexture))
+				{
+					// Replace and add to list
+					if(replace) s.SetFloorTexture(replacewith);
+					objs.Add(new FindReplaceObject(s, "Sector " + s.Index + " (floor)" + (isregex ? " - " + s.FloorTexture : null)));
+				}
+			}
+			
+			// Go for all sidedefs
+			foreach(Sidedef sd in sidelist)
+			{
+				string side = sd.IsFront ? "front" : "back";
+				
+				if(set.IsMatch(sd.HighTexture) && (value != "-" || sd.HighRequired()))
+				{
+					// Replace and add to list
+					if(replace) sd.SetTextureHigh(replacewith);
+					objs.Add(new FindReplaceObject(sd, "Sidedef " + sd.Index + " (" + side + ", high)" + (isregex ? " - " + sd.HighTexture : null)));
+				}
+				
+				if(set.IsMatch(sd.MiddleTexture) && (value != "-" || sd.MiddleRequired()))
+				{
+					// Replace and add to list
+					if(replace) sd.SetTextureMid(replacewith);
+					objs.Add(new FindReplaceObject(sd, "Sidedef " + sd.Index + " (" + side + ", middle)" + (isregex ? " - " + sd.MiddleTexture : null)));
+				}
+				
+				if(set.IsMatch(sd.LowTexture) && (value != "-" || sd.LowRequired()))
+				{
+					// Replace and add to list
+					if(replace) sd.SetTextureLow(replacewith);
+					objs.Add(new FindReplaceObject(sd, "Sidedef " + sd.Index + " (" + side + ", low)" + (isregex ? " - " + sd.LowTexture : null)));
+				}
+			}
+			
+			// When replacing, make sure we keep track of used textures
+			if(replace)
+			{
+				General.Map.Data.UpdateUsedTextures();
+				General.Map.Map.Update(); //mxd. And don't forget to update the view itself
+				General.Map.IsChanged = true;
+			}
+
+			return objs.ToArray();
+		}
+
+		// This is called when a specific object is selected from the list
+		public override void ObjectSelected(FindReplaceObject[] selection)
+		{
+			if(selection.Length == 1)
+			{
+				ZoomToSelection(selection);
+				if(selection[0].Object is Sector)
+					General.Interface.ShowSectorInfo(selection[0].Sector);
+				else if(selection[0].Object is Sidedef)
+					General.Interface.ShowLinedefInfo(selection[0].Sidedef.Line);
+			}
+			else
+				General.Interface.HideInfo();
+			
+			General.Map.Map.ClearAllSelected();
+			foreach(FindReplaceObject obj in selection)
+			{
+				if(obj.Object is Sector)
+					obj.Sector.Selected = true;
+				else if(obj.Object is Sidedef)
+					obj.Sidedef.Line.Selected = true;
+			}
+		}
+
+		// Render selection
+		public override void PlotSelection(IRenderer2D renderer, FindReplaceObject[] selection)
+		{
+			foreach(FindReplaceObject o in selection)
+			{
+				if(o.Object is Sector)
+				{
+					foreach(Sidedef sd in o.Sector.Sidedefs)
+					{
+						renderer.PlotLinedef(sd.Line, General.Colors.Selection);
+					}
+				}
+				else if(o.Object is Sidedef)
+				{
+					renderer.PlotLinedef(o.Sidedef.Line, General.Colors.Selection);
+				}
+			}
+		}
+
+		//mxd
+		public override void RenderOverlaySelection(IRenderer2D renderer, FindReplaceObject[] selection) 
+		{
+			if(!BuilderPlug.Me.UseHighlight) return;
+
+			int color = General.Colors.Selection.WithAlpha(64).ToInt();
+			foreach(FindReplaceObject o in selection) 
+			{
+				if(o.Object is Sector) renderer.RenderHighlight(o.Sector.FlatVertices, color);
+			}
+		}
+
+		// Edit objects
+		public override void EditObjects(FindReplaceObject[] selection)
+		{
+			List<Sector> sectors = new List<Sector>(selection.Length);
+			List<Linedef> lines = new List<Linedef>(selection.Length);
+			foreach(FindReplaceObject o in selection)
+			{
+				if(o.Object is Sector)
+					sectors.Add(o.Sector);
+				else
+					lines.Add(o.Sidedef.Line);
+			}
+			if(sectors.Count > 0) General.Interface.ShowEditSectors(sectors);
+			if(lines.Count > 0) General.Interface.ShowEditLinedefs(lines);
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/FindReplace/FindLinedefFlags.cs b/Source/Plugins/BuilderModes/FindReplace/FindLinedefFlags.cs
new file mode 100644
index 0000000..ecaad6e
--- /dev/null
+++ b/Source/Plugins/BuilderModes/FindReplace/FindLinedefFlags.cs
@@ -0,0 +1,143 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Windows;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[FindReplace("Linedef Flags", BrowseButton = true)]
+	internal class FindLinedefFlags : BaseFindLinedef
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		#endregion
+
+		#region ================== Properties
+
+		public override Image BrowseImage { get { return Properties.Resources.List; } }
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		#endregion
+
+		#region ================== Methods
+
+		// This is called when the browse button is pressed
+		public override string Browse(string initialvalue)
+		{
+			return FlagsForm.ShowDialog(Form.ActiveForm, initialvalue, General.Map.Config.LinedefFlags);
+		}
+
+		// This is called to perform a search (and replace)
+		// Returns a list of items to show in the results list
+		// replacewith is null when not replacing
+		public override FindReplaceObject[] Find(string value, bool withinselection, bool replace, string replacewith, bool keepselection)
+		{
+			List<FindReplaceObject> objs = new List<FindReplaceObject>();
+
+			// Where to search?
+			ICollection<Linedef> list = withinselection ? General.Map.Map.GetSelectedLinedefs(true) : General.Map.Map.Linedefs;
+
+			// Find what? (mxd)
+			List<string> findflagslist = new List<string>();
+			foreach(string flag in value.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries)) 
+			{
+				string f = flag.Trim();
+				if(General.Map.Config.LinedefFlags.ContainsKey(f)) findflagslist.Add(f);
+			}
+			if(findflagslist.Count == 0) 
+			{
+				MessageBox.Show("Invalid value for this search type!", "Find and Replace", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				return objs.ToArray();
+			}
+
+			// Replace with what? (mxd)
+			List<string> replaceflagslist = new List<string>();
+			if(replace) 
+			{
+				string[] replaceflags = replacewith.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+				foreach(string flag in replaceflags) 
+				{
+					string f = flag.Trim();
+					if(!General.Map.Config.LinedefFlags.ContainsKey(f))
+					{
+						MessageBox.Show("Invalid replace value '" + f + "' for this search type!", "Find and Replace", MessageBoxButtons.OK, MessageBoxIcon.Error);
+						return objs.ToArray();
+					}
+					replaceflagslist.Add(f);
+				}
+			}
+
+			// Go for all linedefs
+			foreach(Linedef l in list)
+			{
+				bool match = true;
+
+				// Parse the value string...
+				foreach(string flag in findflagslist)
+				{
+					// ... and check if the flags don't match
+					if(!l.IsFlagSet(flag))
+					{
+						match = false;
+						break;
+					}
+				}
+
+				// Flags matches?
+				if(match)
+				{
+					// Replace flags (mxd)
+					if(replace) 
+					{
+						// Clear all flags
+						l.ClearFlags();
+
+						// Set new flags
+						foreach(string flag in replaceflagslist) l.SetFlag(flag, true);
+					}
+					
+					// Add to list
+					LinedefActionInfo info = General.Map.Config.GetLinedefActionInfo(l.Action);
+					if(!info.IsNull)
+						objs.Add(new FindReplaceObject(l, "Linedef " + l.Index + " (" + info.Title + ")"));
+					else
+						objs.Add(new FindReplaceObject(l, "Linedef " + l.Index));
+				}
+			}
+
+			return objs.ToArray();
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/FindReplace/FindLinedefNumber.cs b/Source/Plugins/BuilderModes/FindReplace/FindLinedefNumber.cs
new file mode 100644
index 0000000..2a04eab
--- /dev/null
+++ b/Source/Plugins/BuilderModes/FindReplace/FindLinedefNumber.cs
@@ -0,0 +1,81 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Config;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[FindReplace("Linedef Index", BrowseButton = false)]
+	internal class FindLinedefNumber : BaseFindLinedef
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		#endregion
+
+		#region ================== Properties
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		#endregion
+
+		#region ================== Methods
+
+		//mxd
+		public override bool CanReplace() 
+		{
+			return false;
+		}
+
+		// This is called to perform a search (and replace)
+		// Returns a list of items to show in the results list
+		// replacewith is null when not replacing
+		public override FindReplaceObject[] Find(string value, bool withinselection, bool replace, string replacewith, bool keepselection)
+		{
+			List<FindReplaceObject> objs = new List<FindReplaceObject>();
+
+			// Interpret the number given
+			int index;
+			if(int.TryParse(value, out index))
+			{
+				Linedef l = General.Map.Map.GetLinedefByIndex(index);
+				if(l != null)
+				{
+					LinedefActionInfo info = General.Map.Config.GetLinedefActionInfo(l.Action);
+					if(!info.IsNull)
+						objs.Add(new FindReplaceObject(l, "Linedef " + index + " (" + info.Title + ")"));
+					else
+						objs.Add(new FindReplaceObject(l, "Linedef " + index));
+				}
+			}
+			
+			return objs.ToArray();
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/FindReplace/FindLinedefSectorRef.cs b/Source/Plugins/BuilderModes/FindReplace/FindLinedefSectorRef.cs
new file mode 100644
index 0000000..98a0824
--- /dev/null
+++ b/Source/Plugins/BuilderModes/FindReplace/FindLinedefSectorRef.cs
@@ -0,0 +1,125 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Types;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[FindReplace("Linedef Sector Reference", BrowseButton = false)]
+	internal class FindLinedefSectorRef : BaseFindLinedef
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		#endregion
+
+		#region ================== Properties
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		#endregion
+
+		#region ================== Methods
+
+		// This is called to test if the item should be displayed
+		public override bool DetermineVisiblity()
+		{
+			return General.Map.FormatInterface.HasActionArgs;
+		}
+
+		// This is called to perform a search (and replace)
+		// Returns a list of items to show in the results list
+		// replacewith is null when not replacing
+		public override FindReplaceObject[] Find(string value, bool withinselection, bool replace, string replacewith, bool keepselection)
+		{
+			List<FindReplaceObject> objs = new List<FindReplaceObject>();
+
+			// Interpret the replacement
+			int replacetag = 0;
+			if(replace)
+			{
+				// If it cannot be interpreted, set replacewith to null (not replacing at all)
+				if(!int.TryParse(replacewith, out replacetag)) replacewith = null;
+				if(replacetag < 0) replacewith = null;
+				if(replacetag > 255) replacewith = null;
+				if(replacewith == null)
+				{
+					MessageBox.Show("Invalid replace value for this search type!", "Find and Replace", MessageBoxButtons.OK, MessageBoxIcon.Error);
+					return objs.ToArray();
+				}
+			}
+
+			// Interpret the number given
+			int tag;
+			if(int.TryParse(value, out tag))
+			{
+				// Where to search?
+				ICollection<Linedef> list = withinselection ? General.Map.Map.GetSelectedLinedefs(true) : General.Map.Map.Linedefs;
+				
+				// Go for all linedefs
+				foreach(Linedef l in list)
+				{
+					bool addline = false;
+
+					LinedefActionInfo info = General.Map.Config.GetLinedefActionInfo(l.Action);
+					if(info.IsKnown && !info.IsNull)
+					{
+						// Go for all args
+						for(int i = 0; i < Linedef.NUM_ARGS; i++)
+						{
+							// Argument type matches?
+							if(info.Args[i].Used && (info.Args[i].Type == (int)UniversalType.SectorTag))
+							{
+								if(l.Args[i] == tag)
+								{
+									// Replace
+									if(replace) l.Args[i] = replacetag;
+									addline = true;
+								}
+							}
+						}
+					}
+					
+					if(addline)
+					{
+						// Add to list
+						if(!info.IsNull)
+							objs.Add(new FindReplaceObject(l, "Linedef " + l.Index + " (" + info.Title + ")"));
+						else
+							objs.Add(new FindReplaceObject(l, "Linedef " + l.Index));
+					}
+				}
+			}
+
+			return objs.ToArray();
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/FindReplace/FindLinedefTags.cs b/Source/Plugins/BuilderModes/FindReplace/FindLinedefTags.cs
new file mode 100644
index 0000000..86cb459
--- /dev/null
+++ b/Source/Plugins/BuilderModes/FindReplace/FindLinedefTags.cs
@@ -0,0 +1,114 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Config;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[FindReplace("Linedef Tag", BrowseButton = false)]
+	internal class FindLinedefTags : BaseFindLinedef
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		#endregion
+
+		#region ================== Properties
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		#endregion
+
+		#region ================== Methods
+
+		// This is called to test if the item should be displayed
+		public override bool DetermineVisiblity()
+		{
+			return General.Map.FormatInterface.HasLinedefTag;
+		}
+
+		// This is called to perform a search (and replace)
+		// Returns a list of items to show in the results list
+		// replacewith is null when not replacing
+		public override FindReplaceObject[] Find(string value, bool withinselection, bool replace, string replacewith, bool keepselection)
+		{
+			List<FindReplaceObject> objs = new List<FindReplaceObject>();
+
+			// Interpret the replacement
+			int replacetag = 0;
+			if(replace)
+			{
+				// If it cannot be interpreted, set replacewith to null (not replacing at all)
+				if(!int.TryParse(replacewith, out replacetag)) replacewith = null;
+				if(replacetag < General.Map.FormatInterface.MinTag) replacewith = null;
+				if(replacetag > General.Map.FormatInterface.MaxTag) replacewith = null;
+				if(replacewith == null)
+				{
+					MessageBox.Show("Invalid replace value for this search type!", "Find and Replace", MessageBoxButtons.OK, MessageBoxIcon.Error);
+					return objs.ToArray();
+				}
+			}
+
+			// Interpret the number given
+			int tag;
+			if(int.TryParse(value, out tag))
+			{
+				// Where to search?
+				ICollection<Linedef> list = withinselection ? General.Map.Map.GetSelectedLinedefs(true) : General.Map.Map.Linedefs;
+
+				// Go for all linedefs
+				foreach(Linedef l in list)
+				{
+					// Tag matches?
+					int index = l.Tags.IndexOf(tag);
+					if(index != -1)
+					{
+						// Replace
+						if(replace)
+						{
+							l.Tags[index] = replacetag; //mxd
+							l.Tags = l.Tags.Distinct().ToList(); //mxd. We don't want duplicates
+						}
+
+						// Add to list
+						LinedefActionInfo info = General.Map.Config.GetLinedefActionInfo(l.Action);
+						if(!info.IsNull)
+							objs.Add(new FindReplaceObject(l, "Linedef " + l.Index + " (" + info.Title + ")"));
+						else
+							objs.Add(new FindReplaceObject(l, "Linedef " + l.Index));
+					}
+				}
+			}
+
+			return objs.ToArray();
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/FindReplace/FindLinedefThingRef.cs b/Source/Plugins/BuilderModes/FindReplace/FindLinedefThingRef.cs
new file mode 100644
index 0000000..6df652b
--- /dev/null
+++ b/Source/Plugins/BuilderModes/FindReplace/FindLinedefThingRef.cs
@@ -0,0 +1,125 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Types;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[FindReplace("Linedef Thing Reference", BrowseButton = false)]
+	internal class FindLinedefThingRef : BaseFindLinedef
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		#endregion
+
+		#region ================== Properties
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		#endregion
+
+		#region ================== Methods
+
+		// This is called to test if the item should be displayed
+		public override bool DetermineVisiblity()
+		{
+			return General.Map.FormatInterface.HasActionArgs;
+		}
+
+		// This is called to perform a search (and replace)
+		// Returns a list of items to show in the results list
+		// replacewith is null when not replacing
+		public override FindReplaceObject[] Find(string value, bool withinselection, bool replace, string replacewith, bool keepselection)
+		{
+			List<FindReplaceObject> objs = new List<FindReplaceObject>();
+
+			// Interpret the replacement
+			int replacetag = 0;
+			if(replace)
+			{
+				// If it cannot be interpreted, set replacewith to null (not replacing at all)
+				if(!int.TryParse(replacewith, out replacetag)) replacewith = null;
+				if(replacetag < 0) replacewith = null;
+				if(replacetag > 255) replacewith = null;
+				if(replacewith == null)
+				{
+					MessageBox.Show("Invalid replace value for this search type!", "Find and Replace", MessageBoxButtons.OK, MessageBoxIcon.Error);
+					return objs.ToArray();
+				}
+			}
+
+			// Interpret the number given
+			int tag;
+			if(int.TryParse(value, out tag))
+			{
+				// Where to search?
+				ICollection<Linedef> list = withinselection ? General.Map.Map.GetSelectedLinedefs(true) : General.Map.Map.Linedefs;
+
+				// Go for all linedefs
+				foreach(Linedef l in list)
+				{
+					bool addline = false;
+
+					LinedefActionInfo info = General.Map.Config.GetLinedefActionInfo(l.Action);
+					if(info.IsKnown && !info.IsNull)
+					{
+						// Go for all args
+						for(int i = 0; i < Linedef.NUM_ARGS; i++)
+						{
+							// Argument type matches?
+							if(info.Args[i].Used && (info.Args[i].Type == (int)UniversalType.ThingTag))
+							{
+								if(l.Args[i] == tag)
+								{
+									// Replace
+									if(replace) l.Args[i] = replacetag;
+									addline = true;
+								}
+							}
+						}
+					}
+
+					if(addline)
+					{
+						// Add to list
+						if(!info.IsNull)
+							objs.Add(new FindReplaceObject(l, "Linedef " + l.Index + " (" + info.Title + ")"));
+						else
+							objs.Add(new FindReplaceObject(l, "Linedef " + l.Index));
+					}
+				}
+			}
+
+			return objs.ToArray();
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/FindReplace/FindLinedefTypes.cs b/Source/Plugins/BuilderModes/FindReplace/FindLinedefTypes.cs
new file mode 100644
index 0000000..52fcca5
--- /dev/null
+++ b/Source/Plugins/BuilderModes/FindReplace/FindLinedefTypes.cs
@@ -0,0 +1,298 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.GZBuilder;
+using CodeImp.DoomBuilder.Map;
+using System.Drawing;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Types;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[FindReplace("Linedef Action and Arguments", BrowseButton = true)]
+	internal class FindLinedefTypes : BaseFindLinedef
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		private List<int> generalizedbits;
+
+		#endregion
+
+		#region ================== Properties
+
+		public override Image BrowseImage { get { return Properties.Resources.List; } }
+		
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		//mxd
+		public FindLinedefTypes() 
+		{
+			if(!General.Map.Config.GeneralizedActions) return;
+
+			// Get all them generalized bits
+			generalizedbits = new List<int>();
+			foreach(GeneralizedCategory cat in General.Map.Config.GenActionCategories) 
+			{
+				foreach(GeneralizedOption option in cat.Options) 
+				{
+					foreach(GeneralizedBit bit in option.Bits) 
+					{
+						if(bit.Index > 0) generalizedbits.Add(bit.Index);
+					}
+				}
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This is called when the browse button is pressed
+		public override string Browse(string initialvalue)
+		{
+			int num;
+			int.TryParse(initialvalue, out num);
+			return General.Interface.BrowseLinedefActions(BuilderPlug.Me.FindReplaceForm, num).ToString();
+		}
+
+
+		// This is called to perform a search (and replace)
+		// Returns a list of items to show in the results list
+		// replacewith is null when not replacing
+		public override FindReplaceObject[] Find(string value, bool withinselection, bool replace, string replacewith, bool keepselection)
+		{
+			List<FindReplaceObject> objs = new List<FindReplaceObject>();
+
+			// Interpret the replacement
+			int replaceaction = 0;
+			string replacearg0str = string.Empty; //mxd
+			int[] replaceargs = null; //mxd
+			if(replace)
+			{
+				string[] replaceparts = replacewith.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
+				
+				// If it cannot be interpreted, set replacewith to null (not replacing at all)
+				if(replaceparts.Length == 0) replacewith = null; //mxd
+				if(!int.TryParse(replaceparts[0], out replaceaction)) replacewith = null;
+				if(replaceaction < 0) replacewith = null;
+				if(replaceaction > Int16.MaxValue) replacewith = null;
+				if(replacewith == null)
+				{
+					MessageBox.Show("Invalid replace value for this search type!", "Find and Replace", MessageBoxButtons.OK, MessageBoxIcon.Error);
+					return objs.ToArray();
+				}
+
+				//mxd. Now try parsing the args
+				if(replaceparts.Length > 1)
+				{
+					replaceargs = new[] { int.MinValue, int.MinValue, int.MinValue, int.MinValue, int.MinValue };
+					int i = 1;
+
+					//mxd. Named script search support...
+					if(General.Map.UDMF && Array.IndexOf(GZGeneral.ACS_SPECIALS, replaceaction) != -1) 
+					{
+						string possiblescriptname = replaceparts[1].Trim().Replace("\"", "").ToLowerInvariant();
+						int tmp;
+						if(!string.IsNullOrEmpty(possiblescriptname) && possiblescriptname != "*" && !int.TryParse(possiblescriptname, out tmp)) 
+						{
+							replacearg0str = possiblescriptname;
+							i = 2;
+						}
+					}
+
+					for(; i < replaceparts.Length && i < replaceargs.Length + 1; i++) 
+					{
+						int argout;
+						if(replaceparts[i].Trim() == "*") continue; //mxd. Any arg value support
+						if(int.TryParse(replaceparts[i].Trim(), out argout)) replaceargs[i - 1] = argout;
+					}
+				}
+			}
+
+			// Interpret the number given
+			int action;
+			string[] parts = value.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
+
+			//For the search, the user may make the following queries:
+			//	action arg0 arg1 arg2 arg3 arg4
+			//	action arg0str arg1 arg2 arg3 arg4
+			//
+			//this allows users to search for lines that contain actions with specific arguments.
+			//useful for locating script lines
+
+			if(int.TryParse(parts[0], out action))
+			{
+				int[] args = null;
+				string arg0str = string.Empty; //mxd
+
+				//parse the arg values out
+				if(parts.Length > 1) 
+				{
+					args = new[] { int.MinValue, int.MinValue, int.MinValue, int.MinValue, int.MinValue };
+					int i = 1;
+
+					//mxd. Named script search support...
+					if(General.Map.UDMF && Array.IndexOf(GZGeneral.ACS_SPECIALS, action) != -1)
+					{
+						string possiblescriptname = parts[1].Trim().Replace("\"", "").ToLowerInvariant();
+						int tmp;
+						if(!string.IsNullOrEmpty(possiblescriptname) && possiblescriptname != "*" && !int.TryParse(possiblescriptname, out tmp))
+						{
+							arg0str = possiblescriptname;
+							i = 2;
+						}
+					}
+
+					for(; i < parts.Length && i < args.Length + 1; i++)
+					{
+						int argout;
+						if(parts[i].Trim() == "*") continue; //mxd. Any arg value support
+						if(int.TryParse(parts[i].Trim(), out argout)) args[i - 1] = argout;
+					}
+				}
+
+				//mxd
+				List<int> expectedbits = GetGeneralizedBits(action);
+
+				// Where to search?
+				ICollection<Linedef> list = withinselection ? General.Map.Map.GetSelectedLinedefs(true) : General.Map.Map.Linedefs;
+
+				// Go for all linedefs
+				foreach(Linedef l in list)
+				{
+					// Action matches?
+					if(l.Action != action && !BitsMatch(l.Action, expectedbits)) continue;
+
+					bool match = true;
+					string argtext = "";
+
+					//if args were specified, then process them
+					if(args != null) 
+					{
+						int x = 0;
+						argtext = " args: (";
+
+						//mxd. Check script name...
+						if(!string.IsNullOrEmpty(arg0str))
+						{
+							string s = l.Fields.GetValue("arg0str", string.Empty);
+							if(s.ToLowerInvariant() != arg0str)
+								match = false;
+							else
+								argtext += "\"" + s + "\"";
+
+							x = 1;
+						}
+
+						for(; x < args.Length; x++)
+						{
+							if(args[x] != int.MinValue && args[x] != l.Args[x]) 
+							{
+								match = false;
+								break;
+							}
+							argtext += (x == 0 ? "" : ",") + l.Args[x];
+						}
+						argtext += ")";
+					}
+
+					if(match) 
+					{
+						// Replace
+						if(replace)
+						{
+							l.Action = replaceaction;
+
+							//mxd. Replace args as well?
+							if(replaceargs != null)
+							{
+								int i = 0;
+								if(!string.IsNullOrEmpty(replacearg0str))
+								{
+									l.Fields["arg0str"] = new UniValue(UniversalType.String, replacearg0str);
+									i = 1;
+								}
+
+								for(; i < replaceargs.Length; i++)
+								{
+									if(replaceargs[i] != int.MinValue) l.Args[i] = replaceargs[i];
+								}
+							}
+						}
+
+						// Add to list
+						LinedefActionInfo info = General.Map.Config.GetLinedefActionInfo(l.Action);
+						if(!info.IsNull)
+							objs.Add(new FindReplaceObject(l, "Linedef " + l.Index + " (" + info.Title + ")" + argtext));
+						else
+							objs.Add(new FindReplaceObject(l, "Linedef " + l.Index + argtext));
+					}
+				}
+			}
+
+			return objs.ToArray();
+		}
+
+		//mxd
+		private static List<int> GetGeneralizedBits(int effect) 
+		{
+			if(!General.Map.Config.GeneralizedActions) return new List<int>();
+			List<int> bits = new List<int>();
+
+			foreach(GeneralizedCategory cat in General.Map.Config.GenActionCategories) 
+			{
+				foreach(GeneralizedOption option in cat.Options) 
+				{
+					foreach(GeneralizedBit bit in option.Bits) 
+					{
+						if(bit.Index > 0 && (effect & bit.Index) == bit.Index)
+							bits.Add(bit.Index);
+					}
+				}
+			}
+
+			return bits;
+		}
+
+		//mxd
+		private static bool BitsMatch(int action, List<int> expectedbits) 
+		{
+			if(!General.Map.Config.GeneralizedActions) return false;
+
+			foreach(int bit in expectedbits) 
+			{
+				if((action & bit) != bit) return false;
+			}
+
+			return true;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/FindReplace/FindReplaceAttribute.cs b/Source/Plugins/BuilderModes/FindReplace/FindReplaceAttribute.cs
new file mode 100644
index 0000000..69b3e8b
--- /dev/null
+++ b/Source/Plugins/BuilderModes/FindReplace/FindReplaceAttribute.cs
@@ -0,0 +1,63 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[AttributeUsage(AttributeTargets.Class, Inherited = true, AllowMultiple = false)]
+	internal class FindReplaceAttribute : Attribute
+	{
+		#region ================== Variables
+
+		private string displayname;
+		private bool browsebutton;
+
+		#endregion
+
+		#region ================== Properties
+
+		public string DisplayName { get { return displayname; } set { displayname = value; } }
+		public bool BrowseButton { get { return browsebutton; } set { browsebutton = value; } }
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		// Constructor
+		public FindReplaceAttribute(string displayname)
+		{
+			// Initialize
+			this.displayname = displayname;
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// String representation
+		public override string ToString()
+		{
+			return displayname;
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/FindReplace/FindReplaceObject.cs b/Source/Plugins/BuilderModes/FindReplace/FindReplaceObject.cs
new file mode 100644
index 0000000..5a363d5
--- /dev/null
+++ b/Source/Plugins/BuilderModes/FindReplace/FindReplaceObject.cs
@@ -0,0 +1,108 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Geometry;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	internal class FindReplaceObject
+	{
+		#region ================== Variables
+
+		private object obj;
+		private string title;
+
+		#endregion
+
+		#region ================== Properties
+
+		public object Object { get { return obj; } set { obj = value; } }
+		public Sector Sector { get { return (Sector)obj; } }
+		public Linedef Linedef { get { return (Linedef)obj; } }
+		public Sidedef Sidedef { get { return (Sidedef)obj; } }
+		public Thing Thing { get { return (Thing)obj; } }
+		public Vertex Vertex { get { return (Vertex)obj; } }
+		public string Title { get { return title; } set { title = value; } }
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		// Constructor
+		public FindReplaceObject(object obj, string title)
+		{
+			// Initialize
+			this.obj = obj;
+			this.title = title;
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// String representation
+		public override string ToString()
+		{
+			return title;
+		}
+		
+		// This adds the vertices of the object used for view area calculation
+		public void AddViewPoints(IList<Vector2D> points)
+		{
+			if(obj is Vertex)
+			{
+				points.Add((obj as Vertex).Position);
+			}
+			else if(obj is Linedef)
+			{
+				points.Add((obj as Linedef).Start.Position);
+				points.Add((obj as Linedef).End.Position);
+			}
+			else if(obj is Sidedef)
+			{
+				points.Add((obj as Sidedef).Line.Start.Position);
+				points.Add((obj as Sidedef).Line.End.Position);
+			}
+			else if(obj is Sector)
+			{
+				Sector s = (obj as Sector);
+				foreach(Sidedef sd in s.Sidedefs)
+				{
+					points.Add(sd.Line.Start.Position);
+					points.Add(sd.Line.End.Position);
+				}
+			}
+			else if(obj is Thing)
+			{
+				Thing t = (obj as Thing);
+				Vector2D p = t.Position;
+				points.Add(p);
+				points.Add(p + new Vector2D(t.Size * 2.0f, t.Size * 2.0f));
+				points.Add(p + new Vector2D(t.Size * 2.0f, -t.Size * 2.0f));
+				points.Add(p + new Vector2D(-t.Size * 2.0f, t.Size * 2.0f));
+				points.Add(p + new Vector2D(-t.Size * 2.0f, -t.Size * 2.0f));
+			}
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/FindReplace/FindReplaceType.cs b/Source/Plugins/BuilderModes/FindReplace/FindReplaceType.cs
new file mode 100644
index 0000000..b1922e4
--- /dev/null
+++ b/Source/Plugins/BuilderModes/FindReplace/FindReplaceType.cs
@@ -0,0 +1,163 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Geometry;
+using System.Drawing;
+using CodeImp.DoomBuilder.Editing;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	internal class FindReplaceType
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		protected readonly FindReplaceAttribute attribs;
+		
+		#endregion
+
+		#region ================== Properties
+
+		public FindReplaceAttribute Attributes { get { return attribs; } }
+		public virtual Image BrowseImage { get { return null; } }
+		public bool AllowDelete { get { return false; } }
+		public virtual Presentation RenderPresentation { get { return Presentation.Standard; } }
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		// Constructor
+		public FindReplaceType()
+		{
+			// Initialize
+			object[] attrs = this.GetType().GetCustomAttributes(typeof(FindReplaceAttribute), true);
+			attribs = (FindReplaceAttribute)attrs[0];
+		}
+
+		#endregion
+
+		#region ================== Methods
+		
+		// This is called to test if the item should be displayed
+		public virtual bool DetermineVisiblity()
+		{
+			return true;
+		}
+
+		// This is called to test if replacing is supported (mxd)
+		public virtual bool CanReplace() 
+		{
+			return true;
+		}
+		
+		// This is called when the browse button is pressed
+		public virtual string Browse(string initialvalue)
+		{
+			return string.Empty;
+		}
+		
+		// This is called to perform a search (and replace)
+		// Must return a list of items to show in the results list
+		// replacewith is null when not replacing
+		public virtual FindReplaceObject[] Find(string value, bool withinselection, bool replace, string replacewith, bool keepselection)
+		{
+			return new FindReplaceObject[0];
+		}
+
+		// String representation
+		public override string ToString()
+		{
+			return attribs.DisplayName;
+		}
+
+		// This is called when a specific object is selected from the list
+		public virtual void ObjectSelected(FindReplaceObject[] selection)
+		{
+		}
+		
+		// This is called for rendering
+		public virtual void PlotSelection(IRenderer2D renderer, FindReplaceObject[] selection)
+		{
+		}
+
+		// This is called for rendering
+		public virtual void RenderThingsSelection(IRenderer2D renderer, FindReplaceObject[] selection)
+		{
+		}
+
+		// This is called for rendering
+		public virtual void RenderOverlaySelection(IRenderer2D renderer, FindReplaceObject[] selection)
+		{
+		}
+		
+		// This is called when the objects are to be edited
+		public virtual void EditObjects(FindReplaceObject[] selection)
+		{
+		}
+
+		// This is called when the objects are to be deleted
+		public virtual void DeleteObjects(FindReplaceObject[] selection)
+		{
+		}
+		
+		// Call this to zoom in on the given selection
+		public virtual void ZoomToSelection(ICollection<FindReplaceObject> selection)
+		{
+			List<Vector2D> points = new List<Vector2D>();
+			RectangleF area = MapSet.CreateEmptyArea();
+			
+			// Add all points to a list
+			foreach(FindReplaceObject o in selection) o.AddViewPoints(points);
+			
+			// Make a view area from the points
+			foreach(Vector2D p in points) area = MapSet.IncreaseArea(area, p);
+			
+			// Make the area square, using the largest side
+			if(area.Width > area.Height)
+			{
+				float delta = area.Width - area.Height;
+				area.Y -= delta * 0.5f;
+				area.Height += delta;
+			}
+			else
+			{
+				float delta = area.Height - area.Width;
+				area.X -= delta * 0.5f;
+				area.Width += delta;
+			}
+			
+			// Add padding
+			area.Inflate(100f, 100f);
+			
+			// Zoom to area
+			ClassicMode editmode = (General.Editing.Mode as ClassicMode);
+			editmode.CenterOnArea(area, 0.6f);
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/FindReplace/FindSectorBrightness.cs b/Source/Plugins/BuilderModes/FindReplace/FindSectorBrightness.cs
new file mode 100644
index 0000000..752ad31
--- /dev/null
+++ b/Source/Plugins/BuilderModes/FindReplace/FindSectorBrightness.cs
@@ -0,0 +1,72 @@
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Map;
+using System.Windows.Forms;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[FindReplace("Sector Brightness", BrowseButton = false)]
+	internal class FindSectorBrightness : BaseFindSector
+	{
+		#region ================== Methods
+
+		// This is called to perform a search (and replace)
+		// Returns a list of items to show in the results list
+		// replacewith is null when not replacing
+		public override FindReplaceObject[] Find(string value, bool withinselection, bool replace, string replacewith, bool keepselection) 
+		{
+			List<FindReplaceObject> objs = new List<FindReplaceObject>();
+
+			// Interpret the replacement
+			int replacebrightness = 0;
+			if(replace) 
+			{
+				// If it cannot be interpreted, set replacewith to null (not replacing at all)
+				if(!int.TryParse(replacewith, out replacebrightness)) replacewith = null;
+				if(replacebrightness < 0) replacewith = null;
+				if(replacebrightness > 255) replacewith = null;
+				if(replacewith == null) 
+				{
+					MessageBox.Show("Invalid replace value for this search type!", "Find and Replace", MessageBoxButtons.OK, MessageBoxIcon.Error);
+					return objs.ToArray();
+				}
+			}
+
+			// Interpret the number given
+			int brightness;
+			if(int.TryParse(value, out brightness)) 
+			{
+				// Where to search?
+				ICollection<Sector> list = withinselection ? General.Map.Map.GetSelectedSectors(true) : General.Map.Map.Sectors;
+
+				// Go for all sectors
+				foreach(Sector s in list) 
+				{
+					// Brightness matches?
+					if(s.Brightness == brightness) 
+					{
+						// Replace
+						if(replace) s.Brightness = replacebrightness;
+
+						objs.Add(new FindReplaceObject(s, "Sector " + s.Index));
+					}
+				}
+			}
+
+			//refresh map
+			if(replace) 
+			{
+				General.Map.Map.Update();
+				General.Map.IsChanged = true;
+			}
+
+			return objs.ToArray();
+		}
+
+		#endregion
+
+	}
+}
diff --git a/Source/Plugins/BuilderModes/FindReplace/FindSectorCeilingHeight.cs b/Source/Plugins/BuilderModes/FindReplace/FindSectorCeilingHeight.cs
new file mode 100644
index 0000000..5cd123e
--- /dev/null
+++ b/Source/Plugins/BuilderModes/FindReplace/FindSectorCeilingHeight.cs
@@ -0,0 +1,69 @@
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Map;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes.FindReplace
+{
+	[FindReplace("Sector Ceiling Height", BrowseButton = false)]
+	internal class FindSectorCeilingHeight : BaseFindSector
+	{
+		#region ================== Methods
+
+		// This is called to perform a search (and replace)
+		// Returns a list of items to show in the results list
+		// replacewith is null when not replacing
+		public override FindReplaceObject[] Find(string value, bool withinselection, bool replace, string replacewith, bool keepselection) 
+		{
+			List<FindReplaceObject> objs = new List<FindReplaceObject>();
+
+			// Interpret the replacement
+			int replaceheight = 0;
+			if(replace) 
+			{
+				// If it cannot be interpreted, set replacewith to null (not replacing at all)
+				if(!int.TryParse(replacewith, out replaceheight)) replacewith = null;
+				if(replacewith == null) 
+				{
+					MessageBox.Show("Invalid replace value for this search type!", "Find and Replace", MessageBoxButtons.OK, MessageBoxIcon.Error);
+					return objs.ToArray();
+				}
+			}
+
+			// Interpret the number given
+			int height;
+			if(int.TryParse(value, out height)) 
+			{
+				// Where to search?
+				ICollection<Sector> list = withinselection ? General.Map.Map.GetSelectedSectors(true) : General.Map.Map.Sectors;
+
+				// Go for all sectors
+				foreach(Sector s in list) 
+				{
+					// Height matches?
+					if(s.CeilHeight == height) 
+					{
+						// Replace
+						if(replace) s.CeilHeight = replaceheight;
+
+						objs.Add(new FindReplaceObject(s, "Sector " + s.Index));
+					}
+				}
+			}
+
+			//refresh map
+			if(replace) 
+			{
+				General.Map.Map.Update();
+				General.Map.IsChanged = true;
+			}
+
+			return objs.ToArray();
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/FindReplace/FindSectorEffect.cs b/Source/Plugins/BuilderModes/FindReplace/FindSectorEffect.cs
new file mode 100644
index 0000000..cd93706
--- /dev/null
+++ b/Source/Plugins/BuilderModes/FindReplace/FindSectorEffect.cs
@@ -0,0 +1,167 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Map;
+using System.Drawing;
+using CodeImp.DoomBuilder.Config;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[FindReplace("Sector Effect", BrowseButton = true)]
+	internal class FindSectorEffect : BaseFindSector
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		private List<int> generalizedbits;
+
+		#endregion
+
+		#region ================== Properties
+
+		public override Image BrowseImage { get { return Properties.Resources.List; } }
+		
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		//mxd
+		public FindSectorEffect() 
+		{
+			if(!General.Map.Config.GeneralizedEffects) return;
+
+			// Get all them generalized bits
+			generalizedbits = new List<int>();
+			foreach(GeneralizedOption option in General.Map.Config.GenEffectOptions) 
+			{
+				foreach(GeneralizedBit bit in option.Bits) 
+				{
+					if(bit.Index > 0) generalizedbits.Add(bit.Index);
+				}
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This is called when the browse button is pressed
+		public override string Browse(string initialvalue)
+		{
+			int effect;
+			int.TryParse(initialvalue, out effect);
+			effect = General.Interface.BrowseSectorEffect(BuilderPlug.Me.FindReplaceForm, effect);
+			return effect.ToString();
+		}
+
+
+		// This is called to perform a search (and replace)
+		// Returns a list of items to show in the results list
+		// replacewith is null when not replacing
+		public override FindReplaceObject[] Find(string value, bool withinselection, bool replace, string replacewith, bool keepselection)
+		{
+			List<FindReplaceObject> objs = new List<FindReplaceObject>();
+
+			// Interpret the replacement
+			int replaceeffect = 0;
+			if(replace)
+			{
+				// If it cannot be interpreted, set replacewith to null (not replacing at all)
+				if(!int.TryParse(replacewith, out replaceeffect)) replacewith = null;
+				if(replaceeffect < 0) replacewith = null;
+				if(replaceeffect > Int16.MaxValue) replacewith = null;
+				if(replacewith == null)
+				{
+					MessageBox.Show("Invalid replace value for this search type!", "Find and Replace", MessageBoxButtons.OK, MessageBoxIcon.Error);
+					return objs.ToArray();
+				}
+			}
+
+			// Interpret the number given
+			int effect;
+			if(int.TryParse(value, out effect))
+			{
+				//mxd
+				List<int> expectedbits = GetGeneralizedBits(effect);
+				
+				// Where to search?
+				ICollection<Sector> list = withinselection ? General.Map.Map.GetSelectedSectors(true) : General.Map.Map.Sectors;
+
+				// Go for all sectors
+				foreach(Sector s in list)
+				{
+					// Effect matches?
+					if(s.Effect == effect || BitsMatch(s.Effect, expectedbits))
+					{
+						// Replace
+						if(replace) s.Effect = replaceeffect;
+						
+						SectorEffectInfo info = General.Map.Config.GetSectorEffectInfo(s.Effect);
+						if(!info.IsNull)
+							objs.Add(new FindReplaceObject(s, "Sector " + s.Index + " (" + info.Title + ")"));
+						else
+							objs.Add(new FindReplaceObject(s, "Sector " + s.Index));
+					}
+				}
+			}
+
+			return objs.ToArray();
+		}
+
+		//mxd
+		private static List<int> GetGeneralizedBits(int effect) 
+		{
+			if(!General.Map.Config.GeneralizedEffects) return new List<int>();
+			List<int> bits = new List<int>();
+
+			foreach(GeneralizedOption option in General.Map.Config.GenEffectOptions) 
+			{
+				foreach(GeneralizedBit bit in option.Bits) 
+				{
+					if(bit.Index > 0 && (effect & bit.Index) == bit.Index)
+						bits.Add(bit.Index);
+				}
+			}
+
+			return bits;
+		}
+
+		//mxd
+		private static bool BitsMatch(int effect, List<int> expectedbits) 
+		{
+			if(!General.Map.Config.GeneralizedEffects) return false;
+
+			foreach(int bit in expectedbits) 
+			{
+				if((effect & bit) != bit) return false;
+			}
+
+			return true;
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/FindReplace/FindSectorFlags.cs b/Source/Plugins/BuilderModes/FindReplace/FindSectorFlags.cs
new file mode 100644
index 0000000..eef2838
--- /dev/null
+++ b/Source/Plugins/BuilderModes/FindReplace/FindSectorFlags.cs
@@ -0,0 +1,121 @@
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Windows;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[FindReplace("Sector Flags", BrowseButton = true)]
+	internal class FindSectorFlags : BaseFindSector
+	{
+		#region ================== Properties
+
+		public override Image BrowseImage { get { return Properties.Resources.List; } }
+
+		#endregion
+
+		#region ================== Methods
+
+		// This is called to test if the item should be displayed
+		public override bool DetermineVisiblity() 
+		{
+			return General.Map.Config.SectorFlags.Count > 0;
+		}
+
+		// This is called when the browse button is pressed
+		public override string Browse(string initialvalue)
+		{
+			return FlagsForm.ShowDialog(Form.ActiveForm, initialvalue, General.Map.Config.SectorFlags);
+		}
+
+		// This is called to perform a search (and replace)
+		// Returns a list of items to show in the results list
+		// replacewith is null when not replacing
+		public override FindReplaceObject[] Find(string value, bool withinselection, bool replace, string replacewith, bool keepselection)
+		{
+			List<FindReplaceObject> objs = new List<FindReplaceObject>();
+
+			// Where to search?
+			ICollection<Sector> list = withinselection ? General.Map.Map.GetSelectedSectors(true) : General.Map.Map.Sectors;
+
+			// Find what? (mxd)
+			List<string> findflagslist = new List<string>();
+			foreach(string flag in value.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries)) 
+			{
+				string f = flag.Trim();
+				if(General.Map.Config.SectorFlags.ContainsKey(f)) findflagslist.Add(f);
+			}
+			if(findflagslist.Count == 0) 
+			{
+				MessageBox.Show("Invalid value for this search type!", "Find and Replace", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				return objs.ToArray();
+			}
+
+			// Replace with what? (mxd)
+			List<string> replaceflagslist = new List<string>();
+			if(replace) 
+			{
+				string[] replaceflags = replacewith.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+				foreach(string flag in replaceflags) 
+				{
+					string f = flag.Trim();
+					if(!General.Map.Config.SectorFlags.ContainsKey(f))
+					{
+						MessageBox.Show("Invalid replace value '" + f + "' for this search type!", "Find and Replace", MessageBoxButtons.OK, MessageBoxIcon.Error);
+						return objs.ToArray();
+					}
+					replaceflagslist.Add(f);
+				}
+			}
+
+			// Go for all linedefs
+			foreach(Sector s in list)
+			{
+				bool match = true;
+
+				// Parse the value string...
+				foreach(string flag in findflagslist)
+				{
+					// ... and check if the flags don't match
+					if(!s.IsFlagSet(flag))
+					{
+						match = false;
+						break;
+					}
+				}
+
+				// Flags matches?
+				if(match)
+				{
+					// Replace flags (mxd)
+					if(replace) 
+					{
+						// Clear all flags
+						s.ClearFlags();
+
+						// Set new flags
+						foreach(string flag in replaceflagslist) s.SetFlag(flag, true);
+					}
+					
+					// Add to list
+					SectorEffectInfo info = General.Map.Config.GetSectorEffectInfo(s.Effect);
+					if(!info.IsNull)
+						objs.Add(new FindReplaceObject(s, "Sector " + s.Index + " (" + info.Title + ")"));
+					else
+						objs.Add(new FindReplaceObject(s, "Sector " + s.Index));
+				}
+			}
+
+			return objs.ToArray();
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/FindReplace/FindSectorFlat.cs b/Source/Plugins/BuilderModes/FindReplace/FindSectorFlat.cs
new file mode 100644
index 0000000..275ac77
--- /dev/null
+++ b/Source/Plugins/BuilderModes/FindReplace/FindSectorFlat.cs
@@ -0,0 +1,113 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Map;
+using System.Drawing;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[FindReplace("Sector Flat", BrowseButton = true)]
+	internal class FindSectorFlat : BaseFindSector
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		#endregion
+
+		#region ================== Properties
+
+		public override Image BrowseImage { get { return Properties.Resources.List_Images; } }
+		
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		#endregion
+
+		#region ================== Methods
+
+		// This is called when the browse button is pressed
+		public override string Browse(string initialvalue)
+		{
+			return General.Interface.BrowseFlat(BuilderPlug.Me.FindReplaceForm, initialvalue);
+		}
+
+
+		// This is called to perform a search (and replace)
+		// Returns a list of items to show in the results list
+		// replacewith is null when not replacing
+		public override FindReplaceObject[] Find(string value, bool withinselection, bool replace, string replacewith, bool keepselection)
+		{
+			List<FindReplaceObject> objs = new List<FindReplaceObject>();
+
+			// Interpret the replacement
+			if(replace && (string.IsNullOrEmpty(replacewith) || replacewith.Length > General.Map.Config.MaxTextureNameLength)) 
+			{
+				MessageBox.Show("Invalid replace value for this search type!", "Find and Replace", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				return objs.ToArray();
+			}
+			
+			// Interpret the find
+			bool isregex = (value.IndexOf('*') != -1 || value.IndexOf('?') != -1); //mxd
+			MatchingTextureSet set = new MatchingTextureSet(new Collection<string> { value.Trim() }); //mxd
+
+			// Where to search?
+			ICollection<Sector> list = withinselection ? General.Map.Map.GetSelectedSectors(true) : General.Map.Map.Sectors;
+
+			// Go for all sectors
+			foreach(Sector s in list)
+			{
+				// Flat matches?
+				if(set.IsMatch(s.CeilTexture)) 
+				{
+					// Replace and add to list
+					if(replace) s.SetCeilTexture(replacewith);
+					objs.Add(new FindReplaceObject(s, "Sector " + s.Index + " (ceiling)" + (isregex ? " - " + s.CeilTexture : null)));
+				}
+
+				if(set.IsMatch(s.FloorTexture)) 
+				{
+					// Replace and add to list
+					if(replace) s.SetFloorTexture(replacewith);
+					objs.Add(new FindReplaceObject(s, "Sector " + s.Index + " (floor)" + (isregex ? " - " + s.FloorTexture : null)));
+				}
+			}
+			
+			// When replacing, make sure we keep track of used textures
+			if(replace) 
+			{
+				General.Map.Data.UpdateUsedTextures();
+				General.Map.Map.Update(); //mxd. And don't forget to update the view itself
+				General.Map.IsChanged = true;
+			}
+			
+			return objs.ToArray();
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/FindReplace/FindSectorFloorHeight.cs b/Source/Plugins/BuilderModes/FindReplace/FindSectorFloorHeight.cs
new file mode 100644
index 0000000..05316e6
--- /dev/null
+++ b/Source/Plugins/BuilderModes/FindReplace/FindSectorFloorHeight.cs
@@ -0,0 +1,69 @@
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Map;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes.FindReplace
+{
+	[FindReplace("Sector Floor Height", BrowseButton = false)]
+	internal class FindSectorFloorHeight : BaseFindSector
+	{
+		#region ================== Methods
+
+		// This is called to perform a search (and replace)
+		// Returns a list of items to show in the results list
+		// replacewith is null when not replacing
+		public override FindReplaceObject[] Find(string value, bool withinselection, bool replace, string replacewith, bool keepselection) 
+		{
+			List<FindReplaceObject> objs = new List<FindReplaceObject>();
+
+			// Interpret the replacement
+			int replaceheight = 0;
+			if(replace) 
+			{
+				// If it cannot be interpreted, set replacewith to null (not replacing at all)
+				if(!int.TryParse(replacewith, out replaceheight)) replacewith = null;
+				if(replacewith == null) 
+				{
+					MessageBox.Show("Invalid replace value for this search type!", "Find and Replace", MessageBoxButtons.OK, MessageBoxIcon.Error);
+					return objs.ToArray();
+				}
+			}
+
+			// Interpret the number given
+			int height;
+			if(int.TryParse(value, out height)) 
+			{
+				// Where to search?
+				ICollection<Sector> list = withinselection ? General.Map.Map.GetSelectedSectors(true) : General.Map.Map.Sectors;
+
+				// Go for all sectors
+				foreach(Sector s in list) 
+				{
+					// Height matches?
+					if(s.FloorHeight == height) 
+					{
+						// Replace
+						if(replace) s.FloorHeight = replaceheight;
+
+						objs.Add(new FindReplaceObject(s, "Sector " + s.Index));
+					}
+				}
+			}
+
+			//refresh map
+			if(replace) 
+			{
+				General.Map.Map.Update();
+				General.Map.IsChanged = true;
+			}
+
+			return objs.ToArray();
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/FindReplace/FindSectorNumber.cs b/Source/Plugins/BuilderModes/FindReplace/FindSectorNumber.cs
new file mode 100644
index 0000000..38b0fd6
--- /dev/null
+++ b/Source/Plugins/BuilderModes/FindReplace/FindSectorNumber.cs
@@ -0,0 +1,81 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Config;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[FindReplace("Sector Index", BrowseButton = false)]
+	internal class FindSectorNumber : BaseFindSector
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		#endregion
+
+		#region ================== Properties
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		#endregion
+
+		#region ================== Methods
+
+		//mxd
+		public override bool CanReplace() 
+		{
+			return false;
+		}
+
+		// This is called to perform a search (and replace)
+		// Returns a list of items to show in the results list
+		// replacewith is null when not replacing
+		public override FindReplaceObject[] Find(string value, bool withinselection, bool replace, string replacewith, bool keepselection)
+		{
+			List<FindReplaceObject> objs = new List<FindReplaceObject>();
+
+			// Interpret the number given
+			int index;
+			if(int.TryParse(value, out index))
+			{
+				Sector s = General.Map.Map.GetSectorByIndex(index);
+				if(s != null)
+				{
+					SectorEffectInfo info = General.Map.Config.GetSectorEffectInfo(s.Effect);
+					if(!info.IsNull)
+						objs.Add(new FindReplaceObject(s, "Sector " + index + " (" + info.Title + ")"));
+					else
+						objs.Add(new FindReplaceObject(s, "Sector " + index));
+				}
+			}
+
+			return objs.ToArray();
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/FindReplace/FindSectorTags.cs b/Source/Plugins/BuilderModes/FindReplace/FindSectorTags.cs
new file mode 100644
index 0000000..5668ee1
--- /dev/null
+++ b/Source/Plugins/BuilderModes/FindReplace/FindSectorTags.cs
@@ -0,0 +1,108 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Config;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[FindReplace("Sector Tag", BrowseButton = false)]
+	internal class FindSectorTags : BaseFindSector
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		#endregion
+
+		#region ================== Properties
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		#endregion
+
+		#region ================== Methods
+
+		// This is called to perform a search (and replace)
+		// Returns a list of items to show in the results list
+		// replacewith is null when not replacing
+		public override FindReplaceObject[] Find(string value, bool withinselection, bool replace, string replacewith, bool keepselection)
+		{
+			List<FindReplaceObject> objs = new List<FindReplaceObject>();
+
+			// Interpret the replacement
+			int replacetag = 0;
+			if(replace)
+			{
+				// If it cannot be interpreted, set replacewith to null (not replacing at all)
+				if(!int.TryParse(replacewith, out replacetag)) replacewith = null;
+				if(replacetag < General.Map.FormatInterface.MinTag) replacewith = null;
+				if(replacetag > General.Map.FormatInterface.MaxTag) replacewith = null;
+				if(replacewith == null)
+				{
+					MessageBox.Show("Invalid replace value for this search type!", "Find and Replace", MessageBoxButtons.OK, MessageBoxIcon.Error);
+					return objs.ToArray();
+				}
+			}
+			
+			// Interpret the number given
+			int tag;
+			if(int.TryParse(value, out tag))
+			{
+				// Where to search?
+				ICollection<Sector> list = withinselection ? General.Map.Map.GetSelectedSectors(true) : General.Map.Map.Sectors;
+
+				// Go for all sectors
+				foreach(Sector s in list)
+				{
+					// Tag matches?
+					int index = s.Tags.IndexOf(tag);
+					if(index != -1)
+					{
+						// Replace
+						if(replace)
+						{
+							s.Tags[index] = replacetag; //mxd
+							s.Tags = s.Tags.Distinct().ToList(); //mxd. We don't want duplicates
+						}
+
+						// Add to list
+						SectorEffectInfo info = General.Map.Config.GetSectorEffectInfo(s.Effect);
+						if(!info.IsNull)
+							objs.Add(new FindReplaceObject(s, "Sector " + s.Index + " (" + info.Title + ")"));
+						else
+							objs.Add(new FindReplaceObject(s, "Sector " + s.Index));
+					}
+				}
+			}
+			
+			return objs.ToArray();
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/FindReplace/FindSidedefFlags.cs b/Source/Plugins/BuilderModes/FindReplace/FindSidedefFlags.cs
new file mode 100644
index 0000000..4409719
--- /dev/null
+++ b/Source/Plugins/BuilderModes/FindReplace/FindSidedefFlags.cs
@@ -0,0 +1,118 @@
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Windows;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[FindReplace("Sidedef Flags", BrowseButton = true)]
+	internal class FindSidedefFlags : BaseFindSidedef
+	{
+		#region ================== Properties
+
+		public override Image BrowseImage { get { return Properties.Resources.List; } }
+
+		#endregion
+
+		#region ================== Methods
+
+		// This is called to test if the item should be displayed
+		public override bool DetermineVisiblity() 
+		{
+			return General.Map.Config.SidedefFlags.Count > 0;
+		}
+
+		// This is called when the browse button is pressed
+		public override string Browse(string initialvalue) 
+		{
+			return FlagsForm.ShowDialog(Form.ActiveForm, initialvalue, General.Map.Config.SidedefFlags);
+		}
+
+		// This is called to perform a search (and replace)
+		// Returns a list of items to show in the results list
+		// replacewith is null when not replacing
+		public override FindReplaceObject[] Find(string value, bool withinselection, bool replace, string replacewith, bool keepselection) 
+		{
+			List<FindReplaceObject> objs = new List<FindReplaceObject>();
+
+			// Where to search?
+			ICollection<Sidedef> list = withinselection ? General.Map.Map.GetSidedefsFromSelectedLinedefs(true) : General.Map.Map.Sidedefs;
+
+			// Find what? (mxd)
+			List<string> findflagslist = new List<string>();
+			foreach(string flag in value.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries)) 
+			{
+				string f = flag.Trim();
+				if(General.Map.Config.SidedefFlags.ContainsKey(f)) findflagslist.Add(f);
+			}
+			if(findflagslist.Count == 0) 
+			{
+				MessageBox.Show("Invalid value for this search type!", "Find and Replace", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				return objs.ToArray();
+			}
+
+			// Replace with what? (mxd)
+			List<string> replaceflagslist = new List<string>();
+			if(replace) 
+			{
+				string[] replaceflags = replacewith.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+				foreach(string flag in replaceflags) 
+				{
+					string f = flag.Trim();
+					if(!General.Map.Config.SidedefFlags.ContainsKey(f))
+					{
+						MessageBox.Show("Invalid replace value '" + f + "' for this search type!", "Find and Replace", MessageBoxButtons.OK, MessageBoxIcon.Error);
+						return objs.ToArray();
+					}
+					replaceflagslist.Add(f);
+				}
+			}
+
+			// Go for all linedefs
+			foreach(Sidedef sd in list) 
+			{
+				bool match = true;
+
+				// Parse the value string...
+				foreach(string flag in findflagslist) 
+				{
+					// ... and check if the flags don't match
+					if(!sd.IsFlagSet(flag)) 
+					{
+						match = false;
+						break;
+					}
+				}
+
+				// Flags matches?
+				if(match) 
+				{
+					string side = sd.IsFront ? "front" : "back";
+					
+					// Replace flags (mxd)
+					if(replace) 
+					{
+						// Clear all flags
+						sd.ClearFlags();
+
+						// Set new flags
+						foreach(string flag in replaceflagslist) sd.SetFlag(flag, true);
+					}
+
+					// Add to list
+					objs.Add(new FindReplaceObject(sd, "Sidedef " + sd.Index + " (" + side + ")"));
+				}
+			}
+
+			return objs.ToArray();
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/FindReplace/FindSidedefNumber.cs b/Source/Plugins/BuilderModes/FindReplace/FindSidedefNumber.cs
new file mode 100644
index 0000000..88a5387
--- /dev/null
+++ b/Source/Plugins/BuilderModes/FindReplace/FindSidedefNumber.cs
@@ -0,0 +1,73 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Map;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[FindReplace("Sidedef Index", BrowseButton = false)]
+	internal class FindSidedefNumber : BaseFindSidedef
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		#endregion
+
+		#region ================== Properties
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		#endregion
+
+		#region ================== Methods
+
+		//mxd
+		public override bool CanReplace() 
+		{
+			return false;
+		}
+
+		// This is called to perform a search (and replace)
+		// Returns a list of items to show in the results list
+		// replacewith is null when not replacing
+		public override FindReplaceObject[] Find(string value, bool withinselection, bool replace, string replacewith, bool keepselection)
+		{
+			List<FindReplaceObject> objs = new List<FindReplaceObject>();
+
+			// Interpret the number given
+			int index;
+			if(int.TryParse(value, out index))
+			{
+				Sidedef sd = General.Map.Map.GetSidedefByIndex(index);
+				if(sd != null) objs.Add(new FindReplaceObject(sd, "Sidedef " + index));
+			}
+
+			return objs.ToArray();
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/FindReplace/FindSidedefTexture.cs b/Source/Plugins/BuilderModes/FindReplace/FindSidedefTexture.cs
new file mode 100644
index 0000000..d37603d
--- /dev/null
+++ b/Source/Plugins/BuilderModes/FindReplace/FindSidedefTexture.cs
@@ -0,0 +1,116 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Map;
+using System.Drawing;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[FindReplace("Sidedef Texture", BrowseButton = true)]
+	internal class FindSidedefTexture : BaseFindSidedef
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		#endregion
+
+		#region ================== Properties
+
+		public override Image BrowseImage { get { return Properties.Resources.List; } }
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		#endregion
+
+		#region ================== Methods
+
+		// This is called when the browse button is pressed
+		public override string Browse(string initialvalue)
+		{
+			return General.Interface.BrowseTexture(BuilderPlug.Me.FindReplaceForm, initialvalue);
+		}
+
+
+		// This is called to perform a search (and replace)
+		// Returns a list of items to show in the results list
+		// replacewith is null when not replacing
+		public override FindReplaceObject[] Find(string value, bool withinselection, bool replace, string replacewith, bool keepselection)
+		{
+			List<FindReplaceObject> objs = new List<FindReplaceObject>();
+
+			// Interpret the replacement
+			if(replace && (string.IsNullOrEmpty(replacewith) || replacewith.Length > General.Map.Config.MaxTextureNameLength)) 
+			{
+				MessageBox.Show("Invalid replace value for this search type!", "Find and Replace", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				return objs.ToArray();
+			}
+			
+			// Interpret the find
+			bool isregex = (value.IndexOf('*') != -1 || value.IndexOf('?') != -1); //mxd
+			MatchingTextureSet set = new MatchingTextureSet(new Collection<string> { value.Trim() }); //mxd
+
+			// Where to search?
+			ICollection<Sidedef> sidelist = withinselection ? General.Map.Map.GetSidedefsFromSelectedLinedefs(true) : General.Map.Map.Sidedefs;
+
+			// Go for all sidedefs
+			foreach(Sidedef sd in sidelist) 
+			{
+				string side = sd.IsFront ? "front" : "back";
+				
+				if(set.IsMatch(sd.HighTexture) && (value != "-" || sd.HighRequired())) 
+				{
+					// Replace and add to list
+					if(replace) sd.SetTextureHigh(replacewith);
+					objs.Add(new FindReplaceObject(sd, "Sidedef " + sd.Index + " (" + side + ", high)" + (isregex ? " - " + sd.HighTexture : null)));
+				}
+				
+				if(set.IsMatch(sd.MiddleTexture) && (value != "-" || sd.MiddleRequired())) 
+				{
+					// Replace and add to list
+					if(replace) sd.SetTextureMid(replacewith);
+					objs.Add(new FindReplaceObject(sd, "Sidedef " + sd.Index + " (" + side + ", middle)" + (isregex ? " - " + sd.MiddleTexture : null)));
+				}
+				
+				if(set.IsMatch(sd.LowTexture) && (value != "-" || sd.LowRequired())) 
+				{
+					// Replace and add to list
+					if(replace) sd.SetTextureLow(replacewith);
+					objs.Add(new FindReplaceObject(sd, "Sidedef " + sd.Index + " (" + side + ", low)" + (isregex ? " - " + sd.LowTexture : null)));
+				}
+			}
+			
+			// When replacing, make sure we keep track of used textures
+			if(replace) General.Map.Data.UpdateUsedTextures();
+			
+			return objs.ToArray();
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/FindReplace/FindThingAction.cs b/Source/Plugins/BuilderModes/FindReplace/FindThingAction.cs
new file mode 100644
index 0000000..3d89f88
--- /dev/null
+++ b/Source/Plugins/BuilderModes/FindReplace/FindThingAction.cs
@@ -0,0 +1,247 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.GZBuilder;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using System.Drawing;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Types;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[FindReplace("Thing Action and Arguments", BrowseButton = true)]
+	internal class FindThingAction : BaseFindThing
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		#endregion
+
+		#region ================== Properties
+
+		public override Presentation RenderPresentation { get { return Presentation.Things; } }
+		public override Image BrowseImage { get { return Properties.Resources.List; } }
+		
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		#endregion
+
+		#region ================== Methods
+
+		// This is called to test if the item should be displayed
+		public override bool DetermineVisiblity()
+		{
+			return General.Map.FormatInterface.HasThingAction;
+		}
+
+
+		// This is called when the browse button is pressed
+		public override string Browse(string initialvalue)
+		{
+			int action;
+			int.TryParse(initialvalue, out action);
+			action = General.Interface.BrowseLinedefActions(BuilderPlug.Me.FindReplaceForm, action);
+			return action.ToString();
+		}
+
+
+		// This is called to perform a search (and replace)
+		// Returns a list of items to show in the results list
+		// replacewith is null when not replacing
+		public override FindReplaceObject[] Find(string value, bool withinselection, bool replace, string replacewith, bool keepselection)
+		{
+			List<FindReplaceObject> objs = new List<FindReplaceObject>();
+
+			// Interpret the replacement
+			int replaceaction = 0;
+			string replacearg0str = string.Empty; //mxd
+			int[] replaceargs = null; //mxd
+			if(replace) 
+			{
+				string[] replaceparts = replacewith.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
+
+				// If it cannot be interpreted, set replacewith to null (not replacing at all)
+				if(replaceparts.Length == 0) replacewith = null; //mxd
+				if(!int.TryParse(replaceparts[0], out replaceaction)) replacewith = null;
+				if(replaceaction < 0) replacewith = null;
+				if(replaceaction > Int16.MaxValue) replacewith = null;
+				if(replacewith == null)
+				{
+					MessageBox.Show("Invalid replace value for this search type!", "Find and Replace", MessageBoxButtons.OK, MessageBoxIcon.Error);
+					return objs.ToArray();
+				}
+
+				//mxd. Now try parsing the args
+				if(replaceparts.Length > 1) 
+				{
+					replaceargs = new[] { int.MinValue, int.MinValue, int.MinValue, int.MinValue, int.MinValue };
+					int i = 1;
+
+					//mxd. Named script search support...
+					if(General.Map.UDMF && Array.IndexOf(GZGeneral.ACS_SPECIALS, replaceaction) != -1) 
+					{
+						string possiblescriptname = replaceparts[1].Trim().Replace("\"", "").ToLowerInvariant();
+						int tmp;
+						if(!string.IsNullOrEmpty(possiblescriptname) && possiblescriptname != "*" && !int.TryParse(possiblescriptname, out tmp)) 
+						{
+							replacearg0str = possiblescriptname;
+							i = 2;
+						}
+					}
+
+					for(; i < replaceparts.Length && i < replaceargs.Length + 1; i++) 
+					{
+						int argout;
+						if(replaceparts[i].Trim() == "*") continue; //mxd. Any arg value support
+						if(int.TryParse(replaceparts[i].Trim(), out argout)) replaceargs[i - 1] = argout;
+					}
+				}
+			}
+
+			// Interpret the number given
+			int action;
+			string[] parts = value.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
+
+			//For the search, the user may make the following queries:
+			//	action arg0 arg1 arg2 arg3 arg4
+			//	action arg0str arg1 arg2 arg3 arg4
+			//
+			//this allows users to search for lines that contain actions with specific arguments.
+			//useful for locating script lines
+
+			if(int.TryParse(parts[0], out action)) 
+			{
+				int[] args = null;
+				string arg0str = string.Empty; //mxd
+
+				//parse the arg values out
+				if(parts.Length > 1) 
+				{
+					args = new[] { int.MinValue, int.MinValue, int.MinValue, int.MinValue, int.MinValue };
+					int i = 1;
+
+					//mxd. Named script search support...
+					if(General.Map.UDMF && Array.IndexOf(GZGeneral.ACS_SPECIALS, action) != -1) 
+					{
+						string possiblescriptname = parts[1].Trim().Replace("\"", "").ToLowerInvariant();
+						int tmp;
+						if(!string.IsNullOrEmpty(possiblescriptname) && possiblescriptname != "*" && !int.TryParse(possiblescriptname, out tmp)) 
+						{
+							arg0str = possiblescriptname;
+							i = 2;
+						}
+					}
+
+					for(; i < parts.Length && i < args.Length + 1; i++) 
+					{
+						int argout;
+						if(parts[i].Trim() == "*") continue; //mxd. Any arg value support
+						if(int.TryParse(parts[i].Trim(), out argout)) args[i - 1] = argout;
+					}
+				}
+
+				// Where to search?
+				ICollection<Thing> list = withinselection ? General.Map.Map.GetSelectedThings(true) : General.Map.Map.Things;
+
+				// Go for all things
+				foreach(Thing t in list) 
+				{
+					// Action matches?
+					if(t.Action != action) continue;
+
+					bool match = true;
+					string argtext = "";
+
+					//if args were specified, then process them
+					if(args != null) 
+					{
+						int x = 0;
+						argtext = " args: (";
+
+						//mxd. Check script name...
+						if(!string.IsNullOrEmpty(arg0str)) 
+						{
+							string s = t.Fields.GetValue("arg0str", string.Empty);
+							if(s.ToLowerInvariant() != arg0str)
+								match = false;
+							else
+								argtext += "\"" + s + "\"";
+
+							x = 1;
+						}
+
+						for(; x < args.Length; x++) 
+						{
+							if(args[x] != int.MinValue && args[x] != t.Args[x]) 
+							{
+								match = false;
+								break;
+							}
+							argtext += (x == 0 ? "" : ",") + t.Args[x];
+						}
+						argtext += ")";
+					}
+
+					if(match) 
+					{
+						// Replace
+						if(replace) 
+						{
+							t.Action = replaceaction;
+
+							//mxd. Replace args as well?
+							if(replaceargs != null) 
+							{
+								int i = 0;
+								if(!string.IsNullOrEmpty(replacearg0str)) 
+								{
+									t.Fields["arg0str"] = new UniValue(UniversalType.String, replacearg0str);
+									i = 1;
+								}
+
+								for(; i < replaceargs.Length; i++) 
+								{
+									if(replaceargs[i] != int.MinValue) t.Args[i] = replaceargs[i];
+								}
+							}
+						}
+
+						// Add to list
+						ThingTypeInfo ti = General.Map.Data.GetThingInfo(t.Type);
+						objs.Add(new FindReplaceObject(t, "Thing " + t.Index + " (" + ti.Title + ")" + argtext));
+					}
+				}
+			}
+
+			return objs.ToArray();
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/FindReplace/FindThingAngle.cs b/Source/Plugins/BuilderModes/FindReplace/FindThingAngle.cs
new file mode 100644
index 0000000..613e810
--- /dev/null
+++ b/Source/Plugins/BuilderModes/FindReplace/FindThingAngle.cs
@@ -0,0 +1,113 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Windows;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Geometry;
+using System.Drawing;
+using CodeImp.DoomBuilder.Config;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[FindReplace("Thing Angle", BrowseButton = true)]
+	internal class FindThingAngle : BaseFindThing
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		#endregion
+
+		#region ================== Properties
+
+		public override Presentation RenderPresentation { get { return Presentation.Things; } }
+		public override Image BrowseImage { get { return Properties.Resources.Angle; } }
+		
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		#endregion
+
+		#region ================== Methods
+
+		// This is called when the browse button is pressed
+		public override string Browse(string initialvalue)
+		{
+			int initangle;
+			int.TryParse(initialvalue, out initangle);
+			return AngleForm.ShowDialog(Form.ActiveForm, initangle).ToString();
+		}
+
+
+		// This is called to perform a search (and replace)
+		// Returns a list of items to show in the results list
+		// replacewith is null when not replacing
+		public override FindReplaceObject[] Find(string value, bool withinselection, bool replace, string replacewith, bool keepselection)
+		{
+			List<FindReplaceObject> objs = new List<FindReplaceObject>();
+
+			// Interpret the replacement
+			int replaceangle = 0;
+			if(replace)
+			{
+				// If it cannot be interpreted, set replacewith to null (not replacing at all)
+				if(!int.TryParse(replacewith, out replaceangle)) replacewith = null;
+				if(replacewith == null)
+				{
+					MessageBox.Show("Invalid replace value for this search type!", "Find and Replace", MessageBoxButtons.OK, MessageBoxIcon.Error);
+					return objs.ToArray();
+				}
+			}
+
+			// Interpret the number given
+			int angle;
+			if(int.TryParse(value, out angle))
+			{
+				// Where to search?
+				ICollection<Thing> list = withinselection ? General.Map.Map.GetSelectedThings(true) : General.Map.Map.Things;
+
+				// Go for all things
+				foreach(Thing t in list)
+				{
+					// Match?
+					if(Angle2D.RealToDoom(t.Angle) == angle)
+					{
+						// Replace
+						if(replace) t.Rotate(Angle2D.DoomToReal(replaceangle));
+
+						// Add to list
+						ThingTypeInfo ti = General.Map.Data.GetThingInfo(t.Type);
+						objs.Add(new FindReplaceObject(t, "Thing " + t.Index + " (" + ti.Title + ")"));
+					}
+				}
+			}
+
+			return objs.ToArray();
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/FindReplace/FindThingFlags.cs b/Source/Plugins/BuilderModes/FindReplace/FindThingFlags.cs
new file mode 100644
index 0000000..082d110
--- /dev/null
+++ b/Source/Plugins/BuilderModes/FindReplace/FindThingFlags.cs
@@ -0,0 +1,148 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Windows;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using System.Drawing;
+using CodeImp.DoomBuilder.Config;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[FindReplace("Thing Flags", BrowseButton = true)]
+	internal class FindThingFlag : BaseFindThing
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		#endregion
+
+		#region ================== Properties
+
+		public override Presentation RenderPresentation { get { return Presentation.Things; } }
+		public override Image BrowseImage { get { return Properties.Resources.List; } }
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		#endregion
+
+		#region ================== Methods
+
+		// This is called to test if the item should be displayed
+		public override bool DetermineVisiblity() 
+		{
+			return General.Map.Config.ThingFlags.Count > 0;
+		}
+
+		// This is called when the browse button is pressed
+		public override string Browse(string initialvalue)
+		{
+			return FlagsForm.ShowDialog(Form.ActiveForm, initialvalue, General.Map.Config.ThingFlags);
+		}
+
+		// This is called to perform a search (and replace)
+		// Returns a list of items to show in the results list
+		// replacewith is null when not replacing
+		public override FindReplaceObject[] Find(string value, bool withinselection, bool replace, string replacewith, bool keepselection)
+		{
+			List<FindReplaceObject> objs = new List<FindReplaceObject>();
+
+			// Where to search?
+			ICollection<Thing> list = withinselection ? General.Map.Map.GetSelectedThings(true) : General.Map.Map.Things;
+
+			// Find what? (mxd)
+			List<string> findflagslist = new List<string>();
+			foreach(string flag in value.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
+			{
+				string f = flag.Trim();
+				if(General.Map.Config.ThingFlags.ContainsKey(f)) findflagslist.Add(f);
+			}
+			if(findflagslist.Count == 0) 
+			{
+				MessageBox.Show("Invalid value for this search type!", "Find and Replace", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				return objs.ToArray();
+			}
+
+			// Replace with what? (mxd)
+			List<string> replaceflagslist = new List<string>();
+			if(replace)
+			{
+				string[] replaceflags = replacewith.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+				foreach(string flag in replaceflags) 
+				{
+					string f = flag.Trim();
+					if(!General.Map.Config.ThingFlags.ContainsKey(f))
+					{
+						MessageBox.Show("Invalid replace value '" + f + "' for this search type!", "Find and Replace", MessageBoxButtons.OK, MessageBoxIcon.Error);
+						return objs.ToArray();
+					}
+					replaceflagslist.Add(f);
+				}
+			}
+
+			// Go for all things
+			foreach(Thing t in list)
+			{
+				bool match = true;
+
+				// Parse the value string...
+				foreach(string flag in findflagslist)
+				{
+					// ... and check if the flags don't match
+					if(!t.IsFlagSet(flag))
+					{
+						match = false;
+						break;
+					}
+				}
+
+				// Match?
+				if(match)
+				{
+					// Replace flags (mxd)
+					if(replace)
+					{
+						// Clear all flags
+						t.ClearFlags();
+
+						// Set new flags
+						foreach(string flag in replaceflagslist) t.SetFlag(flag, true);
+					}
+					
+					// Add to list
+					ThingTypeInfo ti = General.Map.Data.GetThingInfo(t.Type);
+					objs.Add(new FindReplaceObject(t, "Thing " + t.Index + " (" + ti.Title + ")"));
+				}
+			}
+
+			return objs.ToArray();
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/FindReplace/FindThingNumber.cs b/Source/Plugins/BuilderModes/FindReplace/FindThingNumber.cs
new file mode 100644
index 0000000..b087cae
--- /dev/null
+++ b/Source/Plugins/BuilderModes/FindReplace/FindThingNumber.cs
@@ -0,0 +1,81 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Config;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[FindReplace("Thing Index", BrowseButton = false)]
+	internal class FindThingNumber : BaseFindThing
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		#endregion
+
+		#region ================== Properties
+
+		public override Presentation RenderPresentation { get { return Presentation.Things; } }
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		#endregion
+
+		#region ================== Methods
+
+		//mxd
+		public override bool CanReplace() 
+		{
+			return false;
+		}
+
+		// This is called to perform a search (and replace)
+		// Returns a list of items to show in the results list
+		// replacewith is null when not replacing
+		public override FindReplaceObject[] Find(string value, bool withinselection, bool replace, string replacewith, bool keepselection)
+		{
+			List<FindReplaceObject> objs = new List<FindReplaceObject>();
+
+			// Interpret the number given
+			int index;
+			if(int.TryParse(value, out index))
+			{
+				Thing t = General.Map.Map.GetThingByIndex(index);
+				if(t != null)
+				{
+					ThingTypeInfo ti = General.Map.Data.GetThingInfo(t.Type);
+					objs.Add(new FindReplaceObject(t, "Thing " + index + " (" + ti.Title + ")"));
+				}
+			}
+
+			return objs.ToArray();
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/FindReplace/FindThingSectorRef.cs b/Source/Plugins/BuilderModes/FindReplace/FindThingSectorRef.cs
new file mode 100644
index 0000000..87d08e2
--- /dev/null
+++ b/Source/Plugins/BuilderModes/FindReplace/FindThingSectorRef.cs
@@ -0,0 +1,126 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Types;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[FindReplace("Thing Sector Reference", BrowseButton = false)]
+	internal class FindThingSectorRef : BaseFindThing
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		#endregion
+
+		#region ================== Properties
+
+		public override Presentation RenderPresentation { get { return Presentation.Things; } }
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		#endregion
+
+		#region ================== Methods
+
+		// This is called to test if the item should be displayed
+		public override bool DetermineVisiblity()
+		{
+			return General.Map.FormatInterface.HasThingAction && General.Map.FormatInterface.HasActionArgs;
+		}
+
+		// This is called to perform a search (and replace)
+		// Returns a list of items to show in the results list
+		// replacewith is null when not replacing
+		public override FindReplaceObject[] Find(string value, bool withinselection, bool replace, string replacewith, bool keepselection)
+		{
+			List<FindReplaceObject> objs = new List<FindReplaceObject>();
+
+			// Interpret the replacement
+			int replacetag = 0;
+			if(replace)
+			{
+				// If it cannot be interpreted, set replacewith to null (not replacing at all)
+				if(!int.TryParse(replacewith, out replacetag)) replacewith = null;
+				if(replacetag < 0) replacewith = null;
+				if(replacetag > 255) replacewith = null;
+				if(replacewith == null)
+				{
+					MessageBox.Show("Invalid replace value for this search type!", "Find and Replace", MessageBoxButtons.OK, MessageBoxIcon.Error);
+					return objs.ToArray();
+				}
+			}
+
+			// Interpret the number given
+			int tag;
+			if(int.TryParse(value, out tag))
+			{
+				// Where to search?
+				ICollection<Thing> list = withinselection ? General.Map.Map.GetSelectedThings(true) : General.Map.Map.Things;
+
+				// Go for all things
+				foreach(Thing t in list)
+				{
+					bool addthing = false;
+					
+					LinedefActionInfo info = General.Map.Config.GetLinedefActionInfo(t.Action);
+					if(info.IsKnown && !info.IsNull)
+					{
+						// Go for all args
+						for(int i = 0; i < Linedef.NUM_ARGS; i++)
+						{
+							// Argument type matches?
+							if(info.Args[i].Used && (info.Args[i].Type == (int)UniversalType.SectorTag))
+							{
+								if(t.Args[i] == tag)
+								{
+									// Replace
+									if(replace) t.Args[i] = replacetag;
+									addthing = true;
+								}
+							}
+						}
+					}
+					
+					if(addthing)
+					{
+						// Add to list
+						ThingTypeInfo ti = General.Map.Data.GetThingInfo(t.Type);
+						objs.Add(new FindReplaceObject(t, "Thing " + t.Index + " (" + ti.Title + ")"));
+					}
+				}
+			}
+
+			return objs.ToArray();
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/FindReplace/FindThingTag.cs b/Source/Plugins/BuilderModes/FindReplace/FindThingTag.cs
new file mode 100644
index 0000000..ff9aa5f
--- /dev/null
+++ b/Source/Plugins/BuilderModes/FindReplace/FindThingTag.cs
@@ -0,0 +1,109 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Config;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[FindReplace("Thing Tag", BrowseButton = false)]
+	internal class FindThingTag : BaseFindThing
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		#endregion
+
+		#region ================== Properties
+
+		public override Presentation RenderPresentation { get { return Presentation.Things; } }
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		#endregion
+
+		#region ================== Methods
+
+		// This is called to test if the item should be displayed
+		public override bool DetermineVisiblity()
+		{
+			return General.Map.FormatInterface.HasThingTag;
+		}
+
+		// This is called to perform a search (and replace)
+		// Returns a list of items to show in the results list
+		// replacewith is null when not replacing
+		public override FindReplaceObject[] Find(string value, bool withinselection, bool replace, string replacewith, bool keepselection)
+		{
+			List<FindReplaceObject> objs = new List<FindReplaceObject>();
+
+			// Interpret the replacement
+			int replacetag = 0;
+			if(replace)
+			{
+				// If it cannot be interpreted, set replacewith to null (not replacing at all)
+				if(!int.TryParse(replacewith, out replacetag)) replacewith = null;
+				if(replacetag < 0) replacewith = null;
+				if(replacetag > Int16.MaxValue) replacewith = null;
+				if(replacewith == null)
+				{
+					MessageBox.Show("Invalid replace value for this search type!", "Find and Replace", MessageBoxButtons.OK, MessageBoxIcon.Error);
+					return objs.ToArray();
+				}
+			}
+
+			// Interpret the number given
+			int tag;
+			if(int.TryParse(value, out tag))
+			{
+				// Where to search?
+				ICollection<Thing> list = withinselection ? General.Map.Map.GetSelectedThings(true) : General.Map.Map.Things;
+
+				// Go for all things
+				foreach(Thing t in list)
+				{
+					// Match?
+					if(t.Tag == tag)
+					{
+						// Replace
+						if(replace) t.Tag = replacetag;
+
+						// Add to list
+						ThingTypeInfo ti = General.Map.Data.GetThingInfo(t.Type);
+						objs.Add(new FindReplaceObject(t, "Thing " + t.Index + " (" + ti.Title + ")"));
+					}
+				}
+			}
+
+			return objs.ToArray();
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/FindReplace/FindThingThingRef.cs b/Source/Plugins/BuilderModes/FindReplace/FindThingThingRef.cs
new file mode 100644
index 0000000..3d2d62d
--- /dev/null
+++ b/Source/Plugins/BuilderModes/FindReplace/FindThingThingRef.cs
@@ -0,0 +1,126 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Types;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[FindReplace("Thing Thing Reference", BrowseButton = false)]
+	internal class FindThingThingRef : BaseFindThing
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		#endregion
+
+		#region ================== Properties
+
+		public override Presentation RenderPresentation { get { return Presentation.Things; } }
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		#endregion
+
+		#region ================== Methods
+
+		// This is called to test if the item should be displayed
+		public override bool DetermineVisiblity()
+		{
+			return General.Map.FormatInterface.HasThingAction && General.Map.FormatInterface.HasThingTag;
+		}
+
+		// This is called to perform a search (and replace)
+		// Returns a list of items to show in the results list
+		// replacewith is null when not replacing
+		public override FindReplaceObject[] Find(string value, bool withinselection, bool replace, string replacewith, bool keepselection)
+		{
+			List<FindReplaceObject> objs = new List<FindReplaceObject>();
+
+			// Interpret the replacement
+			int replacetag = 0;
+			if(replace)
+			{
+				// If it cannot be interpreted, set replacewith to null (not replacing at all)
+				if(!int.TryParse(replacewith, out replacetag)) replacewith = null;
+				if(replacetag < 0) replacewith = null;
+				if(replacetag > 255) replacewith = null;
+				if(replacewith == null)
+				{
+					MessageBox.Show("Invalid replace value for this search type!", "Find and Replace", MessageBoxButtons.OK, MessageBoxIcon.Error);
+					return objs.ToArray();
+				}
+			}
+
+			// Interpret the number given
+			int tag;
+			if(int.TryParse(value, out tag))
+			{
+				// Where to search?
+				ICollection<Thing> list = withinselection ? General.Map.Map.GetSelectedThings(true) : General.Map.Map.Things;
+
+				// Go for all things
+				foreach(Thing t in list)
+				{
+					bool addthing = false;
+
+					LinedefActionInfo info = General.Map.Config.GetLinedefActionInfo(t.Action);
+					if(info.IsKnown && !info.IsNull)
+					{
+						// Go for all args
+						for(int i = 0; i < Linedef.NUM_ARGS; i++)
+						{
+							// Argument type matches?
+							if(info.Args[i].Used && (info.Args[i].Type == (int)UniversalType.ThingTag))
+							{
+								if(t.Args[i] == tag)
+								{
+									// Replace
+									if(replace) t.Args[i] = replacetag;
+									addthing = true;
+								}
+							}
+						}
+					}
+
+					if(addthing)
+					{
+						// Add to list
+						ThingTypeInfo ti = General.Map.Data.GetThingInfo(t.Type);
+						objs.Add(new FindReplaceObject(t, "Thing " + t.Index + " (" + ti.Title + ")"));
+					}
+				}
+			}
+
+			return objs.ToArray();
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/FindReplace/FindThingType.cs b/Source/Plugins/BuilderModes/FindReplace/FindThingType.cs
new file mode 100644
index 0000000..9e754de
--- /dev/null
+++ b/Source/Plugins/BuilderModes/FindReplace/FindThingType.cs
@@ -0,0 +1,119 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using System.Drawing;
+using CodeImp.DoomBuilder.Config;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[FindReplace("Thing Type", BrowseButton = true)]
+	internal class FindThingType : BaseFindThing
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		#endregion
+
+		#region ================== Properties
+
+		public override Presentation RenderPresentation { get { return Presentation.Things; } }
+		public override Image BrowseImage { get { return Properties.Resources.List; } }
+		
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		#endregion
+
+		#region ================== Methods
+
+		// This is called when the browse button is pressed
+		public override string Browse(string initialvalue)
+		{
+			int type;
+			int.TryParse(initialvalue, out type);
+			type = General.Interface.BrowseThingType(BuilderPlug.Me.FindReplaceForm, type);
+			return type.ToString();
+		}
+
+
+		// This is called to perform a search (and replace)
+		// Returns a list of items to show in the results list
+		// replacewith is null when not replacing
+		public override FindReplaceObject[] Find(string value, bool withinselection, bool replace, string replacewith, bool keepselection)
+		{
+			List<FindReplaceObject> objs = new List<FindReplaceObject>();
+
+			// Interpret the replacement
+			int replacetype = 0;
+			if(replace)
+			{
+				// If it cannot be interpreted, set replacewith to null (not replacing at all)
+				if(!int.TryParse(replacewith, out replacetype)) replacewith = null;
+				if(replacetype < 0) replacewith = null;
+				if(replacetype > Int16.MaxValue) replacewith = null;
+				if(replacewith == null)
+				{
+					MessageBox.Show("Invalid replace value for this search type!", "Find and Replace", MessageBoxButtons.OK, MessageBoxIcon.Error);
+					return objs.ToArray();
+				}
+			}
+
+			// Interpret the number given
+			int findtype;
+			if(int.TryParse(value, out findtype))
+			{
+				// Where to search?
+				ICollection<Thing> list = withinselection ? General.Map.Map.GetSelectedThings(true) : General.Map.Map.Things;
+
+				// Go for all things
+				foreach(Thing t in list)
+				{
+					// Match?
+					if(t.Type == findtype)
+					{
+						// Replace
+						if(replace)
+						{
+							t.Type = replacetype;
+							t.UpdateConfiguration();
+						}
+						
+						// Add to list
+						ThingTypeInfo ti = General.Map.Data.GetThingInfo(t.Type);
+						objs.Add(new FindReplaceObject(t, "Thing " + t.Index + " (" + ti.Title + ")"));
+					}
+				}
+			}
+			
+			return objs.ToArray();
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/FindReplace/FindVertexNumber.cs b/Source/Plugins/BuilderModes/FindReplace/FindVertexNumber.cs
new file mode 100644
index 0000000..568db06
--- /dev/null
+++ b/Source/Plugins/BuilderModes/FindReplace/FindVertexNumber.cs
@@ -0,0 +1,108 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[FindReplace("Vertex Index", BrowseButton = false)]
+	internal class FindVertexNumber : FindReplaceType
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		#endregion
+
+		#region ================== Properties
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		#endregion
+
+		#region ================== Methods
+
+		//mxd
+		public override bool CanReplace() 
+		{
+			return false;
+		}
+
+		// This is called to perform a search (and replace)
+		// Returns a list of items to show in the results list
+		// replacewith is null when not replacing
+		public override FindReplaceObject[] Find(string value, bool withinselection, bool replace, string replacewith, bool keepselection)
+		{
+			List<FindReplaceObject> objs = new List<FindReplaceObject>();
+
+			// Interpret the number given
+			int index;
+			if(int.TryParse(value, out index))
+			{
+				Vertex v = General.Map.Map.GetVertexByIndex(index);
+				if(v != null) objs.Add(new FindReplaceObject(v, "Vertex " + index));
+			}
+			
+			return objs.ToArray();
+		}
+
+		// This is called when a specific object is selected from the list
+		public override void ObjectSelected(FindReplaceObject[] selection)
+		{
+			if(selection.Length == 1)
+			{
+				ZoomToSelection(selection);
+				General.Interface.ShowVertexInfo(selection[0].Vertex);
+			}
+			else
+				General.Interface.HideInfo();
+
+			General.Map.Map.ClearAllSelected();
+			foreach(FindReplaceObject obj in selection) obj.Vertex.Selected = true;
+		}
+
+		// Render selection
+		public override void PlotSelection(IRenderer2D renderer, FindReplaceObject[] selection)
+		{
+			foreach(FindReplaceObject o in selection)
+			{
+				renderer.PlotVertex(o.Vertex, ColorCollection.SELECTION);
+			}
+		}
+
+		// Edit objects
+		public override void EditObjects(FindReplaceObject[] selection)
+		{
+			HashSet<Vertex> vertices = new HashSet<Vertex>();
+			foreach(FindReplaceObject o in selection)
+				if(!vertices.Contains(o.Vertex)) vertices.Add(o.Vertex);
+			General.Interface.ShowEditVertices(vertices);
+			General.Map.Map.Update();
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/General/Association.cs b/Source/Plugins/BuilderModes/General/Association.cs
new file mode 100644
index 0000000..2eded8a
--- /dev/null
+++ b/Source/Plugins/BuilderModes/General/Association.cs
@@ -0,0 +1,136 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Types;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	public class Association
+	{
+		private HashSet<int> tags;
+		private Vector2D center;
+		private UniversalType type;
+
+		public HashSet<int> Tags { get { return tags; } }
+		public Vector2D Center { get { return center; } }
+		public UniversalType Type { get { return type; } }
+
+		//mxd. This sets up the association
+		public Association()
+		{
+			this.tags = new HashSet<int> { 0 };
+		}
+
+		// This sets up the association
+		public Association(Vector2D center, int tag, int type)
+		{
+			this.tags = new HashSet<int> { tag }; //mxd
+			this.type = (UniversalType)type;
+			this.center = center;
+		}
+
+		// This sets up the association
+		public Association(Vector2D center, int tag, UniversalType type)
+		{
+			this.tags = new HashSet<int> { tag }; //mxd
+			this.type = type;
+			this.center = center;
+		}
+
+		//mxd. This also sets up the association
+		public Association(Vector2D center, IEnumerable<int> tags, int type)
+		{
+			this.tags = new HashSet<int>(tags); //mxd
+			this.type = (UniversalType)type;
+			this.center = center;
+		}
+
+		//mxd. This also sets up the association
+		public Association(Vector2D center, IEnumerable<int> tags, UniversalType type)
+		{
+			this.tags = new HashSet<int>(tags); //mxd
+			this.type = type;
+			this.center = center;
+		}
+
+		// This sets up the association
+		public void Set(Vector2D center, int tag, int type)
+		{
+			this.tags = new HashSet<int> { tag }; //mxd
+			this.type = (UniversalType)type;
+			this.center = center;
+		}
+
+		// This sets up the association
+		public void Set(Vector2D center, int tag, UniversalType type)
+		{
+			this.tags = new HashSet<int> { tag }; //mxd
+			this.type = type;
+			this.center = center;
+		}
+
+		//mxd. This also sets up the association
+		public void Set(Vector2D center, IEnumerable<int> tags, int type)
+		{
+			this.tags = new HashSet<int>(tags); //mxd
+			this.type = (UniversalType)type;
+			this.center = center;
+		}
+
+		//mxd. This also sets up the association
+		public void Set(Vector2D center, IEnumerable<int> tags, UniversalType type)
+		{
+			this.tags = new HashSet<int>(tags); //mxd
+			this.type = type;
+			this.center = center;
+		}
+
+		// This compares an association
+		public static bool operator ==(Association a, Association b)
+		{
+			if(!(a is Association) || !(b is Association)) return false; //mxd
+			return (a.type == b.type) && a.tags.SetEquals(b.tags);
+		}
+
+		// This compares an association
+		public static bool operator !=(Association a, Association b)
+		{
+			if(!(a is Association) || !(b is Association)) return true; //mxd
+			return (a.type != b.type) || !a.tags.SetEquals(b.tags);
+		}
+
+		//mxd 
+		public override int GetHashCode() 
+		{
+			return base.GetHashCode();
+		}
+
+		//mxd
+		public override bool Equals(object obj) 
+		{
+			if(!(obj is Association)) return false;
+
+			Association b = (Association)obj;
+			return (type == b.type) && tags.SetEquals(b.tags);
+		}
+	}
+}
diff --git a/Source/Plugins/BuilderModes/General/BuilderModesTools.cs b/Source/Plugins/BuilderModes/General/BuilderModesTools.cs
new file mode 100644
index 0000000..34446ea
--- /dev/null
+++ b/Source/Plugins/BuilderModes/General/BuilderModesTools.cs
@@ -0,0 +1,685 @@
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.VisualModes;
+using CodeImp.DoomBuilder.Windows;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	#region ================== Structs
+
+	// A struct, which contains information about visual sides connected to start and end of given visual side
+	internal class SortedVisualSide
+	{
+		internal readonly BaseVisualGeometrySidedef Side;
+		internal readonly Vector2D Start;
+		internal readonly Vector2D End;
+		internal Rectangle Bounds;
+		internal Rectangle GlobalBounds;
+		internal readonly Dictionary<SortedVisualSide, bool> NextSides;
+		internal readonly Dictionary<SortedVisualSide, bool> PreviousSides;
+		internal readonly int Index;
+		internal int GroupIndex = -1;
+		private static int index;
+
+		//Initial texture coordinates
+		private readonly float OffsetX;
+		private readonly float OffsetY;
+		private readonly float ControlSideOffsetX;
+		private readonly float ControlSideOffsetY;
+		private readonly float ScaleX;
+		private readonly float ScaleY;
+
+		internal SortedVisualSide(BaseVisualGeometrySidedef side)
+		{
+			Side = side;
+			Bounds = BuilderModesTools.GetSidedefPartSize(side);
+			Index = index++;
+
+			if(side.Sidedef.Line.Front == side.Sidedef)
+			{
+				Start = side.Sidedef.Line.Start.Position;
+				End = side.Sidedef.Line.End.Position;
+			}
+			else
+			{
+				Start = side.Sidedef.Line.End.Position;
+				End = side.Sidedef.Line.Start.Position;
+			}
+
+			switch(side.GeometryType)
+			{
+				case VisualGeometryType.WALL_UPPER:
+					OffsetX = UniFields.GetFloat(side.Sidedef.Fields, "offsetx_top");
+					OffsetY = UniFields.GetFloat(side.Sidedef.Fields, "offsety_top");
+					ScaleX = UniFields.GetFloat(side.Sidedef.Fields, "scalex_top", 1.0f);
+					ScaleY = UniFields.GetFloat(side.Sidedef.Fields, "scaley_top", 1.0f);
+					break;
+
+				case VisualGeometryType.WALL_MIDDLE:
+					OffsetX = UniFields.GetFloat(side.Sidedef.Fields, "offsetx_mid");
+					OffsetY = UniFields.GetFloat(side.Sidedef.Fields, "offsety_mid");
+					ScaleX = UniFields.GetFloat(side.Sidedef.Fields, "scalex_mid", 1.0f);
+					ScaleY = UniFields.GetFloat(side.Sidedef.Fields, "scaley_mid", 1.0f);
+					break;
+
+				case VisualGeometryType.WALL_MIDDLE_3D:
+					Sidedef cs = side.GetControlLinedef().Front;
+					ControlSideOffsetX = cs.OffsetX + UniFields.GetFloat(cs.Fields, "offsetx_mid");
+					OffsetX = UniFields.GetFloat(side.Sidedef.Fields, "offsetx_mid");
+					ControlSideOffsetY = cs.OffsetY + UniFields.GetFloat(cs.Fields, "offsety_mid");
+					OffsetY = UniFields.GetFloat(side.Sidedef.Fields, "offsety_mid");
+					ScaleX = UniFields.GetFloat(cs.Fields, "scalex_mid", 1.0f);
+					ScaleY = UniFields.GetFloat(cs.Fields, "scaley_mid", 1.0f);
+					break;
+
+				case VisualGeometryType.WALL_LOWER:
+					OffsetX = UniFields.GetFloat(side.Sidedef.Fields, "offsetx_bottom");
+					OffsetY = UniFields.GetFloat(side.Sidedef.Fields, "offsety_bottom");
+					ScaleX = UniFields.GetFloat(side.Sidedef.Fields, "scalex_bottom", 1.0f);
+					ScaleY = UniFields.GetFloat(side.Sidedef.Fields, "scaley_bottom", 1.0f);
+					break;
+			}
+
+			NextSides = new Dictionary<SortedVisualSide, bool>();
+			PreviousSides = new Dictionary<SortedVisualSide, bool>();
+		}
+
+		internal void OnTextureFit(FitTextureOptions options)
+		{
+			options.Bounds = Bounds;
+			options.GlobalBounds = GlobalBounds;
+			options.InitialOffsetX = OffsetX;
+			options.InitialOffsetY = OffsetY;
+			options.ControlSideOffsetX = ControlSideOffsetX;
+			options.ControlSideOffsetY = ControlSideOffsetY;
+			options.InitialScaleX = ScaleX;
+			options.InitialScaleY = ScaleY;
+
+			Side.OnTextureFit(options);
+		}
+	}
+
+	#endregion
+
+	internal static class BuilderModesTools
+	{
+		#region ================== Sidedef
+
+		internal static Rectangle GetSidedefPartSize(BaseVisualGeometrySidedef side) 
+		{
+			if(side.GeometryType == VisualGeometryType.WALL_MIDDLE_3D) 
+			{
+				Rectangle rect = new Rectangle(0, 0, Math.Max(1, (int)Math.Round(side.Sidedef.Line.Length)), 0);
+				Linedef cl = side.GetControlLinedef();
+				
+				if(cl.Front != null && cl.Front.Sector != null) 
+				{
+					// Use floor height for vavoom-type 3d floors, because FloorHeight should be > CeilHeight for this type of 3d floor.
+					if(cl.Args[1] == 0)
+					{
+						rect.Y = -cl.Front.Sector.FloorHeight;
+						rect.Height = cl.Front.Sector.FloorHeight - cl.Front.Sector.CeilHeight;
+					}
+					else
+					{
+						rect.Y = -cl.Front.Sector.CeilHeight;
+						rect.Height = cl.Front.GetMiddleHeight();
+					}
+				} 
+				else 
+				{
+					rect.Y = -side.Sidedef.Sector.CeilHeight;
+					rect.Height = side.Sidedef.GetMiddleHeight();
+				}
+
+				return rect;
+			}
+
+			return GetSidedefPartSize(side.Sidedef, side.GeometryType);
+		}
+
+		public static Rectangle GetSidedefPartSize(Sidedef side, VisualGeometryType type) 
+		{
+			Rectangle rect = new Rectangle(0, 0, Math.Max(1, (int)Math.Round(side.Line.Length)), 0);
+
+			switch(type) 
+			{
+				case VisualGeometryType.WALL_LOWER:
+					if(side.LowRequired())
+					{
+						rect.Y = -side.Other.Sector.FloorHeight;
+						rect.Height = side.GetLowHeight();
+					}
+					break;
+
+				case VisualGeometryType.WALL_UPPER:
+					if(side.HighRequired()) 
+					{
+						rect.Y = -side.Sector.CeilHeight;
+						rect.Height = side.GetHighHeight();
+					} 
+					break;
+
+				case VisualGeometryType.WALL_MIDDLE:
+					if(side.MiddleRequired())
+					{
+						rect.Y = -side.Sector.CeilHeight;
+					}
+					else if(side.Other.Sector != null) // Double-sided
+					{
+						rect.Y = -Math.Min(side.Sector.CeilHeight, side.Other.Sector.CeilHeight);
+					}
+					rect.Height = side.GetMiddleHeight();
+					break;
+
+				default:
+					throw new NotImplementedException("GetSidedefPartSize: got unsupported geometry type: '" + type + "'");
+			}
+
+			return rect;
+		}
+
+		public static List<SortedVisualSide> SortVisualSides(IEnumerable<BaseVisualGeometrySidedef> tosort)
+		{
+			List<SortedVisualSide> result = new List<SortedVisualSide>();
+
+			// Sort by texture
+			Dictionary<long, List<BaseVisualGeometrySidedef>> sidesbytexture = new Dictionary<long, List<BaseVisualGeometrySidedef>>();
+			foreach(BaseVisualGeometrySidedef side in tosort)
+			{
+				long texturelong;
+				if(side is VisualLower) texturelong = side.Sidedef.LongLowTexture;
+				else if(side is VisualUpper) texturelong = side.Sidedef.LongHighTexture;
+				else if(side is VisualMiddle3D) texturelong = side.GetControlLinedef().Front.LongMiddleTexture;
+				else texturelong = side.Sidedef.LongMiddleTexture;
+
+				if(texturelong == MapSet.EmptyLongName) continue; //not interested...
+
+				if(!sidesbytexture.ContainsKey(texturelong)) sidesbytexture.Add(texturelong, new List<BaseVisualGeometrySidedef>());
+				sidesbytexture[texturelong].Add(side);
+			}
+
+			// Connect sides
+			foreach(KeyValuePair<long, List<BaseVisualGeometrySidedef>> pair in sidesbytexture)
+			{
+				// Create strips
+				Dictionary<int, List<SortedVisualSide>> strips = ConnectSides(pair.Value);
+
+				// Calculate global bounds...
+				foreach(List<SortedVisualSide> group in strips.Values) 
+				{
+					int minx = int.MaxValue;
+					int maxx = int.MinValue;
+					int miny = int.MaxValue;
+					int maxy = int.MinValue;
+
+					foreach(SortedVisualSide side in group) 
+					{
+						if(side.Bounds.X < minx) minx = side.Bounds.X;
+						if(side.Bounds.X + side.Bounds.Width > maxx) maxx = side.Bounds.X + side.Bounds.Width;
+						if(side.Bounds.Y < miny) miny = side.Bounds.Y;
+						if(side.Bounds.Y + side.Bounds.Height > maxy) maxy = side.Bounds.Y + side.Bounds.Height;
+					}
+
+					Rectangle bounds = new Rectangle(minx, miny, maxx - minx, maxy - miny);
+
+					// Normalize Y-offset
+					int offsety = bounds.Y;
+					bounds.Y = 0;
+
+					// Apply changes
+					foreach(SortedVisualSide side in group) 
+					{
+						side.Bounds.Y -= offsety;
+						side.GlobalBounds = bounds;
+					}
+
+					// Add to result
+					result.AddRange(group);
+				}
+			}
+
+			return result;
+		}
+
+		// Connect sides, left to right and sort them into connected groups
+		// NextSides - sides connected to the right (Start) vertex, 
+		// PreviousSides - sides connected to the left (End) vertex
+		private static Dictionary<int, List<SortedVisualSide>> ConnectSides(List<BaseVisualGeometrySidedef> allsides)
+		{
+			Dictionary<int, List<SortedVisualSide>> result = new Dictionary<int, List<SortedVisualSide>>();
+			List<SortedVisualSide> sides = new List<SortedVisualSide>(allsides.Count);
+			int groupindex = 0;
+
+			foreach(BaseVisualGeometrySidedef side in allsides)
+			{
+				sides.Add(new SortedVisualSide(side));
+			}
+
+			foreach(SortedVisualSide curside in sides)
+			{
+				if(curside.GroupIndex == -1) curside.GroupIndex = groupindex++;
+				
+				// Find sides connected to the end of curside
+				foreach(SortedVisualSide nextside in sides) 
+				{
+					if(curside.Index == nextside.Index) continue;
+					if(nextside.Start == curside.End && nextside.End != curside.Start) 
+					{
+						// Add both ways
+						if(!nextside.PreviousSides.ContainsKey(curside)) 
+						{
+							nextside.PreviousSides.Add(curside, false);
+							nextside.GroupIndex = curside.GroupIndex;
+						}
+						if(!curside.NextSides.ContainsKey(nextside)) 
+						{
+							curside.NextSides.Add(nextside, false);
+							nextside.GroupIndex = curside.GroupIndex;
+						}
+					}
+				}
+
+				// Find sides connected to the start of curside
+				foreach(SortedVisualSide prevside in sides) 
+				{
+					if(curside.Index == prevside.Index) continue;
+					if(prevside.End == curside.Start && prevside.Start != curside.End) 
+					{
+						// Add both ways
+						if(!prevside.NextSides.ContainsKey(curside)) 
+						{
+							prevside.NextSides.Add(curside, false);
+							prevside.GroupIndex = curside.GroupIndex;
+						}
+						if(!curside.PreviousSides.ContainsKey(prevside)) 
+						{
+							curside.PreviousSides.Add(prevside, false);
+							prevside.GroupIndex = curside.GroupIndex;
+						}
+					}
+				}
+
+				// Add to collection
+				if(!result.ContainsKey(curside.GroupIndex)) result.Add(curside.GroupIndex, new List<SortedVisualSide>());
+				result[curside.GroupIndex].Add(curside);
+			}
+
+			// Try to find the left-most side
+			foreach(KeyValuePair<int, List<SortedVisualSide>> pair in result) 
+			{
+				SortedVisualSide start = pair.Value[0];
+				foreach(SortedVisualSide side in pair.Value) 
+				{
+					if(side.PreviousSides.Count == 0) {
+						start = side;
+						break;
+					}
+				}
+
+				// Set horizontal offsets...
+				ApplyHorizontalOffset(start, null, true, new Dictionary<int, bool>());
+			}
+
+			return result;
+		}
+
+		private static void ApplyHorizontalOffset(SortedVisualSide side, SortedVisualSide prevside, bool forward, Dictionary<int, bool> processed) 
+		{
+			// Set offset
+			if(!processed.ContainsKey(side.Index))
+			{
+				if(prevside != null)
+				{
+					if(forward)
+						side.Bounds.X = prevside.Bounds.X + (int)Math.Round(prevside.Side.Sidedef.Line.Length);
+					else
+						side.Bounds.X = prevside.Bounds.X - (int)Math.Round(side.Side.Sidedef.Line.Length);
+				}
+
+				processed.Add(side.Index, false);
+			}
+
+			// Repeat for NextSides
+			foreach(KeyValuePair<SortedVisualSide, bool> pair in side.NextSides)
+			{
+				if(!processed.ContainsKey(pair.Key.Index))
+					ApplyHorizontalOffset(pair.Key, side, true, processed);
+			}
+
+			// Repeat for PreviousSides
+			foreach(KeyValuePair<SortedVisualSide, bool> pair in side.PreviousSides) 
+			{
+				if(!processed.ContainsKey(pair.Key.Index)) 
+					ApplyHorizontalOffset(pair.Key, side, false, processed);
+			}
+		}
+
+		#endregion
+
+		#region ================== Things
+
+		internal static float GetHigherThingZ(BaseVisualMode mode, SectorData sd, VisualThing thing)
+		{
+			Vector3D pos = thing.Thing.Position;
+			float thingheight = thing.Thing.Height;
+			bool absolute = thing.Info.AbsoluteZ;
+			bool hangs = thing.Info.Hangs;
+			
+			if(absolute && hangs)
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "Sorry, can't have both 'absolute' and 'hangs' flags...");
+				return pos.z;
+			}
+
+			// Get things, which bounding boxes intersect with target thing
+			IEnumerable<Thing> intersectingthings = GetIntersectingThings(mode, thing.Thing);
+			
+			float fz = (absolute ? 0 : sd.Floor.plane.GetZ(pos));
+			float cz = sd.Ceiling.plane.GetZ(pos);
+			
+			if(hangs)
+			{
+				// Transform to floor-aligned position
+				Vector3D floorpos = new Vector3D(pos, (cz - fz) - pos.z - thingheight);
+				float highertingz = GetNextHigherThingZ(mode, intersectingthings, floorpos.z, thingheight);
+				float higherfloorz = float.MinValue;
+
+				// Do it only when there are extrafloors
+				if(sd.LightLevels.Count > 2)
+				{
+					// Unlike sd.ExtraFloors, these are sorted by height
+					foreach(SectorLevel level in sd.LightLevels)
+					{
+						if(level.type == SectorLevelType.Light || level.type == SectorLevelType.Glow) continue; // Skip lights and glows
+						float z = level.plane.GetZ(floorpos) - fz;
+						if(level.type == SectorLevelType.Ceiling) z -= thingheight;
+						if(z > floorpos.z)
+						{
+							higherfloorz = z;
+							break;
+						}
+					}
+				}
+
+				if(higherfloorz != float.MinValue && highertingz != float.MaxValue)
+				{
+					// Transform back to ceiling-aligned position
+					return cz - fz - Math.Max(Math.Min(higherfloorz, highertingz), 0) - thingheight; 
+				}
+				
+				if(higherfloorz != float.MinValue)
+				{
+					// Transform back to ceiling-aligned position
+					return Math.Max(cz - fz - higherfloorz - thingheight, 0); 
+				}
+				
+				if(highertingz != float.MaxValue)
+				{
+					// Transform back to ceiling-aligned position
+					return Math.Max(cz - fz - highertingz - thingheight, 0); 
+				}
+
+				return 0; // Align to real ceiling
+			}
+			else
+			{
+				float highertingz = GetNextHigherThingZ(mode, intersectingthings, (absolute ? pos.z - fz : pos.z), thingheight);
+				float higherfloorz = float.MinValue;
+				
+				// Do it only when there are extrafloors
+				if(sd.LightLevels.Count > 2)
+				{
+					// Unlike sd.ExtraFloors, these are sorted by height
+					foreach(SectorLevel level in sd.LightLevels)
+					{
+						if(level.type == SectorLevelType.Light || level.type == SectorLevelType.Glow) continue; // Skip lights and glows
+						float z = level.plane.GetZ(pos) - fz;
+						if(level.type == SectorLevelType.Ceiling) z -= thingheight;
+						if(z > pos.z)
+						{
+							higherfloorz = z;
+							break;
+						}
+					}
+				}
+
+				float floorz = sd.Floor.plane.GetZ(pos);
+				float ceilpos = cz - floorz - thingheight; // Ceiling-aligned relative target thing z
+				
+				if(higherfloorz != float.MinValue && highertingz != float.MaxValue) ceilpos = Math.Min(ceilpos, Math.Min(higherfloorz, highertingz));
+				if(higherfloorz != float.MinValue) ceilpos = Math.Min(ceilpos, higherfloorz);
+				if(highertingz != float.MaxValue) ceilpos = Math.Min(ceilpos, highertingz);
+				
+				return (absolute ? ceilpos + floorz : ceilpos); // Convert to absolute position if necessary
+			}
+		}
+
+		internal static float GetLowerThingZ(BaseVisualMode mode, SectorData sd, VisualThing thing) 
+		{
+			Vector3D pos = thing.Thing.Position;
+			float thingheight = thing.Thing.Height;
+			bool absolute = thing.Info.AbsoluteZ;
+			bool hangs = thing.Info.Hangs;
+			
+			if(absolute && hangs)
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "Sorry, can't have both 'absolute' and 'hangs' flags...");
+				return pos.z;
+			}
+
+			// Get things, which bounding boxes intersect with target thing
+			IEnumerable<Thing> intersectingthings = GetIntersectingThings(mode, thing.Thing);
+
+			float fz = (absolute ? 0 : sd.Floor.plane.GetZ(pos));
+			float cz = sd.Ceiling.plane.GetZ(pos);
+
+			if(hangs) 
+			{
+				// Transform to floor-aligned position
+				Vector3D floorpos = new Vector3D(pos, (cz - fz) - pos.z - thingheight);
+				float lowertingz = GetNextLowerThingZ(mode, intersectingthings, floorpos.z, thingheight);
+				float lowerfloorz = float.MaxValue;
+
+				// Do it only when there are extrafloors
+				if(sd.LightLevels.Count > 2)
+				{
+					// Unlike sd.ExtraFloors, these are sorted by height
+					for(int i = sd.LightLevels.Count - 1; i > -1; i--)
+					{
+						SectorLevel level = sd.LightLevels[i];
+						if(level.type == SectorLevelType.Light || level.type == SectorLevelType.Glow) continue; // Skip lights and glows
+						float z = level.plane.GetZ(floorpos) - fz;
+						if(level.type == SectorLevelType.Ceiling) z -= thingheight;
+						if(z < floorpos.z)
+						{
+							lowerfloorz = z;
+							break;
+						}
+					}
+				}
+
+				float floorz = cz - fz; // Floor height when counted from ceiling
+
+				if(lowerfloorz != float.MaxValue && lowertingz != float.MinValue)
+				{
+					// Transform back to ceiling-aligned position
+					return cz - fz - Math.Min(Math.Max(lowerfloorz, lowertingz), floorz) - thingheight;
+				}
+
+				if(lowerfloorz != float.MaxValue)
+				{
+					// Transform back to ceiling-aligned position
+					return cz - fz - Math.Min(lowerfloorz, floorz) - thingheight;
+				}
+
+				if(lowertingz != float.MinValue)
+				{
+					// Transform back to ceiling-aligned position
+					return cz - fz - Math.Min(lowertingz, floorz) - thingheight;
+				}
+
+				return floorz - thingheight; // Align to real floor
+			} 
+			else 
+			{
+				float lowertingz = GetNextLowerThingZ(mode, intersectingthings, (absolute ? pos.z - fz : pos.z), thingheight);
+				float lowerfloorz = float.MaxValue;
+				
+				// Do it only when there are extrafloors
+				if(sd.LightLevels.Count > 2)
+				{
+					// Unlike sd.ExtraFloors, these are sorted by height
+					for(int i = sd.LightLevels.Count - 1; i > -1; i--)
+					{
+						SectorLevel level = sd.LightLevels[i];
+						if(level.type == SectorLevelType.Light || level.type == SectorLevelType.Glow) continue; // Skip lights and glows
+						float z = level.plane.GetZ(pos) - fz;
+						if(level.type == SectorLevelType.Ceiling) z -= thingheight;
+						if(z < pos.z)
+						{
+							lowerfloorz = z;
+							break;
+						}
+					}
+				}
+
+				float floorz = sd.Floor.plane.GetZ(pos); // Floor-aligned relative target thing z
+				float floorpos = 0;
+
+				if(lowerfloorz != float.MaxValue && lowertingz != float.MinValue) floorpos = Math.Max(Math.Max(lowerfloorz, lowertingz), floorz);
+				if(lowerfloorz != float.MaxValue) floorpos = Math.Max(lowerfloorz, floorz);
+				if(lowertingz != float.MinValue) floorpos = Math.Max(lowertingz, floorz);
+
+				return (absolute ? floorpos + floorz : floorpos); // Convert to absolute position if necessary
+			}
+		}
+
+		//mxd. Gets thing z next higher to target thing z
+		private static float GetNextHigherThingZ(BaseVisualMode mode, IEnumerable<Thing> things, float thingz, float thingheight)
+		{
+			float higherthingz = float.MaxValue;
+			foreach(Thing t in things)
+			{
+				float neighbourz = GetAlignedThingZ(mode, t, thingheight);
+				if(neighbourz > thingz && neighbourz < higherthingz) higherthingz = neighbourz;
+			}
+			return higherthingz;
+		}
+
+		//mxd. Gets thing z next lower to target thing z
+		private static float GetNextLowerThingZ(BaseVisualMode mode, IEnumerable<Thing> things, float thingz, float thingheight)
+		{
+			float lowerthingz = float.MinValue;
+			foreach(Thing t in things)
+			{
+				float neighbourz = GetAlignedThingZ(mode, t, thingheight);
+				if(neighbourz < thingz && neighbourz > lowerthingz) lowerthingz = neighbourz;
+			}
+
+			return lowerthingz;
+		}
+
+		private static float GetAlignedThingZ(BaseVisualMode mode, Thing t, float targtthingheight)
+		{
+			ThingTypeInfo info = General.Map.Data.GetThingInfoEx(t.Type);
+			if(info != null)
+			{
+				if(info.AbsoluteZ && info.Hangs) return t.Position.z; // Not sure what to do here...
+				if(info.AbsoluteZ)
+				{
+					// Transform to floor-aligned position
+					SectorData nsd = mode.GetSectorData(t.Sector);
+					return t.Position.z - nsd.Floor.plane.GetZ(t.Position) + t.Height;
+				}
+
+				if(info.Hangs)
+				{
+					// Transform to floor-aligned position. Align top of target thing to the bottom of the hanging thing
+					SectorData nsd = mode.GetSectorData(t.Sector);
+					return (nsd.Ceiling.plane.GetZ(t.Position) - nsd.Floor.plane.GetZ(t.Position)) - t.Position.z - t.Height - targtthingheight;
+				}
+			}
+
+			return t.Position.z + t.Height;
+		}
+
+		private static IEnumerable<Thing> GetIntersectingThings(VisualMode mode, Thing thing)
+		{
+			// Get nearby things
+			List<Thing> neighbours = new List<Thing>();
+			RectangleF bbox = new RectangleF(thing.Position.x - thing.Size, thing.Position.y - thing.Size, thing.Size * 2, thing.Size * 2);
+			Point p1 = mode.BlockMap.GetBlockCoordinates(new Vector2D(bbox.Left, bbox.Top));
+			Point p2 = mode.BlockMap.GetBlockCoordinates(new Vector2D(bbox.Right, bbox.Bottom));
+			for(int x = p1.X; x <= p2.X; x++)
+			{
+				for(int y = p1.Y; y <= p2.Y; y++)
+				{
+					neighbours.AddRange(mode.BlockMap.GetBlock(new Point(x, y)).Things);
+				}
+			}
+
+			// Collect things intersecting with target thing
+			List<Thing> intersectingthings = new List<Thing>();
+			
+			foreach(Thing t in neighbours)
+			{
+				if(t != thing && t.Sector != null && bbox.IntersectsWith(new RectangleF(t.Position.x - t.Size, t.Position.y - t.Size, t.Size * 2, t.Size * 2)))
+					intersectingthings.Add(t);
+			}
+
+			return intersectingthings;
+		} 
+
+		#endregion
+
+		#region ================== Sectors
+
+		// This gets sectors which surround given sectors
+		internal static IEnumerable<Sector> GetSectorsAround(IEnumerable<Sector> selected)
+		{
+			HashSet<int> processedsectors = new HashSet<int>();
+			HashSet<Vertex> verts = new HashSet<Vertex>();
+			List<Sector> result = new List<Sector>();
+
+			foreach(Sector s in selected)
+			{
+				processedsectors.Add(s.Index);
+				foreach(Sidedef side in s.Sidedefs)
+				{
+					if(!verts.Contains(side.Line.Start)) verts.Add(side.Line.Start);
+					if(!verts.Contains(side.Line.End)) verts.Add(side.Line.End);
+				}
+			}
+
+			foreach(Vertex v in verts)
+			{
+				foreach(Linedef l in v.Linedefs)
+				{
+					if(l.Front != null && l.Front.Sector != null && !processedsectors.Contains(l.Front.Sector.Index))
+					{
+						result.Add(l.Front.Sector);
+						processedsectors.Add(l.Front.Sector.Index);
+					}
+					if(l.Back != null && l.Back.Sector != null && !processedsectors.Contains(l.Back.Sector.Index))
+					{
+						result.Add(l.Back.Sector);
+						processedsectors.Add(l.Back.Sector.Index);
+					}
+				}
+			}
+
+			return result;
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/General/BuilderPlug.cs b/Source/Plugins/BuilderModes/General/BuilderPlug.cs
new file mode 100644
index 0000000..49254ca
--- /dev/null
+++ b/Source/Plugins/BuilderModes/General/BuilderPlug.cs
@@ -0,0 +1,764 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.IO;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Actions;
+using CodeImp.DoomBuilder.BuilderModes.Interface;
+using CodeImp.DoomBuilder.BuilderModes.IO;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Controls;
+using CodeImp.DoomBuilder.Data;
+using CodeImp.DoomBuilder.Editing;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.GZBuilder.Geometry;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Plugins;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Types;
+using CodeImp.DoomBuilder.Windows;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	public class BuilderPlug : Plug
+	{
+		#region ================== API Declarations
+
+		[DllImport("user32.dll")]
+		internal static extern int GetWindowLong(IntPtr hWnd, int nIndex);
+		
+		#endregion
+		
+		#region ================== Constants
+
+		internal const int WS_HSCROLL = 0x100000;
+		internal const int WS_VSCROLL = 0x200000;
+		internal const int GWL_STYLE = -16;
+		
+		#endregion
+
+		#region ================== Structs (mxd)
+
+		public struct MakeDoorSettings
+		{
+			public readonly string DoorTexture;
+			public readonly string TrackTexture;
+			public readonly string CeilingTexture;
+			public readonly bool ResetOffsets;
+
+			public MakeDoorSettings(string doortexture, string tracktexture, string ceilingtexture, bool resetoffsets)
+			{
+				DoorTexture = doortexture;
+				TrackTexture = tracktexture;
+				CeilingTexture = ceilingtexture;
+				ResetOffsets = resetoffsets;
+			}
+		}
+
+		#endregion
+
+		#region ================== Variables
+
+		// Static instance
+		private static BuilderPlug me;
+		
+		// Main objects
+		private MenusForm menusform;
+		private CurveLinedefsForm curvelinedefsform;
+		private FindReplaceForm findreplaceform;
+		private ErrorCheckForm errorcheckform;
+		private PreferencesForm preferencesform;
+		
+		// Dockers
+		private UndoRedoPanel undoredopanel;
+		private Docker undoredodocker;
+		private SectorDrawingOptionsPanel drawingOverridesPanel; //mxd
+		private Docker drawingOverridesDocker; //mxd
+		
+		// Settings
+		private int showvisualthings;			// 0 = none, 1 = sprite only, 2 = sprite caged
+		private bool usegravity;
+		private int changeheightbysidedef;		// 0 = nothing, 1 = change ceiling, 2 = change floor
+		private bool editnewthing;
+		private bool editnewsector;
+		private bool additiveselect;
+		private bool autoclearselection;
+		private bool visualmodeclearselection;
+		private string copiedtexture;
+		private string copiedflat;
+		private Point copiedoffsets;
+		private VertexProperties copiedvertexprops;
+		private SectorProperties copiedsectorprops;
+		private SidedefProperties copiedsidedefprops;
+		private LinedefProperties copiedlinedefprops;
+		private ThingProperties copiedthingprops;
+		private bool viewselectionnumbers;
+		private bool viewselectioneffects; //mxd
+		private float stitchrange;
+		private float highlightrange;
+		private float highlightthingsrange;
+		private float splitlinedefsrange;
+		private bool usehighlight;
+		private bool autodragonpaste;
+		private bool autoAlignTextureOffsetsOnCreate;//mxd
+		private bool dontMoveGeometryOutsideMapBoundary;//mxd
+		private bool autoDrawOnEdit; //mxd
+		private bool marqueSelectTouching; //mxd. Select elements partially/fully inside of marque selection?
+		private bool syncSelection; //mxd. Sync selection between Visual and Classic modes.
+		private bool lockSectorTextureOffsetsWhileDragging; //mxd
+		private bool syncthingedit; //mxd
+		
+		#endregion
+
+		#region ================== Properties
+		
+		public override string Name { get { return "GZDoom Builder"; } } //mxd
+		public static BuilderPlug Me { get { return me; } }
+
+		// It is only safe to do this dynamically because we compile and distribute both
+		// the core and this plugin together with the same revision number! In third party
+		// plugins this should just contain a fixed number.
+		public override int MinimumRevision { get { return Assembly.GetExecutingAssembly().GetName().Version.Revision; } }
+		
+		public MenusForm MenusForm { get { return menusform; } }
+		public CurveLinedefsForm CurveLinedefsForm { get { return curvelinedefsform ?? (curvelinedefsform = new CurveLinedefsForm()); } }
+		public FindReplaceForm FindReplaceForm { get { return findreplaceform ?? (findreplaceform = new FindReplaceForm()); } }
+		public ErrorCheckForm ErrorCheckForm { get { return errorcheckform ?? (errorcheckform = new ErrorCheckForm()); } }
+		public PreferencesForm PreferencesForm { get { return preferencesform; } }
+
+		// Settings
+		public int ShowVisualThings { get { return showvisualthings; } set { showvisualthings = value; } }
+		public bool UseGravity { get { return usegravity; } set { usegravity = value; } }
+		public int ChangeHeightBySidedef { get { return changeheightbysidedef; } }
+		public bool EditNewThing { get { return editnewthing; } }
+		public bool EditNewSector { get { return editnewsector; } }
+		public bool AdditiveSelect { get { return additiveselect; } }
+		public bool AutoClearSelection { get { return autoclearselection; } }
+		public bool VisualModeClearSelection { get { return visualmodeclearselection; } }
+		public string CopiedTexture { get { return copiedtexture; } set { copiedtexture = value; } }
+		public string CopiedFlat { get { return copiedflat; } set { copiedflat = value; } }
+		public Point CopiedOffsets { get { return copiedoffsets; } set { copiedoffsets = value; } }
+		public VertexProperties CopiedVertexProps { get { return copiedvertexprops; } set { copiedvertexprops = value; } }
+		public SectorProperties CopiedSectorProps { get { return copiedsectorprops; } set { copiedsectorprops = value; } }
+		public SidedefProperties CopiedSidedefProps { get { return copiedsidedefprops; } set { copiedsidedefprops = value; } }
+		public LinedefProperties CopiedLinedefProps { get { return copiedlinedefprops; } set { copiedlinedefprops = value; } }
+		public ThingProperties CopiedThingProps { get { return copiedthingprops; } set { copiedthingprops = value; } }
+		public bool ViewSelectionNumbers { get { return viewselectionnumbers; } set { viewselectionnumbers = value; } }
+		public bool ViewSelectionEffects { get { return viewselectioneffects; } set { viewselectioneffects = value; } } //mxd
+		public float StitchRange { get { return stitchrange; } internal set { stitchrange = value; } }
+		public float HighlightRange { get { return highlightrange; } }
+		public float HighlightThingsRange { get { return highlightthingsrange; } }
+		public float SplitLinedefsRange { get { return splitlinedefsrange; } }
+		public bool UseHighlight
+		{ 
+			get { return usehighlight; } 
+			set
+			{ 
+				usehighlight = value;
+				General.Map.Renderer3D.ShowSelection = usehighlight;
+				General.Map.Renderer3D.ShowHighlight = usehighlight;
+			} 
+		}
+		public bool AutoDragOnPaste { get { return autodragonpaste; } set { autodragonpaste = value; } }
+		public bool AutoDrawOnEdit { get { return autoDrawOnEdit; } set { autoDrawOnEdit = value; } } //mxd
+		public bool AutoAlignTextureOffsetsOnCreate { get { return autoAlignTextureOffsetsOnCreate; } set { autoAlignTextureOffsetsOnCreate = value; } } //mxd
+		public bool DontMoveGeometryOutsideMapBoundary { get { return dontMoveGeometryOutsideMapBoundary; } set { DontMoveGeometryOutsideMapBoundary = value; } } //mxd
+		public bool MarqueSelectTouching { get { return marqueSelectTouching; } set { marqueSelectTouching = value; } } //mxd
+		public bool SyncSelection { get { return syncSelection; } set { syncSelection = value; } } //mxd
+		public bool LockSectorTextureOffsetsWhileDragging { get { return lockSectorTextureOffsetsWhileDragging; } internal set { lockSectorTextureOffsetsWhileDragging = value; } } //mxd
+		public bool SyncronizeThingEdit { get { return syncthingedit; } internal set { syncthingedit = value; } } //mxd
+
+		//mxd. "Make Door" action persistent settings
+		internal MakeDoorSettings MakeDoor;
+
+		#endregion
+
+		#region ================== Initialize / Dispose
+
+		// When plugin is initialized
+		public override void OnInitialize()
+		{
+			// Setup
+			me = this;
+
+			// Settings
+			showvisualthings = 2;
+			usegravity = false;
+			usehighlight = true;
+			LoadSettings();
+			LoadUISettings(); //mxd
+			
+			// Load menus form and register it
+			menusform = new MenusForm();
+			menusform.Register();
+			menusform.TextureOffsetLock.Checked = lockSectorTextureOffsetsWhileDragging; //mxd
+			menusform.SyncronizeThingEditButton.Checked = syncthingedit; //mxd
+			menusform.SyncronizeThingEditSectorsItem.Checked = syncthingedit; //mxd
+			menusform.SyncronizeThingEditLinedefsItem.Checked = syncthingedit; //mxd
+			
+			// Load Undo\Redo docker
+			undoredopanel = new UndoRedoPanel();
+			undoredodocker = new Docker("undoredo", "Undo / Redo", undoredopanel);
+			General.Interface.AddDocker(undoredodocker);
+
+			//mxd. Create Overrides docker
+			drawingOverridesPanel = new SectorDrawingOptionsPanel();
+			drawingOverridesDocker = new Docker("drawingoverrides", "Draw Settings", drawingOverridesPanel);
+
+			//mxd
+			General.Actions.BindMethods(this);
+		}
+		
+		// Disposer
+		public override void Dispose()
+		{
+			// Not already disposed?
+			if(!IsDisposed)
+			{
+				// Clean up
+				General.Interface.RemoveDocker(undoredodocker);
+
+				undoredopanel.Dispose();
+				drawingOverridesPanel.Dispose(); //mxd
+				menusform.Unregister();
+				menusform.Dispose();
+				menusform = null;
+
+				//mxd. These are created on demand, so they may be nulls.
+				if(curvelinedefsform != null)
+				{
+					curvelinedefsform.Dispose();
+					curvelinedefsform = null;
+				}
+				if(findreplaceform != null)
+				{
+					findreplaceform.Dispose();
+					findreplaceform = null;
+				}
+				if(errorcheckform != null)
+				{
+					errorcheckform.Dispose();
+					errorcheckform = null;
+				}
+				
+				// Done
+				me = null;
+				base.Dispose();
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This loads the plugin settings
+		private void LoadSettings()
+		{
+			changeheightbysidedef = General.Settings.ReadPluginSetting("changeheightbysidedef", 0);
+			editnewthing = General.Settings.ReadPluginSetting("editnewthing", true);
+			editnewsector = General.Settings.ReadPluginSetting("editnewsector", false);
+			additiveselect = General.Settings.ReadPluginSetting("additiveselect", false);
+			autoclearselection = General.Settings.ReadPluginSetting("autoclearselection", false);
+			visualmodeclearselection = General.Settings.ReadPluginSetting("visualmodeclearselection", false);
+			stitchrange = General.Settings.ReadPluginSetting("stitchrange", 20);
+			highlightrange = General.Settings.ReadPluginSetting("highlightrange", 20);
+			highlightthingsrange = General.Settings.ReadPluginSetting("highlightthingsrange", 10);
+			splitlinedefsrange = General.Settings.ReadPluginSetting("splitlinedefsrange", 10);
+			autodragonpaste = General.Settings.ReadPluginSetting("autodragonpaste", false);
+			autoDrawOnEdit = General.Settings.ReadPluginSetting("autodrawonedit", true); //mxd
+			autoAlignTextureOffsetsOnCreate = General.Settings.ReadPluginSetting("autoaligntextureoffsetsoncreate", false); //mxd
+			dontMoveGeometryOutsideMapBoundary = General.Settings.ReadPluginSetting("dontmovegeometryoutsidemapboundary", false); //mxd
+			syncSelection = General.Settings.ReadPluginSetting("syncselection", false); //mxd
+		}
+
+		//mxd. Load settings, which can be changed via UI
+		private void LoadUISettings()
+		{
+			lockSectorTextureOffsetsWhileDragging = General.Settings.ReadPluginSetting("locktextureoffsets", false); //mxd
+			viewselectionnumbers = General.Settings.ReadPluginSetting("viewselectionnumbers", true);
+			viewselectioneffects = General.Settings.ReadPluginSetting("viewselectioneffects", true); //mxd
+			syncthingedit = General.Settings.ReadPluginSetting("syncthingedit", true); //mxd
+		}
+
+		//mxd. Save settings, which can be changed via UI
+		private void SaveUISettings() 
+		{
+			General.Settings.WritePluginSetting("locktextureoffsets", lockSectorTextureOffsetsWhileDragging);
+			General.Settings.WritePluginSetting("viewselectionnumbers", viewselectionnumbers);
+			General.Settings.WritePluginSetting("viewselectioneffects", viewselectioneffects);
+			General.Settings.WritePluginSetting("syncthingedit", syncthingedit);
+		}
+
+		//mxd. These should be reset when changing maps
+		private void ResetCopyProperties()
+		{
+			copiedvertexprops = null;
+			copiedthingprops = null;
+			copiedlinedefprops = null;
+			copiedsidedefprops = null;
+			copiedsectorprops = null;
+		}
+
+		#endregion
+
+		#region ================== Events
+
+		// When floor surface geometry is created for classic modes
+		public override void OnSectorFloorSurfaceUpdate(Sector s, ref FlatVertex[] vertices)
+		{
+			ImageData img = General.Map.Data.GetFlatImage(s.LongFloorTexture);
+			if((img != null) && img.IsImageLoaded)
+			{
+				//mxd. Merged from GZDoomEditing plugin
+				if(General.Map.UDMF) 
+				{
+					// Fetch ZDoom fields
+					Vector2D offset = new Vector2D(s.Fields.GetValue("xpanningfloor", 0.0f),
+												   s.Fields.GetValue("ypanningfloor", 0.0f));
+					Vector2D scale = new Vector2D(s.Fields.GetValue("xscalefloor", 1.0f),
+												  s.Fields.GetValue("yscalefloor", 1.0f));
+					float rotate = s.Fields.GetValue("rotationfloor", 0.0f);
+					int color, light;
+					bool absolute;
+
+					//mxd. Apply GLDEFS override?
+					if(General.Map.Data.GlowingFlats.ContainsKey(s.LongFloorTexture) 
+						&& (General.Map.Data.GlowingFlats[s.LongFloorTexture].Fullbright || General.Map.Data.GlowingFlats[s.LongFloorTexture].Fullblack))
+					{
+						color = -1;
+						light = (General.Map.Data.GlowingFlats[s.LongFloorTexture].Fullbright ? 255 : 0);
+						absolute = true;
+					}
+					else
+					{
+						color = s.Fields.GetValue("lightcolor", -1);
+						light = s.Fields.GetValue("lightfloor", 0);
+						absolute = s.Fields.GetValue("lightfloorabsolute", false);
+					}
+
+					// Setup the vertices with the given settings
+					SetupSurfaceVertices(vertices, s, img, offset, scale, rotate, color, light, absolute);
+				} 
+				else 
+				{
+					// Make scalars
+					float sw = 1.0f / img.ScaledWidth;
+					float sh = 1.0f / img.ScaledHeight;
+
+					// Make proper texture coordinates
+					for(int i = 0; i < vertices.Length; i++) 
+					{
+						vertices[i].u = vertices[i].u * sw;
+						vertices[i].v = -vertices[i].v * sh;
+					}
+				}
+			}
+		}
+
+		// When ceiling surface geometry is created for classic modes
+		public override void OnSectorCeilingSurfaceUpdate(Sector s, ref FlatVertex[] vertices)
+		{
+			ImageData img = General.Map.Data.GetFlatImage(s.LongCeilTexture);
+			if((img != null) && img.IsImageLoaded)
+			{
+				//mxd. Merged from GZDoomEditing plugin
+				if(General.Map.UDMF) 
+				{
+					// Fetch ZDoom fields
+					Vector2D offset = new Vector2D(s.Fields.GetValue("xpanningceiling", 0.0f),
+												   s.Fields.GetValue("ypanningceiling", 0.0f));
+					Vector2D scale = new Vector2D(s.Fields.GetValue("xscaleceiling", 1.0f),
+												  s.Fields.GetValue("yscaleceiling", 1.0f));
+					float rotate = s.Fields.GetValue("rotationceiling", 0.0f);
+					int color, light;
+					bool absolute;
+
+					//mxd. Apply GLDEFS override?
+					if(General.Map.Data.GlowingFlats.ContainsKey(s.LongCeilTexture)
+						&& (General.Map.Data.GlowingFlats[s.LongCeilTexture].Fullbright || General.Map.Data.GlowingFlats[s.LongCeilTexture].Fullblack))
+					{
+						color = -1;
+						light = (General.Map.Data.GlowingFlats[s.LongCeilTexture].Fullbright ? 255 : 0);
+						absolute = true;
+					} 
+					else 
+					{
+						color = s.Fields.GetValue("lightcolor", -1);
+						light = s.Fields.GetValue("lightceiling", 0);
+						absolute = s.Fields.GetValue("lightceilingabsolute", false);
+					}
+
+					// Setup the vertices with the given settings
+					SetupSurfaceVertices(vertices, s, img, offset, scale, rotate, color, light, absolute);
+				} 
+				else 
+				{
+					// Make scalars
+					float sw = 1.0f / img.ScaledWidth;
+					float sh = 1.0f / img.ScaledHeight;
+
+					// Make proper texture coordinates
+					for(int i = 0; i < vertices.Length; i++) 
+					{
+						vertices[i].u = vertices[i].u * sw;
+						vertices[i].v = -vertices[i].v * sh;
+					}
+				}
+			}
+		}
+
+		// When the editing mode changes
+		public override bool OnModeChange(EditMode oldmode, EditMode newmode)
+		{
+			// Show the correct menu for the new mode
+			menusform.ShowEditingModeMenu(newmode);
+			
+			return base.OnModeChange(oldmode, newmode);
+		}
+
+		// When the Preferences dialog is shown
+		public override void OnShowPreferences(PreferencesController controller)
+		{
+			base.OnShowPreferences(controller);
+
+			// Load preferences
+			preferencesform = new PreferencesForm();
+			preferencesform.Setup(controller);
+		}
+
+		// When the Preferences dialog is closed
+		public override void OnClosePreferences(PreferencesController controller)
+		{
+			base.OnClosePreferences(controller);
+
+			// Apply settings that could have been changed
+			LoadSettings();
+			
+			// Unload preferences
+			preferencesform.Dispose();
+			preferencesform = null;
+		}
+		
+		// New map created
+		public override void OnMapNewEnd()
+		{
+			base.OnMapNewEnd();
+			undoredopanel.SetBeginDescription("New Map");
+			undoredopanel.UpdateList();
+
+			//mxd
+			General.Interface.AddDocker(drawingOverridesDocker);
+			drawingOverridesPanel.Setup();
+			MakeDoor = new MakeDoorSettings(General.Map.Config.MakeDoorDoor, General.Map.Config.MakeDoorTrack, General.Map.Config.MakeDoorCeiling, MakeDoor.ResetOffsets);
+			ResetCopyProperties();
+		}
+		
+		// Map opened
+		public override void OnMapOpenEnd()
+		{
+			base.OnMapOpenEnd();
+			undoredopanel.SetBeginDescription("Opened Map");
+			undoredopanel.UpdateList();
+
+			//mxd
+			General.Interface.AddDocker(drawingOverridesDocker);
+			drawingOverridesPanel.Setup();
+			General.Map.Renderer2D.UpdateExtraFloorFlag();
+			MakeDoor = new MakeDoorSettings(General.Map.Config.MakeDoorDoor, General.Map.Config.MakeDoorTrack, General.Map.Config.MakeDoorCeiling, MakeDoor.ResetOffsets);
+			ResetCopyProperties();
+		}
+
+		//mxd
+		public override void OnMapCloseBegin()
+		{
+			drawingOverridesPanel.Terminate();
+			General.Interface.RemoveDocker(drawingOverridesDocker);
+		}
+		
+		// Map closed
+		public override void OnMapCloseEnd()
+		{
+			base.OnMapCloseEnd();
+			undoredopanel.UpdateList();
+
+			//mxd. Save settings
+			SaveUISettings();
+		}
+		
+		// Redo performed
+		public override void OnRedoEnd()
+		{
+			base.OnRedoEnd();
+			undoredopanel.UpdateList();
+		}
+		
+		// Undo performed
+		public override void OnUndoEnd()
+		{
+			base.OnUndoEnd();
+			undoredopanel.UpdateList();
+		}
+		
+		// Undo created
+		public override void OnUndoCreated()
+		{
+			base.OnUndoCreated();
+			undoredopanel.UpdateList();
+		}
+		
+		// Undo withdrawn
+		public override void OnUndoWithdrawn()
+		{
+			base.OnUndoWithdrawn();
+			undoredopanel.UpdateList();
+		}
+		
+		#endregion
+		
+		#region ================== Tools
+
+		//mxd. merged from GZDoomEditing plugin
+		// This applies the given values on the vertices
+		private static void SetupSurfaceVertices(FlatVertex[] vertices, Sector s, ImageData img, Vector2D offset,
+										  Vector2D scale, float rotate, int color, int light, bool absolute) 
+		{
+			// Prepare for math!
+			rotate = Angle2D.DegToRad(rotate);
+			Vector2D texscale = new Vector2D(1.0f / img.ScaledWidth, 1.0f / img.ScaledHeight);
+			if(!absolute) light = s.Brightness + light;
+			PixelColor lightcolor = PixelColor.FromInt(color);
+			PixelColor brightness = PixelColor.FromInt(General.Map.Renderer2D.CalculateBrightness(light));
+			PixelColor finalcolor = PixelColor.Modulate(lightcolor, brightness);
+			color = finalcolor.WithAlpha(255).ToInt();
+
+			// Do the math for all vertices
+			for(int i = 0; i < vertices.Length; i++) 
+			{
+				Vector2D pos = new Vector2D(vertices[i].x, vertices[i].y);
+				pos = pos.GetRotated(rotate);
+				pos.y = -pos.y;
+				pos = (pos + offset) * scale * texscale;
+				vertices[i].u = pos.x;
+				vertices[i].v = pos.y;
+				vertices[i].c = color;
+			}
+		}
+		
+		// This finds all class types that inherits from the given type
+		public Type[] FindClasses(Type t)
+		{
+			List<Type> found = new List<Type>();
+
+			// Get all exported types
+			Type[] types = Assembly.GetExecutingAssembly().GetTypes();
+			foreach(Type it in types)
+			{
+				// Compare types
+				if(t.IsAssignableFrom(it)) found.Add(it);
+			}
+
+			// Return list
+			return found.ToArray();
+		}
+		
+		// This renders the associated sectors/linedefs with the indication color
+		public static void PlotAssociations(IRenderer2D renderer, Association asso, List<Line3D> eventlines) 
+		{
+			// Tag must be above zero
+			if(General.GetByIndex(asso.Tags, 0) < 1) return;
+			
+			// Sectors?
+			switch(asso.Type)
+			{
+				case UniversalType.SectorTag: {
+					foreach(Sector s in General.Map.Map.Sectors)
+					{
+						if(!asso.Tags.Overlaps(s.Tags))continue;
+						renderer.PlotSector(s, General.Colors.Indication);
+						
+						if(!General.Settings.GZShowEventLines) continue;
+						Vector2D end = (s.Labels.Count > 0 ? s.Labels[0].position : new Vector2D(s.BBox.X + s.BBox.Width / 2, s.BBox.Y + s.BBox.Height / 2));
+						eventlines.Add(new Line3D(asso.Center, end)); //mxd
+					}
+					break;
+				}
+
+				case UniversalType.LinedefTag: {
+					foreach(Linedef l in General.Map.Map.Linedefs) 
+					{
+						if(!asso.Tags.Overlaps(l.Tags)) continue;
+						renderer.PlotLinedef(l, General.Colors.Indication);
+						if(General.Settings.GZShowEventLines) eventlines.Add(new Line3D(asso.Center, l.GetCenterPoint())); //mxd
+					}
+					break;
+				}
+			}
+		}
+
+		// This renders the associated things with the indication color
+		public static void RenderAssociations(IRenderer2D renderer, Association asso, List<Line3D> eventlines)
+		{
+			// Tag must be above zero
+			if(General.GetByIndex(asso.Tags, 0) < 1) return;
+
+			// Things?
+			switch(asso.Type)
+			{
+				case UniversalType.ThingTag:
+					foreach(Thing t in General.Map.Map.Things)
+					{
+						if(!asso.Tags.Contains(t.Tag)) continue;
+						renderer.RenderThing(t, General.Colors.Indication, Presentation.THINGS_ALPHA);
+						if(General.Settings.GZShowEventLines) eventlines.Add(new Line3D(asso.Center, t.Position)); //mxd
+					}
+					break;
+
+				case UniversalType.SectorTag:
+					foreach(Sector s in General.Map.Map.Sectors) 
+					{
+						if(!asso.Tags.Overlaps(s.Tags)) continue;
+						int highlightedColor = General.Colors.Highlight.WithAlpha(128).ToInt();
+						FlatVertex[] verts = new FlatVertex[s.FlatVertices.Length];
+						s.FlatVertices.CopyTo(verts, 0);
+						for(int i = 0; i < verts.Length; i++) verts[i].c = highlightedColor;
+						renderer.RenderGeometry(verts, null, true);
+					}
+					break;
+			}
+		}
+
+		// This renders the associated sectors/linedefs with the indication color
+		public static void PlotReverseAssociations(IRenderer2D renderer, Association asso, List<Line3D> eventlines)
+		{
+			// Tag must be above zero
+			if(General.GetByIndex(asso.Tags, 0) < 1) return;
+			
+			// Doom style referencing to sectors?
+			if(General.Map.Config.LineTagIndicatesSectors && (asso.Type == UniversalType.SectorTag))
+			{
+				// Linedefs
+				foreach(Linedef l in General.Map.Map.Linedefs)
+				{
+					// Any action on this line?
+					if(l.Action <= 0 || !asso.Tags.Overlaps(l.Tags)) continue;
+					renderer.PlotLinedef(l, General.Colors.Indication);
+					if(General.Settings.GZShowEventLines) eventlines.Add(new Line3D(l.GetCenterPoint(), asso.Center)); //mxd
+				}
+			}
+
+			// Linedefs
+			foreach(Linedef l in General.Map.Map.Linedefs)
+			{
+				// Known action on this line?
+				if((l.Action > 0) && General.Map.Config.LinedefActions.ContainsKey(l.Action))
+				{
+					LinedefActionInfo action = General.Map.Config.LinedefActions[l.Action];
+					if( ((action.Args[0].Type == (int)asso.Type) && (asso.Tags.Contains(l.Args[0]))) ||
+						((action.Args[1].Type == (int)asso.Type) && (asso.Tags.Contains(l.Args[1]))) ||
+						((action.Args[2].Type == (int)asso.Type) && (asso.Tags.Contains(l.Args[2]))) ||
+						((action.Args[3].Type == (int)asso.Type) && (asso.Tags.Contains(l.Args[3]))) ||
+						((action.Args[4].Type == (int)asso.Type) && (asso.Tags.Contains(l.Args[4]))))
+					{
+						renderer.PlotLinedef(l, General.Colors.Indication);
+						if(General.Settings.GZShowEventLines) eventlines.Add(new Line3D(l.GetCenterPoint(), asso.Center)); //mxd
+					}
+				}
+			}
+		}
+
+		// This renders the associated things with the indication color
+		public static void RenderReverseAssociations(IRenderer2D renderer, Association asso, List<Line3D> eventlines)
+		{
+			// Tag must be above zero
+			if(General.GetByIndex(asso.Tags, 0) < 1) return;
+
+			// Things
+			foreach(Thing t in General.Map.Map.Things)
+			{
+				// Known action on this thing?
+				if((t.Action > 0) && General.Map.Config.LinedefActions.ContainsKey(t.Action))
+				{
+					LinedefActionInfo action = General.Map.Config.LinedefActions[t.Action];
+					if(  ((action.Args[0].Type == (int)asso.Type) && (asso.Tags.Contains(t.Args[0]))) ||
+						 ((action.Args[1].Type == (int)asso.Type) && (asso.Tags.Contains(t.Args[1]))) ||
+						 ((action.Args[2].Type == (int)asso.Type) && (asso.Tags.Contains(t.Args[2]))) ||
+						 ((action.Args[3].Type == (int)asso.Type) && (asso.Tags.Contains(t.Args[3]))) ||
+						 ((action.Args[4].Type == (int)asso.Type) && (asso.Tags.Contains(t.Args[4]))))
+					{
+						renderer.RenderThing(t, General.Colors.Indication, Presentation.THINGS_ALPHA);
+						if(General.Settings.GZShowEventLines) eventlines.Add(new Line3D(t.Position, asso.Center)); //mxd
+					}
+				}
+				//mxd. Thing action on this thing?
+				else if(t.Action == 0)
+				{
+					ThingTypeInfo ti = General.Map.Data.GetThingInfoEx(t.Type);
+					if(ti != null)
+					{
+						if(  ((ti.Args[0].Type == (int)asso.Type) && (asso.Tags.Contains(t.Args[0]))) ||
+						     ((ti.Args[1].Type == (int)asso.Type) && (asso.Tags.Contains(t.Args[1]))) ||
+						     ((ti.Args[2].Type == (int)asso.Type) && (asso.Tags.Contains(t.Args[2]))) ||
+						     ((ti.Args[3].Type == (int)asso.Type) && (asso.Tags.Contains(t.Args[3]))) ||
+						     ((ti.Args[4].Type == (int)asso.Type) && (asso.Tags.Contains(t.Args[4]))))
+						{
+							renderer.RenderThing(t, General.Colors.Indication, Presentation.THINGS_ALPHA);
+							if(General.Settings.GZShowEventLines) eventlines.Add(new Line3D(t.Position, asso.Center));
+						}
+					}
+				}
+			}
+		}
+
+		#endregion
+
+		#region ================== Actions (mxd)
+
+		[BeginAction("exporttoobj")]
+		private void ExportToObj() 
+		{
+			// Convert geometry selection to sectors
+			General.Map.Map.ConvertSelection(SelectionType.Sectors);
+			
+			//get sectors
+			ICollection<Sector> sectors = General.Map.Map.SelectedSectorsCount == 0 ? General.Map.Map.Sectors : General.Map.Map.GetSelectedSectors(true);
+			if(sectors.Count == 0) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "OBJ export failed. Map has no sectors!");
+				return;
+			}
+
+			//show settings form
+			WavefrontSettingsForm form = new WavefrontSettingsForm(General.Map.Map.SelectedSectorsCount == 0 ? -1 : sectors.Count);
+			if(form.ShowDialog() == DialogResult.OK) 
+			{
+				WavefrontExportSettings data = new WavefrontExportSettings(Path.GetFileNameWithoutExtension(form.FilePath), Path.GetDirectoryName(form.FilePath), form.ObjScale, form.UseGZDoomScale, form.ExportTextures);
+				WavefrontExporter e = new WavefrontExporter();
+				e.Export(sectors, data);
+			}
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/General/CopyStructures.cs b/Source/Plugins/BuilderModes/General/CopyStructures.cs
new file mode 100644
index 0000000..df8f438
--- /dev/null
+++ b/Source/Plugins/BuilderModes/General/CopyStructures.cs
@@ -0,0 +1,994 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Map;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	//mxd
+	[AttributeUsage(AttributeTargets.Field)]
+	public class FieldDescription : Attribute
+	{
+		private bool doom = true;
+		private bool hexen = true;
+		private bool udmf = true;
+		private string description = "Unnamed field";
+
+		public bool DOOM { get { return doom; } set { doom = value; } }
+		public bool HEXEN { get { return hexen; } set { hexen = value; } }
+		public bool UDMF { get { return udmf; } set { udmf = value; } }
+		public string Description { get { return description; } set { description = value; } }
+
+		public bool SupportsCurrentMapFormat { get { return General.Map != null && (General.Map.DOOM && doom || General.Map.HEXEN && hexen || General.Map.UDMF && udmf); } }
+	}
+
+	public abstract class MapElementPropertiesCopySettings
+	{
+		protected MapElementPropertiesCopySettings()
+		{
+			// Set all properties supported by currect map format to true
+			FieldInfo[] props = this.GetType().GetFields(BindingFlags.Public | BindingFlags.Instance);
+			foreach(FieldInfo prop in props)
+			{
+				foreach(Attribute attr in Attribute.GetCustomAttributes(prop))
+				{
+					if(attr.GetType() == typeof(FieldDescription))
+					{
+						FieldDescription fd = (FieldDescription)attr;
+						prop.SetValue(this, fd.SupportsCurrentMapFormat);
+					}
+				}
+			}
+		}
+	}
+
+	//mxd
+	public abstract class MapElementProperties
+	{
+		private readonly UniFields fields;   // Only custom (e.g. not UI-managed) fields here
+		private readonly UniFields uifields; // Only UI-managed fields here
+		private readonly MapElementType elementtype;
+
+		protected MapElementProperties(UniFields other, MapElementType type)
+		{
+			// Should we bother?
+			if(!General.Map.UDMF) return;
+			
+			// Copy source fields except the ones controlled by the UI
+			fields = new UniFields();
+			uifields = new UniFields();
+			elementtype = type;
+			foreach(KeyValuePair<string, UniValue> group in other)
+			{
+				if(General.Map.FormatInterface.UIFields[elementtype].ContainsKey(group.Key))
+					uifields.Add(group.Key, new UniValue(group.Value));
+				else
+					fields.Add(group.Key, new UniValue(group.Value));
+			}
+		}
+
+		protected void Apply(UniFields other, string key)
+		{
+			if(uifields.ContainsKey(key)) other[key] = new UniValue(uifields[key]);
+			else if(other.ContainsKey(key)) other.Remove(key);
+		}
+
+		protected void Apply(UniFields other, string key1, string key2)
+		{
+			Apply(other, key1);
+			Apply(other, key2);
+		}
+
+		protected void ApplyCustomFields(UniFields other)
+		{
+			// Remove custom fields
+			string[] keys = new string[other.Keys.Count];
+			other.Keys.CopyTo(keys, 0);
+			foreach(string key in keys)
+			{
+				if(!General.Map.FormatInterface.UIFields[elementtype].ContainsKey(key)) other.Remove(key);
+			}
+
+			// Replace with stored custom fields
+			foreach(KeyValuePair<string, UniValue> group in fields)
+			{
+				other.Add(group.Key, new UniValue(group.Value));
+			}
+		}
+	}
+
+	#region ================== Vertex
+
+	//mxd
+	public class VertexPropertiesCopySettings : MapElementPropertiesCopySettings
+	{
+		[FieldDescription(Description = "Vertex Floor Height", DOOM = false, HEXEN = false)]
+		public bool ZFloor = true;
+		
+		[FieldDescription(Description = "Vertex Ceiling Height", DOOM = false, HEXEN = false)]
+		public bool ZCeiling = true;
+		
+		[FieldDescription(Description = "Custom Fields", DOOM = false, HEXEN = false)]
+		public bool Fields = true;
+	}
+	
+	// Vertex
+	public class VertexProperties : MapElementProperties
+	{
+		private static VertexPropertiesCopySettings defaultsettings = new VertexPropertiesCopySettings();
+		public static VertexPropertiesCopySettings CopySettings = new VertexPropertiesCopySettings();
+		
+		private readonly float zceiling; //mxd
+		private readonly float zfloor; //mxd
+
+		public VertexProperties(Vertex v) : base(v.Fields, MapElementType.VERTEX)
+		{
+			zceiling = v.ZCeiling; //mxd
+			zfloor = v.ZFloor; //mxd
+		}
+
+		//mxd. Applies coped properties
+		public void Apply(Vertex v, bool usecopysettings)
+		{
+			Apply(v, (usecopysettings ? CopySettings : defaultsettings));
+		}
+
+		//mxd. Applies coped properties using selected settings
+		public void Apply(Vertex v, VertexPropertiesCopySettings settings)
+		{
+			if(settings.ZCeiling) v.ZCeiling = zceiling;
+			if(settings.ZFloor) v.ZFloor = zfloor;
+			if(settings.Fields)
+			{
+				v.Fields.BeforeFieldsChange();
+				ApplyCustomFields(v.Fields);
+			}
+		}
+	}
+
+	#endregion
+
+	#region ================== Sector
+
+	//mxd
+	public class SectorPropertiesCopySettings : MapElementPropertiesCopySettings
+	{
+		[FieldDescription(Description = "Floor Height")]
+		public bool FloorHeight = true;
+		
+		[FieldDescription(Description = "Ceiling Height")]
+		public bool CeilingHeight = true;
+		
+		[FieldDescription(Description = "Floor Texture")]
+		public bool FloorTexture = true;
+		
+		[FieldDescription(Description = "Ceiling Texture")]
+		public bool CeilingTexture = true;
+
+		[FieldDescription(Description = "Floor Texture Offset", DOOM = false, HEXEN = false)]
+		public bool FloorTextureOffset = true;
+
+		[FieldDescription(Description = "Ceiling Texture Offset", DOOM = false, HEXEN = false)]
+		public bool CeilingTextureOffset = true;
+
+		[FieldDescription(Description = "Floor Texture Scale", DOOM = false, HEXEN = false)]
+		public bool FloorTextureScale = true;
+
+		[FieldDescription(Description = "Ceiling Texture Scale", DOOM = false, HEXEN = false)]
+		public bool CeilingTextureScale = true;
+
+		[FieldDescription(Description = "Floor Texture Rotation", DOOM = false, HEXEN = false)]
+		public bool FloorTextureRotation = true;
+
+		[FieldDescription(Description = "Ceiling Texture Rotation", DOOM = false, HEXEN = false)]
+		public bool CeilingTextureRotation = true;
+
+		[FieldDescription(Description = "Floor Alpha", DOOM = false, HEXEN = false)]
+		public bool FloorAlpha = true;
+
+		[FieldDescription(Description = "Ceiling Alpha", DOOM = false, HEXEN = false)]
+		public bool CeilingAlpha = true;
+
+		[FieldDescription(Description = "Sector Brightness")]
+		public bool Brightness = true;
+
+		[FieldDescription(Description = "Floor Brightness", DOOM = false, HEXEN = false)]
+		public bool FloorBrightness = true;
+
+		[FieldDescription(Description = "Ceiling Brightness", DOOM = false, HEXEN = false)]
+		public bool CeilingBrightness = true;
+
+		[FieldDescription(Description = "Floor Render Style", DOOM = false, HEXEN = false)]
+		public bool FloorRenderStyle = true;
+
+		[FieldDescription(Description = "Ceiling Render Style", DOOM = false, HEXEN = false)]
+		public bool CeilingRenderStyle = true;
+		
+		[FieldDescription(Description = "Floor Slope", DOOM = false, HEXEN = false)]
+		public bool FloorSlope = true;
+
+		[FieldDescription(Description = "Ceiling Slope", DOOM = false, HEXEN = false)]
+		public bool CeilingSlope = true;
+		
+		[FieldDescription(Description = "Tags")]
+		public bool Tag = true;
+		
+		[FieldDescription(Description = "Effect")]
+		public bool Special = true;
+		
+		[FieldDescription(Description = "Flags", DOOM = false, HEXEN = false)]
+		public bool Flags = true;
+
+		[FieldDescription(Description = "Light Color", DOOM = false, HEXEN = false)]
+		public bool LightColor = true;
+
+		[FieldDescription(Description = "Fade Color", DOOM = false, HEXEN = false)]
+		public bool FadeColor = true;
+
+		[FieldDescription(Description = "Desaturation", DOOM = false, HEXEN = false)]
+		public bool Desaturation = true;
+
+		[FieldDescription(Description = "Sound Sequence", DOOM = false, HEXEN = false)]
+		public bool SoundSequence = true;
+
+		[FieldDescription(Description = "Gravity", DOOM = false, HEXEN = false)]
+		public bool Gravity = true;
+		
+		[FieldDescription(Description = "Custom Fields", DOOM = false, HEXEN = false)]
+		public bool Fields = true;
+
+		[FieldDescription(Description = "Comment", DOOM = false, HEXEN = false)]
+		public bool Comment = true;
+	}
+
+	// Sector
+	public class SectorProperties : MapElementProperties
+	{
+		//mxd
+		private static SectorPropertiesCopySettings defaultsettings = new SectorPropertiesCopySettings();
+		public static SectorPropertiesCopySettings CopySettings = new SectorPropertiesCopySettings();
+		
+		private readonly int floorheight;
+		private readonly int ceilheight;
+		private readonly string floortexture;
+		private readonly string ceilingtexture;
+		private readonly int effect;
+		private readonly int brightness;
+		private readonly float ceilslopeoffset;
+		private readonly float floorslopeoffset;
+		private readonly Vector3D ceilslope;
+		private readonly Vector3D floorslope;
+		private readonly List<int> tags;
+		private readonly Dictionary<string, bool> flags; //mxd
+		
+		public SectorProperties(Sector s) : base(s.Fields, MapElementType.SECTOR)
+		{
+			floorheight = s.FloorHeight;
+			ceilheight = s.CeilHeight;
+			floortexture = s.FloorTexture;
+			ceilingtexture = s.CeilTexture;
+			brightness = s.Brightness;
+			effect = s.Effect;
+			ceilslopeoffset = s.CeilSlopeOffset;
+			floorslopeoffset = s.FloorSlopeOffset;
+			ceilslope = s.CeilSlope;
+			floorslope = s.FloorSlope;
+			tags = new List<int>(s.Tags); //mxd
+			flags = s.GetFlags(); //mxd
+		}
+		
+		//mxd. Applies coped properties
+		public void Apply(Sector s, bool usecopysettings)
+		{
+			Apply(s, (usecopysettings ? CopySettings : defaultsettings));
+		}
+
+		//mxd. Applies coped properties using selected settings
+		public void Apply(Sector s, SectorPropertiesCopySettings settings)
+		{
+			if(settings.FloorHeight) s.FloorHeight = floorheight;
+			if(settings.CeilingHeight) s.CeilHeight = ceilheight;
+			if(settings.FloorTexture) s.SetFloorTexture(floortexture);
+			if(settings.CeilingTexture) s.SetCeilTexture(ceilingtexture);
+			if(settings.Brightness) s.Brightness = brightness;
+			if(settings.Tag) s.Tags = new List<int>(tags); //mxd
+			if(settings.Special) s.Effect = effect;
+			if(settings.CeilingSlope) 
+			{
+				s.CeilSlopeOffset = ceilslopeoffset;
+				s.CeilSlope = ceilslope;
+			}
+			if(settings.FloorSlope) 
+			{
+				s.FloorSlopeOffset = floorslopeoffset;
+				s.FloorSlope = floorslope;
+			}
+			if(settings.Flags) 
+			{
+				s.ClearFlags(); //mxd
+				foreach(KeyValuePair<string, bool> f in flags) //mxd
+					s.SetFlag(f.Key, f.Value);
+			}
+
+			// Should we bother?
+			if(!General.Map.UDMF) return;
+
+			// Apply fields
+			s.Fields.BeforeFieldsChange();
+
+			// Apply UI fields
+			if(settings.FloorTextureOffset)     Apply(s.Fields, "xpanningfloor", "ypanningfloor");
+			if(settings.CeilingTextureOffset)   Apply(s.Fields, "xpanningceiling", "ypanningceiling");
+			if(settings.FloorTextureScale)      Apply(s.Fields, "xscalefloor", "yscalefloor");
+			if(settings.CeilingTextureScale)    Apply(s.Fields, "xscaleceiling", "yscaleceiling");
+			if(settings.FloorTextureRotation)   Apply(s.Fields, "rotationfloor");
+			if(settings.CeilingTextureRotation) Apply(s.Fields, "rotationceiling");
+			if(settings.FloorBrightness)        Apply(s.Fields, "lightfloor", "lightfloorabsolute");
+			if(settings.CeilingBrightness)      Apply(s.Fields, "lightceiling", "lightceilingabsolute");
+			if(settings.FloorAlpha)				Apply(s.Fields, "alphafloor");
+			if(settings.CeilingAlpha)			Apply(s.Fields, "alphaceiling");
+			if(settings.FloorRenderStyle)		Apply(s.Fields, "renderstylefloor");
+			if(settings.CeilingRenderStyle)		Apply(s.Fields, "renderstyleceiling");
+			if(settings.Gravity)				Apply(s.Fields, "gravity");
+			if(settings.LightColor)				Apply(s.Fields, "lightcolor");
+			if(settings.FadeColor)				Apply(s.Fields, "fadecolor");
+			if(settings.Desaturation)			Apply(s.Fields, "desaturation");
+			if(settings.SoundSequence)			Apply(s.Fields, "soundsequence");
+			if(settings.Comment)				Apply(s.Fields, "comment");
+
+			// Apply custom fields
+			if(settings.Fields) ApplyCustomFields(s.Fields);
+		}
+	}
+
+	#endregion
+
+	#region ================== Sidedef
+
+	//mxd
+	public class SidedefPropertiesCopySettings : MapElementPropertiesCopySettings
+	{
+		[FieldDescription(Description = "Upper Texture")]
+		public bool UpperTexture = true;
+		
+		[FieldDescription(Description = "Middle Texture")]
+		public bool MiddleTexture = true;
+		
+		[FieldDescription(Description = "Lower Texture")]
+		public bool LowerTexture = true;
+		
+		[FieldDescription(Description = "Texture Offset X")]
+		public bool OffsetX = true;
+		
+		[FieldDescription(Description = "Texture Offset Y")]
+		public bool OffsetY = true;
+
+		[FieldDescription(Description = "Upper Texture Offset", DOOM = false, HEXEN = false)]
+		public bool UpperTextureOffset = true;
+
+		[FieldDescription(Description = "Middle Texture Offset", DOOM = false, HEXEN = false)]
+		public bool MiddleTextureOffset = true;
+
+		[FieldDescription(Description = "Lower Texture Offset", DOOM = false, HEXEN = false)]
+		public bool LowerTextureOffset = true;
+
+		[FieldDescription(Description = "Upper Texture Scale", DOOM = false, HEXEN = false)]
+		public bool UpperTextureScale = true;
+
+		[FieldDescription(Description = "Middle Texture Scale", DOOM = false, HEXEN = false)]
+		public bool MiddleTextureScale = true;
+
+		[FieldDescription(Description = "Lower Texture Scale", DOOM = false, HEXEN = false)]
+		public bool LowerTextureScale = true;
+
+		[FieldDescription(Description = "Brightness", DOOM = false, HEXEN = false)]
+		public bool Brightness = true;
+		
+		[FieldDescription(Description = "Flags", DOOM = false, HEXEN = false)]
+		public bool Flags = true;
+		
+		[FieldDescription(Description = "Custom Fields", DOOM = false, HEXEN = false)]
+		public bool Fields = true;
+	}
+
+	// Sidedef
+	public class SidedefProperties : MapElementProperties
+	{
+		//mxd
+		internal static SidedefPropertiesCopySettings DefaultSettings = new SidedefPropertiesCopySettings();
+		public static SidedefPropertiesCopySettings CopySettings = new SidedefPropertiesCopySettings();
+
+		private readonly string hightexture;
+		private readonly string middletexture;
+		private readonly string lowtexture;
+		private readonly int offsetx;
+		private readonly int offsety;
+		private readonly Dictionary<string, bool> flags; //mxd
+
+		public SidedefProperties(Sidedef s) : base(s.Fields, MapElementType.SIDEDEF)
+		{
+			hightexture = s.HighTexture;
+			middletexture = s.MiddleTexture;
+			lowtexture = s.LowTexture;
+			offsetx = s.OffsetX;
+			offsety = s.OffsetY;
+			flags = s.GetFlags(); //mxd
+		}
+
+		//mxd. Applies coped properties with all settings enabled
+		public void Apply(Sidedef s, bool usecopysettings)
+		{
+			Apply(s, (usecopysettings ? CopySettings : DefaultSettings));
+		}
+
+		//mxd. Applies selected settings
+		public void Apply(Sidedef s, SidedefPropertiesCopySettings settings)
+		{
+			if(settings.UpperTexture) s.SetTextureHigh(hightexture);
+			if(settings.MiddleTexture) s.SetTextureMid(middletexture);
+			if(settings.LowerTexture) s.SetTextureLow(lowtexture);
+			if(settings.OffsetX) s.OffsetX = offsetx;
+			if(settings.OffsetY) s.OffsetY = offsety;
+			if(settings.Flags)
+			{
+				s.ClearFlags(); //mxd
+				foreach(KeyValuePair<string, bool> f in flags) //mxd
+					s.SetFlag(f.Key, f.Value);
+			}
+
+			// Should we bother?
+			if(!General.Map.UDMF) return;
+
+			// Apply fields
+			s.Fields.BeforeFieldsChange();
+
+			// Apply UI fields
+			if(settings.UpperTextureOffset)  Apply(s.Fields, "offsetx_top", "offsety_top");
+			if(settings.MiddleTextureOffset) Apply(s.Fields, "offsetx_mid", "offsety_mid");
+			if(settings.LowerTextureOffset)  Apply(s.Fields, "offsetx_bottom", "offsety_bottom");
+			if(settings.UpperTextureScale)   Apply(s.Fields, "scalex_top", "scaley_top");
+			if(settings.MiddleTextureScale)  Apply(s.Fields, "scalex_mid", "scaley_mid");
+			if(settings.LowerTextureScale)   Apply(s.Fields, "scalex_bottom", "scaley_bottom");
+			if(settings.Brightness)			 Apply(s.Fields, "light", "lightabsolute");
+
+			// Apply custom fields
+			if(settings.Fields) ApplyCustomFields(s.Fields);
+		}
+	}
+
+	#endregion
+
+	#region ================== Linedef
+
+	//mxd
+	public class LinedefPropertiesCopySettings : MapElementPropertiesCopySettings
+	{
+		[FieldDescription(Description = "Action")]
+		public bool Action = true;
+		
+		[FieldDescription(Description = "Action Arguments", DOOM = false)]
+		public bool Arguments = true;
+		
+		[FieldDescription(Description = "Activation", DOOM = false, UDMF = false)]
+		public bool Activation = true;
+		
+		[FieldDescription(Description = "Tags", HEXEN = false)]
+		public bool Tag = true;
+		
+		[FieldDescription(Description = "Flags")]
+		public bool Flags = true;
+
+		[FieldDescription(Description = "Alpha", DOOM = false, HEXEN = false)]
+		public bool Alpha = true;
+
+		[FieldDescription(Description = "Render Style", DOOM = false, HEXEN = false)]
+		public bool RenderStyle = true;
+
+		[FieldDescription(Description = "Lock Number", DOOM = false, HEXEN = false)]
+		public bool LockNumber = true;
+		
+		[FieldDescription(Description = "Custom Fields", DOOM = false, HEXEN = false)]
+		public bool Fields = true;
+
+		[FieldDescription(Description = "Comment", DOOM = false, HEXEN = false)]
+		public bool Comment = true;
+	}
+
+	// Linedef
+	public class LinedefProperties : MapElementProperties
+	{
+		//mxd
+		private static LinedefPropertiesCopySettings defaultsettings = new LinedefPropertiesCopySettings();
+		public static LinedefPropertiesCopySettings CopySettings = new LinedefPropertiesCopySettings();
+		
+		private readonly SidedefProperties front;
+		private readonly SidedefProperties back;
+		private readonly Dictionary<string, bool> flags;
+		private readonly int action;
+		private readonly int activate;
+		private readonly List<int> tags;
+		private readonly int[] args;
+
+		public LinedefProperties(Linedef l) : base(l.Fields, MapElementType.LINEDEF)
+		{
+			front = (l.Front != null ? new SidedefProperties(l.Front) : null);
+			back = (l.Back != null ? new SidedefProperties(l.Back) : null);
+
+			flags = l.GetFlags();
+			action = l.Action;
+			activate = l.Activate;
+			tags = new List<int>(l.Tags); //mxd
+			args = (int[])(l.Args.Clone());
+		}
+
+		//mxd. Applies coped properties with all settings enabled
+		public void Apply(Linedef l, bool usecopysettings) { Apply(l, usecopysettings, true); }
+		public void Apply(Linedef l, bool usecopysettings, bool applytosidedefs)
+		{
+			if(usecopysettings)
+				Apply(l, CopySettings, (applytosidedefs ? SidedefProperties.CopySettings : null));
+			else
+				Apply(l, defaultsettings, (applytosidedefs ? SidedefProperties.DefaultSettings : null));
+		}
+
+		//mxd. Applies selected linededf and sidedef settings
+		public void Apply(Linedef l, LinedefPropertiesCopySettings settings, SidedefPropertiesCopySettings sidesettings)
+		{
+			if(sidesettings != null)
+			{
+				if((front != null) && (l.Front != null)) front.Apply(l.Front, sidesettings);
+				if((back != null) && (l.Back != null)) back.Apply(l.Back, sidesettings);
+			}
+			if(settings.Flags) 
+			{
+				l.ClearFlags();
+				foreach(KeyValuePair<string, bool> f in flags)
+					l.SetFlag(f.Key, f.Value);
+			}
+			if(settings.Activation) l.Activate = activate;
+			if(settings.Tag) l.Tags = new List<int>(tags); //mxd
+			if(settings.Action) l.Action = action;
+			if(settings.Arguments)
+			{
+				for(int i = 0; i < l.Args.Length; i++)
+					l.Args[i] = args[i];
+			}
+
+			// Should we bother?
+			if(!General.Map.UDMF) return;
+
+			// Apply fields
+			l.Fields.BeforeFieldsChange();
+
+			// Apply string arguments
+			if(settings.Arguments)
+			{
+				Apply(l.Fields, "arg0str");
+
+				//TODO: re-enable when UI part is ready
+				//Apply(l.Fields, "arg1str");
+				//Apply(l.Fields, "arg2str");
+				//Apply(l.Fields, "arg3str");
+				//Apply(l.Fields, "arg4str");
+			}
+
+			// Apply UI fields
+			if(settings.Alpha)		 Apply(l.Fields, "alpha");
+			if(settings.RenderStyle) Apply(l.Fields, "renderstyle");
+			if(settings.LockNumber)  Apply(l.Fields, "locknumber");
+			if(settings.Comment)	 Apply(l.Fields, "comment");
+
+			// Apply custom fields
+			if(settings.Fields) ApplyCustomFields(l.Fields);
+		}
+	}
+
+	#endregion
+
+	#region ================== Thing
+
+	//mxd
+	public class ThingPropertiesCopySettings : MapElementPropertiesCopySettings
+	{
+		[FieldDescription(Description = "Type")]
+		public bool Type = true;
+		
+		[FieldDescription(Description = "Angle")]
+		public bool Angle = true;
+
+		[FieldDescription(Description = "Z Height", DOOM = false)]
+		public bool ZHeight = true;
+		
+		[FieldDescription(Description = "Pitch", DOOM = false, HEXEN = false)]
+		public bool Pitch = true;
+		
+		[FieldDescription(Description = "Roll", DOOM = false, HEXEN = false)]
+		public bool Roll = true;
+		
+		[FieldDescription(Description = "Scale", DOOM = false, HEXEN = false)]
+		public bool Scale = true;
+		
+		[FieldDescription(Description = "Action", DOOM = false)]
+		public bool Action = true;
+		
+		[FieldDescription(Description = "Action Arguments", DOOM = false)]
+		public bool Arguments = true;
+		
+		[FieldDescription(Description = "Tag", DOOM = false)]
+		public bool Tag = true;
+		
+		[FieldDescription(Description = "Flags")]
+		public bool Flags = true;
+
+		[FieldDescription(Description = "Conversation ID", DOOM = false, HEXEN = false)]
+		public bool Conversation = true;
+
+		[FieldDescription(Description = "Gravity", DOOM = false, HEXEN = false)]
+		public bool Gravity = true;
+
+		[FieldDescription(Description = "Health Multiplier", DOOM = false, HEXEN = false)]
+		public bool Health = true;
+
+		[FieldDescription(Description = "Score", DOOM = false, HEXEN = false)]
+		public bool Score = true;
+
+		[FieldDescription(Description = "Alpha", DOOM = false, HEXEN = false)]
+		public bool Alpha = true;
+
+		[FieldDescription(Description = "Fill Color", DOOM = false, HEXEN = false)]
+		public bool FillColor = true;
+
+		[FieldDescription(Description = "Render Style", DOOM = false, HEXEN = false)]
+		public bool RenderStyle = true;
+		
+		[FieldDescription(Description = "Custom Fields", DOOM = false, HEXEN = false)]
+		public bool Fields = true;
+
+		[FieldDescription(Description = "Comment", DOOM = false, HEXEN = false)]
+		public bool Comment = true;
+	}
+	
+	// Thing
+	public class ThingProperties : MapElementProperties
+	{
+		//mxd
+		private static readonly ThingPropertiesCopySettings defaultsettings = new ThingPropertiesCopySettings();
+		public static readonly ThingPropertiesCopySettings CopySettings = new ThingPropertiesCopySettings();
+		
+		private readonly int type;
+		private readonly float angle;
+		private readonly float zheight; //mxd
+		private readonly int pitch; //mxd
+		private readonly int roll; //mxd
+		private readonly float scalex; //mxd
+		private readonly float scaley; //mxd
+		private readonly Dictionary<string, bool> flags;
+		private readonly int tag;
+		private readonly int action;
+		private readonly int[] args;
+		
+		public ThingProperties(Thing t) : base(t.Fields, MapElementType.THING)
+		{
+			type = t.Type;
+			angle = t.Angle;
+			zheight = t.Position.z;
+			pitch = t.Pitch;
+			roll = t.Roll;
+			scalex = t.ScaleX;
+			scaley = t.ScaleY;
+			flags = t.GetFlags();
+			tag = t.Tag;
+			action = t.Action;
+			args = (int[])(t.Args.Clone());
+		}
+
+		//mxd. Applies coped properties with all settings enabled
+		public void Apply(Thing t, bool usecopysettings)
+		{
+			Apply(t, (usecopysettings ? CopySettings : defaultsettings));
+		}
+		
+		//mxd. Applies selected settings
+		public void Apply(Thing t, ThingPropertiesCopySettings settings)
+		{
+			if(settings.Type) t.Type = type;
+			if(settings.Angle) t.Rotate(angle);
+			if(settings.ZHeight) t.Move(t.Position.x, t.Position.y, zheight);
+			if(settings.Pitch) t.SetPitch(pitch);
+			if(settings.Roll) t.SetRoll(roll);
+			if(settings.Scale) t.SetScale(scalex, scaley);
+			if(settings.Flags) 
+			{
+				t.ClearFlags();
+				foreach(KeyValuePair<string, bool> f in flags)
+					t.SetFlag(f.Key, f.Value);
+			}
+			if(settings.Tag) t.Tag = tag;
+			if(settings.Action) t.Action = action;
+			if(settings.Arguments)
+			{
+				for(int i = 0; i < t.Args.Length; i++)
+					t.Args[i] = args[i];
+			}
+
+			// Should we bother?
+			if(!General.Map.UDMF) return;
+
+			// Apply fields
+			t.Fields.BeforeFieldsChange();
+
+			// Apply string arguments
+			if(settings.Arguments)
+			{
+				Apply(t.Fields, "arg0str");
+
+				//TODO: re-enable when UI part is ready
+				//Apply(t.Fields, "arg1str");
+				//Apply(t.Fields, "arg2str");
+				//Apply(t.Fields, "arg3str");
+				//Apply(t.Fields, "arg4str");
+			}
+
+			// Apply UI fields
+			if(settings.Conversation) Apply(t.Fields, "conversation");
+			if(settings.Gravity)	  Apply(t.Fields, "gravity");
+			if(settings.Health)		  Apply(t.Fields, "health");
+			if(settings.FillColor)	  Apply(t.Fields, "fillcolor");
+			if(settings.Alpha)		  Apply(t.Fields, "alpha");
+			if(settings.Score)		  Apply(t.Fields, "score");
+			if(settings.RenderStyle)  Apply(t.Fields, "renderstyle");
+			if(settings.Comment)	  Apply(t.Fields, "comment");
+
+			// Apply custom fields
+			if(settings.Fields) ApplyCustomFields(t.Fields);
+		}
+	}
+
+	#endregion
+
+	#region ================== Properties Comparer
+
+	//mxd. A class, which checks whether source and target map element's properties match
+	public static class PropertiesComparer
+	{
+
+		#region Vertex
+
+		public static bool PropertiesMatch(VertexPropertiesCopySettings flags, Vertex source, Vertex target) 
+		{
+			if(!General.Map.UDMF) return true;
+			
+			// Built-in properties
+			if(flags.ZCeiling && source.ZCeiling != target.ZCeiling) return false;
+			if(flags.ZFloor && source.ZFloor != target.ZFloor) return false;
+
+			// Custom fields
+			return !flags.Fields || UniFields.CustomFieldsMatch(source.Fields, target.Fields);
+		}
+
+		#endregion
+
+		#region Sector
+
+		public static bool PropertiesMatch(SectorPropertiesCopySettings flags, Sector source, Sector target) 
+		{
+			// Built-in properties
+			if(flags.FloorHeight && source.FloorHeight != target.FloorHeight) return false;
+			if(flags.CeilingHeight && source.CeilHeight != target.CeilHeight) return false;
+			if(flags.FloorTexture && source.FloorTexture != target.FloorTexture) return false;
+			if(flags.CeilingTexture && source.CeilTexture != target.CeilTexture) return false;
+			if(flags.Brightness && source.Brightness != target.Brightness) return false;
+			if(flags.Tag && !TagsMatch(source.Tags, target.Tags)) return false;
+			if(flags.Special && source.Effect != target.Effect) return false;
+			if(flags.Flags && !FlagsMatch(source.GetFlags(), target.GetFlags())) return false;
+			if(!General.Map.UDMF) return true;
+
+			// UI fields
+			if(flags.FloorTextureOffset && !UniFields.ValuesMatch("xpanningfloor", "ypanningfloor", source, target)) return false;
+			if(flags.CeilingTextureOffset && !UniFields.ValuesMatch("xpanningceiling", "ypanningceiling", source, target)) return false;
+			if(flags.FloorTextureScale && !UniFields.ValuesMatch("xscalefloor", "yscalefloor", source, target)) return false;
+			if(flags.CeilingTextureScale && !UniFields.ValuesMatch("xscaleceiling", "yscaleceiling", source, target)) return false;
+			if(flags.FloorTextureRotation && !UniFields.ValuesMatch("rotationfloor", source, target)) return false;
+			if(flags.CeilingTextureRotation && !UniFields.ValuesMatch("rotationceiling", source, target)) return false;
+			if(flags.FloorBrightness && !UniFields.ValuesMatch("lightfloor", "lightfloorabsolute", source, target)) return false;
+			if(flags.CeilingBrightness && !UniFields.ValuesMatch("lightceiling", "lightceilingabsolute", source, target)) return false;
+			if(flags.FloorAlpha && !UniFields.ValuesMatch("alphafloor", source, target)) return false;
+			if(flags.CeilingAlpha && !UniFields.ValuesMatch("alphaceiling", source, target)) return false;
+			if(flags.FloorRenderStyle && !UniFields.ValuesMatch("renderstylefloor", source, target)) return false;
+			if(flags.CeilingRenderStyle && !UniFields.ValuesMatch("renderstyleceiling", source, target)) return false;
+			if(flags.Gravity && !UniFields.ValuesMatch("gravity", source, target)) return false;
+			if(flags.LightColor && !UniFields.ValuesMatch("lightcolor", source, target)) return false;
+			if(flags.FadeColor && !UniFields.ValuesMatch("fadecolor", source, target)) return false;
+			if(flags.Desaturation && !UniFields.ValuesMatch("desaturation", source, target)) return false;
+			if(flags.SoundSequence && !UniFields.ValuesMatch("soundsequence", source, target)) return false;
+			if(flags.Comment && !UniFields.ValuesMatch("comment", source, target)) return false;
+
+			// Custom fields
+			return !flags.Fields || UniFields.CustomFieldsMatch(source.Fields, target.Fields);
+		}
+
+		#endregion
+
+		#region Linedef
+
+		public static bool PropertiesMatch(LinedefPropertiesCopySettings linedefflags, SidedefPropertiesCopySettings sideflags, Linedef source, Linedef target) 
+		{
+			// Built-in properties
+			if(linedefflags.Action && source.Action != target.Action) return false;
+			if(linedefflags.Activation && source.Activate != target.Activate) return false;
+			if(linedefflags.Tag && !TagsMatch(source.Tags, target.Tags)) return false; //mxd
+			if(linedefflags.Arguments) 
+			{
+				// Classic args
+				for(int i = 0; i < source.Args.Length; i++)
+					if(source.Args[i] != target.Args[i]) return false;
+
+				// String args
+				if(General.Map.UDMF)
+				{
+					if(!UniFields.ValuesMatch("arg0str", source, target)) return false;
+					if(!UniFields.ValuesMatch("arg1str", source, target)) return false;
+					if(!UniFields.ValuesMatch("arg2str", source, target)) return false;
+					if(!UniFields.ValuesMatch("arg3str", source, target)) return false;
+					if(!UniFields.ValuesMatch("arg4str", source, target)) return false;
+				}
+			}
+			if(linedefflags.Flags && !FlagsMatch(source.GetFlags(), target.GetFlags())) return false;
+
+			if(General.Map.UDMF)
+			{
+				// UI fields
+				if(linedefflags.Alpha && !UniFields.ValuesMatch("alpha", source, target)) return false;
+				if(linedefflags.RenderStyle && !UniFields.ValuesMatch("renderstyle", source, target)) return false;
+				if(linedefflags.LockNumber && !UniFields.ValuesMatch("locknumber", source, target)) return false;
+				if(linedefflags.Comment && !UniFields.ValuesMatch("comment", source, target)) return false;
+
+				// Custom fields
+				if(linedefflags.Fields && !UniFields.CustomFieldsMatch(source.Fields, target.Fields)) return false;
+			}
+
+			// Sidedef properties
+			return (source.Front != null && target.Front != null && PropertiesMatch(sideflags, source.Front, target.Front)) ||
+				   (source.Front != null && target.Back != null && PropertiesMatch(sideflags, source.Front, target.Back)) ||
+				   (source.Back != null && target.Front != null && PropertiesMatch(sideflags, source.Back, target.Front)) ||
+				   (source.Back != null && target.Back != null && PropertiesMatch(sideflags, source.Back, target.Back));
+		}
+
+		#endregion
+
+		#region Sidedef
+
+		public static bool PropertiesMatch(SidedefPropertiesCopySettings flags, Sidedef source, Sidedef target) 
+		{
+			// Built-in properties
+			if(flags.OffsetX && source.OffsetX != target.OffsetX) return false;
+			if(flags.OffsetY && source.OffsetY != target.OffsetY) return false;
+			if(flags.UpperTexture && source.HighTexture != target.HighTexture) return false;
+			if(flags.MiddleTexture && source.MiddleTexture != target.MiddleTexture) return false;
+			if(flags.LowerTexture && source.LowTexture != target.LowTexture) return false;
+			if(!General.Map.UDMF) return true;
+
+			// UDMF-specific properties
+			if(flags.Flags && !FlagsMatch(source.GetFlags(), target.GetFlags())) return false;
+
+			// UI fields
+			if(flags.UpperTextureScale && !UniFields.ValuesMatch("scalex_top", "scaley_top", source, target)) return false;
+			if(flags.MiddleTextureScale && !UniFields.ValuesMatch("scalex_mid", "scaley_mid", source, target)) return false;
+			if(flags.LowerTextureScale && !UniFields.ValuesMatch("scalex_bottom", "scaley_bottom", source, target)) return false;
+			if(flags.UpperTextureOffset && !UniFields.ValuesMatch("offsetx_top", "offsety_top", source, target)) return false;
+			if(flags.MiddleTextureOffset && !UniFields.ValuesMatch("offsetx_mid", "offsety_mid", source, target)) return false;
+			if(flags.LowerTextureOffset && !UniFields.ValuesMatch("offsetx_bottom", "offsety_bottom", source, target)) return false;
+			if(flags.Brightness && !UniFields.ValuesMatch("light", "lightabsolute", source, target)) return false;
+
+			// Custom fields
+			return !flags.Fields || UniFields.CustomFieldsMatch(source.Fields, target.Fields);
+		}
+
+		#endregion
+
+		#region Thing
+
+		public static bool PropertiesMatch(ThingPropertiesCopySettings flags, Thing source, Thing target) 
+		{
+			// Built-in properties
+			if(flags.Type && source.Type != target.Type) return false;
+			if(flags.Angle && source.AngleDoom != target.AngleDoom) return false;
+			if(flags.Action && source.Action != target.Action) return false;
+			if(flags.Arguments) 
+			{
+				// Classic args
+				for(int i = 0; i < source.Args.Length; i++)
+					if(source.Args[i] != target.Args[i]) return false;
+
+				// String args
+				if(General.Map.UDMF)
+				{
+					if(!UniFields.ValuesMatch("arg0str", source, target)) return false;
+					if(!UniFields.ValuesMatch("arg1str", source, target)) return false;
+					if(!UniFields.ValuesMatch("arg2str", source, target)) return false;
+					if(!UniFields.ValuesMatch("arg3str", source, target)) return false;
+					if(!UniFields.ValuesMatch("arg4str", source, target)) return false;
+				}
+			}
+			if(flags.Tag && source.Tag != target.Tag) return false;
+			if(flags.Flags && !FlagsMatch(source.GetFlags(), target.GetFlags())) return false;
+			if(!General.Map.UDMF) return true;
+
+			// UDMF-specific properties
+			if(flags.Pitch && source.Pitch != target.Pitch) return false;
+			if(flags.Roll && source.Roll != target.Roll) return false;
+			if(flags.Scale && (source.ScaleX != target.ScaleX) || (source.ScaleY != target.ScaleY)) return false;
+
+			// UI fields
+			if(flags.Conversation && !UniFields.ValuesMatch("conversation", source, target)) return false;
+			if(flags.Gravity && !UniFields.ValuesMatch("gravity", source, target)) return false;
+			if(flags.Health && !UniFields.ValuesMatch("health", source, target)) return false;
+			if(flags.FillColor && !UniFields.ValuesMatch("fillcolor", source, target)) return false;
+			if(flags.Alpha && !UniFields.ValuesMatch("alpha", source, target)) return false;
+			if(flags.Score && !UniFields.ValuesMatch("score", source, target)) return false;
+			if(flags.RenderStyle && !UniFields.ValuesMatch("renderstyle", source, target)) return false;
+			if(flags.Comment && !UniFields.ValuesMatch("comment", source, target)) return false;
+
+			// Custom fields
+			return !flags.Fields || UniFields.CustomFieldsMatch(source.Fields, target.Fields);
+		}
+
+		#endregion
+
+		private static bool FlagsMatch(Dictionary<string, bool> flags1, Dictionary<string, bool> flags2) 
+		{
+			if(flags1.Count != flags2.Count) return false;
+			foreach(KeyValuePair<string, bool> group in flags1)
+				if(!flags2.ContainsKey(group.Key) || flags2[group.Key] != flags1[group.Key]) return false;
+			return true;
+		}
+
+		//mxd
+		private static bool TagsMatch(List<int> tags1, List<int> tags2)
+		{
+			if(!General.Map.UDMF) return tags1[0] == tags2[0];
+			
+			if(tags1.Count != tags2.Count) return false;
+			Dictionary<int, int> count = new Dictionary<int, int>();
+
+			foreach(int s in tags1)
+			{
+				if(count.ContainsKey(s)) count[s]++;
+				else count.Add(s, 1);
+			}
+
+			foreach(int s in tags2)
+			{
+				if(count.ContainsKey(s)) count[s]--;
+				else return false;
+			}
+
+			return count.Values.All(c => c == 0);
+		}
+	}
+
+	#endregion
+
+}
diff --git a/Source/Plugins/BuilderModes/General/HintLabel.cs b/Source/Plugins/BuilderModes/General/HintLabel.cs
new file mode 100644
index 0000000..965dcc4
--- /dev/null
+++ b/Source/Plugins/BuilderModes/General/HintLabel.cs
@@ -0,0 +1,57 @@
+using System;
+using System.Drawing;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Rendering;
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	public class HintLabel : LineLengthLabel
+	{
+		public string Text { get { return label.Text; } set { label.Text = value; } }
+
+		public HintLabel() : base(false, false) { }
+		public HintLabel(PixelColor textcolor) : base(false, false)
+		{
+			label.Color = textcolor;
+		}
+
+		// We don't want any changes here
+		protected override void UpdateText() { }
+
+		public override void Move(Vector2D start, Vector2D end)
+		{
+			// Store before making any adjustments to start/end...
+			this.start = start;
+			this.end = end;
+
+			// Check if start/end point is on screen...
+			Vector2D lt = General.Map.Renderer2D.DisplayToMap(new Vector2D(0.0f, General.Interface.Display.Size.Height));
+			Vector2D rb = General.Map.Renderer2D.DisplayToMap(new Vector2D(General.Interface.Display.Size.Width, 0.0f));
+			RectangleF viewport = new RectangleF(lt.x, lt.y, rb.x - lt.x, rb.y - lt.y);
+			bool startvisible = viewport.Contains(start.x, start.y);
+			bool endvisible = viewport.Contains(end.x, end.y);
+
+			// Get visile area
+			RectangleF labelrect;
+			if(!startvisible || !endvisible)
+			{
+				float minx = Math.Min(start.x, end.x);
+				float maxx = Math.Max(start.x, end.x);
+				float miny = Math.Min(start.y, end.y);
+				float maxy = Math.Max(start.y, end.y);
+				RectangleF labelarea = new RectangleF(minx, miny, maxx - minx, maxy - miny);
+				labelarea.Intersect(viewport);
+
+				labelrect = new RectangleF(labelarea.X + labelarea.Width * 0.5f, labelarea.Y + labelarea.Height * 0.5f, 0f, 0f);
+			}
+			else
+			{
+				Vector2D delta = end - start;
+				labelrect = new RectangleF(start.x + delta.x * 0.5f, start.y + delta.y * 0.5f, 0f, 0f);
+			}
+
+			// Apply changes
+			label.Rectangle = labelrect;
+		}
+	}
+}
diff --git a/Source/Plugins/BuilderModes/General/LineLengthLabel.cs b/Source/Plugins/BuilderModes/General/LineLengthLabel.cs
new file mode 100644
index 0000000..df071ef
--- /dev/null
+++ b/Source/Plugins/BuilderModes/General/LineLengthLabel.cs
@@ -0,0 +1,211 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Geometry;
+using System.Drawing;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	public class LineLengthLabel : IDisposable
+	{
+		#region ================== Constants
+
+		private const int TEXT_CAPACITY = 15;
+		private const float TEXT_SCALE = 14f;
+		private const string VALUE_FORMAT = "0";
+
+		#endregion
+
+		#region ================== Variables
+
+		protected TextLabel label;
+		protected Vector2D start;
+		protected Vector2D end;
+
+		//mxd. Display options
+		private bool showangle;
+		private bool offsetposition;
+		
+		#endregion
+
+		#region ================== Properties
+
+		public TextLabel TextLabel { get { return label; } }
+
+		//mxd. Display options
+		public bool ShowAngle { get { return showangle; } set { showangle = value; UpdateText(); } }
+		public bool OffsetPosition { get { return offsetposition; } set { offsetposition = value; Move(start, end); } }
+		public PixelColor TextColor { get { return label.Color; } set { label.Color = value; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public LineLengthLabel()
+		{
+			this.showangle = true;
+			this.offsetposition = true;
+			
+			// Initialize
+			Initialize();
+		}
+
+		//mxd. Constructor
+		public LineLengthLabel(bool showangle, bool offsetposition)
+		{
+			this.showangle = showangle;
+			this.offsetposition = offsetposition;
+
+			// Initialize
+			Initialize();
+		}
+
+		// Constructor
+		public LineLengthLabel(Vector2D start, Vector2D end)
+		{
+			this.showangle = true; //mxd
+			this.offsetposition = true; //mxd
+			
+			// Initialize
+			Initialize();
+			Move(start, end);
+		}
+
+		//mxd. Constructor
+		public LineLengthLabel(Vector2D start, Vector2D end, bool showangle, bool offsetposition)
+		{
+			this.showangle = showangle;
+			this.offsetposition = offsetposition;
+			
+			// Initialize
+			Initialize();
+			Move(start, end);
+		}
+
+		// Initialization
+		private void Initialize()
+		{
+			label = new TextLabel(TEXT_CAPACITY);
+			label.AlignX = TextAlignmentX.Center;
+			label.AlignY = TextAlignmentY.Middle;
+			label.Color = General.Colors.Highlight;
+			label.Backcolor = General.Colors.Background;
+			label.Scale = TEXT_SCALE;
+			label.TransformCoords = true;
+		}
+		
+		// Disposer
+		public void Dispose()
+		{
+			label.Dispose();
+		}
+
+		#endregion
+		
+		#region ================== Methods
+
+		// This updates the text
+		protected virtual void UpdateText()
+		{
+			Vector2D delta = end - start;
+
+			// Update label text
+			float length = delta.GetLength();
+			if(showangle)
+			{
+				int displayangle = General.ClampAngle((int)Math.Round(Angle2D.RadToDeg(delta.GetAngle())));
+				label.Text = "l:" + length.ToString(VALUE_FORMAT) + "; a:" + displayangle;
+			}
+			else
+			{
+				label.Text = length.ToString(VALUE_FORMAT);
+			}
+		}
+
+		//mxd. This moves the label so it stays on screen and offsets it vertically so it doesn't overlap the line
+		public virtual void Move(Vector2D start, Vector2D end)
+		{
+			// Store before making any adjustments to start/end...
+			this.start = start;
+			this.end = end;
+
+			// Update text label
+			UpdateText();
+
+			// Check if start/end point is on screen...
+			Vector2D lt = General.Map.Renderer2D.DisplayToMap(new Vector2D(0.0f, General.Interface.Display.Size.Height));
+			Vector2D rb = General.Map.Renderer2D.DisplayToMap(new Vector2D(General.Interface.Display.Size.Width, 0.0f));
+			RectangleF viewport = new RectangleF(lt.x, lt.y, rb.x - lt.x, rb.y - lt.y);
+			bool startvisible = viewport.Contains(start.x, start.y);
+			bool endvisible = viewport.Contains(end.x, end.y);
+
+			// Do this only when one point is visible, an the other isn't 
+			if((!startvisible && endvisible) || (startvisible && !endvisible))
+			{
+				Line2D drawnline = new Line2D(start, end);
+				Line2D[] viewportsides = new[] {
+					new Line2D(lt, rb.x, lt.y), // top
+					new Line2D(lt.x, rb.y, rb.x, rb.y), // bottom
+					new Line2D(lt, lt.x, rb.y), // left
+					new Line2D(rb.x, lt.y, rb.x, rb.y), // right
+				};
+
+				foreach(Line2D side in viewportsides)
+				{
+					// Modify the start point so it stays on screen
+					float u;
+					if(!startvisible && side.GetIntersection(drawnline, out u))
+					{
+						start = drawnline.GetCoordinatesAt(u);
+						break;
+					}
+
+					// Modify the end point so it stays on screen
+					if(!endvisible && side.GetIntersection(drawnline, out u))
+					{
+						end = drawnline.GetCoordinatesAt(u);
+						break;
+					}
+				}
+			}
+
+			// Update label position
+			if(offsetposition)
+			{
+				Vector2D perpendicular = (end - start).GetPerpendicular();
+				float angle = perpendicular.GetAngle();
+				SizeF textsize = General.Map.GetTextSize(label.Text, label.Scale);
+				float offset = textsize.Width * Math.Abs((float)Math.Sin(angle)) + textsize.Height * Math.Abs((float)Math.Cos(angle));
+				perpendicular = perpendicular.GetNormal().GetScaled(offset / 2.0f / General.Map.Renderer2D.Scale);
+				start += perpendicular;
+				end += perpendicular;
+			}
+
+			// Apply changes
+			Vector2D delta = end - start;
+			label.Rectangle = new RectangleF(start.x + delta.x * 0.5f, start.y + delta.y * 0.5f, 0f, 0f);
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/General/UndoGroup.cs b/Source/Plugins/BuilderModes/General/UndoGroup.cs
new file mode 100644
index 0000000..39d2e00
--- /dev/null
+++ b/Source/Plugins/BuilderModes/General/UndoGroup.cs
@@ -0,0 +1,39 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	public static class UndoGroup
+	{
+		public const int None = 0;
+		public const int FloorHeightChange = 1;
+		public const int CeilingHeightChange = 2;
+		public const int SectorBrightnessChange = 3;
+		public const int TextureOffsetChange = 4;
+		public const int TextureRotationChange = 5; //mxd
+		public const int TextureScaleChange = 6; //mxd
+		public const int SurfaceBrightnessChange = 7; //mxd
+		public const int SectorHeightChange = 8;
+		public const int ThingMove = 9; //mxd
+		public const int ThingAngleChange = 10; //mxd
+		public const int ThingPitchChange = 11; //mxd
+		public const int ThingRollChange = 12; //mxd
+	}
+}
diff --git a/Source/Plugins/BuilderModes/IO/WavefrontExporter.cs b/Source/Plugins/BuilderModes/IO/WavefrontExporter.cs
new file mode 100644
index 0000000..d57fd70
--- /dev/null
+++ b/Source/Plugins/BuilderModes/IO/WavefrontExporter.cs
@@ -0,0 +1,546 @@
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.Globalization;
+using System.IO;
+using System.Text;
+using CodeImp.DoomBuilder.Data;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Windows;
+using System.Windows.Forms;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes.IO
+{
+	#region ================== Structs
+
+	internal struct WavefrontExportSettings
+	{
+		public string Obj;
+		public readonly string ObjName;
+		public readonly string ObjPath;
+		public readonly float Scale;
+		public readonly bool FixScale;
+		public readonly bool ExportTextures;
+		public bool Valid;
+		public string[] Textures;
+		public string[] Flats;
+
+		public WavefrontExportSettings(string name, string path, float scale, bool fixScale, bool exportTextures) 
+		{
+			ObjName = name;
+			ObjPath = path;
+			Scale = scale;
+			FixScale = fixScale;
+			ExportTextures = exportTextures;
+
+			Valid = false;
+			Obj = string.Empty;
+			Textures = null;
+			Flats = null;
+		}
+	}
+
+	#endregion
+
+	internal class WavefrontExporter
+	{
+
+		#region ================== Variables and structs
+
+		private const string DEFAULT = "Default";
+
+		private struct VertexIndices
+		{
+			public int PositionIndex;
+			public int UVIndex;
+			public int NormalIndex;
+		}
+
+		#endregion
+
+		#region ================== Export
+
+		public void Export(ICollection<Sector> sectors, WavefrontExportSettings settings) 
+		{
+			CreateObjFromSelection(sectors, ref settings);
+
+			if(!settings.Valid) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "OBJ creation failed. Check 'Errors and Warnings' window for details.");
+				return;
+			}
+
+			if(settings.ExportTextures) 
+			{
+				//save all used textures
+				if(settings.Textures != null) 
+				{
+					foreach(string s in settings.Textures) 
+					{
+						if(s == DEFAULT) continue;
+						if(General.Map.Data.GetTextureExists(s)) 
+						{
+							ImageData id = General.Map.Data.GetTextureImage(s);
+							if(id.Width == 0 || id.Height == 0) 
+							{
+								General.ErrorLogger.Add(ErrorType.Warning, "OBJ Exporter: texture '" + s + "' has invalid size (" + id.Width + "x" + id.Height + ")!");
+								continue;
+							}
+
+							if(!id.IsImageLoaded) id.LoadImage();
+							Bitmap bmp = id.GetBitmap();
+							bmp.Save(Path.Combine(settings.ObjPath, Path.GetFileNameWithoutExtension(s) + ".PNG"), ImageFormat.Png);
+						} 
+						else 
+						{
+							General.ErrorLogger.Add(ErrorType.Warning, "OBJ Exporter: texture '" + s + "' does not exist!");
+						}
+					}
+				}
+
+				if(settings.Flats != null) 
+				{
+					foreach(string s in settings.Flats) 
+					{
+						if(s == DEFAULT) continue;
+						if(General.Map.Data.GetFlatExists(s)) 
+						{
+							ImageData id = General.Map.Data.GetFlatImage(s);
+							if(id.Width == 0 || id.Height == 0) 
+							{
+								General.ErrorLogger.Add(ErrorType.Warning, "OBJ Exporter: flat '" + s + "' has invalid size (" + id.Width + "x" + id.Height + ")!");
+								continue;
+							}
+
+							if(!id.IsImageLoaded) id.LoadImage();
+							Bitmap bmp = id.GetBitmap();
+
+							// Handle duplicate names
+							string flatname = s;
+							if(settings.Textures != null && Array.IndexOf(settings.Textures, s) != -1)
+								flatname += "_FLAT";
+
+							bmp.Save(Path.Combine(settings.ObjPath, Path.GetFileNameWithoutExtension(flatname) + ".PNG"), ImageFormat.Png);
+
+						} 
+						else 
+						{
+							General.ErrorLogger.Add(ErrorType.Warning, "OBJ Exporter: flat '" + s + "' does not exist!");
+						}
+					}
+				}
+			}
+
+			//write obj
+			string savePath = Path.Combine(settings.ObjPath, settings.ObjName);
+			using(StreamWriter sw = new StreamWriter(savePath + ".obj", false))
+				sw.Write(settings.Obj);
+
+			//create mtl
+			StringBuilder mtl = new StringBuilder();
+			mtl.Append("# MTL for " + General.Map.FileTitle + ", map " + General.Map.Options.LevelName + Environment.NewLine);
+			mtl.Append("# Created by GZDoom Builder " + Application.ProductVersion + Environment.NewLine + Environment.NewLine);
+
+			if(settings.Textures != null) 
+			{
+				foreach(string s in settings.Textures) 
+				{
+					if(s == DEFAULT) continue;
+					mtl.Append("newmtl " + s.ToUpperInvariant() + Environment.NewLine);
+					mtl.Append("Kd 1.0 1.0 1.0" + Environment.NewLine);
+					if(settings.ExportTextures) mtl.Append("map_Kd " + Path.Combine(settings.ObjPath, s.ToUpperInvariant() + ".PNG") + Environment.NewLine);
+					mtl.Append(Environment.NewLine);
+				}
+			}
+
+			if(settings.Flats != null) 
+			{
+				foreach(string s in settings.Flats) 
+				{
+					if(s == DEFAULT) continue;
+					mtl.Append("newmtl " + s.ToUpperInvariant() + Environment.NewLine);
+					mtl.Append("Kd 1.0 1.0 1.0" + Environment.NewLine);
+					if(settings.ExportTextures) 
+					{
+						// Handle duplicate names
+						string flatname = s;
+						if(settings.Textures != null && Array.IndexOf(settings.Textures, s) != -1)
+							flatname += "_FLAT";
+
+						mtl.Append("map_Kd " + Path.Combine(settings.ObjPath, flatname.ToUpperInvariant() + ".PNG") + Environment.NewLine);
+					}
+					mtl.Append(Environment.NewLine);
+				}
+			}
+
+			//write mtl
+			using(StreamWriter sw = new StreamWriter(savePath + ".mtl", false))
+				sw.Write(mtl.ToString());
+
+			//done
+			General.Interface.DisplayStatus(StatusType.Warning, "Geometry exported to '" + savePath + ".obj'");
+		}
+
+		#endregion
+
+		#region ================== Utility
+
+		private static void CreateObjFromSelection(ICollection<Sector> sectors, ref WavefrontExportSettings data) 
+		{
+			BaseVisualMode mode = new BaseVisualMode();
+			bool renderingEffectsDisabled = false;
+
+			if(!BaseVisualMode.GZDoomRenderingEffects) 
+			{
+				renderingEffectsDisabled = true;
+				mode.ToggleGZDoomRenderingEffects();
+			}
+
+			mode.RebuildElementData();
+
+			List<BaseVisualSector> visualSectors = new List<BaseVisualSector>();
+
+			//create visual geometry
+			foreach(Sector s in sectors) 
+			{
+				BaseVisualSector bvs = mode.CreateBaseVisualSector(s);
+				if(bvs != null) visualSectors.Add(bvs);
+			}
+
+			if(visualSectors.Count == 0) 
+			{
+				General.ErrorLogger.Add(ErrorType.Error, "OBJ Exporter: no visual sectors to export!");
+				return;
+			}
+
+			//sort geometry
+			List<Dictionary<string, List<WorldVertex[]>>> geometryByTexture = SortGeometry(visualSectors);
+
+			//restore vm settings
+			if(renderingEffectsDisabled) mode.ToggleGZDoomRenderingEffects();
+			mode.Dispose();
+
+			//create obj
+			StringBuilder obj = CreateObjGeometry(geometryByTexture, data);
+
+			if(obj.Length == 0) 
+			{
+				General.ErrorLogger.Add(ErrorType.Error, "OBJ Exporter: failed to create geometry!");
+				return;
+			}
+
+			//add header
+			obj.Insert(0, "o " + General.Map.Options.LevelName + Environment.NewLine); //name
+			obj.Insert(0, "# Created by GZDoom Builder " + Application.ProductVersion + Environment.NewLine + Environment.NewLine);
+			obj.Insert(0, "# " + General.Map.FileTitle + ", map " + General.Map.Options.LevelName + Environment.NewLine);
+			data.Obj = obj.ToString();
+
+			string[] textures = new string[geometryByTexture[0].Keys.Count];
+			geometryByTexture[0].Keys.CopyTo(textures, 0);
+			Array.Sort(textures);
+			data.Textures = textures;
+
+			string[] flats = new string[geometryByTexture[1].Keys.Count];
+			geometryByTexture[1].Keys.CopyTo(flats, 0);
+			Array.Sort(flats);
+			data.Flats = flats;
+
+			data.Valid = true;
+		}
+
+		private static List<Dictionary<string, List<WorldVertex[]>>> SortGeometry(List<BaseVisualSector> visualSectors) 
+		{
+			var texturegeo = new Dictionary<string, List<WorldVertex[]>>(StringComparer.Ordinal);
+			texturegeo.Add(DEFAULT, new List<WorldVertex[]>());
+			var flatgeo = new Dictionary<string, List<WorldVertex[]>>(StringComparer.Ordinal);
+			flatgeo.Add(DEFAULT, new List<WorldVertex[]>());
+
+			foreach(BaseVisualSector vs in visualSectors) 
+			{
+				//floor
+				string texture;
+				if(vs.Floor != null) 
+				{
+					texture = vs.Sector.FloorTexture;
+					CheckTextureName(ref flatgeo, ref texture);
+					flatgeo[texture].AddRange(OptimizeGeometry(vs.Floor.Vertices, vs.Floor.GeometryType, vs.Floor.Sector.Sector.Labels.Count > 1));
+				}
+
+				//ceiling
+				if(vs.Ceiling != null) 
+				{
+					texture = vs.Sector.CeilTexture;
+					CheckTextureName(ref flatgeo, ref texture);
+					flatgeo[texture].AddRange(OptimizeGeometry(vs.Ceiling.Vertices, vs.Ceiling.GeometryType, vs.Ceiling.Sector.Sector.Labels.Count > 1));
+				}
+
+				//walls
+				if(vs.Sides != null) 
+				{
+					foreach(VisualSidedefParts part in vs.Sides.Values) 
+					{
+						//upper
+						if(part.upper != null && part.upper.Vertices != null) 
+						{
+							texture = part.upper.Sidedef.HighTexture;
+							CheckTextureName(ref texturegeo, ref texture);
+							texturegeo[texture].AddRange(OptimizeGeometry(part.upper.Vertices, part.upper.GeometryType));
+						}
+
+						//middle single
+						if(part.middlesingle != null && part.middlesingle.Vertices != null) 
+						{
+							texture = part.middlesingle.Sidedef.MiddleTexture;
+							CheckTextureName(ref texturegeo, ref texture);
+							texturegeo[texture].AddRange(OptimizeGeometry(part.middlesingle.Vertices, part.middlesingle.GeometryType));
+						}
+
+						//middle double
+						if(part.middledouble != null && part.middledouble.Vertices != null) 
+						{
+							texture = part.middledouble.Sidedef.MiddleTexture;
+							CheckTextureName(ref texturegeo, ref texture);
+							texturegeo[texture].AddRange(OptimizeGeometry(part.middledouble.Vertices, part.middledouble.GeometryType));
+						}
+
+						//middle3d
+						if(part.middle3d != null && part.middle3d.Count > 0) 
+						{
+							foreach(VisualMiddle3D m3d in part.middle3d) 
+							{
+								if(m3d.Vertices == null) continue;
+								texture = m3d.GetControlLinedef().Front.MiddleTexture;
+								CheckTextureName(ref texturegeo, ref texture);
+								texturegeo[texture].AddRange(OptimizeGeometry(m3d.Vertices, m3d.GeometryType));
+							}
+						}
+
+						//backsides(?)
+
+						//lower
+						if(part.lower != null && part.lower.Vertices != null) 
+						{
+							texture = part.lower.Sidedef.LowTexture;
+							CheckTextureName(ref texturegeo, ref texture);
+							texturegeo[texture].AddRange(OptimizeGeometry(part.lower.Vertices, part.lower.GeometryType));
+						}
+					}
+				}
+
+				//3d ceilings
+				foreach(VisualCeiling vc in vs.ExtraCeilings) 
+				{
+					texture = vc.GetControlSector().CeilTexture;
+					CheckTextureName(ref flatgeo, ref texture);
+					flatgeo[texture].AddRange(OptimizeGeometry(vc.Vertices, (vc.ExtraFloor.VavoomType ? vc.GeometryType : VisualModes.VisualGeometryType.FLOOR)));
+				}
+
+				//3d floors
+				foreach(VisualFloor vf in vs.ExtraFloors) 
+				{
+					texture = vf.GetControlSector().FloorTexture;
+					CheckTextureName(ref flatgeo, ref texture);
+					flatgeo[texture].AddRange(OptimizeGeometry(vf.Vertices, (vf.ExtraFloor.VavoomType ? vf.GeometryType : VisualModes.VisualGeometryType.CEILING)));
+				}
+
+				//backsides(?)
+			}
+
+			return new List<Dictionary<string, List<WorldVertex[]>>> { texturegeo, flatgeo };
+		}
+
+		private static void CheckTextureName(ref Dictionary<string, List<WorldVertex[]>> geo, ref string texture) 
+		{
+			if(!string.IsNullOrEmpty(texture) && texture != "-") 
+			{
+				if(!geo.ContainsKey(texture)) geo.Add(texture, new List<WorldVertex[]>());
+			} 
+			else 
+			{
+				texture = DEFAULT;
+			}
+		}
+
+		#endregion
+
+		#region ================== Surface optimization
+
+		private static List<WorldVertex[]> OptimizeGeometry(WorldVertex[] verts, VisualModes.VisualGeometryType geotype)
+		{
+			return OptimizeGeometry(verts, geotype, false);
+		}
+
+		private static List<WorldVertex[]> OptimizeGeometry(WorldVertex[] verts, VisualModes.VisualGeometryType geotype, bool skiprectoptimization) 
+		{
+			List<WorldVertex[]> groups = new List<WorldVertex[]>();
+
+			if(!skiprectoptimization && verts.Length == 6) //rectangular surface
+			{
+				if(geotype == VisualModes.VisualGeometryType.CEILING) 
+				{
+					verts = new[] { verts[2], verts[5], verts[1], verts[0] };
+				} 
+				else 
+				{
+					verts = new[] { verts[5], verts[2], verts[1], verts[0] };
+				}
+				groups.Add(verts);
+			} 
+			else 
+			{
+				for(int i = 0; i < verts.Length; i += 3) 
+				{
+					groups.Add(new[] { verts[i + 2], verts[i + 1], verts[i] });
+				}
+			}
+
+			return groups;
+		}
+
+		#endregion
+
+		#region ================== OBJ Creation
+
+		private static StringBuilder CreateObjGeometry(List<Dictionary<string, List<WorldVertex[]>>> geometryByTexture, WavefrontExportSettings data) 
+		{
+			StringBuilder obj = new StringBuilder();
+			const string vertexFormatter = "{0} {2} {1}\n";
+
+			Dictionary<Vector3D, int> uniqueVerts = new Dictionary<Vector3D, int>();
+			Dictionary<Vector3D, int> uniqueNormals = new Dictionary<Vector3D, int>();
+			Dictionary<PointF, int> uniqueUVs = new Dictionary<PointF, int>();
+
+			var vertexDataByTexture = new Dictionary<string, Dictionary<WorldVertex, VertexIndices>>(StringComparer.Ordinal);
+			int pc = 0;
+			int nc = 0;
+			int uvc = 0;
+
+			//optimize geometry
+			foreach(Dictionary<string, List<WorldVertex[]>> dictionary in geometryByTexture) 
+			{
+				foreach(KeyValuePair<string, List<WorldVertex[]>> group in dictionary) 
+				{
+					Dictionary<WorldVertex, VertexIndices> vertsData = new Dictionary<WorldVertex, VertexIndices>();
+					foreach(WorldVertex[] verts in group.Value) 
+					{
+						//vertex normals
+						Vector3D n = new Vector3D(verts[0].nx, verts[0].ny, verts[0].nz).GetNormal();
+						int ni;
+						if(uniqueNormals.ContainsKey(n)) 
+						{
+							ni = uniqueNormals[n];
+						} 
+						else 
+						{
+							uniqueNormals.Add(n, ++nc);
+							ni = nc;
+						}
+
+						foreach(WorldVertex v in verts) 
+						{
+							if(vertsData.ContainsKey(v)) continue;
+							VertexIndices indices = new VertexIndices();
+							indices.NormalIndex = ni;
+
+							//vertex coords
+							Vector3D vc = new Vector3D(v.x, v.y, v.z);
+							if(uniqueVerts.ContainsKey(vc)) 
+							{
+								indices.PositionIndex = uniqueVerts[vc];
+							} 
+							else 
+							{
+								uniqueVerts.Add(vc, ++pc);
+								indices.PositionIndex = pc;
+							}
+
+							//uv
+							PointF uv = new PointF(v.u, v.v);
+							if(uniqueUVs.ContainsKey(uv)) 
+							{
+								indices.UVIndex = uniqueUVs[uv];
+							} 
+							else 
+							{
+								uniqueUVs.Add(uv, ++uvc);
+								indices.UVIndex = uvc;
+							}
+
+							vertsData.Add(v, indices);
+						}
+					}
+
+					if(vertsData.Count > 0) 
+					{
+						if(vertexDataByTexture.ContainsKey(group.Key)) 
+						{
+							foreach(KeyValuePair<WorldVertex, VertexIndices> g in vertsData) 
+								vertexDataByTexture[group.Key].Add(g.Key, g.Value);
+						} 
+						else 
+						{
+							vertexDataByTexture.Add(group.Key, vertsData);
+						}
+					}
+				}
+			}
+
+			//write geometry
+			//write vertices
+			if(data.FixScale) 
+			{
+				foreach(KeyValuePair<Vector3D, int> group in uniqueVerts)
+					obj.Append(string.Format(CultureInfo.InvariantCulture, "v " + vertexFormatter, -group.Key.x * data.Scale, group.Key.y * data.Scale, group.Key.z * data.Scale * 1.2f));
+			} 
+			else 
+			{
+				foreach(KeyValuePair<Vector3D, int> group in uniqueVerts)
+					obj.Append(string.Format(CultureInfo.InvariantCulture, "v " + vertexFormatter, -group.Key.x * data.Scale, group.Key.y * data.Scale, group.Key.z * data.Scale));
+			}
+
+			//write normals
+			foreach(KeyValuePair<Vector3D, int> group in uniqueNormals)
+				obj.Append(string.Format(CultureInfo.InvariantCulture, "vn " + vertexFormatter, group.Key.x, group.Key.y, group.Key.z));
+
+			//write UV coords
+			foreach(KeyValuePair<PointF, int> group in uniqueUVs)
+				obj.Append(string.Format(CultureInfo.InvariantCulture, "vt {0} {1}\n", group.Key.X, -group.Key.Y));
+
+			//write material library
+			obj.Append("mtllib ").Append(data.ObjName + ".mtl").Append("\n");
+
+			//write materials and surface indices
+			foreach(Dictionary<string, List<WorldVertex[]>> dictionary in geometryByTexture) 
+			{
+				foreach(KeyValuePair<string, List<WorldVertex[]>> group in dictionary) 
+				{
+					//material
+					obj.Append("usemtl ").Append(group.Key).Append("\n");
+
+					foreach(WorldVertex[] verts in group.Value) 
+					{
+						//surface indices
+						obj.Append("f");
+						foreach(WorldVertex v in verts) 
+						{
+							VertexIndices vi = vertexDataByTexture[group.Key][v];
+							obj.Append(" " + vi.PositionIndex + "/" + vi.UVIndex + "/" + vi.NormalIndex);
+						}
+						obj.Append("\n");
+					}
+				}
+			}
+
+			return obj;
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/Interface/BridgeModeForm.Designer.cs b/Source/Plugins/BuilderModes/Interface/BridgeModeForm.Designer.cs
new file mode 100644
index 0000000..60b3726
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/BridgeModeForm.Designer.cs
@@ -0,0 +1,230 @@
+namespace CodeImp.DoomBuilder.BuilderModes.Interface {
+	partial class BridgeModeForm {
+		/// <summary>
+		/// Требует�� переменна� кон�труктора.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// О�вободить в�е и�пользуемые ре�ур�ы.
+		/// </summary>
+		/// <param name="disposing">и�тинно, е�ли управл�емый ре�ур� должен быть удален; иначе ложно.</param>
+		protected override void Dispose(bool disposing) 
+		{
+			if(disposing && (components != null)) 
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Код, автоматиче�ки �озданный кон�труктором форм Windows
+
+		/// <summary>
+		/// Об�зательный метод дл� поддержки кон�труктора - не измен�йте
+		/// �одержимое данного метода при помощи редактора кода.
+		/// </summary>
+		private void InitializeComponent() 
+		{
+			this.buttonOK = new System.Windows.Forms.Button();
+			this.buttonCancel = new System.Windows.Forms.Button();
+			this.cbFloorAlign = new System.Windows.Forms.ComboBox();
+			this.cbCeilingAlign = new System.Windows.Forms.ComboBox();
+			this.cbBrightness = new System.Windows.Forms.ComboBox();
+			this.label1 = new System.Windows.Forms.Label();
+			this.label2 = new System.Windows.Forms.Label();
+			this.label3 = new System.Windows.Forms.Label();
+			this.nudSubdivisions = new System.Windows.Forms.NumericUpDown();
+			this.label4 = new System.Windows.Forms.Label();
+			this.buttonFlip = new System.Windows.Forms.Button();
+			this.cbMirror = new System.Windows.Forms.CheckBox();
+			this.cbCopy = new System.Windows.Forms.CheckBox();
+			((System.ComponentModel.ISupportInitialize)(this.nudSubdivisions)).BeginInit();
+			this.SuspendLayout();
+			// 
+			// buttonOK
+			// 
+			this.buttonOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.buttonOK.Location = new System.Drawing.Point(95, 148);
+			this.buttonOK.Name = "buttonOK";
+			this.buttonOK.Size = new System.Drawing.Size(75, 23);
+			this.buttonOK.TabIndex = 4;
+			this.buttonOK.Text = "OK";
+			this.buttonOK.UseVisualStyleBackColor = true;
+			this.buttonOK.Click += new System.EventHandler(this.buttonOK_Click);
+			// 
+			// buttonCancel
+			// 
+			this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.buttonCancel.Location = new System.Drawing.Point(177, 148);
+			this.buttonCancel.Name = "buttonCancel";
+			this.buttonCancel.Size = new System.Drawing.Size(75, 23);
+			this.buttonCancel.TabIndex = 5;
+			this.buttonCancel.Text = "Cancel";
+			this.buttonCancel.UseVisualStyleBackColor = true;
+			this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
+			// 
+			// cbFloorAlign
+			// 
+			this.cbFloorAlign.FormattingEnabled = true;
+			this.cbFloorAlign.Location = new System.Drawing.Point(93, 12);
+			this.cbFloorAlign.Name = "cbFloorAlign";
+			this.cbFloorAlign.Size = new System.Drawing.Size(158, 21);
+			this.cbFloorAlign.TabIndex = 0;
+			// 
+			// cbCeilingAlign
+			// 
+			this.cbCeilingAlign.FormattingEnabled = true;
+			this.cbCeilingAlign.Location = new System.Drawing.Point(93, 39);
+			this.cbCeilingAlign.Name = "cbCeilingAlign";
+			this.cbCeilingAlign.Size = new System.Drawing.Size(158, 21);
+			this.cbCeilingAlign.TabIndex = 1;
+			// 
+			// cbBrightness
+			// 
+			this.cbBrightness.FormattingEnabled = true;
+			this.cbBrightness.Location = new System.Drawing.Point(93, 66);
+			this.cbBrightness.Name = "cbBrightness";
+			this.cbBrightness.Size = new System.Drawing.Size(158, 21);
+			this.cbBrightness.TabIndex = 2;
+			// 
+			// label1
+			// 
+			this.label1.AutoSize = true;
+			this.label1.Location = new System.Drawing.Point(31, 15);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(56, 13);
+			this.label1.TabIndex = 5;
+			this.label1.Text = "Align floor:";
+			this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+			// 
+			// label2
+			// 
+			this.label2.AutoSize = true;
+			this.label2.Location = new System.Drawing.Point(21, 42);
+			this.label2.Name = "label2";
+			this.label2.Size = new System.Drawing.Size(66, 13);
+			this.label2.TabIndex = 6;
+			this.label2.Text = "Align ceiling:";
+			this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+			// 
+			// label3
+			// 
+			this.label3.AutoSize = true;
+			this.label3.Location = new System.Drawing.Point(28, 69);
+			this.label3.Name = "label3";
+			this.label3.Size = new System.Drawing.Size(59, 13);
+			this.label3.TabIndex = 7;
+			this.label3.Text = "Brightness:";
+			this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+			// 
+			// nudSubdivisions
+			// 
+			this.nudSubdivisions.Location = new System.Drawing.Point(93, 94);
+			this.nudSubdivisions.Name = "nudSubdivisions";
+			this.nudSubdivisions.Size = new System.Drawing.Size(46, 20);
+			this.nudSubdivisions.TabIndex = 3;
+			this.nudSubdivisions.Value = new decimal(new int[] {
+            5,
+            0,
+            0,
+            0});
+			this.nudSubdivisions.ValueChanged += new System.EventHandler(this.nudSubdivisions_ValueChanged);
+			// 
+			// label4
+			// 
+			this.label4.AutoSize = true;
+			this.label4.Location = new System.Drawing.Point(16, 95);
+			this.label4.Name = "label4";
+			this.label4.Size = new System.Drawing.Size(69, 13);
+			this.label4.TabIndex = 9;
+			this.label4.Text = "Subdivisions:";
+			this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+			// 
+			// buttonFlip
+			// 
+			this.buttonFlip.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.buttonFlip.Location = new System.Drawing.Point(13, 148);
+			this.buttonFlip.Name = "buttonFlip";
+			this.buttonFlip.Size = new System.Drawing.Size(75, 23);
+			this.buttonFlip.TabIndex = 6;
+			this.buttonFlip.Text = "Flip Lines";
+			this.buttonFlip.UseVisualStyleBackColor = true;
+			this.buttonFlip.Click += new System.EventHandler(this.buttonFlip_Click);
+			// 
+			// cbMirror
+			// 
+			this.cbMirror.AutoSize = true;
+			this.cbMirror.Location = new System.Drawing.Point(168, 96);
+			this.cbMirror.Name = "cbMirror";
+			this.cbMirror.Size = new System.Drawing.Size(81, 17);
+			this.cbMirror.TabIndex = 10;
+			this.cbMirror.Text = "Mirror mode";
+			this.cbMirror.UseVisualStyleBackColor = true;
+			this.cbMirror.CheckStateChanged += new System.EventHandler(this.cbMirror_CheckStateChanged);
+			// 
+			// cbCopy
+			// 
+			this.cbCopy.AutoSize = true;
+			this.cbCopy.Location = new System.Drawing.Point(168, 119);
+			this.cbCopy.Name = "cbCopy";
+			this.cbCopy.Size = new System.Drawing.Size(79, 17);
+			this.cbCopy.TabIndex = 10;
+			this.cbCopy.Text = "Copy mode";
+			this.cbCopy.UseVisualStyleBackColor = true;
+			this.cbCopy.CheckedChanged += new System.EventHandler(this.cbCopy_CheckedChanged);
+			// 
+			// BridgeModeForm
+			// 
+			this.AcceptButton = this.buttonOK;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.CancelButton = this.buttonCancel;
+			this.ClientSize = new System.Drawing.Size(263, 175);
+			this.Controls.Add(this.cbCopy);
+			this.Controls.Add(this.cbMirror);
+			this.Controls.Add(this.buttonFlip);
+			this.Controls.Add(this.label4);
+			this.Controls.Add(this.nudSubdivisions);
+			this.Controls.Add(this.label3);
+			this.Controls.Add(this.label2);
+			this.Controls.Add(this.label1);
+			this.Controls.Add(this.cbBrightness);
+			this.Controls.Add(this.cbCeilingAlign);
+			this.Controls.Add(this.cbFloorAlign);
+			this.Controls.Add(this.buttonCancel);
+			this.Controls.Add(this.buttonOK);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "BridgeModeForm";
+			this.Opacity = 1;
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.Text = "Options";
+			this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.BezierPathForm_FormClosed);
+			this.MouseLeave += new System.EventHandler(this.BezierPathForm_MouseLeave);
+			((System.ComponentModel.ISupportInitialize)(this.nudSubdivisions)).EndInit();
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Button buttonOK;
+		private System.Windows.Forms.Button buttonCancel;
+		private System.Windows.Forms.ComboBox cbFloorAlign;
+		private System.Windows.Forms.ComboBox cbCeilingAlign;
+		private System.Windows.Forms.ComboBox cbBrightness;
+		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.Label label2;
+		private System.Windows.Forms.Label label3;
+		private System.Windows.Forms.NumericUpDown nudSubdivisions;
+		private System.Windows.Forms.Label label4;
+		private System.Windows.Forms.Button buttonFlip;
+		private System.Windows.Forms.CheckBox cbMirror;
+		private System.Windows.Forms.CheckBox cbCopy;
+	}
+}
\ No newline at end of file
diff --git a/Source/Plugins/BuilderModes/Interface/BridgeModeForm.cs b/Source/Plugins/BuilderModes/Interface/BridgeModeForm.cs
new file mode 100644
index 0000000..1e34ec0
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/BridgeModeForm.cs
@@ -0,0 +1,97 @@
+using System;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.BuilderModes.ClassicModes;
+using CodeImp.DoomBuilder.Windows;
+
+namespace CodeImp.DoomBuilder.BuilderModes.Interface 
+{
+	internal struct BridgeInterpolationMode 
+	{
+		public const string BRIGHTNESS_HIGHEST = "Use highest";
+		public const string BRIGHTNESS_LOWEST = "Use lowest";
+
+		public const string HIGHEST = "Highest ceiling";
+		public const string LOWEST = "Lowest floor";
+		public const string LINEAR = "Linear interpolation";
+		public const string IN_SINE = "EaseInSine interpolation";
+		public const string OUT_SINE = "EaseOutSine interpolation";
+		public const string IN_OUT_SINE = "EaseInOutSine interpolation";
+
+		public static readonly string[] CEILING_INTERPOLATION_MODES = { LINEAR, HIGHEST, IN_SINE, OUT_SINE, IN_OUT_SINE/*, IN_OUT_CUBIC, OUT_IN_CUBIC*/ };
+		public static readonly string[] FLOOR_INTERPOLATION_MODES = { LINEAR, LOWEST, IN_SINE, OUT_SINE, IN_OUT_SINE/*, IN_OUT_CUBIC, OUT_IN_CUBIC*/ };
+		public static readonly string[] BRIGHTNESS_INTERPOLATION_MODES = { LINEAR, BRIGHTNESS_HIGHEST, BRIGHTNESS_LOWEST };
+	}
+	
+	public partial class BridgeModeForm : DelayedForm 
+	{
+		internal int Subdivisions { get { return (int)nudSubdivisions.Value; } set { nudSubdivisions.Value = value; } }
+		internal string FloorAlignMode { get { return (string)cbFloorAlign.SelectedItem; } }
+		internal string CeilingAlignMode { get { return (string)cbCeilingAlign.SelectedItem; } }
+		internal string BrightnessMode { get { return (string)cbBrightness.SelectedItem; } }
+
+		internal bool MirrorMode { get { return cbMirror.Checked; } }
+		internal bool CopyMode { get { return cbCopy.Checked; } }
+
+		internal event EventHandler OnSubdivisionChanged;
+		internal event EventHandler OnOkClick;
+		internal event EventHandler OnCancelClick;
+		internal event EventHandler OnFlipClick;
+		
+		public BridgeModeForm() 
+		{
+			InitializeComponent();
+
+			cbBrightness.Items.AddRange(BridgeInterpolationMode.BRIGHTNESS_INTERPOLATION_MODES);
+			cbCeilingAlign.Items.AddRange(BridgeInterpolationMode.CEILING_INTERPOLATION_MODES);
+			cbFloorAlign.Items.AddRange(BridgeInterpolationMode.FLOOR_INTERPOLATION_MODES);
+
+			cbBrightness.SelectedIndex = 0;
+			cbCeilingAlign.SelectedIndex = 0;
+			cbFloorAlign.SelectedIndex = 0;
+
+			nudSubdivisions.Minimum = BridgeMode.MIN_SUBDIVISIONS;
+			nudSubdivisions.Maximum = BridgeMode.MAX_SUBDIVISIONS;
+		}
+
+//events
+		private void BezierPathForm_FormClosed(object sender, FormClosedEventArgs e) 
+		{
+			if(OnCancelClick != null) OnCancelClick(this, EventArgs.Empty);
+		}
+
+		private void buttonCancel_Click(object sender, EventArgs e) 
+		{
+			if(OnCancelClick != null) OnCancelClick(this, EventArgs.Empty);
+		}
+
+		private void buttonOK_Click(object sender, EventArgs e) 
+		{
+			if(OnOkClick != null) OnOkClick(this, EventArgs.Empty);
+		}
+
+		private void nudSubdivisions_ValueChanged(object sender, EventArgs e) 
+		{
+			if(OnSubdivisionChanged != null) OnSubdivisionChanged(this, EventArgs.Empty);
+		}
+
+		private void BezierPathForm_MouseLeave(object sender, EventArgs e) 
+		{
+			General.Interface.FocusDisplay();
+		}
+
+		private void buttonFlip_Click(object sender, EventArgs e) 
+		{
+			if(OnFlipClick != null) OnFlipClick(this, EventArgs.Empty);
+		}
+
+		private void cbCopy_CheckedChanged(object sender, EventArgs e) 
+		{
+			if(cbMirror.Checked && cbCopy.Checked) cbMirror.Checked = false;
+		}
+
+		private void cbMirror_CheckStateChanged(object sender, EventArgs e) 
+		{
+			if(cbMirror.Checked && cbCopy.Checked) cbCopy.Checked = false;
+		}
+	}
+}
diff --git a/Source/Plugins/BuilderModes/Interface/BridgeModeForm.resx b/Source/Plugins/BuilderModes/Interface/BridgeModeForm.resx
new file mode 100644
index 0000000..19dc0dd
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/BridgeModeForm.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/BuilderModes/Interface/CurveLinedefsForm.Designer.cs b/Source/Plugins/BuilderModes/Interface/CurveLinedefsForm.Designer.cs
new file mode 100644
index 0000000..cca122b
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/CurveLinedefsForm.Designer.cs
@@ -0,0 +1,254 @@
+using CodeImp.DoomBuilder.Windows;
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	partial class CurveLinedefsForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			System.Windows.Forms.Label label1;
+			this.distancelabel = new System.Windows.Forms.Label();
+			this.label3 = new System.Windows.Forms.Label();
+			this.vertices = new CodeImp.DoomBuilder.Controls.NumericTextbox();
+			this.distance = new CodeImp.DoomBuilder.Controls.NumericTextbox();
+			this.angle = new CodeImp.DoomBuilder.Controls.NumericTextbox();
+			this.verticesbar = new System.Windows.Forms.VScrollBar();
+			this.distancebar = new System.Windows.Forms.VScrollBar();
+			this.anglebar = new System.Windows.Forms.VScrollBar();
+			this.cancel = new System.Windows.Forms.Button();
+			this.apply = new System.Windows.Forms.Button();
+			this.circular = new System.Windows.Forms.CheckBox();
+			this.backwards = new System.Windows.Forms.CheckBox();
+			label1 = new System.Windows.Forms.Label();
+			this.SuspendLayout();
+			// 
+			// label1
+			// 
+			label1.AutoSize = true;
+			label1.Location = new System.Drawing.Point(24, 15);
+			label1.Name = "label1";
+			label1.Size = new System.Drawing.Size(48, 13);
+			label1.TabIndex = 0;
+			label1.Text = "Vertices:";
+			// 
+			// distancelabel
+			// 
+			this.distancelabel.AutoSize = true;
+			this.distancelabel.Location = new System.Drawing.Point(20, 47);
+			this.distancelabel.Name = "distancelabel";
+			this.distancelabel.Size = new System.Drawing.Size(52, 13);
+			this.distancelabel.TabIndex = 1;
+			this.distancelabel.Text = "Distance:";
+			// 
+			// label3
+			// 
+			this.label3.AutoSize = true;
+			this.label3.Location = new System.Drawing.Point(35, 79);
+			this.label3.Name = "label3";
+			this.label3.Size = new System.Drawing.Size(37, 13);
+			this.label3.TabIndex = 2;
+			this.label3.Text = "Angle:";
+			// 
+			// vertices
+			// 
+			this.vertices.AllowDecimal = false;
+			this.vertices.AllowNegative = false;
+			this.vertices.AllowRelative = false;
+			this.vertices.ForeColor = System.Drawing.SystemColors.WindowText;
+			this.vertices.ImeMode = System.Windows.Forms.ImeMode.Off;
+			this.vertices.Location = new System.Drawing.Point(78, 12);
+			this.vertices.Name = "vertices";
+			this.vertices.Size = new System.Drawing.Size(45, 20);
+			this.vertices.TabIndex = 0;
+			this.vertices.Text = "8";
+			this.vertices.TextChanged += new System.EventHandler(this.vertices_TextChanged);
+			this.vertices.Leave += new System.EventHandler(this.vertices_Leave);
+			// 
+			// distance
+			// 
+			this.distance.AllowDecimal = false;
+			this.distance.AllowNegative = false;
+			this.distance.AllowRelative = false;
+			this.distance.ForeColor = System.Drawing.SystemColors.WindowText;
+			this.distance.ImeMode = System.Windows.Forms.ImeMode.Off;
+			this.distance.Location = new System.Drawing.Point(78, 44);
+			this.distance.Name = "distance";
+			this.distance.Size = new System.Drawing.Size(45, 20);
+			this.distance.TabIndex = 2;
+			this.distance.Text = "128";
+			this.distance.TextChanged += new System.EventHandler(this.distance_TextChanged);
+			this.distance.Leave += new System.EventHandler(this.distance_Leave);
+			// 
+			// angle
+			// 
+			this.angle.AllowDecimal = false;
+			this.angle.AllowNegative = false;
+			this.angle.AllowRelative = false;
+			this.angle.ForeColor = System.Drawing.SystemColors.WindowText;
+			this.angle.ImeMode = System.Windows.Forms.ImeMode.Off;
+			this.angle.Location = new System.Drawing.Point(78, 76);
+			this.angle.Name = "angle";
+			this.angle.Size = new System.Drawing.Size(45, 20);
+			this.angle.TabIndex = 4;
+			this.angle.Text = "180";
+			this.angle.TextChanged += new System.EventHandler(this.angle_TextChanged);
+			this.angle.Leave += new System.EventHandler(this.angle_Leave);
+			// 
+			// verticesbar
+			// 
+			this.verticesbar.LargeChange = 1;
+			this.verticesbar.Location = new System.Drawing.Point(125, 10);
+			this.verticesbar.Maximum = -1;
+			this.verticesbar.Minimum = -200;
+			this.verticesbar.Name = "verticesbar";
+			this.verticesbar.Size = new System.Drawing.Size(19, 24);
+			this.verticesbar.TabIndex = 1;
+			this.verticesbar.Value = -8;
+			this.verticesbar.ValueChanged += new System.EventHandler(this.verticesbar_ValueChanged);
+			// 
+			// distancebar
+			// 
+			this.distancebar.LargeChange = 8;
+			this.distancebar.Location = new System.Drawing.Point(125, 42);
+			this.distancebar.Maximum = 0;
+			this.distancebar.Minimum = -10000;
+			this.distancebar.Name = "distancebar";
+			this.distancebar.Size = new System.Drawing.Size(19, 24);
+			this.distancebar.SmallChange = 8;
+			this.distancebar.TabIndex = 3;
+			this.distancebar.Value = -128;
+			this.distancebar.ValueChanged += new System.EventHandler(this.distancebar_ValueChanged);
+			// 
+			// anglebar
+			// 
+			this.anglebar.LargeChange = 5;
+			this.anglebar.Location = new System.Drawing.Point(125, 74);
+			this.anglebar.Maximum = 0;
+			this.anglebar.Minimum = -180;
+			this.anglebar.Name = "anglebar";
+			this.anglebar.Size = new System.Drawing.Size(19, 24);
+			this.anglebar.SmallChange = 5;
+			this.anglebar.TabIndex = 5;
+			this.anglebar.Value = -180;
+			this.anglebar.ValueChanged += new System.EventHandler(this.anglebar_ValueChanged);
+			// 
+			// cancel
+			// 
+			this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.cancel.Location = new System.Drawing.Point(84, 167);
+			this.cancel.Name = "cancel";
+			this.cancel.Size = new System.Drawing.Size(70, 25);
+			this.cancel.TabIndex = 9;
+			this.cancel.Text = "Cancel";
+			this.cancel.UseVisualStyleBackColor = true;
+			this.cancel.Click += new System.EventHandler(this.cancel_Click);
+			// 
+			// apply
+			// 
+			this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.apply.Location = new System.Drawing.Point(7, 167);
+			this.apply.Name = "apply";
+			this.apply.Size = new System.Drawing.Size(70, 25);
+			this.apply.TabIndex = 8;
+			this.apply.Text = "OK";
+			this.apply.UseVisualStyleBackColor = true;
+			this.apply.Click += new System.EventHandler(this.apply_Click);
+			// 
+			// circular
+			// 
+			this.circular.AutoSize = true;
+			this.circular.Location = new System.Drawing.Point(22, 108);
+			this.circular.Name = "circular";
+			this.circular.Size = new System.Drawing.Size(118, 17);
+			this.circular.TabIndex = 6;
+			this.circular.Text = "Fixed circular curve";
+			this.circular.UseVisualStyleBackColor = true;
+			this.circular.CheckedChanged += new System.EventHandler(this.circular_CheckedChanged);
+			// 
+			// backwards
+			// 
+			this.backwards.AutoSize = true;
+			this.backwards.Location = new System.Drawing.Point(22, 132);
+			this.backwards.Name = "backwards";
+			this.backwards.Size = new System.Drawing.Size(109, 17);
+			this.backwards.TabIndex = 7;
+			this.backwards.Text = "Curve backwards";
+			this.backwards.UseVisualStyleBackColor = true;
+			this.backwards.CheckedChanged += new System.EventHandler(this.backwards_CheckedChanged);
+			// 
+			// CurveLinedefsForm
+			// 
+			this.AcceptButton = this.apply;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.CancelButton = this.cancel;
+			this.ClientSize = new System.Drawing.Size(160, 199);
+			this.Controls.Add(this.backwards);
+			this.Controls.Add(this.circular);
+			this.Controls.Add(this.cancel);
+			this.Controls.Add(this.apply);
+			this.Controls.Add(this.anglebar);
+			this.Controls.Add(this.distancebar);
+			this.Controls.Add(this.verticesbar);
+			this.Controls.Add(this.angle);
+			this.Controls.Add(this.distance);
+			this.Controls.Add(this.vertices);
+			this.Controls.Add(this.label3);
+			this.Controls.Add(this.distancelabel);
+			this.Controls.Add(label1);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "CurveLinedefsForm";
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
+			this.Text = "Curve Linedefs";
+			this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.CurveLinedefsForm_FormClosing);
+			this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.CurveLinedefsForm_HelpRequested);
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Label label3;
+		private CodeImp.DoomBuilder.Controls.NumericTextbox vertices;
+		private CodeImp.DoomBuilder.Controls.NumericTextbox distance;
+		private CodeImp.DoomBuilder.Controls.NumericTextbox angle;
+		private System.Windows.Forms.VScrollBar verticesbar;
+		private System.Windows.Forms.VScrollBar distancebar;
+		private System.Windows.Forms.VScrollBar anglebar;
+		private System.Windows.Forms.Button cancel;
+		private System.Windows.Forms.Button apply;
+		private System.Windows.Forms.CheckBox circular;
+		private System.Windows.Forms.Label distancelabel;
+		private System.Windows.Forms.CheckBox backwards;
+	}
+}
\ No newline at end of file
diff --git a/Source/Plugins/BuilderModes/Interface/CurveLinedefsForm.cs b/Source/Plugins/BuilderModes/Interface/CurveLinedefsForm.cs
new file mode 100644
index 0000000..3078816
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/CurveLinedefsForm.cs
@@ -0,0 +1,203 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Windows;
+using CodeImp.DoomBuilder.Geometry;
+using System.Drawing;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	public partial class CurveLinedefsForm : DelayedForm
+	{
+		#region ================== Constants
+
+		private const int MIN_VERTICES = 1;
+		private const int MAX_VERTICES = 200;
+		private const int MIN_DISTANCE = 0;
+		private const int MAX_DISTANCE = 10000;
+		private const int MIN_ANGLE = 1;
+		private const int MAX_ANGLE = 350;
+
+		#endregion
+
+		#region ================== Properties
+
+		public int Vertices { get { return -verticesbar.Value; } }
+		public float Distance { get { return -distancebar.Value; } }
+		public float Angle { get { return Angle2D.DegToRad(-anglebar.Value); } }
+		public bool FixedCurve { get { return circular.Checked; } }
+		public bool Backwards { get { return backwards.Checked; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public CurveLinedefsForm()
+		{
+			// Initialize
+			InitializeComponent();
+
+			// Set negative properties for stupid
+			// scrollbars that work the other way around
+			verticesbar.Maximum = -MIN_VERTICES;
+			verticesbar.Minimum = -MAX_VERTICES;
+			distancebar.Maximum = -MIN_DISTANCE;
+			distancebar.Minimum = -MAX_DISTANCE;
+			anglebar.Maximum = -MIN_ANGLE;
+			anglebar.Minimum = -MAX_ANGLE;
+		}
+
+		#endregion
+
+		#region ================== Interface
+		
+		// Window closing
+		private void CurveLinedefsForm_FormClosing(object sender, FormClosingEventArgs e)
+		{
+			// User closing the window?
+			if(e.CloseReason == CloseReason.UserClosing)
+			{
+				// Just cancel
+				General.Editing.CancelMode();
+				e.Cancel = true;
+			}
+		}
+
+		// This shows the window
+		public void Show(Form owner)
+		{
+			// First time showing?
+			//if((this.Location.X == 0) && (this.Location.Y == 0))
+			{
+				// Position at left-top of owner
+				this.Location = new Point(owner.Location.X + 20, owner.Location.Y + 90); 
+			}
+
+			// Show window
+			base.Show(owner);
+		}
+		
+		// Vertices bar changed
+		private void verticesbar_ValueChanged(object sender, EventArgs e)
+		{
+			int v = -verticesbar.Value;
+			vertices.Text = v.ToString();
+			General.Interface.RedrawDisplay();
+		}
+
+		// Vertices loses focus
+		private void vertices_Leave(object sender, EventArgs e)
+		{
+			int v = -verticesbar.Value;
+			vertices.Text = v.ToString();
+		}
+
+		// Vertices change
+		private void vertices_TextChanged(object sender, EventArgs e)
+		{
+			int result = -vertices.GetResult(-verticesbar.Value);
+			if((result >= verticesbar.Minimum) && (result <= verticesbar.Maximum)) verticesbar.Value = result;
+		}
+
+		// Distance bar changed
+		private void distancebar_ValueChanged(object sender, EventArgs e)
+		{
+			int v = -distancebar.Value;
+			distance.Text = v.ToString();
+			General.Interface.RedrawDisplay();
+		}
+
+		// Distance loses focus
+		private void distance_Leave(object sender, EventArgs e)
+		{
+			int v = -distancebar.Value;
+			distance.Text = v.ToString();
+		}
+
+		// Distance changed
+		private void distance_TextChanged(object sender, EventArgs e)
+		{
+			int result = -distance.GetResult(-distancebar.Value);
+			if((result >= distancebar.Minimum) && (result <= distancebar.Maximum)) distancebar.Value = result;
+		}
+
+		// Angle bar changed
+		private void anglebar_ValueChanged(object sender, EventArgs e)
+		{
+			int v = -anglebar.Value;
+			angle.Text = v.ToString();
+			General.Interface.RedrawDisplay();
+		}
+
+		// Angle loses focus
+		private void angle_Leave(object sender, EventArgs e)
+		{
+			int v = -anglebar.Value;
+			angle.Text = v.ToString();
+		}
+
+		// Angle changed
+		private void angle_TextChanged(object sender, EventArgs e)
+		{
+			int result = -angle.GetResult(-anglebar.Value);
+			if((result >= anglebar.Minimum) && (result <= anglebar.Maximum)) anglebar.Value = result;
+		}
+
+		// Circular curve switched
+		private void circular_CheckedChanged(object sender, EventArgs e)
+		{
+			// Enable/disable controls
+			distance.Enabled = !circular.Checked;
+			distancebar.Enabled = !circular.Checked;
+			distancelabel.Enabled = !circular.Checked;
+			General.Interface.RedrawDisplay();
+		}
+
+		// Curve backwards switched
+		private void backwards_CheckedChanged(object sender, EventArgs e)
+		{
+			General.Interface.RedrawDisplay();
+		}
+		
+		// Cancel clicked
+		private void cancel_Click(object sender, EventArgs e)
+		{
+			// Cancel now
+			General.Editing.CancelMode();
+		}
+
+		// Apply clicked
+		private void apply_Click(object sender, EventArgs e)
+		{
+			// Apply now
+			General.Editing.AcceptMode();
+		}
+
+		private void CurveLinedefsForm_HelpRequested(object sender, HelpEventArgs hlpevent)
+		{
+			General.ShowHelp("e_curvelinedefs.html");
+		}
+		
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/Source/Plugins/BuilderModes/Interface/CurveLinedefsForm.resx b/Source/Plugins/BuilderModes/Interface/CurveLinedefsForm.resx
new file mode 100644
index 0000000..63dc566
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/CurveLinedefsForm.resx
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="label1.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="vertices.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="distance.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="angle.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="verticesbar.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="distancebar.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="anglebar.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="circular.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="backwards.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/BuilderModes/Interface/DrawCurveOptionsPanel.Designer.cs b/Source/Plugins/BuilderModes/Interface/DrawCurveOptionsPanel.Designer.cs
new file mode 100644
index 0000000..f590468
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/DrawCurveOptionsPanel.Designer.cs
@@ -0,0 +1,113 @@
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	partial class DrawCurveOptionsPanel
+	{
+		/// <summary> 
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing) 
+		{
+			if(disposing && (components != null)) 
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Component Designer generated code
+
+		/// <summary> 
+		/// Required method for Designer support - do not modify 
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent() 
+		{
+			this.toolstrip = new System.Windows.Forms.ToolStrip();
+			this.seglabel = new System.Windows.Forms.ToolStripLabel();
+			this.seglen = new CodeImp.DoomBuilder.Controls.ToolStripNumericUpDown();
+			this.reset = new System.Windows.Forms.ToolStripButton();
+			this.toolstrip.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// toolstrip
+			// 
+			this.toolstrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.seglabel,
+            this.seglen,
+            this.reset});
+			this.toolstrip.Location = new System.Drawing.Point(0, 0);
+			this.toolstrip.Name = "toolstrip";
+			this.toolstrip.Size = new System.Drawing.Size(249, 25);
+			this.toolstrip.TabIndex = 7;
+			this.toolstrip.Text = "toolStrip1";
+			// 
+			// seglabel
+			// 
+			this.seglabel.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.Gear;
+			this.seglabel.Name = "seglabel";
+			this.seglabel.Size = new System.Drawing.Size(113, 22);
+			this.seglabel.Text = "Segment Length:";
+			// 
+			// seglen
+			// 
+			this.seglen.AutoSize = false;
+			this.seglen.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
+			this.seglen.Maximum = new decimal(new int[] {
+            100,
+            0,
+            0,
+            0});
+			this.seglen.Minimum = new decimal(new int[] {
+            0,
+            0,
+            0,
+            0});
+			this.seglen.Name = "seglen";
+			this.seglen.Size = new System.Drawing.Size(56, 20);
+			this.seglen.Text = "0";
+			this.seglen.Value = new decimal(new int[] {
+            0,
+            0,
+            0,
+            0});
+			this.seglen.ValueChanged += new System.EventHandler(this.seglen_ValueChanged);
+			// 
+			// reset
+			// 
+			this.reset.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.reset.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.Reset;
+			this.reset.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.reset.Name = "reset";
+			this.reset.Size = new System.Drawing.Size(23, 22);
+			this.reset.Text = "Reset";
+			this.reset.Click += new System.EventHandler(this.reset_Click);
+			// 
+			// DrawCurveOptionsPanel
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.Controls.Add(this.toolstrip);
+			this.Name = "DrawCurveOptionsPanel";
+			this.Size = new System.Drawing.Size(249, 60);
+			this.toolstrip.ResumeLayout(false);
+			this.toolstrip.PerformLayout();
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.ToolStripLabel seglabel;
+		internal CodeImp.DoomBuilder.Controls.ToolStripNumericUpDown seglen;
+		private System.Windows.Forms.ToolStrip toolstrip;
+		private System.Windows.Forms.ToolStripButton reset;
+
+	}
+}
diff --git a/Source/Plugins/BuilderModes/Interface/DrawCurveOptionsPanel.cs b/Source/Plugins/BuilderModes/Interface/DrawCurveOptionsPanel.cs
new file mode 100644
index 0000000..d97ba89
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/DrawCurveOptionsPanel.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Windows.Forms;
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	internal partial class DrawCurveOptionsPanel : UserControl
+	{
+		public event EventHandler OnValueChanged;
+		private bool blockEvents;
+
+		public int SegmentLength { get { return (int)seglen.Value; } set { blockEvents = true; seglen.Value = value; blockEvents = false; } }
+
+		public DrawCurveOptionsPanel(int minLength, int maxLength) 
+		{
+			InitializeComponent();
+
+			seglen.Minimum = minLength;
+			seglen.Maximum = maxLength;
+		}
+
+		private DrawCurveOptionsPanel() { InitializeComponent(); }
+
+		public void Register() 
+		{
+			General.Interface.AddButton(seglabel);
+			General.Interface.AddButton(seglen);
+			General.Interface.AddButton(reset);
+		}
+
+		public void Unregister() 
+		{
+			General.Interface.RemoveButton(reset);
+			General.Interface.RemoveButton(seglen);
+			General.Interface.RemoveButton(seglabel);
+		}
+
+		private void seglen_ValueChanged(object sender, EventArgs e) 
+		{
+			if(!blockEvents && OnValueChanged != null) OnValueChanged(this, EventArgs.Empty);
+		}
+
+		private void reset_Click(object sender, EventArgs e) 
+		{
+			seglen.Value = seglen.Minimum;
+		}
+	}
+}
diff --git a/Source/Plugins/BuilderModes/Interface/DrawCurveOptionsPanel.resx b/Source/Plugins/BuilderModes/Interface/DrawCurveOptionsPanel.resx
new file mode 100644
index 0000000..58469c3
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/DrawCurveOptionsPanel.resx
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="toolstrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/BuilderModes/Interface/DrawEllipseOptionsPanel.Designer.cs b/Source/Plugins/BuilderModes/Interface/DrawEllipseOptionsPanel.Designer.cs
new file mode 100644
index 0000000..bb88abb
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/DrawEllipseOptionsPanel.Designer.cs
@@ -0,0 +1,146 @@
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	partial class DrawEllipseOptionsPanel
+	{
+		/// <summary> 
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing) 
+		{
+			if(disposing && (components != null)) 
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Component Designer generated code
+
+		/// <summary> 
+		/// Required method for Designer support - do not modify 
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent() 
+		{
+			this.toolStrip1 = new System.Windows.Forms.ToolStrip();
+			this.subdivslabel = new System.Windows.Forms.ToolStripLabel();
+			this.subdivs = new CodeImp.DoomBuilder.Controls.ToolStripNumericUpDown();
+			this.spikinesslabel = new System.Windows.Forms.ToolStripLabel();
+			this.spikiness = new CodeImp.DoomBuilder.Controls.ToolStripNumericUpDown();
+			this.reset = new System.Windows.Forms.ToolStripButton();
+			this.toolStrip1.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// toolStrip1
+			// 
+			this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.subdivslabel,
+            this.subdivs,
+            this.spikinesslabel,
+            this.spikiness,
+            this.reset});
+			this.toolStrip1.Location = new System.Drawing.Point(0, 0);
+			this.toolStrip1.Name = "toolStrip1";
+			this.toolStrip1.Size = new System.Drawing.Size(348, 25);
+			this.toolStrip1.TabIndex = 6;
+			this.toolStrip1.Text = "toolStrip1";
+			// 
+			// subdivslabel
+			// 
+			this.subdivslabel.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.Gear;
+			this.subdivslabel.Name = "subdivslabel";
+			this.subdivslabel.Size = new System.Drawing.Size(53, 22);
+			this.subdivslabel.Text = "Sides:";
+			// 
+			// subdivs
+			// 
+			this.subdivs.AutoSize = false;
+			this.subdivs.Margin = new System.Windows.Forms.Padding(3, 0, 6, 0);
+			this.subdivs.Maximum = new decimal(new int[] {
+            100,
+            0,
+            0,
+            0});
+			this.subdivs.Minimum = new decimal(new int[] {
+            0,
+            0,
+            0,
+            0});
+			this.subdivs.Name = "subdivs";
+			this.subdivs.Size = new System.Drawing.Size(56, 20);
+			this.subdivs.Text = "0";
+			this.subdivs.Value = new decimal(new int[] {
+            0,
+            0,
+            0,
+            0});
+			// 
+			// spikinesslabel
+			// 
+			this.spikinesslabel.Name = "spikinesslabel";
+			this.spikinesslabel.Size = new System.Drawing.Size(58, 22);
+			this.spikinesslabel.Text = "Spikiness:";
+			// 
+			// spikiness
+			// 
+			this.spikiness.AutoSize = false;
+			this.spikiness.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0);
+			this.spikiness.Maximum = new decimal(new int[] {
+            100,
+            0,
+            0,
+            0});
+			this.spikiness.Minimum = new decimal(new int[] {
+            0,
+            0,
+            0,
+            0});
+			this.spikiness.Name = "spikiness";
+			this.spikiness.Size = new System.Drawing.Size(56, 20);
+			this.spikiness.Text = "0";
+			this.spikiness.Value = new decimal(new int[] {
+            0,
+            0,
+            0,
+            0});
+			// 
+			// reset
+			// 
+			this.reset.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.reset.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.Reset;
+			this.reset.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.reset.Name = "reset";
+			this.reset.Size = new System.Drawing.Size(23, 22);
+			this.reset.Text = "Reset";
+			this.reset.Click += new System.EventHandler(this.reset_Click);
+			// 
+			// DrawEllipseOptionsPanel
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.Controls.Add(this.toolStrip1);
+			this.Name = "DrawEllipseOptionsPanel";
+			this.Size = new System.Drawing.Size(348, 60);
+			this.toolStrip1.ResumeLayout(false);
+			this.toolStrip1.PerformLayout();
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.ToolStrip toolStrip1;
+		private System.Windows.Forms.ToolStripLabel subdivslabel;
+		private CodeImp.DoomBuilder.Controls.ToolStripNumericUpDown subdivs;
+		private System.Windows.Forms.ToolStripLabel spikinesslabel;
+		private CodeImp.DoomBuilder.Controls.ToolStripNumericUpDown spikiness;
+		private System.Windows.Forms.ToolStripButton reset;
+	}
+}
diff --git a/Source/Plugins/BuilderModes/Interface/DrawEllipseOptionsPanel.cs b/Source/Plugins/BuilderModes/Interface/DrawEllipseOptionsPanel.cs
new file mode 100644
index 0000000..d2fcb94
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/DrawEllipseOptionsPanel.cs
@@ -0,0 +1,64 @@
+using System;
+using System.Windows.Forms;
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	internal partial class DrawEllipseOptionsPanel : UserControl
+	{
+		public event EventHandler OnValueChanged;
+		private bool blockEvents;
+
+		private static int aquityValue;
+		private static int subdivsValue = 8;
+
+		public int Spikiness { get { return (int)spikiness.Value; } set { blockEvents = true; spikiness.Value = value; blockEvents = false; } }
+		public int Subdivisions { get { return (int)subdivs.Value; } set { blockEvents = true; subdivs.Value = value; blockEvents = false; } }
+		public int MaxSubdivisions { get { return (int)subdivs.Maximum; } set { subdivs.Maximum = value; } }
+		public int MinSubdivisions { get { return (int)subdivs.Minimum;  } set { subdivs.Minimum = value; } }
+		public int MaxSpikiness { get { return (int)spikiness.Maximum; } set { spikiness.Maximum = value; } }
+		public int MinSpikiness { get { return (int)spikiness.Minimum; } set { spikiness.Minimum = value; } }
+		
+		public DrawEllipseOptionsPanel() 
+		{
+			InitializeComponent();
+		}
+
+		public void Register() 
+		{
+			spikiness.Value = aquityValue;
+			subdivs.Value = subdivsValue;
+			spikiness.ValueChanged += ValueChanged;
+			subdivs.ValueChanged += ValueChanged;
+
+			General.Interface.AddButton(subdivslabel);
+			General.Interface.AddButton(subdivs);
+			General.Interface.AddButton(spikinesslabel);
+			General.Interface.AddButton(spikiness);
+			General.Interface.AddButton(reset);
+		}
+
+		public void Unregister() 
+		{
+			General.Interface.RemoveButton(reset);
+			General.Interface.RemoveButton(spikiness);
+			General.Interface.RemoveButton(spikinesslabel);
+			General.Interface.RemoveButton(subdivs);
+			General.Interface.RemoveButton(subdivslabel);
+		}
+
+		private void ValueChanged(object sender, EventArgs e) 
+		{
+			aquityValue = (int)spikiness.Value;
+			subdivsValue = (int)subdivs.Value;
+			if(!blockEvents && OnValueChanged != null) OnValueChanged(this, EventArgs.Empty);
+		}
+
+		private void reset_Click(object sender, EventArgs e) 
+		{
+			blockEvents = true;
+			spikiness.Value = 0;
+			blockEvents = false;
+			subdivs.Value = subdivs.Minimum;
+		}
+	}
+}
diff --git a/Source/Plugins/BuilderModes/Interface/DrawEllipseOptionsPanel.resx b/Source/Plugins/BuilderModes/Interface/DrawEllipseOptionsPanel.resx
new file mode 100644
index 0000000..673dcfd
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/DrawEllipseOptionsPanel.resx
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/BuilderModes/Interface/DrawGridOptionsPanel.Designer.cs b/Source/Plugins/BuilderModes/Interface/DrawGridOptionsPanel.Designer.cs
new file mode 100644
index 0000000..368897f
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/DrawGridOptionsPanel.Designer.cs
@@ -0,0 +1,227 @@
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	partial class DrawGridOptionsPanel
+	{
+		/// <summary> 
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing) 
+		{
+			if(disposing && (components != null)) 
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Component Designer generated code
+
+		/// <summary> 
+		/// Required method for Designer support - do not modify 
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent() 
+		{
+			this.groupBox1 = new System.Windows.Forms.GroupBox();
+			this.triangulate = new System.Windows.Forms.CheckBox();
+			this.gridlock = new System.Windows.Forms.CheckBox();
+			this.reset = new System.Windows.Forms.Button();
+			this.slicesV = new System.Windows.Forms.NumericUpDown();
+			this.slicesH = new System.Windows.Forms.NumericUpDown();
+			this.label2 = new System.Windows.Forms.Label();
+			this.label1 = new System.Windows.Forms.Label();
+			this.groupBox2 = new System.Windows.Forms.GroupBox();
+			this.interpvmode = new System.Windows.Forms.ComboBox();
+			this.interphmode = new System.Windows.Forms.ComboBox();
+			this.label3 = new System.Windows.Forms.Label();
+			this.label4 = new System.Windows.Forms.Label();
+			this.groupBox1.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.slicesV)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.slicesH)).BeginInit();
+			this.groupBox2.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// groupBox1
+			// 
+			this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.groupBox1.Controls.Add(this.triangulate);
+			this.groupBox1.Controls.Add(this.gridlock);
+			this.groupBox1.Controls.Add(this.reset);
+			this.groupBox1.Controls.Add(this.slicesV);
+			this.groupBox1.Controls.Add(this.slicesH);
+			this.groupBox1.Controls.Add(this.label2);
+			this.groupBox1.Controls.Add(this.label1);
+			this.groupBox1.Location = new System.Drawing.Point(3, 3);
+			this.groupBox1.Name = "groupBox1";
+			this.groupBox1.Size = new System.Drawing.Size(200, 128);
+			this.groupBox1.TabIndex = 9;
+			this.groupBox1.TabStop = false;
+			this.groupBox1.Text = " Number of slices: ";
+			// 
+			// triangulate
+			// 
+			this.triangulate.AutoSize = true;
+			this.triangulate.Location = new System.Drawing.Point(20, 103);
+			this.triangulate.Name = "triangulate";
+			this.triangulate.Size = new System.Drawing.Size(79, 17);
+			this.triangulate.TabIndex = 14;
+			this.triangulate.Text = "Triangulate";
+			this.triangulate.UseVisualStyleBackColor = true;
+			this.triangulate.CheckedChanged += new System.EventHandler(this.ValueChanged);
+			// 
+			// gridlock
+			// 
+			this.gridlock.AutoSize = true;
+			this.gridlock.Location = new System.Drawing.Point(20, 80);
+			this.gridlock.Name = "gridlock";
+			this.gridlock.Size = new System.Drawing.Size(111, 17);
+			this.gridlock.TabIndex = 13;
+			this.gridlock.Text = "Lock slices to grid";
+			this.gridlock.UseVisualStyleBackColor = true;
+			this.gridlock.CheckedChanged += new System.EventHandler(this.gridlock_CheckedChanged);
+			// 
+			// reset
+			// 
+			this.reset.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.Reset;
+			this.reset.Location = new System.Drawing.Point(140, 22);
+			this.reset.Name = "reset";
+			this.reset.Size = new System.Drawing.Size(24, 45);
+			this.reset.TabIndex = 10;
+			this.reset.UseVisualStyleBackColor = true;
+			this.reset.Click += new System.EventHandler(this.reset_Click);
+			// 
+			// slicesV
+			// 
+			this.slicesV.Location = new System.Drawing.Point(77, 47);
+			this.slicesV.Name = "slicesV";
+			this.slicesV.Size = new System.Drawing.Size(57, 20);
+			this.slicesV.TabIndex = 12;
+			this.slicesV.ValueChanged += new System.EventHandler(this.ValueChanged);
+			// 
+			// slicesH
+			// 
+			this.slicesH.Location = new System.Drawing.Point(77, 22);
+			this.slicesH.Name = "slicesH";
+			this.slicesH.Size = new System.Drawing.Size(57, 20);
+			this.slicesH.TabIndex = 10;
+			this.slicesH.ValueChanged += new System.EventHandler(this.ValueChanged);
+			// 
+			// label2
+			// 
+			this.label2.AutoSize = true;
+			this.label2.Location = new System.Drawing.Point(29, 49);
+			this.label2.Name = "label2";
+			this.label2.Size = new System.Drawing.Size(42, 13);
+			this.label2.TabIndex = 11;
+			this.label2.Text = "Vertical";
+			// 
+			// label1
+			// 
+			this.label1.AutoSize = true;
+			this.label1.Location = new System.Drawing.Point(17, 24);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(54, 13);
+			this.label1.TabIndex = 10;
+			this.label1.Text = "Horizontal";
+			// 
+			// groupBox2
+			// 
+			this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.groupBox2.Controls.Add(this.interpvmode);
+			this.groupBox2.Controls.Add(this.interphmode);
+			this.groupBox2.Controls.Add(this.label3);
+			this.groupBox2.Controls.Add(this.label4);
+			this.groupBox2.Location = new System.Drawing.Point(3, 137);
+			this.groupBox2.Name = "groupBox2";
+			this.groupBox2.Size = new System.Drawing.Size(200, 82);
+			this.groupBox2.TabIndex = 10;
+			this.groupBox2.TabStop = false;
+			this.groupBox2.Text = " Slices spacing interpolation: ";
+			// 
+			// interpvmode
+			// 
+			this.interpvmode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.interpvmode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.interpvmode.FormattingEnabled = true;
+			this.interpvmode.Location = new System.Drawing.Point(77, 46);
+			this.interpvmode.Name = "interpvmode";
+			this.interpvmode.Size = new System.Drawing.Size(117, 21);
+			this.interpvmode.TabIndex = 17;
+			this.interpvmode.SelectedIndexChanged += new System.EventHandler(this.ValueChanged);
+			this.interpvmode.DropDownClosed += new System.EventHandler(this.interpmode_DropDownClosed);
+			// 
+			// interphmode
+			// 
+			this.interphmode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.interphmode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.interphmode.FormattingEnabled = true;
+			this.interphmode.Location = new System.Drawing.Point(77, 19);
+			this.interphmode.Name = "interphmode";
+			this.interphmode.Size = new System.Drawing.Size(117, 21);
+			this.interphmode.TabIndex = 11;
+			this.interphmode.SelectedIndexChanged += new System.EventHandler(this.ValueChanged);
+			this.interphmode.DropDownClosed += new System.EventHandler(this.interpmode_DropDownClosed);
+			// 
+			// label3
+			// 
+			this.label3.AutoSize = true;
+			this.label3.Location = new System.Drawing.Point(29, 49);
+			this.label3.Name = "label3";
+			this.label3.Size = new System.Drawing.Size(42, 13);
+			this.label3.TabIndex = 16;
+			this.label3.Text = "Vertical";
+			// 
+			// label4
+			// 
+			this.label4.AutoSize = true;
+			this.label4.Location = new System.Drawing.Point(17, 24);
+			this.label4.Name = "label4";
+			this.label4.Size = new System.Drawing.Size(54, 13);
+			this.label4.TabIndex = 15;
+			this.label4.Text = "Horizontal";
+			// 
+			// DrawGridOptionsPanel
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.Controls.Add(this.groupBox2);
+			this.Controls.Add(this.groupBox1);
+			this.Name = "DrawGridOptionsPanel";
+			this.Size = new System.Drawing.Size(206, 299);
+			this.groupBox1.ResumeLayout(false);
+			this.groupBox1.PerformLayout();
+			((System.ComponentModel.ISupportInitialize)(this.slicesV)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.slicesH)).EndInit();
+			this.groupBox2.ResumeLayout(false);
+			this.groupBox2.PerformLayout();
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.GroupBox groupBox1;
+		private System.Windows.Forms.CheckBox triangulate;
+		private System.Windows.Forms.CheckBox gridlock;
+		private System.Windows.Forms.Button reset;
+		private System.Windows.Forms.NumericUpDown slicesV;
+		private System.Windows.Forms.NumericUpDown slicesH;
+		private System.Windows.Forms.Label label2;
+		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.GroupBox groupBox2;
+		private System.Windows.Forms.ComboBox interpvmode;
+		private System.Windows.Forms.ComboBox interphmode;
+		private System.Windows.Forms.Label label3;
+		private System.Windows.Forms.Label label4;
+	}
+}
diff --git a/Source/Plugins/BuilderModes/Interface/DrawGridOptionsPanel.cs b/Source/Plugins/BuilderModes/Interface/DrawGridOptionsPanel.cs
new file mode 100644
index 0000000..a9d2f72
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/DrawGridOptionsPanel.cs
@@ -0,0 +1,72 @@
+using System;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Geometry;
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	internal partial class DrawGridOptionsPanel : UserControl
+	{
+		public event EventHandler OnValueChanged;
+		public event EventHandler OnGridLockChanged;
+		private bool blockevents;
+
+		public bool Triangulate { get { return triangulate.Checked; } set { blockevents = true; triangulate.Checked = value; blockevents = false; } }
+		public bool LockToGrid { get { return gridlock.Checked; } set { blockevents = true; gridlock.Checked = value; blockevents = false; } }
+		public int HorizontalSlices { get { return (int)slicesH.Value; } set { blockevents = true; slicesH.Value = value; blockevents = false; } }
+		public int MaxHorizontalSlices { get { return (int)slicesH.Maximum; } set { slicesH.Maximum = value; } }
+		public int VerticalSlices { get { return (int)slicesV.Value; } set { blockevents = true; slicesV.Value = value; blockevents = false; } }
+		public int MaxVerticalSlices { get { return (int)slicesV.Maximum; } set { slicesV.Maximum = value; } }
+		public InterpolationTools.Mode HorizontalInterpolationMode 
+		{
+			get { return gridlock.Checked ? InterpolationTools.Mode.LINEAR : (InterpolationTools.Mode)interphmode.SelectedIndex; }
+			set { interphmode.SelectedIndex = (int)value; }
+		}
+		public InterpolationTools.Mode VerticalInterpolationMode 
+		{
+			get { return gridlock.Checked ? InterpolationTools.Mode.LINEAR : (InterpolationTools.Mode)interpvmode.SelectedIndex; }
+			set { interpvmode.SelectedIndex = (int)value; }
+		}
+
+		public DrawGridOptionsPanel() 
+		{
+			InitializeComponent();
+
+			// Fill them menus
+			interphmode.Items.AddRange(new object[] { MenusForm.GradientInterpolationModes.Linear, MenusForm.GradientInterpolationModes.EaseInOutSine, MenusForm.GradientInterpolationModes.EaseInSine, MenusForm.GradientInterpolationModes.EaseOutSine });
+			interphmode.SelectedIndex = 0;
+			interpvmode.Items.AddRange(new object[] { MenusForm.GradientInterpolationModes.Linear, MenusForm.GradientInterpolationModes.EaseInOutSine, MenusForm.GradientInterpolationModes.EaseInSine, MenusForm.GradientInterpolationModes.EaseOutSine });
+			interpvmode.SelectedIndex = 0;
+		}
+
+		private void ValueChanged(object sender, EventArgs e) 
+		{
+			if(!blockevents && OnValueChanged != null) OnValueChanged(this, EventArgs.Empty);
+		}
+
+		private void gridlock_CheckedChanged(object sender, EventArgs e)
+		{
+			slicesH.Enabled = !gridlock.Checked;
+			slicesV.Enabled = !gridlock.Checked;
+			interpvmode.Enabled = !gridlock.Checked;
+			interphmode.Enabled = !gridlock.Checked;
+			reset.Enabled = !gridlock.Checked;
+
+			if(!blockevents && OnGridLockChanged != null) OnGridLockChanged(this, EventArgs.Empty);
+		}
+
+		private void interpmode_DropDownClosed(object sender, EventArgs e) 
+		{
+			General.Interface.FocusDisplay();
+		}
+
+		private void reset_Click(object sender, EventArgs e)
+		{
+			blockevents = true;
+			slicesH.Value = 3;
+			slicesV.Value = 3;
+			blockevents = false;
+
+			if(OnValueChanged != null) OnValueChanged(this, EventArgs.Empty);
+		}
+	}
+}
diff --git a/Source/Plugins/BuilderModes/Interface/DrawGridOptionsPanel.resx b/Source/Plugins/BuilderModes/Interface/DrawGridOptionsPanel.resx
new file mode 100644
index 0000000..19dc0dd
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/DrawGridOptionsPanel.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/BuilderModes/Interface/DrawRectangleOptionsPanel.Designer.cs b/Source/Plugins/BuilderModes/Interface/DrawRectangleOptionsPanel.Designer.cs
new file mode 100644
index 0000000..a86a0f0
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/DrawRectangleOptionsPanel.Designer.cs
@@ -0,0 +1,148 @@
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	partial class DrawRectangleOptionsPanel
+	{
+		/// <summary> 
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing) 
+		{
+			if(disposing && (components != null)) 
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Component Designer generated code
+
+		/// <summary> 
+		/// Required method for Designer support - do not modify 
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent() 
+		{
+			this.toolStrip1 = new System.Windows.Forms.ToolStrip();
+			this.radiuslabel = new System.Windows.Forms.ToolStripLabel();
+			this.radius = new CodeImp.DoomBuilder.Controls.ToolStripNumericUpDown();
+			this.subdivslabel = new System.Windows.Forms.ToolStripLabel();
+			this.subdivs = new CodeImp.DoomBuilder.Controls.ToolStripNumericUpDown();
+			this.reset = new System.Windows.Forms.ToolStripButton();
+			this.toolStrip1.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// toolStrip1
+			// 
+			this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.radiuslabel,
+            this.radius,
+            this.subdivslabel,
+            this.subdivs,
+            this.reset});
+			this.toolStrip1.Location = new System.Drawing.Point(0, 0);
+			this.toolStrip1.Name = "toolStrip1";
+			this.toolStrip1.Size = new System.Drawing.Size(380, 25);
+			this.toolStrip1.TabIndex = 7;
+			this.toolStrip1.Text = "toolStrip1";
+			// 
+			// radiuslabel
+			// 
+			this.radiuslabel.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.Gear;
+			this.radiuslabel.Name = "radiuslabel";
+			this.radiuslabel.Size = new System.Drawing.Size(92, 22);
+			this.radiuslabel.Text = "Bevel Radius:";
+			// 
+			// radius
+			// 
+			this.radius.AutoSize = false;
+			this.radius.Margin = new System.Windows.Forms.Padding(3, 0, 6, 0);
+			this.radius.Maximum = new decimal(new int[] {
+            2048,
+            0,
+            0,
+            0});
+			this.radius.Minimum = new decimal(new int[] {
+            0,
+            0,
+            0,
+            0});
+			this.radius.Name = "radius";
+			this.radius.Size = new System.Drawing.Size(56, 20);
+			this.radius.Text = "0";
+			this.radius.Value = new decimal(new int[] {
+            0,
+            0,
+            0,
+            0});
+			this.radius.ValueChanged += new System.EventHandler(this.ValueChanged);
+			// 
+			// subdivslabel
+			// 
+			this.subdivslabel.Name = "subdivslabel";
+			this.subdivslabel.Size = new System.Drawing.Size(76, 22);
+			this.subdivslabel.Text = "Subdivisions:";
+			// 
+			// subdivs
+			// 
+			this.subdivs.AutoSize = false;
+			this.subdivs.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0);
+			this.subdivs.Maximum = new decimal(new int[] {
+            128,
+            0,
+            0,
+            0});
+			this.subdivs.Minimum = new decimal(new int[] {
+            0,
+            0,
+            0,
+            0});
+			this.subdivs.Name = "subdivs";
+			this.subdivs.Size = new System.Drawing.Size(56, 20);
+			this.subdivs.Text = "0";
+			this.subdivs.Value = new decimal(new int[] {
+            0,
+            0,
+            0,
+            0});
+			this.subdivs.ValueChanged += new System.EventHandler(this.ValueChanged);
+			// 
+			// reset
+			// 
+			this.reset.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.reset.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.Reset;
+			this.reset.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.reset.Name = "reset";
+			this.reset.Size = new System.Drawing.Size(23, 22);
+			this.reset.Text = "Reset";
+			this.reset.Click += new System.EventHandler(this.reset_Click);
+			// 
+			// DrawRectangleOptionsPanel
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.Controls.Add(this.toolStrip1);
+			this.Name = "DrawRectangleOptionsPanel";
+			this.Size = new System.Drawing.Size(380, 60);
+			this.toolStrip1.ResumeLayout(false);
+			this.toolStrip1.PerformLayout();
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.ToolStrip toolStrip1;
+		private System.Windows.Forms.ToolStripLabel radiuslabel;
+		private CodeImp.DoomBuilder.Controls.ToolStripNumericUpDown radius;
+		private System.Windows.Forms.ToolStripLabel subdivslabel;
+		private CodeImp.DoomBuilder.Controls.ToolStripNumericUpDown subdivs;
+		private System.Windows.Forms.ToolStripButton reset;
+	}
+}
diff --git a/Source/Plugins/BuilderModes/Interface/DrawRectangleOptionsPanel.cs b/Source/Plugins/BuilderModes/Interface/DrawRectangleOptionsPanel.cs
new file mode 100644
index 0000000..c885ea3
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/DrawRectangleOptionsPanel.cs
@@ -0,0 +1,65 @@
+using System;
+using System.Windows.Forms;
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	internal partial class DrawRectangleOptionsPanel : UserControl
+	{
+		public event EventHandler OnValueChanged;
+		private bool blockEvents;
+
+		private static int radiusValue;
+		private static int subdivsValue;
+
+		public int BevelWidth { get { return (int)radius.Value; } set { blockEvents = true; radius.Value = value; blockEvents = false; } }
+		public int MaxBevelWidth { get { return (int)radius.Maximum; } set { radius.Maximum = value; } }
+		public int MinBevelWidth { get { return (int)radius.Minimum; } set { radius.Minimum = value; } }
+		public int Subdivisions { get { return (int)subdivs.Value; } set { blockEvents = true; subdivs.Value = value; blockEvents = false; } }
+		public int MaxSubdivisions { get { return (int)subdivs.Maximum; } set { subdivs.Maximum = value; } }
+		public int MinSubdivisions { get { return (int)subdivs.Minimum; } set { subdivs.Minimum = value; } }
+
+		public DrawRectangleOptionsPanel() 
+		{
+			InitializeComponent();
+		}
+
+		public void Register() 
+		{
+			radius.Value = radiusValue;
+			subdivs.Value = subdivsValue;
+			radius.ValueChanged += ValueChanged;
+			subdivs.ValueChanged += ValueChanged;
+
+			General.Interface.AddButton(radiuslabel);
+			General.Interface.AddButton(radius);
+			General.Interface.AddButton(subdivslabel);
+			General.Interface.AddButton(subdivs);
+			General.Interface.AddButton(reset);
+		}
+
+		public void Unregister() 
+		{
+			General.Interface.RemoveButton(reset);
+			General.Interface.RemoveButton(subdivs);
+			General.Interface.RemoveButton(subdivslabel);
+			General.Interface.RemoveButton(radius);
+			General.Interface.RemoveButton(radiuslabel);
+		}
+
+		private void ValueChanged(object sender, EventArgs e) 
+		{
+			radiusValue = (int)radius.Value;
+			subdivsValue = (int)subdivs.Value;
+			if(!blockEvents && OnValueChanged != null) OnValueChanged(this, EventArgs.Empty);
+		}
+
+		private void reset_Click(object sender, EventArgs e) 
+		{
+			blockEvents = true;
+			radius.Value = 0;
+			blockEvents = false;
+			subdivs.Value = 0;
+		}
+
+	}
+}
diff --git a/Source/Plugins/BuilderModes/Interface/DrawRectangleOptionsPanel.resx b/Source/Plugins/BuilderModes/Interface/DrawRectangleOptionsPanel.resx
new file mode 100644
index 0000000..673dcfd
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/DrawRectangleOptionsPanel.resx
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/BuilderModes/Interface/EditSelectionPanel.Designer.cs b/Source/Plugins/BuilderModes/Interface/EditSelectionPanel.Designer.cs
new file mode 100644
index 0000000..637d09b
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/EditSelectionPanel.Designer.cs
@@ -0,0 +1,742 @@
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	partial class EditSelectionPanel
+	{
+		/// <summary> 
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Component Designer generated code
+
+		/// <summary> 
+		/// Required method for Designer support - do not modify 
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.components = new System.ComponentModel.Container();
+			this.groupBox1 = new System.Windows.Forms.GroupBox();
+			this.preciseposition = new System.Windows.Forms.CheckBox();
+			this.orgposy = new System.Windows.Forms.Button();
+			this.orgposx = new System.Windows.Forms.Button();
+			this.label16 = new System.Windows.Forms.Label();
+			this.label19 = new System.Windows.Forms.Label();
+			this.label6 = new System.Windows.Forms.Label();
+			this.label5 = new System.Windows.Forms.Label();
+			this.relposy = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.relposx = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.absposy = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.absposx = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.label2 = new System.Windows.Forms.Label();
+			this.label1 = new System.Windows.Forms.Label();
+			this.groupBox2 = new System.Windows.Forms.GroupBox();
+			this.orgsizey = new System.Windows.Forms.Button();
+			this.orgsizex = new System.Windows.Forms.Button();
+			this.label12 = new System.Windows.Forms.Label();
+			this.label9 = new System.Windows.Forms.Label();
+			this.label8 = new System.Windows.Forms.Label();
+			this.label7 = new System.Windows.Forms.Label();
+			this.relsizey = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.relsizex = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.label4 = new System.Windows.Forms.Label();
+			this.abssizey = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.abssizex = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.label3 = new System.Windows.Forms.Label();
+			this.groupBox3 = new System.Windows.Forms.GroupBox();
+			this.label14 = new System.Windows.Forms.Label();
+			this.flipv = new System.Windows.Forms.Button();
+			this.fliph = new System.Windows.Forms.Button();
+			this.label13 = new System.Windows.Forms.Label();
+			this.label11 = new System.Windows.Forms.Label();
+			this.absrot = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.ceiltexgroup = new System.Windows.Forms.GroupBox();
+			this.ceiltexoffset = new System.Windows.Forms.CheckBox();
+			this.ceiltexrotation = new System.Windows.Forms.CheckBox();
+			this.ceiltexscale = new System.Windows.Forms.CheckBox();
+			this.ceiltexall = new System.Windows.Forms.CheckBox();
+			this.floortexrotation = new System.Windows.Forms.CheckBox();
+			this.floortexoffset = new System.Windows.Forms.CheckBox();
+			this.floortexscale = new System.Windows.Forms.CheckBox();
+			this.floortexall = new System.Windows.Forms.CheckBox();
+			this.floortexgroup = new System.Windows.Forms.GroupBox();
+			this.tooltip = new System.Windows.Forms.ToolTip(this.components);
+			this.groupBox1.SuspendLayout();
+			this.groupBox2.SuspendLayout();
+			this.groupBox3.SuspendLayout();
+			this.ceiltexgroup.SuspendLayout();
+			this.floortexgroup.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// groupBox1
+			// 
+			this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.groupBox1.Controls.Add(this.preciseposition);
+			this.groupBox1.Controls.Add(this.orgposy);
+			this.groupBox1.Controls.Add(this.orgposx);
+			this.groupBox1.Controls.Add(this.label16);
+			this.groupBox1.Controls.Add(this.label19);
+			this.groupBox1.Controls.Add(this.label6);
+			this.groupBox1.Controls.Add(this.label5);
+			this.groupBox1.Controls.Add(this.relposy);
+			this.groupBox1.Controls.Add(this.relposx);
+			this.groupBox1.Controls.Add(this.absposy);
+			this.groupBox1.Controls.Add(this.absposx);
+			this.groupBox1.Controls.Add(this.label2);
+			this.groupBox1.Controls.Add(this.label1);
+			this.groupBox1.Location = new System.Drawing.Point(3, 3);
+			this.groupBox1.Name = "groupBox1";
+			this.groupBox1.Size = new System.Drawing.Size(243, 140);
+			this.groupBox1.TabIndex = 0;
+			this.groupBox1.TabStop = false;
+			this.groupBox1.Text = "Position:";
+			// 
+			// preciseposition
+			// 
+			this.preciseposition.AutoSize = true;
+			this.preciseposition.Location = new System.Drawing.Point(58, 115);
+			this.preciseposition.Name = "preciseposition";
+			this.preciseposition.Size = new System.Drawing.Size(146, 17);
+			this.preciseposition.TabIndex = 36;
+			this.preciseposition.Text = "High precision positioning";
+			this.tooltip.SetToolTip(this.preciseposition, "When checked, thing and vertex positions will be set using floating point precisi" +
+					"on.\r\nOtherwise, they will be rounded to the nearest integer.");
+			this.preciseposition.UseVisualStyleBackColor = true;
+			// 
+			// orgposy
+			// 
+			this.orgposy.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+			this.orgposy.Location = new System.Drawing.Point(136, 23);
+			this.orgposy.Name = "orgposy";
+			this.orgposy.Size = new System.Drawing.Size(72, 24);
+			this.orgposy.TabIndex = 29;
+			this.orgposy.Text = "-2000";
+			this.orgposy.UseVisualStyleBackColor = true;
+			this.orgposy.Click += new System.EventHandler(this.orgposy_Click);
+			// 
+			// orgposx
+			// 
+			this.orgposx.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+			this.orgposx.Location = new System.Drawing.Point(58, 23);
+			this.orgposx.Name = "orgposx";
+			this.orgposx.Size = new System.Drawing.Size(72, 24);
+			this.orgposx.TabIndex = 28;
+			this.orgposx.Text = "-2000";
+			this.orgposx.UseVisualStyleBackColor = true;
+			this.orgposx.Click += new System.EventHandler(this.orgposx_Click);
+			// 
+			// label16
+			// 
+			this.label16.AutoSize = true;
+			this.label16.Location = new System.Drawing.Point(214, 28);
+			this.label16.Name = "label16";
+			this.label16.Size = new System.Drawing.Size(21, 13);
+			this.label16.TabIndex = 26;
+			this.label16.Text = "mu";
+			// 
+			// label19
+			// 
+			this.label19.AutoSize = true;
+			this.label19.Location = new System.Drawing.Point(9, 28);
+			this.label19.Name = "label19";
+			this.label19.Size = new System.Drawing.Size(45, 13);
+			this.label19.TabIndex = 23;
+			this.label19.Text = "Original:";
+			// 
+			// label6
+			// 
+			this.label6.AutoSize = true;
+			this.label6.Location = new System.Drawing.Point(214, 88);
+			this.label6.Name = "label6";
+			this.label6.Size = new System.Drawing.Size(21, 13);
+			this.label6.TabIndex = 13;
+			this.label6.Text = "mp";
+			// 
+			// label5
+			// 
+			this.label5.AutoSize = true;
+			this.label5.Location = new System.Drawing.Point(214, 58);
+			this.label5.Name = "label5";
+			this.label5.Size = new System.Drawing.Size(21, 13);
+			this.label5.TabIndex = 12;
+			this.label5.Text = "mp";
+			// 
+			// relposy
+			// 
+			this.relposy.AllowDecimal = true;
+			this.relposy.AllowNegative = true;
+			this.relposy.AllowRelative = true;
+			this.relposy.ButtonStep = 1;
+			this.relposy.ButtonStepBig = 10F;
+			this.relposy.ButtonStepFloat = 1F;
+			this.relposy.ButtonStepSmall = 0.1F;
+			this.relposy.ButtonStepsUseModifierKeys = false;
+			this.relposy.ButtonStepsWrapAround = false;
+			this.relposy.Location = new System.Drawing.Point(136, 83);
+			this.relposy.Name = "relposy";
+			this.relposy.Size = new System.Drawing.Size(72, 24);
+			this.relposy.StepValues = null;
+			this.relposy.TabIndex = 11;
+			this.relposy.WhenEnterPressed += new System.EventHandler(this.relposy_Validated);
+			this.relposy.Validated += new System.EventHandler(this.relposy_Validated);
+			this.relposy.WhenButtonsClicked += new System.EventHandler(this.relposy_Validated);
+			this.relposy.WhenTextChanged += new System.EventHandler(this.WhenTextChanged);
+			// 
+			// relposx
+			// 
+			this.relposx.AllowDecimal = true;
+			this.relposx.AllowNegative = true;
+			this.relposx.AllowRelative = true;
+			this.relposx.ButtonStep = 1;
+			this.relposx.ButtonStepBig = 10F;
+			this.relposx.ButtonStepFloat = 1F;
+			this.relposx.ButtonStepSmall = 0.1F;
+			this.relposx.ButtonStepsUseModifierKeys = false;
+			this.relposx.ButtonStepsWrapAround = false;
+			this.relposx.Location = new System.Drawing.Point(58, 83);
+			this.relposx.Name = "relposx";
+			this.relposx.Size = new System.Drawing.Size(72, 24);
+			this.relposx.StepValues = null;
+			this.relposx.TabIndex = 10;
+			this.relposx.WhenEnterPressed += new System.EventHandler(this.relposx_Validated);
+			this.relposx.Validated += new System.EventHandler(this.relposx_Validated);
+			this.relposx.WhenButtonsClicked += new System.EventHandler(this.relposx_Validated);
+			this.relposx.WhenTextChanged += new System.EventHandler(this.WhenTextChanged);
+			// 
+			// absposy
+			// 
+			this.absposy.AllowDecimal = true;
+			this.absposy.AllowNegative = true;
+			this.absposy.AllowRelative = true;
+			this.absposy.ButtonStep = 1;
+			this.absposy.ButtonStepBig = 10F;
+			this.absposy.ButtonStepFloat = 1F;
+			this.absposy.ButtonStepSmall = 0.1F;
+			this.absposy.ButtonStepsUseModifierKeys = false;
+			this.absposy.ButtonStepsWrapAround = false;
+			this.absposy.Location = new System.Drawing.Point(136, 53);
+			this.absposy.Name = "absposy";
+			this.absposy.Size = new System.Drawing.Size(72, 24);
+			this.absposy.StepValues = null;
+			this.absposy.TabIndex = 9;
+			this.absposy.WhenEnterPressed += new System.EventHandler(this.absposy_Validated);
+			this.absposy.Validated += new System.EventHandler(this.absposy_Validated);
+			this.absposy.WhenButtonsClicked += new System.EventHandler(this.absposy_Validated);
+			this.absposy.WhenTextChanged += new System.EventHandler(this.WhenTextChanged);
+			// 
+			// absposx
+			// 
+			this.absposx.AllowDecimal = true;
+			this.absposx.AllowNegative = true;
+			this.absposx.AllowRelative = true;
+			this.absposx.ButtonStep = 1;
+			this.absposx.ButtonStepBig = 10F;
+			this.absposx.ButtonStepFloat = 1F;
+			this.absposx.ButtonStepSmall = 0.1F;
+			this.absposx.ButtonStepsUseModifierKeys = false;
+			this.absposx.ButtonStepsWrapAround = false;
+			this.absposx.Location = new System.Drawing.Point(58, 53);
+			this.absposx.Name = "absposx";
+			this.absposx.Size = new System.Drawing.Size(72, 24);
+			this.absposx.StepValues = null;
+			this.absposx.TabIndex = 8;
+			this.absposx.WhenEnterPressed += new System.EventHandler(this.absposx_Validated);
+			this.absposx.Validated += new System.EventHandler(this.absposx_Validated);
+			this.absposx.WhenButtonsClicked += new System.EventHandler(this.absposx_Validated);
+			this.absposx.WhenTextChanged += new System.EventHandler(this.WhenTextChanged);
+			// 
+			// label2
+			// 
+			this.label2.AutoSize = true;
+			this.label2.Location = new System.Drawing.Point(7, 88);
+			this.label2.Name = "label2";
+			this.label2.Size = new System.Drawing.Size(49, 13);
+			this.label2.TabIndex = 1;
+			this.label2.Text = "Relative:";
+			// 
+			// label1
+			// 
+			this.label1.AutoSize = true;
+			this.label1.Location = new System.Drawing.Point(6, 58);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(51, 13);
+			this.label1.TabIndex = 0;
+			this.label1.Text = "Absolute:";
+			// 
+			// groupBox2
+			// 
+			this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.groupBox2.Controls.Add(this.orgsizey);
+			this.groupBox2.Controls.Add(this.orgsizex);
+			this.groupBox2.Controls.Add(this.label12);
+			this.groupBox2.Controls.Add(this.label9);
+			this.groupBox2.Controls.Add(this.label8);
+			this.groupBox2.Controls.Add(this.label7);
+			this.groupBox2.Controls.Add(this.relsizey);
+			this.groupBox2.Controls.Add(this.relsizex);
+			this.groupBox2.Controls.Add(this.label4);
+			this.groupBox2.Controls.Add(this.abssizey);
+			this.groupBox2.Controls.Add(this.abssizex);
+			this.groupBox2.Controls.Add(this.label3);
+			this.groupBox2.Location = new System.Drawing.Point(3, 149);
+			this.groupBox2.Name = "groupBox2";
+			this.groupBox2.Size = new System.Drawing.Size(243, 117);
+			this.groupBox2.TabIndex = 1;
+			this.groupBox2.TabStop = false;
+			this.groupBox2.Text = "Size:";
+			// 
+			// orgsizey
+			// 
+			this.orgsizey.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+			this.orgsizey.Location = new System.Drawing.Point(136, 23);
+			this.orgsizey.Name = "orgsizey";
+			this.orgsizey.Size = new System.Drawing.Size(72, 24);
+			this.orgsizey.TabIndex = 31;
+			this.orgsizey.Text = "-2000";
+			this.orgsizey.UseVisualStyleBackColor = true;
+			this.orgsizey.Click += new System.EventHandler(this.orgsizey_Click);
+			// 
+			// orgsizex
+			// 
+			this.orgsizex.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+			this.orgsizex.Location = new System.Drawing.Point(58, 23);
+			this.orgsizex.Name = "orgsizex";
+			this.orgsizex.Size = new System.Drawing.Size(72, 24);
+			this.orgsizex.TabIndex = 30;
+			this.orgsizex.Text = "-2000";
+			this.orgsizex.UseVisualStyleBackColor = true;
+			this.orgsizex.Click += new System.EventHandler(this.orgsizex_Click);
+			// 
+			// label12
+			// 
+			this.label12.AutoSize = true;
+			this.label12.Location = new System.Drawing.Point(214, 28);
+			this.label12.Name = "label12";
+			this.label12.Size = new System.Drawing.Size(21, 13);
+			this.label12.TabIndex = 21;
+			this.label12.Text = "mp";
+			// 
+			// label9
+			// 
+			this.label9.AutoSize = true;
+			this.label9.Location = new System.Drawing.Point(9, 28);
+			this.label9.Name = "label9";
+			this.label9.Size = new System.Drawing.Size(45, 13);
+			this.label9.TabIndex = 18;
+			this.label9.Text = "Original:";
+			// 
+			// label8
+			// 
+			this.label8.AutoSize = true;
+			this.label8.Location = new System.Drawing.Point(214, 88);
+			this.label8.Name = "label8";
+			this.label8.Size = new System.Drawing.Size(15, 13);
+			this.label8.TabIndex = 17;
+			this.label8.Text = "%";
+			// 
+			// label7
+			// 
+			this.label7.AutoSize = true;
+			this.label7.Location = new System.Drawing.Point(214, 58);
+			this.label7.Name = "label7";
+			this.label7.Size = new System.Drawing.Size(21, 13);
+			this.label7.TabIndex = 16;
+			this.label7.Text = "mp";
+			// 
+			// relsizey
+			// 
+			this.relsizey.AllowDecimal = true;
+			this.relsizey.AllowNegative = true;
+			this.relsizey.AllowRelative = true;
+			this.relsizey.ButtonStep = 1;
+			this.relsizey.ButtonStepBig = 10F;
+			this.relsizey.ButtonStepFloat = 1F;
+			this.relsizey.ButtonStepSmall = 0.1F;
+			this.relsizey.ButtonStepsUseModifierKeys = false;
+			this.relsizey.ButtonStepsWrapAround = false;
+			this.relsizey.Location = new System.Drawing.Point(136, 83);
+			this.relsizey.Name = "relsizey";
+			this.relsizey.Size = new System.Drawing.Size(72, 24);
+			this.relsizey.StepValues = null;
+			this.relsizey.TabIndex = 15;
+			this.relsizey.WhenEnterPressed += new System.EventHandler(this.relsizey_Validated);
+			this.relsizey.Validated += new System.EventHandler(this.relsizey_Validated);
+			this.relsizey.WhenButtonsClicked += new System.EventHandler(this.relsizey_Validated);
+			this.relsizey.WhenTextChanged += new System.EventHandler(this.WhenTextChanged);
+			// 
+			// relsizex
+			// 
+			this.relsizex.AllowDecimal = true;
+			this.relsizex.AllowNegative = true;
+			this.relsizex.AllowRelative = true;
+			this.relsizex.ButtonStep = 1;
+			this.relsizex.ButtonStepBig = 10F;
+			this.relsizex.ButtonStepFloat = 1F;
+			this.relsizex.ButtonStepSmall = 0.1F;
+			this.relsizex.ButtonStepsUseModifierKeys = false;
+			this.relsizex.ButtonStepsWrapAround = false;
+			this.relsizex.Location = new System.Drawing.Point(58, 83);
+			this.relsizex.Name = "relsizex";
+			this.relsizex.Size = new System.Drawing.Size(72, 24);
+			this.relsizex.StepValues = null;
+			this.relsizex.TabIndex = 14;
+			this.relsizex.WhenEnterPressed += new System.EventHandler(this.relsizex_Validated);
+			this.relsizex.Validated += new System.EventHandler(this.relsizex_Validated);
+			this.relsizex.WhenButtonsClicked += new System.EventHandler(this.relsizex_Validated);
+			this.relsizex.WhenTextChanged += new System.EventHandler(this.WhenTextChanged);
+			// 
+			// label4
+			// 
+			this.label4.AutoSize = true;
+			this.label4.Location = new System.Drawing.Point(15, 88);
+			this.label4.Name = "label4";
+			this.label4.Size = new System.Drawing.Size(37, 13);
+			this.label4.TabIndex = 13;
+			this.label4.Text = "Scale:";
+			// 
+			// abssizey
+			// 
+			this.abssizey.AllowDecimal = true;
+			this.abssizey.AllowNegative = true;
+			this.abssizey.AllowRelative = true;
+			this.abssizey.ButtonStep = 1;
+			this.abssizey.ButtonStepBig = 10F;
+			this.abssizey.ButtonStepFloat = 1F;
+			this.abssizey.ButtonStepSmall = 0.1F;
+			this.abssizey.ButtonStepsUseModifierKeys = false;
+			this.abssizey.ButtonStepsWrapAround = false;
+			this.abssizey.Location = new System.Drawing.Point(136, 53);
+			this.abssizey.Name = "abssizey";
+			this.abssizey.Size = new System.Drawing.Size(72, 24);
+			this.abssizey.StepValues = null;
+			this.abssizey.TabIndex = 12;
+			this.abssizey.WhenEnterPressed += new System.EventHandler(this.abssizey_Validated);
+			this.abssizey.Validated += new System.EventHandler(this.abssizey_Validated);
+			this.abssizey.WhenButtonsClicked += new System.EventHandler(this.abssizey_Validated);
+			this.abssizey.WhenTextChanged += new System.EventHandler(this.WhenTextChanged);
+			// 
+			// abssizex
+			// 
+			this.abssizex.AllowDecimal = true;
+			this.abssizex.AllowNegative = true;
+			this.abssizex.AllowRelative = true;
+			this.abssizex.ButtonStep = 1;
+			this.abssizex.ButtonStepBig = 10F;
+			this.abssizex.ButtonStepFloat = 1F;
+			this.abssizex.ButtonStepSmall = 0.1F;
+			this.abssizex.ButtonStepsUseModifierKeys = false;
+			this.abssizex.ButtonStepsWrapAround = false;
+			this.abssizex.Location = new System.Drawing.Point(58, 53);
+			this.abssizex.Name = "abssizex";
+			this.abssizex.Size = new System.Drawing.Size(72, 24);
+			this.abssizex.StepValues = null;
+			this.abssizex.TabIndex = 11;
+			this.abssizex.WhenEnterPressed += new System.EventHandler(this.abssizex_Validated);
+			this.abssizex.Validated += new System.EventHandler(this.abssizex_Validated);
+			this.abssizex.WhenButtonsClicked += new System.EventHandler(this.abssizex_Validated);
+			this.abssizex.WhenTextChanged += new System.EventHandler(this.WhenTextChanged);
+			// 
+			// label3
+			// 
+			this.label3.AutoSize = true;
+			this.label3.Location = new System.Drawing.Point(2, 58);
+			this.label3.Name = "label3";
+			this.label3.Size = new System.Drawing.Size(51, 13);
+			this.label3.TabIndex = 10;
+			this.label3.Text = "Absolute:";
+			// 
+			// groupBox3
+			// 
+			this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.groupBox3.Controls.Add(this.label14);
+			this.groupBox3.Controls.Add(this.flipv);
+			this.groupBox3.Controls.Add(this.fliph);
+			this.groupBox3.Controls.Add(this.label13);
+			this.groupBox3.Controls.Add(this.label11);
+			this.groupBox3.Controls.Add(this.absrot);
+			this.groupBox3.Location = new System.Drawing.Point(3, 272);
+			this.groupBox3.Name = "groupBox3";
+			this.groupBox3.Size = new System.Drawing.Size(243, 91);
+			this.groupBox3.TabIndex = 2;
+			this.groupBox3.TabStop = false;
+			this.groupBox3.Text = "Transform:";
+			// 
+			// label14
+			// 
+			this.label14.AutoSize = true;
+			this.label14.Location = new System.Drawing.Point(9, 61);
+			this.label14.Name = "label14";
+			this.label14.Size = new System.Drawing.Size(46, 13);
+			this.label14.TabIndex = 27;
+			this.label14.Text = "Flipping:";
+			// 
+			// flipv
+			// 
+			this.flipv.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+			this.flipv.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.FlipSelectionV;
+			this.flipv.Location = new System.Drawing.Point(94, 53);
+			this.flipv.Name = "flipv";
+			this.flipv.Size = new System.Drawing.Size(30, 30);
+			this.flipv.TabIndex = 26;
+			this.flipv.UseVisualStyleBackColor = true;
+			this.flipv.Click += new System.EventHandler(this.flipv_Click);
+			// 
+			// fliph
+			// 
+			this.fliph.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+			this.fliph.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.FlipSelectionH;
+			this.fliph.Location = new System.Drawing.Point(58, 53);
+			this.fliph.Name = "fliph";
+			this.fliph.Size = new System.Drawing.Size(30, 30);
+			this.fliph.TabIndex = 25;
+			this.fliph.UseVisualStyleBackColor = true;
+			this.fliph.Click += new System.EventHandler(this.fliph_Click);
+			// 
+			// label13
+			// 
+			this.label13.AutoSize = true;
+			this.label13.Location = new System.Drawing.Point(6, 28);
+			this.label13.Name = "label13";
+			this.label13.Size = new System.Drawing.Size(50, 13);
+			this.label13.TabIndex = 23;
+			this.label13.Text = "Rotation:";
+			// 
+			// label11
+			// 
+			this.label11.AutoSize = true;
+			this.label11.Location = new System.Drawing.Point(146, 28);
+			this.label11.Name = "label11";
+			this.label11.Size = new System.Drawing.Size(13, 13);
+			this.label11.TabIndex = 22;
+			this.label11.Text = "º";
+			// 
+			// absrot
+			// 
+			this.absrot.AllowDecimal = true;
+			this.absrot.AllowNegative = true;
+			this.absrot.AllowRelative = true;
+			this.absrot.ButtonStep = 1;
+			this.absrot.ButtonStepBig = 10F;
+			this.absrot.ButtonStepFloat = 1F;
+			this.absrot.ButtonStepSmall = 0.1F;
+			this.absrot.ButtonStepsUseModifierKeys = false;
+			this.absrot.ButtonStepsWrapAround = false;
+			this.absrot.Location = new System.Drawing.Point(58, 23);
+			this.absrot.Name = "absrot";
+			this.absrot.Size = new System.Drawing.Size(82, 24);
+			this.absrot.StepValues = null;
+			this.absrot.TabIndex = 24;
+			this.absrot.WhenEnterPressed += new System.EventHandler(this.absrot_Validated);
+			this.absrot.Validated += new System.EventHandler(this.absrot_Validated);
+			this.absrot.WhenButtonsClicked += new System.EventHandler(this.absrot_Validated);
+			this.absrot.WhenTextChanged += new System.EventHandler(this.WhenTextChanged);
+			// 
+			// ceiltexgroup
+			// 
+			this.ceiltexgroup.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.ceiltexgroup.Controls.Add(this.ceiltexoffset);
+			this.ceiltexgroup.Controls.Add(this.ceiltexrotation);
+			this.ceiltexgroup.Controls.Add(this.ceiltexscale);
+			this.ceiltexgroup.Location = new System.Drawing.Point(3, 369);
+			this.ceiltexgroup.Name = "ceiltexgroup";
+			this.ceiltexgroup.Size = new System.Drawing.Size(243, 58);
+			this.ceiltexgroup.TabIndex = 3;
+			this.ceiltexgroup.TabStop = false;
+			this.ceiltexgroup.Text = "  ";
+			// 
+			// ceiltexoffset
+			// 
+			this.ceiltexoffset.AutoSize = true;
+			this.ceiltexoffset.Location = new System.Drawing.Point(27, 28);
+			this.ceiltexoffset.Name = "ceiltexoffset";
+			this.ceiltexoffset.Size = new System.Drawing.Size(54, 17);
+			this.ceiltexoffset.TabIndex = 30;
+			this.ceiltexoffset.Text = "Offset";
+			this.ceiltexoffset.UseVisualStyleBackColor = true;
+			this.ceiltexoffset.CheckedChanged += new System.EventHandler(this.ceiltexoffset_CheckedChanged);
+			// 
+			// ceiltexrotation
+			// 
+			this.ceiltexrotation.AutoSize = true;
+			this.ceiltexrotation.Location = new System.Drawing.Point(89, 28);
+			this.ceiltexrotation.Name = "ceiltexrotation";
+			this.ceiltexrotation.Size = new System.Drawing.Size(66, 17);
+			this.ceiltexrotation.TabIndex = 32;
+			this.ceiltexrotation.Text = "Rotation";
+			this.ceiltexrotation.UseVisualStyleBackColor = true;
+			this.ceiltexrotation.CheckedChanged += new System.EventHandler(this.ceiltexrotation_CheckedChanged);
+			// 
+			// ceiltexscale
+			// 
+			this.ceiltexscale.AutoSize = true;
+			this.ceiltexscale.Location = new System.Drawing.Point(163, 28);
+			this.ceiltexscale.Name = "ceiltexscale";
+			this.ceiltexscale.Size = new System.Drawing.Size(53, 17);
+			this.ceiltexscale.TabIndex = 35;
+			this.ceiltexscale.Text = "Scale";
+			this.ceiltexscale.UseVisualStyleBackColor = true;
+			this.ceiltexscale.CheckedChanged += new System.EventHandler(this.ceiltexscale_CheckedChanged);
+			// 
+			// ceiltexall
+			// 
+			this.ceiltexall.AutoSize = true;
+			this.ceiltexall.Location = new System.Drawing.Point(14, 368);
+			this.ceiltexall.Name = "ceiltexall";
+			this.ceiltexall.Size = new System.Drawing.Size(154, 17);
+			this.ceiltexall.TabIndex = 37;
+			this.ceiltexall.Text = "Ceiling Textures Transform:";
+			this.ceiltexall.UseVisualStyleBackColor = true;
+			this.ceiltexall.CheckedChanged += new System.EventHandler(this.ceiltexall_CheckedChanged);
+			// 
+			// floortexrotation
+			// 
+			this.floortexrotation.AutoSize = true;
+			this.floortexrotation.Location = new System.Drawing.Point(89, 28);
+			this.floortexrotation.Name = "floortexrotation";
+			this.floortexrotation.Size = new System.Drawing.Size(66, 17);
+			this.floortexrotation.TabIndex = 31;
+			this.floortexrotation.Text = "Rotation";
+			this.floortexrotation.UseVisualStyleBackColor = true;
+			this.floortexrotation.CheckedChanged += new System.EventHandler(this.floortexrotation_CheckedChanged);
+			// 
+			// floortexoffset
+			// 
+			this.floortexoffset.AutoSize = true;
+			this.floortexoffset.Location = new System.Drawing.Point(27, 28);
+			this.floortexoffset.Name = "floortexoffset";
+			this.floortexoffset.Size = new System.Drawing.Size(54, 17);
+			this.floortexoffset.TabIndex = 4;
+			this.floortexoffset.Text = "Offset";
+			this.floortexoffset.UseVisualStyleBackColor = true;
+			this.floortexoffset.CheckedChanged += new System.EventHandler(this.floortexoffset_CheckedChanged);
+			// 
+			// floortexscale
+			// 
+			this.floortexscale.AutoSize = true;
+			this.floortexscale.Location = new System.Drawing.Point(163, 28);
+			this.floortexscale.Name = "floortexscale";
+			this.floortexscale.Size = new System.Drawing.Size(53, 17);
+			this.floortexscale.TabIndex = 34;
+			this.floortexscale.Text = "Scale";
+			this.floortexscale.UseVisualStyleBackColor = true;
+			this.floortexscale.CheckedChanged += new System.EventHandler(this.floortexscale_CheckedChanged);
+			// 
+			// floortexall
+			// 
+			this.floortexall.AutoSize = true;
+			this.floortexall.Location = new System.Drawing.Point(14, 432);
+			this.floortexall.Name = "floortexall";
+			this.floortexall.Size = new System.Drawing.Size(146, 17);
+			this.floortexall.TabIndex = 36;
+			this.floortexall.Text = "Floor Textures Transform:";
+			this.floortexall.UseVisualStyleBackColor = true;
+			this.floortexall.CheckedChanged += new System.EventHandler(this.floortexall_CheckedChanged);
+			// 
+			// floortexgroup
+			// 
+			this.floortexgroup.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.floortexgroup.Controls.Add(this.floortexoffset);
+			this.floortexgroup.Controls.Add(this.floortexrotation);
+			this.floortexgroup.Controls.Add(this.floortexscale);
+			this.floortexgroup.Location = new System.Drawing.Point(3, 433);
+			this.floortexgroup.Name = "floortexgroup";
+			this.floortexgroup.Size = new System.Drawing.Size(243, 58);
+			this.floortexgroup.TabIndex = 38;
+			this.floortexgroup.TabStop = false;
+			this.floortexgroup.Text = "  ";
+			// 
+			// EditSelectionPanel
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.Controls.Add(this.ceiltexall);
+			this.Controls.Add(this.floortexall);
+			this.Controls.Add(this.floortexgroup);
+			this.Controls.Add(this.ceiltexgroup);
+			this.Controls.Add(this.groupBox3);
+			this.Controls.Add(this.groupBox2);
+			this.Controls.Add(this.groupBox1);
+			this.Name = "EditSelectionPanel";
+			this.Size = new System.Drawing.Size(249, 652);
+			this.groupBox1.ResumeLayout(false);
+			this.groupBox1.PerformLayout();
+			this.groupBox2.ResumeLayout(false);
+			this.groupBox2.PerformLayout();
+			this.groupBox3.ResumeLayout(false);
+			this.groupBox3.PerformLayout();
+			this.ceiltexgroup.ResumeLayout(false);
+			this.ceiltexgroup.PerformLayout();
+			this.floortexgroup.ResumeLayout(false);
+			this.floortexgroup.PerformLayout();
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.GroupBox groupBox1;
+		private System.Windows.Forms.GroupBox groupBox2;
+		private System.Windows.Forms.GroupBox groupBox3;
+		private System.Windows.Forms.Label label2;
+		private System.Windows.Forms.Label label1;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox relposy;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox relposx;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox absposy;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox absposx;
+		private System.Windows.Forms.Label label6;
+		private System.Windows.Forms.Label label5;
+		private System.Windows.Forms.Label label8;
+		private System.Windows.Forms.Label label7;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox relsizey;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox relsizex;
+		private System.Windows.Forms.Label label4;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox abssizey;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox abssizex;
+		private System.Windows.Forms.Label label3;
+		private System.Windows.Forms.Label label9;
+		private System.Windows.Forms.Label label12;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox absrot;
+		private System.Windows.Forms.Label label13;
+		private System.Windows.Forms.Label label11;
+		private System.Windows.Forms.Label label14;
+		private System.Windows.Forms.Button flipv;
+		private System.Windows.Forms.Button fliph;
+		private System.Windows.Forms.Label label16;
+		private System.Windows.Forms.Label label19;
+		private System.Windows.Forms.Button orgposx;
+		private System.Windows.Forms.Button orgposy;
+		private System.Windows.Forms.Button orgsizey;
+		private System.Windows.Forms.Button orgsizex;
+		private System.Windows.Forms.GroupBox ceiltexgroup;
+		private System.Windows.Forms.CheckBox ceiltexrotation;
+		private System.Windows.Forms.CheckBox floortexrotation;
+		private System.Windows.Forms.CheckBox ceiltexoffset;
+		private System.Windows.Forms.CheckBox floortexoffset;
+		private System.Windows.Forms.CheckBox ceiltexscale;
+		private System.Windows.Forms.CheckBox floortexscale;
+		private System.Windows.Forms.CheckBox ceiltexall;
+		private System.Windows.Forms.CheckBox floortexall;
+		private System.Windows.Forms.GroupBox floortexgroup;
+		private System.Windows.Forms.CheckBox preciseposition;
+		private System.Windows.Forms.ToolTip tooltip;
+	}
+}
diff --git a/Source/Plugins/BuilderModes/Interface/EditSelectionPanel.cs b/Source/Plugins/BuilderModes/Interface/EditSelectionPanel.cs
new file mode 100644
index 0000000..c90399a
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/EditSelectionPanel.cs
@@ -0,0 +1,373 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Geometry;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	public partial class EditSelectionPanel : UserControl
+	{
+		#region ================== Constants
+		
+		#endregion
+		
+		#region ================== Variables
+		
+		// Editing mode
+		readonly EditSelectionMode mode;
+		
+		// Input
+		private bool userinput;
+		private bool preventchanges; //mxd
+		
+		// Values
+		Vector2D orgpos;
+		Vector2D orgsize;
+		Vector2D abspos;
+		Vector2D relpos;
+		Vector2D abssize;
+		Vector2D relsize;
+		float absrotate;
+		
+		#endregion
+		
+		#region ================== Constructor
+		
+		// Constructor
+		public EditSelectionPanel(EditSelectionMode mode)
+		{
+			InitializeComponent();
+			this.mode = mode;
+
+			//mxd
+			if(General.Map.UDMF)
+			{
+				preciseposition.Checked = mode.UsePrecisePosition;
+				preciseposition.Enabled = true;
+				preciseposition.CheckedChanged += preciseposition_CheckedChanged;
+			}
+			else
+			{
+				preciseposition.Checked = false;
+				preciseposition.Enabled = false;
+			}
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+		
+		// This sets the original size
+		public void ShowOriginalValues(Vector2D pos, Vector2D size)
+		{
+			// Set values
+			this.orgpos = pos;
+			this.orgsize = size;
+			
+			// Set controls
+			orgposx.Text = pos.x.ToString();
+			orgposy.Text = pos.y.ToString();
+			orgsizex.Text = size.x.ToString();
+			orgsizey.Text = size.y.ToString();
+		}
+		
+		// This sets the dynamic values
+		public void ShowCurrentValues(Vector2D pos, Vector2D relpos, Vector2D size, Vector2D relsize, float rotation)
+		{
+			// Set values
+			this.abspos = pos;
+			this.relpos = relpos;
+			this.abssize = size;
+			this.relsize = relsize;
+			this.absrotate = Angle2D.RadToDeg(rotation);
+			
+			// Set controls
+			absposx.Text = pos.x.ToString("0.#");
+			absposy.Text = pos.y.ToString("0.#");
+			relposx.Text = relpos.x.ToString("0.#");
+			relposy.Text = relpos.y.ToString("0.#");
+			abssizex.Text = size.x.ToString("0.#");
+			abssizey.Text = size.y.ToString("0.#");
+			relsizex.Text = relsize.x.ToString("0.#");
+			relsizey.Text = relsize.y.ToString("0.#");
+			absrot.Text = this.absrotate.ToString("0.#");
+			
+			userinput = false;
+		}
+
+		//mxd
+		internal void SetTextureTransformSettings(bool enable)
+		{
+			// Disable groups?
+			if(!enable)
+			{
+				ceiltexgroup.Enabled = false;
+				floortexgroup.Enabled = false;
+				ceiltexall.Enabled = false;
+				floortexall.Enabled = false;
+				return;
+			}
+
+			// Update checkboxes
+			preventchanges = true;
+
+			floortexoffset.Checked = mode.TransformFloorOffsets;
+			ceiltexoffset.Checked = mode.TransformCeilingOffsets;
+			floortexrotation.Checked = mode.RotateFloorOffsets;
+			ceiltexrotation.Checked = mode.RotateCeilingOffsets;
+			floortexscale.Checked = mode.ScaleFloorOffsets;
+			ceiltexscale.Checked = mode.ScaleCeilingOffsets;
+			floortexall.Checked = (mode.TransformFloorOffsets && mode.RotateFloorOffsets && mode.ScaleFloorOffsets);
+			ceiltexall.Checked = (mode.TransformCeilingOffsets && mode.RotateCeilingOffsets && mode.ScaleCeilingOffsets);
+
+			preventchanges = false;
+		}
+
+		//mxd
+		private void UpdateAllFloorTransformsCheckbox()
+		{
+			preventchanges = true;
+
+			int i = 0;
+			if(floortexoffset.Checked) i++;
+			if(floortexrotation.Checked) i++;
+			if(floortexscale.Checked) i++;
+			floortexall.Checked = (i == 3);
+
+			preventchanges = false;
+		}
+
+		//mxd
+		private void UpdateAllCeilingTransformsCheckbox() 
+		{
+			preventchanges = true;
+
+			int i = 0;
+			if(ceiltexoffset.Checked) i++;
+			if(ceiltexrotation.Checked) i++;
+			if(ceiltexscale.Checked) i++;
+			ceiltexall.Checked = (i == 3);
+
+			preventchanges = false;
+		}
+		
+		#endregion
+		
+		#region ================== Events
+		
+		// User input given
+		private void WhenTextChanged(object sender, EventArgs e)
+		{
+			userinput = true;
+		}
+		
+		private void absposx_Validated(object sender, EventArgs e)
+		{
+			if(userinput)
+				mode.SetAbsPosX(absposx.GetResultFloat(this.abspos.x));
+		}
+
+		private void absposy_Validated(object sender, EventArgs e)
+		{
+			if(userinput)
+				mode.SetAbsPosY(absposy.GetResultFloat(this.abspos.y));
+		}
+
+		private void relposx_Validated(object sender, EventArgs e)
+		{
+			if(userinput)
+				mode.SetRelPosX(relposx.GetResultFloat(this.relpos.x));
+		}
+
+		private void relposy_Validated(object sender, EventArgs e)
+		{
+			if(userinput)
+				mode.SetRelPosY(relposy.GetResultFloat(this.relpos.y));
+		}
+
+		private void abssizex_Validated(object sender, EventArgs e)
+		{
+			if(userinput)
+				mode.SetAbsSizeX(abssizex.GetResultFloat(this.abssize.x));
+		}
+
+		private void abssizey_Validated(object sender, EventArgs e)
+		{
+			if(userinput)
+				mode.SetAbsSizeY(abssizey.GetResultFloat(this.abssize.y));
+		}
+
+		private void relsizex_Validated(object sender, EventArgs e)
+		{
+			if(userinput)
+				mode.SetRelSizeX(relsizex.GetResultFloat(this.relsize.x));
+		}
+
+		private void relsizey_Validated(object sender, EventArgs e)
+		{
+			if(userinput)
+				mode.SetRelSizeY(relsizey.GetResultFloat(this.relsize.y));
+		}
+
+		private void absrot_Validated(object sender, EventArgs e)
+		{
+			if(userinput)
+			{
+				float rad = Angle2D.DegToRad(absrot.GetResultFloat(this.absrotate));
+				mode.SetAbsRotation(rad);
+			}
+		}
+
+		private void fliph_Click(object sender, EventArgs e)
+		{
+			General.Actions.InvokeAction("buildermodes_flipselectionh");
+			General.Interface.FocusDisplay();
+		}
+
+		private void flipv_Click(object sender, EventArgs e)
+		{
+			General.Actions.InvokeAction("buildermodes_flipselectionv");
+			General.Interface.FocusDisplay();
+		}
+
+		private void orgposx_Click(object sender, EventArgs e)
+		{
+			mode.SetAbsPosX(orgpos.x);
+			General.Interface.FocusDisplay();
+		}
+
+		private void orgposy_Click(object sender, EventArgs e)
+		{
+			mode.SetAbsPosY(orgpos.y);
+			General.Interface.FocusDisplay();
+		}
+
+		private void orgsizex_Click(object sender, EventArgs e)
+		{
+			mode.SetAbsSizeX(orgsize.x);
+			General.Interface.FocusDisplay();
+		}
+
+		private void orgsizey_Click(object sender, EventArgs e)
+		{
+			mode.SetAbsSizeY(orgsize.y);
+			General.Interface.FocusDisplay();
+		}
+
+		//mxd
+		private void floortexoffset_CheckedChanged(object sender, EventArgs e)
+		{
+			if(preventchanges) return;
+			mode.TransformFloorOffsets = floortexoffset.Checked;
+			UpdateAllFloorTransformsCheckbox();
+			General.Interface.FocusDisplay();
+		}
+
+		//mxd
+		private void ceiltexoffset_CheckedChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			mode.TransformCeilingOffsets = ceiltexoffset.Checked;
+			UpdateAllCeilingTransformsCheckbox();
+			General.Interface.FocusDisplay();
+		}
+
+		//mxd
+		private void floortexrotation_CheckedChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			mode.RotateFloorOffsets = floortexrotation.Checked;
+			UpdateAllFloorTransformsCheckbox();
+			General.Interface.FocusDisplay();
+		}
+
+		//mxd
+		private void ceiltexrotation_CheckedChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			mode.RotateCeilingOffsets = ceiltexrotation.Checked;
+			UpdateAllCeilingTransformsCheckbox();
+			General.Interface.FocusDisplay();
+		}
+
+		//mxd
+		private void floortexscale_CheckedChanged(object sender, EventArgs e)
+		{
+			if(preventchanges) return;
+			mode.ScaleFloorOffsets = floortexscale.Checked;
+			UpdateAllFloorTransformsCheckbox();
+			General.Interface.FocusDisplay();
+		}
+
+		//mxd
+		private void ceiltexscale_CheckedChanged(object sender, EventArgs e)
+		{
+			if(preventchanges) return;
+			mode.ScaleCeilingOffsets = ceiltexscale.Checked;
+			UpdateAllCeilingTransformsCheckbox();
+			General.Interface.FocusDisplay();
+		}
+
+		//mxd
+		private void floortexall_CheckedChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			preventchanges = true;
+
+			floortexoffset.Checked = floortexall.Checked;
+			floortexrotation.Checked = floortexall.Checked;
+			floortexscale.Checked = floortexall.Checked;
+
+			mode.TransformFloorOffsets = floortexoffset.Checked;
+			mode.RotateFloorOffsets = floortexrotation.Checked;
+			mode.ScaleFloorOffsets = floortexscale.Checked;
+
+			preventchanges = false;
+		}
+
+		//mxd
+		private void ceiltexall_CheckedChanged(object sender, EventArgs e) 
+		{
+			if(preventchanges) return;
+			preventchanges = true;
+
+			ceiltexoffset.Checked = ceiltexall.Checked;
+			ceiltexrotation.Checked = ceiltexall.Checked;
+			ceiltexscale.Checked = ceiltexall.Checked;
+
+			mode.TransformCeilingOffsets = ceiltexoffset.Checked;
+			mode.RotateCeilingOffsets = ceiltexrotation.Checked;
+			mode.ScaleCeilingOffsets = ceiltexscale.Checked;
+
+			preventchanges = false;
+		}
+
+		//mxd
+		private void preciseposition_CheckedChanged(object sender, EventArgs e) 
+		{
+			mode.UsePrecisePosition = preciseposition.Checked;
+			General.Interface.FocusDisplay();
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/Interface/EditSelectionPanel.resx b/Source/Plugins/BuilderModes/Interface/EditSelectionPanel.resx
new file mode 100644
index 0000000..aa747e0
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/EditSelectionPanel.resx
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/BuilderModes/Interface/ErrorCheckForm.Designer.cs b/Source/Plugins/BuilderModes/Interface/ErrorCheckForm.Designer.cs
new file mode 100644
index 0000000..9c52410
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/ErrorCheckForm.Designer.cs
@@ -0,0 +1,326 @@
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	partial class ErrorCheckForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.components = new System.ComponentModel.Container();
+			this.checks = new CodeImp.DoomBuilder.Controls.CheckboxArrayControl();
+			this.buttoncheck = new System.Windows.Forms.Button();
+			this.results = new System.Windows.Forms.ListBox();
+			this.resultcontextmenustrip = new System.Windows.Forms.ContextMenuStrip(this.components);
+			this.resultselectcurrenttype = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
+			this.resultshowall = new System.Windows.Forms.ToolStripMenuItem();
+			this.resulthidecurrent = new System.Windows.Forms.ToolStripMenuItem();
+			this.resulthidecurrenttype = new System.Windows.Forms.ToolStripMenuItem();
+			this.resultshowonlycurrent = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+			this.resultcopytoclipboard = new System.Windows.Forms.ToolStripMenuItem();
+			this.resultspanel = new System.Windows.Forms.Panel();
+			this.fix3 = new System.Windows.Forms.Button();
+			this.fix2 = new System.Windows.Forms.Button();
+			this.resultinfo = new System.Windows.Forms.Label();
+			this.fix1 = new System.Windows.Forms.Button();
+			this.progress = new System.Windows.Forms.ProgressBar();
+			this.closebutton = new System.Windows.Forms.Button();
+			this.toggleall = new System.Windows.Forms.CheckBox();
+			this.resultcontextmenustrip.SuspendLayout();
+			this.resultspanel.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// checks
+			// 
+			this.checks.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.checks.AutoScroll = true;
+			this.checks.AutoSize = true;
+			this.checks.Columns = 2;
+			this.checks.Location = new System.Drawing.Point(10, 32);
+			this.checks.Margin = new System.Windows.Forms.Padding(1);
+			this.checks.Name = "checks";
+			this.checks.Size = new System.Drawing.Size(360, 53);
+			this.checks.TabIndex = 0;
+			this.checks.VerticalSpacing = 1;
+			// 
+			// buttoncheck
+			// 
+			this.buttoncheck.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.buttoncheck.Location = new System.Drawing.Point(10, 89);
+			this.buttoncheck.Margin = new System.Windows.Forms.Padding(1);
+			this.buttoncheck.Name = "buttoncheck";
+			this.buttoncheck.Size = new System.Drawing.Size(360, 26);
+			this.buttoncheck.TabIndex = 1;
+			this.buttoncheck.Text = "Start Analysis";
+			this.buttoncheck.UseVisualStyleBackColor = true;
+			this.buttoncheck.Click += new System.EventHandler(this.buttoncheck_Click);
+			// 
+			// results
+			// 
+			this.results.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.results.ContextMenuStrip = this.resultcontextmenustrip;
+			this.results.FormattingEnabled = true;
+			this.results.HorizontalScrollbar = true;
+			this.results.IntegralHeight = false;
+			this.results.Location = new System.Drawing.Point(10, 34);
+			this.results.Name = "results";
+			this.results.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended;
+			this.results.Size = new System.Drawing.Size(360, 290);
+			this.results.Sorted = true;
+			this.results.TabIndex = 0;
+			this.results.SelectedIndexChanged += new System.EventHandler(this.results_SelectedIndexChanged);
+			this.results.KeyUp += new System.Windows.Forms.KeyEventHandler(this.results_KeyUp);
+			// 
+			// resultcontextmenustrip
+			// 
+			this.resultcontextmenustrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.resultselectcurrenttype,
+            this.toolStripSeparator2,
+            this.resultshowall,
+            this.resulthidecurrent,
+            this.resulthidecurrenttype,
+            this.resultshowonlycurrent,
+            this.toolStripSeparator1,
+            this.resultcopytoclipboard});
+			this.resultcontextmenustrip.Name = "resultcontextmenustrip";
+			this.resultcontextmenustrip.Size = new System.Drawing.Size(245, 148);
+			this.resultcontextmenustrip.Opening += new System.ComponentModel.CancelEventHandler(this.resultcontextmenustrip_Opening);
+			// 
+			// resultselectcurrenttype
+			// 
+			this.resultselectcurrenttype.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.Show3;
+			this.resultselectcurrenttype.Name = "resultselectcurrenttype";
+			this.resultselectcurrenttype.Size = new System.Drawing.Size(244, 22);
+			this.resultselectcurrenttype.Text = "Select results of this type(s)";
+			this.resultselectcurrenttype.Click += new System.EventHandler(this.resultselectcurrenttype_Click);
+			// 
+			// toolStripSeparator2
+			// 
+			this.toolStripSeparator2.Name = "toolStripSeparator2";
+			this.toolStripSeparator2.Size = new System.Drawing.Size(241, 6);
+			// 
+			// resultshowall
+			// 
+			this.resultshowall.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.Show;
+			this.resultshowall.Name = "resultshowall";
+			this.resultshowall.Size = new System.Drawing.Size(244, 22);
+			this.resultshowall.Text = "Show all results";
+			this.resultshowall.Click += new System.EventHandler(this.resultshowall_Click);
+			// 
+			// resulthidecurrent
+			// 
+			this.resulthidecurrent.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.Hide;
+			this.resulthidecurrent.Name = "resulthidecurrent";
+			this.resulthidecurrent.Size = new System.Drawing.Size(244, 22);
+			this.resulthidecurrent.Text = "Hide selected results";
+			this.resulthidecurrent.Click += new System.EventHandler(this.resulthidecurrent_Click);
+			// 
+			// resulthidecurrenttype
+			// 
+			this.resulthidecurrenttype.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.HideAll;
+			this.resulthidecurrenttype.Name = "resulthidecurrenttype";
+			this.resulthidecurrenttype.Size = new System.Drawing.Size(244, 22);
+			this.resulthidecurrenttype.Text = "Hide results of this type(s)";
+			this.resulthidecurrenttype.Click += new System.EventHandler(this.resulthidecurrenttype_Click);
+			// 
+			// resultshowonlycurrent
+			// 
+			this.resultshowonlycurrent.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.Show2;
+			this.resultshowonlycurrent.Name = "resultshowonlycurrent";
+			this.resultshowonlycurrent.Size = new System.Drawing.Size(244, 22);
+			this.resultshowonlycurrent.Text = "Show only results of this type(s)";
+			this.resultshowonlycurrent.Click += new System.EventHandler(this.resultshowonlycurrent_Click);
+			// 
+			// toolStripSeparator1
+			// 
+			this.toolStripSeparator1.Name = "toolStripSeparator1";
+			this.toolStripSeparator1.Size = new System.Drawing.Size(241, 6);
+			// 
+			// resultcopytoclipboard
+			// 
+			this.resultcopytoclipboard.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.Copy;
+			this.resultcopytoclipboard.Name = "resultcopytoclipboard";
+			this.resultcopytoclipboard.Size = new System.Drawing.Size(244, 22);
+			this.resultcopytoclipboard.Text = "Copy description(s) to clipboard";
+			this.resultcopytoclipboard.Click += new System.EventHandler(this.resultcopytoclipboard_Click);
+			// 
+			// resultspanel
+			// 
+			this.resultspanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.resultspanel.Controls.Add(this.fix3);
+			this.resultspanel.Controls.Add(this.fix2);
+			this.resultspanel.Controls.Add(this.resultinfo);
+			this.resultspanel.Controls.Add(this.fix1);
+			this.resultspanel.Controls.Add(this.progress);
+			this.resultspanel.Controls.Add(this.results);
+			this.resultspanel.Location = new System.Drawing.Point(0, 124);
+			this.resultspanel.Name = "resultspanel";
+			this.resultspanel.Size = new System.Drawing.Size(379, 442);
+			this.resultspanel.TabIndex = 2;
+			// 
+			// fix3
+			// 
+			this.fix3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.fix3.Location = new System.Drawing.Point(256, 404);
+			this.fix3.Name = "fix3";
+			this.fix3.Size = new System.Drawing.Size(114, 26);
+			this.fix3.TabIndex = 3;
+			this.fix3.Text = "Fix 3";
+			this.fix3.UseVisualStyleBackColor = true;
+			this.fix3.Visible = false;
+			this.fix3.Click += new System.EventHandler(this.fix3_Click);
+			// 
+			// fix2
+			// 
+			this.fix2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.fix2.Location = new System.Drawing.Point(133, 404);
+			this.fix2.Name = "fix2";
+			this.fix2.Size = new System.Drawing.Size(114, 26);
+			this.fix2.TabIndex = 2;
+			this.fix2.Text = "Fix 2";
+			this.fix2.UseVisualStyleBackColor = true;
+			this.fix2.Visible = false;
+			this.fix2.Click += new System.EventHandler(this.fix2_Click);
+			// 
+			// resultinfo
+			// 
+			this.resultinfo.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.resultinfo.Enabled = false;
+			this.resultinfo.Location = new System.Drawing.Point(12, 327);
+			this.resultinfo.Name = "resultinfo";
+			this.resultinfo.Size = new System.Drawing.Size(358, 74);
+			this.resultinfo.TabIndex = 5;
+			this.resultinfo.Text = "Select a result from the list to see more information.\r\nRight-click on a result t" +
+				"o show context menu.";
+			// 
+			// fix1
+			// 
+			this.fix1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.fix1.Location = new System.Drawing.Point(10, 404);
+			this.fix1.Name = "fix1";
+			this.fix1.Size = new System.Drawing.Size(114, 26);
+			this.fix1.TabIndex = 1;
+			this.fix1.Text = "Fix 1";
+			this.fix1.UseVisualStyleBackColor = true;
+			this.fix1.Visible = false;
+			this.fix1.Click += new System.EventHandler(this.fix1_Click);
+			// 
+			// progress
+			// 
+			this.progress.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.progress.Location = new System.Drawing.Point(10, 3);
+			this.progress.Margin = new System.Windows.Forms.Padding(1);
+			this.progress.Name = "progress";
+			this.progress.Size = new System.Drawing.Size(360, 18);
+			this.progress.TabIndex = 3;
+			this.progress.Value = 30;
+			// 
+			// closebutton
+			// 
+			this.closebutton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.closebutton.Location = new System.Drawing.Point(-500, 134);
+			this.closebutton.Name = "closebutton";
+			this.closebutton.Size = new System.Drawing.Size(116, 25);
+			this.closebutton.TabIndex = 4;
+			this.closebutton.Text = "Close";
+			this.closebutton.UseVisualStyleBackColor = true;
+			this.closebutton.Click += new System.EventHandler(this.closebutton_Click);
+			// 
+			// toggleall
+			// 
+			this.toggleall.AutoSize = true;
+			this.toggleall.Checked = true;
+			this.toggleall.CheckState = System.Windows.Forms.CheckState.Checked;
+			this.toggleall.Location = new System.Drawing.Point(10, 12);
+			this.toggleall.Name = "toggleall";
+			this.toggleall.Size = new System.Drawing.Size(72, 17);
+			this.toggleall.TabIndex = 5;
+			this.toggleall.Text = "Toggle all";
+			this.toggleall.UseVisualStyleBackColor = true;
+			this.toggleall.CheckedChanged += new System.EventHandler(this.toggleall_CheckedChanged);
+			// 
+			// ErrorCheckForm
+			// 
+			this.AcceptButton = this.buttoncheck;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.CancelButton = this.closebutton;
+			this.ClientSize = new System.Drawing.Size(380, 566);
+			this.Controls.Add(this.toggleall);
+			this.Controls.Add(this.closebutton);
+			this.Controls.Add(this.resultspanel);
+			this.Controls.Add(this.buttoncheck);
+			this.Controls.Add(this.checks);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "ErrorCheckForm";
+			this.Opacity = 1;
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
+			this.Text = "Map Analysis";
+			this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.ErrorCheckForm_FormClosing);
+			this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.ErrorCheckForm_HelpRequested);
+			this.resultcontextmenustrip.ResumeLayout(false);
+			this.resultspanel.ResumeLayout(false);
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private CodeImp.DoomBuilder.Controls.CheckboxArrayControl checks;
+		private System.Windows.Forms.Button buttoncheck;
+		private System.Windows.Forms.ListBox results;
+		private System.Windows.Forms.Panel resultspanel;
+		private System.Windows.Forms.ProgressBar progress;
+		private System.Windows.Forms.Button fix3;
+		private System.Windows.Forms.Button fix2;
+		private System.Windows.Forms.Label resultinfo;
+		private System.Windows.Forms.Button fix1;
+		private System.Windows.Forms.Button closebutton;
+		private System.Windows.Forms.ContextMenuStrip resultcontextmenustrip;
+		private System.Windows.Forms.ToolStripMenuItem resultshowall;
+		private System.Windows.Forms.ToolStripMenuItem resulthidecurrenttype;
+		private System.Windows.Forms.ToolStripMenuItem resultshowonlycurrent;
+		private System.Windows.Forms.ToolStripMenuItem resultcopytoclipboard;
+		private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
+		private System.Windows.Forms.ToolStripMenuItem resulthidecurrent;
+		private System.Windows.Forms.CheckBox toggleall;
+		private System.Windows.Forms.ToolStripMenuItem resultselectcurrenttype;
+		private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
+	}
+}
\ No newline at end of file
diff --git a/Source/Plugins/BuilderModes/Interface/ErrorCheckForm.cs b/Source/Plugins/BuilderModes/Interface/ErrorCheckForm.cs
new file mode 100644
index 0000000..a782ef9
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/ErrorCheckForm.cs
@@ -0,0 +1,802 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Editing;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Windows;
+using System.Reflection;
+using System.Globalization;
+using System.Threading;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	public partial class ErrorCheckForm : DelayedForm
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Delegates
+
+		private delegate void CallVoidMethodDeletage();
+		private delegate void CallIntMethodDelegate(int i);
+		private delegate void CallResultMethodDelegate(ErrorResult r);
+		
+		#endregion
+		
+		#region ================== Variables
+		
+		private volatile bool running;
+		private Thread checksthread;
+		private BlockMap<BlockEntry> blockmap;
+		private Size initialsize; //mxd
+		private List<ErrorResult> resultslist; //mxd 
+		private List<Type> hiddentresulttypes; //mxd 
+		private bool bathselectioninprogress; //mxd
+		
+		#endregion
+
+		#region ================== Properties
+		
+		public List<ErrorResult> SelectedResults { 
+			get 
+			{
+				List<ErrorResult> selection = new List<ErrorResult>();
+				foreach(Object ro in results.SelectedItems)
+				{
+					ErrorResult result = ro as ErrorResult;
+					if(result == null) continue;
+					selection.Add(result);
+				}
+				return selection;
+			} 
+		}
+		public BlockMap<BlockEntry> BlockMap { get { return blockmap; } }
+		
+		#endregion
+		
+		#region ================== Constructor / Show
+
+		// Constructor
+		public ErrorCheckForm()
+		{
+			// Initialize
+			InitializeComponent();
+			
+			// Find all error checkers
+			Type[] checkertypes = BuilderPlug.Me.FindClasses(typeof(ErrorChecker));
+			foreach(Type t in checkertypes)
+			{
+				object[] attr = t.GetCustomAttributes(typeof(ErrorCheckerAttribute), true);
+				if(attr.Length > 0)
+				{
+					ErrorCheckerAttribute checkerattr = (attr[0] as ErrorCheckerAttribute);
+					
+					// Add the type to the checkbox list
+					CheckBox c = checks.Add(checkerattr.DisplayName, t);
+					c.Checked = checkerattr.DefaultChecked;
+				}
+			}
+			checks.Sort(); //mxd
+
+			//mxd. Store initial height
+			initialsize = this.Size;
+			resultslist = new List<ErrorResult>();
+			hiddentresulttypes = new List<Type>();
+		}
+		
+		// This shows the window
+		public void Show(Form owner)
+		{
+			// Move controls according to the height of the checkers box
+			checks.PerformLayout();
+			buttoncheck.Top = checks.Bottom + 14;
+			resultspanel.Top = buttoncheck.Bottom + 14;
+			this.Text = "Map Analysis"; //mxd
+
+			// Position at left-top of owner
+			this.Location = new Point(owner.Location.X + 20, owner.Location.Y + 90);
+			
+			// Close results part
+			resultspanel.Visible = false;
+			this.Size = new Size(initialsize.Width, this.Height - this.ClientSize.Height + resultspanel.Top);
+			this.MinimumSize = this.Size; //mxd
+			this.MaximumSize = this.Size; //mxd
+			
+			// Show window
+			base.Show(owner);
+		}
+		
+		#endregion
+		
+		#region ================== Thread Calls
+
+		public void SubmitResult(ErrorResult result)
+		{
+			if(results.InvokeRequired)
+			{
+				CallResultMethodDelegate d = SubmitResult;
+				try { progress.Invoke(d, result); }
+				catch(ThreadInterruptedException) { }
+			}
+			else
+			{
+				if(!result.IsHidden && !hiddentresulttypes.Contains(result.GetType())) //mxd
+				{
+					results.Items.Add(result);
+				}
+				resultslist.Add(result); //mxd
+				UpdateTitle();
+			}
+		}
+
+		private void SetProgressMaximum(int maximum)
+		{
+			if(progress.InvokeRequired)
+			{
+				CallIntMethodDelegate d = SetProgressMaximum;
+				try { progress.Invoke(d, maximum); }
+				catch(ThreadInterruptedException) { }
+			}
+			else
+			{
+				progress.Maximum = maximum;
+			}
+		}
+
+		public void AddProgressValue(int value)
+		{
+			if(progress.InvokeRequired)
+			{
+				CallIntMethodDelegate d = AddProgressValue;
+				try { progress.Invoke(d, value); }
+				catch(ThreadInterruptedException) { }
+			}
+			else
+			{
+				progress.Value += value;
+			}
+		}
+
+		//mxd
+		private void UpdateTitle()
+		{
+			int hiddencount = resultslist.Count - results.Items.Count;
+			string title = "Map Analysis [" + resultslist.Count + " results";
+			if(hiddencount > 0) title += hiddencount + " hidden";
+			title += ", " + results.SelectedItems.Count + " selected";
+			this.Text = title + @"]";
+		}
+		
+		// This stops checking (only called from the checking management thread)
+		private void StopChecking()
+		{
+			if(this.InvokeRequired)
+			{
+				CallVoidMethodDeletage d = StopChecking;
+				this.Invoke(d);
+			}
+			else
+			{
+				checksthread = null;
+				progress.Value = 0;
+				buttoncheck.Text = "Start Analysis";
+				Cursor.Current = Cursors.Default;
+				running = false;
+				blockmap.Dispose();
+				blockmap = null;
+				
+				// When no results found, show "no results" and disable the list
+				if(resultslist.Count == 0) 
+				{
+					results.Items.Add(new ResultNoErrors());
+					results.Enabled = false;
+					UpdateTitle(); //mxd
+				} 
+				else 
+				{ 
+					ClearSelectedResult(); //mxd
+				}
+			}
+		}
+		
+		// This starts checking
+		private void StartChecking()
+		{
+			if(running) return;
+			
+			Cursor.Current = Cursors.WaitCursor;
+			
+			// Make blockmap
+			RectangleF area = MapSet.CreateArea(General.Map.Map.Vertices);
+			area = MapSet.IncreaseArea(area, General.Map.Map.Things);
+			blockmap = new BlockMap<BlockEntry>(area);
+			blockmap.AddLinedefsSet(General.Map.Map.Linedefs);
+			blockmap.AddSectorsSet(General.Map.Map.Sectors);
+			blockmap.AddThingsSet(General.Map.Map.Things);
+			blockmap.AddVerticesSet(General.Map.Map.Vertices); //mxd
+			
+			//mxd. Open the results panel
+			if(!resultspanel.Visible) 
+			{
+				this.MinimumSize = new Size();
+				this.MaximumSize = new Size();
+				this.Size = initialsize;
+				resultspanel.Size = new Size(resultspanel.Width, this.ClientSize.Height - resultspanel.Top);
+				resultspanel.Visible = true;
+			}
+			progress.Value = 0;
+			results.Items.Clear();
+			results.Enabled = true;
+			resultslist = new List<ErrorResult>(); //mxd
+			ClearSelectedResult();
+			buttoncheck.Text = "Abort Analysis";
+			General.Interface.RedrawDisplay();
+			
+			// Start checking
+			running = true;
+			checksthread = new Thread(RunChecks);
+			checksthread.Name = "Error Checking Management";
+			checksthread.Priority = ThreadPriority.Normal;
+			checksthread.Start();
+			
+			Cursor.Current = Cursors.Default;
+		}
+
+		#endregion
+
+		#region ================== Methods
+		
+		// This stops the checking
+		public void CloseWindow()
+		{
+			// Currently running?
+			if(running)
+			{
+				Cursor.Current = Cursors.WaitCursor;
+				checksthread.Interrupt();
+			}
+
+			ClearSelectedResult();
+			
+			//mxd. Clear results 
+			resultslist.Clear();
+			results.Items.Clear();
+
+			this.Hide();
+		}
+
+		// This clears the selected result
+		private void ClearSelectedResult()
+		{
+			results.SelectedItems.Clear(); //mxd
+			if(results.Items.Count == 0 && resultslist.Count > 0) //mxd
+				resultinfo.Text = "All results are hidden. Use context menu to show them.";
+			else
+				resultinfo.Text = "Select a result from the list to see more information.\r\nHold 'Ctrl' to select several results.\r\nHold 'Shift' to select a range of results.\r\nRight-click on a result to show context menu.";
+			resultinfo.Enabled = false;
+			fix1.Visible = false;
+			fix2.Visible = false;
+			fix3.Visible = false;
+
+			UpdateTitle(); //mxd
+		}
+		
+		// This runs in a seperate thread to manage the checking threads
+		private void RunChecks()
+		{
+			List<ErrorChecker> checkers = new List<ErrorChecker>();
+			List<Thread> threads = new List<Thread>();
+			int maxthreads = Environment.ProcessorCount;
+			int totalprogress = 0;
+			int nextchecker = 0;
+			
+			// Initiate all checkers
+			foreach(CheckBox c in checks.Checkboxes)
+			{
+				// Include this one?
+				if(c.Checked)
+				{
+					Type t = (c.Tag as Type);
+					ErrorChecker checker;
+					
+					try
+					{
+						// Create instance
+						checker = (ErrorChecker)Assembly.GetExecutingAssembly().CreateInstance(t.FullName, false, BindingFlags.Default, null, null, CultureInfo.CurrentCulture, new object[0]);
+					}
+					catch(TargetInvocationException ex)
+					{
+						// Error!
+						General.ErrorLogger.Add(ErrorType.Error, "Failed to create class instance '" + t.Name + "'");
+						General.WriteLogLine(ex.InnerException.GetType().Name + ": " + ex.InnerException.Message);
+						throw ex;
+					}
+					catch(Exception ex)
+					{
+						// Error!
+						General.ErrorLogger.Add(ErrorType.Error, "Failed to create class instance '" + t.Name + "'");
+						General.WriteLogLine(ex.GetType().Name + ": " + ex.Message);
+						throw ex;
+					}
+					
+					// Add to list
+					if(checker != null)
+					{
+						checkers.Add(checker);
+						totalprogress += checker.TotalProgress;
+					}
+				}
+			}
+			
+			// Sort the checkers with highest cost first
+			// See CompareTo method in ErrorChecker for sorting comparison
+			checkers.Sort();
+			
+			// Setup
+			SetProgressMaximum(totalprogress);
+			
+			// Continue while threads are running or checks are to be done
+			while((nextchecker < checkers.Count) || (threads.Count > 0))
+			{
+				// Start new thread when less than maximum number of
+				// threads running and there is more work to be done
+				while((threads.Count < maxthreads) && (nextchecker < checkers.Count))
+				{
+					ErrorChecker c = checkers[nextchecker++];
+					Thread t = new Thread(c.Run);
+					t.Name = "Error Checker '" + c.GetType().Name + "'";
+					t.Priority = ThreadPriority.BelowNormal;
+					t.Start();
+					threads.Add(t);
+				}
+				
+				// Remove threads that are done
+				for(int i = threads.Count - 1; i >= 0; i--)
+					if(!threads[i].IsAlive) threads.RemoveAt(i);
+				
+				// Handle thread interruption
+				try { Thread.Sleep(1); }
+				catch(ThreadInterruptedException) { break; }
+			}
+			
+			// Stop all running threads
+			foreach(Thread t in threads)
+			{
+				while(t.IsAlive)
+				{
+					try
+					{ 
+						t.Interrupt();
+						t.Join(1);
+					}
+					catch(ThreadInterruptedException)
+					{
+						// We have to continue, we can't just leave the other threads running!
+					}
+				}
+			}
+			
+			// Done
+			StopChecking();
+		}
+
+		//mxd
+		private Dictionary<Type, bool> GetSelectedTypes()
+		{
+			Dictionary<Type, bool> selectedtypes = new Dictionary<Type, bool>();
+			foreach(var ro in results.SelectedItems)
+			{
+				ErrorResult r = ro as ErrorResult;
+				if(r == null) continue;
+				Type t = r.GetType();
+				if(!selectedtypes.ContainsKey(t)) selectedtypes.Add(t, false);
+			}
+
+			return selectedtypes;
+		}
+		
+		#endregion
+		
+		#region ================== Events
+		
+		// Window closing
+		private void ErrorCheckForm_FormClosing(object sender, FormClosingEventArgs e)
+		{
+			//mxd. Clear results 
+			resultslist.Clear();
+			results.Items.Clear();
+			
+			// If the user closes the form, then just cancel the mode
+			if(e.CloseReason == CloseReason.UserClosing)
+			{
+				e.Cancel = true;
+				General.Interface.Focus();
+				General.Editing.CancelMode();
+			}
+		}
+		
+		// Start/stop
+		private void buttoncheck_Click(object sender, EventArgs e)
+		{
+			// Currently running?
+			if(running)
+			{
+				Cursor.Current = Cursors.WaitCursor;
+				checksthread.Interrupt();
+			}
+			else
+			{
+				StartChecking();
+			}
+		}
+
+		// Close
+		private void closebutton_Click(object sender, EventArgs e)
+		{
+			General.Interface.Focus();
+			General.Editing.CancelMode();
+		}
+		
+		// Results selection changed
+		private void results_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			//mxd
+			if(bathselectioninprogress) return;
+			
+			// Anything selected?
+			if(results.SelectedItems.Count > 0)
+			{
+				ErrorResult firstresult = (results.SelectedItems[0] as ErrorResult);
+				if(firstresult == null)
+				{
+					ClearSelectedResult();
+				}
+				else
+				{
+					bool sametype = true;
+					List<ErrorResult> validresults = new List<ErrorResult>();
+
+					// Selected results have the same fixes?
+					foreach(var ri in results.SelectedItems)
+					{
+						ErrorResult result = ri as ErrorResult;
+						if(result == null) continue;
+						validresults.Add(result);
+
+						if(result.Buttons != firstresult.Buttons || result.Button1Text != firstresult.Button1Text
+							|| result.Button2Text != firstresult.Button2Text || result.Button3Text != firstresult.Button3Text)
+						{
+							sametype = false;
+							break;
+						}
+					}
+
+					resultinfo.Enabled = true;
+
+					if(sametype)
+					{
+						resultinfo.Text = firstresult.Description;
+						fix1.Text = firstresult.Button1Text;
+						fix2.Text = firstresult.Button2Text;
+						fix3.Text = firstresult.Button3Text;
+						fix1.Visible = (firstresult.Buttons > 0);
+						fix2.Visible = (firstresult.Buttons > 1);
+						fix3.Visible = (firstresult.Buttons > 2);
+					}
+					else
+					{
+						resultinfo.Text = "Several types of map analysis results are selected. To display fixes, make sure that only a single result type is selected.";
+						fix1.Visible = false;
+						fix2.Visible = false;
+						fix3.Visible = false;
+					}
+
+					// Zoom to area
+					if(validresults.Count > 0)
+					{
+						RectangleF zoomarea = validresults[0].GetZoomArea();
+						foreach(ErrorResult result in validresults)
+						{
+							zoomarea = RectangleF.Union(zoomarea, result.GetZoomArea());
+						}
+
+						ClassicMode editmode = (General.Editing.Mode as ClassicMode);
+						editmode.CenterOnArea(zoomarea, 0.6f);
+					}
+				}
+
+				UpdateTitle(); //mxd
+			}
+			else
+			{
+				ClearSelectedResult();
+			}
+			
+			General.Interface.RedrawDisplay();
+		}
+		
+		// First button
+		private void fix1_Click(object sender, EventArgs e)
+		{
+			// Anything selected?
+			if(results.SelectedItems.Count > 0)
+			{
+				if(running)
+				{
+					General.ShowWarningMessage("You must stop the analysis before you can make changes to your map!", MessageBoxButtons.OK);
+				}
+				else
+				{
+					ErrorResult r = (results.SelectedItem as ErrorResult);
+					if(r.Button1Click(false)) 
+					{
+						if(results.SelectedItems.Count > 1) FixSimilarErrors(r.GetType(), 1); //mxd
+						StartChecking();
+					} 
+					else 
+					{
+						General.Interface.RedrawDisplay();
+					}
+				}
+			}
+		}
+		
+		// Second button
+		private void fix2_Click(object sender, EventArgs e)
+		{
+			// Anything selected?
+			if(results.SelectedIndex >= 0)
+			{
+				if(running)
+				{
+					General.ShowWarningMessage("You must stop the analysis before you can make changes to your map!", MessageBoxButtons.OK);
+				}
+				else
+				{
+					ErrorResult r = (results.SelectedItem as ErrorResult);
+					if(r.Button2Click(false)) 
+					{
+						if(results.SelectedItems.Count > 1) FixSimilarErrors(r.GetType(), 2); //mxd
+						StartChecking();
+					} 
+					else 
+					{
+						General.Interface.RedrawDisplay();
+					}
+				}
+			}
+		}
+		
+		// Third button
+		private void fix3_Click(object sender, EventArgs e)
+		{
+			// Anything selected?
+			if(results.SelectedIndex >= 0)
+			{
+				if(running)
+				{
+					General.ShowWarningMessage("You must stop the analysis before you can make changes to your map!", MessageBoxButtons.OK);
+				}
+				else
+				{
+					ErrorResult r = (results.SelectedItem as ErrorResult);
+					if(r.Button3Click(false)) 
+					{
+						if(results.SelectedItems.Count > 1) FixSimilarErrors(r.GetType(), 3); //mxd
+						StartChecking();
+					} 
+					else 
+					{
+						General.Interface.RedrawDisplay();
+					}
+				}
+			}
+		}
+
+		//mxd
+		private void FixSimilarErrors(Type type, int fixIndex) 
+		{
+			foreach(Object item in results.SelectedItems) 
+			{
+				if(item == results.SelectedItem) continue;
+				if(item.GetType() != type) continue;
+
+				ErrorResult r = item as ErrorResult;
+
+				if(fixIndex == 1 && !r.Button1Click(true)) break;
+				if(fixIndex == 2 && !r.Button2Click(true)) break;
+				if(fixIndex == 3 && !r.Button3Click(true)) break;
+			}
+		}
+
+		//mxd
+		private void toggleall_CheckedChanged(object sender, EventArgs e) 
+		{
+			foreach(CheckBox cb in checks.Checkboxes) cb.Checked = toggleall.Checked;
+		}
+
+		private void ErrorCheckForm_HelpRequested(object sender, HelpEventArgs hlpevent)
+		{
+			General.ShowHelp("e_mapanalysis.html");
+		}
+		
+		#endregion
+
+		#region ================== Results Context Menu (mxd)
+
+		private void resultcontextmenustrip_Opening(object sender, System.ComponentModel.CancelEventArgs e) 
+		{
+			//disable or enable stuff
+			bool haveresult = resultslist.Count > 0 && results.SelectedItems.Count > 0;
+			resultshowall.Enabled = (resultslist.Count > 0 && resultslist.Count > results.Items.Count);
+			resultselectcurrenttype.Enabled = haveresult;
+			resultcopytoclipboard.Enabled = haveresult;
+			resulthidecurrent.Enabled = haveresult;
+			resulthidecurrenttype.Enabled = haveresult;
+			resultshowonlycurrent.Enabled = haveresult;
+		}
+
+		private void resultshowall_Click(object sender, EventArgs e) 
+		{
+			// Reset ignored items
+			foreach(ErrorResult result in resultslist) result.Hide(false);
+			
+			// Restore items
+			results.Items.Clear();
+			results.Items.AddRange(resultslist.ToArray());
+			hiddentresulttypes.Clear();
+
+			// Do the obvious
+			ClearSelectedResult();
+		}
+
+		private void resulthidecurrent_Click(object sender, EventArgs e) 
+		{
+			// Collect results to hide
+			List<ErrorResult> tohide = new List<ErrorResult>();
+			foreach(var ro in results.SelectedItems)
+			{
+				ErrorResult r = ro as ErrorResult;
+				if(r == null) return;
+				r.Hide(true);
+				tohide.Add(r);
+			}
+			
+			// Remove from the list
+			results.BeginUpdate();
+			foreach(ErrorResult r in tohide) results.Items.Remove(r);
+			results.EndUpdate();
+
+			// Do the obvious
+			ClearSelectedResult();
+		}
+
+		private void resulthidecurrenttype_Click(object sender, EventArgs e)
+		{
+			Dictionary<Type, bool> tohide = GetSelectedTypes();
+			List<ErrorResult> filtered = new List<ErrorResult>();
+			hiddentresulttypes.AddRange(tohide.Keys);
+
+			// Apply filtering
+			foreach(ErrorResult result in results.Items)
+			{
+				if(!tohide.ContainsKey(result.GetType())) filtered.Add(result);
+			}
+
+			// Replace items
+			results.Items.Clear();
+			results.Items.AddRange(filtered.ToArray());
+
+			// Do the obvious
+			ClearSelectedResult();
+		}
+
+		private void resultshowonlycurrent_Click(object sender, EventArgs e) 
+		{
+			Dictionary<Type, bool> toshow = GetSelectedTypes();
+			List<ErrorResult> filtered = new List<ErrorResult>();
+			hiddentresulttypes.Clear();
+
+			// Apply filtering
+			foreach(ErrorResult result in results.Items)
+			{
+				Type curresulttype = result.GetType();
+				if(!toshow.ContainsKey(curresulttype))
+				{
+					hiddentresulttypes.Add(curresulttype);
+				}
+				else
+				{
+					filtered.Add(result);
+				}
+			}
+
+			// Replace items
+			results.Items.Clear();
+			results.Items.AddRange(filtered.ToArray());
+
+			// Do the obvious
+			ClearSelectedResult();
+		}
+
+		private void resultcopytoclipboard_Click(object sender, EventArgs e)
+		{
+			// Get results
+			StringBuilder sb = new StringBuilder();
+			foreach(ErrorResult result in results.SelectedItems) sb.AppendLine(result.ToString());
+
+			// Set on clipboard
+			Clipboard.SetText(sb.ToString());
+
+			// Inform the user
+			General.Interface.DisplayStatus(StatusType.Info, "Analysis results copied to clipboard.");
+		}
+
+		private void results_KeyUp(object sender, KeyEventArgs e) 
+		{
+			// Copy descriptions to clipboard?
+			if(e.Control && e.KeyCode == Keys.C)
+			{
+				resultcopytoclipboard_Click(sender, EventArgs.Empty);
+			} 
+			// Select all?
+			else if(e.Control && e.KeyCode == Keys.A)
+			{
+				results.SelectedItems.Clear();
+
+				bathselectioninprogress = true; //mxd
+				results.BeginUpdate(); //mxd
+				for(int i = 0; i < results.Items.Count; i++) results.SelectedItems.Add(results.Items[i]);
+				results.EndUpdate(); //mxd
+				bathselectioninprogress = false; //mxd
+
+				results_SelectedIndexChanged(this, EventArgs.Empty); //trigger update manually
+			}
+		}
+
+		private void resultselectcurrenttype_Click(object sender, EventArgs e)
+		{
+			Dictionary<Type, bool> toselect = GetSelectedTypes();
+			results.SelectedItems.Clear();
+
+			bathselectioninprogress = true; //mxd
+			results.BeginUpdate(); //mxd
+
+			for(int i = 0; i < results.Items.Count; i++) 
+			{
+				if(toselect.ContainsKey(results.Items[i].GetType())) results.SelectedItems.Add(results.Items[i]);
+			}
+
+			results.EndUpdate(); //mxd
+			bathselectioninprogress = false; //mxd
+
+			results_SelectedIndexChanged(this, EventArgs.Empty); //trigger update manually
+		}
+
+		#endregion
+
+	}
+}
\ No newline at end of file
diff --git a/Source/Plugins/BuilderModes/Interface/ErrorCheckForm.resx b/Source/Plugins/BuilderModes/Interface/ErrorCheckForm.resx
new file mode 100644
index 0000000..2a0dd20
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/ErrorCheckForm.resx
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="resultcontextmenustrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>321, 17</value>
+  </metadata>
+  <metadata name="progress.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="closebutton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/BuilderModes/Interface/FilterSelectedThingsForm.Designer.cs b/Source/Plugins/BuilderModes/Interface/FilterSelectedThingsForm.Designer.cs
new file mode 100644
index 0000000..ea9a41d
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/FilterSelectedThingsForm.Designer.cs
@@ -0,0 +1,176 @@
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	partial class FilterSelectedThingsForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing) 
+		{
+			if(disposing && (components != null)) 
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent() 
+		{
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+			this.cancel = new System.Windows.Forms.Button();
+			this.apply = new System.Windows.Forms.Button();
+			this.textBox1 = new System.Windows.Forms.TextBox();
+			this.dataGridView = new System.Windows.Forms.DataGridView();
+			this.ThingType = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.ThingTitle = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.ThingCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
+			this.SuspendLayout();
+			// 
+			// cancel
+			// 
+			this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.cancel.Location = new System.Drawing.Point(268, 213);
+			this.cancel.Name = "cancel";
+			this.cancel.Size = new System.Drawing.Size(90, 23);
+			this.cancel.TabIndex = 10;
+			this.cancel.Text = "Cancel";
+			this.cancel.UseVisualStyleBackColor = true;
+			this.cancel.Click += new System.EventHandler(this.cancel_Click);
+			// 
+			// apply
+			// 
+			this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.apply.Location = new System.Drawing.Point(172, 213);
+			this.apply.Name = "apply";
+			this.apply.Size = new System.Drawing.Size(90, 23);
+			this.apply.TabIndex = 9;
+			this.apply.Text = "OK";
+			this.apply.UseVisualStyleBackColor = true;
+			this.apply.Click += new System.EventHandler(this.apply_Click);
+			// 
+			// textBox1
+			// 
+			this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.textBox1.BackColor = System.Drawing.SystemColors.Control;
+			this.textBox1.BorderStyle = System.Windows.Forms.BorderStyle.None;
+			this.textBox1.Location = new System.Drawing.Point(12, 207);
+			this.textBox1.Multiline = true;
+			this.textBox1.Name = "textBox1";
+			this.textBox1.Size = new System.Drawing.Size(154, 35);
+			this.textBox1.TabIndex = 11;
+			this.textBox1.Text = "Select thing types you want to keep selected";
+			// 
+			// dataGridView
+			// 
+			this.dataGridView.AllowUserToAddRows = false;
+			this.dataGridView.AllowUserToDeleteRows = false;
+			this.dataGridView.AllowUserToResizeColumns = false;
+			this.dataGridView.AllowUserToResizeRows = false;
+			this.dataGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.dataGridView.BackgroundColor = System.Drawing.SystemColors.Window;
+			this.dataGridView.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+			this.dataGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None;
+			this.dataGridView.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
+			dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+			dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control;
+			dataGridViewCellStyle4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText;
+			dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+			dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+			dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+			this.dataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;
+			this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+			this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.ThingType,
+            this.ThingTitle,
+            this.ThingCount});
+			this.dataGridView.Location = new System.Drawing.Point(12, 12);
+			this.dataGridView.Name = "dataGridView";
+			this.dataGridView.ReadOnly = true;
+			this.dataGridView.RowHeadersVisible = false;
+			this.dataGridView.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
+			this.dataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+			this.dataGridView.Size = new System.Drawing.Size(346, 189);
+			this.dataGridView.TabIndex = 8;
+			// 
+			// ThingType
+			// 
+			this.ThingType.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader;
+			dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+			this.ThingType.DefaultCellStyle = dataGridViewCellStyle5;
+			this.ThingType.HeaderText = "Type";
+			this.ThingType.Name = "ThingType";
+			this.ThingType.ReadOnly = true;
+			this.ThingType.Width = 56;
+			// 
+			// ThingTitle
+			// 
+			this.ThingTitle.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+			dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+			this.ThingTitle.DefaultCellStyle = dataGridViewCellStyle6;
+			this.ThingTitle.HeaderText = "Title";
+			this.ThingTitle.Name = "ThingTitle";
+			this.ThingTitle.ReadOnly = true;
+			// 
+			// ThingCount
+			// 
+			this.ThingCount.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader;
+			this.ThingCount.HeaderText = "Count";
+			this.ThingCount.Name = "ThingCount";
+			this.ThingCount.ReadOnly = true;
+			this.ThingCount.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+			this.ThingCount.Width = 60;
+			// 
+			// FilterSelectedThingsForm
+			// 
+			this.AcceptButton = this.apply;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.CancelButton = this.cancel;
+			this.ClientSize = new System.Drawing.Size(370, 248);
+			this.Controls.Add(this.cancel);
+			this.Controls.Add(this.apply);
+			this.Controls.Add(this.textBox1);
+			this.Controls.Add(this.dataGridView);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow;
+			this.Name = "FilterSelectedThingsForm";
+			this.Opacity = 1;
+			this.ShowInTaskbar = false;
+			this.Text = "Filter Selected Things";
+			this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FilterSelectedThingsForm_FormClosing);
+			((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Button cancel;
+		private System.Windows.Forms.Button apply;
+		private System.Windows.Forms.TextBox textBox1;
+		private System.Windows.Forms.DataGridView dataGridView;
+		private System.Windows.Forms.DataGridViewTextBoxColumn ThingType;
+		private System.Windows.Forms.DataGridViewTextBoxColumn ThingTitle;
+		private System.Windows.Forms.DataGridViewTextBoxColumn ThingCount;
+	}
+}
\ No newline at end of file
diff --git a/Source/Plugins/BuilderModes/Interface/FilterSelectedThingsForm.cs b/Source/Plugins/BuilderModes/Interface/FilterSelectedThingsForm.cs
new file mode 100644
index 0000000..d0679f4
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/FilterSelectedThingsForm.cs
@@ -0,0 +1,108 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Windows;
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	public partial class FilterSelectedThingsForm : DelayedForm
+	{
+		private static Size size = Size.Empty;
+		private static Point location = Point.Empty;
+		private ICollection<Thing> selection;
+		private ThingsMode mode;
+
+		public FilterSelectedThingsForm(ICollection<Thing> selection, ThingsMode mode) 
+		{
+			InitializeComponent();
+			this.mode = mode;
+
+			//apply window size and location
+			if(!size.IsEmpty && !location.IsEmpty) 
+			{
+				this.StartPosition = FormStartPosition.Manual;
+				this.Size = size;
+				this.Location = location;
+			}
+
+			Setup(selection);
+		}
+
+		private void Setup(ICollection<Thing> selection) 
+		{
+			this.selection = selection;
+
+			//get thing types
+			Dictionary<int, int> thingcounts = new Dictionary<int, int>();
+			Dictionary<int, string> thingtitles = new Dictionary<int, string>();
+
+			foreach(Thing t in selection) 
+			{
+				if(!thingcounts.ContainsKey(t.Type)) 
+				{
+					thingcounts.Add(t.Type, 1);
+					ThingTypeInfo ti = General.Map.Data.GetThingInfo(t.Type);
+					thingtitles.Add(t.Type, ti.Title);
+				} 
+				else 
+				{
+					thingcounts[t.Type]++;
+				}
+			}
+
+			//add data
+			foreach(KeyValuePair<int, int> group in thingcounts) 
+			{
+				DataGridViewRow row = new DataGridViewRow();
+
+				row.Cells.Add(new DataGridViewTextBoxCell { Value = group.Key }); //type
+				row.Cells.Add(new DataGridViewTextBoxCell { Value = thingtitles[group.Key] }); //title
+				row.Cells.Add(new DataGridViewTextBoxCell { Value = group.Value }); //count
+
+				dataGridView.Rows.Add(row);
+			}
+
+			dataGridView.Sort(ThingType, ListSortDirection.Ascending);
+		}
+
+		private void apply_Click(object sender, EventArgs e) 
+		{
+			//get selected types
+			List<int> selectedtypes = new List<int>();
+
+			foreach(DataGridViewRow row in dataGridView.Rows)
+				if(row.Selected) selectedtypes.Add((int)row.Cells[0].Value);
+
+			//apply selection
+			if(selectedtypes.Count > 0) 
+			{
+				foreach(Thing t in selection) 
+				{
+					if(!selectedtypes.Contains(t.Type)) t.Selected = false;
+				}
+
+				//update display
+				mode.UpdateSelectionInfo();
+				General.Interface.RedrawDisplay();
+			}
+			
+			this.Close();
+		}
+
+		private void cancel_Click(object sender, EventArgs e) 
+		{
+			this.Close();
+		}
+
+		private void FilterSelectedThingsForm_FormClosing(object sender, FormClosingEventArgs e) 
+		{
+			size = this.Size;
+			location = this.Location;
+		}
+		
+	}
+}
diff --git a/Source/Plugins/BuilderModes/Interface/FilterSelectedThingsForm.resx b/Source/Plugins/BuilderModes/Interface/FilterSelectedThingsForm.resx
new file mode 100644
index 0000000..6e7b6d8
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/FilterSelectedThingsForm.resx
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="ThingType.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ThingTitle.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ThingCount.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/BuilderModes/Interface/FindReplaceForm.Designer.cs b/Source/Plugins/BuilderModes/Interface/FindReplaceForm.Designer.cs
new file mode 100644
index 0000000..087f40b
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/FindReplaceForm.Designer.cs
@@ -0,0 +1,277 @@
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	partial class FindReplaceForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			System.Windows.Forms.Label label1;
+			System.Windows.Forms.Label label2;
+			this.searchtypes = new System.Windows.Forms.ComboBox();
+			this.findinput = new CodeImp.DoomBuilder.Controls.AutoSelectTextbox();
+			this.browsefind = new System.Windows.Forms.Button();
+			this.withinselection = new System.Windows.Forms.CheckBox();
+			this.browsereplace = new System.Windows.Forms.Button();
+			this.replaceinput = new CodeImp.DoomBuilder.Controls.AutoSelectTextbox();
+			this.findbutton = new System.Windows.Forms.Button();
+			this.closebutton = new System.Windows.Forms.Button();
+			this.resultslist = new System.Windows.Forms.ListBox();
+			this.resultscount = new System.Windows.Forms.Label();
+			this.resultspanel = new System.Windows.Forms.Panel();
+			this.deletebutton = new System.Windows.Forms.Button();
+			this.editbutton = new System.Windows.Forms.Button();
+			this.doreplace = new System.Windows.Forms.CheckBox();
+			label1 = new System.Windows.Forms.Label();
+			label2 = new System.Windows.Forms.Label();
+			this.resultspanel.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// label1
+			// 
+			label1.AutoSize = true;
+			label1.Location = new System.Drawing.Point(36, 15);
+			label1.Name = "label1";
+			label1.Size = new System.Drawing.Size(67, 13);
+			label1.TabIndex = 0;
+			label1.Text = "Search type:";
+			// 
+			// label2
+			// 
+			label2.AutoSize = true;
+			label2.Location = new System.Drawing.Point(47, 51);
+			label2.Name = "label2";
+			label2.Size = new System.Drawing.Size(56, 13);
+			label2.TabIndex = 2;
+			label2.Text = "Find what:";
+			// 
+			// searchtypes
+			// 
+			this.searchtypes.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.searchtypes.FormattingEnabled = true;
+			this.searchtypes.Location = new System.Drawing.Point(109, 12);
+			this.searchtypes.Name = "searchtypes";
+			this.searchtypes.Size = new System.Drawing.Size(156, 21);
+			this.searchtypes.Sorted = true;
+			this.searchtypes.TabIndex = 0;
+			this.searchtypes.SelectedIndexChanged += new System.EventHandler(this.searchtypes_SelectedIndexChanged);
+			// 
+			// findinput
+			// 
+			this.findinput.Location = new System.Drawing.Point(109, 48);
+			this.findinput.Name = "findinput";
+			this.findinput.Size = new System.Drawing.Size(122, 20);
+			this.findinput.TabIndex = 1;
+			this.findinput.TextChanged += new System.EventHandler(this.findinput_TextChanged);
+			// 
+			// browsefind
+			// 
+			this.browsefind.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.treeview;
+			this.browsefind.Location = new System.Drawing.Point(237, 45);
+			this.browsefind.Name = "browsefind";
+			this.browsefind.Size = new System.Drawing.Size(28, 25);
+			this.browsefind.TabIndex = 2;
+			this.browsefind.UseVisualStyleBackColor = true;
+			this.browsefind.Click += new System.EventHandler(this.browsefind_Click);
+			// 
+			// withinselection
+			// 
+			this.withinselection.AutoSize = true;
+			this.withinselection.Location = new System.Drawing.Point(109, 76);
+			this.withinselection.Name = "withinselection";
+			this.withinselection.Size = new System.Drawing.Size(137, 17);
+			this.withinselection.TabIndex = 3;
+			this.withinselection.Text = "Within current selection";
+			this.withinselection.UseVisualStyleBackColor = true;
+			// 
+			// browsereplace
+			// 
+			this.browsereplace.Enabled = false;
+			this.browsereplace.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.treeview;
+			this.browsereplace.Location = new System.Drawing.Point(237, 97);
+			this.browsereplace.Name = "browsereplace";
+			this.browsereplace.Size = new System.Drawing.Size(28, 25);
+			this.browsereplace.TabIndex = 1;
+			this.browsereplace.UseVisualStyleBackColor = true;
+			this.browsereplace.Click += new System.EventHandler(this.browsereplace_Click);
+			// 
+			// replaceinput
+			// 
+			this.replaceinput.Enabled = false;
+			this.replaceinput.Location = new System.Drawing.Point(109, 100);
+			this.replaceinput.Name = "replaceinput";
+			this.replaceinput.Size = new System.Drawing.Size(122, 20);
+			this.replaceinput.TabIndex = 0;
+			// 
+			// findbutton
+			// 
+			this.findbutton.Enabled = false;
+			this.findbutton.Location = new System.Drawing.Point(273, 10);
+			this.findbutton.Name = "findbutton";
+			this.findbutton.Size = new System.Drawing.Size(74, 25);
+			this.findbutton.TabIndex = 7;
+			this.findbutton.Text = "Find";
+			this.findbutton.UseVisualStyleBackColor = true;
+			this.findbutton.Click += new System.EventHandler(this.findbutton_Click);
+			// 
+			// closebutton
+			// 
+			this.closebutton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.closebutton.Location = new System.Drawing.Point(273, 39);
+			this.closebutton.Name = "closebutton";
+			this.closebutton.Size = new System.Drawing.Size(74, 25);
+			this.closebutton.TabIndex = 8;
+			this.closebutton.Text = "Close";
+			this.closebutton.UseVisualStyleBackColor = true;
+			this.closebutton.Click += new System.EventHandler(this.closebutton_Click);
+			// 
+			// resultslist
+			// 
+			this.resultslist.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.resultslist.FormattingEnabled = true;
+			this.resultslist.IntegralHeight = false;
+			this.resultslist.Location = new System.Drawing.Point(9, 31);
+			this.resultslist.Margin = new System.Windows.Forms.Padding(1);
+			this.resultslist.Name = "resultslist";
+			this.resultslist.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended;
+			this.resultslist.Size = new System.Drawing.Size(341, 212);
+			this.resultslist.TabIndex = 0;
+			this.resultslist.MouseUp += new System.Windows.Forms.MouseEventHandler(this.resultslist_MouseUp);
+			this.resultslist.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.resultslist_MouseDoubleClick);
+			this.resultslist.SelectedIndexChanged += new System.EventHandler(this.resultslist_SelectedIndexChanged);
+			// 
+			// resultscount
+			// 
+			this.resultscount.AutoSize = true;
+			this.resultscount.Location = new System.Drawing.Point(8, 11);
+			this.resultscount.Name = "resultscount";
+			this.resultscount.Size = new System.Drawing.Size(156, 13);
+			this.resultscount.TabIndex = 10;
+			this.resultscount.Text = "1000 items have been replaced";
+			// 
+			// resultspanel
+			// 
+			this.resultspanel.Controls.Add(this.deletebutton);
+			this.resultspanel.Controls.Add(this.editbutton);
+			this.resultspanel.Controls.Add(this.resultscount);
+			this.resultspanel.Controls.Add(this.resultslist);
+			this.resultspanel.Location = new System.Drawing.Point(-1, 133);
+			this.resultspanel.Name = "resultspanel";
+			this.resultspanel.Size = new System.Drawing.Size(362, 285);
+			this.resultspanel.TabIndex = 6;
+			this.resultspanel.Visible = false;
+			// 
+			// deletebutton
+			// 
+			this.deletebutton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.deletebutton.Location = new System.Drawing.Point(131, 250);
+			this.deletebutton.Name = "deletebutton";
+			this.deletebutton.Size = new System.Drawing.Size(109, 25);
+			this.deletebutton.TabIndex = 2;
+			this.deletebutton.Text = "Delete Selection";
+			this.deletebutton.UseVisualStyleBackColor = true;
+			this.deletebutton.Click += new System.EventHandler(this.deletebutton_Click);
+			// 
+			// editbutton
+			// 
+			this.editbutton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.editbutton.Location = new System.Drawing.Point(9, 250);
+			this.editbutton.Name = "editbutton";
+			this.editbutton.Size = new System.Drawing.Size(109, 25);
+			this.editbutton.TabIndex = 1;
+			this.editbutton.Text = "Edit Selection";
+			this.editbutton.UseVisualStyleBackColor = true;
+			this.editbutton.Click += new System.EventHandler(this.editbutton_Click);
+			// 
+			// doreplace
+			// 
+			this.doreplace.AutoSize = true;
+			this.doreplace.Location = new System.Drawing.Point(12, 102);
+			this.doreplace.Name = "doreplace";
+			this.doreplace.Size = new System.Drawing.Size(91, 17);
+			this.doreplace.TabIndex = 4;
+			this.doreplace.Text = "Replace with:";
+			this.doreplace.UseVisualStyleBackColor = true;
+			this.doreplace.CheckedChanged += new System.EventHandler(this.doreplace_CheckedChanged);
+			// 
+			// FindReplaceForm
+			// 
+			this.AcceptButton = this.findbutton;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.CancelButton = this.closebutton;
+			this.ClientSize = new System.Drawing.Size(358, 417);
+			this.Controls.Add(this.browsereplace);
+			this.Controls.Add(this.replaceinput);
+			this.Controls.Add(this.doreplace);
+			this.Controls.Add(this.closebutton);
+			this.Controls.Add(this.findbutton);
+			this.Controls.Add(this.withinselection);
+			this.Controls.Add(this.browsefind);
+			this.Controls.Add(this.findinput);
+			this.Controls.Add(label2);
+			this.Controls.Add(this.searchtypes);
+			this.Controls.Add(label1);
+			this.Controls.Add(this.resultspanel);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "FindReplaceForm";
+			this.Opacity = 1;
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
+			this.Text = "Find and Replace";
+			this.KeyUp += new System.Windows.Forms.KeyEventHandler(this.FindReplaceForm_KeyUp);
+			this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FindReplaceForm_FormClosing);
+			this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.FindReplaceForm_HelpRequested);
+			this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.FindReplaceForm_KeyDown);
+			this.resultspanel.ResumeLayout(false);
+			this.resultspanel.PerformLayout();
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.ComboBox searchtypes;
+		private CodeImp.DoomBuilder.Controls.AutoSelectTextbox findinput;
+		private System.Windows.Forms.Button browsefind;
+		private System.Windows.Forms.CheckBox withinselection;
+		private System.Windows.Forms.Button browsereplace;
+		private CodeImp.DoomBuilder.Controls.AutoSelectTextbox replaceinput;
+		private System.Windows.Forms.Button findbutton;
+		private System.Windows.Forms.Button closebutton;
+		private System.Windows.Forms.ListBox resultslist;
+		private System.Windows.Forms.Label resultscount;
+		private System.Windows.Forms.Panel resultspanel;
+		private System.Windows.Forms.CheckBox doreplace;
+		private System.Windows.Forms.Button editbutton;
+		private System.Windows.Forms.Button deletebutton;
+	}
+}
\ No newline at end of file
diff --git a/Source/Plugins/BuilderModes/Interface/FindReplaceForm.cs b/Source/Plugins/BuilderModes/Interface/FindReplaceForm.cs
new file mode 100644
index 0000000..04752a7
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/FindReplaceForm.cs
@@ -0,0 +1,412 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Windows;
+using System.Reflection;
+using System.Globalization;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	public partial class FindReplaceForm : DelayedForm
+	{
+		#region ================== Constants
+		
+		#endregion
+
+		#region ================== Variables
+
+		private FindReplaceType newfinder;
+		private FindReplaceType finder;
+		private List<FindReplaceType> findtypeslist;
+		bool controlpressed;
+		bool shiftpressed;
+		bool suppressevents;
+		
+		#endregion
+
+		#region ================== Properties
+
+		internal FindReplaceType Finder { get { return finder; } }
+
+		#endregion
+
+		#region ================== Constructor
+
+		// Constructor
+		public FindReplaceForm()
+		{
+			// Initialize
+			InitializeComponent();
+
+			// Find all find/replace types
+			Type[] findtypes = BuilderPlug.Me.FindClasses(typeof(FindReplaceType));
+			findtypeslist = new List<FindReplaceType>(findtypes.Length);
+			foreach(Type t in findtypes)
+			{
+				object[] attr = t.GetCustomAttributes(typeof(FindReplaceAttribute), true);
+				if(attr.Length > 0)
+				{
+					FindReplaceType finderinst;
+					try
+					{
+						// Create instance
+						finderinst = (FindReplaceType)Assembly.GetExecutingAssembly().CreateInstance(t.FullName, false, BindingFlags.Default, null, null, CultureInfo.CurrentCulture, new object[0]);
+					}
+					catch(TargetInvocationException ex)
+					{
+						// Error!
+						General.ErrorLogger.Add(ErrorType.Error, "Failed to create class instance '" + t.Name + "'");
+						General.WriteLogLine(ex.InnerException.GetType().Name + ": " + ex.InnerException.Message);
+						throw;
+					}
+					catch(Exception ex)
+					{
+						// Error!
+						General.ErrorLogger.Add(ErrorType.Error, "Failed to create class instance '" + t.Name + "'");
+						General.WriteLogLine(ex.GetType().Name + ": " + ex.Message);
+						throw;
+					}
+					
+					// Add the finder to the list
+					findtypeslist.Add(finderinst);
+				}
+			}
+		}
+		
+		#endregion
+
+		#region ================== Events
+
+		// Replace (un)checked
+		private void doreplace_CheckedChanged(object sender, EventArgs e)
+		{
+			findbutton.Text = (doreplace.Checked ? "Replace" : "Find");
+			replaceinput.Enabled = doreplace.Checked;
+			browsereplace.Enabled = doreplace.Checked && newfinder != null && newfinder.Attributes.BrowseButton;
+		}
+
+		// Search type selected
+		private void searchtypes_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			// Create instance of the selected type
+			newfinder = (FindReplaceType)searchtypes.SelectedItem;
+			
+			// Now setup the interface
+			browsefind.Enabled = newfinder.Attributes.BrowseButton;
+			browsefind.Image = newfinder.BrowseImage;
+			browsereplace.Enabled = newfinder.Attributes.BrowseButton;
+			browsereplace.Image = newfinder.BrowseImage;
+			if(!newfinder.CanReplace()) doreplace.Checked = false;
+			doreplace_CheckedChanged(this, EventArgs.Empty); //mxd. Update the rest of replace controls
+			doreplace.Enabled = newfinder.CanReplace();
+		}
+		
+		// Browse find button clicked
+		private void browsefind_Click(object sender, EventArgs e)
+		{
+			findinput.Text = newfinder.Browse(findinput.Text);
+		}
+
+		// Browse replacement clicked
+		private void browsereplace_Click(object sender, EventArgs e)
+		{
+			replaceinput.Text = newfinder.Browse(replaceinput.Text);
+		}
+
+		//mxd
+		private void findinput_TextChanged(object sender, EventArgs e)
+		{
+			findbutton.Enabled = !string.IsNullOrEmpty(findinput.Text);
+		}
+
+		// Find / Replace clicked
+		private void findbutton_Click(object sender, EventArgs e)
+		{
+			// Reset results
+			suppressevents = true;
+			resultslist.Items.Clear();
+			
+			// Hide object information
+			General.Interface.HideInfo();
+			
+			// Keep the finder we used for the search
+			finder = newfinder;
+			
+			// Enable/disable buttons
+			editbutton.Enabled = false;
+			deletebutton.Visible = finder.AllowDelete;
+			deletebutton.Enabled = false;
+			resultslist.BeginUpdate();
+			
+			// Perform the search / replace and show the results
+			if(doreplace.Checked)
+			{
+				General.Map.UndoRedo.CreateUndo("Replace " + searchtypes.SelectedItem);
+
+				resultslist.Items.AddRange(finder.Find(findinput.Text, withinselection.Checked, true, replaceinput.Text, false));
+				resultscount.Text = resultslist.Items.Count + " items found and replaced.";
+
+				// Withdraw the undo step if nothing was replaced
+				if(resultslist.Items.Count < 1)
+					General.Map.UndoRedo.WithdrawUndo();
+			}
+			else
+			{
+				resultslist.Items.AddRange(finder.Find(findinput.Text, withinselection.Checked, false, string.Empty, false));
+				resultscount.Text = resultslist.Items.Count + " items found.";
+			}
+			
+			// Select all results
+			General.Map.Map.ClearAllSelected();
+			for(int i = 0; i < resultslist.Items.Count; i++)
+				resultslist.SelectedIndices.Add(i);
+			
+			// Let the finder know about the selection
+			FindReplaceObject[] selection = GetSelection();
+			finder.ObjectSelected(selection);
+			
+			// Open results part of window
+			this.Size = new Size(this.Width, this.Height - this.ClientSize.Height + resultspanel.Top + resultspanel.Height);
+			resultspanel.Visible = true;
+			resultslist.EndUpdate();
+			suppressevents = false;
+			
+			// Enable/disable buttons
+			editbutton.Enabled = (resultslist.SelectedIndex > -1);
+			deletebutton.Enabled = (resultslist.SelectedIndex > -1);
+			
+			// Set correct presentation mode
+			General.Map.Renderer2D.SetPresentation(finder.RenderPresentation);
+			
+			// Redraw the screen, this will show the selection
+			General.Interface.RedrawDisplay();
+		}
+		
+		// Found item selected
+		private void resultslist_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if(!suppressevents)
+			{
+				// Let the finder know about the selection
+				FindReplaceObject[] selection = GetSelection();
+				finder.ObjectSelected(selection);
+				
+				// Enable/disable buttons
+				editbutton.Enabled = (resultslist.SelectedIndex > -1);
+				deletebutton.Enabled = (resultslist.SelectedIndex > -1);
+
+				// Redraw the screen, this will show the selection
+				General.Interface.RedrawDisplay();
+			}
+		}
+
+		// Mouse released
+		private void resultslist_MouseUp(object sender, MouseEventArgs e)
+		{
+			// Right-clicked?
+			if(e.Button == MouseButtons.Right)
+			{
+				int index = resultslist.IndexFromPoint(e.Location);
+				if(index != ListBox.NoMatches)
+				{
+					// Select the right-clicked item, if not selected
+					if(!resultslist.SelectedIndices.Contains(index))
+					{
+						if(!controlpressed && !shiftpressed) resultslist.SelectedItems.Clear();
+						resultslist.SelectedIndices.Add(index);
+						Update();
+					}
+					
+					// Edit selected objects
+					editbutton_Click(this, EventArgs.Empty);
+				}
+			}
+			
+			// Enable/disable buttons
+			editbutton.Enabled = (resultslist.SelectedIndex > -1);
+			deletebutton.Enabled = (resultslist.SelectedIndex > -1);
+		}
+		
+		// Double clicked
+		private void resultslist_MouseDoubleClick(object sender, MouseEventArgs e)
+		{
+			resultslist_MouseUp(sender, new MouseEventArgs(MouseButtons.Right, 1, e.X, e.Y, e.Delta));
+		}
+		
+		// Window closing
+		private void FindReplaceForm_FormClosing(object sender, FormClosingEventArgs e)
+		{
+			// If the user closes the form, then just cancel the mode
+			if(e.CloseReason == CloseReason.UserClosing)
+			{
+				e.Cancel = true;
+				General.Interface.Focus();
+				General.Editing.CancelMode();
+			}
+		}
+
+		// Close button clicked
+		private void closebutton_Click(object sender, EventArgs e)
+		{
+			General.Interface.Focus();
+			General.Editing.CancelMode();
+		}
+
+		// Key pressed
+		private void FindReplaceForm_KeyDown(object sender, KeyEventArgs e)
+		{
+			// Keep modifiers
+			controlpressed = e.Control;
+			shiftpressed = e.Shift;
+
+			// Enable/disable buttons
+			editbutton.Enabled = (resultslist.SelectedIndex > -1);
+			deletebutton.Enabled = (resultslist.SelectedIndex > -1);
+		}
+
+		// Key released
+		private void FindReplaceForm_KeyUp(object sender, KeyEventArgs e)
+		{
+			// Keep modifiers
+			controlpressed = e.Control;
+			shiftpressed = e.Shift;
+
+			// Enable/disable buttons
+			editbutton.Enabled = (resultslist.SelectedIndex > -1);
+			deletebutton.Enabled = (resultslist.SelectedIndex > -1);
+		}
+
+		// Edit Selection
+		private void editbutton_Click(object sender, EventArgs e)
+		{
+			FindReplaceObject[] items = GetSelection();
+			if(items.Length > 0)
+			{
+				// Edit selected objects
+				suppressevents = true;
+				finder.EditObjects(items);
+				suppressevents = false;
+				resultslist_SelectedIndexChanged(sender, e);
+				
+				// Redraw the screen, this will show the selection
+				General.Interface.RedrawDisplay();
+			}
+		}
+
+		// Delete Selection
+		private void deletebutton_Click(object sender, EventArgs e)
+		{
+			// Delete selected objects
+			FindReplaceObject[] items = GetSelection();
+			if(items.Length > 0)
+			{
+				suppressevents = true;
+				finder.DeleteObjects(items);
+				foreach(FindReplaceObject obj in items)
+				{
+					resultslist.Items.Remove(obj);
+				}
+				suppressevents = false;
+				resultslist_SelectedIndexChanged(sender, e);
+				
+				// Redraw the screen, this will show the selection
+				General.Interface.RedrawDisplay();
+			}
+		}
+
+		private void FindReplaceForm_HelpRequested(object sender, HelpEventArgs hlpevent)
+		{
+			General.ShowHelp("e_findreplace.html");
+		}
+		
+		#endregion
+
+		#region ================== Methods
+
+		// This shows the window
+		public void Show(Form owner)
+		{
+			// First time showing?
+			//if((this.Location.X == 0) && (this.Location.Y == 0))
+			{
+				// Position at left-top of owner
+				this.Location = new Point(owner.Location.X + 20, owner.Location.Y + 90);
+			}
+			
+			// Re-fill the search types list
+			searchtypes.Items.Clear();
+			foreach(FindReplaceType t in findtypeslist)
+			{
+				// Check if it should be visible
+				if(t.DetermineVisiblity())
+				{
+					searchtypes.Items.Add(t);
+				}
+			}
+			
+			// Select previously selected item
+			for(int i = 0; i < searchtypes.Items.Count; i++)
+			{
+				if(searchtypes.Items[i] == newfinder)
+					searchtypes.SelectedIndex = i;
+			}
+			
+			// Select first if none was selected
+			if(searchtypes.SelectedIndex < 0)
+				searchtypes.SelectedIndex = 0;
+			
+			// Close results part
+			resultspanel.Visible = false;
+			this.Size = new Size(this.Width, this.Height - this.ClientSize.Height + resultspanel.Top);
+
+			// Show window
+			base.Show(owner);
+		}
+
+		// This hides the window
+		new public void Hide()
+		{
+			base.Hide();
+			
+			// Clear search results
+			resultslist.Items.Clear();
+		}
+		
+		// This returns the selected item(s)
+		internal FindReplaceObject[] GetSelection()
+		{
+			// Return selected objects
+			FindReplaceObject[] list = new FindReplaceObject[resultslist.SelectedItems.Count];
+			int index = 0;
+			foreach(object obj in resultslist.SelectedItems)
+			{
+				list[index++] = (FindReplaceObject)obj;
+			}
+			return list;
+		}
+		
+		#endregion
+
+	}
+}
\ No newline at end of file
diff --git a/Source/Plugins/BuilderModes/Interface/FindReplaceForm.resx b/Source/Plugins/BuilderModes/Interface/FindReplaceForm.resx
new file mode 100644
index 0000000..d75d5d8
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/FindReplaceForm.resx
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="label1.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="label2.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="resultslist.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="resultscount.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="deletebutton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="editbutton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/BuilderModes/Interface/FitTexturesForm.Designer.cs b/Source/Plugins/BuilderModes/Interface/FitTexturesForm.Designer.cs
new file mode 100644
index 0000000..9a14dc4
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/FitTexturesForm.Designer.cs
@@ -0,0 +1,257 @@
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	partial class FitTexturesForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing) {
+			if(disposing && (components != null)) {
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent() {
+			this.labelhorizrepeat = new System.Windows.Forms.Label();
+			this.repeatgroup = new System.Windows.Forms.GroupBox();
+			this.resetvert = new System.Windows.Forms.Button();
+			this.resethoriz = new System.Windows.Forms.Button();
+			this.vertrepeat = new System.Windows.Forms.NumericUpDown();
+			this.horizrepeat = new System.Windows.Forms.NumericUpDown();
+			this.labelvertrepeat = new System.Windows.Forms.Label();
+			this.cbfitwidth = new System.Windows.Forms.CheckBox();
+			this.accept = new System.Windows.Forms.Button();
+			this.cancel = new System.Windows.Forms.Button();
+			this.cbfitheight = new System.Windows.Forms.CheckBox();
+			this.cbfitconnected = new System.Windows.Forms.CheckBox();
+			this.groupBox2 = new System.Windows.Forms.GroupBox();
+			this.repeatgroup.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.vertrepeat)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.horizrepeat)).BeginInit();
+			this.groupBox2.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// labelhorizrepeat
+			// 
+			this.labelhorizrepeat.Location = new System.Drawing.Point(14, 24);
+			this.labelhorizrepeat.Name = "labelhorizrepeat";
+			this.labelhorizrepeat.Size = new System.Drawing.Size(64, 13);
+			this.labelhorizrepeat.TabIndex = 0;
+			this.labelhorizrepeat.Text = "Horizontal:";
+			this.labelhorizrepeat.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// repeatgroup
+			// 
+			this.repeatgroup.Controls.Add(this.resetvert);
+			this.repeatgroup.Controls.Add(this.resethoriz);
+			this.repeatgroup.Controls.Add(this.vertrepeat);
+			this.repeatgroup.Controls.Add(this.horizrepeat);
+			this.repeatgroup.Controls.Add(this.labelvertrepeat);
+			this.repeatgroup.Controls.Add(this.labelhorizrepeat);
+			this.repeatgroup.Location = new System.Drawing.Point(12, 107);
+			this.repeatgroup.Name = "repeatgroup";
+			this.repeatgroup.Size = new System.Drawing.Size(183, 80);
+			this.repeatgroup.TabIndex = 1;
+			this.repeatgroup.TabStop = false;
+			this.repeatgroup.Text = " Texture Repeating ";
+			// 
+			// resetvert
+			// 
+			this.resetvert.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.Reset;
+			this.resetvert.Location = new System.Drawing.Point(150, 46);
+			this.resetvert.Name = "resetvert";
+			this.resetvert.Size = new System.Drawing.Size(24, 24);
+			this.resetvert.TabIndex = 5;
+			this.resetvert.UseVisualStyleBackColor = true;
+			this.resetvert.Click += new System.EventHandler(this.resetvert_Click);
+			// 
+			// resethoriz
+			// 
+			this.resethoriz.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.Reset;
+			this.resethoriz.Location = new System.Drawing.Point(150, 20);
+			this.resethoriz.Name = "resethoriz";
+			this.resethoriz.Size = new System.Drawing.Size(24, 24);
+			this.resethoriz.TabIndex = 4;
+			this.resethoriz.UseVisualStyleBackColor = true;
+			this.resethoriz.Click += new System.EventHandler(this.resethoriz_Click);
+			// 
+			// vertrepeat
+			// 
+			this.vertrepeat.Location = new System.Drawing.Point(84, 48);
+			this.vertrepeat.Maximum = new decimal(new int[] {
+            512,
+            0,
+            0,
+            0});
+			this.vertrepeat.Minimum = new decimal(new int[] {
+            512,
+            0,
+            0,
+            -2147483648});
+			this.vertrepeat.Name = "vertrepeat";
+			this.vertrepeat.Size = new System.Drawing.Size(60, 20);
+			this.vertrepeat.TabIndex = 3;
+			this.vertrepeat.Value = new decimal(new int[] {
+            1,
+            0,
+            0,
+            0});
+			this.vertrepeat.ValueChanged += new System.EventHandler(this.vertrepeat_ValueChanged);
+			// 
+			// horizrepeat
+			// 
+			this.horizrepeat.Location = new System.Drawing.Point(84, 22);
+			this.horizrepeat.Maximum = new decimal(new int[] {
+            512,
+            0,
+            0,
+            0});
+			this.horizrepeat.Minimum = new decimal(new int[] {
+            512,
+            0,
+            0,
+            -2147483648});
+			this.horizrepeat.Name = "horizrepeat";
+			this.horizrepeat.Size = new System.Drawing.Size(60, 20);
+			this.horizrepeat.TabIndex = 2;
+			this.horizrepeat.Value = new decimal(new int[] {
+            1,
+            0,
+            0,
+            0});
+			this.horizrepeat.ValueChanged += new System.EventHandler(this.horizrepeat_ValueChanged);
+			// 
+			// labelvertrepeat
+			// 
+			this.labelvertrepeat.Location = new System.Drawing.Point(15, 50);
+			this.labelvertrepeat.Name = "labelvertrepeat";
+			this.labelvertrepeat.Size = new System.Drawing.Size(64, 13);
+			this.labelvertrepeat.TabIndex = 1;
+			this.labelvertrepeat.Text = "Vertical:";
+			this.labelvertrepeat.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// cbfitwidth
+			// 
+			this.cbfitwidth.AutoSize = true;
+			this.cbfitwidth.Location = new System.Drawing.Point(10, 19);
+			this.cbfitwidth.Name = "cbfitwidth";
+			this.cbfitwidth.Size = new System.Drawing.Size(65, 17);
+			this.cbfitwidth.TabIndex = 2;
+			this.cbfitwidth.Text = "Fit width";
+			this.cbfitwidth.UseVisualStyleBackColor = true;
+			this.cbfitwidth.CheckedChanged += new System.EventHandler(this.cb_CheckedChanged);
+			// 
+			// accept
+			// 
+			this.accept.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.accept.Location = new System.Drawing.Point(12, 194);
+			this.accept.Name = "accept";
+			this.accept.Size = new System.Drawing.Size(88, 24);
+			this.accept.TabIndex = 6;
+			this.accept.Text = "Apply";
+			this.accept.UseVisualStyleBackColor = true;
+			this.accept.Click += new System.EventHandler(this.accept_Click);
+			// 
+			// cancel
+			// 
+			this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.cancel.Location = new System.Drawing.Point(106, 194);
+			this.cancel.Name = "cancel";
+			this.cancel.Size = new System.Drawing.Size(88, 24);
+			this.cancel.TabIndex = 7;
+			this.cancel.Text = "Cancel";
+			this.cancel.UseVisualStyleBackColor = true;
+			this.cancel.Click += new System.EventHandler(this.cancel_Click);
+			// 
+			// cbfitheight
+			// 
+			this.cbfitheight.AutoSize = true;
+			this.cbfitheight.Location = new System.Drawing.Point(10, 42);
+			this.cbfitheight.Name = "cbfitheight";
+			this.cbfitheight.Size = new System.Drawing.Size(69, 17);
+			this.cbfitheight.TabIndex = 8;
+			this.cbfitheight.Text = "Fit height";
+			this.cbfitheight.UseVisualStyleBackColor = true;
+			this.cbfitheight.CheckedChanged += new System.EventHandler(this.cb_CheckedChanged);
+			// 
+			// cbfitconnected
+			// 
+			this.cbfitconnected.AutoSize = true;
+			this.cbfitconnected.Location = new System.Drawing.Point(10, 65);
+			this.cbfitconnected.Name = "cbfitconnected";
+			this.cbfitconnected.Size = new System.Drawing.Size(168, 17);
+			this.cbfitconnected.TabIndex = 9;
+			this.cbfitconnected.Text = "Fit across connected surfaces";
+			this.cbfitconnected.UseVisualStyleBackColor = true;
+			this.cbfitconnected.CheckedChanged += new System.EventHandler(this.cb_CheckedChanged);
+			// 
+			// groupBox2
+			// 
+			this.groupBox2.Controls.Add(this.cbfitwidth);
+			this.groupBox2.Controls.Add(this.cbfitconnected);
+			this.groupBox2.Controls.Add(this.cbfitheight);
+			this.groupBox2.Location = new System.Drawing.Point(12, 12);
+			this.groupBox2.Name = "groupBox2";
+			this.groupBox2.Size = new System.Drawing.Size(183, 89);
+			this.groupBox2.TabIndex = 10;
+			this.groupBox2.TabStop = false;
+			this.groupBox2.Text = " Options ";
+			// 
+			// FitTexturesForm
+			// 
+			this.AcceptButton = this.accept;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.ClientSize = new System.Drawing.Size(206, 223);
+			this.Controls.Add(this.groupBox2);
+			this.Controls.Add(this.cancel);
+			this.Controls.Add(this.accept);
+			this.Controls.Add(this.repeatgroup);
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "FitTexturesForm";
+			this.Opacity = 1;
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Fit Textures";
+			this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FitTexturesForm_FormClosing);
+			this.repeatgroup.ResumeLayout(false);
+			((System.ComponentModel.ISupportInitialize)(this.vertrepeat)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.horizrepeat)).EndInit();
+			this.groupBox2.ResumeLayout(false);
+			this.groupBox2.PerformLayout();
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Label labelhorizrepeat;
+		private System.Windows.Forms.GroupBox repeatgroup;
+		private System.Windows.Forms.Button resethoriz;
+		private System.Windows.Forms.NumericUpDown vertrepeat;
+		private System.Windows.Forms.NumericUpDown horizrepeat;
+		private System.Windows.Forms.Label labelvertrepeat;
+		private System.Windows.Forms.Button resetvert;
+		private System.Windows.Forms.CheckBox cbfitwidth;
+		private System.Windows.Forms.Button accept;
+		private System.Windows.Forms.Button cancel;
+		private System.Windows.Forms.CheckBox cbfitheight;
+		private System.Windows.Forms.CheckBox cbfitconnected;
+		private System.Windows.Forms.GroupBox groupBox2;
+	}
+}
\ No newline at end of file
diff --git a/Source/Plugins/BuilderModes/Interface/FitTexturesForm.cs b/Source/Plugins/BuilderModes/Interface/FitTexturesForm.cs
new file mode 100644
index 0000000..4585a6e
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/FitTexturesForm.cs
@@ -0,0 +1,291 @@
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Windows;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	internal struct FitTextureOptions
+	{
+		public int HorizontalRepeat;
+		public int VerticalRepeat;
+		public bool FitWidth;
+		public bool FitHeight;
+		public bool FitAcrossSurfaces;
+		public Rectangle GlobalBounds;
+		public Rectangle Bounds;
+
+		//Initial texture coordinats
+		public float InitialOffsetX;
+		public float InitialOffsetY;
+		public float ControlSideOffsetX;
+		public float ControlSideOffsetY;
+		public float InitialScaleX;
+		public float InitialScaleY;
+	}
+	
+	internal partial class FitTexturesForm : DelayedForm
+	{
+		#region ================== Event handlers
+
+		#endregion
+
+		#region ================== Variables
+
+		private static Point location = Point.Empty;
+		private bool blockupdate;
+		private int prevhorizrepeat;
+		private int prevvertrepeat;
+
+		// Settings
+		private static int horizontalrepeat = 1;
+		private static int verticalrepeat = 1;
+		private static bool fitacrosssurfaces = true;
+		private static bool fitwidth = true;
+		private static bool fitheight = true;
+
+		//Surface stuff
+		private List<SortedVisualSide> strips;
+
+		#endregion
+
+		#region ================== Constructor
+
+		public FitTexturesForm() 
+		{
+			InitializeComponent();
+
+			if(!location.IsEmpty)
+			{
+				this.StartPosition = FormStartPosition.Manual;
+				this.Location = location;
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		public bool Setup(IEnumerable<BaseVisualGeometrySidedef> sides)
+		{
+			// Get shapes
+			strips = BuilderModesTools.SortVisualSides(sides);
+
+			// No dice...
+			if(strips.Count == 0)
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "Failed to setup sidedef chains...");
+				this.DialogResult = DialogResult.Cancel;
+				this.Close();
+				return false;
+			}
+
+#if DEBUG
+			//debug
+			DrawDebugUV();
+#endif
+
+			// Restore settings
+			blockupdate = true;
+
+			horizrepeat.Value = horizontalrepeat;
+			vertrepeat.Value = verticalrepeat;
+			prevhorizrepeat = horizontalrepeat;
+			prevvertrepeat = verticalrepeat;
+			cbfitconnected.Checked = fitacrosssurfaces;
+			cbfitconnected.Enabled = (strips.Count > 1);
+			cbfitwidth.Checked = fitwidth;
+			cbfitheight.Checked = fitheight;
+			UpdateRepeatGroup();
+
+			blockupdate = false;
+
+			//trigger update
+			UpdateChanges();
+
+			return true;
+		}
+
+		private void UpdateChanges()
+		{
+			// Apply changes
+			FitTextureOptions options = new FitTextureOptions
+			                            {
+											FitAcrossSurfaces = (cbfitconnected.Enabled && cbfitconnected.Checked),
+											FitWidth = cbfitwidth.Checked,
+											FitHeight = cbfitheight.Checked,
+											HorizontalRepeat = (int)horizrepeat.Value,
+											VerticalRepeat = (int)vertrepeat.Value
+			                            };
+
+			foreach(SortedVisualSide side in strips) side.OnTextureFit(options);
+		}
+
+		private void UpdateRepeatGroup()
+		{
+			// Disable whole group?
+			repeatgroup.Enabled = cbfitwidth.Checked || cbfitheight.Checked;
+			if(!repeatgroup.Enabled) return;
+
+			// Update control status
+			labelhorizrepeat.Enabled = cbfitwidth.Checked;
+			horizrepeat.Enabled = cbfitwidth.Checked;
+			resethoriz.Enabled = cbfitwidth.Checked;
+
+			labelvertrepeat.Enabled = cbfitheight.Checked;
+			vertrepeat.Enabled = cbfitheight.Checked;
+			resetvert.Enabled = cbfitheight.Checked;
+		}
+
+		#endregion
+
+		#region ================== Events
+
+		private void FitTexturesForm_FormClosing(object sender, FormClosingEventArgs e)
+		{
+			location = this.Location;
+
+			// Store settings
+			if(this.DialogResult == DialogResult.OK)
+			{
+				horizontalrepeat = (int)horizrepeat.Value;
+				verticalrepeat = (int)vertrepeat.Value;
+				fitacrosssurfaces = cbfitwidth.Checked;
+				fitwidth = cbfitwidth.Checked;
+				fitheight = cbfitheight.Checked;
+			}
+		}
+
+		private void resethoriz_Click(object sender, EventArgs e)
+		{
+			prevhorizrepeat = 1;
+			horizrepeat.Value = 1;
+		}
+
+		private void resetvert_Click(object sender, EventArgs e)
+		{
+			prevvertrepeat = 1;
+			vertrepeat.Value = 1;
+		}
+
+		private void horizrepeat_ValueChanged(object sender, EventArgs e) 
+		{
+			if(blockupdate) return;
+
+			if(horizrepeat.Value == 0)
+			{
+				horizrepeat.Value = prevhorizrepeat > 0 ? -1 : 1;
+				return;
+			}
+
+			prevhorizrepeat = (int)horizrepeat.Value;
+			UpdateChanges();
+		}
+
+		private void vertrepeat_ValueChanged(object sender, EventArgs e) 
+		{
+			if(blockupdate) return;
+
+			if(vertrepeat.Value == 0) 
+			{
+				vertrepeat.Value = prevvertrepeat > 0 ? -1 : 1;
+				return;
+			}
+
+			prevvertrepeat = (int)vertrepeat.Value;
+			UpdateChanges();
+		}
+
+		private void accept_Click(object sender, EventArgs e) 
+		{
+			this.DialogResult = DialogResult.OK;
+			this.Close();
+		}
+
+		private void cancel_Click(object sender, EventArgs e)
+		{
+			this.DialogResult = DialogResult.Cancel;
+			this.Close();
+		}
+
+		private void cb_CheckedChanged(object sender, EventArgs e) 
+		{
+			if(blockupdate) return;
+			UpdateRepeatGroup();
+			UpdateChanges();
+		}
+
+		#endregion
+
+		#region ================== Debug
+
+#if DEBUG
+		private void DrawDebugUV()
+		{
+			const int margin = 20;
+
+			//sort by texture...
+			Dictionary<long, List<SortedVisualSide>> sortedstrips = new Dictionary<long, List<SortedVisualSide>>();
+			foreach(SortedVisualSide side in strips)
+			{
+				if(!sortedstrips.ContainsKey(side.Side.Texture.LongName))
+					sortedstrips.Add(side.Side.Texture.LongName, new List<SortedVisualSide>());
+
+				sortedstrips[side.Side.Texture.LongName].Add(side);
+			}
+
+			foreach(KeyValuePair<long, List<SortedVisualSide>> pair in sortedstrips)
+			{
+				//find bounds
+				int minx = int.MaxValue;
+				int maxx = int.MinValue;
+				int miny = int.MaxValue;
+				int maxy = int.MinValue;
+
+				foreach(SortedVisualSide side in pair.Value) 
+				{
+					if(side.Bounds.X < minx) minx = side.Bounds.X;
+					if(side.Bounds.X + side.Bounds.Width > maxx) maxx = side.Bounds.X + side.Bounds.Width;
+					if(side.Bounds.Y < miny) miny = side.Bounds.Y;
+					if(side.Bounds.Y + side.Bounds.Height > maxy) maxy = side.Bounds.Y + side.Bounds.Height;
+				}
+
+				Bitmap bmp = new Bitmap(maxx - minx + margin * 2, maxy - miny + margin * 2);
+
+				using(Graphics g = Graphics.FromImage(bmp)) 
+				{
+					int i = 0;
+
+					foreach(SortedVisualSide side in pair.Value) 
+					{
+						Color c = General.Colors.BrightColors[General.Random(0, General.Colors.BrightColors.Length - 1)].ToColor();
+						int x = side.Bounds.X - minx + margin;
+						int y = side.Bounds.Y - miny + margin;
+
+						using (Pen p = new Pen(c))
+						{
+							g.DrawRectangle(p, x, y, side.Bounds.Width, side.Bounds.Height);
+						}
+						using (Brush b = new SolidBrush(c))
+						{
+							g.DrawString(i++ + ": line " + side.Side.Sidedef.Line.Index + "; x:" + side.Bounds.X + " y:" + side.Bounds.Y, this.Font, b, x + 2, y + 2);
+						}
+					}
+				}
+
+				bmp.Save("testuv_" + pair.Value[0].Side.Texture.ShortName + ".png", ImageFormat.Png);
+			}
+
+			General.Interface.DisplayStatus(StatusType.Info, "Saved test image!");
+		}
+#endif
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/Interface/FitTexturesForm.resx b/Source/Plugins/BuilderModes/Interface/FitTexturesForm.resx
new file mode 100644
index 0000000..19dc0dd
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/FitTexturesForm.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/BuilderModes/Interface/MakeDoorForm.Designer.cs b/Source/Plugins/BuilderModes/Interface/MakeDoorForm.Designer.cs
new file mode 100644
index 0000000..f61b2ba
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/MakeDoorForm.Designer.cs
@@ -0,0 +1,205 @@
+namespace CodeImp.DoomBuilder.BuilderModes.Interface
+{
+	partial class MakeDoorForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.doortexture = new CodeImp.DoomBuilder.Controls.TextureSelectorControl();
+			this.label1 = new System.Windows.Forms.Label();
+			this.label2 = new System.Windows.Forms.Label();
+			this.ceilingtexture = new CodeImp.DoomBuilder.Controls.FlatSelectorControl();
+			this.floortexture = new CodeImp.DoomBuilder.Controls.FlatSelectorControl();
+			this.label3 = new System.Windows.Forms.Label();
+			this.cancel = new System.Windows.Forms.Button();
+			this.apply = new System.Windows.Forms.Button();
+			this.resetoffsets = new System.Windows.Forms.CheckBox();
+			this.tracktexture = new CodeImp.DoomBuilder.Controls.TextureSelectorControl();
+			this.label4 = new System.Windows.Forms.Label();
+			this.SuspendLayout();
+			// 
+			// doortexture
+			// 
+			this.doortexture.Location = new System.Drawing.Point(12, 29);
+			this.doortexture.MultipleTextures = false;
+			this.doortexture.Name = "doortexture";
+			this.doortexture.Required = true;
+			this.doortexture.Size = new System.Drawing.Size(83, 105);
+			this.doortexture.TabIndex = 0;
+			this.doortexture.TextureName = "";
+			this.doortexture.UsePreviews = true;
+			// 
+			// label1
+			// 
+			this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.label1.Location = new System.Drawing.Point(12, 10);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(83, 21);
+			this.label1.TabIndex = 1;
+			this.label1.Text = "Door";
+			this.label1.TextAlign = System.Drawing.ContentAlignment.TopCenter;
+			// 
+			// label2
+			// 
+			this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.label2.Location = new System.Drawing.Point(190, 10);
+			this.label2.Name = "label2";
+			this.label2.Size = new System.Drawing.Size(83, 21);
+			this.label2.TabIndex = 2;
+			this.label2.Text = "Ceiling";
+			this.label2.TextAlign = System.Drawing.ContentAlignment.TopCenter;
+			// 
+			// ceilingtexture
+			// 
+			this.ceilingtexture.Location = new System.Drawing.Point(190, 29);
+			this.ceilingtexture.MultipleTextures = false;
+			this.ceilingtexture.Name = "ceilingtexture";
+			this.ceilingtexture.Size = new System.Drawing.Size(83, 105);
+			this.ceilingtexture.TabIndex = 1;
+			this.ceilingtexture.TextureName = "";
+			this.ceilingtexture.UsePreviews = true;
+			// 
+			// floortexture
+			// 
+			this.floortexture.Location = new System.Drawing.Point(279, 29);
+			this.floortexture.MultipleTextures = false;
+			this.floortexture.Name = "floortexture";
+			this.floortexture.Size = new System.Drawing.Size(83, 105);
+			this.floortexture.TabIndex = 2;
+			this.floortexture.TextureName = "";
+			this.floortexture.UsePreviews = true;
+			// 
+			// label3
+			// 
+			this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.label3.Location = new System.Drawing.Point(279, 10);
+			this.label3.Name = "label3";
+			this.label3.Size = new System.Drawing.Size(83, 21);
+			this.label3.TabIndex = 4;
+			this.label3.Text = "Floor";
+			this.label3.TextAlign = System.Drawing.ContentAlignment.TopCenter;
+			// 
+			// cancel
+			// 
+			this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.cancel.Location = new System.Drawing.Point(279, 140);
+			this.cancel.Name = "cancel";
+			this.cancel.Size = new System.Drawing.Size(83, 25);
+			this.cancel.TabIndex = 4;
+			this.cancel.Text = "Cancel";
+			this.cancel.UseVisualStyleBackColor = true;
+			this.cancel.Click += new System.EventHandler(this.cancel_Click);
+			// 
+			// apply
+			// 
+			this.apply.Location = new System.Drawing.Point(190, 140);
+			this.apply.Name = "apply";
+			this.apply.Size = new System.Drawing.Size(83, 25);
+			this.apply.TabIndex = 3;
+			this.apply.Text = "OK";
+			this.apply.UseVisualStyleBackColor = true;
+			this.apply.Click += new System.EventHandler(this.apply_Click);
+			// 
+			// resetoffsets
+			// 
+			this.resetoffsets.AutoSize = true;
+			this.resetoffsets.Checked = true;
+			this.resetoffsets.CheckState = System.Windows.Forms.CheckState.Checked;
+			this.resetoffsets.Location = new System.Drawing.Point(12, 140);
+			this.resetoffsets.Name = "resetoffsets";
+			this.resetoffsets.Size = new System.Drawing.Size(123, 17);
+			this.resetoffsets.TabIndex = 5;
+			this.resetoffsets.Text = "Reset texture offsets";
+			this.resetoffsets.UseVisualStyleBackColor = true;
+			// 
+			// tracktexture
+			// 
+			this.tracktexture.Location = new System.Drawing.Point(101, 29);
+			this.tracktexture.MultipleTextures = false;
+			this.tracktexture.Name = "tracktexture";
+			this.tracktexture.Required = false;
+			this.tracktexture.Size = new System.Drawing.Size(83, 105);
+			this.tracktexture.TabIndex = 6;
+			this.tracktexture.TextureName = "";
+			this.tracktexture.UsePreviews = true;
+			// 
+			// label4
+			// 
+			this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.label4.Location = new System.Drawing.Point(101, 10);
+			this.label4.Name = "label4";
+			this.label4.Size = new System.Drawing.Size(83, 21);
+			this.label4.TabIndex = 7;
+			this.label4.Text = "Track";
+			this.label4.TextAlign = System.Drawing.ContentAlignment.TopCenter;
+			// 
+			// MakeDoorForm
+			// 
+			this.AcceptButton = this.apply;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.CancelButton = this.cancel;
+			this.ClientSize = new System.Drawing.Size(372, 170);
+			this.Controls.Add(this.tracktexture);
+			this.Controls.Add(this.label4);
+			this.Controls.Add(this.resetoffsets);
+			this.Controls.Add(this.cancel);
+			this.Controls.Add(this.apply);
+			this.Controls.Add(this.floortexture);
+			this.Controls.Add(this.label3);
+			this.Controls.Add(this.ceilingtexture);
+			this.Controls.Add(this.label2);
+			this.Controls.Add(this.doortexture);
+			this.Controls.Add(this.label1);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "MakeDoorForm";
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Make Door";
+			this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.MakeDoorForm_HelpRequested);
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private CodeImp.DoomBuilder.Controls.TextureSelectorControl doortexture;
+		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.Label label2;
+		private CodeImp.DoomBuilder.Controls.FlatSelectorControl ceilingtexture;
+		private CodeImp.DoomBuilder.Controls.FlatSelectorControl floortexture;
+		private System.Windows.Forms.Label label3;
+		private System.Windows.Forms.Button cancel;
+		private System.Windows.Forms.Button apply;
+		private System.Windows.Forms.CheckBox resetoffsets;
+		private CodeImp.DoomBuilder.Controls.TextureSelectorControl tracktexture;
+		private System.Windows.Forms.Label label4;
+	}
+}
\ No newline at end of file
diff --git a/Source/Plugins/BuilderModes/Interface/MakeDoorForm.cs b/Source/Plugins/BuilderModes/Interface/MakeDoorForm.cs
new file mode 100644
index 0000000..573a8fc
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/MakeDoorForm.cs
@@ -0,0 +1,92 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Windows;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes.Interface
+{
+	public partial class MakeDoorForm : DelayedForm
+	{
+		#region ================== Properties
+
+		public string DoorTexture { get { return doortexture.TextureName; } }
+		public string TrackTexture { get { return tracktexture.TextureName; } }
+		public string CeilingTexture { get { return ceilingtexture.TextureName; } }
+		public string FloorTexture { get { return floortexture.TextureName; } }
+		public bool ResetOffsets { get { return resetoffsets.Checked; } }
+
+		#endregion
+		
+		#region ================== Constructor / Show
+
+		// Constructor
+		public MakeDoorForm()
+		{
+			InitializeComponent();
+		}
+
+		// This sets the properties and shows the form
+		public DialogResult Show(IWin32Window owner, string doortex, string tracktex, string ceilingtex, string floortex, bool roffsets)
+		{
+			this.doortexture.TextureName = doortex;
+			this.tracktexture.TextureName = tracktex;
+			this.ceilingtexture.TextureName = ceilingtex;
+			this.floortexture.TextureName = floortex;
+			this.resetoffsets.Checked = roffsets;
+			return this.ShowDialog(owner);
+		}
+		
+		#endregion
+		
+		#region ================== Events
+
+		// Cancel clicked
+		private void cancel_Click(object sender, EventArgs e)
+		{
+			this.DialogResult = DialogResult.Cancel;
+			this.Close();
+		}
+
+		// OK clicked
+		private void apply_Click(object sender, EventArgs e)
+		{
+			// No door texture selected?
+			if(doortexture.TextureName.Length == 0)
+			{
+				MessageBox.Show(this, "Please select a door texture!", "Make Door", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+				doortexture.Focus();
+			}
+			else
+			{
+				this.DialogResult = DialogResult.OK;
+				this.Close();
+			}
+		}
+
+		private void MakeDoorForm_HelpRequested(object sender, HelpEventArgs hlpevent)
+		{
+			General.ShowHelp("e_sectors.html");
+		}
+		
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/Source/Plugins/BuilderModes/Interface/MakeDoorForm.resx b/Source/Plugins/BuilderModes/Interface/MakeDoorForm.resx
new file mode 100644
index 0000000..19dc0dd
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/MakeDoorForm.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/BuilderModes/Interface/MenusForm.Designer.cs b/Source/Plugins/BuilderModes/Interface/MenusForm.Designer.cs
new file mode 100644
index 0000000..71f4c35
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/MenusForm.Designer.cs
@@ -0,0 +1,959 @@
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	partial class MenusForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MenusForm));
+			this.menustrip = new System.Windows.Forms.MenuStrip();
+			this.linedefsmenu = new System.Windows.Forms.ToolStripMenuItem();
+			this.placethingsl = new System.Windows.Forms.ToolStripMenuItem();
+			this.syncthingeditlinedefsitem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
+			this.selectsinglesideditem = new System.Windows.Forms.ToolStripMenuItem();
+			this.selectdoublesideditem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripSeparator();
+			this.fliplinedefsitem = new System.Windows.Forms.ToolStripMenuItem();
+			this.flipsidedefsitem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator();
+			this.curvelinedefsitem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator();
+			this.splitlinedefsitem = new System.Windows.Forms.ToolStripMenuItem();
+			this.updatelightfogitem = new System.Windows.Forms.ToolStripMenuItem();
+			this.aligntexturesitem = new System.Windows.Forms.ToolStripMenuItem();
+			this.alignFloorToFrontItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.alignFloorToBackItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.alignCeilingToFrontItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.alignCeilingToBackItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
+			this.selectSimilarLinesItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.sectorsmenu = new System.Windows.Forms.ToolStripMenuItem();
+			this.placethingss = new System.Windows.Forms.ToolStripMenuItem();
+			this.syncthingeditsectorsitem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+			this.joinsectorsitem = new System.Windows.Forms.ToolStripMenuItem();
+			this.mergesectorsitem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator();
+			this.flipsectorlinedefsitem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
+			this.makedooritem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
+			this.selectSimilarSectors = new System.Windows.Forms.ToolStripMenuItem();
+			this.thingsmenu = new System.Windows.Forms.ToolStripMenuItem();
+			this.selectInSectorsItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.filterSelectionItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
+			this.alignToWallItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.pointAtCursorItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
+			this.selectSimilarThingsItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.vertsmenu = new System.Windows.Forms.ToolStripMenuItem();
+			this.placethingsv = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
+			this.selectSimilarVertsItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.globalstrip = new System.Windows.Forms.ToolStrip();
+			this.manualstrip = new System.Windows.Forms.ToolStrip();
+			this.buttoncopyproperties = new System.Windows.Forms.ToolStripButton();
+			this.buttonpasteproperties = new System.Windows.Forms.ToolStripButton();
+			this.buttonpastepropertiesoptions = new System.Windows.Forms.ToolStripButton();
+			this.seperatorcopypaste = new System.Windows.Forms.ToolStripSeparator();
+			this.buttonselectionnumbers = new System.Windows.Forms.ToolStripButton();
+			this.buttonselectioneffects = new System.Windows.Forms.ToolStripButton();
+			this.separatorsectors1 = new System.Windows.Forms.ToolStripSeparator();
+			this.buttonMakeDoor = new System.Windows.Forms.ToolStripButton();
+			this.separatorsectors2 = new System.Windows.Forms.ToolStripSeparator();
+			this.buttonbrightnessgradient = new System.Windows.Forms.ToolStripButton();
+			this.buttonfloorgradient = new System.Windows.Forms.ToolStripButton();
+			this.buttonceilinggradient = new System.Windows.Forms.ToolStripButton();
+			this.buttonflipselectionh = new System.Windows.Forms.ToolStripButton();
+			this.buttonflipselectionv = new System.Windows.Forms.ToolStripButton();
+			this.buttoncurvelinedefs = new System.Windows.Forms.ToolStripButton();
+			this.gradientModeMenu = new System.Windows.Forms.ToolStripComboBox();
+			this.gradientInterpolationMenu = new System.Windows.Forms.ToolStripComboBox();
+			this.separatorsectors3 = new System.Windows.Forms.ToolStripSeparator();
+			this.buttonMarqueSelectTouching = new System.Windows.Forms.ToolStripButton();
+			this.syncthingteditbutton = new System.Windows.Forms.ToolStripButton();
+			this.buttonAlignThingsToWall = new System.Windows.Forms.ToolStripButton();
+			this.buttonTextureOffsetLock = new System.Windows.Forms.ToolStripButton();
+			this.fileMenuStrip = new System.Windows.Forms.MenuStrip();
+			this.exportStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripMenuItem5 = new System.Windows.Forms.ToolStripMenuItem();
+			this.editmenuitem = new System.Windows.Forms.ToolStripMenuItem();
+			this.separatorcopyprops = new System.Windows.Forms.ToolStripSeparator();
+			this.itemcopyprops = new System.Windows.Forms.ToolStripMenuItem();
+			this.itempasteprops = new System.Windows.Forms.ToolStripMenuItem();
+			this.itempastepropsoptions = new System.Windows.Forms.ToolStripMenuItem();
+			this.menustrip.SuspendLayout();
+			this.manualstrip.SuspendLayout();
+			this.fileMenuStrip.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// menustrip
+			// 
+			this.menustrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.linedefsmenu,
+            this.sectorsmenu,
+            this.thingsmenu,
+            this.vertsmenu});
+			this.menustrip.Location = new System.Drawing.Point(0, 24);
+			this.menustrip.Name = "menustrip";
+			this.menustrip.Size = new System.Drawing.Size(794, 24);
+			this.menustrip.TabIndex = 0;
+			this.menustrip.Text = "menustrip";
+			// 
+			// linedefsmenu
+			// 
+			this.linedefsmenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.placethingsl,
+            this.syncthingeditlinedefsitem,
+            this.toolStripSeparator2,
+            this.selectsinglesideditem,
+            this.selectdoublesideditem,
+            this.toolStripMenuItem4,
+            this.fliplinedefsitem,
+            this.flipsidedefsitem,
+            this.toolStripMenuItem1,
+            this.curvelinedefsitem,
+            this.toolStripMenuItem3,
+            this.splitlinedefsitem,
+            this.updatelightfogitem,
+            this.aligntexturesitem,
+            this.toolStripSeparator5,
+            this.selectSimilarLinesItem});
+			this.linedefsmenu.Name = "linedefsmenu";
+			this.linedefsmenu.Size = new System.Drawing.Size(63, 20);
+			this.linedefsmenu.Text = "&Linedefs";
+			this.linedefsmenu.Visible = false;
+			this.linedefsmenu.DropDownOpening += new System.EventHandler(this.linedefsmenu_DropDownOpening);
+			// 
+			// placethingsl
+			// 
+			this.placethingsl.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.PlaceThings;
+			this.placethingsl.Name = "placethingsl";
+			this.placethingsl.Size = new System.Drawing.Size(224, 22);
+			this.placethingsl.Tag = "placethings";
+			this.placethingsl.Text = "&Place Things...";
+			this.placethingsl.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// syncthingeditlinedefsitem
+			// 
+			this.syncthingeditlinedefsitem.CheckOnClick = true;
+			this.syncthingeditlinedefsitem.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.SelectThingsInSectors;
+			this.syncthingeditlinedefsitem.Name = "syncthingeditlinedefsitem";
+			this.syncthingeditlinedefsitem.Size = new System.Drawing.Size(224, 22);
+			this.syncthingeditlinedefsitem.Tag = "syncedthingedit";
+			this.syncthingeditlinedefsitem.Text = "&Synchronized Things Editing";
+			this.syncthingeditlinedefsitem.ToolTipText = "When enabled, selected things will be dragged when dragging linedefs.\r\nRectangula" +
+				"r selection will also select things (holding Alt while selecting \r\ninverts this " +
+				"behaviour).";
+			this.syncthingeditlinedefsitem.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// toolStripSeparator2
+			// 
+			this.toolStripSeparator2.Name = "toolStripSeparator2";
+			this.toolStripSeparator2.Size = new System.Drawing.Size(221, 6);
+			// 
+			// selectsinglesideditem
+			// 
+			this.selectsinglesideditem.Name = "selectsinglesideditem";
+			this.selectsinglesideditem.Size = new System.Drawing.Size(224, 22);
+			this.selectsinglesideditem.Tag = "selectsinglesided";
+			this.selectsinglesideditem.Text = "Select S&ingle-sided only";
+			this.selectsinglesideditem.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// selectdoublesideditem
+			// 
+			this.selectdoublesideditem.Name = "selectdoublesideditem";
+			this.selectdoublesideditem.Size = new System.Drawing.Size(224, 22);
+			this.selectdoublesideditem.Tag = "selectdoublesided";
+			this.selectdoublesideditem.Text = "Select &Double-sided only";
+			this.selectdoublesideditem.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// toolStripMenuItem4
+			// 
+			this.toolStripMenuItem4.Name = "toolStripMenuItem4";
+			this.toolStripMenuItem4.Size = new System.Drawing.Size(221, 6);
+			// 
+			// fliplinedefsitem
+			// 
+			this.fliplinedefsitem.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.Flip;
+			this.fliplinedefsitem.Name = "fliplinedefsitem";
+			this.fliplinedefsitem.Size = new System.Drawing.Size(224, 22);
+			this.fliplinedefsitem.Tag = "fliplinedefs";
+			this.fliplinedefsitem.Text = "&Flip Linedefs";
+			this.fliplinedefsitem.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// flipsidedefsitem
+			// 
+			this.flipsidedefsitem.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.Flip;
+			this.flipsidedefsitem.Name = "flipsidedefsitem";
+			this.flipsidedefsitem.Size = new System.Drawing.Size(224, 22);
+			this.flipsidedefsitem.Tag = "flipsidedefs";
+			this.flipsidedefsitem.Text = "F&lip Sidedefs";
+			this.flipsidedefsitem.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// toolStripMenuItem1
+			// 
+			this.toolStripMenuItem1.Name = "toolStripMenuItem1";
+			this.toolStripMenuItem1.Size = new System.Drawing.Size(221, 6);
+			// 
+			// curvelinedefsitem
+			// 
+			this.curvelinedefsitem.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.CurveLines;
+			this.curvelinedefsitem.Name = "curvelinedefsitem";
+			this.curvelinedefsitem.Size = new System.Drawing.Size(224, 22);
+			this.curvelinedefsitem.Tag = "curvelinesmode";
+			this.curvelinedefsitem.Text = "&Curve Linedefs...";
+			this.curvelinedefsitem.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// toolStripMenuItem3
+			// 
+			this.toolStripMenuItem3.Name = "toolStripMenuItem3";
+			this.toolStripMenuItem3.Size = new System.Drawing.Size(221, 6);
+			// 
+			// splitlinedefsitem
+			// 
+			this.splitlinedefsitem.Name = "splitlinedefsitem";
+			this.splitlinedefsitem.Size = new System.Drawing.Size(224, 22);
+			this.splitlinedefsitem.Tag = "splitlinedefs";
+			this.splitlinedefsitem.Text = "S&plit Linedefs";
+			this.splitlinedefsitem.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// updatelightfogitem
+			// 
+			this.updatelightfogitem.Name = "updatelightfogitem";
+			this.updatelightfogitem.Size = new System.Drawing.Size(224, 22);
+			this.updatelightfogitem.Tag = "applylightfogflag";
+			this.updatelightfogitem.Text = "&Update \'lightfog\' flag";
+			this.updatelightfogitem.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// aligntexturesitem
+			// 
+			this.aligntexturesitem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.alignFloorToFrontItem,
+            this.alignFloorToBackItem,
+            this.alignCeilingToFrontItem,
+            this.alignCeilingToBackItem});
+			this.aligntexturesitem.Name = "aligntexturesitem";
+			this.aligntexturesitem.Size = new System.Drawing.Size(224, 22);
+			this.aligntexturesitem.Text = "&Align Textures";
+			// 
+			// alignFloorToFrontItem
+			// 
+			this.alignFloorToFrontItem.Name = "alignFloorToFrontItem";
+			this.alignFloorToFrontItem.Size = new System.Drawing.Size(181, 22);
+			this.alignFloorToFrontItem.Tag = "alignfloortofront";
+			this.alignFloorToFrontItem.Text = "Floor to Front Side";
+			this.alignFloorToFrontItem.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// alignFloorToBackItem
+			// 
+			this.alignFloorToBackItem.Name = "alignFloorToBackItem";
+			this.alignFloorToBackItem.Size = new System.Drawing.Size(181, 22);
+			this.alignFloorToBackItem.Tag = "alignfloortoback";
+			this.alignFloorToBackItem.Text = "Floor to Back Side";
+			this.alignFloorToBackItem.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// alignCeilingToFrontItem
+			// 
+			this.alignCeilingToFrontItem.Name = "alignCeilingToFrontItem";
+			this.alignCeilingToFrontItem.Size = new System.Drawing.Size(181, 22);
+			this.alignCeilingToFrontItem.Tag = "alignceilingtofront";
+			this.alignCeilingToFrontItem.Text = "Ceiling to Front Side";
+			this.alignCeilingToFrontItem.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// alignCeilingToBackItem
+			// 
+			this.alignCeilingToBackItem.Name = "alignCeilingToBackItem";
+			this.alignCeilingToBackItem.Size = new System.Drawing.Size(181, 22);
+			this.alignCeilingToBackItem.Tag = "alignceilingtoback";
+			this.alignCeilingToBackItem.Text = "Ceiling to Back Side";
+			this.alignCeilingToBackItem.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// toolStripSeparator5
+			// 
+			this.toolStripSeparator5.Name = "toolStripSeparator5";
+			this.toolStripSeparator5.Size = new System.Drawing.Size(221, 6);
+			// 
+			// selectSimilarLinesItem
+			// 
+			this.selectSimilarLinesItem.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.Similar;
+			this.selectSimilarLinesItem.Name = "selectSimilarLinesItem";
+			this.selectSimilarLinesItem.Size = new System.Drawing.Size(224, 22);
+			this.selectSimilarLinesItem.Tag = "selectsimilar";
+			this.selectSimilarLinesItem.Text = "Select Similar...";
+			this.selectSimilarLinesItem.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// sectorsmenu
+			// 
+			this.sectorsmenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.placethingss,
+            this.syncthingeditsectorsitem,
+            this.toolStripSeparator1,
+            this.joinsectorsitem,
+            this.mergesectorsitem,
+            this.toolStripMenuItem2,
+            this.flipsectorlinedefsitem,
+            this.toolStripSeparator8,
+            this.makedooritem,
+            this.toolStripSeparator4,
+            this.selectSimilarSectors});
+			this.sectorsmenu.Name = "sectorsmenu";
+			this.sectorsmenu.Size = new System.Drawing.Size(57, 20);
+			this.sectorsmenu.Text = "&Sectors";
+			this.sectorsmenu.Visible = false;
+			// 
+			// placethingss
+			// 
+			this.placethingss.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.PlaceThings;
+			this.placethingss.Name = "placethingss";
+			this.placethingss.Size = new System.Drawing.Size(224, 22);
+			this.placethingss.Tag = "placethings";
+			this.placethingss.Text = "&Place Things...";
+			this.placethingss.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// syncthingeditsectorsitem
+			// 
+			this.syncthingeditsectorsitem.CheckOnClick = true;
+			this.syncthingeditsectorsitem.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.SelectThingsInSectors;
+			this.syncthingeditsectorsitem.Name = "syncthingeditsectorsitem";
+			this.syncthingeditsectorsitem.Size = new System.Drawing.Size(224, 22);
+			this.syncthingeditsectorsitem.Tag = "syncedthingedit";
+			this.syncthingeditsectorsitem.Text = "&Synchronized Things Editing";
+			this.syncthingeditsectorsitem.ToolTipText = resources.GetString("syncthingeditsectorsitem.ToolTipText");
+			this.syncthingeditsectorsitem.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// toolStripSeparator1
+			// 
+			this.toolStripSeparator1.Name = "toolStripSeparator1";
+			this.toolStripSeparator1.Size = new System.Drawing.Size(221, 6);
+			// 
+			// joinsectorsitem
+			// 
+			this.joinsectorsitem.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.Join;
+			this.joinsectorsitem.Name = "joinsectorsitem";
+			this.joinsectorsitem.Size = new System.Drawing.Size(224, 22);
+			this.joinsectorsitem.Tag = "joinsectors";
+			this.joinsectorsitem.Text = "&Join Sectors";
+			this.joinsectorsitem.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// mergesectorsitem
+			// 
+			this.mergesectorsitem.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.Merge;
+			this.mergesectorsitem.Name = "mergesectorsitem";
+			this.mergesectorsitem.Size = new System.Drawing.Size(224, 22);
+			this.mergesectorsitem.Tag = "mergesectors";
+			this.mergesectorsitem.Text = "&Merge Sectors";
+			this.mergesectorsitem.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// toolStripMenuItem2
+			// 
+			this.toolStripMenuItem2.Name = "toolStripMenuItem2";
+			this.toolStripMenuItem2.Size = new System.Drawing.Size(221, 6);
+			// 
+			// flipsectorlinedefsitem
+			// 
+			this.flipsectorlinedefsitem.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.Flip;
+			this.flipsectorlinedefsitem.Name = "flipsectorlinedefsitem";
+			this.flipsectorlinedefsitem.Size = new System.Drawing.Size(224, 22);
+			this.flipsectorlinedefsitem.Tag = "fliplinedefs";
+			this.flipsectorlinedefsitem.Text = "&Flip Linedefs";
+			this.flipsectorlinedefsitem.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// toolStripSeparator8
+			// 
+			this.toolStripSeparator8.Name = "toolStripSeparator8";
+			this.toolStripSeparator8.Size = new System.Drawing.Size(221, 6);
+			// 
+			// makedooritem
+			// 
+			this.makedooritem.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.Door;
+			this.makedooritem.Name = "makedooritem";
+			this.makedooritem.Size = new System.Drawing.Size(224, 22);
+			this.makedooritem.Tag = "makedoor";
+			this.makedooritem.Text = "Make &Door";
+			this.makedooritem.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// toolStripSeparator4
+			// 
+			this.toolStripSeparator4.Name = "toolStripSeparator4";
+			this.toolStripSeparator4.Size = new System.Drawing.Size(221, 6);
+			this.toolStripSeparator4.Visible = false;
+			// 
+			// selectSimilarSectors
+			// 
+			this.selectSimilarSectors.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.Similar;
+			this.selectSimilarSectors.Name = "selectSimilarSectors";
+			this.selectSimilarSectors.Size = new System.Drawing.Size(224, 22);
+			this.selectSimilarSectors.Tag = "selectsimilar";
+			this.selectSimilarSectors.Text = "Select Similar...";
+			this.selectSimilarSectors.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// thingsmenu
+			// 
+			this.thingsmenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.selectInSectorsItem,
+            this.filterSelectionItem,
+            this.toolStripSeparator3,
+            this.alignToWallItem,
+            this.pointAtCursorItem,
+            this.toolStripSeparator6,
+            this.selectSimilarThingsItem});
+			this.thingsmenu.Name = "thingsmenu";
+			this.thingsmenu.Size = new System.Drawing.Size(55, 20);
+			this.thingsmenu.Text = "Things";
+			this.thingsmenu.Visible = false;
+			// 
+			// selectInSectorsItem
+			// 
+			this.selectInSectorsItem.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.SelectThingsInSectors;
+			this.selectInSectorsItem.Name = "selectInSectorsItem";
+			this.selectInSectorsItem.Size = new System.Drawing.Size(245, 22);
+			this.selectInSectorsItem.Tag = "thingsselectinsectors";
+			this.selectInSectorsItem.Text = "&Select Things in Selected Sectors";
+			this.selectInSectorsItem.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// filterSelectionItem
+			// 
+			this.filterSelectionItem.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.FilterThings;
+			this.filterSelectionItem.Name = "filterSelectionItem";
+			this.filterSelectionItem.Size = new System.Drawing.Size(245, 22);
+			this.filterSelectionItem.Tag = "filterselectedthings";
+			this.filterSelectionItem.Text = "Filter Selection...";
+			this.filterSelectionItem.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// toolStripSeparator3
+			// 
+			this.toolStripSeparator3.Name = "toolStripSeparator3";
+			this.toolStripSeparator3.Size = new System.Drawing.Size(242, 6);
+			// 
+			// alignToWallItem
+			// 
+			this.alignToWallItem.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.AlignThings;
+			this.alignToWallItem.Name = "alignToWallItem";
+			this.alignToWallItem.Size = new System.Drawing.Size(245, 22);
+			this.alignToWallItem.Tag = "thingaligntowall";
+			this.alignToWallItem.Text = "&Align To Closest Linedef";
+			this.alignToWallItem.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// pointAtCursorItem
+			// 
+			this.pointAtCursorItem.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.ThingPointAtCursor;
+			this.pointAtCursorItem.Name = "pointAtCursorItem";
+			this.pointAtCursorItem.Size = new System.Drawing.Size(245, 22);
+			this.pointAtCursorItem.Tag = "thinglookatcursor";
+			this.pointAtCursorItem.Text = "&Point to Cursor";
+			this.pointAtCursorItem.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// toolStripSeparator6
+			// 
+			this.toolStripSeparator6.Name = "toolStripSeparator6";
+			this.toolStripSeparator6.Size = new System.Drawing.Size(242, 6);
+			// 
+			// selectSimilarThingsItem
+			// 
+			this.selectSimilarThingsItem.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.Similar;
+			this.selectSimilarThingsItem.Name = "selectSimilarThingsItem";
+			this.selectSimilarThingsItem.Size = new System.Drawing.Size(245, 22);
+			this.selectSimilarThingsItem.Tag = "selectsimilar";
+			this.selectSimilarThingsItem.Text = "Select Similar...";
+			this.selectSimilarThingsItem.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// vertsmenu
+			// 
+			this.vertsmenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.placethingsv,
+            this.toolStripSeparator7,
+            this.selectSimilarVertsItem});
+			this.vertsmenu.Name = "vertsmenu";
+			this.vertsmenu.Size = new System.Drawing.Size(60, 20);
+			this.vertsmenu.Text = "Vertices";
+			this.vertsmenu.Visible = false;
+			// 
+			// placethingsv
+			// 
+			this.placethingsv.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.PlaceThings;
+			this.placethingsv.Name = "placethingsv";
+			this.placethingsv.Size = new System.Drawing.Size(153, 22);
+			this.placethingsv.Tag = "placethings";
+			this.placethingsv.Text = "&Place Things...";
+			this.placethingsv.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// toolStripSeparator7
+			// 
+			this.toolStripSeparator7.Name = "toolStripSeparator7";
+			this.toolStripSeparator7.Size = new System.Drawing.Size(150, 6);
+			// 
+			// selectSimilarVertsItem
+			// 
+			this.selectSimilarVertsItem.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.Similar;
+			this.selectSimilarVertsItem.Name = "selectSimilarVertsItem";
+			this.selectSimilarVertsItem.Size = new System.Drawing.Size(153, 22);
+			this.selectSimilarVertsItem.Tag = "selectsimilar";
+			this.selectSimilarVertsItem.Text = "Select Similar...";
+			this.selectSimilarVertsItem.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// globalstrip
+			// 
+			this.globalstrip.Location = new System.Drawing.Point(0, 48);
+			this.globalstrip.Name = "globalstrip";
+			this.globalstrip.Size = new System.Drawing.Size(794, 25);
+			this.globalstrip.TabIndex = 1;
+			this.globalstrip.Text = "toolstrip";
+			// 
+			// manualstrip
+			// 
+			this.manualstrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.buttoncopyproperties,
+            this.buttonpasteproperties,
+            this.buttonpastepropertiesoptions,
+            this.seperatorcopypaste,
+            this.buttonselectionnumbers,
+            this.buttonselectioneffects,
+            this.separatorsectors1,
+            this.buttonMakeDoor,
+            this.separatorsectors2,
+            this.buttonbrightnessgradient,
+            this.buttonfloorgradient,
+            this.buttonceilinggradient,
+            this.buttonflipselectionh,
+            this.buttonflipselectionv,
+            this.buttoncurvelinedefs,
+            this.gradientModeMenu,
+            this.gradientInterpolationMenu,
+            this.separatorsectors3,
+            this.buttonMarqueSelectTouching,
+            this.syncthingteditbutton,
+            this.buttonAlignThingsToWall,
+            this.buttonTextureOffsetLock});
+			this.manualstrip.Location = new System.Drawing.Point(0, 73);
+			this.manualstrip.Name = "manualstrip";
+			this.manualstrip.Size = new System.Drawing.Size(794, 25);
+			this.manualstrip.TabIndex = 2;
+			this.manualstrip.Text = "toolStrip1";
+			// 
+			// buttoncopyproperties
+			// 
+			this.buttoncopyproperties.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttoncopyproperties.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.CopyProperties;
+			this.buttoncopyproperties.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttoncopyproperties.Name = "buttoncopyproperties";
+			this.buttoncopyproperties.Size = new System.Drawing.Size(23, 22);
+			this.buttoncopyproperties.Tag = "classiccopyproperties";
+			this.buttoncopyproperties.Text = "Copy Properties";
+			this.buttoncopyproperties.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// buttonpasteproperties
+			// 
+			this.buttonpasteproperties.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttonpasteproperties.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.PasteProperties;
+			this.buttonpasteproperties.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttonpasteproperties.Name = "buttonpasteproperties";
+			this.buttonpasteproperties.Size = new System.Drawing.Size(23, 22);
+			this.buttonpasteproperties.Tag = "classicpasteproperties";
+			this.buttonpasteproperties.Text = "Paste Properties";
+			this.buttonpasteproperties.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// buttonpastepropertiesoptions
+			// 
+			this.buttonpastepropertiesoptions.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttonpastepropertiesoptions.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.PastePropertiesOptions;
+			this.buttonpastepropertiesoptions.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttonpastepropertiesoptions.Name = "buttonpastepropertiesoptions";
+			this.buttonpastepropertiesoptions.Size = new System.Drawing.Size(23, 22);
+			this.buttonpastepropertiesoptions.Tag = "classicpastepropertieswithoptions";
+			this.buttonpastepropertiesoptions.Text = "Paste Properties Special...";
+			this.buttonpastepropertiesoptions.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			this.buttonpastepropertiesoptions.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// seperatorcopypaste
+			// 
+			this.seperatorcopypaste.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+			this.seperatorcopypaste.Name = "seperatorcopypaste";
+			this.seperatorcopypaste.Size = new System.Drawing.Size(6, 25);
+			// 
+			// buttonselectionnumbers
+			// 
+			this.buttonselectionnumbers.CheckOnClick = true;
+			this.buttonselectionnumbers.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttonselectionnumbers.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.ViewSelectionIndex;
+			this.buttonselectionnumbers.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttonselectionnumbers.Name = "buttonselectionnumbers";
+			this.buttonselectionnumbers.Size = new System.Drawing.Size(23, 22);
+			this.buttonselectionnumbers.Text = "View Selection Numbering";
+			this.buttonselectionnumbers.Click += new System.EventHandler(this.buttonselectionnumbers_Click);
+			// 
+			// buttonselectioneffects
+			// 
+			this.buttonselectioneffects.CheckOnClick = true;
+			this.buttonselectioneffects.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttonselectioneffects.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.ViewSelectionEffects;
+			this.buttonselectioneffects.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttonselectioneffects.Name = "buttonselectioneffects";
+			this.buttonselectioneffects.Size = new System.Drawing.Size(23, 22);
+			this.buttonselectioneffects.Text = "View Tags and Effects";
+			this.buttonselectioneffects.Click += new System.EventHandler(this.buttonselectioneffects_Click);
+			// 
+			// separatorsectors1
+			// 
+			this.separatorsectors1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+			this.separatorsectors1.Name = "separatorsectors1";
+			this.separatorsectors1.Size = new System.Drawing.Size(6, 25);
+			// 
+			// buttonMakeDoor
+			// 
+			this.buttonMakeDoor.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttonMakeDoor.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.Door;
+			this.buttonMakeDoor.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttonMakeDoor.Name = "buttonMakeDoor";
+			this.buttonMakeDoor.Size = new System.Drawing.Size(23, 22);
+			this.buttonMakeDoor.Tag = "makedoor";
+			this.buttonMakeDoor.Text = "Make Door From Selection";
+			this.buttonMakeDoor.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// separatorsectors2
+			// 
+			this.separatorsectors2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+			this.separatorsectors2.Name = "separatorsectors2";
+			this.separatorsectors2.Size = new System.Drawing.Size(6, 25);
+			// 
+			// buttonbrightnessgradient
+			// 
+			this.buttonbrightnessgradient.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttonbrightnessgradient.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.BrightnessGradient;
+			this.buttonbrightnessgradient.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttonbrightnessgradient.Name = "buttonbrightnessgradient";
+			this.buttonbrightnessgradient.Size = new System.Drawing.Size(23, 22);
+			this.buttonbrightnessgradient.Tag = "gradientbrightness";
+			this.buttonbrightnessgradient.Text = "Make Brightness Gradient";
+			this.buttonbrightnessgradient.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// buttonfloorgradient
+			// 
+			this.buttonfloorgradient.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttonfloorgradient.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.FloorsGradient;
+			this.buttonfloorgradient.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttonfloorgradient.Name = "buttonfloorgradient";
+			this.buttonfloorgradient.Size = new System.Drawing.Size(23, 22);
+			this.buttonfloorgradient.Tag = "gradientfloors";
+			this.buttonfloorgradient.Text = "Make Floor Heights Gradient";
+			this.buttonfloorgradient.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// buttonceilinggradient
+			// 
+			this.buttonceilinggradient.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttonceilinggradient.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.CeilsGradient;
+			this.buttonceilinggradient.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttonceilinggradient.Name = "buttonceilinggradient";
+			this.buttonceilinggradient.Size = new System.Drawing.Size(23, 22);
+			this.buttonceilinggradient.Tag = "gradientceilings";
+			this.buttonceilinggradient.Text = "Make Ceiling Heights Gradient";
+			this.buttonceilinggradient.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// buttonflipselectionh
+			// 
+			this.buttonflipselectionh.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttonflipselectionh.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.FlipSelectionH;
+			this.buttonflipselectionh.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttonflipselectionh.Name = "buttonflipselectionh";
+			this.buttonflipselectionh.Size = new System.Drawing.Size(23, 22);
+			this.buttonflipselectionh.Tag = "flipselectionh";
+			this.buttonflipselectionh.Text = "Flip Selection Horizontally";
+			this.buttonflipselectionh.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// buttonflipselectionv
+			// 
+			this.buttonflipselectionv.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttonflipselectionv.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.FlipSelectionV;
+			this.buttonflipselectionv.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttonflipselectionv.Name = "buttonflipselectionv";
+			this.buttonflipselectionv.Size = new System.Drawing.Size(23, 22);
+			this.buttonflipselectionv.Tag = "flipselectionv";
+			this.buttonflipselectionv.Text = "Flip Selection Vertically";
+			this.buttonflipselectionv.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// buttoncurvelinedefs
+			// 
+			this.buttoncurvelinedefs.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttoncurvelinedefs.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.CurveLines;
+			this.buttoncurvelinedefs.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttoncurvelinedefs.Name = "buttoncurvelinedefs";
+			this.buttoncurvelinedefs.Size = new System.Drawing.Size(23, 22);
+			this.buttoncurvelinedefs.Tag = "curvelinesmode";
+			this.buttoncurvelinedefs.Text = "Curve Linedefs";
+			this.buttoncurvelinedefs.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// gradientModeMenu
+			// 
+			this.gradientModeMenu.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.gradientModeMenu.Name = "gradientModeMenu";
+			this.gradientModeMenu.Size = new System.Drawing.Size(144, 25);
+			this.gradientModeMenu.ToolTipText = "Brightness Gradient Target";
+			this.gradientModeMenu.DropDownClosed += new System.EventHandler(this.gradientMode_DropDownClosed);
+			// 
+			// gradientInterpolationMenu
+			// 
+			this.gradientInterpolationMenu.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.gradientInterpolationMenu.Name = "gradientInterpolationMenu";
+			this.gradientInterpolationMenu.Size = new System.Drawing.Size(108, 25);
+			this.gradientInterpolationMenu.ToolTipText = "Brightness and Height Gradient Interpolation Mode";
+			this.gradientInterpolationMenu.DropDownClosed += new System.EventHandler(this.gradientMode_DropDownClosed);
+			// 
+			// separatorsectors3
+			// 
+			this.separatorsectors3.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+			this.separatorsectors3.Name = "separatorsectors3";
+			this.separatorsectors3.Size = new System.Drawing.Size(6, 25);
+			// 
+			// buttonMarqueSelectTouching
+			// 
+			this.buttonMarqueSelectTouching.CheckOnClick = true;
+			this.buttonMarqueSelectTouching.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttonMarqueSelectTouching.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.SelectTouching;
+			this.buttonMarqueSelectTouching.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttonMarqueSelectTouching.Name = "buttonMarqueSelectTouching";
+			this.buttonMarqueSelectTouching.Size = new System.Drawing.Size(23, 22);
+			this.buttonMarqueSelectTouching.Text = "Select Touching";
+			this.buttonMarqueSelectTouching.ToolTipText = "Toggle between \"select touching\" and \"select inside\"\r\nrectangular selection modes" +
+				"";
+			this.buttonMarqueSelectTouching.Click += new System.EventHandler(this.buttonMarqueSelectTouching_Click);
+			// 
+			// syncthingteditbutton
+			// 
+			this.syncthingteditbutton.CheckOnClick = true;
+			this.syncthingteditbutton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.syncthingteditbutton.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.SelectThingsInSectors;
+			this.syncthingteditbutton.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.syncthingteditbutton.Name = "syncthingteditbutton";
+			this.syncthingteditbutton.Size = new System.Drawing.Size(23, 22);
+			this.syncthingteditbutton.Tag = "syncedthingedit";
+			this.syncthingteditbutton.Text = "Synchronized Things Editing";
+			this.syncthingteditbutton.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// buttonAlignThingsToWall
+			// 
+			this.buttonAlignThingsToWall.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttonAlignThingsToWall.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.AlignThings;
+			this.buttonAlignThingsToWall.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttonAlignThingsToWall.Name = "buttonAlignThingsToWall";
+			this.buttonAlignThingsToWall.Size = new System.Drawing.Size(23, 22);
+			this.buttonAlignThingsToWall.Tag = "thingaligntowall";
+			this.buttonAlignThingsToWall.ToolTipText = "Align selected things to closest linedef";
+			this.buttonAlignThingsToWall.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// buttonTextureOffsetLock
+			// 
+			this.buttonTextureOffsetLock.CheckOnClick = true;
+			this.buttonTextureOffsetLock.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.buttonTextureOffsetLock.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.TextureLock;
+			this.buttonTextureOffsetLock.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.buttonTextureOffsetLock.Name = "buttonTextureOffsetLock";
+			this.buttonTextureOffsetLock.Size = new System.Drawing.Size(23, 22);
+			this.buttonTextureOffsetLock.ToolTipText = "Pin Texture Offsets.\r\nWhen enabled, keeps floor and ceiling texture offsets\r\ncons" +
+				"tant while sector is dragged";
+			this.buttonTextureOffsetLock.Click += new System.EventHandler(this.buttonTextureOffsetLock_Click);
+			// 
+			// fileMenuStrip
+			// 
+			this.fileMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.exportStripMenuItem,
+            this.editmenuitem});
+			this.fileMenuStrip.Location = new System.Drawing.Point(0, 0);
+			this.fileMenuStrip.Name = "fileMenuStrip";
+			this.fileMenuStrip.Size = new System.Drawing.Size(794, 24);
+			this.fileMenuStrip.TabIndex = 3;
+			this.fileMenuStrip.Text = "menuStrip1";
+			// 
+			// exportStripMenuItem
+			// 
+			this.exportStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.toolStripMenuItem5});
+			this.exportStripMenuItem.Name = "exportStripMenuItem";
+			this.exportStripMenuItem.Size = new System.Drawing.Size(52, 20);
+			this.exportStripMenuItem.Text = "Export";
+			// 
+			// toolStripMenuItem5
+			// 
+			this.toolStripMenuItem5.Name = "toolStripMenuItem5";
+			this.toolStripMenuItem5.Size = new System.Drawing.Size(226, 22);
+			this.toolStripMenuItem5.Tag = "exporttoobj";
+			this.toolStripMenuItem5.Text = "Selection to Wavefront .obj...";
+			this.toolStripMenuItem5.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// editmenuitem
+			// 
+			this.editmenuitem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.separatorcopyprops,
+            this.itemcopyprops,
+            this.itempasteprops,
+            this.itempastepropsoptions});
+			this.editmenuitem.Name = "editmenuitem";
+			this.editmenuitem.Size = new System.Drawing.Size(39, 20);
+			this.editmenuitem.Text = "Edit";
+			// 
+			// separatorcopyprops
+			// 
+			this.separatorcopyprops.Name = "separatorcopyprops";
+			this.separatorcopyprops.Size = new System.Drawing.Size(204, 6);
+			// 
+			// itemcopyprops
+			// 
+			this.itemcopyprops.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.CopyProperties;
+			this.itemcopyprops.Name = "itemcopyprops";
+			this.itemcopyprops.Size = new System.Drawing.Size(207, 22);
+			this.itemcopyprops.Tag = "classiccopyproperties";
+			this.itemcopyprops.Text = "Copy Properties";
+			this.itemcopyprops.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// itempasteprops
+			// 
+			this.itempasteprops.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.PasteProperties;
+			this.itempasteprops.Name = "itempasteprops";
+			this.itempasteprops.Size = new System.Drawing.Size(207, 22);
+			this.itempasteprops.Tag = "classicpasteproperties";
+			this.itempasteprops.Text = "Paste Properties";
+			this.itempasteprops.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// itempastepropsoptions
+			// 
+			this.itempastepropsoptions.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.PastePropertiesOptions;
+			this.itempastepropsoptions.Name = "itempastepropsoptions";
+			this.itempastepropsoptions.Size = new System.Drawing.Size(207, 22);
+			this.itempastepropsoptions.Tag = "classicpastepropertieswithoptions";
+			this.itempastepropsoptions.Text = "Paste Properties Special...";
+			this.itempastepropsoptions.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// MenusForm
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.ClientSize = new System.Drawing.Size(794, 100);
+			this.Controls.Add(this.manualstrip);
+			this.Controls.Add(this.globalstrip);
+			this.Controls.Add(this.menustrip);
+			this.Controls.Add(this.fileMenuStrip);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+			this.MainMenuStrip = this.menustrip;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "MenusForm";
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.Text = "MenusForm";
+			this.menustrip.ResumeLayout(false);
+			this.menustrip.PerformLayout();
+			this.manualstrip.ResumeLayout(false);
+			this.manualstrip.PerformLayout();
+			this.fileMenuStrip.ResumeLayout(false);
+			this.fileMenuStrip.PerformLayout();
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.MenuStrip menustrip;
+		private System.Windows.Forms.ToolStripMenuItem linedefsmenu;
+		private System.Windows.Forms.ToolStripMenuItem sectorsmenu;
+		private System.Windows.Forms.ToolStripMenuItem fliplinedefsitem;
+		private System.Windows.Forms.ToolStripMenuItem flipsidedefsitem;
+		private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1;
+		private System.Windows.Forms.ToolStripMenuItem curvelinedefsitem;
+		private System.Windows.Forms.ToolStripMenuItem joinsectorsitem;
+		private System.Windows.Forms.ToolStripMenuItem mergesectorsitem;
+		private System.Windows.Forms.ToolStripSeparator toolStripMenuItem2;
+		private System.Windows.Forms.ToolStripSeparator toolStripMenuItem3;
+		private System.Windows.Forms.ToolStripMenuItem splitlinedefsitem;
+		private System.Windows.Forms.ToolStrip globalstrip;
+		private System.Windows.Forms.ToolStrip manualstrip;
+		private System.Windows.Forms.ToolStripButton buttonbrightnessgradient;
+		private System.Windows.Forms.ToolStripMenuItem selectsinglesideditem;
+		private System.Windows.Forms.ToolStripMenuItem selectdoublesideditem;
+		private System.Windows.Forms.ToolStripSeparator toolStripMenuItem4;
+		private System.Windows.Forms.ToolStripButton buttonflipselectionh;
+		private System.Windows.Forms.ToolStripButton buttonflipselectionv;
+		private System.Windows.Forms.ToolStripButton buttonselectionnumbers;
+		private System.Windows.Forms.ToolStripSeparator separatorsectors1;
+		private System.Windows.Forms.ToolStripButton buttonfloorgradient;
+		private System.Windows.Forms.ToolStripButton buttonceilinggradient;
+		private System.Windows.Forms.ToolStripButton buttoncurvelinedefs;
+		private System.Windows.Forms.ToolStripButton buttoncopyproperties;
+		private System.Windows.Forms.ToolStripButton buttonpasteproperties;
+		private System.Windows.Forms.ToolStripSeparator seperatorcopypaste;
+		private System.Windows.Forms.ToolStripComboBox gradientModeMenu;
+		private System.Windows.Forms.ToolStripButton buttonMarqueSelectTouching;
+		private System.Windows.Forms.ToolStripMenuItem thingsmenu;
+		private System.Windows.Forms.ToolStripMenuItem alignToWallItem;
+		private System.Windows.Forms.ToolStripButton buttonAlignThingsToWall;
+		private System.Windows.Forms.ToolStripMenuItem pointAtCursorItem;
+		private System.Windows.Forms.ToolStripButton buttonTextureOffsetLock;
+		private System.Windows.Forms.ToolStripMenuItem selectInSectorsItem;
+		private System.Windows.Forms.ToolStripMenuItem aligntexturesitem;
+		private System.Windows.Forms.ToolStripMenuItem alignFloorToFrontItem;
+		private System.Windows.Forms.ToolStripMenuItem alignFloorToBackItem;
+		private System.Windows.Forms.ToolStripMenuItem alignCeilingToFrontItem;
+		private System.Windows.Forms.ToolStripMenuItem alignCeilingToBackItem;
+		private System.Windows.Forms.ToolStripMenuItem vertsmenu;
+		private System.Windows.Forms.ToolStripMenuItem placethingsv;
+		private System.Windows.Forms.ToolStripMenuItem placethingsl;
+		private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
+		private System.Windows.Forms.ToolStripMenuItem placethingss;
+		private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
+		private System.Windows.Forms.ToolStripButton buttonselectioneffects;
+		private System.Windows.Forms.ToolStripMenuItem syncthingeditlinedefsitem;
+		private System.Windows.Forms.ToolStripMenuItem syncthingeditsectorsitem;
+		private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
+		private System.Windows.Forms.ToolStripButton buttonMakeDoor;
+		private System.Windows.Forms.ToolStripMenuItem makedooritem;
+		private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
+		private System.Windows.Forms.MenuStrip fileMenuStrip;
+		private System.Windows.Forms.ToolStripMenuItem exportStripMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem5;
+		private System.Windows.Forms.ToolStripButton buttonpastepropertiesoptions;
+		private System.Windows.Forms.ToolStripMenuItem filterSelectionItem;
+		private System.Windows.Forms.ToolStripSeparator toolStripSeparator5;
+		private System.Windows.Forms.ToolStripMenuItem selectSimilarLinesItem;
+		private System.Windows.Forms.ToolStripMenuItem selectSimilarSectors;
+		private System.Windows.Forms.ToolStripSeparator toolStripSeparator6;
+		private System.Windows.Forms.ToolStripMenuItem selectSimilarThingsItem;
+		private System.Windows.Forms.ToolStripSeparator toolStripSeparator7;
+		private System.Windows.Forms.ToolStripMenuItem selectSimilarVertsItem;
+		private System.Windows.Forms.ToolStripMenuItem flipsectorlinedefsitem;
+		private System.Windows.Forms.ToolStripSeparator toolStripSeparator8;
+		private System.Windows.Forms.ToolStripButton syncthingteditbutton;
+		private System.Windows.Forms.ToolStripComboBox gradientInterpolationMenu;
+		private System.Windows.Forms.ToolStripSeparator separatorsectors2;
+		private System.Windows.Forms.ToolStripSeparator separatorsectors3;
+		private System.Windows.Forms.ToolStripMenuItem updatelightfogitem;
+		private System.Windows.Forms.ToolStripMenuItem editmenuitem;
+		private System.Windows.Forms.ToolStripMenuItem itemcopyprops;
+		private System.Windows.Forms.ToolStripMenuItem itempasteprops;
+		private System.Windows.Forms.ToolStripMenuItem itempastepropsoptions;
+		private System.Windows.Forms.ToolStripSeparator separatorcopyprops;
+	}
+}
\ No newline at end of file
diff --git a/Source/Plugins/BuilderModes/Interface/MenusForm.cs b/Source/Plugins/BuilderModes/Interface/MenusForm.cs
new file mode 100644
index 0000000..e90fa2d
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/MenusForm.cs
@@ -0,0 +1,275 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Editing;
+using CodeImp.DoomBuilder.Windows;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	public partial class MenusForm : Form
+	{
+		#region ================== Variables
+
+		// Menus list
+		private readonly ToolStripItem[] menus;
+
+		// mxd. More menus
+		private readonly ToolStripItem[] exportmenuitems;
+
+		// mxd. Even more menus!
+		private readonly ToolStripItem[] propsmenuitems;
+
+		// Buttons list
+		private readonly ToolStripItem[] buttons;
+
+		//mxd
+		public struct BrightnessGradientModes
+		{
+			public const string Sectors = "Sector Brightness";
+			public const string Light = "Light Color";
+			public const string Fade = "Fade Color";
+			public const string LightAndFade = "Light and Fade Colors";
+			public const string Floors = "Floor Brightness";
+			public const string Ceilings = "Ceiling Brightness";
+		}
+
+		//mxd
+		internal struct GradientInterpolationModes
+		{
+			public const string Linear = "Linear";
+			public const string EaseInOutSine = "EaseInOutSine";
+			public const string EaseInSine = "EaseInSine";
+			public const string EaseOutSine = "EaseOutSine";
+		}
+
+		#endregion
+
+		#region ================== Properties
+
+		public ToolStripButton ViewSelectionNumbers { get { return buttonselectionnumbers; } }
+		public ToolStripButton ViewSelectionEffects { get { return buttonselectioneffects; } }
+		public ToolStripSeparator SeparatorSectors1 { get { return separatorsectors1; } }
+		public ToolStripSeparator SeparatorSectors2 { get { return separatorsectors2; } } //mxd
+		public ToolStripSeparator SeparatorSectors3 { get { return separatorsectors3; } } //mxd
+		public ToolStripButton MakeGradientBrightness { get { return buttonbrightnessgradient; } }
+		public ToolStripButton MakeGradientFloors { get { return buttonfloorgradient; } }
+		public ToolStripButton MakeGradientCeilings { get { return buttonceilinggradient; } }
+		public ToolStripButton FlipSelectionV { get { return buttonflipselectionv; } }
+		public ToolStripButton FlipSelectionH { get { return buttonflipselectionh; } }
+		public ToolStripButton CurveLinedefs { get { return buttoncurvelinedefs; } }
+		public ToolStripButton CopyProperties { get { return buttoncopyproperties; } }
+		public ToolStripButton PasteProperties { get { return buttonpasteproperties; } }
+		public ToolStripButton PastePropertiesOptions { get { return buttonpastepropertiesoptions; } } //mxd
+		public ToolStripSeparator SeparatorCopyPaste { get { return seperatorcopypaste; } }
+		public ToolStripComboBox GradientModeMenu { get { return gradientModeMenu; } } //mxd
+		public ToolStripComboBox GradientInterpolationMenu { get { return gradientInterpolationMenu; } } //mxd
+		public ToolStripButton MarqueSelectTouching { get { return buttonMarqueSelectTouching; } } //mxd
+		public ToolStripButton AlignThingsToWall { get { return buttonAlignThingsToWall; } } //mxd
+		public ToolStripButton TextureOffsetLock { get { return buttonTextureOffsetLock; } } //mxd
+		public ToolStripButton SyncronizeThingEditButton { get { return syncthingteditbutton; } } //mxd
+		public ToolStripMenuItem SyncronizeThingEditSectorsItem { get { return syncthingeditsectorsitem; } } //mxd
+		public ToolStripMenuItem SyncronizeThingEditLinedefsItem { get { return syncthingeditlinedefsitem; } } //mxd
+		public ToolStripButton MakeDoor { get { return buttonMakeDoor; } } //mxd
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public MenusForm()
+		{
+			// Initialize
+			InitializeComponent();
+
+			// Apply settings
+			buttonselectionnumbers.Checked = BuilderPlug.Me.ViewSelectionNumbers;
+			buttonselectioneffects.Checked = BuilderPlug.Me.ViewSelectionEffects; //mxd
+
+			//mxd
+			gradientModeMenu.Items.AddRange(new[] { BrightnessGradientModes.Sectors, BrightnessGradientModes.Light, BrightnessGradientModes.Fade, BrightnessGradientModes.LightAndFade, BrightnessGradientModes.Ceilings, BrightnessGradientModes.Floors });
+			gradientModeMenu.SelectedIndex = 0;
+			gradientInterpolationMenu.Items.AddRange(new[] { GradientInterpolationModes.Linear, GradientInterpolationModes.EaseInOutSine, GradientInterpolationModes.EaseInSine, GradientInterpolationModes.EaseOutSine });
+			gradientInterpolationMenu.SelectedIndex = 0;
+			
+			// List all menus
+			menus = new ToolStripItem[menustrip.Items.Count];
+			for(int i = 0; i < menustrip.Items.Count; i++) menus[i] = menustrip.Items[i];
+
+			//mxd. Export menu
+			exportmenuitems = new ToolStripItem[exportStripMenuItem.DropDownItems.Count];
+			for(int i = 0; i < exportStripMenuItem.DropDownItems.Count; i++)
+				exportmenuitems[i] = exportStripMenuItem.DropDownItems[i];
+
+			//mxd. Copy-paste propserties items
+			propsmenuitems = new ToolStripItem[] { separatorcopyprops, itemcopyprops, itempasteprops, itempastepropsoptions };
+
+			// List all buttons
+			buttons = new ToolStripItem[globalstrip.Items.Count];
+			for(int i = 0; i < globalstrip.Items.Count; i++) buttons[i] = globalstrip.Items[i];
+		}
+		
+		#endregion
+
+		#region ================== Methods
+
+		// This registers with the core
+		public void Register()
+		{
+			// Add the menus to the core
+			foreach(ToolStripMenuItem i in menus)
+				General.Interface.AddMenu(i);
+			
+			// Add the buttons to the core
+			foreach(ToolStripItem b in buttons)
+				General.Interface.AddButton(b);
+
+			//mxd. Export menu
+			foreach(ToolStripMenuItem i in exportmenuitems)
+				General.Interface.AddMenu(i, MenuSection.FileExport);
+
+			//mxd. Copy-paste propserties items
+			foreach(ToolStripItem i in propsmenuitems)
+				General.Interface.AddMenu(i, MenuSection.EditCopyPaste);
+		}
+
+		// This unregisters from the core
+		public void Unregister()
+		{
+			// Remove the menus from the core
+			foreach(ToolStripMenuItem i in menus)
+				General.Interface.RemoveMenu(i);
+
+			// Remove the buttons from the core
+			foreach(ToolStripItem b in buttons)
+				General.Interface.RemoveButton(b);
+
+			//mxd. Export menu
+			foreach(ToolStripMenuItem i in exportmenuitems)
+				General.Interface.RemoveMenu(i);
+
+			//mxd. Copy-paste propserties items
+			foreach(ToolStripItem i in propsmenuitems)
+				General.Interface.RemoveMenu(i);
+		}
+
+		// This hides all menus
+		public void HideAllMenus()
+		{
+			foreach(ToolStripMenuItem m in menus) m.Visible = false;
+		}
+		
+		// This hides all except one menu
+		public void HideAllMenusExcept(ToolStripMenuItem showthis)
+		{
+			HideAllMenus();
+			showthis.Visible = true;
+		}
+		
+		// This shows the menu for the current editing mode
+		public void ShowEditingModeMenu(EditMode mode)
+		{
+			Type sourcemode = typeof(object);
+			if(mode != null)
+			{
+				sourcemode = mode.GetType();
+
+				// When in a volatile mode, check against the last stable mode
+				if(mode.Attributes.Volatile) sourcemode = General.Editing.PreviousStableMode;
+			}
+			
+			// Final decision
+			bool showcopyprops = true; //mxd
+			if(sourcemode == typeof(LinedefsMode)) HideAllMenusExcept(linedefsmenu);
+			else if(sourcemode == typeof(SectorsMode)) HideAllMenusExcept(sectorsmenu);
+			else if(sourcemode == typeof(ThingsMode)) HideAllMenusExcept(thingsmenu); //mxd
+			else if(sourcemode == typeof(VerticesMode)) HideAllMenusExcept(vertsmenu); //mxd
+			else
+			{
+				HideAllMenus();
+				showcopyprops = false; //mxd
+			}
+
+			//mxd. Copy-paste properties items
+			foreach(ToolStripItem i in propsmenuitems)
+				i.Visible = showcopyprops;
+		}
+
+		// This invokes an action from control event
+		private void InvokeTaggedAction(object sender, EventArgs e)
+		{
+			General.Interface.InvokeTaggedAction(sender, e);
+		}
+
+		// View selection numbers clicked
+		private void buttonselectionnumbers_Click(object sender, EventArgs e)
+		{
+			BuilderPlug.Me.ViewSelectionNumbers = buttonselectionnumbers.Checked;
+			General.Interface.RedrawDisplay();
+			General.Interface.DisplayStatus(StatusType.Info, (buttonselectionnumbers.Checked ?
+				"Show selection numbers" :
+				"Don't show selection numbers"));
+		}
+
+		//mxd
+		private void buttonselectioneffects_Click(object sender, EventArgs e) 
+		{
+			BuilderPlug.Me.ViewSelectionEffects = buttonselectioneffects.Checked;
+			General.Interface.RedrawDisplay();
+			General.Interface.DisplayStatus(StatusType.Info, (buttonselectioneffects.Checked ?
+				"Show sector tags and effects" :
+				"Don't show sector tags and effects"));
+		}
+
+		//mxd
+		private void buttonMarqueSelectTouching_Click(object sender, EventArgs e) 
+		{
+			BuilderPlug.Me.MarqueSelectTouching = buttonMarqueSelectTouching.Checked;
+			General.Interface.DisplayStatus(StatusType.Info, (buttonMarqueSelectTouching.Checked ? 
+				"Select map elements touching selection rectangle" :
+				"Select map elements inside of selection rectangle"));
+		}
+
+		//mxd
+		private void buttonTextureOffsetLock_Click(object sender, EventArgs e) 
+		{
+			BuilderPlug.Me.LockSectorTextureOffsetsWhileDragging = buttonTextureOffsetLock.Checked;
+			General.Interface.DisplayStatus(StatusType.Info, (buttonTextureOffsetLock.Checked ? 
+				"Lock texture offsets when dragging sectors" : 
+				"Don't lock texture offsets when dragging sectors"));
+		}
+
+		//mxd
+		private void linedefsmenu_DropDownOpening(object sender, EventArgs e) 
+		{
+			aligntexturesitem.Enabled = General.Map.UDMF;
+			updatelightfogitem.Enabled = General.Map.UDMF;
+		}
+
+		//mxd
+		private void gradientMode_DropDownClosed(object sender, EventArgs e) 
+		{
+			General.Interface.FocusDisplay();
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/Source/Plugins/BuilderModes/Interface/MenusForm.resx b/Source/Plugins/BuilderModes/Interface/MenusForm.resx
new file mode 100644
index 0000000..74249a4
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/MenusForm.resx
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="menustrip.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="menustrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <data name="syncthingeditsectorsitem.ToolTipText" xml:space="preserve">
+    <value>When enabled, things dragging will be synchronized to sector dragging.
+Regular, Paint and Rectangular selection will also select things 
+(holding Alt while selecting inverts this behaviour).
+Deleting sectors will also delete selected things.</value>
+  </data>
+  <metadata name="globalstrip.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="globalstrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>118, 17</value>
+  </metadata>
+  <metadata name="manualstrip.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="manualstrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>210, 17</value>
+  </metadata>
+  <metadata name="fileMenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>326, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/BuilderModes/Interface/ObjExporterSettingsForm.Designer.cs b/Source/Plugins/BuilderModes/Interface/ObjExporterSettingsForm.Designer.cs
new file mode 100644
index 0000000..95a0a3c
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/ObjExporterSettingsForm.Designer.cs
@@ -0,0 +1,145 @@
+namespace CodeImp.DoomBuilder.BuilderModes.Interface
+{
+	partial class ObjExporterSettingsForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing) {
+			if(disposing && (components != null)) {
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent() {
+			this.tbExportPath = new System.Windows.Forms.TextBox();
+			this.browse = new System.Windows.Forms.Button();
+			this.label1 = new System.Windows.Forms.Label();
+			this.cbFixScale = new System.Windows.Forms.CheckBox();
+			this.export = new System.Windows.Forms.Button();
+			this.cancel = new System.Windows.Forms.Button();
+			this.saveFileDialog = new System.Windows.Forms.SaveFileDialog();
+			this.cbExportTextures = new System.Windows.Forms.CheckBox();
+			this.SuspendLayout();
+			// 
+			// tbExportPath
+			// 
+			this.tbExportPath.Location = new System.Drawing.Point(82, 12);
+			this.tbExportPath.Name = "tbExportPath";
+			this.tbExportPath.Size = new System.Drawing.Size(272, 20);
+			this.tbExportPath.TabIndex = 0;
+			// 
+			// browse
+			// 
+			this.browse.Location = new System.Drawing.Point(360, 10);
+			this.browse.Name = "browse";
+			this.browse.Size = new System.Drawing.Size(75, 23);
+			this.browse.TabIndex = 1;
+			this.browse.Text = "Browse...";
+			this.browse.UseVisualStyleBackColor = true;
+			this.browse.Click += new System.EventHandler(this.browse_Click);
+			// 
+			// label1
+			// 
+			this.label1.AutoSize = true;
+			this.label1.Location = new System.Drawing.Point(12, 15);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(64, 13);
+			this.label1.TabIndex = 2;
+			this.label1.Text = "Export path:";
+			// 
+			// cbFixScale
+			// 
+			this.cbFixScale.AutoSize = true;
+			this.cbFixScale.Location = new System.Drawing.Point(12, 42);
+			this.cbFixScale.Name = "cbFixScale";
+			this.cbFixScale.Size = new System.Drawing.Size(207, 17);
+			this.cbFixScale.TabIndex = 3;
+			this.cbFixScale.Text = "Export for GZDoom (Fix Vertical Scale)";
+			this.cbFixScale.UseVisualStyleBackColor = true;
+			// 
+			// export
+			// 
+			this.export.Location = new System.Drawing.Point(360, 73);
+			this.export.Name = "export";
+			this.export.Size = new System.Drawing.Size(75, 23);
+			this.export.TabIndex = 4;
+			this.export.Text = "Export";
+			this.export.UseVisualStyleBackColor = true;
+			this.export.Click += new System.EventHandler(this.export_Click);
+			// 
+			// cancel
+			// 
+			this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.cancel.Location = new System.Drawing.Point(279, 73);
+			this.cancel.Name = "cancel";
+			this.cancel.Size = new System.Drawing.Size(75, 23);
+			this.cancel.TabIndex = 5;
+			this.cancel.Text = "Cancel";
+			this.cancel.UseVisualStyleBackColor = true;
+			this.cancel.Click += new System.EventHandler(this.cancel_Click);
+			// 
+			// saveFileDialog
+			// 
+			this.saveFileDialog.DefaultExt = "obj";
+			this.saveFileDialog.Filter = "Wavefront obj files|*.obj";
+			this.saveFileDialog.Title = "Select save location:";
+			// 
+			// cbExportTextures
+			// 
+			this.cbExportTextures.AutoSize = true;
+			this.cbExportTextures.Location = new System.Drawing.Point(12, 65);
+			this.cbExportTextures.Name = "cbExportTextures";
+			this.cbExportTextures.Size = new System.Drawing.Size(96, 17);
+			this.cbExportTextures.TabIndex = 6;
+			this.cbExportTextures.Text = "Export textures";
+			this.cbExportTextures.UseVisualStyleBackColor = true;
+			// 
+			// ObjExporterSettingsForm
+			// 
+			this.AcceptButton = this.export;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.CancelButton = this.cancel;
+			this.ClientSize = new System.Drawing.Size(447, 100);
+			this.Controls.Add(this.cbExportTextures);
+			this.Controls.Add(this.cancel);
+			this.Controls.Add(this.export);
+			this.Controls.Add(this.cbFixScale);
+			this.Controls.Add(this.label1);
+			this.Controls.Add(this.browse);
+			this.Controls.Add(this.tbExportPath);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
+			this.Name = "ObjExporterSettingsForm";
+			this.ShowInTaskbar = false;
+			this.Text = "Export to Wavefront .obj";
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.TextBox tbExportPath;
+		private System.Windows.Forms.Button browse;
+		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.CheckBox cbFixScale;
+		private System.Windows.Forms.Button export;
+		private System.Windows.Forms.Button cancel;
+		private System.Windows.Forms.SaveFileDialog saveFileDialog;
+		private System.Windows.Forms.CheckBox cbExportTextures;
+	}
+}
\ No newline at end of file
diff --git a/Source/Plugins/BuilderModes/Interface/ObjExporterSettingsForm.cs b/Source/Plugins/BuilderModes/Interface/ObjExporterSettingsForm.cs
new file mode 100644
index 0000000..009c777
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/ObjExporterSettingsForm.cs
@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using System.IO;
+
+namespace CodeImp.DoomBuilder.BuilderModes.Interface
+{
+	public partial class ObjExporterSettingsForm : Form
+	{
+		public bool ExportTextures { get { return exportTextures; } }
+		private bool exportTextures;
+
+		public bool FixScale { get { return fixScale; } }
+		private bool fixScale;
+
+		public string FilePath { get { return filePath; } }
+		private string filePath;
+		
+		public ObjExporterSettingsForm() {
+			InitializeComponent();
+			saveFileDialog.InitialDirectory = General.Map.FilePathName;
+			saveFileDialog.FileName = General.Map.FileTitle + "_" + General.Map.Options.LevelName;
+		}
+
+		private void browse_Click(object sender, EventArgs e) {
+			if(saveFileDialog.ShowDialog() == DialogResult.OK) {
+				tbExportPath.Text = saveFileDialog.FileName;
+			}
+		}
+
+		private void export_Click(object sender, EventArgs e) {
+			//verify path
+			filePath = tbExportPath.Text.Trim();
+
+			if(Directory.Exists(Path.GetDirectoryName(filePath))) {
+				exportTextures = cbExportTextures.Checked;
+				fixScale = cbFixScale.Checked;
+				filePath = tbExportPath.Text;
+
+				this.DialogResult = DialogResult.OK;
+				this.Close();
+			} else {
+				MessageBox.Show("Selected path does not exist!");
+			}
+		}
+
+		private void cancel_Click(object sender, EventArgs e) {
+			this.Close();
+		}
+	}
+}
diff --git a/Source/Plugins/BuilderModes/Interface/ObjExporterSettingsForm.resx b/Source/Plugins/BuilderModes/Interface/ObjExporterSettingsForm.resx
new file mode 100644
index 0000000..d957dca
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/ObjExporterSettingsForm.resx
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/BuilderModes/Interface/PastePropertiesOptionsForm.Designer.cs b/Source/Plugins/BuilderModes/Interface/PastePropertiesOptionsForm.Designer.cs
new file mode 100644
index 0000000..85e509f
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/PastePropertiesOptionsForm.Designer.cs
@@ -0,0 +1,268 @@
+namespace CodeImp.DoomBuilder.BuilderModes.Interface
+{
+	partial class PastePropertiesOptionsForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing) 
+		{
+			if(disposing && (components != null)) 
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent() 
+		{
+			this.tabcontrol = new System.Windows.Forms.TabControl();
+			this.sectors = new System.Windows.Forms.TabPage();
+			this.sectorflags = new CodeImp.DoomBuilder.Controls.CheckboxArrayControl();
+			this.linedefs = new System.Windows.Forms.TabPage();
+			this.lineflags = new CodeImp.DoomBuilder.Controls.CheckboxArrayControl();
+			this.sidedefs = new System.Windows.Forms.TabPage();
+			this.sideflags = new CodeImp.DoomBuilder.Controls.CheckboxArrayControl();
+			this.things = new System.Windows.Forms.TabPage();
+			this.thingflags = new CodeImp.DoomBuilder.Controls.CheckboxArrayControl();
+			this.vertices = new System.Windows.Forms.TabPage();
+			this.vertexflags = new CodeImp.DoomBuilder.Controls.CheckboxArrayControl();
+			this.cancel = new System.Windows.Forms.Button();
+			this.apply = new System.Windows.Forms.Button();
+			this.enableall = new System.Windows.Forms.Button();
+			this.tabcontrol.SuspendLayout();
+			this.sectors.SuspendLayout();
+			this.linedefs.SuspendLayout();
+			this.sidedefs.SuspendLayout();
+			this.things.SuspendLayout();
+			this.vertices.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// tabcontrol
+			// 
+			this.tabcontrol.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.tabcontrol.Controls.Add(this.sectors);
+			this.tabcontrol.Controls.Add(this.linedefs);
+			this.tabcontrol.Controls.Add(this.sidedefs);
+			this.tabcontrol.Controls.Add(this.things);
+			this.tabcontrol.Controls.Add(this.vertices);
+			this.tabcontrol.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.tabcontrol.Location = new System.Drawing.Point(12, 12);
+			this.tabcontrol.Name = "tabcontrol";
+			this.tabcontrol.Padding = new System.Drawing.Point(20, 3);
+			this.tabcontrol.SelectedIndex = 0;
+			this.tabcontrol.Size = new System.Drawing.Size(430, 178);
+			this.tabcontrol.TabIndex = 0;
+			// 
+			// sectors
+			// 
+			this.sectors.Controls.Add(this.sectorflags);
+			this.sectors.Location = new System.Drawing.Point(4, 22);
+			this.sectors.Name = "sectors";
+			this.sectors.Padding = new System.Windows.Forms.Padding(3);
+			this.sectors.Size = new System.Drawing.Size(422, 152);
+			this.sectors.TabIndex = 0;
+			this.sectors.Text = "Sectors";
+			this.sectors.UseVisualStyleBackColor = true;
+			// 
+			// sectorflags
+			// 
+			this.sectorflags.AutoScroll = true;
+			this.sectorflags.Columns = 2;
+			this.sectorflags.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.sectorflags.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.sectorflags.Location = new System.Drawing.Point(3, 3);
+			this.sectorflags.Name = "sectorflags";
+			this.sectorflags.Size = new System.Drawing.Size(416, 146);
+			this.sectorflags.TabIndex = 3;
+			this.sectorflags.VerticalSpacing = 1;
+			// 
+			// linedefs
+			// 
+			this.linedefs.Controls.Add(this.lineflags);
+			this.linedefs.Location = new System.Drawing.Point(4, 22);
+			this.linedefs.Name = "linedefs";
+			this.linedefs.Padding = new System.Windows.Forms.Padding(3);
+			this.linedefs.Size = new System.Drawing.Size(422, 152);
+			this.linedefs.TabIndex = 1;
+			this.linedefs.Text = "Linedefs";
+			this.linedefs.UseVisualStyleBackColor = true;
+			// 
+			// lineflags
+			// 
+			this.lineflags.AutoScroll = true;
+			this.lineflags.Columns = 2;
+			this.lineflags.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.lineflags.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.lineflags.Location = new System.Drawing.Point(3, 3);
+			this.lineflags.Name = "lineflags";
+			this.lineflags.Size = new System.Drawing.Size(416, 146);
+			this.lineflags.TabIndex = 3;
+			this.lineflags.VerticalSpacing = 1;
+			// 
+			// sidedefs
+			// 
+			this.sidedefs.Controls.Add(this.sideflags);
+			this.sidedefs.Location = new System.Drawing.Point(4, 22);
+			this.sidedefs.Name = "sidedefs";
+			this.sidedefs.Padding = new System.Windows.Forms.Padding(3);
+			this.sidedefs.Size = new System.Drawing.Size(422, 152);
+			this.sidedefs.TabIndex = 2;
+			this.sidedefs.Text = "Sidedefs";
+			this.sidedefs.UseVisualStyleBackColor = true;
+			// 
+			// sideflags
+			// 
+			this.sideflags.AutoScroll = true;
+			this.sideflags.Columns = 2;
+			this.sideflags.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.sideflags.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.sideflags.Location = new System.Drawing.Point(3, 3);
+			this.sideflags.Name = "sideflags";
+			this.sideflags.Size = new System.Drawing.Size(416, 146);
+			this.sideflags.TabIndex = 2;
+			this.sideflags.VerticalSpacing = 1;
+			// 
+			// things
+			// 
+			this.things.Controls.Add(this.thingflags);
+			this.things.Location = new System.Drawing.Point(4, 22);
+			this.things.Name = "things";
+			this.things.Padding = new System.Windows.Forms.Padding(3);
+			this.things.Size = new System.Drawing.Size(422, 152);
+			this.things.TabIndex = 3;
+			this.things.Text = "Things";
+			this.things.UseVisualStyleBackColor = true;
+			// 
+			// thingflags
+			// 
+			this.thingflags.AutoScroll = true;
+			this.thingflags.Columns = 2;
+			this.thingflags.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.thingflags.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.thingflags.Location = new System.Drawing.Point(3, 3);
+			this.thingflags.Name = "thingflags";
+			this.thingflags.Size = new System.Drawing.Size(416, 146);
+			this.thingflags.TabIndex = 2;
+			this.thingflags.VerticalSpacing = 1;
+			// 
+			// vertices
+			// 
+			this.vertices.Controls.Add(this.vertexflags);
+			this.vertices.Location = new System.Drawing.Point(4, 22);
+			this.vertices.Name = "vertices";
+			this.vertices.Padding = new System.Windows.Forms.Padding(3);
+			this.vertices.Size = new System.Drawing.Size(422, 152);
+			this.vertices.TabIndex = 4;
+			this.vertices.Text = "Vertices";
+			this.vertices.UseVisualStyleBackColor = true;
+			// 
+			// vertexflags
+			// 
+			this.vertexflags.AutoScroll = true;
+			this.vertexflags.Columns = 2;
+			this.vertexflags.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.vertexflags.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.vertexflags.Location = new System.Drawing.Point(3, 3);
+			this.vertexflags.Name = "vertexflags";
+			this.vertexflags.Size = new System.Drawing.Size(416, 146);
+			this.vertexflags.TabIndex = 1;
+			this.vertexflags.VerticalSpacing = 1;
+			// 
+			// cancel
+			// 
+			this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.cancel.Location = new System.Drawing.Point(330, 194);
+			this.cancel.Name = "cancel";
+			this.cancel.Size = new System.Drawing.Size(112, 25);
+			this.cancel.TabIndex = 0;
+			this.cancel.Text = "Cancel";
+			this.cancel.UseVisualStyleBackColor = true;
+			this.cancel.Click += new System.EventHandler(this.cancel_Click);
+			// 
+			// apply
+			// 
+			this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.apply.Location = new System.Drawing.Point(212, 194);
+			this.apply.Name = "apply";
+			this.apply.Size = new System.Drawing.Size(112, 25);
+			this.apply.TabIndex = 1;
+			this.apply.Text = "OK";
+			this.apply.UseVisualStyleBackColor = true;
+			this.apply.Click += new System.EventHandler(this.apply_Click);
+			// 
+			// enableall
+			// 
+			this.enableall.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.enableall.Location = new System.Drawing.Point(12, 194);
+			this.enableall.Name = "enableall";
+			this.enableall.Size = new System.Drawing.Size(120, 25);
+			this.enableall.TabIndex = 2;
+			this.enableall.Text = "Toggle All";
+			this.enableall.UseVisualStyleBackColor = true;
+			this.enableall.Click += new System.EventHandler(this.enableall_Click);
+			// 
+			// PastePropertiesOptionsForm
+			// 
+			this.AcceptButton = this.apply;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.CancelButton = this.cancel;
+			this.ClientSize = new System.Drawing.Size(454, 222);
+			this.Controls.Add(this.enableall);
+			this.Controls.Add(this.apply);
+			this.Controls.Add(this.cancel);
+			this.Controls.Add(this.tabcontrol);
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.MinimumSize = new System.Drawing.Size(300, 200);
+			this.Name = "PastePropertiesOptionsForm";
+			this.Opacity = 1;
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Paste Properties Special";
+			this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.PastePropertiesOptionsForm_FormClosing);
+			this.tabcontrol.ResumeLayout(false);
+			this.sectors.ResumeLayout(false);
+			this.linedefs.ResumeLayout(false);
+			this.sidedefs.ResumeLayout(false);
+			this.things.ResumeLayout(false);
+			this.vertices.ResumeLayout(false);
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.TabControl tabcontrol;
+		private System.Windows.Forms.TabPage sectors;
+		private System.Windows.Forms.TabPage linedefs;
+		private System.Windows.Forms.Button cancel;
+		private System.Windows.Forms.Button apply;
+		private System.Windows.Forms.TabPage sidedefs;
+		private System.Windows.Forms.TabPage things;
+		private System.Windows.Forms.TabPage vertices;
+		private CodeImp.DoomBuilder.Controls.CheckboxArrayControl vertexflags;
+		private CodeImp.DoomBuilder.Controls.CheckboxArrayControl sectorflags;
+		private CodeImp.DoomBuilder.Controls.CheckboxArrayControl lineflags;
+		private CodeImp.DoomBuilder.Controls.CheckboxArrayControl sideflags;
+		private CodeImp.DoomBuilder.Controls.CheckboxArrayControl thingflags;
+		private System.Windows.Forms.Button enableall;
+	}
+}
\ No newline at end of file
diff --git a/Source/Plugins/BuilderModes/Interface/PastePropertiesOptionsForm.cs b/Source/Plugins/BuilderModes/Interface/PastePropertiesOptionsForm.cs
new file mode 100644
index 0000000..0ecfb6f
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/PastePropertiesOptionsForm.cs
@@ -0,0 +1,200 @@
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Reflection;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Controls;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Windows;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes.Interface
+{
+	public partial class PastePropertiesOptionsForm : DelayedForm
+	{
+		#region ================== Variables
+
+		private static Size size = Size.Empty;
+		private static Point location = Point.Empty;
+		private Dictionary<object, CheckboxArrayControl> typecontrols;
+
+		#endregion
+
+		#region ================== Constructor / Setup
+
+		public PastePropertiesOptionsForm() 
+		{
+			InitializeComponent();
+
+			// Apply window size and location
+			if(!size.IsEmpty && !location.IsEmpty)
+			{
+				this.StartPosition = FormStartPosition.Manual;
+				this.Size = size;
+				this.Location = location;
+			}
+		}
+
+		public bool Setup(MapElementType targetmapelementtype) { return Setup(new List<MapElementType> { targetmapelementtype }); }
+		public bool Setup(IEnumerable<MapElementType> targetmapelementtypes)
+		{
+			// Create collections
+			typecontrols = new Dictionary<object, CheckboxArrayControl>();
+			var tabcontrols = new Dictionary<TabPage, CheckboxArrayControl>();
+			
+			// Add appropriate controls
+			foreach(MapElementType t in targetmapelementtypes)
+			{
+				switch(t)
+				{
+					case MapElementType.THING:
+						if(BuilderPlug.Me.CopiedThingProps != null)
+						{
+							typecontrols.Add(ThingProperties.CopySettings, thingflags);
+							tabcontrols.Add(things, thingflags);
+						}
+						break;
+
+					case MapElementType.SECTOR:
+						if(BuilderPlug.Me.CopiedSectorProps != null)
+						{
+							typecontrols.Add(SectorProperties.CopySettings, sectorflags);
+							tabcontrols.Add(sectors, sectorflags);
+						}
+						break;
+
+					case MapElementType.LINEDEF:
+					case MapElementType.SIDEDEF:
+						if(BuilderPlug.Me.CopiedSidedefProps != null || BuilderPlug.Me.CopiedLinedefProps != null)
+						{
+							typecontrols.Add(LinedefProperties.CopySettings, lineflags);
+							typecontrols.Add(SidedefProperties.CopySettings, sideflags);
+							tabcontrols.Add(linedefs, lineflags);
+							tabcontrols.Add(sidedefs, sideflags);
+						}
+						break;
+
+					case MapElementType.VERTEX:
+						if(BuilderPlug.Me.CopiedVertexProps != null)
+						{
+							typecontrols.Add(VertexProperties.CopySettings, vertexflags);
+							tabcontrols.Add(vertices, vertexflags);
+						}
+						break;
+
+					default:
+						throw new NotImplementedException("Unknown map element type: " + t);
+				}
+			}
+
+			// Got anything to show?
+			if(typecontrols.Count == 0)
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "No copied properties to apply!");
+				return false;
+			}
+
+			// Fill flags
+			FillFlags();
+
+			// Select proper tab
+			if(!ShowTabs(tabcontrols))
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "Current map format doesn't support any properties for selected map elements!");
+				return false;
+			}
+
+			return true;
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		private bool ShowTabs(Dictionary<TabPage, CheckboxArrayControl> pageslist)
+		{
+			List<TabPage> toshow = new List<TabPage>();
+			foreach(TabPage page in tabcontrol.TabPages)
+			{
+				if(pageslist.ContainsKey(page) && pageslist[page].Checkboxes.Count > 0) toshow.Add(page); 
+			}
+
+			if(toshow.Count == 0) return false;
+
+			tabcontrol.TabPages.Clear();
+			tabcontrol.TabPages.AddRange(toshow.ToArray());
+			tabcontrol.SelectTab(toshow[0]);
+
+			return true;
+		}
+
+		private void FillFlags()
+		{
+			// Fill flags
+			foreach(KeyValuePair<object, CheckboxArrayControl> group in typecontrols)
+			{
+				FieldInfo[] props = group.Key.GetType().GetFields(BindingFlags.Public | BindingFlags.Instance);
+				foreach(FieldInfo prop in props)
+				{
+					foreach(Attribute attr in Attribute.GetCustomAttributes(prop))
+					{
+						if(attr.GetType() == typeof(FieldDescription))
+						{
+							FieldDescription fd = (FieldDescription)attr;
+							if(fd.SupportsCurrentMapFormat)
+							{
+								group.Value.Add(fd.Description, prop.Name).Checked = (bool)prop.GetValue(group.Key);
+							}
+							break;
+						}
+					}
+				}
+
+				if(group.Value.Checkboxes.Count > 0) group.Value.PositionCheckboxes();
+			}
+		}
+
+		#endregion
+
+		#region ================== Events
+
+		private void apply_Click(object sender, EventArgs e) 
+		{
+			foreach(KeyValuePair<object, CheckboxArrayControl> group in typecontrols) 
+			{
+				FieldInfo[] props = group.Key.GetType().GetFields(BindingFlags.Public | BindingFlags.Instance);
+				var fields = new Dictionary<string, FieldInfo>(props.Length);
+				for(int i = 0; i < props.Length; i++) fields[props[i].Name] = props[i];
+				foreach(CheckBox cb in group.Value.Checkboxes) fields[cb.Tag.ToString()].SetValue(group.Key, cb.Checked);
+			}
+
+			this.DialogResult = DialogResult.OK;
+			this.Close();
+		}
+
+		private void cancel_Click(object sender, EventArgs e) 
+		{
+			this.DialogResult = DialogResult.Cancel;
+			this.Close();
+		}
+
+		private void enableall_Click(object sender, EventArgs e)
+		{
+			var cc = tabcontrol.SelectedTab.Controls[0] as CheckboxArrayControl;
+			if(cc == null) return; //just a piece of boilerplate...
+			bool enable = !cc.Checkboxes[0].Checked;
+			foreach(var cb in cc.Checkboxes) cb.Checked = enable;
+		}
+
+		private void PastePropertiesOptionsForm_FormClosing(object sender, FormClosingEventArgs e)
+		{
+			size = this.Size;
+			location = this.Location;
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/Source/Plugins/BuilderModes/Interface/PastePropertiesOptionsForm.resx b/Source/Plugins/BuilderModes/Interface/PastePropertiesOptionsForm.resx
new file mode 100644
index 0000000..19dc0dd
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/PastePropertiesOptionsForm.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/BuilderModes/Interface/PreferencesForm.Designer.cs b/Source/Plugins/BuilderModes/Interface/PreferencesForm.Designer.cs
new file mode 100644
index 0000000..8438aff
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/PreferencesForm.Designer.cs
@@ -0,0 +1,614 @@
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	partial class PreferencesForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.tabs = new System.Windows.Forms.TabControl();
+			this.taboptions = new System.Windows.Forms.TabPage();
+			this.groupBox4 = new System.Windows.Forms.GroupBox();
+			this.label15 = new System.Windows.Forms.Label();
+			this.label14 = new System.Windows.Forms.Label();
+			this.defaultfloorheight = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.label13 = new System.Windows.Forms.Label();
+			this.defaultceilheight = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.label12 = new System.Windows.Forms.Label();
+			this.defaultbrightness = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.label11 = new System.Windows.Forms.Label();
+			this.groupBox3 = new System.Windows.Forms.GroupBox();
+			this.autodrawonedit = new System.Windows.Forms.CheckBox();
+			this.syncSelection = new System.Windows.Forms.CheckBox();
+			this.dontMoveGeometryOutsideBounds = new System.Windows.Forms.CheckBox();
+			this.autoaligntexturesoncreate = new System.Windows.Forms.CheckBox();
+			this.autodragonpaste = new System.Windows.Forms.CheckBox();
+			this.visualmodeclearselection = new System.Windows.Forms.CheckBox();
+			this.autoclearselection = new System.Windows.Forms.CheckBox();
+			this.editnewthing = new System.Windows.Forms.CheckBox();
+			this.editnewsector = new System.Windows.Forms.CheckBox();
+			this.additiveselect = new System.Windows.Forms.CheckBox();
+			this.groupBox2 = new System.Windows.Forms.GroupBox();
+			this.splitlinedefsrange = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.stitchrange = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.highlightthingsrange = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.highlightrange = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.label8 = new System.Windows.Forms.Label();
+			this.label2 = new System.Windows.Forms.Label();
+			this.label3 = new System.Windows.Forms.Label();
+			this.label9 = new System.Windows.Forms.Label();
+			this.label5 = new System.Windows.Forms.Label();
+			this.label6 = new System.Windows.Forms.Label();
+			this.label4 = new System.Windows.Forms.Label();
+			this.label7 = new System.Windows.Forms.Label();
+			this.groupBox1 = new System.Windows.Forms.GroupBox();
+			this.splitbehavior = new System.Windows.Forms.ComboBox();
+			this.label10 = new System.Windows.Forms.Label();
+			this.label1 = new System.Windows.Forms.Label();
+			this.heightbysidedef = new System.Windows.Forms.ComboBox();
+			this.tabs.SuspendLayout();
+			this.taboptions.SuspendLayout();
+			this.groupBox4.SuspendLayout();
+			this.groupBox3.SuspendLayout();
+			this.groupBox2.SuspendLayout();
+			this.groupBox1.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// tabs
+			// 
+			this.tabs.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.tabs.Controls.Add(this.taboptions);
+			this.tabs.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.tabs.Location = new System.Drawing.Point(12, 12);
+			this.tabs.Name = "tabs";
+			this.tabs.Padding = new System.Drawing.Point(24, 3);
+			this.tabs.SelectedIndex = 0;
+			this.tabs.Size = new System.Drawing.Size(677, 424);
+			this.tabs.TabIndex = 0;
+			// 
+			// taboptions
+			// 
+			this.taboptions.Controls.Add(this.groupBox4);
+			this.taboptions.Controls.Add(this.groupBox3);
+			this.taboptions.Controls.Add(this.groupBox2);
+			this.taboptions.Controls.Add(this.groupBox1);
+			this.taboptions.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.taboptions.Location = new System.Drawing.Point(4, 22);
+			this.taboptions.Name = "taboptions";
+			this.taboptions.Padding = new System.Windows.Forms.Padding(3);
+			this.taboptions.Size = new System.Drawing.Size(669, 398);
+			this.taboptions.TabIndex = 0;
+			this.taboptions.Text = "Editing";
+			this.taboptions.UseVisualStyleBackColor = true;
+			// 
+			// groupBox4
+			// 
+			this.groupBox4.Controls.Add(this.label15);
+			this.groupBox4.Controls.Add(this.label14);
+			this.groupBox4.Controls.Add(this.defaultfloorheight);
+			this.groupBox4.Controls.Add(this.label13);
+			this.groupBox4.Controls.Add(this.defaultceilheight);
+			this.groupBox4.Controls.Add(this.label12);
+			this.groupBox4.Controls.Add(this.defaultbrightness);
+			this.groupBox4.Controls.Add(this.label11);
+			this.groupBox4.Location = new System.Drawing.Point(6, 261);
+			this.groupBox4.Name = "groupBox4";
+			this.groupBox4.Size = new System.Drawing.Size(272, 130);
+			this.groupBox4.TabIndex = 19;
+			this.groupBox4.TabStop = false;
+			this.groupBox4.Text = " Default sector settings";
+			// 
+			// label15
+			// 
+			this.label15.AutoSize = true;
+			this.label15.Location = new System.Drawing.Point(221, 28);
+			this.label15.Name = "label15";
+			this.label15.Size = new System.Drawing.Size(27, 13);
+			this.label15.TabIndex = 26;
+			this.label15.Text = "m.u.";
+			// 
+			// label14
+			// 
+			this.label14.AutoSize = true;
+			this.label14.Location = new System.Drawing.Point(221, 58);
+			this.label14.Name = "label14";
+			this.label14.Size = new System.Drawing.Size(27, 13);
+			this.label14.TabIndex = 20;
+			this.label14.Text = "m.u.";
+			// 
+			// defaultfloorheight
+			// 
+			this.defaultfloorheight.AllowDecimal = false;
+			this.defaultfloorheight.AllowNegative = true;
+			this.defaultfloorheight.AllowRelative = false;
+			this.defaultfloorheight.ButtonStep = 5;
+			this.defaultfloorheight.ButtonStepFloat = 1F;
+			this.defaultfloorheight.ButtonStepsWrapAround = false;
+			this.defaultfloorheight.Location = new System.Drawing.Point(156, 23);
+			this.defaultfloorheight.Name = "defaultfloorheight";
+			this.defaultfloorheight.Size = new System.Drawing.Size(59, 24);
+			this.defaultfloorheight.StepValues = null;
+			this.defaultfloorheight.TabIndex = 25;
+			// 
+			// label13
+			// 
+			this.label13.Location = new System.Drawing.Point(41, 28);
+			this.label13.Name = "label13";
+			this.label13.Size = new System.Drawing.Size(110, 14);
+			this.label13.TabIndex = 24;
+			this.label13.Text = "Default floor height:";
+			this.label13.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// defaultceilheight
+			// 
+			this.defaultceilheight.AllowDecimal = false;
+			this.defaultceilheight.AllowNegative = true;
+			this.defaultceilheight.AllowRelative = false;
+			this.defaultceilheight.ButtonStep = 5;
+			this.defaultceilheight.ButtonStepFloat = 1F;
+			this.defaultceilheight.ButtonStepsWrapAround = false;
+			this.defaultceilheight.Location = new System.Drawing.Point(156, 53);
+			this.defaultceilheight.Name = "defaultceilheight";
+			this.defaultceilheight.Size = new System.Drawing.Size(59, 24);
+			this.defaultceilheight.StepValues = null;
+			this.defaultceilheight.TabIndex = 23;
+			// 
+			// label12
+			// 
+			this.label12.Location = new System.Drawing.Point(41, 58);
+			this.label12.Name = "label12";
+			this.label12.Size = new System.Drawing.Size(110, 14);
+			this.label12.TabIndex = 22;
+			this.label12.Text = "Default ceiling height:";
+			this.label12.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// defaultbrightness
+			// 
+			this.defaultbrightness.AllowDecimal = false;
+			this.defaultbrightness.AllowNegative = false;
+			this.defaultbrightness.AllowRelative = false;
+			this.defaultbrightness.ButtonStep = 5;
+			this.defaultbrightness.ButtonStepFloat = 1F;
+			this.defaultbrightness.ButtonStepsWrapAround = false;
+			this.defaultbrightness.Location = new System.Drawing.Point(156, 83);
+			this.defaultbrightness.Name = "defaultbrightness";
+			this.defaultbrightness.Size = new System.Drawing.Size(59, 24);
+			this.defaultbrightness.StepValues = null;
+			this.defaultbrightness.TabIndex = 21;
+			// 
+			// label11
+			// 
+			this.label11.Location = new System.Drawing.Point(41, 88);
+			this.label11.Name = "label11";
+			this.label11.Size = new System.Drawing.Size(110, 14);
+			this.label11.TabIndex = 20;
+			this.label11.Text = "Default brightness:";
+			this.label11.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// groupBox3
+			// 
+			this.groupBox3.Controls.Add(this.autodrawonedit);
+			this.groupBox3.Controls.Add(this.syncSelection);
+			this.groupBox3.Controls.Add(this.dontMoveGeometryOutsideBounds);
+			this.groupBox3.Controls.Add(this.autoaligntexturesoncreate);
+			this.groupBox3.Controls.Add(this.autodragonpaste);
+			this.groupBox3.Controls.Add(this.visualmodeclearselection);
+			this.groupBox3.Controls.Add(this.autoclearselection);
+			this.groupBox3.Controls.Add(this.editnewthing);
+			this.groupBox3.Controls.Add(this.editnewsector);
+			this.groupBox3.Controls.Add(this.additiveselect);
+			this.groupBox3.Location = new System.Drawing.Point(284, 104);
+			this.groupBox3.Name = "groupBox3";
+			this.groupBox3.Size = new System.Drawing.Size(379, 287);
+			this.groupBox3.TabIndex = 18;
+			this.groupBox3.TabStop = false;
+			this.groupBox3.Text = " Options ";
+			// 
+			// autodrawonedit
+			// 
+			this.autodrawonedit.AutoSize = true;
+			this.autodrawonedit.Location = new System.Drawing.Point(13, 24);
+			this.autodrawonedit.Name = "autodrawonedit";
+			this.autodrawonedit.Size = new System.Drawing.Size(346, 17);
+			this.autodrawonedit.TabIndex = 11;
+			this.autodrawonedit.Text = "Start drawing when Edit pressed over empty space in Classic modes";
+			this.autodrawonedit.UseVisualStyleBackColor = true;
+			// 
+			// syncSelection
+			// 
+			this.syncSelection.AutoSize = true;
+			this.syncSelection.Location = new System.Drawing.Point(13, 249);
+			this.syncSelection.Name = "syncSelection";
+			this.syncSelection.Size = new System.Drawing.Size(295, 17);
+			this.syncSelection.TabIndex = 10;
+			this.syncSelection.Text = "Synchronize selection between Visual and Classic modes";
+			this.syncSelection.UseVisualStyleBackColor = true;
+			// 
+			// dontMoveGeometryOutsideBounds
+			// 
+			this.dontMoveGeometryOutsideBounds.AutoSize = true;
+			this.dontMoveGeometryOutsideBounds.Location = new System.Drawing.Point(13, 224);
+			this.dontMoveGeometryOutsideBounds.Name = "dontMoveGeometryOutsideBounds";
+			this.dontMoveGeometryOutsideBounds.Size = new System.Drawing.Size(323, 17);
+			this.dontMoveGeometryOutsideBounds.TabIndex = 9;
+			this.dontMoveGeometryOutsideBounds.Text = "Don\'t move selection if any part of it is outside of map boundary";
+			this.dontMoveGeometryOutsideBounds.UseVisualStyleBackColor = true;
+			// 
+			// autoaligntexturesoncreate
+			// 
+			this.autoaligntexturesoncreate.AutoSize = true;
+			this.autoaligntexturesoncreate.Location = new System.Drawing.Point(13, 199);
+			this.autoaligntexturesoncreate.Name = "autoaligntexturesoncreate";
+			this.autoaligntexturesoncreate.Size = new System.Drawing.Size(233, 17);
+			this.autoaligntexturesoncreate.TabIndex = 7;
+			this.autoaligntexturesoncreate.Text = "Auto-align textures of newly created linedefs";
+			this.autoaligntexturesoncreate.UseVisualStyleBackColor = true;
+			// 
+			// autodragonpaste
+			// 
+			this.autodragonpaste.AutoSize = true;
+			this.autodragonpaste.Location = new System.Drawing.Point(13, 174);
+			this.autodragonpaste.Name = "autodragonpaste";
+			this.autodragonpaste.Size = new System.Drawing.Size(202, 17);
+			this.autodragonpaste.TabIndex = 6;
+			this.autodragonpaste.Text = "Drag selection automatically on paste";
+			this.autodragonpaste.UseVisualStyleBackColor = true;
+			// 
+			// visualmodeclearselection
+			// 
+			this.visualmodeclearselection.AutoSize = true;
+			this.visualmodeclearselection.Location = new System.Drawing.Point(13, 149);
+			this.visualmodeclearselection.Name = "visualmodeclearselection";
+			this.visualmodeclearselection.Size = new System.Drawing.Size(216, 17);
+			this.visualmodeclearselection.TabIndex = 5;
+			this.visualmodeclearselection.Text = "Automatic clear selection in Visual Mode";
+			this.visualmodeclearselection.UseVisualStyleBackColor = true;
+			// 
+			// autoclearselection
+			// 
+			this.autoclearselection.AutoSize = true;
+			this.autoclearselection.Location = new System.Drawing.Point(13, 124);
+			this.autoclearselection.Name = "autoclearselection";
+			this.autoclearselection.Size = new System.Drawing.Size(226, 17);
+			this.autoclearselection.TabIndex = 4;
+			this.autoclearselection.Text = "Automatic clear selection in Classic Modes";
+			this.autoclearselection.UseVisualStyleBackColor = true;
+			// 
+			// editnewthing
+			// 
+			this.editnewthing.AutoSize = true;
+			this.editnewthing.Location = new System.Drawing.Point(13, 49);
+			this.editnewthing.Name = "editnewthing";
+			this.editnewthing.Size = new System.Drawing.Size(248, 17);
+			this.editnewthing.TabIndex = 1;
+			this.editnewthing.Text = "Edit thing properties when inserting a new thing";
+			this.editnewthing.UseVisualStyleBackColor = true;
+			// 
+			// editnewsector
+			// 
+			this.editnewsector.AutoSize = true;
+			this.editnewsector.Location = new System.Drawing.Point(13, 74);
+			this.editnewsector.Name = "editnewsector";
+			this.editnewsector.Size = new System.Drawing.Size(258, 17);
+			this.editnewsector.TabIndex = 2;
+			this.editnewsector.Text = "Edit sector properties when drawing a new sector";
+			this.editnewsector.UseVisualStyleBackColor = true;
+			// 
+			// additiveselect
+			// 
+			this.additiveselect.AutoSize = true;
+			this.additiveselect.Location = new System.Drawing.Point(13, 99);
+			this.additiveselect.Name = "additiveselect";
+			this.additiveselect.Size = new System.Drawing.Size(205, 17);
+			this.additiveselect.TabIndex = 3;
+			this.additiveselect.Text = "Additive selecting without holding shift";
+			this.additiveselect.UseVisualStyleBackColor = true;
+			// 
+			// groupBox2
+			// 
+			this.groupBox2.Controls.Add(this.splitlinedefsrange);
+			this.groupBox2.Controls.Add(this.stitchrange);
+			this.groupBox2.Controls.Add(this.highlightthingsrange);
+			this.groupBox2.Controls.Add(this.highlightrange);
+			this.groupBox2.Controls.Add(this.label8);
+			this.groupBox2.Controls.Add(this.label2);
+			this.groupBox2.Controls.Add(this.label3);
+			this.groupBox2.Controls.Add(this.label9);
+			this.groupBox2.Controls.Add(this.label5);
+			this.groupBox2.Controls.Add(this.label6);
+			this.groupBox2.Controls.Add(this.label4);
+			this.groupBox2.Controls.Add(this.label7);
+			this.groupBox2.Location = new System.Drawing.Point(6, 104);
+			this.groupBox2.Name = "groupBox2";
+			this.groupBox2.Size = new System.Drawing.Size(272, 151);
+			this.groupBox2.TabIndex = 17;
+			this.groupBox2.TabStop = false;
+			this.groupBox2.Text = " Ranges ";
+			// 
+			// splitlinedefsrange
+			// 
+			this.splitlinedefsrange.AllowDecimal = false;
+			this.splitlinedefsrange.AllowNegative = false;
+			this.splitlinedefsrange.AllowRelative = false;
+			this.splitlinedefsrange.ButtonStep = 5;
+			this.splitlinedefsrange.ButtonStepFloat = 1F;
+			this.splitlinedefsrange.ButtonStepsWrapAround = false;
+			this.splitlinedefsrange.Location = new System.Drawing.Point(156, 111);
+			this.splitlinedefsrange.Name = "splitlinedefsrange";
+			this.splitlinedefsrange.Size = new System.Drawing.Size(59, 24);
+			this.splitlinedefsrange.StepValues = null;
+			this.splitlinedefsrange.TabIndex = 19;
+			// 
+			// stitchrange
+			// 
+			this.stitchrange.AllowDecimal = false;
+			this.stitchrange.AllowNegative = false;
+			this.stitchrange.AllowRelative = false;
+			this.stitchrange.ButtonStep = 5;
+			this.stitchrange.ButtonStepFloat = 1F;
+			this.stitchrange.ButtonStepsWrapAround = false;
+			this.stitchrange.Location = new System.Drawing.Point(156, 81);
+			this.stitchrange.Name = "stitchrange";
+			this.stitchrange.Size = new System.Drawing.Size(59, 24);
+			this.stitchrange.StepValues = null;
+			this.stitchrange.TabIndex = 18;
+			// 
+			// highlightthingsrange
+			// 
+			this.highlightthingsrange.AllowDecimal = false;
+			this.highlightthingsrange.AllowNegative = false;
+			this.highlightthingsrange.AllowRelative = false;
+			this.highlightthingsrange.ButtonStep = 5;
+			this.highlightthingsrange.ButtonStepFloat = 1F;
+			this.highlightthingsrange.ButtonStepsWrapAround = false;
+			this.highlightthingsrange.Location = new System.Drawing.Point(156, 51);
+			this.highlightthingsrange.Name = "highlightthingsrange";
+			this.highlightthingsrange.Size = new System.Drawing.Size(59, 24);
+			this.highlightthingsrange.StepValues = null;
+			this.highlightthingsrange.TabIndex = 17;
+			// 
+			// highlightrange
+			// 
+			this.highlightrange.AllowDecimal = false;
+			this.highlightrange.AllowNegative = false;
+			this.highlightrange.AllowRelative = false;
+			this.highlightrange.ButtonStep = 5;
+			this.highlightrange.ButtonStepFloat = 1F;
+			this.highlightrange.ButtonStepsWrapAround = false;
+			this.highlightrange.Location = new System.Drawing.Point(156, 21);
+			this.highlightrange.Name = "highlightrange";
+			this.highlightrange.Size = new System.Drawing.Size(59, 24);
+			this.highlightrange.StepValues = null;
+			this.highlightrange.TabIndex = 16;
+			// 
+			// label8
+			// 
+			this.label8.AutoSize = true;
+			this.label8.Location = new System.Drawing.Point(221, 116);
+			this.label8.Name = "label8";
+			this.label8.Size = new System.Drawing.Size(33, 13);
+			this.label8.TabIndex = 15;
+			this.label8.Text = "pixels";
+			// 
+			// label2
+			// 
+			this.label2.AutoSize = true;
+			this.label2.Location = new System.Drawing.Point(33, 86);
+			this.label2.Name = "label2";
+			this.label2.Size = new System.Drawing.Size(113, 13);
+			this.label2.TabIndex = 4;
+			this.label2.Text = "Stitch geometry within:";
+			this.label2.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// label3
+			// 
+			this.label3.AutoSize = true;
+			this.label3.Location = new System.Drawing.Point(221, 86);
+			this.label3.Name = "label3";
+			this.label3.Size = new System.Drawing.Size(33, 13);
+			this.label3.TabIndex = 6;
+			this.label3.Text = "pixels";
+			// 
+			// label9
+			// 
+			this.label9.AutoSize = true;
+			this.label9.Location = new System.Drawing.Point(47, 115);
+			this.label9.Name = "label9";
+			this.label9.Size = new System.Drawing.Size(99, 13);
+			this.label9.TabIndex = 13;
+			this.label9.Text = "Split linedefs within:";
+			this.label9.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// label5
+			// 
+			this.label5.AutoSize = true;
+			this.label5.Location = new System.Drawing.Point(20, 26);
+			this.label5.Name = "label5";
+			this.label5.Size = new System.Drawing.Size(127, 13);
+			this.label5.TabIndex = 7;
+			this.label5.Text = "Highlight geometry within:";
+			this.label5.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// label6
+			// 
+			this.label6.AutoSize = true;
+			this.label6.Location = new System.Drawing.Point(221, 55);
+			this.label6.Name = "label6";
+			this.label6.Size = new System.Drawing.Size(33, 13);
+			this.label6.TabIndex = 12;
+			this.label6.Text = "pixels";
+			// 
+			// label4
+			// 
+			this.label4.AutoSize = true;
+			this.label4.Location = new System.Drawing.Point(221, 26);
+			this.label4.Name = "label4";
+			this.label4.Size = new System.Drawing.Size(33, 13);
+			this.label4.TabIndex = 9;
+			this.label4.Text = "pixels";
+			// 
+			// label7
+			// 
+			this.label7.AutoSize = true;
+			this.label7.Location = new System.Drawing.Point(36, 56);
+			this.label7.Name = "label7";
+			this.label7.Size = new System.Drawing.Size(112, 13);
+			this.label7.TabIndex = 10;
+			this.label7.Text = "Highlight things within:";
+			this.label7.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// groupBox1
+			// 
+			this.groupBox1.Controls.Add(this.splitbehavior);
+			this.groupBox1.Controls.Add(this.label10);
+			this.groupBox1.Controls.Add(this.label1);
+			this.groupBox1.Controls.Add(this.heightbysidedef);
+			this.groupBox1.Location = new System.Drawing.Point(6, 6);
+			this.groupBox1.Name = "groupBox1";
+			this.groupBox1.Size = new System.Drawing.Size(657, 92);
+			this.groupBox1.TabIndex = 16;
+			this.groupBox1.TabStop = false;
+			this.groupBox1.Text = " Behavior ";
+			// 
+			// splitbehavior
+			// 
+			this.splitbehavior.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.splitbehavior.FormattingEnabled = true;
+			this.splitbehavior.Items.AddRange(new object[] {
+            "Interpolate texture coordinates",
+            "Duplicate texture coordinates",
+            "Reset X coordinate, duplicate Y coordinate",
+            "Reset X and Y coordinates"});
+			this.splitbehavior.Location = new System.Drawing.Point(342, 55);
+			this.splitbehavior.Name = "splitbehavior";
+			this.splitbehavior.Size = new System.Drawing.Size(309, 21);
+			this.splitbehavior.TabIndex = 2;
+			// 
+			// label10
+			// 
+			this.label10.AutoSize = true;
+			this.label10.Location = new System.Drawing.Point(203, 58);
+			this.label10.Name = "label10";
+			this.label10.Size = new System.Drawing.Size(120, 13);
+			this.label10.TabIndex = 1;
+			this.label10.Text = "When splitting a linedef:";
+			this.label10.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// label1
+			// 
+			this.label1.AutoSize = true;
+			this.label1.Location = new System.Drawing.Point(9, 22);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(308, 13);
+			this.label1.TabIndex = 0;
+			this.label1.Text = "When sector height changes are used on a wall in Visual Mode:";
+			this.label1.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// heightbysidedef
+			// 
+			this.heightbysidedef.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.heightbysidedef.FormattingEnabled = true;
+			this.heightbysidedef.Items.AddRange(new object[] {
+            "Do nothing",
+            "Change the ceiling height",
+            "Change the floor height",
+            "Change both floor and ceiling height"});
+			this.heightbysidedef.Location = new System.Drawing.Point(342, 19);
+			this.heightbysidedef.Name = "heightbysidedef";
+			this.heightbysidedef.Size = new System.Drawing.Size(309, 21);
+			this.heightbysidedef.TabIndex = 0;
+			// 
+			// PreferencesForm
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.ClientSize = new System.Drawing.Size(701, 448);
+			this.Controls.Add(this.tabs);
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "PreferencesForm";
+			this.Opacity = 1;
+			this.ShowIcon = false;
+			this.Text = "PreferencesForm";
+			this.tabs.ResumeLayout(false);
+			this.taboptions.ResumeLayout(false);
+			this.groupBox4.ResumeLayout(false);
+			this.groupBox4.PerformLayout();
+			this.groupBox3.ResumeLayout(false);
+			this.groupBox3.PerformLayout();
+			this.groupBox2.ResumeLayout(false);
+			this.groupBox2.PerformLayout();
+			this.groupBox1.ResumeLayout(false);
+			this.groupBox1.PerformLayout();
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.TabControl tabs;
+		private System.Windows.Forms.TabPage taboptions;
+		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.ComboBox heightbysidedef;
+		private System.Windows.Forms.CheckBox editnewsector;
+		private System.Windows.Forms.CheckBox editnewthing;
+		private System.Windows.Forms.CheckBox additiveselect;
+		private System.Windows.Forms.Label label2;
+		private System.Windows.Forms.Label label3;
+		private System.Windows.Forms.Label label4;
+		private System.Windows.Forms.Label label5;
+		private System.Windows.Forms.Label label6;
+		private System.Windows.Forms.Label label7;
+		private System.Windows.Forms.Label label8;
+		private System.Windows.Forms.Label label9;
+		private System.Windows.Forms.GroupBox groupBox1;
+		private System.Windows.Forms.GroupBox groupBox3;
+		private System.Windows.Forms.GroupBox groupBox2;
+		private System.Windows.Forms.CheckBox autoclearselection;
+		private System.Windows.Forms.CheckBox visualmodeclearselection;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox splitlinedefsrange;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox stitchrange;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox highlightthingsrange;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox highlightrange;
+		private System.Windows.Forms.CheckBox autodragonpaste;
+		private System.Windows.Forms.ComboBox splitbehavior;
+		private System.Windows.Forms.Label label10;
+		private System.Windows.Forms.CheckBox autoaligntexturesoncreate;
+		private System.Windows.Forms.CheckBox dontMoveGeometryOutsideBounds;
+		private System.Windows.Forms.CheckBox syncSelection;
+		private System.Windows.Forms.GroupBox groupBox4;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox defaultbrightness;
+		private System.Windows.Forms.Label label11;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox defaultfloorheight;
+		private System.Windows.Forms.Label label13;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox defaultceilheight;
+		private System.Windows.Forms.Label label12;
+		private System.Windows.Forms.Label label15;
+		private System.Windows.Forms.Label label14;
+		private System.Windows.Forms.CheckBox autodrawonedit;
+	}
+}
\ No newline at end of file
diff --git a/Source/Plugins/BuilderModes/Interface/PreferencesForm.cs b/Source/Plugins/BuilderModes/Interface/PreferencesForm.cs
new file mode 100644
index 0000000..24f533b
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/PreferencesForm.cs
@@ -0,0 +1,127 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Windows;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	public partial class PreferencesForm : DelayedForm
+	{
+		#region ================== Variables
+
+		#endregion
+
+		#region ================== Properties
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Contrustor
+		public PreferencesForm()
+		{
+			InitializeComponent();
+
+			// Apply current settings to interface
+			heightbysidedef.SelectedIndex = General.Settings.ReadPluginSetting("changeheightbysidedef", 0);
+			editnewthing.Checked = General.Settings.ReadPluginSetting("editnewthing", true);
+			editnewsector.Checked = General.Settings.ReadPluginSetting("editnewsector", false);
+			additiveselect.Checked = General.Settings.ReadPluginSetting("additiveselect", false);
+			stitchrange.Text = General.Settings.ReadPluginSetting("stitchrange", 20).ToString();
+			highlightrange.Text = General.Settings.ReadPluginSetting("highlightrange", 20).ToString();
+			highlightthingsrange.Text = General.Settings.ReadPluginSetting("highlightthingsrange", 10).ToString();
+			splitlinedefsrange.Text = General.Settings.ReadPluginSetting("splitlinedefsrange", 10).ToString();
+			splitbehavior.SelectedIndex = (int)General.Settings.SplitLineBehavior; //mxd
+			autoclearselection.Checked = BuilderPlug.Me.AutoClearSelection;
+			visualmodeclearselection.Checked = BuilderPlug.Me.VisualModeClearSelection;
+			autodragonpaste.Checked = BuilderPlug.Me.AutoDragOnPaste;
+			autoaligntexturesoncreate.Checked = BuilderPlug.Me.AutoAlignTextureOffsetsOnCreate; //mxd
+			dontMoveGeometryOutsideBounds.Checked = BuilderPlug.Me.DontMoveGeometryOutsideMapBoundary; //mxd
+			syncSelection.Checked = BuilderPlug.Me.SyncSelection; //mxd
+			autodrawonedit.Checked = BuilderPlug.Me.AutoDrawOnEdit;
+			defaultbrightness.Text = General.Settings.DefaultBrightness.ToString(); //mxd
+			defaultceilheight.Text = General.Settings.DefaultCeilingHeight.ToString();//mxd
+			defaultfloorheight.Text = General.Settings.DefaultFloorHeight.ToString(); //mxd
+		}
+
+		#endregion
+
+		#region ================== Events
+
+		// When OK is pressed on the preferences dialog
+		public void OnAccept(PreferencesController controller)
+		{
+			// Write preferred settings
+			General.Settings.WritePluginSetting("changeheightbysidedef", heightbysidedef.SelectedIndex);
+			General.Settings.WritePluginSetting("editnewthing", editnewthing.Checked);
+			General.Settings.WritePluginSetting("editnewsector", editnewsector.Checked);
+			General.Settings.WritePluginSetting("additiveselect", additiveselect.Checked);
+			General.Settings.WritePluginSetting("stitchrange", stitchrange.GetResult(0));
+			General.Settings.WritePluginSetting("highlightrange", highlightrange.GetResult(0));
+			General.Settings.WritePluginSetting("highlightthingsrange", highlightthingsrange.GetResult(0));
+			General.Settings.WritePluginSetting("splitlinedefsrange", splitlinedefsrange.GetResult(0));
+			General.Settings.WritePluginSetting("autoclearselection", autoclearselection.Checked);
+			General.Settings.WritePluginSetting("visualmodeclearselection", visualmodeclearselection.Checked);
+			General.Settings.WritePluginSetting("autodragonpaste", autodragonpaste.Checked);
+			General.Settings.WritePluginSetting("autodrawonedit", autodrawonedit.Checked); //mxd
+			General.Settings.WritePluginSetting("autoaligntextureoffsetsoncreate", autoaligntexturesoncreate.Checked);//mxd
+			General.Settings.WritePluginSetting("dontmovegeometryoutsidemapboundary", dontMoveGeometryOutsideBounds.Checked);//mxd
+			General.Settings.WritePluginSetting("syncselection", syncSelection.Checked);//mxd
+			General.Settings.SplitLineBehavior = (SplitLineBehavior)splitbehavior.SelectedIndex;//mxd
+
+			//default sector values
+			General.Settings.DefaultBrightness = General.Clamp(defaultbrightness.GetResult(192), 0, 255);
+			
+			int ceilHeight = defaultceilheight.GetResult(128);
+			int floorHeight = defaultfloorheight.GetResult(0);
+			if(ceilHeight < floorHeight) General.Swap(ref ceilHeight, ref floorHeight);
+
+			General.Settings.DefaultCeilingHeight = ceilHeight;
+			General.Settings.DefaultFloorHeight = floorHeight;
+		}
+		
+		// When Cancel is pressed on the preferences dialog
+		public void OnCancel(PreferencesController controller)
+		{
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This sets up the form with the preferences controller
+		public void Setup(PreferencesController controller)
+		{
+			// Add tab pages
+			foreach(TabPage p in tabs.TabPages)
+			{
+				controller.AddTab(p);
+			}
+
+			// Bind events
+			controller.OnAccept += OnAccept;
+			controller.OnCancel += OnCancel;
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/Source/Plugins/BuilderModes/Interface/PreferencesForm.resx b/Source/Plugins/BuilderModes/Interface/PreferencesForm.resx
new file mode 100644
index 0000000..ad3360f
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/PreferencesForm.resx
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="tabs.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/BuilderModes/Interface/SectorDrawingOptionsPanel.Designer.cs b/Source/Plugins/BuilderModes/Interface/SectorDrawingOptionsPanel.Designer.cs
new file mode 100644
index 0000000..fd4ce6b
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/SectorDrawingOptionsPanel.Designer.cs
@@ -0,0 +1,603 @@
+namespace CodeImp.DoomBuilder.BuilderModes.Interface
+{
+	partial class SectorDrawingOptionsPanel
+	{
+		/// <summary> 
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing) 
+		{
+			if(disposing && (components != null)) 
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Component Designer generated code
+
+		/// <summary> 
+		/// Required method for Designer support - do not modify 
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent() 
+		{
+			this.components = new System.ComponentModel.Container();
+			this.groupBox1 = new System.Windows.Forms.GroupBox();
+			this.ceiling = new CodeImp.DoomBuilder.Controls.FlatSelectorControl();
+			this.floor = new CodeImp.DoomBuilder.Controls.FlatSelectorControl();
+			this.cbOverrideFloorTexture = new System.Windows.Forms.CheckBox();
+			this.cbOverrideCeilingTexture = new System.Windows.Forms.CheckBox();
+			this.groupBox2 = new System.Windows.Forms.GroupBox();
+			this.label1 = new System.Windows.Forms.Label();
+			this.label14 = new System.Windows.Forms.Label();
+			this.cbBrightness = new System.Windows.Forms.CheckBox();
+			this.brightness = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.floorHeight = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.cbCeilHeight = new System.Windows.Forms.CheckBox();
+			this.cbFloorHeight = new System.Windows.Forms.CheckBox();
+			this.ceilHeight = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.cbOverrideBottomTexture = new System.Windows.Forms.CheckBox();
+			this.cbOverrideMiddleTexture = new System.Windows.Forms.CheckBox();
+			this.bottom = new CodeImp.DoomBuilder.Controls.TextureSelectorControl();
+			this.cbOverrideTopTexture = new System.Windows.Forms.CheckBox();
+			this.middle = new CodeImp.DoomBuilder.Controls.TextureSelectorControl();
+			this.top = new CodeImp.DoomBuilder.Controls.TextureSelectorControl();
+			this.groupBox3 = new System.Windows.Forms.GroupBox();
+			this.groupBox4 = new System.Windows.Forms.GroupBox();
+			this.fillall = new System.Windows.Forms.Button();
+			this.filllower = new System.Windows.Forms.Button();
+			this.fillmiddle = new System.Windows.Forms.Button();
+			this.fillupper = new System.Windows.Forms.Button();
+			this.fillfloor = new System.Windows.Forms.Button();
+			this.fillceiling = new System.Windows.Forms.Button();
+			this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
+			this.clearlower = new System.Windows.Forms.Button();
+			this.clearmiddle = new System.Windows.Forms.Button();
+			this.clearupper = new System.Windows.Forms.Button();
+			this.clearfloor = new System.Windows.Forms.Button();
+			this.clearceiling = new System.Windows.Forms.Button();
+			this.clearall = new System.Windows.Forms.Button();
+			this.groupBox5 = new System.Windows.Forms.GroupBox();
+			this.getsidetexturesfromselection = new System.Windows.Forms.Button();
+			this.getheightandbrightnessfromselection = new System.Windows.Forms.Button();
+			this.getsectortexturesfromselection = new System.Windows.Forms.Button();
+			this.groupBox1.SuspendLayout();
+			this.groupBox2.SuspendLayout();
+			this.groupBox3.SuspendLayout();
+			this.groupBox4.SuspendLayout();
+			this.groupBox5.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// groupBox1
+			// 
+			this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.groupBox1.Controls.Add(this.getsectortexturesfromselection);
+			this.groupBox1.Controls.Add(this.ceiling);
+			this.groupBox1.Controls.Add(this.floor);
+			this.groupBox1.Controls.Add(this.cbOverrideFloorTexture);
+			this.groupBox1.Controls.Add(this.cbOverrideCeilingTexture);
+			this.groupBox1.Location = new System.Drawing.Point(3, 3);
+			this.groupBox1.Name = "groupBox1";
+			this.groupBox1.Size = new System.Drawing.Size(243, 166);
+			this.groupBox1.TabIndex = 0;
+			this.groupBox1.TabStop = false;
+			this.groupBox1.Text = "Sector texture overrides:";
+			// 
+			// ceiling
+			// 
+			this.ceiling.Location = new System.Drawing.Point(6, 41);
+			this.ceiling.MultipleTextures = false;
+			this.ceiling.Name = "ceiling";
+			this.ceiling.Size = new System.Drawing.Size(68, 90);
+			this.ceiling.TabIndex = 30;
+			this.ceiling.TextureName = "";
+			this.ceiling.UsePreviews = true;
+			this.ceiling.OnValueChanged += new System.EventHandler(this.ceiling_OnValueChanged);
+			// 
+			// floor
+			// 
+			this.floor.Location = new System.Drawing.Point(87, 41);
+			this.floor.MultipleTextures = false;
+			this.floor.Name = "floor";
+			this.floor.Size = new System.Drawing.Size(68, 90);
+			this.floor.TabIndex = 29;
+			this.floor.TextureName = "";
+			this.floor.UsePreviews = true;
+			this.floor.OnValueChanged += new System.EventHandler(this.floor_OnValueChanged);
+			// 
+			// cbOverrideFloorTexture
+			// 
+			this.cbOverrideFloorTexture.AutoSize = true;
+			this.cbOverrideFloorTexture.Location = new System.Drawing.Point(88, 19);
+			this.cbOverrideFloorTexture.Name = "cbOverrideFloorTexture";
+			this.cbOverrideFloorTexture.Size = new System.Drawing.Size(49, 17);
+			this.cbOverrideFloorTexture.TabIndex = 21;
+			this.cbOverrideFloorTexture.Text = "Floor";
+			this.cbOverrideFloorTexture.UseVisualStyleBackColor = true;
+			this.cbOverrideFloorTexture.CheckedChanged += new System.EventHandler(this.cbOverrideFloorTexture_CheckedChanged);
+			// 
+			// cbOverrideCeilingTexture
+			// 
+			this.cbOverrideCeilingTexture.AutoSize = true;
+			this.cbOverrideCeilingTexture.Location = new System.Drawing.Point(7, 19);
+			this.cbOverrideCeilingTexture.Name = "cbOverrideCeilingTexture";
+			this.cbOverrideCeilingTexture.Size = new System.Drawing.Size(57, 17);
+			this.cbOverrideCeilingTexture.TabIndex = 20;
+			this.cbOverrideCeilingTexture.Text = "Ceiling";
+			this.cbOverrideCeilingTexture.UseVisualStyleBackColor = true;
+			this.cbOverrideCeilingTexture.CheckedChanged += new System.EventHandler(this.cbOverrideCeilingTexture_CheckedChanged);
+			// 
+			// groupBox2
+			// 
+			this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.groupBox2.Controls.Add(this.getheightandbrightnessfromselection);
+			this.groupBox2.Controls.Add(this.label1);
+			this.groupBox2.Controls.Add(this.label14);
+			this.groupBox2.Controls.Add(this.cbBrightness);
+			this.groupBox2.Controls.Add(this.brightness);
+			this.groupBox2.Controls.Add(this.floorHeight);
+			this.groupBox2.Controls.Add(this.cbCeilHeight);
+			this.groupBox2.Controls.Add(this.cbFloorHeight);
+			this.groupBox2.Controls.Add(this.ceilHeight);
+			this.groupBox2.Location = new System.Drawing.Point(3, 347);
+			this.groupBox2.Name = "groupBox2";
+			this.groupBox2.Size = new System.Drawing.Size(243, 138);
+			this.groupBox2.TabIndex = 21;
+			this.groupBox2.TabStop = false;
+			this.groupBox2.Text = "Geometry overrides:";
+			// 
+			// label1
+			// 
+			this.label1.AutoSize = true;
+			this.label1.Location = new System.Drawing.Point(182, 53);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(27, 13);
+			this.label1.TabIndex = 29;
+			this.label1.Text = "m.u.";
+			// 
+			// label14
+			// 
+			this.label14.AutoSize = true;
+			this.label14.Location = new System.Drawing.Point(182, 24);
+			this.label14.Name = "label14";
+			this.label14.Size = new System.Drawing.Size(27, 13);
+			this.label14.TabIndex = 28;
+			this.label14.Text = "m.u.";
+			// 
+			// cbBrightness
+			// 
+			this.cbBrightness.AutoSize = true;
+			this.cbBrightness.Location = new System.Drawing.Point(7, 82);
+			this.cbBrightness.Name = "cbBrightness";
+			this.cbBrightness.Size = new System.Drawing.Size(78, 17);
+			this.cbBrightness.TabIndex = 27;
+			this.cbBrightness.Text = "Brightness:";
+			this.cbBrightness.UseVisualStyleBackColor = true;
+			this.cbBrightness.CheckedChanged += new System.EventHandler(this.cbBrightness_CheckedChanged);
+			// 
+			// brightness
+			// 
+			this.brightness.AllowDecimal = false;
+			this.brightness.AllowNegative = false;
+			this.brightness.AllowRelative = false;
+			this.brightness.ButtonStep = 16;
+			this.brightness.ButtonStepFloat = 1F;
+			this.brightness.ButtonStepsWrapAround = false;
+			this.brightness.Location = new System.Drawing.Point(105, 78);
+			this.brightness.Name = "brightness";
+			this.brightness.Size = new System.Drawing.Size(72, 24);
+			this.brightness.StepValues = null;
+			this.brightness.TabIndex = 26;
+			this.brightness.WhenTextChanged += new System.EventHandler(this.brightness_WhenTextChanged);
+			// 
+			// floorHeight
+			// 
+			this.floorHeight.AllowDecimal = false;
+			this.floorHeight.AllowNegative = true;
+			this.floorHeight.AllowRelative = false;
+			this.floorHeight.ButtonStep = 16;
+			this.floorHeight.ButtonStepFloat = 1F;
+			this.floorHeight.ButtonStepsWrapAround = false;
+			this.floorHeight.Location = new System.Drawing.Point(105, 48);
+			this.floorHeight.Name = "floorHeight";
+			this.floorHeight.Size = new System.Drawing.Size(72, 24);
+			this.floorHeight.StepValues = null;
+			this.floorHeight.TabIndex = 25;
+			this.floorHeight.WhenTextChanged += new System.EventHandler(this.floorHeight_WhenTextChanged);
+			// 
+			// cbCeilHeight
+			// 
+			this.cbCeilHeight.AutoSize = true;
+			this.cbCeilHeight.Location = new System.Drawing.Point(7, 23);
+			this.cbCeilHeight.Name = "cbCeilHeight";
+			this.cbCeilHeight.Size = new System.Drawing.Size(92, 17);
+			this.cbCeilHeight.TabIndex = 24;
+			this.cbCeilHeight.Text = "Ceiling height:";
+			this.cbCeilHeight.UseVisualStyleBackColor = true;
+			this.cbCeilHeight.CheckedChanged += new System.EventHandler(this.cbCeilHeight_CheckedChanged);
+			// 
+			// cbFloorHeight
+			// 
+			this.cbFloorHeight.AutoSize = true;
+			this.cbFloorHeight.Location = new System.Drawing.Point(7, 52);
+			this.cbFloorHeight.Name = "cbFloorHeight";
+			this.cbFloorHeight.Size = new System.Drawing.Size(84, 17);
+			this.cbFloorHeight.TabIndex = 23;
+			this.cbFloorHeight.Text = "Floor height:";
+			this.cbFloorHeight.UseVisualStyleBackColor = true;
+			this.cbFloorHeight.CheckedChanged += new System.EventHandler(this.cbFloorHeight_CheckedChanged);
+			// 
+			// ceilHeight
+			// 
+			this.ceilHeight.AllowDecimal = false;
+			this.ceilHeight.AllowNegative = true;
+			this.ceilHeight.AllowRelative = false;
+			this.ceilHeight.ButtonStep = 16;
+			this.ceilHeight.ButtonStepFloat = 1F;
+			this.ceilHeight.ButtonStepsWrapAround = false;
+			this.ceilHeight.Location = new System.Drawing.Point(105, 18);
+			this.ceilHeight.Name = "ceilHeight";
+			this.ceilHeight.Size = new System.Drawing.Size(72, 24);
+			this.ceilHeight.StepValues = null;
+			this.ceilHeight.TabIndex = 11;
+			this.ceilHeight.WhenTextChanged += new System.EventHandler(this.ceilHeight_WhenTextChanged);
+			// 
+			// cbOverrideBottomTexture
+			// 
+			this.cbOverrideBottomTexture.AutoSize = true;
+			this.cbOverrideBottomTexture.Location = new System.Drawing.Point(170, 19);
+			this.cbOverrideBottomTexture.Name = "cbOverrideBottomTexture";
+			this.cbOverrideBottomTexture.Size = new System.Drawing.Size(55, 17);
+			this.cbOverrideBottomTexture.TabIndex = 28;
+			this.cbOverrideBottomTexture.Text = "Lower";
+			this.cbOverrideBottomTexture.UseVisualStyleBackColor = true;
+			this.cbOverrideBottomTexture.CheckedChanged += new System.EventHandler(this.cbOverrideBottomTexture_CheckedChanged);
+			// 
+			// cbOverrideMiddleTexture
+			// 
+			this.cbOverrideMiddleTexture.AutoSize = true;
+			this.cbOverrideMiddleTexture.Location = new System.Drawing.Point(88, 19);
+			this.cbOverrideMiddleTexture.Name = "cbOverrideMiddleTexture";
+			this.cbOverrideMiddleTexture.Size = new System.Drawing.Size(57, 17);
+			this.cbOverrideMiddleTexture.TabIndex = 27;
+			this.cbOverrideMiddleTexture.Text = "Middle";
+			this.cbOverrideMiddleTexture.UseVisualStyleBackColor = true;
+			this.cbOverrideMiddleTexture.CheckedChanged += new System.EventHandler(this.cbOverrideMiddleTexture_CheckedChanged);
+			// 
+			// bottom
+			// 
+			this.bottom.Location = new System.Drawing.Point(168, 41);
+			this.bottom.MultipleTextures = false;
+			this.bottom.Name = "bottom";
+			this.bottom.Required = false;
+			this.bottom.Size = new System.Drawing.Size(68, 90);
+			this.bottom.TabIndex = 25;
+			this.bottom.TextureName = "";
+			this.bottom.UsePreviews = true;
+			this.bottom.OnValueChanged += new System.EventHandler(this.bottom_OnValueChanged);
+			// 
+			// cbOverrideTopTexture
+			// 
+			this.cbOverrideTopTexture.AutoSize = true;
+			this.cbOverrideTopTexture.Location = new System.Drawing.Point(7, 19);
+			this.cbOverrideTopTexture.Name = "cbOverrideTopTexture";
+			this.cbOverrideTopTexture.Size = new System.Drawing.Size(55, 17);
+			this.cbOverrideTopTexture.TabIndex = 26;
+			this.cbOverrideTopTexture.Text = "Upper";
+			this.cbOverrideTopTexture.UseVisualStyleBackColor = true;
+			this.cbOverrideTopTexture.CheckedChanged += new System.EventHandler(this.cbOverrideTopTexture_CheckedChanged);
+			// 
+			// middle
+			// 
+			this.middle.Location = new System.Drawing.Point(87, 41);
+			this.middle.MultipleTextures = false;
+			this.middle.Name = "middle";
+			this.middle.Required = false;
+			this.middle.Size = new System.Drawing.Size(68, 90);
+			this.middle.TabIndex = 24;
+			this.middle.TextureName = "";
+			this.middle.UsePreviews = true;
+			this.middle.OnValueChanged += new System.EventHandler(this.middle_OnValueChanged);
+			// 
+			// top
+			// 
+			this.top.Location = new System.Drawing.Point(6, 41);
+			this.top.MultipleTextures = false;
+			this.top.Name = "top";
+			this.top.Required = false;
+			this.top.Size = new System.Drawing.Size(68, 90);
+			this.top.TabIndex = 23;
+			this.top.TextureName = "";
+			this.top.UsePreviews = true;
+			this.top.OnValueChanged += new System.EventHandler(this.top_OnValueChanged);
+			// 
+			// groupBox3
+			// 
+			this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.groupBox3.Controls.Add(this.getsidetexturesfromselection);
+			this.groupBox3.Controls.Add(this.cbOverrideBottomTexture);
+			this.groupBox3.Controls.Add(this.top);
+			this.groupBox3.Controls.Add(this.cbOverrideMiddleTexture);
+			this.groupBox3.Controls.Add(this.middle);
+			this.groupBox3.Controls.Add(this.bottom);
+			this.groupBox3.Controls.Add(this.cbOverrideTopTexture);
+			this.groupBox3.Location = new System.Drawing.Point(3, 175);
+			this.groupBox3.Name = "groupBox3";
+			this.groupBox3.Size = new System.Drawing.Size(243, 166);
+			this.groupBox3.TabIndex = 29;
+			this.groupBox3.TabStop = false;
+			this.groupBox3.Text = "Sidedef texture overrides:";
+			// 
+			// groupBox4
+			// 
+			this.groupBox4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.groupBox4.Controls.Add(this.fillall);
+			this.groupBox4.Controls.Add(this.filllower);
+			this.groupBox4.Controls.Add(this.fillmiddle);
+			this.groupBox4.Controls.Add(this.fillupper);
+			this.groupBox4.Controls.Add(this.fillfloor);
+			this.groupBox4.Controls.Add(this.fillceiling);
+			this.groupBox4.Location = new System.Drawing.Point(3, 491);
+			this.groupBox4.Name = "groupBox4";
+			this.groupBox4.Size = new System.Drawing.Size(243, 48);
+			this.groupBox4.TabIndex = 30;
+			this.groupBox4.TabStop = false;
+			this.groupBox4.Text = "Fill Selection with Textures:";
+			// 
+			// fillall
+			// 
+			this.fillall.Location = new System.Drawing.Point(6, 19);
+			this.fillall.Name = "fillall";
+			this.fillall.Size = new System.Drawing.Size(32, 23);
+			this.fillall.TabIndex = 5;
+			this.fillall.Text = "All";
+			this.toolTip1.SetToolTip(this.fillall, "Replace all textures with currently enabled overrides");
+			this.fillall.UseVisualStyleBackColor = true;
+			this.fillall.Click += new System.EventHandler(this.fillall_Click);
+			// 
+			// filllower
+			// 
+			this.filllower.Location = new System.Drawing.Point(171, 19);
+			this.filllower.Name = "filllower";
+			this.filllower.Size = new System.Drawing.Size(26, 23);
+			this.filllower.TabIndex = 4;
+			this.filllower.Text = "L";
+			this.toolTip1.SetToolTip(this.filllower, "Fill all lower textures within selection \r\nwith current lower override texture");
+			this.filllower.UseVisualStyleBackColor = true;
+			this.filllower.Click += new System.EventHandler(this.filllower_Click);
+			// 
+			// fillmiddle
+			// 
+			this.fillmiddle.Location = new System.Drawing.Point(139, 19);
+			this.fillmiddle.Name = "fillmiddle";
+			this.fillmiddle.Size = new System.Drawing.Size(26, 23);
+			this.fillmiddle.TabIndex = 3;
+			this.fillmiddle.Text = "M";
+			this.toolTip1.SetToolTip(this.fillmiddle, "Fill all middle textures within selection \r\nwith current middle override texture");
+			this.fillmiddle.UseVisualStyleBackColor = true;
+			this.fillmiddle.Click += new System.EventHandler(this.fillmiddle_Click);
+			// 
+			// fillupper
+			// 
+			this.fillupper.Location = new System.Drawing.Point(107, 19);
+			this.fillupper.Name = "fillupper";
+			this.fillupper.Size = new System.Drawing.Size(26, 23);
+			this.fillupper.TabIndex = 2;
+			this.fillupper.Text = "U";
+			this.toolTip1.SetToolTip(this.fillupper, "Fill all upper textures within selection \r\nwith current upper override texture");
+			this.fillupper.UseVisualStyleBackColor = true;
+			this.fillupper.Click += new System.EventHandler(this.fillupper_Click);
+			// 
+			// fillfloor
+			// 
+			this.fillfloor.Location = new System.Drawing.Point(76, 19);
+			this.fillfloor.Name = "fillfloor";
+			this.fillfloor.Size = new System.Drawing.Size(26, 23);
+			this.fillfloor.TabIndex = 1;
+			this.fillfloor.Text = "F";
+			this.toolTip1.SetToolTip(this.fillfloor, "Fill all floor textures within selection \r\nwith current floor override texture");
+			this.fillfloor.UseVisualStyleBackColor = true;
+			this.fillfloor.Click += new System.EventHandler(this.fillfloor_Click);
+			// 
+			// fillceiling
+			// 
+			this.fillceiling.Location = new System.Drawing.Point(44, 19);
+			this.fillceiling.Name = "fillceiling";
+			this.fillceiling.Size = new System.Drawing.Size(26, 23);
+			this.fillceiling.TabIndex = 0;
+			this.fillceiling.Text = "C";
+			this.toolTip1.SetToolTip(this.fillceiling, "Fill all ceiling textures within selection \r\nwith current ceiling override textur" +
+					"e");
+			this.fillceiling.UseVisualStyleBackColor = true;
+			this.fillceiling.Click += new System.EventHandler(this.fillceiling_Click);
+			// 
+			// clearlower
+			// 
+			this.clearlower.Location = new System.Drawing.Point(171, 19);
+			this.clearlower.Name = "clearlower";
+			this.clearlower.Size = new System.Drawing.Size(26, 23);
+			this.clearlower.TabIndex = 4;
+			this.clearlower.Text = "L";
+			this.toolTip1.SetToolTip(this.clearlower, "Remove all lower textures within selection ");
+			this.clearlower.UseVisualStyleBackColor = true;
+			this.clearlower.Click += new System.EventHandler(this.clearlower_Click);
+			// 
+			// clearmiddle
+			// 
+			this.clearmiddle.Location = new System.Drawing.Point(139, 19);
+			this.clearmiddle.Name = "clearmiddle";
+			this.clearmiddle.Size = new System.Drawing.Size(26, 23);
+			this.clearmiddle.TabIndex = 3;
+			this.clearmiddle.Text = "M";
+			this.toolTip1.SetToolTip(this.clearmiddle, "Remove all middle textures within selection");
+			this.clearmiddle.UseVisualStyleBackColor = true;
+			this.clearmiddle.Click += new System.EventHandler(this.clearmiddle_Click);
+			// 
+			// clearupper
+			// 
+			this.clearupper.Location = new System.Drawing.Point(107, 19);
+			this.clearupper.Name = "clearupper";
+			this.clearupper.Size = new System.Drawing.Size(26, 23);
+			this.clearupper.TabIndex = 2;
+			this.clearupper.Text = "U";
+			this.toolTip1.SetToolTip(this.clearupper, "Remove all upper textures within selection");
+			this.clearupper.UseVisualStyleBackColor = true;
+			this.clearupper.Click += new System.EventHandler(this.clearupper_Click);
+			// 
+			// clearfloor
+			// 
+			this.clearfloor.Location = new System.Drawing.Point(76, 19);
+			this.clearfloor.Name = "clearfloor";
+			this.clearfloor.Size = new System.Drawing.Size(26, 23);
+			this.clearfloor.TabIndex = 1;
+			this.clearfloor.Text = "F";
+			this.toolTip1.SetToolTip(this.clearfloor, "Remove all floor textures within selection");
+			this.clearfloor.UseVisualStyleBackColor = true;
+			this.clearfloor.Click += new System.EventHandler(this.clearfloor_Click);
+			// 
+			// clearceiling
+			// 
+			this.clearceiling.Location = new System.Drawing.Point(44, 19);
+			this.clearceiling.Name = "clearceiling";
+			this.clearceiling.Size = new System.Drawing.Size(26, 23);
+			this.clearceiling.TabIndex = 0;
+			this.clearceiling.Text = "C";
+			this.toolTip1.SetToolTip(this.clearceiling, "Remove all ceiling textures within selection ");
+			this.clearceiling.UseVisualStyleBackColor = true;
+			this.clearceiling.Click += new System.EventHandler(this.clearceiling_Click);
+			// 
+			// clearall
+			// 
+			this.clearall.Location = new System.Drawing.Point(6, 19);
+			this.clearall.Name = "clearall";
+			this.clearall.Size = new System.Drawing.Size(32, 23);
+			this.clearall.TabIndex = 6;
+			this.clearall.Text = "All";
+			this.toolTip1.SetToolTip(this.clearall, "Remove all textures from selected map elements");
+			this.clearall.UseVisualStyleBackColor = true;
+			this.clearall.Click += new System.EventHandler(this.clearall_Click);
+			// 
+			// groupBox5
+			// 
+			this.groupBox5.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.groupBox5.Controls.Add(this.clearall);
+			this.groupBox5.Controls.Add(this.clearlower);
+			this.groupBox5.Controls.Add(this.clearmiddle);
+			this.groupBox5.Controls.Add(this.clearupper);
+			this.groupBox5.Controls.Add(this.clearfloor);
+			this.groupBox5.Controls.Add(this.clearceiling);
+			this.groupBox5.Location = new System.Drawing.Point(3, 545);
+			this.groupBox5.Name = "groupBox5";
+			this.groupBox5.Size = new System.Drawing.Size(243, 48);
+			this.groupBox5.TabIndex = 31;
+			this.groupBox5.TabStop = false;
+			this.groupBox5.Text = "Remove Textures form Selection:";
+			// 
+			// getsidetexturesfromselection
+			// 
+			this.getsidetexturesfromselection.Location = new System.Drawing.Point(6, 137);
+			this.getsidetexturesfromselection.Name = "getsidetexturesfromselection";
+			this.getsidetexturesfromselection.Size = new System.Drawing.Size(230, 23);
+			this.getsidetexturesfromselection.TabIndex = 31;
+			this.getsidetexturesfromselection.Text = "Get From Selection";
+			this.getsidetexturesfromselection.UseVisualStyleBackColor = true;
+			this.getsidetexturesfromselection.Click += new System.EventHandler(this.getsidetexturesfromselection_Click);
+			// 
+			// getheightandbrightnessfromselection
+			// 
+			this.getheightandbrightnessfromselection.Location = new System.Drawing.Point(6, 108);
+			this.getheightandbrightnessfromselection.Name = "getheightandbrightnessfromselection";
+			this.getheightandbrightnessfromselection.Size = new System.Drawing.Size(230, 23);
+			this.getheightandbrightnessfromselection.TabIndex = 32;
+			this.getheightandbrightnessfromselection.Text = "Get From Selection";
+			this.getheightandbrightnessfromselection.UseVisualStyleBackColor = true;
+			this.getheightandbrightnessfromselection.Click += new System.EventHandler(this.getheightandbrightnessfromselection_Click);
+			// 
+			// getsectortexturesfromselection
+			// 
+			this.getsectortexturesfromselection.Location = new System.Drawing.Point(6, 137);
+			this.getsectortexturesfromselection.Name = "getsectortexturesfromselection";
+			this.getsectortexturesfromselection.Size = new System.Drawing.Size(230, 23);
+			this.getsectortexturesfromselection.TabIndex = 32;
+			this.getsectortexturesfromselection.Text = "Get From Selection";
+			this.getsectortexturesfromselection.UseVisualStyleBackColor = true;
+			this.getsectortexturesfromselection.Click += new System.EventHandler(this.getsectortexturesfromselection_Click);
+			// 
+			// SectorDrawingOptionsPanel
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.Controls.Add(this.groupBox5);
+			this.Controls.Add(this.groupBox4);
+			this.Controls.Add(this.groupBox3);
+			this.Controls.Add(this.groupBox2);
+			this.Controls.Add(this.groupBox1);
+			this.Name = "SectorDrawingOptionsPanel";
+			this.Size = new System.Drawing.Size(249, 600);
+			this.groupBox1.ResumeLayout(false);
+			this.groupBox1.PerformLayout();
+			this.groupBox2.ResumeLayout(false);
+			this.groupBox2.PerformLayout();
+			this.groupBox3.ResumeLayout(false);
+			this.groupBox3.PerformLayout();
+			this.groupBox4.ResumeLayout(false);
+			this.groupBox5.ResumeLayout(false);
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.GroupBox groupBox1;
+		private System.Windows.Forms.CheckBox cbOverrideCeilingTexture;
+		private System.Windows.Forms.GroupBox groupBox2;
+		private System.Windows.Forms.CheckBox cbOverrideFloorTexture;
+		private System.Windows.Forms.CheckBox cbBrightness;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox brightness;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox floorHeight;
+		private System.Windows.Forms.CheckBox cbCeilHeight;
+		private System.Windows.Forms.CheckBox cbFloorHeight;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox ceilHeight;
+		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.Label label14;
+		private System.Windows.Forms.CheckBox cbOverrideBottomTexture;
+		private System.Windows.Forms.CheckBox cbOverrideMiddleTexture;
+		private CodeImp.DoomBuilder.Controls.TextureSelectorControl bottom;
+		private System.Windows.Forms.CheckBox cbOverrideTopTexture;
+		private CodeImp.DoomBuilder.Controls.TextureSelectorControl middle;
+		private CodeImp.DoomBuilder.Controls.TextureSelectorControl top;
+		private System.Windows.Forms.GroupBox groupBox3;
+		private System.Windows.Forms.GroupBox groupBox4;
+		private System.Windows.Forms.Button filllower;
+		private System.Windows.Forms.Button fillmiddle;
+		private System.Windows.Forms.Button fillupper;
+		private System.Windows.Forms.Button fillfloor;
+		private System.Windows.Forms.Button fillceiling;
+		private System.Windows.Forms.ToolTip toolTip1;
+		private System.Windows.Forms.GroupBox groupBox5;
+		private System.Windows.Forms.Button clearlower;
+		private System.Windows.Forms.Button clearmiddle;
+		private System.Windows.Forms.Button clearupper;
+		private System.Windows.Forms.Button clearfloor;
+		private System.Windows.Forms.Button clearceiling;
+		private CodeImp.DoomBuilder.Controls.FlatSelectorControl floor;
+		private CodeImp.DoomBuilder.Controls.FlatSelectorControl ceiling;
+		private System.Windows.Forms.Button fillall;
+		private System.Windows.Forms.Button clearall;
+		private System.Windows.Forms.Button getheightandbrightnessfromselection;
+		private System.Windows.Forms.Button getsidetexturesfromselection;
+		private System.Windows.Forms.Button getsectortexturesfromselection;
+	}
+}
diff --git a/Source/Plugins/BuilderModes/Interface/SectorDrawingOptionsPanel.cs b/Source/Plugins/BuilderModes/Interface/SectorDrawingOptionsPanel.cs
new file mode 100644
index 0000000..237f18d
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/SectorDrawingOptionsPanel.cs
@@ -0,0 +1,574 @@
+#region ================== Namespaces
+
+using System;
+using System.Windows.Forms;
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Windows;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes.Interface
+{
+	public partial class SectorDrawingOptionsPanel : UserControl
+	{
+		#region ================== Constructor / Setup
+
+		public SectorDrawingOptionsPanel() 
+		{
+			InitializeComponent();
+		}
+
+		public void Setup() 
+		{
+			ceilHeight.Text = General.Map.Options.CustomCeilingHeight.ToString();
+			floorHeight.Text = General.Map.Options.CustomFloorHeight.ToString();
+			brightness.StepValues = General.Map.Config.BrightnessLevels;
+			brightness.Text = General.Map.Options.CustomBrightness.ToString();
+			ceiling.TextureName = General.Map.Options.DefaultCeilingTexture;
+			floor.TextureName = General.Map.Options.DefaultFloorTexture;
+			top.TextureName = General.Map.Options.DefaultTopTexture;
+			middle.TextureName = General.Map.Options.DefaultWallTexture;
+			bottom.TextureName = General.Map.Options.DefaultBottomTexture;
+
+			cbOverrideCeilingTexture.Checked = General.Map.Options.OverrideCeilingTexture;
+			cbOverrideFloorTexture.Checked = General.Map.Options.OverrideFloorTexture;
+			cbOverrideTopTexture.Checked = General.Map.Options.OverrideTopTexture;
+			cbOverrideMiddleTexture.Checked = General.Map.Options.OverrideMiddleTexture;
+			cbOverrideBottomTexture.Checked = General.Map.Options.OverrideBottomTexture;
+			cbCeilHeight.Checked = General.Map.Options.OverrideCeilingHeight;
+			cbFloorHeight.Checked = General.Map.Options.OverrideFloorHeight;
+			cbBrightness.Checked = General.Map.Options.OverrideBrightness;
+
+			getsectortexturesfromselection.Enabled = (cbOverrideCeilingTexture.Checked || cbOverrideFloorTexture.Checked);
+			getsidetexturesfromselection.Enabled = (cbOverrideTopTexture.Checked || cbOverrideMiddleTexture.Checked || cbOverrideBottomTexture.Checked);
+			getheightandbrightnessfromselection.Enabled = (cbCeilHeight.Checked || cbFloorHeight.Checked || cbBrightness.Checked);
+
+			ceiling.Enabled = cbOverrideCeilingTexture.Checked;
+			floor.Enabled = cbOverrideFloorTexture.Checked;
+			top.Enabled = cbOverrideTopTexture.Checked;
+			middle.Enabled = cbOverrideMiddleTexture.Checked;
+			bottom.Enabled = cbOverrideBottomTexture.Checked;
+			ceilHeight.Enabled = cbCeilHeight.Checked;
+			floorHeight.Enabled = cbFloorHeight.Checked;
+			brightness.Enabled = cbBrightness.Checked;
+		}
+
+		internal void Terminate()
+		{
+			ceiling.StopUpdate();
+			floor.StopUpdate();
+			top.StopUpdate();
+			middle.StopUpdate();
+			bottom.StopUpdate();
+		}
+
+		#endregion
+
+		#region ================== Checkbox Events
+
+		private void cbOverrideCeilingTexture_CheckedChanged(object sender, EventArgs e) 
+		{
+			ceiling.Enabled = cbOverrideCeilingTexture.Checked;
+			General.Map.Options.OverrideCeilingTexture = cbOverrideCeilingTexture.Checked;
+
+			getsectortexturesfromselection.Enabled = (cbOverrideCeilingTexture.Checked || cbOverrideFloorTexture.Checked);
+		}
+
+		private void cbOverrideFloorTexture_CheckedChanged(object sender, EventArgs e) 
+		{
+			floor.Enabled = cbOverrideFloorTexture.Checked;
+			General.Map.Options.OverrideFloorTexture = cbOverrideFloorTexture.Checked;
+		}
+
+		private void cbOverrideTopTexture_CheckedChanged(object sender, EventArgs e) 
+		{
+			top.Enabled = cbOverrideTopTexture.Checked;
+			General.Map.Options.OverrideTopTexture = cbOverrideTopTexture.Checked;
+
+			getsidetexturesfromselection.Enabled = (cbOverrideTopTexture.Checked || cbOverrideMiddleTexture.Checked || cbOverrideBottomTexture.Checked);
+		}
+
+		private void cbOverrideMiddleTexture_CheckedChanged(object sender, EventArgs e) 
+		{
+			middle.Enabled = cbOverrideMiddleTexture.Checked;
+			General.Map.Options.OverrideMiddleTexture = cbOverrideMiddleTexture.Checked;
+
+			getsidetexturesfromselection.Enabled = (cbOverrideTopTexture.Checked || cbOverrideMiddleTexture.Checked || cbOverrideBottomTexture.Checked);
+		}
+
+		private void cbOverrideBottomTexture_CheckedChanged(object sender, EventArgs e) 
+		{
+			bottom.Enabled = cbOverrideBottomTexture.Checked;
+			General.Map.Options.OverrideBottomTexture = cbOverrideBottomTexture.Checked;
+
+			getsidetexturesfromselection.Enabled = (cbOverrideTopTexture.Checked || cbOverrideMiddleTexture.Checked || cbOverrideBottomTexture.Checked);
+		}
+
+		private void cbCeilHeight_CheckedChanged(object sender, EventArgs e) 
+		{
+			ceilHeight.Enabled = cbCeilHeight.Checked;
+			General.Map.Options.OverrideCeilingHeight = cbCeilHeight.Checked;
+
+			getheightandbrightnessfromselection.Enabled = (cbCeilHeight.Checked || cbFloorHeight.Checked || cbBrightness.Checked);
+		}
+
+		private void cbFloorHeight_CheckedChanged(object sender, EventArgs e) 
+		{
+			floorHeight.Enabled = cbFloorHeight.Checked;
+			General.Map.Options.OverrideFloorHeight = cbFloorHeight.Checked;
+
+			getheightandbrightnessfromselection.Enabled = (cbCeilHeight.Checked || cbFloorHeight.Checked || cbBrightness.Checked);
+		}
+
+		private void cbBrightness_CheckedChanged(object sender, EventArgs e) 
+		{
+			brightness.Enabled = cbBrightness.Checked;
+			General.Map.Options.OverrideBrightness = cbBrightness.Checked;
+
+			getheightandbrightnessfromselection.Enabled = (cbCeilHeight.Checked || cbFloorHeight.Checked || cbBrightness.Checked);
+		}
+
+		#endregion
+
+		#region ================== Inputs Events
+
+		private void ceilHeight_WhenTextChanged(object sender, EventArgs e) 
+		{
+			General.Map.Options.CustomCeilingHeight = ceilHeight.GetResult(General.Map.Options.CustomCeilingHeight);
+		}
+
+		private void floorHeight_WhenTextChanged(object sender, EventArgs e) 
+		{
+			General.Map.Options.CustomFloorHeight = floorHeight.GetResult(General.Map.Options.CustomFloorHeight);
+		}
+
+		private void brightness_WhenTextChanged(object sender, EventArgs e) 
+		{
+			General.Map.Options.CustomBrightness = General.Clamp(brightness.GetResult(General.Map.Options.CustomBrightness), 0, 255);
+		}
+
+		private void ceiling_OnValueChanged(object sender, EventArgs e) 
+		{
+			General.Map.Options.DefaultCeilingTexture = ceiling.TextureName;
+		}
+
+		private void floor_OnValueChanged(object sender, EventArgs e) 
+		{
+			General.Map.Options.DefaultFloorTexture = floor.TextureName;
+		}
+
+		private void top_OnValueChanged(object sender, EventArgs e) 
+		{
+			General.Map.Options.DefaultTopTexture = top.TextureName;
+		}
+
+		private void middle_OnValueChanged(object sender, EventArgs e) 
+		{
+			General.Map.Options.DefaultWallTexture = middle.TextureName;
+		}
+
+		private void bottom_OnValueChanged(object sender, EventArgs e) 
+		{
+			General.Map.Options.DefaultBottomTexture = bottom.TextureName;
+		}
+
+		#endregion
+
+		#region ================== Texture Fill
+
+		private void fillceiling_Click(object sender, EventArgs e) 
+		{
+			ICollection<Sector> sectors = General.Map.Map.GetSelectedSectors(true);
+			if(sectors.Count == 0) return;
+
+			string undodesc = "sector";
+			if(sectors.Count > 1) undodesc = sectors.Count + " sectors";
+			General.Map.UndoRedo.CreateUndo("Clear ceiling texture from " + undodesc);
+
+			foreach(Sector s in sectors) s.SetCeilTexture(ceiling.TextureName);
+
+			// Update the used textures
+			General.Map.Data.UpdateUsedTextures();
+			General.Map.IsChanged = true;
+
+			if(General.Map.Renderer2D.ViewMode == Rendering.ViewMode.CeilingTextures)
+				General.Interface.RedrawDisplay();
+		}
+
+		private void fillfloor_Click(object sender, EventArgs e) 
+		{
+			ICollection<Sector> sectors = General.Map.Map.GetSelectedSectors(true);
+			if(sectors.Count == 0) return;
+
+			string undodesc = "sector";
+			if(sectors.Count > 1) undodesc = sectors.Count + " sectors";
+			General.Map.UndoRedo.CreateUndo("Clear ceiling texture from " + undodesc);
+
+			foreach(Sector s in sectors) s.SetFloorTexture(floor.TextureName);
+
+			// Update the used textures
+			General.Map.Data.UpdateUsedTextures();
+			General.Map.IsChanged = true;
+
+			if(General.Map.Renderer2D.ViewMode == Rendering.ViewMode.FloorTextures)
+				General.Interface.RedrawDisplay();
+		}
+
+		private void fillupper_Click(object sender, EventArgs e) 
+		{
+			ICollection<Linedef> lines = General.Map.Map.GetSelectedLinedefs(true);
+			if(lines.Count == 0) return;
+
+			string undodesc = "linedef";
+			if(lines.Count > 1) undodesc = lines.Count + " linedefs";
+			General.Map.UndoRedo.CreateUndo("Fill upper texture for " + undodesc);
+
+			foreach(Linedef l in lines) 
+			{
+				if(l.Front != null && l.Front.HighRequired()) l.Front.SetTextureHigh(top.TextureName);
+				if(l.Back != null && l.Back.HighRequired()) l.Back.SetTextureHigh(top.TextureName);
+			}
+
+			// Update the used textures
+			General.Map.Data.UpdateUsedTextures();
+			General.Map.IsChanged = true;
+		}
+
+		private void fillmiddle_Click(object sender, EventArgs e) 
+		{
+			ICollection<Linedef> lines = General.Map.Map.GetSelectedLinedefs(true);
+			if(lines.Count == 0) return;
+
+			string undodesc = "linedef";
+			if(lines.Count > 1) undodesc = lines.Count + " linedefs";
+			General.Map.UndoRedo.CreateUndo("Fill middle texture for " + undodesc);
+
+			foreach(Linedef l in lines) 
+			{
+				if(l.Front != null && l.Front.MiddleRequired()) l.Front.SetTextureMid(middle.TextureName);
+				if(l.Back != null && l.Back.MiddleRequired()) l.Back.SetTextureMid(middle.TextureName);
+			}
+
+			// Update the used textures
+			General.Map.Data.UpdateUsedTextures();
+			General.Map.IsChanged = true;
+		}
+
+		private void filllower_Click(object sender, EventArgs e) 
+		{
+			ICollection<Linedef> lines = General.Map.Map.GetSelectedLinedefs(true);
+			if(lines.Count == 0) return;
+
+			string undodesc = "linedef";
+			if(lines.Count > 1) undodesc = lines.Count + " linedefs";
+			General.Map.UndoRedo.CreateUndo("Fill lower texture for " + undodesc);
+
+			foreach(Linedef l in lines) 
+			{
+				if(l.Front != null && l.Front.LowRequired()) l.Front.SetTextureLow(bottom.TextureName);
+				if(l.Back != null && l.Back.LowRequired()) l.Back.SetTextureLow(bottom.TextureName);
+			}
+
+			// Update the used textures
+			General.Map.Data.UpdateUsedTextures();
+			General.Map.IsChanged = true;
+		}
+
+		private void fillall_Click(object sender, EventArgs e) 
+		{
+			ICollection<Sector> sectors = General.Map.Map.GetSelectedSectors(true);
+
+			//if we have selected sectors - fill their textures
+			if(sectors.Count > 0) 
+			{
+				//make undo
+				General.Map.UndoRedo.CreateUndo("Fill all texturs for " + sectors.Count + (sectors.Count > 1 ? " sectors" : " sector"));
+
+				foreach(Sector s in sectors) 
+				{
+					//fill sidedefs
+					foreach(Sidedef side in s.Sidedefs) 
+					{
+						if(top.Enabled && side.HighRequired()) side.SetTextureHigh(top.TextureName);
+						if(middle.Enabled && side.MiddleRequired()) side.SetTextureMid(middle.TextureName);
+						if(bottom.Enabled && side.LowRequired()) side.SetTextureLow(bottom.TextureName);
+					}
+
+					//fill flats
+					if(floor.Enabled) s.SetFloorTexture(floor.TextureName);
+					if(ceiling.Enabled) s.SetCeilTexture(ceiling.TextureName);
+				}
+			} 
+			else //if we don't - fill linedef textures
+			{ 
+				ICollection<Linedef> lines = General.Map.Map.GetSelectedLinedefs(true);
+				if(lines.Count == 0) return;
+
+				//make undo
+				General.Map.UndoRedo.CreateUndo("Fill all texturs for " + lines.Count + (lines.Count > 1 ? " linedefs" : " linedef"));
+
+				//fill textures
+				foreach(Linedef l in lines) 
+				{
+					if(top.Enabled) 
+					{
+						if(l.Front != null && l.Front.HighRequired()) l.Front.SetTextureHigh(top.TextureName);
+						if(l.Back != null && l.Back.HighRequired()) l.Back.SetTextureHigh(top.TextureName);
+					}
+					if(middle.Enabled) 
+					{
+						if(l.Front != null && l.Front.MiddleRequired()) l.Front.SetTextureMid(middle.TextureName);
+						if(l.Back != null && l.Back.MiddleRequired()) l.Back.SetTextureMid(middle.TextureName);
+					}
+					if(bottom.Enabled) 
+					{
+						if(l.Front != null && l.Front.LowRequired()) l.Front.SetTextureLow(bottom.TextureName);
+						if(l.Back != null && l.Back.LowRequired()) l.Back.SetTextureLow(bottom.TextureName);
+					}
+				}
+			}
+
+			// Update the used textures
+			General.Map.Data.UpdateUsedTextures();
+			General.Map.IsChanged = true;
+
+			// Update entire display
+			General.Map.Map.Update();
+			General.Interface.RedrawDisplay();
+		}
+
+		#endregion
+
+		#region ================== Clear Textures
+
+		private void clearceiling_Click(object sender, EventArgs e) 
+		{
+			ICollection<Sector> sectors = General.Map.Map.GetSelectedSectors(true);
+			if(sectors.Count == 0) return;
+
+			string undodesc = "sector";
+			if(sectors.Count > 1) undodesc = sectors.Count + " sectors";
+			General.Map.UndoRedo.CreateUndo("Clear ceiling texture from " + undodesc);
+
+			foreach(Sector s in sectors) s.SetCeilTexture("-");
+
+			// Update the used textures
+			General.Map.Data.UpdateUsedTextures();
+			General.Map.IsChanged = true;
+
+			// Update entire display
+			General.Map.Map.Update();
+			if(General.Map.Renderer2D.ViewMode == Rendering.ViewMode.CeilingTextures)
+				General.Interface.RedrawDisplay();
+		}
+
+		private void clearfloor_Click(object sender, EventArgs e) 
+		{
+			ICollection<Sector> sectors = General.Map.Map.GetSelectedSectors(true);
+			if(sectors.Count == 0) return;
+
+			string undodesc = "sector";
+			if(sectors.Count > 1) undodesc = sectors.Count + " sectors";
+			General.Map.UndoRedo.CreateUndo("Clear floor texture from " + undodesc);
+
+			foreach(Sector s in sectors) s.SetFloorTexture("-");
+
+			// Update the used textures
+			General.Map.Data.UpdateUsedTextures();
+			General.Map.IsChanged = true;
+
+			// Update entire display
+			General.Map.Map.Update();
+			if(General.Map.Renderer2D.ViewMode == Rendering.ViewMode.FloorTextures)
+				General.Interface.RedrawDisplay();
+		}
+
+		private void clearupper_Click(object sender, EventArgs e) 
+		{
+			ICollection<Linedef> lines = General.Map.Map.GetSelectedLinedefs(true);
+			if(lines.Count == 0) return;
+
+			string undodesc = "linedef";
+			if(lines.Count > 1) undodesc = lines.Count + " linedefs";
+			General.Map.UndoRedo.CreateUndo("Clear upper texture from " + undodesc);
+
+			foreach(Linedef l in lines) 
+			{
+				if(l.Front != null && l.Front.HighTexture != "-") l.Front.SetTextureHigh("-");
+				if(l.Back != null && l.Back.HighTexture != "-") l.Back.SetTextureHigh("-");
+			}
+
+			// Update the used textures
+			General.Map.Data.UpdateUsedTextures();
+			General.Map.IsChanged = true;
+		}
+
+		private void clearmiddle_Click(object sender, EventArgs e) 
+		{
+			ICollection<Linedef> lines = General.Map.Map.GetSelectedLinedefs(true);
+			if(lines.Count == 0) return;
+
+			string undodesc = "linedef";
+			if(lines.Count > 1) undodesc = lines.Count + " linedefs";
+			General.Map.UndoRedo.CreateUndo("Clear middle texture from " + undodesc);
+
+			foreach(Linedef l in lines) 
+			{
+				if(l.Front != null && l.Front.MiddleTexture != "-") l.Front.SetTextureMid("-");
+				if(l.Back != null && l.Back.MiddleTexture != "-") l.Back.SetTextureMid("-");
+			}
+
+			// Update the used textures
+			General.Map.Data.UpdateUsedTextures();
+			General.Map.IsChanged = true;
+		}
+
+		private void clearlower_Click(object sender, EventArgs e) 
+		{
+			ICollection<Linedef> lines = General.Map.Map.GetSelectedLinedefs(true);
+			if(lines.Count == 0) return;
+
+			string undodesc = "linedef";
+			if(lines.Count > 1) undodesc = lines.Count + " linedefs";
+			General.Map.UndoRedo.CreateUndo("Clear lower texture from " + undodesc);
+
+			foreach(Linedef l in lines) 
+			{
+				if(l.Front != null && l.Front.LowTexture != "-") l.Front.SetTextureLow("-");
+				if(l.Back != null && l.Back.LowTexture != "-") l.Back.SetTextureLow("-");
+			}
+
+			// Update the used textures
+			General.Map.Data.UpdateUsedTextures();
+			General.Map.IsChanged = true;
+		}
+
+		private void clearall_Click(object sender, EventArgs e) 
+		{
+			//if we have selected sectors - clear their textures
+			ICollection<Sector> sectors = General.Map.Map.GetSelectedSectors(true);
+			if(sectors.Count > 0) 
+			{
+				//make undo
+				string undodesc = "sector";
+				if(sectors.Count > 1) undodesc = sectors.Count + " sectors";
+				General.Map.UndoRedo.CreateUndo("Clear all texture from " + undodesc);
+				
+				foreach(Sector s in sectors) 
+				{
+					//clear side textures
+					foreach(Sidedef side in s.Sidedefs) 
+					{
+						if(side.HighTexture != "-") side.SetTextureHigh("-");
+						if(side.MiddleTexture != "-") side.SetTextureMid("-");
+						if(side.LowTexture != "-") side.SetTextureLow("-");
+					}
+
+					//clear flats
+					s.SetCeilTexture("-");
+					s.SetFloorTexture("-");
+				}
+
+			} 
+			else //if we don't - clear linedef textures
+			{
+				ICollection<Linedef> lines = General.Map.Map.GetSelectedLinedefs(true);
+				if(lines.Count == 0) return;
+
+				//make undo
+				string undodesc = "linedef";
+				if(lines.Count > 1) undodesc = lines.Count + " linedefs";
+				General.Map.UndoRedo.CreateUndo("Clear all texture from " + undodesc);
+
+				//clear textures
+				foreach(Linedef l in lines) 
+				{
+					if(l.Front != null) 
+					{
+						if(l.Front.HighTexture != "-") l.Front.SetTextureHigh("-");
+						if(l.Front.MiddleTexture != "-") l.Front.SetTextureMid("-");
+						if(l.Front.LowTexture != "-") l.Front.SetTextureLow("-");
+					} 
+					if(l.Back != null) 
+					{
+						if(l.Back.HighTexture != "-") l.Back.SetTextureHigh("-");
+						if(l.Back.MiddleTexture != "-") l.Back.SetTextureMid("-");
+						if(l.Back.LowTexture != "-") l.Back.SetTextureLow("-");
+					} 
+				}
+			}
+			
+			// Update the used textures
+			General.Map.Data.UpdateUsedTextures();
+			General.Map.IsChanged = true;
+
+			// Update entire display
+			General.Map.Map.Update();
+			General.Interface.RedrawDisplay();
+		}
+
+		#endregion
+
+		#region ================== Get Properties from Selection Events
+
+		private void getsectortexturesfromselection_Click(object sender, EventArgs e) 
+		{
+			ICollection<Sector> sectors = General.Map.Map.GetSelectedSectors(true);
+			if(sectors.Count == 0) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "This action requires selected sector");
+				return;
+			}
+
+			Sector s = General.GetByIndex(sectors, 0);
+			if(cbOverrideCeilingTexture.Checked) ceiling.TextureName = s.CeilTexture;
+			if(cbOverrideFloorTexture.Checked) floor.TextureName = s.FloorTexture;
+		}
+
+		private void getsidetexturesfromselection_Click(object sender, EventArgs e)
+		{
+			ICollection<Linedef> lines = General.Map.Map.GetSelectedLinedefs(true);
+			if(lines.Count == 0) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "This action requires selected linedef");
+				return;
+			}
+
+			Sidedef s = null;
+			foreach(Linedef l in lines)
+			{
+				s = (l.Front ?? l.Back);
+				if(s.MiddleTexture != "-" || s.HighTexture != "-" || s.LowTexture != "-") break;
+			}
+
+			if(s == null)
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "Selection doesn't contain suitable sidedefs");
+				return;
+			}
+
+			if(cbOverrideTopTexture.Checked) top.TextureName = s.HighTexture;
+			if(cbOverrideMiddleTexture.Checked) middle.TextureName = s.MiddleTexture;
+			if(cbOverrideBottomTexture.Checked) bottom.TextureName = s.LowTexture;
+		}
+
+		private void getheightandbrightnessfromselection_Click(object sender, EventArgs e) 
+		{
+			ICollection<Sector> sectors = General.Map.Map.GetSelectedSectors(true);
+			if(sectors.Count == 0) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "This action requires selected sector");
+				return;
+			}
+
+			Sector s = General.GetByIndex(sectors, 0);
+			if(cbCeilHeight.Checked) ceilHeight.Text = s.CeilHeight.ToString();
+			if(cbFloorHeight.Checked) floorHeight.Text = s.FloorHeight.ToString();
+			if(cbBrightness.Checked) brightness.Text = s.Brightness.ToString();
+		}
+
+		#endregion
+
+	}
+}
diff --git a/Source/Plugins/BuilderModes/Interface/SectorDrawingOptionsPanel.resx b/Source/Plugins/BuilderModes/Interface/SectorDrawingOptionsPanel.resx
new file mode 100644
index 0000000..9454f3d
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/SectorDrawingOptionsPanel.resx
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/BuilderModes/Interface/SelectSimilarElementOptionsPanel.Designer.cs b/Source/Plugins/BuilderModes/Interface/SelectSimilarElementOptionsPanel.Designer.cs
new file mode 100644
index 0000000..dbe3e6e
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/SelectSimilarElementOptionsPanel.Designer.cs
@@ -0,0 +1,266 @@
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	partial class SelectSimilarElementOptionsPanel
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing) 
+		{
+			if(disposing && (components != null)) 
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent() 
+		{
+			this.enableall = new System.Windows.Forms.Button();
+			this.apply = new System.Windows.Forms.Button();
+			this.cancel = new System.Windows.Forms.Button();
+			this.tabControl = new System.Windows.Forms.TabControl();
+			this.sectors = new System.Windows.Forms.TabPage();
+			this.sectorflags = new CodeImp.DoomBuilder.Controls.CheckboxArrayControl();
+			this.linedefs = new System.Windows.Forms.TabPage();
+			this.lineflags = new CodeImp.DoomBuilder.Controls.CheckboxArrayControl();
+			this.sidedefs = new System.Windows.Forms.TabPage();
+			this.sideflags = new CodeImp.DoomBuilder.Controls.CheckboxArrayControl();
+			this.things = new System.Windows.Forms.TabPage();
+			this.thingflags = new CodeImp.DoomBuilder.Controls.CheckboxArrayControl();
+			this.vertices = new System.Windows.Forms.TabPage();
+			this.vertexflags = new CodeImp.DoomBuilder.Controls.CheckboxArrayControl();
+			this.tabControl.SuspendLayout();
+			this.sectors.SuspendLayout();
+			this.linedefs.SuspendLayout();
+			this.sidedefs.SuspendLayout();
+			this.things.SuspendLayout();
+			this.vertices.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// enableall
+			// 
+			this.enableall.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.enableall.Location = new System.Drawing.Point(12, 194);
+			this.enableall.Name = "enableall";
+			this.enableall.Size = new System.Drawing.Size(120, 25);
+			this.enableall.TabIndex = 7;
+			this.enableall.Text = "Toggle All";
+			this.enableall.UseVisualStyleBackColor = true;
+			this.enableall.Click += new System.EventHandler(this.enableall_Click);
+			// 
+			// apply
+			// 
+			this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.apply.Location = new System.Drawing.Point(212, 194);
+			this.apply.Name = "apply";
+			this.apply.Size = new System.Drawing.Size(112, 25);
+			this.apply.TabIndex = 6;
+			this.apply.Text = "OK";
+			this.apply.UseVisualStyleBackColor = true;
+			this.apply.Click += new System.EventHandler(this.apply_Click);
+			// 
+			// cancel
+			// 
+			this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.cancel.Location = new System.Drawing.Point(330, 194);
+			this.cancel.Name = "cancel";
+			this.cancel.Size = new System.Drawing.Size(112, 25);
+			this.cancel.TabIndex = 5;
+			this.cancel.Text = "Cancel";
+			this.cancel.UseVisualStyleBackColor = true;
+			this.cancel.Click += new System.EventHandler(this.cancel_Click);
+			// 
+			// tabControl
+			// 
+			this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.tabControl.Controls.Add(this.sectors);
+			this.tabControl.Controls.Add(this.linedefs);
+			this.tabControl.Controls.Add(this.sidedefs);
+			this.tabControl.Controls.Add(this.things);
+			this.tabControl.Controls.Add(this.vertices);
+			this.tabControl.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.tabControl.Location = new System.Drawing.Point(12, 12);
+			this.tabControl.Name = "tabControl";
+			this.tabControl.Padding = new System.Drawing.Point(20, 3);
+			this.tabControl.SelectedIndex = 0;
+			this.tabControl.Size = new System.Drawing.Size(430, 178);
+			this.tabControl.TabIndex = 8;
+			// 
+			// sectors
+			// 
+			this.sectors.Controls.Add(this.sectorflags);
+			this.sectors.Location = new System.Drawing.Point(4, 22);
+			this.sectors.Name = "sectors";
+			this.sectors.Padding = new System.Windows.Forms.Padding(3);
+			this.sectors.Size = new System.Drawing.Size(422, 152);
+			this.sectors.TabIndex = 0;
+			this.sectors.Text = "Sectors";
+			this.sectors.UseVisualStyleBackColor = true;
+			// 
+			// sectorflags
+			// 
+			this.sectorflags.AutoScroll = true;
+			this.sectorflags.Columns = 2;
+			this.sectorflags.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.sectorflags.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.sectorflags.Location = new System.Drawing.Point(3, 3);
+			this.sectorflags.Name = "sectorflags";
+			this.sectorflags.Size = new System.Drawing.Size(416, 146);
+			this.sectorflags.TabIndex = 3;
+			this.sectorflags.VerticalSpacing = 1;
+			// 
+			// linedefs
+			// 
+			this.linedefs.Controls.Add(this.lineflags);
+			this.linedefs.Location = new System.Drawing.Point(4, 22);
+			this.linedefs.Name = "linedefs";
+			this.linedefs.Padding = new System.Windows.Forms.Padding(3);
+			this.linedefs.Size = new System.Drawing.Size(422, 152);
+			this.linedefs.TabIndex = 1;
+			this.linedefs.Text = "Linedefs";
+			this.linedefs.UseVisualStyleBackColor = true;
+			// 
+			// lineflags
+			// 
+			this.lineflags.AutoScroll = true;
+			this.lineflags.Columns = 2;
+			this.lineflags.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.lineflags.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.lineflags.Location = new System.Drawing.Point(3, 3);
+			this.lineflags.Name = "lineflags";
+			this.lineflags.Size = new System.Drawing.Size(416, 146);
+			this.lineflags.TabIndex = 3;
+			this.lineflags.VerticalSpacing = 1;
+			// 
+			// sidedefs
+			// 
+			this.sidedefs.Controls.Add(this.sideflags);
+			this.sidedefs.Location = new System.Drawing.Point(4, 22);
+			this.sidedefs.Name = "sidedefs";
+			this.sidedefs.Padding = new System.Windows.Forms.Padding(3);
+			this.sidedefs.Size = new System.Drawing.Size(422, 152);
+			this.sidedefs.TabIndex = 2;
+			this.sidedefs.Text = "Sidedefs";
+			this.sidedefs.UseVisualStyleBackColor = true;
+			// 
+			// sideflags
+			// 
+			this.sideflags.AutoScroll = true;
+			this.sideflags.Columns = 2;
+			this.sideflags.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.sideflags.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.sideflags.Location = new System.Drawing.Point(3, 3);
+			this.sideflags.Name = "sideflags";
+			this.sideflags.Size = new System.Drawing.Size(416, 146);
+			this.sideflags.TabIndex = 2;
+			this.sideflags.VerticalSpacing = 1;
+			// 
+			// things
+			// 
+			this.things.Controls.Add(this.thingflags);
+			this.things.Location = new System.Drawing.Point(4, 22);
+			this.things.Name = "things";
+			this.things.Padding = new System.Windows.Forms.Padding(3);
+			this.things.Size = new System.Drawing.Size(422, 152);
+			this.things.TabIndex = 3;
+			this.things.Text = "Things";
+			this.things.UseVisualStyleBackColor = true;
+			// 
+			// thingflags
+			// 
+			this.thingflags.AutoScroll = true;
+			this.thingflags.Columns = 2;
+			this.thingflags.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.thingflags.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.thingflags.Location = new System.Drawing.Point(3, 3);
+			this.thingflags.Name = "thingflags";
+			this.thingflags.Size = new System.Drawing.Size(416, 146);
+			this.thingflags.TabIndex = 2;
+			this.thingflags.VerticalSpacing = 1;
+			// 
+			// vertices
+			// 
+			this.vertices.Controls.Add(this.vertexflags);
+			this.vertices.Location = new System.Drawing.Point(4, 22);
+			this.vertices.Name = "vertices";
+			this.vertices.Padding = new System.Windows.Forms.Padding(3);
+			this.vertices.Size = new System.Drawing.Size(422, 152);
+			this.vertices.TabIndex = 4;
+			this.vertices.Text = "Vertices";
+			this.vertices.UseVisualStyleBackColor = true;
+			// 
+			// vertexflags
+			// 
+			this.vertexflags.AutoScroll = true;
+			this.vertexflags.Columns = 2;
+			this.vertexflags.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.vertexflags.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.vertexflags.Location = new System.Drawing.Point(3, 3);
+			this.vertexflags.Name = "vertexflags";
+			this.vertexflags.Size = new System.Drawing.Size(416, 146);
+			this.vertexflags.TabIndex = 1;
+			this.vertexflags.VerticalSpacing = 1;
+			// 
+			// SelectSimilarElementOptionsPanel
+			// 
+			this.AcceptButton = this.apply;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.CancelButton = this.cancel;
+			this.ClientSize = new System.Drawing.Size(454, 222);
+			this.Controls.Add(this.tabControl);
+			this.Controls.Add(this.enableall);
+			this.Controls.Add(this.apply);
+			this.Controls.Add(this.cancel);
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.MinimumSize = new System.Drawing.Size(300, 200);
+			this.Name = "SelectSimilarElementOptionsPanel";
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Selection Options";
+			this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.SelectSimilarElementOptionsPanel_FormClosing);
+			this.tabControl.ResumeLayout(false);
+			this.sectors.ResumeLayout(false);
+			this.linedefs.ResumeLayout(false);
+			this.sidedefs.ResumeLayout(false);
+			this.things.ResumeLayout(false);
+			this.vertices.ResumeLayout(false);
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Button enableall;
+		private System.Windows.Forms.Button apply;
+		private System.Windows.Forms.Button cancel;
+		private System.Windows.Forms.TabControl tabControl;
+		private System.Windows.Forms.TabPage sectors;
+		private CodeImp.DoomBuilder.Controls.CheckboxArrayControl sectorflags;
+		private System.Windows.Forms.TabPage linedefs;
+		private CodeImp.DoomBuilder.Controls.CheckboxArrayControl lineflags;
+		private System.Windows.Forms.TabPage sidedefs;
+		private CodeImp.DoomBuilder.Controls.CheckboxArrayControl sideflags;
+		private System.Windows.Forms.TabPage things;
+		private CodeImp.DoomBuilder.Controls.CheckboxArrayControl thingflags;
+		private System.Windows.Forms.TabPage vertices;
+		private CodeImp.DoomBuilder.Controls.CheckboxArrayControl vertexflags;
+	}
+}
\ No newline at end of file
diff --git a/Source/Plugins/BuilderModes/Interface/SelectSimilarElementOptionsPanel.cs b/Source/Plugins/BuilderModes/Interface/SelectSimilarElementOptionsPanel.cs
new file mode 100644
index 0000000..dcac386
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/SelectSimilarElementOptionsPanel.cs
@@ -0,0 +1,222 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Reflection;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Controls;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Windows;
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	public partial class SelectSimilarElementOptionsPanel : DelayedForm
+	{
+		private static Size size = Size.Empty;
+		private static Point location = Point.Empty;
+		private static readonly object[] flags = {
+			                                new SectorPropertiesCopySettings(),
+			                                new LinedefPropertiesCopySettings(),
+			                                new SidedefPropertiesCopySettings(),
+			                                new ThingPropertiesCopySettings(),
+			                                new VertexPropertiesCopySettings()
+		                                };
+
+		private BaseClassicMode mode;
+		private List<TabPage> showntabs;
+		private readonly Dictionary<CheckboxArrayControl, object> typecontrols;
+		
+		public SelectSimilarElementOptionsPanel() 
+		{
+			InitializeComponent();
+
+			//apply window size and location
+			if(!size.IsEmpty && !location.IsEmpty) 
+			{
+				this.StartPosition = FormStartPosition.Manual;
+				this.Size = size;
+				this.Location = location;
+			}
+
+			//create a collection
+			typecontrols = new Dictionary<CheckboxArrayControl, object>
+			{
+				{ sectorflags, flags[0] },
+				{ lineflags, flags[1] },
+				{ sideflags, flags[2] },
+				{ thingflags, flags[3] },
+				{ vertexflags, flags[4] }
+			};
+		}
+
+		public bool Setup(BaseClassicMode mode) 
+		{
+			this.mode = mode;
+
+			//which tabs should we display?
+			TabPage[] activetabs = null;
+			if(General.Editing.Mode is ThingsMode)
+			{
+				if(General.Map.Map.GetSelectedThings(true).Count == 0) return SetupFailed("This action requires selection...");
+				activetabs = new[] { things };
+			} 
+			else if(General.Editing.Mode is VerticesMode && General.Map.UDMF) 
+			{
+				if(General.Map.Map.GetSelectedVertices(true).Count == 0) return SetupFailed("This action requires selection...");
+				activetabs = new[] { vertices };
+			} 
+			else if(General.Editing.Mode is LinedefsMode) 
+			{
+				if(General.Map.Map.GetSelectedLinedefs(true).Count == 0) return SetupFailed("This action requires selection...");
+				activetabs = new[] { linedefs, sidedefs };
+			} 
+			else if(mode is SectorsMode) 
+			{
+				if(General.Map.Map.GetSelectedSectors(true).Count == 0) return SetupFailed("This action requires selection...");
+				activetabs = new[] { sectors };
+			}
+
+			if(activetabs == null) return SetupFailed("This action doesn't support current editing mode...");
+
+			//fill flags
+			showntabs = new List<TabPage>();
+			foreach(TabPage page in activetabs) 
+			{
+				CheckboxArrayControl curControl = page.Controls[0] as CheckboxArrayControl;
+				if(curControl == null) continue; //just a piece of boilerplate...
+
+				FieldInfo[] props = typecontrols[curControl].GetType().GetFields(BindingFlags.Public | BindingFlags.Instance);
+				foreach(var prop in props) 
+				{
+					foreach(Attribute attr in Attribute.GetCustomAttributes(prop)) 
+					{
+						if(attr.GetType() == typeof(FieldDescription)) 
+						{
+							FieldDescription fd = (FieldDescription)attr;
+							if(fd.SupportsCurrentMapFormat)
+								curControl.Add(fd.Description, prop.Name).Checked = (bool)prop.GetValue(typecontrols[curControl]);
+						}
+					}
+				}
+
+				if(curControl.Checkboxes.Count > 0)
+				{
+					curControl.PositionCheckboxes();
+					showntabs.Add(page);
+				}
+			}
+
+			// Got anything to show?
+			if(showntabs.Count == 0) return SetupFailed("This action doesn't support current editing mode...");
+
+			// Hide unused tab pages
+			tabControl.TabPages.Clear();
+			tabControl.TabPages.AddRange(showntabs.ToArray());
+			tabControl.SelectTab(showntabs[0]);
+
+			return true;
+		}
+
+		private static bool SetupFailed(string message)
+		{
+			General.Interface.DisplayStatus(StatusType.Warning, message);
+			return false;
+		}
+
+		private void SelectSimilarElementOptionsPanel_FormClosing(object sender, FormClosingEventArgs e) 
+		{
+			size = this.Size;
+			location = this.Location;
+		}
+
+		private void enableall_Click(object sender, EventArgs e) 
+		{
+			CheckboxArrayControl curControl = tabControl.SelectedTab.Controls[0] as CheckboxArrayControl;
+			if(curControl == null) return; //just a piece of boilerplate...
+			bool enable = !curControl.Checkboxes[0].Checked;
+			foreach(var cb in curControl.Checkboxes) cb.Checked = enable;
+		}
+
+		private void cancel_Click(object sender, EventArgs e) 
+		{
+			this.Close();
+		}
+
+		private void apply_Click(object sender, EventArgs e) 
+		{
+			//save flags states
+			foreach(TabPage page in showntabs)
+			{
+				CheckboxArrayControl curControl = page.Controls[0] as CheckboxArrayControl;
+				if(curControl == null) continue; //just a piece of boilerplate...
+
+				FieldInfo[] props = typecontrols[curControl].GetType().GetFields(BindingFlags.Public | BindingFlags.Instance);
+				var fields = new Dictionary<string, FieldInfo>(props.Length);
+				for(int i = 0; i < props.Length; i++) fields[props[i].Name] = props[i];
+				foreach(CheckBox cb in curControl.Checkboxes) fields[cb.Tag.ToString()].SetValue(typecontrols[curControl], cb.Checked);
+			}
+
+			//perform selection
+			if(mode is ThingsMode) 
+			{
+				ICollection<Thing> selected = General.Map.Map.GetSelectedThings(true);
+				ICollection<Thing> unselected = General.Map.Map.GetSelectedThings(false);
+
+				foreach(Thing target in unselected) 
+				{
+					foreach(Thing source in selected) 
+					{
+						if(PropertiesComparer.PropertiesMatch((ThingPropertiesCopySettings) typecontrols[thingflags], source, target))
+							mode.SelectMapElement(target);
+					}
+				}
+			} 
+			else if(mode is LinedefsMode) 
+			{
+				ICollection<Linedef> selected = General.Map.Map.GetSelectedLinedefs(true);
+				ICollection<Linedef> unselected = General.Map.Map.GetSelectedLinedefs(false);
+
+				foreach(Linedef target in unselected) 
+				{
+					foreach(Linedef source in selected) 
+					{
+						if(PropertiesComparer.PropertiesMatch((LinedefPropertiesCopySettings)typecontrols[lineflags], (SidedefPropertiesCopySettings)typecontrols[sideflags], source, target))
+							mode.SelectMapElement(target);
+					}
+				}
+			} 
+			else if(mode is SectorsMode) 
+			{
+				ICollection<Sector> selected = General.Map.Map.GetSelectedSectors(true);
+				ICollection<Sector> unselected = General.Map.Map.GetSelectedSectors(false);
+
+				foreach(Sector target in unselected) 
+				{
+					foreach(Sector source in selected) 
+					{
+						if(PropertiesComparer.PropertiesMatch((SectorPropertiesCopySettings)typecontrols[sectorflags], source, target))
+							mode.SelectMapElement(target);
+					}
+				}
+			} 
+			else if(mode is VerticesMode) 
+			{
+				ICollection<Vertex> selected = General.Map.Map.GetSelectedVertices(true);
+				ICollection<Vertex> unselected = General.Map.Map.GetSelectedVertices(false);
+
+				foreach(Vertex target in unselected) 
+				{
+					foreach(Vertex source in selected) 
+					{
+						if(PropertiesComparer.PropertiesMatch((VertexPropertiesCopySettings)typecontrols[vertexflags], source, target))
+							mode.SelectMapElement(target);
+					}
+				}
+
+			}
+
+			mode.UpdateSelectionInfo();
+			General.Interface.RedrawDisplay();
+			this.Close();
+		}
+	}
+}
diff --git a/Source/Plugins/BuilderModes/Interface/SelectSimilarElementOptionsPanel.resx b/Source/Plugins/BuilderModes/Interface/SelectSimilarElementOptionsPanel.resx
new file mode 100644
index 0000000..19dc0dd
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/SelectSimilarElementOptionsPanel.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/BuilderModes/Interface/UndoRedoPanel.Designer.cs b/Source/Plugins/BuilderModes/Interface/UndoRedoPanel.Designer.cs
new file mode 100644
index 0000000..a266188
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/UndoRedoPanel.Designer.cs
@@ -0,0 +1,76 @@
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	partial class UndoRedoPanel
+	{
+		/// <summary> 
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Component Designer generated code
+
+		/// <summary> 
+		/// Required method for Designer support - do not modify 
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.list = new CodeImp.DoomBuilder.Controls.OptimizedListView();
+			this.coldescription = new System.Windows.Forms.ColumnHeader();
+			this.SuspendLayout();
+			// 
+			// list
+			// 
+			this.list.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+            this.coldescription});
+			this.list.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.list.FullRowSelect = true;
+			this.list.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
+			this.list.Location = new System.Drawing.Point(0, 0);
+			this.list.MultiSelect = false;
+			this.list.Name = "list";
+			this.list.ShowGroups = false;
+			this.list.Size = new System.Drawing.Size(390, 548);
+			this.list.TabIndex = 1;
+			this.list.UseCompatibleStateImageBehavior = false;
+			this.list.View = System.Windows.Forms.View.Details;
+			this.list.Resize += new System.EventHandler(this.list_Resize);
+			this.list.SelectedIndexChanged += new System.EventHandler(this.list_SelectedIndexChanged);
+			this.list.MouseUp += new System.Windows.Forms.MouseEventHandler(this.list_MouseUp);
+			this.list.KeyUp += new System.Windows.Forms.KeyEventHandler(this.list_KeyUp);
+			// 
+			// coldescription
+			// 
+			this.coldescription.Text = "Description";
+			this.coldescription.Width = 238;
+			// 
+			// UndoRedoPanel
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.Controls.Add(this.list);
+			this.Name = "UndoRedoPanel";
+			this.Size = new System.Drawing.Size(390, 548);
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private CodeImp.DoomBuilder.Controls.OptimizedListView list;
+		private System.Windows.Forms.ColumnHeader coldescription;
+	}
+}
diff --git a/Source/Plugins/BuilderModes/Interface/UndoRedoPanel.cs b/Source/Plugins/BuilderModes/Interface/UndoRedoPanel.cs
new file mode 100644
index 0000000..4edc297
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/UndoRedoPanel.cs
@@ -0,0 +1,308 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Editing;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	public partial class UndoRedoPanel : UserControl
+	{
+		#region ================== Constants
+		
+		private const int MAX_DISPLAY_LEVELS = 400;
+		
+		#endregion
+		
+		#region ================== Variables
+		
+		private bool ignoreevents;
+		private int currentselection;
+		private int addindex;
+		private string begindescription;
+		
+		#endregion
+		
+		#region ================== Constructor
+		
+		// Constructor
+		public UndoRedoPanel()
+		{
+			InitializeComponent();
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+		
+		// This sets the description for the first item
+		public void SetBeginDescription(string description)
+		{
+			begindescription = description;
+		}
+		
+		// This refills the list
+		public void UpdateList()
+		{
+			ignoreevents = true;
+			currentselection = -1;
+			
+			// Check we have undo/redo capability
+			if((General.Map == null) || General.Map.IsDisposed || (General.Map.UndoRedo == null))
+			{
+				// No, clear the list
+				list.Items.Clear();
+				return;
+			}
+			
+			// Make complete list of levels
+			List<UndoSnapshot> levels = General.Map.UndoRedo.GetUndoList();
+			levels.Reverse();
+			int numundos = levels.Count;
+			levels.AddRange(General.Map.UndoRedo.GetRedoList());
+			//int numredos = levels.Count - numundos;
+			
+			// Determine the offset to show items at
+			int offset = numundos - (MAX_DISPLAY_LEVELS >> 1);
+			if((offset + MAX_DISPLAY_LEVELS) > levels.Count) offset = levels.Count - MAX_DISPLAY_LEVELS;
+			if(offset < 0) offset = 0;
+			
+			// Reset the list
+			list.SelectedItems.Clear();
+			list.BeginUpdate();
+			addindex = 0;
+			
+			// Add beginning
+			if(offset > 0)
+			{
+				// This indicates there is more above, but we don't display it
+				// because when the list gets too long it becomes slow
+				AddItem("...");
+			}
+			else
+			{
+				// Real beginning
+				ListViewItem firstitem = AddItem(begindescription);
+				
+				// Are we at the first item?
+				if(numundos == 0)
+				{
+					// Highlight the last undo level
+					firstitem.BackColor = SystemColors.Highlight;
+					firstitem.ForeColor = SystemColors.HighlightText;
+					currentselection = 0;
+				}
+				else
+				{
+					// Normal undo level
+					firstitem.ForeColor = SystemColors.WindowText;
+					firstitem.BackColor = SystemColors.Window;
+				}
+			}
+			
+			// Add levels!
+			for(int i = offset; i < levels.Count; i++)
+			{
+				// Add no more than the MAX_DISPLAY_LEVELS
+				ListViewItem item;
+				if((addindex - 1) == MAX_DISPLAY_LEVELS)
+					item = AddItem("...");
+				else
+					item = AddItem(levels[i].Description);
+				
+				// Color item
+				if(i == (numundos - 1))
+				{
+					// Highlight the last undo level
+					item.BackColor = SystemColors.Highlight;
+					item.ForeColor = SystemColors.HighlightText;
+					currentselection = addindex - 1;
+				}
+				else if(i >= numundos)
+				{
+					// Make gray because this is a redo level
+					item.ForeColor = SystemColors.GrayText;
+					item.BackColor = SystemColors.Control;
+				}
+				else
+				{
+					// Normal undo level
+					item.ForeColor = SystemColors.WindowText;
+					item.BackColor = SystemColors.Window;
+				}
+				
+				// Leave when list is full
+				if((addindex - 1) > MAX_DISPLAY_LEVELS)
+					break;
+			}
+			
+			// Remove the excessive items
+			for(int i = list.Items.Count - 1; i >= addindex; i--)
+				list.Items.RemoveAt(i);
+			
+			// We must always have the "selected" item in the list
+			if(currentselection == -1)
+				throw new Exception("Where is the selection?");
+				
+			// Make sure we can see the highlighted item
+			list.Items[currentselection].EnsureVisible();
+			
+			list.EndUpdate();
+			UpdateColumnSizes();
+			ignoreevents = false;
+		}
+		
+		// This updates/adds an item in the list
+		private ListViewItem AddItem(string text)
+		{
+			ListViewItem item;
+			if(addindex < list.Items.Count)
+			{
+				item = list.Items[addindex];
+				item.Text = text;
+			}
+			else
+			{
+				item = list.Items.Add(text);
+			}
+			addindex++;
+			return item;
+		}
+		
+		// This updates the list column size
+		private void UpdateColumnSizes()
+		{
+			// Check if a vertical scrollbar exists and adjust the column in the listbox accordingly
+			if((BuilderPlug.GetWindowLong(list.Handle, BuilderPlug.GWL_STYLE) & BuilderPlug.WS_VSCROLL) != 0)
+				coldescription.Width = list.ClientRectangle.Width - 2;
+			else
+				coldescription.Width = list.ClientRectangle.Width - SystemInformation.VerticalScrollBarWidth - 2;
+		}
+		
+		#endregion
+		
+		#region ================== Events
+		
+		// When layout changes
+		protected override void OnLayout(LayoutEventArgs e)
+		{
+			base.OnLayout(e);
+			UpdateColumnSizes();
+		}
+		
+		// Control resizes
+		private void list_Resize(object sender, EventArgs e)
+		{
+			UpdateColumnSizes();
+		}
+		
+		// Item selected
+		private void list_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if(ignoreevents) return;
+			
+			ignoreevents = true;
+			
+			// We must have something selected
+			if(list.SelectedIndices.Count > 0)
+			{
+				// Not the same as last selected?
+				int selectedindex = list.SelectedIndices[0];
+				if(selectedindex != currentselection)
+				{
+					// Recolor the elements in the list to match with the selection
+					list.BeginUpdate();
+					foreach(ListViewItem item in list.Items)
+					{
+						if(item.Index < selectedindex)
+						{
+							// Normal undo level
+							item.ForeColor = SystemColors.WindowText;
+							item.BackColor = SystemColors.Window;
+						}
+						else if(item.Index == selectedindex)
+						{
+							// Target level
+							item.BackColor = SystemColors.Highlight;
+							item.ForeColor = SystemColors.HighlightText;
+						}
+						else
+						{
+							// Make gray because this will become a redo level
+							item.ForeColor = SystemColors.GrayText;
+							item.BackColor = SystemColors.Control;
+						}
+					}
+					list.EndUpdate();
+				}
+			}
+
+			General.Interface.FocusDisplay();
+			
+			ignoreevents = false;
+		}
+		
+		// Mouse released
+		private void list_MouseUp(object sender, MouseEventArgs e)
+		{
+			ignoreevents = true;
+			
+			// We must have something selected
+			if(list.SelectedIndices.Count > 0)
+			{
+				// Not the same as last selected?
+				int selectedindex = list.SelectedIndices[0];
+				if(selectedindex != currentselection)
+				{
+					// Perform the undo/redos, the list will be updated automatically
+					int delta = currentselection - selectedindex;
+					if(delta < 0)
+						General.Map.UndoRedo.PerformRedo(-delta);
+					else
+						General.Map.UndoRedo.PerformUndo(delta);
+				}
+				else
+				{
+					list.SelectedIndices.Clear();
+				}
+			}
+
+			General.Interface.FocusDisplay();
+			
+			ignoreevents = false;
+		}
+		
+		// Key released
+		private void list_KeyUp(object sender, KeyEventArgs e)
+		{
+			ignoreevents = true;
+			
+			list.SelectedIndices.Clear();
+			General.Interface.FocusDisplay();
+			
+			ignoreevents = false;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/Interface/UndoRedoPanel.resx b/Source/Plugins/BuilderModes/Interface/UndoRedoPanel.resx
new file mode 100644
index 0000000..19dc0dd
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/UndoRedoPanel.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/BuilderModes/Interface/WavefrontSettingsForm.Designer.cs b/Source/Plugins/BuilderModes/Interface/WavefrontSettingsForm.Designer.cs
new file mode 100644
index 0000000..f51a4d6
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/WavefrontSettingsForm.Designer.cs
@@ -0,0 +1,194 @@
+namespace CodeImp.DoomBuilder.BuilderModes.Interface
+{
+	partial class WavefrontSettingsForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing) 
+		{
+			if(disposing && (components != null)) 
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent() 
+		{
+			this.tbExportPath = new System.Windows.Forms.TextBox();
+			this.label1 = new System.Windows.Forms.Label();
+			this.cbFixScale = new System.Windows.Forms.CheckBox();
+			this.export = new System.Windows.Forms.Button();
+			this.cancel = new System.Windows.Forms.Button();
+			this.saveFileDialog = new System.Windows.Forms.SaveFileDialog();
+			this.cbExportTextures = new System.Windows.Forms.CheckBox();
+			this.nudScale = new System.Windows.Forms.NumericUpDown();
+			this.label2 = new System.Windows.Forms.Label();
+			this.browse = new System.Windows.Forms.Button();
+			((System.ComponentModel.ISupportInitialize)(this.nudScale)).BeginInit();
+			this.SuspendLayout();
+			// 
+			// tbExportPath
+			// 
+			this.tbExportPath.Location = new System.Drawing.Point(55, 12);
+			this.tbExportPath.Name = "tbExportPath";
+			this.tbExportPath.Size = new System.Drawing.Size(344, 20);
+			this.tbExportPath.TabIndex = 0;
+			// 
+			// label1
+			// 
+			this.label1.AutoSize = true;
+			this.label1.Location = new System.Drawing.Point(18, 14);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(32, 13);
+			this.label1.TabIndex = 2;
+			this.label1.Text = "Path:";
+			// 
+			// cbFixScale
+			// 
+			this.cbFixScale.AutoSize = true;
+			this.cbFixScale.Location = new System.Drawing.Point(15, 64);
+			this.cbFixScale.Name = "cbFixScale";
+			this.cbFixScale.Size = new System.Drawing.Size(268, 17);
+			this.cbFixScale.TabIndex = 3;
+			this.cbFixScale.Text = "Export for GZDoom (increase vertical scale by 20%)";
+			this.cbFixScale.UseVisualStyleBackColor = true;
+			// 
+			// export
+			// 
+			this.export.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.export.Location = new System.Drawing.Point(279, 84);
+			this.export.Name = "export";
+			this.export.Size = new System.Drawing.Size(75, 23);
+			this.export.TabIndex = 4;
+			this.export.Text = "Export";
+			this.export.UseVisualStyleBackColor = true;
+			this.export.Click += new System.EventHandler(this.export_Click);
+			// 
+			// cancel
+			// 
+			this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.cancel.Location = new System.Drawing.Point(360, 84);
+			this.cancel.Name = "cancel";
+			this.cancel.Size = new System.Drawing.Size(75, 23);
+			this.cancel.TabIndex = 5;
+			this.cancel.Text = "Cancel";
+			this.cancel.UseVisualStyleBackColor = true;
+			this.cancel.Click += new System.EventHandler(this.cancel_Click);
+			// 
+			// saveFileDialog
+			// 
+			this.saveFileDialog.DefaultExt = "obj";
+			this.saveFileDialog.Filter = "Wavefront obj files|*.obj";
+			this.saveFileDialog.Title = "Select save location:";
+			// 
+			// cbExportTextures
+			// 
+			this.cbExportTextures.AutoSize = true;
+			this.cbExportTextures.Location = new System.Drawing.Point(15, 87);
+			this.cbExportTextures.Name = "cbExportTextures";
+			this.cbExportTextures.Size = new System.Drawing.Size(96, 17);
+			this.cbExportTextures.TabIndex = 6;
+			this.cbExportTextures.Text = "Export textures";
+			this.cbExportTextures.UseVisualStyleBackColor = true;
+			// 
+			// nudScale
+			// 
+			this.nudScale.DecimalPlaces = 4;
+			this.nudScale.Location = new System.Drawing.Point(55, 38);
+			this.nudScale.Maximum = new decimal(new int[] {
+            2048,
+            0,
+            0,
+            0});
+			this.nudScale.Minimum = new decimal(new int[] {
+            2048,
+            0,
+            0,
+            -2147483648});
+			this.nudScale.Name = "nudScale";
+			this.nudScale.Size = new System.Drawing.Size(94, 20);
+			this.nudScale.TabIndex = 8;
+			this.nudScale.Value = new decimal(new int[] {
+            1,
+            0,
+            0,
+            0});
+			// 
+			// label2
+			// 
+			this.label2.AutoSize = true;
+			this.label2.Location = new System.Drawing.Point(12, 40);
+			this.label2.Name = "label2";
+			this.label2.Size = new System.Drawing.Size(37, 13);
+			this.label2.TabIndex = 9;
+			this.label2.Text = "Scale:";
+			// 
+			// browse
+			// 
+			this.browse.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.Folder;
+			this.browse.Location = new System.Drawing.Point(405, 10);
+			this.browse.Name = "browse";
+			this.browse.Size = new System.Drawing.Size(30, 24);
+			this.browse.TabIndex = 1;
+			this.browse.UseVisualStyleBackColor = true;
+			this.browse.Click += new System.EventHandler(this.browse_Click);
+			// 
+			// WavefrontSettingsForm
+			// 
+			this.AcceptButton = this.export;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.CancelButton = this.cancel;
+			this.ClientSize = new System.Drawing.Size(447, 109);
+			this.Controls.Add(this.label2);
+			this.Controls.Add(this.nudScale);
+			this.Controls.Add(this.cbExportTextures);
+			this.Controls.Add(this.cancel);
+			this.Controls.Add(this.export);
+			this.Controls.Add(this.cbFixScale);
+			this.Controls.Add(this.label1);
+			this.Controls.Add(this.browse);
+			this.Controls.Add(this.tbExportPath);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "WavefrontSettingsForm";
+			this.Opacity = 1;
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.Text = "Export to Wavefront .obj";
+			((System.ComponentModel.ISupportInitialize)(this.nudScale)).EndInit();
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.TextBox tbExportPath;
+		private System.Windows.Forms.Button browse;
+		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.CheckBox cbFixScale;
+		private System.Windows.Forms.Button export;
+		private System.Windows.Forms.Button cancel;
+		private System.Windows.Forms.SaveFileDialog saveFileDialog;
+		private System.Windows.Forms.CheckBox cbExportTextures;
+		private System.Windows.Forms.NumericUpDown nudScale;
+		private System.Windows.Forms.Label label2;
+	}
+}
\ No newline at end of file
diff --git a/Source/Plugins/BuilderModes/Interface/WavefrontSettingsForm.cs b/Source/Plugins/BuilderModes/Interface/WavefrontSettingsForm.cs
new file mode 100644
index 0000000..7791c59
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/WavefrontSettingsForm.cs
@@ -0,0 +1,86 @@
+#region ================== Namespaces
+
+using System;
+using System.Windows.Forms;
+using System.IO;
+using CodeImp.DoomBuilder.Windows;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes.Interface
+{
+	public partial class WavefrontSettingsForm : DelayedForm
+	{
+		#region ================== Properties
+
+		public string FilePath { get { return tbExportPath.Text.Trim(); } }
+		public bool ExportTextures { get { return cbExportTextures.Checked; } }
+		public bool UseGZDoomScale { get { return cbFixScale.Checked; } }
+		public float ObjScale { get { return (float)nudScale.Value; } }
+
+		#endregion
+
+		public WavefrontSettingsForm(int sectorsCount) 
+		{
+			InitializeComponent();
+
+			string name = Path.GetFileNameWithoutExtension(General.Map.FileTitle) + "_" + General.Map.Options.LevelName + ".obj";
+			if(string.IsNullOrEmpty(General.Map.FilePathName)) 
+			{
+				saveFileDialog.FileName = name;
+			} 
+			else 
+			{
+				saveFileDialog.InitialDirectory = General.Map.FilePathName;
+				saveFileDialog.FileName = Path.GetDirectoryName(General.Map.FilePathName) + Path.DirectorySeparatorChar + name;
+				tbExportPath.Text = saveFileDialog.FileName;
+			}
+
+			//restore settings
+			cbExportTextures.Checked = General.Settings.ReadPluginSetting("objexporttextures", false);
+			cbFixScale.Checked = General.Settings.ReadPluginSetting("objgzdoomscale", false);
+			nudScale.Value = (decimal)General.Settings.ReadPluginSetting("objscale", 1.0f);
+
+			this.Text = "Export " + (sectorsCount == -1 ? "whole map" : sectorsCount + (sectorsCount > 1 ? "sectors" : "sector")) + " to Wavefront .obj";
+		}
+
+		#region ================== Events
+
+		private void browse_Click(object sender, EventArgs e) 
+		{
+			if(saveFileDialog.ShowDialog() == DialogResult.OK) 
+				tbExportPath.Text = saveFileDialog.FileName;
+		}
+
+		private void export_Click(object sender, EventArgs e) 
+		{
+			//check settings
+			if(nudScale.Value == 0) 
+			{
+				MessageBox.Show("Scale should not be zero!");
+				return;
+			}
+			if(!Directory.Exists(Path.GetDirectoryName(tbExportPath.Text))) 
+			{
+				MessageBox.Show("Selected path does not exist!");
+				return;
+			}
+
+			//save settings
+			General.Settings.WritePluginSetting("objexporttextures", cbExportTextures.Checked);
+			General.Settings.WritePluginSetting("objgzdoomscale", cbFixScale.Checked);
+			General.Settings.WritePluginSetting("objscale", (float)nudScale.Value);
+			
+			this.DialogResult = DialogResult.OK;
+			this.Close();
+		}
+
+		private void cancel_Click(object sender, EventArgs e) 
+		{
+			this.Close();
+		}
+
+		#endregion
+
+	}
+}
diff --git a/Source/Plugins/BuilderModes/Interface/WavefrontSettingsForm.resx b/Source/Plugins/BuilderModes/Interface/WavefrontSettingsForm.resx
new file mode 100644
index 0000000..d957dca
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Interface/WavefrontSettingsForm.resx
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs b/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..83e1b1a
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs
@@ -0,0 +1,31 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Builder Modes")]
+[assembly: AssemblyDescription("GZDoom Builder Editing Modes")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("CodeImp, MaxED")]
+[assembly: AssemblyProduct("Doom Builder")]
+[assembly: AssemblyCopyright("Copyright ©  2007, 2014")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("30d96659-77e7-4921-a52f-a854c1a36b7d")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+[assembly: AssemblyVersion("2.3.0.1885")]
diff --git a/Source/Plugins/BuilderModes/Properties/Resources.Designer.cs b/Source/Plugins/BuilderModes/Properties/Resources.Designer.cs
new file mode 100644
index 0000000..fae84f3
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Properties/Resources.Designer.cs
@@ -0,0 +1,533 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:4.0.30319.42000
+//
+//     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace CodeImp.DoomBuilder.BuilderModes.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
+    /// </summary>
+    // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
+    // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
+    // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
+    // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("CodeImp.DoomBuilder.BuilderModes.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
+        ///   Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap AlignThings {
+            get {
+                object obj = ResourceManager.GetObject("AlignThings", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Angle {
+            get {
+                object obj = ResourceManager.GetObject("Angle", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap BrightnessGradient {
+            get {
+                object obj = ResourceManager.GetObject("BrightnessGradient", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap CeilingAlign {
+            get {
+                object obj = ResourceManager.GetObject("CeilingAlign", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap CeilsGradient {
+            get {
+                object obj = ResourceManager.GetObject("CeilsGradient", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ColorPick {
+            get {
+                object obj = ResourceManager.GetObject("ColorPick", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Copy {
+            get {
+                object obj = ResourceManager.GetObject("Copy", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap CopyProperties {
+            get {
+                object obj = ResourceManager.GetObject("CopyProperties", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap CurveLines {
+            get {
+                object obj = ResourceManager.GetObject("CurveLines", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Door {
+            get {
+                object obj = ResourceManager.GetObject("Door", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap DrawCurveMode {
+            get {
+                object obj = ResourceManager.GetObject("DrawCurveMode", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap DrawEllipseMode {
+            get {
+                object obj = ResourceManager.GetObject("DrawEllipseMode", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap DrawGeometryMode {
+            get {
+                object obj = ResourceManager.GetObject("DrawGeometryMode", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap DrawGridMode {
+            get {
+                object obj = ResourceManager.GetObject("DrawGridMode", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap DrawRectangleMode {
+            get {
+                object obj = ResourceManager.GetObject("DrawRectangleMode", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap FilterThings {
+            get {
+                object obj = ResourceManager.GetObject("FilterThings", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Flip {
+            get {
+                object obj = ResourceManager.GetObject("Flip", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap FlipSelectionH {
+            get {
+                object obj = ResourceManager.GetObject("FlipSelectionH", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap FlipSelectionV {
+            get {
+                object obj = ResourceManager.GetObject("FlipSelectionV", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap FloorAlign {
+            get {
+                object obj = ResourceManager.GetObject("FloorAlign", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap FloorsGradient {
+            get {
+                object obj = ResourceManager.GetObject("FloorsGradient", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Folder {
+            get {
+                object obj = ResourceManager.GetObject("Folder", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Gear {
+            get {
+                object obj = ResourceManager.GetObject("Gear", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Hide {
+            get {
+                object obj = ResourceManager.GetObject("Hide", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap HideAll {
+            get {
+                object obj = ResourceManager.GetObject("HideAll", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Join {
+            get {
+                object obj = ResourceManager.GetObject("Join", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap List {
+            get {
+                object obj = ResourceManager.GetObject("List", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap List_Images {
+            get {
+                object obj = ResourceManager.GetObject("List_Images", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Merge {
+            get {
+                object obj = ResourceManager.GetObject("Merge", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap PasteProperties {
+            get {
+                object obj = ResourceManager.GetObject("PasteProperties", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap PastePropertiesOptions {
+            get {
+                object obj = ResourceManager.GetObject("PastePropertiesOptions", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap PlaceThings {
+            get {
+                object obj = ResourceManager.GetObject("PlaceThings", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Reset {
+            get {
+                object obj = ResourceManager.GetObject("Reset", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Save {
+            get {
+                object obj = ResourceManager.GetObject("Save", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap SelectThingsInSectors {
+            get {
+                object obj = ResourceManager.GetObject("SelectThingsInSectors", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap SelectTouching {
+            get {
+                object obj = ResourceManager.GetObject("SelectTouching", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Show {
+            get {
+                object obj = ResourceManager.GetObject("Show", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Show2 {
+            get {
+                object obj = ResourceManager.GetObject("Show2", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Show3 {
+            get {
+                object obj = ResourceManager.GetObject("Show3", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Similar {
+            get {
+                object obj = ResourceManager.GetObject("Similar", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Text {
+            get {
+                object obj = ResourceManager.GetObject("Text", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap TextureLock {
+            get {
+                object obj = ResourceManager.GetObject("TextureLock", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ThingPointAtCursor {
+            get {
+                object obj = ResourceManager.GetObject("ThingPointAtCursor", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap treeview {
+            get {
+                object obj = ResourceManager.GetObject("treeview", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ViewSelectionEffects {
+            get {
+                object obj = ResourceManager.GetObject("ViewSelectionEffects", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ViewSelectionIndex {
+            get {
+                object obj = ResourceManager.GetObject("ViewSelectionIndex", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap VisualModeGZ {
+            get {
+                object obj = ResourceManager.GetObject("VisualModeGZ", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+    }
+}
diff --git a/Source/Plugins/BuilderModes/Properties/Resources.resx b/Source/Plugins/BuilderModes/Properties/Resources.resx
new file mode 100644
index 0000000..b9203e3
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Properties/Resources.resx
@@ -0,0 +1,262 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="Join" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Join.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="FloorAlign" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\FloorAlign.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="DrawEllipseMode" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\DrawEllipseMode.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Copy" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Copy.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="VisualModeGZ" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\VisualModeGZ.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="DrawRectangleMode" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\DrawRectangleMode.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ViewSelectionEffects" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ViewSelectionEffects.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Gear" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Gear.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="HideAll" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\HideAll.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="PasteProperties" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\PasteProperties.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="List" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\List.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="DrawGridMode" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\DrawGridMode.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="PastePropertiesOptions" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\PastePropertiesOptions.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Hide" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Hide.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="CurveLines" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\CurveLines.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="AlignThings" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\AlignThings.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="treeview" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\treeview.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Similar" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Similar.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="FloorsGradient" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\FloorsGradient.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Save" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Save.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="SelectThingsInSectors" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\SelectThingsInSectors.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="CeilsGradient" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\CeilsGradient.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="CopyProperties" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\CopyProperties.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="SelectTouching" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\SelectTouching.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Merge" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Merge.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ThingPointAtCursor" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ThingPointAtCursor.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="PlaceThings" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\PlaceThings.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Text" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Text.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="BrightnessGradient" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\BrightnessGradient.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="FlipSelectionV" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\FlipSelectionV.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Door" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Door.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="TextureLock" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\TextureLock.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Reset" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Reset.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Show" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Show.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ViewSelectionIndex" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ViewSelectionIndex.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="DrawCurveMode" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\DrawCurveMode.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Show2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Show2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ColorPick" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ColorPick.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Flip" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Flip.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="FlipSelectionH" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\FlipSelectionH.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Folder" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Folder.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Angle" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Angle.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="List_Images" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\List_Images.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="DrawGeometryMode" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\DrawGeometryMode.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="CeilingAlign" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\CeilingAlign.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="FilterThings" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\FilterThings.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Show3" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Show3.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/BuilderModes/Resources/Actions.cfg b/Source/Plugins/BuilderModes/Resources/Actions.cfg
new file mode 100644
index 0000000..87a415f
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Resources/Actions.cfg
@@ -0,0 +1,1307 @@
+/******************************************\
+	Doom Builder Actions Configuration
+\******************************************/
+
+// Categories for the Controls preferences
+categories
+{
+	drawing = "Drawing";
+	linedefs = "Lines";
+	sectors = "Sectors";
+	things = "Things";
+}
+
+// This just defines which actions there are, what description they have and
+// some behaviour options. The Doom Builder core will bind to these actions
+// with delegates (function pointers) where you use the BeginAction and
+// EndAction attributes.
+
+// Behaviour options:
+//
+// allowkeys: Allows the user to bind standard keys to this action.
+// allowmouse: Allows the user to bind mouse buttons to this action.
+// allowscroll: Allows the user to bind the scrollwheel to this action.
+// disregardshift: This action will be triggered regardless if Shift is used.
+// disregardcontrol: This action will be triggered regardless if Control is used.
+// disregardalt: This action will be triggered regardless if Alt is used.
+// repeat: BeginAction will be called for automatic key repetition.
+//
+// allowkeys and allowmouse are true by default, the others are false by default.
+//
+
+verticesmode
+{
+	title = "Vertices Mode";
+	category = "modes";
+	description = "Switches to vertices editing mode.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+linedefsmode
+{
+	title = "Linedefs Mode";
+	category = "modes";
+	description = "Switches to linedefs editing mode.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+sectorsmode
+{
+	title = "Sectors Mode";
+	category = "modes";
+	description = "Switches to sectors editing mode.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+thingsmode
+{
+	title = "Things Mode";
+	category = "modes";
+	description = "Switches to things editing mode.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+drawlinesmode
+{
+	title = "Start Drawing";
+	category = "drawing";
+	description = "Starts drawing lines. See the Drawing category for actions available during drawing mode.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+//mxd
+drawrectanglemode
+{
+	title = "Start Rectangle Drawing";
+	category = "drawing";
+	description = "Starts drawing rectangle. Increase/Decrease Subdivision Level and Increase/Decrease Corners Bevel actions are avaliable in this mode.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	default = 196676;
+}
+
+//mxd
+drawellipsemode
+{
+	title = "Start Ellipse Drawing";
+	category = "drawing";
+	description = "Starts drawing ellipse. Increase/Decrease Subdivision Level and Increase/Decrease Corners Bevel actions are avaliable in this mode.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	default = 327748;
+}
+
+//mxd
+drawcurvemode
+{
+	title = "Start Curve Drawing";
+	category = "drawing";
+	description = "Starts drawing a curve. Increase/Decrease Subdivision Level actions are avaliable in this mode.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	default = 393284; //Ctrl-Alt-D
+}
+
+//mxd
+drawgridmode
+{
+	title = "Start Grid Drawing";
+	category = "drawing";
+	description = "Starts drawing a grid. Increase/Decrease Subdivision Level and Increase/Decrease Corners Bevel actions are avaliable in this mode.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+//mxd
+increasesubdivlevel
+{
+  title = "Increase Subdivision Level";
+	category = "drawing";
+	description = "Increases subdivision level in Rectangle and Ellipse Drawing Modes.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+  default = 131066;
+}
+
+//mxd
+decreasesubdivlevel
+{
+	title = "Decrease Subdivision Level";
+	category = "drawing";
+	description = "Decreases subdivision level in Rectangle and Ellipse Drawing Modes.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	default = 131067;
+}
+
+//mxd
+increasebevel
+{
+	title = "Increase Corners Bevel";
+	category = "drawing";
+	description = "Increase corners bevel in Rectangle Drawing Modes. Bevel can be negative.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	default = 196602;
+}
+
+//mxd
+decreasebevel
+{
+	title = "Decrease Corners Bevel";
+	category = "drawing";
+	description = "Decreases corners bevel in Rectangle Drawing Modes. Bevel can be negative.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	default = 196603;
+}
+
+//mxd
+bridgemode
+{
+	title = "Bridge Mode";
+	category = "drawing";
+	description = "Select two lines or two series of lines, then activate this tool to draw a bezier path between them.";
+	allowkeys = true;
+	allowmouse = false;
+	allowscroll = false;
+	default = 131138;
+}
+
+//mxd
+placethings
+{
+	title = "Place Things";
+	category = "edit";
+	description = "Creates things of given type and places them inside of selected sectors or on top of selected vertices.";
+	allowkeys = true;
+	allowmouse = false;
+	allowscroll = false;
+}
+
+//mxd
+selectsimilar
+{
+	title = "Select Similar Map Elements";
+	category = "edit";
+	description = "Selects map elements, similar to currently selected ones, based on a set of settings.";
+	allowkeys = true;
+	allowmouse = false;
+	allowscroll = false;
+}
+
+//mxd
+filterselectedthings
+{
+	title = "Filter Selected Things";
+	category = "things";
+	description = "Opens a window, which lets you pick thing type(s) you want to leave selected.";
+	allowkeys = true;
+	allowmouse = false;
+	allowscroll = false;
+}
+
+//mxd
+classicpaintselect
+{
+	title = "Paint Selection";
+	category = "classic";
+	description = "Selects or deselects items by dragging the mouse. Hold shift while dragging to toggle additive selection. Hold Ctrl while dragging to enable subtractive selection";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+	disregardshift = true;
+	disregardcontrol = true;
+	disregardalt = true;
+}
+
+drawpoint
+{
+	title = "Draw Vertex";
+	category = "drawing";
+	description = "Draws a vertex at the mousecursor position.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	disregardshift = true;
+	disregardcontrol = true;
+	disregardalt = true;
+}
+
+removepoint
+{
+	title = "Remove Previous Vertex";
+	category = "drawing";
+	description = "Removes the previously drawn vertex from the drawing session.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+finishdraw
+{
+	title = "Finish Drawing";
+	category = "drawing";
+	description = "Finishes the drawing and creates the geometry.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+selectsinglesided
+{
+	title = "Select Single-sided";
+	category = "linedefs";
+	description = "This keeps only the single-sided lines in your selection selected.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	default = 65585;
+}
+
+selectdoublesided
+{
+	title = "Select Double-sided";
+	category = "linedefs";
+	description = "This keeps only the double-sided lines in your selection selected.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	default = 65586;
+}
+
+fliplinedefs
+{
+	title = "Flip Linedefs";
+	category = "linedefs";
+	description = "This flips the selected linedefs around and keeps sidedefs on the correct side.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+flipsidedefs
+{
+	title = "Flip Sidedefs";
+	category = "linedefs";
+	description = "This flips the sidedefs on the selected linedefs around, keeping the line in the same direction.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+applylightfogflag
+{
+	title = "Apply 'lightfog' flag";
+	category = "linedefs";
+	description = "This applies 'lightfog' flag to all sidedefs within current selection (UDMF only).";
+	allowkeys = true;
+	allowmouse = false;
+	allowscroll = false;
+}
+
+curvelinesmode
+{
+	title = "Curve Linedefs";
+	category = "linedefs";
+	description = "Curves the selected linedefs with a given number of vertices and distance from the line.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+splitlinedefs
+{
+	title = "Split Linedefs";
+	category = "linedefs";
+	description = "Splits the selected linedefs in the middle, or splits the highlighted linedef at the mouse position.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+//mxd
+alignfloortofront
+{
+	title = "Align Floor Texture to Front Side";
+	category = "linedefs";
+	description = "Aligns floor textures to front sides of selected linedefs.";
+	allowkeys = true;
+	allowmouse = false;
+	allowscroll = false;
+}
+
+//mxd
+alignfloortoback
+{
+	title = "Align Floor Texture to Back Side";
+	category = "linedefs";
+	description = "Aligns floor textures to back sides of selected linedefs.";
+	allowkeys = true;
+	allowmouse = false;
+	allowscroll = false;
+}
+
+//mxd
+alignceilingtofront
+{
+	title = "Align Ceiling Texture to Front Side";
+	category = "linedefs";
+	description = "Aligns ceiling textures to front sides of selected linedefs.";
+	allowkeys = true;
+	allowmouse = false;
+	allowscroll = false;
+}
+
+//mxd
+alignceilingtoback
+{
+	title = "Align Ceiling Texture to Back Side";
+	category = "linedefs";
+	description = "Aligns ceiling textures to back sides of selected linedefs.";
+	allowkeys = true;
+	allowmouse = false;
+	allowscroll = false;
+}
+
+joinsectors
+{
+	title = "Join Sectors";
+	category = "sectors";
+	description = "Joins two or more selected sectors together and keeps all linedefs.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+mergesectors
+{
+	title = "Merge Sectors";
+	category = "sectors";
+	description = "Joins two or more selected sectors together and removes the shared linedefs.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+//mxd
+thingaligntowall
+{
+	title = "Align Things To Linedef";
+	category = "things";
+	description = "Aligns selected things to closest linedef.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	default = 196673; //ctrl-shift-a
+}
+
+//mxd
+thinglookatcursor
+{
+	title = "Point Thing to Cursor";
+	category = "things";
+	description = "Points selected things to cursor position. Hold Ctrl to point away from cursor.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	disregardcontrol = true;
+	default = 65612; //Shift-L 
+}
+
+//mxd
+syncedthingedit
+{
+	title = "Synchronized Things Editing";
+	category = "sectors";
+	description = "When enabled, things selection/dragging will be synchronized to sector selection/dragging in Sectors mode. Selected things will be dragged when dragging linedefs in Linedefs mode. Deleting sectors will delete selected things in Sectors mode.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+	default = 65620; //Shift-T
+}
+
+makesectormode
+{
+	title = "Make Sector Mode";
+	category = "modes";
+	description = "Switches to the Make Sector editing mode. This mode allows creating and/or fixing split sectors by clicking within a closed region.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+findmode
+{
+	title = "Find and Replace Mode";
+	category = "modes";
+	description = "Finds vertices, linedefs, sectors or things with a specific property, selects them and optionally replaces them with a given setting.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+editselectionmode
+{
+	title = "Edit Selection Mode";
+	category = "modes";
+	description = "Allows rotating, resizing and moving a selection.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+gradientbrightness
+{
+	title = "Make Brightness Gradient";
+	category = "sectors";
+	description = "Creates a brightness gradient over all selected sectors from the first to the last selected sector.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+gradientfloors
+{
+	title = "Make Floors Gradient";
+	category = "sectors";
+	description = "Creates a floor heights gradient over all selected sectors from the first to the last selected sector.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+gradientceilings
+{
+	title = "Make Ceilings Gradient";
+	category = "sectors";
+	description = "Creates a ceiling heights gradient over all selected sectors from the first to the last selected sector.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+makedoor
+{
+	title = "Make Door";
+	category = "sectors";
+	description = "Creates doors from the highlighted or selected sectors.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+lowerfloor8
+{
+	title = "Lower Floor by 8 mp";
+	category = "sectors";
+	description = "Lowers the highlighted or selected floor heights by 8 mp.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	repeat = true;
+  default = 458747;
+}
+
+raisefloor8
+{
+	title = "Raise Floor by 8 mp";
+	category = "sectors";
+	description = "Raises the highlighted or selected floor heights by 8 mp.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	repeat = true;
+  default = 458746;
+}
+
+lowerceiling8
+{
+	title = "Lower Ceiling by 8 mp";
+	category = "sectors";
+	description = "Lowers the highlighted or selected ceiling heights by 8 mp.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	repeat = true; 
+  default = 393211;
+}
+
+raiseceiling8
+{
+	title = "Raise Ceiling by 8 mp";
+	category = "sectors";
+	description = "Raises the highlighted or selected ceiling heights by 8 mp.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	repeat = true;
+  default = 393210;
+}
+
+errorcheckmode
+{
+	title = "Map Analysis Mode";
+	category = "modes";
+	description = "Checks your map for errors and mistakes and reports the results.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+lowersector8
+{
+	title = "Lower Floor/Ceiling/Thing by 8 mp";
+	category = "visual";
+	description = "Lowers the targeted or selected floors/ceilings by 8 mp. This also lowers selected or targeted things.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	repeat = true;
+}
+
+raisesector8
+{
+	title = "Raise Floor/Ceiling/Thing by 8 mp";
+	category = "visual";
+	description = "Raises the targeted or selected floors/ceilings by 8 mp. This also raises selected or targeted things.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	repeat = true;
+}
+
+lowersector1
+{
+	title = "Lower Floor/Ceiling/Thing by 1 mp";
+	category = "visual";
+	description = "Lowers the targeted or selected floors/ceilings by 1 mp. This also lowers selected or targeted things.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	repeat = true;
+}
+
+raisesector1
+{
+	title = "Raise Floor/Ceiling/Thing by 1 mp";
+	category = "visual";
+	description = "Raises the targeted or selected floors/ceilings by 1 mp. This also raises selected or targeted things.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	repeat = true;
+}
+
+//mxd
+lowersectortonearest
+{
+	title = "Lower Floor/Ceiling/Thing to adjacent Sector/Thing";
+	category = "visual";
+	description = "Lowers the targeted or selected floors/ceilings to match the height of adjacent sector. Hold Ctrl to lower to lowest surface in selection. Also drops targeted or selected things to the nearest floor or ceiling or on top of another thing.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	disregardcontrol = true;
+	default = 34; //PgDn
+}
+
+//mxd
+raisesectortonearest
+{
+	title = "Raise Floor/Ceiling/Thing to adjacent Sector/Thing";
+	category = "visual";
+	description = "Raises the targeted or selected floors/ceilings to match the height of adjacent sector. Hold Ctrl to raise to highest surface in selection. Also raises targeted or selected things to the nearest ceiling or floor or puts them on top of another thing.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	disregardcontrol = true;
+	default = 33; //PgUp
+}
+
+showvisualthings
+{
+	title = "Show Things";
+	category = "visual";
+	description = "Cycles through the different ways the things are shown in Visual Mode.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+raisebrightness8
+{
+	title = "Increase Brightness by 8";
+	category = "edit";
+	description = "Increases the targeted or selected sector brightness level by 8.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	repeat = true;
+}
+
+lowerbrightness8
+{
+	title = "Decrease Brightness by 8";
+	category = "edit";
+	description = "Decreases the targeted or selected sector brightness level by 8.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	repeat = true;
+}
+
+movetextureleft
+{
+	title = "Move Texture Left by 1";
+	category = "visual";
+	description = "Moves the offset of the targeted or selected textures to the left by 1 pixel.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	repeat = true;
+}
+
+movetextureright
+{
+	title = "Move Texture Right by 1";
+	category = "visual";
+	description = "Moves the offset of the targeted or selected textures to the right by 1 pixel.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	repeat = true;
+}
+
+movetextureup
+{
+	title = "Move Texture Up by 1";
+	category = "visual";
+	description = "Moves the offset of the targeted or selected textures up by 1 pixel.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	repeat = true;
+}
+
+movetexturedown
+{
+	title = "Move Texture Down by 1";
+	category = "visual";
+	description = "Moves the offset of the targeted or selected textures down by 1 pixel.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	repeat = true;
+}
+
+movetextureleft8
+{
+	title = "Move Texture Left by cur. grid size";
+	category = "visual";
+	description = "Moves the offset of the targeted or selected textures to the left by current grid size.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	repeat = true;
+	default = 65573;
+}
+
+movetextureright8
+{
+	title = "Move Texture Right by cur. grid size";
+	category = "visual";
+	description = "Moves the offset of the targeted or selected textures to the right by current grid size.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	repeat = true;
+	default = 65575;
+}
+
+movetextureup8
+{
+	title = "Move Texture Up by cur. grid size";
+	category = "visual";
+	description = "Moves the offset of the targeted or selected textures up by current grid size.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	repeat = true;
+	default = 65574;
+}
+
+movetexturedown8
+{
+	title = "Move Texture Down by cur. grid size";
+	category = "visual";
+	description = "Moves the offset of the targeted or selected textures down by current grid size.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	repeat = true;
+	default = 65576;
+}
+
+//mxd
+scaleup
+{
+	title = "Increase Scale";
+	category = "visual";
+	description = "Increases the scale of targeted or selected textures or things by 0.1 (UDMF only).";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	repeat = true;
+	default = 105; // Num 9
+}
+
+//mxd
+scaledown
+{
+	title = "Decrease Scale";
+	category = "visual";
+	description = "Decreases the scale of targeted or selected textures or things by 0.1 (UDMF only).";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	repeat = true;
+	default = 103; // Num 7
+}
+
+//mxd
+scaleupx
+{
+	title = "Increase Horizontal Scale";
+	category = "visual";
+	description = "Increases horizontal scale of targeted or selected textures or things by 0.1 (UDMF only).";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	repeat = true;
+	default = 102;
+}
+
+//mxd
+scaledownx
+{
+	title = "Decrease Horizontal Scale";
+	category = "visual";
+	description = "Decreases horizontal scale of targeted or selected textures or things by 0.1 (UDMF only).";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	repeat = true;
+	default = 100;
+}
+
+//mxd
+scaleupy
+{
+	title = "Increase Vertical Scale";
+	category = "visual";
+	description = "Increases vertical scale of targeted or selected textures or things by 0.1 (UDMF only).";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	repeat = true;
+	default = 104;
+}
+
+//mxd
+scaledowny
+{
+	title = "Decrease Vertical Scale";
+	category = "visual";
+	description = "Decreases vertical scale of targeted or selected textures or things by 0.1 (UDMF only).";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	repeat = true;
+	default = 101;
+}
+
+textureselect
+{
+	title = "Select Texture";
+	category = "visual";
+	description = "Opens the texture browser to select a texture for the targeted or selected walls, floors or ceilings.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+texturecopy
+{
+	title = "Copy Texture";
+	category = "visual";
+	description = "Copies the targeted texture or flat for pasting.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+texturepaste
+{
+	title = "Paste Texture";
+	category = "visual";
+	description = "Pastes the copied texture onto the targeted or selected walls, floors or ceilings.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+//mxd
+visualautoalign
+{
+	title = "Auto-align Textures X and Y";
+	category = "visual";
+	description = "Automatically aligns the neighbouring textures X and Y offsets until another texture is encountered.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	default = 131137; //Ctrl-A
+}
+
+visualautoalignx
+{
+	title = "Auto-align Textures X";
+	category = "visual";
+	description = "Automatically aligns the neighbouring textures X offsets until another texture is encountered.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+visualautoaligny
+{
+	title = "Auto-align Textures Y";
+	category = "visual";
+	description = "Automatically aligns the neighbouring textures Y offsets until another texture is encountered. The Y alignment only takes the ceiling height for each sidedef into account.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+//mxd
+visualautoaligntoselection
+{
+	title = "Auto-align Textures to Selection (X and Y)";
+	category = "visual";
+	description = "Automatically aligns the neighbouring textures X and Y offsets to selected sidedefs until another texture is encountered.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+//mxd
+visualautoaligntoselectionx
+{
+	title = "Auto-align Textures to Selection (X)";
+	category = "visual";
+	description = "Automatically aligns the neighbouring textures X offsets to selected sidedefs until another texture is encountered.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+//mxd
+visualautoaligntoselectiony
+{
+	title = "Auto-align Textures to Selection (Y)";
+	category = "visual";
+	description = "Automatically aligns the neighbouring textures Y offsets to selected sidedefs until another texture is encountered.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+//mxd
+visualfittextures
+{
+	title = "Fit Textures";
+	category = "visual";
+	description = "Scales textures to match the size of selected surfaces.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	default = 393281; //Ctrl-Alt-A
+}
+
+toggleupperunpegged
+{
+	title = "Toggle Upper Unpegged";
+	category = "visual";
+	description = "Toggles the Upper Unpegged setting on the selected or targeted linedef.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+togglelowerunpegged
+{
+	title = "Toggle Lower Unpegged";
+	category = "visual";
+	description = "Toggles the Lower Unpegged setting on the selected or targeted linedef.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+togglegravity
+{
+	title = "Toggle Gravity";
+	category = "visual";
+	description = "Toggles the use of gravity while moving around in visual mode. Turn gravity off to fly around, turn gravity on to walk on the sector floors.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+togglehighlight
+{
+	title = "Toggle Highlight";
+	category = "tools"; //mxd
+	description = "Toggles the highlight of the targeted and selected objects in Visual and Sectors modes.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	default = 72;	// H
+}
+
+resettexture
+{
+	title = "Reset Texture Offsets";
+	category = "visual";
+	description = "Resets the texture offsets of targeted or selected sidedefs (all map formats) and floors/ceilings (UDMF only). Also resets scale of targeted or selected things (UDMF only)";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+//mxd
+resettextureudmf
+{
+	title = "Reset Local Texture Offsets (UDMF)";
+	category = "visual";
+	description = "Resets upper/middle/lower texture offsets, scale and brightness of targeted or selected sidedefs. Resets texture offsets, rotation, scale and brightness of targeted or selected floors/ceilings. Resets scale, pitch and roll of targeted or selected things.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	default = 196690;	//Ctrl-Shift-R
+}
+
+texturecopyoffsets
+{
+	title = "Copy Offsets";
+	category = "visual";
+	description = "Copies the targeted texture offsets for pasting.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+texturepasteoffsets
+{
+	title = "Paste Offsets";
+	category = "visual";
+	description = "Pastes the copied texture offsets onto the targeted or selected walls.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+copyproperties
+{
+	title = "Copy Properties";
+	category = "visual";
+	description = "Copies the targeted object properties for pasting.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+pasteproperties
+{
+	title = "Paste Properties";
+	category = "visual";
+	description = "Pastes the copied properties onto the targeted or selected object.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	default = 393302;	// CTRL+ALT+V
+}
+
+//mxd
+pastepropertieswithoptions
+{
+	title = "Paste Properties Special";
+	category = "visual";
+	description = "Pastes the copied properties onto the highlighted or selected objects allowing you to choose the properties to paste.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	default = 196694;	// CTRL+SHIFT+V
+}
+
+//mxd
+toggleslope
+{
+	title = "Toggle Slope";
+	category = "visual";
+	description = "Toggles Slope for selected surfaces. Select or highlight upper/lower walls to add a slope. Select or highlight floors or ceilings to remove slope.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	default = 262227; //Alt-S
+}
+
+placevisualstart
+{
+	title = "Place Visual Mode Camera";
+	category = "classic";
+	description = "Places a new, or moves the existing, Visual Mode start thing to the mouse position. This thing will keep track where you left Visual Mode so that you return to Visual Mode in the same location.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+classiccopyproperties
+{
+	title = "Copy Properties";
+	category = "classic";
+	description = "Copies the properties of the highlighted or selected object for pasting.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	default = 196675;	// CTRL+SHIFT+C
+}
+
+classicpasteproperties
+{
+	title = "Paste Properties";
+	category = "classic";
+	description = "Pastes the copied properties onto the highlighted or selected objects.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	default = 393302;	// CTRL+ALT+V
+}
+
+//mxd
+classicpastepropertieswithoptions
+{
+	title = "Paste Properties Special";
+	category = "classic";
+	description = "Pastes the copied properties onto the highlighted or selected objects allowing you to choose the properties to paste.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	default = 196694;	// CTRL+SHIFT+V
+}
+
+floodfilltextures
+{
+	title = "Paste Texture Flood-Fill";
+	category = "visual";
+	description = "This allows you to flood-fill all adjacent textures or flats that are identical to the original with the copied texture.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	default = 65540;
+}
+
+flipselectionv
+{
+	title = "Flip Selection Vertically";
+	category = "edit";
+	description = "Flips the selection in Edit Selection mode vertically.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+flipselectionh
+{
+	title = "Flip Selection Horizontally";
+	category = "edit";
+	description = "Flips the selection in Edit Selection mode horizontally.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+//mxd
+rotateclockwise
+{
+	title = "Rotate Clockwise";
+	category = "edit";
+	description = "Rotates selected or highlighted things clockwise. Also rotates floor/ceiling textures in UDMF map format.";
+	allowkeys = true;
+	allowmouse = false;
+	allowscroll = true;
+	repeat = true;
+	default = 262138; // Ctrl + Shift + ScrollUp
+}
+
+//mxd
+rotatecounterclockwise
+{
+	title = "Rotate Counterclockwise";
+	category = "edit";
+	description = "Rotates selected or highlighted things counterclockwise. Also rotates floor/ceiling textures in UDMF map format.";
+	allowkeys = true;
+	allowmouse = false;
+	allowscroll = true;
+	repeat = true;
+	default = 262139; // Ctrl + Shift + ScrollDown
+}
+
+//mxd
+pitchclockwise
+{
+	title = "Change Pitch Clockwise";
+	category = "visual";
+	description = "Increases pitch of selected or highlighted things (UDMF only).";
+	allowkeys = true;
+	allowmouse = false;
+	allowscroll = true;
+	repeat = true;
+	default = 458746; // Ctrl + Alt + ScrollUp
+}
+
+//mxd
+pitchcounterclockwise
+{
+	title = "Change Pitch Counterclockwise";
+	category = "visual";
+	description = "Decreases pitch of selected or highlighted things (UDMF only).";
+	allowkeys = true;
+	allowmouse = false;
+	allowscroll = true;
+	repeat = true;
+	default = 458747; // Ctrl + Alt + ScrollDown
+}
+
+//mxd
+rollclockwise
+{
+	title = "Change Roll Clockwise";
+	category = "visual";
+	description = "Increases roll of selected or highlighted things (UDMF only).";
+	allowkeys = true;
+	allowmouse = false;
+	allowscroll = true;
+	repeat = true;
+	default = 327674; // Alt + ScrollUp
+}
+
+//mxd
+rollcounterclockwise
+{
+	title = "Change Roll Counterclockwise";
+	category = "visual";
+	description = "Decreases roll of selected or highlighted things (UDMF only).";
+	allowkeys = true;
+	allowmouse = false;
+	allowscroll = true;
+	repeat = true;
+	default = 327675; // Alt + ScrollDown
+}
+
+//mxd
+lookthroughthing
+{
+	title = "Look Through Selection";
+	category = "visual";
+	description = "Places visual camera at the same position as selected thing and rotates it to match thing's angle.";
+	allowkeys = true;
+	allowmouse = false;
+	allowscroll = true;
+	default = 89; //Y
+}
+
+//mxd
+matchbrightness
+{
+	title = "Match Brightness";
+	category = "visual";
+	description = "Makes the brightness of selected surfaces the same as the brightness of highlighted surface (UDMF only).";
+	allowkeys = true;
+	allowmouse = false;
+	allowscroll = false;
+  default = 131149; //Ctrl-M
+}
+
+//mxd. moved from GZDoomEditing plugin
+gzdbvisualmode
+{
+	title = "GZDB Visual Mode";
+	category = "modes";
+	description = "Switches to the (G)ZDoom visual editing mode. Hold Shift key to invert 'Synhcronise selection between Visual and Classic modes' setting.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+	disregardshift = true;
+	default = 81; //Q
+}
+
+//mxd.
+exporttoobj
+{
+	title = "Export to Wavefront .obj";
+	category = "tools";
+	description = "Exports selected sectors (or the whole map if no sectors selected) to Wavefront .obj";
+	allowkeys = true;
+	allowmouse = false;
+	allowscroll = false;
+}
+
+flooralignmode
+{
+	title = "Floor Align Mode";
+	category = "modes";
+	description = "Switches to the (G)ZDoom Floor Align mode.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+ceilingalignmode
+{
+	title = "Ceiling Align Mode";
+	category = "modes";
+	description = "Switches to the (G)ZDoom Ceiling Align mode.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+togglegzdoomgeometryeffects
+{
+	title = "Toggle Geometry Effects";
+	category = "visual";
+	description = "Toggles rendering of (G)ZDoom's geometry effects (slopes, 3D-floors etc.) in Visual mode.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+	default = 9; //Tab
+}
\ No newline at end of file
diff --git a/Source/Plugins/BuilderModes/Resources/AlignThings.png b/Source/Plugins/BuilderModes/Resources/AlignThings.png
new file mode 100644
index 0000000..c1bd5d4
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/AlignThings.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/Angle.png b/Source/Plugins/BuilderModes/Resources/Angle.png
new file mode 100644
index 0000000..a0d67d2
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/Angle.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/Blockmap.png b/Source/Plugins/BuilderModes/Resources/Blockmap.png
new file mode 100644
index 0000000..cb00844
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/Blockmap.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/BridgeMode.png b/Source/Plugins/BuilderModes/Resources/BridgeMode.png
new file mode 100644
index 0000000..b91f0ec
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/BridgeMode.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/BrightnessGradient.png b/Source/Plugins/BuilderModes/Resources/BrightnessGradient.png
new file mode 100644
index 0000000..f88afbe
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/BrightnessGradient.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/CeilingAlign.png b/Source/Plugins/BuilderModes/Resources/CeilingAlign.png
new file mode 100644
index 0000000..014137f
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/CeilingAlign.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/CeilsGradient.png b/Source/Plugins/BuilderModes/Resources/CeilsGradient.png
new file mode 100644
index 0000000..2a7a70a
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/CeilsGradient.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/ColorPick.png b/Source/Plugins/BuilderModes/Resources/ColorPick.png
new file mode 100644
index 0000000..e9d0ae1
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/ColorPick.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/Copy.png b/Source/Plugins/BuilderModes/Resources/Copy.png
new file mode 100644
index 0000000..cb3d871
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/Copy.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/CopyProperties.png b/Source/Plugins/BuilderModes/Resources/CopyProperties.png
new file mode 100644
index 0000000..d69a7d4
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/CopyProperties.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/CurveLines.png b/Source/Plugins/BuilderModes/Resources/CurveLines.png
new file mode 100644
index 0000000..1a213db
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/CurveLines.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/Door.png b/Source/Plugins/BuilderModes/Resources/Door.png
new file mode 100644
index 0000000..3482a8d
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/Door.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/DrawCurveMode.png b/Source/Plugins/BuilderModes/Resources/DrawCurveMode.png
new file mode 100644
index 0000000..ce2cc70
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/DrawCurveMode.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/DrawEllipseMode.png b/Source/Plugins/BuilderModes/Resources/DrawEllipseMode.png
new file mode 100644
index 0000000..380751e
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/DrawEllipseMode.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/DrawGeometryMode.png b/Source/Plugins/BuilderModes/Resources/DrawGeometryMode.png
new file mode 100644
index 0000000..5d8b4c7
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/DrawGeometryMode.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/DrawGridMode.png b/Source/Plugins/BuilderModes/Resources/DrawGridMode.png
new file mode 100644
index 0000000..f6953ec
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/DrawGridMode.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/DrawRectangleMode.png b/Source/Plugins/BuilderModes/Resources/DrawRectangleMode.png
new file mode 100644
index 0000000..0a7c095
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/DrawRectangleMode.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/FilterThings.png b/Source/Plugins/BuilderModes/Resources/FilterThings.png
new file mode 100644
index 0000000..2a44359
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/FilterThings.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/FindMode.png b/Source/Plugins/BuilderModes/Resources/FindMode.png
new file mode 100644
index 0000000..c108a2c
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/FindMode.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/Flip.png b/Source/Plugins/BuilderModes/Resources/Flip.png
new file mode 100644
index 0000000..80075cf
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/Flip.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/FlipSelectionH.png b/Source/Plugins/BuilderModes/Resources/FlipSelectionH.png
new file mode 100644
index 0000000..2407623
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/FlipSelectionH.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/FlipSelectionV.png b/Source/Plugins/BuilderModes/Resources/FlipSelectionV.png
new file mode 100644
index 0000000..cc9951c
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/FlipSelectionV.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/FloorAlign.png b/Source/Plugins/BuilderModes/Resources/FloorAlign.png
new file mode 100644
index 0000000..cadfacd
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/FloorAlign.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/FloorsGradient.png b/Source/Plugins/BuilderModes/Resources/FloorsGradient.png
new file mode 100644
index 0000000..3c9b47b
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/FloorsGradient.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/Folder.png b/Source/Plugins/BuilderModes/Resources/Folder.png
new file mode 100644
index 0000000..1d415fd
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/Folder.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/Gear.png b/Source/Plugins/BuilderModes/Resources/Gear.png
new file mode 100644
index 0000000..4d399e2
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/Gear.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/HeightsMode.png b/Source/Plugins/BuilderModes/Resources/HeightsMode.png
new file mode 100644
index 0000000..6a15ca9
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/HeightsMode.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/Hide.png b/Source/Plugins/BuilderModes/Resources/Hide.png
new file mode 100644
index 0000000..cef7d6e
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/Hide.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/HideAll.png b/Source/Plugins/BuilderModes/Resources/HideAll.png
new file mode 100644
index 0000000..d31b449
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/HideAll.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/Hints.cfg b/Source/Plugins/BuilderModes/Resources/Hints.cfg
new file mode 100644
index 0000000..2638070
--- /dev/null
+++ b/Source/Plugins/BuilderModes/Resources/Hints.cfg
@@ -0,0 +1,236 @@
+// This is GZDB hints configuration file. It's dev-only stuff so bare minimum of boilerplate is present in the parser class
+// (e.g. create your Hints.cfg exactly the way it's done here or face consequences).
+// "class" should exactly match your classname; "group" can be anything. "general" and "multiselection" groups are shown automatically when appropriate.
+// Supported tags are <b> for Bold and <br> for line break. Action name inside of <k> tag will insert keyboard shortcut for given action in bold.
+// Only single-line comments are supported.
+
+class VerticesMode
+group general
+"Hold <k>builder_pan_view</k> and move the mouse to pan the view"
+"Press <k>builder_classicselect</k> to select a vertex"
+"Hold <k>builder_classicselect</k> and drag to use rectangular selection"
+"Press <k>builder_clearselection</k> to clear selection"
+"Press <k>builder_insertitem</k> to insert a new vertex"
+"Press <k>builder_deleteitem</k> to delete selected vertices"
+"Press <k>builder_dissolveitem</k> to delete selected vertices and try to preserve surrounding geometry"
+"Press <k>builder_classicedit</k> to edit properties of current selection"
+"Use <k>builder_griddec</k> and <k>builder_gridinc</k> to change grid size"
+"Press <k>buildermodes_drawlinesmode</k> to start drawing lines"
+"Check <b>'Vertices'</b> menu for additional actions"
+
+group multiselection
+"Hold <b>Shift</b> to toggle additive selection"
+"Hold <b>Ctrl</b> to enable subtractive selection"
+"Hold <b>Ctrl-Shift</b> to intersect the new selection with already existing one"
+
+
+class LinedefsMode
+group general
+"Hold <k>builder_pan_view</k> and move the mouse to pan the view"
+"Press <k>builder_classicselect</k> to select a linedef"
+"Hold <k>builder_classicselect</k> and drag to use rectangular selection"
+"Press <k>builder_clearselection</k> to clear selection"
+"Press <k>builder_deleteitem</k> to delete selected linedef(s)"
+"Press <k>builder_dissolveitem</k> to delete selected linedef(s) and try to preserve surrounding geometry"
+"Press <k>builder_classicedit</k> to edit properties of current selection"
+"Use <k>builder_griddec</k> and <k>builder_gridinc</k> to change grid size"
+"Press <k>buildermodes_drawlinesmode</k> or <k>builder_insertitem</k> to start drawing lines"
+"Press <k>buildermodes_fliplinedefs</k> to flip the selected linedefs around keeping sidedefs on the correct side"
+"Press <k>buildermodes_selectsinglesided</k> to keep only the single-sided lines in your selection selected"
+"Press <k>buildermodes_selectdoublesided</k> to keep only the double-sided lines in your selection selected"
+"Check <b>'Linedefs'</b> menu for additional actions"
+
+group multiselection
+"Hold <b>Shift</b> to toggle additive selection"
+"Hold <b>Ctrl</b> to enable subtractive selection"
+"Hold <b>Ctrl-Shift</b> to intersect the new selection with already existing one"
+"Hold <b>Alt</b> to enable things (de)selection"
+
+
+class SectorsMode
+group general
+"Hold <k>builder_pan_view</k> and move the mouse to pan the view"
+"Press <k>builder_classicselect</k> to select a sector. Hold <b>Alt</b> to (de)select things inside of a sector"
+"Hold <k>builder_classicselect</k> and drag to use rectangular selection"
+"Press <k>builder_clearselection</k> to clear selection"
+"Press <k>builder_deleteitem</k> to delete selected sector(s)"
+"Press <k>builder_classicedit</k> to edit properties of current selection"
+"Use <k>builder_griddec</k> and <k>builder_gridinc</k> to change grid size"
+"Press <k>buildermodes_joinsectors</k> to join two or more selected sectors together and keep all linedefs"
+"Press <k>buildermodes_mergesectors</k> to join two or more selected sectors together and remove the shared inedefs"
+"Press <k>buildermodes_gradientbrightness</k> to create a brightness or color gradient over all selected sectors from the first to the last selected sector"
+"Press <k>buildermodes_gradientfloors</k> to create a floor heights gradient over all selected sectors from the first to the last selected sector"
+"Press <k>buildermodes_gradientceilings</k> to create a ceiling heights gradient over all selected sectors from the first to the last selected sector"
+"Press <k>buildermodes_makedoor</k> to create doors from the highlighted or selected sectors"
+"Press <k>buildermodes_drawlinesmode</k> or <k>builder_insertitem</k> to start drawing lines"
+"Check <b>'Sectors'</b> menu for additional actions"
+
+group multiselection
+"Hold <b>Shift</b> to toggle additive selection"
+"Hold <b>Ctrl</b> to enable subtractive selection"
+"Hold <b>Ctrl-Shift</b> to intersect the new selection with already existing one"
+"Hold <b>Alt</b> to enable things (de)selection"
+
+
+class ThingsMode
+group general
+"Hold <k>builder_pan_view</k> and move the mouse to pan the view"
+"Press <k>builder_classicselect</k> to select a thing"
+"Hold <k>builder_classicedit</k> to drag selected or highlighted things"
+"Hold <b>Shift-</b><k>builder_classicedit</k> to clone-drag selected or highlighted things"
+"Hold <k>builder_classicselect</k> and drag to use rectangular selection"
+"Press <k>builder_clearselection</k> to clear selection"
+"Press <k>builder_deleteitem</k> to delete selected thing(s)"
+"Press <k>builder_classicedit</k> to edit properties of current selection"
+"Use <k>builder_griddec</k> and <k>builder_gridinc</k> to change grid size"
+"Press <k>builder_insertitem</k> to create a new thing"
+"Press <k>buildermodes_thinglookatcursor</k> to point selected things to cursor position. Hold <b>Ctrl</b> to point away from cursor"
+"Press <k>buildermodes_thingaligntowall</k> to align selected things to closest linedef"
+"Press <k>buildermodes_drawlinesmode</k> to start drawing lines"
+"Check <b>'Things'</b> menu for additional actions"
+
+group multiselection
+"Hold <b>Shift</b> to toggle additive selection"
+"Hold <b>Ctrl</b> to enable subtractive selection"
+"Hold <b>Ctrl-Shift</b> to intersect the new selection with already existing one"
+
+
+class BaseVisualMode
+group general
+"Use <k>builder_moveforward</k>, <k>builder_movebackward</k>, <k>builder_moveleft</k> and <k>builder_moveright</k> to move around. Hold <b>Shift</b> to double the speed"
+"Use <k>builder_moveup</k> and <k>builder_movedown</k> to move up and down"
+"Press <k>builder_gztogglevisualvertices</k> to toggle vertex handles rendering (UDMF only)"
+
+group things
+"Use <k>builder_moveforward</k>, <k>builder_movebackward</k>, <k>builder_moveleft</k> and <k>builder_moveright</k> to move around. Hold <b>Shift</b> to double the speed"
+"Use <k>builder_moveup</k> and <k>builder_movedown</k> to move up and down"
+"Press <k>builder_gztogglevisualvertices</k> to toggle vertex handles rendering (UDMF only)"
+"Press <k>builder_insertitem</k> to insert a thing at current cursor position"
+"Press <k>builder_visualselect</k> to select the highlighted thing"
+"Press <k>builder_clearselection</k> to clear selection"
+"Press <k>builder_deleteitem</k> to delete selected things"
+"Use <k>buildermodes_raisesector8</k> and <k>buildermodes_lowersector8</k> to change height of selected/targeted things by 8 map units"
+"Use <k>buildermodes_lowersectortonearest</k> and <k>buildermodes_raisesectortonearest</k> to align selected/targeted things to floor or ceiling"
+"Use <k>builder_movethingfwd</k>, <k>builder_movethingback</k>, <k>builder_movethingleft</k> and <k>builder_movethingright</k> to move selected things around"
+"Use <k>buildermodes_scaleupx</k>, <k>buildermodes_scaledownx</k>, <k>buildermodes_scaleupy</k> and <k>buildermodes_scaledowny</k> to scale selected things (UDMF only)"
+"Press <k>builder_placethingatcursor</k> to move selected things to cursor location" 
+"Press <k>buildermodes_showvisualthings</k> to cycle through the different ways the things are shown"
+
+group sidedefs
+"Use <k>builder_moveforward</k>, <k>builder_movebackward</k>, <k>builder_moveleft</k> and <k>builder_moveright</k> to move around. Hold <b>Shift</b> to double the speed"
+"Use <k>builder_moveup</k> and <k>builder_movedown</k> to move up and down"
+"Press <k>builder_gztogglevisualvertices</k> to toggle vertex handles rendering (UDMF only)"
+"Press <k>builder_insertitem</k> to insert a thing at current cursor position"
+"Press <k>builder_visualselect</k> to select the highlighted surface. Hold <b>Shift</b> to select adjacent surfaces with the same texture. Hold <b>Ctrl</b> to select adjacent surfaces with the same height. Hold <b>Alt</b> to stop selecting adjacent surfaces when already selected surface is encountered"
+"Press <k>builder_deleteitem</k> to remove textures from selected surfaces"
+"Use <k>buildermodes_movetextureleft</k>, <k>buildermodes_movetextureright</k>, <k>buildermodes_movetextureup</k> and <k>buildermodes_movetexturedown</k> to change texture offsets by 1 mp."
+"Use <k>buildermodes_movetextureleft8</k>, <k>buildermodes_movetextureright8</k>, <k>buildermodes_movetextureup8</k> and <k>buildermodes_movetexturedown8</k> to change texture offsets by current grid size"
+"Use <k>buildermodes_scaleupx</k>, <k>buildermodes_scaledownx</k>, <k>buildermodes_scaleupy</k> and <k>buildermodes_scaledowny</k> to scale selected textures (UDMF only)"
+"Press <k>buildermodes_textureselect</k> to open texture browser"
+"Use <k>buildermodes_texturecopy</k>, <k>buildermodes_texturepaste</k> and <k>buildermodes_floodfilltextures</k> to copy,  paste and flood-fill highlighted texture"
+"Use <k>buildermodes_texturecopyoffsets</k> and <k>buildermodes_texturepasteoffsets</k> to copy and paste texture offsets"
+"Use <k>buildermodes_visualautoalignx</k>, <k>buildermodes_visualautoalign</k> or <k>buildermodes_visualautoalign</k> to auto align textures on X, Y and XY axis"
+"Use <k>buildermodes_visualfittextures</k> to fit texture's width or height to selected surfaces (UDMF only)"
+"Use <k>buildermodes_resettexture</k> to reset global texture offsets"
+"Use <k>buildermodes_resettextureudmf</k> to reset local texture offsets and scale (UDMF only)"
+"Use <k>buildermodes_toggleupperunpegged</k> or <k>buildermodes_togglelowerunpegged</k> to toggle Upper or Lower Unpegged setting"
+
+group sectors
+"Use <k>builder_moveforward</k>, <k>builder_movebackward</k>, <k>builder_moveleft</k> and <k>builder_moveright</k> to move around. Hold <b>Shift</b> to double the speed"
+"Use <k>builder_moveup</k> and <k>builder_movedown</k> to move up and down"
+"Press <k>builder_gztogglevisualvertices</k> to toggle vertex handles rendering (UDMF only)"
+"Press <k>builder_insertitem</k> to insert a thing at current cursor position"
+"Press <k>builder_visualselect</k> to select the highlighted surface. Hold <b>Shift</b> to select adjacent surfaces with the same texture. Hold <b>Ctrl</b> to select adjacent surfaces with the same height"
+"Press <k>builder_deleteitem</k> to remove textures from selected surfaces"
+"Use <k>buildermodes_movetextureleft</k>, <k>buildermodes_movetextureright</k>, <k>buildermodes_movetextureup</k> and <k>buildermodes_movetexturedown</k> to change texture offsets by 1 mp. (UDMF only)"
+"Use <k>buildermodes_movetextureleft8</k>, <k>buildermodes_movetextureright8</k>, <k>buildermodes_movetextureup8</k> and <k>buildermodes_movetexturedown8</k> to change texture offsets by current grid size (UDMF only)"
+"Use <k>buildermodes_scaleupx</k>, <k>buildermodes_scaledownx</k>, <k>buildermodes_scaleupy</k> and <k>buildermodes_scaledowny</k> to scale selected textures (UDMF only)"
+"Use <k>buildermodes_resettextureudmf</k> to reset local texture offsets and scale (UDMF only)"
+"Press <k>buildermodes_textureselect</k> to open texture browser"
+"Use <k>buildermodes_texturecopy</k> and <k>buildermodes_texturepaste</k> to copy and paste highlighted texture"
+
+
+group vertices
+"Use <k>builder_moveforward</k>, <k>builder_movebackward</k>, <k>builder_moveleft</k> and <k>builder_moveright</k> to move around. Hold <b>Shift</b> to double the speed"
+"Use <k>builder_moveup</k> and <k>builder_movedown</k> to move up and down"
+"Press <k>builder_gztogglevisualvertices</k> to toggle vertex handles rendering (UDMF only)"
+"Press <k>builder_insertitem</k> to insert a thing at current cursor position"
+"Press <k>builder_deleteitem</k> to reset vertex height offsets for selected vertex handles"
+
+
+class DragGeometryMode
+group general
+"Hold <b>Shift</b> to toggle grid snapping"
+"Hold <b>Ctrl</b> to toggle snapping to nearest vertex"
+"Hold <b>Alt</b> to snap by grid increment"
+"Hold <b>Alt - Shift</b> to snap to 4 cardinal directions"
+
+class DragThingsMode
+group general
+"Hold <b>Shift</b> to toggle grid snapping"
+"Hold <b>Ctrl</b> to toggle snapping to nearest vertex"
+"Hold <b>Alt</b> to snap by grid increment"
+"Hold <b>Alt - Shift</b> to snap to 4 cardinal directions"
+
+class DrawGeometryMode
+group general
+"Press <k>builder_classicselect</k> to place a vertex"
+"Press <k>buildermodes_removepoint</k> to remove last vertex"
+"Hold <b>Shift</b> to toggle grid snapping"
+"Hold <b>Ctrl</b> to toggle snapping to nearest vertex"
+"Hold <b>Alt - Shift</b> to snap to 8 cardinal directions"
+"Press <k>builder_acceptmode</k> to accept"
+"Press <k>builder_cancelmode</k> or <k>builder_classicedit</k> to cancel"
+
+
+class DrawCurveMode
+group general
+"Press <k>builder_classicselect</k> to place a vertex"
+"Use <k>buildermodes_increasesubdivlevel</k> and <k>buildermodes_decreasesubdivlevel</k> to change detail level of the curve"
+"Press <k>buildermodes_removepoint</k> to remove last vertex"
+"Hold <b>Shift</b> to toggle grid snapping"
+"Hold <b>Ctrl</b> to toggle snapping to nearest vertex"
+"Hold <b>Alt - Shift</b> to snap to 8 cardinal directions"
+"Press <k>builder_acceptmode</k> to accept"
+"Press <k>builder_cancelmode</k> or <k>builder_classicedit</k> to cancel"
+
+
+class DrawRectangleMode
+group general
+"Press <k>builder_classicselect</k> to place a vertex"
+"Use <k>buildermodes_increasebevel</k> and <k>buildermodes_decreasebevel</k> to change corners bevel by current grid size" 
+"Use <k>buildermodes_increasesubdivlevel</k> and <k>buildermodes_decreasesubdivlevel</k> to change bevel detail level"
+"Hold <b>Shift</b> to toggle grid snapping"
+"Hold <b>Ctrl</b> to toggle snapping to nearest vertex"
+"Hold <b>Alt - Shift</b> to snap to 4 cardinal directions"
+"Place second vertex to finish drawing"
+"Press <k>builder_cancelmode</k> or <k>builder_classicedit</k> to cancel"
+
+
+class DrawEllipseMode
+group general
+"Press <k>builder_classicselect</k> to place a vertex"
+"Use <k>buildermodes_increasebevel</k> and <k>buildermodes_decreasebevel</k> to change bevel by current grid size" 
+"Use <k>buildermodes_increasesubdivlevel</k> and <k>buildermodes_decreasesubdivlevel</k> to change the number of points in ellipse"
+"Hold <b>Shift</b> to toggle grid snapping"
+"Hold <b>Ctrl</b> to toggle snapping to nearest vertex"
+"Hold <b>Alt - Shift</b> to snap to 4 cardinal directions"
+"Place second vertex to finish drawing"
+"Press <k>builder_cancelmode</k> or <k>builder_classicedit</k> to cancel"
+
+
+class DrawGridMode
+group general
+"Use <k>buildermodes_increasebevel</k> and <k>buildermodes_decreasebevel</k> to change the number of horizontal slices"
+"Use <k>buildermodes_increasesubdivlevel</k> and <k>buildermodes_decreasesubdivlevel</k> to change the number of vertical slices"
+"Hold <b>Shift</b> to toggle grid snapping"
+"Hold <b>Ctrl</b> to toggle snapping to nearest vertex"
+"Hold <b>Alt - Shift</b> to snap to 4 cardinal directions"
+"Place second vertex to finish drawing"
+"Press <k>builder_cancelmode</k> or <k>builder_classicedit</k> to cancel"
+
+group gridlockhelp
+"Use <k>builder_griddec</k> and <k>builder_gridinc</k> to change grid size."
+"Hold <b>Alt - Shift</b> to snap to 4 cardinal directions"
+"Place second vertex to finish drawing"
+"Press <k>builder_cancelmode</k> or <k>builder_classicedit</k> to cancel"
\ No newline at end of file
diff --git a/Source/Plugins/BuilderModes/Resources/Join.png b/Source/Plugins/BuilderModes/Resources/Join.png
new file mode 100644
index 0000000..7a54e8b
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/Join.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/LinesMode.png b/Source/Plugins/BuilderModes/Resources/LinesMode.png
new file mode 100644
index 0000000..aa96cfd
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/LinesMode.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/List.png b/Source/Plugins/BuilderModes/Resources/List.png
new file mode 100644
index 0000000..acc30b8
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/List.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/List_Images.png b/Source/Plugins/BuilderModes/Resources/List_Images.png
new file mode 100644
index 0000000..248eaf1
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/List_Images.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/MapAnalysisMode.png b/Source/Plugins/BuilderModes/Resources/MapAnalysisMode.png
new file mode 100644
index 0000000..ad1cc7f
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/MapAnalysisMode.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/Merge.png b/Source/Plugins/BuilderModes/Resources/Merge.png
new file mode 100644
index 0000000..bedbee4
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/Merge.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/NewSector2.png b/Source/Plugins/BuilderModes/Resources/NewSector2.png
new file mode 100644
index 0000000..dbdbe09
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/NewSector2.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/PasteProperties.png b/Source/Plugins/BuilderModes/Resources/PasteProperties.png
new file mode 100644
index 0000000..55a76db
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/PasteProperties.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/PastePropertiesOptions.png b/Source/Plugins/BuilderModes/Resources/PastePropertiesOptions.png
new file mode 100644
index 0000000..f8a7bd6
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/PastePropertiesOptions.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/PlaceThings.png b/Source/Plugins/BuilderModes/Resources/PlaceThings.png
new file mode 100644
index 0000000..3d128fa
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/PlaceThings.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/Reset.png b/Source/Plugins/BuilderModes/Resources/Reset.png
new file mode 100644
index 0000000..2e09b44
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/Reset.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/Save.png b/Source/Plugins/BuilderModes/Resources/Save.png
new file mode 100644
index 0000000..e4adbbc
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/Save.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/SectorsMode.png b/Source/Plugins/BuilderModes/Resources/SectorsMode.png
new file mode 100644
index 0000000..a804452
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/SectorsMode.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/SelectThingsInSectors.png b/Source/Plugins/BuilderModes/Resources/SelectThingsInSectors.png
new file mode 100644
index 0000000..876b237
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/SelectThingsInSectors.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/SelectTouching.png b/Source/Plugins/BuilderModes/Resources/SelectTouching.png
new file mode 100644
index 0000000..a4f7a2b
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/SelectTouching.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/Selection3.png b/Source/Plugins/BuilderModes/Resources/Selection3.png
new file mode 100644
index 0000000..5418b6e
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/Selection3.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/Show.png b/Source/Plugins/BuilderModes/Resources/Show.png
new file mode 100644
index 0000000..73ddfbf
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/Show.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/Show2.png b/Source/Plugins/BuilderModes/Resources/Show2.png
new file mode 100644
index 0000000..9a7ac7b
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/Show2.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/Show3.png b/Source/Plugins/BuilderModes/Resources/Show3.png
new file mode 100644
index 0000000..af32258
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/Show3.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/Similar.png b/Source/Plugins/BuilderModes/Resources/Similar.png
new file mode 100644
index 0000000..94de1a1
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/Similar.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/Text.png b/Source/Plugins/BuilderModes/Resources/Text.png
new file mode 100644
index 0000000..82b80f3
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/Text.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/TextureLock.png b/Source/Plugins/BuilderModes/Resources/TextureLock.png
new file mode 100644
index 0000000..8867a54
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/TextureLock.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/ThingPointAtCursor.png b/Source/Plugins/BuilderModes/Resources/ThingPointAtCursor.png
new file mode 100644
index 0000000..254e723
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/ThingPointAtCursor.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/ThingsMode.png b/Source/Plugins/BuilderModes/Resources/ThingsMode.png
new file mode 100644
index 0000000..2bfc8a8
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/ThingsMode.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/TriangulatorMode.png b/Source/Plugins/BuilderModes/Resources/TriangulatorMode.png
new file mode 100644
index 0000000..22a883d
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/TriangulatorMode.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/VerticesMode.png b/Source/Plugins/BuilderModes/Resources/VerticesMode.png
new file mode 100644
index 0000000..891363d
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/VerticesMode.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/ViewSelectionEffects.png b/Source/Plugins/BuilderModes/Resources/ViewSelectionEffects.png
new file mode 100644
index 0000000..00df6ed
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/ViewSelectionEffects.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/ViewSelectionIndex.png b/Source/Plugins/BuilderModes/Resources/ViewSelectionIndex.png
new file mode 100644
index 0000000..96b7756
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/ViewSelectionIndex.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/VisualModeGZ.png b/Source/Plugins/BuilderModes/Resources/VisualModeGZ.png
new file mode 100644
index 0000000..d6a4378
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/VisualModeGZ.png differ
diff --git a/Source/Plugins/BuilderModes/Resources/treeview.png b/Source/Plugins/BuilderModes/Resources/treeview.png
new file mode 100644
index 0000000..0bbd274
Binary files /dev/null and b/Source/Plugins/BuilderModes/Resources/treeview.png differ
diff --git a/Source/Plugins/BuilderModes/VisualModes/BaseVisualGeometrySector.cs b/Source/Plugins/BuilderModes/VisualModes/BaseVisualGeometrySector.cs
new file mode 100644
index 0000000..a297758
--- /dev/null
+++ b/Source/Plugins/BuilderModes/VisualModes/BaseVisualGeometrySector.cs
@@ -0,0 +1,953 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Data;
+using CodeImp.DoomBuilder.IO;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.VisualModes;
+using CodeImp.DoomBuilder.Windows;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	internal abstract class BaseVisualGeometrySector : VisualGeometry, IVisualEventReceiver
+	{
+		#region ================== Constants
+
+		private const float DRAG_ANGLE_TOLERANCE = 0.06f;
+
+		#endregion
+
+		#region ================== Variables
+
+		protected readonly BaseVisualMode mode;
+		protected long setuponloadedtexture;
+
+		// This is only used to see if this object has already received a change
+		// in a multiselection. The Changed property on the BaseVisualSector is
+		// used to indicate a rebuild is needed.
+		protected bool changed;
+
+		protected SectorLevel level;
+		protected Effect3DFloor extrafloor;
+		
+		// Undo/redo
+		private int undoticket;
+		
+		// UV dragging
+		private float dragstartanglexy;
+		private float dragstartanglez;
+		private Vector3D dragorigin;
+		private int startoffsetx;
+		private int startoffsety;
+		protected bool uvdragging;
+		private int prevoffsetx;		// We have to provide delta offsets, but I don't
+		private int prevoffsety;		// want to calculate with delta offsets to prevent
+										// inaccuracy in the dragging.
+
+		private static List<BaseVisualSector> updateList; //mxd
+
+		#endregion
+
+		#region ================== Properties
+		
+		new public BaseVisualSector Sector { get { return (BaseVisualSector)base.Sector; } }
+		public bool Changed { get { return changed; } set { changed = value; } }
+		public SectorLevel Level { get { return level; } }
+		public Effect3DFloor ExtraFloor { get { return extrafloor; } }
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		// Constructor
+		protected BaseVisualGeometrySector(BaseVisualMode mode, VisualSector vs) : base(vs)
+		{
+			this.mode = mode;
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This changes the height
+		protected abstract void ChangeHeight(int amount);
+		protected abstract void ChangeTextureScale(int incrementX, int incrementY); //mxd
+		public virtual void SelectNeighbours(bool select, bool withSameTexture, bool withSameHeight) { } //mxd
+
+		// This swaps triangles so that the plane faces the other way
+		protected static void SwapTriangleVertices(WorldVertex[] verts)
+		{
+			// Swap some vertices to flip all triangles
+			for(int i = 0; i < verts.Length; i += 3)
+			{
+				// Swap
+				WorldVertex v = verts[i];
+				verts[i] = verts[i + 1];
+				verts[i + 1] = v;
+			}
+		}
+
+		// This is called to update UV dragging
+		protected virtual void UpdateDragUV()
+		{
+			float u_ray = 1.0f;
+
+			// Calculate intersection position
+			this.Level.plane.GetIntersection(General.Map.VisualCamera.Position, General.Map.VisualCamera.Target, ref u_ray);
+			Vector3D intersect = General.Map.VisualCamera.Position + (General.Map.VisualCamera.Target - General.Map.VisualCamera.Position) * u_ray;
+
+			// Calculate offsets
+			Vector3D dragdelta = intersect - dragorigin;
+			float offsetx = dragdelta.x;
+			float offsety = dragdelta.y;
+
+			bool lockX = General.Interface.CtrlState && !General.Interface.ShiftState;
+			bool lockY = !General.Interface.CtrlState && General.Interface.ShiftState;
+
+			if(lockX || lockY) 
+			{
+				float camAngle = Angle2D.RadToDeg(General.Map.VisualCamera.AngleXY);
+				
+				if(camAngle > 315 || camAngle < 46) 
+				{
+					if(lockX) offsetx = 0;
+					if(lockY) offsety = 0;
+				} 
+				else if(camAngle > 225) 
+				{
+					if(lockX) offsety = 0;
+					if(lockY) offsetx = 0;
+				} 
+				else if(camAngle > 135) 
+				{
+					if(lockX) offsetx = 0;
+					if(lockY) offsety = 0;
+				} 
+				else 
+				{
+					if(lockX) offsety = 0;
+					if(lockY) offsetx = 0;
+				}
+			}
+
+			//mxd. Modify offsets based on surface and camera angles
+			float angle;
+
+			if(GeometryType == VisualGeometryType.CEILING)
+				angle = Angle2D.DegToRad(level.sector.Fields.GetValue("rotationceiling", 0f));
+			else
+				angle = Angle2D.DegToRad(level.sector.Fields.GetValue("rotationfloor", 0f));
+
+			Vector2D v = new Vector2D(offsetx, offsety).GetRotated(angle);
+
+			offsetx = (int)Math.Round(v.x);
+			offsety = (int)Math.Round(v.y);
+
+			// Apply offsets
+			if(General.Interface.CtrlState && General.Interface.ShiftState) 
+			{ 
+				//mxd. Clamp to grid size?
+				int newoffsetx = startoffsetx - (int)Math.Round(offsetx);
+				int newoffsety = startoffsety + (int)Math.Round(offsety);
+				int dx = prevoffsetx - newoffsetx;
+				int dy = prevoffsety - newoffsety;
+
+				if(Math.Abs(dx) >= General.Map.Grid.GridSize) 
+				{
+					dx = General.Map.Grid.GridSize * Math.Sign(dx);
+					prevoffsetx = newoffsetx;
+				} 
+				else 
+				{
+					dx = 0;
+				}
+
+				if(Math.Abs(dy) >= General.Map.Grid.GridSize) 
+				{
+					dy = General.Map.Grid.GridSize * Math.Sign(dy);
+					prevoffsety = newoffsety;
+				} 
+				else 
+				{
+					dy = 0;
+				}
+
+				if(dx != 0 || dy != 0) mode.ApplyFlatOffsetChange(dx, dy);
+			} 
+			else 
+			{
+				int newoffsetx = startoffsetx - (int)Math.Round(offsetx);
+				int newoffsety = startoffsety + (int)Math.Round(offsety);
+				mode.ApplyFlatOffsetChange(prevoffsetx - newoffsetx, prevoffsety - newoffsety);
+				prevoffsetx = newoffsetx;
+				prevoffsety = newoffsety;
+			}
+
+			mode.ShowTargetInfo();
+		}
+
+		//mxd
+		public override Sector GetControlSector() 
+		{
+			return level.sector;
+		}
+
+		//mxd
+		protected void OnTextureChanged() 
+		{
+			//mxd. Effects may need updating...
+			mode.RebuildElementData();
+			
+			if(level.sector == this.Sector.Sector) 
+			{
+				this.Setup();
+
+				//mxd. 3D floors may need updating...
+				foreach(Sidedef s in level.sector.Sidedefs) 
+				{
+					if(s.Line.Action == 160 && s.Line.Front != null) 
+					{
+						int sectortag = ((General.Map.UDMF || (s.Line.Args[1] & 8) != 0) ? s.Line.Args[0] : s.Line.Args[0] + (s.Line.Args[4] << 8));
+						foreach(Sector sector in General.Map.Map.Sectors) 
+						{
+							if(sector.Tags.Contains(sectortag))
+							{
+								BaseVisualSector vs = (BaseVisualSector)mode.GetVisualSector(sector);
+								vs.UpdateSectorGeometry(false);
+							}
+						}
+					}
+				}
+			}
+			//mxd. As well as this sector's geometry
+			else if(mode.VisualSectorExists(level.sector)) 
+			{
+				BaseVisualSector vs = (BaseVisualSector)mode.GetVisualSector(level.sector);
+				vs.UpdateSectorGeometry(false);
+			}
+		}
+
+		//mxd
+		public virtual bool IsSelected() 
+		{
+			return selected;
+		}
+
+		//mxd
+		protected void AlignTextureToClosestLine(bool alignx, bool aligny) 
+		{
+			if(!(mode.HighlightedObject is BaseVisualSector)) return;
+			
+			//do we need to align this? (and also grab texture scale while we are at it)
+			float scaleX, scaleY;
+			bool isFloor = (geometrytype == VisualGeometryType.FLOOR);
+
+			if(mode.HighlightedTarget is VisualFloor) 
+			{
+				VisualFloor target = mode.HighlightedTarget as VisualFloor;
+
+				//check texture
+				if(target.Sector.Sector.FloorTexture != (isFloor ? Sector.Sector.FloorTexture : Sector.Sector.CeilTexture))	return;
+
+				scaleX = target.Sector.Sector.Fields.GetValue("xscalefloor", 1.0f);
+				scaleY = target.Sector.Sector.Fields.GetValue("yscalefloor", 1.0f);
+			} 
+			else 
+			{
+				VisualCeiling target = mode.HighlightedTarget as VisualCeiling;
+
+				//check texture
+				if(target.Sector.Sector.CeilTexture != (isFloor ? Sector.Sector.FloorTexture : Sector.Sector.CeilTexture)) return;
+
+				scaleX = target.Sector.Sector.Fields.GetValue("xscaleceiling", 1.0f);
+				scaleY = target.Sector.Sector.Fields.GetValue("yscaleceiling", 1.0f);
+			}
+
+			//find a linedef to align to
+			Vector2D hitpos = mode.GetHitPosition();
+			if(!hitpos.IsFinite()) return;
+
+			//align to line of highlighted sector, which is closest to hitpos
+			Sector highlightedSector = ((BaseVisualSector)mode.HighlightedObject).Sector;
+			List<Linedef> lines = new List<Linedef>();
+			foreach(Sidedef side in highlightedSector.Sidedefs)	lines.Add(side.Line);
+
+			Linedef targetLine = MapSet.NearestLinedef(lines, hitpos);
+			if(targetLine == null) return;
+
+			bool isFront = targetLine.SideOfLine(hitpos) > 0;
+			Sector.Sector.Fields.BeforeFieldsChange();
+
+			//find an angle to rotate texture
+			float sourceAngle = (float)Math.Round(General.ClampAngle(isFront ? -Angle2D.RadToDeg(targetLine.Angle) + 90 : -Angle2D.RadToDeg(targetLine.Angle) - 90), 1);
+			if(!isFront) sourceAngle = General.ClampAngle(sourceAngle + 180);
+
+			//update angle
+			UniFields.SetFloat(Sector.Sector.Fields, (isFloor ? "rotationfloor" : "rotationceiling"), sourceAngle, 0f);
+
+			//set scale
+			UniFields.SetFloat(Sector.Sector.Fields, (isFloor ? "xscalefloor" : "xscaleceiling"), scaleX, 1.0f);
+			UniFields.SetFloat(Sector.Sector.Fields, (isFloor ? "yscalefloor" : "yscaleceiling"), scaleY, 1.0f);
+
+			//update offset
+			float distToStart = Vector2D.Distance(hitpos, targetLine.Start.Position);
+			float distToEnd = Vector2D.Distance(hitpos, targetLine.End.Position);
+			Vector2D offset = (distToStart < distToEnd ? targetLine.Start.Position : targetLine.End.Position).GetRotated(Angle2D.DegToRad(sourceAngle));
+
+			if(alignx) 
+			{
+				if(Texture != null)	offset.x %= Texture.Width / scaleX;
+				UniFields.SetFloat(Sector.Sector.Fields, (isFloor ? "xpanningfloor" : "xpanningceiling"), (float)Math.Round(-offset.x), 0f);
+			}
+
+			if(aligny) 
+			{
+				if(Texture != null)	offset.y %= Texture.Height / scaleY;
+				UniFields.SetFloat(Sector.Sector.Fields, (isFloor ? "ypanningfloor" : "ypanningceiling"), (float)Math.Round(offset.y), 0f);
+			}
+
+			//update geometry
+			Sector.UpdateSectorGeometry(false);
+		}
+
+		//mxd
+		protected void AlignTextureToSlopeLine(Linedef slopeSource, float slopeAngle, bool isFront, bool alignx, bool aligny) 
+		{
+			bool isFloor = (geometrytype == VisualGeometryType.FLOOR);
+			Sector.Sector.Fields.BeforeFieldsChange();
+			float sourceAngle = (float)Math.Round(General.ClampAngle(isFront ? -Angle2D.RadToDeg(slopeSource.Angle) + 90 : -Angle2D.RadToDeg(slopeSource.Angle) - 90), 1);
+
+			if(isFloor) 
+			{
+				if((isFront && slopeSource.Front.Sector.FloorHeight > slopeSource.Back.Sector.FloorHeight) ||
+				  (!isFront && slopeSource.Front.Sector.FloorHeight < slopeSource.Back.Sector.FloorHeight)) 
+				{
+					sourceAngle = General.ClampAngle(sourceAngle + 180);
+				}
+			} 
+			else 
+			{
+				if((isFront && slopeSource.Front.Sector.CeilHeight < slopeSource.Back.Sector.CeilHeight) ||
+				  (!isFront && slopeSource.Front.Sector.CeilHeight > slopeSource.Back.Sector.CeilHeight)) 
+				{
+					sourceAngle = General.ClampAngle(sourceAngle + 180);
+				}
+			}
+
+			//update angle
+			UniFields.SetFloat(Sector.Sector.Fields, (isFloor ? "rotationfloor" : "rotationceiling"), sourceAngle, 0f);
+
+			//update scaleY
+			string xScaleKey = (isFloor ? "xscalefloor" : "xscaleceiling");
+			string yScaleKey = (isFloor ? "yscalefloor" : "yscaleceiling");
+
+			float scaleX = Sector.Sector.Fields.GetValue(xScaleKey, 1.0f);
+			float scaleY;
+
+			//set scale
+			if(aligny) 
+			{
+				scaleY = (float)Math.Round(scaleX * (1 / (float)Math.Cos(slopeAngle)), 2);
+				UniFields.SetFloat(Sector.Sector.Fields, yScaleKey, scaleY, 1.0f);
+			} 
+			else 
+			{
+				scaleY = Sector.Sector.Fields.GetValue(yScaleKey, 1.0f);
+			}
+
+			//update texture offsets
+			Vector2D offset;
+			if(isFloor) 
+			{
+				if((isFront && slopeSource.Front.Sector.FloorHeight < slopeSource.Back.Sector.FloorHeight) ||
+				  (!isFront && slopeSource.Front.Sector.FloorHeight > slopeSource.Back.Sector.FloorHeight)) 
+				{
+					offset = slopeSource.End.Position;
+				} 
+				else 
+				{
+					offset = slopeSource.Start.Position;
+				}
+			} 
+			else 
+			{
+				if((isFront && slopeSource.Front.Sector.CeilHeight > slopeSource.Back.Sector.CeilHeight) ||
+				  (!isFront && slopeSource.Front.Sector.CeilHeight < slopeSource.Back.Sector.CeilHeight)) 
+				{
+					offset = slopeSource.End.Position;
+				} 
+				else 
+				{
+					offset = slopeSource.Start.Position;
+				}
+			}
+
+			offset = offset.GetRotated(Angle2D.DegToRad(sourceAngle));
+
+			if(alignx) 
+			{
+				if(Texture != null)	offset.x %= Texture.Width / scaleX;
+				UniFields.SetFloat(Sector.Sector.Fields, (isFloor ? "xpanningfloor" : "xpanningceiling"), (float)Math.Round(-offset.x), 0f);
+			}
+
+			if(aligny) 
+			{
+				if(Texture != null)	offset.y %= Texture.Height / scaleY;
+				UniFields.SetFloat(Sector.Sector.Fields, (isFloor ? "ypanningfloor" : "ypanningceiling"), (float)Math.Round(offset.y), 0f);
+			}
+
+			//update geometry
+			Sector.UpdateSectorGeometry(false);
+		}
+
+		//mxd
+		protected void ClearFields(IEnumerable<string> keys, string undodescription, string resultdescription) 
+		{
+			if(!General.Map.UDMF) return;
+
+			mode.CreateUndo(undodescription);
+			mode.SetActionResult(resultdescription);
+			Sector.Sector.Fields.BeforeFieldsChange();
+
+			foreach(string key in keys) 
+			{
+				if(Sector.Sector.Fields.ContainsKey(key)) 
+				{
+					Sector.Sector.Fields.Remove(key);
+					Sector.Sector.UpdateNeeded = true;
+				}
+			}
+
+			if(Sector.Sector.UpdateNeeded) Sector.UpdateSectorGeometry(false);
+		}
+		
+		#endregion
+
+		#region ================== Events
+
+		// Unused
+		public virtual void OnEditBegin() { }
+		public virtual void OnTextureFit(FitTextureOptions options) { } //mxd
+		public virtual void OnToggleUpperUnpegged() { }
+		public virtual void OnToggleLowerUnpegged() { }
+		public virtual void OnResetTextureOffset() { }
+		public virtual void OnResetLocalTextureOffset() { } //mxd
+		public virtual void OnCopyTextureOffsets() { }
+		public virtual void OnPasteTextureOffsets() { }
+		public virtual void OnInsert() { }
+		protected virtual void SetTexture(string texturename) { }
+		public virtual void ApplyUpperUnpegged(bool set) { }
+		public virtual void ApplyLowerUnpegged(bool set) { }
+		protected abstract void MoveTextureOffset(Point xy);
+		protected abstract Point GetTextureOffset();
+
+		// Setup this plane
+		public bool Setup() { return this.Setup(this.level, this.extrafloor); }
+		public virtual bool Setup(SectorLevel level, Effect3DFloor extrafloor)
+		{
+			this.level = level;
+			this.extrafloor = extrafloor;
+			return false;
+		}
+
+		// Begin select
+		public virtual void OnSelectBegin()
+		{
+			mode.LockTarget();
+			dragstartanglexy = General.Map.VisualCamera.AngleXY;
+			dragstartanglez = General.Map.VisualCamera.AngleZ;
+			dragorigin = pickintersect;
+			startoffsetx = GetTextureOffset().X;
+			startoffsety = GetTextureOffset().Y;
+			prevoffsetx = GetTextureOffset().X;
+			prevoffsety = GetTextureOffset().Y;
+		}
+		
+		// Select or deselect
+		public virtual void OnSelectEnd()
+		{
+			mode.UnlockTarget();
+			
+			// Was dragging?
+			if(uvdragging)
+			{
+				// Dragging stops now
+				uvdragging = false;
+			}
+			else
+			{
+				if(this.selected)
+				{
+					this.selected = false;
+					mode.RemoveSelectedObject(this);
+				}
+				else
+				{
+					this.selected = true;
+					mode.AddSelectedObject(this);
+				}
+			}
+		}
+
+		// Moving the mouse
+		public virtual void OnMouseMove(MouseEventArgs e)
+		{
+			if(!General.Map.UDMF) return; //mxd. Cannot change texture offsets in other map formats...
+			
+			// Dragging UV?
+			if(uvdragging)
+			{
+				UpdateDragUV();
+			}
+			else
+			{
+				// Select button pressed?
+				if(General.Actions.CheckActionActive(General.ThisAssembly, "visualselect"))
+				{
+					// Check if tolerance is exceeded to start UV dragging
+					float deltaxy = General.Map.VisualCamera.AngleXY - dragstartanglexy;
+					float deltaz = General.Map.VisualCamera.AngleZ - dragstartanglez;
+					if((Math.Abs(deltaxy) + Math.Abs(deltaz)) > DRAG_ANGLE_TOLERANCE)
+					{
+						mode.PreAction(UndoGroup.TextureOffsetChange);
+						mode.CreateUndo("Change texture offsets");
+
+						// Start drag now
+						uvdragging = true;
+						mode.Renderer.ShowSelection = false;
+						mode.Renderer.ShowHighlight = false;
+						UpdateDragUV();
+					}
+				}
+			}
+		}
+
+		// Delete texture
+		public virtual void OnDelete() 
+		{
+			// Remove texture
+			mode.CreateUndo("Delete texture");
+			mode.SetActionResult("Deleted a texture.");
+			SetTexture("-");
+
+			// Update
+			if(mode.VisualSectorExists(level.sector))
+			{
+				BaseVisualSector vs = (BaseVisualSector)mode.GetVisualSector(level.sector);
+				vs.UpdateSectorGeometry(true);
+			}
+		}
+		
+		// Processing
+		public virtual void OnProcess(float deltatime)
+		{
+			// If the texture was not loaded, but is loaded now, then re-setup geometry
+			if(setuponloadedtexture != 0)
+			{
+				ImageData t = General.Map.Data.GetFlatImage(setuponloadedtexture);
+				if(t != null)
+				{
+					if(t.IsImageLoaded)
+					{
+						setuponloadedtexture = 0;
+						Setup();
+					}
+				}
+			}
+		}
+
+		// Flood-fill textures
+		public virtual void OnTextureFloodfill()
+		{
+			if(BuilderPlug.Me.CopiedFlat != null)
+			{
+				string oldtexture = GetTextureName();
+				long oldtexturelong = Lump.MakeLongName(General.Map.Data.GetFullFlatName(oldtexture)); //mxd
+				string newtexture = BuilderPlug.Me.CopiedFlat;
+				if(newtexture != oldtexture)
+				{
+					// Get the texture
+					ImageData newtextureimage = General.Map.Data.GetFlatImage(newtexture);
+					if(newtextureimage != null)
+					{
+						bool fillceilings = (this is VisualCeiling);
+						
+						if(fillceilings)
+						{
+							mode.CreateUndo("Flood-fill ceilings with " + newtexture);
+							mode.SetActionResult("Flood-filled ceilings with " + newtexture + ".");
+						}
+						else
+						{
+							mode.CreateUndo("Flood-fill floors with " + newtexture);
+							mode.SetActionResult("Flood-filled floors with " + newtexture + ".");
+						}
+
+						mode.Renderer.SetCrosshairBusy(true);
+						General.Interface.RedrawDisplay();
+
+						if(mode.IsSingleSelection)
+						{
+							// Clear all marks, this will align everything it can
+							General.Map.Map.ClearMarkedSectors(false);
+						}
+						else
+						{
+							// Limit the alignment to selection only
+							General.Map.Map.ClearMarkedSectors(true);
+							List<Sector> sectors = mode.GetSelectedSectors();
+							foreach(Sector s in sectors) s.Marked = false;
+						}
+						
+						// Do the fill
+						Tools.FloodfillFlats(this.Sector.Sector, fillceilings, oldtexturelong, newtexture, false);
+
+						// Get the changed sectors
+						List<Sector> changes = General.Map.Map.GetMarkedSectors(true);
+						foreach(Sector s in changes)
+						{
+							// Update the visual sector
+							if(mode.VisualSectorExists(s))
+							{
+								BaseVisualSector vs = (BaseVisualSector)mode.GetVisualSector(s);
+								if(fillceilings) vs.Ceiling.Setup();
+								else vs.Floor.Setup();
+							}
+						}
+
+						General.Map.Data.UpdateUsedTextures();
+						mode.Renderer.SetCrosshairBusy(false);
+						mode.ShowTargetInfo();
+					}
+				}
+			}
+		}
+
+		//mxd. Auto-align texture offsets
+		public virtual void OnTextureAlign(bool alignx, bool aligny) 
+		{
+			if(!General.Map.UDMF) return;
+
+			//create undo
+			string rest;
+			if(alignx && aligny) rest = "(X and Y)";
+			else if(alignx)	rest = "(X)";
+			else rest = "(Y)";
+
+			mode.CreateUndo("Auto-align textures " + rest);
+			mode.SetActionResult("Auto-aligned textures " + rest + ".");
+
+			//get selection
+			List<VisualGeometry> selection = mode.GetSelectedSurfaces();
+
+			//align textures on slopes
+			foreach(VisualGeometry vg in selection) 
+			{
+				if(vg.GeometryType == VisualGeometryType.FLOOR || vg.GeometryType == VisualGeometryType.CEILING) 
+				{
+					if(vg.GeometryType == VisualGeometryType.FLOOR)
+						((VisualFloor)vg).AlignTexture(alignx, aligny);
+					else
+						((VisualCeiling)vg).AlignTexture(alignx, aligny);
+
+					vg.Sector.Sector.UpdateNeeded = true;
+					vg.Sector.Sector.UpdateCache();
+				}
+			}
+
+			// Map is changed
+			General.Map.Map.Update();
+			General.Map.IsChanged = true;
+			General.Interface.RefreshInfo();
+		}
+		
+		// Copy properties
+		public virtual void OnCopyProperties()
+		{
+			BuilderPlug.Me.CopiedSectorProps = new SectorProperties(level.sector);
+			mode.SetActionResult("Copied sector properties.");
+		}
+		
+		// Paste properties
+		public virtual void OnPasteProperties(bool usecopysettings)
+		{
+			if(BuilderPlug.Me.CopiedSectorProps != null)
+			{
+				mode.CreateUndo("Paste sector properties");
+				mode.SetActionResult("Pasted sector properties.");
+
+				//mxd. Glow effect may require SectorData update
+				bool oldfloortextureglows = (SectorProperties.CopySettings.FloorTexture && General.Map.Data.GlowingFlats.ContainsKey(level.sector.LongFloorTexture));
+				bool oldceiltextureglows = (SectorProperties.CopySettings.CeilingTexture && General.Map.Data.GlowingFlats.ContainsKey(level.sector.LongCeilTexture));
+
+				//mxd. Added "usecopysettings"
+				BuilderPlug.Me.CopiedSectorProps.Apply(level.sector, usecopysettings);
+
+				//mxd. Glow effect may require SectorData update
+				if(oldfloortextureglows || oldceiltextureglows
+					|| (SectorProperties.CopySettings.FloorTexture && General.Map.Data.GlowingFlats.ContainsKey(level.sector.LongFloorTexture))
+					|| (SectorProperties.CopySettings.CeilingTexture && General.Map.Data.GlowingFlats.ContainsKey(level.sector.LongCeilTexture)))
+				{
+					mode.RebuildElementData();
+					SectorData sd = mode.GetSectorData(level.sector);
+					sd.UpdateForced();
+				}
+
+				if(mode.VisualSectorExists(level.sector))
+				{
+					BaseVisualSector vs = (BaseVisualSector)mode.GetVisualSector(level.sector);
+					vs.UpdateSectorGeometry(true);
+				}
+
+				mode.ShowTargetInfo();
+			}
+		}
+		
+		// Select texture
+		public virtual void OnSelectTexture()
+		{
+			if(General.Interface.IsActiveWindow)
+			{
+				string oldtexture = GetTextureName();
+				string newtexture = General.Interface.BrowseFlat(General.Interface, oldtexture);
+				if(newtexture != oldtexture)
+				{
+					mode.ApplySelectTexture(newtexture, true);
+				}
+			}
+		}
+
+		// Apply Texture
+		public virtual void ApplyTexture(string texture)
+		{
+			mode.CreateUndo("Change flat '" + texture + "'");
+			SetTexture(texture);
+			OnTextureChanged(); //mxd
+		}
+		
+		// Copy texture
+		public virtual void OnCopyTexture()
+		{
+			//mxd. When UseLongTextureNames is disabled, use texture name as stored in Sidedef, otherwise use full name.
+			string texturename = ((General.Map.Options.UseLongTextureNames && Texture != null && Texture.UsedInMap) ? Texture.Name : GetTextureName());
+			BuilderPlug.Me.CopiedFlat = texturename;
+			if(General.Map.Config.MixTexturesFlats) BuilderPlug.Me.CopiedTexture = texturename;
+			mode.SetActionResult("Copied flat '" + texturename + "'.");
+		}
+		
+		public virtual void OnPasteTexture() { }
+
+		// Return texture name
+		public virtual string GetTextureName() { return ""; }
+		
+		// Edit button released
+		public virtual void OnEditEnd()
+		{
+			if(General.Interface.IsActiveWindow)
+			{
+				//mxd
+				List<Sector> sectors = mode.GetSelectedSectors();
+				updateList = new List<BaseVisualSector>();
+
+				foreach(Sector s in sectors) 
+				{
+					if(mode.VisualSectorExists(s)) 
+						updateList.Add((BaseVisualSector)mode.GetVisualSector(s));
+				}
+
+				General.Interface.OnEditFormValuesChanged += Interface_OnEditFormValuesChanged; //mxd
+				mode.StartRealtimeInterfaceUpdate(SelectionType.Sectors); //mxd
+				DialogResult result = General.Interface.ShowEditSectors(sectors);
+				mode.StopRealtimeInterfaceUpdate(SelectionType.Sectors); //mxd
+				General.Interface.OnEditFormValuesChanged -= Interface_OnEditFormValuesChanged; //mxd
+
+				updateList.Clear(); //mxd
+				updateList = null; //mxd
+
+				if(result == DialogResult.OK) mode.RebuildElementData(); //mxd
+			}
+		}
+
+		//mxd
+		private void Interface_OnEditFormValuesChanged(object sender, EventArgs e) 
+		{
+			foreach(BaseVisualSector vs in updateList) vs.UpdateSectorGeometry(true);
+		}
+
+		// Sector height change
+		public virtual void OnChangeTargetHeight(int amount)
+		{
+			changed = true;
+
+			ChangeHeight(amount);
+
+			// Rebuild sector
+			BaseVisualSector vs;
+			if(mode.VisualSectorExists(level.sector)) 
+			{
+				vs = (BaseVisualSector)mode.GetVisualSector(level.sector);
+			} 
+			else 
+			{
+				//mxd. Need this to apply changes to 3d-floor even if control sector doesn't exist 
+				//as BaseVisualSector
+				vs = mode.CreateBaseVisualSector(level.sector);
+			}
+
+			if(vs != null) vs.UpdateSectorGeometry(true);
+		}
+		
+		// Sector brightness change
+		public virtual void OnChangeTargetBrightness(bool up)
+		{
+			mode.CreateUndo("Change sector brightness", UndoGroup.SectorBrightnessChange, Sector.Sector.FixedIndex);
+			
+			if(up)
+				Sector.Sector.Brightness = General.Map.Config.BrightnessLevels.GetNextHigher(Sector.Sector.Brightness);
+			else
+				Sector.Sector.Brightness = General.Map.Config.BrightnessLevels.GetNextLower(Sector.Sector.Brightness);
+			
+			mode.SetActionResult("Changed sector brightness to " + Sector.Sector.Brightness + ".");
+
+			Sector.Sector.UpdateCache();
+
+			// Rebuild sector
+			Sector.UpdateSectorGeometry(false);
+		}
+
+		// Texture offset change
+		public virtual void OnChangeTextureOffset(int horizontal, int vertical, bool doSurfaceAngleCorrection)
+		{
+			if(horizontal == 0 && vertical == 0) return; //mxd
+			
+			//mxd
+			if(!General.Map.UDMF) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "Floor/ceiling texture offsets cannot be changed in this map format!");
+				return;
+			}
+
+			if((General.Map.UndoRedo.NextUndo == null) || (General.Map.UndoRedo.NextUndo.TicketID != undoticket))
+				undoticket = mode.CreateUndo("Change texture offsets");
+
+			//mxd
+			if(doSurfaceAngleCorrection) 
+			{
+				Point p = new Point(horizontal, vertical);
+				float angle = Angle2D.RadToDeg(General.Map.VisualCamera.AngleXY);
+				if(GeometryType == VisualGeometryType.CEILING) 
+					angle += level.sector.Fields.GetValue("rotationceiling", 0f);
+				else
+					angle += level.sector.Fields.GetValue("rotationfloor", 0f);
+
+				angle = General.ClampAngle(angle);
+
+				if(angle > 315 || angle < 46) 
+				{
+					//already correct
+				} 
+				else if(angle > 225) 
+				{
+					vertical = p.X;
+					horizontal = -p.Y;
+				} 
+				else if(angle > 135) 
+				{
+					horizontal = -p.X;
+					vertical = -p.Y;
+				} 
+				else 
+				{
+					vertical = -p.X;
+					horizontal = p.Y;
+				}
+			}
+
+			// Apply offsets
+			MoveTextureOffset(new Point(-horizontal, -vertical));
+
+			// Update sector geometry
+			Sector s = GetControlSector();
+			if(s.Index != Sector.Sector.Index) 
+			{
+				s.UpdateNeeded = true;
+				s.UpdateCache();
+				mode.GetSectorData(s).Update();
+				BaseVisualSector vs = (BaseVisualSector)mode.GetVisualSector(s);
+				vs.UpdateSectorGeometry(false);
+				vs.Rebuild();
+			}
+
+			Sector.Sector.UpdateNeeded = true;
+			Sector.Sector.UpdateCache();
+			Sector.UpdateSectorGeometry(false);
+			Sector.Rebuild();
+		}
+
+		//mxd
+		public virtual void OnChangeTextureRotation(float angle) 
+		{
+			if(!General.Map.UDMF) return;
+
+			if((General.Map.UndoRedo.NextUndo == null) || (General.Map.UndoRedo.NextUndo.TicketID != undoticket))
+				undoticket = mode.CreateUndo("Change texture rotation");
+
+			string key = (GeometryType == VisualGeometryType.FLOOR ? "rotationfloor" : "rotationceiling");
+			mode.SetActionResult( (GeometryType == VisualGeometryType.FLOOR ? "Floor" : "Ceiling") + " rotation changed to " + angle);
+
+			//set value
+			Sector s = GetControlSector();
+			s.Fields.BeforeFieldsChange();
+			UniFields.SetFloat(s.Fields, key, angle, 0.0f);
+
+			if(s.Index != Sector.Sector.Index) 
+			{
+				s.UpdateNeeded = true;
+				s.UpdateCache();
+				mode.GetSectorData(s).Update();
+				BaseVisualSector vs = (BaseVisualSector)mode.GetVisualSector(s);
+				vs.UpdateSectorGeometry(false);
+			}
+
+			Sector.Sector.UpdateNeeded = true;
+			Sector.Sector.UpdateCache();
+			Sector.UpdateSectorGeometry(false);
+		}
+
+		//mxd
+		public virtual void OnChangeScale(int incrementX, int incrementY) 
+		{
+			if(!General.Map.UDMF || !Texture.IsImageLoaded) return;
+
+			if((General.Map.UndoRedo.NextUndo == null) || (General.Map.UndoRedo.NextUndo.TicketID != undoticket))
+				undoticket = mode.CreateUndo("Change texture scale");
+
+			ChangeTextureScale(incrementX, incrementY);
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/VisualModes/BaseVisualGeometrySidedef.cs b/Source/Plugins/BuilderModes/VisualModes/BaseVisualGeometrySidedef.cs
new file mode 100644
index 0000000..462e56e
--- /dev/null
+++ b/Source/Plugins/BuilderModes/VisualModes/BaseVisualGeometrySidedef.cs
@@ -0,0 +1,1596 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Globalization;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Data;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.GZBuilder.Data;
+using CodeImp.DoomBuilder.IO;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.VisualModes;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	internal abstract class BaseVisualGeometrySidedef : VisualGeometry, IVisualEventReceiver
+	{
+		#region ================== Constants
+		
+		private const float DRAG_ANGLE_TOLERANCE = 0.06f;
+		
+		#endregion
+
+		#region ================== Variables
+
+		protected readonly BaseVisualMode mode;
+
+		protected Plane top;
+		protected Plane bottom;
+		protected long setuponloadedtexture;
+		
+		// UV dragging
+		private float dragstartanglexy;
+		private float dragstartanglez;
+		private Vector3D dragorigin;
+		private Vector3D deltaxy;
+		private Vector3D deltaz;
+		private int startoffsetx;
+		private int startoffsety;
+		protected bool uvdragging;
+		private int prevoffsetx;		// We have to provide delta offsets, but I don't
+		private int prevoffsety;		// want to calculate with delta offsets to prevent
+										// inaccuracy in the dragging.
+		private static List<BaseVisualSector> updateList; //mxd
+
+		// Undo/redo
+		private int undoticket;
+		
+		#endregion
+		
+		#region ================== Properties
+		
+		public bool IsDraggingUV { get { return uvdragging; } }
+		new public BaseVisualSector Sector { get { return (BaseVisualSector)base.Sector; } }
+		
+		#endregion
+		
+		#region ================== Constructor / Destructor
+		
+		// Constructor for sidedefs
+		protected BaseVisualGeometrySidedef(BaseVisualMode mode, VisualSector vs, Sidedef sd) : base(vs, sd)
+		{
+			this.mode = mode;
+			this.deltaz = new Vector3D(0.0f, 0.0f, 1.0f);
+			this.deltaxy = (sd.Line.End.Position - sd.Line.Start.Position) * sd.Line.LengthInv;
+			if(!sd.IsFront) this.deltaxy = -this.deltaxy;
+
+			//mxd
+			if(mode.UseSelectionFromClassicMode && sd.Line.Selected) 
+			{
+				this.selected = true;
+				mode.AddSelectedObject(this);
+			}
+		}
+		
+		#endregion
+
+		#region ================== Methods
+
+		// This sets the renderstyle from linedef information and returns the alpha value or the vertices
+		protected byte SetLinedefRenderstyle(bool solidasmask)
+		{
+			byte alpha;
+			bool canhavealpha = (this is VisualMiddleDouble || this is VisualMiddle3D || this is VisualMiddleBack); //mxd
+
+			// From TranslucentLine action
+			if(Sidedef.Line.Action == 208)
+			{
+				alpha = (byte)General.Clamp(Sidedef.Line.Args[1], 0, 255);
+
+				if(canhavealpha && Sidedef.Line.Args[2] == 1)
+					this.RenderPass = RenderPass.Additive;
+				else if(canhavealpha && (alpha < 255 || Texture.IsTranslucent))
+					this.RenderPass = RenderPass.Alpha;
+				else if(solidasmask)
+					this.RenderPass = RenderPass.Mask;
+				else
+					this.RenderPass = RenderPass.Solid;
+			}
+			// From UDMF field
+			else
+			{
+				alpha = (byte)(Sidedef.Line.Fields.GetValue("alpha", 1.0f) * 255.0f);
+				if(alpha == 255 && Sidedef.Line.IsFlagSet("transparent")) alpha = 64; //mxd
+
+				if(canhavealpha && Sidedef.Line.Fields.GetValue("renderstyle", "translucent") == "add")
+					this.RenderPass = RenderPass.Additive;
+				else if(canhavealpha && (alpha < 255 || Texture.IsTranslucent))
+					this.RenderPass = RenderPass.Alpha;
+				else if(solidasmask)
+					this.RenderPass = RenderPass.Mask;
+				else
+					this.RenderPass = RenderPass.Solid;
+			}
+			
+			return alpha;
+		}
+
+		// This performs a fast test in object picking
+		public override bool PickFastReject(Vector3D from, Vector3D to, Vector3D dir)
+		{
+			// Check if intersection point is between top and bottom
+			return (pickintersect.z >= bottom.GetZ(pickintersect)) && (pickintersect.z <= top.GetZ(pickintersect));
+		}
+		
+		
+		// This performs an accurate test for object picking
+		public override bool PickAccurate(Vector3D from, Vector3D to, Vector3D dir, ref float u_ray)
+		{
+			// The fast reject pass is already as accurate as it gets,
+			// so we just return the intersection distance here
+			u_ray = pickrayu;
+			return true;
+		}
+		
+		
+		// This creates vertices from a wall polygon and applies lighting
+		/*protected List<WorldVertex> CreatePolygonVertices(WallPolygon poly, TexturePlane tp, SectorData sd, int lightvalue, bool lightabsolute)
+		{
+			List<WallPolygon> polylist = new List<WallPolygon>(1);
+			polylist.Add(poly);
+			return CreatePolygonVertices(polylist, tp, sd, lightvalue, lightabsolute);
+		}*/
+
+		// This creates vertices from a wall polygon and applies lighting
+		protected List<WorldVertex> CreatePolygonVertices(List<WallPolygon> poly, TexturePlane tp, SectorData sd, int lightvalue, bool lightabsolute)
+		{
+			List<WallPolygon> polygons = new List<WallPolygon>(poly);
+			List<WorldVertex> verts = new List<WorldVertex>();
+
+			//mxd. Do complicated light level shenanigans only when there are extrafloors
+			if(sd.LightLevels.Count > 2)
+			{
+				SectorLevel prevlight = null; //mxd
+
+				// Go for all levels to build geometry
+				for(int i = sd.LightLevels.Count - 1; i >= 0; i--)
+				{
+					SectorLevel l = sd.LightLevels[i];
+
+					//mxd. Skip current light level when it's between TYPE1 and TYPE1_BOTTOM
+					if(prevlight != null
+					   && prevlight.type == SectorLevelType.Light && l.type == SectorLevelType.Light
+					   && (prevlight.lighttype == LightLevelType.TYPE1 && l.lighttype != LightLevelType.TYPE1_BOTTOM)) continue;
+
+					if((l != sd.Floor) && (l != sd.Ceiling) && (l.type != SectorLevelType.Floor || l.splitsides /*(l.alpha < 255)*/))
+					{
+						// Go for all polygons
+						int num = polygons.Count;
+						Plane plane = (l.type == SectorLevelType.Floor ? l.plane.GetInverted() : l.plane); //mxd
+
+						for(int pi = 0; pi < num; pi++)
+						{
+							// Split by plane
+							WallPolygon p = polygons[pi];
+							WallPolygon np = SplitPoly(ref p, plane, false);
+							if(np.Count > 0)
+							{
+								//mxd. Determine color
+								int lightlevel;
+
+								// Sidedef part is not affected by 3d floor brightness
+								if(l.disablelighting || !l.extrafloor)
+									lightlevel = (lightabsolute ? lightvalue : l.brightnessbelow + lightvalue);
+								// 3d floor transfers brightness below it ignoring sidedef's brightness
+								else
+									lightlevel = l.brightnessbelow;
+
+								PixelColor wallbrightness = PixelColor.FromInt(mode.CalculateBrightness(lightlevel, Sidedef)); //mxd
+								np.color = PixelColor.Modulate(l.colorbelow, wallbrightness).WithAlpha(255).ToInt();
+
+								if(p.Count == 0)
+								{
+									polygons[pi] = np;
+								}
+								else
+								{
+									polygons[pi] = p;
+									polygons.Add(np);
+								}
+							}
+							else
+							{
+								polygons[pi] = p;
+							}
+						}
+					}
+
+					//mxd
+					if(l.type == SectorLevelType.Light) prevlight = l;
+				}
+			}
+
+			// Go for all polygons to make geometry
+			foreach(WallPolygon p in polygons)
+			{
+				// Find texture coordinates for each vertex in the polygon
+				List<Vector2D> texc = new List<Vector2D>(p.Count);
+				foreach(Vector3D v in p) texc.Add(tp.GetTextureCoordsAt(v));
+				
+				// Now we create triangles from the polygon.
+				// The polygon is convex and clockwise, so this is a piece of cake.
+				if(p.Count > 2)
+				{
+					for(int k = 1; k < (p.Count - 1); k++)
+					{
+						verts.Add(new WorldVertex(p[0], p.color, texc[0]));
+						verts.Add(new WorldVertex(p[k], p.color, texc[k]));
+						verts.Add(new WorldVertex(p[k + 1], p.color, texc[k + 1]));
+					}
+				}
+			}
+
+			//mxd. Interpolate vertex colors?
+			if(sd.CeilingGlow != null || sd.FloorGlow != null) 
+			{
+				for(int i = 0; i < verts.Count; i++)
+				{
+					if(verts[i].c == PixelColor.INT_WHITE) continue; // Fullbright verts are not affected by glows.
+					verts[i] = InterpolateVertexColor(verts[i], sd);
+				}
+			}
+			
+			return verts;
+		}
+
+		//mxd
+		private static WorldVertex InterpolateVertexColor(WorldVertex v, SectorData data) 
+		{
+			// Apply ceiling glow?
+			if(data.CeilingGlow != null)
+			{
+				float cgz = data.CeilingGlowPlane.GetZ(v.x, v.y);
+
+				// Vertex is above ceiling glow plane?
+				if(v.z > cgz)
+				{
+					float cz = data.Ceiling.plane.GetZ(v.x, v.y);
+					float delta = ((v.z - cgz) / (cz - cgz)) * 0.9f;
+					PixelColor vc = PixelColor.FromInt(v.c);
+					v.c = InterpolationTools.InterpolateColor(GetGlowColor(data.CeilingGlow, vc), vc, delta);
+				}
+			}
+
+			// Apply floor glow?
+			if(data.FloorGlow != null)
+			{
+				float fgz = data.FloorGlowPlane.GetZ(v.x, v.y);
+
+				// Vertex is below floor glow plane?
+				if(v.z < fgz)
+				{
+					float fz = data.Floor.plane.GetZ(v.x, v.y);
+					float delta = ((v.z - fz) / (fgz - fz)) * 0.9f;
+					PixelColor vc = PixelColor.FromInt(v.c);
+					v.c = InterpolationTools.InterpolateColor(vc, GetGlowColor(data.FloorGlow, vc), delta);
+				}
+			}
+
+			return v;
+		}
+
+		//mxd
+		private static PixelColor GetGlowColor(GlowingFlatData data, PixelColor vertexcolor)
+		{
+			if(data.Subtractive) return PixelColor.Subtract(vertexcolor, data.Color);
+			return PixelColor.Add(vertexcolor, data.Color);
+		}
+		
+		// This splits a polygon with a plane and returns the other part as a new polygon
+		// The polygon is expected to be convex and clockwise
+		protected static WallPolygon SplitPoly(ref WallPolygon poly, Plane p, bool keepfront)
+		{
+			const float NEAR_ZERO = 0.01f;
+			WallPolygon front = new WallPolygon(poly.Count);
+			WallPolygon back = new WallPolygon(poly.Count);
+			poly.CopyProperties(front);
+			poly.CopyProperties(back);
+			
+			if(poly.Count > 0)
+			{
+				// Go for all vertices to see which side they have to be on
+				Vector3D v1 = poly[poly.Count - 1];
+				float side1 = p.Distance(v1);
+				for(int i = 0; i < poly.Count; i++)
+				{
+					// Fetch vertex and determine side
+					Vector3D v2 = poly[i];
+					float side2 = p.Distance(v2);
+					
+					// Front?
+					if(side2 > NEAR_ZERO)
+					{
+						if(side1 < -NEAR_ZERO)
+						{
+							// Split line with plane and insert the vertex
+							float u = 0.0f;
+							p.GetIntersection(v1, v2, ref u);
+							Vector3D v3 = v1 + (v2 - v1) * u;
+							front.Add(v3);
+							back.Add(v3);
+						}
+						
+						front.Add(v2);
+					}
+					// Back?
+					else if(side2 < -NEAR_ZERO)
+					{
+						if(side1 > NEAR_ZERO)
+						{
+							// Split line with plane and insert the vertex
+							float u = 0.0f;
+							p.GetIntersection(v1, v2, ref u);
+							Vector3D v3 = v1 + (v2 - v1) * u;
+							front.Add(v3);
+							back.Add(v3);
+						}
+						
+						back.Add(v2);
+					}
+					else
+					{
+						// On the plane, add to both polygons
+						front.Add(v2);
+						back.Add(v2);
+					}
+					
+					// Next
+					v1 = v2;
+					side1 = side2;
+				}
+			}
+			
+			if(keepfront)
+			{
+				poly = front;
+				return back;
+			}
+			else
+			{
+				poly = back;
+				return front;
+			}
+		}
+		
+		
+		// This crops a polygon with a plane and keeps only a certain part of the polygon
+		protected static void CropPoly(ref WallPolygon poly, Plane p, bool keepfront)
+		{
+			const float NEAR_ZERO = 0.01f;
+			float sideswitch = keepfront ? 1 : -1;
+			WallPolygon newp = new WallPolygon(poly.Count);
+			poly.CopyProperties(newp);
+			
+			if(poly.Count > 0)
+			{
+				// First split lines that cross the plane so that we have vertices on the plane where the lines cross
+				Vector3D v1 = poly[poly.Count - 1];
+				float side1 = p.Distance(v1) * sideswitch;
+				for(int i = 0; i < poly.Count; i++)
+				{
+					// Fetch vertex and determine side
+					Vector3D v2 = poly[i];
+					float side2 = p.Distance(v2) * sideswitch;
+					
+					// Front?
+					if(side2 > NEAR_ZERO)
+					{
+						if(side1 < -NEAR_ZERO)
+						{
+							// Split line with plane and insert the vertex
+							float u = 0.0f;
+							p.GetIntersection(v1, v2, ref u);
+							Vector3D v3 = v1 + (v2 - v1) * u;
+							newp.Add(v3);
+						}
+						
+						newp.Add(v2);
+					}
+					// Back?
+					else if(side2 < -NEAR_ZERO)
+					{
+						if(side1 > NEAR_ZERO)
+						{
+							// Split line with plane and insert the vertex
+							float u = 0.0f;
+							p.GetIntersection(v1, v2, ref u);
+							Vector3D v3 = v1 + (v2 - v1) * u;
+							newp.Add(v3);
+						}
+					}
+					else
+					{
+						// On the plane
+						newp.Add(v2);
+					}
+					
+					// Next
+					v1 = v2;
+					side1 = side2;
+				}
+			}
+			
+			poly = newp;
+		}
+
+		//mxd. This clips given polys by extrafloors
+		protected void ClipExtraFloors(List<WallPolygon> polygons, List<Effect3DFloor> extrafloors, bool clipalways)
+		{
+			foreach(Effect3DFloor ef in extrafloors)
+			{
+				//mxd. Walls should be clipped by 3D floors
+				if(ef.ClipSidedefs || clipalways)
+				{
+					int num = polygons.Count;
+					for(int pi = 0; pi < num; pi++)
+					{
+						// Split by floor plane of 3D floor
+						WallPolygon p = polygons[pi];
+						WallPolygon np = SplitPoly(ref p, ef.Ceiling.plane, true);
+
+						if(np.Count > 0)
+						{
+							// Split part below floor by the ceiling plane of 3D floor
+							// and keep only the part below the ceiling (front)
+							SplitPoly(ref np, ef.Floor.plane, true);
+
+							if(p.Count == 0)
+							{
+								polygons[pi] = np;
+							}
+							else
+							{
+								polygons[pi] = p;
+								polygons.Add(np);
+							}
+						}
+						else
+						{
+							polygons[pi] = p;
+						}
+					}
+				}
+			}
+		}
+
+		//mxd
+		protected void GetLightValue(out int lightvalue, out bool lightabsolute)
+		{
+			lightabsolute = Sidedef.Fields.GetValue("lightabsolute", false);
+			bool affectedbyfog = General.Map.Data.MapInfo.HasFadeColor || (Sector.Sector.CeilTexture == General.Map.Config.SkyFlatName && General.Map.Data.MapInfo.HasOutsideFogColor) || Sector.Sector.Fields.ContainsKey("fadecolor");
+			bool ignorelight = affectedbyfog && !Sidedef.IsFlagSet("lightfog") && !lightabsolute;
+			lightvalue = ignorelight ? 0 : Sidedef.Fields.GetValue("light", 0); //mxd
+			if(ignorelight) lightabsolute = false;
+		}
+
+		//mxd
+		protected static float GetRoundedTextureOffset(float oldValue, float offset, float scale, float textureSize) 
+		{
+			if(offset == 0f) return oldValue;
+			float scaledOffset = offset * scale;
+			float result = (float)Math.Round(oldValue + scaledOffset);
+			if(textureSize > 0) result %= textureSize;
+			if(result == oldValue) result += (scaledOffset < 0 ? -1 : 1);
+			return result;
+		}
+
+		//mxd
+		private void OnTextureChanged() 
+		{
+			//check for 3d floors
+			if(Sidedef.Line.Action == 160) 
+			{
+				int sectortag = ((General.Map.UDMF || (Sidedef.Line.Args[1] & 8) != 0) ? Sidedef.Line.Args[0] : Sidedef.Line.Args[0] + (Sidedef.Line.Args[4] << 8));
+				if(sectortag == 0) return;
+
+				foreach(Sector sector in General.Map.Map.Sectors) 
+				{
+					if(sector.Tags.Contains(sectortag))
+					{
+						BaseVisualSector vs = (BaseVisualSector)mode.GetVisualSector(sector);
+						vs.UpdateSectorGeometry(true);
+					}
+				}
+			}
+		}
+
+		//mxd
+		protected void SelectNeighbours(long longtexture, bool select, bool withSameTexture, bool withSameHeight) 
+		{
+			if(Sidedef.Sector == null || (!withSameTexture && !withSameHeight)) return;
+
+			Rectangle rect = BuilderModesTools.GetSidedefPartSize(this);
+			if(rect.Height == 0) return;
+
+			if(select && !selected) 
+			{
+				selected = true;
+				mode.AddSelectedObject(this);
+			} 
+			else if(!select && selected) 
+			{
+				selected = false;
+				mode.RemoveSelectedObject(this);
+			}
+
+			//select
+			List<Linedef> connectedLines = new List<Linedef>();
+
+			foreach(Linedef line in Sidedef.Line.Start.Linedefs) 
+			{
+				if(line.Index == Sidedef.Line.Index) continue;
+				connectedLines.Add(line);
+			}
+			foreach(Linedef line in Sidedef.Line.End.Linedefs) 
+			{
+				if(line.Index == Sidedef.Line.Index) continue;
+				if(!connectedLines.Contains(line)) connectedLines.Add(line);
+			}
+
+			// Check connected lines
+			foreach(Linedef line in connectedLines) 
+			{
+				bool addFrontTop = false;
+				bool addFrontMiddle = false;
+				bool addFrontBottom = false;
+				bool addBackTop = false;
+				bool addBackMiddle = false;
+				bool addBackBottom = false;
+
+				bool lineHasFrontSector = (line.Front != null && line.Front.Sector != null);
+				bool lineHasBackSector = (line.Back != null && line.Back.Sector != null);
+				bool doublesided = (lineHasFrontSector && lineHasBackSector);
+
+				List<VisualMiddle3D> extrasides = new List<VisualMiddle3D>();
+
+				// Gather 3d floor sides
+				if(doublesided) 
+				{
+					BaseVisualSector s = mode.GetVisualSector(line.Front.Sector) as BaseVisualSector;
+					if(s != null) extrasides.AddRange(s.GetSidedefParts(line.Front).middle3d.ToArray());
+
+					s = mode.GetVisualSector(line.Back.Sector) as BaseVisualSector;
+					if(s != null) extrasides.AddRange(s.GetSidedefParts(line.Back).middle3d.ToArray());
+				}
+
+				// Add regular sides
+				if(withSameTexture) 
+				{
+					if(line.Front != null) 
+					{
+						addFrontTop = (line.Front.LongHighTexture == longtexture 
+							&& line.Front.HighRequired()
+							&& BuilderModesTools.GetSidedefPartSize(line.Front, VisualGeometryType.WALL_UPPER).IntersectsWith(rect));
+
+						addFrontMiddle = (line.Front.LongMiddleTexture == longtexture
+							&& (line.Front.MiddleRequired() || (line.Back != null && longtexture != MapSet.EmptyLongName))
+							&& line.Front.GetMiddleHeight() > 0
+							&& BuilderModesTools.GetSidedefPartSize(line.Front, VisualGeometryType.WALL_MIDDLE).IntersectsWith(rect));
+
+						addFrontBottom = (line.Front.LongLowTexture == longtexture 
+							&& line.Front.LowRequired()
+							&& BuilderModesTools.GetSidedefPartSize(line.Front, VisualGeometryType.WALL_LOWER).IntersectsWith(rect));
+
+					}
+
+					if(line.Back != null) 
+					{
+						addBackTop = (line.Back.LongHighTexture == longtexture 
+							&& line.Back.HighRequired()
+							&& BuilderModesTools.GetSidedefPartSize(line.Back, VisualGeometryType.WALL_UPPER).IntersectsWith(rect));
+
+						addBackMiddle = (line.Back.LongMiddleTexture == longtexture
+							&& (line.Back.MiddleRequired() || (line.Front != null && longtexture != MapSet.EmptyLongName))
+							&& line.Back.GetMiddleHeight() > 0
+							&& BuilderModesTools.GetSidedefPartSize(line.Back, VisualGeometryType.WALL_MIDDLE).IntersectsWith(rect));
+
+						addBackBottom = (line.Back.LongLowTexture == longtexture 
+							&& line.Back.LowRequired()
+							&& BuilderModesTools.GetSidedefPartSize(line.Back, VisualGeometryType.WALL_LOWER).IntersectsWith(rect));
+					}
+
+					// Add 3d floor sides
+					List<VisualMiddle3D> filtered = new List<VisualMiddle3D>();
+					foreach(VisualMiddle3D side3d in extrasides) 
+					{
+						Sidedef controlside = side3d.GetControlLinedef().Front;
+						if(controlside.LongMiddleTexture == longtexture && BuilderModesTools.GetSidedefPartSize(controlside, VisualGeometryType.WALL_MIDDLE).IntersectsWith(rect)) 
+						{
+							filtered.Add(side3d);
+						}
+					}
+
+					extrasides = filtered;
+				}
+
+				if(withSameHeight && rect.Height > 0) 
+				{
+					// Upper parts match?
+					if((!withSameTexture || addFrontTop) && doublesided && line.Front.HighRequired())
+					{
+						Rectangle r = BuilderModesTools.GetSidedefPartSize(line.Front, VisualGeometryType.WALL_UPPER);
+						addFrontTop = (rect.Height == r.Height && rect.Y == r.Y);
+					}
+
+					if((!withSameTexture || addBackTop) && doublesided && line.Back.HighRequired()) 
+					{
+						Rectangle r = BuilderModesTools.GetSidedefPartSize(line.Back, VisualGeometryType.WALL_UPPER);
+						addBackTop = (rect.Height == r.Height && rect.Y == r.Y);
+					}
+
+					// Middle parts match?
+					if((!withSameTexture || addFrontMiddle) 
+						&& lineHasFrontSector 
+						&& (line.Front.MiddleRequired() || line.Front.LongMiddleTexture != MapSet.EmptyLongName) ) 
+					{
+						Rectangle r = BuilderModesTools.GetSidedefPartSize(line.Front, VisualGeometryType.WALL_MIDDLE);
+						addFrontMiddle = (rect.Height == r.Height && rect.Y == r.Y);
+					}
+
+					if((!withSameTexture || addBackMiddle) 
+						&& lineHasBackSector 
+						&& (line.Back.MiddleRequired() || line.Back.LongMiddleTexture != MapSet.EmptyLongName)) 
+					{
+						Rectangle r = BuilderModesTools.GetSidedefPartSize(line.Back, VisualGeometryType.WALL_MIDDLE);
+						addBackMiddle = (rect.Height == r.Height && rect.Y == r.Y);
+					}
+
+					// Lower parts match?
+					if((!withSameTexture || addFrontBottom) && doublesided && line.Front.LowRequired()) 
+					{
+						Rectangle r = BuilderModesTools.GetSidedefPartSize(line.Front, VisualGeometryType.WALL_LOWER);
+						addFrontBottom = (rect.Height == r.Height && rect.Y == r.Y);
+					}
+
+					if((!withSameTexture || addBackBottom) && doublesided && line.Back.LowRequired()) 
+					{
+						Rectangle r = BuilderModesTools.GetSidedefPartSize(line.Back, VisualGeometryType.WALL_LOWER);
+						addBackBottom = (rect.Height == r.Height && rect.Y == r.Y);
+					}
+
+					// 3d floor parts match?
+					List<VisualMiddle3D> filtered = new List<VisualMiddle3D>();
+					foreach(VisualMiddle3D side3d in extrasides) 
+					{
+						Sidedef controlside = side3d.GetControlLinedef().Front;
+						Rectangle r = BuilderModesTools.GetSidedefPartSize(controlside, VisualGeometryType.WALL_MIDDLE);
+						if(rect.Height == r.Height && rect.Y == r.Y) 
+						{
+							filtered.Add(side3d);
+						}
+					}
+
+					extrasides = filtered;
+				}
+
+				// Select front?
+				if(addFrontTop || addFrontMiddle || addFrontBottom)
+					mode.SelectSideParts(line.Front, addFrontTop, addFrontMiddle, addFrontBottom, select, withSameTexture, withSameHeight);
+
+				// Select back?
+				if(addBackTop || addBackMiddle || addBackBottom)
+					mode.SelectSideParts(line.Back, addBackTop, addBackMiddle, addBackBottom, select, withSameTexture, withSameHeight);
+
+				// Select 3d floor sides?
+				foreach(VisualMiddle3D side3d in extrasides) 
+				{
+					if( (select && !side3d.Selected) || (!select && side3d.Selected) )
+						side3d.SelectNeighbours(select, withSameTexture, withSameHeight);
+				}
+			}
+		}
+
+		//mxd
+		public virtual bool IsSelected() 
+		{
+			return selected;
+		}
+
+		//mxd
+		protected void FitTexture(FitTextureOptions options)
+		{
+			// Create undo name
+			string s;
+			if(options.FitWidth && options.FitHeight) s = "width and height";
+			else if(options.FitWidth) s = "width";
+			else s = "height";
+
+			// Create undo
+			mode.CreateUndo("Fit texture (" + s + ")", UndoGroup.TextureOffsetChange, Sector.Sector.FixedIndex);
+			Sidedef.Fields.BeforeFieldsChange();
+			
+			// Get proper control side...
+			Linedef controlline = GetControlLinedef();
+			Sidedef controlside;
+			if(controlline != Sidedef.Line)
+			{
+				controlside = controlline.Front;
+				controlside.Fields.BeforeFieldsChange();
+			}
+			else
+			{
+				controlside = Sidedef;
+			}
+
+			// Fit width
+			if(options.FitWidth) 
+			{
+				float scalex, offsetx;
+
+				if(options.FitAcrossSurfaces) 
+				{
+					scalex = Texture.ScaledWidth / (Sidedef.Line.Length * (options.GlobalBounds.Width / Sidedef.Line.Length)) * options.HorizontalRepeat;
+					offsetx = (float)Math.Round((options.Bounds.X * scalex - Sidedef.OffsetX - options.ControlSideOffsetX) % Texture.Width, General.Map.FormatInterface.VertexDecimals);
+				} 
+				else 
+				{
+					scalex = Texture.ScaledWidth / Sidedef.Line.Length * options.HorizontalRepeat;
+					offsetx = -Sidedef.OffsetX - options.ControlSideOffsetX;
+				}
+
+				UniFields.SetFloat(controlside.Fields, "scalex_" + partname, (float)Math.Round(scalex, General.Map.FormatInterface.VertexDecimals), 1.0f);
+				UniFields.SetFloat(Sidedef.Fields, "offsetx_" + partname, offsetx, 0.0f);
+			} 
+			else 
+			{
+				// Restore initial offsets
+				UniFields.SetFloat(controlside.Fields, "scalex_" + partname, options.InitialScaleX, 1.0f);
+				UniFields.SetFloat(Sidedef.Fields, "offsetx_" + partname, options.InitialOffsetX, 0.0f);
+			}
+
+			// Fit height
+			if(options.FitHeight) 
+			{
+				if(Sidedef.Sector != null) 
+				{
+					float scaley, offsety;
+
+					if(options.FitAcrossSurfaces) 
+					{
+						scaley = Texture.ScaledHeight / (options.Bounds.Height * ((float)options.GlobalBounds.Height / options.Bounds.Height)) * options.VerticalRepeat;
+
+						if(this is VisualLower) // Special cases, special cases...
+						{ 
+							offsety = GetLowerOffsetY(scaley);
+						}
+						else if(this is VisualMiddleDouble)
+						{
+							if(Sidedef.Line.IsFlagSet(General.Map.Config.LowerUnpeggedFlag))
+								offsety = (options.Bounds.Y - Sidedef.GetHighHeight() - Sidedef.GetLowHeight()) * scaley - Sidedef.OffsetY;
+							else
+								offsety = options.Bounds.Y * scaley - Sidedef.OffsetY;
+						}
+						else
+						{
+							offsety = Tools.GetSidedefOffsetY(Sidedef, geometrytype, options.Bounds.Y * scaley - Sidedef.OffsetY - options.ControlSideOffsetY, scaley, true) % Texture.Height;
+						}
+					} 
+					else 
+					{
+						scaley = Texture.ScaledHeight / options.Bounds.Height * options.VerticalRepeat;
+
+						if(this is VisualLower) // Special cases, special cases...
+							offsety = GetLowerOffsetY(scaley);
+						else
+							offsety = Tools.GetSidedefOffsetY(Sidedef, geometrytype, -Sidedef.OffsetY - options.ControlSideOffsetY, scaley, true) % Texture.Height;
+					}
+
+					UniFields.SetFloat(controlside.Fields, "scaley_" + partname, (float)Math.Round(scaley, General.Map.FormatInterface.VertexDecimals), 1.0f);
+					UniFields.SetFloat(Sidedef.Fields, "offsety_" + partname, (float)Math.Round(offsety, General.Map.FormatInterface.VertexDecimals), 0.0f);
+				}
+			} 
+			else 
+			{
+				// Restore initial offsets
+				UniFields.SetFloat(controlside.Fields, "scaley_" + partname, options.InitialScaleY, 1.0f);
+				UniFields.SetFloat(Sidedef.Fields, "offsety_" + partname, options.InitialOffsetY, 0.0f);
+			}
+		}
+
+		//mxd. Oh so special cases...
+		private float GetLowerOffsetY(float scaley) 
+		{
+			if(Sidedef.Line.IsFlagSet(General.Map.Config.LowerUnpeggedFlag))
+				return ((-Sidedef.OffsetY - Sidedef.GetMiddleHeight() - Sidedef.GetHighHeight()) * scaley) % Texture.Height;
+			return (-Sidedef.OffsetY * scaley) % Texture.Height;
+		}
+		
+		#endregion
+
+		#region ================== Events
+		
+		// Unused
+		public virtual void OnEditBegin() { }
+		protected virtual void SetTexture(string texturename) { }
+		public abstract bool Setup();
+		protected abstract void SetTextureOffsetX(int x);
+		protected abstract void SetTextureOffsetY(int y);
+		protected virtual void ResetTextureScale() { } //mxd
+		protected abstract void MoveTextureOffset(Point xy);
+		protected abstract Point GetTextureOffset();
+		public virtual void SelectNeighbours(bool select, bool withSameTexture, bool withSameHeight) { } //mxd
+		public virtual void OnTextureFit(FitTextureOptions options) { } //mxd
+		
+		// Insert middle texture
+		public virtual void OnInsert()
+		{
+			// No middle texture yet?
+			if(!Sidedef.MiddleRequired() && (string.IsNullOrEmpty(Sidedef.MiddleTexture) || (Sidedef.MiddleTexture == "-")))
+			{
+				// Make it now
+				mode.CreateUndo("Create middle texture");
+				mode.SetActionResult("Created middle texture.");
+				General.Settings.FindDefaultDrawSettings();
+				Sidedef.SetTextureMid(General.Map.Options.DefaultWallTexture);
+
+				// Update
+				Sector.Changed = true;
+				
+				// Other side as well
+				if(string.IsNullOrEmpty(Sidedef.Other.MiddleTexture) || (Sidedef.Other.MiddleTexture == "-"))
+				{
+					Sidedef.Other.SetTextureMid(General.Map.Options.DefaultWallTexture);
+
+					// Update
+					VisualSector othersector = mode.GetVisualSector(Sidedef.Other.Sector);
+					if(othersector is BaseVisualSector) (othersector as BaseVisualSector).Changed = true;
+				}
+			}
+		}
+
+		// Delete texture
+		public virtual void OnDelete()
+		{
+			// Remove texture
+			mode.CreateUndo("Delete texture");
+			mode.SetActionResult("Deleted a texture.");
+			SetTexture("-");
+
+			// Update
+			Sector.UpdateSectorGeometry(true);
+		}
+		
+		// Processing
+		public virtual void OnProcess(float deltatime)
+		{
+			// If the texture was not loaded, but is loaded now, then re-setup geometry
+			if(setuponloadedtexture != 0)
+			{
+				ImageData t = General.Map.Data.GetTextureImage(setuponloadedtexture);
+				if(t != null)
+				{
+					if(t.IsImageLoaded)
+					{
+						setuponloadedtexture = 0;
+						Setup();
+					}
+				}
+			}
+		}
+		
+		// Change target height
+		public virtual void OnChangeTargetHeight(int amount)
+		{
+			switch(BuilderPlug.Me.ChangeHeightBySidedef)
+			{
+				// Change ceiling
+				case 1:
+					if(!this.Sector.Ceiling.Changed) this.Sector.Ceiling.OnChangeTargetHeight(amount);
+					break;
+
+				// Change floor
+				case 2:
+					if(!this.Sector.Floor.Changed) this.Sector.Floor.OnChangeTargetHeight(amount);
+					break;
+
+				// Change both
+				case 3:
+					if(!this.Sector.Floor.Changed) this.Sector.Floor.OnChangeTargetHeight(amount);
+					if(!this.Sector.Ceiling.Changed) this.Sector.Ceiling.OnChangeTargetHeight(amount);
+					break;
+			}
+		}
+		
+		// Reset texture offsets
+		public virtual void OnResetTextureOffset()
+		{
+			mode.CreateUndo("Reset texture offsets");
+			mode.SetActionResult("Texture offsets reset.");
+
+			// Apply offsets
+			Sidedef.OffsetX = 0;
+			Sidedef.OffsetY = 0;
+			
+			// Update sidedef geometry
+			VisualSidedefParts parts = Sector.GetSidedefParts(Sidedef);
+			parts.SetupAllParts();
+		}
+
+		//mxd
+		public virtual void OnResetLocalTextureOffset() 
+		{
+			if(!General.Map.UDMF) 
+			{
+				OnResetTextureOffset();
+				return;
+			}
+
+			mode.CreateUndo("Reset local texture offsets, scale and brightness");
+			mode.SetActionResult("Local texture offsets, scale and brightness reset.");
+
+			// Reset texture offsets
+			SetTextureOffsetX(0);
+			SetTextureOffsetY(0);
+
+			// Scale
+			ResetTextureScale();
+
+			// And brightness
+			if(Sidedef.Fields.ContainsKey("light")) Sidedef.Fields.Remove("light");
+			if(Sidedef.Fields.ContainsKey("lightabsolute")) Sidedef.Fields.Remove("lightabsolute");
+
+			// Update sidedef geometry
+			VisualSidedefParts parts = Sector.GetSidedefParts(Sidedef);
+			parts.SetupAllParts();
+		}
+		
+		// Toggle upper-unpegged
+		public virtual void OnToggleUpperUnpegged()
+		{
+			if(this.Sidedef.Line.IsFlagSet(General.Map.Config.UpperUnpeggedFlag))
+			{
+				// Remove flag
+				mode.ApplyUpperUnpegged(false);
+			}
+			else
+			{
+				// Add flag
+				mode.ApplyUpperUnpegged(true);
+			}
+		}
+
+		// Toggle lower-unpegged
+		public virtual void OnToggleLowerUnpegged()
+		{
+			if(this.Sidedef.Line.IsFlagSet(General.Map.Config.LowerUnpeggedFlag))
+			{
+				// Remove flag
+				mode.ApplyLowerUnpegged(false);
+			}
+			else
+			{
+				// Add flag
+				mode.ApplyLowerUnpegged(true);
+			}
+		}
+
+		
+		// This sets the Upper Unpegged flag
+		public virtual void ApplyUpperUnpegged(bool set)
+		{
+			if(!set)
+			{
+				// Remove flag
+				mode.CreateUndo("Remove upper-unpegged setting");
+				mode.SetActionResult("Removed upper-unpegged setting.");
+				this.Sidedef.Line.SetFlag(General.Map.Config.UpperUnpeggedFlag, false);
+			}
+			else
+			{
+				// Add flag
+				mode.CreateUndo("Set upper-unpegged setting");
+				mode.SetActionResult("Set upper-unpegged setting.");
+				this.Sidedef.Line.SetFlag(General.Map.Config.UpperUnpeggedFlag, true);
+			}
+
+			// Update sidedef geometry
+			VisualSidedefParts parts = Sector.GetSidedefParts(Sidedef);
+			parts.SetupAllParts();
+			
+			// Update other sidedef geometry
+			if(Sidedef.Other != null)
+			{
+				BaseVisualSector othersector = (BaseVisualSector)mode.GetVisualSector(Sidedef.Other.Sector);
+				parts = othersector.GetSidedefParts(Sidedef.Other);
+				parts.SetupAllParts();
+			}
+		}
+		
+		
+		// This sets the Lower Unpegged flag
+		public virtual void ApplyLowerUnpegged(bool set)
+		{
+			if(!set)
+			{
+				// Remove flag
+				mode.CreateUndo("Remove lower-unpegged setting");
+				mode.SetActionResult("Removed lower-unpegged setting.");
+				this.Sidedef.Line.SetFlag(General.Map.Config.LowerUnpeggedFlag, false);
+			}
+			else
+			{
+				// Add flag
+				mode.CreateUndo("Set lower-unpegged setting");
+				mode.SetActionResult("Set lower-unpegged setting.");
+				this.Sidedef.Line.SetFlag(General.Map.Config.LowerUnpeggedFlag, true);
+			}
+
+			// Update sidedef geometry
+			VisualSidedefParts parts = Sector.GetSidedefParts(Sidedef);
+			parts.SetupAllParts();
+
+			// Update other sidedef geometry
+			if(Sidedef.Other != null)
+			{
+				BaseVisualSector othersector = (BaseVisualSector)mode.GetVisualSector(Sidedef.Other.Sector);
+				parts = othersector.GetSidedefParts(Sidedef.Other);
+				parts.SetupAllParts();
+			}
+		}
+
+
+		// Flood-fill textures
+		public virtual void OnTextureFloodfill()
+		{
+			if(BuilderPlug.Me.CopiedTexture != null)
+			{
+				string oldtexture = GetTextureName();
+				long oldtexturelong = Lump.MakeLongName(General.Map.Data.GetFullTextureName(oldtexture)); //mxd
+				string newtexture = BuilderPlug.Me.CopiedTexture;
+				if(newtexture != oldtexture)
+				{
+					mode.CreateUndo("Flood-fill textures with " + newtexture);
+					mode.SetActionResult("Flood-filled textures with " + newtexture + ".");
+					
+					mode.Renderer.SetCrosshairBusy(true);
+					General.Interface.RedrawDisplay();
+
+					// Get the texture
+					ImageData newtextureimage = General.Map.Data.GetTextureImage(newtexture);
+					if(newtextureimage != null)
+					{
+						if(mode.IsSingleSelection)
+						{
+							// Clear all marks, this will align everything it can
+							General.Map.Map.ClearMarkedSidedefs(false);
+						}
+						else
+						{
+							// Limit the alignment to selection only
+							General.Map.Map.ClearMarkedSidedefs(true);
+							List<Sidedef> sides = mode.GetSelectedSidedefs();
+							foreach(Sidedef sd in sides) sd.Marked = false;
+						}
+						
+						// Do the alignment
+						Tools.FloodfillTextures(this.Sidedef, oldtexturelong, newtexture, false);
+
+						// Get the changed sidedefs
+						List<Sidedef> changes = General.Map.Map.GetMarkedSidedefs(true);
+						foreach(Sidedef sd in changes)
+						{
+							// Update the parts for this sidedef!
+							if(mode.VisualSectorExists(sd.Sector))
+							{
+								BaseVisualSector vs = (mode.GetVisualSector(sd.Sector) as BaseVisualSector);
+								VisualSidedefParts parts = vs.GetSidedefParts(sd);
+								parts.SetupAllParts();
+							}
+						}
+
+						General.Map.Data.UpdateUsedTextures();
+						mode.Renderer.SetCrosshairBusy(false);
+						mode.ShowTargetInfo();
+					}
+				}
+			}
+		}
+		
+		// Auto-align texture offsets
+		public virtual void OnTextureAlign(bool alignx, bool aligny)
+		{
+			//mxd
+			string rest;
+			if(alignx && aligny) rest = "(X and Y)";
+			else if(alignx)	rest = "(X)";
+			else rest = "(Y)";
+
+			mode.CreateUndo("Auto-align textures " + rest);
+			mode.SetActionResult("Auto-aligned textures " + rest + ".");
+			
+			// Make sure the texture is loaded (we need the texture size)
+			if(!base.Texture.IsImageLoaded) base.Texture.LoadImage();
+			
+			if(mode.IsSingleSelection)
+			{
+				// Clear all marks, this will align everything it can
+				General.Map.Map.ClearMarkedSidedefs(false);
+			}
+			else
+			{
+				// Limit the alignment to selection only
+				General.Map.Map.ClearMarkedSidedefs(true);
+				List<Sidedef> sides = mode.GetSelectedSidedefs();
+				foreach(Sidedef sd in sides) sd.Marked = false;
+			}
+			
+			// Do the alignment
+			mode.AutoAlignTextures(this, base.Texture, alignx, aligny, false, true);
+
+			// Get the changed sidedefs
+			List<Sidedef> changes = General.Map.Map.GetMarkedSidedefs(true);
+			foreach(Sidedef sd in changes)
+			{
+				// Update the parts for this sidedef!
+				if(mode.VisualSectorExists(sd.Sector))
+				{
+					BaseVisualSector vs = (BaseVisualSector)mode.GetVisualSector(sd.Sector);
+					VisualSidedefParts parts = vs.GetSidedefParts(sd);
+					parts.SetupAllParts();
+				}
+			}
+		}
+		
+		// Select texture
+		public virtual void OnSelectTexture()
+		{
+			if(General.Interface.IsActiveWindow)
+			{
+				string oldtexture = GetTextureName();
+				string newtexture = General.Interface.BrowseTexture(General.Interface, oldtexture);
+				if(newtexture != oldtexture)
+				{
+					mode.ApplySelectTexture(newtexture, false);
+				}
+			}
+		}
+
+		// Apply Texture
+		public virtual void ApplyTexture(string texture)
+		{
+			mode.CreateUndo("Change texture " + texture);
+			SetTexture(texture);
+			OnTextureChanged();//mxd
+		}
+		
+		// Paste texture
+		public virtual void OnPasteTexture()
+		{
+			if(BuilderPlug.Me.CopiedTexture != null)
+			{
+				mode.CreateUndo("Paste texture '" + BuilderPlug.Me.CopiedTexture + "'");
+				mode.SetActionResult("Pasted texture '" + BuilderPlug.Me.CopiedTexture + "'.");
+				SetTexture(BuilderPlug.Me.CopiedTexture);
+				OnTextureChanged();//mxd
+			}
+		}
+		
+		// Paste texture offsets
+		public virtual void OnPasteTextureOffsets()
+		{
+			mode.CreateUndo("Paste texture offsets");
+			if(General.Map.UDMF) 
+			{
+				SetTextureOffsetX(BuilderPlug.Me.CopiedOffsets.X);
+				SetTextureOffsetY(BuilderPlug.Me.CopiedOffsets.Y);
+			} 
+			else 
+			{
+				Sidedef.OffsetX = BuilderPlug.Me.CopiedOffsets.X;
+				Sidedef.OffsetY = BuilderPlug.Me.CopiedOffsets.Y;
+			}
+			mode.SetActionResult("Pasted texture offsets " + BuilderPlug.Me.CopiedOffsets.X + ", " + BuilderPlug.Me.CopiedOffsets.Y + ".");
+			
+			// Update sidedef geometry
+			VisualSidedefParts parts = Sector.GetSidedefParts(Sidedef);
+			parts.SetupAllParts();
+		}
+		
+		// Copy texture
+		public virtual void OnCopyTexture()
+		{
+			//mxd. When UseLongTextureNames is disabled, use texture name as stored in Sidedef, otherwise use full name.
+			string texturename = ((General.Map.Options.UseLongTextureNames && Texture != null && Texture.UsedInMap) ? Texture.Name : GetTextureName());
+			BuilderPlug.Me.CopiedTexture = texturename;
+			if(General.Map.Config.MixTexturesFlats) BuilderPlug.Me.CopiedFlat = texturename;
+			mode.SetActionResult("Copied texture '" + texturename + "'.");
+		}
+		
+		// Copy texture offsets
+		public virtual void OnCopyTextureOffsets()
+		{
+			//mxd
+			BuilderPlug.Me.CopiedOffsets = General.Map.UDMF ? GetTextureOffset() : new Point(Sidedef.OffsetX, Sidedef.OffsetY);
+			mode.SetActionResult("Copied texture offsets " + BuilderPlug.Me.CopiedOffsets.X + ", " + BuilderPlug.Me.CopiedOffsets.Y + ".");
+		}
+
+		// Copy properties
+		public virtual void OnCopyProperties()
+		{
+			BuilderPlug.Me.CopiedLinedefProps = new LinedefProperties(Sidedef.Line); //mxd
+			BuilderPlug.Me.CopiedSidedefProps = new SidedefProperties(Sidedef);
+			mode.SetActionResult("Copied linedef and sidedef properties.");
+		}
+
+		// Paste properties
+		public virtual void OnPasteProperties(bool usecopysettings)
+		{
+			if(BuilderPlug.Me.CopiedLinedefProps != null)
+			{
+				bool pastesideprops = (BuilderPlug.Me.CopiedSidedefProps != null); //mxd
+				string pastetarget = (pastesideprops ? "linedef and sidedef" : "linedef"); //mxd
+				mode.CreateUndo("Paste " + pastetarget + " properties");
+				mode.SetActionResult("Pasted " + pastetarget + " properties.");
+				BuilderPlug.Me.CopiedLinedefProps.Apply(Sidedef.Line, usecopysettings, false); //mxd
+				if(pastesideprops) BuilderPlug.Me.CopiedSidedefProps.Apply(Sidedef, usecopysettings); //mxd. Added "usecopysettings"
+				
+				// Update sectors on both sides
+				BaseVisualSector front = (BaseVisualSector)mode.GetVisualSector(Sidedef.Sector);
+				if(front != null) front.Changed = true;
+				if(Sidedef.Other != null)
+				{
+					BaseVisualSector back = (BaseVisualSector)mode.GetVisualSector(Sidedef.Other.Sector);
+					if(back != null) back.Changed = true;
+				}
+				mode.ShowTargetInfo();
+			}
+		}
+		
+		// Return texture name
+		public virtual string GetTextureName() { return ""; }
+		
+		// Select button pressed
+		public virtual void OnSelectBegin()
+		{
+			mode.LockTarget();
+			dragstartanglexy = General.Map.VisualCamera.AngleXY;
+			dragstartanglez = General.Map.VisualCamera.AngleZ;
+			dragorigin = pickintersect;
+			startoffsetx = GetTextureOffset().X;
+			startoffsety = GetTextureOffset().Y;
+			prevoffsetx = GetTextureOffset().X;
+			prevoffsety = GetTextureOffset().Y;
+		}
+		
+		// Select button released
+		public virtual void OnSelectEnd()
+		{
+			mode.UnlockTarget();
+			
+			// Was dragging?
+			if(uvdragging)
+			{
+				// Dragging stops now
+				uvdragging = false;
+			}
+			else
+			{
+				// Add/remove selection
+				if(this.selected)
+				{
+					this.selected = false;
+					mode.RemoveSelectedObject(this);
+				}
+				else
+				{
+					this.selected = true;
+					mode.AddSelectedObject(this);
+				}
+			}
+		}
+		
+		// Edit button released
+		public virtual void OnEditEnd()
+		{
+			if(General.Interface.IsActiveWindow)
+			{
+				List<Linedef> linedefs = mode.GetSelectedLinedefs();
+				updateList = new List<BaseVisualSector>(); //mxd
+				foreach(Linedef l in linedefs) 
+				{
+					if(l.Front != null && mode.VisualSectorExists(l.Front.Sector)) 
+						updateList.Add((BaseVisualSector)mode.GetVisualSector(l.Front.Sector));
+					if(l.Back != null && mode.VisualSectorExists(l.Back.Sector))
+						updateList.Add((BaseVisualSector)mode.GetVisualSector(l.Back.Sector));
+				}
+
+				General.Interface.OnEditFormValuesChanged += Interface_OnEditFormValuesChanged;
+				mode.StartRealtimeInterfaceUpdate(SelectionType.Linedefs);
+				DialogResult result = General.Interface.ShowEditLinedefs(linedefs, Sidedef.IsFront, !Sidedef.IsFront);
+				mode.StopRealtimeInterfaceUpdate(SelectionType.Linedefs);
+				General.Interface.OnEditFormValuesChanged -= Interface_OnEditFormValuesChanged;
+
+				updateList.Clear();
+				updateList = null;
+
+				//mxd. Effects may need updating...
+				if(result == DialogResult.OK) mode.RebuildElementData();
+			}
+		}
+
+		//mxd
+		private void Interface_OnEditFormValuesChanged(object sender, EventArgs e) 
+		{
+			foreach(BaseVisualSector vs in updateList) vs.UpdateSectorGeometry(false);
+		}
+		
+		// Mouse moves
+		public virtual void OnMouseMove(MouseEventArgs e)
+		{
+			// Dragging UV?
+			if(uvdragging)
+			{
+				UpdateDragUV();
+			}
+			else
+			{
+				// Select button pressed?
+				if(General.Actions.CheckActionActive(General.ThisAssembly, "visualselect"))
+				{
+					// Check if tolerance is exceeded to start UV dragging
+					float deltaxy = General.Map.VisualCamera.AngleXY - dragstartanglexy;
+					float deltaz = General.Map.VisualCamera.AngleZ - dragstartanglez;
+					if((Math.Abs(deltaxy) + Math.Abs(deltaz)) > DRAG_ANGLE_TOLERANCE)
+					{
+						mode.PreAction(UndoGroup.TextureOffsetChange);
+						mode.CreateUndo("Change texture offsets");
+
+						// Start drag now
+						uvdragging = true;
+						mode.Renderer.ShowSelection = false;
+						mode.Renderer.ShowHighlight = false;
+						UpdateDragUV();
+					}
+				}
+			}
+		}
+		
+		// This is called to update UV dragging
+		protected virtual void UpdateDragUV()
+		{
+			float u_ray;
+			
+			// Calculate intersection position
+			Line2D ray = new Line2D(General.Map.VisualCamera.Position, General.Map.VisualCamera.Target);
+			Sidedef.Line.Line.GetIntersection(ray, out u_ray);
+			Vector3D intersect = General.Map.VisualCamera.Position + (General.Map.VisualCamera.Target - General.Map.VisualCamera.Position) * u_ray;
+			
+			// Calculate offsets
+			Vector3D dragdelta = intersect - dragorigin;
+			Vector3D dragdeltaxy = dragdelta * deltaxy;
+			Vector3D dragdeltaz = dragdelta * deltaz;
+			float offsetx = dragdeltaxy.GetLength();
+			float offsety = dragdeltaz.GetLength();
+			if((Math.Sign(dragdeltaxy.x) < 0) || (Math.Sign(dragdeltaxy.y) < 0) || (Math.Sign(dragdeltaxy.z) < 0)) offsetx = -offsetx;
+			if((Math.Sign(dragdeltaz.x) < 0) || (Math.Sign(dragdeltaz.y) < 0) || (Math.Sign(dragdeltaz.z) < 0)) offsety = -offsety;
+			
+			// Apply offsets
+			if(General.Interface.CtrlState && General.Interface.ShiftState) 
+			{ 
+				//mxd. Clamp to grid size?
+				int newoffsetx = startoffsetx - (int)Math.Round(offsetx);
+				int newoffsety = startoffsety + (int)Math.Round(offsety);
+				int dx = prevoffsetx - newoffsetx;
+				int dy = prevoffsety - newoffsety;
+
+				if(Math.Abs(dx) >= General.Map.Grid.GridSize) 
+				{
+					dx = General.Map.Grid.GridSize * Math.Sign(dx);
+					prevoffsetx = newoffsetx;
+				} 
+				else 
+				{
+					dx = 0;
+				}
+
+				if(Math.Abs(dy) >= General.Map.Grid.GridSize) 
+				{
+					dy = General.Map.Grid.GridSize * Math.Sign(dy);
+					prevoffsety = newoffsety;
+				} 
+				else 
+				{
+					dy = 0;
+				}
+
+				if(dx != 0 || dy != 0) mode.ApplyTextureOffsetChange(dx, dy);
+			} 
+			else 
+			{ 
+				//mxd. Constraint to axis?
+				int newoffsetx = (General.Interface.CtrlState ? startoffsetx : startoffsetx - (int)Math.Round(offsetx)); //mxd
+				int newoffsety = (General.Interface.ShiftState ? startoffsety : startoffsety + (int)Math.Round(offsety)); //mxd
+				mode.ApplyTextureOffsetChange(prevoffsetx - newoffsetx, prevoffsety - newoffsety);
+				prevoffsetx = newoffsetx;
+				prevoffsety = newoffsety;
+			}
+			
+			mode.ShowTargetInfo();
+		}
+		
+		// Sector brightness change
+		public virtual void OnChangeTargetBrightness(bool up)
+		{
+			//mxd. Change UDMF wall light?
+			if(General.Map.UDMF)
+			{
+				int light = Sidedef.Fields.GetValue("light", 0);
+				bool absolute = Sidedef.Fields.GetValue("lightabsolute", false);
+				int newlight;
+
+				if(up)
+					newlight = General.Map.Config.BrightnessLevels.GetNextHigher(light, absolute);
+				else
+					newlight = General.Map.Config.BrightnessLevels.GetNextLower(light, absolute);
+
+				if(newlight == light) return;
+
+				//create undo
+				mode.CreateUndo("Change wall brightness", UndoGroup.SurfaceBrightnessChange, Sector.Sector.FixedIndex);
+				Sidedef.Fields.BeforeFieldsChange();
+
+				//apply changes
+				UniFields.SetInteger(Sidedef.Fields, "light", newlight, (absolute ? int.MinValue : 0));
+				Tools.UpdateLightFogFlag(Sidedef);
+				mode.SetActionResult("Changed wall brightness to " + newlight + ".");
+				Sector.Sector.UpdateCache();
+
+				//rebuild sector
+				Sector.UpdateSectorGeometry(false);
+			}
+			else if(!Sector.Changed)
+			{
+				// Change brightness
+				mode.CreateUndo("Change sector brightness", UndoGroup.SectorBrightnessChange, Sector.Sector.FixedIndex);
+
+				if(up)
+					Sector.Sector.Brightness = General.Map.Config.BrightnessLevels.GetNextHigher(Sector.Sector.Brightness);
+				else
+					Sector.Sector.Brightness = General.Map.Config.BrightnessLevels.GetNextLower(Sector.Sector.Brightness);
+				
+				mode.SetActionResult("Changed sector brightness to " + Sector.Sector.Brightness + ".");
+
+				Sector.Sector.UpdateCache();
+				
+				// Rebuild sector
+				Sector.UpdateSectorGeometry(false);
+
+				// Go for all things in this sector
+				foreach(Thing t in General.Map.Map.Things)
+				{
+					if(t.Sector == Sector.Sector)
+					{
+						if(mode.VisualThingExists(t))
+						{
+							// Update thing
+							BaseVisualThing vt = (mode.GetVisualThing(t) as BaseVisualThing);
+							vt.Changed = true;
+						}
+					}
+				}
+			}
+		}
+		
+		// Texture offset change
+		public virtual void OnChangeTextureOffset(int horizontal, int vertical, bool doSurfaceAngleCorrection)
+		{
+			if((General.Map.UndoRedo.NextUndo == null) || (General.Map.UndoRedo.NextUndo.TicketID != undoticket))
+				undoticket = mode.CreateUndo("Change texture offsets");
+			
+			//mxd
+			if(General.Map.UDMF) 
+			{
+				// Apply UDMF offsets
+				MoveTextureOffset(new Point(-horizontal, -vertical));
+				Point p = GetTextureOffset();
+				mode.SetActionResult("Changed texture offsets to " + p.X + ", " + p.Y + ".");
+			} 
+			else 
+			{
+				//mxd. Apply classic offsets
+				Sidedef.OffsetX = (Sidedef.OffsetX - horizontal);
+				if(Texture != null) Sidedef.OffsetX %= Texture.Width;
+				Sidedef.OffsetY = (Sidedef.OffsetY - vertical);
+				if(geometrytype != VisualGeometryType.WALL_MIDDLE && Texture != null) Sidedef.OffsetY %= Texture.Height;
+
+				mode.SetActionResult("Changed texture offsets to " + Sidedef.OffsetX + ", " + Sidedef.OffsetY + ".");
+			}
+			
+			// Update sidedef geometry
+			VisualSidedefParts parts = Sector.GetSidedefParts(Sidedef);
+			parts.SetupAllParts();
+		}
+
+		//mxd
+		public virtual void OnChangeScale(int incrementX, int incrementY) 
+		{
+			if(!General.Map.UDMF || !Texture.IsImageLoaded) return;
+
+			if((General.Map.UndoRedo.NextUndo == null) || (General.Map.UndoRedo.NextUndo.TicketID != undoticket))
+				undoticket = mode.CreateUndo("Change wall scale");
+
+			string keyX;
+			string keyY;
+
+			switch(GeometryType) 
+			{
+				case VisualGeometryType.WALL_UPPER:
+					keyX = "scalex_top";
+					keyY = "scaley_top";
+					break;
+
+				case VisualGeometryType.WALL_MIDDLE:
+				case VisualGeometryType.WALL_MIDDLE_3D:
+					keyX = "scalex_mid";
+					keyY = "scaley_mid";
+					break;
+
+				case VisualGeometryType.WALL_LOWER:
+					keyX = "scalex_bottom";
+					keyY = "scaley_bottom";
+					break;
+
+				default:
+					throw new Exception("OnChangeTextureScale(): Got unknown GeometryType: " + GeometryType);
+			}
+
+			float scaleX = Sidedef.Fields.GetValue(keyX, 1.0f);
+			float scaleY = Sidedef.Fields.GetValue(keyY, 1.0f);
+
+			Sidedef.Fields.BeforeFieldsChange();
+
+			if(incrementX != 0)
+			{
+				float pix = (int)Math.Round(Texture.Width * scaleX) - incrementX;
+				float newscaleX = (float)Math.Round(pix / Texture.Width, 3);
+				scaleX = (newscaleX == 0 ? scaleX * -1 : newscaleX);
+				UniFields.SetFloat(Sidedef.Fields, keyX, scaleX, 1.0f);
+			}
+
+			if(incrementY != 0) 
+			{
+				float pix = (int)Math.Round(Texture.Height * scaleY) - incrementY;
+				float newscaleY = (float)Math.Round(pix / Texture.Height, 3);
+				scaleY = (newscaleY == 0 ? scaleY * -1 : newscaleY);
+				UniFields.SetFloat(Sidedef.Fields, keyY, scaleY, 1.0f);
+			}
+
+			//update geometry
+			Setup();
+			mode.SetActionResult("Wall scale changed to " + scaleX.ToString("F03", CultureInfo.InvariantCulture) + ", " + scaleY.ToString("F03", CultureInfo.InvariantCulture) + " (" + (int)Math.Round(Texture.Width / scaleX) + " x " + (int)Math.Round(Texture.Height / scaleY) + ").");
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/VisualModes/BaseVisualMode.cs b/Source/Plugins/BuilderModes/VisualModes/BaseVisualMode.cs
new file mode 100644
index 0000000..2d01ae7
--- /dev/null
+++ b/Source/Plugins/BuilderModes/VisualModes/BaseVisualMode.cs
@@ -0,0 +1,4241 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.BuilderModes.Interface;
+using CodeImp.DoomBuilder.Windows;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Editing;
+using CodeImp.DoomBuilder.Actions;
+using CodeImp.DoomBuilder.VisualModes;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.GZBuilder.Data;
+using CodeImp.DoomBuilder.Types;
+using CodeImp.DoomBuilder.Data;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	[EditMode(DisplayName = "GZDB Visual Mode",
+			  SwitchAction = "gzdbvisualmode", // Action name used to switch to this mode
+			  ButtonImage = "VisualModeGZ.png",	// Image resource name for the button
+			  ButtonOrder = 1,					// Position of the button (lower is more to the left)
+			  ButtonGroup = "001_visual",
+			  UseByDefault = true)]
+
+	public class BaseVisualMode : VisualMode
+	{
+		#region ================== Constants
+		// Object picking
+		private const float PICK_INTERVAL = 80.0f;
+		private const float PICK_RANGE = 0.98f;
+
+		// Gravity
+		private const float GRAVITY = -0.06f;
+		
+		#endregion
+		
+		#region ================== Variables
+
+		// Gravity
+		private Vector3D gravity;
+		private float cameraflooroffset = 41f;		// same as in doom
+		private float cameraceilingoffset = 10f;
+		
+		// Object picking
+		private VisualPickResult target;
+		private float lastpicktime;
+		private bool locktarget;
+		private bool useSelectionFromClassicMode;//mxd
+		private readonly Timer selectioninfoupdatetimer; //mxd
+
+		// This keeps extra element info
+		private Dictionary<Sector, SectorData> sectordata;
+		private Dictionary<Thing, ThingData> thingdata;
+		private Dictionary<Vertex, VertexData> vertexdata; //mxd
+		//private Dictionary<Thing, EffectDynamicLight> lightdata; //mxd
+		
+		// This is true when a selection was made because the action is performed
+		// on an object that was not selected. In this case the previous selection
+		// is cleared and the targeted object is temporarely selected to perform
+		// the action on. After the action is completed, the object is deselected.
+		private bool singleselection;
+		
+		// We keep these to determine if we need to make a new undo level
+		private bool selectionchanged;
+		private int lastundogroup;
+		private VisualActionResult actionresult;
+		private bool undocreated;
+
+		// List of selected objects when an action is performed
+		private List<IVisualEventReceiver> selectedobjects;
+		
+		//mxd. Used in Cut/PasteSelection actions
+		private readonly List<ThingCopyData> copybuffer;
+		private Type lasthighlighttype;
+
+		private static bool gzdoomRenderingEffects = true; //mxd
+
+		//mxd. Moved here from Tools
+		private struct SidedefAlignJob
+		{
+			public Sidedef sidedef;
+
+			public float offsetx;
+			public float scaleX; //mxd
+			public float scaleY; //mxd
+
+			private Sidedef controlside; //mxd
+			public Sidedef controlSide
+			{
+				get
+				{
+					return controlside;
+				}
+				set
+				{
+					controlside = value;
+					ceilingheight = (controlside.Index != sidedef.Index && controlside.Line.Args[1] == 0 ? controlside.Sector.FloorHeight : controlside.Sector.CeilHeight);
+				}
+			}
+
+			private int ceilingheight; //mxd
+			public int ceilingHeight { get { return ceilingheight; } } //mxd
+
+			// When this is true, the previous sidedef was on the left of
+			// this one and the texture X offset of this sidedef can be set
+			// directly. When this is false, the length of this sidedef
+			// must be subtracted from the X offset first.
+			public bool forward;
+		}
+		
+		#endregion
+		
+		#region ================== Properties
+
+		public override object HighlightedObject
+		{
+			get
+			{
+				// Geometry picked?
+				if(target.picked is VisualGeometry)
+				{
+					VisualGeometry pickedgeo = (target.picked as VisualGeometry);
+
+					if(pickedgeo.Sidedef != null) return pickedgeo.Sidedef;
+					if(pickedgeo.Sector != null) return pickedgeo.Sector;
+					return null;
+				}
+				// Thing picked?
+				if(target.picked is VisualThing)
+				{
+					VisualThing pickedthing = (target.picked as VisualThing);
+					return pickedthing.Thing;
+				}
+
+				return null;
+			}
+		}
+
+		public object HighlightedTarget { get { return target.picked; } } //mxd
+		public static bool GZDoomRenderingEffects { get { return gzdoomRenderingEffects; } } //mxd
+		public bool UseSelectionFromClassicMode { get { return useSelectionFromClassicMode; } } //mxd
+
+		new public IRenderer3D Renderer { get { return renderer; } }
+		
+		public bool IsSingleSelection { get { return singleselection; } }
+		public bool SelectionChanged { get { return selectionchanged; } set { selectionchanged |= value; } }
+
+		#endregion
+		
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public BaseVisualMode()
+		{
+			// Initialize
+			this.gravity = new Vector3D(0.0f, 0.0f, 0.0f);
+			this.selectedobjects = new List<IVisualEventReceiver>();
+			
+			//mxd
+			this.copybuffer = new List<ThingCopyData>();
+			this.selectioninfoupdatetimer = new Timer();
+			selectioninfoupdatetimer.Interval = 100;
+			selectioninfoupdatetimer.Tick += SelectioninfoupdatetimerOnTick;
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Disposer
+		public override void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Clean up
+				
+				// Done
+				base.Dispose();
+			}
+		}
+
+		#endregion
+		
+		#region ================== Methods
+
+		// This calculates brightness level
+		internal int CalculateBrightness(int level)
+		{
+			return renderer.CalculateBrightness(level);
+		}
+
+		//mxd. This calculates brightness level with doom-style shading
+		internal int CalculateBrightness(int level, Sidedef sd) 
+		{
+			return renderer.CalculateBrightness(level, sd);
+		}
+		
+		// This adds a selected object
+		internal void AddSelectedObject(IVisualEventReceiver obj)
+		{
+			selectedobjects.Add(obj);
+			selectionchanged = true;
+			selectioninfoupdatetimer.Start(); //mxd
+		}
+		
+		// This removes a selected object
+		internal void RemoveSelectedObject(IVisualEventReceiver obj)
+		{
+			selectedobjects.Remove(obj);
+			selectionchanged = true;
+			selectioninfoupdatetimer.Start(); //mxd
+		}
+		
+		// This is called before an action is performed
+		public void PreAction(int multiselectionundogroup)
+		{
+			actionresult = new VisualActionResult();
+			
+			PickTargetUnlocked();
+			
+			// If the action is not performed on a selected object, clear the
+			// current selection and make a temporary selection for the target.
+			if((target.picked != null) && !target.picked.Selected && (BuilderPlug.Me.VisualModeClearSelection || (selectedobjects.Count == 0)))
+			{
+				// Single object, no selection
+				singleselection = true;
+				ClearSelection();
+				undocreated = false;
+			}
+			else
+			{
+				singleselection = false;
+				
+				// Check if we should make a new undo level
+				// We don't want to do this if this is the same action with the same
+				// selection and the action wants to group the undo levels
+				if((lastundogroup != multiselectionundogroup) || (lastundogroup == UndoGroup.None) ||
+				   (multiselectionundogroup == UndoGroup.None) || selectionchanged)
+				{
+					// We want to create a new undo level, but not just yet
+					lastundogroup = multiselectionundogroup;
+					undocreated = false;
+				}
+				else
+				{
+					// We don't want to make a new undo level (changes will be combined)
+					undocreated = true;
+				}
+			}
+		}
+
+		// Called before an action is performed. This does not make an undo level
+		private void PreActionNoChange()
+		{
+			actionresult = new VisualActionResult();
+			singleselection = false;
+			undocreated = false;
+		}
+		
+		// This is called after an action is performed
+		private void PostAction()
+		{
+			if(!string.IsNullOrEmpty(actionresult.displaystatus))
+				General.Interface.DisplayStatus(StatusType.Action, actionresult.displaystatus);
+
+			// Reset changed flags
+			foreach(KeyValuePair<Sector, VisualSector> vs in allsectors)
+			{
+				BaseVisualSector bvs = (vs.Value as BaseVisualSector);
+				foreach(VisualFloor vf in bvs.ExtraFloors) vf.Changed = false;
+				foreach(VisualCeiling vc in bvs.ExtraCeilings) vc.Changed = false;
+				foreach(VisualFloor vf in bvs.ExtraBackFloors) vf.Changed = false; //mxd
+				foreach(VisualCeiling vc in bvs.ExtraBackCeilings) vc.Changed = false; //mxd
+				bvs.Floor.Changed = false;
+				bvs.Ceiling.Changed = false;
+			}
+			
+			selectionchanged = false;
+			
+			if(singleselection) ClearSelection();
+			
+			UpdateChangedObjects();
+			ShowTargetInfo();
+		}
+		
+		// This sets the result for an action
+		public void SetActionResult(VisualActionResult result)
+		{
+			actionresult = result;
+		}
+
+		// This sets the result for an action
+		public void SetActionResult(string displaystatus)
+		{
+			actionresult = new VisualActionResult {displaystatus = displaystatus};
+		}
+		
+		// This creates an undo, when only a single selection is made
+		// When a multi-selection is made, the undo is created by the PreAction function
+		public int CreateUndo(string description, int group, int grouptag)
+		{
+			if(!undocreated)
+			{
+				undocreated = true;
+
+				if(singleselection)
+					return General.Map.UndoRedo.CreateUndo(description, this, group, grouptag);
+				return General.Map.UndoRedo.CreateUndo(description, this, UndoGroup.None, 0);
+			}
+
+			return 0;
+		}
+
+		// This creates an undo, when only a single selection is made
+		// When a multi-selection is made, the undo is created by the PreAction function
+		public int CreateUndo(string description)
+		{
+			return CreateUndo(description, UndoGroup.None, 0);
+		}
+
+		// This makes a list of the selected object
+		private void RebuildSelectedObjectsList()
+		{
+			// Make list of selected objects
+			selectedobjects = new List<IVisualEventReceiver>();
+			foreach(KeyValuePair<Sector, VisualSector> vs in allsectors)
+			{
+				if(vs.Value != null)
+				{
+					BaseVisualSector bvs = vs.Value as BaseVisualSector;
+					if((bvs.Floor != null) && bvs.Floor.Selected) selectedobjects.Add(bvs.Floor);
+					if((bvs.Ceiling != null) && bvs.Ceiling.Selected) selectedobjects.Add(bvs.Ceiling);
+					foreach(Sidedef sd in vs.Key.Sidedefs)
+					{
+						List<VisualGeometry> sidedefgeos = bvs.GetSidedefGeometry(sd);
+						foreach(VisualGeometry sdg in sidedefgeos)
+						{
+							if(sdg.Selected) selectedobjects.Add((sdg as IVisualEventReceiver));
+						}
+					}
+				}
+			}
+
+			foreach(KeyValuePair<Thing, VisualThing> vt in allthings)
+			{
+				if(vt.Value != null)
+				{
+					BaseVisualThing bvt = vt.Value as BaseVisualThing;
+					if(bvt.Selected) selectedobjects.Add(bvt);
+				}
+			}
+
+			//mxd
+			if(General.Map.UDMF && General.Settings.GZShowVisualVertices) 
+			{
+				foreach(KeyValuePair<Vertex, VisualVertexPair> pair in vertices) 
+				{
+					if(pair.Value.CeilingVertex.Selected)
+						selectedobjects.Add((BaseVisualVertex)pair.Value.CeilingVertex);
+					if(pair.Value.FloorVertex.Selected)
+						selectedobjects.Add((BaseVisualVertex)pair.Value.FloorVertex);
+				}
+			}
+
+			//mxd
+			UpdateSelectionInfo();
+		}
+
+		//mxd. Need this to apply changes to 3d-floor even if control sector doesn't exist as BaseVisualSector
+		internal BaseVisualSector CreateBaseVisualSector(Sector s) 
+		{
+			BaseVisualSector vs = new BaseVisualSector(this, s);
+			allsectors.Add(s, vs);
+			return vs;
+		}
+
+		// This creates a visual sector
+		protected override VisualSector CreateVisualSector(Sector s)
+		{
+			BaseVisualSector vs = new BaseVisualSector(this, s);
+			allsectors.Add(s, vs); //mxd
+			return vs;
+		}
+		
+		// This creates a visual thing
+		protected override VisualThing CreateVisualThing(Thing t)
+		{
+			BaseVisualThing vt = new BaseVisualThing(this, t);
+			return vt.Setup() ? vt : null;
+		}
+
+		// This locks the target so that it isn't changed until unlocked
+		public void LockTarget()
+		{
+			locktarget = true;
+		}
+		
+		// This unlocks the target so that is changes to the aimed geometry again
+		public void UnlockTarget()
+		{
+			locktarget = false;
+		}
+		
+		// This picks a new target, if not locked
+		private void PickTargetUnlocked()
+		{
+			if(!locktarget) PickTarget();
+		}
+		
+		// This picks a new target
+		private void PickTarget()
+		{
+			// Find the object we are aiming at
+			Vector3D start = General.Map.VisualCamera.Position;
+			Vector3D delta = General.Map.VisualCamera.Target - General.Map.VisualCamera.Position;
+			delta = delta.GetFixedLength(General.Settings.ViewDistance * PICK_RANGE);
+			VisualPickResult newtarget = PickObject(start, start + delta);
+			
+			// Should we update the info on panels?
+			bool updateinfo = (newtarget.picked != target.picked);
+			
+			// Apply new target
+			target = newtarget;
+
+			// Show target info
+			if(updateinfo) ShowTargetInfo();
+		}
+
+		// This shows the picked target information
+		public void ShowTargetInfo()
+		{
+			// Any result?
+			if(target.picked != null)
+			{
+				// Geometry picked?
+				if(target.picked is VisualGeometry)
+				{
+					VisualGeometry pickedgeo = (target.picked as VisualGeometry);
+					
+					// Sidedef?
+					if(pickedgeo is BaseVisualGeometrySidedef)
+					{
+						BaseVisualGeometrySidedef pickedsidedef = (pickedgeo as BaseVisualGeometrySidedef);
+						General.Interface.ShowLinedefInfo(pickedsidedef.GetControlLinedef(), pickedsidedef.Sidedef); //mxd
+					}
+					// Sector?
+					else if(pickedgeo is BaseVisualGeometrySector)
+					{
+						BaseVisualGeometrySector pickedsector = (pickedgeo as BaseVisualGeometrySector);
+						bool isceiling = (pickedsector is VisualCeiling); //mxd
+						General.Interface.ShowSectorInfo(pickedsector.Level.sector, isceiling, !isceiling);
+					}
+					else
+					{
+						General.Interface.HideInfo();
+					}
+				} 
+				else if(target.picked is VisualThing) 
+				{ // Thing picked?
+					VisualThing pickedthing = (target.picked as VisualThing);
+					General.Interface.ShowThingInfo(pickedthing.Thing);
+				} 
+				else if(target.picked is VisualVertex) //mxd
+				{
+					VisualVertex pickedvert = (target.picked as VisualVertex);
+					General.Interface.ShowVertexInfo(pickedvert.Vertex);
+				}
+			}
+			else
+			{
+				General.Interface.HideInfo();
+			}
+		}
+		
+		// This updates the VisualSectors and VisualThings that have their Changed property set
+		private void UpdateChangedObjects()
+		{
+			foreach(KeyValuePair<Sector, VisualSector> vs in allsectors)
+			{
+				if(vs.Value != null)
+				{
+					BaseVisualSector bvs = vs.Value as BaseVisualSector;
+					if(bvs.Changed) bvs.Rebuild();
+				}
+			}
+
+			foreach(KeyValuePair<Thing, VisualThing> vt in allthings)
+			{
+				if(vt.Value != null)
+				{
+					BaseVisualThing bvt = vt.Value as BaseVisualThing;
+					if(bvt.Changed) bvt.Rebuild();
+				}
+			}
+
+			//mxd
+			if(General.Map.UDMF) 
+			{
+				foreach(KeyValuePair<Vertex, VisualVertexPair> pair in vertices)
+					pair.Value.Update();
+			}
+
+			//mxd. Update event lines (still better than updating them on every frame redraw)
+			renderer.SetEventLines(LinksCollector.GetThingLinks(General.Map.ThingsFilter.VisibleThings, blockmap));
+		}
+
+		//mxd
+		protected override void MoveSelectedThings(Vector2D direction, bool absoluteposition) 
+		{
+			List<VisualThing> visualthings = GetSelectedVisualThings(true);
+			if(visualthings.Count == 0) return;
+
+			PreAction(UndoGroup.ThingMove);
+
+			Vector3D[] coords = new Vector3D[visualthings.Count];
+			for(int i = 0; i < visualthings.Count; i++)
+				coords[i] = visualthings[i].Thing.Position;
+
+			//move things...
+			Vector3D[] translatedcoords = TranslateCoordinates(coords, direction, absoluteposition);
+			for(int i = 0; i < visualthings.Count; i++) 
+			{
+				BaseVisualThing t = visualthings[i] as BaseVisualThing;
+				t.OnMove(translatedcoords[i]);
+			}
+
+			// Things may've changed sectors...
+			FillBlockMap();
+
+			PostAction();
+		}
+
+		//mxd
+		private static Vector3D[] TranslateCoordinates(Vector3D[] coordinates, Vector2D direction, bool absolutePosition) 
+		{
+			if(coordinates.Length == 0) return null;
+
+			direction.x = (float)Math.Round(direction.x);
+			direction.y = (float)Math.Round(direction.y);
+
+			Vector3D[] translatedCoords = new Vector3D[coordinates.Length];
+
+			//move things...
+			if(!absolutePosition) //...relatively (that's easy)
+			{ 
+				int camAngle = (int)Math.Round(Angle2D.RadToDeg(General.Map.VisualCamera.AngleXY));
+				int sector = General.ClampAngle(camAngle - 45) / 90;
+				direction = direction.GetRotated(sector * Angle2D.PIHALF);
+
+				for(int i = 0; i < coordinates.Length; i++)
+					translatedCoords[i] = coordinates[i] + new Vector3D(direction);
+
+				return translatedCoords;
+			}
+
+			//...to specified location preserving relative positioning (that's harder)
+			if(coordinates.Length == 1) //just move it there
+			{
+				translatedCoords[0] = new Vector3D(direction.x, direction.y, coordinates[0].z);
+				return translatedCoords;
+			}
+
+			//we need some reference
+			float minX = coordinates[0].x;
+			float maxX = minX;
+			float minY = coordinates[0].y;
+			float maxY = minY;
+
+			//get bounding coordinates for selected things
+			for(int i = 1; i < coordinates.Length; i++) 
+			{
+				if(coordinates[i].x < minX)
+					minX = coordinates[i].x;
+				else if(coordinates[i].x > maxX)
+					maxX = coordinates[i].x;
+
+				if(coordinates[i].y < minY)
+					minY = coordinates[i].y;
+				else if(coordinates[i].y > maxY)
+					maxY = coordinates[i].y;
+			}
+
+			Vector2D selectionCenter = new Vector2D(minX + (maxX - minX) / 2, minY + (maxY - minY) / 2);
+
+			//move them
+			for(int i = 0; i < coordinates.Length; i++)
+				translatedCoords[i] = new Vector3D((float)Math.Round(direction.x - (selectionCenter.x - coordinates[i].x)), (float)Math.Round(direction.y - (selectionCenter.y - coordinates[i].y)), (float)Math.Round(coordinates[i].z));
+
+			return translatedCoords;
+		}
+
+		//mxd
+		internal void SelectSideParts(Sidedef side, bool toggleTop, bool toggleMid, bool toggleBottom, bool select, bool withSameTexture, bool withSameHeight) 
+		{
+			BaseVisualSector vs = GetVisualSector(side.Sector) as BaseVisualSector;
+			
+			if(toggleTop && vs.Sides[side].upper != null &&
+				((select && !vs.Sides[side].upper.Selected) || (!select && vs.Sides[side].upper.Selected))) 
+			{
+				vs.Sides[side].upper.SelectNeighbours(select, withSameTexture, withSameHeight);
+			}
+
+			if(toggleMid && vs.Sides[side].middlesingle != null &&
+				((select && !vs.Sides[side].middlesingle.Selected) || (!select && vs.Sides[side].middlesingle.Selected))) 
+			{
+				vs.Sides[side].middlesingle.SelectNeighbours(select, withSameTexture, withSameHeight);
+			}
+
+			if(toggleMid && vs.Sides[side].middledouble != null &&
+				((select && !vs.Sides[side].middledouble.Selected) || (!select && vs.Sides[side].middledouble.Selected))) 
+			{
+				vs.Sides[side].middledouble.SelectNeighbours(select, withSameTexture, withSameHeight);
+			}
+
+			if(toggleBottom && vs.Sides[side].lower != null &&
+				((select && !vs.Sides[side].lower.Selected) || (!select && vs.Sides[side].lower.Selected))) 
+			{
+				vs.Sides[side].lower.SelectNeighbours(select, withSameTexture, withSameHeight);
+			}
+		}
+
+		//mxd
+		public override void UpdateSelectionInfo() 
+		{
+			// Collect info
+			int numWalls = 0;
+			int numFloors = 0;
+			int numCeilings = 0;
+			int numThings = 0;
+			int numVerts = 0;
+
+			foreach(IVisualEventReceiver obj in selectedobjects) 
+			{
+				if(!obj.IsSelected()) continue;
+
+				if(obj is BaseVisualThing) numThings++;
+				else if(obj is BaseVisualVertex) numVerts++;
+				else if(obj is VisualCeiling) numCeilings++;
+				else if(obj is VisualFloor)	numFloors++;
+				else if(obj is VisualMiddleSingle || obj is VisualMiddleDouble || obj is VisualLower || obj is VisualUpper || obj is VisualMiddle3D || obj is VisualMiddleBack)
+					numWalls++;
+			}
+
+			List<string> results = new List<string>();
+			if(numWalls > 0) results.Add(numWalls + (numWalls > 1 ? " sidedefs" : " sidedef"));
+			if(numFloors > 0) results.Add(numFloors + (numFloors > 1 ? " floors" : " floor"));
+			if(numCeilings > 0) results.Add(numCeilings + (numCeilings > 1 ? " ceilings" : " ceiling"));
+			if(numThings > 0) results.Add(numThings + (numThings > 1 ? " things" : " thing"));
+			if(numVerts > 0) results.Add(numVerts + (numVerts > 1 ? " vertices" : " vertex"));
+
+			// Display results
+			string result = string.Empty;
+			if(results.Count > 0) 
+			{
+				result = string.Join(", ", results.ToArray());
+				int pos = result.LastIndexOf(",", StringComparison.Ordinal);
+				if(pos != -1) result = result.Remove(pos, 1).Insert(pos, " and");
+				result += " selected.";
+			}
+
+			General.Interface.DisplayStatus(StatusType.Selection, result);
+		}
+
+		//mxd
+		internal void StartRealtimeInterfaceUpdate(SelectionType selectiontype)
+		{
+			switch(selectiontype)
+			{
+				case SelectionType.All:
+				case SelectionType.Linedefs:
+				case SelectionType.Sectors:
+					General.Interface.OnEditFormValuesChanged += Interface_OnSectorEditFormValuesChanged;
+					break;
+				case SelectionType.Things:
+					General.Interface.OnEditFormValuesChanged += Interface_OnThingEditFormValuesChanged;
+					break;
+				default:
+					General.Interface.OnEditFormValuesChanged += Interface_OnEditFormValuesChanged;
+					break;
+			}
+		}
+
+		//mxd
+		internal void StopRealtimeInterfaceUpdate(SelectionType selectiontype)
+		{
+			switch(selectiontype)
+			{
+				case SelectionType.All:
+				case SelectionType.Linedefs:
+				case SelectionType.Sectors:
+					General.Interface.OnEditFormValuesChanged -= Interface_OnSectorEditFormValuesChanged;
+					break;
+				case SelectionType.Things:
+					General.Interface.OnEditFormValuesChanged -= Interface_OnThingEditFormValuesChanged;
+					break;
+				default:
+					General.Interface.OnEditFormValuesChanged -= Interface_OnEditFormValuesChanged;
+					break;
+			}
+		}
+		
+		#endregion
+
+		#region ================== Extended Methods
+
+		// This requests a sector's extra data
+		internal SectorData GetSectorData(Sector s)
+		{
+			// Make fresh sector data when it doesn't exist yet
+			if(!sectordata.ContainsKey(s))
+				sectordata[s] = new SectorData(this, s);
+			
+			return sectordata[s];
+		}
+		
+		// This requests a things's extra data
+		internal ThingData GetThingData(Thing t)
+		{
+			// Make fresh sector data when it doesn't exist yet
+			if(!thingdata.ContainsKey(t))
+				thingdata[t] = new ThingData(this, t);
+			
+			return thingdata[t];
+		}
+
+		//mxd
+		internal VertexData GetVertexData(Vertex v) 
+		{
+			if(!vertexdata.ContainsKey(v))
+				vertexdata[v] = new VertexData(this, v);
+			return vertexdata[v];
+		}
+
+		internal BaseVisualVertex GetVisualVertex(Vertex v, bool floor) 
+		{
+			if(!vertices.ContainsKey(v))
+				vertices.Add(v, new VisualVertexPair(new BaseVisualVertex(this, v, false), new BaseVisualVertex(this, v, true)));
+
+			return (floor ? vertices[v].FloorVertex as BaseVisualVertex : vertices[v].CeilingVertex as BaseVisualVertex);
+		}
+
+		//mxd
+		internal void UpdateVertexHandle(Vertex v) 
+		{
+			if(!vertices.ContainsKey(v))
+				vertices.Add(v, new VisualVertexPair(new BaseVisualVertex(this, v, false), new BaseVisualVertex(this, v, true)));
+			else
+				vertices[v].Changed = true;
+		}
+		
+		// This rebuilds the sector data
+		// This requires that the blockmap is up-to-date!
+		internal void RebuildElementData()
+		{
+			//mxd
+			Sector[] sectorsWithEffects = null;
+
+			if(!gzdoomRenderingEffects) 
+			{
+				//store all sectors with effects
+				if(sectordata != null && sectordata.Count > 0) 
+				{
+					sectorsWithEffects = new Sector[sectordata.Count];
+					sectordata.Keys.CopyTo(sectorsWithEffects, 0);
+				}
+
+				//remove all vertex handles from selection
+				if(vertices != null && vertices.Count > 0) 
+				{
+					foreach(IVisualEventReceiver i in selectedobjects)
+					{
+						if(i is BaseVisualVertex) RemoveSelectedObject(i);
+					}
+				}
+			}
+
+			Dictionary<int, List<Sector>> sectortags = new Dictionary<int, List<Sector>>();
+			sectordata = new Dictionary<Sector, SectorData>(General.Map.Map.Sectors.Count);
+			thingdata = new Dictionary<Thing, ThingData>(General.Map.Map.Things.Count);
+
+			//mxd. rebuild all sectors with effects
+			if(sectorsWithEffects != null) 
+			{
+				for(int i = 0; i < sectorsWithEffects.Length; i++) 
+				{
+					// The visual sector associated is now outdated
+					if(VisualSectorExists(sectorsWithEffects[i])) 
+					{
+						BaseVisualSector vs = GetVisualSector(sectorsWithEffects[i]) as BaseVisualSector;
+						vs.UpdateSectorGeometry(true);
+					}
+				}
+			}
+
+			if(General.Map.UDMF) 
+			{
+				vertexdata = new Dictionary<Vertex, VertexData>(General.Map.Map.Vertices.Count); //mxd
+				vertices.Clear();
+			}
+
+			if(!gzdoomRenderingEffects) return; //mxd
+			
+			// Find all sector who's tag is not 0 and hash them so that we can find them quicly
+			foreach(Sector s in General.Map.Map.Sectors)
+			{
+				foreach(int tag in s.Tags)
+				{
+					if(tag == 0) continue;
+					if(!sectortags.ContainsKey(tag)) sectortags[tag] = new List<Sector>();
+					sectortags[tag].Add(s);
+				}
+			}
+
+			// Find sectors with 3 vertices, because they can be sloped
+			foreach(Sector s in General.Map.Map.Sectors)
+			{
+				// ========== Thing vertex slope, vertices with UDMF vertex offsets ==========
+				if(s.Sidedefs.Count == 3)
+				{
+					if(General.Map.UDMF) GetSectorData(s).AddEffectVertexOffset(); //mxd
+					List<Thing> slopeceilingthings = new List<Thing>(3);
+					List<Thing> slopefloorthings = new List<Thing>(3);
+					
+					foreach(Sidedef sd in s.Sidedefs) 
+					{
+						Vertex v = sd.IsFront ? sd.Line.End : sd.Line.Start;
+
+						// Check if a thing is at this vertex
+						VisualBlockEntry b = blockmap.GetBlock(blockmap.GetBlockCoordinates(v.Position));
+						foreach(Thing t in b.Things) 
+						{
+							if((Vector2D)t.Position == v.Position) 
+							{
+								switch(t.Type)
+								{
+									case 1504: slopefloorthings.Add(t); break;
+									case 1505: slopeceilingthings.Add(t); break;
+								}
+							}
+						}
+					}
+
+					// Slope any floor vertices?
+					if(slopefloorthings.Count > 0) 
+					{
+						SectorData sd = GetSectorData(s);
+						sd.AddEffectThingVertexSlope(slopefloorthings, true);
+					}
+
+					// Slope any ceiling vertices?
+					if(slopeceilingthings.Count > 0) 
+					{
+						SectorData sd = GetSectorData(s);
+						sd.AddEffectThingVertexSlope(slopeceilingthings, false);
+					}
+				}
+				
+				// ========== mxd. Glowing flats ==========
+				if(General.Map.Data.GlowingFlats.ContainsKey(s.LongFloorTexture) || General.Map.Data.GlowingFlats.ContainsKey(s.LongCeilTexture))
+				{
+					SectorData sd = GetSectorData(s);
+					sd.AddEffectGlowingFlat(s);
+				}
+			}
+			
+			// Find interesting linedefs (such as line slopes)
+			foreach(Linedef l in General.Map.Map.Linedefs)
+			{
+				switch(l.Action)
+				{
+					// ========== Plane Align (see http://zdoom.org/wiki/Plane_Align) ==========
+					case 181:
+						if(((l.Args[0] == 1) || (l.Args[1] == 1)) && (l.Front != null))
+						{
+							SectorData sd = GetSectorData(l.Front.Sector);
+							sd.AddEffectLineSlope(l);
+						}
+						if(((l.Args[0] == 2) || (l.Args[1] == 2)) && (l.Back != null))
+						{
+							SectorData sd = GetSectorData(l.Back.Sector);
+							sd.AddEffectLineSlope(l);
+						}
+						break;
+
+					// ========== Plane Copy (mxd) (see http://zdoom.org/wiki/Plane_Copy) ==========
+					case 118: 
+					{
+						//check the flags...
+						bool floorCopyToBack = false;
+						bool floorCopyToFront = false;
+						bool ceilingCopyToBack = false;
+						bool ceilingCopyToFront = false;
+
+						if(l.Args[4] > 0 && l.Args[4] != 3 && l.Args[4] != 12) 
+						{
+							floorCopyToBack = (l.Args[4] & 1) == 1;
+							floorCopyToFront = (l.Args[4] & 2) == 2;
+							ceilingCopyToBack = (l.Args[4] & 4) == 4;
+							ceilingCopyToFront = (l.Args[4] & 8) == 8;
+						}
+					
+						// Copy slope to front sector
+						if(l.Front != null) 
+						{
+							if( (l.Args[0] > 0 || l.Args[1] > 0) || (l.Back != null && (floorCopyToFront || ceilingCopyToFront)) ) 
+							{
+								SectorData sd = GetSectorData(l.Front.Sector);
+								sd.AddEffectPlaneClopySlope(l, true);
+							}
+						}
+
+						// Copy slope to back sector
+						if(l.Back != null) 
+						{
+							if( (l.Args[2] > 0 || l.Args[3] > 0) || (l.Front != null && (floorCopyToBack || ceilingCopyToBack)) ) 
+							{
+								SectorData sd = GetSectorData(l.Back.Sector);
+								sd.AddEffectPlaneClopySlope(l, false);
+							}
+						}
+					}
+						break;
+
+					// ========== Sector 3D floor (see http://zdoom.org/wiki/Sector_Set3dFloor) ==========
+					case 160:
+						if(l.Front != null)
+						{
+							//mxd. Added hi-tag/line ID check 
+							int sectortag = (General.Map.UDMF || (l.Args[1] & (int)Effect3DFloor.FloorTypes.HiTagIsLineID) != 0) ? l.Args[0] : l.Args[0] + (l.Args[4] << 8);
+							if(sectortags.ContainsKey(sectortag)) 
+							{
+								List<Sector> sectors = sectortags[sectortag];
+								foreach(Sector s in sectors) 
+								{
+									SectorData sd = GetSectorData(s);
+									sd.AddEffect3DFloor(l);
+								}
+							}
+						}
+						break;
+
+					// ========== Transfer Brightness (see http://zdoom.org/wiki/ExtraFloor_LightOnly) =========
+					case 50:
+						if(l.Front != null && sectortags.ContainsKey(l.Args[0]))
+						{
+							List<Sector> sectors = sectortags[l.Args[0]];
+							foreach(Sector s in sectors) 
+							{
+								SectorData sd = GetSectorData(s);
+								sd.AddEffectBrightnessLevel(l);
+							}
+						}
+						break;
+
+					// ========== mxd. Transfer Floor Brightness (see http://www.zdoom.org/w/index.php?title=Transfer_FloorLight) =========
+					case 210:
+						if(l.Front != null && sectortags.ContainsKey(l.Args[0])) 
+						{
+							List<Sector> sectors = sectortags[l.Args[0]];
+							foreach(Sector s in sectors) 
+							{
+								SectorData sd = GetSectorData(s);
+								sd.AddEffectTransferFloorBrightness(l);
+							}
+						}
+						break;
+
+					// ========== mxd. Transfer Ceiling Brightness (see http://www.zdoom.org/w/index.php?title=Transfer_CeilingLight) =========
+					case 211:
+						if(l.Front != null && sectortags.ContainsKey(l.Args[0])) 
+						{
+							List<Sector> sectors = sectortags[l.Args[0]];
+							foreach(Sector s in sectors) 
+							{
+								SectorData sd = GetSectorData(s);
+								sd.AddEffectTransferCeilingBrightness(l);
+							}
+						}
+						break;
+				}
+			}
+
+			// Find interesting things (such as sector slopes)
+			foreach(Thing t in General.Map.Map.Things)
+			{
+				switch(t.Type)
+				{
+					// ========== Copy slope ==========
+					case 9511:
+					case 9510:
+						t.DetermineSector(blockmap);
+						if(t.Sector != null)
+						{
+							SectorData sd = GetSectorData(t.Sector);
+							sd.AddEffectCopySlope(t);
+						}
+						break;
+
+					// ========== Thing line slope ==========
+					case 9501:
+					case 9500:
+						t.DetermineSector(blockmap);
+						if(t.Sector != null)
+						{
+							SectorData sd = GetSectorData(t.Sector);
+							sd.AddEffectThingLineSlope(t);
+						}
+						break;
+
+					// ========== Thing slope ==========
+					case 9503:
+					case 9502:
+						t.DetermineSector(blockmap);
+						if(t.Sector != null)
+						{
+							SectorData sd = GetSectorData(t.Sector);
+							sd.AddEffectThingSlope(t);
+						}
+						break;
+				}
+			}
+		}
+		
+		#endregion
+
+		#region ================== Events
+
+		// Help!
+		public override void OnHelp()
+		{
+			General.ShowHelp("e_visual.html");
+		}
+
+		// When entering this mode
+		public override void OnEngage()
+		{
+			base.OnEngage();
+
+			//mxd
+			useSelectionFromClassicMode = BuilderPlug.Me.SyncSelection ? !General.Interface.ShiftState : General.Interface.ShiftState;
+			if(useSelectionFromClassicMode)	UpdateSelectionInfo();
+
+			// Read settings
+			cameraflooroffset = General.Map.Config.ReadSetting("cameraflooroffset", cameraflooroffset);
+			cameraceilingoffset = General.Map.Config.ReadSetting("cameraceilingoffset", cameraceilingoffset);
+
+			//mxd. Update fog color (otherwise FogBoundaries won't be setup correctly)
+			foreach(Sector s in General.Map.Map.Sectors) s.UpdateFogColor();
+
+			// (Re)create special effects
+			RebuildElementData();
+
+			//mxd. Update event lines
+			renderer.SetEventLines(LinksCollector.GetThingLinks(General.Map.ThingsFilter.VisibleThings, blockmap));
+		}
+
+		// When returning to another mode
+		public override void OnDisengage()
+		{
+			base.OnDisengage();
+
+			//mxd
+			if(BuilderPlug.Me.SyncSelection ? !General.Interface.ShiftState : General.Interface.ShiftState)
+			{
+				//clear previously selected stuff
+				General.Map.Map.ClearAllSelected();
+				
+				//refill selection
+				List<int> selectedsectorindices = new List<int>();
+				List<int> selectedlineindices = new List<int>();
+				List<int> selectedvertexindices = new List<int>();
+
+				foreach(IVisualEventReceiver obj in selectedobjects)
+				{
+					if(obj is BaseVisualThing) 
+					{
+						((BaseVisualThing)obj).Thing.Selected = true;
+					}
+					else if(obj is VisualFloor || obj is VisualCeiling) 
+					{
+						VisualGeometry vg = obj as VisualGeometry;
+						if(vg.Sector != null && vg.Sector.Sector != null && !selectedsectorindices.Contains(vg.Sector.Sector.Index))
+						{
+							selectedsectorindices.Add(vg.Sector.Sector.Index);
+							vg.Sector.Sector.Selected = true;
+						}
+					}
+					else if(obj is VisualLower || obj is VisualUpper || obj is VisualMiddleDouble 
+						|| obj is VisualMiddleSingle || obj is VisualMiddle3D) 
+					{
+						VisualGeometry vg = obj as VisualGeometry;
+						if(vg.Sidedef != null && !selectedlineindices.Contains(vg.Sidedef.Line.Index))
+						{
+							selectedlineindices.Add(vg.Sidedef.Line.Index);
+							vg.Sidedef.Line.Selected = true;
+						}
+					}
+					else if(obj is VisualVertex)
+					{
+						VisualVertex v = obj as VisualVertex;
+						if(!selectedvertexindices.Contains(v.Vertex.Index))
+						{
+							selectedvertexindices.Add(v.Vertex.Index);
+							v.Vertex.Selected = true;
+						}
+					}
+				}
+			}
+
+			General.Map.Map.Update();
+		}
+		
+		// Processing
+		public override void OnProcess(float deltatime)
+		{
+			// Process things?
+			base.ProcessThings = (BuilderPlug.Me.ShowVisualThings != 0);
+			
+			// Setup the move multiplier depending on gravity
+			Vector3D movemultiplier = new Vector3D(1.0f, 1.0f, 1.0f);
+			if(BuilderPlug.Me.UseGravity) movemultiplier.z = 0.0f;
+			General.Map.VisualCamera.MoveMultiplier = movemultiplier;
+			
+			// Apply gravity?
+			if(BuilderPlug.Me.UseGravity && (General.Map.VisualCamera.Sector != null))
+			{
+				SectorData sd = GetSectorData(General.Map.VisualCamera.Sector);
+				if(!sd.Updated) sd.Update();
+
+				// Camera below floor level?
+				Vector3D feetposition = General.Map.VisualCamera.Position;
+				SectorLevel floorlevel = sd.GetFloorBelow(feetposition) ?? sd.Floor;
+				float floorheight = floorlevel.plane.GetZ(General.Map.VisualCamera.Position);
+				if(General.Map.VisualCamera.Position.z < (floorheight + cameraflooroffset + 0.1f))
+				{
+					// Stay above floor
+					gravity = new Vector3D(0.0f, 0.0f, 0.0f);
+					General.Map.VisualCamera.Position = new Vector3D(General.Map.VisualCamera.Position.x,
+																	 General.Map.VisualCamera.Position.y,
+																	 floorheight + cameraflooroffset);
+				}
+				else
+				{
+					// Fall down
+					gravity.z += GRAVITY * General.Map.VisualCamera.Gravity * deltatime;
+					if(gravity.z > 3.0f) gravity.z = 3.0f;
+
+					// Test if we don't go through a floor
+					if((General.Map.VisualCamera.Position.z + gravity.z) < (floorheight + cameraflooroffset + 0.1f))
+					{
+						// Stay above floor
+						gravity = new Vector3D(0.0f, 0.0f, 0.0f);
+						General.Map.VisualCamera.Position = new Vector3D(General.Map.VisualCamera.Position.x,
+																		 General.Map.VisualCamera.Position.y,
+																		 floorheight + cameraflooroffset);
+					}
+					else
+					{
+						// Apply gravity vector
+						General.Map.VisualCamera.Position += gravity;
+					}
+				}
+
+				// Camera above ceiling?
+				feetposition = General.Map.VisualCamera.Position - new Vector3D(0, 0, cameraflooroffset - 7.0f);
+				SectorLevel ceillevel = sd.GetCeilingAbove(feetposition) ?? sd.Ceiling;
+				float ceilheight = ceillevel.plane.GetZ(General.Map.VisualCamera.Position);
+				if(General.Map.VisualCamera.Position.z > (ceilheight - cameraceilingoffset - 0.01f))
+				{
+					// Stay below ceiling
+					General.Map.VisualCamera.Position = new Vector3D(General.Map.VisualCamera.Position.x,
+																	 General.Map.VisualCamera.Position.y,
+																	 ceilheight - cameraceilingoffset);
+				}
+			}
+			else
+			{
+				gravity = new Vector3D(0.0f, 0.0f, 0.0f);
+			}
+			
+			// Do processing
+			base.OnProcess(deltatime);
+
+			// Process visible geometry
+			foreach(IVisualEventReceiver g in visiblegeometry)
+			{
+				g.OnProcess(deltatime);
+			}
+			
+			// Time to pick a new target?
+			if(Clock.CurrentTime > (lastpicktime + PICK_INTERVAL))
+			{
+				PickTargetUnlocked();
+				lastpicktime = Clock.CurrentTime;
+			}
+			
+			// The mouse is always in motion
+			MouseEventArgs args = new MouseEventArgs(General.Interface.MouseButtons, 0, 0, 0, 0);
+			OnMouseMove(args);
+		}
+		
+		// This draws a frame
+		public override void OnRedrawDisplay()
+		{
+			// Start drawing
+			if(renderer.Start())
+			{
+				// Use fog!
+				renderer.SetFogMode(true);
+
+				// Set target for highlighting
+				renderer.ShowSelection = General.Settings.GZOldHighlightMode || BuilderPlug.Me.UseHighlight; //mxd
+
+				if(BuilderPlug.Me.UseHighlight)
+					renderer.SetHighlightedObject(target.picked);
+				
+				// Begin with geometry
+				renderer.StartGeometry();
+
+				// Render all visible sectors
+				foreach(VisualGeometry g in visiblegeometry)
+					renderer.AddSectorGeometry(g);
+
+				if(BuilderPlug.Me.ShowVisualThings != 0)
+				{
+					// Render things in cages?
+					renderer.DrawThingCages = ((BuilderPlug.Me.ShowVisualThings & 2) != 0);
+					
+					// Render all visible things
+					foreach(VisualThing t in visiblethings)
+						renderer.AddThingGeometry(t);
+				}
+
+				//mxd
+				if(General.Map.UDMF && General.Settings.GZShowVisualVertices && vertices.Count > 0) 
+				{
+					List<VisualVertex> verts = new List<VisualVertex>();
+
+					foreach(KeyValuePair<Vertex, VisualVertexPair> pair in vertices)
+						verts.AddRange(pair.Value.Vertices);
+
+					renderer.SetVisualVertices(verts);
+				}
+				
+				// Done rendering geometry
+				renderer.FinishGeometry();
+				
+				// Render crosshair
+				renderer.RenderCrosshair();
+				
+				// Present!
+				renderer.Finish();
+			}
+		}
+		
+		// After resources were reloaded
+		protected override void ResourcesReloaded()
+		{
+			base.ResourcesReloaded();
+			RebuildElementData();
+			PickTarget();
+		}
+		
+		// This usually happens when geometry is changed by undo, redo, cut or paste actions
+		// and uses the marks to check what needs to be reloaded.
+		protected override void ResourcesReloadedPartial()
+		{
+			bool sectorsmarked = false;
+			
+			if(General.Map.UndoRedo.GeometryChanged)
+			{
+				// Let the core do this (it will just dispose the sectors that were changed)
+				base.ResourcesReloadedPartial();
+			}
+			else
+			{
+				// Neighbour sectors must be updated as well
+				foreach(Sector s in General.Map.Map.Sectors)
+				{
+					if(s.Marked)
+					{
+						sectorsmarked = true;
+						foreach(Sidedef sd in s.Sidedefs)
+						{
+							sd.Marked = true;
+							if(sd.Other != null) sd.Other.Marked = true;
+						}
+					}
+				}
+				
+				// Go for all sidedefs to update
+				foreach(Sidedef sd in General.Map.Map.Sidedefs)
+				{
+					if(sd.Marked && VisualSectorExists(sd.Sector))
+					{
+						BaseVisualSector vs = GetVisualSector(sd.Sector) as BaseVisualSector;
+						VisualSidedefParts parts = vs.GetSidedefParts(sd);
+						parts.SetupAllParts();
+					}
+				}
+				
+				// Go for all sectors to update
+				foreach(Sector s in General.Map.Map.Sectors)
+				{
+					if(s.Marked)
+					{
+						SectorData sd = GetSectorData(s);
+						sd.Reset();
+						
+						// UpdateSectorGeometry for associated sectors (sd.UpdateAlso) as well!
+						foreach(KeyValuePair<Sector, bool> us in sd.UpdateAlso)
+						{
+							if(VisualSectorExists(us.Key))
+							{
+								BaseVisualSector vs = GetVisualSector(us.Key) as BaseVisualSector;
+								vs.UpdateSectorGeometry(us.Value);
+							}
+						}
+						
+						// And update for this sector ofcourse
+						if(VisualSectorExists(s))
+						{
+							BaseVisualSector vs = GetVisualSector(s) as BaseVisualSector;
+							vs.UpdateSectorGeometry(false);
+						}
+					}
+				}
+				
+				if(!sectorsmarked)
+				{
+					// No sectors or geometry changed. So we only have
+					// to update things when they have changed.
+					foreach(KeyValuePair<Thing, VisualThing> vt in allthings)
+						if((vt.Value != null) && vt.Key.Marked) (vt.Value as BaseVisualThing).Rebuild();
+				}
+				else
+				{
+					// Things depend on the sector they are in and because we can't
+					// easily determine which ones changed, we dispose all things
+					foreach(KeyValuePair<Thing, VisualThing> vt in allthings)
+						if(vt.Value != null) vt.Value.Dispose();
+					
+					// Apply new lists
+					allthings = new Dictionary<Thing, VisualThing>(allthings.Count);
+				}
+				
+				// Clear visibility collections
+				visiblesectors.Clear();
+				visibleblocks.Clear();
+				visiblegeometry.Clear();
+				visiblethings.Clear();
+				
+				// Make new blockmap
+				if(sectorsmarked || General.Map.UndoRedo.PopulationChanged)
+					FillBlockMap();
+				
+				RebuildElementData();
+				UpdateChangedObjects();
+				
+				// Visibility culling (this re-creates the needed resources)
+				DoCulling();
+			}
+			
+			// Determine what we're aiming at now
+			PickTarget();
+		}
+		
+		// Mouse moves
+		public override void OnMouseMove(MouseEventArgs e)
+		{
+			base.OnMouseMove(e);
+			IVisualEventReceiver o = GetTargetEventReceiver(true);
+			o.OnMouseMove(e);
+
+			//mxd. Show hints!
+			if(o.GetType() != lasthighlighttype) 
+			{
+				if(General.Interface.ActiveDockerTabName == "Help") 
+				{
+					if(o is BaseVisualGeometrySidedef) 
+					{
+						General.Hints.ShowHints(this.GetType(), "sidedefs");
+					}
+					else if(o is BaseVisualGeometrySector) 
+					{
+						General.Hints.ShowHints(this.GetType(), "sectors");
+					}
+					else if(o is BaseVisualThing) 
+					{
+						General.Hints.ShowHints(this.GetType(), "things");
+					}
+					else if(o is BaseVisualVertex) 
+					{
+						General.Hints.ShowHints(this.GetType(), "vertices");
+					}
+					else 
+					{
+						General.Hints.ShowHints(this.GetType(), HintsManager.GENERAL);
+					}
+				}
+
+				lasthighlighttype = o.GetType();
+			}
+		}
+		
+		// Undo performed
+		public override void OnUndoEnd()
+		{
+			base.OnUndoEnd();
+
+			//mxd. Effects may've become invalid
+			if(gzdoomRenderingEffects && sectordata != null && sectordata.Count > 0)
+				RebuildElementData();
+
+			//mxd. As well as geometry...
+			foreach(KeyValuePair<Sector, VisualSector> group in visiblesectors)
+			{
+				if(group.Value is BaseVisualSector)
+					(group.Value as BaseVisualSector).Rebuild();
+			}
+
+			RebuildSelectedObjectsList();
+			
+			// We can't group with this undo level anymore
+			lastundogroup = UndoGroup.None;
+		}
+		
+		// Redo performed
+		public override void OnRedoEnd()
+		{
+			base.OnRedoEnd();
+
+			//mxd. Effects may've become invalid
+			if(sectordata != null && sectordata.Count > 0)
+				RebuildElementData();
+
+			//mxd. As well as geometry...
+			foreach(KeyValuePair<Sector, VisualSector> group in visiblesectors) 
+			{
+				if(group.Value is BaseVisualSector) (group.Value as BaseVisualSector).Rebuild();
+			}
+
+			RebuildSelectedObjectsList();
+		}
+
+		//mxd
+		private void Interface_OnSectorEditFormValuesChanged(object sender, EventArgs e) 
+		{
+			if(allsectors == null) return;
+
+			// Reset changed flags
+			foreach(KeyValuePair<Sector, VisualSector> vs in allsectors) 
+			{
+				BaseVisualSector bvs = (vs.Value as BaseVisualSector);
+				foreach(VisualFloor vf in bvs.ExtraFloors) vf.Changed = false;
+				foreach(VisualCeiling vc in bvs.ExtraCeilings) vc.Changed = false;
+				foreach(VisualFloor vf in bvs.ExtraBackFloors) vf.Changed = false;
+				foreach(VisualCeiling vc in bvs.ExtraBackCeilings) vc.Changed = false;
+				bvs.Floor.Changed = false;
+				bvs.Ceiling.Changed = false;
+			}
+
+			UpdateChangedObjects();
+			ShowTargetInfo();
+		}
+
+		//mxd
+		private void Interface_OnThingEditFormValuesChanged(object sender, EventArgs e) 
+		{
+			//update visual sectors, which are affected by certain things
+			List<Thing> things = GetSelectedThings();
+			foreach(Thing t in things) 
+			{
+				if(thingdata.ContainsKey(t)) 
+				{
+					// Update what must be updated
+					ThingData td = GetThingData(t);
+					foreach(KeyValuePair<Sector, bool> s in td.UpdateAlso) 
+					{
+						if(VisualSectorExists(s.Key)) 
+						{
+							BaseVisualSector vs = GetVisualSector(s.Key) as BaseVisualSector;
+							vs.UpdateSectorGeometry(s.Value);
+						}
+					}
+				}
+			}
+			
+			UpdateChangedObjects();
+			ShowTargetInfo();
+		}
+
+		//mxd
+		private void Interface_OnEditFormValuesChanged(object sender, EventArgs e) 
+		{
+			UpdateChangedObjects();
+			ShowTargetInfo();
+		}
+
+		//mxd
+		private void SelectioninfoupdatetimerOnTick(object sender, EventArgs eventArgs) 
+		{
+			selectioninfoupdatetimer.Stop();
+			UpdateSelectionInfo();
+		}
+		
+		#endregion
+
+		#region ================== Action Assist
+
+		// Because some actions can only be called on a single (the targeted) object because
+		// they show a dialog window or something, these functions help applying the result
+		// to all compatible selected objects.
+		
+		// Apply texture offsets
+		public void ApplyTextureOffsetChange(int dx, int dy)
+		{
+			List<IVisualEventReceiver> objs = GetSelectedObjects(false, true, false, false);
+			
+			//mxd. Because Upper/Middle/Lower textures offsets should be threated separately in UDMF
+			if(General.Map.UDMF)
+			{
+				Dictionary<BaseVisualGeometrySidedef, bool> donesides = new Dictionary<BaseVisualGeometrySidedef, bool>(selectedobjects.Count);
+				foreach(IVisualEventReceiver i in objs) 
+				{
+					if(!(i is BaseVisualGeometrySidedef)) continue;
+					BaseVisualGeometrySidedef vs = i as BaseVisualGeometrySidedef; //mxd
+					if(!donesides.ContainsKey(vs)) 
+					{
+						//mxd. added scaling by texture scale
+						if(vs.Texture.UsedInMap) //mxd. Otherwise it's MissingTexture3D and we probably don't want to drag that
+							vs.OnChangeTextureOffset((int)(dx / vs.Texture.Scale.x), (int)(dy / vs.Texture.Scale.y), false);
+
+						donesides.Add(vs, false);
+					}
+				}
+			}
+			else
+			{
+				Dictionary<Sidedef, bool> donesides = new Dictionary<Sidedef, bool>(selectedobjects.Count);
+				foreach(IVisualEventReceiver i in objs) 
+				{
+					if(!(i is BaseVisualGeometrySidedef)) continue;
+					BaseVisualGeometrySidedef vs = i as BaseVisualGeometrySidedef; //mxd
+					if(!donesides.ContainsKey(vs.Sidedef)) 
+					{
+						//mxd. added scaling by texture scale
+						if(vs.Texture.UsedInMap) //mxd. Otherwise it's MissingTexture3D and we probably don't want to drag that
+							vs.OnChangeTextureOffset((int)(dx / vs.Texture.Scale.x), (int)(dy / vs.Texture.Scale.y), false);
+
+						donesides.Add(vs.Sidedef, false);
+					}
+				}
+			}
+		}
+
+		// Apply flat offsets
+		public void ApplyFlatOffsetChange(int dx, int dy)
+		{
+			Dictionary<Sector, int> donesectors = new Dictionary<Sector, int>(selectedobjects.Count);
+			List<IVisualEventReceiver> objs = GetSelectedObjects(true, false, false, false);
+			foreach(IVisualEventReceiver i in objs)
+			{
+				if(i is BaseVisualGeometrySector)
+				{
+					if(!donesectors.ContainsKey((i as BaseVisualGeometrySector).Sector.Sector))
+					{
+						i.OnChangeTextureOffset(dx, dy, false);
+						donesectors.Add((i as BaseVisualGeometrySector).Sector.Sector, 0);
+					}
+				}
+			}
+		}
+
+		// Apply upper unpegged flag
+		public void ApplyUpperUnpegged(bool set)
+		{
+			List<IVisualEventReceiver> objs = GetSelectedObjects(false, true, false, false);
+			foreach(IVisualEventReceiver i in objs)
+			{
+				i.ApplyUpperUnpegged(set);
+			}
+		}
+
+		// Apply lower unpegged flag
+		public void ApplyLowerUnpegged(bool set)
+		{
+			List<IVisualEventReceiver> objs = GetSelectedObjects(false, true, false, false);
+			foreach(IVisualEventReceiver i in objs)
+			{
+				i.ApplyLowerUnpegged(set);
+			}
+		}
+
+		// Apply texture change
+		public void ApplySelectTexture(string texture, bool flat)
+		{
+			List<IVisualEventReceiver> objs;
+			
+			if(General.Map.Config.MixTexturesFlats)
+			{
+				// Apply on all compatible types
+				objs = GetSelectedObjects(true, true, false, false);
+			}
+			else
+			{
+				// We don't want to mix textures and flats, so apply only on the appropriate type
+				objs = GetSelectedObjects(flat, !flat, false, false);
+			}
+			
+			foreach(IVisualEventReceiver i in objs)
+			{
+				i.ApplyTexture(texture);
+			}
+		}
+
+		// This returns all selected objects
+		internal List<IVisualEventReceiver> GetSelectedObjects(bool includesectors, bool includesidedefs, bool includethings, bool includevertices)
+		{
+			List<IVisualEventReceiver> objs = new List<IVisualEventReceiver>();
+			foreach(IVisualEventReceiver i in selectedobjects)
+			{
+				if((i is BaseVisualGeometrySector) && includesectors) objs.Add(i);
+				else if((i is BaseVisualGeometrySidedef) && includesidedefs) objs.Add(i);
+				else if((i is BaseVisualThing) && includethings) objs.Add(i);
+				else if((i is BaseVisualVertex) && includevertices) objs.Add(i);//mxd
+			}
+
+			// Add highlight?
+			if(selectedobjects.Count == 0)
+			{
+				IVisualEventReceiver i = (target.picked as IVisualEventReceiver);
+				if((i is BaseVisualGeometrySector) && includesectors) objs.Add(i);
+				else if((i is BaseVisualGeometrySidedef) && includesidedefs) objs.Add(i);
+				else if((i is BaseVisualThing) && includethings) objs.Add(i);
+				else if((i is BaseVisualVertex) && includevertices) objs.Add(i);//mxd
+			}
+
+			return objs;
+		}
+
+		//mxd
+		internal List<IVisualEventReceiver> RemoveDuplicateSidedefs(List<IVisualEventReceiver> objs) 
+		{
+			Dictionary<Sidedef, bool> processed = new Dictionary<Sidedef, bool>();
+			List<IVisualEventReceiver> result = new List<IVisualEventReceiver>();
+
+			foreach(IVisualEventReceiver obj in objs)
+			{
+				if(!(obj is BaseVisualGeometrySidedef))
+				{
+					result.Add(obj);
+				}
+				else 
+				{
+					Sidedef side = (obj as BaseVisualGeometrySidedef).Sidedef;
+
+					if(!processed.ContainsKey(side))
+					{
+						processed.Add(side, false);
+						result.Add(obj);
+					}
+				}
+			}
+
+			return result;
+		}
+
+		// This returns all selected sectors, no doubles
+		public List<Sector> GetSelectedSectors()
+		{
+			Dictionary<Sector, int> added = new Dictionary<Sector, int>();
+			List<Sector> sectors = new List<Sector>();
+			foreach(IVisualEventReceiver i in selectedobjects)
+			{
+				if(i is BaseVisualGeometrySector)
+				{
+					Sector s = (i as BaseVisualGeometrySector).Level.sector;
+					if(!added.ContainsKey(s))
+					{
+						sectors.Add(s);
+						added.Add(s, 0);
+					}
+				}
+			}
+
+			// Add highlight?
+			if((selectedobjects.Count == 0) && (target.picked is BaseVisualGeometrySector))
+			{
+				Sector s = (target.picked as BaseVisualGeometrySector).Level.sector;
+				if(!added.ContainsKey(s)) sectors.Add(s);
+			}
+			
+			return sectors;
+		}
+
+		// This returns all selected linedefs, no doubles
+		public List<Linedef> GetSelectedLinedefs()
+		{
+			Dictionary<Linedef, int> added = new Dictionary<Linedef, int>();
+			List<Linedef> linedefs = new List<Linedef>();
+			foreach(IVisualEventReceiver i in selectedobjects)
+			{
+				if(i is BaseVisualGeometrySidedef)
+				{
+					Linedef l = (i as BaseVisualGeometrySidedef).GetControlLinedef(); //mxd
+					if(!added.ContainsKey(l))
+					{
+						linedefs.Add(l);
+						added.Add(l, 0);
+					}
+				}
+			}
+
+			// Add highlight?
+			if((selectedobjects.Count == 0) && (target.picked is BaseVisualGeometrySidedef))
+			{
+				Linedef l = (target.picked as BaseVisualGeometrySidedef).GetControlLinedef(); //mxd
+				if(!added.ContainsKey(l)) linedefs.Add(l);
+			}
+
+			return linedefs;
+		}
+
+		// This returns all selected sidedefs, no doubles
+		public List<Sidedef> GetSelectedSidedefs()
+		{
+			Dictionary<Sidedef, int> added = new Dictionary<Sidedef, int>();
+			List<Sidedef> sidedefs = new List<Sidedef>();
+			foreach(IVisualEventReceiver i in selectedobjects)
+			{
+				if(i is BaseVisualGeometrySidedef)
+				{
+					Sidedef sd = (i as BaseVisualGeometrySidedef).Sidedef;
+					if(!added.ContainsKey(sd))
+					{
+						sidedefs.Add(sd);
+						added.Add(sd, 0);
+					}
+				}
+			}
+
+			// Add highlight?
+			if((selectedobjects.Count == 0) && (target.picked is BaseVisualGeometrySidedef))
+			{
+				Sidedef sd = (target.picked as BaseVisualGeometrySidedef).Sidedef;
+				if(!added.ContainsKey(sd)) sidedefs.Add(sd);
+			}
+
+			return sidedefs;
+		}
+
+		// This returns all selected things, no doubles
+		public List<Thing> GetSelectedThings()
+		{
+			Dictionary<Thing, int> added = new Dictionary<Thing, int>();
+			List<Thing> things = new List<Thing>();
+			foreach(IVisualEventReceiver i in selectedobjects)
+			{
+				if(i is BaseVisualThing)
+				{
+					Thing t = (i as BaseVisualThing).Thing;
+					if(!added.ContainsKey(t))
+					{
+						things.Add(t);
+						added.Add(t, 0);
+					}
+				}
+			}
+
+			// Add highlight?
+			if((selectedobjects.Count == 0) && (target.picked is BaseVisualThing))
+			{
+				Thing t = (target.picked as BaseVisualThing).Thing;
+				if(!added.ContainsKey(t)) things.Add(t);
+			}
+
+			return things;
+		}
+
+		//mxd. This returns all selected vertices, no doubles
+		public List<Vertex> GetSelectedVertices() 
+		{
+			Dictionary<Vertex, int> added = new Dictionary<Vertex, int>();
+			List<Vertex> verts = new List<Vertex>();
+
+			foreach(IVisualEventReceiver i in selectedobjects) 
+			{
+				if(i is BaseVisualVertex) 
+				{
+					Vertex v = (i as BaseVisualVertex).Vertex;
+					
+					if(!added.ContainsKey(v)) 
+					{
+						verts.Add(v);
+						added.Add(v, 0);
+					}
+				}
+			}
+
+			// Add highlight?
+			if((selectedobjects.Count == 0) && (target.picked is BaseVisualVertex)) 
+			{
+				Vertex v = (target.picked as BaseVisualVertex).Vertex;
+				if(!added.ContainsKey(v))
+					verts.Add(v);
+			}
+
+			return verts;
+		}
+		
+		// This returns the IVisualEventReceiver on which the action must be performed
+		private IVisualEventReceiver GetTargetEventReceiver(bool targetonly)
+		{
+			if(target.picked != null)
+			{
+				if(singleselection || target.picked.Selected || targetonly)
+				{
+					return target.picked as IVisualEventReceiver;
+				}
+
+				if(selectedobjects.Count > 0)
+				{
+					return selectedobjects[0];
+				}
+
+				return target.picked as IVisualEventReceiver;
+			}
+
+			return new NullVisualEventReceiver();
+		}
+
+		//mxd. Copied from BuilderModes.ThingsMode
+		// This creates a new thing
+		private static Thing CreateThing(Vector2D pos) 
+		{
+			if(pos.x < General.Map.Config.LeftBoundary || pos.x > General.Map.Config.RightBoundary ||
+				pos.y > General.Map.Config.TopBoundary || pos.y < General.Map.Config.BottomBoundary) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "Failed to insert thing: outside of map boundaries.");
+				return null;
+			}
+
+			// Create thing
+			Thing t = General.Map.Map.CreateThing();
+			if(t != null) 
+			{
+				General.Settings.ApplyDefaultThingSettings(t);
+				t.Move(pos);
+				t.UpdateConfiguration();
+				General.Map.IsChanged = true;
+				
+				// Update things filter so that it includes this thing
+				General.Map.ThingsFilter.Update();
+
+				// Snap to grid enabled?
+				if(General.Interface.SnapToGrid) 
+				{
+					// Snap to grid
+					t.SnapToGrid();
+				} 
+				else 
+				{
+					// Snap to map format accuracy
+					t.SnapToAccuracy();
+				}
+			}
+
+			return t;
+		}
+		
+		#endregion
+
+		#region ================== Actions
+
+		[BeginAction("clearselection", BaseAction = true)]
+		public void ClearSelection()
+		{
+			selectedobjects = new List<IVisualEventReceiver>();
+			
+			foreach(KeyValuePair<Sector, VisualSector> vs in allsectors)
+			{
+				if(vs.Value != null)
+				{
+					BaseVisualSector bvs = (BaseVisualSector)vs.Value;
+					if(bvs.Floor != null) bvs.Floor.Selected = false;
+					if(bvs.Ceiling != null) bvs.Ceiling.Selected = false;
+					foreach(VisualFloor vf in bvs.ExtraFloors) vf.Selected = false;
+					foreach(VisualCeiling vc in bvs.ExtraCeilings) vc.Selected = false;
+					foreach(VisualFloor vf in bvs.ExtraBackFloors) vf.Selected = false; //mxd
+					foreach(VisualCeiling vc in bvs.ExtraBackCeilings) vc.Selected = false; //mxd
+
+					foreach(Sidedef sd in vs.Key.Sidedefs)
+					{
+						//mxd. VisualSidedefParts can contain references to visual geometry, which is not present in VisualSector.sidedefgeometry
+						bvs.GetSidedefParts(sd).DeselectAllParts();
+					}
+				}
+			}
+
+			foreach(KeyValuePair<Thing, VisualThing> vt in allthings)
+			{
+				if(vt.Value != null)
+				{
+					BaseVisualThing bvt = vt.Value as BaseVisualThing;
+					bvt.Selected = false;
+				}
+			}
+
+			//mxd
+			if(General.Map.UDMF) 
+			{
+				foreach(KeyValuePair<Vertex, VisualVertexPair> pair in vertices) pair.Value.Deselect();
+			}
+
+			//mxd
+			General.Interface.DisplayStatus(StatusType.Selection, string.Empty);
+		}
+
+		[BeginAction("visualselect", BaseAction = true)]
+		public void BeginSelect()
+		{
+			PreActionNoChange();
+			PickTargetUnlocked();
+			GetTargetEventReceiver(true).OnSelectBegin();
+			PostAction();
+		}
+
+		[EndAction("visualselect", BaseAction = true)]
+		public void EndSelect()
+		{
+			IVisualEventReceiver target = GetTargetEventReceiver(true);
+			target.OnSelectEnd();
+
+			//mxd
+			if((General.Interface.ShiftState || General.Interface.CtrlState) && selectedobjects.Count > 0) 
+			{
+				if(General.Interface.AltState)
+				{
+					target.SelectNeighbours(target.IsSelected(), General.Interface.ShiftState, General.Interface.CtrlState);
+				}
+				else
+				{
+					IVisualEventReceiver[] selection = new IVisualEventReceiver[selectedobjects.Count];
+					selectedobjects.CopyTo(selection);
+					
+					foreach(IVisualEventReceiver obj in selection)
+						obj.SelectNeighbours(target.IsSelected(), General.Interface.ShiftState, General.Interface.CtrlState);
+				}
+			}
+
+			Renderer.ShowSelection = true;
+			Renderer.ShowHighlight = true;
+			PostAction();
+		}
+
+		[BeginAction("visualedit", BaseAction = true)]
+		public void BeginEdit()
+		{
+			PreAction(UndoGroup.None);
+			GetTargetEventReceiver(false).OnEditBegin();
+			PostAction();
+		}
+
+		[EndAction("visualedit", BaseAction = true)]
+		public void EndEdit()
+		{
+			PreActionNoChange();
+			GetTargetEventReceiver(false).OnEditEnd();
+			PostAction();
+		}
+
+		[BeginAction("raisesector8")]
+		public void RaiseSector8()
+		{
+			PreAction(UndoGroup.SectorHeightChange);
+			List<IVisualEventReceiver> objs = GetSelectedObjects(true, true, true, true);
+			foreach(IVisualEventReceiver i in objs) i.OnChangeTargetHeight(8);
+			PostAction();
+		}
+
+		[BeginAction("lowersector8")]
+		public void LowerSector8()
+		{
+			PreAction(UndoGroup.SectorHeightChange);
+			List<IVisualEventReceiver> objs = GetSelectedObjects(true, true, true, true);
+			foreach(IVisualEventReceiver i in objs) i.OnChangeTargetHeight(-8);
+			PostAction();
+		}
+
+		[BeginAction("raisesector1")]
+		public void RaiseSector1()
+		{
+			PreAction(UndoGroup.SectorHeightChange);
+			List<IVisualEventReceiver> objs = GetSelectedObjects(true, true, true, true);
+			foreach(IVisualEventReceiver i in objs) i.OnChangeTargetHeight(1);
+			PostAction();
+		}
+
+		[BeginAction("lowersector1")]
+		public void LowerSector1()
+		{
+			PreAction(UndoGroup.SectorHeightChange);
+			List<IVisualEventReceiver> objs = GetSelectedObjects(true, true, true, true);
+			foreach(IVisualEventReceiver i in objs) i.OnChangeTargetHeight(-1);
+			PostAction();
+		}
+
+		//mxd
+		[BeginAction("raisesectortonearest")]
+		public void RaiseSectorToNearest() 
+		{
+			Dictionary<Sector, VisualFloor> floors = new Dictionary<Sector, VisualFloor>();
+			Dictionary<Sector, VisualCeiling> ceilings = new Dictionary<Sector, VisualCeiling>();
+			List<BaseVisualThing> things = new List<BaseVisualThing>();
+			bool withinSelection = General.Interface.CtrlState;
+
+			// Get selection
+			if(selectedobjects.Count == 0)
+			{
+				IVisualEventReceiver i = (target.picked as IVisualEventReceiver);
+				if(i is VisualFloor) 
+				{
+					VisualFloor vf = i as VisualFloor;
+					floors.Add(vf.Level.sector, vf);
+				} 
+				else if(i is VisualCeiling) 
+				{
+					VisualCeiling vc = i as VisualCeiling;
+					ceilings.Add(vc.Level.sector, vc);
+				} 
+				else if(i is BaseVisualThing) 
+				{
+					things.Add(i as BaseVisualThing);
+				}
+			} 
+			else 
+			{
+				foreach(IVisualEventReceiver i in selectedobjects) 
+				{
+					if(i is VisualFloor) 
+					{
+						VisualFloor vf = i as VisualFloor;
+						floors.Add(vf.Level.sector, vf);
+					} 
+					else if(i is VisualCeiling) 
+					{
+						VisualCeiling vc = i as VisualCeiling;
+						ceilings.Add(vc.Level.sector, vc);
+					} 
+					else if(i is BaseVisualThing) 
+					{
+						things.Add(i as BaseVisualThing);
+					}
+				}
+			}
+
+			// Check what we have
+			if(floors.Count + ceilings.Count == 0 && (things.Count == 0 || !General.Map.FormatInterface.HasThingHeight)) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "No suitable objects found!");
+				return;
+			} 
+			
+			if(withinSelection) 
+			{
+				string s = string.Empty;
+
+				if(floors.Count == 1) s = "floors";
+
+				if(ceilings.Count == 1) 
+				{
+					if(!string.IsNullOrEmpty(s)) s += " and ";
+					s += "ceilings";
+				}
+
+				if(!string.IsNullOrEmpty(s))
+				{
+					General.Interface.DisplayStatus(StatusType.Warning, "Can't do: at least 2 selected " + s + " are required!");
+					return;
+				}
+			}
+
+			// Process floors...
+			int maxSelectedHeight = int.MinValue;
+			int minSelectedCeilingHeight = int.MaxValue;
+			int targetCeilingHeight = int.MaxValue;
+
+			// Get highest ceiling height from selection
+			foreach(KeyValuePair<Sector, VisualCeiling> group in ceilings) 
+			{
+				if(group.Key.CeilHeight > maxSelectedHeight) maxSelectedHeight = group.Key.CeilHeight;
+			}
+
+			if(withinSelection) 
+			{
+				// We are raising, so we don't need to check anything
+				targetCeilingHeight = maxSelectedHeight;
+			} 
+			else 
+			{
+				// Get next higher floor or ceiling from surrounding unselected sectors
+				foreach(Sector s in BuilderModesTools.GetSectorsAround(ceilings.Keys))
+				{
+					if(s.FloorHeight < targetCeilingHeight && s.FloorHeight > maxSelectedHeight)
+						targetCeilingHeight = s.FloorHeight;
+					else if(s.CeilHeight < targetCeilingHeight && s.CeilHeight > maxSelectedHeight)
+						targetCeilingHeight = s.CeilHeight;
+				}
+			}
+
+			// Ceilings...
+			maxSelectedHeight = int.MinValue;
+			int targetFloorHeight = int.MaxValue;
+
+			// Get maximum floor and minimum ceiling heights from selection
+			foreach(KeyValuePair<Sector, VisualFloor> group in floors) 
+			{
+				if(group.Key.FloorHeight > maxSelectedHeight) maxSelectedHeight = group.Key.FloorHeight;
+				if(group.Key.CeilHeight < minSelectedCeilingHeight) minSelectedCeilingHeight = group.Key.CeilHeight;
+			}
+
+			if(withinSelection) 
+			{
+				// Check heights
+				if(minSelectedCeilingHeight < maxSelectedHeight) 
+				{
+					General.Interface.DisplayStatus(StatusType.Warning, "Can't do: lowest ceiling is lower than highest floor!");
+					return;
+				} 
+				targetFloorHeight = maxSelectedHeight;
+			} 
+			else 
+			{
+				// Get next higher floor or ceiling from surrounding unselected sectors
+				foreach(Sector s in BuilderModesTools.GetSectorsAround(floors.Keys))
+				{
+					if(s.FloorHeight > maxSelectedHeight && s.FloorHeight < targetFloorHeight && s.FloorHeight <= minSelectedCeilingHeight)
+						targetFloorHeight = s.FloorHeight;
+					else if(s.CeilHeight > maxSelectedHeight && s.CeilHeight < targetFloorHeight && s.CeilHeight <= minSelectedCeilingHeight)
+						targetFloorHeight = s.CeilHeight;
+				}
+			}
+
+			//CHECK VALUES
+			string alignFailDescription = string.Empty;
+
+			if(floors.Count > 0 && targetFloorHeight == int.MaxValue) 
+			{
+				// Raise to lowest ceiling?
+				if(!withinSelection && minSelectedCeilingHeight > maxSelectedHeight) 
+				{
+					targetFloorHeight = minSelectedCeilingHeight;
+				} 
+				else 
+				{
+					alignFailDescription = floors.Count > 1 ? "floors" : "floor";
+				}
+			}
+
+			if(ceilings.Count > 0 && targetCeilingHeight == int.MaxValue) 
+			{
+				if(!string.IsNullOrEmpty(alignFailDescription)) alignFailDescription += " and ";
+				alignFailDescription += ceilings.Count > 1 ? "ceilings" : "ceiling";
+			}
+
+			if(!string.IsNullOrEmpty(alignFailDescription)) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "Unable to align selected " + alignFailDescription + "!");
+				return;
+			}
+
+			//APPLY VALUES
+			PreAction(UndoGroup.SectorHeightChange);
+
+			// Change floors heights
+			if(floors.Count > 0) 
+			{
+				foreach(KeyValuePair<Sector, VisualFloor> group in floors) 
+				{
+					if(targetFloorHeight != group.Key.FloorHeight)
+						group.Value.OnChangeTargetHeight(targetFloorHeight - group.Key.FloorHeight);
+				}
+			}
+
+			// Change ceilings heights
+			if(ceilings.Count > 0) 
+			{
+				foreach(KeyValuePair<Sector, VisualCeiling> group in ceilings) 
+				{
+					if(targetCeilingHeight != group.Key.CeilHeight)
+						group.Value.OnChangeTargetHeight(targetCeilingHeight - group.Key.CeilHeight);
+				}
+			}
+
+			// Change things heights. Align to higher 3d floor or actual ceiling.
+			if(General.Map.FormatInterface.HasThingHeight) 
+			{
+				foreach(BaseVisualThing vt in things) 
+				{
+					if(vt.Thing.Sector == null) continue;
+					SectorData sd = GetSectorData(vt.Thing.Sector);
+					vt.OnMove(new Vector3D(vt.Thing.Position, BuilderModesTools.GetHigherThingZ(this, sd, vt)));
+				}
+			}
+
+			PostAction();
+		}
+
+		//mxd
+		[BeginAction("lowersectortonearest")]
+		public void LowerSectorToNearest() 
+		{
+			Dictionary<Sector, VisualFloor> floors = new Dictionary<Sector, VisualFloor>();
+			Dictionary<Sector, VisualCeiling> ceilings = new Dictionary<Sector, VisualCeiling>();
+			List<BaseVisualThing> things = new List<BaseVisualThing>();
+			bool withinSelection = General.Interface.CtrlState;
+
+			//get selection
+			if(selectedobjects.Count == 0) 
+			{
+				IVisualEventReceiver i = (target.picked as IVisualEventReceiver);
+				if(i is VisualFloor) 
+				{
+					VisualFloor vf = i as VisualFloor;
+					floors.Add(vf.Level.sector, vf);
+				} 
+				else if(i is VisualCeiling) 
+				{
+					VisualCeiling vc = i as VisualCeiling;
+					ceilings.Add(vc.Level.sector, vc);
+				} 
+				else if(i is BaseVisualThing) 
+				{
+					things.Add(i as BaseVisualThing);
+				}
+			}
+			else
+			{
+				foreach(IVisualEventReceiver i in selectedobjects) 
+				{
+					if(i is VisualFloor) 
+					{
+						VisualFloor vf = i as VisualFloor;
+						floors.Add(vf.Level.sector, vf);
+					} 
+					else if(i is VisualCeiling) 
+					{
+						VisualCeiling vc = i as VisualCeiling;
+						ceilings.Add(vc.Level.sector, vc);
+					} 
+					else if(i is BaseVisualThing) 
+					{
+						things.Add(i as BaseVisualThing);
+					}
+				}
+			}
+
+			// Check what we have
+			if(floors.Count + ceilings.Count == 0 && (things.Count == 0 || !General.Map.FormatInterface.HasThingHeight)) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "No suitable objects found!");
+				return;
+			}
+
+			if(withinSelection) 
+			{
+				string s = string.Empty;
+
+				if(floors.Count == 1) s = "floors";
+
+				if(ceilings.Count == 1) 
+				{
+					if(!string.IsNullOrEmpty(s)) s += " and ";
+					s += "ceilings";
+				}
+
+				if(!string.IsNullOrEmpty(s)) 
+				{
+					General.Interface.DisplayStatus(StatusType.Warning, "Can't do: at least 2 selected " + s + " are required!");
+					return;
+				}
+			}
+
+			// Process floors...
+			int minSelectedHeight = int.MaxValue;
+			int targetFloorHeight = int.MinValue;
+
+			// Get minimum floor height from selection
+			foreach(KeyValuePair<Sector, VisualFloor> group in floors) 
+			{
+				if(group.Key.FloorHeight < minSelectedHeight) minSelectedHeight = group.Key.FloorHeight;
+			}
+			
+			if(withinSelection) 
+			{
+				// We are lowering, so we don't need to check anything
+				targetFloorHeight = minSelectedHeight;
+			} 
+			else 
+			{
+				// Get next lower ceiling or floor from surrounding unselected sectors
+				foreach(Sector s in BuilderModesTools.GetSectorsAround(floors.Keys))
+				{
+					if(s.CeilHeight > targetFloorHeight && s.CeilHeight < minSelectedHeight)
+						targetFloorHeight = s.CeilHeight;
+					else if(s.FloorHeight > targetFloorHeight && s.FloorHeight < minSelectedHeight)
+						targetFloorHeight = s.FloorHeight;
+				}
+			}
+
+			// Ceilings...
+			minSelectedHeight = int.MaxValue;
+			int maxSelectedFloorHeight = int.MinValue;
+			int targetCeilingHeight = int.MinValue;
+
+			// Get minimum ceiling and maximum floor heights from selection
+			foreach(KeyValuePair<Sector, VisualCeiling> group in ceilings) 
+			{
+				if(group.Key.CeilHeight < minSelectedHeight) minSelectedHeight = group.Key.CeilHeight;
+				if(group.Key.FloorHeight > maxSelectedFloorHeight) maxSelectedFloorHeight = group.Key.FloorHeight;
+			}
+
+			if(withinSelection) 
+			{
+				if(minSelectedHeight < maxSelectedFloorHeight) 
+				{
+					General.Interface.DisplayStatus(StatusType.Warning, "Can't do: lowest ceiling is lower than highest floor!");
+					return;
+				} 
+				targetCeilingHeight = minSelectedHeight;
+			} 
+			else 
+			{
+				// Get next lower ceiling or floor from surrounding unselected sectors
+				foreach(Sector s in BuilderModesTools.GetSectorsAround(ceilings.Keys))
+				{
+					if(s.CeilHeight > targetCeilingHeight && s.CeilHeight < minSelectedHeight && s.CeilHeight >= maxSelectedFloorHeight)
+						targetCeilingHeight = s.CeilHeight;
+					else if(s.FloorHeight > targetCeilingHeight && s.FloorHeight < minSelectedHeight && s.FloorHeight >= maxSelectedFloorHeight)
+						targetCeilingHeight = s.FloorHeight;
+				}
+			}
+
+			//CHECK VALUES:
+			string alignFailDescription = string.Empty;
+
+			if(floors.Count > 0 && targetFloorHeight == int.MinValue) 
+				alignFailDescription = floors.Count > 1 ? "floors" : "floor";
+
+			if(ceilings.Count > 0 && targetCeilingHeight == int.MinValue) 
+			{
+				// Drop to highest floor?
+				if(!withinSelection && maxSelectedFloorHeight < minSelectedHeight) 
+				{
+					targetCeilingHeight = maxSelectedFloorHeight;
+				} 
+				else 
+				{
+					if(!string.IsNullOrEmpty(alignFailDescription)) alignFailDescription += " and ";
+					alignFailDescription += ceilings.Count > 1 ? "ceilings" : "ceiling";
+				}
+			}
+
+			if(!string.IsNullOrEmpty(alignFailDescription)) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "Unable to align selected " + alignFailDescription + "!");
+				return;
+			}
+
+			//APPLY VALUES:
+			PreAction(UndoGroup.SectorHeightChange);
+
+			// Change floor height
+			if(floors.Count > 0) 
+			{
+				foreach(KeyValuePair<Sector, VisualFloor> group in floors) 
+				{
+					if(targetFloorHeight != group.Key.FloorHeight)
+						group.Value.OnChangeTargetHeight(targetFloorHeight - group.Key.FloorHeight);
+				}
+			}
+
+			// Change ceiling height
+			if(ceilings.Count > 0) 
+			{
+				foreach(KeyValuePair<Sector, VisualCeiling> group in ceilings) 
+				{
+					if(targetCeilingHeight != group.Key.CeilHeight)
+						group.Value.OnChangeTargetHeight(targetCeilingHeight - group.Key.CeilHeight);
+				}
+			}
+
+			// Change things height. Drop to lower 3d floor or to actual sector's floor.
+			if(General.Map.FormatInterface.HasThingHeight)
+			{
+				foreach(BaseVisualThing vt in things) 
+				{
+					if(vt.Thing.Sector == null) continue;
+					SectorData sd = GetSectorData(vt.Thing.Sector);
+					vt.OnMove(new Vector3D(vt.Thing.Position, BuilderModesTools.GetLowerThingZ(this, sd, vt)));
+				}
+			}
+
+			PostAction();
+		}
+
+		//mxd
+		[BeginAction("matchbrightness")]
+		public void MatchBrightness() 
+		{
+			//check input
+			if(!General.Map.UDMF) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "'Match Brightness' action works only in UDMF map format!");
+				return;
+			}
+
+			if(selectedobjects.Count == 0) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "'Match Brightness' action requires a selection!");
+				return;
+			}
+
+			IVisualEventReceiver highlighted = (target.picked as IVisualEventReceiver);
+
+			if(highlighted is BaseVisualThing) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "Highlight a surface, to which you want to match the brightness.");
+				return;
+			}
+
+			//get target brightness
+			int targetbrightness;
+			if(highlighted is VisualFloor) 
+			{
+				VisualFloor v = highlighted as VisualFloor;
+				targetbrightness = v.Level.sector.Fields.GetValue("lightfloor", 0);
+				if(!v.Level.sector.Fields.GetValue("lightfloorabsolute", false)) 
+				{
+					targetbrightness += v.Level.sector.Brightness;
+				}
+			} 
+			else if(highlighted is VisualCeiling) 
+			{
+				VisualCeiling v = highlighted as VisualCeiling;
+				targetbrightness = v.Level.sector.Fields.GetValue("lightceiling", 0);
+				if(!v.Level.sector.Fields.GetValue("lightceilingabsolute", false)) 
+				{
+					targetbrightness += v.Level.sector.Brightness;
+				}
+			} 
+			else if(highlighted is VisualUpper || highlighted is VisualMiddleSingle || highlighted is VisualMiddleDouble || highlighted is VisualLower) 
+			{
+				BaseVisualGeometrySidedef v = highlighted as BaseVisualGeometrySidedef;
+				targetbrightness = v.Sidedef.Fields.GetValue("light", 0);
+				if(!v.Sidedef.Fields.GetValue("lightabsolute", false)) 
+				{
+					targetbrightness += v.Sidedef.Sector.Brightness;
+				}
+			} 
+			else if(highlighted is VisualMiddle3D) 
+			{
+				VisualMiddle3D v = highlighted as VisualMiddle3D;
+				Sidedef sd = v.GetControlLinedef().Front;
+				if(sd == null) 
+				{
+					General.Interface.DisplayStatus(StatusType.Warning, "Highlight a surface, to which you want to match the brightness.");
+					return;
+				}
+				targetbrightness = sd.Fields.GetValue("light", 0);
+				if(!sd.Fields.GetValue("lightabsolute", false)) 
+				{
+					targetbrightness += sd.Sector.Brightness;
+				}
+
+			} 
+			else 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "Highlight a surface, to which you want to match the brightness.");
+				return;
+			}
+
+			//make undo
+			CreateUndo("Match Brightness");
+			targetbrightness = General.Clamp(targetbrightness, 0, 255);
+
+			//apply new brightness
+			foreach(IVisualEventReceiver obj in selectedobjects) 
+			{
+				if(obj == highlighted) continue;
+
+				if(obj is VisualFloor) 
+				{
+					VisualFloor v = obj as VisualFloor;
+					v.Level.sector.Fields.BeforeFieldsChange();
+					v.Sector.Changed = true;
+
+					if(v.Level.sector.Fields.GetValue("lightfloorabsolute", false)) 
+					{
+						v.Level.sector.Fields["lightfloor"] = new UniValue(UniversalType.Integer, targetbrightness);
+					} 
+					else 
+					{
+						UniFields.SetInteger(v.Level.sector.Fields, "lightfloor", targetbrightness - v.Level.sector.Brightness, 0);
+					}
+
+					v.Sector.UpdateSectorGeometry(false);
+				} 
+				else if(obj is VisualCeiling) 
+				{
+					VisualCeiling v = obj as VisualCeiling;
+					v.Level.sector.Fields.BeforeFieldsChange();
+					v.Sector.Changed = true;
+					v.Sector.Sector.UpdateNeeded = true;
+
+					if(v.Level.sector.Fields.GetValue("lightceilingabsolute", false)) 
+					{
+						v.Level.sector.Fields["lightceiling"] = new UniValue(UniversalType.Integer, targetbrightness);
+					} 
+					else 
+					{
+						UniFields.SetInteger(v.Level.sector.Fields, "lightceiling", targetbrightness - v.Level.sector.Brightness, 0);
+					}
+
+					v.Sector.UpdateSectorGeometry(false);
+				} 
+				else if(obj is VisualUpper || obj is VisualMiddleSingle || obj is VisualMiddleDouble || obj is VisualLower) 
+				{
+					BaseVisualGeometrySidedef v = obj as BaseVisualGeometrySidedef;
+					v.Sidedef.Fields.BeforeFieldsChange();
+					v.Sector.Changed = true;
+
+					if(v.Sidedef.Fields.GetValue("lightabsolute", false)) 
+					{
+						v.Sidedef.Fields["light"] = new UniValue(UniversalType.Integer, targetbrightness);
+					} 
+					else 
+					{
+						UniFields.SetInteger(v.Sidedef.Fields, "light", targetbrightness - v.Sidedef.Sector.Brightness, 0);
+					}
+
+					//Update 'lightfog' flag
+					Tools.UpdateLightFogFlag(v.Sidedef);
+				}
+			}
+
+			//Done
+			General.Interface.DisplayStatus(StatusType.Action, "Matched brightness for " + selectedobjects.Count + " surfaces.");
+			Interface_OnSectorEditFormValuesChanged(this, EventArgs.Empty);
+		}
+
+		[BeginAction("showvisualthings")]
+		public void ShowVisualThings()
+		{
+			BuilderPlug.Me.ShowVisualThings++;
+			if(BuilderPlug.Me.ShowVisualThings > 2) BuilderPlug.Me.ShowVisualThings = 0;
+		}
+
+		[BeginAction("raisebrightness8")]
+		public void RaiseBrightness8()
+		{
+			PreAction(UndoGroup.SectorBrightnessChange);
+			List<IVisualEventReceiver> objs = GetSelectedObjects(true, true, false, false);
+			foreach(IVisualEventReceiver i in objs) i.OnChangeTargetBrightness(true);
+			PostAction();
+		}
+
+		[BeginAction("lowerbrightness8")]
+		public void LowerBrightness8()
+		{
+			PreAction(UndoGroup.SectorBrightnessChange);
+			List<IVisualEventReceiver> objs = GetSelectedObjects(true, true, false, false);
+			foreach(IVisualEventReceiver i in objs) i.OnChangeTargetBrightness(false);
+			PostAction();
+		}
+
+		[BeginAction("movetextureleft")]
+		public void MoveTextureLeft1()
+		{
+			PreAction(UndoGroup.TextureOffsetChange);
+			List<IVisualEventReceiver> objs = GetSelectedObjects(true, true, false, false);
+			if(!General.Map.UDMF) objs = RemoveDuplicateSidedefs(objs); //mxd
+			foreach(IVisualEventReceiver i in objs) i.OnChangeTextureOffset(-1, 0, true);
+			PostAction();
+		}
+
+		[BeginAction("movetextureright")]
+		public void MoveTextureRight1()
+		{
+			PreAction(UndoGroup.TextureOffsetChange);
+			List<IVisualEventReceiver> objs = GetSelectedObjects(true, true, false, false);
+			if(!General.Map.UDMF) objs = RemoveDuplicateSidedefs(objs); //mxd
+			foreach(IVisualEventReceiver i in objs) i.OnChangeTextureOffset(1, 0, true);
+			PostAction();
+		}
+
+		[BeginAction("movetextureup")]
+		public void MoveTextureUp1()
+		{
+			PreAction(UndoGroup.TextureOffsetChange);
+			List<IVisualEventReceiver> objs = GetSelectedObjects(true, true, false, false);
+			if(!General.Map.UDMF) objs = RemoveDuplicateSidedefs(objs); //mxd
+			foreach(IVisualEventReceiver i in objs) i.OnChangeTextureOffset(0, -1, true);
+			PostAction();
+		}
+
+		[BeginAction("movetexturedown")]
+		public void MoveTextureDown1()
+		{
+			PreAction(UndoGroup.TextureOffsetChange);
+			List<IVisualEventReceiver> objs = GetSelectedObjects(true, true, false, false);
+			if(!General.Map.UDMF) objs = RemoveDuplicateSidedefs(objs); //mxd
+			foreach(IVisualEventReceiver i in objs) i.OnChangeTextureOffset(0, 1, true);
+			PostAction();
+		}
+
+		[BeginAction("movetextureleft8")]
+		public void MoveTextureLeft8()
+		{
+			PreAction(UndoGroup.TextureOffsetChange);
+			List<IVisualEventReceiver> objs = GetSelectedObjects(true, true, false, false);
+			if(!General.Map.UDMF) objs = RemoveDuplicateSidedefs(objs); //mxd
+			foreach(IVisualEventReceiver i in objs) i.OnChangeTextureOffset(-General.Map.Grid.GridSize, 0, true);
+			PostAction();
+		}
+
+		[BeginAction("movetextureright8")]
+		public void MoveTextureRight8()
+		{
+			PreAction(UndoGroup.TextureOffsetChange);
+			List<IVisualEventReceiver> objs = GetSelectedObjects(true, true, false, false);
+			if(!General.Map.UDMF) objs = RemoveDuplicateSidedefs(objs); //mxd
+			foreach(IVisualEventReceiver i in objs) i.OnChangeTextureOffset(General.Map.Grid.GridSize, 0, true);
+			PostAction();
+		}
+
+		[BeginAction("movetextureup8")]
+		public void MoveTextureUp8()
+		{
+			PreAction(UndoGroup.TextureOffsetChange);
+			List<IVisualEventReceiver> objs = GetSelectedObjects(true, true, false, false);
+			if(!General.Map.UDMF) objs = RemoveDuplicateSidedefs(objs); //mxd
+			foreach(IVisualEventReceiver i in objs) i.OnChangeTextureOffset(0, -General.Map.Grid.GridSize, true);
+			PostAction();
+		}
+
+		[BeginAction("movetexturedown8")]
+		public void MoveTextureDown8()
+		{
+			PreAction(UndoGroup.TextureOffsetChange);
+			List<IVisualEventReceiver> objs = GetSelectedObjects(true, true, false, false);
+			if(!General.Map.UDMF) objs = RemoveDuplicateSidedefs(objs); //mxd
+			foreach(IVisualEventReceiver i in objs) i.OnChangeTextureOffset(0, General.Map.Grid.GridSize, true);
+			PostAction();
+		}
+
+		//mxd
+		[BeginAction("scaleup")]
+		public void ScaleTextureUp() 
+		{
+			PreAction(UndoGroup.TextureScaleChange);
+			List<IVisualEventReceiver> objs = GetSelectedObjects(true, true, true, false);
+			foreach(IVisualEventReceiver i in objs) i.OnChangeScale(1, 1);
+			PostAction();
+		}
+
+		//mxd
+		[BeginAction("scaledown")]
+		public void ScaleTextureDown() 
+		{
+			PreAction(UndoGroup.TextureScaleChange);
+			List<IVisualEventReceiver> objs = GetSelectedObjects(true, true, true, false);
+			foreach(IVisualEventReceiver i in objs) i.OnChangeScale(-1, -1);
+			PostAction();
+		}
+
+		//mxd
+		[BeginAction("scaleupx")]
+		public void ScaleTextureUpX() 
+		{
+			PreAction(UndoGroup.TextureScaleChange);
+			List<IVisualEventReceiver> objs = GetSelectedObjects(true, true, true, false);
+			foreach(IVisualEventReceiver i in objs) i.OnChangeScale(1, 0);
+			PostAction();
+		}
+
+		//mxd
+		[BeginAction("scaledownx")]
+		public void ScaleTextureDownX() 
+		{
+			PreAction(UndoGroup.TextureScaleChange);
+			List<IVisualEventReceiver> objs = GetSelectedObjects(true, true, true, false);
+			foreach(IVisualEventReceiver i in objs) i.OnChangeScale(-1, 0);
+			PostAction();
+		}
+
+		//mxd
+		[BeginAction("scaleupy")]
+		public void ScaleTextureUpY() 
+		{
+			PreAction(UndoGroup.TextureScaleChange);
+			List<IVisualEventReceiver> objs = GetSelectedObjects(true, true, true, false);
+			foreach(IVisualEventReceiver i in objs) i.OnChangeScale(0, 1);
+			PostAction();
+		}
+
+		//mxd
+		[BeginAction("scaledowny")]
+		public void ScaleTextureDownY() 
+		{
+			PreAction(UndoGroup.TextureScaleChange);
+			List<IVisualEventReceiver> objs = GetSelectedObjects(true, true, true, false);
+			foreach(IVisualEventReceiver i in objs) i.OnChangeScale(0, -1);
+			PostAction();
+		}
+
+		[BeginAction("textureselect")]
+		public void TextureSelect()
+		{
+			PreAction(UndoGroup.None);
+			renderer.SetCrosshairBusy(true);
+			General.Interface.RedrawDisplay();
+			GetTargetEventReceiver(false).OnSelectTexture();
+			UpdateChangedObjects();
+			RebuildElementData(); //mxd. Extrafloors or Glow effects may've been changed
+			renderer.SetCrosshairBusy(false);
+			PostAction();
+		}
+
+		[BeginAction("texturecopy")]
+		public void TextureCopy()
+		{
+			PreActionNoChange();
+			GetTargetEventReceiver(true).OnCopyTexture(); //mxd
+			PostAction();
+		}
+
+		[BeginAction("texturepaste")]
+		public void TexturePaste()
+		{
+			PreAction(UndoGroup.None);
+			List<IVisualEventReceiver> objs = GetSelectedObjects(true, true, false, false);
+			foreach(IVisualEventReceiver i in objs) i.OnPasteTexture();
+			PostAction();
+		}
+
+		//mxd
+		[BeginAction("visualautoalign")]
+		public void TextureAutoAlign() 
+		{
+			PreAction(UndoGroup.None);
+			renderer.SetCrosshairBusy(true);
+			General.Interface.RedrawDisplay();
+			GetTargetEventReceiver(false).OnTextureAlign(true, true);
+			UpdateChangedObjects();
+			renderer.SetCrosshairBusy(false);
+			PostAction();
+		}
+
+		[BeginAction("visualautoalignx")]
+		public void TextureAutoAlignX()
+		{
+			PreAction(UndoGroup.None);
+			renderer.SetCrosshairBusy(true);
+			General.Interface.RedrawDisplay();
+			GetTargetEventReceiver(false).OnTextureAlign(true, false);
+			UpdateChangedObjects();
+			renderer.SetCrosshairBusy(false);
+			PostAction();
+		}
+
+		[BeginAction("visualautoaligny")]
+		public void TextureAutoAlignY()
+		{
+			PreAction(UndoGroup.None);
+			renderer.SetCrosshairBusy(true);
+			General.Interface.RedrawDisplay();
+			GetTargetEventReceiver(false).OnTextureAlign(false, true);
+			UpdateChangedObjects();
+			renderer.SetCrosshairBusy(false);
+			PostAction();
+		}
+
+		//mxd
+		[BeginAction("visualautoaligntoselection")]
+		public void TextureAlignToSelected() 
+		{
+			PreAction(UndoGroup.None);
+			renderer.SetCrosshairBusy(true);
+			General.Interface.RedrawDisplay();
+
+			AutoAlignTexturesToSelected(true, true);
+
+			UpdateChangedObjects();
+			renderer.SetCrosshairBusy(false);
+			PostAction();
+		}
+
+		//mxd
+		[BeginAction("visualautoaligntoselectionx")]
+		public void TextureAlignToSelectedX() 
+		{
+			PreAction(UndoGroup.None);
+			renderer.SetCrosshairBusy(true);
+			General.Interface.RedrawDisplay();
+
+			AutoAlignTexturesToSelected(true, false);
+
+			UpdateChangedObjects();
+			renderer.SetCrosshairBusy(false);
+			PostAction();
+		}
+
+		//mxd
+		[BeginAction("visualautoaligntoselectiony")]
+		public void TextureAlignToSelectedY() 
+		{
+			PreAction(UndoGroup.None);
+			renderer.SetCrosshairBusy(true);
+			General.Interface.RedrawDisplay();
+
+			AutoAlignTexturesToSelected(false, true);
+
+			UpdateChangedObjects();
+			renderer.SetCrosshairBusy(false);
+			PostAction();
+		}
+
+		//mxd
+		private void AutoAlignTexturesToSelected(bool alignX, bool alignY) 
+		{
+			string rest;
+			if(alignX && alignY) rest = "(X and Y)";
+			else if(alignX) rest = "(X)";
+			else rest = "(Y)";
+
+			CreateUndo("Auto-align textures to selected sidedefs " + rest);
+			SetActionResult("Auto-aligned textures to selected sidedefs " + rest + ".");
+
+			// Clear all marks, this will align everything it can
+			General.Map.Map.ClearMarkedSidedefs(false);
+			
+			//get selection
+			List<IVisualEventReceiver> objs = GetSelectedObjects(false, true, false, false);
+
+			//align
+			foreach(IVisualEventReceiver i in objs) 
+			{
+				BaseVisualGeometrySidedef side = i as BaseVisualGeometrySidedef;
+				
+				// Make sure the texture is loaded (we need the texture size)
+				if(!side.Texture.IsImageLoaded) side.Texture.LoadImage();
+
+				//Align textures
+				AutoAlignTextures(side, side.Texture, alignX, alignY, false, false);
+
+				// Get the changed sidedefs
+				List<Sidedef> changes = General.Map.Map.GetMarkedSidedefs(true);
+
+				foreach(Sidedef sd in changes) 
+				{
+					// Update the parts for this sidedef!
+					if(VisualSectorExists(sd.Sector)) 
+					{
+						BaseVisualSector vs = (GetVisualSector(sd.Sector) as BaseVisualSector);
+						VisualSidedefParts parts = vs.GetSidedefParts(sd);
+						parts.SetupAllParts();
+					}
+				}
+			}
+		}
+
+		//mxd
+		[BeginAction("visualfittextures")]
+		private void FitTextures() 
+		{
+			PreAction(UndoGroup.None);
+			
+			// Get selection
+			List<IVisualEventReceiver> objs = GetSelectedObjects(false, true, false, false);
+			List<BaseVisualGeometrySidedef> sides = new List<BaseVisualGeometrySidedef>();
+			foreach(IVisualEventReceiver side in objs) 
+			{
+				if(side is BaseVisualGeometrySidedef) sides.Add(side as BaseVisualGeometrySidedef);
+			}
+
+			if(sides.Count == 0)
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "Fit Textures action requires selected sidedefs.");
+				return;
+			}
+
+			// Show form
+			FitTexturesForm form = new FitTexturesForm();
+
+			// Undo changes?
+			if(form.Setup(sides) && form.ShowDialog((Form)General.Interface) == DialogResult.Cancel)
+				General.Map.UndoRedo.WithdrawUndo();
+
+			PostAction();
+		}
+
+		[BeginAction("toggleupperunpegged")]
+		public void ToggleUpperUnpegged()
+		{
+			PreAction(UndoGroup.None);
+			GetTargetEventReceiver(false).OnToggleUpperUnpegged();
+			PostAction();
+		}
+
+		[BeginAction("togglelowerunpegged")]
+		public void ToggleLowerUnpegged()
+		{
+			PreAction(UndoGroup.None);
+			GetTargetEventReceiver(false).OnToggleLowerUnpegged();
+			PostAction();
+		}
+
+		[BeginAction("togglegravity")]
+		public void ToggleGravity()
+		{
+			BuilderPlug.Me.UseGravity = !BuilderPlug.Me.UseGravity;
+			string onoff = BuilderPlug.Me.UseGravity ? "ON" : "OFF";
+			General.Interface.DisplayStatus(StatusType.Action, "Gravity is now " + onoff + ".");
+		}
+
+		[BeginAction("togglehighlight")]
+		public void ToggleHighlight()
+		{
+			BuilderPlug.Me.UseHighlight = !BuilderPlug.Me.UseHighlight;
+			string onoff = BuilderPlug.Me.UseHighlight ? "ON" : "OFF";
+			General.Interface.DisplayStatus(StatusType.Action, "Highlight is now " + onoff + ".");
+		}
+
+		[BeginAction("resettexture")]
+		public void ResetTexture()
+		{
+			PreAction(UndoGroup.None);
+			List<IVisualEventReceiver> objs = GetSelectedObjects(true, true, true, false);
+			foreach(IVisualEventReceiver i in objs) i.OnResetTextureOffset();
+			PostAction();
+		}
+
+		[BeginAction("resettextureudmf")]
+		public void ResetLocalOffsets() 
+		{
+			PreAction(UndoGroup.None);
+			List<IVisualEventReceiver> objs = GetSelectedObjects(true, true, true, false);
+			foreach(IVisualEventReceiver i in objs) i.OnResetLocalTextureOffset();
+			PostAction();
+		}
+
+		[BeginAction("floodfilltextures")]
+		public void FloodfillTextures()
+		{
+			PreAction(UndoGroup.None);
+			GetTargetEventReceiver(false).OnTextureFloodfill();
+			PostAction();
+		}
+
+		[BeginAction("texturecopyoffsets")]
+		public void TextureCopyOffsets()
+		{
+			PreActionNoChange();
+			GetTargetEventReceiver(true).OnCopyTextureOffsets(); //mxd
+			PostAction();
+		}
+
+		[BeginAction("texturepasteoffsets")]
+		public void TexturePasteOffsets()
+		{
+			PreAction(UndoGroup.None);
+			List<IVisualEventReceiver> objs = GetSelectedObjects(true, true, false, false);
+			foreach(IVisualEventReceiver i in objs) i.OnPasteTextureOffsets();
+			PostAction();
+		}
+
+		[BeginAction("copyproperties")]
+		public void CopyProperties()
+		{
+			PreActionNoChange();
+			GetTargetEventReceiver(true).OnCopyProperties(); //mxd
+			PostAction();
+		}
+
+		[BeginAction("pasteproperties")]
+		public void PasteProperties()
+		{
+			PreAction(UndoGroup.None);
+			List<IVisualEventReceiver> objs = GetSelectedObjects(true, true, true, true);
+			foreach(IVisualEventReceiver i in objs) i.OnPasteProperties(false);
+			PostAction();
+		}
+
+		//mxd
+		[BeginAction("pastepropertieswithoptions")]
+		public void PastePropertiesWithOptions()
+		{
+			// Which options to show?
+			HashSet<int> added;
+			var targettypes = new List<MapElementType>();
+			var selection = new List<IVisualEventReceiver>();
+
+			// Sectors selected?
+			var obj = GetSelectedObjects(true, false, false, false);
+			if(obj.Count > 0)
+			{
+				targettypes.Add(MapElementType.SECTOR);
+
+				// Don't add duplicates
+				added = new HashSet<int>();
+				foreach(IVisualEventReceiver receiver in obj)
+				{
+					VisualGeometry vg = receiver as VisualGeometry;
+					if(vg != null && !added.Contains(vg.Sector.GetHashCode()))
+					{
+						selection.Add(receiver);
+						added.Add(vg.Sector.GetHashCode());
+					}
+				}
+			}
+
+			// Sidedefs selected?
+			obj = GetSelectedObjects(false, true, false, false);
+			if(obj.Count > 0)
+			{
+				targettypes.Add(MapElementType.SIDEDEF);
+
+				// Don't add duplicates
+				added = new HashSet<int>();
+				foreach(IVisualEventReceiver receiver in obj)
+				{
+					VisualGeometry vg = receiver as VisualGeometry;
+					if(vg != null && !added.Contains(vg.Sidedef.Line.GetHashCode()))
+					{
+						selection.Add(receiver);
+						added.Add(vg.Sidedef.Line.GetHashCode());
+					}
+				}
+			}
+
+			// Things selected?
+			obj = GetSelectedObjects(false, false, true, false);
+			if(obj.Count > 0)
+			{
+				targettypes.Add(MapElementType.THING);
+
+				// Don't add duplicates
+				added = new HashSet<int>();
+				foreach(IVisualEventReceiver receiver in obj)
+				{
+					VisualThing vt = receiver as VisualThing;
+					if(vt != null && !added.Contains(vt.Thing.GetHashCode()))
+					{
+						selection.Add(receiver);
+						added.Add(vt.Thing.GetHashCode());
+					}
+				}
+			}
+
+			// Vertices selected?
+			obj = GetSelectedObjects(false, false, false, true);
+			if(obj.Count > 0)
+			{
+				targettypes.Add(MapElementType.VERTEX);
+
+				// Don't add duplicates
+				added = new HashSet<int>();
+				foreach(IVisualEventReceiver receiver in obj)
+				{
+					VisualVertex vv = receiver as VisualVertex;
+					if(vv != null && !added.Contains(vv.Vertex.GetHashCode()))
+					{
+						selection.Add(receiver);
+						added.Add(vv.Vertex.GetHashCode());
+					}
+				}
+			}
+
+			// Anything selected?
+			if(selection.Count == 0)
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "This action requires highlight or selection!");
+				return;
+			}
+
+			// Show the form
+			PastePropertiesOptionsForm form = new PastePropertiesOptionsForm();
+			if(form.Setup(targettypes) && form.ShowDialog(General.Interface) == DialogResult.OK)
+			{
+				// Paste properties
+				PreAction(UndoGroup.None);
+				foreach(IVisualEventReceiver i in selection)i.OnPasteProperties(true);
+				PostAction();
+			}
+		}
+
+		//mxd. now we can insert things in Visual modes
+		[BeginAction("insertitem", BaseAction = true)] 
+		public void InsertThing()
+		{
+			Vector2D hitpos = GetHitPosition();
+
+			if(!hitpos.IsFinite()) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "Cannot insert thing here!");
+				return;
+			}
+			
+			ClearSelection();
+			PreActionNoChange();
+			General.Map.UndoRedo.ClearAllRedos();
+			General.Map.UndoRedo.CreateUndo("Insert thing");
+
+			Thing t = CreateThing(new Vector2D(hitpos.x, hitpos.y));
+
+			if(t == null) 
+			{
+				General.Map.UndoRedo.WithdrawUndo();
+				return;
+			}
+
+			// Edit the thing?
+			if(BuilderPlug.Me.EditNewThing) General.Interface.ShowEditThings(new List<Thing> { t });
+
+			//add thing to blockmap
+			blockmap.AddThing(t);
+
+			General.Interface.DisplayStatus(StatusType.Action, "Inserted a new thing.");
+			PostAction();
+		}
+
+		//mxd
+		[BeginAction("deleteitem", BaseAction = true)]
+		public void Delete()
+		{
+			PreAction(UndoGroup.None);
+			List<IVisualEventReceiver> objs = GetSelectedObjects(true, true, true, true);
+			foreach(IVisualEventReceiver i in objs) i.OnDelete();
+			PostAction();
+
+			ClearSelection();
+		}
+
+		//mxd
+		[BeginAction("copyselection", BaseAction = true)]
+		public void CopySelection() 
+		{
+			List<IVisualEventReceiver> objs = GetSelectedObjects(false, false, true, false);
+			if(objs.Count == 0) return;
+
+			copybuffer.Clear();
+			foreach(IVisualEventReceiver i in objs) 
+			{
+				VisualThing vt = i as VisualThing;
+				if(vt != null) copybuffer.Add(new ThingCopyData(vt.Thing));
+			}
+			General.Interface.DisplayStatus(StatusType.Info, "Copied " + copybuffer.Count + " Things");
+		}
+
+		//mxd
+		[BeginAction("cutselection", BaseAction = true)]
+		public void CutSelection() 
+		{
+			CopySelection();
+
+			//Create undo
+			string rest = copybuffer.Count + " thing" + (copybuffer.Count > 1 ? "s." : ".");
+			CreateUndo("Cut " + rest);
+			General.Interface.DisplayStatus(StatusType.Info, "Cut " + rest);
+
+			List<IVisualEventReceiver> objs = GetSelectedObjects(false, false, true, false);
+			foreach(IVisualEventReceiver i in objs) 
+			{
+				BaseVisualThing thing = i as BaseVisualThing;
+				thing.Thing.Fields.BeforeFieldsChange();
+				thing.Thing.Dispose();
+				thing.Dispose();
+			}
+
+			General.Map.IsChanged = true;
+			General.Map.ThingsFilter.Update();
+
+			// Update event lines
+			renderer.SetEventLines(LinksCollector.GetThingLinks(General.Map.ThingsFilter.VisibleThings, blockmap));
+		}
+
+		//mxd. We'll just use currently selected objects 
+		[BeginAction("pasteselection", BaseAction = true)]
+		public void PasteSelection() 
+		{
+			if(copybuffer.Count == 0)
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "Nothing to paste, cut or copy some Things first!");
+				return;
+			}
+			
+			Vector2D hitpos = GetHitPosition();
+
+			if(!hitpos.IsFinite()) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "Cannot paste here!");
+				return;
+			}
+
+			string rest = copybuffer.Count + " thing" + (copybuffer.Count > 1 ? "s" : "");
+			General.Map.UndoRedo.CreateUndo("Paste " + rest);
+			General.Interface.DisplayStatus(StatusType.Info, "Pasted " + rest);
+			
+			PreActionNoChange();
+			ClearSelection();
+
+			//get translated positions
+			Vector3D[] coords = new Vector3D[copybuffer.Count];
+			for(int i = 0; i < copybuffer.Count; i++ )
+				coords[i] = copybuffer[i].Position;
+
+			Vector3D[] translatedCoords = TranslateCoordinates(coords, hitpos, true);
+
+			//create things from copyBuffer
+			for(int i = 0; i < copybuffer.Count; i++) 
+			{
+				Thing t = CreateThing(new Vector2D());
+				if(t != null) 
+				{
+					copybuffer[i].ApplyTo(t);
+					t.Move(translatedCoords[i]);
+					//add thing to blockmap
+					blockmap.AddThing(t);
+				}
+			}
+
+			General.Map.IsChanged = true;
+			General.Map.ThingsFilter.Update();
+
+			PostAction();
+		}
+
+		//mxd. Rotate clockwise
+		[BeginAction("rotateclockwise")]
+		public void RotateCW() 
+		{
+			RotateThingsAndTextures(5);
+		}
+
+		//mxd. Rotate counterclockwise
+		[BeginAction("rotatecounterclockwise")]
+		public void RotateCCW() 
+		{
+			RotateThingsAndTextures(-5);
+		}
+
+		//mxd
+		private void RotateThingsAndTextures(int increment) 
+		{
+			PreAction(UndoGroup.ThingAngleChange);
+
+			List<IVisualEventReceiver> selection = GetSelectedObjects(true, false, true, false);
+			if(selection.Count == 0) return;
+
+			foreach(IVisualEventReceiver obj in selection) 
+			{
+				if(obj is BaseVisualThing) 
+				{
+					BaseVisualThing t = obj as BaseVisualThing;
+					t.SetAngle(General.ClampAngle(t.Thing.AngleDoom + increment));
+				}
+				else if(obj is VisualFloor) 
+				{
+					VisualFloor vf = obj as VisualFloor;
+					vf.OnChangeTextureRotation(General.ClampAngle(vf.GetControlSector().Fields.GetValue("rotationfloor", 0.0f) + increment));
+				} 
+				else if(obj is VisualCeiling) 
+				{
+					VisualCeiling vc = obj as VisualCeiling;
+					vc.OnChangeTextureRotation(General.ClampAngle(vc.GetControlSector().Fields.GetValue("rotationceiling", 0.0f) + increment));
+				}
+			}
+
+			PostAction();
+		}
+
+		//mxd. Change pitch clockwise
+		[BeginAction("pitchclockwise")]
+		public void PitchCW() 
+		{
+			ChangeThingsPitch(-5);
+		}
+
+		//mxd. Change pitch counterclockwise
+		[BeginAction("pitchcounterclockwise")]
+		public void PitchCCW() 
+		{
+			ChangeThingsPitch(5);
+		}
+
+		//mxd
+		private void ChangeThingsPitch(int increment) 
+		{
+			PreAction(UndoGroup.ThingPitchChange);
+
+			List<IVisualEventReceiver> selection = GetSelectedObjects(false, false, true, false);
+			if(selection.Count == 0) return;
+
+			foreach(IVisualEventReceiver obj in selection) 
+			{
+				if(!(obj is BaseVisualThing))  continue;
+				BaseVisualThing t = obj as BaseVisualThing;
+				t.SetPitch(General.ClampAngle(t.Thing.Pitch + increment));
+			}
+
+			PostAction();
+		}
+
+		//mxd. Change pitch clockwise
+		[BeginAction("rollclockwise")]
+		public void RollCW() 
+		{
+			ChangeThingsRoll(-5);
+		}
+
+		//mxd. Change pitch counterclockwise
+		[BeginAction("rollcounterclockwise")]
+		public void RollCCW() 
+		{
+			ChangeThingsRoll(5);
+		}
+
+		//mxd
+		private void ChangeThingsRoll(int increment) 
+		{
+			PreAction(UndoGroup.ThingRollChange);
+
+			List<IVisualEventReceiver> selection = GetSelectedObjects(false, false, true, false);
+			if(selection.Count == 0) return;
+
+			foreach(IVisualEventReceiver obj in selection) 
+			{
+				if(!(obj is BaseVisualThing)) continue;
+				BaseVisualThing t = obj as BaseVisualThing;
+				t.SetRoll(General.ClampAngle(t.Thing.Roll + increment));
+			}
+
+			PostAction();
+		}
+
+		//mxd
+		[BeginAction("togglegzdoomgeometryeffects")]
+		public void ToggleGZDoomRenderingEffects() 
+		{
+			gzdoomRenderingEffects = !gzdoomRenderingEffects;
+			RebuildElementData();
+			UpdateChangedObjects();
+			General.Interface.DisplayStatus(StatusType.Info, "(G)ZDoom geometry effects are " + (gzdoomRenderingEffects ? "ENABLED" : "DISABLED"));
+		}
+
+		//mxd
+		[BeginAction("thingaligntowall")]
+		public void AlignThingsToWall() 
+		{
+			List<VisualThing> visualThings = GetSelectedVisualThings(true);
+
+			if(visualThings.Count == 0) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "This action requires selected Things!");
+				return;
+			}
+
+			List<Thing> things = new List<Thing>();
+
+			foreach(VisualThing vt in visualThings)
+				things.Add(vt.Thing);
+
+			// Make undo
+			if(things.Count > 1) 
+			{
+				General.Map.UndoRedo.CreateUndo("Align " + things.Count + " things");
+				General.Interface.DisplayStatus(StatusType.Action, "Aligned " + things.Count + " things.");
+			} 
+			else 
+			{
+				General.Map.UndoRedo.CreateUndo("Align thing");
+				General.Interface.DisplayStatus(StatusType.Action, "Aligned a thing.");
+			}
+
+			//align things
+			int thingsCount = General.Map.Map.Things.Count;
+
+			foreach(Thing t in things) 
+			{
+				List<Linedef> excludedLines = new List<Linedef>();
+				bool aligned;
+
+				do 
+				{
+					Linedef l = General.Map.Map.NearestLinedef(t.Position, excludedLines);
+					aligned = Tools.TryAlignThingToLine(t, l);
+
+					if(!aligned) 
+					{
+						excludedLines.Add(l);
+
+						if(excludedLines.Count == thingsCount) 
+						{
+							ThingTypeInfo tti = General.Map.Data.GetThingInfo(t.Type);
+							General.ErrorLogger.Add(ErrorType.Warning, "Unable to align Thing ¹" + t.Index + " (" + tti.Title + ") to any linedef in a map!");
+							aligned = true;
+						}
+					}
+				} while(!aligned);
+			}
+
+			//apply changes to Visual Things
+			for(int i = 0; i < visualThings.Count; i++) 
+			{
+				BaseVisualThing t = visualThings[i] as BaseVisualThing;
+				t.Changed = true;
+
+				// Update what must be updated
+				ThingData td = GetThingData(t.Thing);
+				foreach(KeyValuePair<Sector, bool> s in td.UpdateAlso) 
+				{
+					if(VisualSectorExists(s.Key)) 
+					{
+						BaseVisualSector vs = (BaseVisualSector)GetVisualSector(s.Key);
+						vs.UpdateSectorGeometry(s.Value);
+					}
+				}
+			}
+
+			UpdateChangedObjects();
+			ShowTargetInfo();
+		}
+
+		//mxd
+		[BeginAction("lookthroughthing")]
+		public void LookThroughThing() 
+		{
+			List<VisualThing> visualThings = GetSelectedVisualThings(true);
+
+			if(visualThings.Count != 1) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "Look Through Selection action requires 1 selected Thing!");
+				return;
+			}
+
+			//set position and angles
+			Thing t = visualThings[0].Thing;
+			if((t.Type == 9072 || t.Type == 9073) && t.Args[3] > 0) //AimingCamera or MovingCamera with target?
+			{ 
+				//position
+				if(t.Type == 9072 && (t.Args[0] > 0 || t.Args[1] > 0)) //positon MovingCamera at targeted interpolation point
+				{ 
+					int ipTag = t.Args[0] + (t.Args[1] << 8);
+					Thing ip = null;
+
+					//find interpolation point
+					foreach(Thing tgt in General.Map.Map.Things) 
+					{
+						if(tgt.Tag == ipTag && tgt.Type == 9070) 
+						{
+							ip = tgt;
+							break;
+						}
+					}
+
+					if(ip != null) 
+					{
+						VisualThing vTarget = !VisualThingExists(ip) ? CreateVisualThing(ip) : GetVisualThing(ip);
+						Vector3D targetPos;
+						if(vTarget == null) 
+						{
+							targetPos = ip.Position;
+							if(ip.Sector != null) targetPos.z += ip.Sector.FloorHeight;
+						} 
+						else 
+						{
+							targetPos = vTarget.CenterV3D;
+						}
+
+						General.Map.VisualCamera.Position = targetPos; //position at interpolation point
+					} 
+					else 
+					{
+						General.Map.VisualCamera.Position = visualThings[0].CenterV3D; //position at camera
+					}
+
+				}
+				else
+				{
+					General.Map.VisualCamera.Position = visualThings[0].CenterV3D; //position at camera
+				}
+
+				//angle
+				Thing target = null;
+
+				foreach(Thing tgt in General.Map.Map.Things) 
+				{
+					if(tgt.Tag == t.Args[3]) 
+					{
+						target = tgt;
+						break;
+					}
+				}
+
+				if(target == null) 
+				{
+					General.Interface.DisplayStatus(StatusType.Warning, "Camera target with Tag " + t.Args[3] + " does not exist!");
+					General.Map.VisualCamera.AngleXY = t.Angle - Angle2D.PI;
+					General.Map.VisualCamera.AngleZ = Angle2D.PI;
+				} 
+				else 
+				{
+					VisualThing vTarget = !VisualThingExists(target) ? CreateVisualThing(target) : GetVisualThing(target);
+					Vector3D targetPos;
+					if(vTarget == null) 
+					{
+						targetPos = target.Position;
+						if(target.Sector != null) targetPos.z += target.Sector.FloorHeight;
+					} 
+					else 
+					{
+						targetPos = vTarget.CenterV3D;
+					}
+
+					bool pitch = (t.Args[2] & 4) != 0;
+					Vector3D delta = General.Map.VisualCamera.Position - targetPos;
+					General.Map.VisualCamera.AngleXY = delta.GetAngleXY();
+					General.Map.VisualCamera.AngleZ = pitch ? -delta.GetAngleZ() : Angle2D.PI;
+				}
+			} 
+			else if((t.Type == 9025 || t.Type == 9073 || t.Type == 9070) && t.Args[0] != 0) //InterpolationPoint, SecurityCamera or AimingCamera with pitch?
+			{ 
+				General.Map.VisualCamera.Position = visualThings[0].CenterV3D; //position at camera
+				General.Map.VisualCamera.AngleXY = t.Angle - Angle2D.PI;
+				General.Map.VisualCamera.AngleZ = Angle2D.PI + Angle2D.DegToRad(t.Args[0]);
+			} 
+			else //nope, just a generic thing
+			{ 
+				General.Map.VisualCamera.Position = visualThings[0].CenterV3D; //position at thing
+				General.Map.VisualCamera.AngleXY = t.Angle - Angle2D.PI;
+				General.Map.VisualCamera.AngleZ = Angle2D.PI;
+			}
+		}
+
+		//mxd
+		[BeginAction("toggleslope")]
+		public void ToggleSlope() 
+		{
+			List<VisualGeometry> selection = GetSelectedSurfaces();
+
+			if(selection.Count == 0) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "Toggle Slope action requires selected surfaces!");
+				return;
+			}
+
+			List<BaseVisualSector> toUpdate = new List<BaseVisualSector>();
+			General.Map.UndoRedo.CreateUndo("Toggle Slope");
+
+			//check selection
+			foreach(VisualGeometry vg in selection) 
+			{
+				bool update = false;
+
+				//assign/remove action
+				if(vg.GeometryType == VisualGeometryType.WALL_LOWER) 
+				{
+					if(vg.Sidedef.Line.Action == 0 || (vg.Sidedef.Line.Action == 181 && vg.Sidedef.Line.Args[0] == 0)) 
+					{
+						//check if the sector already has floor slopes
+						foreach(Sidedef side in vg.Sidedef.Sector.Sidedefs) 
+						{
+							if(side == vg.Sidedef || side.Line.Action != 181) continue;
+
+							int arg = (side == side.Line.Front ? 1 : 2);
+
+							if(side.Line.Args[0] == arg) 
+							{
+								//if only floor is affected, remove action
+								if(side.Line.Args[1] == 0)
+									side.Line.Action = 0;
+								else //clear floor alignment
+									side.Line.Args[0] = 0;
+							}
+						}
+
+						//set action
+						vg.Sidedef.Line.Action = 181;
+						vg.Sidedef.Line.Args[0] = (vg.Sidedef == vg.Sidedef.Line.Front ? 1 : 2);
+						update = true;
+					}
+				} 
+				else if(vg.GeometryType == VisualGeometryType.WALL_UPPER) 
+				{
+					if(vg.Sidedef.Line.Action == 0 || (vg.Sidedef.Line.Action == 181 && vg.Sidedef.Line.Args[1] == 0)) 
+					{
+						//check if the sector already has ceiling slopes
+						foreach(Sidedef side in vg.Sidedef.Sector.Sidedefs) 
+						{
+							if(side == vg.Sidedef || side.Line.Action != 181) continue;
+
+							int arg = (side == side.Line.Front ? 1 : 2);
+
+							if(side.Line.Args[1] == arg) 
+							{
+								//if only ceiling is affected, remove action
+								if(side.Line.Args[0] == 0)
+									side.Line.Action = 0;
+								else //clear ceiling alignment
+									side.Line.Args[1] = 0;
+							}
+						}
+
+						//set action
+						vg.Sidedef.Line.Action = 181;
+						vg.Sidedef.Line.Args[1] = (vg.Sidedef == vg.Sidedef.Line.Front ? 1 : 2);
+						update = true;
+					}
+				} 
+				else if(vg.GeometryType == VisualGeometryType.CEILING) 
+				{
+					//check if the sector has ceiling slopes
+					foreach(Sidedef side in vg.Sector.Sector.Sidedefs) 
+					{
+						if(side.Line.Action != 181)	continue;
+
+						int arg = (side == side.Line.Front ? 1 : 2);
+
+						if(side.Line.Args[1] == arg) 
+						{
+							//if only ceiling is affected, remove action
+							if(side.Line.Args[0] == 0)
+								side.Line.Action = 0;
+							else //clear ceiling alignment
+								side.Line.Args[1] = 0;
+
+							update = true;
+						}
+					}
+				} 
+				else if(vg.GeometryType == VisualGeometryType.FLOOR) 
+				{
+					//check if the sector has floor slopes
+					foreach(Sidedef side in vg.Sector.Sector.Sidedefs) 
+					{
+						if(side.Line.Action != 181)	continue;
+
+						int arg = (side == side.Line.Front ? 1 : 2);
+
+						if(side.Line.Args[0] == arg) 
+						{
+							//if only floor is affected, remove action
+							if(side.Line.Args[1] == 0)
+								side.Line.Action = 0;
+							else //clear floor alignment
+								side.Line.Args[0] = 0;
+
+							update = true;
+						}
+					}
+				}
+
+				//add to update list
+				if(update) toUpdate.Add(vg.Sector as BaseVisualSector);
+			}
+
+			//update changed geometry
+			if(toUpdate.Count > 0) 
+			{
+				RebuildElementData();
+
+				foreach(BaseVisualSector vs in toUpdate)
+					vs.UpdateSectorGeometry(true);
+
+				UpdateChangedObjects();
+				ClearSelection();
+				ShowTargetInfo();
+			}
+
+			General.Interface.DisplayStatus(StatusType.Action, "Toggled Slope for " + toUpdate.Count + (toUpdate.Count == 1 ? " surface." : " surfaces."));
+		}
+		
+		#endregion
+
+		#region ================== Texture Alignment
+
+		//mxd. If checkSelectedSidedefParts is set to true, only selected linedef parts will be aligned (when a sidedef has both top and bottom parts, but only bottom is selected, top texture won't be aligned)
+		internal void AutoAlignTextures(BaseVisualGeometrySidedef start, ImageData texture, bool alignx, bool aligny, bool resetsidemarks, bool checkSelectedSidedefParts) 
+		{
+			if(General.Map.UDMF)
+				AutoAlignTexturesUDMF(start, texture, alignx, aligny, resetsidemarks, checkSelectedSidedefParts);
+			else
+				AutoAlignTextures(start, texture, alignx, aligny, resetsidemarks);
+		}
+
+		//mxd. Moved here from Tools
+		// This performs texture alignment along all walls that match with the same texture
+		// NOTE: This method uses the sidedefs marking to indicate which sides have been aligned
+		// When resetsidemarks is set to true, all sidedefs will first be marked false (not aligned).
+		// Setting resetsidemarks to false is usefull to align only within a specific selection
+		// (set the marked property to true for the sidedefs outside the selection)
+		private void AutoAlignTextures(BaseVisualGeometrySidedef start, ImageData texture, bool alignx, bool aligny, bool resetsidemarks) 
+		{
+			Stack<SidedefAlignJob> todo = new Stack<SidedefAlignJob>(50);
+			float scalex = (General.Map.Config.ScaledTextureOffsets && !texture.WorldPanning) ? texture.Scale.x : 1.0f;
+			float scaley = (General.Map.Config.ScaledTextureOffsets && !texture.WorldPanning) ? texture.Scale.y : 1.0f;
+
+			// Mark all sidedefs false (they will be marked true when the texture is aligned).
+			if(resetsidemarks) General.Map.Map.ClearMarkedSidedefs(false);
+
+			// Begin with first sidedef
+			SidedefAlignJob first = new SidedefAlignJob();
+			first.sidedef = start.Sidedef;
+			first.offsetx = start.Sidedef.OffsetX;
+			int ystartalign = start.Sidedef.OffsetY; //mxd
+
+			//mxd
+			if(start.GeometryType == VisualGeometryType.WALL_MIDDLE_3D) 
+			{
+				first.controlSide = start.GetControlLinedef().Front;
+				first.offsetx += first.controlSide.OffsetX;
+				ystartalign += first.controlSide.OffsetY;
+			} 
+			else 
+			{
+				first.controlSide = start.Sidedef;
+			}
+
+			first.forward = true;
+			todo.Push(first);
+
+			// Continue until nothing more to align
+			while(todo.Count > 0) 
+			{
+				// Get the align job to do
+				SidedefAlignJob j = todo.Pop();
+
+				if(j.forward) 
+				{
+					// Apply alignment
+					if(alignx) j.controlSide.OffsetX = (int)j.offsetx;
+					if(aligny) j.sidedef.OffsetY = (int)Math.Round((first.ceilingHeight - j.ceilingHeight) / scaley) + ystartalign;
+					int forwardoffset = (int)j.offsetx + (int)Math.Round(j.sidedef.Line.Length / scalex);
+					int backwardoffset = (int)j.offsetx;
+
+					j.sidedef.Marked = true;
+
+					// Wrap the value within the width of the texture (to prevent ridiculous values)
+					// NOTE: We don't use ScaledWidth here because the texture offset is in pixels, not mappixels
+					if(texture.IsImageLoaded && Tools.SidedefTextureMatch(j.sidedef, texture.LongName)) 
+					{
+						if(alignx) j.sidedef.OffsetX %= texture.Width;
+						if(aligny) j.sidedef.OffsetY %= texture.Height;
+					}
+
+					// Add sidedefs forward (connected to the right vertex)
+					Vertex v = j.sidedef.IsFront ? j.sidedef.Line.End : j.sidedef.Line.Start;
+					AddSidedefsForAlignment(todo, v, true, forwardoffset, 1.0f, texture.LongName, false);
+
+					// Add sidedefs backward (connected to the left vertex)
+					v = j.sidedef.IsFront ? j.sidedef.Line.Start : j.sidedef.Line.End;
+					AddSidedefsForAlignment(todo, v, false, backwardoffset, 1.0f, texture.LongName, false);
+				} 
+				else 
+				{
+					// Apply alignment
+					if(alignx) j.controlSide.OffsetX = (int)j.offsetx - (int)Math.Round(j.sidedef.Line.Length / scalex);
+					if(aligny) j.sidedef.OffsetY = (int)Math.Round((first.ceilingHeight - j.ceilingHeight) / scaley) + ystartalign;
+					int forwardoffset = (int)j.offsetx;
+					int backwardoffset = (int)j.offsetx - (int)Math.Round(j.sidedef.Line.Length / scalex);
+
+					j.sidedef.Marked = true;
+
+					// Wrap the value within the width of the texture (to prevent ridiculous values)
+					// NOTE: We don't use ScaledWidth here because the texture offset is in pixels, not mappixels
+					if(texture.IsImageLoaded && Tools.SidedefTextureMatch(j.sidedef, texture.LongName)) 
+					{
+						if(alignx) j.sidedef.OffsetX %= texture.Width;
+						if(aligny) j.sidedef.OffsetY %= texture.Height;
+					}
+
+					// Add sidedefs backward (connected to the left vertex)
+					Vertex v = j.sidedef.IsFront ? j.sidedef.Line.Start : j.sidedef.Line.End;
+					AddSidedefsForAlignment(todo, v, false, backwardoffset, 1.0f, texture.LongName, false);
+
+					// Add sidedefs forward (connected to the right vertex)
+					v = j.sidedef.IsFront ? j.sidedef.Line.End : j.sidedef.Line.Start;
+					AddSidedefsForAlignment(todo, v, true, forwardoffset, 1.0f, texture.LongName, false);
+				}
+			}
+		}
+
+		//mxd. Moved here from GZDoomEditing plugin
+		// This performs UDMF texture alignment along all walls that match with the same texture
+		// NOTE: This method uses the sidedefs marking to indicate which sides have been aligned
+		// When resetsidemarks is set to true, all sidedefs will first be marked false (not aligned).
+		// Setting resetsidemarks to false is usefull to align only within a specific selection
+		// (set the marked property to true for the sidedefs outside the selection)
+		private void AutoAlignTexturesUDMF(BaseVisualGeometrySidedef start, ImageData texture, bool alignx, bool aligny, bool resetsidemarks, bool checkSelectedSidedefParts) 
+		{
+			// Mark all sidedefs false (they will be marked true when the texture is aligned)
+			if(resetsidemarks) General.Map.Map.ClearMarkedSidedefs(false);
+			if(!texture.IsImageLoaded) return;
+
+			Stack<SidedefAlignJob> todo = new Stack<SidedefAlignJob>(50);
+			float scalex = (General.Map.Config.ScaledTextureOffsets && !texture.WorldPanning) ? texture.Scale.x : 1.0f;
+			float scaley = (General.Map.Config.ScaledTextureOffsets && !texture.WorldPanning) ? texture.Scale.y : 1.0f;
+
+			SidedefAlignJob first = new SidedefAlignJob();
+			first.sidedef = start.Sidedef;
+			first.offsetx = start.Sidedef.OffsetX;
+
+			if(start.GeometryType == VisualGeometryType.WALL_MIDDLE_3D)
+				first.controlSide = start.GetControlLinedef().Front;
+			else
+				first.controlSide = start.Sidedef;
+
+			//mxd
+			List<BaseVisualGeometrySidedef> selectedVisualSides = new List<BaseVisualGeometrySidedef>();
+			if(checkSelectedSidedefParts && !singleselection) 
+			{
+				foreach(IVisualEventReceiver i in selectedobjects) 
+				{
+					if(i is BaseVisualGeometrySidedef) 
+					{
+						BaseVisualGeometrySidedef sd = i as BaseVisualGeometrySidedef;
+						if(!selectedVisualSides.Contains(sd)) selectedVisualSides.Add(sd);
+					}
+				}
+			}
+			
+			//mxd. Scale
+			switch(start.GeometryType) 
+			{
+				case VisualGeometryType.WALL_UPPER:
+					first.scaleX = start.Sidedef.Fields.GetValue("scalex_top", 1.0f);
+					first.scaleY = start.Sidedef.Fields.GetValue("scaley_top", 1.0f);
+					break;
+				case VisualGeometryType.WALL_MIDDLE:
+				case VisualGeometryType.WALL_MIDDLE_3D:
+					first.scaleX = first.controlSide.Fields.GetValue("scalex_mid", 1.0f);
+					first.scaleY = first.controlSide.Fields.GetValue("scaley_mid", 1.0f);
+					break;
+				case VisualGeometryType.WALL_LOWER:
+					first.scaleX = start.Sidedef.Fields.GetValue("scalex_bottom", 1.0f);
+					first.scaleY = start.Sidedef.Fields.GetValue("scaley_bottom", 1.0f);
+					break;
+			}
+
+			// Determine the Y alignment
+			float ystartalign = start.Sidedef.OffsetY;
+			switch(start.GeometryType) 
+			{
+				case VisualGeometryType.WALL_UPPER:
+					ystartalign += Tools.GetSidedefTopOffsetY(start.Sidedef, start.Sidedef.Fields.GetValue("offsety_top", 0.0f), first.scaleY / scaley, false);//mxd
+					break;
+				case VisualGeometryType.WALL_MIDDLE:
+					ystartalign += Tools.GetSidedefMiddleOffsetY(start.Sidedef, start.Sidedef.Fields.GetValue("offsety_mid", 0.0f), first.scaleY / scaley, false);//mxd
+					break;
+				case VisualGeometryType.WALL_MIDDLE_3D: //mxd. 3d-floors are not affected by Lower/Upper unpegged flags
+					ystartalign += first.controlSide.OffsetY - (start.Sidedef.Sector.CeilHeight - first.ceilingHeight);
+					ystartalign += start.Sidedef.Fields.GetValue("offsety_mid", 0.0f);
+					ystartalign += first.controlSide.Fields.GetValue("offsety_mid", 0.0f);
+					break;
+				case VisualGeometryType.WALL_LOWER:
+					ystartalign += Tools.GetSidedefBottomOffsetY(start.Sidedef, start.Sidedef.Fields.GetValue("offsety_bottom", 0.0f), first.scaleY / scaley, false);//mxd
+					break;
+			}
+
+			// Begin with first sidedef
+			switch(start.GeometryType) 
+			{
+				case VisualGeometryType.WALL_UPPER:
+					first.offsetx += start.Sidedef.Fields.GetValue("offsetx_top", 0.0f);
+					break;
+				case VisualGeometryType.WALL_MIDDLE:
+					first.offsetx += start.Sidedef.Fields.GetValue("offsetx_mid", 0.0f);
+					break;
+				case VisualGeometryType.WALL_MIDDLE_3D: //mxd. Yup, 4 sets of texture offsets are used
+					first.offsetx += start.Sidedef.Fields.GetValue("offsetx_mid", 0.0f);
+					first.offsetx += first.controlSide.OffsetX;
+					first.offsetx += first.controlSide.Fields.GetValue("offsetx_mid", 0.0f);
+					break;
+				case VisualGeometryType.WALL_LOWER:
+					first.offsetx += start.Sidedef.Fields.GetValue("offsetx_bottom", 0.0f);
+					break;
+			}
+			first.forward = true;
+			todo.Push(first);
+
+			// Continue until nothing more to align
+			while(todo.Count > 0) 
+			{
+				Vertex v;
+				float forwardoffset;
+				float backwardoffset;
+
+				// Get the align job to do
+				SidedefAlignJob j = todo.Pop();
+
+				bool matchtop = (!j.sidedef.Marked && (!singleselection || j.sidedef.LongHighTexture == texture.LongName) && j.sidedef.HighRequired());
+				bool matchbottom = (!j.sidedef.Marked && (!singleselection || j.sidedef.LongLowTexture == texture.LongName) && j.sidedef.LowRequired());
+				bool matchmid = ((!singleselection || j.controlSide.LongMiddleTexture == texture.LongName) && (j.controlSide.MiddleRequired() || j.controlSide.LongMiddleTexture != MapSet.EmptyLongName)); //mxd
+
+				//mxd. If there's a selection, check if matched part is actually selected
+				if(checkSelectedSidedefParts && !singleselection) 
+				{
+					if(matchtop) matchtop = SidePartIsSelected(selectedVisualSides, j.sidedef, VisualGeometryType.WALL_UPPER);
+					if(matchbottom) matchbottom = SidePartIsSelected(selectedVisualSides, j.sidedef, VisualGeometryType.WALL_LOWER);
+					if(matchmid) matchmid = SidePartIsSelected(selectedVisualSides, j.sidedef, VisualGeometryType.WALL_MIDDLE) || 
+						SidePartIsSelected(selectedVisualSides, j.sidedef, VisualGeometryType.WALL_MIDDLE_3D);
+				}
+
+				if(!matchbottom && !matchtop && !matchmid) continue; //mxd
+
+				//mxd. We want to skip realigning of the starting wall part
+				if(matchtop) matchtop = (j.sidedef != start.Sidedef || start.GeometryType != VisualGeometryType.WALL_UPPER);
+				if(matchmid) matchmid = (j.sidedef != start.Sidedef || (start.GeometryType != VisualGeometryType.WALL_MIDDLE && start.GeometryType != VisualGeometryType.WALL_MIDDLE_3D));
+				if(matchbottom) matchbottom = (j.sidedef != start.Sidedef || start.GeometryType != VisualGeometryType.WALL_LOWER);
+
+				if(matchbottom || matchtop || matchmid)
+				{
+					j.sidedef.Fields.BeforeFieldsChange();
+					if(j.sidedef.Index != j.controlSide.Index) j.controlSide.Fields.BeforeFieldsChange(); //mxd
+				}
+				
+				//mxd. Apply Scale
+				if(matchtop)
+				{
+					UniFields.SetFloat(j.sidedef.Fields, "scalex_top", first.scaleX, 1.0f);
+					UniFields.SetFloat(j.sidedef.Fields, "scaley_top", j.scaleY, 1.0f);
+				}
+				if(matchmid)
+				{
+					UniFields.SetFloat(j.controlSide.Fields, "scalex_mid", first.scaleX, 1.0f);
+					UniFields.SetFloat(j.controlSide.Fields, "scaley_mid", j.scaleY, 1.0f);
+				}
+				if(matchbottom)
+				{
+					UniFields.SetFloat(j.sidedef.Fields, "scalex_bottom", first.scaleX, 1.0f);
+					UniFields.SetFloat(j.sidedef.Fields, "scaley_bottom", j.scaleY, 1.0f);
+				}
+
+				if(j.forward) 
+				{
+					// Apply alignment
+					if(alignx) 
+					{
+						float offset = j.offsetx;
+						offset -= j.sidedef.OffsetX;
+
+						if(matchtop)
+							j.sidedef.Fields["offsetx_top"] = new UniValue(UniversalType.Float, (float)Math.Round(offset % General.Map.Data.GetTextureImage(j.sidedef.LongHighTexture).Width, General.Map.FormatInterface.VertexDecimals));
+						if(matchbottom)
+							j.sidedef.Fields["offsetx_bottom"] = new UniValue(UniversalType.Float, (float)Math.Round(offset % General.Map.Data.GetTextureImage(j.sidedef.LongLowTexture).Width, General.Map.FormatInterface.VertexDecimals));
+						if(matchmid) 
+						{
+							if(j.sidedef.Index != j.controlSide.Index) //mxd. if it's a part of 3d-floor 
+							{ 
+								offset -= j.controlSide.OffsetX;
+								offset -= j.controlSide.Fields.GetValue("offsetx_mid", 0.0f);
+							}
+
+							j.sidedef.Fields["offsetx_mid"] = new UniValue(UniversalType.Float, (float)Math.Round(offset % General.Map.Data.GetTextureImage(j.controlSide.LongMiddleTexture).Width, General.Map.FormatInterface.VertexDecimals));
+						}
+					}
+
+					if(aligny) 
+					{
+						float offset = ((start.Sidedef.Sector.CeilHeight - j.ceilingHeight) / scaley) * j.scaleY + ystartalign; //mxd
+						offset -= j.sidedef.OffsetY; //mxd
+						
+						if(matchtop)
+							j.sidedef.Fields["offsety_top"] = new UniValue(UniversalType.Float, (float)Math.Round(Tools.GetSidedefTopOffsetY(j.sidedef, offset, j.scaleY / scaley, true) % General.Map.Data.GetTextureImage(j.sidedef.LongHighTexture).Height, General.Map.FormatInterface.VertexDecimals)); //mxd
+						if(matchbottom)
+							j.sidedef.Fields["offsety_bottom"] = new UniValue(UniversalType.Float, (float)Math.Round(Tools.GetSidedefBottomOffsetY(j.sidedef, offset, j.scaleY / scaley, true) % General.Map.Data.GetTextureImage(j.sidedef.LongLowTexture).Height, General.Map.FormatInterface.VertexDecimals)); //mxd
+						if(matchmid) 
+						{
+							//mxd. Side is part of a 3D floor?
+							if(j.sidedef.Index != j.controlSide.Index) 
+							{
+								offset -= j.controlSide.OffsetY;
+								offset -= j.controlSide.Fields.GetValue("offsety_mid", 0.0f);
+								j.sidedef.Fields["offsety_mid"] = new UniValue(UniversalType.Float, (float)Math.Round(offset % General.Map.Data.GetTextureImage(j.controlSide.LongMiddleTexture).Height, General.Map.FormatInterface.VertexDecimals));
+							} 
+							else
+							{
+								ImageData midtex = General.Map.Data.GetTextureImage(j.sidedef.LongMiddleTexture);
+								offset = Tools.GetSidedefMiddleOffsetY(j.sidedef, offset, j.scaleY / scaley, true);
+
+								bool startisnonwrappedmidtex = (start.Sidedef.Other != null && start.GeometryType == VisualGeometryType.WALL_MIDDLE && !start.Sidedef.IsFlagSet("wrapmidtex") && !start.Sidedef.Line.IsFlagSet("wrapmidtex"));
+								bool cursideisnonwrappedmidtex = (j.sidedef.Other != null && !j.sidedef.IsFlagSet("wrapmidtex") && !j.sidedef.Line.IsFlagSet("wrapmidtex"));
+
+								//mxd. Only clamp when the texture is wrapped 
+								if(!cursideisnonwrappedmidtex) offset %= midtex.Height;
+
+								if(!startisnonwrappedmidtex && cursideisnonwrappedmidtex)
+								{
+									//mxd. This should be doublesided non-wrapped line. Find the nearset aligned position
+									float curoffset = UniFields.GetFloat(j.sidedef.Fields, "offsety_mid") + j.sidedef.OffsetY;
+									offset += midtex.Height * (float)Math.Round(curoffset / midtex.Height - 0.5f * Math.Sign(j.scaleY));
+
+									// Make sure the surface stays between floor and ceiling
+									if(j.sidedef.Line.IsFlagSet(General.Map.Config.LowerUnpeggedFlag) || Math.Sign(j.scaleY) == -1)
+									{
+										if(offset < -midtex.Height)
+											offset += midtex.Height;
+										else if(offset > j.sidedef.GetMiddleHeight())
+											offset -= midtex.Height;
+									}
+									else 
+									{
+										if(offset < -(j.sidedef.GetMiddleHeight() + midtex.Height))
+											offset += midtex.Height;
+										else if(offset > midtex.Height)
+											offset -= midtex.Height;
+									}
+								}
+
+								j.sidedef.Fields["offsety_mid"] = new UniValue(UniversalType.Float, (float)Math.Round(offset, General.Map.FormatInterface.VertexDecimals)); //mxd
+							}
+						}
+					}
+
+					forwardoffset = j.offsetx + (float)Math.Round(j.sidedef.Line.Length / scalex * first.scaleX, General.Map.FormatInterface.VertexDecimals);
+					backwardoffset = j.offsetx;
+
+					// Done this sidedef
+					j.sidedef.Marked = true;
+					j.controlSide.Marked = true;
+
+					// Add sidedefs backward (connected to the left vertex)
+					v = j.sidedef.IsFront ? j.sidedef.Line.Start : j.sidedef.Line.End;
+					AddSidedefsForAlignment(todo, v, false, backwardoffset, j.scaleY, texture.LongName, true);
+
+					// Add sidedefs forward (connected to the right vertex)
+					v = j.sidedef.IsFront ? j.sidedef.Line.End : j.sidedef.Line.Start;
+					AddSidedefsForAlignment(todo, v, true, forwardoffset, j.scaleY, texture.LongName, true);
+				} 
+				else 
+				{
+					// Apply alignment
+					if(alignx) 
+					{
+						float offset = j.offsetx - (float)Math.Round(j.sidedef.Line.Length / scalex * first.scaleX, General.Map.FormatInterface.VertexDecimals);
+						offset -= j.sidedef.OffsetX;
+
+						if(matchtop)
+							j.sidedef.Fields["offsetx_top"] = new UniValue(UniversalType.Float, (float)Math.Round(offset % General.Map.Data.GetTextureImage(j.sidedef.LongHighTexture).Width, General.Map.FormatInterface.VertexDecimals));
+						if(matchbottom)
+							j.sidedef.Fields["offsetx_bottom"] = new UniValue(UniversalType.Float, (float)Math.Round(offset % General.Map.Data.GetTextureImage(j.sidedef.LongLowTexture).Width, General.Map.FormatInterface.VertexDecimals));
+						if(matchmid) 
+						{
+							if(j.sidedef.Index != j.controlSide.Index) //mxd
+							{ 
+								offset -= j.controlSide.OffsetX;
+								offset -= j.controlSide.Fields.GetValue("offsetx_mid", 0.0f);
+							}
+
+							j.sidedef.Fields["offsetx_mid"] = new UniValue(UniversalType.Float, (float)Math.Round(offset % General.Map.Data.GetTextureImage(j.controlSide.LongMiddleTexture).Width, General.Map.FormatInterface.VertexDecimals));
+						}
+					}
+
+					if(aligny) 
+					{
+						float offset = ((start.Sidedef.Sector.CeilHeight - j.ceilingHeight) / scaley) * j.scaleY + ystartalign; //mxd
+						offset -= j.sidedef.OffsetY; //mxd
+
+						if(matchtop)
+							j.sidedef.Fields["offsety_top"] = new UniValue(UniversalType.Float, (float)Math.Round(Tools.GetSidedefTopOffsetY(j.sidedef, offset, j.scaleY / scaley, true) % General.Map.Data.GetTextureImage(j.sidedef.LongHighTexture).Height, General.Map.FormatInterface.VertexDecimals)); //mxd
+						if(matchbottom)
+							j.sidedef.Fields["offsety_bottom"] = new UniValue(UniversalType.Float, (float)Math.Round(Tools.GetSidedefBottomOffsetY(j.sidedef, offset, j.scaleY / scaley, true) % General.Map.Data.GetTextureImage(j.sidedef.LongLowTexture).Height, General.Map.FormatInterface.VertexDecimals)); //mxd
+						if(matchmid) 
+						{
+							//mxd. Side is part of a 3D floor?
+							if(j.sidedef.Index != j.controlSide.Index) 
+							{
+								offset -= j.controlSide.OffsetY;
+								offset -= j.controlSide.Fields.GetValue("offsety_mid", 0.0f);
+								j.sidedef.Fields["offsety_mid"] = new UniValue(UniversalType.Float, (float)Math.Round(offset % General.Map.Data.GetTextureImage(j.controlSide.LongMiddleTexture).Height, General.Map.FormatInterface.VertexDecimals)); //mxd
+							} 
+							else 
+							{
+								ImageData midtex = General.Map.Data.GetTextureImage(j.sidedef.LongMiddleTexture);
+								offset = Tools.GetSidedefMiddleOffsetY(j.sidedef, offset, j.scaleY / scaley, true);
+
+								bool startisnonwrappedmidtex = (start.Sidedef.Other != null && start.GeometryType == VisualGeometryType.WALL_MIDDLE && !start.Sidedef.IsFlagSet("wrapmidtex") && !start.Sidedef.Line.IsFlagSet("wrapmidtex"));
+								bool cursideisnonwrappedmidtex = (j.sidedef.Other != null && !j.sidedef.IsFlagSet("wrapmidtex") && !j.sidedef.Line.IsFlagSet("wrapmidtex"));
+
+								//mxd. Only clamp when the texture is wrapped 
+								if(!cursideisnonwrappedmidtex) offset %= midtex.Height;
+
+								if(!startisnonwrappedmidtex && cursideisnonwrappedmidtex) 
+								{
+									//mxd. This should be doublesided non-wrapped line. Find the nearset aligned position
+									float curoffset = UniFields.GetFloat(j.sidedef.Fields, "offsety_mid") + j.sidedef.OffsetY;
+									offset += midtex.Height * (float)Math.Round(curoffset / midtex.Height - 0.5f * Math.Sign(j.scaleY));
+
+									// Make sure the surface stays between floor and ceiling
+									if(j.sidedef.Line.IsFlagSet(General.Map.Config.LowerUnpeggedFlag) || Math.Sign(j.scaleY) == -1) 
+									{
+										if(offset < -midtex.Height)
+											offset += midtex.Height;
+										else if(offset > j.sidedef.GetMiddleHeight())
+											offset -= midtex.Height;
+									} 
+									else 
+									{
+										if(offset < -(j.sidedef.GetMiddleHeight() + midtex.Height))
+											offset += midtex.Height;
+										else if(offset > midtex.Height)
+											offset -= midtex.Height;
+									}
+								}
+
+								j.sidedef.Fields["offsety_mid"] = new UniValue(UniversalType.Float, (float)Math.Round(offset, General.Map.FormatInterface.VertexDecimals)); //mxd
+							}
+						}
+					}
+
+					forwardoffset = j.offsetx;
+					backwardoffset = j.offsetx - (float)Math.Round(j.sidedef.Line.Length / scalex * first.scaleX, General.Map.FormatInterface.VertexDecimals);
+
+					// Done this sidedef
+					j.sidedef.Marked = true;
+					j.controlSide.Marked = true;
+
+					// Add sidedefs forward (connected to the right vertex)
+					v = j.sidedef.IsFront ? j.sidedef.Line.End : j.sidedef.Line.Start;
+					AddSidedefsForAlignment(todo, v, true, forwardoffset, j.scaleY, texture.LongName, true);
+
+					// Add sidedefs backward (connected to the left vertex)
+					v = j.sidedef.IsFront ? j.sidedef.Line.Start : j.sidedef.Line.End;
+					AddSidedefsForAlignment(todo, v, false, backwardoffset, j.scaleY, texture.LongName, true);
+				}
+			}
+		}
+
+		// This adds the matching, unmarked sidedefs from a vertex for texture alignment
+		private void AddSidedefsForAlignment(Stack<SidedefAlignJob> stack, Vertex v, bool forward, float offsetx, float scaleY, long texturelongname, bool udmf) 
+		{
+			foreach(Linedef ld in v.Linedefs) 
+			{
+				Sidedef side1 = forward ? ld.Front : ld.Back;
+				Sidedef side2 = forward ? ld.Back : ld.Front;
+
+				if((ld.Start == v) && (side1 != null) && !side1.Marked) 
+				{
+					List<Sidedef> controlSides = GetControlSides(side1, udmf); //mxd
+
+					foreach(Sidedef s in controlSides) 
+					{
+						if(!singleselection || Tools.SidedefTextureMatch(s, texturelongname)) 
+						{
+							SidedefAlignJob nj = new SidedefAlignJob();
+							nj.forward = forward;
+							nj.offsetx = offsetx;
+							nj.scaleY = scaleY; //mxd
+							nj.sidedef = side1;
+							nj.controlSide = s; //mxd
+							stack.Push(nj);
+						}
+					}
+				} 
+				else if((ld.End == v) && (side2 != null) && !side2.Marked) 
+				{
+					List<Sidedef> controlSides = GetControlSides(side2, udmf); //mxd
+
+					foreach(Sidedef s in controlSides) 
+					{
+						if(!singleselection || Tools.SidedefTextureMatch(s, texturelongname)) 
+						{
+							SidedefAlignJob nj = new SidedefAlignJob();
+							nj.forward = forward;
+							nj.offsetx = offsetx;
+							nj.scaleY = scaleY; //mxd
+							nj.sidedef = side2;
+							nj.controlSide = s; //mxd
+							stack.Push(nj);
+						}
+					}
+				}
+			}
+		}
+
+		//mxd
+		private static bool SidePartIsSelected(List<BaseVisualGeometrySidedef> selection, Sidedef side, VisualGeometryType geoType) 
+		{
+			foreach(BaseVisualGeometrySidedef vs in selection) 
+				if(vs.GeometryType == geoType && vs.Sidedef.Index == side.Index) return true;
+			return false;
+		}
+
+		//mxd
+		private List<Sidedef> GetControlSides(Sidedef side, bool udmf) 
+		{
+			if(side.Other == null) return new List<Sidedef>() { side };
+			if(side.Other.Sector.Tag == 0) return new List<Sidedef>() { side };
+
+			SectorData data = GetSectorData(side.Other.Sector);
+			if(data.ExtraFloors.Count == 0)	return new List<Sidedef>() { side };
+
+			List<Sidedef> sides = new List<Sidedef>();
+			foreach(Effect3DFloor ef in data.ExtraFloors)
+				sides.Add(ef.Linedef.Front);
+
+			if(udmf)
+				sides.Add(side); //UDMF map format
+			else
+				sides.Insert(0, side); //Doom/Hexen map format: if a sidedef has lower/upper parts, they take predecence in alignment
+
+			return sides;
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/VisualModes/BaseVisualSector.cs b/Source/Plugins/BuilderModes/VisualModes/BaseVisualSector.cs
new file mode 100644
index 0000000..d28640a
--- /dev/null
+++ b/Source/Plugins/BuilderModes/VisualModes/BaseVisualSector.cs
@@ -0,0 +1,411 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.VisualModes;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	internal class BaseVisualSector : VisualSector
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+		
+		private BaseVisualMode mode;
+
+		private VisualFloor floor;
+		private VisualCeiling ceiling;
+		private List<VisualFloor> extrafloors;
+		private List<VisualCeiling> extraceilings;
+		private List<VisualFloor> extrabackfloors; //mxd
+		private List<VisualCeiling> extrabackceilings; //mxd
+		private Dictionary<Sidedef, VisualSidedefParts> sides;
+		
+		// If this is set to true, the sector will be rebuilt after the action is performed.
+		private bool changed;
+		
+		// Prevent recursion
+		private bool isupdating;
+
+		#endregion
+
+		#region ================== Properties
+		
+		public VisualFloor Floor { get { return floor; } }
+		public VisualCeiling Ceiling { get { return ceiling; } }
+		public List<VisualFloor> ExtraFloors { get { return extrafloors; } }
+		public List<VisualCeiling> ExtraCeilings { get { return extraceilings; } }
+		public List<VisualFloor> ExtraBackFloors { get { return extrabackfloors; } } //mxd
+		public List<VisualCeiling> ExtraBackCeilings { get { return extrabackceilings; } } //mxd
+		public Dictionary<Sidedef, VisualSidedefParts> Sides { get { return sides; } } //mxd
+		public bool Changed { get { return changed; } set { changed |= value; } }
+		
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public BaseVisualSector(BaseVisualMode mode, Sector s) : base(s)
+		{
+			this.mode = mode;
+			this.extrafloors = new List<VisualFloor>(2);
+			this.extraceilings = new List<VisualCeiling>(2);
+			this.extrabackfloors = new List<VisualFloor>(2); //mxd
+			this.extrabackceilings = new List<VisualCeiling>(2); //mxd
+			
+			// Initialize
+			Rebuild();
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Disposer
+		public override void Dispose()
+		{
+			// Not already disposed?
+			if(!IsDisposed)
+			{
+				// Clean up
+				sides = null;
+				floor = null;
+				ceiling = null;
+				extrafloors = null;
+				extraceilings = null;
+				
+				// Dispose base
+				base.Dispose();
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+		
+		// This retreives the sector data for this sector
+		public SectorData GetSectorData()
+		{
+			return mode.GetSectorData(this.Sector);
+		}
+		
+		// This updates this virtual the sector and neightbours if needed
+		override public void UpdateSectorGeometry(bool includeneighbours)
+		{
+			if(isupdating) return;
+				
+			isupdating = true;
+			changed = true;
+			
+			// Not sure what from this part we need, so commented out for now
+			SectorData data = GetSectorData();
+			data.Reset();
+			
+			// Update sectors that rely on this sector
+			foreach(KeyValuePair<Sector, bool> s in data.UpdateAlso)
+			{
+				if(mode.VisualSectorExists(s.Key))
+				{
+					BaseVisualSector vs = (BaseVisualSector)mode.GetVisualSector(s.Key);
+					vs.UpdateSectorGeometry(s.Value);
+				}
+			}
+			
+			// Go for all things in this sector
+			foreach(Thing t in General.Map.Map.Things)
+			{
+				if(t.Sector == this.Sector)
+				{
+					if(mode.VisualThingExists(t))
+					{
+						// Update thing
+						BaseVisualThing vt = (mode.GetVisualThing(t) as BaseVisualThing);
+						vt.Changed = true;
+					}
+				}
+			}
+
+			if(includeneighbours)
+			{
+				// Also rebuild surrounding sectors, because outside sidedefs may need to be adjusted
+				foreach(Sidedef sd in this.Sector.Sidedefs)
+				{
+					if(sd.Other != null)
+					{
+						if(mode.VisualSectorExists(sd.Other.Sector))
+						{
+							BaseVisualSector bvs = (BaseVisualSector)mode.GetVisualSector(sd.Other.Sector);
+							bvs.Changed = true;
+						}
+					}
+				}
+			}
+
+			Sector.UpdateFogColor(); //mxd
+			isupdating = false;
+		}
+
+		//mxd. call this to update sector and things in it when Sector.Fields are changed 
+		override public void UpdateSectorData() 
+		{
+			//update sector data
+			SectorData data = GetSectorData();
+			data.UpdateForced();
+
+			//update sector
+			Rebuild();
+
+			//update things in this sector
+			foreach(Thing t in General.Map.Map.Things) 
+			{
+				if(t.Sector == this.Sector) 
+				{
+					if(mode.VisualThingExists(t)) 
+					{
+						// Update thing
+						BaseVisualThing vt = (mode.GetVisualThing(t) as BaseVisualThing);
+						vt.Rebuild();
+					}
+				}
+			}
+		}
+		
+		// This (re)builds the visual sector, calculating all geometry from scratch
+		public void Rebuild()
+		{
+			// Forget old geometry
+			base.ClearGeometry();
+			
+			// Get sector data
+			SectorData data = GetSectorData();
+			if(!data.Updated) data.Update();
+			
+			// Create floor
+			floor = (floor ?? new VisualFloor(mode, this));
+			if(floor.Setup(data.Floor, null)) AddGeometry(floor);
+			
+			// Create ceiling
+			ceiling = (ceiling ?? new VisualCeiling(mode, this));
+			if(ceiling.Setup(data.Ceiling, null)) AddGeometry(ceiling);
+			
+			// Create 3D floors
+			for(int i = 0; i < data.ExtraFloors.Count; i++)
+			{
+				Effect3DFloor ef = data.ExtraFloors[i];
+				bool floorRequired = ef.VavoomType; //mxd
+				bool ceilingRequired = ef.VavoomType; //mxd
+
+				if(ef.VavoomType || !ef.IgnoreBottomHeight) 
+				{
+					//mxd. check if 3d floor is between real floor and ceiling
+					if(!ef.VavoomType) 
+					{
+						if(ef.Ceiling.plane.GetInverted().Normal != floor.Level.plane.Normal
+							|| ef.Ceiling.plane.Normal != ceiling.Level.plane.Normal) 
+						{
+							//mxd. check if at least one vertex of 3d floor is between floor and ceiling
+							floorRequired = Check3dFloorPlane(floor.Vertices, ceiling.Vertices, ef.Ceiling.plane);
+						
+						} 
+						//if floor, ceiling and 3d floor are not sloped, compare offsets
+						else if(-floor.Level.plane.Offset < ef.Ceiling.plane.Offset
+							&& ceiling.Level.plane.Offset > ef.Ceiling.plane.Offset) 
+						{
+							floorRequired = true;
+						}
+					}
+
+					//mxd. Create a floor
+					if(floorRequired) 
+					{
+						VisualFloor vf = (i < extrafloors.Count) ? extrafloors[i] : new VisualFloor(mode, this);
+						if(vf.Setup(ef.Ceiling, ef)) 
+						{
+							base.AddGeometry(vf);
+
+							//mxd. add backside as well
+							if(!ef.VavoomType && ef.RenderInside) 
+							{
+								VisualFloor vfb = (i < extrabackfloors.Count) ? extrabackfloors[i] : new VisualFloor(mode, this);
+								if(vfb.Setup(ef.Ceiling, ef, true)) base.AddGeometry(vfb);
+								if(i >= extrabackfloors.Count) extrabackfloors.Add(vfb);
+							}
+						}
+						if(i >= extrafloors.Count) extrafloors.Add(vf);
+					}
+				}
+
+				//mxd. check if 3d ceiling is between real floor and ceiling
+				if(!ef.VavoomType) 
+				{
+					if(ef.Floor.plane.GetInverted().Normal != ceiling.Level.plane.Normal
+						|| ef.Floor.plane.Normal != floor.Level.plane.Normal) 
+					{
+						//mxd. check if at least one vertex of 3d ceiling is between floor and ceiling
+						ceilingRequired = Check3dFloorPlane(floor.Vertices, ceiling.Vertices, ef.Floor.plane);
+					
+					}
+					//if floor, ceiling and 3d ceiling are not sloped, compare offsets
+					else if(ceiling.Level.plane.Offset > -ef.Floor.plane.Offset
+						&& floor.Level.plane.Offset > ef.Floor.plane.Offset) 
+					{
+						ceilingRequired = true;
+					}
+				}
+
+				//mxd. Create a ceiling
+				if(ceilingRequired) 
+				{
+					VisualCeiling vc = (i < extraceilings.Count) ? extraceilings[i] : new VisualCeiling(mode, this);
+					if(vc.Setup(ef.Floor, ef)) 
+					{
+						base.AddGeometry(vc);
+
+						//mxd. add backside as well
+						if(!ef.VavoomType && (ef.RenderInside || ef.IgnoreBottomHeight)) 
+						{
+							VisualCeiling vcb = (i < extrabackceilings.Count) ? extrabackceilings[i] : new VisualCeiling(mode, this);
+							if(vcb.Setup(ef.Floor, ef, true)) base.AddGeometry(vcb);
+							if(i >= extrabackceilings.Count) extrabackceilings.Add(vcb);
+						}
+					}
+					if(i >= extraceilings.Count) extraceilings.Add(vc);
+				}
+			}
+			
+			// Go for all sidedefs
+			Dictionary<Sidedef, VisualSidedefParts> oldsides = sides ?? new Dictionary<Sidedef, VisualSidedefParts>(1);
+			sides = new Dictionary<Sidedef, VisualSidedefParts>(base.Sector.Sidedefs.Count);
+			foreach(Sidedef sd in base.Sector.Sidedefs)
+			{
+				// VisualSidedef already exists?
+				VisualSidedefParts parts = oldsides.ContainsKey(sd) ? oldsides[sd] : new VisualSidedefParts();
+				
+				// Doublesided or singlesided?
+				if(sd.Other != null && sd.Line.IsFlagSet(General.Map.Config.DoubleSidedFlag))
+				{
+					// Create upper part
+					VisualUpper vu = parts.upper ?? new VisualUpper(mode, this, sd);
+					if(vu.Setup()) base.AddGeometry(vu);
+					
+					// Create lower part
+					VisualLower vl = parts.lower ?? new VisualLower(mode, this, sd);
+					if(vl.Setup()) base.AddGeometry(vl);
+					
+					// Create middle part
+					VisualMiddleDouble vm = parts.middledouble ?? new VisualMiddleDouble(mode, this, sd);
+					if(vm.Setup()) base.AddGeometry(vm);
+
+					//mxd. Create fog boundary
+					VisualFogBoundary vb = parts.fogboundary ?? new VisualFogBoundary(mode, this, sd);
+					if(vb.Setup())
+					{
+						vm.FogFactor = 0; // Avoid double-fogging the middle part
+						base.AddGeometry(vb);
+					}
+					
+					// Create 3D wall parts
+					SectorData osd = mode.GetSectorData(sd.Other.Sector);
+					if(!osd.Updated) osd.Update();
+					List<VisualMiddle3D> middles = parts.middle3d ?? new List<VisualMiddle3D>(osd.ExtraFloors.Count);
+					for(int i = 0; i < osd.ExtraFloors.Count; i++)
+					{
+						Effect3DFloor ef = osd.ExtraFloors[i];
+						if(!ef.VavoomType && ef.IgnoreBottomHeight) continue; //mxd
+
+						VisualMiddle3D vm3 = (i < middles.Count) ? middles[i] : new VisualMiddle3D(mode, this, sd);
+						if(vm3.Setup(ef)) base.AddGeometry(vm3);
+						if(i >= middles.Count) middles.Add(vm3);
+					}
+
+					//mxd. Create backsides
+					List<VisualMiddleBack> middlebacks = new List<VisualMiddleBack>();
+					for(int i = 0; i < data.ExtraFloors.Count; i++) 
+					{
+						Effect3DFloor ef = data.ExtraFloors[i];
+
+						if(!ef.VavoomType && ef.RenderInside && !ef.IgnoreBottomHeight) 
+						{
+							VisualMiddleBack vms = new VisualMiddleBack(mode, this, sd);
+							if(vms.Setup(ef)) base.AddGeometry(vms);
+							middlebacks.Add(vms);
+						}
+					}
+					
+					// Store
+					sides.Add(sd, new VisualSidedefParts(vu, vl, vm, vb, middles, middlebacks));
+				}
+				else
+				{
+					// Create middle part
+					VisualMiddleSingle vm = parts.middlesingle ?? new VisualMiddleSingle(mode, this, sd);
+					if(vm.Setup()) base.AddGeometry(vm);
+					
+					// Store
+					sides.Add(sd, new VisualSidedefParts(vm));
+				}
+			}
+			
+			// Done
+			changed = false;
+		}
+		
+		// This returns the visual sidedef parts for a given sidedef
+		public VisualSidedefParts GetSidedefParts(Sidedef sd)
+		{
+			return (sides.ContainsKey(sd) ? sides[sd] : new VisualSidedefParts());
+		}
+
+		//mxd. Checks if given plane is between given floor and ceiling vertices
+		private static bool Check3dFloorPlane(WorldVertex[] floorverts, WorldVertex[] ceilingverts, Plane plane) 
+		{
+			bool show = false;
+
+			//check floor
+			for(int c = 0; c < floorverts.Length; c++) 
+			{
+				if(plane.GetZ(new Vector2D(floorverts[c].x, floorverts[c].y)) > Math.Round(floorverts[c].z, 3)) 
+				{
+					show = true;
+					break;
+				}
+			}
+
+			if(!show) return false;
+
+			//check ceiling
+			for(int c = 0; c < ceilingverts.Length; c++) 
+			{
+				if(plane.GetZ(new Vector2D(ceilingverts[c].x, ceilingverts[c].y)) < Math.Round(ceilingverts[c].z, 3))
+					return true;
+			}
+
+			return false;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/VisualModes/BaseVisualThing.cs b/Source/Plugins/BuilderModes/VisualModes/BaseVisualThing.cs
new file mode 100644
index 0000000..5402b8a
--- /dev/null
+++ b/Source/Plugins/BuilderModes/VisualModes/BaseVisualThing.cs
@@ -0,0 +1,882 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.VisualModes;
+using CodeImp.DoomBuilder.Data;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	internal class BaseVisualThing : VisualThing, IVisualEventReceiver
+	{
+		#region ================== Constants
+		
+		#endregion
+		
+		#region ================== Variables
+
+		private readonly BaseVisualMode mode;
+		
+		private bool isloaded;
+		private bool nointeraction; //mxd
+		private ImageData sprite;
+		private float cageradius2;
+		private Vector2D pos2d;
+		private Vector3D boxp1;
+		private Vector3D boxp2;
+		private static List<BaseVisualThing> updateList; //mxd
+		
+		// Undo/redo
+		private int undoticket;
+
+		// If this is set to true, the thing will be rebuilt after the action is performed.
+		private bool changed;
+
+		#endregion
+		
+		#region ================== Properties
+
+		public bool Changed { get { return changed; } set { changed |= value; } }
+
+		#endregion
+		
+		#region ================== Constructor / Setup
+		
+		// Constructor
+		public BaseVisualThing(BaseVisualMode mode, Thing t) : base(t)
+		{
+			this.mode = mode;
+
+			// Find thing information
+			info = General.Map.Data.GetThingInfo(Thing.Type);
+
+			//mxd. When true, the thing can be moved below floor/above ceiling
+			nointeraction = (info.Actor != null && info.Actor.GetFlagValue("nointeraction", false));
+
+			// Find sprite texture
+			if(info.Sprite.Length > 0)
+			{
+				sprite = General.Map.Data.GetSpriteImage(info.Sprite);
+				if(sprite != null) sprite.AddReference();
+			}
+
+			//mxd
+			if(mode.UseSelectionFromClassicMode && t.Selected)
+			{
+				this.selected = true;
+				mode.AddSelectedObject(this);
+			}
+
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+		
+		// This builds the thing geometry. Returns false when nothing was created.
+		public bool Setup()
+		{
+			// Find the sector in which the thing resides
+			Thing.DetermineSector(mode.BlockMap);
+			
+			//mxd. If the thing is inside a sector, apply DECORATE/UDMF alpha/renderstyle overrides
+			byte alpha = 255;
+			if(Thing.Sector != null)
+			{
+				string renderstyle = info.RenderStyle;
+				alpha = info.AlphaByte;
+				
+				if(General.Map.UDMF)
+				{
+					if(Thing.IsFlagSet("translucent"))
+					{
+						renderstyle = "translucent";
+						alpha = 64;
+					}
+					else if(Thing.IsFlagSet("invisible"))
+					{
+						renderstyle = "none";
+						alpha = 0;
+					}
+					else if(Thing.Fields.ContainsKey("renderstyle"))
+					{
+						renderstyle = Thing.Fields.GetValue("renderstyle", renderstyle);
+					}
+
+					if((renderstyle == "add" || renderstyle == "translucent" || renderstyle == "subtract" || renderstyle == "stencil") 
+						&& Thing.Fields.ContainsKey("alpha"))
+					{
+						alpha = (byte)(General.Clamp(Thing.Fields.GetValue("alpha", info.Alpha), 0f, 1f) * 255);
+					}
+				}
+				else if(General.Map.HEXEN)
+				{
+					if(Thing.IsFlagSet("2048"))
+					{
+						renderstyle = "translucent";
+						alpha = 64;
+					}
+					else if(Thing.IsFlagSet("4096"))
+					{
+						renderstyle = "none";
+						alpha = 0;
+					}
+				}
+
+				// Set appropriate RenderPass
+				switch(renderstyle)
+				{
+					case "translucent":
+					case "subtract":
+					case "stencil":
+						RenderPass = RenderPass.Alpha;
+						break;
+
+					case "add":
+						RenderPass = RenderPass.Additive;
+						break;
+
+					case "none":
+						RenderPass = RenderPass.Mask;
+						alpha = 0;
+						break;
+
+					// Many render styles are not supported yet...
+					default:
+						RenderPass = RenderPass.Mask;
+						alpha = 255;
+						break;
+				}
+			}
+
+			// Don't bother when alpha is unchanged, unless Additive RenderStyle is used
+			if(RenderPass != RenderPass.Additive && alpha == 255) RenderPass = RenderPass.Mask;
+
+			int sectorcolor = new PixelColor(alpha, 255, 255, 255).ToInt();
+			fogfactor = 0f; //mxd
+			
+			//mxd. Check thing size 
+			float thingradius = Thing.Size; // Thing.Size has ThingRadius arg override applied
+			thingheight = Thing.Height; // Thing.Height has ThingHeight arg override applied
+
+			if(thingradius < 0.1f || thingheight < 0.1f) 
+			{
+				thingradius = FIXED_RADIUS;
+				thingheight = FIXED_RADIUS;
+				sizeless = true;
+			} 
+			else 
+			{
+				sizeless = false;
+			}
+
+			if(sprite != null)
+			{
+				Plane floor = new Plane(); //mxd
+				Plane ceiling = new Plane(); //mxd
+				if(Thing.Sector != null)
+				{
+					SectorData sd = mode.GetSectorData(Thing.Sector);
+					floor = sd.Floor.plane; //mxd
+					ceiling = sd.Ceiling.plane; //mxd
+
+					if(!info.Bright)
+					{
+						Vector3D thingpos = new Vector3D(Thing.Position.x, Thing.Position.y, Thing.Position.z + sd.Floor.plane.GetZ(Thing.Position));
+						SectorLevel level = sd.GetLevelAboveOrAt(thingpos);
+
+						//mxd. Let's use point on floor plane instead of Thing.Sector.FloorHeight;
+						if(nointeraction && level == null && sd.LightLevels.Count > 0) level = sd.LightLevels[sd.LightLevels.Count - 1];
+
+						//mxd. Use the light level of the highest surface when a thing is above highest sector level.
+						if(level != null)
+						{
+							// TECH: In GZDoom, ceiling glow doesn't affect thing brightness 
+							// Use sector brightness for color shading
+							int brightness = level.brightnessbelow;
+
+							// Level is glowing
+							if(level.affectedbyglow && level.type == SectorLevelType.Floor)
+							{
+								// Get glow brightness
+								SectorData glowdata = (level.sector != Thing.Sector ? mode.GetSectorData(level.sector) : sd);
+								float planez = level.plane.GetZ(thingpos);
+
+								int glowbrightness = glowdata.FloorGlow.Brightness / 2;
+								SectorLevel nexthigher = sd.GetLevelAbove(new Vector3D(thingpos, planez));
+
+								// Interpolate thing brightness between glow and regular ones
+								if(nexthigher != null)
+								{
+									float higherz = nexthigher.plane.GetZ(thingpos);
+									float delta = General.Clamp(1.0f - (thingpos.z - planez) / (higherz - planez), 0f, 1f);
+									brightness = (int)((glowbrightness + level.sector.Brightness / 2) * delta + nexthigher.sector.Brightness * (1.0f - delta));
+								}
+							}
+							// Level below this one is glowing. Only possible for floor glow(?)
+							else if(level.type == SectorLevelType.Glow)
+							{
+								// Interpolate thing brightness between glow and regular ones
+								if(sd.Floor != null && sd.FloorGlow != null)
+								{
+									// Get glow brightness
+									float glowz = level.plane.GetZ(thingpos);
+									float floorz = floor.GetZ(thingpos);
+									float delta = General.Clamp((thingpos.z - floorz) / (glowz - floorz), 0f, 1f);
+
+									brightness = (int)((sd.FloorGlow.Brightness / 2 + sd.Floor.sector.Brightness / 2) * (1.0f - delta) + sd.Floor.sector.Brightness * delta);
+								}
+							}
+
+							PixelColor areabrightness = PixelColor.FromInt(mode.CalculateBrightness(brightness));
+							PixelColor areacolor = PixelColor.Modulate(level.colorbelow, areabrightness);
+							sectorcolor = areacolor.WithAlpha(alpha).ToInt();
+
+							//mxd. Calculate fogfactor
+							float density;
+							if(Thing.Sector.UsesOutsideFog && General.Map.Data.MapInfo.OutsideFogDensity > 0)
+							{
+								density = General.Map.Data.MapInfo.OutsideFogDensity;
+							}
+							else if(!Thing.Sector.UsesOutsideFog && General.Map.Data.MapInfo.FogDensity > 0)
+							{
+								density = General.Map.Data.MapInfo.FogDensity;
+							}
+							else if(brightness < 248)
+							{
+								density = General.Clamp(255 - brightness, 30, 255);
+							}
+							else
+							{
+								density = 0f;
+							}
+
+							if(level.sector.HasFogColor)
+							{
+								density *= 4;
+							}
+
+							fogfactor = density * VisualGeometry.FOG_DENSITY_SCALER;
+						}
+					}
+					//TECH: even Bright Thing frames are affected by custom fade...
+					else
+					{
+						Vector3D thingpos = new Vector3D(Thing.Position.x, Thing.Position.y, Thing.Position.z + sd.Floor.plane.GetZ(Thing.Position));
+						SectorLevel level = sd.GetLevelAboveOrAt(thingpos);
+
+						if(level != null && level.sector.HasFogColor)
+						{
+							//mxd. Calculate fogfactor
+							float density;
+							if(Thing.Sector.UsesOutsideFog && General.Map.Data.MapInfo.OutsideFogDensity > 0)
+							{
+								density = General.Map.Data.MapInfo.OutsideFogDensity;
+							}
+							else if(!Thing.Sector.UsesOutsideFog && General.Map.Data.MapInfo.FogDensity > 0)
+							{
+								density = General.Map.Data.MapInfo.FogDensity;
+							}
+							else if(level.brightnessbelow < 248)
+							{
+								density = General.Clamp(255 - level.brightnessbelow, 30, 255);
+							}
+							else
+							{
+								density = 0f;
+							}
+
+							fogfactor = density * VisualGeometry.FOG_DENSITY_SCALER * 4;
+						}
+					}
+				}
+				
+				// Check if the texture is loaded
+				sprite.LoadImage();
+				isloaded = sprite.IsImageLoaded;
+				if(isloaded)
+				{
+					float offsetx = 0.0f;
+					float offsety = 0.0f;
+					
+					base.Texture = sprite;
+
+					// Determine sprite size and offset
+					float radius = sprite.ScaledWidth * 0.5f;
+					float height = sprite.ScaledHeight;
+					if(sprite is SpriteImage)
+					{
+						offsetx = radius - (sprite as SpriteImage).OffsetX;
+						offsety = (sprite as SpriteImage).OffsetY - height;
+					}
+
+					// Scale by thing type/actor scale
+					// We do this after the offset x/y determination above, because that is entirely in sprite pixels space
+					radius *= info.SpriteScale.Width;
+					height *= info.SpriteScale.Height;
+					offsetx *= info.SpriteScale.Width;
+					offsety *= info.SpriteScale.Height;
+
+					// Make vertices
+					WorldVertex[] verts = new WorldVertex[6];
+
+					if(sizeless) //mxd
+					{ 
+						float hh = height / 2;
+						verts[0] = new WorldVertex(-radius + offsetx, 0.0f, offsety - hh, sectorcolor, 0.0f, 1.0f);
+						verts[1] = new WorldVertex(-radius + offsetx, 0.0f, hh + offsety, sectorcolor, 0.0f, 0.0f);
+						verts[2] = new WorldVertex(+radius + offsetx, 0.0f, hh + offsety, sectorcolor, 1.0f, 0.0f);
+						verts[3] = verts[0];
+						verts[4] = verts[2];
+						verts[5] = new WorldVertex(+radius + offsetx, 0.0f, offsety - hh, sectorcolor, 1.0f, 1.0f);
+					} 
+					else 
+					{
+						verts[0] = new WorldVertex(-radius + offsetx, 0.0f, offsety, sectorcolor, 0.0f, 1.0f);
+						verts[1] = new WorldVertex(-radius + offsetx, 0.0f, height + offsety, sectorcolor, 0.0f, 0.0f);
+						verts[2] = new WorldVertex(+radius + offsetx, 0.0f, height + offsety, sectorcolor, 1.0f, 0.0f);
+						verts[3] = verts[0];
+						verts[4] = verts[2];
+						verts[5] = new WorldVertex(+radius + offsetx, 0.0f, offsety, sectorcolor, 1.0f, 1.0f);
+					}
+					SetVertices(verts, floor, ceiling);
+				}
+				else
+				{
+					base.Texture = General.Map.Data.Hourglass3D;
+
+					// Determine sprite size
+					float radius = Math.Min(thingradius, thingheight / 2f);
+					float height = Math.Min(thingradius * 2f, thingheight);
+
+					// Make vertices
+					WorldVertex[] verts = new WorldVertex[6];
+					verts[0] = new WorldVertex(-radius, 0.0f, 0.0f, sectorcolor, 0.0f, 1.0f);
+					verts[1] = new WorldVertex(-radius, 0.0f, height, sectorcolor, 0.0f, 0.0f);
+					verts[2] = new WorldVertex(+radius, 0.0f, height, sectorcolor, 1.0f, 0.0f);
+					verts[3] = verts[0];
+					verts[4] = verts[2];
+					verts[5] = new WorldVertex(+radius, 0.0f, 0.0f, sectorcolor, 1.0f, 1.0f);
+					SetVertices(verts, floor, ceiling);
+				}
+			}
+			
+			// Determine position
+			Vector3D pos = Thing.Position;
+			if(Thing.Type == 9501)
+			{
+				if(Thing.Sector != null) //mxd
+				{ 
+					// This is a special thing that needs special positioning
+					SectorData sd = mode.GetSectorData(Thing.Sector);
+					pos.z = sd.Ceiling.sector.CeilHeight + Thing.Position.z;
+				}
+			}
+			else if(Thing.Type == 9500)
+			{
+				if(Thing.Sector != null) //mxd
+				{ 
+					// This is a special thing that needs special positioning
+					SectorData sd = mode.GetSectorData(Thing.Sector);
+					pos.z = sd.Floor.sector.FloorHeight + Thing.Position.z;
+				}
+			}
+			else if(info.AbsoluteZ)
+			{
+				// Absolute Z position
+				pos.z = Thing.Position.z;
+			}
+			else if(info.Hangs)
+			{
+				// Hang from ceiling
+				if(Thing.Sector != null)
+				{
+					SectorData sd = mode.GetSectorData(Thing.Sector);
+					float maxz = sd.Ceiling.plane.GetZ(Thing.Position) - info.Height;
+					pos.z = maxz;
+
+					if(Thing.Position.z > 0 || nointeraction) pos.z -= Thing.Position.z;
+
+					// Check if below floor
+					if(!nointeraction)
+					{
+						float minz = sd.Floor.plane.GetZ(Thing.Position);
+						if(pos.z < minz) pos.z = Math.Min(minz, maxz);
+					}
+				}
+			}
+			else
+			{
+				// Stand on floor
+				if(Thing.Sector != null)
+				{
+					SectorData sd = mode.GetSectorData(Thing.Sector);
+					float minz = sd.Floor.plane.GetZ(Thing.Position);
+					pos.z = minz;
+
+					if(Thing.Position.z > 0 || nointeraction) pos.z += Thing.Position.z;
+
+					// Check if above ceiling
+					if(!nointeraction)
+					{
+						float maxz = sd.Ceiling.plane.GetZ(Thing.Position) - info.Height;
+						if(pos.z > maxz) pos.z = Math.Max(minz, maxz);
+					}
+				}
+			}
+			
+			// Apply settings
+			SetPosition(pos);
+			SetCageColor(Thing.Color);
+
+			// Keep info for object picking
+			cageradius2 = thingradius * Angle2D.SQRT2;
+			cageradius2 = cageradius2 * cageradius2;
+			pos2d = pos;
+
+			if(sizeless) //mxd
+			{ 
+				boxp1 = new Vector3D(pos.x - thingradius, pos.y - thingradius, pos.z - thingradius/2);
+				boxp2 = new Vector3D(pos.x + thingradius, pos.y + thingradius, pos.z + thingradius/2);
+			} 
+			else 
+			{
+				boxp1 = new Vector3D(pos.x - thingradius, pos.y - thingradius, pos.z);
+				boxp2 = new Vector3D(pos.x + thingradius, pos.y + thingradius, pos.z + thingheight);
+			}
+			
+			// Done
+			changed = false;
+			return true;
+		}
+		
+		// Disposing
+		public override void Dispose()
+		{
+			if(!IsDisposed)
+			{
+				if(sprite != null)
+				{
+					sprite.RemoveReference();
+					sprite = null;
+				}
+
+				base.Dispose();
+			}
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+		
+		// This forces to rebuild the whole thing
+		public void Rebuild()
+		{
+			// Find thing information
+			info = General.Map.Data.GetThingInfo(Thing.Type);
+
+			//mxd. When true, the thing can be moved below floor/above ceiling
+			nointeraction = (info.Actor != null && info.Actor.GetFlagValue("nointeraction", false));
+
+			// Find sprite texture
+			if(info.Sprite.Length > 0)
+			{
+				sprite = General.Map.Data.GetSpriteImage(info.Sprite);
+				if(sprite != null) sprite.AddReference();
+			}
+			
+			// Setup visual thing
+			Setup();
+		}
+		
+		// This updates the thing when needed
+		public override void Update()
+		{
+			if(!isloaded)
+			{
+				// Rebuild sprite geometry when sprite is loaded
+				if(sprite.IsImageLoaded)
+				{
+					Setup();
+				}
+			}
+			
+			// Let the base update
+			base.Update();
+		}
+
+		// This performs a fast test in object picking
+		public override bool PickFastReject(Vector3D from, Vector3D to, Vector3D dir)
+		{
+			float distance2 = Line2D.GetDistanceToLineSq(from, to, pos2d, false);
+			return (distance2 <= cageradius2);
+		}
+
+		// This performs an accurate test for object picking
+		public override bool PickAccurate(Vector3D from, Vector3D to, Vector3D dir, ref float u_ray)
+		{
+			Vector3D delta = to - from;
+			float tfar = float.MaxValue;
+			float tnear = float.MinValue;
+			
+			// Ray-Box intersection code
+			// See http://www.masm32.com/board/index.php?topic=9941.0
+			
+			// Check X slab
+			if(delta.x == 0.0f)
+			{
+				if(from.x > boxp2.x || from.x < boxp1.x)
+				{
+					// Ray is parallel to the planes & outside slab
+					return false;
+				}
+			}
+			else
+			{
+				float tmp = 1.0f / delta.x;
+				float t1 = (boxp1.x - from.x) * tmp;
+				float t2 = (boxp2.x - from.x) * tmp;
+				if(t1 > t2) General.Swap(ref t1, ref t2);
+				if(t1 > tnear) tnear = t1;
+				if(t2 < tfar) tfar = t2;
+				if(tnear > tfar || tfar < 0.0f)
+				{
+					// Ray missed box or box is behind ray
+					return false;
+				}
+			}
+			
+			// Check Y slab
+			if(delta.y == 0.0f)
+			{
+				if(from.y > boxp2.y || from.y < boxp1.y)
+				{
+					// Ray is parallel to the planes & outside slab
+					return false;
+				}
+			}
+			else
+			{
+				float tmp = 1.0f / delta.y;
+				float t1 = (boxp1.y - from.y) * tmp;
+				float t2 = (boxp2.y - from.y) * tmp;
+				if(t1 > t2) General.Swap(ref t1, ref t2);
+				if(t1 > tnear) tnear = t1;
+				if(t2 < tfar) tfar = t2;
+				if(tnear > tfar || tfar < 0.0f)
+				{
+					// Ray missed box or box is behind ray
+					return false;
+				}
+			}
+			
+			// Check Z slab
+			if(delta.z == 0.0f)
+			{
+				if(from.z > boxp2.z || from.z < boxp1.z)
+				{
+					// Ray is parallel to the planes & outside slab
+					return false;
+				}
+			}
+			else
+			{
+				float tmp = 1.0f / delta.z;
+				float t1 = (boxp1.z - from.z) * tmp;
+				float t2 = (boxp2.z - from.z) * tmp;
+				if(t1 > t2) General.Swap(ref t1, ref t2);
+				if(t1 > tnear) tnear = t1;
+				if(t2 < tfar) tfar = t2;
+				if(tnear > tfar || tfar < 0.0f)
+				{
+					// Ray missed box or box is behind ray
+					return false;
+				}
+			}
+			
+			// Set interpolation point
+			u_ray = (tnear > 0.0f) ? tnear : tfar;
+			return true;
+		}
+
+		//mxd
+		public bool IsSelected() 
+		{
+			return selected;
+		}
+		
+		#endregion
+
+		#region ================== Events
+
+		// Unused
+		public void OnSelectBegin() { }
+		public void OnEditBegin() { }
+		public void OnMouseMove(MouseEventArgs e) { }
+		public void OnChangeTargetBrightness(bool up) { }
+		public void OnChangeTextureOffset(int horizontal, int vertical, bool doSurfaceAngleCorrection) { }
+		public void OnSelectTexture() { }
+		public void OnCopyTexture() { }
+		public void OnPasteTexture() { }
+		public void OnCopyTextureOffsets() { }
+		public void OnPasteTextureOffsets() { }
+		public void OnTextureAlign(bool alignx, bool aligny) { }
+		public void OnToggleUpperUnpegged() { }
+		public void OnToggleLowerUnpegged() { }
+		public void OnProcess(float deltatime) { }
+		public void OnTextureFloodfill() { }
+		public void OnInsert() { }
+		public void OnTextureFit(FitTextureOptions options) { } //mxd
+		public void ApplyTexture(string texture) { }
+		public void ApplyUpperUnpegged(bool set) { }
+		public void ApplyLowerUnpegged(bool set) { }
+		public void SelectNeighbours(bool select, bool withSameTexture, bool withSameHeight) { } //mxd
+		
+		// Return texture name
+		public string GetTextureName() { return ""; }
+
+		// Select or deselect
+		public void OnSelectEnd()
+		{
+			if(this.selected)
+			{
+				this.selected = false;
+				mode.RemoveSelectedObject(this);
+			}
+			else
+			{
+				this.selected = true;
+				mode.AddSelectedObject(this);
+			}
+		}
+
+		//mxd. Delete thing
+		public void OnDelete() 
+		{
+			mode.CreateUndo("Delete thing");
+			mode.SetActionResult("Deleted a thing.");
+
+			this.Thing.Fields.BeforeFieldsChange();
+			this.Thing.Dispose();
+			this.Dispose();
+
+			General.Map.IsChanged = true;
+			General.Map.ThingsFilter.Update();
+		}
+		
+		// Copy properties
+		public void OnCopyProperties()
+		{
+			BuilderPlug.Me.CopiedThingProps = new ThingProperties(Thing);
+			mode.SetActionResult("Copied thing properties.");
+		}
+		
+		// Paste properties
+		public void OnPasteProperties(bool usecopysettings)
+		{
+			if(BuilderPlug.Me.CopiedThingProps != null)
+			{
+				mode.CreateUndo("Paste thing properties");
+				mode.SetActionResult("Pasted thing properties.");
+				BuilderPlug.Me.CopiedThingProps.Apply(Thing, usecopysettings); //mxd. Added "usecopysettings"
+				Thing.UpdateConfiguration();
+				this.Rebuild();
+				mode.ShowTargetInfo();
+			}
+		}
+		
+		// Edit button released
+		public void OnEditEnd()
+		{
+			if(General.Interface.IsActiveWindow)
+			{
+				
+				List<Thing> things = mode.GetSelectedThings();
+				//mxd
+				updateList = new List<BaseVisualThing>();
+				foreach(Thing t in things)
+				{
+					VisualThing vt = mode.GetVisualThing(t);
+					if(vt != null) updateList.Add(vt as BaseVisualThing);
+				}
+
+				General.Interface.OnEditFormValuesChanged += Interface_OnEditFormValuesChanged;
+				mode.StartRealtimeInterfaceUpdate(SelectionType.Things);
+				General.Interface.ShowEditThings(things);
+				mode.StopRealtimeInterfaceUpdate(SelectionType.Things);
+				General.Interface.OnEditFormValuesChanged -= Interface_OnEditFormValuesChanged;
+
+				updateList.Clear();
+				updateList = null;
+			}
+		}
+
+		//mxd
+		private void Interface_OnEditFormValuesChanged(object sender, EventArgs e) 
+		{
+			foreach(BaseVisualThing vt in updateList) vt.Changed = true;
+		}
+
+		//mxd
+		public void OnResetTextureOffset() 
+		{
+			mode.CreateUndo("Reset thing scale");
+			mode.SetActionResult("Thing scale reset.");
+
+			Thing.SetScale(1.0f, 1.0f);
+
+			// Update what must be updated
+			this.Changed = true;
+		}
+
+		//mxd
+		public void OnResetLocalTextureOffset() 
+		{
+			mode.CreateUndo("Reset thing scale, pitch and roll");
+			mode.SetActionResult("Thing scale, pitch and roll reset.");
+
+			Thing.SetScale(1.0f, 1.0f);
+			Thing.SetPitch(0);
+			Thing.SetRoll(0);
+
+			// Update what must be updated
+			this.Changed = true;
+		}
+		
+		// Raise/lower thing
+		public void OnChangeTargetHeight(int amount)
+		{
+			if(General.Map.FormatInterface.HasThingHeight)
+			{
+				if((General.Map.UndoRedo.NextUndo == null) || (General.Map.UndoRedo.NextUndo.TicketID != undoticket))
+					undoticket = mode.CreateUndo("Change thing height");
+
+				Thing.Move(Thing.Position + new Vector3D(0.0f, 0.0f, (info.Hangs ? -amount : amount)));
+
+				mode.SetActionResult("Changed thing height to " + Thing.Position.z + ".");
+				
+				// Update what must be updated
+				ThingData td = mode.GetThingData(this.Thing);
+				foreach(KeyValuePair<Sector, bool> s in td.UpdateAlso)
+				{
+					if(mode.VisualSectorExists(s.Key))
+					{
+						BaseVisualSector vs = (BaseVisualSector)mode.GetVisualSector(s.Key);
+						vs.UpdateSectorGeometry(s.Value);
+					}
+				}
+				
+				this.Changed = true;
+			}
+		}
+
+		//mxd
+		public void OnChangeScale(int incrementX, int incrementY)
+		{
+			if(!General.Map.UDMF || !sprite.IsImageLoaded) return;
+			
+			if((General.Map.UndoRedo.NextUndo == null) || (General.Map.UndoRedo.NextUndo.TicketID != undoticket))
+				undoticket = mode.CreateUndo("Change thing scale");
+
+			float scaleX = Thing.ScaleX;
+			float scaleY = Thing.ScaleY;
+
+			if(incrementX != 0) 
+			{
+				float pix = (int)Math.Round(sprite.Width * scaleX) + incrementX;
+				float newscaleX = (float)Math.Round(pix / sprite.Width, 3);
+				scaleX = (newscaleX == 0 ? scaleX * -1 : newscaleX);
+			}
+
+			if(incrementY != 0) 
+			{
+				float pix = (int)Math.Round(sprite.Height * scaleY) + incrementY;
+				float newscaleY = (float)Math.Round(pix / sprite.Height, 3);
+				scaleY = (newscaleY == 0 ? scaleY * -1 : newscaleY);
+			}
+
+			Thing.SetScale(scaleX, scaleY);
+			mode.SetActionResult("Changed thing scale to " + scaleX.ToString("F03", CultureInfo.InvariantCulture) + ", " + scaleY.ToString("F03", CultureInfo.InvariantCulture) + " (" + (int)Math.Round(sprite.Width * scaleX) + " x " + (int)Math.Round(sprite.Height * scaleY) + ").");
+
+			// Update what must be updated
+			this.Changed = true;
+		}
+
+		//mxd
+		public void OnMove(Vector3D newposition) 
+		{
+			if((General.Map.UndoRedo.NextUndo == null) || (General.Map.UndoRedo.NextUndo.TicketID != undoticket))
+				undoticket = mode.CreateUndo("Move thing");
+			Thing.Move(newposition);
+			mode.SetActionResult("Changed thing position to " + Thing.Position + ".");
+
+			// Update what must be updated
+			ThingData td = mode.GetThingData(this.Thing);
+			foreach(KeyValuePair<Sector, bool> s in td.UpdateAlso) 
+			{
+				if(mode.VisualSectorExists(s.Key)) 
+				{
+					BaseVisualSector vs = (BaseVisualSector)mode.GetVisualSector(s.Key);
+					vs.UpdateSectorGeometry(s.Value);
+				}
+			}
+
+			this.Changed = true;
+		}
+
+		//mxd
+		public void SetAngle(int newangle)
+		{
+			if((General.Map.UndoRedo.NextUndo == null) || (General.Map.UndoRedo.NextUndo.TicketID != undoticket))
+				undoticket = mode.CreateUndo("Change thing angle");
+			Thing.Rotate(newangle);
+			mode.SetActionResult("Changed thing angle to " + Thing.AngleDoom + ".");
+			this.Changed = true;
+		}
+
+		//mxd
+		public void SetPitch(int newpitch)
+		{
+			if(!General.Map.UDMF) return;
+			if((General.Map.UndoRedo.NextUndo == null) || (General.Map.UndoRedo.NextUndo.TicketID != undoticket))
+				undoticket = mode.CreateUndo("Change thing pitch");
+			Thing.SetPitch(newpitch);
+			mode.SetActionResult("Changed thing pitch to " + Thing.Pitch + ".");
+			this.Changed = true;
+		}
+
+		//mxd
+		public void SetRoll(int newroll)
+		{
+			if(!General.Map.UDMF) return;
+			if((General.Map.UndoRedo.NextUndo == null) || (General.Map.UndoRedo.NextUndo.TicketID != undoticket))
+				undoticket = mode.CreateUndo("Change thing roll");
+			Thing.SetRoll(newroll);
+			mode.SetActionResult("Changed thing roll to " + Thing.Roll + ".");
+			this.Changed = true;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/VisualModes/BaseVisualVertex.cs b/Source/Plugins/BuilderModes/VisualModes/BaseVisualVertex.cs
new file mode 100644
index 0000000..19cefac
--- /dev/null
+++ b/Source/Plugins/BuilderModes/VisualModes/BaseVisualVertex.cs
@@ -0,0 +1,402 @@
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.VisualModes;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	internal class BaseVisualVertex : VisualVertex, IVisualEventReceiver
+	{
+		#region ================== Variables
+
+		private readonly BaseVisualMode mode;
+		private readonly float cageradius2;
+		private Vector3D boxp1;
+		private Vector3D boxp2;
+
+		// Undo/redo
+		private int undoticket;
+
+		//updating
+		private static Dictionary<BaseVisualSector, bool> updateList;
+
+		#endregion
+
+		// Constructor
+		public BaseVisualVertex(BaseVisualMode mode, Vertex v, bool ceilingVertex)
+			: base(v, ceilingVertex) 
+		{
+
+			this.mode = mode;
+			cageradius2 = DEFAULT_SIZE * General.Settings.GZVertexScale3D * Angle2D.SQRT2;
+			cageradius2 = cageradius2 * cageradius2;
+
+			// Synchronize selection?
+			if(mode.UseSelectionFromClassicMode && v.Selected
+				&& (General.Map.ViewMode == ViewMode.Normal ||
+				 (!ceilingVertex && General.Map.ViewMode == ViewMode.FloorTextures) 
+				 || (ceilingVertex && General.Map.ViewMode == ViewMode.CeilingTextures)))
+			{
+				this.selected = true;
+				mode.AddSelectedObject(this);
+			}
+
+			changed = true;
+			Update();
+		}
+
+		//this updates the handle itself
+		public override void Update() 
+		{
+			if(!changed) return;
+			float z = ceilingVertex ? vertex.ZCeiling : vertex.ZFloor;
+
+			if(!float.IsNaN(z)) 
+			{
+				haveOffset = true;
+			} 
+			else 
+			{
+				z = GetSectorHeight();
+				haveOffset = false;
+			}
+
+			Vector3D pos = new Vector3D(vertex.Position.x, vertex.Position.y, z);
+			SetPosition(pos);
+
+			float radius = DEFAULT_SIZE * General.Settings.GZVertexScale3D;
+			boxp1 = new Vector3D(pos.x - radius, pos.y - radius, (ceilingVertex ? pos.z - radius : pos.z));
+			boxp2 = new Vector3D(pos.x + radius, pos.y + radius, (ceilingVertex ? pos.z : pos.z + radius));
+
+			changed = false;
+		}
+
+		private void UpdateGeometry(Vertex v) 
+		{
+			VertexData vd = mode.GetVertexData(v);
+			foreach(KeyValuePair<Sector, bool> s in vd.UpdateAlso) 
+			{
+				if(mode.VisualSectorExists(s.Key)) 
+				{
+					BaseVisualSector vs = (BaseVisualSector)mode.GetVisualSector(s.Key);
+					vs.UpdateSectorGeometry(s.Value);
+				}
+			}
+		}
+
+		//get the most appropriate height from sectors
+		private int GetSectorHeight() 
+		{
+			int height;
+
+			VertexData vd = mode.GetVertexData(vertex);
+			Sector[] sectors = new Sector[vd.UpdateAlso.Keys.Count];
+			vd.UpdateAlso.Keys.CopyTo(sectors, 0);
+
+			if(ceilingVertex) 
+			{
+				height = sectors[0].CeilHeight;
+				for(int i = 1; i < sectors.Length; i++) 
+				{
+					if(sectors[i].CeilHeight < height)
+						height = sectors[i].CeilHeight;
+				}
+			} 
+			else 
+			{
+				height = sectors[0].FloorHeight;
+				for(int i = 1; i < sectors.Length; i++) 
+				{
+					if(sectors[i].FloorHeight > height)
+						height = sectors[i].FloorHeight;
+				}
+			}
+
+			return height;
+		}
+
+		//mxd
+		public bool IsSelected() 
+		{
+			return selected;
+		}
+
+		#region ================== Object picking
+
+		// This performs a fast test in object picking
+		public override bool PickFastReject(Vector3D from, Vector3D to, Vector3D dir) 
+		{
+			float distance2 = Line2D.GetDistanceToLineSq(from, to, vertex.Position, false);
+			return (distance2 <= cageradius2);
+		}
+
+		// This performs an accurate test for object picking
+		public override bool PickAccurate(Vector3D from, Vector3D to, Vector3D dir, ref float u_ray) 
+		{
+			Vector3D delta = to - from;
+			float tfar = float.MaxValue;
+			float tnear = float.MinValue;
+
+			// Ray-Box intersection code
+			// See http://www.masm32.com/board/index.php?topic=9941.0
+
+			// Check X slab
+			if(delta.x == 0.0f) 
+			{
+				if(from.x > boxp2.x || from.x < boxp1.x) 
+				{
+					// Ray is parallel to the planes & outside slab
+					return false;
+				}
+			}
+			else 
+			{
+				float tmp = 1.0f / delta.x;
+				float t1 = (boxp1.x - from.x) * tmp;
+				float t2 = (boxp2.x - from.x) * tmp;
+				if(t1 > t2)
+					General.Swap(ref t1, ref t2);
+				if(t1 > tnear)
+					tnear = t1;
+				if(t2 < tfar)
+					tfar = t2;
+				if(tnear > tfar || tfar < 0.0f) 
+				{
+					// Ray missed box or box is behind ray
+					return false;
+				}
+			}
+
+			// Check Y slab
+			if(delta.y == 0.0f) 
+			{
+				if(from.y > boxp2.y || from.y < boxp1.y) 
+				{
+					// Ray is parallel to the planes & outside slab
+					return false;
+				}
+			} 
+			else 
+			{
+				float tmp = 1.0f / delta.y;
+				float t1 = (boxp1.y - from.y) * tmp;
+				float t2 = (boxp2.y - from.y) * tmp;
+				if(t1 > t2)
+					General.Swap(ref t1, ref t2);
+				if(t1 > tnear)
+					tnear = t1;
+				if(t2 < tfar)
+					tfar = t2;
+				if(tnear > tfar || tfar < 0.0f) 
+				{
+					// Ray missed box or box is behind ray
+					return false;
+				}
+			}
+
+			// Check Z slab
+			if(delta.z == 0.0f) 
+			{
+				if(from.z > boxp2.z || from.z < boxp1.z) 
+				{
+					// Ray is parallel to the planes & outside slab
+					return false;
+				}
+			} 
+			else 
+			{
+				float tmp = 1.0f / delta.z;
+				float t1 = (boxp1.z - from.z) * tmp;
+				float t2 = (boxp2.z - from.z) * tmp;
+				if(t1 > t2)
+					General.Swap(ref t1, ref t2);
+				if(t1 > tnear)
+					tnear = t1;
+				if(t2 < tfar)
+					tfar = t2;
+				if(tnear > tfar || tfar < 0.0f) 
+				{
+					// Ray missed box or box is behind ray
+					return false;
+				}
+			}
+
+			// Set interpolation point
+			u_ray = (tnear > 0.0f) ? tnear : tfar;
+			return true;
+		}
+
+		#endregion
+
+		#region ================== Unused events
+
+		// Unused
+		public void OnSelectBegin() { }
+		public void OnEditBegin() { }
+		public void OnMouseMove(MouseEventArgs e) { }
+		public void OnChangeTargetBrightness(bool up) { }
+		public void OnChangeTextureOffset(int horizontal, int vertical, bool doSurfaceAngleCorrection) { }
+		public void OnChangeScale(int incrementX, int incrementY) { }
+		public void OnSelectTexture() { }
+		public void OnCopyTexture() { }
+		public void OnPasteTexture() { }
+		public void OnCopyTextureOffsets() { }
+		public void OnPasteTextureOffsets() { }
+		public void OnTextureAlign(bool alignx, bool aligny) { }
+		public void OnTextureFit(FitTextureOptions options) { } //mxd
+		public void OnToggleUpperUnpegged() { }
+		public void OnToggleLowerUnpegged() { }
+		public void OnResetTextureOffset() { }
+		public void OnResetLocalTextureOffset() { } //mxd
+		public void OnProcess(float deltatime) { }
+		public void OnTextureFloodfill() { }
+		public void OnInsert() { }
+		public void ApplyTexture(string texture) { }
+		public void ApplyUpperUnpegged(bool set) { }
+		public void ApplyLowerUnpegged(bool set) { }
+		public string GetTextureName() { return ""; }
+		public void SelectNeighbours(bool select, bool withSameTexture, bool withSameHeight) { } //mxd
+
+		#endregion
+
+		#region ================== Events
+
+		// Select or deselect
+		public void OnSelectEnd() 
+		{
+			if(this.selected) 
+			{
+				this.selected = false;
+				mode.RemoveSelectedObject(this);
+			} 
+			else 
+			{
+				this.selected = true;
+				mode.AddSelectedObject(this);
+			}
+		}
+
+		// Copy properties
+		public void OnCopyProperties() 
+		{
+			BuilderPlug.Me.CopiedVertexProps = new VertexProperties(vertex);
+			mode.SetActionResult("Copied vertex properties.");
+		}
+
+		// Paste properties
+		public void OnPasteProperties(bool usecopysettings)
+		{
+			if(BuilderPlug.Me.CopiedVertexProps != null) 
+			{
+				mode.CreateUndo("Paste vertex properties");
+				mode.SetActionResult("Pasted vertex properties.");
+				BuilderPlug.Me.CopiedVertexProps.Apply(vertex, usecopysettings);
+				
+				//update affected sectors
+				UpdateGeometry(vertex);
+				changed = true;
+				mode.ShowTargetInfo();
+			}
+		}
+
+		//Delete key pressed - remove zoffset field
+		public void OnDelete() 
+		{
+			mode.CreateUndo("Clear vertex height offset");
+			mode.SetActionResult("Cleared vertex height offset.");
+			
+			if(ceilingVertex) 
+			{
+				if(float.IsNaN(vertex.ZCeiling)) return;
+				vertex.ZCeiling = float.NaN;
+
+				//update affected sectors
+				UpdateGeometry(vertex);
+				changed = true;
+				mode.ShowTargetInfo();
+			} 
+			else 
+			{
+				if(float.IsNaN(vertex.ZFloor)) return;
+				vertex.ZFloor = float.NaN;
+
+				//update affected sectors
+				UpdateGeometry(vertex);
+				changed = true;
+				mode.ShowTargetInfo();
+			}
+		}
+
+		// Edit button released
+		public void OnEditEnd() 
+		{
+			if(General.Interface.IsActiveWindow) 
+			{
+				List<Vertex> verts = mode.GetSelectedVertices();
+				updateList = new Dictionary<BaseVisualSector, bool>();
+
+				foreach(Vertex v in verts)
+				{
+					VertexData vd = mode.GetVertexData(v);
+					foreach(KeyValuePair<Sector, bool> s in vd.UpdateAlso) 
+					{
+						if(mode.VisualSectorExists(s.Key)) 
+						{
+							BaseVisualSector vs = (BaseVisualSector)mode.GetVisualSector(s.Key);
+							if(!updateList.ContainsKey(vs)) updateList.Add(vs, s.Value);
+						}
+					}
+				}
+
+				General.Interface.OnEditFormValuesChanged += Interface_OnEditFormValuesChanged;
+				mode.StartRealtimeInterfaceUpdate(SelectionType.Vertices);
+				General.Interface.ShowEditVertices(verts, false);
+				mode.StopRealtimeInterfaceUpdate(SelectionType.Vertices);
+				General.Interface.OnEditFormValuesChanged -= Interface_OnEditFormValuesChanged;
+
+				updateList.Clear();
+				updateList = null;
+			}
+		}
+
+		//mxd
+		private void Interface_OnEditFormValuesChanged(object sender, System.EventArgs e) 
+		{
+			foreach(KeyValuePair<BaseVisualSector, bool> group in updateList) 
+				group.Key.UpdateSectorGeometry(group.Value);
+
+			changed = true;
+			Update();
+		}
+
+		// Raise/lower thing
+		public void OnChangeTargetHeight(int amount) 
+		{
+			if((General.Map.UndoRedo.NextUndo == null) || (General.Map.UndoRedo.NextUndo.TicketID != undoticket))
+				undoticket = mode.CreateUndo("Change vertex height");
+
+			if(ceilingVertex) 
+			{
+				vertex.ZCeiling = (float.IsNaN(vertex.ZCeiling) ? GetSectorHeight() + amount : vertex.ZCeiling + amount);
+				mode.SetActionResult("Changed vertex height to " + vertex.ZCeiling + ".");
+			} 
+			else 
+			{
+				vertex.ZFloor = (float.IsNaN(vertex.ZFloor) ? GetSectorHeight() + amount : vertex.ZFloor + amount);
+				mode.SetActionResult("Changed vertex height to " + vertex.ZFloor + ".");
+			}
+
+			// Update what must be updated
+			UpdateGeometry(vertex);
+			changed = true;
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/VisualModes/Effect3DFloor.cs b/Source/Plugins/BuilderModes/VisualModes/Effect3DFloor.cs
new file mode 100644
index 0000000..3d3f7aa
--- /dev/null
+++ b/Source/Plugins/BuilderModes/VisualModes/Effect3DFloor.cs
@@ -0,0 +1,199 @@
+#region === Copyright (c) 2010 Pascal van der Heiden ===
+
+using System;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	internal class Effect3DFloor : SectorEffect
+	{
+		// Linedef that is used to create this effect
+		// The sector can be found by linedef.Front.Sector
+		private readonly Linedef linedef;
+		
+		// Floor and ceiling planes
+		private SectorLevel floor;
+		private SectorLevel ceiling;
+
+		// Alpha transparency
+		private int alpha;
+		
+		// Vavoom type?
+		private bool vavoomtype;
+
+		//mxd. Render backsides?
+		private bool renderinside;
+
+		//mxd. Dirty hack to emulate GZDoom behaviour?
+		private bool sloped3dfloor;
+
+		//mxd. Render using Additive pass?
+		private bool renderadditive;
+
+		//mxd. Sidedef should be clipped by floor/ceiling?
+		private bool clipsides;
+
+		//mxd. Ignore Bottom Height?
+		private bool ignorebottomheight;
+
+		// Properties
+		public int Alpha { get { return alpha; } }
+		public SectorLevel Floor { get { return floor; } }
+		public SectorLevel Ceiling { get { return ceiling; } }
+		public Linedef Linedef { get { return linedef; } }
+		public bool VavoomType { get { return vavoomtype; } }
+		public bool RenderInside { get { return renderinside; } } //mxd
+		public bool RenderAdditive { get { return renderadditive; } } //mxd
+		public bool IgnoreBottomHeight { get { return ignorebottomheight; } } //mxd
+		public bool Sloped3dFloor { get { return sloped3dfloor; } } //mxd
+		public bool ClipSidedefs { get { return clipsides; } } //mxd
+
+		//mxd. 3D-Floor Flags
+		[Flags]
+		public enum Flags
+		{
+			None = 0,
+			DisableLighting = 1,
+			RestrictLighting = 2,
+			Fog = 4,
+			IgnoreBottomHeight = 8,
+			UseUpperTexture = 16,
+			UseLowerTexture = 32,
+			RenderAdditive = 64
+		}
+
+		//mxd. 3D-Floor Types
+		[Flags]
+		public enum FloorTypes
+		{
+			VavoomStyle = 0,
+			Solid = 1,
+			Swimmable = 2,
+			NonSolid = 3,
+			RenderInside = 4,
+			HiTagIsLineID = 8,
+			InvertVisibilityRules = 16,
+			InvertShootabilityRules = 32
+		}
+		
+		// Constructor
+		public Effect3DFloor(SectorData data, Linedef sourcelinedef) : base(data)
+		{
+			linedef = sourcelinedef;
+			
+			// New effect added: This sector needs an update!
+			if(data.Mode.VisualSectorExists(data.Sector))
+			{
+				BaseVisualSector vs = (BaseVisualSector)data.Mode.GetVisualSector(data.Sector);
+				vs.UpdateSectorGeometry(true);
+			}
+		}
+
+		// This makes sure we are updated with the source linedef information
+		public override void Update()
+		{
+			SectorData sd = data.Mode.GetSectorData(linedef.Front.Sector);
+			if(!sd.Updated) sd.Update();
+			sd.AddUpdateSector(data.Sector, true);
+
+			if(floor == null)
+			{
+				floor = new SectorLevel(sd.Floor);
+				data.AddSectorLevel(floor);
+			}
+
+			if(ceiling == null)
+			{
+				ceiling = new SectorLevel(sd.Ceiling);
+				data.AddSectorLevel(ceiling);
+			}
+
+			// For non-vavoom types, we must switch the level types
+			if(linedef.Args[1] != (int)FloorTypes.VavoomStyle)
+			{
+				//mxd. check for Swimmable/RenderInside/RenderAdditive flags
+				renderadditive = (linedef.Args[2] & (int)Flags.RenderAdditive) == (int)Flags.RenderAdditive;
+				renderinside = ((((linedef.Args[1] & (int)FloorTypes.Swimmable) == (int)FloorTypes.Swimmable) && (linedef.Args[1] & (int)FloorTypes.NonSolid) != (int)FloorTypes.NonSolid))
+							  || ((linedef.Args[1] & (int)FloorTypes.RenderInside) == (int)FloorTypes.RenderInside);
+				ignorebottomheight = ((linedef.Args[2] & (int)Flags.IgnoreBottomHeight) == (int)Flags.IgnoreBottomHeight);
+				
+				vavoomtype = false;
+				alpha = General.Clamp(linedef.Args[3], 0, 255);
+				sd.Ceiling.CopyProperties(floor);
+				sd.Floor.CopyProperties(ceiling);
+				floor.type = SectorLevelType.Floor;
+				floor.plane = sd.Ceiling.plane.GetInverted();
+				ceiling.type = SectorLevelType.Ceiling;
+				ceiling.plane = (ignorebottomheight ? sd.Ceiling.plane : sd.Floor.plane.GetInverted()); //mxd. Use upper plane when "ignorebottomheight" flag is set
+
+				//mxd
+				clipsides = (!renderinside && !renderadditive && alpha > 254 && !ignorebottomheight);
+
+				// A 3D floor's color is always that of the sector it is placed in
+				// (unless it's affected by glow) - mxd
+				if(sd.CeilingGlow == null || !sd.CeilingGlow.Fullbright) floor.color = 0;
+			}
+			else
+			{
+				vavoomtype = true;
+				renderadditive = false; //mxd
+				clipsides = true; //mxd
+				floor.type = SectorLevelType.Ceiling;
+				floor.plane = sd.Ceiling.plane;
+				ceiling.type = SectorLevelType.Floor;
+				ceiling.plane = sd.Floor.plane;
+				alpha = 255;
+				
+				// A 3D floor's color is always that of the sector it is placed in
+				// (unless it's affected by glow) - mxd
+				if(sd.FloorGlow == null || !sd.FloorGlow.Fullbright) ceiling.color = 0;
+			}
+
+			// Apply alpha
+			floor.alpha = alpha;
+			ceiling.alpha = alpha;
+
+			//mxd
+			floor.extrafloor = true;
+			ceiling.extrafloor = true;
+			floor.splitsides = !clipsides;
+			ceiling.splitsides = (!clipsides && !ignorebottomheight); // if "ignorebottomheight" flag is set, both ceiling and floor will be at the same level and sidedef clipping with floor level will fail resulting in incorrect light props transfer in some cases
+
+			//mxd. Check slopes, cause GZDoom can't handle sloped translucent 3d floors...
+			sloped3dfloor = ((alpha < 255 || renderadditive) &&
+							 (Angle2D.RadToDeg(ceiling.plane.Normal.GetAngleZ()) != 270 ||
+							  Angle2D.RadToDeg(floor.plane.Normal.GetAngleZ()) != 90));
+			
+			// Do not adjust light? (works only for non-vavoom types)
+			if(!vavoomtype)
+			{
+				bool disablelighting =  ((linedef.Args[2] & (int)Flags.DisableLighting)  == (int)Flags.DisableLighting); //mxd
+				bool restrictlighting = ((linedef.Args[2] & (int)Flags.RestrictLighting) == (int)Flags.RestrictLighting); //mxd
+
+				if(disablelighting || restrictlighting)
+				{
+					floor.restrictlighting = restrictlighting; //mxd
+					floor.disablelighting = disablelighting; //mxd
+					
+					if(disablelighting) //mxd
+					{
+						floor.color = 0;
+						floor.brightnessbelow = -1;
+						floor.colorbelow = PixelColor.FromInt(0);
+					}
+
+					ceiling.disablelighting = disablelighting; //mxd
+					ceiling.restrictlighting = restrictlighting; //mxd
+					
+					ceiling.color = 0;
+					ceiling.brightnessbelow = -1;
+					ceiling.colorbelow = PixelColor.FromInt(0);
+				}
+			}
+		}
+	}
+}
diff --git a/Source/Plugins/BuilderModes/VisualModes/EffectBrightnessLevel.cs b/Source/Plugins/BuilderModes/VisualModes/EffectBrightnessLevel.cs
new file mode 100644
index 0000000..7f98fbf
--- /dev/null
+++ b/Source/Plugins/BuilderModes/VisualModes/EffectBrightnessLevel.cs
@@ -0,0 +1,69 @@
+#region === Copyright (c) 2010 Pascal van der Heiden ===
+
+using CodeImp.DoomBuilder.Map;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	internal class EffectBrightnessLevel : SectorEffect
+	{
+		// Linedef that is used to create this effect
+		// The sector can be found by linedef.Front.Sector
+		private readonly Linedef linedef;
+		
+		// Level planes
+		private SectorLevel toplevel;
+		private SectorLevel bottomlevel; //mxd
+		
+		// Constructor
+		public EffectBrightnessLevel(SectorData data, Linedef sourcelinedef) : base(data)
+		{
+			linedef = sourcelinedef;
+
+			// New effect added: This sector needs an update!
+			if(data.Mode.VisualSectorExists(data.Sector))
+			{
+				BaseVisualSector vs = (BaseVisualSector)data.Mode.GetVisualSector(data.Sector);
+				vs.UpdateSectorGeometry(false);
+			}
+		}
+		
+		// This makes sure we are updated with the source linedef information
+		public override void Update()
+		{
+			SectorData sd = data.Mode.GetSectorData(linedef.Front.Sector);
+			if(!sd.Updated) sd.Update();
+			sd.AddUpdateSector(data.Sector, false);
+
+			// Create top level?
+			if(toplevel == null)
+			{
+				toplevel = new SectorLevel(sd.Ceiling);
+				data.AddSectorLevel(toplevel);
+			}
+
+			// Update top level
+			sd.Ceiling.CopyProperties(toplevel);
+			toplevel.lighttype = (LightLevelType)General.Clamp(linedef.Args[1], 0, 2); //mxd
+			toplevel.type = SectorLevelType.Light;
+
+			//mxd. Create bottom level?
+			if(toplevel.lighttype == LightLevelType.TYPE1)
+			{
+				// Create bottom level? Skip this step if there's a different light level between toplevel and bottomlevel
+				if(bottomlevel == null)
+				{
+					bottomlevel = new SectorLevel(data.Ceiling);
+					data.AddSectorLevel(bottomlevel);
+				}
+
+				// Update bottom level
+				data.Ceiling.CopyProperties(bottomlevel);
+				bottomlevel.type = SectorLevelType.Light;
+				bottomlevel.lighttype = LightLevelType.TYPE1_BOTTOM;
+				bottomlevel.plane = sd.Floor.plane.GetInverted();
+			}
+		}
+	}
+}
diff --git a/Source/Plugins/BuilderModes/VisualModes/EffectCopySlope.cs b/Source/Plugins/BuilderModes/VisualModes/EffectCopySlope.cs
new file mode 100644
index 0000000..e4dddf3
--- /dev/null
+++ b/Source/Plugins/BuilderModes/VisualModes/EffectCopySlope.cs
@@ -0,0 +1,62 @@
+#region === Copyright (c) 2010 Pascal van der Heiden ===
+
+using CodeImp.DoomBuilder.Map;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	internal class EffectCopySlope : SectorEffect
+	{
+		// Thing used to create this effect
+		// The thing is in the sector that must receive the slope and the
+		// Thing's arg 0 indicates the sector to copy the slope from.
+		private Thing thing;
+		
+		// Constructor
+		public EffectCopySlope(SectorData data, Thing sourcething) : base(data)
+		{
+			thing = sourcething;
+			
+			// New effect added: This sector needs an update!
+			if(data.Mode.VisualSectorExists(data.Sector))
+			{
+				BaseVisualSector vs = (BaseVisualSector)data.Mode.GetVisualSector(data.Sector);
+				vs.UpdateSectorGeometry(true);
+			}
+		}
+		
+		// This makes sure we are updated with the source linedef information
+		public override void Update()
+		{
+			// Find tagged sector
+			Sector sourcesector = null;
+			foreach(Sector s in General.Map.Map.Sectors)
+			{
+				if(s.Tags.Contains(thing.Args[0]))
+				{
+					sourcesector = s;
+					break;
+				}
+			}
+
+			if(sourcesector != null)
+			{
+				SectorData sourcesectordata = data.Mode.GetSectorData(sourcesector);
+				if(!sourcesectordata.Updated) sourcesectordata.Update();
+
+				switch(thing.Type)
+				{
+					case 9510:
+						data.Floor.plane = sourcesectordata.Floor.plane;
+						break;
+					case 9511:
+						data.Ceiling.plane = sourcesectordata.Ceiling.plane;
+						break;
+				}
+				
+				sourcesectordata.AddUpdateSector(data.Sector, true);
+			}
+		}
+	}
+}
diff --git a/Source/Plugins/BuilderModes/VisualModes/EffectGlowingFlat.cs b/Source/Plugins/BuilderModes/VisualModes/EffectGlowingFlat.cs
new file mode 100644
index 0000000..d1d36e8
--- /dev/null
+++ b/Source/Plugins/BuilderModes/VisualModes/EffectGlowingFlat.cs
@@ -0,0 +1,93 @@
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	internal class EffectGlowingFlat : SectorEffect
+	{
+		private readonly Sector sector;
+
+		// Level planes
+		private SectorLevel ceillevel;
+		private SectorLevel floorlevel;
+		
+		// Constructor
+		public EffectGlowingFlat(SectorData data, Sector sourcesector) : base(data)
+		{
+			sector = sourcesector;
+
+			// New effect added: This sector needs an update!
+			if(data.Mode.VisualSectorExists(data.Sector))
+			{
+				BaseVisualSector vs = (BaseVisualSector)data.Mode.GetVisualSector(data.Sector);
+				vs.UpdateSectorGeometry(false);
+			}
+		}
+
+		public override void Update() 
+		{
+			// Create ceiling glow effect?
+			if(General.Map.Data.GlowingFlats.ContainsKey(sector.LongCeilTexture))
+			{
+				// Create ceiling level?
+				if(ceillevel == null)
+				{
+					ceillevel = new SectorLevel(data.Ceiling);
+					ceillevel.type = SectorLevelType.Glow;
+					ceillevel.disablelighting = true;
+					data.AddSectorLevel(ceillevel);
+				}
+
+				// Update ceiling level
+				data.CeilingGlow = General.Map.Data.GlowingFlats[sector.LongCeilTexture];
+				ceillevel.brightnessbelow = -1; // We need this plane for clipping only,
+				ceillevel.color = 0;            // so we need to reset all shading and coloring
+				ceillevel.plane = data.Ceiling.plane;
+				ceillevel.plane.Offset -= data.CeilingGlow.Height;
+				data.CeilingGlowPlane = ceillevel.plane;
+			}
+			else
+			{
+				data.CeilingGlow = null;
+			}
+
+			// Create floor glow effect?
+			if(General.Map.Data.GlowingFlats.ContainsKey(sector.LongFloorTexture))
+			{
+				// Create floor level?
+				if(floorlevel == null)
+				{
+					floorlevel = new SectorLevel(data.Floor);
+					floorlevel.type = SectorLevelType.Glow;
+					floorlevel.disablelighting = true;
+					data.AddSectorLevel(floorlevel);
+				}
+
+				// Update floor level
+				data.FloorGlow = General.Map.Data.GlowingFlats[sector.LongFloorTexture];
+				floorlevel.plane = data.Floor.plane.GetInverted();
+				floorlevel.plane.Offset += data.FloorGlow.Height;
+
+				if(floorlevel.plane.Offset < data.Ceiling.plane.Offset)
+				{
+					floorlevel.brightnessbelow = -1; // We need this plane for clipping only,
+					floorlevel.color = 0;            // so we need to reset all shading and coloring
+					floorlevel.colorbelow = new PixelColor(0, 0, 0, 0);
+				}
+				else
+				{
+					// If glow plane is above real ceiling, apply ceiling colouring
+					floorlevel.brightnessbelow = data.Ceiling.brightnessbelow;
+					floorlevel.color = data.Ceiling.color;
+					floorlevel.colorbelow = data.Ceiling.colorbelow;
+				}
+
+				data.FloorGlowPlane = floorlevel.plane;
+			}
+			else
+			{
+				data.FloorGlow = null;
+			}
+		}
+	}
+}
diff --git a/Source/Plugins/BuilderModes/VisualModes/EffectLineSlope.cs b/Source/Plugins/BuilderModes/VisualModes/EffectLineSlope.cs
new file mode 100644
index 0000000..06c2cc7
--- /dev/null
+++ b/Source/Plugins/BuilderModes/VisualModes/EffectLineSlope.cs
@@ -0,0 +1,102 @@
+#region === Copyright (c) 2010 Pascal van der Heiden ===
+
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Map;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	internal class EffectLineSlope : SectorEffect
+	{
+		// Linedef that is used to create this effect
+		private readonly Linedef l;
+		
+		// Constructor
+		public EffectLineSlope(SectorData data, Linedef sourcelinedef) : base(data)
+		{
+			l = sourcelinedef;
+			
+			// New effect added: This sector needs an update!
+			if(data.Mode.VisualSectorExists(data.Sector))
+			{
+				BaseVisualSector vs = (BaseVisualSector)data.Mode.GetVisualSector(data.Sector);
+				vs.UpdateSectorGeometry(true);
+			}
+		}
+		
+		// This makes sure we are updated with the source linedef information
+		public override void Update()
+		{
+			if(l.Front == null || l.Back == null) return; //mxd
+			
+			// Find the vertex furthest from the line
+			Vertex foundv = null;
+			float founddist = -1.0f;
+			foreach(Sidedef sd in data.Sector.Sidedefs)
+			{
+				Vertex v = sd.IsFront ? sd.Line.Start : sd.Line.End;
+				float d = l.DistanceToSq(v.Position, false);
+				if(d > founddist)
+				{
+					foundv = v;
+					founddist = d;
+				}
+			}
+			
+			// Align floor with back of line
+			if((l.Args[0] == 1) && (l.Front.Sector == data.Sector))
+			{
+				Vector3D v1 = new Vector3D(l.Start.Position.x, l.Start.Position.y, l.Back.Sector.FloorHeight);
+				Vector3D v2 = new Vector3D(l.End.Position.x, l.End.Position.y, l.Back.Sector.FloorHeight);
+				Vector3D v3 = new Vector3D(foundv.Position.x, foundv.Position.y, data.Sector.FloorHeight);
+				if(l.SideOfLine(v3) < 0.0f)
+					data.Floor.plane = new Plane(v1, v2, v3, true);
+				else
+					data.Floor.plane = new Plane(v2, v1, v3, true);
+				SectorData sd = data.Mode.GetSectorData(l.Back.Sector);
+				sd.AddUpdateSector(data.Sector, true);
+			}
+			// Align floor with front of line
+			else if((l.Args[0] == 2) && (l.Back.Sector == data.Sector))
+			{
+				Vector3D v1 = new Vector3D(l.Start.Position.x, l.Start.Position.y, l.Front.Sector.FloorHeight);
+				Vector3D v2 = new Vector3D(l.End.Position.x, l.End.Position.y, l.Front.Sector.FloorHeight);
+				Vector3D v3 = new Vector3D(foundv.Position.x, foundv.Position.y, data.Sector.FloorHeight);
+				if(l.SideOfLine(v3) < 0.0f)
+					data.Floor.plane = new Plane(v1, v2, v3, true);
+				else
+					data.Floor.plane = new Plane(v2, v1, v3, true);
+				SectorData sd = data.Mode.GetSectorData(l.Front.Sector);
+				sd.AddUpdateSector(data.Sector, true);
+			}
+			
+			// Align ceiling with back of line
+			if((l.Args[1] == 1) && (l.Front.Sector == data.Sector))
+			{
+				Vector3D v1 = new Vector3D(l.Start.Position.x, l.Start.Position.y, l.Back.Sector.CeilHeight);
+				Vector3D v2 = new Vector3D(l.End.Position.x, l.End.Position.y, l.Back.Sector.CeilHeight);
+				Vector3D v3 = new Vector3D(foundv.Position.x, foundv.Position.y, data.Sector.CeilHeight);
+				if(l.SideOfLine(v3) > 0.0f)
+					data.Ceiling.plane = new Plane(v1, v2, v3, false);
+				else
+					data.Ceiling.plane = new Plane(v2, v1, v3, false);
+				SectorData sd = data.Mode.GetSectorData(l.Back.Sector);
+				sd.AddUpdateSector(data.Sector, true);
+			}
+			// Align ceiling with front of line
+			else if((l.Args[1] == 2) && (l.Back.Sector == data.Sector))
+			{
+				Vector3D v1 = new Vector3D(l.Start.Position.x, l.Start.Position.y, l.Front.Sector.CeilHeight);
+				Vector3D v2 = new Vector3D(l.End.Position.x, l.End.Position.y, l.Front.Sector.CeilHeight);
+				Vector3D v3 = new Vector3D(foundv.Position.x, foundv.Position.y, data.Sector.CeilHeight);
+				if(l.SideOfLine(v3) > 0.0f)
+					data.Ceiling.plane = new Plane(v1, v2, v3, false);
+				else
+					data.Ceiling.plane = new Plane(v2, v1, v3, false);
+				SectorData sd = data.Mode.GetSectorData(l.Front.Sector);
+				sd.AddUpdateSector(data.Sector, true);
+			}
+		}
+	}
+}
diff --git a/Source/Plugins/BuilderModes/VisualModes/EffectPlaneCopySlope.cs b/Source/Plugins/BuilderModes/VisualModes/EffectPlaneCopySlope.cs
new file mode 100644
index 0000000..a1ec5aa
--- /dev/null
+++ b/Source/Plugins/BuilderModes/VisualModes/EffectPlaneCopySlope.cs
@@ -0,0 +1,130 @@
+using CodeImp.DoomBuilder.Map;
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	internal class EffectPlaneCopySlope : SectorEffect
+	{
+		// Linedef that is used to create this effect
+		private readonly Linedef linedef;
+		private readonly bool front;
+
+		public EffectPlaneCopySlope(SectorData data, Linedef sourcelinedef, bool front) : base(data) 
+		{
+			this.linedef = sourcelinedef;
+			this.front = front;
+
+			// New effect added: This sector needs an update!
+			if(data.Mode.VisualSectorExists(data.Sector)) 
+			{
+				BaseVisualSector vs = (BaseVisualSector)data.Mode.GetVisualSector(data.Sector);
+				vs.UpdateSectorGeometry(true);
+			}
+		}
+		
+		// This makes sure we are updated with the source linedef information
+		public override void Update() 
+		{
+			Sector sourcesector = null;
+			SectorData sourcesectordata = null;
+
+			// Copy slopes from tagged sectors
+			//check which arguments we must use
+			int floorArg = (front ? 0 : 2);
+			int ceilingArg = (front ? 1 : 3);
+
+			//find sector to align floor to
+			if(linedef.Args[floorArg] > 0) 
+			{
+				foreach(Sector s in General.Map.Map.Sectors) 
+				{
+					if(s.Tags.Contains(linedef.Args[floorArg]))
+					{
+						sourcesector = s;
+						break;
+					}
+				}
+
+				if(sourcesector != null) 
+				{
+					sourcesectordata = data.Mode.GetSectorData(sourcesector);
+					if(!sourcesectordata.Updated) sourcesectordata.Update();
+
+					data.Floor.plane = sourcesectordata.Floor.plane;
+					sourcesectordata.AddUpdateSector(data.Sector, true);
+				}
+			}
+
+			if(linedef.Args[ceilingArg] > 0) 
+			{
+				//find sector to align ceiling to
+				if(linedef.Args[ceilingArg] != linedef.Args[floorArg]) 
+				{
+					sourcesector = null;
+
+					foreach(Sector s in General.Map.Map.Sectors) 
+					{
+						if(s.Tags.Contains(linedef.Args[ceilingArg]))
+						{
+							sourcesector = s;
+							break;
+						}
+					}
+
+					if(sourcesector != null) 
+					{
+						sourcesectordata = data.Mode.GetSectorData(sourcesector);
+						if(!sourcesectordata.Updated) sourcesectordata.Update();
+
+						data.Ceiling.plane = sourcesectordata.Ceiling.plane;
+						sourcesectordata.AddUpdateSector(data.Sector, true);
+					}
+
+				} 
+				else if(sourcesector != null) //ceiling uses the same sector as floor 
+				{ 
+					data.Ceiling.plane = sourcesectordata.Ceiling.plane;
+				}
+			}
+
+			//check the flags...
+			bool copyFloor = false;
+			bool copyCeiling = false;
+
+			if(linedef.Args[4] > 0 && linedef.Args[4] != 3 && linedef.Args[4] != 12) 
+			{
+				if(front) 
+				{
+					copyFloor = (linedef.Args[4] & 2) == 2;
+					copyCeiling = (linedef.Args[4] & 8) == 8;
+				} 
+				else 
+				{
+					copyFloor = (linedef.Args[4] & 1) == 1;
+					copyCeiling = (linedef.Args[4] & 4) == 4;
+				}
+			}
+
+			// Copy slope across the line
+			if(!copyFloor && !copyCeiling) return;
+
+			//get appropriate source sector data
+			sourcesectordata = data.Mode.GetSectorData(front ? linedef.Back.Sector : linedef.Front.Sector);
+			if(!sourcesectordata.Updated) sourcesectordata.Update();
+
+			//copy floor slope?
+			if(copyFloor) 
+			{
+				data.Floor.plane = sourcesectordata.Floor.plane;
+				sourcesectordata.AddUpdateSector(data.Sector, true);
+			}
+
+			//copy ceiling slope?
+			if(copyCeiling) 
+			{
+				data.Ceiling.plane = sourcesectordata.Ceiling.plane;
+				sourcesectordata.AddUpdateSector(data.Sector, true);
+			}
+			
+		}
+	}
+}
diff --git a/Source/Plugins/BuilderModes/VisualModes/EffectThingLineSlope.cs b/Source/Plugins/BuilderModes/VisualModes/EffectThingLineSlope.cs
new file mode 100644
index 0000000..16e35d7
--- /dev/null
+++ b/Source/Plugins/BuilderModes/VisualModes/EffectThingLineSlope.cs
@@ -0,0 +1,111 @@
+#region === Copyright (c) 2010 Pascal van der Heiden ===
+
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Map;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	internal class EffectThingLineSlope : SectorEffect
+	{
+		// Thing used to create this effect
+		// The thing is in the sector that must receive the slope and the
+		// Thing's arg 0 indicates the linedef to start the slope at.
+		private Thing thing;
+		
+		// Constructor
+		public EffectThingLineSlope(SectorData data, Thing sourcething) : base(data)
+		{
+			thing = sourcething;
+			
+			// New effect added: This sector needs an update!
+			if(data.Mode.VisualSectorExists(data.Sector))
+			{
+				BaseVisualSector vs = (BaseVisualSector)data.Mode.GetVisualSector(data.Sector);
+				vs.UpdateSectorGeometry(true);
+			}
+		}
+		
+		// This makes sure we are updated with the source linedef information
+		public override void Update()
+		{
+			ThingData td = data.Mode.GetThingData(thing);
+			Thing t = thing;
+
+			// Find the tagged line
+			Linedef ld = null;
+			foreach(Linedef l in General.Map.Map.Linedefs)
+			{
+				if(l.Tags.Contains(t.Args[0]))
+				{
+					ld = l;
+					break;
+				}
+			}
+			
+			if(ld != null)
+			{
+				if(t.Type == 9500)
+				{
+					// Slope the floor from the linedef to thing
+					t.DetermineSector(data.Mode.BlockMap);
+					if(t.Sector != null)
+					{
+						Vector3D v3 = new Vector3D(t.Position.x, t.Position.y, t.Position.z + t.Sector.FloorHeight);
+						if(ld.SideOfLine(t.Position) < 0.0f)
+						{
+							Vector3D v1 = new Vector3D(ld.Start.Position.x, ld.Start.Position.y, ld.Front.Sector.FloorHeight);
+							Vector3D v2 = new Vector3D(ld.End.Position.x, ld.End.Position.y, ld.Front.Sector.FloorHeight);
+							SectorData sd = data.Mode.GetSectorData(ld.Front.Sector);
+							sd.AddUpdateSector(data.Sector, true);
+							if(!sd.Updated) sd.Update();
+							td.AddUpdateSector(ld.Front.Sector, true);
+							sd.Floor.plane = new Plane(v1, v2, v3, true);
+						}
+						else
+						{
+							Vector3D v1 = new Vector3D(ld.Start.Position.x, ld.Start.Position.y, ld.Back.Sector.FloorHeight);
+							Vector3D v2 = new Vector3D(ld.End.Position.x, ld.End.Position.y, ld.Back.Sector.FloorHeight);
+							SectorData sd = data.Mode.GetSectorData(ld.Back.Sector);
+							sd.AddUpdateSector(data.Sector, true);
+							if(!sd.Updated) sd.Update();
+							td.AddUpdateSector(ld.Back.Sector, true);
+							sd.Floor.plane = new Plane(v2, v1, v3, true);
+						}
+					}
+				}
+				else if(t.Type == 9501)
+				{
+					// Slope the ceiling from the linedef to thing
+					t.DetermineSector(data.Mode.BlockMap);
+					if(t.Sector != null)
+					{
+						td.AddUpdateSector(t.Sector, true);
+						Vector3D v3 = new Vector3D(t.Position.x, t.Position.y, t.Position.z + t.Sector.CeilHeight);
+						if(ld.SideOfLine(t.Position) < 0.0f)
+						{
+							Vector3D v1 = new Vector3D(ld.Start.Position.x, ld.Start.Position.y, ld.Front.Sector.CeilHeight);
+							Vector3D v2 = new Vector3D(ld.End.Position.x, ld.End.Position.y, ld.Front.Sector.CeilHeight);
+							SectorData sd = data.Mode.GetSectorData(ld.Front.Sector);
+							sd.AddUpdateSector(data.Sector, true);
+							td.AddUpdateSector(ld.Front.Sector, true);
+							if(!sd.Updated) sd.Update();
+							sd.Ceiling.plane = new Plane(v1, v2, v3, false);
+						}
+						else
+						{
+							Vector3D v1 = new Vector3D(ld.Start.Position.x, ld.Start.Position.y, ld.Back.Sector.CeilHeight);
+							Vector3D v2 = new Vector3D(ld.End.Position.x, ld.End.Position.y, ld.Back.Sector.CeilHeight);
+							SectorData sd = data.Mode.GetSectorData(ld.Back.Sector);
+							sd.AddUpdateSector(data.Sector, true);
+							td.AddUpdateSector(ld.Back.Sector, true);
+							if(!sd.Updated) sd.Update();
+							sd.Ceiling.plane = new Plane(v2, v1, v3, false);
+						}
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/Source/Plugins/BuilderModes/VisualModes/EffectThingSlope.cs b/Source/Plugins/BuilderModes/VisualModes/EffectThingSlope.cs
new file mode 100644
index 0000000..1448d62
--- /dev/null
+++ b/Source/Plugins/BuilderModes/VisualModes/EffectThingSlope.cs
@@ -0,0 +1,123 @@
+#region === Copyright (c) 2010 Pascal van der Heiden ===
+
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Map;
+using System;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	internal class EffectThingSlope : SectorEffect
+	{
+		// Thing used to create this effect
+		// The thing is in the sector that must receive the slope
+		private Thing thing;
+
+		// Constructor
+		public EffectThingSlope(SectorData data, Thing sourcething) : base(data)
+		{
+			thing = sourcething;
+
+			// New effect added: This sector needs an update!
+			if(data.Mode.VisualSectorExists(data.Sector))
+			{
+				BaseVisualSector vs = (BaseVisualSector)data.Mode.GetVisualSector(data.Sector);
+				vs.UpdateSectorGeometry(true);
+			}
+		}
+
+		// This makes sure we are updated with the source linedef information
+		public override void Update()
+		{
+			ThingData td = data.Mode.GetThingData(thing);
+			Thing t = thing;
+
+			// Floor slope thing
+			if(t.Type == 9502)
+			{
+				t.DetermineSector(data.Mode.BlockMap);
+				if(t.Sector != null)
+				{
+					//mxd. Vertex zheight overrides this effect
+					if(General.Map.UDMF && t.Sector.Sidedefs.Count == 3) 
+					{
+						foreach(Sidedef side in t.Sector.Sidedefs) 
+						{
+							if(!float.IsNaN(side.Line.Start.ZFloor) || !float.IsNaN(side.Line.End.ZFloor)) 
+								return;
+						}
+					}
+
+					float angle = Angle2D.DoomToReal((int)Angle2D.RadToDeg(t.Angle));
+					float vangle = Angle2D.DegToRad(General.Clamp(t.Args[0], 0, 180)); //mxd. Don't underestimate user stupidity (or curiosity)!
+					Vector2D point = new Vector2D(t.Position.x + (float)Math.Cos(angle) * (float)Math.Sin(vangle), t.Position.y + (float)Math.Sin(angle) * (float)Math.Sin(vangle));
+					Vector2D perpendicular = new Line2D(t.Position, point).GetPerpendicular();
+
+					Vector3D v1 = new Vector3D(t.Position.x, t.Position.y, t.Position.z + t.Sector.FloorHeight);
+
+					Vector3D v2 = new Vector3D(
+						point.x + perpendicular.x,
+						point.y + perpendicular.y,
+						t.Position.z + t.Sector.FloorHeight + (float)Math.Cos(vangle)
+					);
+
+					Vector3D v3 = new Vector3D(
+						point.x - perpendicular.x,
+						point.y - perpendicular.y,
+						t.Position.z + t.Sector.FloorHeight + (float)Math.Cos(vangle)
+					);
+
+					SectorData sd = data.Mode.GetSectorData(t.Sector);
+					sd.AddUpdateSector(data.Sector, true);
+					if(!sd.Updated) sd.Update();
+					td.AddUpdateSector(t.Sector, true);
+					sd.Floor.plane = new Plane(v1, v2, v3, true);
+				}
+			}
+			// Ceiling slope thing
+			else if(t.Type == 9503)
+			{
+				t.DetermineSector(data.Mode.BlockMap);
+				if(t.Sector != null)
+				{
+					//mxd. Vertex zheight overrides this effect
+					if(General.Map.UDMF && t.Sector.Sidedefs.Count == 3) 
+					{
+						foreach(Sidedef side in t.Sector.Sidedefs) 
+						{
+							if(!float.IsNaN(side.Line.Start.ZCeiling) || !float.IsNaN(side.Line.End.ZCeiling))
+								return;
+						}
+					}
+					
+					float angle = Angle2D.DoomToReal((int)Angle2D.RadToDeg(t.Angle));
+					float vangle = Angle2D.DegToRad(General.Clamp(t.Args[0], 0, 180)); //mxd. Don't underestimate user stupidity (or curiosity)!
+					Vector2D point = new Vector2D(t.Position.x + (float)Math.Cos(angle) * (float)Math.Sin(vangle), t.Position.y + (float)Math.Sin(angle) * (float)Math.Sin(vangle));
+					Vector2D perpendicular = new Line2D(t.Position, point).GetPerpendicular();
+
+					Vector3D v1 = new Vector3D(t.Position.x, t.Position.y, t.Position.z + t.Sector.CeilHeight);
+
+					Vector3D v2 = new Vector3D(
+						point.x + perpendicular.x,
+						point.y + perpendicular.y,
+						t.Position.z + t.Sector.CeilHeight + (float)Math.Cos(vangle)
+					);
+
+					Vector3D v3 = new Vector3D(
+						point.x - perpendicular.x,
+						point.y - perpendicular.y,
+						t.Position.z + t.Sector.CeilHeight + (float)Math.Cos(vangle)
+					);
+
+					SectorData sd = data.Mode.GetSectorData(t.Sector);
+					sd.AddUpdateSector(data.Sector, true);
+					if(!sd.Updated) sd.Update();
+					td.AddUpdateSector(t.Sector, true);
+					sd.Ceiling.plane = new Plane(v1, v2, v3, false);
+				}
+			}
+
+		}
+	}
+}
diff --git a/Source/Plugins/BuilderModes/VisualModes/EffectThingVertexSlope.cs b/Source/Plugins/BuilderModes/VisualModes/EffectThingVertexSlope.cs
new file mode 100644
index 0000000..c21155e
--- /dev/null
+++ b/Source/Plugins/BuilderModes/VisualModes/EffectThingVertexSlope.cs
@@ -0,0 +1,82 @@
+#region === Copyright (c) 2010 Pascal van der Heiden ===
+
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Map;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	internal class EffectThingVertexSlope : SectorEffect
+	{
+		// Thing used to create this effect
+		// The thing is in the sector that must receive the slope and the
+		// Thing's arg 0 indicates the linedef to start the slope at.
+		private List<Thing> things;
+		
+		// Floor or ceiling?
+		private bool slopefloor;
+		
+		// Constructor
+		public EffectThingVertexSlope(SectorData data, List<Thing> sourcethings, bool floor) : base(data)
+		{
+			things = sourcethings;
+			slopefloor = floor;
+			
+			// New effect added: This sector needs an update!
+			if(data.Mode.VisualSectorExists(data.Sector))
+			{
+				BaseVisualSector vs = (BaseVisualSector)data.Mode.GetVisualSector(data.Sector);
+				vs.UpdateSectorGeometry(true);
+			}
+		}
+		
+		// This makes sure we are updated with the source linedef information
+		public override void Update()
+		{
+			// Create vertices in clockwise order
+			Vector3D[] verts = new Vector3D[3];
+			int index = 0;
+			foreach(Sidedef sd in data.Sector.Sidedefs)
+			{
+				Vertex v = sd.IsFront ? sd.Line.End : sd.Line.Start;
+				
+				// Presume not sloped
+				if(slopefloor)
+					verts[index] = new Vector3D(v.Position.x, v.Position.y, data.Floor.plane.GetZ(v.Position));
+				else
+					verts[index] = new Vector3D(v.Position.x, v.Position.y, data.Ceiling.plane.GetZ(v.Position));
+
+				//mxd. UDMF vertex offset overrides this effect
+				if(General.Map.UDMF) 
+				{
+					if((slopefloor && !float.IsNaN(v.ZFloor)) || !float.IsNaN(v.ZCeiling)) 
+					{
+						index++;
+						continue;
+					}
+				}
+				
+				// Find the thing at this position
+				foreach(Thing t in things)
+				{
+					if((Vector2D)t.Position == v.Position)
+					{
+						ThingData td = data.Mode.GetThingData(t);
+						td.AddUpdateSector(data.Sector, true);
+						verts[index] = t.Position;
+					}
+				}
+				
+				index++;
+			}
+			
+			// Make new plane
+			if(slopefloor)
+				data.Floor.plane = new Plane(verts[0], verts[1], verts[2], true);
+			else
+				data.Ceiling.plane = new Plane(verts[0], verts[2], verts[1], false);
+		}
+	}
+}
diff --git a/Source/Plugins/BuilderModes/VisualModes/EffectTransferCeilingBrightness.cs b/Source/Plugins/BuilderModes/VisualModes/EffectTransferCeilingBrightness.cs
new file mode 100644
index 0000000..5ed4ee0
--- /dev/null
+++ b/Source/Plugins/BuilderModes/VisualModes/EffectTransferCeilingBrightness.cs
@@ -0,0 +1,38 @@
+#region === Copyright (c) 2015 MaxED ===
+
+using CodeImp.DoomBuilder.Map;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	class EffectTransferCeilingBrightness : SectorEffect
+	{
+		// Linedef that is used to create this effect
+		private readonly Linedef linedef;
+
+		// Constructor
+		public EffectTransferCeilingBrightness(SectorData data, Linedef sourcelinedef) : base(data)
+		{
+			linedef = sourcelinedef;
+
+			// New effect added: This sector needs an update!
+			if(data.Mode.VisualSectorExists(data.Sector))
+			{
+				BaseVisualSector vs = (BaseVisualSector)data.Mode.GetVisualSector(data.Sector);
+				vs.UpdateSectorGeometry(false);
+			}
+		}
+		
+		// This makes sure we are updated with the source linedef information
+		public override void Update() 
+		{
+			SectorData sd = data.Mode.GetSectorData(linedef.Front.Sector);
+			if(!sd.Updated) sd.Update();
+			sd.AddUpdateSector(data.Sector, false);
+
+			// Transfer ceiling brightness
+			data.Ceiling.color = General.Map.Renderer3D.CalculateBrightness(sd.Sector.Brightness);
+		}
+	}
+}
diff --git a/Source/Plugins/BuilderModes/VisualModes/EffectTransferFloorBrightness.cs b/Source/Plugins/BuilderModes/VisualModes/EffectTransferFloorBrightness.cs
new file mode 100644
index 0000000..129c8bb
--- /dev/null
+++ b/Source/Plugins/BuilderModes/VisualModes/EffectTransferFloorBrightness.cs
@@ -0,0 +1,39 @@
+#region === Copyright (c) 2015 MaxED ===
+
+using CodeImp.DoomBuilder.Map;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	internal class EffectTransferFloorBrightness : SectorEffect
+	{
+		// Linedef that is used to create this effect
+		private readonly Linedef linedef;
+
+		// Constructor
+		public EffectTransferFloorBrightness(SectorData data, Linedef sourcelinedef) : base(data)
+		{
+			linedef = sourcelinedef;
+
+			// New effect added: This sector needs an update!
+			if(data.Mode.VisualSectorExists(data.Sector))
+			{
+				BaseVisualSector vs = (BaseVisualSector)data.Mode.GetVisualSector(data.Sector);
+				vs.UpdateSectorGeometry(false);
+			}
+		}
+		
+		// This makes sure we are updated with the source linedef information
+		public override void Update() 
+		{
+			SectorData sd = data.Mode.GetSectorData(linedef.Front.Sector);
+			if(!sd.Updated) sd.Update();
+			sd.AddUpdateSector(data.Sector, false);
+
+			// Transfer floor brightness
+			data.Floor.color = General.Map.Renderer3D.CalculateBrightness(sd.Sector.Brightness);
+			data.Floor.brightnessbelow = sd.Floor.brightnessbelow;
+		}
+	}
+}
diff --git a/Source/Plugins/BuilderModes/VisualModes/EffectUDMFVertexOffset.cs b/Source/Plugins/BuilderModes/VisualModes/EffectUDMFVertexOffset.cs
new file mode 100644
index 0000000..943b148
--- /dev/null
+++ b/Source/Plugins/BuilderModes/VisualModes/EffectUDMFVertexOffset.cs
@@ -0,0 +1,82 @@
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Geometry;
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	internal class EffectUDMFVertexOffset : SectorEffect
+	{
+		public EffectUDMFVertexOffset(SectorData data) : base(data) 
+		{
+			// New effect added: This sector needs an update!
+			if(data.Mode.VisualSectorExists(data.Sector)) 
+			{
+				BaseVisualSector vs = (BaseVisualSector)data.Mode.GetVisualSector(data.Sector);
+				vs.UpdateSectorGeometry(true);
+			}
+		}
+
+		public override void Update() 
+		{
+			// Create vertices in clockwise order
+			Vector3D[] floorVerts = new Vector3D[3];
+			Vector3D[] ceilingVerts = new Vector3D[3];
+			bool floorChanged = false;
+			bool ceilingChanged = false;
+			int index = 0;
+
+			//check vertices
+			foreach(Sidedef sd in data.Sector.Sidedefs)	
+			{
+				Vertex v = sd.IsFront ? sd.Line.End : sd.Line.Start;
+				
+				//create "normal" vertices
+				floorVerts[index] = new Vector3D(v.Position);
+				ceilingVerts[index] = new Vector3D(v.Position);
+
+				//check ceiling
+				if(!float.IsNaN(v.ZCeiling)) 
+				{
+					//vertex offset is absolute
+					ceilingVerts[index].z = v.ZCeiling;
+					ceilingChanged = true;
+				} 
+				else 
+				{
+					ceilingVerts[index].z = data.Ceiling.plane.GetZ(v.Position);
+				}
+
+				//and floor
+				if(!float.IsNaN(v.ZFloor)) 
+				{
+					//vertex offset is absolute
+					floorVerts[index].z = v.ZFloor;
+					floorChanged = true;
+				} 
+				else 
+				{
+					floorVerts[index].z = data.Floor.plane.GetZ(v.Position);
+				}
+
+				VertexData vd = data.Mode.GetVertexData(v);
+
+				foreach(Linedef line in v.Linedefs) 
+				{
+					if(line.Front != null && line.Front.Sector != null)
+						vd.AddUpdateSector(line.Front.Sector, false);
+					if(line.Back != null && line.Back.Sector != null)
+						vd.AddUpdateSector(line.Back.Sector, false);
+				}
+
+				data.Mode.UpdateVertexHandle(v);
+				index++;
+			}
+
+			//apply changes
+			if(ceilingChanged)
+				data.Ceiling.plane = new Plane(ceilingVerts[0], ceilingVerts[2], ceilingVerts[1], false);
+
+			if(floorChanged)
+				data.Floor.plane = new Plane(floorVerts[0], floorVerts[1], floorVerts[2], true);
+		}
+	}
+}
diff --git a/Source/Plugins/BuilderModes/VisualModes/IVisualEventReceiver.cs b/Source/Plugins/BuilderModes/VisualModes/IVisualEventReceiver.cs
new file mode 100644
index 0000000..71d143e
--- /dev/null
+++ b/Source/Plugins/BuilderModes/VisualModes/IVisualEventReceiver.cs
@@ -0,0 +1,65 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Windows.Forms;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	internal interface IVisualEventReceiver
+	{
+		// The events that must be handled
+		void OnSelectBegin();
+		void OnSelectEnd();
+		void OnEditBegin();
+		void OnEditEnd();
+		void OnMouseMove(MouseEventArgs e);
+		void OnChangeTargetHeight(int amount);
+		void OnChangeTargetBrightness(bool up);
+		void OnChangeTextureOffset(int horizontal, int vertical, bool doSurfaceAngleCorrection);
+		void OnChangeScale(int incrementX, int incrementY); //mxd
+		void OnResetTextureOffset();
+		void OnResetLocalTextureOffset(); //mxd. This should reset upper/middle/lower offsets (UDMF only)
+		void OnSelectTexture();
+		void OnCopyTexture();
+		void OnPasteTexture();
+		void OnCopyTextureOffsets();
+		void OnPasteTextureOffsets();
+		void OnCopyProperties();
+		void OnPasteProperties(bool usecopysettings); //mxd. Added "usecopysettings"
+		void OnTextureAlign(bool alignx, bool aligny);
+		void OnTextureFit(FitTextureOptions options); //mxd
+		void OnTextureFloodfill();
+		void OnToggleUpperUnpegged();
+		void OnToggleLowerUnpegged();
+		void OnProcess(float deltatime);
+		void OnInsert();
+		void OnDelete();
+
+		// Assist functions
+		void ApplyTexture(string texture);
+		void ApplyUpperUnpegged(bool set);
+		void ApplyLowerUnpegged(bool set);
+		
+		// Other methods
+		string GetTextureName();
+		void SelectNeighbours(bool select, bool withSameTexture, bool withSameHeight); //mxd
+		bool IsSelected(); //mxd
+	}
+}
diff --git a/Source/Plugins/BuilderModes/VisualModes/NullVisualEventReceiver.cs b/Source/Plugins/BuilderModes/VisualModes/NullVisualEventReceiver.cs
new file mode 100644
index 0000000..7d3127f
--- /dev/null
+++ b/Source/Plugins/BuilderModes/VisualModes/NullVisualEventReceiver.cs
@@ -0,0 +1,61 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Windows.Forms;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	// This doesn't do jack shit.
+	internal class NullVisualEventReceiver : IVisualEventReceiver
+	{
+		public void OnSelectBegin() { }
+		public void OnSelectEnd() { }
+		public void OnEditBegin() {	}
+		public void OnEditEnd()	{ }
+		public void OnMouseMove(MouseEventArgs e) {	}
+		public void OnChangeTargetHeight(int amount) { }
+		public void OnChangeTargetBrightness(bool up) { }
+		public void OnChangeTextureOffset(int horizontal, int vertical, bool doSurfaceAngleCorrection) { }
+		public void OnChangeScale(int incrementX, int incrementY) { } //mxd
+		public void OnResetTextureOffset() { }
+		public void OnResetLocalTextureOffset() { } //mxd
+		public void OnSelectTexture() { }
+		public void OnCopyTexture() { }
+		public void OnPasteTexture() { }
+		public void OnCopyTextureOffsets() { }
+		public void OnPasteTextureOffsets() { }
+		public void OnCopyProperties() { }
+		public void OnPasteProperties(bool useoptions) { } //mxd. Added "useoptions"
+		public void OnTextureAlign(bool alignx, bool aligny) { }
+		public void OnTextureFit(FitTextureOptions options) { } //mxd
+		public void OnTextureFloodfill() { }
+		public void OnToggleUpperUnpegged()	{ }
+		public void OnToggleLowerUnpegged()	{ }
+		public void OnProcess(float deltatime) { }
+		public void OnInsert() { }
+		public void OnDelete() { }
+		public void ApplyTexture(string texture) { }
+		public void ApplyUpperUnpegged(bool set) { }
+		public void ApplyLowerUnpegged(bool set) { }
+		public string GetTextureName() { return "";	}
+		public void SelectNeighbours(bool select, bool withSameTexture, bool withSameHeight) { } //mxd
+		public bool IsSelected() { return false; } //mxd
+	}
+}
diff --git a/Source/Plugins/BuilderModes/VisualModes/SectorData.cs b/Source/Plugins/BuilderModes/VisualModes/SectorData.cs
new file mode 100644
index 0000000..92d3c12
--- /dev/null
+++ b/Source/Plugins/BuilderModes/VisualModes/SectorData.cs
@@ -0,0 +1,566 @@
+#region === Copyright (c) 2010 Pascal van der Heiden ===
+
+using System;
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.GZBuilder.Data;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	internal class SectorData
+	{
+		#region ================== Variables
+		
+		// VisualMode
+		private readonly BaseVisualMode mode;
+		
+		// Sector for which this data is
+		private readonly Sector sector;
+		
+		// Levels have been updated?
+		private bool updated;
+		
+		// This prevents recursion
+		private bool isupdating;
+		
+		// All planes in the sector that cast or are affected by light
+		private readonly List<SectorLevel> lightlevels;
+		
+		// Effects
+		private readonly List<SectorEffect> alleffects;
+		private readonly List<Effect3DFloor> extrafloors;
+
+		internal GlowingFlatData CeilingGlow; //mxd
+		internal GlowingFlatData FloorGlow; //mxd
+		internal Plane FloorGlowPlane; //mxd
+		internal Plane CeilingGlowPlane; //mxd
+		
+		// Sectors that must be updated when this sector is changed
+		// The boolean value is the 'includeneighbours' of the UpdateSectorGeometry function which
+		// indicates if the sidedefs of neighbouring sectors should also be rebuilt.
+		private readonly Dictionary<Sector, bool> updatesectors;
+		
+		// Original floor and ceiling levels
+		private readonly SectorLevel floor;
+		private readonly SectorLevel floorbase; // mxd. Sector floor level, unaffected by glow / light properties transfer
+		private readonly SectorLevel ceiling;
+		private readonly SectorLevel ceilingbase; // mxd. Sector ceiling level, unaffected by glow / light properties transfer 
+		
+		// This helps keeping track of changes
+		// otherwise we update ceiling/floor too much
+		private bool floorchanged;
+		private bool ceilingchanged;
+
+		#endregion
+		
+		#region ================== Properties
+		
+		public Sector Sector { get { return sector; } }
+		public bool Updated { get { return updated; } }
+		public bool FloorChanged { get { return floorchanged; } set { floorchanged |= value; } }
+		public bool CeilingChanged { get { return ceilingchanged; } set { ceilingchanged |= value; } }
+		public List<SectorLevel> LightLevels { get { return lightlevels; } }
+		public List<Effect3DFloor> ExtraFloors { get { return extrafloors; } }
+		public SectorLevel Floor { get { return floor; } }
+		public SectorLevel Ceiling { get { return ceiling; } }
+		public BaseVisualMode Mode { get { return mode; } }
+		public Dictionary<Sector, bool> UpdateAlso { get { return updatesectors; } }
+		
+		#endregion
+		
+		#region ================== Constructor / Destructor
+		
+		// Constructor
+		public SectorData(BaseVisualMode mode, Sector s)
+		{
+			// Initialize
+			this.mode = mode;
+			this.sector = s;
+			this.updated = false;
+			this.floorchanged = false;
+			this.ceilingchanged = false;
+			this.lightlevels = new List<SectorLevel>(2);
+			this.extrafloors = new List<Effect3DFloor>(1);
+			this.alleffects = new List<SectorEffect>(1);
+			this.updatesectors = new Dictionary<Sector, bool>(2);
+			this.floor = new SectorLevel(sector, SectorLevelType.Floor);
+			this.floorbase = new SectorLevel(sector, SectorLevelType.Floor); //mxd
+			this.ceiling = new SectorLevel(sector, SectorLevelType.Ceiling);
+			this.ceilingbase = new SectorLevel(sector, SectorLevelType.Ceiling); //mxd
+			
+			BasicSetup();
+			
+			// Add ceiling and floor
+			lightlevels.Add(floor);
+			lightlevels.Add(ceiling);
+		}
+		
+		#endregion
+		
+		#region ================== Public Methods
+		
+		// 3D Floor effect
+		public void AddEffect3DFloor(Linedef sourcelinedef)
+		{
+			Effect3DFloor e = new Effect3DFloor(this, sourcelinedef);
+			extrafloors.Add(e);
+			alleffects.Add(e);
+		}
+		
+		// Brightness level effect
+		public void AddEffectBrightnessLevel(Linedef sourcelinedef)
+		{
+			EffectBrightnessLevel e = new EffectBrightnessLevel(this, sourcelinedef);
+			alleffects.Add(e);
+		}
+
+		//mxd. Transfer Floor Brightness effect
+		public void AddEffectTransferFloorBrightness(Linedef sourcelinedef) 
+		{
+			EffectTransferFloorBrightness e = new EffectTransferFloorBrightness(this, sourcelinedef);
+			alleffects.Add(e);
+		}
+
+		//mxd. Transfer Floor Brightness effect
+		public void AddEffectTransferCeilingBrightness(Linedef sourcelinedef) 
+		{
+			EffectTransferCeilingBrightness e = new EffectTransferCeilingBrightness(this, sourcelinedef);
+			alleffects.Add(e);
+		}
+
+		// Line slope effect
+		public void AddEffectLineSlope(Linedef sourcelinedef)
+		{
+			EffectLineSlope e = new EffectLineSlope(this, sourcelinedef);
+			alleffects.Add(e);
+		}
+
+		//mxd. Plane copy slope effect
+		public void AddEffectPlaneClopySlope(Linedef sourcelinedef, bool front) 
+		{
+			EffectPlaneCopySlope e = new EffectPlaneCopySlope(this, sourcelinedef, front);
+			alleffects.Add(e);
+		}
+
+		// Copy slope effect
+		public void AddEffectCopySlope(Thing sourcething)
+		{
+			EffectCopySlope e = new EffectCopySlope(this, sourcething);
+			alleffects.Add(e);
+		}
+
+		// Thing line slope effect
+		public void AddEffectThingLineSlope(Thing sourcething)
+		{
+			EffectThingLineSlope e = new EffectThingLineSlope(this, sourcething);
+			alleffects.Add(e);
+		}
+
+		// Thing slope effect
+		public void AddEffectThingSlope(Thing sourcething)
+		{
+			EffectThingSlope e = new EffectThingSlope(this, sourcething);
+			alleffects.Add(e);
+		}
+
+		// Thing vertex slope effect
+		public void AddEffectThingVertexSlope(List<Thing> sourcethings, bool slopefloor)
+		{
+			EffectThingVertexSlope e = new EffectThingVertexSlope(this, sourcethings, slopefloor);
+			alleffects.Add(e);
+		}
+
+		//mxd. Add UDMF vertex offset effect
+		public void AddEffectVertexOffset() 
+		{
+			EffectUDMFVertexOffset e = new EffectUDMFVertexOffset(this);
+			alleffects.Add(e);
+		}
+
+		//mxd.
+		public void AddEffectGlowingFlat(Sector sourcesector) 
+		{
+			EffectGlowingFlat e = new EffectGlowingFlat(this, sourcesector);
+			alleffects.Add(e);
+		}
+		
+		// This adds a sector for updating
+		public void AddUpdateSector(Sector s, bool includeneighbours)
+		{
+			updatesectors[s] = includeneighbours;
+		}
+		
+		// This adds a sector level
+		public void AddSectorLevel(SectorLevel level)
+		{
+			// Note: Inserting before the end so that the ceiling stays
+			// at the end and the floor at the beginning
+			lightlevels.Insert(lightlevels.Count - 1, level);
+		}
+		
+		// This resets this sector data and all sectors that require updating after me
+		public void Reset()
+		{
+			if(isupdating) return;
+			isupdating = true;
+
+			// This is set to false so that this sector is rebuilt the next time it is needed!
+			updated = false;
+
+			// The visual sector associated is now outdated
+			if(mode.VisualSectorExists(sector))
+			{
+				BaseVisualSector vs = (BaseVisualSector)mode.GetVisualSector(sector);
+				vs.UpdateSectorGeometry(false);
+			}
+			
+			// Also reset the sectors that depend on this sector
+			foreach(KeyValuePair<Sector, bool> s in updatesectors)
+			{
+				SectorData sd = mode.GetSectorData(s.Key);
+				sd.Reset();
+			}
+
+			isupdating = false;
+		}
+
+		// This sets up the basic floor and ceiling, as they would be in normal Doom circumstances
+		private void BasicSetup()
+		{
+			//mxd
+			if(sector.FloorSlope.GetLengthSq() > 0 && !float.IsNaN(sector.FloorSlopeOffset / sector.FloorSlope.z)) 
+			{
+				// Sloped plane
+				floor.plane = new Plane(sector.FloorSlope, sector.FloorSlopeOffset);
+			} 
+			else 
+			{
+				// Normal (flat) floor plane
+				floor.plane = new Plane(new Vector3D(0, 0, 1), -sector.FloorHeight);
+			}
+
+			if(sector.CeilSlope.GetLengthSq() > 0 && !float.IsNaN(sector.CeilSlopeOffset / sector.CeilSlope.z)) 
+			{
+				// Sloped plane
+				ceiling.plane = new Plane(sector.CeilSlope, sector.CeilSlopeOffset);
+			} 
+			else 
+			{
+				// Normal (flat) ceiling plane
+				ceiling.plane = new Plane(new Vector3D(0, 0, -1), sector.CeilHeight);
+			}
+			
+			// Fetch ZDoom fields
+			int color = sector.Fields.GetValue("lightcolor", -1);
+			int flight = sector.Fields.GetValue("lightfloor", 0);
+			bool fabs = sector.Fields.GetValue("lightfloorabsolute", false);
+			int clight = sector.Fields.GetValue("lightceiling", 0);
+			bool cabs = sector.Fields.GetValue("lightceilingabsolute", false);
+
+			// Determine colors & light levels
+			PixelColor lightcolor = PixelColor.FromInt(color);
+			if(!fabs) flight = sector.Brightness + flight;
+			if(!cabs) clight = sector.Brightness + clight;
+			PixelColor floorbrightness = PixelColor.FromInt(mode.CalculateBrightness(flight));
+			PixelColor ceilingbrightness = PixelColor.FromInt(mode.CalculateBrightness(clight));
+			PixelColor floorcolor = PixelColor.Modulate(lightcolor, floorbrightness);
+			PixelColor ceilingcolor = PixelColor.Modulate(lightcolor, ceilingbrightness);
+			floor.color = floorcolor.WithAlpha(255).ToInt();
+			floor.brightnessbelow = sector.Brightness;
+			floor.colorbelow = lightcolor.WithAlpha(255);
+			ceiling.color = ceilingcolor.WithAlpha(255).ToInt();
+			ceiling.brightnessbelow = sector.Brightness;
+			ceiling.colorbelow = lightcolor.WithAlpha(255);
+
+			//mxd. Store a copy of initial settings
+			floor.CopyProperties(floorbase);
+			ceiling.CopyProperties(ceilingbase);
+		}
+
+		//mxd
+		public void UpdateForced() 
+		{
+			updated = false;
+			Update();
+		}
+
+		// When no geometry has been changed and no effects have been added or removed,
+		// you can call this again to update existing effects. The effects will update
+		// the existing SectorLevels to match with any changes.
+		public void Update()
+		{
+			if(isupdating || updated) return;
+			isupdating = true;
+			
+			// Set floor/ceiling to their original setup
+			BasicSetup();
+
+			// Update all effects
+			foreach(SectorEffect e in alleffects) e.Update();
+			
+			//mxd. Do complicated light level shenanigans only when there are extrafloors
+			if(lightlevels.Count > 2)
+			{
+				// Sort the levels
+				SectorLevelComparer comparer = new SectorLevelComparer(sector);
+				lightlevels.Sort(0, lightlevels.Count, comparer);
+
+				// Now that we know the levels in this sector (and in the right order)
+				// we can determine the lighting in between and on the levels.
+				SectorLevel stored = ceilingbase;
+
+				//mxd. Special cases...
+				if(lightlevels[lightlevels.Count - 1].disablelighting)
+				{
+					lightlevels[lightlevels.Count - 1].colorbelow = stored.colorbelow;
+					lightlevels[lightlevels.Count - 1].brightnessbelow = stored.brightnessbelow;
+					lightlevels[lightlevels.Count - 1].color = stored.colorbelow.ToInt();
+				}
+
+				//mxd. Cast light properties from top to bottom
+				for(int i = lightlevels.Count - 2; i >= 0; i--)
+				{
+					SectorLevel l = lightlevels[i];
+					SectorLevel pl = lightlevels[i + 1];
+
+					// Glow levels should not affect light transfer
+					if(l.type == SectorLevelType.Glow) continue;
+
+					// Glow levels don't cast light
+					if(pl.type == SectorLevelType.Glow && lightlevels.Count > i + 2) pl = lightlevels[i + 2];
+
+					if(l.lighttype == LightLevelType.TYPE1)
+					{
+						stored = pl;
+					}
+					// Use stored light params when "disablelighting" flag is set
+					else if(l.disablelighting)
+					{
+						l.colorbelow = stored.colorbelow;
+						l.brightnessbelow = stored.brightnessbelow;
+						l.color = stored.color;
+					}
+					else if(l.restrictlighting)
+					{
+						if(!pl.restrictlighting && pl != ceiling) stored = pl;
+						l.color = stored.color;
+
+						// This is the bottom side of extrafloor with "restrict lighting" flag. Make it cast stored light props. 
+						if(l.type == SectorLevelType.Ceiling)
+						{
+							// Special case: 2 intersecting extrafloors with "restrictlighting" flag...
+							if(pl.restrictlighting && pl.type == SectorLevelType.Floor && pl.sector.Index != l.sector.Index)
+							{
+								// Use light and color settings from previous layer
+								l.colorbelow = pl.colorbelow;
+								l.brightnessbelow = pl.brightnessbelow;
+								l.color = pl.colorbelow.ToInt();
+
+								// Also colorize previous layer using next higher level color 
+								if(i + 2 < lightlevels.Count)
+									pl.color = lightlevels[i + 2].colorbelow.ToInt();
+							}
+							else
+							{
+								l.colorbelow = stored.colorbelow;
+								l.brightnessbelow = stored.brightnessbelow;
+							}
+						}
+					}
+					// Bottom TYPE1 border requires special handling...
+					else if(l.lighttype == LightLevelType.TYPE1_BOTTOM)
+					{
+						// Use brightness and color from previous light level when it's between TYPE1 and TYPE1_BOTTOM levels
+						if(pl.type == SectorLevelType.Light && pl.lighttype != LightLevelType.TYPE1)
+						{
+							l.brightnessbelow = pl.brightnessbelow;
+							l.colorbelow = pl.colorbelow;
+						}
+						// Use brightness and color from the light level above TYPE1 level
+						else if(stored.type == SectorLevelType.Light)
+						{
+							l.brightnessbelow = stored.brightnessbelow;
+							l.colorbelow = stored.colorbelow;
+						}
+						// Otherwise light values from the real ceiling are used 
+					}
+					else if(l.lighttype == LightLevelType.UNKNOWN)
+					{
+						// Use stored light level when previous one has "disablelighting" flag
+						// or is the lower boundary of an extrafloor with "restrictlighting" flag
+						SectorLevel src = (pl.disablelighting || (pl.restrictlighting && pl.type == SectorLevelType.Ceiling) ? stored : pl);
+						
+						if((src == l) || (src == ceiling && l == floor && src.LightPropertiesMatch(ceilingbase)))
+						{
+							// Don't change anything when light properties were reset before hitting floor
+							// (otherwise floor UDMF brightness will be lost)
+							continue;
+						}
+						
+						// Transfer color and brightness if previous level has them
+						if(src.colorbelow.a > 0 && src.brightnessbelow != -1)
+						{
+							// Only surface brightness is retained when a glowing flat is used as extrafloor texture
+							if(!l.affectedbyglow)
+							{
+								PixelColor brightness = PixelColor.FromInt(mode.CalculateBrightness(src.brightnessbelow));
+								PixelColor color = PixelColor.Modulate(src.colorbelow, brightness);
+								l.color = color.WithAlpha(255).ToInt();
+							}
+
+							// Transfer brightnessbelow and colorbelow if current level is not extrafloor top
+							if(!(l.extrafloor && l.type == SectorLevelType.Floor))
+							{
+								l.brightnessbelow = src.brightnessbelow;
+								l.colorbelow = src.colorbelow;
+							}
+						}
+
+						// Store bottom extrafloor level if it doesn't have "restrictlighting" or "restrictlighting" flags set
+						if(l.extrafloor && l.type == SectorLevelType.Ceiling && !l.restrictlighting && !l.disablelighting) stored = l;
+					}
+				}
+			}
+
+			//mxd. Apply ceiling glow effect?
+			if(CeilingGlow != null)
+			{
+				if(CeilingGlow.Fullbright)     ceiling.color = PixelColor.INT_WHITE;
+				else if(CeilingGlow.Fullblack) ceiling.color = PixelColor.INT_BLACK;
+			}
+
+			//mxd. Apply floor glow effect?
+			if(FloorGlow != null)
+			{
+				// Update floor color
+				if(FloorGlow.Fullbright)     floor.color = PixelColor.INT_WHITE;
+				else if(FloorGlow.Fullblack) floor.color = PixelColor.INT_BLACK;
+
+				// Update brightness
+				floor.brightnessbelow = (FloorGlow.Fullbright ? 255 : Math.Max(128, floor.brightnessbelow));
+				
+				if(floor.colorbelow.ToInt() == 0)
+				{
+					byte bb = (byte)floor.brightnessbelow;
+					floor.colorbelow = new PixelColor(255, bb, bb, bb);
+				}
+			}
+
+			//mxd
+			floor.affectedbyglow = (FloorGlow != null);
+			ceiling.affectedbyglow = (CeilingGlow != null);
+
+			floorchanged = false;
+			ceilingchanged = false;
+			updated = true;
+			isupdating = false;
+		}
+
+		// This returns the level above the given point
+		public SectorLevel GetLevelAbove(Vector3D pos)
+		{
+			SectorLevel found = null;
+			float dist = float.MaxValue;
+			
+			foreach(SectorLevel l in lightlevels)
+			{
+				float d = l.plane.GetZ(pos) - pos.z;
+				if((d > 0.0f) && (d < dist))
+				{
+					dist = d;
+					found = l;
+				}
+			}
+			
+			return found;
+		}
+
+		//mxd. This returns the level above the given point or the level given point is located on
+		public SectorLevel GetLevelAboveOrAt(Vector3D pos)
+		{
+			SectorLevel found = null;
+			float dist = float.MaxValue;
+
+			foreach(SectorLevel l in lightlevels) 
+			{
+				float d = l.plane.GetZ(pos) - pos.z;
+				if((d >= 0.0f) && (d < dist)) 
+				{
+					dist = d;
+					found = l;
+				}
+			}
+
+			return found;
+		}
+
+		// This returns the level above the given point
+		public SectorLevel GetCeilingAbove(Vector3D pos)
+		{
+			SectorLevel found = null;
+			float dist = float.MaxValue;
+
+			foreach(SectorLevel l in lightlevels)
+			{
+				if(l.type == SectorLevelType.Ceiling)
+				{
+					float d = l.plane.GetZ(pos) - pos.z;
+					if((d > 0.0f) && (d < dist))
+					{
+						dist = d;
+						found = l;
+					}
+				}
+			}
+
+			return found;
+		}
+
+		// This returns the level below the given point
+		public SectorLevel GetLevelBelow(Vector3D pos)
+		{
+			SectorLevel found = null;
+			float dist = float.MaxValue;
+
+			foreach(SectorLevel l in lightlevels)
+			{
+				float d = pos.z - l.plane.GetZ(pos);
+				if((d > 0.0f) && (d < dist))
+				{
+					dist = d;
+					found = l;
+				}
+			}
+
+			return found;
+		}
+
+		// This returns the floor below the given point
+		public SectorLevel GetFloorBelow(Vector3D pos)
+		{
+			SectorLevel found = null;
+			float dist = float.MaxValue;
+
+			foreach(SectorLevel l in lightlevels)
+			{
+				if(l.type == SectorLevelType.Floor)
+				{
+					float d = pos.z - l.plane.GetZ(pos);
+					if((d > 0.0f) && (d < dist))
+					{
+						dist = d;
+						found = l;
+					}
+				}
+			}
+
+			return found;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/VisualModes/SectorEffect.cs b/Source/Plugins/BuilderModes/VisualModes/SectorEffect.cs
new file mode 100644
index 0000000..ccba7e3
--- /dev/null
+++ b/Source/Plugins/BuilderModes/VisualModes/SectorEffect.cs
@@ -0,0 +1,20 @@
+#region === Copyright (c) 2010 Pascal van der Heiden ===
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	internal abstract class SectorEffect
+	{
+		protected readonly SectorData data;
+		
+		// Constructor
+		protected SectorEffect(SectorData data)
+		{
+			this.data = data;
+		}
+
+		// This makes sure we are updated with the source linedef information
+		public abstract void Update();
+	}
+}
diff --git a/Source/Plugins/BuilderModes/VisualModes/SectorLevel.cs b/Source/Plugins/BuilderModes/VisualModes/SectorLevel.cs
new file mode 100644
index 0000000..2151638
--- /dev/null
+++ b/Source/Plugins/BuilderModes/VisualModes/SectorLevel.cs
@@ -0,0 +1,110 @@
+#region === Copyright (c) 2010 Pascal van der Heiden ===
+
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	internal class SectorLevel
+	{
+		// Type of level
+		public SectorLevelType type;
+
+		//mxd. Type of extralight
+		public LightLevelType lighttype = LightLevelType.UNKNOWN;  
+
+		// Sector where this level originates from
+		public Sector sector;
+		
+		// Plane in the sector
+		public Plane plane;
+		
+		// Alpha for translucency (255=opaque)
+		public int alpha;
+		
+		// Color of the plane (includes brightness)
+		// When this is 0, it takes the color from the sector above
+		public int color;
+		
+		// Color and brightness below the plane
+		// When this is 0, it takes the color from the sector above
+		public int brightnessbelow;
+		public PixelColor colorbelow;
+		public bool disablelighting; //mxd
+		public bool restrictlighting; //mxd
+		public bool affectedbyglow; //mxd
+		public bool extrafloor; //mxd
+		public bool splitsides; //mxd
+		
+		// Constructor
+		public SectorLevel(Sector s, SectorLevelType type)
+		{
+			this.type = type;
+			this.sector = s;
+			this.alpha = 255;
+			this.splitsides = true; //mxd
+		}
+		
+		// Copy constructor
+		public SectorLevel(SectorLevel source)
+		{
+			source.CopyProperties(this);
+		}
+
+		// Copy properties
+		public void CopyProperties(SectorLevel target)
+		{
+			target.sector = this.sector;
+			target.type = this.type;
+			target.lighttype = this.lighttype; //mxd
+			target.plane = this.plane;
+			target.alpha = this.alpha;
+			target.color = this.color;
+			target.brightnessbelow = this.brightnessbelow;
+			target.colorbelow = this.colorbelow;
+			target.affectedbyglow = this.affectedbyglow; //mxd
+			target.disablelighting = this.disablelighting; //mxd
+			target.restrictlighting = this.restrictlighting; //mxd
+			target.splitsides = this.splitsides; //mxd
+		}
+
+		//mxd. Compare light properties
+		public bool LightPropertiesMatch(SectorLevel other)
+		{
+			return (this.type == other.type && this.lighttype == other.lighttype && this.alpha == other.alpha && this.splitsides == other.splitsides
+				&& this.color == other.color && this.brightnessbelow == other.brightnessbelow && this.colorbelow.ToInt() == other.colorbelow.ToInt()
+				&& this.disablelighting == other.disablelighting && this.restrictlighting == other.restrictlighting);
+		}
+
+#if DEBUG
+		//mxd. Handy when debugging
+		public override string ToString()
+		{
+			switch(type)
+			{
+				case SectorLevelType.Ceiling: return (extrafloor ? "ExtraCeiling" : "Ceiling");
+				case SectorLevelType.Floor: return (extrafloor ? "ExtraFloor" : "Floor");
+				case SectorLevelType.Glow: return "Glow Level";
+				case SectorLevelType.Light: return "Light Level (" + GetLightType() + ")";
+				default: return "Unknown Level Type!!!";
+			}
+		}
+
+		//mxd. Handy when debugging
+		private string GetLightType()
+		{
+			switch(lighttype)
+			{
+				case LightLevelType.TYPE0: return "Type 0";
+				case LightLevelType.TYPE1: return "Type 1";
+				case LightLevelType.TYPE1_BOTTOM: return "Type 1 (bottom)";
+				case LightLevelType.TYPE2: return "Type 2";
+				default: return "Unknown";
+			}
+		}
+#endif
+	}
+}
diff --git a/Source/Plugins/BuilderModes/VisualModes/SectorLevelComparer.cs b/Source/Plugins/BuilderModes/VisualModes/SectorLevelComparer.cs
new file mode 100644
index 0000000..5521316
--- /dev/null
+++ b/Source/Plugins/BuilderModes/VisualModes/SectorLevelComparer.cs
@@ -0,0 +1,53 @@
+#region === Copyright (c) 2010 Pascal van der Heiden ===
+
+using System;
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Map;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	internal class SectorLevelComparer : IComparer<SectorLevel>
+	{
+		// Center of sector to use for plane comparison
+		public Vector2D center;
+		
+		// Constructor
+		public SectorLevelComparer(Sector s)
+		{
+			this.center = new Vector2D(s.BBox.Left + s.BBox.Width / 2, s.BBox.Top + s.BBox.Height / 2);
+		}
+
+		// Comparer. -1 = x is less than y.
+		public int Compare(SectorLevel x, SectorLevel y)
+		{
+			if(x == y) return 0; //mxd
+			float diff = (float)Math.Round(x.plane.GetZ(center) - y.plane.GetZ(center), 3);
+			if(diff == 0)
+			{
+				//mxd. Push extrafloors above extraceilings
+				if(x.extrafloor && y.extrafloor && x.lighttype == LightLevelType.UNKNOWN && y.lighttype == LightLevelType.UNKNOWN)
+				{
+					if(x.type == SectorLevelType.Floor) return (y.type == SectorLevelType.Ceiling ? 1 : 0);
+					return (y.type == SectorLevelType.Floor ? -1 : 0);
+				}
+				
+				bool xislight = (x.type == SectorLevelType.Light || x.type == SectorLevelType.Glow);
+				bool yislight = (y.type == SectorLevelType.Light || y.type == SectorLevelType.Glow);
+				
+				//mxd. Push light levels above floor and ceiling levels when height is the same
+				if(!xislight) return (yislight ? -1 : 0);
+				if(!yislight) return 1;
+
+				//mxd. Push light levels without lighttype (those should be lower levels of type 1 Transfer Brightness effect) above other ones
+				if(x.lighttype == y.lighttype) return 0; //TODO: how this should be handled?
+				if(x.lighttype == LightLevelType.TYPE1_BOTTOM) return 1;
+				return -1;
+			}
+
+			return Math.Sign(diff);
+		}
+	}
+}
diff --git a/Source/Plugins/BuilderModes/VisualModes/SectorLevelType.cs b/Source/Plugins/BuilderModes/VisualModes/SectorLevelType.cs
new file mode 100644
index 0000000..3c0fff4
--- /dev/null
+++ b/Source/Plugins/BuilderModes/VisualModes/SectorLevelType.cs
@@ -0,0 +1,24 @@
+#region === Copyright (c) 2010 Pascal van der Heiden ===
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	internal enum SectorLevelType
+	{
+		Light,
+		Floor,
+		Ceiling,
+		Glow
+	}
+
+	//mxd
+	internal enum LightLevelType
+	{
+		TYPE1_BOTTOM = -2,
+		UNKNOWN = -1,
+		TYPE0 = 0,
+		TYPE1 = 1,
+		TYPE2 = 2,
+	}
+}
diff --git a/Source/Plugins/BuilderModes/VisualModes/TexturePlane.cs b/Source/Plugins/BuilderModes/VisualModes/TexturePlane.cs
new file mode 100644
index 0000000..fbed795
--- /dev/null
+++ b/Source/Plugins/BuilderModes/VisualModes/TexturePlane.cs
@@ -0,0 +1,49 @@
+#region === Copyright (c) 2010 Pascal van der Heiden ===
+
+using CodeImp.DoomBuilder.Geometry;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	internal struct TexturePlane
+	{
+		// Geometry coordinates (left-top, right-top and right-bottom)
+		public Vector3D vlt;
+		public Vector3D vrt;
+		public Vector3D vrb;
+
+		// Texture coordinates on the points above
+		public Vector2D tlt;
+		public Vector2D trt;
+		public Vector2D trb;
+		
+		// This returns interpolated texture coordinates for the point p on the plane defined by vlt, vrt and vrb
+		public Vector2D GetTextureCoordsAt(Vector3D p)
+		{
+			// Delta vectors
+			Vector3D v31 = vrb - vlt;
+			Vector3D v21 = vrt - vlt;
+			Vector3D vp1 = p - vlt;
+			
+			// Compute dot products
+			float d00 = Vector3D.DotProduct(v31, v31);
+			float d01 = Vector3D.DotProduct(v31, v21);
+			float d02 = Vector3D.DotProduct(v31, vp1);
+			float d11 = Vector3D.DotProduct(v21, v21);
+			float d12 = Vector3D.DotProduct(v21, vp1);
+
+			// Compute barycentric coordinates
+			float invd = 1.0f / (d00 * d11 - d01 * d01);
+			float u = (d11 * d02 - d01 * d12) * invd;
+			float v = (d00 * d12 - d01 * d02) * invd;
+
+			// Delta texture coordinates
+			Vector2D t21 = trt - tlt;
+			Vector2D t31 = trb - tlt;
+
+			// Lerp
+			return tlt + t31 * u + t21 * v;
+		}
+	}
+}
diff --git a/Source/Plugins/BuilderModes/VisualModes/ThingData.cs b/Source/Plugins/BuilderModes/VisualModes/ThingData.cs
new file mode 100644
index 0000000..a1723ec
--- /dev/null
+++ b/Source/Plugins/BuilderModes/VisualModes/ThingData.cs
@@ -0,0 +1,58 @@
+#region === Copyright (c) 2010 Pascal van der Heiden ===
+
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Map;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	internal class ThingData
+	{
+		#region ================== Variables
+		
+		// VisualMode
+		private BaseVisualMode mode;
+		
+		// Thing for which this data is
+		private Thing thing;
+		
+		// Sectors that must be updated when this thing is changed
+		// The boolean value is the 'includeneighbours' of the UpdateSectorGeometry function which
+		// indicates if the sidedefs of neighbouring sectors should also be rebuilt.
+		private Dictionary<Sector, bool> updatesectors;
+		
+		#endregion
+		
+		#region ================== Properties
+		
+		public Thing Thing { get { return thing; } }
+		public BaseVisualMode Mode { get { return mode; } }
+		public Dictionary<Sector, bool> UpdateAlso { get { return updatesectors; } }
+		
+		#endregion
+		
+		#region ================== Constructor / Destructor
+		
+		// Constructor
+		public ThingData(BaseVisualMode mode, Thing t)
+		{
+			// Initialize
+			this.mode = mode;
+			this.thing = t;
+			this.updatesectors = new Dictionary<Sector, bool>(2);
+		}
+		
+		#endregion
+		
+		#region ================== Public Methods
+		
+		// This adds a sector for updating
+		public void AddUpdateSector(Sector s, bool includeneighbours)
+		{
+			updatesectors[s] = includeneighbours;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/VisualModes/VertexData.cs b/Source/Plugins/BuilderModes/VisualModes/VertexData.cs
new file mode 100644
index 0000000..a54fceb
--- /dev/null
+++ b/Source/Plugins/BuilderModes/VisualModes/VertexData.cs
@@ -0,0 +1,54 @@
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Map;
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	internal class VertexData
+	{
+		#region ================== Variables
+
+		// VisualMode
+		private BaseVisualMode mode;
+
+		// Vertex for which this data is
+		private Vertex vertex;
+
+		// Sectors that must be updated when this vertex is changed
+		// The boolean value is the 'includeneighbours' of the UpdateSectorGeometry function which
+		// indicates if the sidedefs of neighbouring sectors should also be rebuilt.
+		private Dictionary<Sector, bool> updatesectors;
+
+		#endregion
+
+		#region ================== Properties
+
+		public Vertex Vertex { get { return vertex; } }
+		public BaseVisualMode Mode { get { return mode; } }
+		public Dictionary<Sector, bool> UpdateAlso { get { return updatesectors; } }
+		
+		#endregion
+		
+		#region ================== Constructor / Destructor
+		
+		// Constructor
+		public VertexData(BaseVisualMode mode, Vertex v)
+		{
+			// Initialize
+			this.mode = mode;
+			this.vertex = v;
+			this.updatesectors = new Dictionary<Sector, bool>(2);
+		}
+		
+		#endregion
+		
+		#region ================== Public Methods
+		
+		// This adds a sector for updating
+		public void AddUpdateSector(Sector s, bool includeneighbours)
+		{
+			updatesectors[s] = includeneighbours;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/VisualModes/VisualActionResult.cs b/Source/Plugins/BuilderModes/VisualModes/VisualActionResult.cs
new file mode 100644
index 0000000..9e9a2f1
--- /dev/null
+++ b/Source/Plugins/BuilderModes/VisualModes/VisualActionResult.cs
@@ -0,0 +1,30 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	public struct VisualActionResult
+	{
+		/// <summary>
+		/// Status description to show after action hasbeen performed. Set to null to show no message.
+		/// </summary>
+		public string displaystatus;
+	}
+}
diff --git a/Source/Plugins/BuilderModes/VisualModes/VisualCeiling.cs b/Source/Plugins/BuilderModes/VisualModes/VisualCeiling.cs
new file mode 100644
index 0000000..ab16a83
--- /dev/null
+++ b/Source/Plugins/BuilderModes/VisualModes/VisualCeiling.cs
@@ -0,0 +1,605 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Drawing;
+using System.Globalization;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Types;
+using CodeImp.DoomBuilder.VisualModes;
+using CodeImp.DoomBuilder.Data;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	internal sealed class VisualCeiling : BaseVisualGeometrySector
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		public bool innerSide; //mxd
+
+		#endregion
+
+		#region ================== Properties
+
+		#endregion
+
+		#region ================== Constructor / Setup
+
+		// Constructor
+		public VisualCeiling(BaseVisualMode mode, VisualSector vs) : base(mode, vs)
+		{
+			//mxd
+			geometrytype = VisualGeometryType.CEILING;
+			partname = "ceiling";
+
+			//mxd
+			if(mode.UseSelectionFromClassicMode && vs != null && vs.Sector.Selected && (General.Map.ViewMode == ViewMode.CeilingTextures || General.Map.ViewMode == ViewMode.Normal)) 
+			{
+				this.selected = true;
+				mode.AddSelectedObject(this);
+			}
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// This builds the geometry. Returns false when no geometry created.
+		public override bool Setup(SectorLevel level, Effect3DFloor extrafloor) 
+		{
+			return Setup(level, extrafloor, innerSide);
+		}
+
+		//mxd
+		public bool Setup(SectorLevel level, Effect3DFloor extrafloor, bool innerSide)
+		{
+			Sector s = level.sector;
+			Vector2D texscale;
+			this.innerSide = innerSide; //mxd
+			
+			base.Setup(level, extrafloor);
+			
+			// Fetch ZDoom fields
+			float rotate = Angle2D.DegToRad(s.Fields.GetValue("rotationceiling", 0.0f));
+			Vector2D offset = new Vector2D(s.Fields.GetValue("xpanningceiling", 0.0f),
+										   s.Fields.GetValue("ypanningceiling", 0.0f));
+			Vector2D scale = new Vector2D(s.Fields.GetValue("xscaleceiling", 1.0f),
+										  s.Fields.GetValue("yscaleceiling", 1.0f));
+			
+			//Load ceiling texture
+			if(s.LongCeilTexture != MapSet.EmptyLongName) 
+			{
+				base.Texture = General.Map.Data.GetFlatImage(s.LongCeilTexture);
+				if(base.Texture == null || base.Texture is UnknownImage) 
+				{
+					base.Texture = General.Map.Data.UnknownTexture3D;
+					setuponloadedtexture = s.LongCeilTexture;
+				} 
+				else 
+				{
+					if(!base.Texture.IsImageLoaded) setuponloadedtexture = s.LongCeilTexture;
+				}
+			} 
+			else 
+			{
+				// Use missing texture
+				base.Texture = General.Map.Data.MissingTexture3D;
+				setuponloadedtexture = 0;
+			}
+
+			// Determine texture scale
+			if(base.Texture.IsImageLoaded)
+				texscale = new Vector2D(1.0f / base.Texture.ScaledWidth, 1.0f / base.Texture.ScaledHeight);
+			else
+				texscale = new Vector2D(1.0f / 64.0f, 1.0f / 64.0f);
+
+			//mxd. Sky is always bright
+			int color;
+			if(s.CeilTexture == General.Map.Config.SkyFlatName)
+			{
+				color = -1; // That's white. With alpha. Not very impressive, eh?
+				fogfactor = 0; // No fog
+			}
+			else
+			{
+				color = PixelColor.FromInt(level.color).WithAlpha((byte)General.Clamp(level.alpha, 0, 255)).ToInt();
+
+				//mxd. Top extrafloor level should calculate fogdensity
+				//from the brightness of the level above it
+				int targetbrightness;
+				if(extrafloor != null && !extrafloor.VavoomType && !level.disablelighting)
+				{
+					targetbrightness = 0;
+					SectorData sd = mode.GetSectorData(this.Sector.Sector);
+					for(int i = 0; i < sd.LightLevels.Count - 1; i++)
+					{
+						if(sd.LightLevels[i] == level)
+						{
+							targetbrightness = sd.LightLevels[i + 1].brightnessbelow;
+							break;
+						}
+					}
+				}
+				else
+				{
+					targetbrightness = level.brightnessbelow;
+				}
+
+				fogfactor = CalculateFogDensity(targetbrightness);
+			}
+
+			// Make vertices
+			ReadOnlyCollection<Vector2D> triverts = base.Sector.Sector.Triangles.Vertices;
+			WorldVertex[] verts = new WorldVertex[triverts.Count];
+			for(int i = 0; i < triverts.Count; i++)
+			{
+				// Color shading
+				verts[i].c = color; //mxd
+				
+				// Vertex coordinates
+				verts[i].x = triverts[i].x;
+				verts[i].y = triverts[i].y;
+				verts[i].z = level.plane.GetZ(triverts[i]);
+
+				// Texture coordinates
+				Vector2D pos = triverts[i];
+				pos = pos.GetRotated(rotate);
+				pos.y = -pos.y;
+				pos = (pos + offset) * scale * texscale;
+				verts[i].u = pos.x;
+				verts[i].v = pos.y;
+			}
+			
+			// The sector triangulation created clockwise triangles that
+			// are right up for the floor. For the ceiling we must flip
+			// the triangles upside down.
+			if(extrafloor == null || extrafloor.VavoomType || innerSide)
+				SwapTriangleVertices(verts);
+
+			// Determine render pass
+			if(extrafloor != null)
+			{
+				if(extrafloor.Sloped3dFloor) //mxd
+					this.RenderPass = RenderPass.Mask;
+				else if(extrafloor.RenderAdditive) //mxd
+					this.RenderPass = RenderPass.Additive;
+				else if(level.alpha < 255)
+					this.RenderPass = RenderPass.Alpha;
+				else
+					this.RenderPass = RenderPass.Mask;
+			}
+			else
+			{
+				this.RenderPass = RenderPass.Solid;
+			}
+			
+			// Apply vertices
+			base.SetVertices(verts);
+			return (verts.Length > 0);
+		}
+		
+		#endregion
+
+		#region ================== Methods
+
+		// Return texture coordinates
+		protected override Point GetTextureOffset()
+		{
+			return new Point { X = (int)Sector.Sector.Fields.GetValue("xpanningceiling", 0.0f), 
+							   Y = (int)Sector.Sector.Fields.GetValue("ypanningceiling", 0.0f) };
+		}
+
+		// Move texture coordinates
+		protected override void MoveTextureOffset(Point xy)
+		{
+			//mxd
+			Sector s = GetControlSector();
+			s.Fields.BeforeFieldsChange();
+			float nx = (s.Fields.GetValue("xpanningceiling", 0.0f) + xy.X) % (Texture.ScaledWidth / s.Fields.GetValue("xscaleceiling", 1.0f));
+			float ny = (s.Fields.GetValue("ypanningceiling", 0.0f) + xy.Y) % (Texture.ScaledHeight / s.Fields.GetValue("yscaleceiling", 1.0f));
+			s.Fields["xpanningceiling"] = new UniValue(UniversalType.Float, nx);
+			s.Fields["ypanningceiling"] = new UniValue(UniversalType.Float, ny);
+			s.UpdateNeeded = true;
+
+			mode.SetActionResult("Changed ceiling texture offsets to " + nx + ", " + ny + ".");
+		}
+
+		//mxd. Texture scale change
+		protected override void ChangeTextureScale(int incrementX, int incrementY) 
+		{
+			Sector s = GetControlSector();
+			float scaleX = s.Fields.GetValue("xscaleceiling", 1.0f);
+			float scaleY = s.Fields.GetValue("yscaleceiling", 1.0f);
+
+			s.Fields.BeforeFieldsChange();
+
+			if(incrementX != 0) 
+			{
+				float pix = (int)Math.Round(Texture.Width * scaleX) - incrementX;
+				float newscaleX = (float)Math.Round(pix / Texture.Width, 3);
+				scaleX = (newscaleX == 0 ? scaleX * -1 : newscaleX);
+				UniFields.SetFloat(s.Fields, "xscaleceiling", scaleX, 1.0f);
+			}
+
+			if(incrementY != 0) 
+			{
+				float pix = (int)Math.Round(Texture.Height * scaleY) - incrementY;
+				float newscaleY = (float)Math.Round(pix / Texture.Height, 3);
+				scaleY = (newscaleY == 0 ? scaleY * -1 : newscaleY);
+				UniFields.SetFloat(s.Fields, "yscaleceiling", scaleY, 1.0f);
+			}
+
+			//update geometry
+			OnTextureChanged();
+
+			s.UpdateNeeded = true;
+			s.UpdateCache();
+			if(s.Index != Sector.Sector.Index) 
+			{
+				Sector.Sector.UpdateNeeded = true;
+				Sector.Sector.UpdateCache();
+			}
+
+			mode.SetActionResult("Ceiling scale changed to " + scaleX.ToString("F03", CultureInfo.InvariantCulture) + ", " + scaleY.ToString("F03", CultureInfo.InvariantCulture) + " (" + (int)Math.Round(Texture.Width / scaleX) + " x " + (int)Math.Round(Texture.Height / scaleY) + ").");
+		}
+
+		//mxd
+		public override void OnResetTextureOffset() 
+		{
+			ClearFields(new[] { "xpanningceiling", "ypanningceiling" }, "Reset texture offsets", "Texture offsets reset.");
+		}
+
+		//mxd
+		public override void OnResetLocalTextureOffset() 
+		{
+			ClearFields(new[] { "xpanningceiling", "ypanningceiling", "xscaleceiling", "yscaleceiling", "rotationceiling", "lightceiling", "lightceilingabsolute" },
+				"Reset texture offsets, scale, rotation and brightness", "Texture offsets, scale, rotation and brightness reset.");
+		}
+
+		// Paste texture
+		public override void OnPasteTexture()
+		{
+			if(BuilderPlug.Me.CopiedFlat != null)
+			{
+				mode.CreateUndo("Paste ceiling '" + BuilderPlug.Me.CopiedFlat + "'");
+				mode.SetActionResult("Pasted flat '" + BuilderPlug.Me.CopiedFlat + "' on ceiling.");
+
+				//mxd. Glow effect may require SectorData and geometry update
+				bool prevtextureglows = General.Map.Data.GlowingFlats.ContainsKey(Sector.Sector.LongCeilTexture);
+
+				SetTexture(BuilderPlug.Me.CopiedFlat);
+
+				//mxd. Glow effect may require SectorData and geometry update
+				if(prevtextureglows && !General.Map.Data.GlowingFlats.ContainsKey(Sector.Sector.LongCeilTexture))
+				{
+					SectorData sd = mode.GetSectorData(level.sector);
+					sd.UpdateForced();
+
+					if(mode.VisualSectorExists(level.sector))
+					{
+						BaseVisualSector vs = (BaseVisualSector)mode.GetVisualSector(level.sector);
+						vs.UpdateSectorGeometry(false);
+					}
+				}
+
+				//mxd. 3D floors may need updating...
+				OnTextureChanged();
+			}
+		}
+
+		// Call to change the height
+		public override void OnChangeTargetHeight(int amount)
+		{
+			// Only do this when not done yet in this call
+			// Because we may be able to select the same 3D floor multiple times through multiple sectors
+			SectorData sd = mode.GetSectorData(level.sector);
+			if(!sd.CeilingChanged)
+			{
+				sd.CeilingChanged = true;
+				base.OnChangeTargetHeight(amount);
+			}
+		}
+
+		// This changes the height
+		protected override void ChangeHeight(int amount)
+		{
+			mode.CreateUndo("Change ceiling height", UndoGroup.CeilingHeightChange, level.sector.FixedIndex);
+			level.sector.CeilHeight += amount;
+
+			if(General.Map.UDMF)
+			{
+				//mxd. Modify vertex offsets?
+				if(level.sector.Sidedefs.Count == 3)
+				{
+					ChangeVertexHeight(amount);
+				}
+
+				//mxd. Modify slope offset?
+				if(level.sector.CeilSlope.GetLengthSq() > 0) 
+				{
+					Vector3D center = new Vector3D(level.sector.BBox.X + level.sector.BBox.Width / 2,
+												   level.sector.BBox.Y + level.sector.BBox.Height / 2,
+												   level.sector.CeilHeight);
+					
+					Plane p = new Plane(center,
+										level.sector.CeilSlope.GetAngleXY() - Angle2D.PIHALF,
+										level.sector.CeilSlope.GetAngleZ(),
+										false);
+
+					level.sector.CeilSlopeOffset = p.Offset;
+				}
+			}
+
+			mode.SetActionResult("Changed ceiling height to " + level.sector.CeilHeight + ".");
+		}
+
+		//mxd
+		private void ChangeVertexHeight(int amount) 
+		{
+			List<Vertex> verts = new List<Vertex>(3);
+
+			//do this only if all 3 verts have offsets
+			foreach(Sidedef side in level.sector.Sidedefs) 
+			{
+				if(float.IsNaN(side.Line.Start.ZCeiling) || float.IsNaN(side.Line.End.ZCeiling)) return;
+				if(!verts.Contains(side.Line.Start)) verts.Add(side.Line.Start);
+				if(!verts.Contains(side.Line.End)) verts.Add(side.Line.End);
+			}
+
+			foreach(Vertex v in verts) 
+				mode.GetVisualVertex(v, false).OnChangeTargetHeight(amount);
+		}
+
+		//mxd. Sector brightness change
+		public override void OnChangeTargetBrightness(bool up) 
+		{
+			if(level != null && level.sector != Sector.Sector) 
+			{
+				int index = -1;
+				for(int i = 0; i < Sector.ExtraCeilings.Count; i++) 
+				{
+					if(Sector.ExtraCeilings[i] == this) 
+					{
+						index = i + 1;
+						break;
+					}
+				}
+
+				if(index > -1 && index < Sector.ExtraCeilings.Count)
+					((BaseVisualSector)mode.GetVisualSector(Sector.ExtraCeilings[index].level.sector)).Floor.OnChangeTargetBrightness(up);
+				else
+					base.OnChangeTargetBrightness(up);
+			} 
+			else 
+			{
+				//if a map is not in UDMF format, or this ceiling is part of 3D-floor...
+				if(!General.Map.UDMF || (level != null && Sector.Sector != level.sector)) 
+				{
+					base.OnChangeTargetBrightness(up);
+					return;
+				}
+
+				int light = Sector.Sector.Fields.GetValue("lightceiling", 0);
+				bool absolute = Sector.Sector.Fields.GetValue("lightceilingabsolute", false);
+				int newLight;
+
+				if(up)
+					newLight = General.Map.Config.BrightnessLevels.GetNextHigher(light, absolute);
+				else
+					newLight = General.Map.Config.BrightnessLevels.GetNextLower(light, absolute);
+
+				if(newLight == light) return;
+
+				//create undo
+				mode.CreateUndo("Change ceiling brightness", UndoGroup.SurfaceBrightnessChange, Sector.Sector.FixedIndex);
+				Sector.Sector.Fields.BeforeFieldsChange();
+
+				//apply changes
+				UniFields.SetInteger(Sector.Sector.Fields, "lightceiling", newLight, (absolute ? int.MinValue : 0));
+				mode.SetActionResult("Changed ceiling brightness to " + newLight + ".");
+				Sector.Sector.UpdateNeeded = true;
+				Sector.Sector.UpdateCache();
+
+				//rebuild sector
+				Sector.UpdateSectorGeometry(false);
+			}
+		}
+		
+		// This performs a fast test in object picking
+		public override bool PickFastReject(Vector3D from, Vector3D to, Vector3D dir)
+		{
+			// Check if our ray starts at the correct side of the plane
+			if((innerSide && level.plane.Distance(from) < 0.0f) || (!innerSide && level.plane.Distance(from) > 0.0f)) //mxd
+			//if(level.plane.Distance(from) > 0.0f)
+			{
+				// Calculate the intersection
+				if(level.plane.GetIntersection(from, to, ref pickrayu))
+				{
+					if(pickrayu > 0.0f)
+					{
+						pickintersect = from + (to - from) * pickrayu;
+
+						// Intersection point within bbox?
+						RectangleF bbox = Sector.Sector.BBox;
+						return ((pickintersect.x >= bbox.Left) && (pickintersect.x <= bbox.Right) &&
+								(pickintersect.y >= bbox.Top) && (pickintersect.y <= bbox.Bottom));
+					}
+				}
+			}
+
+			return false;
+		}
+		
+		// This performs an accurate test for object picking
+		public override bool PickAccurate(Vector3D from, Vector3D to, Vector3D dir, ref float u_ray)
+		{
+			u_ray = pickrayu;
+			
+			// Check on which side of the nearest sidedef we are
+			Sidedef sd = MapSet.NearestSidedef(Sector.Sector.Sidedefs, pickintersect);
+			float side = sd.Line.SideOfLine(pickintersect);
+			return (((side <= 0.0f) && sd.IsFront) || ((side > 0.0f) && !sd.IsFront));
+		}
+
+		// Return texture name
+		public override string GetTextureName()
+		{
+			return level.sector.CeilTexture;
+		}
+
+		// This changes the texture
+		protected override void SetTexture(string texturename)
+		{
+			level.sector.SetCeilTexture(texturename);
+			General.Map.Data.UpdateUsedTextures();
+		}
+
+		//mxd
+		public override void SelectNeighbours(bool select, bool withSameTexture, bool withSameHeight) 
+		{
+			if(!withSameTexture && !withSameHeight) return;
+
+			if(select && !selected)
+			{
+				selected = true;
+				mode.AddSelectedObject(this);
+			}
+			else if(!select && selected) 
+			{
+				selected = false;
+				mode.RemoveSelectedObject(this);
+			}
+
+			List<Sector> neighbours = new List<Sector>();
+			bool regularorvavoom = extrafloor == null || (extrafloor != null && extrafloor.VavoomType);
+
+			//collect neighbour sectors
+			foreach(Sidedef side in Sector.Sector.Sidedefs)
+			{
+				if(side.Other != null && side.Other.Sector != Sector.Sector && !neighbours.Contains(side.Other.Sector)) 
+				{
+					BaseVisualSector vs = mode.GetVisualSector(side.Other.Sector) as BaseVisualSector;
+					if(vs == null) continue;
+
+					// When current ceiling is part of a 3d floor, it looks like a floor, so we need to select adjacent floors
+					if(level.sector != Sector.Sector && !regularorvavoom)
+					{
+						if((withSameTexture && side.Other.Sector.LongFloorTexture == level.sector.LongCeilTexture) ||
+							(withSameHeight && side.Other.Sector.FloorHeight == level.sector.CeilHeight)) 
+						{
+							neighbours.Add(side.Other.Sector);
+
+							//(de)select regular visual floor?
+							if(select != vs.Floor.Selected) 
+								vs.Floor.SelectNeighbours(select, withSameTexture, withSameHeight);
+						}
+					} 
+					else // Regular ceiling or vavoom-type extra ceiling
+					{
+						// (De)select adjacent ceilings
+						if((withSameTexture && side.Other.Sector.LongCeilTexture == level.sector.LongCeilTexture) ||
+							(withSameHeight && side.Other.Sector.CeilHeight == level.sector.CeilHeight)) 
+						{
+							neighbours.Add(side.Other.Sector);
+
+							//(de)select regular visual ceiling?
+							if(select != vs.Ceiling.Selected) 
+								vs.Ceiling.SelectNeighbours(select, withSameTexture, withSameHeight);
+						}
+					}
+
+					// (De)select adjacent extra ceilings
+					foreach(VisualCeiling ec in vs.ExtraCeilings)
+					{
+						if(select == ec.Selected || ec.extrafloor.VavoomType != regularorvavoom) continue;
+						if((withSameTexture && level.sector.LongCeilTexture == ec.level.sector.LongCeilTexture) ||
+							(withSameHeight && level.sector.CeilHeight == ec.level.sector.CeilHeight)) 
+						{
+							ec.SelectNeighbours(select, withSameTexture, withSameHeight);
+						}
+					}
+
+					// (De)select adjacent extra floors
+					foreach(VisualFloor ef in vs.ExtraFloors)
+					{
+						if(select == ef.Selected || ef.ExtraFloor.VavoomType == regularorvavoom) continue;
+						if((withSameTexture && level.sector.LongCeilTexture == ef.Level.sector.LongFloorTexture) ||
+							(withSameHeight && level.sector.CeilHeight == ef.Level.sector.FloorHeight)) 
+						{
+							ef.SelectNeighbours(select, withSameTexture, withSameHeight);
+						}
+					}
+				}
+			}
+		}
+
+		//mxd
+		public void AlignTexture(bool alignx, bool aligny) 
+		{
+			if(!General.Map.UDMF) return;
+
+			//is is a surface with line slope?
+			float slopeAngle = level.plane.Normal.GetAngleZ() - Angle2D.PIHALF;
+
+			if(slopeAngle == 0) //it's a horizontal plane
+			{
+				AlignTextureToClosestLine(alignx, aligny);
+			} 
+			else //it can be a surface with line slope
+			{ 
+				Linedef slopeSource = null;
+				bool isFront = false;
+
+				foreach(Sidedef side in Sector.Sector.Sidedefs) 
+				{
+					if(side.Line.Action == 181) 
+					{
+						if(side.Line.Args[1] == 1 && side.Line.Front != null && side.Line.Front == side) 
+						{
+							slopeSource = side.Line;
+							isFront = true;
+							break;
+						}
+
+						if(side.Line.Args[1] == 2 && side.Line.Back != null && side.Line.Back == side) 
+						{
+							slopeSource = side.Line;
+							break;
+						}
+					}
+				}
+
+				if(slopeSource != null && slopeSource.Front != null && slopeSource.Front.Sector != null && slopeSource.Back != null && slopeSource.Back.Sector != null)
+					AlignTextureToSlopeLine(slopeSource, slopeAngle, isFront, alignx, aligny);
+				else
+					AlignTextureToClosestLine(alignx, aligny);
+			}
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/VisualModes/VisualFloor.cs b/Source/Plugins/BuilderModes/VisualModes/VisualFloor.cs
new file mode 100644
index 0000000..c4c64fe
--- /dev/null
+++ b/Source/Plugins/BuilderModes/VisualModes/VisualFloor.cs
@@ -0,0 +1,570 @@
+	
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Drawing;
+using System.Globalization;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Types;
+using CodeImp.DoomBuilder.VisualModes;
+using CodeImp.DoomBuilder.Data;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	internal sealed class VisualFloor : BaseVisualGeometrySector
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		private bool innerSide; //mxd
+
+		#endregion
+
+		#region ================== Properties
+
+		#endregion
+
+		#region ================== Constructor / Setup
+
+		// Constructor
+		public VisualFloor(BaseVisualMode mode, VisualSector vs) : base(mode, vs)
+		{
+			//mxd
+			geometrytype = VisualGeometryType.FLOOR;
+			partname = "floor";
+
+			//mxd
+			if(mode.UseSelectionFromClassicMode && vs != null && vs.Sector.Selected 
+				&& (General.Map.ViewMode == ViewMode.FloorTextures || General.Map.ViewMode == ViewMode.Normal)) 
+			{
+				this.selected = true;
+				mode.AddSelectedObject(this);
+			}
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// This builds the geometry. Returns false when no geometry created.
+		public override bool Setup(SectorLevel level, Effect3DFloor extrafloor) 
+		{
+			return Setup(level, extrafloor, innerSide);
+		}
+
+		//mxd
+		public bool Setup(SectorLevel level, Effect3DFloor extrafloor, bool innerSide)
+		{
+			Sector s = level.sector;
+			Vector2D texscale;
+			this.innerSide = innerSide;
+			
+			base.Setup(level, extrafloor);
+			
+			// Fetch ZDoom fields
+			float rotate = Angle2D.DegToRad(s.Fields.GetValue("rotationfloor", 0.0f));
+			Vector2D offset = new Vector2D(s.Fields.GetValue("xpanningfloor", 0.0f),
+										   s.Fields.GetValue("ypanningfloor", 0.0f));
+			Vector2D scale = new Vector2D(s.Fields.GetValue("xscalefloor", 1.0f),
+										  s.Fields.GetValue("yscalefloor", 1.0f));
+			
+			//Load floor texture
+			if(s.LongFloorTexture != MapSet.EmptyLongName)
+			{
+				base.Texture = General.Map.Data.GetFlatImage(s.LongFloorTexture);
+				if(base.Texture == null || base.Texture is UnknownImage)
+				{
+					base.Texture = General.Map.Data.UnknownTexture3D;
+					setuponloadedtexture = s.LongFloorTexture;
+				}
+				else
+				{
+					if(!base.Texture.IsImageLoaded)
+						setuponloadedtexture = s.LongFloorTexture;
+				}
+			}
+			else
+			{
+				// Use missing texture
+				base.Texture = General.Map.Data.MissingTexture3D;
+				setuponloadedtexture = 0;
+			}
+
+			// Determine texture scale
+			if(base.Texture.IsImageLoaded)
+				texscale = new Vector2D(1.0f / base.Texture.ScaledWidth, 1.0f / base.Texture.ScaledHeight);
+			else
+				texscale = new Vector2D(1.0f / 64.0f, 1.0f / 64.0f);
+
+			//mxd. Sky is always bright
+			int color;
+			if(s.FloorTexture == General.Map.Config.SkyFlatName)
+			{
+				color = -1; // That's white. With alpha. Not very impressive, eh?
+				fogfactor = 0; // No fog
+			}
+			else
+			{
+				color = PixelColor.FromInt(level.color).WithAlpha((byte)General.Clamp(level.alpha, 0, 255)).ToInt();
+
+				//mxd. Top extrafloor level should calculate fogdensity
+				//from the brightness of the level above it
+				int targetbrightness;
+				if(extrafloor != null && extrafloor.VavoomType && !level.disablelighting)
+				{
+					targetbrightness = 0;
+					SectorData sd = mode.GetSectorData(this.Sector.Sector);
+					for(int i = 0; i < sd.LightLevels.Count - 1; i++)
+					{
+						if(sd.LightLevels[i] == level)
+						{
+							targetbrightness = sd.LightLevels[i + 1].brightnessbelow;
+							break;
+						}
+					}
+				}
+				else
+				{
+					targetbrightness = level.brightnessbelow;
+				}
+
+				fogfactor = CalculateFogDensity(targetbrightness);
+			}
+
+			// Make vertices
+			ReadOnlyCollection<Vector2D> triverts = base.Sector.Sector.Triangles.Vertices;
+			WorldVertex[] verts = new WorldVertex[triverts.Count];
+			for(int i = 0; i < triverts.Count; i++)
+			{
+				// Color shading
+				verts[i].c = color; //mxd
+				
+				// Vertex coordinates
+				verts[i].x = triverts[i].x;
+				verts[i].y = triverts[i].y;
+				verts[i].z = level.plane.GetZ(triverts[i]);
+
+				// Texture coordinates
+				Vector2D pos = triverts[i];
+				pos = pos.GetRotated(rotate);
+				pos.y = -pos.y;
+				pos = (pos + offset) * scale * texscale;
+				verts[i].u = pos.x;
+				verts[i].v = pos.y;
+			}
+
+			// The sector triangulation created clockwise triangles that
+			// are right up for the floor. For the ceiling we must flip
+			// the triangles upside down.
+			if((extrafloor != null) && !extrafloor.VavoomType && !innerSide)
+				SwapTriangleVertices(verts);
+			
+			// Determine render pass
+			if(extrafloor != null)
+			{
+				if(extrafloor.Sloped3dFloor) //mxd
+					this.RenderPass = RenderPass.Mask;
+				else if(extrafloor.RenderAdditive) //mxd
+					this.RenderPass = RenderPass.Additive;
+				else if(level.alpha < 255)
+					this.RenderPass = RenderPass.Alpha;
+				else
+					this.RenderPass = RenderPass.Mask;
+			}
+			else
+			{
+				this.RenderPass = RenderPass.Solid;
+			}
+			
+			// Apply vertices
+			base.SetVertices(verts);
+			return (verts.Length > 0);
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+
+		// Return texture coordinates
+		protected override Point GetTextureOffset()
+		{
+			return new Point { X = (int)Sector.Sector.Fields.GetValue("xpanningfloor", 0.0f), 
+							   Y = (int)Sector.Sector.Fields.GetValue("ypanningfloor", 0.0f) };
+		}
+
+		// Move texture coordinates
+		protected override void MoveTextureOffset(Point xy)
+		{
+			//mxd
+			Sector s = GetControlSector();
+			s.Fields.BeforeFieldsChange();
+			float nx = (s.Fields.GetValue("xpanningfloor", 0.0f) + xy.X) % (Texture.ScaledWidth / s.Fields.GetValue("xscalefloor", 1.0f));
+			float ny = (s.Fields.GetValue("ypanningfloor", 0.0f) + xy.Y) % (Texture.ScaledHeight / s.Fields.GetValue("yscalefloor", 1.0f));
+			s.Fields["xpanningfloor"] = new UniValue(UniversalType.Float, nx);
+			s.Fields["ypanningfloor"] = new UniValue(UniversalType.Float, ny);
+			s.UpdateNeeded = true;
+
+			mode.SetActionResult("Changed floor texture offsets to " + nx + ", " + ny + ".");
+		}
+
+		//mxd. Texture scale change
+		protected override void ChangeTextureScale(int incrementX, int incrementY) 
+		{
+			Sector s = GetControlSector();
+			float scaleX = s.Fields.GetValue("xscalefloor", 1.0f);
+			float scaleY = s.Fields.GetValue("yscalefloor", 1.0f);
+
+			s.Fields.BeforeFieldsChange();
+
+			if(incrementX != 0) 
+			{
+				float pix = (int)Math.Round(Texture.Width * scaleX) - incrementX;
+				float newscaleX = (float)Math.Round(pix / Texture.Width, 3);
+				scaleX = (newscaleX == 0 ? scaleX * -1 : newscaleX);
+				UniFields.SetFloat(s.Fields, "xscalefloor", scaleX, 1.0f);
+			}
+
+			if(incrementY != 0)
+			{
+				float pix = (int)Math.Round(Texture.Height * scaleY) - incrementY;
+				float newscaleY = (float)Math.Round(pix / Texture.Height, 3);
+				scaleY = (newscaleY == 0 ? scaleY * -1 : newscaleY);
+				UniFields.SetFloat(s.Fields, "yscalefloor", scaleY, 1.0f);
+			}
+
+			//update geometry
+			OnTextureChanged();
+
+			s.UpdateNeeded = true;
+			s.UpdateCache();
+			if(s.Index != Sector.Sector.Index) 
+			{
+				Sector.Sector.UpdateNeeded = true;
+				Sector.Sector.UpdateCache();
+			}
+
+			mode.SetActionResult("Floor scale changed to " + scaleX.ToString("F03", CultureInfo.InvariantCulture) + ", " + scaleY.ToString("F03", CultureInfo.InvariantCulture) + " (" + (int)Math.Round(Texture.Width / scaleX) + " x " + (int)Math.Round(Texture.Height / scaleY) + ").");
+		}
+
+		//mxd
+		public override void OnResetTextureOffset() 
+		{
+			ClearFields(new[] { "xpanningfloor", "ypanningfloor" }, "Reset texture offsets", "Texture offsets reset.");
+		}
+
+		//mxd
+		public override void OnResetLocalTextureOffset() 
+		{
+			ClearFields(new[] { "xpanningfloor", "ypanningfloor", "xscalefloor", "yscalefloor", "rotationfloor", "lightfloor", "lightfloorabsolute" },
+				"Reset texture offsets, scale, rotation and brightness", "Texture offsets, scale, rotation and brightness reset.");
+		}
+		
+		// Paste texture
+		public override void OnPasteTexture()
+		{
+			if(BuilderPlug.Me.CopiedFlat != null)
+			{
+				mode.CreateUndo("Paste floor '" + BuilderPlug.Me.CopiedFlat + "'");
+				mode.SetActionResult("Pasted flat '" + BuilderPlug.Me.CopiedFlat + "' on floor.");
+
+				//mxd. Glow effect may require SectorData and geometry update
+				bool prevtextureglows = General.Map.Data.GlowingFlats.ContainsKey(Sector.Sector.LongFloorTexture);
+				
+				SetTexture(BuilderPlug.Me.CopiedFlat);
+
+				//mxd. Glow effect may require SectorData and geometry update
+				if(prevtextureglows && !General.Map.Data.GlowingFlats.ContainsKey(Sector.Sector.LongFloorTexture))
+				{
+					SectorData sd = mode.GetSectorData(level.sector);
+					sd.UpdateForced();
+
+					if(mode.VisualSectorExists(level.sector))
+					{
+						BaseVisualSector vs = (BaseVisualSector)mode.GetVisualSector(level.sector);
+						vs.UpdateSectorGeometry(false);
+					}
+				}
+
+				//mxd. 3D floors may need updating...
+				OnTextureChanged();
+			}
+		}
+
+		// Call to change the height
+		public override void OnChangeTargetHeight(int amount)
+		{
+			// Only do this when not done yet in this call
+			// Because we may be able to select the same 3D floor multiple times through multiple sectors
+			SectorData sd = mode.GetSectorData(level.sector);
+			if(!sd.FloorChanged)
+			{
+				sd.FloorChanged = true;
+				base.OnChangeTargetHeight(amount);
+			}
+		}
+
+		// This changes the height
+		protected override void ChangeHeight(int amount)
+		{
+			mode.CreateUndo("Change floor height", UndoGroup.FloorHeightChange, level.sector.FixedIndex);
+			level.sector.FloorHeight += amount;
+			
+			if(General.Map.UDMF) 
+			{
+				//mxd. Modify vertex offsets?
+				if(level.sector.Sidedefs.Count == 3)
+				{
+					ChangeVertexHeight(amount);
+				}
+
+				//mxd. Modify slope offset?
+				if(level.sector.FloorSlope.GetLengthSq() > 0)
+				{
+					Vector3D center = new Vector3D(level.sector.BBox.X + level.sector.BBox.Width / 2,
+												   level.sector.BBox.Y + level.sector.BBox.Height / 2, 
+												   level.sector.FloorHeight);
+					
+					Plane p = new Plane(center, 
+										level.sector.FloorSlope.GetAngleXY() + Angle2D.PIHALF, 
+										-level.sector.FloorSlope.GetAngleZ(), 
+										true);
+
+					level.sector.FloorSlopeOffset = p.Offset;
+				}
+			}
+
+			mode.SetActionResult("Changed floor height to " + level.sector.FloorHeight + ".");
+		}
+
+		//mxd
+		private void ChangeVertexHeight(int amount) 
+		{
+			List<Vertex> verts = new List<Vertex>(3);
+
+			//do this only if all 3 verts have offsets
+			foreach(Sidedef side in level.sector.Sidedefs) 
+			{
+				if(float.IsNaN(side.Line.Start.ZFloor) || float.IsNaN(side.Line.End.ZFloor)) return;
+				if(!verts.Contains(side.Line.Start)) verts.Add(side.Line.Start);
+				if(!verts.Contains(side.Line.End)) verts.Add(side.Line.End);
+			}
+
+			foreach(Vertex v in verts) 
+				mode.GetVisualVertex(v, true).OnChangeTargetHeight(amount);
+		}
+
+		//mxd. Sector brightness change
+		public override void OnChangeTargetBrightness(bool up) 
+		{
+			if(level != null) 
+			{
+				// This floor is part of 3D-floor
+				if(level.sector != Sector.Sector)
+					((BaseVisualSector)mode.GetVisualSector(level.sector)).Floor.OnChangeTargetBrightness(up);
+				// This is actual floor of a sector with extrafloors
+				else if(Sector.ExtraFloors.Count > 0 && !Sector.ExtraFloors[0].ExtraFloor.Floor.restrictlighting && !Sector.ExtraFloors[0].ExtraFloor.Floor.disablelighting)
+					Sector.ExtraFloors[0].OnChangeTargetBrightness(up);
+				else
+					base.OnChangeTargetBrightness(up);
+			} 
+			else 
+			{
+				base.OnChangeTargetBrightness(up);
+			}
+		}
+
+		// This performs a fast test in object picking
+		public override bool PickFastReject(Vector3D from, Vector3D to, Vector3D dir)
+		{
+			// Check if our ray starts at the correct side of the plane
+			if((!innerSide && level.plane.Distance(from) > 0.0f) || (innerSide && level.plane.Distance(from) < 0.0f))
+			{
+				// Calculate the intersection
+				if(level.plane.GetIntersection(from, to, ref pickrayu))
+				{
+					if(pickrayu > 0.0f)
+					{
+						pickintersect = from + (to - from) * pickrayu;
+						
+						// Intersection point within bbox?
+						RectangleF bbox = Sector.Sector.BBox;
+						return ((pickintersect.x >= bbox.Left) && (pickintersect.x <= bbox.Right) &&
+								(pickintersect.y >= bbox.Top) && (pickintersect.y <= bbox.Bottom));
+					}
+				}
+			}
+			
+			return false;
+		}
+		
+		// This performs an accurate test for object picking
+		public override bool PickAccurate(Vector3D from, Vector3D to, Vector3D dir, ref float u_ray)
+		{
+			u_ray = pickrayu;
+			
+			// Check on which side of the nearest sidedef we are
+			Sidedef sd = MapSet.NearestSidedef(Sector.Sector.Sidedefs, pickintersect);
+			float side = sd.Line.SideOfLine(pickintersect);
+			return (((side <= 0.0f) && sd.IsFront) || ((side > 0.0f) && !sd.IsFront));
+		}
+		
+		// Return texture name
+		public override string GetTextureName()
+		{
+			return level.sector.FloorTexture;
+		}
+
+		// This changes the texture
+		protected override void SetTexture(string texturename)
+		{
+			level.sector.SetFloorTexture(texturename);
+			General.Map.Data.UpdateUsedTextures();
+		}
+
+		//mxd
+		public override void SelectNeighbours(bool select, bool withSameTexture, bool withSameHeight) 
+		{
+			if(!withSameTexture && !withSameHeight) return;
+
+			if(select && !selected) 
+			{
+				selected = true;
+				mode.AddSelectedObject(this);
+			}
+			else if(!select && selected)
+			{
+				selected = false;
+				mode.RemoveSelectedObject(this);
+			}
+			
+			List<Sector> neighbours = new List<Sector>();
+			bool regularorvavoom = extrafloor == null || (extrafloor != null && extrafloor.VavoomType);
+
+			//collect neighbour sectors
+			foreach(Sidedef side in Sector.Sector.Sidedefs) 
+			{
+				if(side.Other != null && side.Other.Sector != Sector.Sector && !neighbours.Contains(side.Other.Sector))
+				{
+					BaseVisualSector vs = mode.GetVisualSector(side.Other.Sector) as BaseVisualSector;
+					if(vs == null) continue;
+
+					// When current floor is part of a 3d floor, it looks like a ceiling, so we need to select adjacent ceilings
+					if(level.sector != Sector.Sector && !regularorvavoom)
+					{
+						if((withSameTexture && side.Other.Sector.LongCeilTexture == level.sector.LongFloorTexture) ||
+							(withSameHeight && side.Other.Sector.CeilHeight == level.sector.FloorHeight)) 
+						{
+							neighbours.Add(side.Other.Sector);
+
+							//(de)select regular visual ceiling?
+							if(select != vs.Ceiling.Selected) 
+								vs.Ceiling.SelectNeighbours(select, withSameTexture, withSameHeight);
+						}
+					}
+					else // Regular floor or vavoom-type extrafloor
+					{
+						// (De)select adjacent floor
+						if((withSameTexture && side.Other.Sector.LongFloorTexture == level.sector.LongFloorTexture) ||
+							(withSameHeight && side.Other.Sector.FloorHeight == level.sector.FloorHeight)) 
+						{
+							neighbours.Add(side.Other.Sector);
+
+							//(de)select regular visual floor?
+							if(select != vs.Floor.Selected) 
+								vs.Floor.SelectNeighbours(select, withSameTexture, withSameHeight);
+						}
+					}
+
+					// (De)select adjacent extra floors
+					foreach(VisualFloor ef in vs.ExtraFloors) 
+					{
+						if(select == ef.Selected || ef.extrafloor.VavoomType != regularorvavoom) continue;
+						if((withSameTexture && level.sector.LongFloorTexture == ef.level.sector.LongFloorTexture) ||
+							(withSameHeight && level.sector.FloorHeight == ef.level.sector.FloorHeight)) 
+						{
+							ef.SelectNeighbours(select, withSameTexture, withSameHeight);
+						}
+					}
+
+					// (De)select adjacent vavoom type extra ceilings
+					foreach(VisualCeiling ec in vs.ExtraCeilings) 
+					{
+						if(select == ec.Selected || ec.ExtraFloor.VavoomType == regularorvavoom) continue;
+						if((withSameTexture && level.sector.LongFloorTexture == ec.Level.sector.LongCeilTexture) ||
+							(withSameHeight && level.sector.FloorHeight == ec.Level.sector.CeilHeight)) 
+						{
+							ec.SelectNeighbours(select, withSameTexture, withSameHeight);
+						}
+					}
+				}
+			}
+		}
+
+		//mxd
+		public void AlignTexture(bool alignx, bool aligny) 
+		{
+			if(!General.Map.UDMF) return;
+
+			//is is a surface with line slope?
+			float slopeAngle = level.plane.Normal.GetAngleZ() - Angle2D.PIHALF;
+
+			if(slopeAngle == 0) //it's a horizontal plane
+			{
+				AlignTextureToClosestLine(alignx, aligny);
+			} 
+			else //it can be a surface with line slope
+			{ 
+				Linedef slopeSource = null;
+				bool isFront = false;
+
+				foreach(Sidedef side in Sector.Sector.Sidedefs) 
+				{
+					if(side.Line.Action == 181) 
+					{
+						if(side.Line.Args[0] == 1 && side.Line.Front != null && side.Line.Front == side) 
+						{
+							slopeSource = side.Line;
+							isFront = true;
+							break;
+						} 
+						else if(side.Line.Args[0] == 2 && side.Line.Back != null && side.Line.Back == side) 
+						{
+							slopeSource = side.Line;
+							break;
+						}
+					}
+				}
+
+				if(slopeSource != null && slopeSource.Front != null && slopeSource.Front.Sector != null && slopeSource.Back != null && slopeSource.Back.Sector != null)
+					AlignTextureToSlopeLine(slopeSource, slopeAngle, isFront, alignx, aligny);
+				else
+					AlignTextureToClosestLine(alignx, aligny);
+			}
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/VisualModes/VisualFogBoundary.cs b/Source/Plugins/BuilderModes/VisualModes/VisualFogBoundary.cs
new file mode 100644
index 0000000..4a64469
--- /dev/null
+++ b/Source/Plugins/BuilderModes/VisualModes/VisualFogBoundary.cs
@@ -0,0 +1,161 @@
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.VisualModes;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	internal sealed class VisualFogBoundary : BaseVisualGeometrySidedef
+	{
+		#region ================== Variables
+
+		#endregion
+		
+		#region ================== Constructor / Setup
+
+		// Constructor
+		public VisualFogBoundary(BaseVisualMode mode, VisualSector vs, Sidedef s) : base(mode, vs, s)
+		{
+			//mxd
+			geometrytype = VisualGeometryType.FOG_BOUNDARY;
+			
+			// Set render pass
+			this.RenderPass = RenderPass.Additive;
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+		
+		// This builds the geometry. Returns false when no geometry created.
+		public override bool Setup()
+		{
+			if(!IsFogBoundary()) return false;
+
+			//mxd. lightfog flag support
+			int lightvalue;
+			bool lightabsolute;
+			GetLightValue(out lightvalue, out lightabsolute);
+
+			// Left and right vertices for this sidedef
+			Vector2D vl, vr;
+			if(Sidedef.IsFront)
+			{
+				vl = new Vector2D(Sidedef.Line.Start.Position.x, Sidedef.Line.Start.Position.y);
+				vr = new Vector2D(Sidedef.Line.End.Position.x, Sidedef.Line.End.Position.y);
+			}
+			else
+			{
+				vl = new Vector2D(Sidedef.Line.End.Position.x, Sidedef.Line.End.Position.y);
+				vr = new Vector2D(Sidedef.Line.Start.Position.x, Sidedef.Line.Start.Position.y);
+			}
+
+			// Load sector data
+			SectorData sd = mode.GetSectorData(Sidedef.Sector);
+			SectorData osd = mode.GetSectorData(Sidedef.Other.Sector);
+			if(!osd.Updated) osd.Update();
+
+			// Set texture
+			base.Texture = General.Map.Data.BlackTexture;
+
+			// Determine texture coordinates plane as they would be in normal circumstances.
+			TexturePlane tp = new TexturePlane();
+			float floorbias = (Sidedef.Sector.CeilHeight == Sidedef.Sector.FloorHeight) ? 1.0f : 0.0f;
+			float zoffset = Sidedef.Sector.CeilHeight - Sidedef.Other.Sector.CeilHeight; //mxd
+
+			if(zoffset > 0) tp.tlt.y -= zoffset; //mxd
+			tp.trb.x = tp.tlt.x + Sidedef.Line.Length;
+			tp.trb.y = tp.tlt.y + (Sidedef.Sector.CeilHeight - (Sidedef.Sector.FloorHeight + floorbias));
+
+			// Left top and right bottom of the geometry that
+			tp.vlt = new Vector3D(vl.x, vl.y, Sidedef.Sector.CeilHeight);
+			tp.vrb = new Vector3D(vr.x, vr.y, Sidedef.Sector.FloorHeight + floorbias);
+
+			// Make the right-top coordinates
+			tp.trt = new Vector2D(tp.trb.x, tp.tlt.y);
+			tp.vrt = new Vector3D(tp.vrb.x, tp.vrb.y, tp.vlt.z);
+
+			// Keep top and bottom planes for intersection testing
+			top = sd.Ceiling.plane;
+			bottom = sd.Floor.plane;
+
+			// Create initial polygon, which is just a quad between floor and ceiling
+			WallPolygon poly = new WallPolygon();
+			poly.Add(new Vector3D(vl.x, vl.y, sd.Floor.plane.GetZ(vl)));
+			poly.Add(new Vector3D(vl.x, vl.y, sd.Ceiling.plane.GetZ(vl)));
+			poly.Add(new Vector3D(vr.x, vr.y, sd.Ceiling.plane.GetZ(vr)));
+			poly.Add(new Vector3D(vr.x, vr.y, sd.Floor.plane.GetZ(vr)));
+
+			// Determine initial color
+			int lightlevel = sd.Ceiling.brightnessbelow + lightvalue;
+
+			// Calculate fog density
+			fogfactor = CalculateFogDensity(lightlevel);
+			poly.color = PixelColor.INT_WHITE;
+
+			// Cut off the part below the other floor and above the other ceiling
+			CropPoly(ref poly, osd.Ceiling.plane, true);
+			CropPoly(ref poly, osd.Floor.plane, true);
+
+			List<WallPolygon> polygons = new List<WallPolygon> { poly };
+
+			// Keep top and bottom planes for intersection testing
+			top = osd.Ceiling.plane;
+			bottom = osd.Floor.plane;
+
+			// Process the polygon and create vertices
+			List<WorldVertex> verts = CreatePolygonVertices(polygons, tp, sd, lightvalue, lightabsolute);
+			if(verts.Count > 2)
+			{
+				base.SetVertices(verts);
+				return true;
+			}
+
+			base.SetVertices(null);
+			return false;
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		//==========================================================================
+		//
+		// Check if the current linedef is a candidate for a fog boundary
+		//
+		// Requirements for a fog boundary:
+		// - front sector has no fog
+		// - back sector has fog
+		// - at least one of both does not have a sky ceiling.
+		//
+		//==========================================================================
+		private bool IsFogBoundary()
+		{
+			if(Sidedef.Sector.Index == Sidedef.Other.Sector.Index) return false; // There can't be a boundary if both sides are in the same sector.
+			if(Sidedef.Sector.HasFogColor == Sidedef.Other.Sector.HasFogColor) return false;
+			if(!Sidedef.Sector.HasFogColor && !Sidedef.Other.Sector.HasFogColor) return false;
+			if(Sidedef.Sector.CeilTexture == General.Map.Config.SkyFlatName && Sidedef.Other.Sector.CeilTexture == General.Map.Config.SkyFlatName) return false;
+			return true;
+		}
+
+		// This performs a fast test in object picking
+		public override bool PickFastReject(Vector3D from, Vector3D to, Vector3D dir) { return false; }
+
+		// This performs an accurate test for object picking
+		public override bool PickAccurate(Vector3D from, Vector3D to, Vector3D dir, ref float u_ray) { return false; }
+
+		// Unused
+		protected override void SetTextureOffsetX(int x) { }
+		protected override void SetTextureOffsetY(int y) { }
+		protected override void MoveTextureOffset(Point xy) { }
+		protected override Point GetTextureOffset() { return Point.Empty; }
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/VisualModes/VisualLower.cs b/Source/Plugins/BuilderModes/VisualModes/VisualLower.cs
new file mode 100644
index 0000000..5b82e83
--- /dev/null
+++ b/Source/Plugins/BuilderModes/VisualModes/VisualLower.cs
@@ -0,0 +1,287 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Types;
+using CodeImp.DoomBuilder.VisualModes;
+using CodeImp.DoomBuilder.Data;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	internal sealed class VisualLower : BaseVisualGeometrySidedef
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+		
+		#endregion
+
+		#region ================== Properties
+
+		#endregion
+
+		#region ================== Constructor / Setup
+
+		// Constructor
+		public VisualLower(BaseVisualMode mode, VisualSector vs, Sidedef s) : base(mode, vs, s)
+		{
+			//mxd
+			geometrytype = VisualGeometryType.WALL_LOWER;
+			partname = "bottom";
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+		
+		// This builds the geometry. Returns false when no geometry created.
+		public override bool Setup()
+		{
+			Vector2D vl, vr;
+
+			//mxd. lightfog flag support
+			int lightvalue;
+			bool lightabsolute;
+			GetLightValue(out lightvalue, out lightabsolute);
+			
+			Vector2D tscale = new Vector2D(Sidedef.Fields.GetValue("scalex_bottom", 1.0f),
+										   Sidedef.Fields.GetValue("scaley_bottom", 1.0f));
+			Vector2D toffset = new Vector2D(Sidedef.Fields.GetValue("offsetx_bottom", 0.0f),
+											Sidedef.Fields.GetValue("offsety_bottom", 0.0f));
+			
+			// Left and right vertices for this sidedef
+			if(Sidedef.IsFront)
+			{
+				vl = new Vector2D(Sidedef.Line.Start.Position.x, Sidedef.Line.Start.Position.y);
+				vr = new Vector2D(Sidedef.Line.End.Position.x, Sidedef.Line.End.Position.y);
+			}
+			else
+			{
+				vl = new Vector2D(Sidedef.Line.End.Position.x, Sidedef.Line.End.Position.y);
+				vr = new Vector2D(Sidedef.Line.Start.Position.x, Sidedef.Line.Start.Position.y);
+			}
+			
+			// Load sector data
+			SectorData sd = Sector.GetSectorData();
+			SectorData osd = mode.GetSectorData(Sidedef.Other.Sector);
+			if(!osd.Updated) osd.Update();
+			
+			// Texture given?
+			if(Sidedef.LongLowTexture != MapSet.EmptyLongName)
+			{
+				// Load texture
+				base.Texture = General.Map.Data.GetTextureImage(Sidedef.LongLowTexture);
+				if(base.Texture == null || base.Texture is UnknownImage)
+				{
+					base.Texture = General.Map.Data.UnknownTexture3D;
+					setuponloadedtexture = Sidedef.LongLowTexture;
+				}
+				else
+				{
+					if(!base.Texture.IsImageLoaded)
+						setuponloadedtexture = Sidedef.LongLowTexture;
+				}
+			}
+			else
+			{
+				// Use missing texture
+				base.Texture = General.Map.Data.MissingTexture3D;
+				setuponloadedtexture = 0;
+			}
+			
+			// Get texture scaled size
+			Vector2D tsz = new Vector2D(base.Texture.ScaledWidth, base.Texture.ScaledHeight);
+			tsz = tsz / tscale;
+			
+			// Get texture offsets
+			Vector2D tof = new Vector2D(Sidedef.OffsetX, Sidedef.OffsetY);
+			tof = tof + toffset;
+			tof = tof / tscale;
+			if(General.Map.Config.ScaledTextureOffsets && !base.Texture.WorldPanning)
+				tof = tof * base.Texture.Scale;
+			
+			// Determine texture coordinates plane as they would be in normal circumstances.
+			// We can then use this plane to find any texture coordinate we need.
+			// The logic here is the same as in the original VisualMiddleSingle (except that
+			// the values are stored in a TexturePlane)
+			// NOTE: I use a small bias for the floor height, because if the difference in
+			// height is 0 then the TexturePlane doesn't work!
+			TexturePlane tp = new TexturePlane();
+			float floorbias = (Sidedef.Other.Sector.FloorHeight == Sidedef.Sector.FloorHeight) ? 1.0f : 0.0f;
+			if(Sidedef.Line.IsFlagSet(General.Map.Config.LowerUnpeggedFlag))
+			{
+				if(Sidedef.Sector.CeilTexture == General.Map.Config.SkyFlatName && Sidedef.Other.Sector.CeilTexture == General.Map.Config.SkyFlatName) 
+				{
+					// mxd. Replicate Doom texture offset glitch when front and back sector's ceilings are sky
+					tp.tlt.y = (float)Sidedef.Other.Sector.CeilHeight - Sidedef.Other.Sector.FloorHeight;
+				} 
+				else 
+				{
+					// When lower unpegged is set, the lower texture is bound to the bottom
+					tp.tlt.y = (float) Sidedef.Sector.CeilHeight - Sidedef.Other.Sector.FloorHeight;
+				}
+			}
+			tp.trb.x = tp.tlt.x + Sidedef.Line.Length;
+			tp.trb.y = tp.tlt.y + (Sidedef.Other.Sector.FloorHeight - (Sidedef.Sector.FloorHeight + floorbias));
+			
+			// Apply texture offset
+			tp.tlt += tof;
+			tp.trb += tof;
+			
+			// Transform pixel coordinates to texture coordinates
+			tp.tlt /= tsz;
+			tp.trb /= tsz;
+			
+			// Left top and right bottom of the geometry that
+			tp.vlt = new Vector3D(vl.x, vl.y, Sidedef.Other.Sector.FloorHeight);
+			tp.vrb = new Vector3D(vr.x, vr.y, Sidedef.Sector.FloorHeight + floorbias);
+			
+			// Make the right-top coordinates
+			tp.trt = new Vector2D(tp.trb.x, tp.tlt.y);
+			tp.vrt = new Vector3D(tp.vrb.x, tp.vrb.y, tp.vlt.z);
+			
+			// Create initial polygon, which is just a quad between floor and ceiling
+			WallPolygon poly = new WallPolygon();
+			poly.Add(new Vector3D(vl.x, vl.y, sd.Floor.plane.GetZ(vl)));
+			poly.Add(new Vector3D(vl.x, vl.y, sd.Ceiling.plane.GetZ(vl)));
+			poly.Add(new Vector3D(vr.x, vr.y, sd.Ceiling.plane.GetZ(vr)));
+			poly.Add(new Vector3D(vr.x, vr.y, sd.Floor.plane.GetZ(vr)));
+			
+			// Determine initial color
+			int lightlevel = lightabsolute ? lightvalue : sd.Ceiling.brightnessbelow + lightvalue;
+
+			//mxd. This calculates light with doom-style wall shading
+			PixelColor wallbrightness = PixelColor.FromInt(mode.CalculateBrightness(lightlevel, Sidedef));
+			PixelColor wallcolor = PixelColor.Modulate(sd.Ceiling.colorbelow, wallbrightness);
+			fogfactor = CalculateFogDensity(lightlevel);
+			poly.color = wallcolor.WithAlpha(255).ToInt();
+			
+			// Cut off the part above the other floor
+			CropPoly(ref poly, osd.Floor.plane, false);
+			CropPoly(ref poly, osd.Ceiling.plane, true);
+
+			// Cut out pieces that overlap 3D floors in this sector
+			List<WallPolygon> polygons = new List<WallPolygon> { poly };
+			ClipExtraFloors(polygons, sd.ExtraFloors, false); //mxd
+
+			if(polygons.Count > 0)
+			{
+				// Keep top and bottom planes for intersection testing
+				top = osd.Floor.plane;
+				bottom = sd.Floor.plane;
+				
+				// Process the polygon and create vertices
+				List<WorldVertex> verts = CreatePolygonVertices(polygons, tp, sd, lightvalue, lightabsolute);
+				if(verts.Count > 2)
+				{
+					base.SetVertices(verts);
+					return true;
+				}
+			}
+			
+			base.SetVertices(null); //mxd
+			return false;
+		}
+		
+		#endregion
+
+		#region ================== Methods
+
+		// Return texture name
+		public override string GetTextureName()
+		{
+			return this.Sidedef.LowTexture;
+		}
+		
+		// This changes the texture
+		protected override void SetTexture(string texturename)
+		{
+			this.Sidedef.SetTextureLow(texturename);
+			General.Map.Data.UpdateUsedTextures();
+			this.Setup();
+
+			//mxd. Other sector also may require updating
+			SectorData sd = mode.GetSectorData(Sidedef.Sector);
+			if(sd.ExtraFloors.Count > 0)
+				((BaseVisualSector)mode.GetVisualSector(Sidedef.Sector)).Rebuild();
+		}
+
+		protected override void SetTextureOffsetX(int x)
+		{
+			Sidedef.Fields.BeforeFieldsChange();
+			Sidedef.Fields["offsetx_bottom"] = new UniValue(UniversalType.Float, (float)x);
+		}
+
+		protected override void SetTextureOffsetY(int y)
+		{
+			Sidedef.Fields.BeforeFieldsChange();
+			Sidedef.Fields["offsety_bottom"] = new UniValue(UniversalType.Float, (float)y);
+		}
+
+		protected override void MoveTextureOffset(Point xy)
+		{
+			Sidedef.Fields.BeforeFieldsChange();
+			float oldx = Sidedef.Fields.GetValue("offsetx_bottom", 0.0f);
+			float oldy = Sidedef.Fields.GetValue("offsety_bottom", 0.0f);
+			float scalex = Sidedef.Fields.GetValue("scalex_bottom", 1.0f);
+			float scaley = Sidedef.Fields.GetValue("scaley_bottom", 1.0f);
+			Sidedef.Fields["offsetx_bottom"] = new UniValue(UniversalType.Float, GetRoundedTextureOffset(oldx, xy.X, scalex, Texture != null ? Texture.Width : -1)); //mxd
+			Sidedef.Fields["offsety_bottom"] = new UniValue(UniversalType.Float, GetRoundedTextureOffset(oldy, xy.Y, scaley, Texture != null ? Texture.Height : -1)); //mxd
+		}
+
+		protected override Point GetTextureOffset()
+		{
+			float oldx = Sidedef.Fields.GetValue("offsetx_bottom", 0.0f);
+			float oldy = Sidedef.Fields.GetValue("offsety_bottom", 0.0f);
+			return new Point((int)oldx, (int)oldy);
+		}
+
+		//mxd
+		protected override void ResetTextureScale() 
+		{
+			Sidedef.Fields.BeforeFieldsChange();
+			if(Sidedef.Fields.ContainsKey("scalex_bottom")) Sidedef.Fields.Remove("scalex_bottom");
+			if(Sidedef.Fields.ContainsKey("scaley_bottom")) Sidedef.Fields.Remove("scaley_bottom");
+		}
+
+		//mxd
+		public override void OnTextureFit(FitTextureOptions options) 
+		{
+			if(!General.Map.UDMF) return;
+			if(!Sidedef.LowRequired() || string.IsNullOrEmpty(Sidedef.LowTexture) || Sidedef.LowTexture == "-" || !Texture.IsImageLoaded) return;
+			FitTexture(options);
+			Setup();
+		}
+
+		//mxd
+		public override void SelectNeighbours(bool select, bool withSameTexture, bool withSameHeight) 
+		{
+			SelectNeighbours(Sidedef.LongLowTexture, select, withSameTexture, withSameHeight);
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/VisualModes/VisualMiddle3D.cs b/Source/Plugins/BuilderModes/VisualModes/VisualMiddle3D.cs
new file mode 100644
index 0000000..1886db5
--- /dev/null
+++ b/Source/Plugins/BuilderModes/VisualModes/VisualMiddle3D.cs
@@ -0,0 +1,410 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Types;
+using CodeImp.DoomBuilder.VisualModes;
+using CodeImp.DoomBuilder.Data;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	internal sealed class VisualMiddle3D : BaseVisualGeometrySidedef
+	{
+		#region ================== Constants
+
+		#endregion
+		
+		#region ================== Variables
+
+		private Effect3DFloor extrafloor;
+		
+		#endregion
+		
+		#region ================== Properties
+
+		#endregion
+		
+		#region ================== Constructor / Setup
+		
+		// Constructor
+		public VisualMiddle3D(BaseVisualMode mode, VisualSector vs, Sidedef s) : base(mode, vs, s)
+		{
+			//mxd
+			geometrytype = VisualGeometryType.WALL_MIDDLE_3D;
+			partname = "mid";
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+		
+		// This builds the geometry. Returns false when no geometry created.
+		public override bool Setup() { return this.Setup(this.extrafloor); }
+		public bool Setup(Effect3DFloor extrafloor)
+		{
+			Sidedef sourceside = extrafloor.Linedef.Front;
+			this.extrafloor = extrafloor;
+
+			//mxd. Extrafloor may've become invalid during undo/redo...
+			if(sourceside == null) return false;
+
+			Vector2D vl, vr;
+
+			//mxd. lightfog flag support
+			int lightvalue;
+			bool lightabsolute;
+			GetLightValue(out lightvalue, out lightabsolute);
+
+			Vector2D tscale = new Vector2D(sourceside.Fields.GetValue("scalex_mid", 1.0f),
+										   sourceside.Fields.GetValue("scaley_mid", 1.0f));
+			Vector2D toffset1 = new Vector2D(Sidedef.Fields.GetValue("offsetx_mid", 0.0f),
+											 Sidedef.Fields.GetValue("offsety_mid", 0.0f));
+			Vector2D toffset2 = new Vector2D(sourceside.Fields.GetValue("offsetx_mid", 0.0f),
+											 sourceside.Fields.GetValue("offsety_mid", 0.0f));
+			
+			// Left and right vertices for this sidedef
+			if(Sidedef.IsFront)
+			{
+				vl = new Vector2D(Sidedef.Line.Start.Position.x, Sidedef.Line.Start.Position.y);
+				vr = new Vector2D(Sidedef.Line.End.Position.x, Sidedef.Line.End.Position.y);
+			}
+			else
+			{
+				vl = new Vector2D(Sidedef.Line.End.Position.x, Sidedef.Line.End.Position.y);
+				vr = new Vector2D(Sidedef.Line.Start.Position.x, Sidedef.Line.Start.Position.y);
+			}
+			
+			// Load sector data
+			SectorData sd = mode.GetSectorData(Sidedef.Sector);
+			
+			//mxd. which texture we must use?
+			long textureLong = 0;
+			if((sourceside.Line.Args[2] & (int)Effect3DFloor.Flags.UseUpperTexture) != 0) 
+			{
+				if(Sidedef.LongHighTexture != MapSet.EmptyLongName)
+					textureLong = Sidedef.LongHighTexture;
+			} 
+			else if((sourceside.Line.Args[2] & (int)Effect3DFloor.Flags.UseLowerTexture) != 0) 
+			{
+				if(Sidedef.LongLowTexture != MapSet.EmptyLongName)
+					textureLong = Sidedef.LongLowTexture;
+			} 
+			else if(sourceside.LongMiddleTexture != MapSet.EmptyLongName) 
+			{
+				textureLong = sourceside.LongMiddleTexture;
+			}
+
+			// Texture given?
+			if(textureLong != 0)
+			{
+				// Load texture
+				base.Texture = General.Map.Data.GetTextureImage(textureLong);
+				if(base.Texture == null || base.Texture is UnknownImage)
+				{
+					base.Texture = General.Map.Data.UnknownTexture3D;
+					setuponloadedtexture = textureLong;
+				}
+				else
+				{
+					if(!base.Texture.IsImageLoaded)
+						setuponloadedtexture = textureLong;
+				}
+			}
+			else
+			{
+				// Use missing texture
+				base.Texture = General.Map.Data.MissingTexture3D;
+				setuponloadedtexture = 0;
+			}
+			
+			// Get texture scaled size
+			Vector2D tsz = new Vector2D(base.Texture.ScaledWidth, base.Texture.ScaledHeight);
+			tsz = tsz / tscale;
+			
+			// Get texture offsets
+			Vector2D tof = new Vector2D(Sidedef.OffsetX, Sidedef.OffsetY) + new Vector2D(sourceside.OffsetX, sourceside.OffsetY);
+			tof = tof + toffset1 + toffset2;
+			tof = tof / tscale;
+			if(General.Map.Config.ScaledTextureOffsets && !base.Texture.WorldPanning)
+				tof = tof * base.Texture.Scale;
+			
+			// For Vavoom type 3D floors the ceiling is lower than floor and they are reversed.
+			// We choose here.
+			float sourcetopheight = extrafloor.VavoomType ? sourceside.Sector.FloorHeight : sourceside.Sector.CeilHeight;
+			float sourcebottomheight = extrafloor.VavoomType ? sourceside.Sector.CeilHeight : sourceside.Sector.FloorHeight;
+			
+			// Determine texture coordinates plane as they would be in normal circumstances.
+			// We can then use this plane to find any texture coordinate we need.
+			// The logic here is the same as in the original VisualMiddleSingle (except that
+			// the values are stored in a TexturePlane)
+			// NOTE: I use a small bias for the floor height, because if the difference in
+			// height is 0 then the TexturePlane doesn't work!
+			TexturePlane tp = new TexturePlane();
+			float floorbias = (sourcetopheight == sourcebottomheight) ? 1.0f : 0.0f;
+
+			tp.trb.x = tp.tlt.x + Sidedef.Line.Length;
+			tp.trb.y = tp.tlt.y + (sourcetopheight - sourcebottomheight) + floorbias;
+			
+			// Apply texture offset
+			tp.tlt += tof;
+			tp.trb += tof;
+			
+			// Transform pixel coordinates to texture coordinates
+			tp.tlt /= tsz;
+			tp.trb /= tsz;
+			
+			// Left top and right bottom of the geometry that
+			tp.vlt = new Vector3D(vl.x, vl.y, sourcetopheight);
+			tp.vrb = new Vector3D(vr.x, vr.y, sourcebottomheight + floorbias);
+			
+			// Make the right-top coordinates
+			tp.trt = new Vector2D(tp.trb.x, tp.tlt.y);
+			tp.vrt = new Vector3D(tp.vrb.x, tp.vrb.y, tp.vlt.z);
+			
+			//mxd. Get ceiling and floor heights. Use our and neighbour sector's data
+			SectorData sdo = mode.GetSectorData(Sidedef.Other.Sector); 
+
+			float flo = sdo.Floor.plane.GetZ(vl);
+			float fro = sdo.Floor.plane.GetZ(vr);
+			float clo = sdo.Ceiling.plane.GetZ(vl);
+			float cro = sdo.Ceiling.plane.GetZ(vr);
+
+			float fle = sd.Floor.plane.GetZ(vl);
+			float fre = sd.Floor.plane.GetZ(vr);
+			float cle = sd.Ceiling.plane.GetZ(vl);
+			float cre = sd.Ceiling.plane.GetZ(vr);
+
+			float fl = flo > fle ? flo : fle;
+			float fr = fro > fre ? fro : fre;
+			float cl = clo < cle ? clo : cle;
+			float cr = cro < cre ? cro : cre;
+			
+			// Anything to see?
+			if(((cl - fl) > 0.01f) || ((cr - fr) > 0.01f))
+			{
+				// Keep top and bottom planes for intersection testing
+				top = extrafloor.Floor.plane;
+				bottom = extrafloor.Ceiling.plane;
+				
+				// Create initial polygon, which is just a quad between floor and ceiling
+				WallPolygon poly = new WallPolygon();
+				poly.Add(new Vector3D(vl.x, vl.y, fl));
+				poly.Add(new Vector3D(vl.x, vl.y, cl));
+				poly.Add(new Vector3D(vr.x, vr.y, cr));
+				poly.Add(new Vector3D(vr.x, vr.y, fr));
+				
+				// Determine initial color
+				int lightlevel = lightabsolute ? lightvalue : sd.Ceiling.brightnessbelow + lightvalue;
+				
+				//mxd. This calculates light with doom-style wall shading
+				PixelColor wallbrightness = PixelColor.FromInt(mode.CalculateBrightness(lightlevel, Sidedef));
+				PixelColor wallcolor = PixelColor.Modulate(sd.Ceiling.colorbelow, wallbrightness);
+				fogfactor = CalculateFogDensity(lightlevel);
+				poly.color = wallcolor.WithAlpha(255).ToInt();
+
+				// Cut off the part above the 3D floor and below the 3D ceiling
+				CropPoly(ref poly, extrafloor.Floor.plane, false);
+				CropPoly(ref poly, extrafloor.Ceiling.plane, false);
+
+				// Cut out pieces that overlap 3D floors in this sector
+				List<WallPolygon> polygons = new List<WallPolygon> { poly };
+				bool translucent = (extrafloor.RenderAdditive || extrafloor.Alpha < 255);
+				foreach(Effect3DFloor ef in sd.ExtraFloors)
+				{
+					//mxd. Our poly should be clipped when our ond other extrafloors are both solid or both translucent,
+					// or when only our extrafloor is translucent.
+					// Our poly should not be clipped when our extrafloor is translucent and the other one isn't and both have renderinside setting.
+					bool othertranslucent = (ef.RenderAdditive || ef.Alpha < 255);
+					if(translucent && !othertranslucent && !ef.ClipSidedefs) continue;
+					if(ef.ClipSidedefs == extrafloor.ClipSidedefs || ef.ClipSidedefs) 
+					{
+						int num = polygons.Count;
+						for(int pi = 0; pi < num; pi++)
+						{
+							// Split by floor plane of 3D floor
+							WallPolygon p = polygons[pi];
+							WallPolygon np = SplitPoly(ref p, ef.Ceiling.plane, true);
+							
+							if(np.Count > 0)
+							{
+								// Split part below floor by the ceiling plane of 3D floor
+								// and keep only the part below the ceiling (front)
+								SplitPoly(ref np, ef.Floor.plane, true);
+
+								if(p.Count == 0)
+								{
+									polygons[pi] = np;
+								}
+								else
+								{
+									polygons[pi] = p;
+									polygons.Add(np);
+								}
+							}
+							else
+							{
+								polygons[pi] = p;
+							}
+						}
+					}
+				}
+				
+				// Process the polygon and create vertices
+				if(polygons.Count > 0)
+				{
+					List<WorldVertex> verts = CreatePolygonVertices(polygons, tp, sd, lightvalue, lightabsolute);
+					if(verts.Count > 2)
+					{
+						if(extrafloor.Sloped3dFloor) this.RenderPass = RenderPass.Mask; //mxd
+						else if(extrafloor.RenderAdditive) this.RenderPass = RenderPass.Additive; //mxd
+						else if(extrafloor.Alpha < 255) this.RenderPass = RenderPass.Alpha;
+						else this.RenderPass = RenderPass.Mask;
+
+						if(extrafloor.Alpha < 255)
+						{
+							// Apply alpha to vertices
+							byte alpha = (byte)General.Clamp(extrafloor.Alpha, 0, 255);
+							if(alpha < 255)
+							{
+								for(int i = 0; i < verts.Count; i++)
+								{
+									WorldVertex v = verts[i];
+									v.c = PixelColor.FromInt(v.c).WithAlpha(alpha).ToInt();
+									verts[i] = v;
+								}
+							}
+						}
+
+						base.SetVertices(verts);
+						return true;
+					}
+				}
+			}
+			
+			base.SetVertices(null); //mxd
+			return false;
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+
+		// This performs a fast test in object picking (mxd)
+		public override bool PickFastReject(Vector3D from, Vector3D to, Vector3D dir) 
+		{
+			// Top and bottom are swapped in Vavoom-type 3d floors
+			if(extrafloor.VavoomType)
+				return (pickintersect.z >= top.GetZ(pickintersect)) && (pickintersect.z <= bottom.GetZ(pickintersect));
+			return base.PickFastReject(from, to, dir);
+		}
+
+		// Return texture name
+		public override string GetTextureName()
+		{
+			//mxd
+			if((extrafloor.Linedef.Args[2] & (int)Effect3DFloor.Flags.UseUpperTexture) != 0)
+				return Sidedef.HighTexture;
+			if((extrafloor.Linedef.Args[2] & (int)Effect3DFloor.Flags.UseLowerTexture) != 0)
+				return Sidedef.LowTexture;
+			return extrafloor.Linedef.Front.MiddleTexture;
+		}
+
+		// This changes the texture
+		protected override void SetTexture(string texturename)
+		{
+			//mxd
+			if((extrafloor.Linedef.Args[2] & (int)Effect3DFloor.Flags.UseUpperTexture) != 0)
+				Sidedef.SetTextureHigh(texturename);
+			if((extrafloor.Linedef.Args[2] & (int)Effect3DFloor.Flags.UseLowerTexture) != 0)
+				Sidedef.SetTextureLow(texturename);
+			else
+				extrafloor.Linedef.Front.SetTextureMid(texturename);
+
+			General.Map.Data.UpdateUsedTextures();
+			this.Sector.Rebuild();
+
+			//mxd. Other sector also may require updating
+			SectorData sd = mode.GetSectorData(Sidedef.Other.Sector);
+			if(sd.ExtraFloors.Count > 0)
+				((BaseVisualSector)mode.GetVisualSector(Sidedef.Other.Sector)).Rebuild();
+
+			//mxd. As well as model sector
+			mode.GetVisualSector(extrafloor.Linedef.Front.Sector).UpdateSectorGeometry(false);
+		}
+
+		protected override void SetTextureOffsetX(int x)
+		{
+			Sidedef.Fields.BeforeFieldsChange();
+			Sidedef.Fields["offsetx_mid"] = new UniValue(UniversalType.Float, (float)x);
+		}
+
+		protected override void SetTextureOffsetY(int y)
+		{
+			Sidedef.Fields.BeforeFieldsChange();
+			Sidedef.Fields["offsety_mid"] = new UniValue(UniversalType.Float, (float)y);
+		}
+
+		protected override void MoveTextureOffset(Point xy)
+		{
+			Sidedef.Fields.BeforeFieldsChange();
+			float oldx = Sidedef.Fields.GetValue("offsetx_mid", 0.0f);
+			float oldy = Sidedef.Fields.GetValue("offsety_mid", 0.0f);
+			Sidedef.Fields["offsetx_mid"] = new UniValue(UniversalType.Float, oldx + xy.X);
+			Sidedef.Fields["offsety_mid"] = new UniValue(UniversalType.Float, oldy + xy.Y);
+		}
+
+		protected override Point GetTextureOffset()
+		{
+			float oldx = Sidedef.Fields.GetValue("offsetx_mid", 0.0f);
+			float oldy = Sidedef.Fields.GetValue("offsety_mid", 0.0f);
+			return new Point((int)oldx, (int)oldy);
+		}
+
+		//mxd
+		public override Linedef GetControlLinedef()
+		{
+			return extrafloor.Linedef;
+		}
+
+		//mxd
+		public override void SelectNeighbours(bool select, bool withSameTexture, bool withSameHeight) 
+		{
+			SelectNeighbours(extrafloor.Linedef.Front.LongMiddleTexture, select, withSameTexture, withSameHeight);
+		}
+
+		//mxd
+		public override void OnTextureFit(FitTextureOptions options) 
+		{
+			if(!General.Map.UDMF) return;
+			if(string.IsNullOrEmpty(extrafloor.Linedef.Front.MiddleTexture) || extrafloor.Linedef.Front.MiddleTexture == "-" || !Texture.IsImageLoaded) return;
+			FitTexture(options);
+			Setup();
+
+			// Update the model sector to update all 3d floors
+			mode.GetVisualSector(extrafloor.Linedef.Front.Sector).UpdateSectorGeometry(false);
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/VisualModes/VisualMiddleBack.cs b/Source/Plugins/BuilderModes/VisualModes/VisualMiddleBack.cs
new file mode 100644
index 0000000..cf19c52
--- /dev/null
+++ b/Source/Plugins/BuilderModes/VisualModes/VisualMiddleBack.cs
@@ -0,0 +1,360 @@
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Types;
+using CodeImp.DoomBuilder.VisualModes;
+using CodeImp.DoomBuilder.Data;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	//mxd. Used to render translucent 3D floor's inner sides
+	internal sealed class VisualMiddleBack : BaseVisualGeometrySidedef 
+	{
+		#region ================== Variables
+
+		private Effect3DFloor extrafloor;
+
+		#endregion
+		
+		#region ================== Constructor / Setup
+		
+		// Constructor
+		public VisualMiddleBack(BaseVisualMode mode, VisualSector vs, Sidedef s)
+			: base(mode, vs, s)
+		{
+			//mxd
+			geometrytype = VisualGeometryType.WALL_MIDDLE;
+			partname = "mid";
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+		
+		// This builds the geometry. Returns false when no geometry created.
+		public override bool Setup() { return this.Setup(this.extrafloor); }
+		public bool Setup(Effect3DFloor extrafloor)
+		{
+			Sidedef sourceside = extrafloor.Linedef.Front;
+			this.extrafloor = extrafloor;
+
+			//mxd. Extrafloor may've become invalid during undo/redo...
+			if(sourceside == null) return false;
+
+			Vector2D vl, vr;
+
+			//mxd. lightfog flag support
+			int lightvalue;
+			bool lightabsolute;
+			GetLightValue(out lightvalue, out lightabsolute);
+
+			Vector2D tscale = new Vector2D(sourceside.Fields.GetValue("scalex_mid", 1.0f),
+										   sourceside.Fields.GetValue("scaley_mid", 1.0f));
+			Vector2D toffset1 = new Vector2D(Sidedef.Fields.GetValue("offsetx_mid", 0.0f),
+											 Sidedef.Fields.GetValue("offsety_mid", 0.0f));
+			Vector2D toffset2 = new Vector2D(sourceside.Fields.GetValue("offsetx_mid", 0.0f),
+											 sourceside.Fields.GetValue("offsety_mid", 0.0f));
+			
+			// Left and right vertices for this sidedef
+			if(Sidedef.IsFront)
+			{
+				vl = new Vector2D(Sidedef.Line.Start.Position.x, Sidedef.Line.Start.Position.y);
+				vr = new Vector2D(Sidedef.Line.End.Position.x, Sidedef.Line.End.Position.y);
+			}
+			else
+			{
+				vl = new Vector2D(Sidedef.Line.End.Position.x, Sidedef.Line.End.Position.y);
+				vr = new Vector2D(Sidedef.Line.Start.Position.x, Sidedef.Line.Start.Position.y);
+			}
+
+			// Load sector data
+			SectorData sd = mode.GetSectorData(Sidedef.Other.Sector);
+
+			//mxd. which texture we must use?
+			long longtexture = 0;
+			if((sourceside.Line.Args[2] & (int)Effect3DFloor.Flags.UseUpperTexture) != 0) 
+			{
+				if(Sidedef.Other.LongHighTexture != MapSet.EmptyLongName)
+					longtexture = Sidedef.Other.LongHighTexture;
+			} 
+			else if((sourceside.Line.Args[2] & (int)Effect3DFloor.Flags.UseLowerTexture) != 0) 
+			{
+				if(Sidedef.Other.LongLowTexture != MapSet.EmptyLongName)
+					longtexture = Sidedef.Other.LongLowTexture;
+			} 
+			else if((sourceside.LongMiddleTexture != MapSet.EmptyLongName)) 
+			{
+				longtexture = sourceside.LongMiddleTexture;
+			}
+
+			// Texture given?
+			if(longtexture != 0) 
+			{
+				// Load texture
+				base.Texture = General.Map.Data.GetTextureImage(longtexture);
+				if(base.Texture == null || base.Texture is UnknownImage) 
+				{
+					base.Texture = General.Map.Data.UnknownTexture3D;
+					setuponloadedtexture = longtexture;
+				} 
+				else if(!base.Texture.IsImageLoaded) 
+				{
+					setuponloadedtexture = longtexture;
+				}
+			} 
+			else 
+			{
+				// Use missing texture
+				base.Texture = General.Map.Data.MissingTexture3D;
+				setuponloadedtexture = 0;
+			}
+			
+			// Get texture scaled size
+			Vector2D tsz = new Vector2D(base.Texture.ScaledWidth, base.Texture.ScaledHeight);
+			tsz = tsz / tscale;
+			
+			// Get texture offsets
+			Vector2D tof = new Vector2D(Sidedef.OffsetX, Sidedef.OffsetY) + new Vector2D(sourceside.OffsetX, sourceside.OffsetY);
+			tof = tof + toffset1 + toffset2;
+			tof = tof / tscale;
+			if(General.Map.Config.ScaledTextureOffsets && !base.Texture.WorldPanning)
+				tof = tof * base.Texture.Scale;
+
+			// For Vavoom type 3D floors the ceiling is lower than floor and they are reversed.
+			// We choose here.
+			float sourcetopheight = extrafloor.VavoomType ? sourceside.Sector.FloorHeight : sourceside.Sector.CeilHeight;
+			float sourcebottomheight = extrafloor.VavoomType ? sourceside.Sector.CeilHeight : sourceside.Sector.FloorHeight;
+			
+			// Determine texture coordinates plane as they would be in normal circumstances.
+			// We can then use this plane to find any texture coordinate we need.
+			// The logic here is the same as in the original VisualMiddleSingle (except that
+			// the values are stored in a TexturePlane)
+			// NOTE: I use a small bias for the floor height, because if the difference in
+			// height is 0 then the TexturePlane doesn't work!
+			TexturePlane tp = new TexturePlane();
+			float floorbias = (sourcetopheight == sourcebottomheight) ? 1.0f : 0.0f;
+
+			tp.trb.x = tp.tlt.x + Sidedef.Line.Length;
+			tp.trb.y = tp.tlt.y + (sourcetopheight - sourcebottomheight) + floorbias;
+			
+			// Apply texture offset
+			tp.tlt += tof;
+			tp.trb += tof;
+			
+			// Transform pixel coordinates to texture coordinates
+			tp.tlt /= tsz;
+			tp.trb /= tsz;
+			
+			// Left top and right bottom of the geometry that
+			tp.vlt = new Vector3D(vl.x, vl.y, sourcetopheight);
+			tp.vrb = new Vector3D(vr.x, vr.y, sourcebottomheight + floorbias);
+			
+			// Make the right-top coordinates
+			tp.trt = new Vector2D(tp.trb.x, tp.tlt.y);
+			tp.vrt = new Vector3D(tp.vrb.x, tp.vrb.y, tp.vlt.z);
+			
+			// Get ceiling and floor heights
+			float flo = Sector.Floor.Level.plane.GetZ(vl);
+			float fro = Sector.Floor.Level.plane.GetZ(vr);
+			float clo = Sector.Ceiling.Level.plane.GetZ(vl);
+			float cro = Sector.Ceiling.Level.plane.GetZ(vr);
+
+			float fle = sd.Floor.plane.GetZ(vl);
+			float fre = sd.Floor.plane.GetZ(vr);
+			float cle = sd.Ceiling.plane.GetZ(vl);
+			float cre = sd.Ceiling.plane.GetZ(vr);
+
+			float fl = flo > fle ? flo : fle;
+			float fr = fro > fre ? fro : fre;
+			float cl = clo < cle ? clo : cle;
+			float cr = cro < cre ? cro : cre;
+			
+			// Anything to see?
+			if(((cl - fl) > 0.01f) || ((cr - fr) > 0.01f))
+			{
+				// Keep top and bottom planes for intersection testing
+				bottom = extrafloor.Ceiling.plane;
+				top = extrafloor.Floor.plane;
+				
+				// Create initial polygon, which is just a quad between floor and ceiling
+				WallPolygon poly = new WallPolygon();
+				poly.Add(new Vector3D(vl.x, vl.y, fl));
+				poly.Add(new Vector3D(vl.x, vl.y, cl));
+				poly.Add(new Vector3D(vr.x, vr.y, cr));
+				poly.Add(new Vector3D(vr.x, vr.y, fr));
+				
+				// Determine initial color
+				int lightlevel;
+				PixelColor levelcolor; //mxd
+				if(((sourceside.Line.Args[2] & (int)Effect3DFloor.Flags.DisableLighting) != 0))
+				{
+					lightlevel = lightabsolute ? lightvalue : sd.Ceiling.brightnessbelow + lightvalue;
+					levelcolor = sd.Ceiling.colorbelow; //mxd
+				}
+				else
+				{
+					lightlevel = lightabsolute ? lightvalue : sourceside.Sector.Brightness + lightvalue;
+					levelcolor = extrafloor.Floor.colorbelow; //mxd
+				}
+
+				//mxd. This calculates light with doom-style wall shading
+				PixelColor wallbrightness = PixelColor.FromInt(mode.CalculateBrightness(lightlevel, Sidedef));
+				int wallcolor = PixelColor.Modulate(levelcolor, wallbrightness).WithAlpha((byte)extrafloor.Alpha).ToInt();
+				fogfactor = CalculateFogDensity(lightlevel);
+
+				// Cut off the part above the 3D floor and below the 3D ceiling
+				CropPoly(ref poly, bottom, false);
+				CropPoly(ref poly, top, false);
+
+				// Cut out pieces that overlap 3D floors in this sector
+				List<WallPolygon> polygons = new List<WallPolygon> { poly };
+				foreach(Effect3DFloor ef in sd.ExtraFloors) 
+				{
+					//mxd. Our poly should be clipped when our ond other extrafloors are both solid or both translucent,
+					// or when only our extrafloor is translucent
+					if(ef.ClipSidedefs == extrafloor.ClipSidedefs || ef.ClipSidedefs)
+					{
+						int num = polygons.Count;
+						for(int pi = 0; pi < num; pi++)
+						{
+							// Split by floor plane of 3D floor
+							WallPolygon p = polygons[pi];
+							WallPolygon np = SplitPoly(ref p, ef.Ceiling.plane, true);
+
+							if(np.Count > 0)
+							{
+								// Split part below floor by the ceiling plane of 3D floor
+								// and keep only the part below the ceiling (front)
+								SplitPoly(ref np, ef.Floor.plane, true);
+
+								if(p.Count == 0)
+								{
+									polygons[pi] = np;
+								}
+								else
+								{
+									polygons[pi] = p;
+									polygons.Add(np);
+								}
+							}
+							else
+							{
+								polygons[pi] = p;
+							}
+						}
+					}
+				}
+
+				// Process the polygon and create vertices
+				if(polygons.Count > 0)
+				{
+					List<WorldVertex> verts = CreatePolygonVertices(polygons, tp, sd, lightvalue, lightabsolute);
+					if(verts.Count > 2)
+					{
+						if(extrafloor.Sloped3dFloor) this.RenderPass = RenderPass.Mask; //mxd
+						else if(extrafloor.RenderAdditive) this.RenderPass = RenderPass.Additive; //mxd
+						else if(extrafloor.Alpha < 255) this.RenderPass = RenderPass.Alpha;
+						else this.RenderPass = RenderPass.Mask;
+
+						//mxd. Inner sides always have extrafloor color
+						for(int i = 0; i < verts.Count; i++)
+						{
+							WorldVertex v = verts[i];
+							v.c = wallcolor;
+							verts[i] = v;
+						}
+
+						base.SetVertices(verts);
+						return true;
+					}
+				}
+			}
+			
+			base.SetVertices(null); //mxd
+			return false;
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+
+		// Return texture name
+		public override string GetTextureName() 
+		{
+			//mxd
+			if((extrafloor.Linedef.Args[2] & (int)Effect3DFloor.Flags.UseUpperTexture) != 0)
+				return Sidedef.HighTexture;
+			if((extrafloor.Linedef.Args[2] & (int)Effect3DFloor.Flags.UseLowerTexture) != 0)
+				return Sidedef.LowTexture;
+			return extrafloor.Linedef.Front.MiddleTexture;
+		}
+
+		// This changes the texture
+		protected override void SetTexture(string texturename) 
+		{
+			//mxd
+			if((extrafloor.Linedef.Args[2] & (int)Effect3DFloor.Flags.UseUpperTexture) != 0)
+				Sidedef.Other.SetTextureHigh(texturename);
+			if((extrafloor.Linedef.Args[2] & (int)Effect3DFloor.Flags.UseLowerTexture) != 0)
+				Sidedef.Other.SetTextureLow(texturename);
+			else
+				extrafloor.Linedef.Front.SetTextureMid(texturename);
+
+			General.Map.Data.UpdateUsedTextures();
+			this.Sector.Rebuild();
+
+			//mxd. Other sector also may require updating
+			((BaseVisualSector)mode.GetVisualSector(Sidedef.Other.Sector)).Rebuild();
+
+			//mxd. As well as model sector
+			mode.GetVisualSector(extrafloor.Linedef.Front.Sector).UpdateSectorGeometry(false);
+		}
+
+		protected override void SetTextureOffsetX(int x)
+		{
+			Sidedef.Fields.BeforeFieldsChange();
+			Sidedef.Fields["offsetx_mid"] = new UniValue(UniversalType.Float, (float)x);
+		}
+
+		protected override void SetTextureOffsetY(int y)
+		{
+			Sidedef.Fields.BeforeFieldsChange();
+			Sidedef.Fields["offsety_mid"] = new UniValue(UniversalType.Float, (float)y);
+		}
+
+		protected override void MoveTextureOffset(Point xy)
+		{
+			Sidedef.Fields.BeforeFieldsChange();
+			float oldx = Sidedef.Fields.GetValue("offsetx_mid", 0.0f);
+			float oldy = Sidedef.Fields.GetValue("offsety_mid", 0.0f);
+			float scalex = Sidedef.Fields.GetValue("scalex_mid", 1.0f);
+			float scaley = Sidedef.Fields.GetValue("scaley_mid", 1.0f);
+			Sidedef.Fields["offsetx_mid"] = new UniValue(UniversalType.Float, GetRoundedTextureOffset(oldx, xy.X, scalex, Texture != null ? Texture.Width : -1)); //mxd
+
+			//mxd. Don't clamp offsetY of clipped mid textures
+			bool dontClamp = (Texture == null || Sidedef.IsFlagSet("clipmidtex") || Sidedef.Line.IsFlagSet("clipmidtex"));
+			Sidedef.Fields["offsety_mid"] = new UniValue(UniversalType.Float, GetRoundedTextureOffset(oldy, xy.Y, scaley, dontClamp ? -1 : Texture.Height));
+		}
+
+		protected override Point GetTextureOffset()
+		{
+			float oldx = Sidedef.Fields.GetValue("offsetx_mid", 0.0f);
+			float oldy = Sidedef.Fields.GetValue("offsety_mid", 0.0f);
+			return new Point((int)oldx, (int)oldy);
+		}
+
+		//mxd
+		public override Linedef GetControlLinedef() 
+		{
+			return extrafloor.Linedef;
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/VisualModes/VisualMiddleDouble.cs b/Source/Plugins/BuilderModes/VisualModes/VisualMiddleDouble.cs
new file mode 100644
index 0000000..d95af75
--- /dev/null
+++ b/Source/Plugins/BuilderModes/VisualModes/VisualMiddleDouble.cs
@@ -0,0 +1,387 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Types;
+using CodeImp.DoomBuilder.VisualModes;
+using CodeImp.DoomBuilder.Data;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	internal sealed class VisualMiddleDouble : BaseVisualGeometrySidedef
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		private bool repeatmidtex;
+		private Plane topclipplane;
+		private Plane bottomclipplane;
+		
+		#endregion
+
+		#region ================== Properties
+
+		#endregion
+
+		#region ================== Constructor / Setup
+
+		// Constructor
+		public VisualMiddleDouble(BaseVisualMode mode, VisualSector vs, Sidedef s) : base(mode, vs, s)
+		{
+			//mxd
+			geometrytype = VisualGeometryType.WALL_MIDDLE;
+			partname = "mid";
+			
+			// Set render pass
+			this.RenderPass = RenderPass.Mask;
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+		
+		// This builds the geometry. Returns false when no geometry created.
+		public override bool Setup()
+		{
+			//mxd
+			if(Sidedef.LongMiddleTexture == MapSet.EmptyLongName) return false;
+			
+			Vector2D vl, vr;
+
+			//mxd. lightfog flag support
+			int lightvalue;
+			bool lightabsolute;
+			GetLightValue(out lightvalue, out lightabsolute);
+			
+			Vector2D tscale = new Vector2D(Sidedef.Fields.GetValue("scalex_mid", 1.0f),
+										   Sidedef.Fields.GetValue("scaley_mid", 1.0f));
+			Vector2D toffset = new Vector2D(Sidedef.Fields.GetValue("offsetx_mid", 0.0f),
+											Sidedef.Fields.GetValue("offsety_mid", 0.0f));
+			
+			// Left and right vertices for this sidedef
+			if(Sidedef.IsFront) 
+			{
+				vl = new Vector2D(Sidedef.Line.Start.Position.x, Sidedef.Line.Start.Position.y);
+				vr = new Vector2D(Sidedef.Line.End.Position.x, Sidedef.Line.End.Position.y);
+			} 
+			else 
+			{
+				vl = new Vector2D(Sidedef.Line.End.Position.x, Sidedef.Line.End.Position.y);
+				vr = new Vector2D(Sidedef.Line.Start.Position.x, Sidedef.Line.Start.Position.y);
+			}
+
+			// Load sector data
+			SectorData sd = mode.GetSectorData(Sidedef.Sector);
+			SectorData osd = mode.GetSectorData(Sidedef.Other.Sector);
+			if(!osd.Updated) osd.Update();
+
+			// Load texture
+			if(Sidedef.LongMiddleTexture != MapSet.EmptyLongName) 
+			{
+				base.Texture = General.Map.Data.GetTextureImage(Sidedef.LongMiddleTexture);
+				if(base.Texture == null || base.Texture is UnknownImage) 
+				{
+					base.Texture = General.Map.Data.UnknownTexture3D;
+					setuponloadedtexture = Sidedef.LongMiddleTexture;
+				} 
+				else if(!base.Texture.IsImageLoaded) 
+				{
+					setuponloadedtexture = Sidedef.LongMiddleTexture;
+				}
+			} 
+			else 
+			{
+				// Use missing texture
+				base.Texture = General.Map.Data.MissingTexture3D;
+				setuponloadedtexture = 0;
+			}
+
+			// Get texture scaled size
+			Vector2D tsz = new Vector2D(base.Texture.ScaledWidth, base.Texture.ScaledHeight);
+			tsz = tsz / tscale;
+
+			// Get texture offsets
+			Vector2D tof = new Vector2D(Sidedef.OffsetX, Sidedef.OffsetY);
+			tof = tof + toffset;
+			tof = tof / tscale;
+			if(General.Map.Config.ScaledTextureOffsets && !base.Texture.WorldPanning)
+				tof = tof * base.Texture.Scale;
+
+			// Determine texture coordinates plane as they would be in normal circumstances.
+			// We can then use this plane to find any texture coordinate we need.
+			// The logic here is the same as in the original VisualMiddleSingle (except that
+			// the values are stored in a TexturePlane)
+			// NOTE: I use a small bias for the floor height, because if the difference in
+			// height is 0 then the TexturePlane doesn't work!
+			TexturePlane tp = new TexturePlane();
+			float floorbias = (Sidedef.Sector.CeilHeight == Sidedef.Sector.FloorHeight) ? 1.0f : 0.0f;
+			float geotop = Math.Min(Sidedef.Sector.CeilHeight, Sidedef.Other.Sector.CeilHeight);
+			float geobottom = Math.Max(Sidedef.Sector.FloorHeight, Sidedef.Other.Sector.FloorHeight);
+			float zoffset = Sidedef.Sector.CeilHeight - Sidedef.Other.Sector.CeilHeight; //mxd
+
+			// When lower unpegged is set, the middle texture is bound to the bottom
+			if(Sidedef.Line.IsFlagSet(General.Map.Config.LowerUnpeggedFlag)) 
+				tp.tlt.y = tsz.y - (geotop - geobottom);
+			
+			if(zoffset > 0) tp.tlt.y -= zoffset; //mxd
+			tp.trb.x = tp.tlt.x + Sidedef.Line.Length;
+			tp.trb.y = tp.tlt.y + (Sidedef.Sector.CeilHeight - (Sidedef.Sector.FloorHeight + floorbias));
+
+			// Apply texture offset
+			tp.tlt += tof;
+			tp.trb += tof;
+
+			// Transform pixel coordinates to texture coordinates
+			tp.tlt /= tsz;
+			tp.trb /= tsz;
+
+			// Left top and right bottom of the geometry that
+			tp.vlt = new Vector3D(vl.x, vl.y, Sidedef.Sector.CeilHeight);
+			tp.vrb = new Vector3D(vr.x, vr.y, Sidedef.Sector.FloorHeight + floorbias);
+
+			// Make the right-top coordinates
+			tp.trt = new Vector2D(tp.trb.x, tp.tlt.y);
+			tp.vrt = new Vector3D(tp.vrb.x, tp.vrb.y, tp.vlt.z);
+
+			// Keep top and bottom planes for intersection testing
+			top = sd.Ceiling.plane;
+			bottom = sd.Floor.plane;
+
+			// Create initial polygon, which is just a quad between floor and ceiling
+			WallPolygon poly = new WallPolygon();
+			poly.Add(new Vector3D(vl.x, vl.y, sd.Floor.plane.GetZ(vl)));
+			poly.Add(new Vector3D(vl.x, vl.y, sd.Ceiling.plane.GetZ(vl)));
+			poly.Add(new Vector3D(vr.x, vr.y, sd.Ceiling.plane.GetZ(vr)));
+			poly.Add(new Vector3D(vr.x, vr.y, sd.Floor.plane.GetZ(vr)));
+
+			// Determine initial color
+			int lightlevel = lightabsolute ? lightvalue : sd.Ceiling.brightnessbelow + lightvalue;
+
+			//mxd. This calculates light with doom-style wall shading
+			PixelColor wallbrightness = PixelColor.FromInt(mode.CalculateBrightness(lightlevel, Sidedef));
+			PixelColor wallcolor = PixelColor.Modulate(sd.Ceiling.colorbelow, wallbrightness);
+			fogfactor = CalculateFogDensity(lightlevel);
+			poly.color = wallcolor.WithAlpha(255).ToInt();
+
+			// Cut off the part below the other floor and above the other ceiling
+			CropPoly(ref poly, osd.Ceiling.plane, true);
+			CropPoly(ref poly, osd.Floor.plane, true);
+
+			// Determine if we should repeat the middle texture
+			repeatmidtex = Sidedef.IsFlagSet("wrapmidtex") || Sidedef.Line.IsFlagSet("wrapmidtex"); //mxd
+			if(!repeatmidtex) 
+			{
+				// First determine the visible portion of the texture
+				float textop;
+
+				// Determine top portion height
+				if(Sidedef.Line.IsFlagSet(General.Map.Config.LowerUnpeggedFlag))
+					textop = geobottom + tof.y + Math.Abs(tsz.y);
+				else
+					textop = geotop + tof.y;
+
+				// Calculate bottom portion height
+				float texbottom = textop - Math.Abs(tsz.y);
+
+				// Create crop planes (we also need these for intersection testing)
+				topclipplane = new Plane(new Vector3D(0, 0, -1), textop);
+				bottomclipplane = new Plane(new Vector3D(0, 0, 1), -texbottom);
+
+				// Crop polygon by these heights
+				CropPoly(ref poly, topclipplane, true);
+				CropPoly(ref poly, bottomclipplane, true);
+			}
+
+			//mxd. In(G)ZDoom, middle sidedef parts are not clipped by extrafloors of any type...
+			List<WallPolygon> polygons = new List<WallPolygon> { poly };
+			//ClipExtraFloors(polygons, sd.ExtraFloors, true); //mxd
+			//ClipExtraFloors(polygons, osd.ExtraFloors, true); //mxd
+
+			//if(polygons.Count > 0) 
+			//{
+				// Keep top and bottom planes for intersection testing
+				top = osd.Ceiling.plane;
+				bottom = osd.Floor.plane;
+
+				// Process the polygon and create vertices
+				List<WorldVertex> verts = CreatePolygonVertices(polygons, tp, sd, lightvalue, lightabsolute);
+				if(verts.Count > 2) 
+				{
+					// Apply alpha to vertices
+					byte alpha = SetLinedefRenderstyle(true);
+					if(alpha < 255) 
+					{
+						for(int i = 0; i < verts.Count; i++) 
+						{
+							WorldVertex v = verts[i];
+							v.c = PixelColor.FromInt(v.c).WithAlpha(alpha).ToInt();
+							verts[i] = v;
+						}
+					}
+
+					base.SetVertices(verts);
+					return true;
+				}
+			//}
+			
+			base.SetVertices(null); //mxd
+			return false;
+		}
+		
+		#endregion
+
+		#region ================== Methods
+
+		// This performs a fast test in object picking
+		public override bool PickFastReject(Vector3D from, Vector3D to, Vector3D dir)
+		{
+			if(!repeatmidtex)
+			{
+				// When the texture is not repeated, leave when outside crop planes
+				if((pickintersect.z < bottomclipplane.GetZ(pickintersect)) ||
+				   (pickintersect.z > topclipplane.GetZ(pickintersect)))
+				   return false;
+			}
+			
+			return base.PickFastReject(from, to, dir);
+		}
+
+		//mxd. Alpha based picking
+		public override bool PickAccurate(Vector3D from, Vector3D to, Vector3D dir, ref float u_ray) 
+		{
+			if(!Texture.IsImageLoaded) return base.PickAccurate(from, to, dir, ref u_ray);
+
+			float u;
+			new Line2D(from, to).GetIntersection(Sidedef.Line.Line, out u);
+			if(Sidedef != Sidedef.Line.Front) u = 1.0f - u;
+
+			// Get correct offset to texture space...
+			float zoffset;
+			int ox = (int)Math.Floor((u * Sidedef.Line.Length * UniFields.GetFloat(Sidedef.Fields, "scalex_mid", 1.0f) / Texture.Scale.x + Sidedef.OffsetX + UniFields.GetFloat(Sidedef.Fields, "offsetx_mid")) % Texture.Width);
+			int oy;
+
+			if(repeatmidtex)
+			{
+				if(Sidedef.Line.IsFlagSet(General.Map.Config.LowerUnpeggedFlag))
+					zoffset = Sidedef.Sector.FloorHeight;
+				else
+					zoffset = Sidedef.Sector.CeilHeight;
+
+				oy = (int)Math.Floor(((pickintersect.z - zoffset) * UniFields.GetFloat(Sidedef.Fields, "scaley_mid", 1.0f) / Texture.Scale.y - Sidedef.OffsetY - UniFields.GetFloat(Sidedef.Fields, "offsety_mid")) % Texture.Height);
+			}
+			else
+			{
+				zoffset = bottomclipplane.GetZ(pickintersect);
+				oy = (int)Math.Ceiling(((pickintersect.z - zoffset) * UniFields.GetFloat(Sidedef.Fields, "scaley_mid", 1.0f) / Texture.Scale.y) % Texture.Height);
+			}
+
+			// Make sure offsets are inside of texture dimensions...
+			while(ox < 0) ox += Texture.Width;
+			while(oy < 0) oy += Texture.Height;
+
+			// Check pixel alpha
+			if(Texture.GetBitmap().GetPixel(General.Clamp(ox, 0, Texture.Width - 1), General.Clamp(Texture.Height - oy, 0, Texture.Height - 1)).A > 0)
+			{
+				return base.PickAccurate(from, to, dir, ref u_ray);
+			}
+
+			return false;
+		}
+		
+		// Return texture name
+		public override string GetTextureName()
+		{
+			return this.Sidedef.MiddleTexture;
+		}
+
+		// This changes the texture
+		protected override void SetTexture(string texturename)
+		{
+			this.Sidedef.SetTextureMid(texturename);
+			General.Map.Data.UpdateUsedTextures();
+			this.Setup();
+		}
+
+		protected override void SetTextureOffsetX(int x)
+		{
+			Sidedef.Fields.BeforeFieldsChange();
+			Sidedef.Fields["offsetx_mid"] = new UniValue(UniversalType.Float, (float)x);
+		}
+
+		protected override void SetTextureOffsetY(int y)
+		{
+			Sidedef.Fields.BeforeFieldsChange();
+			Sidedef.Fields["offsety_mid"] = new UniValue(UniversalType.Float, (float)y);
+		}
+
+		protected override void MoveTextureOffset(Point xy)
+		{
+			Sidedef.Fields.BeforeFieldsChange();
+			float oldx = Sidedef.Fields.GetValue("offsetx_mid", 0.0f);
+			float oldy = Sidedef.Fields.GetValue("offsety_mid", 0.0f);
+			float scalex = Sidedef.Fields.GetValue("scalex_mid", 1.0f);
+			float scaley = Sidedef.Fields.GetValue("scaley_mid", 1.0f);
+			Sidedef.Fields["offsetx_mid"] = new UniValue(UniversalType.Float, GetRoundedTextureOffset(oldx, xy.X, scalex, Texture != null ? Texture.Width : -1)); //mxd
+
+			//mxd. Don't clamp offsetY of clipped mid textures
+			bool dontClamp = (Texture == null || (!Sidedef.IsFlagSet("wrapmidtex") && !Sidedef.Line.IsFlagSet("wrapmidtex")));
+			Sidedef.Fields["offsety_mid"] = new UniValue(UniversalType.Float, GetRoundedTextureOffset(oldy, xy.Y, scaley, dontClamp ? -1 : Texture.Height));
+		}
+
+		protected override Point GetTextureOffset()
+		{
+			float oldx = Sidedef.Fields.GetValue("offsetx_mid", 0.0f);
+			float oldy = Sidedef.Fields.GetValue("offsety_mid", 0.0f);
+			return new Point((int)oldx, (int)oldy);
+		}
+
+		//mxd
+		protected override void ResetTextureScale() 
+		{
+			Sidedef.Fields.BeforeFieldsChange();
+			if(Sidedef.Fields.ContainsKey("scalex_mid")) Sidedef.Fields.Remove("scalex_mid");
+			if(Sidedef.Fields.ContainsKey("scaley_mid")) Sidedef.Fields.Remove("scaley_mid");
+		}
+
+		//mxd
+		public override void OnTextureFit(FitTextureOptions options) 
+		{
+			if(!General.Map.UDMF) return;
+			if(string.IsNullOrEmpty(Sidedef.MiddleTexture) || Sidedef.MiddleTexture == "-" || !Texture.IsImageLoaded) return;
+			FitTexture(options);
+			Setup();
+		}
+
+		//mxd
+		public override void SelectNeighbours(bool select, bool withSameTexture, bool withSameHeight) 
+		{
+			SelectNeighbours(Sidedef.LongMiddleTexture, select, withSameTexture, withSameHeight);
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/VisualModes/VisualMiddleSingle.cs b/Source/Plugins/BuilderModes/VisualModes/VisualMiddleSingle.cs
new file mode 100644
index 0000000..139a0e7
--- /dev/null
+++ b/Source/Plugins/BuilderModes/VisualModes/VisualMiddleSingle.cs
@@ -0,0 +1,278 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Types;
+using CodeImp.DoomBuilder.VisualModes;
+using CodeImp.DoomBuilder.Data;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	internal sealed class VisualMiddleSingle : BaseVisualGeometrySidedef
+	{
+		#region ================== Constants
+
+		#endregion
+		
+		#region ================== Variables
+
+		#endregion
+		
+		#region ================== Properties
+
+		#endregion
+		
+		#region ================== Constructor / Setup
+		
+		// Constructor
+		public VisualMiddleSingle(BaseVisualMode mode, VisualSector vs, Sidedef s) : base(mode, vs, s)
+		{
+			//mxd
+			geometrytype = VisualGeometryType.WALL_MIDDLE;
+			partname = "mid";
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+		
+		// This builds the geometry. Returns false when no geometry created.
+		public override bool Setup()
+		{
+			Vector2D vl, vr;
+
+			//mxd. lightfog flag support
+			int lightvalue;
+			bool lightabsolute;
+			GetLightValue(out lightvalue, out lightabsolute);
+
+			Vector2D tscale = new Vector2D(Sidedef.Fields.GetValue("scalex_mid", 1.0f),
+										   Sidedef.Fields.GetValue("scaley_mid", 1.0f));
+			Vector2D toffset = new Vector2D(Sidedef.Fields.GetValue("offsetx_mid", 0.0f),
+											Sidedef.Fields.GetValue("offsety_mid", 0.0f));
+			
+			// Left and right vertices for this sidedef
+			if(Sidedef.IsFront)
+			{
+				vl = new Vector2D(Sidedef.Line.Start.Position.x, Sidedef.Line.Start.Position.y);
+				vr = new Vector2D(Sidedef.Line.End.Position.x, Sidedef.Line.End.Position.y);
+			}
+			else
+			{
+				vl = new Vector2D(Sidedef.Line.End.Position.x, Sidedef.Line.End.Position.y);
+				vr = new Vector2D(Sidedef.Line.Start.Position.x, Sidedef.Line.Start.Position.y);
+			}
+
+			// Load sector data
+			SectorData sd = mode.GetSectorData(Sidedef.Sector);
+			
+			// Texture given?
+			if(Sidedef.LongMiddleTexture != MapSet.EmptyLongName)
+			{
+				// Load texture
+				base.Texture = General.Map.Data.GetTextureImage(Sidedef.LongMiddleTexture);
+				if(base.Texture == null || base.Texture is UnknownImage)
+				{
+					base.Texture = General.Map.Data.UnknownTexture3D;
+					setuponloadedtexture = Sidedef.LongMiddleTexture;
+				}
+				else
+				{
+					if(!base.Texture.IsImageLoaded)
+						setuponloadedtexture = Sidedef.LongMiddleTexture;
+				}
+			}
+			else
+			{
+				// Use missing texture
+				base.Texture = General.Map.Data.MissingTexture3D;
+				setuponloadedtexture = 0;
+			}
+			
+			// Get texture scaled size
+			Vector2D tsz = new Vector2D(base.Texture.ScaledWidth, base.Texture.ScaledHeight);
+			tsz = tsz / tscale;
+			
+			// Get texture offsets
+			Vector2D tof = new Vector2D(Sidedef.OffsetX, Sidedef.OffsetY);
+			tof = tof + toffset;
+			tof = tof / tscale;
+			if(General.Map.Config.ScaledTextureOffsets && !base.Texture.WorldPanning)
+				tof = tof * base.Texture.Scale;
+			
+			// Determine texture coordinates plane as they would be in normal circumstances.
+			// We can then use this plane to find any texture coordinate we need.
+			// The logic here is the same as in the original VisualMiddleSingle (except that
+			// the values are stored in a TexturePlane)
+			// NOTE: I use a small bias for the floor height, because if the difference in
+			// height is 0 then the TexturePlane doesn't work!
+			TexturePlane tp = new TexturePlane();
+			float floorbias = (Sidedef.Sector.CeilHeight == Sidedef.Sector.FloorHeight) ? 1.0f : 0.0f;
+			if(Sidedef.Line.IsFlagSet(General.Map.Config.LowerUnpeggedFlag))
+			{
+				// When lower unpegged is set, the middle texture is bound to the bottom
+				tp.tlt.y = tsz.y - (Sidedef.Sector.CeilHeight - Sidedef.Sector.FloorHeight);
+			}
+			tp.trb.x = tp.tlt.x + Sidedef.Line.Length;
+			tp.trb.y = tp.tlt.y + (Sidedef.Sector.CeilHeight - (Sidedef.Sector.FloorHeight + floorbias));
+			
+			// Apply texture offset
+			tp.tlt += tof;
+			tp.trb += tof;
+			
+			// Transform pixel coordinates to texture coordinates
+			tp.tlt /= tsz;
+			tp.trb /= tsz;
+			
+			// Left top and right bottom of the geometry that
+			tp.vlt = new Vector3D(vl.x, vl.y, Sidedef.Sector.CeilHeight);
+			tp.vrb = new Vector3D(vr.x, vr.y, Sidedef.Sector.FloorHeight + floorbias);
+			
+			// Make the right-top coordinates
+			tp.trt = new Vector2D(tp.trb.x, tp.tlt.y);
+			tp.vrt = new Vector3D(tp.vrb.x, tp.vrb.y, tp.vlt.z);
+			
+			// Get ceiling and floor heights
+			float fl = sd.Floor.plane.GetZ(vl);
+			float fr = sd.Floor.plane.GetZ(vr);
+			float cl = sd.Ceiling.plane.GetZ(vl);
+			float cr = sd.Ceiling.plane.GetZ(vr);
+			
+			// Anything to see?
+			if(((cl - fl) > 0.01f) || ((cr - fr) > 0.01f))
+			{
+				// Keep top and bottom planes for intersection testing
+				top = sd.Ceiling.plane;
+				bottom = sd.Floor.plane;
+				
+				// Create initial polygon, which is just a quad between floor and ceiling
+				WallPolygon poly = new WallPolygon();
+				poly.Add(new Vector3D(vl.x, vl.y, fl));
+				poly.Add(new Vector3D(vl.x, vl.y, cl));
+				poly.Add(new Vector3D(vr.x, vr.y, cr));
+				poly.Add(new Vector3D(vr.x, vr.y, fr));
+				
+				// Determine initial color
+				int lightlevel = lightabsolute ? lightvalue : sd.Ceiling.brightnessbelow + lightvalue;
+
+				//mxd. This calculates light with doom-style wall shading
+				PixelColor wallbrightness = PixelColor.FromInt(mode.CalculateBrightness(lightlevel, Sidedef));
+				PixelColor wallcolor = PixelColor.Modulate(sd.Ceiling.colorbelow, wallbrightness);
+				fogfactor = CalculateFogDensity(lightlevel);
+				poly.color = wallcolor.WithAlpha(255).ToInt();
+
+				// Cut out pieces that overlap 3D floors in this sector
+				List<WallPolygon> polygons = new List<WallPolygon> { poly };
+				ClipExtraFloors(polygons, sd.ExtraFloors, false); //mxd
+
+				if(polygons.Count > 0)
+				{
+					// Process the polygon and create vertices
+					List<WorldVertex> verts = CreatePolygonVertices(polygons, tp, sd, lightvalue, lightabsolute);
+					if(verts.Count > 2)
+					{
+						base.SetVertices(verts);
+						return true;
+					}
+				}
+			}
+			
+			base.SetVertices(null); //mxd
+			return false;
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+
+		// Return texture name
+		public override string GetTextureName()
+		{
+			return this.Sidedef.MiddleTexture;
+		}
+
+		// This changes the texture
+		protected override void SetTexture(string texturename)
+		{
+			this.Sidedef.SetTextureMid(texturename);
+			General.Map.Data.UpdateUsedTextures();
+			this.Setup();
+		}
+
+		protected override void SetTextureOffsetX(int x)
+		{
+			Sidedef.Fields.BeforeFieldsChange();
+			Sidedef.Fields["offsetx_mid"] = new UniValue(UniversalType.Float, (float)x);
+		}
+
+		protected override void SetTextureOffsetY(int y)
+		{
+			Sidedef.Fields.BeforeFieldsChange();
+			Sidedef.Fields["offsety_mid"] = new UniValue(UniversalType.Float, (float)y);
+		}
+
+		protected override void MoveTextureOffset(Point xy)
+		{
+			Sidedef.Fields.BeforeFieldsChange();
+			float oldx = Sidedef.Fields.GetValue("offsetx_mid", 0.0f);
+			float oldy = Sidedef.Fields.GetValue("offsety_mid", 0.0f);
+			float scalex = Sidedef.Fields.GetValue("scalex_mid", 1.0f);
+			float scaley = Sidedef.Fields.GetValue("scaley_mid", 1.0f);
+			Sidedef.Fields["offsetx_mid"] = new UniValue(UniversalType.Float, GetRoundedTextureOffset(oldx, xy.X, scalex, Texture.Width)); //mxd
+			Sidedef.Fields["offsety_mid"] = new UniValue(UniversalType.Float, GetRoundedTextureOffset(oldy, xy.Y, scaley, Texture.Height)); //mxd
+		}
+
+		protected override Point GetTextureOffset()
+		{
+			float oldx = Sidedef.Fields.GetValue("offsetx_mid", 0.0f);
+			float oldy = Sidedef.Fields.GetValue("offsety_mid", 0.0f);
+			return new Point((int)oldx, (int)oldy);
+		}
+
+		//mxd
+		protected override void ResetTextureScale() 
+		{
+			Sidedef.Fields.BeforeFieldsChange();
+			if(Sidedef.Fields.ContainsKey("scalex_mid")) Sidedef.Fields.Remove("scalex_mid");
+			if(Sidedef.Fields.ContainsKey("scaley_mid")) Sidedef.Fields.Remove("scaley_mid");
+		}
+
+		//mxd
+		public override void OnTextureFit(FitTextureOptions options) 
+		{
+			if(!General.Map.UDMF) return;
+			if(string.IsNullOrEmpty(Sidedef.MiddleTexture) || Sidedef.MiddleTexture == "-" || !Texture.IsImageLoaded) return;
+			FitTexture(options);
+			Setup();
+		}
+
+		//mxd
+		public override void SelectNeighbours(bool select, bool withSameTexture, bool withSameHeight) 
+		{
+			SelectNeighbours(Sidedef.LongMiddleTexture, select, withSameTexture, withSameHeight);
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/VisualModes/VisualSidedefParts.cs b/Source/Plugins/BuilderModes/VisualModes/VisualSidedefParts.cs
new file mode 100644
index 0000000..23b1edc
--- /dev/null
+++ b/Source/Plugins/BuilderModes/VisualModes/VisualSidedefParts.cs
@@ -0,0 +1,95 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections.Generic;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	internal struct VisualSidedefParts
+	{
+		// Members
+		public readonly VisualUpper upper;
+		public readonly VisualLower lower;
+		public readonly VisualMiddleDouble middledouble;
+		public readonly VisualMiddleSingle middlesingle;
+		public readonly List<VisualMiddle3D> middle3d;
+		public readonly List<VisualMiddleBack> middleback; //mxd
+		public readonly VisualFogBoundary fogboundary; //mxd
+		
+		// Constructor
+		public VisualSidedefParts(VisualUpper u, VisualLower l, VisualMiddleDouble m, VisualFogBoundary f, List<VisualMiddle3D> e, List<VisualMiddleBack> eb)
+		{
+			this.upper = u;
+			this.lower = l;
+			this.middledouble = m;
+			this.middlesingle = null;
+			this.fogboundary = f;
+			this.middle3d = e;
+			this.middleback = eb; //mxd
+		}
+		
+		// Constructor
+		public VisualSidedefParts(VisualMiddleSingle m)
+		{
+			this.upper = null;
+			this.lower = null;
+			this.middledouble = null;
+			this.middlesingle = m;
+			this.middle3d = null;
+			this.middleback = null; //mxd
+			this.fogboundary = null; //mxd
+		}
+		
+		// This calls Setup() on all parts
+		public void SetupAllParts()
+		{
+			if(lower != null) lower.Setup();
+			if(middledouble != null) middledouble.Setup();
+			if(middlesingle != null) middlesingle.Setup();
+			if(fogboundary != null) fogboundary.Setup(); //mxd
+			if(upper != null) upper.Setup();
+			if(middle3d != null)
+			{
+				foreach(VisualMiddle3D m in middle3d) m.Setup();
+			}
+			if(middleback != null) //mxd
+			{
+				foreach(VisualMiddleBack m in middleback) m.Setup();
+			}
+		}
+
+		//mxd
+		public void DeselectAllParts() 
+		{
+			if(lower != null) lower.Selected = false;
+			if(middledouble != null) middledouble.Selected = false;
+			if(middlesingle != null) middlesingle.Selected = false;
+			if(upper != null) upper.Selected = false;
+			if(middle3d != null) 
+			{
+				foreach(VisualMiddle3D m in middle3d) m.Selected = false;
+			}
+			if(middleback != null) 
+			{
+				foreach(VisualMiddleBack m in middleback) m.Selected = false;
+			}
+		}
+	}
+}
diff --git a/Source/Plugins/BuilderModes/VisualModes/VisualUpper.cs b/Source/Plugins/BuilderModes/VisualModes/VisualUpper.cs
new file mode 100644
index 0000000..42cb6bb
--- /dev/null
+++ b/Source/Plugins/BuilderModes/VisualModes/VisualUpper.cs
@@ -0,0 +1,278 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Types;
+using CodeImp.DoomBuilder.VisualModes;
+using CodeImp.DoomBuilder.Data;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	internal sealed class VisualUpper : BaseVisualGeometrySidedef
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		#endregion
+
+		#region ================== Properties
+
+		#endregion
+
+		#region ================== Constructor / Setup
+
+		// Constructor
+		public VisualUpper(BaseVisualMode mode, VisualSector vs, Sidedef s) : base(mode, vs, s)
+		{
+			//mxd
+			geometrytype = VisualGeometryType.WALL_UPPER;
+			partname = "top";
+			
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// This builds the geometry. Returns false when no geometry created.
+		public override bool Setup()
+		{
+			Vector2D vl, vr;
+			
+			//mxd. lightfog flag support
+			int lightvalue;
+			bool lightabsolute;
+			GetLightValue(out lightvalue, out lightabsolute);
+			
+			Vector2D tscale = new Vector2D(Sidedef.Fields.GetValue("scalex_top", 1.0f),
+										   Sidedef.Fields.GetValue("scaley_top", 1.0f));
+			Vector2D toffset = new Vector2D(Sidedef.Fields.GetValue("offsetx_top", 0.0f),
+											Sidedef.Fields.GetValue("offsety_top", 0.0f));
+			
+			// Left and right vertices for this sidedef
+			if(Sidedef.IsFront)
+			{
+				vl = new Vector2D(Sidedef.Line.Start.Position.x, Sidedef.Line.Start.Position.y);
+				vr = new Vector2D(Sidedef.Line.End.Position.x, Sidedef.Line.End.Position.y);
+			}
+			else
+			{
+				vl = new Vector2D(Sidedef.Line.End.Position.x, Sidedef.Line.End.Position.y);
+				vr = new Vector2D(Sidedef.Line.Start.Position.x, Sidedef.Line.Start.Position.y);
+			}
+			
+			// Load sector data
+			SectorData sd = Sector.GetSectorData();
+			SectorData osd = mode.GetSectorData(Sidedef.Other.Sector);
+			if(!osd.Updated) osd.Update();
+			
+			// Texture given?
+			if((Sidedef.LongHighTexture != MapSet.EmptyLongName))
+			{
+				// Load texture
+				base.Texture = General.Map.Data.GetTextureImage(Sidedef.LongHighTexture);
+				if(base.Texture == null || base.Texture is UnknownImage)
+				{
+					base.Texture = General.Map.Data.UnknownTexture3D;
+					setuponloadedtexture = Sidedef.LongHighTexture;
+				}
+				else
+				{
+					if(!base.Texture.IsImageLoaded)
+						setuponloadedtexture = Sidedef.LongHighTexture;
+				}
+			}
+			else
+			{
+				// Use missing texture
+				base.Texture = General.Map.Data.MissingTexture3D;
+				setuponloadedtexture = 0;
+			}
+
+			// Get texture scaled size
+			Vector2D tsz = new Vector2D(base.Texture.ScaledWidth, base.Texture.ScaledHeight);
+			tsz = tsz / tscale;
+			
+			// Get texture offsets
+			Vector2D tof = new Vector2D(Sidedef.OffsetX, Sidedef.OffsetY);
+			tof = tof + toffset;
+			tof = tof / tscale;
+			if(General.Map.Config.ScaledTextureOffsets && !base.Texture.WorldPanning)
+				tof = tof * base.Texture.Scale;
+			
+			// Determine texture coordinates plane as they would be in normal circumstances.
+			// We can then use this plane to find any texture coordinate we need.
+			// The logic here is the same as in the original VisualMiddleSingle (except that
+			// the values are stored in a TexturePlane)
+			// NOTE: I use a small bias for the floor height, because if the difference in
+			// height is 0 then the TexturePlane doesn't work!
+			TexturePlane tp = new TexturePlane();
+			float ceilbias = (Sidedef.Other.Sector.CeilHeight == Sidedef.Sector.CeilHeight) ? 1.0f : 0.0f;
+			if(!Sidedef.Line.IsFlagSet(General.Map.Config.UpperUnpeggedFlag))
+			{
+				// When lower unpegged is set, the lower texture is bound to the bottom
+				tp.tlt.y = tsz.y - ((float)Sidedef.Sector.CeilHeight - Sidedef.Other.Sector.CeilHeight);
+			}
+			tp.trb.x = tp.tlt.x + Sidedef.Line.Length;
+			tp.trb.y = tp.tlt.y + (Sidedef.Sector.CeilHeight - (Sidedef.Other.Sector.CeilHeight + ceilbias));
+			
+			// Apply texture offset
+			tp.tlt += tof;
+			tp.trb += tof;
+			
+			// Transform pixel coordinates to texture coordinates
+			tp.tlt /= tsz;
+			tp.trb /= tsz;
+			
+			// Left top and right bottom of the geometry that
+			tp.vlt = new Vector3D(vl.x, vl.y, Sidedef.Sector.CeilHeight);
+			tp.vrb = new Vector3D(vr.x, vr.y, Sidedef.Other.Sector.CeilHeight + ceilbias);
+			
+			// Make the right-top coordinates
+			tp.trt = new Vector2D(tp.trb.x, tp.tlt.y);
+			tp.vrt = new Vector3D(tp.vrb.x, tp.vrb.y, tp.vlt.z);
+			
+			// Create initial polygon, which is just a quad between floor and ceiling
+			WallPolygon poly = new WallPolygon();
+			poly.Add(new Vector3D(vl.x, vl.y, sd.Floor.plane.GetZ(vl)));
+			poly.Add(new Vector3D(vl.x, vl.y, sd.Ceiling.plane.GetZ(vl)));
+			poly.Add(new Vector3D(vr.x, vr.y, sd.Ceiling.plane.GetZ(vr)));
+			poly.Add(new Vector3D(vr.x, vr.y, sd.Floor.plane.GetZ(vr)));
+			
+			// Determine initial color
+			int lightlevel = lightabsolute ? lightvalue : sd.Ceiling.brightnessbelow + lightvalue;
+
+			//mxd. This calculates light with doom-style wall shading
+			PixelColor wallbrightness = PixelColor.FromInt(mode.CalculateBrightness(lightlevel, Sidedef));
+			PixelColor wallcolor = PixelColor.Modulate(sd.Ceiling.colorbelow, wallbrightness);
+			fogfactor = CalculateFogDensity(lightlevel);
+			poly.color = wallcolor.WithAlpha(255).ToInt();
+			
+			// Cut off the part below the other ceiling
+			CropPoly(ref poly, osd.Ceiling.plane, false);
+			
+			// Cut out pieces that overlap 3D floors in this sector
+			List<WallPolygon> polygons = new List<WallPolygon> { poly };
+			ClipExtraFloors(polygons, sd.ExtraFloors, false); //mxd
+
+			if(polygons.Count > 0)
+			{
+				// Keep top and bottom planes for intersection testing
+				top = sd.Ceiling.plane;
+				bottom = osd.Ceiling.plane;
+				
+				// Process the polygon and create vertices
+				List<WorldVertex> verts = CreatePolygonVertices(polygons, tp, sd, lightvalue, lightabsolute);
+				if(verts.Count > 2)
+				{
+					base.SetVertices(verts);
+					return true;
+				}
+			}
+			
+			base.SetVertices(null); //mxd
+			return false;
+		}
+		
+		#endregion
+
+		#region ================== Methods
+
+		// Return texture name
+		public override string GetTextureName()
+		{
+			return this.Sidedef.HighTexture;
+		}
+
+		// This changes the texture
+		protected override void SetTexture(string texturename)
+		{
+			this.Sidedef.SetTextureHigh(texturename);
+			General.Map.Data.UpdateUsedTextures();
+			this.Setup();
+
+			//mxd. Other sector also may require updating
+			SectorData sd = mode.GetSectorData(Sidedef.Sector);
+			if(sd.ExtraFloors.Count > 0)
+				((BaseVisualSector)mode.GetVisualSector(Sidedef.Sector)).Rebuild();
+		}
+
+		protected override void SetTextureOffsetX(int x)
+		{
+			Sidedef.Fields.BeforeFieldsChange();
+			Sidedef.Fields["offsetx_top"] = new UniValue(UniversalType.Float, (float)x);
+		}
+
+		protected override void SetTextureOffsetY(int y)
+		{
+			Sidedef.Fields.BeforeFieldsChange();
+			Sidedef.Fields["offsety_top"] = new UniValue(UniversalType.Float, (float)y);
+		}
+
+		protected override void MoveTextureOffset(Point xy)
+		{
+			Sidedef.Fields.BeforeFieldsChange();
+			float oldx = Sidedef.Fields.GetValue("offsetx_top", 0.0f);
+			float oldy = Sidedef.Fields.GetValue("offsety_top", 0.0f);
+			float scalex = Sidedef.Fields.GetValue("scalex_top", 1.0f);
+			float scaley = Sidedef.Fields.GetValue("scaley_top", 1.0f);
+			Sidedef.Fields["offsetx_top"] = new UniValue(UniversalType.Float, GetRoundedTextureOffset(oldx, xy.X, scalex, Texture != null ? Texture.Width : -1)); //mxd
+			Sidedef.Fields["offsety_top"] = new UniValue(UniversalType.Float, GetRoundedTextureOffset(oldy, xy.Y, scaley, Texture != null ? Texture.Height : -1)); //mxd
+		}
+
+		protected override Point GetTextureOffset()
+		{
+			float oldx = Sidedef.Fields.GetValue("offsetx_top", 0.0f);
+			float oldy = Sidedef.Fields.GetValue("offsety_top", 0.0f);
+			return new Point((int)oldx, (int)oldy);
+		}
+
+		//mxd
+		protected override void ResetTextureScale() 
+		{
+			Sidedef.Fields.BeforeFieldsChange();
+			if(Sidedef.Fields.ContainsKey("scalex_top")) Sidedef.Fields.Remove("scalex_top");
+			if(Sidedef.Fields.ContainsKey("scaley_top")) Sidedef.Fields.Remove("scaley_top");
+		}
+
+		//mxd
+		public override void OnTextureFit(FitTextureOptions options) 
+		{
+			if(!General.Map.UDMF) return;
+			if(!Sidedef.HighRequired() || string.IsNullOrEmpty(Sidedef.HighTexture) || Sidedef.HighTexture == "-" || !Texture.IsImageLoaded) return;
+			FitTexture(options);
+			Setup();
+		}
+
+		//mxd
+		public override void SelectNeighbours(bool select, bool withSameTexture, bool withSameHeight) 
+		{
+			SelectNeighbours(Sidedef.LongHighTexture, select, withSameTexture, withSameHeight);
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/BuilderModes/VisualModes/WallPolygon.cs b/Source/Plugins/BuilderModes/VisualModes/WallPolygon.cs
new file mode 100644
index 0000000..d5c6ef9
--- /dev/null
+++ b/Source/Plugins/BuilderModes/VisualModes/WallPolygon.cs
@@ -0,0 +1,25 @@
+#region === Copyright (c) 2010 Pascal van der Heiden ===
+
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Geometry;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes
+{
+	internal class WallPolygon : List<Vector3D>
+	{
+		// The color that the wall should have
+		public int color;
+		
+		// Constructors
+		public WallPolygon() { }
+		public WallPolygon(int capacity) : base(capacity) { }
+		
+		// This copies all the wall properties
+		public void CopyProperties(WallPolygon target)
+		{
+			target.color = this.color;
+		}
+	}
+}
diff --git a/Source/Plugins/ColorPicker/BuilderPlug.cs b/Source/Plugins/ColorPicker/BuilderPlug.cs
new file mode 100644
index 0000000..e0f4301
--- /dev/null
+++ b/Source/Plugins/ColorPicker/BuilderPlug.cs
@@ -0,0 +1,167 @@
+#region ================== Namespaces
+
+using System.Drawing;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Actions;
+using CodeImp.DoomBuilder.ColorPicker.Windows;
+using CodeImp.DoomBuilder.Plugins;
+using CodeImp.DoomBuilder.VisualModes;
+using CodeImp.DoomBuilder.Windows;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.ColorPicker
+{
+	public class BuilderPlug : Plug
+	{
+		private static BuilderPlug me;
+		public static BuilderPlug Me { get { return me; } }
+
+		public override int MinimumRevision { get { return 1869; } }
+
+		public override string Name { get { return "Color Picker"; } }
+
+		private IColorPicker form;
+		private ToolsForm toolsform;
+
+		private Point formLocation; //used to keep form's location constant
+
+		public override void OnInitialize() 
+		{
+			base.OnInitialize();
+			me = this;
+
+			// Load menus form
+			toolsform = new ToolsForm();
+
+			General.Actions.BindMethods(this);
+		}
+
+		public override void OnMapOpenEnd() 
+		{
+			base.OnMapOpenEnd();
+			toolsform.Register();
+		}
+
+		public override void OnMapNewEnd() 
+		{
+			base.OnMapNewEnd();
+			toolsform.Register();
+		}
+
+		public override void OnMapCloseEnd() 
+		{
+			base.OnMapCloseEnd();
+			toolsform.Unregister();
+		}
+
+		public override void OnReloadResources() 
+		{
+			base.OnReloadResources();
+			toolsform.Register();
+		}
+
+		public override void Dispose() 
+		{
+			base.Dispose();
+			General.Actions.UnbindMethods(this);
+
+			if(form != null) form.Close();
+			form = null;
+
+			if(toolsform != null) 
+			{
+				toolsform.Unregister();
+				toolsform.Dispose();
+				toolsform = null;
+			}
+		}
+
+		[BeginAction("togglelightpannel")]
+		private void ToggleLightPannel() 
+		{
+			if(General.Editing.Mode == null) return;
+			string currentModeName = General.Editing.Mode.GetType().Name;
+
+			//display one of colorPickers or tell the user why we can't do that
+			if(currentModeName == "ThingsMode") 
+			{
+				if(General.Map.Map.SelectedThingsCount == 0)
+				{
+					General.Interface.DisplayStatus(StatusType.Warning, "Select some lights first!");
+					return;
+				}
+				form = new LightColorPicker();
+			} 
+			else if(currentModeName == "SectorsMode") 
+			{
+				if(General.Map.UDMF) 
+				{
+					if(General.Map.Map.SelectedSectorsCount == 0) 
+					{
+						General.Interface.DisplayStatus(StatusType.Warning, "Select some sectors first!");
+						return;
+					}
+					form = new SectorColorPicker();
+				} 
+				else 
+				{
+					General.Interface.DisplayStatus(StatusType.Warning, "Sector colors can only be set if map is in UDMF format!");
+					return;
+				}
+			} 
+			else if(currentModeName == "BaseVisualMode") 
+			{
+				//nothing selected in visual mode?
+				if( ((VisualMode)General.Editing.Mode).GetSelectedVisualThings(true).Count == 0 ) 
+				{
+					//check sectors
+					int selectedSectorsCount = ((VisualMode)General.Editing.Mode).GetSelectedVisualSectors(true).Count;
+					if(General.Map.UDMF && (selectedSectorsCount > 0 || General.Map.Map.SelectedSectorsCount > 0)) 
+					{
+						form = new SectorColorPicker();
+					} 
+					else 
+					{
+						General.Interface.DisplayStatus(StatusType.Warning, "Select some lights " + (General.Map.UDMF ? ", sectors or surfaces " : "") + "first!");
+						return;
+					}
+				} 
+				else 
+				{
+					form = new LightColorPicker();
+				}
+			} 
+			else //wrong mode
+			{ 
+				General.Interface.DisplayStatus(StatusType.Warning, "Switch to" + (General.Map.UDMF ? " Sectors," : "") + " Things or GZDoom Visual Mode first!");
+				return;
+			}
+
+			if(form.Setup(currentModeName)) 
+			{
+				if(formLocation.X == 0 && formLocation.Y == 0) 
+				{
+					Size displaySize = General.Interface.Display.Size;
+					Point displayLocation = General.Interface.Display.LocationAbs;
+					formLocation = new Point(displayLocation.X + displaySize.Width - form.Width - 16, displayLocation.Y + 16);
+				} 
+				form.Location = formLocation;
+				form.FormClosed += form_FormClosed;
+				form.ShowDialog(General.Interface);
+			} 
+			else 
+			{
+				form.Dispose();
+				form = null;
+			}
+		}
+
+		private void form_FormClosed(object sender, FormClosedEventArgs e) 
+		{
+			formLocation = form.Location;
+			form.Dispose();
+			form = null;
+		}
+	}
+}
\ No newline at end of file
diff --git a/Source/Plugins/ColorPicker/ColorChangedEventArgs.cs b/Source/Plugins/ColorPicker/ColorChangedEventArgs.cs
new file mode 100644
index 0000000..f7ec097
--- /dev/null
+++ b/Source/Plugins/ColorPicker/ColorChangedEventArgs.cs
@@ -0,0 +1,19 @@
+using System;
+
+namespace CodeImp.DoomBuilder.ColorPicker
+{
+	public class ColorChangedEventArgs : EventArgs 
+	{
+		private ColorHandler.RGB mRGB;
+		private ColorHandler.HSV mHSV;
+
+		public ColorChangedEventArgs(ColorHandler.RGB RGB, ColorHandler.HSV HSV) 
+		{
+			mRGB = RGB;
+			mHSV = HSV;
+		}
+
+		public ColorHandler.RGB RGB { get { return mRGB; } }
+		public ColorHandler.HSV HSV { get { return mHSV; } }
+	}
+}
\ No newline at end of file
diff --git a/Source/Plugins/ColorPicker/ColorHandler.cs b/Source/Plugins/ColorPicker/ColorHandler.cs
new file mode 100644
index 0000000..1af45aa
--- /dev/null
+++ b/Source/Plugins/ColorPicker/ColorHandler.cs
@@ -0,0 +1,214 @@
+using System;
+using System.Drawing;
+
+namespace CodeImp.DoomBuilder.ColorPicker
+{
+	public static class ColorHandler 
+	{
+		// Handle conversions between RGB and HSV    
+		// (and Color types, as well).
+		public struct RGB 
+		{
+			// All values are between 0 and 255.
+			public int Red;
+			public int Green;
+			public int Blue;
+
+			public RGB(int R, int G, int B) 
+			{
+				Red = R;
+				Green = G;
+				Blue = B;
+			}
+		}
+
+		public struct HSV 
+		{
+			// All values are between 0 and 255.
+			public int Hue;
+			public int Saturation;
+			public int value;
+
+			public HSV(int H, int S, int V) 
+			{
+				Hue = H;
+				Saturation = S;
+				value = V;
+			}
+
+			public override string ToString() 
+			{
+				return String.Format("({0}, {1}, {2})", Hue, Saturation, value);
+			}
+		}
+
+		public static RGB HSVtoRGB(int H, int S, int V) 
+		{
+			// H, S, and V must all be between 0 and 255.
+			return HSVtoRGB(new HSV(H, S, V));
+		}
+
+		public static Color HSVtoColor(HSV hsv) 
+		{
+			RGB RGB = HSVtoRGB(hsv);
+			return Color.FromArgb(RGB.Red, RGB.Green, RGB.Blue);
+		}
+
+		public static Color HSVtoColor(int H, int S, int V) 
+		{
+			return HSVtoColor(new HSV(H, S, V));
+		}
+
+		public static Color RGBtoColor(RGB rgb) 
+		{
+			return Color.FromArgb(rgb.Red, rgb.Green, rgb.Blue);
+		}
+
+		public static RGB HSVtoRGB(HSV HSV) 
+		{
+			// HSV contains values scaled as in the color wheel:
+			// that is, all from 0 to 255. 
+
+			// for( this code to work, HSV.Hue needs
+			// to be scaled from 0 to 360 (it//s the angle of the selected
+			// point within the circle). HSV.Saturation and HSV.value must be 
+			// scaled to be between 0 and 1.
+
+			float r = 0;
+			float g = 0;
+			float b = 0;
+
+			// Scale Hue to be between 0 and 360. Saturation
+			// and value scale to be between 0 and 1.
+			float h = ((float)HSV.Hue / 255 * 360) % 360;
+			float s = (float)HSV.Saturation / 255;
+			float v = (float)HSV.value / 255;
+
+			if(s == 0) 
+			{
+				// If s is 0, all colors are the same.
+				// This is some flavor of gray.
+				r = v;
+				g = v;
+				b = v;
+			} 
+			else 
+			{
+				// The color wheel consists of 6 sectors.
+				// Figure out which sector you//re in.
+				float sectorPos = h / 60;
+				int sectorNumber = (int)(Math.Floor(sectorPos));
+
+				// get the fractional part of the sector.
+				// That is, how many degrees into the sector
+				// are you?
+				float fractionalSector = sectorPos - sectorNumber;
+
+				// Calculate values for the three axes
+				// of the color. 
+				float p = v * (1 - s);
+				float q = v * (1 - (s * fractionalSector));
+				float t = v * (1 - (s * (1 - fractionalSector)));
+
+				// Assign the fractional colors to r, g, and b
+				// based on the sector the angle is in.
+				switch(sectorNumber) 
+				{
+					case 0:
+						r = v;
+						g = t;
+						b = p;
+						break;
+
+					case 1:
+						r = q;
+						g = v;
+						b = p;
+						break;
+
+					case 2:
+						r = p;
+						g = v;
+						b = t;
+						break;
+
+					case 3:
+						r = p;
+						g = q;
+						b = v;
+						break;
+
+					case 4:
+						r = t;
+						g = p;
+						b = v;
+						break;
+
+					case 5:
+						r = v;
+						g = p;
+						b = q;
+						break;
+				}
+			}
+			// return an RGB structure, with values scaled
+			// to be between 0 and 255.
+			return new RGB((int)(r * 255), (int)(g * 255), (int)(b * 255));
+		}
+
+		public static HSV RGBtoHSV(RGB RGB) 
+		{
+			// In this function, R, G, and B values must be scaled 
+			// to be between 0 and 1.
+			// HSV.Hue will be a value between 0 and 360, and 
+			// HSV.Saturation and value are between 0 and 1.
+			// The code must scale these to be between 0 and 255 for
+			// the purposes of this application.
+
+			float r = (float)RGB.Red / 255;
+			float g = (float)RGB.Green / 255;
+			float b = (float)RGB.Blue / 255;
+
+			float h, s, v;
+
+			float min = Math.Min(Math.Min(r, g), b);
+			float max = Math.Max(Math.Max(r, g), b);
+			v = max;
+			float delta = max - min;
+			if(max == 0 || delta == 0) 
+			{
+				// R, G, and B must be 0, or all the same. In this case, S is 0, and H is undefined.
+				// Using H = 0 is as good as any...
+				s = 0;
+				h = 0;
+			} 
+			else 
+			{
+				s = delta / max;
+				if(r == max) 
+				{
+					// Between Yellow and Magenta
+					h = (g - b) / delta;
+				} 
+				else if(g == max) 
+				{
+					// Between Cyan and Yellow
+					h = 2 + (b - r) / delta;
+				} 
+				else 
+				{
+					// Between Magenta and Cyan
+					h = 4 + (r - g) / delta;
+				}
+
+			}
+			// Scale h to be between 0 and 360. 
+			// This may require adding 360, if the value is negative.
+			h *= 60;
+			if(h < 0) h += 360;
+
+			// Scale to the requirements of this application. All values are between 0 and 255.
+			return new HSV((int)(h / 360 * 255), (int)(s * 255), (int)(v * 255));
+		}
+	}
+}
diff --git a/Source/Plugins/ColorPicker/ColorPicker.csproj b/Source/Plugins/ColorPicker/ColorPicker.csproj
new file mode 100644
index 0000000..52d64ca
--- /dev/null
+++ b/Source/Plugins/ColorPicker/ColorPicker.csproj
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{A4761900-0EA3-4FE4-A919-847FD5080EFC}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>CodeImp.DoomBuilder.ColorPicker</RootNamespace>
+    <AssemblyName>ColorPicker</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\Build\Plugins\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <PlatformTarget>x86</PlatformTarget>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>
+    </DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\Build\Plugins\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <PlatformTarget>x86</PlatformTarget>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug + Profiler|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\..\..\Build\Plugins\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;PROFILE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release + Profiler|x86' ">
+    <OutputPath>..\..\..\Build\Plugins\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="BuilderPlug.cs" />
+    <Compile Include="ColorChangedEventArgs.cs" />
+    <Compile Include="ColorHandler.cs" />
+    <Compile Include="ColorPickerType.cs" />
+    <Compile Include="ColorWheel.cs" />
+    <Compile Include="Controls\ColorPickerControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Controls\ColorPickerControl.designer.cs">
+      <DependentUpon>ColorPickerControl.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\ColorPickerSlider.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Controls\ColorPickerSlider.Designer.cs">
+      <DependentUpon>ColorPickerSlider.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\ColorPickerSliderEventArgs.cs" />
+    <Compile Include="IColorPicker.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs">
+    </Compile>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Windows\LightColorPicker.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Windows\LightColorPicker.Designer.cs">
+      <DependentUpon>LightColorPicker.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Windows\SectorColorPicker.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Windows\SectorColorPicker.Designer.cs">
+      <DependentUpon>SectorColorPicker.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Windows\ToolForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Windows\ToolForm.Designer.cs">
+      <DependentUpon>ToolForm.cs</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Controls\ColorPickerControl.resx">
+      <DependentUpon>ColorPickerControl.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Windows\LightColorPicker.resx">
+      <DependentUpon>LightColorPicker.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Windows\ToolForm.resx">
+      <DependentUpon>ToolForm.cs</DependentUpon>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Core\Builder.csproj">
+      <Project>{818B3D10-F791-4C3F-9AF5-BB2D0079B63C}</Project>
+      <Name>Builder</Name>
+      <Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Controls\ColorPickerSlider.resx">
+      <DependentUpon>ColorPickerSlider.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Resources\Actions.cfg" />
+    <EmbeddedResource Include="Windows\SectorColorPicker.resx">
+      <DependentUpon>SectorColorPicker.cs</DependentUpon>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\cp.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/Source/Plugins/ColorPicker/ColorPickerType.cs b/Source/Plugins/ColorPicker/ColorPickerType.cs
new file mode 100644
index 0000000..ea916db
--- /dev/null
+++ b/Source/Plugins/ColorPicker/ColorPickerType.cs
@@ -0,0 +1,8 @@
+
+namespace CodeImp.DoomBuilder.ColorPicker {
+	public enum ColorPickerType {
+		CP_NONE = 0,
+		CP_LIGHT = 1,
+		CP_SECTOR = 2
+	}
+}
diff --git a/Source/Plugins/ColorPicker/ColorWheel.cs b/Source/Plugins/ColorPicker/ColorWheel.cs
new file mode 100644
index 0000000..5297510
--- /dev/null
+++ b/Source/Plugins/ColorPicker/ColorWheel.cs
@@ -0,0 +1,477 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Drawing.Imaging;
+
+namespace CodeImp.DoomBuilder.ColorPicker 
+{
+	public sealed class ColorWheel : IDisposable 
+	{
+
+		// These resources should be disposed
+		// of when you're done with them.
+		private Graphics g;
+		private Region colorRegion;
+		private Region brightnessRegion;
+		private Bitmap colorImage;
+
+		public delegate void ColorChangedEventHandler(object sender, ColorChangedEventArgs e);
+		public ColorChangedEventHandler ColorChanged;
+
+		// Keep track of the current mouse state. 
+		private enum MouseState 
+		{
+			MouseUp,
+			ClickOnColor,
+			DragInColor,
+			ClickOnBrightness,
+			DragInBrightness,
+			ClickOutsideRegion,
+			DragOutsideRegion,
+		}
+		private MouseState currentState = MouseState.MouseUp;
+
+		// The code needs to convert back and forth between 
+		// degrees and radians. There are 2*PI radians in a 
+		// full circle, and 360 degrees. This constant allows
+		// you to convert back and forth.
+		private const float DEGREES_PER_RADIAN = 180.0f / (float)Math.PI;
+
+		// COLOR_COUNT represents the number of distinct colors
+		// used to create the circular gradient. Its value 
+		// is somewhat arbitrary -- change this to 6, for 
+		// example, to see what happens. 1536 (6 * 256) seems 
+		// a good compromise -- it's enough to get a full 
+		// range of colors, but it doesn't overwhelm the processor
+		// attempting to generate the image. The color wheel
+		// contains 6 sections, and each section displays 
+		// 256 colors. Seems like a reasonable compromise.
+		private const int COLOR_COUNT = 6 * 256;
+
+		private Point centerPoint;
+		private int radius;
+
+		private Rectangle colorRectangle;
+		private Rectangle brightnessRectangle;
+		private int brightnessX;
+		private float brightnessScaling;
+
+		// selectedColor is the actual value selected by the user. fullColor is the same color, 
+		// with its brightness set to 255.
+		private Color selectedColor = Color.White;
+		private Color fullColor;
+
+		private ColorHandler.RGB RGB;
+		private ColorHandler.HSV HSV;
+
+		// Locations for the two "pointers" on the form.
+		private Point colorPoint;
+		private Point brightnessPoint;
+
+		private int brightness;
+		private int brightnessMin;
+		private int brightnessMax;
+
+		public Color Color { get { return selectedColor; } }
+
+		public ColorWheel(Rectangle colorRectangle, Rectangle brightnessRectangle) 
+		{
+
+			// Caller must provide locations for color wheel
+			// (colorRectangle), brightness "strip" (brightnessRectangle)
+			// and location to display selected color (selectedColorRectangle).
+
+			using (GraphicsPath path = new GraphicsPath()) 
+			{
+				// Store away locations for later use. 
+				this.colorRectangle = colorRectangle;
+				this.brightnessRectangle = brightnessRectangle;
+				//this.selectedColorRectangle = selectedColorRectangle;
+
+				// Calculate the center of the circle.
+				// Start with the location, then offset
+				// the point by the radius.
+				// Use the smaller of the width and height of
+				// the colorRectangle value.
+				this.radius = Math.Min(colorRectangle.Width, colorRectangle.Height) / 2;
+				this.centerPoint = colorRectangle.Location;
+				this.centerPoint.Offset(radius, radius);
+
+				// Start the pointer in the center.
+				this.colorPoint = this.centerPoint;
+
+				// Create a region corresponding to the color circle.
+				// Code uses this later to determine if a specified
+				// point is within the region, using the IsVisible 
+				// method.
+				path.AddEllipse(colorRectangle);
+				colorRegion = new Region(path);
+
+				// set { the range for the brightness selector.
+				this.brightnessMin = this.brightnessRectangle.Top;
+				this.brightnessMax = this.brightnessRectangle.Bottom;
+
+				// Create a region corresponding to the
+				// brightness rectangle, with a little extra 
+				// "breathing room". 
+
+				path.AddRectangle(new Rectangle(brightnessRectangle.Left, brightnessRectangle.Top - 10, brightnessRectangle.Width + 10, brightnessRectangle.Height + 20));
+				// Create region corresponding to brightness
+				// rectangle. Later code uses this to 
+				// determine if a specified point is within
+				// the region, using the IsVisible method.
+				brightnessRegion = new Region(path);
+
+				// Set the location for the brightness indicator "marker".
+				// Also calculate the scaling factor, scaling the height
+				// to be between 0 and 255. 
+				brightnessX = brightnessRectangle.Left + brightnessRectangle.Width;
+				brightnessScaling = 255.0f / (brightnessMax - brightnessMin);
+
+				// Calculate the location of the brightness
+				// pointer. Assume it's at the highest position.
+				brightnessPoint = new Point(brightnessX, brightnessMax);
+
+				// Create the bitmap that contains the circular gradient.
+				CreateGradient();
+			}
+		}
+
+		private void OnColorChanged(ColorHandler.RGB RGB, ColorHandler.HSV HSV) 
+		{
+			ColorChangedEventArgs e = new ColorChangedEventArgs(RGB, HSV);
+			ColorChanged(this, e);
+		}
+
+		void IDisposable.Dispose() 
+		{
+			// Dispose of graphic resources
+			if(colorImage != null) colorImage.Dispose();
+			if(colorRegion != null) colorRegion.Dispose();
+			if(brightnessRegion != null) brightnessRegion.Dispose();
+			if(g != null) g.Dispose();
+		}
+
+		public void SetMouseUp() 
+		{
+			// Indicate that the user has
+			// released the mouse.
+			currentState = MouseState.MouseUp;
+		}
+
+		public void Draw(Graphics g, ColorHandler.RGB RGB) 
+		{
+			// Given RGB values, calculate HSV and then update the screen.
+			this.g = g;
+			this.HSV = ColorHandler.RGBtoHSV(RGB);
+			CalcCoordsAndUpdate(this.HSV);
+			UpdateDisplay();
+		}
+
+		public void Draw(Graphics g, Point mousePoint) 
+		{
+			// You've moved the mouse. 
+			// Now update the screen to match.
+
+			// Keep track of the previous color pointer point, 
+			// so you can put the mouse there in case the 
+			// user has clicked outside the circle.
+			Point newColorPoint = colorPoint;
+			Point newBrightnessPoint = brightnessPoint;
+
+			// Store this away for later use.
+			this.g = g;
+
+			if(currentState == MouseState.MouseUp) 
+			{
+				if(!mousePoint.IsEmpty) 
+				{
+					if(colorRegion.IsVisible(mousePoint)) 
+					{
+						// Is the mouse point within the color circle?
+						// If so, you just clicked on the color wheel.
+						currentState = MouseState.ClickOnColor;
+					} 
+					else if(brightnessRegion.IsVisible(mousePoint)) 
+					{
+						// Is the mouse point within the brightness area?
+						// You clicked on the brightness area.
+						currentState = MouseState.ClickOnBrightness;
+					} 
+					else 
+					{
+						// Clicked outside the color and the brightness
+						// regions. In that case, just put the 
+						// pointers back where they were.
+						currentState = MouseState.ClickOutsideRegion;
+					}
+				}
+			}
+
+			switch(currentState) 
+			{
+				case MouseState.ClickOnBrightness:
+				case MouseState.DragInBrightness:
+					// Calculate new color information
+					// based on the brightness, which may have changed.
+					Point newPoint = mousePoint;
+					if(newPoint.Y < brightnessMin) 
+					{
+						newPoint.Y = brightnessMin;
+					} 
+					else if(newPoint.Y > brightnessMax) 
+					{
+						newPoint.Y = brightnessMax;
+					}
+					newBrightnessPoint = new Point(brightnessX, newPoint.Y);
+					brightness = (int)((brightnessMax - newPoint.Y) * brightnessScaling);
+					HSV.value = brightness;
+					RGB = ColorHandler.HSVtoRGB(HSV);
+					break;
+
+				case MouseState.ClickOnColor:
+				case MouseState.DragInColor:
+					// Calculate new color information
+					// based on selected color, which may have changed.
+					newColorPoint = mousePoint;
+
+					// Calculate x and y distance from the center,
+					// and then calculate the angle corresponding to the
+					// new location.
+					Point delta = new Point(mousePoint.X - centerPoint.X, mousePoint.Y - centerPoint.Y);
+					int degrees = CalcDegrees(delta);
+
+					// Calculate distance from the center to the new point 
+					// as a fraction of the radius. Use your old friend, 
+					// the Pythagorean theorem, to calculate this value.
+					float distance = (float)Math.Sqrt(delta.X * delta.X + delta.Y * delta.Y) / radius;
+
+					if(currentState == MouseState.DragInColor) 
+					{
+						if(distance > 1) 
+						{
+							// Mouse is down, and outside the circle, but you 
+							// were previously dragging in the color circle. 
+							// What to do?
+							// In that case, move the point to the edge of the 
+							// circle at the correct angle.
+							distance = 1;
+							newColorPoint = GetPoint(degrees, radius, centerPoint);
+						}
+					}
+
+					// Calculate the new HSV and RGB values.
+					HSV.Hue = degrees * 255 / 360;
+					HSV.Saturation = (int)(distance * 255);
+					HSV.value = brightness;
+					RGB = ColorHandler.HSVtoRGB(HSV);
+					fullColor = ColorHandler.HSVtoColor(HSV.Hue, HSV.Saturation, 255);
+					break;
+			}
+			selectedColor = ColorHandler.HSVtoColor(HSV);
+
+			// Raise an event back to the parent form,
+			// so the form can update any UI it's using 
+			// to display selected color values.
+			OnColorChanged(RGB, HSV);
+
+			// On the way out, set the new state.
+			switch(currentState) 
+			{
+				case MouseState.ClickOnBrightness:
+					currentState = MouseState.DragInBrightness;
+					break;
+				case MouseState.ClickOnColor:
+					currentState = MouseState.DragInColor;
+					break;
+				case MouseState.ClickOutsideRegion:
+					currentState = MouseState.DragOutsideRegion;
+					break;
+			}
+
+			// Store away the current points for next time.
+			colorPoint = newColorPoint;
+			brightnessPoint = newBrightnessPoint;
+
+			// Draw the gradients and points. 
+			UpdateDisplay();
+		}
+
+		private Point CalcBrightnessPoint(int brightness) 
+		{
+			// Take the value for brightness (0 to 255), scale to the 
+			// scaling used in the brightness bar, then add the value 
+			// to the bottom of the bar. return the correct point at which 
+			// to display the brightness pointer.
+			return new Point(brightnessX, (int)(brightnessMax - brightness / brightnessScaling));
+		}
+
+		private void UpdateDisplay() 
+		{
+			// Update the gradients, and place the pointers correctly based on colors and 
+			// brightness.
+			CreateGradient();
+
+			// Draw the saved color wheel image.
+			g.DrawImage(colorImage, colorRectangle);
+
+			// Draw the "brightness" rectangle.
+			DrawLinearGradient(fullColor);
+			// Draw the two pointers.
+			DrawColorPointer(colorPoint);
+			DrawBrightnessPointer(brightnessPoint);
+		}
+
+		private void CalcCoordsAndUpdate(ColorHandler.HSV HSV) 
+		{
+			// Convert color to real-world coordinates and then calculate
+			// the various points. HSV.Hue represents the degrees (0 to 360), 
+			// HSV.Saturation represents the radius. 
+			// This procedure doesn't draw anything--it simply 
+			// updates class-level variables. The UpdateDisplay
+			// procedure uses these values to update the screen.
+
+			// Given the angle (HSV.Hue), and distance from 
+			// the center (HSV.Saturation), and the center, 
+			// calculate the point corresponding to 
+			// the selected color, on the color wheel.
+			colorPoint = GetPoint((float)HSV.Hue / 255 * 360,
+				(float)HSV.Saturation / 255 * radius, centerPoint);
+
+			// Given the brightness (HSV.value), calculate the 
+			// point corresponding to the brightness indicator.
+			brightnessPoint = CalcBrightnessPoint(HSV.value);
+
+			// Store information about the selected color.
+			brightness = HSV.value;
+			selectedColor = ColorHandler.HSVtoColor(HSV);
+			RGB = ColorHandler.HSVtoRGB(HSV);
+
+			// The full color is the same as HSV, except that the 
+			// brightness is set to full (255). This is the top-most
+			// color in the brightness gradient.
+			fullColor = ColorHandler.HSVtoColor(HSV.Hue, HSV.Saturation, 255);
+		}
+
+		private void DrawLinearGradient(Color TopColor) 
+		{
+			// Given the top color, draw a linear gradient
+			// ranging from black to the top color. Use the 
+			// brightness rectangle as the area to fill.
+			using (LinearGradientBrush lgb = new LinearGradientBrush(brightnessRectangle, TopColor,
+							 Color.Black, LinearGradientMode.Vertical)) 
+			{
+				g.FillRectangle(lgb, brightnessRectangle);
+			}
+		}
+
+		private static int CalcDegrees(Point pt) 
+		{
+			int degrees;
+
+			if(pt.X == 0) 
+			{
+				// The point is on the y-axis. Determine whether it's above or below the x-axis, and return the 
+				// corresponding angle. Note that the orientation of the y-coordinate is backwards. That is, 
+				// A positive Y value indicates a point BELOW the x-axis.
+				degrees = pt.Y > 0 ? 270 : 90;
+			} 
+			else 
+			{
+				// This value needs to be multiplied by -1 because the y-coordinate
+				// is opposite from the normal direction here.
+				// That is, a y-coordinate that's "higher" on the form has a lower y-value, in this coordinate
+				// system. So everything's off by a factor of -1 when performing the ratio calculations.
+				degrees = (int)(-Math.Atan((float)pt.Y / pt.X) * DEGREES_PER_RADIAN);
+
+				// If the x-coordinate of the selected point is to the left of the center of the circle, you 
+				// need to add 180 degrees to the angle. ArcTan only gives you a value on the right-hand side 
+				// of the circle.
+				if(pt.X < 0) degrees += 180;
+
+				// Ensure that the return value is between 0 and 360.
+				degrees = (degrees + 360) % 360;
+			}
+			return degrees;
+		}
+
+		private void CreateGradient() 
+		{
+			// Create a new PathGradientBrush, supplying an array of points created by calling
+			// the GetPoints method.
+			using (PathGradientBrush pgb = new PathGradientBrush(GetPoints(radius, new Point(radius, radius)))) 
+			{
+				// Set the various properties. Note the SurroundColors property, which contains an array of points, 
+				// in a one-to-one relationship with the points that created the gradient.
+				pgb.CenterColor = Color.White;
+				pgb.CenterPoint = new PointF(radius, radius);
+				pgb.SurroundColors = GetColors();
+
+				// Create a new bitmap containing the color wheel gradient, so the 
+				// code only needs to do all this work once. Later code uses the bitmap
+				// rather than recreating the gradient.
+				colorImage = new Bitmap(colorRectangle.Width, colorRectangle.Height, PixelFormat.Format32bppArgb);
+
+				using (Graphics newGraphics = Graphics.FromImage(colorImage)) 
+				{
+					newGraphics.FillEllipse(pgb, 0, 0, colorRectangle.Width, colorRectangle.Height);
+				}
+			}
+		}
+
+		private Color[] GetColors() 
+		{
+			// Create an array of COLOR_COUNT colors, looping through all the hues between 0 and 255, broken
+			// into COLOR_COUNT intervals. HSV is particularly well-suited for this, because the only value 
+			// that changes as you create colors is the Hue.
+			Color[] Colors = new Color[COLOR_COUNT];
+
+			for(int i = 0; i < COLOR_COUNT; i++)
+				Colors[i] = ColorHandler.HSVtoColor((int)((float)(i * 255) / COLOR_COUNT), 255, HSV.value);
+			return Colors;
+		}
+
+		private static Point[] GetPoints(float radius, Point centerPoint) 
+		{
+			// Generate the array of points that describe the locations of the COLOR_COUNT colors to be 
+			// displayed on the color wheel.
+			Point[] Points = new Point[COLOR_COUNT];
+
+			for(int i = 0; i < COLOR_COUNT; i++)
+				Points[i] = GetPoint((float)(i * 360) / COLOR_COUNT, radius, centerPoint);
+			return Points;
+		}
+
+		private static Point GetPoint(float degrees, float radius, Point centerPoint) 
+		{
+			// Given the center of a circle and its radius, along
+			// with the angle corresponding to the point, find the coordinates. 
+			// In other words, conver  t from polar to rectangular coordinates.
+			float radians = degrees / DEGREES_PER_RADIAN;
+
+			return new Point((int)(centerPoint.X + Math.Floor(radius * Math.Cos(radians))),
+				(int)(centerPoint.Y - Math.Floor(radius * Math.Sin(radians))));
+		}
+
+		private void DrawColorPointer(Point pt) 
+		{
+			// Given a point, draw the color selector. The constant SIZE represents half
+			// the width -- the square will be twice this value in width and height.
+			const int SIZE = 3;
+			g.DrawRectangle(Pens.Black, pt.X - SIZE, pt.Y - SIZE, SIZE * 2, SIZE * 2);
+		}
+
+		private void DrawBrightnessPointer(Point pt) 
+		{
+			// Draw a triangle for the brightness indicator that "points" at the provided point.
+			const int HEIGHT = 10;
+			const int WIDTH = 7;
+
+			Point[] Points = new Point[3];
+			Points[0] = pt;
+			Points[1] = new Point(pt.X + WIDTH, pt.Y + HEIGHT / 2);
+			Points[2] = new Point(pt.X + WIDTH, pt.Y - HEIGHT / 2);
+			g.FillPolygon(Brushes.Black, Points);
+		}
+	}
+}
diff --git a/Source/Plugins/ColorPicker/Controls/ColorPickerControl.cs b/Source/Plugins/ColorPicker/Controls/ColorPickerControl.cs
new file mode 100644
index 0000000..eac0630
--- /dev/null
+++ b/Source/Plugins/ColorPicker/Controls/ColorPickerControl.cs
@@ -0,0 +1,312 @@
+#region ================== Namespaces
+
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+using System.Globalization;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.ColorPicker.Controls 
+{
+	public partial class ColorPickerControl : UserControl 
+	{
+		private enum ChangeStyle 
+		{
+			MouseMove,
+			RGB,
+			None
+		}
+
+		private const string COLOR_INFO_RGB = "RGB";
+		private const string COLOR_INFO_HEX = "Hex";
+		private const string COLOR_INFO_FLOAT = "Float";
+		private readonly object[] COLOR_INFO = new object[] { COLOR_INFO_RGB, COLOR_INFO_HEX, COLOR_INFO_FLOAT };
+
+		private static int colorInfoMode;
+		
+		private ChangeStyle changeType = ChangeStyle.None;
+		private Point selectedPoint;
+
+		private ColorWheel colorWheel;
+		private ColorHandler.RGB RGB;
+
+		public ColorHandler.RGB CurrentColor { get { return RGB; } }
+
+		private bool isInUpdate;
+		private Color startColor;
+
+		//events
+		public event EventHandler<ColorChangedEventArgs> OnColorChanged;
+		public event EventHandler OnOkPressed;
+		public event EventHandler OnCancelPressed;
+
+		public Button OkButton { get { return btnOK; } }
+		public Button CancelButton { get { return btnCancel; } }
+
+		public void Initialize(Color startColor)
+		{
+			this.startColor = startColor;
+
+			isInUpdate = true;
+			InitializeComponent();
+			isInUpdate = false;
+
+			cbColorInfo.Items.AddRange(COLOR_INFO);
+			cbColorInfo.SelectedIndex = colorInfoMode;
+		}
+
+		private void NudValueChanged(object sender, EventArgs e) 
+		{
+			// If the R, G, or B values change, use this code to update the HSV values and invalidate
+			// the color wheel (so it updates the pointers).
+			// Check the isInUpdate flag to avoid recursive events when you update the NumericUpdownControls.
+			if(!isInUpdate) 
+			{
+				changeType = ChangeStyle.RGB;
+				RGB = new ColorHandler.RGB((int)nudRed.Value, (int)nudGreen.Value, (int)nudBlue.Value);
+				UpdateColorInfo(RGB);
+				this.Invalidate();
+			}
+		}
+
+		private void SetRGB(ColorHandler.RGB RGB) 
+		{
+			// Update the RGB values on the form, but don't trigger the ValueChanged event of the form. The isInUpdate
+			// variable ensures that the event procedures exit without doing anything.
+			isInUpdate = true;
+			UpdateColorInfo(RGB);
+			isInUpdate = false;
+		}
+
+		private void UpdateColorInfo(ColorHandler.RGB RGB) 
+		{
+			this.RGB = RGB;
+			btnOK.BackColor = ColorHandler.RGBtoColor(RGB);
+			btnOK.ForeColor = (RGB.Red < 180 && RGB.Green < 180) ? Color.White : Color.Black;
+
+			//update color info
+			switch(cbColorInfo.SelectedItem.ToString()) 
+			{
+				case COLOR_INFO_RGB:
+					RefreshNudValue(nudRed, RGB.Red);
+					RefreshNudValue(nudBlue, RGB.Blue);
+					RefreshNudValue(nudGreen, RGB.Green);
+					break;
+
+				case COLOR_INFO_HEX:
+					string r = RGB.Red.ToString("X02");
+					string g = RGB.Green.ToString("X02");
+					string b = RGB.Blue.ToString("X02");
+
+					isInUpdate = true;
+					tbFloatVals.Text = r + g + b;
+					isInUpdate = false;
+					break;
+
+				case COLOR_INFO_FLOAT:
+					string r2 = ((float)Math.Round(RGB.Red / 255f, 2)).ToString("F02", CultureInfo.InvariantCulture);
+					string g2 = ((float)Math.Round(RGB.Green / 255f, 2)).ToString("F02", CultureInfo.InvariantCulture);
+					string b2 = ((float)Math.Round(RGB.Blue / 255f, 2)).ToString("F02", CultureInfo.InvariantCulture);
+
+					isInUpdate = true;
+					tbFloatVals.Text = r2 + " " + g2 + " " + b2;
+					isInUpdate = false;
+					break;
+			}
+
+			//dispatch event further
+			EventHandler<ColorChangedEventArgs> handler = OnColorChanged;
+			if(handler != null)
+				handler(this, new ColorChangedEventArgs(RGB, ColorHandler.RGBtoHSV(RGB)));
+		}
+
+		private void UpdateCancelButton(ColorHandler.RGB RGB) 
+		{
+			btnCancel.BackColor = ColorHandler.RGBtoColor(RGB);
+			btnCancel.ForeColor = (RGB.Red < 180 && RGB.Green < 180) ? Color.White : Color.Black;
+		}
+
+		private static void RefreshNudValue(NumericUpDown nud, int value) 
+		{
+			// Update the value of the NumericUpDown control, if the value is different than the current value.
+			// Refresh the control, causing an immediate repaint.
+			if(nud.Value != value) 
+			{
+				nud.Value = value;
+				nud.Refresh();
+			}
+		}
+
+		public void SetCurrentColor(Color c) 
+		{
+			isInUpdate = true;
+			changeType = ChangeStyle.RGB;
+			RGB = new ColorHandler.RGB(c.R, c.G, c.B);
+
+			UpdateColorInfo(RGB);
+			isInUpdate = false;
+			this.Invalidate();
+		}
+
+		public void SetInitialColor(Color c) 
+		{
+			UpdateCancelButton(new ColorHandler.RGB(c.R, c.G, c.B));
+		}
+
+		//events
+		private void ColorPickerControl_Load(object sender, EventArgs e) 
+		{
+			// Turn on double-buffering, so the form looks better. 
+			this.SetStyle(ControlStyles.AllPaintingInWmPaint, true);
+			this.SetStyle(ControlStyles.UserPaint, true);
+			this.SetStyle(ControlStyles.DoubleBuffer, true);
+
+			Rectangle BrightnessRectangle = new Rectangle(pnlBrightness.Location, pnlBrightness.Size);
+			Rectangle ColorRectangle = new Rectangle(pnlColor.Location, pnlColor.Size);
+
+			// Create the new ColorWheel class, indicating the locations of the color wheel itself, the
+			// brightness area, and the position of the selected color.
+			colorWheel = new ColorWheel(ColorRectangle, BrightnessRectangle);
+			colorWheel.ColorChanged += ColorChanged;
+
+			//set initial colors
+			SetCurrentColor(startColor);
+			UpdateCancelButton(RGB);
+		}
+
+		private void ColorChanged(object sender, ColorChangedEventArgs e) 
+		{
+			SetRGB(e.RGB);
+		}
+
+		private void OnPaint(object sender, PaintEventArgs e) 
+		{
+			// Depending on the circumstances, force a repaint of the color wheel passing different information.
+			switch(changeType) 
+			{
+				case ChangeStyle.MouseMove:
+				case ChangeStyle.None:
+					colorWheel.Draw(e.Graphics, selectedPoint);
+					break;
+				case ChangeStyle.RGB:
+					colorWheel.Draw(e.Graphics, RGB);
+					break;
+			}
+		}
+
+		private void ColorPickerControl_MouseDown(object sender, MouseEventArgs e) 
+		{
+			if(e.Button == MouseButtons.Left) 
+			{
+				changeType = ChangeStyle.MouseMove;
+				selectedPoint = new Point(e.X, e.Y);
+				this.Invalidate();
+			}
+		}
+
+		private void OnMouseMove(object sender, MouseEventArgs e) 
+		{
+			if(e.Button == MouseButtons.Left) 
+			{
+				changeType = ChangeStyle.MouseMove;
+				selectedPoint = new Point(e.X, e.Y);
+				this.Invalidate();
+			}
+		}
+
+		private void OnMouseUp(object sender, MouseEventArgs e) 
+		{
+			colorWheel.SetMouseUp();
+			changeType = ChangeStyle.None;
+		}
+
+		private void OnMouseLeave(object sender, EventArgs e) 
+		{
+			colorWheel.SetMouseUp();
+			changeType = ChangeStyle.None;
+			selectedPoint = Point.Empty;
+		}
+
+		private void btnOK_Click(object sender, EventArgs e) 
+		{
+			//dispatch event further
+			EventHandler handler = OnOkPressed;
+			if(handler != null) handler(this, e);
+		}
+
+		private void btnCancel_Click(object sender, EventArgs e) 
+		{
+			//dispatch event further
+			EventHandler handler = OnCancelPressed;
+			if(handler != null) handler(this, e);
+		}
+
+		private void cbColorInfo_SelectedIndexChanged(object sender, EventArgs e) 
+		{
+			if(cbColorInfo.SelectedItem.ToString() == COLOR_INFO_RGB) 
+			{
+				pRGB.Visible = true;
+				tbFloatVals.Visible = false;
+			} 
+			else 
+			{
+				pRGB.Visible = false;
+				tbFloatVals.Visible = true;
+			}
+			colorInfoMode = cbColorInfo.SelectedIndex;
+			UpdateColorInfo(RGB);
+		}
+
+		private void tbFloatVals_TextChanged(object sender, EventArgs e) 
+		{
+			if(isInUpdate) return;
+			
+			if(COLOR_INFO[colorInfoMode].ToString() == COLOR_INFO_FLOAT) 
+			{
+				string[] parts = tbFloatVals.Text.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
+				if(parts.Length != 3) return;
+
+				ColorHandler.RGB rgb = new ColorHandler.RGB();
+
+				float c;
+				if(!float.TryParse(parts[0].Trim(), NumberStyles.Float, CultureInfo.InvariantCulture, out c)) return;
+				rgb.Red = (int)(General.Clamp(Math.Abs(c), 0.0f, 1.0f) * 255);
+
+				if(!float.TryParse(parts[1].Trim(), NumberStyles.Float, CultureInfo.InvariantCulture, out c)) return;
+				rgb.Green = (int)(General.Clamp(Math.Abs(c), 0.0f, 1.0f) * 255);
+
+				if(!float.TryParse(parts[2].Trim(), NumberStyles.Float, CultureInfo.InvariantCulture, out c)) return;
+				rgb.Blue = (int)(General.Clamp(Math.Abs(c), 0.0f, 1.0f) * 255);
+
+				changeType = ChangeStyle.RGB;
+				UpdateColorInfo(rgb);
+				this.Invalidate();
+			} 
+			else if(COLOR_INFO[colorInfoMode].ToString() == COLOR_INFO_HEX) 
+			{
+				string hexColor = tbFloatVals.Text.Trim().Replace("-", "");
+				if(hexColor.Length != 6) return;
+
+				ColorHandler.RGB rgb = new ColorHandler.RGB();
+				int color;
+
+				string colorStr = hexColor.Substring(0, 2);
+				if(!int.TryParse(colorStr, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out color)) return;
+				rgb.Red = color;
+
+				colorStr = hexColor.Substring(2, 2);
+				if(!int.TryParse(colorStr, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out color)) return;
+				rgb.Green = color;
+
+				colorStr = hexColor.Substring(4, 2);
+				if(!int.TryParse(colorStr, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out color)) return;
+				rgb.Blue = color;
+
+				changeType = ChangeStyle.RGB;
+				UpdateColorInfo(rgb);
+				this.Invalidate();
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/Source/Plugins/ColorPicker/Controls/ColorPickerControl.designer.cs b/Source/Plugins/ColorPicker/Controls/ColorPickerControl.designer.cs
new file mode 100644
index 0000000..784f4f4
--- /dev/null
+++ b/Source/Plugins/ColorPicker/Controls/ColorPickerControl.designer.cs
@@ -0,0 +1,232 @@
+using CodeImp.DoomBuilder.Controls;
+
+namespace CodeImp.DoomBuilder.ColorPicker.Controls {
+	partial class ColorPickerControl {
+		/// <summary> 
+		/// Требует�� переменна� кон�труктора.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary> 
+		/// О�вободить в�е и�пользуемые ре�ур�ы.
+		/// </summary>
+		/// <param name="disposing">и�тинно, е�ли управл�емый ре�ур� должен быть удален; иначе ложно.</param>
+		protected override void Dispose(bool disposing) {
+			if(disposing && (components != null)) {
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Код, автоматиче�ки �озданный кон�труктором компонентов
+
+		/// <summary> 
+		/// Об�зательный метод дл� поддержки кон�труктора - не измен�йте 
+		/// �одержимое данного метода при помощи редактора кода.
+		/// </summary>
+		private void InitializeComponent() {
+			this.btnCancel = new System.Windows.Forms.Button();
+			this.btnOK = new System.Windows.Forms.Button();
+			this.Label3 = new System.Windows.Forms.Label();
+			this.nudRed = new System.Windows.Forms.NumericUpDown();
+			this.pnlColor = new System.Windows.Forms.Panel();
+			this.Label1 = new System.Windows.Forms.Label();
+			this.pnlBrightness = new System.Windows.Forms.Panel();
+			this.nudBlue = new System.Windows.Forms.NumericUpDown();
+			this.nudGreen = new System.Windows.Forms.NumericUpDown();
+			this.Label2 = new System.Windows.Forms.Label();
+			this.tbFloatVals = new CodeImp.DoomBuilder.Controls.AutoSelectTextbox();
+			this.pRGB = new System.Windows.Forms.Panel();
+			this.cbColorInfo = new System.Windows.Forms.ComboBox();
+			((System.ComponentModel.ISupportInitialize)(this.nudRed)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.nudBlue)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.nudGreen)).BeginInit();
+			this.pRGB.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// btnCancel
+			// 
+			this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.btnCancel.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+			this.btnCancel.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.btnCancel.Location = new System.Drawing.Point(214, 44);
+			this.btnCancel.Name = "btnCancel";
+			this.btnCancel.Size = new System.Drawing.Size(94, 42);
+			this.btnCancel.TabIndex = 54;
+			this.btnCancel.Text = "Cancel";
+			this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
+			// 
+			// btnOK
+			// 
+			this.btnOK.BackColor = System.Drawing.SystemColors.Control;
+			this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK;
+			this.btnOK.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+			this.btnOK.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.btnOK.ForeColor = System.Drawing.SystemColors.ControlText;
+			this.btnOK.Location = new System.Drawing.Point(214, 3);
+			this.btnOK.Name = "btnOK";
+			this.btnOK.Size = new System.Drawing.Size(94, 42);
+			this.btnOK.TabIndex = 53;
+			this.btnOK.Text = "OK";
+			this.btnOK.UseVisualStyleBackColor = true;
+			this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
+			// 
+			// Label3
+			// 
+			this.Label3.Location = new System.Drawing.Point(3, 48);
+			this.Label3.Name = "Label3";
+			this.Label3.Size = new System.Drawing.Size(40, 23);
+			this.Label3.TabIndex = 60;
+			this.Label3.Text = "Blue:";
+			this.Label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+			// 
+			// nudRed
+			// 
+			this.nudRed.Location = new System.Drawing.Point(49, 4);
+			this.nudRed.Maximum = new decimal(new int[] {
+            255,
+            0,
+            0,
+            0});
+			this.nudRed.Name = "nudRed";
+			this.nudRed.Size = new System.Drawing.Size(48, 20);
+			this.nudRed.TabIndex = 55;
+			this.nudRed.ValueChanged += new System.EventHandler(this.NudValueChanged);
+			// 
+			// pnlColor
+			// 
+			this.pnlColor.Location = new System.Drawing.Point(3, 3);
+			this.pnlColor.Name = "pnlColor";
+			this.pnlColor.Size = new System.Drawing.Size(176, 176);
+			this.pnlColor.TabIndex = 61;
+			this.pnlColor.Visible = false;
+			// 
+			// Label1
+			// 
+			this.Label1.Location = new System.Drawing.Point(3, 2);
+			this.Label1.Name = "Label1";
+			this.Label1.Size = new System.Drawing.Size(40, 23);
+			this.Label1.TabIndex = 58;
+			this.Label1.Text = "Red:";
+			this.Label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+			// 
+			// pnlBrightness
+			// 
+			this.pnlBrightness.Location = new System.Drawing.Point(185, 3);
+			this.pnlBrightness.Name = "pnlBrightness";
+			this.pnlBrightness.Size = new System.Drawing.Size(16, 176);
+			this.pnlBrightness.TabIndex = 62;
+			this.pnlBrightness.Visible = false;
+			// 
+			// nudBlue
+			// 
+			this.nudBlue.Location = new System.Drawing.Point(49, 50);
+			this.nudBlue.Maximum = new decimal(new int[] {
+            255,
+            0,
+            0,
+            0});
+			this.nudBlue.Name = "nudBlue";
+			this.nudBlue.Size = new System.Drawing.Size(48, 20);
+			this.nudBlue.TabIndex = 57;
+			this.nudBlue.ValueChanged += new System.EventHandler(this.NudValueChanged);
+			// 
+			// nudGreen
+			// 
+			this.nudGreen.Location = new System.Drawing.Point(49, 27);
+			this.nudGreen.Maximum = new decimal(new int[] {
+            255,
+            0,
+            0,
+            0});
+			this.nudGreen.Name = "nudGreen";
+			this.nudGreen.Size = new System.Drawing.Size(48, 20);
+			this.nudGreen.TabIndex = 56;
+			this.nudGreen.ValueChanged += new System.EventHandler(this.NudValueChanged);
+			// 
+			// Label2
+			// 
+			this.Label2.Location = new System.Drawing.Point(3, 25);
+			this.Label2.Name = "Label2";
+			this.Label2.Size = new System.Drawing.Size(40, 23);
+			this.Label2.TabIndex = 59;
+			this.Label2.Text = "Green:";
+			this.Label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+			// 
+			// tbFloatVals
+			// 
+			this.tbFloatVals.Location = new System.Drawing.Point(214, 115);
+			this.tbFloatVals.Name = "tbFloatVals";
+			this.tbFloatVals.Size = new System.Drawing.Size(95, 20);
+			this.tbFloatVals.TabIndex = 63;
+			this.tbFloatVals.Text = "1.01 0.55 0.33";
+			this.tbFloatVals.TextChanged += new System.EventHandler(this.tbFloatVals_TextChanged);
+			// 
+			// pRGB
+			// 
+			this.pRGB.Controls.Add(this.Label2);
+			this.pRGB.Controls.Add(this.nudGreen);
+			this.pRGB.Controls.Add(this.nudBlue);
+			this.pRGB.Controls.Add(this.Label1);
+			this.pRGB.Controls.Add(this.Label3);
+			this.pRGB.Controls.Add(this.nudRed);
+			this.pRGB.Location = new System.Drawing.Point(212, 111);
+			this.pRGB.Name = "pRGB";
+			this.pRGB.Size = new System.Drawing.Size(104, 76);
+			this.pRGB.TabIndex = 64;
+			// 
+			// cbColorInfo
+			// 
+			this.cbColorInfo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.cbColorInfo.FormattingEnabled = true;
+			this.cbColorInfo.Location = new System.Drawing.Point(214, 89);
+			this.cbColorInfo.Name = "cbColorInfo";
+			this.cbColorInfo.Size = new System.Drawing.Size(94, 21);
+			this.cbColorInfo.TabIndex = 65;
+			this.cbColorInfo.SelectedIndexChanged += new System.EventHandler(this.cbColorInfo_SelectedIndexChanged);
+			// 
+			// ColorPickerControl
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.Controls.Add(this.cbColorInfo);
+			this.Controls.Add(this.pRGB);
+			this.Controls.Add(this.tbFloatVals);
+			this.Controls.Add(this.btnCancel);
+			this.Controls.Add(this.btnOK);
+			this.Controls.Add(this.pnlColor);
+			this.Controls.Add(this.pnlBrightness);
+			this.Name = "ColorPickerControl";
+			this.Size = new System.Drawing.Size(311, 183);
+			this.Load += new System.EventHandler(this.ColorPickerControl_Load);
+			this.MouseLeave += new System.EventHandler(this.OnMouseLeave);
+			this.Paint += new System.Windows.Forms.PaintEventHandler(this.OnPaint);
+			this.MouseMove += new System.Windows.Forms.MouseEventHandler(this.OnMouseMove);
+			this.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ColorPickerControl_MouseDown);
+			this.MouseUp += new System.Windows.Forms.MouseEventHandler(this.OnMouseUp);
+			((System.ComponentModel.ISupportInitialize)(this.nudRed)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.nudBlue)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.nudGreen)).EndInit();
+			this.pRGB.ResumeLayout(false);
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		internal System.Windows.Forms.Button btnCancel;
+		internal System.Windows.Forms.Button btnOK;
+		internal System.Windows.Forms.Label Label3;
+		internal System.Windows.Forms.NumericUpDown nudRed;
+		internal System.Windows.Forms.Panel pnlColor;
+		internal System.Windows.Forms.Label Label1;
+		internal System.Windows.Forms.Panel pnlBrightness;
+		internal System.Windows.Forms.NumericUpDown nudBlue;
+		internal System.Windows.Forms.NumericUpDown nudGreen;
+		internal System.Windows.Forms.Label Label2;
+		private CodeImp.DoomBuilder.Controls.AutoSelectTextbox tbFloatVals;
+		private System.Windows.Forms.Panel pRGB;
+		private System.Windows.Forms.ComboBox cbColorInfo;
+	}
+}
diff --git a/Source/Plugins/ColorPicker/Controls/ColorPickerControl.resx b/Source/Plugins/ColorPicker/Controls/ColorPickerControl.resx
new file mode 100644
index 0000000..19dc0dd
--- /dev/null
+++ b/Source/Plugins/ColorPicker/Controls/ColorPickerControl.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/ColorPicker/Controls/ColorPickerSlider.Designer.cs b/Source/Plugins/ColorPicker/Controls/ColorPickerSlider.Designer.cs
new file mode 100644
index 0000000..de41a14
--- /dev/null
+++ b/Source/Plugins/ColorPicker/Controls/ColorPickerSlider.Designer.cs
@@ -0,0 +1,109 @@
+namespace CodeImp.DoomBuilder.ColorPicker.Controls {
+	partial class ColorPickerSlider {
+		/// <summary> 
+		/// Требует�� переменна� кон�труктора.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary> 
+		/// О�вободить в�е и�пользуемые ре�ур�ы.
+		/// </summary>
+		/// <param name="disposing">и�тинно, е�ли управл�емый ре�ур� должен быть удален; иначе ложно.</param>
+		protected override void Dispose(bool disposing) {
+			if(disposing && (components != null)) {
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Код, автоматиче�ки �озданный кон�труктором компонентов
+
+		/// <summary> 
+		/// Об�зательный метод дл� поддержки кон�труктора - не измен�йте 
+		/// �одержимое данного метода при помощи редактора кода.
+		/// </summary>
+		private void InitializeComponent() {
+			this.numericUpDown1 = new System.Windows.Forms.NumericUpDown();
+			this.trackBar1 = new System.Windows.Forms.TrackBar();
+			this.label1 = new System.Windows.Forms.Label();
+			this.labelMin = new System.Windows.Forms.Label();
+			this.labelMax = new System.Windows.Forms.Label();
+			((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.trackBar1)).BeginInit();
+			this.SuspendLayout();
+			// 
+			// numericUpDown1
+			// 
+			this.numericUpDown1.Location = new System.Drawing.Point(263, 16);
+			this.numericUpDown1.Name = "numericUpDown1";
+			this.numericUpDown1.Size = new System.Drawing.Size(44, 20);
+			this.numericUpDown1.TabIndex = 5;
+			this.numericUpDown1.ValueChanged += new System.EventHandler(this.numericUpDown1_ValueChanged);
+			// 
+			// trackBar1
+			// 
+			this.trackBar1.LargeChange = 32;
+			this.trackBar1.Location = new System.Drawing.Point(115, 7);
+			this.trackBar1.Maximum = 512;
+			this.trackBar1.Name = "trackBar1";
+			this.trackBar1.Size = new System.Drawing.Size(142, 45);
+			this.trackBar1.SmallChange = 4;
+			this.trackBar1.TabIndex = 4;
+			this.trackBar1.TickFrequency = 16;
+			this.trackBar1.TickStyle = System.Windows.Forms.TickStyle.Both;
+			this.trackBar1.ValueChanged += new System.EventHandler(this.trackBar1_ValueChanged);
+			// 
+			// label1
+			// 
+			this.label1.Location = new System.Drawing.Point(3, 17);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(106, 14);
+			this.label1.TabIndex = 3;
+			this.label1.Text = "Secondary intensity:";
+			this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+			// 
+			// labelMin
+			// 
+			this.labelMin.Location = new System.Drawing.Point(111, -1);
+			this.labelMin.Name = "labelMin";
+			this.labelMin.Size = new System.Drawing.Size(36, 15);
+			this.labelMin.TabIndex = 6;
+			this.labelMin.Text = "0";
+			this.labelMin.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			// 
+			// labelMax
+			// 
+			this.labelMax.Location = new System.Drawing.Point(231, -1);
+			this.labelMax.Name = "labelMax";
+			this.labelMax.Size = new System.Drawing.Size(36, 15);
+			this.labelMax.TabIndex = 7;
+			this.labelMax.Text = "512";
+			this.labelMax.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			// 
+			// ColorPickerSlider
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.Controls.Add(this.labelMax);
+			this.Controls.Add(this.labelMin);
+			this.Controls.Add(this.numericUpDown1);
+			this.Controls.Add(this.trackBar1);
+			this.Controls.Add(this.label1);
+			this.Name = "ColorPickerSlider";
+			this.Size = new System.Drawing.Size(311, 45);
+			((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.trackBar1)).EndInit();
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.NumericUpDown numericUpDown1;
+		private System.Windows.Forms.TrackBar trackBar1;
+		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.Label labelMin;
+		private System.Windows.Forms.Label labelMax;
+	}
+}
diff --git a/Source/Plugins/ColorPicker/Controls/ColorPickerSlider.cs b/Source/Plugins/ColorPicker/Controls/ColorPickerSlider.cs
new file mode 100644
index 0000000..8e88ea4
--- /dev/null
+++ b/Source/Plugins/ColorPicker/Controls/ColorPickerSlider.cs
@@ -0,0 +1,82 @@
+using System;
+using System.Windows.Forms;
+
+namespace CodeImp.DoomBuilder.ColorPicker.Controls {
+	public partial class ColorPickerSlider : UserControl {
+
+		private bool blockEvents;
+		public event EventHandler<ColorPickerSliderEventArgs> OnValueChanged;
+
+		public int Value 
+		{ 
+			get { return (int)numericUpDown1.Value; }
+			set 
+			{
+				blockEvents = true;
+				numericUpDown1.Value = General.Clamp(value, (int)numericUpDown1.Minimum, (int)numericUpDown1.Maximum);
+				blockEvents = false;
+			}
+		}
+
+		private bool showLimits;
+		public bool ShowLimits 
+		{ 
+			get { return showLimits; }
+			set 
+			{
+				showLimits = value;
+				labelMin.Visible = showLimits;
+				labelMax.Visible = showLimits;
+			}
+		}
+
+		public string Label { set { label1.Text = value; } }
+		
+		public ColorPickerSlider() 
+		{
+			InitializeComponent();
+		}
+
+		public void SetLimits(int tbMin, int tbMax, int nudMin, int nudMax) 
+		{
+			bool blockEventsStatus = blockEvents;
+			blockEvents = true;
+
+			trackBar1.Value = General.Clamp(trackBar1.Value, tbMin, tbMax);
+			trackBar1.Minimum = tbMin;
+			trackBar1.Maximum = tbMax;
+
+			labelMin.Text = tbMin.ToString();
+			labelMax.Text = tbMax.ToString();
+
+			numericUpDown1.Value = General.Clamp((int)numericUpDown1.Value, nudMin, nudMax);
+			numericUpDown1.Minimum = nudMin;
+			numericUpDown1.Maximum = nudMax;
+
+			blockEvents = blockEventsStatus;
+		}
+
+//events
+		private void trackBar1_ValueChanged(object sender, EventArgs e) 
+		{
+			numericUpDown1.Value = ((TrackBar)sender).Value;
+		}
+
+		private void numericUpDown1_ValueChanged(object sender, EventArgs e) 
+		{
+			bool blockEventsStatus = blockEvents;
+			
+			int val = (int)((NumericUpDown)sender).Value;
+
+			if(!blockEventsStatus) 
+			{
+				EventHandler<ColorPickerSliderEventArgs> handler = OnValueChanged;
+				if(handler != null) handler(this, new ColorPickerSliderEventArgs(val));
+			}
+
+			blockEvents = true;
+			trackBar1.Value = General.Clamp(val, trackBar1.Minimum, trackBar1.Maximum); //clamp it!
+			blockEvents = blockEventsStatus;
+		}
+	}
+}
diff --git a/Source/Plugins/ColorPicker/Controls/ColorPickerSlider.resx b/Source/Plugins/ColorPicker/Controls/ColorPickerSlider.resx
new file mode 100644
index 0000000..19dc0dd
--- /dev/null
+++ b/Source/Plugins/ColorPicker/Controls/ColorPickerSlider.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/ColorPicker/Controls/ColorPickerSliderEventArgs.cs b/Source/Plugins/ColorPicker/Controls/ColorPickerSliderEventArgs.cs
new file mode 100644
index 0000000..67e5bd0
--- /dev/null
+++ b/Source/Plugins/ColorPicker/Controls/ColorPickerSliderEventArgs.cs
@@ -0,0 +1,15 @@
+using System;
+
+namespace CodeImp.DoomBuilder.ColorPicker.Controls 
+{
+	public class ColorPickerSliderEventArgs : EventArgs 
+	{
+		private int value;
+		public int Value { get { return value; } }
+
+		public ColorPickerSliderEventArgs(int value) 
+		{
+			this.value = value;
+		}
+	}
+}
diff --git a/Source/Plugins/ColorPicker/IColorPicker.cs b/Source/Plugins/ColorPicker/IColorPicker.cs
new file mode 100644
index 0000000..229c285
--- /dev/null
+++ b/Source/Plugins/ColorPicker/IColorPicker.cs
@@ -0,0 +1,25 @@
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace CodeImp.DoomBuilder.ColorPicker {
+	interface IColorPicker : IWin32Window {
+		Point Location { get; set; }
+		bool Visible { get; set; }
+		int Width { get; set; }
+
+		ColorPickerType Type { get; }
+
+		bool Setup(string editingModeName);
+		//void OnBeforeClose();
+		//void UpdateSelection();
+		//void UpdateSelection(string editingModeName);
+
+		DialogResult ShowDialog(IWin32Window w);
+		//void Show(IWin32Window w);
+		void Close();
+		void Dispose();
+		//void Activate();
+
+		event FormClosedEventHandler FormClosed;
+	}
+}
diff --git a/Source/Plugins/ColorPicker/Properties/AssemblyInfo.cs b/Source/Plugins/ColorPicker/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..1bbfe2a
--- /dev/null
+++ b/Source/Plugins/ColorPicker/Properties/AssemblyInfo.cs
@@ -0,0 +1,37 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Resources;
+
+// Управление общими �ведени�ми о �борке о�уще�твл�ет�� � помощью 
+// набора атрибутов. Измените значени� �тих атрибутов, чтобы изменить �ведени�,
+// �в�занные �о �боркой.
+[assembly: AssemblyTitle("ColorPicker")]
+[assembly: AssemblyDescription("ColorPicker control for GZDoomBuilder")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("ColorPicker")]
+[assembly: AssemblyCopyright("Copyright © MaxED 2012")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Параметр ComVisible �о значением FALSE делает типы в �борке невидимыми 
+// дл� COM-компонентов.  Е�ли требует�� обратить�� к типу в �той �борке через 
+// COM, задайте атрибуту ComVisible значение TRUE дл� �того типа.
+[assembly: ComVisible(false)]
+
+// Следующий GUID �лужит дл� идентификации библиотеки типов, е�ли �тот проект будет видимым дл� COM
+[assembly: Guid("82178b31-4cd7-43e0-a25f-6a58de2fae4e")]
+
+// Сведени� о вер�ии �борки �о�то�т из �ледующих четырех значений:
+//
+//      О�новной номер вер�ии
+//      Дополнительный номер вер�ии 
+//      �омер по�троени�
+//      Редакци�
+//
+// Можно задать в�е значени� или прин�ть номер по�троени� и номер редакции по умолчанию, 
+// и�пользу� "*", как показано ниже:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: NeutralResourcesLanguageAttribute("en")]
diff --git a/Source/Plugins/ColorPicker/Properties/Resources.Designer.cs b/Source/Plugins/ColorPicker/Properties/Resources.Designer.cs
new file mode 100644
index 0000000..8718e2e
--- /dev/null
+++ b/Source/Plugins/ColorPicker/Properties/Resources.Designer.cs
@@ -0,0 +1,73 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:4.0.30319.42000
+//
+//     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace CodeImp.DoomBuilder.ColorPicker.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
+    /// </summary>
+    // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
+    // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
+    // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
+    // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("CodeImp.DoomBuilder.ColorPicker.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
+        ///   Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap cp {
+            get {
+                object obj = ResourceManager.GetObject("cp", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+    }
+}
diff --git a/Source/Plugins/ColorPicker/Properties/Resources.resx b/Source/Plugins/ColorPicker/Properties/Resources.resx
new file mode 100644
index 0000000..9726473
--- /dev/null
+++ b/Source/Plugins/ColorPicker/Properties/Resources.resx
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+	Microsoft ResX Schema 
+	
+	Version 2.0
+	
+	The primary goals of this format is to allow a simple XML format 
+	that is mostly human readable. The generation and parsing of the 
+	various data types are done through the TypeConverter classes 
+	associated with the data types.
+	
+	Example:
+	
+	... ado.net/XML headers & schema ...
+	<resheader name="resmimetype">text/microsoft-resx</resheader>
+	<resheader name="version">2.0</resheader>
+	<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+	<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+	<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+	<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+	<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+		<value>[base64 mime encoded serialized .NET Framework object]</value>
+	</data>
+	<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+		<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+		<comment>This is a comment</comment>
+	</data>
+				
+	There are any number of "resheader" rows that contain simple 
+	name/value pairs.
+	
+	Each data row contains a name, and value. The row also contains a 
+	type or mimetype. Type corresponds to a .NET class that support 
+	text/value conversion through the TypeConverter architecture. 
+	Classes that don't support this are serialized and stored with the 
+	mimetype set.
+	
+	The mimetype is used for serialized objects, and tells the 
+	ResXResourceReader how to depersist the object. This is currently not 
+	extensible. For a given mimetype the value must be set accordingly:
+	
+	Note - application/x-microsoft.net.object.binary.base64 is the format 
+	that the ResXResourceWriter will generate, however the reader can 
+	read any of the formats listed below.
+	
+	mimetype: application/x-microsoft.net.object.binary.base64
+	value   : The object must be serialized with 
+			: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+			: and then encoded with base64 encoding.
+	
+	mimetype: application/x-microsoft.net.object.soap.base64
+	value   : The object must be serialized with 
+			: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+			: and then encoded with base64 encoding.
+
+	mimetype: application/x-microsoft.net.object.bytearray.base64
+	value   : The object must be serialized into a byte array 
+			: using a System.ComponentModel.TypeConverter
+			: and then encoded with base64 encoding.
+	-->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+	<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+	<xsd:element name="root" msdata:IsDataSet="true">
+	  <xsd:complexType>
+		<xsd:choice maxOccurs="unbounded">
+		  <xsd:element name="metadata">
+			<xsd:complexType>
+			  <xsd:sequence>
+				<xsd:element name="value" type="xsd:string" minOccurs="0" />
+			  </xsd:sequence>
+			  <xsd:attribute name="name" use="required" type="xsd:string" />
+			  <xsd:attribute name="type" type="xsd:string" />
+			  <xsd:attribute name="mimetype" type="xsd:string" />
+			  <xsd:attribute ref="xml:space" />
+			</xsd:complexType>
+		  </xsd:element>
+		  <xsd:element name="assembly">
+			<xsd:complexType>
+			  <xsd:attribute name="alias" type="xsd:string" />
+			  <xsd:attribute name="name" type="xsd:string" />
+			</xsd:complexType>
+		  </xsd:element>
+		  <xsd:element name="data">
+			<xsd:complexType>
+			  <xsd:sequence>
+				<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+				<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+			  </xsd:sequence>
+			  <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+			  <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+			  <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+			  <xsd:attribute ref="xml:space" />
+			</xsd:complexType>
+		  </xsd:element>
+		  <xsd:element name="resheader">
+			<xsd:complexType>
+			  <xsd:sequence>
+				<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+			  </xsd:sequence>
+			  <xsd:attribute name="name" type="xsd:string" use="required" />
+			</xsd:complexType>
+		  </xsd:element>
+		</xsd:choice>
+	  </xsd:complexType>
+	</xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+	<value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+	<value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+	<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+	<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="cp" type="System.Resources.ResXFileRef, System.Windows.Forms">
+	<value>..\Resources\cp.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/ColorPicker/Resources/Actions.cfg b/Source/Plugins/ColorPicker/Resources/Actions.cfg
new file mode 100644
index 0000000..5e68dfd
--- /dev/null
+++ b/Source/Plugins/ColorPicker/Resources/Actions.cfg
@@ -0,0 +1,10 @@
+togglelightpannel
+{
+	title = "Open Color Picker";
+	category = "tools";
+	description = "Select dynamic light thing(s) or sector(s), then use this panel to set light properties quickly.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+	default = 75; //K
+}
\ No newline at end of file
diff --git a/Source/Plugins/ColorPicker/Resources/cp.png b/Source/Plugins/ColorPicker/Resources/cp.png
new file mode 100644
index 0000000..28f4239
Binary files /dev/null and b/Source/Plugins/ColorPicker/Resources/cp.png differ
diff --git a/Source/Plugins/ColorPicker/Windows/LightColorPicker.Designer.cs b/Source/Plugins/ColorPicker/Windows/LightColorPicker.Designer.cs
new file mode 100644
index 0000000..953750e
--- /dev/null
+++ b/Source/Plugins/ColorPicker/Windows/LightColorPicker.Designer.cs
@@ -0,0 +1,111 @@
+namespace CodeImp.DoomBuilder.ColorPicker.Windows {
+	partial class LightColorPicker {
+		/// <summary>
+		/// Требует�� переменна� кон�труктора.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// О�вободить в�е и�пользуемые ре�ур�ы.
+		/// </summary>
+		/// <param name="disposing">и�тинно, е�ли управл�емый ре�ур� должен быть удален; иначе ложно.</param>
+		protected override void Dispose(bool disposing) {
+			if(disposing && (components != null)) {
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Код, автоматиче�ки �озданный кон�труктором форм Windows
+
+		/// <summary>
+		/// Об�зательный метод дл� поддержки кон�труктора - не измен�йте
+		/// �одержимое данного метода при помощи редактора кода.
+		/// </summary>
+		private void InitializeComponent() {
+			this.colorPickerControl1 = new CodeImp.DoomBuilder.ColorPicker.Controls.ColorPickerControl();
+			this.cbRelativeMode = new System.Windows.Forms.CheckBox();
+			this.colorPickerSlider1 = new CodeImp.DoomBuilder.ColorPicker.Controls.ColorPickerSlider();
+			this.colorPickerSlider2 = new CodeImp.DoomBuilder.ColorPicker.Controls.ColorPickerSlider();
+			this.colorPickerSlider3 = new CodeImp.DoomBuilder.ColorPicker.Controls.ColorPickerSlider();
+			this.SuspendLayout();
+			// 
+			// colorPickerControl1
+			// 
+			this.colorPickerControl1.Location = new System.Drawing.Point(8, 8);
+			this.colorPickerControl1.Name = "colorPickerControl1";
+			this.colorPickerControl1.Size = new System.Drawing.Size(311, 183);
+			this.colorPickerControl1.TabIndex = 0;
+			// 
+			// cbRelativeMode
+			// 
+			this.cbRelativeMode.AutoSize = true;
+			this.cbRelativeMode.Location = new System.Drawing.Point(14, 209);
+			this.cbRelativeMode.Name = "cbRelativeMode";
+			this.cbRelativeMode.Size = new System.Drawing.Size(95, 17);
+			this.cbRelativeMode.TabIndex = 5;
+			this.cbRelativeMode.Text = "Relative Mode";
+			this.cbRelativeMode.UseVisualStyleBackColor = true;
+			// 
+			// colorPickerSlider1
+			// 
+			this.colorPickerSlider1.Location = new System.Drawing.Point(8, 233);
+			this.colorPickerSlider1.Name = "colorPickerSlider1";
+			this.colorPickerSlider1.ShowLimits = true;
+			this.colorPickerSlider1.Size = new System.Drawing.Size(311, 45);
+			this.colorPickerSlider1.TabIndex = 6;
+			this.colorPickerSlider1.Value = 0;
+			// 
+			// colorPickerSlider2
+			// 
+			this.colorPickerSlider2.Location = new System.Drawing.Point(8, 284);
+			this.colorPickerSlider2.Name = "colorPickerSlider2";
+			this.colorPickerSlider2.ShowLimits = false;
+			this.colorPickerSlider2.Size = new System.Drawing.Size(311, 48);
+			this.colorPickerSlider2.TabIndex = 7;
+			this.colorPickerSlider2.Value = 0;
+			// 
+			// colorPickerSlider3
+			// 
+			this.colorPickerSlider3.Location = new System.Drawing.Point(8, 338);
+			this.colorPickerSlider3.Name = "colorPickerSlider3";
+			this.colorPickerSlider3.ShowLimits = true;
+			this.colorPickerSlider3.Size = new System.Drawing.Size(311, 48);
+			this.colorPickerSlider3.TabIndex = 8;
+			this.colorPickerSlider3.Value = 0;
+			// 
+			// LightColorPicker
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.ClientSize = new System.Drawing.Size(327, 391);
+			this.Controls.Add(this.colorPickerSlider3);
+			this.Controls.Add(this.colorPickerSlider2);
+			this.Controls.Add(this.colorPickerSlider1);
+			this.Controls.Add(this.cbRelativeMode);
+			this.Controls.Add(this.colorPickerControl1);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "LightColorPicker";
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
+			this.Text = "LightColorPicker";
+			this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.LightColorPicker_FormClosing);
+			this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.LightColorPicker_HelpRequested);
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private CodeImp.DoomBuilder.ColorPicker.Controls.ColorPickerControl colorPickerControl1;
+		private System.Windows.Forms.CheckBox cbRelativeMode;
+		private CodeImp.DoomBuilder.ColorPicker.Controls.ColorPickerSlider colorPickerSlider1;
+		private CodeImp.DoomBuilder.ColorPicker.Controls.ColorPickerSlider colorPickerSlider2;
+		private CodeImp.DoomBuilder.ColorPicker.Controls.ColorPickerSlider colorPickerSlider3;
+
+	}
+}
\ No newline at end of file
diff --git a/Source/Plugins/ColorPicker/Windows/LightColorPicker.cs b/Source/Plugins/ColorPicker/Windows/LightColorPicker.cs
new file mode 100644
index 0000000..f7e5cd7
--- /dev/null
+++ b/Source/Plugins/ColorPicker/Windows/LightColorPicker.cs
@@ -0,0 +1,408 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Windows;
+using CodeImp.DoomBuilder.GZBuilder;
+using CodeImp.DoomBuilder.VisualModes;
+using CodeImp.DoomBuilder.ColorPicker.Controls;
+
+namespace CodeImp.DoomBuilder.ColorPicker.Windows 
+{
+	public partial class LightColorPicker : DelayedForm, IColorPicker 
+	{
+		public ColorPickerType Type { get { return ColorPickerType.CP_LIGHT; } }
+
+		private static bool RELATIVE_MODE;
+		
+		private static readonly int[] LIGHT_USES_ANGLE_VALUE = { 9801, 9802, 9804, 9811, 9812, 9814, 9821, 9822, 9824 };
+		
+		private List<Thing> selection;
+		private List<VisualThing> visualSelection;
+		private List<LightProps> fixedValues; //this gets filled with radius / intencity values before RELATIVE_MODE is engaged
+
+		private string editingModeName;
+		private bool showAllControls;
+
+		private LightProps lightProps;
+ 
+		//maximum and minimum values for sliders for relative and absolute modes
+		//numericUpDown
+		private const int NUD_ABS_MIN = 0;
+		private const int NUD_ABS_MAX = 16384;
+
+		private const int NUD_REL_MIN = -16384;
+		private const int NUD_REL_MAX = 16384;
+
+		//trackBar
+		private const int TB_ABS_MIN = 0;
+		private const int TB_ABS_MAX = 512;
+
+		private const int TB_REL_MIN = -256;
+		private const int TB_REL_MAX = 256;
+
+		//trackBar controlling thing angle
+		private const int TB_ANGLE_ABS_MIN = 0;
+		private const int TB_ANGLE_ABS_MAX = 359;
+
+		private const int TB_ANGLE_REL_MIN = -180;
+		private const int TB_ANGLE_REL_MAX = 180;
+
+		//initialise pannel
+		public bool Setup(string editingModeName) 
+		{
+			this.editingModeName = editingModeName;
+			SetupSelection();
+
+			int selCount = selection.Count;
+			if(selCount == 0) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "No lights found in selection!");
+				return false;
+			}
+
+			lightProps = new LightProps();
+
+			//initialise
+			InitializeComponent();
+
+			SetupSliders(selection[0]);
+			UpdateLightPropsFromThing(selection[0]);
+			SetControlsMode();
+
+			colorPickerControl1.Initialize(GetThingColor(selection[0]));
+			colorPickerControl1.OnColorChanged += OnColorPickerControl1OnColorChanged;
+			colorPickerControl1.OnOkPressed += colorPickerControl1_OnOkPressed;
+			colorPickerControl1.OnCancelPressed += colorPickerControl1_OnCancelPressed;
+
+			cbRelativeMode.Checked = RELATIVE_MODE;
+			cbRelativeMode.CheckStateChanged += cbRelativeMode_CheckStateChanged;
+
+			this.AcceptButton = colorPickerControl1.OkButton;
+			this.CancelButton = colorPickerControl1.CancelButton;
+			this.Text = "Editing " + selCount + " light" + (selCount > 1 ? "s" : "");
+			
+			//undo
+			MakeUndo(this.Text);
+			return true;
+		}
+
+		//create selection of lights. This is called only once
+		private void SetupSelection() 
+		{
+			selection = new List<Thing>();
+
+			//check things
+			if(editingModeName == "BaseVisualMode") 
+			{
+				visualSelection = new List<VisualThing>();
+				List<VisualThing> selectedVisualThings = ((VisualMode)General.Editing.Mode).GetSelectedVisualThings(false);
+
+				foreach(VisualThing t in selectedVisualThings) 
+				{
+					if(Array.IndexOf(GZGeneral.GZ_LIGHTS, t.Thing.Type) != -1) 
+					{
+						selection.Add(t.Thing);
+						visualSelection.Add(t);
+					}
+				}
+			} 
+			else 
+			{
+				ICollection<Thing> list = General.Map.Map.GetSelectedThings(true);
+				foreach(Thing t in list) 
+				{
+					if(Array.IndexOf(GZGeneral.GZ_LIGHTS, t.Type) != -1)
+						selection.Add(t);
+				}
+			}
+		}
+
+		//set sliders count and labels based on given thing, set lightProps start values
+		//this is called only once
+		private void SetupSliders(Thing referenceThing) 
+		{
+			ThingTypeInfo typeInfo = General.Map.Data.GetThingInfoEx(referenceThing.Type);
+			int firstArg = 3;
+			if(referenceThing.Type == 1502 || referenceThing.Type == 1503)
+				firstArg = 0;
+
+			//first slider is always used
+			colorPickerSlider1.Label = typeInfo.Args[firstArg].Title + ":";
+			colorPickerSlider1.OnValueChanged += OnSliderValueChanged;
+
+			//either both of them or none are used
+			if(Array.IndexOf(LIGHT_USES_ANGLE_VALUE, referenceThing.Type) != -1) 
+			{
+				showAllControls = true;
+				colorPickerSlider2.Label = typeInfo.Args[4].Title + ":";
+				colorPickerSlider2.OnValueChanged += OnSliderValueChanged;
+				
+				colorPickerSlider3.Label = "Interval:";
+				colorPickerSlider3.OnValueChanged += OnSliderValueChanged;
+			} 
+			else 
+			{
+				colorPickerSlider2.Visible = false;
+				colorPickerSlider3.Visible = false;
+			}
+
+			//set window height
+			int newHeight;
+			if(showAllControls) 
+				newHeight = colorPickerSlider3.Location.Y + colorPickerSlider3.Height + 8;
+			else
+				newHeight = colorPickerSlider1.Location.Y + colorPickerSlider1.Height + 8;
+
+			this.ClientSize = new Size(this.ClientSize.Width, newHeight);
+		}
+
+		//this sets lightProps values from given thing
+		private void UpdateLightPropsFromThing(Thing referenceThing) 
+		{
+			//color
+			Color c = GetThingColor(referenceThing);
+			lightProps.Red = c.R;
+			lightProps.Green = c.G;
+			lightProps.Blue = c.B;
+			
+			//size
+			int firstArg = 3;
+			if(referenceThing.Type == 1502 || referenceThing.Type == 1503)
+				firstArg = 0;
+
+			lightProps.PrimaryRadius = referenceThing.Args[firstArg];
+
+			//either both of them or none are used
+			if(showAllControls && Array.IndexOf(LIGHT_USES_ANGLE_VALUE, referenceThing.Type) != -1) 
+			{
+				lightProps.SecondaryRadius = referenceThing.Args[4];
+				lightProps.Interval = referenceThing.AngleDoom;
+			}
+		}
+
+		//this sets lightProps values from sliders
+		private void UpdateLightPropsFromSliders() 
+		{
+			ColorHandler.RGB curColor = colorPickerControl1.CurrentColor;
+			bool colorChanged = false; //need this check to allow relative mode to work properly
+
+			if((byte)curColor.Red != lightProps.Red || (byte)curColor.Green != lightProps.Green || (byte)curColor.Blue != lightProps.Blue) 
+			{
+				lightProps.Red = (byte)curColor.Red;
+				lightProps.Green = (byte)curColor.Green;
+				lightProps.Blue = (byte)curColor.Blue;
+				colorChanged = true;
+			}
+
+			lightProps.PrimaryRadius = colorPickerSlider1.Value;
+			if(showAllControls) 
+			{
+				lightProps.SecondaryRadius = colorPickerSlider2.Value;
+				lightProps.Interval = colorPickerSlider3.Value;
+			}
+			UpdateSelection(colorChanged);
+		}
+
+		//this sets values from lightProps to things in selection
+		private void UpdateSelection(bool colorChanged) 
+		{
+			for(int i = 0; i < selection.Count; i++) 
+			{
+				Thing t = selection[i];
+
+				//update color 
+				if(colorChanged) //need this check to allow relative mode to work properly
+				{ 
+					if(t.Type == 1503) //Vavoom Light Color
+					{ 
+						t.Args[1] = lightProps.Red;
+						t.Args[2] = lightProps.Green;
+						t.Args[3] = lightProps.Blue;
+					} 
+					else if(t.Type != 1502) //vavoom light has no color settings
+					{ 
+						t.Args[0] = lightProps.Red;
+						t.Args[1] = lightProps.Green;
+						t.Args[2] = lightProps.Blue;
+					}
+				}
+
+				int firstArg = 3;
+				if(t.Type == 1502 || t.Type == 1503) firstArg = 0;
+
+				//update radius and intensity
+				if(RELATIVE_MODE) 
+				{
+					LightProps fixedVal = fixedValues[i];
+
+					t.Args[firstArg] = fixedVal.PrimaryRadius + lightProps.PrimaryRadius;
+					if(t.Args[firstArg] < 0) t.Args[firstArg] = 0;
+
+					if(showAllControls && Array.IndexOf(LIGHT_USES_ANGLE_VALUE, t.Type) != -1) 
+					{
+						t.Args[4] = fixedVal.SecondaryRadius + lightProps.SecondaryRadius;
+						if(t.Args[4] < 0) t.Args[4] = 0;
+
+						t.Rotate(General.ClampAngle(fixedVal.Interval + lightProps.Interval));
+					}
+				} 
+				else 
+				{
+					if(lightProps.PrimaryRadius != -1)
+						t.Args[firstArg] = lightProps.PrimaryRadius;
+
+					if(showAllControls && Array.IndexOf(LIGHT_USES_ANGLE_VALUE, t.Type) != -1) 
+					{
+						t.Args[4] = lightProps.SecondaryRadius;
+						t.Rotate(General.ClampAngle(lightProps.Interval));
+					}
+				}
+			}
+
+			//update VisualThings
+			if(editingModeName == "BaseVisualMode") 
+			{
+				foreach(VisualThing t in visualSelection)
+					t.UpdateLight();
+			}
+			else if(editingModeName == "ThingsMode")
+			{
+				// Hacky way to call ThingsMode.UpdateHelperObjects() without referenceing BuilderModes.dll
+				General.Editing.Mode.OnRedoEnd();
+				General.Interface.RedrawDisplay();
+			}
+		}
+
+		//switch between absolute and relative mode
+		private void SetControlsMode() 
+		{
+			if(RELATIVE_MODE) 
+			{
+				SetFixedValues();
+				colorPickerSlider1.SetLimits(TB_REL_MIN, TB_REL_MAX, NUD_REL_MIN, NUD_REL_MAX);
+				colorPickerSlider1.Value = 0;
+
+				if(showAllControls) 
+				{
+					colorPickerSlider2.SetLimits(TB_REL_MIN, TB_REL_MAX, NUD_REL_MIN, NUD_REL_MAX);
+					colorPickerSlider2.Value = 0;
+
+					colorPickerSlider3.SetLimits(TB_ANGLE_REL_MIN, TB_ANGLE_REL_MAX, NUD_REL_MIN, NUD_REL_MAX);
+					colorPickerSlider3.Value = 0;
+				}    
+			} 
+			else 
+			{
+				UpdateLightPropsFromThing(selection[0]);
+				colorPickerSlider1.SetLimits(TB_ABS_MIN, TB_ABS_MAX, NUD_ABS_MIN, NUD_ABS_MAX);
+				colorPickerSlider1.Value = lightProps.PrimaryRadius;
+
+				if(showAllControls) 
+				{
+					colorPickerSlider2.SetLimits(TB_ABS_MIN, TB_ABS_MAX, NUD_ABS_MIN, NUD_ABS_MAX);
+					colorPickerSlider2.Value = lightProps.SecondaryRadius;
+
+					colorPickerSlider3.SetLimits(TB_ANGLE_ABS_MIN, TB_ANGLE_ABS_MAX, NUD_ABS_MIN, NUD_ABS_MAX);
+					colorPickerSlider3.Value = lightProps.Interval;
+				}
+			}
+		}
+
+		private void MakeUndo(string description) 
+		{
+			General.Map.UndoRedo.CreateUndo(description);
+
+			//tricky way to actually store undo information...
+			foreach(Thing t in selection) t.Move(t.Position);
+		}
+
+		//this is called only once
+		private static Color GetThingColor(Thing thing) 
+		{
+			if(thing.Type == 1502) return Color.White; //vavoom light
+			if(thing.Type == 1503) return Color.FromArgb((byte)thing.Args[1], (byte)thing.Args[2], (byte)thing.Args[3]); //vavoom colored light
+			return Color.FromArgb((byte)thing.Args[0], (byte)thing.Args[1], (byte)thing.Args[2]);
+		}
+
+		//this sets data to use as a reference for relative mode
+		private void SetFixedValues() 
+		{
+			fixedValues = new List<LightProps>();
+
+			for(int i = 0; i < selection.Count; i++) 
+			{
+				Thing t = selection[i];
+				LightProps lp = new LightProps();
+				int firstArg = 3;
+				if(t.Type == 1502 || t.Type == 1503) firstArg = 0;
+				lp.PrimaryRadius = t.Args[firstArg];
+
+				//either both of them or none are used
+				if(showAllControls &&  Array.IndexOf(LIGHT_USES_ANGLE_VALUE, t.Type) != -1) 
+				{
+					lp.SecondaryRadius = t.Args[4];
+					lp.Interval = t.AngleDoom;
+				}
+
+				fixedValues.Add(lp);
+			}
+		}
+
+//events
+		private void OnColorPickerControl1OnColorChanged(object sender, ColorChangedEventArgs e) 
+		{
+			//need this check to allow relative mode to work properly
+			if((byte)e.RGB.Red != lightProps.Red || (byte)e.RGB.Green != lightProps.Green || (byte)e.RGB.Blue != lightProps.Blue)
+				UpdateLightPropsFromSliders();
+		}
+
+		private void colorPickerControl1_OnCancelPressed(object sender, EventArgs e) 
+		{
+			this.DialogResult = DialogResult.Cancel;
+			Close();
+		}
+
+		private void colorPickerControl1_OnOkPressed(object sender, EventArgs e) 
+		{
+			this.DialogResult = DialogResult.OK;
+			General.Interface.RefreshInfo();
+			Close();
+		}
+
+		private void LightColorPicker_FormClosing(object sender, FormClosingEventArgs e) 
+		{
+			if(this.DialogResult == DialogResult.Cancel) General.Map.UndoRedo.WithdrawUndo();
+		}
+
+		private void cbRelativeMode_CheckStateChanged(object sender, EventArgs e) 
+		{
+			RELATIVE_MODE = ((CheckBox)sender).Checked;
+			SetControlsMode();
+		}
+
+		private void OnSliderValueChanged(object sender, ColorPickerSliderEventArgs e) 
+		{
+			UpdateLightPropsFromSliders();
+		}
+
+		private void LightColorPicker_HelpRequested(object sender, HelpEventArgs hlpevent) 
+		{
+			General.ShowHelp("gzdb/features/all_modes/colorpicker.html");
+			hlpevent.Handled = true;
+		}
+	}
+
+	struct LightProps 
+	{
+		public byte Red;
+		public byte Green;
+		public byte Blue;
+
+		public int PrimaryRadius;
+		public int SecondaryRadius;
+		public int Interval;
+	}
+}
\ No newline at end of file
diff --git a/Source/Plugins/ColorPicker/Windows/LightColorPicker.resx b/Source/Plugins/ColorPicker/Windows/LightColorPicker.resx
new file mode 100644
index 0000000..19dc0dd
--- /dev/null
+++ b/Source/Plugins/ColorPicker/Windows/LightColorPicker.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/ColorPicker/Windows/SectorColorPicker.Designer.cs b/Source/Plugins/ColorPicker/Windows/SectorColorPicker.Designer.cs
new file mode 100644
index 0000000..876991a
--- /dev/null
+++ b/Source/Plugins/ColorPicker/Windows/SectorColorPicker.Designer.cs
@@ -0,0 +1,108 @@
+namespace CodeImp.DoomBuilder.ColorPicker.Windows
+{
+	partial class SectorColorPicker
+	{
+		/// <summary>
+		/// Требует�� переменна� кон�труктора.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// О�вободить в�е и�пользуемые ре�ур�ы.
+		/// </summary>
+		/// <param name="disposing">и�тинно, е�ли управл�емый ре�ур� должен быть удален; иначе ложно.</param>
+		protected override void Dispose(bool disposing) {
+			if(disposing && (components != null)) {
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Код, автоматиче�ки �озданный кон�труктором форм Windows
+
+		/// <summary>
+		/// Об�зательный метод дл� поддержки кон�труктора - не измен�йте
+		/// �одержимое данного метода при помощи редактора кода.
+		/// </summary>
+		private void InitializeComponent() {
+			this.groupBox1 = new System.Windows.Forms.GroupBox();
+			this.rbFadeColor = new System.Windows.Forms.RadioButton();
+			this.rbSectorColor = new System.Windows.Forms.RadioButton();
+			this.colorPickerControl1 = new CodeImp.DoomBuilder.ColorPicker.Controls.ColorPickerControl();
+			this.groupBox1.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// groupBox1
+			// 
+			this.groupBox1.Controls.Add(this.rbFadeColor);
+			this.groupBox1.Controls.Add(this.rbSectorColor);
+			this.groupBox1.Location = new System.Drawing.Point(8, 212);
+			this.groupBox1.Name = "groupBox1";
+			this.groupBox1.Size = new System.Drawing.Size(311, 62);
+			this.groupBox1.TabIndex = 2;
+			this.groupBox1.TabStop = false;
+			this.groupBox1.Text = "Edit:";
+			// 
+			// rbFadeColor
+			// 
+			this.rbFadeColor.AutoSize = true;
+			this.rbFadeColor.Location = new System.Drawing.Point(7, 41);
+			this.rbFadeColor.Name = "rbFadeColor";
+			this.rbFadeColor.Size = new System.Drawing.Size(75, 17);
+			this.rbFadeColor.TabIndex = 1;
+			this.rbFadeColor.Tag = "fadecolor";
+			this.rbFadeColor.Text = "Fade color";
+			this.rbFadeColor.UseVisualStyleBackColor = true;
+			// 
+			// rbSectorColor
+			// 
+			this.rbSectorColor.AutoSize = true;
+			this.rbSectorColor.Checked = true;
+			this.rbSectorColor.Location = new System.Drawing.Point(7, 20);
+			this.rbSectorColor.Name = "rbSectorColor";
+			this.rbSectorColor.Size = new System.Drawing.Size(82, 17);
+			this.rbSectorColor.TabIndex = 0;
+			this.rbSectorColor.TabStop = true;
+			this.rbSectorColor.Tag = "lightcolor";
+			this.rbSectorColor.Text = "Sector color";
+			this.rbSectorColor.UseVisualStyleBackColor = true;
+			// 
+			// colorPickerControl1
+			// 
+			this.colorPickerControl1.Location = new System.Drawing.Point(8, 9);
+			this.colorPickerControl1.Name = "colorPickerControl1";
+			this.colorPickerControl1.Size = new System.Drawing.Size(311, 197);
+			this.colorPickerControl1.TabIndex = 1;
+			// 
+			// SectorColorPicker
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.ClientSize = new System.Drawing.Size(327, 278);
+			this.Controls.Add(this.groupBox1);
+			this.Controls.Add(this.colorPickerControl1);
+			this.DoubleBuffered = true;
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "SectorColorPicker";
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
+			this.Text = "SectorColorPicker";
+			this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.SectorColorPicker_FormClosing);
+			this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.SectorColorPicker_HelpRequested);
+			this.groupBox1.ResumeLayout(false);
+			this.groupBox1.PerformLayout();
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private CodeImp.DoomBuilder.ColorPicker.Controls.ColorPickerControl colorPickerControl1;
+		private System.Windows.Forms.GroupBox groupBox1;
+		private System.Windows.Forms.RadioButton rbFadeColor;
+		private System.Windows.Forms.RadioButton rbSectorColor;
+	}
+}
\ No newline at end of file
diff --git a/Source/Plugins/ColorPicker/Windows/SectorColorPicker.cs b/Source/Plugins/ColorPicker/Windows/SectorColorPicker.cs
new file mode 100644
index 0000000..6d415c4
--- /dev/null
+++ b/Source/Plugins/ColorPicker/Windows/SectorColorPicker.cs
@@ -0,0 +1,175 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Windows;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Types;
+using CodeImp.DoomBuilder.VisualModes;
+
+namespace CodeImp.DoomBuilder.ColorPicker.Windows
+{
+	public partial class SectorColorPicker : DelayedForm, IColorPicker
+	{
+		public ColorPickerType Type { get { return ColorPickerType.CP_SECTOR; } }
+
+		private const int DEFAULT_LIGHT_COLOR = 0xFFFFFF; //ffffff
+		private const int DEFAULT_FADE_COLOR = 0;
+		
+		private List<Sector> selection;
+		private List<VisualSector> visualSelection;
+		
+		private int curSectorColor;
+		private int curFadeColor;
+		private int initialSectorColor;
+		private int initialFadeColor;
+
+		private static string currentColorTag = "lightcolor"; //lightcolor or fadecolor
+		private string mode;
+
+		public bool Setup(string editingModeName) 
+		{
+			mode = editingModeName;
+
+			if(mode == "SectorsMode") 
+			{
+				selection = (List<Sector>)(General.Map.Map.GetSelectedSectors(true));
+			} 
+			else //should be Visual mode
+			{ 
+				selection = new List<Sector>();
+				VisualMode vm = (VisualMode)General.Editing.Mode;
+				visualSelection = vm.GetSelectedVisualSectors(false);
+				
+				if(visualSelection.Count > 0) 
+				{
+					foreach(VisualSector vs in visualSelection)
+						selection.Add(vs.Sector);
+				} 
+				else //should be some sectors selected in 2d-mode...
+				{ 
+					visualSelection = new List<VisualSector>();
+					selection = (List<Sector>)(General.Map.Map.GetSelectedSectors(true));
+
+					foreach(Sector s in selection) 
+					{
+						if(vm.VisualSectorExists(s))
+							visualSelection.Add(vm.GetVisualSector(s));
+					}
+				}
+			}
+
+			//create undo
+			string rest = selection.Count + " sector" + (selection.Count > 1 ? "s" : "");
+			General.Map.UndoRedo.CreateUndo("Edit color of " + rest);
+			
+			foreach(Sector s in selection) s.Fields.BeforeFieldsChange();
+
+			//set colors
+			curSectorColor = selection[0].Fields.GetValue("lightcolor", DEFAULT_LIGHT_COLOR);
+			curFadeColor = selection[0].Fields.GetValue("fadecolor", DEFAULT_FADE_COLOR);
+
+			//check that all sectors in selection have "lightcolor" and "fadecolor" fields
+			for(int i = 0; i < selection.Count; i++) 
+			{
+				if(!selection[i].Fields.ContainsKey("lightcolor"))
+					selection[i].Fields.Add("lightcolor", new UniValue(UniversalType.Color, curSectorColor));
+				
+				if(!selection[i].Fields.ContainsKey("fadecolor"))
+					selection[i].Fields.Add("fadecolor", new UniValue(UniversalType.Color, curFadeColor));
+			}
+
+			initialSectorColor = curSectorColor;
+			initialFadeColor = curFadeColor;
+
+			InitializeComponent();
+
+			colorPickerControl1.Initialize(Color.FromArgb(currentColorTag == "lightcolor" ? curSectorColor : curFadeColor));
+			colorPickerControl1.OnColorChanged += OnColorPickerControl1OnColorChanged;
+			colorPickerControl1.OnOkPressed += colorPickerControl1_OnOkPressed;
+			colorPickerControl1.OnCancelPressed += colorPickerControl1_OnCancelPressed;
+
+			if(currentColorTag == "lightcolor")
+				rbSectorColor.Checked = true;
+			else
+				rbFadeColor.Checked = true;
+
+			rbSectorColor.CheckedChanged += rbColor_CheckedChanged;
+			rbFadeColor.CheckedChanged += rbColor_CheckedChanged;
+
+			Text = "Editing " + rest;
+
+			//cannot fail here :)
+			return true;
+		}
+
+		private void colorPickerControl1_OnCancelPressed(object sender, EventArgs e) 
+		{
+			this.DialogResult = DialogResult.Cancel;
+			Close();
+		}
+
+		private void colorPickerControl1_OnOkPressed(object sender, EventArgs e) 
+		{
+			//check if values are default
+			foreach(Sector s in selection) 
+			{
+				if((int)s.Fields["lightcolor"].Value == DEFAULT_LIGHT_COLOR)
+					s.Fields.Remove("lightcolor");
+
+				if((int)s.Fields["fadecolor"].Value == DEFAULT_FADE_COLOR)
+					s.Fields.Remove("fadecolor");
+			}
+
+			this.DialogResult = DialogResult.OK;
+			Close();
+		}
+
+		private void SectorColorPicker_FormClosing(object sender, FormClosingEventArgs e) 
+		{
+			if(this.DialogResult == DialogResult.Cancel) General.Map.UndoRedo.WithdrawUndo();
+		}
+
+		private void OnColorPickerControl1OnColorChanged(object sender, ColorChangedEventArgs e) 
+		{
+			foreach(Sector s in selection) 
+			{
+				s.Fields[currentColorTag].Value = e.RGB.Red << 16 | e.RGB.Green << 8 | e.RGB.Blue;
+				s.UpdateNeeded = true;
+				s.UpdateCache();
+			}
+
+			//update display
+			if(mode == "SectorsMode") 
+			{
+				General.Interface.RedrawDisplay();
+			} 
+			else //should be visual mode
+			{ 
+				foreach(VisualSector vs in visualSelection) vs.UpdateSectorData();
+			}
+		}
+
+		private void rbColor_CheckedChanged(object sender, EventArgs e) 
+		{
+			RadioButton b = (RadioButton)sender;
+			if(b.Checked) 
+			{
+				currentColorTag = (string)b.Tag;
+
+				//update color picker
+				if(currentColorTag == "lightcolor")
+					colorPickerControl1.SetInitialColor(Color.FromArgb(initialSectorColor));
+				else
+					colorPickerControl1.SetInitialColor(Color.FromArgb(initialFadeColor));
+				colorPickerControl1.SetCurrentColor(Color.FromArgb((int)selection[0].Fields[currentColorTag].Value));
+			}
+		}
+
+		private void SectorColorPicker_HelpRequested(object sender, HelpEventArgs hlpevent) 
+		{
+			General.ShowHelp("gzdb/features/all_modes/colorpicker.html");
+			hlpevent.Handled = true;
+		}
+	}
+}
diff --git a/Source/Plugins/ColorPicker/Windows/SectorColorPicker.resx b/Source/Plugins/ColorPicker/Windows/SectorColorPicker.resx
new file mode 100644
index 0000000..19dc0dd
--- /dev/null
+++ b/Source/Plugins/ColorPicker/Windows/SectorColorPicker.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/ColorPicker/Windows/ToolForm.Designer.cs b/Source/Plugins/ColorPicker/Windows/ToolForm.Designer.cs
new file mode 100644
index 0000000..bfdac8e
--- /dev/null
+++ b/Source/Plugins/ColorPicker/Windows/ToolForm.Designer.cs
@@ -0,0 +1,112 @@
+namespace CodeImp.DoomBuilder.ColorPicker
+{
+	partial class ToolsForm
+	{
+		/// <summary>
+		/// Требует�� переменна� кон�труктора.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// О�вободить в�е и�пользуемые ре�ур�ы.
+		/// </summary>
+		/// <param name="disposing">и�тинно, е�ли управл�емый ре�ур� должен быть удален; иначе ложно.</param>
+		protected override void Dispose(bool disposing) {
+			if(disposing && (components != null)) {
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Код, автоматиче�ки �озданный кон�труктором форм Windows
+
+		/// <summary>
+		/// Об�зательный метод дл� поддержки кон�труктора - не измен�йте
+		/// �одержимое данного метода при помощи редактора кода.
+		/// </summary>
+		private void InitializeComponent() {
+			this.toolStrip1 = new System.Windows.Forms.ToolStrip();
+			this.cpButton = new System.Windows.Forms.ToolStripButton();
+			this.menuStrip1 = new System.Windows.Forms.MenuStrip();
+			this.modesmenu = new System.Windows.Forms.ToolStripMenuItem();
+			this.cpMenu = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStrip1.SuspendLayout();
+			this.menuStrip1.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// toolStrip1
+			// 
+			this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.cpButton});
+			this.toolStrip1.Location = new System.Drawing.Point(0, 24);
+			this.toolStrip1.Name = "toolStrip1";
+			this.toolStrip1.Size = new System.Drawing.Size(284, 25);
+			this.toolStrip1.TabIndex = 0;
+			this.toolStrip1.Text = "toolStrip1";
+			// 
+			// cpButton
+			// 
+			this.cpButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.cpButton.Image = global::CodeImp.DoomBuilder.ColorPicker.Properties.Resources.cp;
+			this.cpButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.cpButton.Name = "cpButton";
+			this.cpButton.Size = new System.Drawing.Size(23, 22);
+			this.cpButton.Tag = "togglelightpannel";
+			this.cpButton.Text = "Pick Sector/Light Color";
+			this.cpButton.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// menuStrip1
+			// 
+			this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.modesmenu});
+			this.menuStrip1.Location = new System.Drawing.Point(0, 0);
+			this.menuStrip1.Name = "menuStrip1";
+			this.menuStrip1.Size = new System.Drawing.Size(284, 24);
+			this.menuStrip1.TabIndex = 1;
+			this.menuStrip1.Text = "menuStrip1";
+			// 
+			// modesmenu
+			// 
+			this.modesmenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.cpMenu});
+			this.modesmenu.Name = "modesmenu";
+			this.modesmenu.Size = new System.Drawing.Size(55, 20);
+			this.modesmenu.Text = "Modes";
+			// 
+			// cpMenu
+			// 
+			this.cpMenu.Image = global::CodeImp.DoomBuilder.ColorPicker.Properties.Resources.cp;
+			this.cpMenu.Name = "cpMenu";
+			this.cpMenu.Size = new System.Drawing.Size(205, 22);
+			this.cpMenu.Tag = "togglelightpannel";
+			this.cpMenu.Text = "Pick Sector/Light Color...";
+			this.cpMenu.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// ToolsForm
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.ClientSize = new System.Drawing.Size(284, 262);
+			this.Controls.Add(this.toolStrip1);
+			this.Controls.Add(this.menuStrip1);
+			this.MainMenuStrip = this.menuStrip1;
+			this.Name = "ToolsForm";
+			this.Text = "ToolStrip";
+			this.toolStrip1.ResumeLayout(false);
+			this.toolStrip1.PerformLayout();
+			this.menuStrip1.ResumeLayout(false);
+			this.menuStrip1.PerformLayout();
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.ToolStrip toolStrip1;
+		private System.Windows.Forms.ToolStripButton cpButton;
+		private System.Windows.Forms.MenuStrip menuStrip1;
+		private System.Windows.Forms.ToolStripMenuItem modesmenu;
+		private System.Windows.Forms.ToolStripMenuItem cpMenu;
+	}
+}
\ No newline at end of file
diff --git a/Source/Plugins/ColorPicker/Windows/ToolForm.cs b/Source/Plugins/ColorPicker/Windows/ToolForm.cs
new file mode 100644
index 0000000..c051ae4
--- /dev/null
+++ b/Source/Plugins/ColorPicker/Windows/ToolForm.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Windows.Forms;
+
+namespace CodeImp.DoomBuilder.ColorPicker
+{
+	public partial class ToolsForm : Form
+	{
+		public ToolsForm() 
+		{
+			InitializeComponent();
+		}
+
+		public void Register() 
+		{
+			General.Interface.AddModesMenu(cpMenu, "002_modify");
+			General.Interface.AddModesButton(cpButton, "002_modify");
+		}
+
+		public void Unregister() 
+		{
+			General.Interface.RemoveMenu(cpMenu);
+			General.Interface.RemoveButton(cpButton);
+		}
+
+		private void InvokeTaggedAction(object sender, EventArgs e) 
+		{
+			General.Interface.InvokeTaggedAction(sender, e);
+		}
+	}
+}
diff --git a/Source/Plugins/ColorPicker/Windows/ToolForm.resx b/Source/Plugins/ColorPicker/Windows/ToolForm.resx
new file mode 100644
index 0000000..186cd29
--- /dev/null
+++ b/Source/Plugins/ColorPicker/Windows/ToolForm.resx
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>122, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/CommentsPanel/BuilderPlug.cs b/Source/Plugins/CommentsPanel/BuilderPlug.cs
new file mode 100644
index 0000000..3619445
--- /dev/null
+++ b/Source/Plugins/CommentsPanel/BuilderPlug.cs
@@ -0,0 +1,124 @@
+
+#region ================== Copyright (c) 2010 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2010 Pascal vd Heiden
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using CodeImp.DoomBuilder.Controls;
+using CodeImp.DoomBuilder.Editing;
+using CodeImp.DoomBuilder.Plugins;
+using CodeImp.DoomBuilder.Config;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.CommentsPanel
+{
+	//
+	// MANDATORY: The plug!
+	// This is an important class to the Doom Builder core. Every plugin must
+	// have exactly 1 class that inherits from Plug. When the plugin is loaded,
+	// this class is instantiated and used to receive events from the core.
+	// Make sure the class is public, because only public classes can be seen
+	// by the core.
+	//
+
+	public class BuilderPlug : Plug
+	{
+		// Static instance. We can't use a real static class, because BuilderPlug must
+		// be instantiated by the core, so we keep a static reference. (this technique
+		// should be familiar to object-oriented programmers)
+		private static BuilderPlug me;
+		
+		// Docker
+		private CommentsDocker dockerpanel;
+		private Docker commentsdocker;
+		
+		// Static property to access the BuilderPlug
+		public static BuilderPlug Me { get { return me; } }
+		
+		// This event is called when the plugin is initialized
+		public override void OnInitialize()
+		{
+			base.OnInitialize();
+
+			// Keep a static reference
+            me = this;
+		}
+
+		// When a map is created
+		public override void OnMapNewEnd()
+		{
+			OnMapOpenEnd();
+		}
+		
+		// This is called after a map has been successfully opened
+		public override void OnMapOpenEnd()
+		{
+			// If we just opened a UDMF format map, we want to create the Comments panel!
+			if(General.Map.Config.FormatInterface == "UniversalMapSetIO")
+			{
+				dockerpanel = new CommentsDocker();
+				commentsdocker = new Docker("commentsdockerpanel", "Comments", dockerpanel);
+				General.Interface.AddDocker(commentsdocker);
+				dockerpanel.Setup();
+				dockerpanel.UpdateListSoon();
+			}
+		}
+
+		// Occurs before the map is closed
+		public override void OnMapCloseBegin()
+		{
+			// If we have a Comments panel, remove it
+			if(dockerpanel != null)
+			{
+				dockerpanel.Terminate();
+				General.Interface.RemoveDocker(commentsdocker);
+				commentsdocker = null;
+				dockerpanel.Dispose();
+				dockerpanel = null;
+			}
+		}
+
+		// Geometry pasted
+		public override void OnPasteEnd(PasteOptions options)
+		{
+			if(dockerpanel != null)
+				dockerpanel.UpdateListSoon();
+		}
+
+		// Undo performed
+		public override void OnUndoEnd()
+		{
+			if(dockerpanel != null)
+				dockerpanel.UpdateListSoon();
+		}
+
+		// Redo performed
+		public override void OnRedoEnd()
+		{
+			if(dockerpanel != null)
+				dockerpanel.UpdateListSoon();
+		}
+		
+		// Mode changes
+		public override bool OnModeChange(EditMode oldmode, EditMode newmode)
+		{
+			if(dockerpanel != null)
+				dockerpanel.UpdateListSoon();
+				
+			return base.OnModeChange(oldmode, newmode);
+		}
+    }
+}
diff --git a/Source/Plugins/CommentsPanel/CommentInfo.cs b/Source/Plugins/CommentsPanel/CommentInfo.cs
new file mode 100644
index 0000000..fc75c81
--- /dev/null
+++ b/Source/Plugins/CommentsPanel/CommentInfo.cs
@@ -0,0 +1,59 @@
+
+#region ================== Copyright (c) 2010 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2010 Pascal vd Heiden
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Map;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.CommentsPanel
+{
+	public class CommentInfo
+	{
+		private readonly string comment;
+		private List<MapElement> elements;
+		private DataGridViewRow row;
+		
+		// Properties
+		public string Comment { get { return comment; } }
+		public List<MapElement> Elements { get { return elements; } }
+		public DataGridViewRow Row { get { return row; } set { row = value; } }
+		
+		// Constructor
+		public CommentInfo(string comment, MapElement e)
+		{
+			this.comment = comment;
+			this.elements = new List<MapElement>();
+			this.AddElement(e);
+			this.row = null;
+		}
+		
+		// This adds an element
+		public void AddElement(MapElement e)
+		{
+			this.elements.Add(e);
+		}
+		
+		// This replaces the elements with those from another
+		public void ReplaceElements(CommentInfo other)
+		{
+			this.elements = other.elements;
+		}
+	}
+}
diff --git a/Source/Plugins/CommentsPanel/CommentObjectType.cs b/Source/Plugins/CommentsPanel/CommentObjectType.cs
new file mode 100644
index 0000000..169e661
--- /dev/null
+++ b/Source/Plugins/CommentsPanel/CommentObjectType.cs
@@ -0,0 +1,35 @@
+
+#region ================== Copyright (c) 2010 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2010 Pascal vd Heiden
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+#endregion
+
+namespace CodeImp.DoomBuilder.CommentsPanel
+{
+	public enum CommentObjectType : int
+	{
+		Unknown = -1,
+		
+		Vertex = 0,
+		Linedef = 1,
+		Sector = 2,
+		Thing = 3,
+		
+		// last
+		NumTypes = 4,
+	}
+}
diff --git a/Source/Plugins/CommentsPanel/CommentsDocker.Designer.cs b/Source/Plugins/CommentsPanel/CommentsDocker.Designer.cs
new file mode 100644
index 0000000..0996115
--- /dev/null
+++ b/Source/Plugins/CommentsPanel/CommentsDocker.Designer.cs
@@ -0,0 +1,272 @@
+namespace CodeImp.DoomBuilder.CommentsPanel
+{
+	partial class CommentsDocker
+	{
+		/// <summary> 
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		#region Component Designer generated code
+
+		/// <summary> 
+		/// Required method for Designer support - do not modify 
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.components = new System.ComponentModel.Container();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+			this.optionsgroup = new System.Windows.Forms.GroupBox();
+			this.clickselects = new System.Windows.Forms.CheckBox();
+			this.filtermode = new System.Windows.Forms.CheckBox();
+			this.grid = new System.Windows.Forms.DataGridView();
+			this.iconcolumn = new System.Windows.Forms.DataGridViewImageColumn();
+			this.textcolumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.updatetimer = new System.Windows.Forms.Timer(this.components);
+			this.contextmenu = new System.Windows.Forms.ContextMenuStrip(this.components);
+			this.editobjectitem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator();
+			this.selectitem = new System.Windows.Forms.ToolStripMenuItem();
+			this.selectadditiveitem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator();
+			this.removecommentsitem = new System.Windows.Forms.ToolStripMenuItem();
+			this.addcomment = new System.Windows.Forms.Button();
+			this.addcommentgroup = new System.Windows.Forms.GroupBox();
+			this.addcommenttext = new System.Windows.Forms.TextBox();
+			this.enabledtimer = new System.Windows.Forms.Timer(this.components);
+			this.optionsgroup.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.grid)).BeginInit();
+			this.contextmenu.SuspendLayout();
+			this.addcommentgroup.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// optionsgroup
+			// 
+			this.optionsgroup.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.optionsgroup.Controls.Add(this.clickselects);
+			this.optionsgroup.Controls.Add(this.filtermode);
+			this.optionsgroup.Location = new System.Drawing.Point(3, 561);
+			this.optionsgroup.Name = "optionsgroup";
+			this.optionsgroup.Size = new System.Drawing.Size(244, 93);
+			this.optionsgroup.TabIndex = 1;
+			this.optionsgroup.TabStop = false;
+			// 
+			// clickselects
+			// 
+			this.clickselects.AutoSize = true;
+			this.clickselects.Location = new System.Drawing.Point(15, 57);
+			this.clickselects.Name = "clickselects";
+			this.clickselects.Size = new System.Drawing.Size(96, 17);
+			this.clickselects.TabIndex = 1;
+			this.clickselects.Text = "Select on click";
+			this.clickselects.UseVisualStyleBackColor = true;
+			this.clickselects.CheckedChanged += new System.EventHandler(this.clickselects_CheckedChanged);
+			// 
+			// filtermode
+			// 
+			this.filtermode.AutoSize = true;
+			this.filtermode.Location = new System.Drawing.Point(15, 25);
+			this.filtermode.Name = "filtermode";
+			this.filtermode.Size = new System.Drawing.Size(168, 17);
+			this.filtermode.TabIndex = 0;
+			this.filtermode.Text = "Comments from this mode only";
+			this.filtermode.UseVisualStyleBackColor = true;
+			this.filtermode.CheckedChanged += new System.EventHandler(this.filtermode_CheckedChanged);
+			// 
+			// grid
+			// 
+			this.grid.AllowUserToAddRows = false;
+			this.grid.AllowUserToDeleteRows = false;
+			this.grid.AllowUserToResizeColumns = false;
+			this.grid.AllowUserToResizeRows = false;
+			this.grid.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.grid.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
+			this.grid.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllCells;
+			this.grid.BackgroundColor = System.Drawing.SystemColors.Window;
+			this.grid.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+			this.grid.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None;
+			this.grid.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.EnableWithoutHeaderText;
+			this.grid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+			this.grid.ColumnHeadersVisible = false;
+			this.grid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.iconcolumn,
+            this.textcolumn});
+			this.grid.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;
+			this.grid.Location = new System.Drawing.Point(0, 0);
+			this.grid.Name = "grid";
+			this.grid.ReadOnly = true;
+			this.grid.RowHeadersVisible = false;
+			dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopLeft;
+			dataGridViewCellStyle1.Padding = new System.Windows.Forms.Padding(2, 4, 2, 5);
+			this.grid.RowsDefaultCellStyle = dataGridViewCellStyle1;
+			this.grid.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
+			this.grid.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+			this.grid.ShowCellErrors = false;
+			this.grid.ShowCellToolTips = false;
+			this.grid.ShowEditingIcon = false;
+			this.grid.ShowRowErrors = false;
+			this.grid.Size = new System.Drawing.Size(250, 465);
+			this.grid.StandardTab = true;
+			this.grid.TabIndex = 6;
+			this.grid.MouseDown += new System.Windows.Forms.MouseEventHandler(this.grid_MouseDown);
+			this.grid.Leave += new System.EventHandler(this.grid_Leave);
+			this.grid.MouseUp += new System.Windows.Forms.MouseEventHandler(this.grid_MouseUp);
+			// 
+			// iconcolumn
+			// 
+			this.iconcolumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+			this.iconcolumn.HeaderText = "Icon";
+			this.iconcolumn.MinimumWidth = 20;
+			this.iconcolumn.Name = "iconcolumn";
+			this.iconcolumn.ReadOnly = true;
+			this.iconcolumn.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+			this.iconcolumn.Width = 24;
+			// 
+			// textcolumn
+			// 
+			this.textcolumn.HeaderText = "Text";
+			this.textcolumn.Name = "textcolumn";
+			this.textcolumn.ReadOnly = true;
+			// 
+			// updatetimer
+			// 
+			this.updatetimer.Interval = 2000;
+			this.updatetimer.Tick += new System.EventHandler(this.updatetimer_Tick);
+			// 
+			// contextmenu
+			// 
+			this.contextmenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.editobjectitem,
+            this.toolStripMenuItem1,
+            this.selectitem,
+            this.selectadditiveitem,
+            this.toolStripMenuItem2,
+            this.removecommentsitem});
+			this.contextmenu.Name = "contextMenuStrip1";
+			this.contextmenu.Size = new System.Drawing.Size(175, 116);
+			this.contextmenu.Closed += new System.Windows.Forms.ToolStripDropDownClosedEventHandler(this.contextmenu_Closed);
+			// 
+			// editobjectitem
+			// 
+			this.editobjectitem.Name = "editobjectitem";
+			this.editobjectitem.Size = new System.Drawing.Size(174, 22);
+			this.editobjectitem.Text = "Edit Objects";
+			this.editobjectitem.Click += new System.EventHandler(this.editobjectitem_Click);
+			// 
+			// toolStripMenuItem1
+			// 
+			this.toolStripMenuItem1.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
+			this.toolStripMenuItem1.Name = "toolStripMenuItem1";
+			this.toolStripMenuItem1.Size = new System.Drawing.Size(171, 6);
+			// 
+			// selectitem
+			// 
+			this.selectitem.Name = "selectitem";
+			this.selectitem.Size = new System.Drawing.Size(174, 22);
+			this.selectitem.Text = "Select";
+			this.selectitem.Click += new System.EventHandler(this.selectitem_Click);
+			// 
+			// selectadditiveitem
+			// 
+			this.selectadditiveitem.Name = "selectadditiveitem";
+			this.selectadditiveitem.Size = new System.Drawing.Size(174, 22);
+			this.selectadditiveitem.Text = "Select Additive";
+			this.selectadditiveitem.Click += new System.EventHandler(this.selectadditiveitem_Click);
+			// 
+			// toolStripMenuItem2
+			// 
+			this.toolStripMenuItem2.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
+			this.toolStripMenuItem2.Name = "toolStripMenuItem2";
+			this.toolStripMenuItem2.Size = new System.Drawing.Size(171, 6);
+			// 
+			// removecommentsitem
+			// 
+			this.removecommentsitem.Name = "removecommentsitem";
+			this.removecommentsitem.Size = new System.Drawing.Size(174, 22);
+			this.removecommentsitem.Text = "Remove Comment";
+			this.removecommentsitem.Click += new System.EventHandler(this.removecommentsitem_Click);
+			// 
+			// addcomment
+			// 
+			this.addcomment.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.addcomment.Location = new System.Drawing.Point(6, 45);
+			this.addcomment.Name = "addcomment";
+			this.addcomment.Size = new System.Drawing.Size(232, 31);
+			this.addcomment.TabIndex = 7;
+			this.addcomment.Text = "Set Selection Comment";
+			this.addcomment.UseVisualStyleBackColor = true;
+			this.addcomment.Click += new System.EventHandler(this.addcomment_Click);
+			// 
+			// addcommentgroup
+			// 
+			this.addcommentgroup.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.addcommentgroup.Controls.Add(this.addcommenttext);
+			this.addcommentgroup.Controls.Add(this.addcomment);
+			this.addcommentgroup.Location = new System.Drawing.Point(3, 471);
+			this.addcommentgroup.Name = "addcommentgroup";
+			this.addcommentgroup.Size = new System.Drawing.Size(244, 84);
+			this.addcommentgroup.TabIndex = 8;
+			this.addcommentgroup.TabStop = false;
+			// 
+			// addcommenttext
+			// 
+			this.addcommenttext.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.addcommenttext.Location = new System.Drawing.Point(6, 19);
+			this.addcommenttext.Name = "addcommenttext";
+			this.addcommenttext.Size = new System.Drawing.Size(232, 20);
+			this.addcommenttext.TabIndex = 8;
+			this.addcommenttext.KeyDown += new System.Windows.Forms.KeyEventHandler(this.addcommenttext_KeyDown);
+			// 
+			// enabledtimer
+			// 
+			this.enabledtimer.Interval = 333;
+			this.enabledtimer.Tick += new System.EventHandler(this.enabledtimer_Tick);
+			// 
+			// CommentsDocker
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.Controls.Add(this.addcommentgroup);
+			this.Controls.Add(this.grid);
+			this.Controls.Add(this.optionsgroup);
+			this.Name = "CommentsDocker";
+			this.Size = new System.Drawing.Size(250, 657);
+			this.optionsgroup.ResumeLayout(false);
+			this.optionsgroup.PerformLayout();
+			((System.ComponentModel.ISupportInitialize)(this.grid)).EndInit();
+			this.contextmenu.ResumeLayout(false);
+			this.addcommentgroup.ResumeLayout(false);
+			this.addcommentgroup.PerformLayout();
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.GroupBox optionsgroup;
+		private System.Windows.Forms.CheckBox filtermode;
+		private System.Windows.Forms.DataGridView grid;
+		private System.Windows.Forms.DataGridViewImageColumn iconcolumn;
+		private System.Windows.Forms.DataGridViewTextBoxColumn textcolumn;
+		private System.Windows.Forms.Timer updatetimer;
+		private System.Windows.Forms.ContextMenuStrip contextmenu;
+		private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1;
+		private System.Windows.Forms.ToolStripMenuItem selectitem;
+		private System.Windows.Forms.ToolStripMenuItem selectadditiveitem;
+		private System.Windows.Forms.ToolStripSeparator toolStripMenuItem2;
+		private System.Windows.Forms.ToolStripMenuItem removecommentsitem;
+		private System.Windows.Forms.ToolStripMenuItem editobjectitem;
+		private System.Windows.Forms.CheckBox clickselects;
+		private System.Windows.Forms.Button addcomment;
+		private System.Windows.Forms.GroupBox addcommentgroup;
+		private System.Windows.Forms.TextBox addcommenttext;
+		private System.Windows.Forms.Timer enabledtimer;
+	}
+}
diff --git a/Source/Plugins/CommentsPanel/CommentsDocker.cs b/Source/Plugins/CommentsPanel/CommentsDocker.cs
new file mode 100644
index 0000000..62960b2
--- /dev/null
+++ b/Source/Plugins/CommentsPanel/CommentsDocker.cs
@@ -0,0 +1,635 @@
+#region ================== Copyright (c) 2010 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2010 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Editing;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Types;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.CommentsPanel
+{
+	public partial class CommentsDocker : UserControl
+	{
+		#region ================== Variables
+
+		private readonly Dictionary<string, CommentInfo> v_comments = new Dictionary<string, CommentInfo>(StringComparer.Ordinal);
+		private readonly Dictionary<string, CommentInfo> l_comments = new Dictionary<string, CommentInfo>(StringComparer.Ordinal);
+		private readonly Dictionary<string, CommentInfo> s_comments = new Dictionary<string, CommentInfo>(StringComparer.Ordinal);
+		private readonly Dictionary<string, CommentInfo> t_comments = new Dictionary<string, CommentInfo>(StringComparer.Ordinal);
+		private bool preventupdate;
+		
+		#endregion
+		
+		#region ================== Constructor
+
+		// Constructor
+		public CommentsDocker()
+		{
+			InitializeComponent();
+
+			filtermode.Checked = General.Settings.ReadPluginSetting("filtermode", false);
+			clickselects.Checked = General.Settings.ReadPluginSetting("clickselects", false);
+		}
+		
+		// Disposer
+		protected override void Dispose(bool disposing)
+		{
+			General.Settings.WritePluginSetting("filtermode", filtermode.Checked);
+			General.Settings.WritePluginSetting("clickselects", clickselects.Checked);
+			
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			
+			base.Dispose(disposing);
+		}
+		
+		#endregion
+
+		#region ================== Methods
+
+		// When attached to the docker
+		public void Setup()
+		{
+			if(this.ParentForm != null)
+			{
+				this.ParentForm.Activated += ParentForm_Activated;
+			}
+
+			grid.CurrentCell = null;
+			updatetimer.Start();
+			enabledtimer.Start();
+		}
+
+		// Before detached from the docker
+		public void Terminate()
+		{
+			preventupdate = true; //mxd
+			if(this.ParentForm != null) this.ParentForm.Activated -= ParentForm_Activated;
+			updatetimer.Tick -= updatetimer_Tick; //mxd
+			enabledtimer.Tick -= enabledtimer_Tick; //mxd
+			updatetimer.Stop();
+			enabledtimer.Stop();
+		}
+		
+		// This sends the focus back to the display and removes grid selection
+		private void LoseFocus()
+		{
+			preventupdate = false;
+			grid.CurrentCell = null;
+			grid.ClearSelection();
+			General.Interface.FocusDisplay();
+		}
+		
+		// This updates the list for a specific kind of group
+		private void UpdateGroupList(Dictionary<string, CommentInfo> newcomments, Dictionary<string, CommentInfo> comments, Image icon)
+		{
+			// Remove old comments
+			List<CommentInfo> commentslist = new List<CommentInfo>(comments.Values);
+			foreach(CommentInfo c in commentslist)
+			{
+				if(!newcomments.ContainsKey(c.Comment))
+				{
+					grid.Rows.Remove(c.Row);
+					comments.Remove(c.Comment);
+				}
+			}
+			
+			// Update the list with comments
+			foreach(KeyValuePair<string, CommentInfo> c in newcomments)
+			{
+				CommentInfo cc = c.Value;
+				
+				if(!comments.ContainsKey(c.Key))
+				{
+					// Create grid row
+					int index = grid.Rows.Add();
+					DataGridViewRow row = grid.Rows[index];
+					row.Cells[0].Value = icon;
+					row.Cells[0].Style.Alignment = DataGridViewContentAlignment.TopCenter;
+					row.Cells[0].Style.Padding = new Padding(0, 5, 0, 0);
+					row.Cells[1].Value = cc.Comment;
+					row.Cells[1].Style.WrapMode = DataGridViewTriState.True;
+					row.Cells[1].Tag = cc;
+					
+					// Add to list of comments
+					cc.Row = row;
+					comments.Add(c.Key, cc);
+				}
+				else
+				{
+					cc = comments[c.Key];
+					//row = cc.Row;
+					cc.ReplaceElements(c.Value);
+				}
+			}
+		}
+		
+		// This sets the timer to update the list very soon
+		public void UpdateListSoon()
+		{
+			updatetimer.Stop();
+			updatetimer.Interval = 100;
+			updatetimer.Start();
+		}
+		
+		// This finds all comments and updates the list
+		public void UpdateList()
+		{
+			if(!preventupdate)
+			{
+				// Update vertices
+				Dictionary<string, CommentInfo> newcomments = new Dictionary<string, CommentInfo>(StringComparer.Ordinal);
+				if(!filtermode.Checked || (General.Editing.Mode.GetType().Name == "VerticesMode"))
+				{
+					foreach(Vertex v in General.Map.Map.Vertices) AddComments(v, newcomments);
+				}
+				UpdateGroupList(newcomments, v_comments, Properties.Resources.VerticesMode);
+
+				// Update linedefs/sidedefs
+				newcomments.Clear();
+				if(!filtermode.Checked || (General.Editing.Mode.GetType().Name == "LinedefsMode"))
+				{
+					foreach(Linedef l in General.Map.Map.Linedefs) AddComments(l, newcomments);
+					foreach(Sidedef sd in General.Map.Map.Sidedefs) AddComments(sd, newcomments);
+				}
+				UpdateGroupList(newcomments, l_comments, Properties.Resources.LinesMode);
+
+				// Update sectors
+				newcomments.Clear();
+				if(!filtermode.Checked || (General.Editing.Mode.GetType().Name == "SectorsMode"))
+				{
+					foreach(Sector s in General.Map.Map.Sectors) AddComments(s, newcomments);
+				}
+				UpdateGroupList(newcomments, s_comments, Properties.Resources.SectorsMode);
+
+				// Update things
+				newcomments.Clear();
+				if(!filtermode.Checked || (General.Editing.Mode.GetType().Name == "ThingsMode"))
+				{
+					foreach(Thing t in General.Map.Map.Things) AddComments(t, newcomments);
+				}
+				UpdateGroupList(newcomments, t_comments, Properties.Resources.ThingsMode);
+
+				// Sort grid
+				grid.Sort(grid.Columns[1], ListSortDirection.Ascending);
+
+				// Update
+				grid.Update();
+
+				grid.CurrentCell = null;
+				grid.ClearSelection();
+			}
+		}
+		
+		// This adds comments from a MapElement
+		private static void AddComments(MapElement e, Dictionary<string, CommentInfo> comments)
+		{
+			if(e.Fields.ContainsKey("comment"))
+			{
+				string c = e.Fields["comment"].Value.ToString();
+				if(comments.ContainsKey(c))
+					comments[c].AddElement(e);
+				else
+					comments[c] = new CommentInfo(c, e);
+			}
+		}
+		
+		// This changes the view to see the objects of a comment
+		private static void ViewComment(CommentInfo c)
+		{
+			List<Vector2D> points = new List<Vector2D>();
+			RectangleF area = MapSet.CreateEmptyArea();
+			
+			// Add all points to a list
+			foreach(MapElement obj in c.Elements)
+			{
+				if(obj is Vertex)
+				{
+					points.Add((obj as Vertex).Position);
+				}
+				else if(obj is Linedef)
+				{
+					points.Add((obj as Linedef).Start.Position);
+					points.Add((obj as Linedef).End.Position);
+				}
+				else if(obj is Sidedef)
+				{
+					points.Add((obj as Sidedef).Line.Start.Position);
+					points.Add((obj as Sidedef).Line.End.Position);
+				}
+				else if(obj is Sector)
+				{
+					Sector s = (obj as Sector);
+					foreach(Sidedef sd in s.Sidedefs)
+					{
+						points.Add(sd.Line.Start.Position);
+						points.Add(sd.Line.End.Position);
+					}
+				}
+				else if(obj is Thing)
+				{
+					Thing t = (obj as Thing);
+					Vector2D p = t.Position;
+					points.Add(p);
+					points.Add(p + new Vector2D(t.Size * 2.0f, t.Size * 2.0f));
+					points.Add(p + new Vector2D(t.Size * 2.0f, -t.Size * 2.0f));
+					points.Add(p + new Vector2D(-t.Size * 2.0f, t.Size * 2.0f));
+					points.Add(p + new Vector2D(-t.Size * 2.0f, -t.Size * 2.0f));
+				}
+				else
+				{
+					General.Fail("Unknown object given to zoom in on.");
+				}
+			}
+			
+			// Make a view area from the points
+			foreach(Vector2D p in points) area = MapSet.IncreaseArea(area, p);
+			
+			// Make the area square, using the largest side
+			if(area.Width > area.Height)
+			{
+				float delta = area.Width - area.Height;
+				area.Y -= delta * 0.5f;
+				area.Height += delta;
+			}
+			else
+			{
+				float delta = area.Height - area.Width;
+				area.X -= delta * 0.5f;
+				area.Width += delta;
+			}
+			
+			// Add padding
+			area.Inflate(100f, 100f);
+			
+			// Zoom to area
+			ClassicMode editmode = (General.Editing.Mode as ClassicMode);
+			editmode.CenterOnArea(area, 0.6f);
+		}
+		
+		// This selects the elements in a comment
+		private static void SelectComment(CommentInfo c, bool clear)
+		{
+			//string editmode = "";
+
+			// Leave any volatile mode
+			General.Editing.CancelVolatileMode();
+
+			if(clear)
+			{
+				General.Map.Map.ClearAllSelected();
+
+				if(c.Elements[0] is Thing)
+					General.Editing.ChangeMode("ThingsMode");
+				else if(c.Elements[0] is Vertex)
+					General.Editing.ChangeMode("VerticesMode");
+				else if((c.Elements[0] is Linedef) || (c.Elements[0] is Sidedef))
+					General.Editing.ChangeMode("LinedefsMode");
+				else if(c.Elements[0] is Sector)
+					General.Editing.ChangeMode("SectorsMode");
+			}
+			else
+			{
+				if(!(c.Elements[0] is Thing))
+				{
+					// Sectors mode is a bitch because it deals with selections somewhat aggressively
+					// so we have to switch to linedefs to make this work right
+					if((General.Editing.Mode.GetType().Name == "VerticesMode") ||
+					   (General.Editing.Mode.GetType().Name == "SectorsMode") ||
+					   (General.Editing.Mode.GetType().Name == "MakeSectorMode"))
+						General.Editing.ChangeMode("LinedefsMode");
+				}
+			}
+			
+			// Select the map elements
+			foreach(MapElement obj in c.Elements)
+			{
+				if(obj is SelectableElement)
+				{
+					(obj as SelectableElement).Selected = true;
+					
+					if(obj is Sector)
+					{
+						foreach(Sidedef sd in (obj as Sector).Sidedefs)
+							sd.Line.Selected = true;
+					}
+				}
+			}
+
+			General.Editing.Mode.UpdateSelectionInfo(); //mxd
+			General.Interface.RedrawDisplay();
+		}
+		
+		// This removes the comments from elements in a comment
+		private void RemoveComment(CommentInfo c)
+		{
+			// Create undo
+			if(c.Elements.Count == 1)
+				General.Map.UndoRedo.CreateUndo("Remove comment");
+			else
+				General.Map.UndoRedo.CreateUndo("Remove " + c.Elements.Count + " comments");
+			
+			// Erase comment fields
+			foreach(MapElement obj in c.Elements)
+			{
+				obj.Fields.BeforeFieldsChange();
+				obj.Fields.Remove("comment");
+			}
+			
+			UpdateList();
+			General.Interface.RedrawDisplay();
+		}
+		
+		// This gets the currently selected comment or returns null when none is selected
+		private CommentInfo GetSelectedComment()
+		{
+			if(grid.SelectedCells.Count > 0)
+			{
+				foreach(DataGridViewCell c in grid.SelectedCells)
+				{
+					if((c.ValueType != typeof(Image)) && (c.Tag is CommentInfo))
+						return (CommentInfo)(c.Tag);
+				}
+			}
+			
+			return null;
+		}
+
+		#endregion
+		
+		#region ================== Events
+		
+		// This gives a good idea when comments could have been changed
+		// as it is called every time a dialog window closes.
+		private void ParentForm_Activated(object sender, EventArgs e)
+		{
+			UpdateList();
+		}
+		
+		// Update regulary
+		private void updatetimer_Tick(object sender, EventArgs e)
+		{
+			updatetimer.Stop();
+			updatetimer.Interval = 2000;
+			UpdateList();
+			updatetimer.Start();
+		}
+		
+		// Mouse pressed
+		private void grid_MouseDown(object sender, MouseEventArgs e)
+		{
+			preventupdate = true;
+			
+			if(e.Button == MouseButtons.Right)
+			{
+				DataGridView.HitTestInfo h = grid.HitTest(e.X, e.Y);
+				if(h.Type == DataGridViewHitTestType.Cell)
+				{
+					grid.ClearSelection();
+					grid.Rows[h.RowIndex].Selected = true;
+				}
+			}
+		}
+		
+		// Mouse released
+		private void grid_MouseUp(object sender, MouseEventArgs e)
+		{
+			CommentInfo c = GetSelectedComment();
+			
+			// Show popup menu?
+			if((e.Button == MouseButtons.Right) && (c != null))
+			{
+				// Determine objects type
+				string objname = "";
+				if((c.Elements[0] is Vertex) && (c.Elements.Count > 1)) objname = "Vertices";
+				else if((c.Elements[0] is Vertex) && (c.Elements.Count == 1)) objname = "Vertex";
+				else if(((c.Elements[0] is Linedef) || (c.Elements[0] is Sidedef)) && (c.Elements.Count > 1)) objname = "Linedefs";
+				else if(((c.Elements[0] is Linedef) || (c.Elements[0] is Sidedef)) && (c.Elements.Count == 1)) objname = "Linedef";
+				else if((c.Elements[0] is Sector) && (c.Elements.Count > 1)) objname = "Sectors";
+				else if((c.Elements[0] is Sector) && (c.Elements.Count == 1)) objname = "Sector";
+				else if((c.Elements[0] is Thing) && (c.Elements.Count > 1)) objname = "Things";
+				else if((c.Elements[0] is Thing) && (c.Elements.Count == 1)) objname = "Thing";
+				editobjectitem.Text = "Edit " + objname + "...";
+				
+				// Show popup menu
+				Point screenpos = grid.PointToScreen(new Point(e.X, e.Y));
+				contextmenu.Tag = c;
+				contextmenu.Show(screenpos);
+			}
+			else
+			{
+				// View selected comment
+				if(c != null)
+				{
+					ViewComment(c);
+					
+					if(clickselects.Checked)
+						SelectComment(c, true);
+				}
+				
+				LoseFocus();
+			}
+		}
+		
+		// Select
+		private void selectitem_Click(object sender, EventArgs e)
+		{
+			// Select comment
+			CommentInfo c = (CommentInfo)contextmenu.Tag;
+			if(c != null) SelectComment(c, true);
+		}
+		
+		// Select additive
+		private void selectadditiveitem_Click(object sender, EventArgs e)
+		{
+			// Select comment
+			CommentInfo c = (CommentInfo)contextmenu.Tag;
+			if(c != null) SelectComment(c, false);
+		}
+		
+		// Remove comments
+		private void removecommentsitem_Click(object sender, EventArgs e)
+		{
+			// Remove comment
+			CommentInfo c = (CommentInfo)contextmenu.Tag;
+			if(c != null) RemoveComment(c);
+		}
+		
+		// Edit objects
+		private void editobjectitem_Click(object sender, EventArgs e)
+		{
+			CommentInfo c = (CommentInfo)contextmenu.Tag;
+			if(c != null)
+			{
+				if(c.Elements[0] is Vertex)
+				{
+					List<Vertex> vertices = new List<Vertex>();
+					foreach(MapElement m in c.Elements) vertices.Add((Vertex)m);
+					General.Interface.ShowEditVertices(vertices);
+				}
+				else if((c.Elements[0] is Linedef) || (c.Elements[0] is Sidedef))
+				{
+					List<Linedef> linedefs = new List<Linedef>();
+					foreach(MapElement m in c.Elements)
+					{
+						if(m is Sidedef)
+							linedefs.Add((m as Sidedef).Line);
+						else
+							linedefs.Add((Linedef)m);
+					}
+					General.Interface.ShowEditLinedefs(linedefs);
+				}
+				else if(c.Elements[0] is Sector)
+				{
+					List<Sector> sectors = new List<Sector>();
+					foreach(MapElement m in c.Elements) sectors.Add((Sector)m);
+					General.Interface.ShowEditSectors(sectors);
+				}
+				else if(c.Elements[0] is Thing)
+				{
+					List<Thing> things = new List<Thing>();
+					foreach(MapElement m in c.Elements) things.Add((Thing)m);
+					General.Interface.ShowEditThings(things);
+				}
+
+				General.Map.Map.Update();
+				UpdateList();
+				LoseFocus();
+				General.Interface.RedrawDisplay();
+			}
+		}
+		
+		// Menu closes
+		private void contextmenu_Closed(object sender, ToolStripDropDownClosedEventArgs e)
+		{
+			LoseFocus();
+		}
+		
+		// Mode filter option changed
+		private void filtermode_CheckedChanged(object sender, EventArgs e)
+		{
+			UpdateList();
+			LoseFocus();
+		}
+		
+		// Click selects changes
+		private void clickselects_CheckedChanged(object sender, EventArgs e)
+		{
+			LoseFocus();
+		}
+
+		// This sets the comment on the current selection
+		private void addcomment_Click(object sender, EventArgs e)
+		{
+			List<MapElement> elements = new List<MapElement>();
+
+			if(General.Editing.Mode.GetType().Name == "VerticesMode")
+			{
+				ICollection<Vertex> vs = General.Map.Map.GetSelectedVertices(true);
+				foreach(Vertex v in vs) elements.Add(v);
+			}
+
+			if(General.Editing.Mode.GetType().Name == "LinedefsMode")
+			{
+				ICollection<Linedef> ls = General.Map.Map.GetSelectedLinedefs(true);
+				foreach(Linedef l in ls) elements.Add(l);
+			}
+
+			if(General.Editing.Mode.GetType().Name == "SectorsMode")
+			{
+				ICollection<Sector> ss = General.Map.Map.GetSelectedSectors(true);
+				foreach(Sector s in ss) elements.Add(s);
+			}
+
+			if(General.Editing.Mode.GetType().Name == "ThingsMode")
+			{
+				ICollection<Thing> ts = General.Map.Map.GetSelectedThings(true);
+				foreach(Thing t in ts) elements.Add(t);
+			}
+
+			if(elements.Count > 0)
+			{
+				// Create undo
+				if(elements.Count == 1)
+					General.Map.UndoRedo.CreateUndo("Add comment");
+				else
+					General.Map.UndoRedo.CreateUndo("Add " + elements.Count + " comments");
+
+				// Set comment on elements
+				foreach(MapElement el in elements)
+				{
+					el.Fields.BeforeFieldsChange();
+					el.Fields["comment"] = new UniValue((int)UniversalType.String, addcommenttext.Text);
+				}
+			}
+			
+			addcommenttext.Text = "";
+			UpdateList();
+			LoseFocus();
+			General.Interface.RedrawDisplay();
+		}
+
+		// Text typed in add comment box
+		private void addcommenttext_KeyDown(object sender, KeyEventArgs e)
+		{
+			if((e.KeyCode == Keys.Enter) && (e.Modifiers == Keys.None) && addcomment.Enabled)
+			{
+				addcomment.PerformClick();
+				e.Handled = true;
+				e.SuppressKeyPress = true;
+			}
+		}
+
+		// Check if the add comment box should be enabled
+		private void enabledtimer_Tick(object sender, EventArgs e)
+		{
+			if(General.Editing.Mode == null) return; //mxd
+			switch(General.Editing.Mode.GetType().Name)
+			{
+				case "VerticesMode":
+					addcommentgroup.Enabled = (General.Map.Map.SelectedVerticessCount > 0);
+					break;
+				case "LinedefsMode":
+					addcommentgroup.Enabled = (General.Map.Map.SelectedLinedefsCount > 0);
+					break;
+				case "SectorsMode":
+					addcommentgroup.Enabled = (General.Map.Map.SelectedSectorsCount > 0);
+					break;
+				case "ThingsMode":
+					addcommentgroup.Enabled = (General.Map.Map.SelectedThingsCount > 0);
+					break;
+			}
+		}
+
+		// Focus lost
+		private void grid_Leave(object sender, EventArgs e)
+		{
+			preventupdate = false;
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/CommentsPanel/CommentsDocker.resx b/Source/Plugins/CommentsPanel/CommentsDocker.resx
new file mode 100644
index 0000000..8f6869f
--- /dev/null
+++ b/Source/Plugins/CommentsPanel/CommentsDocker.resx
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="optionsgroup.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="clickselects.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="filtermode.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="grid.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="iconcolumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="textcolumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="updatetimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="contextmenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>136, 17</value>
+  </metadata>
+  <metadata name="addcomment.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="addcommentgroup.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="addcommenttext.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="enabledtimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>252, 17</value>
+  </metadata>
+  <metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/CommentsPanel/CommentsPanel.csproj b/Source/Plugins/CommentsPanel/CommentsPanel.csproj
new file mode 100644
index 0000000..7c074af
--- /dev/null
+++ b/Source/Plugins/CommentsPanel/CommentsPanel.csproj
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{58BD8A5B-1B48-435D-8473-A92F27D06C49}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>CodeImp.DoomBuilder.CommentsPanel</RootNamespace>
+    <AssemblyName>CommentsPanel</AssemblyName>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\..\..\Build\Plugins\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <OutputPath>..\..\..\Build\Plugins\</OutputPath>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug + Profiler|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\..\..\Build\Plugins\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;PROFILE</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release + Profiler|x86' ">
+    <OutputPath>..\..\..\Build\Plugins\</OutputPath>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="BuilderPlug.cs" />
+    <Compile Include="CommentInfo.cs" />
+    <Compile Include="CommentObjectType.cs" />
+    <Compile Include="CommentsDocker.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="CommentsDocker.Designer.cs">
+      <DependentUpon>CommentsDocker.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Core\Builder.csproj">
+      <Project>{818B3D10-F791-4C3F-9AF5-BB2D0079B63C}</Project>
+      <Name>Builder</Name>
+      <Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="CommentsDocker.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>CommentsDocker.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <SubType>Designer</SubType>
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\ThingsMode.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\VerticesMode.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\LinesMode.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\SectorsMode.png" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/Source/Plugins/CommentsPanel/Properties/AssemblyInfo.cs b/Source/Plugins/CommentsPanel/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..4a1d9e2
--- /dev/null
+++ b/Source/Plugins/CommentsPanel/Properties/AssemblyInfo.cs
@@ -0,0 +1,34 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Comments Panel")]
+[assembly: AssemblyDescription("UDMF Comments Panel plugin")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Comments Panel")]
+[assembly: AssemblyCopyright("Copyright ©  2010")]
+[assembly: AssemblyTrademark("CodeImp")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("5da63d9a-d79a-4193-bcdf-1b38773a08ee")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Source/Plugins/CommentsPanel/Properties/Resources.Designer.cs b/Source/Plugins/CommentsPanel/Properties/Resources.Designer.cs
new file mode 100644
index 0000000..19d52d7
--- /dev/null
+++ b/Source/Plugins/CommentsPanel/Properties/Resources.Designer.cs
@@ -0,0 +1,103 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:4.0.30319.42000
+//
+//     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace CodeImp.DoomBuilder.CommentsPanel.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
+    /// </summary>
+    // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
+    // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
+    // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
+    // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("CodeImp.DoomBuilder.CommentsPanel.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
+        ///   Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap LinesMode {
+            get {
+                object obj = ResourceManager.GetObject("LinesMode", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap SectorsMode {
+            get {
+                object obj = ResourceManager.GetObject("SectorsMode", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ThingsMode {
+            get {
+                object obj = ResourceManager.GetObject("ThingsMode", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap VerticesMode {
+            get {
+                object obj = ResourceManager.GetObject("VerticesMode", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+    }
+}
diff --git a/Source/Plugins/CommentsPanel/Properties/Resources.resx b/Source/Plugins/CommentsPanel/Properties/Resources.resx
new file mode 100644
index 0000000..7f62ad6
--- /dev/null
+++ b/Source/Plugins/CommentsPanel/Properties/Resources.resx
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="LinesMode" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\LinesMode.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="SectorsMode" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\SectorsMode.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ThingsMode" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ThingsMode.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="VerticesMode" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\VerticesMode.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/CommentsPanel/Resources/LinesMode.png b/Source/Plugins/CommentsPanel/Resources/LinesMode.png
new file mode 100644
index 0000000..aa96cfd
Binary files /dev/null and b/Source/Plugins/CommentsPanel/Resources/LinesMode.png differ
diff --git a/Source/Plugins/CommentsPanel/Resources/SectorsMode.png b/Source/Plugins/CommentsPanel/Resources/SectorsMode.png
new file mode 100644
index 0000000..a804452
Binary files /dev/null and b/Source/Plugins/CommentsPanel/Resources/SectorsMode.png differ
diff --git a/Source/Plugins/CommentsPanel/Resources/ThingsMode.png b/Source/Plugins/CommentsPanel/Resources/ThingsMode.png
new file mode 100644
index 0000000..2bfc8a8
Binary files /dev/null and b/Source/Plugins/CommentsPanel/Resources/ThingsMode.png differ
diff --git a/Source/Plugins/CommentsPanel/Resources/VerticesMode.png b/Source/Plugins/CommentsPanel/Resources/VerticesMode.png
new file mode 100644
index 0000000..891363d
Binary files /dev/null and b/Source/Plugins/CommentsPanel/Resources/VerticesMode.png differ
diff --git a/Source/Plugins/ImageDrawingExample/Actions.cfg b/Source/Plugins/ImageDrawingExample/Actions.cfg
new file mode 100644
index 0000000..b73b485
--- /dev/null
+++ b/Source/Plugins/ImageDrawingExample/Actions.cfg
@@ -0,0 +1,33 @@
+
+//
+// This file defines which actions there are, what description they have and
+// some behaviour options. The Doom Builder core will bind to these actions
+// with delegates (function pointers) where you use the BeginAction and
+// EndAction attributes. This file must be named Actions.cfg and must be
+// included in the plugin project as "Embedded Resource".
+//
+
+//
+// Options:
+//
+// allowkeys:       Allows the user to bind standard keys to this action.
+// allowmouse:      Allows the user to bind mouse buttons to this action.
+// allowscroll:     Allows the user to bind the scrollwheel to this action.
+// disregardshift:  This action will trigger regardless if Shift or Control is used.
+// repeat:          BeginAction will be called for automatic key repetition.
+// default:         Default key is only used when the action is loaded for the first
+//                  time and the default key is not used by any other action.
+//
+// allowkeys and allowmouse are true by default, the others are false by default.
+//
+
+imageexamplemode
+{
+	title = "Image Example";
+	category = "tools";
+	description = "Switches to the image example mode.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
diff --git a/Source/Plugins/ImageDrawingExample/BuilderPlug.cs b/Source/Plugins/ImageDrawingExample/BuilderPlug.cs
new file mode 100644
index 0000000..d69b9af
--- /dev/null
+++ b/Source/Plugins/ImageDrawingExample/BuilderPlug.cs
@@ -0,0 +1,83 @@
+
+#region ================== Copyright (c) 2009 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2009 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Text;
+using System.IO;
+using System.Reflection;
+using CodeImp.DoomBuilder.Windows;
+using CodeImp.DoomBuilder.IO;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Geometry;
+using System.Drawing;
+using CodeImp.DoomBuilder.Editing;
+using CodeImp.DoomBuilder.Plugins;
+using CodeImp.DoomBuilder.Types;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Data;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Plugins.ImageDrawingExample
+{
+	//
+	// MANDATORY: The plug!
+	// This is an important class to the Doom Builder core. Every plugin must
+	// have exactly 1 class that inherits from Plug. When the plugin is loaded,
+	// this class is instantiated and used to receive events from the core.
+	// Make sure the class is public, because only public classes can be seen
+	// by the core.
+	//
+
+	// In this example we don't really do anything interesting here. This is the bare
+	// minimum you need for a Plug class. You may as well ignore this whole file.
+	
+	public class BuilderPlug : Plug
+	{
+		// Static instance. We can't use a real static class, because BuilderPlug must
+		// be instantiated by the core, so we keep a static reference. (this technique
+		// should be familiar to object-oriented programmers)
+		private static BuilderPlug me;
+
+		// Static property to access the BuilderPlug
+		public static BuilderPlug Me { get { return me; } }
+		
+		// Override this property if you want to give your plugin a name other
+		// than the filename without extention.
+		public override string Name { get { return "Image Drawing Example"; } }
+		
+		// This event is called when the plugin is initialized
+		public override void OnInitialize()
+		{
+			base.OnInitialize();
+
+			// Keep a static reference
+			me = this;
+		}
+
+		// This is called when the plugin is terminated
+		public override void Dispose()
+		{
+			base.Dispose();
+		}
+	}
+}
diff --git a/Source/Plugins/ImageDrawingExample/ImageDrawingExample.csproj b/Source/Plugins/ImageDrawingExample/ImageDrawingExample.csproj
new file mode 100644
index 0000000..9533517
--- /dev/null
+++ b/Source/Plugins/ImageDrawingExample/ImageDrawingExample.csproj
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{CBD14608-D467-458A-97B3-CA767CA85203}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>CodeImp.DoomBuilder.Plugins.ImageDrawingExample</RootNamespace>
+    <AssemblyName>ImageDrawingExample</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\..\..\Build\Plugins\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <OutputPath>..\..\..\Build\Plugins\</OutputPath>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Drawing" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="BuilderPlug.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ImageExampleMode.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Core\Builder.csproj">
+      <Project>{818B3D10-F791-4C3F-9AF5-BB2D0079B63C}</Project>
+      <Name>Builder</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="ImageIcon.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="exampleimage.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Actions.cfg" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/Source/Plugins/ImageDrawingExample/ImageExampleMode.cs b/Source/Plugins/ImageDrawingExample/ImageExampleMode.cs
new file mode 100644
index 0000000..cf269cf
--- /dev/null
+++ b/Source/Plugins/ImageDrawingExample/ImageExampleMode.cs
@@ -0,0 +1,177 @@
+
+#region ================== Copyright (c) 2009 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2009 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Globalization;
+using System.Text;
+using System.IO;
+using System.Reflection;
+using CodeImp.DoomBuilder.Data;
+using CodeImp.DoomBuilder.Windows;
+using CodeImp.DoomBuilder.IO;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Editing;
+using CodeImp.DoomBuilder.Actions;
+using CodeImp.DoomBuilder.Types;
+using CodeImp.DoomBuilder.Config;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Statistics
+{
+	//
+	// This class defines an classic editing mode. You can also inherit from VisualMode for a
+	// visual editing mode or inherit from EditMode if you feel creative. The ClassicMode
+	// provides basic 2D editing mode features such as zooming in/out and panning the view as
+	// well as a bunch of usefull events.
+	//
+	
+	//
+	// This EditMode attribute allows you to link the editing mode into Doom Builder. The core
+	// only sees your editing mode with this attribute and uses the settings to register it.
+	//
+	// DisplayName: This is the name you want to display to the user for this mode.
+	//
+	// SwitchAction: This is the action (see Actions.cfg) that engages this mode.
+	//
+	// ButtonImage: If set, creates a button on the toolbar for this mode and uses this image.
+	//              Note that the image is included in this project as "Embedded Resource".
+	//
+	// ButtonOrder: Ordering number for the position of the button on the toolbar.
+	//
+	// ButtonGroup: Group in which to put the button on the toolbar.
+	//              (Groups are buttons that are grouped together between separators)
+	//
+	// UseByDefault: THIS OPTION MAY BE INTRUSIVE TO THE USER, USE WITH GREAT CARE!
+	//               Set this to enable this editing mode for use in all game configurations
+	//               by default. This only applies the first time a plugin is loaded and can
+	//               still be changed by the user. But it may not be desired and may conflict
+	//               with other editing modes.
+	//
+	// Volatile: Set this to make this mode a volatile mode. When volatile, the mode is
+	//           automatically cancelled when certain major actions are performed (such as
+	//           when the map is saved)
+	//
+
+	[EditMode(DisplayName = "Image Example",
+			  SwitchAction = "imageexamplemode",
+			  ButtonImage = "ImageIcon.png",
+			  ButtonOrder = 300,
+			  ButtonGroup = "002_tools",
+			  UseByDefault = true)]
+	
+	public class ImageExampleMode : ClassicMode
+	{
+		// This is the image we want to display. We keep it here, because we don't want to load/unload
+		// it all the time when it needs to be drawn. You may even want to consider placing this in a
+		// class of program scope such as the Plug and load the image only once when the plugin is loaded.
+		private ImageData exampleimage;
+
+		//
+		// Order in which events occur when switching editing modes:
+		// 
+		// - Constructor of new mode is called
+		// - OnDisengage() of old mode is called
+		// ----- Mode switches -----
+		// - OnEngage() of new mode is called
+		// - Dispose() of old mode is called
+		//
+		// This function is called when this editing mode is engaged
+		public override void OnEngage()
+		{
+			base.OnEngage();
+			
+			// Here we load our image. The image is loaded from resource that is embedded
+			// in this project. This is done by simply adding the PNG file to the project
+			// and set the Build Action property of the image to "Embedded Resource".
+			// Embedded means that the image will be compiled into your plugin .DLL file so
+			// you don't have to distribute this image separately.
+			exampleimage = new ResourceImage("CodeImp.DoomBuilder.Plugins.ImageDrawingExample.exampleimage.png");
+
+			// The image is not always directly loaded. Call this to ensure that the image is loaded immediately.
+			exampleimage.LoadImage();
+			if(exampleimage.LoadFailed) throw new Exception("Unable to load the exampleimage.png resource!");
+
+			// After loading, the image is usable by the GDI (GetBitmap() function) but we want to use
+			// it for rendering in the working area. We must call CreateTexture to tranfer the image to
+			// the vido memory as texture.
+			exampleimage.CreateTexture();
+			
+			// This tells the renderer how to display the map.
+			// The renderer works with several different layers, each with its own purpose
+			// and features. A "presentation" defines how to combine these layers when
+			// presented to the user on the display. Here I make a special presentation
+			// that includes only the layer we need: the Overlay layer.
+			CustomPresentation p = new CustomPresentation();
+			p.AddLayer(new PresentLayer(RendererLayer.Overlay, BlendingMode.None, 1.0f, false));
+			renderer.SetPresentation(p);
+		}
+		
+		// This function is called when this editing mode is disengaged
+		public override void OnDisengage()
+		{
+			// We no longer need the image, make sure it is removed from memory!
+			exampleimage.Dispose();
+			
+			base.OnDisengage();
+		}
+
+		// Event called when the user (or the core) wants to cancel this editing mode
+		public override void OnCancel()
+		{
+			base.OnCancel();
+
+			// Return to previous stable mode
+			General.Editing.ChangeMode(General.Editing.PreviousStableMode.Name);
+		}
+		
+		// MANDATORY: You must override this event and handle it to draw the map
+		// In this example, we're not going to draw the map at all, but the example image instead.
+		public override void OnRedrawDisplay()
+		{
+			base.OnRedrawDisplay();
+			
+			// We don't have to clear the other layers or anything, because they are not used
+			// anyway (see how the presentation above is configured to show only the Overlay layer)
+
+			// Clear the overlay and begin rendering to it.
+			if(renderer.StartOverlay(true))
+			{
+				// Rectangle of coordinates where to draw the image.
+				// We use untranslated coordinates: this means the coordinates here
+				// are already in screen space.
+				RectangleF r = new RectangleF(20.0f, 20.0f, 428.0f, 332.0f);
+				
+				// Show the picture!
+				renderer.RenderRectangleFilled(r, PixelColor.FromColor(Color.White), false, exampleimage);
+				
+				// Finish our rendering to this layer.
+				renderer.Finish();
+			}
+			
+			// We now present it to the user on the display,
+			// with the previously defined presentation settings.
+			renderer.Present();
+		}
+	}
+}
diff --git a/Source/Plugins/ImageDrawingExample/ImageIcon.png b/Source/Plugins/ImageDrawingExample/ImageIcon.png
new file mode 100644
index 0000000..ffc9429
Binary files /dev/null and b/Source/Plugins/ImageDrawingExample/ImageIcon.png differ
diff --git a/Source/Plugins/ImageDrawingExample/Properties/AssemblyInfo.cs b/Source/Plugins/ImageDrawingExample/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..b3fce62
--- /dev/null
+++ b/Source/Plugins/ImageDrawingExample/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Image Drawing Example")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("CodeImp")]
+[assembly: AssemblyProduct("Doom Builder")]
+[assembly: AssemblyCopyright("Copyright ©  2009")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("9395d421-9750-4956-ad27-b3bcd4ee3ffc")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Source/Plugins/ImageDrawingExample/exampleimage.png b/Source/Plugins/ImageDrawingExample/exampleimage.png
new file mode 100644
index 0000000..674a809
Binary files /dev/null and b/Source/Plugins/ImageDrawingExample/exampleimage.png differ
diff --git a/Source/Plugins/NodesViewer/BuilderPlug.cs b/Source/Plugins/NodesViewer/BuilderPlug.cs
new file mode 100644
index 0000000..ac70a22
--- /dev/null
+++ b/Source/Plugins/NodesViewer/BuilderPlug.cs
@@ -0,0 +1,92 @@
+
+#region ================== Copyright (c) 2012 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2012 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.IO;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Plugins.NodesViewer
+{
+	public class BuilderPlug : Plug
+	{
+		#region ================== Variables
+
+		// Objects
+		private static BuilderPlug me;
+		
+		#endregion
+
+		#region ================== Properties
+		
+		// Properties
+		public static BuilderPlug Me { get { return me; } }
+		public override string Name { get { return "NodesViewer"; } }
+		public override int MinimumRevision { get { return 1545; } }
+		
+		#endregion
+
+		#region ================== Initialize / Dispose
+
+		// This event is called when the plugin is initialized
+		public override void OnInitialize()
+		{
+			base.OnInitialize();
+			
+			General.Actions.BindMethods(this);
+
+			// Keep a static reference
+			me = this;
+		}
+
+		// This is called when the plugin is terminated
+		public override void Dispose()
+		{
+			// Clean up
+			General.Actions.UnbindMethods(this);
+			base.Dispose();
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This returns a unique temp filename
+		public static string MakeTempFilename(string extension)
+		{
+			string filename;
+			const string chars = "abcdefghijklmnopqrstuvwxyz1234567890";
+			Random rnd = new Random();
+
+			do
+			{
+				// Generate a filename
+				filename = "";
+				for(int i = 0; i < 8; i++) filename += chars[rnd.Next(chars.Length)];
+				filename = Path.Combine(General.TempPath, filename + extension);
+			}
+			// Continue while file is not unique
+			while(File.Exists(filename) || Directory.Exists(filename));
+
+			// Return the filename
+			return filename;
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/NodesViewer/Node.cs b/Source/Plugins/NodesViewer/Node.cs
new file mode 100644
index 0000000..14bd1e0
--- /dev/null
+++ b/Source/Plugins/NodesViewer/Node.cs
@@ -0,0 +1,22 @@
+#region === Copyright (c) 2010 Pascal van der Heiden ===
+
+using System.Drawing;
+using CodeImp.DoomBuilder.Geometry;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Plugins.NodesViewer
+{
+	public struct Node
+	{
+		public Vector2D linestart;
+		public Vector2D linedelta;
+		public RectangleF rightbox;
+		public RectangleF leftbox;
+		public int rightchild;
+		public int leftchild;
+		public bool rightsubsector;
+		public bool leftsubsector;
+		public int parent;
+	}
+}
diff --git a/Source/Plugins/NodesViewer/NodesForm.Designer.cs b/Source/Plugins/NodesViewer/NodesForm.Designer.cs
new file mode 100644
index 0000000..f52aaff
--- /dev/null
+++ b/Source/Plugins/NodesViewer/NodesForm.Designer.cs
@@ -0,0 +1,839 @@
+namespace CodeImp.DoomBuilder.Plugins.NodesViewer
+{
+	partial class NodesForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.tabs = new System.Windows.Forms.TabControl();
+			this.taboverview = new System.Windows.Forms.TabPage();
+			this.label11 = new System.Windows.Forms.Label();
+			this.buildnodesbutton = new System.Windows.Forms.Button();
+			this.showsegsvertices = new System.Windows.Forms.CheckBox();
+			this.treebalance = new System.Windows.Forms.Label();
+			this.label6 = new System.Windows.Forms.Label();
+			this.treedepth = new System.Windows.Forms.Label();
+			this.label10 = new System.Windows.Forms.Label();
+			this.numsegs = new System.Windows.Forms.Label();
+			this.numsplits = new System.Windows.Forms.Label();
+			this.numvertices = new System.Windows.Forms.Label();
+			this.numssectors = new System.Windows.Forms.Label();
+			this.label4 = new System.Windows.Forms.Label();
+			this.label3 = new System.Windows.Forms.Label();
+			this.label2 = new System.Windows.Forms.Label();
+			this.label1 = new System.Windows.Forms.Label();
+			this.tabsplits = new System.Windows.Forms.TabPage();
+			this.parentbutton = new System.Windows.Forms.Button();
+			this.parentsplit = new System.Windows.Forms.Label();
+			this.label16 = new System.Windows.Forms.Label();
+			this.groupBox2 = new System.Windows.Forms.GroupBox();
+			this.rightindex = new System.Windows.Forms.Label();
+			this.rightarea = new System.Windows.Forms.Label();
+			this.righttype = new System.Windows.Forms.Label();
+			this.label15 = new System.Windows.Forms.Label();
+			this.rightbutton = new System.Windows.Forms.Button();
+			this.groupBox1 = new System.Windows.Forms.GroupBox();
+			this.leftindex = new System.Windows.Forms.Label();
+			this.leftarea = new System.Windows.Forms.Label();
+			this.lefttype = new System.Windows.Forms.Label();
+			this.label7 = new System.Windows.Forms.Label();
+			this.leftbutton = new System.Windows.Forms.Button();
+			this.rootbutton = new System.Windows.Forms.Button();
+			this.splitindex = new System.Windows.Forms.NumericUpDown();
+			this.label5 = new System.Windows.Forms.Label();
+			this.tabsubsectors = new System.Windows.Forms.TabPage();
+			this.viewsegbox = new System.Windows.Forms.CheckBox();
+			this.segindex = new System.Windows.Forms.NumericUpDown();
+			this.ssectornumsegs = new System.Windows.Forms.Label();
+			this.label9 = new System.Windows.Forms.Label();
+			this.ssparentsplit = new System.Windows.Forms.Button();
+			this.ssectorindex = new System.Windows.Forms.NumericUpDown();
+			this.label8 = new System.Windows.Forms.Label();
+			this.groupBox3 = new System.Windows.Forms.GroupBox();
+			this.sectorindex = new System.Windows.Forms.Label();
+			this.label22 = new System.Windows.Forms.Label();
+			this.sideindex = new System.Windows.Forms.Label();
+			this.label19 = new System.Windows.Forms.Label();
+			this.segoffset = new System.Windows.Forms.Label();
+			this.label21 = new System.Windows.Forms.Label();
+			this.segside = new System.Windows.Forms.Label();
+			this.label18 = new System.Windows.Forms.Label();
+			this.segangle = new System.Windows.Forms.Label();
+			this.label14 = new System.Windows.Forms.Label();
+			this.endvertex = new System.Windows.Forms.Label();
+			this.label17 = new System.Windows.Forms.Label();
+			this.startvertex = new System.Windows.Forms.Label();
+			this.label13 = new System.Windows.Forms.Label();
+			this.lineindex = new System.Windows.Forms.Label();
+			this.label12 = new System.Windows.Forms.Label();
+			this.closebutton = new System.Windows.Forms.Button();
+			this.tabs.SuspendLayout();
+			this.taboverview.SuspendLayout();
+			this.tabsplits.SuspendLayout();
+			this.groupBox2.SuspendLayout();
+			this.groupBox1.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.splitindex)).BeginInit();
+			this.tabsubsectors.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.segindex)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.ssectorindex)).BeginInit();
+			this.groupBox3.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// tabs
+			// 
+			this.tabs.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.tabs.Controls.Add(this.taboverview);
+			this.tabs.Controls.Add(this.tabsplits);
+			this.tabs.Controls.Add(this.tabsubsectors);
+			this.tabs.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.tabs.Location = new System.Drawing.Point(9, 9);
+			this.tabs.Margin = new System.Windows.Forms.Padding(0);
+			this.tabs.Name = "tabs";
+			this.tabs.Padding = new System.Drawing.Point(24, 3);
+			this.tabs.SelectedIndex = 0;
+			this.tabs.Size = new System.Drawing.Size(383, 303);
+			this.tabs.TabIndex = 0;
+			this.tabs.SelectedIndexChanged += new System.EventHandler(this.tabs_SelectedIndexChanged);
+			// 
+			// taboverview
+			// 
+			this.taboverview.Controls.Add(this.label11);
+			this.taboverview.Controls.Add(this.buildnodesbutton);
+			this.taboverview.Controls.Add(this.showsegsvertices);
+			this.taboverview.Controls.Add(this.treebalance);
+			this.taboverview.Controls.Add(this.label6);
+			this.taboverview.Controls.Add(this.treedepth);
+			this.taboverview.Controls.Add(this.label10);
+			this.taboverview.Controls.Add(this.numsegs);
+			this.taboverview.Controls.Add(this.numsplits);
+			this.taboverview.Controls.Add(this.numvertices);
+			this.taboverview.Controls.Add(this.numssectors);
+			this.taboverview.Controls.Add(this.label4);
+			this.taboverview.Controls.Add(this.label3);
+			this.taboverview.Controls.Add(this.label2);
+			this.taboverview.Controls.Add(this.label1);
+			this.taboverview.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.taboverview.Location = new System.Drawing.Point(4, 22);
+			this.taboverview.Name = "taboverview";
+			this.taboverview.Padding = new System.Windows.Forms.Padding(3);
+			this.taboverview.Size = new System.Drawing.Size(375, 277);
+			this.taboverview.TabIndex = 0;
+			this.taboverview.Text = "Overview";
+			this.taboverview.UseVisualStyleBackColor = true;
+			// 
+			// label11
+			// 
+			this.label11.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.label11.Location = new System.Drawing.Point(31, 209);
+			this.label11.Name = "label11";
+			this.label11.Size = new System.Drawing.Size(322, 61);
+			this.label11.TabIndex = 14;
+			this.label11.Text = "NOTE: This will rebuild the nodes using the settings configured for \"testing\" in " +
+				"the current game configuration. You can change these settings in the Game Config" +
+				"uration dialog (press F6).";
+			// 
+			// buildnodesbutton
+			// 
+			this.buildnodesbutton.Location = new System.Drawing.Point(31, 171);
+			this.buildnodesbutton.Name = "buildnodesbutton";
+			this.buildnodesbutton.Size = new System.Drawing.Size(119, 28);
+			this.buildnodesbutton.TabIndex = 13;
+			this.buildnodesbutton.Text = "Rebuild nodes";
+			this.buildnodesbutton.UseVisualStyleBackColor = true;
+			this.buildnodesbutton.Click += new System.EventHandler(this.buildnodesbutton_Click);
+			// 
+			// showsegsvertices
+			// 
+			this.showsegsvertices.AutoSize = true;
+			this.showsegsvertices.Location = new System.Drawing.Point(31, 103);
+			this.showsegsvertices.Name = "showsegsvertices";
+			this.showsegsvertices.Size = new System.Drawing.Size(193, 17);
+			this.showsegsvertices.TabIndex = 12;
+			this.showsegsvertices.Text = "Show additional vertices (seg splits)";
+			this.showsegsvertices.UseVisualStyleBackColor = true;
+			this.showsegsvertices.CheckedChanged += new System.EventHandler(this.showsegsvertices_CheckedChanged);
+			// 
+			// treebalance
+			// 
+			this.treebalance.AutoSize = true;
+			this.treebalance.Location = new System.Drawing.Point(313, 30);
+			this.treebalance.Name = "treebalance";
+			this.treebalance.Size = new System.Drawing.Size(13, 13);
+			this.treebalance.TabIndex = 11;
+			this.treebalance.Text = "0";
+			// 
+			// label6
+			// 
+			this.label6.AutoSize = true;
+			this.label6.Location = new System.Drawing.Point(258, 30);
+			this.label6.Name = "label6";
+			this.label6.Size = new System.Drawing.Size(49, 13);
+			this.label6.TabIndex = 10;
+			this.label6.Text = "Balance:";
+			// 
+			// treedepth
+			// 
+			this.treedepth.AutoSize = true;
+			this.treedepth.Location = new System.Drawing.Point(186, 30);
+			this.treedepth.Name = "treedepth";
+			this.treedepth.Size = new System.Drawing.Size(13, 13);
+			this.treedepth.TabIndex = 9;
+			this.treedepth.Text = "0";
+			// 
+			// label10
+			// 
+			this.label10.AutoSize = true;
+			this.label10.Location = new System.Drawing.Point(142, 30);
+			this.label10.Name = "label10";
+			this.label10.Size = new System.Drawing.Size(39, 13);
+			this.label10.TabIndex = 8;
+			this.label10.Text = "Depth:";
+			// 
+			// numsegs
+			// 
+			this.numsegs.AutoSize = true;
+			this.numsegs.Location = new System.Drawing.Point(186, 63);
+			this.numsegs.Name = "numsegs";
+			this.numsegs.Size = new System.Drawing.Size(13, 13);
+			this.numsegs.TabIndex = 7;
+			this.numsegs.Text = "0";
+			// 
+			// numsplits
+			// 
+			this.numsplits.AutoSize = true;
+			this.numsplits.Location = new System.Drawing.Point(84, 30);
+			this.numsplits.Name = "numsplits";
+			this.numsplits.Size = new System.Drawing.Size(13, 13);
+			this.numsplits.TabIndex = 6;
+			this.numsplits.Text = "0";
+			// 
+			// numvertices
+			// 
+			this.numvertices.AutoSize = true;
+			this.numvertices.Location = new System.Drawing.Point(84, 63);
+			this.numvertices.Name = "numvertices";
+			this.numvertices.Size = new System.Drawing.Size(13, 13);
+			this.numvertices.TabIndex = 5;
+			this.numvertices.Text = "0";
+			// 
+			// numssectors
+			// 
+			this.numssectors.AutoSize = true;
+			this.numssectors.Location = new System.Drawing.Point(313, 63);
+			this.numssectors.Name = "numssectors";
+			this.numssectors.Size = new System.Drawing.Size(13, 13);
+			this.numssectors.TabIndex = 4;
+			this.numssectors.Text = "0";
+			// 
+			// label4
+			// 
+			this.label4.AutoSize = true;
+			this.label4.Location = new System.Drawing.Point(28, 63);
+			this.label4.Name = "label4";
+			this.label4.Size = new System.Drawing.Size(48, 13);
+			this.label4.TabIndex = 3;
+			this.label4.Text = "Vertices:";
+			// 
+			// label3
+			// 
+			this.label3.AutoSize = true;
+			this.label3.Location = new System.Drawing.Point(145, 63);
+			this.label3.Name = "label3";
+			this.label3.Size = new System.Drawing.Size(34, 13);
+			this.label3.TabIndex = 2;
+			this.label3.Text = "Segs:";
+			// 
+			// label2
+			// 
+			this.label2.AutoSize = true;
+			this.label2.Location = new System.Drawing.Point(42, 30);
+			this.label2.Name = "label2";
+			this.label2.Size = new System.Drawing.Size(35, 13);
+			this.label2.TabIndex = 1;
+			this.label2.Text = "Splits:";
+			// 
+			// label1
+			// 
+			this.label1.AutoSize = true;
+			this.label1.Location = new System.Drawing.Point(241, 63);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(63, 13);
+			this.label1.TabIndex = 0;
+			this.label1.Text = "Subsectors:";
+			// 
+			// tabsplits
+			// 
+			this.tabsplits.Controls.Add(this.parentbutton);
+			this.tabsplits.Controls.Add(this.parentsplit);
+			this.tabsplits.Controls.Add(this.label16);
+			this.tabsplits.Controls.Add(this.groupBox2);
+			this.tabsplits.Controls.Add(this.groupBox1);
+			this.tabsplits.Controls.Add(this.rootbutton);
+			this.tabsplits.Controls.Add(this.splitindex);
+			this.tabsplits.Controls.Add(this.label5);
+			this.tabsplits.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.tabsplits.Location = new System.Drawing.Point(4, 22);
+			this.tabsplits.Name = "tabsplits";
+			this.tabsplits.Padding = new System.Windows.Forms.Padding(3);
+			this.tabsplits.Size = new System.Drawing.Size(375, 277);
+			this.tabsplits.TabIndex = 1;
+			this.tabsplits.Text = "Splits";
+			this.tabsplits.UseVisualStyleBackColor = true;
+			// 
+			// parentbutton
+			// 
+			this.parentbutton.Location = new System.Drawing.Point(196, 52);
+			this.parentbutton.Name = "parentbutton";
+			this.parentbutton.Size = new System.Drawing.Size(88, 26);
+			this.parentbutton.TabIndex = 9;
+			this.parentbutton.Text = "Go to parent";
+			this.parentbutton.UseVisualStyleBackColor = true;
+			this.parentbutton.Click += new System.EventHandler(this.parentbutton_Click);
+			// 
+			// parentsplit
+			// 
+			this.parentsplit.AutoSize = true;
+			this.parentsplit.Location = new System.Drawing.Point(106, 58);
+			this.parentsplit.Name = "parentsplit";
+			this.parentsplit.Size = new System.Drawing.Size(13, 13);
+			this.parentsplit.TabIndex = 8;
+			this.parentsplit.Text = "0";
+			// 
+			// label16
+			// 
+			this.label16.AutoSize = true;
+			this.label16.Location = new System.Drawing.Point(37, 58);
+			this.label16.Name = "label16";
+			this.label16.Size = new System.Drawing.Size(62, 13);
+			this.label16.TabIndex = 7;
+			this.label16.Text = "Parent split:";
+			// 
+			// groupBox2
+			// 
+			this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.groupBox2.BackColor = System.Drawing.Color.Transparent;
+			this.groupBox2.Controls.Add(this.rightindex);
+			this.groupBox2.Controls.Add(this.rightarea);
+			this.groupBox2.Controls.Add(this.righttype);
+			this.groupBox2.Controls.Add(this.label15);
+			this.groupBox2.Controls.Add(this.rightbutton);
+			this.groupBox2.Location = new System.Drawing.Point(6, 182);
+			this.groupBox2.Name = "groupBox2";
+			this.groupBox2.Size = new System.Drawing.Size(363, 88);
+			this.groupBox2.TabIndex = 6;
+			this.groupBox2.TabStop = false;
+			this.groupBox2.Text = " Right ";
+			// 
+			// rightindex
+			// 
+			this.rightindex.Location = new System.Drawing.Point(100, 55);
+			this.rightindex.Name = "rightindex";
+			this.rightindex.Size = new System.Drawing.Size(108, 18);
+			this.rightindex.TabIndex = 7;
+			this.rightindex.Text = "0";
+			// 
+			// rightarea
+			// 
+			this.rightarea.Location = new System.Drawing.Point(100, 27);
+			this.rightarea.Name = "rightarea";
+			this.rightarea.Size = new System.Drawing.Size(257, 18);
+			this.rightarea.TabIndex = 6;
+			this.rightarea.Text = "0, 0 - 0, 0";
+			// 
+			// righttype
+			// 
+			this.righttype.Location = new System.Drawing.Point(18, 55);
+			this.righttype.Name = "righttype";
+			this.righttype.Size = new System.Drawing.Size(76, 18);
+			this.righttype.TabIndex = 5;
+			this.righttype.Text = "Subsector:";
+			this.righttype.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// label15
+			// 
+			this.label15.Location = new System.Drawing.Point(18, 27);
+			this.label15.Name = "label15";
+			this.label15.Size = new System.Drawing.Size(76, 18);
+			this.label15.TabIndex = 4;
+			this.label15.Text = "Area:";
+			this.label15.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// rightbutton
+			// 
+			this.rightbutton.BackColor = System.Drawing.Color.LightGreen;
+			this.rightbutton.Location = new System.Drawing.Point(233, 49);
+			this.rightbutton.Name = "rightbutton";
+			this.rightbutton.Size = new System.Drawing.Size(115, 26);
+			this.rightbutton.TabIndex = 3;
+			this.rightbutton.Text = "Go to subsector";
+			this.rightbutton.UseVisualStyleBackColor = false;
+			this.rightbutton.Click += new System.EventHandler(this.rightbutton_Click);
+			// 
+			// groupBox1
+			// 
+			this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.groupBox1.Controls.Add(this.leftindex);
+			this.groupBox1.Controls.Add(this.leftarea);
+			this.groupBox1.Controls.Add(this.lefttype);
+			this.groupBox1.Controls.Add(this.label7);
+			this.groupBox1.Controls.Add(this.leftbutton);
+			this.groupBox1.Location = new System.Drawing.Point(6, 88);
+			this.groupBox1.Name = "groupBox1";
+			this.groupBox1.Size = new System.Drawing.Size(363, 88);
+			this.groupBox1.TabIndex = 5;
+			this.groupBox1.TabStop = false;
+			this.groupBox1.Text = " Left ";
+			// 
+			// leftindex
+			// 
+			this.leftindex.Location = new System.Drawing.Point(100, 55);
+			this.leftindex.Name = "leftindex";
+			this.leftindex.Size = new System.Drawing.Size(108, 18);
+			this.leftindex.TabIndex = 7;
+			this.leftindex.Text = "0";
+			// 
+			// leftarea
+			// 
+			this.leftarea.Location = new System.Drawing.Point(100, 27);
+			this.leftarea.Name = "leftarea";
+			this.leftarea.Size = new System.Drawing.Size(257, 18);
+			this.leftarea.TabIndex = 6;
+			this.leftarea.Text = "0, 0 - 0, 0";
+			// 
+			// lefttype
+			// 
+			this.lefttype.Location = new System.Drawing.Point(18, 55);
+			this.lefttype.Name = "lefttype";
+			this.lefttype.Size = new System.Drawing.Size(76, 18);
+			this.lefttype.TabIndex = 5;
+			this.lefttype.Text = "Subsector:";
+			this.lefttype.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// label7
+			// 
+			this.label7.Location = new System.Drawing.Point(18, 27);
+			this.label7.Name = "label7";
+			this.label7.Size = new System.Drawing.Size(76, 18);
+			this.label7.TabIndex = 4;
+			this.label7.Text = "Area:";
+			this.label7.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// leftbutton
+			// 
+			this.leftbutton.BackColor = System.Drawing.Color.LightBlue;
+			this.leftbutton.Location = new System.Drawing.Point(233, 49);
+			this.leftbutton.Name = "leftbutton";
+			this.leftbutton.Size = new System.Drawing.Size(115, 26);
+			this.leftbutton.TabIndex = 3;
+			this.leftbutton.Text = "Go to subsector";
+			this.leftbutton.UseVisualStyleBackColor = false;
+			this.leftbutton.Click += new System.EventHandler(this.leftbutton_Click);
+			// 
+			// rootbutton
+			// 
+			this.rootbutton.Location = new System.Drawing.Point(196, 20);
+			this.rootbutton.Name = "rootbutton";
+			this.rootbutton.Size = new System.Drawing.Size(88, 26);
+			this.rootbutton.TabIndex = 2;
+			this.rootbutton.Text = "Go to root";
+			this.rootbutton.UseVisualStyleBackColor = true;
+			this.rootbutton.Click += new System.EventHandler(this.rootbutton_Click);
+			// 
+			// splitindex
+			// 
+			this.splitindex.Location = new System.Drawing.Point(106, 23);
+			this.splitindex.Name = "splitindex";
+			this.splitindex.Size = new System.Drawing.Size(70, 20);
+			this.splitindex.TabIndex = 1;
+			this.splitindex.ValueChanged += new System.EventHandler(this.splitindex_ValueChanged);
+			// 
+			// label5
+			// 
+			this.label5.AutoSize = true;
+			this.label5.Location = new System.Drawing.Point(28, 25);
+			this.label5.Name = "label5";
+			this.label5.Size = new System.Drawing.Size(68, 13);
+			this.label5.TabIndex = 0;
+			this.label5.Text = "Viewing split:";
+			// 
+			// tabsubsectors
+			// 
+			this.tabsubsectors.Controls.Add(this.viewsegbox);
+			this.tabsubsectors.Controls.Add(this.segindex);
+			this.tabsubsectors.Controls.Add(this.ssectornumsegs);
+			this.tabsubsectors.Controls.Add(this.label9);
+			this.tabsubsectors.Controls.Add(this.ssparentsplit);
+			this.tabsubsectors.Controls.Add(this.ssectorindex);
+			this.tabsubsectors.Controls.Add(this.label8);
+			this.tabsubsectors.Controls.Add(this.groupBox3);
+			this.tabsubsectors.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.tabsubsectors.Location = new System.Drawing.Point(4, 22);
+			this.tabsubsectors.Name = "tabsubsectors";
+			this.tabsubsectors.Padding = new System.Windows.Forms.Padding(3);
+			this.tabsubsectors.Size = new System.Drawing.Size(375, 277);
+			this.tabsubsectors.TabIndex = 2;
+			this.tabsubsectors.Text = "Subsectors";
+			this.tabsubsectors.UseVisualStyleBackColor = true;
+			// 
+			// viewsegbox
+			// 
+			this.viewsegbox.AutoSize = true;
+			this.viewsegbox.Location = new System.Drawing.Point(19, 86);
+			this.viewsegbox.Name = "viewsegbox";
+			this.viewsegbox.Size = new System.Drawing.Size(95, 17);
+			this.viewsegbox.TabIndex = 9;
+			this.viewsegbox.Text = "View segment:";
+			this.viewsegbox.UseVisualStyleBackColor = true;
+			this.viewsegbox.CheckedChanged += new System.EventHandler(this.viewsegbox_CheckedChanged);
+			// 
+			// segindex
+			// 
+			this.segindex.Location = new System.Drawing.Point(124, 85);
+			this.segindex.Name = "segindex";
+			this.segindex.Size = new System.Drawing.Size(70, 20);
+			this.segindex.TabIndex = 8;
+			this.segindex.ValueChanged += new System.EventHandler(this.segindex_ValueChanged);
+			// 
+			// ssectornumsegs
+			// 
+			this.ssectornumsegs.AutoSize = true;
+			this.ssectornumsegs.Location = new System.Drawing.Point(123, 57);
+			this.ssectornumsegs.Name = "ssectornumsegs";
+			this.ssectornumsegs.Size = new System.Drawing.Size(13, 13);
+			this.ssectornumsegs.TabIndex = 6;
+			this.ssectornumsegs.Text = "0";
+			// 
+			// label9
+			// 
+			this.label9.AutoSize = true;
+			this.label9.Location = new System.Drawing.Point(60, 57);
+			this.label9.Name = "label9";
+			this.label9.Size = new System.Drawing.Size(57, 13);
+			this.label9.TabIndex = 5;
+			this.label9.Text = "Segments:";
+			// 
+			// ssparentsplit
+			// 
+			this.ssparentsplit.Location = new System.Drawing.Point(231, 20);
+			this.ssparentsplit.Name = "ssparentsplit";
+			this.ssparentsplit.Size = new System.Drawing.Size(120, 26);
+			this.ssparentsplit.TabIndex = 4;
+			this.ssparentsplit.Text = "Go to parent split";
+			this.ssparentsplit.UseVisualStyleBackColor = true;
+			this.ssparentsplit.Click += new System.EventHandler(this.ssparentsplit_Click);
+			// 
+			// ssectorindex
+			// 
+			this.ssectorindex.Location = new System.Drawing.Point(124, 24);
+			this.ssectorindex.Name = "ssectorindex";
+			this.ssectorindex.Size = new System.Drawing.Size(70, 20);
+			this.ssectorindex.TabIndex = 3;
+			this.ssectorindex.ValueChanged += new System.EventHandler(this.ssectorindex_ValueChanged);
+			// 
+			// label8
+			// 
+			this.label8.AutoSize = true;
+			this.label8.Location = new System.Drawing.Point(16, 26);
+			this.label8.Name = "label8";
+			this.label8.Size = new System.Drawing.Size(96, 13);
+			this.label8.TabIndex = 2;
+			this.label8.Text = "Viewing subsector:";
+			// 
+			// groupBox3
+			// 
+			this.groupBox3.Controls.Add(this.sectorindex);
+			this.groupBox3.Controls.Add(this.label22);
+			this.groupBox3.Controls.Add(this.sideindex);
+			this.groupBox3.Controls.Add(this.label19);
+			this.groupBox3.Controls.Add(this.segoffset);
+			this.groupBox3.Controls.Add(this.label21);
+			this.groupBox3.Controls.Add(this.segside);
+			this.groupBox3.Controls.Add(this.label18);
+			this.groupBox3.Controls.Add(this.segangle);
+			this.groupBox3.Controls.Add(this.label14);
+			this.groupBox3.Controls.Add(this.endvertex);
+			this.groupBox3.Controls.Add(this.label17);
+			this.groupBox3.Controls.Add(this.startvertex);
+			this.groupBox3.Controls.Add(this.label13);
+			this.groupBox3.Controls.Add(this.lineindex);
+			this.groupBox3.Controls.Add(this.label12);
+			this.groupBox3.Location = new System.Drawing.Point(6, 88);
+			this.groupBox3.Name = "groupBox3";
+			this.groupBox3.Size = new System.Drawing.Size(363, 182);
+			this.groupBox3.TabIndex = 10;
+			this.groupBox3.TabStop = false;
+			this.groupBox3.Text = "                                                             ";
+			// 
+			// sectorindex
+			// 
+			this.sectorindex.AutoSize = true;
+			this.sectorindex.Location = new System.Drawing.Point(269, 73);
+			this.sectorindex.Name = "sectorindex";
+			this.sectorindex.Size = new System.Drawing.Size(13, 13);
+			this.sectorindex.TabIndex = 22;
+			this.sectorindex.Text = "0";
+			// 
+			// label22
+			// 
+			this.label22.AutoSize = true;
+			this.label22.Location = new System.Drawing.Point(221, 73);
+			this.label22.Name = "label22";
+			this.label22.Size = new System.Drawing.Size(41, 13);
+			this.label22.TabIndex = 21;
+			this.label22.Text = "Sector:";
+			// 
+			// sideindex
+			// 
+			this.sideindex.AutoSize = true;
+			this.sideindex.Location = new System.Drawing.Point(94, 73);
+			this.sideindex.Name = "sideindex";
+			this.sideindex.Size = new System.Drawing.Size(13, 13);
+			this.sideindex.TabIndex = 20;
+			this.sideindex.Text = "0";
+			// 
+			// label19
+			// 
+			this.label19.AutoSize = true;
+			this.label19.Location = new System.Drawing.Point(41, 73);
+			this.label19.Name = "label19";
+			this.label19.Size = new System.Drawing.Size(46, 13);
+			this.label19.TabIndex = 19;
+			this.label19.Text = "Sidedef:";
+			// 
+			// segoffset
+			// 
+			this.segoffset.AutoSize = true;
+			this.segoffset.Location = new System.Drawing.Point(269, 135);
+			this.segoffset.Name = "segoffset";
+			this.segoffset.Size = new System.Drawing.Size(13, 13);
+			this.segoffset.TabIndex = 18;
+			this.segoffset.Text = "0";
+			// 
+			// label21
+			// 
+			this.label21.AutoSize = true;
+			this.label21.Location = new System.Drawing.Point(222, 135);
+			this.label21.Name = "label21";
+			this.label21.Size = new System.Drawing.Size(38, 13);
+			this.label21.TabIndex = 17;
+			this.label21.Text = "Offset:";
+			// 
+			// segside
+			// 
+			this.segside.AutoSize = true;
+			this.segside.Location = new System.Drawing.Point(269, 42);
+			this.segside.Name = "segside";
+			this.segside.Size = new System.Drawing.Size(13, 13);
+			this.segside.TabIndex = 16;
+			this.segside.Text = "0";
+			// 
+			// label18
+			// 
+			this.label18.AutoSize = true;
+			this.label18.Location = new System.Drawing.Point(232, 42);
+			this.label18.Name = "label18";
+			this.label18.Size = new System.Drawing.Size(31, 13);
+			this.label18.TabIndex = 15;
+			this.label18.Text = "Side:";
+			// 
+			// segangle
+			// 
+			this.segangle.AutoSize = true;
+			this.segangle.Location = new System.Drawing.Point(269, 104);
+			this.segangle.Name = "segangle";
+			this.segangle.Size = new System.Drawing.Size(13, 13);
+			this.segangle.TabIndex = 14;
+			this.segangle.Text = "0";
+			// 
+			// label14
+			// 
+			this.label14.AutoSize = true;
+			this.label14.Location = new System.Drawing.Point(225, 104);
+			this.label14.Name = "label14";
+			this.label14.Size = new System.Drawing.Size(37, 13);
+			this.label14.TabIndex = 13;
+			this.label14.Text = "Angle:";
+			// 
+			// endvertex
+			// 
+			this.endvertex.AutoSize = true;
+			this.endvertex.Location = new System.Drawing.Point(94, 135);
+			this.endvertex.Name = "endvertex";
+			this.endvertex.Size = new System.Drawing.Size(13, 13);
+			this.endvertex.TabIndex = 12;
+			this.endvertex.Text = "0";
+			// 
+			// label17
+			// 
+			this.label17.AutoSize = true;
+			this.label17.Location = new System.Drawing.Point(26, 135);
+			this.label17.Name = "label17";
+			this.label17.Size = new System.Drawing.Size(61, 13);
+			this.label17.TabIndex = 11;
+			this.label17.Text = "End vertex:";
+			// 
+			// startvertex
+			// 
+			this.startvertex.AutoSize = true;
+			this.startvertex.Location = new System.Drawing.Point(94, 104);
+			this.startvertex.Name = "startvertex";
+			this.startvertex.Size = new System.Drawing.Size(13, 13);
+			this.startvertex.TabIndex = 10;
+			this.startvertex.Text = "0";
+			// 
+			// label13
+			// 
+			this.label13.AutoSize = true;
+			this.label13.Location = new System.Drawing.Point(21, 104);
+			this.label13.Name = "label13";
+			this.label13.Size = new System.Drawing.Size(64, 13);
+			this.label13.TabIndex = 9;
+			this.label13.Text = "Start vertex:";
+			// 
+			// lineindex
+			// 
+			this.lineindex.AutoSize = true;
+			this.lineindex.Location = new System.Drawing.Point(94, 42);
+			this.lineindex.Name = "lineindex";
+			this.lineindex.Size = new System.Drawing.Size(13, 13);
+			this.lineindex.TabIndex = 8;
+			this.lineindex.Text = "0";
+			// 
+			// label12
+			// 
+			this.label12.AutoSize = true;
+			this.label12.Location = new System.Drawing.Point(42, 42);
+			this.label12.Name = "label12";
+			this.label12.Size = new System.Drawing.Size(45, 13);
+			this.label12.TabIndex = 7;
+			this.label12.Text = "Linedef:";
+			// 
+			// closebutton
+			// 
+			this.closebutton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.closebutton.Location = new System.Drawing.Point(34, 47);
+			this.closebutton.Name = "closebutton";
+			this.closebutton.Size = new System.Drawing.Size(45, 24);
+			this.closebutton.TabIndex = 1;
+			this.closebutton.Text = "Close";
+			this.closebutton.UseVisualStyleBackColor = true;
+			this.closebutton.Click += new System.EventHandler(this.closebutton_Click);
+			// 
+			// NodesForm
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.CancelButton = this.closebutton;
+			this.ClientSize = new System.Drawing.Size(401, 321);
+			this.Controls.Add(this.tabs);
+			this.Controls.Add(this.closebutton);
+			this.DoubleBuffered = true;
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "NodesForm";
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
+			this.Text = "Nodes Viewer";
+			this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.NodesForm_FormClosing);
+			this.tabs.ResumeLayout(false);
+			this.taboverview.ResumeLayout(false);
+			this.taboverview.PerformLayout();
+			this.tabsplits.ResumeLayout(false);
+			this.tabsplits.PerformLayout();
+			this.groupBox2.ResumeLayout(false);
+			this.groupBox1.ResumeLayout(false);
+			((System.ComponentModel.ISupportInitialize)(this.splitindex)).EndInit();
+			this.tabsubsectors.ResumeLayout(false);
+			this.tabsubsectors.PerformLayout();
+			((System.ComponentModel.ISupportInitialize)(this.segindex)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.ssectorindex)).EndInit();
+			this.groupBox3.ResumeLayout(false);
+			this.groupBox3.PerformLayout();
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.TabControl tabs;
+		private System.Windows.Forms.TabPage taboverview;
+		private System.Windows.Forms.TabPage tabsplits;
+		private System.Windows.Forms.Button closebutton;
+		private System.Windows.Forms.Label label4;
+		private System.Windows.Forms.Label label3;
+		private System.Windows.Forms.Label label2;
+		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.Label treedepth;
+		private System.Windows.Forms.Label label10;
+		private System.Windows.Forms.Label numsegs;
+		private System.Windows.Forms.Label numsplits;
+		private System.Windows.Forms.Label numvertices;
+		private System.Windows.Forms.Label numssectors;
+		private System.Windows.Forms.Label treebalance;
+		private System.Windows.Forms.Label label6;
+		private System.Windows.Forms.TabPage tabsubsectors;
+		private System.Windows.Forms.NumericUpDown splitindex;
+		private System.Windows.Forms.Label label5;
+		private System.Windows.Forms.Button rootbutton;
+		private System.Windows.Forms.Button leftbutton;
+		private System.Windows.Forms.GroupBox groupBox1;
+		private System.Windows.Forms.Label lefttype;
+		private System.Windows.Forms.Label label7;
+		private System.Windows.Forms.GroupBox groupBox2;
+		private System.Windows.Forms.Label rightindex;
+		private System.Windows.Forms.Label rightarea;
+		private System.Windows.Forms.Label righttype;
+		private System.Windows.Forms.Label label15;
+		private System.Windows.Forms.Button rightbutton;
+		private System.Windows.Forms.Label leftindex;
+		private System.Windows.Forms.Label leftarea;
+		private System.Windows.Forms.Button parentbutton;
+		private System.Windows.Forms.Label parentsplit;
+		private System.Windows.Forms.Label label16;
+		private System.Windows.Forms.NumericUpDown ssectorindex;
+		private System.Windows.Forms.Label label8;
+		private System.Windows.Forms.Button ssparentsplit;
+		private System.Windows.Forms.Label ssectornumsegs;
+		private System.Windows.Forms.Label label9;
+		private System.Windows.Forms.NumericUpDown segindex;
+		private System.Windows.Forms.CheckBox viewsegbox;
+		private System.Windows.Forms.GroupBox groupBox3;
+		private System.Windows.Forms.Label lineindex;
+		private System.Windows.Forms.Label label12;
+		private System.Windows.Forms.Label endvertex;
+		private System.Windows.Forms.Label label17;
+		private System.Windows.Forms.Label startvertex;
+		private System.Windows.Forms.Label label13;
+		private System.Windows.Forms.Label segangle;
+		private System.Windows.Forms.Label label14;
+		private System.Windows.Forms.Label label18;
+		private System.Windows.Forms.Label segside;
+		private System.Windows.Forms.Label segoffset;
+		private System.Windows.Forms.Label label21;
+		private System.Windows.Forms.Label sectorindex;
+		private System.Windows.Forms.Label label22;
+		private System.Windows.Forms.Label sideindex;
+		private System.Windows.Forms.Label label19;
+		private System.Windows.Forms.CheckBox showsegsvertices;
+		private System.Windows.Forms.Button buildnodesbutton;
+		private System.Windows.Forms.Label label11;
+	}
+}
\ No newline at end of file
diff --git a/Source/Plugins/NodesViewer/NodesForm.cs b/Source/Plugins/NodesViewer/NodesForm.cs
new file mode 100644
index 0000000..236a9c5
--- /dev/null
+++ b/Source/Plugins/NodesViewer/NodesForm.cs
@@ -0,0 +1,330 @@
+#region === Copyright (c) 2010 Pascal van der Heiden ===
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Windows;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Plugins.NodesViewer
+{
+	public partial class NodesForm : DelayedForm
+	{
+		#region ================== Variables
+
+		private NodesViewerMode mode;
+
+		#endregion
+
+		#region ================== Properties
+
+		public int SelectedTab { get { return tabs.SelectedIndex; } }
+		public int ViewSplitIndex { get { return (int)splitindex.Value; } }
+		public int ViewSubsectorIndex { get { return (int)ssectorindex.Value; } }
+		public int ViewSegIndex { get { return viewsegbox.Checked ? (int)segindex.Value : -1; } }
+		public bool ShowSegsVertices { get { return showsegsvertices.Checked; } }
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		// Constructor
+		public NodesForm()
+		{
+			InitializeComponent();
+		}
+
+		// Constructor
+		public NodesForm(NodesViewerMode mode)
+		{
+			InitializeComponent();
+			this.mode = mode;
+
+			// Counts
+			numsegs.Text = mode.Segs.Length.ToString();
+			numsplits.Text = mode.Nodes.Length.ToString();
+			numssectors.Text = mode.Subsectors.Length.ToString();
+			numvertices.Text = mode.Vertices.Length.ToString();
+			showsegsvertices.Text = "Show additional vertices (" + (mode.Vertices.Length - General.Map.Map.Vertices.Count) + " seg splits)";
+
+			// Create stats on the tree
+			List<int> leafdepths = new List<int>();
+			DiveTree(mode.Nodes.Length - 1, 0, leafdepths);
+			int maxdepth = 0, mindepth = int.MaxValue;
+			foreach(int d in leafdepths)
+			{
+				if(d < mindepth) mindepth = d;
+				if(d > maxdepth) maxdepth = d;
+			}
+
+			treedepth.Text = maxdepth.ToString();
+
+			// Calculate the tree balance. The balance is 100% when all leafs are equal depth and
+			// 0% when 1 leaf equals peakdepth and the others are at level 1.
+			int balance = (int)(((float)mindepth / maxdepth) * 100f);
+			treebalance.Text = balance + "%";
+
+			// Start viewing root split
+			splitindex.Maximum = mode.Nodes.Length - 1;
+			splitindex.Value = mode.Nodes.Length - 1;
+			splitindex_ValueChanged(null, EventArgs.Empty);
+			
+			// Viewing subsector
+			ssectorindex.Maximum = mode.Subsectors.Length - 1;
+			ssectorindex.Value = 0;
+			ssectorindex_ValueChanged(null, EventArgs.Empty);
+			segindex_ValueChanged(null, EventArgs.Empty);
+		}
+
+		// Clean up any resources being used.
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This calculates the tree depth recursively
+		private void DiveTree(int node, int level, List<int> leafdepths)
+		{
+			level++;
+			
+			// Process left side
+			if(!mode.Nodes[node].leftsubsector)
+				DiveTree(mode.Nodes[node].leftchild, level, leafdepths);
+			else
+				leafdepths.Add(level);
+
+			// Process right side
+			if(!mode.Nodes[node].rightsubsector)
+				DiveTree(mode.Nodes[node].rightchild, level, leafdepths);
+			else
+				leafdepths.Add(level);			
+		}
+
+		// Show this form
+		public void Show(Form owner)
+		{
+			// Position at left-top of owner
+			this.Location = new Point(owner.Location.X + 20, owner.Location.Y + 90);
+
+			// Show window
+			base.Show(owner);
+		}
+
+		// Switch to a subsector
+		public void ShowSubsector(int ssindex)
+		{
+			ssectorindex.Value = ssindex;
+			tabs.SelectTab(tabsubsectors);
+		}
+
+		#endregion
+
+		#region ================== Form / Overview Events
+
+		// Exit this mode
+		private void closebutton_Click(object sender, EventArgs e)
+		{
+			this.Close();
+		}
+
+		// Exit mode when dialog is closed
+		private void NodesForm_FormClosing(object sender, FormClosingEventArgs e)
+		{
+			General.Editing.CancelMode();
+		}
+
+		// Open tab changed
+		private void tabs_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			General.Interface.RedrawDisplay();
+		}
+
+		// Show segs vertices changed
+		private void showsegsvertices_CheckedChanged(object sender, EventArgs e)
+		{
+			General.Interface.RedrawDisplay();
+		}
+
+		// (Re)build the nodes
+		private void buildnodesbutton_Click(object sender, EventArgs e)
+		{
+			mode.BuildNodes();
+
+			// Restart the mode so that the new structures are loaded in.
+			// This will automatically close and re-open this window.
+			General.Editing.CancelMode();
+			NodesViewerMode newmode = new NodesViewerMode();
+			General.Editing.ChangeMode(newmode);
+			newmode.Form.showsegsvertices.Checked = this.showsegsvertices.Checked;
+		}
+
+		#endregion
+
+		#region ================== Splits Events
+
+		// Go to the root split
+		private void rootbutton_Click(object sender, EventArgs e)
+		{
+			splitindex.Value = splitindex.Maximum;
+		}
+
+		// Go to the parent split
+		private void parentbutton_Click(object sender, EventArgs e)
+		{
+			Node n = mode.Nodes[(int)splitindex.Value];
+			if(n.parent > -1) splitindex.Value = n.parent;
+		}
+
+		// Go to the left split/subsector
+		private void leftbutton_Click(object sender, EventArgs e)
+		{
+			Node n = mode.Nodes[(int)splitindex.Value];
+			if(n.leftsubsector)
+				ShowSubsector(n.leftchild);
+			else
+				splitindex.Value = n.leftchild;
+		}
+
+		// Go to the right split/subsector
+		private void rightbutton_Click(object sender, EventArgs e)
+		{
+			Node n = mode.Nodes[(int)splitindex.Value];
+			if(n.rightsubsector)
+				ShowSubsector(n.rightchild);
+			else
+				splitindex.Value = n.rightchild;
+		}
+
+		// Split changes
+		private void splitindex_ValueChanged(object sender, EventArgs e)
+		{
+			Node n = mode.Nodes[(int)splitindex.Value];
+			if(n.parent == -1)
+			{
+				parentsplit.Text = "(root split)";
+				parentsplit.Enabled = false;
+				parentbutton.Enabled = false;
+			}
+			else
+			{
+				parentsplit.Text = n.parent.ToString();
+				parentsplit.Enabled = true;
+				parentbutton.Enabled = true;
+			}
+
+			leftarea.Text = "(" + n.leftbox.Left + ", " + n.leftbox.Top + ") - (" + n.leftbox.Right + ", " + n.leftbox.Bottom + ")";
+			rightarea.Text = "(" + n.rightbox.Left + ", " + n.rightbox.Top + ") - (" + n.rightbox.Right + ", " + n.rightbox.Bottom + ")";
+			leftindex.Text = n.leftchild.ToString();
+			rightindex.Text = n.rightchild.ToString();
+
+			if(n.leftsubsector)
+			{
+				lefttype.Text = "Subsector:";
+				leftbutton.Text = "Go to subsector";
+			}
+			else
+			{
+				lefttype.Text = "Split:";
+				leftbutton.Text = "Go to split";
+			}
+
+			if(n.rightsubsector)
+			{
+				righttype.Text = "Subsector:";
+				rightbutton.Text = "Go to subsector";
+			}
+			else
+			{
+				righttype.Text = "Split:";
+				rightbutton.Text = "Go to split";
+			}
+
+			General.Interface.RedrawDisplay();
+		}
+
+		#endregion
+
+		#region ================== Subsectors Events
+
+		// Go to parent split for this subsector
+		private void ssparentsplit_Click(object sender, EventArgs e)
+		{
+			// Find parent split
+			int ss = (int)ssectorindex.Value;
+			int parentsplit = -1;
+			for(int i = 0; i < mode.Nodes.Length; i++)
+			{
+				Node n = mode.Nodes[i];
+				if((n.leftsubsector && (n.leftchild == ss)) || (n.rightsubsector && (n.rightchild == ss)))
+				{
+					parentsplit = i;
+					break;
+				}
+			}
+			if(parentsplit == -1) return;
+			splitindex.Value = parentsplit;
+			tabs.SelectTab(tabsplits);
+		}
+
+		// Subsector changes
+		private void ssectorindex_ValueChanged(object sender, EventArgs e)
+		{
+			Subsector s = mode.Subsectors[(int)ssectorindex.Value];
+			
+			ssectornumsegs.Text = s.numsegs.ToString();
+			segindex.Minimum = s.firstseg;
+			segindex.Maximum = s.firstseg + s.numsegs - 1;
+			segindex.Value = s.firstseg;
+			
+			General.Interface.RedrawDisplay();
+		}
+
+		// Segment changes
+		private void segindex_ValueChanged(object sender, EventArgs e)
+		{
+			Seg sg = mode.Segs[(int)segindex.Value];
+			Linedef ld = null; //mxd
+			if(sg.lineindex != -1) ld = General.Map.Map.GetLinedefByIndex(sg.lineindex); //mxd
+
+			lineindex.Text = sg.lineindex.ToString();
+			startvertex.Text = sg.startvertex + "  (" + mode.Vertices[sg.startvertex].x + ", " + mode.Vertices[sg.startvertex].y + ")";
+			endvertex.Text = sg.endvertex + "  (" + mode.Vertices[sg.endvertex].x + ", " + mode.Vertices[sg.endvertex].y + ")";
+			segside.Text = sg.leftside ? "Back" : "Front";
+			segangle.Text = Angle2D.RealToDoom(sg.angle) + "\u00B0";
+			segoffset.Text = sg.offset + " mp";
+
+			if(ld != null) //mxd
+			{ 
+				sideindex.Text = sg.leftside ? ld.Back.Index.ToString() : ld.Front.Index.ToString();
+				sectorindex.Text = sg.leftside ? ld.Back.Sector.Index.ToString() : ld.Front.Sector.Index.ToString();
+			}
+			else
+			{
+				sideindex.Text = "None";
+				sectorindex.Text = "None";
+			}
+
+			General.Interface.RedrawDisplay();
+		}
+
+		// View segment checkbox changes
+		private void viewsegbox_CheckedChanged(object sender, EventArgs e)
+		{
+			General.Interface.RedrawDisplay();
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/NodesViewer/NodesForm.resx b/Source/Plugins/NodesViewer/NodesForm.resx
new file mode 100644
index 0000000..6adf436
--- /dev/null
+++ b/Source/Plugins/NodesViewer/NodesForm.resx
@@ -0,0 +1,339 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="tabs.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="taboverview.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="label11.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="buildnodesbutton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="showsegsvertices.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="treebalance.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="label6.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="treedepth.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="label10.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="numsegs.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="numsplits.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="numvertices.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="numssectors.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="label4.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="label3.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="label2.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="label1.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="tabsplits.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="parentbutton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="parentsplit.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="label16.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="groupBox2.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="rightindex.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="rightarea.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="righttype.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="label15.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="rightbutton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="groupBox1.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="leftindex.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="leftarea.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="lefttype.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="label7.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="leftbutton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="rootbutton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="splitindex.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="label5.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="tabsubsectors.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="viewsegbox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="segindex.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ssectornumsegs.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="label9.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ssparentsplit.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ssectorindex.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="label8.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="groupBox3.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="sectorindex.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="label22.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="sideindex.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="label19.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="segoffset.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="label21.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="segside.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="label18.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="segangle.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="label14.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="endvertex.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="label17.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="startvertex.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="label13.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="lineindex.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="label12.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="rightindex.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="rightarea.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="righttype.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="label15.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="rightbutton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="leftindex.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="leftarea.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="lefttype.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="label7.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="leftbutton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="closebutton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/NodesViewer/NodesViewer.csproj b/Source/Plugins/NodesViewer/NodesViewer.csproj
new file mode 100644
index 0000000..3871e3c
--- /dev/null
+++ b/Source/Plugins/NodesViewer/NodesViewer.csproj
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{9F244231-6A0C-42A6-87C5-ED9620DEE096}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>CodeImp.DoomBuilder.Plugins.NodesViewer</RootNamespace>
+    <AssemblyName>NodesViewer</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\Build\Plugins\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <PlatformTarget>x86</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\Build\Plugins\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <PlatformTarget>x86</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug + Profiler|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\..\..\Build\Plugins\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;PROFILE</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release + Profiler|x86' ">
+    <OutputPath>..\..\..\Build\Plugins\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="BuilderPlug.cs" />
+    <Compile Include="Node.cs" />
+    <Compile Include="NodesForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="NodesForm.Designer.cs">
+      <DependentUpon>NodesForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="NodesViewerMode.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Seg.cs" />
+    <Compile Include="Split.cs" />
+    <Compile Include="Subsector.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Core\Builder.csproj">
+      <Project>{818B3D10-F791-4C3F-9AF5-BB2D0079B63C}</Project>
+      <Name>Builder</Name>
+      <Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="NodesForm.resx">
+      <DependentUpon>NodesForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\Actions.cfg" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\NodesView.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/Source/Plugins/NodesViewer/NodesViewerMode.cs b/Source/Plugins/NodesViewer/NodesViewerMode.cs
new file mode 100644
index 0000000..6db6686
--- /dev/null
+++ b/Source/Plugins/NodesViewer/NodesViewerMode.cs
@@ -0,0 +1,1153 @@
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.IO;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Editing;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Windows;
+using CodeImp.DoomBuilder.Map;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Plugins.NodesViewer
+{
+	[EditMode(DisplayName = "Nodes Viewer",
+			  SwitchAction = "nodesviewermode",
+			  ButtonImage = "NodesView.png",
+			  ButtonOrder = 350,
+			  ButtonGroup = "002_tools",
+			  Volatile = true,
+			  UseByDefault = true,
+			  AllowCopyPaste = false)]
+	public class NodesViewerMode : ClassicMode
+	{
+		#region ================== Constants
+
+		private const float EPSILON = 0.00001f;
+		
+		#endregion
+		
+		#region ================== Variables
+
+		private Seg[] segs;
+		private Node[] nodes;
+		private Vector2D[] verts;
+		private Subsector[] ssectors;
+		private List<PixelColor> distinctcolors;
+		private NodesForm form;
+		private int mouseinssector = -1;
+		private string nodesformat = "Classic nodes";
+
+		#endregion
+
+		#region ================== Properties
+
+		public Seg[] Segs { get { return segs; } }
+		public Node[] Nodes { get { return nodes; } }
+		public Vector2D[] Vertices { get { return verts; } }
+		public Subsector[] Subsectors { get { return ssectors; } }
+		public NodesForm Form { get { return form; } }
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		// Constructor
+		public NodesViewerMode()
+		{
+			// Make a list of distict colors we can use to
+			// display multiple things on the screen
+			// Note that black and white are not in this list, because
+			// these are the most likely colors for the user's background
+			distinctcolors = new List<PixelColor> {
+				PixelColor.FromColor(Color.Blue), 
+				PixelColor.FromColor(Color.Orange), 
+				PixelColor.FromColor(Color.ForestGreen), 
+				PixelColor.FromColor(Color.Sienna), 
+				PixelColor.FromColor(Color.LightPink), 
+				PixelColor.FromColor(Color.Purple),
+				PixelColor.FromColor(Color.Cyan), 
+				PixelColor.FromColor(Color.LawnGreen), 
+				PixelColor.FromColor(Color.PaleGoldenrod), 
+				PixelColor.FromColor(Color.Red), 
+				PixelColor.FromColor(Color.Yellow), 
+				PixelColor.FromColor(Color.LightSkyBlue), 
+				PixelColor.FromColor(Color.DarkGray), 
+				PixelColor.FromColor(Color.Magenta)
+			};
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		/// <summary>
+		/// This (re)builds the nodes for the whole map.
+		/// </summary>
+		public void BuildNodes()
+		{
+			// There is no API available to do this directly, but we export the map which will
+			// cause the DB core to build the nodes (with testing parameters)
+			General.Interface.DisplayStatus(StatusType.Busy, "Building map nodes...");
+			string tempfile = BuilderPlug.MakeTempFilename(".wad");
+			General.Map.IsChanged = true;
+			General.Map.ExportToFile(tempfile);
+			File.Delete(tempfile);
+		}
+
+		/// <summary>
+		/// This loads all nodes structures data from the lumps
+		/// </summary>
+		private bool LoadClassicStructures()
+		{
+			// Load the nodes structure
+			MemoryStream nodesstream = General.Map.GetLumpData("NODES");
+			int numnodes = (int)nodesstream.Length / 28;
+
+			//mxd. Boilerplate!
+			if(numnodes < 1)
+			{
+				// Cancel mode
+				MessageBox.Show("The map has only one subsector. Please add more sectors, then try running this mode again.", "THY NODETH ARETH BROKH!", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				General.Editing.CancelMode();
+				return false;
+			}
+
+			BinaryReader nodesreader = new BinaryReader(nodesstream);
+			nodes = new Node[numnodes];
+			for(int i = 0; i < nodes.Length; i++)
+			{
+				nodes[i].linestart.x = nodesreader.ReadInt16();
+				nodes[i].linestart.y = nodesreader.ReadInt16();
+				nodes[i].linedelta.x = nodesreader.ReadInt16();
+				nodes[i].linedelta.y = nodesreader.ReadInt16();
+				float top = nodesreader.ReadInt16();
+				float bot = nodesreader.ReadInt16();
+				float left = nodesreader.ReadInt16();
+				float right = nodesreader.ReadInt16();
+				nodes[i].rightbox = new RectangleF(left, top, (right - left), (bot - top));
+				top = nodesreader.ReadInt16();
+				bot = nodesreader.ReadInt16();
+				left = nodesreader.ReadInt16();
+				right = nodesreader.ReadInt16();
+				nodes[i].leftbox = new RectangleF(left, top, (right - left), (bot - top));
+				int rightindex = nodesreader.ReadInt16();
+				int leftindex = nodesreader.ReadInt16();
+				nodes[i].rightchild = rightindex & 0x7FFF;
+				nodes[i].leftchild = leftindex & 0x7FFF;
+				nodes[i].rightsubsector = (rightindex & 0x8000) != 0;
+				nodes[i].leftsubsector = (leftindex & 0x8000) != 0;
+			}
+			nodesreader.Close();
+			nodesstream.Close();
+			nodesstream.Dispose();
+
+			// Add additional properties to nodes
+			nodes[nodes.Length - 1].parent = -1;
+			RecursiveSetupNodes(nodes.Length - 1);
+
+			// Load the segs structure
+			MemoryStream segsstream = General.Map.GetLumpData("SEGS");
+			BinaryReader segsreader = new BinaryReader(segsstream);
+			int numsegs = (int)segsstream.Length / 12;
+
+			//mxd. Boilerplate!
+			if(numsegs < 1) 
+			{
+				// Cancel mode
+				MessageBox.Show("The map has empty SEGS lump. Please rebuild the nodes, then try running this mode again.", "THY SEGS HATH SINNETH!", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				General.Editing.CancelMode();
+				return false;
+			}
+
+			segs = new Seg[numsegs];
+			for(int i = 0; i < segs.Length; i++)
+			{
+				segs[i].startvertex = segsreader.ReadInt16();
+				segs[i].endvertex = segsreader.ReadInt16();
+				segs[i].angle = Angle2D.DoomToReal(segsreader.ReadInt16());
+				segs[i].lineindex = segsreader.ReadInt16();
+				segs[i].leftside = segsreader.ReadInt16() != 0;
+				segs[i].offset = segsreader.ReadInt16();
+			}
+			segsreader.Close();
+			segsstream.Close();
+			segsstream.Dispose();
+
+			// Load the vertexes structure
+			MemoryStream vertsstream = General.Map.GetLumpData("VERTEXES");
+			BinaryReader vertsreader = new BinaryReader(vertsstream);
+			int numverts = (int)vertsstream.Length / 4;
+
+			//mxd. Boilerplate!
+			if(numverts < 1) 
+			{
+				// Cancel mode
+				MessageBox.Show("The map has empty VERTEXES lump. Please rebuild the nodes, then try running this mode again.", "THY VERTEXES ARETH FOUL!", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				General.Editing.CancelMode();
+				return false;
+			}
+
+			verts = new Vector2D[numverts];
+			for(int i = 0; i < verts.Length; i++)
+			{
+				verts[i].x = vertsreader.ReadInt16();
+				verts[i].y = vertsreader.ReadInt16();
+			}
+			vertsreader.Close();
+			vertsstream.Close();
+			vertsstream.Dispose();
+
+			// Load the subsectors structure
+			MemoryStream ssecstream = General.Map.GetLumpData("SSECTORS");
+			BinaryReader ssecreader = new BinaryReader(ssecstream);
+			int numssec = (int)ssecstream.Length / 4;
+
+			//mxd. Boilerplate!
+			if(numssec < 1) 
+			{
+				// Cancel mode
+				MessageBox.Show("The map has empty SSECTORS lump. Please rebuild the nodes, then try running this mode again.", "THY SSECTORS ARETH HERETYSH!", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				General.Editing.CancelMode();
+				return false;
+			}
+
+			ssectors = new Subsector[numssec];
+			for(int i = 0; i < ssectors.Length; i++)
+			{
+				ssectors[i].numsegs = ssecreader.ReadInt16();
+				ssectors[i].firstseg = ssecreader.ReadInt16();
+			}
+			ssecreader.Close();
+			ssecstream.Close();
+			ssecstream.Dispose();
+
+			// Link all segs to their subsectors
+			for(int i = 0; i < ssectors.Length; i++)
+			{
+				int lastseg = ssectors[i].firstseg + ssectors[i].numsegs - 1;
+				for(int sg = ssectors[i].firstseg; sg <= lastseg; sg++)
+				{
+					segs[sg].ssector = i;
+				}
+			}
+
+			return true;
+		}
+
+		//mxd. This loads all data from the ZNODES lump
+		private bool LoadZNodes() 
+		{
+			List<string> supportedFormats = new List<string> { "XNOD", "XGLN", "XGL2", "XGL3" };
+			using(MemoryStream stream = General.Map.GetLumpData("ZNODES")) 
+			{
+				//boilerplate...
+				if(stream.Length < 4) 
+				{
+					MessageBox.Show("ZNODES lump is empty.", "Nodes Viewer mode", MessageBoxButtons.OK, MessageBoxIcon.Error);
+					return false;
+				}
+
+				using(BinaryReader reader = new BinaryReader(stream)) 
+				{
+					//read signature
+					nodesformat = new string(reader.ReadChars(4));
+					if(!supportedFormats.Contains(nodesformat)) 
+					{
+						MessageBox.Show("'" + nodesformat + "' node format is not supported.", "Nodes Viewer mode", MessageBoxButtons.OK, MessageBoxIcon.Error);
+						return false;
+					}
+
+					uint vertsCount = reader.ReadUInt32();
+					uint newVertsCount = reader.ReadUInt32();
+
+					//boilerplate...
+					if(vertsCount != General.Map.Map.Vertices.Count) 
+					{
+						MessageBox.Show("Error while reading ZNODES: vertices count in ZNODES lump (" + vertsCount + ") doesn't match with map's vertices count (" + General.Map.Map.Vertices.Count + ")!", "Nodes Viewer mode", MessageBoxButtons.OK, MessageBoxIcon.Error);
+						return false;
+					}
+
+					//add map vertices
+					verts = new Vector2D[vertsCount + newVertsCount];
+					int counter = 0;
+					foreach(Vertex v in General.Map.Map.Vertices) verts[counter++] = v.Position;
+
+					//read extra vertices
+					for(int i = counter; i < counter + newVertsCount; i++) 
+					{
+						verts[i].x = reader.ReadInt32() / 65536.0f;
+						verts[i].y = reader.ReadInt32() / 65536.0f;
+					}
+
+					//read subsectors
+					uint ssecCount = reader.ReadUInt32();
+					ssectors = new Subsector[ssecCount];
+
+					int firstseg = 0;
+					for(int i = 0; i < ssectors.Length; i++) 
+					{
+						ssectors[i].numsegs = (int)reader.ReadUInt32();
+						ssectors[i].firstseg = firstseg;
+						firstseg += ssectors[i].numsegs;
+					}
+
+					//read segments. offset and angle are unused anyway
+					uint segsCount = reader.ReadUInt32();
+					segs = new Seg[segsCount];
+
+					switch(nodesformat) 
+					{
+						case "XGLN":
+							for(int i = 0; i < segs.Length; i++) 
+							{
+								segs[i].startvertex = (int)reader.ReadUInt32();
+								reader.BaseStream.Position += 4; //skip partner
+								segs[i].lineindex = reader.ReadUInt16();
+								segs[i].leftside = reader.ReadBoolean();
+							}
+							break;
+
+						case "XGL3":
+						case "XGL2":
+							for(int i = 0; i < segs.Length; i++) 
+							{
+								segs[i].startvertex = (int)reader.ReadUInt32();
+								reader.BaseStream.Position += 4; //skip partner
+								uint lineindex = reader.ReadUInt32();
+								segs[i].lineindex = (lineindex == 0xFFFFFFFF ? -1 : (int)lineindex);
+								segs[i].leftside = reader.ReadBoolean();
+							}
+							break;
+
+						case "XNOD":
+							for(int i = 0; i < segs.Length; i++) 
+							{
+								segs[i].startvertex = (int)reader.ReadUInt32();
+								segs[i].endvertex = (int)reader.ReadUInt32();
+								segs[i].lineindex = reader.ReadUInt16();
+								segs[i].leftside = reader.ReadBoolean();
+							}
+							break;
+					}
+
+					//set second vertex, angle and reverse segs order
+					if(nodesformat == "XGLN" || nodesformat == "XGL2" || nodesformat == "XGL3") 
+					{
+						int index = 0;
+						foreach(Subsector ss in ssectors) 
+						{
+							//set the last vert
+							int lastseg = ss.firstseg + ss.numsegs - 1;
+							segs[lastseg].endvertex = segs[ss.firstseg].startvertex;
+
+							//set the rest
+							for(int i = ss.firstseg + 1; i <= lastseg; i++) segs[i - 1].endvertex = segs[i].startvertex;
+
+							//set angle and subsector index
+							for(int i = ss.firstseg; i <= lastseg; i++) 
+							{
+								segs[i].angle = Vector2D.GetAngle(verts[segs[i].endvertex], verts[segs[i].startvertex]);
+								segs[i].ssector = index;
+							}
+
+							index++;
+						}
+					}
+
+					//read nodes
+					uint nodesCount = reader.ReadUInt32();
+
+					//boilerplate...
+					if(nodesCount < 1) 
+					{
+						MessageBox.Show("The map has only one subsector.", "Why are you doing this, Stanley?..", MessageBoxButtons.OK, MessageBoxIcon.Error);
+						return false;
+					}
+
+					nodes = new Node[nodesCount];
+
+					for(int i = 0; i < nodes.Length; i++) 
+					{
+						if(nodesformat == "XGL3") 
+						{
+							nodes[i].linestart.x = reader.ReadInt32() / 65536.0f;
+							nodes[i].linestart.y = reader.ReadInt32() / 65536.0f;
+							nodes[i].linedelta.x = reader.ReadInt32() / 65536.0f;
+							nodes[i].linedelta.y = reader.ReadInt32() / 65536.0f;
+						} 
+						else 
+						{
+							nodes[i].linestart.x = reader.ReadInt16();
+							nodes[i].linestart.y = reader.ReadInt16();
+							nodes[i].linedelta.x = reader.ReadInt16();
+							nodes[i].linedelta.y = reader.ReadInt16();
+						}
+
+						float top = reader.ReadInt16();
+						float bot = reader.ReadInt16();
+						float left = reader.ReadInt16();
+						float right = reader.ReadInt16();
+						nodes[i].rightbox = new RectangleF(left, top, (right - left), (bot - top));
+
+						top = reader.ReadInt16();
+						bot = reader.ReadInt16();
+						left = reader.ReadInt16();
+						right = reader.ReadInt16();
+						nodes[i].leftbox = new RectangleF(left, top, (right - left), (bot - top));
+
+						uint rightindex = reader.ReadUInt32();
+						uint leftindex = reader.ReadUInt32();
+						nodes[i].rightchild = (int)(rightindex & 0x7FFFFFFF);
+						nodes[i].leftchild = (int)(leftindex & 0x7FFFFFFF);
+						nodes[i].rightsubsector = (rightindex & 0x80000000) != 0;
+						nodes[i].leftsubsector = (leftindex & 0x80000000) != 0;
+					}
+
+					// Add additional properties to nodes
+					nodes[nodes.Length - 1].parent = -1;
+					RecursiveSetupNodes(nodes.Length - 1);
+				}
+			}
+
+			return true;
+		}
+
+		/// <summary>
+		/// This recursively sets up the nodes structure with additional properties
+		/// </summary>
+		private void RecursiveSetupNodes(int nodeindex)
+		{
+			Node n = nodes[nodeindex];
+			if(!n.leftsubsector)
+			{
+				nodes[n.leftchild].parent = nodeindex;
+				RecursiveSetupNodes(n.leftchild);
+			}
+			if(!n.rightsubsector)
+			{
+				nodes[n.rightchild].parent = nodeindex;
+				RecursiveSetupNodes(n.rightchild);
+			}
+		}
+
+		/// <summary>
+		/// This builds the polygons for all subsectors
+		/// </summary>
+		private void RecursiveBuildSubsectorPoly(int nodeindex, Stack<Split> splits)
+		{
+			// Do the left side
+			Split s = new Split(nodes[nodeindex].linestart, -nodes[nodeindex].linedelta);
+			splits.Push(s);
+			if(nodes[nodeindex].leftsubsector)
+				BuildSubsectorPoly(nodes[nodeindex].leftchild, splits);
+			else
+				RecursiveBuildSubsectorPoly(nodes[nodeindex].leftchild, splits);
+
+			splits.Pop();
+
+			// Do the right side
+			s = new Split(nodes[nodeindex].linestart, nodes[nodeindex].linedelta);
+			splits.Push(s);
+			if(nodes[nodeindex].rightsubsector)
+				BuildSubsectorPoly(nodes[nodeindex].rightchild, splits);
+			else
+				RecursiveBuildSubsectorPoly(nodes[nodeindex].rightchild, splits);
+
+			splits.Pop();
+		}
+
+		/// <summary>
+		/// Build the polygon for a specific subsector
+		/// </summary>
+		private void BuildSubsectorPoly(int ss, IEnumerable<Split> nodesplits)
+		{
+			// Begin with a giant square polygon that covers the entire map
+			List<Vector2D> poly = new List<Vector2D>(16);
+			poly.Add(new Vector2D(-General.Map.FormatInterface.MaxCoordinate, General.Map.FormatInterface.MaxCoordinate));
+			poly.Add(new Vector2D(General.Map.FormatInterface.MaxCoordinate, General.Map.FormatInterface.MaxCoordinate));
+			poly.Add(new Vector2D(General.Map.FormatInterface.MaxCoordinate, -General.Map.FormatInterface.MaxCoordinate));
+			poly.Add(new Vector2D(-General.Map.FormatInterface.MaxCoordinate, -General.Map.FormatInterface.MaxCoordinate));
+
+			// Crop the polygon by the node tree splits
+			foreach(Split s in nodesplits) CropPolygon(poly, s);
+
+			// Crop the polygon by the subsector segs
+			for(int i = 0; i < ssectors[ss].numsegs; i++)
+			{
+				Split s;
+				Seg sg = segs[ssectors[ss].firstseg + i];
+
+				//mxd. Sanity check, because some segs in Doom maps refer to non-existing verts.  
+				if(sg.startvertex > verts.Length - 1 || sg.endvertex > verts.Length - 1) continue;
+
+				s.pos = verts[sg.startvertex];
+				s.delta = verts[sg.endvertex] - verts[sg.startvertex];
+				CropPolygon(poly, s);
+			}
+
+			if(poly.Count > 1)
+			{
+				// Remove any zero-length lines
+				Vector2D prevpoint = poly[0];
+				for(int i = poly.Count - 1; i >= 0; i--)
+				{
+					if(Vector2D.DistanceSq(poly[i], prevpoint) < 0.001f)
+						poly.RemoveAt(i);
+					else
+						prevpoint = poly[i];
+				}
+			}
+
+			ssectors[ss].points = poly.ToArray();
+
+			// Setup vertices for rendering
+			if(poly.Count >= 3)
+			{
+				FlatVertex[] fverts = new FlatVertex[(poly.Count - 2) * 3];
+				int intcolor = PixelColor.FromColor(Color.Gray).WithAlpha(100).ToInt();
+				int pi = 0;
+				for(int t = 0; t < (poly.Count - 2); t++)
+				{
+					fverts[pi].x = poly[0].x;
+					fverts[pi].y = poly[0].y;
+					fverts[pi].c = intcolor;
+					fverts[pi + 1].x = poly[t + 1].x;
+					fverts[pi + 1].y = poly[t + 1].y;
+					fverts[pi + 1].c = intcolor;
+					fverts[pi + 2].x = poly[t + 2].x;
+					fverts[pi + 2].y = poly[t + 2].y;
+					fverts[pi + 2].c = intcolor;
+					pi += 3;
+				}
+				ssectors[ss].vertices = fverts;
+			}
+		}
+
+		/// <summary>
+		/// Crop a polygon by a split line
+		/// </summary>
+		private static void CropPolygon(List<Vector2D> poly, Split split)
+		{
+			if(poly.Count == 0) return;
+			Vector2D prev = poly[poly.Count - 1];
+
+			float side1 = (prev.y - split.pos.y) * split.delta.x - (prev.x - split.pos.x) * split.delta.y;
+			List<Vector2D> newp = new List<Vector2D>(poly.Count);
+			for(int i = 0; i < poly.Count; i++)
+			{
+				// Fetch vertex and determine side
+				Vector2D cur = poly[i];
+				float side2 = (cur.y - split.pos.y) * split.delta.x - (cur.x - split.pos.x) * split.delta.y;
+
+				// Front?
+				if(side2 < -EPSILON)
+				{
+					if(side1 > EPSILON)
+					{
+						// Split line with plane and insert the vertex
+						float u;
+						Line2D.GetIntersection(split.pos, split.pos + split.delta, prev.x, prev.y, cur.x, cur.y, out u);
+						Vector2D newv = prev + (cur - prev) * u;
+						newp.Add(newv);
+					}
+
+					newp.Add(cur);
+				}
+				// Back?
+				else if(side2 > EPSILON)
+				{
+					if(side1 < -EPSILON)
+					{
+						// Split line with plane and insert the vertex
+						float u;
+						Line2D.GetIntersection(split.pos, split.pos + split.delta, prev.x, prev.y, cur.x, cur.y, out u);
+						Vector2D newv = prev + (cur - prev) * u;
+						newp.Add(newv);
+					}
+				}
+				else
+				{
+					// On the plane
+					newp.Add(cur);
+				}
+
+				// Next
+				prev = cur;
+				side1 = side2;
+			}
+			poly.Clear();
+			poly.AddRange(newp);
+
+			// The code below would be more efficient, because it modifies the polygon in place...
+			// but it has a bug, some polygons are corrupted.
+
+			/*
+			bool prevremoved = false;
+			float prevside = (prev.y - split.pos.y) * split.delta.x - (prev.x - split.pos.x) * split.delta.y;
+			int i = 0;
+			while(i < poly.Count)
+			{
+				Vector2D cur = poly[i];
+				float curside = (cur.y - split.pos.y) * split.delta.x - (cur.x - split.pos.x) * split.delta.y;
+				
+				// Point is in FRONT of the split?
+				if(curside < -EPSILON)
+				{
+					if(prevside > EPSILON)
+					{
+						// Previous point was BEHIND the split
+						// Line crosses the split, we need to add the intersection point
+						float u;
+						Line2D.GetIntersection(split.pos, split.pos + split.delta, prev.x, prev.y, cur.x, cur.y, out u);
+						Vector2D newv = prev + (cur - prev) * u;
+						poly.Insert(i, newv);
+						i++;
+					}
+					else if(prevside < -EPSILON)
+					{
+						// Previous point was also in FRONT of the split
+						// We don't need to do anything
+					}
+					else
+					{
+						// Previous point was ON the split
+						// If the previous point was removed, we have to add it again
+						if(prevremoved)
+						{
+							poly.Insert(i, prev);
+							i++;
+						}
+					}
+					
+					i++;
+					prevremoved = false;
+				}
+				// Point is BEHIND the split?
+				else if(curside > EPSILON)
+				{
+					if(prevside < -EPSILON)
+					{
+						// Previous point was in FRONT of the split
+						// Line crosses the split, so we must add the intersection point
+						float u;
+						Line2D.GetIntersection(split.pos, split.pos + split.delta, prev.x, prev.y, cur.x, cur.y, out u);
+						Vector2D newv = prev + (cur - prev) * u;
+						poly.Insert(i, newv);
+						i++;
+					}
+					else if(prevside > EPSILON)
+					{
+						// Previous point was also BEHIND the split
+						// We don't need to do anything, this point will be removed
+					}
+					else
+					{
+						// Previous point was ON the split
+						// We don't need to do anything, this point will be removed
+					}
+					
+					poly.RemoveAt(i);
+					prevremoved = true;
+				}
+				// Point is ON the split?
+				else
+				{
+					if(prevside > EPSILON)
+					{
+						// Previous point was BEHIND the split
+						// Remove this point
+						poly.RemoveAt(i);
+						prevremoved = true;
+					}
+					else if(prevside < -EPSILON)
+					{
+						// Previous point was in FRONT of the split
+						// We want to keep this point
+						prevremoved = false;
+						i++;
+					}
+					else
+					{
+						// Previous point is ON the split
+						// Only if the previous point was also removed, we remove this one as well
+						if(prevremoved)
+							poly.RemoveAt(i);
+						else
+							i++;
+					}
+				}
+				
+				prev = cur;
+				prevside = curside;
+			}
+			*/
+		}
+
+		/// <summary>
+		/// This tests if the given coordinate is inside the specified subsector.
+		/// </summary>
+		private bool PointInSubsector(int index, Vector2D p) 
+		{
+			if(ssectors[index].points.Length == 0) return false; //mxd
+			
+			// Subsectors are convex, so we can simply test if the point is on the front side of all lines.
+			Vector2D[] points = ssectors[index].points;
+			Vector2D prevpoint = points[points.Length - 1];
+			for(int i = 0; i < points.Length; i++)
+			{
+				float side = Line2D.GetSideOfLine(prevpoint, points[i], p);
+				if(side > 0f) return false;
+				prevpoint = points[i];
+			}
+			return true;
+		}
+
+		// For rendering
+		private void DrawSubsectorArea(FlatVertex[] vertices, PixelColor color)
+		{
+			if(vertices == null) return;
+			if(vertices.Length < 3) return;
+
+			// Copy array and change color
+			FlatVertex[] poly = new FlatVertex[vertices.Length];
+			vertices.CopyTo(poly, 0);
+			int intcolor = color.WithAlpha(100).ToInt();
+			for(int i = 0; i < poly.Length; i++) poly[i].c = intcolor;
+
+			// Draw
+			renderer.RenderGeometry(poly, General.Map.Data.WhiteTexture, true);
+		}
+
+		// For rendering
+		private void DrawSubsectorArea(FlatVertex[] vertices)
+		{
+			if(vertices == null) return;
+			if(vertices.Length < 3) return;
+			renderer.RenderGeometry(vertices, General.Map.Data.WhiteTexture, true);
+		}
+
+		// For rendering
+		private void PlotSubsectorLines(Vector2D[] points, PixelColor color)
+		{
+			if(points.Length < 2) return;
+			Vector2D prevpoint = points[points.Length - 1];
+			for(int i = 0; i < points.Length; i++)
+			{
+				renderer.PlotLine(prevpoint, points[i], color);
+				prevpoint = points[i];
+			}
+		}
+
+		// For rendering
+		private void DrawSplitArea(RectangleF bbox, int nodeindex, bool left, PixelColor color)
+		{
+			Node node = nodes[nodeindex];
+
+			// Begin with a square bounding box polygon
+			List<Vector2D> poly = new List<Vector2D>(16);
+			poly.Add(new Vector2D(bbox.Left, bbox.Top));
+			poly.Add(new Vector2D(bbox.Right, bbox.Top));
+			poly.Add(new Vector2D(bbox.Right, bbox.Bottom));
+			poly.Add(new Vector2D(bbox.Left, bbox.Bottom));
+
+			// Remove everything behind the split from the area
+			if(left)
+				CropPolygon(poly, new Split(node.linestart, -node.linedelta));
+			else
+				CropPolygon(poly, new Split(node.linestart, node.linedelta));
+
+			// Remove everything behind parent splits from the area
+			int prevnode = nodeindex;
+			int parentnode = node.parent;
+			while(parentnode > -1)
+			{
+				Node pn = nodes[parentnode];
+				if(!pn.leftsubsector && (pn.leftchild == prevnode))
+					CropPolygon(poly, new Split(pn.linestart, -pn.linedelta));
+				else if(!pn.rightsubsector && (pn.rightchild == prevnode))
+					CropPolygon(poly, new Split(pn.linestart, pn.linedelta));
+				prevnode = parentnode;
+				parentnode = pn.parent;
+			}
+
+			if(poly.Count >= 3)
+			{
+				// Create render vertices
+				FlatVertex[] fverts = new FlatVertex[(poly.Count - 2) * 3];
+				int intcolor = color.ToInt();
+				int pi = 0;
+				for(int t = 0; t < (poly.Count - 2); t++)
+				{
+					fverts[pi].x = poly[0].x;
+					fverts[pi].y = poly[0].y;
+					fverts[pi].c = intcolor;
+					fverts[pi + 1].x = poly[t + 1].x;
+					fverts[pi + 1].y = poly[t + 1].y;
+					fverts[pi + 1].c = intcolor;
+					fverts[pi + 2].x = poly[t + 2].x;
+					fverts[pi + 2].y = poly[t + 2].y;
+					fverts[pi + 2].c = intcolor;
+					pi += 3;
+				}
+
+				// Draw
+				renderer.RenderGeometry(fverts, General.Map.Data.WhiteTexture, true);
+			}
+		}
+
+		#endregion
+
+		#region ================== Events
+
+		// Mode starts
+		public override void OnEngage()
+		{
+			Cursor.Current = Cursors.WaitCursor;
+			base.OnEngage();
+
+			//mxd. General.Map.ExportToFile in BuildNodes() won't do the trick if the map was never saved
+			if(string.IsNullOrEmpty(General.Map.FilePathName)) 
+			{
+				MessageBox.Show("Please save the map before running Nodes Viewer mode.", "Nodes Viewer mode", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				General.Editing.CancelMode();
+				return;
+			}
+
+			//mxd
+			bool haveNodes = General.Map.LumpExists("NODES");
+			bool haveZnodes = General.Map.LumpExists("ZNODES");
+			bool haveSectors = General.Map.LumpExists("SSECTORS");
+			bool haveSegs = General.Map.LumpExists("SEGS");
+			bool haveVerts = General.Map.LumpExists("VERTEXES");
+
+			if(General.Map.IsChanged || !(haveZnodes || (haveNodes || haveSectors || haveSegs || haveVerts)))
+			{
+				// We need to build the nodes!
+				BuildNodes();
+
+				//mxd. Update nodes availability
+				haveNodes = General.Map.LumpExists("NODES");
+				haveZnodes = General.Map.LumpExists("ZNODES");
+				haveSectors = General.Map.LumpExists("SSECTORS");
+				haveSegs = General.Map.LumpExists("SEGS");
+				haveVerts = General.Map.LumpExists("VERTEXES");
+			}
+
+			//mxd
+			if(haveZnodes) 
+			{
+				General.Interface.DisplayStatus(StatusType.Busy, "Reading map nodes...");
+				if(!LoadZNodes()) 
+				{
+					General.Interface.DisplayStatus(StatusType.Warning, "Failed to read map nodes.");
+					General.Editing.CancelMode();
+					return;
+				}
+			} 
+			else 
+			{
+				if(!haveNodes) 
+				{
+					MessageBox.Show("Unable to find the NODES lump. It may be that the nodes could not be built correctly.", "Nodes Viewer mode", MessageBoxButtons.OK, MessageBoxIcon.Error);
+					General.Editing.CancelMode();
+					return;
+				}
+
+				if(!haveSectors) 
+				{
+					MessageBox.Show("Unable to find the SSECTORS lump. It may be that the nodes could not be built correctly.", "Nodes Viewer mode", MessageBoxButtons.OK, MessageBoxIcon.Error);
+					General.Editing.CancelMode();
+					return;
+				}
+
+				if(!haveSegs) 
+				{
+					MessageBox.Show("Unable to find the SEGS lump. It may be that the nodes could not be built correctly.", "Nodes Viewer mode", MessageBoxButtons.OK, MessageBoxIcon.Error);
+					General.Editing.CancelMode();
+					return;
+				}
+
+				if(!haveVerts) 
+				{
+					MessageBox.Show("Unable to find the VERTEXES lump. It may be that the nodes could not be built correctly.", "Nodes Viewer mode", MessageBoxButtons.OK, MessageBoxIcon.Error);
+					General.Editing.CancelMode();
+					return;
+				}
+
+				General.Interface.DisplayStatus(StatusType.Busy, "Reading map nodes...");
+				if(!LoadClassicStructures())
+				{
+					General.Interface.DisplayStatus(StatusType.Warning, "Failed to read map nodes.");
+					General.Editing.CancelMode();
+					return;
+				}
+			}
+			
+			// Setup presentation
+			CustomPresentation presentation = new CustomPresentation();
+			presentation.AddLayer(new PresentLayer(RendererLayer.Background, BlendingMode.Mask, General.Settings.BackgroundAlpha));
+			presentation.AddLayer(new PresentLayer(RendererLayer.Grid, BlendingMode.Mask));
+			presentation.AddLayer(new PresentLayer(RendererLayer.Overlay, BlendingMode.Alpha, 1f, true));
+			presentation.AddLayer(new PresentLayer(RendererLayer.Geometry, BlendingMode.Alpha, 1f, true));
+			renderer.SetPresentation(presentation);
+
+			General.Interface.DisplayStatus(StatusType.Busy, "Building subsectors...");
+
+			RecursiveBuildSubsectorPoly(nodes.Length - 1, new Stack<Split>(nodes.Length / 2 + 1));
+
+			// Load and display dialog window
+			form = new NodesForm(this);
+			form.Text += " (" + nodesformat + " format)";
+			form.Show((Form)General.Interface);
+
+			Cursor.Current = Cursors.Default;
+			General.Interface.DisplayReady();
+			General.Interface.RedrawDisplay();
+		}
+
+		// Mode ends
+		public override void OnDisengage()
+		{
+			if(form != null)
+			{
+				form.Dispose();
+				form = null;
+			}
+			
+			base.OnDisengage();
+		}
+
+		// Cancelled
+		public override void OnCancel()
+		{
+			// Cancel base class
+			base.OnCancel();
+
+			// Return to previous mode
+			General.Editing.ChangeMode(General.Editing.PreviousStableMode.Name);
+		}
+
+		// Mouse moves
+		public override void OnMouseMove(MouseEventArgs e)
+		{
+			base.OnMouseMove(e);
+
+			if(form.SelectedTab == 0)
+			{
+				int newssector = -1;
+
+				// Traverse the tree to find the subsector we could be in
+				Node n = nodes[nodes.Length - 1];
+				do
+				{
+					float side = (mousemappos.y - n.linestart.y) * n.linedelta.x - (mousemappos.x - n.linestart.x) * n.linedelta.y;
+					if(side > 0f)
+					{
+						// Mouse is on the left side of this split
+						if(n.leftsubsector)
+							newssector = n.leftchild;
+						else
+							n = nodes[n.leftchild];
+					}
+					else
+					{
+						// Mouse is on the right side of this split
+						if(n.rightsubsector)
+							newssector = n.rightchild;
+						else
+							n = nodes[n.rightchild];
+					}
+				}
+				while(newssector == -1);
+
+				// The mouse could be outside the map (which can't be determined through the BSP tree).
+				// So here we check if the mouse is really inside the subsector.
+				if((newssector > -1) && !PointInSubsector(newssector, mousemappos)) newssector = -1;
+				
+				// Update?
+				if(newssector != mouseinssector)
+				{
+					mouseinssector = newssector;
+					General.Interface.RedrawDisplay();
+				}
+			}
+		}
+
+		// Mouse leaves
+		public override void OnMouseLeave(EventArgs e)
+		{
+			base.OnMouseLeave(e);
+			mouseinssector = -1;
+			General.Interface.RedrawDisplay();
+		}
+
+		// Mouse clicks to select a subsector
+		protected override void OnSelectBegin()
+		{
+			base.OnSelectBegin();
+			if(mouseinssector > -1)
+			{
+				form.ShowSubsector(mouseinssector);
+			}
+		}
+
+		// Draw the display
+		public override void OnRedrawDisplay()
+		{
+			base.OnRedrawDisplay();
+
+			if(form == null) return;
+
+			if(renderer.StartPlotter(true))
+			{
+				if(form.SelectedTab == 0)
+				{
+					// Render all subsectors in original color
+					for(int si = 0; si < ssectors.Length; si++) 
+					{
+						Subsector s = ssectors[si];
+						PlotSubsectorLines(s.points, PixelColor.FromColor(Color.Gray));
+					}
+					
+					if(mouseinssector > -1)
+					{
+						PlotSubsectorLines(ssectors[mouseinssector].points, General.Colors.Highlight);
+					}
+
+					// Draw additional vertices
+					if(form.ShowSegsVertices)
+					{
+						for(int i = General.Map.Map.Vertices.Count; i < verts.Length; i++)
+							renderer.PlotVertexAt(verts[i], ColorCollection.VERTICES);
+					}
+				}
+
+				if(form.SelectedTab == 1)
+				{
+					renderer.PlotLinedefSet(General.Map.Map.Linedefs);
+
+					// Render selected node split
+					if((form.ViewSplitIndex >= 0) && (form.ViewSplitIndex < nodes.Length))
+					{
+						Node n = nodes[form.ViewSplitIndex];
+
+						// Draw parent splits
+						int parentsplit = n.parent;
+						while(parentsplit > -1)
+						{
+							Node pn = nodes[parentsplit];
+							renderer.PlotLine(pn.linestart, pn.linestart + pn.linedelta, General.Colors.Selection);
+							parentsplit = pn.parent;
+						}
+
+						// Draw this split
+						renderer.PlotLine(n.linestart, n.linestart + n.linedelta, General.Colors.Highlight);
+					}
+				}
+
+				if(form.SelectedTab == 2)
+				{
+					renderer.PlotLinedefSet(General.Map.Map.Linedefs);
+
+					// Render selected subsector
+					if((form.ViewSubsectorIndex >= 0) && (form.ViewSubsectorIndex < ssectors.Length))
+					{
+						Subsector s = ssectors[form.ViewSubsectorIndex];
+						PlotSubsectorLines(s.points, General.Colors.Highlight);
+					}
+
+					// Draw selected segment
+					if(form.ViewSegIndex > -1)
+					{
+						Seg sg = segs[form.ViewSegIndex];
+						renderer.PlotLine(verts[sg.startvertex], verts[sg.endvertex], General.Colors.Selection);
+					}
+				}
+
+				renderer.Finish();
+			}
+
+			if(renderer.StartOverlay(true))
+			{
+				if(form.SelectedTab == 0)
+				{
+					if(mouseinssector > -1)
+					{
+						// Render all subsectors in original color
+						for(int si = 0; si < ssectors.Length; si++)
+						{
+							Subsector s = ssectors[si];
+							DrawSubsectorArea(s.vertices);
+						}
+						DrawSubsectorArea(ssectors[mouseinssector].vertices, General.Colors.Highlight);
+					}
+					else
+					{
+						// Render all subsectors with distinct colors
+						for(int si = 0; si < ssectors.Length; si++)
+						{
+							Subsector s = ssectors[si];
+							PixelColor color = distinctcolors[si % distinctcolors.Count];
+							DrawSubsectorArea(s.vertices, color);
+						}
+					}
+				}
+
+				if(form.SelectedTab == 1)
+				{
+					// Render selected node split
+					if((form.ViewSplitIndex >= 0) && (form.ViewSplitIndex < nodes.Length))
+					{
+						Node n = nodes[form.ViewSplitIndex];
+
+						// Draw areas. We draw these first, because they would otherwise erase any splits we want to show.
+						DrawSplitArea(n.leftbox, form.ViewSplitIndex, true, new PixelColor(100, 50, 80, 255));
+						DrawSplitArea(n.rightbox, form.ViewSplitIndex, false, new PixelColor(100, 20, 220, 20));
+
+						// Draw parent splits
+						int parentsplit = n.parent;
+						while(parentsplit > -1)
+						{
+							Node pn = nodes[parentsplit];
+							renderer.RenderLine(pn.linestart, pn.linestart + pn.linedelta, 1f, General.Colors.Selection, true);
+							parentsplit = pn.parent;
+						}
+
+						// Draw this split
+						renderer.RenderLine(n.linestart, n.linestart + n.linedelta, 1f, General.Colors.Highlight, true);
+					}
+				}
+
+				if(form.SelectedTab == 2)
+				{
+					// Render selected subsector
+					if((form.ViewSubsectorIndex >= 0) && (form.ViewSubsectorIndex < ssectors.Length))
+					{
+						Subsector s = ssectors[form.ViewSubsectorIndex];
+
+						// Draw area
+						DrawSubsectorArea(s.vertices, General.Colors.Highlight);
+
+						// Draw selected segment
+						if(form.ViewSegIndex > -1)
+						{
+							Seg sg = segs[form.ViewSegIndex];
+							renderer.RenderLine(verts[sg.startvertex], verts[sg.endvertex], 1f, General.Colors.Selection, true);
+						}
+					}
+				}
+				
+				renderer.Finish();
+			}
+			
+			renderer.Present();
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/NodesViewer/Properties/AssemblyInfo.cs b/Source/Plugins/NodesViewer/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..0891601
--- /dev/null
+++ b/Source/Plugins/NodesViewer/Properties/AssemblyInfo.cs
@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("NodesViewer")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("NodesViewer")]
+[assembly: AssemblyCopyright("Copyright ©  2013")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("5b90f638-29b6-4f63-b79c-95f4e29c7c37")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Source/Plugins/NodesViewer/Properties/Resources.Designer.cs b/Source/Plugins/NodesViewer/Properties/Resources.Designer.cs
new file mode 100644
index 0000000..37661b9
--- /dev/null
+++ b/Source/Plugins/NodesViewer/Properties/Resources.Designer.cs
@@ -0,0 +1,63 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:4.0.30319.42000
+//
+//     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace CodeImp.DoomBuilder.Plugins.NodesViewer.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
+    /// </summary>
+    // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
+    // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
+    // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
+    // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("CodeImp.DoomBuilder.Plugins.NodesViewer.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
+        ///   Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+    }
+}
diff --git a/Source/Plugins/NodesViewer/Properties/Resources.resx b/Source/Plugins/NodesViewer/Properties/Resources.resx
new file mode 100644
index 0000000..7080a7d
--- /dev/null
+++ b/Source/Plugins/NodesViewer/Properties/Resources.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/NodesViewer/Resources/Actions.cfg b/Source/Plugins/NodesViewer/Resources/Actions.cfg
new file mode 100644
index 0000000..3f1ebe5
--- /dev/null
+++ b/Source/Plugins/NodesViewer/Resources/Actions.cfg
@@ -0,0 +1,34 @@
+
+//
+// This file defines which actions there are, what description they have and
+// some behaviour options. The Doom Builder core will bind to these actions
+// with delegates (function pointers) where you use the BeginAction and
+// EndAction attributes. This file must be named Actions.cfg and must be
+// included in the plugin project as "Embedded Resource".
+//
+
+//
+// Options:
+//
+// allowkeys:       Allows the user to bind standard keys to this action.
+// allowmouse:      Allows the user to bind mouse buttons to this action.
+// allowscroll:     Allows the user to bind the scrollwheel to this action.
+// disregardshift:  This action will trigger regardless if Shift or Control is used.
+// repeat:          BeginAction will be called for automatic key repetition.
+// default:         Default key is only used when the action is loaded for the first
+//                  time and the default key is not used by any other action.
+//
+// allowkeys and allowmouse are true by default, the others are false by default.
+//
+
+
+nodesviewermode
+{
+	title = "Nodes Viewer Mode";
+	category = "modes";
+	description = "Switches to the Nodes Viewer mode.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+}
+
diff --git a/Source/Plugins/NodesViewer/Resources/NodesView.png b/Source/Plugins/NodesViewer/Resources/NodesView.png
new file mode 100644
index 0000000..af5540f
Binary files /dev/null and b/Source/Plugins/NodesViewer/Resources/NodesView.png differ
diff --git a/Source/Plugins/NodesViewer/Seg.cs b/Source/Plugins/NodesViewer/Seg.cs
new file mode 100644
index 0000000..32fa063
--- /dev/null
+++ b/Source/Plugins/NodesViewer/Seg.cs
@@ -0,0 +1,17 @@
+#region === Copyright (c) 2010 Pascal van der Heiden ===
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Plugins.NodesViewer
+{
+	public struct Seg
+	{
+		public int startvertex;
+		public int endvertex;
+		public float angle;
+		public int lineindex;
+		public bool leftside;
+		public float offset;
+		public int ssector;
+	}
+}
diff --git a/Source/Plugins/NodesViewer/Split.cs b/Source/Plugins/NodesViewer/Split.cs
new file mode 100644
index 0000000..9cf0061
--- /dev/null
+++ b/Source/Plugins/NodesViewer/Split.cs
@@ -0,0 +1,21 @@
+#region === Copyright (c) 2010 Pascal van der Heiden ===
+
+using CodeImp.DoomBuilder.Geometry;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Plugins.NodesViewer
+{
+	public struct Split
+	{
+		public Vector2D pos;
+		public Vector2D delta;
+
+		// Constructor
+		public Split(Vector2D pos, Vector2D delta)
+		{
+			this.pos = pos;
+			this.delta = delta;
+		}
+	}
+}
diff --git a/Source/Plugins/NodesViewer/Subsector.cs b/Source/Plugins/NodesViewer/Subsector.cs
new file mode 100644
index 0000000..2e6d1e2
--- /dev/null
+++ b/Source/Plugins/NodesViewer/Subsector.cs
@@ -0,0 +1,18 @@
+#region === Copyright (c) 2010 Pascal van der Heiden ===
+
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Rendering;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Plugins.NodesViewer
+{
+	public struct Subsector
+	{
+		public int numsegs;
+		public int firstseg;
+
+		public Vector2D[] points;
+		public FlatVertex[] vertices;
+	}
+}
diff --git a/Source/Plugins/SoundPropagationMode/BufferedTreeView.cs b/Source/Plugins/SoundPropagationMode/BufferedTreeView.cs
new file mode 100644
index 0000000..4763de1
--- /dev/null
+++ b/Source/Plugins/SoundPropagationMode/BufferedTreeView.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Windows.Forms;
+using System.Runtime.InteropServices;
+
+// As per http://stackoverflow.com/questions/10362988/treeview-flickering
+// Gets rid of the flickering default TreeView
+
+namespace CodeImp.DoomBuilder.SoundPropagationMode
+{
+	public class BufferedTreeView : TreeView
+	{
+		protected override void OnHandleCreated(EventArgs e)
+		{
+			SendMessage(this.Handle, TVM_SETEXTENDEDSTYLE, (IntPtr)TVS_EX_DOUBLEBUFFER, (IntPtr)TVS_EX_DOUBLEBUFFER);
+			base.OnHandleCreated(e);
+		}
+		// Pinvoke:
+		private const int TVM_SETEXTENDEDSTYLE = 0x1100 + 44;
+		private const int TVM_GETEXTENDEDSTYLE = 0x1100 + 45;
+		private const int TVS_EX_DOUBLEBUFFER = 0x0004;
+		[DllImport("user32.dll")]
+		private static extern IntPtr SendMessage(IntPtr hWnd, int msg, IntPtr wp, IntPtr lp);
+	}
+}
\ No newline at end of file
diff --git a/Source/Plugins/SoundPropagationMode/BuilderPlug.cs b/Source/Plugins/SoundPropagationMode/BuilderPlug.cs
new file mode 100644
index 0000000..8279570
--- /dev/null
+++ b/Source/Plugins/SoundPropagationMode/BuilderPlug.cs
@@ -0,0 +1,490 @@
+
+#region ================== Copyright (c) 2014 Boris Iwanski
+
+/*
+ * Copyright (c) 2014 Boris Iwanski
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.Linq;
+using System.Runtime.InteropServices;
+using CodeImp.DoomBuilder.Editing;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Plugins;
+using CodeImp.DoomBuilder.Rendering;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.SoundPropagationMode
+{
+	//
+	// MANDATORY: The plug!
+	// This is an important class to the Doom Builder core. Every plugin must
+	// have exactly 1 class that inherits from Plug. When the plugin is loaded,
+	// this class is instantiated and used to receive events from the core.
+	// Make sure the class is public, because only public classes can be seen
+	// by the core.
+	//
+	public class BuilderPlug : Plug
+	{
+		#region ================== Constants
+
+		internal const int SOUND_ENVIROMNEMT_THING_TYPE = 9048; //mxd
+
+		#endregion
+
+		#region ================== Variables
+
+		// Interface
+		private MenusForm menusform;
+
+		// Colors
+		private PixelColor highlightcolor;
+		private PixelColor level1color;
+		private PixelColor level2color;
+		private PixelColor blocksoundcolor;
+		private PixelColor nosoundcolor;
+
+		private List<PixelColor> distinctcolors;
+		private List<Bitmap> distincticons; //mxd 
+		private List<SoundEnvironment> soundenvironments;
+		private List<Linedef> blockinglinedefs;
+		private FlatVertex[] overlayGeometry;
+		private bool soundenvironmentisupdated;
+		private bool dataisdirty;
+
+		#endregion
+
+		#region ================== Properties
+
+		// Interface
+		public MenusForm MenusForm { get { return menusform; } }
+		internal List<Bitmap> DistinctIcons { get { return distincticons; } } //mxd
+		internal List<PixelColor> DistinctColors { get { return distinctcolors; } } //mxd
+
+		// Colors
+		public PixelColor HighlightColor { get { return highlightcolor; } set { highlightcolor = value; } }
+		public PixelColor Level1Color { get { return level1color; } set { level1color = value; } }
+		public PixelColor Level2Color { get { return level2color; } set { level2color = value; } }
+		public PixelColor BlockSoundColor { get { return blocksoundcolor; } set { blocksoundcolor = value; } }
+		public PixelColor NoSoundColor { get { return nosoundcolor; } set { nosoundcolor = value; } }
+
+		public List<SoundEnvironment> SoundEnvironments { get { return soundenvironments; } set { soundenvironments = value; } }
+		public List<Linedef> BlockingLinedefs { get { return blockinglinedefs; } set { blockinglinedefs = value; } }
+		public FlatVertex[] OverlayGeometry { get { return overlayGeometry; } set { overlayGeometry = value; } }
+		public bool SoundEnvironmentIsUpdated { get { return soundenvironmentisupdated; } }
+		public bool DataIsDirty { get { return dataisdirty; } set { dataisdirty = value; } }
+
+		#endregion
+
+ 		// Static instance. We can't use a real static class, because BuilderPlug must
+		// be instantiated by the core, so we keep a static reference. (this technique
+		// should be familiar to object-oriented programmers)
+		private static BuilderPlug me;
+
+		// Static property to access the BuilderPlug
+		public static BuilderPlug Me { get { return me; } }
+
+      	// This plugin relies on some functionality that wasn't there in older versions
+		public override int MinimumRevision { get { return 2201; } }
+
+		// This event is called when the plugin is initialized
+		public override void OnInitialize()
+		{
+			base.OnInitialize();
+
+			highlightcolor = PixelColor.FromInt(General.Settings.ReadPluginSetting("highlightcolor", new PixelColor(255, 0, 192, 0).ToInt()));
+			level1color = PixelColor.FromInt(General.Settings.ReadPluginSetting("level1color", new PixelColor(255, 0, 255, 0).ToInt()));
+			level2color = PixelColor.FromInt(General.Settings.ReadPluginSetting("level2color", new PixelColor(255, 255, 255, 0).ToInt()));
+			nosoundcolor = PixelColor.FromInt(General.Settings.ReadPluginSetting("nosoundcolor", new PixelColor(255, 160, 160, 160).ToInt()));
+			blocksoundcolor = PixelColor.FromInt(General.Settings.ReadPluginSetting("blocksoundcolor", new PixelColor(255, 255, 0, 0).ToInt()));
+
+			distinctcolors = new List<PixelColor> 
+			{
+				PixelColor.FromInt(0x84d5a4),
+				PixelColor.FromInt(0xc059cb),
+				PixelColor.FromInt(0xd0533d),
+				PixelColor.FromInt(0x415354),
+				PixelColor.FromInt(0xcea953),
+				PixelColor.FromInt(0x91d44b),
+				PixelColor.FromInt(0xcd5b89),
+				PixelColor.FromInt(0xa8b6c0),
+				PixelColor.FromInt(0x797ecb),
+				PixelColor.FromInt(0x567539),
+				PixelColor.FromInt(0x72422f),
+				PixelColor.FromInt(0x5d3762),
+				PixelColor.FromInt(0xffed6f),
+				PixelColor.FromInt(0xccebc5),
+				PixelColor.FromInt(0xbc80bd),
+				PixelColor.FromInt(0xd9d9d9),
+				PixelColor.FromInt(0xfccde5),
+				PixelColor.FromInt(0x80b1d3),
+				PixelColor.FromInt(0xfdb462),
+				PixelColor.FromInt(0xb3de69),
+				PixelColor.FromInt(0xfb8072),
+				PixelColor.FromInt(0xbebada),
+				PixelColor.FromInt(0xffffb3),
+				PixelColor.FromInt(0x8dd3c7),
+			};
+
+			//mxd. Create coloured icons
+			distincticons = new List<Bitmap>(distinctcolors.Count);
+			foreach(PixelColor color in distinctcolors)
+			{
+				distincticons.Add(MakeTintedImage(Properties.Resources.Status0, color));
+			}
+
+			soundenvironments = new List<SoundEnvironment>();
+			blockinglinedefs = new List<Linedef>();
+			soundenvironmentisupdated = false;
+			dataisdirty = true;
+
+			// This binds the methods in this class that have the BeginAction
+			// and EndAction attributes with their actions. Without this, the
+			// attributes are useless. Note that in classes derived from EditMode
+			// this is not needed, because they are bound automatically when the
+			// editing mode is engaged.
+            General.Actions.BindMethods(this);
+
+			menusform = new MenusForm();
+
+  			// TODO: Add DB2 version check so that old DB2 versions won't crash
+			// General.ErrorLogger.Add(ErrorType.Error, "zomg!");
+
+			// Keep a static reference
+            me = this;
+		}
+
+		public override void OnMapOpenBegin()
+		{
+			base.OnMapOpenBegin();
+			ResetData();
+		}
+
+		public override void OnMapNewBegin()
+		{
+			base.OnMapNewBegin();
+			ResetData();
+		}
+
+		public override void OnMapSaveBegin(SavePurpose purpose)
+		{
+			base.OnMapSaveBegin(purpose);
+			soundenvironmentisupdated = false;
+		}
+
+		public override void OnEditEngage(EditMode oldmode, EditMode newmode)
+		{
+			base.OnEditEngage(oldmode, newmode);
+			ResetData();
+		}
+
+		// This is called when the plugin is terminated
+		public override void Dispose()
+		{
+			base.Dispose();
+
+			//mxd
+			foreach(Bitmap b in distincticons) b.Dispose();
+
+			// This must be called to remove bound methods for actions.
+            General.Actions.UnbindMethods(this);
+        }
+
+		// Resets all data. This will trigger both rediscovering sound environments and recalculating
+		// sound propagation domains
+		private void ResetData()
+		{
+			dataisdirty = true;
+			soundenvironmentisupdated = false;
+			soundenvironments = new List<SoundEnvironment>();
+			blockinglinedefs = new List<Linedef>();
+		}
+
+		public void UpdateSoundEnvironments(object sender, DoWorkEventArgs e)
+		{
+			List<Sector> sectorstocheck = new List<Sector>();
+			List<Sector> checkedsectors = new List<Sector>();
+			List<Sector> allsectors = new List<Sector>();
+			BackgroundWorker worker = sender as BackgroundWorker;
+			List<FlatVertex> vertsList = new List<FlatVertex>();
+			Dictionary<Thing, PixelColor> secolor = new Dictionary<Thing, PixelColor>();
+			Dictionary<Thing, int> senumber = new Dictionary<Thing, int>();
+
+			soundenvironments.Clear();
+			blockinglinedefs.Clear();
+			SoundEnvironmentMode.SoundEnvironmentPanel.BeginUpdate(); //mxd
+
+			// Keep track of all the sectors in the map. Sectors that belong to a sound environment
+			// will be removed from the list, so in the end only sectors that don't belong to any
+			// sound environment will be in this list
+			foreach(Sector s in General.Map.Map.Sectors) allsectors.Add(s);
+
+			List<Thing> soundenvironmenthings = GetSoundEnvironmentThings(General.Map.Map.Sectors.ToList());
+			int numthings = soundenvironmenthings.Count;
+
+			// Assign each thing a color and a number, so each sound environment will always have the same color
+			// and id, no matter in what order they are discovered
+			for(int i = 0; i < soundenvironmenthings.Count; i++)
+			{
+				secolor[soundenvironmenthings[i]] = distinctcolors[i % distinctcolors.Count];
+				senumber.Add(soundenvironmenthings[i], i + 1);
+			}
+
+			while(soundenvironmenthings.Count > 0 && !worker.CancellationPending)
+			{
+				// Sort things by distance to center of the screen, so that sound environments the user want to look at will (hopefully) be discovered first
+				Vector2D center = General.Map.Renderer2D.DisplayToMap(new Vector2D(General.Interface.Display.Width / 2f, General.Interface.Display.Height / 2f));
+				soundenvironmenthings = soundenvironmenthings.OrderBy(o => Math.Abs(Vector2D.Distance(center, o.Position))).ToList();
+
+				Thing thing = soundenvironmenthings[0];
+				if(thing.Sector == null) thing.DetermineSector();
+
+				// Ignore things that are outside the map
+				if(thing.Sector == null)
+				{
+					soundenvironmenthings.Remove(thing);
+					continue;
+				}
+
+				SoundEnvironment environment = new SoundEnvironment();
+
+				// Add initial sector. Additional adjacant sectors will be added later
+				// as they are discovered
+				sectorstocheck.Add(thing.Sector);
+
+				while(sectorstocheck.Count > 0)
+				{
+					Sector sector = sectorstocheck[0];
+
+					if(!environment.Sectors.Contains(sector)) environment.Sectors.Add(sector);
+					if(!checkedsectors.Contains(sector)) checkedsectors.Add(sector);
+
+					sectorstocheck.Remove(sector);
+					allsectors.Remove(sector);
+
+					// Find adjacant sectors and add them to the list of sectors to check if necessary
+					foreach(Sidedef sd in sector.Sidedefs)
+					{
+						if(LinedefBlocksSoundEnvironment(sd.Line))
+						{
+							if(!environment.Linedefs.Contains(sd.Line)) environment.Linedefs.Add(sd.Line);
+							continue;
+						}
+
+						if(sd.Line.Back == null) continue;
+
+						Sector oppositesector = (sd.Line.Front.Sector == sector ? sd.Line.Back.Sector : sd.Line.Front.Sector);
+
+						if(!sectorstocheck.Contains(oppositesector) && !checkedsectors.Contains(oppositesector))
+							sectorstocheck.Add(oppositesector);
+					}
+				}
+
+				// Get all things that are in the current sound environment...
+				environment.Things = GetSoundEnvironmentThings(environment.Sectors);
+
+				// ... and remove them from the list of sound environment things to check, because we know that
+				// they already belong to a sound environment
+				foreach(Thing t in environment.Things)
+				{
+					if(soundenvironmenthings.Contains(t)) soundenvironmenthings.Remove(t);
+				}
+
+				// Set color and id of the sound environment
+				environment.Color = secolor[environment.Things[0]];
+				environment.ID = senumber[environment.Things[0]];
+
+				// Create the data for the overlay geometry
+				foreach(Sector s in environment.Sectors)
+				{
+					FlatVertex[] fv = new FlatVertex[s.FlatVertices.Length];
+					s.FlatVertices.CopyTo(fv, 0);
+					for(int j = 0; j < fv.Length; j++) fv[j].c = environment.Color.WithAlpha(128).ToInt();
+
+					vertsList.AddRange(fv);
+
+					// Get all Linedefs that will block sound environments
+					foreach(Sidedef sd in s.Sidedefs)
+					{
+						if(LinedefBlocksSoundEnvironment(sd.Line))
+							lock (blockinglinedefs)
+							{
+								blockinglinedefs.Add(sd.Line);
+							}
+					}
+				}
+
+				// Update the overlay geometry with the newly added sectors
+				if(overlayGeometry == null)
+				{
+					overlayGeometry = vertsList.ToArray();
+				}
+				else
+				{
+					lock (overlayGeometry)
+					{
+						overlayGeometry = vertsList.ToArray();
+					}
+				}
+
+				environment.Things = environment.Things.OrderBy(o => o.Index).ToList();
+				environment.Linedefs = environment.Linedefs.OrderBy(o => o.Index).ToList();
+
+				//mxd. Find the first non-dormant thing
+				Thing activeenv = null;
+				foreach(Thing t in environment.Things) 
+				{
+					if(!ThingDormant(t)) 
+					{
+						activeenv = t;
+						break;
+					}
+				}
+
+				//mxd. Update environment name
+				if(activeenv != null) 
+				{
+					foreach(KeyValuePair<string, KeyValuePair<int, int>> group in General.Map.Data.Reverbs) 
+					{
+						if(group.Value.Key == activeenv.Args[0] && group.Value.Value == activeenv.Args[1]) 
+						{
+							environment.Name = group.Key + " (" + activeenv.Args[0] + " " + activeenv.Args[1] + ")";
+							break;
+						}
+					}
+
+					//mxd. No suitable name found?..
+					if(environment.Name == SoundEnvironment.DEFAULT_NAME)
+					{
+						environment.Name += " (" + activeenv.Args[0] + " " + activeenv.Args[1] + ")";
+					}
+				}
+
+				//mxd. Still no suitable name?..
+				if(environment.Name == SoundEnvironment.DEFAULT_NAME) environment.Name += " " + environment.ID;
+
+				lock (soundenvironments)
+				{
+					soundenvironments.Add(environment);
+				}
+
+				// Tell the worker that discovering a sound environment is finished. This will update the tree view, and also
+				// redraw the interface, so the sectors of this sound environment are colored
+				worker.ReportProgress((int)((1.0f - (soundenvironmenthings.Count / (float)numthings)) * 100), environment);
+			}
+
+			// Create overlay geometry for sectors that don't belong to a sound environment
+			foreach(Sector s in allsectors)
+			{
+				FlatVertex[] fv = new FlatVertex[s.FlatVertices.Length];
+				s.FlatVertices.CopyTo(fv, 0);
+				for(int j = 0; j < fv.Length; j++) fv[j].c = NoSoundColor.WithAlpha(128).ToInt();
+				vertsList.AddRange(fv);
+			}
+
+			if(overlayGeometry == null)
+			{
+				overlayGeometry = vertsList.ToArray();
+			}
+			else
+			{
+				lock (overlayGeometry)
+				{
+					overlayGeometry = vertsList.ToArray();
+				}
+			}
+
+			soundenvironmentisupdated = true;
+			SoundEnvironmentMode.SoundEnvironmentPanel.EndUpdate(); //mxd
+		}
+
+		private static List<Thing> GetSoundEnvironmentThings(List<Sector> sectors)
+		{
+			List<Thing> things = new List<Thing>();
+
+			foreach(Thing thing in General.Map.Map.Things)
+			{
+				// SoundEnvironment thing, see http://zdoom.org/wiki/Classes:SoundEnvironment
+				if(thing.Type != SOUND_ENVIROMNEMT_THING_TYPE) continue;
+				if(thing.Sector == null) thing.DetermineSector();
+				if(thing.Sector != null && sectors.Contains(thing.Sector)) things.Add(thing);
+			}
+
+			return things;
+		}
+
+		private static bool LinedefBlocksSoundEnvironment(Linedef linedef)
+		{
+			if(General.Map.UDMF) return linedef.IsFlagSet(SoundEnvironmentMode.ZoneBoundaryFlag); //mxd. Fancier this way :)
+			
+			// In Hexen format the line must have action 121 (Line_SetIdentification) and bit 1 of
+			// the second argument set (see http://zdoom.org/wiki/Line_SetIdentification)
+			return (linedef.Action == 121 && (linedef.Args[1] & 1) == 1); //mxd. Fancier this way :)
+		}
+
+		//mxd
+		internal static bool ThingDormant(Thing thing) 
+		{
+			return thing.IsFlagSet(General.Map.UDMF ? "dormant" : "14");
+		}
+
+		//mxd
+		internal static void SetThingDormant(Thing thing, bool dormant) 
+		{
+			thing.SetFlag(General.Map.UDMF ? "dormant" : "14", dormant);
+		}
+
+		//mxd. Based on http://www.getcodesamples.com/src/792A0BB0/6CD40E7B 
+		private static Bitmap MakeTintedImage(Bitmap source, PixelColor tint) 
+		{
+			BitmapData sourcedata = source.LockBits(new Rectangle(0, 0, source.Width, source.Height),
+									ImageLockMode.ReadOnly, PixelFormat.Format32bppArgb);
+
+			byte[] pixelBuffer = new byte[sourcedata.Stride * sourcedata.Height];
+			Marshal.Copy(sourcedata.Scan0, pixelBuffer, 0, pixelBuffer.Length);
+			source.UnlockBits(sourcedata);
+
+			//Translate tint color to 0.0-1.0 range
+			float redtint = tint.r / 256.0f;
+			float greentint = tint.g / 256.0f; 
+			float bluetint = tint.b / 256.0f;
+
+			for(int k = 0; k + 4 < pixelBuffer.Length; k += 4) 
+			{
+				float blue = 60 + pixelBuffer[k] * bluetint;
+				float green = 60 + pixelBuffer[k + 1] * greentint;
+				float red = 60 + pixelBuffer[k + 2] * redtint;
+
+				pixelBuffer[k] = (byte)Math.Min(255, blue);
+				pixelBuffer[k + 1] = (byte)Math.Min(255, green);
+				pixelBuffer[k + 2] = (byte)Math.Min(255, red);
+			}
+
+			Bitmap result = new Bitmap(source.Width, source.Height);
+			BitmapData resultdata = result.LockBits(new Rectangle(0, 0, result.Width, result.Height),
+									ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
+
+			Marshal.Copy(pixelBuffer, 0, resultdata.Scan0, pixelBuffer.Length);
+			result.UnlockBits(resultdata);
+
+			return result;
+		}
+	}
+}
diff --git a/Source/Plugins/SoundPropagationMode/Interface/SoundEnvironmentPanel.Designer.cs b/Source/Plugins/SoundPropagationMode/Interface/SoundEnvironmentPanel.Designer.cs
new file mode 100644
index 0000000..a06c554
--- /dev/null
+++ b/Source/Plugins/SoundPropagationMode/Interface/SoundEnvironmentPanel.Designer.cs
@@ -0,0 +1,81 @@
+namespace CodeImp.DoomBuilder.SoundPropagationMode
+{
+	partial class SoundEnvironmentPanel
+	{
+		/// <summary> 
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Component Designer generated code
+
+		/// <summary> 
+		/// Required method for Designer support - do not modify 
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.showwarningsonly = new System.Windows.Forms.CheckBox();
+			this.soundenvironments = new CodeImp.DoomBuilder.SoundPropagationMode.BufferedTreeView();
+			this.SuspendLayout();
+			// 
+			// showwarningsonly
+			// 
+			this.showwarningsonly.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.showwarningsonly.AutoSize = true;
+			this.showwarningsonly.Location = new System.Drawing.Point(3, 492);
+			this.showwarningsonly.Name = "showwarningsonly";
+			this.showwarningsonly.Size = new System.Drawing.Size(174, 17);
+			this.showwarningsonly.TabIndex = 1;
+			this.showwarningsonly.Text = "Show nodes with warnings only";
+			this.showwarningsonly.UseVisualStyleBackColor = true;
+			this.showwarningsonly.CheckedChanged += new System.EventHandler(this.showwarningsonly_CheckedChanged);
+			// 
+			// soundenvironments
+			// 
+			this.soundenvironments.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.soundenvironments.HideSelection = false;
+			this.soundenvironments.Location = new System.Drawing.Point(0, 0);
+			this.soundenvironments.Name = "soundenvironments";
+			this.soundenvironments.ShowNodeToolTips = true;
+			this.soundenvironments.Size = new System.Drawing.Size(214, 486);
+			this.soundenvironments.TabIndex = 0;
+			this.soundenvironments.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.soundenvironments_NodeMouseClick);
+			this.soundenvironments.BeforeSelect += new System.Windows.Forms.TreeViewCancelEventHandler(this.soundenvironments_BeforeSelect);
+			// 
+			// SoundEnvironmentPanel
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.Controls.Add(this.showwarningsonly);
+			this.Controls.Add(this.soundenvironments);
+			this.Name = "SoundEnvironmentPanel";
+			this.Size = new System.Drawing.Size(214, 512);
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private BufferedTreeView soundenvironments;
+		private System.Windows.Forms.CheckBox showwarningsonly;
+
+
+	}
+}
diff --git a/Source/Plugins/SoundPropagationMode/Interface/SoundEnvironmentPanel.cs b/Source/Plugins/SoundPropagationMode/Interface/SoundEnvironmentPanel.cs
new file mode 100644
index 0000000..f24a9be
--- /dev/null
+++ b/Source/Plugins/SoundPropagationMode/Interface/SoundEnvironmentPanel.cs
@@ -0,0 +1,328 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Editing;
+using CodeImp.DoomBuilder.Geometry;
+
+namespace CodeImp.DoomBuilder.SoundPropagationMode
+{
+	public partial class SoundEnvironmentPanel : UserControl
+	{
+		public event EventHandler OnShowWarningsOnlyChanged; //mxd
+		public BufferedTreeView SoundEnvironments { get { return soundenvironments; } set { soundenvironments = value; } }
+		private readonly int warningiconindex; //mxd
+		private bool treeisupdating; //mxd
+		private int nodewarningscount; //mxd
+		private const string shownodewarningstext = "Show nodes with warnings only (N)";
+		private delegate void UpdateCallback(); //mxd
+
+		public SoundEnvironmentPanel()
+		{
+			InitializeComponent();
+
+			soundenvironments.ImageList = new ImageList();
+			foreach(Bitmap icon in BuilderPlug.Me.DistinctIcons)
+			{
+				soundenvironments.ImageList.Images.Add(icon);
+			}
+			soundenvironments.ImageList.Images.Add(Properties.Resources.Warning);
+			warningiconindex = soundenvironments.ImageList.Images.Count - 1; //mxd
+		}
+
+		//mxd
+		public void BeginUpdate()
+		{
+			if(treeisupdating) return;
+
+			if(soundenvironments.InvokeRequired)
+			{
+				UpdateCallback d = BeginUpdate;
+				soundenvironments.Invoke(d);
+			}
+			else
+			{
+				soundenvironments.BeginUpdate();
+				nodewarningscount = 0;
+			}
+		}
+
+		//mxd
+		public void EndUpdate()
+		{
+			if(soundenvironments.InvokeRequired)
+			{
+				UpdateCallback d = EndUpdate;
+				soundenvironments.Invoke(d);
+			}
+			else
+			{
+				treeisupdating = false;
+				soundenvironments.Sort();
+				soundenvironments.EndUpdate();
+
+				// Update the checkbox
+				showwarningsonly.Text = shownodewarningstext.Replace("(N)", "(" + nodewarningscount + ")");
+				showwarningsonly.Enabled = (showwarningsonly.Checked || nodewarningscount > 0);
+			}
+		}
+
+		public void AddSoundEnvironment(SoundEnvironment se) 
+		{
+			TreeNode topnode = new TreeNode(se.Name);
+			topnode.Tag = se; //mxd
+			TreeNode thingsnode = new TreeNode("Things (" + se.Things.Count + ")");
+			TreeNode linedefsnode = new TreeNode("Linedefs (" + se.Linedefs.Count + ")");
+			int notdormant = 0;
+			int iconindex = BuilderPlug.Me.DistinctColors.IndexOf(se.Color); //mxd
+			int topindex = iconindex; //mxd
+			bool nodehaswarnings = false; //mxd
+
+			thingsnode.ImageIndex = iconindex; //mxd
+			thingsnode.SelectedImageIndex = iconindex; //mxd
+			linedefsnode.ImageIndex = iconindex; //mxd
+			linedefsnode.SelectedImageIndex = iconindex; //mxd
+
+			// Add things
+			foreach(Thing t in se.Things)
+			{
+				TreeNode thingnode = new TreeNode("Thing " + t.Index);
+				thingnode.Tag = t;
+				thingnode.ImageIndex = iconindex; //mxd
+				thingnode.SelectedImageIndex = iconindex; //mxd
+				thingsnode.Nodes.Add(thingnode);
+
+				if(!BuilderPlug.ThingDormant(t))
+				{
+					notdormant++;
+				}
+				else
+				{
+					thingnode.Text += " (dormant)";
+				}
+			}
+
+			// Set the icon to warning sign and add the tooltip when there are more than 1 non-dormant things
+			if(notdormant > 1)
+			{
+				thingsnode.ImageIndex = warningiconindex;
+				thingsnode.SelectedImageIndex = warningiconindex;
+				topindex = warningiconindex;
+
+				foreach(TreeNode tn in thingsnode.Nodes)
+				{
+					if(!BuilderPlug.ThingDormant((Thing)tn.Tag))
+					{
+						tn.ImageIndex = warningiconindex;
+						tn.SelectedImageIndex = warningiconindex;
+						tn.ToolTipText = "More than one thing in this\nsound environment is set to be\nactive. Set all but one thing\nto dormant.";
+						nodewarningscount++; //mxd
+						nodehaswarnings = true; //mxd
+					}
+				}
+			}
+
+			// Add linedefs
+			foreach(Linedef ld in se.Linedefs)
+			{
+				bool showwarning = false;
+				TreeNode linedefnode = new TreeNode("Linedef " + ld.Index);
+				linedefnode.Tag = ld;
+				linedefnode.ImageIndex = iconindex; //mxd
+				linedefnode.SelectedImageIndex = iconindex; //mxd
+
+				if(ld.Back == null)
+				{
+					showwarning = true;
+					linedefnode.ToolTipText = "This line is single-sided, but has\nthe sound boundary flag set.";
+				}
+				else if(se.Sectors.Contains(ld.Front.Sector) && se.Sectors.Contains(ld.Back.Sector))
+				{
+					showwarning = true;
+					linedefnode.ToolTipText = "More than one thing in this\nThe sectors on both sides of\nthe line belong to the same\nsound environment.";
+				}
+
+				if(showwarning)
+				{
+					linedefnode.ImageIndex = warningiconindex;
+					linedefnode.SelectedImageIndex = warningiconindex;
+
+					linedefsnode.ImageIndex = warningiconindex;
+					linedefsnode.SelectedImageIndex = warningiconindex;
+
+					topindex = warningiconindex;
+					nodewarningscount++; //mxd
+					nodehaswarnings = true; //mxd
+				}
+
+				linedefsnode.Nodes.Add(linedefnode);
+			}
+
+			//mxd
+			if(!showwarningsonly.Checked || nodehaswarnings)
+			{
+				topnode.Nodes.Add(thingsnode);
+				topnode.Nodes.Add(linedefsnode);
+
+				topnode.Tag = se;
+				topnode.ImageIndex = topindex;
+				topnode.SelectedImageIndex = topindex;
+
+				// Sound environments will no be added in consecutive order, so we'll have to find
+				// out where in the tree to add the node
+				int insertionplace = 0;
+
+				foreach(TreeNode tn in soundenvironments.Nodes)
+				{
+					if(se.ID < ((SoundEnvironment)tn.Tag).ID) break;
+					insertionplace++;
+				}
+
+				soundenvironments.Nodes.Insert(insertionplace, topnode);
+			}
+		}
+
+		public void HighlightSoundEnvironment(SoundEnvironment se)
+		{
+			if(soundenvironments.SelectedNode != null) return; //mxd
+			if(!treeisupdating) soundenvironments.BeginUpdate();
+			soundenvironments.CollapseAll(); //mxd
+
+			foreach(TreeNode tn in soundenvironments.Nodes)
+			{
+				if(se != null && ((SoundEnvironment)tn.Tag).ID == se.ID)
+				{
+					if(tn.NodeFont == null || tn.NodeFont.Style != FontStyle.Bold)
+						tn.NodeFont = new Font(soundenvironments.Font.FontFamily, soundenvironments.Font.Size, FontStyle.Bold);
+
+					//mxd
+					tn.Expand();
+					if(soundenvironments.SelectedNode == null) tn.EnsureVisible();
+				}
+				else
+				{
+					if(tn.NodeFont == null || tn.NodeFont.Style != FontStyle.Regular)
+						tn.NodeFont = new Font(soundenvironments.Font.FontFamily, soundenvironments.Font.Size);
+				}
+			}
+
+			if(!treeisupdating) soundenvironments.EndUpdate();
+		}
+
+		//mxd. This (de)selects sound environment
+		public void SelectSoundEnvironment(SoundEnvironment se)
+		{
+			if((se == null && soundenvironments.SelectedNode != null) || (se != null && soundenvironments.SelectedNode != null && soundenvironments.SelectedNode.Tag is SoundEnvironment && ((SoundEnvironment)soundenvironments.SelectedNode.Tag).ID == se.ID))
+			{
+				soundenvironments.SelectedNode = null;
+				return;
+			}
+
+			if(se == null) return;
+
+			foreach(TreeNode tn in soundenvironments.Nodes)
+			{
+				if(((SoundEnvironment)tn.Tag).ID == se.ID)
+				{
+					soundenvironments.SelectedNode = tn;
+					tn.EnsureVisible();
+					return;
+				}
+			}
+		}
+
+		private static bool IsClickOnText(TreeView treeView, TreeNode node, Point location)
+		{
+			var hitTest = treeView.HitTest(location);
+			return hitTest.Node == node	&& (hitTest.Location == TreeViewHitTestLocations.Label || hitTest.Location == TreeViewHitTestLocations.Image);
+		}
+
+		private static void ProcessNodeClick(TreeNode node)
+		{
+			if(node == null) return;
+
+			List<Vector2D> points = new List<Vector2D>();
+			RectangleF area = MapSet.CreateEmptyArea();
+
+			if(node.Parent == null)
+			{
+				if(node.Tag is SoundEnvironment)
+				{
+					SoundEnvironment se = (SoundEnvironment)node.Tag;
+
+					foreach(Sector s in se.Sectors)
+					{
+						foreach(Sidedef sd in s.Sidedefs)
+						{
+							points.Add(sd.Line.Start.Position);
+							points.Add(sd.Line.End.Position);
+						}
+					}
+				}
+				else
+				{
+					// Don't zoom if the wrong nodes are selected
+					return;
+				}
+			}
+			else
+			{
+				if(node.Tag is Thing)
+				{
+					Thing t = (Thing)node.Tag;
+
+					// We don't want to be zoomed too closely, so add somepadding
+					points.Add(t.Position - 200);
+					points.Add(t.Position + 200);
+				}
+				else if(node.Tag is Linedef)
+				{
+					Linedef ld = (Linedef)node.Tag;
+
+					points.Add(ld.Start.Position);
+					points.Add(ld.End.Position);
+				}
+				else
+				{
+					// Don't zoom if the wrong nodes are selected
+					return;
+				}
+			}
+
+			area = MapSet.IncreaseArea(area, points);
+
+			// Add padding
+			area.Inflate(100f, 100f);
+
+			// Zoom to area
+			ClassicMode editmode = (General.Editing.Mode as ClassicMode);
+			editmode.CenterOnArea(area, 0.0f);
+		}
+
+		#region ================== Events
+
+		private void soundenvironments_NodeMouseClick(object sender, TreeNodeMouseClickEventArgs e)
+		{
+			if(IsClickOnText(soundenvironments, e.Node, e.Location))
+			{
+				ProcessNodeClick(e.Node);
+			}
+		}
+
+		private void soundenvironments_BeforeSelect(object sender, TreeViewCancelEventArgs e)
+		{
+			if(e.Action != TreeViewAction.ByMouse) return;
+			var position = soundenvironments.PointToClient(Cursor.Position);
+			e.Cancel = !IsClickOnText(soundenvironments, e.Node, position);
+		}
+
+		//mxd
+		private void showwarningsonly_CheckedChanged(object sender, EventArgs e)
+		{
+			if(OnShowWarningsOnlyChanged != null) OnShowWarningsOnlyChanged(this, EventArgs.Empty);
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/SoundPropagationMode/Interface/SoundEnvironmentPanel.resx b/Source/Plugins/SoundPropagationMode/Interface/SoundEnvironmentPanel.resx
new file mode 100644
index 0000000..19dc0dd
--- /dev/null
+++ b/Source/Plugins/SoundPropagationMode/Interface/SoundEnvironmentPanel.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/SoundPropagationMode/Properties/AssemblyInfo.cs b/Source/Plugins/SoundPropagationMode/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..e1affcb
--- /dev/null
+++ b/Source/Plugins/SoundPropagationMode/Properties/AssemblyInfo.cs
@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// Allgemeine Informationen über eine Assembly werden über die folgenden 
+// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
+// die mit einer Assembly verknüpft sind.
+[assembly: AssemblyTitle("SoundPropagationMode")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("SoundPropagationMode")]
+[assembly: AssemblyCopyright("Copyright ©  2015")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Durch Festlegen von ComVisible auf "false" werden die Typen in dieser Assembly unsichtbar 
+// für COM-Komponenten. Wenn Sie auf einen Typ in dieser Assembly von 
+// COM zugreifen müssen, legen Sie das ComVisible-Attribut für diesen Typ auf "true" fest.
+[assembly: ComVisible(false)]
+
+// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird
+[assembly: Guid("626ea88b-7e0f-4486-acca-32027c4133de")]
+
+// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
+//
+//      Hauptversion
+//      Nebenversion 
+//      Buildnummer
+//      Revision
+//
+// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
+// übernehmen, indem Sie "*" eingeben:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("0.1.0.0")]
diff --git a/Source/Plugins/SoundPropagationMode/Properties/Resources.Designer.cs b/Source/Plugins/SoundPropagationMode/Properties/Resources.Designer.cs
new file mode 100644
index 0000000..ad21661
--- /dev/null
+++ b/Source/Plugins/SoundPropagationMode/Properties/Resources.Designer.cs
@@ -0,0 +1,93 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:4.0.30319.42000
+//
+//     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace CodeImp.DoomBuilder.SoundPropagationMode.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
+    /// </summary>
+    // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
+    // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
+    // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
+    // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("CodeImp.DoomBuilder.SoundPropagationMode.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
+        ///   Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ColorManagement {
+            get {
+                object obj = ResourceManager.GetObject("ColorManagement", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Status0 {
+            get {
+                object obj = ResourceManager.GetObject("Status0", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Warning {
+            get {
+                object obj = ResourceManager.GetObject("Warning", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+    }
+}
diff --git a/Source/Plugins/SoundPropagationMode/Properties/Resources.resx b/Source/Plugins/SoundPropagationMode/Properties/Resources.resx
new file mode 100644
index 0000000..3fd1044
--- /dev/null
+++ b/Source/Plugins/SoundPropagationMode/Properties/Resources.resx
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="ColorManagement" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ColorManagement.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Status0" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Status0.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Warning" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Warning.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/SoundPropagationMode/Resources/Actions.cfg b/Source/Plugins/SoundPropagationMode/Resources/Actions.cfg
new file mode 100644
index 0000000..15d1845
--- /dev/null
+++ b/Source/Plugins/SoundPropagationMode/Resources/Actions.cfg
@@ -0,0 +1,56 @@
+//
+// This file defines which actions there are, what description they have and
+// some behaviour options. The Doom Builder core will bind to these actions
+// with delegates (function pointers) where you use the BeginAction and
+// EndAction attributes. This file must be named Actions.cfg and must be
+// included in the plugin project as "Embedded Resource".
+//
+
+//
+// Options:
+//
+// allowkeys:       Allows the user to bind standard keys to this action.
+// allowmouse:      Allows the user to bind mouse buttons to this action.
+// allowscroll:     Allows the user to bind the scrollwheel to this action.
+// disregardshift:  This action will trigger regardless if Shift or Control is used.
+// repeat:          BeginAction will be called for automatic key repetition.
+// default:         Default key is only used when the action is loaded for the first
+//                  time and the default key is not used by any other action.
+//
+// allowkeys and allowmouse are true by default, the others are false by default.
+//
+
+soundpropagationmode
+{
+	title = "Sound propagation mode";
+	category = "modes";
+	description = "Shows how sound propagates through the map";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+soundenvironmentmode
+{
+	title = "Sound environment mode";
+	category = "modes";
+	description = "Shows ZDoom sound environments";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+categories
+{
+	soundpropagationmode = "Sound propagation mode";
+}
+
+soundpropagationcolorconfiguration
+{
+	title = "Configure colors";
+	category = "soundpropagationmode";
+	description = "Configure colors for sound propagation mode";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
diff --git a/Source/Plugins/SoundPropagationMode/Resources/ColorManagement.png b/Source/Plugins/SoundPropagationMode/Resources/ColorManagement.png
new file mode 100644
index 0000000..f876090
Binary files /dev/null and b/Source/Plugins/SoundPropagationMode/Resources/ColorManagement.png differ
diff --git a/Source/Plugins/SoundPropagationMode/Resources/Icon Info.txt b/Source/Plugins/SoundPropagationMode/Resources/Icon Info.txt
new file mode 100644
index 0000000..94a7a8e
--- /dev/null
+++ b/Source/Plugins/SoundPropagationMode/Resources/Icon Info.txt	
@@ -0,0 +1,2 @@
+The ear and color management icons used were made by FatCow (http://www.fatcow.com/). The license for
+the icons is CC BY 3.0 US (http://creativecommons.org/licenses/by/3.0/us/)
\ No newline at end of file
diff --git a/Source/Plugins/SoundPropagationMode/Resources/SoundPropagationIcon.png b/Source/Plugins/SoundPropagationMode/Resources/SoundPropagationIcon.png
new file mode 100644
index 0000000..499c51a
Binary files /dev/null and b/Source/Plugins/SoundPropagationMode/Resources/SoundPropagationIcon.png differ
diff --git a/Source/Plugins/SoundPropagationMode/Resources/Status0.png b/Source/Plugins/SoundPropagationMode/Resources/Status0.png
new file mode 100644
index 0000000..e158cf6
Binary files /dev/null and b/Source/Plugins/SoundPropagationMode/Resources/Status0.png differ
diff --git a/Source/Plugins/SoundPropagationMode/Resources/Warning.png b/Source/Plugins/SoundPropagationMode/Resources/Warning.png
new file mode 100644
index 0000000..083b8cb
Binary files /dev/null and b/Source/Plugins/SoundPropagationMode/Resources/Warning.png differ
diff --git a/Source/Plugins/SoundPropagationMode/Resources/ZDoomSoundEnvironment.png b/Source/Plugins/SoundPropagationMode/Resources/ZDoomSoundEnvironment.png
new file mode 100644
index 0000000..ce19a1c
Binary files /dev/null and b/Source/Plugins/SoundPropagationMode/Resources/ZDoomSoundEnvironment.png differ
diff --git a/Source/Plugins/SoundPropagationMode/SoundEnvironment.cs b/Source/Plugins/SoundPropagationMode/SoundEnvironment.cs
new file mode 100644
index 0000000..8dbe4d9
--- /dev/null
+++ b/Source/Plugins/SoundPropagationMode/SoundEnvironment.cs
@@ -0,0 +1,40 @@
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.SoundPropagationMode
+{
+	public class SoundEnvironment
+	{
+		#region ================== Constants
+
+		public const string DEFAULT_NAME = "Unknown sound environment"; //mxd
+
+		#endregion
+
+		#region ================== Properties
+
+		public List<Sector> Sectors { get; private set; }
+		public List<Thing> Things { get; set; }
+		public List<Linedef> Linedefs { get; set; }
+		public PixelColor Color { get; set; }
+		public int ID { get; set; }
+		public string Name { get; set; } //mxd
+
+		#endregion
+
+		public SoundEnvironment()
+		{
+			Sectors = new List<Sector>();
+			Things = new List<Thing>();
+			Linedefs = new List<Linedef>();
+			Color = General.Colors.Background;
+			ID = -1;
+			Name = DEFAULT_NAME; //mxd
+		}
+	}
+}
diff --git a/Source/Plugins/SoundPropagationMode/SoundEnvironmentMode.cs b/Source/Plugins/SoundPropagationMode/SoundEnvironmentMode.cs
new file mode 100644
index 0000000..48e7aff
--- /dev/null
+++ b/Source/Plugins/SoundPropagationMode/SoundEnvironmentMode.cs
@@ -0,0 +1,582 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden, 2014 Boris Iwanski
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * Copyright (c) 2014 Boris Iwanski
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Windows.Forms;
+using System.ComponentModel;
+using CodeImp.DoomBuilder.Actions;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Windows;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Editing;
+using CodeImp.DoomBuilder.Controls;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.SoundPropagationMode
+{
+	[EditMode(DisplayName = "Sound Environment Mode",
+			  SwitchAction = "soundenvironmentmode",		// Action name used to switch to this mode
+			  ButtonImage = "ZDoomSoundEnvironment.png",	// Image resource name for the button
+			  ButtonOrder = int.MinValue + 502,	// Position of the button (lower is more to the left)
+			  ButtonGroup = "000_editing",
+			  UseByDefault = true,
+			  SafeStartMode = false,
+			  Volatile = false)]
+
+	public class SoundEnvironmentMode : ClassicMode
+	{
+		#region ================== Variables
+
+		// Highlighted item
+		private Sector highlighted;
+		private SoundEnvironment highlightedsoundenvironment;
+		private Linedef highlightedline; //mxd
+		private Thing highlightedthing; //mxd
+
+		// Interface
+		private static SoundEnvironmentPanel panel;
+		private Docker docker;
+
+		private BackgroundWorker worker;
+
+		#endregion
+
+		#region ================== Properties
+
+		public override object HighlightedObject { get { return highlighted; } }
+		internal const string ZoneBoundaryFlag = "zoneboundary"; //mxd
+		internal static SoundEnvironmentPanel SoundEnvironmentPanel { get { return panel; } } //mxd
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Disposer
+		public override void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Dispose base
+				base.Dispose();
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This highlights a new item
+		private void Highlight(Sector s)
+		{
+			// Set new highlight
+			highlighted = s;
+			highlightedsoundenvironment = null;
+
+			if(highlighted != null)
+			{
+				foreach(SoundEnvironment se in BuilderPlug.Me.SoundEnvironments)
+				{
+					if(se.Sectors.Contains(highlighted))
+					{
+						highlightedsoundenvironment = se;
+						break;
+					}
+				}
+			}
+
+			panel.HighlightSoundEnvironment(highlightedsoundenvironment);
+
+			// Show highlight info
+			if((highlighted != null) && !highlighted.IsDisposed)
+				General.Interface.ShowSectorInfo(highlighted);
+			else
+				General.Interface.HideInfo();
+		}
+
+		private void UpdateData() 
+		{
+			BuilderPlug.Me.DataIsDirty = false;
+
+			panel.SoundEnvironments.Nodes.Clear();
+
+			// Only update if map has changed or the sound environments were never updated at all (i.e. first time engaging this mode)
+			if((General.Map.IsChanged || !BuilderPlug.Me.SoundEnvironmentIsUpdated) && !worker.IsBusy) 
+			{
+				General.Interface.DisplayStatus(StatusType.Busy, "Updating sound environments");
+				worker.RunWorkerAsync();
+			} 
+			else if(!worker.IsBusy) 
+			{
+				panel.BeginUpdate(); //mxd
+				
+				foreach(SoundEnvironment se in BuilderPlug.Me.SoundEnvironments)
+					panel.AddSoundEnvironment(se);
+
+				panel.EndUpdate(); //mxd
+			}
+		}
+
+		#endregion
+
+		#region ================== Events
+
+		public override void OnHelp()
+		{
+			General.ShowHelp("gzdb/features/classic_modes/mode_soundenvironment.html");
+		}
+
+		// Cancel mode
+		public override void OnCancel()
+		{
+			base.OnCancel();
+
+			// Return to this mode
+			General.Editing.ChangeMode(new SoundEnvironmentMode());
+		}
+
+		// Mode engages
+		public override void OnEngage()
+		{
+			base.OnEngage();
+
+			General.Interface.AddButton(BuilderPlug.Me.MenusForm.ColorConfiguration);
+
+			panel = new SoundEnvironmentPanel();
+			panel.OnShowWarningsOnlyChanged += PanelOnOnShowWarningsOnlyChanged;
+			docker = new Docker("soundenvironments", "Sound Environments", panel);
+			General.Interface.AddDocker(docker);
+			General.Interface.SelectDocker(docker);
+
+			worker = new BackgroundWorker();
+			worker.WorkerReportsProgress = true;
+			worker.WorkerSupportsCancellation = true;
+
+			worker.DoWork += BuilderPlug.Me.UpdateSoundEnvironments;
+			worker.ProgressChanged += worker_ProgressChanged;
+			worker.RunWorkerCompleted += worker_RunWorkerCompleted;
+
+			UpdateData();
+
+			CustomPresentation presentation = new CustomPresentation();
+			presentation.AddLayer(new PresentLayer(RendererLayer.Background, BlendingMode.Mask, General.Settings.BackgroundAlpha));
+			presentation.AddLayer(new PresentLayer(RendererLayer.Grid, BlendingMode.Mask));
+			presentation.AddLayer(new PresentLayer(RendererLayer.Overlay, BlendingMode.Alpha, 1f, true));
+			presentation.AddLayer(new PresentLayer(RendererLayer.Things, BlendingMode.Alpha, 1.0f));
+			presentation.AddLayer(new PresentLayer(RendererLayer.Geometry, BlendingMode.Alpha, 1f, true));
+			renderer.SetPresentation(presentation);
+		}
+
+		//mxd. If a linedef is highlighted, toggle the sound blocking flag, if a sound environment is clicked, select it in the tree view
+		protected override void OnSelectEnd() 
+		{
+			if(!General.Map.UDMF) return;
+			if(highlightedline != null)
+			{
+				// Make undo
+				General.Map.UndoRedo.CreateUndo("Toggle Sound Zone Boundary");
+
+				// Toggle flag
+				highlightedline.SetFlag(ZoneBoundaryFlag, !highlightedline.IsFlagSet(ZoneBoundaryFlag));
+
+				// Update
+				UpdateData();
+				General.Interface.RedrawDisplay();
+			}
+			else //mxd
+			{
+				panel.SelectSoundEnvironment(highlightedsoundenvironment);
+			}
+		}
+
+		//mxd. Show Reverb selector dialog or add a new sound environment thing
+		protected override void OnEditEnd()
+		{
+			if(highlightedthing != null)
+			{
+				ReverbsPickerForm form = new ReverbsPickerForm(highlightedthing);
+				if(form.ShowDialog((Form) General.Interface) == DialogResult.OK)
+				{
+					// Make undo
+					General.Map.UndoRedo.CreateUndo("Change Sound Environment Settings");
+
+					// Apply changes
+					form.ApplyTo(highlightedthing);
+
+					// Update
+					UpdateData();
+					General.Interface.RedrawDisplay();
+				}
+			}
+			else
+			{
+				InsertThing();
+			}
+		}
+
+		private void worker_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
+		{
+			panel.HighlightSoundEnvironment(highlightedsoundenvironment); //mxd. Expand highlighted node in the treeview
+			General.Interface.DisplayStatus(StatusType.Ready, "Finished updating sound environments");
+		}
+
+		private void worker_ProgressChanged(object sender, ProgressChangedEventArgs e)
+		{
+			SoundEnvironment se = e.UserState as SoundEnvironment;
+			General.Interface.DisplayStatus(StatusType.Busy, "Updating sound environments (" + e.ProgressPercentage + "%)");
+			panel.AddSoundEnvironment(se);
+			General.Interface.RedrawDisplay();
+		}
+
+		// Mode disengages
+		public override void OnDisengage()
+		{
+			base.OnDisengage();
+
+			worker.CancelAsync();
+			General.Interface.RemoveButton(BuilderPlug.Me.MenusForm.ColorConfiguration);
+			General.Interface.RemoveDocker(docker);
+
+			// Hide highlight info
+			General.Interface.HideInfo();
+		}
+
+		// This redraws the display
+		public override void OnRedrawDisplay()
+		{
+			if(BuilderPlug.Me.DataIsDirty) UpdateData();
+
+			// Render lines and vertices
+			if(renderer.StartPlotter(true))
+			{
+				// Plot lines by hand, so that no coloring (line specials, 3D floors etc.) distracts from
+				// the sound environments. Also don't draw the line's normal. They are not needed here anyway
+				// and can make it harder to see the sound environment colors
+				foreach(Linedef ld in General.Map.Map.Linedefs)
+				{
+					PixelColor c;
+					
+					if(ld.IsFlagSet(General.Map.Config.ImpassableFlag))
+						c = General.Colors.Linedefs;
+					else
+						c = General.Colors.Linedefs.WithAlpha(General.Settings.DoubleSidedAlphaByte);
+
+					renderer.PlotLine(ld.Start.Position, ld.End.Position, c);
+				}
+
+				// Since there will usually be way less blocking linedefs than total linedefs, it's presumably
+				// faster to draw them on their own instead of checking if each linedef is in BlockingLinedefs
+				lock (BuilderPlug.Me.BlockingLinedefs)
+				{
+					foreach(Linedef ld in BuilderPlug.Me.BlockingLinedefs)
+					{
+						renderer.PlotLine(ld.Start.Position, ld.End.Position, BuilderPlug.Me.BlockSoundColor);
+					}
+				}
+
+				//mxd. Render highlighted line
+				if(highlightedline != null) 
+				{
+					renderer.PlotLine(highlightedline.Start.Position, highlightedline.End.Position, General.Colors.Highlight);
+				}
+
+				renderer.PlotVerticesSet(General.Map.Map.Vertices);
+				renderer.Finish();
+			}
+
+			// Render things
+			if(renderer.StartThings(true))
+			{
+				renderer.RenderThingSet(General.Map.ThingsFilter.HiddenThings, Presentation.THINGS_BACK_ALPHA);
+				renderer.RenderThingSet(General.Map.ThingsFilter.VisibleThings, Presentation.THINGS_HIDDEN_ALPHA);
+
+				lock (BuilderPlug.Me.SoundEnvironments)
+				{
+					foreach(SoundEnvironment se in BuilderPlug.Me.SoundEnvironments)
+					{
+						if(se.Things.Count > 0) renderer.RenderThingSet(se.Things, Presentation.THINGS_ALPHA);
+					}
+				}
+
+				//mxd. Render highlighted thing
+				if(highlightedthing != null) renderer.RenderThing(highlightedthing, General.Colors.Selection, Presentation.THINGS_ALPHA);
+
+				renderer.Finish();
+			}
+
+			// Render overlay geometry (sectors)
+			if(BuilderPlug.Me.OverlayGeometry != null)
+			{
+				lock (BuilderPlug.Me.OverlayGeometry)
+				{
+					if(BuilderPlug.Me.OverlayGeometry.Length > 0 && renderer.StartOverlay(true))
+					{
+						renderer.RenderGeometry(BuilderPlug.Me.OverlayGeometry, General.Map.Data.WhiteTexture, true);
+						renderer.Finish();
+					}
+				}
+			}
+
+			renderer.Present();
+		}
+
+		// Mouse moves
+		public override void OnMouseMove(MouseEventArgs e)
+		{
+			base.OnMouseMove(e);
+
+			// Not holding any buttons?
+			if(e.Button == MouseButtons.None)
+			{
+				General.Interface.SetCursor(Cursors.Default);
+
+				// Find the nearest linedef within highlight range
+				Linedef l = General.Map.Map.NearestLinedef(mousemappos);
+				if(l != null)
+				{
+					// Check on which side of the linedef the mouse is
+					float side = l.SideOfLine(mousemappos);
+					if(side > 0)
+					{
+						// Is there a sidedef here?
+						if(l.Back != null)
+						{
+							// Highlight if not the same
+							if(l.Back.Sector != highlighted) Highlight(l.Back.Sector);
+						}
+						else
+						{
+							// Highlight nothing
+							Highlight(null);
+						}
+					}
+					else
+					{
+						// Is there a sidedef here?
+						if(l.Front != null)
+						{
+							// Highlight if not the same
+							if(l.Front.Sector != highlighted) Highlight(l.Front.Sector);
+						}
+						else
+						{
+							// Highlight nothing
+							Highlight(null);
+						}
+					}
+				}
+				else
+				{
+					// Highlight nothing
+					Highlight(null);
+				}
+
+				//mxd. Find the nearest linedef within default highlight range
+				l = General.Map.Map.NearestLinedefRange(mousemappos, 20 / renderer.Scale);
+				//mxd. We are not interested in single-sided lines, unless they have zoneboundary flag...
+				if(l != null && ((l.Front == null || l.Back == null) && (General.Map.UDMF && !l.IsFlagSet(ZoneBoundaryFlag))))
+				{
+					l = null;
+				}
+
+				//mxd. Set as highlighted
+				bool redrawrequired = false;
+				if(highlightedline != l) 
+				{
+					highlightedline = l;
+					redrawrequired = true;
+				}
+
+				//mxd. Find the nearest thing within default highlight range
+				if(highlightedline == null && highlightedsoundenvironment != null)
+				{
+					Thing t = MapSet.NearestThingSquareRange(highlightedsoundenvironment.Things, mousemappos, 10 / renderer.Scale);
+					if(highlightedthing != t)
+					{
+						highlightedthing = t;
+						redrawrequired = true;
+					}
+				} 
+				else if(highlightedthing != null)
+				{
+					highlightedthing = null;
+					redrawrequired = true;
+				}
+
+				//mxd. Redraw display?
+				if(redrawrequired) General.Interface.RedrawDisplay();
+			}
+		}
+
+		// Mouse leaves
+		public override void OnMouseLeave(EventArgs e)
+		{
+			base.OnMouseLeave(e);
+
+			// Highlight nothing
+			Highlight(null);
+		}
+
+		//mxd
+		private void PanelOnOnShowWarningsOnlyChanged(object sender, EventArgs eventArgs)
+		{
+			UpdateData();
+		}
+
+		#endregion
+
+		#region ================== Actions
+
+		[BeginAction("soundpropagationcolorconfiguration")]
+		public void ConfigureColors() 
+		{
+			ColorConfiguration cc = new ColorConfiguration();
+			if(cc.ShowDialog((Form)General.Interface) == DialogResult.OK)
+			{
+				General.Interface.RedrawDisplay();
+			}
+		}
+
+		// This creates a new thing at the mouse position
+		[BeginAction("insertitem", BaseAction = true)]
+		public virtual void InsertThing() 
+		{
+			// Mouse in window?
+			if(mouseinside) 
+			{
+				// Insert new thing
+				General.Map.UndoRedo.CreateUndo("Insert sound environment thing");
+				Thing t = InsertThing(mousemappos);
+
+				if(t == null) 
+				{
+					General.Map.UndoRedo.WithdrawUndo();
+					return;
+				}
+
+				// Add to current sound environment
+				if(highlightedsoundenvironment != null) 
+				{
+					lock(highlightedsoundenvironment) 
+					{
+						highlightedsoundenvironment.Things.Add(t);
+					}
+				}
+
+				// Edit the thing
+				highlightedthing = t;
+				General.Interface.RedrawDisplay(); // Redraw screen
+				OnEditEnd();
+
+				General.Interface.DisplayStatus(StatusType.Action, "Inserted a new sound environment thing.");
+
+				// Update things filter
+				General.Map.ThingsFilter.Update();
+
+				// Update sound environments
+				UpdateData();
+
+				// Redraw screen again
+				General.Interface.RedrawDisplay();
+			}
+		}
+
+		// This creates a new thing
+		private static Thing InsertThing(Vector2D pos) 
+		{
+			if(pos.x < General.Map.Config.LeftBoundary || pos.x > General.Map.Config.RightBoundary ||
+				pos.y > General.Map.Config.TopBoundary || pos.y < General.Map.Config.BottomBoundary) 
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, "Failed to insert thing: outside of map boundaries.");
+				return null;
+			}
+
+			// Create thing
+			Thing t = General.Map.Map.CreateThing();
+			if(t != null) 
+			{
+				General.Settings.ApplyDefaultThingSettings(t);
+				t.Type = BuilderPlug.SOUND_ENVIROMNEMT_THING_TYPE;
+				t.Move(pos);
+				t.UpdateConfiguration();
+
+				// Update things filter so that it includes this thing
+				General.Map.ThingsFilter.Update();
+
+				// Snap to grid enabled?
+				if(General.Interface.SnapToGrid) 
+				{
+					// Snap to grid
+					t.SnapToGrid();
+				} 
+				else 
+				{
+					// Snap to map format accuracy
+					t.SnapToAccuracy();
+				}
+			}
+
+			return t;
+		}
+
+		[BeginAction("deleteitem", BaseAction = true)]
+		public void DeleteItem() 
+		{
+			// Anything to do?
+			if(highlightedthing == null) return;
+
+			// Make undo
+			General.Map.UndoRedo.CreateUndo("Delete sound environment thing");
+			General.Interface.DisplayStatus(StatusType.Action, "Deleted a sound environment thing.");
+
+			// Remove from current sound environment
+			if(highlightedsoundenvironment != null && highlightedsoundenvironment.Things.Contains(highlightedthing))
+			{
+				lock(highlightedsoundenvironment)
+				{
+					highlightedsoundenvironment.Things.Remove(highlightedthing);
+				}
+			}
+
+			// Dispose highlighted thing
+			General.Map.Map.BeginAddRemove();
+			highlightedthing.Dispose();
+			highlightedthing = null;
+			General.Map.Map.EndAddRemove();
+
+			// Update cache values
+			General.Map.IsChanged = true;
+			General.Map.ThingsFilter.Update();
+
+			// Invoke a new mousemove so that the highlighted item updates
+			MouseEventArgs e = new MouseEventArgs(MouseButtons.None, 0, (int)mousepos.x, (int)mousepos.y, 0);
+			OnMouseMove(e);
+
+			// Update sound environments
+			UpdateData();
+
+			// Redraw screen
+			General.Interface.RedrawDisplay();
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/SoundPropagationMode/SoundPropagation.csproj b/Source/Plugins/SoundPropagationMode/SoundPropagation.csproj
new file mode 100644
index 0000000..6790b32
--- /dev/null
+++ b/Source/Plugins/SoundPropagationMode/SoundPropagation.csproj
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{F59B344C-DD50-4DB7-ADDD-56AAD66450AF}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>CodeImp.DoomBuilder.SoundPropagationMode</RootNamespace>
+    <AssemblyName>SoundPropagationMode</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\..\..\Build\Plugins\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <OutputPath>..\..\..\Build\Plugins\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug + Profiler|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\..\..\Build\Plugins\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;PROFILE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release + Profiler|x86' ">
+    <OutputPath>..\..\..\Build\Plugins\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="BufferedTreeView.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="BuilderPlug.cs" />
+    <Compile Include="Interface\SoundEnvironmentPanel.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Interface\SoundEnvironmentPanel.Designer.cs">
+      <DependentUpon>SoundEnvironmentPanel.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="SoundEnvironment.cs" />
+    <Compile Include="SoundEnvironmentMode.cs" />
+    <Compile Include="SoundPropagationDomain.cs" />
+    <Compile Include="Windows\ColorConfiguration.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Windows\ColorConfiguration.designer.cs">
+      <DependentUpon>ColorConfiguration.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Windows\MenusForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Windows\MenusForm.designer.cs">
+      <DependentUpon>MenusForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SoundPropagationMode.cs" />
+    <Compile Include="Windows\ReverbsPickerForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Windows\ReverbsPickerForm.Designer.cs">
+      <DependentUpon>ReverbsPickerForm.cs</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Core\Builder.csproj">
+      <Project>{818B3D10-F791-4C3F-9AF5-BB2D0079B63C}</Project>
+      <Name>Builder</Name>
+      <Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\Actions.cfg" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Resources\ColorManagement.png" />
+    <EmbeddedResource Include="Windows\ColorConfiguration.resx">
+      <DependentUpon>ColorConfiguration.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Windows\MenusForm.resx">
+      <DependentUpon>MenusForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Resources\SoundPropagationIcon.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Interface\SoundEnvironmentPanel.resx">
+      <DependentUpon>SoundEnvironmentPanel.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Resources\ZDoomSoundEnvironment.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\Warning.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\Status0.png" />
+    <EmbeddedResource Include="Windows\ReverbsPickerForm.resx">
+      <DependentUpon>ReverbsPickerForm.cs</DependentUpon>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/Source/Plugins/SoundPropagationMode/SoundPropagationDomain.cs b/Source/Plugins/SoundPropagationMode/SoundPropagationDomain.cs
new file mode 100644
index 0000000..54ef2f9
--- /dev/null
+++ b/Source/Plugins/SoundPropagationMode/SoundPropagationDomain.cs
@@ -0,0 +1,127 @@
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.SoundPropagationMode
+{
+	public class SoundPropagationDomain
+	{
+		#region ================== Variables
+
+		private List<Sector> sectors;
+		private List<Sector> adjacentsectors;
+		private List<Linedef> blockinglines;
+		private FlatVertex[] level1geometry;
+		private FlatVertex[] level2geometry;
+
+		#endregion
+
+		#region ================== Properties
+
+		public List<Sector> Sectors { get { return sectors; } }
+		public List<Sector> AdjacentSectors { get { return adjacentsectors; } }
+		public List<Linedef> BlockingLines { get { return blockinglines; } }
+		public FlatVertex[] Level1Geometry { get { return level1geometry; } }
+		public FlatVertex[] Level2Geometry { get { return level2geometry; } }
+
+		#endregion
+
+		#region ================== Constructor
+
+		public SoundPropagationDomain(Sector sector)
+		{
+			sectors = new List<Sector>();
+			adjacentsectors = new List<Sector>();
+			blockinglines = new List<Linedef>();
+
+			CreateSoundPropagationDomain(sector);
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		private void CreateSoundPropagationDomain(Sector sourcesector)
+		{
+			List<Sector> sectorstocheck = new List<Sector> { sourcesector };
+
+			while(sectorstocheck.Count > 0)
+			{
+				// Make sure to first check all sectors that are not behind a sound blocking line
+				Sector sector = sectorstocheck[0];
+
+				foreach(Sidedef sd in sector.Sidedefs)
+				{
+					bool blocksound = sd.Line.IsFlagSet(SoundPropagationMode.BlockSoundFlag);
+					if(blocksound) blockinglines.Add(sd.Line);
+
+					// If the line is one sided, the sound can travel nowhere, so try the next one
+					if(sd.Line.Back == null || blocksound) continue;
+	
+					// Get the sector on the other side of the line we're checking right now
+					Sector oppositesector = sd.Other.Sector;
+
+					bool blockheight = IsSoundBlockedByHeight(sd.Line);
+
+					// Try next line if sound will not pass through the current one. The last check makes
+					// sure that the next line is tried if the current line is blocking sound, and the current
+					// sector is already behind a sound blocking line
+					if(oppositesector == null || blockheight) continue;
+
+					// If the opposite sector was not regarded at all yet...
+					if(!sectors.Contains(oppositesector) && !sectorstocheck.Contains(oppositesector))
+					{
+						sectorstocheck.Add(oppositesector);
+					}
+				}
+
+				sectorstocheck.Remove(sector);
+				sectors.Add(sector);
+			}
+
+			foreach(Linedef ld in blockinglines)
+			{
+				// Lines that don't have a back side, or where the sound is blocked due to
+				// the sector heights on each side can be skipped
+				if(ld.Back == null || IsSoundBlockedByHeight(ld)) continue;
+				if(!sectors.Contains(ld.Front.Sector)) adjacentsectors.Add(ld.Front.Sector);
+				if(!sectors.Contains(ld.Back.Sector)) adjacentsectors.Add(ld.Back.Sector);
+			}
+
+			List<FlatVertex> vertices = new List<FlatVertex>();
+
+			foreach(Sector s in sectors)
+			{
+				vertices.AddRange(s.FlatVertices);
+			}
+
+			level1geometry = vertices.ToArray();
+			level2geometry = vertices.ToArray();
+
+			for(int i = 0; i < level1geometry.Length; i++)
+			{
+				level1geometry[i].c = BuilderPlug.Me.Level1Color.WithAlpha(128).ToInt();
+				level2geometry[i].c = BuilderPlug.Me.Level2Color.WithAlpha(128).ToInt();
+			}
+		}
+
+		private static bool IsSoundBlockedByHeight(Linedef ld)
+		{
+			if(ld.Back == null) return false;
+
+			Sector s1 = ld.Front.Sector;
+			Sector s2 = ld.Back.Sector;
+
+			// Check if the sound will be blocked because of sector floor and ceiling heights
+			// (like closed doors, raised lifts etc.)
+			return (s1.CeilHeight <= s2.FloorHeight || s1.FloorHeight >= s2.CeilHeight ||
+			       s2.CeilHeight <= s2.FloorHeight || s1.CeilHeight <= s1.FloorHeight);
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/SoundPropagationMode/SoundPropagationMode.cs b/Source/Plugins/SoundPropagationMode/SoundPropagationMode.cs
new file mode 100644
index 0000000..f9a3a4a
--- /dev/null
+++ b/Source/Plugins/SoundPropagationMode/SoundPropagationMode.cs
@@ -0,0 +1,437 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden, 2014 Boris Iwanski
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * Copyright (c) 2014 Boris Iwanski
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Editing;
+using CodeImp.DoomBuilder.Actions;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.SoundPropagationMode
+{
+	[EditMode(DisplayName = "Sound Propagation Mode",
+			  SwitchAction = "soundpropagationmode",		// Action name used to switch to this mode
+			  ButtonImage = "SoundPropagationIcon.png",	// Image resource name for the button
+			  ButtonOrder = int.MinValue + 501,	// Position of the button (lower is more to the left)
+			  ButtonGroup = "000_editing",
+			  UseByDefault = true,
+			  SafeStartMode = false,
+			  Volatile = false)]
+
+	public class SoundPropagationMode : ClassicMode
+	{
+		#region ================== Variables
+		
+		// Highlighted item
+		private Sector highlighted;
+		private Linedef highlightedline; //mxd
+
+		private FlatVertex[] overlayGeometry;
+
+		private List<Thing> huntingThings;
+		private List<SoundPropagationDomain> propagationdomains;
+		private Dictionary<Sector, SoundPropagationDomain> sector2domain;
+
+		#endregion
+
+		#region ================== Properties
+
+		public override object HighlightedObject { get { return highlighted; } }
+		internal static string BlockSoundFlag { get { return (General.Map.UDMF ? "blocksound" : "64"); } } //mxd
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Disposer
+		public override void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Dispose base
+				base.Dispose();
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		private void UpdateData()
+		{
+			BuilderPlug.Me.DataIsDirty = false;
+			List<FlatVertex> vertsList = new List<FlatVertex>();
+
+			// Go for all selected sectors
+			foreach(Sector s in General.Map.Map.Sectors) vertsList.AddRange(s.FlatVertices);
+			overlayGeometry = vertsList.ToArray();
+
+			for(int i = 0; i < overlayGeometry.Length; i++)
+				overlayGeometry[i].c = BuilderPlug.Me.NoSoundColor.WithAlpha(128).ToInt();
+		}
+
+		// This highlights a new item
+		private void Highlight(Sector s)
+		{
+			// Set new highlight
+			highlighted = s;
+
+			UpdateSoundPropagation();
+
+			// Show highlight info
+			if((highlighted != null) && !highlighted.IsDisposed)
+				General.Interface.ShowSectorInfo(highlighted);
+			else
+				General.Interface.HideInfo();
+
+			General.Interface.RedrawDisplay();
+		}
+
+		//mxd
+		private void ResetSoundPropagation()
+		{
+			sector2domain.Clear();
+			propagationdomains.Clear();
+			BuilderPlug.Me.BlockingLinedefs.Clear();
+			UpdateSoundPropagation();
+		}
+
+		private void UpdateSoundPropagation()
+		{
+			huntingThings.Clear();
+
+			BuilderPlug.Me.BlockingLinedefs.Clear();
+
+			foreach(Linedef ld in General.Map.Map.Linedefs)
+				if(ld.IsFlagSet(BlockSoundFlag))
+					BuilderPlug.Me.BlockingLinedefs.Add(ld);
+
+			if(highlighted == null || highlighted.IsDisposed) return;
+
+			if(!sector2domain.ContainsKey(highlighted))
+			{
+				SoundPropagationDomain spd = new SoundPropagationDomain(highlighted);
+				foreach(Sector s in spd.Sectors) sector2domain[s] = spd;
+				propagationdomains.Add(spd);
+			}
+
+			foreach(Sector adjacent in sector2domain[highlighted].AdjacentSectors)
+			{
+				if(!sector2domain.ContainsKey(adjacent))
+				{
+					SoundPropagationDomain aspd = new SoundPropagationDomain(adjacent);
+					foreach(Sector s in aspd.Sectors) sector2domain[s] = aspd;
+				}
+			}
+
+			//mxd. Create the list of sectors, which will be affected by noise made in highlighted sector
+			SoundPropagationDomain curdomain = sector2domain[highlighted];
+			Dictionary<int, Sector> noisysectors = new Dictionary<int, Sector>(curdomain.Sectors.Count);
+			foreach(Sector s in curdomain.Sectors)
+			{
+				noisysectors.Add(s.Index, s);
+			}
+
+			foreach(Sector s in curdomain.AdjacentSectors)
+			{
+				SoundPropagationDomain aspd = sector2domain[s];
+				foreach(Sector adjs in aspd.Sectors)
+				{
+					if(!noisysectors.ContainsKey(adjs.Index)) noisysectors.Add(adjs.Index, adjs);
+				}
+			}
+
+			// Update the list of things that will actually go for the player when hearing a noise
+			foreach(Thing thing in General.Map.Map.Things)
+			{
+				if(!General.Map.ThingsFilter.VisibleThings.Contains(thing)) continue;
+				if(thing.IsFlagSet(General.Map.UDMF ? "ambush" : "8")) continue;
+				if(thing.Sector == null) thing.DetermineSector();
+				if(thing.Sector != null && noisysectors.ContainsKey(thing.Sector.Index)) huntingThings.Add(thing);
+			}
+		}
+
+		#endregion
+		
+		#region ================== Events
+
+		public override void OnHelp()
+		{
+			General.ShowHelp("gzdb/features/classic_modes/mode_soundpropagation.html");
+		}
+
+		// Cancel mode
+		public override void OnCancel()
+		{
+			// Cancel base class
+			base.OnCancel();
+
+			// Return to previous mode
+			General.Editing.ChangeMode(new SoundPropagationMode());
+		}
+
+		// Mode engages
+		public override void OnEngage()
+		{
+			base.OnEngage();
+
+			huntingThings = new List<Thing>();
+			propagationdomains = new List<SoundPropagationDomain>();
+			sector2domain = new Dictionary<Sector, SoundPropagationDomain>();
+			BuilderPlug.Me.BlockingLinedefs = new List<Linedef>();
+
+			UpdateData();
+
+			General.Interface.AddButton(BuilderPlug.Me.MenusForm.ColorConfiguration);
+
+			CustomPresentation presentation = new CustomPresentation();
+			presentation.AddLayer(new PresentLayer(RendererLayer.Background, BlendingMode.Mask, General.Settings.BackgroundAlpha));
+			presentation.AddLayer(new PresentLayer(RendererLayer.Grid, BlendingMode.Mask));
+			presentation.AddLayer(new PresentLayer(RendererLayer.Overlay, BlendingMode.Alpha, 1.0f, true));
+			presentation.AddLayer(new PresentLayer(RendererLayer.Things, BlendingMode.Alpha, 1.0f));
+			presentation.AddLayer(new PresentLayer(RendererLayer.Geometry, BlendingMode.Alpha, 1.0f, true));
+			renderer.SetPresentation(presentation);
+
+			// Convert geometry selection to sectors only
+			General.Map.Map.ConvertSelection(SelectionType.Sectors);
+
+			UpdateSoundPropagation();
+			General.Interface.RedrawDisplay();
+		}
+
+		// Mode disengages
+		public override void OnDisengage()
+		{
+			base.OnDisengage();
+			General.Interface.RemoveButton(BuilderPlug.Me.MenusForm.ColorConfiguration);
+
+			// Hide highlight info
+			General.Interface.HideInfo();
+		}
+
+		// This redraws the display
+		public override void OnRedrawDisplay()
+		{
+			List<SoundPropagationDomain> renderedspds = new List<SoundPropagationDomain>();
+			if(BuilderPlug.Me.DataIsDirty) UpdateData();
+
+			// Render lines and vertices
+			if(renderer.StartPlotter(true))
+			{
+
+				// Plot lines by hand, so that no coloring (line specials, 3D floors etc.) distracts from
+				// the sound propagation. Also don't draw the line's normal. They are not needed here anyway
+				// and can make it harder to see the sound environment propagation
+				foreach(Linedef ld in General.Map.Map.Linedefs)
+				{
+					PixelColor c;
+
+					if(ld.IsFlagSet(General.Map.Config.ImpassableFlag))
+						c = General.Colors.Linedefs;
+					else
+						c = General.Colors.Linedefs.WithAlpha(General.Settings.DoubleSidedAlphaByte);
+
+					renderer.PlotLine(ld.Start.Position, ld.End.Position, c);
+				}
+
+				// Since there will usually be way less blocking linedefs than total linedefs, it's presumably
+				// faster to draw them on their own instead of checking if each linedef is in BlockingLinedefs
+				foreach(Linedef ld in BuilderPlug.Me.BlockingLinedefs)
+				{
+					renderer.PlotLine(ld.Start.Position, ld.End.Position, BuilderPlug.Me.BlockSoundColor);
+				}
+
+				//mxd. Render highlighted line
+				if(highlightedline != null)
+				{
+					renderer.PlotLine(highlightedline.Start.Position, highlightedline.End.Position, General.Colors.Highlight);
+				}
+
+				renderer.PlotVerticesSet(General.Map.Map.Vertices);
+
+				renderer.Finish();
+			}
+
+			// Render things
+			if(renderer.StartThings(true))
+			{
+				renderer.RenderThingSet(General.Map.ThingsFilter.HiddenThings, Presentation.THINGS_BACK_ALPHA);
+				renderer.RenderThingSet(General.Map.ThingsFilter.VisibleThings, Presentation.THINGS_HIDDEN_ALPHA);
+				foreach(Thing thing in huntingThings)
+				{
+					renderer.RenderThing(thing, General.Colors.Selection, Presentation.THINGS_ALPHA);
+				}
+
+				renderer.Finish();
+			}
+
+			if(renderer.StartOverlay(true))
+			{
+				renderer.RenderGeometry(overlayGeometry, General.Map.Data.WhiteTexture, true);
+
+				if(highlighted != null && !highlighted.IsDisposed)
+				{
+					SoundPropagationDomain spd = sector2domain[highlighted];
+					renderer.RenderGeometry(spd.Level1Geometry, General.Map.Data.WhiteTexture, true);
+
+					foreach(Sector s in spd.AdjacentSectors)
+					{
+						SoundPropagationDomain aspd = sector2domain[s];
+
+						if(!renderedspds.Contains(aspd))
+						{
+							renderer.RenderGeometry(aspd.Level2Geometry, General.Map.Data.WhiteTexture, true);
+							renderedspds.Add(aspd);
+						}
+					}
+
+					RenderColoredSector(highlighted, BuilderPlug.Me.HighlightColor.WithAlpha(128));
+				}
+
+				renderer.Finish();
+			}
+			
+			renderer.Present();
+		}
+
+		private void RenderColoredSector(Sector sector, PixelColor color)
+		{
+			RenderColoredSector(sector.FlatVertices, color);
+		}
+
+		private void RenderColoredSector(FlatVertex[] flatvertices, PixelColor color)
+		{
+			FlatVertex[] fv = new FlatVertex[flatvertices.Length];
+			flatvertices.CopyTo(fv, 0);
+			for(int i = 0; i < fv.Length; i++) fv[i].c = color.ToInt();
+			renderer.RenderGeometry(fv, General.Map.Data.WhiteTexture, true);
+		}
+
+		//mxd. If a linedef is highlighted, toggle the sound blocking flag 
+		protected override void OnSelectEnd()
+		{
+			if(highlightedline == null) return;
+
+			// Make undo
+			General.Map.UndoRedo.CreateUndo("Toggle Linedef Sound Blocking");
+
+			// Toggle flag
+			highlightedline.SetFlag(BlockSoundFlag, !highlightedline.IsFlagSet(BlockSoundFlag));
+			
+			// Update
+			ResetSoundPropagation();
+			General.Interface.RedrawDisplay();
+		}
+
+		// Mouse moves
+		public override void OnMouseMove(MouseEventArgs e)
+		{
+			base.OnMouseMove(e);
+
+			// Not holding any buttons?
+			if(e.Button == MouseButtons.None)
+			{
+				General.Interface.SetCursor(Cursors.Default);
+
+				// Find the nearest linedef within highlight range
+				Linedef l = General.Map.Map.NearestLinedef(mousemappos);
+				if(l != null)
+				{
+					// Check on which side of the linedef the mouse is
+					float side = l.SideOfLine(mousemappos);
+					if(side > 0)
+					{
+						// Is there a sidedef here?
+						if(l.Back != null)
+						{
+							// Highlight if not the same
+							if(l.Back.Sector != highlighted) Highlight(l.Back.Sector);
+						}
+						else
+						{
+							// Highlight nothing
+							Highlight(null);
+						}
+					}
+					else
+					{
+						// Is there a sidedef here?
+						if(l.Front != null)
+						{
+							// Highlight if not the same
+							if(l.Front.Sector != highlighted) Highlight(l.Front.Sector);
+						}
+						else
+						{
+							// Highlight nothing
+							Highlight(null);
+						}
+					}
+				}
+				else
+				{
+					// Highlight nothing
+					Highlight(null);
+				}
+
+				//mxd. Find the nearest linedef within default highlight range
+				l = General.Map.Map.NearestLinedefRange(mousemappos, 20 / renderer.Scale);
+				//mxd. We are not interested in single-sided lines (unless they have "blocksound" flag set)...
+				if(l != null && (l.Front == null || l.Back == null) && !l.IsFlagSet(BlockSoundFlag)) l = null;
+				
+				//mxd. Set as highlighted
+				if(highlightedline != l)
+				{
+					highlightedline = l;
+					General.Interface.RedrawDisplay();
+				}
+			}
+		}
+
+		// Mouse leaves
+		public override void OnMouseLeave(EventArgs e)
+		{
+			base.OnMouseLeave(e);
+
+			// Highlight nothing
+			Highlight(null);
+		}
+
+		#endregion
+
+		#region ================== Actions
+
+		[BeginAction("soundpropagationcolorconfiguration")]
+		public void ConfigureColors()
+		{
+			ColorConfiguration cc = new ColorConfiguration();
+			if(cc.ShowDialog((Form)General.Interface) == DialogResult.OK) 
+			{
+				General.Interface.RedrawDisplay();
+			}
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/SoundPropagationMode/Windows/ColorConfiguration.cs b/Source/Plugins/SoundPropagationMode/Windows/ColorConfiguration.cs
new file mode 100644
index 0000000..333ae73
--- /dev/null
+++ b/Source/Plugins/SoundPropagationMode/Windows/ColorConfiguration.cs
@@ -0,0 +1,46 @@
+using System;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Windows;
+
+namespace CodeImp.DoomBuilder.SoundPropagationMode
+{
+	public partial class ColorConfiguration : DelayedForm
+	{
+		public ColorConfiguration()
+		{
+			InitializeComponent();
+
+			highlightcolor.Color = BuilderPlug.Me.HighlightColor;
+			level1color.Color = BuilderPlug.Me.Level1Color;
+			level2color.Color = BuilderPlug.Me.Level2Color;
+			nosoundcolor.Color = BuilderPlug.Me.NoSoundColor;
+			blocksoundcolor.Color = BuilderPlug.Me.BlockSoundColor;
+		}
+
+		private void okbutton_Click(object sender, EventArgs e)
+		{
+			BuilderPlug.Me.HighlightColor = highlightcolor.Color;
+			BuilderPlug.Me.Level1Color = level1color.Color;
+			BuilderPlug.Me.Level2Color = level2color.Color;
+			BuilderPlug.Me.NoSoundColor = nosoundcolor.Color;
+			BuilderPlug.Me.BlockSoundColor = blocksoundcolor.Color;
+
+			General.Settings.WritePluginSetting("highlightcolor", highlightcolor.Color.ToInt());
+			General.Settings.WritePluginSetting("level1color", level1color.Color.ToInt());
+			General.Settings.WritePluginSetting("level2color", level2color.Color.ToInt());
+			General.Settings.WritePluginSetting("nosoundcolor", nosoundcolor.Color.ToInt());
+			General.Settings.WritePluginSetting("blocksoundcolor", blocksoundcolor.Color.ToInt());
+
+			this.Close();
+		}
+
+		private void resetcolors_Click(object sender, EventArgs e)
+		{
+			highlightcolor.Color = new PixelColor(255, 0, 192, 0);
+			level1color.Color = new PixelColor(255, 0, 255, 0);
+			level2color.Color = new PixelColor(255, 255, 255, 0);
+			nosoundcolor.Color = new PixelColor(255, 160, 160, 160);
+			blocksoundcolor.Color = new PixelColor(255, 255, 0, 0);
+		}
+	}
+}
diff --git a/Source/Plugins/SoundPropagationMode/Windows/ColorConfiguration.designer.cs b/Source/Plugins/SoundPropagationMode/Windows/ColorConfiguration.designer.cs
new file mode 100644
index 0000000..3b17ffb
--- /dev/null
+++ b/Source/Plugins/SoundPropagationMode/Windows/ColorConfiguration.designer.cs
@@ -0,0 +1,170 @@
+namespace CodeImp.DoomBuilder.SoundPropagationMode
+{
+	partial class ColorConfiguration
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.highlightcolor = new CodeImp.DoomBuilder.Controls.ColorControl();
+			this.level1color = new CodeImp.DoomBuilder.Controls.ColorControl();
+			this.level2color = new CodeImp.DoomBuilder.Controls.ColorControl();
+			this.nosoundcolor = new CodeImp.DoomBuilder.Controls.ColorControl();
+			this.blocksoundcolor = new CodeImp.DoomBuilder.Controls.ColorControl();
+			this.okbutton = new System.Windows.Forms.Button();
+			this.cancelbutton = new System.Windows.Forms.Button();
+			this.resetcolors = new System.Windows.Forms.Button();
+			this.SuspendLayout();
+			// 
+			// highlightcolor
+			// 
+			this.highlightcolor.BackColor = System.Drawing.Color.Transparent;
+			this.highlightcolor.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.highlightcolor.Label = "Highlight color:";
+			this.highlightcolor.Location = new System.Drawing.Point(12, 12);
+			this.highlightcolor.MaximumSize = new System.Drawing.Size(10000, 23);
+			this.highlightcolor.MinimumSize = new System.Drawing.Size(100, 23);
+			this.highlightcolor.Name = "highlightcolor";
+			this.highlightcolor.Size = new System.Drawing.Size(168, 23);
+			this.highlightcolor.TabIndex = 1;
+			// 
+			// level1color
+			// 
+			this.level1color.BackColor = System.Drawing.Color.Transparent;
+			this.level1color.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.level1color.Label = "Level 1 color:";
+			this.level1color.Location = new System.Drawing.Point(12, 41);
+			this.level1color.MaximumSize = new System.Drawing.Size(10000, 23);
+			this.level1color.MinimumSize = new System.Drawing.Size(100, 23);
+			this.level1color.Name = "level1color";
+			this.level1color.Size = new System.Drawing.Size(168, 23);
+			this.level1color.TabIndex = 2;
+			// 
+			// level2color
+			// 
+			this.level2color.BackColor = System.Drawing.Color.Transparent;
+			this.level2color.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.level2color.Label = "Level 2 color:";
+			this.level2color.Location = new System.Drawing.Point(12, 70);
+			this.level2color.MaximumSize = new System.Drawing.Size(10000, 23);
+			this.level2color.MinimumSize = new System.Drawing.Size(100, 23);
+			this.level2color.Name = "level2color";
+			this.level2color.Size = new System.Drawing.Size(168, 23);
+			this.level2color.TabIndex = 3;
+			// 
+			// nosoundcolor
+			// 
+			this.nosoundcolor.BackColor = System.Drawing.Color.Transparent;
+			this.nosoundcolor.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.nosoundcolor.Label = "No sound color:";
+			this.nosoundcolor.Location = new System.Drawing.Point(12, 99);
+			this.nosoundcolor.MaximumSize = new System.Drawing.Size(10000, 23);
+			this.nosoundcolor.MinimumSize = new System.Drawing.Size(100, 23);
+			this.nosoundcolor.Name = "nosoundcolor";
+			this.nosoundcolor.Size = new System.Drawing.Size(168, 23);
+			this.nosoundcolor.TabIndex = 4;
+			// 
+			// blocksoundcolor
+			// 
+			this.blocksoundcolor.BackColor = System.Drawing.Color.Transparent;
+			this.blocksoundcolor.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.blocksoundcolor.Label = "Block sound color:";
+			this.blocksoundcolor.Location = new System.Drawing.Point(12, 128);
+			this.blocksoundcolor.MaximumSize = new System.Drawing.Size(10000, 23);
+			this.blocksoundcolor.MinimumSize = new System.Drawing.Size(100, 23);
+			this.blocksoundcolor.Name = "blocksoundcolor";
+			this.blocksoundcolor.Size = new System.Drawing.Size(168, 23);
+			this.blocksoundcolor.TabIndex = 5;
+			// 
+			// okbutton
+			// 
+			this.okbutton.Location = new System.Drawing.Point(105, 186);
+			this.okbutton.Name = "okbutton";
+			this.okbutton.Size = new System.Drawing.Size(75, 23);
+			this.okbutton.TabIndex = 6;
+			this.okbutton.Text = "OK";
+			this.okbutton.UseVisualStyleBackColor = true;
+			this.okbutton.Click += new System.EventHandler(this.okbutton_Click);
+			// 
+			// cancelbutton
+			// 
+			this.cancelbutton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.cancelbutton.Location = new System.Drawing.Point(12, 186);
+			this.cancelbutton.Name = "cancelbutton";
+			this.cancelbutton.Size = new System.Drawing.Size(75, 23);
+			this.cancelbutton.TabIndex = 7;
+			this.cancelbutton.Text = "Cancel";
+			this.cancelbutton.UseVisualStyleBackColor = true;
+			// 
+			// resetcolors
+			// 
+			this.resetcolors.Location = new System.Drawing.Point(12, 157);
+			this.resetcolors.Name = "resetcolors";
+			this.resetcolors.Size = new System.Drawing.Size(168, 23);
+			this.resetcolors.TabIndex = 8;
+			this.resetcolors.Text = "Reset colors";
+			this.resetcolors.UseVisualStyleBackColor = true;
+			this.resetcolors.Click += new System.EventHandler(this.resetcolors_Click);
+			// 
+			// ColorConfiguration
+			// 
+			this.AcceptButton = this.okbutton;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.CancelButton = this.cancelbutton;
+			this.ClientSize = new System.Drawing.Size(196, 223);
+			this.Controls.Add(this.resetcolors);
+			this.Controls.Add(this.cancelbutton);
+			this.Controls.Add(this.okbutton);
+			this.Controls.Add(this.blocksoundcolor);
+			this.Controls.Add(this.nosoundcolor);
+			this.Controls.Add(this.level2color);
+			this.Controls.Add(this.level1color);
+			this.Controls.Add(this.highlightcolor);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "ColorConfiguration";
+			this.Opacity = 1;
+			this.ShowIcon = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Color Configuration";
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private CodeImp.DoomBuilder.Controls.ColorControl highlightcolor;
+		private CodeImp.DoomBuilder.Controls.ColorControl level1color;
+		private CodeImp.DoomBuilder.Controls.ColorControl level2color;
+		private CodeImp.DoomBuilder.Controls.ColorControl nosoundcolor;
+		private CodeImp.DoomBuilder.Controls.ColorControl blocksoundcolor;
+		private System.Windows.Forms.Button okbutton;
+		private System.Windows.Forms.Button cancelbutton;
+		private System.Windows.Forms.Button resetcolors;
+
+	}
+}
\ No newline at end of file
diff --git a/Source/Plugins/SoundPropagationMode/Windows/ColorConfiguration.resx b/Source/Plugins/SoundPropagationMode/Windows/ColorConfiguration.resx
new file mode 100644
index 0000000..19dc0dd
--- /dev/null
+++ b/Source/Plugins/SoundPropagationMode/Windows/ColorConfiguration.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/SoundPropagationMode/Windows/MenusForm.cs b/Source/Plugins/SoundPropagationMode/Windows/MenusForm.cs
new file mode 100644
index 0000000..c19fa7a
--- /dev/null
+++ b/Source/Plugins/SoundPropagationMode/Windows/MenusForm.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Windows.Forms;
+
+namespace CodeImp.DoomBuilder.SoundPropagationMode
+{
+	public partial class MenusForm : Form
+	{
+		public ToolStripButton ColorConfiguration { get { return colorconfiguration; } }
+
+		public MenusForm()
+		{
+			InitializeComponent();
+		}
+
+		// This invokes an action from control event
+		private void InvokeTaggedAction(object sender, EventArgs e)
+		{
+			General.Interface.InvokeTaggedAction(sender, e);
+		}
+	}
+}
diff --git a/Source/Plugins/SoundPropagationMode/Windows/MenusForm.designer.cs b/Source/Plugins/SoundPropagationMode/Windows/MenusForm.designer.cs
new file mode 100644
index 0000000..0867bee
--- /dev/null
+++ b/Source/Plugins/SoundPropagationMode/Windows/MenusForm.designer.cs
@@ -0,0 +1,77 @@
+namespace CodeImp.DoomBuilder.SoundPropagationMode
+{
+	partial class MenusForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.toolStrip1 = new System.Windows.Forms.ToolStrip();
+			this.colorconfiguration = new System.Windows.Forms.ToolStripButton();
+			this.toolStrip1.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// toolStrip1
+			// 
+			this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.colorconfiguration});
+			this.toolStrip1.Location = new System.Drawing.Point(0, 0);
+			this.toolStrip1.Name = "toolStrip1";
+			this.toolStrip1.Size = new System.Drawing.Size(284, 25);
+			this.toolStrip1.TabIndex = 0;
+			this.toolStrip1.Text = "toolStrip1";
+			// 
+			// colorconfiguration
+			// 
+			this.colorconfiguration.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.colorconfiguration.Image = global::CodeImp.DoomBuilder.SoundPropagationMode.Properties.Resources.ColorManagement;
+			this.colorconfiguration.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.colorconfiguration.Name = "colorconfiguration";
+			this.colorconfiguration.Size = new System.Drawing.Size(23, 22);
+			this.colorconfiguration.Tag = "soundpropagationcolorconfiguration";
+			this.colorconfiguration.Text = "Configure colors";
+			this.colorconfiguration.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// MenusForm
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.ClientSize = new System.Drawing.Size(284, 262);
+			this.Controls.Add(this.toolStrip1);
+			this.Name = "MenusForm";
+			this.Text = "MenuForm";
+			this.toolStrip1.ResumeLayout(false);
+			this.toolStrip1.PerformLayout();
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.ToolStrip toolStrip1;
+		private System.Windows.Forms.ToolStripButton colorconfiguration;
+	}
+}
\ No newline at end of file
diff --git a/Source/Plugins/SoundPropagationMode/Windows/MenusForm.resx b/Source/Plugins/SoundPropagationMode/Windows/MenusForm.resx
new file mode 100644
index 0000000..673dcfd
--- /dev/null
+++ b/Source/Plugins/SoundPropagationMode/Windows/MenusForm.resx
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/SoundPropagationMode/Windows/ReverbsPickerForm.Designer.cs b/Source/Plugins/SoundPropagationMode/Windows/ReverbsPickerForm.Designer.cs
new file mode 100644
index 0000000..63357c6
--- /dev/null
+++ b/Source/Plugins/SoundPropagationMode/Windows/ReverbsPickerForm.Designer.cs
@@ -0,0 +1,127 @@
+namespace CodeImp.DoomBuilder.SoundPropagationMode
+{
+	partial class ReverbsPickerForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing) {
+			if(disposing && (components != null)) {
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent() {
+			this.groupBox1 = new System.Windows.Forms.GroupBox();
+			this.list = new System.Windows.Forms.ListBox();
+			this.accept = new System.Windows.Forms.Button();
+			this.cancel = new System.Windows.Forms.Button();
+			this.cbactiveenv = new System.Windows.Forms.CheckBox();
+			this.groupBox1.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// groupBox1
+			// 
+			this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.groupBox1.Controls.Add(this.list);
+			this.groupBox1.Location = new System.Drawing.Point(12, 12);
+			this.groupBox1.Name = "groupBox1";
+			this.groupBox1.Size = new System.Drawing.Size(190, 351);
+			this.groupBox1.TabIndex = 0;
+			this.groupBox1.TabStop = false;
+			this.groupBox1.Text = " Sound Environments: ";
+			// 
+			// list
+			// 
+			this.list.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.list.FormattingEnabled = true;
+			this.list.Location = new System.Drawing.Point(3, 16);
+			this.list.Name = "list";
+			this.list.Size = new System.Drawing.Size(184, 329);
+			this.list.TabIndex = 0;
+			this.list.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.list_MouseDoubleClick);
+			this.list.SelectedIndexChanged += new System.EventHandler(this.list_SelectedIndexChanged);
+			// 
+			// accept
+			// 
+			this.accept.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.accept.Enabled = false;
+			this.accept.Location = new System.Drawing.Point(14, 394);
+			this.accept.Name = "accept";
+			this.accept.Size = new System.Drawing.Size(91, 23);
+			this.accept.TabIndex = 0;
+			this.accept.Text = "OK";
+			this.accept.UseVisualStyleBackColor = true;
+			this.accept.Click += new System.EventHandler(this.accept_Click);
+			// 
+			// cancel
+			// 
+			this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.cancel.Location = new System.Drawing.Point(111, 394);
+			this.cancel.Name = "cancel";
+			this.cancel.Size = new System.Drawing.Size(91, 23);
+			this.cancel.TabIndex = 1;
+			this.cancel.Text = "Cancel";
+			this.cancel.UseVisualStyleBackColor = true;
+			// 
+			// cbactiveenv
+			// 
+			this.cbactiveenv.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.cbactiveenv.AutoSize = true;
+			this.cbactiveenv.Location = new System.Drawing.Point(15, 369);
+			this.cbactiveenv.Name = "cbactiveenv";
+			this.cbactiveenv.Size = new System.Drawing.Size(152, 17);
+			this.cbactiveenv.TabIndex = 1;
+			this.cbactiveenv.Text = "Active Sound Environment";
+			this.cbactiveenv.UseVisualStyleBackColor = true;
+			// 
+			// ReverbsPickerForm
+			// 
+			this.AcceptButton = this.accept;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.CancelButton = this.cancel;
+			this.ClientSize = new System.Drawing.Size(214, 422);
+			this.Controls.Add(this.cbactiveenv);
+			this.Controls.Add(this.cancel);
+			this.Controls.Add(this.accept);
+			this.Controls.Add(this.groupBox1);
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.MinimumSize = new System.Drawing.Size(230, 200);
+			this.Name = "ReverbsPickerForm";
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Choose a Sound Environment";
+			this.groupBox1.ResumeLayout(false);
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.GroupBox groupBox1;
+		private System.Windows.Forms.Button accept;
+		private System.Windows.Forms.Button cancel;
+		private System.Windows.Forms.ListBox list;
+		private System.Windows.Forms.CheckBox cbactiveenv;
+	}
+}
\ No newline at end of file
diff --git a/Source/Plugins/SoundPropagationMode/Windows/ReverbsPickerForm.cs b/Source/Plugins/SoundPropagationMode/Windows/ReverbsPickerForm.cs
new file mode 100644
index 0000000..4f9a961
--- /dev/null
+++ b/Source/Plugins/SoundPropagationMode/Windows/ReverbsPickerForm.cs
@@ -0,0 +1,97 @@
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Windows;
+
+namespace CodeImp.DoomBuilder.SoundPropagationMode
+{
+	public partial class ReverbsPickerForm : DelayedForm
+	{
+		private struct ReverbListItem
+		{
+			private readonly string name;
+			public readonly int Arg0;
+			public readonly int Arg1;
+
+			public ReverbListItem(string name, int arg0, int arg1) 
+			{
+				this.name = name + " (" + arg0 + " " + arg1 + ")";
+				Arg0 = arg0;
+				Arg1 = arg1;
+			}
+
+			public override string ToString() 
+			{
+				return name;
+			}
+		}
+
+		private static string previousenvironmentname;
+		
+		public ReverbsPickerForm(Thing t) 
+		{
+			InitializeComponent();
+
+			// Fill the list
+			foreach(KeyValuePair<string, KeyValuePair<int, int>> reverb in General.Map.Data.Reverbs)
+			{
+				list.Items.Add(new ReverbListItem(reverb.Key, reverb.Value.Key, reverb.Value.Value));
+			}
+
+			// Select suitable item
+			foreach(var item in list.Items) 
+			{
+				ReverbListItem rli = (ReverbListItem)item;
+				if(rli.Arg0 == t.Args[0] && rli.Arg1 == t.Args[1]) 
+				{
+					list.SelectedItem = item;
+					break;
+				}
+			}
+
+			// Select previously selected item?
+			if(!string.IsNullOrEmpty(previousenvironmentname) && list.SelectedItem == null)
+			{
+				foreach(ReverbListItem item in list.Items)
+				{
+					if(item.ToString() == previousenvironmentname)
+					{
+						list.SelectedItem = item;
+						break;
+					}
+				}
+			}
+
+			// Dormant?
+			cbactiveenv.Checked = !BuilderPlug.ThingDormant(t);
+			list.Focus();
+		}
+
+		public void ApplyTo(Thing t) 
+		{
+			if(list.SelectedItem == null) return;
+			ReverbListItem rli = (ReverbListItem)list.SelectedItem;
+			t.Args[0] = rli.Arg0;
+			t.Args[1] = rli.Arg1;
+			BuilderPlug.SetThingDormant(t, !cbactiveenv.Checked);
+		}
+
+		private void list_MouseDoubleClick(object sender, MouseEventArgs e) 
+		{
+			if(list.SelectedItem != null) accept_Click(accept, EventArgs.Empty);
+		}
+
+		private void accept_Click(object sender, EventArgs e) 
+		{
+			if(list.SelectedItem != null) previousenvironmentname = list.SelectedItem.ToString();
+			this.DialogResult = DialogResult.OK;
+			this.Close();
+		}
+
+		private void list_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			accept.Enabled = (list.SelectedItem != null);
+		}
+	}
+}
diff --git a/Source/Plugins/SoundPropagationMode/Windows/ReverbsPickerForm.resx b/Source/Plugins/SoundPropagationMode/Windows/ReverbsPickerForm.resx
new file mode 100644
index 0000000..19dc0dd
--- /dev/null
+++ b/Source/Plugins/SoundPropagationMode/Windows/ReverbsPickerForm.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/StairSectorBuilder/BuilderPlug.cs b/Source/Plugins/StairSectorBuilder/BuilderPlug.cs
new file mode 100644
index 0000000..465d500
--- /dev/null
+++ b/Source/Plugins/StairSectorBuilder/BuilderPlug.cs
@@ -0,0 +1,167 @@
+
+#region ================== Copyright (c) 2009 Boris Iwanski
+
+/*
+ * Copyright (c) 2009 Boris Iwanski
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Collections.Generic;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Plugins;
+using CodeImp.DoomBuilder.Actions;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.StairSectorBuilderMode
+{
+	//
+	// MANDATORY: The plug!
+	// This is an important class to the Doom Builder core. Every plugin must
+	// have exactly 1 class that inherits from Plug. When the plugin is loaded,
+	// this class is instantiated and used to receive events from the core.
+	// Make sure the class is public, because only public classes can be seen
+	// by the core.
+	//
+
+	public class BuilderPlug : Plug
+	{
+        public struct Prefab
+        {
+            public string name;
+
+            // General
+            public int numberofsectors;
+            public int innervertexmultiplier;
+            public int outervertexmultiplier;
+            public int stairtype;
+
+            // Straight stairs
+            public int sectordepth;
+            public int spacing;
+            public bool frontside;
+            public bool singlesectors;
+            public bool singledirection;
+			public bool distinctbaseheights;
+
+            // Auto curve
+            public int flipping;
+
+            // Catmull Rom spline
+            public int numberofcontrolpoints;
+
+            // Height info
+            public bool applyfloormod;
+            public int floormod;
+			public int floorbase;
+            public bool applyceilingmod;
+            public int ceilingmod;
+			public int ceilingbase;
+
+            // Textures
+            public bool applyfloortexture;
+            public string floortexture;
+            public bool applyceilingtexture;
+            public string ceilingtexture;
+
+            public bool applyuppertexture;
+            public string uppertexture;
+			public bool upperunpegged;
+			public bool applymiddletexture;
+			public string middletexture;
+            public bool applylowertexture;
+            public string lowertexture;
+			public bool lowerunpegged;
+        }
+
+		// Static instance. We can't use a real static class, because BuilderPlug must
+		// be instantiated by the core, so we keep a static reference. (this technique
+		// should be familiar to object-oriented programmers)
+		private static BuilderPlug me;
+
+		// Static property to access the BuilderPlug
+		public static BuilderPlug Me { get { return me; } }
+
+        private List<Prefab> prefabs;
+
+        public List<Prefab> Prefabs { get { return prefabs; } }
+
+		// This plugin relies on some functionality that wasn't there in older versions
+		public override int MinimumRevision { get { return 1310; } }
+
+		// This event is called when the plugin is initialized
+		public override void OnInitialize()
+		{
+			base.OnInitialize();
+
+			// This binds the methods in this class that have the BeginAction
+			// and EndAction attributes with their actions. Without this, the
+			// attributes are useless. Note that in classes derived from EditMode
+			// this is not needed, because they are bound automatically when the
+			// editing mode is engaged.
+            General.Actions.BindMethods(this);
+
+            prefabs = new List<Prefab>();
+
+			// TODO: Add DB2 version check so that old DB2 versions won't crash
+			// General.ErrorLogger.Add(ErrorType.Error, "zomg!");
+
+			// Keep a static reference
+            me = this;
+		}
+
+		// This is called when the plugin is terminated
+		public override void Dispose()
+		{
+			base.Dispose();
+
+			// This must be called to remove bound methods for actions.
+            General.Actions.UnbindMethods(this);
+        }
+
+        #region ================== Actions
+
+		[BeginAction("selectsectorsoutline")]
+		public void SelectSectorsOutline()
+		{
+			// Must have sectors selected. Having sectors selected implies
+			// that there are also linedefs selected
+			if(General.Map.Map.SelectedSectorsCount == 0) return;
+
+			// Get the list of selected sectors since it'll be empty after
+			// switching to linedefs mode
+			List<Sector> sectors = new List<Sector>(General.Map.Map.GetSelectedSectors(true));
+
+			General.Editing.ChangeMode("LinedefsMode");
+
+			// Go through all selected linedefs and unselect/unmark all which
+			// have a selected sector on both sides
+			foreach(Linedef ld in General.Map.Map.GetSelectedLinedefs(true))
+			{
+				if(sectors.Contains(ld.Front.Sector) && ld.Back != null && sectors.Contains(ld.Back.Sector))
+				{
+					ld.Selected = false;
+					ld.Marked = false;
+				}
+			}
+
+			General.Interface.RedrawDisplay();
+		}
+
+        #endregion
+
+		#region ================== Methods
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/StairSectorBuilder/Properties/AssemblyInfo.cs b/Source/Plugins/StairSectorBuilder/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..d24b97f
--- /dev/null
+++ b/Source/Plugins/StairSectorBuilder/Properties/AssemblyInfo.cs
@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// Управление общими �ведени�ми о �борке о�уще�твл�ет�� � помощью 
+// набора атрибутов. Измените значени� �тих атрибутов, чтобы изменить �ведени�,
+// �в�занные �о �боркой.
+[assembly: AssemblyTitle("StairSectorBuilder")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("StairSectorBuilder")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2012")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Параметр ComVisible �о значением FALSE делает типы в �борке невидимыми 
+// дл� COM-компонентов.  Е�ли требует�� обратить�� к типу в �той �борке через 
+// COM, задайте атрибуту ComVisible значение TRUE дл� �того типа.
+[assembly: ComVisible(false)]
+
+// Следующий GUID �лужит дл� идентификации библиотеки типов, е�ли �тот проект будет видимым дл� COM
+[assembly: Guid("a3340ba1-665f-4414-8cbb-a0271aa32137")]
+
+// Сведени� о вер�ии �борки �о�то�т из �ледующих четырех значений:
+//
+//      О�новной номер вер�ии
+//      Дополнительный номер вер�ии 
+//      �омер по�троени�
+//      Редакци�
+//
+// Можно задать в�е значени� или прин�ть номер по�троени� и номер редакции по умолчанию, 
+// и�пользу� "*", как показано ниже:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Source/Plugins/StairSectorBuilder/Properties/Resources.Designer.cs b/Source/Plugins/StairSectorBuilder/Properties/Resources.Designer.cs
new file mode 100644
index 0000000..4cbaee9
--- /dev/null
+++ b/Source/Plugins/StairSectorBuilder/Properties/Resources.Designer.cs
@@ -0,0 +1,83 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:4.0.30319.42000
+//
+//     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace CodeImp.DoomBuilder.StairSectorBuilder.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
+    /// </summary>
+    // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
+    // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
+    // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
+    // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("CodeImp.DoomBuilder.StairSectorBuilder.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
+        ///   Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Byte[].
+        /// </summary>
+        internal static byte[] Actions {
+            get {
+                object obj = ResourceManager.GetObject("Actions", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap StairIcon {
+            get {
+                object obj = ResourceManager.GetObject("StairIcon", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+    }
+}
diff --git a/Source/Plugins/StairSectorBuilder/Properties/Resources.resx b/Source/Plugins/StairSectorBuilder/Properties/Resources.resx
new file mode 100644
index 0000000..48f6661
--- /dev/null
+++ b/Source/Plugins/StairSectorBuilder/Properties/Resources.resx
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="Actions" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Actions.cfg;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="StairIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\StairIcon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/StairSectorBuilder/Resources/Actions.cfg b/Source/Plugins/StairSectorBuilder/Resources/Actions.cfg
new file mode 100644
index 0000000..6dc8c8c
--- /dev/null
+++ b/Source/Plugins/StairSectorBuilder/Resources/Actions.cfg
@@ -0,0 +1,42 @@
+
+//
+// This file defines which actions there are, what description they have and
+// some behaviour options. The Doom Builder core will bind to these actions
+// with delegates (function pointers) where you use the BeginAction and
+// EndAction attributes. This file must be named Actions.cfg and must be
+// included in the plugin project as "Embedded Resource".
+//
+
+//
+// Options:
+//
+// allowkeys:       Allows the user to bind standard keys to this action.
+// allowmouse:      Allows the user to bind mouse buttons to this action.
+// allowscroll:     Allows the user to bind the scrollwheel to this action.
+// disregardshift:  This action will trigger regardless if Shift or Control is used.
+// repeat:          BeginAction will be called for automatic key repetition.
+// default:         Default key is only used when the action is loaded for the first
+//                  time and the default key is not used by any other action.
+//
+// allowkeys and allowmouse are true by default, the others are false by default.
+//
+
+stairsectorbuildermode
+{
+	title = "Stair Sector Builder Mode";
+	category = "modes";
+	description = "Switches to the stair sector builder mode.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
+selectsectorsoutline
+{
+	title = "Select Sectors Outline";
+	category = "sectors";
+	description = "Selects the outline of all marked sectors, deselecting lines that are shared.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
\ No newline at end of file
diff --git a/Source/Plugins/StairSectorBuilder/Resources/StairIcon.png b/Source/Plugins/StairSectorBuilder/Resources/StairIcon.png
new file mode 100644
index 0000000..4db91e9
Binary files /dev/null and b/Source/Plugins/StairSectorBuilder/Resources/StairIcon.png differ
diff --git a/Source/Plugins/StairSectorBuilder/StairSectorBuilder.csproj b/Source/Plugins/StairSectorBuilder/StairSectorBuilder.csproj
new file mode 100644
index 0000000..7ab0ef3
--- /dev/null
+++ b/Source/Plugins/StairSectorBuilder/StairSectorBuilder.csproj
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{3F365121-906B-409D-BB1E-37E0A78056C2}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>CodeImp.DoomBuilder.StairSectorBuilder</RootNamespace>
+    <AssemblyName>StairSectorBuilder</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\Build\Plugins\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <PlatformTarget>x86</PlatformTarget>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\Build\Plugins\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <PlatformTarget>x86</PlatformTarget>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug + Profiler|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\..\..\Build\Plugins\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;PROFILE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release + Profiler|x86' ">
+    <OutputPath>..\..\..\Build\Plugins\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Builder, Version=1.14.0.2201, Culture=neutral, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\Build\Builder.exe</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Windows.Forms" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="BuilderPlug.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="StairSectorBuilderForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="StairSectorBuilderForm.designer.cs">
+      <DependentUpon>StairSectorBuilderForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="StairSectorBuilderMode.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="StairSectorBuilderForm.resx">
+      <DependentUpon>StairSectorBuilderForm.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\Actions.cfg" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\StairIcon.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/Source/Plugins/StairSectorBuilder/StairSectorBuilderForm.cs b/Source/Plugins/StairSectorBuilder/StairSectorBuilderForm.cs
new file mode 100644
index 0000000..78f39b7
--- /dev/null
+++ b/Source/Plugins/StairSectorBuilder/StairSectorBuilderForm.cs
@@ -0,0 +1,881 @@
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Windows;
+
+namespace CodeImp.DoomBuilder.StairSectorBuilderMode
+{
+	public partial class StairSectorBuilderForm : DelayedForm
+	{
+		private bool fullyloaded;
+		private bool loadingprefab;
+		private int stepmultiplier = 1;
+		private int originalfloorbase;
+		private int originalceilingbase;
+
+
+		#region ================== Properties
+
+		public int OriginalFloorBase
+		{
+			set { originalfloorbase = value; }
+			get { return originalfloorbase; }
+		}
+
+		public int OriginalCeilingBase
+		{
+			set { originalceilingbase = value; }
+			get { return originalceilingbase; }
+		}
+
+		public int StepMultiplier
+		{
+			set { stepmultiplier = value; }
+		}
+
+		public int StairType
+		{
+			get { return tabcontrol.SelectedIndex; }
+		}
+
+		public uint NumberOfSectors
+		{
+			// get { return (uint)System.Convert.ToUInt32(numberofsectors.Text); }
+			get { return (uint)numberofsectors.GetResult(1); }
+			set { numberofsectors.Text = value.ToString(); }
+		}
+
+		public uint SectorDepth
+		{
+			// get { return (uint)System.Convert.ToUInt32(sectordepth.Text); }
+			get { return (uint)sectordepth.GetResult(32); }
+			set { sectordepth.Text = value.ToString(); }
+		}
+
+        public int Spacing
+        {
+            get { return spacing.GetResult(0); }
+            set { spacing.Text = value.ToString(); }
+        }
+
+		public int InnerVertexMultiplier
+		{
+			get { return autocurveinnervertexmultiplier.GetResult(1); }
+			set { autocurveinnervertexmultiplier.Text = value.ToString(); }
+		}
+
+		public int OuterVertexMultiplier
+		{
+			get { return autocurveoutervertexmultiplier.GetResult(1); }
+			set { autocurveoutervertexmultiplier.Text = value.ToString(); }
+		}
+
+		public bool SideFront
+		{
+			get { return sidefront.Checked; }
+            set { sidefront.Checked = value; }
+		}
+
+		public CheckBox DistinctBaseHeights
+		{
+			get { return distinctbaseheights; }
+			set { distinctbaseheights = value; }
+		}
+
+		public CheckBox SingleSectors
+		{
+			get { return singlesectors; }
+			set { singlesectors = value; }
+		}
+
+		public CheckBox SingleDirection
+		{
+			get { return singledirection; }
+			set { singledirection = value; }
+		}
+
+		public TabControl Tabs
+		{
+			get { return tabcontrol; }
+		}
+
+		public int NumControlPoints
+		{
+			get { return numberofcontrolpoints.GetResult(1) + 2; }
+            set { numberofcontrolpoints.Text = value.ToString(); }
+		}
+
+        public bool FloorHeight
+        {
+            get { return floorheightmodification.Checked; }
+            set { floorheightmodification.Checked = value; }
+        }
+
+		public bool CeilingHeight
+		{
+			get { return ceilingheightmodification.Checked; }
+            set { ceilingheightmodification.Checked = value; }
+		}
+
+
+        public int FloorHeightModification
+        {
+            get { return floorheightmod.GetResult(0); }
+            set { floorheightmod.Text = value.ToString(); }
+        }
+
+        public int CeilingHeightModification
+        {
+            get { return ceilingheightmod.GetResult(0); }
+            set { ceilingheightmod.Text = value.ToString(); }
+        }
+
+        public bool FloorFlat
+        {
+            get { return floorflat.Checked; }
+            set { floorflat.Checked = value; }
+        }
+
+        public string FloorFlatTexture
+        {
+            get { return floorflattexture.TextureName; }
+            set { floorflattexture.TextureName = value; }
+        }
+
+        public bool CeilingFlat
+        {
+            get { return ceilingflat.Checked; }
+            set { ceilingflat.Checked = value; }
+        }
+
+        public string CeilingFlatTexture
+        {
+            get { return ceilingflattexture.TextureName; }
+            set { ceilingflattexture.TextureName = value; }
+        }
+
+        public bool UpperTexture
+        {
+            get { return uppertexture.Checked; }
+            set { uppertexture.Checked = value; }
+        }
+
+		public bool MiddleTexture
+		{
+			get { return middletexture.Checked; }
+			set { middletexture.Checked = value; }
+		}
+
+        public bool LowerTexture
+        {
+            get { return lowertexture.Checked; }
+            set { lowertexture.Checked = value; }
+        }
+
+        public string UpperTextureTexture
+        {
+            get { return uppertexturetexture.TextureName; }
+            set { uppertexturetexture.TextureName = value; }
+        }
+
+		public string MiddleTextureTexture
+		{
+			get { return middletexturetexture.TextureName; }
+			set { middletexturetexture.TextureName = value; }
+		}
+
+        public string LowerTextureTexture
+        {
+            get { return lowertexturetexture.TextureName; }
+            set { lowertexturetexture.TextureName = value; }
+        }
+
+		public int FloorBase
+		{
+			set { floorbase.Text = value.ToString(); }
+			get { return floorbase.GetResult(0); }
+		}
+
+		public int CeilingBase
+		{
+			set { ceilingbase.Text = value.ToString(); }
+			get { return ceilingbase.GetResult(0); }
+		}
+
+		public bool FullyLoaded
+		{
+			get { return fullyloaded; }
+		}
+
+		public int Flipping
+		{
+			get { return autocurveflipping.SelectedIndex; }
+			set { autocurveflipping.SelectedIndex = value; }
+		}
+
+		public bool UpperUnpegged
+		{
+			get { return upperunpegged.Checked; }
+			set { upperunpegged.Checked = value; }
+		}
+
+		public bool LowerUnpegged
+		{
+			get { return lowerunpegged.Checked; }
+			set { lowerunpegged.Checked = value; }
+		}
+
+		#endregion
+
+		public StairSectorBuilderForm()
+		{
+			InitializeComponent();
+
+            foreach(BuilderPlug.Prefab p in BuilderPlug.Me.Prefabs)
+            {
+                ListViewItem lvi = new ListViewItem();
+                ListViewItem.ListViewSubItem lvisi = new ListViewItem.ListViewSubItem();
+
+                lvi.Text = p.name;
+                lvisi.Text = tabcontrol.TabPages[p.stairtype].Text;
+
+                lvi.SubItems.Add(lvisi);
+                prefabs.Items.Add(lvi);
+            }
+		}
+
+        // This shows the window
+        public void Show(Form owner)
+        {
+            // Position at left-top of owner
+            this.Location = new Point(owner.Location.X + 20, owner.Location.Y + 90);
+
+			// Set the default name for the prefab
+			for(int i = 1; i < int.MaxValue; i++)
+			{
+				string defname = "Prefab #" + i;
+				bool validname = true;
+
+				foreach(BuilderPlug.Prefab p in BuilderPlug.Me.Prefabs)
+				{
+					if(p.name == defname)
+					{
+						validname = false;
+						break;
+					}
+				}
+
+				if(validname)
+				{
+					prefabname.Text = defname;
+					break;
+				}
+			}
+
+            // Show window
+            base.Show(owner);
+        }
+
+		private void ComputeHeights()
+		{
+			if(!fullyloaded) return;
+
+			if(floorbase.Enabled == false)
+			{
+				floorfirst.Text = "--";
+				floorlast.Text = "--";
+			}
+			else
+			{
+				floorfirst.Text = (Int32.Parse(floorbase.Text) + Int32.Parse(floorheightmod.Text)).ToString();
+				floorlast.Text = (Int32.Parse(floorbase.Text) + Int32.Parse(floorheightmod.Text) * (Int32.Parse(numberofsectors.Text) * stepmultiplier)).ToString();
+			}
+
+			if(ceilingbase.Enabled == false)
+			{
+				ceilingfirst.Text = "--";
+				ceilinglast.Text = "--";
+			}
+			else
+			{
+				ceilingfirst.Text = (Int32.Parse(ceilingbase.Text) + Int32.Parse(ceilingheightmod.Text)).ToString();
+				ceilinglast.Text = (Int32.Parse(ceilingbase.Text) + Int32.Parse(ceilingheightmod.Text) * (Int32.Parse(numberofsectors.Text) * stepmultiplier)).ToString();
+			}
+		}
+
+		// Wrap redrawing display so that it will not get called multiple
+		// times while loading a prefab
+		private void DoRedrawDisplay()
+		{
+			if(loadingprefab == false) General.Interface.RedrawDisplay();
+		}
+
+		private void btnOK_Click(object sender, EventArgs e)
+		{
+			SavePrefab("[Previous]", true, 0);
+
+			General.Editing.AcceptMode();
+		}
+
+		private void btnCancel_Click(object sender, EventArgs e)
+		{
+			General.Editing.CancelMode();
+		}
+
+		private void tbSectorDepth_TextChanged(object sender, EventArgs e)
+		{
+			DoRedrawDisplay();
+		}
+
+		private void rdbFront_CheckedChanged(object sender, EventArgs e)
+		{
+			DoRedrawDisplay();
+		}
+
+		private void rdbBack_CheckedChanged(object sender, EventArgs e)
+		{
+			DoRedrawDisplay();
+		}
+
+		private void tabcontrol_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if(General.Map.Map.GetSelectedLinedefs(true).Count == 1)
+			{
+				tabcontrol.SelectedTab = tabPage1;
+			}
+
+			if(tabcontrol.SelectedTab != tabPage1)
+			{
+				floorbase.Enabled = true;
+				ceilingbase.Enabled = true;
+			}
+			else
+			{
+				if(distinctbaseheights.Checked)
+				{
+					floorbase.Enabled = false;
+					ceilingbase.Enabled = false;
+				}
+				else
+				{
+					floorbase.Enabled = true;
+					ceilingbase.Enabled = true;
+				}
+			}
+
+			DoRedrawDisplay();
+			ComputeHeights();
+		}
+
+		/*private void tbAutoNumSectors_TextChanged(object sender, EventArgs e)
+		{
+			DoRedrawDisplay();
+		}*/
+
+		private void numberofsectors_WhenTextChanged(object sender, EventArgs e)
+		{
+			if(numberofsectors.Text == "" || numberofsectors.GetResult(1) == 0) numberofsectors.Text = "1";
+			ComputeHeights();
+			DoRedrawDisplay();
+		}
+
+		private void sectordepth_WhenTextChanged(object sender, EventArgs e)
+		{
+			if(sectordepth.GetResult(32) == 0) sectordepth.Text = "1";
+			DoRedrawDisplay();
+		}
+
+		private void StairSectorBuilderForm_Load(object sender, EventArgs e)
+		{
+			sectordepth.Text = "32";
+            spacing.Text = "0";
+			numberofsectors.Text = "1";
+			autocurveinnervertexmultiplier.Text = "1";
+			autocurveoutervertexmultiplier.Text = "1";
+			splineinnervertexmultiplier.Text = "1";
+			splineoutervertexmultiplier.Text = "1";
+			numberofcontrolpoints.Text = "1";
+            floorheightmod.Text = "0";
+            ceilingheightmod.Text = "0";
+			floorbase.Text = "0";
+			ceilingbase.Text = "0";
+			autocurveflipping.SelectedIndex = 0;
+			MiddleTextureTexture = "-";
+
+			fullyloaded = true;
+
+			ComputeHeights();
+		}
+
+		private void autocurveinnervertexmultiplier_WhenTextChanged(object sender, EventArgs e)
+		{
+			if(autocurveinnervertexmultiplier.GetResult(1) == 0) autocurveinnervertexmultiplier.Text = "1";
+
+			if(splineinnervertexmultiplier.Text != autocurveinnervertexmultiplier.Text)
+				splineinnervertexmultiplier.Text = autocurveinnervertexmultiplier.Text;
+
+			DoRedrawDisplay();
+		}
+
+		private void autocurveoutervertexmultiplier_WhenTextChanged(object sender, EventArgs e)
+		{
+			if(autocurveoutervertexmultiplier.GetResult(1) == 0) autocurveoutervertexmultiplier.Text = "1";
+
+			if(splineoutervertexmultiplier.Text != autocurveoutervertexmultiplier.Text)
+				splineoutervertexmultiplier.Text = autocurveoutervertexmultiplier.Text;
+
+			DoRedrawDisplay();
+
+		}
+
+		private void splineinnervertexmultiplier_WhenTextChanged(object sender, EventArgs e)
+		{
+			if(splineinnervertexmultiplier.GetResult(1) == 0) splineinnervertexmultiplier.Text = "1";
+
+			if(autocurveinnervertexmultiplier.Text != splineinnervertexmultiplier.Text)
+				autocurveinnervertexmultiplier.Text = splineinnervertexmultiplier.Text;
+
+			DoRedrawDisplay();
+		}
+
+		private void splineoutervertexmultiplier_WhenTextChanged(object sender, EventArgs e)
+		{
+			if(splineoutervertexmultiplier.GetResult(1) == 0) splineoutervertexmultiplier.Text = "1";
+
+			if(splineoutervertexmultiplier.Text != autocurveoutervertexmultiplier.Text)
+				autocurveoutervertexmultiplier.Text = splineoutervertexmultiplier.Text;
+
+			DoRedrawDisplay();
+		}
+
+		private void onecontrolpoint_CheckedChanged(object sender, EventArgs e)
+		{
+			DoRedrawDisplay();
+		}
+
+		private void StairSectorBuilderForm_Shown(object sender, EventArgs e)
+		{
+			if(General.Map.Map.GetSelectedLinedefs(true).Count == 1 || General.Map.Map.SelectedSectorsCount > 0)
+			{
+				tabcontrol.TabPages.Remove(tabPage2);
+				tabcontrol.TabPages.Remove(tabPage3);
+			}
+
+			if(General.Map.Map.SelectedSectorsCount > 0)
+			{
+				singledirection.Checked = false;
+				singledirection.Enabled = false;
+
+				singlesectors.Checked = true;
+				singlesectors.Enabled = false;
+			}
+		}
+
+		private void singlesectors_CheckedChanged(object sender, EventArgs e)
+		{
+			if(singlesectors.Checked)
+				singledirection.Enabled = true;
+			else
+				singledirection.Enabled = false;
+
+			DoRedrawDisplay();
+		}
+
+		private void numberofcontrolpoints_WhenTextChanged(object sender, EventArgs e)
+		{
+			if(numberofcontrolpoints.GetResult(1) == 0) numberofcontrolpoints.Text = "1";
+			DoRedrawDisplay();
+		}
+
+		private void sidefront_CheckedChanged(object sender, EventArgs e)
+		{
+			DoRedrawDisplay();
+		}
+
+		private void sideback_CheckedChanged(object sender, EventArgs e)
+		{
+			DoRedrawDisplay();
+		}
+
+		private void singledirection_CheckedChanged(object sender, EventArgs e)
+		{
+			DoRedrawDisplay();
+		}
+
+        private void floorheightmod_WhenTextChanged(object sender, EventArgs e)
+        {
+            if(floorheightmod.GetResult(0) == 0) floorheightmod.Text = "0";
+			ComputeHeights();
+        }
+
+        private void ceilingheightmod_WhenTextChanged(object sender, EventArgs e)
+        {
+            if(ceilingheightmod.GetResult(0) == 0) ceilingheightmod.Text = "0";
+			ComputeHeights();
+        }
+
+        private void floorflat_CheckedChanged(object sender, EventArgs e)
+        {
+            if(floorflat.Checked)
+                floorflattexture.Enabled = true;
+            else
+                floorflattexture.Enabled = false;
+        }
+
+        private void ceilingflat_CheckedChanged(object sender, EventArgs e)
+        {
+            if(ceilingflat.Checked)
+                ceilingflattexture.Enabled = true;
+            else
+                ceilingflattexture.Enabled = false;
+        }
+
+        private void spacing_WhenTextChanged(object sender, EventArgs e)
+        {
+            if(spacing.GetResult(0) == 0) spacing.Text = "0";
+            DoRedrawDisplay();
+        }
+
+        private void uppertexture_CheckedChanged(object sender, EventArgs e)
+        {
+			if(uppertexture.Checked)
+			{
+				uppertexturetexture.Enabled = true;
+				upperunpegged.Enabled = true;
+			}
+			else
+			{
+				uppertexturetexture.Enabled = false;
+				upperunpegged.Enabled = false;
+			}
+        }
+
+		private void middletexture_CheckedChanged(object sender, EventArgs e)
+		{
+			if(middletexture.Checked)
+				middletexturetexture.Enabled = true;
+			else
+				middletexturetexture.Enabled = false;
+		}
+
+        private void lowertexture_CheckedChanged(object sender, EventArgs e)
+        {
+			if(lowertexture.Checked)
+			{
+				lowertexturetexture.Enabled = true;
+				lowerunpegged.Enabled = true;
+			}
+			else
+			{
+				lowertexturetexture.Enabled = false;
+				lowerunpegged.Enabled = false;
+			}
+        }
+
+		private void firstisback_CheckedChanged(object sender, EventArgs e)
+		{
+			DoRedrawDisplay();
+		}
+
+		private void StairSectorBuilderForm_FormClosing(object sender, FormClosingEventArgs e)
+		{
+			// User closing the window?
+			if(e.CloseReason == CloseReason.UserClosing)
+			{
+				// Just cancel
+				General.Editing.CancelMode();
+				e.Cancel = true;
+			}
+		}
+
+		private void lastisback_CheckedChanged(object sender, EventArgs e)
+		{
+			DoRedrawDisplay();
+		}
+
+		private void acflipping1_CheckedChanged(object sender, EventArgs e)
+		{
+			DoRedrawDisplay();
+		}
+
+		private void acflipping2_CheckedChanged(object sender, EventArgs e)
+		{
+			DoRedrawDisplay();
+		}
+
+		private void acflipping3_CheckedChanged(object sender, EventArgs e)
+		{
+			DoRedrawDisplay();
+		}
+
+		private void floorbase_WhenTextChanged(object sender, EventArgs e)
+		{
+			if(floorbase.GetResult(0) == 0) floorbase.Text = "0";
+			ComputeHeights();
+		}
+
+		private void ceilingbase_WhenTextChanged(object sender, EventArgs e)
+		{
+			if(ceilingbase.GetResult(0) == 0) ceilingbase.Text = "0";
+			ComputeHeights();
+		}
+
+        private void prefabsave_Click(object sender, EventArgs e)
+        {
+			string name = prefabname.Text.Trim();
+
+			if(name == "[Previous]")
+				MessageBox.Show(Owner, "The prefab name \"[Previous]\" is reserved and can not be overwritten.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+			else
+				SavePrefab(prefabname.Text.Trim(), false, -1);
+		}
+
+		private void SavePrefab(string name, bool forceoverwrite, int position)
+		{
+            int overwrite = -1;
+
+            // Prefab name may not be empty
+            if(name == "")
+            {
+                MessageBox.Show(this.Owner, "Please enter a name for the prefab", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+
+            // Check if there's already a prefab with the given name
+			for(int i = 0; i < BuilderPlug.Me.Prefabs.Count; i++)
+			{
+				BuilderPlug.Prefab p = BuilderPlug.Me.Prefabs[i];
+
+				if(p.name == name)
+				{
+					if(forceoverwrite == false && MessageBox.Show(this.Owner, "A prefab with that name already exists. Overwrite?", "", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+						return;
+					else
+						overwrite = i;
+				}
+			}
+
+            ListViewItem lvi = new ListViewItem();
+            ListViewItem.ListViewSubItem lvisi = new ListViewItem.ListViewSubItem();
+
+            lvi.Text = name;
+            lvisi.Text = tabcontrol.TabPages[tabcontrol.SelectedIndex].Text;
+
+            lvi.SubItems.Add(lvisi);
+
+            BuilderPlug.Prefab pf = new BuilderPlug.Prefab();
+
+            pf.name = name;
+
+            pf.numberofsectors = (int)NumberOfSectors;
+            pf.outervertexmultiplier = OuterVertexMultiplier;
+            pf.innervertexmultiplier = InnerVertexMultiplier;
+
+            pf.stairtype = tabcontrol.SelectedIndex;
+
+            // Straight stairs
+            pf.sectordepth = (int)SectorDepth;
+            pf.spacing = Spacing;
+            pf.frontside = SideFront;
+            pf.singlesectors = SingleSectors.Checked;
+            pf.singledirection = SingleDirection.Checked;
+			pf.distinctbaseheights = DistinctBaseHeights.Checked;
+
+            // Auto curve
+			pf.flipping = Flipping;
+
+            // Catmull Rom spline
+            pf.numberofcontrolpoints = NumControlPoints - 2;
+
+            // Height info
+            pf.applyfloormod = FloorHeight;
+            pf.floormod = FloorHeightModification;
+			//pf.floorbase = FloorBase;
+            pf.applyceilingmod = CeilingHeight;
+            pf.ceilingmod = CeilingHeightModification;
+			//pf.ceilingbase = CeilingBase;
+
+            // Textures
+            pf.applyfloortexture = FloorFlat;
+            pf.floortexture = FloorFlatTexture;
+
+            pf.applyceilingtexture = CeilingFlat;
+            pf.ceilingtexture = CeilingFlatTexture;
+
+            pf.applyuppertexture = UpperTexture;
+            pf.uppertexture = UpperTextureTexture;
+			pf.upperunpegged = UpperUnpegged;
+
+			pf.applymiddletexture = MiddleTexture;
+			pf.middletexture = MiddleTextureTexture;
+
+            pf.applylowertexture = LowerTexture;
+            pf.lowertexture = LowerTextureTexture;
+			pf.lowerunpegged = LowerUnpegged;
+
+			if(overwrite == -1)
+			{
+				if(position == -1)
+				{
+					BuilderPlug.Me.Prefabs.Add(pf);
+					prefabs.Items.Add(lvi);
+				}
+				else
+				{
+					BuilderPlug.Me.Prefabs.Insert(position, pf);
+					prefabs.Items.Insert(position, lvi);
+				}
+			}
+			else
+			{
+				BuilderPlug.Me.Prefabs.RemoveAt(overwrite);
+				BuilderPlug.Me.Prefabs.Insert(overwrite, pf);
+
+				prefabs.Items.RemoveAt(overwrite);
+				prefabs.Items.Insert(overwrite, lvi);
+			}
+        }
+
+        private void prefabload_Click(object sender, EventArgs e)
+        {
+			if(prefabs.SelectedIndices.Count == 0) return;
+
+			loadingprefab = true;
+
+            BuilderPlug.Prefab p = BuilderPlug.Me.Prefabs[prefabs.SelectedIndices[0]];
+			
+            prefabname.Text = p.name;
+
+            NumberOfSectors = (uint)p.numberofsectors;
+            OuterVertexMultiplier = p.outervertexmultiplier;
+            InnerVertexMultiplier = p.innervertexmultiplier;
+
+            tabcontrol.SelectedIndex = p.stairtype;
+
+            // Straight stairs
+            SectorDepth = (uint)p.sectordepth;
+            Spacing = p.spacing;
+            SideFront = p.frontside;
+            SingleSectors.Checked = p.singlesectors;
+            SingleDirection.Checked = p.singledirection;
+			DistinctBaseHeights.Checked = p.distinctbaseheights;
+
+            // Auto curve TODO
+			Flipping = p.flipping;
+
+            // Catmull Rom spline
+            NumControlPoints = p.numberofcontrolpoints;
+
+            // Height info
+            FloorHeight = p.applyfloormod;
+            FloorHeightModification = p.floormod;
+			//FloorBase = p.floorbase;
+            CeilingHeight = p.applyceilingmod;
+            CeilingHeightModification = p.ceilingmod;
+			//CeilingBase = p.ceilingbase;
+
+            // Textures
+            FloorFlat = p.applyfloortexture;
+            FloorFlatTexture = p.floortexture;
+            CeilingFlat = p.applyceilingtexture;
+            CeilingFlatTexture = p.ceilingtexture;
+
+            UpperTexture = p.applyuppertexture;
+            UpperTextureTexture = p.uppertexture;
+			UpperUnpegged = p.upperunpegged;
+
+			MiddleTexture = p.applymiddletexture;
+			MiddleTextureTexture = p.middletexture;
+
+            LowerTexture = p.applylowertexture;
+            LowerTextureTexture = p.lowertexture;
+			LowerUnpegged = p.lowerunpegged;
+
+			loadingprefab = false;
+
+			DoRedrawDisplay();
+        }
+
+		private void prefabdelete_Click(object sender, EventArgs e)
+		{
+			if(prefabs.SelectedIndices.Count == 0) return;
+
+			BuilderPlug.Me.Prefabs.RemoveAt(prefabs.SelectedIndices[0]);
+			prefabs.Items.RemoveAt(prefabs.SelectedIndices[0]);
+		}
+
+		private void distinctbaseheights_CheckedChanged(object sender, EventArgs e)
+		{
+			if(distinctbaseheights.Checked)
+			{
+				floorbase.Enabled = false;
+				ceilingbase.Enabled = false;
+			}
+			else
+			{
+				if(floorheightmodification.Checked) floorbase.Enabled = true;
+				if(ceilingheightmodification.Checked) ceilingbase.Enabled = true;
+			}
+
+			ComputeHeights();
+		}
+
+		private void autocurveflipping_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if(autocurveflipping.SelectedIndex != splineflipping.SelectedIndex)
+				splineflipping.SelectedIndex = autocurveflipping.SelectedIndex;
+
+			DoRedrawDisplay();
+		}
+
+		private void splineflipping_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			if(splineflipping.SelectedIndex != autocurveflipping.SelectedIndex)
+				autocurveflipping.SelectedIndex = splineflipping.SelectedIndex;
+
+			DoRedrawDisplay();
+		}
+
+		private void floorheightmodification_CheckedChanged(object sender, EventArgs e)
+		{
+			if(floorheightmodification.Checked)
+			{
+				floorheightmod.Enabled = true;
+
+				if(StairType != 0 || distinctbaseheights.Checked == false)	floorbase.Enabled = true;
+			}
+			else
+			{
+				floorheightmod.Enabled = false;
+
+				if(StairType != 0 || distinctbaseheights.Checked == false)	floorbase.Enabled = false;
+			}
+		}
+
+		private void ceilingheightmodification_CheckedChanged(object sender, EventArgs e)
+		{
+			if(ceilingheightmodification.Checked)
+			{
+				ceilingheightmod.Enabled = true;
+
+				if(StairType != 0 || distinctbaseheights.Checked == false) ceilingbase.Enabled = true;
+			}
+			else
+			{
+				ceilingheightmod.Enabled = false;
+
+				if(StairType != 0 || distinctbaseheights.Checked == false) ceilingbase.Enabled = false;
+			}
+		}
+
+		private void floorbasegetter_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+		{
+			floorbase.Text = originalfloorbase.ToString();
+		}
+
+		private void ceilingbasegetter_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+		{
+			ceilingbase.Text = originalceilingbase.ToString();
+		}
+	}
+}
diff --git a/Source/Plugins/StairSectorBuilder/StairSectorBuilderForm.designer.cs b/Source/Plugins/StairSectorBuilder/StairSectorBuilderForm.designer.cs
new file mode 100644
index 0000000..53a69d0
--- /dev/null
+++ b/Source/Plugins/StairSectorBuilder/StairSectorBuilderForm.designer.cs
@@ -0,0 +1,1168 @@
+namespace CodeImp.DoomBuilder.StairSectorBuilderMode
+{
+	partial class StairSectorBuilderForm
+	{
+		/// <summary>
+		/// Erforderliche Designervariable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Verwendete Ressourcen bereinigen.
+		/// </summary>
+		/// <param name="disposing">True, wenn verwaltete Ressourcen gelöscht werden sollen; andernfalls False.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Vom Windows Form-Designer generierter Code
+
+		/// <summary>
+		/// Erforderliche Methode für die Designerunterstützung.
+		/// Der Inhalt der Methode darf nicht mit dem Code-Editor geändert werden.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.btnOK = new System.Windows.Forms.Button();
+			this.btnCancel = new System.Windows.Forms.Button();
+			this.groupBox1 = new System.Windows.Forms.GroupBox();
+			this.numberofsectors = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.label4 = new System.Windows.Forms.Label();
+			this.tabcontrol = new System.Windows.Forms.TabControl();
+			this.tabPage1 = new System.Windows.Forms.TabPage();
+			this.distinctbaseheights = new System.Windows.Forms.CheckBox();
+			this.spacing = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.label11 = new System.Windows.Forms.Label();
+			this.groupBox3 = new System.Windows.Forms.GroupBox();
+			this.singledirection = new System.Windows.Forms.CheckBox();
+			this.singlesectors = new System.Windows.Forms.CheckBox();
+			this.groupBox2 = new System.Windows.Forms.GroupBox();
+			this.sideback = new System.Windows.Forms.RadioButton();
+			this.sidefront = new System.Windows.Forms.RadioButton();
+			this.sectordepth = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.label1 = new System.Windows.Forms.Label();
+			this.tabPage2 = new System.Windows.Forms.TabPage();
+			this.autocurveflipping = new System.Windows.Forms.ComboBox();
+			this.label12 = new System.Windows.Forms.Label();
+			this.autocurveoutervertexmultiplier = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.autocurveinnervertexmultiplier = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.label6 = new System.Windows.Forms.Label();
+			this.label5 = new System.Windows.Forms.Label();
+			this.tabPage3 = new System.Windows.Forms.TabPage();
+			this.splineflipping = new System.Windows.Forms.ComboBox();
+			this.label13 = new System.Windows.Forms.Label();
+			this.splineoutervertexmultiplier = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.splineinnervertexmultiplier = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.label16 = new System.Windows.Forms.Label();
+			this.label17 = new System.Windows.Forms.Label();
+			this.numberofcontrolpoints = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.label10 = new System.Windows.Forms.Label();
+			this.groupBox4 = new System.Windows.Forms.GroupBox();
+			this.floorflattexture = new CodeImp.DoomBuilder.Controls.FlatSelectorControl();
+			this.floorflat = new System.Windows.Forms.CheckBox();
+			this.ceilingflat = new System.Windows.Forms.CheckBox();
+			this.groupBox5 = new System.Windows.Forms.GroupBox();
+			this.ceilingflattexture = new CodeImp.DoomBuilder.Controls.FlatSelectorControl();
+			this.groupBox6 = new System.Windows.Forms.GroupBox();
+			this.label14 = new System.Windows.Forms.Label();
+			this.floorbase = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.floorheightmodification = new System.Windows.Forms.CheckBox();
+			this.floorlast = new System.Windows.Forms.Label();
+			this.floorfirst = new System.Windows.Forms.Label();
+			this.label7 = new System.Windows.Forms.Label();
+			this.label3 = new System.Windows.Forms.Label();
+			this.floorheightmod = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.label = new System.Windows.Forms.Label();
+			this.groupBox7 = new System.Windows.Forms.GroupBox();
+			this.lowerunpegged = new System.Windows.Forms.CheckBox();
+			this.lowertexturetexture = new CodeImp.DoomBuilder.Controls.TextureSelectorControl();
+			this.lowertexture = new System.Windows.Forms.CheckBox();
+			this.groupBox8 = new System.Windows.Forms.GroupBox();
+			this.upperunpegged = new System.Windows.Forms.CheckBox();
+			this.uppertexturetexture = new CodeImp.DoomBuilder.Controls.TextureSelectorControl();
+			this.uppertexture = new System.Windows.Forms.CheckBox();
+			this.ceilinglast = new System.Windows.Forms.Label();
+			this.ceilingfirst = new System.Windows.Forms.Label();
+			this.label8 = new System.Windows.Forms.Label();
+			this.label9 = new System.Windows.Forms.Label();
+			this.ceilingheightmod = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.label2 = new System.Windows.Forms.Label();
+			this.groupBox9 = new System.Windows.Forms.GroupBox();
+			this.label15 = new System.Windows.Forms.Label();
+			this.ceilingbase = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.ceilingheightmodification = new System.Windows.Forms.CheckBox();
+			this.groupBox11 = new System.Windows.Forms.GroupBox();
+			this.prefabload = new System.Windows.Forms.Button();
+			this.prefabdelete = new System.Windows.Forms.Button();
+			this.prefabsave = new System.Windows.Forms.Button();
+			this.prefabname = new System.Windows.Forms.TextBox();
+			this.prefabs = new System.Windows.Forms.ListView();
+			this.columnHeader1 = new System.Windows.Forms.ColumnHeader();
+			this.columnHeader2 = new System.Windows.Forms.ColumnHeader();
+			this.groupBox10 = new System.Windows.Forms.GroupBox();
+			this.middletexturetexture = new CodeImp.DoomBuilder.Controls.TextureSelectorControl();
+			this.middletexture = new System.Windows.Forms.CheckBox();
+			this.groupBox1.SuspendLayout();
+			this.tabcontrol.SuspendLayout();
+			this.tabPage1.SuspendLayout();
+			this.groupBox3.SuspendLayout();
+			this.groupBox2.SuspendLayout();
+			this.tabPage2.SuspendLayout();
+			this.tabPage3.SuspendLayout();
+			this.groupBox4.SuspendLayout();
+			this.groupBox5.SuspendLayout();
+			this.groupBox6.SuspendLayout();
+			this.groupBox7.SuspendLayout();
+			this.groupBox8.SuspendLayout();
+			this.groupBox9.SuspendLayout();
+			this.groupBox11.SuspendLayout();
+			this.groupBox10.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// btnOK
+			// 
+			this.btnOK.Location = new System.Drawing.Point(333, 532);
+			this.btnOK.Name = "btnOK";
+			this.btnOK.Size = new System.Drawing.Size(112, 27);
+			this.btnOK.TabIndex = 4;
+			this.btnOK.Text = "OK";
+			this.btnOK.UseVisualStyleBackColor = true;
+			this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
+			// 
+			// btnCancel
+			// 
+			this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.btnCancel.Location = new System.Drawing.Point(448, 532);
+			this.btnCancel.Name = "btnCancel";
+			this.btnCancel.Size = new System.Drawing.Size(112, 27);
+			this.btnCancel.TabIndex = 5;
+			this.btnCancel.Text = "Cancel";
+			this.btnCancel.UseVisualStyleBackColor = true;
+			this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
+			// 
+			// groupBox1
+			// 
+			this.groupBox1.Controls.Add(this.numberofsectors);
+			this.groupBox1.Controls.Add(this.label4);
+			this.groupBox1.Location = new System.Drawing.Point(12, 9);
+			this.groupBox1.Name = "groupBox1";
+			this.groupBox1.Size = new System.Drawing.Size(220, 50);
+			this.groupBox1.TabIndex = 9;
+			this.groupBox1.TabStop = false;
+			this.groupBox1.Text = "General";
+			// 
+			// numberofsectors
+			// 
+			this.numberofsectors.AllowDecimal = false;
+			this.numberofsectors.AllowNegative = false;
+			this.numberofsectors.AllowRelative = false;
+			this.numberofsectors.ButtonStep = 1;
+			this.numberofsectors.ButtonStepFloat = 1F;
+			this.numberofsectors.Location = new System.Drawing.Point(112, 17);
+			this.numberofsectors.Name = "numberofsectors";
+			this.numberofsectors.Size = new System.Drawing.Size(56, 24);
+			this.numberofsectors.StepValues = null;
+			this.numberofsectors.TabIndex = 1;
+			this.numberofsectors.WhenTextChanged += new System.EventHandler(this.numberofsectors_WhenTextChanged);
+			// 
+			// label4
+			// 
+			this.label4.AutoSize = true;
+			this.label4.Location = new System.Drawing.Point(9, 22);
+			this.label4.Name = "label4";
+			this.label4.Size = new System.Drawing.Size(97, 14);
+			this.label4.TabIndex = 0;
+			this.label4.Text = "Number of sectors";
+			// 
+			// tabcontrol
+			// 
+			this.tabcontrol.Controls.Add(this.tabPage1);
+			this.tabcontrol.Controls.Add(this.tabPage2);
+			this.tabcontrol.Controls.Add(this.tabPage3);
+			this.tabcontrol.Location = new System.Drawing.Point(12, 65);
+			this.tabcontrol.Name = "tabcontrol";
+			this.tabcontrol.SelectedIndex = 0;
+			this.tabcontrol.Size = new System.Drawing.Size(220, 271);
+			this.tabcontrol.TabIndex = 10;
+			this.tabcontrol.SelectedIndexChanged += new System.EventHandler(this.tabcontrol_SelectedIndexChanged);
+			// 
+			// tabPage1
+			// 
+			this.tabPage1.Controls.Add(this.distinctbaseheights);
+			this.tabPage1.Controls.Add(this.spacing);
+			this.tabPage1.Controls.Add(this.label11);
+			this.tabPage1.Controls.Add(this.groupBox3);
+			this.tabPage1.Controls.Add(this.groupBox2);
+			this.tabPage1.Controls.Add(this.sectordepth);
+			this.tabPage1.Controls.Add(this.label1);
+			this.tabPage1.Location = new System.Drawing.Point(4, 23);
+			this.tabPage1.Name = "tabPage1";
+			this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
+			this.tabPage1.Size = new System.Drawing.Size(212, 244);
+			this.tabPage1.TabIndex = 0;
+			this.tabPage1.Text = "Straight";
+			this.tabPage1.UseVisualStyleBackColor = true;
+			// 
+			// distinctbaseheights
+			// 
+			this.distinctbaseheights.AutoSize = true;
+			this.distinctbaseheights.Location = new System.Drawing.Point(10, 70);
+			this.distinctbaseheights.Name = "distinctbaseheights";
+			this.distinctbaseheights.Size = new System.Drawing.Size(126, 18);
+			this.distinctbaseheights.TabIndex = 6;
+			this.distinctbaseheights.Text = "Distinct base heights";
+			this.distinctbaseheights.UseVisualStyleBackColor = true;
+			this.distinctbaseheights.CheckedChanged += new System.EventHandler(this.distinctbaseheights_CheckedChanged);
+			// 
+			// spacing
+			// 
+			this.spacing.AllowDecimal = false;
+			this.spacing.AllowNegative = false;
+			this.spacing.AllowRelative = false;
+			this.spacing.ButtonStep = 8;
+			this.spacing.ButtonStepFloat = 1F;
+			this.spacing.Location = new System.Drawing.Point(81, 33);
+			this.spacing.Name = "spacing";
+			this.spacing.Size = new System.Drawing.Size(56, 24);
+			this.spacing.StepValues = null;
+			this.spacing.TabIndex = 5;
+			this.spacing.WhenTextChanged += new System.EventHandler(this.spacing_WhenTextChanged);
+			// 
+			// label11
+			// 
+			this.label11.AutoSize = true;
+			this.label11.Location = new System.Drawing.Point(7, 37);
+			this.label11.Name = "label11";
+			this.label11.Size = new System.Drawing.Size(46, 14);
+			this.label11.TabIndex = 4;
+			this.label11.Text = "Spacing";
+			// 
+			// groupBox3
+			// 
+			this.groupBox3.Controls.Add(this.singledirection);
+			this.groupBox3.Controls.Add(this.singlesectors);
+			this.groupBox3.Location = new System.Drawing.Point(82, 94);
+			this.groupBox3.Name = "groupBox3";
+			this.groupBox3.Size = new System.Drawing.Size(124, 79);
+			this.groupBox3.TabIndex = 3;
+			this.groupBox3.TabStop = false;
+			this.groupBox3.Text = "Appearance";
+			// 
+			// singledirection
+			// 
+			this.singledirection.AutoSize = true;
+			this.singledirection.Enabled = false;
+			this.singledirection.Location = new System.Drawing.Point(7, 46);
+			this.singledirection.Name = "singledirection";
+			this.singledirection.Size = new System.Drawing.Size(99, 18);
+			this.singledirection.TabIndex = 1;
+			this.singledirection.Text = "Single direction";
+			this.singledirection.UseVisualStyleBackColor = true;
+			this.singledirection.CheckedChanged += new System.EventHandler(this.singledirection_CheckedChanged);
+			// 
+			// singlesectors
+			// 
+			this.singlesectors.AutoSize = true;
+			this.singlesectors.Enabled = false;
+			this.singlesectors.Location = new System.Drawing.Point(7, 22);
+			this.singlesectors.Name = "singlesectors";
+			this.singlesectors.Size = new System.Drawing.Size(95, 18);
+			this.singlesectors.TabIndex = 0;
+			this.singlesectors.Text = "Single sectors";
+			this.singlesectors.UseVisualStyleBackColor = true;
+			this.singlesectors.CheckedChanged += new System.EventHandler(this.singlesectors_CheckedChanged);
+			// 
+			// groupBox2
+			// 
+			this.groupBox2.Controls.Add(this.sideback);
+			this.groupBox2.Controls.Add(this.sidefront);
+			this.groupBox2.Location = new System.Drawing.Point(11, 94);
+			this.groupBox2.Name = "groupBox2";
+			this.groupBox2.Size = new System.Drawing.Size(65, 79);
+			this.groupBox2.TabIndex = 2;
+			this.groupBox2.TabStop = false;
+			this.groupBox2.Text = "Side";
+			// 
+			// sideback
+			// 
+			this.sideback.AutoSize = true;
+			this.sideback.Location = new System.Drawing.Point(7, 46);
+			this.sideback.Name = "sideback";
+			this.sideback.Size = new System.Drawing.Size(49, 18);
+			this.sideback.TabIndex = 1;
+			this.sideback.TabStop = true;
+			this.sideback.Text = "Back";
+			this.sideback.UseVisualStyleBackColor = true;
+			this.sideback.CheckedChanged += new System.EventHandler(this.sideback_CheckedChanged);
+			// 
+			// sidefront
+			// 
+			this.sidefront.AutoSize = true;
+			this.sidefront.Checked = true;
+			this.sidefront.Location = new System.Drawing.Point(7, 22);
+			this.sidefront.Name = "sidefront";
+			this.sidefront.Size = new System.Drawing.Size(50, 18);
+			this.sidefront.TabIndex = 0;
+			this.sidefront.TabStop = true;
+			this.sidefront.Text = "Front";
+			this.sidefront.UseVisualStyleBackColor = true;
+			this.sidefront.CheckedChanged += new System.EventHandler(this.sidefront_CheckedChanged);
+			// 
+			// sectordepth
+			// 
+			this.sectordepth.AllowDecimal = false;
+			this.sectordepth.AllowNegative = false;
+			this.sectordepth.AllowRelative = false;
+			this.sectordepth.ButtonStep = 8;
+			this.sectordepth.ButtonStepFloat = 1F;
+			this.sectordepth.Location = new System.Drawing.Point(81, 3);
+			this.sectordepth.Name = "sectordepth";
+			this.sectordepth.Size = new System.Drawing.Size(56, 24);
+			this.sectordepth.StepValues = null;
+			this.sectordepth.TabIndex = 1;
+			this.sectordepth.WhenTextChanged += new System.EventHandler(this.sectordepth_WhenTextChanged);
+			// 
+			// label1
+			// 
+			this.label1.AutoSize = true;
+			this.label1.Location = new System.Drawing.Point(7, 8);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(69, 14);
+			this.label1.TabIndex = 0;
+			this.label1.Text = "Sector depth";
+			// 
+			// tabPage2
+			// 
+			this.tabPage2.Controls.Add(this.autocurveflipping);
+			this.tabPage2.Controls.Add(this.label12);
+			this.tabPage2.Controls.Add(this.autocurveoutervertexmultiplier);
+			this.tabPage2.Controls.Add(this.autocurveinnervertexmultiplier);
+			this.tabPage2.Controls.Add(this.label6);
+			this.tabPage2.Controls.Add(this.label5);
+			this.tabPage2.Location = new System.Drawing.Point(4, 23);
+			this.tabPage2.Name = "tabPage2";
+			this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
+			this.tabPage2.Size = new System.Drawing.Size(212, 244);
+			this.tabPage2.TabIndex = 1;
+			this.tabPage2.Text = "Auto curve";
+			this.tabPage2.UseVisualStyleBackColor = true;
+			// 
+			// autocurveflipping
+			// 
+			this.autocurveflipping.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.autocurveflipping.FormattingEnabled = true;
+			this.autocurveflipping.Items.AddRange(new object[] {
+            "None",
+            "Source direction",
+            "Destination direction"});
+			this.autocurveflipping.Location = new System.Drawing.Point(55, 9);
+			this.autocurveflipping.Name = "autocurveflipping";
+			this.autocurveflipping.Size = new System.Drawing.Size(151, 22);
+			this.autocurveflipping.TabIndex = 11;
+			this.autocurveflipping.SelectedIndexChanged += new System.EventHandler(this.autocurveflipping_SelectedIndexChanged);
+			// 
+			// label12
+			// 
+			this.label12.AutoSize = true;
+			this.label12.Location = new System.Drawing.Point(6, 12);
+			this.label12.Name = "label12";
+			this.label12.Size = new System.Drawing.Size(43, 14);
+			this.label12.TabIndex = 10;
+			this.label12.Text = "Flipping";
+			// 
+			// autocurveoutervertexmultiplier
+			// 
+			this.autocurveoutervertexmultiplier.AllowDecimal = false;
+			this.autocurveoutervertexmultiplier.AllowNegative = false;
+			this.autocurveoutervertexmultiplier.AllowRelative = false;
+			this.autocurveoutervertexmultiplier.ButtonStep = 1;
+			this.autocurveoutervertexmultiplier.ButtonStepFloat = 1F;
+			this.autocurveoutervertexmultiplier.Location = new System.Drawing.Point(128, 72);
+			this.autocurveoutervertexmultiplier.Name = "autocurveoutervertexmultiplier";
+			this.autocurveoutervertexmultiplier.Size = new System.Drawing.Size(56, 24);
+			this.autocurveoutervertexmultiplier.StepValues = null;
+			this.autocurveoutervertexmultiplier.TabIndex = 9;
+			this.autocurveoutervertexmultiplier.WhenTextChanged += new System.EventHandler(this.autocurveoutervertexmultiplier_WhenTextChanged);
+			// 
+			// autocurveinnervertexmultiplier
+			// 
+			this.autocurveinnervertexmultiplier.AllowDecimal = false;
+			this.autocurveinnervertexmultiplier.AllowNegative = false;
+			this.autocurveinnervertexmultiplier.AllowRelative = false;
+			this.autocurveinnervertexmultiplier.ButtonStep = 1;
+			this.autocurveinnervertexmultiplier.ButtonStepFloat = 1F;
+			this.autocurveinnervertexmultiplier.Location = new System.Drawing.Point(128, 45);
+			this.autocurveinnervertexmultiplier.Name = "autocurveinnervertexmultiplier";
+			this.autocurveinnervertexmultiplier.Size = new System.Drawing.Size(56, 24);
+			this.autocurveinnervertexmultiplier.StepValues = null;
+			this.autocurveinnervertexmultiplier.TabIndex = 8;
+			this.autocurveinnervertexmultiplier.WhenTextChanged += new System.EventHandler(this.autocurveinnervertexmultiplier_WhenTextChanged);
+			// 
+			// label6
+			// 
+			this.label6.AutoSize = true;
+			this.label6.Location = new System.Drawing.Point(6, 77);
+			this.label6.Name = "label6";
+			this.label6.Size = new System.Drawing.Size(112, 14);
+			this.label6.TabIndex = 7;
+			this.label6.Text = "Outer vertex multiplier";
+			// 
+			// label5
+			// 
+			this.label5.AutoSize = true;
+			this.label5.Location = new System.Drawing.Point(6, 50);
+			this.label5.Name = "label5";
+			this.label5.Size = new System.Drawing.Size(109, 14);
+			this.label5.TabIndex = 6;
+			this.label5.Text = "Inner vertex multiplier";
+			// 
+			// tabPage3
+			// 
+			this.tabPage3.Controls.Add(this.splineflipping);
+			this.tabPage3.Controls.Add(this.label13);
+			this.tabPage3.Controls.Add(this.splineoutervertexmultiplier);
+			this.tabPage3.Controls.Add(this.splineinnervertexmultiplier);
+			this.tabPage3.Controls.Add(this.label16);
+			this.tabPage3.Controls.Add(this.label17);
+			this.tabPage3.Controls.Add(this.numberofcontrolpoints);
+			this.tabPage3.Controls.Add(this.label10);
+			this.tabPage3.Location = new System.Drawing.Point(4, 23);
+			this.tabPage3.Name = "tabPage3";
+			this.tabPage3.Padding = new System.Windows.Forms.Padding(3);
+			this.tabPage3.Size = new System.Drawing.Size(212, 244);
+			this.tabPage3.TabIndex = 2;
+			this.tabPage3.Text = "Catmull Rom";
+			this.tabPage3.UseVisualStyleBackColor = true;
+			// 
+			// splineflipping
+			// 
+			this.splineflipping.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.splineflipping.FormattingEnabled = true;
+			this.splineflipping.Items.AddRange(new object[] {
+            "None",
+            "Source direction",
+            "Destination direction"});
+			this.splineflipping.Location = new System.Drawing.Point(55, 9);
+			this.splineflipping.Name = "splineflipping";
+			this.splineflipping.Size = new System.Drawing.Size(151, 22);
+			this.splineflipping.TabIndex = 13;
+			this.splineflipping.SelectedIndexChanged += new System.EventHandler(this.splineflipping_SelectedIndexChanged);
+			// 
+			// label13
+			// 
+			this.label13.AutoSize = true;
+			this.label13.Location = new System.Drawing.Point(6, 12);
+			this.label13.Name = "label13";
+			this.label13.Size = new System.Drawing.Size(43, 14);
+			this.label13.TabIndex = 12;
+			this.label13.Text = "Flipping";
+			// 
+			// splineoutervertexmultiplier
+			// 
+			this.splineoutervertexmultiplier.AllowDecimal = false;
+			this.splineoutervertexmultiplier.AllowNegative = false;
+			this.splineoutervertexmultiplier.AllowRelative = false;
+			this.splineoutervertexmultiplier.ButtonStep = 1;
+			this.splineoutervertexmultiplier.ButtonStepFloat = 1F;
+			this.splineoutervertexmultiplier.Location = new System.Drawing.Point(128, 72);
+			this.splineoutervertexmultiplier.Name = "splineoutervertexmultiplier";
+			this.splineoutervertexmultiplier.Size = new System.Drawing.Size(56, 24);
+			this.splineoutervertexmultiplier.StepValues = null;
+			this.splineoutervertexmultiplier.TabIndex = 9;
+			this.splineoutervertexmultiplier.WhenTextChanged += new System.EventHandler(this.splineoutervertexmultiplier_WhenTextChanged);
+			// 
+			// splineinnervertexmultiplier
+			// 
+			this.splineinnervertexmultiplier.AllowDecimal = false;
+			this.splineinnervertexmultiplier.AllowNegative = false;
+			this.splineinnervertexmultiplier.AllowRelative = false;
+			this.splineinnervertexmultiplier.ButtonStep = 1;
+			this.splineinnervertexmultiplier.ButtonStepFloat = 1F;
+			this.splineinnervertexmultiplier.Location = new System.Drawing.Point(128, 45);
+			this.splineinnervertexmultiplier.Name = "splineinnervertexmultiplier";
+			this.splineinnervertexmultiplier.Size = new System.Drawing.Size(56, 24);
+			this.splineinnervertexmultiplier.StepValues = null;
+			this.splineinnervertexmultiplier.TabIndex = 8;
+			this.splineinnervertexmultiplier.WhenTextChanged += new System.EventHandler(this.splineinnervertexmultiplier_WhenTextChanged);
+			// 
+			// label16
+			// 
+			this.label16.AutoSize = true;
+			this.label16.Location = new System.Drawing.Point(6, 77);
+			this.label16.Name = "label16";
+			this.label16.Size = new System.Drawing.Size(112, 14);
+			this.label16.TabIndex = 7;
+			this.label16.Text = "Outer vertex multiplier";
+			// 
+			// label17
+			// 
+			this.label17.AutoSize = true;
+			this.label17.Location = new System.Drawing.Point(6, 50);
+			this.label17.Name = "label17";
+			this.label17.Size = new System.Drawing.Size(109, 14);
+			this.label17.TabIndex = 6;
+			this.label17.Text = "Inner vertex multiplier";
+			// 
+			// numberofcontrolpoints
+			// 
+			this.numberofcontrolpoints.AllowDecimal = false;
+			this.numberofcontrolpoints.AllowNegative = false;
+			this.numberofcontrolpoints.AllowRelative = false;
+			this.numberofcontrolpoints.ButtonStep = 1;
+			this.numberofcontrolpoints.ButtonStepFloat = 1F;
+			this.numberofcontrolpoints.Location = new System.Drawing.Point(128, 99);
+			this.numberofcontrolpoints.Name = "numberofcontrolpoints";
+			this.numberofcontrolpoints.Size = new System.Drawing.Size(56, 24);
+			this.numberofcontrolpoints.StepValues = null;
+			this.numberofcontrolpoints.TabIndex = 3;
+			this.numberofcontrolpoints.WhenTextChanged += new System.EventHandler(this.numberofcontrolpoints_WhenTextChanged);
+			// 
+			// label10
+			// 
+			this.label10.AutoSize = true;
+			this.label10.Location = new System.Drawing.Point(6, 104);
+			this.label10.Name = "label10";
+			this.label10.Size = new System.Drawing.Size(73, 14);
+			this.label10.TabIndex = 2;
+			this.label10.Text = "Control points";
+			// 
+			// groupBox4
+			// 
+			this.groupBox4.Controls.Add(this.floorflattexture);
+			this.groupBox4.Controls.Add(this.floorflat);
+			this.groupBox4.Location = new System.Drawing.Point(12, 343);
+			this.groupBox4.Name = "groupBox4";
+			this.groupBox4.Size = new System.Drawing.Size(105, 183);
+			this.groupBox4.TabIndex = 11;
+			this.groupBox4.TabStop = false;
+			// 
+			// floorflattexture
+			// 
+			this.floorflattexture.Enabled = false;
+			this.floorflattexture.Location = new System.Drawing.Point(8, 23);
+			this.floorflattexture.MultipleTextures = false;
+			this.floorflattexture.Name = "floorflattexture";
+			this.floorflattexture.Size = new System.Drawing.Size(90, 127);
+			this.floorflattexture.TabIndex = 1;
+			this.floorflattexture.TextureName = "";
+			// 
+			// floorflat
+			// 
+			this.floorflat.AutoSize = true;
+			this.floorflat.Location = new System.Drawing.Point(9, -1);
+			this.floorflat.Name = "floorflat";
+			this.floorflat.Size = new System.Drawing.Size(68, 18);
+			this.floorflat.TabIndex = 0;
+			this.floorflat.Text = "Floor flat";
+			this.floorflat.UseVisualStyleBackColor = true;
+			this.floorflat.CheckedChanged += new System.EventHandler(this.floorflat_CheckedChanged);
+			// 
+			// ceilingflat
+			// 
+			this.ceilingflat.AutoSize = true;
+			this.ceilingflat.Location = new System.Drawing.Point(9, -1);
+			this.ceilingflat.Name = "ceilingflat";
+			this.ceilingflat.Size = new System.Drawing.Size(75, 18);
+			this.ceilingflat.TabIndex = 0;
+			this.ceilingflat.Text = "Ceiling flat";
+			this.ceilingflat.UseVisualStyleBackColor = true;
+			this.ceilingflat.CheckedChanged += new System.EventHandler(this.ceilingflat_CheckedChanged);
+			// 
+			// groupBox5
+			// 
+			this.groupBox5.Controls.Add(this.ceilingflattexture);
+			this.groupBox5.Controls.Add(this.ceilingflat);
+			this.groupBox5.Location = new System.Drawing.Point(123, 343);
+			this.groupBox5.Name = "groupBox5";
+			this.groupBox5.Size = new System.Drawing.Size(105, 183);
+			this.groupBox5.TabIndex = 12;
+			this.groupBox5.TabStop = false;
+			// 
+			// ceilingflattexture
+			// 
+			this.ceilingflattexture.Enabled = false;
+			this.ceilingflattexture.Location = new System.Drawing.Point(8, 23);
+			this.ceilingflattexture.MultipleTextures = false;
+			this.ceilingflattexture.Name = "ceilingflattexture";
+			this.ceilingflattexture.Size = new System.Drawing.Size(90, 127);
+			this.ceilingflattexture.TabIndex = 2;
+			this.ceilingflattexture.TextureName = "";
+			// 
+			// groupBox6
+			// 
+			this.groupBox6.Controls.Add(this.label14);
+			this.groupBox6.Controls.Add(this.floorbase);
+			this.groupBox6.Controls.Add(this.floorheightmodification);
+			this.groupBox6.Controls.Add(this.floorlast);
+			this.groupBox6.Controls.Add(this.floorfirst);
+			this.groupBox6.Controls.Add(this.label7);
+			this.groupBox6.Controls.Add(this.label3);
+			this.groupBox6.Controls.Add(this.floorheightmod);
+			this.groupBox6.Controls.Add(this.label);
+			this.groupBox6.Location = new System.Drawing.Point(238, 203);
+			this.groupBox6.Name = "groupBox6";
+			this.groupBox6.Size = new System.Drawing.Size(110, 134);
+			this.groupBox6.TabIndex = 13;
+			this.groupBox6.TabStop = false;
+			this.groupBox6.Text = "c";
+			// 
+			// label14
+			// 
+			this.label14.AutoSize = true;
+			this.label14.Location = new System.Drawing.Point(4, 53);
+			this.label14.Name = "label14";
+			this.label14.Size = new System.Drawing.Size(32, 14);
+			this.label14.TabIndex = 17;
+			this.label14.Text = "Base";
+			// 
+			// floorbase
+			// 
+			this.floorbase.AllowDecimal = false;
+			this.floorbase.AllowNegative = true;
+			this.floorbase.AllowRelative = false;
+			this.floorbase.ButtonStep = 8;
+			this.floorbase.ButtonStepFloat = 1F;
+			this.floorbase.Location = new System.Drawing.Point(45, 48);
+			this.floorbase.Name = "floorbase";
+			this.floorbase.Size = new System.Drawing.Size(56, 24);
+			this.floorbase.StepValues = null;
+			this.floorbase.TabIndex = 16;
+			this.floorbase.WhenTextChanged += new System.EventHandler(this.floorbase_WhenTextChanged);
+			// 
+			// floorheightmodification
+			// 
+			this.floorheightmodification.AutoSize = true;
+			this.floorheightmodification.Checked = true;
+			this.floorheightmodification.CheckState = System.Windows.Forms.CheckState.Checked;
+			this.floorheightmodification.Location = new System.Drawing.Point(9, -1);
+			this.floorheightmodification.Name = "floorheightmodification";
+			this.floorheightmodification.Size = new System.Drawing.Size(82, 18);
+			this.floorheightmodification.TabIndex = 14;
+			this.floorheightmodification.Text = "Floor height";
+			this.floorheightmodification.UseVisualStyleBackColor = true;
+			this.floorheightmodification.CheckedChanged += new System.EventHandler(this.floorheightmodification_CheckedChanged);
+			// 
+			// floorlast
+			// 
+			this.floorlast.AutoSize = true;
+			this.floorlast.Location = new System.Drawing.Point(41, 108);
+			this.floorlast.Name = "floorlast";
+			this.floorlast.Size = new System.Drawing.Size(46, 14);
+			this.floorlast.TabIndex = 11;
+			this.floorlast.Text = "floorlast";
+			// 
+			// floorfirst
+			// 
+			this.floorfirst.AutoSize = true;
+			this.floorfirst.Location = new System.Drawing.Point(41, 81);
+			this.floorfirst.Name = "floorfirst";
+			this.floorfirst.Size = new System.Drawing.Size(48, 14);
+			this.floorfirst.TabIndex = 10;
+			this.floorfirst.Text = "floorfirst";
+			// 
+			// label7
+			// 
+			this.label7.AutoSize = true;
+			this.label7.Location = new System.Drawing.Point(4, 108);
+			this.label7.Name = "label7";
+			this.label7.Size = new System.Drawing.Size(31, 14);
+			this.label7.TabIndex = 7;
+			this.label7.Text = "Last:";
+			// 
+			// label3
+			// 
+			this.label3.AutoSize = true;
+			this.label3.Location = new System.Drawing.Point(4, 81);
+			this.label3.Name = "label3";
+			this.label3.Size = new System.Drawing.Size(31, 14);
+			this.label3.TabIndex = 6;
+			this.label3.Text = "First:";
+			// 
+			// floorheightmod
+			// 
+			this.floorheightmod.AllowDecimal = false;
+			this.floorheightmod.AllowNegative = true;
+			this.floorheightmod.AllowRelative = false;
+			this.floorheightmod.ButtonStep = 8;
+			this.floorheightmod.ButtonStepFloat = 1F;
+			this.floorheightmod.Location = new System.Drawing.Point(45, 22);
+			this.floorheightmod.Name = "floorheightmod";
+			this.floorheightmod.Size = new System.Drawing.Size(56, 24);
+			this.floorheightmod.StepValues = null;
+			this.floorheightmod.TabIndex = 3;
+			this.floorheightmod.WhenTextChanged += new System.EventHandler(this.floorheightmod_WhenTextChanged);
+			// 
+			// label
+			// 
+			this.label.AutoSize = true;
+			this.label.Location = new System.Drawing.Point(4, 27);
+			this.label.Name = "label";
+			this.label.Size = new System.Drawing.Size(39, 14);
+			this.label.TabIndex = 2;
+			this.label.Text = "Modify";
+			// 
+			// groupBox7
+			// 
+			this.groupBox7.Controls.Add(this.lowerunpegged);
+			this.groupBox7.Controls.Add(this.lowertexturetexture);
+			this.groupBox7.Controls.Add(this.lowertexture);
+			this.groupBox7.Location = new System.Drawing.Point(456, 342);
+			this.groupBox7.Name = "groupBox7";
+			this.groupBox7.Size = new System.Drawing.Size(105, 183);
+			this.groupBox7.TabIndex = 14;
+			this.groupBox7.TabStop = false;
+			// 
+			// lowerunpegged
+			// 
+			this.lowerunpegged.AutoSize = true;
+			this.lowerunpegged.Checked = true;
+			this.lowerunpegged.CheckState = System.Windows.Forms.CheckState.Checked;
+			this.lowerunpegged.Location = new System.Drawing.Point(9, 156);
+			this.lowerunpegged.Name = "lowerunpegged";
+			this.lowerunpegged.Size = new System.Drawing.Size(75, 18);
+			this.lowerunpegged.TabIndex = 3;
+			this.lowerunpegged.Text = "Unpegged";
+			this.lowerunpegged.UseVisualStyleBackColor = true;
+			// 
+			// lowertexturetexture
+			// 
+			this.lowertexturetexture.Location = new System.Drawing.Point(8, 23);
+			this.lowertexturetexture.MultipleTextures = false;
+			this.lowertexturetexture.Name = "lowertexturetexture";
+			this.lowertexturetexture.Required = false;
+			this.lowertexturetexture.Size = new System.Drawing.Size(90, 127);
+			this.lowertexturetexture.TabIndex = 2;
+			this.lowertexturetexture.TextureName = "";
+			// 
+			// lowertexture
+			// 
+			this.lowertexture.AutoSize = true;
+			this.lowertexture.Checked = true;
+			this.lowertexture.CheckState = System.Windows.Forms.CheckState.Checked;
+			this.lowertexture.Location = new System.Drawing.Point(9, -1);
+			this.lowertexture.Name = "lowertexture";
+			this.lowertexture.Size = new System.Drawing.Size(95, 18);
+			this.lowertexture.TabIndex = 0;
+			this.lowertexture.Text = "Lower texture";
+			this.lowertexture.UseVisualStyleBackColor = true;
+			this.lowertexture.CheckedChanged += new System.EventHandler(this.lowertexture_CheckedChanged);
+			// 
+			// groupBox8
+			// 
+			this.groupBox8.Controls.Add(this.upperunpegged);
+			this.groupBox8.Controls.Add(this.uppertexturetexture);
+			this.groupBox8.Controls.Add(this.uppertexture);
+			this.groupBox8.Location = new System.Drawing.Point(234, 343);
+			this.groupBox8.Name = "groupBox8";
+			this.groupBox8.Size = new System.Drawing.Size(105, 183);
+			this.groupBox8.TabIndex = 13;
+			this.groupBox8.TabStop = false;
+			// 
+			// upperunpegged
+			// 
+			this.upperunpegged.AutoSize = true;
+			this.upperunpegged.Checked = true;
+			this.upperunpegged.CheckState = System.Windows.Forms.CheckState.Checked;
+			this.upperunpegged.Location = new System.Drawing.Point(9, 156);
+			this.upperunpegged.Name = "upperunpegged";
+			this.upperunpegged.Size = new System.Drawing.Size(75, 18);
+			this.upperunpegged.TabIndex = 4;
+			this.upperunpegged.Text = "Unpegged";
+			this.upperunpegged.UseVisualStyleBackColor = true;
+			// 
+			// uppertexturetexture
+			// 
+			this.uppertexturetexture.Location = new System.Drawing.Point(8, 23);
+			this.uppertexturetexture.MultipleTextures = false;
+			this.uppertexturetexture.Name = "uppertexturetexture";
+			this.uppertexturetexture.Required = false;
+			this.uppertexturetexture.Size = new System.Drawing.Size(90, 127);
+			this.uppertexturetexture.TabIndex = 1;
+			this.uppertexturetexture.TextureName = "";
+			// 
+			// uppertexture
+			// 
+			this.uppertexture.AutoSize = true;
+			this.uppertexture.Checked = true;
+			this.uppertexture.CheckState = System.Windows.Forms.CheckState.Checked;
+			this.uppertexture.Location = new System.Drawing.Point(9, -1);
+			this.uppertexture.Name = "uppertexture";
+			this.uppertexture.Size = new System.Drawing.Size(92, 18);
+			this.uppertexture.TabIndex = 0;
+			this.uppertexture.Text = "Upper texture";
+			this.uppertexture.UseVisualStyleBackColor = true;
+			this.uppertexture.CheckedChanged += new System.EventHandler(this.uppertexture_CheckedChanged);
+			// 
+			// ceilinglast
+			// 
+			this.ceilinglast.AutoSize = true;
+			this.ceilinglast.Location = new System.Drawing.Point(41, 108);
+			this.ceilinglast.Name = "ceilinglast";
+			this.ceilinglast.Size = new System.Drawing.Size(54, 14);
+			this.ceilinglast.TabIndex = 24;
+			this.ceilinglast.Text = "ceilinglast";
+			// 
+			// ceilingfirst
+			// 
+			this.ceilingfirst.AutoSize = true;
+			this.ceilingfirst.Location = new System.Drawing.Point(41, 81);
+			this.ceilingfirst.Name = "ceilingfirst";
+			this.ceilingfirst.Size = new System.Drawing.Size(56, 14);
+			this.ceilingfirst.TabIndex = 23;
+			this.ceilingfirst.Text = "ceilingfirst";
+			// 
+			// label8
+			// 
+			this.label8.AutoSize = true;
+			this.label8.Location = new System.Drawing.Point(4, 108);
+			this.label8.Name = "label8";
+			this.label8.Size = new System.Drawing.Size(31, 14);
+			this.label8.TabIndex = 22;
+			this.label8.Text = "Last:";
+			// 
+			// label9
+			// 
+			this.label9.AutoSize = true;
+			this.label9.Location = new System.Drawing.Point(4, 81);
+			this.label9.Name = "label9";
+			this.label9.Size = new System.Drawing.Size(31, 14);
+			this.label9.TabIndex = 21;
+			this.label9.Text = "First:";
+			// 
+			// ceilingheightmod
+			// 
+			this.ceilingheightmod.AllowDecimal = false;
+			this.ceilingheightmod.AllowNegative = true;
+			this.ceilingheightmod.AllowRelative = false;
+			this.ceilingheightmod.ButtonStep = 8;
+			this.ceilingheightmod.ButtonStepFloat = 1F;
+			this.ceilingheightmod.Location = new System.Drawing.Point(45, 22);
+			this.ceilingheightmod.Name = "ceilingheightmod";
+			this.ceilingheightmod.Size = new System.Drawing.Size(56, 24);
+			this.ceilingheightmod.StepValues = null;
+			this.ceilingheightmod.TabIndex = 20;
+			this.ceilingheightmod.WhenTextChanged += new System.EventHandler(this.ceilingheightmod_WhenTextChanged);
+			// 
+			// label2
+			// 
+			this.label2.AutoSize = true;
+			this.label2.Location = new System.Drawing.Point(4, 27);
+			this.label2.Name = "label2";
+			this.label2.Size = new System.Drawing.Size(39, 14);
+			this.label2.TabIndex = 19;
+			this.label2.Text = "Modify";
+			// 
+			// groupBox9
+			// 
+			this.groupBox9.Controls.Add(this.label15);
+			this.groupBox9.Controls.Add(this.ceilingbase);
+			this.groupBox9.Controls.Add(this.ceilingheightmodification);
+			this.groupBox9.Controls.Add(this.ceilingheightmod);
+			this.groupBox9.Controls.Add(this.label2);
+			this.groupBox9.Controls.Add(this.ceilinglast);
+			this.groupBox9.Controls.Add(this.label9);
+			this.groupBox9.Controls.Add(this.ceilingfirst);
+			this.groupBox9.Controls.Add(this.label8);
+			this.groupBox9.Location = new System.Drawing.Point(354, 203);
+			this.groupBox9.Name = "groupBox9";
+			this.groupBox9.Size = new System.Drawing.Size(110, 134);
+			this.groupBox9.TabIndex = 18;
+			this.groupBox9.TabStop = false;
+			this.groupBox9.Text = "c";
+			// 
+			// label15
+			// 
+			this.label15.AutoSize = true;
+			this.label15.Location = new System.Drawing.Point(4, 53);
+			this.label15.Name = "label15";
+			this.label15.Size = new System.Drawing.Size(32, 14);
+			this.label15.TabIndex = 27;
+			this.label15.Text = "Base";
+			// 
+			// ceilingbase
+			// 
+			this.ceilingbase.AllowDecimal = false;
+			this.ceilingbase.AllowNegative = true;
+			this.ceilingbase.AllowRelative = false;
+			this.ceilingbase.ButtonStep = 8;
+			this.ceilingbase.ButtonStepFloat = 1F;
+			this.ceilingbase.Location = new System.Drawing.Point(45, 48);
+			this.ceilingbase.Name = "ceilingbase";
+			this.ceilingbase.Size = new System.Drawing.Size(56, 24);
+			this.ceilingbase.StepValues = null;
+			this.ceilingbase.TabIndex = 26;
+			this.ceilingbase.WhenTextChanged += new System.EventHandler(this.ceilingbase_WhenTextChanged);
+			// 
+			// ceilingheightmodification
+			// 
+			this.ceilingheightmodification.AutoSize = true;
+			this.ceilingheightmodification.Checked = true;
+			this.ceilingheightmodification.CheckState = System.Windows.Forms.CheckState.Checked;
+			this.ceilingheightmodification.Location = new System.Drawing.Point(9, -1);
+			this.ceilingheightmodification.Name = "ceilingheightmodification";
+			this.ceilingheightmodification.Size = new System.Drawing.Size(89, 18);
+			this.ceilingheightmodification.TabIndex = 14;
+			this.ceilingheightmodification.Text = "Ceiling height";
+			this.ceilingheightmodification.UseVisualStyleBackColor = true;
+			this.ceilingheightmodification.CheckedChanged += new System.EventHandler(this.ceilingheightmodification_CheckedChanged);
+			// 
+			// groupBox11
+			// 
+			this.groupBox11.Controls.Add(this.prefabload);
+			this.groupBox11.Controls.Add(this.prefabdelete);
+			this.groupBox11.Controls.Add(this.prefabsave);
+			this.groupBox11.Controls.Add(this.prefabname);
+			this.groupBox11.Controls.Add(this.prefabs);
+			this.groupBox11.Location = new System.Drawing.Point(238, 9);
+			this.groupBox11.Name = "groupBox11";
+			this.groupBox11.Size = new System.Drawing.Size(323, 187);
+			this.groupBox11.TabIndex = 24;
+			this.groupBox11.TabStop = false;
+			this.groupBox11.Text = "Prefabs";
+			// 
+			// prefabload
+			// 
+			this.prefabload.Location = new System.Drawing.Point(80, 156);
+			this.prefabload.Name = "prefabload";
+			this.prefabload.Size = new System.Drawing.Size(65, 23);
+			this.prefabload.TabIndex = 28;
+			this.prefabload.Text = "Load";
+			this.prefabload.UseVisualStyleBackColor = true;
+			this.prefabload.Click += new System.EventHandler(this.prefabload_Click);
+			// 
+			// prefabdelete
+			// 
+			this.prefabdelete.Location = new System.Drawing.Point(151, 156);
+			this.prefabdelete.Name = "prefabdelete";
+			this.prefabdelete.Size = new System.Drawing.Size(65, 23);
+			this.prefabdelete.TabIndex = 27;
+			this.prefabdelete.Text = "Delete";
+			this.prefabdelete.UseVisualStyleBackColor = true;
+			this.prefabdelete.Click += new System.EventHandler(this.prefabdelete_Click);
+			// 
+			// prefabsave
+			// 
+			this.prefabsave.Location = new System.Drawing.Point(9, 156);
+			this.prefabsave.Name = "prefabsave";
+			this.prefabsave.Size = new System.Drawing.Size(65, 23);
+			this.prefabsave.TabIndex = 26;
+			this.prefabsave.Text = "Save";
+			this.prefabsave.UseVisualStyleBackColor = true;
+			this.prefabsave.Click += new System.EventHandler(this.prefabsave_Click);
+			// 
+			// prefabname
+			// 
+			this.prefabname.Location = new System.Drawing.Point(10, 19);
+			this.prefabname.Name = "prefabname";
+			this.prefabname.Size = new System.Drawing.Size(306, 20);
+			this.prefabname.TabIndex = 25;
+			// 
+			// prefabs
+			// 
+			this.prefabs.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+            this.columnHeader1,
+            this.columnHeader2});
+			this.prefabs.FullRowSelect = true;
+			this.prefabs.Location = new System.Drawing.Point(9, 41);
+			this.prefabs.MultiSelect = false;
+			this.prefabs.Name = "prefabs";
+			this.prefabs.Size = new System.Drawing.Size(307, 109);
+			this.prefabs.TabIndex = 24;
+			this.prefabs.UseCompatibleStateImageBehavior = false;
+			this.prefabs.View = System.Windows.Forms.View.Details;
+			// 
+			// columnHeader1
+			// 
+			this.columnHeader1.Text = "Name";
+			this.columnHeader1.Width = 200;
+			// 
+			// columnHeader2
+			// 
+			this.columnHeader2.Text = "Type";
+			this.columnHeader2.Width = 80;
+			// 
+			// groupBox10
+			// 
+			this.groupBox10.Controls.Add(this.middletexturetexture);
+			this.groupBox10.Controls.Add(this.middletexture);
+			this.groupBox10.Location = new System.Drawing.Point(345, 343);
+			this.groupBox10.Name = "groupBox10";
+			this.groupBox10.Size = new System.Drawing.Size(105, 183);
+			this.groupBox10.TabIndex = 25;
+			this.groupBox10.TabStop = false;
+			// 
+			// middletexturetexture
+			// 
+			this.middletexturetexture.Enabled = false;
+			this.middletexturetexture.Location = new System.Drawing.Point(8, 23);
+			this.middletexturetexture.MultipleTextures = false;
+			this.middletexturetexture.Name = "middletexturetexture";
+			this.middletexturetexture.Required = false;
+			this.middletexturetexture.Size = new System.Drawing.Size(90, 127);
+			this.middletexturetexture.TabIndex = 2;
+			this.middletexturetexture.TextureName = "";
+			// 
+			// middletexture
+			// 
+			this.middletexture.AutoSize = true;
+			this.middletexture.Location = new System.Drawing.Point(9, -1);
+			this.middletexture.Name = "middletexture";
+			this.middletexture.Size = new System.Drawing.Size(93, 18);
+			this.middletexture.TabIndex = 0;
+			this.middletexture.Text = "Middle texture";
+			this.middletexture.UseVisualStyleBackColor = true;
+			this.middletexture.CheckedChanged += new System.EventHandler(this.middletexture_CheckedChanged);
+			// 
+			// StairSectorBuilderForm
+			// 
+			this.AcceptButton = this.btnOK;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.CancelButton = this.btnCancel;
+			this.ClientSize = new System.Drawing.Size(573, 570);
+			this.Controls.Add(this.groupBox10);
+			this.Controls.Add(this.groupBox11);
+			this.Controls.Add(this.groupBox9);
+			this.Controls.Add(this.groupBox7);
+			this.Controls.Add(this.groupBox8);
+			this.Controls.Add(this.groupBox6);
+			this.Controls.Add(this.groupBox5);
+			this.Controls.Add(this.groupBox4);
+			this.Controls.Add(this.tabcontrol);
+			this.Controls.Add(this.groupBox1);
+			this.Controls.Add(this.btnCancel);
+			this.Controls.Add(this.btnOK);
+			this.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "StairSectorBuilderForm";
+			this.Opacity = 0;
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
+			this.Text = "Stair Sector Builder";
+			this.Load += new System.EventHandler(this.StairSectorBuilderForm_Load);
+			this.Shown += new System.EventHandler(this.StairSectorBuilderForm_Shown);
+			this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.StairSectorBuilderForm_FormClosing);
+			this.groupBox1.ResumeLayout(false);
+			this.groupBox1.PerformLayout();
+			this.tabcontrol.ResumeLayout(false);
+			this.tabPage1.ResumeLayout(false);
+			this.tabPage1.PerformLayout();
+			this.groupBox3.ResumeLayout(false);
+			this.groupBox3.PerformLayout();
+			this.groupBox2.ResumeLayout(false);
+			this.groupBox2.PerformLayout();
+			this.tabPage2.ResumeLayout(false);
+			this.tabPage2.PerformLayout();
+			this.tabPage3.ResumeLayout(false);
+			this.tabPage3.PerformLayout();
+			this.groupBox4.ResumeLayout(false);
+			this.groupBox4.PerformLayout();
+			this.groupBox5.ResumeLayout(false);
+			this.groupBox5.PerformLayout();
+			this.groupBox6.ResumeLayout(false);
+			this.groupBox6.PerformLayout();
+			this.groupBox7.ResumeLayout(false);
+			this.groupBox7.PerformLayout();
+			this.groupBox8.ResumeLayout(false);
+			this.groupBox8.PerformLayout();
+			this.groupBox9.ResumeLayout(false);
+			this.groupBox9.PerformLayout();
+			this.groupBox11.ResumeLayout(false);
+			this.groupBox11.PerformLayout();
+			this.groupBox10.ResumeLayout(false);
+			this.groupBox10.PerformLayout();
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Button btnOK;
+		private System.Windows.Forms.Button btnCancel;
+		private System.Windows.Forms.GroupBox groupBox1;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox numberofsectors;
+		private System.Windows.Forms.Label label4;
+		private System.Windows.Forms.TabControl tabcontrol;
+		private System.Windows.Forms.TabPage tabPage1;
+		private System.Windows.Forms.TabPage tabPage2;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox sectordepth;
+		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.GroupBox groupBox2;
+		private System.Windows.Forms.RadioButton sideback;
+		private System.Windows.Forms.RadioButton sidefront;
+		private System.Windows.Forms.GroupBox groupBox3;
+		private System.Windows.Forms.CheckBox singledirection;
+		private System.Windows.Forms.CheckBox singlesectors;
+		private System.Windows.Forms.GroupBox groupBox4;
+		private System.Windows.Forms.CheckBox floorflat;
+		private CodeImp.DoomBuilder.Controls.FlatSelectorControl floorflattexture;
+		private System.Windows.Forms.GroupBox groupBox5;
+		private System.Windows.Forms.CheckBox ceilingflat;
+		private System.Windows.Forms.TabPage tabPage3;
+		private System.Windows.Forms.GroupBox groupBox6;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox floorheightmod;
+		private System.Windows.Forms.Label label;
+		private CodeImp.DoomBuilder.Controls.FlatSelectorControl ceilingflattexture;
+		private System.Windows.Forms.Label label3;
+		private System.Windows.Forms.Label floorlast;
+		private System.Windows.Forms.Label floorfirst;
+		private System.Windows.Forms.Label label7;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox numberofcontrolpoints;
+		private System.Windows.Forms.Label label10;
+        private System.Windows.Forms.CheckBox floorheightmodification;
+        private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox spacing;
+        private System.Windows.Forms.Label label11;
+        private System.Windows.Forms.GroupBox groupBox7;
+        private System.Windows.Forms.CheckBox lowertexture;
+        private System.Windows.Forms.GroupBox groupBox8;
+        private System.Windows.Forms.CheckBox uppertexture;
+        private CodeImp.DoomBuilder.Controls.TextureSelectorControl lowertexturetexture;
+		private CodeImp.DoomBuilder.Controls.TextureSelectorControl uppertexturetexture;
+		private System.Windows.Forms.Label ceilinglast;
+		private System.Windows.Forms.Label ceilingfirst;
+		private System.Windows.Forms.Label label8;
+		private System.Windows.Forms.Label label9;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox ceilingheightmod;
+		private System.Windows.Forms.Label label2;
+		private System.Windows.Forms.GroupBox groupBox9;
+		private System.Windows.Forms.CheckBox ceilingheightmodification;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox floorbase;
+        private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox ceilingbase;
+        private System.Windows.Forms.GroupBox groupBox11;
+        private System.Windows.Forms.Button prefabload;
+        private System.Windows.Forms.Button prefabdelete;
+        private System.Windows.Forms.Button prefabsave;
+        private System.Windows.Forms.TextBox prefabname;
+        private System.Windows.Forms.ListView prefabs;
+        private System.Windows.Forms.ColumnHeader columnHeader1;
+        private System.Windows.Forms.ColumnHeader columnHeader2;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox autocurveoutervertexmultiplier;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox autocurveinnervertexmultiplier;
+		private System.Windows.Forms.Label label6;
+		private System.Windows.Forms.Label label5;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox splineoutervertexmultiplier;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox splineinnervertexmultiplier;
+		private System.Windows.Forms.Label label16;
+		private System.Windows.Forms.Label label17;
+		private System.Windows.Forms.CheckBox distinctbaseheights;
+		private System.Windows.Forms.Label label12;
+		private System.Windows.Forms.ComboBox autocurveflipping;
+		private System.Windows.Forms.ComboBox splineflipping;
+		private System.Windows.Forms.Label label13;
+		private System.Windows.Forms.Label label14;
+		private System.Windows.Forms.Label label15;
+		private System.Windows.Forms.CheckBox lowerunpegged;
+		private System.Windows.Forms.CheckBox upperunpegged;
+		private System.Windows.Forms.GroupBox groupBox10;
+		private CodeImp.DoomBuilder.Controls.TextureSelectorControl middletexturetexture;
+		private System.Windows.Forms.CheckBox middletexture;
+	}
+}
\ No newline at end of file
diff --git a/Source/Plugins/StairSectorBuilder/StairSectorBuilderForm.resx b/Source/Plugins/StairSectorBuilder/StairSectorBuilderForm.resx
new file mode 100644
index 0000000..19dc0dd
--- /dev/null
+++ b/Source/Plugins/StairSectorBuilder/StairSectorBuilderForm.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/StairSectorBuilder/StairSectorBuilderMode.cs b/Source/Plugins/StairSectorBuilder/StairSectorBuilderMode.cs
new file mode 100644
index 0000000..a0aa39f
--- /dev/null
+++ b/Source/Plugins/StairSectorBuilder/StairSectorBuilderMode.cs
@@ -0,0 +1,1628 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Windows.Forms;
+using System.Drawing;
+using CodeImp.DoomBuilder.Windows;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Editing;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.StairSectorBuilderMode
+{
+	//[EditMode(DisplayName = "Stair Sector Builder",
+	//          Volatile = true)]
+
+	[EditMode(DisplayName = "Stair Sector Builder Mode",
+			  SwitchAction = "stairsectorbuildermode",		// Action name used to switch to this mode
+			  ButtonImage = "StairIcon.png",	// Image resource name for the button
+			  ButtonOrder = int.MinValue + 500,	// Position of the button (lower is more to the left)
+			  ButtonGroup = "000_editing",
+			  UseByDefault = true,
+			  SafeStartMode = false,
+              Volatile = true )]
+
+	public sealed class StairSectorBuilderMode : ClassicMode
+	{
+		#region ================== Constants
+
+		private const float LINE_THICKNESS = 0.6f;
+		private const float CONTROLPOINT_SIZE = 10.0f;
+		private const int INNER_SPLINE = 0;
+		private const int OUTER_SPLINE = 1;
+
+		#endregion
+
+		#region ================== Variables
+
+		private StairSectorBuilderForm stairsectorbuilderform;
+        private List<StairInfo> stairsectors;
+		// private List<Vector2D> controlpoints;
+		// private List<Vector2D> tangents;
+		private List<CatmullRomSplineGroup> catmullromsplinegroups;
+		private int numcontrolpoints;
+		private ControlpointPointer selectedcontrolpoint;
+		private bool linesconnected;
+		private List<ConnectedLinedefs> connectedlinedefs;
+		private bool baseheightset;
+		private int oldflipping = -1;
+		private List<List<Vector2D>> exactsplines;
+
+		#endregion
+
+		#region ================== Structures
+
+		private struct CatmullRomSplineData
+		{
+			public Line2D line;
+			public List<Vector2D> controlpoints;
+			public List<Vector2D> tangents;
+		}
+
+		private struct CatmullRomSplineGroup
+		{
+			public CatmullRomSplineData[] splines;
+			public Linedef sourcelinedef;
+		}
+
+		private struct ControlpointPointer
+		{
+			public int crsg;
+			public int crsd;
+			public int cp;
+		}
+
+		private struct ConnectedLinedefs
+		{
+			public bool closed;
+			public int sector;
+			public List<Linedef> linedefs;
+			public Linedef firstlinedef;
+		}
+
+        private struct StairInfo
+        {
+            public int floorheight;
+            public int ceilingheight;
+            public List<List<Vector2D>> sectors;
+        }
+
+
+		#endregion
+
+		#region ================== Properties
+
+		// Just keep the base mode button checked
+		public override string EditModeButtonName { get { return General.Editing.PreviousStableMode.Name; } }
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		#endregion
+
+		#region ================== Methods
+
+		private void InitializeCatmullRomSplines()
+		{
+			numcontrolpoints = stairsectorbuilderform.NumControlPoints;
+
+			if(General.Map.Map.GetSelectedLinedefs(true).Count <= 0) return;
+
+			if(catmullromsplinegroups == null)
+				catmullromsplinegroups = new List<CatmullRomSplineGroup>();
+			else
+				catmullromsplinegroups.Clear();
+
+			List<Linedef> sourceld = new List<Linedef>(General.Map.Map.GetSelectedLinedefs(true));
+			for(int l1 = 0; l1 < sourceld.Count - 1; l1++)
+			{
+				int l2 = l1 + 1;
+
+				Vector2D s1 = stairsectorbuilderform.Flipping == 1 ? sourceld[l1].End.Position : sourceld[l1].Start.Position;
+				Vector2D e1 = stairsectorbuilderform.Flipping == 1 ? sourceld[l1].Start.Position : sourceld[l1].End.Position;
+				Vector2D s2 = stairsectorbuilderform.Flipping == 2 ? sourceld[l2].End.Position : sourceld[l2].Start.Position;
+				Vector2D e2 = stairsectorbuilderform.Flipping == 2 ? sourceld[l2].Start.Position : sourceld[l2].End.Position;
+
+				//innerline = new Line2D(sourceld[l2].Start.Position, sourceld[l1].Start.Position);
+				//outerline = new Line2D(sourceld[l1].End.Position, sourceld[l2].End.Position);
+
+				Line2D innerline = new Line2D(s2, s1);
+				Line2D outerline = new Line2D(e1, e2);
+
+				CatmullRomSplineData innerspline = new CatmullRomSplineData();
+				innerspline.controlpoints = new List<Vector2D>();
+
+				innerspline.line = innerline;
+				innerspline.controlpoints.Add(new Vector2D(innerline.v1));
+
+				for(int k = 1; k <= numcontrolpoints - 2; k++)
+					innerspline.controlpoints.Add(new Vector2D(innerline.GetCoordinatesAt(1.0f / (numcontrolpoints - 1) * k)));
+
+				innerspline.controlpoints.Add(new Vector2D(innerline.v2));
+
+				ComputeTangents(ref innerspline);
+
+				CatmullRomSplineData outerspline = new CatmullRomSplineData();
+				outerspline.controlpoints = new List<Vector2D>();
+
+				outerspline.line = outerline;
+				outerspline.controlpoints.Add(new Vector2D(outerline.v1));
+
+				for(int k = 1; k <= numcontrolpoints - 2; k++)
+					outerspline.controlpoints.Add(new Vector2D(outerline.GetCoordinatesAt(1.0f / (numcontrolpoints - 1) * k)));
+
+				outerspline.controlpoints.Add(new Vector2D(outerline.v2));
+
+				ComputeTangents(ref outerspline);
+
+				CatmullRomSplineGroup splinegroup = new CatmullRomSplineGroup();
+				splinegroup.splines = new CatmullRomSplineData[2];
+				splinegroup.splines[INNER_SPLINE] = innerspline;
+				splinegroup.splines[OUTER_SPLINE] = outerspline;
+				splinegroup.sourcelinedef = sourceld[l1];
+
+				catmullromsplinegroups.Add(splinegroup);
+			}
+		}
+
+		// Modifies the number of control points on the splines
+		public void ModifyControlpointNumber(int num)
+		{
+			if(catmullromsplinegroups == null) return;
+
+			for(int crsg=0; crsg < catmullromsplinegroups.Count;crsg++) {
+				for(int s = 0; s < 2; s++)
+				{
+					List<Vector2D> verts = GenerateCatmullRom(catmullromsplinegroups[crsg].splines[s], num-1);
+
+					catmullromsplinegroups[crsg].splines[s].controlpoints.Clear();
+
+					foreach(Vector2D v in verts)
+					{
+						catmullromsplinegroups[crsg].splines[s].controlpoints.Add(v);
+					}
+
+					// catmullromsplinegroups[crsg].splines[s].controlpoints.Add(catmullromsplinegroups[crsg].splines[s].line.v1);
+
+					// New tangents of the control points have to be calculated
+					ComputeTangents(ref catmullromsplinegroups[crsg].splines[s]);
+				}
+			}
+		}
+
+		// Create the sector data depending on the selected tab
+		public void UpdateVertexData()
+		{
+			// Straight stair
+			if(stairsectorbuilderform.Tabs.SelectedIndex == 0)
+			{
+				if(General.Map.Map.SelectedSectorsCount == 0)
+				{
+					stairsectors = CreateStraightStairSectorsFromLines(new List<Linedef>(General.Map.Map.GetSelectedLinedefs(true)));
+				}
+				else
+				{
+					stairsectors = CreateStraightStairSectorsFromSectors(new List<Sector>(General.Map.Map.GetSelectedSectors(true)));
+				}
+			}
+			// Curved stair
+			else if(stairsectorbuilderform.Tabs.SelectedIndex == 1)
+			{
+				stairsectors = CreateCurvedStairSectors();
+			}
+			// Catmull Rom stair
+			else if(stairsectorbuilderform.Tabs.SelectedIndex == 2)
+			{
+				if(oldflipping != stairsectorbuilderform.Flipping)
+				{
+					oldflipping = stairsectorbuilderform.Flipping;
+					InitializeCatmullRomSplines();
+				}
+
+				exactsplines = new List<List<Vector2D>>();
+				stairsectors = CreateCatmullRomStairSectors();
+			}
+
+			if(stairsectors.Count > 0)
+			{
+				stairsectorbuilderform.OriginalCeilingBase = stairsectors[0].ceilingheight;
+				stairsectorbuilderform.OriginalFloorBase = stairsectors[0].floorheight;
+			}
+		}
+
+		/*private bool CheckConnectedLines()
+		{
+			//List<Linedef> sourceld = new List<Linedef>();
+
+			//if(General.Map.Map.GetSelectedLinedefs(true).Count <= 0 && General.Map.Map.SelectedSectorsCount <= 0)
+			//{
+			//    return false;
+			//}
+
+			// connectedlinedefs = new List<ConnectedLinedefs>();
+
+			//foreach(Linedef ld in General.Map.Map.GetSelectedLinedefs(true))
+			//{
+			//    sourceld.Add(ld);
+			//}
+
+			// GetConnectedLines(ref sourceld, -1);
+
+			return true;
+		}*/
+
+		private void GetConnectedLines(ref List<Linedef> sourceld, int sector)
+		{
+			List<Linedef> connectedld = new List<Linedef>();
+			Linedef currentld = null;
+
+			connectedlinedefs = new List<ConnectedLinedefs>();
+
+			while(sourceld.Count > 0)
+			{
+				// List is empty
+				if(connectedld.Count == 0)
+				{
+					connectedld.Add(sourceld[0]);
+					currentld = sourceld[0];
+					sourceld.RemoveAt(0);
+				}
+
+				// Find all connected linedefs starting from the start of the current linedef
+				while(currentld != null)
+				{
+					bool found = false;
+
+					foreach(Linedef ld in sourceld)
+					{
+						// if(currentld.Start.Linedefs.Contains(ld))
+						if(ld.Start == currentld.Start || ld.End == currentld.Start)
+						{
+							// add the connected linedef to the beginning of the list
+							connectedld.Insert(0, ld);
+							currentld = ld;
+							sourceld.Remove(ld);
+							found = true;
+							break;
+						}
+					}
+
+					if(found == false) currentld = null;
+				}
+
+				currentld = connectedld[connectedld.Count - 1];
+
+				// Find all connected linedefs starting from the end of the current linedef
+				while(currentld != null)
+				{
+					bool found = false;
+
+					foreach(Linedef ld in sourceld)
+					{
+						// if(currentld.End.Linedefs.Contains(ld))
+						if(ld.Start == currentld.End || ld.End == currentld.End)
+						{
+							// add the connected linedef to the end of the list
+							connectedld.Add(ld);
+							currentld = ld;
+							sourceld.Remove(ld);
+							found = true;
+							break;
+						}
+					}
+
+					if(found == false) currentld = null;
+				}
+
+				ConnectedLinedefs cld = new ConnectedLinedefs();
+				cld.linedefs = new List<Linedef>();
+
+				cld.sector = sector;
+
+				foreach(Linedef ld in connectedld)
+				{
+					cld.linedefs.Add(ld);
+				}
+
+				if(General.Map.Map.SelectedLinedefsCount > 0)
+				{
+					foreach(Linedef ld in General.Map.Map.GetSelectedLinedefs(true))
+					{
+						if(cld.linedefs.Contains(ld))
+						{
+							cld.firstlinedef = ld;
+							break;
+						}
+					}
+
+					// if(connectedvertices[0] == cld.firstlinedef.End.Position && connectedvertices[connectedvertices.Count-1] == cld.firstlinedef.Start.Position) {
+				}
+				else
+				{
+					cld.closed = true;
+					cld.firstlinedef = cld.linedefs[cld.linedefs.Count-1];
+				}
+
+				connectedlinedefs.Add(cld);
+				connectedld.Clear();
+			}
+		}
+
+		// Computes the tangents of the control points of a Catmull Rom spline
+		private void ComputeTangents(ref CatmullRomSplineData spline)
+		{
+			float f = 2.0f;
+			int i;
+
+			if(spline.tangents == null)
+				spline.tangents = new List<Vector2D>();
+			else
+				spline.tangents.Clear();
+
+			// Special case for the first control point
+			// spline.tangents.Add(new Vector2D((spline.controlpoints[1] - spline.controlpoints[0]) / f));
+			spline.tangents.Add(new Vector2D(spline.controlpoints[1] - spline.controlpoints[0]));
+
+			for(i = 1; i < spline.controlpoints.Count - 1; i++)
+			{
+				spline.tangents.Add(new Vector2D((spline.controlpoints[i + 1] - spline.controlpoints[i - 1]) / f));
+			}
+
+			// Special case for the last control point
+			//spline.tangents.Add(new Vector2D((spline.controlpoints[i] - spline.controlpoints[i - 1]) / f));
+			spline.tangents.Add(new Vector2D(spline.controlpoints[i] - spline.controlpoints[i - 1]));
+		}
+
+		// Creates sectors for a curved stair
+        private List<StairInfo> CreateCurvedStairSectors()
+		{
+			List<List<Vector2D>> secs = new List<List<Vector2D>>();
+	        int innervertexmultiplier = stairsectorbuilderform.InnerVertexMultiplier;
+			int outervertexmultiplier = stairsectorbuilderform.OuterVertexMultiplier;
+	        int numsteps = (int)stairsectorbuilderform.NumberOfSectors;
+			List<Linedef> sourceld = new List<Linedef>();
+            List<StairInfo> stairinfo = new List<StairInfo>();
+            StairInfo si;
+            List<List<Vector2D>> sisecs = new List<List<Vector2D>>();
+
+			secs.Clear();
+
+			if(General.Map.Map.GetSelectedLinedefs(true).Count <= 0)
+			{
+				return null;
+			}
+
+			// Add all selected linedefs to a source linedef list
+			foreach(Linedef ld in General.Map.Map.GetSelectedLinedefs(true))
+			{
+				sourceld.Add(ld);
+			}
+
+			// Go through all source linedefs
+			for(int l1 = 0; l1 < sourceld.Count - 1; l1++)
+			{
+				// A curve will always be made in the order the lines were selected
+				int l2 = l1 + 1;
+				float distance = 128;
+				bool fixedcurve = true;
+
+				Vector2D s1 = stairsectorbuilderform.Flipping == 1 ? sourceld[l1].End.Position : sourceld[l1].Start.Position;
+				Vector2D e1 = stairsectorbuilderform.Flipping == 1 ? sourceld[l1].Start.Position : sourceld[l1].End.Position;
+				Vector2D s2 = stairsectorbuilderform.Flipping == 2 ? sourceld[l2].End.Position : sourceld[l2].Start.Position;
+				Vector2D e2 = stairsectorbuilderform.Flipping == 2 ? sourceld[l2].Start.Position : sourceld[l2].End.Position;
+
+				Line2D innerline, outerline;
+				bool clockwise;
+				if(Vector2D.Distance(s1, s2) < Vector2D.Distance(e1, e2))
+				{
+					clockwise = true;
+					innerline = new Line2D(s2, s1);
+					outerline = new Line2D(e1, e2);
+				}
+				else // Counter clockwise
+				{
+					clockwise = false;
+					innerline = new Line2D(e1, e2);
+					outerline = new Line2D(s2, s1);
+				}
+
+				// Compute the angle of the inner and outer line
+				float innerangle, outerangle;
+				if(sourceld[l1].Angle == sourceld[l2].Angle && stairsectorbuilderform.Flipping != 1 && stairsectorbuilderform.Flipping != 2)
+				{
+					innerangle = 1;
+					outerangle = 1;
+					distance = 0;
+					fixedcurve = false;
+				}
+				else
+				{
+					if(clockwise)
+					{
+						innerangle = outerangle = sourceld[l1].Angle - sourceld[l2].Angle;
+						if(innerangle < 0.0f) innerangle += Angle2D.PI2;
+						if(outerangle < 0.0f) outerangle += Angle2D.PI2;
+					}
+					else
+					{
+						innerangle = outerangle = sourceld[l2].Angle - sourceld[l1].Angle;
+						if(innerangle < 0.0f) innerangle += Angle2D.PI2;
+						if(outerangle < 0.0f) outerangle += Angle2D.PI2;
+					}
+
+					if(stairsectorbuilderform.Flipping != 0)
+					{
+						if(sourceld[l1].Angle == sourceld[l2].Angle)
+						{
+							if(stairsectorbuilderform.Flipping == 1)
+							{
+								innerangle = Math.Abs(innerangle - Angle2D.PI);
+								outerangle = Math.Abs(outerangle - Angle2D.PI);
+							}
+							else if(stairsectorbuilderform.Flipping == 2)
+							{
+								innerangle -= Angle2D.PI;
+								outerangle -= Angle2D.PI;
+							}
+						}
+						else
+						{
+							innerangle = Math.Abs(innerangle - Angle2D.PI2);
+							outerangle = Math.Abs(outerangle - Angle2D.PI2);
+						}
+					}
+				}
+
+				// Generate the vertices on the curve, and add the start and end vertices of the inner line to the list
+				List<Vector2D> innervertices = GenerateCurve(innerline, numsteps * innervertexmultiplier - 1, innerangle, false, distance, fixedcurve);
+				innervertices.Insert(0, innerline.v1);
+				innervertices.Add(innerline.v2);
+
+				// Generate the vertices on the curve, and add the start and end vertices of the outer line to the list
+				List<Vector2D> outervertices = GenerateCurve(outerline, numsteps * outervertexmultiplier - 1, outerangle, true, distance, fixedcurve);
+				outervertices.Insert(0, outerline.v1);
+				outervertices.Add(outerline.v2);
+
+                // If the vertices were created in counter-clockwise order turn them into clockwise order
+                if(!clockwise)
+                {
+	                List<Vector2D> tmpvertices = innervertices;
+                    int tmpmultiplier = innervertexmultiplier;
+
+                    innervertices = outervertices;
+                    outervertices = tmpvertices;
+
+                    innervertexmultiplier = outervertexmultiplier;
+                    outervertexmultiplier = tmpmultiplier;
+                }
+
+				// Create the sectors from the created vertices
+			    for(int i = 0; i < numsteps; i++)
+			    {
+					List<Vector2D> newsec = new List<Vector2D>();
+
+					// Depending on the outer and innter vertex multipliers more
+					// vertices from the curve have to be added to the new sector
+                    for(int k = 0; k <= outervertexmultiplier; k++)
+                    {
+                        newsec.Add(outervertices[i * outervertexmultiplier + k]);
+                    }
+
+					// Depending on the outer and innter vertex multipliers more
+					// vertices from the curve have to be added to the new sector
+                    for(int k = 0; k <= innervertexmultiplier; k++)
+                    {
+                        newsec.Add(innervertices[(numsteps - 1 - i) * innervertexmultiplier + k]);
+                    }
+
+					// Don't forget the add the first vertex again, to actually have
+					// a whole sector
+                    newsec.Add(outervertices[i * outervertexmultiplier]);
+
+					sisecs.Add(newsec);
+			    }
+			}
+
+			GetSetTextureAndHeightInfo(sourceld[0], out si);
+
+            si.sectors = sisecs;
+
+            stairinfo.Add(si);
+
+			stairsectorbuilderform.StepMultiplier = sourceld.Count - 1;
+
+			return stairinfo;
+		}
+
+		/*private List<Vector2D> GenerateCurve(Line2D line, int vertices, float angle, bool backwards)
+		{
+			return GenerateCurve(line, vertices, angle, backwards, 128, true);
+		}*/
+
+		// This generates the vertices to split the line with, from start to end
+		private static List<Vector2D> GenerateCurve(Line2D line, int vertices, float angle, bool backwards, float distance, bool fixedcurve)
+		{
+
+			// Make list
+			List<Vector2D> points = new List<Vector2D>(vertices);
+
+			//Added by Anders Ã…strand 2008-05-18
+			//The formulas used are taken from http://mathworld.wolfram.com/CircularSegment.html
+			//c and theta are known (length of line and angle parameter). d, R and h are
+			//calculated from those two
+			//If the curve is not supposed to be a circular segment it's simply deformed to fit
+			//the value set for distance.
+
+			//The vertices are generated to be evenly distributed (by angle) along the curve
+			//and lastly they are rotated and moved to fit with the original line
+
+			//calculate some identities of a circle segment (refer to the graph in the url above)
+			double c = line.GetLength();
+			double theta = angle;
+
+			double d = (c / Math.Tan(theta / 2)) / 2;
+			double R = d / Math.Cos(theta / 2);
+			double h = R - d;
+
+			double yDeform = fixedcurve ? 1 : distance / h;
+			if(backwards) yDeform = -yDeform;
+
+			for(int v = 1; v <= vertices; v++)
+			{
+				//calculate the angle for this vertex
+				//the curve starts at PI/2 - theta/2 and is segmented into vertices+1 segments
+				//this assumes the line is horisontal and on y = 0, the point is rotated and moved later
+
+				double a = (Math.PI - theta) / 2 + v * (theta / (vertices + 1));
+
+				//calculate the coordinates of the point, and distort the y coordinate
+				//using the deform factor calculated above
+				double x = Math.Cos(a) * R;
+				double y = (Math.Sin(a) * R - d) * yDeform;
+
+				//rotate and transform to fit original line
+				Vector2D vertex = new Vector2D((float)x, (float)y).GetRotated(line.GetAngle() + Angle2D.PIHALF);
+				vertex = vertex.GetTransformed(line.GetCoordinatesAt(0.5f).x, line.GetCoordinatesAt(0.5f).y, 1, 1);
+
+				points.Add(vertex);
+			}
+
+			// Done
+			return points;
+		}
+
+
+		// Creates stair sectors from two Catmull Rom splines
+        private List<StairInfo> CreateCatmullRomStairSectors()
+		{
+			List<List<Vector2D>> secs = new List<List<Vector2D>>();
+	        int innervertexmultiplier = stairsectorbuilderform.InnerVertexMultiplier;
+			int outervertexmultiplier = stairsectorbuilderform.OuterVertexMultiplier;
+			int numsteps = (int)stairsectorbuilderform.NumberOfSectors;
+			List<List<Vector2D>> sisecs = new List<List<Vector2D>>();
+
+            List<StairInfo> stairinfo = new List<StairInfo>();
+            StairInfo si;
+
+			secs.Clear();
+
+			foreach(CatmullRomSplineGroup crsg in catmullromsplinegroups)
+			{
+				// Generate the vertices for both the inner and outer spline
+				List<Vector2D> innervertices = GenerateCatmullRom(crsg.splines[INNER_SPLINE], numsteps * innervertexmultiplier);
+				List<Vector2D> outervertices = GenerateCatmullRom(crsg.splines[OUTER_SPLINE], numsteps * outervertexmultiplier);
+
+				// Create the data to build complete sectors from the splines
+				for(int i = 0; i < numsteps; i++)
+				{
+					List<Vector2D> newsec = new List<Vector2D>();
+
+					// Depending on the outer and innter vertex multipliers more
+					// vertices from the splines have to be added to the new sector
+					for(int k = 0; k <= outervertexmultiplier; k++)
+					{
+						newsec.Add(outervertices[i * outervertexmultiplier + k]);
+					}
+
+					for(int k = 0; k <= innervertexmultiplier; k++)
+					{
+						newsec.Add(innervertices[(numsteps - 1 - i) * innervertexmultiplier + k]);
+					}
+
+					// Don't forget the add the first vertex again, to actually have
+					// a whole sector
+					newsec.Add(outervertices[i * outervertexmultiplier]);
+
+					sisecs.Add(newsec);
+				}
+			}
+
+			GetSetTextureAndHeightInfo(catmullromsplinegroups[0].sourcelinedef, out si);
+
+			si.sectors = sisecs;
+
+			stairinfo.Add(si);
+
+			return stairinfo;
+		}
+
+		private List<StairInfo> CreateStraightStairSectorsFromSectors(List<Sector> selectedsectors)
+		{
+			List<StairInfo> stairinfo = new List<StairInfo>();
+
+			foreach(Sector s in selectedsectors)
+			{
+				List<Linedef> linedefs = new List<Linedef>();
+				List<Linedef> fliplinedefs = new List<Linedef>();
+
+				foreach(Sidedef sd in s.Sidedefs)
+				{
+					if(sd.Line.Front.Sector.Index != s.Index)
+					{
+						fliplinedefs.Add(sd.Line);
+						sd.Line.FlipVertices();
+						sd.Line.FlipSidedefs();
+					}
+
+					linedefs.Add(sd.Line);
+				}
+
+				stairinfo.AddRange(CreateStraightStairSectorsFromLines(linedefs));
+
+				foreach(Linedef ld in fliplinedefs)
+				{
+					ld.FlipSidedefs();
+					ld.FlipVertices();
+				}
+			}
+
+			return stairinfo;
+		}
+
+		private List<StairInfo> CreateStraightStairSectorsFromLines(List<Linedef> selectedlinedefs)
+		{
+            List<StairInfo> stairinfo = new List<StairInfo>();
+			uint numsteps = stairsectorbuilderform.NumberOfSectors;
+			uint depth = stairsectorbuilderform.SectorDepth;
+            int spacing = stairsectorbuilderform.Spacing;
+			List<Linedef> sourceld = new List<Linedef>(selectedlinedefs);
+            StairInfo si;
+
+			GetConnectedLines(ref selectedlinedefs, -1);
+
+            // Build an independend set of steps from each selected line
+			if(!stairsectorbuilderform.SingleSectors.Checked)
+			{
+				// Go through each selected line
+				for(int k = 0; k < sourceld.Count; k++)
+				{
+                    List<List<Vector2D>> sisecs = new List<List<Vector2D>>();
+
+                    // Get the direction to build the stair to. "Flip" the vector depending on the selected build direction modifier
+                    Vector2D direction = sourceld[k].Line.GetPerpendicular().GetNormal() * (stairsectorbuilderform.SideFront ? -1 : 1);
+
+					for(int i = 0; i < numsteps; i++)
+					{
+						//List<DrawnVertex> vertices = new List<DrawnVertex>();
+						List<Vector2D> newsec = new List<Vector2D>();
+
+                        // Compute the position of the vertices that form the line opposite the source line
+                        Vector2D v1 = sourceld[k].Start.Position + direction * depth * i;
+                        Vector2D v2 = sourceld[k].End.Position + direction * depth * i;
+						Vector2D v3 = v1 + direction * depth;
+						Vector2D v4 = v2 + direction * depth;
+
+                        // Apply spacing to each vertex
+                        if(spacing > 0)
+                        {
+                            v1 += (direction * spacing) * i;
+                            v2 += (direction * spacing) * i;
+                            v3 += (direction * spacing) * i;
+                            v4 += (direction * spacing) * i;
+                        }
+
+                        // v1 is added twice so it will actually draw a complete sector
+						newsec.Add(v1);
+						newsec.Add(v3);
+						newsec.Add(v4);
+						newsec.Add(v2);
+						newsec.Add(v1);
+
+						sisecs.Add(newsec);
+					}
+
+					GetSetTextureAndHeightInfo(sourceld[k], out si);
+
+                    si.sectors = sisecs;
+
+                    stairinfo.Add(si);
+				}
+			}
+			else if(stairsectorbuilderform.SingleSectors.Checked)
+			{
+				Vector2D direction = new Vector2D();
+				bool closed = false;
+
+				foreach(ConnectedLinedefs cld in connectedlinedefs)
+				{
+					List<Vector2D> connectedvertices = new List<Vector2D>();
+					List<Vector2D> connecteddirections = new List<Vector2D>();
+					List<double> connectedlength = new List<double>();
+                    List<List<Vector2D>> sisecs = new List<List<Vector2D>>();
+
+					Vector2D globaldirection = Vector2D.FromAngle(cld.firstlinedef.Angle + Angle2D.DegToRad(stairsectorbuilderform.SideFront ? -90.0f : 90.0f));
+
+					for(int i = 0; i < cld.linedefs.Count; i++)
+					{
+						if(cld.sector >= 0)
+						{
+							if(cld.linedefs[i].Front.Sector.Index == cld.sector)
+							{
+								if(!connectedvertices.Contains(cld.linedefs[i].End.Position))
+									connectedvertices.Add(cld.linedefs[i].End.Position);
+
+								if(!connectedvertices.Contains(cld.linedefs[i].Start.Position))
+									connectedvertices.Add(cld.linedefs[i].Start.Position);
+							}
+							else
+							{
+								if(!connectedvertices.Contains(cld.linedefs[i].Start.Position))
+									connectedvertices.Add(cld.linedefs[i].Start.Position);
+
+								if(!connectedvertices.Contains(cld.linedefs[i].End.Position))
+									connectedvertices.Add(cld.linedefs[i].End.Position);
+							}
+						}
+						else
+						{
+							if(!connectedvertices.Contains(cld.linedefs[i].Start.Position))
+								connectedvertices.Add(cld.linedefs[i].Start.Position);
+
+							if(!connectedvertices.Contains(cld.linedefs[i].End.Position))
+								connectedvertices.Add(cld.linedefs[i].End.Position);
+						}
+					}
+
+					if(cld.sector >= 0)
+					{
+						closed = true;
+					}
+					else
+					{
+						if(connectedvertices[0] == cld.firstlinedef.End.Position && connectedvertices[connectedvertices.Count - 1] == cld.firstlinedef.Start.Position)
+							closed = true;
+					}
+				
+					for(int i = 0; i < connectedvertices.Count; i++)
+					{
+						if(i == 0 && closed == false)
+						{
+							connecteddirections.Add(Vector2D.FromAngle(Vector2D.GetAngle(connectedvertices[0], connectedvertices[1]) - Angle2D.DegToRad(stairsectorbuilderform.SideFront ? -90.0f : 90.0f)));
+							connectedlength.Add(depth);
+						}
+						else if(i == connectedvertices.Count - 1 && closed == false)
+						{
+							connecteddirections.Add(Vector2D.FromAngle(Vector2D.GetAngle(connectedvertices[i], connectedvertices[i - 1]) + Angle2D.DegToRad(stairsectorbuilderform.SideFront ? -90.0f : 90.0f)));
+							connectedlength.Add(depth);
+						}
+						else
+						{
+							Vector2D v1;
+							Vector2D v2;
+
+							if(closed && i == 0)
+							{
+								v1 = new Line2D(connectedvertices[1], connectedvertices[0]).GetPerpendicular();
+								v2 = new Line2D(connectedvertices[0], connectedvertices[connectedvertices.Count - 1]).GetPerpendicular();
+							}
+							else if(closed && i == connectedvertices.Count - 1)
+							{
+								v1 = new Line2D(connectedvertices[0], connectedvertices[i]).GetPerpendicular();
+								v2 = new Line2D(connectedvertices[i], connectedvertices[i - 1]).GetPerpendicular();
+							}
+							else
+							{
+								v1 = new Line2D(connectedvertices[i + 1], connectedvertices[i]).GetPerpendicular();
+								v2 = new Line2D(connectedvertices[i], connectedvertices[i - 1]).GetPerpendicular();
+							}
+
+							double a = (v1.GetNormal() + v2.GetNormal()).GetAngle();
+							double b = a - v1.GetNormal().GetAngle();
+
+							double opl = Math.Tan(b) * depth;
+							double distance = Math.Sqrt(depth * depth + opl * opl);
+							Vector2D v3 = Vector2D.FromAngle((float)a);
+
+							connecteddirections.Add(Vector2D.FromAngle(v3.GetAngle() + Angle2D.DegToRad(stairsectorbuilderform.SideFront ? 0.0f : 180.0f)));
+							connectedlength.Add(distance);
+						}
+					}
+
+					for(int i = 0; i < numsteps; i++)
+					{
+						List<Vector2D> newsec = new List<Vector2D>();
+						float length;
+
+						if(closed == false)
+						{
+							for(int k = 0; k < connectedvertices.Count; k++)
+							{
+								if(!stairsectorbuilderform.SingleDirection.Checked)
+								{
+									direction = connecteddirections[k];
+									length = (float)connectedlength[k];
+								}
+								else
+								{
+									direction = globaldirection;
+									length = depth;
+								}
+
+                                newsec.Add(connectedvertices[k] + direction * length * i + (direction * spacing) * i);
+							}
+						}
+
+						for(int k = connectedvertices.Count - 1; k >= 0; k--)
+						{
+							if(!stairsectorbuilderform.SingleDirection.Checked)
+							{
+								direction = connecteddirections[k];
+								length = (float)connectedlength[k];
+							}
+							else
+							{
+								direction = globaldirection;
+								length = depth;
+							}
+
+                            newsec.Add(connectedvertices[k] + direction * length * (i + 1) + (direction * spacing) * i);
+						}
+
+						if(closed == false)
+                            newsec.Add(connectedvertices[0] + direction * depth * i + (direction * spacing) * i);
+						else
+							newsec.Add(newsec[0]);
+
+						// If the steps are drawn on the back side the vertices are in counter-clockwise
+						// order, so reverse their order
+						if(!stairsectorbuilderform.SideFront) newsec.Reverse();
+
+						sisecs.Add(newsec);
+					}
+
+					GetSetTextureAndHeightInfo(cld.firstlinedef, out si);
+
+                    si.sectors = sisecs;
+
+                    stairinfo.Add(si);
+				}
+			}
+
+			stairsectorbuilderform.StepMultiplier = 1;
+
+			return stairinfo;
+		}
+
+		// Generats the Catmull Rom spline from the given control points and their tangents.
+		// Returns a list of Vector2D.
+		// The line between two control points is a "section". There is always one section
+		// less than there are control points.
+		// A "hop" is the distance between two to-be-created vertices. The distance is not
+		// in map units, but a relative indication where on the line between two control
+		// points the vertex will be.
+		// First it is calculated in which section the vertex will be in, then the relative
+		// position on the line between the control points of this section is calculated.
+		// This value will be from 0.0 to 0.99999...
+		// A workaround has to be done for the last vertex, which will inevitably be exactly
+		// on the last control point, thus computing the wrong section and relative position
+		private List<Vector2D> GenerateCatmullRom(CatmullRomSplineData crsd, int numverts)
+		{
+			List<Vector2D> vertices = new List<Vector2D>();
+			//int sections = crsd.controlpoints.Count - 1;
+			//double hop = (double)sections / numverts;
+			float distance = 0.0f;
+			List<float> cpdistance = new List<float>();
+
+			// Compute the length of the whole spline and the length of the parts on the
+			// spline between the control points
+			for(int i = 0; i < crsd.controlpoints.Count-1; i++)
+			{
+				int h = (int)Vector2D.Distance(crsd.controlpoints[i], crsd.controlpoints[i + 1]);
+				float dist = 0;
+				List<Vector2D> dc = new List<Vector2D>();
+
+				Vector2D p0 = crsd.controlpoints[i];
+				Vector2D p1 = crsd.controlpoints[i + 1];
+				Vector2D t0 = crsd.tangents[i];
+				Vector2D t1 = crsd.tangents[i + 1];
+
+				for(int k = 0; k <= h; k++)
+				{
+					dc.Add(Tools.HermiteSpline(p0, t0, p1, t1, (float)k / h));
+				}
+
+				for(int k = 0; k < h; k++)
+				{
+					dist += Vector2D.Distance(dc[k], dc[k + 1]);
+				}
+
+				distance += dist;
+
+				cpdistance.Add(dist);
+
+				exactsplines.Add(dc);
+			}
+
+			float unithop = distance / numverts;
+
+			for(int i = 0; i <= numverts; i++)
+			{
+				int s = 0;
+				float u;
+				float distancefromstart = i * unithop;
+				float max = 0.0f;
+
+				// Find out what section the vertex is in
+				while(max < distancefromstart)
+				{
+					max += cpdistance[s];
+					if(max < distancefromstart) s++;
+
+					// Work around for rounding errors
+					if(s > cpdistance.Count-1)
+					{
+						s = cpdistance.Count - 1;
+						max = distancefromstart;
+					}
+				}
+
+				// Compute the u component with special cases for the first
+				// and last vertex
+				if(distancefromstart == 0)
+					u = 0.0f;
+				else if(distancefromstart == distance)
+					u = 1.0f;
+				else
+					u = 1.0f - ((max - distancefromstart) / cpdistance[s]);
+
+				Vector2D p0 = crsd.controlpoints[s];
+				Vector2D p1 = crsd.controlpoints[s + 1];
+				Vector2D t0 = crsd.tangents[s];
+				Vector2D t1 = crsd.tangents[s + 1];
+				vertices.Add(Tools.HermiteSpline(p0, t0, p1, t1, u));
+			}
+
+			// OLD CODE
+			//for(int x = 0; x <= numverts; x++)
+			//{
+			//    // Compute the section the vertex will be in
+			//    int s = (int)(x * hop);
+			//    double u;
+
+			//    // Workaround for the last vertex
+			//    if((x * hop) - s < 0.00001f && s == sections)
+			//    {
+			//        u = 1.0f;
+			//        s--;
+			//    }
+			//    else
+			//    {
+			//        //u = (summe - x * unithop) / Vector2D.Distance(crsd.controlpoints[cs], crsd.controlpoints[cs+1]);
+			//        u = (x * hop) - s;
+			//    }
+
+			//    if(u > 1.0f) u = 1.0f;
+
+			//    Vector2D p0 = crsd.controlpoints[s];
+			//    Vector2D p1 = crsd.controlpoints[s + 1];
+			//    Vector2D t0 = crsd.tangents[s];
+			//    Vector2D t1 = crsd.tangents[s + 1];
+			//    vertices.Add(Tools.HermiteSpline(p0, t0, p1, t1, (float)u));
+			//}
+
+			return vertices;
+		}
+
+		// Turns a position into a DrawnVertex and returns it
+		private DrawnVertex SectorVertex(float x, float y)
+		{
+			DrawnVertex v = new DrawnVertex();
+
+			v.stitch = true;
+			v.stitchline = true;
+			v.pos = new Vector2D((float)Math.Round(x, General.Map.FormatInterface.VertexDecimals), (float)Math.Round(y, General.Map.FormatInterface.VertexDecimals));
+
+			return v;
+		}
+
+		private DrawnVertex SectorVertex(Vector2D v)
+		{
+			return SectorVertex(v.x, v.y);
+		}
+
+		// Remember info for floor and ceiling height. The info is retrieved
+		// from either front or back of the source line, depending in what
+		// direction the it should build
+		// Also set the upper/lower textures to use if they aren't already
+		private void GetSetTextureAndHeightInfo(Linedef ld, out StairInfo siout)
+		{
+			StairInfo si = new StairInfo();
+			Sidedef primary;
+			Sidedef secondary;
+
+			GetSetBaseHeights(ld);
+
+			if(stairsectorbuilderform.SideFront)
+			{
+				if(ld.Front == null)
+				{
+					primary = ld.Back;
+					secondary = ld.Front;
+				}
+				else
+				{
+					primary = ld.Front;
+					secondary = ld.Back;
+				}
+			}
+			else
+			{
+				if(ld.Back == null)
+				{
+					primary = ld.Front;
+					secondary = ld.Back;
+				}
+				else
+				{
+					primary = ld.Back;
+					secondary = ld.Front;
+				}
+			}
+
+			si.ceilingheight = primary.Sector.CeilHeight;
+			si.floorheight = primary.Sector.FloorHeight;
+
+			if(stairsectorbuilderform.UpperTextureTexture == "")
+				stairsectorbuilderform.UpperTextureTexture = (secondary == null) ? primary.MiddleTexture : primary.HighTexture;
+
+			if(stairsectorbuilderform.LowerTextureTexture == "")
+				stairsectorbuilderform.LowerTextureTexture = (secondary == null) ? primary.MiddleTexture : primary.LowTexture;
+
+			siout = si;
+		}
+
+		private void GetSetBaseHeights(Linedef ld)
+		{
+			if(baseheightset) return;
+
+			baseheightset = true;
+
+			if(stairsectorbuilderform.SideFront)
+			{
+				if(ld.Back == null)
+				{
+					stairsectorbuilderform.CeilingBase = ld.Front.Sector.CeilHeight;
+					stairsectorbuilderform.FloorBase = ld.Front.Sector.FloorHeight;
+				}
+				else
+				{
+					stairsectorbuilderform.CeilingBase = ld.Back.Sector.CeilHeight;
+					stairsectorbuilderform.FloorBase = ld.Back.Sector.FloorHeight;
+				}
+			}
+			else
+			{
+				stairsectorbuilderform.CeilingBase = ld.Front.Sector.CeilHeight;
+				stairsectorbuilderform.FloorBase = ld.Front.Sector.FloorHeight;
+			}
+		}
+
+		#endregion
+
+		#region ================== Events
+
+		public override void OnHelp()
+		{
+			General.ShowHelp("e_curvelinedefs.html");
+		}
+
+		// Cancelled
+		public override void OnCancel()
+		{
+			// Cancel base class
+			base.OnCancel();
+
+			// stairsectorbuilderform.Close();
+
+			// Return to base mode
+			General.Editing.ChangeMode(General.Editing.PreviousStableMode.Name);
+		}
+
+		// Mode engages
+		public override void OnEngage()
+		{
+			base.OnEngage();
+
+            // If no lines are selected nothing can be done, so exit this mode immediately
+            if(General.Map.Map.SelectedLinedefsCount == 0 && General.Map.Map.SelectedSectorsCount == 0)
+            {
+                General.Interface.DisplayStatus(StatusType.Warning, "No lines or sectors selected.");
+                General.Editing.ChangeMode(General.Editing.PreviousStableMode.Name);
+                return;
+            }
+
+			renderer.SetPresentation(Presentation.Standard);
+
+			linesconnected = true; //CheckConnectedLines();
+
+			LoadPrefabs();
+
+            // stairsectorbuilderform = BuilderPlug.Me.StairSectorBuilderForm;
+
+            stairsectorbuilderform = new StairSectorBuilderForm();
+
+			InitializeCatmullRomSplines();
+
+			selectedcontrolpoint.cp = -1;
+			selectedcontrolpoint.crsd = -1;
+			selectedcontrolpoint.crsg = -1;
+
+			stairsectorbuilderform.SingleSectors.Enabled = linesconnected;
+			stairsectorbuilderform.DistinctBaseHeights.Checked = (General.Map.Map.SelectedLinedefsCount != 1);
+
+
+			// Show toolbox window
+            // stairsectorbuilderform.Show();
+            stairsectorbuilderform.Show((Form)General.Interface);
+		}
+
+		// Disenagaging
+		public override void OnDisengage()
+		{
+			base.OnDisengage();
+
+			SavePrefabs();
+
+			// Sort of work around so that the DB2 window won't lose focus
+			General.Interface.Focus();
+
+			if(stairsectorbuilderform != null)
+			    stairsectorbuilderform.Hide();
+		}
+
+		// This applies the curves and returns to the base mode
+		public override void OnAccept()
+		{
+			string uppertexture = stairsectorbuilderform.UpperTextureTexture;
+			string lowertexture = stairsectorbuilderform.LowerTextureTexture;
+			string middletexture = stairsectorbuilderform.MiddleTextureTexture;
+			string olddefaulttexture = "-";
+			List<Vertex> newvertices = new List<Vertex>();
+			List<Linedef> newlinedefs = new List<Linedef>();
+			List<Sector> allnewsectors = new List<Sector>();
+
+			if(stairsectors == null) return;
+
+			// Create undo
+			General.Map.UndoRedo.CreateUndo("Build stair sectors");
+
+            // Get the default settings and remember the default texture
+            General.Settings.FindDefaultDrawSettings();
+
+			if(stairsectorbuilderform.MiddleTexture)
+			{
+				olddefaulttexture = General.Map.Options.DefaultWallTexture;
+				General.Map.Options.DefaultWallTexture = "-";
+			}
+
+    		// This creates the geometry. Uses exactly the same data used
+			// for the preview
+			try
+			{
+				foreach(StairInfo si in stairsectors)
+				{
+					int stepcounter = 1;
+
+					foreach(List<Vector2D> lv in si.sectors)
+					{
+						List<Sector> oldsectors = new List<Sector>(General.Map.Map.Sectors);
+						//List<Sector> newsectors = new List<Sector>();
+						List<DrawnVertex> vertices = new List<DrawnVertex>();
+
+						for(int i = 0; i < lv.Count; i++)
+						{
+							vertices.Add(SectorVertex(lv[i]));
+						}
+
+						// Draw the new sector
+						if(!Tools.DrawLines(vertices)) throw new Exception("Failed drawing lines");
+
+						// Update newly created sector(s) with the given textures and heights
+						foreach(Sector s in General.Map.Map.Sectors)
+						{
+							if(!oldsectors.Contains(s))
+							{
+								allnewsectors.Add(s);
+
+								// Apply floor heights if necessary
+								if(stairsectorbuilderform.FloorHeight)
+								{
+									// Should each stair use individual base height or the global one?
+									if(stairsectorbuilderform.DistinctBaseHeights.Checked && stairsectorbuilderform.StairType == 0)
+										s.FloorHeight = si.floorheight + stairsectorbuilderform.FloorHeightModification * stepcounter;
+									else
+										s.FloorHeight = stairsectorbuilderform.FloorBase + stairsectorbuilderform.FloorHeightModification * stepcounter;
+								}
+
+								// Apply ceiling heights if necessary
+								if(stairsectorbuilderform.CeilingHeight)
+								{
+									// Should each stair use individual base height or the global one?
+									if(stairsectorbuilderform.DistinctBaseHeights.Checked && stairsectorbuilderform.StairType == 0)
+										s.CeilHeight = si.ceilingheight + stairsectorbuilderform.CeilingHeightModification * stepcounter;
+									else
+										s.CeilHeight = stairsectorbuilderform.CeilingBase + stairsectorbuilderform.CeilingHeightModification * stepcounter;
+								}
+
+								// Apply floor and ceiling textures if necessary
+								if(stairsectorbuilderform.FloorFlat)
+									s.SetFloorTexture(stairsectorbuilderform.FloorFlatTexture);
+
+								if(stairsectorbuilderform.CeilingFlat)
+									s.SetCeilTexture(stairsectorbuilderform.CeilingFlatTexture);
+
+								// Fix missing textures
+								foreach(Sidedef sd in s.Sidedefs)
+								{
+									if(!newlinedefs.Contains(sd.Line)) newlinedefs.Add(sd.Line);
+
+									if(stairsectorbuilderform.UpperTexture)
+									{
+										if(sd.Line.Back != null && sd.Line.Back.HighRequired()) sd.Line.Back.SetTextureHigh(uppertexture);
+										if(sd.Line.Front != null && sd.Line.Front.HighRequired()) sd.Line.Front.SetTextureHigh(uppertexture);
+										if(stairsectorbuilderform.UpperUnpegged) sd.Line.SetFlag(General.Map.Config.UpperUnpeggedFlag, true);
+									}
+
+									if(stairsectorbuilderform.LowerTexture)
+									{
+										if(sd.Line.Front != null && sd.Line.Front.LowRequired()) sd.Line.Front.SetTextureLow(lowertexture);
+										if(sd.Line.Back != null && sd.Line.Back.LowRequired()) sd.Line.Back.SetTextureLow(lowertexture);
+										if(stairsectorbuilderform.LowerUnpegged) sd.Line.SetFlag(General.Map.Config.LowerUnpeggedFlag, true);
+									}
+
+									if(stairsectorbuilderform.MiddleTexture)
+									{
+										if(sd.Line.Front != null && sd.Line.Front.MiddleRequired()) sd.Line.Front.SetTextureMid(middletexture);
+										if(sd.Line.Back != null && sd.Line.Back.MiddleRequired()) sd.Line.Back.SetTextureMid(middletexture);
+									}
+								}
+							}
+						}
+
+						stepcounter++;
+					}
+				}
+
+				if(stairsectorbuilderform.MiddleTexture)
+					General.Map.Options.DefaultWallTexture = olddefaulttexture;
+
+				// Snap to map format accuracy
+				General.Map.Map.SnapAllToAccuracy();
+
+				// Clean the map up. Merge all vertices that share the same position and
+				// remove looped linedefs
+				foreach(Sector s in allnewsectors)
+				{
+					if(s.Sidedefs == null) continue;
+
+					foreach(Sidedef sd in s.Sidedefs)
+					{
+						if(!newvertices.Contains(sd.Line.Start)) newvertices.Add(sd.Line.Start);
+						if(!newvertices.Contains(sd.Line.End)) newvertices.Add(sd.Line.End);
+					}
+				}
+
+				General.Map.Map.BeginAddRemove();
+				MapSet.JoinVertices(newvertices, newvertices, false, MapSet.STITCH_DISTANCE);
+				General.Map.Map.EndAddRemove();
+
+				MapSet.RemoveLoopedLinedefs(newlinedefs);
+
+				// Update textures
+				General.Map.Data.UpdateUsedTextures();
+
+				// Update caches
+				General.Map.Map.Update();
+				General.Map.IsChanged = true;
+			}
+			catch (Exception e)
+			{
+				General.Interface.DisplayStatus(StatusType.Warning, e.ToString());
+				General.Map.UndoRedo.WithdrawUndo();
+			}
+
+			// Return to base mode
+			General.Editing.ChangeMode(General.Editing.PreviousStableMode.Name);
+		}
+
+		// Redrawing display
+		public override void OnRedrawDisplay()
+		{
+			if(!stairsectorbuilderform.FullyLoaded) return;
+
+			base.OnRedrawDisplay();
+
+			renderer.RedrawSurface();
+
+			// Render lines
+			if(renderer.StartPlotter(true))
+			{
+				renderer.PlotLinedefSet(General.Map.Map.Linedefs);
+				renderer.PlotVerticesSet(General.Map.Map.Vertices);
+				renderer.Finish();
+			}
+
+			// Render things
+			if(renderer.StartThings(true))
+			{
+				renderer.RenderThingSet(General.Map.Map.Things, Presentation.THINGS_ALPHA);
+				renderer.Finish();
+			}
+
+			// Render overlay
+			if(renderer.StartOverlay(true))
+			{
+				if(stairsectorbuilderform.Tabs.SelectedIndex == 2 && numcontrolpoints != stairsectorbuilderform.NumControlPoints)
+				{
+					ModifyControlpointNumber(stairsectorbuilderform.NumControlPoints);
+					numcontrolpoints = stairsectorbuilderform.NumControlPoints;
+				}
+
+                // Create sector info based on the settings...
+				UpdateVertexData();
+
+				// Render the control points if the Catmull Rom spline tab is selected
+				if(stairsectorbuilderform.Tabs.SelectedIndex == 2)
+				{
+					foreach(List<Vector2D> lv in exactsplines)
+					{
+						for(int i = 0; i < lv.Count - 1; i++)
+						{
+							renderer.RenderLine(lv[i], lv[i + 1], LINE_THICKNESS, new PixelColor(255, 128, 128, 128), true);
+						}
+					}
+
+					foreach(CatmullRomSplineGroup crsg in catmullromsplinegroups)
+					{
+						CatmullRomSplineData[] crsd = new CatmullRomSplineData[2] { crsg.splines[INNER_SPLINE], crsg.splines[OUTER_SPLINE] };
+
+						foreach(CatmullRomSplineData c in crsd)
+						{
+							for(int i = 0; i < c.controlpoints.Count; i++)
+							{
+								RectangleF rect = new RectangleF(c.controlpoints[i].x - CONTROLPOINT_SIZE / 2, c.controlpoints[i].y - CONTROLPOINT_SIZE / 2, 10.0f, 10.0f);
+
+								if(i == 0) renderer.RenderRectangle(rect, 2, new PixelColor(128, 255, 0, 0), true);
+								else if(i == c.controlpoints.Count -1) renderer.RenderRectangle(rect, 2, new PixelColor(128, 0, 255, 0), true);
+								else renderer.RenderRectangle(rect, 2, General.Colors.Indication, true);
+								//renderer.RenderLine(c.controlpoints[i], c.controlpoints[i] + c.tangents[i], LINE_THICKNESS, new PixelColor(255, 128, 128, 128), true);
+							}
+						}
+					}
+				}
+
+				// ... and draw the preview
+				foreach(StairInfo si in stairsectors)
+				{
+					foreach(List<Vector2D> lv in si.sectors)
+					{
+						for(int i = 0; i < lv.Count - 1; i++)
+						{
+							renderer.RenderLine(lv[i], lv[i + 1], LINE_THICKNESS, General.Colors.Highlight, true);
+
+							RectangleF rect = new RectangleF(lv[i].x - CONTROLPOINT_SIZE / 2, lv[i].y - CONTROLPOINT_SIZE / 2, 10.0f, 10.0f);
+							renderer.RenderRectangle(rect, 2, new PixelColor(128, 255, 0, 0), true);
+						}
+					}
+				}
+			
+				renderer.Finish();
+			}
+
+			renderer.Present();
+		}
+
+		protected override void OnSelectBegin()
+		{
+			base.OnSelectBegin();
+
+			if(stairsectorbuilderform.Tabs.SelectedIndex != 2) return;
+
+			// Go through all Catmull Rom Spline Groups
+			for(int crsg = 0; crsg < catmullromsplinegroups.Count; crsg++)
+			{
+				// Check inner and outer splines
+				for(int crsd = 0; crsd < 2; crsd++)
+				{
+					// Check all control points except the first and last, they belong to the linedefs
+					// and may not be moved
+					for(int cp = 1; cp < catmullromsplinegroups[crsg].splines[crsd].controlpoints.Count-1; cp++)
+					{
+						Vector2D p = catmullromsplinegroups[crsg].splines[crsd].controlpoints[cp];
+
+						// If the mouse is inside a control point, set the info about that control point
+						// in the selectedcontrolpoint struct
+						if(mousemappos.x >= p.x - CONTROLPOINT_SIZE / 2 && mousemappos.x <= p.x + CONTROLPOINT_SIZE / 2 && mousemappos.y >= p.y - CONTROLPOINT_SIZE / 2 && mousemappos.y <= p.y + CONTROLPOINT_SIZE / 2)
+						{
+							selectedcontrolpoint.cp = cp;
+							selectedcontrolpoint.crsd = crsd;
+							selectedcontrolpoint.crsg = crsg;
+						}
+					}
+				}
+			}
+		}
+
+		// When selected button is released
+		protected override void OnSelectEnd()
+		{
+			base.OnSelectEnd();
+
+			// No control point is selected
+			selectedcontrolpoint.cp = -1;
+			selectedcontrolpoint.crsd = -1;
+			selectedcontrolpoint.crsg = -1;
+
+			// Redraw
+			General.Map.Map.Update();
+			General.Interface.RedrawDisplay();
+		}
+
+		// Mouse moves
+		public override void OnMouseMove(MouseEventArgs e)
+		{
+			base.OnMouseMove(e);
+
+			// If a control point is selected move it around
+			if(selectedcontrolpoint.cp != -1)
+			{
+				if(General.Interface.ShiftState ^ General.Interface.SnapToGrid)
+				{
+					catmullromsplinegroups[selectedcontrolpoint.crsg].splines[selectedcontrolpoint.crsd].controlpoints[selectedcontrolpoint.cp] = new Vector2D(General.Map.Grid.SnappedToGrid(mousemappos).x, General.Map.Grid.SnappedToGrid(mousemappos).y);
+				}
+				else
+				{
+					catmullromsplinegroups[selectedcontrolpoint.crsg].splines[selectedcontrolpoint.crsd].controlpoints[selectedcontrolpoint.cp] = new Vector2D(mousemappos.x, mousemappos.y);
+				}
+
+				// New tangents of the control points have to be calculated
+				ComputeTangents(ref catmullromsplinegroups[selectedcontrolpoint.crsg].splines[selectedcontrolpoint.crsd]);
+
+				General.Interface.RedrawDisplay();
+			}
+		}
+
+		public static void SavePrefabs()
+		{
+			ListDictionary prefabdata = new ListDictionary();
+			int counter = 1;
+
+			foreach(BuilderPlug.Prefab p in BuilderPlug.Me.Prefabs)
+			{
+				ListDictionary data = new ListDictionary();
+				data.Add("name", p.name);
+				data.Add("numberofsectors", p.numberofsectors);
+				data.Add("outervertexmultiplier", p.outervertexmultiplier);
+				data.Add("innervertexmultiplier", p.innervertexmultiplier);
+				data.Add("stairtype", p.stairtype);
+				data.Add("sectordepth", p.sectordepth);
+				data.Add("spacing", p.spacing);
+				data.Add("frontside", p.frontside);
+				data.Add("singlesectors", p.singlesectors);
+				data.Add("singledirection", p.singledirection);
+				data.Add("distinctbaseheights", p.distinctbaseheights);
+				data.Add("flipping", p.flipping);
+				data.Add("numberofcontrolpoints", p.numberofcontrolpoints);
+				data.Add("applyfloormod", p.applyfloormod);
+				data.Add("floormod", p.floormod);
+				//data.Add("floorbase", p.floorbase);
+				data.Add("applyceilingmod", p.applyceilingmod);
+				data.Add("ceilingmod", p.ceilingmod);
+				//data.Add("ceilingbase", p.ceilingbase);
+				data.Add("applyfloortexture", p.applyfloortexture);
+				data.Add("floortexture", p.floortexture);
+				data.Add("applyceilingtexture", p.applyceilingtexture);
+				data.Add("ceilingtexture", p.ceilingtexture);
+				data.Add("applyuppertexture", p.applyuppertexture);
+				data.Add("uppertexture", p.uppertexture);
+				data.Add("upperunpegged", p.upperunpegged);
+				data.Add("applymiddletexture", p.applymiddletexture);
+				data.Add("middletexture", p.middletexture);
+				data.Add("applylowertexture", p.applylowertexture);
+				data.Add("lowertexture", p.lowertexture);
+				data.Add("lowerunpegged", p.lowerunpegged);
+
+				prefabdata.Add("prefab" + counter, data);
+
+				counter++;
+			}
+
+			General.Map.Options.WritePluginSetting("prefabs", prefabdata);
+		}
+
+		private void LoadPrefabs()
+		{
+			// load the light info from the .dbs
+			ListDictionary prefabdata = (ListDictionary)General.Map.Options.ReadPluginSetting("prefabs", new ListDictionary());
+
+			BuilderPlug.Me.Prefabs.Clear();
+
+			foreach(DictionaryEntry prefabentry in prefabdata)
+			{
+				BuilderPlug.Prefab p = new BuilderPlug.Prefab();
+
+				foreach(DictionaryEntry entry in (ListDictionary)prefabentry.Value)
+				{
+					if((string)entry.Key == "name") p.name = (string)entry.Value;
+					if((string)entry.Key == "numberofsectors") p.numberofsectors = (int)entry.Value;
+					if((string)entry.Key == "outervertexmultiplier") p.outervertexmultiplier = (int)entry.Value;
+					if((string)entry.Key == "innervertexmultiplier") p.innervertexmultiplier = (int)entry.Value;
+					if((string)entry.Key == "stairtype") p.stairtype = (int)entry.Value;
+					if((string)entry.Key == "sectordepth") p.sectordepth = (int)entry.Value;
+					if((string)entry.Key == "spacing") p.spacing = (int)entry.Value;
+					if((string)entry.Key == "frontside") p.frontside = (bool)entry.Value;
+					if((string)entry.Key == "singlesectors") p.singlesectors = (bool)entry.Value;
+					if((string)entry.Key == "singledirection") p.singledirection = (bool)entry.Value;
+					if((string)entry.Key == "distinctbaseheights") p.distinctbaseheights = (bool)entry.Value;
+					if((string)entry.Key == "flipping") p.flipping = (int)entry.Value;
+					if((string)entry.Key == "numberofcontrolpoints") p.numberofcontrolpoints = (int)entry.Value;
+					if((string)entry.Key == "applyfloormod") p.applyfloormod = (bool)entry.Value;
+					if((string)entry.Key == "floormod") p.floormod = (int)entry.Value;
+					//if((string)entry.Key == "floorbase") p.floorbase = (int)entry.Value;
+					if((string)entry.Key == "applyceilingmod") p.applyceilingmod = (bool)entry.Value;
+					if((string)entry.Key == "ceilingmod") p.ceilingmod = (int)entry.Value;
+					//if((string)entry.Key == "ceilingbase") p.ceilingbase = (int)entry.Value;
+					if((string)entry.Key == "applyfloortexture") p.applyfloortexture = (bool)entry.Value;
+					if((string)entry.Key == "floortexture") p.floortexture = (string)entry.Value;
+					if((string)entry.Key == "applyceilingtexture") p.applyceilingtexture = (bool)entry.Value;
+					if((string)entry.Key == "ceilingtexture") p.ceilingtexture = (string)entry.Value;
+					if((string)entry.Key == "applyuppertexture") p.applyuppertexture = (bool)entry.Value;
+					if((string)entry.Key == "upperunpegged") p.upperunpegged = (bool)entry.Value;
+					if((string)entry.Key == "uppertexture") p.uppertexture = (string)entry.Value;
+					if((string)entry.Key == "applymiddletexture") p.applymiddletexture = (bool)entry.Value;
+					if((string)entry.Key == "middletexture") p.middletexture = (string)entry.Value;
+					if((string)entry.Key == "applylowertexture") p.applylowertexture = (bool)entry.Value;
+					if((string)entry.Key == "lowertexture") p.lowertexture = (string)entry.Value;
+					if((string)entry.Key == "lowerunpegged") p.lowerunpegged = (bool)entry.Value;
+				}
+
+				BuilderPlug.Me.Prefabs.Add(p);
+			}
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/TagExplorer/BuilderPlug.cs b/Source/Plugins/TagExplorer/BuilderPlug.cs
new file mode 100644
index 0000000..8ea3b62
--- /dev/null
+++ b/Source/Plugins/TagExplorer/BuilderPlug.cs
@@ -0,0 +1,83 @@
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Controls;
+using CodeImp.DoomBuilder.Plugins;
+
+namespace CodeImp.DoomBuilder.TagExplorer
+{
+	public sealed class BuilderPlug : Plug
+	{
+		private static BuilderPlug me;
+
+		// Docker
+		private TagExplorer tagExplorer;
+		private Docker docker;
+
+		// Static property to access the BuilderPlug
+		public static BuilderPlug Me { get { return me; } }
+
+		// This event is called when the plugin is initialized
+		public override void OnInitialize() 
+		{
+			base.OnInitialize();
+
+			// Keep a static reference
+			me = this;
+		}
+
+		// When a map is created
+		public override void OnMapNewEnd() 
+		{
+			OnMapOpenEnd();
+		}
+
+		// This is called after a map has been successfully opened
+		public override void OnMapOpenEnd() 
+		{
+			if(tagExplorer == null) 
+			{
+				tagExplorer = new TagExplorer();
+				docker = new Docker("tagexplorerdockerpanel", "Tag Explorer", tagExplorer);
+				General.Interface.AddDocker(docker);
+				tagExplorer.Setup();
+			}
+		}
+
+		// This is called after a map has been closed
+		public override void OnMapCloseBegin() 
+		{
+			// If we have a Tag Explorer panel, remove it
+			if(tagExplorer != null) 
+			{
+				tagExplorer.Terminate();
+				General.Interface.RemoveDocker(docker);
+				docker = null;
+				tagExplorer.Dispose();
+				tagExplorer = null;
+			}
+		}
+
+		// Geometry pasted
+		public override void OnPasteEnd(PasteOptions options) 
+		{
+			if(tagExplorer != null) tagExplorer.UpdateTreeSoon();
+		}
+
+		// Undo performed
+		public override void OnUndoEnd() 
+		{
+			if(tagExplorer != null) tagExplorer.UpdateTreeSoon();
+		}
+
+		// Redo performed
+		public override void OnRedoEnd() 
+		{
+			if(tagExplorer != null) tagExplorer.UpdateTreeSoon();
+		}
+
+		public override void OnActionEnd(Actions.Action action) 
+		{
+			if(tagExplorer != null && action.Name == "builder_deleteitem")
+				tagExplorer.UpdateTreeSoon();
+		}
+	}
+}
diff --git a/Source/Plugins/TagExplorer/Controls/TagExplorer.Designer.cs b/Source/Plugins/TagExplorer/Controls/TagExplorer.Designer.cs
new file mode 100644
index 0000000..1e6ad6e
--- /dev/null
+++ b/Source/Plugins/TagExplorer/Controls/TagExplorer.Designer.cs
@@ -0,0 +1,264 @@
+namespace CodeImp.DoomBuilder.TagExplorer
+{
+	partial class TagExplorer
+	{
+		/// <summary> 
+		/// Требует�� переменна� кон�труктора.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		#region Код, автоматиче�ки �озданный кон�труктором компонентов
+
+		/// <summary> 
+		/// Об�зательный метод дл� поддержки кон�труктора - не измен�йте 
+		/// �одержимое данного метода при помощи редактора кода.
+		/// </summary>
+		private void InitializeComponent() {
+			this.components = new System.ComponentModel.Container();
+			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TagExplorer));
+			this.treeView = new System.Windows.Forms.TreeView();
+			this.imageList1 = new System.Windows.Forms.ImageList(this.components);
+			this.cbDisplayMode = new System.Windows.Forms.ComboBox();
+			this.label1 = new System.Windows.Forms.Label();
+			this.cbSortMode = new System.Windows.Forms.ComboBox();
+			this.labelsortmode = new System.Windows.Forms.Label();
+			this.cbCenterOnSelected = new System.Windows.Forms.CheckBox();
+			this.groupBox1 = new System.Windows.Forms.GroupBox();
+			this.cbCommentsOnly = new System.Windows.Forms.CheckBox();
+			this.cbSelectOnClick = new System.Windows.Forms.CheckBox();
+			this.labelSearch = new System.Windows.Forms.Label();
+			this.btnClearSearch = new System.Windows.Forms.Button();
+			this.tbSearch = new System.Windows.Forms.TextBox();
+			this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
+			this.bExportToFile = new System.Windows.Forms.Button();
+			this.updatetimer = new System.Windows.Forms.Timer(this.components);
+			this.saveFileDialog = new System.Windows.Forms.SaveFileDialog();
+			this.groupBox1.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// treeView
+			// 
+			this.treeView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.treeView.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+			this.treeView.HideSelection = false;
+			this.treeView.ImageIndex = 0;
+			this.treeView.ImageList = this.imageList1;
+			this.treeView.Location = new System.Drawing.Point(3, 172);
+			this.treeView.Name = "treeView";
+			this.treeView.SelectedImageIndex = 0;
+			this.treeView.ShowNodeToolTips = true;
+			this.treeView.Size = new System.Drawing.Size(266, 226);
+			this.treeView.TabIndex = 0;
+			this.treeView.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.treeView_NodeMouseDoubleClick);
+			this.treeView.AfterLabelEdit += new System.Windows.Forms.NodeLabelEditEventHandler(this.treeView_AfterLabelEdit);
+			this.treeView.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.treeView_NodeMouseClick);
+			this.treeView.BeforeLabelEdit += new System.Windows.Forms.NodeLabelEditEventHandler(this.treeView_BeforeLabelEdit);
+			// 
+			// imageList1
+			// 
+			this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream")));
+			this.imageList1.TransparentColor = System.Drawing.Color.Transparent;
+			this.imageList1.Images.SetKeyName(0, "ThingsGroup.png");
+			this.imageList1.Images.SetKeyName(1, "Things.png");
+			this.imageList1.Images.SetKeyName(2, "SectorsGroup.png");
+			this.imageList1.Images.SetKeyName(3, "Sectors.png");
+			this.imageList1.Images.SetKeyName(4, "LinesGroup.png");
+			this.imageList1.Images.SetKeyName(5, "Lines.png");
+			// 
+			// cbDisplayMode
+			// 
+			this.cbDisplayMode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.cbDisplayMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.cbDisplayMode.Location = new System.Drawing.Point(57, 13);
+			this.cbDisplayMode.Name = "cbDisplayMode";
+			this.cbDisplayMode.Size = new System.Drawing.Size(203, 21);
+			this.cbDisplayMode.TabIndex = 2;
+			// 
+			// label1
+			// 
+			this.label1.AutoSize = true;
+			this.label1.Location = new System.Drawing.Point(14, 16);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(37, 13);
+			this.label1.TabIndex = 3;
+			this.label1.Text = "Show:";
+			this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+			// 
+			// cbSortMode
+			// 
+			this.cbSortMode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.cbSortMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.cbSortMode.Location = new System.Drawing.Point(57, 40);
+			this.cbSortMode.Name = "cbSortMode";
+			this.cbSortMode.Size = new System.Drawing.Size(203, 21);
+			this.cbSortMode.TabIndex = 4;
+			// 
+			// labelsortmode
+			// 
+			this.labelsortmode.AutoSize = true;
+			this.labelsortmode.Location = new System.Drawing.Point(22, 43);
+			this.labelsortmode.Name = "labelsortmode";
+			this.labelsortmode.Size = new System.Drawing.Size(29, 13);
+			this.labelsortmode.TabIndex = 5;
+			this.labelsortmode.Text = "Sort:";
+			this.labelsortmode.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+			// 
+			// cbCenterOnSelected
+			// 
+			this.cbCenterOnSelected.AutoSize = true;
+			this.cbCenterOnSelected.Location = new System.Drawing.Point(12, 94);
+			this.cbCenterOnSelected.Name = "cbCenterOnSelected";
+			this.cbCenterOnSelected.Size = new System.Drawing.Size(203, 17);
+			this.cbCenterOnSelected.TabIndex = 6;
+			this.cbCenterOnSelected.Text = "Center view on selected map element";
+			this.cbCenterOnSelected.UseVisualStyleBackColor = true;
+			// 
+			// groupBox1
+			// 
+			this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.groupBox1.Controls.Add(this.cbCommentsOnly);
+			this.groupBox1.Controls.Add(this.cbSelectOnClick);
+			this.groupBox1.Controls.Add(this.labelSearch);
+			this.groupBox1.Controls.Add(this.btnClearSearch);
+			this.groupBox1.Controls.Add(this.tbSearch);
+			this.groupBox1.Controls.Add(this.label1);
+			this.groupBox1.Controls.Add(this.cbCenterOnSelected);
+			this.groupBox1.Controls.Add(this.cbDisplayMode);
+			this.groupBox1.Controls.Add(this.labelsortmode);
+			this.groupBox1.Controls.Add(this.cbSortMode);
+			this.groupBox1.Location = new System.Drawing.Point(3, 3);
+			this.groupBox1.Name = "groupBox1";
+			this.groupBox1.Size = new System.Drawing.Size(266, 163);
+			this.groupBox1.TabIndex = 7;
+			this.groupBox1.TabStop = false;
+			// 
+			// cbCommentsOnly
+			// 
+			this.cbCommentsOnly.AutoSize = true;
+			this.cbCommentsOnly.Location = new System.Drawing.Point(12, 140);
+			this.cbCommentsOnly.Name = "cbCommentsOnly";
+			this.cbCommentsOnly.Size = new System.Drawing.Size(181, 17);
+			this.cbCommentsOnly.TabIndex = 11;
+			this.cbCommentsOnly.Text = "Hide elements without comments";
+			this.cbCommentsOnly.UseVisualStyleBackColor = true;
+			this.cbCommentsOnly.CheckedChanged += new System.EventHandler(this.cbCommentsOnly_CheckedChanged);
+			// 
+			// cbSelectOnClick
+			// 
+			this.cbSelectOnClick.AutoSize = true;
+			this.cbSelectOnClick.Location = new System.Drawing.Point(12, 117);
+			this.cbSelectOnClick.Name = "cbSelectOnClick";
+			this.cbSelectOnClick.Size = new System.Drawing.Size(96, 17);
+			this.cbSelectOnClick.TabIndex = 10;
+			this.cbSelectOnClick.Text = "Select on click";
+			this.cbSelectOnClick.UseVisualStyleBackColor = true;
+			// 
+			// labelSearch
+			// 
+			this.labelSearch.AutoSize = true;
+			this.labelSearch.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.labelSearch.ForeColor = System.Drawing.SystemColors.HotTrack;
+			this.labelSearch.Location = new System.Drawing.Point(18, 70);
+			this.labelSearch.Name = "labelSearch";
+			this.labelSearch.Size = new System.Drawing.Size(32, 13);
+			this.labelSearch.TabIndex = 9;
+			this.labelSearch.Text = "Filter:";
+			this.labelSearch.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+			// 
+			// btnClearSearch
+			// 
+			this.btnClearSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.btnClearSearch.Image = global::CodeImp.DoomBuilder.TagExplorer.Properties.Resources.SearchClear;
+			this.btnClearSearch.Location = new System.Drawing.Point(236, 65);
+			this.btnClearSearch.Name = "btnClearSearch";
+			this.btnClearSearch.Size = new System.Drawing.Size(24, 24);
+			this.btnClearSearch.TabIndex = 8;
+			this.toolTip1.SetToolTip(this.btnClearSearch, "Clear Search");
+			this.btnClearSearch.UseVisualStyleBackColor = true;
+			this.btnClearSearch.Click += new System.EventHandler(this.btnClearSearch_Click);
+			// 
+			// tbSearch
+			// 
+			this.tbSearch.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.tbSearch.Location = new System.Drawing.Point(57, 68);
+			this.tbSearch.Name = "tbSearch";
+			this.tbSearch.Size = new System.Drawing.Size(175, 20);
+			this.tbSearch.TabIndex = 7;
+			this.tbSearch.TextChanged += new System.EventHandler(this.tbSearch_TextChanged);
+			// 
+			// toolTip1
+			// 
+			this.toolTip1.AutomaticDelay = 0;
+			this.toolTip1.AutoPopDelay = 30000;
+			this.toolTip1.InitialDelay = 10;
+			this.toolTip1.ReshowDelay = 100;
+			this.toolTip1.ToolTipTitle = "Supported wildcards:";
+			this.toolTip1.UseAnimation = false;
+			this.toolTip1.UseFading = false;
+			// 
+			// bExportToFile
+			// 
+			this.bExportToFile.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.bExportToFile.Image = global::CodeImp.DoomBuilder.TagExplorer.Properties.Resources.Save;
+			this.bExportToFile.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+			this.bExportToFile.Location = new System.Drawing.Point(3, 402);
+			this.bExportToFile.Name = "bExportToFile";
+			this.bExportToFile.Size = new System.Drawing.Size(266, 23);
+			this.bExportToFile.TabIndex = 0;
+			this.bExportToFile.Text = "Export to file...";
+			this.bExportToFile.UseVisualStyleBackColor = true;
+			this.bExportToFile.Click += new System.EventHandler(this.bExportToFile_Click);
+			// 
+			// updatetimer
+			// 
+			this.updatetimer.Interval = 750;
+			this.updatetimer.Tick += new System.EventHandler(this.updatetimer_Tick);
+			// 
+			// saveFileDialog
+			// 
+			this.saveFileDialog.Filter = "Text files|*.txt";
+			this.saveFileDialog.Title = "Choose save location:";
+			// 
+			// TagExplorer
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.Controls.Add(this.bExportToFile);
+			this.Controls.Add(this.groupBox1);
+			this.Controls.Add(this.treeView);
+			this.Name = "TagExplorer";
+			this.Size = new System.Drawing.Size(272, 430);
+			this.groupBox1.ResumeLayout(false);
+			this.groupBox1.PerformLayout();
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.TreeView treeView;
+		private System.Windows.Forms.ComboBox cbDisplayMode;
+		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.ComboBox cbSortMode;
+		private System.Windows.Forms.Label labelsortmode;
+		private System.Windows.Forms.ImageList imageList1;
+		private System.Windows.Forms.CheckBox cbCenterOnSelected;
+		private System.Windows.Forms.GroupBox groupBox1;
+		private System.Windows.Forms.ToolTip toolTip1;
+		private System.Windows.Forms.Label labelSearch;
+		private System.Windows.Forms.Button btnClearSearch;
+		private System.Windows.Forms.TextBox tbSearch;
+		private System.Windows.Forms.CheckBox cbSelectOnClick;
+		private System.Windows.Forms.CheckBox cbCommentsOnly;
+		private System.Windows.Forms.Timer updatetimer;
+		private System.Windows.Forms.Button bExportToFile;
+		private System.Windows.Forms.SaveFileDialog saveFileDialog;
+	}
+}
diff --git a/Source/Plugins/TagExplorer/Controls/TagExplorer.cs b/Source/Plugins/TagExplorer/Controls/TagExplorer.cs
new file mode 100644
index 0000000..eba50ca
--- /dev/null
+++ b/Source/Plugins/TagExplorer/Controls/TagExplorer.cs
@@ -0,0 +1,1000 @@
+#region ================== Namespaces
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Globalization;
+using System.IO;
+using System.Text;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Editing;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.IO;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Windows;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.TagExplorer
+{
+	#region ================== Structs
+
+	internal struct SortMode
+	{
+		public const string SORT_BY_INDEX = "By Index";
+		public const string SORT_BY_TAG = "By Tag";
+		public const string SORT_BY_ACTION = "By Action Special";
+		public const string SORT_BY_POLYOBJ_NUMBER = "By Polyobject Number";
+		public static readonly object[] SORT_MODES = new object[] { SORT_BY_INDEX, SORT_BY_TAG, SORT_BY_ACTION };
+	}
+
+	internal struct SelectedNode
+	{
+		public NodeInfoType Type;
+		public int Index;
+	}
+
+	#endregion
+	
+	public sealed partial class TagExplorer : UserControl
+	{
+		private const string DISPLAY_TAGS_AND_ACTIONS = "Tags and Action Specials";
+		private const string DISPLAY_TAGS = "Tags";
+		private const string DISPLAY_ACTIONS = "Action Specials";
+		private const string DISPLAY_POLYOBJECTS = "Polyobjects";
+		private readonly object[] DISPLAY_MODES = new object[] { DISPLAY_TAGS_AND_ACTIONS, DISPLAY_TAGS, DISPLAY_ACTIONS, DISPLAY_POLYOBJECTS };
+		
+		private string currentDisplayMode;
+		private string currentSortMode;
+
+		private const string CAT_THINGS = "Things:";
+		private const string CAT_SECTORS = "Sectors:";
+		private const string CAT_LINEDEFS = "Linedefs:";
+
+		private readonly Color commentColor = Color.DarkMagenta;
+		private SelectedNode selection;
+		private readonly string nodetooltip;
+
+		private static bool udmf;
+		internal static bool UDMF { get { return udmf; } }
+
+		#region ================== Constructor / Disposer
+
+		public TagExplorer() 
+		{
+			InitializeComponent();
+
+			selection = new SelectedNode();
+
+			cbDisplayMode.Items.AddRange(DISPLAY_MODES);
+			cbDisplayMode.SelectedIndex = General.Clamp(General.Settings.ReadPluginSetting("displaymode", 0), 0, DISPLAY_MODES.Length - 1);
+			cbDisplayMode.SelectedIndexChanged += cbDisplayMode_SelectedIndexChanged;
+			currentDisplayMode = cbDisplayMode.SelectedItem.ToString();
+
+			cbSortMode.Items.AddRange(SortMode.SORT_MODES);
+			cbSortMode.SelectedIndex = General.Clamp(General.Settings.ReadPluginSetting("sortmode", 0), 0, SortMode.SORT_MODES.Length - 1);
+			cbSortMode.SelectedIndexChanged += cbSortMode_SelectedIndexChanged;
+			currentSortMode = cbSortMode.SelectedItem.ToString();
+
+			cbCenterOnSelected.Checked = General.Settings.ReadPluginSetting("centeronselected", false);
+			cbSelectOnClick.Checked = General.Settings.ReadPluginSetting("doselect", false);
+
+			udmf = (General.Map.Config.FormatInterface == "UniversalMapSetIO");
+
+			string searchhint = "Enter '#' + tag number to show only specified tag. Example: #667" + Environment.NewLine
+				+ "Enter '$' + effect number to show only specified effect. Example: $80" + Environment.NewLine
+			    + "Enter '^' + polyobject number to filter by polyobject number. Example: ^22" + Environment.NewLine
+			    + "Several wildcards can be combined.";
+
+			if(udmf) 
+			{
+				cbCommentsOnly.Checked = General.Settings.ReadPluginSetting("commentsonly", false);
+				toolTip1.SetToolTip(labelSearch, "Enter text to find comment" + Environment.NewLine + searchhint);
+				nodetooltip = "Double-click item to edit item's comment\r\nRight-click item to open item's Properties";
+			} 
+			else 
+			{
+				cbCommentsOnly.Enabled = false;
+				toolTip1.SetToolTip(labelSearch, searchhint);
+				nodetooltip = "Right-click item to open item's Properties";
+			}
+		}
+
+		// Disposer
+		protected override void Dispose(bool disposing) 
+		{
+			General.Settings.WritePluginSetting("sortmode", cbSortMode.SelectedIndex);
+			General.Settings.WritePluginSetting("displaymode", cbDisplayMode.SelectedIndex);
+			General.Settings.WritePluginSetting("centeronselected", cbCenterOnSelected.Checked);
+			General.Settings.WritePluginSetting("doselect", cbSelectOnClick.Checked);
+
+			if(udmf) General.Settings.WritePluginSetting("commentsonly", cbCommentsOnly.Checked);
+			if(disposing && (components != null)) components.Dispose();
+			base.Dispose(disposing);
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		public void Setup() 
+		{
+			if(this.ParentForm != null) this.ParentForm.Activated += ParentForm_Activated;
+			UpdateTree(true);
+		}
+
+		public void Terminate() 
+		{
+			if(this.ParentForm != null) this.ParentForm.Activated -= ParentForm_Activated;
+		}
+
+		// This sets the timer to update the list very soon (because we'll have problems if we just call updateTree now)
+		public void UpdateTreeSoon() 
+		{
+			updatetimer.Stop();
+			updatetimer.Start();
+		}
+
+		private void UpdateTree(bool focusDisplay) 
+		{
+			bool showTags = (currentDisplayMode == DISPLAY_TAGS || currentDisplayMode == DISPLAY_TAGS_AND_ACTIONS);
+			bool showActions = (currentDisplayMode == DISPLAY_ACTIONS || currentDisplayMode == DISPLAY_TAGS_AND_ACTIONS);
+			bool hasComment;
+			string comment = "";
+			string serachStr = tbSearch.Text.ToLowerInvariant();
+
+			List<int> filteredtags = new List<int>();
+			List<int> filteredactions = new List<int>();
+			List<int> filteredpolyobjects = new List<int>();
+			GetSpecialValues(serachStr, ref filteredtags, ref filteredactions, ref filteredpolyobjects);
+
+			if(!udmf || filteredtags.Count > 0 || filteredactions.Count > 0 || filteredpolyobjects.Count > 0)
+				serachStr = "";
+
+			TreeNode selectedNode = null;
+
+			this.SuspendLayout();
+			treeView.Nodes.Clear();
+
+			List<TreeNode> nodes = new List<TreeNode>();
+
+//add things
+			if(General.Map.FormatInterface.HasThingAction || General.Map.FormatInterface.HasThingTag) 
+			{
+				ICollection<Thing> things = General.Map.Map.Things;
+
+				if(!(things is MapElementCollection<Thing>)) //don't want to enumerate when array is locked
+				{ 
+					foreach(Thing t in things) 
+					{
+						if((showTags && t.Tag != 0) || (showActions && t.Action > 0)) 
+						{
+							if(filteredtags.Count > 0 && !filteredtags.Contains(t.Tag)) continue;
+							if(filteredactions.Count > 0 && !filteredactions.Contains(t.Action)) continue;
+
+							NodeInfo info = new NodeInfo(t);
+							if(filteredpolyobjects.Count > 0 && !filteredpolyobjects.Contains(info.PolyobjectNumber)) continue;
+
+							string name = info.GetName(ref comment, currentSortMode);
+							hasComment = comment.Length > 0;
+
+							if(!hasComment && cbCommentsOnly.Checked) continue;
+
+							if(!udmf || serachStr.Length == 0 || (hasComment && comment.ToLowerInvariant().IndexOf(serachStr) != -1)) 
+							{
+								TreeNode node = new TreeNode(name, 1, 1) { Tag = info, ToolTipText = nodetooltip };
+								if(hasComment) node.ForeColor = commentColor;
+								nodes.Add(node);
+
+								if(info.Index == selection.Index && info.Type == selection.Type)
+									selectedNode = node;
+							}
+						}
+						else if(currentDisplayMode == DISPLAY_POLYOBJECTS)
+						{
+							NodeInfo info = new NodeInfo(t);
+							if(info.PolyobjectNumber != int.MinValue && (filteredpolyobjects.Count == 0 || filteredpolyobjects.Contains(info.PolyobjectNumber)))
+							{
+								string name = info.GetName(ref comment, SortMode.SORT_BY_POLYOBJ_NUMBER);
+								TreeNode node = new TreeNode(name, 1, 1) { Tag = info, ToolTipText = nodetooltip };
+								nodes.Add(node);
+							}
+						}
+					}
+
+					//sort nodes
+					Sort(ref nodes, currentSortMode);
+
+					//add "things" category
+					if(nodes.Count > 0) 
+					{
+						switch(currentSortMode)
+						{
+							case SortMode.SORT_BY_ACTION:
+							{ 
+								Dictionary<int, TreeNode> categories = new Dictionary<int, TreeNode>();
+								TreeNode noAction = new TreeNode("No Action", 0, 0);
+
+								foreach(TreeNode node in nodes) 
+								{
+									NodeInfo nodeInfo = node.Tag as NodeInfo;
+
+									if(nodeInfo.Action == 0) 
+									{
+										noAction.Nodes.Add(node);
+										continue;
+									}
+
+									LinedefActionInfo lai = General.Map.Config.GetLinedefActionInfo(nodeInfo.Action);
+
+									if(!categories.ContainsKey(lai.Index))
+										categories.Add(lai.Index, new TreeNode(lai.Index + " - " + lai.Name, 0, 0, new[] { node }));
+									else
+										categories[lai.Index].Nodes.Add(node);
+								}
+
+								TreeNode[] catNodes = new TreeNode[categories.Values.Count];
+								categories.Values.CopyTo(catNodes, 0);
+
+								TreeNode category = new TreeNode(CAT_THINGS, 0, 0, catNodes);
+								if(noAction.Nodes.Count > 0) category.Nodes.Add(noAction);
+
+								treeView.Nodes.Add(category);
+
+							}
+							break;
+
+							case SortMode.SORT_BY_INDEX:
+							{
+								if(currentDisplayMode == DISPLAY_POLYOBJECTS)
+								{
+									TreeNode category = new TreeNode(CAT_THINGS, 0, 0);
+									category.Nodes.AddRange(nodes.ToArray());
+									treeView.Nodes.Add(category);
+								}
+								else
+								{
+									Dictionary<string, TreeNode> categories = new Dictionary<string, TreeNode>(StringComparer.Ordinal);
+									foreach(TreeNode node in nodes)
+									{
+										NodeInfo nodeInfo = node.Tag as NodeInfo;
+										ThingTypeInfo tti = General.Map.Data.GetThingInfoEx(General.Map.Map.GetThingByIndex(nodeInfo.Index).Type);
+
+										if(tti != null)
+										{
+											if(!categories.ContainsKey(tti.Category.Title)) categories.Add(tti.Category.Title, new TreeNode(tti.Category.Title, 0, 0, new[] {node}));
+											else categories[tti.Category.Title].Nodes.Add(node);
+										}
+										else
+										{
+											if(!categories.ContainsKey("UNKNOWN")) categories.Add("UNKNOWN", new TreeNode("UNKNOWN", 0, 0, new[] {node}));
+											else categories["UNKNOWN"].Nodes.Add(node);
+										}
+									}
+									TreeNode[] catNodes = new TreeNode[categories.Values.Count];
+									categories.Values.CopyTo(catNodes, 0);
+
+									treeView.Nodes.Add(new TreeNode(CAT_THINGS, 0, 0, catNodes));
+								}
+							}
+							break;
+
+							case SortMode.SORT_BY_TAG:
+							{ 
+								Dictionary<int, TreeNode> categories = new Dictionary<int, TreeNode>();
+								TreeNode noTag = new TreeNode("No Tag", 0, 0);
+
+								foreach(TreeNode node in nodes) 
+								{
+									NodeInfo nodeInfo = node.Tag as NodeInfo;
+
+									if(nodeInfo.Tag == 0) 
+									{
+										noTag.Nodes.Add(node);
+										continue;
+									}
+
+									if(!categories.ContainsKey(nodeInfo.Tag)) 
+									{
+										string title = "Tag " + nodeInfo.Tag;
+										if(General.Map.Options.TagLabels.ContainsKey(nodeInfo.Tag))
+											title += ": " + General.Map.Options.TagLabels[nodeInfo.Tag];
+
+										categories.Add(nodeInfo.Tag, new TreeNode(title, 0, 0, new[] { node }));
+									} 
+									else 
+									{
+										categories[nodeInfo.Tag].Nodes.Add(node);
+									}
+								}
+
+								TreeNode[] catNodes = new TreeNode[categories.Values.Count];
+								categories.Values.CopyTo(catNodes, 0);
+
+								TreeNode category = new TreeNode(CAT_THINGS, 0, 0, catNodes);
+								if(noTag.Nodes.Count > 0) category.Nodes.Add(noTag);
+
+								treeView.Nodes.Add(category);
+							}
+							break;
+						}
+					}
+				}
+			}
+
+//add sectors
+			nodes = new List<TreeNode>();
+			ICollection<Sector> sectors = General.Map.Map.Sectors;
+
+			if(currentDisplayMode != DISPLAY_POLYOBJECTS && !(sectors is MapElementCollection<Sector>)) //don't want to enumerate when array is locked
+			{ 
+				foreach(Sector s in sectors) 
+				{
+					if((showTags && s.Tag != 0) || (showActions && s.Effect > 0)) 
+					{
+						if(filteredtags.Count > 0 && !filteredtags.Contains(s.Tag)) continue;
+						if(filteredactions.Count > 0 && !filteredactions.Contains(s.Effect)) continue;
+
+						NodeInfo info = new NodeInfo(s);
+						string name = info.GetName(ref comment, currentSortMode);
+						hasComment = comment.Length > 0;
+
+						if(!hasComment && cbCommentsOnly.Checked) continue;
+
+						if(!udmf || serachStr.Length == 0 || (hasComment && comment.ToLowerInvariant().IndexOf(serachStr) != -1)) 
+						{
+							TreeNode node = new TreeNode(name, 3, 3) { Tag = info, ToolTipText = nodetooltip };
+							if(hasComment) node.ForeColor = commentColor;
+							nodes.Add(node);
+
+							if(info.Index == selection.Index && info.Type == selection.Type)
+								selectedNode = node;
+						}
+					}
+				}
+
+				//sort nodes
+				Sort(ref nodes, currentSortMode);
+
+				//add category
+				if(nodes.Count > 0) 
+				{
+					switch(currentSortMode)
+					{
+						case SortMode.SORT_BY_ACTION:
+						{
+							Dictionary<int, TreeNode> categories = new Dictionary<int, TreeNode>();
+							TreeNode noAction = new TreeNode("No Effect", 2, 2);
+
+							foreach(TreeNode node in nodes) 
+							{
+								NodeInfo nodeInfo = node.Tag as NodeInfo;
+
+								if(nodeInfo.Action == 0) 
+								{
+									noAction.Nodes.Add(node);
+									continue;
+								}
+
+								SectorEffectInfo sei = General.Map.Config.GetSectorEffectInfo(nodeInfo.Action);
+
+								if(!categories.ContainsKey(sei.Index))
+									categories.Add(sei.Index, new TreeNode(sei.Index + " - " + sei.Title, 2, 2, new[] { node }));
+								else
+									categories[sei.Index].Nodes.Add(node);
+							}
+							TreeNode[] catNodes = new TreeNode[categories.Values.Count];
+							categories.Values.CopyTo(catNodes, 0);
+
+							TreeNode category = new TreeNode(CAT_SECTORS, 2, 2, catNodes);
+							if(noAction.Nodes.Count > 0) category.Nodes.Add(noAction);
+
+							treeView.Nodes.Add(category);
+						}
+						break;
+
+						case SortMode.SORT_BY_TAG:
+						{
+							Dictionary<int, TreeNode> categories = new Dictionary<int, TreeNode>();
+							TreeNode noTag = new TreeNode("No Tag", 2, 2);
+
+							foreach(TreeNode node in nodes) 
+							{
+								NodeInfo nodeInfo = node.Tag as NodeInfo;
+
+								if(nodeInfo.Tag == 0) 
+								{
+									noTag.Nodes.Add(node);
+									continue;
+								}
+
+								if(!categories.ContainsKey(nodeInfo.Tag)) 
+								{
+									string title = "Tag " + nodeInfo.Tag;
+									if(General.Map.Options.TagLabels.ContainsKey(nodeInfo.Tag))
+										title += ": " + General.Map.Options.TagLabels[nodeInfo.Tag];
+
+									categories.Add(nodeInfo.Tag, new TreeNode(title, 2, 2, new[] { node }));
+								} 
+								else 
+								{
+									categories[nodeInfo.Tag].Nodes.Add(node);
+								}
+							}
+							TreeNode[] catNodes = new TreeNode[categories.Values.Count];
+							categories.Values.CopyTo(catNodes, 0);
+
+							TreeNode category = new TreeNode(CAT_SECTORS, 2, 2, catNodes);
+							if(noTag.Nodes.Count > 0) category.Nodes.Add(noTag);
+
+							treeView.Nodes.Add(category);
+						}
+						break;
+
+						default:
+							treeView.Nodes.Add(new TreeNode(CAT_SECTORS, 2, 2, nodes.ToArray()));
+							break;
+					}
+				}
+			}
+
+//add linedefs
+			nodes = new List<TreeNode>();
+			ICollection<Linedef> linedefs = General.Map.Map.Linedefs;
+
+			if(!(linedefs is MapElementCollection<Linedef>)) //don't want to enumerate when array is locked
+			{ 
+				foreach(Linedef l in linedefs) 
+				{
+					if((showTags && l.Tag != 0) || (showActions && l.Action > 0)) 
+					{
+						if(filteredtags.Count > 0 && !filteredtags.Contains(l.Tag)) continue;
+						if(filteredactions.Count > 0 && !filteredactions.Contains(l.Action)) continue;
+
+						NodeInfo info = new NodeInfo(l);
+						if(filteredpolyobjects.Count > 0 && !filteredpolyobjects.Contains(info.PolyobjectNumber))
+							continue;
+
+						string name = info.GetName(ref comment, currentSortMode);
+						hasComment = comment.Length > 0;
+
+						if(!hasComment && cbCommentsOnly.Checked) continue;
+
+						if(!udmf || serachStr.Length == 0 || (hasComment && comment.ToLowerInvariant().IndexOf(serachStr) != -1)) 
+						{
+							TreeNode node = new TreeNode(name, 5, 5) { Tag = info, ToolTipText = nodetooltip };
+							if(hasComment) node.ForeColor = commentColor;
+							nodes.Add(node);
+
+							if(info.Index == selection.Index && info.Type == selection.Type)
+								selectedNode = node;
+						}
+					} 
+					else if(currentDisplayMode == DISPLAY_POLYOBJECTS) 
+					{
+						NodeInfo info = new NodeInfo(l);
+						if(info.PolyobjectNumber != int.MinValue && (filteredpolyobjects.Count == 0 || filteredpolyobjects.Contains(info.PolyobjectNumber))) 
+						{
+							string name = info.GetName(ref comment, SortMode.SORT_BY_POLYOBJ_NUMBER);
+							TreeNode node = new TreeNode(name, 1, 1) { Tag = info, ToolTipText = nodetooltip };
+							nodes.Add(node);
+						}
+					}
+				}
+
+				//sort nodes
+				Sort(ref nodes, currentSortMode);
+
+				//add category
+				if(nodes.Count > 0) 
+				{
+					switch(currentSortMode)
+					{
+						case SortMode.SORT_BY_ACTION:
+						{
+							Dictionary<int, TreeNode> categories = new Dictionary<int, TreeNode>();
+							TreeNode noAction = new TreeNode("No Action", 4, 4);
+
+							foreach(TreeNode node in nodes)
+							{
+								NodeInfo nodeInfo = node.Tag as NodeInfo;
+
+								if(nodeInfo.Action == 0)
+								{
+									noAction.Nodes.Add(node);
+									continue;
+								}
+
+								LinedefActionInfo lai = General.Map.Config.GetLinedefActionInfo(nodeInfo.Action);
+
+								if(!categories.ContainsKey(lai.Index)) categories.Add(lai.Index, new TreeNode(lai.Index + " - " + lai.Name, 4, 4, new[] { node }));
+								else categories[lai.Index].Nodes.Add(node);
+							}
+							TreeNode[] catNodes = new TreeNode[categories.Values.Count];
+							categories.Values.CopyTo(catNodes, 0);
+
+							TreeNode category = new TreeNode(CAT_LINEDEFS, 4, 4, catNodes);
+							if(noAction.Nodes.Count > 0) category.Nodes.Add(noAction);
+
+							treeView.Nodes.Add(category);
+						}
+						break;
+
+						case SortMode.SORT_BY_TAG:
+						{
+							Dictionary<int, TreeNode> categories = new Dictionary<int, TreeNode>();
+							TreeNode noTag = new TreeNode("No Tag", 4, 4);
+
+							foreach(TreeNode node in nodes) 
+							{
+								NodeInfo nodeInfo = node.Tag as NodeInfo;
+
+								if(nodeInfo.Tag == 0) 
+								{
+									noTag.Nodes.Add(node);
+									continue;
+								}
+
+								if(!categories.ContainsKey(nodeInfo.Tag)) 
+								{
+									string title = "Tag " + nodeInfo.Tag;
+									if(General.Map.Options.TagLabels.ContainsKey(nodeInfo.Tag))
+										title += ": " + General.Map.Options.TagLabels[nodeInfo.Tag];
+
+									categories.Add(nodeInfo.Tag, new TreeNode(title, 4, 4, new[] { node }));
+								} 
+								else 
+								{
+									categories[nodeInfo.Tag].Nodes.Add(node);
+								}
+							}
+							TreeNode[] catNodes = new TreeNode[categories.Values.Count];
+							categories.Values.CopyTo(catNodes, 0);
+
+							TreeNode category = new TreeNode(CAT_LINEDEFS, 4, 4, catNodes);
+							if(noTag.Nodes.Count > 0) category.Nodes.Add(noTag);
+
+							treeView.Nodes.Add(category);
+						}
+						break;
+
+						default:
+							treeView.Nodes.Add(new TreeNode(CAT_LINEDEFS, 4, 4, nodes.ToArray()));
+							break;
+					}
+				}
+			}
+
+			//expand top level nodes
+			foreach(TreeNode t in treeView.Nodes) t.Expand();
+
+			if(selectedNode != null)
+				treeView.SelectedNode = selectedNode;
+			else if(treeView.Nodes.Count > 0)
+				treeView.SelectedNode = treeView.Nodes[0];
+
+			this.ResumeLayout();
+
+			//update Export button
+			bExportToFile.Enabled = (treeView.Nodes != null && treeView.Nodes.Count > 0);
+
+			//loose focus
+			if(focusDisplay) General.Interface.FocusDisplay();
+		}
+
+//tag/action search
+		private static void GetSpecialValues(string serachstr, ref List<int> filteredtags, ref List<int> filteredactions, ref List<int> filteredpolyobjects) 
+		{
+			if(serachstr.Length == 0) return;
+
+			string[] tags = serachstr.Split(new[]{ '#' });
+			foreach(string tagstr in tags)
+			{
+				int tag = ReadNumber(tagstr);
+				if(tag != int.MinValue) filteredtags.Add(tag);
+			}
+
+			string[] actions = serachstr.Split(new[] { '$' });
+			foreach(string actionstr in actions) 
+			{
+				int action = ReadNumber(actionstr);
+				if(action != int.MinValue) filteredactions.Add(action);
+			}
+
+			string[] ponums = serachstr.Split(new[] { '^' });
+			foreach(string postr in ponums) 
+			{
+				int ponum = ReadNumber(postr);
+				if(ponum != int.MinValue) filteredpolyobjects.Add(ponum);
+			}
+		}
+
+		private static int ReadNumber(string str) 
+		{
+			string token = "";
+			int pos = 0;
+
+			while(pos < str.Length && Configuration.NUMBERS.IndexOf(str[pos]) != -1) 
+			{
+				token += str[pos];
+				pos++;
+			}
+
+			if(token.Length > 0) 
+			{
+				int result;
+				if(int.TryParse(token, NumberStyles.Integer, CultureInfo.InvariantCulture, out result))
+					return result;
+			}
+
+			return int.MinValue;
+		}
+
+		#endregion
+
+		#region ================== Sorting
+
+		private void Sort(ref List<TreeNode> nodes, string sortMode)
+		{
+			switch(sortMode)
+			{
+				case SortMode.SORT_BY_ACTION:
+					nodes.Sort(SortByAction);
+					break;
+
+				case SortMode.SORT_BY_TAG:
+					nodes.Sort(SortByTag);
+					break;
+
+				case SortMode.SORT_BY_INDEX:
+					if(currentDisplayMode == DISPLAY_POLYOBJECTS) 
+						nodes.Sort(SortByPolyobjectNumber);
+					else
+						nodes.Sort(SortByIndex);
+					break;
+
+				default:
+					throw new NotImplementedException("Tag Explorer: Sort mode '" + sortMode + "' is not implemented!");
+			}
+		}
+
+		private static int SortByAction(TreeNode t1, TreeNode t2) 
+		{
+			NodeInfo i1 = t1.Tag as NodeInfo;
+			NodeInfo i2 = t2.Tag as NodeInfo;
+
+			if(i1.Action == i2.Action) return SortByTag(t1, t2);
+			if(i1.Action == 0) return 1; //push items with no action to the end of the list
+			if(i2.Action == 0) return -1; //push items with no action to the end of the list
+			if(i1.Action > i2.Action) return 1;
+			return -1; //should be i1 < i2
+		}
+
+		private static int SortByTag(TreeNode t1, TreeNode t2) 
+		{
+			NodeInfo i1 = t1.Tag as NodeInfo;
+			NodeInfo i2 = t2.Tag as NodeInfo;
+
+			if(i1.Tag == i2.Tag) return SortByIndex(t1, t2);
+			if(i1.Tag == 0) return 1; //push items with no tag to the end of the list
+			if(i2.Tag == 0) return -1; //push items with no tag to the end of the list
+			if(i1.Tag > i2.Tag) return 1;
+			return -1; //should be i1 < i2
+		}
+
+		private static int SortByIndex(TreeNode t1, TreeNode t2) 
+		{
+			NodeInfo i1 = t1.Tag as NodeInfo;
+			NodeInfo i2 = t2.Tag as NodeInfo;
+
+			if(i1.Index > i2.Index) return 1;
+			if(i1.Index == i2.Index) return 0;
+			return -1;
+		}
+
+		private static int SortByPolyobjectNumber(TreeNode t1, TreeNode t2) 
+		{
+			NodeInfo i1 = t1.Tag as NodeInfo;
+			NodeInfo i2 = t2.Tag as NodeInfo;
+
+			if(i1.PolyobjectNumber > i2.PolyobjectNumber) return 1;
+			if(i1.PolyobjectNumber == i2.PolyobjectNumber)
+				return String.CompareOrdinal(i1.DefaultName, i2.DefaultName);
+			return -1;
+		}
+
+		#endregion
+
+		#region ================== Events
+
+		private void cbDisplayMode_SelectedIndexChanged(object sender, EventArgs e) 
+		{
+			currentDisplayMode = cbDisplayMode.SelectedItem.ToString();
+			UpdateTree(true);
+		}
+
+		private void cbSortMode_SelectedIndexChanged(object sender, EventArgs e) 
+		{
+			currentSortMode = cbSortMode.SelectedItem.ToString();
+			UpdateTree(true);
+		}
+
+		private void treeView_NodeMouseClick(object sender, TreeNodeMouseClickEventArgs e) 
+		{
+			NodeInfo info = e.Node.Tag as NodeInfo;
+			if(info == null) return;
+
+			//store selection
+			selection.Type = info.Type;
+			selection.Index = info.Index;
+
+			if(e.Button == MouseButtons.Right) //open element properties
+			{ 
+				bool updateDisplay = false;
+				
+				switch(info.Type) 
+				{
+					case NodeInfoType.THING:
+						Thing t = General.Map.Map.GetThingByIndex(info.Index);
+						updateDisplay = (t != null && General.Interface.ShowEditThings(new List<Thing>() { t }) == DialogResult.OK);
+						break;
+
+					case NodeInfoType.SECTOR:
+						Sector s = General.Map.Map.GetSectorByIndex(info.Index);
+						updateDisplay = (s != null && General.Interface.ShowEditSectors(new List<Sector>() { s }) == DialogResult.OK);
+						break;
+
+					case NodeInfoType.LINEDEF:
+						Linedef l = General.Map.Map.GetLinedefByIndex(info.Index);
+						updateDisplay = (l != null && General.Interface.ShowEditLinedefs(new List<Linedef>() { l }) == DialogResult.OK);
+						break;
+
+					default:
+						General.ErrorLogger.Add(ErrorType.Warning, "Tag Explorer: got unknown category: " + info.Type);
+						break;
+				}
+
+				if(updateDisplay) 
+				{
+					// Update entire display
+					General.Map.Map.Update();
+					General.Interface.RedrawDisplay();
+					UpdateTree(true);
+				}
+
+			} 
+			else 
+			{
+				//select element?
+				if(cbSelectOnClick.Checked) 
+				{
+					// Leave any volatile mode
+					General.Editing.CancelVolatileMode();
+					General.Map.Map.ClearAllSelected();
+
+					//make selection
+					switch(info.Type)
+					{
+						case NodeInfoType.THING:
+						{
+							if(General.Editing.Mode.GetType().Name != "ThingsMode") General.Editing.ChangeMode("ThingsMode");
+							Thing t = General.Map.Map.GetThingByIndex(info.Index);
+							if(t != null) t.Selected = true;
+						}
+						break;
+
+						case NodeInfoType.LINEDEF:
+						{
+							if(General.Editing.Mode.GetType().Name != "LinedefsMode") General.Editing.ChangeMode("LinedefsMode");
+							Linedef l = General.Map.Map.GetLinedefByIndex(info.Index);
+							if(l != null) l.Selected = true;
+						}
+						break;
+
+						default:
+						{
+							if(General.Editing.Mode.GetType().Name != "SectorsMode") General.Editing.ChangeMode("SectorsMode");
+							Sector s = General.Map.Map.GetSectorByIndex(info.Index);
+							if(s != null) 
+							{
+								((ClassicMode)General.Editing.Mode).SelectMapElement(s);
+								foreach(Sidedef sd in s.Sidedefs) sd.Line.Selected = true;
+							}
+						}
+						break;
+					}
+				}
+
+				//focus on element?
+				if(cbCenterOnSelected.Checked) 
+				{
+					List<Vector2D> points = new List<Vector2D>();
+					RectangleF area = MapSet.CreateEmptyArea();
+
+					switch(info.Type)
+					{
+						case NodeInfoType.LINEDEF:
+						{
+							Linedef l = General.Map.Map.GetLinedefByIndex(info.Index);
+							points.Add(l.Start.Position);
+							points.Add(l.End.Position);
+						}
+						break;
+
+						case NodeInfoType.SECTOR:
+						{
+							Sector s = General.Map.Map.GetSectorByIndex(info.Index);
+							foreach(Sidedef sd in s.Sidedefs) 
+							{
+								points.Add(sd.Line.Start.Position);
+								points.Add(sd.Line.End.Position);
+							}
+						}
+						break;
+
+						case NodeInfoType.THING:
+						{
+							Thing t = General.Map.Map.GetThingByIndex(info.Index);
+							Vector2D p = t.Position;
+							points.Add(p);
+							points.Add(p + new Vector2D(t.Size * 2.0f, t.Size * 2.0f));
+							points.Add(p + new Vector2D(t.Size * 2.0f, -t.Size * 2.0f));
+							points.Add(p + new Vector2D(-t.Size * 2.0f, t.Size * 2.0f));
+							points.Add(p + new Vector2D(-t.Size * 2.0f, -t.Size * 2.0f));
+						}
+						break;
+
+						default:
+							General.Fail("Tag Explorer: unknown object type given to zoom in on!");
+							break;
+					}
+
+					// Make a view area from the points
+					foreach(Vector2D p in points) area = MapSet.IncreaseArea(area, p);
+
+					// Make the area square, using the largest side
+					if(area.Width > area.Height) 
+					{
+						float delta = area.Width - area.Height;
+						area.Y -= delta * 0.5f;
+						area.Height += delta;
+					} 
+					else 
+					{
+						float delta = area.Height - area.Width;
+						area.X -= delta * 0.5f;
+						area.Width += delta;
+					}
+
+					// Add padding
+					area.Inflate(100f, 100f);
+
+					// Zoom to area
+					ClassicMode editmode = (General.Editing.Mode as ClassicMode);
+					editmode.CenterOnArea(area, 0.6f);
+				}
+
+				// Update info and view
+				General.Editing.Mode.UpdateSelectionInfo();
+				General.Interface.RedrawDisplay();
+			}
+		}
+
+		private void treeView_NodeMouseDoubleClick(object sender, TreeNodeMouseClickEventArgs e) 
+		{
+			//edit comment
+			if(udmf && currentDisplayMode != DISPLAY_POLYOBJECTS) 
+			{
+				NodeInfo info = e.Node.Tag as NodeInfo;
+				if(info == null) return;
+
+				treeView.LabelEdit = true;
+				e.Node.Text = info.Comment; //set node text to comment
+				e.Node.BeginEdit(); //begin editing
+			}
+		}
+
+		//we don't want to edit categories if we are in UDMF
+		private void treeView_BeforeLabelEdit(object sender, NodeLabelEditEventArgs e) 
+		{
+			if(!udmf || !treeView.LabelEdit || e.Node.Tag == null) e.CancelEdit = true;
+		}
+
+		//map should be in UDMF format, or we wouldn't be here
+		private void treeView_AfterLabelEdit(object sender, NodeLabelEditEventArgs e) 
+		{
+			NodeInfo info = e.Node.Tag as NodeInfo;
+			string comment = "";
+
+			//to set comment manually we actually have to cancel edit...
+			e.CancelEdit = true;
+			e.Node.EndEdit(true);
+			treeView.LabelEdit = false;
+
+			//apply comment
+			if(e.Label != null)	info.Comment = e.Label;
+			e.Node.Text = info.GetName(ref comment, currentSortMode);
+			e.Node.ForeColor = string.IsNullOrEmpty(info.Comment) ? Color.Black : commentColor;
+		}
+
+		//It is called every time a dialog window closes.
+		private void ParentForm_Activated(object sender, EventArgs e)
+		{
+			UpdateTreeSoon();
+		}
+
+		private void btnClearSearch_Click(object sender, EventArgs e) 
+		{
+			tbSearch.Clear();
+		}
+
+		private void tbSearch_TextChanged(object sender, EventArgs e) 
+		{
+			if(tbSearch.Text.Length > 1 || tbSearch.Text.Length == 0) UpdateTree(false);
+		}
+
+		private void cbCommentsOnly_CheckedChanged(object sender, EventArgs e) 
+		{
+			UpdateTree(true);
+		}
+
+		private void updatetimer_Tick(object sender, EventArgs e) 
+		{
+			updatetimer.Stop();
+			UpdateTree(true);
+		}
+
+		private void bExportToFile_Click(object sender, EventArgs e) 
+		{
+			if(treeView.Nodes == null || treeView.Nodes.Count == 0) return;
+
+			// Show save dialog
+			string path = Path.GetDirectoryName(General.Map.FilePathName);
+			saveFileDialog.InitialDirectory = path;
+			saveFileDialog.FileName = Path.GetFileNameWithoutExtension(General.Map.FileTitle) + "_info.txt";
+			if(saveFileDialog.ShowDialog(this) == DialogResult.Cancel) return;
+
+			// Generate stuff
+			StringBuilder sb = new StringBuilder();
+
+			//top level
+			foreach(TreeNode n in treeView.Nodes) 
+			{
+				if(n.Nodes.Count == 0) continue;
+
+				if(sb.Length > 0) sb.AppendLine(Environment.NewLine);
+				sb.AppendLine(n.Text.Replace(":", " (" + currentSortMode.ToLowerInvariant() + "):"));
+
+				//second level
+				foreach(TreeNode cn in n.Nodes) 
+				{
+					//third level
+					if(cn.Nodes.Count > 0) 
+					{
+						sb.AppendLine("  " + cn.Text + ":");
+						foreach(TreeNode ccn in cn.Nodes) sb.AppendLine("    " + ccn.Text);
+					} 
+					else 
+					{
+						sb.AppendLine("  " + cn.Text);
+					}
+				}
+			}
+			
+			// Save to file
+			try
+			{
+				using(StreamWriter sw = File.CreateText(saveFileDialog.FileName)) sw.Write(sb.ToString());
+				General.Interface.DisplayStatus(StatusType.Info, "Tag info successfully saved.");
+			}
+			catch (Exception ex)
+			{
+				General.ErrorLogger.Add(ErrorType.Error, "Failed to save tag info: " + ex.Message);
+				General.Interface.DisplayStatus(StatusType.Info, "Failed to save tag info...");
+			}
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/Source/Plugins/TagExplorer/Controls/TagExplorer.resx b/Source/Plugins/TagExplorer/Controls/TagExplorer.resx
new file mode 100644
index 0000000..1054a1b
--- /dev/null
+++ b/Source/Plugins/TagExplorer/Controls/TagExplorer.resx
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="imageList1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <data name="imageList1.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
+        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
+        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAo
+        FwAAAk1TRnQBSQFMAgEBBgEAAYABAAGAAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        AwABIAMAAQEBAAEgBgABIBYAAxIBGQMSARkDEgEZNAADEgEZAxIBGQMSARmwAAMwAUwBAAE5AecB/wEA
+        ASUBoQH/AzABTAMSARksAAMwAUwBswFnAR0B/wFxAUEBEwH/AzABTAMSARmsAAEWAVYC/wEOAVAC/wEA
+        ATIBzgH/AQABJQGhAf8DEgEZLAAB4AGHASUB/wHZAYYBJAH/AZ4BWwEaAf8BcQFBARMB/wMSARmsAAFq
+        AZsC/wHoAe8C/wEOAVAC/wEAATkB5wH/AxIBGSwAAf4BtAFiAv8B/QHlAf8B2QGGASQB/wGzAWcBHQH/
+        AxIBGawAAzABTAFqAZsC/wEWAVYC/wOJAf8DPgH/AyMBMygAAzABTAH+AbQBYgH/AeABhwElAf8BowGJ
+        AWcB/wM+Af8DIwEzsAADIwEzA7wB/wOBAf8DPgH/AyMBMwgAAyMBMwMjATMDIwEzGAADIwEzA7wB/wOB
+        Af8DPgH/AyMBMwgAAyMBMwMjATMDIwEznAADIwEzA80B/wOUAf8DPgH/AyMBMwMwAUwDPgH/A5QB/wMj
+        ATMcAAMjATMDzQH/A5QB/wM+Af8DIwEzAzABTAM+Af8DlAH/AyMBM6AAAyMBMwPNAf8DlAH/Az4B/wM+
+        Af8DlAH/AyMBMyQAAyMBMwPNAf8DlAH/Az4B/wM+Af8DlAH/AyMBM6gAAyMBMwO4Af8DlAH/A4EB/wMj
+        ATMsAAMjATMDuAH/A5QB/wOBAf8DIwEzsAADIwEzA88B/wOUAf8DPgH/AyMBMywAAyMBMwPPAf8DlAH/
+        Az4B/wMjATOwAAMjATMDwwH/A5QB/wM+Af8DIwEzLAADIwEzA8MB/wOUAf8DPgH/AyMBM7AAAyMBMwO8
+        Af8DlAH/Az4B/wMSARkDEgEZAxIBGSQAAyMBMwO8Af8DlAH/Az4B/wMSARkDEgEZAxIBGagAAyMBMwPZ
+        Af8DtwH/AQABOQHnAf8BAAElAaEB/wMwAUwDEgEZJAADIwEzA9kB/wHRAbcBnQH/AbMBZwEdAf8BcQFB
+        ARMB/wMwAUwDEgEZqAADIwEzARYBVgL/AQ4BUAL/AQABMgHOAf8BAAElAaEB/wMSARkoAAMjATMB4AGH
+        ASUB/wHZAYYBJAH/AZ4BWwEaAf8BcQFBARMB/wMSARmsAAFqAZsC/wHoAe8C/wEOAVAC/wEAATkB5wH/
+        AxIBGSwAAf4BtAFiAv8B/QHlAf8B2QGGASQB/wGzAWcBHQH/AxIBGawAAzABTAFqAZsC/wEWAVYC/wMw
+        AUwwAAMwAUwB/gG0AWIB/wHgAYcBJQH/AzABTJgAAwgBCwMfAS0DJwE7AycBOwMnATsDHgErAxIBGAMS
+        ARggAAMIAQsDHwEtAycBOwMnATsDJwE7Ax4BKwMSARgDEgEYEAADEgEZAxIBGQMSARkgAAMSARkDEgEZ
+        AxIBGQgAAxIBGQMSARkDEgEZIAADEgEZAxIBGQMSARkUAAM4AVwDXwHoARwBJAGBAf8BFgEdAWoB/wEV
+        ARwBZwH/ARQBGwFgAf8CWgFgAeQDOAFcAycBOwMSARgYAAM4AVwDXwHoAYEBTwEcAf8BagFHARYB/wFn
+        AUUBFQH/AWABQAEUAf8BYQJaAeQDOAFcAycBOwMSARgIAAMwAUwBHgEtAbIB/wEUASEBcAH/AzABTAMS
+        ARkDEgEZAxIBGQMSARkDEgEZAxIBGQMSARkDMAFMAR4BLQGyAf8BFAEhAXAB/wMwAUwDEgEZAzABTAGy
+        AWcBHgH/AXABQQEUAf8DMAFMAxIBGQMSARkDEgEZAxIBGQMSARkDEgEZAxIBGQMwAUwBsgFnAR4B/wFw
+        AUEBFAH/AzABTAMSARkMAANaAcUBLAE4AbsB/wEqATYBvAH/ASkBNQG6Af8BKAE0AbcB/wEmATABtAH/
+        ASQBLwGsAf8BHwEnAZQB/wEVAR0BagH/A1oBvQMnATsDEgEYEAADWgHFAbsBgwEsAf8BvAGCASoB/wG6
+        AYEBKQH/AbcBgQEoAf8BtAGBASYB/wGsAW0BJAH/AZQBXwEfAf8BagFGARUB/wNaAb0DJwE7AxIBGAQA
+        AScBPwHfAf8BJQE5AdgB/wEaASYBnQH/ARQBIQFwAf8DNwH/AzcB/wM3Af8DNwH/AzcB/wM3Af8DNwH/
+        AScBPwHfAf8BJQE5AdgB/wEaASYBnQH/ARQBIQFwAf8DEgEZAd8BhwEnAf8B2AGGASUB/wGdAVsBGgH/
+        AXABQQEUAf8DNwH/AzcB/wM3Af8DNwH/AzcB/wM3Af8DNwH/Ad8BhwEnAf8B2AGGASUB/wGdAVsBGgH/
+        AXABQQEUAf8DEgEZCAADWQG+ATEBPgHTAf8BNgFFAegB/wE6AUgB8wH/ATkBSAHwAf8BOAFIAe8B/wE4
+        AUgB7wH/ATcBRQHtAf8BNAFDAeIB/wEqATYBuwH/ARoBIQGBAf8DWgG9AycBOwMSARgIAANZAb4B0wGT
+        ATEB/wHoAaEBNgH/AfMBqgE6Af8B8AGnATkB/wHvAaUBOAH/Ae8BpQE4Af8B7QGlATcB/wHiAZwBNAH/
+        AbsBggEqAf8BgQFRARoB/wNaAb0DJwE7AxIBGAFjAYEB/QH/AewB5QL/ASUBOQHYAf8BHgEtAbIB/wO4
+        Af8DuAH/A7gB/wO4Af8DuAH/A6YB/wOYAf8BYwGBAf0B/wHsAeUC/wElATkB2AH/AR4BLQGyAf8DEgEZ
+        Af0BtAFjAv8B/QHlAf8B2AGGASUB/wGyAWcBHgH/A7gB/wO4Af8DuAH/A7gB/wO4Af8DpgH/A5gB/wH9
+        AbQBYwL/Af0B5QH/AdgBhgElAf8BsgFnAR4B/wMSARkEAAM4AVwBOgFIAeMB/wE5AUcB8QH/ASkBNAGz
+        Af8BJwEyAasB/wE3AUUB6gH/ATwBTAH6Af8BOwFKAfYB/wE5AUcB8QH/ATkBSAHwAf8BNgFEAeoB/wEp
+        ATQBvgH/ARkBHwGBAf8DOAFcAxIBGAQAAzgBXAHjAaABOgH/AfEBqAE5Af8BswGBASkB/wGrAW4BJwH/
+        AeoBowE3Af8B+gGuATwB/wH2AawBOwH/AfEBqAE5Af8B8AGnATkB/wHqAaMBNgH/Ab4BhAEpAf8BgQFQ
+        ARkB/wM4AVwDEgEYAzABTAFjAYEB/QH/AScBPwHfAf8DMAFMDAADuAH/A04BmQgAAzABTAFjAYEB/QH/
+        AScBPwHfAf8DMAFMBAADMAFMAf0BtAFjAf8B3wGHAScB/wMwAUwMAAO4Af8DTgGZCAADMAFMAf0BtAFj
+        Af8B3wGHAScB/wMwAUwIAANfAdsBSQFXAfYB/wFDAVIC/wEpATQBsQH/AwAB/wECAQQBHgH/ARcBHgFq
+        Af8BLgE5AcIB/wE5AUkB8QH/ATwBTAH6Af8BOgFKAfQB/wEzAUEB5AH/ASQBLwGsAf8CXAFkAecDHgEr
+        BAADXwHbAfYBsQFJAv8BtAFDAf8BsQFyASkB/wMAAf8BHgETAQIB/wFqAUcBFwH/AcIBiAEuAf8B8QGn
+        ATkB/wH6Aa4BPAH/AfQBqQE6Af8B5AGeATMB/wGsAW0BJAH/AWQBYgFcAecDHgErBAADmAH/Az4B/wMS
+        ARkMAAOlAf8DTgGZDAADmAH/AzcB/wMSARkIAAOYAf8DPgH/AxIBGQwAA6UB/wNOAZkMAAOYAf8DNwH/
+        AxIBGQgAAUYBVAL/AV4BbAL/AU0BWgH7Af8BPwFNAegB/wECAQMBFAH/AwAB/wMAAf8DAAH/AQYBCQEt
+        Af8BHAEkAYQB/wEwATwBzgH/ATgBRwHvAf8BLgE6AcwB/wEdASYBigH/AycBOwQAAf8BtgFGAv8BvgFe
+        Af8B+wG3AU0B/wHoAaUBPwH/ARQBDQECAf8DAAH/AwAB/wMAAf8BLQEdAQYB/wGEAVMBHAH/Ac4BkAEw
+        Af8B7wGmATgB/wHMAY4BLgH/AYoBVwEdAf8DJwE7BAADpgH/Az4B/wMSARkgAAOmAf8DNwH/AxIBGQgA
+        A6YB/wM+Af8DEgEZIAADpgH/AzcB/wMSARkEAAMjATMBWQFmAv8BbwGEAv8BVwFjAfkB/wFJAVgB/AH/
+        ARoBIgFvAf8DAAH/AwAB/wMAAf8BAAEBAQcB/wETARoBWQH/ASMBLAGdAf8BNgFDAeQB/wEzAUIB4QH/
+        ASABKQGcAf8DJwE7AyMBMwH/Ab0BWQL/AcYBbwH/AfkBugFXAf8B/AG0AUkB/wFvAUsBGgH/AwAB/wMA
+        Af8DAAH/AQcBBAEAAf8BWQE7ARMB/wGdAWUBIwH/AeQBoAE2Af8B4QGbATMB/wGcAWMBIAH/AycBOwQA
+        A7AB/wM+Af8DTgGZA04BmRQAA04BmQNOAZkDsAH/AzcB/wMSARkIAAOwAf8DPgH/A04BmQNOAZkUAANO
+        AZkDTgGZA7AB/wM3Af8DEgEZBAADIwEzAWMBcAL/AYEBjAL/AVgBZgH4Af8BRwFXAfsB/wEvATsBywH/
+        AwAB/wMAAf8DAAH/AQwBEAE/Af8BPAFLAfkB/wE8AUwB+gH/ATkBSAHwAf8BMwFBAeMB/wEhASsBogH/
+        AycBOwMjATMB/wHBAWMC/wHKAYEB/wH4AbgBWAH/AfsBsgFHAf8BywGOAS8B/wMAAf8DAAH/AwAB/wE/
+        ASoBDAH/AfkBrgE8Af8B+gGuATwB/wHwAacBOQH/AeMBnQEzAf8BogFnASEB/wMnATsEAAO4Af8DuAH/
+        A7gB/wOlAf8UAAOlAf8DuAH/A7gB/wM3Af8DEgEZCAADuAH/A7gB/wO4Af8DpQH/FAADpQH/A7gB/wO4
+        Af8DNwH/AxIBGQgAAWEBcAL/AY4BlwL/AWABawH+Af8BSQFYAfUB/wE/AU0B+AH/AQsBEAE/Af8DAAH/
+        ARgBIAFuAf8DAAH/AQ8BFQFOAf8BOQFIAfAB/wE6AUgB8wH/ATEBPwHaAf8BIwEsAZ8B/wMiATEEAAH/
+        Ab8BYQL/AdABjgH/Af4BwQFgAf8B9QGwAUkB/wH4Aa8BPwH/AT8BKQELAf8DAAH/AW4BSQEYAf8DAAH/
+        AU4BMwEPAf8B8AGnATkB/wHzAaoBOgH/AdoBlwExAf8BnwFnASMB/wMiATEEAAO4Af8DPgH/AxIBGSAA
+        A7gB/wM3Af8DEgEZCAADuAH/Az4B/wMSARkgAAO4Af8DNwH/AxIBGQgAA18B2wGWAaAC/wGGAZAC/wFh
+        AW4B+QH/AUwBWgH+Af8BJAEuAZ0B/wEKAQ8BOwH/AT4BTgL/ASIBKwGYAf8DAAH/AQ8BFQFOAf8BOAFH
+        Ae0B/wExAT4B1QH/A1wB6gMMARAEAANfAdsB/wHSAZYC/wHMAYYB/wH5AbwBYQH/Af4BuAFMAf8BnQFl
+        ASQB/wE7ASYBCgL/AbIBPgH/AZgBYgEiAf8DAAH/AU4BMwEPAf8B7QGlATgB/wHVAZQBMQH/A1wB6gMM
+        ARAEAAO4Af8DPgH/AxIBGSAAA7gB/wM3Af8DEgEZCAADuAH/Az4B/wMSARkgAAO4Af8DNwH/AxIBGQgA
+        AzgBXAGYAaIC/wGeAacC/wFqAYEC/wFWAWMB+QH/AUEBTAHkAf8BMgE9Ab4B/wFCAVIB+AH/AUQBUgH9
+        Af8BKwEzAZwB/wMAAf8BKAEyAbEB/wE0AUEB3gH/AzgBXAgAAzgBXAH/AdMBmAL/AdYBngL/AcUBagH/
+        AfkBuQFWAf8B5AGlAUEB/wG+AYcBMgH/AfgBrgFCAf8B/QG0AUQB/wGcAWgBKwH/AwAB/wGxAYABKAH/
+        Ad4BmwE0Af8DOAFcCAADuAH/Az4B/wMSARkMAAOlAf8DTgGZDAADuAH/AzcB/wMSARkIAAO4Af8DPgH/
+        AxIBGQwAA6UB/wNOAZkMAAO4Af8DNwH/AxIBGQwAA1UBsgGoAbEC/wGJAZMC/wFwAYMC/wFnAYAB/AH/
+        AVwBaAH2Af8BVgFiAfYB/wFVAWEB9QH/AVEBXgH7Af8BNAE+AcIB/wE1AUMB4AH/A1sBxhAAA1UBsgH/
+        AdkBqAL/Ac4BiQL/AcgBcAH/AfwBwQFnAf8B9gG5AVwB/wH2AbcBVgH/AfUBtgFVAf8B+wG4AVEB/wHC
+        AYsBNAH/AeABnAE1Af8DWwHGCAADMAFMAR4BLQGyAf8BFAEhAXAB/wMwAUwDEgEZAxIBGQMSARkDuAH/
+        A04BmQMSARkDEgEZAzABTAEeAS0BsgH/ARQBIQFwAf8DMAFMAxIBGQMwAUwBsgFnAR4B/wFwAUEBFAH/
+        AzABTAMSARkDEgEZAxIBGQO4Af8DTgGZAxIBGQMSARkDMAFMAbIBZwEeAf8BcAFBARQB/wMwAUwDEgEZ
+        DAADVgGxAZ8BqQL/AZcBogL/AYsBlQL/AWsBggL/AVkBaAH9Af8BTwFcAfkB/wFDAVIB9wH/ATwBTAH6
+        Af8DWgG9GAADVgGxAf8B1QGfAv8B0QGXAv8BzwGLAv8BwwFrAf8B/QG6AVkB/wH5AbYBTwH/AfcBrwFD
+        Af8B+gGtATwB/wNaAb0MAAEnAT8B3wH/ASUBOQHYAf8BGgEmAZ0B/wEUASEBcAH/Az4B/wM+Af8DPgH/
+        A7gB/wM+Af8DPgH/Az4B/wEnAT8B3wH/ASUBOQHYAf8BGgEmAZ0B/wEUASEBcAH/AxIBGQHfAYcBJwH/
+        AdgBhgElAf8BnQFbARoB/wFwAUEBFAH/Az4B/wM+Af8DPgH/A7gB/wM+Af8DPgH/Az4B/wHfAYcBJwH/
+        AdgBhgElAf8BnQFbARoB/wFwAUEBFAH/AxIBGRAAAzgBXANeAdgBcgGHAv8BgwGNAv8BawGDAv8BVgFk
+        Av8DXgHYAzgBXCAAAzgBXANeAdgB/wHHAXIC/wHMAYMC/wHCAWsC/wG8AVYB/wNeAdgDOAFcEAABYwGB
+        Af0B/wHsAeUC/wElATkB2AH/AR4BLQGyAf8DuAH/A7gB/wO4Af8DuAH/A7gB/wOmAf8DmAH/AWMBgQH9
+        Af8B7AHlAv8BJQE5AdgB/wEeAS0BsgH/AxIBGQH9AbQBYwL/Af0B5QH/AdgBhgElAf8BsgFnAR4B/wO4
+        Af8DuAH/A7gB/wO4Af8DuAH/A6YB/wOYAf8B/QG0AWMC/wH9AeUB/wHYAYYBJQH/AbIBZwEeAf8DEgEZ
+        HAADIwEzAyMBMzgAAyMBMwMjATMcAAMwAUwBYwGBAf0B/wEnAT8B3wH/AzABTBwAAzABTAFjAYEB/QH/
+        AScBPwHfAf8DMAFMBAADMAFMAf0BtAFjAf8B3wGHAScB/wMwAUwcAAMwAUwB/QG0AWMB/wHfAYcBJwH/
+        AzABTAQAAUIBTQE+BwABPgMAASgDAAFAAwABIAMAAQEBAAEBBgABARYAA/8BAAGPAf8BjwH/BAABBwH/
+        AQcB/wQAAQcB/wEHAf8EAAEHAf8BBwH/BAABAwH/AQMB/wQAAcEBjwHBAY8EAAHgAQ8B4AEPBAAB8AEf
+        AfABHwQAAfgBPwH4AT8EAAH8AR8B/AEfBAAB/gEPAf4BDwQAAf8BAQH/AQEEAAH/AYAB/wGABAAB/wHA
+        Af8BwAQAAf8B4AH/AeAEAAH/AeEB/wHhBAAB+AEHAfgBBwGPAfEBjwHxAfABAwHwAQMEAAHgAQEB4AEB
+        BAABwAEAAcAFAAGAAQABgAEAAQ4BYQEOAWEBgAEAAYABAAGOAXEBjgFxAYABAAGAAQABjwHxAY8B8QQA
+        AYcBwQGHAcEEAAGHAcEBhwHBAYABAAGAAQABjwHxAY8B8QGAAQABgAEAAY8B8QGPAfEBgAEBAYABAQGO
+        AXEBjgFxAcABAwHAAQMEAAHgAQcB4AEHBAAB8AEPAfABDwQAAf4BfwH+AX8BDwHhAQ8B4Qs=
+</value>
+  </data>
+  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>122, 17</value>
+  </metadata>
+  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>122, 17</value>
+  </metadata>
+  <metadata name="updatetimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>219, 17</value>
+  </metadata>
+  <metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>338, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/TagExplorer/NodeInfo.cs b/Source/Plugins/TagExplorer/NodeInfo.cs
new file mode 100644
index 0000000..79356b2
--- /dev/null
+++ b/Source/Plugins/TagExplorer/NodeInfo.cs
@@ -0,0 +1,196 @@
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Types;
+
+namespace CodeImp.DoomBuilder.TagExplorer
+{
+	internal sealed class NodeInfo
+	{
+		private readonly NodeInfoType type;
+
+		private readonly int index;
+		private readonly int action;
+		private readonly int tag;
+		private readonly int polyobjnumber;
+		private readonly string defaultName;
+
+		public int Index { get { return index; } }
+		public int Tag { get { return tag; } }
+		public int PolyobjectNumber { get { return polyobjnumber; } }
+		public int Action { get { return action; } }
+		public string DefaultName { get { return defaultName; } }
+		public NodeInfoType Type { get { return type; } }
+		public string Comment { get { return GetComment(); } set { SetComment(value); } }
+
+		//constructor
+		public NodeInfo(Thing t) 
+		{
+			type = NodeInfoType.THING;
+			index = t.Index;
+			action = t.Action;
+			tag = t.Tag;
+			polyobjnumber = ((t.Type > 9299 && t.Type < 9304) ? t.AngleDoom : int.MinValue);
+			ThingTypeInfo tti = General.Map.Data.GetThingInfoEx(t.Type);
+			defaultName = (tti != null ? tti.Title : "Thing");
+		}
+
+		public NodeInfo(Sector s) 
+		{
+			type = NodeInfoType.SECTOR;
+			index = s.Index;
+			action = s.Effect;
+			tag = s.Tag;
+			
+			if(General.Map.Config.SectorEffects.ContainsKey(action))
+			{
+				defaultName = General.Map.Config.SectorEffects[action].Title;
+			}
+			else
+			{
+				defaultName = "Sector";
+			}
+		}
+
+		public NodeInfo(Linedef l) 
+		{
+			type = NodeInfoType.LINEDEF;
+			index = l.Index;
+			action = l.Action;
+			tag = l.Tag;
+			polyobjnumber = ((l.Action > 0 && l.Action < 9) ? l.Args[0] : int.MinValue);
+			
+			if(General.Map.Config.LinedefActions.ContainsKey(l.Action))
+			{
+				defaultName = General.Map.Config.LinedefActions[l.Action].Title;
+			}
+			else
+			{
+				defaultName = "Linedef";
+			}
+		}
+
+		//methods
+		private UniFields GetFields() 
+		{
+			if(type == NodeInfoType.THING) 
+			{
+				Thing t = General.Map.Map.GetThingByIndex(index);
+				return (t == null ? null : t.Fields);
+			}
+
+			if(type == NodeInfoType.SECTOR) 
+			{
+				Sector s = General.Map.Map.GetSectorByIndex(index);
+				return (s == null ? null : s.Fields);
+			}
+
+			Linedef l = General.Map.Map.GetLinedefByIndex(index);
+			return (l == null ? null : l.Fields);
+		}
+
+//comment
+		private void SetComment(string comment) 
+		{
+			UniFields fields = GetFields();
+
+			if(comment.Length == 0) 
+			{
+				if(fields.ContainsKey("comment")) 
+				{
+					General.Map.UndoRedo.CreateUndo("Remove comment");
+					fields.BeforeFieldsChange();
+					fields.Remove("comment");
+				}
+				return;
+			}
+
+			//create undo stuff
+			General.Map.UndoRedo.CreateUndo("Set comment");
+			fields.BeforeFieldsChange();
+
+			if(!fields.ContainsKey("comment"))
+				fields.Add("comment", new UniValue((int)UniversalType.String, comment));
+			else
+				fields["comment"].Value = comment;
+		}
+
+		private string GetComment() 
+		{
+			UniFields fields = GetFields();
+			if(fields == null) return "";
+			if(!fields.ContainsKey("comment")) return "";
+			return fields["comment"].Value.ToString();
+		}
+
+//naming
+		public string GetName(ref string comment, string sortMode) 
+		{
+			if(type == NodeInfoType.THING) 
+			{
+				Thing t = General.Map.Map.GetThingByIndex(index);
+				if(t == null) return "<invalid thing>";
+				return GetThingName(t, ref comment, sortMode);
+			}
+
+			if(type == NodeInfoType.SECTOR) 
+			{
+				Sector s = General.Map.Map.GetSectorByIndex(index);
+				if(s == null) return "<invalid sector>";
+				return GetSectorName(s, ref comment, sortMode);
+			}
+
+			Linedef l = General.Map.Map.GetLinedefByIndex(index);
+			if(l == null) return "<invalid linedef>";
+			return GetLinedefName(l, ref comment, sortMode);
+		}
+
+		private string GetThingName(Thing t, ref string comment, string sortmode) 
+		{
+			comment = ((TagExplorer.UDMF && t.Fields.ContainsKey("comment")) ? t.Fields["comment"].Value.ToString() : string.Empty);
+			return CombineName(comment, sortmode);
+		}
+
+		private string GetSectorName(Sector s, ref string comment, string sortmode) 
+		{
+			comment = ((TagExplorer.UDMF && s.Fields.ContainsKey("comment")) ? s.Fields["comment"].Value.ToString() : string.Empty);
+			return CombineName(comment, sortmode);
+		}
+
+		private string GetLinedefName(Linedef l, ref string comment, string sortmode) 
+		{
+			if(polyobjnumber != int.MinValue) return CombineName(string.Empty, sortmode);
+			comment = ((TagExplorer.UDMF && l.Fields.ContainsKey("comment")) ? l.Fields["comment"].Value.ToString() : string.Empty);
+			return CombineName(comment, sortmode);
+		}
+
+		private string CombineName(string comment, string sortmode)
+		{
+			string name = (!string.IsNullOrEmpty(comment) ? comment : defaultName);
+
+			switch(sortmode) 
+			{
+				case SortMode.SORT_BY_ACTION: //action name is already shown as category name, so we'll show tag here
+					return (tag > 0 ? "Tag " + tag + ": " : "") + name + ", Index " + index;
+
+				case SortMode.SORT_BY_INDEX:
+					return index + ": " + name + (tag > 0 ? ", Tag " + tag : "") + (action > 0 ? ", Action " + action : "");
+
+				case SortMode.SORT_BY_TAG: //tag is already shown as category name, so we'll show action here
+					return (action > 0 ? "Action " + action + ": " : "") + name + ", Index " + index;
+
+				case SortMode.SORT_BY_POLYOBJ_NUMBER:
+					return "PO " + polyobjnumber + ": " + defaultName + ", Index " + index;
+
+				default:
+					return name;
+			}
+		}
+	}
+
+	internal enum NodeInfoType
+	{
+		THING,
+		SECTOR,
+		LINEDEF
+	}
+}
diff --git a/Source/Plugins/TagExplorer/Properties/AssemblyInfo.cs b/Source/Plugins/TagExplorer/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..7286052
--- /dev/null
+++ b/Source/Plugins/TagExplorer/Properties/AssemblyInfo.cs
@@ -0,0 +1,37 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Resources;
+
+// Управление общими �ведени�ми о �борке о�уще�твл�ет�� � помощью 
+// набора атрибутов. Измените значени� �тих атрибутов, чтобы изменить �ведени�,
+// �в�занные �о �боркой.
+[assembly: AssemblyTitle("TagExplorer")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("TagExplorer")]
+[assembly: AssemblyCopyright("Copyright ©  2012")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Параметр ComVisible �о значением FALSE делает типы в �борке невидимыми 
+// дл� COM-компонентов.  Е�ли требует�� обратить�� к типу в �той �борке через 
+// COM, задайте атрибуту ComVisible значение TRUE дл� �того типа.
+[assembly: ComVisible(false)]
+
+// Следующий GUID �лужит дл� идентификации библиотеки типов, е�ли �тот проект будет видимым дл� COM
+[assembly: Guid("053f5efd-fcd9-4fa4-9107-2383a7eef971")]
+
+// Сведени� о вер�ии �борки �о�то�т из �ледующих четырех значений:
+//
+//      О�новной номер вер�ии
+//      Дополнительный номер вер�ии 
+//      �омер по�троени�
+//      Редакци�
+//
+// Можно задать в�е значени� или прин�ть номер по�троени� и номер редакции по умолчанию, 
+// и�пользу� "*", как показано ниже:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: NeutralResourcesLanguageAttribute("en")]
diff --git a/Source/Plugins/TagExplorer/Properties/Resources.Designer.cs b/Source/Plugins/TagExplorer/Properties/Resources.Designer.cs
new file mode 100644
index 0000000..c8d3b6c
--- /dev/null
+++ b/Source/Plugins/TagExplorer/Properties/Resources.Designer.cs
@@ -0,0 +1,83 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:4.0.30319.42000
+//
+//     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace CodeImp.DoomBuilder.TagExplorer.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
+    /// </summary>
+    // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
+    // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
+    // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
+    // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("CodeImp.DoomBuilder.TagExplorer.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
+        ///   Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Save {
+            get {
+                object obj = ResourceManager.GetObject("Save", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap SearchClear {
+            get {
+                object obj = ResourceManager.GetObject("SearchClear", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+    }
+}
diff --git a/Source/Plugins/TagExplorer/Properties/Resources.resx b/Source/Plugins/TagExplorer/Properties/Resources.resx
new file mode 100644
index 0000000..5e55781
--- /dev/null
+++ b/Source/Plugins/TagExplorer/Properties/Resources.resx
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="SearchClear" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\SearchClear.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Save" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Save.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/TagExplorer/Resources/Lines.png b/Source/Plugins/TagExplorer/Resources/Lines.png
new file mode 100644
index 0000000..aa96cfd
Binary files /dev/null and b/Source/Plugins/TagExplorer/Resources/Lines.png differ
diff --git a/Source/Plugins/TagExplorer/Resources/LinesGroup.png b/Source/Plugins/TagExplorer/Resources/LinesGroup.png
new file mode 100644
index 0000000..7da53b4
Binary files /dev/null and b/Source/Plugins/TagExplorer/Resources/LinesGroup.png differ
diff --git a/Source/Plugins/TagExplorer/Resources/Save.png b/Source/Plugins/TagExplorer/Resources/Save.png
new file mode 100644
index 0000000..e4adbbc
Binary files /dev/null and b/Source/Plugins/TagExplorer/Resources/Save.png differ
diff --git a/Source/Plugins/TagExplorer/Resources/SearchClear.png b/Source/Plugins/TagExplorer/Resources/SearchClear.png
new file mode 100644
index 0000000..9f5eda7
Binary files /dev/null and b/Source/Plugins/TagExplorer/Resources/SearchClear.png differ
diff --git a/Source/Plugins/TagExplorer/Resources/Sectors.png b/Source/Plugins/TagExplorer/Resources/Sectors.png
new file mode 100644
index 0000000..a804452
Binary files /dev/null and b/Source/Plugins/TagExplorer/Resources/Sectors.png differ
diff --git a/Source/Plugins/TagExplorer/Resources/SectorsGroup.png b/Source/Plugins/TagExplorer/Resources/SectorsGroup.png
new file mode 100644
index 0000000..db4fca5
Binary files /dev/null and b/Source/Plugins/TagExplorer/Resources/SectorsGroup.png differ
diff --git a/Source/Plugins/TagExplorer/Resources/Things.png b/Source/Plugins/TagExplorer/Resources/Things.png
new file mode 100644
index 0000000..2bfc8a8
Binary files /dev/null and b/Source/Plugins/TagExplorer/Resources/Things.png differ
diff --git a/Source/Plugins/TagExplorer/Resources/ThingsGroup.png b/Source/Plugins/TagExplorer/Resources/ThingsGroup.png
new file mode 100644
index 0000000..45a1bfe
Binary files /dev/null and b/Source/Plugins/TagExplorer/Resources/ThingsGroup.png differ
diff --git a/Source/Plugins/TagExplorer/TagExplorer.csproj b/Source/Plugins/TagExplorer/TagExplorer.csproj
new file mode 100644
index 0000000..99123d2
--- /dev/null
+++ b/Source/Plugins/TagExplorer/TagExplorer.csproj
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{BE7917F3-E6FE-4D5B-8FA9-B8E7668AC731}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>CodeImp.DoomBuilder.TagExplorer</RootNamespace>
+    <AssemblyName>TagExplorer</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>3.5</OldToolsVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\Build\Plugins\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <PlatformTarget>x86</PlatformTarget>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\Build\Plugins\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <PlatformTarget>x86</PlatformTarget>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug + Profiler|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\..\..\Build\Plugins\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;PROFILE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release + Profiler|x86' ">
+    <OutputPath>..\..\..\Build\Plugins\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="BuilderPlug.cs" />
+    <Compile Include="Controls\TagExplorer.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Controls\TagExplorer.Designer.cs">
+      <DependentUpon>TagExplorer.cs</DependentUpon>
+    </Compile>
+    <Compile Include="NodeInfo.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Core\Builder.csproj">
+      <Project>{818B3D10-F791-4C3F-9AF5-BB2D0079B63C}</Project>
+      <Name>Builder</Name>
+      <Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Controls\TagExplorer.resx">
+      <DependentUpon>TagExplorer.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Resources\Lines.png" />
+    <Content Include="Resources\LinesGroup.png" />
+    <None Include="Resources\SearchClear.png" />
+    <None Include="Resources\Save.png" />
+    <Content Include="Resources\Sectors.png" />
+    <Content Include="Resources\SectorsGroup.png" />
+    <Content Include="Resources\Things.png" />
+    <Content Include="Resources\ThingsGroup.png" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/Source/Plugins/TagRange/BuilderPlug.cs b/Source/Plugins/TagRange/BuilderPlug.cs
new file mode 100644
index 0000000..27e2c0b
--- /dev/null
+++ b/Source/Plugins/TagRange/BuilderPlug.cs
@@ -0,0 +1,88 @@
+
+#region ================== Copyright (c) 2010 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2010 Pascal vd Heiden
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Windows;
+using CodeImp.DoomBuilder.Editing;
+using CodeImp.DoomBuilder.Plugins;
+using CodeImp.DoomBuilder.Actions;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.TagRange
+{
+	public class BuilderPlug : Plug
+	{
+		// Static instance. We can't use a real static class, because BuilderPlug must
+		// be instantiated by the core, so we keep a static reference. (this technique
+		// should be familiar to object-oriented programmers)
+		private static BuilderPlug me;
+		
+		// Tools form
+		private ToolsForm toolsform;
+		
+		// Static property to access the BuilderPlug
+		public static BuilderPlug Me { get { return me; } }
+		
+		// This event is called when the plugin is initialized
+		public override void OnInitialize()
+		{
+			base.OnInitialize();
+			
+			// Keep a static reference
+            me = this;
+			
+			// Load form
+            toolsform = new ToolsForm();
+			
+			General.Actions.BindMethods(this);
+		}
+		
+		// This is called when the plugin is terminated
+		public override void Dispose()
+		{
+			base.Dispose();
+			
+			General.Actions.UnbindMethods(this);
+			
+			// Dispose form
+			if(toolsform != null)
+				toolsform.Dispose();
+			toolsform = null;
+		}
+		
+		// This updates the button on the toolbar
+		public override void OnEditEngage(EditMode oldmode, EditMode newmode)
+		{
+			base.OnEditEngage(oldmode, newmode);
+			toolsform.UpdateButton();
+		}
+
+		[BeginAction("rangetagselection")]
+		private void RangeTagSelection()
+		{
+			TagRangeForm f = new TagRangeForm();
+			f.Setup();
+			if(f.SelectionCount > 0)
+				f.ShowDialog(General.Interface);
+			else
+				General.Interface.DisplayStatus(StatusType.Warning, "This action requires a selection!"); //mxd
+			f.Dispose();
+		}
+	}
+}
diff --git a/Source/Plugins/TagRange/Properties/AssemblyInfo.cs b/Source/Plugins/TagRange/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..c70989e
--- /dev/null
+++ b/Source/Plugins/TagRange/Properties/AssemblyInfo.cs
@@ -0,0 +1,34 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("TagRange")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Doom Builder")]
+[assembly: AssemblyCopyright("Copyright ©  2010")]
+[assembly: AssemblyTrademark("CodeImp")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("8b9957c1-629e-45b7-8228-115225999d62")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Source/Plugins/TagRange/Properties/Resources.Designer.cs b/Source/Plugins/TagRange/Properties/Resources.Designer.cs
new file mode 100644
index 0000000..66e21a0
--- /dev/null
+++ b/Source/Plugins/TagRange/Properties/Resources.Designer.cs
@@ -0,0 +1,73 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:4.0.30319.42000
+//
+//     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace CodeImp.DoomBuilder.TagRange.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
+    /// </summary>
+    // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
+    // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
+    // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
+    // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("CodeImp.DoomBuilder.TagRange.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
+        ///   Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap tag_blue {
+            get {
+                object obj = ResourceManager.GetObject("tag_blue", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+    }
+}
diff --git a/Source/Plugins/TagRange/Properties/Resources.resx b/Source/Plugins/TagRange/Properties/Resources.resx
new file mode 100644
index 0000000..03c4f93
--- /dev/null
+++ b/Source/Plugins/TagRange/Properties/Resources.resx
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="tag_blue" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\tag_blue.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/TagRange/Resources/Actions.cfg b/Source/Plugins/TagRange/Resources/Actions.cfg
new file mode 100644
index 0000000..36edfd0
--- /dev/null
+++ b/Source/Plugins/TagRange/Resources/Actions.cfg
@@ -0,0 +1,10 @@
+
+rangetagselection
+{
+	title = "Tag Range";
+	category = "classic";
+	description = "Allows giving a range of tags to a selection of sectors, linedefs or things.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
diff --git a/Source/Plugins/TagRange/Resources/tag_blue.png b/Source/Plugins/TagRange/Resources/tag_blue.png
new file mode 100644
index 0000000..9757fc6
Binary files /dev/null and b/Source/Plugins/TagRange/Resources/tag_blue.png differ
diff --git a/Source/Plugins/TagRange/TagRange.csproj b/Source/Plugins/TagRange/TagRange.csproj
new file mode 100644
index 0000000..e12e12a
--- /dev/null
+++ b/Source/Plugins/TagRange/TagRange.csproj
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{F49EFF6D-51CB-4E49-8223-AAE653C5B62F}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>CodeImp.DoomBuilder.TagRange</RootNamespace>
+    <AssemblyName>TagRange</AssemblyName>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\..\..\Build\Plugins\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <OutputPath>..\..\..\Build\Plugins\</OutputPath>
+    <DefineConstants>
+    </DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug + Profiler|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\..\..\Build\Plugins\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;PROFILE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release + Profiler|x86' ">
+    <OutputPath>..\..\..\Build\Plugins\</OutputPath>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="BuilderPlug.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="TagRangeForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="TagRangeForm.Designer.cs">
+      <DependentUpon>TagRangeForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="ToolsForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="ToolsForm.Designer.cs">
+      <DependentUpon>ToolsForm.cs</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <SubType>Designer</SubType>
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\tag_blue.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\Actions.cfg" />
+    <EmbeddedResource Include="TagRangeForm.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>TagRangeForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ToolsForm.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>ToolsForm.cs</DependentUpon>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Core\Builder.csproj">
+      <Project>{818B3D10-F791-4C3F-9AF5-BB2D0079B63C}</Project>
+      <Name>Builder</Name>
+      <Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/Source/Plugins/TagRange/TagRange.csproj.user b/Source/Plugins/TagRange/TagRange.csproj.user
new file mode 100644
index 0000000..5b30a8e
--- /dev/null
+++ b/Source/Plugins/TagRange/TagRange.csproj.user
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <PublishUrlHistory />
+    <InstallUrlHistory />
+    <SupportUrlHistory />
+    <UpdateUrlHistory />
+    <BootstrapperUrlHistory />
+    <ErrorReportUrlHistory />
+    <FallbackCulture>de-DE</FallbackCulture>
+    <VerifyUploadedFiles>false</VerifyUploadedFiles>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/Plugins/TagRange/TagRangeForm.Designer.cs b/Source/Plugins/TagRange/TagRangeForm.Designer.cs
new file mode 100644
index 0000000..368a803
--- /dev/null
+++ b/Source/Plugins/TagRange/TagRangeForm.Designer.cs
@@ -0,0 +1,248 @@
+namespace CodeImp.DoomBuilder.TagRange
+{
+	partial class TagRangeForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.rangestart = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.label1 = new System.Windows.Forms.Label();
+			this.doubletagwarning = new System.Windows.Forms.Label();
+			this.skipdoubletags = new System.Windows.Forms.CheckBox();
+			this.okbutton = new System.Windows.Forms.Button();
+			this.cancelbutton = new System.Windows.Forms.Button();
+			this.outoftagswarning = new System.Windows.Forms.Label();
+			this.endtaglabel = new System.Windows.Forms.Label();
+			this.label4 = new System.Windows.Forms.Label();
+			this.label2 = new System.Windows.Forms.Label();
+			this.rangestep = new CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox();
+			this.relativemode = new System.Windows.Forms.CheckBox();
+			this.bglabel = new System.Windows.Forms.Label();
+			this.SuspendLayout();
+			// 
+			// rangestart
+			// 
+			this.rangestart.AllowDecimal = false;
+			this.rangestart.AllowNegative = false;
+			this.rangestart.AllowRelative = false;
+			this.rangestart.ButtonStep = 1;
+			this.rangestart.ButtonStepFloat = 1F;
+			this.rangestart.ButtonStepsWrapAround = false;
+			this.rangestart.Location = new System.Drawing.Point(76, 12);
+			this.rangestart.Name = "rangestart";
+			this.rangestart.Size = new System.Drawing.Size(96, 24);
+			this.rangestart.StepValues = null;
+			this.rangestart.TabIndex = 0;
+			this.rangestart.WhenTextChanged += new System.EventHandler(this.rangestart_WhenTextChanged);
+			// 
+			// label1
+			// 
+			this.label1.Location = new System.Drawing.Point(10, 17);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(62, 14);
+			this.label1.TabIndex = 1;
+			this.label1.Text = "Start Tag:";
+			this.label1.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// doubletagwarning
+			// 
+			this.doubletagwarning.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.doubletagwarning.BackColor = System.Drawing.SystemColors.Info;
+			this.doubletagwarning.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+			this.doubletagwarning.Location = new System.Drawing.Point(12, 94);
+			this.doubletagwarning.Name = "doubletagwarning";
+			this.doubletagwarning.Padding = new System.Windows.Forms.Padding(3);
+			this.doubletagwarning.Size = new System.Drawing.Size(273, 50);
+			this.doubletagwarning.TabIndex = 4;
+			this.doubletagwarning.Text = "Warning: The tag range contains already used tags.";
+			this.doubletagwarning.Visible = false;
+			// 
+			// skipdoubletags
+			// 
+			this.skipdoubletags.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.skipdoubletags.AutoSize = true;
+			this.skipdoubletags.BackColor = System.Drawing.SystemColors.Info;
+			this.skipdoubletags.Location = new System.Drawing.Point(63, 119);
+			this.skipdoubletags.Name = "skipdoubletags";
+			this.skipdoubletags.Size = new System.Drawing.Size(157, 17);
+			this.skipdoubletags.TabIndex = 5;
+			this.skipdoubletags.Text = "Skip over already used tags";
+			this.skipdoubletags.UseVisualStyleBackColor = false;
+			this.skipdoubletags.Visible = false;
+			this.skipdoubletags.CheckedChanged += new System.EventHandler(this.skipdoubletags_CheckedChanged);
+			// 
+			// okbutton
+			// 
+			this.okbutton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.okbutton.Location = new System.Drawing.Point(81, 151);
+			this.okbutton.Name = "okbutton";
+			this.okbutton.Size = new System.Drawing.Size(99, 26);
+			this.okbutton.TabIndex = 6;
+			this.okbutton.Text = "OK";
+			this.okbutton.UseVisualStyleBackColor = true;
+			this.okbutton.Click += new System.EventHandler(this.okbutton_Click);
+			// 
+			// cancelbutton
+			// 
+			this.cancelbutton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.cancelbutton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.cancelbutton.Location = new System.Drawing.Point(186, 151);
+			this.cancelbutton.Name = "cancelbutton";
+			this.cancelbutton.Size = new System.Drawing.Size(99, 26);
+			this.cancelbutton.TabIndex = 7;
+			this.cancelbutton.Text = "Cancel";
+			this.cancelbutton.UseVisualStyleBackColor = true;
+			this.cancelbutton.Click += new System.EventHandler(this.cancelbutton_Click);
+			// 
+			// outoftagswarning
+			// 
+			this.outoftagswarning.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.outoftagswarning.BackColor = System.Drawing.SystemColors.Info;
+			this.outoftagswarning.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+			this.outoftagswarning.Location = new System.Drawing.Point(12, 94);
+			this.outoftagswarning.Name = "outoftagswarning";
+			this.outoftagswarning.Padding = new System.Windows.Forms.Padding(3);
+			this.outoftagswarning.Size = new System.Drawing.Size(273, 50);
+			this.outoftagswarning.TabIndex = 8;
+			this.outoftagswarning.Text = "The range exceeds the maximum or minimum allowed tags and cannot be created.";
+			this.outoftagswarning.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			this.outoftagswarning.Visible = false;
+			// 
+			// endtaglabel
+			// 
+			this.endtaglabel.AutoSize = true;
+			this.endtaglabel.Location = new System.Drawing.Point(250, 17);
+			this.endtaglabel.Name = "endtaglabel";
+			this.endtaglabel.Size = new System.Drawing.Size(13, 13);
+			this.endtaglabel.TabIndex = 10;
+			this.endtaglabel.Text = "0";
+			// 
+			// label4
+			// 
+			this.label4.AutoSize = true;
+			this.label4.Location = new System.Drawing.Point(189, 17);
+			this.label4.Name = "label4";
+			this.label4.Size = new System.Drawing.Size(51, 13);
+			this.label4.TabIndex = 9;
+			this.label4.Text = "End Tag:";
+			// 
+			// label2
+			// 
+			this.label2.Location = new System.Drawing.Point(10, 47);
+			this.label2.Name = "label2";
+			this.label2.Size = new System.Drawing.Size(62, 14);
+			this.label2.TabIndex = 11;
+			this.label2.Text = "Increment:";
+			this.label2.TextAlign = System.Drawing.ContentAlignment.TopRight;
+			// 
+			// rangestep
+			// 
+			this.rangestep.AllowDecimal = false;
+			this.rangestep.AllowNegative = true;
+			this.rangestep.AllowRelative = false;
+			this.rangestep.ButtonStep = 1;
+			this.rangestep.ButtonStepFloat = 1F;
+			this.rangestep.ButtonStepsWrapAround = false;
+			this.rangestep.Location = new System.Drawing.Point(76, 42);
+			this.rangestep.Name = "rangestep";
+			this.rangestep.Size = new System.Drawing.Size(96, 24);
+			this.rangestep.StepValues = null;
+			this.rangestep.TabIndex = 12;
+			this.rangestep.WhenTextChanged += new System.EventHandler(this.rangestep_WhenTextChanged);
+			// 
+			// relativemode
+			// 
+			this.relativemode.AutoSize = true;
+			this.relativemode.Location = new System.Drawing.Point(76, 72);
+			this.relativemode.Name = "relativemode";
+			this.relativemode.Size = new System.Drawing.Size(138, 17);
+			this.relativemode.TabIndex = 13;
+			this.relativemode.Text = "Relative to existing tags";
+			this.relativemode.UseVisualStyleBackColor = false;
+			this.relativemode.CheckedChanged += new System.EventHandler(this.relativemode_CheckedChanged);
+			// 
+			// bglabel
+			// 
+			this.bglabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.bglabel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+			this.bglabel.Enabled = false;
+			this.bglabel.Location = new System.Drawing.Point(12, 94);
+			this.bglabel.Name = "bglabel";
+			this.bglabel.Padding = new System.Windows.Forms.Padding(3);
+			this.bglabel.Size = new System.Drawing.Size(273, 50);
+			this.bglabel.TabIndex = 14;
+			this.bglabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			// 
+			// TagRangeForm
+			// 
+			this.AcceptButton = this.okbutton;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.CancelButton = this.cancelbutton;
+			this.ClientSize = new System.Drawing.Size(298, 183);
+			this.Controls.Add(this.relativemode);
+			this.Controls.Add(this.rangestep);
+			this.Controls.Add(this.label2);
+			this.Controls.Add(this.endtaglabel);
+			this.Controls.Add(this.label4);
+			this.Controls.Add(this.cancelbutton);
+			this.Controls.Add(this.okbutton);
+			this.Controls.Add(this.skipdoubletags);
+			this.Controls.Add(this.doubletagwarning);
+			this.Controls.Add(this.label1);
+			this.Controls.Add(this.rangestart);
+			this.Controls.Add(this.outoftagswarning);
+			this.Controls.Add(this.bglabel);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "TagRangeForm";
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Tag Selected Range";
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox rangestart;
+		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.Label doubletagwarning;
+		private System.Windows.Forms.CheckBox skipdoubletags;
+		private System.Windows.Forms.Button okbutton;
+		private System.Windows.Forms.Button cancelbutton;
+		private System.Windows.Forms.Label outoftagswarning;
+		private System.Windows.Forms.Label endtaglabel;
+		private System.Windows.Forms.Label label4;
+		private System.Windows.Forms.Label label2;
+		private CodeImp.DoomBuilder.Controls.ButtonsNumericTextbox rangestep;
+		private System.Windows.Forms.CheckBox relativemode;
+		private System.Windows.Forms.Label bglabel;
+	}
+}
\ No newline at end of file
diff --git a/Source/Plugins/TagRange/TagRangeForm.cs b/Source/Plugins/TagRange/TagRangeForm.cs
new file mode 100644
index 0000000..1389c2e
--- /dev/null
+++ b/Source/Plugins/TagRange/TagRangeForm.cs
@@ -0,0 +1,275 @@
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Windows;
+using CodeImp.DoomBuilder.Types;
+using CodeImp.DoomBuilder.Map;
+
+namespace CodeImp.DoomBuilder.TagRange
+{
+	public partial class TagRangeForm : DelayedForm
+	{
+		private UniversalType selectiontype;
+		private int selectioncount;
+		Dictionary<int, bool> usedtags;
+		private List<int> initialtags; //mxd
+
+		//mxd. Persistent settings
+		private static int storedstep = 1;
+		private static bool storedrelative;
+		
+		public int SelectionCount { get { return selectioncount; } }
+		
+		// Constructor
+		public TagRangeForm()
+		{
+			InitializeComponent();
+		}
+		
+		// This sets up the form
+		public void Setup()
+		{
+			General.Map.Map.ClearAllMarks(false);
+			
+			switch(General.Editing.Mode.GetType().Name)
+			{
+				case "SectorsMode":
+				{
+					General.Map.Map.MarkSelectedSectors(true, true); //mxd
+					selectiontype = UniversalType.SectorTag;
+					ICollection<Sector> list = General.Map.Map.GetSelectedSectors(true);
+					initialtags = new List<int>(list.Count); //mxd
+					foreach(Sector element in list) initialtags.Add(element.Tag); //mxd
+					selectioncount = list.Count;
+					this.Text = "Create tag range for " + selectioncount + (selectioncount > 1 ? " sectors" : " sector");
+				}
+				break;
+
+				case "LinedefsMode":
+				{
+					General.Map.Map.MarkSelectedLinedefs(true, true); //mxd
+					selectiontype = UniversalType.LinedefTag;
+					ICollection<Linedef> list = General.Map.Map.GetSelectedLinedefs(true);
+					initialtags = new List<int>(list.Count); //mxd
+					foreach(Linedef element in list) initialtags.Add(element.Tag); //mxd
+					selectioncount = list.Count;
+					this.Text = "Create tag range for " + selectioncount + (selectioncount > 1 ? " linedefs" : " linedef");
+				}
+				break;
+
+				case "ThingsMode":
+				{
+					General.Map.Map.MarkSelectedThings(true, true); //mxd
+					selectiontype = UniversalType.ThingTag;
+					ICollection<Thing> list = General.Map.Map.GetSelectedThings(true);
+					initialtags = new List<int>(list.Count); //mxd
+					foreach(Thing element in list) initialtags.Add(element.Tag); //mxd
+					selectioncount = list.Count;
+					this.Text = "Create tag range for " + selectioncount + (selectioncount > 1 ? " things" : " thing");
+				}
+				break;
+			}
+			
+			// Find out which tags are used
+			usedtags = new Dictionary<int, bool>();
+			General.Map.Map.ForAllTags(TagHandler, false, usedtags);
+			
+			// Find the first unused tag to use as range start
+			int starttag = General.Map.Map.GetNewTag();
+			rangestart.Text = starttag.ToString();
+
+			//mxd. Apply saved settings
+			rangestep.Text = storedstep.ToString();
+			relativemode.Checked = storedrelative;
+
+			//mxd. Do useless stuff
+			if(General.Random(0, 255) > 230) bglabel.Text = "Creating tag ranges is fun! ^_^";
+		}
+		
+		// Handler for finding a new tag
+		private static void TagHandler(MapElement element, bool actionargument, UniversalType type, ref int value, Dictionary<int, bool> usedtags)
+		{
+			if(value > 0) usedtags[value] = true; //mxd
+		}
+		
+		// This creates a range
+		private List<int> CreateRange(int starttag, int increment, bool relative, bool skipusedtags, out bool tagsused, out bool outoftags) 
+		{
+			List<int> newtags = new List<int>(selectioncount);
+			outoftags = false;
+			tagsused = false;
+
+			//mxd. Get relative tag range
+			if(relative) 
+			{
+				// Go for the number of tags we need
+				for(int i = 0; i < selectioncount; i++) 
+				{
+					int newtag = initialtags[i] + starttag;
+
+					if(newtag > General.Map.FormatInterface.MaxTag || newtag < General.Map.FormatInterface.MinTag) 
+					{
+						outoftags = true;
+						return newtags;
+					}
+
+					if(skipusedtags) 
+					{
+						// Find next unused tag
+						while(usedtags.ContainsKey(newtag)) 
+						{
+							if(newtag >= General.Map.FormatInterface.MaxTag || newtag <= General.Map.FormatInterface.MinTag) 
+							{
+								outoftags = true;
+								return newtags;
+							}
+
+							starttag += increment; //mxd
+						}
+					} 
+					else 
+					{
+						tagsused |= usedtags.ContainsKey(newtag);
+					}
+
+					newtags.Add(newtag);
+					starttag += increment;
+				}
+			} 
+			else //mxd. Get absolute tag range
+			{
+				// Go for the number of tags we need
+				for(int i = 0; i < selectioncount; i++) 
+				{
+					if(starttag > General.Map.FormatInterface.MaxTag || starttag < General.Map.FormatInterface.MinTag) 
+					{
+						outoftags = true;
+						return newtags;
+					}
+
+					if(skipusedtags) 
+					{
+						// Find next unused tag
+						while(usedtags.ContainsKey(starttag)) 
+						{
+							if(starttag >= General.Map.FormatInterface.MaxTag || starttag <= General.Map.FormatInterface.MinTag) 
+							{
+								outoftags = true;
+								return newtags;
+							}
+
+							starttag += increment; //mxd
+						}
+					} 
+					else 
+					{
+						tagsused |= usedtags.ContainsKey(starttag);
+					}
+
+					newtags.Add(starttag);
+					starttag += increment; //mxd
+				}
+			}
+			
+			return newtags;
+		}
+		
+		// This updates the calculated range
+		private void UpdateChanges()
+		{
+			bool outoftags, tagsused;
+			int starttag = rangestart.GetResult(0);
+			int step = rangestep.GetResult(1); //mxd
+			
+			List<int> tags = CreateRange(starttag, step, relativemode.Checked, skipdoubletags.Checked, out tagsused, out outoftags); //mxd
+
+			outoftagswarning.Visible = outoftags;
+			okbutton.Enabled = !outoftags;
+			doubletagwarning.Visible = tagsused && !outoftags;
+			skipdoubletags.Visible = tagsused && !outoftags;
+			skipdoubletags.BringToFront();
+			
+			if(tags.Count > 0) endtaglabel.Text = tags[tags.Count - 1].ToString();
+		}
+		
+		// Range start changes
+		private void rangestart_WhenTextChanged(object sender, EventArgs e)
+		{
+			UpdateChanges();
+		}
+		
+		// OK clicked
+		private void okbutton_Click(object sender, EventArgs e)
+		{
+			bool outoftags, tagsused;
+			int starttag = rangestart.GetResult(0);
+			int step = rangestep.GetResult(1);
+
+			//mxd
+			List<int> tags = CreateRange(starttag, step, relativemode.Checked, skipdoubletags.Checked, out tagsused, out outoftags);
+
+			if(outoftags)
+			{
+				General.ShowWarningMessage("The range exceeds the maximum allowed tags and cannot be created.", MessageBoxButtons.OK);
+			}
+			else
+			{
+				// Apply tags!
+				if(selectiontype == UniversalType.SectorTag)
+				{
+					General.Map.UndoRedo.CreateUndo("Set " + selectioncount + " sector tags");
+					ICollection<Sector> list = General.Map.Map.GetSelectedSectors(true);
+					int index = 0;
+					foreach(Sector s in list) s.Tag = tags[index++];
+				}
+				else if(selectiontype == UniversalType.LinedefTag)
+				{
+					General.Map.UndoRedo.CreateUndo("Set " + selectioncount + " linedef tags");
+					ICollection<Linedef> list = General.Map.Map.GetSelectedLinedefs(true);
+					int index = 0;
+					foreach(Linedef l in list) l.Tag = tags[index++];
+				}
+				else if(selectiontype == UniversalType.ThingTag)
+				{
+					General.Map.UndoRedo.CreateUndo("Set " + selectioncount + " thing tags");
+					ICollection<Thing> list = General.Map.Map.GetSelectedThings(true);
+					int index = 0;
+					foreach(Thing t in list) t.Tag = tags[index++];
+				}
+
+				//mxd. Store settings
+				storedstep = rangestep.GetResult(1);
+				storedrelative = relativemode.Checked;
+
+				//We are done here.
+				this.Close();
+			}
+		}
+		
+		// Cancel clicked
+		private void cancelbutton_Click(object sender, EventArgs e)
+		{
+			this.Close();
+		}
+		
+		// Skip over used tags changed
+		private void skipdoubletags_CheckedChanged(object sender, EventArgs e)
+		{
+			UpdateChanges();
+		}
+
+		//mxd
+		private void rangestep_WhenTextChanged(object sender, EventArgs e) 
+		{
+			UpdateChanges();
+		}
+
+		//mxd
+		private void relativemode_CheckedChanged(object sender, EventArgs e) 
+		{
+			rangestart.AllowNegative = relativemode.Checked;
+			UpdateChanges();
+		}
+	}
+}
+
diff --git a/Source/Plugins/TagRange/TagRangeForm.resx b/Source/Plugins/TagRange/TagRangeForm.resx
new file mode 100644
index 0000000..19dc0dd
--- /dev/null
+++ b/Source/Plugins/TagRange/TagRangeForm.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/TagRange/ToolsForm.Designer.cs b/Source/Plugins/TagRange/ToolsForm.Designer.cs
new file mode 100644
index 0000000..0580061
--- /dev/null
+++ b/Source/Plugins/TagRange/ToolsForm.Designer.cs
@@ -0,0 +1,98 @@
+namespace CodeImp.DoomBuilder.TagRange
+{
+	partial class ToolsForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.toolstrip = new System.Windows.Forms.ToolStrip();
+			this.seperator1 = new System.Windows.Forms.ToolStripSeparator();
+			this.tagrangebutton = new System.Windows.Forms.ToolStripButton();
+			this.seperator2 = new System.Windows.Forms.ToolStripSeparator();
+			this.toolstrip.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// toolstrip
+			// 
+			this.toolstrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.seperator1,
+            this.tagrangebutton,
+            this.seperator2});
+			this.toolstrip.Location = new System.Drawing.Point(0, 0);
+			this.toolstrip.Name = "toolstrip";
+			this.toolstrip.Size = new System.Drawing.Size(330, 25);
+			this.toolstrip.TabIndex = 0;
+			this.toolstrip.Text = "toolStrip1";
+			// 
+			// seperator1
+			// 
+			this.seperator1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+			this.seperator1.Name = "seperator1";
+			this.seperator1.Size = new System.Drawing.Size(6, 25);
+			// 
+			// tagrangebutton
+			// 
+			this.tagrangebutton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.tagrangebutton.Image = global::CodeImp.DoomBuilder.TagRange.Properties.Resources.tag_blue;
+			this.tagrangebutton.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.tagrangebutton.Name = "tagrangebutton";
+			this.tagrangebutton.Size = new System.Drawing.Size(23, 22);
+			this.tagrangebutton.Tag = "rangetagselection";
+			this.tagrangebutton.Text = "Tag Range";
+			this.tagrangebutton.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// seperator2
+			// 
+			this.seperator2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+			this.seperator2.Name = "seperator2";
+			this.seperator2.Size = new System.Drawing.Size(6, 25);
+			// 
+			// ToolsForm
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.ClientSize = new System.Drawing.Size(330, 230);
+			this.Controls.Add(this.toolstrip);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "ToolsForm";
+			this.Text = "Tag Range";
+			this.toolstrip.ResumeLayout(false);
+			this.toolstrip.PerformLayout();
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.ToolStrip toolstrip;
+		private System.Windows.Forms.ToolStripButton tagrangebutton;
+		private System.Windows.Forms.ToolStripSeparator seperator2;
+		private System.Windows.Forms.ToolStripSeparator seperator1;
+	}
+}
\ No newline at end of file
diff --git a/Source/Plugins/TagRange/ToolsForm.cs b/Source/Plugins/TagRange/ToolsForm.cs
new file mode 100644
index 0000000..8e6bf60
--- /dev/null
+++ b/Source/Plugins/TagRange/ToolsForm.cs
@@ -0,0 +1,51 @@
+using System;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.IO;
+
+namespace CodeImp.DoomBuilder.TagRange
+{
+	public partial class ToolsForm : Form
+	{
+		bool buttonontoolbar;
+		
+		// Constructor
+		public ToolsForm()
+		{
+			InitializeComponent();
+			buttonontoolbar = false;
+		}
+		
+		// This invokes an action from control event
+		private void InvokeTaggedAction(object sender, EventArgs e)
+		{
+			General.Interface.InvokeTaggedAction(sender, e);
+		}
+		
+		// This adds or removes the button from the DB toolbar
+		public void UpdateButton()
+		{
+			if(buttonontoolbar)
+			{
+				General.Interface.RemoveButton(seperator1);
+				General.Interface.RemoveButton(tagrangebutton);
+				General.Interface.RemoveButton(seperator2);
+				buttonontoolbar = false;
+			}
+			
+			if(General.Editing.Mode == null)
+				return;
+			
+			string modename = General.Editing.Mode.GetType().Name;
+			IMapSetIO mapset = General.Map.FormatInterface;
+			if((modename == "SectorsMode") ||
+			   ((modename == "LinedefsMode") && mapset.HasLinedefTag) ||
+			   ((modename == "ThingsMode") && mapset.HasThingTag))
+			{
+				General.Interface.AddButton(seperator1);
+				General.Interface.AddButton(tagrangebutton);
+				General.Interface.AddButton(seperator2);
+				buttonontoolbar = true;
+			}
+		}
+	}
+}
diff --git a/Source/Plugins/TagRange/ToolsForm.resx b/Source/Plugins/TagRange/ToolsForm.resx
new file mode 100644
index 0000000..58469c3
--- /dev/null
+++ b/Source/Plugins/TagRange/ToolsForm.resx
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="toolstrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/USDF/BuilderPlug.cs b/Source/Plugins/USDF/BuilderPlug.cs
new file mode 100644
index 0000000..28ccc7e
--- /dev/null
+++ b/Source/Plugins/USDF/BuilderPlug.cs
@@ -0,0 +1,187 @@
+
+#region ================== Copyright (c) 2010 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2010 Pascal vd Heiden
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Globalization;
+using System.Text;
+using System.IO;
+using System.Reflection;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Controls;
+using CodeImp.DoomBuilder.Windows;
+using CodeImp.DoomBuilder.IO;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Editing;
+using CodeImp.DoomBuilder.Plugins;
+using CodeImp.DoomBuilder.Actions;
+using CodeImp.DoomBuilder.Types;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Data;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.USDF
+{
+	public class BuilderPlug : Plug
+	{
+		#region ================== Variables
+
+		// Static instance
+		private static BuilderPlug me;
+		
+		// Tools form
+		private ToolsForm toolsform;
+		
+		// Main form
+		private MainForm mainform;
+		
+		#endregion
+		
+		#region ================== Properties
+
+		// Static property to access the BuilderPlug
+		public static BuilderPlug Me { get { return me; } }
+		
+		// Is the editor opened?
+		public bool EditorOpen { get { return (mainform != null) && !mainform.IsDisposed; } }
+		
+		#endregion
+		
+		#region ================== Methods
+
+		// This loads what is needed to support USDF
+		private void Load()
+		{
+			// Check if the map format has a DIALOGUE lump we can edit
+			bool editlump = false;
+			foreach(KeyValuePair<string, MapLumpInfo> lump in General.Map.Config.MapLumps)
+			{
+				if(lump.Key.Trim().ToUpperInvariant() == "DIALOGUE")
+					editlump = true;
+			}
+			
+			if(editlump)
+			{
+				// Load tools (this adds our button to the toolbar)
+				if(toolsform == null)
+					toolsform = new ToolsForm();
+			}
+		}
+		
+		// This unloads everything
+		private void Unload()
+		{
+			if(mainform != null)
+				mainform.Dispose();
+			
+			if(toolsform != null)
+				toolsform.Dispose();
+			
+			toolsform = null;
+		}
+		
+		#endregion
+		
+		#region ================== Events
+
+		// This event is called when the plugin is initialized
+		public override void OnInitialize()
+		{
+			base.OnInitialize();
+
+			// Keep a static reference
+            me = this;
+
+			General.Actions.BindMethods(this);
+		}
+		
+		// This is called when the plugin is terminated
+		public override void Dispose()
+		{
+			General.Actions.UnbindMethods(this);
+			Unload();
+			base.Dispose();
+        }
+
+		// New map started
+		public override void OnMapNewEnd()
+		{
+			base.OnMapNewEnd();
+			Load();
+		}
+
+		// Map opened
+		public override void OnMapOpenEnd()
+		{
+			base.OnMapOpenEnd();
+			Load();
+		}
+		
+		// Map is being saved
+		public override void OnMapSaveBegin(SavePurpose purpose)
+		{
+			base.OnMapSaveBegin(purpose);
+			if(this.EditorOpen)
+				mainform.SaveData();
+		}
+		
+		// Map closed
+		public override void OnMapCloseEnd()
+		{
+			base.OnMapCloseEnd();
+			Unload();
+		}
+
+		// Map config changed
+		public override void OnMapReconfigure()
+		{
+			base.OnMapReconfigure();
+			Unload();
+			Load();
+		}
+		
+		#endregion
+		
+		#region ================== Actions
+		
+		[BeginAction("opendialogeditor")]
+		public void OpenConversationEditor()
+		{
+			if(!this.EditorOpen)
+			{
+				mainform = new MainForm();
+				
+				if(General.Settings.ScriptOnTop)
+					mainform.Show(General.Interface);
+				else
+					mainform.Show();
+			}
+			else
+			{
+				mainform.Activate();
+			}
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/USDF/MainForm.Designer.cs b/Source/Plugins/USDF/MainForm.Designer.cs
new file mode 100644
index 0000000..9a10314
--- /dev/null
+++ b/Source/Plugins/USDF/MainForm.Designer.cs
@@ -0,0 +1,88 @@
+namespace CodeImp.DoomBuilder.USDF
+{
+	partial class MainForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.components = new System.ComponentModel.Container();
+			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));
+			this.tree = new System.Windows.Forms.TreeView();
+			this.treeimages = new System.Windows.Forms.ImageList(this.components);
+			this.SuspendLayout();
+			// 
+			// tree
+			// 
+			this.tree.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+						| System.Windows.Forms.AnchorStyles.Left)));
+			this.tree.HideSelection = false;
+			this.tree.ImageIndex = 0;
+			this.tree.ImageList = this.treeimages;
+			this.tree.Indent = 22;
+			this.tree.ItemHeight = 18;
+			this.tree.Location = new System.Drawing.Point(12, 12);
+			this.tree.Name = "tree";
+			this.tree.PathSeparator = ".";
+			this.tree.SelectedImageIndex = 0;
+			this.tree.Size = new System.Drawing.Size(257, 588);
+			this.tree.TabIndex = 0;
+			// 
+			// treeimages
+			// 
+			this.treeimages.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("treeimages.ImageStream")));
+			this.treeimages.TransparentColor = System.Drawing.Color.Transparent;
+			this.treeimages.Images.SetKeyName(0, "Dialog2.png");
+			this.treeimages.Images.SetKeyName(1, "book_closed.png");
+			this.treeimages.Images.SetKeyName(2, "book_open.png");
+			this.treeimages.Images.SetKeyName(3, "page_user.png");
+			// 
+			// MainForm
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.ClientSize = new System.Drawing.Size(942, 612);
+			this.Controls.Add(this.tree);
+			this.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+			this.Name = "MainForm";
+			this.Opacity = 0;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
+			this.Text = "Dialog Editor";
+			this.Load += new System.EventHandler(this.MainForm_Load);
+			this.Move += new System.EventHandler(this.MainForm_Move);
+			this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing);
+			this.ResizeEnd += new System.EventHandler(this.MainForm_ResizeEnd);
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.TreeView tree;
+		private System.Windows.Forms.ImageList treeimages;
+
+	}
+}
\ No newline at end of file
diff --git a/Source/Plugins/USDF/MainForm.cs b/Source/Plugins/USDF/MainForm.cs
new file mode 100644
index 0000000..5070ca5
--- /dev/null
+++ b/Source/Plugins/USDF/MainForm.cs
@@ -0,0 +1,130 @@
+#region === Copyright (c) 2010 Pascal van der Heiden ===
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Windows;
+using System.IO;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.USDF
+{
+	public partial class MainForm : DelayedForm
+	{
+		#region ================== Constants
+		
+		#endregion
+		
+		#region ================== Variables
+		
+		// Position/size
+		private Point lastposition;
+		private Size lastsize;
+		
+		#endregion
+		
+		#region ================== Properties
+		
+		#endregion
+		
+		#region ================== Constructor / Destructor
+		
+		// Constructor
+		public MainForm()
+		{
+			InitializeComponent();
+			
+			// Load data from DIALOGUE lump
+			MemoryStream s = General.Map.GetLumpData("DIALOGUE");
+			if(s != null)
+			{
+				
+			}
+		}
+		
+		#endregion
+		
+		#region ================== Methods
+		
+		// Called before the map is saved so we can save our data
+		public void SaveData()
+		{
+		}
+		
+		#endregion
+		
+		#region ================== Events
+		
+		// Form loaded
+		private void MainForm_Load(object sender, EventArgs e)
+		{
+			this.SuspendLayout();
+			this.Location = new Point(General.Settings.ReadPluginSetting("mainwindow.positionx", this.Location.X),
+									  General.Settings.ReadPluginSetting("mainwindow.positiony", this.Location.Y));
+			this.Size = new Size(General.Settings.ReadPluginSetting("mainwindow.sizewidth", this.Size.Width),
+								 General.Settings.ReadPluginSetting("mainwindow.sizeheight", this.Size.Height));
+			this.WindowState = (FormWindowState)General.Settings.ReadPluginSetting("mainwindow.windowstate", (int)FormWindowState.Normal);
+			this.ResumeLayout(true);
+			
+			// Normal windowstate?
+			if(this.WindowState == FormWindowState.Normal)
+			{
+				// Keep last position and size
+				lastposition = this.Location;
+				lastsize = this.Size;
+			}
+		}
+		
+		// Form is being closed
+		private void MainForm_FormClosing(object sender, FormClosingEventArgs e)
+		{
+			int windowstate;
+			
+			// Determine window state to save
+			if(this.WindowState != FormWindowState.Minimized)
+				windowstate = (int)this.WindowState;
+			else
+				windowstate = (int)FormWindowState.Normal;
+			
+			// Save window settings
+			General.Settings.WritePluginSetting("mainwindow.positionx", lastposition.X);
+			General.Settings.WritePluginSetting("mainwindow.positiony", lastposition.Y);
+			General.Settings.WritePluginSetting("mainwindow.sizewidth", lastsize.Width);
+			General.Settings.WritePluginSetting("mainwindow.sizeheight", lastsize.Height);
+			General.Settings.WritePluginSetting("mainwindow.windowstate", windowstate);
+			
+			// Save dialog data
+			SaveData();
+		}
+		
+		// Form resized
+		private void MainForm_ResizeEnd(object sender, EventArgs e)
+		{
+			// Normal windowstate?
+			if(this.WindowState == FormWindowState.Normal)
+			{
+				// Keep last position and size
+				lastposition = this.Location;
+				lastsize = this.Size;
+			}
+		}
+		
+		// Form moved
+		private void MainForm_Move(object sender, EventArgs e)
+		{
+			// Normal windowstate?
+			if(this.WindowState == FormWindowState.Normal)
+			{
+				// Keep last position and size
+				lastposition = this.Location;
+				lastsize = this.Size;
+			}
+		}
+		
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/Source/Plugins/USDF/MainForm.resx b/Source/Plugins/USDF/MainForm.resx
new file mode 100644
index 0000000..4310636
--- /dev/null
+++ b/Source/Plugins/USDF/MainForm.resx
@@ -0,0 +1,247 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="treeimages.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <data name="treeimages.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
+        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
+        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAB4
+        FQAAAk1TRnQBSQFMAgEBBAEAAQkBAAEEAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        AwABIAMAAQEBAAEgBgABIP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8AagABkwFyAXMB/wGQ
+        AVoBXAH/AY0CWQH/AYoBVgFXAf8BhgFUAVMB/wGDAVEBUAH/AYACTgH/AXwCSgH/AXgBSAFHAf8BdAFE
+        AUUB/wFxAkEB/wFsAT0BPgH/AWoCOQH/sAABJQE3ASgB/wE0AU4BOAH/EAABqQGBAYIB/wGPAWIBYwH/
+        AaYBkQGBAf8BpQGNAYAB/wGmAY4BfwH/AaYBjgF/Af8BpgGOAX4B/wGmAY0BfgH/AaYBjQF+Af8BpgGN
+        AX4B/wGmAY0BfgH/AacBjgF+Af8B1AHLAcIB/wF4AUIBQwH/GAABdQFYAUQB/wFpAU4BOwH/AWUBSQE3
+        Af8BagFNAToB/wFsAU8BOgH/AW0BUQE8Af8BbQFSAT4B/wFyAVMBQQH/AYQBZgFVAf8BlgF8AW0B/wGv
+        AZgBjAH/A+UB/wO4Af8DtQH/A7UB/wO1Af8DtQH/A7UB/wO1Af8DtQH/A7UB/wO1Af8DtQH/A7UB/wO1
+        Af8DuQH/A+UB/ygAASwBQQEvAf8BdAGhAXsB/wE0AU4BOAH/EAABkAFjAWUB/wGQAWIBZAH/AYMBUwFW
+        Af8BnwFVAVMB/wGoAVYBUwH/AaYBUQFNAf8BoAFLAUcB/wGbAUYBQgH/AZcBQAE8Af8BkwE8ATgB/wGR
+        ATgBMwH/AZcBNwEzAf8B/QL+Af8BewFEAUYB/xQAAXwBWgFIAf8BuAF3AXUB/wFuAVIBPgH/AVwBRAEz
+        Af8BtQJoAf8BtgFoAWkB/wG7AnAB/wG9AXMBcgH/AcEBdwF7Af8BxwGBAYMB/wHCAX4BfQH/AZsBbQFg
+        Af8DuAH/AcABpwGLAf8B9gHiAcsB/wHBAagBjAH/AfYB4QHKAf8B5AHLAbAB/wHkAcsBsAH/AfYB4QHK
+        Af8BwQGoAYwB/wHkAcsBsAH/AcEBqAGMAf8D+gH/A/oB/wP6Af8D9gH/A7kB/yQAATABSAE0Af8BdAGh
+        AXsB/wGCAasBiQH/ATQBTgE4Af8QAAGiAXgBeQH/AaECeAH/AZcBbQFuAf8B0QF/AXsB/wHJAXcBcgH/
+        AcMBbgFqAf8BvQFmAWEB/wG2AV8BWQH/AbEBWAFRAf8BrAFQAUkB/wGoAUwBRAH/AZYBOAExAf8D+AH/
+        AX8BRwFJAf8QAAF6AVkBRwH/AbgBdwF1Af8B4wHaAdUB/wGYAXgBXwH/AZcBdwFhAf8BnwGDAW8B/wHK
+        AboBrwH/AdcBzAHDAf8B4wHaAdUB/wHpAeIB3gH/AeYB3QHZAf8BvwF7AXkB/wGuAWkBZgH/A7UB/wHC
+        AakBjQH/AfYB4QHKAf8B9gHhAcoB/wH2AeEBygH/AeQBywGwAf8B5AHLAbAB/wHkAcsBsAH/AeQBywGw
+        Af8B5AHLAbAB/wHBAagBjAH/A/kB/wP3Af8D9gH/A/oB/wO1Af8gAAE0AU4BOAH/AXQBoQF7Bf8BggGr
+        AYkB/wE0AU4BOAH/EAABpQF7AXwB/wGnAX0BfgH/AZ0BcgFzAf8B0QGBAX8B/wHMAXsBdwH/AcYBcwFv
+        Af8BwAFtAWgB/wG6AWUBXwH/AbQBXQFXAf8BrwFWAU8B/wGpAVABSQH/AZoBPgE3Af8D+QH/AYICSwH/
+        DAABegFZAUcB/wG4AXcBdQH/AcsBmwGaAf8B4wHaAdUB/wGYAXgBXwH/AeUB0QHCAf8B2QHOAcYB/wGb
+        AXwBZwH/AawBkQGBAf8B3QHSAcsB/wHpAeEB3AH/AeoB4wHfAf8BxQKBAf8BtwJvAf8DtQH/A/oB/wHB
+        AagBjAH/AfYB4QHKAf8BowG9AdkB/wGjAb0B2QH/AaMBvQHZAf8BowG9AdkB/wHkAcsBsAH/AcEBqAGM
+        Af8D+gH/A/kB/wP3Af8D9QH/A/oB/wO1Af8EAAE3AUkBOgH/ATQBTgE4Af8BNAFOATgB/wE0AU4BOAH/
+        ATQBTgE4Af8BNAFOATgB/wE0AU4BOAH/AXQBoQF7Cf8BggGrAYkB/wE0AU4BOAH/AS8BRwEzAf8MAAGp
+        AX4BfwH/AawCgQH/AZ4BcgFzAf8B1gGIAYUB/wHRAYEBfwH/AcwBegF3Af8BxgF0AXAB/wHAAWwBZwH/
+        AboBZAFfAf8BtAFdAVcB/wGvAVYBTwH/AZ4BRAE8Af8D+QH/AYYBTgFPAf8IAAF6AVkBRwH/AbMBdAFw
+        Af8ByAGVAZQB/wHwAesB6AH/AeMB2gHVAf8BnwF7AWEB/wHfAcoBuwH/AekB4wHeAf8B6wHlAeEB/wHX
+        AcIBtQH/AZsBfAFnAf8B3wHUAc4B/wHsAeYB4AH/AcsBhwGKAf8BvQJ2Af8DtQH/A/oB/wP6Af8BowG9
+        AdkB/wHbAeUB8AH/AdsB5QHwAf8B2wHlAfAB/wHbAeUB8AH/AaMBvQHZAf8D+gH/A/oB/wP3Af8D9gH/
+        A/UB/wP6Af8DtQH/ATkBTAE8Af8B3gHpAeAB/wHWAeQB2AH/Ac4B3wHQAf8BwwHXAcYB/wG7AdIBvgH/
+        AbMBzAG3Af8BqAHFAawB/wP8Cf8BwwHXAcYB/wGCAasBiQH/AXQBoQF7Af8BLwFHATMB/wgAAawCgAH/
+        AbECgQH/AZ4BbwFwAf8B3AGPAYwB/wHWAYgBhQH/AdABgQF+Af8BzAF7AXcB/wHGAXMBbwH/AcABawFn
+        Af8BugFkAV8B/wGzAVwBVgH/AaMBSgFEAf8D+wH/AYgBUAFRAf8IAAGuAYEBeQH/AboBewF5Bf8B8AHr
+        AegB/wHjAdoB1QH/AaEBfQFjAf8B3wHKAbsB/wHpAeMB3gH/AfcB9QHzCf8BlwF3AWEB/wHwAesB6AH/
+        Ac8BjQGPAf8BwgF7AX0B/wO1Af8D+gH/AaMBvQHZAf8B5wHuAfUB/wGsAcEB1wH/AdsB5QHwAf8B2wHl
+        AfAB/wGsAcEB1wH/AdsB5QHwAf8BowG9AdkB/wP5Af8D9gH/A/YB/wPzAf8D+gH/A7UB/wFGAWEBSgH/
+        AeQB7AHlAf8B5AHsAeUB/wHoAe4B6QH/AeoB7wHrAf8B7gHxAe4B/wHyAfMB8gH/AfUB9gH1Af8B+AH5
+        AfgB/wP6Af8D/An/AYIBqwGJAf8BNAFOATgB/wgAAa0CfgH/AbQCgQH/AaIBcQFzAf8B4gGWAZUB/wHb
+        AY4BjAH/AdYBhwGEAf8B0AGBAX0B/wHKAXsBdgH/AcUBcwFuAf8BvwFrAWYB/wG5AWQBXQH/AagBTwFK
+        Bf8BiQFSAVMB/wgAAbgBgQF8Af8BugF8AXkF/wHwAesB6AH/AeMB2gHVAf8BqAGAAWkB/wHfAcoBuwH/
+        AekB4wHeAf8B9wH1AfMJ/wGXAXgBYQH/Ae8B6gHnAf8B1AGTAZUB/wHJAYQBhwH/A7UB/wP6Af8BjQGr
+        Ac8B/wHnAe0B9QH/AYIBngG2Af8B2wHlAfAB/wHbAeUB8AH/AYIBngG2Af8B2wHlAfAB/wGNAasBzgH/
+        A/UB/wPzAf8D8AH/A+8B/wP6Af8DtQH/AVYBcQFaAf8B6gHvAeoB/wHfAeoB4AH/AeAB6gHiAf8B5AHs
+        AeUB/wHoAe4B6QH/AewB8AHtAf8B8AHyAfAB/wHyAfMB8gH/AfUB9gH1Af8B+AH5AfgB/wP7Bf8BggGr
+        AYkB/wE0AU4BOAH/CAABsAF+AX8B/wG6AYUBhgH/AagCdwH/AegBngGdAf8B4QGWAZQB/wHcAY4BjAH/
+        AdYBhgGEAf8B0AGBAX4B/wHLAXoBdgH/AcUBcwFuAf8BvwFrAWUB/wGuAVYBUQX/AY0BVgFXAf8IAAHC
+        AYcBhAH/Ab0BfQF6Bf8B8AHrAegB/wHjAdoB1QH/Aa8BhgFtAf8B3wHKAbsB/wHpAeMB3gH/AfcB9QHz
+        Cf8BngF7AWUB/wHvAegB5QH/AdUBlgGYAf8BzQGJAYwB/wO1Af8D+gH/AYIBngG2Af8BjAGqAc0B/wHa
+        AeQB7wH/AdsB5QHwAf8B2wHlAfAB/wHbAeUB8AH/AY0BqwHOAf8BgQGcAbQB/wPwAf8D7gH/A+wB/wPr
+        Af8D+gH/A7UB/wFjAX4BZwH/Ae0B8QHtAf8B2AHlAdoB/wOYAf8DmAH/AcYBzAHHAf8DmAH/A5gB/wOY
+        Af8DmAH/AfQB9QH0Af8B9QH2AfUB/wP7Af8BggGrAYkB/wE0AU4BOAH/CAABtgGBAYIB/wHCAYwBjQH/
+        Aa0BewF8Af8B7QGlAaQB/wHnAZ0BnAH/AeIBlgGTAf8B3AGNAYsB/wHWAYYBgwH/Ac8BgAF9Af8BywF6
+        AXYB/wHEAXEBbgH/AbUBXQFZBf8BkQFZAVoB/wgAAcUBigGIAf8BvQF/AXwF/wHwAesB6AH/AeMB2gHV
+        Af8BwgGXAX4B/wHfAcoBuwH/AekB4wHeAf8B9wH1AfMJ/wGjAX0BZwH/AewB5gHhAf8B1wGYAZsB/wHQ
+        AY0BkAH/A7UB/wP6Af8BggGeAbYB/wGrAcAB1gH/AYwBqQHNAf8BiwGpAc0B/wGNAasBzgH/AYwBqQHN
+        Af8BiwGpAc0B/wF/AZoBsgH/A+sB/wPkAf8D5AH/A+IB/wP6Af8DtQH/AW8BiQFzAf8B8wH1AfMB/wHS
+        AeEB1AH/AdYB5AHYAf8B2QHmAdsB/wHbAecB3QH/Ad8B6gHgAf8B4wHsAeQB/wHnAe4B6AH/AeoB7wHr
+        Af8B7AHwAe0B/wHwAfIB8AH/AfcB+AH3Af8BgQGqAYYB/wE0AU4BOAH/CAABuwKGAf8ByAKSAf8BsgGA
+        AYEB/wHyAqsB/wHtAaQBowH/AeYBnQGbAf8B4AGVAZIB/wHbAY4BiwH/AdQBhwGEAf8B0AGBAX0B/wHK
+        AXgBdQH/AboBZQFhBf8BlQFbAVwB/wgAAcgCjgH/AcABgQF+Av8B/QL/AfAB6wHoAf8B4wHaAdUB/wHI
+        AZsBgQH/Ad8BygG7Af8B6QHjAd4B/wH3AfUB8wn/AagBgQFrAf8B6wHhAd8B/wHXAZgBmwH/AdUBlQGY
+        Af8DtQH/A/oB/wP6Af8BgQGdAbUB/wGqAb8B1QH/AYsBqQHNAf8BiwGpAc0B/wGLAakBzQH/AX8BmgGy
+        Af8D6wH/A+IB/wP6Af8D+gH/A/oB/wP1Af8DtQH/AW8BiQFzAf8B9wH4AfcB/wHNAd4B0AH/A5gB/wOY
+        Af8DmAH/A5gB/wHCAckBxAH/A5gB/wHGAcwBxwH/A5gB/wOYAf8B8AHyAfAB/wGCAasBiQH/ATQBTgE4
+        Af8IAAG/AooB/wHQAZgBmQH/AbgBgwGEAf8B9wKxAf8B8gGrAaoB/wHsAaQBowH/AeYBnAGbAf8B4AGU
+        AZMB/wHaAY0BiwH/AdYBhQGDAf8B0AGAAXwB/wHAAWsBaAX/AZgCXwH/CAABzwKWAf8BwgGEAYAD/wH+
+        Af8B8AHrAegB/wHiAc4BwQH/AdwBugGpAf8B4QHEAbMB/wHpAeMB3gH/AfcB9QHzCf8BuQGLAXIB/wHa
+        AZ0BnwH/AeIBqQGsAf8EAAO1Af8D+gH/A/oB/wP2Af8BgQGcAbQB/wGAAZsBswH/AYABnAG0Af8BfwGa
+        AbIB/wPpAf8D5AH/A94B/wP6Af8D8gH/A90B/wOtAf8D0gH/AXkBkwF9Af8B/AH9AfwB/wHFAdgBxwH/
+        AckB2wHMAf8BzQHeAdAB/wHRAeAB0wH/AdQB4wHWAf8B1gHkAdgB/wHZAeYB2wH/Ad0B6AHfAf8B4AHq
+        AeIB/wHkAewB5QH/AeoB7wHrAf8BiAGvAY4B/wE0AU4BOAH/CAABxQGOAY8B/wHXAp8B/wG9AYcBiAH/
+        AfsCtgH/AfcBsQGyAf8B8gGrAaoB/wHtAaMBogH/AecBmwGaAf8B4AGUAZIB/wHaAY0BiQH/AdUBhgGC
+        Af8BxgFxAW8F/wGbAWEBYgH/CAAB1AKeAf8BxgGJAYEC/wL+Af8B8AHrAecB/wHlAcMBrwH/BAAB6QHU
+        AcsB/wHKAa4BoQH/AcoBowGOAf8B9gHwAewF/wHEAZEBdgH/DAADtQH/A/wB/wP6Af8D9gH/A/MB/wPw
+        Af8D8AH/A+4B/wPoAf8D4AH/A9cB/wP6Af8D7wH/A6wB/wPSAf8EAAFuAYMBcQX/AfcB+AH3Af8B7wHz
+        AfAB/wHnAe4B6AH/AdwB6AHdAf8B0wHiAdUB/wHLAdwBzgH/AcMB1wHGAf8BuQHQAbwB/wGwAcoBtAH/
+        AagBxQGsAf8BlQG4AZoB/wGNAbMBkgH/ASoBPAEsAf8IAAHKAZQBlQH/AeIBqAGpAf8BwgGNAY4C/wG9
+        Ab8B/wH+AbkBugH/AfsCtQH/AfUCrQH/AfABpgGlAf8B6gGeAZ0B/wHkAZcBlAH/Ad0BjgGMAf8BzgF6
+        AXgF/wGkAWgBaQH/CAAB4gGvAbEB/wHJAZABhQL/Af4C/wHzAeoB5QH/Ad0BsQGXAf8MAAHoAdYBywH/
+        AccBrAGeAf8BygGjAY4B/wHPAacBkAH/DAADuQH/A/cB/wP8Af8D+gH/A/oB/wP6Af8D+gH/A/oB/wP6
+        Af8D+gH/A/oB/wP6Af8DrwH/A9IB/wwAAW0BggFxAf8BeQGTAX0B/wFvAYkBcwH/AW8BiQFzAf8BbwGJ
+        AXMB/wFvAYkBcwH/AWMBfgFnAf8BYwF+AWcB/wFjAX4BZwH/AVYBcQFaAf8BVgFxAVoB/wFGAWEBSgH/
+        ATkBTAE8Af8MAAHNApQB/wHKApAB/wHEAYsBjAH/AdsBqQGqAf8B2QGnAagB/wHWAqYB/wHUAqQB/wHR
+        AqEB/wHOAp8B/wHLApwB/wHIApkB/wHBAZUBlAH/Ac8CuAH/EAAB1QGjAY0F/wHfAbYBnwH/LAAD5QH/
+        A7kB/wO1Af8DtQH/A7UB/wO1Af8DtQH/A7UB/wO1Af8DtQH/A7UB/wO1Af8D0gH/mAAB2wGtAZMB/3AA
+        AUIBTQE+BwABPgMAASgDAAFAAwABIAMAAQEBAAEBBgABARYAA/+BAAL/AcABAQX/AecBgAEBAfgDAAH/
+        AccBgAEBAfADAAH/AYcBgAEBAeADAAH/AQcBgAEBAcADAAGAAQMBgAEBAYAEAAEBAYABAQGABAABAQGA
+        AQEBgAQAAQEBgAEBAYAEAAEBAYABAQGABAABAQGAAQEBgAQAAQEBgAEBAYABAQMAAQEBgAEBAYIBBwEA
+        AQEBAAEBAYABAQGDAYcBAAEDAYABAwGAAQMBxwH/AQABBwT/Ae8D/ws=
+</value>
+  </data>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZAAAAGQAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAkNieyM003/wAA
+        ABkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAArQC7Mc6F6/zNN
+        N/8AAAAZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAvRzPlc6F6/4Kr
+        if8zTTf/AAAAGQAAAAAAAAAAAAAAAAAAAAAAAAAZAAAAGQAAABkAAAAZAAAAGQAAABkzTTf/c6F6////
+        //+Cq4n/M003/wAAABkAAAAZAAAAAAoPCzM2SDmyM003/zNNN/8zTTf/M003/zNNN/8zTTf/c6F6////
+        ////////gquJ/zNNN/8uRjKyGScbMwAAABk4Szuy3ung/9bk2P/O39D/w9fG/7vSvv+zzLf/qMWs//z8
+        /P///////////8PXxv+Cq4n/c6F6/y5GMrIAAAAZRWBJ/+Ts5f/k7OX/6O7p/+rv6//u8e7/8vPy//X2
+        9f/4+fj/+vr6//z8/P///////////4Krif8zTTf/AAAAGVVwWf/q7+r/3+rg/+Dq4v/k7OX/6O7p/+zw
+        7f/w8vD/8vPy//X29f/4+fj/+/v7//////+Cq4n/M003/wAAABlifWb/7fHt/9jl2v+YmJj/mJiY/8bM
+        x/+YmJj/mJiY/5iYmP+YmJj/9PX0//X29f/7+/v/gquJ/zNNN/8AAAAZboly//P18//S4dT/1uTY/9nm
+        2//b593/3+rg/+Ps5P/n7uj/6u/r/+zw7f/w8vD/9/j3/4Cqhv8zTTf/AAAAGW6Jcv/3+Pf/zd7Q/5iY
+        mP+YmJj/mJiY/5iYmP/CycT/mJiY/8bMx/+YmJj/mJiY//Dy8P+Cq4n/M003/wAAABl4k3z//P38/8XY
+        x//J28z/zd7Q/9Hg0//U49b/1uTY/9nm2//d6N//4Ori/+Ts5f/q7+v/iK+O/zNNN/8AAAAZbYNwsv//
+        ///3+Pf/7/Pw/+fu6P/c6N3/0+LV/8vczv/D18b/udC8/7DKtP+oxaz/lbia/42zkv8pOyuyAAAAACct
+        KDNsgnCyeJN8/26Jcv9uiXL/boly/26Jcv9ifWb/Yn1m/2J9Zv9VcFn/VXBZ/0VgSf84SzuyEhsTMwAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAA//P////j////w////4P//8AB//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAB
+        //8AAf///////w==
+</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/USDF/Properties/AssemblyInfo.cs b/Source/Plugins/USDF/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..790f960
--- /dev/null
+++ b/Source/Plugins/USDF/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("USDF")]
+[assembly: AssemblyDescription("USDF Conversation Editor plugin")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Doom Builder")]
+[assembly: AssemblyCopyright("Copyright ©  2010")]
+[assembly: AssemblyTrademark("CodeImp")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("49d76fc2-0683-4fce-9a22-7b288061ffc2")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Source/Plugins/USDF/Properties/Resources.Designer.cs b/Source/Plugins/USDF/Properties/Resources.Designer.cs
new file mode 100644
index 0000000..550a011
--- /dev/null
+++ b/Source/Plugins/USDF/Properties/Resources.Designer.cs
@@ -0,0 +1,70 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:2.0.50727.3615
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace CodeImp.DoomBuilder.USDF.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("CodeImp.DoomBuilder.USDF.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        internal static System.Drawing.Bitmap Dialog {
+            get {
+                object obj = ResourceManager.GetObject("Dialog", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+    }
+}
diff --git a/Source/Plugins/USDF/Properties/Resources.resx b/Source/Plugins/USDF/Properties/Resources.resx
new file mode 100644
index 0000000..838832c
--- /dev/null
+++ b/Source/Plugins/USDF/Properties/Resources.resx
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="Dialog" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Dialog.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/USDF/Resources/Actions.cfg b/Source/Plugins/USDF/Resources/Actions.cfg
new file mode 100644
index 0000000..65954ee
--- /dev/null
+++ b/Source/Plugins/USDF/Resources/Actions.cfg
@@ -0,0 +1,15 @@
+/******************************************\
+	Doom Builder Actions Configuration
+\******************************************/
+
+
+opendialogeditor
+{
+	title = "Dialog Editor";
+	category = "view";
+	description = "This opens the dialog editor that allows you to edit DIALOGUE conversations in your map.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
diff --git a/Source/Plugins/USDF/Resources/Dialog.png b/Source/Plugins/USDF/Resources/Dialog.png
new file mode 100644
index 0000000..1bbc62c
Binary files /dev/null and b/Source/Plugins/USDF/Resources/Dialog.png differ
diff --git a/Source/Plugins/USDF/ToolsForm.Designer.cs b/Source/Plugins/USDF/ToolsForm.Designer.cs
new file mode 100644
index 0000000..0b101b4
--- /dev/null
+++ b/Source/Plugins/USDF/ToolsForm.Designer.cs
@@ -0,0 +1,107 @@
+namespace CodeImp.DoomBuilder.USDF
+{
+	partial class ToolsForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.toolstrip = new System.Windows.Forms.ToolStrip();
+			this.dialogbutton = new System.Windows.Forms.ToolStripButton();
+			this.menuStrip1 = new System.Windows.Forms.MenuStrip();
+			this.editmenu = new System.Windows.Forms.ToolStripMenuItem();
+			this.dialogitem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolstrip.SuspendLayout();
+			this.menuStrip1.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// toolstrip
+			// 
+			this.toolstrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.dialogbutton});
+			this.toolstrip.Location = new System.Drawing.Point(0, 24);
+			this.toolstrip.Name = "toolstrip";
+			this.toolstrip.Size = new System.Drawing.Size(196, 25);
+			this.toolstrip.TabIndex = 0;
+			this.toolstrip.Text = "toolStrip1";
+			// 
+			// dialogbutton
+			// 
+			this.dialogbutton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.dialogbutton.Image = global::CodeImp.DoomBuilder.USDF.Properties.Resources.Dialog;
+			this.dialogbutton.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.dialogbutton.Name = "dialogbutton";
+			this.dialogbutton.Size = new System.Drawing.Size(23, 22);
+			this.dialogbutton.Tag = "opendialogeditor";
+			this.dialogbutton.Text = "Open Dialog Editor";
+			this.dialogbutton.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// menuStrip1
+			// 
+			this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.editmenu});
+			this.menuStrip1.Location = new System.Drawing.Point(0, 0);
+			this.menuStrip1.Name = "menuStrip1";
+			this.menuStrip1.Size = new System.Drawing.Size(196, 24);
+			this.menuStrip1.TabIndex = 1;
+			this.menuStrip1.Text = "menuStrip1";
+			// 
+			// editmenu
+			// 
+			this.editmenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.dialogitem});
+			this.editmenu.Name = "editmenu";
+			this.editmenu.Size = new System.Drawing.Size(39, 20);
+			this.editmenu.Text = "Edit";
+			// 
+			// dialogitem
+			// 
+			this.dialogitem.Image = global::CodeImp.DoomBuilder.USDF.Properties.Resources.Dialog;
+			this.dialogitem.Name = "dialogitem";
+			this.dialogitem.Size = new System.Drawing.Size(152, 22);
+			this.dialogitem.Tag = "opendialogeditor";
+			this.dialogitem.Text = "Dialog Editor...";
+			this.dialogitem.Click += new System.EventHandler(this.InvokeTaggedAction);
+			// 
+			// ToolsForm
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.ClientSize = new System.Drawing.Size(196, 78);
+			this.Controls.Add(this.toolstrip);
+			this.Controls.Add(this.menuStrip1);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MainMenuStrip = this.menuStrip1;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "ToolsForm";
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.Text = "ToolsForm";
+			this.toolstrip.ResumeLayout(false);
+			this.toolstrip.PerformLayout();
+			this.menuStrip1.ResumeLayout(false);
+			this.menuStrip1.PerformLayout();
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.ToolStrip toolstrip;
+		private System.Windows.Forms.ToolStripButton dialogbutton;
+		private System.Windows.Forms.MenuStrip menuStrip1;
+		private System.Windows.Forms.ToolStripMenuItem editmenu;
+		private System.Windows.Forms.ToolStripMenuItem dialogitem;
+	}
+}
\ No newline at end of file
diff --git a/Source/Plugins/USDF/ToolsForm.cs b/Source/Plugins/USDF/ToolsForm.cs
new file mode 100644
index 0000000..5d713d8
--- /dev/null
+++ b/Source/Plugins/USDF/ToolsForm.cs
@@ -0,0 +1,71 @@
+#region === Copyright (c) 2010 Pascal van der Heiden ===
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Text;
+using System.ComponentModel;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Windows;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.USDF
+{
+	public partial class ToolsForm : Form
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		#endregion
+
+		#region ================== Properties
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		// Constructor
+		public ToolsForm()
+		{
+			InitializeComponent();
+
+			General.Interface.AddButton(dialogbutton, ToolbarSection.Script);
+			General.Interface.AddMenu(dialogitem, MenuSection.ViewScriptEdit);
+		}
+
+		// Disposer
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			
+			General.Interface.RemoveButton(dialogbutton);
+			General.Interface.RemoveMenu(dialogitem);
+			
+			base.Dispose(disposing);
+		}
+		
+		#endregion
+
+		#region ================== Methods
+
+		// This invokes an action from control event
+		private void InvokeTaggedAction(object sender, EventArgs e)
+		{
+			General.Interface.InvokeTaggedAction(sender, e);
+		}
+		
+		#endregion
+
+		#region ================== Events
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/USDF/ToolsForm.resx b/Source/Plugins/USDF/ToolsForm.resx
new file mode 100644
index 0000000..1da5007
--- /dev/null
+++ b/Source/Plugins/USDF/ToolsForm.resx
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="toolstrip.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="toolstrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>114, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/USDF/USDF.csproj b/Source/Plugins/USDF/USDF.csproj
new file mode 100644
index 0000000..d5555b2
--- /dev/null
+++ b/Source/Plugins/USDF/USDF.csproj
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{CC9BAD62-C57B-45A0-BC5D-172A2957ADC7}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>CodeImp.DoomBuilder.USDF</RootNamespace>
+    <AssemblyName>USDF</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\..\..\Build\Plugins\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <OutputPath>..\..\..\Build\Plugins\</OutputPath>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="BuilderPlug.cs" />
+    <Compile Include="MainForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="MainForm.Designer.cs">
+      <DependentUpon>MainForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="ToolsForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="ToolsForm.Designer.cs">
+      <DependentUpon>ToolsForm.cs</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ToolsForm.resx">
+      <DependentUpon>ToolsForm.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Core\Builder.csproj">
+      <Project>{818B3D10-F791-4C3F-9AF5-BB2D0079B63C}</Project>
+      <Name>Builder</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="MainForm.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>MainForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Resources\Actions.cfg" />
+    <None Include="Resources\Dialog.png" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/Source/Plugins/VisplaneExplorer/BuilderPlug.cs b/Source/Plugins/VisplaneExplorer/BuilderPlug.cs
new file mode 100644
index 0000000..8f36dbd
--- /dev/null
+++ b/Source/Plugins/VisplaneExplorer/BuilderPlug.cs
@@ -0,0 +1,158 @@
+
+#region ================== Copyright (c) 2012 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2012 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Globalization;
+using System.IO;
+using CodeImp.DoomBuilder.Plugins.VisplaneExplorer.Properties;
+using CodeImp.DoomBuilder.Windows;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Plugins.VisplaneExplorer
+{
+	public class BuilderPlug : Plug
+	{
+		#region ================== Variables
+
+		// Objects
+		private static BuilderPlug me;
+		private VPOManager vpo;
+		private InterfaceForm interfaceform;
+		private bool enabled; //mxd
+
+		// Palettes
+		private Palette[] palettes;
+		
+		#endregion
+
+		#region ================== Properties
+		
+		// Properties
+		public override string Name { get { return "VisplaneExplorer"; } }
+		internal static VPOManager VPO { get { return me.vpo; } }
+		internal static InterfaceForm InterfaceForm { get { return me.interfaceform; } }
+		internal static Palette[] Palettes { get { return me.GetPalettes(); } }
+		public override int MinimumRevision { get { return 2411; } }
+		
+		#endregion
+
+		#region ================== Initialize / Dispose
+
+		//mxd. Initialize when we can check the map format
+		public override void OnMapNewEnd() { OnMapOpenEnd(); }
+		public override void OnMapOpenEnd()
+		{
+			enabled = (General.Map.DOOM || General.Map.HEXEN);
+			if(enabled)
+			{
+				// Load interface controls
+				interfaceform = new InterfaceForm();
+
+				// Load VPO manager (manages multithreading and communication with vpo.dll)
+				vpo = new VPOManager();
+
+				// Keep a static reference
+				me = this;
+			}
+		}
+
+		// Preferences changed
+		public override void OnClosePreferences(PreferencesController controller)
+		{
+			base.OnClosePreferences(controller);
+			ApplyUserColors();
+		}
+
+		// This is called when the plugin is terminated
+		public override void Dispose()
+		{
+			//mxd. Active and not already disposed?
+			if(!IsDisposed)
+			{
+				if(enabled)
+				{
+					// Clean up
+					interfaceform.Dispose();
+					interfaceform = null;
+					vpo.Dispose();
+					vpo = null;
+
+					// Done
+					me = null;
+				}
+
+				base.Dispose();
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		//mxd
+		private Palette[] GetPalettes()
+		{
+			if(palettes == null)
+			{
+				// Load palettes
+				palettes = new Palette[(int)ViewStats.NumStats];
+				palettes[(int)ViewStats.Visplanes] = new Palette(Resources.Visplanes_pal);
+				palettes[(int)ViewStats.Drawsegs] = new Palette(Resources.Drawsegs_pal);
+				palettes[(int)ViewStats.Solidsegs] = new Palette(Resources.Solidsegs_pal);
+				palettes[(int)ViewStats.Openings] = new Palette(Resources.Openings_pal);
+				palettes[(int)ViewStats.Heatmap] = new Palette(Resources.Heatmap_pal); //mxd
+				ApplyUserColors();
+			}
+			return palettes;
+		}
+
+		// This applies user-defined appearance colors to the palettes
+		private void ApplyUserColors()
+		{
+			//mxd
+			if(palettes == null)
+			{
+				GetPalettes();
+				return;
+			}
+			
+			// Override special palette indices with user-defined colors
+			foreach(Palette p in palettes) p.SetColor(Tile.POINT_VOID_B, General.Colors.Background.WithAlpha(0).ToInt());
+		}
+
+		// This returns a unique temp filename
+		public static string MakeTempFilename(string extension)
+		{
+			string filename;
+
+			do
+			{
+				//mxd. Generate a filename
+				filename = Path.Combine(General.TempPath, MurmurHash2.Hash(DateTime.Now.Ticks.ToString(CultureInfo.InvariantCulture)) + extension);
+			}
+			// Continue while file is not unique
+			while(File.Exists(filename) || Directory.Exists(filename));
+
+			// Return the filename
+			return filename;
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/VisplaneExplorer/InterfaceForm.Designer.cs b/Source/Plugins/VisplaneExplorer/InterfaceForm.Designer.cs
new file mode 100644
index 0000000..77b46b3
--- /dev/null
+++ b/Source/Plugins/VisplaneExplorer/InterfaceForm.Designer.cs
@@ -0,0 +1,174 @@
+namespace CodeImp.DoomBuilder.Plugins.VisplaneExplorer
+{
+	partial class InterfaceForm
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.components = new System.ComponentModel.Container();
+			this.toolstrip = new System.Windows.Forms.ToolStrip();
+			this.statsbutton = new System.Windows.Forms.ToolStripDropDownButton();
+			this.vpstats = new System.Windows.Forms.ToolStripMenuItem();
+			this.dsstats = new System.Windows.Forms.ToolStripMenuItem();
+			this.ssstats = new System.Windows.Forms.ToolStripMenuItem();
+			this.opstats = new System.Windows.Forms.ToolStripMenuItem();
+			this.separator = new System.Windows.Forms.ToolStripSeparator();
+			this.cbopendoors = new CodeImp.DoomBuilder.Controls.ToolStripCheckBox();
+			this.cbheatmap = new CodeImp.DoomBuilder.Controls.ToolStripCheckBox();
+			this.tooltip = new System.Windows.Forms.ToolTip(this.components);
+			this.toolstrip.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// toolstrip
+			// 
+			this.toolstrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.statsbutton,
+            this.separator,
+            this.cbopendoors,
+            this.cbheatmap});
+			this.toolstrip.Location = new System.Drawing.Point(0, 0);
+			this.toolstrip.Name = "toolstrip";
+			this.toolstrip.Size = new System.Drawing.Size(465, 25);
+			this.toolstrip.TabIndex = 0;
+			// 
+			// statsbutton
+			// 
+			this.statsbutton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			this.statsbutton.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.vpstats,
+            this.dsstats,
+            this.ssstats,
+            this.opstats});
+			this.statsbutton.Image = global::CodeImp.DoomBuilder.Plugins.VisplaneExplorer.Properties.Resources.Visplanes;
+			this.statsbutton.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.statsbutton.Name = "statsbutton";
+			this.statsbutton.Size = new System.Drawing.Size(29, 22);
+			this.statsbutton.ToolTipText = "Statistics to view";
+			// 
+			// vpstats
+			// 
+			this.vpstats.Checked = true;
+			this.vpstats.CheckState = System.Windows.Forms.CheckState.Checked;
+			this.vpstats.Image = global::CodeImp.DoomBuilder.Plugins.VisplaneExplorer.Properties.Resources.Visplanes;
+			this.vpstats.Name = "vpstats";
+			this.vpstats.Size = new System.Drawing.Size(125, 22);
+			this.vpstats.Tag = "0";
+			this.vpstats.Text = "Visplanes";
+			this.vpstats.Click += new System.EventHandler(this.stats_Click);
+			// 
+			// dsstats
+			// 
+			this.dsstats.Image = global::CodeImp.DoomBuilder.Plugins.VisplaneExplorer.Properties.Resources.Drawsegs;
+			this.dsstats.Name = "dsstats";
+			this.dsstats.Size = new System.Drawing.Size(125, 22);
+			this.dsstats.Tag = "1";
+			this.dsstats.Text = "Drawsegs";
+			this.dsstats.Click += new System.EventHandler(this.stats_Click);
+			// 
+			// ssstats
+			// 
+			this.ssstats.Image = global::CodeImp.DoomBuilder.Plugins.VisplaneExplorer.Properties.Resources.Solidsegs;
+			this.ssstats.Name = "ssstats";
+			this.ssstats.Size = new System.Drawing.Size(125, 22);
+			this.ssstats.Tag = "2";
+			this.ssstats.Text = "Solidsegs";
+			this.ssstats.Click += new System.EventHandler(this.stats_Click);
+			// 
+			// opstats
+			// 
+			this.opstats.Image = global::CodeImp.DoomBuilder.Plugins.VisplaneExplorer.Properties.Resources.Openings;
+			this.opstats.Name = "opstats";
+			this.opstats.Size = new System.Drawing.Size(125, 22);
+			this.opstats.Tag = "3";
+			this.opstats.Text = "Openings";
+			this.opstats.Click += new System.EventHandler(this.stats_Click);
+			// 
+			// separator
+			// 
+			this.separator.Name = "separator";
+			this.separator.Size = new System.Drawing.Size(6, 25);
+			// 
+			// cbopendoors
+			// 
+			this.cbopendoors.Checked = false;
+			this.cbopendoors.Margin = new System.Windows.Forms.Padding(12, 1, 0, 2);
+			this.cbopendoors.Name = "cbopendoors";
+			this.cbopendoors.Size = new System.Drawing.Size(89, 22);
+			this.cbopendoors.Text = "Open Doors";
+			this.cbopendoors.Click += new System.EventHandler(this.cbopendoors_Click);
+			// 
+			// cbheatmap
+			// 
+			this.cbheatmap.Checked = false;
+			this.cbheatmap.Name = "cbheatmap";
+			this.cbheatmap.Size = new System.Drawing.Size(88, 22);
+			this.cbheatmap.Text = "Heat Colors";
+			this.cbheatmap.Click += new System.EventHandler(this.cbheatmap_Click);
+			// 
+			// tooltip
+			// 
+			this.tooltip.AutomaticDelay = 1;
+			this.tooltip.AutoPopDelay = 1000;
+			this.tooltip.InitialDelay = 1;
+			this.tooltip.ReshowDelay = 0;
+			this.tooltip.ShowAlways = true;
+			// 
+			// InterfaceForm
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.ClientSize = new System.Drawing.Size(465, 273);
+			this.Controls.Add(this.toolstrip);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "InterfaceForm";
+			this.Opacity = 1;
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.Text = "InterfaceForm";
+			this.toolstrip.ResumeLayout(false);
+			this.toolstrip.PerformLayout();
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.ToolStrip toolstrip;
+		private System.Windows.Forms.ToolStripDropDownButton statsbutton;
+		private System.Windows.Forms.ToolStripMenuItem vpstats;
+		private System.Windows.Forms.ToolStripMenuItem dsstats;
+		private System.Windows.Forms.ToolStripMenuItem ssstats;
+		private System.Windows.Forms.ToolStripMenuItem opstats;
+		private System.Windows.Forms.ToolTip tooltip;
+		private CodeImp.DoomBuilder.Controls.ToolStripCheckBox cbopendoors;
+		private CodeImp.DoomBuilder.Controls.ToolStripCheckBox cbheatmap;
+		private System.Windows.Forms.ToolStripSeparator separator;
+
+	}
+}
\ No newline at end of file
diff --git a/Source/Plugins/VisplaneExplorer/InterfaceForm.cs b/Source/Plugins/VisplaneExplorer/InterfaceForm.cs
new file mode 100644
index 0000000..c9e3c3a
--- /dev/null
+++ b/Source/Plugins/VisplaneExplorer/InterfaceForm.cs
@@ -0,0 +1,125 @@
+#region === Copyright (c) 2010 Pascal van der Heiden ===
+
+using System;
+using System.Drawing;
+using System.Globalization;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Windows;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Plugins.VisplaneExplorer
+{
+	public partial class InterfaceForm : DelayedForm
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		private ViewStats viewstats;
+		private static bool opendoors; //mxd
+		private static bool showheatmap; //mxd
+		private Point oldttposition;
+
+		#endregion
+
+		#region ================== Properties
+
+		internal ViewStats ViewStats { get { return viewstats; } }
+		internal bool OpenDoors { get { return opendoors; } } //mxd
+		internal bool ShowHeatmap { get { return showheatmap; } } //mxd
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		// Constructor
+		public InterfaceForm()
+		{
+			InitializeComponent();
+			cbopendoors.Checked = opendoors; //mxd
+			cbheatmap.Checked = showheatmap; //mxd
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// This adds the buttons to the toolbar
+		public void AddToInterface()
+		{
+			General.Interface.AddButton(statsbutton);
+			General.Interface.AddButton(separator); //mxd
+			General.Interface.AddButton(cbopendoors); //mxd
+			General.Interface.AddButton(cbheatmap); //mxd
+		}
+
+		// This removes the buttons from the toolbar
+		public void RemoveFromInterface()
+		{
+			General.Interface.RemoveButton(cbheatmap); //mxd
+			General.Interface.RemoveButton(cbopendoors); //mxd
+			General.Interface.RemoveButton(separator); //mxd
+			General.Interface.RemoveButton(statsbutton);
+		}
+
+		// This shows a tooltip
+		public void ShowTooltip(string text, Point p)
+		{
+			Point sp = General.Interface.Display.PointToScreen(p);
+			Point fp = (General.Interface as Form).Location;
+			Point tp = new Point(sp.X - fp.X, sp.Y - fp.Y);
+
+			if(oldttposition != tp)
+			{
+				tooltip.Show(text, General.Interface, tp);
+				oldttposition = tp;
+			}
+		}
+
+		// This hides the tooltip
+		public void HideTooltip()
+		{
+			tooltip.Hide(General.Interface);
+		}
+
+		#endregion
+
+		#region ================== Events
+
+		// Selecting a type of stats to view
+		private void stats_Click(object sender, EventArgs e)
+		{
+			foreach(ToolStripMenuItem i in statsbutton.DropDownItems)
+				i.Checked = false;
+			
+			ToolStripMenuItem item = (ToolStripMenuItem)sender;
+			viewstats = (ViewStats)int.Parse(item.Tag.ToString(), CultureInfo.InvariantCulture);
+			item.Checked = true;
+			statsbutton.Image = item.Image;
+
+			General.Interface.RedrawDisplay();
+		}
+
+		//mxd
+		private void cbheatmap_Click(object sender, EventArgs e)
+		{
+			showheatmap = cbheatmap.Checked;
+			General.Interface.RedrawDisplay();
+		}
+
+		//mxd
+		private void cbopendoors_Click(object sender, EventArgs e)
+		{
+			opendoors = cbopendoors.Checked;
+			
+			// Restart processing 
+			BuilderPlug.VPO.Restart();
+			General.Interface.RedrawDisplay();
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/VisplaneExplorer/InterfaceForm.resx b/Source/Plugins/VisplaneExplorer/InterfaceForm.resx
new file mode 100644
index 0000000..e37dc15
--- /dev/null
+++ b/Source/Plugins/VisplaneExplorer/InterfaceForm.resx
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="toolstrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>109, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/VisplaneExplorer/NearestLineBlockmap.cs b/Source/Plugins/VisplaneExplorer/NearestLineBlockmap.cs
new file mode 100644
index 0000000..d443b1f
--- /dev/null
+++ b/Source/Plugins/VisplaneExplorer/NearestLineBlockmap.cs
@@ -0,0 +1,38 @@
+#region === Copyright (c) 2010 Pascal van der Heiden ===
+
+using System.Collections.Generic;
+using System.Drawing;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Map;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Plugins.VisplaneExplorer
+{
+	internal sealed class NearestLineBlockmap : BlockMap<BlockEntry>
+	{
+		// Constructor
+		public NearestLineBlockmap(RectangleF range) : base(range)
+		{
+			List<Linedef> singlesided = new List<Linedef>(General.Map.Map.Linedefs.Count);
+			foreach(Linedef ld in General.Map.Map.Linedefs)
+				if(ld.Back == null) singlesided.Add(ld);
+			AddLinedefsSet(singlesided);
+
+			// Blocks that do not have any linedefs in them must get the nearest line in them!
+			for(int x = 0; x < size.Width; x++)
+			{
+				for(int y = 0; y < size.Height; y++)
+				{
+					BlockEntry be = blockmap[x, y];
+					if(be.Lines.Count == 0)
+					{
+						Vector2D bc = GetBlockCenter(new Point(x, y));
+						Linedef ld = MapSet.NearestLinedef(singlesided, bc);
+						be.Lines.Add(ld);
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/Source/Plugins/VisplaneExplorer/Palette.cs b/Source/Plugins/VisplaneExplorer/Palette.cs
new file mode 100644
index 0000000..08bc28a
--- /dev/null
+++ b/Source/Plugins/VisplaneExplorer/Palette.cs
@@ -0,0 +1,32 @@
+#region === Copyright (c) 2010 Pascal van der Heiden ===
+
+using System.Drawing;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Plugins.VisplaneExplorer
+{
+	internal class Palette
+	{
+		// Members
+		private readonly int[] colors;
+
+		// Properties
+		public int[] Colors { get { return colors; } }
+
+		// Constructor
+		public Palette(Bitmap bmp)
+		{
+			// Initialize
+			colors = new int[bmp.Size.Width];
+			for(int x = 0; x < bmp.Size.Width; x++)
+				colors[x] = bmp.GetPixel(x, 0).ToArgb();
+		}
+
+		// This overrides a color
+		public void SetColor(int index, int color)
+		{
+			colors[index] = color;
+		}
+	}
+}
diff --git a/Source/Plugins/VisplaneExplorer/PointData.cs b/Source/Plugins/VisplaneExplorer/PointData.cs
new file mode 100644
index 0000000..2e82c1c
--- /dev/null
+++ b/Source/Plugins/VisplaneExplorer/PointData.cs
@@ -0,0 +1,16 @@
+#region === Copyright (c) 2010 Pascal van der Heiden ===
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Plugins.VisplaneExplorer
+{
+	internal struct PointData
+	{
+		public TilePoint point;
+		public PointResult result;
+		public int visplanes;
+		public int drawsegs;
+		public int solidsegs;
+		public int openings;
+	}
+}
diff --git a/Source/Plugins/VisplaneExplorer/PointResult.cs b/Source/Plugins/VisplaneExplorer/PointResult.cs
new file mode 100644
index 0000000..3c6cc65
--- /dev/null
+++ b/Source/Plugins/VisplaneExplorer/PointResult.cs
@@ -0,0 +1,14 @@
+#region === Copyright (c) 2010 Pascal van der Heiden ===
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Plugins.VisplaneExplorer
+{
+	internal enum PointResult : int
+	{
+		OK = 0,
+		BadZ = -1,
+		Void = -2,
+		Overflow = -3,
+	}
+}
diff --git a/Source/Plugins/VisplaneExplorer/Properties/AssemblyInfo.cs b/Source/Plugins/VisplaneExplorer/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..8f48b96
--- /dev/null
+++ b/Source/Plugins/VisplaneExplorer/Properties/AssemblyInfo.cs
@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("VisplaneExplorer")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("CodeImp")]
+[assembly: AssemblyProduct("Doom Builder")]
+[assembly: AssemblyCopyright("Copyright ©  2012")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("323a480c-22f6-4bb0-9b3b-20aa547fb1bc")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Source/Plugins/VisplaneExplorer/Properties/Resources.Designer.cs b/Source/Plugins/VisplaneExplorer/Properties/Resources.Designer.cs
new file mode 100644
index 0000000..b3e17b1
--- /dev/null
+++ b/Source/Plugins/VisplaneExplorer/Properties/Resources.Designer.cs
@@ -0,0 +1,153 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:4.0.30319.42000
+//
+//     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace CodeImp.DoomBuilder.Plugins.VisplaneExplorer.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
+    /// </summary>
+    // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
+    // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
+    // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
+    // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("CodeImp.DoomBuilder.Plugins.VisplaneExplorer.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
+        ///   Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Drawsegs {
+            get {
+                object obj = ResourceManager.GetObject("Drawsegs", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Drawsegs_pal {
+            get {
+                object obj = ResourceManager.GetObject("Drawsegs_pal", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Heatmap_pal {
+            get {
+                object obj = ResourceManager.GetObject("Heatmap_pal", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Openings {
+            get {
+                object obj = ResourceManager.GetObject("Openings", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Openings_pal {
+            get {
+                object obj = ResourceManager.GetObject("Openings_pal", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Solidsegs {
+            get {
+                object obj = ResourceManager.GetObject("Solidsegs", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Solidsegs_pal {
+            get {
+                object obj = ResourceManager.GetObject("Solidsegs_pal", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Visplanes {
+            get {
+                object obj = ResourceManager.GetObject("Visplanes", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Visplanes_pal {
+            get {
+                object obj = ResourceManager.GetObject("Visplanes_pal", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+    }
+}
diff --git a/Source/Plugins/VisplaneExplorer/Properties/Resources.resx b/Source/Plugins/VisplaneExplorer/Properties/Resources.resx
new file mode 100644
index 0000000..8da2a08
--- /dev/null
+++ b/Source/Plugins/VisplaneExplorer/Properties/Resources.resx
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="Solidsegs" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Solidsegs.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Drawsegs" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Drawsegs.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Visplanes" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Visplanes.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Openings" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Openings.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Drawsegs_pal" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Drawsegs_pal.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Openings_pal" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Openings_pal.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Solidsegs_pal" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Solidsegs_pal.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Visplanes_pal" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Visplanes_pal.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Heatmap_pal" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Heatmap_pal.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/VisplaneExplorer/Resources/Actions.cfg b/Source/Plugins/VisplaneExplorer/Resources/Actions.cfg
new file mode 100644
index 0000000..eb62d03
--- /dev/null
+++ b/Source/Plugins/VisplaneExplorer/Resources/Actions.cfg
@@ -0,0 +1,34 @@
+
+//
+// This file defines which actions there are, what description they have and
+// some behaviour options. The Doom Builder core will bind to these actions
+// with delegates (function pointers) where you use the BeginAction and
+// EndAction attributes. This file must be named Actions.cfg and must be
+// included in the plugin project as "Embedded Resource".
+//
+
+//
+// Options:
+//
+// allowkeys:       Allows the user to bind standard keys to this action.
+// allowmouse:      Allows the user to bind mouse buttons to this action.
+// allowscroll:     Allows the user to bind the scrollwheel to this action.
+// disregardshift:  This action will trigger regardless if Shift or Control is used.
+// repeat:          BeginAction will be called for automatic key repetition.
+// default:         Default key is only used when the action is loaded for the first
+//                  time and the default key is not used by any other action.
+//
+// allowkeys and allowmouse are true by default, the others are false by default.
+//
+
+
+visplaneexplorermode
+{
+	title = "Visplane Explorer Mode";
+	category = "modes";
+	description = "Switches to the Visplane Explorer viewing mode.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = false;
+}
+
diff --git a/Source/Plugins/VisplaneExplorer/Resources/Drawsegs.png b/Source/Plugins/VisplaneExplorer/Resources/Drawsegs.png
new file mode 100644
index 0000000..1d2cb0f
Binary files /dev/null and b/Source/Plugins/VisplaneExplorer/Resources/Drawsegs.png differ
diff --git a/Source/Plugins/VisplaneExplorer/Resources/Drawsegs_pal.png b/Source/Plugins/VisplaneExplorer/Resources/Drawsegs_pal.png
new file mode 100644
index 0000000..6928971
Binary files /dev/null and b/Source/Plugins/VisplaneExplorer/Resources/Drawsegs_pal.png differ
diff --git a/Source/Plugins/VisplaneExplorer/Resources/Gauge.ico b/Source/Plugins/VisplaneExplorer/Resources/Gauge.ico
new file mode 100644
index 0000000..508ca5e
Binary files /dev/null and b/Source/Plugins/VisplaneExplorer/Resources/Gauge.ico differ
diff --git a/Source/Plugins/VisplaneExplorer/Resources/Gauge.png b/Source/Plugins/VisplaneExplorer/Resources/Gauge.png
new file mode 100644
index 0000000..4e286ad
Binary files /dev/null and b/Source/Plugins/VisplaneExplorer/Resources/Gauge.png differ
diff --git a/Source/Plugins/VisplaneExplorer/Resources/Gauge_large.ico b/Source/Plugins/VisplaneExplorer/Resources/Gauge_large.ico
new file mode 100644
index 0000000..eaa722a
Binary files /dev/null and b/Source/Plugins/VisplaneExplorer/Resources/Gauge_large.ico differ
diff --git a/Source/Plugins/VisplaneExplorer/Resources/Heatmap_pal.png b/Source/Plugins/VisplaneExplorer/Resources/Heatmap_pal.png
new file mode 100644
index 0000000..27b57a0
Binary files /dev/null and b/Source/Plugins/VisplaneExplorer/Resources/Heatmap_pal.png differ
diff --git a/Source/Plugins/VisplaneExplorer/Resources/Openings.png b/Source/Plugins/VisplaneExplorer/Resources/Openings.png
new file mode 100644
index 0000000..203d86a
Binary files /dev/null and b/Source/Plugins/VisplaneExplorer/Resources/Openings.png differ
diff --git a/Source/Plugins/VisplaneExplorer/Resources/Openings_pal.png b/Source/Plugins/VisplaneExplorer/Resources/Openings_pal.png
new file mode 100644
index 0000000..2ea31d7
Binary files /dev/null and b/Source/Plugins/VisplaneExplorer/Resources/Openings_pal.png differ
diff --git a/Source/Plugins/VisplaneExplorer/Resources/Solidsegs.png b/Source/Plugins/VisplaneExplorer/Resources/Solidsegs.png
new file mode 100644
index 0000000..8a2c6b6
Binary files /dev/null and b/Source/Plugins/VisplaneExplorer/Resources/Solidsegs.png differ
diff --git a/Source/Plugins/VisplaneExplorer/Resources/Solidsegs_pal.png b/Source/Plugins/VisplaneExplorer/Resources/Solidsegs_pal.png
new file mode 100644
index 0000000..6e031e0
Binary files /dev/null and b/Source/Plugins/VisplaneExplorer/Resources/Solidsegs_pal.png differ
diff --git a/Source/Plugins/VisplaneExplorer/Resources/Visplanes.png b/Source/Plugins/VisplaneExplorer/Resources/Visplanes.png
new file mode 100644
index 0000000..b028752
Binary files /dev/null and b/Source/Plugins/VisplaneExplorer/Resources/Visplanes.png differ
diff --git a/Source/Plugins/VisplaneExplorer/Resources/Visplanes_pal.png b/Source/Plugins/VisplaneExplorer/Resources/Visplanes_pal.png
new file mode 100644
index 0000000..ad85f8e
Binary files /dev/null and b/Source/Plugins/VisplaneExplorer/Resources/Visplanes_pal.png differ
diff --git a/Source/Plugins/VisplaneExplorer/Resources/vpo.dll b/Source/Plugins/VisplaneExplorer/Resources/vpo.dll
new file mode 100644
index 0000000..ec61d8e
Binary files /dev/null and b/Source/Plugins/VisplaneExplorer/Resources/vpo.dll differ
diff --git a/Source/Plugins/VisplaneExplorer/Tile.cs b/Source/Plugins/VisplaneExplorer/Tile.cs
new file mode 100644
index 0000000..61b6d90
--- /dev/null
+++ b/Source/Plugins/VisplaneExplorer/Tile.cs
@@ -0,0 +1,175 @@
+#region === Copyright (c) 2010 Pascal van der Heiden ===
+
+using System;
+using System.Drawing;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Plugins.VisplaneExplorer
+{
+	// This is a 64x64 tile in map space which holds the point data results.
+	internal class Tile
+	{
+		// Constants
+		public const int TILE_SIZE = 64;
+		public static readonly int[] STATS_COMPRESSOR = new[] { 1, 2, 1, 160 };
+		public static readonly int[] STATS_LIMITS = new[] { 128, 256, 32, 320 * 64 };
+		public const uint POINT_MAXRANGE = 254;
+		public const uint POINT_OVERFLOW = 0xFEFEFEFE;
+		public const uint POINT_VOID = 0xFFFFFFFF;
+		public const byte POINT_OVERFLOW_B = 0xFE;
+		public const byte POINT_VOID_B = 0xFF;
+		
+		// Members
+		private Point position;
+		private uint[][] points;
+		private int nextindex;
+		
+		// Properties
+		public Point Position { get { return position; } }
+		public bool IsComplete { get { return nextindex == (TILE_SIZE * TILE_SIZE); } }
+
+		// Constructor
+		public Tile(Point lefttoppos)
+		{
+			// Make the jagged array
+			// I use a jagged array because, allegedly, it performs better than a multidimensional array.
+			points = new uint[TILE_SIZE][];
+			for(int y = 0; y < TILE_SIZE; y++)
+				points[y] = new uint[TILE_SIZE];
+			
+			position = lefttoppos;
+		}
+
+		// This receives a processed point
+		public void StorePointData(PointData pd)
+		{
+			uint t;
+			switch(pd.result)
+			{
+				case PointResult.OK:
+					uint vp = (uint)Math.Min((pd.visplanes + (STATS_COMPRESSOR[(int)ViewStats.Visplanes] - 1)) / STATS_COMPRESSOR[(int)ViewStats.Visplanes], POINT_MAXRANGE);
+					uint ds = (uint)Math.Min((pd.drawsegs + (STATS_COMPRESSOR[(int)ViewStats.Drawsegs] - 1)) / STATS_COMPRESSOR[(int)ViewStats.Drawsegs], POINT_MAXRANGE);
+					uint ss = (uint)Math.Min((pd.solidsegs + (STATS_COMPRESSOR[(int)ViewStats.Solidsegs] - 1)) / STATS_COMPRESSOR[(int)ViewStats.Solidsegs], POINT_MAXRANGE);
+					uint op = (uint)Math.Min((pd.openings + (STATS_COMPRESSOR[(int)ViewStats.Openings] - 1)) / STATS_COMPRESSOR[(int)ViewStats.Openings], POINT_MAXRANGE);
+					t = MakePointValue(vp, ds, ss, op);
+					break;
+
+				case PointResult.BadZ:
+					t = MakePointValue(1, 0, 0, 0);
+					break;
+					
+				case PointResult.Void:
+					t = POINT_VOID;
+					break;
+
+				case PointResult.Overflow:
+				default:
+					t = POINT_OVERFLOW;
+					break;
+			}
+
+			FillPoints(ref pd.point, t);
+		}
+
+		// This fills points with the given tile data over the specified granularity
+		private void FillPoints(ref TilePoint p, uint t)
+		{
+			int xs = p.x - position.X;
+			int ys = p.y - position.Y;
+			int xe = xs + p.granularity;
+			int ye = ys + p.granularity;
+			for(int x = xs; x < xe; x++)
+				for(int y = ys; y < ye; y++)
+					points[y][x] = t;
+		}
+
+		// This composes point values
+		private static uint MakePointValue(uint vp, uint ds, uint ss, uint op)
+		{
+			unchecked
+			{
+				return vp + (ds << 8) + (ss << 16) + (op << 24);
+			}
+		}
+
+		// This returns a point value
+		public byte GetPointByte(int x, int y, int stat)
+		{
+			unchecked
+			{
+				uint v = points[y][x];
+				return (byte)((v >> (stat * 8)) & 0xFF);
+			}
+		}
+		
+		// This returns a point value
+		public int GetPointValue(int x, int y, int stat)
+		{
+			byte b = GetPointByte(x, y, stat);
+			return b * STATS_COMPRESSOR[stat];
+		}
+
+		// This returns the next point to process
+		public TilePoint GetNextPoint()
+		{
+			TilePoint p = PointByIndex(nextindex++);
+			p.x += position.X;
+			p.y += position.Y;
+			return p;
+		}
+
+		// Returns a position by index
+		private static TilePoint PointByIndex(int index)
+		{
+			#if DEBUG
+			if(index > (TILE_SIZE * TILE_SIZE))
+				throw new IndexOutOfRangeException();
+			#endif
+
+			TilePoint p;
+			
+			// Would be nicer if this could be done without branching or looping...
+			if(index == 0) p.granularity = 64;
+			else if(index < 4) p.granularity = 32;
+			else if(index < 16) p.granularity = 16;
+			else if(index < 64) p.granularity = 8;
+			else if(index < 256) p.granularity = 4;
+			else if(index < 1024) p.granularity = 2;
+			else p.granularity = 1;
+			
+			// this is a "butterfly" style sequence, which begins like:
+			//    ( 0  0)  (32 32)  ( 0 32)  (32  0)
+			//    (16 16)  (48 48)  (16 48)  (48 16)
+			//    ( 0 16)  (32 48)  ( 0 48)  (32 16)
+			//    (16  0)  (48 32)  (16 32)  (48  0)
+			//    ( 8  8)  (40 40)  ( 8 40)  (40  8)
+			//    etc....
+
+			p.x = (index & 1) << 5;
+			p.y = (((index >> 1) ^ index) & 1) << 5;
+
+			index >>= 2;
+			p.x += (index & 1) << 4;
+			p.y += (((index >> 1) ^ index) & 1) << 4;
+
+			index >>= 2;
+			p.x |= (index & 1) << 3;
+			p.y |= (((index >> 1) ^ index) & 1) << 3;
+
+			index >>= 2;
+			p.x |= (index & 1) << 2;
+			p.y |= (((index >> 1) ^ index) & 1) << 2;
+
+			index >>= 2;
+			p.x |= (index & 1) << 1;
+			p.y |= (((index >> 1) ^ index) & 1) << 1;
+
+			index >>= 2;
+			p.x |= index & 1;
+			p.y |= ((index >> 1) ^ index) & 1;
+
+			return p;
+		}
+	}
+}
diff --git a/Source/Plugins/VisplaneExplorer/TilePoint.cs b/Source/Plugins/VisplaneExplorer/TilePoint.cs
new file mode 100644
index 0000000..ea37ea3
--- /dev/null
+++ b/Source/Plugins/VisplaneExplorer/TilePoint.cs
@@ -0,0 +1,13 @@
+#region === Copyright (c) 2010 Pascal van der Heiden ===
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Plugins.VisplaneExplorer
+{
+	internal struct TilePoint
+	{
+		public int x;
+		public int y;
+		public byte granularity;
+	}
+}
diff --git a/Source/Plugins/VisplaneExplorer/VPOManager.cs b/Source/Plugins/VisplaneExplorer/VPOManager.cs
new file mode 100644
index 0000000..f98e9f3
--- /dev/null
+++ b/Source/Plugins/VisplaneExplorer/VPOManager.cs
@@ -0,0 +1,307 @@
+#region === Copyright (c) 2010 Pascal van der Heiden ===
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.IO;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Threading;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Plugins.VisplaneExplorer
+{
+	internal class VPOManager : IDisposable
+	{
+		#region ================== Constants
+
+		public const int POINTS_PER_ITERATION = 100;
+		private const int EXPECTED_RESULTS_BUFFER = 200000;
+
+		private readonly int[] TEST_ANGLES = new[] { 0, 90, 180, 270, 45, 135, 225, 315 /*, 22, 67, 112, 157, 202, 247, 292, 337 */ };
+		private const int TEST_HEIGHT = 41 + 8;
+		
+		#endregion
+
+		#region ================== APIs
+
+		[DllImport("kernel32.dll", SetLastError = true)]
+		private static extern IntPtr LoadLibrary(string filename);
+
+		[DllImport("kernel32.dll")]
+		private static extern IntPtr GetProcAddress(IntPtr modulehandle, string procedurename);
+
+		[DllImport("kernel32.dll")]
+		private static extern bool FreeLibrary(IntPtr modulehandle);
+		
+		#endregion
+
+		#region ================== Delegates
+
+		[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+		private delegate string VPO_GetError();
+
+		[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+		private delegate int VPO_LoadWAD(string filename);
+
+		[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+		private delegate int VPO_OpenMap(string mapname, ref bool isHexen);
+
+		[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+		private delegate void VPO_FreeWAD();
+
+		[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+		private delegate void VPO_CloseMap();
+
+		[UnmanagedFunctionPointer(CallingConvention.Cdecl)] //mxd
+		private delegate void VPO_OpenDoorSectors(int dir);
+
+		[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+		private delegate int VPO_TestSpot(int x, int y, int dz, int angle,
+			ref int visplanes, ref int drawsegs, ref int openings, ref int solidsegs);
+
+		#endregion
+
+		#region ================== Variables
+
+		// Main objects
+		private readonly string[] tempfiles;
+		private IntPtr[] dlls;
+		private Thread[] threads;
+
+		// Map to load
+		private string filename;
+		private string mapname;
+
+		// Input and output queue (both require a lock on 'points' !)
+		private readonly Queue<TilePoint> points = new Queue<TilePoint>(EXPECTED_RESULTS_BUFFER);
+		private readonly Queue<PointData> results = new Queue<PointData>(EXPECTED_RESULTS_BUFFER);
+		
+		#endregion
+
+		#region ================== Properties
+
+		public int NumThreads { get { return Environment.ProcessorCount; } }
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+		
+		// Constructor
+		public VPOManager()
+		{
+			// Load a DLL for each thread
+			dlls = new IntPtr[NumThreads];
+			tempfiles = new string[NumThreads];
+			
+			// We must write the DLL file with a unique name for every thread,
+			// because LoadLibrary will share loaded libraries with the same
+			// names and LoadLibraryEx does not have a flag to force loading
+			// it multiple times.
+			Assembly thisasm = Assembly.GetExecutingAssembly();
+			Stream dllstream = thisasm.GetManifestResourceStream("CodeImp.DoomBuilder.Plugins.VisplaneExplorer.Resources.vpo.dll");
+			dllstream.Seek(0, SeekOrigin.Begin);
+			byte[] dllbytes = new byte[dllstream.Length];
+			dllstream.Read(dllbytes, 0, dllbytes.Length);
+			for(int i = 0; i < dlls.Length; i++)
+			{
+				// Write file with unique filename
+				tempfiles[i] = BuilderPlug.MakeTempFilename(".dll");
+				File.WriteAllBytes(tempfiles[i], dllbytes);
+				
+				// Load it
+				dlls[i] = LoadLibrary(tempfiles[i]);
+				if(dlls[i] == IntPtr.Zero)
+				{
+					int error = Marshal.GetLastWin32Error(); //mxd
+					throw new Exception("Error " + error + " while loading vpo.dll: " + new Win32Exception(error).Message);
+				}
+			}
+		}
+
+		// Disposer
+		public void Dispose()
+		{
+			if(threads != null) Stop();
+			
+			if(dlls != null)
+			{
+				for(int i = 0; i < dlls.Length; i++)
+				{
+					FreeLibrary(dlls[i]);
+					File.Delete(tempfiles[i]);
+				}
+				dlls = null;
+			}
+		}
+		
+		#endregion
+
+		#region ================== Processing
+
+		// The thread!
+		private void ProcessingThread(object index)
+		{
+			// Get function pointers
+			//VPO_GetError GetError = (VPO_GetError)Marshal.GetDelegateForFunctionPointer(GetProcAddress(dlls[(int)index], "VPO_GetError"), typeof(VPO_GetError));
+			VPO_LoadWAD LoadWAD = (VPO_LoadWAD)Marshal.GetDelegateForFunctionPointer(GetProcAddress(dlls[(int)index], "VPO_LoadWAD"), typeof(VPO_LoadWAD));
+			VPO_OpenMap OpenMap = (VPO_OpenMap)Marshal.GetDelegateForFunctionPointer(GetProcAddress(dlls[(int)index], "VPO_OpenMap"), typeof(VPO_OpenMap));
+			VPO_FreeWAD FreeWAD = (VPO_FreeWAD)Marshal.GetDelegateForFunctionPointer(GetProcAddress(dlls[(int)index], "VPO_FreeWAD"), typeof(VPO_FreeWAD));
+			VPO_CloseMap CloseMap = (VPO_CloseMap)Marshal.GetDelegateForFunctionPointer(GetProcAddress(dlls[(int)index], "VPO_CloseMap"), typeof(VPO_CloseMap));
+			VPO_OpenDoorSectors OpenDoors = (VPO_OpenDoorSectors)Marshal.GetDelegateForFunctionPointer(GetProcAddress(dlls[(int)index], "VPO_OpenDoorSectors"), typeof(VPO_OpenDoorSectors)); //mxd
+			VPO_TestSpot TestSpot = (VPO_TestSpot)Marshal.GetDelegateForFunctionPointer(GetProcAddress(dlls[(int)index], "VPO_TestSpot"), typeof(VPO_TestSpot));
+
+			try
+			{
+				// Load the map
+				bool isHexen = General.Map.HEXEN;
+				if(LoadWAD(filename) != 0) throw new Exception("VPO is unable to read this file.");
+				if(OpenMap(mapname, ref isHexen) != 0) throw new Exception("VPO is unable to open this map.");
+				OpenDoors(BuilderPlug.InterfaceForm.OpenDoors ? 1 : -1); //mxd
+
+				// Processing
+				Queue<TilePoint> todo = new Queue<TilePoint>(POINTS_PER_ITERATION);
+				Queue<PointData> done = new Queue<PointData>(POINTS_PER_ITERATION);
+				while(true)
+				{
+					lock(points)
+					{
+						// Flush done points to the results
+						int numdone = done.Count;
+						for(int i = 0; i < numdone; i++)
+							results.Enqueue(done.Dequeue());
+						
+						// Get points from the waiting queue into my todo queue for processing
+						int numtodo = Math.Min(POINTS_PER_ITERATION, points.Count);
+						for(int i = 0; i < numtodo; i++)
+							todo.Enqueue(points.Dequeue());
+					}
+
+					// Don't keep locking!
+					if(todo.Count == 0)
+						Thread.Sleep(31);
+					
+					// Process the points
+					while(todo.Count > 0)
+					{
+						TilePoint p = todo.Dequeue();
+						PointData pd = new PointData();
+						pd.point = p;
+
+						for(int i = 0; i < TEST_ANGLES.Length; i++)
+						{
+							pd.result = (PointResult)TestSpot(p.x, p.y, TEST_HEIGHT, TEST_ANGLES[i],
+								ref pd.visplanes, ref pd.drawsegs, ref pd.openings, ref pd.solidsegs);
+						}
+
+						done.Enqueue(pd);
+					}
+				}
+			}
+			catch(ThreadInterruptedException)
+			{
+			}
+			finally
+			{
+				CloseMap();
+				FreeWAD();
+			}
+		}
+
+		#endregion
+
+		#region ================== Public Methods
+
+		// This loads a map
+		public void Start(string filename, string mapname)
+		{
+			this.filename = filename;
+			this.mapname = mapname;
+			results.Clear();
+			
+			// Start a thread on each core
+			threads = new Thread[dlls.Length];
+			for(int i = 0; i < threads.Length; i++)
+			{
+				threads[i] = new Thread(ProcessingThread);
+				threads[i].Priority = ThreadPriority.BelowNormal;
+				threads[i].Name = "Visplane Explorer " + i;
+				threads[i].Start(i);
+			}
+		}
+
+		// This frees the map
+		public void Stop()
+		{
+			if(threads != null)
+			{
+				lock(points)
+				{
+					// Stop all threads
+					for(int i = 0; i < threads.Length; i++)
+					{
+						threads[i].Interrupt();
+						threads[i].Join();
+					}
+					threads = null;
+					points.Clear();
+					results.Clear();
+				}
+			}
+		}
+
+		//mxd
+		internal void Restart() 
+		{
+			Stop();
+			Start(filename, mapname);
+		}
+
+		// This clears the list of enqueued points
+		public void ClearPoints()
+		{
+			lock(points)
+			{
+				points.Clear();
+			}
+		}
+
+		// This gives points to process and returns the total points left in the buffer
+		public int EnqueuePoints(IEnumerable<TilePoint> newpoints)
+		{
+			lock(points)
+			{
+				foreach(TilePoint p in newpoints)
+					points.Enqueue(p);
+				return points.Count;
+			}
+		}
+
+		// This fetches results (in 'data') and returns the number of points
+		// remaining to be processed.
+		public int DequeueResults(List<PointData> data)
+		{
+			lock(points)
+			{
+				int numresults = results.Count;
+				if(data.Capacity - data.Count < numresults)
+					data.Capacity = data.Count + numresults;
+				for(int i = 0; i < numresults; i++)
+					data.Add(results.Dequeue());
+				return points.Count;
+			}
+		}
+
+		// This returns the number of points left in the buffer
+		public int GetRemainingPoints()
+		{
+			lock(points)
+			{
+				return points.Count;
+			}
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/VisplaneExplorer/ViewStats.cs b/Source/Plugins/VisplaneExplorer/ViewStats.cs
new file mode 100644
index 0000000..1511e7b
--- /dev/null
+++ b/Source/Plugins/VisplaneExplorer/ViewStats.cs
@@ -0,0 +1,16 @@
+#region === Copyright (c) 2010 Pascal van der Heiden ===
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Plugins.VisplaneExplorer
+{
+	internal enum ViewStats
+	{
+		Visplanes,
+		Drawsegs,
+		Solidsegs,
+		Openings,
+		Heatmap, //mxd
+		NumStats
+	}
+}
diff --git a/Source/Plugins/VisplaneExplorer/VisplaneExplorer.csproj b/Source/Plugins/VisplaneExplorer/VisplaneExplorer.csproj
new file mode 100644
index 0000000..55a3b15
--- /dev/null
+++ b/Source/Plugins/VisplaneExplorer/VisplaneExplorer.csproj
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{CF670175-7099-4090-A330-EE25C7230139}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>CodeImp.DoomBuilder.Plugins.VisplaneExplorer</RootNamespace>
+    <AssemblyName>VisplaneExplorer</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\Build\Plugins\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\Build\Plugins\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug + Profiler|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\..\..\Build\Plugins\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;PROFILE</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release + Profiler|x86' ">
+    <OutputPath>..\..\..\Build\Plugins\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="BuilderPlug.cs" />
+    <Compile Include="InterfaceForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="InterfaceForm.Designer.cs">
+      <DependentUpon>InterfaceForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="NearestLineBlockmap.cs" />
+    <Compile Include="Palette.cs" />
+    <Compile Include="PointData.cs" />
+    <Compile Include="PointResult.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Tile.cs" />
+    <Compile Include="TilePoint.cs" />
+    <Compile Include="ViewStats.cs" />
+    <Compile Include="VisplaneExplorerMode.cs" />
+    <Compile Include="VPOManager.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\Actions.cfg" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Drawsegs.png" />
+    <None Include="Resources\Drawsegs_pal.png" />
+    <Content Include="Resources\Gauge.ico" />
+    <EmbeddedResource Include="InterfaceForm.resx">
+      <DependentUpon>InterfaceForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Resources\Gauge.png" />
+    <Content Include="Resources\Gauge_large.ico" />
+    <None Include="Resources\Heatmap_pal.png" />
+    <EmbeddedResource Include="Resources\vpo.dll" />
+    <None Include="Resources\Solidsegs_pal.png" />
+    <None Include="Resources\Openings_pal.png" />
+    <None Include="Resources\Visplanes_pal.png" />
+    <None Include="Resources\Openings.png" />
+    <None Include="Resources\Solidsegs.png" />
+    <None Include="Resources\Visplanes.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Core\Builder.csproj">
+      <Project>{818B3D10-F791-4C3F-9AF5-BB2D0079B63C}</Project>
+      <Name>Builder</Name>
+      <Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/Source/Plugins/VisplaneExplorer/VisplaneExplorerMode.cs b/Source/Plugins/VisplaneExplorer/VisplaneExplorerMode.cs
new file mode 100644
index 0000000..a790cd5
--- /dev/null
+++ b/Source/Plugins/VisplaneExplorer/VisplaneExplorerMode.cs
@@ -0,0 +1,483 @@
+#region === Copyright (c) 2010 Pascal van der Heiden ===
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.IO;
+using System.Runtime.InteropServices;
+using System.Windows.Forms;
+using CodeImp.DoomBuilder.Data;
+using CodeImp.DoomBuilder.Editing;
+using System.Drawing.Imaging;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Windows;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Plugins.VisplaneExplorer
+{
+	[EditMode(DisplayName = "Visplane Explorer",
+			  SwitchAction = "visplaneexplorermode",
+			  ButtonImage = "Gauge.png",
+			  ButtonOrder = 300,
+			  ButtonGroup = "002_tools",
+			  Volatile = true,
+			  UseByDefault = true,
+			  SupportedMapFormats = new[] { "DoomMapSetIO", "HexenMapSetIO" }, //mxd
+			  AllowCopyPaste = false)]
+	public class VisplaneExplorerMode : ClassicMode
+	{
+		#region ================== Constants
+
+		#endregion
+		
+		#region ================== APIs
+
+		[DllImport("kernel32.dll")]
+		static extern void RtlZeroMemory(IntPtr dst, int length);
+
+		#endregion
+
+		#region ================== Variables
+
+		// The image is the ImageData resource for Doom Builder to work with
+		private DynamicBitmapImage image;
+		
+		// This is the bitmap that we will be drawing on
+		private Bitmap canvas;
+		private ViewStats lastviewstats;
+		
+		// Temporary WAD file written for the vpo.dll library
+		private string tempfile;
+
+		// Rectangle around the map
+		private Rectangle mapbounds;
+
+		// 64x64 tiles in map space. These are discarded when outside view.
+		private Dictionary<Point, Tile> tiles = new Dictionary<Point, Tile>();
+
+		// Time when to do another update
+		private DateTime nextupdate;
+
+		// Are we processing?
+		private bool processingenabled;
+		
+		#endregion
+
+		#region ================== Properties
+
+		#endregion
+
+		#region ================== Constructor / Destructor
+
+		#endregion
+
+		#region ================== Methods
+
+		// This cleans up anything we used for this mode
+		private void CleanUp()
+		{
+			BuilderPlug.VPO.Stop();
+
+			if(processingenabled)
+			{
+				General.Interface.DisableProcessing();
+				processingenabled = false;
+			}
+			
+			if(!string.IsNullOrEmpty(tempfile))
+			{
+				File.Delete(tempfile);
+				tempfile = null;
+			}
+
+			if(image != null)
+			{
+				image.Dispose();
+				image = null;
+			}
+
+			if(canvas != null)
+			{
+				canvas.Dispose();
+				canvas = null;
+			}
+
+			tiles.Clear();
+			BuilderPlug.InterfaceForm.HideTooltip();
+			BuilderPlug.InterfaceForm.RemoveFromInterface();
+		}
+
+		// This returns the tile position for the given map coordinate
+		private static Point TileForPoint(float x, float y)
+		{
+			return new Point((int)Math.Floor(x / Tile.TILE_SIZE) * Tile.TILE_SIZE, (int)Math.Floor(y / Tile.TILE_SIZE) * Tile.TILE_SIZE);
+		}
+
+		// This draws all tiles on the image
+		// THIS MUST BE FAST! TOP PERFORMANCE REQUIRED!
+		private unsafe void RedrawAllTiles()
+		{
+			if(canvas == null) return;
+
+			// Determine viewport rectangle in map space
+			Vector2D mapleftbot = Renderer.DisplayToMap(new Vector2D(0f, 0f));
+			Vector2D maprighttop = Renderer.DisplayToMap(new Vector2D(General.Interface.Display.ClientSize.Width, General.Interface.Display.ClientSize.Height));
+			Rectangle mapviewrect = new Rectangle((int)mapleftbot.x - Tile.TILE_SIZE, (int)maprighttop.y - Tile.TILE_SIZE, (int)maprighttop.x - (int)mapleftbot.x + Tile.TILE_SIZE, (int)mapleftbot.y - (int)maprighttop.y + Tile.TILE_SIZE);
+
+			int viewstats = (int)BuilderPlug.InterfaceForm.ViewStats;
+			Palette pal = (BuilderPlug.InterfaceForm.ShowHeatmap ? BuilderPlug.Palettes[(int)ViewStats.Heatmap] : BuilderPlug.Palettes[viewstats]);
+
+			Size canvassize = canvas.Size;
+			BitmapData bd = canvas.LockBits(new Rectangle(0, 0, canvassize.Width, canvassize.Height), ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
+			RtlZeroMemory(bd.Scan0, bd.Width * bd.Height * 4);
+			int* p = (int*)bd.Scan0.ToPointer();
+
+			foreach(KeyValuePair<Point, Tile> t in tiles)
+			{
+				if(!mapviewrect.Contains(t.Key)) continue;
+				
+				// Map this tile to screen space
+				Vector2D lb = Renderer.MapToDisplay(new Vector2D(t.Value.Position.X, t.Value.Position.Y));
+				Vector2D rt = Renderer.MapToDisplay(new Vector2D(t.Value.Position.X + Tile.TILE_SIZE, t.Value.Position.Y + Tile.TILE_SIZE));
+
+				// Make sure the coordinates are aligned with canvas pixels
+				float x1 = (float)Math.Round(lb.x);
+				float x2 = (float)Math.Round(rt.x);
+				float y1 = (float)Math.Round(rt.y);
+				float y2 = (float)Math.Round(lb.y);
+
+				// Determine width and height of the screen space area for this tile
+				float w = x2 - x1;
+				float h = y2 - y1;
+				float winv = 1f / w;
+				float hinv = 1f / h;
+
+				// Loop ranges. These are relative to the left-top of the tile.
+				float sx = 0f;
+				float sy = 0f;
+				float ex = w;
+				float ey = h;
+				int screenx = (int)x1;
+				int screenystart = (int)y1;
+				
+				// Clipping the loop ranges against canvas boundary.
+				if(x1 < 0f) { sx = -x1; screenx = 0; }
+				if(y1 < 0f) { sy = -y1; screenystart = 0; }
+				if(x2 > bd.Width) ex = w - (x2 - bd.Width);
+				if(y2 > bd.Height) ey = h - (y2 - bd.Height);
+				
+				// Draw all pixels within this tile
+				for(float x = sx; x < ex; x++, screenx++)
+				{
+					int screeny = screenystart;
+					for(float y = sy; y < ey; y++, screeny++)
+					{
+						// Calculate the relative offset in map coordinates for this pixel
+						float ux = x * winv * Tile.TILE_SIZE;
+						float uy = y * hinv * Tile.TILE_SIZE;
+
+						// Get the data and apply the color
+						byte value = t.Value.GetPointByte((int)ux, Tile.TILE_SIZE - 1 - (int)uy, viewstats);
+						p[screeny * bd.Width + screenx] = pal.Colors[value];
+					}
+				}
+			}
+			
+			canvas.UnlockBits(bd);
+			image.UpdateTexture();
+		}
+
+		// This queues points for all current tiles
+		private void QueuePoints(int pointsleft)
+		{
+			// Determine viewport rectangle in map space
+			Vector2D mapleftbot = Renderer.DisplayToMap(new Vector2D(0f, 0f));
+			Vector2D maprighttop = Renderer.DisplayToMap(new Vector2D(General.Interface.Display.ClientSize.Width, General.Interface.Display.ClientSize.Height));
+			Rectangle mapviewrect = new Rectangle((int)mapleftbot.x - Tile.TILE_SIZE, (int)maprighttop.y - Tile.TILE_SIZE, (int)maprighttop.x - (int)mapleftbot.x + Tile.TILE_SIZE, (int)mapleftbot.y - (int)maprighttop.y + Tile.TILE_SIZE);
+			
+			while(pointsleft < (VPOManager.POINTS_PER_ITERATION * BuilderPlug.VPO.NumThreads * 5))
+			{
+				// Collect points from the tiles in the current view
+				List<TilePoint> newpoints = new List<TilePoint>(tiles.Count);
+				foreach(KeyValuePair<Point, Tile> t in tiles)
+					if((!t.Value.IsComplete) && (mapviewrect.Contains(t.Key))) newpoints.Add(t.Value.GetNextPoint());
+				
+				// If the current view is complete, try getting points from all tiles
+				if(newpoints.Count == 0)
+				{
+					foreach(KeyValuePair<Point, Tile> t in tiles)
+						if(!t.Value.IsComplete) newpoints.Add(t.Value.GetNextPoint());
+				}
+				
+				if(newpoints.Count == 0) break;
+				pointsleft = BuilderPlug.VPO.EnqueuePoints(newpoints);
+			}
+		}
+
+		// This updates the overlay
+		private void UpdateOverlay()
+		{
+			// We must redraw the tiles to the canvas when the stats to view has changed
+			if(lastviewstats != BuilderPlug.InterfaceForm.ViewStats)
+			{
+				RedrawAllTiles();
+				lastviewstats = BuilderPlug.InterfaceForm.ViewStats;
+			}
+			
+			// Render the overlay
+			if(renderer.StartOverlay(true))
+			{
+				// Render the canvas to screen
+				RectangleF r = new RectangleF(0, 0, canvas.Width, canvas.Height);
+				renderer.RenderRectangleFilled(r, PixelColor.FromColor(Color.White), false, image);
+
+				// Render any selection
+				if(selecting) RenderMultiSelection();
+
+				// Finish our rendering to this layer.
+				renderer.Finish();
+			}
+		}
+
+		#endregion
+
+		#region ================== Events
+
+		// Mode starts
+		public override void OnEngage()
+		{
+			Cursor.Current = Cursors.WaitCursor;
+			base.OnEngage();
+			General.Interface.DisplayStatus(StatusType.Busy, "Setting up test environment...");
+
+			CleanUp();
+
+			BuilderPlug.InterfaceForm.AddToInterface();
+			lastviewstats = BuilderPlug.InterfaceForm.ViewStats;
+
+			// Export the current map to a temporary WAD file
+			tempfile = BuilderPlug.MakeTempFilename(".wad");
+			General.Map.ExportToFile(tempfile);
+
+			// Load the map in VPO_DLL
+			BuilderPlug.VPO.Start(tempfile, General.Map.Options.LevelName);
+
+			// Determine map boundary
+			mapbounds = Rectangle.Round(MapSet.CreateArea(General.Map.Map.Vertices));
+
+			// Create tiles for all points inside the map
+			Point lt = TileForPoint(mapbounds.Left - Tile.TILE_SIZE, mapbounds.Top - Tile.TILE_SIZE);
+			Point rb = TileForPoint(mapbounds.Right + Tile.TILE_SIZE, mapbounds.Bottom + Tile.TILE_SIZE);
+			Rectangle tilesrect = new Rectangle(lt.X, lt.Y, rb.X - lt.X, rb.Y - lt.Y);
+			NearestLineBlockmap blockmap = new NearestLineBlockmap(tilesrect);
+			for(int x = tilesrect.X; x <= tilesrect.Right; x += Tile.TILE_SIZE) 
+			{
+				for(int y = tilesrect.Y; y <= tilesrect.Bottom; y += Tile.TILE_SIZE) 
+				{
+					// If the tile is obviously outside the map, don't create it
+					Vector2D pc = new Vector2D(x + (Tile.TILE_SIZE >> 1), y + (Tile.TILE_SIZE >> 1));
+					Linedef ld = MapSet.NearestLinedef(blockmap.GetBlockAt(pc).Lines, pc);
+					float distancesq = ld.DistanceToSq(pc, true);
+					if(distancesq > (Tile.TILE_SIZE * Tile.TILE_SIZE)) 
+					{
+						float side = ld.SideOfLine(pc);
+						if((side > 0.0f) && (ld.Back == null))
+							continue;
+					}
+
+					Point tp = new Point(x, y);
+					tiles.Add(tp, new Tile(tp));
+				}
+			}
+
+			QueuePoints(0);
+
+			// Make an image to draw on.
+			// The BitmapImage for Doom Builder's resources must be Format32bppArgb and NOT using color correction,
+			// otherwise DB will make a copy of the bitmap when LoadImage() is called! This is normally not a problem,
+			// but we want to keep drawing to the same bitmap.
+			int width = General.NextPowerOf2(General.Interface.Display.ClientSize.Width);
+			int height = General.NextPowerOf2(General.Interface.Display.ClientSize.Height);
+			canvas = new Bitmap(width, height, PixelFormat.Format32bppArgb);
+			image = new DynamicBitmapImage(canvas, "_CANVAS_");
+			image.UseColorCorrection = false;
+			image.MipMapLevels = 1;
+			image.LoadImage();
+			image.CreateTexture();
+
+			// Make custom presentation
+			CustomPresentation p = new CustomPresentation();
+			p.AddLayer(new PresentLayer(RendererLayer.Overlay, BlendingMode.Mask, 1f, false));
+			p.AddLayer(new PresentLayer(RendererLayer.Grid, BlendingMode.Mask));
+			p.AddLayer(new PresentLayer(RendererLayer.Geometry, BlendingMode.Alpha, 1f, true));
+			renderer.SetPresentation(p);
+
+			// Setup processing
+			nextupdate = DateTime.Now + new TimeSpan(0, 0, 0, 0, 100);
+			General.Interface.EnableProcessing();
+			processingenabled = true;
+
+			RedrawAllTiles();
+			Cursor.Current = Cursors.Default;
+			General.Interface.SetCursor(Cursors.Cross);
+			General.Interface.DisplayReady();
+		}
+
+		// Mode ends
+		public override void OnDisengage()
+		{
+			CleanUp();
+			base.OnDisengage();
+		}
+
+		// Cancelled
+		public override void OnCancel()
+		{
+			// Cancel base class
+			base.OnCancel();
+
+			// Return to previous mode
+			General.Editing.ChangeMode(General.Editing.PreviousStableMode.Name);
+		}
+
+		// View position/scale changed!
+		protected override void OnViewChanged()
+		{
+			base.OnViewChanged();
+
+			RedrawAllTiles();
+			
+			// Update the screen sooner
+			nextupdate = DateTime.Now + new TimeSpan(0, 0, 0, 0, 100);
+		}
+
+		// Draw the display
+		public override void OnRedrawDisplay()
+		{
+			base.OnRedrawDisplay();
+			
+			// Render the overlay
+			UpdateOverlay();
+
+			// Render lines and vertices
+			if(renderer.StartPlotter(true))
+			{
+				renderer.PlotLinedefSet(General.Map.Map.Linedefs);
+				renderer.PlotVerticesSet(General.Map.Map.Vertices);
+				renderer.Finish();
+			}
+			renderer.Present();
+		}
+
+		// Processing
+		public override void OnProcess(float deltatime)
+		{
+			base.OnProcess(deltatime);
+			if(DateTime.Now >= nextupdate)
+			{
+				// Get the processed points from the VPO manager
+				List<PointData> points = new List<PointData>();
+				int pointsleft = BuilderPlug.VPO.DequeueResults(points);
+
+				// Queue more points if needed
+				QueuePoints(pointsleft);
+
+				// Apply the points to the tiles
+				foreach(PointData pd in points)
+				{
+					Tile t;
+					Point tp = TileForPoint(pd.point.x, pd.point.y);
+					if(tiles.TryGetValue(tp, out t))
+						t.StorePointData(pd);
+				}
+
+				// Redraw
+				RedrawAllTiles();
+				General.Interface.RedrawDisplay();
+
+				nextupdate = DateTime.Now + new TimeSpan(0, 0, 0, 0, 500);
+			}
+			else
+			{
+				// Queue more points if needed
+				QueuePoints(BuilderPlug.VPO.GetRemainingPoints());
+			}
+		}
+
+		// LMB pressed
+		protected override void OnSelectBegin()
+		{
+			StartMultiSelection();
+			BuilderPlug.InterfaceForm.HideTooltip();
+			base.OnSelectBegin();
+		}
+
+		// Multiselecting
+		protected override void OnUpdateMultiSelection()
+		{
+			base.OnUpdateMultiSelection();
+			
+			UpdateOverlay();
+			renderer.Present();
+		}
+
+		// Multiselect ends
+		protected override void OnEndMultiSelection()
+		{
+			base.OnEndMultiSelection();
+			if((selectionrect.Width < 64f) && (selectionrect.Height < 64f))
+				selectionrect.Inflate(64f, 64f);
+			base.CenterOnArea(selectionrect, 0.1f);
+		}
+
+		// Mouse moves
+		public override void OnMouseMove(MouseEventArgs e)
+		{
+			base.OnMouseMove(e);
+
+			if(!selecting)
+			{
+				int viewstats = (int)BuilderPlug.InterfaceForm.ViewStats;
+				
+				// Get the tile data for the current position
+				Point tp = TileForPoint(mousemappos.x, mousemappos.y);
+				Tile t;
+				if(tiles.TryGetValue(tp, out t))
+				{
+					int x = (int)Math.Floor(mousemappos.x) - t.Position.X;
+					int y = (int)Math.Floor(mousemappos.y) - t.Position.Y;
+					byte b = t.GetPointByte(x, y, viewstats);
+					if(b != Tile.POINT_VOID_B)
+					{
+						// Setup hoverlabel
+						int value = t.GetPointValue(x, y, viewstats);
+						Point p = new Point((int)mousepos.x + 5, (int)mousepos.y + 5);
+						string appendoverflow = (b == Tile.POINT_OVERFLOW_B) ? "+" : "";
+						BuilderPlug.InterfaceForm.ShowTooltip(value + appendoverflow + " / " + Tile.STATS_LIMITS[viewstats], p);
+					}
+					else
+					{
+						// Void
+						BuilderPlug.InterfaceForm.HideTooltip();
+					}
+				}
+				else
+				{
+					BuilderPlug.InterfaceForm.HideTooltip();
+				}
+			}
+		}
+
+		// Mouse leaves
+		public override void OnMouseLeave(EventArgs e)
+		{
+			base.OnMouseLeave(e);
+			BuilderPlug.InterfaceForm.HideTooltip();
+		}
+
+		#endregion
+	}
+}
diff --git a/Source/Plugins/WadAuthorMode/BuilderPlug.cs b/Source/Plugins/WadAuthorMode/BuilderPlug.cs
new file mode 100644
index 0000000..6c1c653
--- /dev/null
+++ b/Source/Plugins/WadAuthorMode/BuilderPlug.cs
@@ -0,0 +1,78 @@
+
+#region ================== Copyright (c) 2010 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2010 Pascal vd Heiden
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Globalization;
+using System.Text;
+using System.IO;
+using System.Reflection;
+using CodeImp.DoomBuilder.Controls;
+using CodeImp.DoomBuilder.Windows;
+using CodeImp.DoomBuilder.IO;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Editing;
+using CodeImp.DoomBuilder.Plugins;
+using CodeImp.DoomBuilder.Actions;
+using CodeImp.DoomBuilder.Types;
+using CodeImp.DoomBuilder.Config;
+using CodeImp.DoomBuilder.Data;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.WadAuthorMode
+{
+	//
+	// MANDATORY: The plug!
+	// This is an important class to the Doom Builder core. Every plugin must
+	// have exactly 1 class that inherits from Plug. When the plugin is loaded,
+	// this class is instantiated and used to receive events from the core.
+	// Make sure the class is public, because only public classes can be seen
+	// by the core.
+	//
+
+	public class BuilderPlug : Plug
+	{
+		// Static instance. We can't use a real static class, because BuilderPlug must
+		// be instantiated by the core, so we keep a static reference. (this technique
+		// should be familiar to object-oriented programmers)
+		private static BuilderPlug me;
+		
+		// Static property to access the BuilderPlug
+		public static BuilderPlug Me { get { return me; } }
+		
+		// This event is called when the plugin is initialized
+		public override void OnInitialize()
+		{
+			base.OnInitialize();
+
+			// Keep a static reference
+            me = this;
+		}
+		
+		// This is called when the plugin is terminated
+		public override void Dispose()
+		{
+			base.Dispose();
+        }
+    }
+}
diff --git a/Source/Plugins/WadAuthorMode/Properties/AssemblyInfo.cs b/Source/Plugins/WadAuthorMode/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..47b27ce
--- /dev/null
+++ b/Source/Plugins/WadAuthorMode/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("WadAuthorMode")]
+[assembly: AssemblyDescription("WadAuthor Editing Mode")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("WadAuthorMode")]
+[assembly: AssemblyCopyright("Copyright ©  2010")]
+[assembly: AssemblyTrademark("CodeImp")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("88b0b89b-686a-41e5-94b4-950b27deeaa5")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Source/Plugins/WadAuthorMode/Properties/Resources.Designer.cs b/Source/Plugins/WadAuthorMode/Properties/Resources.Designer.cs
new file mode 100644
index 0000000..9ace329
--- /dev/null
+++ b/Source/Plugins/WadAuthorMode/Properties/Resources.Designer.cs
@@ -0,0 +1,70 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:2.0.50727.3615
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace CodeImp.DoomBuilder.WadAuthorMode.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("CodeImp.DoomBuilder.WadAuthorMode.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        internal static System.Drawing.Bitmap WAuthor {
+            get {
+                object obj = ResourceManager.GetObject("WAuthor", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+    }
+}
diff --git a/Source/Plugins/WadAuthorMode/Properties/Resources.resx b/Source/Plugins/WadAuthorMode/Properties/Resources.resx
new file mode 100644
index 0000000..693e660
--- /dev/null
+++ b/Source/Plugins/WadAuthorMode/Properties/Resources.resx
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="WAuthor" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\WAuthor.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/WadAuthorMode/Resources/Actions.cfg b/Source/Plugins/WadAuthorMode/Resources/Actions.cfg
new file mode 100644
index 0000000..934d094
--- /dev/null
+++ b/Source/Plugins/WadAuthorMode/Resources/Actions.cfg
@@ -0,0 +1,39 @@
+/******************************************\
+	Doom Builder Actions Configuration
+\******************************************/
+
+// Categories for the Controls preferences
+categories
+{
+	drawing = "Drawing";
+	linedefs = "Lines";
+	sectors = "Sectors";
+}
+
+// This just defines which actions there are, what description they have and
+// some behaviour options. The Doom Builder core will bind to these actions
+// with delegates (function pointers) where you use the BeginAction and
+// EndAction attributes.
+
+// Behaviour options:
+//
+// allowkeys: Allows the user to bind standard keys to this action.
+// allowmouse: Allows the user to bind mouse buttons to this action.
+// allowscroll: Allows the user to bind the scrollwheel to this action.
+// disregardshift: This action will be triggered regardless if Shift is used.
+// disregardcontrol: This action will be triggered regardless if Control is used.
+// repeat: BeginAction will be called for automatic key repetition.
+//
+// allowkeys and allowmouse are true by default, the others are false by default.
+//
+
+wadauthormode
+{
+	title = "WadAuthor Mode";
+	category = "modes";
+	description = "Switches to WadAuthor editing mode.";
+	allowkeys = true;
+	allowmouse = true;
+	allowscroll = true;
+}
+
diff --git a/Source/Plugins/WadAuthorMode/Resources/WAuthor.png b/Source/Plugins/WadAuthorMode/Resources/WAuthor.png
new file mode 100644
index 0000000..b98bed4
Binary files /dev/null and b/Source/Plugins/WadAuthorMode/Resources/WAuthor.png differ
diff --git a/Source/Plugins/WadAuthorMode/WAuthorMode.cs b/Source/Plugins/WadAuthorMode/WAuthorMode.cs
new file mode 100644
index 0000000..140435b
--- /dev/null
+++ b/Source/Plugins/WadAuthorMode/WAuthorMode.cs
@@ -0,0 +1,386 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Text;
+using System.Windows.Forms;
+using System.IO;
+using System.Reflection;
+using CodeImp.DoomBuilder.Windows;
+using CodeImp.DoomBuilder.IO;
+using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Rendering;
+using CodeImp.DoomBuilder.Geometry;
+using CodeImp.DoomBuilder.Editing;
+using CodeImp.DoomBuilder.Actions;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.BuilderModes.Editing
+{
+	[EditMode(DisplayName = "WadAuthor Mode",
+			  SwitchAction = "wadauthormode",
+			  ButtonImage = "WAuthor.png",
+			  ButtonOrder = int.MinValue + 400,
+			  ButtonGroup = "000_editing",
+			  UseByDefault = true,
+			  SafeStartMode = true)]
+	
+	public class WadAuthorMode : ClassicMode
+	{
+		#region ================== Constants
+
+		protected const float LINEDEF_HIGHLIGHT_RANGE = 10f;
+		protected const float VERTEX_HIGHLIGHT_RANGE = 8f;
+		protected const float THING_HIGHLIGHT_RANGE = 2f;
+
+		#endregion
+
+		#region ================== Variables
+		
+		// Tools
+		protected WAuthorTools tools;
+		
+		// Highlighted item
+		protected object highlighted;
+
+		#endregion
+
+		#region ================== Properties
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		public WadAuthorMode()
+		{
+			// Initialize
+			tools = new WAuthorTools();
+
+			// We have no destructor
+			GC.SuppressFinalize(this);
+		}
+
+		// Disposer
+		public override void Dispose()
+		{
+			// Not already disposed?
+			if(!isdisposed)
+			{
+				// Clean up
+				tools.Dispose();
+				
+				// Dispose base
+				base.Dispose();
+			}
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		// Cancel mode
+		public override void OnCancel()
+		{
+			base.OnCancel();
+
+			// Return to this mode
+			General.Editing.ChangeMode(new WadAuthorMode());
+		}
+
+		// Mode engages
+		public override void OnEngage()
+		{
+			base.OnEngage();
+
+			renderer.SetPresentation(Presentation.Things);
+			
+			// Convert geometry selection to linedefs selection
+			General.Map.Map.ConvertSelection(SelectionType.Sectors, SelectionType.Linedefs);
+		}
+
+		// Mode disengages
+		public override void OnDisengage()
+		{
+			base.OnDisengage();
+
+			// Clear selected vertices
+			General.Map.Map.ClearAllSelected();
+
+			// Hide highlight info
+			General.Interface.HideInfo();
+		}
+
+		// This redraws the display
+		public override void OnRedrawDisplay()
+		{
+			renderer.RedrawSurface();
+			
+			// Render lines and vertices
+			if(renderer.StartPlotter(true))
+			{
+				renderer.PlotLinedefSet(General.Map.Map.Linedefs);
+				renderer.PlotVerticesSet(General.Map.Map.Vertices);
+				if((highlighted != null) && !(highlighted is Thing)) DrawHighlight(true);
+				renderer.Finish();
+			}
+			
+			// Render things
+			if(renderer.StartThings(true))
+			{
+				renderer.RenderThingSet(General.Map.Map.Things, 1.0f);
+				if((highlighted != null) && (highlighted is Thing)) DrawHighlight(true);
+				renderer.Finish();
+			}
+
+			renderer.Present();
+		}
+
+		// This draws the highlighted item
+		protected void DrawHighlight(bool highlightcolor)
+		{
+			// With highlight color
+			if(highlightcolor)
+			{
+				// Vertex
+				if(highlighted is Vertex)
+				{
+					if((highlighted as Vertex).IsDisposed) return;
+					renderer.PlotVertex(highlighted as Vertex, ColorCollection.HIGHLIGHT);
+				}
+				// Linedef
+				else if(highlighted is Linedef)
+				{
+					if((highlighted as Linedef).IsDisposed) return;
+					renderer.PlotLinedef((highlighted as Linedef), General.Colors.Highlight);
+					renderer.PlotVertex((highlighted as Linedef).Start, renderer.DetermineVertexColor((highlighted as Linedef).Start));
+					renderer.PlotVertex((highlighted as Linedef).End, renderer.DetermineVertexColor((highlighted as Linedef).End));
+				}
+				// Sector
+				else if(highlighted is Sector)
+				{
+					if((highlighted as Sector).IsDisposed) return;
+					renderer.PlotSector((highlighted as Sector), General.Colors.Highlight);
+				}
+				// Thing
+				else if(highlighted is Thing)
+				{
+					if((highlighted as Thing).IsDisposed) return;
+					renderer.RenderThing((highlighted as Thing), General.Colors.Highlight, 1.0f);
+				}
+			}
+			// With original color
+			else
+			{
+				// Vertex
+				if(highlighted is Vertex)
+				{
+					if((highlighted as Vertex).IsDisposed) return;
+					renderer.PlotVertex(highlighted as Vertex, renderer.DetermineVertexColor(highlighted as Vertex));
+				}
+				// Linedef
+				else if(highlighted is Linedef)
+				{
+					if((highlighted as Linedef).IsDisposed) return;
+					renderer.PlotLinedef((highlighted as Linedef), renderer.DetermineLinedefColor((highlighted as Linedef)));
+					renderer.PlotVertex((highlighted as Linedef).Start, renderer.DetermineVertexColor((highlighted as Linedef).Start));
+					renderer.PlotVertex((highlighted as Linedef).End, renderer.DetermineVertexColor((highlighted as Linedef).End));
+				}
+				// Sector
+				else if(highlighted is Sector)
+				{
+					if((highlighted as Sector).IsDisposed) return;
+					renderer.PlotSector((highlighted as Sector));
+				}
+				// Thing
+				else if(highlighted is Thing)
+				{
+					if((highlighted as Thing).IsDisposed) return;
+					renderer.RenderThing((highlighted as Thing), renderer.DetermineThingColor((highlighted as Thing)), 1.0f);
+				}
+			}
+		}
+		
+		// This highlights a new item
+		protected void Highlight(object h)
+		{
+			bool renderresult;
+			
+			// Changes?
+			if(highlighted != h)
+			{
+				if(highlighted != null)
+				{
+					// Start update
+					if(highlighted is Thing)
+						renderresult = renderer.StartThings(false);
+					else
+						renderresult = renderer.StartPlotter(false);
+						
+					// Undraw previous highlight
+					if(renderresult)
+					{
+						DrawHighlight(false);
+						renderer.Finish();
+					}
+				}
+				
+				// Set new highlight
+				highlighted = h;
+
+				if(highlighted != null)
+				{
+					// Start update
+					if(highlighted is Thing)
+						renderresult = renderer.StartThings(false);
+					else
+						renderresult = renderer.StartPlotter(false);
+
+					// Undraw previous highlight
+					if(renderresult)
+					{
+						DrawHighlight(true);
+						renderer.Finish();
+					}
+				}
+
+				// Hide info
+				General.Interface.HideInfo();
+				
+				// Anything highlighted?
+				if(highlighted != null)
+				{
+					// Show highlight info
+					if(highlighted is Vertex)
+						General.Interface.ShowVertexInfo(highlighted as Vertex);
+					else if(highlighted is Linedef)
+						General.Interface.ShowLinedefInfo(highlighted as Linedef);
+					else if(highlighted is Sector)
+						General.Interface.ShowSectorInfo(highlighted as Sector);
+					else if(highlighted is Thing)
+						General.Interface.ShowThingInfo(highlighted as Thing);
+				}
+
+				renderer.Present();
+			}
+		}
+
+		// Mouse moves
+		public override void OnMouseMove(MouseEventArgs e)
+		{
+			base.OnMouseMove(e);
+
+			// Not holding any buttons?
+			if(e.Button == MouseButtons.None)
+			{
+				// Find the nearest items within highlight range
+				Vertex v = General.Map.Map.NearestVertexSquareRange(mousemappos, VERTEX_HIGHLIGHT_RANGE / renderer.Scale);
+				Thing t = General.Map.Map.NearestThingSquareRange(mousemappos, THING_HIGHLIGHT_RANGE / renderer.Scale);
+				Linedef l = General.Map.Map.NearestLinedef(mousemappos);
+				Sector s;
+				
+				// Check on which side of the linedef the mouse is
+				float side = l.SideOfLine(mousemappos);
+				if(side > 0)
+				{
+					// Is there a sidedef here?
+					if(l.Back != null) s = l.Back.Sector;
+					else s = null;
+				}
+				else
+				{
+					// Is there a sidedef here?
+					if(l.Front != null) s = l.Front.Sector;
+					else s = null;
+				}
+
+				// Both a vertex and thing in range?
+				if((v != null) && (t != null))
+				{
+					// Highlight closest
+					float vd = v.DistanceToSq(mousemappos);
+					float td = t.DistanceToSq(mousemappos);
+					if(vd < td) Highlight(v); else Highlight(t);
+				}
+				// Vertex in range?
+				else if(v != null)
+				{
+					// Highlight vertex
+					Highlight(v);
+				}
+				// Thing in range?
+				else if(t != null)
+				{
+					// Highlight thing
+					Highlight(t);
+				}
+				else
+				{
+					// Linedef within in range?
+					float ld = l.DistanceTo(mousemappos, true);
+					if(ld < (LINEDEF_HIGHLIGHT_RANGE / renderer.Scale))
+					{
+						// Highlight line
+						Highlight(l);
+					}
+					// Mouse inside a sector?
+					else if(s != null)
+					{
+						// Highlight sector
+						Highlight(s);
+					}
+					else
+					{
+						// Highlight nothing
+						Highlight(null);
+					}
+				}
+			}
+		}
+		
+		// Mouse leaves
+		public override void OnMouseLeave(EventArgs e)
+		{
+			base.OnMouseLeave(e);
+
+			// Highlight nothing
+			Highlight(null);
+		}
+
+		// Mouse wants to drag
+		protected override void OnDragStart(MouseEventArgs e)
+		{
+			base.OnDragStart(e);
+		}
+
+		// Edit action ends
+		protected override void OnEditEnd()
+		{
+			base.OnEditEnd();
+			
+			// This shows a popup menu
+			tools.LinedefPopup.Show(Cursor.Position);
+		}
+		
+		#endregion
+	}
+}
diff --git a/Source/Plugins/WadAuthorMode/WAuthorTools.Designer.cs b/Source/Plugins/WadAuthorMode/WAuthorTools.Designer.cs
new file mode 100644
index 0000000..9559d70
--- /dev/null
+++ b/Source/Plugins/WadAuthorMode/WAuthorTools.Designer.cs
@@ -0,0 +1,116 @@
+namespace CodeImp.DoomBuilder.BuilderModes.Editing
+{
+	partial class WAuthorTools
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.components = new System.ComponentModel.Container();
+			this.linedefpopup = new System.Windows.Forms.ContextMenuStrip(this.components);
+			this.propertiesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator();
+			this.deleteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.splitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.flipToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.curveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.linedefpopup.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// linedefpopup
+			// 
+			this.linedefpopup.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.propertiesToolStripMenuItem,
+            this.toolStripMenuItem1,
+            this.deleteToolStripMenuItem,
+            this.splitToolStripMenuItem,
+            this.flipToolStripMenuItem,
+            this.curveToolStripMenuItem});
+			this.linedefpopup.Name = "linedefpopup";
+			this.linedefpopup.Size = new System.Drawing.Size(147, 120);
+			// 
+			// propertiesToolStripMenuItem
+			// 
+			this.propertiesToolStripMenuItem.Name = "propertiesToolStripMenuItem";
+			this.propertiesToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
+			this.propertiesToolStripMenuItem.Text = "Properties...";
+			// 
+			// toolStripMenuItem1
+			// 
+			this.toolStripMenuItem1.Name = "toolStripMenuItem1";
+			this.toolStripMenuItem1.Size = new System.Drawing.Size(143, 6);
+			// 
+			// deleteToolStripMenuItem
+			// 
+			this.deleteToolStripMenuItem.Name = "deleteToolStripMenuItem";
+			this.deleteToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
+			this.deleteToolStripMenuItem.Text = "Delete";
+			// 
+			// splitToolStripMenuItem
+			// 
+			this.splitToolStripMenuItem.Name = "splitToolStripMenuItem";
+			this.splitToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
+			this.splitToolStripMenuItem.Text = "Split";
+			// 
+			// flipToolStripMenuItem
+			// 
+			this.flipToolStripMenuItem.Name = "flipToolStripMenuItem";
+			this.flipToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
+			this.flipToolStripMenuItem.Text = "Flip";
+			// 
+			// curveToolStripMenuItem
+			// 
+			this.curveToolStripMenuItem.Name = "curveToolStripMenuItem";
+			this.curveToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
+			this.curveToolStripMenuItem.Text = "Curve...";
+			// 
+			// WAuthorTools
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 14F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.ClientSize = new System.Drawing.Size(243, 130);
+			this.ControlBox = false;
+			this.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "WAuthorTools";
+			this.Text = "WAuthorTools";
+			this.linedefpopup.ResumeLayout(false);
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.ContextMenuStrip linedefpopup;
+		private System.Windows.Forms.ToolStripMenuItem propertiesToolStripMenuItem;
+		private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1;
+		private System.Windows.Forms.ToolStripMenuItem deleteToolStripMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem splitToolStripMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem flipToolStripMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem curveToolStripMenuItem;
+	}
+}
\ No newline at end of file
diff --git a/Source/Plugins/WadAuthorMode/WAuthorTools.cs b/Source/Plugins/WadAuthorMode/WAuthorTools.cs
new file mode 100644
index 0000000..1cc9852
--- /dev/null
+++ b/Source/Plugins/WadAuthorMode/WAuthorTools.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+
+namespace CodeImp.DoomBuilder.BuilderModes.Editing
+{
+	public partial class WAuthorTools : Form
+	{
+		// Tools
+		public ContextMenuStrip LinedefPopup { get { return linedefpopup; } }
+		
+		// Constructor
+		public WAuthorTools()
+		{
+			InitializeComponent();
+		}
+	}
+}
\ No newline at end of file
diff --git a/Source/Plugins/WadAuthorMode/WAuthorTools.resx b/Source/Plugins/WadAuthorMode/WAuthorTools.resx
new file mode 100644
index 0000000..9355b1d
--- /dev/null
+++ b/Source/Plugins/WadAuthorMode/WAuthorTools.resx
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="linedefpopup.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Source/Plugins/WadAuthorMode/WadAuthorMode.csproj b/Source/Plugins/WadAuthorMode/WadAuthorMode.csproj
new file mode 100644
index 0000000..c60ade8
--- /dev/null
+++ b/Source/Plugins/WadAuthorMode/WadAuthorMode.csproj
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{B675B60F-FFB4-4170-BEA8-A8849E197B93}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>CodeImp.DoomBuilder.WadAuthorMode</RootNamespace>
+    <AssemblyName>WadAuthorMode</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkSubset>
+    </TargetFrameworkSubset>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\..\..\Build\Plugins\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <OutputPath>..\..\..\Build\Plugins\</OutputPath>
+    <DefineConstants>
+    </DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml.Linq">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data.DataSetExtensions">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="BuilderPlug.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="WAuthorMode.cs" />
+    <Compile Include="WAuthorTools.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="WAuthorTools.designer.cs">
+      <DependentUpon>WAuthorTools.cs</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Core\Builder.csproj">
+      <Project>{818B3D10-F791-4C3F-9AF5-BB2D0079B63C}</Project>
+      <Name>Builder</Name>
+      <Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <EmbeddedResource Include="WAuthorTools.resx">
+      <DependentUpon>WAuthorTools.cs</DependentUpon>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\Actions.cfg" />
+    <EmbeddedResource Include="Resources\WAuthor.png" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/Source/Plugins/vpo_dll/doomdata.h b/Source/Plugins/vpo_dll/doomdata.h
new file mode 100644
index 0000000..5431aee
--- /dev/null
+++ b/Source/Plugins/vpo_dll/doomdata.h
@@ -0,0 +1,235 @@
+// Emacs style mode select   -*- C++ -*- 
+//-----------------------------------------------------------------------------
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005 Simon Howard
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+// 02111-1307, USA.
+//
+// DESCRIPTION:
+//  all external data is defined here
+//  most of the data is loaded into different structures at run time
+//  some internal structures shared by many modules are here
+//
+//-----------------------------------------------------------------------------
+
+#ifndef __DOOMDATA__
+#define __DOOMDATA__
+
+// The most basic types we use, portability.
+#include "doomtype.h"
+
+// Some global defines, that configure the game.
+#include "doomdef.h"
+
+
+
+//
+// Map level types.
+// The following data structures define the persistent format
+// used in the lumps of the WAD files.
+//
+
+// Lump order in a map WAD: each map needs a couple of lumps
+// to provide a complete scene geometry description.
+enum
+{
+  ML_LABEL,		// A separator, name, ExMx or MAPxx
+  ML_THINGS,		// Monsters, items..
+  ML_LINEDEFS,		// LineDefs, from editing
+  ML_SIDEDEFS,		// SideDefs, from editing
+  ML_VERTEXES,		// Vertices, edited and BSP splits generated
+  ML_SEGS,		// LineSegs, from LineDefs split by BSP
+  ML_SSECTORS,		// SubSectors, list of LineSegs
+  ML_NODES,		// BSP nodes
+  ML_SECTORS,		// Sectors, from editing
+  ML_REJECT,		// LUT, sector-sector visibility	
+  ML_BLOCKMAP,	// LUT, motion clipping, walls/grid element
+
+  ML_BEHAVIOR   // HEXEN ONLY: compiled ACS scripts
+};
+
+
+// A single Vertex.
+typedef struct
+{
+  short		x;
+  short		y;
+} PACKEDATTR mapvertex_t;
+
+
+// A SideDef, defining the visual appearance of a wall,
+// by setting textures and offsets.
+typedef struct
+{
+  short		textureoffset;
+  short		rowoffset;
+  char		toptexture[8];
+  char		bottomtexture[8];
+  char		midtexture[8];
+  // Front sector, towards viewer.
+  short		sector;
+} PACKEDATTR mapsidedef_t;
+
+
+
+// A LineDef, as used for editing, and as input
+// to the BSP builder.
+typedef struct
+{
+  short		v1;
+  short		v2;
+  short		flags;
+  short		special;
+  short		tag;
+  // sidenum[1] will be -1 if one sided
+  short		sidenum[2];
+} PACKEDATTR maplinedef_t;
+
+
+// the Hexen LineDef structure  [andrewj: added this]
+typedef struct
+{
+  short		v1;
+  short		v2;
+  short		flags;
+  unsigned char	special;
+  unsigned char args[5];
+  short		sidenum[2];
+} PACKEDATTR maplinedef_hexen_t;
+
+
+//
+// LineDef attributes.
+//
+
+// Solid, is an obstacle.
+#define ML_BLOCKING		1
+
+// Blocks monsters only.
+#define ML_BLOCKMONSTERS	2
+
+// Backside will not be present at all
+//  if not two sided.
+#define ML_TWOSIDED		4
+
+// If a texture is pegged, the texture will have
+// the end exposed to air held constant at the
+// top or bottom of the texture (stairs or pulled
+// down things) and will move with a height change
+// of one of the neighbor sectors.
+// Unpegged textures allways have the first row of
+// the texture at the top pixel of the line for both
+// top and bottom textures (use next to windows).
+
+// upper texture unpegged
+#define ML_DONTPEGTOP		8
+
+// lower texture unpegged
+#define ML_DONTPEGBOTTOM	16	
+
+// In AutoMap: don't map as two sided: IT'S A SECRET!
+#define ML_SECRET		32
+
+// Sound rendering: don't let sound cross two of these.
+#define ML_SOUNDBLOCK		64
+
+// Don't draw on the automap at all.
+#define ML_DONTDRAW		128
+
+// Set if already seen, thus drawn in automap.
+#define ML_MAPPED		256
+
+
+
+
+// Sector definition, from editing.
+typedef	struct
+{
+  short		floorheight;
+  short		ceilingheight;
+  char		floorpic[8];
+  char		ceilingpic[8];
+  short		lightlevel;
+  short		special;
+  short		tag;
+} PACKEDATTR mapsector_t;
+
+// SubSector, as generated by BSP.
+typedef struct
+{
+  short		numsegs;
+  // Index of first one, segs are stored sequentially.
+  short		firstseg;	
+} PACKEDATTR mapsubsector_t;
+
+
+// LineSeg, generated by splitting LineDefs
+// using partition lines selected by BSP builder.
+typedef struct
+{
+  short		v1;
+  short		v2;
+  short		angle;		
+  short		linedef;
+  short		side;
+  short		offset;
+} PACKEDATTR mapseg_t;
+
+
+
+// BSP node structure.
+
+// Indicate a leaf.
+#define	NF_SUBSECTOR	0x8000
+
+typedef struct
+{
+  // Partition line from (x,y) to x+dx,y+dy)
+  short		x;
+  short		y;
+  short		dx;
+  short		dy;
+
+  // Bounding box for each child,
+  // clip against view frustum.
+  short		bbox[2][4];
+
+  // If NF_SUBSECTOR its a subsector,
+  // else it's a node of another subtree.
+  unsigned short	children[2];
+
+} PACKEDATTR mapnode_t;
+
+
+
+
+// Thing definition, position, orientation and type,
+// plus skill/visibility flags and attributes.
+typedef struct
+{
+    short		x;
+    short		y;
+    short		angle;
+    short		type;
+    short		options;
+} PACKEDATTR mapthing_t;
+
+
+
+
+
+#endif			// __DOOMDATA__
diff --git a/Source/Plugins/vpo_dll/doomdef.h b/Source/Plugins/vpo_dll/doomdef.h
new file mode 100644
index 0000000..2aead1f
--- /dev/null
+++ b/Source/Plugins/vpo_dll/doomdef.h
@@ -0,0 +1,258 @@
+// Emacs style mode select   -*- C++ -*- 
+//-----------------------------------------------------------------------------
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005 Simon Howard
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+// 02111-1307, USA.
+//
+// DESCRIPTION:
+//  Internally used data structures for virtually everything,
+//   lots of other stuff.
+//
+//-----------------------------------------------------------------------------
+
+#ifndef __DOOMDEF__
+#define __DOOMDEF__
+
+
+// #define macros to provide functions missing in Windows.
+// Outside Windows, we use strings.h for str[n]casecmp.
+
+
+#ifdef _WIN32
+
+#define snprintf _snprintf
+#define vsnprintf _vsnprintf
+#define strcasecmp stricmp
+#define strncasecmp strnicmp
+
+#else
+
+#include <strings.h>
+
+#endif
+
+
+//
+// The packed attribute forces structures to be packed into the minimum 
+// space necessary.  If this is not done, the compiler may align structure
+// fields differently to optimize memory access, inflating the overall
+// structure size.  It is important to use the packed attribute on certain
+// structures where alignment is important, particularly data read/written
+// to disk.
+//
+
+#ifdef __GNUC__
+#define PACKEDATTR __attribute__((packed))
+#else
+#define PACKEDATTR
+#endif
+
+//
+// Global parameters/defines.
+//
+// DOOM version
+#define DOOM_VERSION 109
+
+// Version code for cph's longtics hack ("v1.91")
+#define DOOM_191_VERSION 111
+
+
+// Game mode handling - identify IWAD version
+//  to handle IWAD dependend animations etc.
+typedef enum
+{
+  shareware,	// DOOM 1 shareware, E1, M9
+  registered,	// DOOM 1 registered, E3, M27
+  commercial,	// DOOM 2 retail, E1 M34
+  // DOOM 2 german edition not handled
+  retail,	// DOOM 1 retail, E4, M36
+  indetermined	// Well, no IWAD found.
+  
+} GameMode_t;
+
+
+// Mission packs - might be useful for TC stuff?
+typedef enum
+{
+  doom,		// DOOM 1
+  doom2,	// DOOM 2
+  pack_tnt,	// TNT mission pack
+  pack_plut,	// Plutonia pack
+  none
+
+} GameMission_t;
+
+// What version are we emulating?
+
+typedef enum
+{
+    exe_doom_1_9,   // Doom 1.9: used for shareware, registered and commercial
+    exe_hacx,       // Hacx executable (Doom 1.9 with patch applied)
+    exe_ultimate,   // Ultimate Doom (retail)
+    exe_final,      // Final Doom
+    exe_final2,     // Final Doom (alternate exe)
+    exe_chex,       // Chex Quest executable (based on Final Doom)
+} GameVersion_t;
+
+
+// If rangecheck is undefined,
+// most parameter validation debugging code will not be compiled
+#define RANGECHECK
+
+
+
+// Screen width and height.
+
+#define SCREENWIDTH  320
+#define SCREENHEIGHT 200
+
+// Screen width used for "squash" scale functions
+
+#define SCREENWIDTH_4_3 256
+
+// Screen height used for "stretch" scale functions.
+
+#define SCREENHEIGHT_4_3 240
+
+// The maximum number of players, multiplayer/networking.
+#define MAXPLAYERS		4
+
+// State updates, number of tics / second.
+#define TICRATE		35
+
+// The current state of the game: whether we are
+// playing, gazing at the intermission screen,
+// the game final animation, or a demo. 
+typedef enum
+{
+    GS_LEVEL,
+    GS_INTERMISSION,
+    GS_FINALE,
+    GS_DEMOSCREEN,
+} gamestate_t;
+
+//
+// Difficulty/skill settings/filters.
+//
+
+// Skill flags.
+#define	MTF_EASY		1
+#define	MTF_NORMAL		2
+#define	MTF_HARD		4
+
+// Deaf monsters/do not react to sound.
+#define	MTF_AMBUSH		8
+
+typedef enum
+{
+    sk_noitems = -1,        // the "-skill 0" hack
+    sk_baby = 0,
+    sk_easy,
+    sk_medium,
+    sk_hard,
+    sk_nightmare
+} skill_t;
+
+
+
+
+//
+// Key cards.
+//
+typedef enum
+{
+    it_bluecard,
+    it_yellowcard,
+    it_redcard,
+    it_blueskull,
+    it_yellowskull,
+    it_redskull,
+    
+    NUMCARDS
+    
+} card_t;
+
+
+
+// The defined weapons,
+//  including a marker indicating
+//  user has not changed weapon.
+typedef enum
+{
+    wp_fist,
+    wp_pistol,
+    wp_shotgun,
+    wp_chaingun,
+    wp_missile,
+    wp_plasma,
+    wp_bfg,
+    wp_chainsaw,
+    wp_supershotgun,
+
+    NUMWEAPONS,
+    
+    // No pending weapon change.
+    wp_nochange
+
+} weapontype_t;
+
+
+// Ammunition types defined.
+typedef enum
+{
+    am_clip,	// Pistol / chaingun ammo.
+    am_shell,	// Shotgun / double barreled shotgun.
+    am_cell,	// Plasma rifle, BFG.
+    am_misl,	// Missile launcher.
+    NUMAMMO,
+    am_noammo	// Unlimited for chainsaw / fist.	
+
+} ammotype_t;
+
+
+// Power up artifacts.
+typedef enum
+{
+    pw_invulnerability,
+    pw_strength,
+    pw_invisibility,
+    pw_ironfeet,
+    pw_allmap,
+    pw_infrared,
+    NUMPOWERS
+    
+} powertype_t;
+
+
+
+//
+// Power up durations,
+//  how many seconds till expiration,
+//  assuming TICRATE is 35 ticks/second.
+//
+typedef enum
+{
+    INVULNTICS	= (30*TICRATE),
+    INVISTICS	= (60*TICRATE),
+    INFRATICS	= (120*TICRATE),
+    IRONTICS	= (60*TICRATE)
+    
+} powerduration_t;
+
+
+#endif          // __DOOMDEF__
diff --git a/Source/Plugins/vpo_dll/doomtype.h b/Source/Plugins/vpo_dll/doomtype.h
new file mode 100644
index 0000000..0a5b5e3
--- /dev/null
+++ b/Source/Plugins/vpo_dll/doomtype.h
@@ -0,0 +1,84 @@
+// Emacs style mode select   -*- C++ -*- 
+//-----------------------------------------------------------------------------
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005 Simon Howard
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+// 02111-1307, USA.
+//
+// DESCRIPTION:
+//	Simple basic typedefs, isolated here to make it easier
+//	 separating modules.
+//    
+//-----------------------------------------------------------------------------
+
+
+#ifndef __DOOMTYPE__
+#define __DOOMTYPE__
+
+// Windows CE is missing some vital ANSI C functions.  We have to
+// use our own replacements.
+
+#ifdef _WIN32_WCE
+#include "libc_wince.h"
+#endif
+
+// C99 integer types; with gcc we just use this.  Other compilers 
+// should add conditional statements that define the C99 types.
+
+// What is really wanted here is stdint.h; however, some old versions
+// of Solaris don't have stdint.h and only have inttypes.h (the 
+// pre-standardisation version).  inttypes.h is also in the C99 
+// standard and defined to include stdint.h, so include this. 
+
+#include <inttypes.h>
+
+#ifdef __cplusplus
+
+// Use builtin bool type with C++.
+
+typedef bool boolean;
+
+#else
+
+typedef enum 
+{
+    false, 
+    true
+} boolean;
+
+#endif
+
+typedef uint8_t byte;
+
+#include <limits.h>
+
+#ifdef _WIN32
+
+#define DIR_SEPARATOR '\\'
+#define PATH_SEPARATOR ';'
+
+#else
+
+#define DIR_SEPARATOR '/'
+#define PATH_SEPARATOR ':'
+
+#endif
+
+#define arrlen(array) (sizeof(array) / sizeof(*array))
+
+#endif
+
diff --git a/Source/Plugins/vpo_dll/exports.def b/Source/Plugins/vpo_dll/exports.def
new file mode 100644
index 0000000..60648a5
--- /dev/null
+++ b/Source/Plugins/vpo_dll/exports.def
@@ -0,0 +1,13 @@
+
+EXPORTS
+	
+	VPO_GetError
+	VPO_LoadWAD
+	VPO_FreeWAD
+	VPO_GetMapName
+	VPO_OpenMap
+	VPO_CloseMap
+	VPO_GetLinedef
+	VPO_OpenDoorSectors
+	VPO_TestSpot
+	
\ No newline at end of file
diff --git a/Source/Plugins/vpo_dll/inttypes.h b/Source/Plugins/vpo_dll/inttypes.h
new file mode 100644
index 0000000..4b3828a
--- /dev/null
+++ b/Source/Plugins/vpo_dll/inttypes.h
@@ -0,0 +1,305 @@
+// ISO C9x  compliant inttypes.h for Microsoft Visual Studio
+// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 
+// 
+//  Copyright (c) 2006 Alexander Chemeris
+// 
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+// 
+//   1. Redistributions of source code must retain the above copyright notice,
+//      this list of conditions and the following disclaimer.
+// 
+//   2. Redistributions in binary form must reproduce the above copyright
+//      notice, this list of conditions and the following disclaimer in the
+//      documentation and/or other materials provided with the distribution.
+// 
+//   3. The name of the author may be used to endorse or promote products
+//      derived from this software without specific prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+// 
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _MSC_VER // [
+#error "Use this header only with Microsoft Visual C++ compilers!"
+#endif // _MSC_VER ]
+
+#ifndef _MSC_INTTYPES_H_ // [
+#define _MSC_INTTYPES_H_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif
+
+#include "stdint.h"
+
+// 7.8 Format conversion of integer types
+
+typedef struct {
+   intmax_t quot;
+   intmax_t rem;
+} imaxdiv_t;
+
+// 7.8.1 Macros for format specifiers
+
+#if !defined(__cplusplus) || defined(__STDC_FORMAT_MACROS) // [   See footnote 185 at page 198
+
+// The fprintf macros for signed integers are:
+#define PRId8       "d"
+#define PRIi8       "i"
+#define PRIdLEAST8  "d"
+#define PRIiLEAST8  "i"
+#define PRIdFAST8   "d"
+#define PRIiFAST8   "i"
+
+#define PRId16       "hd"
+#define PRIi16       "hi"
+#define PRIdLEAST16  "hd"
+#define PRIiLEAST16  "hi"
+#define PRIdFAST16   "hd"
+#define PRIiFAST16   "hi"
+
+#define PRId32       "I32d"
+#define PRIi32       "I32i"
+#define PRIdLEAST32  "I32d"
+#define PRIiLEAST32  "I32i"
+#define PRIdFAST32   "I32d"
+#define PRIiFAST32   "I32i"
+
+#define PRId64       "I64d"
+#define PRIi64       "I64i"
+#define PRIdLEAST64  "I64d"
+#define PRIiLEAST64  "I64i"
+#define PRIdFAST64   "I64d"
+#define PRIiFAST64   "I64i"
+
+#define PRIdMAX     "I64d"
+#define PRIiMAX     "I64i"
+
+#define PRIdPTR     "Id"
+#define PRIiPTR     "Ii"
+
+// The fprintf macros for unsigned integers are:
+#define PRIo8       "o"
+#define PRIu8       "u"
+#define PRIx8       "x"
+#define PRIX8       "X"
+#define PRIoLEAST8  "o"
+#define PRIuLEAST8  "u"
+#define PRIxLEAST8  "x"
+#define PRIXLEAST8  "X"
+#define PRIoFAST8   "o"
+#define PRIuFAST8   "u"
+#define PRIxFAST8   "x"
+#define PRIXFAST8   "X"
+
+#define PRIo16       "ho"
+#define PRIu16       "hu"
+#define PRIx16       "hx"
+#define PRIX16       "hX"
+#define PRIoLEAST16  "ho"
+#define PRIuLEAST16  "hu"
+#define PRIxLEAST16  "hx"
+#define PRIXLEAST16  "hX"
+#define PRIoFAST16   "ho"
+#define PRIuFAST16   "hu"
+#define PRIxFAST16   "hx"
+#define PRIXFAST16   "hX"
+
+#define PRIo32       "I32o"
+#define PRIu32       "I32u"
+#define PRIx32       "I32x"
+#define PRIX32       "I32X"
+#define PRIoLEAST32  "I32o"
+#define PRIuLEAST32  "I32u"
+#define PRIxLEAST32  "I32x"
+#define PRIXLEAST32  "I32X"
+#define PRIoFAST32   "I32o"
+#define PRIuFAST32   "I32u"
+#define PRIxFAST32   "I32x"
+#define PRIXFAST32   "I32X"
+
+#define PRIo64       "I64o"
+#define PRIu64       "I64u"
+#define PRIx64       "I64x"
+#define PRIX64       "I64X"
+#define PRIoLEAST64  "I64o"
+#define PRIuLEAST64  "I64u"
+#define PRIxLEAST64  "I64x"
+#define PRIXLEAST64  "I64X"
+#define PRIoFAST64   "I64o"
+#define PRIuFAST64   "I64u"
+#define PRIxFAST64   "I64x"
+#define PRIXFAST64   "I64X"
+
+#define PRIoMAX     "I64o"
+#define PRIuMAX     "I64u"
+#define PRIxMAX     "I64x"
+#define PRIXMAX     "I64X"
+
+#define PRIoPTR     "Io"
+#define PRIuPTR     "Iu"
+#define PRIxPTR     "Ix"
+#define PRIXPTR     "IX"
+
+// The fscanf macros for signed integers are:
+#define SCNd8       "d"
+#define SCNi8       "i"
+#define SCNdLEAST8  "d"
+#define SCNiLEAST8  "i"
+#define SCNdFAST8   "d"
+#define SCNiFAST8   "i"
+
+#define SCNd16       "hd"
+#define SCNi16       "hi"
+#define SCNdLEAST16  "hd"
+#define SCNiLEAST16  "hi"
+#define SCNdFAST16   "hd"
+#define SCNiFAST16   "hi"
+
+#define SCNd32       "ld"
+#define SCNi32       "li"
+#define SCNdLEAST32  "ld"
+#define SCNiLEAST32  "li"
+#define SCNdFAST32   "ld"
+#define SCNiFAST32   "li"
+
+#define SCNd64       "I64d"
+#define SCNi64       "I64i"
+#define SCNdLEAST64  "I64d"
+#define SCNiLEAST64  "I64i"
+#define SCNdFAST64   "I64d"
+#define SCNiFAST64   "I64i"
+
+#define SCNdMAX     "I64d"
+#define SCNiMAX     "I64i"
+
+#ifdef _WIN64 // [
+#  define SCNdPTR     "I64d"
+#  define SCNiPTR     "I64i"
+#else  // _WIN64 ][
+#  define SCNdPTR     "ld"
+#  define SCNiPTR     "li"
+#endif  // _WIN64 ]
+
+// The fscanf macros for unsigned integers are:
+#define SCNo8       "o"
+#define SCNu8       "u"
+#define SCNx8       "x"
+#define SCNX8       "X"
+#define SCNoLEAST8  "o"
+#define SCNuLEAST8  "u"
+#define SCNxLEAST8  "x"
+#define SCNXLEAST8  "X"
+#define SCNoFAST8   "o"
+#define SCNuFAST8   "u"
+#define SCNxFAST8   "x"
+#define SCNXFAST8   "X"
+
+#define SCNo16       "ho"
+#define SCNu16       "hu"
+#define SCNx16       "hx"
+#define SCNX16       "hX"
+#define SCNoLEAST16  "ho"
+#define SCNuLEAST16  "hu"
+#define SCNxLEAST16  "hx"
+#define SCNXLEAST16  "hX"
+#define SCNoFAST16   "ho"
+#define SCNuFAST16   "hu"
+#define SCNxFAST16   "hx"
+#define SCNXFAST16   "hX"
+
+#define SCNo32       "lo"
+#define SCNu32       "lu"
+#define SCNx32       "lx"
+#define SCNX32       "lX"
+#define SCNoLEAST32  "lo"
+#define SCNuLEAST32  "lu"
+#define SCNxLEAST32  "lx"
+#define SCNXLEAST32  "lX"
+#define SCNoFAST32   "lo"
+#define SCNuFAST32   "lu"
+#define SCNxFAST32   "lx"
+#define SCNXFAST32   "lX"
+
+#define SCNo64       "I64o"
+#define SCNu64       "I64u"
+#define SCNx64       "I64x"
+#define SCNX64       "I64X"
+#define SCNoLEAST64  "I64o"
+#define SCNuLEAST64  "I64u"
+#define SCNxLEAST64  "I64x"
+#define SCNXLEAST64  "I64X"
+#define SCNoFAST64   "I64o"
+#define SCNuFAST64   "I64u"
+#define SCNxFAST64   "I64x"
+#define SCNXFAST64   "I64X"
+
+#define SCNoMAX     "I64o"
+#define SCNuMAX     "I64u"
+#define SCNxMAX     "I64x"
+#define SCNXMAX     "I64X"
+
+#ifdef _WIN64 // [
+#  define SCNoPTR     "I64o"
+#  define SCNuPTR     "I64u"
+#  define SCNxPTR     "I64x"
+#  define SCNXPTR     "I64X"
+#else  // _WIN64 ][
+#  define SCNoPTR     "lo"
+#  define SCNuPTR     "lu"
+#  define SCNxPTR     "lx"
+#  define SCNXPTR     "lX"
+#endif  // _WIN64 ]
+
+#endif // __STDC_FORMAT_MACROS ]
+
+// 7.8.2 Functions for greatest-width integer types
+
+// 7.8.2.1 The imaxabs function
+#define imaxabs _abs64
+
+// 7.8.2.2 The imaxdiv function
+
+// This is modified version of div() function from Microsoft's div.c found
+// in %MSVC.NET%\crt\src\div.c
+#ifdef STATIC_IMAXDIV // [
+static
+#else // STATIC_IMAXDIV ][
+_inline
+#endif // STATIC_IMAXDIV ]
+imaxdiv_t __cdecl imaxdiv(intmax_t numer, intmax_t denom)
+{
+   imaxdiv_t result;
+
+   result.quot = numer / denom;
+   result.rem = numer % denom;
+
+   if (numer < 0 && result.rem > 0) {
+      // did division wrong; must fix up
+      ++result.quot;
+      result.rem -= denom;
+   }
+
+   return result;
+}
+
+// 7.8.2.3 The strtoimax and strtoumax functions
+#define strtoimax _strtoi64
+#define strtoumax _strtoui64
+
+// 7.8.2.4 The wcstoimax and wcstoumax functions
+#define wcstoimax _wcstoi64
+#define wcstoumax _wcstoui64
+
+
+#endif // _MSC_INTTYPES_H_ ]
diff --git a/Source/Plugins/vpo_dll/m_bbox.cc b/Source/Plugins/vpo_dll/m_bbox.cc
new file mode 100644
index 0000000..348f34a
--- /dev/null
+++ b/Source/Plugins/vpo_dll/m_bbox.cc
@@ -0,0 +1,61 @@
+// Emacs style mode select   -*- C++ -*- 
+//-----------------------------------------------------------------------------
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005 Simon Howard
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+// 02111-1307, USA.
+//
+// DESCRIPTION:
+//	Main loop menu stuff.
+//	Random number LUT.
+//	Default Config File.
+//	PCX Screenshots.
+//
+//-----------------------------------------------------------------------------
+
+#include "vpo_local.h"
+
+namespace vpo
+{
+
+
+void M_ClearBox (fixed_t *box)
+{
+    box[BOXTOP] = box[BOXRIGHT] = INT_MIN;
+    box[BOXBOTTOM] = box[BOXLEFT] = INT_MAX;
+}
+
+void
+M_AddToBox
+( fixed_t*	box,
+  fixed_t	x,
+  fixed_t	y )
+{
+    if (x<box[BOXLEFT])
+	box[BOXLEFT] = x;
+    else if (x>box[BOXRIGHT])
+	box[BOXRIGHT] = x;
+    if (y<box[BOXBOTTOM])
+	box[BOXBOTTOM] = y;
+    else if (y>box[BOXTOP])
+	box[BOXTOP] = y;
+}
+
+
+
+} // namespace vpo
+
diff --git a/Source/Plugins/vpo_dll/m_bbox.h b/Source/Plugins/vpo_dll/m_bbox.h
new file mode 100644
index 0000000..3788044
--- /dev/null
+++ b/Source/Plugins/vpo_dll/m_bbox.h
@@ -0,0 +1,55 @@
+// Emacs style mode select   -*- C++ -*- 
+//-----------------------------------------------------------------------------
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005 Simon Howard
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+// 02111-1307, USA.
+//
+// DESCRIPTION:
+//    Nil.
+//    
+//-----------------------------------------------------------------------------
+
+
+#ifndef __M_BBOX__
+#define __M_BBOX__
+
+#include <limits.h>
+
+#include "m_fixed.h"
+
+
+// Bounding box coordinate storage.
+enum
+{
+    BOXTOP,
+    BOXBOTTOM,
+    BOXLEFT,
+    BOXRIGHT
+};	// bbox coordinates
+
+// Bounding box functions.
+void M_ClearBox (fixed_t*	box);
+
+void
+M_AddToBox
+( fixed_t*	box,
+  fixed_t	x,
+  fixed_t	y );
+
+
+#endif
diff --git a/Source/Plugins/vpo_dll/m_fixed.cc b/Source/Plugins/vpo_dll/m_fixed.cc
new file mode 100644
index 0000000..e11bee6
--- /dev/null
+++ b/Source/Plugins/vpo_dll/m_fixed.cc
@@ -0,0 +1,66 @@
+// Emacs style mode select   -*- C++ -*- 
+//-----------------------------------------------------------------------------
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005 Simon Howard
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+// 02111-1307, USA.
+//
+// DESCRIPTION:
+//	Fixed point implementation.
+//
+//-----------------------------------------------------------------------------
+
+#include "vpo_local.h"
+
+namespace vpo
+{
+
+// Fixme. __USE_C_FIXED__ or something.
+
+fixed_t
+FixedMul
+( fixed_t	a,
+  fixed_t	b )
+{
+    return ((int64_t) a * (int64_t) b) >> FRACBITS;
+}
+
+
+
+//
+// FixedDiv, C version.
+//
+
+fixed_t FixedDiv(fixed_t a, fixed_t b)
+{
+    if ((abs(a) >> 14) >= abs(b))
+    {
+	return (a^b) < 0 ? INT_MIN : INT_MAX;
+    }
+    else
+    {
+	int64_t result;
+
+	result = ((int64_t) a << 16) / b;
+
+	return (fixed_t) result;
+    }
+}
+
+
+} // namespace vpo
+
diff --git a/Source/Plugins/vpo_dll/m_fixed.h b/Source/Plugins/vpo_dll/m_fixed.h
new file mode 100644
index 0000000..f76b976
--- /dev/null
+++ b/Source/Plugins/vpo_dll/m_fixed.h
@@ -0,0 +1,42 @@
+// Emacs style mode select   -*- C++ -*- 
+//-----------------------------------------------------------------------------
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005 Simon Howard
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+// 02111-1307, USA.
+//
+// DESCRIPTION:
+//	Fixed point arithemtics, implementation.
+//
+//-----------------------------------------------------------------------------
+
+
+#ifndef __M_FIXED__
+#define __M_FIXED__
+
+//
+// Fixed point, 32bit as 16.16.
+//
+#define FRACBITS		16
+#define FRACUNIT		(1<<FRACBITS)
+
+typedef int fixed_t;
+
+fixed_t FixedMul	(fixed_t a, fixed_t b);
+fixed_t FixedDiv	(fixed_t a, fixed_t b);
+
+#endif
diff --git a/Source/Plugins/vpo_dll/p_setup.cc b/Source/Plugins/vpo_dll/p_setup.cc
new file mode 100644
index 0000000..4644e0e
--- /dev/null
+++ b/Source/Plugins/vpo_dll/p_setup.cc
@@ -0,0 +1,925 @@
+//-----------------------------------------------------------------------------
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005 Simon Howard
+// Copyright(C) 2014 Andrew Apted
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+// 02111-1307, USA.
+//
+// DESCRIPTION:
+//	Do all the WAD I/O, get map description,
+//	set up initial state and misc. LUTs.
+//
+//-----------------------------------------------------------------------------
+
+#include "vpo_local.h"
+
+namespace vpo
+{
+
+
+// the error message returned from P_SetupLevel()
+static char  level_error_msg[1024];
+
+// this exception is thrown during P_SetupLevel() when a map with bad data
+// is detected (e.g. vertex number out of range).  The above message buffer
+// should contain the error message.  [added by andrewj]
+class invalid_data_exception { };
+
+
+static bool level_is_hexen;
+
+
+//
+// MAP related Lookup tables.
+// Store VERTEXES, LINEDEFS, SIDEDEFS, etc.
+//
+vertex_t*	vertexes;
+int		numvertexes;
+
+seg_t*		segs;
+int		numsegs;
+
+sector_t*	sectors;
+int		numsectors;
+
+subsector_t*	subsectors;
+int		numsubsectors;
+
+node_t*		nodes;
+int		numnodes;
+
+line_t*		lines;
+int		numlines;
+
+side_t*		sides;
+int		numsides;
+
+
+fixed_t  Map_bbox[4];
+
+
+static int R_TextureNumForName (const char * name)
+{
+	// "NoTexture" marker.
+	if (name[0] == '-')         
+		return 0;
+
+	return 1;  // dummy value
+}
+
+static int R_FlatNumForName (const char * name)
+{
+	// SKY ?
+	if (name[0] == 'F' && name[1] == '_' && name[2] == 'S' && name[3] == 'K')
+		return skyflatnum;
+
+	return 1;  // dummy value
+}
+
+
+static void LevelError(const char *msg, ...)
+{
+	va_list argptr;
+
+	va_start(argptr, msg);
+	memset(level_error_msg, 0, sizeof(level_error_msg));
+	vsnprintf(level_error_msg, sizeof(level_error_msg) - 1, msg, argptr);
+	va_end(argptr);
+
+	throw invalid_data_exception();
+}
+
+
+//
+// P_LoadVertexes
+//
+void P_LoadVertexes (int lump)
+{
+	byte*		data;
+	int			i;
+	mapvertex_t*	ml;
+	vertex_t*		li;
+
+	// Determine number of lumps:
+	//  total lump length / vertex record length.
+	numvertexes = W_LumpLength (lump) / sizeof(mapvertex_t);
+
+	// Allocate zone memory for buffer.
+	vertexes = new vertex_t[numvertexes];
+
+	// Load data into cache.
+	data = W_LoadLump (lump);
+
+	ml = (mapvertex_t *)data;
+	li = vertexes;
+
+	// Copy and convert vertex coordinates,
+	// internal representation as fixed.
+	for (i=0 ; i < numvertexes ; i++, li++, ml++)
+	{
+		li->x = SHORT(ml->x)<<FRACBITS;
+		li->y = SHORT(ml->y)<<FRACBITS;
+	}
+
+	// Free buffer memory.
+	W_FreeLump(data);
+}
+
+
+//
+// GetSectorAtNullAddress
+//
+sector_t * GetSectorAtNullAddress(void)
+{
+	return sectors + 0;
+}
+
+
+//
+// P_LoadSegs
+//
+void P_LoadSegs (int lump)
+{
+	byte*		data;
+	int		i;
+	mapseg_t*	ml;
+	seg_t*		li;
+	line_t*		ldef;
+	int		side;
+	int             sidenum;
+
+	numsegs = W_LumpLength (lump) / sizeof(mapseg_t);
+	segs = new seg_t[numsegs];
+
+	memset (segs, 0, numsegs*sizeof(seg_t));
+
+	data = W_LoadLump (lump);
+
+	ml = (mapseg_t *)data;
+	li = segs;
+
+	for (i=0 ; i < numsegs ; i++, li++, ml++)
+	{
+		int v1_idx = SHORT(ml->v1);
+		int v2_idx = SHORT(ml->v2);
+
+		if (v1_idx < 0 || v1_idx >= numvertexes ||
+		    v2_idx < 0 || v2_idx >= numvertexes)
+		{
+			LevelError("Bad map data : vertex out of range (seg #%d)", i);
+		}
+
+		li->v1 = &vertexes[v1_idx];
+		li->v2 = &vertexes[v2_idx];
+
+		int line_idx = SHORT(ml->linedef);
+
+		if (line_idx < 0 || line_idx >= numlines)
+		{
+			LevelError("Bad map data : linedef out of range (seg #%d)", i);
+		}
+
+		li->angle = (SHORT(ml->angle))<<16;
+		li->offset = (SHORT(ml->offset))<<16;
+
+		ldef = &lines[line_idx];
+		li->linedef = ldef;
+
+		side = SHORT(ml->side);
+		li->sidedef = &sides[ldef->sidenum[side]];
+		li->frontsector = sides[ldef->sidenum[side]].sector;
+
+		if (ldef-> flags & ML_TWOSIDED)
+		{
+			sidenum = ldef->sidenum[side ^ 1];
+
+			// If the sidenum is out of range, this may be a "glass hack"
+			// impassible window.  Point at side #0 (this may not be
+			// the correct Vanilla behavior; however, it seems to work for
+			// OTTAWAU.WAD, which is the one place I've seen this trick
+			// used).
+
+			if (sidenum < 0 || sidenum >= numsides)
+			{
+				li->backsector = GetSectorAtNullAddress();
+			}
+			else
+			{
+				li->backsector = sides[sidenum].sector;
+			}
+		}
+		else
+		{
+			li->backsector = NULL;
+		}
+	}
+
+	W_FreeLump(data);
+}
+
+
+//
+// P_LoadSubsectors
+//
+void P_LoadSubsectors (int lump)
+{
+	byte*		data;
+	int			i;
+	mapsubsector_t*	ms;
+	subsector_t*	ss;
+
+	numsubsectors = W_LumpLength (lump) / sizeof(mapsubsector_t);
+	subsectors = new subsector_t[numsubsectors];
+
+	data = W_LoadLump (lump);
+
+	ms = (mapsubsector_t *)data;
+	memset (subsectors,0, numsubsectors*sizeof(subsector_t));
+	ss = subsectors;
+
+	for (i=0 ; i < numsubsectors ; i++, ss++, ms++)
+	{
+		ss->numlines = SHORT(ms->numsegs);
+		ss->firstline = SHORT(ms->firstseg);
+	}
+
+	W_FreeLump(data);
+}
+
+
+// andrewj: added this
+static void ValidateSubsectors ()
+{
+	int i;
+	subsector_t * ss = subsectors;
+
+	for (i=0 ; i < numsubsectors ; i++, ss++)
+	{
+		if (ss->firstline < 0 || ss->numlines < 0 ||
+		    ss->firstline + ss->numlines > numsegs)
+		{
+			LevelError("Bad map data : invalid seg range in subsector #%d\n", i);
+		}
+	}
+}
+
+
+//
+// P_LoadSectors
+//
+void P_LoadSectors (int lump)
+{
+	byte*		data;
+	int			i;
+	mapsector_t*	ms;
+	sector_t*		ss;
+
+	numsectors = W_LumpLength (lump) / sizeof(mapsector_t);
+	sectors = new sector_t[numsectors];
+
+	memset (sectors, 0, numsectors*sizeof(sector_t));
+	data = W_LoadLump (lump);
+
+	ms = (mapsector_t *)data;
+	ss = sectors;
+
+	for (i=0 ; i < numsectors ; i++, ss++, ms++)
+	{
+		ss->floorheight = SHORT(ms->floorheight)<<FRACBITS;
+		ss->ceilingheight = SHORT(ms->ceilingheight)<<FRACBITS;
+		ss->floorpic = R_FlatNumForName(ms->floorpic);
+		ss->ceilingpic = R_FlatNumForName(ms->ceilingpic);
+		ss->lightlevel = SHORT(ms->lightlevel);
+		ss->special = SHORT(ms->special);
+		ss->tag = SHORT(ms->tag);
+		///	ss->thinglist = NULL;
+	}
+
+	W_FreeLump(data);
+}
+
+
+static bool isChildValid(unsigned short child)
+{
+	if (child & NF_SUBSECTOR)
+		return ((child & ~NF_SUBSECTOR) < numsubsectors);
+	else
+		return (child < numnodes);
+}
+
+
+//
+// P_LoadNodes
+//
+void P_LoadNodes (int lump)
+{
+	byte*	data;
+	int		i;
+	int		j;
+	int		k;
+	mapnode_t*	mn;
+	node_t*	no;
+
+	numnodes = W_LumpLength (lump) / sizeof(mapnode_t);
+	nodes = new node_t[numnodes];
+
+	data = W_LoadLump (lump);
+
+	mn = (mapnode_t *)data;
+	no = nodes;
+
+	for (i=0 ; i < numnodes ; i++, no++, mn++)
+	{
+		no->x = SHORT(mn->x)<<FRACBITS;
+		no->y = SHORT(mn->y)<<FRACBITS;
+		no->dx = SHORT(mn->dx)<<FRACBITS;
+		no->dy = SHORT(mn->dy)<<FRACBITS;
+
+		for (j=0 ; j < 2 ; j++)
+		{
+			unsigned short child = SHORT(mn->children[j]);
+
+			if (! isChildValid(child))
+				LevelError("Bad map data : invalid child in node #%d", i);
+
+			no->children[j] = child;
+
+			for (k=0 ; k < 4 ; k++)
+				no->bbox[j][k] = SHORT(mn->bbox[j][k])<<FRACBITS;
+		}
+	}
+
+	W_FreeLump(data);
+}
+
+
+/* andrewj : removed P_LoadThings(), not needed for Visplane Explorer */
+
+
+static void LineDef_CommonSetup(line_t *ld)
+{
+	vertex_t *v1 = ld->v1;
+	vertex_t *v2 = ld->v2;
+
+	ld->dx = v2->x - v1->x;
+	ld->dy = v2->y - v1->y;
+
+	if (!ld->dx)
+		ld->slopetype = ST_VERTICAL;
+	else if (!ld->dy)
+		ld->slopetype = ST_HORIZONTAL;
+	else
+	{
+		if (FixedDiv (ld->dy , ld->dx) > 0)
+			ld->slopetype = ST_POSITIVE;
+		else
+			ld->slopetype = ST_NEGATIVE;
+	}
+
+	if (v1->x < v2->x)
+	{
+		ld->bbox[BOXLEFT] = v1->x;
+		ld->bbox[BOXRIGHT] = v2->x;
+	}
+	else
+	{
+		ld->bbox[BOXLEFT] = v2->x;
+		ld->bbox[BOXRIGHT] = v1->x;
+	}
+
+	if (v1->y < v2->y)
+	{
+		ld->bbox[BOXBOTTOM] = v1->y;
+		ld->bbox[BOXTOP] = v2->y;
+	}
+	else
+	{
+		ld->bbox[BOXBOTTOM] = v2->y;
+		ld->bbox[BOXTOP] = v1->y;
+	}
+
+	// andrewj: be tolerant of bad sidedef numbers
+	if (ld->sidenum[0] < 0 || ld->sidenum[0] >= numsides)
+	{
+		if (numsides == 0)
+			LevelError("Bad map data : no sidedefs!");
+
+		ld->sidenum[0] = 0;
+	}
+
+	if (ld->sidenum[1] < -1 || ld->sidenum[1] >= numsides)
+		ld->sidenum[1] = -1;
+
+
+	if (ld->sidenum[0] != -1)
+		ld->frontsector = sides[ld->sidenum[0]].sector;
+	else
+		ld->frontsector = NULL;
+
+	if (ld->sidenum[1] != -1)
+		ld->backsector = sides[ld->sidenum[1]].sector;
+	else
+		ld->backsector = NULL;
+}
+
+
+//
+// P_LoadLineDefs
+// Also counts secret lines for intermissions.
+//
+void P_LoadLineDefs (int lump)
+{
+	byte*		data;
+	int		i;
+	maplinedef_t*	mld;
+	line_t*		ld;
+
+	numlines = W_LumpLength (lump) / sizeof(maplinedef_t);
+	lines = new line_t[numlines];
+
+	memset (lines, 0, numlines*sizeof(line_t));
+	data = W_LoadLump (lump);
+
+	mld = (maplinedef_t *)data;
+	ld = lines;
+
+	for (i=0 ; i < numlines ; i++, mld++, ld++)
+	{
+		int v1_idx = SHORT(mld->v1);
+		int v2_idx = SHORT(mld->v2);
+
+		if (v1_idx < 0 || v1_idx >= numvertexes ||
+		    v2_idx < 0 || v2_idx >= numvertexes)
+		{
+			LevelError("Bad map data : vertex out of range (line #%d)", i);
+		}
+
+		ld->v1 = &vertexes[v1_idx];
+		ld->v2 = &vertexes[v2_idx];
+		
+		ld->flags = SHORT(mld->flags);
+		ld->special = SHORT(mld->special);
+		ld->tag = SHORT(mld->tag);
+		ld->sidenum[0] = SHORT(mld->sidenum[0]);
+		ld->sidenum[1] = SHORT(mld->sidenum[1]);
+
+		LineDef_CommonSetup(ld);
+	}
+
+	W_FreeLump(data);
+}
+
+
+// andrewj: added this for Hexen support
+void P_LoadLineDefs_Hexen (int lump)
+{
+	byte*			data;
+	int			i, k;
+	maplinedef_hexen_t*	mld;
+	line_t*			ld;
+
+	numlines = W_LumpLength (lump) / sizeof(maplinedef_hexen_t);
+	lines = new line_t[numlines];
+
+	memset (lines, 0, numlines*sizeof(line_t));
+	data = W_LoadLump (lump);
+
+	mld = (maplinedef_hexen_t *)data;
+	ld = lines;
+
+	for (i=0 ; i < numlines ; i++, mld++, ld++)
+	{
+		int v1_idx = SHORT(mld->v1);
+		int v2_idx = SHORT(mld->v2);
+
+		if (v1_idx < 0 || v1_idx >= numvertexes ||
+		    v2_idx < 0 || v2_idx >= numvertexes)
+		{
+			LevelError("Bad map data : vertex out of range (line #%d)", i);
+		}
+
+		ld->v1 = &vertexes[v1_idx];
+		ld->v2 = &vertexes[v2_idx];
+
+		ld->flags = SHORT(mld->flags);
+		ld->special = mld->special;
+		ld->tag = 0;
+		ld->sidenum[0] = SHORT(mld->sidenum[0]);
+		ld->sidenum[1] = SHORT(mld->sidenum[1]);
+
+		for (k = 0 ; k < 5 ; k++)
+			ld->args[k] = mld->args[k];
+
+		LineDef_CommonSetup(ld);
+	}
+
+	W_FreeLump(data);
+}
+
+
+//
+// P_LoadSideDefs
+//
+void P_LoadSideDefs (int lump)
+{
+	byte*		data;
+	int			i;
+	mapsidedef_t*	msd;
+	side_t*		sd;
+
+	numsides = W_LumpLength (lump) / sizeof(mapsidedef_t);
+	sides = new side_t[numsides];
+
+	memset (sides, 0, numsides*sizeof(side_t));
+	data = W_LoadLump (lump);
+
+	msd = (mapsidedef_t *)data;
+	sd = sides;
+
+	for (i=0 ; i < numsides ; i++, msd++, sd++)
+	{
+		int sec_idx = SHORT(msd->sector);
+
+		// andrewj : silently fix a bad sector number
+		if (sec_idx < 0 || sec_idx >= numsectors)
+		{
+			if (numsectors == 0)
+				LevelError("Bad map data : no sectors!");
+
+			sec_idx = 0;
+		}
+
+		sd->textureoffset = SHORT(msd->textureoffset)<<FRACBITS;
+		sd->rowoffset = SHORT(msd->rowoffset)<<FRACBITS;
+		sd->toptexture = R_TextureNumForName(msd->toptexture);
+		sd->bottomtexture = R_TextureNumForName(msd->bottomtexture);
+		sd->midtexture = R_TextureNumForName(msd->midtexture);
+		sd->sector = &sectors[sec_idx];
+	}
+
+	W_FreeLump(data);
+}
+
+
+
+//
+// P_GroupLines
+// Builds sector line lists and subsector sector numbers.
+// Finds block bounding boxes for sectors.
+//
+void P_GroupLines (void)
+{
+	line_t**		linebuffer;
+	int			i;
+	int			j;
+	line_t*		li;
+	sector_t*		sector;
+	subsector_t*	ss;
+	seg_t*		seg;
+	fixed_t		bbox[4];
+	int  totallines;
+
+	// look up sector number for each subsector
+	ss = subsectors;
+	for (i=0 ; i < numsubsectors ; i++, ss++)
+	{
+		seg = &segs[ss->firstline];
+		ss->sector = seg->sidedef->sector;
+	}
+
+	// count number of lines in each sector
+	li = lines;
+	totallines = 0;
+	for (i=0 ; i < numlines ; i++, li++)
+	{
+		totallines++;
+		li->frontsector->linecount++;
+
+		if (li->backsector && li->backsector != li->frontsector)
+		{
+			li->backsector->linecount++;
+			totallines++;
+		}
+	}
+
+	// build line tables for each sector	
+	linebuffer = new line_t* [totallines];
+
+	for (i=0; i < numsectors; ++i)
+	{
+		// Assign the line buffer for this sector
+
+		sectors[i].lines = linebuffer;
+		linebuffer += sectors[i].linecount;
+
+		// Reset linecount to zero so in the next stage we can count
+		// lines into the list.
+
+		sectors[i].linecount = 0;
+	}
+
+	// Assign lines to sectors
+
+	for (i=0; i < numlines; ++i)
+	{ 
+		li = &lines[i];
+
+		if (li->frontsector != NULL)
+		{
+			sector = li->frontsector;
+
+			sector->lines[sector->linecount] = li;
+			++sector->linecount;
+		}
+
+		if (li->backsector != NULL && li->frontsector != li->backsector)
+		{
+			sector = li->backsector;
+
+			sector->lines[sector->linecount] = li;
+			++sector->linecount;
+		}
+	}
+
+	// Generate bounding boxes for sectors
+
+	sector = sectors;
+	for (i=0 ; i < numsectors ; i++, sector++)
+	{
+		M_ClearBox (bbox);
+
+		for (j=0 ; j < sector->linecount; j++)
+		{
+			li = sector->lines[j];
+
+			M_AddToBox (bbox, li->v1->x, li->v1->y);
+			M_AddToBox (bbox, li->v2->x, li->v2->y);
+		}
+	}
+
+	// andrewj : generate bounding box for level
+
+	M_ClearBox (Map_bbox);
+
+	for (i=0; i < numlines; ++i)
+	{ 
+		li = &lines[i];
+
+		M_AddToBox (Map_bbox, li->v1->x, li->v1->y);
+		M_AddToBox (Map_bbox, li->v2->x, li->v2->y);
+	}
+}
+
+
+//
+// andrewj: added this
+//
+// Find sectors which seem to be doors.
+// Main criterion is that sector is closed, and either has a tag
+// or one of the linedefs has a manual door type.
+//
+static int HasManualDoor(const sector_t *sec)
+{
+	int k;
+
+	for (k = 0 ; k < sec->linecount ; k++)
+	{
+		const line_t *L = sec->lines[k];
+
+		if (level_is_hexen)
+		{
+			switch (L->special)
+			{
+				case 10: case 11: case 12: case 13:
+				case 202: /* zdoom's Generic_Door */
+				{
+					if (L->args[0] == 0)
+						return +1;
+				}
+				default: break;
+			}
+		}
+		else
+		{
+			switch (L->special)
+			{
+				case 1: case 26: case 27: case 28:
+				case 31: case 32: case 33: case 34:
+				case 117: case 118:
+					return +1;
+
+				default: break;
+			}
+		}
+	}
+
+	return 0;
+}
+
+static void CalcDoorAltHeight(sector_t *sec)
+{
+	fixed_t door_h = sec->floorheight;  // == sec->ceilingheight
+
+	// compute lowest ceiling and highest floor of neighbor sectors
+	fixed_t low_ceil   =  32767 << FRACBITS;
+	fixed_t high_floor = -32767 << FRACBITS;
+
+	int k, pass;
+
+	for (k = 0 ; k < sec->linecount ; k++)
+	{
+		const line_t *L = sec->lines[k];
+
+		for (pass = 0 ; pass < 2 ; pass++)
+		{
+			const sector_t *nb = pass ? L->backsector : L->frontsector;
+
+			if (nb && nb != sec)
+			{
+				if (low_ceil > nb->ceilingheight)
+					low_ceil = nb->ceilingheight;
+
+				if (high_floor < nb->floorheight)
+					high_floor = nb->floorheight;
+			}
+		}
+	}
+
+	// see if this is actually a lowering floor
+	// (like used on MAP12 of DOOM 2)
+
+	fixed_t mid_h = (low_ceil >> 1) + (high_floor >> 1);
+
+	if (door_h > mid_h)
+	{
+		sec->is_door = -1;
+		sec->alt_height = high_floor;
+	}
+	else
+	{
+		// is_door already set to +1
+		sec->alt_height = low_ceil - (4 * FRACUNIT);
+	}
+}
+
+void P_DetectDoorSectors(void)
+{
+	int i;
+
+	for (i = 0 ; i < numsectors ; i++)
+	{
+		sector_t *sec = &sectors[i];
+
+		if (sec->floorheight != sec->ceilingheight)
+			continue;
+
+		if (sec->tag || HasManualDoor(sec))
+		{
+			sec->is_door = +1;
+
+			CalcDoorAltHeight(sec);
+		}
+	}
+}
+
+
+//
+// P_SetupLevel
+//
+// Returns an error message if something went wrong
+// or NULL on success.
+//
+const char * P_SetupLevel ( const char *lumpname, bool *is_hexen )
+{
+	int base = W_CheckNumForName(lumpname);
+
+	if (base < 0 || ! lumpinfo[base].is_map_header)
+	{
+		sprintf(level_error_msg, "No such map in wad: %s", lumpname);
+		return level_error_msg;
+	}
+
+	level_is_hexen = lumpinfo[base].is_hexen;
+
+	if (is_hexen)
+		*is_hexen = level_is_hexen;
+
+	// check that we have some nodes
+	if (lumpinfo[base + ML_SEGS].size == 0)
+	{
+		sprintf(level_error_msg, "Missing nodes for: %s", lumpname);
+		return level_error_msg;
+	}
+
+	W_BeginRead();
+
+	try
+	{
+		// note: most of this ordering is important	
+		///    P_LoadBlockMap (base + ML_BLOCKMAP);
+		P_LoadVertexes (base + ML_VERTEXES);
+		P_LoadSectors (base + ML_SECTORS);
+		P_LoadSideDefs (base + ML_SIDEDEFS);
+
+		if (level_is_hexen)
+			P_LoadLineDefs_Hexen (base + ML_LINEDEFS);
+		else
+			P_LoadLineDefs (base + ML_LINEDEFS);
+
+		P_LoadSubsectors (base + ML_SSECTORS);
+		P_LoadNodes (base + ML_NODES);
+		P_LoadSegs (base + ML_SEGS);
+
+		ValidateSubsectors();
+	}
+	catch (invalid_data_exception)
+	{
+		W_EndRead();
+		P_FreeLevelData();
+
+		return level_error_msg;
+	}
+
+	W_EndRead();
+
+	P_GroupLines ();
+
+	// andrewj: added this
+	P_DetectDoorSectors();
+
+	return NULL;
+}
+
+
+void P_FreeLevelData (void)
+{
+	if (vertexes)
+	{
+		delete[] vertexes;
+		vertexes = NULL;
+		numvertexes = 0;
+	}
+
+	if (sectors)
+	{
+		delete[] sectors;
+		sectors = NULL;
+		numsectors = 0;
+	}
+
+	if (sides)
+	{
+		delete[] sides;
+		sides = NULL;
+		numsides = 0;
+	}
+
+	if (lines)
+	{
+		delete[] lines;
+		lines = NULL;
+		numlines = 0;
+	}
+
+	if (segs)
+	{
+		delete[] segs;
+		segs = NULL;
+		numsegs = 0;
+	}
+
+	if (subsectors)
+	{
+		delete[] subsectors;
+		subsectors = NULL;
+		numsubsectors = 0;
+	}
+
+	if (nodes)
+	{
+		delete[] nodes;
+		nodes = NULL;
+		numnodes = 0;
+	}
+}
+
+
+} // namespace vpo
+
+//--- editor settings ---
+// vi:ts=4:sw=4:noexpandtab
+// Emacs style mode select   -*- C++ -*- 
diff --git a/Source/Plugins/vpo_dll/r_bsp.cc b/Source/Plugins/vpo_dll/r_bsp.cc
new file mode 100644
index 0000000..920fed7
--- /dev/null
+++ b/Source/Plugins/vpo_dll/r_bsp.cc
@@ -0,0 +1,577 @@
+// Emacs style mode select   -*- C++ -*- 
+//-----------------------------------------------------------------------------
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005 Simon Howard
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+// 02111-1307, USA.
+//
+// DESCRIPTION:
+//	BSP traversal, handling of LineSegs for rendering.
+//
+//-----------------------------------------------------------------------------
+
+#include "vpo_local.h"
+
+namespace vpo
+{
+
+
+seg_t*		curline;
+side_t*		sidedef;
+line_t*		linedef;
+sector_t*	frontsector;
+sector_t*	backsector;
+
+drawseg_t	drawsegs[MAXDRAWSEGS+10];
+drawseg_t*	ds_p;
+
+int total_drawsegs;
+
+
+void R_StoreWallRange ( int	start, int	stop );
+
+
+//
+// R_ClearDrawSegs
+//
+void R_ClearDrawSegs (void)
+{
+    total_drawsegs = 0;
+
+    ds_p = drawsegs;
+}
+
+
+
+//
+// ClipWallSegment
+// Clips the given range of columns
+// and includes it in the new clip list.
+//
+typedef	struct
+{
+    int	first;
+    int last;
+    
+} cliprange_t;
+
+
+// andrewj: increased limit to 128 for Visplane Explorer
+// #define MAXSOLIDSEGS		32
+#define MAXSOLIDSEGS  128
+
+// newend is one past the last valid seg
+cliprange_t	solidsegs[MAXSOLIDSEGS+8];
+cliprange_t*	newend;
+
+int max_solidsegs;
+
+
+
+//
+// R_ClipSolidWallSegment
+// Does handle solid walls,
+//  e.g. single sided LineDefs (middle texture)
+//  that entirely block the view.
+// 
+void
+R_ClipSolidWallSegment ( int   first, int   last )
+{
+    cliprange_t*	next;
+    cliprange_t*	start;
+
+    // Find the first range that touches the range
+    //  (adjacent pixels are touching).
+    start = solidsegs;
+    while (start->last < first-1)
+	start++;
+
+    if (first < start->first)
+    {
+	if (last < start->first-1)
+	{
+	    // Post is entirely visible (above start),
+	    //  so insert a new clippost.
+	    R_StoreWallRange (first, last);
+	    next = newend;
+	    newend++;
+
+      // andrewj: check for solidseg overflow
+      max_solidsegs = MAX(max_solidsegs, (newend - solidsegs));
+      if (max_solidsegs >= MAXSOLIDSEGS)
+        throw overflow_exception();
+	    
+	    while (next != start)
+	    {
+		*next = *(next-1);
+		next--;
+	    }
+	    next->first = first;
+	    next->last = last;
+	    return;
+	}
+		
+	// There is a fragment above *start.
+	R_StoreWallRange (first, start->first - 1);
+	// Now adjust the clip size.
+	start->first = first;	
+    }
+
+    // Bottom contained in start?
+    if (last <= start->last)
+	return;			
+		
+    next = start;
+    while (last >= (next+1)->first-1)
+    {
+	// There is a fragment between two posts.
+	R_StoreWallRange (next->last + 1, (next+1)->first - 1);
+	next++;
+	
+	if (last <= next->last)
+	{
+	    // Bottom is contained in next.
+	    // Adjust the clip size.
+	    start->last = next->last;	
+	    goto crunch;
+	}
+    }
+	
+    // There is a fragment after *next.
+    R_StoreWallRange (next->last + 1, last);
+    // Adjust the clip size.
+    start->last = last;
+	
+    // Remove start+1 to next from the clip list,
+    // because start now covers their area.
+  crunch:
+    if (next == start)
+    {
+	// Post just extended past the bottom of one post.
+	return;
+    }
+    
+
+    while (next++ != newend)
+    {
+	// Remove a post.
+	*++start = *next;
+    }
+
+    newend = start+1;
+
+    // andrewj: check for solidseg overflow
+    max_solidsegs = MAX(max_solidsegs, (newend - solidsegs));
+    if (max_solidsegs >= MAXSOLIDSEGS)
+      throw overflow_exception();
+}
+
+
+
+//
+// R_ClipPassWallSegment
+// Clips the given range of columns,
+//  but does not includes it in the clip list.
+// Does handle windows,
+//  e.g. LineDefs with upper and lower texture.
+//
+void R_ClipPassWallSegment ( int first, int last )
+{
+    cliprange_t*	start;
+
+    // Find the first range that touches the range
+    //  (adjacent pixels are touching).
+    start = solidsegs;
+    while (start->last < first-1)
+	start++;
+
+    if (first < start->first)
+    {
+	if (last < start->first-1)
+	{
+	    // Post is entirely visible (above start).
+	    R_StoreWallRange (first, last);
+	    return;
+	}
+		
+	// There is a fragment above *start.
+	R_StoreWallRange (first, start->first - 1);
+    }
+
+    // Bottom contained in start?
+    if (last <= start->last)
+	return;			
+		
+    while (last >= (start+1)->first-1)
+    {
+	// There is a fragment between two posts.
+	R_StoreWallRange (start->last + 1, (start+1)->first - 1);
+	start++;
+	
+	if (last <= start->last)
+	    return;
+    }
+	
+    // There is a fragment after *next.
+    R_StoreWallRange (start->last + 1, last);
+}
+
+
+
+//
+// R_ClearClipSegs
+//
+void R_ClearClipSegs (void)
+{
+    solidsegs[0].first = -0x7fffffff;
+    solidsegs[0].last = -1;
+    solidsegs[1].first = viewwidth;
+    solidsegs[1].last = 0x7fffffff;
+
+    newend = solidsegs+2;
+    max_solidsegs = 2;
+}
+
+//
+// R_AddLine
+// Clips the given segment
+// and adds any visible pieces to the line list.
+//
+void R_AddLine (seg_t*	line)
+{
+    int			x1;
+    int			x2;
+    angle_t		angle1;
+    angle_t		angle2;
+    angle_t		span;
+    angle_t		tspan;
+    
+    curline = line;
+
+    // OPTIMIZE: quickly reject orthogonal back sides.
+    angle1 = R_PointToAngle (line->v1->x, line->v1->y);
+    angle2 = R_PointToAngle (line->v2->x, line->v2->y);
+    
+    // Clip to view edges.
+    // OPTIMIZE: make constant out of 2*clipangle (FIELDOFVIEW).
+    span = angle1 - angle2;
+    
+    // Back side? I.e. backface culling?
+    if (span >= ANG180)
+	return;		
+
+    // Global angle needed by segcalc.
+    rw_angle1 = angle1;
+    angle1 -= viewangle;
+    angle2 -= viewangle;
+	
+    tspan = angle1 + clipangle;
+    if (tspan > 2*clipangle)
+    {
+	tspan -= 2*clipangle;
+
+	// Totally off the left edge?
+	if (tspan >= span)
+	    return;
+	
+	angle1 = clipangle;
+    }
+    tspan = clipangle - angle2;
+    if (tspan > 2*clipangle)
+    {
+	tspan -= 2*clipangle;
+
+	// Totally off the left edge?
+	if (tspan >= span)
+	    return;	
+	angle2 = -clipangle;
+    }
+    
+    // The seg is in the view range,
+    // but not necessarily visible.
+    angle1 = (angle1+ANG90)>>ANGLETOFINESHIFT;
+    angle2 = (angle2+ANG90)>>ANGLETOFINESHIFT;
+    x1 = viewangletox[angle1];
+    x2 = viewangletox[angle2];
+
+    // Does not cross a pixel?
+    if (x1 == x2)
+	return;				
+	
+    backsector = line->backsector;
+
+    // Single sided line?
+    if (!backsector)
+	goto clipsolid;		
+
+    // Closed door.
+    if (backsector->ceilingheight <= frontsector->floorheight
+	|| backsector->floorheight >= frontsector->ceilingheight)
+	goto clipsolid;		
+
+    // Window.
+    if (backsector->ceilingheight != frontsector->ceilingheight
+	|| backsector->floorheight != frontsector->floorheight)
+	goto clippass;	
+		
+    // Reject empty lines used for triggers
+    //  and special events.
+    // Identical floor and ceiling on both sides,
+    // identical light levels on both sides,
+    // and no middle texture.
+    if (backsector->ceilingpic == frontsector->ceilingpic
+	&& backsector->floorpic == frontsector->floorpic
+	&& backsector->lightlevel == frontsector->lightlevel
+	&& curline->sidedef->midtexture == 0)
+    {
+	return;
+    }
+    
+				
+  clippass:
+    R_ClipPassWallSegment (x1, x2-1);	
+    return;
+		
+  clipsolid:
+    R_ClipSolidWallSegment (x1, x2-1);
+}
+
+
+//
+// R_CheckBBox
+// Checks BSP node/subtree bounding box.
+// Returns true
+//  if some part of the bbox might be visible.
+//
+int	checkcoord[12][4] =
+{
+    {3,0,2,1},
+    {3,0,2,0},
+    {3,1,2,0},
+    {0},
+    {2,0,2,1},
+    {0,0,0,0},
+    {3,1,3,0},
+    {0},
+    {2,0,3,1},
+    {2,1,3,1},
+    {2,1,3,0}
+};
+
+
+boolean R_CheckBBox (fixed_t*	bspcoord)
+{
+    int			boxx;
+    int			boxy;
+    int			boxpos;
+
+    fixed_t		x1;
+    fixed_t		y1;
+    fixed_t		x2;
+    fixed_t		y2;
+    
+    angle_t		angle1;
+    angle_t		angle2;
+    angle_t		span;
+    angle_t		tspan;
+    
+    cliprange_t*	start;
+
+    int			sx1;
+    int			sx2;
+    
+    // Find the corners of the box
+    // that define the edges from current viewpoint.
+    if (viewx <= bspcoord[BOXLEFT])
+	boxx = 0;
+    else if (viewx < bspcoord[BOXRIGHT])
+	boxx = 1;
+    else
+	boxx = 2;
+		
+    if (viewy >= bspcoord[BOXTOP])
+	boxy = 0;
+    else if (viewy > bspcoord[BOXBOTTOM])
+	boxy = 1;
+    else
+	boxy = 2;
+		
+    boxpos = (boxy<<2)+boxx;
+    if (boxpos == 5)
+	return true;
+	
+    x1 = bspcoord[checkcoord[boxpos][0]];
+    y1 = bspcoord[checkcoord[boxpos][1]];
+    x2 = bspcoord[checkcoord[boxpos][2]];
+    y2 = bspcoord[checkcoord[boxpos][3]];
+    
+    // check clip list for an open space
+    angle1 = R_PointToAngle (x1, y1) - viewangle;
+    angle2 = R_PointToAngle (x2, y2) - viewangle;
+	
+    span = angle1 - angle2;
+
+    // Sitting on a line?
+    if (span >= ANG180)
+	return true;
+    
+    tspan = angle1 + clipangle;
+
+    if (tspan > 2*clipangle)
+    {
+	tspan -= 2*clipangle;
+
+	// Totally off the left edge?
+	if (tspan >= span)
+	    return false;	
+
+	angle1 = clipangle;
+    }
+    tspan = clipangle - angle2;
+    if (tspan > 2*clipangle)
+    {
+	tspan -= 2*clipangle;
+
+	// Totally off the left edge?
+	if (tspan >= span)
+	    return false;
+	
+	angle2 = -clipangle;
+    }
+
+
+    // Find the first clippost
+    //  that touches the source post
+    //  (adjacent pixels are touching).
+    angle1 = (angle1+ANG90)>>ANGLETOFINESHIFT;
+    angle2 = (angle2+ANG90)>>ANGLETOFINESHIFT;
+    sx1 = viewangletox[angle1];
+    sx2 = viewangletox[angle2];
+
+    // Does not cross a pixel.
+    if (sx1 == sx2)
+	return false;			
+    sx2--;
+	
+    start = solidsegs;
+    while (start->last < sx2)
+	start++;
+    
+    if (sx1 >= start->first
+	&& sx2 <= start->last)
+    {
+	// The clippost contains the new span.
+	return false;
+    }
+
+    return true;
+}
+
+
+
+//
+// R_Subsector
+// Determine floor/ceiling planes.
+// Add sprites of things in sector.
+// Draw one or more line segments.
+//
+void R_Subsector (int num)
+{
+    int			count;
+    seg_t*		line;
+    subsector_t*	sub;
+	
+#ifdef RANGECHECK
+    if (num>=numsubsectors)
+	I_Error ("R_Subsector: ss %i with numss = %i",
+		 num,
+		 numsubsectors);
+#endif
+
+    sscount++;
+    sub = &subsectors[num];
+    frontsector = sub->sector;
+    count = sub->numlines;
+    line = &segs[sub->firstline];
+
+    if (frontsector->floorheight < viewz)
+    {
+	floorplane = R_FindPlane (frontsector->floorheight,
+				  frontsector->floorpic,
+				  frontsector->lightlevel);
+    }
+    else
+	floorplane = NULL;
+    
+    if (frontsector->ceilingheight > viewz 
+	|| frontsector->ceilingpic == skyflatnum)
+    {
+	ceilingplane = R_FindPlane (frontsector->ceilingheight,
+				    frontsector->ceilingpic,
+				    frontsector->lightlevel);
+    }
+    else
+	ceilingplane = NULL;
+		
+////    R_AddSprites (frontsector);	
+
+    while (count--)
+    {
+	R_AddLine (line);
+	line++;
+    }
+}
+
+
+
+
+//
+// RenderBSPNode
+// Renders all subsectors below a given node,
+//  traversing subtree recursively.
+// Just call with BSP root.
+void R_RenderBSPNode (int bspnum)
+{
+    node_t*	bsp;
+    int		side;
+
+    // Found a subsector?
+    if (bspnum & NF_SUBSECTOR)
+    {
+	if (bspnum == -1)			
+	    R_Subsector (0);
+	else
+	    R_Subsector (bspnum&(~NF_SUBSECTOR));
+	return;
+    }
+		
+    bsp = &nodes[bspnum];
+    
+    // Decide which side the view point is on.
+    side = R_PointOnSide (viewx, viewy, bsp);
+
+    // Recursively divide front space.
+    R_RenderBSPNode (bsp->children[side]); 
+
+    // Possibly divide back space.
+    if (R_CheckBBox (bsp->bbox[side^1]))	
+	R_RenderBSPNode (bsp->children[side^1]);
+}
+
+
+} // namespace vpo
+
diff --git a/Source/Plugins/vpo_dll/r_bsp.h b/Source/Plugins/vpo_dll/r_bsp.h
new file mode 100644
index 0000000..45c534b
--- /dev/null
+++ b/Source/Plugins/vpo_dll/r_bsp.h
@@ -0,0 +1,57 @@
+// Emacs style mode select   -*- C++ -*- 
+//-----------------------------------------------------------------------------
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005 Simon Howard
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+// 02111-1307, USA.
+//
+// DESCRIPTION:
+//	Refresh module, BSP traversal and handling.
+//
+//-----------------------------------------------------------------------------
+
+#ifndef __R_BSP__
+#define __R_BSP__
+
+extern seg_t*		curline;
+extern side_t*		sidedef;
+extern line_t*		linedef;
+extern sector_t*	frontsector;
+extern sector_t*	backsector;
+
+extern int		rw_x;
+extern int		rw_stopx;
+
+extern boolean		segtextured;
+
+// false if the back side is the same plane
+extern boolean		markfloor;		
+extern boolean		markceiling;
+
+extern boolean		skymap;
+
+extern drawseg_t	drawsegs[MAXDRAWSEGS+10];
+extern drawseg_t*	ds_p;
+
+
+// BSP?
+void R_ClearClipSegs (void);
+void R_ClearDrawSegs (void);
+
+void R_RenderBSPNode (int bspnum);
+
+#endif
diff --git a/Source/Plugins/vpo_dll/r_defs.h b/Source/Plugins/vpo_dll/r_defs.h
new file mode 100644
index 0000000..cd6fb1d
--- /dev/null
+++ b/Source/Plugins/vpo_dll/r_defs.h
@@ -0,0 +1,308 @@
+//-----------------------------------------------------------------------------
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005 Simon Howard
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+// 02111-1307, USA.
+//
+// DESCRIPTION:
+//      Refresh/rendering module, shared data struct definitions.
+//
+//-----------------------------------------------------------------------------
+
+#ifndef __R_DEFS__
+#define __R_DEFS__
+
+
+// Silhouette, needed for clipping Segs (mainly)
+// and sprites representing things.
+#define SIL_NONE		0
+#define SIL_BOTTOM		1
+#define SIL_TOP			2
+#define SIL_BOTH		3
+
+// andrewj: increased for Visplane Explorer (was 256)
+#define MAXDRAWSEGS		1024
+
+
+#define skyflatnum  2
+
+
+extern fixed_t Map_bbox[4];
+
+
+//
+// INTERNAL MAP TYPES
+//  used by play and refresh
+//
+
+//
+// Your plain vanilla vertex.
+// Note: transformed values not buffered locally,
+//       like some DOOM-alikes ("wt", "WebView") did.
+//
+typedef struct
+{
+	fixed_t	x;
+	fixed_t	y;
+
+} vertex_t;
+
+
+// Forward of LineDefs, for Sectors.
+struct line_s;
+
+
+//
+// The SECTORS record, at runtime.
+// Stores things/mobjs.
+//
+typedef	struct
+{
+	fixed_t	floorheight;
+	fixed_t	ceilingheight;
+
+	short	floorpic;
+	short	ceilingpic;
+	short	lightlevel;
+	short	special;
+	short	tag;
+
+	// 0 = untraversed, 1,2 = sndlines -1
+	int		soundtraversed;
+
+	// if == validcount, already checked
+	int		validcount;
+
+	// thinker_t for reversable actions
+	void*	specialdata;
+
+	int			linecount;
+	struct line_s**	lines;	// [linecount] size
+
+	// andrewj: added these two field for Visplane Explorer.
+	//          is_door is normally 0,
+	//          can be +1 for a door (ceiling goes up)
+	//          or -1 for a lowering floor (e.g. MAP12 of DOOM 2)
+	int	is_door; 
+	fixed_t  alt_height;
+
+} sector_t;
+
+
+//
+// The SideDef.
+//
+typedef struct
+{
+	// add this to the calculated texture column
+	fixed_t	textureoffset;
+
+	// add this to the calculated texture top
+	fixed_t	rowoffset;
+
+	// Texture indices.
+	// We do not maintain names here. 
+	short	toptexture;
+	short	bottomtexture;
+	short	midtexture;
+
+	// Sector the SideDef is facing.
+	sector_t*	sector;
+
+} side_t;
+
+
+//
+// Move clipping aid for LineDefs.
+//
+typedef enum
+{
+	ST_HORIZONTAL,
+	ST_VERTICAL,
+	ST_POSITIVE,
+	ST_NEGATIVE
+
+} slopetype_t;
+
+
+typedef struct line_s
+{
+	// Vertices, from v1 to v2.
+	vertex_t*	v1;
+	vertex_t*	v2;
+
+	// Precalculated v2 - v1 for side checking.
+	fixed_t	dx;
+	fixed_t	dy;
+
+	// Animation related.
+	short	flags;
+	short	special;
+	short	tag;
+
+	// Visual appearance: SideDefs.
+	//  sidenum[1] will be -1 if one sided
+	short	sidenum[2];			
+
+	// Neat. Another bounding box, for the extent
+	//  of the LineDef.
+	fixed_t	bbox[4];
+
+	// To aid move clipping.
+	slopetype_t	slopetype;
+
+	// Front and back sector.
+	// Note: redundant? Can be retrieved from SideDefs.
+	sector_t*	frontsector;
+	sector_t*	backsector;
+
+	// if == validcount, already checked
+	int		validcount;
+
+	// thinker_t for reversable actions
+	void*	specialdata;		
+
+	// andrewj: added the following Hexen stuff
+	unsigned char args[5];
+} line_t;
+
+
+//
+// A SubSector.
+// References a Sector.
+// Basically, this is a list of LineSegs,
+//  indicating the visible walls that define
+//  (all or some) sides of a convex BSP leaf.
+//
+typedef struct subsector_s
+{
+	sector_t*	sector;
+
+	short	numlines;
+	short	firstline;
+
+} subsector_t;
+
+
+//
+// The LineSeg.
+//
+typedef struct
+{
+	vertex_t*	v1;
+	vertex_t*	v2;
+
+	fixed_t	offset;
+
+	angle_t	angle;
+
+	side_t*	sidedef;
+	line_t*	linedef;
+
+	// Sector references.
+	// Could be retrieved from linedef, too.
+	// backsector is NULL for one sided lines
+	sector_t*	frontsector;
+	sector_t*	backsector;
+
+} seg_t;
+
+
+//
+// BSP node.
+//
+typedef struct
+{
+	// Partition line.
+	fixed_t	x;
+	fixed_t	y;
+	fixed_t	dx;
+	fixed_t	dy;
+
+	// Bounding box for each child.
+	fixed_t	bbox[2][4];
+
+	// If NF_SUBSECTOR its a subsector.
+	unsigned short children[2];
+
+} node_t;
+
+
+//
+// OTHER TYPES
+//
+
+
+typedef struct drawseg_s
+{
+	seg_t*		curline;
+	int			x1;
+	int			x2;
+
+	fixed_t		scale1;
+	fixed_t		scale2;
+	fixed_t		scalestep;
+
+	// 0=none, 1=bottom, 2=top, 3=both
+	int			silhouette;
+
+	// do not clip sprites above this
+	fixed_t		bsilheight;
+
+	// do not clip sprites below this
+	fixed_t		tsilheight;
+
+	// Pointers to lists for sprite clipping,
+	//  all three adjusted so [x1] is first value.
+	short*		sprtopclip;		
+	short*		sprbottomclip;	
+	short*		maskedtexturecol;
+
+} drawseg_t;
+
+
+//
+// Now what is a visplane, anyway?
+// 
+typedef struct
+{
+	fixed_t		height;
+	int			picnum;
+	int			lightlevel;
+	int			minx;
+	int			maxx;
+
+	// leave pads for [minx-1]/[maxx+1]
+
+	byte		pad1;
+	// Here lies the rub for all
+	//  dynamic resize/change of resolution.
+	byte		top[SCREENWIDTH];
+	byte		pad2;
+	byte		pad3;
+	// See above.
+	byte		bottom[SCREENWIDTH];
+	byte		pad4;
+
+} visplane_t;
+
+
+#endif  /* __R_DEFS__ */
+
+//--- editor settings ---
+// vi:ts=4:sw=4:noexpandtab
+// Emacs style mode select   -*- C++ -*- 
diff --git a/Source/Plugins/vpo_dll/r_main.cc b/Source/Plugins/vpo_dll/r_main.cc
new file mode 100644
index 0000000..519ab7c
--- /dev/null
+++ b/Source/Plugins/vpo_dll/r_main.cc
@@ -0,0 +1,683 @@
+// Emacs style mode select   -*- C++ -*- 
+//-----------------------------------------------------------------------------
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005 Simon Howard
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+// 02111-1307, USA.
+//
+// DESCRIPTION:
+//	Rendering main loop and setup functions,
+//	 utility functions (BSP, geometry, trigonometry).
+//	See tables.c, too.
+//
+//-----------------------------------------------------------------------------
+
+#include "vpo_local.h"
+
+// #include "r_sky.h"
+
+namespace vpo
+{
+
+
+// Fineangles in the SCREENWIDTH wide window.
+#define FIELDOFVIEW		2048	
+
+int			viewangleoffset;
+
+// increment every time a check is made
+int			validcount = 1;		
+
+
+int			centerx;
+int			centery;
+
+fixed_t			centerxfrac;
+fixed_t			centeryfrac;
+fixed_t			projection;
+
+// just for profiling purposes
+int			framecount;	
+
+int			sscount;
+int			linecount;
+int			loopcount;
+
+fixed_t			viewx;
+fixed_t			viewy;
+fixed_t			viewz;
+
+angle_t			viewangle;
+
+fixed_t			viewcos;
+fixed_t			viewsin;
+
+
+//
+// precalculated math tables
+//
+angle_t			clipangle;
+
+// The viewangletox[viewangle + FINEANGLES/4] lookup
+// maps the visible view angles to screen X coordinates,
+// flattening the arc to a flat projection plane.
+// There will be many angles mapped to the same X. 
+int			viewangletox[FINEANGLES/2];
+
+// The xtoviewangleangle[] table maps a screen pixel
+// to the lowest viewangle that maps back to x ranges
+// from clipangle to -clipangle.
+angle_t			xtoviewangle[SCREENWIDTH+1];
+
+
+// UNUSED.
+// The finetangentgent[angle+FINEANGLES/4] table
+// holds the fixed_t tangent values for view angles,
+// ranging from INT_MIN to 0 to INT_MAX.
+// fixed_t		finetangent[FINEANGLES/2];
+
+// fixed_t		finesine[5*FINEANGLES/4];
+const fixed_t*		finecosine = &finesine[FINEANGLES/4];
+
+
+// bumped light from gun blasts
+int			extralight;			
+
+
+// from R_DRAW
+int		viewwidth;
+int		scaledviewwidth;
+int		viewheight;
+int		viewwindowx;
+int		viewwindowy; 
+
+
+// from R_THINGS
+fixed_t  pspritescale;
+fixed_t  pspriteiscale;
+
+short  screenheightarray[SCREENWIDTH];
+short  negonearray[SCREENWIDTH];
+
+
+//
+// R_AddPointToBox
+// Expand a given bbox
+// so that it encloses a given point.
+//
+void R_AddPointToBox ( int  x, int  y, fixed_t* box )
+{
+    if (x< box[BOXLEFT])
+	box[BOXLEFT] = x;
+    if (x> box[BOXRIGHT])
+	box[BOXRIGHT] = x;
+    if (y< box[BOXBOTTOM])
+	box[BOXBOTTOM] = y;
+    if (y> box[BOXTOP])
+	box[BOXTOP] = y;
+}
+
+
+//
+// R_PointOnSide
+// Traverse BSP (sub) tree,
+//  check point against partition plane.
+// Returns side 0 (front) or 1 (back).
+//
+int R_PointOnSide ( fixed_t	x, fixed_t	y, node_t*	node )
+{
+    fixed_t	dx;
+    fixed_t	dy;
+    fixed_t	left;
+    fixed_t	right;
+	
+    if (!node->dx)
+    {
+	if (x <= node->x)
+	    return node->dy > 0;
+	
+	return node->dy < 0;
+    }
+    if (!node->dy)
+    {
+	if (y <= node->y)
+	    return node->dx < 0;
+	
+	return node->dx > 0;
+    }
+	
+    dx = (x - node->x);
+    dy = (y - node->y);
+	
+    // Try to quickly decide by looking at sign bits.
+    if ( (node->dy ^ node->dx ^ dx ^ dy)&0x80000000 )
+    {
+	if  ( (node->dy ^ dx) & 0x80000000 )
+	{
+	    // (left is negative)
+	    return 1;
+	}
+	return 0;
+    }
+
+    left = FixedMul ( node->dy>>FRACBITS , dx );
+    right = FixedMul ( dy , node->dx>>FRACBITS );
+	
+    if (right < left)
+    {
+	// front side
+	return 0;
+    }
+    // back side
+    return 1;			
+}
+
+
+int R_PointOnSegSide ( fixed_t	x, fixed_t	y, seg_t*	line )
+{
+    fixed_t	lx;
+    fixed_t	ly;
+    fixed_t	ldx;
+    fixed_t	ldy;
+    fixed_t	dx;
+    fixed_t	dy;
+    fixed_t	left;
+    fixed_t	right;
+	
+    lx = line->v1->x;
+    ly = line->v1->y;
+	
+    ldx = line->v2->x - lx;
+    ldy = line->v2->y - ly;
+	
+    if (!ldx)
+    {
+	if (x <= lx)
+	    return ldy > 0;
+	
+	return ldy < 0;
+    }
+    if (!ldy)
+    {
+	if (y <= ly)
+	    return ldx < 0;
+	
+	return ldx > 0;
+    }
+	
+    dx = (x - lx);
+    dy = (y - ly);
+	
+    // Try to quickly decide by looking at sign bits.
+    if ( (ldy ^ ldx ^ dx ^ dy)&0x80000000 )
+    {
+	if  ( (ldy ^ dx) & 0x80000000 )
+	{
+	    // (left is negative)
+	    return 1;
+	}
+	return 0;
+    }
+
+    left = FixedMul ( ldy>>FRACBITS , dx );
+    right = FixedMul ( dy , ldx>>FRACBITS );
+	
+    if (right < left)
+    {
+	// front side
+	return 0;
+    }
+    // back side
+    return 1;			
+}
+
+
+//
+// R_PointToAngle
+// To get a global angle from cartesian coordinates,
+//  the coordinates are flipped until they are in
+//  the first octant of the coordinate system, then
+//  the y (<=x) is scaled and divided by x to get a
+//  tangent (slope) value which is looked up in the
+//  tantoangle[] table.
+
+angle_t R_PointToAngle ( fixed_t	x, fixed_t	y )
+{	
+    x -= viewx;
+    y -= viewy;
+    
+    if ( (!x) && (!y) )
+	return 0;
+
+    if (x>= 0)
+    {
+	// x >=0
+	if (y>= 0)
+	{
+	    // y>= 0
+
+	    if (x>y)
+	    {
+		// octant 0
+		return tantoangle[ SlopeDiv(y,x)];
+	    }
+	    else
+	    {
+		// octant 1
+		return ANG90-1-tantoangle[ SlopeDiv(x,y)];
+	    }
+	}
+	else
+	{
+	    // y<0
+	    y = -y;
+
+	    if (x>y)
+	    {
+		// octant 8
+		return -tantoangle[SlopeDiv(y,x)];
+	    }
+	    else
+	    {
+		// octant 7
+		return ANG270+tantoangle[ SlopeDiv(x,y)];
+	    }
+	}
+    }
+    else
+    {
+	// x<0
+	x = -x;
+
+	if (y>= 0)
+	{
+	    // y>= 0
+	    if (x>y)
+	    {
+		// octant 3
+		return ANG180-1-tantoangle[ SlopeDiv(y,x)];
+	    }
+	    else
+	    {
+		// octant 2
+		return ANG90+ tantoangle[ SlopeDiv(x,y)];
+	    }
+	}
+	else
+	{
+	    // y<0
+	    y = -y;
+
+	    if (x>y)
+	    {
+		// octant 4
+		return ANG180+tantoangle[ SlopeDiv(y,x)];
+	    }
+	    else
+	    {
+		 // octant 5
+		return ANG270-1-tantoangle[ SlopeDiv(x,y)];
+	    }
+	}
+    }
+    return 0;
+}
+
+
+angle_t R_PointToAngle2 ( fixed_t	x1, fixed_t	y1, fixed_t	x2, fixed_t	y2 )
+{	
+    viewx = x1;
+    viewy = y1;
+    
+    return R_PointToAngle (x2, y2);
+}
+
+
+fixed_t R_PointToDist ( fixed_t	x, fixed_t	y )
+{
+    int		angle;
+    fixed_t	dx;
+    fixed_t	dy;
+    fixed_t	temp;
+    fixed_t	dist;
+    fixed_t     frac;
+	
+    dx = abs(x - viewx);
+    dy = abs(y - viewy);
+	
+    if (dy>dx)
+    {
+	temp = dx;
+	dx = dy;
+	dy = temp;
+    }
+
+    // Fix crashes in udm1.wad
+
+    if (dx != 0)
+    {
+        frac = FixedDiv(dy, dx);
+    }
+    else
+    {
+	frac = 0;
+    }
+	
+    angle = (tantoangle[frac>>DBITS]+ANG90) >> ANGLETOFINESHIFT;
+
+    // use as cosine
+    dist = FixedDiv (dx, finesine[angle] );	
+	
+    return dist;
+}
+
+
+//
+// R_ScaleFromGlobalAngle
+// Returns the texture mapping scale
+//  for the current line (horizontal span)
+//  at the given angle.
+// rw_distance must be calculated first.
+//
+fixed_t R_ScaleFromGlobalAngle (angle_t visangle)
+{
+    fixed_t		scale;
+    angle_t		anglea;
+    angle_t		angleb;
+    int			sinea;
+    int			sineb;
+    fixed_t		num;
+    int			den;
+
+    // UNUSED
+#if 0
+{
+    fixed_t		dist;
+    fixed_t		z;
+    fixed_t		sinv;
+    fixed_t		cosv;
+	
+    sinv = finesine[(visangle-rw_normalangle)>>ANGLETOFINESHIFT];	
+    dist = FixedDiv (rw_distance, sinv);
+    cosv = finecosine[(viewangle-visangle)>>ANGLETOFINESHIFT];
+    z = abs(FixedMul (dist, cosv));
+    scale = FixedDiv(projection, z);
+    return scale;
+}
+#endif
+
+    anglea = ANG90 + (visangle-viewangle);
+    angleb = ANG90 + (visangle-rw_normalangle);
+
+    // both sines are allways positive
+    sinea = finesine[anglea>>ANGLETOFINESHIFT];	
+    sineb = finesine[angleb>>ANGLETOFINESHIFT];
+    num = FixedMul(projection,sineb)<<0;
+    den = FixedMul(rw_distance,sinea);
+
+    if (den > num>>16)
+    {
+	scale = FixedDiv (num, den);
+
+	if (scale > 64*FRACUNIT)
+	    scale = 64*FRACUNIT;
+	else if (scale < 256)
+	    scale = 256;
+    }
+    else
+	scale = 64*FRACUNIT;
+	
+    return scale;
+}
+
+
+void R_InitBuffer ( int		width, int		height ) 
+{ 
+    int		i;
+	
+    // Handle resize,
+    //  e.g. smaller view windows
+    //  with border and/or status bar.
+    viewwindowx = (SCREENWIDTH-width) >> 1; 
+    viewwindowy = 0; 
+
+    // this was from R_InitSprites
+    for (i=0 ; i<SCREENWIDTH ; i++)
+    {
+      negonearray[i] = -1;
+    }
+
+#if 0
+    // Column offset. For windows.
+    for (i=0 ; i<width ; i++) 
+	columnofs[i] = viewwindowx + i;
+
+    // Samw with base row offset.
+    if (width == SCREENWIDTH) 
+	viewwindowy = 0; 
+    else 
+	viewwindowy = (SCREENHEIGHT-SBARHEIGHT-height) >> 1; 
+
+    // Preclaculate all row offsets.
+    for (i=0 ; i<height ; i++) 
+	ylookup[i] = screens[0] + (i+viewwindowy)*SCREENWIDTH; 
+#endif
+} 
+
+
+//
+// R_InitTextureMapping
+//
+void R_InitTextureMapping (void)
+{
+    int			i;
+    int			x;
+    int			t;
+    fixed_t		focallength;
+    
+    // Use tangent table to generate viewangletox:
+    //  viewangletox will give the next greatest x
+    //  after the view angle.
+    //
+    // Calc focallength
+    //  so FIELDOFVIEW angles covers SCREENWIDTH.
+    focallength = FixedDiv (centerxfrac,
+			    finetangent[FINEANGLES/4+FIELDOFVIEW/2] );
+	
+    for (i=0 ; i<FINEANGLES/2 ; i++)
+    {
+	if (finetangent[i] > FRACUNIT*2)
+	    t = -1;
+	else if (finetangent[i] < -FRACUNIT*2)
+	    t = viewwidth+1;
+	else
+	{
+	    t = FixedMul (finetangent[i], focallength);
+	    t = (centerxfrac - t+FRACUNIT-1)>>FRACBITS;
+
+	    if (t < -1)
+		t = -1;
+	    else if (t>viewwidth+1)
+		t = viewwidth+1;
+	}
+	viewangletox[i] = t;
+    }
+    
+    // Scan viewangletox[] to generate xtoviewangle[]:
+    //  xtoviewangle will give the smallest view angle
+    //  that maps to x.	
+    for (x=0;x<=viewwidth;x++)
+    {
+	i = 0;
+	while (viewangletox[i]>x)
+	    i++;
+	xtoviewangle[x] = (i<<ANGLETOFINESHIFT)-ANG90;
+    }
+    
+    // Take out the fencepost cases from viewangletox.
+    for (i=0 ; i<FINEANGLES/2 ; i++)
+    {
+	t = FixedMul (finetangent[i], focallength);
+	t = centerx - t;
+	
+	if (viewangletox[i] == -1)
+	    viewangletox[i] = 0;
+	else if (viewangletox[i] == viewwidth+1)
+	    viewangletox[i]  = viewwidth;
+    }
+	
+    clipangle = xtoviewangle[0];
+}
+
+
+
+//
+// R_SetViewSize
+//
+void R_SetViewSize ( int  blocks, int  detail )
+{
+    fixed_t	cosadj;
+    fixed_t	dy;
+    int		i;
+
+    if (blocks == 11)
+    {
+	scaledviewwidth = SCREENWIDTH;
+	viewheight = SCREENHEIGHT;
+    }
+    else
+    {
+	scaledviewwidth = blocks*32;
+	viewheight = (blocks*168/10)&~7;
+    }
+    
+    viewwidth = scaledviewwidth >> 0;
+	
+    centery = viewheight/2;
+    centerx = viewwidth/2;
+    centerxfrac = centerx<<FRACBITS;
+    centeryfrac = centery<<FRACBITS;
+    projection = centerxfrac;
+
+    R_InitBuffer (scaledviewwidth, viewheight);
+	
+    R_InitTextureMapping ();
+
+    // psprite scales
+    pspritescale = FRACUNIT*viewwidth/SCREENWIDTH;
+    pspriteiscale = FRACUNIT*SCREENWIDTH/viewwidth;
+    
+    // thing clipping
+    for (i=0 ; i<viewwidth ; i++)
+	screenheightarray[i] = viewheight;
+    
+    // planes
+    for (i=0 ; i<viewheight ; i++)
+    {
+	dy = ((i-viewheight/2)<<FRACBITS)+FRACUNIT/2;
+	dy = abs(dy);
+	yslope[i] = FixedDiv ( (viewwidth<<0)/2*FRACUNIT, dy);
+    }
+	
+    for (i=0 ; i<viewwidth ; i++)
+    {
+	cosadj = abs(finecosine[xtoviewangle[i]>>ANGLETOFINESHIFT]);
+	distscale[i] = FixedDiv (FRACUNIT,cosadj);
+    }
+    
+}
+
+
+
+//
+// R_Init
+//
+void R_Init (void)
+{
+    R_SetViewSize (11, 0);
+	
+    framecount = 0;
+}
+
+
+//
+// R_PointInSubsector
+//
+subsector_t* R_PointInSubsector ( fixed_t	x, fixed_t	y )
+{
+    node_t*	node;
+    int		side;
+    int		nodenum;
+
+    // single subsector is a special case
+    if (!numnodes)				
+	return subsectors;
+		
+    nodenum = numnodes-1;
+
+    while (! (nodenum & NF_SUBSECTOR) )
+    {
+	node = &nodes[nodenum];
+	side = R_PointOnSide (x, y, node);
+	nodenum = node->children[side];
+    }
+	
+    return &subsectors[nodenum & ~NF_SUBSECTOR];
+}
+
+
+//
+// R_SetupFrame
+//
+void R_SetupFrame (fixed_t x, fixed_t y, fixed_t z, angle_t angle)
+{		
+    viewx = x;
+    viewy = y;
+    viewz = z;
+
+    viewangle = angle;
+
+    viewsin = finesine[viewangle>>ANGLETOFINESHIFT];
+    viewcos = finecosine[viewangle>>ANGLETOFINESHIFT];
+	
+    sscount = 0;
+	
+    framecount++;
+    validcount++;
+}
+
+
+//
+// R_RenderView
+//
+void R_RenderView (fixed_t x, fixed_t y, fixed_t z, angle_t angle)
+{	
+    R_SetupFrame (x, y, z, angle);
+
+    // Clear buffers.
+    R_ClearClipSegs ();
+    R_ClearDrawSegs ();
+    R_ClearPlanes ();
+///  R_ClearSprites ();
+    
+    // The head node is the last node output.
+    R_RenderBSPNode (numnodes - 1);
+}
+
+
+} // namespace vpo
+
diff --git a/Source/Plugins/vpo_dll/r_main.h b/Source/Plugins/vpo_dll/r_main.h
new file mode 100644
index 0000000..c3490e9
--- /dev/null
+++ b/Source/Plugins/vpo_dll/r_main.h
@@ -0,0 +1,113 @@
+// Emacs style mode select   -*- C++ -*- 
+//-----------------------------------------------------------------------------
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005 Simon Howard
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+// 02111-1307, USA.
+//
+// DESCRIPTION:
+//	System specific interface stuff.
+//
+//-----------------------------------------------------------------------------
+
+#ifndef __R_MAIN__
+#define __R_MAIN__
+
+
+//
+// POV related.
+//
+extern fixed_t		viewcos;
+extern fixed_t		viewsin;
+
+extern int		viewwidth;
+extern int		viewheight;
+extern int		viewwindowx;
+extern int		viewwindowy;
+
+
+extern int		centerx;
+extern int		centery;
+
+extern fixed_t		centerxfrac;
+extern fixed_t		centeryfrac;
+extern fixed_t		projection;
+
+extern int		validcount;
+
+extern int		linecount;
+extern int		loopcount;
+
+
+//
+// Lighting LUT.
+// Used for z-depth cuing per column/row,
+//  and other lighting effects (sector ambient, flash).
+//
+
+// Lighting constants.
+// Now why not 32 levels here?
+#define LIGHTLEVELS	        16
+#define LIGHTSEGSHIFT	         4
+
+#define MAXLIGHTSCALE		48
+#define LIGHTSCALESHIFT		12
+#define MAXLIGHTZ	       128
+#define LIGHTZSHIFT		20
+
+
+// Number of diminishing brightness levels.
+// There a 0-31, i.e. 32 LUT in the COLORMAP lump.
+#define NUMCOLORMAPS		32
+
+
+//
+// Utility functions.
+int R_PointOnSide ( fixed_t	x, fixed_t	y, node_t*	node );
+
+int R_PointOnSegSide ( fixed_t	x, fixed_t	y, seg_t*	line );
+
+angle_t R_PointToAngle ( fixed_t	x, fixed_t	y );
+
+angle_t R_PointToAngle2 ( fixed_t	x1, fixed_t	y1, fixed_t	x2, fixed_t	y2 );
+
+fixed_t R_PointToDist ( fixed_t	x, fixed_t	y );
+
+
+fixed_t R_ScaleFromGlobalAngle (angle_t visangle);
+
+subsector_t* R_PointInSubsector ( fixed_t	x, fixed_t	y );
+
+void R_AddPointToBox ( int		x, int		y, fixed_t*	box );
+
+
+
+// R_THINGS
+
+extern short  screenheightarray[SCREENWIDTH];
+extern short  negonearray[SCREENWIDTH];
+
+
+//
+// REFRESH - the actual rendering functions.
+//
+
+void R_Init (void);
+
+void R_RenderView (fixed_t x, fixed_t y, fixed_t z, angle_t angle);
+
+#endif
diff --git a/Source/Plugins/vpo_dll/r_plane.cc b/Source/Plugins/vpo_dll/r_plane.cc
new file mode 100644
index 0000000..535d9d5
--- /dev/null
+++ b/Source/Plugins/vpo_dll/r_plane.cc
@@ -0,0 +1,355 @@
+// Emacs style mode select   -*- C++ -*- 
+//-----------------------------------------------------------------------------
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005 Simon Howard
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+// 02111-1307, USA.
+//
+// DESCRIPTION:
+//	Here is a core component: drawing the floors and ceilings,
+//	 while maintaining a per column clipping list only.
+//	Moreover, the sky areas have to be determined.
+//
+//-----------------------------------------------------------------------------
+
+#include "vpo_local.h"
+
+namespace vpo
+{
+
+
+//
+// opening
+//
+
+// Here comes the obnoxious "visplane".
+visplane_t		visplanes[MAXVISPLANES+10];
+visplane_t*		lastvisplane;
+visplane_t*		floorplane;
+visplane_t*		ceilingplane;
+
+int total_visplanes;
+
+short			openings[MAXOPENINGS+400];
+short*			lastopening;
+
+int total_openings;
+
+
+//
+// Clip values are the solid pixel bounding the range.
+//  floorclip starts out SCREENHEIGHT
+//  ceilingclip starts out -1
+//
+short			floorclip[SCREENWIDTH];
+short			ceilingclip[SCREENWIDTH];
+
+//
+// spanstart holds the start of a plane span
+// initialized to 0 at start
+//
+int			spanstart[SCREENHEIGHT];
+int			spanstop[SCREENHEIGHT];
+
+//
+// texture mapping
+//
+fixed_t			planeheight;
+
+fixed_t			yslope[SCREENHEIGHT];
+fixed_t			distscale[SCREENWIDTH];
+fixed_t			basexscale;
+fixed_t			baseyscale;
+
+fixed_t			cachedheight[SCREENHEIGHT];
+fixed_t			cacheddistance[SCREENHEIGHT];
+fixed_t			cachedxstep[SCREENHEIGHT];
+fixed_t			cachedystep[SCREENHEIGHT];
+
+
+
+#if 0
+//
+// R_MapPlane
+//
+// Uses global vars:
+//  planeheight
+//  ds_source
+//  basexscale
+//  baseyscale
+//  viewx
+//  viewy
+//
+// BASIC PRIMITIVE
+//
+void R_MapPlane ( int  y, int  x1, int  x2 )
+{
+    angle_t	angle;
+    fixed_t	distance;
+    fixed_t	length;
+    unsigned	index;
+	
+#ifdef RANGECHECK
+    if (x2 < x1
+     || x1 < 0
+     || x2 >= viewwidth
+     || y > viewheight)
+    {
+	I_Error ("R_MapPlane: %i, %i at %i",x1,x2,y);
+    }
+#endif
+
+    if (planeheight != cachedheight[y])
+    {
+	cachedheight[y] = planeheight;
+	distance = cacheddistance[y] = FixedMul (planeheight, yslope[y]);
+	ds_xstep = cachedxstep[y] = FixedMul (distance,basexscale);
+	ds_ystep = cachedystep[y] = FixedMul (distance,baseyscale);
+    }
+    else
+    {
+	distance = cacheddistance[y];
+	ds_xstep = cachedxstep[y];
+	ds_ystep = cachedystep[y];
+    }
+	
+    length = FixedMul (distance,distscale[x1]);
+    angle = (viewangle + xtoviewangle[x1])>>ANGLETOFINESHIFT;
+    ds_xfrac = viewx + FixedMul(finecosine[angle], length);
+    ds_yfrac = -viewy - FixedMul(finesine[angle], length);
+
+    if (fixedcolormap)
+	ds_colormap = fixedcolormap;
+    else
+    {
+	index = distance >> LIGHTZSHIFT;
+	
+	if (index >= MAXLIGHTZ )
+	    index = MAXLIGHTZ-1;
+
+	ds_colormap = planezlight[index];
+    }
+	
+    ds_y = y;
+    ds_x1 = x1;
+    ds_x2 = x2;
+
+    // high or low detail
+    spanfunc ();	
+}
+#endif
+
+
+//
+// R_ClearPlanes
+// At begining of frame.
+//
+void R_ClearPlanes (void)
+{
+    int		i;
+    angle_t	angle;
+    
+    // opening / clipping determination
+    for (i=0 ; i<viewwidth ; i++)
+    {
+	floorclip[i] = viewheight;
+	ceilingclip[i] = -1;
+    }
+
+    total_visplanes = 0;
+    total_openings  = 0;
+
+    lastvisplane = visplanes;
+    lastopening = openings;
+
+    // texture calculation
+    memset (cachedheight, 0, sizeof(cachedheight));
+
+    // left to right mapping
+    angle = (viewangle-ANG90)>>ANGLETOFINESHIFT;
+	
+    // scale will be unit scale at SCREENWIDTH/2 distance
+    basexscale = FixedDiv (finecosine[angle],centerxfrac);
+    baseyscale = -FixedDiv (finesine[angle],centerxfrac);
+}
+
+
+
+
+//
+// R_FindPlane
+//
+visplane_t* R_FindPlane ( fixed_t height, int  picnum, int  lightlevel )
+{
+    visplane_t*	check;
+	
+    if (picnum == skyflatnum)
+    {
+	height = 0;			// all skys map together
+	lightlevel = 0;
+    }
+	
+    for (check=visplanes; check<lastvisplane; check++)
+    {
+	if (height == check->height
+	    && picnum == check->picnum
+	    && lightlevel == check->lightlevel)
+	{
+	    break;
+	}
+    }
+    
+			
+    if (check < lastvisplane)
+	return check;
+		
+    if (total_visplanes >= MAXVISPLANES)
+      throw overflow_exception(); // I_Error ("R_FindPlane: no more visplanes");
+		
+    total_visplanes++;
+    lastvisplane++;
+
+    check->height = height;
+    check->picnum = picnum;
+    check->lightlevel = lightlevel;
+    check->minx = SCREENWIDTH;
+    check->maxx = -1;
+    
+    memset (check->top,0xff,sizeof(check->top));
+		
+    return check;
+}
+
+
+//
+// R_CheckPlane
+//
+visplane_t* R_CheckPlane ( visplane_t* pl, int  start, int  stop )
+{
+    int		intrl;
+    int		intrh;
+    int		unionl;
+    int		unionh;
+    int		x;
+	
+    if (start < pl->minx)
+    {
+	intrl = pl->minx;
+	unionl = start;
+    }
+    else
+    {
+	unionl = pl->minx;
+	intrl = start;
+    }
+	
+    if (stop > pl->maxx)
+    {
+	intrh = pl->maxx;
+	unionh = stop;
+    }
+    else
+    {
+	unionh = pl->maxx;
+	intrh = stop;
+    }
+
+    for (x=intrl ; x<= intrh ; x++)
+	if (pl->top[x] != 0xff)
+	    break;
+
+    if (x > intrh)
+    {
+	pl->minx = unionl;
+	pl->maxx = unionh;
+
+	// use the same one
+	return pl;		
+    }
+	
+    // make a new visplane
+    lastvisplane->height = pl->height;
+    lastvisplane->picnum = pl->picnum;
+    lastvisplane->lightlevel = pl->lightlevel;
+    
+    if (total_visplanes >= MAXVISPLANES)
+      throw overflow_exception(); // I_Error ("R_FindPlane: no more visplanes");
+
+    total_visplanes++;
+
+    pl = lastvisplane++;
+    pl->minx = start;
+    pl->maxx = stop;
+
+    memset (pl->top,0xff,sizeof(pl->top));
+
+    return pl;
+}
+
+
+#if 0
+//
+// R_MakeSpans
+//
+void R_MakeSpans ( int  x, int  t1, int  b1, int  t2, int  b2 )
+{
+    while (t1 < t2 && t1<=b1)
+    {
+	R_MapPlane (t1,spanstart[t1],x-1);
+	t1++;
+    }
+    while (b1 > b2 && b1>=t1)
+    {
+	R_MapPlane (b1,spanstart[b1],x-1);
+	b1--;
+    }
+	
+    while (t2 < t1 && t2<=b2)
+    {
+	spanstart[t2] = x;
+	t2++;
+    }
+    while (b2 > b1 && b2>=t2)
+    {
+	spanstart[b2] = x;
+	b2--;
+    }
+}
+#endif
+
+
+
+#if 0
+    was: R_DrawPlanes()
+
+				
+    if (ds_p - drawsegs > MAXDRAWSEGS)
+	I_Error ("R_DrawPlanes: drawsegs overflow (%i)",
+		 ds_p - drawsegs);
+    
+    if (lastvisplane - visplanes > MAXVISPLANES)
+	I_Error ("R_DrawPlanes: visplane overflow (%i)",
+		 lastvisplane - visplanes);
+    
+    if (lastopening - openings > MAXOPENINGS)
+	I_Error ("R_DrawPlanes: opening overflow (%i)",
+		 lastopening - openings);
+#endif
+
+
+} // namespace vpo
+
diff --git a/Source/Plugins/vpo_dll/r_plane.h b/Source/Plugins/vpo_dll/r_plane.h
new file mode 100644
index 0000000..4543a5b
--- /dev/null
+++ b/Source/Plugins/vpo_dll/r_plane.h
@@ -0,0 +1,64 @@
+// Emacs style mode select   -*- C++ -*- 
+//-----------------------------------------------------------------------------
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005 Simon Howard
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+// 02111-1307, USA.
+//
+// DESCRIPTION:
+//	Refresh, visplane stuff (floor, ceilings).
+//
+//-----------------------------------------------------------------------------
+
+#ifndef __R_PLANE__
+#define __R_PLANE__
+
+
+// Visplane related.
+extern  short * lastopening;
+
+
+typedef void (*planefunction_t) (int top, int bottom);
+
+extern short		floorclip[SCREENWIDTH];
+extern short		ceilingclip[SCREENWIDTH];
+
+extern fixed_t		yslope[SCREENHEIGHT];
+extern fixed_t		distscale[SCREENWIDTH];
+
+void R_ClearPlanes (void);
+
+void R_MapPlane ( int y, int x1, int x2 );
+void R_MakeSpans ( int x, int t1, int b1, int t2, int b2 );
+void R_DrawPlanes (void);
+
+visplane_t* R_FindPlane ( fixed_t height, int picnum, int lightlevel );
+visplane_t* R_CheckPlane ( visplane_t* pl, int start, int stop );
+
+// #define MAXVISPLANES	128
+#define MAXVISPLANES	512   // andrewj: increased for Visplane Explorer
+
+// #define MAXOPENINGS	SCREENWIDTH*64
+#define MAXOPENINGS	SCREENWIDTH*256  // andrewj: increased for Visplane Explorer
+
+extern int total_visplanes;
+extern int total_drawsegs;
+extern int total_openings;
+extern int   max_solidsegs;
+
+
+#endif
diff --git a/Source/Plugins/vpo_dll/r_segs.cc b/Source/Plugins/vpo_dll/r_segs.cc
new file mode 100644
index 0000000..ff22dc7
--- /dev/null
+++ b/Source/Plugins/vpo_dll/r_segs.cc
@@ -0,0 +1,622 @@
+// Emacs style mode select   -*- C++ -*- 
+//-----------------------------------------------------------------------------
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005 Simon Howard
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+// 02111-1307, USA.
+//
+// DESCRIPTION:
+//	All the clipping: columns, horizontal spans, sky columns.
+//
+//-----------------------------------------------------------------------------
+
+#include "vpo_local.h"
+
+namespace vpo
+{
+
+
+// OPTIMIZE: closed two sided lines as single sided
+
+// True if any of the segs textures might be visible.
+boolean		segtextured;	
+
+// False if the back side is the same plane.
+boolean		markfloor;	
+boolean		markceiling;
+
+boolean		maskedtexture;
+int		toptexture;
+int		bottomtexture;
+int		midtexture;
+
+
+angle_t		rw_normalangle;
+// angle to line origin
+int		rw_angle1;	
+
+//
+// regular wall
+//
+int		rw_x;
+int		rw_stopx;
+angle_t		rw_centerangle;
+fixed_t		rw_offset;
+fixed_t		rw_distance;
+fixed_t		rw_scale;
+fixed_t		rw_scalestep;
+fixed_t		rw_midtexturemid;
+fixed_t		rw_toptexturemid;
+fixed_t		rw_bottomtexturemid;
+
+int		worldtop;
+int		worldbottom;
+int		worldhigh;
+int		worldlow;
+
+fixed_t		pixhigh;
+fixed_t		pixlow;
+fixed_t		pixhighstep;
+fixed_t		pixlowstep;
+
+fixed_t		topfrac;
+fixed_t		topstep;
+
+fixed_t		bottomfrac;
+fixed_t		bottomstep;
+
+
+short*		maskedtexturecol;
+
+
+// R_DRAW bits
+int              dc_x;
+int              dc_yl;
+int              dc_yh;
+fixed_t          dc_iscale;
+fixed_t          dc_texturemid;
+
+
+//
+// R_RenderSegLoop
+// Draws zero, one, or two textures (and possibly a masked
+//  texture) for walls.
+// Can draw or mark the starting pixel of floor and ceiling
+//  textures.
+// CALLED: CORE LOOPING ROUTINE.
+//
+#define HEIGHTBITS		12
+#define HEIGHTUNIT		(1<<HEIGHTBITS)
+
+void R_RenderSegLoop (void)
+{
+  angle_t		angle;
+  int			yl;
+  int			yh;
+  int			mid;
+  fixed_t		texturecolumn;
+  int			top;
+  int			bottom;
+
+  for ( ; rw_x < rw_stopx ; rw_x++)
+  {
+    // mark floor / ceiling areas
+    yl = (topfrac+HEIGHTUNIT-1)>>HEIGHTBITS;
+
+    // no space above wall?
+    if (yl < ceilingclip[rw_x]+1)
+      yl = ceilingclip[rw_x]+1;
+
+    if (markceiling)
+    {
+      top = ceilingclip[rw_x]+1;
+      bottom = yl-1;
+
+      if (bottom >= floorclip[rw_x])
+        bottom = floorclip[rw_x]-1;
+
+      if (top <= bottom)
+      {
+        ceilingplane->top[rw_x] = top;
+        ceilingplane->bottom[rw_x] = bottom;
+      }
+    }
+
+    yh = bottomfrac>>HEIGHTBITS;
+
+    if (yh >= floorclip[rw_x])
+      yh = floorclip[rw_x]-1;
+
+    if (markfloor)
+    {
+      top = yh+1;
+      bottom = floorclip[rw_x]-1;
+      if (top <= ceilingclip[rw_x])
+        top = ceilingclip[rw_x]+1;
+      if (top <= bottom)
+      {
+        floorplane->top[rw_x] = top;
+        floorplane->bottom[rw_x] = bottom;
+      }
+    }
+
+    // texturecolumn and lighting are independent of wall tiers
+    if (segtextured)
+    {
+      // calculate texture offset
+      angle = (rw_centerangle + xtoviewangle[rw_x])>>ANGLETOFINESHIFT;
+      texturecolumn = rw_offset-FixedMul(finetangent[angle],rw_distance);
+      texturecolumn >>= FRACBITS;
+
+      dc_x = rw_x;
+      dc_iscale = 0xffffffffu / (unsigned)rw_scale;
+    }
+    else
+    {
+      // purely to shut up the compiler
+
+      texturecolumn = 0;
+    }
+
+    // draw the wall tiers
+    if (midtexture)
+    {
+      // single sided line
+      dc_yl = yl;
+      dc_yh = yh;
+      dc_texturemid = rw_midtexturemid;
+      ///---	    dc_source = R_GetColumn(midtexture,texturecolumn);
+      ///---	    colfunc ();
+      ceilingclip[rw_x] = viewheight;
+      floorclip[rw_x] = -1;
+    }
+    else
+    {
+      // two sided line
+      if (toptexture)
+      {
+        // top wall
+        mid = pixhigh>>HEIGHTBITS;
+        pixhigh += pixhighstep;
+
+        if (mid >= floorclip[rw_x])
+          mid = floorclip[rw_x]-1;
+
+        if (mid >= yl)
+        {
+          dc_yl = yl;
+          dc_yh = mid;
+          dc_texturemid = rw_toptexturemid;
+          ///---		    dc_source = R_GetColumn(toptexture,texturecolumn);
+          ///---		    colfunc ();
+          ceilingclip[rw_x] = mid;
+        }
+        else
+          ceilingclip[rw_x] = yl-1;
+      }
+      else
+      {
+        // no top wall
+        if (markceiling)
+          ceilingclip[rw_x] = yl-1;
+      }
+
+      if (bottomtexture)
+      {
+        // bottom wall
+        mid = (pixlow+HEIGHTUNIT-1)>>HEIGHTBITS;
+        pixlow += pixlowstep;
+
+        // no space above wall?
+        if (mid <= ceilingclip[rw_x])
+          mid = ceilingclip[rw_x]+1;
+
+        if (mid <= yh)
+        {
+          dc_yl = mid;
+          dc_yh = yh;
+          dc_texturemid = rw_bottomtexturemid;
+///---          dc_source = R_GetColumn(bottomtexture, texturecolumn);
+///---          colfunc ();
+          floorclip[rw_x] = mid;
+        }
+        else
+          floorclip[rw_x] = yh+1;
+      }
+      else
+      {
+        // no bottom wall
+        if (markfloor)
+          floorclip[rw_x] = yh+1;
+      }
+
+      if (maskedtexture)
+      {
+        // save texturecol
+        //  for backdrawing of masked mid texture
+        maskedtexturecol[rw_x] = texturecolumn;
+      }
+    }
+
+    rw_scale += rw_scalestep;
+    topfrac += topstep;
+    bottomfrac += bottomstep;
+  }
+}
+
+
+
+
+//
+// R_StoreWallRange
+// A wall segment will be drawn
+//  between start and stop pixels (inclusive).
+//
+void R_StoreWallRange ( int	start, int	stop )
+{
+  fixed_t		hyp;
+  fixed_t		sineval;
+  angle_t		distangle, offsetangle;
+  fixed_t		vtop;
+
+  // don't overflow and crash
+  total_drawsegs++;
+
+  if (total_drawsegs >= MAXDRAWSEGS)
+    throw overflow_exception();
+
+#ifdef RANGECHECK
+  if (start >=viewwidth || start > stop)
+    I_Error ("Bad R_RenderWallRange: %i to %i", start , stop);
+#endif
+
+  sidedef = curline->sidedef;
+  linedef = curline->linedef;
+
+  // mark the segment as visible for auto map
+  linedef->flags |= ML_MAPPED;
+
+  // calculate rw_distance for scale calculation
+  rw_normalangle = curline->angle + ANG90;
+  offsetangle = abs((int)rw_normalangle-rw_angle1);
+
+  if (offsetangle > ANG90)
+    offsetangle = ANG90;
+
+  distangle = ANG90 - offsetangle;
+  hyp = R_PointToDist (curline->v1->x, curline->v1->y);
+  sineval = finesine[distangle>>ANGLETOFINESHIFT];
+  rw_distance = FixedMul (hyp, sineval);
+
+
+  ds_p->x1 = rw_x = start;
+  ds_p->x2 = stop;
+  ds_p->curline = curline;
+  rw_stopx = stop+1;
+
+  // calculate scale at both ends and step
+  ds_p->scale1 = rw_scale = 
+    R_ScaleFromGlobalAngle (viewangle + xtoviewangle[start]);
+
+  if (stop > start )
+  {
+    ds_p->scale2 = R_ScaleFromGlobalAngle (viewangle + xtoviewangle[stop]);
+    ds_p->scalestep = rw_scalestep = 
+      (ds_p->scale2 - rw_scale) / (stop-start);
+  }
+  else
+  {
+    ds_p->scale2 = ds_p->scale1;
+  }
+
+  // calculate texture boundaries
+  //  and decide if floor / ceiling marks are needed
+  worldtop = frontsector->ceilingheight - viewz;
+  worldbottom = frontsector->floorheight - viewz;
+
+  midtexture = toptexture = bottomtexture = maskedtexture = 0;
+  ds_p->maskedtexturecol = NULL;
+
+  if (!backsector)
+  {
+    // single sided line
+    midtexture = sidedef->midtexture;
+    // a single sided line is terminal, so it must mark ends
+    markfloor = markceiling = true;
+    if (linedef->flags & ML_DONTPEGBOTTOM)
+    {
+      vtop = frontsector->floorheight
+             + 128; ///??? textureheight[sidedef->midtexture];
+      // bottom of texture at bottom
+      rw_midtexturemid = vtop - viewz;	
+    }
+    else
+    {
+      // top of texture at top
+      rw_midtexturemid = worldtop;
+    }
+    rw_midtexturemid += sidedef->rowoffset;
+
+    ds_p->silhouette = SIL_BOTH;
+    ds_p->sprtopclip = screenheightarray;
+    ds_p->sprbottomclip = negonearray;
+    ds_p->bsilheight = INT_MAX;
+    ds_p->tsilheight = INT_MIN;
+  }
+  else
+  {
+    // two sided line
+    ds_p->sprtopclip = ds_p->sprbottomclip = NULL;
+    ds_p->silhouette = 0;
+
+    if (frontsector->floorheight > backsector->floorheight)
+    {
+      ds_p->silhouette = SIL_BOTTOM;
+      ds_p->bsilheight = frontsector->floorheight;
+    }
+    else if (backsector->floorheight > viewz)
+    {
+      ds_p->silhouette = SIL_BOTTOM;
+      ds_p->bsilheight = INT_MAX;
+      // ds_p->sprbottomclip = negonearray;
+    }
+
+    if (frontsector->ceilingheight < backsector->ceilingheight)
+    {
+      ds_p->silhouette |= SIL_TOP;
+      ds_p->tsilheight = frontsector->ceilingheight;
+    }
+    else if (backsector->ceilingheight < viewz)
+    {
+      ds_p->silhouette |= SIL_TOP;
+      ds_p->tsilheight = INT_MIN;
+      // ds_p->sprtopclip = screenheightarray;
+    }
+
+    if (backsector->ceilingheight <= frontsector->floorheight)
+    {
+      ds_p->sprbottomclip = negonearray;
+      ds_p->bsilheight = INT_MAX;
+      ds_p->silhouette |= SIL_BOTTOM;
+    }
+
+    if (backsector->floorheight >= frontsector->ceilingheight)
+    {
+      ds_p->sprtopclip = screenheightarray;
+      ds_p->tsilheight = INT_MIN;
+      ds_p->silhouette |= SIL_TOP;
+    }
+
+    worldhigh = backsector->ceilingheight - viewz;
+    worldlow = backsector->floorheight - viewz;
+
+    // hack to allow height changes in outdoor areas
+    if (frontsector->ceilingpic == skyflatnum 
+        && backsector->ceilingpic == skyflatnum)
+    {
+      worldtop = worldhigh;
+    }
+
+
+    if (worldlow != worldbottom 
+        || backsector->floorpic != frontsector->floorpic
+        || backsector->lightlevel != frontsector->lightlevel)
+    {
+      markfloor = true;
+    }
+    else
+    {
+      // same plane on both sides
+      markfloor = false;
+    }
+
+
+    if (worldhigh != worldtop 
+        || backsector->ceilingpic != frontsector->ceilingpic
+        || backsector->lightlevel != frontsector->lightlevel)
+    {
+      markceiling = true;
+    }
+    else
+    {
+      // same plane on both sides
+      markceiling = false;
+    }
+
+    if (backsector->ceilingheight <= frontsector->floorheight
+        || backsector->floorheight >= frontsector->ceilingheight)
+    {
+      // closed door
+      markceiling = markfloor = true;
+    }
+
+
+    if (worldhigh < worldtop)
+    {
+      // top texture
+      toptexture = sidedef->toptexture;
+      if (linedef->flags & ML_DONTPEGTOP)
+      {
+        // top of texture at top
+        rw_toptexturemid = worldtop;
+      }
+      else
+      {
+        vtop = backsector->ceilingheight
+               + 128; ///???  textureheight[sidedef->toptexture];
+
+        // bottom of texture
+        rw_toptexturemid = vtop - viewz;	
+      }
+    }
+    if (worldlow > worldbottom)
+    {
+      // bottom texture
+      bottomtexture = sidedef->bottomtexture;
+
+      if (linedef->flags & ML_DONTPEGBOTTOM )
+      {
+        // bottom of texture at bottom
+        // top of texture at top
+        rw_bottomtexturemid = worldtop;
+      }
+      else	// top of texture at top
+        rw_bottomtexturemid = worldlow;
+    }
+    rw_toptexturemid += sidedef->rowoffset;
+    rw_bottomtexturemid += sidedef->rowoffset;
+
+    // allocate space for masked texture tables
+    if (sidedef->midtexture)
+    {
+      // masked midtexture
+      maskedtexture = true;
+      ds_p->maskedtexturecol = maskedtexturecol = lastopening - rw_x;
+      lastopening += rw_stopx - rw_x;
+      total_openings += (rw_stopx - rw_x);
+
+      if (total_openings >= MAXOPENINGS)
+        throw overflow_exception();
+    }
+  }
+
+  // calculate rw_offset (only needed for textured lines)
+  segtextured = midtexture | toptexture | bottomtexture | maskedtexture;
+
+  if (segtextured)
+  {
+    offsetangle = rw_normalangle-rw_angle1;
+
+    if (offsetangle > ANG180)
+      offsetangle = -offsetangle;
+
+    if (offsetangle > ANG90)
+      offsetangle = ANG90;
+
+    sineval = finesine[offsetangle >>ANGLETOFINESHIFT];
+    rw_offset = FixedMul (hyp, sineval);
+
+    if (rw_normalangle-rw_angle1 < ANG180)
+      rw_offset = -rw_offset;
+
+    rw_offset += sidedef->textureoffset + curline->offset;
+    rw_centerangle = ANG90 + viewangle - rw_normalangle;
+
+  }
+
+  // if a floor / ceiling plane is on the wrong side
+  //  of the view plane, it is definitely invisible
+  //  and doesn't need to be marked.
+
+
+  if (frontsector->floorheight >= viewz)
+  {
+    // above view plane
+    markfloor = false;
+  }
+
+  if (frontsector->ceilingheight <= viewz 
+      && frontsector->ceilingpic != skyflatnum)
+  {
+    // below view plane
+    markceiling = false;
+  }
+
+
+  // calculate incremental stepping values for texture edges
+  worldtop >>= 4;
+  worldbottom >>= 4;
+
+  topstep = -FixedMul (rw_scalestep, worldtop);
+  topfrac = (centeryfrac>>4) - FixedMul (worldtop, rw_scale);
+
+  bottomstep = -FixedMul (rw_scalestep,worldbottom);
+  bottomfrac = (centeryfrac>>4) - FixedMul (worldbottom, rw_scale);
+
+  if (backsector)
+  {	
+    worldhigh >>= 4;
+    worldlow >>= 4;
+
+    if (worldhigh < worldtop)
+    {
+      pixhigh = (centeryfrac>>4) - FixedMul (worldhigh, rw_scale);
+      pixhighstep = -FixedMul (rw_scalestep,worldhigh);
+    }
+
+    if (worldlow > worldbottom)
+    {
+      pixlow = (centeryfrac>>4) - FixedMul (worldlow, rw_scale);
+      pixlowstep = -FixedMul (rw_scalestep,worldlow);
+    }
+  }
+
+  // andrewj: make sure floorplane/ceilingplane are not NULL (prevent a crash)
+  if (!   floorplane) markfloor   = false;
+  if (! ceilingplane) markceiling = false;
+
+  // render it
+  if (markceiling)
+    ceilingplane = R_CheckPlane (ceilingplane, rw_x, rw_stopx-1);
+
+  if (markfloor)
+    floorplane = R_CheckPlane (floorplane, rw_x, rw_stopx-1);
+
+  R_RenderSegLoop ();
+
+
+  // save sprite clipping info
+  if ( ((ds_p->silhouette & SIL_TOP) || maskedtexture)
+      && !ds_p->sprtopclip)
+  {
+    memcpy (lastopening, ceilingclip+start, 2*(rw_stopx-start));
+    ds_p->sprtopclip = lastopening - start;
+    lastopening += rw_stopx - start;
+    total_openings += (rw_stopx - start);
+
+    if (total_openings >= MAXOPENINGS)
+      throw overflow_exception();
+  }
+
+  if ( ((ds_p->silhouette & SIL_BOTTOM) || maskedtexture)
+      && !ds_p->sprbottomclip)
+  {
+    memcpy (lastopening, floorclip+start, 2*(rw_stopx-start));
+    ds_p->sprbottomclip = lastopening - start;
+    lastopening += rw_stopx - start;	
+    total_openings += (rw_stopx - start);
+
+    if (total_openings >= MAXOPENINGS)
+      throw overflow_exception();
+  }
+
+  if (maskedtexture && !(ds_p->silhouette&SIL_TOP))
+  {
+    ds_p->silhouette |= SIL_TOP;
+    ds_p->tsilheight = INT_MIN;
+  }
+  if (maskedtexture && !(ds_p->silhouette&SIL_BOTTOM))
+  {
+    ds_p->silhouette |= SIL_BOTTOM;
+    ds_p->bsilheight = INT_MAX;
+  }
+  ds_p++;
+}
+
+
+} // namespace vpo
+
diff --git a/Source/Plugins/vpo_dll/r_state.h b/Source/Plugins/vpo_dll/r_state.h
new file mode 100644
index 0000000..eb9761d
--- /dev/null
+++ b/Source/Plugins/vpo_dll/r_state.h
@@ -0,0 +1,107 @@
+// Emacs style mode select   -*- C++ -*- 
+//-----------------------------------------------------------------------------
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005 Simon Howard
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+// 02111-1307, USA.
+//
+// DESCRIPTION:
+//	Refresh/render internal state variables (global).
+//
+//-----------------------------------------------------------------------------
+
+
+#ifndef __R_STATE__
+#define __R_STATE__
+
+
+//
+// Refresh internal data structures,
+//  for rendering.
+//
+
+// needed for pre rendering (fracs)
+extern fixed_t*		spritewidth;
+
+extern fixed_t*		spriteoffset;
+extern fixed_t*		spritetopoffset;
+
+extern int		viewwidth;
+extern int		scaledviewwidth;
+extern int		viewheight;
+
+extern int		firstflat;
+
+
+//
+// Lookup tables for map data.
+//
+extern int		numvertexes;
+extern vertex_t*	vertexes;
+
+extern int		numsegs;
+extern seg_t*		segs;
+
+extern int		numsectors;
+extern sector_t*	sectors;
+
+extern int		numsubsectors;
+extern subsector_t*	subsectors;
+
+extern int		numnodes;
+extern node_t*		nodes;
+
+extern int		numlines;
+extern line_t*		lines;
+
+extern int		numsides;
+extern side_t*		sides;
+
+
+//
+// POV data.
+//
+extern fixed_t		viewx;
+extern fixed_t		viewy;
+extern fixed_t		viewz;
+
+extern angle_t		viewangle;
+
+
+// ?
+extern angle_t		clipangle;
+
+extern int		viewangletox[FINEANGLES/2];
+extern angle_t		xtoviewangle[SCREENWIDTH+1];
+//extern fixed_t		finetangent[FINEANGLES/2];
+
+extern fixed_t		rw_distance;
+extern angle_t		rw_normalangle;
+
+
+
+// angle to line origin
+extern int		rw_angle1;
+
+// Segs count?
+extern int		sscount;
+
+extern visplane_t*	floorplane;
+extern visplane_t*	ceilingplane;
+
+
+#endif
diff --git a/Source/Plugins/vpo_dll/stdint.h b/Source/Plugins/vpo_dll/stdint.h
new file mode 100644
index 0000000..d02608a
--- /dev/null
+++ b/Source/Plugins/vpo_dll/stdint.h
@@ -0,0 +1,247 @@
+// ISO C9x  compliant stdint.h for Microsoft Visual Studio
+// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 
+// 
+//  Copyright (c) 2006-2008 Alexander Chemeris
+// 
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+// 
+//   1. Redistributions of source code must retain the above copyright notice,
+//      this list of conditions and the following disclaimer.
+// 
+//   2. Redistributions in binary form must reproduce the above copyright
+//      notice, this list of conditions and the following disclaimer in the
+//      documentation and/or other materials provided with the distribution.
+// 
+//   3. The name of the author may be used to endorse or promote products
+//      derived from this software without specific prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+// 
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _MSC_VER // [
+#error "Use this header only with Microsoft Visual C++ compilers!"
+#endif // _MSC_VER ]
+
+#ifndef _MSC_STDINT_H_ // [
+#define _MSC_STDINT_H_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif
+
+#include <limits.h>
+
+// For Visual Studio 6 in C++ mode and for many Visual Studio versions when
+// compiling for ARM we should wrap <wchar.h> include with 'extern "C++" {}'
+// or compiler give many errors like this:
+//   error C2733: second C linkage of overloaded function 'wmemchr' not allowed
+#ifdef __cplusplus
+extern "C" {
+#endif
+#  include <wchar.h>
+#ifdef __cplusplus
+}
+#endif
+
+// Define _W64 macros to mark types changing their size, like intptr_t.
+#ifndef _W64
+#  if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && _MSC_VER >= 1300
+#     define _W64 __w64
+#  else
+#     define _W64
+#  endif
+#endif
+
+
+// 7.18.1 Integer types
+
+// 7.18.1.1 Exact-width integer types
+
+// Visual Studio 6 and Embedded Visual C++ 4 doesn't
+// realize that, e.g. char has the same size as __int8
+// so we give up on __intX for them.
+#if (_MSC_VER < 1300)
+   typedef signed char       int8_t;
+   typedef signed short      int16_t;
+   typedef signed int        int32_t;
+   typedef unsigned char     uint8_t;
+   typedef unsigned short    uint16_t;
+   typedef unsigned int      uint32_t;
+#else
+   typedef signed __int8     int8_t;
+   typedef signed __int16    int16_t;
+   typedef signed __int32    int32_t;
+   typedef unsigned __int8   uint8_t;
+   typedef unsigned __int16  uint16_t;
+   typedef unsigned __int32  uint32_t;
+#endif
+typedef signed __int64       int64_t;
+typedef unsigned __int64     uint64_t;
+
+
+// 7.18.1.2 Minimum-width integer types
+typedef int8_t    int_least8_t;
+typedef int16_t   int_least16_t;
+typedef int32_t   int_least32_t;
+typedef int64_t   int_least64_t;
+typedef uint8_t   uint_least8_t;
+typedef uint16_t  uint_least16_t;
+typedef uint32_t  uint_least32_t;
+typedef uint64_t  uint_least64_t;
+
+// 7.18.1.3 Fastest minimum-width integer types
+typedef int8_t    int_fast8_t;
+typedef int16_t   int_fast16_t;
+typedef int32_t   int_fast32_t;
+typedef int64_t   int_fast64_t;
+typedef uint8_t   uint_fast8_t;
+typedef uint16_t  uint_fast16_t;
+typedef uint32_t  uint_fast32_t;
+typedef uint64_t  uint_fast64_t;
+
+// 7.18.1.4 Integer types capable of holding object pointers
+#ifdef _WIN64 // [
+   typedef signed __int64    intptr_t;
+   typedef unsigned __int64  uintptr_t;
+#else // _WIN64 ][
+   typedef _W64 signed int   intptr_t;
+   typedef _W64 unsigned int uintptr_t;
+#endif // _WIN64 ]
+
+// 7.18.1.5 Greatest-width integer types
+typedef int64_t   intmax_t;
+typedef uint64_t  uintmax_t;
+
+
+// 7.18.2 Limits of specified-width integer types
+
+#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) // [   See footnote 220 at page 257 and footnote 221 at page 259
+
+// 7.18.2.1 Limits of exact-width integer types
+#define INT8_MIN     ((int8_t)_I8_MIN)
+#define INT8_MAX     _I8_MAX
+#define INT16_MIN    ((int16_t)_I16_MIN)
+#define INT16_MAX    _I16_MAX
+#define INT32_MIN    ((int32_t)_I32_MIN)
+#define INT32_MAX    _I32_MAX
+#define INT64_MIN    ((int64_t)_I64_MIN)
+#define INT64_MAX    _I64_MAX
+#define UINT8_MAX    _UI8_MAX
+#define UINT16_MAX   _UI16_MAX
+#define UINT32_MAX   _UI32_MAX
+#define UINT64_MAX   _UI64_MAX
+
+// 7.18.2.2 Limits of minimum-width integer types
+#define INT_LEAST8_MIN    INT8_MIN
+#define INT_LEAST8_MAX    INT8_MAX
+#define INT_LEAST16_MIN   INT16_MIN
+#define INT_LEAST16_MAX   INT16_MAX
+#define INT_LEAST32_MIN   INT32_MIN
+#define INT_LEAST32_MAX   INT32_MAX
+#define INT_LEAST64_MIN   INT64_MIN
+#define INT_LEAST64_MAX   INT64_MAX
+#define UINT_LEAST8_MAX   UINT8_MAX
+#define UINT_LEAST16_MAX  UINT16_MAX
+#define UINT_LEAST32_MAX  UINT32_MAX
+#define UINT_LEAST64_MAX  UINT64_MAX
+
+// 7.18.2.3 Limits of fastest minimum-width integer types
+#define INT_FAST8_MIN    INT8_MIN
+#define INT_FAST8_MAX    INT8_MAX
+#define INT_FAST16_MIN   INT16_MIN
+#define INT_FAST16_MAX   INT16_MAX
+#define INT_FAST32_MIN   INT32_MIN
+#define INT_FAST32_MAX   INT32_MAX
+#define INT_FAST64_MIN   INT64_MIN
+#define INT_FAST64_MAX   INT64_MAX
+#define UINT_FAST8_MAX   UINT8_MAX
+#define UINT_FAST16_MAX  UINT16_MAX
+#define UINT_FAST32_MAX  UINT32_MAX
+#define UINT_FAST64_MAX  UINT64_MAX
+
+// 7.18.2.4 Limits of integer types capable of holding object pointers
+#ifdef _WIN64 // [
+#  define INTPTR_MIN   INT64_MIN
+#  define INTPTR_MAX   INT64_MAX
+#  define UINTPTR_MAX  UINT64_MAX
+#else // _WIN64 ][
+#  define INTPTR_MIN   INT32_MIN
+#  define INTPTR_MAX   INT32_MAX
+#  define UINTPTR_MAX  UINT32_MAX
+#endif // _WIN64 ]
+
+// 7.18.2.5 Limits of greatest-width integer types
+#define INTMAX_MIN   INT64_MIN
+#define INTMAX_MAX   INT64_MAX
+#define UINTMAX_MAX  UINT64_MAX
+
+// 7.18.3 Limits of other integer types
+
+#ifdef _WIN64 // [
+#  define PTRDIFF_MIN  _I64_MIN
+#  define PTRDIFF_MAX  _I64_MAX
+#else  // _WIN64 ][
+#  define PTRDIFF_MIN  _I32_MIN
+#  define PTRDIFF_MAX  _I32_MAX
+#endif  // _WIN64 ]
+
+#define SIG_ATOMIC_MIN  INT_MIN
+#define SIG_ATOMIC_MAX  INT_MAX
+
+#ifndef SIZE_MAX // [
+#  ifdef _WIN64 // [
+#     define SIZE_MAX  _UI64_MAX
+#  else // _WIN64 ][
+#     define SIZE_MAX  _UI32_MAX
+#  endif // _WIN64 ]
+#endif // SIZE_MAX ]
+
+// WCHAR_MIN and WCHAR_MAX are also defined in <wchar.h>
+#ifndef WCHAR_MIN // [
+#  define WCHAR_MIN  0
+#endif  // WCHAR_MIN ]
+#ifndef WCHAR_MAX // [
+#  define WCHAR_MAX  _UI16_MAX
+#endif  // WCHAR_MAX ]
+
+#define WINT_MIN  0
+#define WINT_MAX  _UI16_MAX
+
+#endif // __STDC_LIMIT_MACROS ]
+
+
+// 7.18.4 Limits of other integer types
+
+#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) // [   See footnote 224 at page 260
+
+// 7.18.4.1 Macros for minimum-width integer constants
+
+#define INT8_C(val)  val##i8
+#define INT16_C(val) val##i16
+#define INT32_C(val) val##i32
+#define INT64_C(val) val##i64
+
+#define UINT8_C(val)  val##ui8
+#define UINT16_C(val) val##ui16
+#define UINT32_C(val) val##ui32
+#define UINT64_C(val) val##ui64
+
+// 7.18.4.2 Macros for greatest-width integer constants
+#define INTMAX_C   INT64_C
+#define UINTMAX_C  UINT64_C
+
+#endif // __STDC_CONSTANT_MACROS ]
+
+
+#endif // _MSC_STDINT_H_ ]
diff --git a/Source/Plugins/vpo_dll/sys_endian.h b/Source/Plugins/vpo_dll/sys_endian.h
new file mode 100644
index 0000000..ee8409d
--- /dev/null
+++ b/Source/Plugins/vpo_dll/sys_endian.h
@@ -0,0 +1,128 @@
+//------------------------------------------------------------------------
+//  EDGE Endian handling
+//------------------------------------------------------------------------
+//
+//  Eureka DOOM Editor
+//
+//  Copyright (C) 2006-2008 Andrew Apted
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 2
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//------------------------------------------------------------------------
+//
+//  Using code from SDL_byteorder.h and SDL_endian.h.
+//  Copyright (C) 1997-2004 Sam Lantinga.
+//
+//------------------------------------------------------------------------
+
+#ifndef __SYS_ENDIAN_H__
+#define __SYS_ENDIAN_H__
+
+
+// ---- determine byte order ----
+
+#define UT_LIL_ENDIAN  1234
+#define UT_BIG_ENDIAN  4321
+
+#if defined(__LITTLE_ENDIAN__) || defined(WIN32) ||  \
+    defined(__i386__) || defined(__i386) ||          \
+    defined(__ia64__) || defined(__x86_64__)  ||     \
+    defined(__alpha__) || defined(__alpha)  ||       \
+    defined(__arm__) || defined(__SYMBIAN32__) ||    \
+    (defined(__mips__) && defined(__MIPSEL__))
+#define UT_BYTEORDER   UT_LIL_ENDIAN
+#else
+#define UT_BYTEORDER   UT_BIG_ENDIAN
+#endif
+
+
+// ---- the gruntwork of swapping ----
+
+#if defined(__GNUC__) && defined(__i386__)
+static inline u16_t UT_Swap16(u16_t x)
+{
+  __asm__("xchgb %b0,%h0" : "=q" (x) :  "0" (x));
+  return x;
+}
+#elif defined(__GNUC__) && defined(__x86_64__)
+static inline u16_t UT_Swap16(u16_t x)
+{
+  __asm__("xchgb %b0,%h0" : "=Q" (x) :  "0" (x));
+  return x;
+}
+#elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__))
+static inline u16_t UT_Swap16(u16_t x)
+{
+  u16_t result;
+
+  __asm__("rlwimi %0,%2,8,16,23" : "=&r" (result) : "0" (x >> 8), "r" (x));
+  return result;
+}
+#else
+static inline u16_t UT_Swap16(u16_t x) {
+  return((x<<8)|(x>>8));
+}
+#endif
+
+#if defined(__GNUC__) && defined(__i386__)
+static inline u32_t UT_Swap32(u32_t x)
+{
+  __asm__("bswap %0" : "=r" (x) : "0" (x));
+  return x;
+}
+#elif defined(__GNUC__) && defined(__x86_64__)
+static inline u32_t UT_Swap32(u32_t x)
+{
+  __asm__("bswapl %0" : "=r" (x) : "0" (x));
+  return x;
+}
+#elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__))
+static inline u32_t UT_Swap32(u32_t x)
+{
+  u32_t result;
+
+  __asm__("rlwimi %0,%2,24,16,23" : "=&r" (result) : "0" (x>>24), "r" (x));
+  __asm__("rlwimi %0,%2,8,8,15"   : "=&r" (result) : "0" (result),    "r" (x));
+  __asm__("rlwimi %0,%2,24,0,7"   : "=&r" (result) : "0" (result),    "r" (x));
+  return result;
+}
+#else
+static inline u32_t UT_Swap32(u32_t x) {
+  return ((x<<24)|((x<<8)&0x00FF0000)|((x>>8)&0x0000FF00)|(x>>24));
+}
+#endif
+
+
+// ---- byte swap from specified endianness to native ----
+
+#if (UT_BYTEORDER == UT_LIL_ENDIAN)
+#define LE_U16(X)  ((u16_t)(X))
+#define LE_U32(X)  ((u32_t)(X))
+#define BE_U16(X)  UT_Swap16(X)
+#define BE_U32(X)  UT_Swap32(X)
+#else
+#define LE_U16(X)  UT_Swap16(X)
+#define LE_U32(X)  UT_Swap32(X)
+#define BE_U16(X)  ((u16_t)(X))
+#define BE_U32(X)  ((u32_t)(X))
+#endif
+
+// signed versions of the above
+#define LE_S16(X)  ((s16_t) LE_U16((u16_t) (X)))
+#define LE_S32(X)  ((s32_t) LE_U32((u32_t) (X)))
+#define BE_S16(X)  ((s16_t) BE_U16((u16_t) (X)))
+#define BE_S32(X)  ((s32_t) BE_U32((u32_t) (X)))
+
+
+#endif // __SYS_ENDIAN_H__
+
+//--- editor settings ---
+// vi:ts=4:sw=4:noexpandtab
diff --git a/Source/Plugins/vpo_dll/sys_macro.h b/Source/Plugins/vpo_dll/sys_macro.h
new file mode 100644
index 0000000..c38091b
--- /dev/null
+++ b/Source/Plugins/vpo_dll/sys_macro.h
@@ -0,0 +1,62 @@
+//------------------------------------------------------------------------
+//  Macros
+//------------------------------------------------------------------------
+//
+//  Eureka DOOM Editor
+//
+//  Copyright (C) 2006-2008 Andrew Apted
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 2
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//------------------------------------------------------------------------
+
+#ifndef __SYS_MACRO_H__
+#define __SYS_MACRO_H__
+
+// basic macros
+
+#ifndef NULL
+#define NULL    ((void*) 0)
+#endif
+
+#ifndef M_PI
+#define M_PI  3.14159265358979323846
+#endif
+
+#ifndef MAX
+#define MAX(a,b)  ((a) > (b) ? (a) : (b))
+#endif
+
+#ifndef MIN
+#define MIN(a,b)  ((a) < (b) ? (a) : (b))
+#endif
+
+#ifndef ABS
+#define ABS(a)  ((a) < 0 ? -(a) : (a))
+#endif
+
+#ifndef SGN
+#define SGN(a)  ((a) < 0 ? -1 : (a) > 0 ? +1 : 0)
+#endif
+
+#ifndef I_ROUND
+#define I_ROUND(x)  ((int) (((x) < 0.0f) ? ((x) - 0.5f) : ((x) + 0.5f)))
+#endif
+
+#ifndef CLAMP
+#define CLAMP(low,x,high)  \
+    ((x) < (low) ? (low) : (x) > (high) ? (high) : (x))
+#endif
+
+#endif  /* __SYS_MACRO_H__ */
+
+//--- editor settings ---
+// vi:ts=4:sw=4:noexpandtab
diff --git a/Source/Plugins/vpo_dll/sys_type.h b/Source/Plugins/vpo_dll/sys_type.h
new file mode 100644
index 0000000..89843b1
--- /dev/null
+++ b/Source/Plugins/vpo_dll/sys_type.h
@@ -0,0 +1,39 @@
+//------------------------------------------------------------------------
+//  Type definitions
+//------------------------------------------------------------------------
+//
+//  Eureka DOOM Editor
+//
+//  Copyright (C) 2006-2008 Andrew Apted
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 2
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//------------------------------------------------------------------------
+
+#ifndef __SYS_TYPE_H__
+#define __SYS_TYPE_H__
+
+// basic types
+
+typedef char  s8_t;
+typedef short s16_t;
+typedef int   s32_t;
+ 
+typedef unsigned char  u8_t;
+typedef unsigned short u16_t;
+typedef unsigned int   u32_t;
+
+typedef u8_t byte;
+
+#endif  /* __SYS_TYPE_H__ */
+
+//--- editor settings ---
+// vi:ts=4:sw=4:noexpandtab
diff --git a/Source/Plugins/vpo_dll/tables.cc b/Source/Plugins/vpo_dll/tables.cc
new file mode 100644
index 0000000..a6a83cd
--- /dev/null
+++ b/Source/Plugins/vpo_dll/tables.cc
@@ -0,0 +1,2129 @@
+// Emacs style mode select   -*- C++ -*- 
+//-----------------------------------------------------------------------------
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005 Simon Howard
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+// 02111-1307, USA.
+//
+// DESCRIPTION:
+//	Lookup tables.
+//	Do not try to look them up :-).
+//	In the order of appearance: 
+//
+//	int finetangent[4096]	- Tangens LUT.
+//	 Should work with BAM fairly well (12 of 16bit,
+//      effectively, by shifting).
+//
+//	int finesine[10240]		- Sine lookup.
+//	 Guess what, serves as cosine, too.
+//	 Remarkable thing is, how to use BAMs with this? 
+//
+//	int tantoangle[2049]	- ArcTan LUT,
+//	  maps tan(angle) to angle fast. Gotta search.
+//	
+//    
+//-----------------------------------------------------------------------------
+
+#include "vpo_local.h"
+
+namespace vpo
+{
+
+
+int
+SlopeDiv
+( unsigned	num,
+  unsigned	den)
+{
+    unsigned 	ans;
+    
+    if (den < 512)
+	return SLOPERANGE;
+
+    ans = (num<<3)/(den>>8);
+
+    return ans <= SLOPERANGE ? ans : SLOPERANGE;
+}
+
+
+const int finetangent[4096] =
+{
+    -170910304,-56965752,-34178904,-24413316,-18988036,-15535599,-13145455,-11392683,
+    -10052327,-8994149,-8137527,-7429880,-6835455,-6329090,-5892567,-5512368,
+    -5178251,-4882318,-4618375,-4381502,-4167737,-3973855,-3797206,-3635590,
+    -3487165,-3350381,-3223918,-3106651,-2997613,-2895966,-2800983,-2712030,
+    -2628549,-2550052,-2476104,-2406322,-2340362,-2277919,-2218719,-2162516,
+    -2109087,-2058233,-2009771,-1963536,-1919378,-1877161,-1836758,-1798063,
+    -1760956,-1725348,-1691149,-1658278,-1626658,-1596220,-1566898,-1538632,
+    -1511367,-1485049,-1459630,-1435065,-1411312,-1388330,-1366084,-1344537,
+    -1323658,-1303416,-1283783,-1264730,-1246234,-1228269,-1210813,-1193846,
+    -1177345,-1161294,-1145673,-1130465,-1115654,-1101225,-1087164,-1073455,
+    -1060087,-1047046,-1034322,-1021901,-1009774,-997931,-986361,-975054,
+    -964003,-953199,-942633,-932298,-922186,-912289,-902602,-893117,
+    -883829,-874730,-865817,-857081,-848520,-840127,-831898,-823827,
+    -815910,-808143,-800521,-793041,-785699,-778490,-771411,-764460,
+    -757631,-750922,-744331,-737853,-731486,-725227,-719074,-713023,
+    -707072,-701219,-695462,-689797,-684223,-678737,-673338,-668024,
+    -662792,-657640,-652568,-647572,-642651,-637803,-633028,-628323,
+    -623686,-619117,-614613,-610174,-605798,-601483,-597229,-593033,
+    -588896,-584815,-580789,-576818,-572901,-569035,-565221,-561456,
+    -557741,-554074,-550455,-546881,-543354,-539870,-536431,-533034,
+    -529680,-526366,-523094,-519861,-516667,-513512,-510394,-507313,
+    -504269,-501261,-498287,-495348,-492443,-489571,-486732,-483925,
+    -481150,-478406,-475692,-473009,-470355,-467730,-465133,-462565,
+    -460024,-457511,-455024,-452564,-450129,-447720,-445337,-442978,
+    -440643,-438332,-436045,-433781,-431540,-429321,-427125,-424951,
+    -422798,-420666,-418555,-416465,-414395,-412344,-410314,-408303,
+    -406311,-404338,-402384,-400448,-398530,-396630,-394747,-392882,
+    -391034,-389202,-387387,-385589,-383807,-382040,-380290,-378555,
+    -376835,-375130,-373440,-371765,-370105,-368459,-366826,-365208,
+    -363604,-362013,-360436,-358872,-357321,-355783,-354257,-352744,
+    -351244,-349756,-348280,-346816,-345364,-343924,-342495,-341078,
+    -339671,-338276,-336892,-335519,-334157,-332805,-331464,-330133,
+    -328812,-327502,-326201,-324910,-323629,-322358,-321097,-319844,
+    -318601,-317368,-316143,-314928,-313721,-312524,-311335,-310154,
+    -308983,-307819,-306664,-305517,-304379,-303248,-302126,-301011,
+    -299904,-298805,-297714,-296630,-295554,-294485,-293423,-292369,
+    -291322,-290282,-289249,-288223,-287204,-286192,-285186,-284188,
+    -283195,-282210,-281231,-280258,-279292,-278332,-277378,-276430,
+    -275489,-274553,-273624,-272700,-271782,-270871,-269965,-269064,
+    -268169,-267280,-266397,-265519,-264646,-263779,-262917,-262060,
+    -261209,-260363,-259522,-258686,-257855,-257029,-256208,-255392,
+    -254581,-253774,-252973,-252176,-251384,-250596,-249813,-249035,
+    -248261,-247492,-246727,-245966,-245210,-244458,-243711,-242967,
+    -242228,-241493,-240763,-240036,-239314,-238595,-237881,-237170,
+    -236463,-235761,-235062,-234367,-233676,-232988,-232304,-231624,
+    -230948,-230275,-229606,-228941,-228279,-227621,-226966,-226314,
+    -225666,-225022,-224381,-223743,-223108,-222477,-221849,-221225,
+    -220603,-219985,-219370,-218758,-218149,-217544,-216941,-216341,
+    -215745,-215151,-214561,-213973,-213389,-212807,-212228,-211652,
+    -211079,-210509,-209941,-209376,-208815,-208255,-207699,-207145,
+    -206594,-206045,-205500,-204956,-204416,-203878,-203342,-202809,
+    -202279,-201751,-201226,-200703,-200182,-199664,-199149,-198636,
+    -198125,-197616,-197110,-196606,-196105,-195606,-195109,-194614,
+    -194122,-193631,-193143,-192658,-192174,-191693,-191213,-190736,
+    -190261,-189789,-189318,-188849,-188382,-187918,-187455,-186995,
+    -186536,-186080,-185625,-185173,-184722,-184274,-183827,-183382,
+    -182939,-182498,-182059,-181622,-181186,-180753,-180321,-179891,
+    -179463,-179037,-178612,-178190,-177769,-177349,-176932,-176516,
+    -176102,-175690,-175279,-174870,-174463,-174057,-173653,-173251,
+    -172850,-172451,-172053,-171657,-171263,-170870,-170479,-170089,
+    -169701,-169315,-168930,-168546,-168164,-167784,-167405,-167027,
+    -166651,-166277,-165904,-165532,-165162,-164793,-164426,-164060,
+    -163695,-163332,-162970,-162610,-162251,-161893,-161537,-161182,
+    -160828,-160476,-160125,-159775,-159427,-159079,-158734,-158389,
+    -158046,-157704,-157363,-157024,-156686,-156349,-156013,-155678,
+    -155345,-155013,-154682,-154352,-154024,-153697,-153370,-153045,
+    -152722,-152399,-152077,-151757,-151438,-151120,-150803,-150487,
+    -150172,-149859,-149546,-149235,-148924,-148615,-148307,-148000,
+    -147693,-147388,-147084,-146782,-146480,-146179,-145879,-145580,
+    -145282,-144986,-144690,-144395,-144101,-143808,-143517,-143226,
+    -142936,-142647,-142359,-142072,-141786,-141501,-141217,-140934,
+    -140651,-140370,-140090,-139810,-139532,-139254,-138977,-138701,
+    -138426,-138152,-137879,-137607,-137335,-137065,-136795,-136526,
+    -136258,-135991,-135725,-135459,-135195,-134931,-134668,-134406,
+    -134145,-133884,-133625,-133366,-133108,-132851,-132594,-132339,
+    -132084,-131830,-131576,-131324,-131072,-130821,-130571,-130322,
+    -130073,-129825,-129578,-129332,-129086,-128841,-128597,-128353,
+    -128111,-127869,-127627,-127387,-127147,-126908,-126669,-126432,
+    -126195,-125959,-125723,-125488,-125254,-125020,-124787,-124555,
+    -124324,-124093,-123863,-123633,-123404,-123176,-122949,-122722,
+    -122496,-122270,-122045,-121821,-121597,-121374,-121152,-120930,
+    -120709,-120489,-120269,-120050,-119831,-119613,-119396,-119179,
+    -118963,-118747,-118532,-118318,-118104,-117891,-117678,-117466,
+    -117254,-117044,-116833,-116623,-116414,-116206,-115998,-115790,
+    -115583,-115377,-115171,-114966,-114761,-114557,-114354,-114151,
+    -113948,-113746,-113545,-113344,-113143,-112944,-112744,-112546,
+    -112347,-112150,-111952,-111756,-111560,-111364,-111169,-110974,
+    -110780,-110586,-110393,-110200,-110008,-109817,-109626,-109435,
+    -109245,-109055,-108866,-108677,-108489,-108301,-108114,-107927,
+    -107741,-107555,-107369,-107184,-107000,-106816,-106632,-106449,
+    -106266,-106084,-105902,-105721,-105540,-105360,-105180,-105000,
+    -104821,-104643,-104465,-104287,-104109,-103933,-103756,-103580,
+    -103404,-103229,-103054,-102880,-102706,-102533,-102360,-102187,
+    -102015,-101843,-101671,-101500,-101330,-101159,-100990,-100820,
+    -100651,-100482,-100314,-100146,-99979,-99812,-99645,-99479,
+    -99313,-99148,-98982,-98818,-98653,-98489,-98326,-98163,
+    -98000,-97837,-97675,-97513,-97352,-97191,-97030,-96870,
+    -96710,-96551,-96391,-96233,-96074,-95916,-95758,-95601,
+    -95444,-95287,-95131,-94975,-94819,-94664,-94509,-94354,
+    -94200,-94046,-93892,-93739,-93586,-93434,-93281,-93129,
+    -92978,-92826,-92675,-92525,-92375,-92225,-92075,-91926,
+    -91777,-91628,-91480,-91332,-91184,-91036,-90889,-90742,
+    -90596,-90450,-90304,-90158,-90013,-89868,-89724,-89579,
+    -89435,-89292,-89148,-89005,-88862,-88720,-88577,-88435,
+    -88294,-88152,-88011,-87871,-87730,-87590,-87450,-87310,
+    -87171,-87032,-86893,-86755,-86616,-86479,-86341,-86204,
+    -86066,-85930,-85793,-85657,-85521,-85385,-85250,-85114,
+    -84980,-84845,-84710,-84576,-84443,-84309,-84176,-84043,
+    -83910,-83777,-83645,-83513,-83381,-83250,-83118,-82987,
+    -82857,-82726,-82596,-82466,-82336,-82207,-82078,-81949,
+    -81820,-81691,-81563,-81435,-81307,-81180,-81053,-80925,
+    -80799,-80672,-80546,-80420,-80294,-80168,-80043,-79918,
+    -79793,-79668,-79544,-79420,-79296,-79172,-79048,-78925,
+    -78802,-78679,-78557,-78434,-78312,-78190,-78068,-77947,
+    -77826,-77705,-77584,-77463,-77343,-77223,-77103,-76983,
+    -76864,-76744,-76625,-76506,-76388,-76269,-76151,-76033,
+    -75915,-75797,-75680,-75563,-75446,-75329,-75213,-75096,
+    -74980,-74864,-74748,-74633,-74517,-74402,-74287,-74172,
+    -74058,-73944,-73829,-73715,-73602,-73488,-73375,-73262,
+    -73149,-73036,-72923,-72811,-72699,-72587,-72475,-72363,
+    -72252,-72140,-72029,-71918,-71808,-71697,-71587,-71477,
+    -71367,-71257,-71147,-71038,-70929,-70820,-70711,-70602,
+    -70494,-70385,-70277,-70169,-70061,-69954,-69846,-69739,
+    -69632,-69525,-69418,-69312,-69205,-69099,-68993,-68887,
+    -68781,-68676,-68570,-68465,-68360,-68255,-68151,-68046,
+    -67942,-67837,-67733,-67629,-67526,-67422,-67319,-67216,
+    -67113,-67010,-66907,-66804,-66702,-66600,-66498,-66396,
+    -66294,-66192,-66091,-65989,-65888,-65787,-65686,-65586,
+    -65485,-65385,-65285,-65185,-65085,-64985,-64885,-64786,
+    -64687,-64587,-64488,-64389,-64291,-64192,-64094,-63996,
+    -63897,-63799,-63702,-63604,-63506,-63409,-63312,-63215,
+    -63118,-63021,-62924,-62828,-62731,-62635,-62539,-62443,
+    -62347,-62251,-62156,-62060,-61965,-61870,-61775,-61680,
+    -61585,-61491,-61396,-61302,-61208,-61114,-61020,-60926,
+    -60833,-60739,-60646,-60552,-60459,-60366,-60273,-60181,
+    -60088,-59996,-59903,-59811,-59719,-59627,-59535,-59444,
+    -59352,-59261,-59169,-59078,-58987,-58896,-58805,-58715,
+    -58624,-58534,-58443,-58353,-58263,-58173,-58083,-57994,
+    -57904,-57815,-57725,-57636,-57547,-57458,-57369,-57281,
+    -57192,-57104,-57015,-56927,-56839,-56751,-56663,-56575,
+    -56487,-56400,-56312,-56225,-56138,-56051,-55964,-55877,
+    -55790,-55704,-55617,-55531,-55444,-55358,-55272,-55186,
+    -55100,-55015,-54929,-54843,-54758,-54673,-54587,-54502,
+    -54417,-54333,-54248,-54163,-54079,-53994,-53910,-53826,
+    -53741,-53657,-53574,-53490,-53406,-53322,-53239,-53156,
+    -53072,-52989,-52906,-52823,-52740,-52657,-52575,-52492,
+    -52410,-52327,-52245,-52163,-52081,-51999,-51917,-51835,
+    -51754,-51672,-51591,-51509,-51428,-51347,-51266,-51185,
+    -51104,-51023,-50942,-50862,-50781,-50701,-50621,-50540,
+    -50460,-50380,-50300,-50221,-50141,-50061,-49982,-49902,
+    -49823,-49744,-49664,-49585,-49506,-49427,-49349,-49270,
+    -49191,-49113,-49034,-48956,-48878,-48799,-48721,-48643,
+    -48565,-48488,-48410,-48332,-48255,-48177,-48100,-48022,
+    -47945,-47868,-47791,-47714,-47637,-47560,-47484,-47407,
+    -47331,-47254,-47178,-47102,-47025,-46949,-46873,-46797,
+    -46721,-46646,-46570,-46494,-46419,-46343,-46268,-46193,
+    -46118,-46042,-45967,-45892,-45818,-45743,-45668,-45593,
+    -45519,-45444,-45370,-45296,-45221,-45147,-45073,-44999,
+    -44925,-44851,-44778,-44704,-44630,-44557,-44483,-44410,
+    -44337,-44263,-44190,-44117,-44044,-43971,-43898,-43826,
+    -43753,-43680,-43608,-43535,-43463,-43390,-43318,-43246,
+    -43174,-43102,-43030,-42958,-42886,-42814,-42743,-42671,
+    -42600,-42528,-42457,-42385,-42314,-42243,-42172,-42101,
+    -42030,-41959,-41888,-41817,-41747,-41676,-41605,-41535,
+    -41465,-41394,-41324,-41254,-41184,-41113,-41043,-40973,
+    -40904,-40834,-40764,-40694,-40625,-40555,-40486,-40416,
+    -40347,-40278,-40208,-40139,-40070,-40001,-39932,-39863,
+    -39794,-39726,-39657,-39588,-39520,-39451,-39383,-39314,
+    -39246,-39178,-39110,-39042,-38973,-38905,-38837,-38770,
+    -38702,-38634,-38566,-38499,-38431,-38364,-38296,-38229,
+    -38161,-38094,-38027,-37960,-37893,-37826,-37759,-37692,
+    -37625,-37558,-37491,-37425,-37358,-37291,-37225,-37158,
+    -37092,-37026,-36959,-36893,-36827,-36761,-36695,-36629,
+    -36563,-36497,-36431,-36365,-36300,-36234,-36168,-36103,
+    -36037,-35972,-35907,-35841,-35776,-35711,-35646,-35580,
+    -35515,-35450,-35385,-35321,-35256,-35191,-35126,-35062,
+    -34997,-34932,-34868,-34803,-34739,-34675,-34610,-34546,
+    -34482,-34418,-34354,-34289,-34225,-34162,-34098,-34034,
+    -33970,-33906,-33843,-33779,-33715,-33652,-33588,-33525,
+    -33461,-33398,-33335,-33272,-33208,-33145,-33082,-33019,
+    -32956,-32893,-32830,-32767,-32705,-32642,-32579,-32516,
+    -32454,-32391,-32329,-32266,-32204,-32141,-32079,-32017,
+    -31955,-31892,-31830,-31768,-31706,-31644,-31582,-31520,
+    -31458,-31396,-31335,-31273,-31211,-31150,-31088,-31026,
+    -30965,-30904,-30842,-30781,-30719,-30658,-30597,-30536,
+    -30474,-30413,-30352,-30291,-30230,-30169,-30108,-30048,
+    -29987,-29926,-29865,-29805,-29744,-29683,-29623,-29562,
+    -29502,-29441,-29381,-29321,-29260,-29200,-29140,-29080,
+    -29020,-28959,-28899,-28839,-28779,-28719,-28660,-28600,
+    -28540,-28480,-28420,-28361,-28301,-28241,-28182,-28122,
+    -28063,-28003,-27944,-27884,-27825,-27766,-27707,-27647,
+    -27588,-27529,-27470,-27411,-27352,-27293,-27234,-27175,
+    -27116,-27057,-26998,-26940,-26881,-26822,-26763,-26705,
+    -26646,-26588,-26529,-26471,-26412,-26354,-26295,-26237,
+    -26179,-26120,-26062,-26004,-25946,-25888,-25830,-25772,
+    -25714,-25656,-25598,-25540,-25482,-25424,-25366,-25308,
+    -25251,-25193,-25135,-25078,-25020,-24962,-24905,-24847,
+    -24790,-24732,-24675,-24618,-24560,-24503,-24446,-24389,
+    -24331,-24274,-24217,-24160,-24103,-24046,-23989,-23932,
+    -23875,-23818,-23761,-23704,-23647,-23591,-23534,-23477,
+    -23420,-23364,-23307,-23250,-23194,-23137,-23081,-23024,
+    -22968,-22911,-22855,-22799,-22742,-22686,-22630,-22573,
+    -22517,-22461,-22405,-22349,-22293,-22237,-22181,-22125,
+    -22069,-22013,-21957,-21901,-21845,-21789,-21733,-21678,
+    -21622,-21566,-21510,-21455,-21399,-21343,-21288,-21232,
+    -21177,-21121,-21066,-21010,-20955,-20900,-20844,-20789,
+    -20734,-20678,-20623,-20568,-20513,-20457,-20402,-20347,
+    -20292,-20237,-20182,-20127,-20072,-20017,-19962,-19907,
+    -19852,-19797,-19742,-19688,-19633,-19578,-19523,-19469,
+    -19414,-19359,-19305,-19250,-19195,-19141,-19086,-19032,
+    -18977,-18923,-18868,-18814,-18760,-18705,-18651,-18597,
+    -18542,-18488,-18434,-18380,-18325,-18271,-18217,-18163,
+    -18109,-18055,-18001,-17946,-17892,-17838,-17784,-17731,
+    -17677,-17623,-17569,-17515,-17461,-17407,-17353,-17300,
+    -17246,-17192,-17138,-17085,-17031,-16977,-16924,-16870,
+    -16817,-16763,-16710,-16656,-16603,-16549,-16496,-16442,
+    -16389,-16335,-16282,-16229,-16175,-16122,-16069,-16015,
+    -15962,-15909,-15856,-15802,-15749,-15696,-15643,-15590,
+    -15537,-15484,-15431,-15378,-15325,-15272,-15219,-15166,
+    -15113,-15060,-15007,-14954,-14901,-14848,-14795,-14743,
+    -14690,-14637,-14584,-14531,-14479,-14426,-14373,-14321,
+    -14268,-14215,-14163,-14110,-14057,-14005,-13952,-13900,
+    -13847,-13795,-13742,-13690,-13637,-13585,-13533,-13480,
+    -13428,-13375,-13323,-13271,-13218,-13166,-13114,-13062,
+    -13009,-12957,-12905,-12853,-12800,-12748,-12696,-12644,
+    -12592,-12540,-12488,-12436,-12383,-12331,-12279,-12227,
+    -12175,-12123,-12071,-12019,-11967,-11916,-11864,-11812,
+    -11760,-11708,-11656,-11604,-11552,-11501,-11449,-11397,
+    -11345,-11293,-11242,-11190,-11138,-11086,-11035,-10983,
+    -10931,-10880,-10828,-10777,-10725,-10673,-10622,-10570,
+    -10519,-10467,-10415,-10364,-10312,-10261,-10209,-10158,
+    -10106,-10055,-10004,-9952,-9901,-9849,-9798,-9747,
+    -9695,-9644,-9592,-9541,-9490,-9438,-9387,-9336,
+    -9285,-9233,-9182,-9131,-9080,-9028,-8977,-8926,
+    -8875,-8824,-8772,-8721,-8670,-8619,-8568,-8517,
+    -8466,-8414,-8363,-8312,-8261,-8210,-8159,-8108,
+    -8057,-8006,-7955,-7904,-7853,-7802,-7751,-7700,
+    -7649,-7598,-7547,-7496,-7445,-7395,-7344,-7293,
+    -7242,-7191,-7140,-7089,-7038,-6988,-6937,-6886,
+    -6835,-6784,-6733,-6683,-6632,-6581,-6530,-6480,
+    -6429,-6378,-6327,-6277,-6226,-6175,-6124,-6074,
+    -6023,-5972,-5922,-5871,-5820,-5770,-5719,-5668,
+    -5618,-5567,-5517,-5466,-5415,-5365,-5314,-5264,
+    -5213,-5162,-5112,-5061,-5011,-4960,-4910,-4859,
+    -4808,-4758,-4707,-4657,-4606,-4556,-4505,-4455,
+    -4404,-4354,-4303,-4253,-4202,-4152,-4101,-4051,
+    -4001,-3950,-3900,-3849,-3799,-3748,-3698,-3648,
+    -3597,-3547,-3496,-3446,-3395,-3345,-3295,-3244,
+    -3194,-3144,-3093,-3043,-2992,-2942,-2892,-2841,
+    -2791,-2741,-2690,-2640,-2590,-2539,-2489,-2439,
+    -2388,-2338,-2288,-2237,-2187,-2137,-2086,-2036,
+    -1986,-1935,-1885,-1835,-1784,-1734,-1684,-1633,
+    -1583,-1533,-1483,-1432,-1382,-1332,-1281,-1231,
+    -1181,-1131,-1080,-1030,-980,-929,-879,-829,
+    -779,-728,-678,-628,-578,-527,-477,-427,
+    -376,-326,-276,-226,-175,-125,-75,-25,
+    25,75,125,175,226,276,326,376,
+    427,477,527,578,628,678,728,779,
+    829,879,929,980,1030,1080,1131,1181,
+    1231,1281,1332,1382,1432,1483,1533,1583,
+    1633,1684,1734,1784,1835,1885,1935,1986,
+    2036,2086,2137,2187,2237,2288,2338,2388,
+    2439,2489,2539,2590,2640,2690,2741,2791,
+    2841,2892,2942,2992,3043,3093,3144,3194,
+    3244,3295,3345,3395,3446,3496,3547,3597,
+    3648,3698,3748,3799,3849,3900,3950,4001,
+    4051,4101,4152,4202,4253,4303,4354,4404,
+    4455,4505,4556,4606,4657,4707,4758,4808,
+    4859,4910,4960,5011,5061,5112,5162,5213,
+    5264,5314,5365,5415,5466,5517,5567,5618,
+    5668,5719,5770,5820,5871,5922,5972,6023,
+    6074,6124,6175,6226,6277,6327,6378,6429,
+    6480,6530,6581,6632,6683,6733,6784,6835,
+    6886,6937,6988,7038,7089,7140,7191,7242,
+    7293,7344,7395,7445,7496,7547,7598,7649,
+    7700,7751,7802,7853,7904,7955,8006,8057,
+    8108,8159,8210,8261,8312,8363,8414,8466,
+    8517,8568,8619,8670,8721,8772,8824,8875,
+    8926,8977,9028,9080,9131,9182,9233,9285,
+    9336,9387,9438,9490,9541,9592,9644,9695,
+    9747,9798,9849,9901,9952,10004,10055,10106,
+    10158,10209,10261,10312,10364,10415,10467,10519,
+    10570,10622,10673,10725,10777,10828,10880,10931,
+    10983,11035,11086,11138,11190,11242,11293,11345,
+    11397,11449,11501,11552,11604,11656,11708,11760,
+    11812,11864,11916,11967,12019,12071,12123,12175,
+    12227,12279,12331,12383,12436,12488,12540,12592,
+    12644,12696,12748,12800,12853,12905,12957,13009,
+    13062,13114,13166,13218,13271,13323,13375,13428,
+    13480,13533,13585,13637,13690,13742,13795,13847,
+    13900,13952,14005,14057,14110,14163,14215,14268,
+    14321,14373,14426,14479,14531,14584,14637,14690,
+    14743,14795,14848,14901,14954,15007,15060,15113,
+    15166,15219,15272,15325,15378,15431,15484,15537,
+    15590,15643,15696,15749,15802,15856,15909,15962,
+    16015,16069,16122,16175,16229,16282,16335,16389,
+    16442,16496,16549,16603,16656,16710,16763,16817,
+    16870,16924,16977,17031,17085,17138,17192,17246,
+    17300,17353,17407,17461,17515,17569,17623,17677,
+    17731,17784,17838,17892,17946,18001,18055,18109,
+    18163,18217,18271,18325,18380,18434,18488,18542,
+    18597,18651,18705,18760,18814,18868,18923,18977,
+    19032,19086,19141,19195,19250,19305,19359,19414,
+    19469,19523,19578,19633,19688,19742,19797,19852,
+    19907,19962,20017,20072,20127,20182,20237,20292,
+    20347,20402,20457,20513,20568,20623,20678,20734,
+    20789,20844,20900,20955,21010,21066,21121,21177,
+    21232,21288,21343,21399,21455,21510,21566,21622,
+    21678,21733,21789,21845,21901,21957,22013,22069,
+    22125,22181,22237,22293,22349,22405,22461,22517,
+    22573,22630,22686,22742,22799,22855,22911,22968,
+    23024,23081,23137,23194,23250,23307,23364,23420,
+    23477,23534,23591,23647,23704,23761,23818,23875,
+    23932,23989,24046,24103,24160,24217,24274,24331,
+    24389,24446,24503,24560,24618,24675,24732,24790,
+    24847,24905,24962,25020,25078,25135,25193,25251,
+    25308,25366,25424,25482,25540,25598,25656,25714,
+    25772,25830,25888,25946,26004,26062,26120,26179,
+    26237,26295,26354,26412,26471,26529,26588,26646,
+    26705,26763,26822,26881,26940,26998,27057,27116,
+    27175,27234,27293,27352,27411,27470,27529,27588,
+    27647,27707,27766,27825,27884,27944,28003,28063,
+    28122,28182,28241,28301,28361,28420,28480,28540,
+    28600,28660,28719,28779,28839,28899,28959,29020,
+    29080,29140,29200,29260,29321,29381,29441,29502,
+    29562,29623,29683,29744,29805,29865,29926,29987,
+    30048,30108,30169,30230,30291,30352,30413,30474,
+    30536,30597,30658,30719,30781,30842,30904,30965,
+    31026,31088,31150,31211,31273,31335,31396,31458,
+    31520,31582,31644,31706,31768,31830,31892,31955,
+    32017,32079,32141,32204,32266,32329,32391,32454,
+    32516,32579,32642,32705,32767,32830,32893,32956,
+    33019,33082,33145,33208,33272,33335,33398,33461,
+    33525,33588,33652,33715,33779,33843,33906,33970,
+    34034,34098,34162,34225,34289,34354,34418,34482,
+    34546,34610,34675,34739,34803,34868,34932,34997,
+    35062,35126,35191,35256,35321,35385,35450,35515,
+    35580,35646,35711,35776,35841,35907,35972,36037,
+    36103,36168,36234,36300,36365,36431,36497,36563,
+    36629,36695,36761,36827,36893,36959,37026,37092,
+    37158,37225,37291,37358,37425,37491,37558,37625,
+    37692,37759,37826,37893,37960,38027,38094,38161,
+    38229,38296,38364,38431,38499,38566,38634,38702,
+    38770,38837,38905,38973,39042,39110,39178,39246,
+    39314,39383,39451,39520,39588,39657,39726,39794,
+    39863,39932,40001,40070,40139,40208,40278,40347,
+    40416,40486,40555,40625,40694,40764,40834,40904,
+    40973,41043,41113,41184,41254,41324,41394,41465,
+    41535,41605,41676,41747,41817,41888,41959,42030,
+    42101,42172,42243,42314,42385,42457,42528,42600,
+    42671,42743,42814,42886,42958,43030,43102,43174,
+    43246,43318,43390,43463,43535,43608,43680,43753,
+    43826,43898,43971,44044,44117,44190,44263,44337,
+    44410,44483,44557,44630,44704,44778,44851,44925,
+    44999,45073,45147,45221,45296,45370,45444,45519,
+    45593,45668,45743,45818,45892,45967,46042,46118,
+    46193,46268,46343,46419,46494,46570,46646,46721,
+    46797,46873,46949,47025,47102,47178,47254,47331,
+    47407,47484,47560,47637,47714,47791,47868,47945,
+    48022,48100,48177,48255,48332,48410,48488,48565,
+    48643,48721,48799,48878,48956,49034,49113,49191,
+    49270,49349,49427,49506,49585,49664,49744,49823,
+    49902,49982,50061,50141,50221,50300,50380,50460,
+    50540,50621,50701,50781,50862,50942,51023,51104,
+    51185,51266,51347,51428,51509,51591,51672,51754,
+    51835,51917,51999,52081,52163,52245,52327,52410,
+    52492,52575,52657,52740,52823,52906,52989,53072,
+    53156,53239,53322,53406,53490,53574,53657,53741,
+    53826,53910,53994,54079,54163,54248,54333,54417,
+    54502,54587,54673,54758,54843,54929,55015,55100,
+    55186,55272,55358,55444,55531,55617,55704,55790,
+    55877,55964,56051,56138,56225,56312,56400,56487,
+    56575,56663,56751,56839,56927,57015,57104,57192,
+    57281,57369,57458,57547,57636,57725,57815,57904,
+    57994,58083,58173,58263,58353,58443,58534,58624,
+    58715,58805,58896,58987,59078,59169,59261,59352,
+    59444,59535,59627,59719,59811,59903,59996,60088,
+    60181,60273,60366,60459,60552,60646,60739,60833,
+    60926,61020,61114,61208,61302,61396,61491,61585,
+    61680,61775,61870,61965,62060,62156,62251,62347,
+    62443,62539,62635,62731,62828,62924,63021,63118,
+    63215,63312,63409,63506,63604,63702,63799,63897,
+    63996,64094,64192,64291,64389,64488,64587,64687,
+    64786,64885,64985,65085,65185,65285,65385,65485,
+    65586,65686,65787,65888,65989,66091,66192,66294,
+    66396,66498,66600,66702,66804,66907,67010,67113,
+    67216,67319,67422,67526,67629,67733,67837,67942,
+    68046,68151,68255,68360,68465,68570,68676,68781,
+    68887,68993,69099,69205,69312,69418,69525,69632,
+    69739,69846,69954,70061,70169,70277,70385,70494,
+    70602,70711,70820,70929,71038,71147,71257,71367,
+    71477,71587,71697,71808,71918,72029,72140,72252,
+    72363,72475,72587,72699,72811,72923,73036,73149,
+    73262,73375,73488,73602,73715,73829,73944,74058,
+    74172,74287,74402,74517,74633,74748,74864,74980,
+    75096,75213,75329,75446,75563,75680,75797,75915,
+    76033,76151,76269,76388,76506,76625,76744,76864,
+    76983,77103,77223,77343,77463,77584,77705,77826,
+    77947,78068,78190,78312,78434,78557,78679,78802,
+    78925,79048,79172,79296,79420,79544,79668,79793,
+    79918,80043,80168,80294,80420,80546,80672,80799,
+    80925,81053,81180,81307,81435,81563,81691,81820,
+    81949,82078,82207,82336,82466,82596,82726,82857,
+    82987,83118,83250,83381,83513,83645,83777,83910,
+    84043,84176,84309,84443,84576,84710,84845,84980,
+    85114,85250,85385,85521,85657,85793,85930,86066,
+    86204,86341,86479,86616,86755,86893,87032,87171,
+    87310,87450,87590,87730,87871,88011,88152,88294,
+    88435,88577,88720,88862,89005,89148,89292,89435,
+    89579,89724,89868,90013,90158,90304,90450,90596,
+    90742,90889,91036,91184,91332,91480,91628,91777,
+    91926,92075,92225,92375,92525,92675,92826,92978,
+    93129,93281,93434,93586,93739,93892,94046,94200,
+    94354,94509,94664,94819,94975,95131,95287,95444,
+    95601,95758,95916,96074,96233,96391,96551,96710,
+    96870,97030,97191,97352,97513,97675,97837,98000,
+    98163,98326,98489,98653,98818,98982,99148,99313,
+    99479,99645,99812,99979,100146,100314,100482,100651,
+    100820,100990,101159,101330,101500,101671,101843,102015,
+    102187,102360,102533,102706,102880,103054,103229,103404,
+    103580,103756,103933,104109,104287,104465,104643,104821,
+    105000,105180,105360,105540,105721,105902,106084,106266,
+    106449,106632,106816,107000,107184,107369,107555,107741,
+    107927,108114,108301,108489,108677,108866,109055,109245,
+    109435,109626,109817,110008,110200,110393,110586,110780,
+    110974,111169,111364,111560,111756,111952,112150,112347,
+    112546,112744,112944,113143,113344,113545,113746,113948,
+    114151,114354,114557,114761,114966,115171,115377,115583,
+    115790,115998,116206,116414,116623,116833,117044,117254,
+    117466,117678,117891,118104,118318,118532,118747,118963,
+    119179,119396,119613,119831,120050,120269,120489,120709,
+    120930,121152,121374,121597,121821,122045,122270,122496,
+    122722,122949,123176,123404,123633,123863,124093,124324,
+    124555,124787,125020,125254,125488,125723,125959,126195,
+    126432,126669,126908,127147,127387,127627,127869,128111,
+    128353,128597,128841,129086,129332,129578,129825,130073,
+    130322,130571,130821,131072,131324,131576,131830,132084,
+    132339,132594,132851,133108,133366,133625,133884,134145,
+    134406,134668,134931,135195,135459,135725,135991,136258,
+    136526,136795,137065,137335,137607,137879,138152,138426,
+    138701,138977,139254,139532,139810,140090,140370,140651,
+    140934,141217,141501,141786,142072,142359,142647,142936,
+    143226,143517,143808,144101,144395,144690,144986,145282,
+    145580,145879,146179,146480,146782,147084,147388,147693,
+    148000,148307,148615,148924,149235,149546,149859,150172,
+    150487,150803,151120,151438,151757,152077,152399,152722,
+    153045,153370,153697,154024,154352,154682,155013,155345,
+    155678,156013,156349,156686,157024,157363,157704,158046,
+    158389,158734,159079,159427,159775,160125,160476,160828,
+    161182,161537,161893,162251,162610,162970,163332,163695,
+    164060,164426,164793,165162,165532,165904,166277,166651,
+    167027,167405,167784,168164,168546,168930,169315,169701,
+    170089,170479,170870,171263,171657,172053,172451,172850,
+    173251,173653,174057,174463,174870,175279,175690,176102,
+    176516,176932,177349,177769,178190,178612,179037,179463,
+    179891,180321,180753,181186,181622,182059,182498,182939,
+    183382,183827,184274,184722,185173,185625,186080,186536,
+    186995,187455,187918,188382,188849,189318,189789,190261,
+    190736,191213,191693,192174,192658,193143,193631,194122,
+    194614,195109,195606,196105,196606,197110,197616,198125,
+    198636,199149,199664,200182,200703,201226,201751,202279,
+    202809,203342,203878,204416,204956,205500,206045,206594,
+    207145,207699,208255,208815,209376,209941,210509,211079,
+    211652,212228,212807,213389,213973,214561,215151,215745,
+    216341,216941,217544,218149,218758,219370,219985,220603,
+    221225,221849,222477,223108,223743,224381,225022,225666,
+    226314,226966,227621,228279,228941,229606,230275,230948,
+    231624,232304,232988,233676,234367,235062,235761,236463,
+    237170,237881,238595,239314,240036,240763,241493,242228,
+    242967,243711,244458,245210,245966,246727,247492,248261,
+    249035,249813,250596,251384,252176,252973,253774,254581,
+    255392,256208,257029,257855,258686,259522,260363,261209,
+    262060,262917,263779,264646,265519,266397,267280,268169,
+    269064,269965,270871,271782,272700,273624,274553,275489,
+    276430,277378,278332,279292,280258,281231,282210,283195,
+    284188,285186,286192,287204,288223,289249,290282,291322,
+    292369,293423,294485,295554,296630,297714,298805,299904,
+    301011,302126,303248,304379,305517,306664,307819,308983,
+    310154,311335,312524,313721,314928,316143,317368,318601,
+    319844,321097,322358,323629,324910,326201,327502,328812,
+    330133,331464,332805,334157,335519,336892,338276,339671,
+    341078,342495,343924,345364,346816,348280,349756,351244,
+    352744,354257,355783,357321,358872,360436,362013,363604,
+    365208,366826,368459,370105,371765,373440,375130,376835,
+    378555,380290,382040,383807,385589,387387,389202,391034,
+    392882,394747,396630,398530,400448,402384,404338,406311,
+    408303,410314,412344,414395,416465,418555,420666,422798,
+    424951,427125,429321,431540,433781,436045,438332,440643,
+    442978,445337,447720,450129,452564,455024,457511,460024,
+    462565,465133,467730,470355,473009,475692,478406,481150,
+    483925,486732,489571,492443,495348,498287,501261,504269,
+    507313,510394,513512,516667,519861,523094,526366,529680,
+    533034,536431,539870,543354,546881,550455,554074,557741,
+    561456,565221,569035,572901,576818,580789,584815,588896,
+    593033,597229,601483,605798,610174,614613,619117,623686,
+    628323,633028,637803,642651,647572,652568,657640,662792,
+    668024,673338,678737,684223,689797,695462,701219,707072,
+    713023,719074,725227,731486,737853,744331,750922,757631,
+    764460,771411,778490,785699,793041,800521,808143,815910,
+    823827,831898,840127,848520,857081,865817,874730,883829,
+    893117,902602,912289,922186,932298,942633,953199,964003,
+    975054,986361,997931,1009774,1021901,1034322,1047046,1060087,
+    1073455,1087164,1101225,1115654,1130465,1145673,1161294,1177345,
+    1193846,1210813,1228269,1246234,1264730,1283783,1303416,1323658,
+    1344537,1366084,1388330,1411312,1435065,1459630,1485049,1511367,
+    1538632,1566898,1596220,1626658,1658278,1691149,1725348,1760956,
+    1798063,1836758,1877161,1919378,1963536,2009771,2058233,2109087,
+    2162516,2218719,2277919,2340362,2406322,2476104,2550052,2628549,
+    2712030,2800983,2895966,2997613,3106651,3223918,3350381,3487165,
+    3635590,3797206,3973855,4167737,4381502,4618375,4882318,5178251,
+    5512368,5892567,6329090,6835455,7429880,8137527,8994149,10052327,
+    11392683,13145455,15535599,18988036,24413316,34178904,56965752,170910304
+};
+
+
+const int finesine[10240] =
+{
+    25,75,125,175,226,276,326,376,
+    427,477,527,578,628,678,728,779,
+    829,879,929,980,1030,1080,1130,1181,
+    1231,1281,1331,1382,1432,1482,1532,1583,
+    1633,1683,1733,1784,1834,1884,1934,1985,
+    2035,2085,2135,2186,2236,2286,2336,2387,
+    2437,2487,2537,2587,2638,2688,2738,2788,
+    2839,2889,2939,2989,3039,3090,3140,3190,
+    3240,3291,3341,3391,3441,3491,3541,3592,
+    3642,3692,3742,3792,3843,3893,3943,3993,
+    4043,4093,4144,4194,4244,4294,4344,4394,
+    4445,4495,4545,4595,4645,4695,4745,4796,
+    4846,4896,4946,4996,5046,5096,5146,5197,
+    5247,5297,5347,5397,5447,5497,5547,5597,
+    5647,5697,5748,5798,5848,5898,5948,5998,
+    6048,6098,6148,6198,6248,6298,6348,6398,
+    6448,6498,6548,6598,6648,6698,6748,6798,
+    6848,6898,6948,6998,7048,7098,7148,7198,
+    7248,7298,7348,7398,7448,7498,7548,7598,
+    7648,7697,7747,7797,7847,7897,7947,7997,
+    8047,8097,8147,8196,8246,8296,8346,8396,
+    8446,8496,8545,8595,8645,8695,8745,8794,
+    8844,8894,8944,8994,9043,9093,9143,9193,
+    9243,9292,9342,9392,9442,9491,9541,9591,
+    9640,9690,9740,9790,9839,9889,9939,9988,
+    10038,10088,10137,10187,10237,10286,10336,10386,
+    10435,10485,10534,10584,10634,10683,10733,10782,
+    10832,10882,10931,10981,11030,11080,11129,11179,
+    11228,11278,11327,11377,11426,11476,11525,11575,
+    11624,11674,11723,11773,11822,11872,11921,11970,
+    12020,12069,12119,12168,12218,12267,12316,12366,
+    12415,12464,12514,12563,12612,12662,12711,12760,
+    12810,12859,12908,12957,13007,13056,13105,13154,
+    13204,13253,13302,13351,13401,13450,13499,13548,
+    13597,13647,13696,13745,13794,13843,13892,13941,
+    13990,14040,14089,14138,14187,14236,14285,14334,
+    14383,14432,14481,14530,14579,14628,14677,14726,
+    14775,14824,14873,14922,14971,15020,15069,15118,
+    15167,15215,15264,15313,15362,15411,15460,15509,
+    15557,15606,15655,15704,15753,15802,15850,15899,
+    15948,15997,16045,16094,16143,16191,16240,16289,
+    16338,16386,16435,16484,16532,16581,16629,16678,
+    16727,16775,16824,16872,16921,16970,17018,17067,
+    17115,17164,17212,17261,17309,17358,17406,17455,
+    17503,17551,17600,17648,17697,17745,17793,17842,
+    17890,17939,17987,18035,18084,18132,18180,18228,
+    18277,18325,18373,18421,18470,18518,18566,18614,
+    18663,18711,18759,18807,18855,18903,18951,19000,
+    19048,19096,19144,19192,19240,19288,19336,19384,
+    19432,19480,19528,19576,19624,19672,19720,19768,
+    19816,19864,19912,19959,20007,20055,20103,20151,
+    20199,20246,20294,20342,20390,20438,20485,20533,
+    20581,20629,20676,20724,20772,20819,20867,20915,
+    20962,21010,21057,21105,21153,21200,21248,21295,
+    21343,21390,21438,21485,21533,21580,21628,21675,
+    21723,21770,21817,21865,21912,21960,22007,22054,
+    22102,22149,22196,22243,22291,22338,22385,22433,
+    22480,22527,22574,22621,22668,22716,22763,22810,
+    22857,22904,22951,22998,23045,23092,23139,23186,
+    23233,23280,23327,23374,23421,23468,23515,23562,
+    23609,23656,23703,23750,23796,23843,23890,23937,
+    23984,24030,24077,24124,24171,24217,24264,24311,
+    24357,24404,24451,24497,24544,24591,24637,24684,
+    24730,24777,24823,24870,24916,24963,25009,25056,
+    25102,25149,25195,25241,25288,25334,25381,25427,
+    25473,25520,25566,25612,25658,25705,25751,25797,
+    25843,25889,25936,25982,26028,26074,26120,26166,
+    26212,26258,26304,26350,26396,26442,26488,26534,
+    26580,26626,26672,26718,26764,26810,26856,26902,
+    26947,26993,27039,27085,27131,27176,27222,27268,
+    27313,27359,27405,27450,27496,27542,27587,27633,
+    27678,27724,27770,27815,27861,27906,27952,27997,
+    28042,28088,28133,28179,28224,28269,28315,28360,
+    28405,28451,28496,28541,28586,28632,28677,28722,
+    28767,28812,28858,28903,28948,28993,29038,29083,
+    29128,29173,29218,29263,29308,29353,29398,29443,
+    29488,29533,29577,29622,29667,29712,29757,29801,
+    29846,29891,29936,29980,30025,30070,30114,30159,
+    30204,30248,30293,30337,30382,30426,30471,30515,
+    30560,30604,30649,30693,30738,30782,30826,30871,
+    30915,30959,31004,31048,31092,31136,31181,31225,
+    31269,31313,31357,31402,31446,31490,31534,31578,
+    31622,31666,31710,31754,31798,31842,31886,31930,
+    31974,32017,32061,32105,32149,32193,32236,32280,
+    32324,32368,32411,32455,32499,32542,32586,32630,
+    32673,32717,32760,32804,32847,32891,32934,32978,
+    33021,33065,33108,33151,33195,33238,33281,33325,
+    33368,33411,33454,33498,33541,33584,33627,33670,
+    33713,33756,33799,33843,33886,33929,33972,34015,
+    34057,34100,34143,34186,34229,34272,34315,34358,
+    34400,34443,34486,34529,34571,34614,34657,34699,
+    34742,34785,34827,34870,34912,34955,34997,35040,
+    35082,35125,35167,35210,35252,35294,35337,35379,
+    35421,35464,35506,35548,35590,35633,35675,35717,
+    35759,35801,35843,35885,35927,35969,36011,36053,
+    36095,36137,36179,36221,36263,36305,36347,36388,
+    36430,36472,36514,36555,36597,36639,36681,36722,
+    36764,36805,36847,36889,36930,36972,37013,37055,
+    37096,37137,37179,37220,37262,37303,37344,37386,
+    37427,37468,37509,37551,37592,37633,37674,37715,
+    37756,37797,37838,37879,37920,37961,38002,38043,
+    38084,38125,38166,38207,38248,38288,38329,38370,
+    38411,38451,38492,38533,38573,38614,38655,38695,
+    38736,38776,38817,38857,38898,38938,38979,39019,
+    39059,39100,39140,39180,39221,39261,39301,39341,
+    39382,39422,39462,39502,39542,39582,39622,39662,
+    39702,39742,39782,39822,39862,39902,39942,39982,
+    40021,40061,40101,40141,40180,40220,40260,40300,
+    40339,40379,40418,40458,40497,40537,40576,40616,
+    40655,40695,40734,40773,40813,40852,40891,40931,
+    40970,41009,41048,41087,41127,41166,41205,41244,
+    41283,41322,41361,41400,41439,41478,41517,41556,
+    41595,41633,41672,41711,41750,41788,41827,41866,
+    41904,41943,41982,42020,42059,42097,42136,42174,
+    42213,42251,42290,42328,42366,42405,42443,42481,
+    42520,42558,42596,42634,42672,42711,42749,42787,
+    42825,42863,42901,42939,42977,43015,43053,43091,
+    43128,43166,43204,43242,43280,43317,43355,43393,
+    43430,43468,43506,43543,43581,43618,43656,43693,
+    43731,43768,43806,43843,43880,43918,43955,43992,
+    44029,44067,44104,44141,44178,44215,44252,44289,
+    44326,44363,44400,44437,44474,44511,44548,44585,
+    44622,44659,44695,44732,44769,44806,44842,44879,
+    44915,44952,44989,45025,45062,45098,45135,45171,
+    45207,45244,45280,45316,45353,45389,45425,45462,
+    45498,45534,45570,45606,45642,45678,45714,45750,
+    45786,45822,45858,45894,45930,45966,46002,46037,
+    46073,46109,46145,46180,46216,46252,46287,46323,
+    46358,46394,46429,46465,46500,46536,46571,46606,
+    46642,46677,46712,46747,46783,46818,46853,46888,
+    46923,46958,46993,47028,47063,47098,47133,47168,
+    47203,47238,47273,47308,47342,47377,47412,47446,
+    47481,47516,47550,47585,47619,47654,47688,47723,
+    47757,47792,47826,47860,47895,47929,47963,47998,
+    48032,48066,48100,48134,48168,48202,48237,48271,
+    48305,48338,48372,48406,48440,48474,48508,48542,
+    48575,48609,48643,48676,48710,48744,48777,48811,
+    48844,48878,48911,48945,48978,49012,49045,49078,
+    49112,49145,49178,49211,49244,49278,49311,49344,
+    49377,49410,49443,49476,49509,49542,49575,49608,
+    49640,49673,49706,49739,49771,49804,49837,49869,
+    49902,49935,49967,50000,50032,50065,50097,50129,
+    50162,50194,50226,50259,50291,50323,50355,50387,
+    50420,50452,50484,50516,50548,50580,50612,50644,
+    50675,50707,50739,50771,50803,50834,50866,50898,
+    50929,50961,50993,51024,51056,51087,51119,51150,
+    51182,51213,51244,51276,51307,51338,51369,51401,
+    51432,51463,51494,51525,51556,51587,51618,51649,
+    51680,51711,51742,51773,51803,51834,51865,51896,
+    51926,51957,51988,52018,52049,52079,52110,52140,
+    52171,52201,52231,52262,52292,52322,52353,52383,
+    52413,52443,52473,52503,52534,52564,52594,52624,
+    52653,52683,52713,52743,52773,52803,52832,52862,
+    52892,52922,52951,52981,53010,53040,53069,53099,
+    53128,53158,53187,53216,53246,53275,53304,53334,
+    53363,53392,53421,53450,53479,53508,53537,53566,
+    53595,53624,53653,53682,53711,53739,53768,53797,
+    53826,53854,53883,53911,53940,53969,53997,54026,
+    54054,54082,54111,54139,54167,54196,54224,54252,
+    54280,54308,54337,54365,54393,54421,54449,54477,
+    54505,54533,54560,54588,54616,54644,54672,54699,
+    54727,54755,54782,54810,54837,54865,54892,54920,
+    54947,54974,55002,55029,55056,55084,55111,55138,
+    55165,55192,55219,55246,55274,55300,55327,55354,
+    55381,55408,55435,55462,55489,55515,55542,55569,
+    55595,55622,55648,55675,55701,55728,55754,55781,
+    55807,55833,55860,55886,55912,55938,55965,55991,
+    56017,56043,56069,56095,56121,56147,56173,56199,
+    56225,56250,56276,56302,56328,56353,56379,56404,
+    56430,56456,56481,56507,56532,56557,56583,56608,
+    56633,56659,56684,56709,56734,56760,56785,56810,
+    56835,56860,56885,56910,56935,56959,56984,57009,
+    57034,57059,57083,57108,57133,57157,57182,57206,
+    57231,57255,57280,57304,57329,57353,57377,57402,
+    57426,57450,57474,57498,57522,57546,57570,57594,
+    57618,57642,57666,57690,57714,57738,57762,57785,
+    57809,57833,57856,57880,57903,57927,57950,57974,
+    57997,58021,58044,58067,58091,58114,58137,58160,
+    58183,58207,58230,58253,58276,58299,58322,58345,
+    58367,58390,58413,58436,58459,58481,58504,58527,
+    58549,58572,58594,58617,58639,58662,58684,58706,
+    58729,58751,58773,58795,58818,58840,58862,58884,
+    58906,58928,58950,58972,58994,59016,59038,59059,
+    59081,59103,59125,59146,59168,59190,59211,59233,
+    59254,59276,59297,59318,59340,59361,59382,59404,
+    59425,59446,59467,59488,59509,59530,59551,59572,
+    59593,59614,59635,59656,59677,59697,59718,59739,
+    59759,59780,59801,59821,59842,59862,59883,59903,
+    59923,59944,59964,59984,60004,60025,60045,60065,
+    60085,60105,60125,60145,60165,60185,60205,60225,
+    60244,60264,60284,60304,60323,60343,60363,60382,
+    60402,60421,60441,60460,60479,60499,60518,60537,
+    60556,60576,60595,60614,60633,60652,60671,60690,
+    60709,60728,60747,60766,60785,60803,60822,60841,
+    60859,60878,60897,60915,60934,60952,60971,60989,
+    61007,61026,61044,61062,61081,61099,61117,61135,
+    61153,61171,61189,61207,61225,61243,61261,61279,
+    61297,61314,61332,61350,61367,61385,61403,61420,
+    61438,61455,61473,61490,61507,61525,61542,61559,
+    61577,61594,61611,61628,61645,61662,61679,61696,
+    61713,61730,61747,61764,61780,61797,61814,61831,
+    61847,61864,61880,61897,61913,61930,61946,61963,
+    61979,61995,62012,62028,62044,62060,62076,62092,
+    62108,62125,62141,62156,62172,62188,62204,62220,
+    62236,62251,62267,62283,62298,62314,62329,62345,
+    62360,62376,62391,62407,62422,62437,62453,62468,
+    62483,62498,62513,62528,62543,62558,62573,62588,
+    62603,62618,62633,62648,62662,62677,62692,62706,
+    62721,62735,62750,62764,62779,62793,62808,62822,
+    62836,62850,62865,62879,62893,62907,62921,62935,
+    62949,62963,62977,62991,63005,63019,63032,63046,
+    63060,63074,63087,63101,63114,63128,63141,63155,
+    63168,63182,63195,63208,63221,63235,63248,63261,
+    63274,63287,63300,63313,63326,63339,63352,63365,
+    63378,63390,63403,63416,63429,63441,63454,63466,
+    63479,63491,63504,63516,63528,63541,63553,63565,
+    63578,63590,63602,63614,63626,63638,63650,63662,
+    63674,63686,63698,63709,63721,63733,63745,63756,
+    63768,63779,63791,63803,63814,63825,63837,63848,
+    63859,63871,63882,63893,63904,63915,63927,63938,
+    63949,63960,63971,63981,63992,64003,64014,64025,
+    64035,64046,64057,64067,64078,64088,64099,64109,
+    64120,64130,64140,64151,64161,64171,64181,64192,
+    64202,64212,64222,64232,64242,64252,64261,64271,
+    64281,64291,64301,64310,64320,64330,64339,64349,
+    64358,64368,64377,64387,64396,64405,64414,64424,
+    64433,64442,64451,64460,64469,64478,64487,64496,
+    64505,64514,64523,64532,64540,64549,64558,64566,
+    64575,64584,64592,64601,64609,64617,64626,64634,
+    64642,64651,64659,64667,64675,64683,64691,64699,
+    64707,64715,64723,64731,64739,64747,64754,64762,
+    64770,64777,64785,64793,64800,64808,64815,64822,
+    64830,64837,64844,64852,64859,64866,64873,64880,
+    64887,64895,64902,64908,64915,64922,64929,64936,
+    64943,64949,64956,64963,64969,64976,64982,64989,
+    64995,65002,65008,65015,65021,65027,65033,65040,
+    65046,65052,65058,65064,65070,65076,65082,65088,
+    65094,65099,65105,65111,65117,65122,65128,65133,
+    65139,65144,65150,65155,65161,65166,65171,65177,
+    65182,65187,65192,65197,65202,65207,65212,65217,
+    65222,65227,65232,65237,65242,65246,65251,65256,
+    65260,65265,65270,65274,65279,65283,65287,65292,
+    65296,65300,65305,65309,65313,65317,65321,65325,
+    65329,65333,65337,65341,65345,65349,65352,65356,
+    65360,65363,65367,65371,65374,65378,65381,65385,
+    65388,65391,65395,65398,65401,65404,65408,65411,
+    65414,65417,65420,65423,65426,65429,65431,65434,
+    65437,65440,65442,65445,65448,65450,65453,65455,
+    65458,65460,65463,65465,65467,65470,65472,65474,
+    65476,65478,65480,65482,65484,65486,65488,65490,
+    65492,65494,65496,65497,65499,65501,65502,65504,
+    65505,65507,65508,65510,65511,65513,65514,65515,
+    65516,65518,65519,65520,65521,65522,65523,65524,
+    65525,65526,65527,65527,65528,65529,65530,65530,
+    65531,65531,65532,65532,65533,65533,65534,65534,
+    65534,65535,65535,65535,65535,65535,65535,65535,
+    65535,65535,65535,65535,65535,65535,65535,65534,
+    65534,65534,65533,65533,65532,65532,65531,65531,
+    65530,65530,65529,65528,65527,65527,65526,65525,
+    65524,65523,65522,65521,65520,65519,65518,65516,
+    65515,65514,65513,65511,65510,65508,65507,65505,
+    65504,65502,65501,65499,65497,65496,65494,65492,
+    65490,65488,65486,65484,65482,65480,65478,65476,
+    65474,65472,65470,65467,65465,65463,65460,65458,
+    65455,65453,65450,65448,65445,65442,65440,65437,
+    65434,65431,65429,65426,65423,65420,65417,65414,
+    65411,65408,65404,65401,65398,65395,65391,65388,
+    65385,65381,65378,65374,65371,65367,65363,65360,
+    65356,65352,65349,65345,65341,65337,65333,65329,
+    65325,65321,65317,65313,65309,65305,65300,65296,
+    65292,65287,65283,65279,65274,65270,65265,65260,
+    65256,65251,65246,65242,65237,65232,65227,65222,
+    65217,65212,65207,65202,65197,65192,65187,65182,
+    65177,65171,65166,65161,65155,65150,65144,65139,
+    65133,65128,65122,65117,65111,65105,65099,65094,
+    65088,65082,65076,65070,65064,65058,65052,65046,
+    65040,65033,65027,65021,65015,65008,65002,64995,
+    64989,64982,64976,64969,64963,64956,64949,64943,
+    64936,64929,64922,64915,64908,64902,64895,64887,
+    64880,64873,64866,64859,64852,64844,64837,64830,
+    64822,64815,64808,64800,64793,64785,64777,64770,
+    64762,64754,64747,64739,64731,64723,64715,64707,
+    64699,64691,64683,64675,64667,64659,64651,64642,
+    64634,64626,64617,64609,64600,64592,64584,64575,
+    64566,64558,64549,64540,64532,64523,64514,64505,
+    64496,64487,64478,64469,64460,64451,64442,64433,
+    64424,64414,64405,64396,64387,64377,64368,64358,
+    64349,64339,64330,64320,64310,64301,64291,64281,
+    64271,64261,64252,64242,64232,64222,64212,64202,
+    64192,64181,64171,64161,64151,64140,64130,64120,
+    64109,64099,64088,64078,64067,64057,64046,64035,
+    64025,64014,64003,63992,63981,63971,63960,63949,
+    63938,63927,63915,63904,63893,63882,63871,63859,
+    63848,63837,63825,63814,63803,63791,63779,63768,
+    63756,63745,63733,63721,63709,63698,63686,63674,
+    63662,63650,63638,63626,63614,63602,63590,63578,
+    63565,63553,63541,63528,63516,63504,63491,63479,
+    63466,63454,63441,63429,63416,63403,63390,63378,
+    63365,63352,63339,63326,63313,63300,63287,63274,
+    63261,63248,63235,63221,63208,63195,63182,63168,
+    63155,63141,63128,63114,63101,63087,63074,63060,
+    63046,63032,63019,63005,62991,62977,62963,62949,
+    62935,62921,62907,62893,62879,62865,62850,62836,
+    62822,62808,62793,62779,62764,62750,62735,62721,
+    62706,62692,62677,62662,62648,62633,62618,62603,
+    62588,62573,62558,62543,62528,62513,62498,62483,
+    62468,62453,62437,62422,62407,62391,62376,62360,
+    62345,62329,62314,62298,62283,62267,62251,62236,
+    62220,62204,62188,62172,62156,62141,62125,62108,
+    62092,62076,62060,62044,62028,62012,61995,61979,
+    61963,61946,61930,61913,61897,61880,61864,61847,
+    61831,61814,61797,61780,61764,61747,61730,61713,
+    61696,61679,61662,61645,61628,61611,61594,61577,
+    61559,61542,61525,61507,61490,61473,61455,61438,
+    61420,61403,61385,61367,61350,61332,61314,61297,
+    61279,61261,61243,61225,61207,61189,61171,61153,
+    61135,61117,61099,61081,61062,61044,61026,61007,
+    60989,60971,60952,60934,60915,60897,60878,60859,
+    60841,60822,60803,60785,60766,60747,60728,60709,
+    60690,60671,60652,60633,60614,60595,60576,60556,
+    60537,60518,60499,60479,60460,60441,60421,60402,
+    60382,60363,60343,60323,60304,60284,60264,60244,
+    60225,60205,60185,60165,60145,60125,60105,60085,
+    60065,60045,60025,60004,59984,59964,59944,59923,
+    59903,59883,59862,59842,59821,59801,59780,59759,
+    59739,59718,59697,59677,59656,59635,59614,59593,
+    59572,59551,59530,59509,59488,59467,59446,59425,
+    59404,59382,59361,59340,59318,59297,59276,59254,
+    59233,59211,59190,59168,59146,59125,59103,59081,
+    59059,59038,59016,58994,58972,58950,58928,58906,
+    58884,58862,58840,58818,58795,58773,58751,58729,
+    58706,58684,58662,58639,58617,58594,58572,58549,
+    58527,58504,58481,58459,58436,58413,58390,58367,
+    58345,58322,58299,58276,58253,58230,58207,58183,
+    58160,58137,58114,58091,58067,58044,58021,57997,
+    57974,57950,57927,57903,57880,57856,57833,57809,
+    57785,57762,57738,57714,57690,57666,57642,57618,
+    57594,57570,57546,57522,57498,57474,57450,57426,
+    57402,57377,57353,57329,57304,57280,57255,57231,
+    57206,57182,57157,57133,57108,57083,57059,57034,
+    57009,56984,56959,56935,56910,56885,56860,56835,
+    56810,56785,56760,56734,56709,56684,56659,56633,
+    56608,56583,56557,56532,56507,56481,56456,56430,
+    56404,56379,56353,56328,56302,56276,56250,56225,
+    56199,56173,56147,56121,56095,56069,56043,56017,
+    55991,55965,55938,55912,55886,55860,55833,55807,
+    55781,55754,55728,55701,55675,55648,55622,55595,
+    55569,55542,55515,55489,55462,55435,55408,55381,
+    55354,55327,55300,55274,55246,55219,55192,55165,
+    55138,55111,55084,55056,55029,55002,54974,54947,
+    54920,54892,54865,54837,54810,54782,54755,54727,
+    54699,54672,54644,54616,54588,54560,54533,54505,
+    54477,54449,54421,54393,54365,54337,54308,54280,
+    54252,54224,54196,54167,54139,54111,54082,54054,
+    54026,53997,53969,53940,53911,53883,53854,53826,
+    53797,53768,53739,53711,53682,53653,53624,53595,
+    53566,53537,53508,53479,53450,53421,53392,53363,
+    53334,53304,53275,53246,53216,53187,53158,53128,
+    53099,53069,53040,53010,52981,52951,52922,52892,
+    52862,52832,52803,52773,52743,52713,52683,52653,
+    52624,52594,52564,52534,52503,52473,52443,52413,
+    52383,52353,52322,52292,52262,52231,52201,52171,
+    52140,52110,52079,52049,52018,51988,51957,51926,
+    51896,51865,51834,51803,51773,51742,51711,51680,
+    51649,51618,51587,51556,51525,51494,51463,51432,
+    51401,51369,51338,51307,51276,51244,51213,51182,
+    51150,51119,51087,51056,51024,50993,50961,50929,
+    50898,50866,50834,50803,50771,50739,50707,50675,
+    50644,50612,50580,50548,50516,50484,50452,50420,
+    50387,50355,50323,50291,50259,50226,50194,50162,
+    50129,50097,50065,50032,50000,49967,49935,49902,
+    49869,49837,49804,49771,49739,49706,49673,49640,
+    49608,49575,49542,49509,49476,49443,49410,49377,
+    49344,49311,49278,49244,49211,49178,49145,49112,
+    49078,49045,49012,48978,48945,48911,48878,48844,
+    48811,48777,48744,48710,48676,48643,48609,48575,
+    48542,48508,48474,48440,48406,48372,48338,48304,
+    48271,48237,48202,48168,48134,48100,48066,48032,
+    47998,47963,47929,47895,47860,47826,47792,47757,
+    47723,47688,47654,47619,47585,47550,47516,47481,
+    47446,47412,47377,47342,47308,47273,47238,47203,
+    47168,47133,47098,47063,47028,46993,46958,46923,
+    46888,46853,46818,46783,46747,46712,46677,46642,
+    46606,46571,46536,46500,46465,46429,46394,46358,
+    46323,46287,46252,46216,46180,46145,46109,46073,
+    46037,46002,45966,45930,45894,45858,45822,45786,
+    45750,45714,45678,45642,45606,45570,45534,45498,
+    45462,45425,45389,45353,45316,45280,45244,45207,
+    45171,45135,45098,45062,45025,44989,44952,44915,
+    44879,44842,44806,44769,44732,44695,44659,44622,
+    44585,44548,44511,44474,44437,44400,44363,44326,
+    44289,44252,44215,44178,44141,44104,44067,44029,
+    43992,43955,43918,43880,43843,43806,43768,43731,
+    43693,43656,43618,43581,43543,43506,43468,43430,
+    43393,43355,43317,43280,43242,43204,43166,43128,
+    43091,43053,43015,42977,42939,42901,42863,42825,
+    42787,42749,42711,42672,42634,42596,42558,42520,
+    42481,42443,42405,42366,42328,42290,42251,42213,
+    42174,42136,42097,42059,42020,41982,41943,41904,
+    41866,41827,41788,41750,41711,41672,41633,41595,
+    41556,41517,41478,41439,41400,41361,41322,41283,
+    41244,41205,41166,41127,41088,41048,41009,40970,
+    40931,40891,40852,40813,40773,40734,40695,40655,
+    40616,40576,40537,40497,40458,40418,40379,40339,
+    40300,40260,40220,40180,40141,40101,40061,40021,
+    39982,39942,39902,39862,39822,39782,39742,39702,
+    39662,39622,39582,39542,39502,39462,39422,39382,
+    39341,39301,39261,39221,39180,39140,39100,39059,
+    39019,38979,38938,38898,38857,38817,38776,38736,
+    38695,38655,38614,38573,38533,38492,38451,38411,
+    38370,38329,38288,38248,38207,38166,38125,38084,
+    38043,38002,37961,37920,37879,37838,37797,37756,
+    37715,37674,37633,37592,37551,37509,37468,37427,
+    37386,37344,37303,37262,37220,37179,37137,37096,
+    37055,37013,36972,36930,36889,36847,36805,36764,
+    36722,36681,36639,36597,36556,36514,36472,36430,
+    36388,36347,36305,36263,36221,36179,36137,36095,
+    36053,36011,35969,35927,35885,35843,35801,35759,
+    35717,35675,35633,35590,35548,35506,35464,35421,
+    35379,35337,35294,35252,35210,35167,35125,35082,
+    35040,34997,34955,34912,34870,34827,34785,34742,
+    34699,34657,34614,34571,34529,34486,34443,34400,
+    34358,34315,34272,34229,34186,34143,34100,34057,
+    34015,33972,33929,33886,33843,33799,33756,33713,
+    33670,33627,33584,33541,33498,33454,33411,33368,
+    33325,33281,33238,33195,33151,33108,33065,33021,
+    32978,32934,32891,32847,32804,32760,32717,32673,
+    32630,32586,32542,32499,32455,32411,32368,32324,
+    32280,32236,32193,32149,32105,32061,32017,31974,
+    31930,31886,31842,31798,31754,31710,31666,31622,
+    31578,31534,31490,31446,31402,31357,31313,31269,
+    31225,31181,31136,31092,31048,31004,30959,30915,
+    30871,30826,30782,30738,30693,30649,30604,30560,
+    30515,30471,30426,30382,30337,30293,30248,30204,
+    30159,30114,30070,30025,29980,29936,29891,29846,
+    29801,29757,29712,29667,29622,29577,29533,29488,
+    29443,29398,29353,29308,29263,29218,29173,29128,
+    29083,29038,28993,28948,28903,28858,28812,28767,
+    28722,28677,28632,28586,28541,28496,28451,28405,
+    28360,28315,28269,28224,28179,28133,28088,28042,
+    27997,27952,27906,27861,27815,27770,27724,27678,
+    27633,27587,27542,27496,27450,27405,27359,27313,
+    27268,27222,27176,27131,27085,27039,26993,26947,
+    26902,26856,26810,26764,26718,26672,26626,26580,
+    26534,26488,26442,26396,26350,26304,26258,26212,
+    26166,26120,26074,26028,25982,25936,25889,25843,
+    25797,25751,25705,25658,25612,25566,25520,25473,
+    25427,25381,25334,25288,25241,25195,25149,25102,
+    25056,25009,24963,24916,24870,24823,24777,24730,
+    24684,24637,24591,24544,24497,24451,24404,24357,
+    24311,24264,24217,24171,24124,24077,24030,23984,
+    23937,23890,23843,23796,23750,23703,23656,23609,
+    23562,23515,23468,23421,23374,23327,23280,23233,
+    23186,23139,23092,23045,22998,22951,22904,22857,
+    22810,22763,22716,22668,22621,22574,22527,22480,
+    22433,22385,22338,22291,22243,22196,22149,22102,
+    22054,22007,21960,21912,21865,21817,21770,21723,
+    21675,21628,21580,21533,21485,21438,21390,21343,
+    21295,21248,21200,21153,21105,21057,21010,20962,
+    20915,20867,20819,20772,20724,20676,20629,20581,
+    20533,20485,20438,20390,20342,20294,20246,20199,
+    20151,20103,20055,20007,19959,19912,19864,19816,
+    19768,19720,19672,19624,19576,19528,19480,19432,
+    19384,19336,19288,19240,19192,19144,19096,19048,
+    19000,18951,18903,18855,18807,18759,18711,18663,
+    18614,18566,18518,18470,18421,18373,18325,18277,
+    18228,18180,18132,18084,18035,17987,17939,17890,
+    17842,17793,17745,17697,17648,17600,17551,17503,
+    17455,17406,17358,17309,17261,17212,17164,17115,
+    17067,17018,16970,16921,16872,16824,16775,16727,
+    16678,16629,16581,16532,16484,16435,16386,16338,
+    16289,16240,16191,16143,16094,16045,15997,15948,
+    15899,15850,15802,15753,15704,15655,15606,15557,
+    15509,15460,15411,15362,15313,15264,15215,15167,
+    15118,15069,15020,14971,14922,14873,14824,14775,
+    14726,14677,14628,14579,14530,14481,14432,14383,
+    14334,14285,14236,14187,14138,14089,14040,13990,
+    13941,13892,13843,13794,13745,13696,13646,13597,
+    13548,13499,13450,13401,13351,13302,13253,13204,
+    13154,13105,13056,13007,12957,12908,12859,12810,
+    12760,12711,12662,12612,12563,12514,12464,12415,
+    12366,12316,12267,12218,12168,12119,12069,12020,
+    11970,11921,11872,11822,11773,11723,11674,11624,
+    11575,11525,11476,11426,11377,11327,11278,11228,
+    11179,11129,11080,11030,10981,10931,10882,10832,
+    10782,10733,10683,10634,10584,10534,10485,10435,
+    10386,10336,10286,10237,10187,10137,10088,10038,
+    9988,9939,9889,9839,9790,9740,9690,9640,
+    9591,9541,9491,9442,9392,9342,9292,9243,
+    9193,9143,9093,9043,8994,8944,8894,8844,
+    8794,8745,8695,8645,8595,8545,8496,8446,
+    8396,8346,8296,8246,8196,8147,8097,8047,
+    7997,7947,7897,7847,7797,7747,7697,7648,
+    7598,7548,7498,7448,7398,7348,7298,7248,
+    7198,7148,7098,7048,6998,6948,6898,6848,
+    6798,6748,6698,6648,6598,6548,6498,6448,
+    6398,6348,6298,6248,6198,6148,6098,6048,
+    5998,5948,5898,5848,5798,5748,5697,5647,
+    5597,5547,5497,5447,5397,5347,5297,5247,
+    5197,5146,5096,5046,4996,4946,4896,4846,
+    4796,4745,4695,4645,4595,4545,4495,4445,
+    4394,4344,4294,4244,4194,4144,4093,4043,
+    3993,3943,3893,3843,3792,3742,3692,3642,
+    3592,3541,3491,3441,3391,3341,3291,3240,
+    3190,3140,3090,3039,2989,2939,2889,2839,
+    2788,2738,2688,2638,2587,2537,2487,2437,
+    2387,2336,2286,2236,2186,2135,2085,2035,
+    1985,1934,1884,1834,1784,1733,1683,1633,
+    1583,1532,1482,1432,1382,1331,1281,1231,
+    1181,1130,1080,1030,980,929,879,829,
+    779,728,678,628,578,527,477,427,
+    376,326,276,226,175,125,75,25,
+    -25,-75,-125,-175,-226,-276,-326,-376,
+    -427,-477,-527,-578,-628,-678,-728,-779,
+    -829,-879,-929,-980,-1030,-1080,-1130,-1181,
+    -1231,-1281,-1331,-1382,-1432,-1482,-1532,-1583,
+    -1633,-1683,-1733,-1784,-1834,-1884,-1934,-1985,
+    -2035,-2085,-2135,-2186,-2236,-2286,-2336,-2387,
+    -2437,-2487,-2537,-2588,-2638,-2688,-2738,-2788,
+    -2839,-2889,-2939,-2989,-3039,-3090,-3140,-3190,
+    -3240,-3291,-3341,-3391,-3441,-3491,-3541,-3592,
+    -3642,-3692,-3742,-3792,-3843,-3893,-3943,-3993,
+    -4043,-4093,-4144,-4194,-4244,-4294,-4344,-4394,
+    -4445,-4495,-4545,-4595,-4645,-4695,-4745,-4796,
+    -4846,-4896,-4946,-4996,-5046,-5096,-5146,-5197,
+    -5247,-5297,-5347,-5397,-5447,-5497,-5547,-5597,
+    -5647,-5697,-5748,-5798,-5848,-5898,-5948,-5998,
+    -6048,-6098,-6148,-6198,-6248,-6298,-6348,-6398,
+    -6448,-6498,-6548,-6598,-6648,-6698,-6748,-6798,
+    -6848,-6898,-6948,-6998,-7048,-7098,-7148,-7198,
+    -7248,-7298,-7348,-7398,-7448,-7498,-7548,-7598,
+    -7648,-7697,-7747,-7797,-7847,-7897,-7947,-7997,
+    -8047,-8097,-8147,-8196,-8246,-8296,-8346,-8396,
+    -8446,-8496,-8545,-8595,-8645,-8695,-8745,-8794,
+    -8844,-8894,-8944,-8994,-9043,-9093,-9143,-9193,
+    -9243,-9292,-9342,-9392,-9442,-9491,-9541,-9591,
+    -9640,-9690,-9740,-9790,-9839,-9889,-9939,-9988,
+    -10038,-10088,-10137,-10187,-10237,-10286,-10336,-10386,
+    -10435,-10485,-10534,-10584,-10634,-10683,-10733,-10782,
+    -10832,-10882,-10931,-10981,-11030,-11080,-11129,-11179,
+    -11228,-11278,-11327,-11377,-11426,-11476,-11525,-11575,
+    -11624,-11674,-11723,-11773,-11822,-11872,-11921,-11970,
+    -12020,-12069,-12119,-12168,-12218,-12267,-12316,-12366,
+    -12415,-12464,-12514,-12563,-12612,-12662,-12711,-12760,
+    -12810,-12859,-12908,-12957,-13007,-13056,-13105,-13154,
+    -13204,-13253,-13302,-13351,-13401,-13450,-13499,-13548,
+    -13597,-13647,-13696,-13745,-13794,-13843,-13892,-13941,
+    -13990,-14040,-14089,-14138,-14187,-14236,-14285,-14334,
+    -14383,-14432,-14481,-14530,-14579,-14628,-14677,-14726,
+    -14775,-14824,-14873,-14922,-14971,-15020,-15069,-15118,
+    -15167,-15215,-15264,-15313,-15362,-15411,-15460,-15509,
+    -15557,-15606,-15655,-15704,-15753,-15802,-15850,-15899,
+    -15948,-15997,-16045,-16094,-16143,-16191,-16240,-16289,
+    -16338,-16386,-16435,-16484,-16532,-16581,-16629,-16678,
+    -16727,-16775,-16824,-16872,-16921,-16970,-17018,-17067,
+    -17115,-17164,-17212,-17261,-17309,-17358,-17406,-17455,
+    -17503,-17551,-17600,-17648,-17697,-17745,-17793,-17842,
+    -17890,-17939,-17987,-18035,-18084,-18132,-18180,-18228,
+    -18277,-18325,-18373,-18421,-18470,-18518,-18566,-18614,
+    -18663,-18711,-18759,-18807,-18855,-18903,-18951,-19000,
+    -19048,-19096,-19144,-19192,-19240,-19288,-19336,-19384,
+    -19432,-19480,-19528,-19576,-19624,-19672,-19720,-19768,
+    -19816,-19864,-19912,-19959,-20007,-20055,-20103,-20151,
+    -20199,-20246,-20294,-20342,-20390,-20438,-20485,-20533,
+    -20581,-20629,-20676,-20724,-20772,-20819,-20867,-20915,
+    -20962,-21010,-21057,-21105,-21153,-21200,-21248,-21295,
+    -21343,-21390,-21438,-21485,-21533,-21580,-21628,-21675,
+    -21723,-21770,-21817,-21865,-21912,-21960,-22007,-22054,
+    -22102,-22149,-22196,-22243,-22291,-22338,-22385,-22433,
+    -22480,-22527,-22574,-22621,-22668,-22716,-22763,-22810,
+    -22857,-22904,-22951,-22998,-23045,-23092,-23139,-23186,
+    -23233,-23280,-23327,-23374,-23421,-23468,-23515,-23562,
+    -23609,-23656,-23703,-23750,-23796,-23843,-23890,-23937,
+    -23984,-24030,-24077,-24124,-24171,-24217,-24264,-24311,
+    -24357,-24404,-24451,-24497,-24544,-24591,-24637,-24684,
+    -24730,-24777,-24823,-24870,-24916,-24963,-25009,-25056,
+    -25102,-25149,-25195,-25241,-25288,-25334,-25381,-25427,
+    -25473,-25520,-25566,-25612,-25658,-25705,-25751,-25797,
+    -25843,-25889,-25936,-25982,-26028,-26074,-26120,-26166,
+    -26212,-26258,-26304,-26350,-26396,-26442,-26488,-26534,
+    -26580,-26626,-26672,-26718,-26764,-26810,-26856,-26902,
+    -26947,-26993,-27039,-27085,-27131,-27176,-27222,-27268,
+    -27313,-27359,-27405,-27450,-27496,-27542,-27587,-27633,
+    -27678,-27724,-27770,-27815,-27861,-27906,-27952,-27997,
+    -28042,-28088,-28133,-28179,-28224,-28269,-28315,-28360,
+    -28405,-28451,-28496,-28541,-28586,-28632,-28677,-28722,
+    -28767,-28812,-28858,-28903,-28948,-28993,-29038,-29083,
+    -29128,-29173,-29218,-29263,-29308,-29353,-29398,-29443,
+    -29488,-29533,-29577,-29622,-29667,-29712,-29757,-29801,
+    -29846,-29891,-29936,-29980,-30025,-30070,-30114,-30159,
+    -30204,-30248,-30293,-30337,-30382,-30426,-30471,-30515,
+    -30560,-30604,-30649,-30693,-30738,-30782,-30826,-30871,
+    -30915,-30959,-31004,-31048,-31092,-31136,-31181,-31225,
+    -31269,-31313,-31357,-31402,-31446,-31490,-31534,-31578,
+    -31622,-31666,-31710,-31754,-31798,-31842,-31886,-31930,
+    -31974,-32017,-32061,-32105,-32149,-32193,-32236,-32280,
+    -32324,-32368,-32411,-32455,-32499,-32542,-32586,-32630,
+    -32673,-32717,-32760,-32804,-32847,-32891,-32934,-32978,
+    -33021,-33065,-33108,-33151,-33195,-33238,-33281,-33325,
+    -33368,-33411,-33454,-33498,-33541,-33584,-33627,-33670,
+    -33713,-33756,-33799,-33843,-33886,-33929,-33972,-34015,
+    -34057,-34100,-34143,-34186,-34229,-34272,-34315,-34358,
+    -34400,-34443,-34486,-34529,-34571,-34614,-34657,-34699,
+    -34742,-34785,-34827,-34870,-34912,-34955,-34997,-35040,
+    -35082,-35125,-35167,-35210,-35252,-35294,-35337,-35379,
+    -35421,-35464,-35506,-35548,-35590,-35633,-35675,-35717,
+    -35759,-35801,-35843,-35885,-35927,-35969,-36011,-36053,
+    -36095,-36137,-36179,-36221,-36263,-36305,-36347,-36388,
+    -36430,-36472,-36514,-36555,-36597,-36639,-36681,-36722,
+    -36764,-36805,-36847,-36889,-36930,-36972,-37013,-37055,
+    -37096,-37137,-37179,-37220,-37262,-37303,-37344,-37386,
+    -37427,-37468,-37509,-37551,-37592,-37633,-37674,-37715,
+    -37756,-37797,-37838,-37879,-37920,-37961,-38002,-38043,
+    -38084,-38125,-38166,-38207,-38248,-38288,-38329,-38370,
+    -38411,-38451,-38492,-38533,-38573,-38614,-38655,-38695,
+    -38736,-38776,-38817,-38857,-38898,-38938,-38979,-39019,
+    -39059,-39100,-39140,-39180,-39221,-39261,-39301,-39341,
+    -39382,-39422,-39462,-39502,-39542,-39582,-39622,-39662,
+    -39702,-39742,-39782,-39822,-39862,-39902,-39942,-39982,
+    -40021,-40061,-40101,-40141,-40180,-40220,-40260,-40299,
+    -40339,-40379,-40418,-40458,-40497,-40537,-40576,-40616,
+    -40655,-40695,-40734,-40773,-40813,-40852,-40891,-40931,
+    -40970,-41009,-41048,-41087,-41127,-41166,-41205,-41244,
+    -41283,-41322,-41361,-41400,-41439,-41478,-41517,-41556,
+    -41595,-41633,-41672,-41711,-41750,-41788,-41827,-41866,
+    -41904,-41943,-41982,-42020,-42059,-42097,-42136,-42174,
+    -42213,-42251,-42290,-42328,-42366,-42405,-42443,-42481,
+    -42520,-42558,-42596,-42634,-42672,-42711,-42749,-42787,
+    -42825,-42863,-42901,-42939,-42977,-43015,-43053,-43091,
+    -43128,-43166,-43204,-43242,-43280,-43317,-43355,-43393,
+    -43430,-43468,-43506,-43543,-43581,-43618,-43656,-43693,
+    -43731,-43768,-43806,-43843,-43880,-43918,-43955,-43992,
+    -44029,-44067,-44104,-44141,-44178,-44215,-44252,-44289,
+    -44326,-44363,-44400,-44437,-44474,-44511,-44548,-44585,
+    -44622,-44659,-44695,-44732,-44769,-44806,-44842,-44879,
+    -44915,-44952,-44989,-45025,-45062,-45098,-45135,-45171,
+    -45207,-45244,-45280,-45316,-45353,-45389,-45425,-45462,
+    -45498,-45534,-45570,-45606,-45642,-45678,-45714,-45750,
+    -45786,-45822,-45858,-45894,-45930,-45966,-46002,-46037,
+    -46073,-46109,-46145,-46180,-46216,-46252,-46287,-46323,
+    -46358,-46394,-46429,-46465,-46500,-46536,-46571,-46606,
+    -46642,-46677,-46712,-46747,-46783,-46818,-46853,-46888,
+    -46923,-46958,-46993,-47028,-47063,-47098,-47133,-47168,
+    -47203,-47238,-47273,-47308,-47342,-47377,-47412,-47446,
+    -47481,-47516,-47550,-47585,-47619,-47654,-47688,-47723,
+    -47757,-47792,-47826,-47860,-47895,-47929,-47963,-47998,
+    -48032,-48066,-48100,-48134,-48168,-48202,-48236,-48271,
+    -48304,-48338,-48372,-48406,-48440,-48474,-48508,-48542,
+    -48575,-48609,-48643,-48676,-48710,-48744,-48777,-48811,
+    -48844,-48878,-48911,-48945,-48978,-49012,-49045,-49078,
+    -49112,-49145,-49178,-49211,-49244,-49278,-49311,-49344,
+    -49377,-49410,-49443,-49476,-49509,-49542,-49575,-49608,
+    -49640,-49673,-49706,-49739,-49771,-49804,-49837,-49869,
+    -49902,-49935,-49967,-50000,-50032,-50065,-50097,-50129,
+    -50162,-50194,-50226,-50259,-50291,-50323,-50355,-50387,
+    -50420,-50452,-50484,-50516,-50548,-50580,-50612,-50644,
+    -50675,-50707,-50739,-50771,-50803,-50834,-50866,-50898,
+    -50929,-50961,-50993,-51024,-51056,-51087,-51119,-51150,
+    -51182,-51213,-51244,-51276,-51307,-51338,-51369,-51401,
+    -51432,-51463,-51494,-51525,-51556,-51587,-51618,-51649,
+    -51680,-51711,-51742,-51773,-51803,-51834,-51865,-51896,
+    -51926,-51957,-51988,-52018,-52049,-52079,-52110,-52140,
+    -52171,-52201,-52231,-52262,-52292,-52322,-52353,-52383,
+    -52413,-52443,-52473,-52503,-52534,-52564,-52594,-52624,
+    -52653,-52683,-52713,-52743,-52773,-52803,-52832,-52862,
+    -52892,-52922,-52951,-52981,-53010,-53040,-53069,-53099,
+    -53128,-53158,-53187,-53216,-53246,-53275,-53304,-53334,
+    -53363,-53392,-53421,-53450,-53479,-53508,-53537,-53566,
+    -53595,-53624,-53653,-53682,-53711,-53739,-53768,-53797,
+    -53826,-53854,-53883,-53911,-53940,-53969,-53997,-54026,
+    -54054,-54082,-54111,-54139,-54167,-54196,-54224,-54252,
+    -54280,-54308,-54337,-54365,-54393,-54421,-54449,-54477,
+    -54505,-54533,-54560,-54588,-54616,-54644,-54672,-54699,
+    -54727,-54755,-54782,-54810,-54837,-54865,-54892,-54920,
+    -54947,-54974,-55002,-55029,-55056,-55084,-55111,-55138,
+    -55165,-55192,-55219,-55246,-55274,-55300,-55327,-55354,
+    -55381,-55408,-55435,-55462,-55489,-55515,-55542,-55569,
+    -55595,-55622,-55648,-55675,-55701,-55728,-55754,-55781,
+    -55807,-55833,-55860,-55886,-55912,-55938,-55965,-55991,
+    -56017,-56043,-56069,-56095,-56121,-56147,-56173,-56199,
+    -56225,-56250,-56276,-56302,-56328,-56353,-56379,-56404,
+    -56430,-56456,-56481,-56507,-56532,-56557,-56583,-56608,
+    -56633,-56659,-56684,-56709,-56734,-56760,-56785,-56810,
+    -56835,-56860,-56885,-56910,-56935,-56959,-56984,-57009,
+    -57034,-57059,-57083,-57108,-57133,-57157,-57182,-57206,
+    -57231,-57255,-57280,-57304,-57329,-57353,-57377,-57402,
+    -57426,-57450,-57474,-57498,-57522,-57546,-57570,-57594,
+    -57618,-57642,-57666,-57690,-57714,-57738,-57762,-57785,
+    -57809,-57833,-57856,-57880,-57903,-57927,-57950,-57974,
+    -57997,-58021,-58044,-58067,-58091,-58114,-58137,-58160,
+    -58183,-58207,-58230,-58253,-58276,-58299,-58322,-58345,
+    -58367,-58390,-58413,-58436,-58459,-58481,-58504,-58527,
+    -58549,-58572,-58594,-58617,-58639,-58662,-58684,-58706,
+    -58729,-58751,-58773,-58795,-58818,-58840,-58862,-58884,
+    -58906,-58928,-58950,-58972,-58994,-59016,-59038,-59059,
+    -59081,-59103,-59125,-59146,-59168,-59190,-59211,-59233,
+    -59254,-59276,-59297,-59318,-59340,-59361,-59382,-59404,
+    -59425,-59446,-59467,-59488,-59509,-59530,-59551,-59572,
+    -59593,-59614,-59635,-59656,-59677,-59697,-59718,-59739,
+    -59759,-59780,-59801,-59821,-59842,-59862,-59883,-59903,
+    -59923,-59944,-59964,-59984,-60004,-60025,-60045,-60065,
+    -60085,-60105,-60125,-60145,-60165,-60185,-60205,-60225,
+    -60244,-60264,-60284,-60304,-60323,-60343,-60363,-60382,
+    -60402,-60421,-60441,-60460,-60479,-60499,-60518,-60537,
+    -60556,-60576,-60595,-60614,-60633,-60652,-60671,-60690,
+    -60709,-60728,-60747,-60766,-60785,-60803,-60822,-60841,
+    -60859,-60878,-60897,-60915,-60934,-60952,-60971,-60989,
+    -61007,-61026,-61044,-61062,-61081,-61099,-61117,-61135,
+    -61153,-61171,-61189,-61207,-61225,-61243,-61261,-61279,
+    -61297,-61314,-61332,-61350,-61367,-61385,-61403,-61420,
+    -61438,-61455,-61473,-61490,-61507,-61525,-61542,-61559,
+    -61577,-61594,-61611,-61628,-61645,-61662,-61679,-61696,
+    -61713,-61730,-61747,-61764,-61780,-61797,-61814,-61831,
+    -61847,-61864,-61880,-61897,-61913,-61930,-61946,-61963,
+    -61979,-61995,-62012,-62028,-62044,-62060,-62076,-62092,
+    -62108,-62125,-62141,-62156,-62172,-62188,-62204,-62220,
+    -62236,-62251,-62267,-62283,-62298,-62314,-62329,-62345,
+    -62360,-62376,-62391,-62407,-62422,-62437,-62453,-62468,
+    -62483,-62498,-62513,-62528,-62543,-62558,-62573,-62588,
+    -62603,-62618,-62633,-62648,-62662,-62677,-62692,-62706,
+    -62721,-62735,-62750,-62764,-62779,-62793,-62808,-62822,
+    -62836,-62850,-62865,-62879,-62893,-62907,-62921,-62935,
+    -62949,-62963,-62977,-62991,-63005,-63019,-63032,-63046,
+    -63060,-63074,-63087,-63101,-63114,-63128,-63141,-63155,
+    -63168,-63182,-63195,-63208,-63221,-63235,-63248,-63261,
+    -63274,-63287,-63300,-63313,-63326,-63339,-63352,-63365,
+    -63378,-63390,-63403,-63416,-63429,-63441,-63454,-63466,
+    -63479,-63491,-63504,-63516,-63528,-63541,-63553,-63565,
+    -63578,-63590,-63602,-63614,-63626,-63638,-63650,-63662,
+    -63674,-63686,-63698,-63709,-63721,-63733,-63745,-63756,
+    -63768,-63779,-63791,-63803,-63814,-63825,-63837,-63848,
+    -63859,-63871,-63882,-63893,-63904,-63915,-63927,-63938,
+    -63949,-63960,-63971,-63981,-63992,-64003,-64014,-64025,
+    -64035,-64046,-64057,-64067,-64078,-64088,-64099,-64109,
+    -64120,-64130,-64140,-64151,-64161,-64171,-64181,-64192,
+    -64202,-64212,-64222,-64232,-64242,-64252,-64261,-64271,
+    -64281,-64291,-64301,-64310,-64320,-64330,-64339,-64349,
+    -64358,-64368,-64377,-64387,-64396,-64405,-64414,-64424,
+    -64433,-64442,-64451,-64460,-64469,-64478,-64487,-64496,
+    -64505,-64514,-64523,-64532,-64540,-64549,-64558,-64566,
+    -64575,-64584,-64592,-64601,-64609,-64617,-64626,-64634,
+    -64642,-64651,-64659,-64667,-64675,-64683,-64691,-64699,
+    -64707,-64715,-64723,-64731,-64739,-64747,-64754,-64762,
+    -64770,-64777,-64785,-64793,-64800,-64808,-64815,-64822,
+    -64830,-64837,-64844,-64852,-64859,-64866,-64873,-64880,
+    -64887,-64895,-64902,-64908,-64915,-64922,-64929,-64936,
+    -64943,-64949,-64956,-64963,-64969,-64976,-64982,-64989,
+    -64995,-65002,-65008,-65015,-65021,-65027,-65033,-65040,
+    -65046,-65052,-65058,-65064,-65070,-65076,-65082,-65088,
+    -65094,-65099,-65105,-65111,-65117,-65122,-65128,-65133,
+    -65139,-65144,-65150,-65155,-65161,-65166,-65171,-65177,
+    -65182,-65187,-65192,-65197,-65202,-65207,-65212,-65217,
+    -65222,-65227,-65232,-65237,-65242,-65246,-65251,-65256,
+    -65260,-65265,-65270,-65274,-65279,-65283,-65287,-65292,
+    -65296,-65300,-65305,-65309,-65313,-65317,-65321,-65325,
+    -65329,-65333,-65337,-65341,-65345,-65349,-65352,-65356,
+    -65360,-65363,-65367,-65371,-65374,-65378,-65381,-65385,
+    -65388,-65391,-65395,-65398,-65401,-65404,-65408,-65411,
+    -65414,-65417,-65420,-65423,-65426,-65429,-65431,-65434,
+    -65437,-65440,-65442,-65445,-65448,-65450,-65453,-65455,
+    -65458,-65460,-65463,-65465,-65467,-65470,-65472,-65474,
+    -65476,-65478,-65480,-65482,-65484,-65486,-65488,-65490,
+    -65492,-65494,-65496,-65497,-65499,-65501,-65502,-65504,
+    -65505,-65507,-65508,-65510,-65511,-65513,-65514,-65515,
+    -65516,-65518,-65519,-65520,-65521,-65522,-65523,-65524,
+    -65525,-65526,-65527,-65527,-65528,-65529,-65530,-65530,
+    -65531,-65531,-65532,-65532,-65533,-65533,-65534,-65534,
+    -65534,-65535,-65535,-65535,-65535,-65535,-65535,-65535,
+    -65535,-65535,-65535,-65535,-65535,-65535,-65535,-65534,
+    -65534,-65534,-65533,-65533,-65532,-65532,-65531,-65531,
+    -65530,-65530,-65529,-65528,-65527,-65527,-65526,-65525,
+    -65524,-65523,-65522,-65521,-65520,-65519,-65518,-65516,
+    -65515,-65514,-65513,-65511,-65510,-65508,-65507,-65505,
+    -65504,-65502,-65501,-65499,-65497,-65496,-65494,-65492,
+    -65490,-65488,-65486,-65484,-65482,-65480,-65478,-65476,
+    -65474,-65472,-65470,-65467,-65465,-65463,-65460,-65458,
+    -65455,-65453,-65450,-65448,-65445,-65442,-65440,-65437,
+    -65434,-65431,-65429,-65426,-65423,-65420,-65417,-65414,
+    -65411,-65408,-65404,-65401,-65398,-65395,-65391,-65388,
+    -65385,-65381,-65378,-65374,-65371,-65367,-65363,-65360,
+    -65356,-65352,-65349,-65345,-65341,-65337,-65333,-65329,
+    -65325,-65321,-65317,-65313,-65309,-65305,-65300,-65296,
+    -65292,-65287,-65283,-65279,-65274,-65270,-65265,-65260,
+    -65256,-65251,-65246,-65242,-65237,-65232,-65227,-65222,
+    -65217,-65212,-65207,-65202,-65197,-65192,-65187,-65182,
+    -65177,-65171,-65166,-65161,-65155,-65150,-65144,-65139,
+    -65133,-65128,-65122,-65117,-65111,-65105,-65099,-65094,
+    -65088,-65082,-65076,-65070,-65064,-65058,-65052,-65046,
+    -65040,-65033,-65027,-65021,-65015,-65008,-65002,-64995,
+    -64989,-64982,-64976,-64969,-64963,-64956,-64949,-64943,
+    -64936,-64929,-64922,-64915,-64908,-64902,-64895,-64887,
+    -64880,-64873,-64866,-64859,-64852,-64844,-64837,-64830,
+    -64822,-64815,-64808,-64800,-64793,-64785,-64777,-64770,
+    -64762,-64754,-64747,-64739,-64731,-64723,-64715,-64707,
+    -64699,-64691,-64683,-64675,-64667,-64659,-64651,-64642,
+    -64634,-64626,-64617,-64609,-64601,-64592,-64584,-64575,
+    -64566,-64558,-64549,-64540,-64532,-64523,-64514,-64505,
+    -64496,-64487,-64478,-64469,-64460,-64451,-64442,-64433,
+    -64424,-64414,-64405,-64396,-64387,-64377,-64368,-64358,
+    -64349,-64339,-64330,-64320,-64310,-64301,-64291,-64281,
+    -64271,-64261,-64252,-64242,-64232,-64222,-64212,-64202,
+    -64192,-64181,-64171,-64161,-64151,-64140,-64130,-64120,
+    -64109,-64099,-64088,-64078,-64067,-64057,-64046,-64035,
+    -64025,-64014,-64003,-63992,-63981,-63971,-63960,-63949,
+    -63938,-63927,-63915,-63904,-63893,-63882,-63871,-63859,
+    -63848,-63837,-63825,-63814,-63803,-63791,-63779,-63768,
+    -63756,-63745,-63733,-63721,-63709,-63698,-63686,-63674,
+    -63662,-63650,-63638,-63626,-63614,-63602,-63590,-63578,
+    -63565,-63553,-63541,-63528,-63516,-63504,-63491,-63479,
+    -63466,-63454,-63441,-63429,-63416,-63403,-63390,-63378,
+    -63365,-63352,-63339,-63326,-63313,-63300,-63287,-63274,
+    -63261,-63248,-63235,-63221,-63208,-63195,-63182,-63168,
+    -63155,-63141,-63128,-63114,-63101,-63087,-63074,-63060,
+    -63046,-63032,-63019,-63005,-62991,-62977,-62963,-62949,
+    -62935,-62921,-62907,-62893,-62879,-62865,-62850,-62836,
+    -62822,-62808,-62793,-62779,-62764,-62750,-62735,-62721,
+    -62706,-62692,-62677,-62662,-62648,-62633,-62618,-62603,
+    -62588,-62573,-62558,-62543,-62528,-62513,-62498,-62483,
+    -62468,-62453,-62437,-62422,-62407,-62391,-62376,-62360,
+    -62345,-62329,-62314,-62298,-62283,-62267,-62251,-62236,
+    -62220,-62204,-62188,-62172,-62156,-62141,-62125,-62108,
+    -62092,-62076,-62060,-62044,-62028,-62012,-61995,-61979,
+    -61963,-61946,-61930,-61913,-61897,-61880,-61864,-61847,
+    -61831,-61814,-61797,-61780,-61764,-61747,-61730,-61713,
+    -61696,-61679,-61662,-61645,-61628,-61611,-61594,-61577,
+    -61559,-61542,-61525,-61507,-61490,-61473,-61455,-61438,
+    -61420,-61403,-61385,-61367,-61350,-61332,-61314,-61297,
+    -61279,-61261,-61243,-61225,-61207,-61189,-61171,-61153,
+    -61135,-61117,-61099,-61081,-61062,-61044,-61026,-61007,
+    -60989,-60971,-60952,-60934,-60915,-60897,-60878,-60859,
+    -60841,-60822,-60803,-60785,-60766,-60747,-60728,-60709,
+    -60690,-60671,-60652,-60633,-60614,-60595,-60576,-60556,
+    -60537,-60518,-60499,-60479,-60460,-60441,-60421,-60402,
+    -60382,-60363,-60343,-60323,-60304,-60284,-60264,-60244,
+    -60225,-60205,-60185,-60165,-60145,-60125,-60105,-60085,
+    -60065,-60045,-60025,-60004,-59984,-59964,-59944,-59923,
+    -59903,-59883,-59862,-59842,-59821,-59801,-59780,-59759,
+    -59739,-59718,-59697,-59677,-59656,-59635,-59614,-59593,
+    -59572,-59551,-59530,-59509,-59488,-59467,-59446,-59425,
+    -59404,-59382,-59361,-59340,-59318,-59297,-59276,-59254,
+    -59233,-59211,-59189,-59168,-59146,-59125,-59103,-59081,
+    -59059,-59038,-59016,-58994,-58972,-58950,-58928,-58906,
+    -58884,-58862,-58840,-58818,-58795,-58773,-58751,-58729,
+    -58706,-58684,-58662,-58639,-58617,-58594,-58572,-58549,
+    -58527,-58504,-58481,-58459,-58436,-58413,-58390,-58367,
+    -58345,-58322,-58299,-58276,-58253,-58230,-58207,-58183,
+    -58160,-58137,-58114,-58091,-58067,-58044,-58021,-57997,
+    -57974,-57950,-57927,-57903,-57880,-57856,-57833,-57809,
+    -57785,-57762,-57738,-57714,-57690,-57666,-57642,-57618,
+    -57594,-57570,-57546,-57522,-57498,-57474,-57450,-57426,
+    -57402,-57377,-57353,-57329,-57304,-57280,-57255,-57231,
+    -57206,-57182,-57157,-57133,-57108,-57083,-57059,-57034,
+    -57009,-56984,-56959,-56935,-56910,-56885,-56860,-56835,
+    -56810,-56785,-56760,-56734,-56709,-56684,-56659,-56633,
+    -56608,-56583,-56557,-56532,-56507,-56481,-56456,-56430,
+    -56404,-56379,-56353,-56328,-56302,-56276,-56250,-56225,
+    -56199,-56173,-56147,-56121,-56095,-56069,-56043,-56017,
+    -55991,-55965,-55938,-55912,-55886,-55860,-55833,-55807,
+    -55781,-55754,-55728,-55701,-55675,-55648,-55622,-55595,
+    -55569,-55542,-55515,-55489,-55462,-55435,-55408,-55381,
+    -55354,-55327,-55300,-55274,-55246,-55219,-55192,-55165,
+    -55138,-55111,-55084,-55056,-55029,-55002,-54974,-54947,
+    -54920,-54892,-54865,-54837,-54810,-54782,-54755,-54727,
+    -54699,-54672,-54644,-54616,-54588,-54560,-54533,-54505,
+    -54477,-54449,-54421,-54393,-54365,-54337,-54308,-54280,
+    -54252,-54224,-54196,-54167,-54139,-54111,-54082,-54054,
+    -54026,-53997,-53969,-53940,-53911,-53883,-53854,-53826,
+    -53797,-53768,-53739,-53711,-53682,-53653,-53624,-53595,
+    -53566,-53537,-53508,-53479,-53450,-53421,-53392,-53363,
+    -53334,-53304,-53275,-53246,-53216,-53187,-53158,-53128,
+    -53099,-53069,-53040,-53010,-52981,-52951,-52922,-52892,
+    -52862,-52832,-52803,-52773,-52743,-52713,-52683,-52653,
+    -52624,-52594,-52564,-52534,-52503,-52473,-52443,-52413,
+    -52383,-52353,-52322,-52292,-52262,-52231,-52201,-52171,
+    -52140,-52110,-52079,-52049,-52018,-51988,-51957,-51926,
+    -51896,-51865,-51834,-51803,-51773,-51742,-51711,-51680,
+    -51649,-51618,-51587,-51556,-51525,-51494,-51463,-51432,
+    -51401,-51369,-51338,-51307,-51276,-51244,-51213,-51182,
+    -51150,-51119,-51087,-51056,-51024,-50993,-50961,-50929,
+    -50898,-50866,-50834,-50803,-50771,-50739,-50707,-50675,
+    -50644,-50612,-50580,-50548,-50516,-50484,-50452,-50420,
+    -50387,-50355,-50323,-50291,-50259,-50226,-50194,-50162,
+    -50129,-50097,-50065,-50032,-50000,-49967,-49935,-49902,
+    -49869,-49837,-49804,-49771,-49739,-49706,-49673,-49640,
+    -49608,-49575,-49542,-49509,-49476,-49443,-49410,-49377,
+    -49344,-49311,-49278,-49244,-49211,-49178,-49145,-49112,
+    -49078,-49045,-49012,-48978,-48945,-48911,-48878,-48844,
+    -48811,-48777,-48744,-48710,-48676,-48643,-48609,-48575,
+    -48542,-48508,-48474,-48440,-48406,-48372,-48338,-48305,
+    -48271,-48237,-48202,-48168,-48134,-48100,-48066,-48032,
+    -47998,-47963,-47929,-47895,-47860,-47826,-47792,-47757,
+    -47723,-47688,-47654,-47619,-47585,-47550,-47516,-47481,
+    -47446,-47412,-47377,-47342,-47307,-47273,-47238,-47203,
+    -47168,-47133,-47098,-47063,-47028,-46993,-46958,-46923,
+    -46888,-46853,-46818,-46783,-46747,-46712,-46677,-46642,
+    -46606,-46571,-46536,-46500,-46465,-46429,-46394,-46358,
+    -46323,-46287,-46251,-46216,-46180,-46145,-46109,-46073,
+    -46037,-46002,-45966,-45930,-45894,-45858,-45822,-45786,
+    -45750,-45714,-45678,-45642,-45606,-45570,-45534,-45498,
+    -45462,-45425,-45389,-45353,-45316,-45280,-45244,-45207,
+    -45171,-45135,-45098,-45062,-45025,-44989,-44952,-44915,
+    -44879,-44842,-44806,-44769,-44732,-44695,-44659,-44622,
+    -44585,-44548,-44511,-44474,-44437,-44400,-44363,-44326,
+    -44289,-44252,-44215,-44178,-44141,-44104,-44067,-44029,
+    -43992,-43955,-43918,-43880,-43843,-43806,-43768,-43731,
+    -43693,-43656,-43618,-43581,-43543,-43506,-43468,-43430,
+    -43393,-43355,-43317,-43280,-43242,-43204,-43166,-43128,
+    -43091,-43053,-43015,-42977,-42939,-42901,-42863,-42825,
+    -42787,-42749,-42711,-42672,-42634,-42596,-42558,-42520,
+    -42481,-42443,-42405,-42366,-42328,-42290,-42251,-42213,
+    -42174,-42136,-42097,-42059,-42020,-41982,-41943,-41904,
+    -41866,-41827,-41788,-41750,-41711,-41672,-41633,-41595,
+    -41556,-41517,-41478,-41439,-41400,-41361,-41322,-41283,
+    -41244,-41205,-41166,-41127,-41087,-41048,-41009,-40970,
+    -40931,-40891,-40852,-40813,-40773,-40734,-40695,-40655,
+    -40616,-40576,-40537,-40497,-40458,-40418,-40379,-40339,
+    -40299,-40260,-40220,-40180,-40141,-40101,-40061,-40021,
+    -39982,-39942,-39902,-39862,-39822,-39782,-39742,-39702,
+    -39662,-39622,-39582,-39542,-39502,-39462,-39422,-39382,
+    -39341,-39301,-39261,-39221,-39180,-39140,-39100,-39059,
+    -39019,-38979,-38938,-38898,-38857,-38817,-38776,-38736,
+    -38695,-38655,-38614,-38573,-38533,-38492,-38451,-38411,
+    -38370,-38329,-38288,-38248,-38207,-38166,-38125,-38084,
+    -38043,-38002,-37961,-37920,-37879,-37838,-37797,-37756,
+    -37715,-37674,-37633,-37592,-37550,-37509,-37468,-37427,
+    -37386,-37344,-37303,-37262,-37220,-37179,-37137,-37096,
+    -37055,-37013,-36972,-36930,-36889,-36847,-36805,-36764,
+    -36722,-36681,-36639,-36597,-36556,-36514,-36472,-36430,
+    -36388,-36347,-36305,-36263,-36221,-36179,-36137,-36095,
+    -36053,-36011,-35969,-35927,-35885,-35843,-35801,-35759,
+    -35717,-35675,-35633,-35590,-35548,-35506,-35464,-35421,
+    -35379,-35337,-35294,-35252,-35210,-35167,-35125,-35082,
+    -35040,-34997,-34955,-34912,-34870,-34827,-34785,-34742,
+    -34699,-34657,-34614,-34571,-34529,-34486,-34443,-34400,
+    -34358,-34315,-34272,-34229,-34186,-34143,-34100,-34057,
+    -34015,-33972,-33929,-33886,-33843,-33799,-33756,-33713,
+    -33670,-33627,-33584,-33541,-33498,-33454,-33411,-33368,
+    -33325,-33281,-33238,-33195,-33151,-33108,-33065,-33021,
+    -32978,-32934,-32891,-32847,-32804,-32760,-32717,-32673,
+    -32630,-32586,-32542,-32499,-32455,-32411,-32368,-32324,
+    -32280,-32236,-32193,-32149,-32105,-32061,-32017,-31974,
+    -31930,-31886,-31842,-31798,-31754,-31710,-31666,-31622,
+    -31578,-31534,-31490,-31446,-31402,-31357,-31313,-31269,
+    -31225,-31181,-31136,-31092,-31048,-31004,-30959,-30915,
+    -30871,-30826,-30782,-30738,-30693,-30649,-30604,-30560,
+    -30515,-30471,-30426,-30382,-30337,-30293,-30248,-30204,
+    -30159,-30114,-30070,-30025,-29980,-29936,-29891,-29846,
+    -29801,-29757,-29712,-29667,-29622,-29577,-29533,-29488,
+    -29443,-29398,-29353,-29308,-29263,-29218,-29173,-29128,
+    -29083,-29038,-28993,-28948,-28903,-28858,-28812,-28767,
+    -28722,-28677,-28632,-28586,-28541,-28496,-28451,-28405,
+    -28360,-28315,-28269,-28224,-28179,-28133,-28088,-28042,
+    -27997,-27952,-27906,-27861,-27815,-27770,-27724,-27678,
+    -27633,-27587,-27542,-27496,-27450,-27405,-27359,-27313,
+    -27268,-27222,-27176,-27131,-27085,-27039,-26993,-26947,
+    -26902,-26856,-26810,-26764,-26718,-26672,-26626,-26580,
+    -26534,-26488,-26442,-26396,-26350,-26304,-26258,-26212,
+    -26166,-26120,-26074,-26028,-25982,-25936,-25889,-25843,
+    -25797,-25751,-25705,-25658,-25612,-25566,-25520,-25473,
+    -25427,-25381,-25334,-25288,-25241,-25195,-25149,-25102,
+    -25056,-25009,-24963,-24916,-24870,-24823,-24777,-24730,
+    -24684,-24637,-24591,-24544,-24497,-24451,-24404,-24357,
+    -24311,-24264,-24217,-24171,-24124,-24077,-24030,-23984,
+    -23937,-23890,-23843,-23796,-23750,-23703,-23656,-23609,
+    -23562,-23515,-23468,-23421,-23374,-23327,-23280,-23233,
+    -23186,-23139,-23092,-23045,-22998,-22951,-22904,-22857,
+    -22810,-22763,-22716,-22668,-22621,-22574,-22527,-22480,
+    -22432,-22385,-22338,-22291,-22243,-22196,-22149,-22102,
+    -22054,-22007,-21960,-21912,-21865,-21817,-21770,-21723,
+    -21675,-21628,-21580,-21533,-21485,-21438,-21390,-21343,
+    -21295,-21248,-21200,-21153,-21105,-21057,-21010,-20962,
+    -20915,-20867,-20819,-20772,-20724,-20676,-20629,-20581,
+    -20533,-20485,-20438,-20390,-20342,-20294,-20246,-20199,
+    -20151,-20103,-20055,-20007,-19959,-19912,-19864,-19816,
+    -19768,-19720,-19672,-19624,-19576,-19528,-19480,-19432,
+    -19384,-19336,-19288,-19240,-19192,-19144,-19096,-19048,
+    -19000,-18951,-18903,-18855,-18807,-18759,-18711,-18663,
+    -18614,-18566,-18518,-18470,-18421,-18373,-18325,-18277,
+    -18228,-18180,-18132,-18084,-18035,-17987,-17939,-17890,
+    -17842,-17793,-17745,-17697,-17648,-17600,-17551,-17503,
+    -17455,-17406,-17358,-17309,-17261,-17212,-17164,-17115,
+    -17067,-17018,-16970,-16921,-16872,-16824,-16775,-16727,
+    -16678,-16629,-16581,-16532,-16484,-16435,-16386,-16338,
+    -16289,-16240,-16191,-16143,-16094,-16045,-15997,-15948,
+    -15899,-15850,-15802,-15753,-15704,-15655,-15606,-15557,
+    -15509,-15460,-15411,-15362,-15313,-15264,-15215,-15167,
+    -15118,-15069,-15020,-14971,-14922,-14873,-14824,-14775,
+    -14726,-14677,-14628,-14579,-14530,-14481,-14432,-14383,
+    -14334,-14285,-14236,-14187,-14138,-14089,-14040,-13990,
+    -13941,-13892,-13843,-13794,-13745,-13696,-13647,-13597,
+    -13548,-13499,-13450,-13401,-13351,-13302,-13253,-13204,
+    -13154,-13105,-13056,-13007,-12957,-12908,-12859,-12810,
+    -12760,-12711,-12662,-12612,-12563,-12514,-12464,-12415,
+    -12366,-12316,-12267,-12217,-12168,-12119,-12069,-12020,
+    -11970,-11921,-11872,-11822,-11773,-11723,-11674,-11624,
+    -11575,-11525,-11476,-11426,-11377,-11327,-11278,-11228,
+    -11179,-11129,-11080,-11030,-10981,-10931,-10882,-10832,
+    -10782,-10733,-10683,-10634,-10584,-10534,-10485,-10435,
+    -10386,-10336,-10286,-10237,-10187,-10137,-10088,-10038,
+    -9988,-9939,-9889,-9839,-9790,-9740,-9690,-9640,
+    -9591,-9541,-9491,-9442,-9392,-9342,-9292,-9243,
+    -9193,-9143,-9093,-9043,-8994,-8944,-8894,-8844,
+    -8794,-8745,-8695,-8645,-8595,-8545,-8496,-8446,
+    -8396,-8346,-8296,-8246,-8196,-8147,-8097,-8047,
+    -7997,-7947,-7897,-7847,-7797,-7747,-7697,-7648,
+    -7598,-7548,-7498,-7448,-7398,-7348,-7298,-7248,
+    -7198,-7148,-7098,-7048,-6998,-6948,-6898,-6848,
+    -6798,-6748,-6698,-6648,-6598,-6548,-6498,-6448,
+    -6398,-6348,-6298,-6248,-6198,-6148,-6098,-6048,
+    -5998,-5948,-5898,-5848,-5798,-5747,-5697,-5647,
+    -5597,-5547,-5497,-5447,-5397,-5347,-5297,-5247,
+    -5197,-5146,-5096,-5046,-4996,-4946,-4896,-4846,
+    -4796,-4745,-4695,-4645,-4595,-4545,-4495,-4445,
+    -4394,-4344,-4294,-4244,-4194,-4144,-4093,-4043,
+    -3993,-3943,-3893,-3843,-3792,-3742,-3692,-3642,
+    -3592,-3541,-3491,-3441,-3391,-3341,-3291,-3240,
+    -3190,-3140,-3090,-3039,-2989,-2939,-2889,-2839,
+    -2788,-2738,-2688,-2638,-2588,-2537,-2487,-2437,
+    -2387,-2336,-2286,-2236,-2186,-2135,-2085,-2035,
+    -1985,-1934,-1884,-1834,-1784,-1733,-1683,-1633,
+    -1583,-1532,-1482,-1432,-1382,-1331,-1281,-1231,
+    -1181,-1130,-1080,-1030,-980,-929,-879,-829,
+    -779,-728,-678,-628,-578,-527,-477,-427,
+    -376,-326,-276,-226,-175,-125,-75,-25,
+    25,75,125,175,226,276,326,376,
+    427,477,527,578,628,678,728,779,
+    829,879,929,980,1030,1080,1130,1181,
+    1231,1281,1331,1382,1432,1482,1532,1583,
+    1633,1683,1733,1784,1834,1884,1934,1985,
+    2035,2085,2135,2186,2236,2286,2336,2387,
+    2437,2487,2537,2587,2638,2688,2738,2788,
+    2839,2889,2939,2989,3039,3090,3140,3190,
+    3240,3291,3341,3391,3441,3491,3542,3592,
+    3642,3692,3742,3792,3843,3893,3943,3993,
+    4043,4093,4144,4194,4244,4294,4344,4394,
+    4445,4495,4545,4595,4645,4695,4745,4796,
+    4846,4896,4946,4996,5046,5096,5146,5197,
+    5247,5297,5347,5397,5447,5497,5547,5597,
+    5647,5697,5747,5798,5848,5898,5948,5998,
+    6048,6098,6148,6198,6248,6298,6348,6398,
+    6448,6498,6548,6598,6648,6698,6748,6798,
+    6848,6898,6948,6998,7048,7098,7148,7198,
+    7248,7298,7348,7398,7448,7498,7548,7598,
+    7648,7697,7747,7797,7847,7897,7947,7997,
+    8047,8097,8147,8196,8246,8296,8346,8396,
+    8446,8496,8545,8595,8645,8695,8745,8794,
+    8844,8894,8944,8994,9043,9093,9143,9193,
+    9243,9292,9342,9392,9442,9491,9541,9591,
+    9640,9690,9740,9790,9839,9889,9939,9988,
+    10038,10088,10137,10187,10237,10286,10336,10386,
+    10435,10485,10534,10584,10634,10683,10733,10782,
+    10832,10882,10931,10981,11030,11080,11129,11179,
+    11228,11278,11327,11377,11426,11476,11525,11575,
+    11624,11674,11723,11773,11822,11872,11921,11970,
+    12020,12069,12119,12168,12218,12267,12316,12366,
+    12415,12464,12514,12563,12612,12662,12711,12760,
+    12810,12859,12908,12957,13007,13056,13105,13154,
+    13204,13253,13302,13351,13401,13450,13499,13548,
+    13597,13647,13696,13745,13794,13843,13892,13941,
+    13990,14040,14089,14138,14187,14236,14285,14334,
+    14383,14432,14481,14530,14579,14628,14677,14726,
+    14775,14824,14873,14922,14971,15020,15069,15118,
+    15167,15215,15264,15313,15362,15411,15460,15509,
+    15557,15606,15655,15704,15753,15802,15850,15899,
+    15948,15997,16045,16094,16143,16191,16240,16289,
+    16338,16386,16435,16484,16532,16581,16629,16678,
+    16727,16775,16824,16872,16921,16970,17018,17067,
+    17115,17164,17212,17261,17309,17358,17406,17455,
+    17503,17551,17600,17648,17697,17745,17793,17842,
+    17890,17939,17987,18035,18084,18132,18180,18228,
+    18277,18325,18373,18421,18470,18518,18566,18614,
+    18663,18711,18759,18807,18855,18903,18951,19000,
+    19048,19096,19144,19192,19240,19288,19336,19384,
+    19432,19480,19528,19576,19624,19672,19720,19768,
+    19816,19864,19912,19959,20007,20055,20103,20151,
+    20199,20246,20294,20342,20390,20438,20485,20533,
+    20581,20629,20676,20724,20772,20819,20867,20915,
+    20962,21010,21057,21105,21153,21200,21248,21295,
+    21343,21390,21438,21485,21533,21580,21628,21675,
+    21723,21770,21817,21865,21912,21960,22007,22054,
+    22102,22149,22196,22243,22291,22338,22385,22432,
+    22480,22527,22574,22621,22668,22716,22763,22810,
+    22857,22904,22951,22998,23045,23092,23139,23186,
+    23233,23280,23327,23374,23421,23468,23515,23562,
+    23609,23656,23703,23750,23796,23843,23890,23937,
+    23984,24030,24077,24124,24171,24217,24264,24311,
+    24357,24404,24451,24497,24544,24591,24637,24684,
+    24730,24777,24823,24870,24916,24963,25009,25056,
+    25102,25149,25195,25241,25288,25334,25381,25427,
+    25473,25520,25566,25612,25658,25705,25751,25797,
+    25843,25889,25936,25982,26028,26074,26120,26166,
+    26212,26258,26304,26350,26396,26442,26488,26534,
+    26580,26626,26672,26718,26764,26810,26856,26902,
+    26947,26993,27039,27085,27131,27176,27222,27268,
+    27313,27359,27405,27450,27496,27542,27587,27633,
+    27678,27724,27770,27815,27861,27906,27952,27997,
+    28042,28088,28133,28179,28224,28269,28315,28360,
+    28405,28451,28496,28541,28586,28632,28677,28722,
+    28767,28812,28858,28903,28948,28993,29038,29083,
+    29128,29173,29218,29263,29308,29353,29398,29443,
+    29488,29533,29577,29622,29667,29712,29757,29801,
+    29846,29891,29936,29980,30025,30070,30114,30159,
+    30204,30248,30293,30337,30382,30427,30471,30516,
+    30560,30604,30649,30693,30738,30782,30826,30871,
+    30915,30959,31004,31048,31092,31136,31181,31225,
+    31269,31313,31357,31402,31446,31490,31534,31578,
+    31622,31666,31710,31754,31798,31842,31886,31930,
+    31974,32017,32061,32105,32149,32193,32236,32280,
+    32324,32368,32411,32455,32499,32542,32586,32630,
+    32673,32717,32760,32804,32847,32891,32934,32978,
+    33021,33065,33108,33151,33195,33238,33281,33325,
+    33368,33411,33454,33498,33541,33584,33627,33670,
+    33713,33756,33799,33843,33886,33929,33972,34015,
+    34057,34100,34143,34186,34229,34272,34315,34358,
+    34400,34443,34486,34529,34571,34614,34657,34699,
+    34742,34785,34827,34870,34912,34955,34997,35040,
+    35082,35125,35167,35210,35252,35294,35337,35379,
+    35421,35464,35506,35548,35590,35633,35675,35717,
+    35759,35801,35843,35885,35927,35969,36011,36053,
+    36095,36137,36179,36221,36263,36305,36347,36388,
+    36430,36472,36514,36556,36597,36639,36681,36722,
+    36764,36805,36847,36889,36930,36972,37013,37055,
+    37096,37137,37179,37220,37262,37303,37344,37386,
+    37427,37468,37509,37551,37592,37633,37674,37715,
+    37756,37797,37838,37879,37920,37961,38002,38043,
+    38084,38125,38166,38207,38248,38288,38329,38370,
+    38411,38451,38492,38533,38573,38614,38655,38695,
+    38736,38776,38817,38857,38898,38938,38979,39019,
+    39059,39100,39140,39180,39221,39261,39301,39341,
+    39382,39422,39462,39502,39542,39582,39622,39662,
+    39702,39742,39782,39822,39862,39902,39942,39982,
+    40021,40061,40101,40141,40180,40220,40260,40299,
+    40339,40379,40418,40458,40497,40537,40576,40616,
+    40655,40695,40734,40773,40813,40852,40891,40931,
+    40970,41009,41048,41087,41127,41166,41205,41244,
+    41283,41322,41361,41400,41439,41478,41517,41556,
+    41595,41633,41672,41711,41750,41788,41827,41866,
+    41904,41943,41982,42020,42059,42097,42136,42174,
+    42213,42251,42290,42328,42366,42405,42443,42481,
+    42520,42558,42596,42634,42672,42711,42749,42787,
+    42825,42863,42901,42939,42977,43015,43053,43091,
+    43128,43166,43204,43242,43280,43317,43355,43393,
+    43430,43468,43506,43543,43581,43618,43656,43693,
+    43731,43768,43806,43843,43880,43918,43955,43992,
+    44029,44067,44104,44141,44178,44215,44252,44289,
+    44326,44363,44400,44437,44474,44511,44548,44585,
+    44622,44659,44695,44732,44769,44806,44842,44879,
+    44915,44952,44989,45025,45062,45098,45135,45171,
+    45207,45244,45280,45316,45353,45389,45425,45462,
+    45498,45534,45570,45606,45642,45678,45714,45750,
+    45786,45822,45858,45894,45930,45966,46002,46037,
+    46073,46109,46145,46180,46216,46252,46287,46323,
+    46358,46394,46429,46465,46500,46536,46571,46606,
+    46642,46677,46712,46747,46783,46818,46853,46888,
+    46923,46958,46993,47028,47063,47098,47133,47168,
+    47203,47238,47273,47308,47342,47377,47412,47446,
+    47481,47516,47550,47585,47619,47654,47688,47723,
+    47757,47792,47826,47861,47895,47929,47963,47998,
+    48032,48066,48100,48134,48168,48202,48237,48271,
+    48305,48338,48372,48406,48440,48474,48508,48542,
+    48575,48609,48643,48676,48710,48744,48777,48811,
+    48844,48878,48911,48945,48978,49012,49045,49078,
+    49112,49145,49178,49211,49244,49278,49311,49344,
+    49377,49410,49443,49476,49509,49542,49575,49608,
+    49640,49673,49706,49739,49771,49804,49837,49869,
+    49902,49935,49967,50000,50032,50064,50097,50129,
+    50162,50194,50226,50259,50291,50323,50355,50387,
+    50420,50452,50484,50516,50548,50580,50612,50644,
+    50675,50707,50739,50771,50803,50834,50866,50898,
+    50929,50961,50993,51024,51056,51087,51119,51150,
+    51182,51213,51244,51276,51307,51338,51369,51401,
+    51432,51463,51494,51525,51556,51587,51618,51649,
+    51680,51711,51742,51773,51803,51834,51865,51896,
+    51926,51957,51988,52018,52049,52079,52110,52140,
+    52171,52201,52231,52262,52292,52322,52353,52383,
+    52413,52443,52473,52503,52534,52564,52594,52624,
+    52653,52683,52713,52743,52773,52803,52832,52862,
+    52892,52922,52951,52981,53010,53040,53069,53099,
+    53128,53158,53187,53216,53246,53275,53304,53334,
+    53363,53392,53421,53450,53479,53508,53537,53566,
+    53595,53624,53653,53682,53711,53739,53768,53797,
+    53826,53854,53883,53912,53940,53969,53997,54026,
+    54054,54082,54111,54139,54167,54196,54224,54252,
+    54280,54309,54337,54365,54393,54421,54449,54477,
+    54505,54533,54560,54588,54616,54644,54672,54699,
+    54727,54755,54782,54810,54837,54865,54892,54920,
+    54947,54974,55002,55029,55056,55084,55111,55138,
+    55165,55192,55219,55246,55274,55300,55327,55354,
+    55381,55408,55435,55462,55489,55515,55542,55569,
+    55595,55622,55648,55675,55701,55728,55754,55781,
+    55807,55833,55860,55886,55912,55938,55965,55991,
+    56017,56043,56069,56095,56121,56147,56173,56199,
+    56225,56250,56276,56302,56328,56353,56379,56404,
+    56430,56456,56481,56507,56532,56557,56583,56608,
+    56633,56659,56684,56709,56734,56760,56785,56810,
+    56835,56860,56885,56910,56935,56959,56984,57009,
+    57034,57059,57083,57108,57133,57157,57182,57206,
+    57231,57255,57280,57304,57329,57353,57377,57402,
+    57426,57450,57474,57498,57522,57546,57570,57594,
+    57618,57642,57666,57690,57714,57738,57762,57785,
+    57809,57833,57856,57880,57903,57927,57950,57974,
+    57997,58021,58044,58067,58091,58114,58137,58160,
+    58183,58207,58230,58253,58276,58299,58322,58345,
+    58367,58390,58413,58436,58459,58481,58504,58527,
+    58549,58572,58594,58617,58639,58662,58684,58706,
+    58729,58751,58773,58795,58818,58840,58862,58884,
+    58906,58928,58950,58972,58994,59016,59038,59059,
+    59081,59103,59125,59146,59168,59190,59211,59233,
+    59254,59276,59297,59318,59340,59361,59382,59404,
+    59425,59446,59467,59488,59509,59530,59551,59572,
+    59593,59614,59635,59656,59677,59697,59718,59739,
+    59759,59780,59801,59821,59842,59862,59883,59903,
+    59923,59944,59964,59984,60004,60025,60045,60065,
+    60085,60105,60125,60145,60165,60185,60205,60225,
+    60244,60264,60284,60304,60323,60343,60363,60382,
+    60402,60421,60441,60460,60479,60499,60518,60537,
+    60556,60576,60595,60614,60633,60652,60671,60690,
+    60709,60728,60747,60766,60785,60803,60822,60841,
+    60859,60878,60897,60915,60934,60952,60971,60989,
+    61007,61026,61044,61062,61081,61099,61117,61135,
+    61153,61171,61189,61207,61225,61243,61261,61279,
+    61297,61314,61332,61350,61367,61385,61403,61420,
+    61438,61455,61473,61490,61507,61525,61542,61559,
+    61577,61594,61611,61628,61645,61662,61679,61696,
+    61713,61730,61747,61764,61780,61797,61814,61831,
+    61847,61864,61880,61897,61913,61930,61946,61963,
+    61979,61995,62012,62028,62044,62060,62076,62092,
+    62108,62125,62141,62156,62172,62188,62204,62220,
+    62236,62251,62267,62283,62298,62314,62329,62345,
+    62360,62376,62391,62407,62422,62437,62453,62468,
+    62483,62498,62513,62528,62543,62558,62573,62588,
+    62603,62618,62633,62648,62662,62677,62692,62706,
+    62721,62735,62750,62764,62779,62793,62808,62822,
+    62836,62850,62865,62879,62893,62907,62921,62935,
+    62949,62963,62977,62991,63005,63019,63032,63046,
+    63060,63074,63087,63101,63114,63128,63141,63155,
+    63168,63182,63195,63208,63221,63235,63248,63261,
+    63274,63287,63300,63313,63326,63339,63352,63365,
+    63378,63390,63403,63416,63429,63441,63454,63466,
+    63479,63491,63504,63516,63528,63541,63553,63565,
+    63578,63590,63602,63614,63626,63638,63650,63662,
+    63674,63686,63698,63709,63721,63733,63745,63756,
+    63768,63779,63791,63803,63814,63825,63837,63848,
+    63859,63871,63882,63893,63904,63915,63927,63938,
+    63949,63960,63971,63981,63992,64003,64014,64025,
+    64035,64046,64057,64067,64078,64088,64099,64109,
+    64120,64130,64140,64151,64161,64171,64181,64192,
+    64202,64212,64222,64232,64242,64252,64261,64271,
+    64281,64291,64301,64310,64320,64330,64339,64349,
+    64358,64368,64377,64387,64396,64405,64414,64424,
+    64433,64442,64451,64460,64469,64478,64487,64496,
+    64505,64514,64523,64532,64540,64549,64558,64566,
+    64575,64584,64592,64600,64609,64617,64626,64634,
+    64642,64651,64659,64667,64675,64683,64691,64699,
+    64707,64715,64723,64731,64739,64747,64754,64762,
+    64770,64777,64785,64793,64800,64808,64815,64822,
+    64830,64837,64844,64852,64859,64866,64873,64880,
+    64887,64895,64902,64908,64915,64922,64929,64936,
+    64943,64949,64956,64963,64969,64976,64982,64989,
+    64995,65002,65008,65015,65021,65027,65033,65040,
+    65046,65052,65058,65064,65070,65076,65082,65088,
+    65094,65099,65105,65111,65117,65122,65128,65133,
+    65139,65144,65150,65155,65161,65166,65171,65177,
+    65182,65187,65192,65197,65202,65207,65212,65217,
+    65222,65227,65232,65237,65242,65246,65251,65256,
+    65260,65265,65270,65274,65279,65283,65287,65292,
+    65296,65300,65305,65309,65313,65317,65321,65325,
+    65329,65333,65337,65341,65345,65349,65352,65356,
+    65360,65363,65367,65371,65374,65378,65381,65385,
+    65388,65391,65395,65398,65401,65404,65408,65411,
+    65414,65417,65420,65423,65426,65429,65431,65434,
+    65437,65440,65442,65445,65448,65450,65453,65455,
+    65458,65460,65463,65465,65467,65470,65472,65474,
+    65476,65478,65480,65482,65484,65486,65488,65490,
+    65492,65494,65496,65497,65499,65501,65502,65504,
+    65505,65507,65508,65510,65511,65513,65514,65515,
+    65516,65518,65519,65520,65521,65522,65523,65524,
+    65525,65526,65527,65527,65528,65529,65530,65530,
+    65531,65531,65532,65532,65533,65533,65534,65534,
+    65534,65535,65535,65535,65535,65535,65535,65535
+};
+
+
+
+const angle_t tantoangle[2049] =
+{
+    0,333772,667544,1001315,1335086,1668857,2002626,2336395,
+    2670163,3003929,3337694,3671457,4005219,4338979,4672736,5006492,
+    5340245,5673995,6007743,6341488,6675230,7008968,7342704,7676435,
+    8010164,8343888,8677609,9011325,9345037,9678744,10012447,10346145,
+    10679838,11013526,11347209,11680887,12014558,12348225,12681885,13015539,
+    13349187,13682829,14016464,14350092,14683714,15017328,15350936,15684536,
+    16018129,16351714,16685291,17018860,17352422,17685974,18019518,18353054,
+    18686582,19020100,19353610,19687110,20020600,20354080,20687552,21021014,
+    21354466,21687906,22021338,22354758,22688168,23021568,23354956,23688332,
+    24021698,24355052,24688396,25021726,25355046,25688352,26021648,26354930,
+    26688200,27021456,27354702,27687932,28021150,28354356,28687548,29020724,
+    29353888,29687038,30020174,30353296,30686404,31019496,31352574,31685636,
+    32018684,32351718,32684734,33017736,33350722,33683692,34016648,34349584,
+    34682508,35015412,35348300,35681172,36014028,36346868,36679688,37012492,
+    37345276,37678044,38010792,38343524,38676240,39008936,39341612,39674272,
+    40006912,40339532,40672132,41004716,41337276,41669820,42002344,42334848,
+    42667332,42999796,43332236,43664660,43997060,44329444,44661800,44994140,
+    45326456,45658752,45991028,46323280,46655512,46987720,47319908,47652072,
+    47984212,48316332,48648428,48980500,49312548,49644576,49976580,50308556,
+    50640512,50972444,51304352,51636236,51968096,52299928,52631740,52963524,
+    53295284,53627020,53958728,54290412,54622068,54953704,55285308,55616888,
+    55948444,56279972,56611472,56942948,57274396,57605816,57937212,58268576,
+    58599916,58931228,59262512,59593768,59924992,60256192,60587364,60918508,
+    61249620,61580704,61911760,62242788,62573788,62904756,63235692,63566604,
+    63897480,64228332,64559148,64889940,65220696,65551424,65882120,66212788,
+    66543420,66874024,67204600,67535136,67865648,68196120,68526568,68856984,
+    69187360,69517712,69848024,70178304,70508560,70838776,71168960,71499112,
+    71829224,72159312,72489360,72819376,73149360,73479304,73809216,74139096,
+    74468936,74798744,75128520,75458264,75787968,76117632,76447264,76776864,
+    77106424,77435952,77765440,78094888,78424304,78753688,79083032,79412336,
+    79741608,80070840,80400032,80729192,81058312,81387392,81716432,82045440,
+    82374408,82703336,83032224,83361080,83689896,84018664,84347400,84676096,
+    85004760,85333376,85661952,85990488,86318984,86647448,86975864,87304240,
+    87632576,87960872,88289128,88617344,88945520,89273648,89601736,89929792,
+    90257792,90585760,90913688,91241568,91569408,91897200,92224960,92552672,
+    92880336,93207968,93535552,93863088,94190584,94518040,94845448,95172816,
+    95500136,95827416,96154648,96481832,96808976,97136080,97463136,97790144,
+    98117112,98444032,98770904,99097736,99424520,99751256,100077944,100404592,
+    100731192,101057744,101384248,101710712,102037128,102363488,102689808,103016080,
+    103342312,103668488,103994616,104320696,104646736,104972720,105298656,105624552,
+    105950392,106276184,106601928,106927624,107253272,107578872,107904416,108229920,
+    108555368,108880768,109206120,109531416,109856664,110181872,110507016,110832120,
+    111157168,111482168,111807112,112132008,112456856,112781648,113106392,113431080,
+    113755720,114080312,114404848,114729328,115053760,115378136,115702464,116026744,
+    116350960,116675128,116999248,117323312,117647320,117971272,118295176,118619024,
+    118942816,119266560,119590248,119913880,120237456,120560984,120884456,121207864,
+    121531224,121854528,122177784,122500976,122824112,123147200,123470224,123793200,
+    124116120,124438976,124761784,125084528,125407224,125729856,126052432,126374960,
+    126697424,127019832,127342184,127664472,127986712,128308888,128631008,128953072,
+    129275080,129597024,129918912,130240744,130562520,130884232,131205888,131527480,
+    131849016,132170496,132491912,132813272,133134576,133455816,133776992,134098120,
+    134419184,134740176,135061120,135382000,135702816,136023584,136344272,136664912,
+    136985488,137306016,137626464,137946864,138267184,138587456,138907664,139227808,
+    139547904,139867920,140187888,140507776,140827616,141147392,141467104,141786752,
+    142106336,142425856,142745312,143064720,143384048,143703312,144022512,144341664,
+    144660736,144979744,145298704,145617584,145936400,146255168,146573856,146892480,
+    147211040,147529536,147847968,148166336,148484640,148802880,149121056,149439152,
+    149757200,150075168,150393072,150710912,151028688,151346400,151664048,151981616,
+    152299136,152616576,152933952,153251264,153568496,153885680,154202784,154519824,
+    154836784,155153696,155470528,155787296,156104000,156420624,156737200,157053696,
+    157370112,157686480,158002768,158318976,158635136,158951216,159267232,159583168,
+    159899040,160214848,160530592,160846256,161161840,161477376,161792832,162108208,
+    162423520,162738768,163053952,163369040,163684080,163999040,164313936,164628752,
+    164943504,165258176,165572784,165887312,166201776,166516160,166830480,167144736,
+    167458912,167773008,168087040,168400992,168714880,169028688,169342432,169656096,
+    169969696,170283216,170596672,170910032,171223344,171536576,171849728,172162800,
+    172475808,172788736,173101600,173414384,173727104,174039728,174352288,174664784,
+    174977200,175289536,175601792,175913984,176226096,176538144,176850096,177161984,
+    177473792,177785536,178097200,178408784,178720288,179031728,179343088,179654368,
+    179965568,180276704,180587744,180898720,181209616,181520448,181831184,182141856,
+    182452448,182762960,183073408,183383760,183694048,184004240,184314368,184624416,
+    184934400,185244288,185554096,185863840,186173504,186483072,186792576,187102000,
+    187411344,187720608,188029808,188338912,188647936,188956896,189265760,189574560,
+    189883264,190191904,190500448,190808928,191117312,191425632,191733872,192042016,
+    192350096,192658096,192966000,193273840,193581584,193889264,194196848,194504352,
+    194811792,195119136,195426400,195733584,196040688,196347712,196654656,196961520,
+    197268304,197574992,197881616,198188144,198494592,198800960,199107248,199413456,
+    199719584,200025616,200331584,200637456,200943248,201248960,201554576,201860128,
+    202165584,202470960,202776256,203081456,203386592,203691632,203996592,204301472,
+    204606256,204910976,205215600,205520144,205824592,206128960,206433248,206737456,
+    207041584,207345616,207649568,207953424,208257216,208560912,208864512,209168048,
+    209471488,209774832,210078112,210381296,210684384,210987408,211290336,211593184,
+    211895936,212198608,212501184,212803680,213106096,213408432,213710672,214012816,
+    214314880,214616864,214918768,215220576,215522288,215823920,216125472,216426928,
+    216728304,217029584,217330784,217631904,217932928,218233856,218534704,218835472,
+    219136144,219436720,219737216,220037632,220337952,220638192,220938336,221238384,
+    221538352,221838240,222138032,222437728,222737344,223036880,223336304,223635664,
+    223934912,224234096,224533168,224832160,225131072,225429872,225728608,226027232,
+    226325776,226624240,226922608,227220880,227519056,227817152,228115168,228413088,
+    228710912,229008640,229306288,229603840,229901312,230198688,230495968,230793152,
+    231090256,231387280,231684192,231981024,232277760,232574416,232870960,233167440,
+    233463808,233760096,234056288,234352384,234648384,234944304,235240128,235535872,
+    235831504,236127056,236422512,236717888,237013152,237308336,237603424,237898416,
+    238193328,238488144,238782864,239077488,239372016,239666464,239960816,240255072,
+    240549232,240843312,241137280,241431168,241724960,242018656,242312256,242605776,
+    242899200,243192512,243485744,243778896,244071936,244364880,244657744,244950496,
+    245243168,245535744,245828224,246120608,246412912,246705104,246997216,247289216,
+    247581136,247872960,248164688,248456320,248747856,249039296,249330640,249621904,
+    249913056,250204128,250495088,250785968,251076736,251367424,251658016,251948512,
+    252238912,252529200,252819408,253109520,253399536,253689456,253979280,254269008,
+    254558640,254848176,255137632,255426976,255716224,256005376,256294432,256583392,
+    256872256,257161024,257449696,257738272,258026752,258315136,258603424,258891600,
+    259179696,259467696,259755600,260043392,260331104,260618704,260906224,261193632,
+    261480960,261768176,262055296,262342320,262629248,262916080,263202816,263489456,
+    263776000,264062432,264348784,264635024,264921168,265207216,265493168,265779024,
+    266064784,266350448,266636000,266921472,267206832,267492096,267777264,268062336,
+    268347312,268632192,268916960,269201632,269486208,269770688,270055072,270339360,
+    270623552,270907616,271191616,271475488,271759296,272042976,272326560,272610048,
+    272893440,273176736,273459936,273743040,274026048,274308928,274591744,274874432,
+    275157024,275439520,275721920,276004224,276286432,276568512,276850528,277132416,
+    277414240,277695936,277977536,278259040,278540448,278821728,279102944,279384032,
+    279665056,279945952,280226752,280507456,280788064,281068544,281348960,281629248,
+    281909472,282189568,282469568,282749440,283029248,283308960,283588544,283868032,
+    284147424,284426720,284705920,284985024,285264000,285542912,285821696,286100384,
+    286378976,286657440,286935840,287214112,287492320,287770400,288048384,288326240,
+    288604032,288881696,289159264,289436768,289714112,289991392,290268576,290545632,
+    290822592,291099456,291376224,291652896,291929440,292205888,292482272,292758528,
+    293034656,293310720,293586656,293862496,294138240,294413888,294689440,294964864,
+    295240192,295515424,295790560,296065600,296340512,296615360,296890080,297164704,
+    297439200,297713632,297987936,298262144,298536256,298810240,299084160,299357952,
+    299631648,299905248,300178720,300452128,300725408,300998592,301271680,301544640,
+    301817536,302090304,302362976,302635520,302908000,303180352,303452608,303724768,
+    303996800,304268768,304540608,304812320,305083968,305355520,305626944,305898272,
+    306169472,306440608,306711616,306982528,307253344,307524064,307794656,308065152,
+    308335552,308605856,308876032,309146112,309416096,309685984,309955744,310225408,
+    310494976,310764448,311033824,311303072,311572224,311841280,312110208,312379040,
+    312647776,312916416,313184960,313453376,313721696,313989920,314258016,314526016,
+    314793920,315061728,315329408,315597024,315864512,316131872,316399168,316666336,
+    316933408,317200384,317467232,317733984,318000640,318267200,318533632,318799968,
+    319066208,319332352,319598368,319864288,320130112,320395808,320661408,320926912,
+    321192320,321457632,321722816,321987904,322252864,322517760,322782528,323047200,
+    323311744,323576192,323840544,324104800,324368928,324632992,324896928,325160736,
+    325424448,325688096,325951584,326215008,326478304,326741504,327004608,327267584,
+    327530464,327793248,328055904,328318496,328580960,328843296,329105568,329367712,
+    329629760,329891680,330153536,330415264,330676864,330938400,331199808,331461120,
+    331722304,331983392,332244384,332505280,332766048,333026752,333287296,333547776,
+    333808128,334068384,334328544,334588576,334848512,335108352,335368064,335627712,
+    335887200,336146624,336405920,336665120,336924224,337183200,337442112,337700864,
+    337959552,338218112,338476576,338734944,338993184,339251328,339509376,339767296,
+    340025120,340282848,340540480,340797984,341055392,341312704,341569888,341826976,
+    342083968,342340832,342597600,342854272,343110848,343367296,343623648,343879904,
+    344136032,344392064,344648000,344903808,345159520,345415136,345670656,345926048,
+    346181344,346436512,346691616,346946592,347201440,347456224,347710880,347965440,
+    348219872,348474208,348728448,348982592,349236608,349490528,349744320,349998048,
+    350251648,350505152,350758528,351011808,351264992,351518048,351771040,352023872,
+    352276640,352529280,352781824,353034272,353286592,353538816,353790944,354042944,
+    354294880,354546656,354798368,355049952,355301440,355552800,355804096,356055264,
+    356306304,356557280,356808128,357058848,357309504,357560032,357810464,358060768,
+    358311008,358561088,358811104,359060992,359310784,359560480,359810048,360059520,
+    360308896,360558144,360807296,361056352,361305312,361554144,361802880,362051488,
+    362300032,362548448,362796736,363044960,363293056,363541024,363788928,364036704,
+    364284384,364531936,364779392,365026752,365274016,365521152,365768192,366015136,
+    366261952,366508672,366755296,367001792,367248192,367494496,367740704,367986784,
+    368232768,368478656,368724416,368970080,369215648,369461088,369706432,369951680,
+    370196800,370441824,370686752,370931584,371176288,371420896,371665408,371909792,
+    372154080,372398272,372642336,372886304,373130176,373373952,373617600,373861152,
+    374104608,374347936,374591168,374834304,375077312,375320224,375563040,375805760,
+    376048352,376290848,376533248,376775520,377017696,377259776,377501728,377743584,
+    377985344,378227008,378468544,378709984,378951328,379192544,379433664,379674688,
+    379915584,380156416,380397088,380637696,380878176,381118560,381358848,381599040,
+    381839104,382079072,382318912,382558656,382798304,383037856,383277280,383516640,
+    383755840,383994976,384233984,384472896,384711712,384950400,385188992,385427488,
+    385665888,385904160,386142336,386380384,386618368,386856224,387093984,387331616,
+    387569152,387806592,388043936,388281152,388518272,388755296,388992224,389229024,
+    389465728,389702336,389938816,390175200,390411488,390647680,390883744,391119712,
+    391355584,391591328,391826976,392062528,392297984,392533312,392768544,393003680,
+    393238720,393473632,393708448,393943168,394177760,394412256,394646656,394880960,
+    395115136,395349216,395583200,395817088,396050848,396284512,396518080,396751520,
+    396984864,397218112,397451264,397684288,397917248,398150080,398382784,398615424,
+    398847936,399080320,399312640,399544832,399776928,400008928,400240832,400472608,
+    400704288,400935872,401167328,401398720,401629984,401861120,402092192,402323136,
+    402553984,402784736,403015360,403245888,403476320,403706656,403936896,404167008,
+    404397024,404626944,404856736,405086432,405316032,405545536,405774912,406004224,
+    406233408,406462464,406691456,406920320,407149088,407377760,407606336,407834784,
+    408063136,408291392,408519520,408747584,408975520,409203360,409431072,409658720,
+    409886240,410113664,410340992,410568192,410795296,411022304,411249216,411476032,
+    411702720,411929312,412155808,412382176,412608480,412834656,413060736,413286720,
+    413512576,413738336,413964000,414189568,414415040,414640384,414865632,415090784,
+    415315840,415540800,415765632,415990368,416215008,416439552,416663968,416888288,
+    417112512,417336640,417560672,417784576,418008384,418232096,418455712,418679200,
+    418902624,419125920,419349120,419572192,419795200,420018080,420240864,420463552,
+    420686144,420908608,421130976,421353280,421575424,421797504,422019488,422241344,
+    422463104,422684768,422906336,423127776,423349120,423570400,423791520,424012576,
+    424233536,424454368,424675104,424895744,425116288,425336736,425557056,425777280,
+    425997408,426217440,426437376,426657184,426876928,427096544,427316064,427535488,
+    427754784,427974016,428193120,428412128,428631040,428849856,429068544,429287168,
+    429505664,429724064,429942368,430160576,430378656,430596672,430814560,431032352,
+    431250048,431467616,431685120,431902496,432119808,432336992,432554080,432771040,
+    432987936,433204736,433421408,433637984,433854464,434070848,434287104,434503296,
+    434719360,434935360,435151232,435367008,435582656,435798240,436013696,436229088,
+    436444352,436659520,436874592,437089568,437304416,437519200,437733856,437948416,
+    438162880,438377248,438591520,438805696,439019744,439233728,439447584,439661344,
+    439875008,440088576,440302048,440515392,440728672,440941824,441154880,441367872,
+    441580736,441793472,442006144,442218720,442431168,442643552,442855808,443067968,
+    443280032,443492000,443703872,443915648,444127296,444338880,444550336,444761696,
+    444972992,445184160,445395232,445606176,445817056,446027840,446238496,446449088,
+    446659552,446869920,447080192,447290400,447500448,447710432,447920320,448130112,
+    448339776,448549376,448758848,448968224,449177536,449386720,449595808,449804800,
+    450013664,450222464,450431168,450639776,450848256,451056640,451264960,451473152,
+    451681248,451889248,452097152,452304960,452512672,452720288,452927808,453135232,
+    453342528,453549760,453756864,453963904,454170816,454377632,454584384,454791008,
+    454997536,455203968,455410304,455616544,455822688,456028704,456234656,456440512,
+    456646240,456851904,457057472,457262912,457468256,457673536,457878688,458083744,
+    458288736,458493600,458698368,458903040,459107616,459312096,459516480,459720768,
+    459924960,460129056,460333056,460536960,460740736,460944448,461148064,461351584,
+    461554976,461758304,461961536,462164640,462367680,462570592,462773440,462976160,
+    463178816,463381344,463583776,463786144,463988384,464190560,464392608,464594560,
+    464796448,464998208,465199872,465401472,465602944,465804320,466005600,466206816,
+    466407904,466608896,466809824,467010624,467211328,467411936,467612480,467812896,
+    468013216,468213440,468413600,468613632,468813568,469013440,469213184,469412832,
+    469612416,469811872,470011232,470210528,470409696,470608800,470807776,471006688,
+    471205472,471404192,471602784,471801312,471999712,472198048,472396288,472594400,
+    472792448,472990400,473188256,473385984,473583648,473781216,473978688,474176064,
+    474373344,474570528,474767616,474964608,475161504,475358336,475555040,475751648,
+    475948192,476144608,476340928,476537184,476733312,476929376,477125344,477321184,
+    477516960,477712640,477908224,478103712,478299104,478494400,478689600,478884704,
+    479079744,479274656,479469504,479664224,479858880,480053408,480247872,480442240,
+    480636512,480830656,481024736,481218752,481412640,481606432,481800128,481993760,
+    482187264,482380704,482574016,482767264,482960416,483153472,483346432,483539296,
+    483732064,483924768,484117344,484309856,484502240,484694560,484886784,485078912,
+    485270944,485462880,485654720,485846464,486038144,486229696,486421184,486612576,
+    486803840,486995040,487186176,487377184,487568096,487758912,487949664,488140320,
+    488330880,488521312,488711712,488901984,489092160,489282240,489472256,489662176,
+    489851968,490041696,490231328,490420896,490610336,490799712,490988960,491178144,
+    491367232,491556224,491745120,491933920,492122656,492311264,492499808,492688256,
+    492876608,493064864,493253056,493441120,493629120,493817024,494004832,494192544,
+    494380160,494567712,494755136,494942496,495129760,495316928,495504000,495691008,
+    495877888,496064704,496251424,496438048,496624608,496811040,496997408,497183680,
+    497369856,497555936,497741920,497927840,498113632,498299360,498484992,498670560,
+    498856000,499041376,499226656,499411840,499596928,499781920,499966848,500151680,
+    500336416,500521056,500705600,500890080,501074464,501258752,501442944,501627040,
+    501811072,501995008,502178848,502362592,502546240,502729824,502913312,503096704,
+    503280000,503463232,503646368,503829408,504012352,504195200,504377984,504560672,
+    504743264,504925760,505108192,505290496,505472736,505654912,505836960,506018944,
+    506200832,506382624,506564320,506745952,506927488,507108928,507290272,507471552,
+    507652736,507833824,508014816,508195744,508376576,508557312,508737952,508918528,
+    509099008,509279392,509459680,509639904,509820032,510000064,510180000,510359872,
+    510539648,510719328,510898944,511078432,511257856,511437216,511616448,511795616,
+    511974688,512153664,512332576,512511392,512690112,512868768,513047296,513225792,
+    513404160,513582432,513760640,513938784,514116800,514294752,514472608,514650368,
+    514828064,515005664,515183168,515360608,515537952,515715200,515892352,516069440,
+    516246432,516423328,516600160,516776896,516953536,517130112,517306592,517482976,
+    517659264,517835488,518011616,518187680,518363648,518539520,518715296,518891008,
+    519066624,519242144,519417600,519592960,519768256,519943424,520118528,520293568,
+    520468480,520643328,520818112,520992800,521167392,521341888,521516320,521690656,
+    521864896,522039072,522213152,522387168,522561056,522734912,522908640,523082304,
+    523255872,523429376,523602784,523776096,523949312,524122464,524295552,524468512,
+    524641440,524814240,524986976,525159616,525332192,525504640,525677056,525849344,
+    526021568,526193728,526365792,526537760,526709632,526881440,527053152,527224800,
+    527396352,527567840,527739200,527910528,528081728,528252864,528423936,528594880,
+    528765760,528936576,529107296,529277920,529448480,529618944,529789344,529959648,
+    530129856,530300000,530470048,530640000,530809888,530979712,531149440,531319072,
+    531488608,531658080,531827488,531996800,532166016,532335168,532504224,532673184,
+    532842080,533010912,533179616,533348288,533516832,533685312,533853728,534022048,
+    534190272,534358432,534526496,534694496,534862400,535030240,535197984,535365632,
+    535533216,535700704,535868128,536035456,536202720,536369888,536536992,536704000,
+    536870912
+};
+
+
+} // namespace vpo
+
diff --git a/Source/Plugins/vpo_dll/tables.h b/Source/Plugins/vpo_dll/tables.h
new file mode 100644
index 0000000..baf785c
--- /dev/null
+++ b/Source/Plugins/vpo_dll/tables.h
@@ -0,0 +1,94 @@
+// Emacs style mode select   -*- C++ -*- 
+//-----------------------------------------------------------------------------
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005 Simon Howard
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+// 02111-1307, USA.
+//
+// DESCRIPTION:
+//	Lookup tables.
+//	Do not try to look them up :-).
+//	In the order of appearance: 
+//
+//	int finetangent[4096]	- Tangens LUT.
+//	 Should work with BAM fairly well (12 of 16bit,
+//      effectively, by shifting).
+//
+//	int finesine[10240]		- Sine lookup.
+//	 Guess what, serves as cosine, too.
+//	 Remarkable thing is, how to use BAMs with this? 
+//
+//	int tantoangle[2049]	- ArcTan LUT,
+//	  maps tan(angle) to angle fast. Gotta search.	
+//    
+//-----------------------------------------------------------------------------
+
+
+#ifndef __TABLES__
+#define __TABLES__
+
+
+
+#include "m_fixed.h"
+	
+#define FINEANGLES		8192
+#define FINEMASK		(FINEANGLES-1)
+
+
+// 0x100000000 to 0x2000
+#define ANGLETOFINESHIFT	19		
+
+// Effective size is 10240.
+extern const fixed_t finesine[5*FINEANGLES/4];
+
+// Re-use data, is just PI/2 pahse shift.
+extern const fixed_t *finecosine;
+
+
+// Effective size is 4096.
+extern const fixed_t finetangent[FINEANGLES/2];
+
+// Binary Angle Measument, BAM.
+#define ANG45			0x20000000
+#define ANG90			0x40000000
+#define ANG180		0x80000000
+#define ANG270		0xc0000000
+
+
+#define SLOPERANGE		2048
+#define SLOPEBITS		11
+#define DBITS			(FRACBITS-SLOPEBITS)
+
+typedef unsigned angle_t;
+
+
+// Effective size is 2049;
+// The +1 size is to handle the case when x==y
+//  without additional checking.
+extern const angle_t tantoangle[SLOPERANGE+1];
+
+
+// Utility function,
+//  called by R_PointToAngle.
+int
+SlopeDiv
+( unsigned	num,
+  unsigned	den);
+
+
+#endif
+
diff --git a/Source/Plugins/vpo_dll/vpo_api.h b/Source/Plugins/vpo_dll/vpo_api.h
new file mode 100644
index 0000000..1fd149a
--- /dev/null
+++ b/Source/Plugins/vpo_dll/vpo_api.h
@@ -0,0 +1,98 @@
+//------------------------------------------------------------------------
+//  Visplane Overflow Library
+//------------------------------------------------------------------------
+//
+//  Copyright (C) 1993-1996 Id Software, Inc.
+//  Copyright (C) 2005      Simon Howard
+//  Copyright (C) 2012-2014 Andrew Apted
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 2
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//------------------------------------------------------------------------
+
+#ifndef __VPO_API_H__
+#define __VPO_API_H__
+
+
+// return error message when something fails
+// (this will be a static buffer, so is not guaranteed to remain valid
+//  after any other API call)
+const char *VPO_GetError(void);
+
+// try to load a wad file
+// returns 0 on success, negative value on error
+int VPO_LoadWAD(const char *wad_filename);
+
+// free all data associated with the wad file
+// can be safely called without any loaded wad file
+void VPO_FreeWAD(void);
+
+// retrieve the map names in the wad, one at a time
+// index starts at 0
+// returns NULL when index is past the end of the list
+// NOTE: return pointer is a static buffer, and is NOT guaranteed to
+//       remain valid once this function is called again
+const char * VPO_GetMapName(unsigned int index, bool *is_hexen = NULL);
+
+// try to open a map from the current wad file
+// returns 0 on success, negative value on error
+int VPO_OpenMap(const char *map_name, bool *is_hexen = NULL);
+
+// free all data associated with a map
+// can be safely called without any opened map
+void VPO_CloseMap(void);
+
+// retrieve the linedefs in the current map, one at a time
+// index starts at 0
+// returns number of sides (0 to 2), or -1 for invalid index
+int VPO_GetLinedef(unsigned int index, int *x1, int *y1, int *x2, int *y2);
+
+// retrieve a seg for the current map
+// index starts at 0
+// side value will be 0 for front/right, 1 for back/left
+// returns a value >= 0 if valid, otherwise -1
+int VPO_GetSeg(unsigned int index, int *linedef, int *side,
+               int *x1, int *y1, int *x2, int *y2);
+
+// retrieve the bounding box of the map
+void VPO_GetBBox(int *x1, int *y1, int *x2, int *y2);
+
+// open or close all sectors which seem to be doors
+// dir must be > 0 to open them, or -1 to close them
+void VPO_OpenDoorSectors(int dir);
+
+// test a spot and angle, returning the number of visplanes
+// dz is the height above the floor (or offset from ceiling if < 0)
+// angle is in degrees (0 to 360), 0 is east, 90 is north
+// returns RESULT_OK on success, or a negative value spot was in the
+// void or an error occurred -- see the RESULT_* values below
+//
+// the num_xxx parameters point to variables which get _updated_ by
+// this call (i.e. new value is maximum of old value + checked value).
+// hence you need to set those variables to zero before the first
+// call at a particular (X Y) location.
+//
+// RESULT_OVERFLOW means that an internal limit overflowed (which are
+// four times or more the actual DOOM limits).
+
+#define RESULT_OK         0
+#define RESULT_BAD_Z     -1
+#define RESULT_IN_VOID   -2
+#define RESULT_OVERFLOW  -3
+
+int VPO_TestSpot(int x, int y, int dz, int angle,
+                 int *num_visplanes,
+                 int *num_drawsegs,
+                 int *num_openings,
+                 int *num_solidsegs);
+
+#endif  /* __VPO_API_H__ */
+
diff --git a/Source/Plugins/vpo_dll/vpo_dll.vcproj b/Source/Plugins/vpo_dll/vpo_dll.vcproj
new file mode 100644
index 0000000..23cf6be
--- /dev/null
+++ b/Source/Plugins/vpo_dll/vpo_dll.vcproj
@@ -0,0 +1,326 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="vpo_dll"
+	ProjectGUID="{29C8D76F-DE3D-482D-AD7D-B86BBD0824DE}"
+	RootNamespace="vpo_dll"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)\Source\Plugins\VisplaneExplorer\Resources"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\vpo.dll"
+				ModuleDefinitionFile="exports.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				FixedBaseAddress="1"
+				SupportUnloadOfDelayLoadedDLL="true"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)\Source\Plugins\VisplaneExplorer\Resources"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="4"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)&quot;"
+				PreprocessorDefinitions="WIN32;_RELEASE;_WINDOWS;_USRDLL"
+				RuntimeLibrary="2"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="true"
+				EnableEnhancedInstructionSet="2"
+				FloatingPointModel="2"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\vpo.dll"
+				ModuleDefinitionFile="exports.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				OptimizeForWindows98="1"
+				FixedBaseAddress="1"
+				SupportUnloadOfDelayLoadedDLL="true"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath=".\m_bbox.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\m_fixed.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\p_setup.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\r_bsp.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\r_main.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\r_plane.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\r_segs.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\tables.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\vpo_main.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\vpo_stuff.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\w_file.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\w_wad.cc"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\doomdata.h"
+				>
+			</File>
+			<File
+				RelativePath=".\doomdef.h"
+				>
+			</File>
+			<File
+				RelativePath=".\doomtype.h"
+				>
+			</File>
+			<File
+				RelativePath=".\exports.def"
+				>
+			</File>
+			<File
+				RelativePath=".\inttypes.h"
+				>
+			</File>
+			<File
+				RelativePath=".\m_bbox.h"
+				>
+			</File>
+			<File
+				RelativePath=".\m_fixed.h"
+				>
+			</File>
+			<File
+				RelativePath=".\r_bsp.h"
+				>
+			</File>
+			<File
+				RelativePath=".\r_defs.h"
+				>
+			</File>
+			<File
+				RelativePath=".\r_main.h"
+				>
+			</File>
+			<File
+				RelativePath=".\r_plane.h"
+				>
+			</File>
+			<File
+				RelativePath=".\r_state.h"
+				>
+			</File>
+			<File
+				RelativePath=".\stdint.h"
+				>
+			</File>
+			<File
+				RelativePath=".\sys_endian.h"
+				>
+			</File>
+			<File
+				RelativePath=".\sys_macro.h"
+				>
+			</File>
+			<File
+				RelativePath=".\sys_type.h"
+				>
+			</File>
+			<File
+				RelativePath=".\tables.h"
+				>
+			</File>
+			<File
+				RelativePath=".\vpo_api.h"
+				>
+			</File>
+			<File
+				RelativePath=".\vpo_local.h"
+				>
+			</File>
+			<File
+				RelativePath=".\w_file.h"
+				>
+			</File>
+			<File
+				RelativePath=".\w_wad.h"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/Source/Plugins/vpo_dll/vpo_local.h b/Source/Plugins/vpo_dll/vpo_local.h
new file mode 100644
index 0000000..d503c03
--- /dev/null
+++ b/Source/Plugins/vpo_dll/vpo_local.h
@@ -0,0 +1,78 @@
+//------------------------------------------------------------------------
+//  Visplane Overflow Library
+//------------------------------------------------------------------------
+//
+//  Copyright (C) 1993-1996 Id Software, Inc.
+//  Copyright (C) 2005 Simon Howard
+//  Copyright (C) 2012 Andrew Apted
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 2
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//------------------------------------------------------------------------
+
+#ifndef __VPO_LOCAL_H__
+#define __VPO_LOCAL_H__
+
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <math.h>
+
+#include "sys_type.h"
+#include "sys_macro.h"
+#include "sys_endian.h"
+
+namespace vpo
+{
+
+#include "doomtype.h"
+#include "doomdef.h"
+#include "doomdata.h"
+
+#include "m_bbox.h"
+#include "m_fixed.h"
+
+#include "w_file.h"
+#include "w_wad.h"
+
+#include "tables.h"
+#include "r_defs.h"
+#include "r_state.h"
+
+#include "r_main.h"
+#include "r_bsp.h"
+#include "r_plane.h"
+
+
+//------------------------------------------------------------
+
+#define SHORT(x)  LE_S16(x)
+#define LONG(x)   LE_S32(x)
+
+const char * P_SetupLevel (const char *lumpname, bool *is_hexen );
+void P_FreeLevelData (void);
+
+void I_Error (const char *error, ...);
+
+sector_t * X_SectorForPoint(fixed_t x, fixed_t y);
+
+// exceptions thrown on overflows
+class overflow_exception { };
+
+} // namespace vpo
+
+
+#endif  /* __VPO_LOCAL_H__ */
+
+//--- editor settings ---
+// vi:ts=4:sw=4:noexpandtab
diff --git a/Source/Plugins/vpo_dll/vpo_main.cc b/Source/Plugins/vpo_dll/vpo_main.cc
new file mode 100644
index 0000000..f3106a7
--- /dev/null
+++ b/Source/Plugins/vpo_dll/vpo_main.cc
@@ -0,0 +1,369 @@
+//------------------------------------------------------------------------
+//  Visplane Overflow Library
+//------------------------------------------------------------------------
+//
+//  Copyright (C) 1993-1996 Id Software, Inc.
+//  Copyright (C) 2005      Simon Howard
+//  Copyright (C) 2012-2014 Andrew Apted
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 2
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//------------------------------------------------------------------------
+
+#include "vpo_local.h"
+#include "vpo_api.h"
+
+
+static char error_buffer[1024];
+
+// cache for the sector lookup
+static int last_x, last_y;
+static vpo::sector_t *last_sector;
+
+
+static void ClearError(void)
+{
+	strcpy(error_buffer, "(No Error)");
+}
+
+static void SetError(const char *msg, ...)
+{
+	va_list argptr;
+
+	va_start(argptr, msg);
+	memset(error_buffer, 0, sizeof(error_buffer));
+	vsnprintf(error_buffer, sizeof(error_buffer) - 1, msg, argptr);
+	va_end(argptr);
+}
+
+
+const char *VPO_GetError(void)
+{
+	return error_buffer;
+}
+
+
+//------------------------------------------------------------------------
+
+int VPO_LoadWAD(const char *wad_filename)
+{
+	ClearError();
+
+	// free any previously loaded wad
+	VPO_FreeWAD();
+
+	vpo::R_Init();
+
+	if (! vpo::W_AddFile(wad_filename))
+	{
+		SetError("Missing or invalid wad file: %s", wad_filename);
+		return -1;
+	}
+
+	return 0;  // OK !
+}
+
+
+int VPO_OpenMap(const char *map_name, bool *is_hexen)
+{
+	// check a wad is loaded
+	if (vpo::numlumps <= 0)
+	{
+		SetError("VPO_OpenMap called without any loaded wad");
+		return -1;
+	}
+
+	ClearError();
+
+	// close any previously loaded map
+	VPO_CloseMap();
+
+	const char *err_msg = vpo::P_SetupLevel(map_name, is_hexen);
+
+	if (err_msg)
+	{
+		SetError("%s", err_msg);
+		return -1;
+	}
+
+	return 0;  // OK !
+}
+
+
+void VPO_FreeWAD(void)
+{
+	VPO_CloseMap();
+
+	vpo::W_RemoveFile();
+}
+
+
+void VPO_CloseMap(void)
+{
+	ClearError();
+
+	last_x = -77777;
+	last_y = -77777;
+	last_sector = NULL;
+
+	vpo::P_FreeLevelData();
+}
+
+
+const char * VPO_GetMapName(unsigned int index, bool *is_hexen)
+{
+	static char buffer[16];
+
+	for (int lump_i = 0 ; lump_i < vpo::numlumps ; lump_i++)
+	{
+		if (! vpo::lumpinfo[lump_i].is_map_header)
+			continue;
+
+		if (index == 0)
+		{
+			// found it
+			memcpy(buffer, vpo::lumpinfo[lump_i].name, 8);
+			buffer[8] = 0;
+
+			if (is_hexen)
+				*is_hexen = vpo::lumpinfo[lump_i].is_hexen;
+
+			return buffer;
+		}
+		
+		index--;
+	}
+
+	// not found
+	return NULL;
+}
+
+
+int VPO_GetLinedef(unsigned int index, int *x1, int *y1, int *x2, int *y2)
+{
+	if (index >= (unsigned int)vpo::numlines)
+		return -1;
+
+	const vpo::line_t *L = &vpo::lines[index];
+
+	*x1 = L->v1->x >> FRACBITS;
+	*y1 = L->v1->y >> FRACBITS;
+
+	*x2 = L->v2->x >> FRACBITS;
+	*y2 = L->v2->y >> FRACBITS;
+
+	return L->backsector ? 2 : 1;
+}
+
+
+int VPO_GetSeg(unsigned int index, int *linedef, int *side,
+               int *x1, int *y1, int *x2, int *y2)
+{
+	if (index >= (unsigned int)vpo::numsegs)
+		return -1;
+	
+	const vpo::seg_t *seg = &vpo::segs[index];
+	const vpo::line_t *L  = seg->linedef;
+
+	*x1 = seg->v1->x >> FRACBITS;
+	*y1 = seg->v1->y >> FRACBITS;
+
+	*x2 = seg->v2->x >> FRACBITS;
+	*y2 = seg->v2->y >> FRACBITS;
+
+	*linedef = (L - vpo::lines);
+	*side = 0;
+
+	if (L->sidenum[1] >= 0 && seg->sidedef == &vpo::sides[L->sidenum[1]])
+		*side = 1;
+
+	return 0;
+}
+
+
+void VPO_GetBBox(int *x1, int *y1, int *x2, int *y2)
+{
+	*x1 = (vpo::Map_bbox[vpo::BOXLEFT]   >> FRACBITS);
+	*y1 = (vpo::Map_bbox[vpo::BOXBOTTOM] >> FRACBITS);
+	*x2 = (vpo::Map_bbox[vpo::BOXRIGHT]  >> FRACBITS);
+	*y2 = (vpo::Map_bbox[vpo::BOXTOP]    >> FRACBITS);
+}
+
+
+void VPO_OpenDoorSectors(int dir)
+{
+	for (int i = 0 ; i < vpo::numsectors ; i++)
+	{
+		vpo::sector_t *sec = &vpo::sectors[i];
+
+		if (sec->is_door == 0)
+			continue;
+
+		if (dir > 0)  // open them
+		{
+			if (sec->is_door > 0)
+				sec->ceilingheight = sec->alt_height;
+			else
+				sec->floorheight = sec->alt_height;
+		}
+		else if (dir < 0)  // close them
+		{
+			if (sec->is_door > 0)
+				sec->ceilingheight = sec->floorheight;
+			else
+				sec->floorheight = sec->ceilingheight;
+		}
+	}
+}
+
+
+//------------------------------------------------------------------------
+
+int VPO_TestSpot(int x, int y, int dz, int angle,
+                 int *num_visplanes, int *num_drawsegs,
+                 int *num_openings,  int *num_solidsegs)
+{
+	// the actual spot we will use
+	// (this prevents issues with X_SectorForPoint getting the wrong
+	//  value when the casted ray hits a vertex)
+	vpo::fixed_t rx = (x << FRACBITS) + (FRACUNIT / 2);
+	vpo::fixed_t ry = (y << FRACBITS) + (FRACUNIT / 2);
+
+	// check if spot is outside the map
+	if (rx < vpo::Map_bbox[vpo::BOXLEFT]   ||
+	    rx > vpo::Map_bbox[vpo::BOXRIGHT]  ||
+	    ry < vpo::Map_bbox[vpo::BOXBOTTOM] ||
+		ry > vpo::Map_bbox[vpo::BOXTOP])
+	{
+		return RESULT_IN_VOID;
+	}
+
+	// optimization: we cache the last sector lookup
+	vpo::sector_t *sec;
+
+	if (x == last_x && y == last_y)
+		sec = last_sector;
+	else
+	{
+		sec = vpo::X_SectorForPoint(rx, ry);
+
+		last_x = x;
+		last_y = y;
+		last_sector = sec;
+	}
+
+	if (! sec)
+		return RESULT_IN_VOID;
+	
+	vpo::fixed_t rz;
+	
+	if (dz < 0)
+		rz = sec->ceilingheight + (dz << FRACBITS);
+	else
+		rz = sec->floorheight + (dz << FRACBITS);
+
+	if (rz <= sec->floorheight || rz >= sec->ceilingheight)
+		return RESULT_BAD_Z;
+
+	// convert angle to the 32-bit BAM representation
+	if (angle == 360)
+		angle = 0;
+
+	vpo::fixed_t ang2 = vpo::FixedDiv(angle << FRACBITS, 360 << FRACBITS);
+
+	vpo::angle_t r_ang = (vpo::angle_t) (ang2 << 16);
+
+	int result = RESULT_OK;
+
+	// perform a no-draw render and see how many visplanes were needed
+	try
+	{
+		vpo::R_RenderView(rx, ry, rz, r_ang);
+	}
+	catch (vpo::overflow_exception& e)
+	{
+		result = RESULT_OVERFLOW;
+	}
+
+	*num_visplanes = MAX(*num_visplanes, vpo::total_visplanes);
+	*num_drawsegs  = MAX(*num_drawsegs,  vpo::total_drawsegs);
+	*num_openings  = MAX(*num_openings,  vpo::total_openings);
+	*num_solidsegs = MAX(*num_solidsegs, vpo::max_solidsegs);
+
+	return result;
+}
+
+
+//------------------------------------------------------------------------
+
+#if 0 // VPO_TEST_PROGRAM
+
+// NOTE: this is out of date and will not compile
+
+#define EYE_HEIGHT  41
+
+int main(int argc, char **argv)
+{
+	printf("----------------\n");
+	printf("VPO TEST PROGRAM\n");
+	printf("----------------\n");
+	printf("\n");
+
+	if (argc < 5 ||
+	    (strcmp (argv[1], "-h") == 0 ||
+	     strcmp (argv[1], "--help") == 0 ||
+	     strcmp (argv[1], "/?") == 0) )
+	{
+		printf("Usage: vpotest file.wad MAP01 x y angle\n");
+		fflush(stdout);
+		return 0;
+	}
+
+	const char *filename = argv[1];
+	const char *map = argv[2];
+
+	int x = atoi(argv[3]);
+	int y = atoi(argv[4]);
+	int angle = atoi(argv[5]);
+
+	printf("Loading file: %s [%s]\n", filename, map);
+
+	if (VPO_LoadWAD(filename) != 0)
+	{
+		printf("ERROR: %s\n", VPO_GetError());
+		fflush(stdout);
+		return 1;
+	}
+
+	if (VPO_OpenMap(map) != 0)
+	{
+		printf("ERROR: %s\n", VPO_GetError());
+		fflush(stdout);
+		VPO_FreeWAD();
+		return 1;
+	}
+
+	int vp_num = VPO_TestSpot(TEST_VISPLANES, x, y, EYE_HEIGHT, angle);
+
+	printf("\n");
+	printf("Visplanes @ (%d %d) ---> %d\n", x, y, vp_num);
+	fflush(stdout);
+
+	VPO_CloseMap();
+	VPO_FreeWAD();
+
+	return 0;
+}
+
+#endif // VPO_TEST_PROGRAM
+
+//--- editor settings ---
+// vi:ts=4:sw=4:noexpandtab
diff --git a/Source/Plugins/vpo_dll/vpo_stuff.cc b/Source/Plugins/vpo_dll/vpo_stuff.cc
new file mode 100644
index 0000000..f4d8bb7
--- /dev/null
+++ b/Source/Plugins/vpo_dll/vpo_stuff.cc
@@ -0,0 +1,113 @@
+//------------------------------------------------------------------------
+//  VPO_LIB : misc stuff
+//------------------------------------------------------------------------
+//
+//  Copyright (C) 1993-1996 Id Software, Inc.
+//  Copyright (C) 2005 Simon Howard
+//  Copyright (C) 2012 Andrew Apted
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 2
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//------------------------------------------------------------------------
+
+#include "vpo_local.h"
+
+namespace vpo
+{
+
+
+void I_Error (const char *error, ...)
+{
+	va_list	argptr;
+
+	va_start(argptr, error);
+	vfprintf(stderr, error, argptr);
+	va_end(argptr);
+
+	fprintf(stderr, "\n\n");
+	fflush(stderr);
+
+	exit(-1);
+}
+
+
+static int ClosestLine_CastingHoriz(fixed_t x, fixed_t y, int *side)
+{
+	int     best_match = -1;
+	fixed_t best_dist  = 32000 << FRACBITS;
+
+	for (int n = 0 ; n < numlines ; n++)
+	{
+		fixed_t ly1 = lines[n].v1->y;
+		fixed_t ly2 = lines[n].v2->y;
+
+		// ignore purely horizontal lines
+		if (ly1 == ly2)
+			continue;
+
+		// does the linedef cross the horizontal ray?
+		if ( (y < ly1) && (y < ly2) ) continue;
+		if ( (y > ly1) && (y > ly2) ) continue;
+
+		fixed_t lx1 = lines[n].v1->x;
+		fixed_t lx2 = lines[n].v2->x;
+
+		fixed_t quot = FixedDiv(y - ly1, ly2 - ly1);
+		fixed_t dist = lx1 - x + FixedMul(lx2 - lx1, quot);
+
+		if (abs(dist) < best_dist)
+		{
+			best_match = n;
+			best_dist  = abs(dist);
+
+			if (side)
+			{
+				if (best_dist < FRACUNIT / 8)
+					*side = 0;  // on the line
+				else if ( (ly1 > ly2) == (dist > 0))
+					*side = 1;  // right side
+				else
+					*side = -1; // left side
+			}
+		}
+	}
+
+	return best_match;
+}
+
+
+sector_t * X_SectorForPoint(fixed_t x, fixed_t y)
+{
+	/* hack, hack...  I look for the first LineDef crossing
+	   an horizontal half-line drawn from the cursor */
+
+	int sd = 0;
+	int ld = ClosestLine_CastingHoriz(x, y, &sd);
+
+	// VOID checks
+	if (ld < 0)
+		return NULL;
+
+	if (lines[ld].sidenum[sd <= 0 ? 1 : 0] < 0)
+		return NULL;
+	
+	// get sector as DOOM would
+	// (need this to handle self-referencing linedef tricks)
+	subsector_t *sub = R_PointInSubsector(x, y); 
+
+	return sub->sector;
+}
+
+
+} // namespace vpo
+
+//--- editor settings ---
+// vi:ts=4:sw=4:noexpandtab
diff --git a/Source/Plugins/vpo_dll/w_file.cc b/Source/Plugins/vpo_dll/w_file.cc
new file mode 100644
index 0000000..76d6d44
--- /dev/null
+++ b/Source/Plugins/vpo_dll/w_file.cc
@@ -0,0 +1,85 @@
+// Emacs style mode select   -*- C++ -*- 
+//-----------------------------------------------------------------------------
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2008 Simon Howard
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+// 02111-1307, USA.
+//
+// DESCRIPTION:
+//	WAD I/O functions.
+//
+//-----------------------------------------------------------------------------
+
+#include "vpo_local.h"
+
+namespace vpo
+{
+
+
+wad_file_t *W_OpenFile(const char *path)
+{
+    wad_file_t *result;
+
+    FILE *fstream = fopen(path, "rb");
+
+    if (fstream == NULL)
+    {
+        return NULL;
+    }
+
+    // Create a new wad_file_t to hold the file handle.
+
+    result = new wad_file_t;
+
+    result->fstream = fstream;
+
+//    result->length = M_FileLength(fstream);
+
+    return result;
+}
+
+
+void W_CloseFile(wad_file_t *wad)
+{
+    fclose(wad->fstream);
+
+    delete wad;
+}
+
+
+// Read data from the specified position in the file into the 
+// provided buffer.  Returns the number of bytes read.
+
+size_t W_Read(wad_file_t *wad, unsigned int offset,
+              void *buffer, size_t buffer_len)
+{
+    size_t result;
+
+    // Jump to the specified position in the file.
+
+    fseek(wad->fstream, offset, SEEK_SET);
+
+    // Read into the buffer.
+
+    result = fread(buffer, 1, buffer_len, wad->fstream);
+
+    return result;
+}
+
+
+} // namespace vpo
+
diff --git a/Source/Plugins/vpo_dll/w_file.h b/Source/Plugins/vpo_dll/w_file.h
new file mode 100644
index 0000000..dba21d8
--- /dev/null
+++ b/Source/Plugins/vpo_dll/w_file.h
@@ -0,0 +1,55 @@
+// Emacs style mode select   -*- C++ -*- 
+//-----------------------------------------------------------------------------
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2008 Simon Howard
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+// 02111-1307, USA.
+//
+// DESCRIPTION:
+//	WAD I/O functions.
+//
+//-----------------------------------------------------------------------------
+
+#ifndef __W_FILE__
+#define __W_FILE__
+
+#include <stdio.h>
+#include "doomtype.h"
+
+typedef struct _wad_file_s
+{
+    FILE *fstream;
+
+} wad_file_t;
+
+// Open the specified file. Returns a pointer to a new wad_file_t 
+// handle for the WAD file, or NULL if it could not be opened.
+
+wad_file_t *W_OpenFile(const char *path);
+
+// Close the specified WAD file.
+
+void W_CloseFile(wad_file_t *wad);
+
+// Read data from the specified file into the provided buffer.  The
+// data is read from the specified offset from the start of the file.
+// Returns the number of bytes read.
+
+size_t W_Read(wad_file_t *wad, unsigned int offset,
+              void *buffer, size_t buffer_len);
+
+#endif /* #ifndef __W_FILE__ */
diff --git a/Source/Plugins/vpo_dll/w_wad.cc b/Source/Plugins/vpo_dll/w_wad.cc
new file mode 100644
index 0000000..d5a1547
--- /dev/null
+++ b/Source/Plugins/vpo_dll/w_wad.cc
@@ -0,0 +1,366 @@
+//-----------------------------------------------------------------------------
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005 Simon Howard
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+// 02111-1307, USA.
+//
+// DESCRIPTION:
+//	Handles WAD file header, directory, lump I/O.
+//
+//-----------------------------------------------------------------------------
+
+#include "vpo_local.h"
+
+namespace vpo
+{
+
+
+typedef struct
+{
+	// Should be "IWAD" or "PWAD".
+	char		identification[4];
+	int			numlumps;
+	int			infotableofs;
+
+} PACKEDATTR wadinfo_t;
+
+
+typedef struct
+{
+	int			filepos;
+	int			size;
+	char		name[8];
+
+} PACKEDATTR filelump_t;
+
+//
+// GLOBALS
+//
+
+// Location of each lump on disk.
+
+lumpinfo_t *lumpinfo;
+
+int numlumps = 0;
+
+static char * wad_filename;
+
+static wad_file_t * current_file;
+
+
+
+//
+// LUMP BASED ROUTINES.
+//
+
+// andrewj: added this to find level names
+//          returns 0 if not a level, 1 for DOOM, 2 for HEXEN format
+static int CheckMapHeader(filelump_t *lumps, int num_after)
+{
+	static const char *level_lumps[] =
+	{
+		"THINGS", "LINEDEFS", "SIDEDEFS", "VERTEXES",
+		"SEGS", "SSECTORS", "NODES", "SECTORS",
+		"REJECT", "BLOCKMAP"
+	};
+
+	if (num_after < 10)
+		return 0;
+
+	for (int i = 0 ; i < 10 ; i++)
+	{
+		const char *name = level_lumps[i];
+
+		// level lumps are never valid map header names
+		if (strncmp(lumps[0].name, name, 8) == 0)
+			return 0;
+
+		// require a one-to-one correspondence
+		// (anything else would crash DOOM)
+		if (strncmp(lumps[1 + i].name, name, 8) != 0)
+			return 0;
+	}
+
+	// hexen format is distinguished by a following BEHAVIOR lump
+	if (num_after >= 11 && strncmp(lumps[11].name, "BEHAVIOR", 8) == 0)
+		return 2;
+
+	return 1;
+}
+
+
+//
+// W_AddFile
+//
+// All files are optional, but at least one file must be
+//  found (PWAD, if all required lumps are present).
+// Files with a .wad extension are wadlink files
+//  with multiple lumps.
+// Other files are single lumps with the base filename
+//  for the lump name.
+
+bool W_AddFile (const char *filename)
+{
+	wadinfo_t header;
+	lumpinfo_t *lump_p;
+	wad_file_t *wad_file;
+
+	int i;
+	int length;
+	int startlump;
+
+	filelump_t *fileinfo;
+	filelump_t *filerover;
+
+	// open the file and add to directory
+
+	wad_file = W_OpenFile(filename);
+
+	if (wad_file == NULL)
+	{
+		return false;
+	}
+
+	startlump = numlumps;
+
+	W_Read(wad_file, 0, &header, sizeof(header));
+
+	if (strncmp(header.identification,"IWAD",4) != 0)
+	{
+		// Homebrew levels?
+		if (strncmp(header.identification,"PWAD",4) != 0)
+		{
+///			I_Error ("Wad file %s doesn't have IWAD "
+///					"or PWAD id\n", filename);
+
+			W_CloseFile(wad_file);
+
+			return false;
+		}
+	}
+
+	header.numlumps = LONG(header.numlumps);
+	header.infotableofs = LONG(header.infotableofs);
+
+	length = header.numlumps * sizeof(filelump_t);
+
+	fileinfo = new filelump_t[header.numlumps];
+
+	W_Read(wad_file, header.infotableofs, fileinfo, length);
+	numlumps += header.numlumps;
+
+
+	// Fill in lumpinfo
+	lumpinfo = (lumpinfo_t *)realloc(lumpinfo, numlumps * sizeof(lumpinfo_t));
+
+	if (! lumpinfo)
+		I_Error ("Out of memory -- could not realloc lumpinfo");
+
+	lump_p = &lumpinfo[startlump];
+
+	filerover = fileinfo;
+
+	for (i=startlump; i < numlumps; ++i)
+	{
+		int map_header;
+
+		lump_p->position = LONG(filerover->filepos);
+		lump_p->size = LONG(filerover->size);
+
+		strncpy(lump_p->name, filerover->name, 8);
+
+		map_header = CheckMapHeader(filerover, numlumps - i - 1);
+
+		lump_p->is_map_header = (map_header >= 1);
+		lump_p->is_hexen      = (map_header == 2);
+
+		++lump_p;
+		++filerover;
+	}
+
+	delete[] fileinfo;
+
+	// close the file now, we re-open it later to load the map
+	W_CloseFile(wad_file);
+
+	wad_filename = strdup(filename);
+
+	if (! wad_filename)
+		I_Error ("Out of memory -- could not strdup filename");
+
+	return true;
+}
+
+
+void W_RemoveFile(void)
+{
+	if (wad_filename)
+	{
+		free(wad_filename);
+
+		wad_filename = NULL;
+
+		free(lumpinfo);
+
+		lumpinfo = NULL;
+		numlumps = 0;
+	}
+}
+
+
+//
+// W_NumLumps
+//
+int W_NumLumps (void)
+{
+	return numlumps;
+}
+
+
+//
+// W_CheckNumForName
+// Returns -1 if name not found.
+//
+int W_CheckNumForName (const char* name)
+{
+	int i;
+
+	// scan backwards so patch lump files take precedence
+
+	for (i=numlumps-1; i >= 0; --i)
+	{
+		if (strncasecmp(lumpinfo[i].name, name, 8) == 0)
+		{
+			return i;
+		}
+	}
+
+	// TFB. Not found.
+
+	return -1;
+}
+
+
+//
+// W_LumpLength
+// Returns the buffer size needed to load the given lump.
+//
+int W_LumpLength (int lumpnum)
+{
+	if (lumpnum >= numlumps)
+	{
+		I_Error ("W_LumpLength: %i >= numlumps", lumpnum);
+	}
+
+	return lumpinfo[lumpnum].size;
+}
+
+
+//
+// W_ReadLump
+// Loads the lump into the given buffer,
+//  which must be >= W_LumpLength().
+//
+static void W_ReadLump(int lump, void *dest)
+{
+	int c;
+	lumpinfo_t *l;
+
+	if (lump >= numlumps)
+	{
+		I_Error ("W_ReadLump: %i >= numlumps", lump);
+	}
+
+	l = lumpinfo+lump;
+
+	c = W_Read(current_file, l->position, dest, l->size);
+
+	if (c < l->size)
+	{
+		I_Error ("W_ReadLump: only read %i of %i on lump %i", c, l->size, lump);
+	}
+}
+
+
+//
+// W_LoadLump
+//
+// Load a lump into memory and return a pointer to a buffer containing
+// the lump data.
+//
+byte * W_LoadLump(int lumpnum)
+{
+	byte *result;
+
+	if (lumpnum < 0 || lumpnum >= numlumps)
+	{
+		I_Error ("W_LoadLump: %i >= numlumps", lumpnum);
+	}
+
+	if (! current_file)
+		I_Error ("W_LoadLump: no current file (W_BeginRead not called)");
+
+	// load it now
+
+	result = new byte[W_LumpLength(lumpnum) + 1];
+
+	W_ReadLump (lumpnum, result);
+
+	return result;
+}
+
+
+void W_FreeLump(byte * data)
+{
+	delete[] data;
+}
+
+
+void W_BeginRead(void)
+{
+	// check API usage
+	if (! wad_filename)
+		I_Error("W_BeginRead called without any wad file!");
+
+	if (current_file)
+		I_Error("W_BeginRead called twice without W_EndRead.");
+
+	current_file = W_OpenFile(wad_filename);
+
+	// it should normally succeed, as it is unlikely the file suddenly
+	// disappears between reading the directory and loading a map.
+	if (! current_file)
+		I_Error("Could not re-open the wad file -- deleted?");
+}
+
+
+void W_EndRead()
+{
+	if (! current_file)
+		I_Error("W_EndRead called without a previous W_BeginRead.");
+
+	W_CloseFile(current_file);
+
+	current_file = NULL;
+}
+
+
+} // namespace vpo
+
+//--- editor settings ---
+// vi:ts=4:sw=4:noexpandtab
+// Emacs style mode select   -*- C++ -*- 
diff --git a/Source/Plugins/vpo_dll/w_wad.h b/Source/Plugins/vpo_dll/w_wad.h
new file mode 100644
index 0000000..1973f2d
--- /dev/null
+++ b/Source/Plugins/vpo_dll/w_wad.h
@@ -0,0 +1,84 @@
+//-----------------------------------------------------------------------------
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005 Simon Howard
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+// 02111-1307, USA.
+//
+// DESCRIPTION:
+//	WAD I/O functions.
+//
+//-----------------------------------------------------------------------------
+
+#ifndef __W_WAD__
+#define __W_WAD__
+
+#include <stdio.h>
+
+#include "doomtype.h"
+#include "w_file.h"
+
+
+//
+// TYPES
+//
+
+//
+// WADFILE I/O related stuff.
+//
+
+typedef struct lumpinfo_s lumpinfo_t;
+
+struct lumpinfo_s
+{
+	char	name[8];
+
+	int		position;
+	int		size;
+
+	bool  is_map_header;  // e.g. MAP01 or E1M1 
+	bool  is_hexen;
+};
+
+
+extern lumpinfo_t *lumpinfo;
+extern int numlumps;
+
+
+// andrewj: only a single file can be added now
+bool W_AddFile (const char *filename);
+
+void W_RemoveFile(void);
+
+
+int	W_CheckNumForName (const char *name);
+
+int	W_LumpLength (int lumpnum);
+
+
+// andrewj: all lump loading must occur between these calls
+void W_BeginRead(void);
+void W_EndRead();
+
+byte * W_LoadLump(int lumpnum);
+void   W_FreeLump(byte * data);
+
+
+#endif  /* __W_WAD__ */
+
+//--- editor settings ---
+// vi:ts=4:sw=4:noexpandtab
+// Emacs style mode select   -*- C++ -*- 
diff --git a/Tests/CopyPaste/copypaste_a.wad b/Tests/CopyPaste/copypaste_a.wad
new file mode 100644
index 0000000..7e7f42e
Binary files /dev/null and b/Tests/CopyPaste/copypaste_a.wad differ
diff --git a/Tests/Decorate/DECORATE.txt b/Tests/Decorate/DECORATE.txt
new file mode 100644
index 0000000..ab1fad7
--- /dev/null
+++ b/Tests/Decorate/DECORATE.txt
@@ -0,0 +1,33 @@
+actor SanyaChainsaw : Weapon 6205
+{
+  //$Category BDIS2_Armory
+  //$Sprite CSAWA0
+  Game Doom
+  SpawnID 32
+  Weapon.Kickback 0
+  Weapon.SelectionOrder 2200
+  Weapon.UpSound "weapons/sawup"
+  Weapon.ReadySound "weapons/sawidle"
+  Inventory.PickupMessage "A chainsaw!"
+  Obituary "%o was mowed over by %k's chainsaw."
+  +WEAPON.MELEEWEAPON      
+  States
+  {
+  Ready:
+    SAWG AB 4 A_WeaponReady
+    loop
+  Deselect:
+    SAWG A 1 A_Lower
+    loop
+  Select:
+    SAWG A 1 A_Raise
+    loop
+  Fire:
+    SAWG CD 4 A_Saw
+    SAWG D 0 A_ReFire
+    goto Ready
+  Spawn:
+    CSAW A -1
+    stop
+  }
+}
diff --git a/Tests/Decorate/decoratetest.dbs b/Tests/Decorate/decoratetest.dbs
new file mode 100644
index 0000000..1d6fb76
--- /dev/null
+++ b/Tests/Decorate/decoratetest.dbs
@@ -0,0 +1,39 @@
+type = "Doom Builder Map Settings Configuration";
+gameconfig = "ZDoom_DoomHexen.cfg";
+strictpatches = 0;
+
+maps
+{
+	
+	MAP01
+	{
+		
+		resources
+		{
+			
+			resource0
+			{
+				type = 1;
+				location = "F:\\Projects\\Doom Builder\\Tests\\Decorate";
+				option1 = 0;
+				option2 = 0;
+			}
+			
+		}
+		
+		
+		grid
+		{
+			background = "";
+			backsource = 0;
+			backoffsetx = 0;
+			backoffsety = 0;
+			backscalex = 100;
+			backscaley = 100;
+			gridsize = 32;
+		}
+		
+	}
+	
+}
+
diff --git a/Tests/Decorate/decoratetest.wad b/Tests/Decorate/decoratetest.wad
new file mode 100644
index 0000000..3ed7622
Binary files /dev/null and b/Tests/Decorate/decoratetest.wad differ
diff --git a/Tests/Decorate/testscale.wad b/Tests/Decorate/testscale.wad
new file mode 100644
index 0000000..8ebaee8
Binary files /dev/null and b/Tests/Decorate/testscale.wad differ
diff --git a/Tests/Drawing/AutoCloseFail1.wad b/Tests/Drawing/AutoCloseFail1.wad
new file mode 100644
index 0000000..7dbc0dc
Binary files /dev/null and b/Tests/Drawing/AutoCloseFail1.wad differ
diff --git a/Tests/Drawing/AutoCloseFail1a.png b/Tests/Drawing/AutoCloseFail1a.png
new file mode 100644
index 0000000..8fb2c5e
Binary files /dev/null and b/Tests/Drawing/AutoCloseFail1a.png differ
diff --git a/Tests/Drawing/AutoCloseFail1b.png b/Tests/Drawing/AutoCloseFail1b.png
new file mode 100644
index 0000000..d5ed134
Binary files /dev/null and b/Tests/Drawing/AutoCloseFail1b.png differ
diff --git a/Tests/Drawing/VerticalCCAutoCloseOnVertices.dbs b/Tests/Drawing/VerticalCCAutoCloseOnVertices.dbs
new file mode 100644
index 0000000..9ebf4f0
--- /dev/null
+++ b/Tests/Drawing/VerticalCCAutoCloseOnVertices.dbs
@@ -0,0 +1,30 @@
+type = "Doom Builder Map Settings Configuration";
+gameconfig = "ZDoom_Doom.cfg";
+
+maps
+{
+	
+	MAP01
+	{
+		
+		resources
+		{
+		}
+		
+		
+		grid
+		{
+			background = "";
+			backsource = 0;
+			backoffsetx = 0;
+			backoffsety = 0;
+			backscalex = 100;
+			backscaley = 100;
+			gridsize = 32;
+		}
+		
+	}
+	
+}
+
+strictpatches = 0;
diff --git a/Tests/Drawing/VerticalCCAutoCloseOnVertices.wad b/Tests/Drawing/VerticalCCAutoCloseOnVertices.wad
new file mode 100644
index 0000000..826fe8e
Binary files /dev/null and b/Tests/Drawing/VerticalCCAutoCloseOnVertices.wad differ
diff --git a/Tests/ErrorChecking/overlappinglines_a.wad b/Tests/ErrorChecking/overlappinglines_a.wad
new file mode 100644
index 0000000..78ed9b8
Binary files /dev/null and b/Tests/ErrorChecking/overlappinglines_a.wad differ
diff --git a/Tests/ErrorChecking/sectornotclosed_a.dbs b/Tests/ErrorChecking/sectornotclosed_a.dbs
new file mode 100644
index 0000000..99ad8d1
--- /dev/null
+++ b/Tests/ErrorChecking/sectornotclosed_a.dbs
@@ -0,0 +1,30 @@
+type = "Doom Builder Map Settings Configuration";
+gameconfig = "ZDoom_Doom.cfg";
+strictpatches = 0;
+
+maps
+{
+	
+	MAP01
+	{
+		
+		resources
+		{
+		}
+		
+		
+		grid
+		{
+			background = "";
+			backsource = 0;
+			backoffsetx = 0;
+			backoffsety = 0;
+			backscalex = 100;
+			backscaley = 100;
+			gridsize = 32;
+		}
+		
+	}
+	
+}
+
diff --git a/Tests/ErrorChecking/sectornotclosed_a.wad b/Tests/ErrorChecking/sectornotclosed_a.wad
new file mode 100644
index 0000000..f3ae992
Binary files /dev/null and b/Tests/ErrorChecking/sectornotclosed_a.wad differ
diff --git a/Tests/Textures/Medricel/Docs/Textures - Bugs.txt b/Tests/Textures/Medricel/Docs/Textures - Bugs.txt
new file mode 100644
index 0000000..392109f
--- /dev/null
+++ b/Tests/Textures/Medricel/Docs/Textures - Bugs.txt	
@@ -0,0 +1,88 @@
+----------------------------------------
+FEATURE SUGGESTIONS
+----------------------------------------
+
+ForcePallete
+	Forces the texture/patch to be restricted to the game
+	pallete. Useful for blends that look good in software,
+	but turn out really bad in GL.
+
+----------------------------------------
+Bugs with TEXTURES definitions:
+----------------------------------------
+* The Desaturate translation does nothing.
+
+!* Desaturate requires parenthesis or else ZDoom will crash.
+
+=* There is an additional required number for Desaturate that
+	has no effect.
+	
+=* 0-255 Integer RGB values for Blend are read as hexadecimal
+	when the list is enclosed in quotation marks.
+	
+!* Integer values 100-249 cause ZDoom to crash when used.
+	This is possibly related to the hexadecimal bug above.
+	This only affects the Red value, when the list is surr-
+	ounded by quotes.
+	
+!* Integer values 6-36 cause ZDoom to crash when used in a
+	Blend statement. This only applies to a list that is not
+	surrounded by quotes, and only the Red value.
+	
+* Hexadecimal values load as a single string ("8080FF"), but
+	are not displayed properly.
+	
+=* Named translations do not respect patch transparency.
+	This bug manifests itself differently in ZDoom than in
+	GZDoom. In GZ, it happens all the time. In ZD, it only
+	occurs when the patch interacts with a patch with a
+	Style value other than Copy.
+
+=* Blends also do not respect patch transparency.
+
+!* Using out-of-range pallete indexes in translations causes
+	ZDoom to crash.
+
+---------------------------------------	
+Functioning Styles:
+---------------------------------------
+Add
+	Functions completely as expected.
+
+Subtract
+	Inverts patch, Applies Multiply? Blend on Patch
+
+ReverseSubtract
+	Inverts underlying image, Applies Multiply? on Patch
+	
+*	Lower Alpha values make the overall result darker, for
+	  some reason.
+
+Modulate
+*?	Unaffected by Alpha. Algorithm unknown.
+
+---------------------------------------
+Broken Styles:
+---------------------------------------
+Copy
+	Appears to do nothing, even with 0.5 Alpha
+
+CopyAlpha
+	Alpha does nothing. In software mode, seems to cause
+	  some kind of color distortion. Looks exactly like Copy
+	  when in GZDoom GL mode. (GZ r248)
+	CopyAlpha also triggers the transparency bug with
+	  translations
+
+Blend
+	Bad syntax error
+
+---------------------------------------
+Other:
+---------------------------------------
+Multiple translations must be induvidually quoted
+	( "a:b=x:y", "e:h=l:o" ) in order to function properly.
+	
+Styles do not affect other world textures. All styled
+	Patches are automatically blended against black if there
+	is no underlying image data.
\ No newline at end of file
diff --git a/Tests/Textures/Medricel/Docs/Textures - Reference.txt b/Tests/Textures/Medricel/Docs/Textures - Reference.txt
new file mode 100644
index 0000000..e2cbaae
--- /dev/null
+++ b/Tests/Textures/Medricel/Docs/Textures - Reference.txt	
@@ -0,0 +1,212 @@
+----------------------------------------
+Texture Properties (22 textures)
+----------------------------------------
+	
+XScale Only (4 textures)
+	TSCLX025	-	0.25
+	TSCLX05		-	0.5
+	TSCLX2		-	2
+	TSCLX4		-	4
+
+YScale Only (4 textures)
+	TSCLY025	-	0.25
+	TSCLY05		-	0.5
+	TSCLY2		-	2
+	TSCLY4		-	4
+
+XScale and YScale Equal (4 textures)
+	TSCLB025	-	0.25
+	TSCLB05		-	0.5
+	TSCLB2		-	2
+	TSCLB4		-	4
+
+XScale and YScale Mixed (4 textures)
+	TSCLM1		-	X: 0.25, Y: 2
+	TSCLM2		-	X: 4, Y: 2
+	TSCLM3		-	X: 2, Y: 0.5
+	TSCLM4		-	X: 0.5, Y: 0.25
+	
+World Panning - Same As Above (4 textures)
+	TSCLMWP1	-	X: 0.25, Y: 2
+	TSCLMWP2	-	X: 4, Y: 2
+	TSCLMWP3	-	X: 2, Y: 0.5
+	TSCLMWP4	-	X: 0.5, Y: 0.25
+	
+Misc. Texture Properties (2 textures)
+	TMISCNOD	-	No Decals
+	TMISCNUL	-	Null Texture
+
+----------------------------------------	
+Patch Properties (60 textures)
+----------------------------------------
+
+Basic Use (4 textures)
+	PBLACK		- All-Black Texture
+	PBASIC1		- One-Patch Texture
+	PBASIC2		- Multi-Patch Texture, Side-by-Side
+	PBASIC3		- Multi-Patch Texture, Overlapping
+
+Flipping (4 textures)
+	PFLIPX		- FlipX
+	PFLIPY		- FlipY
+	PFLIPXY		- FlipX and FlipY Combined
+	PFLIPM		- Three Flipped Patches
+	
+Rotation (4 textures)
+	PROT90		- Rotate 90
+	PROT180		- Rotate 180
+	PROT270		- Rotate 270
+	PROTM		- Four Rotated Patches
+
+Translations - Pre-Named (6 textures)
+	PTRNN1		- Inverse
+	PTRNN2		- Gold
+	PTRNN3		- Red
+	PTRNN4		- Green
+	PTRNN5		- Ice
+	PTRNN6		- Desaturate
+
+Translations - Custom (6 textures)
+	PTRNC1		- index:index
+	PTRNC2		- index:rgb
+	PTRNC3		- index:index, index:index
+	PTRNC4		- index:rgb, index:rgb
+	PTRNC5		- index:index, index:rgb
+	PTRNC6		- Two Patches - i:i and i:rgb
+	
+Blend - Named Colors From X11R6RGB Lump in ZDoom.PK3 (7 textures)
+	PBLNN1		- "Blue"
+	PBLNN2		- "Pale Green"
+	PBLNN3		- "Dark Slate Grey"
+	PBLNN4		- "Blue" at 0.75 Alpha
+	PBLNN5		- "Pale Green" at 0.5 Alpha
+	PBLNN6		- "Dark Slate Grey" at 0.25 Alpha
+	PBLNN7		- Two Patches - "Red" and "Orange"
+	
+Blend - RGB Colors (8 textures)
+		(Note: As of r1302, Alpha does not work)
+	PBLNRGB1	- 255 Red
+	PBLNRGB2	- 255 Green
+	PBLNRGB3	- 255 Blue
+	PBLNRGB4	- 252, 120, 213 - Pink
+	PBLNRGB5	- Pink in Hexadecimal "FC, 78, D5"
+	PBLNRGB6	- Pink With 0.5 Alpha
+	PBLNRGB7	- Pink in Hex With 0.5 Alpha "80"
+	PBLNRGBM	- TWo Patches - "FC, 78, D5" and 83, 170, 146
+	
+Styles (17 textures)
+		(Note: Copy appears to do nothing in r1302)
+		(CopyAlpha does something in software, but I don't know what.)
+		(Using Blend returns a bad syntax error.)
+	PSTYL1		- Add
+	PSTYL2		- Subtract
+	PSTYL3		- ReverseSubtract
+	PSTYL4		- Modulate
+	PSTYL5		- Copy
+	PSTYL6		- CopyAlpha
+	PSTYL7		- Add and Add
+	PSTYL8		- Add and Subtract
+	PSTYL9		- Add and ReverseSubtract
+	PSTYL10		- Add and Modulate
+	PSTYL11		- Subtract and Subtract
+	PSTYL12		- Subtract and ReverseSubtract
+	PSTYL13		- Subtract and Modulate
+	PSTYL14		- Modulate and Modulate
+	PSTYL15		- Modulate, Subtract, and Add
+	PSTYL16		- Add, ReverseSubtract, and Modulate
+	PSTYL17		- Add, ReverseSubtract, and Subtract
+	
+Styles With Alpha (4 textures)
+		(Note: The following are not affected by Alpha in r1302)
+			(Modulate, Copy, and CopyAlpha)
+	
+	PSTYA1		- Add 0.5
+	PSTYA2		- Subtract 0.25
+	PSTYA3		- ReverseSubtract 0.75
+	PSTYA4		- Add 0.6, ReverseSubtract 0.9, Subtract 0.5
+
+----------------------------------------	
+Mixed Properties
+----------------------------------------
+
+Translation and Style (4 textures)
+	
+	MTS1		- Translation + Style 1
+	MTS2		- Translation + Style 2
+	MTS3		- Translation + Style 3
+	MTS4		- Translation + Style 4
+	
+Translation and Flip (3 textures)
+
+	MTF1		- Translation + Flip 1
+	MTF2		- Translation + Flip 2
+	MTF3		- Translation + Flip 3
+
+Translation and Rotate (3 textures)
+
+	MTR1		- Translation + Rotate 1
+	MTR2		- Translation + Rotate 2
+	MTR3		- Translation + Rotate 3
+
+Translation, Flip, and Rotate (4 textures)
+
+	MTFR1		- Translation + Flip + Rotate 1
+	MTFR2		- Translation + Flip + Rotate 2
+	MTFR3		- Translation + Flip + Rotate 3
+	MTFR4		- Translation + Flip + Rotate 4
+	
+Translation, Flip, and Style (4 Textures)
+
+	MTFS1		- Translation + Flip + Style 1
+	MTFS2		- Translation + Flip + Style 2
+	MTFS3		- Translation + Flip + Style 3
+	MTFS4		- Translation + Flip + Style 4
+	
+Translation, Flip, Rotate, and Style
+
+	MTFRS1		- Translation + Flip + Rotate + Style 1
+
+
+
+
+
+////////////////////////////////////////
+
+TODO:
+
+	Mixed Properties:
+	*Translation + Style
+	*Translation + Flip
+	*Translation + Rotate
+	*Translation + Flip + Rotate
+	*Translation + Flip + Style
+	Translation + Flip + Rotate + Style
+	
+	Blend + Flip + Rotate + Style
+	
+	Flip + Rotate
+	Flip + Style
+	Flip + Rotate + Style
+	
+	Rotate + Style
+	
+	Scale + Multi-Patch
+	Scale + Multi-Patch Properties
+	
+	Sprites As Patches
+		+Flip
+		+Rotate
+		+Translate
+		+Blend
+		+Style
+	Graphics As Patches
+		+Flip
+		+Rotate
+		+Translate
+		+Blend
+		+Style
+	
+	
+//--------------------------------------
+// 
+//--------------------------------------
\ No newline at end of file
diff --git a/Tests/Textures/Medricel/TEXTURES.txt b/Tests/Textures/Medricel/TEXTURES.txt
new file mode 100644
index 0000000..7abbb43
--- /dev/null
+++ b/Tests/Textures/Medricel/TEXTURES.txt
@@ -0,0 +1,1343 @@
+////////////////////////////////////////
+//--------------------------------------
+// Texture Properties
+//--------------------------------------
+////////////////////////////////////////
+
+//--------------------------------------
+// XScale Only
+//--------------------------------------
+texture TSCLX025, 64, 64		//0.25, 4x size
+{
+	XScale 0.25
+	Patch W31_1, 0, 0
+}
+
+texture TSCLX05, 64, 64			//XScale 0.5, 2x Size
+{
+	XScale 0.5
+	Patch W31_1, 0, 0
+}
+texture TSCLX2, 64, 64			//XScale 2, 0.5x Size
+{
+	XScale 2
+	Patch W31_1, 0, 0
+}
+texture TSCLX4, 64, 64			//XScale 4, 0.25x Size
+{
+	XScale 4
+	Patch W31_1, 0, 0
+}
+
+//--------------------------------------
+// YScale Only
+//--------------------------------------
+
+texture TSCLY025, 32, 32		//YScale 0.25
+{
+	YScale 0.25
+	Patch SW3S1, 0, 0
+}
+
+texture TSCLY05, 32, 32			//YScale 0.5
+{
+	YScale 0.5
+	Patch SW3S1, 0, 0
+}
+texture TSCLY2, 32, 32			//YScale 2
+{
+	YScale 2
+	Patch SW3S1, 0, 0
+}
+texture TSCLY4, 32, 32			//YScale 4
+{
+	YScale 4
+	Patch SW3S1, 0, 0
+}
+
+//--------------------------------------
+// XScale and YScale Equal
+//--------------------------------------
+
+texture TSCLB025, 32, 32		//Scale 0.25
+{
+	XScale 0.25
+	YScale 0.25
+	Patch SGCRATE2, 0,0
+}
+
+texture TSCLB05, 32, 32			//Scale 0.5
+{
+	XScale 0.5
+	YScale 0.5
+	Patch SGCRATE2, 0,0
+}
+
+texture TSCLB2, 32, 32			//Scale 2
+{
+	XScale 2
+	YScale 2
+	Patch SGCRATE2, 0,0
+}
+
+texture TSCLB4, 32, 32			//Scale 4
+{
+	XScale 4
+	YScale 4
+	Patch SGCRATE2, 0,0
+}
+
+//--------------------------------------
+// XScale and YScale Mixed
+//--------------------------------------
+
+texture TSCLM1, 32, 64			// X: 0.25, Y: 2
+{
+	XScale 0.25
+	YScale 2
+	Patch RW31_4, 0, 0
+}
+
+texture TSCLM2, 128, 128		// X: 4, Y: 2
+{
+	XScale 4
+	YScale 2
+	Patch MWALL4_2, 0, 0
+}
+
+texture TSCLM3, 64, 64			// X: 2, Y: 0.5
+{
+	XScale 2
+	YScale 0.5
+	Patch WALL72_3, 0, 0
+}
+
+texture TSCLM4, 32, 32			// X: 0.5, Y: 0.25
+{
+	XScale 0.5
+	YScale 0.25
+	Patch SW2S1, 0, 0
+}
+
+//--------------------------------------
+// World Panning - Same As Above
+//--------------------------------------
+
+texture TSCLMWP1, 32, 64			// X: 0.25, Y: 2
+{
+	XScale 0.25
+	YScale 2
+	WorldPanning
+	Patch RW31_4, 0, 0
+}
+
+texture TSCLMWP2, 128, 128		// X: 4, Y: 2
+{
+	XScale 4
+	YScale 2
+	WorldPanning
+	Patch MWALL4_2, 0, 0
+}
+
+texture TSCLMWP3, 64, 64			// X: 2, Y: 0.5
+{
+	XScale 2
+	YScale 0.5
+	WorldPanning
+	Patch WALL72_3, 0, 0
+}
+
+texture TSCLMWP4, 32, 32			// X: 0.5, Y: 0.25
+{
+	XScale 0.5
+	YScale 0.25
+	WorldPanning
+	Patch SW2S1, 0, 0
+}
+
+//--------------------------------------
+// Misc. Texture Properties
+//--------------------------------------
+
+texture TMISCNOD, 64, 128			// No Decals
+{
+	NoDecals
+	Patch WALL00_1, 0, 0
+}
+
+texture TMISCNUL, 64, 128			// Null Texture
+{
+	NullTexture
+	Patch WALL78_1, 0, 0
+}
+
+////////////////////////////////////////
+//--------------------------------------
+// Patch Properties
+//--------------------------------------
+////////////////////////////////////////
+
+//--------------------------------------
+// Basic Use
+//--------------------------------------
+
+texture PBLACK, 32,32			//All-Black Texture
+{
+	Patch RW34_1, -16, -16
+}
+
+texture PBASIC1, 64, 128		// Basic Single-Patch Texture
+{
+	Patch HELL6_3, 0, 0
+}
+
+texture PBASIC2, 256, 128		// Multi-Patch Texture, Side-by-Side
+{
+	Patch HELL5_1, 0, 0
+	Patch HELL5_2, 128, 0
+}
+
+texture PBASIC3, 64, 128		// Multi-Patch Texture, Overlapping
+{
+	Patch COMP03_4, 0, 0
+	Patch Comp03_4, 0, 64
+	Patch Comp03_4, 32, 0
+	Patch Comp03_4, 32, 64
+	Patch Comp04_1, 0, 24
+	Patch WARNA0, 24, 66
+}
+
+//--------------------------------------
+// Flipping
+//--------------------------------------
+
+texture PFLIPX, 112, 64			// FlipX
+{
+	Patch CYL1_1, 0, 0
+	{
+		FlipX
+	}
+}
+
+texture PFLIPY, 64, 128			// FlipY
+{
+	Patch WALL58_2, 0, 0
+	{
+		FlipY
+	}
+}
+
+texture PFLIPXY, 64, 64			// FlipX and FlipY Combined
+{
+	Patch T14_3, 0, -4
+	{
+		FlipX
+		FlipY
+	}
+}
+
+texture PFLIPM, 64, 128			// Three Flipped Patches
+{
+	Patch RSKY3, 0, -32
+	{
+		FlipY
+	}
+	Patch DOOR2_1, -16, 56
+	{
+		FlipX
+		FlipY
+	}
+	Patch PS20A0, 1, 54
+	{
+		FlipX
+	}
+}
+
+//--------------------------------------
+// Rotation
+//--------------------------------------
+
+texture PROT90, 128, 128		// Rotate 90
+{
+	Patch W74B_1, 0, 0
+	{
+		Rotate 90
+	}
+}
+
+texture PROT180, 128, 128		// Rotate 180
+{
+	Patch W74B_1, 0, 0
+	{
+		Rotate 180
+	}
+}
+
+texture PROT270, 128, 128		// Rotate 270
+{
+	Patch W74B_1, 0, 0
+	{
+		Rotate 270
+	}
+}
+
+texture PROTM, 128, 128			// Four Rotated Patches
+{
+	Patch TOMW2_2, 0, 56
+	{
+		Rotate 180
+	}
+	Patch COMP04_2, 0, 0
+	{
+		Rotate -90
+	}
+	Patch COMP03_5, 64, 0
+	{
+		Rotate 90
+	}
+	Patch WARNA0, 48, 60
+	{
+		Rotate 270
+	}
+}
+
+//--------------------------------------
+// Translations - Pre-Named
+//--------------------------------------
+
+texture PTRNN1, 64, 64			// Inverse
+{
+	Patch WALL72_5, 0, 0
+	{
+		Translation Inverse
+	}
+}
+
+texture PTRNN2, 64, 64			// Gold
+{
+	Patch WALL72_5, 0, 0
+	{
+		Translation Gold
+	}
+}
+
+texture PTRNN3, 64, 64			// Red
+{
+	Patch WALL72_5, 0, 0
+	{
+		Translation Red
+	}
+}
+
+texture PTRNN4, 64, 64			// Green
+{
+	Patch WALL72_5, 0, 0
+	{
+		Translation Green
+	}
+}
+
+texture PTRNN5, 64, 64			// Ice
+{
+	Patch WALL72_5, 0, 0
+	{
+		Translation Ice
+	}
+}
+
+texture PTRNN6, 64, 64			// Desaturate
+{
+	Patch WALL72_5, 0, 0
+	{
+		Translation "Desaturate, 1.0"
+	}
+}
+
+texture PTRNN7, 64, 128			// Two Patches - Gold and Inverse
+{
+	Patch WALL72_5, 0, 0
+	{
+		Translation Gold
+	}
+	
+	Patch WALL72_5, 0, 64
+	{
+		Translation Inverse
+	}
+}
+
+//--------------------------------------
+// Translations - Custom
+//--------------------------------------
+
+texture PTRNC1, 64, 128			// index:index
+{
+	Patch RW37_3, 0, 0
+	{
+		Translation "152:159=70:77"
+	}
+}
+
+texture PTRNC2, 64, 128			// index:rgb
+{
+	Patch RW37_3, 0, 0
+	{
+		Translation "152:159=[254,112,136]:[182,56,24]"
+	}
+}
+
+texture PTRNC3, 64, 128			// index:index, index:index
+{
+	Patch RW37_3, 0, 0
+	{
+		Translation "200:207=192:199", "152:159=70:77"
+	}
+}
+
+texture PTRNC4, 64, 128			// index:rgb, index:rgb
+{
+	Patch RW37_3, 0, 0
+	{
+		Translation "200:207=[138,254,61]:[85,211,1]", "152:159=[254,112,136]:[182,56,24]"
+	}
+}
+
+texture PTRNC5, 64, 128			// index:index, index:rgb
+{
+	Patch RW37_3, 0, 0
+	{
+		Translation "200:207=192:199", "152:159=[254,112,136]:[182,56,24]"
+	}
+}
+
+texture PTRNC6, 64, 128			// Two Patches - i:i and i:rgb
+{
+	Patch RW37_3, 0, 0
+	{
+		Translation "200:207=192:199"
+	}
+	Patch RW37_3, 0, 64
+	{
+		Translation "152:159=[254,112,136]:[182,56,24]"
+	}
+}
+
+//--------------------------------------
+// Blend - Named Colors From X11R6RGB
+//     Lump in ZDoom.PK3
+//--------------------------------------
+
+texture PBLNN1, 64, 64			// "Blue"
+{
+	Patch WALL02_1, 0, 0
+	{
+		Blend "Blue"
+	}
+}
+
+texture PBLNN2, 64, 64			// "Pale Green"
+{
+	Patch WALL02_1, 0, 0
+	{
+		Blend "Pale Green"
+	}
+}
+
+texture PBLNN3, 64, 64			// "Dark Slate Grey"
+{
+	Patch WALL02_1, 0, 0
+	{
+		Blend "Dark Slate Grey"
+	}
+}
+
+texture PBLNN4, 64, 64			// "Blue" at 0.75 Alpha
+{
+	Patch WALL02_1, 0, 0
+	{
+		Blend "Blue", 0.75
+	}
+}
+
+texture PBLNN5, 64, 64			// "Pale Green" at 0.5 Alpha
+{
+	Patch WALL02_1, 0, 0
+	{
+		Blend "Pale Green", 0.5
+	}
+}
+
+texture PBLNN6, 64, 64			// "Dark Slate Grey" at 0.25 Alpha
+{
+	Patch WALL02_1, 0, 0
+	{
+		Blend "Dark Slate Grey", 0.25
+	}
+}
+
+texture PBLNN7, 64, 128			// Two Patches - "Red" and "Orange"
+{
+	Patch WALL02_1, 0, 0
+	{
+		Blend "Red"
+	}
+	Patch WALL02_1, 0, 64
+	{
+		Blend "Orange"
+	}
+}
+
+//--------------------------------------
+// Blend - RGB Colors
+//     Note: As of r1302, Alpha does not work
+//--------------------------------------
+
+texture PBLNRGB1, 64, 64		// 255 Red
+{
+	Patch WALL03_1, 0 ,0
+	{
+		Blend 255, 0, 0, 1.0
+	}
+}
+
+texture PBLNRGB2, 64, 64		// 255 Green
+{
+	Patch WALL03_1, 0 ,0
+	{
+		Blend 0, 255, 0, 1.0
+	}
+}
+
+texture PBLNRGB3, 64, 64		// 255 Blue
+{
+	Patch WALL03_1, 0 ,0
+	{
+		Blend 0, 0, 255, 1.0
+	}
+}
+
+texture PBLNRGB4, 64, 64		// 252, 120, 213 - Pink
+{
+	Patch WALL03_1, 0 ,0
+	{
+		Blend 252, 120, 213, 1.0
+	}
+}
+
+texture PBLNRGB5, 64, 64		// Pink in Hexadecimal "FC, 78, D5"
+{
+	Patch WALL03_1, 0 ,0
+	{
+		Blend "FC, 78, D5"
+	}
+}
+
+texture PBLNRGB6, 64, 64		// Pink With 0.5 Alpha
+{
+	Patch WALL03_1, 0 ,0
+	{
+		Blend 252, 120, 213, 0.5
+	}
+}
+
+texture PBLNRGB7, 64, 64		// Pink in Hex With 0.5 Alpha "80"
+{
+	Patch WALL03_1, 0 ,0
+	{
+		Blend "FC, 78, D5, 80"
+	}
+}
+
+texture PBLNRGBM, 64, 128		// TWo Patches - "FC, 78, D5"
+{									//and 83, 170, 146
+	Patch WALL03_1, 0 ,0
+	{
+		Blend "FC, 78, D5"
+	}
+	Patch WALL03_1, 0 ,64
+	{
+		Blend 83, 170, 146, 1.0
+	}
+}
+
+
+//--------------------------------------
+// Styles
+//     Notes: Copy appears to do nothing in r1302
+//       CopyAlpha does something in software, but I don't know what.
+//       Using Blend returns a bad syntax error.
+//--------------------------------------
+
+texture PSTYL1, 64, 128			// Add
+{
+	Patch RW1_2, 0, 0
+	Patch WLA128_1, 32, 0
+	{
+		Style Add
+	}
+}
+
+texture PSTYL2, 64, 128			// Subtract
+{
+	Patch RW1_2, 0, 0
+	Patch WLA128_1, 32, 0
+	{
+		Style Subtract
+	}
+}
+
+texture PSTYL3, 64, 128			// ReverseSubtract
+{
+	Patch RW1_2, 0, 0
+	Patch WLA128_1, 32, 0
+	{
+		Style ReverseSubtract
+	}
+}
+
+texture PSTYL4, 64, 128			// Modulate
+{
+	Patch RW1_2, 0, 0
+	Patch WLA128_1, 32, 0
+	{
+		Style Modulate
+	}
+}
+
+texture PSTYL5, 64, 128			// Copy
+{
+	Patch RW1_2, 0, 0
+	Patch WLA128_1, 32, 0
+	{
+		Style Copy
+	}
+}
+
+texture PSTYL6, 64, 128			// CopyAlpha
+{
+	Patch RW1_2, 0, 0
+	Patch WLA128_1, 32, 0
+	{
+		Style CopyAlpha
+	}
+}
+
+texture PSTYL7, 64, 128			// Add and Add
+{
+	Patch RW1_2, 0, 0
+	Patch WLA128_1, 0, 64
+	{
+		Style Add
+	}
+	Patch SUPPORT2, 0, 32
+	{
+		Style Add
+	}
+}
+
+texture PSTYL8, 64, 128			// Add and Subtract
+{
+	Patch RW1_2, 0, 0
+	Patch WLA128_1, 0, 64
+	{
+		Style Add
+	}
+	Patch SUPPORT2, 0, 32
+	{
+		Style Subtract
+	}
+}
+
+texture PSTYL9, 64, 128			// Add and ReverseSubtract
+{
+	Patch RW1_2, 0, 0
+	Patch WLA128_1, 0, 64
+	{
+		Style Add
+	}
+	Patch SUPPORT2, 0, 32
+	{
+		Style ReverseSubtract
+	}
+}
+
+texture PSTYL10, 64, 128		// Add and Modulate
+{
+	Patch RW1_2, 0, 0
+	Patch WLA128_1, 0, 64
+	{
+		Style Add
+	}
+	Patch SUPPORT2, 0, 32
+	{
+		Style Modulate
+	}
+}
+
+texture PSTYL11, 64, 128		// Subtract and Subtract
+{
+	Patch RW1_2, 0, 0
+	Patch WLA128_1, 0, 64
+	{
+		Style Subtract
+	}
+	Patch SUPPORT2, 0, 32
+	{
+		Style Subtract
+	}
+}
+
+texture PSTYL12, 64, 128		// Subtract and ReverseSubtract
+{
+	Patch RW1_2, 0, 0
+	Patch WLA128_1, 0, 64
+	{
+		Style Subtract
+	}
+	Patch SUPPORT2, 0, 32
+	{
+		Style Reversesubtract
+	}
+}
+
+texture PSTYL13, 64, 128		// Subtract and Modulate
+{
+	Patch RW1_2, 0, 0
+	Patch WLA128_1, 0, 64
+	{
+		Style Subtract
+	}
+	Patch SUPPORT2, 0, 32
+	{
+		Style Modulate
+	}
+}
+
+texture PSTYL14, 64, 128		// Modulate and Modulate
+{
+	Patch RW1_2, 0, 0
+	Patch WLA128_1, 0, 64
+	{
+		Style Modulate
+	}
+	Patch SUPPORT2, 0, 32
+	{
+		Style Modulate
+	}
+}
+
+texture PSTYL15, 64, 128		// Modulate, Subtract, and Add
+{
+	Patch RW1_2, 0, 0
+	Patch WLA128_1, 0, 64
+	{
+		Style Modulate
+	}
+	Patch SUPPORT2, 0, 32
+	{
+		Style Subtract
+	}
+	Patch COMP03_8, 12, 32
+	{
+		Style Add
+	}
+}
+
+texture PSTYL16, 64, 128		// Add, ReverseSubtract, and Modulate
+{
+	Patch RW1_2, 0, 0
+	Patch WLA128_1, 0, 64
+	{
+		Style Add
+	}
+	Patch SUPPORT2, 0, 32
+	{
+		Style ReverseSubtract
+	}
+	Patch COMP03_8, 12, 32
+	{
+		Style Modulate
+	}
+}
+
+texture PSTYL17, 64, 128		// Add, ReverseSubtract, and Subtract
+{
+	Patch RW1_2, 0, 0
+	Patch WLA128_1, 0, 64
+	{
+		Style Add
+	}
+	Patch SUPPORT2, 0, 32
+	{
+		Style ReverseSubtract
+	}
+	Patch COMP03_8, 12, 32
+	{
+		Style Subtract
+	}
+}
+
+//--------------------------------------
+// Styles With Alpha
+//     Note: The following are not affected by Alpha in r1302:
+//       Modulate, Copy, and CopyAlpha
+//--------------------------------------
+
+texture PSTYA1, 64, 128			// Add 0.5
+{
+	Patch RW1_2, 0, 0
+	Patch WLA128_1, 32, 0
+	{
+		Style Add
+		Alpha 0.5
+	}
+}
+
+texture PSTYA2, 64, 128			// Subtract 0.25
+{
+	Patch RW1_2, 0, 0
+	Patch WLA128_1, 32, 0
+	{
+		Style Subtract
+		Alpha 0.75
+	}
+}
+
+texture PSTYA3, 64, 128			// ReverseSubtract 0.75
+{
+	Patch RW1_2, 0, 0
+	Patch WLA128_1, 32, 0
+	{
+		Style ReverseSubtract
+		Alpha 0.75
+	}
+}
+
+texture PSTYA4, 64, 128			// Add 0.6, ReverseSubtract 0.9, Subtract 0.5
+{
+	Patch RW1_2, 0, 0
+	Patch WLA128_1, 0, 64
+	{
+		Style Add
+		Alpha 0.6
+	}
+	Patch SUPPORT2, 0, 32
+	{
+		Style ReverseSubtract
+		Alpha 0.9
+	}
+	Patch COMP03_8, 12, 32
+	{
+		Style Subtract
+		Alpha 0.5
+	}
+}
+
+texture PSTYA5, 64, 128			// Subtract 0.25, Modulate, Add 0.75
+{
+	Patch RW1_2, 0, 0
+	Patch WLA128_1, 0, 64
+	{
+		Style Subtract
+		Alpha 0.25
+	}
+	Patch SUPPORT2, 0, 32
+	{
+		Style Modulate
+	}
+	Patch COMP03_8, 12, 32
+	{
+		Style Add
+		Alpha 0.75
+	}
+}
+
+////////////////////////////////////////
+//--------------------------------------
+// Mixed Properties
+//--------------------------------------
+////////////////////////////////////////
+
+//--------------------------------------
+// Translation and Style
+//--------------------------------------
+
+texture MTS1, 64, 128			// Translation + Style 1
+{
+	Patch RW18_1, 0, 0
+	Patch PS20A0, 1, 56
+	{
+		Translation "160:167=128:135"
+		Style Add
+	}
+	Patch PS20A0, 1, 56
+	{
+		Translation "160:167=128:135"
+		Style Modulate
+	}
+}
+
+texture MTS2, 64, 128			// Translation + Style 2
+{
+	Patch WALL00_1, 0, 0
+	{
+		Translation "88:103=136:151"
+	}
+	Patch WALL00_3, 24, 0
+	{
+		Translation "32:47=192:207", "176:191=192:207", "88:103=136:151"
+	}
+	Patch PS20A0, 1, 56
+	{
+		Style ReverseSubtract
+	}
+}
+
+texture MTS3, 64, 128			// Translation + Style 3
+{
+	Patch WALL03_7, 0, 0
+	{
+		Translation Gold
+	}
+	Patch WALL03_7, 0, 64
+	{
+		Translation Gold
+	}
+	Patch COMP03_4, 16, 0
+	{
+		Style Add
+	}
+	Patch COMP03_4, 16, 64
+	{
+		Style Add
+	}
+	Patch T14_5, 24, 28
+	{
+		Translation "93:111=62:79", "3:3=72:72"
+	}
+}
+
+texture MTS4, 64, 128			// Translation + Style 4
+{
+	Patch WALL30_2, 0, 0
+	{
+		Translation Ice
+	}
+	Patch SW2_4, 6, 16
+	{
+		Translation Ice
+	}
+	Patch W73A_2, 0, 0
+	{
+		Style Add
+		Alpha 0.25
+	}
+}
+
+//--------------------------------------
+// Translation and Flip
+//--------------------------------------
+
+texture MTF1, 64, 128			// Translation + Flip 1
+{
+	Patch W105_1, -32, -8
+	{
+		FlipY
+		Translation Inverse
+	}
+}
+
+texture MTF2, 64, 128			// Translation + Flip 2
+{
+	Patch RW39_2, 0, 0
+	{
+		FlipY
+		Translation "32:47=192:207", "225:231=112:118"
+	}
+	Patch SW1S1, 16, 72
+	{
+		FlipX
+		Translation "112:127=192:207", "176:191=112:127"
+	}
+	Patch EXIT1, 16, 12
+	{
+		Translation "176:191=112:127"
+	}
+}
+
+texture MTF3, 128, 64			// Translation + Flip 3
+{
+	Patch TOMW2_2, 0, -8
+	{
+		FlipX
+		FlipY
+		Translation "112:127=[250,237,75]:[0,0,0]"
+	}
+	Patch WALL69_4, 0, -48
+	{
+		FlipY
+		FlipX
+		Translation Red
+	}
+	Patch WALL72_7, 64, -48
+	{
+		FlipY
+		Translation Red
+	}
+}
+
+//--------------------------------------
+// Translation and Rotate
+//--------------------------------------
+
+texture MTR1, 64, 128			// Translation + Rotate 1
+{
+	Patch WALL52_2, -64, 0
+	{
+		Rotate 270
+		Translation Green
+	}
+	Patch LADDER16, 8, 32
+	{
+		Rotate 90
+		Translation "141:151=94:105", "152:159=96:103", "74:79=106:111"
+	}
+}
+
+texture MTR2, 64, 128			// Translation + Rotate 2
+{
+	Patch RW23_4, 0, 0
+	{
+		Rotate -90
+		Translation "96:111=128:143", "5:6=150:151", "247:247=239:239", "14:14=141:141"
+	}
+	Patch RW23_4, 0, 64
+	{
+		Rotate 270
+		Translation "96:111=128:143", "5:6=150:151", "247:247=239:239", "14:14=141:141"
+	}
+	Patch SUPPORT2, -4, 112
+	{
+		Rotate 90
+		Translation "80:111=48:79", "3:3=72:72"
+	}
+}
+
+Texture MTR3, 64, 128			// Translation + Rotate 3
+{
+	Patch COMP03_5, 0, 0
+	{
+		Rotate 180
+		Translation "112:127=[250,237,75]:[0,0,0]", "240:247=[128,0,0]:[0,0,0]"
+	}
+	Patch COMP03_1, 0, 64
+	{
+		Rotate 90
+		Translation "203:207=179:183", "240:247=184:191"
+	}
+	Patch COMP03_8, 0, 96
+	{
+		Rotate -90
+	}
+}
+
+//--------------------------------------
+// Translation, Flip, and Rotate
+//--------------------------------------
+
+texture MTFR1, 128, 128			// Translation + Flip + Rotate 1
+{
+	Patch WALL62_2, 0, 0
+	{
+		FlipY
+	}
+	Patch WALL62_2, 64, 0
+	{
+		FlipY
+	}
+		Patch SW2_4, 8, 16
+	{
+		Rotate 90
+		Translation "176:191=[204,182,21]:[125,63,6]"
+	}
+	Patch SW2_4, 79, 16
+	{
+		Rotate -90
+		Translation Ice
+	}
+
+	Patch SW2_4, 37, 72
+	{
+		FlipY
+		Translation Green
+	}
+}
+
+texture MTFR2, 128, 128			// Translation + Flip + Rotate 2
+{
+	Patch DOOR9_1, 0, 0
+	{
+		Rotate 180
+		Translation "32:47=216:223"
+	}
+	Patch W94_1, 0, 14
+	{
+		Translation Gold
+		Rotate 90
+		FlipY
+	}
+	Patch DOORTRAK, 0, 14
+	{
+		Rotate 90
+		Translation Gold
+	}
+	Patch DOORTRAK, 0, 88
+	{
+		Rotate 90
+		Translation Gold
+	}
+	Patch RW33_2, 0, 96
+	{
+		Rotate -90
+		FlipY
+		Translation "184:191=160:167"
+	}
+}
+
+texture MTFR3, 128, 128			// Translation + Flip + Rotate 3
+{
+	Patch WALL22_1, 0, 8
+	{
+		FlipY
+		Translation Ice
+	}
+	Patch WALL42_3, 0, -16
+	{
+		Rotate 90
+		Translation Gold
+	}
+	Patch WALL42_3, 0, 120
+	{
+		Rotate 90
+		Translation Gold
+	}
+}
+
+texture MTFR4, 128, 128			// Translation + Flip + Rotate 4
+{
+	Patch RSKY2, 0, 0
+	{
+		FlipX
+		FlipY
+		Rotate 270
+		Translation Inverse
+	}
+	Patch W111_3, 32, 32
+	{
+		Rotate 180
+		Translation Red
+	}
+}
+
+//--------------------------------------
+// Translation, Flip, and Style
+//--------------------------------------
+
+texture MTFS1, 64, 128			// Translation + Flip + Style 1
+{
+	Patch SW11_1, 0, 0
+	{
+		Translation Gold
+		FlipY
+	}
+	Patch SW11_1, 32, 0
+	{
+		Translation "80:111=128:143", "3:3=141:141"
+	}
+	Patch HELL6_3, 0, 0
+	{
+		Style Subtract
+		Alpha 0.3
+	}
+}
+
+texture MTFS2, 128, 128			// Translation + Flip + Style 2
+{
+	Patch HELL5_1, 0, 0
+	{
+		FlipY
+		Translation "16:31=200:207", "32:47=240:247"
+	}
+	Patch COMP03_1, 32, 0
+	{
+		Translation Inverse
+		Style Subtract
+		Alpha 0.5
+	}
+	Patch COMP03_1, 32, 64
+	{
+		Translation Inverse
+		Style Subtract
+		Alpha 0.5
+	}
+	Patch Door3_5, -4, -8
+	{
+		FlipX
+		Translation Gold
+		Style ReverseSubtract
+	}
+	Patch Door3_5, -4, 64
+	{
+		FlipY
+		FlipX
+		Translation Gold
+		Style ReverseSubtract
+	}
+		Patch Door3_5, 108, -8
+	{
+		Translation Gold
+		Style ReverseSubtract
+	}
+		Patch Door3_5, 108, 64
+	{
+		FlipY
+		Translation Gold
+		Style ReverseSubtract
+	}
+}
+
+texture MTFS3, 64, 128			// Translation + Flip + Style 3
+{
+	Patch RW7_2, 0, 0
+	{
+		Translation "152:159=160:167", "9:12=[108,63,0]:[0,0,0]"
+	}
+	
+	Patch SW11_1, 0, 13
+	{
+		Translation Gold
+		Style ReverseSubtract
+	}
+	Patch SW11_1, 32, 13
+	{
+		Translation Gold
+		Style ReverseSubtract
+	}
+		Patch RW7_2, 0, 124
+	{
+		FlipY
+		Translation "152:159=160:167", "9:12=[108,63,0]:[0,0,0]"
+	}
+}
+
+texture MTFS4, 64, 128			// Translation + Flip + Style 4
+{
+	Patch WALL00_1, 0, 0
+	{
+		//Translation Red
+	}
+	Patch WALL03_1, 0, -16
+	{
+		FlipY
+		Translation "128:143=176:191", "144:144=182:182"
+		Style Modulate
+	}
+	Patch WALL03_1, 0, 56
+	{
+		Translation "128:143=176:191", "144:144=182:182"
+		Style Modulate
+	}
+	Patch W33_8, 0, 52
+	{
+		Translation "80:111=88:95"
+		Style Modulate
+	}
+	Patch W33_8, 0, 71
+	{
+		Translation "80:111=88:95"
+		Style Modulate
+	}
+}
+
+//--------------------------------------
+// Translation, Flip, Rotate, and Style
+//--------------------------------------
+
+texture MTFRS1, 128, 128		// 
+{
+	Patch WALL00_3, 56, 0
+	{
+		Translation "32:47=192:207", "176:191=192:207"
+	}
+	Patch W32_1, -6, 0
+	{
+		Rotate 90
+	}
+	Patch W32_1, 69, 0
+	{
+		Rotate 270
+	}
+	Patch W32_1, -6, 64
+	{
+		Rotate 90
+	}
+	Patch W32_1, 69, 64
+	{
+		Rotate 270
+	}
+	Patch AG128_2, 0, 0
+	{
+		Translation "80:111=48:79", "3:3=72:72"
+		Style Modulate
+		Rotate 90
+	}
+	Patch AG128_2, 0, 64
+	{
+		Translation "80:111=48:79", "3:3=72:72"
+		Style Modulate
+		Rotate 90
+		FlipX
+	}
+}
+
+texture MTFRS2, 128, 128		// 
+{
+	Patch AG128_1, 0, 0
+	{
+		Translation Red
+	}
+	Patch AG128_1, 64, 0
+	{
+		Translation Ice
+	}
+	Patch DOOR2_1, 16, 16
+	{
+		Style Add
+		Rotate 90
+		Translation "80:111=48:79", "3:3=72:72"
+		FlipX
+	}
+}
+
+texture MTFRS3, 128, 128		// 
+{
+	
+}
+
+texture OHSHIT, 128, 128
+{
+   Patch STONE, 0, 0
+   Patch AG128_2, 32, 0
+   {
+      Style Add
+   }
+   Patch TLITE6_5, 0, 0
+   {
+      Style Add
+   }
+   patch TLITE6_5, 64, 0
+   {
+      Style Add
+   }
+}
+
diff --git a/Tests/Textures/Medricel/textest.wad b/Tests/Textures/Medricel/textest.wad
new file mode 100644
index 0000000..5464442
Binary files /dev/null and b/Tests/Textures/Medricel/textest.wad differ
diff --git a/Tests/Textures/bkpng2.wad b/Tests/Textures/bkpng2.wad
new file mode 100644
index 0000000..c521cb1
Binary files /dev/null and b/Tests/Textures/bkpng2.wad differ
diff --git a/Tests/Textures/brokenpng.wad b/Tests/Textures/brokenpng.wad
new file mode 100644
index 0000000..573e5e2
Binary files /dev/null and b/Tests/Textures/brokenpng.wad differ
diff --git a/Tests/Textures/sprites.wad b/Tests/Textures/sprites.wad
new file mode 100644
index 0000000..6e8802f
Binary files /dev/null and b/Tests/Textures/sprites.wad differ
diff --git a/Tests/Textures/texturesoverride.wad b/Tests/Textures/texturesoverride.wad
new file mode 100644
index 0000000..91c0f8d
Binary files /dev/null and b/Tests/Textures/texturesoverride.wad differ
diff --git a/Tests/Textures/texturestest.wad b/Tests/Textures/texturestest.wad
new file mode 100644
index 0000000..e7cea27
Binary files /dev/null and b/Tests/Textures/texturestest.wad differ
diff --git a/Tests/Triangulation/triangulation.dbs b/Tests/Triangulation/triangulation.dbs
new file mode 100644
index 0000000..e95d35b
--- /dev/null
+++ b/Tests/Triangulation/triangulation.dbs
@@ -0,0 +1,17 @@
+type = "Doom Builder Map Settings Configuration";
+gameconfig = "ZDoom_Doom.cfg";
+
+maps
+{
+	
+	MAP01
+	{
+		
+		resources
+		{
+		}
+		
+	}
+	
+}
+
diff --git a/Tests/Triangulation/triangulation.wad b/Tests/Triangulation/triangulation.wad
new file mode 100644
index 0000000..1f3028b
Binary files /dev/null and b/Tests/Triangulation/triangulation.wad differ
diff --git a/Tests/Triangulation/triangulation_a.wad b/Tests/Triangulation/triangulation_a.wad
new file mode 100644
index 0000000..c23294d
Binary files /dev/null and b/Tests/Triangulation/triangulation_a.wad differ
diff --git a/Tests/Triangulation/triangulation_b.wad b/Tests/Triangulation/triangulation_b.wad
new file mode 100644
index 0000000..3db3c91
Binary files /dev/null and b/Tests/Triangulation/triangulation_b.wad differ
diff --git a/Tests/Triangulation/triangulation_c.dbs b/Tests/Triangulation/triangulation_c.dbs
new file mode 100644
index 0000000..6e4d6b6
--- /dev/null
+++ b/Tests/Triangulation/triangulation_c.dbs
@@ -0,0 +1,30 @@
+type = "Doom Builder Map Settings Configuration";
+gameconfig = "ZDoom_Doom.cfg";
+strictpatches = 0;
+
+maps
+{
+	
+	MAP01
+	{
+		
+		resources
+		{
+		}
+		
+		
+		grid
+		{
+			background = "";
+			backsource = 0;
+			backoffsetx = 0;
+			backoffsety = 0;
+			backscalex = 100;
+			backscaley = 100;
+			gridsize = 1;
+		}
+		
+	}
+	
+}
+
diff --git a/Tests/Triangulation/triangulation_c.wad b/Tests/Triangulation/triangulation_c.wad
new file mode 100644
index 0000000..6430f5d
Binary files /dev/null and b/Tests/Triangulation/triangulation_c.wad differ
diff --git a/Tests/Triangulation/triangulation_e.wad b/Tests/Triangulation/triangulation_e.wad
new file mode 100644
index 0000000..3179074
Binary files /dev/null and b/Tests/Triangulation/triangulation_e.wad differ
diff --git a/Tests/Triangulation/triangulation_g.dbs b/Tests/Triangulation/triangulation_g.dbs
new file mode 100644
index 0000000..e95d35b
--- /dev/null
+++ b/Tests/Triangulation/triangulation_g.dbs
@@ -0,0 +1,17 @@
+type = "Doom Builder Map Settings Configuration";
+gameconfig = "ZDoom_Doom.cfg";
+
+maps
+{
+	
+	MAP01
+	{
+		
+		resources
+		{
+		}
+		
+	}
+	
+}
+
diff --git a/Tests/Triangulation/triangulation_g.wad b/Tests/Triangulation/triangulation_g.wad
new file mode 100644
index 0000000..bce32cf
Binary files /dev/null and b/Tests/Triangulation/triangulation_g.wad differ
diff --git a/Tests/Triangulation/triangulation_k.dbs b/Tests/Triangulation/triangulation_k.dbs
new file mode 100644
index 0000000..5b8c60f
--- /dev/null
+++ b/Tests/Triangulation/triangulation_k.dbs
@@ -0,0 +1,56 @@
+type = "Doom Builder Map Settings Configuration";
+gameconfig = "ZDoom_DoomHexen.cfg";
+strictpatches = 0;
+
+maps
+{
+	
+	MAP01
+	{
+		
+		fieldtypes
+		{
+			
+			linedef
+			{
+				blocking = 3;
+			}
+			
+		}
+		
+		
+		plugins
+		{
+			
+			lighting
+			{
+				
+				lights
+				{
+				}
+				
+			}
+			
+		}
+		
+		
+		resources
+		{
+		}
+		
+		
+		grid
+		{
+			background = "";
+			backsource = 0;
+			backoffsetx = 0;
+			backoffsety = 0;
+			backscalex = 100;
+			backscaley = 100;
+			gridsize = 32;
+		}
+		
+	}
+	
+}
+
diff --git a/Tests/Triangulation/triangulation_k.png b/Tests/Triangulation/triangulation_k.png
new file mode 100644
index 0000000..7c7289b
Binary files /dev/null and b/Tests/Triangulation/triangulation_k.png differ
diff --git a/Tests/Triangulation/triangulation_k.wad b/Tests/Triangulation/triangulation_k.wad
new file mode 100644
index 0000000..dcd319c
Binary files /dev/null and b/Tests/Triangulation/triangulation_k.wad differ
diff --git a/Tests/Triangulation/triangulation_m.dbs b/Tests/Triangulation/triangulation_m.dbs
new file mode 100644
index 0000000..7d860c1
--- /dev/null
+++ b/Tests/Triangulation/triangulation_m.dbs
@@ -0,0 +1,30 @@
+type = "Doom Builder Map Settings Configuration";
+gameconfig = "ZDoom_DoomHexen.cfg";
+strictpatches = 0;
+
+maps
+{
+	
+	SAD01
+	{
+		
+		grid
+		{
+			backoffsety = 0;
+			backoffsetx = 0;
+			backscalex = 100;
+			gridsize = 32;
+			background = "";
+			backsource = 0;
+			backscaley = 100;
+		}
+		
+		
+		resources
+		{
+		}
+		
+	}
+	
+}
+
diff --git a/Tests/Triangulation/triangulation_m.wad b/Tests/Triangulation/triangulation_m.wad
new file mode 100644
index 0000000..ac069b7
Binary files /dev/null and b/Tests/Triangulation/triangulation_m.wad differ
diff --git a/Tests/Triangulation/triangulation_p.png b/Tests/Triangulation/triangulation_p.png
new file mode 100644
index 0000000..e326552
Binary files /dev/null and b/Tests/Triangulation/triangulation_p.png differ
diff --git a/Tests/Triangulation/triangulation_p.wad b/Tests/Triangulation/triangulation_p.wad
new file mode 100644
index 0000000..5027128
Binary files /dev/null and b/Tests/Triangulation/triangulation_p.wad differ
diff --git a/Tests/Triangulation/triangulation_s.dbs b/Tests/Triangulation/triangulation_s.dbs
new file mode 100644
index 0000000..e95d35b
--- /dev/null
+++ b/Tests/Triangulation/triangulation_s.dbs
@@ -0,0 +1,17 @@
+type = "Doom Builder Map Settings Configuration";
+gameconfig = "ZDoom_Doom.cfg";
+
+maps
+{
+	
+	MAP01
+	{
+		
+		resources
+		{
+		}
+		
+	}
+	
+}
+
diff --git a/Tests/Triangulation/triangulation_s.png b/Tests/Triangulation/triangulation_s.png
new file mode 100644
index 0000000..ea6ff3d
Binary files /dev/null and b/Tests/Triangulation/triangulation_s.png differ
diff --git a/Tests/Triangulation/triangulation_s.wad b/Tests/Triangulation/triangulation_s.wad
new file mode 100644
index 0000000..115d81c
Binary files /dev/null and b/Tests/Triangulation/triangulation_s.wad differ
diff --git a/Tests/Triangulation/triangulation_t.dbs b/Tests/Triangulation/triangulation_t.dbs
new file mode 100644
index 0000000..e95d35b
--- /dev/null
+++ b/Tests/Triangulation/triangulation_t.dbs
@@ -0,0 +1,17 @@
+type = "Doom Builder Map Settings Configuration";
+gameconfig = "ZDoom_Doom.cfg";
+
+maps
+{
+	
+	MAP01
+	{
+		
+		resources
+		{
+		}
+		
+	}
+	
+}
+
diff --git a/Tests/Triangulation/triangulation_t.wad b/Tests/Triangulation/triangulation_t.wad
new file mode 100644
index 0000000..18e4dfd
Binary files /dev/null and b/Tests/Triangulation/triangulation_t.wad differ
diff --git a/Tests/Triangulation/triangulation_w.wad b/Tests/Triangulation/triangulation_w.wad
new file mode 100644
index 0000000..3f531db
Binary files /dev/null and b/Tests/Triangulation/triangulation_w.wad differ
diff --git a/Tests/UDMF/udmfexample.dbs b/Tests/UDMF/udmfexample.dbs
new file mode 100644
index 0000000..4877fa1
--- /dev/null
+++ b/Tests/UDMF/udmfexample.dbs
@@ -0,0 +1,41 @@
+type = "Doom Builder Map Settings Configuration";
+gameconfig = "ZDoom_DoomUDMF.cfg";
+
+maps
+{
+	
+	MAP01
+	{
+		
+		resources
+		{
+		}
+		
+		
+		grid
+		{
+			background = "";
+			backsource = 0;
+			backoffsetx = 0;
+			backoffsety = 0;
+			backscalex = 100;
+			backscaley = 100;
+			gridsize = 8;
+		}
+		
+		
+		fieldtypes
+		{
+			
+			vertex
+			{
+				comment = 2;
+			}
+			
+		}
+		
+	}
+	
+}
+
+strictpatches = 0;
diff --git a/Tests/UDMF/udmfexample.wad b/Tests/UDMF/udmfexample.wad
new file mode 100644
index 0000000..bd9c74b
Binary files /dev/null and b/Tests/UDMF/udmfexample.wad differ
diff --git a/VersionFromSVN.exe b/VersionFromSVN.exe
new file mode 100644
index 0000000..0f04eeb
Binary files /dev/null and b/VersionFromSVN.exe differ